diff --git a/asm/emerald.s b/asm/emerald.s index 96f032a55d..889109ead0 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -22,12 +22,12 @@ Main: bl RegisterRamReset movs r1, 0xA0 lsls r1, 19 - ldr r2, _08000468 + ldr r2, =0x00007fff adds r0, r2, 0 strh r0, [r1] bl lcd_io_copy_queue_clean - ldr r1, _0800046C - ldr r3, _08000470 + ldr r1, =0x04000204 + ldr r3, =0x00004014 adds r0, r3, 0 strh r0, [r1] bl init_keypad_data @@ -42,34 +42,34 @@ Main: bl dma3_transfer_queue_clear bl gpu_init_bgs bl fboxes_set_default_ptr - ldr r0, _08000474 + ldr r0, =0x02000000 movs r1, 0xE0 lsls r1, 9 bl init_malloc - ldr r0, _08000478 + ldr r0, =0x03002700 movs r4, 0 strb r4, [r0] - ldr r0, _0800047C + ldr r0, =0x03005d88 ldr r0, [r0] cmp r0, 0x1 beq _08000414 movs r0, 0 bl set_callback2 _08000414: - ldr r2, _08000480 + ldr r2, =0x030022b4 strb r4, [r2] - ldr r1, _08000484 + ldr r1, =0x03000000 movs r3, 0xFC lsls r3, 4 adds r0, r3, 0 strh r0, [r1] - ldr r7, _08000488 + ldr r7, =0x030022c0 movs r0, 0 mov r8, r0 adds r6, r2, 0 _0800042A: bl load_keys - ldr r0, _08000478 + ldr r0, =0x03002700 ldrb r0, [r0] cmp r0, 0 bne _08000454 @@ -95,17 +95,9 @@ _08000454: strb r0, [r6] b _080004B2 .align 2, 0 -_08000468: .4byte 0x00007fff -_0800046C: .4byte 0x04000204 -_08000470: .4byte 0x00004014 -_08000474: .4byte 0x02000000 -_08000478: .4byte 0x03002700 -_0800047C: .4byte 0x03005d88 -_08000480: .4byte 0x030022b4 -_08000484: .4byte 0x03000000 -_08000488: .4byte 0x030022c0 + .pool _0800048C: - ldr r5, _080004C0 + ldr r5, =0x030022b4 movs r0, 0 strb r0, [r5] bl call_callbacks_wrapper @@ -126,7 +118,7 @@ _080004B2: bl wait_for_vblank b _0800042A .align 2, 0 -_080004C0: .4byte 0x030022b4 + .pool thumb_func_end Main thumb_func_start call_callbacks_wrapper @@ -145,37 +137,31 @@ _080004D4: thumb_func_start init_saveblock_ptrs_and_set_copyright_callback2 init_saveblock_ptrs_and_set_copyright_callback2: @ 80004D8 push {lr} - ldr r2, _08000500 + ldr r2, =0x030022c0 movs r0, 0 str r0, [r2, 0x20] - ldr r1, _08000504 + ldr r1, =0x0203cf5c str r0, [r1] str r0, [r2, 0x24] str r0, [r2] - ldr r0, _08000508 + ldr r0, =c2_copyright_1 + 1 bl set_callback2 - ldr r1, _0800050C - ldr r0, _08000510 + ldr r1, =0x03005d90 + ldr r0, =0x02024a54 str r0, [r1] - ldr r1, _08000514 - ldr r0, _08000518 + ldr r1, =0x03005d94 + ldr r0, =0x02029808 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08000500: .4byte 0x030022c0 -_08000504: .4byte 0x0203cf5c -_08000508: .4byte c2_copyright_1 + 1 -_0800050C: .4byte 0x03005d90 -_08000510: .4byte 0x02024a54 -_08000514: .4byte 0x03005d94 -_08000518: .4byte 0x02029808 + .pool thumb_func_end init_saveblock_ptrs_and_set_copyright_callback2 thumb_func_start call_callbacks call_callbacks: @ 800051C push {r4,lr} - ldr r4, _0800053C + ldr r4, =0x030022c0 ldr r0, [r4] cmp r0, 0 beq _0800052A @@ -190,12 +176,12 @@ _08000534: pop {r0} bx r0 .align 2, 0 -_0800053C: .4byte 0x030022c0 + .pool thumb_func_end call_callbacks thumb_func_start set_callback2 set_callback2: @ 8000540 - ldr r1, _08000550 + ldr r1, =0x030022c0 str r0, [r1, 0x4] movs r0, 0x87 lsls r0, 3 @@ -204,47 +190,45 @@ set_callback2: @ 8000540 strb r0, [r1] bx lr .align 2, 0 -_08000550: .4byte 0x030022c0 + .pool thumb_func_end set_callback2 thumb_func_start start_timer1 start_timer1: @ 8000554 - ldr r1, _0800055C + ldr r1, =0x04000106 movs r0, 0x80 strh r0, [r1] bx lr .align 2, 0 -_0800055C: .4byte 0x04000106 + .pool thumb_func_end start_timer1 thumb_func_start set_rand_seed_and_trainer_id_hi set_rand_seed_and_trainer_id_hi: @ 8000560 push {r4,lr} - ldr r0, _0800057C + ldr r0, =0x04000104 ldrh r4, [r0] adds r0, r4, 0 bl SeedRng - ldr r1, _08000580 + ldr r1, =0x04000106 movs r0, 0 strh r0, [r1] - ldr r0, _08000584 + ldr r0, =0x02020000 strh r4, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0800057C: .4byte 0x04000104 -_08000580: .4byte 0x04000106 -_08000584: .4byte 0x02020000 + .pool thumb_func_end set_rand_seed_and_trainer_id_hi thumb_func_start get_trainer_id_hi get_trainer_id_hi: @ 8000588 - ldr r0, _08000590 + ldr r0, =0x02020000 ldrh r0, [r0] bx lr .align 2, 0 -_08000590: .4byte 0x02020000 + .pool thumb_func_end get_trainer_id_hi thumb_func_start lcd_enable_vcount_irq_at_150px @@ -270,13 +254,13 @@ lcd_enable_vcount_irq_at_150px: @ 8000594 thumb_func_start init_keypad_data init_keypad_data: @ 80005BC - ldr r1, _080005D8 + ldr r1, =0x030026fc movs r0, 0x5 strh r0, [r1] - ldr r1, _080005DC + ldr r1, =0x030022b0 movs r0, 0x28 strh r0, [r1] - ldr r1, _080005E0 + ldr r1, =0x030022c0 movs r0, 0 strh r0, [r1, 0x2C] strh r0, [r1, 0x2E] @@ -285,21 +269,19 @@ init_keypad_data: @ 80005BC strh r0, [r1, 0x2A] bx lr .align 2, 0 -_080005D8: .4byte 0x030026fc -_080005DC: .4byte 0x030022b0 -_080005E0: .4byte 0x030022c0 + .pool thumb_func_end init_keypad_data thumb_func_start load_keys load_keys: @ 80005E4 push {lr} - ldr r0, _08000620 + ldr r0, =0x04000130 ldrh r1, [r0] - ldr r2, _08000624 + ldr r2, =0x000003ff adds r0, r2, 0 adds r3, r0, 0 eors r3, r1 - ldr r1, _08000628 + ldr r1, =0x030022c0 ldrh r2, [r1, 0x28] adds r0, r3, 0 bics r0, r2 @@ -319,22 +301,19 @@ load_keys: @ 80005E4 cmp r0, 0 bne _08000636 strh r3, [r2, 0x30] - ldr r0, _0800062C + ldr r0, =0x030026fc b _08000632 .align 2, 0 -_08000620: .4byte 0x04000130 -_08000624: .4byte 0x000003ff -_08000628: .4byte 0x030022c0 -_0800062C: .4byte 0x030026fc + .pool _08000630: - ldr r0, _0800067C + ldr r0, =0x030022b0 _08000632: ldrh r0, [r0] strh r0, [r2, 0x32] _08000636: strh r3, [r2, 0x28] strh r3, [r2, 0x2C] - ldr r0, _08000680 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x2 @@ -370,17 +349,16 @@ _08000676: pop {r0} bx r0 .align 2, 0 -_0800067C: .4byte 0x030022b0 -_08000680: .4byte 0x03005d90 + .pool thumb_func_end load_keys thumb_func_start init_irq_handler init_irq_handler: @ 8000684 push {r4,r5,lr} - ldr r5, _080006D0 - ldr r4, _080006D4 - ldr r3, _080006D8 - ldr r2, _080006DC + ldr r5, =InterruptMain + ldr r4, =0x03002750 + ldr r3, =0x082e9548 + ldr r2, =0x03002710 movs r1, 0xD _08000690: ldm r3!, {r0} @@ -388,13 +366,13 @@ _08000690: subs r1, 0x1 cmp r1, 0 bge _08000690 - ldr r0, _080006E0 + ldr r0, =0x040000d4 str r5, [r0] str r4, [r0, 0x4] - ldr r1, _080006E4 + ldr r1, =0x84000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - ldr r0, _080006E8 + ldr r0, =0x03007ffc str r4, [r0] movs r0, 0 bl SetVBlankCallback @@ -402,7 +380,7 @@ _08000690: bl SetHBlankCallback movs r0, 0 bl set_serial_callback - ldr r1, _080006EC + ldr r1, =0x04000208 movs r0, 0x1 strh r0, [r1] movs r0, 0x1 @@ -411,89 +389,80 @@ _08000690: pop {r0} bx r0 .align 2, 0 -_080006D0: .4byte InterruptMain -_080006D4: .4byte 0x03002750 -_080006D8: .4byte 0x082e9548 -_080006DC: .4byte 0x03002710 -_080006E0: .4byte 0x040000d4 -_080006E4: .4byte 0x84000200 -_080006E8: .4byte 0x03007ffc -_080006EC: .4byte 0x04000208 + .pool thumb_func_end init_irq_handler thumb_func_start SetVBlankCallback SetVBlankCallback: @ 80006F0 - ldr r1, _080006F8 + ldr r1, =0x030022c0 str r0, [r1, 0xC] bx lr .align 2, 0 -_080006F8: .4byte 0x030022c0 + .pool thumb_func_end SetVBlankCallback thumb_func_start SetHBlankCallback SetHBlankCallback: @ 80006FC - ldr r1, _08000704 + ldr r1, =0x030022c0 str r0, [r1, 0x10] bx lr .align 2, 0 -_08000704: .4byte 0x030022c0 + .pool thumb_func_end SetHBlankCallback thumb_func_start SetVCountCallback SetVCountCallback: @ 8000708 - ldr r1, _08000710 + ldr r1, =0x030022c0 str r0, [r1, 0x14] bx lr .align 2, 0 -_08000710: .4byte 0x030022c0 + .pool thumb_func_end SetVCountCallback thumb_func_start restore_serial_timer3_irq_handlers restore_serial_timer3_irq_handlers: @ 8000714 - ldr r0, _08000720 - ldr r1, _08000724 + ldr r0, =0x03002710 + ldr r1, =irq_serial + 1 str r1, [r0, 0x4] - ldr r1, _08000728 + ldr r1, =irq_timer3 + 1 str r1, [r0, 0x8] bx lr .align 2, 0 -_08000720: .4byte 0x03002710 -_08000724: .4byte irq_serial + 1 -_08000728: .4byte irq_timer3 + 1 + .pool thumb_func_end restore_serial_timer3_irq_handlers thumb_func_start set_serial_callback set_serial_callback: @ 800072C - ldr r1, _08000734 + ldr r1, =0x030022c0 str r0, [r1, 0x18] bx lr .align 2, 0 -_08000734: .4byte 0x030022c0 + .pool thumb_func_end set_serial_callback thumb_func_start irq_vblank irq_vblank: @ 8000738 push {r4,lr} - ldr r0, _08000748 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0800074C bl rfu_syncVBlank__ b _08000758 .align 2, 0 -_08000748: .4byte 0x030030fc + .pool _0800074C: - ldr r0, _080007DC + ldr r0, =0x03002748 ldrb r0, [r0] cmp r0, 0 bne _08000758 bl sub_800B9B8 _08000758: - ldr r0, _080007E0 + ldr r0, =0x030022c0 ldr r1, [r0, 0x20] adds r1, 0x1 str r1, [r0, 0x20] - ldr r1, _080007E4 + ldr r1, =0x0203cf5c ldr r1, [r1] adds r4, r0, 0 cmp r1, 0 @@ -516,22 +485,22 @@ _08000782: str r0, [r4, 0x24] bl lcd_io_copy_queue_process bl dma_transfer_queue_process - ldr r1, _080007E8 - ldr r0, _080007EC + ldr r1, =0x03002f50 + ldr r0, =0x03006380 ldrb r0, [r0, 0x4] strb r0, [r1] bl m4aSoundMain bl sub_8033648 - ldr r1, _080007F0 + ldr r1, =0x00000439 adds r0, r4, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _080007BA - ldr r0, _080007F4 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _080007F8 + ldr r1, =0x013f0102 ands r0, r1 cmp r0, 0 bne _080007BE @@ -539,12 +508,12 @@ _080007BA: bl GenerateRandomNumber _080007BE: bl sub_800E174 - ldr r2, _080007FC + ldr r2, =0x03007ff8 ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 strh r0, [r2] - ldr r0, _080007E0 + ldr r0, =0x030022c0 ldrh r2, [r0, 0x1C] ldrh r3, [r0, 0x1C] orrs r1, r2 @@ -553,39 +522,31 @@ _080007BE: pop {r0} bx r0 .align 2, 0 -_080007DC: .4byte 0x03002748 -_080007E0: .4byte 0x030022c0 -_080007E4: .4byte 0x0203cf5c -_080007E8: .4byte 0x03002f50 -_080007EC: .4byte 0x03006380 -_080007F0: .4byte 0x00000439 -_080007F4: .4byte 0x02022fec -_080007F8: .4byte 0x013f0102 -_080007FC: .4byte 0x03007ff8 + .pool thumb_func_end irq_vblank thumb_func_start flash_timeout_start_on_timer_2 flash_timeout_start_on_timer_2: @ 8000800 push {lr} - ldr r1, _08000810 + ldr r1, =0x0300272c movs r0, 0x2 bl SetFlashTimerIntr pop {r0} bx r0 .align 2, 0 -_08000810: .4byte 0x0300272c + .pool thumb_func_end flash_timeout_start_on_timer_2 thumb_func_start irq_hblank irq_hblank: @ 8000814 push {r4,lr} - ldr r4, _0800083C + ldr r4, =0x030022c0 ldr r0, [r4, 0x10] cmp r0, 0 beq _08000822 bl _call_via_r0 _08000822: - ldr r2, _08000840 + ldr r2, =0x03007ff8 ldrh r0, [r2] movs r1, 0x2 orrs r0, r1 @@ -598,21 +559,20 @@ _08000822: pop {r0} bx r0 .align 2, 0 -_0800083C: .4byte 0x030022c0 -_08000840: .4byte 0x03007ff8 + .pool thumb_func_end irq_hblank thumb_func_start irq_vcount irq_vcount: @ 8000844 push {r4,lr} - ldr r4, _08000870 + ldr r4, =0x030022c0 ldr r0, [r4, 0x14] cmp r0, 0 beq _08000852 bl _call_via_r0 _08000852: bl SoundVSync_rev01 - ldr r2, _08000874 + ldr r2, =0x03007ff8 ldrh r0, [r2] movs r1, 0x4 orrs r0, r1 @@ -625,20 +585,19 @@ _08000852: pop {r0} bx r0 .align 2, 0 -_08000870: .4byte 0x030022c0 -_08000874: .4byte 0x03007ff8 + .pool thumb_func_end irq_vcount thumb_func_start irq_serial irq_serial: @ 8000878 push {r4,lr} - ldr r4, _080008A0 + ldr r4, =0x030022c0 ldr r0, [r4, 0x18] cmp r0, 0 beq _08000886 bl _call_via_r0 _08000886: - ldr r2, _080008A4 + ldr r2, =0x03007ff8 ldrh r0, [r2] movs r1, 0x80 orrs r0, r1 @@ -651,8 +610,7 @@ _08000886: pop {r0} bx r0 .align 2, 0 -_080008A0: .4byte 0x030022c0 -_080008A4: .4byte 0x03007ff8 + .pool thumb_func_end irq_serial thumb_func_start irq_other @@ -663,9 +621,9 @@ irq_other: @ 80008A8 thumb_func_start wait_for_vblank wait_for_vblank: @ 80008AC push {lr} - ldr r2, _080008D4 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x1C] - ldr r0, _080008D8 + ldr r0, =0x0000fffe ands r0, r1 ldrh r1, [r2, 0x1C] strh r0, [r2, 0x1C] @@ -685,45 +643,44 @@ _080008D0: pop {r0} bx r0 .align 2, 0 -_080008D4: .4byte 0x030022c0 -_080008D8: .4byte 0x0000fffe + .pool thumb_func_end wait_for_vblank thumb_func_start sub_80008DC sub_80008DC: @ 80008DC - ldr r1, _080008E4 + ldr r1, =0x0203cf5c str r0, [r1] bx lr .align 2, 0 -_080008E4: .4byte 0x0203cf5c + .pool thumb_func_end sub_80008DC thumb_func_start sub_80008E8 sub_80008E8: @ 80008E8 - ldr r1, _080008F0 + ldr r1, =0x0203cf5c movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_080008F0: .4byte 0x0203cf5c + .pool thumb_func_end sub_80008E8 thumb_func_start do_reset do_reset: @ 80008F4 push {r4,lr} - ldr r1, _08000950 + ldr r1, =0x04000208 movs r0, 0 strh r0, [r1] bl SoundVSyncOff_rev01 bl remove_some_task - ldr r1, _08000954 + ldr r1, =0x040000bc ldrh r2, [r1, 0xA] - ldr r3, _08000958 + ldr r3, =0x0000c5ff adds r0, r3, 0 ands r0, r2 strh r0, [r1, 0xA] ldrh r4, [r1, 0xA] - ldr r2, _0800095C + ldr r2, =0x00007fff adds r0, r2, 0 ands r0, r4 strh r0, [r1, 0xA] @@ -738,7 +695,7 @@ do_reset: @ 80008F4 ands r0, r4 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] - ldr r0, _08000960 + ldr r0, =0x040000d4 ldrh r1, [r0, 0xA] ands r3, r1 strh r3, [r0, 0xA] @@ -753,11 +710,7 @@ do_reset: @ 80008F4 pop {r0} bx r0 .align 2, 0 -_08000950: .4byte 0x04000208 -_08000954: .4byte 0x040000bc -_08000958: .4byte 0x0000c5ff -_0800095C: .4byte 0x00007fff -_08000960: .4byte 0x040000d4 + .pool thumb_func_end do_reset thumb_func_start sub_8000964 @@ -767,16 +720,15 @@ sub_8000964: @ 8000964 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _08000980 - ldr r2, _08000984 + ldr r1, =0x03007330 + ldr r2, =0x01000034 mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08000980: .4byte 0x03007330 -_08000984: .4byte 0x01000034 + .pool thumb_func_end sub_8000964 thumb_func_start malloc_header @@ -784,7 +736,7 @@ malloc_header: @ 8000988 push {r4,lr} movs r4, 0 strh r4, [r0] - ldr r4, _080009A0 + ldr r4, =0x0000a3a3 strh r4, [r0, 0x2] str r3, [r0, 0x4] str r1, [r0, 0x8] @@ -793,7 +745,7 @@ malloc_header: @ 8000988 pop {r0} bx r0 .align 2, 0 -_080009A0: .4byte 0x0000a3a3 + .pool thumb_func_end malloc_header thumb_func_start malloc_unlinked_header @@ -967,7 +919,7 @@ check_memblk_core: @ 8000AC4 adds r3, r1, 0 subs r3, 0x10 ldrh r2, [r3, 0x2] - ldr r0, _08000B10 + ldr r0, =0x0000a3a3 cmp r2, r0 bne _08000B0A ldr r0, [r3, 0xC] @@ -983,7 +935,7 @@ check_memblk_core: @ 8000AC4 _08000AE8: ldr r2, [r3, 0x8] ldrh r1, [r2, 0x2] - ldr r0, _08000B10 + ldr r0, =0x0000a3a3 cmp r1, r0 bne _08000B0A cmp r2, r5 @@ -1003,7 +955,7 @@ _08000B0A: movs r0, 0 b _08000B16 .align 2, 0 -_08000B10: .4byte 0x0000a3a3 + .pool _08000B14: movs r0, 0x1 _08000B16: @@ -1015,74 +967,73 @@ _08000B16: thumb_func_start init_malloc init_malloc: @ 8000B1C push {lr} - ldr r2, _08000B30 + ldr r2, =0x03000004 str r0, [r2] - ldr r2, _08000B34 + ldr r2, =0x03000008 str r1, [r2] bl malloc_unlinked_header pop {r0} bx r0 .align 2, 0 -_08000B30: .4byte 0x03000004 -_08000B34: .4byte 0x03000008 + .pool thumb_func_end init_malloc thumb_func_start malloc malloc: @ 8000B38 push {lr} adds r1, r0, 0 - ldr r0, _08000B48 + ldr r0, =0x03000004 ldr r0, [r0] bl malloc_core pop {r1} bx r1 .align 2, 0 -_08000B48: .4byte 0x03000004 + .pool thumb_func_end malloc thumb_func_start malloc_and_clear malloc_and_clear: @ 8000B4C push {lr} adds r1, r0, 0 - ldr r0, _08000B5C + ldr r0, =0x03000004 ldr r0, [r0] bl malloc_core_and_clear pop {r1} bx r1 .align 2, 0 -_08000B5C: .4byte 0x03000004 + .pool thumb_func_end malloc_and_clear thumb_func_start free free: @ 8000B60 push {lr} adds r1, r0, 0 - ldr r0, _08000B70 + ldr r0, =0x03000004 ldr r0, [r0] bl free_core pop {r0} bx r0 .align 2, 0 -_08000B70: .4byte 0x03000004 + .pool thumb_func_end free thumb_func_start check_memblk check_memblk: @ 8000B74 push {lr} adds r1, r0, 0 - ldr r0, _08000B84 + ldr r0, =0x03000004 ldr r0, [r0] bl check_memblk_core pop {r1} bx r1 .align 2, 0 -_08000B84: .4byte 0x03000004 + .pool thumb_func_end check_memblk thumb_func_start check_all_memblks check_all_memblks: @ 8000B88 push {r4,r5,lr} - ldr r0, _08000BAC + ldr r0, =0x03000004 ldr r4, [r0] adds r5, r0, 0 _08000B90: @@ -1099,7 +1050,7 @@ _08000B90: movs r0, 0x1 b _08000BB2 .align 2, 0 -_08000BAC: .4byte 0x03000004 + .pool _08000BB0: movs r0, 0 _08000BB2: @@ -1111,14 +1062,14 @@ _08000BB2: thumb_func_start dma3_transfer_queue_clear dma3_transfer_queue_clear: @ 8000BB8 push {lr} - ldr r2, _08000BE4 + ldr r2, =0x03000810 movs r0, 0x1 strb r0, [r2] - ldr r1, _08000BE8 + ldr r1, =0x03000811 movs r0, 0 strb r0, [r1] movs r3, 0 - ldr r0, _08000BEC + ldr r0, =0x03000010 movs r1, 0x7F _08000BCC: strh r3, [r0, 0x8] @@ -1133,9 +1084,7 @@ _08000BCC: pop {r0} bx r0 .align 2, 0 -_08000BE4: .4byte 0x03000810 -_08000BE8: .4byte 0x03000811 -_08000BEC: .4byte 0x03000010 + .pool thumb_func_end dma3_transfer_queue_clear thumb_func_start dma_transfer_queue_process @@ -1146,7 +1095,7 @@ dma_transfer_queue_process: @ 8000BF0 mov r5, r8 push {r5-r7} sub sp, 0xC - ldr r0, _08000C6C + ldr r0, =0x03000810 ldrb r0, [r0] cmp r0, 0 beq _08000C06 @@ -1154,8 +1103,8 @@ dma_transfer_queue_process: @ 8000BF0 _08000C06: movs r0, 0 str r0, [sp, 0x8] - ldr r1, _08000C70 - ldr r2, _08000C74 + ldr r1, =0x03000010 + ldr r2, =0x03000811 ldrb r0, [r2] lsls r0, 4 adds r0, r1 @@ -1170,7 +1119,7 @@ _08000C1E: mov r10, r1 movs r6, 0x80 lsls r6, 5 - ldr r7, _08000C78 + ldr r7, =0x040000d4 movs r2, 0 mov r9, r2 _08000C2E: @@ -1192,7 +1141,7 @@ _08000C2E: bls _08000C50 b _08000E46 _08000C50: - ldr r0, _08000C7C + ldr r0, =0x04000006 ldrb r0, [r0] cmp r0, 0xE0 bls _08000C5A @@ -1207,11 +1156,7 @@ _08000C5A: beq _08000C8C b _08000DF0 .align 2, 0 -_08000C6C: .4byte 0x03000810 -_08000C70: .4byte 0x03000010 -_08000C74: .4byte 0x03000811 -_08000C78: .4byte 0x040000d4 -_08000C7C: .4byte 0x04000006 + .pool _08000C80: cmp r0, 0x3 beq _08000D3C @@ -1235,10 +1180,10 @@ _08000C8C: lsls r1, 24 b _08000DAA _08000CA6: - ldr r4, _08000CC8 + ldr r4, =0x040000d4 str r3, [r4] str r2, [r4, 0x4] - ldr r0, _08000CCC + ldr r0, =0x84000400 str r0, [r4, 0x8] ldr r0, [r4, 0x8] adds r3, r6 @@ -1253,8 +1198,7 @@ _08000CA6: lsls r1, 24 b _08000D76 .align 2, 0 -_08000CC8: .4byte 0x040000d4 -_08000CCC: .4byte 0x84000400 + .pool _08000CD0: mov r3, r10 adds r0, r5, r3 @@ -1283,11 +1227,11 @@ _08000CF4: adds r0, r5 ldr r0, [r0] str r0, [sp] - ldr r3, _08000D34 + ldr r3, =0x040000d4 mov r0, sp str r0, [r3] str r4, [r3, 0x4] - ldr r0, _08000D38 + ldr r0, =0x85000400 str r0, [r3, 0x8] ldr r0, [r3, 0x8] adds r4, r6 @@ -1307,8 +1251,7 @@ _08000CF4: lsls r1, 24 b _08000DEA .align 2, 0 -_08000D34: .4byte 0x040000d4 -_08000D38: .4byte 0x85000400 + .pool _08000D3C: ldr r3, [r1] mov r2, r10 @@ -1324,10 +1267,10 @@ _08000D3C: lsls r1, 24 b _08000DAA _08000D56: - ldr r4, _08000D80 + ldr r4, =0x040000d4 str r3, [r4] str r2, [r4, 0x4] - ldr r0, _08000D84 + ldr r0, =0x80000800 str r0, [r4, 0x8] ldr r0, [r4, 0x8] adds r3, r6 @@ -1346,8 +1289,7 @@ _08000D76: ldr r0, [r4, 0x8] b _08000DF0 .align 2, 0 -_08000D80: .4byte 0x040000d4 -_08000D84: .4byte 0x80000800 + .pool _08000D88: mov r3, r10 adds r0, r5, r3 @@ -1375,14 +1317,14 @@ _08000DB2: mov r5, r12 ldrb r0, [r5] lsls r0, 4 - ldr r3, _08000E58 + ldr r3, =0x0300001c adds r0, r3 ldr r0, [r0] strh r0, [r1] - ldr r3, _08000E5C + ldr r3, =0x040000d4 str r1, [r3] str r2, [r3, 0x4] - ldr r0, _08000E60 + ldr r0, =0x81000800 str r0, [r3, 0x8] ldr r0, [r3, 0x8] adds r2, r6 @@ -1391,7 +1333,7 @@ _08000DB2: bhi _08000DB2 ldrb r0, [r5] lsls r0, 4 - ldr r5, _08000E58 + ldr r5, =0x0300001c adds r0, r5 ldr r0, [r0] strh r0, [r1] @@ -1405,7 +1347,7 @@ _08000DEA: str r0, [r3, 0x8] ldr r0, [r3, 0x8] _08000DF0: - ldr r1, _08000E64 + ldr r1, =0x03000010 mov r3, r12 ldrb r0, [r3] lsls r0, 4 @@ -1443,7 +1385,7 @@ _08000E34: mov r2, r12 ldrb r0, [r2] lsls r0, 4 - ldr r3, _08000E64 + ldr r3, =0x03000010 adds r0, r3 ldrh r0, [r0, 0x8] cmp r0, 0 @@ -1459,10 +1401,7 @@ _08000E46: pop {r0} bx r0 .align 2, 0 -_08000E58: .4byte 0x0300001c -_08000E5C: .4byte 0x040000d4 -_08000E60: .4byte 0x81000800 -_08000E64: .4byte 0x03000010 + .pool thumb_func_end dma_transfer_queue_process thumb_func_start dma3_transfer_queue_add_copy @@ -1479,13 +1418,13 @@ dma3_transfer_queue_add_copy: @ 8000E68 lsls r3, 24 lsrs r4, r3, 24 movs r5, 0 - ldr r1, _08000EB4 + ldr r1, =0x03000810 movs r0, 0x1 strb r0, [r1] - ldr r0, _08000EB8 + ldr r0, =0x03000811 ldrb r2, [r0] mov r10, r1 - ldr r6, _08000EBC + ldr r6, =0x03000010 mov r9, r6 lsls r0, r2, 4 adds r1, r0, r6 @@ -1507,21 +1446,19 @@ _08000E94: strh r4, [r1, 0xA] b _08000EC4 .align 2, 0 -_08000EB4: .4byte 0x03000810 -_08000EB8: .4byte 0x03000811 -_08000EBC: .4byte 0x03000010 + .pool _08000EC0: movs r0, 0x3 strh r0, [r1, 0xA] _08000EC4: movs r0, 0 - ldr r1, _08000ED0 + ldr r1, =0x03000810 strb r0, [r1] lsls r0, r2, 16 asrs r0, 16 b _08000EF0 .align 2, 0 -_08000ED0: .4byte 0x03000810 + .pool _08000ED4: adds r1, 0x10 adds r2, 0x1 @@ -1562,13 +1499,13 @@ dma3_transfer_queue_add_fill: @ 8000F00 lsls r3, 24 lsrs r5, r3, 24 movs r6, 0 - ldr r0, _08000F58 + ldr r0, =0x03000811 ldrb r2, [r0] - ldr r1, _08000F5C + ldr r1, =0x03000810 movs r0, 0x1 strb r0, [r1] mov r10, r1 - ldr r0, _08000F60 + ldr r0, =0x03000010 mov r12, r0 mov r4, r12 lsls r0, r2, 4 @@ -1595,21 +1532,19 @@ _08000F30: movs r0, 0x2 b _08000F66 .align 2, 0 -_08000F58: .4byte 0x03000811 -_08000F5C: .4byte 0x03000810 -_08000F60: .4byte 0x03000010 + .pool _08000F64: movs r0, 0x4 _08000F66: strh r0, [r1, 0x2] movs r0, 0 - ldr r6, _08000F74 + ldr r6, =0x03000810 strb r0, [r6] lsls r0, r2, 16 asrs r0, 16 b _08000F96 .align 2, 0 -_08000F74: .4byte 0x03000810 + .pool _08000F78: adds r1, 0x10 adds r2, 0x1 @@ -1647,7 +1582,7 @@ dma3_transfer_queue_check_for_space: @ 8000FA4 negs r3, r3 cmp r1, r3 bne _08000FCC - ldr r1, _08000FC8 + ldr r1, =0x03000010 _08000FB6: ldrh r0, [r1, 0x8] cmp r0, 0 @@ -1660,9 +1595,9 @@ _08000FC4: movs r0, 0 b _08000FDC .align 2, 0 -_08000FC8: .4byte 0x03000010 + .pool _08000FCC: - ldr r0, _08000FE0 + ldr r0, =0x03000010 lsls r1, 4 adds r1, r0 ldrh r0, [r1, 0x8] @@ -1675,7 +1610,7 @@ _08000FDC: pop {r1} bx r1 .align 2, 0 -_08000FE0: .4byte 0x03000010 + .pool thumb_func_end dma3_transfer_queue_check_for_space thumb_func_start lcd_io_copy_queue_clean @@ -1684,14 +1619,14 @@ lcd_io_copy_queue_clean: @ 8000FE4 mov r7, r8 push {r7} movs r2, 0 - ldr r7, _08001028 - ldr r0, _0800102C + ldr r7, =0x030008d8 + ldr r0, =0x030008d9 mov r12, r0 - ldr r1, _08001030 + ldr r1, =0x030008da mov r8, r1 - ldr r6, _08001034 + ldr r6, =0x03000818 movs r5, 0 - ldr r4, _08001038 + ldr r4, =0x03000878 movs r3, 0xFF _08000FFE: adds r0, r2, r6 @@ -1716,11 +1651,7 @@ _08000FFE: pop {r0} bx r0 .align 2, 0 -_08001028: .4byte 0x030008d8 -_0800102C: .4byte 0x030008d9 -_08001030: .4byte 0x030008da -_08001034: .4byte 0x03000818 -_08001038: .4byte 0x03000878 + .pool thumb_func_end lcd_io_copy_queue_clean thumb_func_start lcd_io_buffer_to_hardware @@ -1730,26 +1661,24 @@ lcd_io_buffer_to_hardware: @ 800103C lsrs r2, r0, 24 cmp r2, 0x4 bne _08001068 - ldr r2, _0800105C + ldr r2, =0x04000004 ldrh r1, [r2] - ldr r0, _08001060 + ldr r0, =0x0000ffe7 ands r0, r1 strh r0, [r2] - ldr r1, _08001064 + ldr r1, =0x0300081c ldrh r0, [r2] ldrh r1, [r1] orrs r0, r1 strh r0, [r2] b _08001076 .align 2, 0 -_0800105C: .4byte 0x04000004 -_08001060: .4byte 0x0000ffe7 -_08001064: .4byte 0x0300081c + .pool _08001068: movs r0, 0x80 lsls r0, 19 adds r0, r2, r0 - ldr r1, _0800107C + ldr r1, =0x03000818 adds r1, r2, r1 ldrh r1, [r1] strh r1, [r0] @@ -1757,19 +1686,19 @@ _08001076: pop {r0} bx r0 .align 2, 0 -_0800107C: .4byte 0x03000818 + .pool thumb_func_end lcd_io_buffer_to_hardware thumb_func_start lcd_io_copy_queue_process lcd_io_copy_queue_process: @ 8001080 push {r4,r5,lr} - ldr r0, _080010AC + ldr r0, =0x030008d8 ldrb r0, [r0] cmp r0, 0 bne _080010A4 movs r5, 0 _0800108C: - ldr r0, _080010B0 + ldr r0, =0x03000878 adds r4, r5, r0 ldrb r0, [r4] cmp r0, 0xFF @@ -1785,8 +1714,7 @@ _080010A4: pop {r0} bx r0 .align 2, 0 -_080010AC: .4byte 0x030008d8 -_080010B0: .4byte 0x03000878 + .pool thumb_func_end lcd_io_copy_queue_process thumb_func_start lcd_io_set @@ -1798,10 +1726,10 @@ lcd_io_set: @ 80010B4 lsrs r1, 16 cmp r4, 0x5F bhi _08001130 - ldr r0, _080010F0 + ldr r0, =0x03000818 adds r0, r4, r0 strh r1, [r0] - ldr r0, _080010F4 + ldr r0, =0x04000006 ldrh r1, [r0] movs r0, 0xFF ands r0, r1 @@ -1822,18 +1750,17 @@ _080010E8: bl lcd_io_buffer_to_hardware b _08001130 .align 2, 0 -_080010F0: .4byte 0x03000818 -_080010F4: .4byte 0x04000006 + .pool _080010F8: movs r0, 0 strb r0, [r5] b _08001130 _080010FE: - ldr r2, _08001138 + ldr r2, =0x030008d8 movs r0, 0x1 strb r0, [r2] movs r3, 0 - ldr r0, _0800113C + ldr r0, =0x03000878 ldrb r1, [r0] adds r5, r2, 0 adds r2, r0, 0 @@ -1861,8 +1788,7 @@ _08001130: pop {r0} bx r0 .align 2, 0 -_08001138: .4byte 0x030008d8 -_0800113C: .4byte 0x03000878 + .pool thumb_func_end lcd_io_set thumb_func_start lcd_io_set_forced_blank @@ -1874,7 +1800,7 @@ lcd_io_set_forced_blank: @ 8001140 lsrs r1, 16 cmp r4, 0x5F bhi _080011A8 - ldr r0, _0800116C + ldr r0, =0x03000818 adds r0, r4, r0 strh r1, [r0] movs r0, 0x80 @@ -1888,17 +1814,17 @@ lcd_io_set_forced_blank: @ 8001140 bl lcd_io_buffer_to_hardware b _080011A8 .align 2, 0 -_0800116C: .4byte 0x03000818 + .pool _08001170: movs r0, 0 strb r0, [r5] b _080011A8 _08001176: - ldr r2, _080011B0 + ldr r2, =0x030008d8 movs r0, 0x1 strb r0, [r2] movs r3, 0 - ldr r0, _080011B4 + ldr r0, =0x03000878 ldrb r1, [r0] adds r5, r2, 0 adds r2, r0, 0 @@ -1926,8 +1852,7 @@ _080011A8: pop {r0} bx r0 .align 2, 0 -_080011B0: .4byte 0x030008d8 -_080011B4: .4byte 0x03000878 + .pool thumb_func_end lcd_io_set_forced_blank thumb_func_start lcd_io_get @@ -1938,28 +1863,28 @@ lcd_io_get: @ 80011B8 adds r1, r0, 0 cmp r1, 0x4 bne _080011CC - ldr r0, _080011C8 + ldr r0, =0x04000004 b _080011DE .align 2, 0 -_080011C8: .4byte 0x04000004 + .pool _080011CC: cmp r1, 0x6 beq _080011DC - ldr r0, _080011D8 + ldr r0, =0x03000818 adds r0, r1, r0 ldrh r0, [r0] b _080011E0 .align 2, 0 -_080011D8: .4byte 0x03000818 + .pool _080011DC: - ldr r0, _080011E4 + ldr r0, =0x04000006 _080011DE: ldrh r0, [r0] _080011E0: pop {r1} bx r1 .align 2, 0 -_080011E4: .4byte 0x04000006 + .pool thumb_func_end lcd_io_get thumb_func_start lcd_io_set_bits @@ -1968,7 +1893,7 @@ lcd_io_set_bits: @ 80011E8 adds r2, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08001204 + ldr r1, =0x03000818 adds r1, r0, r1 ldrh r1, [r1] orrs r1, r2 @@ -1978,7 +1903,7 @@ lcd_io_set_bits: @ 80011E8 pop {r0} bx r0 .align 2, 0 -_08001204: .4byte 0x03000818 + .pool thumb_func_end lcd_io_set_bits thumb_func_start lcd_io_clear_bits @@ -1988,7 +1913,7 @@ lcd_io_clear_bits: @ 8001208 lsls r0, 24 lsrs r0, 24 lsls r2, 16 - ldr r1, _08001224 + ldr r1, =0x03000818 adds r1, r0, r1 ldrh r1, [r1] lsrs r2, 16 @@ -1997,22 +1922,22 @@ lcd_io_clear_bits: @ 8001208 pop {r0} bx r0 .align 2, 0 -_08001224: .4byte 0x03000818 + .pool thumb_func_end lcd_io_clear_bits thumb_func_start update_hardware_IE update_hardware_IE: @ 8001228 push {r4,r5,lr} - ldr r5, _0800124C + ldr r5, =0x030008d9 ldrb r0, [r5] cmp r0, 0 beq _08001246 - ldr r2, _08001250 + ldr r2, =0x04000208 ldrh r1, [r2] movs r4, 0 strh r4, [r2] - ldr r3, _08001254 - ldr r0, _08001258 + ldr r3, =0x04000200 + ldr r0, =0x030008da ldrh r0, [r0] strh r0, [r3] strh r1, [r2] @@ -2022,10 +1947,7 @@ _08001246: pop {r0} bx r0 .align 2, 0 -_0800124C: .4byte 0x030008d9 -_08001250: .4byte 0x04000208 -_08001254: .4byte 0x04000200 -_08001258: .4byte 0x030008da + .pool thumb_func_end update_hardware_IE thumb_func_start enable_irqs @@ -2033,11 +1955,11 @@ enable_irqs: @ 800125C push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _08001280 + ldr r4, =0x030008da ldrh r1, [r4] orrs r0, r1 strh r0, [r4] - ldr r1, _08001284 + ldr r1, =0x030008d9 movs r0, 0x1 strb r0, [r1] bl update_hardware_IE @@ -2047,8 +1969,7 @@ enable_irqs: @ 800125C pop {r0} bx r0 .align 2, 0 -_08001280: .4byte 0x030008da -_08001284: .4byte 0x030008d9 + .pool thumb_func_end enable_irqs thumb_func_start disable_irqs @@ -2056,11 +1977,11 @@ disable_irqs: @ 8001288 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080012AC + ldr r4, =0x030008da ldrh r1, [r4] bics r1, r0 strh r1, [r4] - ldr r1, _080012B0 + ldr r1, =0x030008d9 movs r0, 0x1 strb r0, [r1] bl update_hardware_IE @@ -2070,8 +1991,7 @@ disable_irqs: @ 8001288 pop {r0} bx r0 .align 2, 0 -_080012AC: .4byte 0x030008da -_080012B0: .4byte 0x030008d9 + .pool thumb_func_end disable_irqs thumb_func_start dispstat_set_vblank_hblank_irqs @@ -2112,48 +2032,47 @@ _080012EA: gpu_init_bgs: @ 80012F0 push {lr} bl gpu_reset_bg_configs - ldr r1, _08001304 + ldr r1, =0x030008e0 movs r0, 0 strh r0, [r1, 0x10] bl gpu_sync_text_mode_and_hide_bgs pop {r0} bx r0 .align 2, 0 -_08001304: .4byte 0x030008e0 + .pool thumb_func_end gpu_init_bgs thumb_func_start gpu_set_bg_mode gpu_set_bg_mode: @ 8001308 lsls r0, 24 lsrs r0, 24 - ldr r3, _0800131C + ldr r3, =0x030008e0 ldrh r2, [r3, 0x10] - ldr r1, _08001320 + ldr r1, =0x0000fff8 ands r1, r2 orrs r1, r0 strh r1, [r3, 0x10] bx lr .align 2, 0 -_0800131C: .4byte 0x030008e0 -_08001320: .4byte 0x0000fff8 + .pool thumb_func_end gpu_set_bg_mode thumb_func_start gpu_get_bg_mode gpu_get_bg_mode: @ 8001324 - ldr r0, _08001330 + ldr r0, =0x030008e0 ldrb r1, [r0, 0x10] movs r0, 0x7 ands r0, r1 bx lr .align 2, 0 -_08001330: .4byte 0x030008e0 + .pool thumb_func_end gpu_get_bg_mode thumb_func_start gpu_reset_bg_configs gpu_reset_bg_configs: @ 8001334 push {lr} - ldr r2, _0800134C - ldr r0, _08001350 + ldr r2, =0x030008e0 + ldr r0, =0x082e9580 ldr r0, [r0] adds r1, r2, 0 adds r1, 0xC @@ -2165,8 +2084,7 @@ _08001340: pop {r0} bx r0 .align 2, 0 -_0800134C: .4byte 0x030008e0 -_08001350: .4byte 0x082e9580 + .pool thumb_func_end gpu_reset_bg_configs thumb_func_start sub_8001354 @@ -2179,10 +2097,10 @@ sub_8001354: @ 8001354 lsls r0, 24 cmp r0, 0 bne _08001372 - ldr r1, _08001378 + ldr r1, =0x030008e0 lsls r0, r4, 2 adds r0, r1 - ldr r1, _0800137C + ldr r1, =0x082e9580 ldr r1, [r1] str r1, [r0] _08001372: @@ -2190,8 +2108,7 @@ _08001372: pop {r0} bx r0 .align 2, 0 -_08001378: .4byte 0x030008e0 -_0800137C: .4byte 0x082e9580 + .pool thumb_func_end sub_8001354 thumb_func_start gpu_bg_config_set_fields @@ -2238,7 +2155,7 @@ gpu_bg_config_set_fields: @ 8001380 mov r12, r0 cmp r0, 0 bne _08001498 - ldr r2, _080014A8 + ldr r2, =0x030008e0 mov r8, r2 mov r0, r10 cmp r0, 0xFF @@ -2352,7 +2269,7 @@ _08001498: pop {r0} bx r0 .align 2, 0 -_080014A8: .4byte 0x030008e0 + .pool thumb_func_end gpu_bg_config_set_fields thumb_func_start gpu_bg_config_get_field @@ -2367,7 +2284,7 @@ gpu_bg_config_get_field: @ 80014AC lsls r0, 24 cmp r0, 0 bne _08001558 - ldr r1, _080014E4 + ldr r1, =0x030008e0 lsls r2, r4, 2 adds r0, r2, r1 ldrb r0, [r0] @@ -2379,13 +2296,12 @@ gpu_bg_config_get_field: @ 80014AC cmp r0, 0x7 bhi _08001558 lsls r0, 2 - ldr r1, _080014E8 + ldr r1, =_080014EC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080014E4: .4byte 0x030008e0 -_080014E8: .4byte _080014EC + .pool .align 2, 0 _080014EC: .4byte _0800150C @@ -2470,7 +2386,7 @@ gpu_copy_to_vram_by_bg_id: @ 8001560 lsls r0, 24 cmp r0, 0 bne _080015D8 - ldr r1, _080015A0 + ldr r1, =0x030008e0 lsls r0, r4, 2 adds r1, r0, r1 ldrb r0, [r1] @@ -2484,7 +2400,7 @@ gpu_copy_to_vram_by_bg_id: @ 8001560 movs r2, 0xFF b _080015DC .align 2, 0 -_080015A0: .4byte 0x030008e0 + .pool _080015A4: ldrb r0, [r1, 0x1] lsls r0, 30 @@ -2536,7 +2452,7 @@ gpu_bg_show: @ 80015E8 lsls r0, 24 cmp r0, 0 bne _08001656 - ldr r5, _0800165C + ldr r5, =0x030008e0 lsls r0, r4, 2 adds r2, r0, r5 ldrb r3, [r2] @@ -2578,7 +2494,7 @@ gpu_bg_show: @ 80015E8 lsls r0, r1 ldrh r1, [r5, 0x10] orrs r0, r1 - ldr r1, _08001660 + ldr r1, =0x00000f07 ands r0, r1 strh r0, [r5, 0x10] _08001656: @@ -2586,8 +2502,7 @@ _08001656: pop {r0} bx r0 .align 2, 0 -_0800165C: .4byte 0x030008e0 -_08001660: .4byte 0x00000f07 + .pool thumb_func_end gpu_bg_show thumb_func_start gpu_bg_hide @@ -2600,14 +2515,14 @@ gpu_bg_hide: @ 8001664 lsls r0, 24 cmp r0, 0 bne _0800168A - ldr r2, _08001690 + ldr r2, =0x030008e0 adds r0, r4, 0 adds r0, 0x8 movs r1, 0x1 lsls r1, r0 ldrh r0, [r2, 0x10] bics r0, r1 - ldr r1, _08001694 + ldr r1, =0x00000f07 ands r0, r1 strh r0, [r2, 0x10] _0800168A: @@ -2615,8 +2530,7 @@ _0800168A: pop {r0} bx r0 .align 2, 0 -_08001690: .4byte 0x030008e0 -_08001694: .4byte 0x00000f07 + .pool thumb_func_end gpu_bg_hide thumb_func_start gpu_sync_bg_visibility_and_mode @@ -2624,9 +2538,9 @@ gpu_sync_bg_visibility_and_mode: @ 8001698 push {lr} movs r0, 0 bl lcd_io_get - ldr r1, _080016B4 + ldr r1, =0x0000f0f8 ands r1, r0 - ldr r0, _080016B8 + ldr r0, =0x030008e0 ldrh r0, [r0, 0x10] orrs r1, r0 movs r0, 0 @@ -2634,8 +2548,7 @@ gpu_sync_bg_visibility_and_mode: @ 8001698 pop {r0} bx r0 .align 2, 0 -_080016B4: .4byte 0x0000f0f8 -_080016B8: .4byte 0x030008e0 + .pool thumb_func_end gpu_sync_bg_visibility_and_mode thumb_func_start gpu_sync_text_mode_and_hide_bgs @@ -2643,14 +2556,14 @@ gpu_sync_text_mode_and_hide_bgs: @ 80016BC push {lr} movs r0, 0 bl lcd_io_get - ldr r1, _080016D4 + ldr r1, =0x0000f0f8 ands r1, r0 movs r0, 0 bl lcd_io_set pop {r0} bx r0 .align 2, 0 -_080016D4: .4byte 0x0000f0f8 + .pool thumb_func_end gpu_sync_text_mode_and_hide_bgs thumb_func_start gpu_bg_affine_set @@ -2677,7 +2590,7 @@ gpu_bg_affine_set: @ 80016D8 lsrs r4, 16 lsls r5, 16 lsrs r5, 16 - ldr r0, _0800171C + ldr r0, =0x030008e0 ldrh r0, [r0, 0x10] movs r1, 0x7 ands r1, r0 @@ -2689,7 +2602,7 @@ gpu_bg_affine_set: @ 80016D8 beq _08001726 b _08001796 .align 2, 0 -_0800171C: .4byte 0x030008e0 + .pool _08001720: cmp r6, 0x2 bne _08001796 @@ -2778,7 +2691,7 @@ gpu_reset_bgs_and_dma3_busy_flags: @ 80017BC push {r4,lr} adds r4, r0, 0 bl gpu_init_bgs - ldr r1, _080017E0 + ldr r1, =0x03000938 movs r2, 0 adds r0, r1, 0 adds r0, 0xC @@ -2787,14 +2700,13 @@ _080017CC: subs r0, 0x4 cmp r0, r1 bge _080017CC - ldr r0, _080017E4 + ldr r0, =0x03002f54 str r4, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080017E0: .4byte 0x03000938 -_080017E4: .4byte 0x03002f54 + .pool thumb_func_end gpu_reset_bgs_and_dma3_busy_flags thumb_func_start bg_vram_setup @@ -2815,7 +2727,7 @@ bg_vram_setup: @ 80017E8 cmp r4, 0 beq _08001894 movs r7, 0 - ldr r0, _080018A4 + ldr r0, =0x030008f8 mov r9, r0 movs r2, 0xC add r2, r9 @@ -2851,7 +2763,7 @@ _0800181A: lsls r2, 8 lsrs r2, 22 ldrh r0, [r3] - ldr r5, _080018A8 + ldr r5, =0xfffffc00 adds r1, r5, 0 ands r0, r1 orrs r0, r2 @@ -2863,7 +2775,7 @@ _0800181A: ands r0, r1 strb r0, [r3, 0x1] ldr r0, [r3] - ldr r1, _080018AC + ldr r1, =0x00003fff ands r0, r1 str r0, [r3] mov r0, r9 @@ -2894,9 +2806,7 @@ _08001894: pop {r0} bx r0 .align 2, 0 -_080018A4: .4byte 0x030008f8 -_080018A8: .4byte 0xfffffc00 -_080018AC: .4byte 0x00003fff + .pool thumb_func_end bg_vram_setup thumb_func_start bg_init_bg_config_2_from_bg_config_3 @@ -2926,14 +2836,14 @@ bg_init_bg_config_2_from_bg_config_3: @ 80018B0 str r6, [sp, 0xC] adds r0, r5, 0 bl gpu_bg_config_set_fields - ldr r4, _08001928 + ldr r4, =0x030008f8 lsls r5, 4 adds r3, r5, r4 ldr r1, [r7] lsls r1, 8 lsrs r1, 22 ldrh r2, [r3] - ldr r0, _0800192C + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3] @@ -2943,7 +2853,7 @@ bg_init_bg_config_2_from_bg_config_3: @ 80018B0 ands r0, r1 strb r0, [r3, 0x1] ldr r0, [r3] - ldr r1, _08001930 + ldr r1, =0x00003fff ands r0, r1 str r0, [r3] adds r0, r4, 0x4 @@ -2962,9 +2872,7 @@ _08001920: pop {r0} bx r0 .align 2, 0 -_08001928: .4byte 0x030008f8 -_0800192C: .4byte 0xfffffc00 -_08001930: .4byte 0x00003fff + .pool thumb_func_end bg_init_bg_config_2_from_bg_config_3 thumb_func_start call_gpu_set_bg_mode @@ -2997,7 +2905,7 @@ gpu_copy_bg_tile_pattern_data_to_vram: @ 8001944 lsls r0, 16 cmp r0, 0 bne _08001980 - ldr r1, _0800197C + ldr r1, =0x030008f8 lsls r0, r5, 4 adds r0, r1 ldrh r0, [r0] @@ -3007,9 +2915,9 @@ gpu_copy_bg_tile_pattern_data_to_vram: @ 8001944 lsls r0, 21 b _08001990 .align 2, 0 -_0800197C: .4byte 0x030008f8 + .pool _08001980: - ldr r1, _080019B0 + ldr r1, =0x030008f8 lsls r0, r5, 4 adds r0, r1 ldrh r0, [r0] @@ -3031,13 +2939,12 @@ _08001990: adds r7, r1, 0 cmp r1, 0xFF bne _080019B8 - ldr r0, _080019B4 + ldr r0, =0x0000ffff b _080019E6 .align 2, 0 -_080019B0: .4byte 0x030008f8 -_080019B4: .4byte 0x0000ffff + .pool _080019B8: - ldr r0, _080019F4 + ldr r0, =0x03000938 lsrs r2, 29 lsls r2, 2 adds r2, r0 @@ -3048,7 +2955,7 @@ _080019B8: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r0, _080019F8 + ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 bne _080019E4 @@ -3068,8 +2975,7 @@ _080019E6: pop {r1} bx r1 .align 2, 0 -_080019F4: .4byte 0x03000938 -_080019F8: .4byte 0x03002f54 + .pool thumb_func_end gpu_copy_bg_tile_pattern_data_to_vram thumb_func_start gpu_copy_bg_tile_map_to_vram @@ -3089,7 +2995,7 @@ gpu_copy_bg_tile_map_to_vram: @ 80019FC lsrs r3, r2, 24 cmp r3, 0xFF beq _08001A3C - ldr r0, _08001A38 + ldr r0, =0x03000938 lsrs r2, 29 lsls r2, 2 adds r2, r0 @@ -3103,16 +3009,16 @@ gpu_copy_bg_tile_map_to_vram: @ 80019FC adds r0, r3, 0 b _08001A3E .align 2, 0 -_08001A38: .4byte 0x03000938 + .pool _08001A3C: - ldr r0, _08001A48 + ldr r0, =0x0000ffff _08001A3E: add sp, 0x4 pop {r4} pop {r1} bx r1 .align 2, 0 -_08001A48: .4byte 0x0000ffff + .pool thumb_func_end gpu_copy_bg_tile_map_to_vram thumb_func_start unused_copy_palette @@ -3129,7 +3035,7 @@ unused_copy_palette: @ 8001A4C bl is_invalid_bg_id_2 cmp r0, 0 bne _08001A98 - ldr r1, _08001A9C + ldr r1, =0x030008f8 lsls r0, r4, 4 adds r0, r1 ldrb r1, [r0, 0x1] @@ -3154,13 +3060,12 @@ unused_copy_palette: @ 8001A4C cmp r1, r0 bne _08001AA4 _08001A98: - ldr r0, _08001AA0 + ldr r0, =0x0000ffff b _08001AC8 .align 2, 0 -_08001A9C: .4byte 0x030008f8 -_08001AA0: .4byte 0x0000ffff + .pool _08001AA4: - ldr r4, _08001AD0 + ldr r4, =0x03000938 adds r0, r1, 0 cmp r1, 0 bge _08001AAE @@ -3184,7 +3089,7 @@ _08001AC8: pop {r1} bx r1 .align 2, 0 -_08001AD0: .4byte 0x03000938 + .pool thumb_func_end unused_copy_palette thumb_func_start is_dma3_queue_busy_with_gpu_copy @@ -3205,7 +3110,7 @@ _08001AE4: subs r0, r5, r0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08001B18 + ldr r1, =0x03000938 lsrs r2, 22 adds r4, r2, r1 movs r6, 0x1 @@ -3224,7 +3129,7 @@ _08001AE4: movs r0, 0x1 b _08001B2A .align 2, 0 -_08001B18: .4byte 0x03000938 + .pool _08001B1C: ldr r0, [r4] bics r0, r6 @@ -3276,12 +3181,12 @@ gpu_bg_config_set_field: @ 8001B58 cmp r0, 0x6 bhi _08001C12 lsls r0, 2 - ldr r1, _08001B78 + ldr r1, =_08001B7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08001B78: .4byte _08001B7C + .pool .align 2, 0 _08001B7C: .4byte _08001B98 @@ -3377,12 +3282,12 @@ bg_get_field: @ 8001C1C cmp r0, 0x9 bhi _08001CF8 lsls r0, 2 - ldr r1, _08001C38 + ldr r1, =_08001C3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08001C38: .4byte _08001C3C + .pool .align 2, 0 _08001C3C: .4byte _08001C64 @@ -3461,7 +3366,7 @@ _08001CDE: lsrs r0, 16 b _08001CFA _08001CE4: - ldr r0, _08001CF4 + ldr r0, =0x030008f8 lsls r1, r4, 4 adds r1, r0 ldrh r0, [r1] @@ -3469,15 +3374,15 @@ _08001CE4: lsrs r0, 22 b _08001CFA .align 2, 0 -_08001CF4: .4byte 0x030008f8 + .pool _08001CF8: - ldr r0, _08001D00 + ldr r0, =0x0000ffff _08001CFA: pop {r4} pop {r1} bx r1 .align 2, 0 -_08001D00: .4byte 0x0000ffff + .pool thumb_func_end bg_get_field thumb_func_start bg_change_x_offset @@ -3510,7 +3415,7 @@ _08001D2E: cmp r5, 0x2 beq _08001D60 _08001D3A: - ldr r0, _08001D48 + ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x8 adds r0, r1, r0 @@ -3518,9 +3423,9 @@ _08001D3A: adds r5, r1, 0 b _08001D70 .align 2, 0 -_08001D48: .4byte 0x030008f8 + .pool _08001D4C: - ldr r0, _08001D5C + ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0x8 adds r0, r2, r0 @@ -3528,9 +3433,9 @@ _08001D4C: adds r1, r6 b _08001D6C .align 2, 0 -_08001D5C: .4byte 0x030008f8 + .pool _08001D60: - ldr r0, _08001D88 + ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0x8 adds r0, r2, r0 @@ -3551,7 +3456,7 @@ _08001D70: beq _08001D96 b _08001E2C .align 2, 0 -_08001D88: .4byte 0x030008f8 + .pool _08001D8C: cmp r4, 0x2 beq _08001DC0 @@ -3559,7 +3464,7 @@ _08001D8C: beq _08001DF8 b _08001E2C _08001D96: - ldr r0, _08001DA8 + ldr r0, =0x030008f8 ldr r0, [r0, 0x8] lsls r0, 8 lsrs r1, r0, 16 @@ -3567,9 +3472,9 @@ _08001D96: bl lcd_io_set b _08001E2C .align 2, 0 -_08001DA8: .4byte 0x030008f8 + .pool _08001DAC: - ldr r0, _08001DBC + ldr r0, =0x030008f8 ldr r0, [r0, 0x18] lsls r0, 8 lsrs r1, r0, 16 @@ -3577,11 +3482,11 @@ _08001DAC: bl lcd_io_set b _08001E2C .align 2, 0 -_08001DBC: .4byte 0x030008f8 + .pool _08001DC0: cmp r0, 0 bne _08001DD8 - ldr r0, _08001DD4 + ldr r0, =0x030008f8 ldr r0, [r0, 0x28] lsls r0, 8 lsrs r1, r0, 16 @@ -3589,9 +3494,9 @@ _08001DC0: bl lcd_io_set b _08001E2C .align 2, 0 -_08001DD4: .4byte 0x030008f8 + .pool _08001DD8: - ldr r0, _08001DF4 + ldr r0, =0x030008f8 ldr r0, [r0, 0x28] lsrs r1, r0, 16 lsls r0, 16 @@ -3603,11 +3508,11 @@ _08001DD8: bl lcd_io_set b _08001E2C .align 2, 0 -_08001DF4: .4byte 0x030008f8 + .pool _08001DF8: cmp r0, 0 bne _08001E10 - ldr r0, _08001E0C + ldr r0, =0x030008f8 ldr r0, [r0, 0x38] lsls r0, 8 lsrs r1, r0, 16 @@ -3615,11 +3520,11 @@ _08001DF8: bl lcd_io_set b _08001E2C .align 2, 0 -_08001E0C: .4byte 0x030008f8 + .pool _08001E10: cmp r0, 0x2 bne _08001E2C - ldr r0, _08001E3C + ldr r0, =0x030008f8 ldr r0, [r0, 0x38] lsrs r1, r0, 16 lsls r0, 16 @@ -3630,7 +3535,7 @@ _08001E10: adds r1, r4, 0 bl lcd_io_set _08001E2C: - ldr r0, _08001E3C + ldr r0, =0x030008f8 adds r0, 0x8 adds r0, r5, r0 ldr r0, [r0] @@ -3639,7 +3544,7 @@ _08001E34: pop {r1} bx r1 .align 2, 0 -_08001E3C: .4byte 0x030008f8 + .pool thumb_func_end bg_change_x_offset thumb_func_start bg_get_x_offset @@ -3657,14 +3562,14 @@ bg_get_x_offset: @ 8001E40 lsls r0, 16 cmp r0, 0 beq _08001E70 - ldr r0, _08001E6C + ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x8 adds r1, r0 ldr r0, [r1] b _08001E74 .align 2, 0 -_08001E6C: .4byte 0x030008f8 + .pool _08001E70: movs r0, 0x1 negs r0, r0 @@ -3704,7 +3609,7 @@ _08001EA6: cmp r5, 0x2 beq _08001ED8 _08001EB2: - ldr r0, _08001EC0 + ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0xC adds r0, r1, r0 @@ -3712,9 +3617,9 @@ _08001EB2: adds r5, r1, 0 b _08001EE8 .align 2, 0 -_08001EC0: .4byte 0x030008f8 + .pool _08001EC4: - ldr r0, _08001ED4 + ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0xC adds r0, r2, r0 @@ -3722,9 +3627,9 @@ _08001EC4: adds r1, r6 b _08001EE4 .align 2, 0 -_08001ED4: .4byte 0x030008f8 + .pool _08001ED8: - ldr r0, _08001F00 + ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0xC adds r0, r2, r0 @@ -3745,7 +3650,7 @@ _08001EE8: beq _08001F0E b _08001FA4 .align 2, 0 -_08001F00: .4byte 0x030008f8 + .pool _08001F04: cmp r4, 0x2 beq _08001F38 @@ -3753,7 +3658,7 @@ _08001F04: beq _08001F70 b _08001FA4 _08001F0E: - ldr r0, _08001F20 + ldr r0, =0x030008f8 ldr r0, [r0, 0xC] lsls r0, 8 lsrs r1, r0, 16 @@ -3761,9 +3666,9 @@ _08001F0E: bl lcd_io_set b _08001FA4 .align 2, 0 -_08001F20: .4byte 0x030008f8 + .pool _08001F24: - ldr r0, _08001F34 + ldr r0, =0x030008f8 ldr r0, [r0, 0x1C] lsls r0, 8 lsrs r1, r0, 16 @@ -3771,11 +3676,11 @@ _08001F24: bl lcd_io_set b _08001FA4 .align 2, 0 -_08001F34: .4byte 0x030008f8 + .pool _08001F38: cmp r0, 0 bne _08001F50 - ldr r0, _08001F4C + ldr r0, =0x030008f8 ldr r0, [r0, 0x2C] lsls r0, 8 lsrs r1, r0, 16 @@ -3783,9 +3688,9 @@ _08001F38: bl lcd_io_set b _08001FA4 .align 2, 0 -_08001F4C: .4byte 0x030008f8 + .pool _08001F50: - ldr r0, _08001F6C + ldr r0, =0x030008f8 ldr r0, [r0, 0x2C] lsrs r1, r0, 16 lsls r0, 16 @@ -3797,11 +3702,11 @@ _08001F50: bl lcd_io_set b _08001FA4 .align 2, 0 -_08001F6C: .4byte 0x030008f8 + .pool _08001F70: cmp r0, 0 bne _08001F88 - ldr r0, _08001F84 + ldr r0, =0x030008f8 ldr r0, [r0, 0x3C] lsls r0, 8 lsrs r1, r0, 16 @@ -3809,11 +3714,11 @@ _08001F70: bl lcd_io_set b _08001FA4 .align 2, 0 -_08001F84: .4byte 0x030008f8 + .pool _08001F88: cmp r0, 0x2 bne _08001FA4 - ldr r0, _08001FB4 + ldr r0, =0x030008f8 ldr r0, [r0, 0x3C] lsrs r1, r0, 16 lsls r0, 16 @@ -3824,7 +3729,7 @@ _08001F88: adds r1, r4, 0 bl lcd_io_set _08001FA4: - ldr r0, _08001FB4 + ldr r0, =0x030008f8 adds r0, 0xC adds r0, r5, r0 ldr r0, [r0] @@ -3833,7 +3738,7 @@ _08001FAC: pop {r1} bx r1 .align 2, 0 -_08001FB4: .4byte 0x030008f8 + .pool thumb_func_end bg_change_y_offset thumb_func_start bg_change_y_offset_to_copy_queue @@ -3866,7 +3771,7 @@ _08001FE2: cmp r5, 0x2 beq _08002014 _08001FEE: - ldr r0, _08001FFC + ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0xC adds r0, r1, r0 @@ -3874,9 +3779,9 @@ _08001FEE: adds r5, r1, 0 b _08002024 .align 2, 0 -_08001FFC: .4byte 0x030008f8 + .pool _08002000: - ldr r0, _08002010 + ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0xC adds r0, r2, r0 @@ -3884,9 +3789,9 @@ _08002000: adds r1, r6 b _08002020 .align 2, 0 -_08002010: .4byte 0x030008f8 + .pool _08002014: - ldr r0, _0800203C + ldr r0, =0x030008f8 lsls r2, r4, 4 adds r0, 0xC adds r0, r2, r0 @@ -3907,7 +3812,7 @@ _08002024: beq _0800204A b _080020E0 .align 2, 0 -_0800203C: .4byte 0x030008f8 + .pool _08002040: cmp r4, 0x2 beq _08002074 @@ -3915,7 +3820,7 @@ _08002040: beq _080020AC b _080020E0 _0800204A: - ldr r0, _0800205C + ldr r0, =0x030008f8 ldr r0, [r0, 0xC] lsls r0, 8 lsrs r1, r0, 16 @@ -3923,9 +3828,9 @@ _0800204A: bl lcd_io_set_forced_blank b _080020E0 .align 2, 0 -_0800205C: .4byte 0x030008f8 + .pool _08002060: - ldr r0, _08002070 + ldr r0, =0x030008f8 ldr r0, [r0, 0x1C] lsls r0, 8 lsrs r1, r0, 16 @@ -3933,11 +3838,11 @@ _08002060: bl lcd_io_set_forced_blank b _080020E0 .align 2, 0 -_08002070: .4byte 0x030008f8 + .pool _08002074: cmp r0, 0 bne _0800208C - ldr r0, _08002088 + ldr r0, =0x030008f8 ldr r0, [r0, 0x2C] lsls r0, 8 lsrs r1, r0, 16 @@ -3945,9 +3850,9 @@ _08002074: bl lcd_io_set_forced_blank b _080020E0 .align 2, 0 -_08002088: .4byte 0x030008f8 + .pool _0800208C: - ldr r0, _080020A8 + ldr r0, =0x030008f8 ldr r0, [r0, 0x2C] lsrs r1, r0, 16 lsls r0, 16 @@ -3959,11 +3864,11 @@ _0800208C: bl lcd_io_set_forced_blank b _080020E0 .align 2, 0 -_080020A8: .4byte 0x030008f8 + .pool _080020AC: cmp r0, 0 bne _080020C4 - ldr r0, _080020C0 + ldr r0, =0x030008f8 ldr r0, [r0, 0x3C] lsls r0, 8 lsrs r1, r0, 16 @@ -3971,11 +3876,11 @@ _080020AC: bl lcd_io_set_forced_blank b _080020E0 .align 2, 0 -_080020C0: .4byte 0x030008f8 + .pool _080020C4: cmp r0, 0x2 bne _080020E0 - ldr r0, _080020F0 + ldr r0, =0x030008f8 ldr r0, [r0, 0x3C] lsrs r1, r0, 16 lsls r0, 16 @@ -3986,7 +3891,7 @@ _080020C4: adds r1, r4, 0 bl lcd_io_set_forced_blank _080020E0: - ldr r0, _080020F0 + ldr r0, =0x030008f8 adds r0, 0xC adds r0, r5, r0 ldr r0, [r0] @@ -3995,7 +3900,7 @@ _080020E8: pop {r1} bx r1 .align 2, 0 -_080020F0: .4byte 0x030008f8 + .pool thumb_func_end bg_change_y_offset_to_copy_queue thumb_func_start bg_get_y_offset @@ -4013,14 +3918,14 @@ bg_get_y_offset: @ 80020F4 lsls r0, 16 cmp r0, 0 beq _08002124 - ldr r0, _08002120 + ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0xC adds r1, r0 ldr r0, [r1] b _08002128 .align 2, 0 -_08002120: .4byte 0x030008f8 + .pool _08002124: movs r0, 0x1 negs r0, r0 @@ -4087,12 +3992,12 @@ mosaic_something: @ 8002170 cmp r6, 0x6 bhi _080021C4 lsls r0, r6, 2 - ldr r1, _080021A4 + ldr r1, =_080021A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080021A4: .4byte _080021A8 + .pool .align 2, 0 _080021A8: .4byte _080021C4 @@ -4203,7 +4108,7 @@ bg_set_tilemap: @ 8002250 lsls r0, 16 cmp r0, 0 beq _0800227A - ldr r0, _08002280 + ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x4 adds r1, r0 @@ -4213,7 +4118,7 @@ _0800227A: pop {r0} bx r0 .align 2, 0 -_08002280: .4byte 0x030008f8 + .pool thumb_func_end bg_set_tilemap thumb_func_start bg_unset_tilemap @@ -4232,7 +4137,7 @@ bg_unset_tilemap: @ 8002284 lsls r0, 16 cmp r0, 0 beq _080022AE - ldr r0, _080022B4 + ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x4 adds r1, r0 @@ -4242,7 +4147,7 @@ _080022AE: pop {r0} bx r0 .align 2, 0 -_080022B4: .4byte 0x030008f8 + .pool thumb_func_end bg_unset_tilemap thumb_func_start bg_get_tilemap @@ -4260,14 +4165,14 @@ bg_get_tilemap: @ 80022B8 lsls r0, 16 cmp r0, 0 beq _080022E8 - ldr r0, _080022E4 + ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x4 adds r1, r0 ldr r0, [r1] b _080022EA .align 2, 0 -_080022E4: .4byte 0x030008f8 + .pool _080022E8: movs r0, 0 _080022EA: @@ -4302,7 +4207,7 @@ gpu_copy_to_wram_bg_tile_map: @ 80022F0 bne _08002358 cmp r6, 0 beq _08002340 - ldr r0, _0800233C + ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x4 adds r1, r0 @@ -4314,9 +4219,9 @@ gpu_copy_to_wram_bg_tile_map: @ 80022F0 bl CpuSet b _08002358 .align 2, 0 -_0800233C: .4byte 0x030008f8 + .pool _08002340: - ldr r0, _08002368 + ldr r0, =0x030008f8 mov r2, r9 lsls r1, r2, 4 adds r0, 0x4 @@ -4336,7 +4241,7 @@ _08002358: pop {r0} bx r0 .align 2, 0 -_08002368: .4byte 0x030008f8 + .pool thumb_func_end gpu_copy_to_wram_bg_tile_map thumb_func_start gpu_copy_wram_bg_tilemap_to_vram @@ -4375,7 +4280,7 @@ _080023A6: _080023B0: lsrs r2, r0, 16 _080023B2: - ldr r0, _080023D0 + ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x4 adds r1, r0 @@ -4391,7 +4296,7 @@ _080023C8: pop {r0} bx r0 .align 2, 0 -_080023D0: .4byte 0x030008f8 + .pool thumb_func_end gpu_copy_wram_bg_tilemap_to_vram thumb_func_start gpu_copy_to_iwram_tile_map_rect @@ -4440,7 +4345,7 @@ _08002422: bge _080024C4 mov r12, r0 lsls r1, r5, 4 - ldr r0, _0800246C + ldr r0, =0x030008fc adds r1, r0 mov r8, r1 _08002436: @@ -4473,7 +4378,7 @@ _08002460: blt _08002436 b _080024C4 .align 2, 0 -_0800246C: .4byte 0x030008fc + .pool _08002470: mov r4, r8 adds r0, r5, 0 @@ -4496,7 +4401,7 @@ _0800248E: adds r7, r3, 0x1 cmp r2, r0 bge _080024BC - ldr r6, _080024D4 + ldr r6, =0x030008fc add r6, r8 ldr r1, [sp] adds r5, r3, 0 @@ -4529,7 +4434,7 @@ _080024C4: pop {r0} bx r0 .align 2, 0 -_080024D4: .4byte 0x030008fc + .pool thumb_func_end gpu_copy_to_iwram_tile_map_rect thumb_func_start bg_copy_tilemap_rect_simple @@ -4689,7 +4594,7 @@ _080025F8: bge _0800265A ldr r2, [sp, 0x4] lsls r0, r2, 4 - ldr r1, _08002670 + ldr r1, =0x030008fc adds r0, r1 mov r10, r0 ldr r7, [sp, 0x20] @@ -4740,7 +4645,7 @@ _0800265A: blt _080025F8 b _080026EE .align 2, 0 -_08002670: .4byte 0x030008fc + .pool _08002674: ldr r1, [sp, 0x10] adds r0, r1, 0 @@ -4762,7 +4667,7 @@ _08002674: subs r2, r7, r2 str r2, [sp, 0x34] str r0, [sp, 0x38] - ldr r7, _08002700 + ldr r7, =0x030008fc mov r10, r7 ldr r0, [sp, 0x4] lsls r0, 4 @@ -4815,7 +4720,7 @@ _080026EE: pop {r0} bx r0 .align 2, 0 -_08002700: .4byte 0x030008fc + .pool thumb_func_end bg_copy_tilemap_rect thumb_func_start bg_fill_tilemap_rect @@ -4865,7 +4770,7 @@ _08002756: bge _080027F0 adds r7, r5, 0 lsls r1, r6, 4 - ldr r0, _0800279C + ldr r0, =0x030008fc adds r1, r0 mov r12, r1 _08002768: @@ -4897,7 +4802,7 @@ _08002790: blt _08002768 b _080027F0 .align 2, 0 -_0800279C: .4byte 0x030008fc + .pool _080027A0: adds r0, r6, 0 movs r1, 0x1 @@ -4919,7 +4824,7 @@ _080027BC: adds r6, r3, 0x1 cmp r2, r0 bge _080027E8 - ldr r5, _08002800 + ldr r5, =0x030008fc add r5, r12 ldr r1, [sp] adds r4, r3, 0 @@ -4951,7 +4856,7 @@ _080027F0: pop {r0} bx r0 .align 2, 0 -_08002800: .4byte 0x030008fc + .pool thumb_func_end bg_fill_tilemap_rect thumb_func_start Bg_FillWramTileMapRectWithTileAndPalette @@ -5076,7 +4981,7 @@ _080028E0: bge _08002944 mov r3, r9 lsls r1, r3, 4 - ldr r0, _08002954 + ldr r0, =0x030008fc adds r6, r1, r0 _080028F6: ldr r0, [sp, 0x18] @@ -5104,7 +5009,7 @@ _080028F6: ands r2, r1 ldr r3, [sp, 0x10] adds r0, r3 - ldr r3, _08002958 + ldr r3, =0x000003ff adds r1, r3, 0 ands r0, r1 adds r2, r0 @@ -5125,8 +5030,7 @@ _08002944: blt _080028E0 b _080029D4 .align 2, 0 -_08002954: .4byte 0x030008fc -_08002958: .4byte 0x000003ff + .pool _0800295C: mov r0, r9 movs r1, 0x1 @@ -5150,7 +5054,7 @@ _0800297A: mov r8, r1 cmp r4, r0 bge _080029C8 - ldr r2, _080029E4 + ldr r2, =0x030008fc add r2, r12 str r2, [sp, 0x28] ldr r7, [sp, 0x20] @@ -5160,7 +5064,7 @@ _0800297A: movs r1, 0xFC lsls r1, 8 mov r9, r1 - ldr r7, _080029E8 + ldr r7, =0x000003ff adds r5, r7, 0 adds r6, r0, 0 _080029A2: @@ -5200,8 +5104,7 @@ _080029D4: pop {r0} bx r0 .align 2, 0 -_080029E4: .4byte 0x030008fc -_080029E8: .4byte 0x000003ff + .pool thumb_func_end bg_write_sequence_to_wram_tile_map_rect thumb_func_start bg_get_screen_size_in_regular_mode @@ -5375,14 +5278,14 @@ bg_copy_tilemap_entry_not_rotscale_mode: @ 8002AEC blt _08002B34 ldrh r0, [r4] adds r0, r3 - ldr r3, _08002B10 + ldr r3, =0x00000fff adds r1, r3, 0 ands r0, r1 adds r1, r2, r5 lsls r1, 12 b _08002B3A .align 2, 0 -_08002B10: .4byte 0x00000fff + .pool _08002B14: ldrh r1, [r6] movs r0, 0xFC @@ -5392,13 +5295,13 @@ _08002B14: adds r2, r1, r2 ldrh r0, [r4] adds r0, r3 - ldr r3, _08002B30 + ldr r3, =0x000003ff adds r1, r3, 0 ands r0, r1 orrs r0, r2 b _08002B3C .align 2, 0 -_08002B30: .4byte 0x000003ff + .pool _08002B34: ldrh r0, [r4] adds r0, r3 @@ -5456,13 +5359,13 @@ _08002B86: cmp r0, 0x2 beq _08002B82 _08002B8E: - ldr r0, _08002B98 + ldr r0, =0x0000ffff _08002B90: pop {r4,r5} pop {r1} bx r1 .align 2, 0 -_08002B98: .4byte 0x0000ffff + .pool thumb_func_end bg_get_type_by_bg_id thumb_func_start is_invalid_bg_id_2 @@ -5485,12 +5388,12 @@ _08002BAC: IsTileMapOutsideWram: @ 8002BB0 push {lr} lsls r0, 24 - ldr r1, _08002BCC + ldr r1, =0x030008f8 lsrs r0, 20 adds r1, 0x4 adds r0, r1 ldr r1, [r0] - ldr r0, _08002BD0 + ldr r0, =0x03008000 cmp r1, r0 bhi _08002BD4 cmp r1, 0 @@ -5498,8 +5401,7 @@ IsTileMapOutsideWram: @ 8002BB0 movs r0, 0 b _08002BD6 .align 2, 0 -_08002BCC: .4byte 0x030008f8 -_08002BD0: .4byte 0x03008000 + .pool _08002BD4: movs r0, 0x1 _08002BD6: @@ -6333,7 +6235,7 @@ Window_InitFromTemplates: @ 80031C0 adds r5, r0, 0 movs r0, 0 mov r8, r0 - ldr r4, _08003254 + ldr r4, =0x03002f70 _080031D4: mov r1, r8 lsls r0, r1, 24 @@ -6341,7 +6243,7 @@ _080031D4: bl bg_get_tilemap cmp r0, 0 beq _080031E4 - ldr r0, _08003258 + ldr r0, =nullsub_8 + 1 _080031E4: str r0, [r4] adds r4, 0x4 @@ -6350,10 +6252,10 @@ _080031E4: mov r0, r8 cmp r0, 0x3 ble _080031D4 - ldr r0, _0800325C + ldr r0, =0x082e9584 ldr r2, [r0] ldr r3, [r0, 0x4] - ldr r1, _08003260 + ldr r1, =0x02020004 movs r0, 0 movs r4, 0x1F mov r8, r4 @@ -6381,7 +6283,7 @@ _08003224: movs r2, 0 str r2, [sp, 0x4] _0800322A: - ldr r0, _08003264 + ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 bne _08003268 @@ -6403,13 +6305,9 @@ _08003250: movs r0, 0 b _08003364 .align 2, 0 -_08003254: .4byte 0x03002f70 -_08003258: .4byte nullsub_8 + 1 -_0800325C: .4byte 0x082e9584 -_08003260: .4byte 0x02020004 -_08003264: .4byte 0x03002f54 + .pool _08003268: - ldr r0, _080032A0 + ldr r0, =0x03002f70 mov r9, r0 lsls r0, r7, 2 mov r2, r9 @@ -6423,7 +6321,7 @@ _08003268: bl bg_get_field lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _080032A4 + ldr r0, =0x0000ffff cmp r5, r0 beq _080032CA adds r0, r5, 0 @@ -6434,8 +6332,7 @@ _08003268: bl Window_FreeMemory b _08003250 .align 2, 0 -_080032A0: .4byte 0x03002f70 -_080032A4: .4byte 0x0000ffff + .pool _080032A8: movs r1, 0 mov r3, r9 @@ -6470,11 +6367,11 @@ _080032CA: lsls r0, 24 cmp r0, 0 bne _08003250 - ldr r0, _08003304 + ldr r0, =0x03002f70 mov r2, r10 adds r5, r2, r0 ldr r1, [r5] - ldr r0, _08003308 + ldr r0, =nullsub_8 + 1 cmp r1, r0 beq _08003250 adds r0, r1, 0 @@ -6482,10 +6379,9 @@ _080032CA: str r4, [r5] b _08003250 .align 2, 0 -_08003304: .4byte 0x03002f70 -_08003308: .4byte nullsub_8 + 1 + .pool _0800330C: - ldr r1, _08003374 + ldr r1, =0x02020004 adds r0, r1, 0 adds r0, 0x8 ldr r2, [sp, 0x4] @@ -6496,7 +6392,7 @@ _0800330C: ldr r1, [r6, 0x4] str r0, [r2] str r1, [r2, 0x4] - ldr r0, _08003378 + ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 bne _08003342 @@ -6526,7 +6422,7 @@ _08003342: bgt _0800335C b _0800322A _0800335C: - ldr r1, _0800337C + ldr r1, =0x03002f60 movs r0, 0 strb r0, [r1] movs r0, 0x1 @@ -6540,9 +6436,7 @@ _08003364: pop {r1} bx r1 .align 2, 0 -_08003374: .4byte 0x02020004 -_08003378: .4byte 0x03002f54 -_0800337C: .4byte 0x03002f60 + .pool thumb_func_end Window_InitFromTemplates thumb_func_start Window_AddFromTemplate @@ -6555,7 +6449,7 @@ Window_AddFromTemplate: @ 8003380 sub sp, 0x4 mov r8, r0 movs r6, 0 - ldr r1, _08003470 + ldr r1, =0x02020004 ldrb r0, [r1] cmp r0, 0xFF beq _080033B0 @@ -6579,7 +6473,7 @@ _080033B0: ldrb r7, [r0] movs r1, 0 mov r9, r1 - ldr r0, _08003474 + ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 bne _080033E2 @@ -6598,7 +6492,7 @@ _080033B0: cmp r9, r0 beq _0800346A _080033E2: - ldr r3, _08003478 + ldr r3, =0x03002f70 mov r10, r3 lsls r0, r7, 2 adds r1, r0, r3 @@ -6611,7 +6505,7 @@ _080033E2: bl bg_get_field lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _0800347C + ldr r0, =0x0000ffff cmp r5, r0 beq _08003432 adds r0, r5, 0 @@ -6653,11 +6547,11 @@ _08003432: lsls r0, 24 cmp r0, 0 bne _0800346A - ldr r0, _08003478 + ldr r0, =0x03002f70 ldr r3, [sp] adds r5, r3, r0 ldr r1, [r5] - ldr r0, _08003480 + ldr r0, =nullsub_8 + 1 cmp r1, r0 beq _0800346A adds r0, r1, 0 @@ -6667,13 +6561,9 @@ _0800346A: movs r0, 0xFF b _080034C0 .align 2, 0 -_08003470: .4byte 0x02020004 -_08003474: .4byte 0x03002f54 -_08003478: .4byte 0x03002f70 -_0800347C: .4byte 0x0000ffff -_08003480: .4byte nullsub_8 + 1 + .pool _08003484: - ldr r2, _080034D0 + ldr r2, =0x02020004 lsls r1, r6, 1 adds r1, r6 lsls r1, 2 @@ -6687,7 +6577,7 @@ _08003484: ldr r1, [r3, 0x4] str r0, [r2] str r1, [r2, 0x4] - ldr r0, _080034D4 + ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 bne _080034BE @@ -6713,8 +6603,7 @@ _080034C0: pop {r1} bx r1 .align 2, 0 -_080034D0: .4byte 0x02020004 -_080034D4: .4byte 0x03002f54 + .pool thumb_func_end Window_AddFromTemplate thumb_func_start Window_AddFromTemplateWithoutAllocatingMemory @@ -6722,7 +6611,7 @@ Window_AddFromTemplateWithoutAllocatingMemory: @ 80034D8 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 - ldr r1, _0800352C + ldr r1, =0x02020004 ldrb r0, [r1] cmp r0, 0xFF beq _080034FE @@ -6744,7 +6633,7 @@ _080034FE: beq _08003528 ldrb r6, [r5] movs r3, 0 - ldr r0, _08003530 + ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 bne _08003534 @@ -6764,10 +6653,9 @@ _08003528: movs r0, 0xFF b _08003564 .align 2, 0 -_0800352C: .4byte 0x02020004 -_08003530: .4byte 0x03002f54 + .pool _08003534: - ldr r1, _0800356C + ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -6776,7 +6664,7 @@ _08003534: ldr r1, [r5, 0x4] str r0, [r2] str r1, [r2, 0x4] - ldr r0, _08003570 + ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 bne _08003562 @@ -6796,8 +6684,7 @@ _08003564: pop {r1} bx r1 .align 2, 0 -_0800356C: .4byte 0x02020004 -_08003570: .4byte 0x03002f54 + .pool thumb_func_end Window_AddFromTemplateWithoutAllocatingMemory thumb_func_start Window_Remove @@ -6805,14 +6692,14 @@ Window_Remove: @ 8003574 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080035F0 + ldr r1, =0x02020004 lsls r0, r6, 1 adds r0, r6 lsls r0, 2 adds r4, r0, r1 ldrb r3, [r4] adds r7, r3, 0 - ldr r0, _080035F4 + ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 bne _080035A0 @@ -6824,7 +6711,7 @@ Window_Remove: @ 8003574 movs r3, 0x2 bl do_nothing _080035A0: - ldr r0, _080035F8 + ldr r0, =0x082e9584 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r4] @@ -6835,18 +6722,18 @@ _080035A0: lsrs r5, r0, 24 cmp r5, 0 bne _080035CE - ldr r0, _080035FC + ldr r0, =0x03002f70 lsls r1, r7, 2 adds r4, r1, r0 ldr r1, [r4] - ldr r0, _08003600 + ldr r0, =nullsub_8 + 1 cmp r1, r0 beq _080035CE adds r0, r1, 0 bl free str r5, [r4] _080035CE: - ldr r1, _080035F0 + ldr r1, =0x02020004 lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -6863,23 +6750,19 @@ _080035E8: pop {r0} bx r0 .align 2, 0 -_080035F0: .4byte 0x02020004 -_080035F4: .4byte 0x03002f54 -_080035F8: .4byte 0x082e9584 -_080035FC: .4byte 0x03002f70 -_08003600: .4byte nullsub_8 + 1 + .pool thumb_func_end Window_Remove thumb_func_start Window_FreeMemory Window_FreeMemory: @ 8003604 push {r4-r6,lr} - ldr r4, _0800364C + ldr r4, =0x03002f70 movs r5, 0x3 _0800360A: ldr r1, [r4] cmp r1, 0 beq _08003620 - ldr r0, _08003650 + ldr r0, =nullsub_8 + 1 cmp r1, r0 beq _08003620 adds r0, r1, 0 @@ -6891,7 +6774,7 @@ _08003620: subs r5, 0x1 cmp r5, 0 bge _0800360A - ldr r0, _08003654 + ldr r0, =0x02020004 adds r4, r0, 0 adds r4, 0x8 movs r6, 0 @@ -6911,9 +6794,7 @@ _0800363E: pop {r0} bx r0 .align 2, 0 -_0800364C: .4byte 0x03002f70 -_08003650: .4byte nullsub_8 + 1 -_08003654: .4byte 0x02020004 + .pool thumb_func_end Window_FreeMemory thumb_func_start Window_CopyToVram @@ -6925,7 +6806,7 @@ Window_CopyToVram: @ 8003658 lsls r1, 24 lsrs r3, r1, 24 adds r5, r3, 0 - ldr r2, _08003690 + ldr r2, =0x02020004 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -6947,7 +6828,7 @@ Window_CopyToVram: @ 8003658 beq _0800369A b _080036CE .align 2, 0 -_08003690: .4byte 0x02020004 + .pool _08003694: cmp r5, 0x3 beq _080036B6 @@ -6998,7 +6879,7 @@ Window_CopyRectToVram: @ 80036D8 beq _08003782 cmp r3, 0 beq _08003782 - ldr r2, _0800372C + ldr r2, =0x02020004 lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -7029,7 +6910,7 @@ Window_CopyRectToVram: @ 80036D8 beq _08003736 b _08003782 .align 2, 0 -_0800372C: .4byte 0x02020004 + .pool _08003730: cmp r5, 0x3 beq _0800375E @@ -7084,7 +6965,7 @@ Window_WriteStandardTileMap: @ 800378C sub sp, 0x1C lsls r0, 24 lsrs r0, 24 - ldr r2, _080037E8 + ldr r2, =0x02020004 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -7125,7 +7006,7 @@ Window_WriteStandardTileMap: @ 800378C pop {r0} bx r0 .align 2, 0 -_080037E8: .4byte 0x02020004 + .pool thumb_func_end Window_WriteStandardTileMap thumb_func_start Window_WriteStandardTileMapRectOverridePalette @@ -7155,7 +7036,7 @@ Window_WriteStandardTileMapRectOverridePalette: @ 80037EC lsls r5, 24 lsrs r5, 24 str r5, [sp, 0x20] - ldr r2, _080038A0 + ldr r2, =0x02020004 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -7220,7 +7101,7 @@ _0800388E: pop {r0} bx r0 .align 2, 0 -_080038A0: .4byte 0x02020004 + .pool thumb_func_end Window_WriteStandardTileMapRectOverridePalette thumb_func_start Window_FillTileMap @@ -7229,7 +7110,7 @@ Window_FillTileMap: @ 80038A4 sub sp, 0x18 lsls r0, 24 lsrs r0, 24 - ldr r2, _080038EC + ldr r2, =0x02020004 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -7239,7 +7120,7 @@ Window_FillTileMap: @ 80038A4 stm r0!, {r2-r4} add r0, sp, 0xC ldrb r0, [r0] - ldr r1, _080038F0 + ldr r1, =0x03002f60 ldrb r1, [r1] add r2, sp, 0xC ldrb r2, [r2, 0x1] @@ -7260,8 +7141,7 @@ Window_FillTileMap: @ 80038A4 pop {r0} bx r0 .align 2, 0 -_080038EC: .4byte 0x02020004 -_080038F0: .4byte 0x03002f60 + .pool thumb_func_end Window_FillTileMap thumb_func_start Window_WriteStandardTileMapRect @@ -7287,7 +7167,7 @@ Window_WriteStandardTileMapRect: @ 80038F4 lsls r4, 24 lsrs r4, 24 mov r8, r4 - ldr r2, _080039A0 + ldr r2, =0x02020004 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -7352,7 +7232,7 @@ _0800398E: pop {r0} bx r0 .align 2, 0 -_080039A0: .4byte 0x02020004 + .pool thumb_func_end Window_WriteStandardTileMapRect thumb_func_start Window_CopyWholePixelBlockToWindow @@ -7428,13 +7308,13 @@ Window_CopyPixelRectToWindow: @ 80039DC lsrs r6, 16 mov r12, r6 str r1, [sp, 0x14] - ldr r7, _08003A90 + ldr r7, =0xffff0000 lsls r5, 16 - ldr r6, _08003A94 + ldr r6, =0x0000ffff lsrs r4, 16 orrs r4, r5 str r4, [sp, 0x18] - ldr r1, _08003A98 + ldr r1, =0x02020004 lsls r5, r0, 1 adds r5, r0 lsls r5, 2 @@ -7477,9 +7357,7 @@ Window_CopyPixelRectToWindow: @ 80039DC pop {r0} bx r0 .align 2, 0 -_08003A90: .4byte 0xffff0000 -_08003A94: .4byte 0x0000ffff -_08003A98: .4byte 0x02020004 + .pool thumb_func_end Window_CopyPixelRectToWindow thumb_func_start Window_copy_pixels_rect_3 @@ -7529,11 +7407,11 @@ Window_copy_pixels_rect_3: @ 8003A9C str r6, [sp, 0x24] str r1, [sp, 0x14] lsls r5, 16 - ldr r6, _08003B58 + ldr r6, =0x0000ffff lsrs r4, 16 orrs r4, r5 str r4, [sp, 0x18] - ldr r1, _08003B5C + ldr r1, =0x02020004 lsls r5, r0, 1 adds r5, r0 lsls r5, 2 @@ -7547,7 +7425,7 @@ Window_copy_pixels_rect_3: @ 8003A9C lsls r0, 3 add r1, sp, 0x1C ldr r4, [r1, 0x4] - ldr r7, _08003B60 + ldr r7, =0xffff0000 ands r4, r7 orrs r4, r0 str r4, [r1, 0x4] @@ -7577,9 +7455,7 @@ Window_copy_pixels_rect_3: @ 8003A9C pop {r0} bx r0 .align 2, 0 -_08003B58: .4byte 0x0000ffff -_08003B5C: .4byte 0x02020004 -_08003B60: .4byte 0xffff0000 + .pool thumb_func_end Window_copy_pixels_rect_3 thumb_func_start Window_FillPixelRect @@ -7609,7 +7485,7 @@ Window_FillPixelRect: @ 8003B64 lsls r4, 16 lsrs r4, 16 mov r8, r4 - ldr r5, _08003BE4 + ldr r5, =0x02020004 lsls r4, r0, 1 adds r4, r0 lsls r4, 2 @@ -7621,14 +7497,14 @@ Window_FillPixelRect: @ 8003B64 adds r4, r5 ldrb r0, [r4, 0x3] lsls r0, 3 - ldr r6, _08003BE8 + ldr r6, =0xffff0000 ldr r5, [sp, 0xC] ands r5, r6 orrs r5, r0 str r5, [sp, 0xC] ldrb r4, [r4, 0x4] lsls r4, 19 - ldr r0, _08003BEC + ldr r0, =0x0000ffff ands r0, r5 orrs r0, r4 str r0, [sp, 0xC] @@ -7647,9 +7523,7 @@ Window_FillPixelRect: @ 8003B64 pop {r0} bx r0 .align 2, 0 -_08003BE4: .4byte 0x02020004 -_08003BE8: .4byte 0xffff0000 -_08003BEC: .4byte 0x0000ffff + .pool thumb_func_end Window_FillPixelRect thumb_func_start Window_CopyToPixels @@ -7663,7 +7537,7 @@ Window_CopyToPixels: @ 8003BF0 lsrs r2, r3, 16 cmp r5, 0 beq _08003C24 - ldr r1, _08003C20 + ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -7677,9 +7551,9 @@ Window_CopyToPixels: @ 8003BF0 bl CpuSet b _08003C3C .align 2, 0 -_08003C20: .4byte 0x02020004 + .pool _08003C24: - ldr r1, _08003C44 + ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -7695,7 +7569,7 @@ _08003C3C: pop {r0} bx r0 .align 2, 0 -_08003C44: .4byte 0x02020004 + .pool thumb_func_end Window_CopyToPixels thumb_func_start Window_FastFillPixels @@ -7706,7 +7580,7 @@ Window_FastFillPixels: @ 8003C48 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r5, _08003C90 + ldr r5, =0x02020004 lsls r4, r0, 1 adds r4, r0 lsls r4, 2 @@ -7735,7 +7609,7 @@ Window_FastFillPixels: @ 8003C48 pop {r0} bx r0 .align 2, 0 -_08003C90: .4byte 0x02020004 + .pool thumb_func_end Window_FastFillPixels thumb_func_start Window_ScrollVertically @@ -7756,7 +7630,7 @@ Window_ScrollVertically: @ 8003C94 str r2, [sp] lsls r3, 24 lsrs r3, 24 - ldr r2, _08003D30 + ldr r2, =0x02020004 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -7823,7 +7697,7 @@ _08003D08: str r0, [r1] b _08003D38 .align 2, 0 -_08003D30: .4byte 0x02020004 + .pool _08003D34: mov r2, r10 str r7, [r2] @@ -8273,7 +8147,7 @@ CallWindowFunction: @ 8004058 mov r8, r1 lsls r0, 24 lsrs r0, 24 - ldr r2, _080040A4 + ldr r2, =0x02020004 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -8303,7 +8177,7 @@ CallWindowFunction: @ 8004058 pop {r0} bx r0 .align 2, 0 -_080040A4: .4byte 0x02020004 + .pool thumb_func_end CallWindowFunction thumb_func_start Window_SetField @@ -8316,12 +8190,12 @@ Window_SetField: @ 80040A8 cmp r0, 0x7 bhi _08004142 lsls r0, 2 - ldr r1, _080040C0 + ldr r1, =_080040C4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080040C0: .4byte _080040C4 + .pool .align 2, 0 _080040C4: .4byte _08004142 @@ -8333,7 +8207,7 @@ _080040C4: .4byte _08004120 .4byte _08004134 _080040E4: - ldr r1, _080040F4 + ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 lsls r0, 2 @@ -8342,9 +8216,9 @@ _080040E4: movs r0, 0 b _08004144 .align 2, 0 -_080040F4: .4byte 0x02020004 + .pool _080040F8: - ldr r1, _08004108 + ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 lsls r0, 2 @@ -8353,9 +8227,9 @@ _080040F8: movs r0, 0 b _08004144 .align 2, 0 -_08004108: .4byte 0x02020004 + .pool _0800410C: - ldr r1, _0800411C + ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 lsls r0, 2 @@ -8364,9 +8238,9 @@ _0800410C: movs r0, 0 b _08004144 .align 2, 0 -_0800411C: .4byte 0x02020004 + .pool _08004120: - ldr r1, _08004130 + ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 lsls r0, 2 @@ -8375,9 +8249,9 @@ _08004120: movs r0, 0 b _08004144 .align 2, 0 -_08004130: .4byte 0x02020004 + .pool _08004134: - ldr r1, _08004148 + ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 lsls r0, 2 @@ -8390,7 +8264,7 @@ _08004144: pop {r1} bx r1 .align 2, 0 -_08004148: .4byte 0x02020004 + .pool thumb_func_end Window_SetField thumb_func_start Window_GetField @@ -8403,12 +8277,12 @@ Window_GetField: @ 800414C cmp r0, 0x7 bhi _08004228 lsls r0, 2 - ldr r1, _08004164 + ldr r1, =_08004168 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08004164: .4byte _08004168 + .pool .align 2, 0 _08004168: .4byte _08004188 @@ -8420,7 +8294,7 @@ _08004168: .4byte _08004200 .4byte _08004214 _08004188: - ldr r0, _08004198 + ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -8428,9 +8302,9 @@ _08004188: ldrb r0, [r1] b _0800422A .align 2, 0 -_08004198: .4byte 0x02020004 + .pool _0800419C: - ldr r0, _080041AC + ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -8438,9 +8312,9 @@ _0800419C: ldrb r0, [r1, 0x1] b _0800422A .align 2, 0 -_080041AC: .4byte 0x02020004 + .pool _080041B0: - ldr r0, _080041C0 + ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -8448,9 +8322,9 @@ _080041B0: ldrb r0, [r1, 0x2] b _0800422A .align 2, 0 -_080041C0: .4byte 0x02020004 + .pool _080041C4: - ldr r0, _080041D4 + ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -8458,9 +8332,9 @@ _080041C4: ldrb r0, [r1, 0x3] b _0800422A .align 2, 0 -_080041D4: .4byte 0x02020004 + .pool _080041D8: - ldr r0, _080041E8 + ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -8468,9 +8342,9 @@ _080041D8: ldrb r0, [r1, 0x4] b _0800422A .align 2, 0 -_080041E8: .4byte 0x02020004 + .pool _080041EC: - ldr r0, _080041FC + ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -8478,9 +8352,9 @@ _080041EC: ldrb r0, [r1, 0x5] b _0800422A .align 2, 0 -_080041FC: .4byte 0x02020004 + .pool _08004200: - ldr r0, _08004210 + ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -8488,9 +8362,9 @@ _08004200: ldrh r0, [r1, 0x6] b _0800422A .align 2, 0 -_08004210: .4byte 0x02020004 + .pool _08004214: - ldr r0, _08004224 + ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -8499,7 +8373,7 @@ _08004214: ldr r0, [r1] b _0800422A .align 2, 0 -_08004224: .4byte 0x02020004 + .pool _08004228: movs r0, 0 _0800422A: @@ -8513,7 +8387,7 @@ GetNumActiveWindowsOnBg: @ 8004230 lsls r0, 24 lsrs r4, r0, 24 movs r3, 0 - ldr r2, _08004258 + ldr r2, =0x02020004 movs r1, 0x1F _0800423C: ldrb r0, [r2] @@ -8532,7 +8406,7 @@ _08004248: pop {r1} bx r1 .align 2, 0 -_08004258: .4byte 0x02020004 + .pool thumb_func_end GetNumActiveWindowsOnBg thumb_func_start nullsub_9 @@ -8549,7 +8423,7 @@ Window_AddFromTemplate8Bpp: @ 8004260 push {r5-r7} mov r9, r0 movs r6, 0 - ldr r1, _08004328 + ldr r1, =0x02020004 ldrb r0, [r1] cmp r0, 0xFF beq _0800428E @@ -8571,7 +8445,7 @@ _0800428E: beq _08004322 mov r0, r9 ldrb r7, [r0] - ldr r1, _0800432C + ldr r1, =0x03002f70 mov r10, r1 lsls r2, r7, 2 mov r8, r2 @@ -8585,7 +8459,7 @@ _0800428E: bl bg_get_field lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _08004330 + ldr r0, =0x0000ffff cmp r5, r0 beq _080042EA adds r0, r5, 0 @@ -8628,11 +8502,11 @@ _080042EA: lsls r0, 24 cmp r0, 0 bne _08004322 - ldr r0, _0800432C + ldr r0, =0x03002f70 lsls r1, r7, 2 adds r5, r1, r0 ldr r1, [r5] - ldr r0, _08004334 + ldr r0, =nullsub_9 + 1 cmp r1, r0 beq _08004322 adds r0, r1, 0 @@ -8642,12 +8516,9 @@ _08004322: movs r0, 0xFF b _08004356 .align 2, 0 -_08004328: .4byte 0x02020004 -_0800432C: .4byte 0x03002f70 -_08004330: .4byte 0x0000ffff -_08004334: .4byte nullsub_9 + 1 + .pool _08004338: - ldr r1, _08004364 + ldr r1, =0x02020004 lsls r2, r6, 1 adds r2, r6 lsls r2, 2 @@ -8671,7 +8542,7 @@ _08004356: pop {r1} bx r1 .align 2, 0 -_08004364: .4byte 0x02020004 + .pool thumb_func_end Window_AddFromTemplate8Bpp thumb_func_start Window_FillPixels8Bpp @@ -8681,7 +8552,7 @@ Window_FillPixels8Bpp: @ 8004368 lsrs r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r6, _080043A4 + ldr r6, =0x02020004 lsls r1, r0, 1 adds r1, r0 lsls r4, r1, 2 @@ -8709,7 +8580,7 @@ _0800439E: pop {r0} bx r0 .align 2, 0 -_080043A4: .4byte 0x02020004 + .pool thumb_func_end Window_FillPixels8Bpp thumb_func_start Window_FillPixelRect8Bpp @@ -8739,7 +8610,7 @@ Window_FillPixelRect8Bpp: @ 80043A8 lsls r4, 16 lsrs r4, 16 mov r8, r4 - ldr r5, _08004428 + ldr r5, =0x02020004 lsls r4, r0, 1 adds r4, r0 lsls r4, 2 @@ -8751,14 +8622,14 @@ Window_FillPixelRect8Bpp: @ 80043A8 adds r4, r5 ldrb r0, [r4, 0x3] lsls r0, 3 - ldr r6, _0800442C + ldr r6, =0xffff0000 ldr r5, [sp, 0xC] ands r5, r6 orrs r5, r0 str r5, [sp, 0xC] ldrb r4, [r4, 0x4] lsls r4, 19 - ldr r0, _08004430 + ldr r0, =0x0000ffff ands r0, r5 orrs r0, r4 str r0, [sp, 0xC] @@ -8777,9 +8648,7 @@ Window_FillPixelRect8Bpp: @ 80043A8 pop {r0} bx r0 .align 2, 0 -_08004428: .4byte 0x02020004 -_0800442C: .4byte 0xffff0000 -_08004430: .4byte 0x0000ffff + .pool thumb_func_end Window_FillPixelRect8Bpp thumb_func_start Window_CopyPixelRectToWindow4BppTo8Bpp @@ -8829,11 +8698,11 @@ Window_CopyPixelRectToWindow4BppTo8Bpp: @ 8004434 str r6, [sp, 0x28] str r1, [sp, 0x18] lsls r5, 16 - ldr r6, _080044F4 + ldr r6, =0x0000ffff lsrs r4, 16 orrs r4, r5 str r4, [sp, 0x1C] - ldr r1, _080044F8 + ldr r1, =0x02020004 lsls r5, r0, 1 adds r5, r0 lsls r5, 2 @@ -8847,7 +8716,7 @@ Window_CopyPixelRectToWindow4BppTo8Bpp: @ 8004434 lsls r0, 3 add r1, sp, 0x20 ldr r4, [r1, 0x4] - ldr r7, _080044FC + ldr r7, =0xffff0000 ands r4, r7 orrs r4, r0 str r4, [r1, 0x4] @@ -8879,9 +8748,7 @@ Window_CopyPixelRectToWindow4BppTo8Bpp: @ 8004434 pop {r0} bx r0 .align 2, 0 -_080044F4: .4byte 0x0000ffff -_080044F8: .4byte 0x02020004 -_080044FC: .4byte 0xffff0000 + .pool thumb_func_end Window_CopyPixelRectToWindow4BppTo8Bpp thumb_func_start Window_CopyToVram8Bpp @@ -8892,14 +8759,14 @@ Window_CopyToVram8Bpp: @ 8004500 lsls r1, 24 lsrs r2, r1, 24 adds r5, r2, 0 - ldr r6, _08004534 + ldr r6, =0x02020184 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 - ldr r0, _08004538 + ldr r0, =0x02020004 adds r3, r1, r0 str r3, [r6] - ldr r4, _0800453C + ldr r4, =0x02020188 ldrb r1, [r3, 0x3] ldrb r0, [r3, 0x4] muls r0, r1 @@ -8913,9 +8780,7 @@ Window_CopyToVram8Bpp: @ 8004500 beq _08004546 b _08004570 .align 2, 0 -_08004534: .4byte 0x02020184 -_08004538: .4byte 0x02020004 -_0800453C: .4byte 0x02020188 + .pool _08004540: cmp r5, 0x3 beq _0800455C @@ -8952,7 +8817,7 @@ GetNumActiveWindowsOnBgDuplicate: @ 8004578 lsls r0, 24 lsrs r4, r0, 24 movs r3, 0 - ldr r2, _080045A0 + ldr r2, =0x02020004 movs r1, 0x1F _08004584: ldrb r0, [r2] @@ -8971,24 +8836,24 @@ _08004590: pop {r1} bx r1 .align 2, 0 -_080045A0: .4byte 0x02020004 + .pool thumb_func_end GetNumActiveWindowsOnBgDuplicate thumb_func_start fboxes_set_ptr fboxes_set_ptr: @ 80045A4 - ldr r1, _080045AC + ldr r1, =0x03002f80 str r0, [r1] bx lr .align 2, 0 -_080045AC: .4byte 0x03002f80 + .pool thumb_func_end fboxes_set_ptr thumb_func_start TextBox_ResetSomeField TextBox_ResetSomeField: @ 80045B0 push {lr} - ldr r1, _080045C8 + ldr r1, =0x020201b0 movs r2, 0 - ldr r3, _080045CC + ldr r3, =0x0000045c adds r0, r1, r3 _080045BA: strb r2, [r0, 0x1B] @@ -8998,8 +8863,7 @@ _080045BA: pop {r0} bx r0 .align 2, 0 -_080045C8: .4byte 0x020201b0 -_080045CC: .4byte 0x0000045c + .pool thumb_func_end TextBox_ResetSomeField thumb_func_start Print @@ -9029,7 +8893,7 @@ Print: @ 80045D0 strb r4, [r0, 0x7] strb r3, [r0, 0x8] strb r4, [r0, 0x9] - ldr r0, _08004678 + ldr r0, =0x03002f80 ldr r0, [r0] lsls r3, r1, 1 adds r3, r1 @@ -9088,7 +8952,7 @@ Print: @ 80045D0 pop {r1} bx r1 .align 2, 0 -_08004678: .4byte 0x03002f80 + .pool thumb_func_end Print thumb_func_start remo_copy @@ -9098,16 +8962,16 @@ remo_copy: @ 800467C mov r12, r2 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _08004694 + ldr r0, =0x03002f80 ldr r0, [r0] cmp r0, 0 bne _08004698 movs r0, 0 b _08004766 .align 2, 0 -_08004694: .4byte 0x03002f80 + .pool _08004698: - ldr r0, _08004710 + ldr r0, =0x0202018c movs r2, 0 movs r1, 0x1 strb r1, [r0, 0x1B] @@ -9152,7 +9016,7 @@ _080046AE: ldrb r0, [r4, 0x1D] subs r0, 0x1 strb r0, [r4, 0x1D] - ldr r2, _08004714 + ldr r2, =0x020201b0 ldrb r0, [r6, 0x4] lsls r1, r0, 3 adds r1, r0 @@ -9167,18 +9031,16 @@ _080046AE: stm r1!, {r2,r4,r7} b _0800475E .align 2, 0 -_08004710: .4byte 0x0202018c -_08004714: .4byte 0x020201b0 + .pool _08004718: - ldr r1, _08004724 + ldr r1, =0x0202018c movs r0, 0 strb r0, [r1, 0x1D] movs r4, 0 - ldr r7, _08004728 + ldr r7, =0x000003ff b _08004732 .align 2, 0 -_08004724: .4byte 0x0202018c -_08004728: .4byte 0x000003ff + .pool _0800472C: adds r0, r4, 0x1 lsls r0, 16 @@ -9186,19 +9048,19 @@ _0800472C: _08004732: cmp r4, r7 bhi _08004740 - ldr r0, _0800476C + ldr r0, =0x0202018c bl fbox_exec cmp r0, 0x1 bne _0800472C _08004740: cmp r5, 0xFF beq _0800474E - ldr r0, _0800476C + ldr r0, =0x0202018c ldrb r0, [r0, 0x4] movs r1, 0x2 bl Window_CopyToVram _0800474E: - ldr r2, _08004770 + ldr r2, =0x020201b0 ldrb r1, [r6, 0x4] lsls r0, r1, 3 adds r0, r1 @@ -9207,7 +9069,7 @@ _0800474E: movs r1, 0 strb r1, [r0, 0x1B] _0800475E: - ldr r1, _08004774 + ldr r1, =0x03002f84 movs r0, 0 strb r0, [r1] movs r0, 0x1 @@ -9216,9 +9078,7 @@ _08004766: pop {r1} bx r1 .align 2, 0 -_0800476C: .4byte 0x0202018c -_08004770: .4byte 0x020201b0 -_08004774: .4byte 0x03002f84 + .pool thumb_func_end remo_copy thumb_func_start run_remoboxes @@ -9226,11 +9086,11 @@ run_remoboxes: @ 8004778 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _080047B0 + ldr r0, =0x03002f84 ldrb r0, [r0] cmp r0, 0 bne _080047F6 - ldr r0, _080047B4 + ldr r0, =0x020201b0 movs r6, 0 adds r5, r0, 0x4 mov r8, r0 @@ -9251,8 +9111,7 @@ _08004790: beq _080047BE b _080047E8 .align 2, 0 -_080047B0: .4byte 0x03002f84 -_080047B4: .4byte 0x020201b0 + .pool _080047B8: cmp r4, 0x3 beq _080047C6 @@ -9262,7 +9121,7 @@ _080047BE: movs r1, 0x2 bl Window_CopyToVram _080047C6: - ldr r1, _080047E0 + ldr r1, =0x020201b0 adds r0, r1, 0 adds r0, 0x10 adds r0, r6, r0 @@ -9274,7 +9133,7 @@ _080047C6: bl _call_via_r2 b _080047E8 .align 2, 0 -_080047E0: .4byte 0x020201b0 + .pool _080047E4: movs r0, 0 strb r0, [r5, 0x17] @@ -9298,7 +9157,7 @@ _080047F6: a_pressed_maybe: @ 8004800 lsls r0, 24 lsrs r0, 24 - ldr r2, _08004814 + ldr r2, =0x020201b0 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -9306,7 +9165,7 @@ a_pressed_maybe: @ 8004800 ldrb r0, [r1, 0x1B] bx lr .align 2, 0 -_08004814: .4byte 0x020201b0 + .pool thumb_func_end a_pressed_maybe thumb_func_start fbox_exec @@ -9315,7 +9174,7 @@ fbox_exec: @ 8004818 adds r4, r0, 0 _0800481C: ldrb r1, [r4, 0x5] - ldr r0, _08004840 + ldr r0, =0x03002f80 ldr r2, [r0] lsls r0, r1, 1 adds r0, r1 @@ -9332,7 +9191,7 @@ _0800481C: pop {r1} bx r1 .align 2, 0 -_08004840: .4byte 0x03002f80 + .pool thumb_func_end fbox_exec thumb_func_start GenerateFontHalfRowLut @@ -9349,12 +9208,12 @@ GenerateFontHalfRowLut: @ 8004844 lsrs r1, 24 lsls r2, 24 lsrs r2, 24 - ldr r3, _08004BD0 - ldr r4, _08004BD4 + ldr r3, =0x03000948 + ldr r4, =0x030009ea strh r1, [r4] - ldr r4, _08004BD8 + ldr r4, =0x030009ec strh r0, [r4] - ldr r4, _08004BDC + ldr r4, =0x030009ee strh r2, [r4] lsls r5, r1, 12 lsls r6, r0, 12 @@ -9792,28 +9651,23 @@ GenerateFontHalfRowLut: @ 8004844 pop {r0} bx r0 .align 2, 0 -_08004BD0: .4byte 0x03000948 -_08004BD4: .4byte 0x030009ea -_08004BD8: .4byte 0x030009ec -_08004BDC: .4byte 0x030009ee + .pool thumb_func_end GenerateFontHalfRowLut thumb_func_start save_remo_colors save_remo_colors: @ 8004BE0 - ldr r3, _08004BF4 + ldr r3, =0x030009ea ldrh r3, [r3] strb r3, [r1] - ldr r1, _08004BF8 + ldr r1, =0x030009ec ldrh r1, [r1] strb r1, [r0] - ldr r0, _08004BFC + ldr r0, =0x030009ee ldrh r0, [r0] strb r0, [r2] bx lr .align 2, 0 -_08004BF4: .4byte 0x030009ea -_08004BF8: .4byte 0x030009ec -_08004BFC: .4byte 0x030009ee + .pool thumb_func_end save_remo_colors thumb_func_start restore_remo_colors @@ -9833,8 +9687,8 @@ font_render_sub: @ 8004C10 mov r7, r8 push {r7} ldrh r7, [r0] - ldr r5, _08004D50 - ldr r4, _08004D54 + ldr r5, =0x03000948 + ldr r4, =0x082e958c movs r2, 0xFF mov r8, r2 adds r2, r7, 0 @@ -9989,8 +9843,7 @@ font_render_sub: @ 8004C10 pop {r0} bx r0 .align 2, 0 -_08004D50: .4byte 0x03000948 -_08004D54: .4byte 0x082e958c + .pool thumb_func_end font_render_sub thumb_func_start sub_8004D58 @@ -10011,23 +9864,23 @@ _08004D6E: beq _08004D80 b _08004D98 _08004D74: - ldr r0, _08004D7C + ldr r0, =0x030009ec ldrb r0, [r0] b _08004D9A .align 2, 0 -_08004D7C: .4byte 0x030009ec + .pool _08004D80: - ldr r0, _08004D88 + ldr r0, =0x030009ea ldrb r0, [r0] b _08004D9A .align 2, 0 -_08004D88: .4byte 0x030009ea + .pool _08004D8C: - ldr r0, _08004D94 + ldr r0, =0x030009ee ldrb r0, [r0] b _08004D9A .align 2, 0 -_08004D94: .4byte 0x030009ee + .pool _08004D98: movs r0, 0 _08004D9A: @@ -10048,14 +9901,14 @@ CopyGlyphToWindow: @ 8004DA0 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _08004E7C + ldr r1, =0x02020004 adds r1, r0, r1 adds r2, r1, 0 ldrb r7, [r1, 0x3] lsls r0, r7, 3 ldrb r6, [r3, 0x8] subs r4, r0, r6 - ldr r5, _08004E80 + ldr r5, =0x03002f90 adds r0, r5, 0 adds r0, 0x80 ldrb r0, [r0] @@ -10155,8 +10008,7 @@ _08004E72: bcc _08004E14 b _080052AA .align 2, 0 -_08004E7C: .4byte 0x02020004 -_08004E80: .4byte 0x03002f90 + .pool _08004E84: mov r1, r8 str r3, [sp, 0x14] @@ -10233,7 +10085,7 @@ _08004F06: bcc _08004EA8 _08004F0E: ldr r1, [sp, 0x88] - ldr r3, _08004F90 + ldr r3, =0x03002fd0 str r3, [sp, 0x20] ldr r0, [sp, 0x74] mov r8, r0 @@ -10302,7 +10154,7 @@ _08004F86: bcc _08004F28 b _080052AA .align 2, 0 -_08004F90: .4byte 0x03002fd0 + .pool _08004F94: cmp r0, 0x8 ble _08004F9A @@ -10379,7 +10231,7 @@ _08005014: bcc _08004FBA _0800501C: mov r1, r8 - ldr r3, _080050A0 + ldr r3, =0x03002fb0 str r3, [sp, 0x38] ldr r0, [sp, 0x84] ldr r2, [sp, 0x7C] @@ -10449,7 +10301,7 @@ _08005096: bcc _08005038 b _080052AA .align 2, 0 -_080050A0: .4byte 0x03002fb0 + .pool _080050A4: mov r1, r8 str r5, [sp, 0x44] @@ -10525,7 +10377,7 @@ _08005124: bcc _080050CA _0800512C: mov r1, r8 - ldr r3, _080052BC + ldr r3, =0x03002fb0 str r3, [sp, 0x50] ldr r0, [sp, 0x84] ldr r2, [sp, 0x7C] @@ -10594,7 +10446,7 @@ _080051A4: bcc _08005146 _080051AC: ldr r1, [sp, 0x88] - ldr r3, _080052C0 + ldr r3, =0x03002fd0 str r3, [sp, 0x5C] ldr r0, [sp, 0x84] mov r8, r0 @@ -10663,7 +10515,7 @@ _08005222: _0800522A: ldr r4, [sp, 0x84] ldr r1, [sp, 0x88] - ldr r3, _080052C4 + ldr r3, =0x03002ff0 str r3, [sp, 0x68] ldr r0, [sp, 0x7C] adds r0, r4 @@ -10739,9 +10591,7 @@ _080052AA: pop {r0} bx r0 .align 2, 0 -_080052BC: .4byte 0x03002fb0 -_080052C0: .4byte 0x03002fd0 -_080052C4: .4byte 0x03002ff0 + .pool thumb_func_end CopyGlyphToWindow thumb_func_start Text_ClearHorizontalSpan @@ -10750,7 +10600,7 @@ Text_ClearHorizontalSpan: @ 80052C8 sub sp, 0x10 adds r4, r0, 0 adds r6, r1, 0 - ldr r0, _08005328 + ldr r0, =0x030009ea ldrh r5, [r0] cmp r5, 0 beq _0800531E @@ -10758,24 +10608,24 @@ Text_ClearHorizontalSpan: @ 80052C8 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _0800532C + ldr r1, =0x02020004 adds r0, r1 ldr r1, [r0, 0x8] str r1, [sp, 0x8] ldrb r2, [r0, 0x3] lsls r2, 3 - ldr r3, _08005330 + ldr r3, =0xffff0000 ldr r1, [sp, 0xC] ands r1, r3 orrs r1, r2 str r1, [sp, 0xC] ldrb r2, [r0, 0x4] lsls r2, 19 - ldr r0, _08005334 + ldr r0, =0x0000ffff ands r0, r1 orrs r0, r2 str r0, [sp, 0xC] - ldr r0, _08005338 + ldr r0, =0x03002f90 adds r0, 0x81 ldrb r1, [r4, 0x8] ldrb r2, [r4, 0x9] @@ -10794,11 +10644,7 @@ _0800531E: pop {r0} bx r0 .align 2, 0 -_08005328: .4byte 0x030009ea -_0800532C: .4byte 0x02020004 -_08005330: .4byte 0xffff0000 -_08005334: .4byte 0x0000ffff -_08005338: .4byte 0x03002f90 + .pool thumb_func_end Text_ClearHorizontalSpan thumb_func_start fbox0_func @@ -11052,7 +10898,7 @@ sub_80054F8: @ 80054F8 push {lr} adds r2, r0, 0 adds r2, 0x14 - ldr r0, _08005510 + ldr r0, =0x03003014 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 @@ -11062,7 +10908,7 @@ sub_80054F8: @ 80054F8 strb r0, [r2, 0x2] b _08005524 .align 2, 0 -_08005510: .4byte 0x03003014 + .pool _08005514: ldrb r0, [r2, 0x1] movs r1, 0x61 @@ -11084,7 +10930,7 @@ remo_draw_bouncing_down_arrow: @ 8005528 adds r5, r0, 0 adds r6, r5, 0 adds r6, 0x14 - ldr r7, _0800555C + ldr r7, =0x03003014 ldrb r1, [r7] movs r0, 0x4 ands r0, r1 @@ -11105,7 +10951,7 @@ remo_draw_bouncing_down_arrow: @ 8005528 negs r1, r1 b _080055E8 .align 2, 0 -_0800555C: .4byte 0x03003014 + .pool _08005560: ldrb r0, [r5, 0x4] ldrb r2, [r5, 0xD] @@ -11128,15 +10974,15 @@ _08005560: cmp r0, 0x1 beq _08005594 _0800558A: - ldr r7, _08005590 + ldr r7, =0x082e968c b _08005596 .align 2, 0 -_08005590: .4byte 0x082e968c + .pool _08005594: - ldr r7, _080055F8 + ldr r7, =0x082e974c _08005596: ldrb r0, [r5, 0x4] - ldr r2, _080055FC + ldr r2, =0x082e9d0c ldr r1, [r6] lsls r1, 17 lsrs r1, 30 @@ -11184,8 +11030,7 @@ _080055EE: pop {r0} bx r0 .align 2, 0 -_080055F8: .4byte 0x082e974c -_080055FC: .4byte 0x082e9d0c + .pool thumb_func_end remo_draw_bouncing_down_arrow thumb_func_start remo_clear_down_arrow @@ -11239,7 +11084,7 @@ remo_is_it_time_to_continue_plus_down_arrow: @ 8005650 push {r4,lr} adds r2, r0, 0 movs r4, 0 - ldr r0, _08005670 + ldr r0, =0x03003014 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 @@ -11251,11 +11096,11 @@ remo_is_it_time_to_continue_plus_down_arrow: @ 8005650 lsrs r4, r0, 24 b _0800568E .align 2, 0 -_08005670: .4byte 0x03003014 + .pool _08005674: adds r0, r2, 0 bl remo_draw_bouncing_down_arrow - ldr r0, _08005698 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -11270,7 +11115,7 @@ _0800568E: pop {r1} bx r1 .align 2, 0 -_08005698: .4byte 0x030022c0 + .pool thumb_func_end remo_is_it_time_to_continue_plus_down_arrow thumb_func_start remo_is_it_time_to_continue @@ -11278,7 +11123,7 @@ remo_is_it_time_to_continue: @ 800569C push {r4,lr} adds r2, r0, 0 movs r4, 0 - ldr r0, _080056BC + ldr r0, =0x03003014 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 @@ -11290,9 +11135,9 @@ remo_is_it_time_to_continue: @ 800569C lsrs r4, r0, 24 b _080056D4 .align 2, 0 -_080056BC: .4byte 0x03003014 + .pool _080056C0: - ldr r0, _080056DC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -11307,7 +11152,7 @@ _080056D4: pop {r1} bx r1 .align 2, 0 -_080056DC: .4byte 0x030022c0 + .pool thumb_func_end remo_is_it_time_to_continue thumb_func_start draw_bouncing_down_arrow_2 @@ -11356,7 +11201,7 @@ _0800571A: bl Window_FillPixelRect cmp r4, 0 bne _0800579A - ldr r0, _0800574C + ldr r0, =0x03003014 ldr r0, [r0] lsls r0, 30 lsrs r0, 31 @@ -11365,15 +11210,14 @@ _0800571A: cmp r0, 0x1 beq _08005754 _08005748: - ldr r6, _08005750 + ldr r6, =0x082e968c b _08005756 .align 2, 0 -_0800574C: .4byte 0x03003014 -_08005750: .4byte 0x082e968c + .pool _08005754: - ldr r6, _080057AC + ldr r6, =0x082e974c _08005756: - ldr r2, _080057B0 + ldr r2, =0x082e9d0c mov r0, r10 ldrb r1, [r0] movs r0, 0x3 @@ -11415,8 +11259,7 @@ _0800579A: pop {r0} bx r0 .align 2, 0 -_080057AC: .4byte 0x082e974c -_080057B0: .4byte 0x082e9d0c + .pool thumb_func_end draw_bouncing_down_arrow_2 thumb_func_start font_render_b @@ -11431,12 +11274,12 @@ font_render_b: @ 80057B4 b _08005D6C _080057C4: lsls r0, 2 - ldr r1, _080057D0 + ldr r1, =_080057D4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080057D0: .4byte _080057D4 + .pool .align 2, 0 _080057D4: .4byte _080057F0 @@ -11447,7 +11290,7 @@ _080057D4: .4byte _08005D48 .4byte _08005D5A _080057F0: - ldr r2, _08005844 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0x3 ands r0, r1 @@ -11469,7 +11312,7 @@ _0800580A: beq _0800584C subs r0, r1, 0x1 strb r0, [r6, 0x1E] - ldr r0, _08005848 + ldr r0, =0x03003014 ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -11492,17 +11335,16 @@ _08005834: strb r0, [r6, 0x1E] b _08005B56 .align 2, 0 -_08005844: .4byte 0x030022c0 -_08005848: .4byte 0x03003014 + .pool _0800584C: - ldr r0, _0800586C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 bne _08005874 - ldr r0, _08005870 + ldr r0, =0x03003014 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 @@ -11511,8 +11353,7 @@ _0800584C: movs r0, 0x3 b _08005876 .align 2, 0 -_0800586C: .4byte 0x02022fec -_08005870: .4byte 0x03003014 + .pool _08005874: ldrb r0, [r6, 0x1D] _08005876: @@ -11528,12 +11369,12 @@ _08005876: b _08005B90 _0800588A: lsls r0, 2 - ldr r1, _08005894 + ldr r1, =_08005898 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08005894: .4byte _08005898 + .pool .align 2, 0 _08005898: .4byte _08005B6C @@ -11548,7 +11389,7 @@ _080058B8: ldrb r0, [r6, 0x6] strb r0, [r6, 0x8] ldrb r1, [r6, 0x5] - ldr r0, _080058D8 + ldr r0, =0x03002f80 ldr r2, [r0] lsls r0, r1, 1 adds r0, r1 @@ -11561,7 +11402,7 @@ _080058B8: adds r0, r1 b _08005ABA .align 2, 0 -_080058D8: .4byte 0x03002f80 + .pool _080058DC: ldr r0, [r6] b _08005B30 @@ -11576,12 +11417,12 @@ _080058E0: b _08005B90 _080058F0: lsls r0, 2 - ldr r1, _080058FC + ldr r1, =_08005900 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080058FC: .4byte _08005900 + .pool .align 2, 0 _08005900: .4byte _08005960 @@ -11729,7 +11570,7 @@ _08005A2A: _08005A3A: movs r0, 0x1 strb r0, [r6, 0x1C] - ldr r0, _08005A54 + ldr r0, =0x03003014 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 @@ -11741,7 +11582,7 @@ _08005A4C: strb r0, [r4, 0x2] b _08005B56 .align 2, 0 -_08005A54: .4byte 0x03003014 + .pool _08005A58: movs r0, 0x5 b _08005D56 @@ -11798,17 +11639,17 @@ _08005ABA: strb r0, [r6, 0x9] b _08005A0A _08005ABE: - ldr r0, _08005AC8 + ldr r0, =0x03007420 bl MPlayStop_rev01 b _08005A0A .align 2, 0 -_08005AC8: .4byte 0x03007420 + .pool _08005ACC: - ldr r0, _08005AD4 + ldr r0, =0x03007420 bl m4aMPlayContinue b _08005A0A .align 2, 0 -_08005AD4: .4byte 0x03007420 + .pool _08005AD8: ldr r0, [r6] ldrb r4, [r0] @@ -11906,14 +11747,14 @@ _08005B6C: ldrb r2, [r6, 0x8] ldrb r3, [r6, 0x9] bl TextBox_DrawKeypadIcon - ldr r1, _08005B8C + ldr r1, =0x03002f90 adds r1, 0x80 strb r0, [r1] ldrb r3, [r6, 0xA] adds r0, r3 b _08005C6A .align 2, 0 -_08005B8C: .4byte 0x03002f90 + .pool _08005B90: ldr r0, [r4] lsls r0, 28 @@ -11921,12 +11762,12 @@ _08005B90: cmp r0, 0x8 bhi _08005C10 lsls r0, 2 - ldr r1, _08005BA4 + ldr r1, =_08005BA8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08005BA4: .4byte _08005BA8 + .pool .align 2, 0 _08005BA8: .4byte _08005BCC @@ -11980,7 +11821,7 @@ _08005C10: ldrb r0, [r2] cmp r0, 0 beq _08005C48 - ldr r1, _08005C44 + ldr r1, =0x03002f90 adds r1, 0x80 ldrb r0, [r1] ldrb r3, [r6, 0x8] @@ -11998,14 +11839,14 @@ _08005C10: adds r0, r4 b _08005C6E .align 2, 0 -_08005C44: .4byte 0x03002f90 + .pool _08005C48: adds r0, r6, 0 adds r0, 0x21 ldrb r0, [r0] cmp r0, 0 beq _08005C64 - ldr r0, _08005C60 + ldr r0, =0x03002f90 adds r0, 0x80 ldrb r1, [r6, 0xA] ldrb r0, [r0] @@ -12013,9 +11854,9 @@ _08005C48: ldrb r0, [r6, 0x8] b _08005C6C .align 2, 0 -_08005C60: .4byte 0x03002f90 + .pool _08005C64: - ldr r0, _08005C74 + ldr r0, =0x03002f90 adds r0, 0x80 ldrb r0, [r0] _08005C6A: @@ -12028,7 +11869,7 @@ _08005C70: movs r0, 0 b _08005D6E .align 2, 0 -_08005C74: .4byte 0x03002f90 + .pool _08005C78: adds r0, r6, 0 bl remo_is_it_time_to_continue @@ -12073,7 +11914,7 @@ _08005CC6: adds r0, r6, 0 bl remo_clear_down_arrow ldrb r1, [r6, 0x5] - ldr r0, _08005CEC + ldr r0, =0x03002f80 ldr r2, [r0] lsls r0, r1, 1 adds r0, r1 @@ -12089,13 +11930,13 @@ _08005CC6: strb r0, [r6, 0x1C] b _08005B56 .align 2, 0 -_08005CEC: .4byte 0x03002f80 + .pool _08005CF0: ldrb r0, [r6, 0x1F] cmp r0, 0 beq _08005D44 bl sub_8197964 - ldr r1, _08005D1C + ldr r1, =0x082e9d10 adds r0, r1 ldrb r4, [r0] ldrb r2, [r6, 0x1F] @@ -12112,7 +11953,7 @@ _08005CF0: movs r0, 0 b _08005D38 .align 2, 0 -_08005D1C: .4byte 0x082e9d10 + .pool _08005D20: ldrb r0, [r6, 0x4] ldrb r1, [r6, 0xD] @@ -12195,12 +12036,12 @@ _08005D9C: cmp r0, 0x8 bhi _08005E6A lsls r0, 2 - ldr r1, _08005DB4 + ldr r1, =_08005DB8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08005DB4: .4byte _08005DB8 + .pool .align 2, 0 _08005DB8: .4byte _08005E64 @@ -12229,12 +12070,12 @@ _08005DEC: cmp r0, 0x15 bhi _08005E70 lsls r0, 2 - ldr r1, _08005E04 + ldr r1, =_08005E08 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08005E04: .4byte _08005E08 + .pool .align 2, 0 _08005E08: .4byte _08005E64 @@ -12309,7 +12150,7 @@ font_get_get_width_func: @ 8005EA8 lsls r0, 24 lsrs r4, r0, 24 movs r3, 0 - ldr r0, _08005EC0 + ldr r0, =0x082e9d14 adds r2, r0, 0x4 adds r1, r0, 0 _08005EB6: @@ -12319,7 +12160,7 @@ _08005EB6: ldr r0, [r2] b _08005ED0 .align 2, 0 -_08005EC0: .4byte 0x082e9d14 + .pool _08005EC4: adds r2, 0x8 adds r1, 0x8 @@ -12390,12 +12231,12 @@ _08005F30: b _080060F8 _08005F3C: lsls r0, 2 - ldr r1, _08005F48 + ldr r1, =_08005F4C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08005F48: .4byte _08005F4C + .pool .align 2, 0 _08005F4C: .4byte _08005FA2 @@ -12429,17 +12270,17 @@ _08005F8A: beq _08005FA0 b _08005F02 _08005F90: - ldr r6, _08005F94 + ldr r6, =0x02021cc4 b _08005FA2 .align 2, 0 -_08005F94: .4byte 0x02021cc4 + .pool _08005F98: - ldr r6, _08005F9C + ldr r6, =0x02021dc4 b _08005FA2 .align 2, 0 -_08005F9C: .4byte 0x02021dc4 + .pool _08005FA0: - ldr r6, _08005FB4 + ldr r6, =0x02021ec4 _08005FA2: cmp r6, 0 bne _08005FE0 @@ -12449,7 +12290,7 @@ _08005FA2: adds r6, r0, 0 b _08005FE0 .align 2, 0 -_08005FB4: .4byte 0x02021ec4 + .pool _08005FB8: ldrb r0, [r6] adds r6, 0x1 @@ -12487,12 +12328,12 @@ _08005FEA: b _0800611C _08005FF6: lsls r0, 2 - ldr r1, _08006000 + ldr r1, =_08006004 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08006000: .4byte _08006004 + .pool .align 2, 0 _08006004: .4byte _08006060 @@ -12692,12 +12533,12 @@ _08006182: cmp r0, 0x8 bhi _0800627E lsls r0, 2 - ldr r1, _0800619C + ldr r1, =_080061A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0800619C: .4byte _080061A0 + .pool .align 2, 0 _080061A0: .4byte _08006276 @@ -12717,12 +12558,12 @@ _080061C4: cmp r0, 0x15 bhi _080062B8 lsls r0, 2 - ldr r1, _080061DC + ldr r1, =_080061E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080061DC: .4byte _080061E0 + .pool .align 2, 0 _080061E0: .4byte _0800624A @@ -12804,8 +12645,8 @@ _08006290: movs r1, 0x1 bl Text_DecompressGlyphFont1 _08006298: - ldr r4, _080062E0 - ldr r5, _080062E4 + ldr r4, =0x03002f90 + ldr r5, =0x04000008 adds r0, r4, 0 mov r1, r9 adds r2, r5, 0 @@ -12840,8 +12681,7 @@ _080062C0: pop {r1} bx r1 .align 2, 0 -_080062E0: .4byte 0x03002f90 -_080062E4: .4byte 0x04000008 + .pool thumb_func_end font_render_some thumb_func_start TextBox_DrawKeypadIcon @@ -12855,12 +12695,12 @@ TextBox_DrawKeypadIcon: @ 80062E8 lsrs r2, 16 lsls r3, 16 lsrs r3, 16 - ldr r4, _08006330 + ldr r4, =0x082e9d5c lsrs r1, 22 adds r1, r4 ldrh r5, [r1] lsls r5, 5 - ldr r4, _08006334 + ldr r4, =0x082e9d90 adds r5, r4 movs r4, 0x80 str r4, [sp] @@ -12881,55 +12721,54 @@ TextBox_DrawKeypadIcon: @ 80062E8 pop {r1} bx r1 .align 2, 0 -_08006330: .4byte 0x082e9d5c -_08006334: .4byte 0x082e9d90 + .pool thumb_func_end TextBox_DrawKeypadIcon thumb_func_start sub_8006338 sub_8006338: @ 8006338 lsls r0, 24 - ldr r1, _08006344 + ldr r1, =0x082e9d5c lsrs r0, 22 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08006344: .4byte 0x082e9d5c + .pool thumb_func_end sub_8006338 thumb_func_start Font_ReturnsValueFromLUT Font_ReturnsValueFromLUT: @ 8006348 lsls r0, 24 - ldr r1, _08006354 + ldr r1, =0x082e9d5c lsrs r0, 22 adds r0, r1 ldrb r0, [r0, 0x2] bx lr .align 2, 0 -_08006354: .4byte 0x082e9d5c + .pool thumb_func_end Font_ReturnsValueFromLUT thumb_func_start sub_8006358 sub_8006358: @ 8006358 lsls r0, 24 - ldr r1, _08006364 + ldr r1, =0x082e9d5c lsrs r0, 22 adds r0, r1 ldrb r0, [r0, 0x3] bx lr .align 2, 0 -_08006364: .4byte 0x082e9d5c + .pool thumb_func_end sub_8006358 thumb_func_start fboxes_set_default_ptr fboxes_set_default_ptr: @ 8006368 push {lr} - ldr r0, _08006374 + ldr r0, =0x082ea590 bl fboxes_set_ptr pop {r0} bx r0 .align 2, 0 -_08006374: .4byte 0x082ea590 + .pool thumb_func_end fboxes_set_default_ptr thumb_func_start fbox_get_field @@ -12943,12 +12782,12 @@ fbox_get_field: @ 8006378 cmp r1, 0x7 bhi _08006456 lsls r0, r1, 2 - ldr r1, _08006394 + ldr r1, =_08006398 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08006394: .4byte _08006398 + .pool .align 2, 0 _08006398: .4byte _080063B8 @@ -12960,7 +12799,7 @@ _08006398: .4byte _08006430 .4byte _08006448 _080063B8: - ldr r1, _080063C8 + ldr r1, =0x082ea590 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -12968,9 +12807,9 @@ _080063B8: ldrb r0, [r0, 0x4] b _08006456 .align 2, 0 -_080063C8: .4byte 0x082ea590 + .pool _080063CC: - ldr r1, _080063DC + ldr r1, =0x082ea590 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -12978,9 +12817,9 @@ _080063CC: ldrb r0, [r0, 0x5] b _08006456 .align 2, 0 -_080063DC: .4byte 0x082ea590 + .pool _080063E0: - ldr r1, _080063F0 + ldr r1, =0x082ea590 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -12988,9 +12827,9 @@ _080063E0: ldrb r0, [r0, 0x6] b _08006456 .align 2, 0 -_080063F0: .4byte 0x082ea590 + .pool _080063F4: - ldr r1, _08006404 + ldr r1, =0x082ea590 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -12998,9 +12837,9 @@ _080063F4: ldrb r0, [r0, 0x7] b _08006456 .align 2, 0 -_08006404: .4byte 0x082ea590 + .pool _08006408: - ldr r0, _08006418 + ldr r0, =0x082ea590 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -13008,9 +12847,9 @@ _08006408: ldrb r0, [r1, 0x8] b _0800643C .align 2, 0 -_08006418: .4byte 0x082ea590 + .pool _0800641C: - ldr r0, _0800642C + ldr r0, =0x082ea590 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -13018,9 +12857,9 @@ _0800641C: ldrb r0, [r1, 0x8] b _08006454 .align 2, 0 -_0800642C: .4byte 0x082ea590 + .pool _08006430: - ldr r0, _08006444 + ldr r0, =0x082ea590 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -13031,9 +12870,9 @@ _0800643C: lsrs r0, 28 b _08006456 .align 2, 0 -_08006444: .4byte 0x082ea590 + .pool _08006448: - ldr r0, _0800645C + ldr r0, =0x082ea590 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -13045,7 +12884,7 @@ _08006456: pop {r1} bx r1 .align 2, 0 -_0800645C: .4byte 0x082ea590 + .pool thumb_func_end fbox_get_field thumb_func_start sub_8006460 @@ -13053,14 +12892,14 @@ sub_8006460: @ 8006460 lsls r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _08006474 + ldr r2, =0x082ea608 lsrs r0, 23 adds r1, r0 adds r1, r2 ldrb r0, [r1] bx lr .align 2, 0 -_08006474: .4byte 0x082ea608 + .pool thumb_func_end sub_8006460 thumb_func_start Text_DecompressGlyphFont0 @@ -13075,10 +12914,10 @@ Text_DecompressGlyphFont0: @ 8006478 movs r0, 0xF ands r0, r3 lsls r0, 4 - ldr r1, _080064BC + ldr r1, =0x086544e4 adds r0, r1 adds r5, r2, r0 - ldr r4, _080064C0 + ldr r4, =0x03002f90 adds r0, r5, 0 adds r1, r4, 0 bl font_render_sub @@ -13097,14 +12936,13 @@ Text_DecompressGlyphFont0: @ 8006478 strb r0, [r4] b _08006534 .align 2, 0 -_080064BC: .4byte 0x086544e4 -_080064C0: .4byte 0x03002f90 + .pool _080064C4: lsls r1, r3, 6 - ldr r0, _080064F4 + ldr r0, =0x08633ce4 adds r5, r1, r0 - ldr r4, _080064F8 - ldr r0, _080064FC + ldr r4, =0x03002f90 + ldr r0, =0x0863bce4 adds r0, r3, r0 ldrb r1, [r0] adds r0, r4, 0 @@ -13122,9 +12960,7 @@ _080064C4: bl font_render_sub b _0800652C .align 2, 0 -_080064F4: .4byte 0x08633ce4 -_080064F8: .4byte 0x03002f90 -_080064FC: .4byte 0x0863bce4 + .pool _08006500: adds r0, r5, 0 adds r1, r4, 0 @@ -13145,7 +12981,7 @@ _08006500: adds r1, 0x60 bl font_render_sub _0800652C: - ldr r0, _0800653C + ldr r0, =0x03002f90 adds r0, 0x81 movs r1, 0xD strb r1, [r0] @@ -13154,7 +12990,7 @@ _08006534: pop {r0} bx r0 .align 2, 0 -_0800653C: .4byte 0x03002f90 + .pool thumb_func_end Text_DecompressGlyphFont0 thumb_func_start get_font_width_unk3 @@ -13164,12 +13000,12 @@ get_font_width_unk3: @ 8006540 lsrs r2, r0, 16 cmp r1, 0x1 beq _08006558 - ldr r0, _08006554 + ldr r0, =0x0863bce4 adds r0, r2, r0 ldrb r0, [r0] b _0800655A .align 2, 0 -_08006554: .4byte 0x0863bce4 + .pool _08006558: movs r0, 0x8 _0800655A: @@ -13190,10 +13026,10 @@ Text_DecompressGlyphFont7: @ 8006560 adds r0, r3, 0 ands r0, r5 lsls r0, 4 - ldr r1, _080065A4 + ldr r1, =0x086584e4 adds r0, r1 adds r6, r2, r0 - ldr r4, _080065A8 + ldr r4, =0x03002f90 adds r0, r6, 0 adds r1, r4, 0 bl font_render_sub @@ -13211,14 +13047,13 @@ Text_DecompressGlyphFont7: @ 8006560 strb r5, [r4] b _0800661C .align 2, 0 -_080065A4: .4byte 0x086584e4 -_080065A8: .4byte 0x03002f90 + .pool _080065AC: lsls r1, r3, 6 - ldr r0, _080065DC + ldr r0, =0x0863bee4 adds r6, r1, r0 - ldr r4, _080065E0 - ldr r0, _080065E4 + ldr r4, =0x03002f90 + ldr r0, =0x08643ee4 adds r0, r3, r0 ldrb r1, [r0] adds r0, r4, 0 @@ -13236,9 +13071,7 @@ _080065AC: bl font_render_sub b _08006614 .align 2, 0 -_080065DC: .4byte 0x0863bee4 -_080065E0: .4byte 0x03002f90 -_080065E4: .4byte 0x08643ee4 + .pool _080065E8: adds r0, r6, 0 adds r1, r4, 0 @@ -13259,7 +13092,7 @@ _080065E8: adds r1, 0x60 bl font_render_sub _08006614: - ldr r0, _08006624 + ldr r0, =0x03002f90 adds r0, 0x81 movs r1, 0xF strb r1, [r0] @@ -13268,7 +13101,7 @@ _0800661C: pop {r0} bx r0 .align 2, 0 -_08006624: .4byte 0x03002f90 + .pool thumb_func_end Text_DecompressGlyphFont7 thumb_func_start get_font_width_black_en @@ -13278,12 +13111,12 @@ get_font_width_black_en: @ 8006628 lsrs r2, r0, 16 cmp r1, 0x1 beq _08006640 - ldr r0, _0800663C + ldr r0, =0x08643ee4 adds r0, r2, r0 ldrb r0, [r0] b _08006642 .align 2, 0 -_0800663C: .4byte 0x08643ee4 + .pool _08006640: movs r0, 0x8 _08006642: @@ -13303,10 +13136,10 @@ Text_DecompressGlyphFont8: @ 8006648 movs r0, 0xF ands r0, r3 lsls r0, 4 - ldr r1, _0800668C + ldr r1, =0x086544e4 adds r0, r1 adds r5, r2, r0 - ldr r4, _08006690 + ldr r4, =0x03002f90 adds r0, r5, 0 adds r1, r4, 0 bl font_render_sub @@ -13325,14 +13158,13 @@ Text_DecompressGlyphFont8: @ 8006648 strb r0, [r4] b _08006704 .align 2, 0 -_0800668C: .4byte 0x086544e4 -_08006690: .4byte 0x03002f90 + .pool _08006694: lsls r1, r3, 6 - ldr r0, _080066C4 + ldr r0, =0x0862bae4 adds r5, r1, r0 - ldr r4, _080066C8 - ldr r0, _080066CC + ldr r4, =0x03002f90 + ldr r0, =0x08633ae4 adds r0, r3, r0 ldrb r1, [r0] adds r0, r4, 0 @@ -13350,9 +13182,7 @@ _08006694: bl font_render_sub b _080066FC .align 2, 0 -_080066C4: .4byte 0x0862bae4 -_080066C8: .4byte 0x03002f90 -_080066CC: .4byte 0x08633ae4 + .pool _080066D0: adds r0, r5, 0 adds r1, r4, 0 @@ -13373,7 +13203,7 @@ _080066D0: adds r1, 0x60 bl font_render_sub _080066FC: - ldr r0, _0800670C + ldr r0, =0x03002f90 adds r0, 0x81 movs r1, 0xC strb r1, [r0] @@ -13382,7 +13212,7 @@ _08006704: pop {r0} bx r0 .align 2, 0 -_0800670C: .4byte 0x03002f90 + .pool thumb_func_end Text_DecompressGlyphFont8 thumb_func_start get_font_width_unk2 @@ -13392,12 +13222,12 @@ get_font_width_unk2: @ 8006710 lsrs r2, r0, 16 cmp r1, 0x1 beq _08006728 - ldr r0, _08006724 + ldr r0, =0x08633ae4 adds r0, r2, r0 ldrb r0, [r0] b _0800672A .align 2, 0 -_08006724: .4byte 0x08633ae4 + .pool _08006728: movs r0, 0x8 _0800672A: @@ -13417,10 +13247,10 @@ Text_DecompressGlyphFont2: @ 8006730 movs r0, 0x7 ands r0, r6 lsls r0, 5 - ldr r1, _08006794 + ldr r1, =0x0866c8e4 adds r0, r1 adds r4, r2, r0 - ldr r5, _08006798 + ldr r5, =0x03002f90 adds r0, r4, 0 adds r1, r5, 0 bl font_render_sub @@ -13441,7 +13271,7 @@ Text_DecompressGlyphFont2: @ 8006730 adds r1, r5, 0 adds r1, 0x60 bl font_render_sub - ldr r0, _0800679C + ldr r0, =0x086748e4 adds r0, r6, r0 ldrb r1, [r0] adds r0, r5, 0 @@ -13453,15 +13283,13 @@ Text_DecompressGlyphFont2: @ 8006730 strb r0, [r1] b _08006810 .align 2, 0 -_08006794: .4byte 0x0866c8e4 -_08006798: .4byte 0x03002f90 -_0800679C: .4byte 0x086748e4 + .pool _080067A0: lsls r1, r6, 6 - ldr r0, _080067D0 + ldr r0, =0x086440e4 adds r4, r1, r0 - ldr r5, _080067D4 - ldr r0, _080067D8 + ldr r5, =0x03002f90 + ldr r0, =0x0864c0e4 adds r0, r6, r0 ldrb r1, [r0] adds r0, r5, 0 @@ -13479,9 +13307,7 @@ _080067A0: bl font_render_sub b _08006808 .align 2, 0 -_080067D0: .4byte 0x086440e4 -_080067D4: .4byte 0x03002f90 -_080067D8: .4byte 0x0864c0e4 + .pool _080067DC: adds r0, r4, 0 adds r1, r5, 0 @@ -13502,7 +13328,7 @@ _080067DC: adds r1, 0x60 bl font_render_sub _08006808: - ldr r0, _08006818 + ldr r0, =0x03002f90 adds r0, 0x81 movs r1, 0xE strb r1, [r0] @@ -13511,7 +13337,7 @@ _08006810: pop {r0} bx r0 .align 2, 0 -_08006818: .4byte 0x03002f90 + .pool thumb_func_end Text_DecompressGlyphFont2 thumb_func_start get_font_width_unk @@ -13521,19 +13347,19 @@ get_font_width_unk: @ 800681C lsrs r2, r0, 16 cmp r1, 0x1 beq _08006830 - ldr r0, _0800682C + ldr r0, =0x0864c0e4 b _08006832 .align 2, 0 -_0800682C: .4byte 0x0864c0e4 + .pool _08006830: - ldr r0, _0800683C + ldr r0, =0x086748e4 _08006832: adds r0, r2, r0 ldrb r0, [r0] pop {r1} bx r1 .align 2, 0 -_0800683C: .4byte 0x086748e4 + .pool thumb_func_end get_font_width_unk thumb_func_start Text_DecompressGlyphFont1 @@ -13549,10 +13375,10 @@ Text_DecompressGlyphFont1: @ 8006840 adds r0, r3, 0 ands r0, r5 lsls r0, 4 - ldr r1, _08006884 + ldr r1, =0x086584e4 adds r0, r1 adds r6, r2, r0 - ldr r4, _08006888 + ldr r4, =0x03002f90 adds r0, r6, 0 adds r1, r4, 0 bl font_render_sub @@ -13570,14 +13396,13 @@ Text_DecompressGlyphFont1: @ 8006840 strb r5, [r4] b _080068FC .align 2, 0 -_08006884: .4byte 0x086584e4 -_08006888: .4byte 0x03002f90 + .pool _0800688C: lsls r1, r3, 6 - ldr r0, _080068BC + ldr r0, =0x0864c2e4 adds r6, r1, r0 - ldr r4, _080068C0 - ldr r0, _080068C4 + ldr r4, =0x03002f90 + ldr r0, =0x086542e4 adds r0, r3, r0 ldrb r1, [r0] adds r0, r4, 0 @@ -13595,9 +13420,7 @@ _0800688C: bl font_render_sub b _080068F4 .align 2, 0 -_080068BC: .4byte 0x0864c2e4 -_080068C0: .4byte 0x03002f90 -_080068C4: .4byte 0x086542e4 + .pool _080068C8: adds r0, r6, 0 adds r1, r4, 0 @@ -13618,7 +13441,7 @@ _080068C8: adds r1, 0x60 bl font_render_sub _080068F4: - ldr r0, _08006904 + ldr r0, =0x03002f90 adds r0, 0x81 movs r1, 0xF strb r1, [r0] @@ -13627,7 +13450,7 @@ _080068FC: pop {r0} bx r0 .align 2, 0 -_08006904: .4byte 0x03002f90 + .pool thumb_func_end Text_DecompressGlyphFont1 thumb_func_start get_font_width_red_en_jp @@ -13637,12 +13460,12 @@ get_font_width_red_en_jp: @ 8006908 lsrs r2, r0, 16 cmp r1, 0x1 beq _08006920 - ldr r0, _0800691C + ldr r0, =0x086542e4 adds r0, r2, r0 ldrb r0, [r0] b _08006922 .align 2, 0 -_0800691C: .4byte 0x086542e4 + .pool _08006920: movs r0, 0x8 _08006922: @@ -13660,10 +13483,10 @@ Text_DecompressGlyphFont9: @ 8006928 lsls r1, 12 ands r1, r0 lsrs r1, 12 - ldr r0, _0800696C + ldr r0, =0x082ea61c adds r1, r0 adds r4, r1 - ldr r5, _08006970 + ldr r5, =0x03002f90 adds r0, r4, 0 adds r1, r5, 0 bl font_render_sub @@ -13685,8 +13508,7 @@ Text_DecompressGlyphFont9: @ 8006928 pop {r0} bx r0 .align 2, 0 -_0800696C: .4byte 0x082ea61c -_08006970: .4byte 0x03002f90 + .pool thumb_func_end Text_DecompressGlyphFont9 thumb_func_start reset_all_obj_data @@ -13699,26 +13521,23 @@ reset_all_obj_data: @ 8006974 bl copy_queue_clear bl rotscale_reset_all bl gpu_tile_obj_tags_reset - ldr r1, _080069B0 + ldr r1, =0x02021b38 movs r0, 0x40 strb r0, [r1] - ldr r0, _080069B4 + ldr r0, =0x02021b3a movs r4, 0 strh r4, [r0] movs r0, 0 bl gpu_tile_obj_alloc - ldr r0, _080069B8 + ldr r0, =0x02021bbc strh r4, [r0] - ldr r0, _080069BC + ldr r0, =0x02021bbe strh r4, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080069B0: .4byte 0x02021b38 -_080069B4: .4byte 0x02021b3a -_080069B8: .4byte 0x02021bbc -_080069BC: .4byte 0x02021bbe + .pool thumb_func_end reset_all_obj_data thumb_func_start call_obj_callbacks @@ -13730,7 +13549,7 @@ _080069C6: lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, _08006A08 + ldr r1, =0x02020630 adds r4, r0, r1 adds r5, r4, 0 adds r5, 0x3E @@ -13759,7 +13578,7 @@ _080069F6: pop {r0} bx r0 .align 2, 0 -_08006A08: .4byte 0x02020630 + .pool thumb_func_end call_obj_callbacks thumb_func_start obj_sync_something @@ -13768,8 +13587,8 @@ obj_sync_something: @ 8006A0C bl update_obj_oam_coords bl do_something_with_obj_priorites bl determine_visible_sprites_maybe - ldr r5, _08006A4C - ldr r0, _08006A50 + ldr r5, =0x030022c0 + ldr r0, =0x00000439 adds r5, r0 ldrb r0, [r5] lsls r4, r0, 31 @@ -13786,25 +13605,23 @@ obj_sync_something: @ 8006A0C ands r0, r1 orrs r4, r0 strb r4, [r5] - ldr r0, _08006A54 + ldr r0, =0x02021834 strb r2, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08006A4C: .4byte 0x030022c0 -_08006A50: .4byte 0x00000439 -_08006A54: .4byte 0x02021834 + .pool thumb_func_end obj_sync_something thumb_func_start update_obj_oam_coords update_obj_oam_coords: @ 8006A58 push {r4-r7,lr} movs r4, 0 - ldr r7, _08006AC4 - ldr r0, _08006AC8 + ldr r7, =0x02020630 + ldr r0, =0x000001ff adds r5, r0, 0 - ldr r6, _08006ACC + ldr r6, =0xfffffe00 _08006A64: lsls r0, r4, 4 adds r0, r4 @@ -13832,7 +13649,7 @@ _08006A64: lsls r0, 24 asrs r0, 24 adds r1, r0 - ldr r0, _08006AD0 + ldr r0, =0x02021bbc movs r2, 0 ldrsh r0, [r0, r2] adds r1, r0 @@ -13848,17 +13665,13 @@ _08006A64: adds r0, r3, 0 adds r0, 0x29 ldrb r0, [r0] - ldr r2, _08006AD4 + ldr r2, =0x02021bbe adds r0, r1 ldrb r2, [r2] adds r0, r2 b _08006B08 .align 2, 0 -_08006AC4: .4byte 0x02020630 -_08006AC8: .4byte 0x000001ff -_08006ACC: .4byte 0xfffffe00 -_08006AD0: .4byte 0x02021bbc -_08006AD4: .4byte 0x02021bbe + .pool _08006AD8: movs r2, 0x20 ldrsh r1, [r3, r2] @@ -13901,8 +13714,8 @@ _08006B0A: do_something_with_obj_priorites: @ 8006B1C push {r4,lr} movs r2, 0 - ldr r4, _08006B54 - ldr r3, _08006B58 + ldr r4, =0x02020630 + ldr r3, =0x02021774 _08006B24: lsls r0, r2, 4 adds r0, r2 @@ -13928,8 +13741,7 @@ _08006B24: pop {r0} bx r0 .align 2, 0 -_08006B54: .4byte 0x02020630 -_08006B58: .4byte 0x02021774 + .pool thumb_func_end do_something_with_obj_priorites thumb_func_start determine_visible_sprites_maybe @@ -13942,11 +13754,11 @@ determine_visible_sprites_maybe: @ 8006B5C sub sp, 0x4 movs r0, 0x1 mov r12, r0 - ldr r1, _08006C24 + ldr r1, =0x020217f4 mov r10, r1 - ldr r3, _08006C28 + ldr r3, =0xffffff00 mov r9, r3 - ldr r6, _08006C2C + ldr r6, =0xc0000300 mov r8, r6 _08006B78: mov r5, r12 @@ -13957,7 +13769,7 @@ _08006B78: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r7, _08006C30 + ldr r7, =0x02020630 adds r3, r0, r7 mov r0, r12 add r0, r10 @@ -13967,7 +13779,7 @@ _08006B78: lsls r0, 2 adds r4, r0, r7 lsls r2, 1 - ldr r0, _08006C34 + ldr r0, =0x02021774 adds r2, r0 ldrh r2, [r2] str r2, [sp] @@ -14042,11 +13854,7 @@ _08006C10: bne _08006CF6 b _08006CEE .align 2, 0 -_08006C24: .4byte 0x020217f4 -_08006C28: .4byte 0xffffff00 -_08006C2C: .4byte 0xc0000300 -_08006C30: .4byte 0x02020630 -_08006C34: .4byte 0x02021774 + .pool _08006C38: mov r1, r10 adds r3, r5, r1 @@ -14064,7 +13872,7 @@ _08006C38: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r6, _08006D14 + ldr r6, =0x02020630 adds r3, r0, r6 mov r7, r10 adds r0, r5, r7 @@ -14074,7 +13882,7 @@ _08006C38: lsls r0, 2 adds r4, r0, r6 lsls r2, 1 - ldr r0, _08006D18 + ldr r0, =0x02021774 adds r2, r0 ldrh r2, [r2] str r2, [sp] @@ -14168,16 +13976,15 @@ _08006D04: pop {r0} bx r0 .align 2, 0 -_08006D14: .4byte 0x02020630 -_08006D18: .4byte 0x02021774 + .pool thumb_func_end determine_visible_sprites_maybe thumb_func_start copy_rotscale_coeffs_to_super_sprites copy_rotscale_coeffs_to_super_sprites: @ 8006D1C push {r4-r6,lr} movs r4, 0 - ldr r5, _08006D60 - ldr r6, _08006D64 + ldr r5, =0x030022c0 + ldr r6, =0x02021bc0 _08006D24: lsls r2, r4, 2 lsls r1, r4, 5 @@ -14210,8 +14017,7 @@ _08006D24: pop {r0} bx r0 .align 2, 0 -_08006D60: .4byte 0x030022c0 -_08006D64: .4byte 0x02021bc0 + .pool thumb_func_end copy_rotscale_coeffs_to_super_sprites thumb_func_start super_sprites_fill @@ -14222,13 +14028,13 @@ super_sprites_fill: @ 8006D68 mov r0, sp strb r4, [r0] _08006D72: - ldr r0, _08006DE0 + ldr r0, =0x020217f4 adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08006DE4 + ldr r1, =0x02020630 adds r2, r0, r1 adds r0, r2, 0 adds r0, 0x3E @@ -14250,14 +14056,14 @@ _08006D9E: cmp r4, 0x3F bls _08006D72 mov r0, sp - ldr r4, _08006DE8 + ldr r4, =0x02021b38 ldrb r0, [r0] ldrb r1, [r4] cmp r0, r1 bcs _08006DD8 mov r1, sp - ldr r5, _08006DEC - ldr r0, _08006DF0 + ldr r5, =0x030022f8 + ldr r0, =0x082ec690 ldr r2, [r0] ldr r3, [r0, 0x4] _08006DBE: @@ -14280,11 +14086,7 @@ _08006DD8: pop {r0} bx r0 .align 2, 0 -_08006DE0: .4byte 0x020217f4 -_08006DE4: .4byte 0x02020630 -_08006DE8: .4byte 0x02021b38 -_08006DEC: .4byte 0x030022f8 -_08006DF0: .4byte 0x082ec690 + .pool thumb_func_end super_sprites_fill thumb_func_start obj_add_from_template_forward_search @@ -14295,7 +14097,7 @@ obj_add_from_template_forward_search: @ 8006DF4 lsls r3, 24 lsrs r4, r3, 24 movs r3, 0 - ldr r0, _08006E30 + ldr r0, =0x02020630 mov r12, r0 lsls r5, r1, 16 lsls r6, r2, 16 @@ -14319,7 +14121,7 @@ _08006E08: lsrs r0, 24 b _08006E40 .align 2, 0 -_08006E30: .4byte 0x02020630 + .pool _08006E34: adds r0, r3, 0x1 lsls r0, 24 @@ -14344,7 +14146,7 @@ obj_add_from_template_backward_search: @ 8006E48 lsls r3, 24 lsrs r6, r3, 24 movs r3, 0x3F - ldr r0, _08006E94 + ldr r0, =0x02020630 mov r8, r0 movs r0, 0x1 negs r0, r0 @@ -14374,7 +14176,7 @@ _08006E66: lsrs r0, 24 b _08006EA6 .align 2, 0 -_08006E94: .4byte 0x02020630 + .pool _08006E98: subs r0, r1, 0x1 lsls r0, 16 @@ -14396,7 +14198,7 @@ _08006EA6: obj_add_empty_with_callback: @ 8006EB4 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, _08006EEC + ldr r0, =0x082ec6ac movs r1, 0 movs r2, 0 movs r3, 0x1F @@ -14405,7 +14207,7 @@ obj_add_empty_with_callback: @ 8006EB4 lsrs r5, r0, 24 cmp r5, 0x40 beq _08006EF4 - ldr r4, _08006EF0 + ldr r4, =0x02020630 lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -14421,8 +14223,7 @@ obj_add_empty_with_callback: @ 8006EB4 adds r0, r5, 0 b _08006EF6 .align 2, 0 -_08006EEC: .4byte 0x082ec6ac -_08006EF0: .4byte 0x02020630 + .pool _08006EF4: movs r0, 0x40 _08006EF6: @@ -14454,7 +14255,7 @@ template_read: @ 8006EFC lsls r0, 4 add r0, r10 lsls r0, 2 - ldr r1, _08006FC0 + ldr r1, =0x02020630 adds r7, r0, r1 adds r0, r7, 0 bl obj_delete @@ -14505,7 +14306,7 @@ template_read: @ 8006EFC bl oam_center mov r0, r8 ldrh r1, [r0] - ldr r4, _08006FC4 + ldr r4, =0xffff0000 lsrs r0, r4, 16 cmp r1, r0 bne _08006FF8 @@ -14528,14 +14329,13 @@ template_read: @ 8006EFC movs r0, 0x40 b _08007040 .align 2, 0 -_08006FC0: .4byte 0x02020630 -_08006FC4: .4byte 0xffff0000 + .pool _08006FC8: - ldr r1, _08006FF0 + ldr r1, =0x000003ff adds r0, r1, 0 ands r2, r0 ldrh r1, [r7, 0x4] - ldr r0, _08006FF4 + ldr r0, =0xfffffc00 ands r0, r1 orrs r0, r2 strh r0, [r7, 0x4] @@ -14552,8 +14352,7 @@ _08006FC8: strh r0, [r1] b _0800700C .align 2, 0 -_08006FF0: .4byte 0x000003ff -_08006FF4: .4byte 0xfffffc00 + .pool _08006FF8: mov r1, r8 ldrh r0, [r1] @@ -14576,7 +14375,7 @@ _0800700C: _08007020: mov r0, r8 ldrh r1, [r0, 0x2] - ldr r0, _08007050 + ldr r0, =0x0000ffff cmp r1, r0 beq _0800703E mov r1, r8 @@ -14599,7 +14398,7 @@ _08007040: pop {r1} bx r1 .align 2, 0 -_08007050: .4byte 0x0000ffff + .pool thumb_func_end template_read thumb_func_start obj_add_from_template_call_callback_once @@ -14615,7 +14414,7 @@ obj_add_from_template_call_callback_once: @ 8007054 lsrs r3, 24 mov r9, r3 movs r3, 0 - ldr r5, _080070C4 + ldr r5, =0x02020630 lsls r1, 16 mov r12, r1 lsls r2, 16 @@ -14645,7 +14444,7 @@ _08007074: adds r5, r0, 0 cmp r5, 0x40 beq _080070D6 - ldr r1, _080070C8 + ldr r1, =0x0202064c adds r0, r6, r1 ldr r1, [r0] adds r0, r4, 0 @@ -14660,8 +14459,7 @@ _080070C0: adds r0, r5, 0 b _080070D8 .align 2, 0 -_080070C4: .4byte 0x02020630 -_080070C8: .4byte 0x0202064c + .pool _080070CC: adds r0, r3, 0x1 lsls r0, 24 @@ -14708,7 +14506,7 @@ obj_delete_and_free_tiles: @ 80070E8 adds r3, r1, 0 cmp r3, r4 bcs _0800713E - ldr r0, _0800714C + ldr r0, =0x02021b3c mov r12, r0 movs r6, 0x7 movs r7, 0x1 @@ -14735,7 +14533,7 @@ _08007144: pop {r0} bx r0 .align 2, 0 -_0800714C: .4byte 0x02021b3c + .pool thumb_func_end obj_delete_and_free_tiles thumb_func_start reset_super_sprites @@ -14747,8 +14545,8 @@ reset_super_sprites: @ 8007150 lsrs r3, r0, 24 cmp r3, r4 bcs _08007178 - ldr r6, _08007180 - ldr r5, _08007184 + ldr r6, =0x030022f8 + ldr r5, =0x082ec690 _08007162: lsls r0, r3, 3 adds r0, r6 @@ -14766,15 +14564,14 @@ _08007178: pop {r0} bx r0 .align 2, 0 -_08007180: .4byte 0x030022f8 -_08007184: .4byte 0x082ec690 + .pool thumb_func_end reset_super_sprites thumb_func_start copy_super_sprites_to_oam copy_super_sprites_to_oam: @ 8007188 push {lr} - ldr r2, _080071AC - ldr r1, _080071B0 + ldr r2, =0x030022c0 + ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x1 @@ -14785,27 +14582,25 @@ copy_super_sprites_to_oam: @ 8007188 adds r0, 0x38 movs r1, 0xE0 lsls r1, 19 - ldr r2, _080071B4 + ldr r2, =0x04000100 bl CpuSet _080071A8: pop {r0} bx r0 .align 2, 0 -_080071AC: .4byte 0x030022c0 -_080071B0: .4byte 0x00000439 -_080071B4: .4byte 0x04000100 + .pool thumb_func_end copy_super_sprites_to_oam thumb_func_start copy_queue_clear copy_queue_clear: @ 80071B8 push {r4,r5,lr} - ldr r0, _080071EC + ldr r0, =0x02021834 movs r1, 0 strb r1, [r0] - ldr r0, _080071F0 + ldr r0, =0x02021835 strb r1, [r0] movs r2, 0 - ldr r4, _080071F4 + ldr r4, =0x02021838 movs r3, 0 adds r5, r4, 0x4 _080071CC: @@ -14826,16 +14621,14 @@ _080071CC: pop {r0} bx r0 .align 2, 0 -_080071EC: .4byte 0x02021834 -_080071F0: .4byte 0x02021835 -_080071F4: .4byte 0x02021838 + .pool thumb_func_end copy_queue_clear thumb_func_start reset_rotscale_coeffs reset_rotscale_coeffs: @ 80071F8 push {r4,lr} movs r1, 0 - ldr r4, _08007220 + ldr r4, =0x02021bc0 movs r3, 0 movs r2, 0x80 lsls r2, 1 @@ -14855,7 +14648,7 @@ _08007204: pop {r0} bx r0 .align 2, 0 -_08007220: .4byte 0x02021bc0 + .pool thumb_func_end reset_rotscale_coeffs thumb_func_start rotscale_set_direct @@ -14863,7 +14656,7 @@ rotscale_set_direct: @ 8007224 push {r4,r5,lr} ldr r5, [sp, 0xC] lsls r0, 24 - ldr r4, _08007240 + ldr r4, =0x02021bc0 lsrs r0, 21 adds r0, r4 strh r1, [r0] @@ -14874,19 +14667,19 @@ rotscale_set_direct: @ 8007224 pop {r0} bx r0 .align 2, 0 -_08007240: .4byte 0x02021bc0 + .pool thumb_func_end rotscale_set_direct thumb_func_start obj_delete obj_delete: @ 8007244 push {lr} - ldr r1, _08007254 + ldr r1, =0x082ec64c movs r2, 0x44 bl memcpy pop {r0} bx r0 .align 2, 0 -_08007254: .4byte 0x082ec64c + .pool thumb_func_end obj_delete thumb_func_start oam_center @@ -14897,7 +14690,7 @@ oam_center: @ 8007258 lsls r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _08007298 + ldr r4, =0x082ec634 lsrs r2, 23 lsrs r1, 21 adds r2, r1 @@ -14924,7 +14717,7 @@ _08007286: pop {r0} bx r0 .align 2, 0 -_08007298: .4byte 0x082ec634 + .pool thumb_func_end oam_center thumb_func_start gpu_tile_obj_alloc @@ -14937,12 +14730,12 @@ gpu_tile_obj_alloc: @ 800729C lsrs r4, r0, 16 cmp r4, 0 bne _080072F2 - ldr r0, _080072E0 + ldr r0, =0x02021b3a ldrh r3, [r0] - ldr r0, _080072E4 + ldr r0, =0x000003ff cmp r3, r0 bhi _080072DA - ldr r7, _080072E8 + ldr r7, =0x02021b3c movs r6, 0x7 adds r4, r0, 0 movs r5, 0x1 @@ -14965,17 +14758,15 @@ _080072DA: movs r0, 0 b _080073A4 .align 2, 0 -_080072E0: .4byte 0x02021b3a -_080072E4: .4byte 0x000003ff -_080072E8: .4byte 0x02021b3c + .pool _080072EC: movs r0, 0x1 negs r0, r0 b _080073A4 _080072F2: - ldr r0, _080073B0 + ldr r0, =0x02021b3a ldrh r3, [r0] - ldr r0, _080073B4 + ldr r0, =0x02021b3c mov r9, r0 movs r7, 0x7 movs r6, 0x1 @@ -14991,7 +14782,7 @@ _080072FE: beq _08007332 movs r5, 0x80 lsls r5, 3 - ldr r2, _080073B4 + ldr r2, =0x02021b3c _08007316: adds r0, r3, 0x1 lsls r0, 16 @@ -15015,7 +14806,7 @@ _08007332: movs r1, 0x80 lsls r1, 3 mov r12, r1 - ldr r5, _080073B4 + ldr r5, =0x02021b3c _08007342: adds r0, r3, 0x1 lsls r0, 16 @@ -15048,7 +14839,7 @@ _0800736C: adds r6, r0, 0 cmp r3, r1 bge _080073A2 - ldr r0, _080073B4 + ldr r0, =0x02021b3c mov r8, r0 movs r7, 0x7 adds r4, r1, 0 @@ -15078,8 +14869,7 @@ _080073A4: pop {r1} bx r1 .align 2, 0 -_080073B0: .4byte 0x02021b3a -_080073B4: .4byte 0x02021b3c + .pool thumb_func_end gpu_tile_obj_alloc thumb_func_start gpu_tile_obj_alloc_map_bit_op @@ -15104,34 +14894,34 @@ gpu_tile_obj_alloc_map_bit_op: @ 80073B8 mvns r0, r0 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080073EC + ldr r0, =0x02021b3c adds r0, r3, r0 ldrb r1, [r0] ands r2, r1 strb r2, [r0] b _0800741C .align 2, 0 -_080073EC: .4byte 0x02021b3c + .pool _080073F0: cmp r1, 0x1 bne _0800740C lsls r1, r2 lsls r0, r1, 24 lsrs r2, r0, 24 - ldr r0, _08007408 + ldr r0, =0x02021b3c adds r0, r3, r0 ldrb r1, [r0] orrs r2, r1 strb r2, [r0] b _0800741C .align 2, 0 -_08007408: .4byte 0x02021b3c + .pool _0800740C: movs r0, 0x80 lsls r0, 17 lsls r0, r4 lsrs r5, r0, 24 - ldr r0, _08007424 + ldr r0, =0x02021b3c adds r0, r6, r0 ldrb r0, [r0] ands r5, r0 @@ -15141,7 +14931,7 @@ _0800741C: pop {r1} bx r1 .align 2, 0 -_08007424: .4byte 0x02021b3c + .pool thumb_func_end gpu_tile_obj_alloc_map_bit_op thumb_func_start nullsub_12 @@ -15152,16 +14942,16 @@ nullsub_12: @ 8007428 thumb_func_start copy_queue_process copy_queue_process: @ 800742C push {r4-r7,lr} - ldr r0, _0800747C + ldr r0, =0x02021834 ldrb r0, [r0] cmp r0, 0 beq _08007474 movs r4, 0 - ldr r1, _08007480 + ldr r1, =0x02021835 ldrb r0, [r1] cmp r0, 0 beq _0800746E - ldr r6, _08007484 + ldr r6, =0x02021838 adds r7, r6, 0x4 adds r5, r1, 0 _08007446: @@ -15185,7 +14975,7 @@ _08007446: cmp r1, 0 bne _08007446 _0800746E: - ldr r1, _0800747C + ldr r1, =0x02021834 movs r0, 0 strb r0, [r1] _08007474: @@ -15193,9 +14983,7 @@ _08007474: pop {r0} bx r0 .align 2, 0 -_0800747C: .4byte 0x02021834 -_08007480: .4byte 0x02021835 -_08007484: .4byte 0x02021838 + .pool thumb_func_end copy_queue_process thumb_func_start copy_queue_add_oam_frame @@ -15206,11 +14994,11 @@ copy_queue_add_oam_frame: @ 8007488 lsrs r2, r0, 16 lsls r1, 16 lsrs r6, r1, 16 - ldr r4, _080074E0 + ldr r4, =0x02021835 ldrb r0, [r4] cmp r0, 0x3F bhi _080074D8 - ldr r3, _080074E4 + ldr r3, =0x02021838 adds r1, r0, 0 lsls r0, r1, 1 adds r0, r1 @@ -15227,7 +15015,7 @@ copy_queue_add_oam_frame: @ 8007488 adds r0, r3, 0x4 adds r1, r0 lsls r0, r6, 5 - ldr r5, _080074E8 + ldr r5, =0x06010000 adds r0, r5 str r0, [r1] ldrb r1, [r4] @@ -15245,9 +15033,7 @@ _080074D8: pop {r0} bx r0 .align 2, 0 -_080074E0: .4byte 0x02021835 -_080074E4: .4byte 0x02021838 -_080074E8: .4byte 0x06010000 + .pool thumb_func_end copy_queue_add_oam_frame thumb_func_start copy_queue_add @@ -15257,11 +15043,11 @@ copy_queue_add: @ 80074EC adds r5, r1, 0 lsls r2, 16 lsrs r6, r2, 16 - ldr r3, _08007534 + ldr r3, =0x02021835 ldrb r0, [r3] cmp r0, 0x3F bhi _0800752C - ldr r2, _08007538 + ldr r2, =0x02021838 adds r1, r0, 0 lsls r0, r1, 1 adds r0, r1 @@ -15289,17 +15075,16 @@ _0800752C: pop {r0} bx r0 .align 2, 0 -_08007534: .4byte 0x02021835 -_08007538: .4byte 0x02021838 + .pool thumb_func_end copy_queue_add thumb_func_start copy_all_from_objects copy_all_from_objects: @ 800753C push {r4,lr} adds r1, r0, 0 - ldr r3, _0800755C + ldr r3, =0x02020630 movs r2, 0 - ldr r4, _08007560 + ldr r4, =0x000010ff _08007546: ldrb r0, [r3] strb r0, [r1] @@ -15312,17 +15097,16 @@ _08007546: pop {r0} bx r0 .align 2, 0 -_0800755C: .4byte 0x02020630 -_08007560: .4byte 0x000010ff + .pool thumb_func_end copy_all_from_objects thumb_func_start copy_all_to_objects copy_all_to_objects: @ 8007564 push {r4,lr} adds r1, r0, 0 - ldr r3, _08007584 + ldr r3, =0x02020630 movs r2, 0 - ldr r4, _08007588 + ldr r4, =0x000010ff _0800756E: ldrb r0, [r1] strb r0, [r3] @@ -15335,8 +15119,7 @@ _0800756E: pop {r0} bx r0 .align 2, 0 -_08007584: .4byte 0x02020630 -_08007588: .4byte 0x000010ff + .pool thumb_func_end copy_all_to_objects thumb_func_start obj_delete_all @@ -15347,10 +15130,10 @@ _08007590: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r5, _080075C0 + ldr r5, =0x02020630 adds r0, r5 bl obj_delete - ldr r0, _080075C4 + ldr r0, =0x020217f4 adds r0, r4, r0 strb r4, [r0] adds r0, r4, 0x1 @@ -15367,8 +15150,7 @@ _08007590: pop {r0} bx r0 .align 2, 0 -_080075C0: .4byte 0x02020630 -_080075C4: .4byte 0x020217f4 + .pool thumb_func_end obj_delete_all thumb_func_start obj_free_tiles @@ -15376,7 +15158,7 @@ obj_free_tiles: @ 80075C8 push {lr} ldr r2, [r0, 0x14] ldrh r1, [r2] - ldr r0, _080075E0 + ldr r0, =0x0000ffff cmp r1, r0 beq _080075DA adds r0, r1, 0 @@ -15385,7 +15167,7 @@ _080075DA: pop {r0} bx r0 .align 2, 0 -_080075E0: .4byte 0x0000ffff + .pool thumb_func_end obj_free_tiles thumb_func_start obj_free_pal @@ -15444,7 +15226,7 @@ obj_delete_and_free_resources: @ 8007620 obj_anim_step: @ 8007640 push {r4,r5,lr} adds r4, r0, 0 - ldr r2, _0800767C + ldr r2, =0x082ec6c4 adds r5, r4, 0 adds r5, 0x3F ldrb r1, [r5] @@ -15454,11 +15236,11 @@ obj_anim_step: @ 8007640 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 - ldr r0, _08007680 + ldr r0, =0x02021cc0 ldrb r0, [r0] cmp r0, 0 bne _08007676 - ldr r0, _08007684 + ldr r0, =0x082ec6cc ldrb r1, [r5] lsls r1, 28 lsrs r1, 31 @@ -15472,9 +15254,7 @@ _08007676: pop {r0} bx r0 .align 2, 0 -_0800767C: .4byte 0x082ec6c4 -_08007680: .4byte 0x02021cc0 -_08007684: .4byte 0x082ec6cc + .pool thumb_func_end obj_anim_step thumb_func_start obj_anim_image_begin @@ -15572,18 +15352,17 @@ _0800772E: adds r0, 0x40 ldrh r1, [r0] add r1, r9 - ldr r2, _08007754 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r4, 0x4] - ldr r0, _08007758 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] b _0800776C .align 2, 0 -_08007754: .4byte 0x000003ff -_08007758: .4byte 0xfffffc00 + .pool _0800775C: mov r1, r8 lsrs r0, r1, 16 @@ -15670,7 +15449,7 @@ _080077C8: lsls r0, 16 lsrs r2, r0, 16 _080077FE: - ldr r0, _08007814 + ldr r0, =0x082ec6d4 lsls r1, r2, 16 asrs r1, 14 adds r1, r0 @@ -15682,7 +15461,7 @@ _0800780E: pop {r0} bx r0 .align 2, 0 -_08007814: .4byte 0x082ec6d4 + .pool thumb_func_end obj_anim_image_continue thumb_func_start anim_image_3 @@ -15749,18 +15528,17 @@ _0800787C: adds r0, 0x40 ldrh r1, [r0] adds r1, r7 - ldr r2, _080078A4 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r4, 0x4] - ldr r0, _080078A8 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] b _080078BA .align 2, 0 -_080078A4: .4byte 0x000003ff -_080078A8: .4byte 0xfffffc00 + .pool _080078AC: mov r0, r8 ldrh r1, [r4, 0x4] @@ -15868,18 +15646,17 @@ _0800795A: adds r0, 0x40 ldrh r1, [r0] adds r1, r7 - ldr r2, _08007984 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r4, 0x4] - ldr r0, _08007988 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] b _0800799A .align 2, 0 -_08007984: .4byte 0x000003ff -_08007988: .4byte 0xfffffc00 + .pool _0800798C: mov r0, r8 ldrh r1, [r4, 0x4] @@ -16042,7 +15819,7 @@ obj_anim_rotscale_begin: @ 8007A90 ldr r0, [r0] movs r2, 0 ldrsh r1, [r0, r2] - ldr r0, _08007B1C + ldr r0, =0x00007fff cmp r1, r0 beq _08007B12 adds r0, r6, 0 @@ -16070,7 +15847,7 @@ obj_anim_rotscale_begin: @ 8007A90 adds r0, r4, 0 mov r1, sp bl sub_8008168 - ldr r1, _08007B20 + ldr r1, =0x03000b70 lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -16094,8 +15871,7 @@ _08007B12: pop {r0} bx r0 .align 2, 0 -_08007B1C: .4byte 0x00007fff -_08007B20: .4byte 0x03000b70 + .pool thumb_func_end obj_anim_rotscale_begin thumb_func_start obj_anim_rotscale_continue @@ -16114,7 +15890,7 @@ obj_anim_rotscale_continue: @ 8007B24 lsls r0, 24 lsrs r2, r0, 24 adds r5, r2, 0 - ldr r1, _08007B5C + ldr r1, =0x03000b70 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -16127,7 +15903,7 @@ obj_anim_rotscale_continue: @ 8007B24 bl sub_8007BD8 b _08007BAA .align 2, 0 -_08007B5C: .4byte 0x03000b70 + .pool _08007B60: adds r0, r4, 0 adds r0, 0x2C @@ -16150,15 +15926,15 @@ _08007B60: movs r2, 0x3 movs r0, 0 ldrsh r1, [r1, r0] - ldr r0, _08007BCC + ldr r0, =0x00007ffc cmp r1, r0 ble _08007B98 - ldr r2, _08007BD0 + ldr r2, =0xffff8003 adds r0, r1, r2 lsls r0, 16 lsrs r2, r0, 16 _08007B98: - ldr r0, _08007BD4 + ldr r0, =0x082ec6e4 lsls r1, r2, 16 asrs r1, 14 adds r1, r0 @@ -16185,9 +15961,7 @@ _08007BC6: pop {r0} bx r0 .align 2, 0 -_08007BCC: .4byte 0x00007ffc -_08007BD0: .4byte 0xffff8003 -_08007BD4: .4byte 0x082ec6e4 + .pool thumb_func_end obj_anim_rotscale_continue thumb_func_start sub_8007BD8 @@ -16223,7 +15997,7 @@ anim_rotscale_0: @ 8007C0C adds r3, r1, 0 lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08007C30 + ldr r1, =0x03000b70 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -16236,7 +16010,7 @@ anim_rotscale_0: @ 8007C0C bl sub_8007C7C b _08007C3C .align 2, 0 -_08007C30: .4byte 0x03000b70 + .pool _08007C34: adds r0, r2, 0 adds r1, r3, 0 @@ -16252,7 +16026,7 @@ sub_8007C40: @ 8007C40 adds r4, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08007C78 + ldr r1, =0x03000b70 lsls r3, r0, 1 adds r3, r0 lsls r3, 2 @@ -16275,7 +16049,7 @@ sub_8007C40: @ 8007C40 pop {r0} bx r0 .align 2, 0 -_08007C78: .4byte 0x03000b70 + .pool thumb_func_end sub_8007C40 thumb_func_start sub_8007C7C @@ -16284,7 +16058,7 @@ sub_8007C7C: @ 8007C7C adds r4, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r2, _08007CA8 + ldr r2, =0x03000b70 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -16300,7 +16074,7 @@ sub_8007C7C: @ 8007C7C pop {r0} bx r0 .align 2, 0 -_08007CA8: .4byte 0x03000b70 + .pool thumb_func_end sub_8007C7C thumb_func_start obj_anim_rotscale_rewind_to_cmd00_maybe @@ -16309,7 +16083,7 @@ obj_anim_rotscale_rewind_to_cmd00_maybe: @ 8007CAC mov r12, r1 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08007CD0 + ldr r1, =0x03000b70 lsls r3, r5, 1 adds r0, r3, r5 lsls r0, 2 @@ -16324,7 +16098,7 @@ obj_anim_rotscale_rewind_to_cmd00_maybe: @ 8007CAC adds r4, r3, 0 b _08007CDC .align 2, 0 -_08007CD0: .4byte 0x03000b70 + .pool _08007CD4: cmp r2, 0 beq _08007D00 @@ -16346,7 +16120,7 @@ _08007CDC: subs r0, 0x8 movs r7, 0 ldrsh r1, [r0, r7] - ldr r0, _08007D14 + ldr r0, =0x00007ffd cmp r1, r0 bne _08007CD4 _08007D00: @@ -16361,7 +16135,7 @@ _08007D0C: pop {r0} bx r0 .align 2, 0 -_08007D14: .4byte 0x00007ffd + .pool thumb_func_end obj_anim_rotscale_rewind_to_cmd00_maybe thumb_func_start anim_rotscale_1 @@ -16371,7 +16145,7 @@ anim_rotscale_1: @ 8007D18 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _08007D60 + ldr r0, =0x03000b70 lsls r4, r5, 1 adds r4, r5 lsls r4, 2 @@ -16400,7 +16174,7 @@ anim_rotscale_1: @ 8007D18 pop {r0} bx r0 .align 2, 0 -_08007D60: .4byte 0x03000b70 + .pool thumb_func_end anim_rotscale_1 thumb_func_start anim_rotscale_2 @@ -16418,7 +16192,7 @@ anim_rotscale_2: @ 8007D64 movs r3, 0x20 orrs r2, r3 strb r2, [r1] - ldr r2, _08007D9C + ldr r2, =0x03000b70 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -16432,7 +16206,7 @@ anim_rotscale_2: @ 8007D64 pop {r0} bx r0 .align 2, 0 -_08007D9C: .4byte 0x03000b70 + .pool thumb_func_end anim_rotscale_2 thumb_func_start anim_rotscale_3 @@ -16449,7 +16223,7 @@ anim_rotscale_3: @ 8007DA0 adds r0, r4, 0 mov r1, sp bl sub_8008168 - ldr r1, _08007DD4 + ldr r1, =0x03000b70 lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -16461,13 +16235,13 @@ anim_rotscale_3: @ 8007DA0 pop {r0} bx r0 .align 2, 0 -_08007DD4: .4byte 0x03000b70 + .pool thumb_func_end anim_rotscale_3 thumb_func_start rotscale_set_indirect rotscale_set_indirect: @ 8007DD8 lsls r0, 24 - ldr r2, _08007DF4 + ldr r2, =0x02021bc0 lsrs r0, 21 adds r0, r2 ldrh r2, [r1] @@ -16480,7 +16254,7 @@ rotscale_set_indirect: @ 8007DD8 strh r1, [r0, 0x6] bx lr .align 2, 0 -_08007DF4: .4byte 0x02021bc0 + .pool thumb_func_end rotscale_set_indirect thumb_func_start obj_get_rotscale_entry_index @@ -16559,7 +16333,7 @@ obj_update_pos2: @ 8007E54 mov r9, r0 cmp r6, r9 beq _08007EA2 - ldr r2, _08007EE8 + ldr r2, =0x082ec6f4 lsrs r1, 6 lsls r1, 3 ldrb r0, [r5, 0x1] @@ -16570,7 +16344,7 @@ obj_update_pos2: @ 8007E54 ldr r0, [r1] lsls r4, r0, 8 lsls r0, 16 - ldr r2, _08007EEC + ldr r2, =0x02021bc0 lsls r1, r7, 3 adds r1, r2 movs r2, 0 @@ -16584,7 +16358,7 @@ obj_update_pos2: @ 8007E54 _08007EA2: cmp r8, r9 beq _08007EDA - ldr r2, _08007EE8 + ldr r2, =0x082ec6f4 ldrb r1, [r5, 0x3] lsrs r1, 6 lsls r1, 3 @@ -16597,7 +16371,7 @@ _08007EA2: ldr r0, [r1] lsls r4, r0, 8 lsls r0, 16 - ldr r2, _08007EEC + ldr r2, =0x02021bc0 lsls r1, r7, 3 adds r1, r2 movs r2, 0x6 @@ -16616,8 +16390,7 @@ _08007EDA: pop {r0} bx r0 .align 2, 0 -_08007EE8: .4byte 0x082ec6f4 -_08007EEC: .4byte 0x02021bc0 + .pool thumb_func_end obj_update_pos2 thumb_func_start obj_set_horizonal_and_vertical_flip @@ -16685,7 +16458,7 @@ obj_set_horizonal_and_vertical_flip: @ 8007EF0 rotscale_reset_half: @ 8007F64 lsls r0, 24 lsrs r0, 24 - ldr r2, _08007F7C + ldr r2, =0x03000b70 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -16696,14 +16469,14 @@ rotscale_reset_half: @ 8007F64 strb r0, [r1, 0x3] bx lr .align 2, 0 -_08007F7C: .4byte 0x03000b70 + .pool thumb_func_end rotscale_reset_half thumb_func_start rotscale_reset_full_1 rotscale_reset_full_1: @ 8007F80 lsls r0, 24 lsrs r0, 24 - ldr r3, _08007FA4 + ldr r3, =0x03000b70 lsls r2, r0, 1 adds r2, r0 lsls r2, 2 @@ -16720,14 +16493,14 @@ rotscale_reset_full_1: @ 8007F80 strh r3, [r2, 0x8] bx lr .align 2, 0 -_08007FA4: .4byte 0x03000b70 + .pool thumb_func_end rotscale_reset_full_1 thumb_func_start rotscale_reset_full_2 rotscale_reset_full_2: @ 8007FA8 lsls r0, 24 lsrs r0, 24 - ldr r2, _08007FCC + ldr r2, =0x03000b70 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -16744,14 +16517,14 @@ rotscale_reset_full_2: @ 8007FA8 strh r0, [r1, 0x8] bx lr .align 2, 0 -_08007FCC: .4byte 0x03000b70 + .pool thumb_func_end rotscale_reset_full_2 thumb_func_start rotscale_frame_apply_absolute rotscale_frame_apply_absolute: @ 8007FD0 lsls r0, 24 lsrs r0, 24 - ldr r3, _08007FF0 + ldr r3, =0x03000b70 lsls r2, r0, 1 adds r2, r0 lsls r2, 2 @@ -16765,7 +16538,7 @@ rotscale_frame_apply_absolute: @ 8007FD0 strh r0, [r2, 0x8] bx lr .align 2, 0 -_08007FF0: .4byte 0x03000b70 + .pool thumb_func_end rotscale_frame_apply_absolute thumb_func_start obj_anim_image_delay_progress @@ -16805,7 +16578,7 @@ obj_anim_rotscale_delay_progress: @ 800801C ands r0, r1 cmp r0, 0 bne _08008040 - ldr r0, _08008048 + ldr r0, =0x03000b70 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -16819,7 +16592,7 @@ _08008040: pop {r1} bx r1 .align 2, 0 -_08008048: .4byte 0x03000b70 + .pool thumb_func_end obj_anim_rotscale_delay_progress thumb_func_start rotscale_frame_apply_relative_and_sync @@ -16829,7 +16602,7 @@ rotscale_frame_apply_relative_and_sync: @ 800804C adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _080080D4 + ldr r0, =0x03000b70 lsls r4, r5, 1 adds r4, r5 lsls r4, 2 @@ -16846,7 +16619,7 @@ rotscale_frame_apply_relative_and_sync: @ 800804C lsls r0, 8 ldrh r1, [r4, 0x8] adds r0, r1 - ldr r2, _080080D8 + ldr r2, =0xffffff00 adds r1, r2, 0 ands r0, r1 strh r0, [r4, 0x8] @@ -16855,7 +16628,7 @@ rotscale_frame_apply_relative_and_sync: @ 800804C bl divide_0x10000_by lsls r0, 16 lsrs r0, 16 - ldr r6, _080080DC + ldr r6, =0xffff0000 ldr r1, [sp] ands r1, r6 orrs r1, r0 @@ -16864,7 +16637,7 @@ rotscale_frame_apply_relative_and_sync: @ 800804C ldrsh r0, [r4, r2] bl divide_0x10000_by lsls r0, 16 - ldr r2, _080080E0 + ldr r2, =0x0000ffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -16888,10 +16661,7 @@ rotscale_frame_apply_relative_and_sync: @ 800804C pop {r0} bx r0 .align 2, 0 -_080080D4: .4byte 0x03000b70 -_080080D8: .4byte 0xffffff00 -_080080DC: .4byte 0xffff0000 -_080080E0: .4byte 0x0000ffff + .pool thumb_func_end rotscale_frame_apply_relative_and_sync thumb_func_start divide_0x10000_by @@ -16914,7 +16684,7 @@ rotscale_load_frame: @ 80080FC push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _08008164 + ldr r3, =0x03000b70 lsls r4, r0, 1 adds r4, r0 lsls r4, 2 @@ -16963,7 +16733,7 @@ rotscale_load_frame: @ 80080FC pop {r0} bx r0 .align 2, 0 -_08008164: .4byte 0x03000b70 + .pool thumb_func_end rotscale_load_frame thumb_func_start sub_8008168 @@ -17131,7 +16901,7 @@ sub_8008284: @ 8008284 bl obj_get_rotscale_entry_index lsls r0, 24 lsrs r0, 24 - ldr r2, _080082B4 + ldr r2, =0x03000b70 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -17147,7 +16917,7 @@ _080082AC: pop {r0} bx r0 .align 2, 0 -_080082B4: .4byte 0x03000b70 + .pool thumb_func_end sub_8008284 thumb_func_start sub_80082B8 @@ -17159,7 +16929,7 @@ sub_80082B8: @ 80082B8 bl obj_get_rotscale_entry_index lsls r0, 24 lsrs r0, 24 - ldr r2, _080082EC + ldr r2, =0x03000b70 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -17177,7 +16947,7 @@ sub_80082B8: @ 80082B8 pop {r0} bx r0 .align 2, 0 -_080082EC: .4byte 0x03000b70 + .pool thumb_func_end sub_80082B8 thumb_func_start sub_80082F0 @@ -17189,7 +16959,7 @@ sub_80082F0: @ 80082F0 bl obj_get_rotscale_entry_index lsls r0, 24 lsrs r0, 24 - ldr r2, _08008320 + ldr r2, =0x03000b70 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -17205,7 +16975,7 @@ _08008318: pop {r0} bx r0 .align 2, 0 -_08008320: .4byte 0x03000b70 + .pool thumb_func_end sub_80082F0 thumb_func_start sub_8008324 @@ -17241,11 +17011,11 @@ _08008358: adds r0, 0x40 ldrh r1, [r0] adds r1, r2 - ldr r2, _08008374 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r3, 0x4] - ldr r0, _08008378 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] @@ -17253,17 +17023,16 @@ _08008370: pop {r0} bx r0 .align 2, 0 -_08008374: .4byte 0x000003ff -_08008378: .4byte 0xfffffc00 + .pool thumb_func_end sub_8008324 thumb_func_start rotscale_reset_all rotscale_reset_all: @ 800837C push {r4,lr} - ldr r1, _080083A8 + ldr r1, =0x02021cc0 movs r0, 0 strb r0, [r1] - ldr r1, _080083AC + ldr r1, =0x03003018 movs r0, 0 str r0, [r1] bl reset_rotscale_coeffs @@ -17280,8 +17049,7 @@ _08008390: pop {r0} bx r0 .align 2, 0 -_080083A8: .4byte 0x02021cc0 -_080083AC: .4byte 0x03003018 + .pool thumb_func_end rotscale_reset_all thumb_func_start rotscale_alloc_entry @@ -17289,7 +17057,7 @@ rotscale_alloc_entry: @ 80083B0 push {r4,lr} movs r2, 0 movs r1, 0x1 - ldr r0, _080083D0 + ldr r0, =0x03003018 ldr r4, [r0] adds r3, r0, 0 _080083BC: @@ -17303,7 +17071,7 @@ _080083BC: adds r0, r2, 0 b _080083E2 .align 2, 0 -_080083D0: .4byte 0x03003018 + .pool _080083D4: adds r0, r2, 0x1 lsls r0, 24 @@ -17326,7 +17094,7 @@ rotscale_free_entry: @ 80083E8 lsrs r2, r0, 24 movs r0, 0 movs r1, 0x1 - ldr r3, _08008424 + ldr r3, =0x03003018 cmp r0, r2 bcs _08008406 _080083FA: @@ -17351,7 +17119,7 @@ _08008406: pop {r0} bx r0 .align 2, 0 -_08008424: .4byte 0x03003018 + .pool thumb_func_end rotscale_free_entry thumb_func_start obj_alloc_rotscale_entry @@ -17416,7 +17184,7 @@ sub_8008478: @ 8008478 bl divide_0x10000_by lsls r0, 16 lsrs r0, 16 - ldr r1, _080084F0 + ldr r1, =0xffff0000 mov r8, r1 ldr r1, [sp] mov r2, r8 @@ -17428,7 +17196,7 @@ sub_8008478: @ 8008478 adds r0, r4, 0 bl divide_0x10000_by lsls r0, 16 - ldr r2, _080084F4 + ldr r2, =0x0000ffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -17454,8 +17222,7 @@ sub_8008478: @ 8008478 pop {r0} bx r0 .align 2, 0 -_080084F0: .4byte 0xffff0000 -_080084F4: .4byte 0x0000ffff + .pool thumb_func_end sub_8008478 thumb_func_start gpu_tile_obj_alloc_tag_and_copy_to_vram @@ -17477,7 +17244,7 @@ gpu_tile_obj_alloc_tag_and_copy_to_vram: @ 80084F8 bl gpu_tile_obj_tag_add ldr r0, [r5] lsls r1, r6, 5 - ldr r2, _08008530 + ldr r2, =0x06010000 adds r1, r2 ldrh r2, [r5, 0x4] lsrs r2, 1 @@ -17485,7 +17252,7 @@ gpu_tile_obj_alloc_tag_and_copy_to_vram: @ 80084F8 adds r0, r4, 0 b _08008536 .align 2, 0 -_08008530: .4byte 0x06010000 + .pool _08008534: movs r0, 0 _08008536: @@ -17532,7 +17299,7 @@ gpu_tile_obj_free_by_tag: @ 8008568 lsrs r4, r0, 24 cmp r4, 0xFF beq _080085C6 - ldr r0, _080085D0 + ldr r0, =0x03000a70 lsls r1, r4, 2 adds r2, r1, r0 adds r0, 0x2 @@ -17540,12 +17307,12 @@ gpu_tile_obj_free_by_tag: @ 8008568 ldrh r0, [r1] ldrh r3, [r2] adds r0, r3, r0 - ldr r1, _080085D4 + ldr r1, =0x030009f0 mov r8, r1 lsls r5, r4, 1 cmp r3, r0 bge _080085BE - ldr r1, _080085D8 + ldr r1, =0x02021b3c mov r12, r1 movs r6, 0x7 movs r7, 0x1 @@ -17568,7 +17335,7 @@ _080085A2: _080085BE: mov r0, r8 adds r1, r5, r0 - ldr r0, _080085DC + ldr r0, =0x0000ffff strh r0, [r1] _080085C6: pop {r3} @@ -17577,20 +17344,17 @@ _080085C6: pop {r0} bx r0 .align 2, 0 -_080085D0: .4byte 0x03000a70 -_080085D4: .4byte 0x030009f0 -_080085D8: .4byte 0x02021b3c -_080085DC: .4byte 0x0000ffff + .pool thumb_func_end gpu_tile_obj_free_by_tag thumb_func_start gpu_tile_obj_tags_reset gpu_tile_obj_tags_reset: @ 80085E0 push {r4-r7,lr} movs r2, 0 - ldr r7, _08008614 - ldr r0, _08008618 + ldr r7, =0x030009f0 + ldr r0, =0x0000ffff adds r6, r0, 0 - ldr r4, _0800861C + ldr r4, =0x03000a70 movs r3, 0 adds r5, r4, 0x2 _080085F0: @@ -17613,9 +17377,7 @@ _080085F0: pop {r0} bx r0 .align 2, 0 -_08008614: .4byte 0x030009f0 -_08008618: .4byte 0x0000ffff -_0800861C: .4byte 0x03000a70 + .pool thumb_func_end gpu_tile_obj_tags_reset thumb_func_start gpu_tile_obj_tag_get_range_start @@ -17628,20 +17390,20 @@ gpu_tile_obj_tag_get_range_start: @ 8008620 lsrs r1, r0, 24 cmp r1, 0xFF beq _08008640 - ldr r0, _0800863C + ldr r0, =0x03000a70 lsls r1, 2 adds r1, r0 ldrh r0, [r1] b _08008642 .align 2, 0 -_0800863C: .4byte 0x03000a70 + .pool _08008640: - ldr r0, _08008648 + ldr r0, =0x0000ffff _08008642: pop {r1} bx r1 .align 2, 0 -_08008648: .4byte 0x0000ffff + .pool thumb_func_end gpu_tile_obj_tag_get_range_start thumb_func_start gpu_tile_obj_tag_index_of @@ -17650,7 +17412,7 @@ gpu_tile_obj_tag_index_of: @ 800864C lsls r0, 16 lsrs r2, r0, 16 movs r1, 0 - ldr r3, _08008664 + ldr r3, =0x030009f0 _08008656: lsls r0, r1, 1 adds r0, r3 @@ -17660,7 +17422,7 @@ _08008656: adds r0, r1, 0 b _08008674 .align 2, 0 -_08008664: .4byte 0x030009f0 + .pool _08008668: adds r0, r1, 0x1 lsls r0, 24 @@ -17679,9 +17441,9 @@ gpu_tile_obj_tag_get_by_range_start: @ 8008678 lsls r0, 16 lsrs r3, r0, 16 movs r2, 0 - ldr r6, _080086A0 - ldr r5, _080086A4 - ldr r4, _080086A8 + ldr r6, =0x030009f0 + ldr r5, =0x0000ffff + ldr r4, =0x03000a70 _08008686: lsls r0, r2, 1 adds r1, r0, r6 @@ -17696,22 +17458,20 @@ _08008686: ldrh r0, [r1] b _080086B8 .align 2, 0 -_080086A0: .4byte 0x030009f0 -_080086A4: .4byte 0x0000ffff -_080086A8: .4byte 0x03000a70 + .pool _080086AC: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3F bls _08008686 - ldr r0, _080086C0 + ldr r0, =0x0000ffff _080086B8: pop {r4-r6} pop {r1} bx r1 .align 2, 0 -_080086C0: .4byte 0x0000ffff + .pool thumb_func_end gpu_tile_obj_tag_get_by_range_start thumb_func_start gpu_tile_obj_tag_add @@ -17726,15 +17486,15 @@ gpu_tile_obj_tag_add: @ 80086C4 lsrs r5, 16 lsls r6, 16 lsrs r6, 16 - ldr r0, _08008700 + ldr r0, =0x0000ffff bl gpu_tile_obj_tag_index_of lsls r0, 24 lsrs r0, 24 - ldr r2, _08008704 + ldr r2, =0x030009f0 lsls r1, r0, 1 adds r1, r2 strh r4, [r1] - ldr r1, _08008708 + ldr r1, =0x03000a70 lsls r0, 2 adds r2, r0, r1 strh r5, [r2] @@ -17745,20 +17505,18 @@ gpu_tile_obj_tag_add: @ 80086C4 pop {r0} bx r0 .align 2, 0 -_08008700: .4byte 0x0000ffff -_08008704: .4byte 0x030009f0 -_08008708: .4byte 0x03000a70 + .pool thumb_func_end gpu_tile_obj_tag_add thumb_func_start gpu_pal_allocator_reset gpu_pal_allocator_reset: @ 800870C push {r4,lr} - ldr r1, _08008738 + ldr r1, =0x0300301c movs r0, 0 strb r0, [r1] movs r2, 0 - ldr r4, _0800873C - ldr r0, _08008740 + ldr r4, =0x03000cf0 + ldr r0, =0x0000ffff adds r3, r0, 0 _0800871C: lsls r0, r2, 1 @@ -17775,9 +17533,7 @@ _0800871C: pop {r0} bx r0 .align 2, 0 -_08008738: .4byte 0x0300301c -_0800873C: .4byte 0x03000cf0 -_08008740: .4byte 0x0000ffff + .pool thumb_func_end gpu_pal_allocator_reset thumb_func_start gpu_pal_obj_alloc_tag_and_apply @@ -17793,13 +17549,13 @@ gpu_pal_obj_alloc_tag_and_apply: @ 8008744 adds r0, r4, 0 b _0800878A _0800875A: - ldr r0, _08008780 + ldr r0, =0x0000ffff bl gpu_pal_tags_index_of lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF beq _08008788 - ldr r1, _08008784 + ldr r1, =0x03000cf0 lsls r0, r4, 1 adds r0, r1 ldrh r1, [r5, 0x4] @@ -17810,8 +17566,7 @@ _0800875A: adds r0, r4, 0 b _0800878A .align 2, 0 -_08008780: .4byte 0x0000ffff -_08008784: .4byte 0x03000cf0 + .pool _08008788: movs r0, 0xFF _0800878A: @@ -17867,21 +17622,20 @@ gpu_pal_alloc_new: @ 80087D4 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _080087F4 + ldr r0, =0x0000ffff bl gpu_pal_tags_index_of lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF beq _080087FC - ldr r1, _080087F8 + ldr r1, =0x03000cf0 lsls r0, r2, 1 adds r0, r1 strh r4, [r0] adds r0, r2, 0 b _080087FE .align 2, 0 -_080087F4: .4byte 0x0000ffff -_080087F8: .4byte 0x03000cf0 + .pool _080087FC: movs r0, 0xFF _080087FE: @@ -17895,11 +17649,11 @@ gpu_pal_tags_index_of: @ 8008804 push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _08008824 + ldr r0, =0x0300301c ldrb r1, [r0] cmp r1, 0xF bhi _08008836 - ldr r3, _08008828 + ldr r3, =0x03000cf0 _08008814: lsls r0, r1, 1 adds r0, r3 @@ -17909,8 +17663,7 @@ _08008814: adds r0, r1, 0 b _08008838 .align 2, 0 -_08008824: .4byte 0x0300301c -_08008828: .4byte 0x03000cf0 + .pool _0800882C: adds r0, r1, 0x1 lsls r0, 24 @@ -17927,13 +17680,13 @@ _08008838: thumb_func_start gpu_pal_tag_by_index gpu_pal_tag_by_index: @ 800883C lsls r0, 24 - ldr r1, _08008848 + ldr r1, =0x03000cf0 lsrs r0, 23 adds r0, r1 ldrh r0, [r0] bx lr .align 2, 0 -_08008848: .4byte 0x03000cf0 + .pool thumb_func_end gpu_pal_tag_by_index thumb_func_start gpu_pal_free_tag @@ -17946,17 +17699,16 @@ gpu_pal_free_tag: @ 800884C lsrs r1, r0, 24 cmp r1, 0xFF beq _08008868 - ldr r0, _0800886C + ldr r0, =0x03000cf0 lsls r1, 1 adds r1, r0 - ldr r0, _08008870 + ldr r0, =0x0000ffff strh r0, [r1] _08008868: pop {r0} bx r0 .align 2, 0 -_0800886C: .4byte 0x03000cf0 -_08008870: .4byte 0x0000ffff + .pool thumb_func_end gpu_pal_free_tag thumb_func_start obj_set_f18_to_r0_f42_to_40 @@ -17973,7 +17725,7 @@ super_sprite_add: @ 8008880 push {r4,lr} adds r4, r0, 0 adds r3, r1, 0 - ldr r1, _08008894 + ldr r1, =0x02021b38 ldrb r0, [r3] ldrb r1, [r1] cmp r0, r1 @@ -17981,7 +17733,7 @@ super_sprite_add: @ 8008880 movs r0, 0x1 b _080088E0 .align 2, 0 -_08008894: .4byte 0x02021b38 + .pool _08008898: ldr r0, [r4, 0x18] cmp r0, 0 @@ -17994,7 +17746,7 @@ _08008898: cmp r0, 0 bne _080088CC _080088AC: - ldr r0, _080088C8 + ldr r0, =0x030022c0 ldrb r2, [r3] lsls r2, 3 adds r0, 0x38 @@ -18009,11 +17761,11 @@ _080088AC: movs r0, 0 b _080088E0 .align 2, 0 -_080088C8: .4byte 0x030022c0 + .pool _080088CC: ldrb r1, [r3] lsls r1, 3 - ldr r0, _080088E8 + ldr r0, =0x030022f8 adds r1, r0 adds r0, r4, 0 adds r2, r3, 0 @@ -18025,7 +17777,7 @@ _080088E0: pop {r1} bx r1 .align 2, 0 -_080088E8: .4byte 0x030022f8 + .pool thumb_func_end super_sprite_add thumb_func_start sub_80088EC @@ -18039,7 +17791,7 @@ sub_80088EC: @ 80088EC adds r3, r0, 0 str r1, [sp] mov r8, r2 - ldr r0, _0800890C + ldr r0, =0x02021b38 ldrb r1, [r2] ldrb r0, [r0] cmp r1, r0 @@ -18048,7 +17800,7 @@ _08008908: movs r0, 0x1 b _08008AE6 .align 2, 0 -_0800890C: .4byte 0x02021b38 + .pool _08008910: adds r0, r3, 0 adds r0, 0x42 @@ -18131,7 +17883,7 @@ _080089A0: _080089A6: mov r2, r8 ldrb r0, [r2] - ldr r1, _08008AF8 + ldr r1, =0x02021b38 ldrb r1, [r1] cmp r0, r1 bcs _08008908 @@ -18158,7 +17910,7 @@ _080089A6: lsrs r0, 30 lsls r0, 4 adds r1, r0 - ldr r0, _08008AFC + ldr r0, =0x082ec754 adds r1, r0 ldrb r1, [r1] lsls r1, 24 @@ -18184,7 +17936,7 @@ _080089FC: lsrs r0, 30 lsls r0, 4 adds r1, r0 - ldr r2, _08008AFC + ldr r2, =0x082ec754 adds r1, r2 ldrb r1, [r1, 0x1] lsls r1, 24 @@ -18234,11 +17986,11 @@ _08008A2E: asrs r1, 16 ldr r0, [sp, 0x14] adds r1, r0, r1 - ldr r2, _08008B00 + ldr r2, =0x000001ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r3, 0x2] - ldr r0, _08008B04 + ldr r0, =0xfffffe00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x2] @@ -18252,11 +18004,11 @@ _08008A2E: lsrs r1, 22 ldr r2, [sp, 0x4] adds r1, r2, r1 - ldr r2, _08008B08 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r3, 0x4] - ldr r0, _08008B0C + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] @@ -18303,12 +18055,7 @@ _08008AE6: pop {r1} bx r1 .align 2, 0 -_08008AF8: .4byte 0x02021b38 -_08008AFC: .4byte 0x082ec754 -_08008B00: .4byte 0x000001ff -_08008B04: .4byte 0xfffffe00 -_08008B08: .4byte 0x000003ff -_08008B0C: .4byte 0xfffffc00 + .pool thumb_func_end sub_80088EC thumb_func_start strcpy_limit_10_chars @@ -18602,7 +18349,7 @@ decimal_int_to_string: @ 8008CC0 adds r4, r0, 0 adds r6, r1, 0 lsls r3, 24 - ldr r0, _08008D18 + ldr r0, =0x082ec7e4 lsrs r3, 22 subs r3, 0x4 adds r3, r0 @@ -18619,7 +18366,7 @@ _08008CE4: adds r5, r0, 0 cmp r5, 0 ble _08008D60 - ldr r0, _08008D1C + ldr r0, =0x082ec7d4 mov r8, r0 _08008CEE: adds r0, r6, 0 @@ -18642,8 +18389,7 @@ _08008CEE: ldrb r0, [r0] b _08008D22 .align 2, 0 -_08008D18: .4byte 0x082ec7e4 -_08008D1C: .4byte 0x082ec7d4 + .pool _08008D20: movs r0, 0xAC _08008D22: @@ -18702,7 +18448,7 @@ sub_8008D70: @ 8008D70 adds r4, r0, 0 adds r6, r1, 0 lsls r3, 24 - ldr r0, _08008DC8 + ldr r0, =0x082ec7e4 lsrs r3, 22 subs r3, 0x4 adds r3, r0 @@ -18719,7 +18465,7 @@ _08008D94: adds r5, r0, 0 cmp r5, 0 ble _08008E10 - ldr r0, _08008DCC + ldr r0, =0x082ec7d4 mov r8, r0 _08008D9E: adds r0, r6, 0 @@ -18742,8 +18488,7 @@ _08008D9E: ldrb r0, [r0] b _08008DD2 .align 2, 0 -_08008DC8: .4byte 0x082ec7e4 -_08008DCC: .4byte 0x082ec7d4 + .pool _08008DD0: movs r0, 0xAC _08008DD2: @@ -18829,7 +18574,7 @@ _08008E54: adds r5, r1, 0 cmp r5, 0 ble _08008ECA - ldr r0, _08008E8C + ldr r0, =0x082ec7d4 mov r9, r0 _08008E5E: mov r0, r8 @@ -18854,7 +18599,7 @@ _08008E5E: ldrb r0, [r0] b _08008EAC .align 2, 0 -_08008E8C: .4byte 0x082ec7d4 + .pool _08008E90: cmp r4, 0 bne _08008E98 @@ -18917,12 +18662,12 @@ _08008EE6: cmp r0, 0x5 bhi _08008FBA lsls r0, 2 - ldr r1, _08008EFC + ldr r1, =_08008F00 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08008EFC: .4byte _08008F00 + .pool .align 2, 0 _08008F00: .4byte _08008FBA @@ -18951,12 +18696,12 @@ _08008F2C: cmp r0, 0x14 bhi _08008FB0 lsls r0, 2 - ldr r1, _08008F48 + ldr r1, =_08008F4C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08008F48: .4byte _08008F4C + .pool .align 2, 0 _08008F4C: .4byte _08008FA0 @@ -19015,12 +18760,12 @@ sub_8008FCC: @ 8008FCC sub sp, 0xC adds r5, r0, 0 adds r6, r1, 0 - ldr r1, _08009004 + ldr r1, =0x082ec80c mov r0, sp movs r2, 0x4 bl memcpy add r4, sp, 0x4 - ldr r1, _08009008 + ldr r1, =0x082ec810 adds r0, r4, 0 movs r2, 0x5 bl memcpy @@ -19038,8 +18783,7 @@ _08008FF4: bne _08009012 b _0800901E .align 2, 0 -_08009004: .4byte 0x082ec80c -_08009008: .4byte 0x082ec810 + .pool _0800900C: adds r0, r5, 0 adds r1, r4, 0 @@ -19062,143 +18806,141 @@ _0800901E: thumb_func_start sub_800902C sub_800902C: @ 800902C - ldr r0, _08009030 + ldr r0, =0x020223ac bx lr .align 2, 0 -_08009030: .4byte 0x020223ac + .pool thumb_func_end sub_800902C thumb_func_start sub_8009034 sub_8009034: @ 8009034 - ldr r0, _0800903C + ldr r0, =0x03005d90 ldr r0, [r0] bx lr .align 2, 0 -_0800903C: .4byte 0x03005d90 + .pool thumb_func_end sub_8009034 thumb_func_start sub_8009040 sub_8009040: @ 8009040 - ldr r0, _08009044 + ldr r0, =0x02021cc4 bx lr .align 2, 0 -_08009044: .4byte 0x02021cc4 + .pool thumb_func_end sub_8009040 thumb_func_start sub_8009048 sub_8009048: @ 8009048 - ldr r0, _0800904C + ldr r0, =0x02021dc4 bx lr .align 2, 0 -_0800904C: .4byte 0x02021dc4 + .pool thumb_func_end sub_8009048 thumb_func_start sub_8009050 sub_8009050: @ 8009050 - ldr r0, _08009054 + ldr r0, =0x02021ec4 bx lr .align 2, 0 -_08009054: .4byte 0x02021ec4 + .pool thumb_func_end sub_8009050 thumb_func_start sub_8009058 sub_8009058: @ 8009058 push {lr} - ldr r0, _08009068 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 beq _08009070 - ldr r0, _0800906C + ldr r0, =0x085e821a b _08009072 .align 2, 0 -_08009068: .4byte 0x03005d90 -_0800906C: .4byte 0x085e821a + .pool _08009070: - ldr r0, _08009078 + ldr r0, =0x085e8219 _08009072: pop {r1} bx r1 .align 2, 0 -_08009078: .4byte 0x085e8219 + .pool thumb_func_end sub_8009058 thumb_func_start sub_800907C sub_800907C: @ 800907C push {lr} - ldr r0, _0800908C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 beq _08009094 - ldr r0, _08009090 + ldr r0, =0x085e8258 b _08009096 .align 2, 0 -_0800908C: .4byte 0x03005d90 -_08009090: .4byte 0x085e8258 + .pool _08009094: - ldr r0, _0800909C + ldr r0, =0x085e8260 _08009096: pop {r1} bx r1 .align 2, 0 -_0800909C: .4byte 0x085e8260 + .pool thumb_func_end sub_800907C thumb_func_start sub_80090A0 sub_80090A0: @ 80090A0 - ldr r0, _080090A4 + ldr r0, =0x085e8229 bx lr .align 2, 0 -_080090A4: .4byte 0x085e8229 + .pool thumb_func_end sub_80090A0 thumb_func_start sub_80090A8 sub_80090A8: @ 80090A8 - ldr r0, _080090AC + ldr r0, =0x085e8231 bx lr .align 2, 0 -_080090AC: .4byte 0x085e8231 + .pool thumb_func_end sub_80090A8 thumb_func_start sub_80090B0 sub_80090B0: @ 80090B0 - ldr r0, _080090B4 + ldr r0, =0x085e8236 bx lr .align 2, 0 -_080090B4: .4byte 0x085e8236 + .pool thumb_func_end sub_80090B0 thumb_func_start sub_80090B8 sub_80090B8: @ 80090B8 - ldr r0, _080090BC + ldr r0, =0x085e823c bx lr .align 2, 0 -_080090BC: .4byte 0x085e823c + .pool thumb_func_end sub_80090B8 thumb_func_start sub_80090C0 sub_80090C0: @ 80090C0 - ldr r0, _080090C4 + ldr r0, =0x085e8243 bx lr .align 2, 0 -_080090C4: .4byte 0x085e8243 + .pool thumb_func_end sub_80090C0 thumb_func_start sub_80090C8 sub_80090C8: @ 80090C8 - ldr r0, _080090CC + ldr r0, =0x085e8249 bx lr .align 2, 0 -_080090CC: .4byte 0x085e8249 + .pool thumb_func_end sub_80090C8 thumb_func_start sub_80090D0 sub_80090D0: @ 80090D0 - ldr r0, _080090D4 + ldr r0, =0x085e8250 bx lr .align 2, 0 -_080090D4: .4byte 0x085e8250 + .pool thumb_func_end sub_80090D0 thumb_func_start get_fcode_buffer @@ -19206,21 +18948,21 @@ get_fcode_buffer: @ 80090D8 push {lr} cmp r0, 0xD bhi _080090F0 - ldr r1, _080090EC + ldr r1, =0x082ec818 lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _call_via_r0 b _080090F2 .align 2, 0 -_080090EC: .4byte 0x082ec818 + .pool _080090F0: - ldr r0, _080090F8 + ldr r0, =0x085e8218 _080090F2: pop {r1} bx r1 .align 2, 0 -_080090F8: .4byte 0x085e8218 + .pool thumb_func_end get_fcode_buffer thumb_func_start sub_80090FC @@ -19277,7 +19019,7 @@ _08009148: subs r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _08009178 + ldr r0, =0x0000ffff cmp r3, r0 beq _0800916C adds r1, r0, 0 @@ -19297,7 +19039,7 @@ _0800916C: pop {r1} bx r1 .align 2, 0 -_08009178: .4byte 0x0000ffff + .pool thumb_func_end sub_8009128 thumb_func_start sub_800917C @@ -19478,14 +19220,14 @@ sub_800927C: @ 800927C movs r0, 0 cmp r1, 0x18 bhi _0800928E - ldr r0, _08009294 + ldr r0, =0x082ec850 adds r0, r1, r0 ldrb r0, [r0] _0800928E: pop {r1} bx r1 .align 2, 0 -_08009294: .4byte 0x082ec850 + .pool thumb_func_end sub_800927C thumb_func_start sub_8009298 @@ -19668,7 +19410,7 @@ sub_80093CC: @ 80093CC bl sub_800B488 bl sub_800E700 bl sub_800BEC0 - ldr r1, _080093F0 + ldr r1, =0x00008001 cmp r0, r1 beq _080093F4 bl sub_800B4A4 @@ -19677,7 +19419,7 @@ sub_80093CC: @ 80093CC movs r0, 0 b _080093FE .align 2, 0 -_080093F0: .4byte 0x00008001 + .pool _080093F4: bl rfu_REQ_stopMode bl rfu_waitREQComplete @@ -19715,12 +19457,12 @@ sub_8009414: @ 8009414 lsrs r7, r3, 24 lsls r4, 16 lsrs r4, 16 - ldr r0, _08009470 + ldr r0, =0x082ecf20 lsls r1, r5, 4 movs r2, 0x20 bl gpu_pal_apply - ldr r3, _08009474 - ldr r0, _08009478 + ldr r3, =0x040000d4 + ldr r0, =0x082ecf40 str r0, [r3] lsls r2, r7, 14 lsls r0, r4, 5 @@ -19729,10 +19471,10 @@ sub_8009414: @ 8009414 adds r0, r1 adds r2, r0 str r2, [r3, 0x4] - ldr r0, _0800947C + ldr r0, =0x80000110 str r0, [r3, 0x8] ldr r0, [r3, 0x8] - ldr r0, _08009480 + ldr r0, =0x03003130 str r6, [r0] str r5, [r0, 0x4] str r4, [r0, 0x8] @@ -19745,11 +19487,7 @@ sub_8009414: @ 8009414 beq _0800948C b _080094C0 .align 2, 0 -_08009470: .4byte 0x082ecf20 -_08009474: .4byte 0x040000d4 -_08009478: .4byte 0x082ecf40 -_0800947C: .4byte 0x80000110 -_08009480: .4byte 0x03003130 + .pool _08009484: mov r0, r8 cmp r0, 0x3 @@ -19821,29 +19559,29 @@ sub_80094EC: @ 80094EC lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _08009558 + ldr r0, =0x082ecf20 mov r2, r8 lsls r1, r2, 4 movs r2, 0x20 bl gpu_pal_apply - ldr r2, _0800955C - ldr r0, _08009560 + ldr r2, =0x040000d4 + ldr r0, =0x082ecf40 str r0, [r2] lsls r0, r5, 14 movs r1, 0xC0 lsls r1, 19 adds r0, r1 str r0, [r2, 0x4] - ldr r0, _08009564 + ldr r0, =0x80000110 str r0, [r2, 0x8] ldr r0, [r2, 0x8] - ldr r0, _08009568 + ldr r0, =0x03003130 str r4, [r0] mov r1, r8 str r1, [r0, 0x4] movs r1, 0 str r1, [r0, 0x8] - ldr r0, _0800956C + ldr r0, =0x082ed1d0 adds r6, r0 ldrb r0, [r6] lsls r4, 8 @@ -19857,12 +19595,7 @@ sub_80094EC: @ 80094EC pop {r0} bx r0 .align 2, 0 -_08009558: .4byte 0x082ecf20 -_0800955C: .4byte 0x040000d4 -_08009560: .4byte 0x082ecf40 -_08009564: .4byte 0x80000110 -_08009568: .4byte 0x03003130 -_0800956C: .4byte 0x082ed1d0 + .pool thumb_func_end sub_80094EC thumb_func_start sub_8009570 @@ -19872,21 +19605,21 @@ sub_8009570: @ 8009570 bl reset_all_obj_data bl gpu_pal_allocator_reset bl clear_tasks - ldr r0, _08009604 + ldr r0, =sub_80096BC + 1 bl SetVBlankCallback bl sub_800A2E0 - ldr r1, _08009608 - ldr r2, _0800960C + ldr r1, =0x020229c6 + ldr r2, =0x00001111 adds r0, r2, 0 strh r0, [r1] bl sub_8009734 - ldr r0, _08009610 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x24] bl SeedRng movs r4, 0 _080095A0: bl GenerateRandomNumber - ldr r1, _08009614 + ldr r1, =0x03005d90 ldr r1, [r1] adds r1, 0xA adds r1, r4 @@ -19905,53 +19638,45 @@ _080095A0: lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _08009618 + ldr r0, =sub_8009404 + 1 movs r1, 0 bl AddTask bl run_active_tasks bl call_obj_callbacks bl obj_sync_something bl fade_and_return_progress_probably - ldr r0, _0800961C + ldr r0, =0x03000d60 str r4, [r0] bl sub_8009638 - ldr r0, _08009620 + ldr r0, =task00_link_test + 1 movs r1, 0 bl AddTask - ldr r0, _08009624 + ldr r0, =c2_08009A8C + 1 bl set_callback2 add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_08009604: .4byte sub_80096BC + 1 -_08009608: .4byte 0x020229c6 -_0800960C: .4byte 0x00001111 -_08009610: .4byte 0x030022c0 -_08009614: .4byte 0x03005d90 -_08009618: .4byte sub_8009404 + 1 -_0800961C: .4byte 0x03000d60 -_08009620: .4byte task00_link_test + 1 -_08009624: .4byte c2_08009A8C + 1 + .pool thumb_func_end sub_8009570 thumb_func_start sub_8009628 sub_8009628: @ 8009628 lsls r0, 24 lsrs r0, 24 - ldr r1, _08009634 + ldr r1, =0x020229cc strh r0, [r1, 0x18] bx lr .align 2, 0 -_08009634: .4byte 0x020229cc + .pool thumb_func_end sub_8009628 thumb_func_start sub_8009638 sub_8009638: @ 8009638 push {r4,r5,lr} - ldr r5, _080096A4 - ldr r4, _080096A8 + ldr r5, =0x020229cc + ldr r4, =0x03005d90 ldr r1, [r4] ldrb r2, [r1, 0xA] ldrb r0, [r1, 0xB] @@ -19970,13 +19695,13 @@ sub_8009638: @ 8009638 ldr r0, [r4] ldrb r0, [r0, 0x8] strb r0, [r5, 0x13] - ldr r0, _080096AC + ldr r0, =0x020229c6 ldrh r0, [r0] str r0, [r5, 0x14] - ldr r0, _080096B0 + ldr r0, =0x082e9531 ldrb r0, [r0] strh r0, [r5, 0x1A] - ldr r0, _080096B4 + ldr r0, =0x082e9530 ldrb r0, [r0] movs r2, 0x80 lsls r2, 7 @@ -19988,7 +19713,7 @@ sub_8009638: @ 8009638 strh r0, [r5, 0x2] bl sub_809D42C strb r0, [r5, 0x10] - ldr r0, _080096B8 + ldr r0, =0x0000087f bl flag_check lsls r0, 24 cmp r0, 0 @@ -20002,12 +19727,7 @@ _0800969E: pop {r0} bx r0 .align 2, 0 -_080096A4: .4byte 0x020229cc -_080096A8: .4byte 0x03005d90 -_080096AC: .4byte 0x020229c6 -_080096B0: .4byte 0x082e9531 -_080096B4: .4byte 0x082e9530 -_080096B8: .4byte 0x0000087f + .pool thumb_func_end sub_8009638 thumb_func_start sub_80096BC @@ -20023,9 +19743,9 @@ sub_80096BC: @ 80096BC thumb_func_start sub_80096D0 sub_80096D0: @ 80096D0 push {lr} - ldr r3, _080096F0 - ldr r1, _080096F4 - ldr r2, _080096F8 + ldr r3, =0x020229c4 + ldr r1, =0x03003110 + ldr r2, =0x0000efff adds r0, r1, 0 adds r0, 0xE _080096DC: @@ -20039,9 +19759,7 @@ _080096DC: pop {r0} bx r0 .align 2, 0 -_080096F0: .4byte 0x020229c4 -_080096F4: .4byte 0x03003110 -_080096F8: .4byte 0x0000efff + .pool thumb_func_end sub_80096D0 thumb_func_start task02_080097CC @@ -20049,7 +19767,7 @@ task02_080097CC: @ 80096FC push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0800972C + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -20061,7 +19779,7 @@ task02_080097CC: @ 80096FC asrs r0, 16 cmp r0, 0x5 bne _08009726 - ldr r1, _08009730 + ldr r1, =0x03003144 movs r0, 0x1 strb r0, [r1] adds r0, r2, 0 @@ -20070,66 +19788,55 @@ _08009726: pop {r0} bx r0 .align 2, 0 -_0800972C: .4byte 0x03005e00 -_08009730: .4byte 0x03003144 + .pool thumb_func_end task02_080097CC thumb_func_start sub_8009734 sub_8009734: @ 8009734 push {r4-r6,lr} - ldr r0, _0800977C + ldr r0, =0x030030fc ldrb r4, [r0] cmp r4, 0 bne _080097A8 bl sub_800B628 bl sub_80096D0 - ldr r1, _08009780 - ldr r0, _08009784 + ldr r1, =0x03003140 + ldr r0, =sub_800A824 + 1 str r0, [r1] - ldr r0, _08009788 + ldr r0, =0x03002748 strb r4, [r0] - ldr r0, _0800978C + ldr r0, =0x0300306c strb r4, [r0] - ldr r0, _08009790 + ldr r0, =0x030030f8 strb r4, [r0] bl sub_800A5B4 bl sub_800A2E0 - ldr r0, _08009794 + ldr r0, =0x03000d54 str r4, [r0] - ldr r0, _08009798 + ldr r0, =0x030030e8 strb r4, [r0] - ldr r0, _0800979C + ldr r0, =0x030030e4 strb r4, [r0] - ldr r0, _080097A0 + ldr r0, =0x030030f4 strh r4, [r0] - ldr r0, _080097A4 + ldr r0, =task02_080097CC + 1 movs r1, 0x2 bl AddTask b _080097AC .align 2, 0 -_0800977C: .4byte 0x030030fc -_08009780: .4byte 0x03003140 -_08009784: .4byte sub_800A824 + 1 -_08009788: .4byte 0x03002748 -_0800978C: .4byte 0x0300306c -_08009790: .4byte 0x030030f8 -_08009794: .4byte 0x03000d54 -_08009798: .4byte 0x030030e8 -_0800979C: .4byte 0x030030e4 -_080097A0: .4byte 0x030030f4 -_080097A4: .4byte task02_080097CC + 1 + .pool _080097A8: bl sub_800E700 _080097AC: - ldr r1, _080097D8 + ldr r1, =0x03003124 movs r0, 0 strb r0, [r1] movs r1, 0 - ldr r6, _080097DC + ldr r6, =0x03003078 movs r2, 0 movs r5, 0x1 - ldr r4, _080097E0 - ldr r3, _080097E4 + ldr r4, =0x030030f0 + ldr r3, =0x030030ec _080097BE: adds r0, r1, r6 strb r5, [r0] @@ -20144,34 +19851,29 @@ _080097BE: pop {r0} bx r0 .align 2, 0 -_080097D8: .4byte 0x03003124 -_080097DC: .4byte 0x03003078 -_080097E0: .4byte 0x030030f0 -_080097E4: .4byte 0x030030ec + .pool thumb_func_end sub_8009734 thumb_func_start sub_80097E8 sub_80097E8: @ 80097E8 push {r4,lr} - ldr r0, _0800980C + ldr r0, =0x03003124 movs r4, 0 strb r4, [r0] - ldr r0, _08009810 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080097FC bl sub_800EDD4 _080097FC: - ldr r0, _08009814 + ldr r0, =0x020229c4 strb r4, [r0] bl sub_800B53C pop {r4} pop {r0} bx r0 .align 2, 0 -_0800980C: .4byte 0x03003124 -_08009810: .4byte 0x030030fc -_08009814: .4byte 0x020229c4 + .pool thumb_func_end sub_80097E8 thumb_func_start sub_8009818 @@ -20180,8 +19882,8 @@ sub_8009818: @ 8009818 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r5, _080098DC - ldr r4, _080098E0 + ldr r5, =0x03000d64 + ldr r4, =0x03000d10 ldrb r0, [r5] ldrh r1, [r4] cmp r0, r1 @@ -20195,9 +19897,9 @@ sub_8009818: @ 8009818 strb r0, [r5] _0800983C: movs r5, 0 - ldr r7, _080098E4 + ldr r7, =0x03000d20 _08009840: - ldr r0, _080098E8 + ldr r0, =0x03000d68 adds r6, r5, r0 lsls r0, r5, 1 adds r0, r5 @@ -20228,9 +19930,9 @@ _08009868: cmp r7, 0xF bne _080098CE movs r5, 0 - ldr r0, _080098E4 + ldr r0, =0x03000d20 mov r9, r0 - ldr r1, _080098EC + ldr r1, =0x00000342 mov r8, r1 _08009888: adds r0, r7, 0 @@ -20240,7 +19942,7 @@ _08009888: cmp r0, 0 beq _080098C4 lsls r0, r5, 8 - ldr r1, _080098F0 + ldr r1, =0x020223c4 adds r0, r1 lsls r4, r5, 1 adds r1, r4, r5 @@ -20248,7 +19950,7 @@ _08009888: add r1, r9 ldrh r1, [r1, 0x2] bl sub_800A648 - ldr r1, _080098F4 + ldr r1, =0x03003148 adds r4, r1 movs r6, 0 strh r0, [r4] @@ -20257,9 +19959,9 @@ _08009888: ldrh r0, [r4] cmp r0, r8 beq _080098C4 - ldr r0, _080098F8 + ldr r0, =0x020223bc strb r6, [r0] - ldr r0, _080098FC + ldr r0, =0x020223bd strb r6, [r0] _080098C4: adds r0, r5, 0x1 @@ -20275,28 +19977,20 @@ _080098CE: pop {r0} bx r0 .align 2, 0 -_080098DC: .4byte 0x03000d64 -_080098E0: .4byte 0x03000d10 -_080098E4: .4byte 0x03000d20 -_080098E8: .4byte 0x03000d68 -_080098EC: .4byte 0x00000342 -_080098F0: .4byte 0x020223c4 -_080098F4: .4byte 0x03003148 -_080098F8: .4byte 0x020223bc -_080098FC: .4byte 0x020223bd + .pool thumb_func_end sub_8009818 thumb_func_start sub_8009900 sub_8009900: @ 8009900 push {r4,r5,lr} sub sp, 0x4 - ldr r4, _080099A0 + ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _08009916 - ldr r1, _080099A4 + ldr r1, =0x03003144 movs r0, 0x1 strb r0, [r1] _08009916: @@ -20306,8 +20000,8 @@ _08009916: ands r0, r1 cmp r0, 0 beq _0800992A - ldr r0, _080099A8 - ldr r1, _080099AC + ldr r0, =0x02004000 + ldr r1, =0x00002004 bl sub_800A2F4 _0800992A: ldrh r1, [r4, 0x2E] @@ -20348,14 +20042,14 @@ _08009968: beq _08009976 bl sub_800AC34 _08009976: - ldr r0, _080099B0 + ldr r0, =0x020223bc ldrb r0, [r0] cmp r0, 0 beq _08009996 ldr r2, [r4, 0x24] - ldr r0, _080099B4 + ldr r0, =0x03002748 ldrb r1, [r0] - ldr r0, _080099B8 + ldr r0, =0x03003140 ldr r0, [r0] cmp r0, 0 bne _08009990 @@ -20370,13 +20064,7 @@ _08009996: pop {r0} bx r0 .align 2, 0 -_080099A0: .4byte 0x030022c0 -_080099A4: .4byte 0x03003144 -_080099A8: .4byte 0x02004000 -_080099AC: .4byte 0x00002004 -_080099B0: .4byte 0x020223bc -_080099B4: .4byte 0x03002748 -_080099B8: .4byte 0x03003140 + .pool thumb_func_end sub_8009900 thumb_func_start c2_08009A8C @@ -20399,18 +20087,18 @@ c2_08009A8C: @ 80099BC sub_80099E0: @ 80099E0 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _080099F0 + ldr r0, =0x020229c4 ldrb r0, [r0] cmp r0, 0 bne _080099F4 movs r0, 0 b _08009A3C .align 2, 0 -_080099F0: .4byte 0x020229c4 + .pool _080099F4: movs r1, 0 - ldr r5, _08009A44 - ldr r3, _08009A48 + ldr r5, =0x03003084 + ldr r3, =0x03003110 movs r2, 0 _080099FC: lsls r0, r1, 1 @@ -20423,18 +20111,18 @@ _080099FC: bls _080099FC ldrh r0, [r4] strh r0, [r5] - ldr r0, _08009A4C + ldr r0, =0x030030e0 ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _08009A38 - ldr r0, _08009A50 + ldr r0, =0x04000128 ldr r0, [r0] lsls r0, 26 lsrs r0, 30 bl sub_8009AA0 - ldr r0, _08009A54 + ldr r0, =0x03003140 ldr r0, [r0] cmp r0, 0 beq _08009A34 @@ -20442,18 +20130,14 @@ _080099FC: _08009A34: bl sub_800AEB4 _08009A38: - ldr r0, _08009A4C + ldr r0, =0x030030e0 ldrh r0, [r0] _08009A3C: pop {r4,r5} pop {r1} bx r1 .align 2, 0 -_08009A44: .4byte 0x03003084 -_08009A48: .4byte 0x03003110 -_08009A4C: .4byte 0x030030e0 -_08009A50: .4byte 0x04000128 -_08009A54: .4byte 0x03003140 + .pool thumb_func_end sub_80099E0 thumb_func_start sub_8009A58 @@ -20462,14 +20146,14 @@ sub_8009A58: @ 8009A58 lsls r0, 24 lsrs r0, 24 movs r5, 0 - ldr r1, _08009A6C + ldr r1, =0x03003078 adds r0, r1 strb r5, [r0] movs r4, 0 adds r6, r1, 0 b _08009A78 .align 2, 0 -_08009A6C: .4byte 0x03003078 + .pool _08009A70: adds r0, r4, r6 ldrb r0, [r0] @@ -20483,7 +20167,7 @@ _08009A78: blt _08009A70 cmp r5, 0 bne _08009A94 - ldr r1, _08009A9C + ldr r1, =0x03003124 ldrb r0, [r1] cmp r0, 0 bne _08009A94 @@ -20494,7 +20178,7 @@ _08009A94: pop {r0} bx r0 .align 2, 0 -_08009A9C: .4byte 0x03003124 + .pool thumb_func_end sub_8009A58 thumb_func_start sub_8009AA0 @@ -20507,13 +20191,13 @@ sub_8009AA0: @ 8009AA0 sub sp, 0x4 movs r6, 0 _08009AAE: - ldr r0, _08009AF8 + ldr r0, =0x03003020 lsls r1, r6, 1 adds r3, r1, r0 movs r0, 0 strh r0, [r3] lsls r4, r6, 4 - ldr r5, _08009AFC + ldr r5, =0x03003090 adds r2, r4, r5 ldrh r0, [r2] mov r12, r1 @@ -20524,38 +20208,33 @@ _08009AAE: b _08009D6E _08009ACC: ldrh r1, [r2] - ldr r0, _08009B00 + ldr r0, =0x00005fff cmp r1, r0 bne _08009AD6 b _08009D20 _08009AD6: cmp r1, r0 bgt _08009B24 - ldr r0, _08009B04 + ldr r0, =0x00004444 cmp r1, r0 bne _08009AE2 b _08009D64 _08009AE2: cmp r1, r0 bgt _08009B10 - ldr r0, _08009B08 + ldr r0, =0x00002222 cmp r1, r0 beq _08009B68 - ldr r0, _08009B0C + ldr r0, =0x00002ffe cmp r1, r0 bne _08009AF4 b _08009D28 _08009AF4: b _08009D6E .align 2, 0 -_08009AF8: .4byte 0x03003020 -_08009AFC: .4byte 0x03003090 -_08009B00: .4byte 0x00005fff -_08009B04: .4byte 0x00004444 -_08009B08: .4byte 0x00002222 -_08009B0C: .4byte 0x00002ffe + .pool _08009B10: - ldr r0, _08009B20 + ldr r0, =0x00005555 cmp r1, r0 beq _08009BB8 adds r0, 0x11 @@ -20563,54 +20242,51 @@ _08009B10: beq _08009BB8 b _08009D6E .align 2, 0 -_08009B20: .4byte 0x00005555 + .pool _08009B24: - ldr r0, _08009B40 + ldr r0, =0x0000bbbb cmp r1, r0 beq _08009BC4 cmp r1, r0 bgt _08009B4C - ldr r0, _08009B44 + ldr r0, =0x00008888 cmp r1, r0 beq _08009BF0 - ldr r0, _08009B48 + ldr r0, =0x0000aaaa cmp r1, r0 bne _08009B3C b _08009D38 _08009B3C: b _08009D6E .align 2, 0 -_08009B40: .4byte 0x0000bbbb -_08009B44: .4byte 0x00008888 -_08009B48: .4byte 0x0000aaaa + .pool _08009B4C: - ldr r0, _08009B60 + ldr r0, =0x0000cafe cmp r1, r0 bne _08009B54 b _08009D64 _08009B54: - ldr r0, _08009B64 + ldr r0, =0x0000cccc cmp r1, r0 bne _08009B5C b _08009D3E _08009B5C: b _08009D6E .align 2, 0 -_08009B60: .4byte 0x0000cafe -_08009B64: .4byte 0x0000cccc + .pool _08009B68: bl sub_8009638 - ldr r0, _08009BAC + ldr r0, =0x03003030 adds r2, r0, 0 adds r2, 0x10 - ldr r1, _08009BB0 + ldr r1, =0x020229cc ldm r1!, {r3-r5} stm r2!, {r3-r5} ldm r1!, {r3,r6,r7} stm r2!, {r3,r6,r7} ldr r1, [r1] str r1, [r2] - ldr r4, _08009BB4 + ldr r4, =0x082ed1d4 adds r2, r0, 0 adds r1, r4, 0 ldm r1!, {r5-r7} @@ -20631,43 +20307,40 @@ _08009B68: bl sub_800A2F4 b _08009D6E .align 2, 0 -_08009BAC: .4byte 0x03003030 -_08009BB0: .4byte 0x020229cc -_08009BB4: .4byte 0x082ed1d4 + .pool _08009BB8: - ldr r1, _08009BC0 + ldr r1, =0x030030e8 movs r0, 0x1 strb r0, [r1] b _08009D6E .align 2, 0 -_08009BC0: .4byte 0x030030e8 + .pool _08009BC4: mov r7, r12 adds r1, r7, r6 lsls r1, 2 - ldr r0, _08009BE8 + ldr r0, =0x03000d20 adds r1, r0 movs r2, 0 strh r2, [r1] - ldr r0, _08009BEC + ldr r0, =0x03003090 adds r0, 0x2 adds r0, r4, r0 ldrh r0, [r0] strh r0, [r1, 0x2] - ldr r0, _08009BEC + ldr r0, =0x03003090 adds r0, 0x4 adds r0, r4, r0 ldrh r0, [r0] strb r0, [r1, 0x9] b _08009D6E .align 2, 0 -_08009BE8: .4byte 0x03000d20 -_08009BEC: .4byte 0x03003090 + .pool _08009BF0: mov r3, r12 adds r0, r3, r6 lsls r0, 2 - ldr r5, _08009C34 + ldr r5, =0x03000d20 adds r3, r0, r5 ldrh r1, [r3, 0x2] movs r0, 0x80 @@ -20676,11 +20349,11 @@ _08009BF0: mov r10, r7 cmp r1, r0 bls _08009C40 - ldr r0, _08009C38 + ldr r0, =0x0201c000 mov r8, r0 movs r2, 0 adds r5, r3, 0 - ldr r7, _08009C3C + ldr r7, =0x03003090 adds r3, r4, 0 _08009C14: ldrh r1, [r5] @@ -20700,15 +20373,13 @@ _08009C14: bls _08009C14 b _08009C70 .align 2, 0 -_08009C34: .4byte 0x03000d20 -_08009C38: .4byte 0x0201c000 -_08009C3C: .4byte 0x03003090 + .pool _08009C40: movs r2, 0 - ldr r1, _08009CF4 + ldr r1, =0x020223c4 mov r9, r1 adds r7, r3, 0 - ldr r3, _08009CF8 + ldr r3, =0x03003090 mov r8, r3 lsls r5, r6, 8 adds r3, r4, 0 @@ -20743,19 +20414,19 @@ _08009C70: ldrh r1, [r1, 0x2] cmp r0, r1 bcc _08009D6E - ldr r0, _08009CFC + ldr r0, =0x03003078 adds r0, r6, r0 ldrb r0, [r0] cmp r0, 0x1 bne _08009D16 lsls r1, r6, 8 - ldr r0, _08009CF4 + ldr r0, =0x020223c4 adds r1, r0 mov r8, r1 lsls r0, r6, 3 subs r0, r6 lsls r0, 2 - ldr r1, _08009D00 + ldr r1, =0x020229e8 adds r2, r0, r1 adds r1, r2, 0 mov r0, r8 @@ -20778,7 +20449,7 @@ _08009C70: _08009CCA: adds r0, r2, 0 bl sub_800B524 - ldr r5, _08009D04 + ldr r5, =0x082ed1d4 mov r0, r8 adds r1, r5, 0 bl strcmp @@ -20791,16 +20462,11 @@ _08009CCA: cmp r0, 0 beq _08009D0C _08009CEC: - ldr r0, _08009D08 + ldr r0, =c2_800ACD4 + 1 bl set_callback2 b _08009D6E .align 2, 0 -_08009CF4: .4byte 0x020223c4 -_08009CF8: .4byte 0x03003090 -_08009CFC: .4byte 0x03003078 -_08009D00: .4byte 0x020229e8 -_08009D04: .4byte 0x082ed1d4 -_08009D08: .4byte c2_800ACD4 + 1 + .pool _08009D0C: lsls r0, r6, 24 lsrs r0, 24 @@ -20812,25 +20478,25 @@ _08009D16: bl sub_800A588 b _08009D6E _08009D20: - ldr r0, _08009D24 + ldr r0, =0x030030f0 b _08009D2A .align 2, 0 -_08009D24: .4byte 0x030030f0 + .pool _08009D28: - ldr r0, _08009D34 + ldr r0, =0x030030ec _08009D2A: adds r0, r6, r0 movs r1, 0x1 strb r1, [r0] b _08009D6E .align 2, 0 -_08009D34: .4byte 0x030030ec + .pool _08009D38: bl sub_800A418 b _08009D6E _08009D3E: - ldr r3, _08009D5C - ldr r0, _08009D60 + ldr r3, =0x082ed1a8 + ldr r0, =0x03003090 adds r0, 0x2 adds r0, r4, r0 ldrh r2, [r0] @@ -20844,10 +20510,9 @@ _08009D3E: bl link_0800A448 b _08009D6E .align 2, 0 -_08009D5C: .4byte 0x082ed1a8 -_08009D60: .4byte 0x03003090 + .pool _08009D64: - ldr r0, _08009D8C + ldr r0, =0x03003090 adds r0, 0x2 adds r0, r4, r0 ldrh r0, [r0] @@ -20869,7 +20534,7 @@ _08009D7A: pop {r0} bx r0 .align 2, 0 -_08009D8C: .4byte 0x03003090 + .pool thumb_func_end sub_8009AA0 thumb_func_start sub_8009D90 @@ -20877,20 +20542,20 @@ sub_8009D90: @ 8009D90 push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _08009DBC + ldr r0, =0x00006666 cmp r2, r0 beq _08009E60 cmp r2, r0 bgt _08009DF0 - ldr r0, _08009DC0 + ldr r0, =0x00004444 cmp r2, r0 beq _08009E4C cmp r2, r0 bgt _08009DCC - ldr r0, _08009DC4 + ldr r0, =0x00002222 cmp r2, r0 beq _08009E38 - ldr r0, _08009DC8 + ldr r0, =0x00002ffe _08009DB2: cmp r2, r0 bne _08009DB8 @@ -20898,12 +20563,9 @@ _08009DB2: _08009DB8: b _08009F06 .align 2, 0 -_08009DBC: .4byte 0x00006666 -_08009DC0: .4byte 0x00004444 -_08009DC4: .4byte 0x00002222 -_08009DC8: .4byte 0x00002ffe + .pool _08009DCC: - ldr r0, _08009DDC + ldr r0, =0x00005566 cmp r2, r0 bne _08009DD4 b _08009EE4 @@ -20913,77 +20575,72 @@ _08009DD4: subs r0, 0x11 b _08009DB2 .align 2, 0 -_08009DDC: .4byte 0x00005566 + .pool _08009DE0: - ldr r0, _08009DEC + ldr r0, =0x00005fff cmp r2, r0 bne _08009DE8 b _08009ED0 _08009DE8: b _08009F06 .align 2, 0 -_08009DEC: .4byte 0x00005fff + .pool _08009DF0: - ldr r0, _08009E04 + ldr r0, =0x0000aaab cmp r2, r0 beq _08009EA8 cmp r2, r0 bgt _08009E10 - ldr r0, _08009E08 + ldr r0, =0x00007777 cmp r2, r0 beq _08009E6C - ldr r0, _08009E0C + ldr r0, =0x0000aaaa b _08009DB2 .align 2, 0 -_08009E04: .4byte 0x0000aaab -_08009E08: .4byte 0x00007777 -_08009E0C: .4byte 0x0000aaaa + .pool _08009E10: - ldr r0, _08009E24 + ldr r0, =0x0000cafe cmp r2, r0 beq _08009EF0 cmp r2, r0 bgt _08009E2C - ldr r0, _08009E28 + ldr r0, =0x0000bbbb cmp r2, r0 beq _08009E8C b _08009F06 .align 2, 0 -_08009E24: .4byte 0x0000cafe -_08009E28: .4byte 0x0000bbbb + .pool _08009E2C: - ldr r0, _08009E34 + ldr r0, =0x0000cccc cmp r2, r0 beq _08009EBC b _08009F06 .align 2, 0 -_08009E34: .4byte 0x0000cccc + .pool _08009E38: - ldr r0, _08009E44 + ldr r0, =0x03003110 strh r2, [r0] - ldr r1, _08009E48 + ldr r1, =0x020229c6 ldrh r1, [r1] b _08009F04 .align 2, 0 -_08009E44: .4byte 0x03003110 -_08009E48: .4byte 0x020229c6 + .pool _08009E4C: - ldr r0, _08009E58 + ldr r0, =0x03003110 strh r2, [r0] - ldr r1, _08009E5C + ldr r1, =0x030022c0 ldrh r1, [r1, 0x2C] b _08009F04 .align 2, 0 -_08009E58: .4byte 0x03003110 -_08009E5C: .4byte 0x030022c0 + .pool _08009E60: - ldr r0, _08009E68 + ldr r0, =0x03003110 movs r1, 0 b _08009F02 .align 2, 0 -_08009E68: .4byte 0x03003110 + .pool _08009E6C: - ldr r0, _08009E88 + ldr r0, =0x03003110 strh r2, [r0] movs r1, 0 adds r3, r0, 0 @@ -20999,11 +20656,11 @@ _08009E76: bls _08009E76 b _08009F06 .align 2, 0 -_08009E88: .4byte 0x03003110 + .pool _08009E8C: - ldr r1, _08009EA0 + ldr r1, =0x03003110 strh r2, [r1] - ldr r2, _08009EA4 + ldr r2, =0x03000d10 ldrh r0, [r2, 0x2] strh r0, [r1, 0x2] ldrb r0, [r2, 0x9] @@ -21011,51 +20668,47 @@ _08009E8C: strh r0, [r1, 0x4] b _08009F06 .align 2, 0 -_08009EA0: .4byte 0x03003110 -_08009EA4: .4byte 0x03000d10 + .pool _08009EA8: - ldr r0, _08009EB4 + ldr r0, =0x03003110 strh r2, [r0] - ldr r1, _08009EB8 + ldr r1, =0x0203ce7c ldrh r1, [r1] b _08009F04 .align 2, 0 -_08009EB4: .4byte 0x03003110 -_08009EB8: .4byte 0x0203ce7c + .pool _08009EBC: - ldr r0, _08009EC8 + ldr r0, =0x03003110 strh r2, [r0] - ldr r1, _08009ECC + ldr r1, =0x03003150 ldrb r1, [r1] b _08009F04 .align 2, 0 -_08009EC8: .4byte 0x03003110 -_08009ECC: .4byte 0x03003150 + .pool _08009ED0: - ldr r0, _08009EDC + ldr r0, =0x03003110 strh r2, [r0] - ldr r1, _08009EE0 + ldr r1, =0x030030f4 ldrh r1, [r1] b _08009F04 .align 2, 0 -_08009EDC: .4byte 0x03003110 -_08009EE0: .4byte 0x030030f4 + .pool _08009EE4: - ldr r0, _08009EEC + ldr r0, =0x03003110 strh r2, [r0] b _08009F06 .align 2, 0 -_08009EEC: .4byte 0x03003110 + .pool _08009EF0: - ldr r0, _08009F0C + ldr r0, =0x03005da8 ldrh r1, [r0] cmp r1, 0 beq _08009F06 - ldr r0, _08009F10 + ldr r0, =0x030022b4 ldrb r0, [r0] cmp r0, 0 bne _08009F06 - ldr r0, _08009F14 + ldr r0, =0x03003110 _08009F02: strh r2, [r0] _08009F04: @@ -21064,53 +20717,48 @@ _08009F06: pop {r0} bx r0 .align 2, 0 -_08009F0C: .4byte 0x03005da8 -_08009F10: .4byte 0x030022b4 -_08009F14: .4byte 0x03003110 + .pool thumb_func_end sub_8009D90 thumb_func_start sub_8009F18 sub_8009F18: @ 8009F18 push {lr} - ldr r0, _08009F30 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08009F26 bl sub_800F804 _08009F26: - ldr r1, _08009F34 - ldr r0, _08009F38 + ldr r1, =0x03003140 + ldr r0, =sub_8009F70 + 1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08009F30: .4byte 0x030030fc -_08009F34: .4byte 0x03003140 -_08009F38: .4byte sub_8009F70 + 1 + .pool thumb_func_end sub_8009F18 thumb_func_start sub_8009F3C sub_8009F3C: @ 8009F3C push {lr} - ldr r0, _08009F4C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08009F50 bl sub_800F7E4 b _08009F6A .align 2, 0 -_08009F4C: .4byte 0x030030fc + .pool _08009F50: - ldr r0, _08009F60 + ldr r0, =0x03003140 ldr r1, [r0] - ldr r0, _08009F64 + ldr r0, =sub_8009F70 + 1 cmp r1, r0 beq _08009F68 movs r0, 0 b _08009F6A .align 2, 0 -_08009F60: .4byte 0x03003140 -_08009F64: .4byte sub_8009F70 + 1 + .pool _08009F68: movs r0, 0x1 _08009F6A: @@ -21121,78 +20769,76 @@ _08009F6A: thumb_func_start sub_8009F70 sub_8009F70: @ 8009F70 push {lr} - ldr r0, _08009F84 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 bne _08009F80 - ldr r0, _08009F88 + ldr r0, =0x0000cafe bl sub_8009D90 _08009F80: pop {r0} bx r0 .align 2, 0 -_08009F84: .4byte 0x03003124 -_08009F88: .4byte 0x0000cafe + .pool thumb_func_end sub_8009F70 thumb_func_start sub_8009F8C sub_8009F8C: @ 8009F8C push {lr} - ldr r0, _08009F9C + ldr r0, =0x030030fc ldrb r1, [r0] cmp r1, 0 beq _08009FA0 bl Rfu_set_zero b _08009FA4 .align 2, 0 -_08009F9C: .4byte 0x030030fc + .pool _08009FA0: - ldr r0, _08009FA8 + ldr r0, =0x03003140 str r1, [r0] _08009FA4: pop {r0} bx r0 .align 2, 0 -_08009FA8: .4byte 0x03003140 + .pool thumb_func_end sub_8009F8C thumb_func_start sub_8009FAC sub_8009FAC: @ 8009FAC push {lr} - ldr r0, _08009FBC + ldr r0, =0x030030fc ldrb r1, [r0] cmp r1, 0 beq _08009FC0 bl Rfu_set_zero b _08009FC4 .align 2, 0 -_08009FBC: .4byte 0x030030fc + .pool _08009FC0: - ldr r0, _08009FC8 + ldr r0, =0x03003140 str r1, [r0] _08009FC4: pop {r0} bx r0 .align 2, 0 -_08009FC8: .4byte 0x03003140 + .pool thumb_func_end sub_8009FAC thumb_func_start sub_8009FCC sub_8009FCC: @ 8009FCC push {lr} - ldr r0, _08009FE4 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _08009FEC - ldr r0, _08009FE8 + ldr r0, =0x030030e0 ldr r0, [r0] movs r1, 0x1C ands r0, r1 lsrs r0, 2 b _08009FF4 .align 2, 0 -_08009FE4: .4byte 0x030030fc -_08009FE8: .4byte 0x030030e0 + .pool _08009FEC: bl sub_80104F4 lsls r0, 24 @@ -21214,7 +20860,7 @@ sub_8009FF8: @ 8009FF8 cmp r2, r4 bge _0800A030 movs r7, 0xFF - ldr r3, _0800A024 + ldr r3, =0x020229e8 _0800A010: ldrh r0, [r3] adds r1, r7, 0 @@ -21227,7 +20873,7 @@ _0800A01E: movs r0, 0x1 b _0800A034 .align 2, 0 -_0800A024: .4byte 0x020229e8 + .pool _0800A028: adds r3, 0x1C adds r2, 0x1 @@ -21297,7 +20943,7 @@ sub_800A07C: @ 800A07C adds r2, r0, 0 cmp r2, 0 blt _0800A0A4 - ldr r0, _0800A0A0 + ldr r0, =0x020229e8 lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -21308,7 +20954,7 @@ sub_800A07C: @ 800A07C movs r0, 0x1 b _0800A0A6 .align 2, 0 -_0800A0A0: .4byte 0x020229e8 + .pool _0800A0A4: movs r0, 0 _0800A0A6: @@ -21319,17 +20965,16 @@ _0800A0A6: thumb_func_start sub_800A0AC sub_800A0AC: @ 800A0AC push {lr} - ldr r0, _0800A0C0 + ldr r0, =0x03000d5c movs r1, 0 str r1, [r0] - ldr r0, _0800A0C4 + ldr r0, =0x020229c8 strh r1, [r0] bl sub_8009734 pop {r0} bx r0 .align 2, 0 -_0800A0C0: .4byte 0x03000d5c -_0800A0C4: .4byte 0x020229c8 + .pool thumb_func_end sub_800A0AC thumb_func_start sub_800A0C8 @@ -21338,7 +20983,7 @@ sub_800A0C8: @ 800A0C8 adds r5, r0, 0 adds r6, r1, 0 movs r7, 0 - ldr r0, _0800A0F4 + ldr r0, =0x03003124 ldrb r4, [r0] cmp r4, 0x1 beq _0800A0DA @@ -21352,29 +20997,27 @@ _0800A0DA: cmp r0, r6 ble _0800A0FC _0800A0EA: - ldr r1, _0800A0F8 + ldr r1, =0x03000d5c movs r0, 0x6 str r0, [r1] b _0800A22E .align 2, 0 -_0800A0F4: .4byte 0x03003124 -_0800A0F8: .4byte 0x03000d5c + .pool _0800A0FC: bl sub_8009FCC lsls r0, 24 cmp r0, 0 bne _0800A10E - ldr r0, _0800A118 + ldr r0, =0x0300306c strb r4, [r0] bl sub_80097E8 _0800A10E: movs r6, 0 - ldr r4, _0800A11C + ldr r4, =0x020229e8 movs r5, 0 b _0800A134 .align 2, 0 -_0800A118: .4byte 0x0300306c -_0800A11C: .4byte 0x020229e8 + .pool _0800A120: adds r0, r4, 0 adds r0, 0x14 @@ -21398,9 +21041,9 @@ _0800A134: lsrs r0, 24 cmp r7, r0 bne _0800A1AC - ldr r0, _0800A16C + ldr r0, =0x020229e8 ldr r1, [r0, 0x14] - ldr r0, _0800A170 + ldr r0, =0x00001133 cmp r1, r0 bne _0800A19C bl sub_807A728 @@ -21410,45 +21053,43 @@ _0800A134: bgt _0800A178 cmp r0, 0 beq _0800A19C - ldr r3, _0800A174 + ldr r3, =0x03000d5c b _0800A22C .align 2, 0 -_0800A16C: .4byte 0x020229e8 -_0800A170: .4byte 0x00001133 -_0800A174: .4byte 0x03000d5c + .pool _0800A178: cmp r0, 0x2 beq _0800A190 - ldr r3, _0800A180 + ldr r3, =0x03000d5c b _0800A22C .align 2, 0 -_0800A180: .4byte 0x03000d5c + .pool _0800A184: - ldr r1, _0800A18C + ldr r1, =0x03000d5c movs r0, 0x4 b _0800A1A0 .align 2, 0 -_0800A18C: .4byte 0x03000d5c + .pool _0800A190: - ldr r1, _0800A198 + ldr r1, =0x03000d5c movs r0, 0x5 b _0800A1A0 .align 2, 0 -_0800A198: .4byte 0x03000d5c + .pool _0800A19C: - ldr r1, _0800A1A8 + ldr r1, =0x03000d5c movs r0, 0x1 _0800A1A0: str r0, [r1] adds r3, r1, 0 b _0800A22C .align 2, 0 -_0800A1A8: .4byte 0x03000d5c + .pool _0800A1AC: - ldr r6, _0800A200 + ldr r6, =0x03000d5c movs r0, 0x3 str r0, [r6] - ldr r4, _0800A204 + ldr r4, =0x020229e8 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -21468,40 +21109,36 @@ _0800A1AC: lsls r1, 2 adds r1, r4 ldr r1, [r1] - ldr r2, _0800A208 + ldr r2, =0x00002266 cmp r5, r2 bne _0800A1EA - ldr r0, _0800A20C + ldr r0, =0x00002277 cmp r1, r0 beq _0800A1F6 _0800A1EA: - ldr r0, _0800A20C + ldr r0, =0x00002277 adds r3, r6, 0 cmp r5, r0 bne _0800A22C cmp r1, r2 bne _0800A22C _0800A1F6: - ldr r1, _0800A210 + ldr r1, =0x020375e2 movs r0, 0x3 strh r0, [r1] - ldr r3, _0800A200 + ldr r3, =0x03000d5c b _0800A22C .align 2, 0 -_0800A200: .4byte 0x03000d5c -_0800A204: .4byte 0x020229e8 -_0800A208: .4byte 0x00002266 -_0800A20C: .4byte 0x00002277 -_0800A210: .4byte 0x020375e2 + .pool _0800A214: - ldr r0, _0800A234 + ldr r0, =0x020229c8 ldrh r1, [r0] adds r1, 0x1 strh r1, [r0] lsls r1, 16 movs r0, 0x96 lsls r0, 18 - ldr r3, _0800A238 + ldr r3, =0x03000d5c cmp r1, r0 bls _0800A22C movs r0, 0x2 @@ -21513,8 +21150,7 @@ _0800A22E: pop {r1} bx r1 .align 2, 0 -_0800A234: .4byte 0x020229c8 -_0800A238: .4byte 0x03000d5c + .pool thumb_func_end sub_800A0C8 thumb_func_start sub_800A23C @@ -21522,10 +21158,10 @@ sub_800A23C: @ 800A23C push {r4-r6,lr} movs r6, 0 movs r4, 0 - ldr r5, _0800A248 + ldr r5, =0x020229e8 b _0800A26C .align 2, 0 -_0800A248: .4byte 0x020229e8 + .pool _0800A24C: lsls r0, r4, 3 subs r0, r4 @@ -21556,14 +21192,14 @@ _0800A26C: cmp r6, r0 bne _0800A290 movs r2, 0x1 - ldr r0, _0800A28C + ldr r0, =0x03000d5c str r2, [r0] b _0800A298 .align 2, 0 -_0800A28C: .4byte 0x03000d5c + .pool _0800A290: movs r2, 0 - ldr r1, _0800A2A0 + ldr r1, =0x03000d5c movs r0, 0x3 str r0, [r1] _0800A298: @@ -21572,14 +21208,14 @@ _0800A298: pop {r1} bx r1 .align 2, 0 -_0800A2A0: .4byte 0x03000d5c + .pool thumb_func_end sub_800A23C thumb_func_start sub_800A2A4 sub_800A2A4: @ 800A2A4 lsls r0, 24 lsrs r0, 24 - ldr r2, _0800A2B8 + ldr r2, =0x020229e8 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -21588,13 +21224,13 @@ sub_800A2A4: @ 800A2A4 ldr r0, [r1] bx lr .align 2, 0 -_0800A2B8: .4byte 0x020229e8 + .pool thumb_func_end sub_800A2A4 thumb_func_start sub_800A2BC sub_800A2BC: @ 800A2BC push {r4,r5,lr} - ldr r5, _0800A2DC + ldr r5, =0x020229e8 movs r4, 0x4 _0800A2C2: adds r0, r5, 0 @@ -21609,12 +21245,12 @@ _0800A2C2: pop {r0} bx r0 .align 2, 0 -_0800A2DC: .4byte 0x020229e8 + .pool thumb_func_end sub_800A2BC thumb_func_start sub_800A2E0 sub_800A2E0: @ 800A2E0 - ldr r1, _0800A2F0 + ldr r1, =0x03000d10 movs r0, 0 strb r0, [r1, 0x8] strh r0, [r1] @@ -21622,7 +21258,7 @@ sub_800A2E0: @ 800A2E0 str r0, [r1, 0x4] bx lr .align 2, 0 -_0800A2F0: .4byte 0x03000d10 + .pool thumb_func_end sub_800A2E0 thumb_func_start sub_800A2F4 @@ -21630,14 +21266,14 @@ sub_800A2F4: @ 800A2F4 push {r4-r7,lr} adds r7, r0, 0 adds r6, r1, 0 - ldr r4, _0800A308 + ldr r4, =0x03000d10 ldrb r5, [r4, 0x8] cmp r5, 0 beq _0800A30C movs r0, 0 b _0800A34A .align 2, 0 -_0800A308: .4byte 0x03000d10 + .pool _0800A30C: bl link_get_multiplayer_id strb r0, [r4, 0x9] @@ -21651,7 +21287,7 @@ _0800A30C: str r7, [r4, 0x4] b _0800A336 _0800A324: - ldr r5, _0800A350 + ldr r5, =0x020228c4 cmp r7, r5 beq _0800A334 adds r0, r5, 0 @@ -21661,12 +21297,12 @@ _0800A324: _0800A334: str r5, [r4, 0x4] _0800A336: - ldr r0, _0800A354 + ldr r0, =0x0000bbbb bl sub_8009D90 - ldr r1, _0800A358 - ldr r0, _0800A35C + ldr r1, =0x03003140 + ldr r0, =sub_800A364 + 1 str r0, [r1] - ldr r1, _0800A360 + ldr r1, =0x03000d50 movs r0, 0 str r0, [r1] movs r0, 0x1 @@ -21675,41 +21311,35 @@ _0800A34A: pop {r1} bx r1 .align 2, 0 -_0800A350: .4byte 0x020228c4 -_0800A354: .4byte 0x0000bbbb -_0800A358: .4byte 0x03003140 -_0800A35C: .4byte sub_800A364 + 1 -_0800A360: .4byte 0x03000d50 + .pool thumb_func_end sub_800A2F4 thumb_func_start sub_800A364 sub_800A364: @ 800A364 push {lr} - ldr r1, _0800A37C + ldr r1, =0x03000d50 ldr r0, [r1] adds r0, 0x1 str r0, [r1] cmp r0, 0x2 bls _0800A378 - ldr r1, _0800A380 - ldr r0, _0800A384 + ldr r1, =0x03003140 + ldr r0, =sub_800A388 + 1 str r0, [r1] _0800A378: pop {r0} bx r0 .align 2, 0 -_0800A37C: .4byte 0x03000d50 -_0800A380: .4byte 0x03003140 -_0800A384: .4byte sub_800A388 + 1 + .pool thumb_func_end sub_800A364 thumb_func_start sub_800A388 sub_800A388: @ 800A388 push {r4-r6,lr} - ldr r0, _0800A3D8 + ldr r0, =0x03000d10 ldr r5, [r0, 0x4] - ldr r2, _0800A3DC - ldr r1, _0800A3E0 + ldr r2, =0x03003110 + ldr r1, =0x00008888 strh r1, [r2] movs r3, 0 adds r4, r0, 0 @@ -21739,110 +21369,102 @@ _0800A39C: bhi _0800A3D0 movs r0, 0 strb r0, [r4, 0x8] - ldr r1, _0800A3E4 - ldr r0, _0800A3E8 + ldr r1, =0x03003140 + ldr r0, =sub_800A3EC + 1 str r0, [r1] _0800A3D0: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0800A3D8: .4byte 0x03000d10 -_0800A3DC: .4byte 0x03003110 -_0800A3E0: .4byte 0x00008888 -_0800A3E4: .4byte 0x03003140 -_0800A3E8: .4byte sub_800A3EC + 1 + .pool thumb_func_end sub_800A388 thumb_func_start sub_800A3EC sub_800A3EC: @ 800A3EC - ldr r1, _0800A3F4 + ldr r1, =0x03003140 movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_0800A3F4: .4byte 0x03003140 + .pool thumb_func_end sub_800A3EC thumb_func_start sub_800A3F8 sub_800A3F8: @ 800A3F8 push {lr} bl link_get_multiplayer_id - ldr r0, _0800A410 + ldr r0, =0x00004444 bl sub_8009D90 - ldr r1, _0800A414 + ldr r1, =0x020223c0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0800A410: .4byte 0x00004444 -_0800A414: .4byte 0x020223c0 + .pool thumb_func_end sub_800A3F8 thumb_func_start sub_800A418 sub_800A418: @ 800A418 push {lr} - ldr r1, _0800A430 + ldr r1, =0x020223c0 movs r0, 0 str r0, [r1] - ldr r0, _0800A434 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0800A438 bl sub_800F850 b _0800A43E .align 2, 0 -_0800A430: .4byte 0x020223c0 -_0800A434: .4byte 0x030030fc + .pool _0800A438: - ldr r1, _0800A444 - ldr r0, _0800A448 + ldr r1, =0x03003140 + ldr r0, =sub_800A3F8 + 1 str r0, [r1] _0800A43E: pop {r0} bx r0 .align 2, 0 -_0800A444: .4byte 0x03003140 -_0800A448: .4byte sub_800A3F8 + 1 + .pool thumb_func_end sub_800A418 thumb_func_start sub_800A44C sub_800A44C: @ 800A44C - ldr r0, _0800A454 + ldr r0, =0x020223c0 ldr r0, [r0] bx lr .align 2, 0 -_0800A454: .4byte 0x020223c0 + .pool thumb_func_end sub_800A44C thumb_func_start sub_800A458 sub_800A458: @ 800A458 push {lr} - ldr r0, _0800A464 + ldr r0, =0x0000aaaa bl sub_8009D90 pop {r0} bx r0 .align 2, 0 -_0800A464: .4byte 0x0000aaaa + .pool thumb_func_end sub_800A458 thumb_func_start link_get_multiplayer_id link_get_multiplayer_id: @ 800A468 push {lr} - ldr r0, _0800A47C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 beq _0800A484 - ldr r0, _0800A480 + ldr r0, =0x04000128 ldr r0, [r0] lsls r0, 26 lsrs r0, 30 b _0800A48C .align 2, 0 -_0800A47C: .4byte 0x030030fc -_0800A480: .4byte 0x04000128 + .pool _0800A484: bl rfu_get_multiplayer_id lsls r0, 24 @@ -21875,7 +21497,7 @@ link_0800A448: @ 800A4AC adds r3, r1, 0 lsls r2, 16 lsrs r1, r2, 16 - ldr r0, _0800A4C4 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 beq _0800A4C8 @@ -21883,7 +21505,7 @@ link_0800A448: @ 800A4AC bl sub_800A2F4 b _0800A4CE .align 2, 0 -_0800A4C4: .4byte 0x030030fc + .pool _0800A4C8: adds r0, r3, 0 bl sub_800FE84 @@ -21900,7 +21522,7 @@ sub_800A4D8: @ 800A4D8 lsls r0, 24 lsrs r1, r0, 24 adds r2, r1, 0 - ldr r0, _0800A4F4 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 bne _0800A4F8 @@ -21910,34 +21532,33 @@ sub_800A4D8: @ 800A4D8 lsrs r0, 24 b _0800A514 .align 2, 0 -_0800A4F4: .4byte 0x030030fc + .pool _0800A4F8: - ldr r0, _0800A504 + ldr r0, =0x03003140 ldr r0, [r0] cmp r0, 0 beq _0800A508 movs r0, 0 b _0800A514 .align 2, 0 -_0800A504: .4byte 0x03003140 + .pool _0800A508: - ldr r0, _0800A518 + ldr r0, =0x03003150 strb r2, [r0] - ldr r0, _0800A51C + ldr r0, =0x0000cccc bl sub_8009D90 movs r0, 0x1 _0800A514: pop {r1} bx r1 .align 2, 0 -_0800A518: .4byte 0x03003150 -_0800A51C: .4byte 0x0000cccc + .pool thumb_func_end sub_800A4D8 thumb_func_start sub_800A520 sub_800A520: @ 800A520 push {lr} - ldr r0, _0800A534 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 bne _0800A538 @@ -21946,10 +21567,10 @@ sub_800A520: @ 800A520 lsrs r0, 24 b _0800A546 .align 2, 0 -_0800A534: .4byte 0x030030fc + .pool _0800A538: movs r1, 0 - ldr r0, _0800A54C + ldr r0, =0x03003140 ldr r0, [r0] cmp r0, 0 bne _0800A544 @@ -21960,17 +21581,17 @@ _0800A546: pop {r1} bx r1 .align 2, 0 -_0800A54C: .4byte 0x03003140 + .pool thumb_func_end sub_800A520 thumb_func_start sub_800A550 sub_800A550: @ 800A550 push {lr} - ldr r0, _0800A574 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 beq _0800A57C - ldr r2, _0800A578 + ldr r2, =0x0300307c ldrb r0, [r2, 0x3] lsls r0, 3 ldrb r1, [r2, 0x2] @@ -21983,8 +21604,7 @@ sub_800A550: @ 800A550 orrs r0, r1 b _0800A580 .align 2, 0 -_0800A574: .4byte 0x030030fc -_0800A578: .4byte 0x0300307c + .pool _0800A57C: bl sub_800FCD8 _0800A580: @@ -21999,7 +21619,7 @@ sub_800A588: @ 800A588 push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0800A5A0 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 bne _0800A5A4 @@ -22007,9 +21627,9 @@ sub_800A588: @ 800A588 bl sub_800F6FC b _0800A5AC .align 2, 0 -_0800A5A0: .4byte 0x030030fc + .pool _0800A5A4: - ldr r0, _0800A5B0 + ldr r0, =0x0300307c adds r0, r1, r0 movs r1, 0x1 strb r1, [r0] @@ -22017,13 +21637,13 @@ _0800A5AC: pop {r0} bx r0 .align 2, 0 -_0800A5B0: .4byte 0x0300307c + .pool thumb_func_end sub_800A588 thumb_func_start sub_800A5B4 sub_800A5B4: @ 800A5B4 push {r4,lr} - ldr r0, _0800A5D0 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 bne _0800A5D4 @@ -22037,9 +21657,9 @@ _0800A5C0: ble _0800A5C0 b _0800A5E2 .align 2, 0 -_0800A5D0: .4byte 0x030030fc + .pool _0800A5D4: - ldr r1, _0800A5E8 + ldr r1, =0x0300307c movs r2, 0 adds r0, r1, 0x3 _0800A5DA: @@ -22052,7 +21672,7 @@ _0800A5E2: pop {r0} bx r0 .align 2, 0 -_0800A5E8: .4byte 0x0300307c + .pool thumb_func_end sub_800A5B4 thumb_func_start sub_800A5EC @@ -22060,7 +21680,7 @@ sub_800A5EC: @ 800A5EC push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0800A604 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 bne _0800A608 @@ -22068,9 +21688,9 @@ sub_800A5EC: @ 800A5EC bl sub_800F728 b _0800A616 .align 2, 0 -_0800A604: .4byte 0x030030fc + .pool _0800A608: - ldr r0, _0800A61C + ldr r0, =0x0300307c adds r1, r0 ldrb r0, [r1] cmp r0, 0 @@ -22081,13 +21701,13 @@ _0800A616: pop {r0} bx r0 .align 2, 0 -_0800A61C: .4byte 0x0300307c + .pool thumb_func_end sub_800A5EC thumb_func_start sub_800A620 sub_800A620: @ 800A620 push {lr} - ldr r0, _0800A640 + ldr r0, =0x030030e0 ldr r1, [r0] movs r0, 0x20 ands r0, r1 @@ -22097,15 +21717,14 @@ sub_800A620: @ 800A620 ands r1, r0 cmp r1, 0x4 bls _0800A63C - ldr r1, _0800A644 + ldr r1, =0x03003144 movs r0, 0x1 strb r0, [r1] _0800A63C: pop {r0} bx r0 .align 2, 0 -_0800A640: .4byte 0x030030e0 -_0800A644: .4byte 0x03003144 + .pool thumb_func_end sub_800A620 thumb_func_start sub_800A648 @@ -22145,7 +21764,7 @@ sub_800A678: @ 800A678 lsls r1, 24 lsrs r1, 24 lsls r2, 24 - ldr r4, _0800A6AC + ldr r4, =0x03003130 ldr r3, [r4] lsls r3, 11 movs r5, 0xC0 @@ -22166,7 +21785,7 @@ sub_800A678: @ 800A678 pop {r0} bx r0 .align 2, 0 -_0800A6AC: .4byte 0x03003130 + .pool thumb_func_end sub_800A678 thumb_func_start sub_800A6B0 @@ -22177,7 +21796,7 @@ sub_800A6B0: @ 800A6B0 lsls r1, 24 lsrs r1, 24 lsls r2, 24 - ldr r4, _0800A6E4 + ldr r4, =0x03003130 ldr r3, [r4] lsls r3, 11 movs r5, 0xC0 @@ -22197,7 +21816,7 @@ sub_800A6B0: @ 800A6B0 pop {r0} bx r0 .align 2, 0 -_0800A6E4: .4byte 0x03003130 + .pool thumb_func_end sub_800A6B0 thumb_func_start sub_800A6E8 @@ -22379,51 +21998,49 @@ _0800A81C: thumb_func_start sub_800A824 sub_800A824: @ 800A824 push {lr} - ldr r0, _0800A844 + ldr r0, =0x030030e0 ldr r0, [r0] movs r1, 0x20 ands r0, r1 cmp r0, 0 _0800A830: beq _0800A838 - ldr r0, _0800A848 + ldr r0, =0x00002222 bl sub_8009D90 _0800A838: - ldr r1, _0800A84C + ldr r1, =0x03003140 movs r0, 0 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0800A844: .4byte 0x030030e0 -_0800A848: .4byte 0x00002222 -_0800A84C: .4byte 0x03003140 + .pool thumb_func_end sub_800A824 thumb_func_start task00_link_test task00_link_test: @ 800A850 push {r4-r6,lr} sub sp, 0x20 - ldr r1, _0800A970 + ldr r1, =0x082ed1e4 mov r0, sp bl strcat mov r0, sp movs r1, 0x5 movs r2, 0x2 bl sub_800A7DC - ldr r0, _0800A974 + ldr r0, =0x03003144 ldrb r0, [r0] movs r1, 0x2 movs r2, 0x1 movs r3, 0x2 bl sub_800A6E8 - ldr r4, _0800A978 + ldr r4, =0x030030e0 ldr r0, [r4] movs r1, 0xF movs r2, 0x1 movs r3, 0x8 bl sub_800A6E8 - ldr r0, _0800A97C + ldr r0, =0x03003170 ldrb r0, [r0, 0x1] movs r1, 0x2 movs r2, 0xA @@ -22444,13 +22061,13 @@ task00_link_test: @ 800A850 movs r2, 0xC movs r3, 0x2 bl sub_800A6E8 - ldr r0, _0800A980 + ldr r0, =0x03003160 ldrb r0, [r0] movs r1, 0x19 movs r2, 0x1 movs r3, 0x2 bl sub_800A6E8 - ldr r0, _0800A984 + ldr r0, =0x03004130 ldrb r0, [r0] movs r1, 0x19 movs r2, 0x2 @@ -22463,13 +22080,13 @@ task00_link_test: @ 800A850 movs r2, 0x5 movs r3, 0x2 bl sub_800A6E8 - ldr r0, _0800A988 + ldr r0, =0x0300302c ldr r0, [r0] movs r1, 0x2 movs r2, 0xC movs r3, 0x8 bl sub_800A6E8 - ldr r0, _0800A98C + ldr r0, =0x03003070 ldr r0, [r0] movs r1, 0x2 movs r2, 0xD @@ -22506,7 +22123,7 @@ task00_link_test: @ 800A850 movs r6, 0 movs r5, 0x80 lsls r5, 19 - ldr r4, _0800A990 + ldr r4, =0x03003148 _0800A94E: ldrh r0, [r4] lsrs r2, r5, 24 @@ -22525,27 +22142,18 @@ _0800A94E: pop {r0} bx r0 .align 2, 0 -_0800A970: .4byte 0x082ed1e4 -_0800A974: .4byte 0x03003144 -_0800A978: .4byte 0x030030e0 -_0800A97C: .4byte 0x03003170 -_0800A980: .4byte 0x03003160 -_0800A984: .4byte 0x03004130 -_0800A988: .4byte 0x0300302c -_0800A98C: .4byte 0x03003070 -_0800A990: .4byte 0x03003148 + .pool thumb_func_end task00_link_test thumb_func_start sub_800A994 sub_800A994: @ 800A994 - ldr r2, _0800A9A0 + ldr r2, =0x0300302c str r0, [r2] - ldr r0, _0800A9A4 + ldr r0, =0x03003070 str r1, [r0] bx lr .align 2, 0 -_0800A9A0: .4byte 0x0300302c -_0800A9A4: .4byte 0x03003070 + .pool thumb_func_end sub_800A994 thumb_func_start sub_800A9A8 @@ -22553,7 +22161,7 @@ sub_800A9A8: @ 800A9A8 push {r4,lr} movs r1, 0 movs r2, 0 - ldr r0, _0800A9D4 + ldr r0, =0x03003100 ldrb r0, [r0] cmp r1, r0 bge _0800A9CA @@ -22574,7 +22182,7 @@ _0800A9CA: pop {r1} bx r1 .align 2, 0 -_0800A9D4: .4byte 0x03003100 + .pool thumb_func_end sub_800A9A8 thumb_func_start sub_800A9D8 @@ -22606,13 +22214,13 @@ _0800A9EE: thumb_func_start sub_800AA04 sub_800AA04: @ 800AA04 push {r4-r7,lr} - ldr r1, _0800AA38 + ldr r1, =0x03003100 strb r0, [r1] bl link_get_multiplayer_id - ldr r1, _0800AA3C + ldr r1, =0x03003120 strb r0, [r1] - ldr r4, _0800AA40 - ldr r3, _0800AA44 + ldr r4, =0x020229e8 + ldr r3, =0x02022a74 movs r2, 0x4 _0800AA18: adds r0, r3, 0 @@ -22632,28 +22240,25 @@ _0800AA18: pop {r0} bx r0 .align 2, 0 -_0800AA38: .4byte 0x03003100 -_0800AA3C: .4byte 0x03003120 -_0800AA40: .4byte 0x020229e8 -_0800AA44: .4byte 0x02022a74 + .pool thumb_func_end sub_800AA04 thumb_func_start sub_800AA48 sub_800AA48: @ 800AA48 - ldr r0, _0800AA50 + ldr r0, =0x03003100 ldrb r0, [r0] bx lr .align 2, 0 -_0800AA50: .4byte 0x03003100 + .pool thumb_func_end sub_800AA48 thumb_func_start sub_800AA54 sub_800AA54: @ 800AA54 - ldr r0, _0800AA5C + ldr r0, =0x03003120 ldrb r0, [r0] bx lr .align 2, 0 -_0800AA5C: .4byte 0x03003120 + .pool thumb_func_end sub_800AA54 thumb_func_start sub_800AA60 @@ -22663,17 +22268,17 @@ sub_800AA60: @ 800AA60 mov r6, r8 push {r6,r7} movs r3, 0 - ldr r0, _0800AAD0 + ldr r0, =0x03003100 ldrb r1, [r0] mov r9, r0 cmp r3, r1 bge _0800AAB4 - ldr r0, _0800AAD4 + ldr r0, =0x020229e8 mov r12, r0 - ldr r0, _0800AAD8 - ldr r2, _0800AADC + ldr r0, =0x02022a74 + ldr r2, =0x00002288 mov r8, r2 - ldr r7, _0800AAE0 + ldr r7, =0x020229c6 mov r6, r12 adds r6, 0x14 adds r5, r0, 0x4 @@ -22718,11 +22323,7 @@ _0800AAB4: movs r0, 0x1 b _0800AAE6 .align 2, 0 -_0800AAD0: .4byte 0x03003100 -_0800AAD4: .4byte 0x020229e8 -_0800AAD8: .4byte 0x02022a74 -_0800AADC: .4byte 0x00002288 -_0800AAE0: .4byte 0x020229c6 + .pool _0800AAE4: movs r0, 0 _0800AAE6: @@ -22737,7 +22338,7 @@ _0800AAE6: thumb_func_start sub_800AAF4 sub_800AAF4: @ 800AAF4 push {r4,r5,lr} - ldr r5, _0800AB14 + ldr r5, =0x02022a74 movs r4, 0x3 _0800AAFA: adds r0, r5, 0 @@ -22752,7 +22353,7 @@ _0800AAFA: pop {r0} bx r0 .align 2, 0 -_0800AB14: .4byte 0x02022a74 + .pool thumb_func_end sub_800AAF4 thumb_func_start sub_800AB18 @@ -22761,12 +22362,12 @@ sub_800AB18: @ 800AB18 mov r7, r8 push {r7} movs r4, 0 - ldr r0, _0800AB84 + ldr r0, =0x03003100 ldrb r0, [r0] cmp r4, r0 bcs _0800AB78 - ldr r6, _0800AB88 - ldr r5, _0800AB8C + ldr r6, =0x02022a74 + ldr r5, =0x020229e8 movs r0, 0x8 adds r0, r6 mov r8, r0 @@ -22791,17 +22392,17 @@ _0800AB36: cmp r0, 0 beq _0800AB6A _0800AB5A: - ldr r1, _0800AB90 + ldr r1, =0x0300306c movs r0, 0x1 strb r0, [r1] bl sub_80097E8 - ldr r0, _0800AB94 + ldr r0, =c2_800ACD4 + 1 bl set_callback2 _0800AB6A: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0800AB84 + ldr r0, =0x03003100 ldrb r0, [r0] cmp r4, r0 bcc _0800AB36 @@ -22812,54 +22413,48 @@ _0800AB78: pop {r0} bx r0 .align 2, 0 -_0800AB84: .4byte 0x03003100 -_0800AB88: .4byte 0x02022a74 -_0800AB8C: .4byte 0x020229e8 -_0800AB90: .4byte 0x0300306c -_0800AB94: .4byte c2_800ACD4 + 1 + .pool thumb_func_end sub_800AB18 thumb_func_start sub_800AB98 sub_800AB98: @ 800AB98 - ldr r0, _0800ABA4 + ldr r0, =0x03003100 movs r1, 0 strb r1, [r0] - ldr r0, _0800ABA8 + ldr r0, =0x03003120 strb r1, [r0] bx lr .align 2, 0 -_0800ABA4: .4byte 0x03003100 -_0800ABA8: .4byte 0x03003120 + .pool thumb_func_end sub_800AB98 thumb_func_start sub_800ABAC sub_800ABAC: @ 800ABAC - ldr r0, _0800ABB8 + ldr r0, =0x030030e0 ldr r0, [r0] movs r1, 0x1C ands r0, r1 lsrs r0, 2 bx lr .align 2, 0 -_0800ABB8: .4byte 0x030030e0 + .pool thumb_func_end sub_800ABAC thumb_func_start sub_800ABBC sub_800ABBC: @ 800ABBC push {lr} - ldr r0, _0800ABD4 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _0800ABDC - ldr r0, _0800ABD8 + ldr r0, =0x030030e0 ldr r0, [r0] lsrs r0, 5 movs r1, 0x1 ands r0, r1 b _0800ABE4 .align 2, 0 -_0800ABD4: .4byte 0x030030fc -_0800ABD8: .4byte 0x030030e0 + .pool _0800ABDC: bl sub_8011AB0 lsls r0, 24 @@ -22871,11 +22466,11 @@ _0800ABE4: thumb_func_start sub_800ABE8 sub_800ABE8: @ 800ABE8 - ldr r0, _0800ABF0 + ldr r0, =0x03000d58 ldrb r0, [r0] bx lr .align 2, 0 -_0800ABF0: .4byte 0x03000d58 + .pool thumb_func_end sub_800ABE8 thumb_func_start sub_800ABF4 @@ -22883,95 +22478,86 @@ sub_800ABF4: @ 800ABF4 push {lr} lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _0800AC08 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 bne _0800AC0C bl task_add_05_task_del_08FA224_when_no_RfuFunc b _0800AC20 .align 2, 0 -_0800AC08: .4byte 0x030030fc + .pool _0800AC0C: - ldr r2, _0800AC24 + ldr r2, =0x03003140 ldr r1, [r2] cmp r1, 0 bne _0800AC20 - ldr r0, _0800AC28 + ldr r0, =sub_800AC80 + 1 str r0, [r2] - ldr r0, _0800AC2C + ldr r0, =0x030030e4 strb r1, [r0] - ldr r0, _0800AC30 + ldr r0, =0x030030f4 strh r3, [r0] _0800AC20: pop {r0} bx r0 .align 2, 0 -_0800AC24: .4byte 0x03003140 -_0800AC28: .4byte sub_800AC80 + 1 -_0800AC2C: .4byte 0x030030e4 -_0800AC30: .4byte 0x030030f4 + .pool thumb_func_end sub_800ABF4 thumb_func_start sub_800AC34 sub_800AC34: @ 800AC34 push {lr} - ldr r0, _0800AC44 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 bne _0800AC48 bl task_add_05_task_del_08FA224_when_no_RfuFunc b _0800AC70 .align 2, 0 -_0800AC44: .4byte 0x030030fc + .pool _0800AC48: - ldr r2, _0800AC5C + ldr r2, =0x03003140 ldr r1, [r2] cmp r1, 0 beq _0800AC64 - ldr r1, _0800AC60 + ldr r1, =0x02022b08 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _0800AC70 .align 2, 0 -_0800AC5C: .4byte 0x03003140 -_0800AC60: .4byte 0x02022b08 + .pool _0800AC64: - ldr r0, _0800AC74 + ldr r0, =sub_800AC80 + 1 str r0, [r2] - ldr r0, _0800AC78 + ldr r0, =0x030030e4 strb r1, [r0] - ldr r0, _0800AC7C + ldr r0, =0x030030f4 strh r1, [r0] _0800AC70: pop {r0} bx r0 .align 2, 0 -_0800AC74: .4byte sub_800AC80 + 1 -_0800AC78: .4byte 0x030030e4 -_0800AC7C: .4byte 0x030030f4 + .pool thumb_func_end sub_800AC34 thumb_func_start sub_800AC80 sub_800AC80: @ 800AC80 push {lr} - ldr r0, _0800AC9C + ldr r0, =0x03004130 ldrb r0, [r0] cmp r0, 0 bne _0800AC96 - ldr r0, _0800ACA0 + ldr r0, =0x00005fff bl sub_8009D90 - ldr r1, _0800ACA4 - ldr r0, _0800ACA8 + ldr r1, =0x03003140 + ldr r0, =sub_800ACAC + 1 str r0, [r1] _0800AC96: pop {r0} bx r0 .align 2, 0 -_0800AC9C: .4byte 0x03004130 -_0800ACA0: .4byte 0x00005fff -_0800ACA4: .4byte 0x03003140 -_0800ACA8: .4byte sub_800ACAC + 1 + .pool thumb_func_end sub_800AC80 thumb_func_start sub_800ACAC @@ -22984,7 +22570,7 @@ sub_800ACAC: @ 800ACAC movs r1, 0 cmp r3, r2 bge _0800ACD0 - ldr r4, _0800ACFC + ldr r4, =0x030030f0 _0800ACC0: adds r0, r1, r4 ldrb r0, [r0] @@ -22998,93 +22584,83 @@ _0800ACCA: _0800ACD0: cmp r3, r2 bne _0800ACF4 - ldr r2, _0800AD00 + ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x21 negs r1, r1 ands r0, r1 str r0, [r2] - ldr r0, _0800AD04 + ldr r0, =0x03002748 movs r4, 0x1 strb r4, [r0] bl sub_80097E8 - ldr r1, _0800AD08 + ldr r1, =0x03003140 movs r0, 0 str r0, [r1] - ldr r0, _0800AD0C + ldr r0, =0x030030e4 strb r4, [r0] _0800ACF4: pop {r4} pop {r0} bx r0 .align 2, 0 -_0800ACFC: .4byte 0x030030f0 -_0800AD00: .4byte 0x02022fec -_0800AD04: .4byte 0x03002748 -_0800AD08: .4byte 0x03003140 -_0800AD0C: .4byte 0x030030e4 + .pool thumb_func_end sub_800ACAC thumb_func_start sub_800AD10 sub_800AD10: @ 800AD10 push {lr} - ldr r0, _0800AD20 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 bne _0800AD24 bl task_add_05_task_del_08FA224_when_no_RfuFunc b _0800AD4C .align 2, 0 -_0800AD20: .4byte 0x030030fc + .pool _0800AD24: - ldr r2, _0800AD38 + ldr r2, =0x03003140 ldr r1, [r2] cmp r1, 0 beq _0800AD40 - ldr r1, _0800AD3C + ldr r1, =0x02022b08 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _0800AD4C .align 2, 0 -_0800AD38: .4byte 0x03003140 -_0800AD3C: .4byte 0x02022b08 + .pool _0800AD40: - ldr r0, _0800AD50 + ldr r0, =sub_800AD5C + 1 str r0, [r2] - ldr r0, _0800AD54 + ldr r0, =0x030030e4 strb r1, [r0] - ldr r0, _0800AD58 + ldr r0, =0x030030f4 strh r1, [r0] _0800AD4C: pop {r0} bx r0 .align 2, 0 -_0800AD50: .4byte sub_800AD5C + 1 -_0800AD54: .4byte 0x030030e4 -_0800AD58: .4byte 0x030030f4 + .pool thumb_func_end sub_800AD10 thumb_func_start sub_800AD5C sub_800AD5C: @ 800AD5C push {lr} - ldr r0, _0800AD78 + ldr r0, =0x03004130 ldrb r0, [r0] cmp r0, 0 bne _0800AD72 - ldr r0, _0800AD7C + ldr r0, =0x00005fff bl sub_8009D90 - ldr r1, _0800AD80 - ldr r0, _0800AD84 + ldr r1, =0x03003140 + ldr r0, =sub_800AD88 + 1 str r0, [r1] _0800AD72: pop {r0} bx r0 .align 2, 0 -_0800AD78: .4byte 0x03004130 -_0800AD7C: .4byte 0x00005fff -_0800AD80: .4byte 0x03003140 -_0800AD84: .4byte sub_800AD88 + 1 + .pool thumb_func_end sub_800AD5C thumb_func_start sub_800AD88 @@ -23097,8 +22673,8 @@ sub_800AD88: @ 800AD88 movs r2, 0 cmp r1, r3 bge _0800ADB6 - ldr r5, _0800ADE0 - ldr r4, _0800ADE4 + ldr r5, =0x030030f0 + ldr r4, =0x020229e8 _0800AD9E: ldrh r0, [r4, 0x1A] cmp r0, 0x1 @@ -23117,85 +22693,75 @@ _0800ADAE: _0800ADB6: cmp r1, r3 bne _0800ADDA - ldr r2, _0800ADE8 + ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x21 negs r1, r1 ands r0, r1 str r0, [r2] - ldr r0, _0800ADEC + ldr r0, =0x03002748 movs r4, 0x1 strb r4, [r0] bl sub_80097E8 - ldr r1, _0800ADF0 + ldr r1, =0x03003140 movs r0, 0 str r0, [r1] - ldr r0, _0800ADF4 + ldr r0, =0x030030e4 strb r4, [r0] _0800ADDA: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0800ADE0: .4byte 0x030030f0 -_0800ADE4: .4byte 0x020229e8 -_0800ADE8: .4byte 0x02022fec -_0800ADEC: .4byte 0x03002748 -_0800ADF0: .4byte 0x03003140 -_0800ADF4: .4byte 0x030030e4 + .pool thumb_func_end sub_800AD88 thumb_func_start sub_800ADF8 sub_800ADF8: @ 800ADF8 push {lr} - ldr r0, _0800AE08 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 bne _0800AE0C bl sub_8010434 b _0800AE1E .align 2, 0 -_0800AE08: .4byte 0x030030fc + .pool _0800AE0C: - ldr r1, _0800AE24 + ldr r1, =0x03003140 ldr r0, [r1] cmp r0, 0 bne _0800AE18 - ldr r0, _0800AE28 + ldr r0, =sub_800AE30 + 1 str r0, [r1] _0800AE18: - ldr r1, _0800AE2C + ldr r1, =0x030030e4 movs r0, 0 strb r0, [r1] _0800AE1E: pop {r0} bx r0 .align 2, 0 -_0800AE24: .4byte 0x03003140 -_0800AE28: .4byte sub_800AE30 + 1 -_0800AE2C: .4byte 0x030030e4 + .pool thumb_func_end sub_800ADF8 thumb_func_start sub_800AE30 sub_800AE30: @ 800AE30 push {lr} - ldr r0, _0800AE4C + ldr r0, =0x03004130 ldrb r0, [r0] cmp r0, 0 bne _0800AE46 - ldr r0, _0800AE50 + ldr r0, =0x00002ffe bl sub_8009D90 - ldr r1, _0800AE54 - ldr r0, _0800AE58 + ldr r1, =0x03003140 + ldr r0, =sub_800AE5C + 1 str r0, [r1] _0800AE46: pop {r0} bx r0 .align 2, 0 -_0800AE4C: .4byte 0x03004130 -_0800AE50: .4byte 0x00002ffe -_0800AE54: .4byte 0x03003140 -_0800AE58: .4byte sub_800AE5C + 1 + .pool thumb_func_end sub_800AE30 thumb_func_start sub_800AE5C @@ -23207,7 +22773,7 @@ sub_800AE5C: @ 800AE5C movs r1, 0 cmp r1, r2 bcs _0800AE86 - ldr r3, _0800AEAC + ldr r3, =0x030030ec ldrb r0, [r3] cmp r0, 0 beq _0800AE86 @@ -23225,8 +22791,8 @@ _0800AE86: cmp r1, r2 bne _0800AEA4 movs r1, 0 - ldr r4, _0800AEB0 - ldr r3, _0800AEAC + ldr r4, =0x03003140 + ldr r3, =0x030030ec movs r2, 0 _0800AE92: adds r0, r1, r3 @@ -23243,40 +22809,39 @@ _0800AEA4: pop {r0} bx r0 .align 2, 0 -_0800AEAC: .4byte 0x030030ec -_0800AEB0: .4byte 0x03003140 + .pool thumb_func_end sub_800AE5C thumb_func_start sub_800AEB4 sub_800AEB4: @ 800AEB4 push {lr} - ldr r0, _0800AEF8 + ldr r0, =0x020229c4 ldrb r0, [r0] cmp r0, 0 beq _0800AEF4 - ldr r0, _0800AEFC + ldr r0, =0x030030e0 ldr r2, [r0] movs r0, 0xFE lsls r0, 11 ands r0, r2 cmp r0, 0 beq _0800AEF4 - ldr r0, _0800AF00 + ldr r0, =0x030030f8 ldrb r0, [r0] cmp r0, 0 bne _0800AEEA - ldr r1, _0800AF04 + ldr r1, =0x02022b00 str r2, [r1] - ldr r0, _0800AF08 + ldr r0, =0x03004130 ldrb r0, [r0] strb r0, [r1, 0x4] - ldr r0, _0800AF0C + ldr r0, =0x03003160 ldrb r0, [r0] strb r0, [r1, 0x5] - ldr r0, _0800AF10 + ldr r0, =c2_800ACD4 + 1 bl set_callback2 _0800AEEA: - ldr r1, _0800AF14 + ldr r1, =0x0300306c movs r0, 0x1 strb r0, [r1] bl sub_80097E8 @@ -23284,20 +22849,13 @@ _0800AEF4: pop {r0} bx r0 .align 2, 0 -_0800AEF8: .4byte 0x020229c4 -_0800AEFC: .4byte 0x030030e0 -_0800AF00: .4byte 0x030030f8 -_0800AF04: .4byte 0x02022b00 -_0800AF08: .4byte 0x03004130 -_0800AF0C: .4byte 0x03003160 -_0800AF10: .4byte c2_800ACD4 + 1 -_0800AF14: .4byte 0x0300306c + .pool thumb_func_end sub_800AEB4 thumb_func_start sub_800AF18 sub_800AF18: @ 800AF18 push {r4,lr} - ldr r4, _0800AF2C + ldr r4, =0x02022b00 str r0, [r4] strb r1, [r4, 0x5] strb r2, [r4, 0x4] @@ -23306,7 +22864,7 @@ sub_800AF18: @ 800AF18 pop {r0} bx r0 .align 2, 0 -_0800AF2C: .4byte 0x02022b00 + .pool thumb_func_end sub_800AF18 thumb_func_start c2_800ACD4 @@ -23315,13 +22873,13 @@ c2_800ACD4: @ 800AF30 movs r0, 0 movs r1, 0 bl lcd_io_set - ldr r0, _0800B044 + ldr r0, =0x030075f0 bl MPlayStop_rev01 - ldr r0, _0800B048 + ldr r0, =0x03007630 bl MPlayStop_rev01 - ldr r0, _0800B04C + ldr r0, =0x03007800 bl MPlayStop_rev01 - ldr r0, _0800B050 + ldr r0, =0x02000000 movs r1, 0xE0 lsls r1, 9 bl init_malloc @@ -23334,11 +22892,11 @@ c2_800ACD4: @ 800AF30 bl rboxid_80040B8 bl clear_tasks bl remove_some_task - ldr r1, _0800B054 + ldr r1, =0x030030fc ldrb r0, [r1] cmp r0, 0 beq _0800AF8C - ldr r0, _0800B058 + ldr r0, =0x02022b00 ldrb r0, [r0, 0x6] cmp r0, 0 bne _0800AF88 @@ -23347,15 +22905,15 @@ c2_800ACD4: @ 800AF30 _0800AF88: bl sub_800E604 _0800AF8C: - ldr r0, _0800B05C + ldr r0, =sub_80096BC + 1 bl SetVBlankCallback movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0800B060 + ldr r1, =0x082ed1fc movs r0, 0 movs r2, 0x2 bl bg_vram_setup - ldr r4, _0800B064 + ldr r4, =0x02022b0c movs r0, 0x80 lsls r0, 4 bl malloc @@ -23363,7 +22921,7 @@ _0800AF8C: str r1, [r4] movs r0, 0x1 bl bg_set_tilemap - ldr r0, _0800B068 + ldr r0, =0x082ed204 bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 @@ -23392,72 +22950,58 @@ _0800AF8C: lsls r1, 8 movs r0, 0 bl lcd_io_clear_bits - ldr r0, _0800B06C + ldr r0, =0x0860f074 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _0800B070 + ldr r1, =0x03002700 movs r0, 0 strb r0, [r1] - ldr r0, _0800B074 + ldr r0, =sub_8009404 + 1 movs r1, 0 bl AddTask bl sub_80A2F30 - ldr r1, _0800B078 + ldr r1, =0x030022c0 movs r0, 0 str r0, [r1] bl run_active_tasks bl call_obj_callbacks bl obj_sync_something bl fade_and_return_progress_probably - ldr r0, _0800B07C + ldr r0, =sub_800B1A0 + 1 bl set_callback2 _0800B03C: pop {r4} pop {r0} bx r0 .align 2, 0 -_0800B044: .4byte 0x030075f0 -_0800B048: .4byte 0x03007630 -_0800B04C: .4byte 0x03007800 -_0800B050: .4byte 0x02000000 -_0800B054: .4byte 0x030030fc -_0800B058: .4byte 0x02022b00 -_0800B05C: .4byte sub_80096BC + 1 -_0800B060: .4byte 0x082ed1fc -_0800B064: .4byte 0x02022b0c -_0800B068: .4byte 0x082ed204 -_0800B06C: .4byte 0x0860f074 -_0800B070: .4byte 0x03002700 -_0800B074: .4byte sub_8009404 + 1 -_0800B078: .4byte 0x030022c0 -_0800B07C: .4byte sub_800B1A0 + 1 + .pool thumb_func_end c2_800ACD4 thumb_func_start sub_800B080 sub_800B080: @ 800B080 push {r4,r5,lr} sub sp, 0xC - ldr r1, _0800B11C + ldr r1, =0x082ed168 movs r0, 0 movs r2, 0x20 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r1, _0800B120 + ldr r1, =0x082ec88c movs r5, 0 str r5, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _0800B124 + ldr r1, =0x082ecd34 movs r0, 0x1 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _0800B128 + ldr r0, =0x082ec86c movs r1, 0 movs r2, 0x20 bl gpu_pal_apply @@ -23467,10 +23011,10 @@ sub_800B080: @ 800B080 movs r0, 0x2 movs r1, 0 bl Window_FastFillPixels - ldr r4, _0800B12C + ldr r4, =0x082ed224 str r4, [sp] str r5, [sp, 0x4] - ldr r0, _0800B130 + ldr r0, =0x085ee4f7 str r0, [sp, 0x8] movs r0, 0 movs r1, 0x3 @@ -23479,7 +23023,7 @@ sub_800B080: @ 800B080 bl box_print str r4, [sp] str r5, [sp, 0x4] - ldr r0, _0800B134 + ldr r0, =0x085ee50c str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0x3 @@ -23501,20 +23045,14 @@ sub_800B080: @ 800B080 pop {r0} bx r0 .align 2, 0 -_0800B11C: .4byte 0x082ed168 -_0800B120: .4byte 0x082ec88c -_0800B124: .4byte 0x082ecd34 -_0800B128: .4byte 0x082ec86c -_0800B12C: .4byte 0x082ed224 -_0800B130: .4byte 0x085ee4f7 -_0800B134: .4byte 0x085ee50c + .pool thumb_func_end sub_800B080 thumb_func_start sub_800B138 sub_800B138: @ 800B138 push {lr} sub sp, 0xC - ldr r1, _0800B194 + ldr r1, =0x082ed168 movs r0, 0 movs r2, 0x20 movs r3, 0 @@ -23525,11 +23063,11 @@ sub_800B138: @ 800B138 movs r0, 0x2 movs r1, 0 bl Window_FastFillPixels - ldr r0, _0800B198 + ldr r0, =0x082ed224 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, _0800B19C + ldr r0, =0x085ee4a4 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x3 @@ -23550,16 +23088,14 @@ sub_800B138: @ 800B138 pop {r0} bx r0 .align 2, 0 -_0800B194: .4byte 0x082ed168 -_0800B198: .4byte 0x082ed224 -_0800B19C: .4byte 0x085ee4a4 + .pool thumb_func_end sub_800B138 thumb_func_start sub_800B1A0 sub_800B1A0: @ 800B1A0 push {r4,lr} sub sp, 0xC - ldr r0, _0800B1C0 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -23574,7 +23110,7 @@ sub_800B1A0: @ 800B1A0 beq _0800B1F2 b _0800B260 .align 2, 0 -_0800B1C0: .4byte 0x030022c0 + .pool _0800B1C4: cmp r0, 0x5A beq _0800B20C @@ -23588,21 +23124,21 @@ _0800B1D2: beq _0800B214 b _0800B260 _0800B1D8: - ldr r0, _0800B1E8 + ldr r0, =0x02022b00 ldrb r0, [r0, 0x6] cmp r0, 0 beq _0800B1EC bl sub_800B080 b _0800B260 .align 2, 0 -_0800B1E8: .4byte 0x02022b00 + .pool _0800B1EC: bl sub_800B138 b _0800B260 _0800B1F2: movs r0, 0 bl gpu_sync_bg_show - ldr r0, _0800B208 + ldr r0, =0x02022b00 ldrb r0, [r0, 0x6] cmp r0, 0 beq _0800B260 @@ -23610,21 +23146,21 @@ _0800B1F2: bl gpu_sync_bg_show b _0800B260 .align 2, 0 -_0800B208: .4byte 0x02022b00 + .pool _0800B20C: movs r0, 0x16 bl audio_play b _0800B260 _0800B214: - ldr r0, _0800B238 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x2 bne _0800B244 - ldr r0, _0800B23C + ldr r0, =0x082ed224 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, _0800B240 + ldr r0, =0x085ee572 str r0, [sp, 0x8] movs r0, 0 movs r1, 0x3 @@ -23633,17 +23169,15 @@ _0800B214: bl box_print b _0800B260 .align 2, 0 -_0800B238: .4byte 0x030030fc -_0800B23C: .4byte 0x082ed224 -_0800B240: .4byte 0x085ee572 + .pool _0800B244: cmp r0, 0x1 bne _0800B260 - ldr r0, _0800B294 + ldr r0, =0x082ed224 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, _0800B298 + ldr r0, =0x085ee553 str r0, [sp, 0x8] movs r0, 0 movs r1, 0x3 @@ -23651,14 +23185,14 @@ _0800B244: movs r3, 0x14 bl box_print _0800B260: - ldr r0, _0800B29C + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r0, r2 ldrb r1, [r1] cmp r1, 0xA0 bne _0800B2D0 - ldr r4, _0800B2A0 + ldr r4, =0x030030fc ldrb r2, [r4] cmp r2, 0x1 bne _0800B2A8 @@ -23670,17 +23204,13 @@ _0800B260: bl audio_play movs r0, 0 strb r0, [r4] - ldr r1, _0800B2A4 + ldr r1, =0x02022b00 movs r0, 0 strb r0, [r1, 0x6] bl sub_81700F8 b _0800B2C2 .align 2, 0 -_0800B294: .4byte 0x082ed224 -_0800B298: .4byte 0x085ee553 -_0800B29C: .4byte 0x030022c0 -_0800B2A0: .4byte 0x030030fc -_0800B2A4: .4byte 0x02022b00 + .pool _0800B2A8: cmp r2, 0x2 bne _0800B2C2 @@ -23693,7 +23223,7 @@ _0800B2A8: bl rfu_waitREQComplete bl do_reset _0800B2C2: - ldr r0, _0800B2E4 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r0, r2 @@ -23713,26 +23243,26 @@ _0800B2DC: pop {r0} bx r0 .align 2, 0 -_0800B2E4: .4byte 0x030022c0 + .pool thumb_func_end sub_800B1A0 thumb_func_start sub_800B2E8 sub_800B2E8: @ 800B2E8 - ldr r0, _0800B2F4 + ldr r0, =0x04000128 ldrh r0, [r0] lsrs r0, 2 movs r1, 0x1 ands r0, r1 bx lr .align 2, 0 -_0800B2F4: .4byte 0x04000128 + .pool thumb_func_end sub_800B2E8 thumb_func_start sub_800B2F8 sub_800B2F8: @ 800B2F8 push {lr} movs r3, 0 - ldr r2, _0800B31C + ldr r2, =0x04000128 ldrh r1, [r2] movs r0, 0x8 ands r0, r1 @@ -23749,54 +23279,54 @@ _0800B314: pop {r1} bx r1 .align 2, 0 -_0800B31C: .4byte 0x04000128 + .pool thumb_func_end sub_800B2F8 thumb_func_start sub_800B320 sub_800B320: @ 800B320 - ldr r0, _0800B32C + ldr r0, =0x030030e0 ldr r0, [r0] lsrs r0, 6 movs r1, 0x1 ands r0, r1 bx lr .align 2, 0 -_0800B32C: .4byte 0x030030e0 + .pool thumb_func_end sub_800B320 thumb_func_start sub_800B330 sub_800B330: @ 800B330 - ldr r1, _0800B338 + ldr r1, =0x030030f8 strb r0, [r1] bx lr .align 2, 0 -_0800B338: .4byte 0x030030f8 + .pool thumb_func_end sub_800B330 thumb_func_start sub_800B33C sub_800B33C: @ 800B33C - ldr r0, _0800B344 + ldr r0, =0x0300306c ldrb r0, [r0] bx lr .align 2, 0 -_0800B344: .4byte 0x0300306c + .pool thumb_func_end sub_800B33C thumb_func_start sub_800B348 sub_800B348: @ 800B348 push {r4-r6,lr} bl sub_8009638 - ldr r1, _0800B394 + ldr r1, =0x03003030 adds r2, r1, 0 adds r2, 0x10 - ldr r0, _0800B398 + ldr r0, =0x020229cc ldm r0!, {r3-r5} stm r2!, {r3-r5} ldm r0!, {r3,r4,r6} stm r2!, {r3,r4,r6} ldr r0, [r0] str r0, [r2] - ldr r3, _0800B39C + ldr r3, =0x082ed1d4 adds r2, r1, 0 adds r0, r3, 0 ldm r0!, {r4-r6} @@ -23813,17 +23343,14 @@ sub_800B348: @ 800B348 strh r2, [r0] ldrb r2, [r3, 0x2] strb r2, [r0, 0x2] - ldr r0, _0800B3A0 + ldr r0, =0x020228c4 movs r2, 0x3C bl memcpy pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0800B394: .4byte 0x03003030 -_0800B398: .4byte 0x020229cc -_0800B39C: .4byte 0x082ed1d4 -_0800B3A0: .4byte 0x020228c4 + .pool thumb_func_end sub_800B348 thumb_func_start sub_800B3A4 @@ -23832,12 +23359,12 @@ sub_800B3A4: @ 800B3A4 lsls r0, 24 lsrs r0, 24 lsls r2, r0, 8 - ldr r1, _0800B3FC + ldr r1, =0x020223c4 adds r4, r2, r1 lsls r2, r0, 3 subs r2, r0 lsls r2, 2 - ldr r0, _0800B400 + ldr r0, =0x020229e8 adds r2, r0 adds r1, r2, 0 adds r0, r4, 0 @@ -23850,7 +23377,7 @@ sub_800B3A4: @ 800B3A4 str r0, [r1] adds r0, r2, 0 bl sub_800B524 - ldr r5, _0800B404 + ldr r5, =0x082ed1d4 adds r0, r4, 0 adds r1, r5, 0 bl strcmp @@ -23863,33 +23390,30 @@ sub_800B3A4: @ 800B3A4 cmp r0, 0 beq _0800B3F4 _0800B3EE: - ldr r0, _0800B408 + ldr r0, =c2_800ACD4 + 1 bl set_callback2 _0800B3F4: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0800B3FC: .4byte 0x020223c4 -_0800B400: .4byte 0x020229e8 -_0800B404: .4byte 0x082ed1d4 -_0800B408: .4byte c2_800ACD4 + 1 + .pool thumb_func_end sub_800B3A4 thumb_func_start sub_800B40C sub_800B40C: @ 800B40C push {r4,r5,lr} - ldr r0, _0800B444 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _0800B45C - ldr r0, _0800B448 - ldr r1, _0800B44C - ldr r2, _0800B450 + ldr r0, =0x03003144 + ldr r1, =0x03003110 + ldr r2, =0x03003090 bl sub_800B638 - ldr r4, _0800B454 + ldr r4, =0x030030e0 str r0, [r4] - ldr r0, _0800B458 + ldr r0, =0x030022ec bl sub_80099E0 ldr r0, [r4] movs r1, 0x80 @@ -23904,12 +23428,7 @@ _0800B43E: movs r0, 0x1 b _0800B482 .align 2, 0 -_0800B444: .4byte 0x030030fc -_0800B448: .4byte 0x03003144 -_0800B44C: .4byte 0x03003110 -_0800B450: .4byte 0x03003090 -_0800B454: .4byte 0x030030e0 -_0800B458: .4byte 0x030022ec + .pool _0800B45C: bl sub_8010EC0 adds r4, r0, 0 @@ -23936,71 +23455,66 @@ _0800B482: thumb_func_start sub_800B488 sub_800B488: @ 800B488 push {lr} - ldr r0, _0800B49C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0800B498 - ldr r1, _0800B4A0 + ldr r1, =0x030030fc movs r0, 0x1 strb r0, [r1] _0800B498: pop {r0} bx r0 .align 2, 0 -_0800B49C: .4byte 0x03003124 -_0800B4A0: .4byte 0x030030fc + .pool thumb_func_end sub_800B488 thumb_func_start sub_800B4A4 sub_800B4A4: @ 800B4A4 push {lr} - ldr r0, _0800B4B8 + ldr r0, =0x03003124 ldrb r1, [r0] cmp r1, 0 bne _0800B4B2 - ldr r0, _0800B4BC + ldr r0, =0x030030fc strb r1, [r0] _0800B4B2: pop {r0} bx r0 .align 2, 0 -_0800B4B8: .4byte 0x03003124 -_0800B4BC: .4byte 0x030030fc + .pool thumb_func_end sub_800B4A4 thumb_func_start sub_800B4C0 sub_800B4C0: @ 800B4C0 push {lr} - ldr r0, _0800B4D4 + ldr r0, =0x03003124 ldrb r1, [r0] cmp r1, 0 bne _0800B4CE - ldr r0, _0800B4D8 + ldr r0, =0x030030fc strb r1, [r0] _0800B4CE: pop {r0} bx r0 .align 2, 0 -_0800B4D4: .4byte 0x03003124 -_0800B4D8: .4byte 0x030030fc + .pool thumb_func_end sub_800B4C0 thumb_func_start sub_800B4DC sub_800B4DC: @ 800B4DC push {lr} - ldr r0, _0800B4F0 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _0800B4FC - ldr r0, _0800B4F4 - ldr r1, _0800B4F8 + ldr r0, =0x03003170 + ldr r1, =0x00000fbd adds r0, r1 ldrb r0, [r0] b _0800B500 .align 2, 0 -_0800B4F0: .4byte 0x030030fc -_0800B4F4: .4byte 0x03003170 -_0800B4F8: .4byte 0x00000fbd + .pool _0800B4FC: bl sub_80124D4 _0800B500: @@ -24025,11 +23539,11 @@ _0800B514: thumb_func_start sub_800B518 sub_800B518: @ 800B518 - ldr r0, _0800B520 + ldr r0, =0x030030fc ldrb r0, [r0] bx lr .align 2, 0 -_0800B520: .4byte 0x030030fc + .pool thumb_func_end sub_800B518 thumb_func_start sub_800B524 @@ -24052,39 +23566,34 @@ sub_800B53C: @ 800B53C sub sp, 0x4 movs r0, 0xC0 bl disable_irqs - ldr r1, _0800B57C + ldr r1, =0x04000128 movs r2, 0x80 lsls r2, 6 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0800B580 + ldr r0, =0x0400010e movs r2, 0 strh r2, [r0] adds r1, 0xDA movs r0, 0xC0 strh r0, [r1] - ldr r0, _0800B584 + ldr r0, =0x0400012a strh r2, [r0] - ldr r2, _0800B588 + ldr r2, =0x04000120 movs r0, 0 movs r1, 0 str r0, [r2] str r1, [r2, 0x4] str r0, [sp] - ldr r1, _0800B58C - ldr r2, _0800B590 + ldr r1, =0x03003170 + ldr r2, =0x050003f0 mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_0800B57C: .4byte 0x04000128 -_0800B580: .4byte 0x0400010e -_0800B584: .4byte 0x0400012a -_0800B588: .4byte 0x04000120 -_0800B58C: .4byte 0x03003170 -_0800B590: .4byte 0x050003f0 + .pool thumb_func_end sub_800B53C thumb_func_start sub_800B594 @@ -24093,61 +23602,49 @@ sub_800B594: @ 800B594 sub sp, 0x4 movs r0, 0xC0 bl disable_irqs - ldr r0, _0800B5F4 + ldr r0, =0x04000134 movs r4, 0 strh r4, [r0] - ldr r2, _0800B5F8 + ldr r2, =0x04000128 movs r1, 0x80 lsls r1, 6 adds r0, r1, 0 strh r0, [r2] ldrh r0, [r2] - ldr r3, _0800B5FC + ldr r3, =0x00004003 adds r1, r3, 0 orrs r0, r1 strh r0, [r2] movs r0, 0x80 bl enable_irqs - ldr r0, _0800B600 + ldr r0, =0x0400012a strh r4, [r0] movs r5, 0 str r5, [sp] - ldr r1, _0800B604 - ldr r2, _0800B608 + ldr r1, =0x03003170 + ldr r2, =0x050003f0 mov r0, sp bl CpuSet - ldr r0, _0800B60C + ldr r0, =0x03000d6c strb r4, [r0] - ldr r0, _0800B610 + ldr r0, =0x03000d6e strh r5, [r0] - ldr r0, _0800B614 + ldr r0, =0x03000d70 strh r5, [r0] - ldr r0, _0800B618 + ldr r0, =0x03000d72 strb r4, [r0] - ldr r0, _0800B61C + ldr r0, =0x03000d73 strb r4, [r0] - ldr r0, _0800B620 + ldr r0, =0x03003160 strb r4, [r0] - ldr r0, _0800B624 + ldr r0, =0x03004130 strb r4, [r0] add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0800B5F4: .4byte 0x04000134 -_0800B5F8: .4byte 0x04000128 -_0800B5FC: .4byte 0x00004003 -_0800B600: .4byte 0x0400012a -_0800B604: .4byte 0x03003170 -_0800B608: .4byte 0x050003f0 -_0800B60C: .4byte 0x03000d6c -_0800B610: .4byte 0x03000d6e -_0800B614: .4byte 0x03000d70 -_0800B618: .4byte 0x03000d72 -_0800B61C: .4byte 0x03000d73 -_0800B620: .4byte 0x03003160 -_0800B624: .4byte 0x03004130 + .pool thumb_func_end sub_800B594 thumb_func_start sub_800B628 @@ -24165,18 +23662,17 @@ sub_800B638: @ 800B638 adds r4, r0, 0 adds r5, r1, 0 adds r6, r2, 0 - ldr r0, _0800B654 + ldr r0, =0x03003170 ldrb r0, [r0, 0x1] cmp r0, 0x4 bhi _0800B6EA lsls r0, 2 - ldr r1, _0800B658 + ldr r1, =_0800B65C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0800B654: .4byte 0x03003170 -_0800B658: .4byte _0800B65C + .pool .align 2, 0 _0800B65C: .4byte _0800B670 @@ -24186,23 +23682,23 @@ _0800B65C: .4byte _0800B6DE _0800B670: bl sub_800B53C - ldr r1, _0800B67C + ldr r1, =0x03003170 movs r0, 0x1 strb r0, [r1, 0x1] b _0800B6EA .align 2, 0 -_0800B67C: .4byte 0x03003170 + .pool _0800B680: ldrb r0, [r4] cmp r0, 0x1 bne _0800B6EA bl sub_800B594 - ldr r1, _0800B694 + ldr r1, =0x03003170 movs r0, 0x2 strb r0, [r1, 0x1] b _0800B6EA .align 2, 0 -_0800B694: .4byte 0x03003170 + .pool _0800B698: ldrb r1, [r4] cmp r1, 0x1 @@ -24212,7 +23708,7 @@ _0800B698: bl sub_800B764 b _0800B6EA _0800B6A8: - ldr r2, _0800B6BC + ldr r2, =0x03003170 ldrb r0, [r2] cmp r0, 0x8 bne _0800B6EA @@ -24222,20 +23718,19 @@ _0800B6A8: strb r1, [r2, 0xE] b _0800B6EA .align 2, 0 -_0800B6BC: .4byte 0x03003170 + .pool _0800B6C0: - ldr r0, _0800B6CC + ldr r0, =0x03003170 movs r1, 0 strb r1, [r0, 0x1] - ldr r0, _0800B6D0 + ldr r0, =0x0400012a strh r1, [r0] b _0800B6EA .align 2, 0 -_0800B6CC: .4byte 0x03003170 -_0800B6D0: .4byte 0x0400012a + .pool _0800B6D4: bl sub_800B790 - ldr r1, _0800B724 + ldr r1, =0x03003170 movs r0, 0x4 strb r0, [r1, 0x1] _0800B6DE: @@ -24246,7 +23741,7 @@ _0800B6DE: _0800B6EA: movs r0, 0 strb r0, [r4] - ldr r1, _0800B724 + ldr r1, =0x03003170 ldrb r2, [r1, 0x2] ldrb r0, [r1, 0x3] lsls r0, 2 @@ -24275,7 +23770,7 @@ _0800B702: orrs r0, r2 b _0800B72C .align 2, 0 -_0800B724: .4byte 0x03003170 + .pool _0800B728: adds r0, r2, 0 orrs r0, r3 @@ -24315,11 +23810,11 @@ _0800B75A: thumb_func_start sub_800B764 sub_800B764: @ 800B764 push {lr} - ldr r0, _0800B780 + ldr r0, =0x04000128 ldr r1, [r0] movs r0, 0xC ands r1, r0 - ldr r2, _0800B784 + ldr r2, =0x03003170 cmp r1, 0x8 bne _0800B788 ldrb r0, [r2, 0x2] @@ -24328,8 +23823,7 @@ sub_800B764: @ 800B764 strb r1, [r2] b _0800B78C .align 2, 0 -_0800B780: .4byte 0x04000128 -_0800B784: .4byte 0x03003170 + .pool _0800B788: movs r0, 0 strb r0, [r2] @@ -24341,12 +23835,12 @@ _0800B78C: thumb_func_start sub_800B790 sub_800B790: @ 800B790 push {lr} - ldr r0, _0800B7B4 + ldr r0, =0x03003170 ldrb r0, [r0] cmp r0, 0 beq _0800B7AE - ldr r1, _0800B7B8 - ldr r2, _0800B7BC + ldr r1, =0x0400010c + ldr r2, =0x0000ff3b adds r0, r2, 0 strh r0, [r1] adds r1, 0x2 @@ -24358,9 +23852,7 @@ _0800B7AE: pop {r0} bx r0 .align 2, 0 -_0800B7B4: .4byte 0x03003170 -_0800B7B8: .4byte 0x0400010c -_0800B7BC: .4byte 0x0000ff3b + .pool thumb_func_end sub_800B790 thumb_func_start sub_800B7C0 @@ -24371,14 +23863,14 @@ sub_800B7C0: @ 800B7C0 mov r5, r8 push {r5-r7} adds r3, r0, 0 - ldr r2, _0800B838 - ldr r1, _0800B83C + ldr r2, =0x03004134 + ldr r1, =0x04000208 ldrh r0, [r1] strh r0, [r2] movs r0, 0 strh r0, [r1] - ldr r1, _0800B840 - ldr r4, _0800B844 + ldr r1, =0x03003170 + ldr r4, =0x00000339 adds r0, r1, r4 ldrb r4, [r0] adds r6, r1, 0 @@ -24398,9 +23890,9 @@ sub_800B7C0: @ 800B7C0 lsrs r0, 24 _0800B7FE: movs r2, 0 - ldr r4, _0800B848 + ldr r4, =0x03000d6e mov r9, r4 - ldr r1, _0800B84C + ldr r1, =0x03003160 mov r10, r1 lsls r5, r0, 1 movs r0, 0x18 @@ -24428,25 +23920,20 @@ _0800B814: bls _0800B814 b _0800B85C .align 2, 0 -_0800B838: .4byte 0x03004134 -_0800B83C: .4byte 0x04000208 -_0800B840: .4byte 0x03003170 -_0800B844: .4byte 0x00000339 -_0800B848: .4byte 0x03000d6e -_0800B84C: .4byte 0x03003160 + .pool _0800B850: movs r0, 0x1 strb r0, [r6, 0x12] - ldr r2, _0800B894 + ldr r2, =0x03000d6e mov r9, r2 - ldr r4, _0800B898 + ldr r4, =0x03003160 mov r10, r4 _0800B85C: mov r1, r9 ldrh r0, [r1] cmp r0, 0 beq _0800B874 - ldr r2, _0800B89C + ldr r2, =0x00000339 adds r0, r6, r2 ldrb r1, [r0] adds r1, 0x1 @@ -24455,11 +23942,11 @@ _0800B85C: mov r4, r9 strh r2, [r4] _0800B874: - ldr r1, _0800B8A0 - ldr r2, _0800B8A4 + ldr r1, =0x04000208 + ldr r2, =0x03004134 ldrh r0, [r2] strh r0, [r1] - ldr r4, _0800B89C + ldr r4, =0x00000339 adds r0, r6, r4 ldrb r0, [r0] mov r1, r10 @@ -24472,11 +23959,7 @@ _0800B874: pop {r0} bx r0 .align 2, 0 -_0800B894: .4byte 0x03000d6e -_0800B898: .4byte 0x03003160 -_0800B89C: .4byte 0x00000339 -_0800B8A0: .4byte 0x04000208 -_0800B8A4: .4byte 0x03004134 + .pool thumb_func_end sub_800B7C0 thumb_func_start sub_800B8A8 @@ -24487,14 +23970,14 @@ sub_800B8A8: @ 800B8A8 mov r5, r8 push {r5-r7} mov r9, r0 - ldr r2, _0800B904 - ldr r1, _0800B908 + ldr r2, =0x03004134 + ldr r1, =0x04000208 ldrh r0, [r1] strh r0, [r2] movs r0, 0 strh r0, [r1] - ldr r1, _0800B90C - ldr r3, _0800B910 + ldr r1, =0x03003170 + ldr r3, =0x00000fbd adds r0, r1, r3 ldrb r0, [r0] mov r12, r1 @@ -24530,17 +24013,14 @@ _0800B8FA: strb r0, [r7, 0xC] b _0800B990 .align 2, 0 -_0800B904: .4byte 0x03004134 -_0800B908: .4byte 0x04000208 -_0800B90C: .4byte 0x03003170 -_0800B910: .4byte 0x00000fbd + .pool _0800B914: movs r3, 0 mov r0, r12 ldrb r1, [r0, 0x3] cmp r3, r1 bcs _0800B96A - ldr r0, _0800B9A8 + ldr r0, =0x00000fbc add r0, r12 ldrb r0, [r0] lsls r6, r0, 1 @@ -24582,13 +24062,13 @@ _0800B944: bcc _0800B930 _0800B96A: mov r2, r12 - ldr r0, _0800B9AC + ldr r0, =0x00000fbd adds r1, r2, r0 ldrb r0, [r1] subs r0, 0x1 movs r3, 0 strb r0, [r1] - ldr r1, _0800B9A8 + ldr r1, =0x00000fbc adds r2, r1 ldrb r0, [r2] adds r0, 0x1 @@ -24602,8 +24082,8 @@ _0800B98C: mov r2, r12 strb r3, [r2, 0xC] _0800B990: - ldr r1, _0800B9B0 - ldr r3, _0800B9B4 + ldr r1, =0x04000208 + ldr r3, =0x03004134 ldrh r0, [r3] strh r0, [r1] pop {r3-r5} @@ -24614,16 +24094,13 @@ _0800B990: pop {r0} bx r0 .align 2, 0 -_0800B9A8: .4byte 0x00000fbc -_0800B9AC: .4byte 0x00000fbd -_0800B9B0: .4byte 0x04000208 -_0800B9B4: .4byte 0x03004134 + .pool thumb_func_end sub_800B8A8 thumb_func_start sub_800B9B8 sub_800B9B8: @ 800B9B8 push {r4,lr} - ldr r3, _0800B9E0 + ldr r3, =0x03003170 ldrb r4, [r3] cmp r4, 0 beq _0800B9F4 @@ -24643,7 +24120,7 @@ sub_800B9B8: @ 800B9B8 strb r0, [r3, 0x13] b _0800BA1E .align 2, 0 -_0800B9E0: .4byte 0x03003170 + .pool _0800B9E4: ldrb r0, [r3, 0x13] cmp r0, 0x1 @@ -24660,7 +24137,7 @@ _0800B9F4: cmp r2, 0x2 bne _0800BA1E _0800B9FE: - ldr r1, _0800BA24 + ldr r1, =0x03000d6c ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -24682,7 +24159,7 @@ _0800BA1E: pop {r0} bx r0 .align 2, 0 -_0800BA24: .4byte 0x03000d6c + .pool thumb_func_end sub_800B9B8 thumb_func_start irq_timer3 @@ -24697,8 +24174,8 @@ irq_timer3: @ 800BA28 thumb_func_start sub_800BA38 sub_800BA38: @ 800BA38 push {r4,lr} - ldr r4, _0800BA64 - ldr r0, _0800BA68 + ldr r4, =0x03003170 + ldr r0, =0x04000128 ldr r1, [r0] lsls r0, r1, 26 lsrs r0, 30 @@ -24716,8 +24193,7 @@ sub_800BA38: @ 800BA38 bl sub_800BDCC b _0800BA8A .align 2, 0 -_0800BA64: .4byte 0x03003170 -_0800BA68: .4byte 0x04000128 + .pool _0800BA6C: bl sub_800BAD0 lsls r0, 24 @@ -24735,19 +24211,19 @@ _0800BA86: movs r0, 0x4 strb r0, [r4, 0x1] _0800BA8A: - ldr r3, _0800BAB0 + ldr r3, =0x03003170 ldrb r0, [r3, 0xD] adds r0, 0x1 movs r2, 0 strb r0, [r3, 0xD] - ldr r1, _0800BAB4 + ldr r1, =0x03000d6c strb r2, [r1] lsls r0, 24 asrs r0, 24 cmp r0, 0x8 bne _0800BAAA - ldr r0, _0800BAB8 - ldr r2, _0800BABC + ldr r0, =0x03004130 + ldr r2, =0x00000fbd adds r1, r3, r2 ldrb r1, [r1] strb r1, [r0] @@ -24756,22 +24232,19 @@ _0800BAAA: pop {r0} bx r0 .align 2, 0 -_0800BAB0: .4byte 0x03003170 -_0800BAB4: .4byte 0x03000d6c -_0800BAB8: .4byte 0x03004130 -_0800BABC: .4byte 0x00000fbd + .pool thumb_func_end sub_800BA38 thumb_func_start sub_800BAC0 sub_800BAC0: @ 800BAC0 - ldr r0, _0800BACC + ldr r0, =0x04000128 ldrh r1, [r0] movs r2, 0x80 orrs r1, r2 strh r1, [r0] bx lr .align 2, 0 -_0800BACC: .4byte 0x04000128 + .pool thumb_func_end sub_800BAC0 thumb_func_start sub_800BAD0 @@ -24781,28 +24254,25 @@ sub_800BAD0: @ 800BAD0 mov r6, r8 push {r6,r7} movs r5, 0 - ldr r6, _0800BAEC - ldr r0, _0800BAF0 + ldr r6, =0x0000ffff + ldr r0, =0x03003170 ldrb r1, [r0, 0xE] adds r7, r0, 0 cmp r1, 0x1 bne _0800BAFC - ldr r1, _0800BAF4 - ldr r2, _0800BAF8 + ldr r1, =0x0400012a + ldr r2, =0x00008fff b _0800BB00 .align 2, 0 -_0800BAEC: .4byte 0x0000ffff -_0800BAF0: .4byte 0x03003170 -_0800BAF4: .4byte 0x0400012a -_0800BAF8: .4byte 0x00008fff + .pool _0800BAFC: - ldr r1, _0800BB54 - ldr r2, _0800BB58 + ldr r1, =0x0400012a + ldr r2, =0x0000b9a0 _0800BB00: adds r0, r2, 0 strh r0, [r1] - ldr r2, _0800BB5C - ldr r3, _0800BB60 + ldr r2, =0x03003174 + ldr r3, =0x04000120 ldr r0, [r3] ldr r1, [r3, 0x4] str r0, [r2] @@ -24813,11 +24283,11 @@ _0800BB00: str r1, [r3, 0x4] strb r0, [r2, 0xA] movs r4, 0 - ldr r0, _0800BB64 + ldr r0, =0x03000d73 mov r9, r0 mov r8, r2 - ldr r2, _0800BB68 - ldr r1, _0800BB6C + ldr r2, =0x00008fff + ldr r1, =0x0000ffff mov r12, r1 _0800BB28: lsls r0, r4, 1 @@ -24826,7 +24296,7 @@ _0800BB28: movs r0, 0x4 negs r0, r0 ands r0, r3 - ldr r1, _0800BB58 + ldr r1, =0x0000b9a0 cmp r0, r1 beq _0800BB40 adds r0, r3, 0 @@ -24844,13 +24314,7 @@ _0800BB40: adds r6, r3, 0 b _0800BB78 .align 2, 0 -_0800BB54: .4byte 0x0400012a -_0800BB58: .4byte 0x0000b9a0 -_0800BB5C: .4byte 0x03003174 -_0800BB60: .4byte 0x04000120 -_0800BB64: .4byte 0x03000d73 -_0800BB68: .4byte 0x00008fff -_0800BB6C: .4byte 0x0000ffff + .pool _0800BB70: cmp r0, r12 beq _0800BB82 @@ -24872,13 +24336,13 @@ _0800BB82: cmp r0, r2 bne _0800BBA4 ldrh r1, [r7, 0x4] - ldr r0, _0800BBA0 + ldr r0, =0x00008fff cmp r1, r0 bne _0800BBA4 movs r0, 0x1 b _0800BBBE .align 2, 0 -_0800BBA0: .4byte 0x00008fff + .pool _0800BBA4: ldrb r0, [r7, 0x3] cmp r0, 0x1 @@ -24910,18 +24374,18 @@ sub_800BBCC: @ 800BBCC mov r7, r8 push {r7} sub sp, 0x8 - ldr r0, _0800BC24 + ldr r0, =0x04000120 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] - ldr r0, _0800BC28 + ldr r0, =0x03003170 ldrb r1, [r0, 0x16] adds r6, r0, 0 cmp r1, 0 bne _0800BC30 movs r4, 0 - ldr r7, _0800BC2C + ldr r7, =0x03000d72 ldrb r0, [r6, 0x3] cmp r4, r0 bcs _0800BC1A @@ -24954,11 +24418,9 @@ _0800BC1A: strb r0, [r7] b _0800BCD0 .align 2, 0 -_0800BC24: .4byte 0x04000120 -_0800BC28: .4byte 0x03003170 -_0800BC2C: .4byte 0x03000d72 + .pool _0800BC30: - ldr r2, _0800BCA0 + ldr r2, =0x00000fbc adds r1, r6, r2 adds r2, 0x1 adds r0, r6, r2 @@ -24980,7 +24442,7 @@ _0800BC4C: cmp r4, r1 bcs _0800BCAC adds r5, r6, 0 - ldr r7, _0800BCA4 + ldr r7, =0x03000d70 lsls r0, 1 mov r12, r0 movs r2, 0xCF @@ -25017,8 +24479,7 @@ _0800BC68: bcc _0800BC68 b _0800BCAC .align 2, 0 -_0800BCA0: .4byte 0x00000fbc -_0800BCA4: .4byte 0x03000d70 + .pool _0800BCA8: movs r0, 0x2 strb r0, [r6, 0x12] @@ -25030,11 +24491,11 @@ _0800BCAC: lsrs r0, 24 cmp r0, 0x8 bne _0800BCD0 - ldr r2, _0800BCDC + ldr r2, =0x03000d70 ldrh r0, [r2] cmp r0, 0 beq _0800BCD0 - ldr r1, _0800BCE0 + ldr r1, =0x00000fbd adds r0, r6, r1 ldrb r1, [r0] adds r1, 0x1 @@ -25049,26 +24510,25 @@ _0800BCD0: pop {r0} bx r0 .align 2, 0 -_0800BCDC: .4byte 0x03000d70 -_0800BCE0: .4byte 0x00000fbd + .pool thumb_func_end sub_800BBCC thumb_func_start sub_800BCE4 sub_800BCE4: @ 800BCE4 push {r4,lr} - ldr r0, _0800BD20 + ldr r0, =0x03003170 ldrb r1, [r0, 0x16] adds r4, r0, 0 cmp r1, 0x8 bne _0800BD36 - ldr r1, _0800BD24 + ldr r1, =0x0400012a ldrh r0, [r4, 0x14] strh r0, [r1] - ldr r1, _0800BD28 + ldr r1, =0x03000d6d ldrb r2, [r1] cmp r2, 0 bne _0800BD30 - ldr r0, _0800BD2C + ldr r0, =0x00000339 adds r1, r4, r0 ldrb r0, [r1] subs r0, 0x1 @@ -25086,20 +24546,17 @@ sub_800BCE4: @ 800BCE4 strb r2, [r1] b _0800BD8C .align 2, 0 -_0800BD20: .4byte 0x03003170 -_0800BD24: .4byte 0x0400012a -_0800BD28: .4byte 0x03000d6d -_0800BD2C: .4byte 0x00000339 + .pool _0800BD30: movs r0, 0 strb r0, [r1] b _0800BD8C _0800BD36: - ldr r1, _0800BD5C + ldr r1, =0x03000d6d ldrb r0, [r1] cmp r0, 0 bne _0800BD52 - ldr r2, _0800BD60 + ldr r2, =0x00000339 adds r0, r4, r2 ldrb r0, [r0] cmp r0, 0 @@ -25111,16 +24568,14 @@ _0800BD4C: cmp r0, 0 beq _0800BD68 _0800BD52: - ldr r1, _0800BD64 + ldr r1, =0x0400012a movs r0, 0 strh r0, [r1] b _0800BD86 .align 2, 0 -_0800BD5C: .4byte 0x03000d6d -_0800BD60: .4byte 0x00000339 -_0800BD64: .4byte 0x0400012a + .pool _0800BD68: - ldr r3, _0800BD94 + ldr r3, =0x0400012a movs r1, 0xCE lsls r1, 2 adds r0, r4, r1 @@ -25144,40 +24599,36 @@ _0800BD8C: pop {r0} bx r0 .align 2, 0 -_0800BD94: .4byte 0x0400012a + .pool thumb_func_end sub_800BCE4 thumb_func_start sub_800BD98 sub_800BD98: @ 800BD98 push {lr} - ldr r0, _0800BDB8 + ldr r0, =0x03003170 ldrb r0, [r0] cmp r0, 0 beq _0800BDB4 - ldr r2, _0800BDBC + ldr r2, =0x0400010e ldrh r1, [r2] - ldr r0, _0800BDC0 + ldr r0, =0x0000ff7f ands r0, r1 strh r0, [r2] - ldr r1, _0800BDC4 - ldr r2, _0800BDC8 + ldr r1, =0x0400010c + ldr r2, =0x0000ff3b adds r0, r2, 0 strh r0, [r1] _0800BDB4: pop {r0} bx r0 .align 2, 0 -_0800BDB8: .4byte 0x03003170 -_0800BDBC: .4byte 0x0400010e -_0800BDC0: .4byte 0x0000ff7f -_0800BDC4: .4byte 0x0400010c -_0800BDC8: .4byte 0x0000ff3b + .pool thumb_func_end sub_800BD98 thumb_func_start sub_800BDCC sub_800BDCC: @ 800BDCC push {lr} - ldr r1, _0800BDE0 + ldr r1, =0x03003170 ldrb r0, [r1, 0x17] cmp r0, 0x8 bne _0800BDE4 @@ -25186,12 +24637,12 @@ sub_800BDCC: @ 800BDCC strb r0, [r1, 0x17] b _0800BDF4 .align 2, 0 -_0800BDE0: .4byte 0x03003170 + .pool _0800BDE4: ldrb r0, [r1] cmp r0, 0 beq _0800BDF4 - ldr r0, _0800BDF8 + ldr r0, =0x0400010e ldrh r1, [r0] movs r2, 0x80 orrs r1, r2 @@ -25200,14 +24651,14 @@ _0800BDF4: pop {r0} bx r0 .align 2, 0 -_0800BDF8: .4byte 0x0400010e + .pool thumb_func_end sub_800BDCC thumb_func_start sub_800BDFC sub_800BDFC: @ 800BDFC push {r4-r6,lr} - ldr r1, _0800BE44 - ldr r2, _0800BE48 + ldr r1, =0x03003170 + ldr r2, =0x00000339 adds r0, r1, r2 movs r2, 0 strb r2, [r0] @@ -25219,7 +24670,7 @@ sub_800BDFC: @ 800BDFC movs r6, 0x64 adds r5, r1, 0 adds r5, 0x18 - ldr r4, _0800BE4C + ldr r4, =0x0000efff _0800BE1A: movs r2, 0 adds r1, r0, 0x1 @@ -25243,20 +24694,18 @@ _0800BE22: pop {r0} bx r0 .align 2, 0 -_0800BE44: .4byte 0x03003170 -_0800BE48: .4byte 0x00000339 -_0800BE4C: .4byte 0x0000efff + .pool thumb_func_end sub_800BDFC thumb_func_start sub_800BE50 sub_800BE50: @ 800BE50 push {r4-r7,lr} - ldr r1, _0800BEB0 - ldr r2, _0800BEB4 + ldr r1, =0x03003170 + ldr r2, =0x00000fbd adds r0, r1, r2 movs r2, 0 strb r2, [r0] - ldr r3, _0800BEB8 + ldr r3, =0x00000fbc adds r0, r1, r3 strb r2, [r0] movs r0, 0x64 @@ -25264,7 +24713,7 @@ sub_800BE50: @ 800BE50 movs r3, 0xCF lsls r3, 2 adds r7, r1, r3 - ldr r6, _0800BEBC + ldr r6, =0x0000efff _0800BE6E: movs r3, 0 lsls r0, r2, 1 @@ -25302,10 +24751,7 @@ _0800BE86: pop {r0} bx r0 .align 2, 0 -_0800BEB0: .4byte 0x03003170 -_0800BEB4: .4byte 0x00000fbd -_0800BEB8: .4byte 0x00000fbc -_0800BEBC: .4byte 0x0000efff + .pool thumb_func_end sub_800BE50 thumb_func_start sub_800BEC0 @@ -25313,14 +24759,14 @@ sub_800BEC0: @ 800BEC0 push {r4,lr} bl rfu_REQBN_softReset_and_checkID adds r4, r0, 0 - ldr r0, _0800BF04 + ldr r0, =0x00008001 cmp r4, r0 bne _0800BED4 - ldr r1, _0800BF08 + ldr r1, =0x03004140 movs r0, 0x1 strb r0, [r1, 0x8] _0800BED4: - ldr r0, _0800BF08 + ldr r0, =0x03004140 ldrb r2, [r0, 0x4] adds r1, r0, 0 cmp r2, 0x17 @@ -25344,8 +24790,7 @@ _0800BEE8: pop {r1} bx r1 .align 2, 0 -_0800BF04: .4byte 0x00008001 -_0800BF08: .4byte 0x03004140 + .pool thumb_func_end sub_800BEC0 thumb_func_start rfu_REQ_sendData_wrapper @@ -25353,12 +24798,12 @@ rfu_REQ_sendData_wrapper: @ 800BF0C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0800BF2C + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 bne _0800BF34 - ldr r0, _0800BF30 + ldr r0, =0x03004140 ldrb r0, [r0, 0x2] movs r2, 0 cmp r0, 0x1 @@ -25366,10 +24811,9 @@ rfu_REQ_sendData_wrapper: @ 800BF0C movs r2, 0x1 b _0800BF3C .align 2, 0 -_0800BF2C: .4byte 0x03007890 -_0800BF30: .4byte 0x03004140 + .pool _0800BF34: - ldr r0, _0800BF48 + ldr r0, =0x03004140 ldrb r1, [r0, 0x3] movs r1, 0 strb r1, [r0, 0x3] @@ -25379,7 +24823,7 @@ _0800BF3C: pop {r0} bx r0 .align 2, 0 -_0800BF48: .4byte 0x03004140 + .pool thumb_func_end rfu_REQ_sendData_wrapper thumb_func_start sub_800BF4C @@ -25393,8 +24837,8 @@ sub_800BF4C: @ 800BF4C mov r1, sp movs r0, 0 strh r0, [r1] - ldr r4, _0800BF84 - ldr r2, _0800BF88 + ldr r4, =0x03004140 + ldr r2, =0x01000024 mov r0, sp adds r1, r4, 0 bl CpuSet @@ -25402,17 +24846,14 @@ sub_800BF4C: @ 800BF4C strb r0, [r4, 0x6] str r5, [r4, 0x40] str r6, [r4, 0x44] - ldr r0, _0800BF8C + ldr r0, =sub_800CEB0 + 1 bl rfu_setMSCCallback - ldr r0, _0800BF90 + ldr r0, =sub_800C7B4 + 1 bl rfu_setREQCallback movs r0, 0 b _0800BF96 .align 2, 0 -_0800BF84: .4byte 0x03004140 -_0800BF88: .4byte 0x01000024 -_0800BF8C: .4byte sub_800CEB0 + 1 -_0800BF90: .4byte sub_800C7B4 + 1 + .pool _0800BF94: movs r0, 0x4 _0800BF96: @@ -25429,8 +24870,8 @@ sub_800BFA0: @ 800BFA0 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r4, _0800BFC4 - ldr r2, _0800BFC8 + ldr r4, =0x03004140 + ldr r2, =0x01000020 mov r0, sp adds r1, r4, 0 bl CpuSet @@ -25441,8 +24882,7 @@ sub_800BFA0: @ 800BFA0 pop {r0} bx r0 .align 2, 0 -_0800BFC4: .4byte 0x03004140 -_0800BFC8: .4byte 0x01000020 + .pool thumb_func_end sub_800BFA0 thumb_func_start sub_800BFCC @@ -25450,7 +24890,7 @@ sub_800BFCC: @ 800BFCC push {r4,lr} adds r4, r0, 0 bl sub_800C000 - ldr r1, _0800BFFC + ldr r1, =0x03004140 movs r2, 0x1 strb r2, [r1, 0x4] movs r0, 0x2 @@ -25471,13 +24911,13 @@ _0800BFF4: pop {r0} bx r0 .align 2, 0 -_0800BFFC: .4byte 0x03004140 + .pool thumb_func_end sub_800BFCC thumb_func_start sub_800C000 sub_800C000: @ 800C000 push {r4,r5,lr} - ldr r2, _0800C044 + ldr r2, =0x03004140 movs r0, 0 strb r0, [r2, 0x5] strb r0, [r2, 0x4] @@ -25511,17 +24951,17 @@ _0800C028: pop {r0} bx r0 .align 2, 0 -_0800C044: .4byte 0x03004140 + .pool thumb_func_end sub_800C000 thumb_func_start sub_800C048 sub_800C048: @ 800C048 - ldr r1, _0800C050 + ldr r1, =0x03004140 movs r0, 0x15 strb r0, [r1, 0x4] bx lr .align 2, 0 -_0800C050: .4byte 0x03004140 + .pool thumb_func_end sub_800C048 thumb_func_start sub_800C054 @@ -25537,7 +24977,7 @@ sub_800C054: @ 800C054 lsls r2, 16 lsrs r2, 16 mov r8, r2 - ldr r1, _0800C08C + ldr r1, =0x03004140 ldrb r0, [r1, 0x4] cmp r0, 0 beq _0800C090 @@ -25554,13 +24994,13 @@ _0800C07A: movs r0, 0x1 b _0800C122 .align 2, 0 -_0800C08C: .4byte 0x03004140 + .pool _0800C090: bl rfu_getMasterSlave lsls r0, 24 cmp r0, 0 bne _0800C0B0 - ldr r1, _0800C0AC + ldr r1, =0x03004140 movs r0, 0x2 strh r0, [r1, 0x14] movs r0, 0xF3 @@ -25569,13 +25009,13 @@ _0800C090: movs r0, 0x2 b _0800C122 .align 2, 0 -_0800C0AC: .4byte 0x03004140 + .pool _0800C0B0: movs r2, 0 ldrh r0, [r6] - ldr r4, _0800C0E4 + ldr r4, =0x0000ffff adds r1, r6, 0x2 - ldr r3, _0800C0E8 + ldr r3, =0x03004140 cmp r0, r4 beq _0800C0D0 _0800C0BE: @@ -25599,8 +25039,7 @@ _0800C0D0: movs r0, 0x4 b _0800C122 .align 2, 0 -_0800C0E4: .4byte 0x0000ffff -_0800C0E8: .4byte 0x03004140 + .pool _0800C0EC: cmp r5, 0x1 bls _0800C0FA @@ -25651,7 +25090,7 @@ mega_func_4: @ 800C12C lsls r1, 16 lsrs r1, 16 mov r8, r1 - ldr r1, _0800C160 + ldr r1, =0x03004140 ldrb r0, [r1, 0x4] cmp r0, 0 beq _0800C164 @@ -25668,13 +25107,13 @@ mega_func_4: @ 800C12C movs r0, 0x1 b _0800C204 .align 2, 0 -_0800C160: .4byte 0x03004140 + .pool _0800C164: bl rfu_getMasterSlave lsls r0, 24 cmp r0, 0 bne _0800C184 - ldr r1, _0800C180 + ldr r1, =0x03004140 movs r0, 0x2 strh r0, [r1, 0x14] movs r0, 0xF3 @@ -25683,13 +25122,13 @@ _0800C164: movs r0, 0x2 b _0800C204 .align 2, 0 -_0800C180: .4byte 0x03004140 + .pool _0800C184: movs r2, 0 - ldr r0, _0800C1D0 + ldr r0, =0x03007890 ldr r1, [r0] ldrb r3, [r1, 0x8] - ldr r5, _0800C1D4 + ldr r5, =0x03004140 adds r7, r0, 0 cmp r2, r3 bcs _0800C1B2 @@ -25725,8 +25164,7 @@ _0800C1BE: movs r0, 0x3 b _0800C204 .align 2, 0 -_0800C1D0: .4byte 0x03007890 -_0800C1D4: .4byte 0x03004140 + .pool _0800C1D8: ldrb r0, [r5, 0x4] cmp r0, 0 @@ -25767,7 +25205,7 @@ sub_800C210: @ 800C210 push {r4-r7,lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r6, _0800C274 + ldr r6, =0x03004140 adds r3, r6, 0 adds r3, 0x30 ldrb r2, [r3] @@ -25779,7 +25217,7 @@ sub_800C210: @ 800C210 bics r0, r1 strb r0, [r3] movs r4, 0 - ldr r7, _0800C278 + ldr r7, =0x03007890 movs r5, 0x1 adds r3, 0x4 movs r2, 0 @@ -25806,7 +25244,7 @@ _0800C246: adds r0, r4, 0 bl sub_800D334 _0800C260: - ldr r0, _0800C274 + ldr r0, =0x03004140 strh r4, [r0, 0x14] movs r0, 0x33 adds r1, r4, 0 @@ -25816,8 +25254,7 @@ _0800C26C: pop {r0} bx r0 .align 2, 0 -_0800C274: .4byte 0x03004140 -_0800C278: .4byte 0x03007890 + .pool thumb_func_end sub_800C210 thumb_func_start sub_800C27C @@ -25825,7 +25262,7 @@ sub_800C27C: @ 800C27C push {r4,r5,lr} lsls r0, 24 movs r2, 0 - ldr r1, _0800C298 + ldr r1, =0x03004140 strb r2, [r1, 0x7] adds r5, r1, 0 cmp r0, 0 @@ -25835,19 +25272,19 @@ sub_800C27C: @ 800C27C strb r0, [r5, 0x4] b _0800C366 .align 2, 0 -_0800C298: .4byte 0x03004140 + .pool _0800C29C: ldrb r0, [r5, 0x4] subs r0, 0x5 cmp r0, 0xD bhi _0800C352 lsls r0, 2 - ldr r1, _0800C2B0 + ldr r1, =_0800C2B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0800C2B0: .4byte _0800C2B4 + .pool .align 2, 0 _0800C2B4: .4byte _0800C2EC @@ -25904,7 +25341,7 @@ _0800C326: strb r0, [r5, 0x4] ldrb r0, [r5, 0x12] strb r0, [r5, 0x5] - ldr r4, _0800C348 + ldr r4, =0x03007890 ldr r0, [r4] ldrb r0, [r0, 0x3] bl sub_800D334 @@ -25916,7 +25353,7 @@ _0800C326: bl sub_800D30C b _0800C366 .align 2, 0 -_0800C348: .4byte 0x03007890 + .pool _0800C34C: movs r0, 0x12 strb r0, [r5, 0x4] @@ -25962,7 +25399,7 @@ sub_800C36C: @ 800C36C adds r7, r4, 0 cmp r0, 0 beq _0800C43E - ldr r1, _0800C408 + ldr r1, =0x03004140 mov r0, sp ldrb r0, [r0] strh r0, [r1, 0x14] @@ -26020,7 +25457,7 @@ _0800C3F8: movs r0, 0x31 b _0800C41E .align 2, 0 -_0800C408: .4byte 0x03004140 + .pool _0800C40C: movs r0, 0 strb r0, [r6, 0xA] @@ -26046,7 +25483,7 @@ _0800C426: _0800C43A: bl sub_800D610 _0800C43E: - ldr r0, _0800C528 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x1 @@ -26055,7 +25492,7 @@ _0800C43E: cmp r0, 0 beq _0800C49C movs r2, 0 - ldr r6, _0800C52C + ldr r6, =0x03004140 movs r3, 0x1 adds r4, r6, 0 adds r4, 0x34 @@ -26082,7 +25519,7 @@ _0800C478: lsrs r2, r0, 24 cmp r2, 0x3 bls _0800C45C - ldr r3, _0800C52C + ldr r3, =0x03004140 adds r2, r3, 0 adds r2, 0x30 ldrb r1, [r7] @@ -26095,7 +25532,7 @@ _0800C478: movs r1, 0x1 bl sub_800D30C _0800C49C: - ldr r0, _0800C52C + ldr r0, =0x03004140 adds r3, r0, 0 adds r3, 0x30 ldrb r1, [r3] @@ -26143,13 +25580,13 @@ _0800C4E2: bl sub_800D334 movs r6, 0x1 mov r8, r6 - ldr r0, _0800C52C + ldr r0, =0x03004140 strh r4, [r0, 0x14] movs r0, 0x33 movs r1, 0x1 bl sub_800D30C _0800C506: - ldr r0, _0800C52C + ldr r0, =0x03004140 adds r1, r0, 0 adds r1, 0x30 ldrb r1, [r1] @@ -26169,8 +25606,7 @@ _0800C518: pop {r1} bx r1 .align 2, 0 -_0800C528: .4byte 0x03007890 -_0800C52C: .4byte 0x03004140 + .pool thumb_func_end sub_800C36C thumb_func_start rfu_syncVBlank_ @@ -26193,7 +25629,7 @@ _0800C548: sub_800C54C: @ 800C54C push {r4,lr} adds r3, r0, 0 - ldr r1, _0800C564 + ldr r1, =0x03004140 ldr r2, [r1, 0x40] cmp r2, 0 bne _0800C568 @@ -26203,16 +25639,16 @@ sub_800C54C: @ 800C54C strb r2, [r1, 0x4] b _0800C736 .align 2, 0 -_0800C564: .4byte 0x03004140 + .pool _0800C568: - ldr r0, _0800C59C + ldr r0, =0x03004140 ldrb r0, [r0, 0x7] cmp r0, 0 beq _0800C576 adds r0, r3, 0 bl sub_800C744 _0800C576: - ldr r4, _0800C59C + ldr r4, =0x03004140 ldrb r0, [r4, 0x4] cmp r0, 0 bne _0800C580 @@ -26228,13 +25664,12 @@ _0800C580: b _0800C6F6 _0800C592: lsls r0, 2 - ldr r1, _0800C5A0 + ldr r1, =_0800C5A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0800C59C: .4byte 0x03004140 -_0800C5A0: .4byte _0800C5A4 + .pool .align 2, 0 _0800C5A4: .4byte _0800C624 @@ -26262,37 +25697,35 @@ _0800C5A4: .4byte _0800C600 _0800C600: bl sub_800BEC0 - ldr r1, _0800C61C + ldr r1, =0x00008001 movs r2, 0xFF cmp r0, r1 bne _0800C60E movs r2, 0x44 _0800C60E: - ldr r1, _0800C620 + ldr r1, =0x03004140 movs r0, 0 strb r0, [r1, 0x5] strb r0, [r1, 0x4] adds r0, r2, 0 b _0800C64E .align 2, 0 -_0800C61C: .4byte 0x00008001 -_0800C620: .4byte 0x03004140 + .pool _0800C624: bl sub_800BEC0 - ldr r1, _0800C63C + ldr r1, =0x00008001 cmp r0, r1 bne _0800C644 - ldr r0, _0800C640 + ldr r0, =0x03004140 ldrb r1, [r0, 0x5] strb r1, [r0, 0x4] movs r1, 0x3 strb r1, [r0, 0x5] b _0800C6F6 .align 2, 0 -_0800C63C: .4byte 0x00008001 -_0800C640: .4byte 0x03004140 + .pool _0800C644: - ldr r1, _0800C658 + ldr r1, =0x03004140 movs r0, 0 strb r0, [r1, 0x5] strb r0, [r1, 0x4] @@ -26302,12 +25735,12 @@ _0800C64E: bl sub_800D30C b _0800C6F6 .align 2, 0 -_0800C658: .4byte 0x03004140 + .pool _0800C65C: bl rfu_REQ_reset b _0800C6F6 _0800C662: - ldr r0, _0800C674 + ldr r0, =0x03004140 ldr r2, [r0, 0x3C] ldrh r0, [r2, 0x2] ldrb r1, [r2] @@ -26315,9 +25748,9 @@ _0800C662: bl rfu_REQ_configSystem b _0800C6F6 .align 2, 0 -_0800C674: .4byte 0x03004140 + .pool _0800C678: - ldr r0, _0800C68C + ldr r0, =0x03004140 ldr r3, [r0, 0x3C] ldrb r0, [r3, 0x4] ldrh r1, [r3, 0x6] @@ -26326,7 +25759,7 @@ _0800C678: bl rfu_REQ_configGameData b _0800C6F6 .align 2, 0 -_0800C68C: .4byte 0x03004140 + .pool _0800C690: bl rfu_REQ_startSearchChild b _0800C6F6 @@ -26346,12 +25779,12 @@ _0800C6AE: bl rfu_REQ_endSearchParent b _0800C6F6 _0800C6B4: - ldr r0, _0800C6C0 + ldr r0, =0x03004140 ldrh r0, [r0, 0x1E] bl rfu_REQ_startConnectParent b _0800C6F6 .align 2, 0 -_0800C6C0: .4byte 0x03004140 + .pool _0800C6C4: bl rfu_REQ_pollConnectParent b _0800C6F6 @@ -26359,13 +25792,13 @@ _0800C6CA: bl rfu_REQ_endConnectParent b _0800C6F6 _0800C6D0: - ldr r0, _0800C6DC + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x3] bl rfu_REQ_CHILD_startConnectRecovery b _0800C6F6 .align 2, 0 -_0800C6DC: .4byte 0x03007890 + .pool _0800C6E0: bl rfu_REQ_CHILD_pollConnectRecovery b _0800C6F6 @@ -26379,11 +25812,11 @@ _0800C6F2: bl rfu_REQ_stopMode _0800C6F6: bl rfu_waitREQComplete - ldr r1, _0800C73C + ldr r1, =0x03004140 movs r0, 0 strb r0, [r1, 0xE] _0800C700: - ldr r0, _0800C73C + ldr r0, =0x03004140 ldrb r0, [r0, 0x4] subs r0, 0x12 lsls r0, 24 @@ -26392,7 +25825,7 @@ _0800C700: bhi _0800C710 b _0800C576 _0800C710: - ldr r0, _0800C740 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x1 @@ -26412,15 +25845,14 @@ _0800C736: pop {r0} bx r0 .align 2, 0 -_0800C73C: .4byte 0x03004140 -_0800C740: .4byte 0x03007890 + .pool thumb_func_end sub_800C54C thumb_func_start sub_800C744 sub_800C744: @ 800C744 push {r4,lr} adds r3, r0, 0 - ldr r0, _0800C768 + ldr r0, =0x03004140 ldrb r1, [r0, 0x7] adds r4, r0, 0 cmp r1, 0x5 @@ -26437,7 +25869,7 @@ sub_800C744: @ 800C744 strb r0, [r4, 0x7] b _0800C76E .align 2, 0 -_0800C768: .4byte 0x03004140 + .pool _0800C76C: strb r2, [r4, 0x7] _0800C76E: @@ -26492,7 +25924,7 @@ sub_800C7B4: @ 800C7B4 mov r8, r0 lsls r1, 16 lsrs r6, r1, 16 - ldr r0, _0800C7EC + ldr r0, =0x03004140 ldrb r1, [r0, 0xE] adds r7, r0, 0 cmp r1, 0 @@ -26508,13 +25940,12 @@ _0800C7D2: b _0800CC8A _0800C7E0: lsls r0, 2 - ldr r1, _0800C7F0 + ldr r1, =_0800C7F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0800C7EC: .4byte 0x03004140 -_0800C7F0: .4byte _0800C7F4 + .pool .align 2, 0 _0800C7F4: .4byte _0800C8AC @@ -26568,50 +25999,50 @@ _0800C8AC: beq _0800C8B2 b _0800CC8A _0800C8B2: - ldr r0, _0800C8C0 + ldr r0, =0x03004140 ldrb r1, [r0, 0x5] strb r1, [r0, 0x4] movs r1, 0x4 strb r1, [r0, 0x5] b _0800CC8A .align 2, 0 -_0800C8C0: .4byte 0x03004140 + .pool _0800C8C4: cmp r6, 0 beq _0800C8CA b _0800CC8A _0800C8CA: - ldr r0, _0800C8D4 + ldr r0, =0x03004140 ldrb r1, [r0, 0x5] strb r1, [r0, 0x4] strb r6, [r0, 0x5] b _0800CC8A .align 2, 0 -_0800C8D4: .4byte 0x03004140 + .pool _0800C8D8: cmp r6, 0 beq _0800C8DE b _0800CC8A _0800C8DE: - ldr r0, _0800C8E8 + ldr r0, =0x03004140 strb r6, [r0, 0x5] strb r6, [r0, 0x4] movs r0, 0 b _0800CBF6 .align 2, 0 -_0800C8E8: .4byte 0x03004140 + .pool _0800C8EC: cmp r6, 0 beq _0800C8F2 b _0800CC8A _0800C8F2: - ldr r1, _0800C8F8 + ldr r1, =0x03004140 movs r0, 0x6 b _0800CA0C .align 2, 0 -_0800C8F8: .4byte 0x03004140 + .pool _0800C8FC: - ldr r1, _0800C91C + ldr r1, =0x03004140 ldrh r0, [r1, 0x1A] cmp r0, 0 bne _0800C906 @@ -26630,13 +26061,13 @@ _0800C912: strb r0, [r1, 0x5] b _0800CC8A .align 2, 0 -_0800C91C: .4byte 0x03004140 + .pool _0800C920: cmp r6, 0 beq _0800C926 b _0800CC8A _0800C926: - ldr r0, _0800C93C + ldr r0, =0x03004140 ldrb r1, [r0, 0x5] strb r1, [r0, 0x4] strb r6, [r0, 0x5] @@ -26648,7 +26079,7 @@ _0800C936: movs r0, 0x13 b _0800CBF6 .align 2, 0 -_0800C93C: .4byte 0x03004140 + .pool _0800C940: cmp r6, 0 beq _0800C946 @@ -26663,11 +26094,11 @@ _0800C946: subs r0, 0x1 strh r0, [r7, 0x1A] _0800C956: - ldr r1, _0800C95C + ldr r1, =0x03004140 movs r0, 0xA b _0800CA0C .align 2, 0 -_0800C95C: .4byte 0x03004140 + .pool _0800C960: cmp r6, 0 bne _0800C9A6 @@ -26676,7 +26107,7 @@ _0800C960: lsrs r0, 24 mov r1, sp strb r0, [r1] - ldr r4, _0800C9C8 + ldr r4, =0x03004140 strh r0, [r4, 0x14] cmp r0, 0 beq _0800C980 @@ -26690,7 +26121,7 @@ _0800C980: ldrh r0, [r4, 0x1A] cmp r0, 0x1 beq _0800C9A6 - ldr r0, _0800C9CC + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0x4 @@ -26702,7 +26133,7 @@ _0800C980: movs r0, 0x1 strb r0, [r4, 0xB] _0800C9A6: - ldr r1, _0800C9C8 + ldr r1, =0x03004140 ldrh r0, [r1, 0x1A] cmp r0, 0 bne _0800C9B0 @@ -26721,14 +26152,13 @@ _0800C9BC: strb r0, [r1, 0x5] b _0800CC8A .align 2, 0 -_0800C9C8: .4byte 0x03004140 -_0800C9CC: .4byte 0x03007890 + .pool _0800C9D0: cmp r6, 0 beq _0800C9D6 b _0800CC8A _0800C9D6: - ldr r2, _0800C9F0 + ldr r2, =0x03004140 ldrb r0, [r2, 0x5] strb r0, [r2, 0x4] ldrb r1, [r2, 0x7] @@ -26742,7 +26172,7 @@ _0800C9EA: movs r0, 0x21 b _0800CBF6 .align 2, 0 -_0800C9F0: .4byte 0x03004140 + .pool _0800C9F4: cmp r1, 0x7 bne _0800C9FA @@ -26757,18 +26187,18 @@ _0800CA02: beq _0800CA08 b _0800CC8A _0800CA08: - ldr r1, _0800CA14 + ldr r1, =0x03004140 movs r0, 0xD _0800CA0C: strb r0, [r1, 0x5] strb r0, [r1, 0x4] b _0800CC8A .align 2, 0 -_0800CA14: .4byte 0x03004140 + .pool _0800CA18: cmp r6, 0 bne _0800CA3C - ldr r4, _0800CA58 + ldr r4, =0x03004150 mov r0, sp adds r1, r4, 0 bl rfu_getConnectParentStatus @@ -26784,7 +26214,7 @@ _0800CA18: movs r0, 0xE strb r0, [r1, 0x4] _0800CA3C: - ldr r1, _0800CA5C + ldr r1, =0x03004140 ldrh r0, [r1, 0x1A] cmp r0, 0 bne _0800CA46 @@ -26801,14 +26231,13 @@ _0800CA52: strb r0, [r1, 0x4] b _0800CC8A .align 2, 0 -_0800CA58: .4byte 0x03004150 -_0800CA5C: .4byte 0x03004140 + .pool _0800CA60: cmp r6, 0 beq _0800CA66 b _0800CC8A _0800CA66: - ldr r4, _0800CA98 + ldr r4, =0x03004150 mov r0, sp adds r1, r4, 0 bl rfu_getConnectParentStatus @@ -26833,7 +26262,7 @@ _0800CA78: strh r0, [r1, 0x14] b _0800CABC .align 2, 0 -_0800CA98: .4byte 0x03004150 + .pool _0800CA9C: adds r1, r4, 0 subs r1, 0x10 @@ -26852,7 +26281,7 @@ _0800CA9C: movs r0, 0x9 strb r0, [r1, 0x4] _0800CABC: - ldr r4, _0800CACC + ldr r4, =0x03004140 ldrb r0, [r4, 0x1E] movs r1, 0x1 bl sub_800D30C @@ -26860,13 +26289,13 @@ _0800CABC: strh r0, [r4, 0x1E] b _0800CC8A .align 2, 0 -_0800CACC: .4byte 0x03004140 + .pool _0800CAD0: cmp r6, 0 beq _0800CAD6 b _0800CC8A _0800CAD6: - ldr r2, _0800CB18 + ldr r2, =0x03007890 ldr r3, [r2] ldrb r0, [r3, 0x3] movs r1, 0 @@ -26903,7 +26332,7 @@ _0800CB08: beq _0800CAF8 b _0800CC8A .align 2, 0 -_0800CB18: .4byte 0x03007890 + .pool _0800CB1C: cmp r6, 0 bne _0800CB3A @@ -26916,11 +26345,11 @@ _0800CB1C: ldrb r0, [r0] cmp r0, 0x1 bhi _0800CB3A - ldr r1, _0800CB60 + ldr r1, =0x03004140 movs r0, 0x12 strb r0, [r1, 0x4] _0800CB3A: - ldr r2, _0800CB60 + ldr r2, =0x03004140 ldrb r0, [r2, 0x10] lsls r0, 1 adds r1, r2, 0 @@ -26942,7 +26371,7 @@ _0800CB5A: strb r0, [r2, 0x4] b _0800CC8A .align 2, 0 -_0800CB60: .4byte 0x03004140 + .pool _0800CB64: cmp r6, 0 beq _0800CB6A @@ -26959,7 +26388,7 @@ _0800CB78: ldrb r0, [r0] cmp r0, 0 bne _0800CB94 - ldr r1, _0800CB90 + ldr r1, =0x03004140 movs r0, 0x13 strb r0, [r1, 0x4] movs r0, 0x16 @@ -26968,19 +26397,19 @@ _0800CB78: strh r0, [r1, 0x1E] b _0800CBA8 .align 2, 0 -_0800CB90: .4byte 0x03004140 + .pool _0800CB94: - ldr r4, _0800CBD0 + ldr r4, =0x03004140 strb r6, [r4, 0x5] strb r6, [r4, 0x4] - ldr r0, _0800CBD4 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x3] bl sub_800D334 movs r0, 0x33 strh r0, [r4, 0x1E] _0800CBA8: - ldr r5, _0800CBD0 + ldr r5, =0x03004140 ldrb r0, [r5, 0x10] lsls r0, 1 adds r1, r5, 0 @@ -26999,12 +26428,11 @@ _0800CBA8: strh r4, [r5, 0x1E] b _0800CC8A .align 2, 0 -_0800CBD0: .4byte 0x03004140 -_0800CBD4: .4byte 0x03007890 + .pool _0800CBD8: cmp r6, 0 bne _0800CC8A - ldr r5, _0800CC00 + ldr r5, =0x03004140 ldrb r1, [r5, 0x5] adds r0, r1, 0 cmp r0, 0x16 @@ -27022,7 +26450,7 @@ _0800CBF6: bl sub_800D30C b _0800CC8A .align 2, 0 -_0800CC00: .4byte 0x03004140 + .pool _0800CC04: cmp r0, 0xF bne _0800CC8A @@ -27061,7 +26489,7 @@ _0800CC04: strb r7, [r5, 0x5] strb r7, [r5, 0x4] bl sub_800D610 - ldr r0, _0800CC74 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r1, [r0, 0x2] ldrb r0, [r0, 0x3] @@ -27075,23 +26503,23 @@ _0800CC04: bl sub_800D30C b _0800CC8A .align 2, 0 -_0800CC74: .4byte 0x03007890 + .pool _0800CC78: cmp r6, 0 bne _0800CC8A - ldr r0, _0800CC94 + ldr r0, =0x03004140 strb r6, [r0, 0x5] strb r6, [r0, 0x4] movs r0, 0x42 movs r1, 0 bl sub_800D30C _0800CC8A: - ldr r1, _0800CC94 + ldr r1, =0x03004140 movs r0, 0x1 strb r0, [r1, 0xE] b _0800CCE6 .align 2, 0 -_0800CC94: .4byte 0x03004140 + .pool _0800CC98: cmp r6, 0x3 bne _0800CCE6 @@ -27114,7 +26542,7 @@ _0800CCB0: ldrb r0, [r0] cmp r0, 0 bne _0800CCE6 - ldr r4, _0800CCFC + ldr r4, =0x03007890 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 @@ -27142,7 +26570,7 @@ _0800CCEE: _0800CCF8: b _0800CE3E .align 2, 0 -_0800CCFC: .4byte 0x03007890 + .pool _0800CD00: mov r0, r8 cmp r0, 0x30 @@ -27158,7 +26586,7 @@ _0800CD0E: b _0800CE42 _0800CD14: bl rfu_getSTWIRecvBuffer - ldr r4, _0800CDC4 + ldr r4, =0x03004140 ldrb r0, [r0, 0x8] strh r0, [r4, 0x14] bl sub_800D358 @@ -27194,7 +26622,7 @@ _0800CD54: lsrs r3, r0, 24 cmp r3, 0x3 bls _0800CD44 - ldr r1, _0800CDC4 + ldr r1, =0x03004140 ldrb r0, [r1, 0x6] cmp r0, 0 bne _0800CD6A @@ -27202,14 +26630,14 @@ _0800CD54: strb r0, [r1, 0x4] _0800CD6A: mov r3, sp - ldr r1, _0800CDC4 + ldr r1, =0x03004140 ldrb r2, [r1] ldrb r0, [r1, 0x14] ands r0, r2 strb r0, [r3] movs r3, 0 adds r7, r1, 0 - ldr r2, _0800CDC8 + ldr r2, =0x03007890 mov r1, sp movs r5, 0x1 adds r4, r7, 0 @@ -27249,8 +26677,7 @@ _0800CD96: strb r0, [r7, 0x7] b _0800CDDE .align 2, 0 -_0800CDC4: .4byte 0x03004140 -_0800CDC8: .4byte 0x03007890 + .pool _0800CDCC: ldrb r0, [r7, 0x4] subs r0, 0x6 @@ -27283,7 +26710,7 @@ _0800CDF2: b _0800CE3E _0800CE02: bl sub_800D20C - ldr r0, _0800CE1C + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0xFF @@ -27293,11 +26720,11 @@ _0800CE02: bl sub_800D30C b _0800CE3E .align 2, 0 -_0800CE1C: .4byte 0x03007890 + .pool _0800CE20: cmp r6, 0 bne _0800CE42 - ldr r0, _0800CE6C + ldr r0, =0x03004140 strb r6, [r0, 0xD] strb r6, [r0, 0x1] strb r6, [r0] @@ -27312,7 +26739,7 @@ _0800CE3E: cmp r6, 0 beq _0800CE92 _0800CE42: - ldr r7, _0800CE6C + ldr r7, =0x03004140 mov r0, r8 cmp r0, 0x1C bne _0800CE74 @@ -27321,7 +26748,7 @@ _0800CE42: ldrb r0, [r7, 0x7] cmp r0, 0x4 bne _0800CE74 - ldr r2, _0800CE70 + ldr r2, =0x03007890 ldr r1, [r2] movs r0, 0x1 strb r0, [r1] @@ -27332,8 +26759,7 @@ _0800CE42: bl rfu_waitREQComplete b _0800CEA4 .align 2, 0 -_0800CE6C: .4byte 0x03004140 -_0800CE70: .4byte 0x03007890 + .pool _0800CE74: movs r1, 0 mov r3, r8 @@ -27372,13 +26798,13 @@ sub_800CEB0: @ 800CEB0 sub sp, 0x4 lsls r0, 16 lsrs r6, r0, 16 - ldr r4, _0800CEE4 + ldr r4, =0x03004140 ldrb r7, [r4, 0xE] movs r0, 0 strb r0, [r4, 0xE] movs r0, 0x1 strb r0, [r4, 0xF] - ldr r0, _0800CEE8 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r5, [r0] cmp r5, 0 @@ -27393,8 +26819,7 @@ sub_800CEB0: @ 800CEB0 strb r7, [r4, 0xE] b _0800CF28 .align 2, 0 -_0800CEE4: .4byte 0x03004140 -_0800CEE8: .4byte 0x03007890 + .pool _0800CEEC: mov r0, sp bl rfu_UNI_PARENT_getDRAC_ACK @@ -27408,7 +26833,7 @@ _0800CEEC: ldrb r1, [r4, 0x3] strb r0, [r4, 0x3] _0800CF04: - ldr r4, _0800CF30 + ldr r4, =0x03004140 ldr r1, [r4, 0x44] cmp r1, 0 beq _0800CF20 @@ -27420,7 +26845,7 @@ _0800CF04: bne _0800CF20 bl sub_800D610 _0800CF20: - ldr r1, _0800CF30 + ldr r1, =0x03004140 movs r0, 0 strb r0, [r1, 0xF] strb r7, [r1, 0xE] @@ -27430,7 +26855,7 @@ _0800CF28: pop {r0} bx r0 .align 2, 0 -_0800CF30: .4byte 0x03004140 + .pool thumb_func_end sub_800CEB0 thumb_func_start sub_800CF34 @@ -27441,7 +26866,7 @@ sub_800CF34: @ 800CF34 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r1, _0800CFB8 + ldr r1, =0x03004140 ldrb r0, [r1, 0x4] subs r0, 0x5 lsls r0, 24 @@ -27451,7 +26876,7 @@ sub_800CF34: @ 800CF34 bls _0800CF52 b _0800D146 _0800CF52: - ldr r0, _0800CFBC + ldr r0, =0x03007890 ldr r2, [r0] ldrb r1, [r2, 0x2] ldrb r0, [r3, 0xC] @@ -27503,8 +26928,7 @@ _0800CF88: mov r10, r6 b _0800D090 .align 2, 0 -_0800CFB8: .4byte 0x03004140 -_0800CFBC: .4byte 0x03007890 + .pool _0800CFC0: ldrb r1, [r7] adds r0, r4, 0 @@ -27527,7 +26951,7 @@ _0800CFDA: mov r10, r2 cmp r0, 0 beq _0800D090 - ldr r0, _0800D034 + ldr r0, =0x03007880 lsls r1, r6, 2 adds r1, r0 ldr r1, [r1] @@ -27542,15 +26966,15 @@ _0800CFDA: movs r5, 0x2 ldr r3, [r3, 0x20] ldrh r2, [r3] - ldr r0, _0800D038 + ldr r0, =0x0000ffff cmp r2, r0 beq _0800D024 - ldr r0, _0800D03C + ldr r0, =0x03007890 ldr r0, [r0] lsls r1, r6, 5 adds r0, r1 ldrh r0, [r0, 0x18] - ldr r1, _0800D038 + ldr r1, =0x0000ffff _0800D018: cmp r0, r2 beq _0800CFC0 @@ -27567,9 +26991,7 @@ _0800D024: orrs r5, r0 b _0800D058 .align 2, 0 -_0800D034: .4byte 0x03007880 -_0800D038: .4byte 0x0000ffff -_0800D03C: .4byte 0x03007890 + .pool _0800D040: lsls r1, r6, 1 adds r0, r3, 0 @@ -27578,7 +27000,7 @@ _0800D040: ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] - ldr r1, _0800D114 + ldr r1, =0x0000ffff ands r0, r1 cmp r0, 0 bne _0800D058 @@ -27605,7 +27027,7 @@ _0800D058: _0800D07E: movs r0, 0x4 ands r5, r0 - ldr r3, _0800D118 + ldr r3, =0x03004140 cmp r5, 0 beq _0800D090 ldrb r1, [r7, 0xD] @@ -27623,18 +27045,18 @@ _0800D09C: ldr r4, [sp] cmp r4, 0 beq _0800D0AE - ldr r0, _0800D118 + ldr r0, =0x03004140 strh r4, [r0, 0x14] movs r0, 0x11 movs r1, 0x1 bl sub_800D30C _0800D0AE: - ldr r1, _0800D118 + ldr r1, =0x03004140 ldrb r0, [r1, 0xD] cmp r0, 0 beq _0800D0EA movs r5, 0x1 - ldr r0, _0800D11C + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0 @@ -27648,7 +27070,7 @@ _0800D0AE: _0800D0CE: cmp r5, 0 beq _0800D0EA - ldr r4, _0800D118 + ldr r4, =0x03004140 ldrb r0, [r4, 0xD] bl sub_800D334 ldrb r0, [r4, 0xD] @@ -27659,7 +27081,7 @@ _0800D0CE: movs r1, 0x1 bl sub_800D30C _0800D0EA: - ldr r0, _0800D118 + ldr r0, =0x03004140 adds r1, r0, 0 adds r1, 0x24 ldrb r1, [r1] @@ -27679,9 +27101,7 @@ _0800D0EA: bl sub_800D30C b _0800D146 .align 2, 0 -_0800D114: .4byte 0x0000ffff -_0800D118: .4byte 0x03004140 -_0800D11C: .4byte 0x03007890 + .pool _0800D120: cmp r0, 0x2 bne _0800D12C @@ -27718,12 +27138,12 @@ _0800D146: thumb_func_start sub_800D158 sub_800D158: @ 800D158 push {r4-r6,lr} - ldr r1, _0800D1FC + ldr r1, =0x04000208 ldrh r0, [r1] adds r6, r0, 0 movs r0, 0 strh r0, [r1] - ldr r4, _0800D200 + ldr r4, =0x03004140 ldrb r0, [r4, 0x4] cmp r0, 0xF bne _0800D1BC @@ -27738,7 +27158,7 @@ sub_800D158: @ 800D158 lsls r0, 16 cmp r0, 0 beq _0800D192 - ldr r1, _0800D204 + ldr r1, =0x03007880 ldrb r0, [r4, 0x10] lsls r0, 2 adds r0, r1 @@ -27767,9 +27187,9 @@ _0800D192: movs r1, 0 strh r1, [r0] _0800D1BC: - ldr r0, _0800D1FC + ldr r0, =0x04000208 strh r6, [r0] - ldr r5, _0800D200 + ldr r5, =0x03004140 ldrb r0, [r5, 0x4] cmp r0, 0x18 bne _0800D1F6 @@ -27784,7 +27204,7 @@ _0800D1D2: bne _0800D1F6 strb r4, [r5, 0x5] strb r4, [r5, 0x4] - ldr r0, _0800D208 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r1, [r0, 0x2] ldrb r0, [r0, 0x3] @@ -27799,20 +27219,17 @@ _0800D1F6: pop {r0} bx r0 .align 2, 0 -_0800D1FC: .4byte 0x04000208 -_0800D200: .4byte 0x03004140 -_0800D204: .4byte 0x03007880 -_0800D208: .4byte 0x03007890 + .pool thumb_func_end sub_800D158 thumb_func_start sub_800D20C sub_800D20C: @ 800D20C push {r4,r5,lr} - ldr r5, _0800D260 + ldr r5, =0x03004140 ldrb r0, [r5, 0x4] cmp r0, 0xF bne _0800D258 - ldr r1, _0800D264 + ldr r1, =0x03007880 ldrb r2, [r5, 0x10] lsls r0, r2, 2 adds r0, r1 @@ -27848,14 +27265,13 @@ _0800D258: pop {r0} bx r0 .align 2, 0 -_0800D260: .4byte 0x03004140 -_0800D264: .4byte 0x03007880 + .pool thumb_func_end sub_800D20C thumb_func_start sub_800D268 sub_800D268: @ 800D268 push {lr} - ldr r1, _0800D290 + ldr r1, =0x03004140 ldrb r0, [r1, 0x6] cmp r0, 0 bne _0800D28C @@ -27876,7 +27292,7 @@ _0800D28C: pop {r0} bx r0 .align 2, 0 -_0800D290: .4byte 0x03004140 + .pool thumb_func_end sub_800D268 thumb_func_start sub_800D294 @@ -27888,13 +27304,13 @@ sub_800D294: @ 800D294 push {r5-r7} movs r6, 0 movs r5, 0 - ldr r1, _0800D300 + ldr r1, =0x03007890 ldr r0, [r1] ldrb r0, [r0, 0x8] cmp r6, r0 bcs _0800D2F0 mov r8, r0 - ldr r0, _0800D304 + ldr r0, =0x03004140 mov r10, r0 mov r9, r1 _0800D2B4: @@ -27903,7 +27319,7 @@ _0800D2B4: ldrh r2, [r3] adds r0, r5, 0x1 mov r12, r0 - ldr r1, _0800D308 + ldr r1, =0x0000ffff cmp r2, r1 beq _0800D2E6 mov r1, r9 @@ -27911,7 +27327,7 @@ _0800D2B4: lsls r1, r5, 5 adds r0, r1 ldrh r4, [r0, 0x18] - ldr r7, _0800D308 + ldr r7, =0x0000ffff movs r1, 0x1 lsls r1, r5 _0800D2D4: @@ -27941,9 +27357,7 @@ _0800D2F0: pop {r1} bx r1 .align 2, 0 -_0800D300: .4byte 0x03007890 -_0800D304: .4byte 0x03004140 -_0800D308: .4byte 0x0000ffff + .pool thumb_func_end sub_800D294 thumb_func_start sub_800D30C @@ -27953,7 +27367,7 @@ sub_800D30C: @ 800D30C lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r4, _0800D330 + ldr r4, =0x03004140 ldr r2, [r4, 0x40] cmp r2, 0 beq _0800D322 @@ -27966,7 +27380,7 @@ _0800D322: pop {r0} bx r0 .align 2, 0 -_0800D330: .4byte 0x03004140 + .pool thumb_func_end sub_800D30C thumb_func_start sub_800D334 @@ -27974,7 +27388,7 @@ sub_800D334: @ 800D334 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _0800D354 + ldr r4, =0x03004140 ldrb r5, [r4, 0xE] movs r1, 0x1 strb r1, [r4, 0xE] @@ -27985,7 +27399,7 @@ sub_800D334: @ 800D334 pop {r0} bx r0 .align 2, 0 -_0800D354: .4byte 0x03004140 + .pool thumb_func_end sub_800D334 thumb_func_start sub_800D358 @@ -27993,14 +27407,14 @@ sub_800D358: @ 800D358 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0800D424 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0 beq _0800D3A0 movs r4, 0 _0800D36A: - ldr r1, _0800D428 + ldr r1, =0x03007880 lsls r0, r4, 2 adds r0, r1 ldr r2, [r0] @@ -28028,14 +27442,14 @@ _0800D396: cmp r4, 0x3 bls _0800D36A _0800D3A0: - ldr r0, _0800D424 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0 beq _0800D3DE movs r4, 0 _0800D3AC: - ldr r1, _0800D428 + ldr r1, =0x03007880 lsls r0, r4, 2 adds r0, r1 ldr r2, [r0] @@ -28061,7 +27475,7 @@ _0800D3D4: cmp r4, 0x3 bls _0800D3AC _0800D3DE: - ldr r0, _0800D424 + ldr r0, =0x03007890 ldr r3, [r0] ldrb r2, [r3, 0x6] cmp r2, 0 @@ -28071,8 +27485,8 @@ _0800D3DE: ands r0, r2 strb r0, [r3, 0x6] movs r4, 0 - ldr r7, _0800D42C - ldr r6, _0800D430 + ldr r7, =0x03007870 + ldr r6, =0x00008024 _0800D3F6: lsls r0, r4, 2 adds r0, r7 @@ -28099,10 +27513,7 @@ _0800D41C: pop {r0} bx r0 .align 2, 0 -_0800D424: .4byte 0x03007890 -_0800D428: .4byte 0x03007880 -_0800D42C: .4byte 0x03007870 -_0800D430: .4byte 0x00008024 + .pool thumb_func_end sub_800D358 thumb_func_start sub_800D434 @@ -28113,18 +27524,18 @@ sub_800D434: @ 800D434 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r0, _0800D520 + ldr r0, =0x03004140 ldrh r0, [r0, 0x18] cmp r0, 0 beq _0800D510 - ldr r0, _0800D524 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0 beq _0800D4D4 movs r6, 0 _0800D454: - ldr r3, _0800D528 + ldr r3, =0x03007880 lsls r2, r6, 2 adds r0, r2, r3 ldr r0, [r0] @@ -28155,7 +27566,7 @@ _0800D47A: lsls r0, r4, 2 adds r0, r3 ldr r0, [r0] - ldr r1, _0800D520 + ldr r1, =0x03004140 ldrh r0, [r0, 0x2] ldrh r1, [r1, 0x18] cmp r0, r1 @@ -28192,14 +27603,14 @@ _0800D4CA: cmp r6, 0x3 bls _0800D454 _0800D4D4: - ldr r0, _0800D524 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0 beq _0800D510 movs r6, 0 _0800D4E0: - ldr r1, _0800D528 + ldr r1, =0x03007880 lsls r0, r6, 2 adds r0, r1 ldr r2, [r0] @@ -28210,7 +27621,7 @@ _0800D4E0: ands r0, r1 cmp r0, 0 beq _0800D506 - ldr r1, _0800D520 + ldr r1, =0x03004140 ldrh r0, [r2, 0x36] ldrh r1, [r1, 0x18] cmp r0, r1 @@ -28233,32 +27644,29 @@ _0800D510: pop {r0} bx r0 .align 2, 0 -_0800D520: .4byte 0x03004140 -_0800D524: .4byte 0x03007890 -_0800D528: .4byte 0x03007880 + .pool thumb_func_end sub_800D434 thumb_func_start sub_800D52C sub_800D52C: @ 800D52C push {lr} - ldr r1, _0800D53C + ldr r1, =0x03004140 str r0, [r1, 0x44] - ldr r0, _0800D540 + ldr r0, =sub_800CEB0 + 1 bl rfu_setMSCCallback pop {r0} bx r0 .align 2, 0 -_0800D53C: .4byte 0x03004140 -_0800D540: .4byte sub_800CEB0 + 1 + .pool thumb_func_end sub_800D52C thumb_func_start sub_800D544 sub_800D544: @ 800D544 - ldr r1, _0800D54C + ldr r1, =0x03004140 str r0, [r1, 0x40] bx lr .align 2, 0 -_0800D54C: .4byte 0x03004140 + .pool thumb_func_end sub_800D544 thumb_func_start sub_800D550 @@ -28268,7 +27676,7 @@ sub_800D550: @ 800D550 lsrs r4, r0, 24 lsls r1, 16 lsrs r5, r1, 16 - ldr r0, _0800D574 + ldr r0, =0x03004140 ldrb r1, [r0, 0x9] adds r3, r0, 0 cmp r1, 0 @@ -28282,9 +27690,9 @@ sub_800D550: @ 800D550 movs r0, 0x5 b _0800D588 .align 2, 0 -_0800D574: .4byte 0x03004140 + .pool _0800D578: - ldr r2, _0800D590 + ldr r2, =0x04000208 ldrh r1, [r2] movs r0, 0 strh r0, [r2] @@ -28297,7 +27705,7 @@ _0800D588: pop {r1} bx r1 .align 2, 0 -_0800D590: .4byte 0x04000208 + .pool thumb_func_end sub_800D550 thumb_func_start sub_800D594 @@ -28305,22 +27713,21 @@ sub_800D594: @ 800D594 push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _0800D5B0 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r1, [r0, 0x4] ldrb r0, [r0, 0x5] orrs r0, r1 cmp r0, 0 bne _0800D5B8 - ldr r0, _0800D5B4 + ldr r0, =0x03004140 strh r2, [r0, 0x18] movs r0, 0 b _0800D5C8 .align 2, 0 -_0800D5B0: .4byte 0x03007890 -_0800D5B4: .4byte 0x03004140 + .pool _0800D5B8: - ldr r1, _0800D5CC + ldr r1, =0x03004140 movs r0, 0x6 strh r0, [r1, 0x14] movs r0, 0xF3 @@ -28331,7 +27738,7 @@ _0800D5C8: pop {r1} bx r1 .align 2, 0 -_0800D5CC: .4byte 0x03004140 + .pool thumb_func_end sub_800D594 thumb_func_start sub_800D5D0 @@ -28340,7 +27747,7 @@ sub_800D5D0: @ 800D5D0 lsls r0, 24 lsrs r2, r0, 24 adds r3, r2, 0 - ldr r1, _0800D5F8 + ldr r1, =0x03004140 ldrb r0, [r1, 0x4] subs r0, 0x9 lsls r0, 24 @@ -28355,7 +27762,7 @@ sub_800D5D0: @ 800D5D0 movs r0, 0x7 b _0800D60A .align 2, 0 -_0800D5F8: .4byte 0x03004140 + .pool _0800D5FC: cmp r2, 0 beq _0800D606 @@ -28374,7 +27781,7 @@ _0800D60A: thumb_func_start sub_800D610 sub_800D610: @ 800D610 push {lr} - ldr r1, _0800D62C + ldr r1, =0x03004140 ldrb r0, [r1, 0x2] cmp r0, 0 beq _0800D628 @@ -28388,13 +27795,13 @@ _0800D628: pop {r0} bx r0 .align 2, 0 -_0800D62C: .4byte 0x03004140 + .pool thumb_func_end sub_800D610 thumb_func_start sub_800D630 sub_800D630: @ 800D630 push {lr} - ldr r1, _0800D644 + ldr r1, =0x03004140 ldrb r0, [r1, 0x2] cmp r0, 0 bne _0800D648 @@ -28403,7 +27810,7 @@ sub_800D630: @ 800D630 bl sub_800D30C b _0800D654 .align 2, 0 -_0800D644: .4byte 0x03004140 + .pool _0800D648: ldrb r0, [r1, 0x2] cmp r0, 0x1 @@ -28419,7 +27826,7 @@ _0800D654: thumb_func_start sub_800D658 sub_800D658: @ 800D658 push {lr} - ldr r0, _0800D678 + ldr r0, =0x03004140 ldrb r1, [r0, 0x7] adds r2, r0, 0 cmp r1, 0 @@ -28429,13 +27836,12 @@ sub_800D658: @ 800D658 cmp r0, 0x6 bhi _0800D6C2 lsls r0, 2 - ldr r1, _0800D67C + ldr r1, =_0800D680 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0800D678: .4byte 0x03004140 -_0800D67C: .4byte _0800D680 + .pool .align 2, 0 _0800D680: .4byte _0800D69C @@ -28498,7 +27904,7 @@ _0800D6DC: cmp r0, 0x1F ble _0800D6D2 movs r1, 0 - ldr r2, _0800D718 + ldr r2, =0x000008c1 adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] @@ -28507,11 +27913,11 @@ _0800D6DC: adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] - ldr r2, _0800D71C + ldr r2, =0x000008c2 adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] - ldr r2, _0800D720 + ldr r2, =0x000008c3 adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] @@ -28519,9 +27925,7 @@ _0800D6DC: pop {r0} bx r0 .align 2, 0 -_0800D718: .4byte 0x000008c1 -_0800D71C: .4byte 0x000008c2 -_0800D720: .4byte 0x000008c3 + .pool thumb_func_end sub_800D6C8 thumb_func_start sub_800D724 @@ -28548,7 +27952,7 @@ _0800D73A: cmp r1, 0x27 ble _0800D72C movs r1, 0 - ldr r2, _0800D774 + ldr r2, =0x00000231 adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] @@ -28557,11 +27961,11 @@ _0800D73A: adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] - ldr r2, _0800D778 + ldr r2, =0x00000232 adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] - ldr r2, _0800D77C + ldr r2, =0x00000233 adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] @@ -28569,9 +27973,7 @@ _0800D73A: pop {r0} bx r0 .align 2, 0 -_0800D774: .4byte 0x00000231 -_0800D778: .4byte 0x00000232 -_0800D77C: .4byte 0x00000233 + .pool thumb_func_end sub_800D724 thumb_func_start sub_800D780 @@ -28596,7 +27998,7 @@ _0800D792: cmp r1, 0x1 ble _0800D788 movs r1, 0 - ldr r2, _0800D7CC + ldr r2, =0x00000201 adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] @@ -28605,11 +28007,11 @@ _0800D792: adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] - ldr r2, _0800D7D0 + ldr r2, =0x00000202 adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] - ldr r2, _0800D7D4 + ldr r2, =0x00000203 adds r0, r3, r2 ldrb r2, [r0] strb r1, [r0] @@ -28617,9 +28019,7 @@ _0800D792: pop {r0} bx r0 .align 2, 0 -_0800D7CC: .4byte 0x00000201 -_0800D7D0: .4byte 0x00000202 -_0800D7D4: .4byte 0x00000203 + .pool thumb_func_end sub_800D780 thumb_func_start sub_800D7D8 @@ -28627,12 +28027,12 @@ sub_800D7D8: @ 800D7D8 push {r4-r7,lr} adds r3, r0, 0 adds r4, r1, 0 - ldr r1, _0800D86C + ldr r1, =0x000008c2 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0x1F bhi _0800D874 - ldr r0, _0800D870 + ldr r0, =0x04000208 ldrh r1, [r0] adds r7, r1, 0 movs r1, 0 @@ -28685,7 +28085,7 @@ _0800D81E: ands r0, r2 ldrb r2, [r1] strb r0, [r1] - ldr r0, _0800D86C + ldr r0, =0x000008c2 adds r1, r3, r0 ldrb r0, [r1] adds r0, 0x1 @@ -28700,14 +28100,13 @@ _0800D85E: cmp r0, r4 bge _0800D85E _0800D866: - ldr r0, _0800D870 + ldr r0, =0x04000208 strh r7, [r0] b _0800D87E .align 2, 0 -_0800D86C: .4byte 0x000008c2 -_0800D870: .4byte 0x04000208 + .pool _0800D874: - ldr r1, _0800D884 + ldr r1, =0x000008c3 adds r0, r3, r1 ldrb r1, [r0] movs r1, 0x1 @@ -28717,7 +28116,7 @@ _0800D87E: pop {r0} bx r0 .align 2, 0 -_0800D884: .4byte 0x000008c3 + .pool thumb_func_end sub_800D7D8 thumb_func_start sub_800D888 @@ -28725,12 +28124,12 @@ sub_800D888: @ 800D888 push {r4-r7,lr} adds r6, r0, 0 adds r5, r1, 0 - ldr r1, _0800D918 + ldr r1, =0x00000232 adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0x27 bhi _0800D920 - ldr r1, _0800D91C + ldr r1, =0x04000208 ldrh r0, [r1] adds r7, r0, 0 movs r0, 0 @@ -28779,7 +28178,7 @@ _0800D8C4: bl __umodsi3 ldrb r1, [r4] strb r0, [r4] - ldr r0, _0800D918 + ldr r0, =0x00000232 adds r1, r6, r0 ldrb r0, [r1] adds r0, 0x1 @@ -28794,14 +28193,13 @@ _0800D908: cmp r0, r5 bge _0800D908 _0800D910: - ldr r0, _0800D91C + ldr r0, =0x04000208 strh r7, [r0] b _0800D92A .align 2, 0 -_0800D918: .4byte 0x00000232 -_0800D91C: .4byte 0x04000208 + .pool _0800D920: - ldr r1, _0800D930 + ldr r1, =0x00000233 adds r0, r6, r1 ldrb r1, [r0] movs r1, 0x1 @@ -28811,7 +28209,7 @@ _0800D92A: pop {r0} bx r0 .align 2, 0 -_0800D930: .4byte 0x00000233 + .pool thumb_func_end sub_800D888 thumb_func_start sub_800D934 @@ -28819,7 +28217,7 @@ sub_800D934: @ 800D934 push {r4-r7,lr} adds r3, r0, 0 adds r4, r1, 0 - ldr r1, _0800D978 + ldr r1, =0x04000208 ldrh r0, [r1] mov r12, r0 movs r0, 0 @@ -28827,13 +28225,13 @@ sub_800D934: @ 800D934 movs r1, 0x8C lsls r1, 4 adds r0, r3, r1 - ldr r7, _0800D97C + ldr r7, =0x000008c1 adds r5, r3, r7 ldrb r1, [r0] ldrb r0, [r5] cmp r1, r0 beq _0800D960 - ldr r1, _0800D980 + ldr r1, =0x000008c3 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 @@ -28847,15 +28245,13 @@ _0800D966: subs r0, 0x1 cmp r0, r4 bge _0800D966 - ldr r0, _0800D978 + ldr r0, =0x04000208 mov r7, r12 strh r7, [r0] movs r0, 0 b _0800D9CA .align 2, 0 -_0800D978: .4byte 0x04000208 -_0800D97C: .4byte 0x000008c1 -_0800D980: .4byte 0x000008c3 + .pool _0800D984: movs r2, 0 movs r6, 0x46 @@ -28872,7 +28268,7 @@ _0800D988: adds r2, 0x1 cmp r2, 0x45 ble _0800D988 - ldr r0, _0800D9D0 + ldr r0, =0x000008c1 adds r1, r3, r0 ldrb r0, [r1] adds r0, 0x1 @@ -28883,13 +28279,13 @@ _0800D988: ands r0, r2 ldrb r2, [r1] strb r0, [r1] - ldr r7, _0800D9D4 + ldr r7, =0x000008c2 adds r1, r3, r7 ldrb r0, [r1] subs r0, 0x1 ldrb r2, [r1] strb r0, [r1] - ldr r0, _0800D9D8 + ldr r0, =0x04000208 mov r1, r12 strh r1, [r0] movs r0, 0x1 @@ -28898,9 +28294,7 @@ _0800D9CA: pop {r1} bx r1 .align 2, 0 -_0800D9D0: .4byte 0x000008c1 -_0800D9D4: .4byte 0x000008c2 -_0800D9D8: .4byte 0x04000208 + .pool thumb_func_end sub_800D934 thumb_func_start sub_800D9DC @@ -28917,7 +28311,7 @@ sub_800D9DC: @ 800D9DC ldrb r0, [r4] cmp r1, r0 beq _0800DA00 - ldr r1, _0800DA04 + ldr r1, =0x00000233 adds r0, r5, r1 ldrb r0, [r0] adds r2, r0, 0 @@ -28927,9 +28321,9 @@ _0800DA00: movs r0, 0 b _0800DA54 .align 2, 0 -_0800DA04: .4byte 0x00000233 + .pool _0800DA08: - ldr r1, _0800DA5C + ldr r1, =0x04000208 ldrh r0, [r1] adds r7, r0, 0 strh r2, [r1] @@ -28947,7 +28341,7 @@ _0800DA12: adds r3, 0x1 cmp r3, 0xD ble _0800DA12 - ldr r0, _0800DA60 + ldr r0, =0x00000231 adds r4, r5, r0 ldrb r0, [r4] adds r0, 0x1 @@ -28958,13 +28352,13 @@ _0800DA12: bl __umodsi3 ldrb r1, [r4] strb r0, [r4] - ldr r0, _0800DA64 + ldr r0, =0x00000232 adds r1, r5, r0 ldrb r0, [r1] subs r0, 0x1 ldrb r2, [r1] strb r0, [r1] - ldr r0, _0800DA5C + ldr r0, =0x04000208 strh r7, [r0] movs r0, 0x1 _0800DA54: @@ -28972,9 +28366,7 @@ _0800DA54: pop {r1} bx r1 .align 2, 0 -_0800DA5C: .4byte 0x04000208 -_0800DA60: .4byte 0x00000231 -_0800DA64: .4byte 0x00000232 + .pool thumb_func_end sub_800D9DC thumb_func_start sub_800DA68 @@ -29084,7 +28476,7 @@ sub_800DB18: @ 800DB18 push {r4,r5,lr} adds r3, r0, 0 adds r5, r1, 0 - ldr r1, _0800DB6C + ldr r1, =0x00000202 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -29116,7 +28508,7 @@ _0800DB30: ands r0, r2 ldrb r2, [r1] strb r0, [r1] - ldr r0, _0800DB6C + ldr r0, =0x00000202 adds r1, r3, r0 ldrb r0, [r1] adds r0, 0x1 @@ -29124,9 +28516,9 @@ _0800DB30: strb r0, [r1] b _0800DB7A .align 2, 0 -_0800DB6C: .4byte 0x00000202 + .pool _0800DB70: - ldr r1, _0800DB80 + ldr r1, =0x00000203 adds r0, r3, r1 ldrb r1, [r0] movs r1, 0x1 @@ -29136,7 +28528,7 @@ _0800DB7A: pop {r0} bx r0 .align 2, 0 -_0800DB80: .4byte 0x00000203 + .pool thumb_func_end sub_800DB18 thumb_func_start sub_800DB84 @@ -29153,7 +28545,7 @@ sub_800DB84: @ 800DB84 ldrb r0, [r4] cmp r1, r0 beq _0800DBA6 - ldr r1, _0800DBAC + ldr r1, =0x00000203 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 @@ -29162,7 +28554,7 @@ _0800DBA6: movs r0, 0 b _0800DBEA .align 2, 0 -_0800DBAC: .4byte 0x00000203 + .pool _0800DBB0: movs r2, 0 _0800DBB2: @@ -29176,7 +28568,7 @@ _0800DBB2: adds r2, 0x1 cmp r2, 0xFF ble _0800DBB2 - ldr r0, _0800DBF0 + ldr r0, =0x00000201 adds r1, r3, r0 ldrb r0, [r1] adds r0, 0x1 @@ -29187,7 +28579,7 @@ _0800DBB2: ands r0, r2 ldrb r2, [r1] strb r0, [r1] - ldr r0, _0800DBF4 + ldr r0, =0x00000202 adds r1, r3, r0 ldrb r0, [r1] subs r0, 0x1 @@ -29199,8 +28591,7 @@ _0800DBEA: pop {r1} bx r1 .align 2, 0 -_0800DBF0: .4byte 0x00000201 -_0800DBF4: .4byte 0x00000202 + .pool thumb_func_end sub_800DB84 thumb_func_start sub_800DBF8 @@ -29277,7 +28668,7 @@ _0800DC70: b _0800DCAA _0800DC76: movs r4, 0 - ldr r3, _0800DCB0 + ldr r3, =0x03000d74 ldrb r1, [r3] ldrb r0, [r3] adds r7, r0, 0x1 @@ -29308,7 +28699,7 @@ _0800DCAA: pop {r0} bx r0 .align 2, 0 -_0800DCB0: .4byte 0x03000d74 + .pool thumb_func_end sub_800DBF8 thumb_func_start sub_800DCB4 @@ -29319,7 +28710,7 @@ sub_800DCB4: @ 800DCB4 ldrb r0, [r1] cmp r0, 0xFF beq _0800DCD8 - ldr r5, _0800DCE4 + ldr r5, =0x082ed470 adds r2, r1, 0 _0800DCC4: adds r1, r4, r3 @@ -29340,7 +28731,7 @@ _0800DCD8: pop {r0} bx r0 .align 2, 0 -_0800DCE4: .4byte 0x082ed470 + .pool thumb_func_end sub_800DCB4 thumb_func_start sub_800DCE8 @@ -29351,7 +28742,7 @@ sub_800DCE8: @ 800DCE8 ldrb r0, [r1] cmp r0, 0 beq _0800DD0C - ldr r5, _0800DD18 + ldr r5, =0x082ed370 adds r2, r1, 0 _0800DCF8: adds r1, r4, r3 @@ -29372,7 +28763,7 @@ _0800DD0C: pop {r0} bx r0 .align 2, 0 -_0800DD18: .4byte 0x082ed370 + .pool thumb_func_end sub_800DCE8 thumb_func_start sub_800DD1C @@ -29381,7 +28772,7 @@ sub_800DD1C: @ 800DD1C lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r0, _0800DD44 + ldr r0, =0x03007890 ldr r4, [r0] ldrb r2, [r4, 0x2] ldrb r1, [r4] @@ -29397,7 +28788,7 @@ sub_800DD1C: @ 800DD1C ldrb r0, [r4, 0xA] b _0800DD8C .align 2, 0 -_0800DD44: .4byte 0x03007890 + .pool _0800DD48: adds r0, r6, 0x1 lsls r0, 24 @@ -29455,7 +28846,7 @@ sub_800DD94: @ 800DD94 lsrs r1, 24 mov r9, r1 movs r4, 0 - ldr r0, _0800DE70 + ldr r0, =0x03005d90 mov r8, r0 adds r6, r7, 0x2 ldr r0, [r0] @@ -29526,7 +28917,7 @@ _0800DDC8: subs r0, 0x20 ands r1, r0 strb r1, [r7] - ldr r0, _0800DE74 + ldr r0, =0x0000087f bl flag_check lsls r0, 7 ldrb r1, [r7] @@ -29539,7 +28930,7 @@ _0800DDC8: ands r5, r1 orrs r5, r0 strb r5, [r7, 0x1] - ldr r0, _0800DE78 + ldr r0, =0x00000864 bl flag_check ands r6, r0 lsls r6, 1 @@ -29556,9 +28947,7 @@ _0800DDC8: pop {r0} bx r0 .align 2, 0 -_0800DE70: .4byte 0x03005d90 -_0800DE74: .4byte 0x0000087f -_0800DE78: .4byte 0x00000864 + .pool thumb_func_end sub_800DD94 thumb_func_start sub_800DE7C @@ -29571,13 +28960,13 @@ sub_800DE7C: @ 800DE7C mov r8, r1 lsls r2, 24 lsrs r5, r2, 24 - ldr r0, _0800DED0 + ldr r0, =0x03004140 ldrb r0, [r0, 0x6] cmp r0, 0x1 bne _0800DED8 movs r0, 0x1 mov r9, r0 - ldr r6, _0800DED4 + ldr r6, =0x03007890 ldr r0, [r6] lsls r4, r5, 5 adds r0, r4 @@ -29603,12 +28992,11 @@ _0800DEB8: bl memset b _0800DF24 .align 2, 0 -_0800DED0: .4byte 0x03004140 -_0800DED4: .4byte 0x03007890 + .pool _0800DED8: movs r0, 0 mov r9, r0 - ldr r6, _0800DF0C + ldr r6, =0x03007890 ldr r0, [r6] lsls r4, r5, 5 adds r0, r4 @@ -29631,7 +29019,7 @@ _0800DEF0: bl memcpy b _0800DF24 .align 2, 0 -_0800DF0C: .4byte 0x03007890 + .pool _0800DF10: adds r0, r7, 0 movs r1, 0 @@ -29658,12 +29046,12 @@ sub_800DF34: @ 800DF34 adds r5, r1, 0 lsls r2, 24 movs r7, 0 - ldr r6, _0800DF6C + ldr r6, =0x03007890 ldr r0, [r6] lsrs r4, r2, 19 adds r2, r0, r4 ldrh r1, [r2, 0x18] - ldr r0, _0800DF70 + ldr r0, =0x00007f7d cmp r1, r0 bne _0800DF74 adds r1, r2, 0 @@ -29680,8 +29068,7 @@ sub_800DF34: @ 800DF34 movs r7, 0x1 b _0800DF88 .align 2, 0 -_0800DF6C: .4byte 0x03007890 -_0800DF70: .4byte 0x00007f7d + .pool _0800DF74: adds r0, r3, 0 movs r1, 0 @@ -29702,10 +29089,10 @@ _0800DF88: sub_800DF90: @ 800DF90 push {r4,lr} adds r4, r1, 0 - ldr r1, _0800DFAC + ldr r1, =0x02022b14 movs r2, 0xD bl memcpy - ldr r1, _0800DFB0 + ldr r1, =0x02022b22 adds r0, r4, 0 movs r2, 0x8 bl memcpy @@ -29713,8 +29100,7 @@ sub_800DF90: @ 800DF90 pop {r0} bx r0 .align 2, 0 -_0800DFAC: .4byte 0x02022b14 -_0800DFB0: .4byte 0x02022b22 + .pool thumb_func_end sub_800DF90 thumb_func_start sub_800DFB4 @@ -29731,26 +29117,26 @@ sub_800DFB4: @ 800DFB4 movs r3, 0xE7 movs r2, 0x8 _0800DFCA: - ldr r0, _0800E00C + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x1 bne _0800E024 - ldr r0, _0800E010 + ldr r0, =0x082ed5f0 adds r1, r3, 0 movs r3, 0 bl obj_add_from_template_forward_search adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _0800E014 + ldr r0, =0x02020630 lsls r4, r5, 4 adds r4, r5 lsls r4, 2 adds r4, r0 - ldr r0, _0800E018 + ldr r0, =0x00001234 strh r0, [r4, 0x3C] - ldr r0, _0800E01C + ldr r0, =0x082ed5e0 ldrh r0, [r0, 0x6] bl gpu_tile_obj_tag_get_range_start strh r0, [r4, 0x3A] @@ -29759,32 +29145,27 @@ _0800DFCA: movs r1, 0x4 orrs r0, r1 strb r0, [r4] - ldr r0, _0800E020 + ldr r0, =0x02022b10 strb r5, [r0] b _0800E06A .align 2, 0 -_0800E00C: .4byte 0x03007890 -_0800E010: .4byte 0x082ed5f0 -_0800E014: .4byte 0x02020630 -_0800E018: .4byte 0x00001234 -_0800E01C: .4byte 0x082ed5e0 -_0800E020: .4byte 0x02022b10 + .pool _0800E024: - ldr r0, _0800E070 + ldr r0, =0x082ed5f0 adds r1, r3, 0 movs r3, 0 bl obj_add_from_template_forward_search - ldr r4, _0800E074 + ldr r4, =0x02022b10 strb r0, [r4] - ldr r5, _0800E078 + ldr r5, =0x02020630 ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0800E07C + ldr r1, =0x00001234 strh r1, [r0, 0x3C] - ldr r0, _0800E080 + ldr r0, =0x082ed5e0 ldrh r0, [r0, 0x6] bl gpu_tile_obj_tag_get_range_start ldrb r2, [r4] @@ -29808,18 +29189,14 @@ _0800E06A: pop {r0} bx r0 .align 2, 0 -_0800E070: .4byte 0x082ed5f0 -_0800E074: .4byte 0x02022b10 -_0800E078: .4byte 0x02020630 -_0800E07C: .4byte 0x00001234 -_0800E080: .4byte 0x082ed5e0 + .pool thumb_func_end sub_800DFB4 thumb_func_start sub_800E084 sub_800E084: @ 800E084 push {r4,lr} - ldr r4, _0800E0D0 - ldr r3, _0800E0D4 + ldr r4, =0x02020630 + ldr r3, =0x02022b10 ldrb r1, [r3] lsls r0, r1, 4 adds r0, r1 @@ -29827,7 +29204,7 @@ sub_800E084: @ 800E084 adds r2, r0, r4 movs r0, 0x3C ldrsh r1, [r2, r0] - ldr r0, _0800E0D8 + ldr r0, =0x00001234 cmp r1, r0 bne _0800E0CA movs r0, 0 @@ -29838,16 +29215,16 @@ sub_800E084: @ 800E084 lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r3, _0800E0DC + ldr r3, =0x030022c0 movs r0, 0x84 lsls r0, 3 adds r3, r0 - ldr r0, _0800E0E0 + ldr r0, =0x082ec690 ldr r1, [r0] ldr r2, [r0, 0x4] str r1, [r3] str r2, [r3, 0x4] - ldr r1, _0800E0E4 + ldr r1, =0x070003e8 movs r2, 0x4 bl CpuSet _0800E0CA: @@ -29855,46 +29232,38 @@ _0800E0CA: pop {r0} bx r0 .align 2, 0 -_0800E0D0: .4byte 0x02020630 -_0800E0D4: .4byte 0x02022b10 -_0800E0D8: .4byte 0x00001234 -_0800E0DC: .4byte 0x030022c0 -_0800E0E0: .4byte 0x082ec690 -_0800E0E4: .4byte 0x070003e8 + .pool thumb_func_end sub_800E084 thumb_func_start sub_800E0E8 sub_800E0E8: @ 800E0E8 push {r4,lr} - ldr r4, _0800E114 + ldr r4, =0x082ed5e0 ldrh r0, [r4, 0x6] bl gpu_tile_obj_tag_get_range_start lsls r0, 16 - ldr r1, _0800E118 + ldr r1, =0xffff0000 cmp r0, r1 bne _0800E100 adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load _0800E100: - ldr r0, _0800E11C + ldr r0, =0x082ed5e8 bl gpu_pal_obj_alloc_tag_and_apply - ldr r1, _0800E120 + ldr r1, =0x02022b10 movs r0, 0xFF strb r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_0800E114: .4byte 0x082ed5e0 -_0800E118: .4byte 0xffff0000 -_0800E11C: .4byte 0x082ed5e8 -_0800E120: .4byte 0x02022b10 + .pool thumb_func_end sub_800E0E8 thumb_func_start sub_800E124 sub_800E124: @ 800E124 push {r4,lr} - ldr r1, _0800E144 + ldr r1, =0x03007890 ldr r0, [r1] ldrb r2, [r0, 0x2] movs r3, 0 @@ -29910,7 +29279,7 @@ _0800E130: ldrb r0, [r0] b _0800E156 .align 2, 0 -_0800E144: .4byte 0x03007890 + .pool _0800E148: lsrs r2, 1 adds r0, r3, 0x1 @@ -29947,13 +29316,13 @@ sub_800E174: @ 800E174 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r1, _0800E1B8 + ldr r1, =0x02022b10 ldrb r0, [r1] cmp r0, 0xFF bne _0800E184 b _0800E346 _0800E184: - ldr r2, _0800E1BC + ldr r2, =0x02020630 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -29961,7 +29330,7 @@ _0800E184: adds r2, r0, r2 movs r0, 0x3C ldrsh r1, [r2, r0] - ldr r0, _0800E1C0 + ldr r0, =0x00001234 cmp r1, r0 beq _0800E19C b _0800E346 @@ -29969,7 +29338,7 @@ _0800E19C: adds r6, r2, 0 movs r5, 0xFF movs r4, 0 - ldr r0, _0800E1C4 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x1 @@ -29981,10 +29350,7 @@ _0800E19C: mov r8, r1 b _0800E1E6 .align 2, 0 -_0800E1B8: .4byte 0x02022b10 -_0800E1BC: .4byte 0x02020630 -_0800E1C0: .4byte 0x00001234 -_0800E1C4: .4byte 0x03007890 + .pool _0800E1C8: adds r0, r4, 0x1 lsls r0, 24 @@ -30109,11 +29475,11 @@ _0800E2AC: adds r0, 0x1 strh r0, [r6, 0x34] _0800E2B2: - ldr r4, _0800E350 + ldr r4, =0x030022c0 movs r1, 0x84 lsls r1, 3 adds r0, r4, r1 - ldr r1, _0800E354 + ldr r1, =0x082ed570 ldr r2, [r1, 0x4] ldr r1, [r1] str r1, [r0] @@ -30123,13 +29489,13 @@ _0800E2B2: movs r1, 0 ldrsb r1, [r7, r1] adds r2, r1 - ldr r1, _0800E358 + ldr r1, =0x00000422 adds r5, r4, r1 - ldr r3, _0800E35C + ldr r3, =0x000001ff adds r1, r3, 0 ands r2, r1 ldrh r3, [r5] - ldr r1, _0800E360 + ldr r1, =0xfffffe00 ands r1, r3 orrs r1, r2 strh r1, [r5] @@ -30139,7 +29505,7 @@ _0800E2B2: adds r1, r2 strb r1, [r0] ldrb r2, [r6, 0x5] - ldr r3, _0800E364 + ldr r3, =0x00000425 adds r5, r4, r3 lsrs r2, 4 lsls r2, 4 @@ -30161,17 +29527,17 @@ _0800E2B2: ldrh r2, [r1] ldrh r6, [r6, 0x3A] adds r2, r6 - ldr r1, _0800E368 + ldr r1, =0x00000424 adds r4, r1 - ldr r3, _0800E36C + ldr r3, =0x000003ff adds r1, r3, 0 ands r2, r1 ldrh r3, [r4] - ldr r1, _0800E370 + ldr r1, =0xfffffc00 ands r1, r3 orrs r1, r2 strh r1, [r4] - ldr r1, _0800E374 + ldr r1, =0x070003e8 movs r2, 0x4 bl CpuSet bl sub_8011A74 @@ -30187,16 +29553,7 @@ _0800E346: pop {r0} bx r0 .align 2, 0 -_0800E350: .4byte 0x030022c0 -_0800E354: .4byte 0x082ed570 -_0800E358: .4byte 0x00000422 -_0800E35C: .4byte 0x000001ff -_0800E360: .4byte 0xfffffe00 -_0800E364: .4byte 0x00000425 -_0800E368: .4byte 0x00000424 -_0800E36C: .4byte 0x000003ff -_0800E370: .4byte 0xfffffc00 -_0800E374: .4byte 0x070003e8 + .pool thumb_func_end sub_800E174 thumb_func_start sub_800E378 @@ -30239,7 +29596,7 @@ sub_800E3A8: @ 800E3A8 mov r5, r8 push {r5-r7} sub sp, 0x20 - ldr r0, _0800E3CC + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _0800E3BE @@ -30251,7 +29608,7 @@ _0800E3BE: movs r4, 0 b _0800E434 .align 2, 0 -_0800E3CC: .4byte 0x030030fc + .pool _0800E3D0: lsls r2, r4, 2 mov r0, sp @@ -30267,9 +29624,9 @@ _0800E3D0: subs r0, r4 lsls r0, 2 str r0, [sp, 0x1C] - ldr r7, _0800E450 + ldr r7, =0x020229f0 mov r10, r7 - ldr r6, _0800E454 + ldr r6, =0x00003b98 movs r4, 0 mov r0, r10 subs r0, 0x4 @@ -30277,9 +29634,9 @@ _0800E3D0: adds r3, r1, r0 _0800E3FC: ldrh r1, [r3] - ldr r0, _0800E458 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r7, _0800E454 + ldr r7, =0x00003b98 adds r0, r2, r7 adds r0, r4 ldr r0, [r0] @@ -30318,16 +29675,14 @@ _0800E434: ldr r6, [sp, 0x14] b _0800E4AC .align 2, 0 -_0800E450: .4byte 0x020229f0 -_0800E454: .4byte 0x00003b98 -_0800E458: .4byte 0x03005d8c + .pool _0800E45C: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 cmp r4, r0 beq _0800E4A6 - ldr r2, _0800E530 + ldr r2, =0x020229e8 adds r0, r5, r2 ldrh r0, [r0, 0x1A] cmp r0, 0x1 @@ -30342,13 +29697,13 @@ _0800E45C: ldr r2, [r7] cmp r2, 0 blt _0800E4A0 - ldr r0, _0800E534 + ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r2, 1 adds r0, r2 lsls r0, 2 adds r0, r1 - ldr r1, _0800E538 + ldr r1, =0x00003b9c adds r0, r1 movs r1, 0 movs r2, 0x8 @@ -30368,9 +29723,9 @@ _0800E4AC: cmp r4, r0 blt _0800E45C movs r4, 0 - ldr r1, _0800E534 + ldr r1, =0x03005d8c mov r9, r1 - ldr r6, _0800E53C + ldr r6, =0x00003b98 movs r7, 0 mov r1, r8 lsls r0, r1, 1 @@ -30388,7 +29743,7 @@ _0800E4CE: beq _0800E500 mov r0, r9 ldr r2, [r0] - ldr r1, _0800E53C + ldr r1, =0x00003b98 adds r0, r2, r1 adds r0, r7 ldr r1, [r0] @@ -30409,9 +29764,9 @@ _0800E500: cmp r4, 0x13 ble _0800E4CE _0800E50A: - ldr r0, _0800E534 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r7, _0800E53C + ldr r7, =0x00003b98 adds r0, r7 ldr r1, [sp, 0x14] movs r2, 0xF0 @@ -30428,10 +29783,7 @@ _0800E520: pop {r0} bx r0 .align 2, 0 -_0800E530: .4byte 0x020229e8 -_0800E534: .4byte 0x03005d8c -_0800E538: .4byte 0x00003b9c -_0800E53C: .4byte 0x00003b98 + .pool thumb_func_end sub_800E3A8 thumb_func_start sub_800E540 @@ -30445,8 +29797,8 @@ sub_800E540: @ 800E540 lsrs r0, 16 mov r8, r0 movs r7, 0 - ldr r6, _0800E57C - ldr r4, _0800E580 + ldr r6, =0x03005d8c + ldr r4, =0x00003b98 movs r5, 0 _0800E558: ldr r0, [r6] @@ -30457,7 +29809,7 @@ _0800E558: cmp r0, 0 bne _0800E584 ldr r0, [r6] - ldr r1, _0800E580 + ldr r1, =0x00003b98 adds r0, r1 adds r0, r5 ldr r0, [r0] @@ -30466,8 +29818,7 @@ _0800E558: movs r0, 0x1 b _0800E59E .align 2, 0 -_0800E57C: .4byte 0x03005d8c -_0800E580: .4byte 0x00003b98 + .pool _0800E584: ldr r0, [r6] adds r0, r4 @@ -30497,14 +29848,14 @@ sub_800E5AC: @ 800E5AC mov r7, r8 push {r7} sub sp, 0x4 - ldr r0, _0800E5F0 + ldr r0, =0x00003b98 mov r8, r0 movs r7, 0 mov r6, r8 movs r5, 0 movs r4, 0x13 _0800E5C0: - ldr r0, _0800E5F4 + ldr r0, =0x03005d8c ldr r1, [r0] mov r2, r8 adds r0, r1, r2 @@ -30514,7 +29865,7 @@ _0800E5C0: strh r7, [r0] adds r1, r6 adds r1, 0x4 - ldr r2, _0800E5F8 + ldr r2, =0x01000004 bl CpuSet adds r6, 0xC adds r5, 0xC @@ -30528,9 +29879,7 @@ _0800E5C0: pop {r0} bx r0 .align 2, 0 -_0800E5F0: .4byte 0x00003b98 -_0800E5F4: .4byte 0x03005d8c -_0800E5F8: .4byte 0x01000004 + .pool thumb_func_end sub_800E5AC thumb_func_start nullsub_5 @@ -30550,14 +29899,14 @@ sub_800E604: @ 800E604 mov r6, r8 push {r6,r7} sub sp, 0x8 - ldr r6, _0800E6A8 + ldr r6, =0x03005000 adds r5, r6, 0 adds r5, 0xEE ldrb r4, [r5] mov r0, sp movs r7, 0 strh r7, [r0] - ldr r2, _0800E6AC + ldr r2, =0x0100067a adds r1, r6, 0 bl CpuSet ldrb r0, [r5] @@ -30588,30 +29937,30 @@ _0800E64A: cmp r4, 0 bge _0800E64A movs r5, 0 - ldr r4, _0800E6B0 + ldr r4, =0x0300506c adds r0, r4, 0 bl sub_800FCC4 adds r0, r4, 0 adds r0, 0xB8 bl sub_800D6C8 - ldr r0, _0800E6B4 + ldr r0, =0x0000097c adds r4, r0 adds r0, r4, 0 bl sub_800D724 strh r5, [r7] - ldr r1, _0800E6B8 - ldr r2, _0800E6BC + ldr r1, =0x03003110 + ldr r2, =0x01000008 adds r0, r7, 0 bl CpuSet mov r0, r8 strh r5, [r0] - ldr r1, _0800E6C0 - ldr r2, _0800E6C4 + ldr r1, =0x03003090 + ldr r2, =0x01000028 bl CpuSet mov r0, r9 strh r5, [r0] - ldr r1, _0800E6C8 - ldr r2, _0800E6CC + ldr r1, =0x020229e8 + ldr r2, =0x01000046 bl CpuSet add sp, 0x8 pop {r3,r4} @@ -30621,28 +29970,19 @@ _0800E64A: pop {r0} bx r0 .align 2, 0 -_0800E6A8: .4byte 0x03005000 -_0800E6AC: .4byte 0x0100067a -_0800E6B0: .4byte 0x0300506c -_0800E6B4: .4byte 0x0000097c -_0800E6B8: .4byte 0x03003110 -_0800E6BC: .4byte 0x01000008 -_0800E6C0: .4byte 0x03003090 -_0800E6C4: .4byte 0x01000028 -_0800E6C8: .4byte 0x020229e8 -_0800E6CC: .4byte 0x01000046 + .pool thumb_func_end sub_800E604 thumb_func_start sub_800E6D0 sub_800E6D0: @ 800E6D0 push {r4-r6,lr} - ldr r4, _0800E6F8 + ldr r4, =0x03002710 ldr r5, [r4, 0x4] ldr r6, [r4, 0x8] bl sub_800E700 bl rfu_REQ_stopMode bl rfu_waitREQComplete - ldr r1, _0800E6FC + ldr r1, =0x04000208 movs r0, 0 strh r0, [r1] str r5, [r4, 0x4] @@ -30653,16 +29993,15 @@ sub_800E6D0: @ 800E6D0 pop {r0} bx r0 .align 2, 0 -_0800E6F8: .4byte 0x03002710 -_0800E6FC: .4byte 0x04000208 + .pool thumb_func_end sub_800E6D0 thumb_func_start sub_800E700 sub_800E700: @ 800E700 push {r4,lr} - ldr r0, _0800E738 - ldr r1, _0800E73C - ldr r4, _0800E740 + ldr r0, =0x03004190 + ldr r1, =0x00000e64 + ldr r4, =0x03002714 adds r2, r4, 0 movs r3, 0x1 bl rfu_initializeAPI @@ -30670,7 +30009,7 @@ sub_800E700: @ 800E700 lsrs r1, r0, 16 cmp r1, 0 bne _0800E732 - ldr r0, _0800E744 + ldr r0, =0x020229c6 strh r1, [r0] bl sub_800AAF4 movs r0, 0 @@ -30684,10 +30023,7 @@ _0800E732: pop {r0} bx r0 .align 2, 0 -_0800E738: .4byte 0x03004190 -_0800E73C: .4byte 0x00000e64 -_0800E740: .4byte 0x03002714 -_0800E744: .4byte 0x020229c6 + .pool thumb_func_end sub_800E700 thumb_func_start sub_800E748 @@ -30696,20 +30032,19 @@ sub_800E748: @ 800E748 lsls r0, 24 lsrs r5, r0, 24 bl sub_8010750 - ldr r0, _0800E768 + ldr r0, =0x03005000 ldrh r0, [r0, 0x4] cmp r0, 0x12 bls _0800E75C b _0800E862 _0800E75C: lsls r0, 2 - ldr r1, _0800E76C + ldr r1, =_0800E770 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0800E768: .4byte 0x03005000 -_0800E76C: .4byte _0800E770 + .pool .align 2, 0 _0800E770: .4byte _0800E7BC @@ -30732,12 +30067,12 @@ _0800E770: .4byte _0800E862 .4byte _0800E828 _0800E7BC: - ldr r0, _0800E7D8 + ldr r0, =0x02022b2c bl sub_800BFCC - ldr r0, _0800E7DC + ldr r0, =0x03005000 movs r2, 0x1 strh r2, [r0, 0x4] - ldr r1, _0800E7E0 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -30745,19 +30080,17 @@ _0800E7BC: strh r2, [r0, 0xA] b _0800E862 .align 2, 0 -_0800E7D8: .4byte 0x02022b2c -_0800E7DC: .4byte 0x03005000 -_0800E7E0: .4byte 0x03005e00 + .pool _0800E7E4: - ldr r4, _0800E808 + ldr r4, =0x03005000 ldrb r0, [r4, 0xC] - ldr r3, _0800E80C + ldr r3, =0x082ed6e0 movs r1, 0 movs r2, 0xF0 bl sub_800C054 movs r0, 0x3 strh r0, [r4, 0x4] - ldr r1, _0800E810 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -30766,39 +30099,37 @@ _0800E7E4: strh r1, [r0, 0xA] b _0800E862 .align 2, 0 -_0800E808: .4byte 0x03005000 -_0800E80C: .4byte 0x082ed6e0 -_0800E810: .4byte 0x03005e00 + .pool _0800E814: movs r0, 0 bl sub_800C27C - ldr r1, _0800E824 + ldr r1, =0x03005000 movs r0, 0x5 strh r0, [r1, 0x4] b _0800E862 .align 2, 0 -_0800E824: .4byte 0x03005000 + .pool _0800E828: - ldr r4, _0800E868 - ldr r0, _0800E86C + ldr r4, =0x03005000 + ldr r0, =0x00000cdb adds r1, r4, r0 ldrb r0, [r1] movs r0, 0 strb r0, [r1] - ldr r0, _0800E870 + ldr r0, =sub_800EDBC + 1 bl sub_800D52C bl sub_800EAB4 bl sub_800EAFC movs r0, 0x14 strh r0, [r4, 0x4] - ldr r1, _0800E874 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0x8 strh r1, [r0, 0xA] - ldr r0, _0800E878 + ldr r0, =sub_801084C + 1 movs r1, 0x5 bl AddTask adds r0, r5, 0 @@ -30808,23 +30139,19 @@ _0800E862: pop {r0} bx r0 .align 2, 0 -_0800E868: .4byte 0x03005000 -_0800E86C: .4byte 0x00000cdb -_0800E870: .4byte sub_800EDBC + 1 -_0800E874: .4byte 0x03005e00 -_0800E878: .4byte sub_801084C + 1 + .pool thumb_func_end sub_800E748 thumb_func_start sub_800E87C sub_800E87C: @ 800E87C lsls r0, 24 lsrs r0, 24 - ldr r1, _0800E888 + ldr r1, =0x082ed6a5 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_0800E888: .4byte 0x082ed6a5 + .pool thumb_func_end sub_800E87C thumb_func_start sub_800E88C @@ -30841,7 +30168,7 @@ sub_800E88C: @ 800E88C bne _0800E8CC movs r3, 0 movs r5, 0x1 - ldr r1, _0800E8C8 + ldr r1, =0x03005cde _0800E8A6: adds r0, r2, 0 ands r0, r5 @@ -30861,13 +30188,13 @@ _0800E8B8: bls _0800E8A6 b _0800E942 .align 2, 0 -_0800E8C8: .4byte 0x03005cde + .pool _0800E8CC: movs r3, 0 mvns r0, r1 mov r12, r0 movs r7, 0x1 - ldr r4, _0800E948 + ldr r4, =0x03005cde _0800E8D6: adds r2, r1, 0 ands r2, r7 @@ -30883,14 +30210,14 @@ _0800E8E2: cmp r3, 0x3 bls _0800E8D6 movs r4, 0x4 - ldr r0, _0800E948 + ldr r0, =0x03005cde ldrb r7, [r0] _0800E8F4: movs r3, 0 subs r1, r4, 0x1 cmp r7, r4 beq _0800E910 - ldr r2, _0800E948 + ldr r2, =0x03005cde _0800E8FE: adds r0, r3, 0x1 lsls r0, 24 @@ -30914,7 +30241,7 @@ _0800E916: ands r5, r0 movs r3, 0 movs r2, 0x1 - ldr r1, _0800E948 + ldr r1, =0x03005cde _0800E928: adds r0, r5, 0 ands r0, r2 @@ -30935,7 +30262,7 @@ _0800E942: pop {r0} bx r0 .align 2, 0 -_0800E948: .4byte 0x03005cde + .pool thumb_func_end sub_800E88C thumb_func_start sub_800E94C @@ -30943,7 +30270,7 @@ sub_800E94C: @ 800E94C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0800E968 + ldr r0, =0x03005000 ldrh r3, [r0, 0x4] adds r7, r0, 0 cmp r3, 0xC @@ -30951,13 +30278,12 @@ sub_800E94C: @ 800E94C b _0800EA9A _0800E95E: lsls r0, r3, 2 - ldr r1, _0800E96C + ldr r1, =_0800E970 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0800E968: .4byte 0x03005000 -_0800E96C: .4byte _0800E970 + .pool .align 2, 0 _0800E970: .4byte _0800E9A4 @@ -30974,25 +30300,24 @@ _0800E970: .4byte _0800E9F8 .4byte _0800EA3C _0800E9A4: - ldr r0, _0800E9B4 + ldr r0, =0x082ed608 bl sub_800BFCC - ldr r0, _0800E9B8 + ldr r0, =0x03005000 movs r2, 0x1 strh r2, [r0, 0x4] b _0800E9CC .align 2, 0 -_0800E9B4: .4byte 0x082ed608 -_0800E9B8: .4byte 0x03005000 + .pool _0800E9BC: ldrb r0, [r7, 0xC] - ldr r3, _0800E9DC + ldr r3, =0x082ed6e0 movs r1, 0 movs r2, 0xF0 bl sub_800C054 movs r2, 0x7 strh r2, [r7, 0x4] _0800E9CC: - ldr r1, _0800E9E0 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -31000,10 +30325,9 @@ _0800E9CC: strh r2, [r0, 0xA] b _0800EA9A .align 2, 0 -_0800E9DC: .4byte 0x082ed6e0 -_0800E9E0: .4byte 0x03005e00 + .pool _0800E9E4: - ldr r0, _0800E9F4 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -31012,7 +30336,7 @@ _0800E9E4: strh r0, [r1, 0xA] b _0800EA9A .align 2, 0 -_0800E9F4: .4byte 0x03005e00 + .pool _0800E9F8: bl sub_80107A0 cmp r0, 0x6 @@ -31027,16 +30351,16 @@ _0800EA0A: beq _0800EA1C b _0800EA9A _0800EA10: - ldr r1, _0800EA18 + ldr r1, =0x03005000 movs r0, 0xC strh r0, [r1, 0x4] b _0800EA9A .align 2, 0 -_0800EA18: .4byte 0x03005000 + .pool _0800EA1C: bl sub_800D630 - ldr r0, _0800EA34 - ldr r1, _0800EA38 + ldr r0, =0x03005000 + ldr r1, =0x00000ce4 adds r0, r1 movs r1, 0x2 strb r1, [r0] @@ -31044,10 +30368,9 @@ _0800EA1C: bl remove_task b _0800EA9A .align 2, 0 -_0800EA34: .4byte 0x03005000 -_0800EA38: .4byte 0x00000ce4 + .pool _0800EA3C: - ldr r0, _0800EAA0 + ldr r0, =0x00000c3e adds r4, r7, r0 ldrb r0, [r4] movs r5, 0x80 @@ -31058,7 +30381,7 @@ _0800EA3C: movs r0, 0xC bl rfu_clearSlot ldrb r1, [r4] - ldr r0, _0800EAA4 + ldr r0, =0x00000c3f adds r2, r7, r0 movs r0, 0x10 movs r3, 0x46 @@ -31068,7 +30391,7 @@ _0800EA3C: adds r0, r5, 0 movs r2, 0xE bl rfu_UNI_setSendData - ldr r1, _0800EAA8 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -31077,7 +30400,7 @@ _0800EA3C: strh r1, [r0, 0xA] adds r0, r6, 0 bl remove_task - ldr r4, _0800EAAC + ldr r4, =0x02022b44 ldrb r0, [r4, 0xF] cmp r0, 0 bne _0800EA92 @@ -31086,7 +30409,7 @@ _0800EA3C: adds r0, 0x1 strb r0, [r4, 0xF] _0800EA92: - ldr r0, _0800EAB0 + ldr r0, =sub_801084C + 1 movs r1, 0x5 bl AddTask _0800EA9A: @@ -31094,17 +30417,13 @@ _0800EA9A: pop {r0} bx r0 .align 2, 0 -_0800EAA0: .4byte 0x00000c3e -_0800EAA4: .4byte 0x00000c3f -_0800EAA8: .4byte 0x03005e00 -_0800EAAC: .4byte 0x02022b44 -_0800EAB0: .4byte sub_801084C + 1 + .pool thumb_func_end sub_800E94C thumb_func_start sub_800EAB4 sub_800EAB4: @ 800EAB4 push {r4,r5,lr} - ldr r0, _0800EAF4 + ldr r0, =0x03004140 ldrb r5, [r0] movs r4, 0 _0800EABC: @@ -31115,7 +30434,7 @@ _0800EABC: lsls r2, r4, 3 subs r2, r4 lsls r2, 1 - ldr r0, _0800EAF8 + ldr r0, =0x03005014 adds r2, r0 movs r0, 0x10 adds r1, r4, 0 @@ -31135,23 +30454,22 @@ _0800EAE0: pop {r0} bx r0 .align 2, 0 -_0800EAF4: .4byte 0x03004140 -_0800EAF8: .4byte 0x03005014 + .pool thumb_func_end sub_800EAB4 thumb_func_start sub_800EAFC sub_800EAFC: @ 800EAFC push {r4-r6,lr} - ldr r0, _0800EB38 + ldr r0, =0x03004140 ldrb r5, [r0] - ldr r4, _0800EB3C + ldr r4, =0x03005c87 adds r0, r5, 0 adds r1, r4, 0 movs r2, 0x46 bl rfu_UNI_setSendData adds r0, r5, 0 bl sub_800E87C - ldr r1, _0800EB40 + ldr r1, =0xfffff379 adds r6, r4, r1 adds r1, r4, 0 adds r1, 0x53 @@ -31168,9 +30486,7 @@ sub_800EAFC: @ 800EAFC pop {r0} bx r0 .align 2, 0 -_0800EB38: .4byte 0x03004140 -_0800EB3C: .4byte 0x03005c87 -_0800EB40: .4byte 0xfffff379 + .pool thumb_func_end sub_800EAFC thumb_func_start sub_800EB44 @@ -31189,7 +30505,7 @@ sub_800EB44: @ 800EB44 lsrs r0, 24 cmp r0, 0x4 bne _0800EB78 - ldr r0, _0800EB90 + ldr r0, =0x03004140 ldrb r0, [r0] bl rfu_REQ_disconnect bl rfu_waitREQComplete @@ -31197,7 +30513,7 @@ sub_800EB44: @ 800EB44 movs r1, 0 bl sub_8011A64 _0800EB78: - ldr r0, _0800EB94 + ldr r0, =0x03005000 ldrh r2, [r0, 0x4] adds r6, r0, 0 cmp r2, 0x12 @@ -31205,14 +30521,12 @@ _0800EB78: b _0800ECF4 _0800EB84: lsls r0, r2, 2 - ldr r1, _0800EB98 + ldr r1, =_0800EB9C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0800EB90: .4byte 0x03004140 -_0800EB94: .4byte 0x03005000 -_0800EB98: .4byte _0800EB9C + .pool .align 2, 0 _0800EB9C: .4byte _0800EBE8 @@ -31235,12 +30549,12 @@ _0800EB9C: .4byte _0800EC10 .4byte _0800ECF4 _0800EBE8: - ldr r0, _0800EC04 + ldr r0, =0x02022b2c bl sub_800BFCC - ldr r0, _0800EC08 + ldr r0, =0x03005000 movs r2, 0x1 strh r2, [r0, 0x4] - ldr r1, _0800EC0C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -31248,27 +30562,23 @@ _0800EBE8: strh r2, [r0, 0xA] b _0800ECF4 .align 2, 0 -_0800EC04: .4byte 0x02022b2c -_0800EC08: .4byte 0x03005000 -_0800EC0C: .4byte 0x03005e00 + .pool _0800EC10: - ldr r3, _0800EC2C + ldr r3, =0x082ed6e0 movs r0, 0x2 movs r1, 0 movs r2, 0xF0 bl sub_800C054 - ldr r0, _0800EC30 + ldr r0, =sub_800ED34 + 1 bl sub_800D52C - ldr r1, _0800EC34 + ldr r1, =0x03005000 movs r0, 0x12 strh r0, [r1, 0x4] b _0800ECF4 .align 2, 0 -_0800EC2C: .4byte 0x082ed6e0 -_0800EC30: .4byte sub_800ED34 + 1 -_0800EC34: .4byte 0x03005000 + .pool _0800EC38: - ldr r1, _0800EC7C + ldr r1, =0x00000c3e adds r0, r6, r1 ldrb r1, [r0] movs r0, 0x80 @@ -31286,7 +30596,7 @@ _0800EC38: strb r0, [r6, 0xC] adds r0, r5, 0 bl remove_task - ldr r0, _0800EC80 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -31295,37 +30605,35 @@ _0800EC38: ldrsh r0, [r1, r2] cmp r0, 0 beq _0800EC88 - ldr r0, _0800EC84 + ldr r0, =sub_8010D0C + 1 movs r1, 0x1 bl AddTask b _0800ECF4 .align 2, 0 -_0800EC7C: .4byte 0x00000c3e -_0800EC80: .4byte 0x03005e00 -_0800EC84: .4byte sub_8010D0C + 1 + .pool _0800EC88: - ldr r0, _0800EC94 + ldr r0, =sub_801084C + 1 movs r1, 0x5 bl AddTask b _0800ECF4 .align 2, 0 -_0800EC94: .4byte sub_801084C + 1 + .pool _0800EC98: movs r0, 0 bl sub_800C27C - ldr r1, _0800ECA8 + ldr r1, =0x03005000 movs r0, 0xF strh r0, [r1, 0x4] b _0800ECF4 .align 2, 0 -_0800ECA8: .4byte 0x03005000 + .pool _0800ECAC: - ldr r0, _0800ECFC + ldr r0, =0x00000cdb adds r1, r6, r0 ldrb r0, [r1] movs r0, 0 strb r0, [r1] - ldr r0, _0800ED00 + ldr r0, =sub_800EDBC + 1 bl sub_800D52C movs r0, 0x1 bl sub_8011068 @@ -31333,7 +30641,7 @@ _0800ECAC: bl sub_800EAFC movs r0, 0x14 strh r0, [r6, 0x4] - ldr r1, _0800ED04 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -31342,10 +30650,10 @@ _0800ECAC: strh r1, [r0, 0xA] movs r4, 0x1 strb r4, [r6, 0xC] - ldr r0, _0800ED08 + ldr r0, =sub_801084C + 1 movs r1, 0x5 bl AddTask - ldr r1, _0800ED0C + ldr r1, =0x00000ce8 adds r0, r6, r1 strb r4, [r0] adds r0, r5, 0 @@ -31355,17 +30663,13 @@ _0800ECF4: pop {r0} bx r0 .align 2, 0 -_0800ECFC: .4byte 0x00000cdb -_0800ED00: .4byte sub_800EDBC + 1 -_0800ED04: .4byte 0x03005e00 -_0800ED08: .4byte sub_801084C + 1 -_0800ED0C: .4byte 0x00000ce8 + .pool thumb_func_end sub_800EB44 thumb_func_start sub_800ED10 sub_800ED10: @ 800ED10 push {lr} - ldr r3, _0800ED24 + ldr r3, =0x082ed6e0 movs r0, 0x1 movs r1, 0 movs r2, 0xF0 @@ -31373,7 +30677,7 @@ sub_800ED10: @ 800ED10 pop {r0} bx r0 .align 2, 0 -_0800ED24: .4byte 0x082ed6e0 + .pool thumb_func_end sub_800ED10 thumb_func_start sub_800ED28 @@ -31388,7 +30692,7 @@ sub_800ED28: @ 800ED28 thumb_func_start sub_800ED34 sub_800ED34: @ 800ED34 push {r4,lr} - ldr r0, _0800EDA8 + ldr r0, =0x03005000 movs r2, 0 movs r1, 0xD adds r0, 0x59 @@ -31400,9 +30704,9 @@ _0800ED3E: bge _0800ED3E bl rfu_REQ_recvData bl rfu_waitREQComplete - ldr r1, _0800EDAC - ldr r3, _0800EDA8 - ldr r0, _0800EDB0 + ldr r1, =0x03007870 + ldr r3, =0x03005000 + ldr r0, =0x00000c3e adds r4, r3, r0 ldrb r0, [r4] lsls r0, 2 @@ -31421,10 +30725,10 @@ _0800ED3E: movs r1, 0x92 lsls r1, 1 adds r0, r3, r1 - ldr r2, _0800EDB4 + ldr r2, =0x00000c3f adds r1, r3, r2 bl sub_800D7D8 - ldr r1, _0800EDB8 + ldr r1, =0x02022b44 ldrh r0, [r1, 0x6] adds r0, 0x1 strh r0, [r1, 0x6] @@ -31440,44 +30744,38 @@ _0800ED9A: pop {r0} bx r0 .align 2, 0 -_0800EDA8: .4byte 0x03005000 -_0800EDAC: .4byte 0x03007870 -_0800EDB0: .4byte 0x00000c3e -_0800EDB4: .4byte 0x00000c3f -_0800EDB8: .4byte 0x02022b44 + .pool thumb_func_end sub_800ED34 thumb_func_start sub_800EDBC sub_800EDBC: @ 800EDBC - ldr r0, _0800EDCC - ldr r1, _0800EDD0 + ldr r0, =0x03005000 + ldr r1, =0x00000cdb adds r0, r1 ldrb r1, [r0] movs r1, 0x1 strb r1, [r0] bx lr .align 2, 0 -_0800EDCC: .4byte 0x03005000 -_0800EDD0: .4byte 0x00000cdb + .pool thumb_func_end sub_800EDBC thumb_func_start sub_800EDD4 sub_800EDD4: @ 800EDD4 push {r4-r6,lr} bl sub_800C048 - ldr r4, _0800EDE8 + ldr r4, =0x03005000 ldrb r0, [r4, 0xC] cmp r0, 0x1 bne _0800EDF0 - ldr r0, _0800EDEC + ldr r0, =sub_800E748 + 1 b _0800EDF6 .align 2, 0 -_0800EDE8: .4byte 0x03005000 -_0800EDEC: .4byte sub_800E748 + 1 + .pool _0800EDF0: cmp r0, 0 bne _0800EE18 - ldr r0, _0800EE14 + ldr r0, =sub_800E94C + 1 _0800EDF6: bl is_function_an_active_task lsls r0, 24 @@ -31491,11 +30789,11 @@ _0800EDF6: bl sub_800E604 b _0800EE38 .align 2, 0 -_0800EE14: .4byte sub_800E94C + 1 + .pool _0800EE18: cmp r0, 0x2 bne _0800EE38 - ldr r0, _0800EE70 + ldr r0, =sub_800EB44 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -31508,7 +30806,7 @@ _0800EE18: bl sub_800E604 _0800EE38: movs r5, 0 - ldr r6, _0800EE74 + ldr r6, =0x082ed7e0 _0800EE3C: lsls r0, r5, 2 adds r0, r6 @@ -31534,34 +30832,32 @@ _0800EE5E: pop {r0} bx r0 .align 2, 0 -_0800EE70: .4byte sub_800EB44 + 1 -_0800EE74: .4byte 0x082ed7e0 + .pool thumb_func_end sub_800EDD4 thumb_func_start sub_800EE78 sub_800EE78: @ 800EE78 push {lr} - ldr r0, _0800EE8C + ldr r0, =sub_800E748 + 1 movs r1, 0x1 bl AddTask - ldr r1, _0800EE90 + ldr r1, =0x03005000 adds r1, 0x67 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_0800EE8C: .4byte sub_800E748 + 1 -_0800EE90: .4byte 0x03005000 + .pool thumb_func_end sub_800EE78 thumb_func_start sub_800EE94 sub_800EE94: @ 800EE94 push {lr} - ldr r1, _0800EEAC + ldr r1, =0x03005000 ldrh r0, [r1, 0x4] cmp r0, 0x7 bne _0800EEB4 - ldr r2, _0800EEB0 + ldr r2, =0x00000ccd adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -31569,8 +30865,7 @@ sub_800EE94: @ 800EE94 movs r0, 0x1 b _0800EEB6 .align 2, 0 -_0800EEAC: .4byte 0x03005000 -_0800EEB0: .4byte 0x00000ccd + .pool _0800EEB4: movs r0, 0 _0800EEB6: @@ -31581,13 +30876,13 @@ _0800EEB6: thumb_func_start sub_800EEBC sub_800EEBC: @ 800EEBC push {r4,lr} - ldr r4, _0800EEEC + ldr r4, =0x03005000 ldrh r0, [r4, 0x4] cmp r0, 0x7 bne _0800EEF8 - ldr r0, _0800EEF0 + ldr r0, =0x03007890 ldr r1, [r0] - ldr r2, _0800EEF4 + ldr r2, =0x00000c3d adds r0, r4, r2 ldrb r0, [r0] lsls r0, 5 @@ -31603,9 +30898,7 @@ sub_800EEBC: @ 800EEBC movs r0, 0x1 b _0800EEFA .align 2, 0 -_0800EEEC: .4byte 0x03005000 -_0800EEF0: .4byte 0x03007890 -_0800EEF4: .4byte 0x00000c3d + .pool _0800EEF8: movs r0, 0 _0800EEFA: @@ -31617,30 +30910,29 @@ _0800EEFA: thumb_func_start sub_800EF00 sub_800EF00: @ 800EF00 push {lr} - ldr r0, _0800EF14 + ldr r0, =sub_800E94C + 1 movs r1, 0x1 bl AddTask - ldr r1, _0800EF18 + ldr r1, =0x03005000 adds r1, 0x67 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_0800EF14: .4byte sub_800E94C + 1 -_0800EF18: .4byte 0x03005000 + .pool thumb_func_end sub_800EF00 thumb_func_start sub_800EF1C sub_800EF1C: @ 800EF1C push {lr} - ldr r0, _0800EF2C + ldr r0, =0x03004140 ldrb r0, [r0] cmp r0, 0 bne _0800EF30 movs r0, 0 b _0800EF32 .align 2, 0 -_0800EF2C: .4byte 0x03004140 + .pool _0800EF30: movs r0, 0x1 _0800EF32: @@ -31650,26 +30942,24 @@ _0800EF32: thumb_func_start sub_800EF38 sub_800EF38: @ 800EF38 - ldr r1, _0800EF4C + ldr r1, =0x03005000 movs r0, 0x4 strh r0, [r1, 0x4] - ldr r0, _0800EF50 + ldr r0, =0x03004140 ldrb r0, [r0] - ldr r2, _0800EF54 + ldr r2, =0x00000ce7 adds r1, r2 strb r0, [r1] bx lr .align 2, 0 -_0800EF4C: .4byte 0x03005000 -_0800EF50: .4byte 0x03004140 -_0800EF54: .4byte 0x00000ce7 + .pool thumb_func_end sub_800EF38 thumb_func_start sub_800EF58 sub_800EF58: @ 800EF58 push {lr} adds r1, r0, 0 - ldr r2, _0800EF70 + ldr r2, =0x03005000 ldrh r0, [r2, 0x4] cmp r0, 0x11 beq _0800EF68 @@ -31681,7 +30971,7 @@ _0800EF68: movs r0, 0x1 b _0800EF76 .align 2, 0 -_0800EF70: .4byte 0x03005000 + .pool _0800EF74: movs r0, 0 _0800EF76: @@ -31691,12 +30981,12 @@ _0800EF76: thumb_func_start sub_800EF7C sub_800EF7C: @ 800EF7C - ldr r1, _0800EF84 + ldr r1, =0x03005000 movs r0, 0xE strh r0, [r1, 0x4] bx lr .align 2, 0 -_0800EF84: .4byte 0x03005000 + .pool thumb_func_end sub_800EF7C thumb_func_start sub_800EF88 @@ -31730,10 +31020,10 @@ sub_800EFB0: @ 800EFB0 push {r4-r7,lr} sub sp, 0x4 movs r2, 0 - ldr r7, _0800F004 - ldr r0, _0800F008 + ldr r7, =0x03003090 + ldr r0, =0x03005000 adds r6, r7, 0 - ldr r1, _0800F00C + ldr r1, =0x00000c87 adds r5, r0, r1 _0800EFC0: movs r3, 0 @@ -31761,7 +31051,7 @@ _0800EFD0: movs r0, 0 mov r1, sp strh r0, [r1] - ldr r2, _0800F010 + ldr r2, =0x01000028 mov r0, sp adds r1, r7, 0 bl CpuSet @@ -31770,17 +31060,14 @@ _0800EFD0: pop {r0} bx r0 .align 2, 0 -_0800F004: .4byte 0x03003090 -_0800F008: .4byte 0x03005000 -_0800F00C: .4byte 0x00000c87 -_0800F010: .4byte 0x01000028 + .pool thumb_func_end sub_800EFB0 thumb_func_start sub_800F014 sub_800F014: @ 800F014 push {lr} - ldr r3, _0800F040 - ldr r2, _0800F044 + ldr r3, =0x03003110 + ldr r2, =0x03003090 movs r1, 0x6 _0800F01C: ldrh r0, [r3] @@ -31790,7 +31077,7 @@ _0800F01C: subs r1, 0x1 cmp r1, 0 bge _0800F01C - ldr r1, _0800F040 + ldr r1, =0x03003110 movs r2, 0 adds r0, r1, 0 adds r0, 0xC @@ -31802,27 +31089,26 @@ _0800F032: pop {r0} bx r0 .align 2, 0 -_0800F040: .4byte 0x03003110 -_0800F044: .4byte 0x03003090 + .pool thumb_func_end sub_800F014 thumb_func_start sub_800F048 sub_800F048: @ 800F048 push {r4,r5,lr} - ldr r4, _0800F0A4 - ldr r0, _0800F0A8 + ldr r4, =0x03005000 + ldr r0, =0x00000c3c adds r5, r4, r0 ldrb r0, [r5] cmp r0, 0 beq _0800F07A - ldr r1, _0800F0AC + ldr r1, =0x00000c1c adds r0, r4, r1 adds r1, r4, 0 adds r1, 0x4C bl sub_800DAC8 lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _0800F0B0 + ldr r1, =0x00000c3a adds r0, r4, r1 ldrb r0, [r0] adds r1, r0, 0 @@ -31834,19 +31120,19 @@ _0800F076: cmp r2, 0 bne _0800F09E _0800F07A: - ldr r5, _0800F0A4 - ldr r1, _0800F0A8 + ldr r5, =0x03005000 + ldr r1, =0x00000c3c adds r0, r5, r1 ldrb r0, [r0] cmp r0, 0 bne _0800F09E - ldr r1, _0800F0B4 + ldr r1, =0x000009e8 adds r0, r5, r1 adds r4, r5, 0 adds r4, 0x4C adds r1, r4, 0 bl sub_800D9DC - ldr r1, _0800F0AC + ldr r1, =0x00000c1c adds r0, r5, r1 adds r1, r4, 0 bl sub_800DA68 @@ -31855,17 +31141,13 @@ _0800F09E: pop {r0} bx r0 .align 2, 0 -_0800F0A4: .4byte 0x03005000 -_0800F0A8: .4byte 0x00000c3c -_0800F0AC: .4byte 0x00000c1c -_0800F0B0: .4byte 0x00000c3a -_0800F0B4: .4byte 0x000009e8 + .pool thumb_func_end sub_800F048 thumb_func_start sub_800F0B8 sub_800F0B8: @ 800F0B8 push {r4,lr} - ldr r0, _0800F0C8 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0 @@ -31874,10 +31156,10 @@ _0800F0C4: movs r0, 0 b _0800F0EC .align 2, 0 -_0800F0C8: .4byte 0x03007890 + .pool _0800F0CC: movs r3, 0 - ldr r4, _0800F0F4 + ldr r4, =0x03003090 _0800F0D0: movs r2, 0 lsls r0, r3, 4 @@ -31899,13 +31181,13 @@ _0800F0EC: pop {r1} bx r1 .align 2, 0 -_0800F0F4: .4byte 0x03003090 + .pool thumb_func_end sub_800F0B8 thumb_func_start sub_800F0F8 sub_800F0F8: @ 800F0F8 push {r4-r6,lr} - ldr r6, _0800F114 + ldr r6, =0x03005000 ldrh r0, [r6, 0x4] cmp r0, 0x13 bhi _0800F118 @@ -31915,16 +31197,16 @@ sub_800F0F8: @ 800F0F8 bl rfu_REQ_sendData_wrapper b _0800F1D2 .align 2, 0 -_0800F114: .4byte 0x03005000 + .pool _0800F118: - ldr r0, _0800F174 + ldr r0, =0x00000cdb adds r1, r6, r0 ldrb r0, [r1] movs r0, 0 strb r0, [r1] - ldr r0, _0800F178 + ldr r0, =0x00000ce2 adds r1, r6, r0 - ldr r0, _0800F17C + ldr r0, =0x03007890 ldr r0, [r0] ldrb r1, [r1] ldrb r0, [r0, 0x2] @@ -31933,20 +31215,20 @@ _0800F118: bne _0800F1D2 cmp r0, 0 beq _0800F1D2 - ldr r1, _0800F180 + ldr r1, =0x00000cdc adds r0, r6, r1 ldrb r0, [r0] adds r5, r0, 0 cmp r5, 0 bne _0800F1C8 - ldr r0, _0800F184 + ldr r0, =0x00000ce3 adds r4, r6, r0 ldrb r0, [r4] cmp r0, 0 beq _0800F1A8 bl sub_8011D6C strb r5, [r4] - ldr r1, _0800F188 + ldr r1, =0x00000ce4 adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -31960,28 +31242,22 @@ _0800F118: bl sub_8011170 b _0800F1D2 .align 2, 0 -_0800F174: .4byte 0x00000cdb -_0800F178: .4byte 0x00000ce2 -_0800F17C: .4byte 0x03007890 -_0800F180: .4byte 0x00000cdc -_0800F184: .4byte 0x00000ce3 -_0800F188: .4byte 0x00000ce4 + .pool _0800F18C: - ldr r0, _0800F1A0 + ldr r0, =0x03004140 ldrb r4, [r0] cmp r4, 0 bne _0800F1A8 bl sub_800EDD4 - ldr r0, _0800F1A4 + ldr r0, =0x03003124 strb r4, [r0] b _0800F1D2 .align 2, 0 -_0800F1A0: .4byte 0x03004140 -_0800F1A4: .4byte 0x03003124 + .pool _0800F1A8: bl sub_800EFB0 - ldr r0, _0800F1C0 - ldr r1, _0800F1C4 + ldr r0, =0x03005000 + ldr r1, =0x00000cda adds r0, r1 ldrb r0, [r0] bl rfu_UNI_readySendData @@ -31989,12 +31265,11 @@ _0800F1A8: bl rfu_REQ_sendData_wrapper b _0800F1CC .align 2, 0 -_0800F1C0: .4byte 0x03005000 -_0800F1C4: .4byte 0x00000cda + .pool _0800F1C8: bl rfu_REQ_PARENT_resumeRetransmitAndChange _0800F1CC: - ldr r1, _0800F1DC + ldr r1, =0x03005000 movs r0, 0x1 strb r0, [r1, 0xE] _0800F1D2: @@ -32003,7 +31278,7 @@ _0800F1D2: pop {r1} bx r1 .align 2, 0 -_0800F1DC: .4byte 0x03005000 + .pool thumb_func_end sub_800F0F8 thumb_func_start sub_800F1E0 @@ -32014,7 +31289,7 @@ sub_800F1E0: @ 800F1E0 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _0800F2C0 + ldr r0, =0x03005000 ldrh r1, [r0, 0x4] adds r6, r0, 0 cmp r1, 0x13 @@ -32027,7 +31302,7 @@ _0800F1F8: b _0800F45A _0800F200: bl rfu_waitREQComplete - ldr r0, _0800F2C4 + ldr r0, =0x00000cdb adds r2, r6, r0 ldrb r0, [r2] cmp r0, 0 @@ -32046,9 +31321,9 @@ _0800F21A: _0800F220: bl rfu_REQ_recvData bl rfu_waitREQComplete - ldr r2, _0800F2C8 - ldr r4, _0800F2C0 - ldr r1, _0800F2CC + ldr r2, =0x03004140 + ldr r4, =0x03005000 + ldr r1, =0x00000ce2 adds r0, r4, r1 ldrb r1, [r2, 0x3] ldrb r0, [r0] @@ -32057,12 +31332,12 @@ _0800F220: beq _0800F23C b _0800F444 _0800F23C: - ldr r6, _0800F2D0 + ldr r6, =0x00000cdc adds r1, r4, r6 ldrb r0, [r1] movs r0, 0 strb r0, [r1] - ldr r1, _0800F2D4 + ldr r1, =0x02022b44 ldrh r0, [r1, 0x6] adds r0, 0x1 strh r0, [r1, 0x6] @@ -32079,7 +31354,7 @@ _0800F252: bne _0800F264 b _0800F364 _0800F264: - ldr r1, _0800F2C0 + ldr r1, =0x03005000 lsls r2, r5, 3 subs r0, r2, r5 lsls r4, r0, 1 @@ -32093,7 +31368,7 @@ _0800F264: mov r10, r1 cmp r0, 0 beq _0800F35C - ldr r2, _0800F2D8 + ldr r2, =0x00000cee adds r0, r6, r2 adds r1, r5, r0 ldrb r0, [r1] @@ -32110,7 +31385,7 @@ _0800F264: ands r0, r1 cmp r2, r0 beq _0800F2E0 - ldr r0, _0800F2DC + ldr r0, =0x00000cea adds r1, r6, r0 adds r1, r5, r1 ldrb r0, [r1] @@ -32125,17 +31400,10 @@ _0800F264: bl sub_8011170 b _0800F35C .align 2, 0 -_0800F2C0: .4byte 0x03005000 -_0800F2C4: .4byte 0x00000cdb -_0800F2C8: .4byte 0x03004140 -_0800F2CC: .4byte 0x00000ce2 -_0800F2D0: .4byte 0x00000cdc -_0800F2D4: .4byte 0x02022b44 -_0800F2D8: .4byte 0x00000cee -_0800F2DC: .4byte 0x00000cea + .pool _0800F2E0: - ldr r2, _0800F420 - ldr r6, _0800F424 + ldr r2, =0x03005000 + ldr r6, =0x00000cee adds r1, r2, r6 adds r1, r5, r1 subs r3, r5 @@ -32146,7 +31414,7 @@ _0800F2E0: ldrb r0, [r2] lsrs r0, 5 strb r0, [r1] - ldr r1, _0800F420 + ldr r1, =0x03005000 subs r6, 0x4 adds r0, r1, r6 adds r0, r5, r0 @@ -32156,7 +31424,7 @@ _0800F2E0: movs r0, 0x1F ands r0, r1 strb r0, [r2] - ldr r2, _0800F428 + ldr r2, =0x03005cde adds r0, r5, r2 ldrb r0, [r0] movs r6, 0 @@ -32166,7 +31434,7 @@ _0800F2E0: str r2, [sp, 0x4] adds r5, 0x1 str r5, [sp] - ldr r1, _0800F42C + ldr r1, =0x03003090 mov r9, r1 adds r5, r3, 0 adds r7, r4, 0 @@ -32216,21 +31484,21 @@ _0800F376: movs r0, 0 bl sub_800F86C bl sub_8010528 - ldr r4, _0800F420 - ldr r1, _0800F430 + ldr r4, =0x03005000 + ldr r1, =0x00000ce5 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 beq _0800F452 - ldr r2, _0800F434 + ldr r2, =0x00000cd9 adds r0, r4, r2 ldrb r2, [r0] cmp r2, 0 bne _0800F452 - ldr r0, _0800F438 + ldr r0, =0x02022b44 ldrb r1, [r0, 0xE] strb r2, [r0, 0xE] - ldr r6, _0800F43C + ldr r6, =0x00000cda adds r0, r4, r6 ldrb r1, [r0] movs r0, 0x3 @@ -32239,7 +31507,7 @@ _0800F376: adds r7, r4, 0 adds r7, 0x14 _0800F3B2: - ldr r0, _0800F430 + ldr r0, =0x00000ce5 adds r6, r4, r0 ldrb r0, [r6] asrs r0, r5 @@ -32285,22 +31553,14 @@ _0800F3D6: adds r1, r6, 0 subs r1, 0xB strb r0, [r1] - ldr r0, _0800F440 + ldr r0, =sub_8010AAC + 1 movs r1, 0 bl AddTask b _0800F452 .align 2, 0 -_0800F420: .4byte 0x03005000 -_0800F424: .4byte 0x00000cee -_0800F428: .4byte 0x03005cde -_0800F42C: .4byte 0x03003090 -_0800F430: .4byte 0x00000ce5 -_0800F434: .4byte 0x00000cd9 -_0800F438: .4byte 0x02022b44 -_0800F43C: .4byte 0x00000cda -_0800F440: .4byte sub_8010AAC + 1 + .pool _0800F444: - ldr r2, _0800F474 + ldr r2, =0x00000cdc adds r1, r4, r2 ldrb r0, [r1] movs r2, 0 @@ -32308,16 +31568,16 @@ _0800F444: strb r0, [r1] strb r2, [r4, 0xE] _0800F452: - ldr r1, _0800F478 + ldr r1, =0x03005000 movs r0, 0 strb r0, [r1, 0xE] adds r6, r1, 0 _0800F45A: - ldr r1, _0800F474 + ldr r1, =0x00000cdc adds r0, r6, r1 ldrb r0, [r0] adds r1, r0, 0 - ldr r0, _0800F47C + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0 @@ -32326,9 +31586,7 @@ _0800F45A: ands r0, r1 b _0800F486 .align 2, 0 -_0800F474: .4byte 0x00000cdc -_0800F478: .4byte 0x03005000 -_0800F47C: .4byte 0x03007890 + .pool _0800F480: movs r0, 0 b _0800F486 @@ -32353,7 +31611,7 @@ sub_800F498: @ 800F498 ldrh r1, [r4] cmp r1, 0 beq _0800F4DC - ldr r0, _0800F4D8 + ldr r0, =0x03005000 movs r5, 0x81 lsls r5, 1 adds r3, r0, r5 @@ -32380,7 +31638,7 @@ _0800F4C2: bge _0800F4C2 b _0800F4EA .align 2, 0 -_0800F4D8: .4byte 0x03005000 + .pool _0800F4DC: movs r1, 0 adds r0, r2, 0 @@ -32402,11 +31660,11 @@ sub_800F4F0: @ 800F4F0 mov r7, r8 push {r7} sub sp, 0x58 - ldr r0, _0800F614 + ldr r0, =0x03005124 mov r1, sp bl sub_800D934 movs r1, 0 - ldr r0, _0800F618 + ldr r0, =0x03003090 mov r12, r0 _0800F506: movs r4, 0 @@ -32442,17 +31700,17 @@ _0800F514: bls _0800F506 movs r0, 0 bl sub_800F86C - ldr r0, _0800F61C + ldr r0, =0x03004140 ldrb r0, [r0, 0x2] cmp r0, 0 bne _0800F5C0 - ldr r0, _0800F620 - ldr r2, _0800F624 + ldr r0, =0x03005000 + ldr r2, =0x00000ce4 adds r0, r2 ldrb r0, [r0] cmp r0, 0 beq _0800F5C0 - ldr r0, _0800F628 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r1, [r0, 0x2] ldrb r0, [r0, 0x3] @@ -32474,13 +31732,13 @@ _0800F514: bl sub_8011A64 _0800F58C: bl rfu_clearAllSlot - ldr r1, _0800F62C + ldr r1, =0x03003124 movs r0, 0 strb r0, [r1] - ldr r0, _0800F620 + ldr r0, =0x03005000 movs r5, 0 str r5, [r0] - ldr r7, _0800F624 + ldr r7, =0x00000ce4 adds r6, r0, r7 ldrb r0, [r6] cmp r0, 0x1 @@ -32493,12 +31751,12 @@ _0800F58C: adds r0, r4, 0 bl sub_8011170 _0800F5B8: - ldr r0, _0800F61C + ldr r0, =0x03004140 strb r5, [r0, 0x5] strb r5, [r0, 0x4] strb r5, [r6] _0800F5C0: - ldr r6, _0800F620 + ldr r6, =0x03005000 movs r0, 0xCD lsls r0, 4 adds r2, r6, r0 @@ -32510,12 +31768,12 @@ _0800F5C0: ldrb r1, [r2] strb r0, [r2] bl sub_8010528 - ldr r5, _0800F630 + ldr r5, =0x03003110 add r4, sp, 0x48 adds r0, r5, 0 adds r1, r4, 0 bl sub_800F498 - ldr r1, _0800F634 + ldr r1, =0x000009e8 adds r0, r6, r1 adds r1, r4, 0 bl sub_800D888 @@ -32539,15 +31797,7 @@ _0800F604: pop {r1} bx r1 .align 2, 0 -_0800F614: .4byte 0x03005124 -_0800F618: .4byte 0x03003090 -_0800F61C: .4byte 0x03004140 -_0800F620: .4byte 0x03005000 -_0800F624: .4byte 0x00000ce4 -_0800F628: .4byte 0x03007890 -_0800F62C: .4byte 0x03003124 -_0800F630: .4byte 0x03003110 -_0800F634: .4byte 0x000009e8 + .pool thumb_func_end sub_800F4F0 thumb_func_start sub_800F638 @@ -32557,7 +31807,7 @@ sub_800F638: @ 800F638 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _0800F6E4 + ldr r0, =0x03005000 ldr r2, [r0, 0x70] mov r10, r2 movs r5, 0 @@ -32567,7 +31817,7 @@ sub_800F638: @ 800F638 cmp r5, r3 bge _0800F6D4 mov r9, r0 - ldr r0, _0800F6E8 + ldr r0, =0x03000d90 mov r8, r0 _0800F65A: movs r0, 0x1 @@ -32576,7 +31826,7 @@ _0800F65A: adds r6, r5, 0x1 cmp r0, 0 bne _0800F6C8 - ldr r1, _0800F6EC + ldr r1, =0xffff8900 adds r0, r1, 0 adds r1, r5, 0 orrs r1, r0 @@ -32584,7 +31834,7 @@ _0800F65A: strh r1, [r2] movs r4, 0 lsls r0, r5, 1 - ldr r3, _0800F6F0 + ldr r3, =0x03000d80 mov r12, r3 adds r0, r5 lsls r0, 2 @@ -32604,8 +31854,8 @@ _0800F686: cmp r4, 0x6 ble _0800F686 movs r4, 0 - ldr r2, _0800F6E8 - ldr r1, _0800F6F0 + ldr r2, =0x03000d90 + ldr r1, =0x03000d80 _0800F6A0: ldrh r0, [r2] lsrs r0, 8 @@ -32617,7 +31867,7 @@ _0800F6A0: adds r4, 0x1 cmp r4, 0x6 ble _0800F6A0 - ldr r0, _0800F6F4 + ldr r0, =0x030059e8 mov r1, r12 bl sub_800D888 movs r1, 0x1 @@ -32629,7 +31879,7 @@ _0800F6A0: _0800F6C8: adds r1, r7, 0 adds r5, r6, 0 - ldr r3, _0800F6F8 + ldr r3, =0x0300506e ldrh r3, [r3] cmp r5, r3 blt _0800F65A @@ -32642,12 +31892,7 @@ _0800F6D4: pop {r0} bx r0 .align 2, 0 -_0800F6E4: .4byte 0x03005000 -_0800F6E8: .4byte 0x03000d90 -_0800F6EC: .4byte 0xffff8900 -_0800F6F0: .4byte 0x03000d80 -_0800F6F4: .4byte 0x030059e8 -_0800F6F8: .4byte 0x0300506e + .pool thumb_func_end sub_800F638 thumb_func_start sub_800F6FC @@ -32655,7 +31900,7 @@ sub_800F6FC: @ 800F6FC push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0800F718 + ldr r0, =0x03005000 ldrb r2, [r0, 0xC] cmp r2, 0x1 bne _0800F71C @@ -32666,7 +31911,7 @@ sub_800F6FC: @ 800F6FC strb r2, [r0] b _0800F724 .align 2, 0 -_0800F718: .4byte 0x03005000 + .pool _0800F71C: adds r0, 0x5C adds r0, r1, r0 @@ -32681,7 +31926,7 @@ _0800F724: sub_800F728: @ 800F728 lsls r0, 24 lsrs r0, 24 - ldr r3, _0800F748 + ldr r3, =0x03005000 adds r1, r3, 0 adds r1, 0x5C adds r1, r0, r1 @@ -32695,14 +31940,14 @@ sub_800F728: @ 800F728 strb r2, [r1] bx lr .align 2, 0 -_0800F748: .4byte 0x03005000 + .pool thumb_func_end sub_800F728 thumb_func_start sub_800F74C sub_800F74C: @ 800F74C push {r4,r5,lr} adds r3, r0, 0 - ldr r0, _0800F760 + ldr r0, =0x03005000 ldrb r1, [r0, 0xC] adds r5, r0, 0 cmp r1, 0x1 @@ -32710,10 +31955,10 @@ sub_800F74C: @ 800F74C movs r0, 0 b _0800F786 .align 2, 0 -_0800F760: .4byte 0x03005000 + .pool _0800F764: movs r2, 0 - ldr r0, _0800F78C + ldr r0, =0x00000cde adds r4, r5, r0 _0800F76A: adds r1, r2, r4 @@ -32725,7 +31970,7 @@ _0800F76A: lsrs r2, r0, 24 cmp r2, 0x3 bls _0800F76A - ldr r1, _0800F790 + ldr r1, =0x00000c3e adds r0, r5, r1 ldrb r0, [r0] adds r0, r3 @@ -32735,26 +31980,25 @@ _0800F786: pop {r1} bx r1 .align 2, 0 -_0800F78C: .4byte 0x00000cde -_0800F790: .4byte 0x00000c3e + .pool thumb_func_end sub_800F74C thumb_func_start rfu_func_080F97B8 rfu_func_080F97B8: @ 800F794 push {lr} - ldr r0, _0800F7CC + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0800F7C6 - ldr r3, _0800F7D0 + ldr r3, =0x03005da8 ldrh r2, [r3] cmp r2, 0 beq _0800F7C6 - ldr r0, _0800F7D4 + ldr r0, =0x030022b4 ldrb r0, [r0] cmp r0, 0x1 beq _0800F7C6 - ldr r1, _0800F7D8 + ldr r1, =0x03000d78 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -32769,27 +32013,24 @@ _0800F7C6: pop {r0} bx r0 .align 2, 0 -_0800F7CC: .4byte 0x03003124 -_0800F7D0: .4byte 0x03005da8 -_0800F7D4: .4byte 0x030022b4 -_0800F7D8: .4byte 0x03000d78 + .pool thumb_func_end rfu_func_080F97B8 thumb_func_start sub_800F7DC sub_800F7DC: @ 800F7DC - ldr r0, _0800F7E0 + ldr r0, =0x02022b14 bx lr .align 2, 0 -_0800F7E0: .4byte 0x02022b14 + .pool thumb_func_end sub_800F7DC thumb_func_start sub_800F7E4 sub_800F7E4: @ 800F7E4 push {lr} movs r2, 0 - ldr r0, _0800F7FC + ldr r0, =0x03005000 ldr r1, [r0] - ldr r0, _0800F800 + ldr r0, =rfu_func_080F97B8 + 1 cmp r1, r0 bne _0800F7F4 movs r2, 0x1 @@ -32798,29 +32039,27 @@ _0800F7F4: pop {r1} bx r1 .align 2, 0 -_0800F7FC: .4byte 0x03005000 -_0800F800: .4byte rfu_func_080F97B8 + 1 + .pool thumb_func_end sub_800F7E4 thumb_func_start sub_800F804 sub_800F804: @ 800F804 - ldr r1, _0800F80C - ldr r0, _0800F810 + ldr r1, =0x03005000 + ldr r0, =rfu_func_080F97B8 + 1 str r0, [r1] bx lr .align 2, 0 -_0800F80C: .4byte 0x03005000 -_0800F810: .4byte rfu_func_080F97B8 + 1 + .pool thumb_func_end sub_800F804 thumb_func_start Rfu_set_zero Rfu_set_zero: @ 800F814 - ldr r1, _0800F81C + ldr r1, =0x03005000 movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_0800F81C: .4byte 0x03005000 + .pool thumb_func_end Rfu_set_zero thumb_func_start sub_800F820 @@ -32834,35 +32073,33 @@ sub_800F820: @ 800F820 cmp r0, 0 bne _0800F83C bl sub_8082D18 - ldr r1, _0800F848 + ldr r1, =0x03003110 strh r0, [r1, 0xC] _0800F83C: - ldr r1, _0800F84C + ldr r1, =0x020223c0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0800F848: .4byte 0x03003110 -_0800F84C: .4byte 0x020223c0 + .pool thumb_func_end sub_800F820 thumb_func_start sub_800F850 sub_800F850: @ 800F850 push {lr} - ldr r1, _0800F864 + ldr r1, =0x03005000 ldr r0, [r1] cmp r0, 0 bne _0800F85E - ldr r0, _0800F868 + ldr r0, =sub_800F820 + 1 str r0, [r1] _0800F85E: pop {r0} bx r0 .align 2, 0 -_0800F864: .4byte 0x03005000 -_0800F868: .4byte sub_800F820 + 1 + .pool thumb_func_end sub_800F850 thumb_func_start sub_800F86C @@ -32877,7 +32114,7 @@ sub_800F86C: @ 800F86C _0800F87A: mov r1, r8 lsls r0, r1, 4 - ldr r2, _0800F8C0 + ldr r2, =0x03003090 adds r1, r0, r2 ldrh r7, [r1] movs r3, 0xFF @@ -32913,7 +32150,7 @@ _0800F8B2: _0800F8BC: b _0800FC04 .align 2, 0 -_0800F8C0: .4byte 0x03003090 + .pool _0800F8C4: movs r0, 0xEE lsls r0, 7 @@ -32959,17 +32196,17 @@ _0800F902: _0800F90C: b _0800FC04 _0800F90E: - ldr r4, _0800F948 + ldr r4, =0x03005000 ldrb r0, [r4, 0xC] cmp r0, 0 bne _0800F920 - ldr r0, _0800F94C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0800F920 b _0800FC50 _0800F920: - ldr r0, _0800F950 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] mov r6, r8 @@ -32978,26 +32215,21 @@ _0800F920: beq _0800F930 b _0800FC08 _0800F930: - ldr r1, _0800F954 + ldr r1, =0x03003092 adds r0, r5, r1 ldrh r0, [r0] - ldr r2, _0800F948 + ldr r2, =0x03005000 strb r0, [r2, 0xD] - ldr r3, _0800F958 + ldr r3, =0x03003094 adds r0, r5, r3 bl sub_800F74C - ldr r4, _0800F95C + ldr r4, =0x03005cce strb r0, [r4] b _0800FC08 .align 2, 0 -_0800F948: .4byte 0x03005000 -_0800F94C: .4byte 0x03003124 -_0800F950: .4byte 0x03007890 -_0800F954: .4byte 0x03003092 -_0800F958: .4byte 0x03003094 -_0800F95C: .4byte 0x03005cce + .pool _0800F960: - ldr r0, _0800F9BC + ldr r0, =0x03005000 mov r9, r0 mov r1, r8 lsls r0, r1, 2 @@ -33019,13 +32251,13 @@ _0800F982: adds r0, 0x80 movs r2, 0 strh r4, [r0] - ldr r1, _0800F9C0 + ldr r1, =0x03003092 adds r0, r5, r1 ldrh r0, [r0] adds r1, r3, 0 adds r1, 0x82 strh r0, [r1] - ldr r1, _0800F9C4 + ldr r1, =0x03003094 adds r0, r5, r1 ldrh r1, [r0] adds r0, r3, 0 @@ -33044,11 +32276,9 @@ _0800F982: strb r2, [r0] b _0800FC08 .align 2, 0 -_0800F9BC: .4byte 0x03005000 -_0800F9C0: .4byte 0x03003092 -_0800F9C4: .4byte 0x03003094 + .pool _0800F9C8: - ldr r4, _0800FA98 + ldr r4, =0x03005000 mov r9, r4 mov r0, r8 lsls r1, r0, 2 @@ -33078,7 +32308,7 @@ _0800F9EA: orrs r0, r3 str r0, [r1] movs r4, 0 - ldr r0, _0800FA9C + ldr r0, =0x020223c4 mov r9, r0 mov r12, r2 mov r1, r8 @@ -33097,7 +32327,7 @@ _0800FA0E: adds r2, r4, 0x1 lsls r0, r2, 1 adds r0, r3 - ldr r4, _0800FAA0 + ldr r4, =0x03003090 adds r0, r4 ldrh r0, [r0] strh r0, [r1] @@ -33105,7 +32335,7 @@ _0800FA0E: lsrs r4, r2, 16 cmp r4, 0x5 bls _0800FA0E - ldr r4, _0800FA98 + ldr r4, =0x03005000 mov r0, r10 add r0, r8 lsls r0, 2 @@ -33117,7 +32347,7 @@ _0800FA0E: adds r0, 0x82 ldrh r0, [r0] lsls r0, 2 - ldr r3, _0800FAA4 + ldr r3, =0x082ed628 adds r0, r3 ldr r1, [r1] ldr r0, [r0] @@ -33141,7 +32371,7 @@ _0800FA5C: beq _0800FA7E b _0800FC08 _0800FA7E: - ldr r0, _0800FAA8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0800FA88 @@ -33152,18 +32382,14 @@ _0800FA88: beq _0800FA90 b _0800FC08 _0800FA90: - ldr r0, _0800FA9C + ldr r0, =0x020223c4 bl sub_8010A70 b _0800FC08 .align 2, 0 -_0800FA98: .4byte 0x03005000 -_0800FA9C: .4byte 0x020223c4 -_0800FAA0: .4byte 0x03003090 -_0800FAA4: .4byte 0x082ed628 -_0800FAA8: .4byte 0x03003124 + .pool _0800FAAC: - ldr r2, _0800FAC8 - ldr r3, _0800FACC + ldr r2, =0x082ed6b8 + ldr r3, =0x03003092 adds r0, r5, r3 ldrh r1, [r0] lsls r1, 3 @@ -33175,22 +32401,21 @@ _0800FAAC: bl sub_800FE84 b _0800FC04 .align 2, 0 -_0800FAC8: .4byte 0x082ed6b8 -_0800FACC: .4byte 0x03003092 + .pool _0800FAD0: - ldr r1, _0800FADC + ldr r1, =0x030050e4 add r1, r8 movs r0, 0x1 strb r0, [r1] b _0800FC04 .align 2, 0 -_0800FADC: .4byte 0x030050e4 + .pool _0800FAE0: - ldr r2, _0800FB08 + ldr r2, =0x03005000 movs r4, 0x80 lsls r4, 1 adds r0, r2, r4 - ldr r3, _0800FB0C + ldr r3, =0x03003092 adds r1, r5, r3 ldrh r0, [r0] mov r6, r8 @@ -33207,23 +32432,22 @@ _0800FAFA: strb r1, [r0] b _0800FC08 .align 2, 0 -_0800FB08: .4byte 0x03005000 -_0800FB0C: .4byte 0x03003092 + .pool _0800FB10: - ldr r7, _0800FB5C + ldr r7, =0x03005000 ldrb r2, [r7, 0xC] cmp r2, 0 bne _0800FB78 - ldr r3, _0800FB60 + ldr r3, =0x03003124 ldrb r0, [r3] mov r6, r8 adds r6, 0x1 cmp r0, 0 beq _0800FC08 - ldr r0, _0800FB64 + ldr r0, =0x03003092 adds r4, r5, r0 ldrh r1, [r4] - ldr r0, _0800FB68 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0, 0x2] ands r1, r0 @@ -33231,14 +32455,14 @@ _0800FB10: beq _0800FB48 strb r2, [r3] bl sub_800D630 - ldr r1, _0800FB6C + ldr r1, =0x03003094 adds r0, r5, r1 ldrh r1, [r0] - ldr r2, _0800FB70 + ldr r2, =0x00000ce4 adds r0, r7, r2 strb r1, [r0] _0800FB48: - ldr r0, _0800FB74 + ldr r0, =0x03003090 adds r0, 0x6 adds r0, r5, r0 ldrh r0, [r0] @@ -33247,73 +32471,60 @@ _0800FB48: bl sub_80109E8 b _0800FC08 .align 2, 0 -_0800FB5C: .4byte 0x03005000 -_0800FB60: .4byte 0x03003124 -_0800FB64: .4byte 0x03003092 -_0800FB68: .4byte 0x03007890 -_0800FB6C: .4byte 0x03003094 -_0800FB70: .4byte 0x00000ce4 -_0800FB74: .4byte 0x03003090 + .pool _0800FB78: movs r0, 0xEE lsls r0, 8 bl sub_800FD14 - ldr r1, _0800FBA0 - ldr r3, _0800FBA4 + ldr r1, =0x03003110 + ldr r3, =0x03003092 adds r0, r5, r3 ldrh r0, [r0] strh r0, [r1, 0x2] - ldr r4, _0800FBA8 + ldr r4, =0x03003094 adds r0, r5, r4 ldrh r0, [r0] strh r0, [r1, 0x4] - ldr r0, _0800FBAC + ldr r0, =0x03003090 adds r0, 0x6 adds r0, r5, r0 ldrh r0, [r0] strh r0, [r1, 0x6] b _0800FC04 .align 2, 0 -_0800FBA0: .4byte 0x03003110 -_0800FBA4: .4byte 0x03003092 -_0800FBA8: .4byte 0x03003094 -_0800FBAC: .4byte 0x03003090 + .pool _0800FBB0: - ldr r4, _0800FBE0 + ldr r4, =0x03005000 ldrb r0, [r4, 0xC] mov r6, r8 adds r6, 0x1 cmp r0, 0x1 bne _0800FC44 - ldr r0, _0800FBE4 + ldr r0, =0x00000ce3 adds r2, r4, r0 - ldr r1, _0800FBE8 + ldr r1, =0x03003092 adds r3, r5, r1 ldrb r1, [r3] ldrb r0, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _0800FBEC + ldr r2, =0x03003094 adds r0, r5, r2 ldrh r1, [r0] - ldr r2, _0800FBF0 + ldr r2, =0x00000ce4 adds r0, r4, r2 strb r1, [r0] ldrh r0, [r3] bl sub_80109E8 b _0800FC08 .align 2, 0 -_0800FBE0: .4byte 0x03005000 -_0800FBE4: .4byte 0x00000ce3 -_0800FBE8: .4byte 0x03003092 -_0800FBEC: .4byte 0x03003094 -_0800FBF0: .4byte 0x00000ce4 + .pool _0800FBF4: - ldr r0, _0800FC34 + ldr r0, =0x03003020 mov r3, r8 lsls r1, r3, 1 adds r1, r0 - ldr r4, _0800FC38 + ldr r4, =0x03003092 adds r0, r5, r4 ldrh r0, [r0] strh r0, [r1] @@ -33321,7 +32532,7 @@ _0800FC04: mov r6, r8 adds r6, 0x1 _0800FC08: - ldr r3, _0800FC3C + ldr r3, =0x03005000 ldrb r4, [r3, 0xC] cmp r4, 0x1 bne _0800FC44 @@ -33343,9 +32554,7 @@ _0800FC08: strb r1, [r2] b _0800FC44 .align 2, 0 -_0800FC34: .4byte 0x03003020 -_0800FC38: .4byte 0x03003092 -_0800FC3C: .4byte 0x03005000 + .pool _0800FC40: adds r0, 0x1 strb r0, [r2] @@ -33370,7 +32579,7 @@ _0800FC50: sub_800FC60: @ 800FC60 push {lr} movs r2, 0 - ldr r0, _0800FC74 + ldr r0, =0x03005000 adds r1, r0, 0 adds r1, 0x92 _0800FC6A: @@ -33380,7 +32589,7 @@ _0800FC6A: movs r0, 0 b _0800FC82 .align 2, 0 -_0800FC74: .4byte 0x03005000 + .pool _0800FC78: adds r1, 0x14 adds r2, 0x1 @@ -33396,7 +32605,7 @@ _0800FC82: sub_800FC88: @ 800FC88 push {r4,lr} movs r1, 0 - ldr r2, _0800FCB0 + ldr r2, =0x03005000 ldrb r0, [r2, 0xD] cmp r1, r0 bge _0800FCBC @@ -33416,7 +32625,7 @@ _0800FCAA: movs r0, 0 b _0800FCBE .align 2, 0 -_0800FCB0: .4byte 0x03005000 + .pool _0800FCB4: adds r3, 0x14 adds r1, 0x1 @@ -33449,7 +32658,7 @@ sub_800FCD8: @ 800FCD8 push {r4,lr} movs r2, 0 movs r1, 0 - ldr r0, _0800FD10 + ldr r0, =0x03005000 adds r3, r0, 0 adds r3, 0x92 adds r4, r0, 0 @@ -33476,7 +32685,7 @@ _0800FCFE: pop {r1} bx r1 .align 2, 0 -_0800FD10: .4byte 0x03005000 + .pool thumb_func_end sub_800FCD8 thumb_func_start sub_800FD14 @@ -33484,7 +32693,7 @@ sub_800FD14: @ 800FD14 push {r4,r5,lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r5, _0800FD4C + ldr r5, =0x03003110 strh r1, [r5] movs r0, 0xF0 lsls r0, 7 @@ -33509,7 +32718,7 @@ sub_800FD14: @ 800FD14 beq _0800FE14 b _0800FE46 .align 2, 0 -_0800FD4C: .4byte 0x03003110 + .pool _0800FD50: movs r0, 0xCC lsls r0, 7 @@ -33537,7 +32746,7 @@ _0800FD62: beq _0800FD98 b _0800FE46 _0800FD80: - ldr r0, _0800FD94 + ldr r0, =0x03005000 adds r1, r0, 0 adds r1, 0x6E ldrh r1, [r1] @@ -33548,28 +32757,28 @@ _0800FD80: strh r0, [r5, 0x4] b _0800FE46 .align 2, 0 -_0800FD94: .4byte 0x03005000 + .pool _0800FD98: bl sub_800FC60 lsls r0, 24 cmp r0, 0 beq _0800FE46 - ldr r0, _0800FDAC + ldr r0, =0x03005000 adds r0, 0x5A ldrb r0, [r0] b _0800FE44 .align 2, 0 -_0800FDAC: .4byte 0x03005000 + .pool _0800FDB0: - ldr r3, _0800FDEC - ldr r1, _0800FDF0 + ldr r3, =0x03005000 + ldr r1, =0x00000ce2 adds r0, r3, r1 - ldr r2, _0800FDF4 + ldr r2, =0x00000ce3 adds r1, r3, r2 ldrb r2, [r0] ldrb r0, [r1] eors r0, r2 - ldr r1, _0800FDF8 + ldr r1, =0x082ed695 adds r0, r1 ldrb r0, [r0] adds r0, 0x1 @@ -33578,7 +32787,7 @@ _0800FDB0: strh r0, [r4, 0x2] adds r2, r4, 0x4 movs r4, 0 - ldr r0, _0800FDFC + ldr r0, =0x00000cde adds r3, r0 _0800FDD6: adds r1, r2, r4 @@ -33592,13 +32801,9 @@ _0800FDD6: bls _0800FDD6 b _0800FE46 .align 2, 0 -_0800FDEC: .4byte 0x03005000 -_0800FDF0: .4byte 0x00000ce2 -_0800FDF4: .4byte 0x00000ce3 -_0800FDF8: .4byte 0x082ed695 -_0800FDFC: .4byte 0x00000cde + .pool _0800FE00: - ldr r0, _0800FE10 + ldr r0, =0x03005000 movs r1, 0x80 lsls r1, 1 adds r0, r1 @@ -33606,17 +32811,17 @@ _0800FE00: strh r0, [r4, 0x2] b _0800FE46 .align 2, 0 -_0800FE10: .4byte 0x03005000 + .pool _0800FE14: strh r1, [r5] - ldr r0, _0800FE1C + ldr r0, =0x030022c0 ldrh r0, [r0, 0x2C] b _0800FE44 .align 2, 0 -_0800FE1C: .4byte 0x030022c0 + .pool _0800FE20: movs r4, 0 - ldr r3, _0800FE3C + ldr r3, =0x030050f2 _0800FE24: adds r2, r4, 0x1 lsls r1, r2, 1 @@ -33631,9 +32836,9 @@ _0800FE24: bls _0800FE24 b _0800FE46 .align 2, 0 -_0800FE3C: .4byte 0x030050f2 + .pool _0800FE40: - ldr r0, _0800FE4C + ldr r0, =0x03005da8 ldrh r0, [r0] _0800FE44: strh r0, [r5, 0x2] @@ -33642,21 +32847,21 @@ _0800FE46: pop {r0} bx r0 .align 2, 0 -_0800FE4C: .4byte 0x03005da8 + .pool thumb_func_end sub_800FD14 thumb_func_start sub_800FE50 sub_800FE50: @ 800FE50 push {r4,lr} adds r4, r0, 0 - ldr r0, _0800FE7C + ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 bne _0800FE76 bl sub_8011A80 cmp r0, 0 bne _0800FE76 - ldr r0, _0800FE80 + ldr r0, =0x030050f2 adds r1, r4, 0 movs r2, 0xC bl memcpy @@ -33668,8 +32873,7 @@ _0800FE76: pop {r0} bx r0 .align 2, 0 -_0800FE7C: .4byte 0x03003110 -_0800FE80: .4byte 0x030050f2 + .pool thumb_func_end sub_800FE50 thumb_func_start sub_800FE84 @@ -33680,11 +32884,11 @@ sub_800FE84: @ 800FE84 push {r6,r7} adds r7, r0, 0 adds r6, r1, 0 - ldr r5, _0800FEBC + ldr r5, =0x03005000 ldr r0, [r5] cmp r0, 0 bne _0800FEB8 - ldr r0, _0800FEC0 + ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 bne _0800FEB8 @@ -33695,7 +32899,7 @@ sub_800FE84: @ 800FE84 mov r8, r1 cmp r1, 0 beq _0800FEC8 - ldr r1, _0800FEC4 + ldr r1, =0x02022b44 adds r1, 0x83 ldrb r0, [r1] adds r0, 0x1 @@ -33704,9 +32908,7 @@ _0800FEB8: movs r0, 0 b _0800FF32 .align 2, 0 -_0800FEBC: .4byte 0x03005000 -_0800FEC0: .4byte 0x03003110 -_0800FEC4: .4byte 0x02022b44 + .pool _0800FEC8: adds r0, r6, 0 movs r1, 0xC @@ -33739,7 +32941,7 @@ _0800FEC8: str r7, [r5, 0x70] b _0800FF1C _0800FF0A: - ldr r4, _0800FF40 + ldr r4, =0x020228c4 cmp r7, r4 beq _0800FF1A adds r0, r4, 0 @@ -33752,8 +32954,8 @@ _0800FF1C: movs r0, 0x88 lsls r0, 8 bl sub_800FD14 - ldr r0, _0800FF44 - ldr r1, _0800FF48 + ldr r0, =0x03005000 + ldr r1, =rfufunc_80F9F44 + 1 str r1, [r0] adds r0, 0x5B movs r1, 0 @@ -33767,15 +32969,13 @@ _0800FF32: pop {r1} bx r1 .align 2, 0 -_0800FF40: .4byte 0x020228c4 -_0800FF44: .4byte 0x03005000 -_0800FF48: .4byte rfufunc_80F9F44 + 1 + .pool thumb_func_end sub_800FE84 thumb_func_start rfufunc_80F9F44 rfufunc_80F9F44: @ 800FF4C push {r4,r5,lr} - ldr r0, _0800FF7C + ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 bne _0800FFA0 @@ -33783,7 +32983,7 @@ rfufunc_80F9F44: @ 800FF4C lsls r5, 8 adds r0, r5, 0 bl sub_800FD14 - ldr r4, _0800FF80 + ldr r4, =0x03005000 ldrb r0, [r4, 0xC] cmp r0, 0x1 bne _0800FF84 @@ -33798,11 +32998,10 @@ rfufunc_80F9F44: @ 800FF4C bls _0800FFA0 b _0800FF9C .align 2, 0 -_0800FF7C: .4byte 0x03003110 -_0800FF80: .4byte 0x03005000 + .pool _0800FF84: bl link_get_multiplayer_id - ldr r1, _0800FFA8 + ldr r1, =0x03003090 lsls r0, 24 lsrs r0, 20 adds r0, r1 @@ -33813,24 +33012,23 @@ _0800FF84: cmp r0, r5 bne _0800FFA0 _0800FF9C: - ldr r0, _0800FFAC + ldr r0, =sub_800FFB0 + 1 str r0, [r4] _0800FFA0: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0800FFA8: .4byte 0x03003090 -_0800FFAC: .4byte sub_800FFB0 + 1 + .pool thumb_func_end rfufunc_80F9F44 thumb_func_start sub_800FFB0 sub_800FFB0: @ 800FFB0 push {r4-r6,lr} - ldr r0, _0801001C + ldr r0, =0x03005000 mov r12, r0 ldr r5, [r0, 0x70] - ldr r3, _08010020 + ldr r3, =0x03003110 mov r2, r12 adds r2, 0x6C ldrh r1, [r2] @@ -33874,7 +33072,7 @@ _0800FFD0: adds r0, 0x7C movs r1, 0 strb r1, [r0] - ldr r0, _08010024 + ldr r0, =rfufunc_80FA020 + 1 mov r1, r12 str r0, [r1] _08010014: @@ -33882,9 +33080,7 @@ _08010014: pop {r0} bx r0 .align 2, 0 -_0801001C: .4byte 0x03005000 -_08010020: .4byte 0x03003110 -_08010024: .4byte rfufunc_80FA020 + 1 + .pool thumb_func_end sub_800FFB0 thumb_func_start rfufunc_80FA020 @@ -33893,7 +33089,7 @@ rfufunc_80FA020: @ 8010028 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r5, _080100D0 + ldr r5, =0x03005000 ldr r0, [r5, 0x70] mov r8, r0 bl link_get_multiplayer_id @@ -33902,18 +33098,18 @@ rfufunc_80FA020: @ 8010028 ldrb r0, [r5, 0xC] cmp r0, 0 bne _080100F0 - ldr r3, _080100D4 + ldr r3, =0x03003110 adds r2, r5, 0 adds r2, 0x6E ldrh r0, [r2] subs r0, 0x1 - ldr r4, _080100D8 + ldr r4, =0xffff8900 adds r1, r4, 0 orrs r0, r1 strh r0, [r3] movs r4, 0 mov r9, r5 - ldr r0, _080100DC + ldr r0, =0x03003090 mov r12, r0 lsls r5, r6, 4 adds r7, r2, 0 @@ -33954,7 +33150,7 @@ _08010064: adds r1, r3, 0 adds r1, 0x88 adds r1, r0, r1 - ldr r2, _080100E0 + ldr r2, =0x082ed628 adds r0, r3 adds r0, 0x82 ldrh r0, [r0] @@ -33966,19 +33162,14 @@ _08010064: beq _080100E8 adds r0, r6, 0 bl sub_800F638 - ldr r1, _080100E4 + ldr r1, =0x02022b44 adds r1, 0x64 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _080100F4 .align 2, 0 -_080100D0: .4byte 0x03005000 -_080100D4: .4byte 0x03003110 -_080100D8: .4byte 0xffff8900 -_080100DC: .4byte 0x03003090 -_080100E0: .4byte 0x082ed628 -_080100E4: .4byte 0x02022b44 + .pool _080100E8: movs r0, 0 mov r4, r9 @@ -33999,7 +33190,7 @@ _080100F4: thumb_func_start sub_8010100 sub_8010100: @ 8010100 push {lr} - ldr r1, _08010118 + ldr r1, =0x03005000 adds r1, 0x5A strb r0, [r1] movs r0, 0xA1 @@ -34009,7 +33200,7 @@ sub_8010100: @ 8010100 pop {r1} bx r1 .align 2, 0 -_08010118: .4byte 0x03005000 + .pool thumb_func_end sub_8010100 thumb_func_start sub_801011C @@ -34017,10 +33208,10 @@ sub_801011C: @ 801011C push {lr} bl rfu_clearAllSlot bl sub_800C048 - ldr r1, _08010140 + ldr r1, =0x03003124 movs r0, 0 strb r0, [r1] - ldr r2, _08010144 + ldr r2, =0x03005000 adds r3, r2, 0 adds r3, 0xEF movs r1, 0 @@ -34030,14 +33221,13 @@ sub_801011C: @ 801011C pop {r0} bx r0 .align 2, 0 -_08010140: .4byte 0x03003124 -_08010144: .4byte 0x03005000 + .pool thumb_func_end sub_801011C thumb_func_start sub_8010148 sub_8010148: @ 8010148 push {lr} - ldr r0, _08010164 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r1, [r0, 0x2] ldrb r0, [r0, 0x3] @@ -34048,66 +33238,62 @@ sub_8010148: @ 8010148 pop {r0} bx r0 .align 2, 0 -_08010164: .4byte 0x03007890 + .pool thumb_func_end sub_8010148 thumb_func_start sub_8010168 sub_8010168: @ 8010168 push {r4,lr} - ldr r4, _08010180 + ldr r4, =0x03005000 ldrb r0, [r4, 0xC] cmp r0, 0 bne _08010188 bl sub_800D630 - ldr r0, _08010184 + ldr r0, =0x00000ce4 adds r1, r4, r0 movs r0, 0x2 strb r0, [r1] b _0801018C .align 2, 0 -_08010180: .4byte 0x03005000 -_08010184: .4byte 0x00000ce4 + .pool _08010188: - ldr r0, _08010194 + ldr r0, =sub_8010148 + 1 str r0, [r4] _0801018C: pop {r4} pop {r0} bx r0 .align 2, 0 -_08010194: .4byte sub_8010148 + 1 + .pool thumb_func_end sub_8010168 thumb_func_start sub_8010198 sub_8010198: @ 8010198 push {lr} bl sub_800D630 - ldr r2, _080101BC - ldr r0, _080101C0 + ldr r2, =0x03005000 + ldr r0, =0x00000ce4 adds r1, r2, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, _080101C4 + ldr r0, =0x03007890 ldr r1, [r0] ldrb r0, [r1, 0x2] ldrb r1, [r1, 0x3] orrs r0, r1 - ldr r1, _080101C8 + ldr r1, =0x00000ce3 adds r2, r1 strb r0, [r2] pop {r0} bx r0 .align 2, 0 -_080101BC: .4byte 0x03005000 -_080101C0: .4byte 0x00000ce4 -_080101C4: .4byte 0x03007890 -_080101C8: .4byte 0x00000ce3 + .pool thumb_func_end sub_8010198 thumb_func_start sub_80101CC sub_80101CC: @ 80101CC push {r4,r5,lr} - ldr r0, _08010214 + ldr r0, =0x03005000 ldrb r5, [r0, 0xD] movs r2, 0 movs r1, 0 @@ -34126,7 +33312,7 @@ _080101E6: ble _080101DC cmp r2, r5 bne _08010220 - ldr r2, _08010218 + ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x21 negs r1, r1 @@ -34143,28 +33329,27 @@ _080101E6: bl sub_8010168 b _08010220 .align 2, 0 -_08010214: .4byte 0x03005000 -_08010218: .4byte 0x02022fec + .pool _0801021C: - ldr r0, _08010228 + ldr r0, =sub_8010168 + 1 str r0, [r3] _08010220: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08010228: .4byte sub_8010168 + 1 + .pool thumb_func_end sub_80101CC thumb_func_start sub_801022C sub_801022C: @ 801022C push {r4,lr} - ldr r0, _08010254 + ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 bne _0801024E - ldr r4, _08010258 - ldr r1, _0801025C + ldr r4, =0x03005000 + ldr r1, =0x00000ce8 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 @@ -34172,17 +33357,14 @@ sub_801022C: @ 801022C movs r0, 0xBE lsls r0, 7 bl sub_800FD14 - ldr r0, _08010260 + ldr r0, =sub_80101CC + 1 str r0, [r4] _0801024E: pop {r4} pop {r0} bx r0 .align 2, 0 -_08010254: .4byte 0x03003110 -_08010258: .4byte 0x03005000 -_0801025C: .4byte 0x00000ce8 -_08010260: .4byte sub_80101CC + 1 + .pool thumb_func_end sub_801022C thumb_func_start sub_8010264 @@ -34190,15 +33372,15 @@ sub_8010264: @ 8010264 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _08010288 + ldr r2, =0x03005000 ldr r0, [r2] cmp r0, 0 bne _08010284 - ldr r1, _0801028C + ldr r1, =0x00000cd9 adds r0, r2, r1 movs r1, 0x1 strb r1, [r0] - ldr r0, _08010290 + ldr r0, =sub_801022C + 1 str r0, [r2] adds r0, r3, 0 bl remove_task @@ -34206,15 +33388,13 @@ _08010284: pop {r0} bx r0 .align 2, 0 -_08010288: .4byte 0x03005000 -_0801028C: .4byte 0x00000cd9 -_08010290: .4byte sub_801022C + 1 + .pool thumb_func_end sub_8010264 thumb_func_start task_add_05_task_del_08FA224_when_no_RfuFunc task_add_05_task_del_08FA224_when_no_RfuFunc: @ 8010294 push {r4,lr} - ldr r4, _080102B4 + ldr r4, =sub_8010264 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -34228,7 +33408,7 @@ _080102AC: pop {r0} bx r0 .align 2, 0 -_080102B4: .4byte sub_8010264 + 1 + .pool thumb_func_end task_add_05_task_del_08FA224_when_no_RfuFunc thumb_func_start sub_80102B8 @@ -34238,8 +33418,8 @@ sub_80102B8: @ 80102B8 lsls r0, 24 cmp r0, 0 beq _080102E6 - ldr r1, _08010350 - ldr r2, _08010354 + ldr r1, =0x03005000 + ldr r2, =0x000009e6 adds r0, r1, r2 ldrb r0, [r0] adds r4, r0, 0 @@ -34261,7 +33441,7 @@ _080102E6: movs r1, 0 cmp r1, r2 bcs _08010312 - ldr r0, _08010350 + ldr r0, =0x03005000 adds r3, r0, 0 adds r3, 0xE9 ldrb r0, [r3] @@ -34278,7 +33458,7 @@ _08010300: cmp r0, 0 bne _08010300 _08010312: - ldr r4, _08010350 + ldr r4, =0x03005000 cmp r1, r2 bne _0801033E movs r1, 0 @@ -34311,37 +33491,33 @@ _0801033E: pop {r0} bx r0 .align 2, 0 -_08010350: .4byte 0x03005000 -_08010354: .4byte 0x000009e6 + .pool thumb_func_end sub_80102B8 thumb_func_start sub_8010358 sub_8010358: @ 8010358 push {r4,lr} - ldr r4, _08010380 - ldr r1, _08010384 + ldr r4, =0x03005000 + ldr r1, =0x000009e6 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 bne _0801037A - ldr r0, _08010388 + ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 bne _0801037A movs r0, 0xCC lsls r0, 7 bl sub_800FD14 - ldr r0, _0801038C + ldr r0, =sub_80102B8 + 1 str r0, [r4] _0801037A: pop {r4} pop {r0} bx r0 .align 2, 0 -_08010380: .4byte 0x03005000 -_08010384: .4byte 0x000009e6 -_08010388: .4byte 0x03003110 -_0801038C: .4byte sub_80102B8 + 1 + .pool thumb_func_end sub_8010358 thumb_func_start sub_8010390 @@ -34351,26 +33527,23 @@ sub_8010390: @ 8010390 lsls r0, 24 cmp r0, 0 beq _080103CC - ldr r4, _080103BC - ldr r1, _080103C0 + ldr r4, =0x03005000 + ldr r1, =0x000009e6 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 bne _0801041E - ldr r0, _080103C4 + ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 bne _0801041E movs r0, 0xCC lsls r0, 7 bl sub_800FD14 - ldr r0, _080103C8 + ldr r0, =sub_80102B8 + 1 b _0801041C .align 2, 0 -_080103BC: .4byte 0x03005000 -_080103C0: .4byte 0x000009e6 -_080103C4: .4byte 0x03003110 -_080103C8: .4byte sub_80102B8 + 1 + .pool _080103CC: bl sub_8009FCC lsls r0, 24 @@ -34378,7 +33551,7 @@ _080103CC: movs r1, 0x1 cmp r1, r2 bcs _080103FA - ldr r3, _08010424 + ldr r3, =0x03005000 adds r0, r3, 0 adds r0, 0xEA ldrb r0, [r0] @@ -34398,20 +33571,20 @@ _080103E8: _080103FA: cmp r1, r2 bne _0801041E - ldr r4, _08010424 - ldr r1, _08010428 + ldr r4, =0x03005000 + ldr r1, =0x000009e6 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 bne _0801041E - ldr r0, _0801042C + ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 bne _0801041E movs r0, 0xCC lsls r0, 7 bl sub_800FD14 - ldr r0, _08010430 + ldr r0, =sub_8010358 + 1 _0801041C: str r0, [r4] _0801041E: @@ -34419,20 +33592,17 @@ _0801041E: pop {r0} bx r0 .align 2, 0 -_08010424: .4byte 0x03005000 -_08010428: .4byte 0x000009e6 -_0801042C: .4byte 0x03003110 -_08010430: .4byte sub_8010358 + 1 + .pool thumb_func_end sub_8010390 thumb_func_start sub_8010434 sub_8010434: @ 8010434 push {lr} - ldr r1, _0801044C + ldr r1, =0x03005000 ldr r2, [r1] cmp r2, 0 bne _08010448 - ldr r0, _08010450 + ldr r0, =sub_8010390 + 1 str r0, [r1] adds r0, r1, 0 adds r0, 0xFE @@ -34441,19 +33611,18 @@ _08010448: pop {r0} bx r0 .align 2, 0 -_0801044C: .4byte 0x03005000 -_08010450: .4byte sub_8010390 + 1 + .pool thumb_func_end sub_8010434 thumb_func_start sub_8010454 sub_8010454: @ 8010454 push {r4,lr} adds r3, r0, 0 - ldr r1, _08010470 + ldr r1, =0x082ed6e0 ldrh r0, [r1] cmp r0, r3 beq _08010482 - ldr r4, _08010474 + ldr r4, =0x0000ffff adds r2, r1, 0 _08010464: ldrh r0, [r2] @@ -34462,8 +33631,7 @@ _08010464: movs r0, 0 b _08010484 .align 2, 0 -_08010470: .4byte 0x082ed6e0 -_08010474: .4byte 0x0000ffff + .pool _08010478: adds r1, 0x2 adds r2, 0x2 @@ -34503,8 +33671,8 @@ _080104AC: thumb_func_start sub_80104B0 sub_80104B0: @ 80104B0 push {lr} - ldr r0, _080104C8 - ldr r1, _080104CC + ldr r0, =0x03005000 + ldr r1, =0x00000cd9 adds r0, r1 movs r1, 0x1 strb r1, [r0] @@ -34513,24 +33681,22 @@ sub_80104B0: @ 80104B0 pop {r0} bx r0 .align 2, 0 -_080104C8: .4byte 0x03005000 -_080104CC: .4byte 0x00000cd9 + .pool thumb_func_end sub_80104B0 thumb_func_start rfu_get_multiplayer_id rfu_get_multiplayer_id: @ 80104D0 push {lr} - ldr r1, _080104E4 + ldr r1, =0x03005000 ldrb r0, [r1, 0xC] cmp r0, 0x1 beq _080104EC - ldr r2, _080104E8 + ldr r2, =0x00000cce adds r0, r1, r2 ldrb r0, [r0] b _080104EE .align 2, 0 -_080104E4: .4byte 0x03005000 -_080104E8: .4byte 0x00000cce + .pool _080104EC: movs r0, 0 _080104EE: @@ -34540,17 +33706,17 @@ _080104EE: thumb_func_start sub_80104F4 sub_80104F4: @ 80104F4 - ldr r0, _080104FC + ldr r0, =0x03005000 ldrb r0, [r0, 0xD] bx lr .align 2, 0 -_080104FC: .4byte 0x03005000 + .pool thumb_func_end sub_80104F4 thumb_func_start sub_8010500 sub_8010500: @ 8010500 push {lr} - ldr r2, _08010514 + ldr r2, =0x03005000 adds r0, r2, 0 adds r0, 0xF1 ldrb r0, [r0] @@ -34559,7 +33725,7 @@ sub_8010500: @ 8010500 movs r0, 0 b _08010524 .align 2, 0 -_08010514: .4byte 0x03005000 + .pool _08010518: movs r1, 0 ldr r0, [r2] @@ -34576,7 +33742,7 @@ _08010524: thumb_func_start sub_8010528 sub_8010528: @ 8010528 push {lr} - ldr r0, _0801053C + ldr r0, =0x03005000 ldr r0, [r0] cmp r0, 0 beq _08010536 @@ -34585,7 +33751,7 @@ _08010536: pop {r0} bx r0 .align 2, 0 -_0801053C: .4byte 0x03005000 + .pool thumb_func_end sub_8010528 thumb_func_start sub_8010540 @@ -34595,12 +33761,12 @@ sub_8010540: @ 8010540 push {r7} movs r7, 0 movs r5, 0 - ldr r6, _080105AC - ldr r0, _080105B0 + ldr r6, =0x03005000 + ldr r0, =0x00000c3e adds r0, r6 mov r8, r0 _08010552: - ldr r1, _080105B4 + ldr r1, =0x00000cd1 adds r0, r6, r1 adds r4, r5, r0 ldrb r0, [r4] @@ -34609,7 +33775,7 @@ _08010552: lsrs r0, 24 cmp r0, 0x1 bls _080105DA - ldr r1, _080105B8 + ldr r1, =0x03007880 lsls r0, r5, 2 adds r0, r1 ldr r0, [r0] @@ -34619,7 +33785,7 @@ _08010552: cmp r0, 0x48 bne _080105C0 _08010576: - ldr r2, _080105BC + ldr r2, =0x00000cd5 adds r0, r6, r2 adds r1, r5, r0 ldrb r0, [r1] @@ -34644,11 +33810,7 @@ _08010576: movs r7, 0x1 b _080105DA .align 2, 0 -_080105AC: .4byte 0x03005000 -_080105B0: .4byte 0x00000c3e -_080105B4: .4byte 0x00000cd1 -_080105B8: .4byte 0x03007880 -_080105BC: .4byte 0x00000cd5 + .pool _080105C0: mov r2, r8 ldrb r0, [r2] @@ -34679,7 +33841,7 @@ sub_80105EC: @ 80105EC push {r4-r6,lr} movs r3, 0 movs r1, 0 - ldr r5, _08010638 + ldr r5, =0x03005cd5 movs r6, 0x1 movs r4, 0 _080105F8: @@ -34704,7 +33866,7 @@ _0801060C: bl rfu_waitREQComplete _08010620: movs r1, 0 - ldr r2, _08010638 + ldr r2, =0x03005cd5 _08010624: adds r0, r1, r2 ldrb r0, [r0] @@ -34716,7 +33878,7 @@ _08010624: movs r0, 0x1 b _08010644 .align 2, 0 -_08010638: .4byte 0x03005cd5 + .pool _0801063C: adds r1, 0x1 cmp r1, 0x3 @@ -34741,8 +33903,8 @@ sub_801064C: @ 801064C lsrs r1, r0, 24 cmp r1, 0xFF beq _08010680 - ldr r0, _08010678 - ldr r2, _0801067C + ldr r0, =0x03005000 + ldr r2, =0x00000cd1 adds r0, r2 adds r0, r1, r0 ldrb r0, [r0] @@ -34751,8 +33913,7 @@ sub_801064C: @ 801064C movs r0, 0 b _08010682 .align 2, 0 -_08010678: .4byte 0x03005000 -_0801067C: .4byte 0x00000cd1 + .pool _08010680: movs r0, 0x1 _08010682: @@ -34773,8 +33934,8 @@ sub_8010688: @ 8010688 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _080106CC - ldr r0, _080106D0 + ldr r5, =0x03005000 + ldr r0, =0x00000cd1 adds r5, r0 adds r5, r4, r5 strb r6, [r5] @@ -34793,19 +33954,18 @@ sub_8010688: @ 8010688 pop {r0} bx r0 .align 2, 0 -_080106CC: .4byte 0x03005000 -_080106D0: .4byte 0x00000cd1 + .pool thumb_func_end sub_8010688 thumb_func_start sub_80106D4 sub_80106D4: @ 80106D4 push {r4,r5,lr} - ldr r4, _08010708 - ldr r0, _0801070C + ldr r4, =0x03005000 + ldr r0, =0x00000c85 adds r5, r4, r0 movs r0, 0x8 strb r0, [r5] - ldr r0, _08010710 + ldr r0, =0x00000c3e adds r4, r0 ldrb r1, [r4] movs r0, 0x4 @@ -34823,9 +33983,7 @@ sub_80106D4: @ 80106D4 pop {r0} bx r0 .align 2, 0 -_08010708: .4byte 0x03005000 -_0801070C: .4byte 0x00000c85 -_08010710: .4byte 0x00000c3e + .pool thumb_func_end sub_80106D4 thumb_func_start sub_8010714 @@ -34844,7 +34002,7 @@ sub_8010714: @ 8010714 movs r0, 0x2 b _0801074A _08010730: - ldr r1, _08010744 + ldr r1, =0x03007880 lsls r0, 2 adds r0, r1 ldr r0, [r0] @@ -34854,7 +34012,7 @@ _08010730: movs r0, 0 b _0801074A .align 2, 0 -_08010744: .4byte 0x03007880 + .pool _08010748: movs r0, 0x1 _0801074A: @@ -34867,11 +34025,11 @@ sub_8010750: @ 8010750 push {r4,r5,lr} bl sub_8010540 movs r4, 0 - ldr r0, _08010794 - ldr r1, _08010798 + ldr r0, =0x03005000 + ldr r1, =0x00000cd5 adds r5, r0, r1 _0801075E: - ldr r1, _0801079C + ldr r1, =0x03007880 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] @@ -34900,23 +34058,21 @@ _08010788: pop {r0} bx r0 .align 2, 0 -_08010794: .4byte 0x03005000 -_08010798: .4byte 0x00000cd5 -_0801079C: .4byte 0x03007880 + .pool thumb_func_end sub_8010750 thumb_func_start sub_80107A0 sub_80107A0: @ 80107A0 push {r4,r5,lr} movs r4, 0 - ldr r1, _08010818 - ldr r2, _0801081C + ldr r1, =0x03005000 + ldr r2, =0x00000c85 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x8 bne _080107DA - ldr r2, _08010820 - ldr r0, _08010824 + ldr r2, =0x03007880 + ldr r0, =0x00000c3e adds r1, r0 ldrb r0, [r1] lsls r0, 2 @@ -34937,9 +34093,9 @@ _080107D2: movs r0, 0x4 bl rfu_clearSlot _080107DA: - ldr r2, _08010820 - ldr r5, _08010818 - ldr r0, _08010824 + ldr r2, =0x03007880 + ldr r5, =0x03005000 + ldr r0, =0x00000c3e adds r1, r5, r0 ldrb r0, [r1] lsls r0, 2 @@ -34959,7 +34115,7 @@ _080107FE: ldrb r1, [r1] movs r0, 0x8 bl rfu_clearSlot - ldr r2, _08010828 + ldr r2, =0x00000c86 adds r4, r5, r2 ldrb r0, [r4] movs r1, 0 @@ -34967,11 +34123,7 @@ _080107FE: ldrb r4, [r4] b _08010844 .align 2, 0 -_08010818: .4byte 0x03005000 -_0801081C: .4byte 0x00000c85 -_08010820: .4byte 0x03007880 -_08010824: .4byte 0x00000c3e -_08010828: .4byte 0x00000c86 + .pool _0801082C: ldrb r0, [r1] lsls r0, 2 @@ -34996,7 +34148,7 @@ sub_801084C: @ 801084C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _08010898 + ldr r5, =0x03005000 adds r0, r5, 0 adds r0, 0xF1 ldrb r0, [r0] @@ -35005,14 +34157,14 @@ sub_801084C: @ 801084C lsrs r0, 24 cmp r0, 0x1 bhi _08010872 - ldr r0, _0801089C + ldr r0, =0x00000ce8 adds r1, r5, r0 movs r0, 0 strb r0, [r1] adds r0, r6, 0 bl remove_task _08010872: - ldr r2, _080108A0 + ldr r2, =0x03005e00 lsls r1, r6, 2 adds r0, r1, r6 lsls r0, 3 @@ -35032,9 +34184,7 @@ _08010872: beq _080108B6 b _080109D2 .align 2, 0 -_08010898: .4byte 0x03005000 -_0801089C: .4byte 0x00000ce8 -_080108A0: .4byte 0x03005e00 + .pool _080108A4: cmp r0, 0x5 beq _08010950 @@ -35059,7 +34209,7 @@ _080108CC: ldrb r0, [r5, 0xC] cmp r0, 0x1 bne _0801090C - ldr r0, _080108E4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080108E8 @@ -35068,13 +34218,13 @@ _080108CC: bl sub_800FD14 b _080108F0 .align 2, 0 -_080108E4: .4byte 0x03003124 + .pool _080108E8: movs r0, 0xEE lsls r0, 7 bl sub_800FD14 _080108F0: - ldr r0, _08010900 + ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -35082,9 +34232,9 @@ _080108F0: strh r0, [r1, 0x8] b _080109D2 .align 2, 0 -_08010900: .4byte 0x03005e00 + .pool _08010904: - ldr r0, _08010914 + ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 bne _080109D2 @@ -35093,7 +34243,7 @@ _0801090C: strh r0, [r4, 0x8] b _080109D2 .align 2, 0 -_08010914: .4byte 0x03003110 + .pool _08010918: ldrb r0, [r5, 0xD] b _08010944 @@ -35140,7 +34290,7 @@ _08010958: cmp r4, r2 blt _08010958 _0801096E: - ldr r0, _08010980 + ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -35149,14 +34299,14 @@ _0801096E: strh r0, [r1, 0x8] b _080109D2 .align 2, 0 -_08010980: .4byte 0x03005e00 + .pool _08010984: adds r0, r6, 0 bl remove_task - ldr r1, _080109D8 + ldr r1, =0x03003124 movs r0, 0x1 strb r0, [r1] - ldr r0, _080109DC + ldr r0, =0x00000ce8 adds r1, r5, r0 movs r0, 0 strb r0, [r1] @@ -35164,7 +34314,7 @@ _08010984: lsls r1, 2 movs r0, 0x1 bl sub_800D550 - ldr r2, _080109E0 + ldr r2, =0x00000ce6 adds r1, r5, r2 ldrb r0, [r1] cmp r0, 0 @@ -35172,7 +34322,7 @@ _08010984: movs r4, 0 adds r2, r1, 0 movs r3, 0x1 - ldr r0, _080109E4 + ldr r0, =0x00000ce5 adds r5, r0 _080109B6: ldrb r0, [r2] @@ -35195,10 +34345,7 @@ _080109D2: pop {r0} bx r0 .align 2, 0 -_080109D8: .4byte 0x03003124 -_080109DC: .4byte 0x00000ce8 -_080109E0: .4byte 0x00000ce6 -_080109E4: .4byte 0x00000ce5 + .pool thumb_func_end sub_801084C thumb_func_start sub_80109E8 @@ -35208,7 +34355,7 @@ sub_80109E8: @ 80109E8 lsrs r2, r0, 16 movs r1, 0 movs r5, 0x1 - ldr r4, _08010A10 + ldr r4, =0x03005cde movs r3, 0 _080109F6: adds r0, r2, 0 @@ -35226,18 +34373,18 @@ _08010A04: pop {r0} bx r0 .align 2, 0 -_08010A10: .4byte 0x03005cde + .pool thumb_func_end sub_80109E8 thumb_func_start sub_8010A14 sub_8010A14: @ 8010A14 push {r4-r7,lr} adds r2, r0, 0 - ldr r1, _08010A64 + ldr r1, =0x03005000 ldrb r0, [r2, 0xF] strb r0, [r1, 0xD] movs r4, 0 - ldr r0, _08010A68 + ldr r0, =0x00000cde adds r5, r1, r0 adds r3, r2, 0 adds r3, 0x10 @@ -35250,7 +34397,7 @@ _08010A28: cmp r4, 0x3 ble _08010A28 adds r6, r2, 0 - ldr r5, _08010A6C + ldr r5, =0x020229e8 movs r4, 0x4 _08010A3C: adds r0, r5, 0 @@ -35273,9 +34420,7 @@ _08010A3C: pop {r0} bx r0 .align 2, 0 -_08010A64: .4byte 0x03005000 -_08010A68: .4byte 0x00000cde -_08010A6C: .4byte 0x020229e8 + .pool thumb_func_end sub_8010A14 thumb_func_start sub_8010A70 @@ -35283,7 +34428,7 @@ sub_8010A70: @ 8010A70 push {r4,r5,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r0, _08010AA4 + ldr r0, =0x082ed7ec adds r1, r4, 0 bl strcmp adds r5, r0, 0 @@ -35293,7 +34438,7 @@ sub_8010A70: @ 8010A70 bl sub_8010A14 mov r0, sp strh r5, [r0] - ldr r2, _08010AA8 + ldr r2, =0x0100007e adds r1, r4, 0 bl CpuSet movs r0, 0 @@ -35304,8 +34449,7 @@ _08010A9C: pop {r0} bx r0 .align 2, 0 -_08010AA4: .4byte 0x082ed7ec -_08010AA8: .4byte 0x0100007e + .pool thumb_func_end sub_8010A70 thumb_func_start sub_8010AAC @@ -35314,13 +34458,13 @@ sub_8010AAC: @ 8010AAC sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r3, _08010B0C - ldr r2, _08010B10 - ldr r1, _08010B14 + ldr r3, =0x03005000 + ldr r2, =0x082ed68c + ldr r1, =0x00000ce9 adds r0, r3, r1 ldrb r1, [r0] adds r1, r2 - ldr r2, _08010B18 + ldr r2, =0x00000cde adds r0, r3, r2 ldrb r1, [r1] adds r0, r1 @@ -35333,14 +34477,14 @@ sub_8010AAC: @ 8010AAC lsrs r0, 24 cmp r0, 0x1 bhi _08010AE8 - ldr r5, _08010B1C + ldr r5, =0x00000ce8 adds r1, r3, r5 movs r0, 0 strb r0, [r1] adds r0, r6, 0 bl remove_task _08010AE8: - ldr r0, _08010B20 + ldr r0, =0x03005e00 lsls r2, r6, 2 adds r1, r2, r6 lsls r1, 3 @@ -35354,18 +34498,12 @@ _08010AE8: b _08010CF0 _08010B00: lsls r0, r1, 2 - ldr r1, _08010B24 + ldr r1, =_08010B28 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08010B0C: .4byte 0x03005000 -_08010B10: .4byte 0x082ed68c -_08010B14: .4byte 0x00000ce9 -_08010B18: .4byte 0x00000cde -_08010B1C: .4byte 0x00000ce8 -_08010B20: .4byte 0x03005e00 -_08010B24: .4byte _08010B28 + .pool .align 2, 0 _08010B28: .4byte _08010B40 @@ -35375,7 +34513,7 @@ _08010B28: .4byte _08010C0A .4byte _08010C94 _08010B40: - ldr r0, _08010B5C + ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 beq _08010B4A @@ -35388,9 +34526,9 @@ _08010B4A: bl sub_800FD14 b _08010C4A .align 2, 0 -_08010B5C: .4byte 0x03003110 + .pool _08010B60: - ldr r0, _08010B74 + ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 beq _08010B6A @@ -35401,7 +34539,7 @@ _08010B6A: adds r1, r3 b _08010C52 .align 2, 0 -_08010B74: .4byte 0x03003110 + .pool _08010B78: bl sub_800A550 lsls r0, 24 @@ -35416,9 +34554,9 @@ _08010B8C: adds r0, r4, 0 bl sub_800A5EC lsls r2, r4, 8 - ldr r0, _08010BB8 + ldr r0, =0x020223c4 adds r2, r0 - ldr r1, _08010BBC + ldr r1, =0x020229e8 lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -35434,25 +34572,24 @@ _08010B8C: bl sub_800B524 b _08010C4A .align 2, 0 -_08010BB8: .4byte 0x020223c4 -_08010BBC: .4byte 0x020229e8 + .pool _08010BC0: - ldr r5, _08010C5C + ldr r5, =0x020228c4 adds r1, r5, 0 - ldr r0, _08010C60 + ldr r0, =0x082ed7ec ldm r0!, {r2-r4} stm r1!, {r2-r4} ldrh r2, [r0] strh r2, [r1] ldrb r0, [r0, 0x2] strb r0, [r1, 0x2] - ldr r1, _08010C64 + ldr r1, =0x03005000 ldrb r0, [r1, 0xD] strb r0, [r5, 0xF] movs r2, 0 adds r4, r5, 0 adds r4, 0x10 - ldr r0, _08010C68 + ldr r0, =0x00000cde adds r3, r1, r0 _08010BE2: adds r0, r4, r2 @@ -35462,12 +34599,12 @@ _08010BE2: adds r2, 0x1 cmp r2, 0x3 ble _08010BE2 - ldr r1, _08010C6C + ldr r1, =0x020229e8 adds r0, r5, 0 adds r0, 0x14 movs r2, 0x8C bl memcpy - ldr r0, _08010C70 + ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -35475,16 +34612,16 @@ _08010BE2: adds r0, 0x1 strh r0, [r1, 0x8] _08010C0A: - ldr r5, _08010C5C - ldr r1, _08010C64 + ldr r5, =0x020228c4 + ldr r1, =0x03005000 ldrb r0, [r1, 0xD] strb r0, [r5, 0xF] movs r2, 0 - ldr r3, _08010C6C + ldr r3, =0x020229e8 mov r12, r3 adds r4, r5, 0 adds r4, 0x10 - ldr r0, _08010C68 + ldr r0, =0x00000cde adds r3, r1, r0 _08010C20: adds r0, r4, r2 @@ -35499,7 +34636,7 @@ _08010C20: mov r1, r12 movs r2, 0x8C bl memcpy - ldr r1, _08010C5C + ldr r1, =0x020228c4 movs r0, 0 movs r2, 0xA0 bl link_0800A448 @@ -35507,7 +34644,7 @@ _08010C20: cmp r0, 0 beq _08010CF0 _08010C4A: - ldr r0, _08010C70 + ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -35517,28 +34654,22 @@ _08010C52: strh r0, [r1, 0x8] b _08010CF0 .align 2, 0 -_08010C5C: .4byte 0x020228c4 -_08010C60: .4byte 0x082ed7ec -_08010C64: .4byte 0x03005000 -_08010C68: .4byte 0x00000cde -_08010C6C: .4byte 0x020229e8 -_08010C70: .4byte 0x03005e00 + .pool _08010C74: adds r0, r3, 0 lsls r0, r2 - ldr r2, _08010C8C + ldr r2, =0x00000ce5 adds r1, r5, r2 strb r0, [r1] ldrb r1, [r4] eors r0, r1 strb r0, [r4] - ldr r4, _08010C90 + ldr r4, =0x00000ce8 adds r0, r5, r4 strb r3, [r0] b _08010CEA .align 2, 0 -_08010C8C: .4byte 0x00000ce5 -_08010C90: .4byte 0x00000ce8 + .pool _08010C94: bl sub_800A520 lsls r0, 24 @@ -35552,16 +34683,16 @@ _08010C94: mov r0, sp movs r4, 0 strh r4, [r0] - ldr r1, _08010CF8 - ldr r2, _08010CFC + ldr r1, =0x020223c4 + ldr r2, =0x0100007e bl CpuSet movs r0, 0 bl sub_800A5EC - ldr r1, _08010D00 - ldr r5, _08010D04 + ldr r1, =0x03005000 + ldr r5, =0x00000ce8 adds r0, r1, r5 strb r4, [r0] - ldr r0, _08010D08 + ldr r0, =0x00000ce6 adds r3, r1, r0 ldrb r0, [r3] cmp r0, 0 @@ -35589,11 +34720,7 @@ _08010CF0: pop {r0} bx r0 .align 2, 0 -_08010CF8: .4byte 0x020223c4 -_08010CFC: .4byte 0x0100007e -_08010D00: .4byte 0x03005000 -_08010D04: .4byte 0x00000ce8 -_08010D08: .4byte 0x00000ce6 + .pool thumb_func_end sub_8010AAC thumb_func_start sub_8010D0C @@ -35601,7 +34728,7 @@ sub_8010D0C: @ 8010D0C push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _08010D48 + ldr r6, =0x03005000 adds r0, r6, 0 adds r0, 0xF1 ldrb r0, [r0] @@ -35613,7 +34740,7 @@ sub_8010D0C: @ 8010D0C adds r0, r5, 0 bl remove_task _08010D2A: - ldr r1, _08010D4C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -35628,8 +34755,7 @@ _08010D2A: beq _08010D56 b _08010DA6 .align 2, 0 -_08010D48: .4byte 0x03005000 -_08010D4C: .4byte 0x03005e00 + .pool _08010D50: cmp r0, 0x2 beq _08010D82 @@ -35639,13 +34765,13 @@ _08010D56: cmp r0, 0 beq _08010DA6 bl sub_800B348 - ldr r1, _08010D6C + ldr r1, =0x020228c4 movs r0, 0 movs r2, 0x3C bl link_0800A448 b _08010D7A .align 2, 0 -_08010D6C: .4byte 0x020228c4 + .pool _08010D70: bl sub_800A520 lsls r0, 24 @@ -35663,11 +34789,11 @@ _08010D82: ands r1, r0 cmp r1, 0 beq _08010DA6 - ldr r0, _08010DAC + ldr r0, =0x020223c4 bl sub_8010A14 movs r0, 0 bl sub_800A5EC - ldr r0, _08010DB0 + ldr r0, =0x03003124 strb r4, [r0] adds r0, r5, 0 bl remove_task @@ -35676,27 +34802,26 @@ _08010DA6: pop {r0} bx r0 .align 2, 0 -_08010DAC: .4byte 0x020223c4 -_08010DB0: .4byte 0x03003124 + .pool thumb_func_end sub_8010D0C thumb_func_start sub_8010DB4 sub_8010DB4: @ 8010DB4 push {r4-r7,lr} - ldr r0, _08010E3C + ldr r0, =0x03005000 adds r1, r0, 0 adds r1, 0xEE ldrb r1, [r1] adds r3, r0, 0 cmp r1, 0x1 bne _08010E5C - ldr r2, _08010E40 + ldr r2, =0x03004140 ldrb r0, [r2, 0x2] cmp r0, 0 bne _08010E5C - ldr r0, _08010E44 + ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, _08010E48 + ldr r0, =sub_8018438 + 1 cmp r1, r0 beq _08010DDE ldr r0, [r2, 0x3C] @@ -35704,16 +34829,16 @@ sub_8010DB4: @ 8010DB4 cmp r0, 0 beq _08010DE4 _08010DDE: - ldr r1, _08010E4C + ldr r1, =0x030030fc movs r0, 0x2 strb r0, [r1] _08010DE4: - ldr r4, _08010E50 + ldr r4, =c2_800ACD4 + 1 adds r0, r4, 0 bl set_callback2 - ldr r0, _08010E44 + ldr r0, =0x030022c0 str r4, [r0, 0x8] - ldr r5, _08010E3C + ldr r5, =0x03005000 ldrh r0, [r5, 0xA] lsls r4, r0, 16 ldrh r0, [r5, 0x10] @@ -35721,11 +34846,11 @@ _08010DE4: orrs r4, r0 ldrh r0, [r5, 0x12] orrs r4, r0 - ldr r1, _08010E54 + ldr r1, =0x000009e6 adds r0, r5, r1 ldrb r0, [r0] adds r7, r0, 0 - ldr r1, _08010E58 + ldr r1, =0x00000c1a adds r0, r5, r1 ldrb r0, [r0] adds r6, r0, 0 @@ -35749,27 +34874,20 @@ _08010E20: bl sub_80097E8 b _08010E8E .align 2, 0 -_08010E3C: .4byte 0x03005000 -_08010E40: .4byte 0x03004140 -_08010E44: .4byte 0x030022c0 -_08010E48: .4byte sub_8018438 + 1 -_08010E4C: .4byte 0x030030fc -_08010E50: .4byte c2_800ACD4 + 1 -_08010E54: .4byte 0x000009e6 -_08010E58: .4byte 0x00000c1a + .pool _08010E5C: - ldr r1, _08010E94 + ldr r1, =0x00000c1b adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0x1 beq _08010E70 - ldr r1, _08010E98 + ldr r1, =0x000009e7 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0x1 bne _08010E8E _08010E70: - ldr r0, _08010E9C + ldr r0, =0x03004140 ldrb r0, [r0, 0x2] cmp r0, 0 beq _08010E7C @@ -35787,15 +34905,13 @@ _08010E8E: pop {r0} bx r0 .align 2, 0 -_08010E94: .4byte 0x00000c1b -_08010E98: .4byte 0x000009e7 -_08010E9C: .4byte 0x03004140 + .pool thumb_func_end sub_8010DB4 thumb_func_start rfu_REQ_recvData_then_sendData rfu_REQ_recvData_then_sendData: @ 8010EA0 push {lr} - ldr r0, _08010EBC + ldr r0, =0x03004140 ldrb r0, [r0, 0x6] cmp r0, 0x1 bne _08010EB8 @@ -35807,15 +34923,15 @@ _08010EB8: pop {r0} bx r0 .align 2, 0 -_08010EBC: .4byte 0x03004140 + .pool thumb_func_end rfu_REQ_recvData_then_sendData thumb_func_start sub_8010EC0 sub_8010EC0: @ 8010EC0 push {r4,r5,lr} movs r5, 0 - ldr r4, _08010EF4 - ldr r1, _08010EF8 + ldr r4, =0x03005000 + ldr r1, =0x00000ccd adds r0, r4, r1 strb r5, [r0] bl GenerateRandomNumber2 @@ -35836,8 +34952,7 @@ sub_8010EC0: @ 8010EC0 beq _08010F08 b _08010F14 .align 2, 0 -_08010EF4: .4byte 0x03005000 -_08010EF8: .4byte 0x00000ccd + .pool _08010EFC: cmp r0, 0x2 beq _08010F10 @@ -35862,7 +34977,7 @@ _08010F14: sub_8010F1C: @ 8010F1C push {r4,lr} movs r4, 0 - ldr r1, _08010F44 + ldr r1, =0x03005000 adds r0, r1, 0 adds r0, 0xEF ldrb r0, [r0] @@ -35881,27 +34996,26 @@ _08010F3C: pop {r1} bx r1 .align 2, 0 -_08010F44: .4byte 0x03005000 + .pool thumb_func_end sub_8010F1C thumb_func_start sub_8010F48 sub_8010F48: @ 8010F48 push {lr} - ldr r0, _08010F58 - ldr r1, _08010F5C + ldr r0, =0x02022b22 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy pop {r0} bx r0 .align 2, 0 -_08010F58: .4byte 0x02022b22 -_08010F5C: .4byte 0x03005d90 + .pool thumb_func_end sub_8010F48 thumb_func_start sub_8010F60 sub_8010F60: @ 8010F60 push {r4,lr} - ldr r4, _08010F80 + ldr r4, =0x02022b14 adds r0, r4, 0 movs r1, 0 movs r2, 0xD @@ -35915,7 +35029,7 @@ sub_8010F60: @ 8010F60 pop {r0} bx r0 .align 2, 0 -_08010F80: .4byte 0x02022b14 + .pool thumb_func_end sub_8010F60 thumb_func_start sub_8010F84 @@ -35925,20 +35039,20 @@ sub_8010F84: @ 8010F84 adds r3, r1, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08010F9C + ldr r0, =0x02022b14 adds r1, r4, 0 bl sub_800DD94 pop {r4} pop {r0} bx r0 .align 2, 0 -_08010F9C: .4byte 0x02022b14 + .pool thumb_func_end sub_8010F84 thumb_func_start sub_8010FA0 sub_8010FA0: @ 8010FA0 push {r4,r5,lr} - ldr r5, _08010FC8 + ldr r5, =0x02022b14 movs r4, 0x1 ands r0, r4 lsls r0, 4 @@ -35958,24 +35072,24 @@ sub_8010FA0: @ 8010FA0 pop {r0} bx r0 .align 2, 0 -_08010FC8: .4byte 0x02022b14 + .pool thumb_func_end sub_8010FA0 thumb_func_start sub_8010FCC sub_8010FCC: @ 8010FCC push {r4,r5,lr} - ldr r5, _08011000 + ldr r5, =0x02022b14 lsls r0, 2 ldrb r4, [r5, 0x9] movs r3, 0x3 ands r3, r4 orrs r3, r0 strb r3, [r5, 0x9] - ldr r3, _08011004 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 ldrh r3, [r5, 0x8] - ldr r0, _08011008 + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r1 strh r0, [r5, 0x8] @@ -35989,16 +35103,14 @@ sub_8010FCC: @ 8010FCC pop {r0} bx r0 .align 2, 0 -_08011000: .4byte 0x02022b14 -_08011004: .4byte 0x000003ff -_08011008: .4byte 0xfffffc00 + .pool thumb_func_end sub_8010FCC thumb_func_start sub_801100C sub_801100C: @ 801100C push {r4,lr} movs r4, 0x80 - ldr r3, _08011038 + ldr r3, =0x020229e8 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -36018,17 +35130,17 @@ sub_801100C: @ 801100C pop {r1} bx r1 .align 2, 0 -_08011038: .4byte 0x020229e8 + .pool thumb_func_end sub_801100C thumb_func_start sub_801103C sub_801103C: @ 801103C push {r4,r5,lr} - ldr r5, _08011044 + ldr r5, =0x02022b14 movs r4, 0x1 b _08011054 .align 2, 0 -_08011044: .4byte 0x02022b14 + .pool _08011048: adds r0, r4, 0 bl sub_801100C @@ -36050,22 +35162,21 @@ _08011054: sub_8011068: @ 8011068 push {lr} lsls r0, 24 - ldr r2, _08011088 + ldr r2, =0x02022b14 lsrs r0, 17 ldrb r3, [r2, 0xA] movs r1, 0x7F ands r1, r3 orrs r1, r0 strb r1, [r2, 0xA] - ldr r3, _0801108C + ldr r3, =0x02022b22 movs r0, 0 movs r1, 0x2 bl rfu_REQ_configGameData pop {r0} bx r0 .align 2, 0 -_08011088: .4byte 0x02022b14 -_0801108C: .4byte 0x02022b22 + .pool thumb_func_end sub_8011068 thumb_func_start sub_8011090 @@ -36077,16 +35188,15 @@ sub_8011090: @ 8011090 beq _0801109E bl sub_8010F84 _0801109E: - ldr r2, _080110B0 - ldr r3, _080110B4 + ldr r2, =0x02022b14 + ldr r3, =0x02022b22 movs r0, 0 movs r1, 0x2 bl rfu_REQ_configGameData pop {r0} bx r0 .align 2, 0 -_080110B0: .4byte 0x02022b14 -_080110B4: .4byte 0x02022b22 + .pool thumb_func_end sub_8011090 thumb_func_start sub_80110B8 @@ -36105,10 +35215,10 @@ sub_80110B8: @ 80110B8 bne _0801114C movs r5, 0 movs r7, 0 - ldr r3, _0801115C - ldr r1, _08011160 + ldr r3, =0x03005000 + ldr r1, =0x00000ce2 adds r0, r3, r1 - ldr r2, _08011164 + ldr r2, =0x00000ce3 adds r1, r3, r2 ldrb r2, [r0] ldrb r0, [r1] @@ -36117,9 +35227,9 @@ sub_80110B8: @ 80110B8 mov r8, r1 movs r4, 0 movs r6, 0x1 - ldr r2, _08011168 + ldr r2, =0x020229e8 mov r12, r2 - ldr r0, _0801116C + ldr r0, =0x00000cde adds r0, r3 mov r10, r0 mov r3, r12 @@ -36175,24 +35285,20 @@ _0801114C: pop {r0} bx r0 .align 2, 0 -_0801115C: .4byte 0x03005000 -_08011160: .4byte 0x00000ce2 -_08011164: .4byte 0x00000ce3 -_08011168: .4byte 0x020229e8 -_0801116C: .4byte 0x00000cde + .pool thumb_func_end sub_80110B8 thumb_func_start sub_8011170 sub_8011170: @ 8011170 push {r4,lr} adds r4, r0, 0 - ldr r2, _08011198 + ldr r2, =0x03005000 adds r3, r2, 0 adds r3, 0xEE ldrb r0, [r3] cmp r0, 0 bne _08011192 - ldr r1, _0801119C + ldr r1, =0x03004140 ldrh r0, [r1, 0x14] strh r0, [r2, 0x10] ldrh r0, [r1, 0x16] @@ -36206,20 +35312,19 @@ _08011192: pop {r0} bx r0 .align 2, 0 -_08011198: .4byte 0x03005000 -_0801119C: .4byte 0x03004140 + .pool thumb_func_end sub_8011170 thumb_func_start sub_80111A0 sub_80111A0: @ 80111A0 - ldr r0, _080111AC + ldr r0, =0x03005000 adds r0, 0xEE ldrb r1, [r0] movs r1, 0 strb r1, [r0] bx lr .align 2, 0 -_080111AC: .4byte 0x03005000 + .pool thumb_func_end sub_80111A0 thumb_func_start sub_80111B0 @@ -36228,15 +35333,15 @@ sub_80111B0: @ 80111B0 adds r2, r0, 0 cmp r2, 0 bne _080111C8 - ldr r0, _080111C4 + ldr r0, =0x03005000 adds r0, 0xEE ldrb r1, [r0] strb r2, [r0] b _080111D2 .align 2, 0 -_080111C4: .4byte 0x03005000 + .pool _080111C8: - ldr r0, _080111D8 + ldr r0, =0x03005000 adds r0, 0xEE ldrb r1, [r0] movs r1, 0x4 @@ -36245,35 +35350,33 @@ _080111D2: pop {r0} bx r0 .align 2, 0 -_080111D8: .4byte 0x03005000 + .pool thumb_func_end sub_80111B0 thumb_func_start sub_80111DC sub_80111DC: @ 80111DC push {lr} - ldr r0, _080111F4 + ldr r0, =0x03004140 ldrb r0, [r0] movs r1, 0x1 bl sub_8011E94 - ldr r1, _080111F8 + ldr r1, =0x03005000 movs r0, 0 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080111F4: .4byte 0x03004140 -_080111F8: .4byte 0x03005000 + .pool thumb_func_end sub_80111DC thumb_func_start sub_80111FC sub_80111FC: @ 80111FC - ldr r1, _08011204 - ldr r0, _08011208 + ldr r1, =0x03005000 + ldr r0, =sub_80111DC + 1 str r0, [r1] bx lr .align 2, 0 -_08011204: .4byte 0x03005000 -_08011208: .4byte sub_80111DC + 1 + .pool thumb_func_end sub_80111FC thumb_func_start sub_801120C @@ -36350,34 +35453,34 @@ _08011276: _0801127C: b _080113EE _0801127E: - ldr r1, _08011288 + ldr r1, =0x03005000 movs r0, 0x2 strh r0, [r1, 0x4] b _080113EE .align 2, 0 -_08011288: .4byte 0x03005000 + .pool _0801128C: - ldr r0, _080112F0 + ldr r0, =0x03004140 ldrh r0, [r0, 0x14] bl sub_80115EC movs r5, 0 movs r0, 0x1 mov r8, r0 - ldr r1, _080112F4 + ldr r1, =0x03005000 mov r9, r1 - ldr r3, _080112F8 + ldr r3, =0x00000cd5 add r3, r9 mov r10, r3 movs r7, 0x7F _080112A6: - ldr r0, _080112F0 + ldr r0, =0x03004140 ldrh r0, [r0, 0x14] asrs r0, r5 mov r1, r8 ands r0, r1 cmp r0, 0 beq _0801130E - ldr r0, _080112FC + ldr r0, =0x03007890 lsls r1, r5, 5 adds r1, 0x14 ldr r0, [r0] @@ -36391,7 +35494,7 @@ _080112A6: ands r0, r1 cmp r4, r0 bne _08011304 - ldr r0, _08011300 + ldr r0, =0x00000cd1 add r0, r9 adds r0, r5, r0 movs r1, 0 @@ -36405,11 +35508,7 @@ _080112A6: bl rfu_setRecvBuffer b _0801130E .align 2, 0 -_080112F0: .4byte 0x03004140 -_080112F4: .4byte 0x03005000 -_080112F8: .4byte 0x00000cd5 -_080112FC: .4byte 0x03007890 -_08011300: .4byte 0x00000cd1 + .pool _08011304: mov r0, r8 lsls r0, r5 @@ -36429,10 +35528,10 @@ _0801130E: bl rfu_waitREQComplete b _080113EE _08011328: - ldr r4, _08011348 - ldr r1, _0801134C + ldr r4, =0x03005000 + ldr r1, =0x00000ce7 adds r0, r4, r1 - ldr r1, _08011350 + ldr r1, =0x03004140 ldrb r2, [r0] ldrb r0, [r1] cmp r2, r0 @@ -36445,38 +35544,36 @@ _08011342: strh r0, [r4, 0x4] b _080113EE .align 2, 0 -_08011348: .4byte 0x03005000 -_0801134C: .4byte 0x00000ce7 -_08011350: .4byte 0x03004140 + .pool _08011354: - ldr r0, _0801135C + ldr r0, =0x03005000 adds r0, 0xF0 b _080113EA .align 2, 0 -_0801135C: .4byte 0x03005000 + .pool _08011360: - ldr r0, _08011368 + ldr r0, =0x03005000 adds r0, 0xF0 movs r1, 0x3 b _080113EC .align 2, 0 -_08011368: .4byte 0x03005000 + .pool _0801136C: - ldr r1, _0801139C + ldr r1, =0x03005000 adds r2, r1, 0 adds r2, 0xF0 movs r0, 0x4 strb r0, [r2] - ldr r3, _080113A0 + ldr r3, =0x00000ce2 adds r1, r3 - ldr r0, _080113A4 + ldr r0, =0x03004140 ldrb r2, [r0, 0x14] ldrb r0, [r1] adds r3, r0, 0 bics r3, r2 adds r2, r3, 0 strb r2, [r1] - ldr r0, _080113A8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 bne _080113B0 @@ -36486,10 +35583,7 @@ _0801136C: bl sub_8011170 b _080113B0 .align 2, 0 -_0801139C: .4byte 0x03005000 -_080113A0: .4byte 0x00000ce2 -_080113A4: .4byte 0x03004140 -_080113A8: .4byte 0x03003124 + .pool _080113AC: bl sub_80111FC _080113B0: @@ -36503,19 +35597,19 @@ _080113BA: bl sub_8011A64 movs r0, 0xF3 bl sub_8011170 - ldr r0, _080113D0 + ldr r0, =0x03005000 adds r0, 0xEF b _080113EA .align 2, 0 -_080113D0: .4byte 0x03005000 + .pool _080113D4: adds r0, r4, 0 bl sub_8011170 movs r0, 0x1 adds r1, r4, 0 bl sub_8011A64 - ldr r0, _080113FC - ldr r1, _08011400 + ldr r0, =0x03005000 + ldr r1, =0x00000cdb adds r0, r1 ldrb r1, [r0] _080113EA: @@ -36531,8 +35625,7 @@ _080113EE: pop {r0} bx r0 .align 2, 0 -_080113FC: .4byte 0x03005000 -_08011400: .4byte 0x00000cdb + .pool thumb_func_end sub_801120C thumb_func_start sub_8011404 @@ -36602,59 +35695,55 @@ _08011466: _0801146C: b _080115DE _0801146E: - ldr r1, _08011478 + ldr r1, =0x03005000 movs r0, 0x6 strh r0, [r1, 0x4] b _080115DE .align 2, 0 -_08011478: .4byte 0x03005000 + .pool _0801147C: - ldr r0, _08011488 - ldr r1, _0801148C + ldr r0, =0x03005000 + ldr r1, =0x03004140 ldrh r1, [r1, 0x14] - ldr r2, _08011490 + ldr r2, =0x00000ccd adds r0, r2 b _080115DC .align 2, 0 -_08011488: .4byte 0x03005000 -_0801148C: .4byte 0x03004140 -_08011490: .4byte 0x00000ccd + .pool _08011494: - ldr r0, _080114A4 - ldr r1, _080114A8 + ldr r0, =0x03005000 + ldr r1, =0x03004140 ldrh r1, [r1, 0x14] - ldr r2, _080114AC + ldr r2, =0x00000c3e adds r0, r2 ldrb r2, [r0] b _080115DC .align 2, 0 -_080114A4: .4byte 0x03005000 -_080114A8: .4byte 0x03004140 -_080114AC: .4byte 0x00000c3e + .pool _080114B0: movs r0, 0x2 adds r1, r4, 0 bl sub_8011A64 b _080115DE _080114BA: - ldr r4, _080114F0 + ldr r4, =0x03005000 movs r1, 0 movs r0, 0xB strh r0, [r4, 0x4] - ldr r2, _080114F4 + ldr r2, =0x00000c85 adds r0, r4, r2 strb r1, [r0] - ldr r0, _080114F8 + ldr r0, =0x00000c86 adds r2, r4, r0 strb r1, [r2] - ldr r1, _080114FC + ldr r1, =0x00000c3e adds r5, r4, r1 ldrb r1, [r5] movs r0, 0x20 movs r3, 0x1 bl rfu_setRecvBuffer ldrb r1, [r5] - ldr r2, _08011500 + ldr r2, =0x00000c3f adds r4, r2 movs r0, 0x10 adds r2, r4, 0 @@ -36662,29 +35751,25 @@ _080114BA: bl rfu_setRecvBuffer b _080115DE .align 2, 0 -_080114F0: .4byte 0x03005000 -_080114F4: .4byte 0x00000c85 -_080114F8: .4byte 0x00000c86 -_080114FC: .4byte 0x00000c3e -_08011500: .4byte 0x00000c3f + .pool _08011504: movs r0, 0x2 movs r1, 0x25 bl sub_8011A64 b _080115DE _0801150E: - ldr r0, _08011560 + ldr r0, =0x03005000 adds r2, r0, 0 adds r2, 0xF0 movs r1, 0x2 strb r1, [r2] - ldr r1, _08011564 + ldr r1, =0x00000c86 adds r0, r1 ldrb r0, [r0] cmp r0, 0x6 beq _080115DE _08011522: - ldr r2, _08011560 + ldr r2, =0x03005000 adds r1, r2, 0 adds r1, 0xF0 ldrb r0, [r1] @@ -36693,7 +35778,7 @@ _08011522: movs r0, 0x4 strb r0, [r1] _08011532: - ldr r1, _08011564 + ldr r1, =0x00000c86 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x9 @@ -36702,11 +35787,11 @@ _08011532: adds r1, r4, 0 bl sub_8011A64 _08011544: - ldr r0, _08011568 + ldr r0, =0x082ed7fc movs r1, 0x5 movs r2, 0x5 bl nullsub_5 - ldr r0, _0801156C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 bne _080115DE @@ -36714,57 +35799,52 @@ _08011544: bl sub_8011170 b _080115DE .align 2, 0 -_08011560: .4byte 0x03005000 -_08011564: .4byte 0x00000c86 -_08011568: .4byte 0x082ed7fc -_0801156C: .4byte 0x03003124 + .pool _08011570: - ldr r0, _08011584 + ldr r0, =0x03005000 adds r0, 0xF0 movs r1, 0x1 strb r1, [r0] - ldr r0, _08011588 + ldr r0, =0x082ed814 movs r1, 0x5 movs r2, 0x5 bl nullsub_5 b _080115DE .align 2, 0 -_08011584: .4byte 0x03005000 -_08011588: .4byte 0x082ed814 + .pool _0801158C: - ldr r1, _080115A4 + ldr r1, =0x03005000 adds r2, r1, 0 adds r2, 0xF0 movs r0, 0x3 strb r0, [r2] - ldr r2, _080115A8 + ldr r2, =0x00000c3c adds r1, r2 ldrb r0, [r1] movs r0, 0x1 strb r0, [r1] b _080115DE .align 2, 0 -_080115A4: .4byte 0x03005000 -_080115A8: .4byte 0x00000c3c + .pool _080115AC: movs r0, 0x1 movs r1, 0xF3 bl sub_8011A64 movs r0, 0xF3 bl sub_8011170 - ldr r0, _080115C0 + ldr r0, =0x03005000 adds r0, 0xEF b _080115DA .align 2, 0 -_080115C0: .4byte 0x03005000 + .pool _080115C4: movs r0, 0x1 adds r1, r4, 0 bl sub_8011A64 adds r0, r4, 0 bl sub_8011170 - ldr r0, _080115E4 - ldr r1, _080115E8 + ldr r0, =0x03005000 + ldr r1, =0x00000cdb adds r0, r1 ldrb r1, [r0] _080115DA: @@ -36776,8 +35856,7 @@ _080115DE: pop {r0} bx r0 .align 2, 0 -_080115E4: .4byte 0x03005000 -_080115E8: .4byte 0x00000cdb + .pool thumb_func_end sub_8011404 thumb_func_start sub_80115EC @@ -36786,8 +35865,8 @@ sub_80115EC: @ 80115EC adds r3, r0, 0 movs r2, 0 movs r6, 0x1 - ldr r0, _08011620 - ldr r4, _08011624 + ldr r0, =0x03005000 + ldr r4, =0x00000cea adds r1, r0, r4 movs r5, 0 movs r4, 0xFF @@ -36810,8 +35889,7 @@ _08011610: pop {r0} bx r0 .align 2, 0 -_08011620: .4byte 0x03005000 -_08011624: .4byte 0x00000cea + .pool thumb_func_end sub_80115EC thumb_func_start sub_8011628 @@ -36821,7 +35899,7 @@ sub_8011628: @ 8011628 movs r3, 0 movs r2, 0 movs r4, 0x1 - ldr r6, _08011670 + ldr r6, =0x03007890 movs r7, 0x7F _08011636: adds r0, r5, 0 @@ -36854,7 +35932,7 @@ _0801165C: pop {r1} bx r1 .align 2, 0 -_08011670: .4byte 0x03007890 + .pool thumb_func_end sub_8011628 thumb_func_start sub_8011674 @@ -36958,12 +36036,12 @@ _08011704: _0801170A: b _08011A42 _0801170C: - ldr r1, _08011714 + ldr r1, =0x03005000 movs r0, 0x11 strh r0, [r1, 0x4] b _08011A42 .align 2, 0 -_08011714: .4byte 0x03005000 + .pool _08011718: movs r0, 0x4 movs r1, 0 @@ -36976,13 +36054,13 @@ _08011722: ands r0, r1 cmp r0, 0x45 bne _080117DC - ldr r5, _08011784 - ldr r1, _08011788 + ldr r5, =0x03005000 + ldr r1, =0x00000cd9 adds r0, r5, r1 ldrb r0, [r0] cmp r0, 0 bne _080117DC - ldr r0, _0801178C + ldr r0, =0x03004140 ldrh r0, [r0, 0x14] bl sub_8011628 lsls r0, 24 @@ -36997,12 +36075,12 @@ _08011722: lsls r1, r0 lsls r1, 24 lsrs r1, 24 - ldr r7, _08011790 + ldr r7, =0x00000ce6 adds r6, r5, r7 ldrb r2, [r6] cmp r2, 0 bne _08011798 - ldr r0, _08011794 + ldr r0, =0x00000ce8 adds r3, r5, r0 ldrb r0, [r3] cmp r0, 0 @@ -37017,43 +36095,35 @@ _08011722: strb r0, [r3] b _080117A6 .align 2, 0 -_08011784: .4byte 0x03005000 -_08011788: .4byte 0x00000cd9 -_0801178C: .4byte 0x03004140 -_08011790: .4byte 0x00000ce6 -_08011794: .4byte 0x00000ce8 + .pool _08011798: - ldr r0, _080117C8 - ldr r1, _080117CC + ldr r0, =0x03005000 + ldr r1, =0x00000ce6 adds r0, r1 ldrb r2, [r0] adds r1, r4, 0 orrs r1, r2 strb r1, [r0] _080117A6: - ldr r0, _080117D0 + ldr r0, =0x03004140 ldrh r1, [r0, 0x14] cmp r4, r1 beq _080117F6 - ldr r2, _080117C8 - ldr r7, _080117D4 + ldr r2, =0x03005000 + ldr r7, =0x00000ce3 adds r3, r2, r7 adds r0, r4, 0 eors r0, r1 ldrb r1, [r3] orrs r0, r1 strb r0, [r3] - ldr r0, _080117D8 + ldr r0, =0x00000ce4 adds r2, r0 movs r0, 0x2 strb r0, [r2] b _080117F6 .align 2, 0 -_080117C8: .4byte 0x03005000 -_080117CC: .4byte 0x00000ce6 -_080117D0: .4byte 0x03004140 -_080117D4: .4byte 0x00000ce3 -_080117D8: .4byte 0x00000ce4 + .pool _080117DC: bl sub_800F7DC ldrb r1, [r0, 0xA] @@ -37061,17 +36131,17 @@ _080117DC: ands r0, r1 cmp r0, 0x54 bne _080117F6 - ldr r0, _08011800 + ldr r0, =0x03004140 ldrb r0, [r0] bl rfu_REQ_disconnect bl rfu_waitREQComplete _080117F6: - ldr r0, _08011800 + ldr r0, =0x03004140 ldrh r0, [r0, 0x14] bl sub_80115EC b _08011A42 .align 2, 0 -_08011800: .4byte 0x03004140 + .pool _08011804: bl sub_800F7DC ldrb r1, [r0, 0xA] @@ -37079,7 +36149,7 @@ _08011804: ands r0, r1 cmp r0, 0x45 beq _08011836 - ldr r4, _08011848 + ldr r4, =0x03004140 ldrb r0, [r4, 0x1] cmp r0, 0x1 bls _08011836 @@ -37095,7 +36165,7 @@ _08011804: bl rfu_REQ_disconnect bl rfu_waitREQComplete _08011836: - ldr r1, _0801184C + ldr r1, =0x03005000 ldrh r0, [r1, 0x4] cmp r0, 0xF beq _08011840 @@ -37105,66 +36175,59 @@ _08011840: strh r0, [r1, 0x4] b _08011A42 .align 2, 0 -_08011848: .4byte 0x03004140 -_0801184C: .4byte 0x03005000 + .pool _08011850: - ldr r0, _0801185C - ldr r1, _08011860 + ldr r0, =0x03005000 + ldr r1, =0x03004140 ldrh r1, [r1, 0x14] - ldr r2, _08011864 + ldr r2, =0x00000ccd adds r0, r2 b _08011A40 .align 2, 0 -_0801185C: .4byte 0x03005000 -_08011860: .4byte 0x03004140 -_08011864: .4byte 0x00000ccd + .pool _08011868: - ldr r0, _08011878 - ldr r1, _0801187C + ldr r0, =0x03005000 + ldr r1, =0x03004140 ldrh r1, [r1, 0x14] - ldr r7, _08011880 + ldr r7, =0x00000c3e adds r0, r7 ldrb r2, [r0] b _08011A40 .align 2, 0 -_08011878: .4byte 0x03005000 -_0801187C: .4byte 0x03004140 -_08011880: .4byte 0x00000c3e + .pool _08011884: - ldr r1, _080118A4 + ldr r1, =0x03005000 movs r0, 0x12 strh r0, [r1, 0x4] - ldr r0, _080118A8 + ldr r0, =0x00000ccf adds r1, r0 ldrb r0, [r1] cmp r0, 0x1 bhi _080118B0 adds r0, 0x1 strb r0, [r1] - ldr r0, _080118AC + ldr r0, =sub_801209C + 1 movs r1, 0x2 bl AddTask b _08011A42 .align 2, 0 -_080118A4: .4byte 0x03005000 -_080118A8: .4byte 0x00000ccf -_080118AC: .4byte sub_801209C + 1 + .pool _080118B0: movs r0, 0x2 movs r1, 0x23 bl sub_8011A64 b _08011A42 _080118BA: - ldr r4, _080118E0 + ldr r4, =0x03005000 movs r0, 0xD strh r0, [r4, 0x4] movs r0, 0x3 movs r1, 0 bl sub_8011A64 - ldr r1, _080118E4 + ldr r1, =0x00000c3e adds r0, r4, r1 ldrb r1, [r0] - ldr r2, _080118E8 + ldr r2, =0x00000c3f adds r4, r2 movs r0, 0x10 adds r2, r4, 0 @@ -37172,16 +36235,14 @@ _080118BA: bl rfu_setRecvBuffer b _08011A42 .align 2, 0 -_080118E0: .4byte 0x03005000 -_080118E4: .4byte 0x00000c3e -_080118E8: .4byte 0x00000c3f + .pool _080118EC: movs r0, 0x2 movs r1, 0x25 bl sub_8011A64 b _08011A42 _080118F6: - ldr r0, _0801190C + ldr r0, =0x03004140 ldrb r1, [r0] ldrh r0, [r0, 0x14] ands r1, r0 @@ -37189,42 +36250,39 @@ _080118F6: bne _08011904 b _08011A42 _08011904: - ldr r0, _08011910 + ldr r0, =0x03005000 adds r0, 0xF0 movs r1, 0x1 b _08011A40 .align 2, 0 -_0801190C: .4byte 0x03004140 -_08011910: .4byte 0x03005000 + .pool _08011914: - ldr r2, _08011934 + ldr r2, =0x03005000 adds r1, r2, 0 adds r1, 0xF0 movs r0, 0x3 strb r0, [r1] - ldr r0, _08011938 + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 beq _0801192A b _08011A42 _0801192A: - ldr r7, _0801193C + ldr r7, =0x00000c3c adds r0, r2, r7 ldrb r1, [r0] movs r1, 0x1 b _08011A40 .align 2, 0 -_08011934: .4byte 0x03005000 -_08011938: .4byte 0x03007890 -_0801193C: .4byte 0x00000c3c + .pool _08011940: - ldr r0, _08011980 + ldr r0, =0x03005000 adds r0, 0xF0 movs r1, 0x2 strb r1, [r0] _08011948: - ldr r2, _08011980 + ldr r2, =0x03005000 adds r1, r2, 0 adds r1, 0xF0 ldrb r0, [r1] @@ -37236,13 +36294,13 @@ _08011958: ldrb r0, [r2, 0xC] cmp r0, 0x1 bne _08011996 - ldr r0, _08011984 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 bne _080119B4 - ldr r0, _08011988 + ldr r0, =0x00000ce2 adds r2, r0 - ldr r0, _0801198C + ldr r0, =0x03004140 ldrb r1, [r0, 0x14] ldrb r0, [r2] bics r0, r1 @@ -37253,20 +36311,17 @@ _08011958: bl sub_8011170 b _080119B4 .align 2, 0 -_08011980: .4byte 0x03005000 -_08011984: .4byte 0x03003124 -_08011988: .4byte 0x00000ce2 -_0801198C: .4byte 0x03004140 + .pool _08011990: bl sub_80111FC b _080119B4 _08011996: - ldr r1, _080119E4 + ldr r1, =0x00000ce4 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x2 beq _080119B4 - ldr r0, _080119E8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 bne _080119B4 @@ -37275,22 +36330,22 @@ _08011996: movs r0, 0 bl sub_800C27C _080119B4: - ldr r0, _080119EC + ldr r0, =0x03007890 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0xFF bne _080119DA - ldr r0, _080119F0 + ldr r0, =0x03004140 ldrb r0, [r0, 0x7] cmp r0, 0 bne _080119DA - ldr r0, _080119F4 + ldr r0, =sub_800EB44 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080119DA - ldr r1, _080119F8 + ldr r1, =0x03005000 movs r0, 0x11 strh r0, [r1, 0x4] _080119DA: @@ -37299,40 +36354,34 @@ _080119DA: bl sub_8011A64 b _08011A42 .align 2, 0 -_080119E4: .4byte 0x00000ce4 -_080119E8: .4byte 0x03003124 -_080119EC: .4byte 0x03007890 -_080119F0: .4byte 0x03004140 -_080119F4: .4byte sub_800EB44 + 1 -_080119F8: .4byte 0x03005000 + .pool _080119FC: - ldr r0, _08011A04 - ldr r2, _08011A08 + ldr r0, =0x03005000 + ldr r2, =0x00000ce3 adds r0, r2 b _08011A3E .align 2, 0 -_08011A04: .4byte 0x03005000 -_08011A08: .4byte 0x00000ce3 + .pool _08011A0C: movs r0, 0x1 movs r1, 0xF3 bl sub_8011A64 movs r0, 0xF3 bl sub_8011170 - ldr r0, _08011A24 + ldr r0, =0x03005000 adds r0, 0xEF movs r1, 0x1 b _08011A40 .align 2, 0 -_08011A24: .4byte 0x03005000 + .pool _08011A28: adds r0, r4, 0 bl sub_8011170 movs r0, 0x1 adds r1, r4, 0 bl sub_8011A64 - ldr r0, _08011A48 - ldr r7, _08011A4C + ldr r0, =0x03005000 + ldr r7, =0x00000cdb adds r0, r7 ldrb r1, [r0] _08011A3E: @@ -37344,43 +36393,41 @@ _08011A42: pop {r0} bx r0 .align 2, 0 -_08011A48: .4byte 0x03005000 -_08011A4C: .4byte 0x00000cdb + .pool thumb_func_end sub_8011674 thumb_func_start sub_8011A50 sub_8011A50: @ 8011A50 - ldr r0, _08011A5C - ldr r1, _08011A60 + ldr r0, =0x03005000 + ldr r1, =0x00000ce4 adds r0, r1 movs r1, 0x2 strb r1, [r0] bx lr .align 2, 0 -_08011A5C: .4byte 0x03005000 -_08011A60: .4byte 0x00000ce4 + .pool thumb_func_end sub_8011A50 thumb_func_start sub_8011A64 sub_8011A64: @ 8011A64 - ldr r2, _08011A70 + ldr r2, =0x03005000 adds r3, r2, 0 adds r3, 0xF1 strb r0, [r3] strh r1, [r2, 0xA] bx lr .align 2, 0 -_08011A70: .4byte 0x03005000 + .pool thumb_func_end sub_8011A64 thumb_func_start sub_8011A74 sub_8011A74: @ 8011A74 - ldr r0, _08011A7C + ldr r0, =0x03005000 adds r0, 0xF1 ldrb r0, [r0] bx lr .align 2, 0 -_08011A7C: .4byte 0x03005000 + .pool thumb_func_end sub_8011A74 thumb_func_start sub_8011A80 @@ -37403,23 +36450,22 @@ _08011A96: thumb_func_start sub_8011A9C sub_8011A9C: @ 8011A9C - ldr r0, _08011AA8 - ldr r1, _08011AAC + ldr r0, =0x03005000 + ldr r1, =0x00000ce8 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08011AA8: .4byte 0x03005000 -_08011AAC: .4byte 0x00000ce8 + .pool thumb_func_end sub_8011A9C thumb_func_start sub_8011AB0 sub_8011AB0: @ 8011AB0 - ldr r0, _08011AB8 + ldr r0, =0x03005000 ldrb r0, [r0, 0xC] bx lr .align 2, 0 -_08011AB8: .4byte 0x03005000 + .pool thumb_func_end sub_8011AB0 thumb_func_start rfu_syncVBlank__ @@ -37436,16 +36482,15 @@ sub_8011AC8: @ 8011AC8 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r1, _08011AE0 - ldr r2, _08011AE4 + ldr r1, =0x03003090 + ldr r2, =0x05000014 mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08011AE0: .4byte 0x03003090 -_08011AE4: .4byte 0x05000014 + .pool thumb_func_end sub_8011AC8 thumb_func_start sub_8011AE8 @@ -37465,25 +36510,25 @@ sub_8011AFC: @ 8011AFC bl gpu_pal_allocator_reset bl clear_tasks bl sub_80A1A74 - ldr r0, _08011B78 + ldr r0, =sub_8011AE8 + 1 bl SetVBlankCallback bl sub_80093CC lsls r0, 24 cmp r0, 0 beq _08011B70 - ldr r1, _08011B7C - ldr r2, _08011B80 + ldr r1, =0x020229c6 + ldr r2, =0x00001111 adds r0, r2, 0 strh r0, [r1] bl sub_800B488 bl sub_8009734 - ldr r0, _08011B84 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x24] bl SeedRng movs r4, 0 _08011B38: bl GenerateRandomNumber - ldr r1, _08011B88 + ldr r1, =0x03005d90 ldr r1, [r1] adds r1, 0xA adds r1, r4 @@ -37500,38 +36545,33 @@ _08011B38: bl obj_sync_something bl fade_and_return_progress_probably bl sub_8011BA4 - ldr r0, _08011B8C + ldr r0, =sub_8011BF8 + 1 bl set_callback2 _08011B70: pop {r4} pop {r0} bx r0 .align 2, 0 -_08011B78: .4byte sub_8011AE8 + 1 -_08011B7C: .4byte 0x020229c6 -_08011B80: .4byte 0x00001111 -_08011B84: .4byte 0x030022c0 -_08011B88: .4byte 0x03005d90 -_08011B8C: .4byte sub_8011BF8 + 1 + .pool thumb_func_end sub_8011AFC thumb_func_start sub_8011B90 sub_8011B90: @ 8011B90 push {lr} - ldr r0, _08011BA0 + ldr r0, =sub_800EB44 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_08011BA0: .4byte sub_800EB44 + 1 + .pool thumb_func_end sub_8011B90 thumb_func_start sub_8011BA4 sub_8011BA4: @ 8011BA4 push {r4,lr} - ldr r4, _08011BC8 + ldr r4, =nullsub_89 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -37540,7 +36580,7 @@ sub_8011BA4: @ 8011BA4 adds r0, r4, 0 movs r1, 0 bl AddTask - ldr r1, _08011BCC + ldr r1, =0x03005000 adds r1, 0x66 strb r0, [r1] _08011BC2: @@ -37548,20 +36588,19 @@ _08011BC2: pop {r0} bx r0 .align 2, 0 -_08011BC8: .4byte nullsub_89 + 1 -_08011BCC: .4byte 0x03005000 + .pool thumb_func_end sub_8011BA4 thumb_func_start sub_8011BD0 sub_8011BD0: @ 8011BD0 push {lr} - ldr r0, _08011BF0 + ldr r0, =nullsub_89 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _08011BEA - ldr r0, _08011BF4 + ldr r0, =0x03005000 adds r0, 0x66 ldrb r0, [r0] bl remove_task @@ -37569,8 +36608,7 @@ _08011BEA: pop {r0} bx r0 .align 2, 0 -_08011BF0: .4byte nullsub_89 + 1 -_08011BF4: .4byte 0x03005000 + .pool thumb_func_end sub_8011BD0 thumb_func_start sub_8011BF8 @@ -37588,21 +36626,21 @@ sub_8011BF8: @ 8011BF8 sub_8011C10: @ 8011C10 push {r4-r6,lr} adds r4, r0, 0 - ldr r1, _08011C48 + ldr r1, =0x03005000 movs r0, 0x1 strb r0, [r1, 0xC] bl sub_8010F48 - ldr r0, _08011C4C + ldr r0, =sub_801120C + 1 movs r1, 0 bl sub_800BF4C - ldr r2, _08011C50 + ldr r2, =0x02022b2c adds r1, r2, 0 - ldr r0, _08011C54 + ldr r0, =0x082ed608 ldm r0!, {r3,r5,r6} stm r1!, {r3,r5,r6} ldm r0!, {r3,r5,r6} stm r1!, {r3,r5,r6} - ldr r0, _08011C58 + ldr r0, =0x082ed620 subs r4, 0x1 adds r4, r0 ldrb r0, [r4] @@ -37612,46 +36650,40 @@ sub_8011C10: @ 8011C10 pop {r0} bx r0 .align 2, 0 -_08011C48: .4byte 0x03005000 -_08011C4C: .4byte sub_801120C + 1 -_08011C50: .4byte 0x02022b2c -_08011C54: .4byte 0x082ed608 -_08011C58: .4byte 0x082ed620 + .pool thumb_func_end sub_8011C10 thumb_func_start sub_8011C5C sub_8011C5C: @ 8011C5C push {lr} - ldr r1, _08011C78 + ldr r1, =0x03005000 movs r0, 0 strb r0, [r1, 0xC] bl sub_8010F48 - ldr r0, _08011C7C - ldr r1, _08011C80 + ldr r0, =sub_8011404 + 1 + ldr r1, =sub_800ED34 + 1 bl sub_800BF4C bl sub_800EF00 pop {r0} bx r0 .align 2, 0 -_08011C78: .4byte 0x03005000 -_08011C7C: .4byte sub_8011404 + 1 -_08011C80: .4byte sub_800ED34 + 1 + .pool thumb_func_end sub_8011C5C thumb_func_start sub_8011C84 sub_8011C84: @ 8011C84 push {r4-r7,lr} - ldr r4, _08011CC4 + ldr r4, =0x03005000 movs r5, 0 movs r0, 0x2 strb r0, [r4, 0xC] bl sub_8010F48 - ldr r0, _08011CC8 + ldr r0, =sub_8011674 + 1 movs r1, 0 bl sub_800BF4C - ldr r2, _08011CCC + ldr r2, =0x02022b2c adds r1, r2, 0 - ldr r0, _08011CD0 + ldr r0, =0x082ed608 ldm r0!, {r3,r6,r7} stm r1!, {r3,r6,r7} ldm r0!, {r3,r6,r7} @@ -37660,7 +36692,7 @@ sub_8011C84: @ 8011C84 movs r0, 0x96 lsls r0, 2 strh r0, [r2, 0x12] - ldr r0, _08011CD4 + ldr r0, =sub_800EB44 + 1 movs r1, 0x1 bl AddTask adds r4, 0x67 @@ -37669,11 +36701,7 @@ sub_8011C84: @ 8011C84 pop {r0} bx r0 .align 2, 0 -_08011CC4: .4byte 0x03005000 -_08011CC8: .4byte sub_8011674 + 1 -_08011CCC: .4byte 0x02022b2c -_08011CD0: .4byte 0x082ed608 -_08011CD4: .4byte sub_800EB44 + 1 + .pool thumb_func_end sub_8011C84 thumb_func_start sub_8011CD8 @@ -37700,7 +36728,7 @@ sub_8011CE4: @ 8011CE4 movs r0, 0xFF mov r9, r0 movs r7, 0 - ldr r1, _08011D68 + ldr r1, =0x03007890 mov r8, r1 _08011D02: lsls r4, r7, 5 @@ -37754,7 +36782,7 @@ _08011D56: pop {r1} bx r1 .align 2, 0 -_08011D68: .4byte 0x03007890 + .pool thumb_func_end sub_8011CE4 thumb_func_start sub_8011D6C @@ -37765,19 +36793,19 @@ sub_8011D6C: @ 8011D6C lsrs r0, 24 bl rfu_REQ_disconnect bl rfu_waitREQComplete - ldr r4, _08011DB0 - ldr r0, _08011DB4 + ldr r4, =0x03005000 + ldr r0, =0x00000ce2 adds r5, r4, r0 ldrb r0, [r5] bics r0, r6 strb r0, [r5] - ldr r1, _08011DB8 + ldr r1, =0x00000cda adds r6, r4, r1 ldrb r1, [r6] movs r0, 0x1 bl rfu_clearSlot ldrb r0, [r5] - ldr r1, _08011DBC + ldr r1, =0x00000c87 adds r4, r1 adds r1, r4, 0 movs r2, 0x46 @@ -37789,10 +36817,7 @@ sub_8011D6C: @ 8011D6C pop {r0} bx r0 .align 2, 0 -_08011DB0: .4byte 0x03005000 -_08011DB4: .4byte 0x00000ce2 -_08011DB8: .4byte 0x00000cda -_08011DBC: .4byte 0x00000c87 + .pool thumb_func_end sub_8011D6C thumb_func_start sub_8011DC0 @@ -37821,7 +36846,7 @@ sub_8011DE0: @ 8011DE0 beq _08011E20 movs r3, 0 movs r2, 0 - ldr r5, _08011E28 + ldr r5, =0x03005cde adds r6, r5, 0x4 _08011DF0: adds r0, r2, r5 @@ -37853,7 +36878,7 @@ _08011E20: pop {r0} bx r0 .align 2, 0 -_08011E28: .4byte 0x03005cde + .pool thumb_func_end sub_8011DE0 thumb_func_start sub_8011E2C @@ -37861,12 +36886,12 @@ sub_8011E2C: @ 8011E2C push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _08011E80 + ldr r6, =0x03003110 ldrh r0, [r6] cmp r0, 0 bne _08011E7A - ldr r5, _08011E84 - ldr r1, _08011E88 + ldr r5, =0x03005000 + ldr r1, =0x00000ce8 adds r0, r5, r1 ldrb r0, [r0] cmp r0, 0 @@ -37874,7 +36899,7 @@ sub_8011E2C: @ 8011E2C movs r0, 0xED lsls r0, 8 bl sub_800FD14 - ldr r1, _08011E8C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -37883,7 +36908,7 @@ sub_8011E2C: @ 8011E2C strh r1, [r6, 0x2] ldrh r1, [r0, 0xA] strh r1, [r6, 0x4] - ldr r1, _08011E90 + ldr r1, =0x082ed695 movs r2, 0x8 ldrsh r0, [r0, r2] adds r0, r1 @@ -37900,11 +36925,7 @@ _08011E7A: pop {r0} bx r0 .align 2, 0 -_08011E80: .4byte 0x03003110 -_08011E84: .4byte 0x03005000 -_08011E88: .4byte 0x00000ce8 -_08011E8C: .4byte 0x03005e00 -_08011E90: .4byte 0x082ed695 + .pool thumb_func_end sub_8011E2C thumb_func_start sub_8011E94 @@ -37912,7 +36933,7 @@ sub_8011E94: @ 8011E94 push {r4-r6,lr} adds r4, r0, 0 adds r6, r1, 0 - ldr r5, _08011EC4 + ldr r5, =sub_8011E2C + 1 adds r0, r5, 0 bl get_task_id_by_function lsls r0, 24 @@ -37924,7 +36945,7 @@ sub_8011E94: @ 8011E94 bl AddTask lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08011EC8 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -37932,10 +36953,9 @@ sub_8011E94: @ 8011E94 strh r4, [r0, 0x8] b _08011EDC .align 2, 0 -_08011EC4: .4byte sub_8011E2C + 1 -_08011EC8: .4byte 0x03005e00 + .pool _08011ECC: - ldr r0, _08011EF0 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -37944,7 +36964,7 @@ _08011ECC: orrs r4, r0 strh r4, [r1, 0x8] _08011EDC: - ldr r1, _08011EF0 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -37954,7 +36974,7 @@ _08011EDC: pop {r0} bx r0 .align 2, 0 -_08011EF0: .4byte 0x03005e00 + .pool thumb_func_end sub_8011E94 thumb_func_start sub_8011EF4 @@ -37965,7 +36985,7 @@ sub_8011EF4: @ 8011EF4 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08011F4C + ldr r1, =0x03005e08 adds r4, r0, r1 bl sub_800EE94 lsls r0, 24 @@ -37983,15 +37003,15 @@ sub_8011EF4: @ 8011EF4 lsrs r2, r0, 24 cmp r2, 0xFF beq _08011F8C - ldr r0, _08011F50 + ldr r0, =0x03007890 ldr r0, [r0] lsls r1, r2, 5 adds r0, r1 ldrb r0, [r0, 0x16] cmp r0, 0xFF beq _08011F5C - ldr r0, _08011F54 - ldr r1, _08011F58 + ldr r0, =0x03005000 + ldr r1, =0x00000c3d adds r0, r1 strb r2, [r0] bl sub_800EEBC @@ -37999,10 +37019,7 @@ sub_8011EF4: @ 8011EF4 beq _08011FAA b _08011F84 .align 2, 0 -_08011F4C: .4byte 0x03005e08 -_08011F50: .4byte 0x03007890 -_08011F54: .4byte 0x03005000 -_08011F58: .4byte 0x00000c3d + .pool _08011F5C: bl sub_800F7DC ldrb r1, [r0, 0xA] @@ -38029,14 +37046,13 @@ _08011F8C: ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] - ldr r0, _08011F9C - ldr r1, _08011FA0 + ldr r0, =0x03005000 + ldr r1, =0x00000c3d adds r0, r1 strb r2, [r0] b _08011FAA .align 2, 0 -_08011F9C: .4byte 0x03005000 -_08011FA0: .4byte 0x00000c3d + .pool _08011FA4: ldrh r0, [r4, 0x1E] adds r0, 0x1 @@ -38064,11 +37080,11 @@ sub_8011FC8: @ 8011FC8 adds r6, r0, 0 lsls r5, r1, 16 lsrs r5, 16 - ldr r0, _08012000 + ldr r0, =0x03005000 adds r0, 0xF1 movs r1, 0 strb r1, [r0] - ldr r0, _08012004 + ldr r0, =sub_8011EF4 + 1 movs r1, 0x3 bl AddTask lsls r0, 24 @@ -38076,7 +37092,7 @@ sub_8011FC8: @ 8011FC8 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08012008 + ldr r0, =0x03005e08 adds r4, r0 adds r0, r4, 0 adds r1, r6, 0 @@ -38086,9 +37102,7 @@ sub_8011FC8: @ 8011FC8 pop {r0} bx r0 .align 2, 0 -_08012000: .4byte 0x03005000 -_08012004: .4byte sub_8011EF4 + 1 -_08012008: .4byte 0x03005e08 + .pool thumb_func_end sub_8011FC8 thumb_func_start sub_801200C @@ -38120,9 +37134,9 @@ _08012032: bne _0801202E cmp r5, 0x44 bne _08012092 - ldr r5, _08012060 + ldr r5, =0x0300510a ldrh r0, [r5, 0x8] - ldr r3, _08012064 + ldr r3, =0x000003ff adds r2, r3, 0 ands r2, r0 movs r0, 0xCE @@ -38136,8 +37150,7 @@ _08012032: beq _08012092 b _0801202E .align 2, 0 -_08012060: .4byte 0x0300510a -_08012064: .4byte 0x000003ff + .pool _08012068: ldrh r1, [r4, 0x8] adds r0, r3, 0 @@ -38176,7 +37189,7 @@ sub_801209C: @ 801209C lsls r0, 24 lsrs r5, r0, 24 mov r8, r5 - ldr r6, _08012154 + ldr r6, =0x03005000 adds r0, r6, 0 adds r0, 0xF1 ldrb r0, [r0] @@ -38185,7 +37198,7 @@ sub_801209C: @ 801209C adds r0, r5, 0 bl remove_task _080120BA: - ldr r1, _08012158 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -38205,12 +37218,12 @@ _080120BA: adds r0, r5, 0 bl remove_task _080120E4: - ldr r1, _0801215C + ldr r1, =0x00000ccd adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0 beq _0801217C - ldr r0, _08012160 + ldr r0, =0x03004140 ldrb r0, [r0, 0x6] cmp r0, 0 bne _0801217C @@ -38221,7 +37234,7 @@ _080120E4: adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r2, _08012164 + ldr r2, =0x00000119 adds r0, r6, r2 bl sub_8011CE4 lsls r0, 24 @@ -38230,7 +37243,7 @@ _080120E4: beq _0801217C movs r1, 0xA ldrsh r0, [r4, r1] - ldr r7, _08012168 + ldr r7, =0x03007890 lsls r4, r2, 5 adds r2, r4, 0 adds r2, 0x14 @@ -38257,12 +37270,7 @@ _080120E4: bl remove_task b _0801217C .align 2, 0 -_08012154: .4byte 0x03005000 -_08012158: .4byte 0x03005e00 -_0801215C: .4byte 0x00000ccd -_08012160: .4byte 0x03004140 -_08012164: .4byte 0x00000119 -_08012168: .4byte 0x03007890 + .pool _0801216C: movs r1, 0xE0 lsls r1, 7 @@ -38285,15 +37293,15 @@ sub_8012188: @ 8012188 adds r5, r1, 0 lsls r4, r2, 24 lsrs r4, 24 - ldr r6, _080121F8 - ldr r1, _080121FC + ldr r6, =0x03005000 + ldr r1, =0x00000ccf adds r0, r6, r1 movs r7, 0 strb r7, [r0] adds r0, r6, 0 adds r0, 0xF1 strb r7, [r0] - ldr r1, _08012200 + ldr r1, =0x00000119 adds r0, r6, r1 adds r1, r3, 0 bl gf_strcpy @@ -38304,18 +37312,18 @@ sub_8012188: @ 8012188 movs r2, 0xD bl memcpy bl sub_800D658 - ldr r0, _08012204 + ldr r0, =sub_801209C + 1 movs r1, 0x2 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r5, _08012208 + ldr r5, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r5 strh r4, [r1, 0xA] - ldr r0, _0801220C + ldr r0, =sub_800EB44 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r1, r0, 24 @@ -38332,12 +37340,7 @@ sub_8012188: @ 8012188 strh r1, [r0, 0x16] b _0801221E .align 2, 0 -_080121F8: .4byte 0x03005000 -_080121FC: .4byte 0x00000ccf -_08012200: .4byte 0x00000119 -_08012204: .4byte sub_801209C + 1 -_08012208: .4byte 0x03005e00 -_0801220C: .4byte sub_800EB44 + 1 + .pool _08012210: cmp r2, 0xFF beq _0801221E @@ -38355,7 +37358,7 @@ _0801221E: thumb_func_start sub_8012224 sub_8012224: @ 8012224 push {lr} - ldr r0, _08012234 + ldr r0, =0x03005000 adds r0, 0xF0 ldrb r0, [r0] cmp r0, 0x1 @@ -38363,7 +37366,7 @@ sub_8012224: @ 8012224 movs r0, 0 b _0801223A .align 2, 0 -_08012234: .4byte 0x03005000 + .pool _08012238: movs r0, 0x1 _0801223A: @@ -38375,9 +37378,9 @@ _0801223A: sub_8012240: @ 8012240 push {r4,lr} movs r1, 0 - ldr r0, _08012264 + ldr r0, =0x03004140 ldrb r2, [r0] - ldr r4, _08012268 + ldr r4, =0x03005cd1 movs r3, 0x1 _0801224C: adds r0, r2, 0 @@ -38392,8 +37395,7 @@ _0801224C: movs r0, 0 b _08012274 .align 2, 0 -_08012264: .4byte 0x03004140 -_08012268: .4byte 0x03005cd1 + .pool _0801226C: adds r1, 0x1 cmp r1, 0x3 @@ -38412,7 +37414,7 @@ sub_801227C: @ 801227C _08012280: lsls r2, r4, 24 lsrs r2, 24 - ldr r0, _08012298 + ldr r0, =0x082ed82c movs r1, 0 bl nullsub_5 adds r4, 0x1 @@ -38422,7 +37424,7 @@ _08012280: pop {r0} bx r0 .align 2, 0 -_08012298: .4byte 0x082ed82c + .pool thumb_func_end sub_801227C thumb_func_start sub_801229C @@ -38437,7 +37439,7 @@ sub_801229C: @ 801229C movs r2, 0x13 movs r3, 0x2 bl nullsub_13 - ldr r4, _0801236C + ldr r4, =0x03007890 ldr r0, [r4] ldrb r0, [r0, 0x2] movs r1, 0x14 @@ -38450,7 +37452,7 @@ sub_801229C: @ 801229C movs r2, 0x1 movs r3, 0x1 bl nullsub_13 - ldr r0, _08012370 + ldr r0, =0x03005000 ldrb r0, [r0, 0xC] cmp r0, 0x1 bne _08012378 @@ -38492,7 +37494,7 @@ _0801231E: cmp r6, 0x3 ble _080122E0 movs r6, 0 - ldr r0, _08012370 + ldr r0, =0x03005000 mov r8, r0 _0801232C: movs r5, 0 @@ -38520,15 +37522,13 @@ _08012342: adds r6, r7, 0 cmp r6, 0x3 ble _0801232C - ldr r0, _08012374 + ldr r0, =0x082ed868 movs r1, 0x1 movs r2, 0xF bl nullsub_5 b _080124AA .align 2, 0 -_0801236C: .4byte 0x03007890 -_08012370: .4byte 0x03005000 -_08012374: .4byte 0x082ed868 + .pool _08012378: ldr r1, [r4] ldrb r0, [r1, 0x2] @@ -38547,11 +37547,11 @@ _0801238C: adds r2, r4, 0 movs r3, 0x4 bl nullsub_13 - ldr r0, _08012400 + ldr r0, =0x082ed84b movs r1, 0x6 adds r2, r4, 0 bl nullsub_5 - ldr r0, _08012404 + ldr r0, =0x082ed85b movs r1, 0x16 adds r2, r4, 0 bl nullsub_5 @@ -38561,10 +37561,10 @@ _0801238C: adds r6, 0x1 cmp r6, 0x3 ble _0801238C - ldr r5, _08012408 + ldr r5, =0x03007890 ldr r1, [r5] - ldr r4, _0801240C - ldr r0, _08012410 + ldr r4, =0x03005000 + ldr r0, =0x00000c3e adds r4, r0 ldrb r0, [r4] lsls r0, 5 @@ -38594,14 +37594,10 @@ _0801238C: bl nullsub_5 b _080124AA .align 2, 0 -_08012400: .4byte 0x082ed84b -_08012404: .4byte 0x082ed85b -_08012408: .4byte 0x03007890 -_0801240C: .4byte 0x03005000 -_08012410: .4byte 0x00000c3e + .pool _08012414: movs r6, 0 - ldr r1, _080124B4 + ldr r1, =0x03007890 ldr r0, [r1] ldrb r0, [r0, 0x8] cmp r6, r0 @@ -38659,11 +37655,11 @@ _0801247C: adds r2, r4, 0 movs r3, 0x4 bl nullsub_13 - ldr r0, _080124B8 + ldr r0, =0x082ed84b movs r1, 0x6 adds r2, r4, 0 bl nullsub_5 - ldr r0, _080124BC + ldr r0, =0x082ed85b movs r1, 0x16 adds r2, r4, 0 bl nullsub_5 @@ -38680,33 +37676,29 @@ _080124AA: pop {r0} bx r0 .align 2, 0 -_080124B4: .4byte 0x03007890 -_080124B8: .4byte 0x082ed84b -_080124BC: .4byte 0x082ed85b + .pool thumb_func_end sub_801229C thumb_func_start sub_80124C0 sub_80124C0: @ 80124C0 - ldr r0, _080124CC - ldr r1, _080124D0 + ldr r0, =0x03005000 + ldr r1, =0x00000c1a adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080124CC: .4byte 0x03005000 -_080124D0: .4byte 0x00000c1a + .pool thumb_func_end sub_80124C0 thumb_func_start sub_80124D4 sub_80124D4: @ 80124D4 - ldr r0, _080124E0 - ldr r1, _080124E4 + ldr r0, =0x03005000 + ldr r1, =0x000009e6 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080124E0: .4byte 0x03005000 -_080124E4: .4byte 0x000009e6 + .pool thumb_func_end sub_80124D4 thumb_func_start nullsub_89 @@ -38755,30 +37747,30 @@ _08012526: beq _08012564 b _080125A6 _08012538: - ldr r1, _08012540 + ldr r1, =0x082edb60 subs r0, r5, 0x1 lsls r0, 2 b _0801256C .align 2, 0 -_08012540: .4byte 0x082edb60 + .pool _08012544: - ldr r1, _08012550 + ldr r1, =0x082edb60 subs r0, r5, 0x1 lsls r0, 2 adds r1, 0x14 b _0801256C .align 2, 0 -_08012550: .4byte 0x082edb60 + .pool _08012554: - ldr r1, _08012560 + ldr r1, =0x082edb60 subs r0, r5, 0x1 lsls r0, 2 adds r1, 0x28 b _0801256C .align 2, 0 -_08012560: .4byte 0x082edb60 + .pool _08012564: - ldr r1, _08012584 + ldr r1, =0x082edb60 subs r0, r5, 0x1 lsls r0, 2 adds r1, 0x3C @@ -38795,9 +37787,9 @@ _0801256C: bl sub_80173E0 b _080125A6 .align 2, 0 -_08012584: .4byte 0x082edb60 + .pool _08012588: - ldr r1, _080125B8 + ldr r1, =0x082edb60 subs r0, r5, 0x1 lsls r0, 2 adds r1, 0x50 @@ -38820,7 +37812,7 @@ _080125A6: pop {r0} bx r0 .align 2, 0 -_080125B8: .4byte 0x082edb60 + .pool thumb_func_end sub_80124EC thumb_func_start sub_80125BC @@ -38832,7 +37824,7 @@ sub_80125BC: @ 80125BC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r6, _08012624 + ldr r6, =0x03005d90 ldr r2, [r6] movs r0, 0x1 str r0, [sp] @@ -38843,7 +37835,7 @@ sub_80125BC: @ 80125BC movs r1, 0x1 movs r3, 0 bl sub_80173E0 - ldr r1, _08012628 + ldr r1, =0x082ed8cc add r0, sp, 0x8 bl gf_strcpy adds r5, r0, 0 @@ -38873,8 +37865,7 @@ sub_80125BC: @ 80125BC pop {r0} bx r0 .align 2, 0 -_08012624: .4byte 0x03005d90 -_08012628: .4byte 0x082ed8cc + .pool thumb_func_end sub_80125BC thumb_func_start sub_801262C @@ -38886,12 +37877,12 @@ sub_801262C: @ 801262C cmp r0, 0x1B bhi _080126C0 lsls r0, 2 - ldr r1, _08012644 + ldr r1, =_08012648 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08012644: .4byte _08012648 + .pool .align 2, 0 _08012648: .4byte _080126B8 @@ -38923,15 +37914,14 @@ _08012648: .4byte _080126B8 .4byte _080126B8 _080126B8: - ldr r0, _080126C4 - ldr r1, _080126C8 + ldr r0, =0x02021fc4 + ldr r1, =0x082ed960 bl ExpandTextCodes _080126C0: pop {r0} bx r0 .align 2, 0 -_080126C4: .4byte 0x02021fc4 -_080126C8: .4byte 0x082ed960 + .pool thumb_func_end sub_801262C thumb_func_start sub_80126CC @@ -38941,12 +37931,12 @@ sub_80126CC: @ 80126CC cmp r0, 0x12 bhi _08012734 lsls r0, 2 - ldr r1, _080126E0 + ldr r1, =_080126E4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080126E0: .4byte _080126E4 + .pool .align 2, 0 _080126E4: .4byte _08012730 @@ -38981,33 +37971,29 @@ _08012736: thumb_func_start sub_801273C sub_801273C: @ 801273C push {lr} - ldr r0, _0801276C + ldr r0, =sub_8012780 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08012770 + ldr r2, =0x02022c30 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08012774 + ldr r0, =0x03005e08 adds r1, r0 str r1, [r2] - ldr r0, _08012778 + ldr r0, =0x03000da0 str r1, [r0] movs r0, 0 strb r0, [r1, 0xC] strb r0, [r1, 0xD] - ldr r1, _0801277C + ldr r1, =0x020375f0 strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_0801276C: .4byte sub_8012780 + 1 -_08012770: .4byte 0x02022c30 -_08012774: .4byte 0x03005e08 -_08012778: .4byte 0x03000da0 -_0801277C: .4byte 0x020375f0 + .pool thumb_func_end sub_801273C thumb_func_start sub_8012780 @@ -39018,7 +38004,7 @@ sub_8012780: @ 8012780 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080127A4 + ldr r0, =0x02022c30 ldr r6, [r0] ldrb r0, [r6, 0xC] cmp r0, 0x1E @@ -39026,13 +38012,12 @@ sub_8012780: @ 8012780 bl _08012F50 _0801279A: lsls r0, 2 - ldr r1, _080127A8 + ldr r1, =_080127AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080127A4: .4byte 0x02022c30 -_080127A8: .4byte _080127AC + .pool .align 2, 0 _080127AC: .4byte _08012828 @@ -39067,14 +38052,14 @@ _080127AC: .4byte _08012B54 .4byte _08012EB6 _08012828: - ldr r0, _08012888 + ldr r0, =0x020375e0 ldrh r2, [r0] adds r3, r0, 0 cmp r2, 0x14 bne _08012848 - ldr r0, _0801288C + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08012890 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r1, [r0] movs r0, 0x3 @@ -39084,14 +38069,14 @@ _08012828: adds r0, r2, 0x1 strh r0, [r3] _08012848: - ldr r2, _08012894 - ldr r1, _08012898 + ldr r2, =0x02022c2c + ldr r1, =0x082f00c4 ldrh r0, [r3] lsls r0, 2 adds r0, r1 ldr r0, [r0] strb r0, [r2] - ldr r4, _0801289C + ldr r4, =0x02022c2d ldrh r0, [r3] lsls r0, 2 adds r0, r1 @@ -39112,12 +38097,7 @@ _08012848: strb r0, [r6, 0xC] b _08012F50 .align 2, 0 -_08012888: .4byte 0x020375e0 -_0801288C: .4byte 0x03005d90 -_08012890: .4byte 0x00000ca9 -_08012894: .4byte 0x02022c2c -_08012898: .4byte 0x082f00c4 -_0801289C: .4byte 0x02022c2d + .pool _080128A0: movs r0, 0x70 bl malloc_and_clear @@ -39161,10 +38141,10 @@ _080128A0: movs r1, 0xFF bl sub_8016FC0 strb r0, [r6, 0x17] - ldr r0, _08012920 + ldr r0, =0x082f00bc bl Window_AddFromTemplate strb r0, [r6, 0x10] - ldr r0, _08012924 + ldr r0, =0x02022c2d ldrb r0, [r0] movs r1, 0xF ands r1, r0 @@ -39176,27 +38156,26 @@ _080128A0: beq _08012930 b _08012938 .align 2, 0 -_08012920: .4byte 0x082f00bc -_08012924: .4byte 0x02022c2d + .pool _08012928: - ldr r0, _0801292C + ldr r0, =0x082f011c b _08012932 .align 2, 0 -_0801292C: .4byte 0x082f011c + .pool _08012930: - ldr r0, _080129B4 + ldr r0, =0x082f0124 _08012932: bl Window_AddFromTemplate strb r0, [r6, 0xF] _08012938: - ldr r0, _080129B8 + ldr r0, =0x082f012c bl Window_AddFromTemplate strb r0, [r6, 0x11] ldrb r0, [r6, 0x10] movs r1, 0x22 bl Window_FastFillPixels ldrb r0, [r6, 0x10] - ldr r2, _080129BC + ldr r2, =0x082edbc4 movs r3, 0x1 mov r8, r3 str r3, [sp] @@ -39213,9 +38192,9 @@ _08012938: ldrb r0, [r6, 0xF] movs r1, 0 bl sub_81973FC - ldr r0, _080129C0 + ldr r0, =0x03006310 adds r2, r0, 0 - ldr r1, _080129C4 + ldr r1, =0x082f015c ldm r1!, {r3,r5,r7} stm r2!, {r3,r5,r7} ldm r1!, {r3,r5,r7} @@ -39241,21 +38220,17 @@ _08012938: strb r4, [r6, 0xC] b _08012F50 .align 2, 0 -_080129B4: .4byte 0x082f0124 -_080129B8: .4byte 0x082f012c -_080129BC: .4byte 0x082edbc4 -_080129C0: .4byte 0x03006310 -_080129C4: .4byte 0x082f015c + .pool _080129C8: - ldr r0, _08012A00 - ldr r2, _08012A04 - ldr r4, _08012A08 + ldr r0, =0x02021cc4 + ldr r2, =0x082f0048 + ldr r4, =0x02022c2c ldrb r1, [r4] lsls r1, 2 adds r1, r2 ldr r1, [r1] bl gf_strcpy - ldr r0, _08012A0C + ldr r0, =0x02022c2d ldrb r2, [r0] lsrs r0, r2, 4 cmp r0, 0 @@ -39268,32 +38243,26 @@ _080129C8: ands r0, r2 cmp r0, 0 beq _08012A18 - ldr r0, _08012A10 - ldr r1, _08012A14 + ldr r0, =0x02021fc4 + ldr r1, =0x082ed990 bl ExpandTextCodes b _08012A34 .align 2, 0 -_08012A00: .4byte 0x02021cc4 -_08012A04: .4byte 0x082f0048 -_08012A08: .4byte 0x02022c2c -_08012A0C: .4byte 0x02022c2d -_08012A10: .4byte 0x02021fc4 -_08012A14: .4byte 0x082ed990 + .pool _08012A18: - ldr r0, _08012A24 - ldr r1, _08012A28 + ldr r0, =0x02021fc4 + ldr r1, =0x082ed960 bl ExpandTextCodes b _08012A34 .align 2, 0 -_08012A24: .4byte 0x02021fc4 -_08012A28: .4byte 0x082ed960 + .pool _08012A2C: - ldr r0, _08012A48 + ldr r0, =0x02021fc4 ldrb r1, [r4] bl sub_801262C _08012A34: ldrb r0, [r6, 0x11] - ldr r1, _08012A4C + ldr r1, =0x02022c2d ldrb r1, [r1] ldrb r2, [r6, 0x13] bl sub_80124EC @@ -39301,12 +38270,11 @@ _08012A34: strb r0, [r6, 0xC] b _08012F50 .align 2, 0 -_08012A48: .4byte 0x02021fc4 -_08012A4C: .4byte 0x02022c2d + .pool _08012A50: adds r0, r6, 0 adds r0, 0xD - ldr r1, _08012A68 + ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -39317,13 +38285,13 @@ _08012A62: strb r0, [r6, 0xC] b _08012F50 .align 2, 0 -_08012A68: .4byte 0x02021fc4 + .pool _08012A6C: adds r0, r6, 0 movs r1, 0x7 movs r2, 0xA bl sub_801320C - ldr r0, _08012A8C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -39335,9 +38303,9 @@ _08012A6C: movs r0, 0x17 b _08012AA6 .align 2, 0 -_08012A8C: .4byte 0x030022c0 + .pool _08012A90: - ldr r0, _08012AA0 + ldr r0, =0x02022c2d ldrb r1, [r0] movs r0, 0xF0 ands r0, r1 @@ -39346,13 +38314,13 @@ _08012A90: movs r0, 0x1E b _08012AA6 .align 2, 0 -_08012AA0: .4byte 0x02022c2d + .pool _08012AA4: movs r0, 0x13 _08012AA6: strb r0, [r6, 0xC] _08012AA8: - ldr r0, _08012AF4 + ldr r0, =0x02022c2d ldrb r2, [r0] lsrs r0, r2, 4 cmp r0, 0 @@ -39369,7 +38337,7 @@ _08012AA8: bl sub_8012240 cmp r0, 0 beq _08012ADE - ldr r0, _08012AF8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x8 ands r0, r1 @@ -39390,8 +38358,7 @@ _08012AE6: _08012AF0: b _08012C56 .align 2, 0 -_08012AF4: .4byte 0x02022c2d -_08012AF8: .4byte 0x030022c0 + .pool _08012AFC: bl sub_80105EC cmp r0, 0 @@ -39406,7 +38373,7 @@ _08012B06: b _08012F50 _08012B14: movs r3, 0 - ldr r0, _08012B4C + ldr r0, =0x02022c2c ldrb r1, [r0] movs r0, 0xF ands r0, r1 @@ -39416,7 +38383,7 @@ _08012B14: _08012B24: adds r0, r6, 0 adds r0, 0xD - ldr r2, _08012B50 + ldr r2, =0x082eddc4 lsls r1, r3, 2 adds r1, r2 ldr r1, [r1] @@ -39433,10 +38400,9 @@ _08012B3C: bl sub_81AE70C b _08012E5C .align 2, 0 -_08012B4C: .4byte 0x02022c2c -_08012B50: .4byte 0x082eddc4 + .pool _08012B54: - ldr r0, _08012B84 + ldr r0, =0x02022c2d ldrb r0, [r0] movs r1, 0xF ands r1, r0 @@ -39447,7 +38413,7 @@ _08012B54: lsrs r3, r0, 31 adds r0, r6, 0 adds r0, 0xD - ldr r2, _08012B88 + ldr r2, =0x082eddc4 lsls r1, r3, 2 adds r1, r2 ldr r1, [r1] @@ -39461,12 +38427,11 @@ _08012B7E: strb r0, [r6, 0xC] b _08012F50 .align 2, 0 -_08012B84: .4byte 0x02022c2d -_08012B88: .4byte 0x082eddc4 + .pool _08012B8C: adds r0, r6, 0 adds r0, 0xD - ldr r1, _08012BA4 + ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -39477,7 +38442,7 @@ _08012B9E: strb r0, [r6, 0xC] b _08012F50 .align 2, 0 -_08012BA4: .4byte 0x02021fc4 + .pool _08012BA8: adds r4, r6, 0 adds r4, 0xD @@ -39597,7 +38562,7 @@ _08012C5C: ldrb r0, [r6, 0x13] adds r0, 0x1 strb r0, [r6, 0x13] - ldr r1, _08012CC0 + ldr r1, =0x02022c2d ldrb r1, [r1] movs r3, 0xF lsls r0, 24 @@ -39616,33 +38581,30 @@ _08012CBC: strb r3, [r6, 0xC] b _08012CE0 .align 2, 0 -_08012CC0: .4byte 0x02022c2d + .pool _08012CC4: - ldr r0, _08012CF4 + ldr r0, =0x02021cc4 ldrb r2, [r6, 0x13] lsls r2, 5 subs r2, 0x20 ldr r1, [r6] adds r1, r2 bl sub_8018404 - ldr r0, _08012CF8 - ldr r1, _08012CFC + ldr r0, =0x02021fc4 + ldr r1, =0x082edc9c bl ExpandTextCodes movs r0, 0xD strb r0, [r6, 0xC] _08012CE0: bl sub_800EF38 ldrb r0, [r6, 0x11] - ldr r1, _08012D00 + ldr r1, =0x02022c2d ldrb r1, [r1] ldrb r2, [r6, 0x13] bl sub_80124EC b _08012D44 .align 2, 0 -_08012CF4: .4byte 0x02021cc4 -_08012CF8: .4byte 0x02021fc4 -_08012CFC: .4byte 0x082edc9c -_08012D00: .4byte 0x02022c2d + .pool _08012D04: ldrb r1, [r6, 0x13] lsls r1, 5 @@ -39689,7 +38651,7 @@ _08012D50: _08012D5A: adds r0, r6, 0 adds r0, 0xD - ldr r1, _08012D74 + ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -39700,7 +38662,7 @@ _08012D6C: strb r0, [r6, 0xC] b _08012F50 .align 2, 0 -_08012D74: .4byte 0x02021fc4 + .pool _08012D78: ldrb r0, [r6, 0xE] adds r0, 0x1 @@ -39715,7 +38677,7 @@ _08012D88: _08012D8A: adds r0, r6, 0 adds r0, 0xD - ldr r1, _08012DA4 + ldr r1, =0x082edc5c bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -39726,7 +38688,7 @@ _08012D9C: strb r0, [r6, 0xC] b _08012F50 .align 2, 0 -_08012DA4: .4byte 0x082edc5c + .pool _08012DA8: adds r0, r6, 0 adds r0, 0xD @@ -39752,7 +38714,7 @@ _08012DCE: strb r0, [r6, 0xC] b _08012F50 _08012DD4: - ldr r0, _08012DE8 + ldr r0, =0x02022c2d ldrb r1, [r0] movs r0, 0xF0 ands r0, r1 @@ -39762,7 +38724,7 @@ _08012DD4: strb r0, [r6, 0xC] b _08012F50 .align 2, 0 -_08012DE8: .4byte 0x02022c2d + .pool _08012DEC: movs r0, 0x13 strb r0, [r6, 0xC] @@ -39770,7 +38732,7 @@ _08012DEC: _08012DF2: adds r0, r6, 0 adds r0, 0xD - ldr r1, _08012E0C + ldr r1, =0x082edc78 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -39781,7 +38743,7 @@ _08012E04: strb r0, [r6, 0xC] b _08012F50 .align 2, 0 -_08012E0C: .4byte 0x082edc78 + .pool _08012E10: adds r0, r6, 0 adds r0, 0xD @@ -39803,7 +38765,7 @@ _08012E30: beq _08012E36 b _08012F50 _08012E36: - ldr r0, _08012E48 + ldr r0, =0x02022c2d ldrb r2, [r0] movs r0, 0xF0 ands r0, r2 @@ -39813,7 +38775,7 @@ _08012E36: strb r0, [r6, 0xC] b _08012F50 .align 2, 0 -_08012E48: .4byte 0x02022c2d + .pool _08012E4C: movs r3, 0xF ldrb r1, [r6, 0x13] @@ -39873,7 +38835,7 @@ _08012EAE: _08012EB6: adds r0, r6, 0 adds r0, 0xD - ldr r1, _08012ECC + ldr r1, =0x082edd58 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -39883,7 +38845,7 @@ _08012EC6: strb r0, [r6, 0xC] b _08012F50 .align 2, 0 -_08012ECC: .4byte 0x082edd58 + .pool _08012ED0: bl sub_800E084 bl sub_800EDD4 @@ -39897,22 +38859,22 @@ _08012EE6: bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task - ldr r1, _08012EF8 + ldr r1, =0x020375f0 movs r0, 0x5 strh r0, [r1] b _08012F50 .align 2, 0 -_08012EF8: .4byte 0x020375f0 + .pool _08012EFC: bl script_env_2_enable_and_set_ctx_running adds r0, r4, 0 bl remove_task - ldr r1, _08012F10 + ldr r1, =0x020375f0 movs r0, 0x8 strh r0, [r1] b _08012F50 .align 2, 0 -_08012F10: .4byte 0x020375f0 + .pool _08012F14: bl sub_8011A80 cmp r0, 0 @@ -39921,11 +38883,11 @@ _08012F14: strb r0, [r6, 0xC] b _08012F50 _08012F22: - ldr r0, _08012F5C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08012F50 - ldr r0, _08012F60 + ldr r0, =0x02022c2c ldrb r0, [r0] bl sub_80126CC cmp r0, 0 @@ -39947,8 +38909,7 @@ _08012F50: pop {r0} bx r0 .align 2, 0 -_08012F5C: .4byte 0x03003124 -_08012F60: .4byte 0x02022c2c + .pool thumb_func_end sub_8012780 thumb_func_start sub_8012F64 @@ -40000,12 +38961,12 @@ sub_8012FC4: @ 8012FC4 cmp r0, 0x1B bhi _08013070 lsls r0, 2 - ldr r1, _08012FDC + ldr r1, =_08012FE0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08012FDC: .4byte _08012FE0 + .pool .align 2, 0 _08012FE0: .4byte _08013050 @@ -40037,27 +38998,27 @@ _08012FE0: .4byte _08013068 .4byte _08013050 _08013050: - ldr r1, _08013054 + ldr r1, =0x082edbe8 b _0801305A .align 2, 0 -_08013054: .4byte 0x082edbe8 + .pool _08013058: - ldr r1, _08013064 + ldr r1, =0x082edc0c _0801305A: adds r0, r2, 0 bl ExpandTextCodes b _08013070 .align 2, 0 -_08013064: .4byte 0x082edc0c + .pool _08013068: - ldr r1, _08013074 + ldr r1, =0x082edc34 adds r0, r2, 0 bl ExpandTextCodes _08013070: pop {r0} bx r0 .align 2, 0 -_08013074: .4byte 0x082edc34 + .pool thumb_func_end sub_8012FC4 thumb_func_start sub_8013078 @@ -40080,19 +39041,19 @@ _0801308E: beq _080130A4 b _080130AA _08013098: - ldr r1, _080130A0 + ldr r1, =0x082ee560 bl ExpandTextCodes b _080130AA .align 2, 0 -_080130A0: .4byte 0x082ee560 + .pool _080130A4: - ldr r1, _080130B0 + ldr r1, =0x082ee57c bl ExpandTextCodes _080130AA: pop {r0} bx r0 .align 2, 0 -_080130B0: .4byte 0x082ee57c + .pool thumb_func_end sub_8013078 thumb_func_start sub_80130B4 @@ -40105,12 +39066,12 @@ sub_80130B4: @ 80130B4 cmp r0, 0x1B bhi _08013158 lsls r0, 2 - ldr r1, _080130CC + ldr r1, =_080130D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080130CC: .4byte _080130D0 + .pool .align 2, 0 _080130D0: .4byte _08013140 @@ -40142,21 +39103,21 @@ _080130D0: .4byte _08013150 .4byte _08013140 _08013140: - ldr r1, _0801314C + ldr r1, =0x082efc3c adds r0, r2, 0 bl ExpandTextCodes b _08013158 .align 2, 0 -_0801314C: .4byte 0x082efc3c + .pool _08013150: - ldr r1, _0801315C + ldr r1, =0x082efc54 adds r0, r2, 0 bl ExpandTextCodes _08013158: pop {r0} bx r0 .align 2, 0 -_0801315C: .4byte 0x082efc54 + .pool thumb_func_end sub_80130B4 thumb_func_start sub_8013160 @@ -40169,12 +39130,12 @@ sub_8013160: @ 8013160 cmp r0, 0x1B bhi _08013204 lsls r0, 2 - ldr r1, _08013178 + ldr r1, =_0801317C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08013178: .4byte _0801317C + .pool .align 2, 0 _0801317C: .4byte _080131EC @@ -40206,21 +39167,21 @@ _0801317C: .4byte _080131FC .4byte _080131EC _080131EC: - ldr r1, _080131F8 + ldr r1, =0x082eddf4 adds r0, r2, 0 bl ExpandTextCodes b _08013204 .align 2, 0 -_080131F8: .4byte 0x082eddf4 + .pool _080131FC: - ldr r1, _08013208 + ldr r1, =0x082ede0c adds r0, r2, 0 bl ExpandTextCodes _08013204: pop {r0} bx r0 .align 2, 0 -_08013208: .4byte 0x082ede0c + .pool thumb_func_end sub_8013160 thumb_func_start sub_801320C @@ -40243,22 +39204,20 @@ _08013228: bl audio_play ldrb r0, [r4, 0x12] bl sub_81AE70C - ldr r0, _08013250 + ldr r0, =0x02021dc4 ldrb r2, [r4, 0x13] lsls r2, 5 ldr r1, [r4] adds r1, r2 bl sub_8018404 - ldr r0, _08013254 - ldr r1, _08013258 + ldr r0, =0x02021fc4 + ldr r1, =0x02022c2c ldrb r1, [r1] bl sub_8012FC4 strb r6, [r4, 0xC] b _08013270 .align 2, 0 -_08013250: .4byte 0x02021dc4 -_08013254: .4byte 0x02021fc4 -_08013258: .4byte 0x02022c2c + .pool _0801325C: movs r0, 0 movs r1, 0 @@ -40285,7 +39244,7 @@ sub_8013278: @ 8013278 lsrs r5, r0, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, _080132A4 + ldr r0, =0x02022c30 ldr r3, [r0] movs r2, 0 ldr r1, [r3] @@ -40300,7 +39259,7 @@ sub_8013278: @ 8013278 beq _080132B2 b _080132B4 .align 2, 0 -_080132A4: .4byte 0x02022c30 + .pool _080132A8: ldrb r0, [r1, 0x1B] cmp r0, 0 @@ -40334,7 +39293,7 @@ sub_80132D4: @ 80132D4 mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r0, _0801332C + ldr r0, =0x02022c30 ldr r5, [r0] movs r0, 0 mov r8, r0 @@ -40374,7 +39333,7 @@ _080132E8: strh r1, [r0, 0x18] b _08013348 .align 2, 0 -_0801332C: .4byte 0x02022c30 + .pool _08013330: ldr r2, [r5] adds r2, r6 @@ -40441,7 +39400,7 @@ sub_8013398: @ 8013398 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _0801346C + ldr r0, =0x02022c30 ldr r4, [r0] movs r3, 0 _080133A8: @@ -40492,7 +39451,7 @@ _080133F2: mov r10, r5 cmp r5, 0x4 bhi _08013454 - ldr r0, _08013470 + ldr r0, =0x082f045c mov r9, r0 movs r1, 0 mov r12, r1 @@ -40548,8 +39507,7 @@ _08013454: mov r10, r3 b _08013494 .align 2, 0 -_0801346C: .4byte 0x02022c30 -_08013470: .4byte 0x082f045c + .pool _08013474: adds r3, 0x1 cmp r3, 0x4 @@ -40581,33 +39539,29 @@ _08013494: thumb_func_start sub_80134A4 sub_80134A4: @ 80134A4 push {lr} - ldr r0, _080134D4 + ldr r0, =sub_80134E8 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080134D8 + ldr r2, =0x02022c30 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080134DC + ldr r0, =0x03005e08 adds r1, r0 str r1, [r2] - ldr r0, _080134E0 + ldr r0, =0x03000da4 str r1, [r0] movs r0, 0 strb r0, [r1, 0x8] strb r0, [r1, 0x9] - ldr r1, _080134E4 + ldr r1, =0x020375f0 strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_080134D4: .4byte sub_80134E8 + 1 -_080134D8: .4byte 0x02022c30 -_080134DC: .4byte 0x03005e08 -_080134E0: .4byte 0x03000da4 -_080134E4: .4byte 0x020375f0 + .pool thumb_func_end sub_80134A4 thumb_func_start sub_80134E8 @@ -40616,7 +39570,7 @@ sub_80134E8: @ 80134E8 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08013508 + ldr r0, =0x02022c30 ldr r6, [r0] ldrb r0, [r6, 0x8] cmp r0, 0x17 @@ -40624,13 +39578,12 @@ sub_80134E8: @ 80134E8 b _08013B82 _080134FC: lsls r0, 2 - ldr r1, _0801350C + ldr r1, =_08013510 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08013508: .4byte 0x02022c30 -_0801350C: .4byte _08013510 + .pool .align 2, 0 _08013510: .4byte _08013570 @@ -40658,14 +39611,14 @@ _08013510: .4byte _08013B82 .4byte _08013B68 _08013570: - ldr r0, _080135CC + ldr r0, =0x020375e0 ldrh r2, [r0] adds r3, r0, 0 cmp r2, 0x14 bne _08013590 - ldr r0, _080135D0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _080135D4 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r1, [r0] movs r0, 0x3 @@ -40675,8 +39628,8 @@ _08013570: adds r0, r2, 0x1 strh r0, [r3] _08013590: - ldr r2, _080135D8 - ldr r1, _080135DC + ldr r2, =0x02022c2c + ldr r1, =0x082f0530 ldrh r0, [r3] adds r0, r1 ldrb r0, [r0] @@ -40699,16 +39652,12 @@ _08013590: strb r0, [r6, 0x8] b _08013B82 .align 2, 0 -_080135CC: .4byte 0x020375e0 -_080135D0: .4byte 0x03005d90 -_080135D4: .4byte 0x00000ca9 -_080135D8: .4byte 0x02022c2c -_080135DC: .4byte 0x082f0530 + .pool _080135E0: adds r0, r6, 0 adds r0, 0x9 - ldr r2, _08013604 - ldr r1, _08013608 + ldr r2, =0x082efb70 + ldr r1, =0x020375e0 ldrh r1, [r1] lsls r1, 2 adds r1, r2 @@ -40723,8 +39672,7 @@ _080135FC: strb r0, [r6, 0x8] b _08013B82 .align 2, 0 -_08013604: .4byte 0x082efb70 -_08013608: .4byte 0x020375e0 + .pool _0801360C: ldr r0, [r6, 0x4] movs r1, 0x4 @@ -40733,25 +39681,25 @@ _0801360C: movs r1, 0x10 bl sub_8017580 ldr r0, [r6, 0x4] - ldr r1, _080136BC + ldr r1, =0x020375e0 ldrh r1, [r1] bl sub_8016FC0 movs r4, 0 strb r0, [r6, 0x11] - ldr r0, _080136C0 + ldr r0, =0x082f00bc bl Window_AddFromTemplate strb r0, [r6, 0xC] - ldr r0, _080136C4 + ldr r0, =0x082f0174 bl Window_AddFromTemplate strb r0, [r6, 0xB] - ldr r0, _080136C8 + ldr r0, =0x082f017c bl Window_AddFromTemplate strb r0, [r6, 0xD] ldrb r0, [r6, 0xC] movs r1, 0x22 bl Window_FastFillPixels ldrb r0, [r6, 0xC] - ldr r2, _080136CC + ldr r2, =0x082ef7dc movs r1, 0x1 str r1, [sp] movs r1, 0x4 @@ -40767,9 +39715,9 @@ _0801360C: ldrb r0, [r6, 0xB] movs r1, 0 bl sub_81973FC - ldr r0, _080136D0 + ldr r0, =0x03006310 adds r2, r0, 0 - ldr r1, _080136D4 + ldr r1, =0x082f0204 ldm r1!, {r3,r5,r7} stm r2!, {r3,r5,r7} ldm r1!, {r3,r5,r7} @@ -40797,13 +39745,7 @@ _0801360C: strb r0, [r6, 0x8] b _08013B82 .align 2, 0 -_080136BC: .4byte 0x020375e0 -_080136C0: .4byte 0x082f00bc -_080136C4: .4byte 0x082f0174 -_080136C8: .4byte 0x082f017c -_080136CC: .4byte 0x082ef7dc -_080136D0: .4byte 0x03006310 -_080136D4: .4byte 0x082f0204 + .pool _080136D8: bl sub_8013E44 lsls r0, 24 @@ -40821,7 +39763,7 @@ _080136F2: ldrb r0, [r6, 0xE] bl sub_81AE604 adds r4, r0, 0 - ldr r0, _08013740 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -40855,10 +39797,10 @@ _080136F2: movs r0, 0x5 b _08013756 .align 2, 0 -_08013740: .4byte 0x030022c0 + .pool _08013744: - ldr r0, _08013760 - ldr r2, _08013764 + ldr r0, =0x02021fc4 + ldr r2, =0x082edd50 subs r1, 0x1 lsls r1, 2 adds r1, r2 @@ -40871,14 +39813,13 @@ _08013756: bl audio_play b _08013B82 .align 2, 0 -_08013760: .4byte 0x02021fc4 -_08013764: .4byte 0x082edd50 + .pool _08013768: movs r0, 0x7 bl audio_play b _08013B82 _08013770: - ldr r0, _08013784 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -40890,10 +39831,10 @@ _0801377E: strb r0, [r6, 0x8] b _08013B82 .align 2, 0 -_08013784: .4byte 0x030022c0 + .pool _08013788: - ldr r4, _080137B8 - ldr r0, _080137BC + ldr r4, =0x02021fc4 + ldr r0, =0x02022c2c ldrb r1, [r0] adds r0, r4, 0 bl sub_80130B4 @@ -40906,7 +39847,7 @@ _08013788: bne _080137A6 b _08013B82 _080137A6: - ldr r0, _080137C0 + ldr r0, =0x02021cc4 ldrb r2, [r6, 0xF] lsls r2, 5 ldr r1, [r6] @@ -40914,15 +39855,13 @@ _080137A6: bl sub_8018404 b _08013A86 .align 2, 0 -_080137B8: .4byte 0x02021fc4 -_080137BC: .4byte 0x02022c2c -_080137C0: .4byte 0x02021cc4 + .pool _080137C4: - ldr r0, _080137F8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0801387A - ldr r4, _080137FC + ldr r4, =0x02022c2c ldr r1, [r6] ldrb r0, [r6, 0xF] lsls r0, 5 @@ -40939,14 +39878,12 @@ _080137C4: cmp r0, 0x1B bhi _0801387A lsls r0, 2 - ldr r1, _08013800 + ldr r1, =_08013804 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080137F8: .4byte 0x03003124 -_080137FC: .4byte 0x02022c2c -_08013800: .4byte _08013804 + .pool .align 2, 0 _08013804: .4byte _08013874 @@ -40991,12 +39928,12 @@ _0801387A: b _080139EC _0801388A: lsls r0, 2 - ldr r1, _08013894 + ldr r1, =_08013898 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08013894: .4byte _08013898 + .pool .align 2, 0 _08013898: .4byte _080138BC @@ -41017,8 +39954,8 @@ _080138C2: strb r0, [r6, 0x8] b _080139EC _080138C8: - ldr r5, _080138FC - ldr r4, _08013900 + ldr r5, =0x02021fc4 + ldr r4, =0x02022c2c ldrb r1, [r4] adds r0, r5, 0 bl sub_8013160 @@ -41042,27 +39979,24 @@ _080138F0: bl sub_8011A64 b _080139EC .align 2, 0 -_080138FC: .4byte 0x02021fc4 -_08013900: .4byte 0x02022c2c + .pool _08013904: movs r0, 0x7 movs r1, 0 bl sub_8011A64 - ldr r0, _08013928 - ldr r2, _0801392C + ldr r0, =0x02021cc4 + ldr r2, =0x082f0048 ldrb r1, [r4] lsls r1, 2 adds r1, r2 ldr r1, [r1] bl gf_strcpy - ldr r1, _08013930 + ldr r1, =0x082ede48 adds r0, r5, 0 bl ExpandTextCodes b _080139EC .align 2, 0 -_08013928: .4byte 0x02021cc4 -_0801392C: .4byte 0x082f0048 -_08013930: .4byte 0x082ede48 + .pool _08013934: ldrb r0, [r6, 0x15] adds r2, r0, 0 @@ -41070,7 +40004,7 @@ _08013934: bls _0801395C adds r0, r6, 0 adds r0, 0x9 - ldr r1, _08013958 + ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -41081,21 +40015,20 @@ _08013934: movs r0, 0 b _080139EA .align 2, 0 -_08013958: .4byte 0x02021fc4 + .pool _0801395C: - ldr r0, _08013970 + ldr r0, =0x02022c2c ldrb r0, [r0] subs r0, 0x1 cmp r0, 0x1B bhi _080139E8 lsls r0, 2 - ldr r1, _08013974 + ldr r1, =_08013978 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08013970: .4byte 0x02022c2c -_08013974: .4byte _08013978 + .pool .align 2, 0 _08013978: .4byte _080139EC @@ -41137,7 +40070,7 @@ _080139EC: beq _080139F8 b _08013B82 _080139F8: - ldr r0, _08013A0C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -41149,11 +40082,11 @@ _08013A06: strb r0, [r6, 0x8] b _08013B82 .align 2, 0 -_08013A0C: .4byte 0x030022c0 + .pool _08013A10: adds r0, r6, 0 adds r0, 0x9 - ldr r1, _08013A28 + ldr r1, =0x082ede64 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -41164,7 +40097,7 @@ _08013A22: strb r0, [r6, 0x8] b _08013B82 .align 2, 0 -_08013A28: .4byte 0x082ede64 + .pool _08013A2C: adds r4, r6, 0 adds r4, 0x9 @@ -41254,7 +40187,7 @@ _08013AE4: bl sub_800E084 adds r5, r6, 0 adds r5, 0x9 - ldr r4, _08013B0C + ldr r4, =0x082ede9c bl sub_8011A74 lsls r0, 24 lsrs r0, 22 @@ -41265,24 +40198,23 @@ _08013AE4: lsls r0, 24 cmp r0, 0 beq _08013B82 - ldr r0, _08013B10 + ldr r0, =0x020375f0 movs r1, 0x6 b _08013B58 .align 2, 0 -_08013B0C: .4byte 0x082ede9c -_08013B10: .4byte 0x020375f0 + .pool _08013B14: bl sub_800E084 - ldr r0, _08013B20 + ldr r0, =0x020375f0 movs r1, 0x5 b _08013B58 .align 2, 0 -_08013B20: .4byte 0x020375f0 + .pool _08013B24: bl sub_800E084 adds r5, r6, 0 adds r5, 0x9 - ldr r4, _08013B40 + ldr r4, =0x082ede9c bl sub_8011A74 lsls r0, 24 lsrs r0, 22 @@ -41291,17 +40223,17 @@ _08013B24: adds r0, r5, 0 b _08013B4A .align 2, 0 -_08013B40: .4byte 0x082ede9c + .pool _08013B44: adds r0, r6, 0 adds r0, 0x9 - ldr r1, _08013B60 + ldr r1, =0x02021fc4 _08013B4A: bl sub_8017064 lsls r0, 24 cmp r0, 0 beq _08013B82 - ldr r0, _08013B64 + ldr r0, =0x020375f0 movs r1, 0x8 _08013B58: strh r1, [r0] @@ -41309,8 +40241,7 @@ _08013B58: strb r0, [r6, 0x8] b _08013B82 .align 2, 0 -_08013B60: .4byte 0x02021fc4 -_08013B64: .4byte 0x020375f0 + .pool _08013B68: adds r0, r4, 0 bl remove_task @@ -41334,7 +40265,7 @@ sub_8013B8C: @ 8013B8C lsls r1, 5 ldr r0, [r0] adds r3, r0, r1 - ldr r0, _08013BBC + ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x4 bne _08013BCE @@ -41343,7 +40274,7 @@ sub_8013B8C: @ 8013B8C ands r0, r1 cmp r0, 0xC beq _08013BCE - ldr r0, _08013BC0 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r1, [r0, 0x9] movs r2, 0x80 @@ -41354,8 +40285,7 @@ sub_8013B8C: @ 8013B8C movs r0, 0x1 b _08013BD4 .align 2, 0 -_08013BBC: .4byte 0x02022c2c -_08013BC0: .4byte 0x03005d90 + .pool _08013BC4: ldrb r1, [r3] adds r0, r2, 0 @@ -41383,14 +40313,14 @@ sub_8013BD8: @ 8013BD8 bl sub_800DFB4 ldrb r0, [r4, 0xE] bl sub_81AE70C - ldr r0, _08013C34 + ldr r0, =0x02021cc4 ldrb r2, [r4, 0xF] lsls r2, 5 ldr r1, [r4] adds r1, r2 bl sub_8018404 - ldr r1, _08013C38 - ldr r0, _08013C3C + ldr r1, =0x082f0530 + ldr r0, =0x020375e0 ldrh r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -41414,38 +40344,33 @@ sub_8013BD8: @ 8013BD8 pop {r0} bx r0 .align 2, 0 -_08013C34: .4byte 0x02021cc4 -_08013C38: .4byte 0x082f0530 -_08013C3C: .4byte 0x020375e0 + .pool thumb_func_end sub_8013BD8 thumb_func_start sub_8013C40 sub_8013C40: @ 8013C40 push {lr} - ldr r0, _08013C6C + ldr r0, =sub_8013C7C + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r3, _08013C70 + ldr r3, =0x02022c30 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _08013C74 + ldr r2, =0x03005e08 adds r1, r2 str r1, [r3] movs r2, 0 strb r2, [r1, 0x8] strb r2, [r1, 0x9] - ldr r2, _08013C78 + ldr r2, =0x03000da4 str r1, [r2] pop {r1} bx r1 .align 2, 0 -_08013C6C: .4byte sub_8013C7C + 1 -_08013C70: .4byte 0x02022c30 -_08013C74: .4byte 0x03005e08 -_08013C78: .4byte 0x03000da4 + .pool thumb_func_end sub_8013C40 thumb_func_start sub_8013C7C @@ -41453,19 +40378,18 @@ sub_8013C7C: @ 8013C7C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08013C98 + ldr r0, =0x02022c30 ldr r4, [r0] ldrb r0, [r4, 0x8] cmp r0, 0xB bhi _08013D80 lsls r0, 2 - ldr r1, _08013C9C + ldr r1, =_08013CA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08013C98: .4byte 0x02022c30 -_08013C9C: .4byte _08013CA0 + .pool .align 2, 0 _08013CA0: .4byte _08013CD0 @@ -41525,7 +40449,7 @@ _08013D28: movs r0, 0x2 bl audio_play _08013D3A: - ldr r0, _08013D54 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -41538,7 +40462,7 @@ _08013D3A: strb r0, [r4, 0x8] b _08013D80 .align 2, 0 -_08013D54: .4byte 0x03005e00 + .pool _08013D58: ldrb r0, [r4, 0x11] bl remove_task @@ -41573,13 +40497,13 @@ _08013D90: _08013D94: cmp r1, 0x16 bhi _08013DB6 - ldr r0, _08013DA4 + ldr r0, =0x082f04d8 lsls r1, 2 adds r1, r0 ldr r1, [r1] b _08013DB0 .align 2, 0 -_08013DA4: .4byte 0x082f04d8 + .pool _08013DA8: ldrb r0, [r1] cmp r0, r2 @@ -41645,7 +40569,7 @@ sub_8013DF4: @ 8013DF4 lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r0, _08013E40 + ldr r0, =0x02022c30 ldr r0, [r0] mov r8, r0 bl sub_8013DBC @@ -41670,7 +40594,7 @@ sub_8013DF4: @ 8013DF4 pop {r0} bx r0 .align 2, 0 -_08013E40: .4byte 0x02022c30 + .pool thumb_func_end sub_8013DF4 thumb_func_start sub_8013E44 @@ -41679,7 +40603,7 @@ sub_8013E44: @ 8013E44 mov r7, r8 push {r7} sub sp, 0x4 - ldr r0, _08013EAC + ldr r0, =0x02022c30 ldr r6, [r0] movs r7, 0 movs r3, 0 @@ -41727,7 +40651,7 @@ _08013E54: stm r1!, {r2,r4,r7} b _08013EDA .align 2, 0 -_08013EAC: .4byte 0x02022c30 + .pool _08013EB0: ldr r0, [r6] adds r1, r0, r5 @@ -41777,7 +40701,7 @@ _08013EEE: ldr r0, [r6] adds r2, r0, r5 ldrh r1, [r2, 0x18] - ldr r0, _08013F5C + ldr r0, =0x0000012b cmp r1, r0 bls _08013F20 ldrb r0, [r2, 0x1A] @@ -41821,7 +40745,7 @@ _08013F44: pop {r1} bx r1 .align 2, 0 -_08013F5C: .4byte 0x0000012b + .pool thumb_func_end sub_8013E44 thumb_func_start sub_8013F60 @@ -41841,7 +40765,7 @@ sub_8013F60: @ 8013F60 thumb_func_start sub_8013F78 sub_8013F78: @ 8013F78 push {lr} - ldr r0, _08013F8C + ldr r0, =sub_8013F60 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -41849,7 +40773,7 @@ sub_8013F78: @ 8013F78 pop {r1} bx r1 .align 2, 0 -_08013F8C: .4byte sub_8013F60 + 1 + .pool thumb_func_end sub_8013F78 thumb_func_start sub_8013F90 @@ -41859,7 +40783,7 @@ sub_8013F90: @ 8013F90 push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08013FCC + ldr r0, =0x02022c40 mov r8, r0 bl link_get_multiplayer_id adds r1, r0, 0 @@ -41868,7 +40792,7 @@ sub_8013F90: @ 8013F90 mov r0, r8 bl sub_8018120 adds r7, r0, 0 - ldr r1, _08013FD0 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -41883,8 +40807,7 @@ sub_8013F90: @ 8013F90 beq _08013FDE b _080140BC .align 2, 0 -_08013FCC: .4byte 0x02022c40 -_08013FD0: .4byte 0x03005e00 + .pool _08013FD4: cmp r0, 0x2 beq _08014038 @@ -41898,14 +40821,14 @@ _08013FDE: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _08013FF8 + ldr r0, =0x020244ec adds r1, r0 movs r0, 0 movs r2, 0x64 bl link_0800A448 b _080140BC .align 2, 0 -_08013FF8: .4byte 0x020244ec + .pool _08013FFC: bl sub_800A550 lsls r0, 24 @@ -41914,12 +40837,12 @@ _08013FFC: bne _080140BC bl link_get_multiplayer_id adds r1, r0, 0 - ldr r0, _08014030 + ldr r0, =0x02024744 movs r2, 0x1 eors r1, r2 lsls r1, 24 lsrs r1, 16 - ldr r2, _08014034 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x64 bl memcpy @@ -41928,13 +40851,12 @@ _08013FFC: bl sub_800A5B4 b _0801405A .align 2, 0 -_08014030: .4byte 0x02024744 -_08014034: .4byte 0x020223c4 + .pool _08014038: - ldr r4, _08014064 - ldr r0, _08014068 + ldr r4, =0x020228c4 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0801406C + ldr r0, =0x00002be0 adds r1, r0 adds r0, r4, 0 movs r2, 0xDC @@ -41952,36 +40874,34 @@ _0801405A: strh r0, [r5, 0x8] b _080140BC .align 2, 0 -_08014064: .4byte 0x020228c4 -_08014068: .4byte 0x03005d8c -_0801406C: .4byte 0x00002be0 + .pool _08014070: bl sub_800A550 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 bne _080140BC - ldr r4, _080140C8 + ldr r4, =0x020321c0 bl link_get_multiplayer_id adds r1, r0, 0 movs r0, 0x1 eors r1, r0 lsls r1, 24 lsrs r1, 16 - ldr r0, _080140CC + ldr r0, =0x020223c4 adds r1, r0 adds r0, r4, 0 movs r2, 0xD8 bl memcpy bl sub_800A5B4 - ldr r1, _080140D0 + ldr r1, =0x02032298 strb r7, [r1] movs r0, 0x6 strb r0, [r1, 0x1] - ldr r1, _080140D4 - ldr r0, _080140D8 + ldr r1, =0x030022c0 + ldr r0, =c2_exit_to_overworld_2_switch + 1 str r0, [r1, 0x8] - ldr r0, _080140DC + ldr r0, =sub_807AE50 + 1 bl set_callback2 mov r0, r8 bl sub_801807C @@ -41994,12 +40914,7 @@ _080140BC: pop {r0} bx r0 .align 2, 0 -_080140C8: .4byte 0x020321c0 -_080140CC: .4byte 0x020223c4 -_080140D0: .4byte 0x02032298 -_080140D4: .4byte 0x030022c0 -_080140D8: .4byte c2_exit_to_overworld_2_switch + 1 -_080140DC: .4byte sub_807AE50 + 1 + .pool thumb_func_end sub_8013F90 thumb_func_start sub_80140E0 @@ -42007,7 +40922,7 @@ sub_80140E0: @ 80140E0 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08014100 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -42020,7 +40935,7 @@ sub_80140E0: @ 80140E0 beq _0801411C b _0801419E .align 2, 0 -_08014100: .4byte 0x03005e00 + .pool _08014104: bl link_get_multiplayer_id lsls r0, 24 @@ -42042,17 +40957,17 @@ _0801411C: cmp r4, r0 bne _0801419E movs r4, 0 - ldr r5, _08014134 + ldr r5, =0x020229e8 b _08014152 .align 2, 0 -_08014134: .4byte 0x020229e8 + .pool _08014138: lsls r1, r4, 8 - ldr r0, _08014188 + ldr r0, =0x020223c4 adds r3, r1, r0 movs r0, 0x64 muls r0, r4 - ldr r1, _0801418C + ldr r1, =0x02039b58 adds r0, r1 ldrb r2, [r5] adds r1, r3, 0 @@ -42075,7 +40990,7 @@ _08014152: eors r0, r1 lsls r0, 24 lsrs r0, 16 - ldr r1, _08014188 + ldr r1, =0x020223c4 adds r3, r0, r1 adds r0, r3, 0 adds r0, 0x60 @@ -42083,8 +40998,7 @@ _08014152: bl sub_801B94C b _08014194 .align 2, 0 -_08014188: .4byte 0x020223c4 -_0801418C: .4byte 0x02039b58 + .pool _08014190: bl sub_801B940 _08014194: @@ -42100,7 +41014,7 @@ _0801419E: thumb_func_start sub_80141A4 sub_80141A4: @ 80141A4 push {r4,lr} - ldr r0, _080141BC + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r4, r0, r1 @@ -42111,9 +41025,9 @@ sub_80141A4: @ 80141A4 beq _080141D4 b _080141F2 .align 2, 0 -_080141BC: .4byte 0x030022c0 + .pool _080141C0: - ldr r0, _080141D0 + ldr r0, =sub_80140E0 + 1 movs r1, 0x5 bl AddTask ldrb r0, [r4] @@ -42121,9 +41035,9 @@ _080141C0: strb r0, [r4] b _080141F2 .align 2, 0 -_080141D0: .4byte sub_80140E0 + 1 + .pool _080141D4: - ldr r0, _08014208 + ldr r0, =sub_80140E0 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -42133,7 +41047,7 @@ _080141D4: eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r1, _0801420C + ldr r1, =c2_exit_to_overworld_2_switch + 1 bl sub_80C4E74 _080141F2: bl run_active_tasks @@ -42144,8 +41058,7 @@ _080141F2: pop {r0} bx r0 .align 2, 0 -_08014208: .4byte sub_80140E0 + 1 -_0801420C: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_80141A4 thumb_func_start sub_8014210 @@ -42157,8 +41070,8 @@ sub_8014210: @ 8014210 bl sp000_heal_pokemon bl copy_player_party_to_sav1 bl sub_8076ECC - ldr r5, _0801427C - ldr r0, _08014280 + ldr r5, =0x020229e8 + ldr r0, =0x00002211 str r0, [r5, 0x14] bl link_get_multiplayer_id adds r4, r0, 0 @@ -42187,21 +41100,17 @@ sub_8014210: @ 8014210 lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0x18] - ldr r1, _08014284 - ldr r0, _08014288 + ldr r1, =0x030022c0 + ldr r0, =sub_80B360C + 1 str r0, [r1, 0x8] - ldr r0, _0801428C + ldr r0, =0x02022fec str r6, [r0] bl sub_806E64C pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0801427C: .4byte 0x020229e8 -_08014280: .4byte 0x00002211 -_08014284: .4byte 0x030022c0 -_08014288: .4byte sub_80B360C + 1 -_0801428C: .4byte 0x02022fec + .pool thumb_func_end sub_8014210 thumb_func_start sub_8014290 @@ -42219,10 +41128,10 @@ sub_8014290: @ 8014290 lsrs r4, 16 lsls r5, 16 lsrs r5, 16 - ldr r0, _080142FC + ldr r0, =0x00004087 adds r1, r3, 0 bl var_set - ldr r6, _08014300 + ldr r6, =0x03005d8c ldr r1, [r6] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -42257,8 +41166,7 @@ sub_8014290: @ 8014290 pop {r0} bx r0 .align 2, 0 -_080142FC: .4byte 0x00004087 -_08014300: .4byte 0x03005d8c + .pool thumb_func_end sub_8014290 thumb_func_start sub_8014304 @@ -42278,15 +41186,15 @@ sub_8014304: @ 8014304 lsrs r5, 24 lsls r1, 16 lsrs r1, 16 - ldr r0, _08014374 + ldr r0, =0x020375e0 strh r1, [r0] - ldr r0, _08014378 + ldr r0, =0x00004087 bl var_set bl sub_8009FCC - ldr r1, _0801437C + ldr r1, =0x03005db8 strb r0, [r1] bl link_get_multiplayer_id - ldr r1, _08014380 + ldr r1, =0x03005db4 strb r0, [r1] bl sub_809D2BC lsls r4, 24 @@ -42314,16 +41222,13 @@ sub_8014304: @ 8014304 pop {r0} bx r0 .align 2, 0 -_08014374: .4byte 0x020375e0 -_08014378: .4byte 0x00004087 -_0801437C: .4byte 0x03005db8 -_08014380: .4byte 0x03005db4 + .pool thumb_func_end sub_8014304 thumb_func_start sub_8014384 sub_8014384: @ 8014384 push {r4,lr} - ldr r0, _0801439C + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r4, r0, r1 @@ -42334,9 +41239,9 @@ sub_8014384: @ 8014384 beq _080143B4 b _080143C6 .align 2, 0 -_0801439C: .4byte 0x030022c0 + .pool _080143A0: - ldr r0, _080143B0 + ldr r0, =sub_80140E0 + 1 movs r1, 0x5 bl AddTask ldrb r0, [r4] @@ -42344,14 +41249,14 @@ _080143A0: strb r0, [r4] b _080143C6 .align 2, 0 -_080143B0: .4byte sub_80140E0 + 1 + .pool _080143B4: - ldr r0, _080143DC + ldr r0, =sub_80140E0 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 bne _080143C6 - ldr r0, _080143E0 + ldr r0, =sub_8086074 + 1 bl set_callback2 _080143C6: bl run_active_tasks @@ -42362,8 +41267,7 @@ _080143C6: pop {r0} bx r0 .align 2, 0 -_080143DC: .4byte sub_80140E0 + 1 -_080143E0: .4byte sub_8086074 + 1 + .pool thumb_func_end sub_8014384 thumb_func_start sub_80143E4 @@ -42396,19 +41300,18 @@ sub_801440C: @ 801440C lsls r0, 24 lsrs r4, r0, 24 bl sub_801B940 - ldr r0, _0801442C + ldr r0, =0x02022c2c ldrb r0, [r0] subs r0, 0x1 cmp r0, 0xE bhi _08014474 lsls r0, 2 - ldr r1, _08014430 + ldr r1, =_08014434 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801442C: .4byte 0x02022c2c -_08014430: .4byte _08014434 + .pool .align 2, 0 _08014434: .4byte _08014470 @@ -42429,7 +41332,7 @@ _08014434: _08014470: bl sub_800E3A8 _08014474: - ldr r0, _0801448C + ldr r0, =0x02022c2c ldrb r0, [r0] subs r0, 0x1 cmp r0, 0x50 @@ -42437,13 +41340,12 @@ _08014474: b _08014764 _08014480: lsls r0, 2 - ldr r1, _08014490 + ldr r1, =_08014494 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801448C: .4byte 0x02022c2c -_08014490: .4byte _08014494 + .pool .align 2, 0 _08014494: .4byte _080145F4 @@ -42529,18 +41431,17 @@ _08014494: .4byte _080145D8 _080145D8: bl overworld_free_bg_tilemaps - ldr r1, _080145EC - ldr r0, _080145F0 + ldr r1, =0x030022c0 + ldr r0, =sub_801AC54 + 1 str r0, [r1, 0x8] movs r0, 0x3 bl sub_81B8518 b _08014764 .align 2, 0 -_080145EC: .4byte 0x030022c0 -_080145F0: .4byte sub_801AC54 + 1 + .pool _080145F4: bl overworld_free_bg_tilemaps - ldr r0, _0801461C + ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 bl sp000_heal_pokemon @@ -42554,13 +41455,13 @@ _080145F4: movs r3, 0x8 b _080146B0 .align 2, 0 -_0801461C: .4byte 0x020228c4 + .pool _08014620: bl overworld_free_bg_tilemaps bl sp000_heal_pokemon bl copy_player_party_to_sav1 bl sub_8076ECC - ldr r0, _08014648 + ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 movs r0, 0x2 @@ -42571,13 +41472,13 @@ _08014620: movs r3, 0x8 b _080146B0 .align 2, 0 -_08014648: .4byte 0x020228c4 + .pool _0801464C: bl overworld_free_bg_tilemaps bl sp000_heal_pokemon bl copy_player_party_to_sav1 bl sub_8076ECC - ldr r0, _08014674 + ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 movs r0, 0x5 @@ -42588,9 +41489,9 @@ _0801464C: movs r3, 0x8 b _080146B0 .align 2, 0 -_08014674: .4byte 0x020228c4 + .pool _08014678: - ldr r0, _08014694 + ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 bl overworld_free_bg_tilemaps @@ -42602,9 +41503,9 @@ _08014678: movs r3, 0x8 b _080146B0 .align 2, 0 -_08014694: .4byte 0x020228c4 + .pool _08014698: - ldr r0, _080146BC + ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 bl overworld_free_bg_tilemaps @@ -42616,20 +41517,19 @@ _08014698: movs r3, 0x9 _080146B0: bl sub_8014304 - ldr r0, _080146C0 + ldr r0, =sub_8014384 + 1 bl set_callback2 b _08014764 .align 2, 0 -_080146BC: .4byte 0x020228c4 -_080146C0: .4byte sub_8014384 + 1 + .pool _080146C4: bl overworld_free_bg_tilemaps - ldr r0, _080146D4 + ldr r0, =sub_8013F90 + 1 movs r1, 0 bl AddTask b _08014764 .align 2, 0 -_080146D4: .4byte sub_8013F90 + 1 + .pool _080146D8: bl link_get_multiplayer_id lsls r0, 24 @@ -42647,15 +41547,14 @@ _080146F6: bl sub_801DD98 b _08014764 _080146FC: - ldr r0, _0801470C + ldr r0, =0x020228c4 movs r1, 0 bl sub_80143E4 - ldr r0, _08014710 + ldr r0, =sub_80141A4 + 1 bl set_callback2 b _08014764 .align 2, 0 -_0801470C: .4byte 0x020228c4 -_08014710: .4byte sub_80141A4 + 1 + .pool _08014714: movs r0, 0x8 movs r1, 0x5 @@ -42664,21 +41563,21 @@ _08014714: bl brm_get_pokemon_selection lsls r0, 24 lsrs r0, 24 - ldr r1, _08014730 + ldr r1, =c2_load_new_map + 1 bl sub_802A9A8 b _08014764 .align 2, 0 -_08014730: .4byte c2_load_new_map + 1 + .pool _08014734: movs r0, 0x7 movs r1, 0x9 movs r2, 0x1 bl sub_8014290 - ldr r0, _08014748 + ldr r0, =c2_load_new_map + 1 bl sub_8020C70 b _08014764 .align 2, 0 -_08014748: .4byte c2_load_new_map + 1 + .pool _0801474C: movs r0, 0x8 movs r1, 0x5 @@ -42687,15 +41586,15 @@ _0801474C: bl brm_get_pokemon_selection lsls r0, 24 lsrs r0, 24 - ldr r1, _08014784 + ldr r1, =c2_load_new_map + 1 bl sub_802493C _08014764: adds r0, r4, 0 bl remove_task - ldr r1, _08014788 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - ldr r0, _0801478C + ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x44 beq _0801477C @@ -42706,9 +41605,7 @@ _0801477C: pop {r0} bx r0 .align 2, 0 -_08014784: .4byte c2_load_new_map + 1 -_08014788: .4byte 0x020375f0 -_0801478C: .4byte 0x02022c2c + .pool thumb_func_end sub_801440C thumb_func_start sub_8014790 @@ -42722,9 +41619,9 @@ sub_8014790: @ 8014790 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080147C0 + ldr r1, =0x03005e08 adds r7, r0, r1 - ldr r0, _080147C4 + ldr r0, =0x020228c4 mov r9, r0 movs r1, 0 ldrsh r0, [r7, r1] @@ -42734,14 +41631,12 @@ sub_8014790: @ 8014790 b _080149B2 _080147B6: lsls r0, 2 - ldr r1, _080147C8 + ldr r1, =_080147CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080147C0: .4byte 0x03005e08 -_080147C4: .4byte 0x020228c4 -_080147C8: .4byte _080147CC + .pool .align 2, 0 _080147CC: .4byte _080147F0 @@ -42754,23 +41649,21 @@ _080147CC: .4byte _08014992 .4byte _0801499C _080147F0: - ldr r1, _0801480C + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - ldr r0, _08014810 + ldr r0, =0x02022c2c ldrb r0, [r0] subs r0, 0xE cmp r0, 0xE bhi _080148C2 lsls r0, 2 - ldr r1, _08014814 + ldr r1, =_08014818 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801480C: .4byte 0x020375f0 -_08014810: .4byte 0x02022c2c -_08014814: .4byte _08014818 + .pool .align 2, 0 _08014818: .4byte _08014854 @@ -42789,8 +41682,8 @@ _08014818: .4byte _080148B8 .4byte _08014854 _08014854: - ldr r1, _080148A4 - ldr r0, _080148A8 + ldr r1, =0x020229e8 + ldr r0, =0x00002211 str r0, [r1, 0x14] movs r2, 0 mov r8, r2 @@ -42798,11 +41691,11 @@ _08014854: strh r0, [r1, 0x18] movs r0, 0x2 strh r0, [r1, 0x34] - ldr r6, _080148AC + ldr r6, =0x0203cef8 ldrb r0, [r6] movs r5, 0x64 muls r0, r5 - ldr r4, _080148B0 + ldr r4, =0x02024488 adds r0, r4 movs r1, 0xB bl pokemon_getattr @@ -42816,7 +41709,7 @@ _08014854: bl pokemon_getattr mov r2, r9 strh r0, [r2, 0x2] - ldr r0, _080148B4 + ldr r0, =0x030022c0 mov r1, r8 str r1, [r0, 0x8] movs r0, 0x4 @@ -42825,11 +41718,7 @@ _08014854: bl sub_800A5B4 b _080149B2 .align 2, 0 -_080148A4: .4byte 0x020229e8 -_080148A8: .4byte 0x00002211 -_080148AC: .4byte 0x0203cef8 -_080148B0: .4byte 0x02024488 -_080148B4: .4byte 0x030022c0 + .pool _080148B8: bl sub_800E3A8 adds r0, r4, 0 @@ -42851,25 +41740,23 @@ _080148CC: strh r0, [r7] b _080149B2 _080148E4: - ldr r0, _08014908 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080149B2 - ldr r0, _0801490C + ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x1D bne _08014914 adds r0, r4, 0 bl remove_task - ldr r0, _08014910 + ldr r0, =sub_80773AC + 1 bl set_callback2 b _080149B2 .align 2, 0 -_08014908: .4byte 0x02037fd4 -_0801490C: .4byte 0x02022c2c -_08014910: .4byte sub_80773AC + 1 + .pool _08014914: bl sub_800ADF8 movs r0, 0x3 @@ -42902,22 +41789,21 @@ _0801494A: cmp r0, 0x3 bne _080149B2 bl sub_800A5B4 - ldr r0, _08014978 + ldr r0, =0x020223c4 movs r2, 0x80 lsls r2, 1 adds r1, r0, r2 bl sub_80B2AF4 cmp r0, 0 beq _08014980 - ldr r0, _0801497C + ldr r0, =0x020375f0 movs r1, 0xB strh r1, [r0] movs r0, 0x7 strh r0, [r7] b _080149B2 .align 2, 0 -_08014978: .4byte 0x020223c4 -_0801497C: .4byte 0x020375f0 + .pool _08014980: movs r0, 0x6 strh r0, [r7] @@ -42933,7 +41819,7 @@ _08014992: strh r0, [r7] b _080149B2 _0801499C: - ldr r0, _080149C0 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080149B2 @@ -42949,30 +41835,30 @@ _080149B2: pop {r0} bx r0 .align 2, 0 -_080149C0: .4byte 0x03003124 + .pool thumb_func_end sub_8014790 thumb_func_start sub_80149C4 sub_80149C4: @ 80149C4 push {lr} - ldr r0, _080149D4 + ldr r0, =sub_8014790 + 1 movs r1, 0 bl AddTask pop {r0} bx r0 .align 2, 0 -_080149D4: .4byte sub_8014790 + 1 + .pool thumb_func_end sub_80149C4 thumb_func_start sub_80149D8 sub_80149D8: @ 80149D8 push {lr} - ldr r0, _080149F8 + ldr r0, =sub_801440C + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080149FC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -42982,40 +41868,36 @@ sub_80149D8: @ 80149D8 pop {r0} bx r0 .align 2, 0 -_080149F8: .4byte sub_801440C + 1 -_080149FC: .4byte 0x03005e00 + .pool thumb_func_end sub_80149D8 thumb_func_start sub_8014A00 sub_8014A00: @ 8014A00 push {r4,lr} adds r4, r0, 0 - ldr r0, _08014A30 + ldr r0, =sub_8014A40 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08014A34 + ldr r2, =0x02022c30 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08014A38 + ldr r0, =0x03005e08 adds r1, r0 str r1, [r2] movs r2, 0 strb r2, [r1, 0xC] strb r2, [r1, 0xD] strb r4, [r1, 0x18] - ldr r0, _08014A3C + ldr r0, =0x020375f0 strh r2, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08014A30: .4byte sub_8014A40 + 1 -_08014A34: .4byte 0x02022c30 -_08014A38: .4byte 0x03005e08 -_08014A3C: .4byte 0x020375f0 + .pool thumb_func_end sub_8014A00 thumb_func_start sub_8014A40 @@ -43024,7 +41906,7 @@ sub_8014A40: @ 8014A40 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08014A60 + ldr r0, =0x02022c30 ldr r5, [r0] ldrb r0, [r5, 0xC] cmp r0, 0x11 @@ -43032,13 +41914,12 @@ sub_8014A40: @ 8014A40 b _08014EF2 _08014A54: lsls r0, 2 - ldr r1, _08014A64 + ldr r1, =_08014A68 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08014A60: .4byte 0x02022c30 -_08014A64: .4byte _08014A68 + .pool .align 2, 0 _08014A68: .4byte _08014AB0 @@ -43060,10 +41941,10 @@ _08014A68: .4byte _08014EA8 .4byte _08014EE2 _08014AB0: - ldr r1, _08014AE4 + ldr r1, =0x02022c2c ldrb r0, [r5, 0x18] strb r0, [r1] - ldr r1, _08014AE8 + ldr r1, =0x02022c2d movs r0, 0x2 strb r0, [r1] ldrb r0, [r5, 0x18] @@ -43081,8 +41962,7 @@ _08014AB0: strb r0, [r5, 0xC] b _08014EF2 .align 2, 0 -_08014AE4: .4byte 0x02022c2c -_08014AE8: .4byte 0x02022c2d + .pool _08014AEC: movs r0, 0x70 bl malloc_and_clear @@ -43126,18 +42006,18 @@ _08014AEC: movs r1, 0xFF bl sub_8016FC0 strb r0, [r5, 0x17] - ldr r0, _08014BA8 + ldr r0, =0x082f011c ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] bl sub_8019930 lsls r0, 16 - ldr r2, _08014BAC + ldr r2, =0x0000ffff ldr r1, [sp, 0x4] ands r1, r2 orrs r1, r0 - ldr r0, _08014BB0 + ldr r0, =0xffff00ff ands r1, r0 movs r0, 0xC0 lsls r0, 4 @@ -43148,9 +42028,9 @@ _08014AEC: strb r0, [r5, 0xF] ldrb r0, [r5, 0xF] bl sub_8018784 - ldr r0, _08014BB4 + ldr r0, =0x03006310 adds r2, r0, 0 - ldr r1, _08014BB8 + ldr r1, =0x082f015c ldm r1!, {r3,r4,r6} stm r2!, {r3,r4,r6} ldm r1!, {r3,r4,r6} @@ -43167,45 +42047,38 @@ _08014AEC: strb r0, [r5, 0x13] b _08014C42 .align 2, 0 -_08014BA8: .4byte 0x082f011c -_08014BAC: .4byte 0x0000ffff -_08014BB0: .4byte 0xffff00ff -_08014BB4: .4byte 0x03006310 -_08014BB8: .4byte 0x082f015c + .pool _08014BBC: - ldr r0, _08014BDC - ldr r2, _08014BE0 - ldr r4, _08014BE4 + ldr r0, =0x02021cc4 + ldr r2, =0x082f0048 + ldr r4, =0x02022c2c ldrb r1, [r4] lsls r1, 2 adds r1, r2 ldr r1, [r1] bl gf_strcpy - ldr r0, _08014BE8 + ldr r0, =0x02021fc4 ldrb r1, [r4] bl sub_801262C movs r0, 0x3 strb r0, [r5, 0xC] b _08014EF2 .align 2, 0 -_08014BDC: .4byte 0x02021cc4 -_08014BE0: .4byte 0x082f0048 -_08014BE4: .4byte 0x02022c2c -_08014BE8: .4byte 0x02021fc4 + .pool _08014BEC: - ldr r0, _08014BF8 + ldr r0, =0x02021fc4 bl sub_8018884 movs r0, 0x4 strb r0, [r5, 0xC] b _08014EF2 .align 2, 0 -_08014BF8: .4byte 0x02021fc4 + .pool _08014BFC: adds r0, r5, 0 movs r1, 0x5 movs r2, 0x6 bl sub_801320C - ldr r0, _08014C20 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -43218,11 +42091,11 @@ _08014C14: bl sub_800E084 b _08014EF2 .align 2, 0 -_08014C20: .4byte 0x030022c0 + .pool _08014C24: adds r0, r5, 0 adds r0, 0xD - ldr r1, _08014C48 + ldr r1, =0x082edf40 bl mevent_0814257C cmp r0, 0 bne _08014C34 @@ -43238,7 +42111,7 @@ _08014C42: strb r0, [r5, 0xC] b _08014EF2 .align 2, 0 -_08014C48: .4byte 0x082edf40 + .pool _08014C4C: movs r0, 0x7 strb r0, [r5, 0xC] @@ -43248,7 +42121,7 @@ _08014C52: adds r0, 0xD adds r1, r5, 0 adds r1, 0x14 - ldr r3, _08014C78 + ldr r3, =0x02021fc4 movs r2, 0 bl sub_8018B08 lsls r0, 24 @@ -43263,7 +42136,7 @@ _08014C52: beq _08014CC4 b _08014EF2 .align 2, 0 -_08014C78: .4byte 0x02021fc4 + .pool _08014C7C: cmp r4, 0x1 beq _08014CC4 @@ -43353,24 +42226,22 @@ _08014CF2: ldrb r0, [r5, 0x13] adds r0, 0x1 strb r0, [r5, 0x13] - ldr r0, _08014D58 + ldr r0, =0x02021cc4 ldrb r2, [r5, 0x13] lsls r2, 5 subs r2, 0x20 ldr r1, [r5] adds r1, r2 bl sub_8018404 - ldr r0, _08014D5C - ldr r1, _08014D60 + ldr r0, =0x02021fc4 + ldr r1, =0x082edc9c bl ExpandTextCodes movs r0, 0x9 strb r0, [r5, 0xC] bl sub_800EF38 b _08014DA4 .align 2, 0 -_08014D58: .4byte 0x02021cc4 -_08014D5C: .4byte 0x02021fc4 -_08014D60: .4byte 0x082edc9c + .pool _08014D64: ldrb r1, [r5, 0x13] lsls r1, 5 @@ -43415,13 +42286,13 @@ _08014DB0: strb r4, [r5, 0xC] b _08014EF2 _08014DBC: - ldr r0, _08014DC8 + ldr r0, =0x02021fc4 bl sub_8018884 movs r0, 0xA strb r0, [r5, 0xC] b _08014EF2 .align 2, 0 -_08014DC8: .4byte 0x02021fc4 + .pool _08014DCC: ldrb r0, [r5, 0xE] adds r0, 0x1 @@ -43485,19 +42356,18 @@ _08014E16: _08014E4E: adds r0, r5, 0 adds r0, 0xD - ldr r1, _08014E6C + ldr r1, =0x082ed8d0 bl mevent_0814257C cmp r0, 0 beq _08014EF2 adds r0, r4, 0 bl remove_task - ldr r1, _08014E70 + ldr r1, =0x020375f0 movs r0, 0x5 strh r0, [r1] b _08014EF2 .align 2, 0 -_08014E6C: .4byte 0x082ed8d0 -_08014E70: .4byte 0x020375f0 + .pool _08014E74: bl sub_8011A74 lsls r0, 24 @@ -43514,7 +42384,7 @@ _08014E8C: strb r0, [r5, 0xC] b _08014EF2 _08014E92: - ldr r0, _08014EA4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08014EF2 @@ -43522,7 +42392,7 @@ _08014E92: bl sub_8011068 b _08014EDA .align 2, 0 -_08014EA4: .4byte 0x03003124 + .pool _08014EA8: ldrb r0, [r5, 0x12] movs r1, 0 @@ -43564,36 +42434,32 @@ _08014EF2: sub_8014EFC: @ 8014EFC push {r4,lr} adds r4, r0, 0 - ldr r0, _08014F34 + ldr r0, =sub_8014F48 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08014F38 + ldr r2, =0x02022c30 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08014F3C + ldr r0, =0x03005e08 adds r1, r0 str r1, [r2] - ldr r0, _08014F40 + ldr r0, =0x03000da4 str r1, [r0] movs r2, 0 strb r2, [r1, 0x8] strb r2, [r1, 0x9] subs r4, 0x15 strb r4, [r1, 0x12] - ldr r0, _08014F44 + ldr r0, =0x020375f0 strh r2, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08014F34: .4byte sub_8014F48 + 1 -_08014F38: .4byte 0x02022c30 -_08014F3C: .4byte 0x03005e08 -_08014F40: .4byte 0x03000da4 -_08014F44: .4byte 0x020375f0 + .pool thumb_func_end sub_8014EFC thumb_func_start sub_8014F48 @@ -43602,7 +42468,7 @@ sub_8014F48: @ 8014F48 sub sp, 0x10 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08014F68 + ldr r0, =0x02022c30 ldr r7, [r0] ldrb r0, [r7, 0x8] cmp r0, 0xC @@ -43610,13 +42476,12 @@ sub_8014F48: @ 8014F48 b _080152A0 _08014F5C: lsls r0, 2 - ldr r1, _08014F6C + ldr r1, =_08014F70 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08014F68: .4byte 0x02022c30 -_08014F6C: .4byte _08014F70 + .pool .align 2, 0 _08014F70: .4byte _08014FA4 @@ -43654,13 +42519,13 @@ _08014FA4: strb r0, [r7, 0x8] b _080152A0 _08014FD8: - ldr r0, _08014FE4 + ldr r0, =0x082ef7f8 bl sub_8018884 movs r0, 0x2 strb r0, [r7, 0x8] b _080152A0 .align 2, 0 -_08014FE4: .4byte 0x082ef7f8 + .pool _08014FE8: ldr r0, [r7, 0x4] movs r1, 0x4 @@ -43674,18 +42539,18 @@ _08014FE8: bl sub_8016FC0 movs r6, 0 strb r0, [r7, 0x11] - ldr r0, _080150A0 + ldr r0, =0x082f0174 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] bl sub_8019930 lsls r0, 16 - ldr r2, _080150A4 + ldr r2, =0x0000ffff ldr r1, [sp, 0x4] ands r1, r2 orrs r1, r0 - ldr r5, _080150A8 + ldr r5, =0xffff00ff ands r1, r5 movs r4, 0xC0 lsls r4, 4 @@ -43694,7 +42559,7 @@ _08014FE8: mov r0, sp bl Window_AddFromTemplate strb r0, [r7, 0xB] - ldr r0, _080150AC + ldr r0, =0x082f017c ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x8] @@ -43708,9 +42573,9 @@ _08014FE8: strb r0, [r7, 0xD] ldrb r0, [r7, 0xB] bl sub_8018784 - ldr r0, _080150B0 + ldr r0, =0x03006310 adds r2, r0, 0 - ldr r1, _080150B4 + ldr r1, =0x082f0204 ldm r1!, {r3-r5} stm r2!, {r3-r5} ldm r1!, {r3-r5} @@ -43740,12 +42605,7 @@ _08014FE8: strb r0, [r7, 0x8] b _080152A0 .align 2, 0 -_080150A0: .4byte 0x082f0174 -_080150A4: .4byte 0x0000ffff -_080150A8: .4byte 0xffff00ff -_080150AC: .4byte 0x082f017c -_080150B0: .4byte 0x03006310 -_080150B4: .4byte 0x082f0204 + .pool _080150B8: bl sub_8013E44 lsls r0, 24 @@ -43764,7 +42624,7 @@ _080150D6: ldrb r0, [r7, 0xE] bl sub_81AE604 adds r2, r0, 0 - ldr r0, _08015158 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -43793,7 +42653,7 @@ _080150D6: bl sub_800DFB4 ldrb r0, [r7, 0xE] bl sub_81AE70C - ldr r0, _0801515C + ldr r0, =0x02021cc4 ldrb r2, [r7, 0xF] lsls r2, 5 ldr r1, [r7] @@ -43818,14 +42678,13 @@ _080150D6: strb r0, [r7, 0x8] b _080152A0 .align 2, 0 -_08015158: .4byte 0x030022c0 -_0801515C: .4byte 0x02021cc4 + .pool _08015160: movs r0, 0x7 bl audio_play b _080152A0 _08015168: - ldr r0, _0801517C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -43837,11 +42696,11 @@ _08015176: strb r0, [r7, 0x8] b _080152A0 .align 2, 0 -_0801517C: .4byte 0x030022c0 + .pool _08015180: - ldr r0, _0801519C + ldr r0, =0x082efc3c bl sub_8018884 - ldr r0, _080151A0 + ldr r0, =0x02021cc4 ldrb r2, [r7, 0xF] lsls r2, 5 ldr r1, [r7] @@ -43851,14 +42710,13 @@ _08015180: strb r0, [r7, 0x8] b _080152A0 .align 2, 0 -_0801519C: .4byte 0x082efc3c -_080151A0: .4byte 0x02021cc4 + .pool _080151A4: - ldr r0, _080151DC + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080151C2 - ldr r2, _080151E0 + ldr r2, =0x02022c2c ldr r1, [r7] ldrb r0, [r7, 0xF] lsls r0, 5 @@ -43883,8 +42741,7 @@ _080151C2: blt _080152A0 b _080151E8 .align 2, 0 -_080151DC: .4byte 0x03003124 -_080151E0: .4byte 0x02022c2c + .pool _080151E4: cmp r0, 0x6 bne _080152A0 @@ -43893,14 +42750,14 @@ _080151E8: strb r0, [r7, 0x8] b _080152A0 _080151EE: - ldr r0, _08015200 + ldr r0, =0x082eddf4 bl sub_8018884 movs r0, 0 movs r1, 0 bl sub_8011A64 b _080152A0 .align 2, 0 -_08015200: .4byte 0x082eddf4 + .pool _08015204: ldrb r0, [r7, 0xE] movs r1, 0 @@ -43925,7 +42782,7 @@ _08015204: _0801523A: adds r5, r7, 0 adds r5, 0x9 - ldr r4, _0801525C + ldr r4, =0x082edf80 bl sub_8011A74 lsls r0, 24 lsrs r0, 22 @@ -43938,22 +42795,21 @@ _0801523A: bl sub_800E084 b _0801526A .align 2, 0 -_0801525C: .4byte 0x082edf80 + .pool _08015260: bl sub_800E084 - ldr r0, _0801527C + ldr r0, =0x082ed8d0 bl sub_8018884 _0801526A: adds r0, r6, 0 bl remove_task bl sub_800EDD4 - ldr r1, _08015280 + ldr r1, =0x020375f0 movs r0, 0x5 strh r0, [r1] b _080152A0 .align 2, 0 -_0801527C: .4byte 0x082ed8d0 -_08015280: .4byte 0x020375f0 + .pool _08015284: ldrb r0, [r7, 0x8] adds r0, 0x1 @@ -43978,36 +42834,32 @@ _080152A0: sub_80152A8: @ 80152A8 push {r4,lr} adds r4, r0, 0 - ldr r0, _080152E0 + ldr r0, =task00_081182DC + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080152E4 + ldr r2, =0x02022c30 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080152E8 + ldr r0, =0x03005e08 adds r1, r0 str r1, [r2] - ldr r0, _080152EC + ldr r0, =0x03000da4 str r1, [r0] movs r2, 0 strb r2, [r1, 0x8] strb r2, [r1, 0x9] subs r4, 0x15 strb r4, [r1, 0x12] - ldr r0, _080152F0 + ldr r0, =0x020375f0 strh r2, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080152E0: .4byte task00_081182DC + 1 -_080152E4: .4byte 0x02022c30 -_080152E8: .4byte 0x03005e08 -_080152EC: .4byte 0x03000da4 -_080152F0: .4byte 0x020375f0 + .pool thumb_func_end sub_80152A8 thumb_func_start task00_081182DC @@ -44016,7 +42868,7 @@ task00_081182DC: @ 80152F4 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08015314 + ldr r0, =0x02022c30 ldr r5, [r0] ldrb r0, [r5, 0x8] cmp r0, 0xE @@ -44024,13 +42876,12 @@ task00_081182DC: @ 80152F4 b _08015604 _08015308: lsls r0, 2 - ldr r1, _08015318 + ldr r1, =_0801531C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08015314: .4byte 0x02022c30 -_08015318: .4byte _0801531C + .pool .align 2, 0 _0801531C: .4byte _08015358 @@ -44067,13 +42918,13 @@ _08015358: strb r0, [r5, 0x8] b _08015604 _08015386: - ldr r0, _08015394 + ldr r0, =0x082efbc8 bl sub_8018884 movs r0, 0x2 strb r0, [r5, 0x8] b _08015604 .align 2, 0 -_08015394: .4byte 0x082efbc8 + .pool _08015398: ldr r0, [r5, 0x4] movs r1, 0x4 @@ -44089,14 +42940,14 @@ _08015398: ldrb r0, [r5, 0x13] cmp r0, 0 beq _08015404 - ldr r0, _08015410 + ldr r0, =0x082f0174 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] bl sub_8019930 lsls r0, 16 - ldr r2, _08015414 + ldr r2, =0x0000ffff ldr r1, [sp, 0x4] ands r1, r2 orrs r1, r0 @@ -44106,9 +42957,9 @@ _08015398: strb r0, [r5, 0xB] ldrb r0, [r5, 0xB] bl sub_8018784 - ldr r0, _08015418 + ldr r0, =0x03006310 adds r2, r0, 0 - ldr r1, _0801541C + ldr r1, =0x082f0204 ldm r1!, {r3,r4,r6} stm r2!, {r3,r4,r6} ldm r1!, {r3,r4,r6} @@ -44128,10 +42979,7 @@ _08015404: strb r0, [r5, 0x8] b _08015604 .align 2, 0 -_08015410: .4byte 0x082f0174 -_08015414: .4byte 0x0000ffff -_08015418: .4byte 0x03006310 -_0801541C: .4byte 0x082f0204 + .pool _08015420: bl sub_8013E44 lsls r0, 24 @@ -44208,7 +43056,7 @@ _080154B4: strb r0, [r5, 0x8] b _080154D4 _080154C0: - ldr r0, _080154DC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -44224,11 +43072,11 @@ _080154D4: strb r0, [r5, 0x14] b _08015604 .align 2, 0 -_080154DC: .4byte 0x030022c0 + .pool _080154E0: - ldr r0, _080154FC + ldr r0, =0x082efc90 bl sub_8018884 - ldr r0, _08015500 + ldr r0, =0x02021cc4 ldrb r2, [r5, 0xF] lsls r2, 5 ldr r1, [r5] @@ -44238,14 +43086,13 @@ _080154E0: strb r0, [r5, 0x8] b _08015604 .align 2, 0 -_080154FC: .4byte 0x082efc90 -_08015500: .4byte 0x02021cc4 + .pool _08015504: - ldr r0, _0801553C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08015522 - ldr r2, _08015540 + ldr r2, =0x02022c2c ldr r1, [r5] ldrb r0, [r5, 0xF] lsls r0, 5 @@ -44270,8 +43117,7 @@ _08015522: blt _08015604 b _08015548 .align 2, 0 -_0801553C: .4byte 0x03003124 -_08015540: .4byte 0x02022c2c + .pool _08015544: cmp r0, 0x6 bne _08015604 @@ -44280,14 +43126,14 @@ _08015548: strb r0, [r5, 0x8] b _08015604 _0801554E: - ldr r0, _08015560 + ldr r0, =0x082edec4 bl sub_8018884 movs r0, 0 movs r1, 0 bl sub_8011A64 b _08015604 .align 2, 0 -_08015560: .4byte 0x082edec4 + .pool _08015564: ldrb r0, [r5, 0x13] cmp r0, 0 @@ -44314,21 +43160,21 @@ _08015580: _0801559A: adds r0, r5, 0 adds r0, 0x9 - ldr r1, _080155A4 + ldr r1, =0x082edf04 b _080155C2 .align 2, 0 -_080155A4: .4byte 0x082edf04 + .pool _080155A8: adds r0, r5, 0 adds r0, 0x9 - ldr r1, _080155B0 + ldr r1, =0x082ed8f8 b _080155C2 .align 2, 0 -_080155B0: .4byte 0x082ed8f8 + .pool _080155B4: adds r0, r5, 0 adds r0, 0x9 - ldr r2, _080155E0 + ldr r2, =0x082efd58 ldrb r1, [r5, 0x12] lsls r1, 2 adds r1, r2 @@ -44341,13 +43187,12 @@ _080155C2: adds r0, r4, 0 bl remove_task bl sub_800EDD4 - ldr r1, _080155E4 + ldr r1, =0x020375f0 movs r0, 0x5 strh r0, [r1] b _08015604 .align 2, 0 -_080155E0: .4byte 0x082efd58 -_080155E4: .4byte 0x020375f0 + .pool _080155E8: ldrb r0, [r5, 0x8] adds r0, 0x1 @@ -44372,22 +43217,22 @@ _08015604: sub_801560C: @ 801560C push {r4,lr} bl sub_8010F60 - ldr r0, _08015648 + ldr r0, =sub_80156E0 + 1 movs r1, 0xA bl AddTask - ldr r4, _0801564C + ldr r4, =0x02022c30 movs r0, 0x9B lsls r0, 2 bl malloc_and_clear str r0, [r4] - ldr r1, _08015650 + ldr r1, =0x03000da8 str r0, [r1] movs r1, 0 strb r1, [r0, 0x14] strb r1, [r0, 0x16] strh r1, [r0, 0x10] strh r1, [r0, 0x12] - ldr r0, _08015654 + ldr r0, =0x020375f0 strh r1, [r0] movs r0, 0xD0 movs r1, 0x1 @@ -44396,10 +43241,7 @@ sub_801560C: @ 801560C pop {r0} bx r0 .align 2, 0 -_08015648: .4byte sub_80156E0 + 1 -_0801564C: .4byte 0x02022c30 -_08015650: .4byte 0x03000da8 -_08015654: .4byte 0x020375f0 + .pool thumb_func_end sub_801560C thumb_func_start sub_8015658 @@ -44415,12 +43257,12 @@ sub_8015658: @ 8015658 sub_8015664: @ 8015664 push {lr} adds r3, r1, 0 - ldr r1, _08015684 + ldr r1, =0x02022c30 ldr r2, [r1] movs r1, 0x8 strb r1, [r2, 0x14] strb r0, [r2, 0x15] - ldr r0, _08015688 + ldr r0, =0x02021fc4 cmp r3, r0 beq _0801567E adds r1, r3, 0 @@ -44429,19 +43271,18 @@ _0801567E: pop {r0} bx r0 .align 2, 0 -_08015684: .4byte 0x02022c30 -_08015688: .4byte 0x02021fc4 + .pool thumb_func_end sub_8015664 thumb_func_start sub_801568C sub_801568C: @ 801568C push {lr} adds r2, r0, 0 - ldr r0, _080156A8 + ldr r0, =0x02022c30 ldr r1, [r0] movs r0, 0x1A strb r0, [r1, 0x14] - ldr r0, _080156AC + ldr r0, =0x02021fc4 cmp r2, r0 beq _080156A4 adds r1, r2, 0 @@ -44450,14 +43291,13 @@ _080156A4: pop {r0} bx r0 .align 2, 0 -_080156A8: .4byte 0x02022c30 -_080156AC: .4byte 0x02021fc4 + .pool thumb_func_end sub_801568C thumb_func_start sub_80156B0 sub_80156B0: @ 80156B0 push {lr} - ldr r3, _080156C4 + ldr r3, =0x0201ff00 ldr r1, [r0] movs r2, 0x80 lsls r2, 1 @@ -44466,21 +43306,21 @@ sub_80156B0: @ 80156B0 pop {r0} bx r0 .align 2, 0 -_080156C4: .4byte 0x0201ff00 + .pool thumb_func_end sub_80156B0 thumb_func_start sub_80156C8 sub_80156C8: @ 80156C8 push {lr} ldr r0, [r0] - ldr r1, _080156DC + ldr r1, =0x0201ff00 movs r2, 0x80 lsls r2, 1 bl memcpy pop {r0} bx r0 .align 2, 0 -_080156DC: .4byte 0x0201ff00 + .pool thumb_func_end sub_80156C8 thumb_func_start sub_80156E0 @@ -44490,12 +43330,12 @@ sub_80156E0: @ 80156E0 lsls r0, 24 lsrs r4, r0, 24 movs r5, 0 - ldr r0, _0801570C + ldr r0, =0x02022c30 ldr r6, [r0] lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08015710 + ldr r1, =0x03005e08 adds r7, r0, r1 ldrb r0, [r6, 0x14] cmp r0, 0x38 @@ -44503,14 +43343,12 @@ sub_80156E0: @ 80156E0 bl _08016878 _08015702: lsls r0, 2 - ldr r1, _08015714 + ldr r1, =_08015718 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801570C: .4byte 0x02022c30 -_08015710: .4byte 0x03005e08 -_08015714: .4byte _08015718 + .pool .align 2, 0 _08015718: .4byte _080157FC @@ -44587,7 +43425,7 @@ _080157FC: ldr r0, [r6] movs r1, 0x8 bl sub_8017580 - ldr r1, _08015850 + ldr r1, =0x02022c2c movs r0, 0x40 strb r0, [r1] ldr r0, [r6, 0xC] @@ -44604,7 +43442,7 @@ _080157FC: movs r0, 0x1 bl _08016876 .align 2, 0 -_08015850: .4byte 0x02022c2c + .pool _08015854: adds r0, r6, 0 adds r0, 0x21 @@ -44627,7 +43465,7 @@ _08015878: movs r1, 0 movs r2, 0 bl sub_8010F84 - ldr r2, _080158C0 + ldr r2, =0x02022c40 ldrh r0, [r2, 0x2] ldrh r1, [r2, 0xA] ldrh r2, [r2, 0xC] @@ -44644,14 +43482,13 @@ _08015878: ldr r0, [r6, 0xC] movs r1, 0x4 bl sub_80175EC - ldr r1, _080158C4 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] movs r0, 0x3 bl _08016876 .align 2, 0 -_080158C0: .4byte 0x02022c40 -_080158C4: .4byte 0x020375f0 + .pool _080158C8: bl sub_81B1360 lsls r0, 24 @@ -44664,7 +43501,7 @@ _080158C8: cmp r0, 0x9 bne _080159A0 _080158E0: - ldr r4, _080158FC + ldr r4, =0x02022c40 ldrh r0, [r4] cmp r0, 0 beq _080159A0 @@ -44678,7 +43515,7 @@ _080158E0: beq _08015950 b _0801598E .align 2, 0 -_080158FC: .4byte 0x02022c40 + .pool _08015900: movs r0, 0x54 movs r1, 0 @@ -44692,11 +43529,11 @@ _08015900: movs r1, 0 movs r2, 0 bl sub_8010FCC - ldr r0, _08015928 + ldr r0, =0x082ef4fc bl sub_801568C b _0801598E .align 2, 0 -_08015928: .4byte 0x082ef4fc + .pool _0801592C: bl brm_get_pokemon_selection lsls r0, 24 @@ -44705,12 +43542,12 @@ _0801592C: bl sub_80180A0 cmp r0, 0 bne _0801594C - ldr r1, _08015948 + ldr r1, =0x082ef47c movs r0, 0x34 bl sub_8015664 b _0801598E .align 2, 0 -_08015948: .4byte 0x082ef47c + .pool _0801594C: movs r0, 0x37 b _0801598C @@ -44721,17 +43558,17 @@ _08015950: strh r0, [r7, 0x2] cmp r5, 0x5 bls _0801596C - ldr r0, _08015968 + ldr r0, =0x082ef544 bl sub_801568C b _0801598E .align 2, 0 -_08015968: .4byte 0x082ef544 + .pool _0801596C: movs r0, 0x54 movs r1, 0 movs r2, 0x1 bl sub_8011090 - ldr r1, _08015998 + ldr r1, =0x02022c2c movs r0, 0x44 strb r0, [r1] bl brm_get_pokemon_selection @@ -44743,18 +43580,17 @@ _0801596C: _0801598C: strb r0, [r6, 0x14] _0801598E: - ldr r1, _0801599C + ldr r1, =0x02022c40 movs r0, 0 strh r0, [r1] bl _08016878 .align 2, 0 -_08015998: .4byte 0x02022c2c -_0801599C: .4byte 0x02022c40 + .pool _080159A0: movs r0, 0x4 bl _08016876 _080159A6: - ldr r4, _080159D4 + ldr r4, =0x020375f0 ldrh r0, [r4] cmp r0, 0 beq _08015A0A @@ -44766,17 +43602,15 @@ _080159A6: bl sub_8011090 movs r0, 0x2 bl audio_play - ldr r0, _080159D8 - ldr r1, _080159DC + ldr r0, =0x02021cc4 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy movs r1, 0 movs r0, 0x2A b _08015A02 .align 2, 0 -_080159D4: .4byte 0x020375f0 -_080159D8: .4byte 0x02021cc4 -_080159DC: .4byte 0x03005d90 + .pool _080159E0: cmp r0, 0xB bne _080159F4 @@ -44807,7 +43641,7 @@ _08015A0A: bne _08015A1A bl _08016878 _08015A1A: - ldr r0, _08015A48 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -44827,7 +43661,7 @@ _08015A1A: movs r0, 0x18 bl _08016876 .align 2, 0 -_08015A48: .4byte 0x030022c0 + .pool _08015A4C: bl sub_8017940 cmp r0, 0 @@ -44839,15 +43673,14 @@ _08015A4C: movs r0, 0x2 bl audio_play bl sub_80181CC - ldr r0, _08015A78 - ldr r1, _08015A7C + ldr r0, =0x02021cc4 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy movs r0, 0x2D bl _08016876 .align 2, 0 -_08015A78: .4byte 0x02021cc4 -_08015A7C: .4byte 0x03005d90 + .pool _08015A80: bl sub_8016B00 lsls r0, 24 @@ -44891,7 +43724,7 @@ _08015AD0: bl sub_801A284 bl _08016878 _08015ADA: - ldr r0, _08015AFC + ldr r0, =sub_809FA34 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -44905,7 +43738,7 @@ _08015AEA: movs r0, 0x4 bl _08016876 .align 2, 0 -_08015AFC: .4byte sub_809FA34 + 1 + .pool _08015B00: bl sub_801704C movs r3, 0x2 @@ -44944,21 +43777,21 @@ _08015B44: adds r1, r0 adds r0, r1, 0 adds r0, 0x10 - ldr r2, _08015B64 + ldr r2, =0x02022c2c ldrb r2, [r2] bl sub_8012188 strh r5, [r6, 0x12] movs r0, 0x19 bl _08016876 .align 2, 0 -_08015B64: .4byte 0x02022c2c + .pool _08015B68: - ldr r1, _08015B74 + ldr r1, =0x02021fc4 movs r0, 0x13 bl sub_8015664 bl _08016878 .align 2, 0 -_08015B74: .4byte 0x02021fc4 + .pool _08015B78: bl sub_801704C bl sub_8011A74 @@ -44978,65 +43811,59 @@ _08015B9A: bl sub_8011B90 cmp r0, 0x1 bne _08015BB0 - ldr r0, _08015BAC + ldr r0, =0x082ee6c8 bl sub_801568C b _08015BB8 .align 2, 0 -_08015BAC: .4byte 0x082ee6c8 + .pool _08015BB0: - ldr r1, _08015BE0 + ldr r1, =0x082ee6c8 movs r0, 0x1E bl sub_8015664 _08015BB8: - ldr r1, _08015BE4 + ldr r1, =0x02022c2c movs r0, 0x40 strb r0, [r1] _08015BBE: - ldr r0, _08015BE8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08015BCA bl _08016878 _08015BCA: - ldr r0, _08015BEC + ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 - ldr r0, _08015BF0 + ldr r0, =sub_80140E0 + 1 movs r1, 0x5 bl AddTask movs r0, 0x26 bl _08016876 .align 2, 0 -_08015BE0: .4byte 0x082ee6c8 -_08015BE4: .4byte 0x02022c2c -_08015BE8: .4byte 0x03003124 -_08015BEC: .4byte 0x020228c4 -_08015BF0: .4byte sub_80140E0 + 1 + .pool _08015BF4: - ldr r0, _08015C18 + ldr r0, =sub_80140E0 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 beq _08015C04 bl _08016878 _08015C04: - ldr r0, _08015C1C + ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x44 bne _08015C24 - ldr r1, _08015C20 + ldr r1, =0x082ee004 movs r0, 0x1F bl sub_8015664 bl _08016878 .align 2, 0 -_08015C18: .4byte sub_80140E0 + 1 -_08015C1C: .4byte 0x02022c2c -_08015C20: .4byte 0x082ee004 + .pool _08015C24: movs r0, 0x5 bl _08016876 _08015C2A: - ldr r0, _08015C50 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08015C36 @@ -45053,7 +43880,7 @@ _08015C36: movs r0, 0x2 bl _08016876 .align 2, 0 -_08015C50: .4byte 0x03003124 + .pool _08015C54: adds r0, r6, 0 adds r0, 0x16 @@ -45061,8 +43888,8 @@ _08015C54: adds r1, 0x1B adds r2, r6, 0 adds r2, 0x1C - ldr r3, _08015C88 - ldr r4, _08015C8C + ldr r3, =0x082f021c + ldr r4, =0x082f0244 str r4, [sp] bl sub_8017178 adds r5, r0, 0 @@ -45072,16 +43899,14 @@ _08015C54: bne _08015C78 bl _08016878 _08015C78: - ldr r0, _08015C90 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08015C94 movs r0, 0x1C bl _08016876 .align 2, 0 -_08015C88: .4byte 0x082f021c -_08015C8C: .4byte 0x082f0244 -_08015C90: .4byte 0x03003124 + .pool _08015C94: adds r1, r6, 0 adds r1, 0x98 @@ -45103,9 +43928,9 @@ _08015CB2: movs r1, 0x40 strh r1, [r0] bl sub_800FE50 - ldr r0, _08015CD8 - ldr r2, _08015CDC - ldr r1, _08015CE0 + ldr r0, =0x02021fc4 + ldr r2, =0x082eeb80 + ldr r1, =0x020229e8 ldrb r1, [r1, 0x13] lsls r1, 2 adds r1, r2 @@ -45114,13 +43939,11 @@ _08015CB2: movs r0, 0x20 bl _08016876 .align 2, 0 -_08015CD8: .4byte 0x02021fc4 -_08015CDC: .4byte 0x082eeb80 -_08015CE0: .4byte 0x020229e8 + .pool _08015CE4: - ldr r0, _08015D0C + ldr r0, =0x02022c2c strb r5, [r0] - ldr r1, _08015D10 + ldr r1, =0x02022c2d lsrs r0, r5, 8 strb r0, [r1] lsls r0, r5, 24 @@ -45130,16 +43953,14 @@ _08015CE4: bl sub_8018024 cmp r0, 0 bne _08015D18 - ldr r1, _08015D14 + ldr r1, =0x082eebd0 movs r0, 0x5 bl sub_8015664 bl _08016878 .align 2, 0 -_08015D0C: .4byte 0x02022c2c -_08015D10: .4byte 0x02022c2d -_08015D14: .4byte 0x082eebd0 + .pool _08015D18: - ldr r0, _08015D30 + ldr r0, =0x02022c2c ldrb r0, [r0] movs r1, 0x40 orrs r1, r0 @@ -45150,16 +43971,15 @@ _08015D18: movs r0, 0x1B bl _08016876 .align 2, 0 -_08015D30: .4byte 0x02022c2c + .pool _08015D34: - ldr r0, _08015D44 - ldr r1, _08015D48 + ldr r0, =0x02021fc4 + ldr r1, =0x082eeb88 bl gf_strcpy movs r0, 0x24 bl _08016876 .align 2, 0 -_08015D44: .4byte 0x02021fc4 -_08015D48: .4byte 0x082eeb88 + .pool _08015D4C: adds r0, r6, 0 bl sub_8017FD8 @@ -45177,7 +43997,7 @@ _08015D4C: adds r5, r0, 0 adds r0, r6, 0 adds r0, 0x16 - ldr r3, _08015D98 + ldr r3, =0x082ee82c lsls r1, r5, 2 lsls r2, r4, 4 adds r1, r2 @@ -45194,7 +44014,7 @@ _08015D8C: movs r0, 0x1D bl _08016876 .align 2, 0 -_08015D98: .4byte 0x082ee82c + .pool _08015D9C: bl sub_800AC34 movs r0, 0x24 @@ -45204,7 +44024,7 @@ _08015DA6: adds r0, 0x4C movs r1, 0x44 strh r1, [r0] - ldr r2, _08015DCC + ldr r2, =0x02022c40 ldrh r1, [r2, 0xE] adds r3, r6, 0 adds r3, 0x4E @@ -45217,21 +44037,19 @@ _08015DA6: movs r0, 0x1D bl _08016876 .align 2, 0 -_08015DCC: .4byte 0x02022c40 + .pool _08015DD0: - ldr r0, _08015DE8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08015DF4 - ldr r0, _08015DEC - ldr r1, _08015DF0 + ldr r0, =0x02021fc4 + ldr r1, =0x082eeb88 bl gf_strcpy movs r0, 0x1C bl _08016876 .align 2, 0 -_08015DE8: .4byte 0x03003124 -_08015DEC: .4byte 0x02021fc4 -_08015DF0: .4byte 0x082eeb88 + .pool _08015DF4: adds r0, r6, 0 bl sub_8017FD8 @@ -45240,19 +44058,18 @@ _08015DF4: ldrh r0, [r0] cmp r0, 0x51 bne _08015E2A - ldr r0, _08015E1C + ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x8 bne _08015E24 - ldr r0, _08015E20 + ldr r0, =0x02021fc4 adds r1, r6, 0 movs r2, 0 bl sub_8018220 movs r0, 0x28 bl _08016876 .align 2, 0 -_08015E1C: .4byte 0x02022c2c -_08015E20: .4byte 0x02021fc4 + .pool _08015E24: movs r0, 0xD bl _08016876 @@ -45264,20 +44081,18 @@ _08015E32: movs r5, 0 movs r0, 0x20 strb r0, [r6, 0x14] - ldr r0, _08015E50 - ldr r4, _08015E54 + ldr r0, =0x02021fc4 + ldr r4, =0x02022c2c ldrb r2, [r4] movs r1, 0x40 orrs r1, r2 - ldr r2, _08015E58 + ldr r2, =0x020229e8 ldrb r2, [r2, 0x13] bl sub_8017D9C strb r5, [r4] bl _08016878 .align 2, 0 -_08015E50: .4byte 0x02021fc4 -_08015E54: .4byte 0x02022c2c -_08015E58: .4byte 0x020229e8 + .pool _08015E5C: movs r0, 0x2 ldrsh r1, [r7, r0] @@ -45291,7 +44106,7 @@ _08015E5C: ldr r1, [r6] bl sub_8017CF8 adds r4, r0, 0 - ldr r2, _08015E90 + ldr r2, =0x082ee24c lsls r0, r4, 2 lsls r1, r5, 3 adds r0, r1 @@ -45301,11 +44116,11 @@ _08015E5C: bl sub_8015664 bl _08016878 .align 2, 0 -_08015E90: .4byte 0x082ee24c + .pool _08015E94: adds r0, r6, 0 adds r0, 0x16 - ldr r1, _08015EC0 + ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -45323,7 +44138,7 @@ _08015EA8: strh r4, [r0] bl _08016878 .align 2, 0 -_08015EC0: .4byte 0x02021fc4 + .pool _08015EC4: bl sub_800A520 lsls r0, 24 @@ -45335,7 +44150,7 @@ _08015ED2: lsls r0, 24 cmp r0, 0 bne _08015F2C - ldr r5, _08015F1C + ldr r5, =0x02021cc4 bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 @@ -45344,7 +44159,7 @@ _08015ED2: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r4, _08015F20 + ldr r4, =0x020229f0 adds r1, r4 adds r0, r5, 0 bl gf_strcpy @@ -45353,8 +44168,8 @@ _08015ED2: adds r1, r4, 0 bl sub_800E540 adds r5, r0, 0 - ldr r0, _08015F24 - ldr r2, _08015F28 + ldr r0, =0x02021fc4 + ldr r2, =0x082ee378 lsls r1, r5, 2 adds r1, r2 ldr r1, [r1] @@ -45362,10 +44177,7 @@ _08015ED2: movs r0, 0x21 bl _08016876 .align 2, 0 -_08015F1C: .4byte 0x02021cc4 -_08015F20: .4byte 0x020229f0 -_08015F24: .4byte 0x02021fc4 -_08015F28: .4byte 0x082ee378 + .pool _08015F2C: movs r0, 0x7 bl _08016876 @@ -45392,7 +44204,7 @@ _08015F54: _08015F5C: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r4, _08015F94 + ldr r4, =0x02022c2c movs r0, 0x45 strb r0, [r4] movs r0, 0x45 @@ -45415,21 +44227,21 @@ _08015F5C: strh r5, [r7, 0x6] bl _08016878 .align 2, 0 -_08015F94: .4byte 0x02022c2c + .pool _08015F98: movs r3, 0x2 ldrsh r0, [r7, r3] ldr r1, [r6] bl sub_8017CF8 adds r4, r0, 0 - ldr r1, _08015FB4 + ldr r1, =0x082eec9c lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] bl sub_801568C bl _08016878 .align 2, 0 -_08015FB4: .4byte 0x082eec9c + .pool _08015FB8: ldrh r0, [r7, 0x4] adds r0, 0x1 @@ -45474,16 +44286,16 @@ _08015FF4: bl sub_8011B90 cmp r0, 0x1 bne _08016028 - ldr r0, _08016024 + ldr r0, =0x082eed3c lsls r1, r4, 2 adds r1, r0 ldr r0, [r1] bl sub_801568C b _08016040 .align 2, 0 -_08016024: .4byte 0x082eed3c + .pool _08016028: - ldr r0, _08016038 + ldr r0, =0x082eed3c lsls r1, r4, 2 adds r1, r0 ldr r1, [r1] @@ -45491,7 +44303,7 @@ _08016028: bl sub_8015664 b _08016040 .align 2, 0 -_08016038: .4byte 0x082eed3c + .pool _0801603C: movs r0, 0x16 strb r0, [r6, 0x14] @@ -45516,23 +44328,23 @@ _0801604A: bl sub_8011B90 cmp r0, 0x1 bne _08016084 - ldr r0, _08016080 + ldr r0, =0x082eed3c lsls r1, r4, 2 adds r1, r0 ldr r0, [r1] bl sub_801568C b _08016092 .align 2, 0 -_08016080: .4byte 0x082eed3c + .pool _08016084: - ldr r0, _080160A4 + ldr r0, =0x082eed3c lsls r1, r4, 2 adds r1, r0 ldr r1, [r1] movs r0, 0x1E bl sub_8015664 _08016092: - ldr r0, _080160A8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0801609E @@ -45541,8 +44353,7 @@ _0801609E: movs r0, 0x10 bl _08016876 .align 2, 0 -_080160A4: .4byte 0x082eed3c -_080160A8: .4byte 0x03003124 + .pool _080160AC: movs r0, 0x49 bl audio_play @@ -45563,28 +44374,26 @@ _080160C6: movs r0, 0x2 bl _08016876 _080160DA: - ldr r0, _080160F8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080160E4 b _08016878 _080160E4: - ldr r0, _080160FC + ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 - ldr r0, _08016100 + ldr r0, =sub_80140E0 + 1 movs r1, 0x5 bl AddTask movs r0, 0x27 b _08016876 .align 2, 0 -_080160F8: .4byte 0x03003124 -_080160FC: .4byte 0x020228c4 -_08016100: .4byte sub_80140E0 + 1 + .pool _08016104: adds r0, r6, 0 bl sub_801689C - ldr r0, _08016144 + ldr r0, =sub_80140E0 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -45593,8 +44402,8 @@ _08016104: _08016118: movs r0, 0x21 strb r0, [r6, 0x14] - ldr r0, _08016148 - ldr r4, _0801614C + ldr r0, =0x02021cc4 + ldr r4, =0x02022a0c adds r1, r4, 0 bl gf_strcpy adds r0, r4, 0 @@ -45603,25 +44412,21 @@ _08016118: adds r1, r4, 0 bl sub_800E540 adds r5, r0, 0 - ldr r0, _08016150 - ldr r2, _08016154 + ldr r0, =0x02021fc4 + ldr r2, =0x082ee324 lsls r1, r5, 2 adds r1, r2 ldr r1, [r1] bl ExpandTextCodes b _08016878 .align 2, 0 -_08016144: .4byte sub_80140E0 + 1 -_08016148: .4byte 0x02021cc4 -_0801614C: .4byte 0x02022a0c -_08016150: .4byte 0x02021fc4 -_08016154: .4byte 0x082ee324 + .pool _08016158: adds r0, r6, 0 bl sub_801689C adds r0, r6, 0 adds r0, 0x16 - ldr r1, _08016174 + ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -45631,7 +44436,7 @@ _08016170: movs r0, 0x22 b _08016876 .align 2, 0 -_08016174: .4byte 0x02021fc4 + .pool _08016178: adds r0, r6, 0 bl sub_801689C @@ -45641,7 +44446,7 @@ _08016178: bne _0801618A b _08016878 _0801618A: - ldr r0, _080161AC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -45651,22 +44456,20 @@ _0801618A: _08016198: movs r0, 0x1 bl sub_8011DE0 - ldr r0, _080161B0 - ldr r1, _080161B4 + ldr r0, =0x02021fc4 + ldr r1, =0x082ee598 bl gf_strcpy movs r0, 0x24 b _08016876 .align 2, 0 -_080161AC: .4byte 0x030022c0 -_080161B0: .4byte 0x02021fc4 -_080161B4: .4byte 0x082ee598 + .pool _080161B8: - ldr r1, _080161C4 + ldr r1, =0x02021fc4 movs r0, 0x9 bl sub_8015664 b _08016878 .align 2, 0 -_080161C4: .4byte 0x02021fc4 + .pool _080161C8: adds r0, r6, 0 adds r0, 0x16 @@ -45692,7 +44495,7 @@ _080161EE: adds r0, 0x4C movs r1, 0x51 strh r1, [r0] - ldr r1, _0801621C + ldr r1, =0x02022c2c ldrb r1, [r1] adds r5, r0, 0 cmp r1, 0x45 @@ -45709,7 +44512,7 @@ _080161EE: bl sub_8011090 b _0801623E .align 2, 0 -_0801621C: .4byte 0x02022c2c + .pool _08016220: movs r0, 0x40 adds r4, r1, 0 @@ -45729,7 +44532,7 @@ _0801623E: movs r0, 0 strb r0, [r1, 0x1B] strh r0, [r7, 0x6] - ldr r0, _08016270 + ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x41 bne _08016286 @@ -45742,14 +44545,12 @@ _0801623E: bl sub_800FE50 movs r0, 0xA strb r0, [r6, 0x14] - ldr r0, _08016274 - ldr r1, _08016278 + ldr r0, =0x02021fc4 + ldr r1, =0x082eec14 bl gf_strcpy b _08016878 .align 2, 0 -_08016270: .4byte 0x02022c2c -_08016274: .4byte 0x02021fc4 -_08016278: .4byte 0x082eec14 + .pool _0801627C: adds r0, r5, 0 bl sub_800FE50 @@ -45760,14 +44561,14 @@ _08016286: bne _080162A4 adds r0, r5, 0 bl sub_800FE50 - ldr r0, _080162A0 + ldr r0, =0x02021fc4 adds r1, r6, 0 movs r2, 0x1 bl sub_8018220 movs r0, 0x28 b _08016876 .align 2, 0 -_080162A0: .4byte 0x02021fc4 + .pool _080162A4: adds r0, r5, 0 bl sub_800FE50 @@ -45781,29 +44582,28 @@ _080162AE: bl sub_800FE50 movs r0, 0xA strb r0, [r6, 0x14] - ldr r0, _080162CC - ldr r1, _080162D0 + ldr r0, =0x02021fc4 + ldr r1, =0x02022c2c ldrb r1, [r1] bl sub_8013078 b _08016878 .align 2, 0 -_080162CC: .4byte 0x02021fc4 -_080162D0: .4byte 0x02022c2c + .pool _080162D4: bl sub_800AC34 movs r0, 0x24 b _08016876 _080162DC: - ldr r0, _0801630C + ldr r0, =0x03003124 ldrb r4, [r0] cmp r4, 0 beq _080162E6 b _08016878 _080162E6: - ldr r1, _08016310 + ldr r1, =0x02022c2c movs r0, 0x40 strb r0, [r1] - ldr r1, _08016314 + ldr r1, =0x02021fc4 movs r0, 0x25 bl sub_8015664 adds r0, r6, 0 @@ -45818,9 +44618,7 @@ _080162E6: strh r4, [r0] b _08016878 .align 2, 0 -_0801630C: .4byte 0x03003124 -_08016310: .4byte 0x02022c2c -_08016314: .4byte 0x02021fc4 + .pool _08016318: movs r0, 0x2 strb r0, [r6, 0x14] @@ -45828,8 +44626,8 @@ _08016318: bl sub_801818C b _08016878 _08016324: - ldr r4, _08016340 - ldr r0, _08016344 + ldr r4, =0x02021fc4 + ldr r0, =0x02022c2c ldrb r0, [r0] movs r1, 0x40 orrs r1, r0 @@ -45840,8 +44638,7 @@ _08016324: bl sub_8015664 b _08016878 .align 2, 0 -_08016340: .4byte 0x02021fc4 -_08016344: .4byte 0x02022c2c + .pool _08016348: bl sub_800ADF8 movs r0, 0xF @@ -45893,17 +44690,17 @@ _080163AE: bl sub_8019E3C adds r0, r4, 0 bl remove_task - ldr r0, _080163C8 + ldr r0, =0x02022c30 ldr r0, [r0] bl free bl sub_80149D8 b _08016878 .align 2, 0 -_080163C8: .4byte 0x02022c30 + .pool _080163CC: bl sub_800F7DC ldrh r1, [r0, 0x8] - ldr r4, _080163E0 + ldr r4, =0x000003ff adds r0, r4, 0 ands r0, r1 cmp r0, 0 @@ -45911,7 +44708,7 @@ _080163CC: movs r0, 0x2B b _08016876 .align 2, 0 -_080163E0: .4byte 0x000003ff + .pool _080163E4: bl sub_800F7DC ldrh r1, [r0, 0x8] @@ -45921,26 +44718,25 @@ _080163E4: lsls r1, 1 cmp r0, r1 bne _08016408 - ldr r0, _08016400 - ldr r1, _08016404 + ldr r0, =0x02021fc4 + ldr r1, =0x082ef590 bl gf_strcpy b _0801643E .align 2, 0 -_08016400: .4byte 0x02021fc4 -_08016404: .4byte 0x082ef590 + .pool _08016408: - ldr r4, _08016448 + ldr r4, =0x02021cc4 bl sub_800F7DC ldrh r0, [r0, 0x8] lsls r0, 22 lsrs r0, 22 movs r1, 0xB muls r1, r0 - ldr r0, _0801644C + ldr r0, =0x083185c8 adds r1, r0 adds r0, r4, 0 bl gf_strcpy - ldr r4, _08016450 + ldr r4, =0x02021dc4 bl sub_800F7DC ldrb r1, [r0, 0xB] lsrs r1, 1 @@ -45948,24 +44744,20 @@ _08016408: movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r0, _08016454 - ldr r1, _08016458 + ldr r0, =0x02021fc4 + ldr r1, =0x082ef564 bl ExpandTextCodes _0801643E: - ldr r1, _08016454 + ldr r1, =0x02021fc4 movs r0, 0x2C bl sub_8015664 b _08016878 .align 2, 0 -_08016448: .4byte 0x02021cc4 -_0801644C: .4byte 0x083185c8 -_08016450: .4byte 0x02021dc4 -_08016454: .4byte 0x02021fc4 -_08016458: .4byte 0x082ef564 + .pool _0801645C: adds r0, r6, 0 adds r0, 0x16 - ldr r1, _08016474 + ldr r1, =0x082ef20c bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -45975,7 +44767,7 @@ _0801646E: movs r0, 0x2F b _08016876 .align 2, 0 -_08016474: .4byte 0x082ef20c + .pool _08016478: adds r0, r6, 0 adds r0, 0x16 @@ -45983,8 +44775,8 @@ _08016478: adds r1, 0x1D adds r2, r6, 0 adds r2, 0x1E - ldr r3, _080164B0 - ldr r4, _080164B4 + ldr r3, =0x082f025c + ldr r4, =0x082f027c str r4, [sp] bl sub_8017178 adds r5, r0, 0 @@ -46006,8 +44798,7 @@ _080164A4: bl sub_801818C b _08016878 .align 2, 0 -_080164B0: .4byte 0x082f025c -_080164B4: .4byte 0x082f027c + .pool _080164B8: cmp r5, 0x1 beq _080164C2 @@ -46015,19 +44806,19 @@ _080164B8: beq _080164D0 b _08016878 _080164C2: - ldr r1, _080164CC + ldr r1, =0x082ef4c4 movs r0, 0x35 bl sub_8015664 b _08016878 .align 2, 0 -_080164CC: .4byte 0x082ef4c4 + .pool _080164D0: - ldr r1, _080164DC + ldr r1, =0x082ef298 movs r0, 0x2F bl sub_8015664 b _08016878 .align 2, 0 -_080164DC: .4byte 0x082ef298 + .pool _080164E0: movs r0, 0x1 negs r0, r0 @@ -46039,7 +44830,7 @@ _080164E0: movs r0, 0x36 b _08016876 _080164F4: - ldr r0, _08016518 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -46047,22 +44838,18 @@ _080164F4: beq _08016502 b _08016878 _08016502: - ldr r1, _0801651C + ldr r1, =0x02022c40 movs r0, 0x1 strh r0, [r1] - ldr r1, _08016520 - ldr r0, _08016524 + ldr r1, =0x03005dac + ldr r0, =sub_80AF128 + 1 str r0, [r1] - ldr r1, _08016528 + ldr r1, =c2_exit_to_overworld_2_switch + 1 movs r0, 0x8 bl sub_81B8904 b _08016878 .align 2, 0 -_08016518: .4byte 0x02037fd4 -_0801651C: .4byte 0x02022c40 -_08016520: .4byte 0x03005dac -_08016524: .4byte sub_80AF128 + 1 -_08016528: .4byte c2_exit_to_overworld_2_switch + 1 + .pool _0801652C: adds r0, r6, 0 adds r0, 0x16 @@ -46070,8 +44857,8 @@ _0801652C: adds r1, 0x1D adds r2, r6, 0 adds r2, 0x1E - ldr r3, _08016570 - ldr r4, _08016574 + ldr r3, =0x082f0294 + ldr r4, =0x082f032c str r4, [sp] bl sub_8017178 adds r5, r0, 0 @@ -46087,39 +44874,35 @@ _0801654E: cmp r5, 0x12 bne _08016580 _08016558: - ldr r0, _08016578 + ldr r0, =0x02022c40 bl sub_801807C movs r0, 0 movs r1, 0 movs r2, 0 bl sub_8010FCC - ldr r0, _0801657C + ldr r0, =0x082ef4fc bl sub_801568C b _08016878 .align 2, 0 -_08016570: .4byte 0x082f0294 -_08016574: .4byte 0x082f032c -_08016578: .4byte 0x02022c40 -_0801657C: .4byte 0x082ef4fc + .pool _08016580: - ldr r0, _08016588 + ldr r0, =0x02022c40 strh r5, [r0, 0x2] movs r0, 0x37 b _08016876 .align 2, 0 -_08016588: .4byte 0x02022c40 + .pool _0801658C: - ldr r2, _080165A0 + ldr r2, =0x02022c40 ldrh r0, [r2, 0x2] ldrh r1, [r2, 0xA] ldrh r2, [r2, 0xC] bl sub_8010FCC - ldr r0, _080165A4 + ldr r0, =0x082ef520 bl sub_801568C b _08016878 .align 2, 0 -_080165A0: .4byte 0x02022c40 -_080165A4: .4byte 0x082ef520 + .pool _080165A8: adds r0, r6, 0 adds r0, 0x16 @@ -46151,7 +44934,7 @@ _080165D2: _080165DC: adds r0, r6, 0 adds r0, 0x16 - ldr r1, _08016608 + ldr r1, =0x082ef5b8 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -46162,19 +44945,18 @@ _080165EE: movs r1, 0 movs r2, 0 bl sub_8010FCC - ldr r0, _0801660C + ldr r0, =0x02022c40 bl sub_801807C movs r0, 0x1 bl sub_801818C movs r0, 0x4 b _08016876 .align 2, 0 -_08016608: .4byte 0x082ef5b8 -_0801660C: .4byte 0x02022c40 + .pool _08016610: adds r0, r6, 0 adds r0, 0x16 - ldr r1, _08016628 + ldr r1, =0x082ef1ec bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -46184,7 +44966,7 @@ _08016622: movs r0, 0x2E b _08016876 .align 2, 0 -_08016628: .4byte 0x082ef1ec + .pool _0801662C: bl sub_80173B0 movs r0, 0x30 @@ -46198,9 +44980,9 @@ _08016634: adds r2, 0x4A adds r3, r6, 0 adds r3, 0x1E - ldr r4, _08016674 + ldr r4, =0x082f034c str r4, [sp] - ldr r4, _08016678 + ldr r4, =0x082f03a4 str r4, [sp, 0x4] ldr r4, [r6] str r4, [sp, 0x8] @@ -46223,8 +45005,7 @@ _0801666A: movs r0, 0x4 b _08016876 .align 2, 0 -_08016674: .4byte 0x082f034c -_08016678: .4byte 0x082f03a4 + .pool _0801667C: bl sub_80173B0 ldr r1, [r6] @@ -46248,65 +45029,58 @@ _080166A2: beq _080166FC b _08016878 _080166A8: - ldr r0, _080166C0 + ldr r0, =0x02021cc4 ldr r1, [r6] adds r1, r4 bl sub_8018404 - ldr r1, _080166C4 + ldr r1, =0x082ef65c movs r0, 0x31 bl sub_8015664 strh r5, [r7, 0x2] b _08016878 .align 2, 0 -_080166C0: .4byte 0x02021cc4 -_080166C4: .4byte 0x082ef65c + .pool _080166C8: - ldr r0, _080166EC + ldr r0, =0x02021cc4 ldr r1, [r6] adds r1, r4 bl sub_8018404 - ldr r0, _080166F0 + ldr r0, =0x02021dc4 ldr r1, [r6] adds r1, r4 ldrb r2, [r1, 0x9] lsrs r2, 2 lsls r1, r2, 3 subs r1, r2 - ldr r2, _080166F4 + ldr r2, =0x0831ae38 adds r1, r2 bl gf_strcpy - ldr r1, _080166F8 + ldr r1, =0x082ef6e4 b _0801671E .align 2, 0 -_080166EC: .4byte 0x02021cc4 -_080166F0: .4byte 0x02021dc4 -_080166F4: .4byte 0x0831ae38 -_080166F8: .4byte 0x082ef6e4 + .pool _080166FC: - ldr r0, _08016728 + ldr r0, =0x02021cc4 ldr r1, [r6] adds r1, r4 bl sub_8018404 - ldr r0, _0801672C + ldr r0, =0x02021dc4 ldr r1, [r6] adds r1, r4 ldrb r2, [r1, 0x9] lsrs r2, 2 lsls r1, r2, 3 subs r1, r2 - ldr r2, _08016730 + ldr r2, =0x0831ae38 adds r1, r2 bl gf_strcpy - ldr r1, _08016734 + ldr r1, =0x082ef718 _0801671E: movs r0, 0x2E bl sub_8015664 b _08016878 .align 2, 0 -_08016728: .4byte 0x02021cc4 -_0801672C: .4byte 0x02021dc4 -_08016730: .4byte 0x0831ae38 -_08016734: .4byte 0x082ef718 + .pool _08016738: adds r0, r6, 0 adds r0, 0x16 @@ -46338,17 +45112,17 @@ _08016762: _0801676C: adds r0, r6, 0 adds r0, 0x16 - ldr r1, _080167D4 + ldr r1, =0x082ef4c4 bl sub_8017064 lsls r0, 24 cmp r0, 0 bne _0801677E b _08016878 _0801677E: - ldr r4, _080167D8 + ldr r4, =0x02022c40 movs r0, 0x2 strh r0, [r4] - ldr r2, _080167DC + ldr r2, =0x02022c38 movs r3, 0x2 ldrsh r0, [r7, r3] ldr r1, [r6] @@ -46356,7 +45130,7 @@ _0801677E: adds r0, r1 ldr r0, [r0] str r0, [r2] - ldr r2, _080167E0 + ldr r2, =0x02022c3e ldr r1, [r6] movs r3, 0x2 ldrsh r0, [r7, r3] @@ -46365,7 +45139,7 @@ _0801677E: ldrb r0, [r1, 0x9] lsrs r0, 2 strb r0, [r2] - ldr r2, _080167E4 + ldr r2, =0x02022c3c ldr r1, [r6] movs r3, 0x2 ldrsh r0, [r7, r3] @@ -46375,10 +45149,10 @@ _0801677E: lsls r0, 22 lsrs r0, 22 strh r0, [r2] - ldr r1, _080167E8 - ldr r0, _080167EC + ldr r1, =0x03005dac + ldr r0, =sub_80AF128 + 1 str r0, [r1] - ldr r1, _080167F0 + ldr r1, =c2_exit_to_overworld_2_switch + 1 movs r0, 0x9 bl sub_81B8904 adds r0, r6, 0 @@ -46387,16 +45161,9 @@ _0801677E: strb r0, [r4, 0x8] b _08016878 .align 2, 0 -_080167D4: .4byte 0x082ef4c4 -_080167D8: .4byte 0x02022c40 -_080167DC: .4byte 0x02022c38 -_080167E0: .4byte 0x02022c3e -_080167E4: .4byte 0x02022c3c -_080167E8: .4byte 0x03005dac -_080167EC: .4byte sub_80AF128 + 1 -_080167F0: .4byte c2_exit_to_overworld_2_switch + 1 + .pool _080167F4: - ldr r1, _0801682C + ldr r1, =0x02022c2c movs r0, 0x44 strb r0, [r1] movs r1, 0x2 @@ -46408,26 +45175,24 @@ _080167F4: adds r0, 0x10 movs r2, 0x44 bl sub_8012188 - ldr r0, _08016830 + ldr r0, =0x02021cc4 movs r3, 0x2 ldrsh r2, [r7, r3] lsls r2, 5 ldr r1, [r6] adds r1, r2 bl sub_8018404 - ldr r0, _08016834 + ldr r0, =0x082ee17c ldr r0, [r0, 0x8] bl sub_8017020 movs r0, 0x19 b _08016876 .align 2, 0 -_0801682C: .4byte 0x02022c2c -_08016830: .4byte 0x02021cc4 -_08016834: .4byte 0x082ee17c + .pool _08016838: adds r0, r6, 0 adds r0, 0x16 - ldr r1, _08016860 + ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -46443,11 +45208,11 @@ _08016838: movs r0, 0x4 b _08016876 .align 2, 0 -_08016860: .4byte 0x02021fc4 + .pool _08016864: adds r0, r6, 0 adds r0, 0x16 - ldr r1, _08016880 + ldr r1, =0x02021fc4 bl sub_8017064 lsls r0, 24 cmp r0, 0 @@ -46461,7 +45226,7 @@ _08016878: pop {r0} bx r0 .align 2, 0 -_08016880: .4byte 0x02021fc4 + .pool thumb_func_end sub_80156E0 thumb_func_start var_800D_set_xB @@ -46470,21 +45235,21 @@ var_800D_set_xB: @ 8016884 bl in_trade_center cmp r0, 0x1 bne _08016894 - ldr r1, _08016898 + ldr r1, =0x020375f0 movs r0, 0xB strh r0, [r1] _08016894: pop {r0} bx r0 .align 2, 0 -_08016898: .4byte 0x020375f0 + .pool thumb_func_end var_800D_set_xB thumb_func_start sub_801689C sub_801689C: @ 801689C push {r4,r5,lr} adds r2, r0, 0 - ldr r3, _080168D8 + ldr r3, =0x03003090 ldrh r5, [r3, 0x12] adds r4, r5, 0 cmp r4, 0 @@ -46513,7 +45278,7 @@ _080168D0: pop {r0} bx r0 .align 2, 0 -_080168D8: .4byte 0x03003090 + .pool thumb_func_end sub_801689C thumb_func_start sub_80168DC @@ -46525,8 +45290,8 @@ sub_80168DC: @ 80168DC ldrh r0, [r5] cmp r0, 0 beq _0801692C - ldr r0, _08016910 - ldr r1, _08016914 + ldr r0, =0x02021fc4 + ldr r1, =0x020229e8 adds r1, 0x2F ldrb r1, [r1] adds r2, r5, 0 @@ -46538,15 +45303,13 @@ sub_80168DC: @ 80168DC bne _0801691C movs r0, 0x23 strb r0, [r4, 0x14] - ldr r1, _08016918 + ldr r1, =0x02022c2c ldrh r0, [r5] strb r0, [r1] movs r0, 0 b _0801692E .align 2, 0 -_08016910: .4byte 0x02021fc4 -_08016914: .4byte 0x020229e8 -_08016918: .4byte 0x02022c2c + .pool _0801691C: cmp r0, 0x2 bne _0801692C @@ -46566,18 +45329,18 @@ _0801692E: thumb_func_start sub_8016934 sub_8016934: @ 8016934 push {r4,r5,lr} - ldr r5, _0801696C + ldr r5, =0x02022c20 movs r0, 0xFF strb r0, [r5] - ldr r0, _08016970 + ldr r0, =task00_081199FC + 1 movs r1, 0 bl AddTask - ldr r4, _08016974 + ldr r4, =0x02022c30 movs r0, 0x9B lsls r0, 2 bl malloc_and_clear str r0, [r4] - ldr r1, _08016978 + ldr r1, =0x03000da8 str r0, [r1] movs r1, 0 strb r1, [r0, 0x14] @@ -46591,10 +45354,7 @@ sub_8016934: @ 8016934 pop {r0} bx r0 .align 2, 0 -_0801696C: .4byte 0x02022c20 -_08016970: .4byte task00_081199FC + 1 -_08016974: .4byte 0x02022c30 -_08016978: .4byte 0x03000da8 + .pool thumb_func_end sub_8016934 thumb_func_start task00_081199FC @@ -46603,7 +45363,7 @@ task00_081199FC: @ 801697C sub sp, 0x20 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0801699C + ldr r0, =0x02022c30 ldr r5, [r0] ldrb r0, [r5, 0x14] cmp r0, 0x4 @@ -46611,13 +45371,12 @@ task00_081199FC: @ 801697C b _08016AC8 _08016990: lsls r0, 2 - ldr r1, _080169A0 + ldr r1, =_080169A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801699C: .4byte 0x02022c30 -_080169A0: .4byte _080169A4 + .pool .align 2, 0 _080169A4: .4byte _080169B8 @@ -46682,7 +45441,7 @@ _08016A30: blt _08016AC8 cmp r0, 0x2 bgt _08016AC8 - ldr r0, _08016A80 + ldr r0, =0x02022c20 ldrb r0, [r0] cmp r0, 0xFF bne _08016AC8 @@ -46714,14 +45473,14 @@ _08016A78: ble _08016A4A b _08016AC8 .align 2, 0 -_08016A80: .4byte 0x02022c20 + .pool _08016A84: - ldr r0, _08016A90 + ldr r0, =0x02022c20 mov r1, sp bl gf_strcpy b _08016AC8 .align 2, 0 -_08016A90: .4byte 0x02022c20 + .pool _08016A94: ldr r0, [r5, 0x8] bl free @@ -46735,7 +45494,7 @@ _08016A94: adds r0, 0x20 ldrb r0, [r0] bl remove_task - ldr r0, _08016AD0 + ldr r0, =0x02022c30 ldr r0, [r0] bl free bl sub_800EDD4 @@ -46747,22 +45506,22 @@ _08016AC8: pop {r0} bx r0 .align 2, 0 -_08016AD0: .4byte 0x02022c30 + .pool thumb_func_end task00_081199FC thumb_func_start sp182_move_string sp182_move_string: @ 8016AD4 push {r4,lr} - ldr r4, _08016AE4 + ldr r4, =0x02022c20 ldrb r0, [r4] cmp r0, 0xFF bne _08016AE8 movs r0, 0 b _08016AF6 .align 2, 0 -_08016AE4: .4byte 0x02022c20 + .pool _08016AE8: - ldr r0, _08016AFC + ldr r0, =0x02021cc4 adds r1, r4, 0 bl gf_strcpy movs r0, 0xFF @@ -46773,7 +45532,7 @@ _08016AF6: pop {r1} bx r1 .align 2, 0 -_08016AFC: .4byte 0x02021cc4 + .pool thumb_func_end sp182_move_string thumb_func_start sub_8016B00 @@ -46782,7 +45541,7 @@ sub_8016B00: @ 8016B00 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _08016B54 + ldr r0, =0x02022c30 ldr r4, [r0] movs r7, 0 movs r6, 0 @@ -46790,7 +45549,7 @@ sub_8016B00: @ 8016B00 _08016B12: ldr r0, [r4, 0xC] adds r0, r5 - ldr r1, _08016B58 + ldr r1, =0x082f045c bl sub_8017630 lsls r0, 24 lsrs r3, r0, 24 @@ -46820,8 +45579,7 @@ _08016B12: movs r0, 0x4 b _08016C90 .align 2, 0 -_08016B54: .4byte 0x02022c30 -_08016B58: .4byte 0x082f045c + .pool _08016B5C: adds r5, 0x1C adds r6, 0x1 @@ -46923,7 +45681,7 @@ _08016C02: ldr r0, [r4] adds r2, r0, r5 ldrh r1, [r2, 0x18] - ldr r0, _08016C38 + ldr r0, =0x00000257 cmp r1, r0 bls _08016C5C ldrb r0, [r2, 0x1A] @@ -46937,7 +45695,7 @@ _08016C02: movs r7, 0x2 b _08016C5C .align 2, 0 -_08016C38: .4byte 0x00000257 + .pool _08016C3C: lsrs r0, r2, 30 cmp r0, 0x2 @@ -46948,7 +45706,7 @@ _08016C3C: ldr r0, [r4] adds r2, r0, r5 ldrh r1, [r2, 0x18] - ldr r0, _08016C9C + ldr r0, =0x00000383 cmp r1, r0 bls _08016C5C adds r0, r2, 0 @@ -46991,7 +45749,7 @@ _08016C90: pop {r1} bx r1 .align 2, 0 -_08016C9C: .4byte 0x00000383 + .pool thumb_func_end sub_8016B00 thumb_func_start sub_8016CA0 @@ -47008,7 +45766,7 @@ sub_8016CA0: @ 8016CA0 lsls r0, 2 add r0, r10 lsls r0, 3 - ldr r1, _08016D90 + ldr r1, =0x03005e08 adds r6, r0, r1 movs r7, 0 mov r0, sp @@ -47030,7 +45788,7 @@ _08016CC4: lsls r1, r2, 2 add r1, r10 lsls r1, 3 - ldr r3, _08016D94 + ldr r3, =0x03005e00 adds r1, r3 movs r5, 0x10 ldrsh r1, [r1, r5] @@ -47038,7 +45796,7 @@ _08016CC4: cmp r0, 0 bne _08016D00 mov r1, sp - ldr r0, _08016D98 + ldr r0, =0x082f045c ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} @@ -47051,7 +45809,7 @@ _08016D00: cmp r0, 0x1 bne _08016D18 mov r1, sp - ldr r0, _08016D98 + ldr r0, =0x082f045c ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} @@ -47078,7 +45836,7 @@ _08016D2E: cmp r0, 0 bne _08016D4C mov r1, sp - ldr r0, _08016D98 + ldr r0, =0x082f045c ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} @@ -47103,7 +45861,7 @@ _08016D58: stm r1!, {r2,r3,r5} ldr r0, [r6, 0x4] adds r0, r4 - ldr r1, _08016D98 + ldr r1, =0x082f045c bl sub_8017630 ldr r3, [r6, 0x4] adds r3, r4 @@ -47118,9 +45876,7 @@ _08016D58: strb r0, [r3, 0x18] b _08016DD4 .align 2, 0 -_08016D90: .4byte 0x03005e08 -_08016D94: .4byte 0x03005e00 -_08016D98: .4byte 0x082f045c + .pool _08016D9C: ldr r1, [r6] lsls r4, r7, 3 @@ -47134,7 +45890,7 @@ _08016D9C: stm r1!, {r2,r3,r5} ldr r0, [r6] adds r0, r4 - ldr r1, _08016DEC + ldr r1, =0x082f045c bl sub_8017630 ldr r3, [r6] adds r3, r4 @@ -47164,7 +45920,7 @@ _08016DDC: pop {r0} bx r0 .align 2, 0 -_08016DEC: .4byte 0x082f045c + .pool thumb_func_end sub_8016CA0 thumb_func_start sub_8016DF0 @@ -47173,7 +45929,7 @@ sub_8016DF0: @ 8016DF0 adds r4, r0, 0 adds r5, r1, 0 adds r6, r2, 0 - ldr r0, _08016E1C + ldr r0, =sub_8016CA0 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -47181,7 +45937,7 @@ sub_8016DF0: @ 8016DF0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _08016E20 + ldr r2, =0x03005e08 adds r3, r1, r2 str r4, [r3] str r5, [r3, 0x4] @@ -47191,8 +45947,7 @@ sub_8016DF0: @ 8016DF0 pop {r1} bx r1 .align 2, 0 -_08016E1C: .4byte sub_8016CA0 + 1 -_08016E20: .4byte 0x03005e08 + .pool thumb_func_end sub_8016DF0 thumb_func_start sub_8016E24 @@ -47209,7 +45964,7 @@ sub_8016E24: @ 8016E24 lsls r0, 2 add r0, r10 lsls r0, 3 - ldr r1, _08016F10 + ldr r1, =0x03005e08 adds r6, r0, r1 movs r3, 0 _08016E42: @@ -47233,7 +45988,7 @@ _08016E42: lsls r1, r2, 2 add r1, r10 lsls r1, 3 - ldr r7, _08016F14 + ldr r7, =0x03005e00 adds r1, r7 movs r2, 0xC ldrsh r1, [r1, r2] @@ -47244,7 +45999,7 @@ _08016E42: bne _08016E8E ldr r1, [r6] adds r1, r5 - ldr r0, _08016F18 + ldr r0, =0x082f045c ldm r0!, {r2,r4,r7} stm r1!, {r2,r4,r7} ldm r0!, {r2,r4,r7} @@ -47273,7 +46028,7 @@ _08016E9E: ldr r1, [r6] ldr r5, [sp, 0x4] adds r1, r5 - ldr r0, _08016F18 + ldr r0, =0x082f045c ldm r0!, {r2,r5,r7} stm r1!, {r2,r5,r7} ldm r0!, {r2,r5,r7} @@ -47291,7 +46046,7 @@ _08016ED2: lsls r4, 2 ldr r0, [r6] adds r0, r4 - ldr r1, _08016F18 + ldr r1, =0x082f045c bl sub_8017630 ldr r3, [r6] adds r3, r4 @@ -47316,9 +46071,7 @@ _08016ED2: pop {r0} bx r0 .align 2, 0 -_08016F10: .4byte 0x03005e08 -_08016F14: .4byte 0x03005e00 -_08016F18: .4byte 0x082f045c + .pool thumb_func_end sub_8016E24 thumb_func_start sub_8016F1C @@ -47359,7 +46112,7 @@ sub_8016F44: @ 8016F44 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08016FB8 + ldr r0, =0x03005e08 adds r4, r1, r0 movs r6, 0 subs r0, 0x8 @@ -47386,7 +46139,7 @@ _08016F62: _08016F86: ldr r0, [r4] adds r0, r5 - ldr r1, _08016FBC + ldr r1, =0x082f045c bl sub_8017630 ldr r3, [r4] adds r3, r5 @@ -47409,8 +46162,7 @@ _08016F86: pop {r0} bx r0 .align 2, 0 -_08016FB8: .4byte 0x03005e08 -_08016FBC: .4byte 0x082f045c + .pool thumb_func_end sub_8016F44 thumb_func_start sub_8016FC0 @@ -47418,7 +46170,7 @@ sub_8016FC0: @ 8016FC0 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _08016FE8 + ldr r0, =sub_8016E24 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -47426,7 +46178,7 @@ sub_8016FC0: @ 8016FC0 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 - ldr r1, _08016FEC + ldr r1, =0x03005e08 adds r3, r2, r1 str r4, [r3] adds r1, r2 @@ -47435,8 +46187,7 @@ sub_8016FC0: @ 8016FC0 pop {r1} bx r1 .align 2, 0 -_08016FE8: .4byte sub_8016E24 + 1 -_08016FEC: .4byte 0x03005e08 + .pool thumb_func_end sub_8016FC0 thumb_func_start sub_8016FF0 @@ -47444,7 +46195,7 @@ sub_8016FF0: @ 8016FF0 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _08017018 + ldr r0, =sub_8016F44 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -47452,7 +46203,7 @@ sub_8016FF0: @ 8016FF0 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 - ldr r1, _0801701C + ldr r1, =0x03005e08 adds r3, r2, r1 str r4, [r3] adds r1, r2 @@ -47461,8 +46212,7 @@ sub_8016FF0: @ 8016FF0 pop {r1} bx r1 .align 2, 0 -_08017018: .4byte sub_8016F44 + 1 -_0801701C: .4byte 0x03005e08 + .pool thumb_func_end sub_8016FF0 thumb_func_start sub_8017020 @@ -47473,7 +46223,7 @@ sub_8017020: @ 8017020 movs r0, 0 movs r1, 0x1 bl sub_81973C4 - ldr r0, _08017048 + ldr r0, =0x02021fc4 adds r1, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -47484,7 +46234,7 @@ sub_8017020: @ 8017020 pop {r1} bx r1 .align 2, 0 -_08017048: .4byte 0x02021fc4 + .pool thumb_func_end sub_8017020 thumb_func_start sub_801704C @@ -47519,7 +46269,7 @@ _08017076: movs r0, 0 movs r1, 0x1 bl sub_81973C4 - ldr r0, _08017098 + ldr r0, =0x02021fc4 adds r1, r5, 0 bl ExpandTextCodes movs r0, 0x1 @@ -47529,7 +46279,7 @@ _08017076: strb r0, [r4] b _080170AE .align 2, 0 -_08017098: .4byte 0x02021fc4 + .pool _0801709C: bl sub_8197224 lsls r0, 16 @@ -47615,7 +46365,7 @@ sub_8017118: @ 8017118 adds r0, r4, 0 movs r1, 0xFF bl Window_FastFillPixels - ldr r2, _08017164 + ldr r2, =0x082efd94 movs r0, 0x1 str r0, [sp] movs r0, 0x6 @@ -47635,7 +46385,7 @@ sub_8017118: @ 8017118 pop {r1} bx r1 .align 2, 0 -_08017164: .4byte 0x082efd94 + .pool thumb_func_end sub_8017118 thumb_func_start sub_8017168 @@ -47677,7 +46427,7 @@ _08017194: cmp r0, r1 ble _080171B6 lsls r1, 24 - ldr r0, _0801721C + ldr r0, =0x00ffffff ands r0, r2 orrs r0, r1 str r0, [sp] @@ -47698,7 +46448,7 @@ _080171B6: _080171D0: lsls r1, r0, 24 lsrs r1, 16 - ldr r0, _08017220 + ldr r0, =0xffff00ff ands r0, r2 orrs r0, r1 str r0, [sp] @@ -47709,7 +46459,7 @@ _080171DC: ldrb r0, [r5] movs r1, 0 bl sub_81973FC - ldr r0, _08017224 + ldr r0, =0x03006310 adds r2, r0, 0 ldr r1, [sp, 0x24] ldm r1!, {r3,r4,r6} @@ -47731,15 +46481,13 @@ _080171DC: strb r0, [r7] b _0801728E .align 2, 0 -_0801721C: .4byte 0x00ffffff -_08017220: .4byte 0xffff00ff -_08017224: .4byte 0x03006310 + .pool _08017228: mov r3, r9 ldrb r0, [r3] bl sub_81AE604 mov r8, r0 - ldr r0, _08017260 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] ands r4, r1 cmp r4, 0 @@ -47759,7 +46507,7 @@ _08017228: mov r0, r8 b _08017292 .align 2, 0 -_08017260: .4byte 0x030022c0 + .pool _08017264: movs r0, 0x2 ands r0, r1 @@ -47816,7 +46564,7 @@ _080172C2: beq _0801731C b _0801739C _080172C8: - ldr r0, _08017304 + ldr r0, =0x082f0344 bl sub_8017118 mov r1, r9 strb r0, [r1] @@ -47826,7 +46574,7 @@ _080172C8: ldrb r0, [r6] movs r1, 0 bl sub_81973FC - ldr r0, _08017308 + ldr r0, =0x03006310 adds r2, r0, 0 ldr r1, [sp, 0x24] ldm r1!, {r3,r4,r7} @@ -47842,8 +46590,7 @@ _080172C8: strb r0, [r1] b _08017314 .align 2, 0 -_08017304: .4byte 0x082f0344 -_08017308: .4byte 0x03006310 + .pool _0801730C: ldrb r0, [r6] movs r1, 0x1 @@ -47858,7 +46605,7 @@ _0801731C: ldrb r0, [r3] bl sub_81AE604 adds r1, r0, 0 - ldr r0, _08017364 + ldr r0, =0x030022c0 ldrh r2, [r0, 0x2E] movs r0, 0x3 ands r0, r2 @@ -47887,7 +46634,7 @@ _0801733E: negs r0, r0 b _080173A0 .align 2, 0 -_08017364: .4byte 0x030022c0 + .pool _08017368: ldr r0, [sp, 0x28] bl sub_8017CB0 @@ -47978,7 +46725,7 @@ sub_80173E0: @ 80173E0 negs r0, r0 ands r0, r1 strb r0, [r2, 0xC] - ldr r2, _0801742C + ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x3 negs r0, r0 @@ -47989,13 +46736,12 @@ sub_80173E0: @ 80173E0 b _0801756E _08017422: lsls r0, r4, 2 - ldr r1, _08017430 + ldr r1, =_08017434 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801742C: .4byte 0x03003014 -_08017430: .4byte _08017434 + .pool .align 2, 0 _08017434: .4byte _08017450 @@ -48179,7 +46925,7 @@ sub_8017580: @ 8017580 lsrs r1, 24 cmp r1, 0 beq _080175D8 - ldr r2, _080175E8 + ldr r2, =0x082f045c mov r8, r2 movs r5, 0 mov r9, r5 @@ -48224,7 +46970,7 @@ _080175D8: pop {r0} bx r0 .align 2, 0 -_080175E8: .4byte 0x082f045c + .pool thumb_func_end sub_8017580 thumb_func_start sub_80175EC @@ -48232,7 +46978,7 @@ sub_80175EC: @ 80175EC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r1, _0801762C + ldr r1, =0x082f045c mov r12, r1 movs r5, 0x2 negs r5, r5 @@ -48263,7 +47009,7 @@ _08017604: pop {r0} bx r0 .align 2, 0 -_0801762C: .4byte 0x082f045c + .pool thumb_func_end sub_80175EC thumb_func_start sub_8017630 @@ -48343,7 +47089,7 @@ _080176A0: cmp r2, 0x3 ble _080176A0 ldrh r2, [r5, 0x8] - ldr r0, _080176D8 + ldr r0, =0x000003ff ldrh r3, [r6, 0x8] adds r1, r0, 0 ands r1, r2 @@ -48361,7 +47107,7 @@ _080176A0: movs r0, 0 b _080176DE .align 2, 0 -_080176D8: .4byte 0x000003ff + .pool _080176DC: movs r0, 0x1 _080176DE: @@ -48511,13 +47257,13 @@ sub_80177B8: @ 80177B8 mov r9, r3 lsls r1, 24 lsrs r1, 24 - ldr r5, _08017894 + ldr r5, =0x02021fc4 adds r1, 0x1 adds r0, r5, 0 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r1, _08017898 + ldr r1, =0x082ed8c8 adds r0, r5, 0 bl gf_strcat str r7, [sp] @@ -48562,7 +47308,7 @@ sub_80177B8: @ 80177B8 movs r2, 0x2 movs r3, 0x5 bl decimal_int_to_string - ldr r1, _0801789C + ldr r1, =0x082ed8cc adds r0, r5, 0 bl gf_strcpy adds r0, r5, 0 @@ -48591,9 +47337,7 @@ _08017884: pop {r0} bx r0 .align 2, 0 -_08017894: .4byte 0x02021fc4 -_08017898: .4byte 0x082ed8c8 -_0801789C: .4byte 0x082ed8cc + .pool thumb_func_end sub_80177B8 thumb_func_start sub_80178A0 @@ -48620,7 +47364,7 @@ sub_80178A0: @ 80178A0 ands r0, r1 cmp r0, 0x1 bne _0801792A - ldr r4, _08017938 + ldr r4, =0x02021fc4 adds r0, r4, 0 adds r1, r5, 0 bl sub_8018404 @@ -48640,7 +47384,7 @@ sub_80178A0: @ 80178A0 movs r2, 0x2 movs r3, 0x5 bl decimal_int_to_string - ldr r1, _0801793C + ldr r1, =0x082ed8cc adds r0, r4, 0 bl gf_strcpy adds r0, r4, 0 @@ -48669,8 +47413,7 @@ _0801792A: pop {r0} bx r0 .align 2, 0 -_08017938: .4byte 0x02021fc4 -_0801793C: .4byte 0x082ed8cc + .pool thumb_func_end sub_80178A0 thumb_func_start sub_8017940 @@ -48691,7 +47434,7 @@ sub_8017940: @ 8017940 ldrsh r0, [r4, r1] cmp r0, 0x8 bne _08017978 - ldr r0, _08017974 + ldr r0, =0x02037590 ldrb r0, [r0, 0x3] cmp r0, 0x2 beq _0801796E @@ -48701,7 +47444,7 @@ _0801796E: movs r0, 0x1 b _0801797A .align 2, 0 -_08017974: .4byte 0x02037590 + .pool _08017978: movs r0, 0 _0801797A: @@ -48776,7 +47519,7 @@ sub_80179D4: @ 80179D4 bne _08017A4C cmp r4, 0 bne _08017A4C - ldr r4, _08017A2C + ldr r4, =0x02021cc4 adds r0, r4, 0 adds r1, r5, 0 bl sub_8018404 @@ -48792,8 +47535,8 @@ sub_80179D4: @ 80179D4 ands r0, r1 cmp r0, 0x45 bne _08017A38 - ldr r0, _08017A30 - ldr r3, _08017A34 + ldr r0, =0x02021fc4 + ldr r3, =0x082ee6b8 lsls r1, r6, 2 lsls r2, 3 adds r1, r2 @@ -48803,11 +47546,9 @@ sub_80179D4: @ 80179D4 movs r0, 0x2 b _08017B2A .align 2, 0 -_08017A2C: .4byte 0x02021cc4 -_08017A30: .4byte 0x02021fc4 -_08017A34: .4byte 0x082ee6b8 + .pool _08017A38: - ldr r0, _08017A48 + ldr r0, =0x082ee17c lsls r1, r2, 2 adds r1, r0 ldr r0, [r1] @@ -48815,9 +47556,9 @@ _08017A38: movs r0, 0x1 b _08017B2A .align 2, 0 -_08017A48: .4byte 0x082ee17c + .pool _08017A4C: - ldr r0, _08017A7C + ldr r0, =0x02021cc4 adds r1, r5, 0 bl sub_8018404 cmp r4, 0 @@ -48841,7 +47582,7 @@ _08017A62: beq _08017A8A b _08017B20 .align 2, 0 -_08017A7C: .4byte 0x02021cc4 + .pool _08017A80: cmp r1, 0x5 beq _08017AD0 @@ -48849,8 +47590,8 @@ _08017A80: beq _08017AF4 b _08017B20 _08017A8A: - ldr r5, _08017AA8 - ldr r4, _08017AAC + ldr r5, =0x02021fc4 + ldr r4, =0x082eeeac bl GenerateRandomNumber lsls r0, 16 movs r1, 0xC0 @@ -48863,11 +47604,10 @@ _08017A8A: ldr r1, [r1] b _08017B0E .align 2, 0 -_08017AA8: .4byte 0x02021fc4 -_08017AAC: .4byte 0x082eeeac + .pool _08017AB0: - ldr r5, _08017AC8 - ldr r4, _08017ACC + ldr r5, =0x02021fc4 + ldr r4, =0x082ef1cc bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -48877,11 +47617,10 @@ _08017AB0: lsls r1, r6, 4 b _08017B08 .align 2, 0 -_08017AC8: .4byte 0x02021fc4 -_08017ACC: .4byte 0x082ef1cc + .pool _08017AD0: - ldr r5, _08017AEC - ldr r4, _08017AF0 + ldr r5, =0x02021fc4 + ldr r4, =0x082ef010 bl GenerateRandomNumber lsls r0, 16 movs r1, 0xC0 @@ -48894,11 +47633,10 @@ _08017AD0: ldr r1, [r1] b _08017B0E .align 2, 0 -_08017AEC: .4byte 0x02021fc4 -_08017AF0: .4byte 0x082ef010 + .pool _08017AF4: - ldr r5, _08017B18 - ldr r4, _08017B1C + ldr r5, =0x02021fc4 + ldr r4, =0x082ef100 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -48915,11 +47653,10 @@ _08017B0E: bl ExpandTextCodes b _08017B28 .align 2, 0 -_08017B18: .4byte 0x02021fc4 -_08017B1C: .4byte 0x082ef100 + .pool _08017B20: - ldr r0, _08017B30 - ldr r1, _08017B34 + ldr r0, =0x02021fc4 + ldr r1, =0x082ee6c8 bl ExpandTextCodes _08017B28: movs r0, 0 @@ -48928,8 +47665,7 @@ _08017B2A: pop {r1} bx r1 .align 2, 0 -_08017B30: .4byte 0x02021fc4 -_08017B34: .4byte 0x082ee6c8 + .pool thumb_func_end sub_80179D4 thumb_func_start nullsub_14 @@ -48971,7 +47707,7 @@ sub_8017B3C: @ 8017B3C lsls r0, 1 cmp r8, r0 bne _08017B94 - ldr r2, _08017B90 + ldr r2, =0x082ef7d0 str r5, [sp] str r4, [sp, 0x4] adds r0, r6, 0 @@ -48980,7 +47716,7 @@ sub_8017B3C: @ 8017B3C bl sub_80173E0 b _08017BD4 .align 2, 0 -_08017B90: .4byte 0x082ef7d0 + .pool _08017B94: adds r1, r7, 0x1 adds r0, r6, 0 @@ -48990,7 +47726,7 @@ _08017B94: movs r0, 0xB mov r2, r8 muls r2, r0 - ldr r0, _08017BE4 + ldr r0, =0x083185c8 adds r2, r0 str r5, [sp] str r4, [sp, 0x4] @@ -49019,7 +47755,7 @@ _08017BD4: pop {r0} bx r0 .align 2, 0 -_08017BE4: .4byte 0x083185c8 + .pool thumb_func_end sub_8017B3C thumb_func_start sub_8017BE8 @@ -49035,14 +47771,14 @@ sub_8017BE8: @ 8017BE8 mov r9, r0 lsls r2, 24 lsrs r7, r2, 24 - ldr r0, _08017C3C + ldr r0, =0x02022c30 ldr r0, [r0] mov r8, r0 movs r0, 0x3 negs r0, r0 cmp r4, r0 bne _08017C6C - ldr r0, _08017C40 + ldr r0, =0x082f03a4 ldrb r0, [r0, 0x14] lsls r0, 28 lsrs r0, 28 @@ -49051,11 +47787,11 @@ sub_8017BE8: @ 8017BE8 bl sub_800F7DC adds r2, r0, 0 ldrh r1, [r2, 0x8] - ldr r0, _08017C44 + ldr r0, =0x000003ff ands r0, r1 cmp r0, 0 beq _08017CA0 - ldr r0, _08017C48 + ldr r0, =0x03005d90 ldr r3, [r0] movs r0, 0x5 str r0, [sp] @@ -49064,10 +47800,7 @@ sub_8017BE8: @ 8017BE8 bl sub_8017B3C b _08017CA0 .align 2, 0 -_08017C3C: .4byte 0x02022c30 -_08017C40: .4byte 0x082f03a4 -_08017C44: .4byte 0x000003ff -_08017C48: .4byte 0x03005d90 + .pool _08017C4C: mov r0, r12 adds r1, r0, r4 @@ -49128,7 +47861,7 @@ sub_8017CB0: @ 8017CB0 movs r4, 0 movs r3, 0 movs r7, 0x3 - ldr r6, _08017CE0 + ldr r6, =0x000003ff adds r2, r0, 0 adds r2, 0x8 adds r5, r1, 0x1 @@ -49150,7 +47883,7 @@ _08017CD6: adds r0, r3, 0 b _08017CF0 .align 2, 0 -_08017CE0: .4byte 0x000003ff + .pool _08017CE4: adds r2, 0x20 adds r3, 0x1 @@ -49187,7 +47920,7 @@ sub_8017D04: @ 8017D04 _08017D14: movs r0, 0x64 muls r0, r4 - ldr r1, _08017D3C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x41 bl pokemon_getattr @@ -49198,26 +47931,25 @@ _08017D14: beq _08017D74 adds r4, 0x1 _08017D2E: - ldr r0, _08017D40 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 blt _08017D14 movs r0, 0x2 b _08017D90 .align 2, 0 -_08017D3C: .4byte 0x020244ec -_08017D40: .4byte 0x020244e9 + .pool _08017D44: movs r4, 0 - ldr r0, _08017D78 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 bge _08017D8E - ldr r6, _08017D7C + ldr r6, =0x083203cc _08017D50: movs r0, 0x64 muls r0, r4 - ldr r1, _08017D80 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x41 bl pokemon_getattr @@ -49236,12 +47968,10 @@ _08017D74: movs r0, 0 b _08017D90 .align 2, 0 -_08017D78: .4byte 0x020244e9 -_08017D7C: .4byte 0x083203cc -_08017D80: .4byte 0x020244ec + .pool _08017D84: adds r4, 0x1 - ldr r0, _08017D98 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 blt _08017D50 @@ -49252,7 +47982,7 @@ _08017D90: pop {r1} bx r1 .align 2, 0 -_08017D98: .4byte 0x020244e9 + .pool thumb_func_end sub_8017D04 thumb_func_start sub_8017D9C @@ -49273,31 +48003,31 @@ _08017DAE: beq _08017DE8 b _08017DF6 _08017DB8: - ldr r0, _08017DC4 + ldr r0, =0x082eea68 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] b _08017DDA .align 2, 0 -_08017DC4: .4byte 0x082eea68 + .pool _08017DC8: - ldr r0, _08017DD4 + ldr r0, =0x082eed3c lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] b _08017DDA .align 2, 0 -_08017DD4: .4byte 0x082eed3c + .pool _08017DD8: - ldr r1, _08017DE4 + ldr r1, =0x082ef7b0 _08017DDA: adds r0, r3, 0 bl ExpandTextCodes b _08017DF6 .align 2, 0 -_08017DE4: .4byte 0x082ef7b0 + .pool _08017DE8: - ldr r0, _08017DFC + ldr r0, =0x082eeb08 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -49307,7 +48037,7 @@ _08017DF6: pop {r0} bx r0 .align 2, 0 -_08017DFC: .4byte 0x082eeb08 + .pool thumb_func_end sub_8017D9C thumb_func_start sub_8017E00 @@ -49320,7 +48050,7 @@ sub_8017E00: @ 8017E00 bl link_get_multiplayer_id lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _08017E34 + ldr r2, =0x020229e8 movs r0, 0x1 adds r1, r3, 0 eors r1, r0 @@ -49337,13 +48067,13 @@ sub_8017E00: @ 8017E00 beq _08017E3E b _08017E94 .align 2, 0 -_08017E34: .4byte 0x020229e8 + .pool _08017E38: cmp r6, 0x45 beq _08017E78 b _08017E94 _08017E3E: - ldr r2, _08017E50 + ldr r2, =0x082ee984 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -49353,9 +48083,9 @@ _08017E3E: adds r1, r0 b _08017E66 .align 2, 0 -_08017E50: .4byte 0x082ee984 + .pool _08017E54: - ldr r2, _08017E74 + ldr r2, =0x082ee984 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -49371,9 +48101,9 @@ _08017E66: bl gf_strcpy b _08017E94 .align 2, 0 -_08017E74: .4byte 0x082ee984 + .pool _08017E78: - ldr r2, _08017E9C + ldr r2, =0x082ee984 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -49391,7 +48121,7 @@ _08017E94: pop {r0} bx r0 .align 2, 0 -_08017E9C: .4byte 0x082ee984 + .pool thumb_func_end sub_8017E00 thumb_func_start sub_8017EA0 @@ -49411,12 +48141,12 @@ sub_8017EA0: @ 8017EA0 b _08017FC6 _08017EBA: lsls r0, 2 - ldr r1, _08017EC4 + ldr r1, =_08017EC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08017EC4: .4byte _08017EC8 + .pool .align 2, 0 _08017EC8: .4byte _08017FBC @@ -49429,19 +48159,19 @@ _08017EC8: .4byte _08017FC6 .4byte _08017FAC _08017EEC: - ldr r1, _08017EF0 + ldr r1, =0x082ee3dc b _08017FAE .align 2, 0 -_08017EF0: .4byte 0x082ee3dc + .pool _08017EF4: - ldr r1, _08017EF8 + ldr r1, =0x082ee430 b _08017FAE .align 2, 0 -_08017EF8: .4byte 0x082ee430 + .pool _08017EFC: adds r0, r6, 0 adds r0, 0x58 - ldr r4, _08017F24 + ldr r4, =0x02022c40 ldrh r1, [r4, 0xC] movs r2, 0 movs r3, 0x3 @@ -49451,20 +48181,19 @@ _08017EFC: ldrh r2, [r4, 0xA] movs r1, 0xB muls r1, r2 - ldr r2, _08017F28 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy movs r4, 0 b _08017F2E .align 2, 0 -_08017F24: .4byte 0x02022c40 -_08017F28: .4byte 0x083185c8 + .pool _08017F2C: adds r4, 0x1 _08017F2E: cmp r4, 0x3 bgt _08017F64 - ldr r0, _08017F78 + ldr r0, =0x03007890 ldr r0, [r0] lsls r1, r4, 5 adds r0, r1 @@ -49480,7 +48209,7 @@ _08017F2E: ldrh r1, [r5, 0x2] movs r0, 0xB muls r1, r0 - ldr r0, _08017F7C + ldr r0, =0x083185c8 adds r1, r0 adds r0, r6, 0 adds r0, 0x88 @@ -49492,14 +48221,12 @@ _08017F64: lsls r0, 1 cmp r8, r0 bne _08017F84 - ldr r1, _08017F80 + ldr r1, =0x082ee4f0 adds r0, r7, 0 bl gf_strcpy b _08017FB4 .align 2, 0 -_08017F78: .4byte 0x03007890 -_08017F7C: .4byte 0x083185c8 -_08017F80: .4byte 0x082ee4f0 + .pool _08017F84: movs r4, 0 adds r5, r6, 0 @@ -49513,14 +48240,14 @@ _08017F8A: adds r4, 0x1 cmp r4, 0x3 ble _08017F8A - ldr r1, _08017FA8 + ldr r1, =0x082ee47c adds r0, r7, 0 bl sub_81AFC28 b _08017FB4 .align 2, 0 -_08017FA8: .4byte 0x082ee47c + .pool _08017FAC: - ldr r1, _08017FB8 + ldr r1, =0x082ee380 _08017FAE: adds r0, r7, 0 bl ExpandTextCodes @@ -49528,9 +48255,9 @@ _08017FB4: movs r2, 0x1 b _08017FC6 .align 2, 0 -_08017FB8: .4byte 0x082ee380 + .pool _08017FBC: - ldr r1, _08017FD4 + ldr r1, =0x082ee544 adds r0, r7, 0 bl ExpandTextCodes movs r2, 0x2 @@ -49542,14 +48269,14 @@ _08017FC6: pop {r1} bx r1 .align 2, 0 -_08017FD4: .4byte 0x082ee544 + .pool thumb_func_end sub_8017EA0 thumb_func_start sub_8017FD8 sub_8017FD8: @ 8017FD8 push {lr} adds r2, r0, 0 - ldr r0, _08017FF8 + ldr r0, =0x03003090 ldrh r1, [r0, 0x2] cmp r1, 0 beq _08017FFC @@ -49564,7 +48291,7 @@ _08017FEC: movs r0, 0x1 b _08017FFE .align 2, 0 -_08017FF8: .4byte 0x03003090 + .pool _08017FFC: movs r0, 0 _08017FFE: @@ -49576,10 +48303,10 @@ _08017FFE: in_trade_center: @ 8018004 push {lr} movs r2, 0 - ldr r0, _0801801C + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _08018020 + ldr r0, =0x00003c19 cmp r1, r0 bne _08018016 movs r2, 0x1 @@ -49588,8 +48315,7 @@ _08018016: pop {r1} bx r1 .align 2, 0 -_0801801C: .4byte 0x03005d8c -_08018020: .4byte 0x00003c19 + .pool thumb_func_end in_trade_center thumb_func_start sub_8018024 @@ -49597,7 +48323,7 @@ sub_8018024: @ 8018024 push {r4-r6,lr} movs r6, 0 movs r5, 0 - ldr r0, _0801806C + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r6, r0 bge _08018064 @@ -49605,7 +48331,7 @@ _08018032: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08018070 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x38 @@ -49622,7 +48348,7 @@ _08018032: adds r6, 0x1 _0801805A: adds r5, 0x1 - ldr r0, _0801806C + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 blt _08018032 @@ -49632,8 +48358,7 @@ _08018064: movs r0, 0 b _08018076 .align 2, 0 -_0801806C: .4byte 0x020244e9 -_08018070: .4byte 0x020244ec + .pool _08018074: movs r0, 0x1 _08018076: @@ -49659,12 +48384,12 @@ sub_801807C: @ 801807C thumb_func_start sub_8018090 sub_8018090: @ 8018090 push {lr} - ldr r0, _0801809C + ldr r0, =0x02022c40 bl sub_801807C pop {r0} bx r0 .align 2, 0 -_0801809C: .4byte 0x02022c40 + .pool thumb_func_end sub_8018090 thumb_func_start sub_80180A0 @@ -49674,7 +48399,7 @@ sub_80180A0: @ 80180A0 movs r1, 0x64 adds r4, r0, 0 muls r4, r1 - ldr r0, _080180DC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -49696,7 +48421,7 @@ sub_80180A0: @ 80180A0 movs r0, 0 b _080180E2 .align 2, 0 -_080180DC: .4byte 0x020244ec + .pool _080180E0: movs r0, 0x1 _080180E2: @@ -49712,7 +48437,7 @@ sub_80180E8: @ 80180E8 movs r1, 0x64 adds r4, r0, 0 muls r4, r1 - ldr r0, _0801811C + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -49730,7 +48455,7 @@ sub_80180E8: @ 80180E8 pop {r0} bx r0 .align 2, 0 -_0801811C: .4byte 0x020244ec + .pool thumb_func_end sub_80180E8 thumb_func_start sub_8018120 @@ -49761,7 +48486,7 @@ _08018146: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08018184 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0 @@ -49778,7 +48503,7 @@ _08018146: _0801816C: adds r5, 0x1 _0801816E: - ldr r0, _08018188 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 blt _08018146 @@ -49790,8 +48515,7 @@ _08018176: pop {r1} bx r1 .align 2, 0 -_08018184: .4byte 0x020244ec -_08018188: .4byte 0x020244e9 + .pool thumb_func_end sub_8018120 thumb_func_start sub_801818C @@ -49801,12 +48525,12 @@ sub_801818C: @ 801818C bl sub_80173B0 bl script_env_2_disable bl sub_8098524 - ldr r1, _080181C4 + ldr r1, =0x02022c2c movs r0, 0 strb r0, [r1] cmp r4, 0 beq _080181BC - ldr r2, _080181C8 + ldr r2, =0x02022c40 ldrh r0, [r2, 0x2] ldrh r1, [r2, 0xA] ldrh r2, [r2, 0xC] @@ -49820,8 +48544,7 @@ _080181BC: pop {r0} bx r0 .align 2, 0 -_080181C4: .4byte 0x02022c2c -_080181C8: .4byte 0x02022c40 + .pool thumb_func_end sub_801818C thumb_func_start sub_80181CC @@ -49892,7 +48615,7 @@ sub_8018220: @ 8018220 lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _080183B0 + ldr r0, =0x02039b58 adds r1, r0 mov r8, r1 bl sub_81AFBF0 @@ -49903,7 +48626,7 @@ sub_8018220: @ 8018220 lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _080183B4 + ldr r0, =0x0830fcd4 adds r1, r0 adds r0, r6, 0 bl gf_strcpy @@ -49917,7 +48640,7 @@ sub_8018220: @ 8018220 movs r4, 0xBA lsls r4, 1 add r4, r9 - ldr r1, _080183B8 + ldr r1, =0x082eff50 mov r2, r8 ldrb r0, [r2, 0x1] lsls r0, 2 @@ -49965,15 +48688,15 @@ sub_8018220: @ 8018220 movs r4, 0xD2 lsls r4, 1 add r4, r9 - ldr r1, _080183BC + ldr r1, =0x082eff64 adds r0, r4, 0 bl sub_81AFC28 - ldr r0, _080183C0 + ldr r0, =0x02021fc4 adds r1, r4, 0 bl gf_strcpy mov r0, r8 ldrh r1, [r0, 0x14] - ldr r4, _080183C4 + ldr r4, =0x0000270f cmp r1, r4 ble _0801830C adds r1, r4, 0 @@ -50033,17 +48756,17 @@ _08018360: movs r4, 0xD2 lsls r4, 1 add r4, r9 - ldr r1, _080183C8 + ldr r1, =0x082effa4 adds r0, r4, 0 bl sub_81AFC28 - ldr r5, _080183C0 + ldr r5, =0x02021fc4 adds r0, r5, 0 adds r1, r4, 0 bl gf_strcat ldr r0, [sp] cmp r0, 0x1 bne _080183D0 - ldr r1, _080183CC + ldr r1, =0x082f0020 adds r0, r4, 0 bl sub_81AFC28 adds r0, r5, 0 @@ -50051,19 +48774,12 @@ _08018360: bl gf_strcat b _080183F0 .align 2, 0 -_080183B0: .4byte 0x02039b58 -_080183B4: .4byte 0x0830fcd4 -_080183B8: .4byte 0x082eff50 -_080183BC: .4byte 0x082eff64 -_080183C0: .4byte 0x02021fc4 -_080183C4: .4byte 0x0000270f -_080183C8: .4byte 0x082effa4 -_080183CC: .4byte 0x082f0020 + .pool _080183D0: ldr r2, [sp] cmp r2, 0 bne _080183F0 - ldr r0, _08018400 + ldr r0, =0x082f0018 mov r2, r8 ldrb r1, [r2] lsls r1, 2 @@ -50084,7 +48800,7 @@ _080183F0: pop {r0} bx r0 .align 2, 0 -_08018400: .4byte 0x082f0018 + .pool thumb_func_end sub_8018220 thumb_func_start sub_8018404 @@ -50130,7 +48846,7 @@ sub_8018450: @ 8018450 push {r4-r7,lr} sub sp, 0xC adds r7, r0, 0 - ldr r0, _08018470 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r6, r0, r1 @@ -50145,7 +48861,7 @@ _08018466: beq _08018482 b _08018644 .align 2, 0 -_08018470: .4byte 0x030022c0 + .pool _08018474: cmp r0, 0x2 bne _0801847A @@ -50166,7 +48882,7 @@ _08018482: bl remove_some_task movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0801856C + ldr r1, =0x082f0598 movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -50226,7 +48942,7 @@ _08018482: bl bg_set_tilemap movs r0, 0x3 bl bgid_upload_textbox_1 - ldr r0, _08018570 + ldr r0, =0x082f05a8 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r1, 0xC0 @@ -50244,10 +48960,9 @@ _08018482: bl lcd_io_set b _08018610 .align 2, 0 -_0801856C: .4byte 0x082f0598 -_08018570: .4byte 0x082f05a8 + .pool _08018574: - ldr r0, _080185F4 + ldr r0, =0x082f0548 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply @@ -50300,7 +49015,7 @@ _08018574: bl sub_80186EC b _08018610 .align 2, 0 -_080185F4: .4byte 0x082f0548 + .pool _080185F8: movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram @@ -50320,17 +49035,16 @@ _08018618: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show - ldr r0, _0801863C + ldr r0, =0x0000021d bl song_play_for_text - ldr r0, _08018640 + ldr r0, =sub_8018424 + 1 bl SetVBlankCallback movs r0, 0xC5 bl enable_irqs movs r0, 0x1 b _08018646 .align 2, 0 -_0801863C: .4byte 0x0000021d -_08018640: .4byte sub_8018424 + 1 + .pool _08018644: movs r0, 0 _08018646: @@ -50347,9 +49061,9 @@ c2_mystery_gift: @ 8018650 bl sub_8018450 cmp r0, 0 beq _0801866C - ldr r0, _08018674 + ldr r0, =sub_8018438 + 1 bl set_callback2 - ldr r1, _08018678 + ldr r1, =0x02022c60 movs r0, 0 strb r0, [r1] bl task_add_00_mystery_gift @@ -50358,8 +49072,7 @@ _0801866C: pop {r0} bx r0 .align 2, 0 -_08018674: .4byte sub_8018438 + 1 -_08018678: .4byte 0x02022c60 + .pool thumb_func_end c2_mystery_gift thumb_func_start sub_801867C @@ -50369,9 +49082,9 @@ sub_801867C: @ 801867C bl sub_8018450 cmp r0, 0 beq _08018698 - ldr r0, _0801869C + ldr r0, =sub_8018438 + 1 bl set_callback2 - ldr r1, _080186A0 + ldr r1, =0x02022c60 movs r0, 0x1 strb r0, [r1] bl sub_81D5014 @@ -50379,14 +49092,13 @@ _08018698: pop {r0} bx r0 .align 2, 0 -_0801869C: .4byte sub_8018438 + 1 -_080186A0: .4byte 0x02022c60 + .pool thumb_func_end sub_801867C thumb_func_start sub_80186A4 sub_80186A4: @ 80186A4 push {lr} - ldr r1, _080186E4 + ldr r1, =0x02022c60 movs r0, 0 strb r0, [r1] bl Window_FreeMemory @@ -50402,13 +49114,12 @@ sub_80186A4: @ 80186A4 movs r0, 0x3 bl bg_get_tilemap bl free - ldr r0, _080186E8 + ldr r0, =c2_title_screen_1 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080186E4: .4byte 0x02022c60 -_080186E8: .4byte c2_title_screen_1 + 1 + .pool thumb_func_end sub_80186A4 thumb_func_start sub_80186EC @@ -50424,24 +49135,22 @@ sub_80186EC: @ 80186EC bl Window_FastFillPixels cmp r4, 0 bne _0801871C - ldr r0, _08018710 - ldr r7, _08018714 + ldr r0, =0x085ef654 + ldr r7, =0x085ef678 cmp r5, 0 bne _08018720 - ldr r7, _08018718 + ldr r7, =0x085ef664 b _08018720 .align 2, 0 -_08018710: .4byte 0x085ef654 -_08018714: .4byte 0x085ef678 -_08018718: .4byte 0x085ef664 + .pool _0801871C: - ldr r0, _08018778 - ldr r7, _0801877C + ldr r0, =0x085edfbf + ldr r7, =0x085edfc9 _08018720: movs r4, 0 str r4, [sp] str r4, [sp, 0x4] - ldr r6, _08018780 + ldr r6, =0x082f0720 str r6, [sp, 0x8] movs r5, 0x1 negs r5, r5 @@ -50478,9 +49187,7 @@ _08018720: pop {r0} bx r0 .align 2, 0 -_08018778: .4byte 0x085edfbf -_0801877C: .4byte 0x085edfc9 -_08018780: .4byte 0x082f0720 + .pool thumb_func_end sub_80186EC thumb_func_start sub_8018784 @@ -50625,7 +49332,7 @@ sub_8018884: @ 8018884 push {r4,lr} sub sp, 0x14 adds r1, r0, 0 - ldr r4, _080188D4 + ldr r4, =0x02021fc4 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -50634,7 +49341,7 @@ sub_8018884: @ 8018884 movs r1, 0 str r1, [sp] str r1, [sp, 0x4] - ldr r0, _080188D8 + ldr r0, =0x082f0728 str r0, [sp, 0x8] str r1, [sp, 0xC] str r4, [sp, 0x10] @@ -50657,8 +49364,7 @@ sub_8018884: @ 8018884 pop {r0} bx r0 .align 2, 0 -_080188D4: .4byte 0x02021fc4 -_080188D8: .4byte 0x082f0728 + .pool thumb_func_end sub_8018884 thumb_func_start sub_80188DC @@ -50701,7 +49407,7 @@ _0801891A: _08018920: movs r0, 0 str r0, [sp] - ldr r0, _0801894C + ldr r0, =0x02022c58 str r0, [sp, 0x4] adds r0, 0x1 str r0, [sp, 0x8] @@ -50710,7 +49416,7 @@ _08018920: movs r2, 0x14 movs r3, 0x1 bl draw_bouncing_down_arrow_2 - ldr r0, _08018950 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -50721,12 +49427,11 @@ _08018944: adds r0, 0x1 b _0801897E .align 2, 0 -_0801894C: .4byte 0x02022c58 -_08018950: .4byte 0x030022c0 + .pool _08018954: movs r0, 0x1 str r0, [sp] - ldr r0, _08018978 + ldr r0, =0x02022c58 str r0, [sp, 0x4] adds r0, 0x1 str r0, [sp, 0x8] @@ -50741,7 +49446,7 @@ _08018954: movs r0, 0x1 b _08018982 .align 2, 0 -_08018978: .4byte 0x02022c58 + .pool _0801897C: movs r0, 0x2 _0801897E: @@ -50761,7 +49466,7 @@ sub_801898C: @ 801898C sub sp, 0xC movs r0, 0 str r0, [sp] - ldr r0, _080189B0 + ldr r0, =0x02022c58 str r0, [sp, 0x4] adds r0, 0x1 str r0, [sp, 0x8] @@ -50774,7 +49479,7 @@ sub_801898C: @ 801898C pop {r0} bx r0 .align 2, 0 -_080189B0: .4byte 0x02022c58 + .pool thumb_func_end sub_801898C thumb_func_start sub_80189B4 @@ -50783,7 +49488,7 @@ sub_80189B4: @ 80189B4 sub sp, 0xC movs r0, 0x1 str r0, [sp] - ldr r0, _080189D8 + ldr r0, =0x02022c58 str r0, [sp, 0x4] adds r0, 0x1 str r0, [sp, 0x8] @@ -50796,7 +49501,7 @@ sub_80189B4: @ 80189B4 pop {r0} bx r0 .align 2, 0 -_080189D8: .4byte 0x02022c58 + .pool thumb_func_end sub_80189B4 thumb_func_start sub_80189DC @@ -50811,7 +49516,7 @@ sub_80189DC: @ 80189DC b _08018A14 _080189EC: bl sub_801898C - ldr r0, _08018A04 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -50822,7 +49527,7 @@ _080189EC: strb r0, [r4] b _08018A14 .align 2, 0 -_08018A04: .4byte 0x030022c0 + .pool _08018A08: bl sub_80189B4 movs r0, 0 @@ -50873,26 +49578,24 @@ sub_8018A50: @ 8018A50 sub sp, 0x24 lsls r2, 24 add r1, sp, 0x4 - ldr r0, _08018A74 + ldr r0, =0x082f0638 ldm r0!, {r3-r5} stm r1!, {r3-r5} ldm r0!, {r3-r5} stm r1!, {r3-r5} - ldr r0, _08018A78 + ldr r0, =0x082f05e0 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x1C] str r1, [sp, 0x20] cmp r2, 0 bne _08018A80 - ldr r0, _08018A7C + ldr r0, =0x082f0608 b _08018A82 .align 2, 0 -_08018A74: .4byte 0x082f0638 -_08018A78: .4byte 0x082f05e0 -_08018A7C: .4byte 0x082f0608 + .pool _08018A80: - ldr r0, _08018AC0 + ldr r0, =0x082f0620 _08018A82: str r0, [sp, 0x4] add r0, sp, 0x4 @@ -50905,7 +49608,7 @@ _08018A82: adds r3, 0x1 _08018A96: lsls r1, r3, 24 - ldr r0, _08018AC4 + ldr r0, =0x00ffffff ldr r2, [sp, 0x1C] ands r2, r0 orrs r2, r1 @@ -50919,17 +49622,15 @@ _08018A96: asrs r0, 1 lsls r0, 24 lsrs r0, 16 - ldr r1, _08018AC8 + ldr r1, =0xffff00ff ands r1, r2 orrs r1, r0 str r1, [sp, 0x1C] b _08018AD2 .align 2, 0 -_08018AC0: .4byte 0x082f0620 -_08018AC4: .4byte 0x00ffffff -_08018AC8: .4byte 0xffff00ff + .pool _08018ACC: - ldr r0, _08018B04 + ldr r0, =0xffff00ff ands r2, r0 str r2, [sp, 0x1C] _08018AD2: @@ -50957,7 +49658,7 @@ _08018AFA: pop {r1} bx r1 .align 2, 0 -_08018B04: .4byte 0xffff00ff + .pool thumb_func_end sub_8018A50 thumb_func_start sub_8018B08 @@ -50984,17 +49685,16 @@ _08018B26: beq _08018C1A b _08018C3E _08018B30: - ldr r0, _08018B40 + ldr r0, =0x02021fc4 bl ExpandTextCodes cmp r6, 0 bne _08018B48 - ldr r0, _08018B44 + ldr r0, =0x082f05c8 b _08018B4A .align 2, 0 -_08018B40: .4byte 0x02021fc4 -_08018B44: .4byte 0x082f05c8 + .pool _08018B48: - ldr r0, _08018B8C + ldr r0, =0x082f05d0 _08018B4A: bl Window_AddFromTemplate strh r0, [r4] @@ -51005,10 +49705,10 @@ _08018B4A: movs r2, 0 str r2, [sp] str r2, [sp, 0x4] - ldr r1, _08018B90 + ldr r1, =0x082f0728 str r1, [sp, 0x8] str r2, [sp, 0xC] - ldr r1, _08018B94 + ldr r1, =0x02021fc4 str r1, [sp, 0x10] movs r1, 0x1 movs r3, 0x1 @@ -51024,28 +49724,25 @@ _08018B4A: bl Window_WriteStandardTileMap b _08018BD6 .align 2, 0 -_08018B8C: .4byte 0x082f05d0 -_08018B90: .4byte 0x082f0728 -_08018B94: .4byte 0x02021fc4 + .pool _08018B98: - ldr r0, _08018BB4 + ldr r0, =0x082f05e8 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x14] str r1, [sp, 0x18] cmp r6, 0 bne _08018BBC - ldr r0, _08018BB8 + ldr r0, =0xff00ffff ldr r1, [sp, 0x14] ands r1, r0 movs r0, 0x90 lsls r0, 12 b _08018BC6 .align 2, 0 -_08018BB4: .4byte 0x082f05e8 -_08018BB8: .4byte 0xff00ffff + .pool _08018BBC: - ldr r0, _08018BE0 + ldr r0, =0xff00ffff ldr r1, [sp, 0x14] ands r1, r0 movs r0, 0xF0 @@ -51064,7 +49761,7 @@ _08018BD6: strb r0, [r5] b _08018C3E .align 2, 0 -_08018BE0: .4byte 0xff00ffff + .pool _08018BE4: bl sub_8198C58 lsls r0, 24 @@ -51136,19 +49833,18 @@ _08018C6A: _08018C6C: cmp r2, 0 bne _08018C84 - ldr r0, _08018C7C - ldr r1, _08018C80 + ldr r0, =0x02021fc4 + ldr r1, =0x085ef2fc bl ExpandTextCodes b _08018C8C .align 2, 0 -_08018C7C: .4byte 0x02021fc4 -_08018C80: .4byte 0x085ef2fc + .pool _08018C84: - ldr r0, _08018CD8 - ldr r1, _08018CDC + ldr r0, =0x02021fc4 + ldr r1, =0x085ef330 bl ExpandTextCodes _08018C8C: - ldr r0, _08018CE0 + ldr r0, =0x082f05d8 bl Window_AddFromTemplate strh r0, [r5] lsls r0, 24 @@ -51159,10 +49855,10 @@ _08018C8C: movs r2, 0 str r2, [sp] str r2, [sp, 0x4] - ldr r1, _08018CE4 + ldr r1, =0x082f0728 str r1, [sp, 0x8] str r2, [sp, 0xC] - ldr r1, _08018CD8 + ldr r1, =0x02021fc4 str r1, [sp, 0x10] movs r1, 0x1 movs r3, 0x1 @@ -51181,40 +49877,34 @@ _08018C8C: strb r0, [r6] b _08018D8C .align 2, 0 -_08018CD8: .4byte 0x02021fc4 -_08018CDC: .4byte 0x085ef330 -_08018CE0: .4byte 0x082f05d8 -_08018CE4: .4byte 0x082f0728 + .pool _08018CE8: cmp r3, 0 beq _08018D10 cmp r2, 0 bne _08018D00 - ldr r0, _08018CF8 - ldr r1, _08018CFC + ldr r0, =0x082f05f8 + ldr r1, =0x082f06c8 b _08018D28 .align 2, 0 -_08018CF8: .4byte 0x082f05f8 -_08018CFC: .4byte 0x082f06c8 + .pool _08018D00: - ldr r0, _08018D08 - ldr r1, _08018D0C + ldr r0, =0x082f0600 + ldr r1, =0x082f06f8 b _08018D28 .align 2, 0 -_08018D08: .4byte 0x082f0600 -_08018D0C: .4byte 0x082f06f8 + .pool _08018D10: cmp r2, 0 bne _08018D24 - ldr r0, _08018D1C - ldr r1, _08018D20 + ldr r0, =0x082f05f0 + ldr r1, =0x082f06b0 b _08018D28 .align 2, 0 -_08018D1C: .4byte 0x082f05f0 -_08018D20: .4byte 0x082f06b0 + .pool _08018D24: - ldr r0, _08018D60 - ldr r1, _08018D64 + ldr r0, =0x082f05f8 + ldr r1, =0x082f06e0 _08018D28: movs r2, 0xE0 str r2, [sp] @@ -51240,8 +49930,7 @@ _08018D28: adds r0, r4, 0 b _08018D90 .align 2, 0 -_08018D60: .4byte 0x082f05f8 -_08018D64: .4byte 0x082f06e0 + .pool _08018D68: movs r0, 0 strb r0, [r6] @@ -51381,12 +50070,12 @@ sub_8018E50: @ 8018E50 push {lr} cmp r2, 0 beq _08018E60 - ldr r3, _08018E5C + ldr r3, =0x085ef55c b _08018E62 .align 2, 0 -_08018E5C: .4byte 0x085ef55c + .pool _08018E60: - ldr r3, _08018E70 + ldr r3, =0x085ef520 _08018E62: movs r2, 0x1 bl sub_8018B08 @@ -51395,7 +50084,7 @@ _08018E62: pop {r1} bx r1 .align 2, 0 -_08018E70: .4byte 0x085ef520 + .pool thumb_func_end sub_8018E50 thumb_func_start mevent_message_was_thrown_away @@ -51403,18 +50092,18 @@ mevent_message_was_thrown_away: @ 8018E74 push {lr} cmp r1, 0 beq _08018E84 - ldr r1, _08018E80 + ldr r1, =0x085ef630 b _08018E86 .align 2, 0 -_08018E80: .4byte 0x085ef630 + .pool _08018E84: - ldr r1, _08018E90 + ldr r1, =0x085ef60c _08018E86: bl mevent_0814257C pop {r1} bx r1 .align 2, 0 -_08018E90: .4byte 0x085ef60c + .pool thumb_func_end mevent_message_was_thrown_away thumb_func_start mevent_save_game @@ -51425,12 +50114,12 @@ mevent_save_game: @ 8018E94 cmp r0, 0x4 bhi _08018F04 lsls r0, 2 - ldr r1, _08018EA8 + ldr r1, =_08018EAC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08018EA8: .4byte _08018EAC + .pool .align 2, 0 _08018EAC: .4byte _08018EC0 @@ -51439,23 +50128,23 @@ _08018EAC: .4byte _08018EE0 .4byte _08018EF8 _08018EC0: - ldr r0, _08018EC8 + ldr r0, =0x085ef5bc bl sub_8018884 b _08018EEC .align 2, 0 -_08018EC8: .4byte 0x085ef5bc + .pool _08018ECC: movs r0, 0 bl save_game_when_memory_present b _08018EEC _08018ED4: - ldr r0, _08018EDC + ldr r0, =0x085ef5e0 bl sub_8018884 b _08018EEC .align 2, 0 -_08018EDC: .4byte 0x085ef5e0 + .pool _08018EE0: - ldr r0, _08018EF4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -51467,7 +50156,7 @@ _08018EEC: strb r0, [r4] b _08018F04 .align 2, 0 -_08018EF4: .4byte 0x030022c0 + .pool _08018EF8: movs r0, 0 strb r0, [r4] @@ -51497,12 +50186,12 @@ mevent_message: @ 8018F0C b _08019034 _08018F22: lsls r0, r3, 2 - ldr r1, _08018F2C + ldr r1, =_08018F30 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08018F2C: .4byte _08018F30 + .pool .align 2, 0 _08018F30: .4byte _08018F6C @@ -51523,106 +50212,103 @@ _08018F30: _08018F6C: movs r0, 0 str r0, [r4] - ldr r2, _08018F74 + ldr r2, =0x085ef2e4 b _08019034 .align 2, 0 -_08018F74: .4byte 0x085ef2e4 + .pool _08018F78: movs r0, 0 str r0, [r4] - ldr r2, _08018F80 + ldr r2, =0x085ef244 b _08019034 .align 2, 0 -_08018F80: .4byte 0x085ef244 + .pool _08018F84: movs r0, 0x1 str r0, [r4] - ldr r2, _08018F94 + ldr r2, =0x085ef0c8 cmp r5, 0 bne _08019034 - ldr r2, _08018F98 + ldr r2, =0x085ef124 b _08019034 .align 2, 0 -_08018F94: .4byte 0x085ef0c8 -_08018F98: .4byte 0x085ef124 + .pool _08018F9C: movs r0, 0x1 str r0, [r4] - ldr r2, _08018FAC + ldr r2, =0x085ef0f4 cmp r5, 0 bne _08019034 - ldr r2, _08018FB0 + ldr r2, =0x085ef14c b _08019034 .align 2, 0 -_08018FAC: .4byte 0x085ef0f4 -_08018FB0: .4byte 0x085ef14c + .pool _08018FB4: movs r0, 0x1 str r0, [r4] - ldr r2, _08018FBC + ldr r2, =0x085ef178 b _08019034 .align 2, 0 -_08018FBC: .4byte 0x085ef178 + .pool _08018FC0: movs r0, 0 str r0, [r4] - ldr r2, _08018FC8 + ldr r2, =0x085ef1b4 b _08019034 .align 2, 0 -_08018FC8: .4byte 0x085ef1b4 + .pool _08018FCC: movs r0, 0 str r0, [r4] - ldr r2, _08018FD4 + ldr r2, =0x085ef200 b _08019034 .align 2, 0 -_08018FD4: .4byte 0x085ef200 + .pool _08018FD8: movs r0, 0 str r0, [r4] - ldr r2, _08018FE0 + ldr r2, =0x085ef1d8 b _08019034 .align 2, 0 -_08018FE0: .4byte 0x085ef1d8 + .pool _08018FE4: movs r0, 0 str r0, [r4] - ldr r2, _08018FEC + ldr r2, =0x085ef21c b _08019034 .align 2, 0 -_08018FEC: .4byte 0x085ef21c + .pool _08018FF0: movs r0, 0 str r0, [r4] - ldr r2, _08018FF8 + ldr r2, =0x085ef02c b _08019034 .align 2, 0 -_08018FF8: .4byte 0x085ef02c + .pool _08018FFC: movs r0, 0 str r0, [r4] - ldr r2, _0801900C + ldr r2, =0x085ef2b4 cmp r6, 0 bne _08019034 - ldr r2, _08019010 + ldr r2, =0x085ef280 b _08019034 .align 2, 0 -_0801900C: .4byte 0x085ef2b4 -_08019010: .4byte 0x085ef280 + .pool _08019014: movs r0, 0 str r0, [r4] - ldr r2, _0801901C + ldr r2, =0x085ef014 b _08019034 .align 2, 0 -_0801901C: .4byte 0x085ef014 + .pool _08019020: movs r0, 0x1 str r0, [r4] - ldr r2, _08019028 + ldr r2, =0x085ef198 b _08019034 .align 2, 0 -_08019028: .4byte 0x085ef198 + .pool _0801902C: movs r0, 0x1 b _08019032 @@ -51700,20 +50386,19 @@ _0801909C: mevent_message_stamp_card_etc_send_status: @ 80190A4 push {r4,lr} adds r3, r0, 0 - ldr r1, _080190C0 + ldr r1, =0x085ef014 movs r0, 0 str r0, [r3] adds r4, r1, 0 cmp r2, 0xE bhi _08019166 lsls r0, r2, 2 - ldr r1, _080190C4 + ldr r1, =_080190C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080190C0: .4byte 0x085ef014 -_080190C4: .4byte _080190C8 + .pool .align 2, 0 _080190C8: .4byte _08019104 @@ -51732,75 +50417,75 @@ _080190C8: .4byte _0801915C .4byte _08019164 _08019104: - ldr r1, _08019108 + ldr r1, =0x085ef2e4 b _08019166 .align 2, 0 -_08019108: .4byte 0x085ef2e4 + .pool _0801910C: - ldr r1, _08019110 + ldr r1, =0x085ef244 b _08019166 .align 2, 0 -_08019110: .4byte 0x085ef244 + .pool _08019114: - ldr r1, _08019118 + ldr r1, =0x085ef39c b _0801911E .align 2, 0 -_08019118: .4byte 0x085ef39c + .pool _0801911C: - ldr r1, _08019124 + ldr r1, =0x085ef3c4 _0801911E: movs r0, 0x1 str r0, [r3] b _08019166 .align 2, 0 -_08019124: .4byte 0x085ef3c4 + .pool _08019128: - ldr r1, _0801912C + ldr r1, =0x085ef3f0 b _08019166 .align 2, 0 -_0801912C: .4byte 0x085ef3f0 + .pool _08019130: - ldr r1, _08019134 + ldr r1, =0x085ef42c b _08019166 .align 2, 0 -_08019134: .4byte 0x085ef42c + .pool _08019138: - ldr r1, _0801913C + ldr r1, =0x085ef494 b _08019166 .align 2, 0 -_0801913C: .4byte 0x085ef494 + .pool _08019140: - ldr r1, _08019144 + ldr r1, =0x085ef460 b _08019166 .align 2, 0 -_08019144: .4byte 0x085ef460 + .pool _08019148: - ldr r1, _0801914C + ldr r1, =0x085ef21c b _08019166 .align 2, 0 -_0801914C: .4byte 0x085ef21c + .pool _08019150: - ldr r1, _08019154 + ldr r1, =0x085ef4c4 b _08019166 .align 2, 0 -_08019154: .4byte 0x085ef4c4 + .pool _08019158: adds r1, r4, 0 b _08019166 _0801915C: - ldr r1, _08019160 + ldr r1, =0x085ef410 b _08019166 .align 2, 0 -_08019160: .4byte 0x085ef410 + .pool _08019164: - ldr r1, _08019170 + ldr r1, =0x085ef4f0 _08019166: adds r0, r1, 0 pop {r4} pop {r1} bx r1 .align 2, 0 -_08019170: .4byte 0x085ef4f0 + .pool thumb_func_end mevent_message_stamp_card_etc_send_status thumb_func_start sub_8019174 @@ -51836,7 +50521,7 @@ _080191A2: thumb_func_start task_add_00_mystery_gift task_add_00_mystery_gift: @ 80191AC push {r4,lr} - ldr r0, _080191EC + ldr r0, =task00_mystery_gift + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -51844,7 +50529,7 @@ task_add_00_mystery_gift: @ 80191AC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080191F0 + ldr r0, =0x03005e08 adds r4, r0 movs r0, 0 strb r0, [r4, 0x8] @@ -51866,8 +50551,7 @@ task_add_00_mystery_gift: @ 80191AC pop {r0} bx r0 .align 2, 0 -_080191EC: .4byte task00_mystery_gift + 1 -_080191F0: .4byte 0x03005e08 + .pool thumb_func_end task_add_00_mystery_gift thumb_func_start task00_mystery_gift @@ -51879,7 +50563,7 @@ task00_mystery_gift: @ 80191F4 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08019218 + ldr r1, =0x03005e08 adds r5, r0, r1 ldrb r0, [r5, 0x8] cmp r0, 0x25 @@ -51887,13 +50571,12 @@ task00_mystery_gift: @ 80191F4 b _08019922 _0801920E: lsls r0, 2 - ldr r1, _0801921C + ldr r1, =_08019220 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08019218: .4byte 0x03005e08 -_0801921C: .4byte _08019220 + .pool .align 2, 0 _08019220: .4byte _080192B8 @@ -51980,14 +50663,14 @@ _08019300: bne _08019314 adds r0, r5, 0 adds r0, 0x9 - ldr r1, _08019310 + ldr r1, =0x085eeef0 b _0801931A .align 2, 0 -_08019310: .4byte 0x085eeef0 + .pool _08019314: adds r0, r5, 0 adds r0, 0x9 - ldr r1, _08019334 + ldr r1, =0x085eef2c _0801931A: bl mevent_0814257C cmp r0, 0 @@ -52001,25 +50684,25 @@ _08019324: bl sub_80186EC b _08019922 .align 2, 0 -_08019334: .4byte 0x085eef2c + .pool _08019338: ldrb r0, [r5, 0xC] cmp r0, 0 bne _0801934C - ldr r0, _08019348 + ldr r0, =0x085eef68 bl sub_8018884 b _08019352 .align 2, 0 -_08019348: .4byte 0x085eef68 + .pool _0801934C: - ldr r0, _08019358 + ldr r0, =0x085eef94 bl sub_8018884 _08019352: movs r0, 0x4 strb r0, [r5, 0x8] b _08019922 .align 2, 0 -_08019358: .4byte 0x085eef94 + .pool _0801935C: adds r0, r5, 0 adds r0, 0x9 @@ -52061,12 +50744,12 @@ _080193A6: movs r0, 0 b _080198FE _080193AC: - ldr r0, _080193C8 + ldr r0, =0x02021cc4 movs r1, 0xFF strb r1, [r0] - ldr r0, _080193CC + ldr r0, =0x02021dc4 strb r1, [r0] - ldr r0, _080193D0 + ldr r0, =0x02021ec4 strb r1, [r0] ldrb r0, [r5, 0xC] cmp r0, 0 @@ -52075,9 +50758,7 @@ _080193AC: beq _080193EE b _08019406 .align 2, 0 -_080193C8: .4byte 0x02021cc4 -_080193CC: .4byte 0x02021dc4 -_080193D0: .4byte 0x02021ec4 + .pool _080193D4: ldrb r0, [r5, 0xD] cmp r0, 0x1 @@ -52108,7 +50789,7 @@ _08019406: strb r0, [r5, 0x8] b _08019922 _0801940C: - ldr r0, _08019428 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0801942C @@ -52120,9 +50801,9 @@ _0801940C: bl sub_801D484 b _08019922 .align 2, 0 -_08019428: .4byte 0x03003124 + .pool _0801942C: - ldr r0, _08019440 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x5 beq _08019436 @@ -52132,15 +50813,15 @@ _08019436: bl sub_8018838 b _080197C0 .align 2, 0 -_08019440: .4byte 0x020375f0 + .pool _08019444: - ldr r0, _08019450 + ldr r0, =0x085eefe8 bl sub_8018884 movs r0, 0x8 strb r0, [r5, 0x8] b _08019922 .align 2, 0 -_08019450: .4byte 0x085eefe8 + .pool _08019454: adds r0, r5, 0 bl sub_801D4A8 @@ -52150,12 +50831,12 @@ _08019454: b _08019922 _08019462: lsls r0, 2 - ldr r1, _0801946C + ldr r1, =_08019470 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801946C: .4byte _08019470 + .pool .align 2, 0 _08019470: .4byte _080194AE @@ -52190,13 +50871,12 @@ _080194AE: _080194B4: movs r0, 0xB strb r0, [r5, 0x8] - ldr r0, _080194C4 - ldr r1, _080194C8 + ldr r0, =0x02021cc4 + ldr r1, =0x020229f0 bl gf_strcpy b _08019922 .align 2, 0 -_080194C4: .4byte 0x02021cc4 -_080194C8: .4byte 0x020229f0 + .pool _080194CC: adds r4, r5, 0 adds r4, 0x9 @@ -52229,7 +50909,7 @@ _08019506: _08019508: adds r0, r5, 0 adds r0, 0x9 - ldr r3, _08019530 + ldr r3, =0x085ef050 adds r1, r5, 0 movs r2, 0 bl sub_8018B08 @@ -52246,14 +50926,14 @@ _08019508: strb r0, [r5, 0x8] b _08019922 .align 2, 0 -_08019530: .4byte 0x085ef050 + .pool _08019534: movs r0, 0 b _08019566 _08019538: adds r0, r5, 0 adds r0, 0x9 - ldr r3, _0801955C + ldr r3, =0x085ef084 adds r1, r5, 0 movs r2, 0 bl sub_8018B08 @@ -52270,7 +50950,7 @@ _08019552: beq _08019564 b _08019922 .align 2, 0 -_0801955C: .4byte 0x085ef084 + .pool _08019560: movs r0, 0 b _08019566 @@ -52284,7 +50964,7 @@ _0801956A: strb r0, [r5, 0x8] b _08019922 _08019574: - ldr r0, _08019588 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0801957E @@ -52295,11 +50975,11 @@ _0801957E: strb r0, [r5, 0x8] b _08019922 .align 2, 0 -_08019588: .4byte 0x03003124 + .pool _0801958C: adds r0, r5, 0 adds r0, 0x9 - ldr r1, _080195B0 + ldr r1, =0x085eeff8 bl sub_8018A1C cmp r0, 0 bne _0801959C @@ -52308,17 +50988,15 @@ _0801959C: ldrb r0, [r5, 0xD] cmp r0, 0x1 bne _080195AA - ldr r0, _080195B4 - ldr r1, _080195B8 + ldr r0, =0x02021cc4 + ldr r1, =0x020229f0 bl gf_strcpy _080195AA: movs r0, 0xF strb r0, [r5, 0x8] b _08019922 .align 2, 0 -_080195B0: .4byte 0x085eeff8 -_080195B4: .4byte 0x02021cc4 -_080195B8: .4byte 0x020229f0 + .pool _080195BC: ldrb r1, [r5, 0xC] ldrb r2, [r5, 0xD] @@ -52392,7 +51070,7 @@ _0801963C: ldrb r0, [r5, 0xC] cmp r0, 0 bne _08019664 - ldr r2, _08019660 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -52410,9 +51088,9 @@ _08019652: _0801965E: b _08019682 .align 2, 0 -_08019660: .4byte 0x030022c0 + .pool _08019664: - ldr r0, _08019678 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] bl sub_801CCD0 cmp r0, 0 @@ -52421,7 +51099,7 @@ _08019664: beq _08019682 b _08019922 .align 2, 0 -_08019678: .4byte 0x030022c0 + .pool _0801967C: bl sub_801CC38 b _0801975E @@ -52520,7 +51198,7 @@ _0801971A: _0801972E: adds r0, r5, 0 adds r0, 0x9 - ldr r3, _08019754 + ldr r3, =0x085ef584 adds r1, r5, 0 movs r2, 0x1 bl sub_8018B08 @@ -52537,7 +51215,7 @@ _08019748: beq _0801975E b _08019922 .align 2, 0 -_08019754: .4byte 0x085ef584 + .pool _08019758: movs r0, 0x18 strb r0, [r5, 0x8] @@ -52626,7 +51304,7 @@ _080197EE: strb r0, [r5, 0x8] b _08019922 _080197F8: - ldr r0, _0801980C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08019810 @@ -52636,9 +51314,9 @@ _080197F8: strb r0, [r5, 0x8] b _08019922 .align 2, 0 -_0801980C: .4byte 0x03003124 + .pool _08019810: - ldr r0, _08019828 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x5 beq _0801981A @@ -52651,29 +51329,26 @@ _08019820: strb r0, [r5, 0x8] b _08019922 .align 2, 0 -_08019828: .4byte 0x020375f0 + .pool _0801982C: - ldr r0, _0801984C + ldr r0, =0x02021cc4 movs r1, 0xFF strb r1, [r0] - ldr r0, _08019850 + ldr r0, =0x02021dc4 strb r1, [r0] - ldr r0, _08019854 + ldr r0, =0x02021ec4 strb r1, [r0] ldrb r0, [r5, 0xC] cmp r0, 0 bne _0801985C - ldr r0, _08019858 + ldr r0, =0x085ef360 bl sub_8018884 bl sub_801D0A0 b _08019866 .align 2, 0 -_0801984C: .4byte 0x02021cc4 -_08019850: .4byte 0x02021dc4 -_08019854: .4byte 0x02021ec4 -_08019858: .4byte 0x085ef360 + .pool _0801985C: - ldr r0, _0801986C + ldr r0, =0x085ef37c bl sub_8018884 bl sub_801D07C _08019866: @@ -52681,7 +51356,7 @@ _08019866: strb r0, [r5, 0x8] b _08019922 .align 2, 0 -_0801986C: .4byte 0x085ef37c + .pool _08019870: adds r0, r5, 0 bl sub_801D0C4 @@ -52694,17 +51369,16 @@ _08019870: b _08019922 _08019884: bl task_add_05_task_del_08FA224_when_no_RfuFunc - ldr r0, _08019898 - ldr r1, _0801989C + ldr r0, =0x02021cc4 + ldr r1, =0x02022a0c bl gf_strcpy movs r0, 0x22 strb r0, [r5, 0x8] b _08019922 .align 2, 0 -_08019898: .4byte 0x02021cc4 -_0801989C: .4byte 0x02022a0c + .pool _080198A0: - ldr r0, _080198B4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08019922 @@ -52713,7 +51387,7 @@ _080198A0: strb r0, [r5, 0x8] b _08019922 .align 2, 0 -_080198B4: .4byte 0x03003124 + .pool _080198B8: adds r0, r5, 0 adds r0, 0x9 @@ -52724,9 +51398,9 @@ _080198B8: cmp r0, 0 beq _08019922 ldr r0, [r5, 0xC] - ldr r1, _080198E4 + ldr r1, =0x00ffff00 ands r0, r1 - ldr r1, _080198E8 + ldr r1, =0x00030100 cmp r0, r1 bne _080198FA movs r0, 0x3 @@ -52736,12 +51410,11 @@ _080198DC: strb r0, [r5, 0x8] b _08019922 .align 2, 0 -_080198E4: .4byte 0x00ffff00 -_080198E8: .4byte 0x00030100 + .pool _080198EC: adds r0, r5, 0 adds r0, 0x9 - ldr r1, _08019908 + ldr r1, =0x085ef014 bl mevent_0814257C _080198F6: cmp r0, 0 @@ -52754,14 +51427,14 @@ _080198FE: bl sub_80186EC b _08019922 .align 2, 0 -_08019908: .4byte 0x085ef014 + .pool _0801990C: bl sub_80097E8 ldr r0, [r5, 0x10] bl free adds r0, r4, 0 bl remove_task - ldr r0, _0801992C + ldr r0, =sub_80186A4 + 1 bl set_callback2 _08019922: add sp, 0x4 @@ -52769,15 +51442,15 @@ _08019922: pop {r0} bx r0 .align 2, 0 -_0801992C: .4byte sub_80186A4 + 1 + .pool thumb_func_end task00_mystery_gift thumb_func_start sub_8019930 sub_8019930: @ 8019930 - ldr r0, _08019934 + ldr r0, =0x000001a9 bx lr .align 2, 0 -_08019934: .4byte 0x000001a9 + .pool thumb_func_end sub_8019930 thumb_func_start bgid_upload_textbox_1 @@ -52786,7 +51459,7 @@ bgid_upload_textbox_1: @ 8019938 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r1, _08019954 + ldr r1, =0x082f0568 movs r2, 0x80 lsls r2, 1 movs r3, 0 @@ -52796,13 +51469,13 @@ bgid_upload_textbox_1: @ 8019938 pop {r0} bx r0 .align 2, 0 -_08019954: .4byte 0x082f0568 + .pool thumb_func_end bgid_upload_textbox_1 thumb_func_start is_walking_or_running is_walking_or_running: @ 8019958 push {lr} - ldr r0, _0801996C + ldr r0, =0x02037590 ldrb r0, [r0, 0x3] cmp r0, 0x2 beq _08019966 @@ -52812,7 +51485,7 @@ _08019966: movs r0, 0x1 b _08019972 .align 2, 0 -_0801996C: .4byte 0x02037590 + .pool _08019970: movs r0, 0 _08019972: @@ -52822,7 +51495,7 @@ _08019972: thumb_func_start sub_8019978 sub_8019978: @ 8019978 - ldr r3, _0801998C + ldr r3, =0x082f072c movs r2, 0x7 ands r2, r1 lsls r1, r0, 2 @@ -52833,7 +51506,7 @@ sub_8019978: @ 8019978 ldrb r0, [r2] bx lr .align 2, 0 -_0801998C: .4byte 0x082f072c + .pool thumb_func_end sub_8019978 thumb_func_start sub_8019990 @@ -52841,13 +51514,13 @@ sub_8019990: @ 8019990 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r4, _080199D8 + ldr r4, =0x082f0740 mov r8, r4 lsls r0, 2 adds r4, r0, r4 movs r6, 0 ldrsh r5, [r4, r6] - ldr r6, _080199DC + ldr r6, =0x082f0760 lsls r1, 1 adds r4, r1, r6 ldrb r4, [r4] @@ -52875,20 +51548,19 @@ sub_8019990: @ 8019990 pop {r0} bx r0 .align 2, 0 -_080199D8: .4byte 0x082f0740 -_080199DC: .4byte 0x082f0760 + .pool thumb_func_end sub_8019990 thumb_func_start sub_80199E0 sub_80199E0: @ 80199E0 push {r4-r7,lr} mov r12, r3 - ldr r7, _08019A20 + ldr r7, =0x082f0740 lsls r5, r0, 2 adds r0, r5, r7 movs r4, 0 ldrsh r3, [r0, r4] - ldr r6, _08019A24 + ldr r6, =0x082f0760 lsls r4, r1, 1 adds r0, r4, r6 ldrb r0, [r0] @@ -52914,8 +51586,7 @@ sub_80199E0: @ 80199E0 movs r0, 0x1 b _08019A2A .align 2, 0 -_08019A20: .4byte 0x082f0740 -_08019A24: .4byte 0x082f0760 + .pool _08019A28: movs r0, 0 _08019A2A: @@ -52927,7 +51598,7 @@ _08019A2A: thumb_func_start sub_8019A30 sub_8019A30: @ 8019A30 push {lr} - ldr r1, _08019A48 + ldr r1, =0x000002bf adds r0, r1 lsls r0, 16 lsrs r0, 16 @@ -52937,13 +51608,13 @@ sub_8019A30: @ 8019A30 pop {r1} bx r1 .align 2, 0 -_08019A48: .4byte 0x000002bf + .pool thumb_func_end sub_8019A30 thumb_func_start flag_set_x63 flag_set_x63: @ 8019A4C push {lr} - ldr r1, _08019A60 + ldr r1, =0x000002bf adds r0, r1 lsls r0, 16 lsrs r0, 16 @@ -52951,13 +51622,13 @@ flag_set_x63: @ 8019A4C pop {r0} bx r0 .align 2, 0 -_08019A60: .4byte 0x000002bf + .pool thumb_func_end flag_set_x63 thumb_func_start flag_clear_x63 flag_clear_x63: @ 8019A64 push {lr} - ldr r1, _08019A78 + ldr r1, =0x000002bf adds r0, r1 lsls r0, 16 lsrs r0, 16 @@ -52965,13 +51636,13 @@ flag_clear_x63: @ 8019A64 pop {r0} bx r0 .align 2, 0 -_08019A78: .4byte 0x000002bf + .pool thumb_func_end flag_clear_x63 thumb_func_start sub_8019A7C sub_8019A7C: @ 8019A7C push {lr} - ldr r2, _08019A94 + ldr r2, =0x00004010 adds r0, r2 lsls r0, 16 lsrs r0, 16 @@ -52981,16 +51652,16 @@ sub_8019A7C: @ 8019A7C pop {r0} bx r0 .align 2, 0 -_08019A94: .4byte 0x00004010 + .pool thumb_func_end sub_8019A7C thumb_func_start sub_8019A98 sub_8019A98: @ 8019A98 push {lr} - ldr r1, _08019AB0 + ldr r1, =0x082f0774 adds r0, r1 ldrb r0, [r0] - ldr r1, _08019AB4 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -52998,17 +51669,16 @@ sub_8019A98: @ 8019A98 pop {r0} bx r0 .align 2, 0 -_08019AB0: .4byte 0x082f0774 -_08019AB4: .4byte 0x03005d8c + .pool thumb_func_end sub_8019A98 thumb_func_start sub_8019AB8 sub_8019AB8: @ 8019AB8 push {lr} - ldr r1, _08019AD0 + ldr r1, =0x082f0774 adds r0, r1 ldrb r0, [r0] - ldr r1, _08019AD4 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -53016,8 +51686,7 @@ sub_8019AB8: @ 8019AB8 pop {r0} bx r0 .align 2, 0 -_08019AD0: .4byte 0x082f0774 -_08019AD4: .4byte 0x03005d8c + .pool thumb_func_end sub_8019AB8 thumb_func_start sub_8019AD8 @@ -53025,10 +51694,10 @@ sub_8019AD8: @ 8019AD8 push {r4,r5,lr} sub sp, 0x4 adds r5, r1, 0 - ldr r1, _08019B24 + ldr r1, =0x082f0774 adds r0, r1 ldrb r0, [r0] - ldr r1, _08019B28 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -53042,7 +51711,7 @@ sub_8019AD8: @ 8019AD8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08019B2C + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl npc_is_visible_or_is_x40 @@ -53058,9 +51727,7 @@ sub_8019AD8: @ 8019AD8 movs r0, 0x1 b _08019B32 .align 2, 0 -_08019B24: .4byte 0x082f0774 -_08019B28: .4byte 0x03005d8c -_08019B2C: .4byte 0x02037350 + .pool _08019B30: movs r0, 0 _08019B32: @@ -53074,10 +51741,10 @@ _08019B32: sub_8019B3C: @ 8019B3C push {r4,lr} sub sp, 0x4 - ldr r1, _08019B78 + ldr r1, =0x082f0774 adds r0, r1 ldrb r0, [r0] - ldr r1, _08019B7C + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -53091,7 +51758,7 @@ sub_8019B3C: @ 8019B3C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08019B80 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl sub_8093284 @@ -53101,9 +51768,7 @@ sub_8019B3C: @ 8019B3C movs r0, 0 b _08019B9E .align 2, 0 -_08019B78: .4byte 0x082f0774 -_08019B7C: .4byte 0x03005d8c -_08019B80: .4byte 0x02037350 + .pool _08019B84: bl script_env_2_is_enabled lsls r0, 24 @@ -53127,10 +51792,10 @@ _08019B9E: thumb_func_start sub_8019BA8 sub_8019BA8: @ 8019BA8 push {lr} - ldr r2, _08019BD4 + ldr r2, =0x02022c68 movs r1, 0 str r1, [r2] - ldr r1, _08019BD8 + ldr r1, =0x02022c64 str r0, [r1] movs r1, 0 movs r2, 0x7 @@ -53149,8 +51814,7 @@ _08019BB8: pop {r1} bx r1 .align 2, 0 -_08019BD4: .4byte 0x02022c68 -_08019BD8: .4byte 0x02022c64 + .pool thumb_func_end sub_8019BA8 thumb_func_start sub_8019BDC @@ -53166,7 +51830,7 @@ sub_8019BDC: @ 8019BDC beq _08019C10 b _08019C2E _08019BF0: - ldr r1, _08019C0C + ldr r1, =0x082f078c adds r0, r4, 0 bl sub_8019AD8 cmp r0, 0x1 @@ -53178,7 +51842,7 @@ _08019BF0: strb r0, [r5] b _08019C2E .align 2, 0 -_08019C0C: .4byte 0x082f078c + .pool _08019C10: adds r0, r4, 0 bl sub_8019B3C @@ -53263,7 +51927,7 @@ _08019C5A: adds r0, 0x1 strb r0, [r6] _08019CBC: - ldr r1, _08019CD0 + ldr r1, =0x082f078e adds r0, r5, 0 bl sub_8019AD8 cmp r0, 0x1 @@ -53273,7 +51937,7 @@ _08019CBC: strb r0, [r6] b _08019CE6 .align 2, 0 -_08019CD0: .4byte 0x082f078e + .pool _08019CD4: adds r0, r5, 0 bl sub_8019B3C @@ -53295,7 +51959,7 @@ _08019CE8: thumb_func_start sub_8019CF0 sub_8019CF0: @ 8019CF0 push {r4,lr} - ldr r3, _08019D14 + ldr r3, =0x02022c64 lsls r0, 2 ldr r4, [r3] adds r4, r0 @@ -53311,7 +51975,7 @@ sub_8019CF0: @ 8019CF0 movs r0, 0 b _08019D1A .align 2, 0 -_08019D14: .4byte 0x02022c64 + .pool _08019D18: movs r0, 0x1 _08019D1A: @@ -53323,7 +51987,7 @@ _08019D1A: thumb_func_start AGBAssert AGBAssert: @ 8019D20 push {lr} - ldr r1, _08019D38 + ldr r1, =0x02022c64 lsls r0, 2 ldr r1, [r1] adds r1, r0 @@ -53335,7 +51999,7 @@ AGBAssert: @ 8019D20 movs r0, 0 b _08019D3E .align 2, 0 -_08019D38: .4byte 0x02022c64 + .pool _08019D3C: movs r0, 0x1 _08019D3E: @@ -53424,7 +52088,7 @@ _08019DC6: sub_8019DD0: @ 8019DD0 push {r4,r5,lr} movs r4, 0 - ldr r5, _08019DF0 + ldr r5, =0x02022c64 _08019DD6: lsls r0, r4, 2 ldr r1, [r5] @@ -53438,13 +52102,13 @@ _08019DD6: pop {r0} bx r0 .align 2, 0 -_08019DF0: .4byte 0x02022c64 + .pool thumb_func_end sub_8019DD0 thumb_func_start sub_8019DF4 sub_8019DF4: @ 8019DF4 push {r4,lr} - ldr r4, _08019E14 + ldr r4, =sub_8019DD0 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -53458,7 +52122,7 @@ sub_8019DF4: @ 8019DF4 lsrs r0, 24 b _08019E1A .align 2, 0 -_08019E14: .4byte sub_8019DD0 + 1 + .pool _08019E18: movs r0, 0x10 _08019E1A: @@ -53470,7 +52134,7 @@ _08019E1A: thumb_func_start sub_8019E20 sub_8019E20: @ 8019E20 push {lr} - ldr r0, _08019E38 + ldr r0, =sub_8019DD0 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -53481,7 +52145,7 @@ _08019E34: pop {r0} bx r0 .align 2, 0 -_08019E38: .4byte sub_8019DD0 + 1 + .pool thumb_func_end sub_8019E20 thumb_func_start sub_8019E3C @@ -53501,7 +52165,7 @@ _08019E56: adds r4, 0x1 cmp r4, 0x7 ble _08019E40 - ldr r1, _08019E6C + ldr r1, =0x02022c64 movs r0, 0 str r0, [r1] bl sub_8019E20 @@ -53509,7 +52173,7 @@ _08019E56: pop {r0} bx r0 .align 2, 0 -_08019E6C: .4byte 0x02022c64 + .pool thumb_func_end sub_8019E3C thumb_func_start sub_8019E70 @@ -53526,7 +52190,7 @@ sub_8019E70: @ 8019E70 mov r0, r9 lsls r0, 2 mov r8, r0 - ldr r0, _08019EFC + ldr r0, =0x082f0740 mov r2, r8 adds r1, r2, r0 ldrh r1, [r1] @@ -53536,7 +52200,7 @@ sub_8019E70: @ 8019E70 add r0, r8 ldrh r0, [r0] mov r10, r0 - ldr r6, _08019F00 + ldr r6, =0x082f0760 _08019E9E: mov r5, r8 add r5, r9 @@ -53583,8 +52247,7 @@ _08019E9E: pop {r0} bx r0 .align 2, 0 -_08019EFC: .4byte 0x082f0740 -_08019F00: .4byte 0x082f0760 + .pool thumb_func_end sub_8019E70 thumb_func_start sub_8019F04 @@ -53592,7 +52255,7 @@ sub_8019F04: @ 8019F04 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 - ldr r6, _08019F28 + ldr r6, =0x02020630 _08019F0C: adds r0, r5, r4 ldrb r1, [r0] @@ -53608,7 +52271,7 @@ _08019F0C: pop {r0} bx r0 .align 2, 0 -_08019F28: .4byte 0x02020630 + .pool thumb_func_end sub_8019F04 thumb_func_start sub_8019F2C @@ -53648,12 +52311,12 @@ sub_8019F64: @ 8019F64 adds r1, r0, 0 cmp r1, 0 beq _08019F78 - ldr r0, _08019F74 + ldr r0, =0x082f076f adds r0, r1, r0 ldrb r0, [r0] b _08019F88 .align 2, 0 -_08019F74: .4byte 0x082f076f + .pool _08019F78: ldrb r1, [r2, 0xA] movs r0, 0x7F @@ -53919,12 +52582,12 @@ sub_801A16C: @ 801A16C cmp r0, 0x14 bhi _0801A20E lsls r0, 2 - ldr r1, _0801A188 + ldr r1, =_0801A18C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801A188: .4byte _0801A18C + .pool .align 2, 0 _0801A18C: .4byte _0801A1E0 @@ -53997,7 +52660,7 @@ _0801A21E: thumb_func_start sub_801A234 sub_801A234: @ 801A234 push {r4,r5,lr} - ldr r2, _0801A254 + ldr r2, =0x02022c68 movs r1, 0 str r1, [r2] movs r5, 0 @@ -54013,7 +52676,7 @@ _0801A240: bl sub_801A16C b _0801A264 .align 2, 0 -_0801A254: .4byte 0x02022c68 + .pool _0801A258: cmp r1, 0x2 bne _0801A264 @@ -54032,20 +52695,20 @@ _0801A264: thumb_func_start sub_801A274 sub_801A274: @ 801A274 - ldr r1, _0801A280 + ldr r1, =0x02022c68 movs r0, 0x96 lsls r0, 1 str r0, [r1] bx lr .align 2, 0 -_0801A280: .4byte 0x02022c68 + .pool thumb_func_end sub_801A274 thumb_func_start sub_801A284 sub_801A284: @ 801A284 push {lr} adds r2, r0, 0 - ldr r0, _0801A2A4 + ldr r0, =0x02022c68 ldr r1, [r0] adds r1, 0x1 str r1, [r0] @@ -54059,7 +52722,7 @@ _0801A29E: pop {r0} bx r0 .align 2, 0 -_0801A2A4: .4byte 0x02022c68 + .pool thumb_func_end sub_801A284 thumb_func_start sub_801A2A8 @@ -54078,7 +52741,7 @@ sub_801A2A8: @ 801A2A8 bne _0801A2F0 b _0801A396 _0801A2C4: - ldr r4, _0801A2EC + ldr r4, =0x082f076a bl player_get_direction__sp1AA lsls r0, 24 lsrs r0, 24 @@ -54096,7 +52759,7 @@ _0801A2C4: movs r0, 0x1 b _0801A398 .align 2, 0 -_0801A2EC: .4byte 0x082f076a + .pool _0801A2F0: mov r4, sp adds r4, 0x2 @@ -54105,7 +52768,7 @@ _0801A2F0: bl player_get_pos_to_plus_one_step_in_direction_player_is_facing movs r0, 0 str r0, [sp, 0xC] - ldr r0, _0801A3A8 + ldr r0, =0x082f0740 adds r7, r5, 0 movs r1, 0 mov r10, r1 @@ -54120,7 +52783,7 @@ _0801A30E: mov r9, r4 ldr r1, [sp, 0x10] mov r8, r1 - ldr r5, _0801A3AC + ldr r5, =0x082f0760 _0801A31E: mov r2, r10 adds r3, r2, r6 @@ -54193,8 +52856,7 @@ _0801A398: pop {r1} bx r1 .align 2, 0 -_0801A3A8: .4byte 0x082f0740 -_0801A3AC: .4byte 0x082f0760 + .pool thumb_func_end sub_801A2A8 thumb_func_start sub_801A3B0 @@ -54266,12 +52928,12 @@ sub_801A418: @ 801A418 thumb_func_start sub_801A42C sub_801A42C: @ 801A42C push {lr} - ldr r0, _0801A438 + ldr r0, =sub_801A43C + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0801A438: .4byte sub_801A43C + 1 + .pool thumb_func_end sub_801A42C thumb_func_start sub_801A43C @@ -54281,7 +52943,7 @@ sub_801A43C: @ 801A43C movs r0, 0 movs r1, 0 bl lcd_io_set - ldr r5, _0801A560 + ldr r5, =0x03000dac movs r0, 0x6C bl malloc_and_clear str r0, [r5] @@ -54289,7 +52951,7 @@ sub_801A43C: @ 801A43C bl SetVBlankCallback movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0801A564 + ldr r1, =0x082f0d34 movs r0, 0 movs r2, 0x2 bl bg_vram_setup @@ -54305,19 +52967,19 @@ sub_801A43C: @ 801A43C adds r1, r0, 0 movs r0, 0 bl bg_set_tilemap - ldr r1, _0801A568 + ldr r1, =0x082f0990 movs r0, 0 str r0, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _0801A56C + ldr r1, =0x082f0ba0 movs r0, 0x1 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r0, _0801A570 + ldr r0, =0x082f0d3c bl Window_InitFromTemplates bl TextBox_ResetSomeField bl sub_80A1A74 @@ -54325,9 +52987,9 @@ sub_801A43C: @ 801A43C bl clear_tasks bl remove_some_task bl SoundVSyncOn_rev01 - ldr r0, _0801A574 + ldr r0, =sub_801A418 + 1 bl SetVBlankCallback - ldr r0, _0801A578 + ldr r0, =sub_801A6C0 + 1 movs r1, 0 bl AddTask ldr r1, [r5] @@ -54356,7 +53018,7 @@ sub_801A43C: @ 801A43C movs r1, 0 movs r2, 0 bl bg_change_y_offset - ldr r0, _0801A57C + ldr r0, =0x082f0790 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply @@ -54375,7 +53037,7 @@ sub_801A43C: @ 801A43C bl Bg_FillWramTileMapRectWithTileAndPalette movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _0801A580 + ldr r0, =sub_801A3F4 + 1 bl set_callback2 bl run_active_tasks bl run_remoboxes @@ -54387,15 +53049,7 @@ sub_801A43C: @ 801A43C pop {r0} bx r0 .align 2, 0 -_0801A560: .4byte 0x03000dac -_0801A564: .4byte 0x082f0d34 -_0801A568: .4byte 0x082f0990 -_0801A56C: .4byte 0x082f0ba0 -_0801A570: .4byte 0x082f0d3c -_0801A574: .4byte sub_801A418 + 1 -_0801A578: .4byte sub_801A6C0 + 1 -_0801A57C: .4byte 0x082f0790 -_0801A580: .4byte sub_801A3F4 + 1 + .pool thumb_func_end sub_801A43C thumb_func_start sub_801A584 @@ -54411,17 +53065,16 @@ _0801A58C: adds r4, 0x1 cmp r4, 0x1 ble _0801A58C - ldr r0, _0801A5B4 + ldr r0, =0x03000dac ldr r0, [r0] bl free - ldr r0, _0801A5B8 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 pop {r4} pop {r0} bx r0 .align 2, 0 -_0801A5B4: .4byte 0x03000dac -_0801A5B8: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_801A584 thumb_func_start sub_801A5BC @@ -54452,7 +53105,7 @@ _0801A5E4: ldrsh r0, [r1, r2] adds r0, 0x2 lsls r0, 5 - ldr r1, _0801A5FC + ldr r1, =0x082f0790 adds r0, r1 movs r1, 0 movs r2, 0x10 @@ -54460,7 +53113,7 @@ _0801A5E4: pop {r0} bx r0 .align 2, 0 -_0801A5FC: .4byte 0x082f0790 + .pool thumb_func_end sub_801A5BC thumb_func_start sub_801A600 @@ -54476,7 +53129,7 @@ sub_801A600: @ 801A600 movs r0, 0x2 movs r1, 0 bl Window_FastFillPixels - ldr r5, _0801A6BC + ldr r5, =0x082f0d5c ldr r4, [r5] movs r0, 0x1 adds r1, r4, 0 @@ -54515,7 +53168,7 @@ _0801A644: adds r1, r4, 0 cmp r4, 0x2 ble _0801A644 - ldr r1, _0801A6BC + ldr r1, =0x082f0d5c adds r0, r4, 0x1 lsls r0, 2 adds r0, r1 @@ -54549,7 +53202,7 @@ _0801A644: pop {r0} bx r0 .align 2, 0 -_0801A6BC: .4byte 0x082f0d5c + .pool thumb_func_end sub_801A600 thumb_func_start sub_801A6C0 @@ -54560,7 +53213,7 @@ sub_801A6C0: @ 801A6C0 sub sp, 0x8 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0801A6EC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -54573,13 +53226,12 @@ sub_801A6C0: @ 801A6C0 b _0801A89C _0801A6E2: lsls r0, 2 - ldr r1, _0801A6F0 + ldr r1, =_0801A6F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801A6EC: .4byte 0x03005e00 -_0801A6F0: .4byte _0801A6F4 + .pool .align 2, 0 _0801A6F4: .4byte _0801A70C @@ -54590,7 +53242,7 @@ _0801A6F4: .4byte _0801A884 _0801A70C: bl sub_801A600 - ldr r0, _0801A724 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -54600,7 +53252,7 @@ _0801A70C: strh r0, [r1, 0x8] b _0801A89C .align 2, 0 -_0801A724: .4byte 0x03005e00 + .pool _0801A728: movs r0, 0x1 negs r0, r0 @@ -54617,7 +53269,7 @@ _0801A728: bl gpu_sync_bg_show b _0801A86C _0801A74C: - ldr r0, _0801A764 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -54631,9 +53283,9 @@ _0801A75A: adds r0, r2 b _0801A876 .align 2, 0 -_0801A764: .4byte 0x02037fd4 + .pool _0801A768: - ldr r0, _0801A7C4 + ldr r0, =0x03000dac ldr r0, [r0] adds r1, r0, 0 adds r1, 0x10 @@ -54651,11 +53303,11 @@ _0801A768: movs r1, 0 bl Window_FastFillPixels movs r4, 0 - ldr r6, _0801A7C8 + ldr r6, =0x02021fc4 movs r7, 0x80 lsls r7, 20 _0801A796: - ldr r0, _0801A7C4 + ldr r0, =0x03000dac ldr r0, [r0] lsls r1, r4, 2 adds r0, r1 @@ -54677,8 +53329,7 @@ _0801A796: bl sub_801A8B0 b _0801A7DE .align 2, 0 -_0801A7C4: .4byte 0x03000dac -_0801A7C8: .4byte 0x02021fc4 + .pool _0801A7CC: movs r0, 0x62 str r0, [sp] @@ -54701,7 +53352,7 @@ _0801A7DE: movs r1, 0x3 bl Window_CopyToVram _0801A7F8: - ldr r0, _0801A84C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -54714,8 +53365,8 @@ _0801A7F8: _0801A80C: movs r0, 0x5 bl audio_play - ldr r2, _0801A850 - ldr r0, _0801A854 + ldr r2, =0x03005e00 + ldr r0, =0x03000dac ldr r0, [r0] adds r0, 0x61 ldrb r1, [r0] @@ -54736,7 +53387,7 @@ _0801A836: mov r2, r8 adds r1, r2, r5 lsls r1, 3 - ldr r0, _0801A858 + ldr r0, =0x03005e08 adds r1, r0 adds r0, r1, 0 adds r0, 0xE @@ -54744,10 +53395,7 @@ _0801A836: bl sub_801A5BC b _0801A89C .align 2, 0 -_0801A84C: .4byte 0x030022c0 -_0801A850: .4byte 0x03005e00 -_0801A854: .4byte 0x03000dac -_0801A858: .4byte 0x03005e08 + .pool _0801A85C: movs r0, 0x1 negs r0, r0 @@ -54757,7 +53405,7 @@ _0801A85C: movs r3, 0x10 bl sub_80A1AD4 _0801A86C: - ldr r1, _0801A880 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -54768,15 +53416,15 @@ _0801A876: strh r1, [r0, 0x8] b _0801A89C .align 2, 0 -_0801A880: .4byte 0x03005e00 + .pool _0801A884: - ldr r0, _0801A8A8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0801A89C - ldr r0, _0801A8AC + ldr r0, =sub_801A584 + 1 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -54788,8 +53436,7 @@ _0801A89C: pop {r0} bx r0 .align 2, 0 -_0801A8A8: .4byte 0x02037fd4 -_0801A8AC: .4byte sub_801A584 + 1 + .pool thumb_func_end sub_801A6C0 thumb_func_start sub_801A8B0 @@ -54812,12 +53459,12 @@ sub_801A8B0: @ 801A8B0 cmp r0, 0x4 bhi _0801A93A lsls r0, 2 - ldr r1, _0801A8DC + ldr r1, =_0801A8E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801A8DC: .4byte _0801A8E0 + .pool .align 2, 0 _0801A8E0: .4byte _0801A8F4 @@ -54902,7 +53549,7 @@ sub_801A960: @ 801A960 lsrs r0, 25 mov r8, r0 movs r4, 0 - ldr r0, _0801A9D8 + ldr r0, =0x082f0d70 mov r9, r0 movs r1, 0x1 add r1, r9 @@ -54953,7 +53600,7 @@ _0801A9C4: adds r1, r7 b _0801A9E8 .align 2, 0 -_0801A9D8: .4byte 0x082f0d70 + .pool _0801A9DC: mov r1, r10 adds r0, r2, r1 @@ -55027,7 +53674,7 @@ sub_801AA30: @ 801AA30 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0801AA98 + ldr r1, =0x03005e08 adds r7, r0, r1 movs r4, 0 _0801AA5E: @@ -55059,7 +53706,7 @@ _0801AA78: movs r0, 0 b _0801AAC6 .align 2, 0 -_0801AA98: .4byte 0x03005e08 + .pool _0801AA9C: adds r1, r6, 0 mov r0, sp @@ -55100,10 +53747,10 @@ sub_801AAD4: @ 801AAD4 bl sub_8014210 movs r4, 0 movs r7, 0x64 - ldr r6, _0801AB54 - ldr r5, _0801AB58 + ldr r6, =0x020244ec + ldr r5, =0x02024744 _0801AAE4: - ldr r0, _0801AB5C + ldr r0, =0x0203cef8 adds r0, r4, r0 ldrb r0, [r0] subs r0, 0x1 @@ -55117,7 +53764,7 @@ _0801AAE4: adds r4, 0x1 cmp r4, 0x1 ble _0801AAE4 - ldr r4, _0801AB54 + ldr r4, =0x020244ec movs r0, 0xFA lsls r0, 1 adds r5, r4, r0 @@ -55127,12 +53774,12 @@ _0801AB0A: adds r4, 0x64 cmp r4, r5 ble _0801AB0A - ldr r4, _0801AB54 + ldr r4, =0x020244ec movs r5, 0 adds r6, r4, 0 adds r6, 0x64 _0801AB1E: - ldr r1, _0801AB58 + ldr r1, =0x02024744 adds r1, r5, r1 adds r0, r4, 0 movs r2, 0x64 @@ -55144,22 +53791,18 @@ _0801AB1E: movs r0, 0x32 bl sav12_xor_increment bl calc_player_party_count - ldr r0, _0801AB60 + ldr r0, =0x02038bca movs r2, 0xC0 lsls r2, 4 adds r1, r2, 0 strh r1, [r0] - ldr r0, _0801AB64 + ldr r0, =sub_8036760 + 1 bl set_callback2 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0801AB54: .4byte 0x020244ec -_0801AB58: .4byte 0x02024744 -_0801AB5C: .4byte 0x0203cef8 -_0801AB60: .4byte 0x02038bca -_0801AB64: .4byte sub_8036760 + 1 + .pool thumb_func_end sub_801AAD4 thumb_func_start sub_801AB68 @@ -55184,7 +53827,7 @@ sub_801AB68: @ 801AB68 mov r9, r0 movs r1, 0x1 mov r10, r1 - ldr r0, _0801ABD8 + ldr r0, =0x082f0de4 mov r8, r0 ldrb r0, [r0] lsls r1, r0, 4 @@ -55218,7 +53861,7 @@ sub_801AB68: @ 801AB68 pop {r0} bx r0 .align 2, 0 -_0801ABD8: .4byte 0x082f0de4 + .pool thumb_func_end sub_801AB68 thumb_func_start sub_801ABDC @@ -55288,7 +53931,7 @@ sub_801AC40: @ 801AC40 sub_801AC54: @ 801AC54 push {r4,lr} sub sp, 0xC - ldr r1, _0801AC74 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -55299,13 +53942,12 @@ sub_801AC54: @ 801AC54 b _0801AFAE _0801AC6A: lsls r0, 2 - ldr r1, _0801AC78 + ldr r1, =_0801AC7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801AC74: .4byte 0x030022c0 -_0801AC78: .4byte _0801AC7C + .pool .align 2, 0 _0801AC7C: .4byte _0801AD4C @@ -55364,7 +54006,7 @@ _0801AD4C: movs r0, 0 movs r1, 0 bl lcd_io_set - ldr r4, _0801ADE8 + ldr r4, =0x02022c6c movs r0, 0x4 bl malloc_and_clear str r0, [r4] @@ -55373,12 +54015,12 @@ _0801AD4C: bl clear_tasks movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0801ADEC + ldr r1, =0x082f0dd0 movs r0, 0 movs r2, 0x1 bl bg_vram_setup bl reset_temp_tile_data_buffers - ldr r0, _0801ADF0 + ldr r0, =0x082f0dd4 bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 @@ -55414,38 +54056,32 @@ _0801AD8C: movs r2, 0xD0 bl box_border_load_tiles_and_pal bl sub_819789C - ldr r0, _0801ADF4 + ldr r0, =sub_801AC40 + 1 bl SetVBlankCallback - ldr r1, _0801ADF8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0801AF8A .align 2, 0 -_0801ADE8: .4byte 0x02022c6c -_0801ADEC: .4byte 0x082f0dd0 -_0801ADF0: .4byte 0x082f0dd4 -_0801ADF4: .4byte sub_801AC40 + 1 -_0801ADF8: .4byte 0x030022c0 + .pool _0801ADFC: - ldr r0, _0801AE18 + ldr r0, =0x02022c6c ldr r0, [r0] - ldr r1, _0801AE1C + ldr r1, =0x085efbd2 movs r2, 0 bl sub_801ABDC cmp r0, 0 bne _0801AE0E b _0801AFAE _0801AE0E: - ldr r1, _0801AE20 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _0801AF8A .align 2, 0 -_0801AE18: .4byte 0x02022c6c -_0801AE1C: .4byte 0x085efbd2 -_0801AE20: .4byte 0x030022c0 + .pool _0801AE24: movs r0, 0x1 negs r0, r0 @@ -55456,13 +54092,13 @@ _0801AE24: bl sub_80A1AD4 movs r0, 0 bl gpu_sync_bg_show - ldr r1, _0801AE44 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0801AF8A .align 2, 0 -_0801AE44: .4byte 0x030022c0 + .pool _0801AE48: bl fade_and_return_progress_probably lsls r0, 24 @@ -55470,12 +54106,12 @@ _0801AE48: beq _0801AE54 b _0801AFAE _0801AE54: - ldr r4, _0801AE70 + ldr r4, =0x020228c4 adds r0, r4, 0 movs r1, 0 movs r2, 0x20 bl memset - ldr r0, _0801AE74 + ldr r0, =0x0203cef8 ldrb r1, [r0] ldrb r0, [r0, 0x1] cmn r1, r0 @@ -55483,24 +54119,22 @@ _0801AE54: movs r0, 0x52 b _0801AE7A .align 2, 0 -_0801AE70: .4byte 0x020228c4 -_0801AE74: .4byte 0x0203cef8 + .pool _0801AE78: movs r0, 0x51 _0801AE7A: strb r0, [r4] - ldr r1, _0801AE90 + ldr r1, =0x020228c4 movs r0, 0 movs r2, 0x20 bl link_0800A448 - ldr r1, _0801AE94 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _0801AF8A .align 2, 0 -_0801AE90: .4byte 0x020228c4 -_0801AE94: .4byte 0x030022c0 + .pool _0801AE98: bl sub_800A550 lsls r0, 24 @@ -55509,7 +54143,7 @@ _0801AE98: beq _0801AEA6 b _0801AFAE _0801AEA6: - ldr r1, _0801AED8 + ldr r1, =0x020223c4 ldrh r0, [r1] cmp r0, 0x51 bne _0801AEE0 @@ -55526,18 +54160,17 @@ _0801AEA6: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0801AEDC + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 movs r1, 0x32 b _0801AF16 .align 2, 0 -_0801AED8: .4byte 0x020223c4 -_0801AEDC: .4byte 0x030022c0 + .pool _0801AEE0: bl sub_800AC34 - ldr r4, _0801AF04 + ldr r4, =0x020223c4 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 16 @@ -55545,17 +54178,16 @@ _0801AEE0: ldrh r0, [r0] cmp r0, 0x52 bne _0801AF0C - ldr r0, _0801AF08 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 movs r1, 0x6 b _0801AF16 .align 2, 0 -_0801AF04: .4byte 0x020223c4 -_0801AF08: .4byte 0x030022c0 + .pool _0801AF0C: - ldr r0, _0801AF20 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -55565,47 +54197,45 @@ _0801AF16: bl sub_800A5B4 b _0801AFAE .align 2, 0 -_0801AF20: .4byte 0x030022c0 + .pool _0801AF24: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 bne _0801AFAE bl sub_800ADF8 - ldr r1, _0801AF3C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _0801AF8A .align 2, 0 -_0801AF3C: .4byte 0x030022c0 + .pool _0801AF40: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _0801AFAE - ldr r0, _0801AF54 + ldr r0, =sub_801AAD4 + 1 bl set_callback2 b _0801AFAE .align 2, 0 -_0801AF54: .4byte sub_801AAD4 + 1 + .pool _0801AF58: - ldr r0, _0801AF70 + ldr r0, =0x02022c6c ldr r0, [r0] - ldr r1, _0801AF74 + ldr r1, =0x085efc27 movs r2, 0x1 bl sub_801ABDC cmp r0, 0 beq _0801AFAE - ldr r0, _0801AF78 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 b _0801AFAE .align 2, 0 -_0801AF70: .4byte 0x02022c6c -_0801AF74: .4byte 0x085efc27 -_0801AF78: .4byte c2_exit_to_overworld_2_switch + 1 + .pool _0801AF7C: - ldr r0, _0801AF94 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0801AFAE @@ -55618,16 +54248,16 @@ _0801AF8A: strb r0, [r1] b _0801AFAE .align 2, 0 -_0801AF94: .4byte 0x03003124 + .pool _0801AF98: - ldr r0, _0801AFCC + ldr r0, =0x02022c6c ldr r0, [r0] - ldr r1, _0801AFD0 + ldr r1, =0x085efc0c movs r2, 0x1 bl sub_801ABDC cmp r0, 0 beq _0801AFAE - ldr r0, _0801AFD4 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 _0801AFAE: bl run_active_tasks @@ -55641,9 +54271,7 @@ _0801AFC2: pop {r0} bx r0 .align 2, 0 -_0801AFCC: .4byte 0x02022c6c -_0801AFD0: .4byte 0x085efc0c -_0801AFD4: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_801AC54 thumb_func_start sub_801AFD8 @@ -55652,11 +54280,11 @@ sub_801AFD8: @ 801AFD8 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r0, _0801B000 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0801B004 + ldr r0, =0x0000322c adds r1, r0 - ldr r2, _0801B008 + ldr r2, =0x050000db mov r0, sp bl CpuSet bl sub_801B180 @@ -55665,69 +54293,63 @@ sub_801AFD8: @ 801AFD8 pop {r0} bx r0 .align 2, 0 -_0801B000: .4byte 0x03005d8c -_0801B004: .4byte 0x0000322c -_0801B008: .4byte 0x050000db + .pool thumb_func_end sub_801AFD8 thumb_func_start sub_801B00C sub_801B00C: @ 801B00C - ldr r0, _0801B018 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B01C + ldr r1, =0x00003230 adds r0, r1 bx lr .align 2, 0 -_0801B018: .4byte 0x03005d8c -_0801B01C: .4byte 0x00003230 + .pool thumb_func_end sub_801B00C thumb_func_start sav1_get_mevent_buffer_1 sav1_get_mevent_buffer_1: @ 801B020 - ldr r0, _0801B02C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B030 + ldr r1, =0x000033f0 adds r0, r1 bx lr .align 2, 0 -_0801B02C: .4byte 0x03005d8c -_0801B030: .4byte 0x000033f0 + .pool thumb_func_end sav1_get_mevent_buffer_1 thumb_func_start sav1_get_mevent_buffer_2 sav1_get_mevent_buffer_2: @ 801B034 - ldr r0, _0801B040 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0xD5 lsls r1, 6 adds r0, r1 bx lr .align 2, 0 -_0801B040: .4byte 0x03005d8c + .pool thumb_func_end sav1_get_mevent_buffer_2 thumb_func_start sub_801B044 sub_801B044: @ 801B044 - ldr r0, _0801B050 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B054 + ldr r1, =0x0000356c adds r0, r1 bx lr .align 2, 0 -_0801B050: .4byte 0x03005d8c -_0801B054: .4byte 0x0000356c + .pool thumb_func_end sub_801B044 thumb_func_start sub_801B058 sub_801B058: @ 801B058 - ldr r0, _0801B064 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B068 + ldr r1, =0x00003564 adds r0, r1 bx lr .align 2, 0 -_0801B064: .4byte 0x03005d8c -_0801B068: .4byte 0x00003564 + .pool thumb_func_end sub_801B058 thumb_func_start sub_801B06C @@ -55746,9 +54368,9 @@ sub_801B078: @ 801B078 cmp r0, 0 beq _0801B0C4 bl sub_801B14C - ldr r4, _0801B0B8 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r5, _0801B0BC + ldr r5, =0x00003230 adds r0, r5 movs r6, 0xDE lsls r6, 1 @@ -55760,7 +54382,7 @@ sub_801B078: @ 801B078 adds r1, r6, 0 bl sub_806F928 ldr r1, [r4] - ldr r2, _0801B0C0 + ldr r2, =0x0000322c adds r1, r2 lsls r0, 16 lsrs r0, 16 @@ -55768,9 +54390,7 @@ sub_801B078: @ 801B078 movs r0, 0x1 b _0801B0C6 .align 2, 0 -_0801B0B8: .4byte 0x03005d8c -_0801B0BC: .4byte 0x00003230 -_0801B0C0: .4byte 0x0000322c + .pool _0801B0C4: movs r0, 0 _0801B0C6: @@ -55782,9 +54402,9 @@ _0801B0C6: thumb_func_start sub_801B0CC sub_801B0CC: @ 801B0CC push {r4,lr} - ldr r4, _0801B100 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _0801B104 + ldr r1, =0x00003230 adds r0, r1 movs r1, 0xDE lsls r1, 1 @@ -55792,12 +54412,12 @@ sub_801B0CC: @ 801B0CC lsls r0, 16 lsrs r0, 16 ldr r4, [r4] - ldr r2, _0801B108 + ldr r2, =0x0000322c adds r1, r4, r2 ldr r1, [r1] cmp r0, r1 bne _0801B10C - ldr r1, _0801B104 + ldr r1, =0x00003230 adds r0, r4, r1 bl sub_801B114 cmp r0, 0 @@ -55805,9 +54425,7 @@ sub_801B0CC: @ 801B0CC movs r0, 0x1 b _0801B10E .align 2, 0 -_0801B100: .4byte 0x03005d8c -_0801B104: .4byte 0x00003230 -_0801B108: .4byte 0x0000322c + .pool _0801B10C: movs r0, 0 _0801B10E: @@ -55834,9 +54452,9 @@ _0801B122: thumb_func_start sub_801B128 sub_801B128: @ 801B128 push {lr} - ldr r0, _0801B13C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B140 + ldr r1, =0x00003230 adds r0, r1 ldrb r0, [r0, 0x2] cmp r0, 0 @@ -55844,8 +54462,7 @@ sub_801B128: @ 801B128 movs r0, 0x1 b _0801B146 .align 2, 0 -_0801B13C: .4byte 0x03005d8c -_0801B140: .4byte 0x00003230 + .pool _0801B144: movs r0, 0 _0801B146: @@ -55861,12 +54478,12 @@ sub_801B14C: @ 801B14C str r4, [sp] bl sub_801B00C adds r1, r0, 0 - ldr r2, _0801B174 + ldr r2, =0x0500006f mov r0, sp bl CpuSet - ldr r0, _0801B178 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B17C + ldr r1, =0x0000322c adds r0, r1 str r4, [r0] add sp, 0x4 @@ -55874,9 +54491,7 @@ sub_801B14C: @ 801B14C pop {r0} bx r0 .align 2, 0 -_0801B174: .4byte 0x0500006f -_0801B178: .4byte 0x03005d8c -_0801B17C: .4byte 0x0000322c + .pool thumb_func_end sub_801B14C thumb_func_start sub_801B180 @@ -55887,7 +54502,7 @@ sub_801B180: @ 801B180 str r0, [sp] bl sub_801B044 adds r1, r0, 0 - ldr r2, _0801B1A0 + ldr r2, =0x05000001 mov r0, sp bl CpuSet bl sub_801DBC0 @@ -55895,16 +54510,16 @@ sub_801B180: @ 801B180 pop {r0} bx r0 .align 2, 0 -_0801B1A0: .4byte 0x05000001 + .pool thumb_func_end sub_801B180 thumb_func_start sub_801B1A4 sub_801B1A4: @ 801B1A4 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0801B1BC + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B1C0 + ldr r1, =0x00003230 adds r4, r0, r1 bl sub_801B0CC cmp r0, 0 @@ -55913,11 +54528,10 @@ _0801B1B8: movs r0, 0 b _0801B1DC .align 2, 0 -_0801B1BC: .4byte 0x03005d8c -_0801B1C0: .4byte 0x00003230 + .pool _0801B1C4: movs r2, 0 - ldr r3, _0801B1E4 + ldr r3, =0x000001bb _0801B1C8: adds r0, r4, r2 adds r1, r5, r2 @@ -55934,7 +54548,7 @@ _0801B1DC: pop {r1} bx r1 .align 2, 0 -_0801B1E4: .4byte 0x000001bb + .pool thumb_func_end sub_801B1A4 thumb_func_start sub_801B1E8 @@ -55946,16 +54560,15 @@ sub_801B1E8: @ 801B1E8 bl killram bl sub_809D4D8 bl sub_809D570 - ldr r0, _0801B214 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0801B218 + ldr r1, =0x00000bec adds r0, r1 bl sub_816534C pop {r0} bx r0 .align 2, 0 -_0801B214: .4byte 0x03005d90 -_0801B218: .4byte 0x00000bec + .pool thumb_func_end sub_801B1E8 thumb_func_start sub_801B21C @@ -55966,9 +54579,9 @@ sub_801B21C: @ 801B21C cmp r0, 0 beq _0801B274 bl sub_801B1E8 - ldr r4, _0801B268 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r5, _0801B26C + ldr r5, =0x000033f0 adds r0, r5 movs r6, 0xA6 lsls r6, 1 @@ -55980,7 +54593,7 @@ sub_801B21C: @ 801B21C adds r1, r6, 0 bl sub_806F928 ldr r1, [r4] - ldr r3, _0801B270 + ldr r3, =0x000033ec adds r2, r1, r3 lsls r0, 16 lsrs r0, 16 @@ -55994,9 +54607,7 @@ sub_801B21C: @ 801B21C movs r0, 0x1 b _0801B276 .align 2, 0 -_0801B268: .4byte 0x03005d8c -_0801B26C: .4byte 0x000033f0 -_0801B270: .4byte 0x000033ec + .pool _0801B274: movs r0, 0 _0801B276: @@ -56008,9 +54619,9 @@ _0801B276: thumb_func_start sub_801B27C sub_801B27C: @ 801B27C push {r4,r5,lr} - ldr r5, _0801B2B8 + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r1, _0801B2BC + ldr r1, =0x000033ec adds r4, r0, r1 adds r1, 0x4 adds r0, r1 @@ -56023,7 +54634,7 @@ sub_801B27C: @ 801B27C cmp r1, r0 bne _0801B2C4 ldr r0, [r5] - ldr r1, _0801B2C0 + ldr r1, =0x000033f0 adds r0, r1 bl sub_801B2CC cmp r0, 0 @@ -56034,9 +54645,7 @@ sub_801B27C: @ 801B27C movs r0, 0x1 b _0801B2C6 .align 2, 0 -_0801B2B8: .4byte 0x03005d8c -_0801B2BC: .4byte 0x000033ec -_0801B2C0: .4byte 0x000033f0 + .pool _0801B2C4: movs r0, 0 _0801B2C6: @@ -56085,9 +54694,9 @@ _0801B304: thumb_func_start sub_801B308 sub_801B308: @ 801B308 push {lr} - ldr r0, _0801B320 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B324 + ldr r1, =0x000033f0 adds r0, r1 ldrb r1, [r0, 0x8] movs r0, 0xC0 @@ -56097,8 +54706,7 @@ sub_801B308: @ 801B308 movs r0, 0x1 b _0801B32A .align 2, 0 -_0801B320: .4byte 0x03005d8c -_0801B324: .4byte 0x000033f0 + .pool _0801B328: movs r0, 0 _0801B32A: @@ -56112,15 +54720,15 @@ sub_801B330: @ 801B330 sub sp, 0x4 movs r5, 0 str r5, [sp] - ldr r4, _0801B358 + ldr r4, =0x03005d8c ldr r1, [r4] - ldr r0, _0801B35C + ldr r0, =0x000033f0 adds r1, r0 - ldr r2, _0801B360 + ldr r2, =0x05000053 mov r0, sp bl CpuSet ldr r0, [r4] - ldr r1, _0801B364 + ldr r1, =0x000033ec adds r0, r1 str r5, [r0] add sp, 0x4 @@ -56128,10 +54736,7 @@ sub_801B330: @ 801B330 pop {r0} bx r0 .align 2, 0 -_0801B358: .4byte 0x03005d8c -_0801B35C: .4byte 0x000033f0 -_0801B360: .4byte 0x05000053 -_0801B364: .4byte 0x000033ec + .pool thumb_func_end sub_801B330 thumb_func_start sub_801B368 @@ -56142,12 +54747,12 @@ sub_801B368: @ 801B368 str r4, [sp] bl sav1_get_mevent_buffer_2 adds r1, r0, 0 - ldr r2, _0801B390 + ldr r2, =0x05000009 mov r0, sp bl CpuSet - ldr r0, _0801B394 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B398 + ldr r1, =0x0000353c adds r0, r1 str r4, [r0] add sp, 0x4 @@ -56155,9 +54760,7 @@ sub_801B368: @ 801B368 pop {r0} bx r0 .align 2, 0 -_0801B390: .4byte 0x05000009 -_0801B394: .4byte 0x03005d8c -_0801B398: .4byte 0x0000353c + .pool thumb_func_end sub_801B368 thumb_func_start sub_801B39C @@ -56169,17 +54772,16 @@ sub_801B39C: @ 801B39C movs r0, 0 b _0801B3B4 _0801B3AA: - ldr r0, _0801B3B8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B3BC + ldr r1, =0x000033f0 adds r0, r1 ldrh r0, [r0] _0801B3B4: pop {r1} bx r1 .align 2, 0 -_0801B3B8: .4byte 0x03005d8c -_0801B3BC: .4byte 0x000033f0 + .pool thumb_func_end sub_801B39C thumb_func_start sub_801B3C0 @@ -56203,7 +54805,7 @@ _0801B3D4: sub_801B3D8: @ 801B3D8 push {lr} lsls r0, 16 - ldr r1, _0801B3EC + ldr r1, =0xfc180000 adds r0, r1 lsrs r0, 16 cmp r0, 0x13 @@ -56211,7 +54813,7 @@ sub_801B3D8: @ 801B3D8 movs r0, 0 b _0801B3F2 .align 2, 0 -_0801B3EC: .4byte 0xfc180000 + .pool _0801B3F0: movs r0, 0x1 _0801B3F2: @@ -56229,8 +54831,8 @@ sub_801B3F8: @ 801B3F8 bl sub_801B3D8 cmp r0, 0 beq _0801B430 - ldr r1, _0801B428 - ldr r2, _0801B42C + ldr r1, =0x082f0de8 + ldr r2, =0xfffffc18 adds r0, r4, r2 lsls r0, 1 adds r0, r1 @@ -56243,8 +54845,7 @@ sub_801B3F8: @ 801B3F8 movs r0, 0x1 b _0801B432 .align 2, 0 -_0801B428: .4byte 0x082f0de8 -_0801B42C: .4byte 0xfffffc18 + .pool _0801B430: movs r0, 0 _0801B432: @@ -56332,13 +54933,13 @@ sub_801B4A4: @ 801B4A4 ldrh r1, [r1] cmp r1, 0 beq _0801B4C4 - ldr r0, _0801B4C0 + ldr r0, =0x0000019b cmp r1, r0 bhi _0801B4C4 movs r0, 0x1 b _0801B4C6 .align 2, 0 -_0801B4C0: .4byte 0x0000019b + .pool _0801B4C4: movs r0, 0 _0801B4C6: @@ -56352,9 +54953,9 @@ sub_801B4CC: @ 801B4CC bl sub_801B27C cmp r0, 0 beq _0801B500 - ldr r0, _0801B4F8 + ldr r0, =0x03005d8c ldr r3, [r0] - ldr r0, _0801B4FC + ldr r0, =0x000033f0 adds r2, r3, r0 ldrb r1, [r2, 0x8] movs r0, 0x3 @@ -56368,8 +54969,7 @@ sub_801B4CC: @ 801B4CC bl sub_801B438 b _0801B502 .align 2, 0 -_0801B4F8: .4byte 0x03005d8c -_0801B4FC: .4byte 0x000033f0 + .pool _0801B500: movs r0, 0 _0801B502: @@ -56381,9 +54981,9 @@ _0801B502: sub_801B508: @ 801B508 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _0801B538 + ldr r6, =0x03005d8c ldr r0, [r6] - ldr r1, _0801B53C + ldr r1, =0x000033f0 adds r0, r1 ldrb r4, [r0, 0x9] adds r0, r5, 0 @@ -56401,8 +55001,7 @@ sub_801B508: @ 801B508 beq _0801B54C b _0801B572 .align 2, 0 -_0801B538: .4byte 0x03005d8c -_0801B53C: .4byte 0x000033f0 + .pool _0801B540: ldrh r0, [r5, 0x2] strh r0, [r1] @@ -56415,7 +55014,7 @@ _0801B54C: cmp r3, r4 bge _0801B572 ldr r0, [r6] - ldr r6, _0801B57C + ldr r6, =0x00003548 adds r2, r0, r6 adds r6, 0xE adds r1, r0, r6 @@ -56439,7 +55038,7 @@ _0801B574: pop {r1} bx r1 .align 2, 0 -_0801B57C: .4byte 0x00003548 + .pool thumb_func_end sub_801B508 thumb_func_start sub_801B580 @@ -56454,11 +55053,11 @@ sub_801B580: @ 801B580 adds r4, r1, 0 movs r0, 0 str r0, [sp] - ldr r2, _0801B5B4 + ldr r2, =0x05000019 mov r0, sp adds r1, r5, 0 bl CpuSet - ldr r0, _0801B5B8 + ldr r0, =0x00000101 str r0, [r5] movs r0, 0x1 strh r0, [r5, 0x4] @@ -56467,12 +55066,10 @@ sub_801B580: @ 801B580 beq _0801B5C0 movs r0, 0x5 strh r0, [r5, 0xC] - ldr r0, _0801B5BC + ldr r0, =0x00000201 b _0801B5C8 .align 2, 0 -_0801B5B4: .4byte 0x05000019 -_0801B5B8: .4byte 0x00000101 -_0801B5BC: .4byte 0x00000201 + .pool _0801B5C0: movs r0, 0x4 strh r0, [r5, 0xC] @@ -56506,7 +55103,7 @@ _0801B5FC: _0801B5FE: adds r4, r5, 0 adds r4, 0x4C - ldr r0, _0801B688 + ldr r0, =0x03005d90 mov r8, r0 adds r6, r5, 0 adds r6, 0x45 @@ -56518,9 +55115,9 @@ _0801B5FE: movs r2, 0x60 adds r2, r5 mov r10, r2 - ldr r0, _0801B68C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _0801B690 + ldr r3, =0x00003564 adds r2, r0, r3 adds r1, r5, 0 adds r1, 0x16 @@ -56542,9 +55139,9 @@ _0801B628: ldr r1, [r2] adds r0, r6, 0 bl gf_strcpy - ldr r0, _0801B68C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _0801B694 + ldr r3, =0x00002bb0 adds r2, r0, r3 adds r1, r7, 0 movs r3, 0x5 @@ -56556,11 +55153,11 @@ _0801B658: subs r3, 0x1 cmp r3, 0 bge _0801B658 - ldr r1, _0801B698 + ldr r1, =RomHeaderGameCode mov r0, r9 movs r2, 0x4 bl memcpy - ldr r0, _0801B69C + ldr r0, =RomHeaderSoftwareVersion ldrb r0, [r0] mov r4, r10 strb r0, [r4] @@ -56573,12 +55170,7 @@ _0801B658: pop {r0} bx r0 .align 2, 0 -_0801B688: .4byte 0x03005d90 -_0801B68C: .4byte 0x03005d8c -_0801B690: .4byte 0x00003564 -_0801B694: .4byte 0x00002bb0 -_0801B698: .4byte RomHeaderGameCode -_0801B69C: .4byte RomHeaderSoftwareVersion + .pool thumb_func_end sub_801B580 thumb_func_start sub_801B6A0 @@ -56587,7 +55179,7 @@ sub_801B6A0: @ 801B6A0 adds r2, r0, 0 adds r4, r1, 0 ldr r1, [r2] - ldr r0, _0801B6E0 + ldr r0, =0x00000101 cmp r1, r0 bne _0801B6DC ldrh r1, [r2, 0x4] @@ -56617,7 +55209,7 @@ _0801B6DC: movs r0, 0 b _0801B6E6 .align 2, 0 -_0801B6E0: .4byte 0x00000101 + .pool _0801B6E4: movs r0, 0x1 _0801B6E6: @@ -56731,12 +55323,12 @@ sub_801B784: @ 801B784 cmp r1, 0x4 bhi _0801B7D0 lsls r0, r1, 2 - ldr r1, _0801B798 + ldr r1, =_0801B79C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801B798: .4byte _0801B79C + .pool .align 2, 0 _0801B79C: .4byte _0801B7B0 @@ -56775,9 +55367,9 @@ _0801B7D2: sub_801B7D8: @ 801B7D8 push {r4,lr} adds r4, r0, 0 - ldr r2, _0801B800 + ldr r2, =0x03005d8c ldr r0, [r2] - ldr r1, _0801B804 + ldr r1, =0x000033f0 adds r0, r1 ldrb r1, [r0, 0x8] movs r0, 0x3 @@ -56789,14 +55381,12 @@ sub_801B7D8: @ 801B7D8 cmp r4, 0x4 bhi _0801B83A lsls r0, r4, 2 - ldr r1, _0801B808 + ldr r1, =_0801B80C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801B800: .4byte 0x03005d8c -_0801B804: .4byte 0x000033f0 -_0801B808: .4byte _0801B80C + .pool .align 2, 0 _0801B80C: .4byte _0801B820 @@ -56811,13 +55401,13 @@ _0801B820: b _0801B838 _0801B828: ldr r0, [r3] - ldr r1, _0801B830 + ldr r1, =0x00003542 b _0801B838 .align 2, 0 -_0801B830: .4byte 0x00003542 + .pool _0801B834: ldr r0, [r3] - ldr r1, _0801B858 + ldr r1, =0x00003544 _0801B838: adds r2, r0, r1 _0801B83A: @@ -56828,7 +55418,7 @@ _0801B83A: strh r0, [r2] lsls r0, 16 lsrs r0, 16 - ldr r1, _0801B85C + ldr r1, =0x000003e7 cmp r0, r1 bls _0801B850 strh r1, [r2] @@ -56837,8 +55427,7 @@ _0801B850: pop {r0} bx r0 .align 2, 0 -_0801B858: .4byte 0x00003544 -_0801B85C: .4byte 0x000003e7 + .pool thumb_func_end sub_801B7D8 thumb_func_start mevent_081445C0 @@ -56847,12 +55436,12 @@ mevent_081445C0: @ 801B860 cmp r0, 0x4 bhi _0801B938 lsls r0, 2 - ldr r1, _0801B870 + ldr r1, =_0801B874 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801B870: .4byte _0801B874 + .pool .align 2, 0 _0801B874: .4byte _0801B888 @@ -56861,9 +55450,9 @@ _0801B874: .4byte _0801B8F4 .4byte _0801B918 _0801B888: - ldr r0, _0801B8A4 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r1, _0801B8A8 + ldr r1, =0x000033f0 adds r0, r2, r1 ldrb r1, [r0, 0x8] movs r0, 0x3 @@ -56876,12 +55465,11 @@ _0801B888: ldrh r0, [r0] b _0801B93A .align 2, 0 -_0801B8A4: .4byte 0x03005d8c -_0801B8A8: .4byte 0x000033f0 + .pool _0801B8AC: - ldr r0, _0801B8C8 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r1, _0801B8CC + ldr r1, =0x000033f0 adds r0, r2, r1 ldrb r1, [r0, 0x8] movs r0, 0x3 @@ -56894,12 +55482,11 @@ _0801B8AC: ldrh r0, [r0, 0x2] b _0801B93A .align 2, 0 -_0801B8C8: .4byte 0x03005d8c -_0801B8CC: .4byte 0x000033f0 + .pool _0801B8D0: - ldr r0, _0801B8EC + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r1, _0801B8F0 + ldr r1, =0x000033f0 adds r0, r2, r1 ldrb r1, [r0, 0x8] movs r0, 0x3 @@ -56912,12 +55499,11 @@ _0801B8D0: ldrh r0, [r0, 0x4] b _0801B93A .align 2, 0 -_0801B8EC: .4byte 0x03005d8c -_0801B8F0: .4byte 0x000033f0 + .pool _0801B8F4: - ldr r0, _0801B910 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B914 + ldr r1, =0x000033f0 adds r0, r1 ldrb r1, [r0, 0x8] movs r0, 0x3 @@ -56929,12 +55515,11 @@ _0801B8F4: lsrs r0, 16 b _0801B93A .align 2, 0 -_0801B910: .4byte 0x03005d8c -_0801B914: .4byte 0x000033f0 + .pool _0801B918: - ldr r0, _0801B930 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B934 + ldr r1, =0x000033f0 adds r2, r0, r1 ldrb r1, [r2, 0x8] movs r0, 0x3 @@ -56944,8 +55529,7 @@ _0801B918: ldrb r0, [r2, 0x9] b _0801B93A .align 2, 0 -_0801B930: .4byte 0x03005d8c -_0801B934: .4byte 0x000033f0 + .pool _0801B938: movs r0, 0 _0801B93A: @@ -56955,12 +55539,12 @@ _0801B93A: thumb_func_start sub_801B940 sub_801B940: @ 801B940 - ldr r1, _0801B948 + ldr r1, =0x02022c70 movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_0801B948: .4byte 0x02022c70 + .pool thumb_func_end sub_801B940 thumb_func_start sub_801B94C @@ -56969,7 +55553,7 @@ sub_801B94C: @ 801B94C lsls r0, 16 lsrs r0, 16 adds r4, r0, 0 - ldr r5, _0801B97C + ldr r5, =0x02022c70 movs r0, 0 str r0, [r5] cmp r4, 0 @@ -56977,9 +55561,9 @@ sub_801B94C: @ 801B94C bl sub_801B27C cmp r0, 0 beq _0801B988 - ldr r0, _0801B980 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0801B984 + ldr r1, =0x000033f0 adds r0, r1 ldrh r0, [r0] cmp r0, r4 @@ -56988,9 +55572,7 @@ sub_801B94C: @ 801B94C str r0, [r5] b _0801B98A .align 2, 0 -_0801B97C: .4byte 0x02022c70 -_0801B980: .4byte 0x03005d8c -_0801B984: .4byte 0x000033f0 + .pool _0801B988: movs r0, 0 _0801B98A: @@ -57003,7 +55585,7 @@ _0801B98A: sub_801B990: @ 801B990 push {lr} adds r2, r0, 0 - ldr r0, _0801B9B4 + ldr r0, =0x02022c70 ldr r0, [r0] cmp r0, 0 beq _0801B9EC @@ -57013,20 +55595,18 @@ sub_801B990: @ 801B990 bcc _0801B9C0 cmp r2, 0x2 bne _0801B9EC - ldr r0, _0801B9B8 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r0, _0801B9BC + ldr r0, =0x00003584 adds r2, r0 movs r0, 0x2 b _0801B9CA .align 2, 0 -_0801B9B4: .4byte 0x02022c70 -_0801B9B8: .4byte 0x03005d8c -_0801B9BC: .4byte 0x00003584 + .pool _0801B9C0: - ldr r0, _0801B9D4 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r0, _0801B9D8 + ldr r0, =0x00003570 adds r2, r0 movs r0, 0 _0801B9CA: @@ -57034,12 +55614,11 @@ _0801B9CA: bl sub_801BA8C b _0801B9EC .align 2, 0 -_0801B9D4: .4byte 0x03005d8c -_0801B9D8: .4byte 0x00003570 + .pool _0801B9DC: - ldr r0, _0801B9F0 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r0, _0801B9F4 + ldr r0, =0x00003570 adds r2, r0 movs r0, 0x1 movs r3, 0x5 @@ -57048,8 +55627,7 @@ _0801B9EC: pop {r0} bx r0 .align 2, 0 -_0801B9F0: .4byte 0x03005d8c -_0801B9F4: .4byte 0x00003570 + .pool thumb_func_end sub_801B990 thumb_func_start sub_801B9F8 @@ -57058,20 +55636,18 @@ sub_801B9F8: @ 801B9F8 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r0, _0801BA18 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0801BA1C + ldr r0, =0x00003570 adds r1, r0 - ldr r2, _0801BA20 + ldr r2, =0x0500000a mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_0801BA18: .4byte 0x03005d8c -_0801BA1C: .4byte 0x00003570 -_0801BA20: .4byte 0x0500000a + .pool thumb_func_end sub_801B9F8 thumb_func_start sub_801BA24 @@ -57164,8 +55740,8 @@ sub_801BAAC: @ 801BAAC beq _0801BAC8 cmp r6, 0 beq _0801BAC8 - ldr r7, _0801BACC - ldr r0, _0801BAD0 + ldr r7, =0x02022c74 + ldr r0, =0x0000145c bl malloc_and_clear str r0, [r7] cmp r0, 0 @@ -57174,8 +55750,7 @@ _0801BAC8: movs r0, 0 b _0801BB3E .align 2, 0 -_0801BACC: .4byte 0x02022c74 -_0801BAD0: .4byte 0x0000145c + .pool _0801BAD4: movs r4, 0xA6 lsls r4, 1 @@ -57228,7 +55803,7 @@ _0801BB26: lsls r0, 26 lsrs r0, 28 lsls r0, 4 - ldr r1, _0801BB44 + ldr r1, =0x082f1d60 adds r0, r1 str r0, [r2] movs r0, 0x1 @@ -57237,17 +55812,17 @@ _0801BB3E: pop {r1} bx r1 .align 2, 0 -_0801BB44: .4byte 0x082f1d60 + .pool thumb_func_end sub_801BAAC thumb_func_start sub_801BB48 sub_801BB48: @ 801BB48 push {r4,lr} - ldr r4, _0801BB6C + ldr r4, =0x02022c74 ldr r0, [r4] cmp r0, 0 beq _0801BB64 - ldr r2, _0801BB70 + ldr r2, =0x0000145c movs r1, 0 bl memset ldr r0, [r4] @@ -57259,15 +55834,14 @@ _0801BB64: pop {r0} bx r0 .align 2, 0 -_0801BB6C: .4byte 0x02022c74 -_0801BB70: .4byte 0x0000145c + .pool thumb_func_end sub_801BB48 thumb_func_start sub_801BB74 sub_801BB74: @ 801BB74 push {r4-r6,lr} sub sp, 0x24 - ldr r5, _0801BB88 + ldr r5, =0x02022c74 ldr r0, [r5] cmp r0, 0 bne _0801BB8C @@ -57275,7 +55849,7 @@ sub_801BB74: @ 801BB74 negs r0, r0 b _0801BD98 .align 2, 0 -_0801BB88: .4byte 0x02022c74 + .pool _0801BB8C: movs r4, 0xBA lsls r4, 1 @@ -57286,12 +55860,12 @@ _0801BB8C: b _0801BD70 _0801BB9A: lsls r0, 2 - ldr r1, _0801BBA4 + ldr r1, =_0801BBA8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801BBA4: .4byte _0801BBA8 + .pool .align 2, 0 _0801BBA8: .4byte _0801BBC8 @@ -57349,7 +55923,7 @@ _0801BBE8: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r5, _0801BC84 + ldr r5, =0x02022c74 ldr r0, [r5] movs r1, 0xB8 lsls r1, 1 @@ -57362,7 +55936,7 @@ _0801BBE8: movs r2, 0 movs r3, 0x8 bl decompress_and_copy_tile_data_to_vram - ldr r4, _0801BC88 + ldr r4, =0x082f0e1c adds r0, r4, 0 bl Window_AddFromTemplate ldr r1, [r5] @@ -57388,8 +55962,7 @@ _0801BBE8: strh r0, [r1] b _0801BD86 .align 2, 0 -_0801BC84: .4byte 0x02022c74 -_0801BC88: .4byte 0x082f0e1c + .pool _0801BC8C: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -57403,12 +55976,12 @@ _0801BC9A: movs r1, 0x20 movs r2, 0x20 bl gpu_pal_apply - ldr r2, _0801BD08 + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r5, _0801BD0C + ldr r5, =0x02022c74 ldr r0, [r5] movs r4, 0xB8 lsls r4, 1 @@ -57422,7 +55995,7 @@ _0801BC9A: adds r4, r1, r4 ldr r0, [r4] ldr r0, [r0, 0x8] - ldr r4, _0801BD10 + ldr r4, =0x0000045c adds r1, r4 bl LZ77UnCompWram ldr r1, [r5] @@ -57448,9 +56021,7 @@ _0801BC9A: bl gpu_copy_wram_bg_tilemap_to_vram b _0801BD86 .align 2, 0 -_0801BD08: .4byte 0x02037fd4 -_0801BD0C: .4byte 0x02022c74 -_0801BD10: .4byte 0x0000045c + .pool _0801BD14: bl sub_801BEF8 b _0801BD86 @@ -57472,7 +56043,7 @@ _0801BD3A: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - ldr r2, _0801BD6C + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -57488,7 +56059,7 @@ _0801BD3A: bl fade_and_return_progress_probably b _0801BD86 .align 2, 0 -_0801BD6C: .4byte 0x02037fd4 + .pool _0801BD70: bl fade_and_return_progress_probably lsls r0, 24 @@ -57501,7 +56072,7 @@ _0801BD70: movs r0, 0x1 b _0801BD98 _0801BD86: - ldr r0, _0801BDA0 + ldr r0, =0x02022c74 ldr r1, [r0] movs r0, 0xBA lsls r0, 1 @@ -57517,7 +56088,7 @@ _0801BD98: pop {r1} bx r1 .align 2, 0 -_0801BDA0: .4byte 0x02022c74 + .pool thumb_func_end sub_801BB74 thumb_func_start sub_801BDA4 @@ -57525,7 +56096,7 @@ sub_801BDA4: @ 801BDA4 push {r4,r5,lr} sub sp, 0x8 adds r2, r0, 0 - ldr r5, _0801BDB8 + ldr r5, =0x02022c74 ldr r0, [r5] cmp r0, 0 bne _0801BDBC @@ -57533,7 +56104,7 @@ sub_801BDA4: @ 801BDA4 negs r0, r0 b _0801BEEC .align 2, 0 -_0801BDB8: .4byte 0x02022c74 + .pool _0801BDBC: movs r4, 0xBA lsls r4, 1 @@ -57544,12 +56115,12 @@ _0801BDBC: b _0801BEC4 _0801BDCA: lsls r0, 2 - ldr r1, _0801BDD4 + ldr r1, =_0801BDD8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801BDD4: .4byte _0801BDD8 + .pool .align 2, 0 _0801BDD8: .4byte _0801BDF0 @@ -57609,7 +56180,7 @@ _0801BE56: bl gpu_sync_bg_hide movs r0, 0x2 bl gpu_sync_bg_hide - ldr r4, _0801BE90 + ldr r4, =0x02022c74 ldr r0, [r4] movs r1, 0xBD lsls r1, 1 @@ -57630,13 +56201,13 @@ _0801BE56: bl Window_Remove b _0801BEDA .align 2, 0 -_0801BE90: .4byte 0x02022c74 + .pool _0801BE94: bl sub_801C61C bl sub_80D2F9C b _0801BEDA _0801BE9E: - ldr r0, _0801BEC0 + ldr r0, =0x02022c60 ldrb r0, [r0] adds r1, r2, 0 bl sub_80186EC @@ -57651,7 +56222,7 @@ _0801BE9E: bl sub_80A1AD4 b _0801BEDA .align 2, 0 -_0801BEC0: .4byte 0x02022c60 + .pool _0801BEC4: bl fade_and_return_progress_probably lsls r0, 24 @@ -57664,7 +56235,7 @@ _0801BEC4: movs r0, 0x1 b _0801BEEC _0801BEDA: - ldr r0, _0801BEF4 + ldr r0, =0x02022c74 ldr r1, [r0] movs r0, 0xBA lsls r0, 1 @@ -57680,7 +56251,7 @@ _0801BEEC: pop {r1} bx r1 .align 2, 0 -_0801BEF4: .4byte 0x02022c74 + .pool thumb_func_end sub_801BDA4 thumb_func_start sub_801BEF8 @@ -57696,15 +56267,15 @@ sub_801BEF8: @ 801BEF8 movs r1, 0 movs r2, 0x6 bl memset - ldr r4, _0801BFDC + ldr r4, =0x02022c74 ldr r1, [r4] - ldr r2, _0801BFE0 + ldr r2, =0x0000018b adds r0, r1, r2 adds r1, 0xA movs r2, 0x28 bl memcpy ldr r0, [r4] - ldr r3, _0801BFE4 + ldr r3, =0x000001b3 adds r1, r0, r3 movs r0, 0xFF strb r0, [r1] @@ -57724,13 +56295,13 @@ sub_801BEF8: @ 801BEF8 strb r1, [r0] ldr r1, [r4] ldr r0, [r1, 0x4] - ldr r2, _0801BFE8 + ldr r2, =0x000f423f cmp r0, r2 bls _0801BF54 str r2, [r1, 0x4] _0801BF54: ldr r1, [r4] - ldr r2, _0801BFEC + ldr r2, =0x000001dd adds r0, r1, r2 ldr r1, [r1, 0x4] movs r2, 0 @@ -57766,7 +56337,7 @@ _0801BF66: lsrs r5, r0, 16 cmp r5, 0x3 bls _0801BF66 - ldr r6, _0801BFDC + ldr r6, =0x02022c74 ldr r1, [r6] movs r3, 0xA2 lsls r3, 2 @@ -57795,17 +56366,13 @@ _0801BF66: beq _0801BFF6 b _0801C168 .align 2, 0 -_0801BFDC: .4byte 0x02022c74 -_0801BFE0: .4byte 0x0000018b -_0801BFE4: .4byte 0x000001b3 -_0801BFE8: .4byte 0x000f423f -_0801BFEC: .4byte 0x000001dd + .pool _0801BFF0: cmp r0, 0x2 beq _0801C028 b _0801C168 _0801BFF6: - ldr r2, _0801C010 + ldr r2, =0x000002b1 adds r0, r1, r2 movs r3, 0x91 lsls r3, 1 @@ -57813,14 +56380,13 @@ _0801BFF6: movs r2, 0x28 bl memcpy ldr r1, [r6] - ldr r0, _0801C014 + ldr r0, =0x000002d9 adds r1, r0 b _0801C01C .align 2, 0 -_0801C010: .4byte 0x000002b1 -_0801C014: .4byte 0x000002d9 + .pool _0801C018: - ldr r2, _0801C024 + ldr r2, =0x000002b1 adds r1, r2 _0801C01C: ldrb r0, [r1] @@ -57828,9 +56394,9 @@ _0801C01C: strb r0, [r1] b _0801C168 .align 2, 0 -_0801C024: .4byte 0x000002b1 + .pool _0801C028: - ldr r3, _0801C0E4 + ldr r3, =0x000002b1 adds r0, r1, r3 ldrb r1, [r0] orrs r1, r7 @@ -57841,7 +56407,7 @@ _0801C028: lsls r4, 1 adds r0, r1, r4 ldrh r0, [r0] - ldr r2, _0801C0E8 + ldr r2, =0x000003e7 cmp r0, r2 bls _0801C046 adds r0, r2, 0 @@ -57894,12 +56460,12 @@ _0801C06E: bls _0801C06E movs r5, 0 movs r6, 0 - ldr r1, _0801C0EC + ldr r1, =0x02022c74 mov r8, r1 movs r2, 0x91 lsls r2, 1 mov r10, r2 - ldr r7, _0801C0F0 + ldr r7, =0x00000175 movs r3, 0xB7 lsls r3, 2 mov r9, r3 @@ -57912,14 +56478,14 @@ _0801C0B6: ldrb r3, [r0] cmp r3, 0xF7 beq _0801C0F8 - ldr r1, _0801C0F0 + ldr r1, =0x00000175 adds r0, r2, r1 ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 lsls r0, 4 adds r0, r6, r0 - ldr r4, _0801C0F4 + ldr r4, =0x000002dd adds r1, r2, r4 adds r1, r0 strb r3, [r1] @@ -57928,11 +56494,7 @@ _0801C0B6: lsrs r6, r0, 16 b _0801C15E .align 2, 0 -_0801C0E4: .4byte 0x000002b1 -_0801C0E8: .4byte 0x000003e7 -_0801C0EC: .4byte 0x02022c74 -_0801C0F0: .4byte 0x00000175 -_0801C0F4: .4byte 0x000002dd + .pool _0801C0F8: adds r0, r5, 0x1 adds r0, r1, r0 @@ -58016,7 +56578,7 @@ sub_801C178: @ 801C178 mov r8, r4 movs r0, 0 str r0, [sp, 0xC] - ldr r7, _0801C1C0 + ldr r7, =0x02022c74 ldr r0, [r7] lsls r1, r4, 1 movs r2, 0xBB @@ -58040,7 +56602,7 @@ sub_801C178: @ 801C178 mov r9, r6 b _0801C498 .align 2, 0 -_0801C1C0: .4byte 0x02022c74 + .pool _0801C1C4: mov r0, r8 cmp r0, 0x2 @@ -58061,13 +56623,13 @@ _0801C1D0: lsrs r0, 28 lsls r1, r0, 1 adds r1, r0 - ldr r0, _0801C294 + ldr r0, =0x082f0e10 mov r8, r0 add r1, r8 str r1, [sp] ldr r1, [sp, 0xC] str r1, [sp, 0x4] - ldr r0, _0801C298 + ldr r0, =0x0000018b adds r2, r0 str r2, [sp, 0x8] adds r0, r5, 0 @@ -58135,7 +56697,7 @@ _0801C266: str r0, [sp] ldr r0, [sp, 0xC] str r0, [sp, 0x4] - ldr r1, _0801C29C + ldr r1, =0x000001dd adds r0, r2, r1 str r0, [sp, 0x8] adds r0, r5, 0 @@ -58145,9 +56707,7 @@ _0801C266: bl box_print b _0801C498 .align 2, 0 -_0801C294: .4byte 0x082f0e10 -_0801C298: .4byte 0x0000018b -_0801C29C: .4byte 0x000001dd + .pool _0801C2A0: mov r9, r6 _0801C2A2: @@ -58158,7 +56718,7 @@ _0801C2A2: adds r3, 0x2 lsls r3, 24 lsrs r3, 24 - ldr r0, _0801C2FC + ldr r0, =0x02022c74 ldr r2, [r0] movs r1, 0xB8 lsls r1, 1 @@ -58168,7 +56728,7 @@ _0801C2A2: lsrs r0, 4 lsls r1, r0, 1 adds r1, r0 - ldr r0, _0801C300 + ldr r0, =0x082f0e10 adds r1, r0 str r1, [sp] movs r0, 0 @@ -58196,10 +56756,9 @@ _0801C2A2: ble _0801C2A2 b _0801C498 .align 2, 0 -_0801C2FC: .4byte 0x02022c74 -_0801C300: .4byte 0x082f0e10 + .pool _0801C304: - ldr r4, _0801C38C + ldr r4, =0x082f0e18 ldr r2, [r7] ldrb r0, [r2, 0x8] lsls r0, 30 @@ -58215,7 +56774,7 @@ _0801C304: lsrs r0, 28 lsls r1, r0, 1 adds r1, r0 - ldr r0, _0801C390 + ldr r0, =0x082f0e10 mov r10, r0 add r1, r10 str r1, [sp] @@ -58255,7 +56814,7 @@ _0801C304: str r0, [sp] ldr r0, [sp, 0xC] str r0, [sp, 0x4] - ldr r1, _0801C394 + ldr r1, =0x000002b1 adds r0, r2, r1 str r0, [sp, 0x8] adds r0, r5, 0 @@ -58265,9 +56824,7 @@ _0801C304: mov r9, r6 b _0801C498 .align 2, 0 -_0801C38C: .4byte 0x082f0e18 -_0801C390: .4byte 0x082f0e10 -_0801C394: .4byte 0x000002b1 + .pool _0801C398: movs r2, 0 mov r8, r2 @@ -58283,7 +56840,7 @@ _0801C398: lsls r0, 24 lsrs r2, r0, 24 ldr r0, [r7] - ldr r1, _0801C4B4 + ldr r1, =0x00000175 adds r0, r1 mov r9, r6 ldr r1, [sp, 0xC] @@ -58309,7 +56866,7 @@ _0801C3CE: lsrs r1, 28 lsls r0, r1, 1 adds r0, r1 - ldr r1, _0801C4B8 + ldr r1, =0x082f0e10 adds r0, r1 str r0, [sp] movs r0, 0 @@ -58332,7 +56889,7 @@ _0801C3CE: bl box_print ldr r1, [r7] adds r0, r1, r5 - ldr r2, _0801C4BC + ldr r2, =0x00000306 adds r0, r2 ldrb r0, [r0] cmp r0, 0xFF @@ -58356,7 +56913,7 @@ _0801C3CE: lsrs r1, 28 lsls r0, r1, 1 adds r0, r1 - ldr r1, _0801C4B8 + ldr r1, =0x082f0e10 adds r0, r1 str r0, [sp] movs r0, 0 @@ -58389,7 +56946,7 @@ _0801C482: str r0, [sp, 0xC] asrs r1, 24 ldr r0, [r7] - ldr r2, _0801C4B4 + ldr r2, =0x00000175 adds r0, r2 ldrb r0, [r0] cmp r1, r0 @@ -58408,9 +56965,7 @@ _0801C498: pop {r0} bx r0 .align 2, 0 -_0801C4B4: .4byte 0x00000175 -_0801C4B8: .4byte 0x082f0e10 -_0801C4BC: .4byte 0x00000306 + .pool thumb_func_end sub_801C178 thumb_func_start sub_801C4C0 @@ -58422,7 +56977,7 @@ sub_801C4C0: @ 801C4C0 push {r5-r7} sub sp, 0x8 movs r7, 0 - ldr r4, _0801C600 + ldr r4, =0x02022c74 ldr r0, [r4] movs r1, 0xBE lsls r1, 1 @@ -58439,7 +56994,7 @@ sub_801C4C0: @ 801C4C0 bl sub_80D2E84 lsls r0, 16 lsrs r0, 16 - ldr r1, _0801C604 + ldr r1, =nullsub_12 + 1 str r7, [sp] str r7, [sp, 0x4] movs r2, 0xDC @@ -58450,7 +57005,7 @@ sub_801C4C0: @ 801C4C0 lsls r2, 1 adds r1, r2 strb r0, [r1] - ldr r2, _0801C608 + ldr r2, =0x02020630 ldr r0, [r4] movs r1, 0xBE lsls r1, 1 @@ -58477,7 +57032,7 @@ _0801C52C: ands r0, r1 cmp r0, 0x1 bne _0801C5EE - ldr r0, _0801C60C + ldr r0, =0x082f1d00 bl gpu_tile_obj_decompress_and_load3 ldr r0, [r4] movs r2, 0xB8 @@ -58487,7 +57042,7 @@ _0801C52C: ldrb r0, [r0, 0x1] lsrs r0, 4 lsls r0, 3 - ldr r1, _0801C610 + ldr r1, =0x082f1d08 adds r0, r1 bl gpu_pal_obj_alloc_tag_and_apply ldr r0, [r4] @@ -58495,7 +57050,7 @@ _0801C52C: cmp r7, r0 bcs _0801C5EE adds r6, r4, 0 - ldr r0, _0801C614 + ldr r0, =0x0000017d mov r10, r0 movs r1, 0 mov r9, r1 @@ -58521,7 +57076,7 @@ _0801C572: lsls r1, r7, 5 movs r0, 0xD8 subs r5, r0, r1 - ldr r0, _0801C618 + ldr r0, =0x082f1d48 adds r1, r5, 0 movs r2, 0x90 movs r3, 0x8 @@ -58544,7 +57099,7 @@ _0801C572: mov r2, r9 str r2, [sp] str r2, [sp, 0x4] - ldr r1, _0801C604 + ldr r1, =nullsub_12 + 1 adds r2, r5, 0 movs r3, 0x88 bl sub_80D2D78 @@ -58572,20 +57127,14 @@ _0801C5EE: pop {r0} bx r0 .align 2, 0 -_0801C600: .4byte 0x02022c74 -_0801C604: .4byte nullsub_12 + 1 -_0801C608: .4byte 0x02020630 -_0801C60C: .4byte 0x082f1d00 -_0801C610: .4byte 0x082f1d08 -_0801C614: .4byte 0x0000017d -_0801C618: .4byte 0x082f1d48 + .pool thumb_func_end sub_801C4C0 thumb_func_start sub_801C61C sub_801C61C: @ 801C61C push {r4-r7,lr} movs r5, 0 - ldr r4, _0801C6BC + ldr r4, =0x02022c74 ldr r0, [r4] movs r2, 0xBE lsls r2, 1 @@ -58597,7 +57146,7 @@ sub_801C61C: @ 801C61C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0801C6C0 + ldr r1, =0x02020630 adds r0, r1 bl sub_80D2EF8 _0801C640: @@ -58613,11 +57162,11 @@ _0801C640: cmp r5, r2 bcs _0801C6A4 adds r6, r4, 0 - ldr r7, _0801C6C0 + ldr r7, =0x02020630 _0801C65A: ldr r0, [r6] lsls r4, r5, 1 - ldr r1, _0801C6C4 + ldr r1, =0x0000017d adds r0, r1 adds r1, r0, r4 ldrb r0, [r1] @@ -58664,9 +57213,7 @@ _0801C6B4: pop {r0} bx r0 .align 2, 0 -_0801C6BC: .4byte 0x02022c74 -_0801C6C0: .4byte 0x02020630 -_0801C6C4: .4byte 0x0000017d + .pool thumb_func_end sub_801C61C thumb_func_start sub_801C6C8 @@ -58675,8 +57222,8 @@ sub_801C6C8: @ 801C6C8 adds r4, r0, 0 cmp r4, 0 beq _0801C6DE - ldr r5, _0801C6E4 - ldr r0, _0801C6E8 + ldr r5, =0x02022c78 + ldr r0, =0x000013a4 bl malloc_and_clear str r0, [r5] cmp r0, 0 @@ -58685,8 +57232,7 @@ _0801C6DE: movs r0, 0 b _0801C71C .align 2, 0 -_0801C6E4: .4byte 0x02022c78 -_0801C6E8: .4byte 0x000013a4 + .pool _0801C6EC: movs r6, 0xDE lsls r6, 1 @@ -58704,10 +57250,10 @@ _0801C704: adds r3, r2, r6 ldrb r0, [r2, 0x3] lsls r0, 4 - ldr r1, _0801C724 + ldr r1, =0x082f24c8 adds r0, r1 str r0, [r3] - ldr r0, _0801C728 + ldr r0, =0x000001c1 adds r1, r2, r0 movs r0, 0xFF strb r0, [r1] @@ -58717,18 +57263,17 @@ _0801C71C: pop {r1} bx r1 .align 2, 0 -_0801C724: .4byte 0x082f24c8 -_0801C728: .4byte 0x000001c1 + .pool thumb_func_end sub_801C6C8 thumb_func_start sub_801C72C sub_801C72C: @ 801C72C push {r4,lr} - ldr r4, _0801C750 + ldr r4, =0x02022c78 ldr r0, [r4] cmp r0, 0 beq _0801C748 - ldr r2, _0801C754 + ldr r2, =0x000013a4 movs r1, 0 bl memset ldr r0, [r4] @@ -58740,8 +57285,7 @@ _0801C748: pop {r0} bx r0 .align 2, 0 -_0801C750: .4byte 0x02022c78 -_0801C754: .4byte 0x000013a4 + .pool thumb_func_end sub_801C72C thumb_func_start sub_801C758 @@ -58752,7 +57296,7 @@ sub_801C758: @ 801C758 mov r5, r8 push {r5-r7} sub sp, 0x24 - ldr r5, _0801C774 + ldr r5, =0x02022c78 ldr r0, [r5] cmp r0, 0 bne _0801C778 @@ -58760,7 +57304,7 @@ sub_801C758: @ 801C758 negs r0, r0 b _0801CA3A .align 2, 0 -_0801C774: .4byte 0x02022c78 + .pool _0801C778: movs r4, 0xE0 lsls r4, 1 @@ -58772,12 +57316,12 @@ _0801C778: b _0801CA04 _0801C788: lsls r0, 2 - ldr r1, _0801C794 + ldr r1, =_0801C798 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801C794: .4byte _0801C798 + .pool .align 2, 0 _0801C798: .4byte _0801C7B4 @@ -58822,7 +57366,7 @@ _0801C7D2: movs r0, 0x40 movs r1, 0xF0 bl lcd_io_set - ldr r1, _0801C828 + ldr r1, =0x00001a98 movs r0, 0x44 bl lcd_io_set movs r0, 0x48 @@ -58837,7 +57381,7 @@ _0801C7D2: bl lcd_io_set_bits b _0801CA1E .align 2, 0 -_0801C828: .4byte 0x00001a98 + .pool _0801C82C: movs r5, 0x1E str r5, [sp] @@ -58877,7 +57421,7 @@ _0801C82C: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r5, _0801C8CC + ldr r5, =0x02022c78 ldr r0, [r5] movs r1, 0xDE lsls r1, 1 @@ -58890,7 +57434,7 @@ _0801C82C: movs r2, 0 movs r3, 0x8 bl decompress_and_copy_tile_data_to_vram - ldr r4, _0801C8D0 + ldr r4, =0x082f1de8 adds r0, r4, 0 bl Window_AddFromTemplate ldr r1, [r5] @@ -58908,8 +57452,7 @@ _0801C82C: strh r0, [r1] b _0801CA1E .align 2, 0 -_0801C8CC: .4byte 0x02022c78 -_0801C8D0: .4byte 0x082f1de8 + .pool _0801C8D4: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -58923,12 +57466,12 @@ _0801C8E2: movs r1, 0x20 movs r2, 0x20 bl gpu_pal_apply - ldr r2, _0801C988 + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r0, _0801C98C + ldr r0, =0x02022c78 mov r8, r0 ldr r0, [r0] movs r4, 0xDE @@ -58994,8 +57537,7 @@ _0801C8E2: bl gpu_copy_wram_bg_tilemap_to_vram b _0801CA1E .align 2, 0 -_0801C988: .4byte 0x02037fd4 -_0801C98C: .4byte 0x02022c78 + .pool _0801C990: bl sub_801CDCC b _0801CA1E @@ -59013,12 +57555,12 @@ _0801C9A8: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show - ldr r2, _0801C9F8 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] - ldr r4, _0801C9FC + ldr r4, =0x02022c78 ldr r1, [r4] movs r3, 0xE5 lsls r3, 2 @@ -59028,7 +57570,7 @@ _0801C9A8: adds r1, r2 bl sub_81AF380 ldr r1, [r4] - ldr r3, _0801CA00 + ldr r3, =0x000001c1 adds r2, r1, r3 movs r1, 0 strb r0, [r2] @@ -59041,9 +57583,7 @@ _0801C9A8: bl fade_and_return_progress_probably b _0801CA1E .align 2, 0 -_0801C9F8: .4byte 0x02037fd4 -_0801C9FC: .4byte 0x02022c78 -_0801CA00: .4byte 0x000001c1 + .pool _0801CA04: bl fade_and_return_progress_probably lsls r0, 24 @@ -59058,7 +57598,7 @@ _0801CA04: movs r0, 0x1 b _0801CA3A _0801CA1E: - ldr r0, _0801CA4C + ldr r0, =0x02022c78 ldr r2, [r0] movs r0, 0xE0 lsls r0, 1 @@ -59083,7 +57623,7 @@ _0801CA3A: pop {r1} bx r1 .align 2, 0 -_0801CA4C: .4byte 0x02022c78 + .pool thumb_func_end sub_801C758 thumb_func_start sub_801CA50 @@ -59091,7 +57631,7 @@ sub_801CA50: @ 801CA50 push {r4,r5,lr} sub sp, 0x8 adds r2, r0, 0 - ldr r5, _0801CA64 + ldr r5, =0x02022c78 ldr r0, [r5] cmp r0, 0 bne _0801CA68 @@ -59099,7 +57639,7 @@ sub_801CA50: @ 801CA50 negs r0, r0 b _0801CC2A .align 2, 0 -_0801CA64: .4byte 0x02022c78 + .pool _0801CA68: movs r4, 0xE0 lsls r4, 1 @@ -59111,12 +57651,12 @@ _0801CA68: b _0801CBF4 _0801CA78: lsls r0, 2 - ldr r1, _0801CA84 + ldr r1, =_0801CA88 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801CA84: .4byte _0801CA88 + .pool .align 2, 0 _0801CA88: .4byte _0801CAA0 @@ -59208,7 +57748,7 @@ _0801CB54: bl gpu_sync_bg_hide movs r0, 0x2 bl gpu_sync_bg_hide - ldr r4, _0801CB80 + ldr r4, =0x02022c78 ldr r0, [r4] movs r1, 0xE5 lsls r1, 1 @@ -59223,7 +57763,7 @@ _0801CB54: bl Window_Remove b _0801CC0E .align 2, 0 -_0801CB80: .4byte 0x02022c78 + .pool _0801CB84: movs r0, 0x2 movs r1, 0 @@ -59233,25 +57773,24 @@ _0801CB84: movs r1, 0 movs r2, 0 bl bg_change_y_offset - ldr r4, _0801CBB8 + ldr r4, =0x02022c78 ldr r0, [r4] - ldr r2, _0801CBBC + ldr r2, =0x000001c1 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF beq _0801CC0E bl sub_81AF620 ldr r0, [r4] - ldr r2, _0801CBBC + ldr r2, =0x000001c1 adds r1, r0, r2 movs r0, 0xFF strb r0, [r1] b _0801CC0E .align 2, 0 -_0801CBB8: .4byte 0x02022c78 -_0801CBBC: .4byte 0x000001c1 + .pool _0801CBC0: - ldr r0, _0801CBF0 + ldr r0, =0x02022c60 ldrb r0, [r0] adds r1, r2, 0 bl sub_80186EC @@ -59270,7 +57809,7 @@ _0801CBC0: bl sub_80A1AD4 b _0801CC0E .align 2, 0 -_0801CBF0: .4byte 0x02022c60 + .pool _0801CBF4: bl fade_and_return_progress_probably lsls r0, 24 @@ -59285,7 +57824,7 @@ _0801CBF4: movs r0, 0x1 b _0801CC2A _0801CC0E: - ldr r0, _0801CC34 + ldr r0, =0x02022c78 ldr r2, [r0] movs r0, 0xE0 lsls r0, 1 @@ -59306,13 +57845,13 @@ _0801CC2A: pop {r1} bx r1 .align 2, 0 -_0801CC34: .4byte 0x02022c78 + .pool thumb_func_end sub_801CA50 thumb_func_start sub_801CC38 sub_801CC38: @ 801CC38 push {r4,r5,lr} - ldr r4, _0801CC78 + ldr r4, =0x02022c78 ldr r2, [r4] movs r5, 0xE0 lsls r5, 1 @@ -59322,14 +57861,14 @@ sub_801CC38: @ 801CC38 ands r0, r1 cmp r0, 0 bne _0801CC72 - ldr r0, _0801CC7C + ldr r0, =0x000001c1 adds r1, r2, r0 ldrb r0, [r1] cmp r0, 0xFF beq _0801CC72 bl sub_81AF620 ldr r0, [r4] - ldr r2, _0801CC7C + ldr r2, =0x000001c1 adds r1, r0, r2 movs r0, 0xFF strb r0, [r1] @@ -59344,14 +57883,13 @@ _0801CC72: pop {r0} bx r0 .align 2, 0 -_0801CC78: .4byte 0x02022c78 -_0801CC7C: .4byte 0x000001c1 + .pool thumb_func_end sub_801CC38 thumb_func_start sub_801CC80 sub_801CC80: @ 801CC80 push {r4,lr} - ldr r4, _0801CCC8 + ldr r4, =0x02022c78 ldr r2, [r4] movs r1, 0xE0 lsls r1, 1 @@ -59369,7 +57907,7 @@ sub_801CC80: @ 801CC80 adds r1, r2, r3 bl sub_81AF380 ldr r1, [r4] - ldr r2, _0801CCCC + ldr r2, =0x000001c1 adds r1, r2 strb r0, [r1] ldr r1, [r4] @@ -59386,8 +57924,7 @@ _0801CCC0: pop {r0} bx r0 .align 2, 0 -_0801CCC8: .4byte 0x02022c78 -_0801CCCC: .4byte 0x000001c1 + .pool thumb_func_end sub_801CC80 thumb_func_start sub_801CCD0 @@ -59396,7 +57933,7 @@ sub_801CCD0: @ 801CCD0 lsls r0, 16 lsrs r4, r0, 16 adds r3, r4, 0 - ldr r2, _0801CCFC + ldr r2, =0x02022c78 ldr r0, [r2] mov r12, r0 movs r0, 0xE1 @@ -59414,7 +57951,7 @@ _0801CCF6: movs r0, 0xFF b _0801CDC6 .align 2, 0 -_0801CCFC: .4byte 0x02022c78 + .pool _0801CD00: cmp r4, 0x2 beq _0801CD1C @@ -59450,7 +57987,7 @@ _0801CD20: ands r0, r1 cmp r0, 0 bne _0801CCF6 - ldr r2, _0801CD4C + ldr r2, =0x000001c3 add r2, r12 ldrb r1, [r2] movs r0, 0x2 @@ -59458,7 +57995,7 @@ _0801CD20: ands r0, r1 b _0801CD7E .align 2, 0 -_0801CD4C: .4byte 0x000001c3 + .pool _0801CD50: movs r0, 0xE3 lsls r0, 1 @@ -59478,7 +58015,7 @@ _0801CD50: ands r0, r1 cmp r0, 0 bne _0801CCF6 - ldr r2, _0801CDC0 + ldr r2, =0x000001c3 add r2, r12 ldrb r0, [r2] movs r1, 0x1 @@ -59518,7 +58055,7 @@ _0801CD7E: movs r0, 0x3 b _0801CDC6 .align 2, 0 -_0801CDC0: .4byte 0x000001c3 + .pool _0801CDC4: movs r0, 0x2 _0801CDC6: @@ -59531,7 +58068,7 @@ _0801CDC6: sub_801CDCC: @ 801CDCC push {r4-r6,lr} movs r5, 0 - ldr r4, _0801CE6C + ldr r4, =0x02022c78 ldr r1, [r4] movs r2, 0xE7 lsls r2, 1 @@ -59553,14 +58090,14 @@ _0801CDF0: lsls r1, 3 adds r4, r1, r5 adds r0, r4, r2 - ldr r3, _0801CE70 + ldr r3, =0x000001f7 adds r0, r3 adds r1, r2 adds r1, 0x2C movs r2, 0x28 bl memcpy ldr r0, [r6] - ldr r1, _0801CE74 + ldr r1, =0x0000021f adds r0, r1 adds r0, r4 movs r1, 0xFF @@ -59568,7 +58105,7 @@ _0801CDF0: cmp r5, 0x7 bls _0801CE34 ldr r1, [r6] - ldr r2, _0801CE70 + ldr r2, =0x000001f7 adds r0, r1, r2 adds r0, r4 ldrb r0, [r0] @@ -59586,12 +58123,12 @@ _0801CE34: lsrs r5, r0, 24 cmp r5, 0x9 bls _0801CDF0 - ldr r2, _0801CE6C + ldr r2, =0x02022c78 ldr r1, [r2] movs r4, 0xE5 lsls r4, 2 adds r1, r4 - ldr r0, _0801CE78 + ldr r0, =0x082f1df8 ldm r0!, {r3-r5} stm r1!, {r3-r5} ldr r0, [r0] @@ -59609,10 +58146,7 @@ _0801CE34: pop {r0} bx r0 .align 2, 0 -_0801CE6C: .4byte 0x02022c78 -_0801CE70: .4byte 0x000001f7 -_0801CE74: .4byte 0x0000021f -_0801CE78: .4byte 0x082f1df8 + .pool thumb_func_end sub_801CDCC thumb_func_start sub_801CE7C @@ -59622,7 +58156,7 @@ sub_801CE7C: @ 801CE7C push {r7} sub sp, 0xC movs r5, 0 - ldr r6, _0801CF98 + ldr r6, =0x02022c78 ldr r0, [r6] movs r7, 0xE4 lsls r7, 1 @@ -59682,7 +58216,7 @@ _0801CEEC: lsrs r1, 28 lsls r3, r1, 1 adds r3, r1 - ldr r1, _0801CF9C + ldr r1, =0x082f1de0 adds r3, r1 str r3, [sp] str r5, [sp, 0x4] @@ -59692,7 +58226,7 @@ _0801CEEC: movs r3, 0x6 bl box_print _0801CF1C: - ldr r6, _0801CF98 + ldr r6, =0x02022c78 ldr r4, [r6] movs r1, 0xE5 lsls r1, 1 @@ -59710,7 +58244,7 @@ _0801CF1C: lsrs r1, 4 lsls r2, r1, 1 adds r2, r1 - ldr r1, _0801CF9C + ldr r1, =0x082f1de0 adds r2, r1 str r2, [sp] movs r1, 0 @@ -59719,7 +58253,7 @@ _0801CF1C: adds r1, r5 lsls r1, 3 adds r1, r5 - ldr r2, _0801CFA0 + ldr r2, =0x000001f7 adds r1, r2 adds r4, r1 str r4, [sp, 0x8] @@ -59752,15 +58286,13 @@ _0801CF1C: pop {r0} bx r0 .align 2, 0 -_0801CF98: .4byte 0x02022c78 -_0801CF9C: .4byte 0x082f1de0 -_0801CFA0: .4byte 0x000001f7 + .pool thumb_func_end sub_801CE7C thumb_func_start sub_801CFA4 sub_801CFA4: @ 801CFA4 push {r4-r6,lr} - ldr r0, _0801CFDC + ldr r0, =0x02022c78 ldr r1, [r0] movs r2, 0xE1 lsls r2, 1 @@ -59768,7 +58300,7 @@ sub_801CFA4: @ 801CFA4 ldrb r0, [r0] lsrs r4, r0, 1 lsls r4, 8 - ldr r6, _0801CFE0 + ldr r6, =0x000001c3 adds r0, r1, r6 ldrb r1, [r0] movs r0, 0x1 @@ -59785,8 +58317,7 @@ sub_801CFA4: @ 801CFA4 bl bg_change_y_offset b _0801CFF8 .align 2, 0 -_0801CFDC: .4byte 0x02022c78 -_0801CFE0: .4byte 0x000001c3 + .pool _0801CFE4: movs r0, 0x2 adds r1, r4, 0 @@ -59797,9 +58328,9 @@ _0801CFE4: movs r2, 0x2 bl bg_change_y_offset _0801CFF8: - ldr r3, _0801D03C + ldr r3, =0x02022c78 ldr r0, [r3] - ldr r2, _0801D040 + ldr r2, =0x000001c3 adds r5, r0, r2 ldrb r4, [r5] lsrs r1, r4, 1 @@ -59832,8 +58363,7 @@ _0801CFF8: adds r0, 0x1 b _0801D04E .align 2, 0 -_0801D03C: .4byte 0x02022c78 -_0801D040: .4byte 0x000001c3 + .pool _0801D044: movs r2, 0xE3 lsls r2, 1 @@ -59852,7 +58382,7 @@ _0801D04E: ands r0, r1 strb r0, [r2] ldr r0, [r3] - ldr r1, _0801D078 + ldr r1, =0x000001c3 adds r2, r0, r1 ldrb r1, [r2] movs r0, 0x1 @@ -59863,17 +58393,17 @@ _0801D070: pop {r0} bx r0 .align 2, 0 -_0801D078: .4byte 0x000001c3 + .pool thumb_func_end sub_801CFA4 thumb_func_start sub_801D07C sub_801D07C: @ 801D07C push {r4,lr} - ldr r4, _0801D098 + ldr r4, =0x02022c7c movs r0, 0x60 bl malloc_and_clear str r0, [r4] - ldr r1, _0801D09C + ldr r1, =0x082f298c movs r2, 0 movs r3, 0x1 bl mevent_srv_init_common @@ -59881,18 +58411,17 @@ sub_801D07C: @ 801D07C pop {r0} bx r0 .align 2, 0 -_0801D098: .4byte 0x02022c7c -_0801D09C: .4byte 0x082f298c + .pool thumb_func_end sub_801D07C thumb_func_start sub_801D0A0 sub_801D0A0: @ 801D0A0 push {r4,lr} - ldr r4, _0801D0BC + ldr r4, =0x02022c7c movs r0, 0x60 bl malloc_and_clear str r0, [r4] - ldr r1, _0801D0C0 + ldr r1, =0x082f29ec movs r2, 0 movs r3, 0x1 bl mevent_srv_init_common @@ -59900,22 +58429,21 @@ sub_801D0A0: @ 801D0A0 pop {r0} bx r0 .align 2, 0 -_0801D0BC: .4byte 0x02022c7c -_0801D0C0: .4byte 0x082f29ec + .pool thumb_func_end sub_801D0A0 thumb_func_start sub_801D0C4 sub_801D0C4: @ 801D0C4 push {r4-r6,lr} adds r6, r0, 0 - ldr r4, _0801D0D4 + ldr r4, =0x02022c7c ldr r0, [r4] cmp r0, 0 bne _0801D0D8 movs r0, 0x3 b _0801D0F8 .align 2, 0 -_0801D0D4: .4byte 0x02022c7c + .pool _0801D0D8: bl mevent_dispatch_08145600 adds r5, r0, 0 @@ -60102,12 +58630,12 @@ sub_801D1F0: @ 801D1F0 b _0801D464 _0801D20C: lsls r0, 2 - ldr r1, _0801D218 + ldr r1, =_0801D21C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801D218: .4byte _0801D21C + .pool .align 2, 0 _0801D21C: .4byte _0801D298 @@ -60387,7 +58915,7 @@ _0801D464: thumb_func_start mevent_dispatch_08145600 mevent_dispatch_08145600: @ 801D46C push {lr} - ldr r2, _0801D480 + ldr r2, =0x082f2548 ldr r1, [r0, 0x8] lsls r1, 2 adds r1, r2 @@ -60396,14 +58924,14 @@ mevent_dispatch_08145600: @ 801D46C pop {r1} bx r1 .align 2, 0 -_0801D480: .4byte 0x082f2548 + .pool thumb_func_end mevent_dispatch_08145600 thumb_func_start sub_801D484 sub_801D484: @ 801D484 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _0801D4A4 + ldr r4, =0x02022c80 movs r0, 0x50 bl malloc_and_clear str r0, [r4] @@ -60416,21 +58944,21 @@ sub_801D484: @ 801D484 pop {r0} bx r0 .align 2, 0 -_0801D4A4: .4byte 0x02022c80 + .pool thumb_func_end sub_801D484 thumb_func_start sub_801D4A8 sub_801D4A8: @ 801D4A8 push {r4-r6,lr} adds r6, r0, 0 - ldr r4, _0801D4B8 + ldr r4, =0x02022c80 ldr r0, [r4] cmp r0, 0 bne _0801D4BC movs r0, 0x6 b _0801D4DC .align 2, 0 -_0801D4B8: .4byte 0x02022c80 + .pool _0801D4BC: bl mevent_srv_ish_exec adds r5, r0, 0 @@ -60454,34 +58982,34 @@ _0801D4DC: thumb_func_start sub_801D4E4 sub_801D4E4: @ 801D4E4 - ldr r0, _0801D4F0 + ldr r0, =0x02022c80 ldr r1, [r0] ldr r0, [r1, 0xC] adds r0, 0x1 str r0, [r1, 0xC] bx lr .align 2, 0 -_0801D4F0: .4byte 0x02022c80 + .pool thumb_func_end sub_801D4E4 thumb_func_start sub_801D4F4 sub_801D4F4: @ 801D4F4 - ldr r0, _0801D4FC + ldr r0, =0x02022c80 ldr r0, [r0] ldr r0, [r0, 0x20] bx lr .align 2, 0 -_0801D4FC: .4byte 0x02022c80 + .pool thumb_func_end sub_801D4F4 thumb_func_start sub_801D500 sub_801D500: @ 801D500 - ldr r1, _0801D508 + ldr r1, =0x02022c80 ldr r1, [r1] str r0, [r1, 0x4] bx lr .align 2, 0 -_0801D508: .4byte 0x02022c80 + .pool thumb_func_end sub_801D500 thumb_func_start mevent_srv_ish_init @@ -60565,7 +59093,7 @@ sub_801D59C: @ 801D59C movs r0, 0 str r0, [sp] ldr r1, [r4, 0x14] - ldr r2, _0801D5CC + ldr r2, =0x05000100 mov r0, sp bl CpuSet ldr r2, [r4, 0x14] @@ -60580,7 +59108,7 @@ sub_801D59C: @ 801D59C pop {r0} bx r0 .align 2, 0 -_0801D5CC: .4byte 0x05000100 + .pool thumb_func_end sub_801D59C thumb_func_start sub_801D5D0 @@ -60588,7 +59116,7 @@ sub_801D5D0: @ 801D5D0 push {r4,lr} adds r4, r0, 0 ldr r0, [r4, 0x1C] - ldr r1, _0801D5F4 + ldr r1, =0x082f2598 movs r2, 0x80 lsls r2, 3 bl memcpy @@ -60602,7 +59130,7 @@ sub_801D5D0: @ 801D5D0 pop {r1} bx r1 .align 2, 0 -_0801D5F4: .4byte 0x082f2598 + .pool thumb_func_end sub_801D5D0 thumb_func_start sub_801D5F8 @@ -60665,12 +59193,12 @@ sub_801D63C: @ 801D63C b _0801D804 _0801D654: lsls r0, 2 - ldr r1, _0801D660 + ldr r1, =_0801D664 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801D660: .4byte _0801D664 + .pool .align 2, 0 _0801D664: .4byte _0801D804 @@ -60837,9 +59365,9 @@ _0801D7C4: bl sub_80992A0 b _0801D804 _0801D7D0: - ldr r0, _0801D7E8 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0801D7EC + ldr r1, =0x00000bec adds r0, r1 ldr r1, [r4, 0x18] movs r2, 0xBC @@ -60847,10 +59375,9 @@ _0801D7D0: bl sub_81652B4 b _0801D804 .align 2, 0 -_0801D7E8: .4byte 0x03005d90 -_0801D7EC: .4byte 0x00000bec + .pool _0801D7F0: - ldr r0, _0801D80C + ldr r0, =0x0201c000 ldr r1, [r4, 0x18] movs r2, 0x80 lsls r2, 3 @@ -60867,7 +59394,7 @@ _0801D806: pop {r1} bx r1 .align 2, 0 -_0801D80C: .4byte 0x0201c000 + .pool thumb_func_end sub_801D63C thumb_func_start sub_801D810 @@ -60924,11 +59451,11 @@ _0801D858: sub_801D860: @ 801D860 push {r4,lr} adds r4, r0, 0 - ldr r3, _0801D888 + ldr r3, =0x0201c000 adds r0, r4, 0x4 - ldr r1, _0801D88C + ldr r1, =0x03005d90 ldr r1, [r1] - ldr r2, _0801D890 + ldr r2, =0x03005d8c ldr r2, [r2] bl _call_via_r3 cmp r0, 0x1 @@ -60943,9 +59470,7 @@ _0801D880: pop {r1} bx r1 .align 2, 0 -_0801D888: .4byte 0x0201c000 -_0801D88C: .4byte 0x03005d90 -_0801D890: .4byte 0x03005d8c + .pool thumb_func_end sub_801D860 thumb_func_start mevent_srv_ish_exec @@ -60953,7 +59478,7 @@ mevent_srv_ish_exec: @ 801D894 push {r4,r5,lr} sub sp, 0x20 mov r2, sp - ldr r1, _0801D8BC + ldr r1, =0x082f255c ldm r1!, {r3-r5} stm r2!, {r3-r5} ldm r1!, {r3-r5} @@ -60970,7 +59495,7 @@ mevent_srv_ish_exec: @ 801D894 pop {r1} bx r1 .align 2, 0 -_0801D8BC: .4byte 0x082f255c + .pool thumb_func_end mevent_srv_ish_exec thumb_func_start sub_801D8C0 @@ -61005,14 +59530,13 @@ sub_801D8D8: @ 801D8D8 strh r3, [r0, 0x8] str r3, [r0, 0x1C] str r3, [r0, 0x18] - ldr r1, _0801D8FC + ldr r1, =sub_801DA5C + 1 str r1, [r0, 0x24] - ldr r1, _0801D900 + ldr r1, =sub_801D988 + 1 str r1, [r0, 0x20] bx lr .align 2, 0 -_0801D8FC: .4byte sub_801DA5C + 1 -_0801D900: .4byte sub_801D988 + 1 + .pool thumb_func_end sub_801D8D8 thumb_func_start sub_801D904 @@ -61057,14 +59581,14 @@ sub_801D938: @ 801D938 adds r3, r0, 0 adds r0, r1, 0 lsls r3, 8 - ldr r1, _0801D950 + ldr r1, =0x020223c4 adds r3, r1 adds r1, r3, 0 bl memcpy pop {r0} bx r0 .align 2, 0 -_0801D950: .4byte 0x020223c4 + .pool thumb_func_end sub_801D938 thumb_func_start sub_801D954 @@ -61235,7 +59759,7 @@ _0801DA7C: cmp r0, 0 beq _0801DB5E ldrh r1, [r4, 0xE] - ldr r2, _0801DAC0 + ldr r2, =0xffff0000 ldr r0, [sp] ands r0, r2 orrs r0, r1 @@ -61248,7 +59772,7 @@ _0801DA7C: ldr r0, [r4, 0x1C] bl sub_806F928 lsls r0, 16 - ldr r2, _0801DAC4 + ldr r2, =0x0000ffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -61262,8 +59786,7 @@ _0801DA7C: bl link_0800A448 b _0801DB3E .align 2, 0 -_0801DAC0: .4byte 0xffff0000 -_0801DAC4: .4byte 0x0000ffff + .pool _0801DAC8: bl sub_800A520 lsls r0, 24 @@ -61397,18 +59920,18 @@ sub_801DBC0: @ 801DBC0 movs r1, 0 strb r1, [r0] strb r1, [r0, 0x1] - ldr r0, _0801DBD8 + ldr r0, =0x0000402e bl var_set pop {r0} bx r0 .align 2, 0 -_0801DBD8: .4byte 0x0000402e + .pool thumb_func_end sub_801DBC0 thumb_func_start sub_801DBDC sub_801DBDC: @ 801DBDC push {r4,lr} - ldr r0, _0801DC18 + ldr r0, =0x0000402e bl var_get_pointer adds r4, r0, 0 bl sub_801B044 @@ -61422,7 +59945,7 @@ sub_801DBDC: @ 801DBDC adds r0, 0x1 strh r0, [r4] lsls r0, 16 - ldr r1, _0801DC1C + ldr r1, =0x01f30000 cmp r0, r1 bls _0801DC10 ldrb r0, [r2] @@ -61436,14 +59959,13 @@ _0801DC10: pop {r0} bx r0 .align 2, 0 -_0801DC18: .4byte 0x0000402e -_0801DC1C: .4byte 0x01f30000 + .pool thumb_func_end sub_801DBDC thumb_func_start sub_801DC20 sub_801DC20: @ 801DC20 push {r4-r6,lr} - ldr r6, _0801DC40 + ldr r6, =0x020375f0 bl sub_801B044 adds r4, r0, 0 bl sub_809D490 @@ -61456,7 +59978,7 @@ _0801DC3A: movs r0, 0 b _0801DCA6 .align 2, 0 -_0801DC40: .4byte 0x020375f0 + .pool _0801DC44: adds r0, r4, 0 bl sub_801DD44 @@ -61465,12 +59987,12 @@ _0801DC44: cmp r5, 0x6 bhi _0801DCA4 lsls r0, r5, 2 - ldr r1, _0801DC5C + ldr r1, =_0801DC60 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801DC5C: .4byte _0801DC60 + .pool .align 2, 0 _0801DC60: .4byte _0801DCA4 @@ -61655,26 +60177,24 @@ _0801DD92: thumb_func_start sub_801DD98 sub_801DD98: @ 801DD98 push {r4,lr} - ldr r4, _0801DDC4 + ldr r4, =0x02022c84 movs r0, 0xDE lsls r0, 1 bl malloc str r0, [r4] bl sub_801DDD0 - ldr r1, _0801DDC8 + ldr r1, =0x030022b0 movs r0, 0x14 strh r0, [r1] movs r0, 0 bl SetVBlankCallback - ldr r0, _0801DDCC + ldr r0, =c2_081284E0 + 1 bl set_callback2 pop {r4} pop {r0} bx r0 .align 2, 0 -_0801DDC4: .4byte 0x02022c84 -_0801DDC8: .4byte 0x030022b0 -_0801DDCC: .4byte c2_081284E0 + 1 + .pool thumb_func_end sub_801DD98 thumb_func_start sub_801DDD0 @@ -61703,8 +60223,8 @@ sub_801DDD0: @ 801DDD0 lsls r1, 1 adds r0, r4, r1 bl sub_801EF1C - ldr r7, _0801DE28 - ldr r6, _0801DE2C + ldr r7, =0x03005d8c + ldr r6, =0x00003c88 adds r4, 0xB9 movs r5, 0x9 _0801DE0E: @@ -61721,14 +60241,13 @@ _0801DE0E: pop {r0} bx r0 .align 2, 0 -_0801DE28: .4byte 0x03005d8c -_0801DE2C: .4byte 0x00003c88 + .pool thumb_func_end sub_801DDD0 thumb_func_start sub_801DE30 sub_801DE30: @ 801DE30 push {r4,lr} - ldr r4, _0801DE50 + ldr r4, =0x02022c84 ldr r0, [r4] ldrb r0, [r0, 0xE] bl remove_task @@ -61741,14 +60260,14 @@ sub_801DE30: @ 801DE30 pop {r0} bx r0 .align 2, 0 -_0801DE50: .4byte 0x02022c84 + .pool thumb_func_end sub_801DE30 thumb_func_start c2_081284E0 c2_081284E0: @ 801DE54 push {r4-r6,lr} sub sp, 0x4 - ldr r0, _0801DE70 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r6, r0, r1 @@ -61761,7 +60280,7 @@ c2_081284E0: @ 801DE54 beq _0801DE7A b _0801DF04 .align 2, 0 -_0801DE70: .4byte 0x030022c0 + .pool _0801DE74: cmp r0, 0x2 beq _0801DEC8 @@ -61790,7 +60309,7 @@ _0801DE8C: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _0801DEC4 + ldr r0, =sub_801DF20 + 1 bl SetVBlankCallback _0801DEBC: ldrb r0, [r6] @@ -61798,24 +60317,24 @@ _0801DEBC: strb r0, [r6] b _0801DF04 .align 2, 0 -_0801DEC4: .4byte sub_801DF20 + 1 + .pool _0801DEC8: bl fade_and_return_progress_probably - ldr r0, _0801DF0C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0801DF04 - ldr r0, _0801DF10 + ldr r0, =sub_801DF38 + 1 bl set_callback2 - ldr r0, _0801DF14 + ldr r0, =sub_801DF54 + 1 movs r1, 0x8 bl AddTask - ldr r4, _0801DF18 + ldr r4, =0x02022c84 ldr r1, [r4] strb r0, [r1, 0xE] - ldr r0, _0801DF1C + ldr r0, =sub_801F2B4 + 1 movs r1, 0x7 bl AddTask ldr r1, [r4] @@ -61830,11 +60349,7 @@ _0801DF04: pop {r0} bx r0 .align 2, 0 -_0801DF0C: .4byte 0x02037fd4 -_0801DF10: .4byte sub_801DF38 + 1 -_0801DF14: .4byte sub_801DF54 + 1 -_0801DF18: .4byte 0x02022c84 -_0801DF1C: .4byte sub_801F2B4 + 1 + .pool thumb_func_end c2_081284E0 thumb_func_start sub_801DF20 @@ -61863,7 +60378,7 @@ sub_801DF38: @ 801DF38 thumb_func_start sub_801DF54 sub_801DF54: @ 801DF54 push {r4,lr} - ldr r4, _0801DF6C + ldr r4, =0x02022c84 ldr r0, [r4] ldrb r0, [r0, 0x17] cmp r0, 0x2 @@ -61874,7 +60389,7 @@ sub_801DF54: @ 801DF54 beq _0801DF76 b _0801DF8A .align 2, 0 -_0801DF6C: .4byte 0x02022c84 + .pool _0801DF70: cmp r0, 0x3 beq _0801DF7E @@ -61893,8 +60408,8 @@ _0801DF80: movs r0, 0 strb r0, [r1, 0x17] _0801DF8A: - ldr r1, _0801DFA4 - ldr r0, _0801DFA8 + ldr r1, =0x082f2a7c + ldr r0, =0x02022c84 ldr r0, [r0] ldrh r0, [r0, 0x4] lsls r0, 2 @@ -61905,14 +60420,13 @@ _0801DF8A: pop {r0} bx r0 .align 2, 0 -_0801DFA4: .4byte 0x082f2a7c -_0801DFA8: .4byte 0x02022c84 + .pool thumb_func_end sub_801DF54 thumb_func_start sub_801DFAC sub_801DFAC: @ 801DFAC push {r4,lr} - ldr r4, _0801DFC4 + ldr r4, =0x02022c84 ldr r0, [r4] ldrh r1, [r0, 0x6] cmp r1, 0x1 @@ -61923,7 +60437,7 @@ sub_801DFAC: @ 801DFAC beq _0801DFCE b _0801E028 .align 2, 0 -_0801DFC4: .4byte 0x02022c84 + .pool _0801DFC8: cmp r1, 0x2 beq _0801E018 @@ -61945,7 +60459,7 @@ _0801DFE0: bl sub_8011A9C cmp r0, 0 bne _0801E028 - ldr r4, _0801E014 + ldr r4, =0x02022c84 ldr r1, [r4] movs r0, 0xC8 lsls r0, 1 @@ -61962,7 +60476,7 @@ _0801DFE0: strh r0, [r1, 0x6] b _0801E028 .align 2, 0 -_0801E014: .4byte 0x02022c84 + .pool _0801E018: bl sub_800A520 lsls r0, 24 @@ -61979,7 +60493,7 @@ _0801E028: thumb_func_start sub_801E030 sub_801E030: @ 801E030 push {r4,r5,lr} - ldr r5, _0801E044 + ldr r5, =0x02022c84 ldr r3, [r5] ldrh r0, [r3, 0x6] cmp r0, 0 @@ -61988,9 +60502,9 @@ sub_801E030: @ 801E030 beq _0801E0F6 b _0801E118 .align 2, 0 -_0801E044: .4byte 0x02022c84 + .pool _0801E048: - ldr r1, _0801E064 + ldr r1, =0x030022c0 ldrh r2, [r1, 0x2E] movs r0, 0x8 ands r0, r2 @@ -62003,7 +60517,7 @@ _0801E048: bl sub_801EBD4 b _0801E118 .align 2, 0 -_0801E064: .4byte 0x030022c0 + .pool _0801E068: movs r0, 0x4 ands r0, r2 @@ -62099,7 +60613,7 @@ _0801E118: thumb_func_start sub_801E120 sub_801E120: @ 801E120 push {r4-r6,lr} - ldr r0, _0801E138 + ldr r0, =0x02022c84 ldr r0, [r0] ldrh r0, [r0, 0x6] cmp r0, 0x4 @@ -62107,13 +60621,12 @@ sub_801E120: @ 801E120 b _0801E23A _0801E12E: lsls r0, 2 - ldr r1, _0801E13C + ldr r1, =_0801E140 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801E138: .4byte 0x02022c84 -_0801E13C: .4byte _0801E140 + .pool .align 2, 0 _0801E140: .4byte _0801E154 @@ -62133,14 +60646,14 @@ _0801E15E: cmp r0, 0 bne _0801E23A _0801E16A: - ldr r0, _0801E178 + ldr r0, =0x02022c84 ldr r1, [r0] ldrh r0, [r1, 0x6] adds r0, 0x1 strh r0, [r1, 0x6] b _0801E23A .align 2, 0 -_0801E178: .4byte 0x02022c84 + .pool _0801E17C: bl ProcessMenuInput lsls r0, 24 @@ -62157,7 +60670,7 @@ _0801E17C: movs r0, 0x4 movs r1, 0 bl sub_801F5EC - ldr r5, _0801E1B0 + ldr r5, =0x02022c84 ldr r2, [r5] ldrb r0, [r2, 0x10] cmp r0, r4 @@ -62166,9 +60679,9 @@ _0801E17C: ble _0801E1EC b _0801E1DC .align 2, 0 -_0801E1B0: .4byte 0x02022c84 + .pool _0801E1B4: - ldr r0, _0801E1D0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -62180,19 +60693,19 @@ _0801E1B4: bl MoveMenuCursor b _0801E23A .align 2, 0 -_0801E1D0: .4byte 0x030022c0 + .pool _0801E1D4: movs r0, 0x4 movs r1, 0 bl sub_801F5EC _0801E1DC: - ldr r0, _0801E1E8 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x3 strh r0, [r1, 0x6] b _0801E23A .align 2, 0 -_0801E1E8: .4byte 0x02022c84 + .pool _0801E1EC: movs r1, 0 strb r1, [r2, 0x11] @@ -62238,7 +60751,7 @@ _0801E23A: thumb_func_start sub_801E240 sub_801E240: @ 801E240 push {r4,r5,lr} - ldr r1, _0801E25C + ldr r1, =0x02022c84 ldr r0, [r1] ldrh r0, [r0, 0x6] adds r2, r1, 0 @@ -62247,13 +60760,12 @@ sub_801E240: @ 801E240 b _0801E458 _0801E250: lsls r0, 2 - ldr r1, _0801E260 + ldr r1, =_0801E264 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801E25C: .4byte 0x02022c84 -_0801E260: .4byte _0801E264 + .pool .align 2, 0 _0801E264: .4byte _0801E290 @@ -62271,13 +60783,13 @@ _0801E290: movs r0, 0x6 movs r1, 0 bl sub_801F5EC - ldr r0, _0801E2A4 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x1 strh r0, [r1, 0x6] b _0801E458 .align 2, 0 -_0801E2A4: .4byte 0x02022c84 + .pool _0801E2A8: movs r0, 0 bl sub_801F644 @@ -62286,13 +60798,13 @@ _0801E2A8: beq _0801E2B6 b _0801E458 _0801E2B6: - ldr r0, _0801E2C0 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x2 strh r0, [r1, 0x6] b _0801E458 .align 2, 0 -_0801E2C0: .4byte 0x02022c84 + .pool _0801E2C4: bl sub_801FF08 lsls r0, 24 @@ -62313,7 +60825,7 @@ _0801E2DE: _0801E2E4: b _0801E396 _0801E2E6: - ldr r4, _0801E30C + ldr r4, =0x02022c84 ldr r1, [r4] ldrb r0, [r1, 0x13] cmp r0, 0 @@ -62330,7 +60842,7 @@ _0801E2E6: strh r0, [r1, 0x6] b _0801E458 .align 2, 0 -_0801E30C: .4byte 0x02022c84 + .pool _0801E310: movs r2, 0xC8 lsls r2, 1 @@ -62362,13 +60874,13 @@ _0801E346: movs r0, 0x14 movs r1, 0 bl sub_801F5EC - ldr r0, _0801E358 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0xA strh r0, [r1, 0x6] b _0801E458 .align 2, 0 -_0801E358: .4byte 0x02022c84 + .pool _0801E35C: movs r0, 0 bl sub_801F644 @@ -62377,13 +60889,13 @@ _0801E35C: beq _0801E36A b _0801E458 _0801E36A: - ldr r0, _0801E374 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x8 strh r0, [r1, 0x6] b _0801E458 .align 2, 0 -_0801E374: .4byte 0x02022c84 + .pool _0801E378: bl sub_801FF08 lsls r0, 24 @@ -62404,16 +60916,16 @@ _0801E396: movs r0, 0x7 movs r1, 0 bl sub_801F5EC - ldr r0, _0801E3A8 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x3 strh r0, [r1, 0x6] b _0801E458 .align 2, 0 -_0801E3A8: .4byte 0x02022c84 + .pool _0801E3AC: bl sub_80104B0 - ldr r4, _0801E3D0 + ldr r4, =0x02022c84 ldr r0, [r4] movs r1, 0xC8 lsls r1, 1 @@ -62428,7 +60940,7 @@ _0801E3AC: strh r5, [r0] b _0801E458 .align 2, 0 -_0801E3D0: .4byte 0x02022c84 + .pool _0801E3D4: bl sub_800A520 lsls r0, 24 @@ -62437,7 +60949,7 @@ _0801E3D4: bl sub_8011A9C cmp r0, 0 bne _0801E414 - ldr r4, _0801E40C + ldr r4, =0x02022c84 ldr r1, [r4] movs r0, 0xC8 lsls r0, 1 @@ -62455,21 +60967,21 @@ _0801E3D4: movs r0, 0x6 b _0801E412 .align 2, 0 -_0801E40C: .4byte 0x02022c84 + .pool _0801E410: movs r0, 0x5 _0801E412: strh r0, [r1, 0x6] _0801E414: - ldr r0, _0801E420 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0801E458 b _0801E42C .align 2, 0 -_0801E420: .4byte 0x03003124 + .pool _0801E424: - ldr r0, _0801E434 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0801E438 @@ -62478,7 +60990,7 @@ _0801E42C: bl sub_801EBD4 b _0801E458 .align 2, 0 -_0801E434: .4byte 0x03003124 + .pool _0801E438: ldr r3, [r2] movs r1, 0xDC @@ -62505,7 +61017,7 @@ _0801E458: thumb_func_start sub_801E460 sub_801E460: @ 801E460 push {r4,lr} - ldr r1, _0801E47C + ldr r1, =0x02022c84 ldr r0, [r1] ldrh r0, [r0, 0x6] adds r2, r1, 0 @@ -62514,13 +61026,12 @@ sub_801E460: @ 801E460 b _0801E5BC _0801E470: lsls r0, 2 - ldr r1, _0801E480 + ldr r1, =_0801E484 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801E47C: .4byte 0x02022c84 -_0801E480: .4byte _0801E484 + .pool .align 2, 0 _0801E484: .4byte _0801E4A4 @@ -62532,7 +61043,7 @@ _0801E484: .4byte _0801E584 .4byte _0801E5A8 _0801E4A4: - ldr r0, _0801E4C0 + ldr r0, =sub_801F2B4 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -62542,12 +61053,11 @@ _0801E4B2: movs r0, 0x7 movs r1, 0 bl sub_801F5EC - ldr r0, _0801E4C4 + ldr r0, =0x02022c84 ldr r1, [r0] b _0801E59A .align 2, 0 -_0801E4C0: .4byte sub_801F2B4 + 1 -_0801E4C4: .4byte 0x02022c84 + .pool _0801E4C8: movs r0, 0 bl sub_801F644 @@ -62557,18 +61067,18 @@ _0801E4C8: movs r0, 0x12 movs r1, 0 bl sub_801F5EC - ldr r0, _0801E4E4 + ldr r0, =0x02022c84 ldr r1, [r0] b _0801E59A .align 2, 0 -_0801E4E4: .4byte 0x02022c84 + .pool _0801E4E8: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 bne _0801E5BC - ldr r4, _0801E508 + ldr r4, =0x02022c84 ldr r0, [r4] movs r1, 0xC8 lsls r1, 1 @@ -62577,7 +61087,7 @@ _0801E4E8: ldr r1, [r4] b _0801E59A .align 2, 0 -_0801E508: .4byte 0x02022c84 + .pool _0801E50C: bl sub_800A520 lsls r0, 24 @@ -62586,7 +61096,7 @@ _0801E50C: bl sub_8011A9C cmp r0, 0 bne _0801E5BC - ldr r4, _0801E53C + ldr r4, =0x02022c84 ldr r1, [r4] movs r0, 0xC8 lsls r0, 1 @@ -62600,7 +61110,7 @@ _0801E50C: ldr r1, [r4] b _0801E59A .align 2, 0 -_0801E53C: .4byte 0x02022c84 + .pool _0801E540: bl sub_800A550 movs r1, 0x1 @@ -62610,11 +61120,11 @@ _0801E540: bl sub_8011A9C cmp r0, 0 bne _0801E5BC - ldr r0, _0801E55C + ldr r0, =0x02022c84 ldr r1, [r0] b _0801E59A .align 2, 0 -_0801E55C: .4byte 0x02022c84 + .pool _0801E560: bl sub_800A520 lsls r0, 24 @@ -62625,12 +61135,12 @@ _0801E560: cmp r4, 0 bne _0801E5BC bl sub_800AC34 - ldr r0, _0801E580 + ldr r0, =0x02022c84 ldr r1, [r0] strh r4, [r1, 0xA] b _0801E59A .align 2, 0 -_0801E580: .4byte 0x02022c84 + .pool _0801E584: ldr r1, [r2] ldrh r0, [r1, 0xA] @@ -62639,7 +61149,7 @@ _0801E584: adds r0, 0x1 strh r0, [r1, 0xA] _0801E590: - ldr r0, _0801E5A4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0801E5BC @@ -62650,7 +61160,7 @@ _0801E59A: strh r0, [r1, 0x6] b _0801E5BC .align 2, 0 -_0801E5A4: .4byte 0x03003124 + .pool _0801E5A8: ldr r1, [r2] ldrh r0, [r1, 0xA] @@ -62671,7 +61181,7 @@ _0801E5BC: thumb_func_start sub_801E5C4 sub_801E5C4: @ 801E5C4 push {r4,r5,lr} - ldr r5, _0801E5DC + ldr r5, =0x02022c84 ldr r1, [r5] ldrh r0, [r1, 0x6] cmp r0, 0x1 @@ -62682,7 +61192,7 @@ sub_801E5C4: @ 801E5C4 beq _0801E5EA b _0801E662 .align 2, 0 -_0801E5DC: .4byte 0x02022c84 + .pool _0801E5E0: cmp r0, 0x2 beq _0801E62E @@ -62690,7 +61200,7 @@ _0801E5E0: beq _0801E650 b _0801E662 _0801E5EA: - ldr r0, _0801E600 + ldr r0, =sub_801F2B4 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -62700,7 +61210,7 @@ _0801E5EA: bl sub_801F5EC b _0801E640 .align 2, 0 -_0801E600: .4byte sub_801F2B4 + 1 + .pool _0801E604: movs r0, 0 bl sub_801F644 @@ -62726,7 +61236,7 @@ _0801E62E: adds r0, 0x1 strh r0, [r1, 0xA] _0801E638: - ldr r0, _0801E64C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0801E662 @@ -62738,7 +61248,7 @@ _0801E642: strh r0, [r1, 0x6] b _0801E662 .align 2, 0 -_0801E64C: .4byte 0x03003124 + .pool _0801E650: ldrh r0, [r1, 0xA] cmp r0, 0x95 @@ -62758,20 +61268,19 @@ _0801E662: thumb_func_start sub_801E668 sub_801E668: @ 801E668 push {r4,lr} - ldr r1, _0801E680 + ldr r1, =0x02022c84 ldr r0, [r1] ldrh r0, [r0, 0x6] adds r2, r1, 0 cmp r0, 0x4 bhi _0801E75C lsls r0, 2 - ldr r1, _0801E684 + ldr r1, =_0801E688 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801E680: .4byte 0x02022c84 -_0801E684: .4byte _0801E688 + .pool .align 2, 0 _0801E688: .4byte _0801E69C @@ -62780,12 +61289,12 @@ _0801E688: .4byte _0801E724 .4byte _0801E748 _0801E69C: - ldr r0, _0801E6C0 + ldr r0, =sub_801F2B4 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 bne _0801E75C - ldr r4, _0801E6C4 + ldr r4, =0x02022c84 ldr r0, [r4] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -62797,15 +61306,14 @@ _0801E6BA: ldr r1, [r4] b _0801E73A .align 2, 0 -_0801E6C0: .4byte sub_801F2B4 + 1 -_0801E6C4: .4byte 0x02022c84 + .pool _0801E6C8: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 bne _0801E75C - ldr r4, _0801E6EC + ldr r4, =0x02022c84 ldr r0, [r4] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -62817,7 +61325,7 @@ _0801E6E6: ldr r1, [r4] b _0801E73A .align 2, 0 -_0801E6EC: .4byte 0x02022c84 + .pool _0801E6F0: movs r0, 0 bl sub_801F644 @@ -62834,12 +61342,12 @@ _0801E6F0: cmp r4, 0 bne _0801E75C bl sub_800AC34 - ldr r0, _0801E720 + ldr r0, =0x02022c84 ldr r1, [r0] strh r4, [r1, 0xA] b _0801E73A .align 2, 0 -_0801E720: .4byte 0x02022c84 + .pool _0801E724: ldr r1, [r2] ldrh r0, [r1, 0xA] @@ -62848,7 +61356,7 @@ _0801E724: adds r0, 0x1 strh r0, [r1, 0xA] _0801E730: - ldr r0, _0801E744 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0801E75C @@ -62859,7 +61367,7 @@ _0801E73A: strh r0, [r1, 0x6] b _0801E75C .align 2, 0 -_0801E744: .4byte 0x03003124 + .pool _0801E748: ldr r1, [r2] ldrh r0, [r1, 0xA] @@ -62880,20 +61388,19 @@ _0801E75C: thumb_func_start sub_801E764 sub_801E764: @ 801E764 push {r4,lr} - ldr r1, _0801E77C + ldr r1, =0x02022c84 ldr r0, [r1] ldrh r0, [r0, 0x6] adds r4, r1, 0 cmp r0, 0x4 bhi _0801E830 lsls r0, 2 - ldr r1, _0801E780 + ldr r1, =_0801E784 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801E77C: .4byte 0x02022c84 -_0801E780: .4byte _0801E784 + .pool .align 2, 0 _0801E784: .4byte _0801E798 @@ -62902,7 +61409,7 @@ _0801E784: .4byte _0801E802 .4byte _0801E820 _0801E798: - ldr r0, _0801E7A8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0801E7AC @@ -62910,7 +61417,7 @@ _0801E798: bl sub_801EBD4 b _0801E830 .align 2, 0 -_0801E7A8: .4byte 0x03003124 + .pool _0801E7AC: ldr r0, [r4] movs r1, 0xC8 @@ -62930,7 +61437,7 @@ _0801E7C0: bl sub_8011A9C cmp r0, 0 bne _0801E830 - ldr r4, _0801E7F0 + ldr r4, =0x02022c84 ldr r1, [r4] movs r0, 0xC8 lsls r0, 1 @@ -62944,7 +61451,7 @@ _0801E7C0: ldr r1, [r4] b _0801E812 .align 2, 0 -_0801E7F0: .4byte 0x02022c84 + .pool _0801E7F4: bl sub_801EE10 movs r0, 0x8 @@ -62958,7 +61465,7 @@ _0801E802: cmp r0, 0 bne _0801E830 _0801E80E: - ldr r0, _0801E81C + ldr r0, =0x02022c84 ldr r1, [r0] _0801E812: ldrh r0, [r1, 0x6] @@ -62966,7 +61473,7 @@ _0801E812: strh r0, [r1, 0x6] b _0801E830 .align 2, 0 -_0801E81C: .4byte 0x02022c84 + .pool _0801E820: bl sub_800A520 lsls r0, 24 @@ -62983,7 +61490,7 @@ _0801E830: thumb_func_start sub_801E838 sub_801E838: @ 801E838 push {r4,lr} - ldr r0, _0801E850 + ldr r0, =0x02022c84 ldr r0, [r0] ldrh r0, [r0, 0x6] cmp r0, 0x6 @@ -62991,13 +61498,12 @@ sub_801E838: @ 801E838 b _0801E968 _0801E846: lsls r0, 2 - ldr r1, _0801E854 + ldr r1, =_0801E858 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801E850: .4byte 0x02022c84 -_0801E854: .4byte _0801E858 + .pool .align 2, 0 _0801E858: .4byte _0801E874 @@ -63014,24 +61520,24 @@ _0801E874: movs r0, 0x9 movs r1, 0 bl sub_801F5EC - ldr r0, _0801E88C + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x2 b _0801E966 .align 2, 0 -_0801E88C: .4byte 0x02022c84 + .pool _0801E890: movs r0, 0xD movs r1, 0 bl sub_801F5EC - ldr r0, _0801E8A0 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x5 b _0801E966 .align 2, 0 -_0801E8A0: .4byte 0x02022c84 + .pool _0801E8A4: - ldr r0, _0801E8C4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -63041,13 +61547,12 @@ _0801E8A4: movs r0, 0xB movs r1, 0 bl sub_801F5EC - ldr r0, _0801E8C8 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x3 b _0801E966 .align 2, 0 -_0801E8C4: .4byte 0x030022c0 -_0801E8C8: .4byte 0x02022c84 + .pool _0801E8CC: movs r4, 0x2 adds r0, r4, 0 @@ -63063,24 +61568,24 @@ _0801E8DA: movs r0, 0x1 movs r1, 0 bl sub_801F5EC - ldr r0, _0801E8F4 + ldr r0, =0x02022c84 ldr r0, [r0] strh r4, [r0, 0x6] b _0801E968 .align 2, 0 -_0801E8F4: .4byte 0x02022c84 + .pool _0801E8F8: movs r0, 0 bl sub_801F644 lsls r0, 24 cmp r0, 0 bne _0801E968 - ldr r0, _0801E90C + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x1 b _0801E966 .align 2, 0 -_0801E90C: .4byte 0x02022c84 + .pool _0801E910: movs r0, 0 bl sub_801F644 @@ -63104,14 +61609,14 @@ _0801E934: lsls r0, 24 cmp r0, 0 bne _0801E968 - ldr r0, _0801E948 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x6 b _0801E966 .align 2, 0 -_0801E948: .4byte 0x02022c84 + .pool _0801E94C: - ldr r0, _0801E970 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -63121,7 +61626,7 @@ _0801E94C: _0801E95A: movs r1, 0 bl sub_801F5EC - ldr r0, _0801E974 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x4 _0801E966: @@ -63131,15 +61636,14 @@ _0801E968: pop {r0} bx r0 .align 2, 0 -_0801E970: .4byte 0x030022c0 -_0801E974: .4byte 0x02022c84 + .pool thumb_func_end sub_801E838 thumb_func_start sub_801E978 sub_801E978: @ 801E978 push {r4,lr} sub sp, 0x4 - ldr r1, _0801E994 + ldr r1, =0x02022c84 ldr r0, [r1] ldrh r0, [r0, 0x6] adds r4, r1, 0 @@ -63148,13 +61652,12 @@ sub_801E978: @ 801E978 b _0801EBC2 _0801E98A: lsls r0, 2 - ldr r1, _0801E998 + ldr r1, =_0801E99C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801E994: .4byte 0x02022c84 -_0801E998: .4byte _0801E99C + .pool .align 2, 0 _0801E99C: .4byte _0801E9D4 @@ -63196,13 +61699,13 @@ _0801E9FC: movs r0, 0xE movs r1, 0 bl sub_801F5EC - ldr r0, _0801EA10 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x2 strh r0, [r1, 0x6] b _0801EBC2 .align 2, 0 -_0801EA10: .4byte 0x02022c84 + .pool _0801EA14: bl sub_801FF08 lsls r0, 24 @@ -63221,22 +61724,22 @@ _0801EA2E: beq _0801EA34 b _0801EBC2 _0801EA34: - ldr r0, _0801EA3C + ldr r0, =0x02022c84 ldr r1, [r0] b _0801EB82 .align 2, 0 -_0801EA3C: .4byte 0x02022c84 + .pool _0801EA40: movs r0, 0x7 movs r1, 0 bl sub_801F5EC - ldr r0, _0801EA54 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x3 strh r0, [r1, 0x6] b _0801EBC2 .align 2, 0 -_0801EA54: .4byte 0x02022c84 + .pool _0801EA58: movs r0, 0 bl sub_801F644 @@ -63248,13 +61751,13 @@ _0801EA66: movs r0, 0xF movs r1, 0 bl sub_801F5EC - ldr r0, _0801EA78 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x4 strh r0, [r1, 0x6] b _0801EBC2 .align 2, 0 -_0801EA78: .4byte 0x02022c84 + .pool _0801EA7C: movs r0, 0 bl sub_801F644 @@ -63263,13 +61766,13 @@ _0801EA7C: beq _0801EA8A b _0801EBC2 _0801EA8A: - ldr r0, _0801EA94 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x5 strh r0, [r1, 0x6] b _0801EBC2 .align 2, 0 -_0801EA94: .4byte 0x02022c84 + .pool _0801EA98: bl sub_801FF08 lsls r0, 24 @@ -63288,22 +61791,22 @@ _0801EAB2: beq _0801EAB8 b _0801EBC2 _0801EAB8: - ldr r0, _0801EAC0 + ldr r0, =0x02022c84 ldr r1, [r0] b _0801EB82 .align 2, 0 -_0801EAC0: .4byte 0x02022c84 + .pool _0801EAC4: movs r0, 0x7 movs r1, 0 bl sub_801F5EC - ldr r0, _0801EAD8 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x6 strh r0, [r1, 0x6] b _0801EBC2 .align 2, 0 -_0801EAD8: .4byte 0x02022c84 + .pool _0801EADC: movs r0, 0 bl sub_801F644 @@ -63314,13 +61817,13 @@ _0801EADC: movs r1, 0 bl sub_801F5EC bl sub_801EE2C - ldr r0, _0801EB00 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x7 strh r0, [r1, 0x6] b _0801EBC2 .align 2, 0 -_0801EB00: .4byte 0x02022c84 + .pool _0801EB04: movs r0, 0 bl sub_801F644 @@ -63330,24 +61833,24 @@ _0801EB04: bl sub_8076D5C movs r0, 0 bl save_game_when_memory_present - ldr r0, _0801EB24 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x8 strh r0, [r1, 0x6] b _0801EBC2 .align 2, 0 -_0801EB24: .4byte 0x02022c84 + .pool _0801EB28: movs r0, 0x11 movs r1, 0 bl sub_801F5EC - ldr r0, _0801EB3C + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x9 strh r0, [r1, 0x6] b _0801EBC2 .align 2, 0 -_0801EB3C: .4byte 0x02022c84 + .pool _0801EB40: movs r0, 0 bl sub_801F644 @@ -63357,13 +61860,13 @@ _0801EB40: movs r0, 0x37 bl audio_play bl sav2_gender2_inplace_and_xFE - ldr r0, _0801EB60 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0xA strh r0, [r1, 0x6] b _0801EBC2 .align 2, 0 -_0801EB60: .4byte 0x02022c84 + .pool _0801EB64: ldr r1, [r4] movs r0, 0 @@ -63394,15 +61897,15 @@ _0801EB88: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0801EBA4 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0xD strh r0, [r1, 0x6] b _0801EBC2 .align 2, 0 -_0801EBA4: .4byte 0x02022c84 + .pool _0801EBA8: - ldr r0, _0801EBCC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -63410,7 +61913,7 @@ _0801EBA8: bne _0801EBC2 bl sub_801F544 bl sub_801DE30 - ldr r0, _0801EBD0 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 _0801EBC2: add sp, 0x4 @@ -63418,26 +61921,25 @@ _0801EBC2: pop {r0} bx r0 .align 2, 0 -_0801EBCC: .4byte 0x02037fd4 -_0801EBD0: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_801E978 thumb_func_start sub_801EBD4 sub_801EBD4: @ 801EBD4 - ldr r1, _0801EBE0 + ldr r1, =0x02022c84 ldr r1, [r1] movs r2, 0 strh r0, [r1, 0x4] strh r2, [r1, 0x6] bx lr .align 2, 0 -_0801EBE0: .4byte 0x02022c84 + .pool thumb_func_end sub_801EBD4 thumb_func_start sub_801EBE4 sub_801EBE4: @ 801EBE4 push {lr} - ldr r0, _0801EC14 + ldr r0, =0x030022c0 ldrh r2, [r0, 0x30] movs r0, 0x40 ands r0, r2 @@ -63449,9 +61951,9 @@ sub_801EBE4: @ 801EBE4 ands r0, r2 cmp r0, 0 beq _0801EC24 - ldr r0, _0801EC18 + ldr r0, =0x02022c84 ldr r2, [r0] - ldr r1, _0801EC1C + ldr r1, =0x082f2aa4 ldrb r0, [r2, 0x10] adds r0, r1 ldrb r1, [r2, 0x12] @@ -63461,14 +61963,12 @@ sub_801EBE4: @ 801EBE4 adds r0, r1, 0x1 b _0801EC88 .align 2, 0 -_0801EC14: .4byte 0x030022c0 -_0801EC18: .4byte 0x02022c84 -_0801EC1C: .4byte 0x082f2aa4 + .pool _0801EC20: strb r3, [r2, 0x12] b _0801EC8A _0801EC24: - ldr r0, _0801EC48 + ldr r0, =0x02022c84 ldr r1, [r0] ldrb r0, [r1, 0x10] cmp r0, 0x3 @@ -63486,7 +61986,7 @@ _0801EC24: strb r0, [r1, 0x11] b _0801EC8A .align 2, 0 -_0801EC48: .4byte 0x02022c84 + .pool _0801EC4C: movs r0, 0x4 strb r0, [r1, 0x11] @@ -63509,7 +62009,7 @@ _0801EC6A: movs r0, 0 b _0801EC8C _0801EC6E: - ldr r0, _0801EC7C + ldr r0, =0x02022c84 ldr r2, [r0] ldrb r0, [r2, 0x12] cmp r0, 0 @@ -63517,9 +62017,9 @@ _0801EC6E: subs r0, 0x1 b _0801EC88 .align 2, 0 -_0801EC7C: .4byte 0x02022c84 + .pool _0801EC80: - ldr r0, _0801EC90 + ldr r0, =0x082f2aa4 ldrb r1, [r2, 0x10] adds r1, r0 ldrb r0, [r1] @@ -63531,19 +62031,19 @@ _0801EC8C: pop {r1} bx r1 .align 2, 0 -_0801EC90: .4byte 0x082f2aa4 + .pool thumb_func_end sub_801EBE4 thumb_func_start sub_801EC94 sub_801EC94: @ 801EC94 push {r4-r6,lr} sub sp, 0x18 - ldr r0, _0801ECD4 + ldr r0, =0x02022c84 ldr r5, [r0] ldrb r0, [r5, 0x10] cmp r0, 0x3 beq _0801ECDC - ldr r3, _0801ECD8 + ldr r3, =0x082f2ba8 ldrb r1, [r5, 0x12] lsls r1, 2 adds r2, r0, 0 @@ -63571,8 +62071,7 @@ _0801ECCE: movs r5, 0x1 b _0801ED02 .align 2, 0 -_0801ECD4: .4byte 0x02022c84 -_0801ECD8: .4byte 0x082f2ba8 + .pool _0801ECDC: ldrb r0, [r5, 0x12] lsls r1, r0, 2 @@ -63592,7 +62091,7 @@ _0801ECDC: bl sub_80091CC adds r5, r0, 0 _0801ED02: - ldr r6, _0801ED64 + ldr r6, =0x02022c84 ldr r1, [r6] ldrb r0, [r1, 0x15] strb r0, [r1, 0x14] @@ -63644,13 +62143,13 @@ _0801ED5A: pop {r0} bx r0 .align 2, 0 -_0801ED64: .4byte 0x02022c84 + .pool thumb_func_end sub_801EC94 thumb_func_start sub_801ED68 sub_801ED68: @ 801ED68 push {r4,lr} - ldr r4, _0801ED90 + ldr r4, =0x02022c84 ldr r1, [r4] ldrb r0, [r1, 0x15] strb r0, [r1, 0x14] @@ -63670,13 +62169,13 @@ _0801ED8A: pop {r0} bx r0 .align 2, 0 -_0801ED90: .4byte 0x02022c84 + .pool thumb_func_end sub_801ED68 thumb_func_start sub_801ED94 sub_801ED94: @ 801ED94 push {lr} - ldr r0, _0801EDBC + ldr r0, =0x02022c84 ldr r1, [r0] ldrb r0, [r1, 0x15] subs r0, 0x1 @@ -63686,7 +62185,7 @@ sub_801ED94: @ 801ED94 ldrb r0, [r2] cmp r0, 0xF9 beq _0801EDB8 - ldr r1, _0801EDC0 + ldr r1, =0x082f2aa8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -63696,14 +62195,13 @@ _0801EDB8: pop {r0} bx r0 .align 2, 0 -_0801EDBC: .4byte 0x02022c84 -_0801EDC0: .4byte 0x082f2aa8 + .pool thumb_func_end sub_801ED94 thumb_func_start sub_801EDC4 sub_801EDC4: @ 801EDC4 push {lr} - ldr r0, _0801EDD4 + ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x15] cmp r0, 0 @@ -63711,7 +62209,7 @@ sub_801EDC4: @ 801EDC4 movs r0, 0 b _0801EDDA .align 2, 0 -_0801EDD4: .4byte 0x02022c84 + .pool _0801EDD8: movs r0, 0x1 _0801EDDA: @@ -63724,7 +62222,7 @@ sub_801EDE0: @ 801EDE0 push {r4,lr} bl sub_801F114 adds r1, r0, 0 - ldr r4, _0801EE0C + ldr r4, =0x02022c84 ldr r0, [r4] ldrb r3, [r0, 0x12] lsls r2, r3, 2 @@ -63741,12 +62239,12 @@ sub_801EDE0: @ 801EDE0 pop {r0} bx r0 .align 2, 0 -_0801EE0C: .4byte 0x02022c84 + .pool thumb_func_end sub_801EDE0 thumb_func_start sub_801EE10 sub_801EE10: @ 801EE10 - ldr r1, _0801EE28 + ldr r1, =0x02022c84 ldr r2, [r1] movs r0, 0xFF strb r0, [r2, 0x1A] @@ -63758,7 +62256,7 @@ sub_801EE10: @ 801EE10 strb r3, [r0, 0x15] bx lr .align 2, 0 -_0801EE28: .4byte 0x02022c84 + .pool thumb_func_end sub_801EE10 thumb_func_start sub_801EE2C @@ -63766,11 +62264,11 @@ sub_801EE2C: @ 801EE2C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0801EE60 + ldr r0, =0x03005d8c mov r8, r0 - ldr r7, _0801EE64 + ldr r7, =0x02022c84 movs r6, 0xB9 - ldr r5, _0801EE68 + ldr r5, =0x00003c88 movs r4, 0x9 _0801EE3E: mov r1, r8 @@ -63790,14 +62288,12 @@ _0801EE3E: pop {r0} bx r0 .align 2, 0 -_0801EE60: .4byte 0x03005d8c -_0801EE64: .4byte 0x02022c84 -_0801EE68: .4byte 0x00003c88 + .pool thumb_func_end sub_801EE2C thumb_func_start sub_801EE6C sub_801EE6C: @ 801EE6C - ldr r2, _0801EE80 + ldr r2, =0x02022c84 lsls r1, r0, 2 adds r1, r0 lsls r1, 2 @@ -63807,13 +62303,13 @@ sub_801EE6C: @ 801EE6C adds r0, r1 bx lr .align 2, 0 -_0801EE80: .4byte 0x02022c84 + .pool thumb_func_end sub_801EE6C thumb_func_start sub_801EE84 sub_801EE84: @ 801EE84 push {lr} - ldr r0, _0801EEA4 + ldr r0, =0x02022c84 ldr r0, [r0] adds r1, r0, 0 adds r1, 0x1A @@ -63830,13 +62326,13 @@ _0801EE9C: pop {r1} bx r1 .align 2, 0 -_0801EEA4: .4byte 0x02022c84 + .pool thumb_func_end sub_801EE84 thumb_func_start sub_801EEA8 sub_801EEA8: @ 801EEA8 push {lr} - ldr r0, _0801EED4 + ldr r0, =0x02022c84 ldr r0, [r0] adds r2, r0, 0 adds r2, 0x1A @@ -63860,13 +62356,13 @@ _0801EECC: pop {r1} bx r1 .align 2, 0 -_0801EED4: .4byte 0x02022c84 + .pool thumb_func_end sub_801EEA8 thumb_func_start sub_801EED8 sub_801EED8: @ 801EED8 push {r4,lr} - ldr r4, _0801EF18 + ldr r4, =0x02022c84 ldr r0, [r4] adds r0, 0x1A bl sub_80091CC @@ -63899,7 +62395,7 @@ _0801EF0C: pop {r1} bx r1 .align 2, 0 -_0801EF18: .4byte 0x02022c84 + .pool thumb_func_end sub_801EED8 thumb_func_start sub_801EF1C @@ -63916,10 +62412,10 @@ sub_801EF24: @ 801EF24 movs r0, 0x2 strb r0, [r4] adds r0, r4, 0x1 - ldr r1, _0801EF44 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy - ldr r0, _0801EF48 + ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x13] strb r0, [r4, 0x9] @@ -63927,8 +62423,7 @@ sub_801EF24: @ 801EF24 pop {r0} bx r0 .align 2, 0 -_0801EF44: .4byte 0x03005d90 -_0801EF48: .4byte 0x02022c84 + .pool thumb_func_end sub_801EF24 thumb_func_start sub_801EF4C @@ -63938,11 +62433,11 @@ sub_801EF4C: @ 801EF4C movs r0, 0x1 strb r0, [r4] adds r0, r4, 0x1 - ldr r1, _0801EF74 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy adds r4, 0x9 - ldr r0, _0801EF78 + ldr r0, =0x02022c84 ldr r1, [r0] adds r1, 0x1A adds r0, r4, 0 @@ -63951,8 +62446,7 @@ sub_801EF4C: @ 801EF4C pop {r0} bx r0 .align 2, 0 -_0801EF74: .4byte 0x03005d90 -_0801EF78: .4byte 0x02022c84 + .pool thumb_func_end sub_801EF4C thumb_func_start sub_801EF7C @@ -63962,10 +62456,10 @@ sub_801EF7C: @ 801EF7C movs r0, 0x3 strb r0, [r4] adds r0, r4, 0x1 - ldr r1, _0801EFA0 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy - ldr r0, _0801EFA4 + ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x13] strb r0, [r4, 0x9] @@ -63974,8 +62468,7 @@ sub_801EF7C: @ 801EF7C pop {r0} bx r0 .align 2, 0 -_0801EFA0: .4byte 0x03005d90 -_0801EFA4: .4byte 0x02022c84 + .pool thumb_func_end sub_801EF7C thumb_func_start sub_801EFA8 @@ -63985,10 +62478,10 @@ sub_801EFA8: @ 801EFA8 movs r0, 0x4 strb r0, [r4] adds r0, r4, 0x1 - ldr r1, _0801EFC8 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy - ldr r0, _0801EFCC + ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x13] strb r0, [r4, 0x9] @@ -63996,8 +62489,7 @@ sub_801EFA8: @ 801EFA8 pop {r0} bx r0 .align 2, 0 -_0801EFC8: .4byte 0x03005d90 -_0801EFCC: .4byte 0x02022c84 + .pool thumb_func_end sub_801EFA8 thumb_func_start sub_801EFD0 @@ -64007,10 +62499,10 @@ sub_801EFD0: @ 801EFD0 movs r0, 0x5 strb r0, [r4] adds r0, r4, 0x1 - ldr r1, _0801EFF0 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy - ldr r0, _0801EFF4 + ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x13] strb r0, [r4, 0x9] @@ -64018,8 +62510,7 @@ sub_801EFD0: @ 801EFD0 pop {r0} bx r0 .align 2, 0 -_0801EFF0: .4byte 0x03005d90 -_0801EFF4: .4byte 0x02022c84 + .pool thumb_func_end sub_801EFD0 thumb_func_start sub_801EFF8 @@ -64046,7 +62537,7 @@ _0801F016: beq _0801F06E b _0801F0A8 _0801F020: - ldr r0, _0801F03C + ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x13] ldrb r1, [r4, 0x8] @@ -64056,11 +62547,10 @@ _0801F020: movs r0, 0 adds r1, r4, 0 bl sub_81AFC0C - ldr r1, _0801F040 + ldr r1, =0x085ed2a9 b _0801F094 .align 2, 0 -_0801F03C: .4byte 0x02022c84 -_0801F040: .4byte 0x085ed2a9 + .pool _0801F044: adds r0, r6, 0 adds r1, r4, 0 @@ -64082,13 +62572,13 @@ _0801F044: movs r0, 0x1 b _0801F0AA _0801F06E: - ldr r0, _0801F0A0 + ldr r0, =0x02022c84 ldr r0, [r0] adds r0, 0x79 adds r1, r4, 0 bl gf_strcpy _0801F07A: - ldr r0, _0801F0A0 + ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x13] ldrb r5, [r5] @@ -64098,15 +62588,14 @@ _0801F07A: movs r0, 0 adds r1, r4, 0 bl sub_81AFC0C - ldr r1, _0801F0A4 + ldr r1, =0x085ed2bd _0801F094: adds r0, r6, 0 bl sub_81AFC28 movs r0, 0x1 b _0801F0AA .align 2, 0 -_0801F0A0: .4byte 0x02022c84 -_0801F0A4: .4byte 0x085ed2bd + .pool _0801F0A8: movs r0, 0 _0801F0AA: @@ -64117,17 +62606,17 @@ _0801F0AA: thumb_func_start sub_801F0B0 sub_801F0B0: @ 801F0B0 - ldr r0, _0801F0B8 + ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x10] bx lr .align 2, 0 -_0801F0B8: .4byte 0x02022c84 + .pool thumb_func_end sub_801F0B0 thumb_func_start sub_801F0BC sub_801F0BC: @ 801F0BC - ldr r2, _0801F0CC + ldr r2, =0x02022c84 ldr r3, [r2] ldrb r2, [r3, 0x11] strb r2, [r0] @@ -64135,17 +62624,17 @@ sub_801F0BC: @ 801F0BC strb r0, [r1] bx lr .align 2, 0 -_0801F0CC: .4byte 0x02022c84 + .pool thumb_func_end sub_801F0BC thumb_func_start sub_801F0D0 sub_801F0D0: @ 801F0D0 - ldr r0, _0801F0D8 + ldr r0, =0x02022c84 ldr r0, [r0] adds r0, 0x1A bx lr .align 2, 0 -_0801F0D8: .4byte 0x02022c84 + .pool thumb_func_end sub_801F0D0 thumb_func_start sub_801F0DC @@ -64161,7 +62650,7 @@ sub_801F0DC: @ 801F0DC sub_801F0EC: @ 801F0EC push {r4,lr} adds r4, r0, 0 - ldr r0, _0801F104 + ldr r0, =0x02022c84 ldr r0, [r0] ldrb r3, [r0, 0x15] ldrb r2, [r0, 0x14] @@ -64172,7 +62661,7 @@ sub_801F0EC: @ 801F0EC str r3, [r4] b _0801F10A .align 2, 0 -_0801F104: .4byte 0x02022c84 + .pool _0801F108: str r2, [r4] _0801F10A: @@ -64188,7 +62677,7 @@ sub_801F114: @ 801F114 bl sub_801EED8 lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _0801F140 + ldr r0, =0x02022c84 ldr r0, [r0] adds r1, r0, 0 adds r1, 0x1A @@ -64209,7 +62698,7 @@ _0801F13A: pop {r1} bx r1 .align 2, 0 -_0801F140: .4byte 0x02022c84 + .pool thumb_func_end sub_801F114 thumb_func_start sub_801F144 @@ -64218,7 +62707,7 @@ sub_801F144: @ 801F144 bl sub_801EED8 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _0801F17C + ldr r0, =0x02022c84 ldr r0, [r0] adds r1, r0, 0 adds r1, 0x1A @@ -64245,37 +62734,37 @@ _0801F174: pop {r1} bx r1 .align 2, 0 -_0801F17C: .4byte 0x02022c84 + .pool thumb_func_end sub_801F144 thumb_func_start sub_801F180 sub_801F180: @ 801F180 - ldr r0, _0801F188 + ldr r0, =0x02022c84 ldr r0, [r0] adds r0, 0x39 bx lr .align 2, 0 -_0801F188: .4byte 0x02022c84 + .pool thumb_func_end sub_801F180 thumb_func_start sub_801F18C sub_801F18C: @ 801F18C - ldr r0, _0801F194 + ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x16] bx lr .align 2, 0 -_0801F194: .4byte 0x02022c84 + .pool thumb_func_end sub_801F18C thumb_func_start sub_801F198 sub_801F198: @ 801F198 - ldr r0, _0801F1A0 + ldr r0, =0x02022c84 ldr r0, [r0] ldrb r0, [r0, 0x15] bx lr .align 2, 0 -_0801F1A0: .4byte 0x02022c84 + .pool thumb_func_end sub_801F198 thumb_func_start sub_801F1A4 @@ -64285,7 +62774,7 @@ sub_801F1A4: @ 801F1A4 ldrb r1, [r0] cmp r1, 0xFF bhi _0801F1BE - ldr r0, _0801F1C4 + ldr r0, =0x082f2aa8 adds r0, r1, r0 ldrb r0, [r0] cmp r0, r1 @@ -64296,7 +62785,7 @@ _0801F1BE: movs r0, 0x3 b _0801F1CA .align 2, 0 -_0801F1C4: .4byte 0x082f2aa8 + .pool _0801F1C8: movs r0, 0 _0801F1CA: @@ -64306,93 +62795,73 @@ _0801F1CA: thumb_func_start sub_801F1D0 sub_801F1D0: @ 801F1D0 - ldr r0, _0801F1D8 + ldr r0, =0x02022c84 ldr r0, [r0] adds r0, 0x79 bx lr .align 2, 0 -_0801F1D8: .4byte 0x02022c84 + .pool thumb_func_end sub_801F1D0 thumb_func_start copy_strings_to_sav1 copy_strings_to_sav1: @ 801F1DC push {r4,lr} - ldr r4, _0801F260 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _0801F264 + ldr r1, =0x00003c88 adds r0, r1 - ldr r1, _0801F268 + ldr r1, =0x085ed40f bl gf_strcpy ldr r0, [r4] - ldr r1, _0801F26C + ldr r1, =0x00003c9d adds r0, r1 - ldr r1, _0801F270 + ldr r1, =0x085ed415 bl gf_strcpy ldr r0, [r4] - ldr r1, _0801F274 + ldr r1, =0x00003cb2 adds r0, r1 - ldr r1, _0801F278 + ldr r1, =0x085ed41d bl gf_strcpy ldr r0, [r4] - ldr r1, _0801F27C + ldr r1, =0x00003cc7 adds r0, r1 - ldr r1, _0801F280 + ldr r1, =0x085ed423 bl gf_strcpy ldr r0, [r4] - ldr r1, _0801F284 + ldr r1, =0x00003cdc adds r0, r1 - ldr r1, _0801F288 + ldr r1, =0x085ed42a bl gf_strcpy ldr r0, [r4] - ldr r1, _0801F28C + ldr r1, =0x00003cf1 adds r0, r1 - ldr r1, _0801F290 + ldr r1, =0x085ed430 bl gf_strcpy ldr r0, [r4] - ldr r1, _0801F294 + ldr r1, =0x00003d06 adds r0, r1 - ldr r1, _0801F298 + ldr r1, =0x085ed434 bl gf_strcpy ldr r0, [r4] - ldr r1, _0801F29C + ldr r1, =0x00003d1b adds r0, r1 - ldr r1, _0801F2A0 + ldr r1, =0x085ed43a bl gf_strcpy ldr r0, [r4] - ldr r1, _0801F2A4 + ldr r1, =0x00003d30 adds r0, r1 - ldr r1, _0801F2A8 + ldr r1, =0x085ed440 bl gf_strcpy ldr r0, [r4] - ldr r1, _0801F2AC + ldr r1, =0x00003d45 adds r0, r1 - ldr r1, _0801F2B0 + ldr r1, =0x085ed44a bl gf_strcpy pop {r4} pop {r0} bx r0 .align 2, 0 -_0801F260: .4byte 0x03005d8c -_0801F264: .4byte 0x00003c88 -_0801F268: .4byte 0x085ed40f -_0801F26C: .4byte 0x00003c9d -_0801F270: .4byte 0x085ed415 -_0801F274: .4byte 0x00003cb2 -_0801F278: .4byte 0x085ed41d -_0801F27C: .4byte 0x00003cc7 -_0801F280: .4byte 0x085ed423 -_0801F284: .4byte 0x00003cdc -_0801F288: .4byte 0x085ed42a -_0801F28C: .4byte 0x00003cf1 -_0801F290: .4byte 0x085ed430 -_0801F294: .4byte 0x00003d06 -_0801F298: .4byte 0x085ed434 -_0801F29C: .4byte 0x00003d1b -_0801F2A0: .4byte 0x085ed43a -_0801F2A4: .4byte 0x00003d30 -_0801F2A8: .4byte 0x085ed440 -_0801F2AC: .4byte 0x00003d45 -_0801F2B0: .4byte 0x085ed44a + .pool thumb_func_end copy_strings_to_sav1 thumb_func_start sub_801F2B4 @@ -64403,7 +62872,7 @@ sub_801F2B4: @ 801F2B4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0801F2D8 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -64412,13 +62881,12 @@ sub_801F2B4: @ 801F2B4 b _0801F4C4 _0801F2CE: lsls r0, 2 - ldr r1, _0801F2DC + ldr r1, =_0801F2E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801F2D8: .4byte 0x03005e08 -_0801F2DC: .4byte _0801F2E0 + .pool .align 2, 0 _0801F2E0: .4byte _0801F300 @@ -64430,7 +62898,7 @@ _0801F2E0: .4byte _0801F494 .4byte _0801F438 _0801F300: - ldr r0, _0801F334 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0801F30A @@ -64444,7 +62912,7 @@ _0801F30E: lsrs r0, 24 adds r2, r0, 0 strh r0, [r4, 0x8] - ldr r3, _0801F338 + ldr r3, =0x02022c84 ldr r0, [r3] ldrb r1, [r0, 0xD] movs r5, 0x8 @@ -64457,8 +62925,7 @@ _0801F30E: strb r2, [r0, 0xD] b _0801F4C4 .align 2, 0 -_0801F334: .4byte 0x03003124 -_0801F338: .4byte 0x02022c84 + .pool _0801F33C: bl sub_800A550 lsls r0, 24 @@ -64521,20 +62988,19 @@ _0801F3A2: movs r1, 0x2 ldrsh r0, [r4, r1] lsls r0, 8 - ldr r1, _0801F3C8 + ldr r1, =0x020223c4 adds r0, r1 ldrb r0, [r0] subs r0, 0x1 cmp r0, 0x4 bhi _0801F3E4 lsls r0, 2 - ldr r1, _0801F3CC + ldr r1, =_0801F3D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801F3C8: .4byte 0x020223c4 -_0801F3CC: .4byte _0801F3D0 + .pool .align 2, 0 _0801F3D0: .4byte _0801F3E4 @@ -64558,13 +63024,13 @@ _0801F3F4: movs r0, 0x6 _0801F3F6: strh r0, [r4, 0xA] - ldr r5, _0801F424 + ldr r5, =0x02022c84 ldr r0, [r5] adds r0, 0x39 movs r2, 0x2 ldrsh r1, [r4, r2] lsls r1, 8 - ldr r2, _0801F428 + ldr r2, =0x020223c4 adds r1, r2 bl sub_801EFF8 cmp r0, 0 @@ -64578,8 +63044,7 @@ _0801F3F6: movs r0, 0x7 b _0801F42E .align 2, 0 -_0801F424: .4byte 0x02022c84 -_0801F428: .4byte 0x020223c4 + .pool _0801F42C: ldrh r0, [r4, 0xA] _0801F42E: @@ -64597,7 +63062,7 @@ _0801F438: ldrh r0, [r4, 0xA] b _0801F4C2 _0801F448: - ldr r6, _0801F470 + ldr r6, =0x02022c84 ldr r0, [r6] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -64616,7 +63081,7 @@ _0801F448: movs r0, 0x1 b _0801F49A .align 2, 0 -_0801F470: .4byte 0x02022c84 + .pool _0801F474: movs r5, 0x4 ldrsh r0, [r4, r5] @@ -64625,7 +63090,7 @@ _0801F47C: movs r0, 0x3 b _0801F4C2 _0801F480: - ldr r0, _0801F490 + ldr r0, =0x02022c84 ldr r1, [r0] ldrb r0, [r1, 0x13] cmp r0, 0 @@ -64633,9 +63098,9 @@ _0801F480: movs r0, 0x2 b _0801F49A .align 2, 0 -_0801F490: .4byte 0x02022c84 + .pool _0801F494: - ldr r0, _0801F4A4 + ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x3 _0801F49A: @@ -64645,12 +63110,12 @@ _0801F49C: bl remove_task b _0801F4C4 .align 2, 0 -_0801F4A4: .4byte 0x02022c84 + .pool _0801F4A8: bl sub_8011A9C cmp r0, 0 bne _0801F4C4 - ldr r0, _0801F4CC + ldr r0, =0x02022c84 ldr r1, [r0] ldrb r0, [r1, 0x13] cmp r0, 0 @@ -64666,14 +63131,14 @@ _0801F4C4: pop {r0} bx r0 .align 2, 0 -_0801F4CC: .4byte 0x02022c84 + .pool thumb_func_end sub_801F2B4 thumb_func_start sub_801F4D0 sub_801F4D0: @ 801F4D0 push {r4,lr} - ldr r4, _0801F51C - ldr r0, _0801F520 + ldr r4, =0x02022c88 + ldr r0, =0x00002168 bl malloc str r0, [r4] cmp r0, 0 @@ -64683,11 +63148,11 @@ sub_801F4D0: @ 801F4D0 beq _0801F52C movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0801F524 + ldr r1, =0x082f2c60 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r0, _0801F528 + ldr r0, =0x082f2c70 bl Window_InitFromTemplates bl reset_temp_tile_data_buffers bl sub_8020770 @@ -64700,10 +63165,7 @@ sub_801F4D0: @ 801F4D0 movs r0, 0x1 b _0801F52E .align 2, 0 -_0801F51C: .4byte 0x02022c88 -_0801F520: .4byte 0x00002168 -_0801F524: .4byte 0x082f2c60 -_0801F528: .4byte 0x082f2c70 + .pool _0801F52C: movs r0, 0 _0801F52E: @@ -64727,7 +63189,7 @@ sub_801F534: @ 801F534 sub_801F544: @ 801F544 push {r4,lr} bl sub_80208D0 - ldr r4, _0801F56C + ldr r4, =0x02022c88 ldr r0, [r4] cmp r0, 0 beq _0801F55A @@ -64736,15 +63198,14 @@ sub_801F544: @ 801F544 str r0, [r4] _0801F55A: bl Window_FreeMemory - ldr r1, _0801F570 + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] pop {r4} pop {r0} bx r0 .align 2, 0 -_0801F56C: .4byte 0x02022c88 -_0801F570: .4byte 0x02039b28 + .pool thumb_func_end sub_801F544 thumb_func_start sub_801F574 @@ -64760,13 +63221,13 @@ sub_801F574: @ 801F574 thumb_func_start sub_801F580 sub_801F580: @ 801F580 push {r4,r5,lr} - ldr r1, _0801F5B0 + ldr r1, =0x02022c88 ldr r0, [r1] cmp r0, 0 beq _0801F5A8 movs r2, 0 adds r4, r1, 0 - ldr r5, _0801F5B4 + ldr r5, =sub_801FDD8 + 1 movs r3, 0 _0801F592: ldr r0, [r4] @@ -64785,14 +63246,13 @@ _0801F5A8: pop {r0} bx r0 .align 2, 0 -_0801F5B0: .4byte 0x02022c88 -_0801F5B4: .4byte sub_801FDD8 + 1 + .pool thumb_func_end sub_801F580 thumb_func_start sub_801F5B8 sub_801F5B8: @ 801F5B8 push {r4-r6,lr} - ldr r1, _0801F5E8 + ldr r1, =0x02022c88 ldr r0, [r1] cmp r0, 0 beq _0801F5E0 @@ -64816,7 +63276,7 @@ _0801F5E0: pop {r0} bx r0 .align 2, 0 -_0801F5E8: .4byte 0x02022c88 + .pool thumb_func_end sub_801F5B8 thumb_func_start sub_801F5EC @@ -64825,17 +63285,17 @@ sub_801F5EC: @ 801F5EC lsls r0, 16 lsrs r6, r0, 16 lsls r1, 24 - ldr r3, _0801F628 + ldr r3, =0x02022c88 ldr r0, [r3] lsrs r1, 21 adds r0, r1 - ldr r2, _0801F62C + ldr r2, =sub_801FDD8 + 1 str r2, [r0] movs r4, 0 adds r5, r3, 0 adds r3, r1, 0 mov r12, r4 - ldr r1, _0801F630 + ldr r1, =0x082f2c98 movs r7, 0x1 adds r2, r1, 0x4 _0801F60E: @@ -64853,9 +63313,7 @@ _0801F60E: strb r1, [r0, 0x5] b _0801F63E .align 2, 0 -_0801F628: .4byte 0x02022c88 -_0801F62C: .4byte sub_801FDD8 + 1 -_0801F630: .4byte 0x082f2c98 + .pool _0801F634: adds r1, 0x8 adds r2, 0x8 @@ -64871,14 +63329,14 @@ _0801F63E: thumb_func_start sub_801F644 sub_801F644: @ 801F644 lsls r0, 24 - ldr r1, _0801F654 + ldr r1, =0x02022c88 ldr r1, [r1] lsrs r0, 21 adds r1, r0 ldrb r0, [r1, 0x4] bx lr .align 2, 0 -_0801F654: .4byte 0x02022c88 + .pool thumb_func_end sub_801F644 thumb_func_start sub_801F658 @@ -64894,12 +63352,12 @@ sub_801F658: @ 801F658 cmp r0, 0x6 bhi _0801F6E4 lsls r0, 2 - ldr r1, _0801F678 + ldr r1, =_0801F67C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801F678: .4byte _0801F67C + .pool .align 2, 0 _0801F67C: .4byte _0801F698 @@ -65101,14 +63559,14 @@ _0801F7F0: movs r1, 0xB movs r2, 0x1 bl sub_801FDDC - ldr r0, _0801F810 + ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 bl Window_CopyToVram b _0801F81E .align 2, 0 -_0801F810: .4byte 0x02022c88 + .pool _0801F814: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -65270,14 +63728,14 @@ _0801F938: movs r0, 0x1 movs r1, 0x10 bl sub_801FF18 - ldr r0, _0801F958 + ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 bl Window_CopyToVram b _0801F972 .align 2, 0 -_0801F958: .4byte 0x02022c88 + .pool _0801F95C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -65352,14 +63810,14 @@ _0801F9E0: cmp r0, 0 bne _0801FA20 bl sub_8020094 - ldr r0, _0801F9FC + ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 bl Window_CopyToVram b _0801FA1A .align 2, 0 -_0801F9FC: .4byte 0x02022c88 + .pool _0801FA00: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -65427,12 +63885,12 @@ sub_801FA68: @ 801FA68 cmp r0, 0x4 bhi _0801FB3A lsls r0, 2 - ldr r1, _0801FA7C + ldr r1, =_0801FA80 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0801FA7C: .4byte _0801FA80 + .pool .align 2, 0 _0801FA80: .4byte _0801FA94 @@ -65441,7 +63899,7 @@ _0801FA80: .4byte _0801FB14 .4byte _0801FADE _0801FA94: - ldr r0, _0801FABC + ldr r0, =0x02022c88 ldr r0, [r0] ldrh r5, [r0, 0x1A] bl sub_801F180 @@ -65458,14 +63916,14 @@ _0801FA94: bl Window_CopyToVram b _0801FB34 .align 2, 0 -_0801FABC: .4byte 0x02022c88 + .pool _0801FAC0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 bne _0801FB3A - ldr r0, _0801FAE4 + ldr r0, =0x02022c88 ldr r1, [r0] ldrh r0, [r1, 0x1A] cmp r0, 0x8 @@ -65478,7 +63936,7 @@ _0801FADE: movs r0, 0 b _0801FB3C .align 2, 0 -_0801FAE4: .4byte 0x02022c88 + .pool _0801FAE8: strh r2, [r1, 0x1C] ldrb r0, [r6] @@ -65493,7 +63951,7 @@ _0801FAF0: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram - ldr r0, _0801FB30 + ldr r0, =0x02022c88 ldr r1, [r0] ldrh r0, [r1, 0x1C] adds r0, 0x1 @@ -65506,7 +63964,7 @@ _0801FB14: lsls r0, 24 cmp r0, 0 bne _0801FB3A - ldr r0, _0801FB30 + ldr r0, =0x02022c88 ldr r0, [r0] ldrh r0, [r0, 0x1C] cmp r0, 0x2 @@ -65515,7 +63973,7 @@ _0801FB14: subs r0, 0x1 b _0801FB38 .align 2, 0 -_0801FB30: .4byte 0x02022c88 + .pool _0801FB34: ldrb r0, [r6] adds r0, 0x1 @@ -65570,7 +64028,7 @@ _0801FB80: movs r0, 0x3 movs r1, 0x10 bl sub_801FF18 - ldr r0, _0801FB9C + ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 @@ -65580,7 +64038,7 @@ _0801FB80: strb r0, [r4] b _0801FBAA .align 2, 0 -_0801FB9C: .4byte 0x02022c88 + .pool _0801FBA0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -65608,7 +64066,7 @@ _0801FBC4: movs r0, 0x4 movs r1, 0 bl sub_801FF18 - ldr r0, _0801FBE0 + ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 @@ -65618,7 +64076,7 @@ _0801FBC4: strb r0, [r4] b _0801FBEE .align 2, 0 -_0801FBE0: .4byte 0x02022c88 + .pool _0801FBE4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -65651,7 +64109,7 @@ _0801FC08: movs r0, 0x5 movs r1, 0 bl sub_801FF18 - ldr r0, _0801FC34 + ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 @@ -65661,7 +64119,7 @@ _0801FC08: strb r0, [r4] b _0801FC42 .align 2, 0 -_0801FC34: .4byte 0x02022c88 + .pool _0801FC38: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -65693,7 +64151,7 @@ _0801FC5C: movs r1, 0xA movs r2, 0x1 bl sub_801FDDC - ldr r0, _0801FC84 + ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 @@ -65703,7 +64161,7 @@ _0801FC5C: strb r0, [r4] b _0801FC92 .align 2, 0 -_0801FC84: .4byte 0x02022c88 + .pool _0801FC88: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -65735,7 +64193,7 @@ _0801FCAC: movs r1, 0xA movs r2, 0x1 bl sub_801FDDC - ldr r0, _0801FCD4 + ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 @@ -65745,7 +64203,7 @@ _0801FCAC: strb r0, [r4] b _0801FCE2 .align 2, 0 -_0801FCD4: .4byte 0x02022c88 + .pool _0801FCD8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -65773,7 +64231,7 @@ _0801FCFC: movs r0, 0x8 movs r1, 0 bl sub_801FF18 - ldr r0, _0801FD18 + ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 @@ -65783,7 +64241,7 @@ _0801FCFC: strb r0, [r4] b _0801FD26 .align 2, 0 -_0801FD18: .4byte 0x02022c88 + .pool _0801FD1C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -65809,14 +64267,14 @@ sub_801FD30: @ 801FD30 b _0801FD7E _0801FD40: bl sub_81AFBF0 - ldr r0, _0801FD6C + ldr r0, =0x03005d90 ldr r1, [r0] movs r0, 0 bl sub_81AFC0C movs r0, 0x9 movs r1, 0 bl sub_801FF18 - ldr r0, _0801FD70 + ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 @@ -65826,8 +64284,7 @@ _0801FD40: strb r0, [r4] b _0801FD7E .align 2, 0 -_0801FD6C: .4byte 0x03005d90 -_0801FD70: .4byte 0x02022c88 + .pool _0801FD74: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -65859,7 +64316,7 @@ _0801FD98: movs r1, 0xA movs r2, 0x1 bl sub_801FDDC - ldr r0, _0801FDC0 + ldr r0, =0x02022c88 ldr r0, [r0] ldrb r0, [r0, 0x1E] movs r1, 0x3 @@ -65869,7 +64326,7 @@ _0801FD98: strb r0, [r4] b _0801FDCE .align 2, 0 -_0801FDC0: .4byte 0x02022c88 + .pool _0801FDC4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -65897,18 +64354,18 @@ sub_801FDDC: @ 801FDDC lsls r1, 24 lsls r2, 24 lsrs r7, r2, 24 - ldr r4, _0801FE9C + ldr r4, =0xffffff00 ldr r2, [sp, 0xC] ands r2, r4 lsrs r0, 16 - ldr r3, _0801FEA0 + ldr r3, =0xffff00ff ands r2, r3 orrs r2, r0 lsrs r1, 8 - ldr r0, _0801FEA4 + ldr r0, =0xff00ffff ands r2, r0 orrs r2, r1 - ldr r0, _0801FEA8 + ldr r0, =0x00ffffff ands r2, r0 movs r0, 0xC0 lsls r0, 19 @@ -65922,7 +64379,7 @@ sub_801FDDC: @ 801FDDC movs r1, 0xE0 lsls r1, 4 orrs r0, r1 - ldr r1, _0801FEAC + ldr r1, =0x0000ffff ands r0, r1 movs r1, 0xA4 lsls r1, 15 @@ -65931,7 +64388,7 @@ sub_801FDDC: @ 801FDDC add r0, sp, 0xC bl Window_AddFromTemplate adds r1, r0, 0 - ldr r5, _0801FEB0 + ldr r5, =0x02022c88 ldr r0, [r5] movs r6, 0 strh r1, [r0, 0x18] @@ -65948,7 +64405,7 @@ sub_801FDDC: @ 801FDDC bl Window_WriteStandardTileMap ldr r0, [r5] ldrb r0, [r0, 0x18] - ldr r2, _0801FEB4 + ldr r2, =0x085eae62 movs r1, 0x1 str r1, [sp] movs r4, 0xFF @@ -65958,7 +64415,7 @@ sub_801FDDC: @ 801FDDC bl Print ldr r0, [r5] ldrb r0, [r0, 0x18] - ldr r2, _0801FEB8 + ldr r2, =0x085eae66 movs r1, 0x11 str r1, [sp] str r4, [sp, 0x4] @@ -65982,20 +64439,13 @@ _0801FE94: pop {r0} bx r0 .align 2, 0 -_0801FE9C: .4byte 0xffffff00 -_0801FEA0: .4byte 0xffff00ff -_0801FEA4: .4byte 0xff00ffff -_0801FEA8: .4byte 0x00ffffff -_0801FEAC: .4byte 0x0000ffff -_0801FEB0: .4byte 0x02022c88 -_0801FEB4: .4byte 0x085eae62 -_0801FEB8: .4byte 0x085eae66 + .pool thumb_func_end sub_801FDDC thumb_func_start sub_801FEBC sub_801FEBC: @ 801FEBC push {r4,lr} - ldr r4, _0801FEE0 + ldr r4, =0x02022c88 ldr r0, [r4] ldrh r0, [r0, 0x18] cmp r0, 0xFF @@ -66012,13 +64462,13 @@ _0801FEDA: pop {r0} bx r0 .align 2, 0 -_0801FEE0: .4byte 0x02022c88 + .pool thumb_func_end sub_801FEBC thumb_func_start sub_801FEE4 sub_801FEE4: @ 801FEE4 push {r4,lr} - ldr r4, _0801FF04 + ldr r4, =0x02022c88 ldr r0, [r4] ldrh r0, [r0, 0x18] cmp r0, 0xFF @@ -66034,7 +64484,7 @@ _0801FEFE: pop {r0} bx r0 .align 2, 0 -_0801FF04: .4byte 0x02022c88 + .pool thumb_func_end sub_801FEE4 thumb_func_start sub_801FF08 @@ -66058,20 +64508,20 @@ sub_801FF18: @ 801FF18 lsls r1, 16 lsrs r1, 16 mov r9, r1 - ldr r1, _0801FFC4 + ldr r1, =0xffffff00 ldr r3, [sp, 0x14] ands r3, r1 - ldr r2, _0801FFC8 + ldr r2, =0xffff00ff ands r3, r2 movs r0, 0x80 lsls r0, 4 orrs r3, r0 - ldr r0, _0801FFCC + ldr r0, =0xff00ffff ands r3, r0 movs r0, 0x80 lsls r0, 13 orrs r3, r0 - ldr r5, _0801FFD0 + ldr r5, =0x00ffffff ands r3, r5 movs r0, 0xA8 lsls r0, 21 @@ -66085,13 +64535,13 @@ sub_801FF18: @ 801FF18 movs r1, 0xE0 lsls r1, 4 orrs r0, r1 - ldr r1, _0801FFD4 + ldr r1, =0x0000ffff ands r0, r1 movs r1, 0xD4 lsls r1, 15 orrs r0, r1 str r0, [sp, 0x18] - ldr r1, _0801FFD8 + ldr r1, =0x082f2d40 lsls r0, r7, 1 adds r0, r7 lsls r0, 2 @@ -66116,7 +64566,7 @@ sub_801FF18: @ 801FF18 _0801FF98: add r0, sp, 0x14 bl Window_AddFromTemplate - ldr r5, _0801FFDC + ldr r5, =0x02022c88 ldr r1, [r5] strh r0, [r1, 0x1E] ldrh r0, [r1, 0x1E] @@ -66135,13 +64585,7 @@ _0801FF98: adds r6, 0x22 b _0801FFE2 .align 2, 0 -_0801FFC4: .4byte 0xffffff00 -_0801FFC8: .4byte 0xffff00ff -_0801FFCC: .4byte 0xff00ffff -_0801FFD0: .4byte 0x00ffffff -_0801FFD4: .4byte 0x0000ffff -_0801FFD8: .4byte 0x082f2d40 -_0801FFDC: .4byte 0x02022c88 + .pool _0801FFE0: ldr r6, [r4] _0801FFE2: @@ -66158,7 +64602,7 @@ _0801FFE2: bl Window_FastFillPixels adds r0, r5, 0 bl Window_WriteStandardTileMap - ldr r1, _0802004C + ldr r1, =0x082f2d40 lsls r0, r7, 1 adds r0, r7 lsls r0, 2 @@ -66193,7 +64637,7 @@ _0801FFE2: bl sub_8199F74 b _0802007A .align 2, 0 -_0802004C: .4byte 0x082f2d40 + .pool _08020050: adds r0, r5, 0 movs r1, 0xA @@ -66215,7 +64659,7 @@ _08020050: adds r2, r6, 0 bl sub_8199F74 _0802007A: - ldr r0, _08020090 + ldr r0, =0x02022c88 ldr r0, [r0] mov r1, r8 strh r1, [r0, 0x1E] @@ -66228,13 +64672,13 @@ _08020082: pop {r0} bx r0 .align 2, 0 -_08020090: .4byte 0x02022c88 + .pool thumb_func_end sub_801FF18 thumb_func_start sub_8020094 sub_8020094: @ 8020094 push {r4,lr} - ldr r4, _080200C4 + ldr r4, =0x02022c88 ldr r0, [r4] ldrh r0, [r0, 0x1E] cmp r0, 0xFF @@ -66255,13 +64699,13 @@ _080200B2: pop {r0} bx r0 .align 2, 0 -_080200C4: .4byte 0x02022c88 + .pool thumb_func_end sub_8020094 thumb_func_start sub_80200C8 sub_80200C8: @ 80200C8 push {r4,lr} - ldr r4, _080200E8 + ldr r4, =0x02022c88 ldr r0, [r4] ldrh r0, [r0, 0x1E] cmp r0, 0xFF @@ -66277,7 +64721,7 @@ _080200E2: pop {r0} bx r0 .align 2, 0 -_080200E8: .4byte 0x02022c88 + .pool thumb_func_end sub_80200C8 thumb_func_start sub_80200EC @@ -66414,7 +64858,7 @@ _080201EC: movs r7, 0 movs r6, 0 lsls r0, r2, 2 - ldr r1, _0802023C + ldr r1, =0x082f2ba8 adds r0, r2 lsls r0, 3 adds r4, r0, r1 @@ -66452,7 +64896,7 @@ _08020206: ble _080201FE b _0802030C .align 2, 0 -_0802023C: .4byte 0x082f2ba8 + .pool _08020240: movs r1, 0x4 str r1, [sp, 0x40] @@ -66539,7 +64983,7 @@ _080202AC: movs r1, 0x1 negs r1, r1 str r1, [sp, 0x4] - ldr r0, _0802031C + ldr r0, =0x082f2dc4 str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0 @@ -66562,13 +65006,13 @@ _0802030C: pop {r0} bx r0 .align 2, 0 -_0802031C: .4byte 0x082f2dc4 + .pool thumb_func_end sub_80201A4 thumb_func_start sub_8020320 sub_8020320: @ 8020320 push {r4,lr} - ldr r1, _08020344 + ldr r1, =0x02022c88 ldr r2, [r1] ldrh r3, [r2, 0x20] movs r4, 0x20 @@ -66586,7 +65030,7 @@ sub_8020320: @ 8020320 strh r0, [r2, 0x20] b _08020354 .align 2, 0 -_08020344: .4byte 0x02022c88 + .pool _08020348: movs r1, 0x20 ldrsh r0, [r2, r1] @@ -66608,7 +65052,7 @@ _08020360: thumb_func_start sub_8020368 sub_8020368: @ 8020368 push {r4,lr} - ldr r1, _0802038C + ldr r1, =0x02022c88 ldr r2, [r1] ldrh r3, [r2, 0x20] movs r4, 0x20 @@ -66625,7 +65069,7 @@ sub_8020368: @ 8020368 strh r0, [r2, 0x20] b _0802039C .align 2, 0 -_0802038C: .4byte 0x02022c88 + .pool _08020390: movs r1, 0x20 ldrsh r0, [r2, r1] @@ -66659,7 +65103,7 @@ sub_80203B0: @ 80203B0 str r5, [sp] movs r4, 0x5 str r4, [sp, 0x4] - ldr r0, _08020408 + ldr r0, =0x082f2dc8 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x2 @@ -66684,7 +65128,7 @@ sub_80203B0: @ 80203B0 pop {r0} bx r0 .align 2, 0 -_08020408: .4byte 0x082f2dc8 + .pool thumb_func_end sub_80203B0 thumb_func_start sub_802040C @@ -66806,7 +65250,7 @@ sub_8020480: @ 8020480 lsls r1, 6 movs r0, 0 bl lcd_io_set_bits - ldr r1, _08020534 + ldr r1, =0x000040f0 movs r0, 0x40 bl lcd_io_set movs r0, 0x44 @@ -66821,13 +65265,13 @@ sub_8020480: @ 8020480 pop {r0} bx r0 .align 2, 0 -_08020534: .4byte 0x000040f0 + .pool thumb_func_end sub_8020480 thumb_func_start sub_8020538 sub_8020538: @ 8020538 push {r4,lr} - ldr r4, _08020574 + ldr r4, =0x02022c88 ldr r1, [r4] movs r0, 0x94 lsls r0, 1 @@ -66835,17 +65279,17 @@ sub_8020538: @ 8020538 movs r0, 0 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _08020578 + ldr r0, =0x00000928 adds r1, r0 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _0802057C + ldr r0, =0x00001128 adds r1, r0 movs r0, 0x3 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _08020580 + ldr r0, =0x00001928 adds r1, r0 movs r0, 0x2 bl bg_set_tilemap @@ -66853,10 +65297,7 @@ sub_8020538: @ 8020538 pop {r0} bx r0 .align 2, 0 -_08020574: .4byte 0x02022c88 -_08020578: .4byte 0x00000928 -_0802057C: .4byte 0x00001128 -_08020580: .4byte 0x00001928 + .pool thumb_func_end sub_8020538 thumb_func_start sub_8020584 @@ -66888,22 +65329,22 @@ sub_8020584: @ 8020584 sub_80205B4: @ 80205B4 push {lr} sub sp, 0x4 - ldr r0, _080205F4 + ldr r0, =0x08dd4bd0 movs r1, 0x70 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _080205F8 + ldr r0, =0x08dd4bb0 movs r1, 0xC0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _080205FC + ldr r1, =0x08dd4bf0 movs r0, 0 str r0, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _08020600 + ldr r1, =0x08dd4c4c movs r0, 0x1 movs r2, 0 movs r3, 0 @@ -66914,21 +65355,18 @@ sub_80205B4: @ 80205B4 pop {r0} bx r0 .align 2, 0 -_080205F4: .4byte 0x08dd4bd0 -_080205F8: .4byte 0x08dd4bb0 -_080205FC: .4byte 0x08dd4bf0 -_08020600: .4byte 0x08dd4c4c + .pool thumb_func_end sub_80205B4 thumb_func_start task_tutorial_story_unknown task_tutorial_story_unknown: @ 8020604 push {r4,r5,lr} sub sp, 0x4 - ldr r0, _08020668 + ldr r0, =0x08dd4860 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _0802066C + ldr r1, =0x08dd4880 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -66941,9 +65379,9 @@ task_tutorial_story_unknown: @ 8020604 movs r1, 0x88 lsls r1, 2 adds r0, r5, r1 - ldr r4, _08020670 + ldr r4, =0x02022c88 ldr r1, [r4] - ldr r2, _08020674 + ldr r2, =0x00002128 adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -66951,12 +65389,12 @@ task_tutorial_story_unknown: @ 8020604 lsls r1, 3 adds r0, r5, r1 ldr r1, [r4] - ldr r2, _08020678 + ldr r2, =0x00002148 adds r1, r2 movs r2, 0x8 bl CpuFastSet _0802064E: - ldr r1, _0802067C + ldr r1, =0x08dd4ab8 movs r0, 0x2 movs r2, 0 movs r3, 0 @@ -66968,22 +65406,17 @@ _0802064E: pop {r0} bx r0 .align 2, 0 -_08020668: .4byte 0x08dd4860 -_0802066C: .4byte 0x08dd4880 -_08020670: .4byte 0x02022c88 -_08020674: .4byte 0x00002128 -_08020678: .4byte 0x00002148 -_0802067C: .4byte 0x08dd4ab8 + .pool thumb_func_end task_tutorial_story_unknown thumb_func_start sub_8020680 sub_8020680: @ 8020680 push {lr} - ldr r0, _0802069C + ldr r0, =0x082f2c20 movs r1, 0x80 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _080206A0 + ldr r1, =0x06004020 movs r0, 0 movs r2, 0x20 movs r3, 0x1 @@ -66991,14 +65424,13 @@ sub_8020680: @ 8020680 pop {r0} bx r0 .align 2, 0 -_0802069C: .4byte 0x082f2c20 -_080206A0: .4byte 0x06004020 + .pool thumb_func_end sub_8020680 thumb_func_start sub_80206A4 sub_80206A4: @ 80206A4 push {lr} - ldr r0, _080206CC + ldr r0, =0x082f2c40 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -67013,7 +65445,7 @@ sub_80206A4: @ 80206A4 pop {r0} bx r0 .align 2, 0 -_080206CC: .4byte 0x082f2c40 + .pool thumb_func_end sub_80206A4 thumb_func_start sub_80206D0 @@ -67040,9 +65472,9 @@ sub_80206E8: @ 80206E8 strb r0, [r1, 0x1] movs r4, 0 _080206F8: - ldr r0, _08020738 + ldr r0, =0x02022c88 ldr r1, [r0] - ldr r0, _0802073C + ldr r0, =0x00002128 adds r1, r0 lsls r2, r4, 19 lsrs r2, 16 @@ -67069,8 +65501,7 @@ _080206F8: pop {r0} bx r0 .align 2, 0 -_08020738: .4byte 0x02022c88 -_0802073C: .4byte 0x00002128 + .pool thumb_func_end sub_80206E8 thumb_func_start sub_8020740 @@ -67087,23 +65518,23 @@ sub_8020740: @ 8020740 movs r1, 0xA movs r2, 0x20 bl box_border_load_tiles_and_pal - ldr r0, _0802076C + ldr r0, =0x0860f074 movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply pop {r0} bx r0 .align 2, 0 -_0802076C: .4byte 0x0860f074 + .pool thumb_func_end sub_8020740 thumb_func_start sub_8020770 sub_8020770: @ 8020770 push {lr} sub sp, 0x10 - ldr r0, _080207AC + ldr r0, =0xa2600001 str r0, [sp, 0x4] - ldr r0, _080207B0 + ldr r0, =0x04000014 str r0, [sp] mov r2, sp movs r1, 0 @@ -67111,13 +65542,13 @@ sub_8020770: @ 8020770 strb r0, [r2, 0x8] mov r0, sp strb r1, [r0, 0x9] - ldr r0, _080207B4 + ldr r0, =0x02022c88 ldr r0, [r0] strh r1, [r0, 0x20] str r1, [sp, 0xC] add r0, sp, 0xC - ldr r1, _080207B8 - ldr r2, _080207BC + ldr r1, =0x02038c28 + ldr r2, =0x010003c0 bl CpuFastSet ldr r0, [sp] ldr r1, [sp, 0x4] @@ -67127,11 +65558,7 @@ sub_8020770: @ 8020770 pop {r0} bx r0 .align 2, 0 -_080207AC: .4byte 0xa2600001 -_080207B0: .4byte 0x04000014 -_080207B4: .4byte 0x02022c88 -_080207B8: .4byte 0x02038c28 -_080207BC: .4byte 0x010003c0 + .pool thumb_func_end sub_8020770 thumb_func_start sub_80207C0 @@ -67142,14 +65569,14 @@ sub_80207C0: @ 80207C0 lsrs r0, 16 mov r1, sp strh r0, [r1] - ldr r5, _08020808 + ldr r5, =0x02039b28 ldrb r0, [r5, 0x14] lsls r1, r0, 4 subs r1, r0 lsls r1, 7 - ldr r4, _0802080C + ldr r4, =0x02038c28 adds r1, r4 - ldr r2, _08020810 + ldr r2, =0x01000090 mov r0, sp bl CpuSet mov r0, sp @@ -67164,17 +65591,14 @@ sub_80207C0: @ 80207C0 lsls r2, 1 adds r4, r2 adds r1, r4 - ldr r2, _08020814 + ldr r2, =0x01000010 bl CpuSet add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08020808: .4byte 0x02039b28 -_0802080C: .4byte 0x02038c28 -_08020810: .4byte 0x01000090 -_08020814: .4byte 0x01000010 + .pool thumb_func_end sub_80207C0 thumb_func_start sub_8020818 @@ -67189,8 +65613,8 @@ sub_8020818: @ 8020818 lsrs r4, 16 mov r0, sp strh r4, [r0] - ldr r5, _08020884 - ldr r0, _08020888 + ldr r5, =0x02038c28 + ldr r0, =0x01000090 mov r9, r0 mov r0, sp adds r1, r5, 0 @@ -67203,7 +65627,7 @@ sub_8020818: @ 8020818 movs r2, 0x90 lsls r2, 1 adds r1, r5, r2 - ldr r2, _0802088C + ldr r2, =0x01000010 mov r8, r2 bl CpuSet add r0, sp, 0x4 @@ -67230,16 +65654,14 @@ sub_8020818: @ 8020818 pop {r0} bx r0 .align 2, 0 -_08020884: .4byte 0x02038c28 -_08020888: .4byte 0x01000090 -_0802088C: .4byte 0x01000010 + .pool thumb_func_end sub_8020818 thumb_func_start sub_8020890 sub_8020890: @ 8020890 push {r4,r5,lr} movs r5, 0 - ldr r4, _080208BC + ldr r4, =0x082f3134 _08020896: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load @@ -67247,9 +65669,9 @@ _08020896: adds r5, 0x1 cmp r5, 0x4 bls _08020896 - ldr r0, _080208C0 + ldr r0, =0x082f315c bl gpu_pal_obj_alloc_tag_and_apply - ldr r4, _080208C4 + ldr r4, =0x02022c8c movs r0, 0x18 bl malloc str r0, [r4] @@ -67258,9 +65680,7 @@ _08020896: movs r0, 0x1 b _080208CA .align 2, 0 -_080208BC: .4byte 0x082f3134 -_080208C0: .4byte 0x082f315c -_080208C4: .4byte 0x02022c8c + .pool _080208C8: movs r0, 0 _080208CA: @@ -67272,7 +65692,7 @@ _080208CA: thumb_func_start sub_80208D0 sub_80208D0: @ 80208D0 push {lr} - ldr r0, _080208E4 + ldr r0, =0x02022c8c ldr r0, [r0] cmp r0, 0 beq _080208DE @@ -67281,38 +65701,36 @@ _080208DE: pop {r0} bx r0 .align 2, 0 -_080208E4: .4byte 0x02022c8c + .pool thumb_func_end sub_80208D0 thumb_func_start sub_80208E8 sub_80208E8: @ 80208E8 push {lr} - ldr r0, _08020910 + ldr r0, =0x082f319c movs r1, 0xA movs r2, 0x18 movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _08020914 + ldr r1, =0x02022c8c ldr r2, [r1] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08020918 + ldr r0, =0x02020630 adds r1, r0 str r1, [r2] pop {r0} bx r0 .align 2, 0 -_08020910: .4byte 0x082f319c -_08020914: .4byte 0x02022c8c -_08020918: .4byte 0x02020630 + .pool thumb_func_end sub_80208E8 thumb_func_start sub_802091C sub_802091C: @ 802091C - ldr r1, _08020938 + ldr r1, =0x02022c8c ldr r1, [r1] ldr r2, [r1] adds r2, 0x3E @@ -67327,7 +65745,7 @@ sub_802091C: @ 802091C strb r1, [r2] bx lr .align 2, 0 -_08020938: .4byte 0x02022c8c + .pool thumb_func_end sub_802091C thumb_func_start sub_802093C @@ -67345,7 +65763,7 @@ sub_802093C: @ 802093C bl sub_801F0BC cmp r4, 0x3 beq _0802097C - ldr r4, _08020978 + ldr r4, =0x02022c8c ldr r0, [r4] ldr r0, [r0] movs r1, 0 @@ -67360,9 +65778,9 @@ sub_802093C: @ 802093C ldr r2, [r1] b _08020992 .align 2, 0 -_08020978: .4byte 0x02022c8c + .pool _0802097C: - ldr r4, _080209A8 + ldr r4, =0x02022c8c ldr r0, [r4] ldr r0, [r0] movs r1, 0x2 @@ -67384,7 +65802,7 @@ _08020992: pop {r0} bx r0 .align 2, 0 -_080209A8: .4byte 0x02022c8c + .pool thumb_func_end sub_802093C thumb_func_start sub_80209AC @@ -67392,14 +65810,14 @@ sub_80209AC: @ 80209AC push {r4,lr} adds r4, r0, 0 lsls r4, 2 - ldr r0, _080209D8 + ldr r0, =0x082f2df2 adds r4, r0 movs r0, 0 bl gpu_pal_tags_index_of adds r1, r0, 0 lsls r1, 24 lsrs r1, 4 - ldr r0, _080209DC + ldr r0, =0x01010000 adds r1, r0 lsrs r1, 16 adds r0, r4, 0 @@ -67409,8 +65827,7 @@ sub_80209AC: @ 80209AC pop {r0} bx r0 .align 2, 0 -_080209D8: .4byte 0x082f2df2 -_080209DC: .4byte 0x01010000 + .pool thumb_func_end sub_80209AC thumb_func_start sub_80209E0 @@ -67421,35 +65838,35 @@ sub_80209E0: @ 80209E0 lsrs r0, 24 cmp r0, 0x3 beq _08020A00 - ldr r0, _080209FC + ldr r0, =0x02022c8c ldr r0, [r0] ldr r0, [r0] movs r1, 0x1 bl obj_anim_image_start b _08020A0C .align 2, 0 -_080209FC: .4byte 0x02022c8c + .pool _08020A00: - ldr r0, _08020A18 + ldr r0, =0x02022c8c ldr r0, [r0] ldr r0, [r0] movs r1, 0x3 bl obj_anim_image_start _08020A0C: - ldr r0, _08020A18 + ldr r0, =0x02022c8c ldr r1, [r0] movs r0, 0 strh r0, [r1, 0x14] pop {r0} bx r0 .align 2, 0 -_08020A18: .4byte 0x02022c8c + .pool thumb_func_end sub_80209E0 thumb_func_start sub_8020A1C sub_8020A1C: @ 8020A1C push {r4,lr} - ldr r4, _08020A2C + ldr r4, =0x02022c8c ldr r1, [r4] ldrh r0, [r1, 0x14] cmp r0, 0x3 @@ -67458,7 +65875,7 @@ _08020A28: movs r0, 0 b _08020A62 .align 2, 0 -_08020A2C: .4byte 0x02022c8c + .pool _08020A30: adds r0, 0x1 strh r0, [r1, 0x14] @@ -67493,22 +65910,22 @@ _08020A62: thumb_func_start sub_8020A68 sub_8020A68: @ 8020A68 push {r4,r5,lr} - ldr r0, _08020AAC + ldr r0, =0x082f31bc movs r1, 0x4C movs r2, 0x98 movs r3, 0x2 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r5, _08020AB0 + ldr r5, =0x02022c8c ldr r2, [r5] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, _08020AB4 + ldr r4, =0x02020630 adds r1, r4 str r1, [r2, 0x8] - ldr r0, _08020AB8 + ldr r0, =0x082f31d4 movs r1, 0x40 movs r2, 0x98 movs r3, 0x1 @@ -67525,10 +65942,7 @@ sub_8020A68: @ 8020A68 pop {r0} bx r0 .align 2, 0 -_08020AAC: .4byte 0x082f31bc -_08020AB0: .4byte 0x02022c8c -_08020AB4: .4byte 0x02020630 -_08020AB8: .4byte 0x082f31d4 + .pool thumb_func_end sub_8020A68 thumb_func_start sub_8020ABC @@ -67592,22 +66006,22 @@ _08020B1A: thumb_func_start sub_8020B20 sub_8020B20: @ 8020B20 push {r4,r5,lr} - ldr r0, _08020B70 + ldr r0, =0x082f322c movs r1, 0x8 movs r2, 0x98 movs r3, 0x3 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r5, _08020B74 + ldr r5, =0x02022c8c ldr r2, [r5] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, _08020B78 + ldr r4, =0x02020630 adds r1, r4 str r1, [r2, 0xC] - ldr r0, _08020B7C + ldr r0, =0x082f3244 movs r1, 0x20 movs r2, 0x98 movs r3, 0x4 @@ -67629,10 +66043,7 @@ sub_8020B20: @ 8020B20 pop {r0} bx r0 .align 2, 0 -_08020B70: .4byte 0x082f322c -_08020B74: .4byte 0x02022c8c -_08020B78: .4byte 0x02020630 -_08020B7C: .4byte 0x082f3244 + .pool thumb_func_end sub_8020B20 thumb_func_start sub_8020B80 @@ -67646,7 +66057,7 @@ sub_8020B80: @ 8020B80 bl sub_801F0DC cmp r0, 0 beq _08020BC2 - ldr r3, _08020BB4 + ldr r3, =0x02022c8c ldr r0, [r3] ldr r1, [r0, 0x10] adds r1, 0x3E @@ -67661,14 +66072,14 @@ sub_8020B80: @ 8020B80 bl obj_anim_image_start b _08020BF6 .align 2, 0 -_08020BB4: .4byte 0x02022c8c + .pool _08020BB8: bl sub_801F1A4 adds r4, r0, 0 cmp r4, 0x3 bne _08020BD8 _08020BC2: - ldr r0, _08020BD4 + ldr r0, =0x02022c8c ldr r0, [r0] ldr r1, [r0, 0x10] adds r1, 0x3E @@ -67678,9 +66089,9 @@ _08020BC2: strb r0, [r1] b _08020BF6 .align 2, 0 -_08020BD4: .4byte 0x02022c8c + .pool _08020BD8: - ldr r3, _08020BFC + ldr r3, =0x02022c8c ldr r0, [r3] ldr r1, [r0, 0x10] adds r1, 0x3E @@ -67699,30 +66110,30 @@ _08020BF6: pop {r0} bx r0 .align 2, 0 -_08020BFC: .4byte 0x02022c8c + .pool thumb_func_end sub_8020B80 thumb_func_start sub_8020C00 sub_8020C00: @ 8020C00 - ldr r0, _08020C08 + ldr r0, =0x02022c90 ldr r0, [r0] bx lr .align 2, 0 -_08020C08: .4byte 0x02022c90 + .pool thumb_func_end sub_8020C00 thumb_func_start sub_8020C0C sub_8020C0C: @ 8020C0C push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08020C1C + ldr r5, =0x02022c90 ldr r0, [r5] cmp r0, 0 bne _08020C20 movs r0, 0x2 b _08020C5C .align 2, 0 -_08020C1C: .4byte 0x02022c90 + .pool _08020C20: cmp r4, 0 bne _08020C26 @@ -67736,10 +66147,10 @@ _08020C26: str r0, [r5] adds r0, r4, 0 bl set_callback2 - ldr r0, _08020C64 + ldr r0, =c2_exit_to_overworld_2_switch + 1 cmp r4, r0 bne _08020C5A - ldr r2, _08020C68 + ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 @@ -67747,7 +66158,7 @@ _08020C26: movs r0, 0xC8 lsls r0, 1 bl current_map_music_set - ldr r0, _08020C6C + ldr r0, =c1_overworld + 1 bl set_callback1 _08020C5A: movs r0, 0 @@ -67756,9 +66167,7 @@ _08020C5C: pop {r1} bx r1 .align 2, 0 -_08020C64: .4byte c2_exit_to_overworld_2_switch + 1 -_08020C68: .4byte 0x03003014 -_08020C6C: .4byte c1_overworld + 1 + .pool thumb_func_end sub_8020C0C thumb_func_start sub_8020C70 @@ -67770,26 +66179,24 @@ sub_8020C70: @ 8020C70 adds r4, r0, 0 movs r0, 0 mov r8, r0 - ldr r0, _08020CA0 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08020C8E - ldr r0, _08020CA4 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _08020CAC _08020C8E: adds r0, r4, 0 bl set_callback2 - ldr r0, _08020CA8 + ldr r0, =0x03005000 mov r1, r8 strh r1, [r0, 0x10] strh r1, [r0, 0x12] b _08020CF8 .align 2, 0 -_08020CA0: .4byte 0x03003124 -_08020CA4: .4byte 0x030030fc -_08020CA8: .4byte 0x03005000 + .pool _08020CAC: bl sub_8009FCC lsls r0, 24 @@ -67806,16 +66213,16 @@ _08020CAC: _08020CC8: adds r0, r4, 0 bl set_callback2 - ldr r0, _08020CD8 + ldr r0, =0x03005000 movs r1, 0 strh r1, [r0, 0x10] strh r1, [r0, 0x12] b _08020CF8 .align 2, 0 -_08020CD8: .4byte 0x03005000 + .pool _08020CDC: - ldr r6, _08020D04 - ldr r0, _08020D08 + ldr r6, =0x02022c90 + ldr r0, =0x000041c0 bl malloc_and_clear adds r5, r0, 0 str r5, [r6] @@ -67823,7 +66230,7 @@ _08020CDC: bne _08020D10 adds r0, r4, 0 bl set_callback2 - ldr r0, _08020D0C + ldr r0, =0x03005000 strh r5, [r0, 0x10] strh r5, [r0, 0x12] _08020CF8: @@ -67833,9 +66240,7 @@ _08020CF8: strb r1, [r0] b _08020D74 .align 2, 0 -_08020D04: .4byte 0x02022c90 -_08020D08: .4byte 0x000041c0 -_08020D0C: .4byte 0x03005000 + .pool _08020D10: str r4, [r5] movs r4, 0 @@ -67869,14 +66274,14 @@ _08020D10: movs r0, 0x4 movs r1, 0x1 bl sub_8022BEC - ldr r0, _08020D80 + ldr r0, =sub_8020F88 + 1 bl set_callback2 - ldr r0, _08020D84 + ldr r0, =sub_8020FA0 + 1 movs r1, 0x8 bl AddTask ldr r1, [r6] strb r0, [r1, 0xA] - ldr r2, _08020D88 + ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x5 negs r0, r0 @@ -67890,16 +66295,14 @@ _08020D74: pop {r0} bx r0 .align 2, 0 -_08020D80: .4byte sub_8020F88 + 1 -_08020D84: .4byte sub_8020FA0 + 1 -_08020D88: .4byte 0x03003014 + .pool thumb_func_end sub_8020C70 thumb_func_start sub_8020D8C sub_8020D8C: @ 8020D8C push {r4,lr} sub sp, 0xC - ldr r1, _08020DA4 + ldr r1, =0x0203ce7c ldrh r0, [r1] subs r0, 0x85 lsls r0, 16 @@ -67910,18 +66313,18 @@ sub_8020D8C: @ 8020D8C strh r0, [r1] b _08020DB0 .align 2, 0 -_08020DA4: .4byte 0x0203ce7c + .pool _08020DA8: ldrh r0, [r1] movs r1, 0x1 bl sub_80D6AA4 _08020DB0: - ldr r4, _08020E0C + ldr r4, =0x02022c90 ldr r2, [r4] ldrb r0, [r2, 0x8] lsls r0, 5 adds r0, r2, r0 - ldr r1, _08020E10 + ldr r1, =0x0203ce7c ldrh r1, [r1] subs r1, 0x85 adds r0, 0xA4 @@ -67947,49 +66350,45 @@ _08020DB0: movs r0, 0x4 movs r1, 0x1 bl sub_8022BEC - ldr r0, _08020E14 + ldr r0, =sub_8020FA0 + 1 movs r1, 0x8 bl AddTask ldr r1, [r4] strb r0, [r1, 0xA] - ldr r0, _08020E18 + ldr r0, =sub_8020F88 + 1 bl set_callback2 add sp, 0xC pop {r4} pop {r0} bx r0 .align 2, 0 -_08020E0C: .4byte 0x02022c90 -_08020E10: .4byte 0x0203ce7c -_08020E14: .4byte sub_8020FA0 + 1 -_08020E18: .4byte sub_8020F88 + 1 + .pool thumb_func_end sub_8020D8C thumb_func_start sub_8020E1C sub_8020E1C: @ 8020E1C push {lr} - ldr r0, _08020E34 + ldr r0, =0x02022c90 ldr r0, [r0] ldrb r0, [r0, 0xA] bl remove_task - ldr r0, _08020E38 + ldr r0, =sub_8020D8C + 1 bl sub_81AABF0 pop {r0} bx r0 .align 2, 0 -_08020E34: .4byte 0x02022c90 -_08020E38: .4byte sub_8020D8C + 1 + .pool thumb_func_end sub_8020E1C thumb_func_start sub_8020E3C sub_8020E3C: @ 8020E3C push {lr} - ldr r0, _08020E48 + ldr r0, =sub_8020F74 + 1 bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 -_08020E48: .4byte sub_8020F74 + 1 + .pool thumb_func_end sub_8020E3C thumb_func_start sub_8020E4C @@ -68004,7 +66403,7 @@ sub_8020E4C: @ 8020E4C thumb_func_start sub_8020E58 sub_8020E58: @ 8020E58 push {r4-r6,lr} - ldr r4, _08020E9C + ldr r4, =0x02022c90 ldr r0, [r4] adds r0, 0x6C ldrh r2, [r0] @@ -68022,7 +66421,7 @@ sub_8020E58: @ 8020E58 adds r1, r2, 0 bl sub_81515FC adds r3, r0, 0 - ldr r0, _08020EA0 + ldr r0, =0x0000ffff ands r3, r0 ldr r2, [r4] strh r3, [r2, 0x16] @@ -68035,8 +66434,7 @@ sub_8020E58: @ 8020E58 beq _08020EAE b _08020F48 .align 2, 0 -_08020E9C: .4byte 0x02022c90 -_08020EA0: .4byte 0x0000ffff + .pool _08020EA4: cmp r0, 0x4 beq _08020EEC @@ -68044,7 +66442,7 @@ _08020EA4: beq _08020F20 b _08020F48 _08020EAE: - ldr r5, _08020ED8 + ldr r5, =0x03005d90 ldr r1, [r5] movs r0, 0xF6 lsls r0, 1 @@ -68066,17 +66464,17 @@ _08020EAE: lsls r2, 1 b _08020F14 .align 2, 0 -_08020ED8: .4byte 0x03005d90 + .pool _08020EDC: - ldr r5, _08020EE8 + ldr r5, =0x03005d90 ldr r0, [r5] movs r6, 0xF7 lsls r6, 1 b _08020F28 .align 2, 0 -_08020EE8: .4byte 0x03005d90 + .pool _08020EEC: - ldr r5, _08020F1C + ldr r5, =0x03005d90 ldr r1, [r5] movs r0, 0xF8 lsls r0, 1 @@ -68101,9 +66499,9 @@ _08020F14: strh r1, [r0] b _08020F48 .align 2, 0 -_08020F1C: .4byte 0x03005d90 + .pool _08020F20: - ldr r5, _08020F6C + ldr r5, =0x03005d90 ldr r0, [r5] movs r6, 0xF9 lsls r6, 1 @@ -68125,7 +66523,7 @@ _08020F28: adds r1, r6 strh r0, [r1] _08020F48: - ldr r4, _08020F70 + ldr r4, =0x02022c90 ldr r1, [r4] ldr r0, [r1, 0x68] str r0, [r1, 0x1C] @@ -68144,8 +66542,7 @@ _08020F66: pop {r0} bx r0 .align 2, 0 -_08020F6C: .4byte 0x03005d90 -_08020F70: .4byte 0x02022c90 + .pool thumb_func_end sub_8020E58 thumb_func_start sub_8020F74 @@ -68172,7 +66569,7 @@ sub_8020F88: @ 8020F88 thumb_func_start sub_8020FA0 sub_8020FA0: @ 8020FA0 push {r4,lr} - ldr r4, _08020FC0 + ldr r4, =0x02022c90 ldr r0, [r4] ldr r2, [r0, 0x4] cmp r2, 0 @@ -68187,7 +66584,7 @@ _08020FB4: pop {r0} bx r0 .align 2, 0 -_08020FC0: .4byte 0x02022c90 + .pool thumb_func_end sub_8020FA0 thumb_func_start sub_8020FC4 @@ -68203,7 +66600,7 @@ _08020FCC: lsls r1, r5, 3 subs r1, r5 lsls r1, 2 - ldr r2, _0802102C + ldr r2, =0x020229f0 adds r1, r2 bl gf_strcpy adds r0, r5, 0x1 @@ -68233,7 +66630,7 @@ _08020FF0: cmp r5, 0x4 bls _08020FF0 _08021012: - ldr r0, _08021030 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x14] lsls r0, 29 @@ -68246,8 +66643,7 @@ _08021012: beq _0802103A b _08021046 .align 2, 0 -_0802102C: .4byte 0x020229f0 -_08021030: .4byte 0x03005d90 + .pool _08021034: cmp r0, 0x2 beq _08021042 @@ -68286,12 +66682,12 @@ _08021060: b _080212FC _08021068: lsls r0, 2 - ldr r1, _08021074 + ldr r1, =_08021078 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08021074: .4byte _08021078 + .pool .align 2, 0 _08021078: .4byte _080210A0 @@ -68321,16 +66717,15 @@ _080210BE: strh r4, [r0] movs r1, 0xE0 lsls r1, 19 - ldr r2, _080210DC + ldr r2, =0x01000200 bl CpuSet - ldr r0, _080210E0 + ldr r0, =0x0300301c strb r4, [r0] movs r0, 0x3 bl sub_8034C54 b _080212FC .align 2, 0 -_080210DC: .4byte 0x01000200 -_080210E0: .4byte 0x0300301c + .pool _080210E4: bl sub_80A1A74 bl reset_all_obj_data @@ -68339,7 +66734,7 @@ _080210E4: _080210F2: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08021174 + ldr r1, =0x082f32c8 movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -68390,7 +66785,7 @@ _080210F2: bl lcd_io_set b _080212FC .align 2, 0 -_08021174: .4byte 0x082f32c8 + .pool _08021178: movs r4, 0x20 str r4, [sp] @@ -68432,7 +66827,7 @@ _080211BE: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r1, _080211E8 + ldr r1, =0x08de34b8 movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -68441,7 +66836,7 @@ _080211BE: bl decompress_and_copy_tile_data_to_vram b _080212FC .align 2, 0 -_080211E8: .4byte 0x08de34b8 + .pool _080211EC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -68455,31 +66850,31 @@ _080211F8: bl sub_8022588 adds r0, r5, 0 bl sub_8022600 - ldr r0, _08021218 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x8] movs r2, 0x80 orrs r1, r2 strb r1, [r0, 0x8] b _080212FC .align 2, 0 -_08021218: .4byte 0x02037fd4 + .pool _0802121C: - ldr r0, _08021268 + ldr r0, =0x08de3398 movs r2, 0xC0 lsls r2, 1 movs r1, 0 bl gpu_pal_apply - ldr r1, _0802126C + ldr r1, =0x082f3c8c movs r0, 0x1 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r1, _08021270 + ldr r1, =0x082f3dbc movs r0, 0x2 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r1, _08021274 + ldr r1, =0x082f3f54 movs r0, 0x3 movs r2, 0 movs r3, 0 @@ -68494,10 +66889,7 @@ _0802121C: bl gpu_copy_wram_bg_tilemap_to_vram b _080212FC .align 2, 0 -_08021268: .4byte 0x08de3398 -_0802126C: .4byte 0x082f3c8c -_08021270: .4byte 0x082f3dbc -_08021274: .4byte 0x082f3f54 + .pool _08021278: bl sub_800E0E8 movs r0, 0 @@ -68505,7 +66897,7 @@ _08021278: bl sub_800DFB4 adds r0, r5, 0 bl sub_8022730 - ldr r0, _080212B0 + ldr r0, =0x02021bbe ldrh r1, [r0] negs r1, r1 lsls r1, 16 @@ -68522,9 +66914,9 @@ _08021278: bl bg_change_y_offset b _080212FC .align 2, 0 -_080212B0: .4byte 0x02021bbe + .pool _080212B4: - ldr r2, _080212F8 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -68552,7 +66944,7 @@ _080212B4: movs r0, 0x1 b _08021304 .align 2, 0 -_080212F8: .4byte 0x02037fd4 + .pool _080212FC: ldrb r0, [r5, 0xC] adds r0, 0x1 @@ -68584,12 +66976,12 @@ _08021320: b _0802143E _08021328: lsls r0, 2 - ldr r1, _08021334 + ldr r1, =_08021338 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08021334: .4byte _08021338 + .pool .align 2, 0 _08021338: .4byte _08021358 @@ -68714,7 +67106,7 @@ _08021446: sub_8021450: @ 8021450 push {r4,lr} adds r4, r0, 0 - ldr r0, _08021484 + ldr r0, =0x02021bbe ldrh r1, [r4, 0x2C] ldrh r2, [r4, 0x2A] adds r1, r2 @@ -68738,24 +67130,22 @@ _0802147C: pop {r1} bx r1 .align 2, 0 -_08021484: .4byte 0x02021bbe + .pool thumb_func_end sub_8021450 thumb_func_start sub_8021488 sub_8021488: @ 8021488 movs r1, 0 - ldr r2, _0802149C + ldr r2, =0x0000ff98 strh r2, [r0, 0x2A] strh r1, [r0, 0x2C] - ldr r0, _080214A0 + ldr r0, =0x02021bbc strh r1, [r0] - ldr r0, _080214A4 + ldr r0, =0x02021bbe strh r2, [r0] bx lr .align 2, 0 -_0802149C: .4byte 0x0000ff98 -_080214A0: .4byte 0x02021bbc -_080214A4: .4byte 0x02021bbe + .pool thumb_func_end sub_8021488 thumb_func_start sub_80214A8 @@ -68776,7 +67166,7 @@ sub_80214A8: @ 80214A8 bcc _080214C6 b _080215E4 _080214C6: - ldr r1, _080215F4 + ldr r1, =0x082f41e8 mov r2, r9 lsls r0, r2, 1 adds r0, r1 @@ -68789,7 +67179,7 @@ _080214C6: adds r3, 0x85 lsls r3, 16 lsrs r3, 16 - ldr r0, _080215F8 + ldr r0, =0x082f436c adds r1, r2, 0 bl sub_81AFF34 lsls r0, 24 @@ -68802,7 +67192,7 @@ _080214C6: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080215FC + ldr r0, =0x02020630 adds r1, r0 str r1, [r6] ldrb r0, [r1, 0x5] @@ -68825,7 +67215,7 @@ _080214C6: adds r0, 0x78 strh r0, [r1, 0x20] ldr r1, [r6] - ldr r0, _08021600 + ldr r0, =0x0000fff0 strh r0, [r1, 0x22] ldr r3, [r6] adds r5, r3, 0 @@ -68891,7 +67281,7 @@ _08021558: bl sub_81515D4 strh r0, [r5, 0xA] ldrh r0, [r5, 0xE] - ldr r2, _08021604 + ldr r2, =0xffff8000 adds r1, r2, 0 orrs r0, r1 strh r0, [r5, 0xE] @@ -68925,11 +67315,7 @@ _080215E4: pop {r0} bx r0 .align 2, 0 -_080215F4: .4byte 0x082f41e8 -_080215F8: .4byte 0x082f436c -_080215FC: .4byte 0x02020630 -_08021600: .4byte 0x0000fff0 -_08021604: .4byte 0xffff8000 + .pool thumb_func_end sub_80214A8 thumb_func_start sub_8021608 @@ -68981,7 +67367,7 @@ sub_8021608: @ 8021608 movs r0, 0 strh r0, [r5, 0x24] ldrh r1, [r4, 0xE] - ldr r0, _080216A0 + ldr r0, =0x00007fff ands r0, r1 strh r0, [r4, 0xE] _0802166E: @@ -68995,11 +67381,11 @@ _0802166E: ldrsh r0, [r5, r2] adds r1, r0 ldrh r2, [r4, 0xE] - ldr r0, _080216A0 + ldr r0, =0x00007fff ands r0, r2 cmp r1, r0 blt _0802169A - ldr r0, _080216A4 + ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] adds r0, r5, 0 bl obj_free_rotscale_entry @@ -69010,8 +67396,7 @@ _0802169A: pop {r0} bx r0 .align 2, 0 -_080216A0: .4byte 0x00007fff -_080216A4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8021608 thumb_func_start sub_80216A8 @@ -69022,7 +67407,7 @@ sub_80216A8: @ 80216A8 ldrb r0, [r6, 0x9] cmp r5, r0 bcs _080216D4 - ldr r7, _080216DC + ldr r7, =0x082f41e8 _080216B6: lsls r0, r5, 1 adds r0, r7 @@ -69042,7 +67427,7 @@ _080216D4: pop {r0} bx r0 .align 2, 0 -_080216DC: .4byte 0x082f41e8 + .pool thumb_func_end sub_80216A8 thumb_func_start sub_80216E0 @@ -69064,7 +67449,7 @@ sub_80216E0: @ 80216E0 ldrb r2, [r6, 0x9] cmp r0, r2 bcs _080217AE - ldr r7, _08021744 + ldr r7, =0x082f41cc _08021704: mov r3, r10 ldrh r0, [r3, 0xA] @@ -69098,7 +67483,7 @@ _08021704: bl obj_anim_image_start b _0802175A .align 2, 0 -_08021744: .4byte 0x082f41cc + .pool _08021748: mov r0, r9 lsls r4, r0, 2 @@ -69138,7 +67523,7 @@ _0802175A: asrs r0, 24 strh r0, [r2, 0x24] ldr r2, [r3] - ldr r3, _080217BC + ldr r3, =0x082f41cd adds r1, r3 movs r0, 0 ldrsb r0, [r1, r0] @@ -69161,7 +67546,7 @@ _080217AE: ldrb r1, [r2] b _0802189C .align 2, 0 -_080217BC: .4byte 0x082f41cd + .pool _080217C0: ldrh r0, [r6, 0x28] movs r1, 0x3 @@ -69196,10 +67581,10 @@ _080217E8: ands r0, r1 cmp r0, 0 beq _0802187E - ldr r0, _08021854 + ldr r0, =sub_8022B28 + 1 str r0, [r2, 0x1C] lsls r1, r4, 1 - ldr r3, _08021858 + ldr r3, =0x082f41d2 adds r0, r1, r3 movs r4, 0 ldrsb r4, [r0, r4] @@ -69207,7 +67592,7 @@ _080217E8: adds r0, 0x78 strh r0, [r2, 0x20] ldr r2, [r7] - ldr r0, _0802185C + ldr r0, =0x082f41d3 adds r1, r0 movs r6, 0 ldrsb r6, [r1, r6] @@ -69236,9 +67621,7 @@ _080217E8: bl obj_anim_image_start b _08021868 .align 2, 0 -_08021854: .4byte sub_8022B28 + 1 -_08021858: .4byte 0x082f41d2 -_0802185C: .4byte 0x082f41d3 + .pool _08021860: ldr r0, [r7] movs r1, 0 @@ -69404,7 +67787,7 @@ sub_8021944: @ 8021944 asrs r3, r0, 16 movs r0, 0x7 mov r12, r0 - ldr r5, _080219C0 + ldr r5, =0x082f334c movs r4, 0x1 _08021990: mov r0, r12 @@ -69424,7 +67807,7 @@ _080219A6: lsrs r2, r0, 24 cmp r2, 0x7 bls _08021990 - ldr r1, _080219C4 + ldr r1, =0x000f4240 adds r0, r7, 0 bl __udivsi3 strh r0, [r6, 0x8] @@ -69432,8 +67815,7 @@ _080219A6: pop {r0} bx r0 .align 2, 0 -_080219C0: .4byte 0x082f334c -_080219C4: .4byte 0x000f4240 + .pool thumb_func_end sub_8021944 thumb_func_start sub_80219C8 @@ -69464,7 +67846,7 @@ sub_80219C8: @ 80219C8 lsrs r4, 24 lsls r0, r5, 1 adds r0, r5 - ldr r1, _08021A24 + ldr r1, =0x082f32d8 adds r0, r1 str r0, [sp] movs r0, 0 @@ -69483,7 +67865,7 @@ sub_80219C8: @ 80219C8 pop {r0} bx r0 .align 2, 0 -_08021A24: .4byte 0x082f32d8 + .pool thumb_func_end sub_80219C8 thumb_func_start sub_8021A28 @@ -69613,14 +67995,14 @@ _08021B04: adds r0, r3, r0 adds r0, r2, r0 ldrh r1, [r0] - ldr r0, _08021B40 + ldr r0, =0x02021fc4 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r0, _08021B44 + ldr r0, =0x082f43b4 adds r0, r4, r0 ldr r1, [r0] - ldr r0, _08021B40 + ldr r0, =0x02021fc4 bl gf_strcat ldr r4, [sp, 0x14] subs r4, 0x4 @@ -69634,8 +68016,7 @@ _08021B04: mov r8, r0 b _08021C5A .align 2, 0 -_08021B40: .4byte 0x02021fc4 -_08021B44: .4byte 0x082f43b4 + .pool _08021B48: ldr r1, [sp, 0x20] adds r0, r1, r5 @@ -69667,7 +68048,7 @@ _08021B72: adds r4, r2, r4 ldrh r1, [r4] lsrs r1, 4 - ldr r0, _08021C04 + ldr r0, =0x02021cc4 movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string @@ -69691,7 +68072,7 @@ _08021B72: mov r8, r0 adds r6, 0xE adds r5, 0x1 - ldr r1, _08021C08 + ldr r1, =0x082f334c mov r12, r1 _08021BB8: movs r0, 0x3 @@ -69713,29 +68094,24 @@ _08021BD0: cmp r2, 0x3 bls _08021BB8 adds r0, r7, 0 - ldr r1, _08021C0C + ldr r1, =0x000f4240 bl __udivsi3 lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _08021C10 + ldr r0, =0x02021dc4 adds r1, r3, 0 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r0, _08021C14 + ldr r0, =0x082f43b4 ldr r2, [sp, 0x28] adds r0, r2, r0 ldr r1, [r0] - ldr r0, _08021C18 + ldr r0, =0x02021fc4 bl ExpandTextCodes b _08021C5E .align 2, 0 -_08021C04: .4byte 0x02021cc4 -_08021C08: .4byte 0x082f334c -_08021C0C: .4byte 0x000f4240 -_08021C10: .4byte 0x02021dc4 -_08021C14: .4byte 0x082f43b4 -_08021C18: .4byte 0x02021fc4 + .pool _08021C1C: str r5, [sp, 0x18] str r5, [sp, 0x1C] @@ -69751,13 +68127,13 @@ _08021C30: lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r0, _08021CA4 + ldr r0, =0x0858a670 adds r1, r0 - ldr r0, _08021CA8 + ldr r0, =0x02021cc4 bl gf_strcpy - ldr r0, _08021CAC + ldr r0, =0x082f43b4 ldr r1, [r0, 0x8] - ldr r0, _08021CB0 + ldr r0, =0x02021fc4 bl ExpandTextCodes ldr r4, [sp, 0x14] subs r4, 0x4 @@ -69772,7 +68148,7 @@ _08021C5A: adds r5, 0x1 _08021C5E: movs r0, 0x2 - ldr r1, _08021CB0 + ldr r1, =0x02021fc4 adds r2, r4, 0 bl sub_81DB368 adds r2, r0, 0 @@ -69785,11 +68161,11 @@ _08021C5E: lsrs r2, 24 mov r1, r10 lsrs r3, r1, 24 - ldr r1, _08021CB4 + ldr r1, =0x082f32d8 str r1, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r1, _08021CB0 + ldr r1, =0x02021fc4 str r1, [sp, 0x8] movs r1, 0x2 bl box_print @@ -69798,24 +68174,18 @@ _08021C5E: ldrb r2, [r2, 0x8] cmp r3, r2 bne _08021CC0 - ldr r0, _08021CB8 - ldr r1, _08021CBC + ldr r0, =0x02021ec4 + ldr r1, =0x085ed7d4 bl gf_strcpy b _08021CC8 .align 2, 0 -_08021CA4: .4byte 0x0858a670 -_08021CA8: .4byte 0x02021cc4 -_08021CAC: .4byte 0x082f43b4 -_08021CB0: .4byte 0x02021fc4 -_08021CB4: .4byte 0x082f32d8 -_08021CB8: .4byte 0x02021ec4 -_08021CBC: .4byte 0x085ed7d4 + .pool _08021CC0: - ldr r0, _08021D24 - ldr r1, _08021D28 + ldr r0, =0x02021ec4 + ldr r1, =0x085ed7e0 bl gf_strcpy _08021CC8: - ldr r4, _08021D24 + ldr r4, =0x02021ec4 mov r3, r9 strb r3, [r4] mov r1, r8 @@ -69824,7 +68194,7 @@ _08021CC8: adds r1, r0, r1 movs r0, 0 bl sub_81AFC0C - ldr r0, _08021D2C + ldr r0, =0x02021fc4 adds r1, r4, 0 bl sub_81AFC28 ldr r1, [sp, 0xC] @@ -69834,11 +68204,11 @@ _08021CC8: ldrb r0, [r0] mov r4, r10 lsrs r3, r4, 24 - ldr r1, _08021D30 + ldr r1, =0x082f32d8 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r2, _08021D2C + ldr r2, =0x02021fc4 str r2, [sp, 0x8] movs r1, 0x2 movs r2, 0x4 @@ -69860,10 +68230,7 @@ _08021D14: pop {r0} bx r0 .align 2, 0 -_08021D24: .4byte 0x02021ec4 -_08021D28: .4byte 0x085ed7e0 -_08021D2C: .4byte 0x02021fc4 -_08021D30: .4byte 0x082f32d8 + .pool thumb_func_end sub_8021A28 thumb_func_start sub_8021D34 @@ -69902,16 +68269,16 @@ sub_8021D34: @ 8021D34 ldrh r1, [r2, 0x4] bl sub_8021944 ldrb r0, [r4] - ldr r4, _08021F88 + ldr r4, =0x082f32d8 str r4, [sp] str r6, [sp, 0x4] - ldr r1, _08021F8C + ldr r1, =0x085ed808 str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0 adds r3, r7, 0 bl box_print - ldr r4, _08021F90 + ldr r4, =0x085ed840 movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 @@ -69923,7 +68290,7 @@ sub_8021D34: @ 8021D34 lsrs r6, r0, 24 mov r2, r9 ldrb r0, [r2] - ldr r1, _08021F88 + ldr r1, =0x082f32d8 str r1, [sp] mov r2, r10 str r2, [sp, 0x4] @@ -69937,11 +68304,11 @@ sub_8021D34: @ 8021D34 add r0, r8 movs r4, 0 ldrsh r1, [r0, r4] - ldr r0, _08021F94 + ldr r0, =0x02021cc4 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r0, _08021F98 + ldr r0, =0x02021dc4 movs r1, 0xA0 lsls r1, 1 add r1, r8 @@ -69950,8 +68317,8 @@ sub_8021D34: @ 8021D34 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r5, _08021F9C - ldr r1, _08021FA0 + ldr r5, =0x02021fc4 + ldr r1, =0x085ed838 adds r0, r5, 0 bl ExpandTextCodes movs r0, 0x2 @@ -69964,7 +68331,7 @@ sub_8021D34: @ 8021D34 lsrs r6, r0, 24 mov r4, r9 ldrb r0, [r4] - ldr r1, _08021F88 + ldr r1, =0x082f32d8 str r1, [sp] mov r2, r10 str r2, [sp, 0x4] @@ -69973,7 +68340,7 @@ sub_8021D34: @ 8021D34 adds r2, r6, 0 adds r3, r7, 0 bl box_print - ldr r4, _08021FA4 + ldr r4, =0x085ed830 movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 @@ -69984,7 +68351,7 @@ sub_8021D34: @ 8021D34 lsrs r6, r0, 24 mov r1, r9 ldrb r0, [r1] - ldr r2, _08021F88 + ldr r2, =0x082f32d8 str r2, [sp] mov r1, r10 str r1, [sp, 0x4] @@ -69998,11 +68365,11 @@ sub_8021D34: @ 8021D34 add r0, r8 movs r2, 0 ldrsh r1, [r0, r2] - ldr r0, _08021F94 + ldr r0, =0x02021cc4 movs r2, 0x2 movs r3, 0x1 bl decimal_int_to_string - ldr r1, _08021FA8 + ldr r1, =0x085ed82c adds r0, r5, 0 bl ExpandTextCodes movs r0, 0x2 @@ -70015,7 +68382,7 @@ sub_8021D34: @ 8021D34 lsrs r6, r0, 24 mov r4, r9 ldrb r0, [r4] - ldr r1, _08021F88 + ldr r1, =0x082f32d8 str r1, [sp] mov r2, r10 str r2, [sp, 0x4] @@ -70029,17 +68396,17 @@ sub_8021D34: @ 8021D34 lsls r0, 24 lsrs r7, r0, 24 ldrb r0, [r4] - ldr r4, _08021F88 + ldr r4, =0x082f32d8 str r4, [sp] mov r1, r10 str r1, [sp, 0x4] - ldr r1, _08021FAC + ldr r1, =0x085ed810 str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0 adds r3, r7, 0 bl box_print - ldr r4, _08021FB0 + ldr r4, =0x085ed850 movs r0, 0x2 adds r1, r4, 0 movs r2, 0x1 @@ -70052,7 +68419,7 @@ sub_8021D34: @ 8021D34 lsrs r6, r0, 24 mov r1, r9 ldrb r0, [r1] - ldr r2, _08021F88 + ldr r2, =0x082f32d8 str r2, [sp] mov r1, r10 str r1, [sp, 0x4] @@ -70068,7 +68435,7 @@ sub_8021D34: @ 8021D34 movs r1, 0x7 mov r9, r1 movs r5, 0x1 - ldr r3, _08021FB4 + ldr r3, =0x082f334c _08021EEC: mov r4, r9 mov r0, r10 @@ -70093,14 +68460,14 @@ _08021F0A: mov r10, r0 cmp r0, 0x7 bls _08021EEC - ldr r0, _08021F94 + ldr r0, =0x02021cc4 mov r2, r12 lsrs r1, r2, 8 movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string - ldr r4, _08021F98 - ldr r1, _08021FB8 + ldr r4, =0x02021dc4 + ldr r1, =0x000f4240 ldr r0, [sp, 0xC] bl __udivsi3 adds r1, r0, 0 @@ -70108,8 +68475,8 @@ _08021F0A: movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r4, _08021F9C - ldr r1, _08021FBC + ldr r4, =0x02021fc4 + ldr r1, =0x085ed848 adds r0, r4, 0 bl ExpandTextCodes movs r2, 0x1 @@ -70133,7 +68500,7 @@ _08021F0A: lsls r0, 1 add r0, r8 ldrb r0, [r0] - ldr r1, _08021FC0 + ldr r1, =0x082f32e7 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] @@ -70144,27 +68511,13 @@ _08021F0A: bl box_print b _08021FDE .align 2, 0 -_08021F88: .4byte 0x082f32d8 -_08021F8C: .4byte 0x085ed808 -_08021F90: .4byte 0x085ed840 -_08021F94: .4byte 0x02021cc4 -_08021F98: .4byte 0x02021dc4 -_08021F9C: .4byte 0x02021fc4 -_08021FA0: .4byte 0x085ed838 -_08021FA4: .4byte 0x085ed830 -_08021FA8: .4byte 0x085ed82c -_08021FAC: .4byte 0x085ed810 -_08021FB0: .4byte 0x085ed850 -_08021FB4: .4byte 0x082f334c -_08021FB8: .4byte 0x000f4240 -_08021FBC: .4byte 0x085ed848 -_08021FC0: .4byte 0x082f32e7 + .pool _08021FC4: movs r0, 0xDD lsls r0, 1 add r0, r8 ldrb r0, [r0] - ldr r1, _0802205C + ldr r1, =0x082f32d8 str r1, [sp] str r2, [sp, 0x4] str r4, [sp, 0x8] @@ -70182,25 +68535,25 @@ _08021FDE: add r8, r4 mov r1, r8 ldrb r0, [r1] - ldr r2, _0802205C + ldr r2, =0x082f32d8 mov r9, r2 str r2, [sp] movs r5, 0 str r5, [sp, 0x4] - ldr r1, _08022060 + ldr r1, =0x085ed820 str r1, [sp, 0x8] movs r1, 0x2 movs r2, 0 adds r3, r7, 0 bl box_print - ldr r0, _08022064 + ldr r0, =0x02021cc4 ldr r4, [sp, 0x10] ldrh r1, [r4, 0x8] movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string - ldr r4, _08022068 - ldr r1, _0802206C + ldr r4, =0x02021fc4 + ldr r1, =0x085ed85c adds r0, r4, 0 bl ExpandTextCodes movs r2, 0x1 @@ -70231,11 +68584,7 @@ _08021FDE: pop {r0} bx r0 .align 2, 0 -_0802205C: .4byte 0x082f32d8 -_08022060: .4byte 0x085ed820 -_08022064: .4byte 0x02021cc4 -_08022068: .4byte 0x02021fc4 -_0802206C: .4byte 0x085ed85c + .pool thumb_func_end sub_8021D34 thumb_func_start sub_8022070 @@ -70252,12 +68601,12 @@ sub_8022070: @ 8022070 b _08022218 _08022084: lsls r0, 2 - ldr r1, _08022090 + ldr r1, =_08022094 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08022090: .4byte _08022094 + .pool .align 2, 0 _08022094: .4byte _080220AC @@ -70275,7 +68624,7 @@ _080220AC: bl sub_8022554 ldrh r0, [r4, 0x12] lsls r0, 3 - ldr r2, _080220D4 + ldr r2, =0x082f32cc mov r1, sp adds r0, r2 ldm r0!, {r2,r3} @@ -70283,14 +68632,13 @@ _080220AC: ldrh r0, [r4, 0x12] cmp r0, 0xD bne _080220DC - ldr r0, _080220D8 + ldr r0, =0x082f3344 adds r0, 0x4 b _080220DE .align 2, 0 -_080220D4: .4byte 0x082f32cc -_080220D8: .4byte 0x082f3344 + .pool _080220DC: - ldr r0, _080220F4 + ldr r0, =0x082f3344 _080220DE: adds r0, r5, r0 ldrb r1, [r0] @@ -70303,7 +68651,7 @@ _080220DE: strb r0, [r1] b _08022218 .align 2, 0 -_080220F4: .4byte 0x082f3344 + .pool _080220F8: adds r4, r6, 0 adds r4, 0x82 @@ -70317,7 +68665,7 @@ _0802210C: adds r5, r6, 0 adds r5, 0x82 ldrb r0, [r5] - ldr r4, _0802212C + ldr r4, =0x0000021d adds r1, r4, 0 movs r2, 0xD0 bl box_border_load_tiles_and_pal @@ -70328,7 +68676,7 @@ _0802210C: bl SetWindowBorderStyle b _08022218 .align 2, 0 -_0802212C: .4byte 0x0000021d + .pool _08022130: ldrb r0, [r4, 0x9] subs r0, 0x2 @@ -70350,11 +68698,11 @@ _0802214E: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] - ldr r3, _0802217C + ldr r3, =0x085ed860 movs r1, 0x14 movs r2, 0x3 bl sub_80219C8 - ldr r0, _08022180 + ldr r0, =0x082f3344 adds r0, r5, r0 ldrb r3, [r0] lsls r3, 27 @@ -70368,13 +68716,12 @@ _0802214E: movs r0, 0x5 b _08022220 .align 2, 0 -_0802217C: .4byte 0x085ed860 -_08022180: .4byte 0x082f3344 + .pool _08022184: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] - ldr r2, _080221C0 + ldr r2, =0x082f43b4 adds r1, r4, 0 adds r1, 0x8F ldrb r1, [r1] @@ -70385,7 +68732,7 @@ _08022184: movs r1, 0x14 movs r2, 0x4 bl sub_80219C8 - ldr r0, _080221C4 + ldr r0, =0x082f3344 adds r0, r5, r0 ldrb r3, [r0] lsls r3, 27 @@ -70399,17 +68746,16 @@ _08022184: movs r0, 0x5 b _08022220 .align 2, 0 -_080221C0: .4byte 0x082f43b4 -_080221C4: .4byte 0x082f3344 + .pool _080221C8: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] - ldr r3, _080221F0 + ldr r3, =0x085ed878 movs r1, 0x16 movs r2, 0x3 bl sub_80219C8 - ldr r0, _080221F4 + ldr r0, =0x082f3344 adds r0, 0x4 adds r0, r5, r0 ldrb r3, [r0] @@ -70421,8 +68767,7 @@ _080221C8: bl sub_8021A28 b _08022218 .align 2, 0 -_080221F0: .4byte 0x085ed878 -_080221F4: .4byte 0x082f3344 + .pool _080221F8: adds r0, r4, 0 bl sub_8021D34 @@ -70490,7 +68835,7 @@ sub_8022250: @ 8022250 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08022284 + ldr r1, =0x03005e08 adds r6, r0, r1 movs r1, 0 ldrsh r0, [r6, r1] @@ -70502,7 +68847,7 @@ sub_8022250: @ 8022250 beq _08022296 b _080224BA .align 2, 0 -_08022284: .4byte 0x03005e08 + .pool _08022288: cmp r0, 0x2 bne _0802228E @@ -70514,7 +68859,7 @@ _0802228E: _08022294: b _080224BA _08022296: - ldr r0, _080222C8 + ldr r0, =0x082f32ec bl Window_AddFromTemplate strh r0, [r6, 0x2] lsls r0, 24 @@ -70524,7 +68869,7 @@ _08022296: movs r1, 0 bl Window_FastFillPixels ldrb r0, [r6, 0x2] - ldr r4, _080222CC + ldr r4, =0x0000021d adds r1, r4, 0 movs r2, 0xD0 bl box_border_load_tiles_and_pal @@ -70535,10 +68880,9 @@ _08022296: bl SetWindowBorderStyle b _080224BA .align 2, 0 -_080222C8: .4byte 0x082f32ec -_080222CC: .4byte 0x0000021d + .pool _080222D0: - ldr r0, _08022450 + ldr r0, =0x085ed8d0 mov r10, r0 movs r1, 0x1 negs r1, r1 @@ -70553,7 +68897,7 @@ _080222D0: lsls r0, 24 lsrs r7, r0, 24 ldrb r0, [r6, 0x2] - ldr r5, _08022454 + ldr r5, =0x082f32e1 str r5, [sp] mov r1, r9 str r1, [sp, 0x4] @@ -70563,7 +68907,7 @@ _080222D0: adds r2, r7, 0 movs r3, 0x1 bl box_print - ldr r0, _08022458 + ldr r0, =0x085ed8dc mov r10, r0 movs r0, 0x1 mov r1, r10 @@ -70588,26 +68932,26 @@ _080222D0: _08022336: mov r1, r9 adds r1, 0x2 - ldr r0, _0802245C + ldr r0, =0x02021cc4 movs r2, 0 movs r3, 0x1 bl decimal_int_to_string - ldr r0, _08022460 - ldr r1, _08022464 + ldr r0, =0x02021fc4 + ldr r1, =0x085ed8f4 bl ExpandTextCodes ldrb r0, [r6, 0x2] - ldr r1, _08022468 + ldr r1, =0x082f32d8 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, _08022460 + ldr r1, =0x02021fc4 str r1, [sp, 0x8] movs r1, 0x1 movs r2, 0 mov r3, r10 bl box_print movs r0, 0x1 - ldr r1, _0802246C + ldr r1, =0x085ed850 movs r2, 0x1 negs r2, r2 bl font_get_width_of_string @@ -70616,11 +68960,11 @@ _08022336: lsls r1, 24 lsrs r7, r1, 24 ldrb r0, [r6, 0x2] - ldr r1, _08022468 + ldr r1, =0x082f32d8 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, _0802246C + ldr r1, =0x085ed850 str r1, [sp, 0x8] movs r1, 0x1 adds r2, r7, 0 @@ -70640,7 +68984,7 @@ _08022336: mov r12, r1 movs r0, 0x1 mov r8, r0 - ldr r5, _08022470 + ldr r5, =0x082f334c _080223AE: mov r0, r12 subs r1, r0, r2 @@ -70665,23 +69009,23 @@ _080223CA: adds r0, r4, r6 ldrh r1, [r0, 0x4] lsrs r1, 8 - ldr r0, _0802245C + ldr r0, =0x02021cc4 movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string ldr r0, [sp, 0xC] - ldr r1, _08022474 + ldr r1, =0x000f4240 bl __udivsi3 adds r1, r0, 0 - ldr r0, _08022478 + ldr r0, =0x02021dc4 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r0, _08022460 - ldr r1, _0802247C + ldr r0, =0x02021fc4 + ldr r1, =0x085ed848 bl ExpandTextCodes movs r0, 0x1 - ldr r1, _08022460 + ldr r1, =0x02021fc4 movs r2, 0x1 negs r2, r2 bl font_get_width_of_string @@ -70689,11 +69033,11 @@ _080223CA: lsls r0, 24 lsrs r7, r0, 24 ldrb r0, [r6, 0x2] - ldr r1, _08022468 + ldr r1, =0x082f32d8 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, _08022460 + ldr r1, =0x02021fc4 str r1, [sp, 0x8] movs r1, 0x1 adds r2, r7, 0 @@ -70718,20 +69062,9 @@ _08022444: bl Window_CopyToVram b _080224BA .align 2, 0 -_08022450: .4byte 0x085ed8d0 -_08022454: .4byte 0x082f32e1 -_08022458: .4byte 0x085ed8dc -_0802245C: .4byte 0x02021cc4 -_08022460: .4byte 0x02021fc4 -_08022464: .4byte 0x085ed8f4 -_08022468: .4byte 0x082f32d8 -_0802246C: .4byte 0x085ed850 -_08022470: .4byte 0x082f334c -_08022474: .4byte 0x000f4240 -_08022478: .4byte 0x02021dc4 -_0802247C: .4byte 0x085ed848 + .pool _08022480: - ldr r0, _08022490 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -70739,7 +69072,7 @@ _08022480: bne _080224BA b _080224C0 .align 2, 0 -_08022490: .4byte 0x030022c0 + .pool _08022494: ldrb r0, [r6, 0x2] movs r1, 0x1 @@ -70774,17 +69107,17 @@ _080224C0: sub_80224D0: @ 80224D0 push {lr} bl script_env_2_enable - ldr r0, _08022518 + ldr r0, =sub_8022250 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0802251C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _08022520 + ldr r0, =0x03005d90 ldr r2, [r0] movs r3, 0xF6 lsls r3, 1 @@ -70806,9 +69139,7 @@ sub_80224D0: @ 80224D0 pop {r0} bx r0 .align 2, 0 -_08022518: .4byte sub_8022250 + 1 -_0802251C: .4byte 0x03005e00 -_08022520: .4byte 0x03005d90 + .pool thumb_func_end sub_80224D0 thumb_func_start sub_8022524 @@ -70870,7 +69201,7 @@ sub_8022588: @ 8022588 ldrb r0, [r5, 0x9] cmp r6, r0 bcs _080225E8 - ldr r7, _080225F0 + ldr r7, =0x082f417c _08022596: lsls r0, r6, 2 movs r1, 0xA2 @@ -70887,15 +69218,15 @@ _08022596: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _080225F4 + ldr r1, =0x082f4190 adds r0, r1 str r0, [r2] ldrb r0, [r0] lsls r0, 3 - ldr r1, _080225F8 + ldr r1, =0x082f32f4 adds r0, r1 bl Window_AddFromTemplate - ldr r1, _080225FC + ldr r1, =0x000001bb adds r4, r5, r1 adds r4, r6 strb r0, [r4] @@ -70915,10 +69246,7 @@ _080225E8: pop {r0} bx r0 .align 2, 0 -_080225F0: .4byte 0x082f417c -_080225F4: .4byte 0x082f4190 -_080225F8: .4byte 0x082f32f4 -_080225FC: .4byte 0x000001bb + .pool thumb_func_end sub_8022588 thumb_func_start sub_8022600 @@ -70935,7 +69263,7 @@ sub_8022600: @ 8022600 movs r1, 0 mov r8, r1 _08022616: - ldr r1, _08022660 + ldr r1, =0x000001bb adds r0, r6, r1 adds r5, r0, r7 ldrb r0, [r5] @@ -70959,7 +69287,7 @@ _08022616: mov r1, r8 str r1, [sp] str r1, [sp, 0x4] - ldr r1, _08022664 + ldr r1, =0x082f32db str r1, [sp, 0x8] mov r1, r8 str r1, [sp, 0xC] @@ -70969,8 +69297,7 @@ _08022616: bl sub_8199EEC b _0802269C .align 2, 0 -_08022660: .4byte 0x000001bb -_08022664: .4byte 0x082f32db + .pool _08022668: lsls r4, r7, 5 adds r4, 0x98 @@ -70988,7 +69315,7 @@ _08022668: mov r1, r8 str r1, [sp] str r1, [sp, 0x4] - ldr r1, _080226C8 + ldr r1, =0x082f32de str r1, [sp, 0x8] mov r1, r8 str r1, [sp, 0xC] @@ -70997,7 +69324,7 @@ _08022668: movs r3, 0x1 bl sub_8199EEC _0802269C: - ldr r1, _080226CC + ldr r1, =0x000001bb adds r0, r6, r1 adds r0, r7 ldrb r0, [r0] @@ -71019,8 +69346,7 @@ _080226B6: pop {r0} bx r0 .align 2, 0 -_080226C8: .4byte 0x082f32de -_080226CC: .4byte 0x000001bb + .pool thumb_func_end sub_8022600 thumb_func_start sub_80226D0 @@ -71029,14 +69355,13 @@ sub_80226D0: @ 80226D0 sub sp, 0x8 adds r6, r0, 0 movs r5, 0 - ldr r0, _080226E4 - ldr r4, _080226E8 + ldr r0, =0x08de3fd4 + ldr r4, =0x0201c000 adds r1, r4, 0 bl LZ77UnCompWram b _0802271A .align 2, 0 -_080226E4: .4byte 0x08de3fd4 -_080226E8: .4byte 0x0201c000 + .pool _080226EC: lsls r1, r5, 2 movs r2, 0xA2 @@ -71077,14 +69402,14 @@ sub_8022730: @ 8022730 push {r4-r7,lr} adds r6, r0, 0 movs r5, 0 - ldr r0, _08022930 + ldr r0, =0x0000ff98 strh r0, [r6, 0x2A] strh r5, [r6, 0x2C] - ldr r1, _08022934 + ldr r1, =0x02021bbc strh r5, [r1] - ldr r1, _08022938 + ldr r1, =0x02021bbe strh r0, [r1] - ldr r4, _0802293C + ldr r4, =0x082f41f4 _08022746: lsls r0, r5, 3 adds r0, r4 @@ -71094,9 +69419,9 @@ _08022746: lsrs r5, r0, 24 cmp r5, 0x3 bls _08022746 - ldr r0, _08022940 + ldr r0, =0x082f421c bl gpu_pal_obj_alloc_and_load_multiple - ldr r0, _08022944 + ldr r0, =0x082f430c movs r1, 0x78 movs r2, 0x58 movs r3, 0x5 @@ -71109,7 +69434,7 @@ _08022746: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r1, _08022948 + ldr r1, =0x02020630 adds r0, r1 str r0, [r3] ldrb r1, [r0, 0x5] @@ -71148,7 +69473,7 @@ _080227AA: adds r2, 0x20 lsls r2, 16 asrs r2, 16 - ldr r0, _0802294C + ldr r0, =0x082f4324 movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 24 @@ -71160,7 +69485,7 @@ _080227AA: lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r0, _08022948 + ldr r0, =0x02020630 adds r1, r0 str r1, [r3] ldrb r0, [r1, 0x5] @@ -71195,7 +69520,7 @@ _080227AA: bcc _080227AA _08022822: movs r5, 0 - ldr r4, _08022950 + ldr r4, =0x082f41d2 adds r7, r4, 0x1 _08022828: lsls r2, r5, 1 @@ -71208,7 +69533,7 @@ _08022828: lsls r2, 24 asrs r2, 24 adds r2, 0x88 - ldr r0, _08022954 + ldr r0, =0x082f433c movs r3, 0x6 bl obj_add_from_template_forward_search lsls r0, 24 @@ -71221,7 +69546,7 @@ _08022828: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r1, _08022948 + ldr r1, =0x02020630 adds r0, r1 str r0, [r3] ldrb r1, [r0, 0x5] @@ -71256,7 +69581,7 @@ _0802288E: lsls r3, 16 adds r1, r3 asrs r1, 16 - ldr r0, _08022958 + ldr r0, =0x082f4354 movs r2, 0x8 movs r3, 0 bl obj_add_from_template_forward_search @@ -71270,7 +69595,7 @@ _0802288E: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r1, _08022948 + ldr r1, =0x02020630 adds r0, r1 str r0, [r3] ldrb r1, [r0, 0x5] @@ -71299,7 +69624,7 @@ _0802288E: lsrs r5, r0, 24 cmp r5, 0x1 bls _0802288E - ldr r4, _0802295C + ldr r4, =0x082f4384 movs r0, 0 movs r1, 0 adds r2, r4, 0 @@ -71326,18 +69651,7 @@ _08022928: pop {r0} bx r0 .align 2, 0 -_08022930: .4byte 0x0000ff98 -_08022934: .4byte 0x02021bbc -_08022938: .4byte 0x02021bbe -_0802293C: .4byte 0x082f41f4 -_08022940: .4byte 0x082f421c -_08022944: .4byte 0x082f430c -_08022948: .4byte 0x02020630 -_0802294C: .4byte 0x082f4324 -_08022950: .4byte 0x082f41d2 -_08022954: .4byte 0x082f433c -_08022958: .4byte 0x082f4354 -_0802295C: .4byte 0x082f4384 + .pool thumb_func_end sub_8022730 thumb_func_start sub_8022960 @@ -71461,7 +69775,7 @@ sub_8022A4C: @ 8022A4C push {r4,r5,lr} adds r3, r0, 0 movs r1, 0 - ldr r5, _08022A90 + ldr r5, =nullsub_12 + 1 adds r2, r3, 0 adds r2, 0x2E movs r4, 0 @@ -71493,7 +69807,7 @@ _08022A5A: pop {r0} bx r0 .align 2, 0 -_08022A90: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8022A4C thumb_func_start sub_8022A94 @@ -71545,7 +69859,7 @@ sub_8022A94: @ 8022A94 movs r0, 0 strh r0, [r5, 0x24] ldrh r1, [r4, 0xE] - ldr r0, _08022B20 + ldr r0, =0x00007fff ands r0, r1 strh r0, [r4, 0xE] _08022AFA: @@ -71559,19 +69873,18 @@ _08022AFA: ldrsh r0, [r5, r2] adds r1, r0 ldrh r2, [r4, 0xE] - ldr r0, _08022B20 + ldr r0, =0x00007fff ands r0, r2 cmp r1, r0 ble _08022B1A - ldr r0, _08022B24 + ldr r0, =sub_8022A4C + 1 str r0, [r5, 0x1C] _08022B1A: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08022B20: .4byte 0x00007fff -_08022B24: .4byte sub_8022A4C + 1 + .pool thumb_func_end sub_8022A94 thumb_func_start sub_8022B28 @@ -71639,14 +69952,14 @@ _08022BA6: asrs r0, 2 strh r0, [r7, 0xC] ldrh r0, [r7, 0xE] - ldr r2, _08022BE4 + ldr r2, =0xffff8000 adds r1, r2, 0 orrs r0, r1 strh r0, [r7, 0xE] mov r0, r8 strh r0, [r6, 0x26] strh r0, [r6, 0x24] - ldr r0, _08022BE8 + ldr r0, =sub_8022A94 + 1 str r0, [r6, 0x1C] adds r2, r6, 0 adds r2, 0x2C @@ -71667,8 +69980,7 @@ _08022BA6: pop {r0} bx r0 .align 2, 0 -_08022BE4: .4byte 0xffff8000 -_08022BE8: .4byte sub_8022A94 + 1 + .pool thumb_func_end sub_8022B28 thumb_func_start sub_8022BEC @@ -71696,7 +70008,7 @@ _08022C0A: _08022C14: cmp r5, 0 beq _08022C28 - ldr r0, _08022C3C + ldr r0, =0x082f43cc lsls r1, r5, 2 adds r1, r0 ldr r2, [r1] @@ -71710,14 +70022,14 @@ _08022C28: mov r0, r8 strb r0, [r6, 0xE] _08022C32: - ldr r0, _08022C3C + ldr r0, =0x082f43cc ldrb r1, [r6, 0xE] lsls r1, 2 b _08022C44 .align 2, 0 -_08022C3C: .4byte 0x082f43cc + .pool _08022C40: - ldr r0, _08022C54 + ldr r0, =0x082f43cc lsls r1, r5, 2 _08022C44: adds r1, r0 @@ -71730,7 +70042,7 @@ _08022C4A: pop {r0} bx r0 .align 2, 0 -_08022C54: .4byte 0x082f43cc + .pool thumb_func_end sub_8022BEC thumb_func_start sub_8022C58 @@ -71755,7 +70067,7 @@ sub_8022C58: @ 8022C58 lsls r4, 8 ldrb r2, [r1, 0x7] orrs r4, r2 - ldr r5, _08022CAC + ldr r5, =0x02037fd4 ldrb r3, [r5, 0x8] movs r2, 0x7F ands r2, r3 @@ -71776,7 +70088,7 @@ sub_8022C58: @ 8022C58 pop {r1} bx r1 .align 2, 0 -_08022CAC: .4byte 0x02037fd4 + .pool thumb_func_end sub_8022C58 thumb_func_start sub_8022CB0 @@ -71876,8 +70188,8 @@ _08022D42: lsrs r4, r0, 24 cmp r4, 0 beq _08022D90 - ldr r4, _08022D88 - ldr r1, _08022D8C + ldr r4, =0x02021fc4 + ldr r1, =0x082f32a4 ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -71898,10 +70210,9 @@ _08022D42: bl text_box_related_one b _08022DB2 .align 2, 0 -_08022D88: .4byte 0x02021fc4 -_08022D8C: .4byte 0x082f32a4 + .pool _08022D90: - ldr r1, _08022DBC + ldr r1, =0x082f32a4 ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -71923,7 +70234,7 @@ _08022DB2: bl Window_CopyToVram b _08022E08 .align 2, 0 -_08022DBC: .4byte 0x082f32a4 + .pool _08022DC0: movs r0, 0 bl a_pressed_maybe @@ -71937,14 +70248,14 @@ _08022DC0: strb r0, [r7, 0xC] b _08022E08 _08022DD8: - ldr r0, _08022DE4 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] ands r4, r0 cmp r4, 0 bne _08022E08 b _08022E0E .align 2, 0 -_08022DE4: .4byte 0x030022c0 + .pool _08022DE8: ldrb r1, [r5, 0x1] movs r0, 0x1 @@ -72032,7 +70343,7 @@ _08022E72: lsls r0, 24 cmp r0, 0 beq _08022EA2 - ldr r0, _08022E98 + ldr r0, =0x000001e5 bl current_map_music_set movs r0, 0x7 movs r1, 0x1 @@ -72044,7 +70355,7 @@ _08022E72: strb r1, [r4, 0xC] b _08022EA2 .align 2, 0 -_08022E98: .4byte 0x000001e5 + .pool _08022E9C: ldrb r0, [r4, 0xC] adds r0, 0x1 @@ -72109,13 +70420,13 @@ sub_8022F04: @ 8022F04 push {lr} movs r1, 0 str r1, [r0, 0x4] - ldr r0, _08022F18 + ldr r0, =sub_8020E1C + 1 bl set_callback2 movs r0, 0 pop {r1} bx r1 .align 2, 0 -_08022F18: .4byte sub_8020E1C + 1 + .pool thumb_func_end sub_8022F04 thumb_func_start sub_8022F1C @@ -72130,12 +70441,12 @@ sub_8022F1C: @ 8022F1C b _08023060 _08022F2C: lsls r0, 2 - ldr r1, _08022F38 + ldr r1, =_08022F3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08022F38: .4byte _08022F3C + .pool .align 2, 0 _08022F3C: .4byte _08022F54 @@ -72194,7 +70505,7 @@ _08022FAA: b _08023060 _08022FBA: bl sub_800A550 - ldr r2, _08023038 + ldr r2, =0x082f4448 ldrb r4, [r5, 0x9] subs r1, r4, 0x2 adds r1, r2 @@ -72206,9 +70517,9 @@ _08022FBA: movs r3, 0 cmp r3, r4 bcs _0802301E - ldr r7, _0802303C + ldr r7, =0x020223c4 movs r6, 0 - ldr r4, _08023040 + ldr r4, =0x0858ab24 _08022FDC: lsls r0, r3, 5 adds r0, r5, r0 @@ -72257,9 +70568,7 @@ _0802301E: str r0, [r5, 0x20] b _08023060 .align 2, 0 -_08023038: .4byte 0x082f4448 -_0802303C: .4byte 0x020223c4 -_08023040: .4byte 0x0858ab24 + .pool _08023044: movs r0, 0 movs r1, 0x1 @@ -72295,12 +70604,12 @@ sub_8023070: @ 8023070 b _080231A8 _0802307C: lsls r0, 2 - ldr r1, _08023088 + ldr r1, =_0802308C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08023088: .4byte _0802308C + .pool .align 2, 0 _0802308C: .4byte _080230A8 @@ -72328,7 +70637,7 @@ _080230BA: adds r1, r4, r2 movs r0, 0 strb r0, [r1] - ldr r3, _080230E4 + ldr r3, =0x00000139 adds r1, r4, r3 strb r0, [r1] adds r2, 0x2 @@ -72339,7 +70648,7 @@ _080230BA: strb r0, [r1] b _080231A8 .align 2, 0 -_080230E4: .4byte 0x00000139 + .pool _080230E8: movs r0, 0x9C lsls r0, 1 @@ -72351,7 +70660,7 @@ _080230E8: adds r1, r4, r2 adds r0, r1, r0 ldr r2, [r0] - ldr r0, _0802311C + ldr r0, =sub_8021608 + 1 str r0, [r2, 0x1C] ldrb r0, [r3] lsls r0, 2 @@ -72366,7 +70675,7 @@ _080230E8: bl audio_play b _080231A8 .align 2, 0 -_0802311C: .4byte sub_8021608 + 1 + .pool _08023120: movs r3, 0x9C lsls r3, 1 @@ -72378,7 +70687,7 @@ _08023120: adds r3, r1, r0 ldr r0, [r3] ldr r1, [r0, 0x1C] - ldr r0, _0802314C + ldr r0, =sub_8021608 + 1 cmp r1, r0 beq _080231AE movs r0, 0 @@ -72389,7 +70698,7 @@ _08023120: bl sub_8010434 b _080231A8 .align 2, 0 -_0802314C: .4byte sub_8021608 + 1 + .pool _08023150: bl sub_800A520 lsls r0, 24 @@ -72472,7 +70781,7 @@ _080231D6: b _080232E2 _080231E4: strh r1, [r4, 0x2A] - ldr r0, _08023214 + ldr r0, =0x00000139 adds r3, r4, r0 movs r0, 0x4 strb r0, [r3] @@ -72481,7 +70790,7 @@ _080231E4: adds r1, r4, r2 movs r0, 0 strb r0, [r1] - ldr r2, _08023218 + ldr r2, =0x082f326c ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -72495,14 +70804,13 @@ _080231E4: bl audio_play b _080232DC .align 2, 0 -_08023214: .4byte 0x00000139 -_08023218: .4byte 0x082f326c + .pool _0802321C: - ldr r7, _08023294 + ldr r7, =0x082f326c movs r0, 0x9C lsls r0, 1 adds r6, r4, r0 - ldr r1, _08023298 + ldr r1, =0x00000139 adds r5, r4, r1 ldrb r1, [r5] lsls r0, r1, 3 @@ -72556,8 +70864,7 @@ _0802321C: strb r0, [r6] b _080232E2 .align 2, 0 -_08023294: .4byte 0x082f326c -_08023298: .4byte 0x00000139 + .pool _0802329C: movs r0, 0 strh r0, [r4, 0x2C] @@ -72647,7 +70954,7 @@ _08023338: adds r1, r4, r0 movs r0, 0 strb r0, [r1] - ldr r2, _08023374 + ldr r2, =0x00000139 adds r1, r4, r2 strb r0, [r1] adds r2, 0x1 @@ -72666,7 +70973,7 @@ _08023338: bl sub_8022BEC b _08023382 .align 2, 0 -_08023374: .4byte 0x00000139 + .pool _08023378: movs r0, 0xE movs r1, 0x1 @@ -72708,11 +71015,11 @@ sub_802339C: @ 802339C movs r2, 0x5E adds r2, r4 mov r9, r2 - ldr r3, _08023460 + ldr r3, =0x082f325c mov r10, r3 _080233C0: lsls r0, r7, 4 - ldr r1, _08023464 + ldr r1, =0x03003090 adds r2, r0, r1 ldrh r1, [r2] movs r0, 0xFF @@ -72792,8 +71099,7 @@ _080233C0: strh r1, [r0] b _08023476 .align 2, 0 -_08023460: .4byte 0x082f325c -_08023464: .4byte 0x03003090 + .pool _08023468: adds r0, r4, r6 adds r2, r0, 0 @@ -72868,7 +71174,7 @@ _080234E0: ldrh r0, [r4, 0x2E] add r0, r8 strh r0, [r4, 0x2E] - ldr r1, _08023530 + ldr r1, =0x082f3264 mov r0, r8 subs r0, 0x1 adds r0, r1 @@ -72901,7 +71207,7 @@ _080234E0: strb r2, [r0] b _08023548 .align 2, 0 -_08023530: .4byte 0x082f3264 + .pool _08023534: adds r1, r4, 0 adds r1, 0x24 @@ -72980,7 +71286,7 @@ _080235B0: strh r1, [r0] cmp r6, 0 bne _080235D4 - ldr r2, _080235D0 + ldr r2, =0x0000013b adds r0, r3, r2 ldrb r0, [r0] cmp r0, 0 @@ -72990,21 +71296,21 @@ _080235B0: adds r1, r3, r4 b _08023612 .align 2, 0 -_080235D0: .4byte 0x0000013b + .pool _080235D4: - ldr r5, _08023600 + ldr r5, =0x0000013b adds r2, r3, r5 ldrb r0, [r2] cmp r0, 0 beq _0802361A - ldr r0, _08023604 + ldr r0, =0x00000139 adds r1, r3, r0 ldrb r2, [r1] cmp r6, r2 beq _0802360C subs r0, r6, 0x1 strb r0, [r1] - ldr r1, _08023608 + ldr r1, =0x082f3290 lsls r0, 2 adds r0, r1 ldrb r0, [r0] @@ -73014,9 +71320,7 @@ _080235D4: strb r0, [r1] b _08023640 .align 2, 0 -_08023600: .4byte 0x0000013b -_08023604: .4byte 0x00000139 -_08023608: .4byte 0x082f3290 + .pool _0802360C: movs r5, 0x9C lsls r5, 1 @@ -73033,10 +71337,10 @@ _0802361A: movs r0, 0 strb r0, [r1] subs r0, r6, 0x1 - ldr r4, _08023670 + ldr r4, =0x00000139 adds r1, r3, r4 strb r0, [r1] - ldr r1, _08023674 + ldr r1, =0x082f3290 lsls r0, 2 adds r0, r1 ldrb r0, [r0] @@ -73047,7 +71351,7 @@ _0802361A: movs r0, 0x1 strb r0, [r2] _08023640: - ldr r0, _08023678 + ldr r0, =0x0000013b adds r4, r3, r0 ldrb r0, [r4] cmp r0, 0 @@ -73064,7 +71368,7 @@ _08023640: bcc _0802367C movs r0, 0 strb r0, [r1] - ldr r5, _08023670 + ldr r5, =0x00000139 adds r1, r3, r5 strb r0, [r1] strb r0, [r2] @@ -73072,13 +71376,11 @@ _08023640: movs r1, 0 b _08023690 .align 2, 0 -_08023670: .4byte 0x00000139 -_08023674: .4byte 0x082f3290 -_08023678: .4byte 0x0000013b + .pool _0802367C: - ldr r2, _08023698 + ldr r2, =0x082f3290 ldrb r1, [r1] - ldr r4, _0802369C + ldr r4, =0x00000139 adds r0, r3, r4 ldrb r0, [r0] lsls r0, 2 @@ -73092,8 +71394,7 @@ _08023690: strb r1, [r0] b _080236A8 .align 2, 0 -_08023698: .4byte 0x082f3290 -_0802369C: .4byte 0x00000139 + .pool _080236A0: adds r1, r3, 0 adds r1, 0x5F @@ -73115,7 +71416,7 @@ sub_80236B8: @ 80236B8 mov r7, r8 push {r7} adds r5, r0, 0 - ldr r3, _0802374C + ldr r3, =0x030022c0 ldrh r1, [r3, 0x2E] movs r4, 0x1 adds r0, r4, 0 @@ -73173,7 +71474,7 @@ _08023710: bne _08023768 movs r0, 0x2E ldrsh r2, [r5, r0] - ldr r1, _08023750 + ldr r1, =0x082f4444 ldrb r0, [r5, 0x9] subs r0, 0x2 adds r0, r1 @@ -73188,8 +71489,7 @@ _08023710: orrs r0, r1 b _0802375C .align 2, 0 -_0802374C: .4byte 0x030022c0 -_08023750: .4byte 0x082f4444 + .pool _08023754: ldrb r1, [r6] movs r0, 0x11 @@ -73211,7 +71511,7 @@ _08023768: bne _080237DE movs r0, 0x34 ldrsh r2, [r5, r0] - ldr r3, _08023794 + ldr r3, =0x082f4434 ldrb r0, [r5, 0x9] subs r0, 0x2 lsls r1, r0, 2 @@ -73225,7 +71525,7 @@ _08023768: strb r0, [r6] b _080237D8 .align 2, 0 -_08023794: .4byte 0x082f4434 + .pool _08023798: adds r0, r3, 0x1 adds r0, r1, r0 @@ -73291,7 +71591,7 @@ _080237FA: strh r4, [r5, 0x10] _0802380A: ldrh r1, [r5, 0x28] - ldr r0, _08023858 + ldr r0, =0x00008c9f cmp r1, r0 bls _0802381A ldrb r0, [r7] @@ -73329,7 +71629,7 @@ _0802384C: pop {r0} bx r0 .align 2, 0 -_08023858: .4byte 0x00008c9f + .pool thumb_func_end sub_80236B8 thumb_func_start sub_802385C @@ -73337,7 +71637,7 @@ sub_802385C: @ 802385C push {r4,r5,lr} adds r5, r0, 0 movs r4, 0 - ldr r3, _080238A8 + ldr r3, =0x03003090 ldrb r0, [r5, 0x9] cmp r4, r0 bcs _08023880 @@ -73376,7 +71676,7 @@ _08023898: strb r0, [r2] b _080238EA .align 2, 0 -_080238A8: .4byte 0x03003090 + .pool _080238AC: adds r4, r5, 0 adds r4, 0x4E @@ -73454,7 +71754,7 @@ sub_80238F0: @ 80238F0 cmp r0, 0 beq _08023978 ldrh r1, [r4, 0x28] - ldr r0, _08023960 + ldr r0, =0x00008c9f cmp r1, r0 bls _08023964 adds r0, 0x1 @@ -73465,7 +71765,7 @@ sub_80238F0: @ 80238F0 bl sub_8022BEC b _0802396E .align 2, 0 -_08023960: .4byte 0x00008c9f + .pool _08023964: movs r0, 0xF movs r1, 0x1 @@ -73535,7 +71835,7 @@ sub_8023998: @ 8023998 cmp r0, 0 beq _08023A20 ldrh r1, [r4, 0x28] - ldr r0, _08023A08 + ldr r0, =0x00008c9f cmp r1, r0 bls _08023A0C adds r0, 0x1 @@ -73546,7 +71846,7 @@ sub_8023998: @ 8023998 bl sub_8022BEC b _08023A16 .align 2, 0 -_08023A08: .4byte 0x00008c9f + .pool _08023A0C: movs r0, 0xF movs r1, 0x1 @@ -73578,12 +71878,12 @@ sub_8023A30: @ 8023A30 b _08023BB2 _08023A3C: lsls r0, 2 - ldr r1, _08023A48 + ldr r1, =_08023A4C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08023A48: .4byte _08023A4C + .pool .align 2, 0 _08023A4C: .4byte _08023A64 @@ -73599,7 +71899,7 @@ _08023A64: bl audio_play movs r0, 0x1 negs r0, r0 - ldr r2, _08023A88 + ldr r2, =0x000003ff movs r1, 0x8 bl sub_80A2A20 movs r0, 0x9C @@ -73609,7 +71909,7 @@ _08023A64: strb r0, [r1] b _08023BB2 .align 2, 0 -_08023A88: .4byte 0x000003ff + .pool _08023A8C: movs r1, 0x9C lsls r1, 1 @@ -73625,16 +71925,16 @@ _08023A8C: _08023AA2: movs r0, 0x1 negs r0, r0 - ldr r2, _08023AD0 + ldr r2, =0x000003ff movs r1, 0 bl sub_80A2A20 - ldr r2, _08023AD4 + ldr r2, =0x00000139 adds r1, r4, r2 movs r0, 0x4 strb r0, [r1] movs r0, 0 strb r0, [r5] - ldr r2, _08023AD8 + ldr r2, =0x082f326c ldrb r1, [r1] lsls r0, r1, 3 subs r0, r1 @@ -73646,15 +71946,13 @@ _08023AA2: strb r0, [r1] b _08023BB2 .align 2, 0 -_08023AD0: .4byte 0x000003ff -_08023AD4: .4byte 0x00000139 -_08023AD8: .4byte 0x082f326c + .pool _08023ADC: - ldr r7, _08023B54 + ldr r7, =0x082f326c movs r0, 0x9C lsls r0, 1 adds r6, r4, r0 - ldr r1, _08023B58 + ldr r1, =0x00000139 adds r5, r4, r1 ldrb r1, [r5] lsls r0, r1, 3 @@ -73708,8 +72006,7 @@ _08023ADC: strb r0, [r6] b _08023BB8 .align 2, 0 -_08023B54: .4byte 0x082f326c -_08023B58: .4byte 0x00000139 + .pool _08023B5C: movs r0, 0 strh r0, [r4, 0x2C] @@ -73842,7 +72139,7 @@ _08023C5C: lsls r0, 24 cmp r0, 0 beq _08023CA2 - ldr r0, _08023C98 + ldr r0, =0x02021cc4 ldr r1, [r5, 0x1C] movs r2, 0 movs r3, 0x6 @@ -73864,7 +72161,7 @@ _08023C5C: strh r4, [r5, 0x10] b _08023CA0 .align 2, 0 -_08023C98: .4byte 0x02021cc4 + .pool _08023C9C: ldrb r0, [r5, 0xC] adds r0, 0x1 @@ -73893,12 +72190,12 @@ sub_8023CAC: @ 8023CAC b _0802402E _08023CC2: lsls r0, 2 - ldr r1, _08023CCC + ldr r1, =_08023CD0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08023CCC: .4byte _08023CD0 + .pool .align 2, 0 _08023CD0: .4byte _08023CF0 @@ -73948,7 +72245,7 @@ _08023D36: b _08024004 _08023D38: bl sub_800A550 - ldr r2, _08023D94 + ldr r2, =0x082f4448 ldrb r3, [r7, 0x9] subs r1, r3, 0x2 adds r1, r2 @@ -73965,7 +72262,7 @@ _08023D50: adds r4, 0x42 cmp r8, r3 bcs _08023D7E - ldr r2, _08023D98 + ldr r2, =0x020223c4 _08023D5E: mov r3, r8 lsls r1, r3, 5 @@ -73994,8 +72291,7 @@ _08023D7E: movs r0, 0x3 b _08024032 .align 2, 0 -_08023D94: .4byte 0x082f4448 -_08023D98: .4byte 0x020223c4 + .pool _08023D9C: movs r0, 0x6 b _08024032 @@ -74301,7 +72597,7 @@ _08023FDC: movs r1, 0 movs r2, 0x30 bl memset - ldr r1, _0802400C + ldr r1, =0x020223c4 adds r0, r4, 0 movs r2, 0x30 bl memcpy @@ -74311,7 +72607,7 @@ _08024004: strh r0, [r7, 0x10] b _0802402E .align 2, 0 -_0802400C: .4byte 0x020223c4 + .pool _08024010: bl sub_8020E58 movs r0, 0x12 @@ -74353,12 +72649,12 @@ sub_8024048: @ 8024048 cmp r0, 0x4 bhi _08024124 lsls r0, 2 - ldr r1, _08024060 + ldr r1, =_08024064 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08024060: .4byte _08024064 + .pool .align 2, 0 _08024064: .4byte _08024078 @@ -74395,7 +72691,7 @@ _0802409C: strb r0, [r1] b _0802412A _080240AE: - ldr r0, _080240C8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -74407,7 +72703,7 @@ _080240AE: bl sub_802222C b _08024124 .align 2, 0 -_080240C8: .4byte 0x030022c0 + .pool _080240CC: ldrh r0, [r5, 0x12] cmp r0, 0xC @@ -74418,12 +72714,12 @@ _080240CC: strb r1, [r5, 0xC] b _0802412A _080240DC: - ldr r0, _0802411C + ldr r0, =0x02021cc4 ldr r1, [r5, 0x1C] movs r2, 0 movs r3, 0x6 bl decimal_int_to_string - ldr r4, _08024120 + ldr r4, =0x02021dc4 bl sub_80247BC adds r1, r0, 0 adds r0, r4, 0 @@ -74446,8 +72742,7 @@ _080240DC: strb r4, [r5, 0xC] b _0802412A .align 2, 0 -_0802411C: .4byte 0x02021cc4 -_08024120: .4byte 0x02021dc4 + .pool _08024124: ldrb r0, [r5, 0xC] adds r0, 0x1 @@ -74470,12 +72765,12 @@ sub_8024134: @ 8024134 cmp r0, 0x4 bhi _08024218 lsls r0, 2 - ldr r1, _0802414C + ldr r1, =_08024150 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802414C: .4byte _08024150 + .pool .align 2, 0 _08024150: .4byte _08024164 @@ -74485,7 +72780,7 @@ _08024150: .4byte _08024204 _08024164: ldrh r1, [r5, 0x28] - ldr r0, _0802419C + ldr r0, =0x00008c9f cmp r1, r0 bls _08024176 movs r1, 0x9C @@ -74510,7 +72805,7 @@ _08024176: strb r4, [r5, 0xC] b _0802421E .align 2, 0 -_0802419C: .4byte 0x00008c9f + .pool _080241A0: bl sub_8010434 b _08024218 @@ -74522,7 +72817,7 @@ _080241A6: movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, _080241E8 + ldr r2, =0x082c8959 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -74538,22 +72833,21 @@ _080241A6: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _080241EC + ldr r0, =sub_8153688 + 1 movs r1, 0 bl AddTask b _08024218 .align 2, 0 -_080241E8: .4byte 0x082c8959 -_080241EC: .4byte sub_8153688 + 1 + .pool _080241F0: - ldr r0, _08024200 + ldr r0, =sub_8153688 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 beq _08024218 b _0802421E .align 2, 0 -_08024200: .4byte sub_8153688 + 1 + .pool _08024204: movs r0, 0x14 movs r1, 0x1 @@ -74721,7 +73015,7 @@ _08024328: b _080243AC _08024336: bl sub_800A550 - ldr r2, _08024388 + ldr r2, =0x082f4448 ldrb r3, [r4, 0x9] subs r1, r3, 0x2 adds r1, r2 @@ -74737,7 +73031,7 @@ _08024336: cmp r5, r3 bcs _08024374 adds r1, r6, 0 - ldr r2, _0802438C + ldr r2, =0x020223c4 _0802435C: lsls r0, r5, 8 adds r0, r2 @@ -74761,8 +73055,7 @@ _08024374: bl sub_8022BEC b _0802439A .align 2, 0 -_08024388: .4byte 0x082f4448 -_0802438C: .4byte 0x020223c4 + .pool _08024390: movs r0, 0x16 movs r1, 0x1 @@ -74887,7 +73180,7 @@ _08024460: ldrh r1, [r5, 0x14] cmp r1, 0x3 bne _08024490 - ldr r0, _0802448C + ldr r0, =0x082f32a4 ldr r2, [r0, 0x14] ldrb r3, [r5, 0xB] str r4, [sp] @@ -74901,9 +73194,9 @@ _08024460: bl text_box_related_one b _080244AC .align 2, 0 -_0802448C: .4byte 0x082f32a4 + .pool _08024490: - ldr r0, _080244B8 + ldr r0, =0x082f32a4 ldr r2, [r0, 0x18] ldrb r3, [r5, 0xB] str r4, [sp] @@ -74922,7 +73215,7 @@ _080244AC: bl Window_CopyToVram b _080244F6 .align 2, 0 -_080244B8: .4byte 0x082f32a4 + .pool _080244BC: movs r0, 0 bl a_pressed_maybe @@ -74992,7 +73285,7 @@ _08024528: bl sub_800AC34 b _08024558 _08024538: - ldr r0, _08024554 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0802455E @@ -75005,7 +73298,7 @@ _08024538: strb r4, [r5, 0xC] b _0802455E .align 2, 0 -_08024554: .4byte 0x03003124 + .pool _08024558: ldrb r0, [r5, 0xC] adds r0, 0x1 @@ -75054,7 +73347,7 @@ sub_8024578: @ 8024578 strh r5, [r4, 0x26] strh r5, [r4, 0x28] strh r5, [r4, 0x2E] - ldr r0, _08024600 + ldr r0, =0x0000ffff strh r0, [r4, 0x32] strh r5, [r4, 0x30] strh r5, [r4, 0x34] @@ -75065,7 +73358,7 @@ _080245B8: adds r2, r4, r0 adds r1, r2, 0 adds r1, 0xA4 - ldr r0, _08024600 + ldr r0, =0x0000ffff strh r0, [r1] adds r0, r2, 0 adds r0, 0xA6 @@ -75097,7 +73390,7 @@ _080245B8: pop {r0} bx r0 .align 2, 0 -_08024600: .4byte 0x0000ffff + .pool thumb_func_end sub_8024578 thumb_func_start sub_8024604 @@ -75159,7 +73452,7 @@ sub_8024644: @ 8024644 thumb_func_start sub_8024668 sub_8024668: @ 8024668 - ldr r1, _08024678 + ldr r1, =0x03005d90 ldr r1, [r1] adds r1, 0xAC ldr r0, [r0] @@ -75167,12 +73460,12 @@ sub_8024668: @ 8024668 eors r0, r1 bx lr .align 2, 0 -_08024678: .4byte 0x03005d90 + .pool thumb_func_end sub_8024668 thumb_func_start sub_802467C sub_802467C: @ 802467C - ldr r2, _0802468C + ldr r2, =0x03005d90 ldr r2, [r2] adds r2, 0xAC ldr r2, [r2] @@ -75180,14 +73473,14 @@ sub_802467C: @ 802467C str r2, [r0] bx lr .align 2, 0 -_0802468C: .4byte 0x03005d90 + .pool thumb_func_end sub_802467C thumb_func_start sub_8024690 sub_8024690: @ 8024690 push {lr} adds r1, r0, 0 - ldr r0, _080246A8 + ldr r0, =0x03005d90 ldr r0, [r0] movs r2, 0xFA lsls r2, 1 @@ -75196,14 +73489,14 @@ sub_8024690: @ 8024690 pop {r0} bx r0 .align 2, 0 -_080246A8: .4byte 0x03005d90 + .pool thumb_func_end sub_8024690 thumb_func_start sub_80246AC sub_80246AC: @ 80246AC push {r4,lr} adds r4, r0, 0 - ldr r0, _080246C8 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xFA lsls r1, 1 @@ -75214,7 +73507,7 @@ sub_80246AC: @ 80246AC movs r0, 0x1 b _080246CE .align 2, 0 -_080246C8: .4byte 0x03005d90 + .pool _080246CC: movs r0, 0 _080246CE: @@ -75226,21 +73519,20 @@ _080246CE: thumb_func_start sub_80246D4 sub_80246D4: @ 80246D4 push {lr} - ldr r0, _080246F0 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xFA lsls r1, 1 adds r0, r1 bl sub_8024668 - ldr r1, _080246F4 + ldr r1, =0x020375e0 ldrh r1, [r1] cmp r0, r1 bcc _080246F8 movs r0, 0x1 b _080246FA .align 2, 0 -_080246F0: .4byte 0x03005d90 -_080246F4: .4byte 0x020375e0 + .pool _080246F8: movs r0, 0 _080246FA: @@ -75252,7 +73544,7 @@ _080246FA: sub_8024700: @ 8024700 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _08024728 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xFA lsls r1, 1 @@ -75260,7 +73552,7 @@ sub_8024700: @ 8024700 adds r0, r5, 0 bl sub_8024668 adds r1, r0, r4 - ldr r2, _0802472C + ldr r2, =0x0001869f cmp r1, r2 bhi _08024730 adds r0, r5, 0 @@ -75268,8 +73560,7 @@ sub_8024700: @ 8024700 movs r0, 0x1 b _0802473A .align 2, 0 -_08024728: .4byte 0x03005d90 -_0802472C: .4byte 0x0001869f + .pool _08024730: adds r0, r5, 0 adds r1, r2, 0 @@ -75285,7 +73576,7 @@ _0802473A: sub_8024740: @ 8024740 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08024770 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xFA lsls r1, 1 @@ -75304,7 +73595,7 @@ sub_8024740: @ 8024740 movs r0, 0x1 b _08024776 .align 2, 0 -_08024770: .4byte 0x03005d90 + .pool _08024774: movs r0, 0 _08024776: @@ -75316,12 +73607,12 @@ _08024776: thumb_func_start sub_802477C sub_802477C: @ 802477C push {r4,r5,lr} - ldr r0, _080247AC + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xFA lsls r1, 1 adds r4, r0, r1 - ldr r5, _080247B0 + ldr r5, =0x020375e0 ldrh r0, [r5] bl sub_80246AC lsls r0, 24 @@ -75337,8 +73628,7 @@ sub_802477C: @ 802477C movs r0, 0x1 b _080247B6 .align 2, 0 -_080247AC: .4byte 0x03005d90 -_080247B0: .4byte 0x020375e0 + .pool _080247B4: movs r0, 0 _080247B6: @@ -75350,7 +73640,7 @@ _080247B6: thumb_func_start sub_80247BC sub_80247BC: @ 80247BC push {lr} - ldr r0, _080247D0 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xFA lsls r1, 1 @@ -75359,7 +73649,7 @@ sub_80247BC: @ 80247BC pop {r1} bx r1 .align 2, 0 -_080247D0: .4byte 0x03005d90 + .pool thumb_func_end sub_80247BC thumb_func_start sub_80247D4 @@ -75383,7 +73673,7 @@ sub_80247D4: @ 80247D4 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _08024828 + ldr r0, =0x02021cc4 mov r9, r0 movs r2, 0x1 movs r3, 0x5 @@ -75405,7 +73695,7 @@ sub_80247D4: @ 80247D4 pop {r0} bx r0 .align 2, 0 -_08024828: .4byte 0x02021cc4 + .pool thumb_func_end sub_80247D4 thumb_func_start sub_802482C @@ -75429,7 +73719,7 @@ sub_802482C: @ 802482C adds r2, r4, 0 adds r3, r5, 0 bl SetWindowBorderStyle - ldr r2, _08024888 + ldr r2, =0x085edcde movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -75453,7 +73743,7 @@ sub_802482C: @ 802482C pop {r0} bx r0 .align 2, 0 -_08024888: .4byte 0x085edcde + .pool thumb_func_end sub_802482C thumb_func_start sub_802488C @@ -75462,7 +73752,7 @@ sub_802488C: @ 802488C sub sp, 0x4 bl sub_80247BC adds r1, r0, 0 - ldr r0, _080248AC + ldr r0, =0x02022c94 ldrb r0, [r0] movs r2, 0 str r2, [sp] @@ -75473,7 +73763,7 @@ sub_802488C: @ 802488C pop {r0} bx r0 .align 2, 0 -_080248AC: .4byte 0x02022c94 + .pool thumb_func_end sub_802488C thumb_func_start sub_80248B0 @@ -75493,7 +73783,7 @@ sub_80248B0: @ 80248B0 movs r2, 0x1 movs r3, 0x1 bl rbox_template_set - ldr r4, _08024910 + ldr r4, =0x02022c94 add r0, sp, 0x10 bl Window_AddFromTemplate strb r0, [r4] @@ -75503,7 +73793,7 @@ sub_80248B0: @ 80248B0 ldrb r0, [r4] bl Window_WriteStandardTileMap ldrb r0, [r4] - ldr r5, _08024914 + ldr r5, =0x0000021d adds r1, r5, 0 movs r2, 0xD0 bl box_border_load_tiles_and_pal @@ -75519,14 +73809,13 @@ sub_80248B0: @ 80248B0 pop {r0} bx r0 .align 2, 0 -_08024910: .4byte 0x02022c94 -_08024914: .4byte 0x0000021d + .pool thumb_func_end sub_80248B0 thumb_func_start sub_8024918 sub_8024918: @ 8024918 push {r4,lr} - ldr r4, _08024938 + ldr r4, =0x02022c94 ldrb r0, [r4] bl Window_FillTileMap ldrb r0, [r4] @@ -75538,7 +73827,7 @@ sub_8024918: @ 8024918 pop {r0} bx r0 .align 2, 0 -_08024938: .4byte 0x02022c94 + .pool thumb_func_end sub_8024918 thumb_func_start sub_802493C @@ -75547,15 +73836,15 @@ sub_802493C: @ 802493C adds r5, r1, 0 lsls r0, 16 lsrs r6, r0, 16 - ldr r1, _080249E4 + ldr r1, =0x03000db0 movs r0, 0 str r0, [r1] - ldr r0, _080249E8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08024A10 - ldr r4, _080249EC - ldr r0, _080249F0 + ldr r4, =0x02022c98 + ldr r0, =0x00003330 bl malloc_and_clear str r0, [r4] cmp r0, 0 @@ -75570,7 +73859,7 @@ sub_802493C: @ 802493C adds r1, 0x28 strb r0, [r1] ldr r1, [r4] - ldr r2, _080249F4 + ldr r2, =0x000032cc adds r0, r1, r2 adds r2, r1, 0 adds r2, 0x28 @@ -75579,7 +73868,7 @@ sub_802493C: @ 802493C subs r2, r3 lsls r2, 2 adds r1, r2 - ldr r2, _080249F8 + ldr r2, =0x000031a0 adds r1, r2 movs r2, 0x3C bl memcpy @@ -75588,18 +73877,18 @@ sub_802493C: @ 802493C adds r1, 0x28 ldrb r1, [r1] lsls r1, 2 - ldr r2, _080249FC + ldr r2, =0x0000318c adds r1, r2 adds r0, r1 movs r1, 0x64 muls r1, r6 - ldr r2, _08024A00 + ldr r2, =0x020244ec adds r1, r2 bl sub_80261F8 - ldr r0, _08024A04 + ldr r0, =sub_8024BC8 + 1 movs r1, 0x1 bl AddTask - ldr r0, _08024A08 + ldr r0, =sub_80261CC + 1 bl set_callback2 bl sub_80273F0 ldr r2, [r4] @@ -75611,21 +73900,11 @@ sub_802493C: @ 802493C adds r2, 0x48 bl sub_8026B5C bl sub_80A2F30 - ldr r0, _08024A0C + ldr r0, =0x0000021e bl current_map_music_set b _08024A16 .align 2, 0 -_080249E4: .4byte 0x03000db0 -_080249E8: .4byte 0x03003124 -_080249EC: .4byte 0x02022c98 -_080249F0: .4byte 0x00003330 -_080249F4: .4byte 0x000032cc -_080249F8: .4byte 0x000031a0 -_080249FC: .4byte 0x0000318c -_08024A00: .4byte 0x020244ec -_08024A04: .4byte sub_8024BC8 + 1 -_08024A08: .4byte sub_80261CC + 1 -_08024A0C: .4byte 0x0000021e + .pool _08024A10: adds r0, r5, 0 bl set_callback2 @@ -75861,7 +74140,7 @@ sub_8024BC8: @ 8024BC8 sub sp, 0x4 lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _08024BE8 + ldr r0, =0x02022c98 ldr r0, [r0] ldrb r0, [r0, 0xC] cmp r0, 0x7 @@ -75869,13 +74148,12 @@ sub_8024BC8: @ 8024BC8 b _08024D34 _08024BDC: lsls r0, 2 - ldr r1, _08024BEC + ldr r1, =_08024BF0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08024BE8: .4byte 0x02022c98 -_08024BEC: .4byte _08024BF0 + .pool .align 2, 0 _08024BF0: .4byte _08024C10 @@ -75889,21 +74167,21 @@ _08024BF0: _08024C10: movs r0, 0 bl SetVBlankCallback - ldr r0, _08024C20 + ldr r0, =sub_8025910 + 1 movs r1, 0x4 bl sub_802620C b _08024D20 .align 2, 0 -_08024C20: .4byte sub_8025910 + 1 + .pool _08024C24: - ldr r0, _08024C44 + ldr r0, =sub_8025910 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 beq _08024C32 b _08024D40 _08024C32: - ldr r4, _08024C48 + ldr r4, =0x02022c98 ldr r0, [r4] movs r1, 0xB0 lsls r1, 1 @@ -75912,8 +74190,7 @@ _08024C32: ldr r1, [r4] b _08024D24 .align 2, 0 -_08024C44: .4byte sub_8025910 + 1 -_08024C48: .4byte 0x02022c98 + .pool _08024C4C: bl sub_802A770 cmp r0, 0 @@ -75925,7 +74202,7 @@ _08024C5A: lsls r0, 24 cmp r0, 0 beq _08024D40 - ldr r0, _08024C7C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08024D20 @@ -75935,9 +74212,9 @@ _08024C5A: bl sub_800DFB4 b _08024D20 .align 2, 0 -_08024C7C: .4byte 0x03003124 + .pool _08024C80: - ldr r0, _08024CCC + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x24 ldrb r5, [r0] @@ -75946,14 +74223,14 @@ _08024C80: cmp r4, r5 bcs _08024CBA _08024C92: - ldr r0, _08024CCC + ldr r0, =0x02022c98 ldr r1, [r0] adds r0, r1, 0 adds r0, 0x34 adds r0, r4 ldrb r2, [r0] lsls r0, r2, 2 - ldr r3, _08024CD0 + ldr r3, =0x0000318c adds r0, r3 adds r0, r1, r0 adds r1, 0x24 @@ -75966,7 +74243,7 @@ _08024C92: cmp r4, r5 bcc _08024C92 _08024CBA: - ldr r4, _08024CCC + ldr r4, =0x02022c98 ldr r0, [r4] adds r0, 0x24 ldrb r1, [r0] @@ -75975,8 +74252,7 @@ _08024CBA: ldr r1, [r4] b _08024D24 .align 2, 0 -_08024CCC: .4byte 0x02022c98 -_08024CD0: .4byte 0x0000318c + .pool _08024CD4: bl sub_8028A34 bl sub_8028A88 @@ -75997,21 +74273,21 @@ _08024CE6: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _08024D0C + ldr r0, =sub_80261E4 + 1 bl SetVBlankCallback b _08024D20 .align 2, 0 -_08024D0C: .4byte sub_80261E4 + 1 + .pool _08024D10: bl fade_and_return_progress_probably - ldr r0, _08024D2C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08024D40 _08024D20: - ldr r0, _08024D30 + ldr r0, =0x02022c98 ldr r1, [r0] _08024D24: ldrb r0, [r1, 0xC] @@ -76019,12 +74295,11 @@ _08024D24: strb r0, [r1, 0xC] b _08024D40 .align 2, 0 -_08024D2C: .4byte 0x02037fd4 -_08024D30: .4byte 0x02022c98 + .pool _08024D34: adds r0, r1, 0 bl remove_task - ldr r0, _08024D48 + ldr r0, =sub_802589C + 1 bl sub_802621C _08024D40: add sp, 0x4 @@ -76032,22 +74307,22 @@ _08024D40: pop {r0} bx r0 .align 2, 0 -_08024D48: .4byte sub_802589C + 1 + .pool thumb_func_end sub_8024BC8 thumb_func_start sub_8024D4C sub_8024D4C: @ 8024D4C push {lr} bl sub_8025D04 - ldr r1, _08024D78 - ldr r0, _08024D7C + ldr r1, =0x082f7ac4 + ldr r0, =0x02022c98 ldr r0, [r0] ldrb r0, [r0, 0x18] lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _call_via_r0 - ldr r0, _08024D80 + ldr r0, =0x03000db0 ldr r0, [r0] cmp r0, 0 bne _08024D70 @@ -76057,24 +74332,22 @@ _08024D70: pop {r0} bx r0 .align 2, 0 -_08024D78: .4byte 0x082f7ac4 -_08024D7C: .4byte 0x02022c98 -_08024D80: .4byte 0x03000db0 + .pool thumb_func_end sub_8024D4C thumb_func_start sub_8024D84 sub_8024D84: @ 8024D84 push {lr} bl sub_8025E0C - ldr r1, _08024DB0 - ldr r0, _08024DB4 + ldr r1, =0x082f7af4 + ldr r0, =0x02022c98 ldr r0, [r0] ldrb r0, [r0, 0x18] lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _call_via_r0 - ldr r0, _08024DB8 + ldr r0, =0x03000db0 ldr r0, [r0] cmp r0, 0 bne _08024DA8 @@ -76084,15 +74357,13 @@ _08024DA8: pop {r0} bx r0 .align 2, 0 -_08024DB0: .4byte 0x082f7af4 -_08024DB4: .4byte 0x02022c98 -_08024DB8: .4byte 0x03000db0 + .pool thumb_func_end sub_8024D84 thumb_func_start sub_8024DBC sub_8024DBC: @ 8024DBC push {r4,lr} - ldr r4, _08024DD0 + ldr r4, =0x02022c98 ldr r0, [r4] ldrb r0, [r0, 0x10] cmp r0, 0 @@ -76101,7 +74372,7 @@ sub_8024DBC: @ 8024DBC beq _08024DEA b _08024DF8 .align 2, 0 -_08024DD0: .4byte 0x02022c98 + .pool _08024DD4: movs r0, 0x1 bl sub_8028504 @@ -76127,7 +74398,7 @@ _08024DF8: thumb_func_start sub_8024E00 sub_8024E00: @ 8024E00 push {r4,lr} - ldr r4, _08024E1C + ldr r4, =0x02022c98 ldr r1, [r4] ldrb r0, [r1, 0x10] cmp r0, 0 @@ -76139,7 +74410,7 @@ sub_8024E00: @ 8024E00 strb r0, [r1, 0x10] b _08024E30 .align 2, 0 -_08024E1C: .4byte 0x02022c98 + .pool _08024E20: movs r0, 0x8C lsls r0, 1 @@ -76158,20 +74429,19 @@ _08024E30: sub_8024E38: @ 8024E38 push {r4,lr} sub sp, 0x4 - ldr r1, _08024E54 + ldr r1, =0x02022c98 ldr r0, [r1] ldrb r0, [r0, 0x10] adds r4, r1, 0 cmp r0, 0x5 bhi _08024F08 lsls r0, 2 - ldr r1, _08024E58 + ldr r1, =_08024E5C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08024E54: .4byte 0x02022c98 -_08024E58: .4byte _08024E5C + .pool .align 2, 0 _08024E5C: .4byte _08024E74 @@ -76188,24 +74458,24 @@ _08024E74: movs r2, 0x78 movs r3, 0x50 bl sub_802EB24 - ldr r0, _08024E8C + ldr r0, =0x02022c98 ldr r1, [r0] b _08024EF0 .align 2, 0 -_08024E8C: .4byte 0x02022c98 + .pool _08024E90: bl sub_8010434 - ldr r0, _08024E9C + ldr r0, =0x02022c98 ldr r1, [r0] b _08024EF0 .align 2, 0 -_08024E9C: .4byte 0x02022c98 + .pool _08024EA0: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _08024F08 - ldr r2, _08024EC0 + ldr r2, =0x02022c98 ldr r1, [r2] ldrb r0, [r1, 0x10] adds r0, 0x1 @@ -76216,16 +74486,16 @@ _08024EA0: strb r3, [r0] b _08024F08 .align 2, 0 -_08024EC0: .4byte 0x02022c98 + .pool _08024EC4: bl sub_802EB84 cmp r0, 0 bne _08024F08 - ldr r0, _08024ED4 + ldr r0, =0x02022c98 ldr r1, [r0] b _08024EF0 .align 2, 0 -_08024ED4: .4byte 0x02022c98 + .pool _08024ED8: ldr r1, [r4] adds r1, 0x30 @@ -76260,7 +74530,7 @@ _08024F08: thumb_func_start sub_8024F10 sub_8024F10: @ 8024F10 push {lr} - ldr r0, _08024F34 + ldr r0, =0x02022c98 ldr r1, [r0] ldrb r0, [r1, 0x10] cmp r0, 0 @@ -76277,13 +74547,13 @@ _08024F2E: pop {r0} bx r0 .align 2, 0 -_08024F34: .4byte 0x02022c98 + .pool thumb_func_end sub_8024F10 thumb_func_start sub_8024F38 sub_8024F38: @ 8024F38 push {r4,lr} - ldr r4, _08024F78 + ldr r4, =0x02022c98 ldr r2, [r4] ldrb r0, [r2, 0x10] cmp r0, 0 @@ -76298,33 +74568,30 @@ sub_8024F38: @ 8024F38 ldrb r0, [r0] cmp r0, 0 bne _08024FEE - ldr r0, _08024F7C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _08024F88 - ldr r1, _08024F80 + ldr r1, =0x000031cc adds r0, r2, r1 ldrb r1, [r0] cmp r1, 0 bne _08024FEE - ldr r3, _08024F84 + ldr r3, =0x000031d0 adds r0, r2, r3 strb r1, [r0] movs r0, 0x2 b _08024FC2 .align 2, 0 -_08024F78: .4byte 0x02022c98 -_08024F7C: .4byte 0x030022c0 -_08024F80: .4byte 0x000031cc -_08024F84: .4byte 0x000031d0 + .pool _08024F88: movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _08024FA8 - ldr r3, _08024FA4 + ldr r3, =0x000031cc adds r0, r2, r3 ldrb r1, [r0] cmp r1, 0 @@ -76335,13 +74602,13 @@ _08024F88: movs r0, 0x1 b _08024FC2 .align 2, 0 -_08024FA4: .4byte 0x000031cc + .pool _08024FA8: movs r0, 0x20 ands r0, r1 cmp r0, 0 beq _08024FD4 - ldr r3, _08024FD0 + ldr r3, =0x000031cc adds r0, r2, r3 ldrb r1, [r0] cmp r1, 0 @@ -76353,22 +74620,22 @@ _08024FA8: _08024FC2: bl sub_8027518 ldr r1, [r4] - ldr r2, _08024FD0 + ldr r2, =0x000031cc adds r1, r2 strb r0, [r1] b _08024FEE .align 2, 0 -_08024FD0: .4byte 0x000031cc + .pool _08024FD4: movs r0, 0 bl sub_8027518 ldr r1, [r4] - ldr r3, _08024FE4 + ldr r3, =0x000031cc adds r1, r3 strb r0, [r1] b _08024FEE .align 2, 0 -_08024FE4: .4byte 0x000031cc + .pool _08024FE8: movs r0, 0xB bl sub_8026240 @@ -76384,14 +74651,14 @@ _08024FF6: thumb_func_start sub_8024FFC sub_8024FFC: @ 8024FFC push {lr} - ldr r0, _0802503C + ldr r0, =0x02022c98 ldr r2, [r0] adds r0, r2, 0 adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 bhi _080250C4 - ldr r0, _08025040 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -76404,21 +74671,18 @@ sub_8024FFC: @ 8024FFC subs r0, r1 lsls r0, 2 adds r0, r2, r0 - ldr r1, _08025044 + ldr r1, =0x000031cc adds r0, r1 ldrb r0, [r0] cmp r0, 0 bne _080250CA - ldr r3, _08025048 + ldr r3, =0x000032f8 adds r1, r2, r3 movs r0, 0x2 strb r0, [r1] b _080250CA .align 2, 0 -_0802503C: .4byte 0x02022c98 -_08025040: .4byte 0x030022c0 -_08025044: .4byte 0x000031cc -_08025048: .4byte 0x000032f8 + .pool _0802504C: movs r0, 0x10 ands r0, r1 @@ -76431,19 +74695,18 @@ _0802504C: subs r0, r1 lsls r0, 2 adds r0, r2, r0 - ldr r1, _08025078 + ldr r1, =0x000031cc adds r0, r1 ldrb r0, [r0] cmp r0, 0 bne _080250CA - ldr r3, _0802507C + ldr r3, =0x000032f8 adds r1, r2, r3 movs r0, 0x1 strb r0, [r1] b _080250CA .align 2, 0 -_08025078: .4byte 0x000031cc -_0802507C: .4byte 0x000032f8 + .pool _08025080: movs r0, 0x20 ands r0, r1 @@ -76458,26 +74721,25 @@ _08025080: subs r0, r1 lsls r0, 2 adds r0, r2, r0 - ldr r1, _080250B0 + ldr r1, =0x000031cc adds r0, r1 ldrb r0, [r0] cmp r0, 0 bne _080250CA - ldr r3, _080250B4 + ldr r3, =0x000032f8 adds r1, r2, r3 movs r0, 0x3 strb r0, [r1] b _080250CA .align 2, 0 -_080250B0: .4byte 0x000031cc -_080250B4: .4byte 0x000032f8 + .pool _080250B8: - ldr r3, _080250C0 + ldr r3, =0x000032f8 adds r0, r2, r3 strb r1, [r0] b _080250CA .align 2, 0 -_080250C0: .4byte 0x000032f8 + .pool _080250C4: movs r0, 0xB bl sub_8026240 @@ -76500,7 +74762,7 @@ sub_80250D4: @ 80250D4 bl sub_8026240 b _08025150 _080250F2: - ldr r0, _08025120 + ldr r0, =0x02022c98 ldr r2, [r0] movs r1, 0x96 lsls r1, 1 @@ -76524,7 +74786,7 @@ _080250F2: str r0, [r4] b _08025150 .align 2, 0 -_08025120: .4byte 0x02022c98 + .pool _08025124: adds r0, r3, 0x1 lsls r0, 24 @@ -76594,7 +74856,7 @@ _08025192: thumb_func_start sub_8025198 sub_8025198: @ 8025198 push {r4,r5,lr} - ldr r5, _080251B0 + ldr r5, =0x02022c98 ldr r1, [r5] ldrb r4, [r1, 0x10] cmp r4, 0x1 @@ -76605,7 +74867,7 @@ sub_8025198: @ 8025198 beq _080251BA b _0802520C .align 2, 0 -_080251B0: .4byte 0x02022c98 + .pool _080251B4: cmp r4, 0x2 beq _080251DC @@ -76661,7 +74923,7 @@ _0802520C: beq _08025226 movs r0, 0x6 bl sub_8026240 - ldr r0, _0802522C + ldr r0, =0x0000020b movs r1, 0x4 bl sub_80A2F88 _08025226: @@ -76669,13 +74931,13 @@ _08025226: pop {r0} bx r0 .align 2, 0 -_0802522C: .4byte 0x0000020b + .pool thumb_func_end sub_8025198 thumb_func_start sub_8025230 sub_8025230: @ 8025230 push {r4,r5,lr} - ldr r5, _08025248 + ldr r5, =0x02022c98 ldr r2, [r5] ldrb r4, [r2, 0x10] cmp r4, 0x1 @@ -76686,7 +74948,7 @@ sub_8025230: @ 8025230 beq _08025252 b _080252DC .align 2, 0 -_08025248: .4byte 0x02022c98 + .pool _0802524C: cmp r4, 0x2 beq _08025282 @@ -76724,7 +74986,7 @@ _08025282: _0802528E: ldr r0, [r5] adds r0, 0x4A - ldr r1, _080252D4 + ldr r1, =0x020223c4 movs r2, 0x3C bl memcpy ldr r1, [r5] @@ -76742,7 +75004,7 @@ _080252AA: cmp r4, r0 bcc _0802528E _080252B4: - ldr r3, _080252D8 + ldr r3, =0x02022c98 ldr r2, [r3] adds r1, r2, 0 adds r1, 0x24 @@ -76760,15 +75022,14 @@ _080252CC: strb r0, [r1, 0x10] b _08025316 .align 2, 0 -_080252D4: .4byte 0x020223c4 -_080252D8: .4byte 0x02022c98 + .pool _080252DC: movs r0, 0x1 bl ducking_tick lsls r0, 24 cmp r0, 0 beq _08025316 - ldr r0, _0802531C + ldr r0, =0x02022c98 ldr r2, [r0] adds r0, r2, 0 adds r0, 0x28 @@ -76786,7 +75047,7 @@ _080252DC: strh r1, [r0] movs r0, 0x6 bl sub_8026240 - ldr r0, _08025320 + ldr r0, =0x0000020b movs r1, 0x4 bl sub_80A2F88 _08025316: @@ -76794,8 +75055,7 @@ _08025316: pop {r0} bx r0 .align 2, 0 -_0802531C: .4byte 0x02022c98 -_08025320: .4byte 0x0000020b + .pool thumb_func_end sub_8025230 thumb_func_start sub_8025324 @@ -76805,7 +75065,7 @@ sub_8025324: @ 8025324 movs r1, 0x1 mov r0, sp strb r1, [r0] - ldr r0, _08025344 + ldr r0, =0x02022c98 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x4 @@ -76813,13 +75073,12 @@ sub_8025324: @ 8025324 b _08025458 _0802533A: lsls r0, 2 - ldr r1, _08025348 + ldr r1, =_0802534C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08025344: .4byte 0x02022c98 -_08025348: .4byte _0802534C + .pool .align 2, 0 _0802534C: .4byte _08025360 @@ -76836,22 +75095,22 @@ _08025360: bl sub_8028EC8 movs r0, 0x2 bl sub_80292E0 - ldr r0, _08025380 + ldr r0, =0x02022c98 ldr r1, [r0] b _08025448 .align 2, 0 -_08025380: .4byte 0x02022c98 + .pool _08025384: bl sub_802A770 cmp r0, 0 bne _08025466 movs r0, 0x5 bl sub_80292E0 - ldr r0, _08025398 + ldr r0, =0x02022c98 ldr r1, [r0] b _08025448 .align 2, 0 -_08025398: .4byte 0x02022c98 + .pool _0802539C: bl sub_802A794 mov r1, sp @@ -76862,17 +75121,17 @@ _0802539C: lsls r0, 24 cmp r0, 0 beq _08025466 - ldr r0, _080253B8 + ldr r0, =0x02022c98 ldr r1, [r0] b _08025448 .align 2, 0 -_080253B8: .4byte 0x02022c98 + .pool _080253BC: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _08025466 - ldr r3, _080253D8 + ldr r3, =0x02022c98 ldr r1, [r3] ldrb r0, [r1, 0x10] adds r0, 0x1 @@ -76882,13 +75141,13 @@ _080253BC: strb r2, [r0, 0x8] b _08025466 .align 2, 0 -_080253D8: .4byte 0x02022c98 + .pool _080253DC: bl sub_8025170 cmp r0, 0 beq _08025422 movs r2, 0 - ldr r1, _08025450 + ldr r1, =0x02022c98 ldr r0, [r1] adds r0, 0x24 ldrb r0, [r0] @@ -76897,7 +75156,7 @@ _080253DC: adds r3, r1, 0 movs r5, 0x86 lsls r5, 1 - ldr r4, _08025454 + ldr r4, =0x020223c4 _080253FA: ldr r1, [r3] adds r1, r2, r1 @@ -76920,7 +75179,7 @@ _080253FA: cmp r2, r0 bcc _080253FA _08025422: - ldr r4, _08025450 + ldr r4, =0x02022c98 ldr r2, [r4] adds r1, r2, 0 adds r1, 0x24 @@ -76944,8 +75203,7 @@ _08025448: strb r0, [r1, 0x10] b _08025466 .align 2, 0 -_08025450: .4byte 0x02022c98 -_08025454: .4byte 0x020223c4 + .pool _08025458: bl sub_802A770 cmp r0, 0 @@ -76963,7 +75221,7 @@ _08025466: sub_8025470: @ 8025470 push {r4,r5,lr} sub sp, 0x4 - ldr r4, _0802548C + ldr r4, =0x02022c98 ldr r0, [r4] ldrb r0, [r0, 0x10] cmp r0, 0x7 @@ -76971,13 +75229,12 @@ sub_8025470: @ 8025470 b _08025606 _08025480: lsls r0, 2 - ldr r1, _08025490 + ldr r1, =_08025494 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802548C: .4byte 0x02022c98 -_08025490: .4byte _08025494 + .pool .align 2, 0 _08025494: .4byte _080254B4 @@ -76990,18 +75247,17 @@ _08025494: .4byte _08025578 _080254B4: bl sub_8027748 - ldr r1, _080254CC + ldr r1, =0x00000bb7 cmp r0, r1 bls _080254C4 movs r0, 0x4 bl sub_80292E0 _080254C4: - ldr r0, _080254D0 + ldr r0, =0x02022c98 ldr r1, [r0] b _080255E8 .align 2, 0 -_080254CC: .4byte 0x00000bb7 -_080254D0: .4byte 0x02022c98 + .pool _080254D4: bl sub_802A770 cmp r0, 0 @@ -77010,19 +75266,19 @@ _080254D4: _080254DE: movs r0, 0x3 bl sub_80292E0 - ldr r0, _080254EC + ldr r0, =0x02022c98 ldr r1, [r0] b _080255E8 .align 2, 0 -_080254EC: .4byte 0x02022c98 + .pool _080254F0: bl sub_8028FCC bl sub_80272E8 - ldr r0, _08025500 + ldr r0, =0x02022c98 ldr r1, [r0] b _080255E8 .align 2, 0 -_08025500: .4byte 0x02022c98 + .pool _08025504: bl sub_802A794 lsls r0, 24 @@ -77033,11 +75289,11 @@ _08025504: bne _08025516 b _0802563C _08025516: - ldr r0, _0802551C + ldr r0, =0x02022c98 ldr r1, [r0] b _080255E8 .align 2, 0 -_0802551C: .4byte 0x02022c98 + .pool _08025520: bl sub_802A770 cmp r0, 0 @@ -77046,11 +75302,11 @@ _08025520: _0802552A: movs r0, 0x5 bl sub_80292E0 - ldr r0, _08025538 + ldr r0, =0x02022c98 ldr r1, [r0] b _080255E8 .align 2, 0 -_08025538: .4byte 0x02022c98 + .pool _0802553C: bl sub_802A794 mov r1, sp @@ -77061,30 +75317,30 @@ _0802553C: lsls r0, 24 cmp r0, 0 beq _0802563C - ldr r2, _08025560 + ldr r2, =0x02022c98 ldr r1, [r2] movs r0, 0 strb r0, [r1, 0x8] ldr r1, [r2] b _080255E8 .align 2, 0 -_08025560: .4byte 0x02022c98 + .pool _08025564: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _0802563C - ldr r0, _08025574 + ldr r0, =0x02022c98 ldr r1, [r0] b _080255E8 .align 2, 0 -_08025574: .4byte 0x02022c98 + .pool _08025578: bl sub_8025170 cmp r0, 0 beq _080255BE movs r2, 0 - ldr r1, _080255F0 + ldr r1, =0x02022c98 ldr r0, [r1] adds r0, 0x24 ldrb r0, [r0] @@ -77093,7 +75349,7 @@ _08025578: adds r3, r1, 0 movs r5, 0x86 lsls r5, 1 - ldr r4, _080255F4 + ldr r4, =0x020223c4 _08025596: ldr r1, [r3] adds r1, r2, r1 @@ -77116,7 +75372,7 @@ _08025596: cmp r2, r0 bcc _08025596 _080255BE: - ldr r4, _080255F0 + ldr r4, =0x02022c98 ldr r2, [r4] adds r1, r2, 0 adds r1, 0x24 @@ -77141,8 +75397,7 @@ _080255E8: strb r0, [r1, 0x10] b _0802563C .align 2, 0 -_080255F0: .4byte 0x02022c98 -_080255F4: .4byte 0x020223c4 + .pool _080255F8: bl sub_8027554 b _0802563C @@ -77188,7 +75443,7 @@ _0802563C: thumb_func_start sub_8025644 sub_8025644: @ 8025644 push {r4,lr} - ldr r4, _0802565C + ldr r4, =0x02022c98 ldr r0, [r4] ldrb r0, [r0, 0x10] cmp r0, 0x1 @@ -77199,7 +75454,7 @@ sub_8025644: @ 8025644 beq _08025666 b _08025692 .align 2, 0 -_0802565C: .4byte 0x02022c98 + .pool _08025660: cmp r0, 0x2 beq _0802567C @@ -77227,7 +75482,7 @@ _08025688: strb r0, [r1, 0x10] b _080256A0 _08025692: - ldr r0, _080256A8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080256A0 @@ -77238,14 +75493,14 @@ _080256A0: pop {r0} bx r0 .align 2, 0 -_080256A8: .4byte 0x03003124 + .pool thumb_func_end sub_8025644 thumb_func_start sub_80256AC sub_80256AC: @ 80256AC push {r4,lr} sub sp, 0x4 - ldr r4, _080256C4 + ldr r4, =0x02022c98 ldr r0, [r4] ldrb r1, [r0, 0x10] cmp r1, 0x1 @@ -77256,7 +75511,7 @@ sub_80256AC: @ 80256AC beq _080256CE b _08025728 .align 2, 0 -_080256C4: .4byte 0x02022c98 + .pool _080256C8: cmp r1, 0x2 beq _080256F8 @@ -77272,7 +75527,7 @@ _080256CE: b _0802571A _080256E0: bl fade_and_return_progress_probably - ldr r0, _080256F4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -77280,7 +75535,7 @@ _080256E0: bne _0802574C b _0802571A .align 2, 0 -_080256F4: .4byte 0x02037fd4 + .pool _080256F8: bl sub_8028B80 bl sub_80287E4 @@ -77289,7 +75544,7 @@ _080256F8: ldrb r0, [r0] bl sub_8028614 bl sub_8028E84 - ldr r1, _08025724 + ldr r1, =0x03000db0 movs r0, 0x1 str r0, [r1] movs r0, 0x8 @@ -77301,12 +75556,12 @@ _0802571A: strb r0, [r1, 0x10] b _0802574C .align 2, 0 -_08025724: .4byte 0x03000db0 + .pool _08025728: bl sub_802A770 cmp r0, 0 bne _0802574C - ldr r4, _08025754 + ldr r4, =0x02022c98 ldr r0, [r4] ldr r0, [r0] bl set_callback2 @@ -77322,14 +75577,14 @@ _0802574C: pop {r0} bx r0 .align 2, 0 -_08025754: .4byte 0x02022c98 + .pool thumb_func_end sub_80256AC thumb_func_start sub_8025758 sub_8025758: @ 8025758 push {r4,lr} sub sp, 0x4 - ldr r4, _08025774 + ldr r4, =0x02022c98 ldr r1, [r4] ldrb r0, [r1, 0x10] cmp r0, 0x6 @@ -77337,13 +75592,12 @@ sub_8025758: @ 8025758 b _0802585C _08025768: lsls r0, 2 - ldr r1, _08025778 + ldr r1, =_0802577C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08025774: .4byte 0x02022c98 -_08025778: .4byte _0802577C + .pool .align 2, 0 _0802577C: .4byte _08025798 @@ -77402,12 +75656,12 @@ _08025802: bl sub_80A2F30 b _08025848 _08025808: - ldr r0, _08025814 + ldr r0, =0x0000021e bl current_map_music_set bl sub_8028E4C b _08025848 .align 2, 0 -_08025814: .4byte 0x0000021e + .pool _08025818: movs r4, 0x1 negs r4, r4 @@ -77425,31 +75679,30 @@ _08025818: b _08025848 _08025838: bl fade_and_return_progress_probably - ldr r0, _08025854 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0802588C _08025848: - ldr r0, _08025858 + ldr r0, =0x02022c98 ldr r1, [r0] ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] b _0802588C .align 2, 0 -_08025854: .4byte 0x02037fd4 -_08025858: .4byte 0x02022c98 + .pool _0802585C: ldrb r0, [r1, 0x4] bl remove_task - ldr r0, _08025894 + ldr r0, =sub_802589C + 1 bl sub_802621C bl sub_802903C ldr r0, [r4] bl sub_8024A30 - ldr r0, _08025898 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08025882 @@ -77467,8 +75720,7 @@ _0802588C: pop {r0} bx r0 .align 2, 0 -_08025894: .4byte sub_802589C + 1 -_08025898: .4byte 0x03003124 + .pool thumb_func_end sub_8025758 thumb_func_start sub_802589C @@ -77476,7 +75728,7 @@ sub_802589C: @ 802589C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080258B8 + ldr r1, =0x02022c98 ldr r0, [r1] ldrb r0, [r0, 0x10] adds r4, r1, 0 @@ -77488,7 +75740,7 @@ sub_802589C: @ 802589C beq _080258C2 b _080258E0 .align 2, 0 -_080258B8: .4byte 0x02022c98 + .pool _080258BC: cmp r0, 0x2 beq _080258CE @@ -77516,13 +75768,13 @@ _080258E0: ldrb r0, [r0] cmp r0, 0 beq _080258F8 - ldr r0, _080258F4 + ldr r0, =sub_8024D4C + 1 bl sub_802621C b _080258FE .align 2, 0 -_080258F4: .4byte sub_8024D4C + 1 + .pool _080258F8: - ldr r0, _0802590C + ldr r0, =sub_8024D84 + 1 bl sub_802621C _080258FE: adds r0, r5, 0 @@ -77532,7 +75784,7 @@ _08025904: pop {r0} bx r0 .align 2, 0 -_0802590C: .4byte sub_8024D84 + 1 + .pool thumb_func_end sub_802589C thumb_func_start sub_8025910 @@ -77543,7 +75795,7 @@ sub_8025910: @ 8025910 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08025934 + ldr r1, =0x03005e08 adds r5, r0, r1 movs r0, 0 ldrsh r4, [r5, r0] @@ -77555,19 +75807,19 @@ sub_8025910: @ 8025910 beq _0802593E b _080259E8 .align 2, 0 -_08025934: .4byte 0x03005e08 + .pool _08025938: cmp r4, 0x2 beq _0802597E b _080259E8 _0802593E: - ldr r6, _08025964 + ldr r6, =0x02022c98 ldr r1, [r6] adds r0, r1, 0 adds r0, 0x28 ldrb r0, [r0] lsls r0, 2 - ldr r2, _08025968 + ldr r2, =0x0000318c adds r0, r2 adds r1, r0 movs r0, 0 @@ -77580,8 +75832,7 @@ _0802593E: strb r4, [r0, 0x8] b _08025976 .align 2, 0 -_08025964: .4byte 0x02022c98 -_08025968: .4byte 0x0000318c + .pool _0802596C: bl sub_800A520 lsls r0, 24 @@ -77597,15 +75848,15 @@ _0802597E: cmp r0, 0 beq _080259C4 movs r2, 0 - ldr r1, _080259F0 + ldr r1, =0x02022c98 ldr r0, [r1] adds r0, 0x24 ldrb r0, [r0] cmp r2, r0 bcs _080259C4 adds r3, r1, 0 - ldr r5, _080259F4 - ldr r4, _080259F8 + ldr r5, =0x020223c4 + ldr r4, =0x0000318c _0802599A: ldr r0, [r3] lsls r1, r2, 2 @@ -77629,7 +75880,7 @@ _0802599A: cmp r2, r0 bcc _0802599A _080259C4: - ldr r4, _080259F0 + ldr r4, =0x02022c98 ldr r0, [r4] adds r1, r0, 0 adds r1, 0x24 @@ -77650,9 +75901,7 @@ _080259E8: pop {r0} bx r0 .align 2, 0 -_080259F0: .4byte 0x02022c98 -_080259F4: .4byte 0x020223c4 -_080259F8: .4byte 0x0000318c + .pool thumb_func_end sub_8025910 thumb_func_start sub_80259FC @@ -77661,18 +75910,18 @@ sub_80259FC: @ 80259FC mov r7, r8 push {r7} sub sp, 0x18 - ldr r6, _08025AD8 + ldr r6, =0x02022c98 ldr r0, [r6] adds r1, r0, 0 adds r1, 0x24 ldrb r7, [r1] - ldr r2, _08025ADC + ldr r2, =0x000031a0 adds r1, r0, r2 - ldr r3, _08025AE0 + ldr r3, =0x000031cc adds r2, r0, r3 - ldr r4, _08025AE4 + ldr r4, =0x00003208 adds r3, r0, r4 - ldr r5, _08025AE8 + ldr r5, =0x00003244 adds r4, r0, r5 str r4, [sp] adds r5, 0x3C @@ -77695,7 +75944,7 @@ sub_80259FC: @ 80259FC movs r0, 0 bl sub_8028164 ldr r1, [r6] - ldr r5, _08025AEC + ldr r5, =0x000031b0 adds r2, r1, r5 str r0, [r2] movs r0, 0x94 @@ -77718,7 +75967,7 @@ _08025A60: subs r0, r5 lsls r4, r0, 2 adds r1, r4, r1 - ldr r2, _08025AE0 + ldr r2, =0x000031cc adds r1, r2 adds r0, r5, 0 bl sub_8028318 @@ -77727,7 +75976,7 @@ _08025A60: bne _08025A9A ldr r0, [r6] adds r0, r4 - ldr r3, _08025AE0 + ldr r3, =0x000031cc adds r0, r3 strb r1, [r0] ldr r0, [r6] @@ -77742,7 +75991,7 @@ _08025A9A: cmp r5, r7 bcc _08025A60 _08025AA4: - ldr r5, _08025AD8 + ldr r5, =0x02022c98 ldr r1, [r5] movs r6, 0x92 lsls r6, 1 @@ -77768,12 +76017,7 @@ _08025AA4: strb r1, [r0] b _08025B02 .align 2, 0 -_08025AD8: .4byte 0x02022c98 -_08025ADC: .4byte 0x000031a0 -_08025AE0: .4byte 0x000031cc -_08025AE4: .4byte 0x00003208 -_08025AE8: .4byte 0x00003244 -_08025AEC: .4byte 0x000031b0 + .pool _08025AF0: adds r0, r1, r6 ldrb r0, [r0] @@ -77787,9 +76031,9 @@ _08025B02: movs r5, 0 cmp r5, r7 bcs _08025BF6 - ldr r3, _08025B4C + ldr r3, =0x000031cc mov r12, r3 - ldr r4, _08025B50 + ldr r4, =0x02022c98 mov r8, r4 _08025B10: mov r6, r8 @@ -77824,8 +76068,7 @@ _08025B36: bge _08025B5A b _08025BEC .align 2, 0 -_08025B4C: .4byte 0x000031cc -_08025B50: .4byte 0x02022c98 + .pool _08025B54: cmp r0, 0x4 beq _08025BA8 @@ -77857,17 +76100,16 @@ _08025B5A: strb r2, [r0] ldr r0, [r3] adds r0, r1 - ldr r6, _08025BA0 + ldr r6, =0x000031d0 adds r0, r6 strb r2, [r0] ldr r0, [r3] adds r0, r1 - ldr r1, _08025BA4 + ldr r1, =0x000031d4 adds r0, r1 b _08025BEA .align 2, 0 -_08025BA0: .4byte 0x000031d0 -_08025BA4: .4byte 0x000031d4 + .pool _08025BA8: adds r1, 0xB0 adds r1, r5 @@ -77895,12 +76137,12 @@ _08025BA8: strb r2, [r0] ldr r0, [r4] adds r0, r1 - ldr r3, _08025C04 + ldr r3, =0x000031d0 adds r0, r3 strb r2, [r0] ldr r0, [r4] adds r0, r1 - ldr r6, _08025C08 + ldr r6, =0x000031d4 adds r0, r6 _08025BEA: strb r2, [r0] @@ -77918,26 +76160,25 @@ _08025BF6: pop {r0} bx r0 .align 2, 0 -_08025C04: .4byte 0x000031d0 -_08025C08: .4byte 0x000031d4 + .pool thumb_func_end sub_80259FC thumb_func_start sub_8025C0C sub_8025C0C: @ 8025C0C push {r4-r7,lr} sub sp, 0x18 - ldr r5, _08025CD0 + ldr r5, =0x02022c98 ldr r0, [r5] adds r1, r0, 0 adds r1, 0x24 ldrb r6, [r1] - ldr r2, _08025CD4 + ldr r2, =0x000031a0 adds r1, r0, r2 - ldr r3, _08025CD8 + ldr r3, =0x000031cc adds r2, r0, r3 - ldr r4, _08025CDC + ldr r4, =0x00003208 adds r3, r0, r4 - ldr r7, _08025CE0 + ldr r7, =0x00003244 adds r4, r0, r7 str r4, [sp] adds r7, 0x3C @@ -77960,7 +76201,7 @@ sub_8025C0C: @ 8025C0C movs r0, 0 bl sub_8028164 ldr r1, [r5] - ldr r7, _08025CE4 + ldr r7, =0x000031b0 adds r2, r1, r7 str r0, [r2] movs r0, 0x94 @@ -77976,7 +76217,7 @@ _08025C6C: bl sub_8028374 cmp r0, 0 beq _08025C92 - ldr r0, _08025CD0 + ldr r0, =0x02022c98 ldr r2, [r0] lsls r1, r4, 2 movs r3, 0x98 @@ -77997,7 +76238,7 @@ _08025C92: cmp r4, r6 bcc _08025C6C _08025C9C: - ldr r5, _08025CD0 + ldr r5, =0x02022c98 ldr r1, [r5] movs r6, 0x92 lsls r6, 1 @@ -78023,12 +76264,7 @@ _08025C9C: strb r1, [r0] b _08025CFA .align 2, 0 -_08025CD0: .4byte 0x02022c98 -_08025CD4: .4byte 0x000031a0 -_08025CD8: .4byte 0x000031cc -_08025CDC: .4byte 0x00003208 -_08025CE0: .4byte 0x00003244 -_08025CE4: .4byte 0x000031b0 + .pool _08025CE8: adds r0, r1, r6 ldrb r0, [r0] @@ -78048,7 +76284,7 @@ _08025CFA: thumb_func_start sub_8025D04 sub_8025D04: @ 8025D04 push {r4,r5,lr} - ldr r5, _08025D1C + ldr r5, =0x02022c98 ldr r0, [r5] ldrb r0, [r0, 0x18] cmp r0, 0x4 @@ -78059,7 +76295,7 @@ sub_8025D04: @ 8025D04 beq _08025D26 b _08025D4A .align 2, 0 -_08025D1C: .4byte 0x02022c98 + .pool _08025D20: cmp r0, 0xB beq _08025D46 @@ -78091,7 +76327,7 @@ _08025D4A: sub_8025D50: @ 8025D50 push {r4-r6,lr} sub sp, 0x14 - ldr r0, _08025D64 + ldr r0, =0x02022c98 ldr r5, [r0] ldrb r0, [r5, 0x18] cmp r0, 0x4 @@ -78100,15 +76336,15 @@ sub_8025D50: @ 8025D50 beq _08025DB8 b _08025DF4 .align 2, 0 -_08025D64: .4byte 0x02022c98 + .pool _08025D68: - ldr r1, _08025DA8 + ldr r1, =0x000032cc adds r0, r5, r1 - ldr r2, _08025DAC + ldr r2, =0x000031cc adds r1, r5, r2 - ldr r3, _08025DB0 + ldr r3, =0x00003208 adds r2, r5, r3 - ldr r4, _08025DB4 + ldr r4, =0x00003244 adds r3, r5, r4 movs r6, 0xCA lsls r6, 6 @@ -78133,18 +76369,15 @@ _08025D68: bl sub_8027E30 b _08025DF4 .align 2, 0 -_08025DA8: .4byte 0x000032cc -_08025DAC: .4byte 0x000031cc -_08025DB0: .4byte 0x00003208 -_08025DB4: .4byte 0x00003244 + .pool _08025DB8: - ldr r1, _08025DFC + ldr r1, =0x000032cc adds r0, r5, r1 - ldr r2, _08025E00 + ldr r2, =0x000031cc adds r1, r5, r2 - ldr r3, _08025E04 + ldr r3, =0x00003208 adds r2, r5, r3 - ldr r4, _08025E08 + ldr r4, =0x00003244 adds r3, r5, r4 movs r6, 0xCA lsls r6, 6 @@ -78173,17 +76406,14 @@ _08025DF4: pop {r0} bx r0 .align 2, 0 -_08025DFC: .4byte 0x000032cc -_08025E00: .4byte 0x000031cc -_08025E04: .4byte 0x00003208 -_08025E08: .4byte 0x00003244 + .pool thumb_func_end sub_8025D50 thumb_func_start sub_8025E0C sub_8025E0C: @ 8025E0C push {r4-r6,lr} sub sp, 0x18 - ldr r0, _08025E20 + ldr r0, =0x02022c98 ldr r5, [r0] ldrb r0, [r5, 0x18] cmp r0, 0x4 @@ -78192,7 +76422,7 @@ sub_8025E0C: @ 8025E0C beq _08025E7C b _08025EC0 .align 2, 0 -_08025E20: .4byte 0x02022c98 + .pool _08025E24: adds r0, r5, 0 adds r0, 0x28 @@ -78200,14 +76430,14 @@ _08025E24: lsls r1, r0, 4 subs r1, r0 lsls r1, 2 - ldr r2, _08025E6C + ldr r2, =0x000031a0 adds r1, r2 adds r1, r5, r1 - ldr r3, _08025E70 + ldr r3, =0x000031cc adds r2, r5, r3 - ldr r4, _08025E74 + ldr r4, =0x00003208 adds r3, r5, r4 - ldr r6, _08025E78 + ldr r6, =0x00003244 adds r4, r5, r6 str r4, [sp] adds r6, 0x3C @@ -78229,10 +76459,7 @@ _08025E24: bl sub_8028164 b _08025EC0 .align 2, 0 -_08025E6C: .4byte 0x000031a0 -_08025E70: .4byte 0x000031cc -_08025E74: .4byte 0x00003208 -_08025E78: .4byte 0x00003244 + .pool _08025E7C: adds r0, r5, 0 adds r0, 0x28 @@ -78240,14 +76467,14 @@ _08025E7C: lsls r1, r0, 4 subs r1, r0 lsls r1, 2 - ldr r2, _08025EC8 + ldr r2, =0x000031a0 adds r1, r2 adds r1, r5, r1 - ldr r3, _08025ECC + ldr r3, =0x000031cc adds r2, r5, r3 - ldr r4, _08025ED0 + ldr r4, =0x00003208 adds r3, r5, r4 - ldr r6, _08025ED4 + ldr r6, =0x00003244 adds r4, r5, r6 str r4, [sp] adds r6, 0x3C @@ -78273,16 +76500,13 @@ _08025EC0: pop {r0} bx r0 .align 2, 0 -_08025EC8: .4byte 0x000031a0 -_08025ECC: .4byte 0x000031cc -_08025ED0: .4byte 0x00003208 -_08025ED4: .4byte 0x00003244 + .pool thumb_func_end sub_8025E0C thumb_func_start sub_8025ED8 sub_8025ED8: @ 8025ED8 push {r4,lr} - ldr r4, _08025EF0 + ldr r4, =0x02022c98 ldr r1, [r4] ldrb r0, [r1, 0x18] cmp r0, 0x4 @@ -78293,7 +76517,7 @@ sub_8025ED8: @ 8025ED8 beq _08025EFA b _08025F40 .align 2, 0 -_08025EF0: .4byte 0x02022c98 + .pool _08025EF4: cmp r0, 0xB beq _08025F24 @@ -78309,7 +76533,7 @@ _08025EFA: str r1, [r0] b _08025F40 _08025F0E: - ldr r2, _08025F20 + ldr r2, =0x000032f8 adds r1, r2 ldrb r0, [r1] cmp r0, 0 @@ -78317,7 +76541,7 @@ _08025F0E: bl sub_80282EC b _08025F40 .align 2, 0 -_08025F20: .4byte 0x000032f8 + .pool _08025F24: movs r2, 0x90 lsls r2, 1 @@ -78341,7 +76565,7 @@ _08025F40: thumb_func_start sub_8025F48 sub_8025F48: @ 8025F48 push {r4-r6,lr} - ldr r6, _08025F80 + ldr r6, =0x02022c98 ldr r2, [r6] adds r0, r2, 0 adds r0, 0x28 @@ -78350,7 +76574,7 @@ sub_8025F48: @ 8025F48 subs r0, r1 lsls r0, 2 adds r1, r2, r0 - ldr r3, _08025F84 + ldr r3, =0x000031cc adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 @@ -78367,10 +76591,9 @@ sub_8025F48: @ 8025F48 strb r1, [r0] b _08025FEA .align 2, 0 -_08025F80: .4byte 0x02022c98 -_08025F84: .4byte 0x000031cc + .pool _08025F88: - ldr r3, _08025FB4 + ldr r3, =0x000031d0 adds r0, r1, r3 ldrb r4, [r0] cmp r4, 0x1 @@ -78391,9 +76614,9 @@ _08025F88: adds r0, r2 b _08025FE8 .align 2, 0 -_08025FB4: .4byte 0x000031d0 + .pool _08025FB8: - ldr r3, _08026014 + ldr r3, =0x000031d4 adds r0, r1, r3 ldrb r4, [r0] cmp r4, 0x1 @@ -78417,7 +76640,7 @@ _08025FB8: _08025FE8: strb r4, [r0] _08025FEA: - ldr r0, _08026018 + ldr r0, =0x02022c98 ldr r2, [r0] movs r5, 0xAA lsls r5, 1 @@ -78437,8 +76660,7 @@ _08025FEA: movs r1, 0x1 b _0802603A .align 2, 0 -_08026014: .4byte 0x000031d4 -_08026018: .4byte 0x02022c98 + .pool _0802601C: ldr r0, [r4] movs r1, 0xAA @@ -78467,7 +76689,7 @@ sub_8026044: @ 8026044 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r6, _08026090 + ldr r6, =0x02022c98 ldr r2, [r6] adds r0, r2, 0 adds r0, 0x44 @@ -78482,12 +76704,12 @@ sub_8026044: @ 8026044 subs r0, r1 lsls r0, 2 adds r1, r2, r0 - ldr r3, _08026094 + ldr r3, =0x000031cc adds r0, r1, r3 ldrb r3, [r0] cmp r3, 0 bne _0802609C - ldr r4, _08026098 + ldr r4, =0x000031d0 adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0x1 @@ -78503,11 +76725,9 @@ sub_8026044: @ 8026044 strb r3, [r0] b _080260FE .align 2, 0 -_08026090: .4byte 0x02022c98 -_08026094: .4byte 0x000031cc -_08026098: .4byte 0x000031d0 + .pool _0802609C: - ldr r3, _080260C8 + ldr r3, =0x000031d0 adds r0, r1, r3 ldrb r4, [r0] cmp r4, 0x1 @@ -78528,9 +76748,9 @@ _0802609C: adds r0, r3 b _080260FC .align 2, 0 -_080260C8: .4byte 0x000031d0 + .pool _080260CC: - ldr r4, _08026150 + ldr r4, =0x000031d4 adds r0, r1, r4 ldrb r4, [r0] cmp r4, 0x1 @@ -78557,7 +76777,7 @@ _080260FE: mov r4, r8 cmp r4, r7 bcs _08026172 - ldr r5, _08026154 + ldr r5, =0x02022c98 _08026106: ldr r2, [r5] adds r0, r2, 0 @@ -78566,7 +76786,7 @@ _08026106: lsls r0, r1, 4 subs r0, r1 lsls r0, 2 - ldr r1, _08026158 + ldr r1, =0x000031a0 adds r0, r1 adds r0, r2, r0 adds r1, r0, 0 @@ -78595,9 +76815,7 @@ _08026106: movs r1, 0x1 b _08026166 .align 2, 0 -_08026150: .4byte 0x000031d4 -_08026154: .4byte 0x02022c98 -_08026158: .4byte 0x000031a0 + .pool _0802615C: movs r3, 0xA4 lsls r3, 1 @@ -78613,7 +76831,7 @@ _08026168: cmp r4, r7 bcc _08026106 _08026172: - ldr r0, _0802619C + ldr r0, =0x02022c98 ldr r2, [r0] movs r5, 0xAA lsls r5, 1 @@ -78633,7 +76851,7 @@ _08026172: movs r1, 0x1 b _080261BE .align 2, 0 -_0802619C: .4byte 0x02022c98 + .pool _080261A0: ldr r0, [r4] movs r1, 0xAA @@ -78707,7 +76925,7 @@ sub_802621C: @ 802621C push {lr} movs r1, 0x1 bl AddTask - ldr r1, _0802623C + ldr r1, =0x02022c98 ldr r3, [r1] movs r2, 0 strb r0, [r3, 0x4] @@ -78720,13 +76938,13 @@ sub_802621C: @ 802621C pop {r0} bx r0 .align 2, 0 -_0802623C: .4byte 0x02022c98 + .pool thumb_func_end sub_802621C thumb_func_start sub_8026240 sub_8026240: @ 8026240 push {r4,lr} - ldr r2, _08026260 + ldr r2, =0x02022c98 ldr r1, [r2] ldrb r3, [r1, 0x18] movs r4, 0 @@ -78741,13 +76959,13 @@ sub_8026240: @ 8026240 pop {r0} bx r0 .align 2, 0 -_08026260: .4byte 0x02022c98 + .pool thumb_func_end sub_8026240 thumb_func_start sub_8026264 sub_8026264: @ 8026264 push {r4,lr} - ldr r3, _08026298 + ldr r3, =0x02022c98 ldr r1, [r3] ldrb r0, [r1, 0x14] lsrs r2, r0, 2 @@ -78761,7 +76979,7 @@ sub_8026264: @ 8026264 ands r0, r1 cmp r0, 0 bne _080262B8 - ldr r1, _0802629C + ldr r1, =0x082f7a94 adds r0, r3, 0 adds r0, 0x24 ldrb r0, [r0] @@ -78773,8 +76991,7 @@ sub_8026264: @ 8026264 movs r0, 0x1 b _080262BA .align 2, 0 -_08026298: .4byte 0x02022c98 -_0802629C: .4byte 0x082f7a94 + .pool _080262A0: lsls r4, r2, 3 adds r1, r4, 0 @@ -78799,7 +77016,7 @@ sub_80262C0: @ 80262C0 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r2, _08026318 + ldr r2, =0x02022c98 ldr r0, [r2] adds r1, r0, 0 adds r1, 0x44 @@ -78809,7 +77026,7 @@ sub_80262C0: @ 80262C0 cmp r1, r5 bcs _0802630C mov r8, r2 - ldr r0, _0802631C + ldr r0, =0x000032e0 mov r12, r0 movs r7, 0 movs r6, 0x1 @@ -78818,7 +77035,7 @@ _080262E2: ldr r0, [r2] mov r2, r12 adds r4, r0, r2 - ldr r2, _08026320 + ldr r2, =0x000032eb adds r0, r2 adds r2, r0, r1 movs r3, 0 @@ -78843,9 +77060,7 @@ _0802630C: pop {r0} bx r0 .align 2, 0 -_08026318: .4byte 0x02022c98 -_0802631C: .4byte 0x000032e0 -_08026320: .4byte 0x000032eb + .pool thumb_func_end sub_80262C0 thumb_func_start sub_8026324 @@ -78856,7 +77071,7 @@ sub_8026324: @ 8026324 mov r5, r8 push {r5-r7} sub sp, 0x10 - ldr r0, _080263F8 + ldr r0, =0x02022c98 ldr r1, [r0] adds r0, r1, 0 adds r0, 0x44 @@ -78882,13 +77097,13 @@ _08026358: cmp r6, r0 bcs _08026440 _08026360: - ldr r3, _080263F8 + ldr r3, =0x02022c98 lsls r0, r6, 4 subs r1, r0, r6 lsls r1, 2 ldr r2, [r3] adds r1, r2 - ldr r4, _080263FC + ldr r4, =0x000031cc adds r4, r1 mov r8, r4 ldrb r1, [r4] @@ -78910,7 +77125,7 @@ _08026360: bcs _08026434 adds r7, r3, 0 _08026396: - ldr r0, _08026400 + ldr r0, =0x082f449c add r0, r10 ldrb r5, [r0] ldr r1, [r7] @@ -78935,7 +77150,7 @@ _08026396: cmp r0, 0x1 bne _08026410 movs r2, 0 - ldr r3, _080263F8 + ldr r3, =0x02022c98 mov r8, r4 _080263CE: ldr r0, [r3] @@ -78959,9 +77174,7 @@ _080263CE: strb r1, [r0] b _08026434 .align 2, 0 -_080263F8: .4byte 0x02022c98 -_080263FC: .4byte 0x000031cc -_08026400: .4byte 0x082f449c + .pool _08026404: adds r0, r2, 0x1 lsls r0, 24 @@ -78975,7 +77188,7 @@ _08026410: subs r1, r2, r6 lsls r1, 2 adds r0, r1 - ldr r4, _08026504 + ldr r4, =0x000031d4 adds r0, r4 ldrb r0, [r0] cmp r0, 0x1 @@ -79003,11 +77216,11 @@ _08026440: bcc _0802644C b _08026614 _0802644C: - ldr r1, _08026508 + ldr r1, =0x02022c98 mov r9, r1 _08026450: movs r6, 0xFF - ldr r0, _0802650C + ldr r0, =0x082f449c add r0, r10 ldrb r5, [r0] mov r2, r9 @@ -79037,8 +77250,8 @@ _08026468: bls _0802648E movs r3, 0x2 _0802648E: - ldr r2, _08026510 - ldr r0, _08026514 + ldr r2, =0x082f7a88 + ldr r0, =0x000031b4 adds r1, r4, r0 adds r1, r5 lsls r0, r3, 1 @@ -79099,11 +77312,7 @@ _080264D6: _08026500: b _08026528 .align 2, 0 -_08026504: .4byte 0x000031d4 -_08026508: .4byte 0x02022c98 -_0802650C: .4byte 0x082f449c -_08026510: .4byte 0x082f7a88 -_08026514: .4byte 0x000031b4 + .pool _08026518: adds r0, r3, 0 adds r0, 0xF5 @@ -79136,7 +77345,7 @@ _0802654A: _0802654E: mov r1, r9 ldr r0, [r1] - ldr r2, _08026624 + ldr r2, =0x000032eb adds r0, r2 adds r0, r5 movs r1, 0x7 @@ -79162,7 +77371,7 @@ _0802654E: subs r0, r4 lsls r0, 2 adds r1, r0 - ldr r2, _08026628 + ldr r2, =0x000031d0 adds r1, r2 movs r0, 0x1 strb r0, [r1] @@ -79172,7 +77381,7 @@ _0802654E: subs r0, r6 lsls r0, 2 adds r1, r0 - ldr r0, _0802662C + ldr r0, =0x000031d4 adds r1, r0 movs r2, 0x1 strb r2, [r1] @@ -79197,7 +77406,7 @@ _0802654E: adds r1, r0, 0 adds r1, 0xE8 adds r1, r5 - ldr r2, _08026630 + ldr r2, =0x000032e0 adds r0, r2 adds r0, r5 ldrb r0, [r0] @@ -79241,10 +77450,7 @@ _08026614: pop {r0} bx r0 .align 2, 0 -_08026624: .4byte 0x000032eb -_08026628: .4byte 0x000031d0 -_0802662C: .4byte 0x000031d4 -_08026630: .4byte 0x000032e0 + .pool thumb_func_end sub_8026324 thumb_func_start sub_8026634 @@ -79257,7 +77463,7 @@ sub_8026634: @ 8026634 lsls r2, 24 lsrs r6, r2, 24 movs r7, 0 - ldr r2, _08026668 + ldr r2, =0x02022c98 ldr r1, [r2] adds r0, r1, 0 adds r0, 0x24 @@ -79265,7 +77471,7 @@ sub_8026634: @ 8026634 subs r0, 0x1 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0802666C + ldr r0, =0x000032e0 adds r1, r0 mov r12, r2 cmp r3, 0x2 @@ -79276,8 +77482,7 @@ sub_8026634: @ 8026634 beq _08026674 b _08026676 .align 2, 0 -_08026668: .4byte 0x02022c98 -_0802666C: .4byte 0x000032e0 + .pool _08026670: movs r7, 0x1 b _08026676 @@ -79293,7 +77498,7 @@ _08026676: lsrs r0, 24 cmp r0, 0x1 bhi _080266D4 - ldr r0, _080266C8 + ldr r0, =0x082f45af lsls r1, r4, 1 adds r1, r4 adds r1, r7, r1 @@ -79319,19 +77524,18 @@ _08026676: subs r0, r4 lsls r0, 2 adds r0, r1, r0 - ldr r1, _080266CC + ldr r1, =0x000031d4 adds r0, r1 movs r1, 0x1 strb r1, [r0] b _0802670A .align 2, 0 -_080266C8: .4byte 0x082f45af -_080266CC: .4byte 0x000031d4 + .pool _080266D0: movs r0, 0x1 b _0802670C _080266D4: - ldr r0, _08026714 + ldr r0, =0x082f45af lsls r1, r4, 1 adds r1, r4 adds r1, r7, r1 @@ -79354,7 +77558,7 @@ _080266D4: subs r0, r4 lsls r0, 2 adds r1, r0 - ldr r0, _08026718 + ldr r0, =0x000031d4 adds r1, r0 movs r0, 0x1 strb r0, [r1] @@ -79365,8 +77569,7 @@ _0802670C: pop {r1} bx r1 .align 2, 0 -_08026714: .4byte 0x082f45af -_08026718: .4byte 0x000031d4 + .pool thumb_func_end sub_8026634 thumb_func_start sub_802671C @@ -79376,7 +77579,7 @@ sub_802671C: @ 802671C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _080267F0 + ldr r2, =0x02022c98 ldr r4, [r2] adds r0, r4, 0 adds r0, 0x44 @@ -79414,7 +77617,7 @@ _08026762: adds r0, r4, r1 movs r2, 0x1 str r2, [r0] - ldr r1, _080267F4 + ldr r1, =0x000032eb adds r0, r4, r1 adds r6, r0, r5 ldrb r0, [r6] @@ -79439,7 +77642,7 @@ _08026762: cmp r0, 0 bne _080267AC strb r2, [r1] - ldr r2, _080267F8 + ldr r2, =0x000032e0 adds r0, r4, r2 adds r0, r5 ldrb r0, [r0] @@ -79481,9 +77684,7 @@ _080267DE: bl sub_8027234 b _08026964 .align 2, 0 -_080267F0: .4byte 0x02022c98 -_080267F4: .4byte 0x000032eb -_080267F8: .4byte 0x000032e0 + .pool _080267FC: adds r0, r5, 0 bl sub_8026D8C @@ -79503,8 +77704,8 @@ _080267FC: bls _08026822 movs r3, 0x2 _08026822: - ldr r2, _08026864 - ldr r0, _08026868 + ldr r2, =0x082f7a88 + ldr r0, =0x000032e0 adds r1, r4, r0 adds r1, r5 lsls r0, r3, 1 @@ -79536,8 +77737,7 @@ _0802685C: bl sub_8026324 b _08026964 .align 2, 0 -_08026864: .4byte 0x082f7a88 -_08026868: .4byte 0x000032e0 + .pool _0802686C: cmp r0, 0x2 bne _080268F4 @@ -79567,7 +77767,7 @@ _0802686C: subs r0, r1 lsls r0, 2 adds r2, r0 - ldr r1, _080268E8 + ldr r1, =0x000031d0 adds r2, r1 strb r3, [r2] mov r2, r8 @@ -79583,7 +77783,7 @@ _0802686C: adds r0, 0xC4 adds r0, r5 strb r3, [r0] - ldr r1, _080268EC + ldr r1, =0x000032eb adds r0, r4, r1 adds r0, r5 strb r6, [r0] @@ -79593,15 +77793,13 @@ _0802686C: lsrs r0, 24 adds r1, r5, 0 bl sub_8026DB0 - ldr r2, _080268F0 + ldr r2, =0x000032e0 adds r1, r4, r2 adds r1, r5 strb r0, [r1] b _08026964 .align 2, 0 -_080268E8: .4byte 0x000031d0 -_080268EC: .4byte 0x000032eb -_080268F0: .4byte 0x000032e0 + .pool _080268F4: cmp r0, 0x3 bne _08026964 @@ -79636,7 +77834,7 @@ _080268F4: adds r0, 0xC4 adds r0, r5 strb r2, [r0] - ldr r2, _08026984 + ldr r2, =0x000032eb adds r0, r4, r2 adds r0, r5 movs r1, 0x1 @@ -79675,7 +77873,7 @@ _08026974: pop {r0} bx r0 .align 2, 0 -_08026984: .4byte 0x000032eb + .pool thumb_func_end sub_802671C thumb_func_start sub_8026988 @@ -79684,7 +77882,7 @@ sub_8026988: @ 8026988 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _080269F0 + ldr r0, =0x02022c98 ldr r0, [r0] adds r1, r0, 0 adds r1, 0x44 @@ -79694,10 +77892,10 @@ sub_8026988: @ 8026988 ldrb r6, [r1] cmp r6, r8 bcs _08026A7A - ldr r0, _080269F4 + ldr r0, =0x082f449c mov r9, r0 _080269A8: - ldr r0, _080269F0 + ldr r0, =0x02022c98 ldr r3, [r0] adds r0, r3, 0 adds r0, 0x28 @@ -79705,7 +77903,7 @@ _080269A8: lsls r0, r1, 4 subs r0, r1 lsls r0, 2 - ldr r2, _080269F8 + ldr r2, =0x000031a0 adds r0, r2 adds r7, r3, r0 movs r0, 0xB @@ -79733,9 +77931,7 @@ _080269A8: bl sub_8028BF8 b _08026A04 .align 2, 0 -_080269F0: .4byte 0x02022c98 -_080269F4: .4byte 0x082f449c -_080269F8: .4byte 0x000031a0 + .pool _080269FC: adds r0, r6, 0 movs r1, 0x1 @@ -79811,7 +78007,7 @@ _08026A7A: thumb_func_start sub_8026A88 sub_8026A88: @ 8026A88 push {r4-r6,lr} - ldr r1, _08026AC0 + ldr r1, =0x02022c98 ldr r0, [r1] adds r0, 0x24 ldrb r5, [r0] @@ -79825,7 +78021,7 @@ _08026A9A: lsls r0, 2 ldr r1, [r6] adds r0, r1 - ldr r1, _08026AC4 + ldr r1, =0x000031cc adds r0, r1 ldrb r1, [r0] adds r0, r4, 0 @@ -79840,14 +78036,13 @@ _08026ABA: pop {r0} bx r0 .align 2, 0 -_08026AC0: .4byte 0x02022c98 -_08026AC4: .4byte 0x000031cc + .pool thumb_func_end sub_8026A88 thumb_func_start sub_8026AC8 sub_8026AC8: @ 8026AC8 push {r4,r5,lr} - ldr r0, _08026AF0 + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x24 ldrb r5, [r0] @@ -79868,14 +78063,14 @@ _08026AEA: pop {r0} bx r0 .align 2, 0 -_08026AF0: .4byte 0x02022c98 + .pool thumb_func_end sub_8026AC8 thumb_func_start sub_8026AF4 sub_8026AF4: @ 8026AF4 push {lr} bl sub_8026988 - ldr r0, _08026B0C + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x40 ldrb r0, [r0] @@ -79884,11 +78079,11 @@ sub_8026AF4: @ 8026AF4 bl sub_8026AC8 b _08026B14 .align 2, 0 -_08026B0C: .4byte 0x02022c98 + .pool _08026B10: bl sub_8026A88 _08026B14: - ldr r0, _08026B24 + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x40 ldrb r0, [r0] @@ -79896,14 +78091,14 @@ _08026B14: pop {r0} bx r0 .align 2, 0 -_08026B24: .4byte 0x02022c98 + .pool thumb_func_end sub_8026AF4 thumb_func_start sub_8026B28 sub_8026B28: @ 8026B28 push {lr} bl sub_8026988 - ldr r0, _08026B40 + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x40 ldrb r0, [r0] @@ -79912,11 +78107,11 @@ sub_8026B28: @ 8026B28 bl sub_8026AC8 b _08026B48 .align 2, 0 -_08026B40: .4byte 0x02022c98 + .pool _08026B44: bl sub_8026A88 _08026B48: - ldr r0, _08026B58 + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x40 ldrb r0, [r0] @@ -79924,7 +78119,7 @@ _08026B48: pop {r0} bx r0 .align 2, 0 -_08026B58: .4byte 0x02022c98 + .pool thumb_func_end sub_8026B28 thumb_func_start sub_8026B5C @@ -79937,12 +78132,12 @@ sub_8026B5C: @ 8026B5C cmp r0, 0x4 bhi _08026BB4 lsls r0, 2 - ldr r1, _08026B74 + ldr r1, =_08026B78 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08026B74: .4byte _08026B78 + .pool .align 2, 0 _08026B78: .4byte _08026B8C @@ -79984,7 +78179,7 @@ _08026BB4: thumb_func_start sub_8026BB8 sub_8026BB8: @ 8026BB8 push {r4-r6,lr} - ldr r1, _08026C10 + ldr r1, =0x02022c98 ldr r0, [r1] adds r0, 0x24 ldrb r5, [r0] @@ -80017,7 +78212,7 @@ _08026BEC: bcc _08026BCA cmp r4, r5 bcs _08026C1E - ldr r0, _08026C10 + ldr r0, =0x02022c98 ldr r0, [r0] movs r2, 0xAC lsls r2, 1 @@ -80030,7 +78225,7 @@ _08026C04: movs r0, 0 b _08026C20 .align 2, 0 -_08026C10: .4byte 0x02022c98 + .pool _08026C14: adds r0, r4, 0x1 lsls r0, 24 @@ -80049,7 +78244,7 @@ _08026C20: sub_8026C28: @ 8026C28 push {r4,lr} movs r1, 0 - ldr r4, _08026C4C + ldr r4, =0x02022c98 movs r3, 0xAC lsls r3, 1 movs r2, 0 @@ -80067,13 +78262,13 @@ _08026C34: pop {r0} bx r0 .align 2, 0 -_08026C4C: .4byte 0x02022c98 + .pool thumb_func_end sub_8026C28 thumb_func_start sub_8026C50 sub_8026C50: @ 8026C50 push {r4,lr} - ldr r3, _08026C84 + ldr r3, =0x02022c98 ldr r1, [r3] adds r2, r1, 0 adds r2, 0x40 @@ -80098,7 +78293,7 @@ sub_8026C50: @ 8026C50 movs r0, 0x1 b _08026C8A .align 2, 0 -_08026C84: .4byte 0x02022c98 + .pool _08026C88: movs r0, 0 _08026C8A: @@ -80110,7 +78305,7 @@ _08026C8A: thumb_func_start sub_8026C90 sub_8026C90: @ 8026C90 push {r4-r6,lr} - ldr r4, _08026D08 + ldr r4, =0x02022c98 ldr r1, [r4] adds r2, r1, 0 adds r2, 0x40 @@ -80141,7 +78336,7 @@ sub_8026C90: @ 8026C90 lsls r1, r3, 4 subs r1, r3 lsls r1, 2 - ldr r6, _08026D0C + ldr r6, =0x082f449c subs r0, 0x4 ldrb r2, [r0] subs r2, 0x1 @@ -80152,7 +78347,7 @@ sub_8026C90: @ 8026C90 subs r0, r2 lsls r0, 3 subs r2, r0, r2 - ldr r0, _08026D10 + ldr r0, =0x000031bf adds r1, r0 _08026CEA: adds r0, r4, r3 @@ -80172,9 +78367,7 @@ _08026D04: movs r0, 0x1 b _08026D16 .align 2, 0 -_08026D08: .4byte 0x02022c98 -_08026D0C: .4byte 0x082f449c -_08026D10: .4byte 0x000031bf + .pool _08026D14: movs r0, 0 _08026D16: @@ -80192,9 +78385,9 @@ sub_8026D1C: @ 8026D1C adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _08026D84 + ldr r0, =0x082f7a9c mov r8, r0 - ldr r0, _08026D88 + ldr r0, =0x02022c98 ldr r6, [r0] adds r0, r6, 0 adds r0, 0x90 @@ -80236,16 +78429,15 @@ _08026D76: pop {r0} bx r0 .align 2, 0 -_08026D84: .4byte 0x082f7a9c -_08026D88: .4byte 0x02022c98 + .pool thumb_func_end sub_8026D1C thumb_func_start sub_8026D8C sub_8026D8C: @ 8026D8C lsls r0, 24 lsrs r0, 24 - ldr r3, _08026DA8 - ldr r1, _08026DAC + ldr r3, =0x082f4648 + ldr r1, =0x02022c98 ldr r1, [r1] adds r1, 0x24 ldrb r1, [r1] @@ -80257,8 +78449,7 @@ sub_8026D8C: @ 8026D8C ldrb r0, [r0] bx lr .align 2, 0 -_08026DA8: .4byte 0x082f4648 -_08026DAC: .4byte 0x02022c98 + .pool thumb_func_end sub_8026D8C thumb_func_start sub_8026DB0 @@ -80270,14 +78461,14 @@ sub_8026DB0: @ 8026DB0 lsrs r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r4, _08026E30 + ldr r4, =0x02022c98 ldr r1, [r4] adds r1, 0x24 ldrb r2, [r1] subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, _08026E34 + ldr r3, =0x082f45fa lsls r1, r0, 1 adds r1, r0 lsls r0, r2, 4 @@ -80294,7 +78485,7 @@ sub_8026DB0: @ 8026DB0 ldrb r1, [r1] mov r8, r1 movs r3, 0 - ldr r1, _08026E38 + ldr r1, =0x082f467f lsls r0, r2, 2 adds r2, r0, r2 adds r0, r2, r1 @@ -80329,9 +78520,7 @@ _08026E18: adds r1, r0, 0 b _08026E48 .align 2, 0 -_08026E30: .4byte 0x02022c98 -_08026E34: .4byte 0x082f45fa -_08026E38: .4byte 0x082f467f + .pool _08026E3C: ldr r0, [r4] adds r0, 0x90 @@ -80370,7 +78559,7 @@ sub_8026E70: @ 8026E70 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _08026E9C + ldr r2, =0x02022c98 ldr r2, [r2] adds r2, 0xE8 adds r2, r1 @@ -80382,13 +78571,12 @@ sub_8026E70: @ 8026E70 cmp r0, 0x6 bhi _08026EDE lsls r0, 2 - ldr r1, _08026EA0 + ldr r1, =_08026EA4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08026E9C: .4byte 0x02022c98 -_08026EA0: .4byte _08026EA4 + .pool .align 2, 0 _08026EA4: .4byte _08026EDE @@ -80469,7 +78657,7 @@ sub_8026F1C: @ 8026F1C lsrs r4, r1, 24 lsls r2, 24 lsrs r2, 24 - ldr r6, _08026F44 + ldr r6, =0x02022c98 ldr r1, [r6] adds r0, r1, 0 adds r0, 0x24 @@ -80484,9 +78672,9 @@ _08026F3A: beq _08026F78 b _0802722C .align 2, 0 -_08026F44: .4byte 0x02022c98 + .pool _08026F48: - ldr r3, _08026F70 + ldr r3, =0x000031b4 adds r0, r1, r3 adds r0, r4 ldrb r4, [r0] @@ -80499,15 +78687,14 @@ _08026F48: adds r0, 0x4A adds r0, r4 ldrh r0, [r0] - ldr r1, _08026F74 + ldr r1, =0x00004e20 bl sub_8027A28 ldr r1, [r6] adds r1, 0x4A adds r1, r4 b _0802722A .align 2, 0 -_08026F70: .4byte 0x000031b4 -_08026F74: .4byte 0x00004e20 + .pool _08026F78: adds r0, r1, 0 adds r0, 0x4A @@ -80541,12 +78728,12 @@ _08026FA4: b _0802722C _08026FAA: lsls r0, r4, 2 - ldr r1, _08026FB4 + ldr r1, =_08026FB8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08026FB4: .4byte _08026FB8 + .pool .align 2, 0 _08026FB8: .4byte _08026FE0 @@ -80560,7 +78747,7 @@ _08026FB8: .4byte _0802706C .4byte _08027084 _08026FE0: - ldr r0, _08026FF4 + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x68 @@ -80570,16 +78757,16 @@ _08026FE0: adds r1, 0x74 b _08027226 .align 2, 0 -_08026FF4: .4byte 0x02022c98 + .pool _08026FF8: - ldr r0, _08027000 + ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x74 b _08027226 .align 2, 0 -_08027000: .4byte 0x02022c98 + .pool _08027004: - ldr r0, _08027018 + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x74 @@ -80589,16 +78776,16 @@ _08027004: adds r1, 0x80 b _08027226 .align 2, 0 -_08027018: .4byte 0x02022c98 + .pool _0802701C: - ldr r0, _08027024 + ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x80 b _08027226 .align 2, 0 -_08027024: .4byte 0x02022c98 + .pool _08027028: - ldr r0, _0802703C + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x80 @@ -80608,16 +78795,16 @@ _08027028: adds r1, 0x50 b _08027226 .align 2, 0 -_0802703C: .4byte 0x02022c98 + .pool _08027040: - ldr r0, _08027048 + ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x50 b _08027226 .align 2, 0 -_08027048: .4byte 0x02022c98 + .pool _0802704C: - ldr r0, _0802705C + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x50 @@ -80626,15 +78813,15 @@ _0802704C: strh r0, [r2] b _08027224 .align 2, 0 -_0802705C: .4byte 0x02022c98 + .pool _08027060: - ldr r0, _08027068 + ldr r0, =0x02022c98 ldr r1, [r0] b _08027224 .align 2, 0 -_08027068: .4byte 0x02022c98 + .pool _0802706C: - ldr r0, _08027080 + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x5C @@ -80644,14 +78831,14 @@ _0802706C: adds r1, 0x68 b _08027226 .align 2, 0 -_08027080: .4byte 0x02022c98 + .pool _08027084: - ldr r0, _0802708C + ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x68 b _08027226 .align 2, 0 -_0802708C: .4byte 0x02022c98 + .pool _08027090: subs r0, r4, 0x1 cmp r0, 0x7 @@ -80659,12 +78846,12 @@ _08027090: b _0802722C _08027098: lsls r0, 2 - ldr r1, _080270A4 + ldr r1, =_080270A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080270A4: .4byte _080270A8 + .pool .align 2, 0 _080270A8: .4byte _080270C8 @@ -80676,7 +78863,7 @@ _080270A8: .4byte _08027130 .4byte _08027148 _080270C8: - ldr r0, _080270DC + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x68 @@ -80686,16 +78873,16 @@ _080270C8: adds r1, 0x74 b _08027226 .align 2, 0 -_080270DC: .4byte 0x02022c98 + .pool _080270E0: - ldr r0, _080270E8 + ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x74 b _08027226 .align 2, 0 -_080270E8: .4byte 0x02022c98 + .pool _080270EC: - ldr r0, _08027100 + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x74 @@ -80705,16 +78892,16 @@ _080270EC: adds r1, 0x50 b _08027226 .align 2, 0 -_08027100: .4byte 0x02022c98 + .pool _08027104: - ldr r0, _0802710C + ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x50 b _08027226 .align 2, 0 -_0802710C: .4byte 0x02022c98 + .pool _08027110: - ldr r0, _08027120 + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x50 @@ -80723,15 +78910,15 @@ _08027110: strh r0, [r2] b _08027224 .align 2, 0 -_08027120: .4byte 0x02022c98 + .pool _08027124: - ldr r0, _0802712C + ldr r0, =0x02022c98 ldr r1, [r0] b _08027224 .align 2, 0 -_0802712C: .4byte 0x02022c98 + .pool _08027130: - ldr r0, _08027144 + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x5C @@ -80741,25 +78928,25 @@ _08027130: adds r1, 0x68 b _08027226 .align 2, 0 -_08027144: .4byte 0x02022c98 + .pool _08027148: - ldr r0, _08027150 + ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x68 b _08027226 .align 2, 0 -_08027150: .4byte 0x02022c98 + .pool _08027154: subs r0, r4, 0x2 cmp r0, 0x5 bhi _0802722C lsls r0, 2 - ldr r1, _08027164 + ldr r1, =_08027168 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08027164: .4byte _08027168 + .pool .align 2, 0 _08027168: .4byte _08027180 @@ -80769,7 +78956,7 @@ _08027168: .4byte _080271C8 .4byte _080271DC _08027180: - ldr r0, _08027194 + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x5C @@ -80779,16 +78966,16 @@ _08027180: adds r1, 0x68 b _08027226 .align 2, 0 -_08027194: .4byte 0x02022c98 + .pool _08027198: - ldr r0, _080271A0 + ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x68 b _08027226 .align 2, 0 -_080271A0: .4byte 0x02022c98 + .pool _080271A4: - ldr r0, _080271B8 + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x68 @@ -80798,16 +78985,16 @@ _080271A4: adds r1, 0x50 b _08027226 .align 2, 0 -_080271B8: .4byte 0x02022c98 + .pool _080271BC: - ldr r0, _080271C4 + ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x50 b _08027226 .align 2, 0 -_080271C4: .4byte 0x02022c98 + .pool _080271C8: - ldr r0, _080271D8 + ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x50 @@ -80816,13 +79003,13 @@ _080271C8: strh r0, [r2] b _08027224 .align 2, 0 -_080271D8: .4byte 0x02022c98 + .pool _080271DC: - ldr r0, _080271E4 + ldr r0, =0x02022c98 ldr r1, [r0] b _08027224 .align 2, 0 -_080271E4: .4byte 0x02022c98 + .pool _080271E8: cmp r4, 0x4 beq _0802720E @@ -80876,7 +79063,7 @@ _0802722C: sub_8027234: @ 8027234 push {r4,r5,lr} adds r1, r0, 0 - ldr r4, _08027278 + ldr r4, =0x02022c98 ldr r3, [r4] adds r0, r3, 0 adds r0, 0x24 @@ -80904,14 +79091,13 @@ _08027268: ldr r0, [r4] adds r2, r0, r5 ldrh r0, [r2] - ldr r1, _0802727C + ldr r1, =0x0000270f cmp r0, r1 bls _0802729E strh r1, [r2] b _0802729E .align 2, 0 -_08027278: .4byte 0x02022c98 -_0802727C: .4byte 0x0000270f + .pool _08027280: movs r2, 0x89 lsls r2, 1 @@ -80939,7 +79125,7 @@ _0802729E: sub_80272A4: @ 80272A4 push {r4,r5,lr} movs r3, 0 - ldr r2, _080272E4 + ldr r2, =0x02022c98 ldr r0, [r2] adds r0, 0x24 ldrb r0, [r0] @@ -80971,7 +79157,7 @@ _080272DC: pop {r0} bx r0 .align 2, 0 -_080272E4: .4byte 0x02022c98 + .pool thumb_func_end sub_80272A4 thumb_func_start sub_80272E8 @@ -80982,9 +79168,9 @@ sub_80272E8: @ 80272E8 mov r5, r8 push {r5-r7} movs r5, 0 - ldr r7, _080273D8 + ldr r7, =0x02022c98 movs r4, 0 - ldr r0, _080273DC + ldr r0, =0x000031bf mov r10, r0 _080272FC: movs r2, 0 @@ -81012,12 +79198,12 @@ _08027310: subs r1, r6, r5 lsls r1, 2 adds r0, r1 - ldr r2, _080273E0 + ldr r2, =0x000031cc adds r0, r2 strb r4, [r0] ldr r0, [r7] adds r0, r1 - ldr r1, _080273E4 + ldr r1, =0x000031d0 adds r0, r1 strb r4, [r0] ldr r0, [r7] @@ -81030,11 +79216,11 @@ _08027310: add r0, r8 strh r4, [r0] add r1, r12 - ldr r2, _080273E8 + ldr r2, =0x00003308 adds r1, r2 strb r4, [r1] ldr r2, [r7] - ldr r1, _080273EC + ldr r1, =0x0000330c adds r0, r2, r1 add r0, r12 str r4, [r0] @@ -81070,14 +79256,14 @@ _08027310: lsrs r5, r0, 24 cmp r5, 0x4 bls _080272FC - ldr r2, _080273D8 + ldr r2, =0x02022c98 ldr r0, [r2] movs r1, 0xAA lsls r1, 1 adds r0, r1 movs r2, 0 strb r2, [r0] - ldr r1, _080273D8 + ldr r1, =0x02022c98 ldr r0, [r1] movs r1, 0x89 lsls r1, 1 @@ -81096,19 +79282,14 @@ _08027310: pop {r0} bx r0 .align 2, 0 -_080273D8: .4byte 0x02022c98 -_080273DC: .4byte 0x000031bf -_080273E0: .4byte 0x000031cc -_080273E4: .4byte 0x000031d0 -_080273E8: .4byte 0x00003308 -_080273EC: .4byte 0x0000330c + .pool thumb_func_end sub_80272E8 thumb_func_start sub_80273F0 sub_80273F0: @ 80273F0 push {r4,r5,lr} movs r4, 0 - ldr r0, _08027408 + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x24 ldrb r0, [r0] @@ -81118,7 +79299,7 @@ sub_80273F0: @ 80273F0 beq _08027410 b _08027412 .align 2, 0 -_08027408: .4byte 0x02022c98 + .pool _0802740C: movs r4, 0x1 b _08027412 @@ -81134,8 +79315,8 @@ _08027412: lsrs r0, 24 movs r3, 0 lsls r1, r4, 2 - ldr r5, _08027454 - ldr r2, _08027458 + ldr r5, =0x02022c98 + ldr r2, =0x082f7aa4 adds r1, r4 lsls r1, 1 adds r0, r1 @@ -81158,8 +79339,7 @@ _08027436: pop {r0} bx r0 .align 2, 0 -_08027454: .4byte 0x02022c98 -_08027458: .4byte 0x082f7aa4 + .pool thumb_func_end sub_80273F0 thumb_func_start sub_802745C @@ -81167,7 +79347,7 @@ sub_802745C: @ 802745C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08027494 + ldr r1, =0x02022c98 ldr r2, [r1] lsls r1, r0, 1 adds r1, r0 @@ -81185,7 +79365,7 @@ sub_802745C: @ 802745C adds r3, r0 ldrh r2, [r2] adds r0, r3, r2 - ldr r1, _08027498 + ldr r1, =0x0000270f cmp r0, r1 bls _0802748E adds r0, r1, 0 @@ -81193,29 +79373,28 @@ _0802748E: pop {r1} bx r1 .align 2, 0 -_08027494: .4byte 0x02022c98 -_08027498: .4byte 0x0000270f + .pool thumb_func_end sub_802745C thumb_func_start sub_802749C sub_802749C: @ 802749C push {r4-r6,lr} - ldr r5, _08027504 + ldr r5, =0x02022c98 ldr r0, [r5] adds r0, 0x28 ldrb r0, [r0] bl sub_802745C - ldr r1, _08027508 + ldr r1, =0x0000270f bl sub_8027A38 adds r4, r0, 0 ldr r0, [r5] adds r0, 0x28 ldrb r0, [r0] bl sub_80276C0 - ldr r1, _0802750C + ldr r1, =0x000f4236 bl sub_8027A38 adds r2, r0, 0 - ldr r3, _08027510 + ldr r3, =0x03005d90 ldr r0, [r3] movs r6, 0x83 lsls r6, 2 @@ -81235,7 +79414,7 @@ _080274D6: strh r4, [r1] _080274E6: ldr r0, [r3] - ldr r6, _08027514 + ldr r6, =0x00000212 adds r2, r0, r6 ldr r0, [r5] movs r1, 0x8A @@ -81251,11 +79430,7 @@ _080274FE: pop {r0} bx r0 .align 2, 0 -_08027504: .4byte 0x02022c98 -_08027508: .4byte 0x0000270f -_0802750C: .4byte 0x000f4236 -_08027510: .4byte 0x03005d90 -_08027514: .4byte 0x00000212 + .pool thumb_func_end sub_802749C thumb_func_start sub_8027518 @@ -81263,7 +79438,7 @@ sub_8027518: @ 8027518 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _08027550 + ldr r1, =0x02022c98 ldr r0, [r1] adds r0, 0x9B ldrb r6, [r0] @@ -81290,13 +79465,13 @@ _0802752C: pop {r1} bx r1 .align 2, 0 -_08027550: .4byte 0x02022c98 + .pool thumb_func_end sub_8027518 thumb_func_start sub_8027554 sub_8027554: @ 8027554 push {r4,lr} - ldr r4, _08027588 + ldr r4, =0x02022c98 ldr r3, [r4] adds r0, r3, 0 adds r0, 0x28 @@ -81306,7 +79481,7 @@ sub_8027554: @ 8027554 ldrb r0, [r2] cmp r0, 0 bne _080275FC - ldr r0, _0802758C + ldr r0, =0x030022c0 ldrh r2, [r0, 0x2E] movs r0, 0x40 ands r0, r2 @@ -81316,14 +79491,12 @@ sub_8027554: @ 8027554 subs r0, r1 lsls r0, 2 adds r0, r3, r0 - ldr r1, _08027590 + ldr r1, =0x000031cc adds r0, r1 movs r1, 0x2 b _080275CA .align 2, 0 -_08027588: .4byte 0x02022c98 -_0802758C: .4byte 0x030022c0 -_08027590: .4byte 0x000031cc + .pool _08027594: movs r0, 0x20 ands r0, r2 @@ -81333,12 +79506,12 @@ _08027594: subs r0, r1 lsls r0, 2 adds r0, r3, r0 - ldr r1, _080275AC + ldr r1, =0x000031cc adds r0, r1 movs r1, 0x3 b _080275CA .align 2, 0 -_080275AC: .4byte 0x000031cc + .pool _080275B0: movs r0, 0x10 ands r0, r2 @@ -81350,7 +79523,7 @@ _080275B0: subs r0, r1 lsls r0, 2 adds r0, r3, r0 - ldr r1, _080275E4 + ldr r1, =0x000031cc adds r0, r1 movs r1, 0x1 _080275CA: @@ -81367,18 +79540,18 @@ _080275CA: bl audio_play b _08027600 .align 2, 0 -_080275E4: .4byte 0x000031cc + .pool _080275E8: lsls r0, r1, 4 subs r0, r1 lsls r0, 2 adds r0, r3, r0 - ldr r1, _080275F8 + ldr r1, =0x000031cc adds r0, r1 strb r2, [r0] b _08027600 .align 2, 0 -_080275F8: .4byte 0x000031cc + .pool _080275FC: subs r0, 0x1 strb r0, [r2] @@ -81390,7 +79563,7 @@ _08027600: thumb_func_start sub_8027608 sub_8027608: @ 8027608 - ldr r0, _08027624 + ldr r0, =0x02022c98 ldr r1, [r0] adds r0, r1, 0 adds r0, 0x28 @@ -81399,19 +79572,18 @@ sub_8027608: @ 8027608 subs r0, r2 lsls r0, 2 adds r1, r0 - ldr r0, _08027628 + ldr r0, =0x000031cc adds r1, r0 movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_08027624: .4byte 0x02022c98 -_08027628: .4byte 0x000031cc + .pool thumb_func_end sub_8027608 thumb_func_start sub_802762C sub_802762C: @ 802762C - ldr r0, _0802764C + ldr r0, =0x02022c98 ldr r1, [r0] adds r0, r1, 0 adds r0, 0x28 @@ -81427,18 +79599,18 @@ sub_802762C: @ 802762C lsrs r0, 16 bx lr .align 2, 0 -_0802764C: .4byte 0x02022c98 + .pool thumb_func_end sub_802762C thumb_func_start sub_8027650 sub_8027650: @ 8027650 - ldr r0, _0802765C + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x24 ldrb r0, [r0] bx lr .align 2, 0 -_0802765C: .4byte 0x02022c98 + .pool thumb_func_end sub_8027650 thumb_func_start sub_8027660 @@ -81446,33 +79618,31 @@ sub_8027660: @ 8027660 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08027680 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0802768C - ldr r0, _08027684 + ldr r0, =0x02022c98 lsls r1, r2, 4 subs r1, r2 lsls r1, 2 - ldr r2, _08027688 + ldr r2, =0x000031a0 adds r1, r2 ldr r0, [r0] b _08027694 .align 2, 0 -_08027680: .4byte 0x03003124 -_08027684: .4byte 0x02022c98 -_08027688: .4byte 0x000031a0 + .pool _0802768C: lsls r0, r2, 3 subs r0, r2 lsls r0, 2 - ldr r1, _0802769C + ldr r1, =0x020229f0 _08027694: adds r0, r1 pop {r1} bx r1 .align 2, 0 -_0802769C: .4byte 0x020229f0 + .pool thumb_func_end sub_8027660 thumb_func_start sub_80276A0 @@ -81480,7 +79650,7 @@ sub_80276A0: @ 80276A0 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r2, _080276BC + ldr r2, =0x02022c98 ldr r3, [r2] lsrs r1, 23 lsls r2, r0, 1 @@ -81492,7 +79662,7 @@ sub_80276A0: @ 80276A0 ldrh r0, [r3] bx lr .align 2, 0 -_080276BC: .4byte 0x02022c98 + .pool thumb_func_end sub_80276A0 thumb_func_start sub_80276C0 @@ -81507,9 +79677,9 @@ sub_80276C0: @ 80276C0 lsrs r4, r0, 24 movs r5, 0 movs r3, 0 - ldr r0, _0802772C + ldr r0, =0x02022c98 mov r9, r0 - ldr r2, _08027730 + ldr r2, =0x082f7b24 mov r10, r2 ldr r2, [r0] lsls r1, r4, 1 @@ -81553,8 +79723,7 @@ _080276EE: subs r0, r5, r0 b _08027736 .align 2, 0 -_0802772C: .4byte 0x02022c98 -_08027730: .4byte 0x082f7b24 + .pool _08027734: movs r0, 0 _08027736: @@ -81571,7 +79740,7 @@ _08027736: thumb_func_start sub_8027748 sub_8027748: @ 8027748 push {r4-r6,lr} - ldr r0, _08027784 + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x24 ldrb r6, [r0] @@ -81594,22 +79763,21 @@ _0802776C: cmp r4, r6 bcc _08027760 _08027776: - ldr r1, _08027788 + ldr r1, =0x000f4236 adds r0, r5, 0 bl sub_8027A38 pop {r4-r6} pop {r1} bx r1 .align 2, 0 -_08027784: .4byte 0x02022c98 -_08027788: .4byte 0x000f4236 + .pool thumb_func_end sub_8027748 thumb_func_start sub_802778C sub_802778C: @ 802778C push {r4,r5,lr} lsls r0, 24 - ldr r1, _080277CC + ldr r1, =0x02022c98 ldr r2, [r1] adds r1, r2, 0 adds r1, 0x24 @@ -81643,7 +79811,7 @@ _080277C4: pop {r1} bx r1 .align 2, 0 -_080277CC: .4byte 0x02022c98 + .pool thumb_func_end sub_802778C thumb_func_start sub_80277D0 @@ -81653,7 +79821,7 @@ sub_80277D0: @ 80277D0 lsls r0, 24 lsrs r7, r0, 24 movs r6, 0x1 - ldr r0, _08027848 + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x24 ldrb r5, [r0] @@ -81714,7 +79882,7 @@ _08027838: pop {r1} bx r1 .align 2, 0 -_08027848: .4byte 0x02022c98 + .pool thumb_func_end sub_80277D0 thumb_func_start sub_802784C @@ -81728,7 +79896,7 @@ sub_802784C: @ 802784C mov r10, r0 mov r8, r0 mov r9, r0 - ldr r6, _0802792C + ldr r6, =0x02022c98 ldr r0, [r6] adds r0, 0x24 ldrb r5, [r0] @@ -81740,11 +79908,11 @@ sub_802784C: @ 802784C cmp r9, r5 bcs _080278A0 adds r2, r6, 0 - ldr r1, _08027930 + ldr r1, =0x00003308 mov r12, r1 movs r7, 0 movs r6, 0x4 - ldr r3, _08027934 + ldr r3, =0x0000330c _08027884: ldr r0, [r2] lsls r1, r4, 3 @@ -81767,12 +79935,12 @@ _080278A0: _080278A6: adds r0, r4, 0 bl sub_80276C0 - ldr r1, _08027938 + ldr r1, =0x000f4236 bl sub_8027A38 - ldr r1, _0802792C + ldr r1, =0x02022c98 ldr r1, [r1] lsls r2, r4, 3 - ldr r3, _08027934 + ldr r3, =0x0000330c adds r1, r3 adds r1, r2 str r0, [r1] @@ -81789,20 +79957,20 @@ _080278CA: movs r4, 0 cmp r4, r5 bcs _08027916 - ldr r7, _0802792C + ldr r7, =0x02022c98 mov r10, r7 _080278DE: mov r0, r10 ldr r2, [r0] lsls r1, r4, 3 - ldr r7, _08027934 + ldr r7, =0x0000330c adds r0, r2, r7 adds r0, r1 ldr r0, [r0] cmp r6, r0 bne _0802790C adds r0, r2, r1 - ldr r1, _08027930 + ldr r1, =0x00003308 adds r0, r1 strb r3, [r0] mov r0, r8 @@ -81834,19 +80002,16 @@ _08027916: pop {r1} bx r1 .align 2, 0 -_0802792C: .4byte 0x02022c98 -_08027930: .4byte 0x00003308 -_08027934: .4byte 0x0000330c -_08027938: .4byte 0x000f4236 + .pool thumb_func_end sub_802784C thumb_func_start sub_802793C sub_802793C: @ 802793C lsls r1, 24 - ldr r2, _08027954 + ldr r2, =0x02022c98 ldr r2, [r2] lsrs r1, 21 - ldr r3, _08027958 + ldr r3, =0x00003308 adds r2, r3 adds r2, r1 ldr r1, [r2] @@ -81855,8 +80020,7 @@ sub_802793C: @ 802793C str r2, [r0, 0x4] bx lr .align 2, 0 -_08027954: .4byte 0x02022c98 -_08027958: .4byte 0x00003308 + .pool thumb_func_end sub_802793C thumb_func_start sub_802795C @@ -81866,7 +80030,7 @@ sub_802795C: @ 802795C lsls r0, 24 lsrs r6, r0, 24 movs r7, 0 - ldr r0, _080279C4 + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x24 ldrb r5, [r0] @@ -81916,13 +80080,13 @@ _080279B0: pop {r1} bx r1 .align 2, 0 -_080279C4: .4byte 0x02022c98 + .pool thumb_func_end sub_802795C thumb_func_start sub_80279C8 sub_80279C8: @ 80279C8 push {r4-r6,lr} - ldr r0, _080279F0 + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x28 ldrb r4, [r0] @@ -81939,7 +80103,7 @@ sub_80279C8: @ 80279C8 movs r0, 0x3 b _08027A22 .align 2, 0 -_080279F0: .4byte 0x02022c98 + .pool _080279F4: adds r0, r5, 0 movs r1, 0x1 @@ -81999,26 +80163,26 @@ _08027A44: sub_8027A48: @ 8027A48 lsls r0, 24 lsrs r0, 24 - ldr r1, _08027A58 + ldr r1, =0x02022c98 ldr r1, [r1] adds r1, 0x34 adds r1, r0 ldrb r0, [r1] bx lr .align 2, 0 -_08027A58: .4byte 0x02022c98 + .pool thumb_func_end sub_8027A48 thumb_func_start sub_8027A5C sub_8027A5C: @ 8027A5C push {r4-r6,lr} movs r5, 0 - ldr r6, _08027A8C + ldr r6, =0x020375f0 _08027A62: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08027A90 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -82034,13 +80198,12 @@ _08027A62: strh r0, [r6] b _08027AA0 .align 2, 0 -_08027A8C: .4byte 0x020375f0 -_08027A90: .4byte 0x020244ec + .pool _08027A94: adds r5, 0x1 cmp r5, 0x5 ble _08027A62 - ldr r1, _08027AA8 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] _08027AA0: @@ -82048,13 +80211,13 @@ _08027AA0: pop {r0} bx r0 .align 2, 0 -_08027AA8: .4byte 0x020375f0 + .pool thumb_func_end sub_8027A5C thumb_func_start sub_8027AAC sub_8027AAC: @ 8027AAC push {r4,lr} - ldr r4, _08027AC8 + ldr r4, =sub_8027ACC + 1 adds r0, r4, 0 movs r1, 0 bl AddTask @@ -82065,7 +80228,7 @@ sub_8027AAC: @ 8027AAC pop {r0} bx r0 .align 2, 0 -_08027AC8: .4byte sub_8027ACC + 1 + .pool thumb_func_end sub_8027AAC thumb_func_start sub_8027ACC @@ -82077,7 +80240,7 @@ sub_8027ACC: @ 8027ACC lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08027AF0 + ldr r1, =0x03005e08 adds r7, r0, r1 movs r1, 0 ldrsh r0, [r7, r1] @@ -82089,7 +80252,7 @@ sub_8027ACC: @ 8027ACC beq _08027AFE b _08027BE2 .align 2, 0 -_08027AF0: .4byte 0x03005e08 + .pool _08027AF4: cmp r0, 0x2 beq _08027BA0 @@ -82097,18 +80260,18 @@ _08027AF4: beq _08027BC8 b _08027BE2 _08027AFE: - ldr r0, _08027B80 + ldr r0, =0x082f7b2c ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] - ldr r1, _08027B84 + ldr r1, =0x085edce5 movs r0, 0x1 movs r2, 0 bl font_get_width_of_string adds r4, r0, 0 movs r6, 0 - ldr r5, _08027B88 + ldr r5, =0x082f7b34 _08027B18: ldr r1, [r5] movs r0, 0x1 @@ -82142,12 +80305,12 @@ _08027B46: asrs r1, 1 lsls r1, 24 lsrs r1, 16 - ldr r2, _08027B8C + ldr r2, =0xffff00ff ldr r0, [sp] ands r0, r2 orrs r0, r1 lsls r2, r4, 24 - ldr r1, _08027B90 + ldr r1, =0x00ffffff ands r0, r1 orrs r0, r2 str r0, [sp] @@ -82162,11 +80325,7 @@ _08027B46: movs r1, 0x3 b _08027BB6 .align 2, 0 -_08027B80: .4byte 0x082f7b2c -_08027B84: .4byte 0x085edce5 -_08027B88: .4byte 0x082f7b34 -_08027B8C: .4byte 0xffff00ff -_08027B90: .4byte 0x00ffffff + .pool _08027B94: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -82174,7 +80333,7 @@ _08027B94: bne _08027BE2 b _08027BBA _08027BA0: - ldr r0, _08027BC4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -82192,7 +80351,7 @@ _08027BBA: strh r0, [r7] b _08027BE2 .align 2, 0 -_08027BC4: .4byte 0x030022c0 + .pool _08027BC8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -82221,7 +80380,7 @@ sub_8027BEC: @ 8027BEC str r1, [sp, 0x18] lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08027CFC + ldr r0, =0x03005d90 ldr r1, [r0] movs r2, 0x84 lsls r2, 2 @@ -82232,11 +80391,11 @@ sub_8027BEC: @ 8027BEC adds r0, r1, r2 ldr r0, [r0] str r0, [sp, 0x10] - ldr r0, _08027D00 + ldr r0, =0x00000212 adds r1, r0 ldrh r0, [r1] str r0, [sp, 0x14] - ldr r4, _08027D04 + ldr r4, =0x0000021d adds r0, r7, 0 adds r1, r4, 0 movs r2, 0xD0 @@ -82248,7 +80407,7 @@ sub_8027BEC: @ 8027BEC adds r0, r7, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r4, _08027D08 + ldr r4, =0x085edce5 ldr r0, [sp, 0x18] lsls r2, r0, 3 movs r0, 0x1 @@ -82268,7 +80427,7 @@ sub_8027BEC: @ 8027BEC adds r2, r4, 0 bl Print movs r6, 0 - ldr r2, _08027D0C + ldr r2, =0x02021cc4 mov r8, r2 movs r0, 0xFF mov r10, r0 @@ -82281,7 +80440,7 @@ _08027C76: ldr r0, [sp, 0x1C] ldm r0!, {r1} str r0, [sp, 0x1C] - ldr r0, _08027D10 + ldr r0, =0x082f7b40 adds r0, r6, r0 ldrb r3, [r0] mov r0, r8 @@ -82293,10 +80452,10 @@ _08027C76: negs r2, r2 bl font_get_width_of_string adds r5, r0, 0 - ldr r0, _08027D14 + ldr r0, =0x082f7b34 adds r4, r0 ldr r2, [r4] - ldr r0, _08027D18 + ldr r0, =0x082f7b44 lsls r4, r6, 1 adds r0, r4, r0 ldrb r0, [r0] @@ -82314,7 +80473,7 @@ _08027C76: subs r3, r5 lsls r3, 24 lsrs r3, 24 - ldr r0, _08027D1C + ldr r0, =0x082f7b4a adds r4, r0 ldrb r0, [r4] str r0, [sp] @@ -82340,46 +80499,38 @@ _08027C76: pop {r0} bx r0 .align 2, 0 -_08027CFC: .4byte 0x03005d90 -_08027D00: .4byte 0x00000212 -_08027D04: .4byte 0x0000021d -_08027D08: .4byte 0x085edce5 -_08027D0C: .4byte 0x02021cc4 -_08027D10: .4byte 0x082f7b40 -_08027D14: .4byte 0x082f7b34 -_08027D18: .4byte 0x082f7b44 -_08027D1C: .4byte 0x082f7b4a + .pool thumb_func_end sub_8027BEC thumb_func_start sub_8027D20 sub_8027D20: @ 8027D20 push {lr} bl sub_8009FCC - ldr r1, _08027D34 + ldr r1, =0x02022c98 ldr r1, [r1] adds r1, 0x24 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_08027D34: .4byte 0x02022c98 + .pool thumb_func_end sub_8027D20 thumb_func_start sub_8027D38 sub_8027D38: @ 8027D38 push {r4-r7,lr} - ldr r0, _08027DC0 + ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x24 ldrb r4, [r0] cmp r4, 0x4 bhi _08027D66 - ldr r5, _08027DC4 + ldr r5, =0x082f7b90 _08027D48: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, _08027DC8 + ldr r1, =0x020229f0 adds r0, r1 lsls r1, r4, 2 adds r1, r5 @@ -82391,7 +80542,7 @@ _08027D48: cmp r4, 0x4 bls _08027D48 _08027D66: - ldr r0, _08027DC0 + ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x24 movs r2, 0x5 @@ -82407,9 +80558,9 @@ _08027D74: ldrb r0, [r0] cmp r4, r0 bcs _08027DB2 - ldr r7, _08027DC0 + ldr r7, =0x02022c98 lsls r3, r1, 1 - ldr r6, _08027DCC + ldr r6, =0x082f7b50 _08027D8A: ldr r2, [r7] lsls r0, r4, 1 @@ -82440,17 +80591,14 @@ _08027DB2: pop {r0} bx r0 .align 2, 0 -_08027DC0: .4byte 0x02022c98 -_08027DC4: .4byte 0x082f7b90 -_08027DC8: .4byte 0x020229f0 -_08027DCC: .4byte 0x082f7b50 + .pool thumb_func_end sub_8027D38 thumb_func_start sub_8027DD0 sub_8027DD0: @ 8027DD0 push {lr} sub sp, 0x8 - ldr r3, _08027DF8 + ldr r3, =0xffffff00 ldr r1, [sp] ands r1, r3 movs r2, 0x1 @@ -82468,14 +80616,14 @@ sub_8027DD0: @ 8027DD0 pop {r0} bx r0 .align 2, 0 -_08027DF8: .4byte 0xffffff00 + .pool thumb_func_end sub_8027DD0 thumb_func_start sub_8027DFC sub_8027DFC: @ 8027DFC push {lr} adds r2, r0, 0 - ldr r3, _08027E24 + ldr r3, =0x03003090 ldrh r0, [r3] movs r1, 0xFF lsls r1, 8 @@ -82494,7 +80642,7 @@ _08027E1E: movs r0, 0 b _08027E2A .align 2, 0 -_08027E24: .4byte 0x03003090 + .pool _08027E28: ldrb r0, [r1, 0x4] _08027E2A: @@ -82932,7 +81080,7 @@ sub_8028164: @ 8028164 mov r9, r0 adds r2, r7, 0 adds r2, 0x14 - ldr r4, _080281A0 + ldr r4, =0x03003090 ldrh r0, [r4] movs r1, 0xFF lsls r1, 8 @@ -82949,7 +81097,7 @@ _0802819C: movs r0, 0 b _080282DE .align 2, 0 -_080281A0: .4byte 0x03003090 + .pool _080281A4: ldrb r0, [r3, 0x1] lsls r0, 28 @@ -83123,7 +81271,7 @@ sub_80282EC: @ 80282EC sub sp, 0x8 lsls r0, 24 lsrs r0, 24 - ldr r3, _08028314 + ldr r3, =0xffffff00 ldr r1, [sp] ands r1, r3 movs r2, 0x3 @@ -83139,7 +81287,7 @@ sub_80282EC: @ 80282EC pop {r0} bx r0 .align 2, 0 -_08028314: .4byte 0xffffff00 + .pool thumb_func_end sub_80282EC thumb_func_start sub_8028318 @@ -83147,7 +81295,7 @@ sub_8028318: @ 8028318 push {r4,lr} adds r2, r0, 0 adds r4, r1, 0 - ldr r3, _08028340 + ldr r3, =0x03003090 ldrh r0, [r3] movs r1, 0xFF lsls r1, 8 @@ -83166,7 +81314,7 @@ _0802833C: movs r0, 0 b _0802834A .align 2, 0 -_08028340: .4byte 0x03003090 + .pool _08028344: ldrb r0, [r1, 0x4] strb r0, [r4] @@ -83181,7 +81329,7 @@ _0802834A: sub_8028350: @ 8028350 push {lr} sub sp, 0x8 - ldr r2, _08028370 + ldr r2, =0xffffff00 ldr r1, [sp] ands r1, r2 movs r2, 0x4 @@ -83194,14 +81342,14 @@ sub_8028350: @ 8028350 pop {r0} bx r0 .align 2, 0 -_08028370: .4byte 0xffffff00 + .pool thumb_func_end sub_8028350 thumb_func_start sub_8028374 sub_8028374: @ 8028374 push {lr} adds r2, r0, 0 - ldr r3, _0802839C + ldr r3, =0x03003090 ldrh r0, [r3] movs r1, 0xFF lsls r1, 8 @@ -83220,7 +81368,7 @@ _08028396: movs r0, 0 b _080283A2 .align 2, 0 -_0802839C: .4byte 0x03003090 + .pool _080283A0: ldr r0, [r1, 0x4] _080283A2: @@ -83237,17 +81385,17 @@ sub_80283A8: @ 80283A8 adds r0, r5, 0 bl malloc_and_clear adds r4, r0, 0 - ldr r0, _080283FC + ldr r0, =0x082fb2d8 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x8] str r1, [sp, 0xC] - ldr r0, _08028400 + ldr r0, =0x082fb2e0 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x10] str r1, [sp, 0x14] - ldr r0, _08028404 + ldr r0, =0x082f98bc adds r1, r4, 0 bl LZ77UnCompWram cmp r4, 0 @@ -83268,9 +81416,7 @@ _080283E8: pop {r0} bx r0 .align 2, 0 -_080283FC: .4byte 0x082fb2d8 -_08028400: .4byte 0x082fb2e0 -_08028404: .4byte 0x082f98bc + .pool thumb_func_end sub_80283A8 thumb_func_start sub_8028408 @@ -83297,21 +81443,21 @@ sub_8028408: @ 8028408 mov r0, sp adds r0, 0x1A strh r2, [r0] - ldr r0, _08028494 + ldr r0, =0x082fb1e0 str r0, [sp, 0x1C] - ldr r0, _08028498 + ldr r0, =0x082fb228 str r0, [sp, 0x20] str r3, [sp, 0x24] - ldr r0, _0802849C + ldr r0, =0x082ec6a8 str r0, [sp, 0x28] - ldr r0, _080284A0 + ldr r0, =sub_80284A8 + 1 str r0, [sp, 0x2C] mov r0, sp movs r2, 0x18 bl memcpy movs r0, 0x4 bl malloc_and_clear - ldr r1, _080284A4 + ldr r1, =0x02022c9c mov r2, r8 lsls r4, r2, 2 adds r4, r1 @@ -83340,11 +81486,7 @@ sub_8028408: @ 8028408 pop {r0} bx r0 .align 2, 0 -_08028494: .4byte 0x082fb1e0 -_08028498: .4byte 0x082fb228 -_0802849C: .4byte 0x082ec6a8 -_080284A0: .4byte sub_80284A8 + 1 -_080284A4: .4byte 0x02022c9c + .pool thumb_func_end sub_8028408 thumb_func_start sub_80284A8 @@ -83373,7 +81515,7 @@ _080284C6: sub_80284CC: @ 80284CC push {lr} bl link_get_multiplayer_id - ldr r1, _080284FC + ldr r1, =0x02022c9c lsls r0, 24 lsrs r0, 22 adds r0, r1 @@ -83382,7 +81524,7 @@ sub_80284CC: @ 80284CC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08028500 + ldr r1, =0x02020630 adds r0, r1 movs r2, 0 movs r1, 0x1 @@ -83394,15 +81536,14 @@ sub_80284CC: @ 80284CC pop {r0} bx r0 .align 2, 0 -_080284FC: .4byte 0x02022c9c -_08028500: .4byte 0x02020630 + .pool thumb_func_end sub_80284CC thumb_func_start sub_8028504 sub_8028504: @ 8028504 push {lr} bl link_get_multiplayer_id - ldr r1, _08028534 + ldr r1, =0x02022c9c lsls r0, 24 lsrs r0, 22 adds r0, r1 @@ -83411,7 +81552,7 @@ sub_8028504: @ 8028504 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08028538 + ldr r1, =0x02020630 adds r0, r1 movs r2, 0 movs r1, 0x2 @@ -83423,8 +81564,7 @@ sub_8028504: @ 8028504 pop {r0} bx r0 .align 2, 0 -_08028534: .4byte 0x02022c9c -_08028538: .4byte 0x02020630 + .pool thumb_func_end sub_8028504 thumb_func_start sub_802853C @@ -83551,7 +81691,7 @@ sub_8028614: @ 8028614 movs r4, 0 cmp r4, r5 bcs _08028646 - ldr r6, _0802864C + ldr r6, =0x02022c9c _08028622: lsls r0, r4, 2 adds r0, r6 @@ -83560,7 +81700,7 @@ _08028622: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08028650 + ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 beq _0802863C @@ -83576,8 +81716,7 @@ _08028646: pop {r0} bx r0 .align 2, 0 -_0802864C: .4byte 0x02022c9c -_08028650: .4byte 0x02020630 + .pool thumb_func_end sub_8028614 thumb_func_start sub_8028654 @@ -83585,8 +81724,8 @@ sub_8028654: @ 8028654 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, _08028684 - ldr r2, _08028688 + ldr r3, =0x02020630 + ldr r2, =0x02022c9c lsrs r1, 22 adds r1, r2 ldr r1, [r1] @@ -83607,8 +81746,7 @@ sub_8028654: @ 8028654 strb r1, [r2] bx lr .align 2, 0 -_08028684: .4byte 0x02020630 -_08028688: .4byte 0x02022c9c + .pool thumb_func_end sub_8028654 thumb_func_start sub_802868C @@ -83642,7 +81780,7 @@ sub_80286B4: @ 80286B4 lsls r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _080286D8 + ldr r2, =0x02022c9c lsrs r0, 22 adds r0, r2 ldr r0, [r0] @@ -83650,14 +81788,13 @@ sub_80286B4: @ 80286B4 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, _080286DC + ldr r2, =0x02020630 adds r0, r2 bl obj_anim_image_start pop {r0} bx r0 .align 2, 0 -_080286D8: .4byte 0x02022c9c -_080286DC: .4byte 0x02020630 + .pool thumb_func_end sub_80286B4 thumb_func_start nullsub_15 @@ -83669,10 +81806,10 @@ nullsub_15: @ 80286E0 sub_80286E4: @ 80286E4 push {r4-r7,lr} movs r4, 0 - ldr r0, _0802872C + ldr r0, =0x02020630 mov r12, r0 movs r6, 0 - ldr r5, _08028730 + ldr r5, =0x02022cf4 _080286F0: ldr r3, [r5] lsls r1, r4, 1 @@ -83705,8 +81842,7 @@ _080286F0: pop {r0} bx r0 .align 2, 0 -_0802872C: .4byte 0x02020630 -_08028730: .4byte 0x02022cf4 + .pool thumb_func_end sub_80286E4 thumb_func_start sub_8028734 @@ -83718,12 +81854,12 @@ sub_8028734: @ 8028734 adds r0, r4, 0 bl malloc_and_clear adds r6, r0, 0 - ldr r0, _080287D4 + ldr r0, =0x082fb2e8 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x20] str r1, [sp, 0x24] - ldr r0, _080287D8 + ldr r0, =0x082f96e0 adds r1, r6, 0 bl LZ77UnCompWram cmp r6, 0 @@ -83735,12 +81871,12 @@ sub_8028734: @ 8028734 orrs r0, r4 str r0, [r5, 0x4] mov r1, sp - ldr r0, _080287DC + ldr r0, =0x082fb2f0 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2-r4} stm r1!, {r2-r4} - ldr r4, _080287E0 + ldr r4, =0x02022cf4 movs r0, 0x40 bl malloc_and_clear str r0, [r4] @@ -83765,7 +81901,7 @@ _0802878A: mov r0, sp movs r3, 0 bl obj_add_from_template_forward_search - ldr r1, _080287E0 + ldr r1, =0x02022cf4 ldr r1, [r1] lsls r2, r4, 1 adds r1, 0x2A @@ -83786,10 +81922,7 @@ _080287C4: pop {r0} bx r0 .align 2, 0 -_080287D4: .4byte 0x082fb2e8 -_080287D8: .4byte 0x082f96e0 -_080287DC: .4byte 0x082fb2f0 -_080287E0: .4byte 0x02022cf4 + .pool thumb_func_end sub_8028734 thumb_func_start sub_80287E4 @@ -83797,7 +81930,7 @@ sub_80287E4: @ 80287E4 push {r4,r5,lr} movs r4, 0 _080287E8: - ldr r5, _08028820 + ldr r5, =0x02022cf4 ldr r0, [r5] lsls r1, r4, 1 adds r0, 0x2A @@ -83806,7 +81939,7 @@ _080287E8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08028824 + ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 beq _08028806 @@ -83825,8 +81958,7 @@ _08028806: pop {r0} bx r0 .align 2, 0 -_08028820: .4byte 0x02022cf4 -_08028824: .4byte 0x02020630 + .pool thumb_func_end sub_80287E4 thumb_func_start sub_8028828 @@ -83838,7 +81970,7 @@ sub_8028828: @ 8028828 sub sp, 0x4 movs r3, 0 movs r6, 0 - ldr r0, _080288B8 + ldr r0, =0x02022cf4 mov r9, r0 _0802883A: mov r7, r9 @@ -83851,7 +81983,7 @@ _0802883A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080288BC + ldr r1, =0x02020630 adds r4, r0, r1 adds r0, r2, 0 adds r0, 0x16 @@ -83881,7 +82013,7 @@ _08028870: ldr r0, [r1] adds r0, 0x16 adds r0, r5 - ldr r1, _080288C0 + ldr r1, =0x0000fff0 strh r1, [r0] movs r0, 0x24 str r3, [sp] @@ -83907,9 +82039,7 @@ _080288A6: movs r0, 0x1 b _080288C6 .align 2, 0 -_080288B8: .4byte 0x02022cf4 -_080288BC: .4byte 0x02020630 -_080288C0: .4byte 0x0000fff0 + .pool _080288C4: movs r0, 0 _080288C6: @@ -83931,7 +82061,7 @@ sub_80288D4: @ 80288D4 bls _08028910 movs r4, 0 _080288E0: - ldr r0, _08028908 + ldr r0, =0x02022cf4 ldr r0, [r0] lsls r1, r4, 1 adds r0, 0x2A @@ -83940,7 +82070,7 @@ _080288E0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0802890C + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 bl obj_anim_image_start @@ -83951,21 +82081,20 @@ _080288E0: bls _080288E0 b _080289DA .align 2, 0 -_08028908: .4byte 0x02022cf4 -_0802890C: .4byte 0x02020630 + .pool _08028910: movs r4, 0 movs r0, 0xA subs r0, r5 cmp r4, r0 bge _080289D6 - ldr r6, _08028940 + ldr r6, =0x02020630 _0802891C: cmp r5, 0x6 bls _08028984 - ldr r0, _08028944 + ldr r0, =0x02022cf4 ldr r2, [r0] - ldr r1, _08028948 + ldr r1, =0x0000fffa adds r0, r1, 0 ldrh r1, [r2, 0x3E] adds r0, r1 @@ -83979,9 +82108,7 @@ _0802891C: strh r1, [r2, 0x3E] b _0802899E .align 2, 0 -_08028940: .4byte 0x02020630 -_08028944: .4byte 0x02022cf4 -_08028948: .4byte 0x0000fffa + .pool _0802894C: cmp r0, 0xA bls _0802896A @@ -84011,7 +82138,7 @@ _0802896A: bl obj_anim_image_start b _0802899E _08028984: - ldr r0, _080289B0 + ldr r0, =0x02022cf4 ldr r0, [r0] lsls r1, r4, 1 adds r0, 0x2A @@ -84033,9 +82160,9 @@ _0802899E: blt _0802891C b _080289D6 .align 2, 0 -_080289B0: .4byte 0x02022cf4 + .pool _080289B4: - ldr r0, _080289E0 + ldr r0, =0x02022cf4 ldr r0, [r0] lsls r1, r4, 1 adds r0, 0x2A @@ -84044,7 +82171,7 @@ _080289B4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080289E4 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 bl obj_anim_image_start @@ -84059,8 +82186,7 @@ _080289DA: pop {r0} bx r0 .align 2, 0 -_080289E0: .4byte 0x02022cf4 -_080289E4: .4byte 0x02020630 + .pool thumb_func_end sub_80288D4 thumb_func_start sub_80289E8 @@ -84069,13 +82195,13 @@ sub_80289E8: @ 80289E8 lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r7, _08028A2C + ldr r7, =0x02020630 movs r1, 0x1 ands r0, r1 lsls r4, r0, 2 movs r6, 0x5 negs r6, r6 - ldr r5, _08028A30 + ldr r5, =0x02022cf4 _080289FE: ldr r0, [r5] lsls r1, r3, 1 @@ -84101,8 +82227,7 @@ _080289FE: pop {r0} bx r0 .align 2, 0 -_08028A2C: .4byte 0x02020630 -_08028A30: .4byte 0x02022cf4 + .pool thumb_func_end sub_80289E8 thumb_func_start sub_8028A34 @@ -84114,12 +82239,12 @@ sub_8028A34: @ 8028A34 adds r0, r5, 0 bl malloc_and_clear adds r4, r0, 0 - ldr r0, _08028A80 + ldr r0, =0x082fb314 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x8] str r1, [sp, 0xC] - ldr r0, _08028A84 + ldr r0, =0x082f7eb0 adds r1, r4, 0 bl LZ77UnCompWram cmp r4, 0 @@ -84141,8 +82266,7 @@ _08028A6A: pop {r0} bx r0 .align 2, 0 -_08028A80: .4byte 0x082fb314 -_08028A84: .4byte 0x082f7eb0 + .pool thumb_func_end sub_8028A34 thumb_func_start sub_8028A88 @@ -84153,14 +82277,14 @@ sub_8028A88: @ 8028A88 push {r6,r7} sub sp, 0x30 mov r1, sp - ldr r0, _08028B18 + ldr r0, =0x082fb324 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} add r2, sp, 0x18 adds r1, r2, 0 - ldr r0, _08028B1C + ldr r0, =0x082fb33c ldm r0!, {r3-r5} stm r1!, {r3-r5} ldm r0!, {r3-r5} @@ -84170,7 +82294,7 @@ sub_8028A88: @ 8028A88 _08028AB0: movs r0, 0x4 bl malloc_and_clear - ldr r1, _08028B20 + ldr r1, =0x02022cb8 lsls r4, r5, 2 adds r4, r1 str r0, [r4] @@ -84194,8 +82318,8 @@ _08028AB0: cmp r5, 0xA bls _08028AB0 movs r5, 0 - ldr r7, _08028B24 - ldr r4, _08028B28 + ldr r7, =0x02022ce4 + ldr r4, =0x082fb31c mov r8, r4 _08028AF0: movs r0, 0x4 @@ -84216,11 +82340,7 @@ _08028AF0: ldr r1, [r7, 0xC] b _08028B40 .align 2, 0 -_08028B18: .4byte 0x082fb324 -_08028B1C: .4byte 0x082fb33c -_08028B20: .4byte 0x02022cb8 -_08028B24: .4byte 0x02022ce4 -_08028B28: .4byte 0x082fb31c + .pool _08028B2C: lsls r0, r5, 1 add r0, r8 @@ -84241,7 +82361,7 @@ _08028B40: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08028B7C + ldr r1, =0x02020630 adds r0, r1 adds r1, r5, 0 bl obj_anim_image_start @@ -84260,14 +82380,14 @@ _08028B40: pop {r0} bx r0 .align 2, 0 -_08028B7C: .4byte 0x02020630 + .pool thumb_func_end sub_8028A88 thumb_func_start sub_8028B80 sub_8028B80: @ 8028B80 push {r4-r6,lr} movs r5, 0 - ldr r6, _08028BEC + ldr r6, =0x02022cb8 _08028B86: lsls r0, r5, 2 adds r4, r0, r6 @@ -84276,7 +82396,7 @@ _08028B86: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08028BF0 + ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 beq _08028BA0 @@ -84292,7 +82412,7 @@ _08028BA0: cmp r5, 0xA bls _08028B86 movs r5, 0 - ldr r6, _08028BF4 + ldr r6, =0x02022ce4 _08028BB8: lsls r0, r5, 2 adds r4, r0, r6 @@ -84301,7 +82421,7 @@ _08028BB8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08028BF0 + ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 beq _08028BD2 @@ -84320,9 +82440,7 @@ _08028BD2: pop {r0} bx r0 .align 2, 0 -_08028BEC: .4byte 0x02022cb8 -_08028BF0: .4byte 0x02020630 -_08028BF4: .4byte 0x02022ce4 + .pool thumb_func_end sub_8028B80 thumb_func_start sub_8028BF8 @@ -84330,8 +82448,8 @@ sub_8028BF8: @ 8028BF8 lsls r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r3, _08028C28 - ldr r2, _08028C2C + ldr r3, =0x02020630 + ldr r2, =0x02022cb8 lsrs r0, 22 adds r0, r2 ldr r0, [r0] @@ -84352,8 +82470,7 @@ sub_8028BF8: @ 8028BF8 strb r0, [r2] bx lr .align 2, 0 -_08028C28: .4byte 0x02020630 -_08028C2C: .4byte 0x02022cb8 + .pool thumb_func_end sub_8028BF8 thumb_func_start sub_8028C30 @@ -84362,8 +82479,8 @@ sub_8028C30: @ 8028C30 lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r7, _08028C74 - ldr r6, _08028C78 + ldr r7, =0x02020630 + ldr r6, =0x02022ce4 movs r1, 0x1 ands r0, r1 lsls r4, r0, 2 @@ -84393,16 +82510,15 @@ _08028C46: pop {r0} bx r0 .align 2, 0 -_08028C74: .4byte 0x02020630 -_08028C78: .4byte 0x02022ce4 + .pool thumb_func_end sub_8028C30 thumb_func_start sub_8028C7C sub_8028C7C: @ 8028C7C lsls r0, 24 lsls r1, 24 - ldr r3, _08028C9C - ldr r2, _08028CA0 + ldr r3, =0x02020630 + ldr r2, =0x02022cb8 lsrs r0, 22 adds r0, r2 ldr r0, [r0] @@ -84415,8 +82531,7 @@ sub_8028C7C: @ 8028C7C strh r1, [r0, 0x22] bx lr .align 2, 0 -_08028C9C: .4byte 0x02020630 -_08028CA0: .4byte 0x02022cb8 + .pool thumb_func_end sub_8028C7C thumb_func_start sub_8028CA4 @@ -84425,7 +82540,7 @@ sub_8028CA4: @ 8028CA4 lsls r0, 16 lsls r1, 24 lsrs r1, 24 - ldr r2, _08028CC8 + ldr r2, =0x02022cb8 lsrs r0, 14 adds r0, r2 ldr r0, [r0] @@ -84433,21 +82548,20 @@ sub_8028CA4: @ 8028CA4 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, _08028CCC + ldr r2, =0x02020630 adds r0, r2 bl obj_anim_image_start pop {r0} bx r0 .align 2, 0 -_08028CC8: .4byte 0x02022cb8 -_08028CCC: .4byte 0x02020630 + .pool thumb_func_end sub_8028CA4 thumb_func_start sub_8028CD0 sub_8028CD0: @ 8028CD0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08028CF0 + ldr r1, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -84461,7 +82575,7 @@ sub_8028CD0: @ 8028CD0 strh r0, [r2, 0x22] bx lr .align 2, 0 -_08028CF0: .4byte 0x02020630 + .pool thumb_func_end sub_8028CD0 thumb_func_start sub_8028CF4 @@ -84474,8 +82588,8 @@ sub_8028CF4: @ 8028CF4 cmp r0, 0x1 beq _08028D36 movs r3, 0 - ldr r7, _08028D3C - ldr r6, _08028D40 + ldr r7, =0x082fb354 + ldr r6, =0x02022cb0 movs r5, 0 _08028D0A: lsls r0, r3, 2 @@ -84506,8 +82620,7 @@ _08028D36: pop {r0} bx r0 .align 2, 0 -_08028D3C: .4byte 0x082fb354 -_08028D40: .4byte 0x02022cb0 + .pool thumb_func_end sub_8028CF4 thumb_func_start sub_8028D44 @@ -84522,12 +82635,12 @@ sub_8028D44: @ 8028D44 adds r0, r4, 0 bl malloc_and_clear adds r6, r0, 0 - ldr r0, _08028DE8 + ldr r0, =0x082fb360 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x20] str r1, [sp, 0x24] - ldr r0, _08028DEC + ldr r0, =0x082f9774 adds r1, r6, 0 bl LZ77UnCompWram cmp r6, 0 @@ -84539,7 +82652,7 @@ sub_8028D44: @ 8028D44 orrs r1, r4 str r1, [r0, 0x4] mov r2, sp - ldr r1, _08028DF0 + ldr r1, =0x082fb368 ldm r1!, {r3-r5} stm r2!, {r3-r5} ldm r1!, {r3-r5} @@ -84548,10 +82661,10 @@ sub_8028D44: @ 8028D44 add r0, sp, 0x20 bl gpu_pal_obj_alloc_tag_and_apply movs r5, 0 - ldr r7, _08028DF4 + ldr r7, =0x082fb356 adds r0, r7, 0x2 mov r9, r0 - ldr r1, _08028DF8 + ldr r1, =0x02022cb0 mov r8, r1 _08028D9E: movs r0, 0x4 @@ -84589,22 +82702,18 @@ _08028DD2: pop {r0} bx r0 .align 2, 0 -_08028DE8: .4byte 0x082fb360 -_08028DEC: .4byte 0x082f9774 -_08028DF0: .4byte 0x082fb368 -_08028DF4: .4byte 0x082fb356 -_08028DF8: .4byte 0x02022cb0 + .pool thumb_func_end sub_8028D44 thumb_func_start sub_8028DFC sub_8028DFC: @ 8028DFC push {r4-r7,lr} movs r3, 0 - ldr r0, _08028E40 + ldr r0, =0x02022cb0 mov r12, r0 - ldr r4, _08028E44 + ldr r4, =0x082fb356 adds r7, r4, 0x2 - ldr r6, _08028E48 + ldr r6, =0x02020630 movs r5, 0x1 _08028E0C: lsls r2, r3, 2 @@ -84634,17 +82743,15 @@ _08028E0C: pop {r0} bx r0 .align 2, 0 -_08028E40: .4byte 0x02022cb0 -_08028E44: .4byte 0x082fb356 -_08028E48: .4byte 0x02020630 + .pool thumb_func_end sub_8028DFC thumb_func_start sub_8028E4C sub_8028E4C: @ 8028E4C push {r4,r5,lr} movs r2, 0 - ldr r5, _08028E7C - ldr r4, _08028E80 + ldr r5, =0x02022cb0 + ldr r4, =0x02020630 movs r3, 0 _08028E56: lsls r0, r2, 2 @@ -84666,15 +82773,14 @@ _08028E56: pop {r0} bx r0 .align 2, 0 -_08028E7C: .4byte 0x02022cb0 -_08028E80: .4byte 0x02020630 + .pool thumb_func_end sub_8028E4C thumb_func_start sub_8028E84 sub_8028E84: @ 8028E84 push {r4-r6,lr} movs r5, 0 - ldr r6, _08028EC0 + ldr r6, =0x02022cb0 _08028E8A: lsls r0, r5, 2 adds r4, r0, r6 @@ -84683,7 +82789,7 @@ _08028E8A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08028EC4 + ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 beq _08028EA4 @@ -84702,8 +82808,7 @@ _08028EA4: pop {r0} bx r0 .align 2, 0 -_08028EC0: .4byte 0x02022cb0 -_08028EC4: .4byte 0x02020630 + .pool thumb_func_end sub_8028E84 thumb_func_start sub_8028EC8 @@ -84712,8 +82817,8 @@ sub_8028EC8: @ 8028EC8 lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r7, _08028F0C - ldr r6, _08028F10 + ldr r7, =0x02020630 + ldr r6, =0x02022cb0 movs r1, 0x1 ands r0, r1 lsls r4, r0, 2 @@ -84743,8 +82848,7 @@ _08028EDE: pop {r0} bx r0 .align 2, 0 -_08028F0C: .4byte 0x02020630 -_08028F10: .4byte 0x02022cb0 + .pool thumb_func_end sub_8028EC8 thumb_func_start sub_8028F14 @@ -84759,12 +82863,12 @@ sub_8028F14: @ 8028F14 cmp r0, 0x4 bhi _08028FC6 lsls r0, 2 - ldr r1, _08028F30 + ldr r1, =_08028F34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08028F30: .4byte _08028F34 + .pool .align 2, 0 _08028F34: .4byte _08028FB4 @@ -84820,12 +82924,12 @@ _08028F8E: cmp r2, 0x4 bhi _08028FC6 lsls r0, r2, 2 - ldr r1, _08028F9C + ldr r1, =_08028FA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08028F9C: .4byte _08028FA0 + .pool .align 2, 0 _08028FA0: .4byte _08028FB4 @@ -84914,14 +83018,14 @@ sub_802902C: @ 802902C thumb_func_start sub_802903C sub_802903C: @ 802903C - ldr r3, _0802906C + ldr r3, =0x02022cf8 ldr r0, [r3] movs r2, 0xC0 lsls r2, 6 adds r1, r0, r2 movs r2, 0 str r2, [r1] - ldr r1, _08029070 + ldr r1, =0x00003014 adds r0, r1 strb r2, [r0] ldr r0, [r3] @@ -84938,8 +83042,7 @@ sub_802903C: @ 802903C strb r2, [r0] bx lr .align 2, 0 -_0802906C: .4byte 0x02022cf8 -_08029070: .4byte 0x00003014 + .pool thumb_func_end sub_802903C thumb_func_start sub_8029074 @@ -85191,17 +83294,17 @@ sub_8029174: @ 8029174 thumb_func_start sub_8029274 sub_8029274: @ 8029274 push {r4,lr} - ldr r4, _080292BC + ldr r4, =0x02022cf8 str r0, [r4] movs r2, 0xC0 lsls r2, 6 adds r1, r0, r2 movs r2, 0 str r2, [r1] - ldr r3, _080292C0 + ldr r3, =0x00003014 adds r1, r0, r3 strb r2, [r1] - ldr r1, _080292C4 + ldr r1, =0x00003018 adds r0, r1 strb r2, [r0] ldr r0, [r4] @@ -85212,25 +83315,20 @@ sub_8029274: @ 8029274 adds r1, 0xC adds r0, r1 strb r2, [r0] - ldr r0, _080292C8 + ldr r0, =sub_8029314 + 1 movs r1, 0x3 bl AddTask ldr r1, [r4] - ldr r2, _080292CC + ldr r2, =0x00003004 adds r1, r2 strb r0, [r1] - ldr r0, _080292D0 + ldr r0, =sub_8029338 + 1 bl sub_802A72C pop {r4} pop {r0} bx r0 .align 2, 0 -_080292BC: .4byte 0x02022cf8 -_080292C0: .4byte 0x00003014 -_080292C4: .4byte 0x00003018 -_080292C8: .4byte sub_8029314 + 1 -_080292CC: .4byte 0x00003004 -_080292D0: .4byte sub_8029338 + 1 + .pool thumb_func_end sub_8029274 thumb_func_start sub_80292D4 @@ -85247,7 +83345,7 @@ sub_80292E0: @ 80292E0 lsls r0, 24 lsrs r6, r0, 24 movs r4, 0 - ldr r5, _08029310 + ldr r5, =0x082fb40c adds r7, r5, 0x4 _080292EC: lsls r1, r4, 3 @@ -85268,13 +83366,13 @@ _080292FE: pop {r0} bx r0 .align 2, 0 -_08029310: .4byte 0x082fb40c + .pool thumb_func_end sub_80292E0 thumb_func_start sub_8029314 sub_8029314: @ 8029314 push {lr} - ldr r0, _08029334 + ldr r0, =0x02022cf8 ldr r0, [r0] movs r1, 0xC0 lsls r1, 6 @@ -85288,28 +83386,26 @@ _0802932E: pop {r0} bx r0 .align 2, 0 -_08029334: .4byte 0x02022cf8 + .pool thumb_func_end sub_8029314 thumb_func_start sub_8029338 sub_8029338: @ 8029338 push {lr} - ldr r0, _08029354 + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r2, _08029358 + ldr r2, =0x00003014 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x4 bhi _08029430 lsls r0, 2 - ldr r1, _0802935C + ldr r1, =_08029360 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08029354: .4byte 0x02022cf8 -_08029358: .4byte 0x00003014 -_0802935C: .4byte _08029360 + .pool .align 2, 0 _08029360: .4byte _08029374 @@ -85324,26 +83420,25 @@ _0802937A: bl sub_802A8E8 cmp r0, 0x1 bne _0802943A - ldr r0, _0802938C + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r2, _08029390 + ldr r2, =0x00003014 adds r1, r2 b _0802941C .align 2, 0 -_0802938C: .4byte 0x02022cf8 -_08029390: .4byte 0x00003014 + .pool _08029394: - ldr r1, _080293CC + ldr r1, =0x082faad8 movs r0, 0x3 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r1, _080293D0 + ldr r1, =0x082faf94 movs r0, 0x1 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r1, _080293D4 + ldr r1, =0x082fad44 movs r0, 0x2 movs r2, 0 movs r3, 0 @@ -85356,9 +83451,7 @@ _08029394: bl gpu_copy_wram_bg_tilemap_to_vram b _08029414 .align 2, 0 -_080293CC: .4byte 0x082faad8 -_080293D0: .4byte 0x082faf94 -_080293D4: .4byte 0x082fad44 + .pool _080293D8: movs r0, 0 bl gpu_sync_bg_show @@ -85368,25 +83461,24 @@ _080293D8: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - ldr r0, _080293FC + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r2, _08029400 + ldr r2, =0x00003014 adds r1, r2 b _0802941C .align 2, 0 -_080293FC: .4byte 0x02022cf8 -_08029400: .4byte 0x00003014 + .pool _08029404: - ldr r0, _08029424 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x14] lsrs r0, 3 bl sub_8028FF8 bl sub_802902C _08029414: - ldr r0, _08029428 + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r0, _0802942C + ldr r0, =0x00003014 adds r1, r0 _0802941C: ldrb r0, [r1] @@ -85394,9 +83486,7 @@ _0802941C: strb r0, [r1] b _0802943A .align 2, 0 -_08029424: .4byte 0x03005d90 -_08029428: .4byte 0x02022cf8 -_0802942C: .4byte 0x00003014 + .pool _08029430: movs r2, 0xC0 lsls r2, 6 @@ -85416,9 +83506,9 @@ sub_8029440: @ 8029440 mov r5, r8 push {r5-r7} sub sp, 0x1C - ldr r4, _08029480 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r2, _08029484 + ldr r2, =0x00003014 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 @@ -85445,21 +83535,20 @@ _0802946E: _0802947E: b _08029640 .align 2, 0 -_08029480: .4byte 0x02022cf8 -_08029484: .4byte 0x00003014 + .pool _08029488: bl sub_8027650 lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080295C4 + ldr r1, =0x082fb3c8 subs r0, r7, 0x1 lsls r0, 2 adds r0, r1 ldr r5, [r0] - ldr r2, _080295C8 + ldr r2, =0xffffff00 ldr r0, [sp, 0xC] ands r0, r2 - ldr r1, _080295CC + ldr r1, =0x00ffffff ands r0, r1 movs r1, 0xE0 lsls r1, 19 @@ -85469,12 +83558,12 @@ _08029488: ands r0, r2 movs r1, 0x2 orrs r0, r1 - ldr r1, _080295D0 + ldr r1, =0xffff00ff ands r0, r1 movs r1, 0xD0 lsls r1, 4 orrs r0, r1 - ldr r1, _080295D4 + ldr r1, =0x0000ffff ands r0, r1 movs r1, 0x98 lsls r1, 13 @@ -85487,7 +83576,7 @@ _08029488: adds r3, 0xC str r3, [sp, 0x18] mov r10, r4 - ldr r0, _080295D8 + ldr r0, =0x00003008 mov r9, r0 _080294DC: movs r1, 0 @@ -85509,14 +83598,14 @@ _080294DC: str r1, [sp, 0x14] ldrb r0, [r5] lsls r0, 8 - ldr r2, _080295D0 + ldr r2, =0xffff00ff ldr r1, [sp, 0xC] ands r1, r2 orrs r1, r0 str r1, [sp, 0xC] ldrb r2, [r5, 0x1] lsls r2, 16 - ldr r0, _080295DC + ldr r0, =0xff00ffff ands r0, r1 orrs r0, r2 str r0, [sp, 0xC] @@ -85561,7 +83650,7 @@ _0802955A: mov r3, r8 lsls r1, r3, 1 add r1, r8 - ldr r3, _080295E0 + ldr r3, =0x082fb380 adds r1, r3 str r1, [sp] movs r1, 0x1 @@ -85591,22 +83680,13 @@ _0802955A: cmp r6, r7 bcc _080294DC _080295B8: - ldr r0, _080295E4 + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r0, _080295E8 + ldr r0, =0x00003014 adds r1, r0 b _0802962A .align 2, 0 -_080295C4: .4byte 0x082fb3c8 -_080295C8: .4byte 0xffffff00 -_080295CC: .4byte 0x00ffffff -_080295D0: .4byte 0xffff00ff -_080295D4: .4byte 0x0000ffff -_080295D8: .4byte 0x00003008 -_080295DC: .4byte 0xff00ffff -_080295E0: .4byte 0x082fb380 -_080295E4: .4byte 0x02022cf8 -_080295E8: .4byte 0x00003014 + .pool _080295EC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -85620,7 +83700,7 @@ _080295EC: bcs _0802961C _08029604: ldr r0, [r4] - ldr r1, _08029634 + ldr r1, =0x00003008 adds r0, r1 adds r0, r6 ldrb r0, [r0] @@ -85633,9 +83713,9 @@ _08029604: _0802961C: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _08029638 + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r2, _0802963C + ldr r2, =0x00003014 adds r1, r2 _0802962A: ldrb r0, [r1] @@ -85643,13 +83723,11 @@ _0802962A: strb r0, [r1] b _0802968E .align 2, 0 -_08029634: .4byte 0x00003008 -_08029638: .4byte 0x02022cf8 -_0802963C: .4byte 0x00003014 + .pool _08029640: - ldr r5, _080296A0 + ldr r5, =0x02022cf8 ldr r0, [r5] - ldr r4, _080296A4 + ldr r4, =0x00003008 adds r0, r4 adds r0, r6 ldrb r0, [r0] @@ -85676,7 +83754,7 @@ _08029666: bl bg_fill_tilemap_rect movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _080296A0 + ldr r0, =0x02022cf8 ldr r0, [r0] movs r3, 0xC0 lsls r3, 6 @@ -85693,8 +83771,7 @@ _0802968E: pop {r0} bx r0 .align 2, 0 -_080296A0: .4byte 0x02022cf8 -_080296A4: .4byte 0x00003008 + .pool thumb_func_end sub_8029440 thumb_func_start sub_80296A8 @@ -85711,7 +83788,7 @@ sub_80296A8: @ 80296A8 movs r6, 0 lsrs r7, r0, 24 add r4, sp, 0x2C - ldr r1, _08029870 + ldr r1, =0x082fb45c adds r0, r4, 0 movs r2, 0x5 bl memcpy @@ -85771,7 +83848,7 @@ _08029728: bcc _08029700 _0802972E: movs r5, 0 - ldr r4, _08029874 + ldr r4, =0x085ede5d cmp r5, r7 bcs _08029754 add r1, sp, 0x34 @@ -85805,7 +83882,7 @@ _08029754: mov r2, sp adds r2, 0x34 str r2, [sp, 0x68] - ldr r3, _08029878 + ldr r3, =0x00003009 mov r10, r3 _08029774: movs r0, 0 @@ -85820,18 +83897,18 @@ _08029774: adds r0, r1 ldr r0, [r0] mov r9, r0 - ldr r2, _0802987C + ldr r2, =0x02022cf8 ldr r0, [r2] add r0, r10 ldrb r0, [r0] - ldr r2, _08029880 + ldr r2, =0x082fb3dc ldr r3, [sp, 0x68] adds r1, r3, r1 ldrb r1, [r1] lsls r1, 2 adds r1, r2 ldr r2, [r1] - ldr r3, _08029884 + ldr r3, =0x082fb402 lsls r1, r5, 1 adds r1, r3 ldrb r6, [r1] @@ -85854,14 +83931,14 @@ _080297CC: adds r0, r4, 0 bl sub_8027660 adds r3, r0, 0 - ldr r1, _0802987C + ldr r1, =0x02022cf8 ldr r0, [r1] add r0, r10 ldrb r0, [r0] mov r2, r8 lsls r1, r2, 1 add r1, r8 - ldr r2, _08029888 + ldr r2, =0x082fb380 adds r1, r2 str r1, [sp] movs r1, 0x1 @@ -85883,7 +83960,7 @@ _080297CC: negs r2, r2 bl font_get_width_of_string adds r3, r0, 0 - ldr r2, _0802987C + ldr r2, =0x02022cf8 ldr r0, [r2] add r0, r10 ldrb r0, [r0] @@ -85899,7 +83976,7 @@ _080297CC: movs r1, 0x1 add r2, sp, 0xC bl Print - ldr r2, _0802987C + ldr r2, =0x02022cf8 ldr r0, [r2] add r0, r10 ldrb r0, [r0] @@ -85911,7 +83988,7 @@ _080297CC: movs r1, 0 str r1, [sp, 0x8] movs r1, 0x1 - ldr r2, _08029874 + ldr r2, =0x085ede5d lsrs r3, 24 bl Print adds r0, r5, 0x1 @@ -85929,13 +84006,7 @@ _08029860: pop {r0} bx r0 .align 2, 0 -_08029870: .4byte 0x082fb45c -_08029874: .4byte 0x085ede5d -_08029878: .4byte 0x00003009 -_0802987C: .4byte 0x02022cf8 -_08029880: .4byte 0x082fb3dc -_08029884: .4byte 0x082fb402 -_08029888: .4byte 0x082fb380 + .pool thumb_func_end sub_80296A8 thumb_func_start sub_802988C @@ -85950,9 +84021,9 @@ sub_802988C: @ 802988C lsls r0, 24 lsrs r0, 24 str r0, [sp, 0xC] - ldr r6, _080298BC + ldr r6, =0x02022cf8 ldr r1, [r6] - ldr r2, _080298C0 + ldr r2, =0x00003014 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xB @@ -85960,14 +84031,12 @@ sub_802988C: @ 802988C b _08029FA8 _080298B2: lsls r0, 2 - ldr r1, _080298C4 + ldr r1, =_080298C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080298BC: .4byte 0x02022cf8 -_080298C0: .4byte 0x00003014 -_080298C4: .4byte _080298C8 + .pool .align 2, 0 _080298C8: .4byte _080298F8 @@ -85984,23 +84053,22 @@ _080298C8: .4byte _08029F5C _080298F8: bl sub_802784C - ldr r0, _0802990C + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r0, _08029910 + ldr r0, =0x0000301c adds r2, r1, r0 movs r0, 0 strh r0, [r2] b _08029F8A .align 2, 0 -_0802990C: .4byte 0x02022cf8 -_08029910: .4byte 0x0000301c + .pool _08029914: - ldr r6, _0802995C + ldr r6, =0x082f7bbc adds r0, r6, 0 bl Window_AddFromTemplate - ldr r4, _08029960 + ldr r4, =0x02022cf8 ldr r1, [r4] - ldr r2, _08029964 + ldr r2, =0x00003008 mov r8, r2 add r1, r8 strb r0, [r1] @@ -86009,7 +84077,7 @@ _08029914: mov r9, r0 bl Window_AddFromTemplate ldr r1, [r4] - ldr r5, _08029968 + ldr r5, =0x00003009 adds r1, r5 strb r0, [r1] ldr r0, [r4] @@ -86026,26 +84094,23 @@ _08029914: bl sub_8029174 b _08029F88 .align 2, 0 -_0802995C: .4byte 0x082f7bbc -_08029960: .4byte 0x02022cf8 -_08029964: .4byte 0x00003008 -_08029968: .4byte 0x00003009 + .pool _0802996C: - ldr r4, _08029AB4 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r5, _08029AB8 + ldr r5, =0x00003008 adds r0, r5 ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels ldr r0, [r4] - ldr r1, _08029ABC + ldr r1, =0x00003009 mov r9, r1 add r0, r9 ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _08029AC0 + ldr r2, =0x085edd49 mov r8, r2 movs r2, 0x1 negs r2, r2 @@ -86072,7 +84137,7 @@ _0802996C: ldr r0, [r4] add r0, r9 ldrb r0, [r0] - ldr r2, _08029AC4 + ldr r2, =0x085edd6b movs r1, 0x11 str r1, [sp] str r6, [sp, 0x4] @@ -86097,19 +84162,19 @@ _080299F2: mov r0, r9 bl sub_8027660 adds r6, r0, 0 - ldr r0, _08029AB4 + ldr r0, =0x02022cf8 ldr r0, [r0] - ldr r1, _08029ABC + ldr r1, =0x00003009 adds r0, r1 ldrb r0, [r0] mov r2, r9 lsls r5, r2, 1 - ldr r2, _08029AC8 + ldr r2, =0x082fb3f8 adds r1, r5, r2 ldrb r3, [r1] lsls r1, r4, 1 adds r1, r4 - ldr r2, _08029ACC + ldr r2, =0x082fb380 adds r1, r2 str r1, [sp] movs r4, 0x1 @@ -86124,7 +84189,7 @@ _080299F2: mov r0, r9 adds r0, 0x1 str r0, [sp, 0x10] - ldr r1, _08029AD0 + ldr r1, =0x02021fc4 mov r10, r1 _08029A36: mov r0, r9 @@ -86132,14 +84197,14 @@ _08029A36: bl sub_80276A0 lsls r0, 16 lsrs r0, 16 - ldr r1, _08029AD4 + ldr r1, =0x0000270f bl sub_8027A38 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 adds r0, r7, 0 bl sub_802778C - ldr r1, _08029AD4 + ldr r1, =0x0000270f bl sub_8027A38 lsls r0, 16 lsrs r6, r0, 16 @@ -86158,22 +84223,22 @@ _08029A36: bne _08029AE0 cmp r6, 0 beq _08029AE0 - ldr r0, _08029AB4 + ldr r0, =0x02022cf8 ldr r0, [r0] - ldr r2, _08029ABC + ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] lsls r1, r7, 1 - ldr r2, _08029AD8 + ldr r2, =0x082fb3f0 adds r1, r2 ldrb r2, [r1] subs r2, r5 lsls r2, 24 lsrs r2, 24 - ldr r1, _08029AC8 + ldr r1, =0x082fb3f8 add r1, r8 ldrb r3, [r1] - ldr r1, _08029ADC + ldr r1, =0x082fb383 str r1, [sp] movs r1, 0x1 negs r1, r1 @@ -86184,31 +84249,21 @@ _08029A36: bl box_print b _08029B10 .align 2, 0 -_08029AB4: .4byte 0x02022cf8 -_08029AB8: .4byte 0x00003008 -_08029ABC: .4byte 0x00003009 -_08029AC0: .4byte 0x085edd49 -_08029AC4: .4byte 0x085edd6b -_08029AC8: .4byte 0x082fb3f8 -_08029ACC: .4byte 0x082fb380 -_08029AD0: .4byte 0x02021fc4 -_08029AD4: .4byte 0x0000270f -_08029AD8: .4byte 0x082fb3f0 -_08029ADC: .4byte 0x082fb383 + .pool _08029AE0: - ldr r0, _08029B50 + ldr r0, =0x02022cf8 ldr r0, [r0] - ldr r2, _08029B54 + ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] lsls r1, r7, 1 - ldr r2, _08029B58 + ldr r2, =0x082fb3f0 adds r1, r2 ldrb r3, [r1] subs r3, r5 lsls r3, 24 lsrs r3, 24 - ldr r1, _08029B5C + ldr r1, =0x082fb3f8 add r1, r8 ldrb r1, [r1] str r1, [sp] @@ -86217,7 +84272,7 @@ _08029AE0: movs r1, 0 str r1, [sp, 0x8] movs r1, 0x1 - ldr r2, _08029B60 + ldr r2, =0x02021fc4 bl Print _08029B10: adds r0, r7, 0x1 @@ -86234,44 +84289,38 @@ _08029B10: bcs _08029B2A b _080299E2 _08029B2A: - ldr r4, _08029B50 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r1, _08029B64 + ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] movs r1, 0x2 bl Window_CopyToVram ldr r0, [r4] - ldr r2, _08029B54 + ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] movs r1, 0x2 bl Window_CopyToVram ldr r1, [r4] - ldr r0, _08029B68 + ldr r0, =0x00003014 adds r1, r0 b _08029F8E .align 2, 0 -_08029B50: .4byte 0x02022cf8 -_08029B54: .4byte 0x00003009 -_08029B58: .4byte 0x082fb3f0 -_08029B5C: .4byte 0x082fb3f8 -_08029B60: .4byte 0x02021fc4 -_08029B64: .4byte 0x00003008 -_08029B68: .4byte 0x00003014 + .pool _08029B6C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _08029B90 - ldr r4, _08029BA8 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r1, _08029BAC + ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] bl Window_WriteStandardTileMap ldr r0, [r4] - ldr r2, _08029BB0 + ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] bl Window_WriteStandardTileMap @@ -86280,20 +84329,17 @@ _08029B90: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0 bl sub_8028C30 - ldr r0, _08029BA8 + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r0, _08029BB4 + ldr r0, =0x00003014 adds r1, r0 b _08029F8E .align 2, 0 -_08029BA8: .4byte 0x02022cf8 -_08029BAC: .4byte 0x00003008 -_08029BB0: .4byte 0x00003009 -_08029BB4: .4byte 0x00003014 + .pool _08029BB8: - ldr r4, _08029BF0 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r1, _08029BF4 + ldr r1, =0x0000301c adds r2, r0, r1 ldrh r0, [r2] adds r0, 0x1 @@ -86304,7 +84350,7 @@ _08029BB8: bhi _08029BD0 b _08029FF8 _08029BD0: - ldr r0, _08029BF8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -86320,24 +84366,22 @@ _08029BDE: bl sub_8028C30 b _08029F88 .align 2, 0 -_08029BF0: .4byte 0x02022cf8 -_08029BF4: .4byte 0x0000301c -_08029BF8: .4byte 0x030022c0 + .pool _08029BFC: - ldr r4, _08029C50 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r5, _08029C54 + ldr r5, =0x00003008 adds r0, r5 ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels ldr r0, [r4] - ldr r1, _08029C58 + ldr r1, =0x00003009 adds r0, r1 ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels - ldr r6, _08029C5C + ldr r6, =0x085edd86 movs r2, 0x1 negs r2, r2 movs r0, 0x1 @@ -86363,68 +84407,59 @@ _08029BFC: bl Print b _08029F88 .align 2, 0 -_08029C50: .4byte 0x02022cf8 -_08029C54: .4byte 0x00003008 -_08029C58: .4byte 0x00003009 -_08029C5C: .4byte 0x085edd86 + .pool _08029C60: ldr r0, [sp, 0xC] bl sub_80296A8 - ldr r4, _08029C8C + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r1, _08029C90 + ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] movs r1, 0x2 bl Window_CopyToVram ldr r0, [r4] - ldr r2, _08029C94 + ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] movs r1, 0x2 bl Window_CopyToVram ldr r1, [r4] - ldr r0, _08029C98 + ldr r0, =0x00003014 adds r1, r0 b _08029F8E .align 2, 0 -_08029C8C: .4byte 0x02022cf8 -_08029C90: .4byte 0x00003008 -_08029C94: .4byte 0x00003009 -_08029C98: .4byte 0x00003014 + .pool _08029C9C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _08029CC0 - ldr r4, _08029CD0 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r1, _08029CD4 + ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] bl Window_WriteStandardTileMap ldr r0, [r4] - ldr r2, _08029CD8 + ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] bl Window_WriteStandardTileMap _08029CC0: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _08029CD0 + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r0, _08029CDC + ldr r0, =0x00003014 adds r1, r0 b _08029F8E .align 2, 0 -_08029CD0: .4byte 0x02022cf8 -_08029CD4: .4byte 0x00003008 -_08029CD8: .4byte 0x00003009 -_08029CDC: .4byte 0x00003014 + .pool _08029CE0: - ldr r4, _08029D28 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r1, _08029D2C + ldr r1, =0x0000301c adds r2, r0, r1 ldrh r0, [r2] adds r0, 0x1 @@ -86435,7 +84470,7 @@ _08029CE0: bhi _08029CF8 b _08029FF8 _08029CF8: - ldr r0, _08029D30 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -86448,25 +84483,21 @@ _08029D06: movs r0, 0x5 bl audio_play bl sub_8027748 - ldr r1, _08029D34 + ldr r1, =0x00000bb7 cmp r0, r1 bhi _08029D3C ldr r0, [r4] - ldr r2, _08029D38 + ldr r2, =0x00003014 adds r0, r2 movs r1, 0x7F strb r1, [r0] b _08029D4C .align 2, 0 -_08029D28: .4byte 0x02022cf8 -_08029D2C: .4byte 0x0000301c -_08029D30: .4byte 0x030022c0 -_08029D34: .4byte 0x00000bb7 -_08029D38: .4byte 0x00003014 + .pool _08029D3C: bl sub_80A2F30 ldr r1, [r4] - ldr r0, _08029D90 + ldr r0, =0x00003014 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 @@ -86481,13 +84512,13 @@ _08029D4C: movs r2, 0 movs r3, 0x5 bl bg_fill_tilemap_rect - ldr r5, _08029D94 + ldr r5, =0x02022cf8 ldr r0, [r5] - ldr r4, _08029D98 + ldr r4, =0x00003009 adds r0, r4 ldrb r0, [r0] bl Window_Remove - ldr r6, _08029D9C + ldr r6, =0x082f7bcc adds r0, r6, 0 bl Window_AddFromTemplate ldr r1, [r5] @@ -86501,28 +84532,25 @@ _08029D4C: bl sub_8029174 b _08029FF8 .align 2, 0 -_08029D90: .4byte 0x00003014 -_08029D94: .4byte 0x02022cf8 -_08029D98: .4byte 0x00003009 -_08029D9C: .4byte 0x082f7bcc + .pool _08029DA0: - ldr r0, _08029E78 + ldr r0, =0x0000016f bl current_map_music_set - ldr r4, _08029E7C + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r6, _08029E80 + ldr r6, =0x00003008 adds r0, r6 ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels ldr r0, [r4] - ldr r1, _08029E84 + ldr r1, =0x00003009 mov r10, r1 add r0, r10 ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels - ldr r5, _08029E88 + ldr r5, =0x085edd9b movs r2, 0x1 negs r2, r2 movs r0, 0x1 @@ -86552,14 +84580,14 @@ _08029DA0: bl sub_802762C lsls r0, 16 lsrs r0, 16 - ldr r5, _08029E8C + ldr r5, =0x02021cc4 adds r1, r5, 0 bl itemid_get_name movs r0, 0 adds r1, r5, 0 bl sub_81AFC0C - ldr r7, _08029E90 - ldr r1, _08029E94 + ldr r7, =0x02021fc4 + ldr r1, =0x085eddbd adds r0, r7, 0 bl sub_81AFC28 ldr r0, [r4] @@ -86593,33 +84621,25 @@ _08029DA0: bl sub_81AFC0C cmp r4, 0x2 bne _08029E9C - ldr r1, _08029E98 + ldr r1, =0x085edde2 adds r0, r7, 0 bl sub_81AFC28 b _08029EA8 .align 2, 0 -_08029E78: .4byte 0x0000016f -_08029E7C: .4byte 0x02022cf8 -_08029E80: .4byte 0x00003008 -_08029E84: .4byte 0x00003009 -_08029E88: .4byte 0x085edd9b -_08029E8C: .4byte 0x02021cc4 -_08029E90: .4byte 0x02021fc4 -_08029E94: .4byte 0x085eddbd -_08029E98: .4byte 0x085edde2 + .pool _08029E9C: cmp r6, 0x1 bne _08029EA8 - ldr r1, _08029EF0 + ldr r1, =0x085eddfb adds r0, r7, 0 bl sub_81AFC28 _08029EA8: - ldr r0, _08029EF4 + ldr r0, =0x02022cf8 ldr r0, [r0] - ldr r2, _08029EF8 + ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] - ldr r2, _08029EFC + ldr r2, =0x02021fc4 movs r1, 0x29 str r1, [sp] movs r1, 0xFF @@ -86630,68 +84650,59 @@ _08029EA8: movs r3, 0 bl Print _08029EC8: - ldr r4, _08029EF4 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r1, _08029F00 + ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] movs r1, 0x2 bl Window_CopyToVram ldr r0, [r4] - ldr r2, _08029EF8 + ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] movs r1, 0x2 bl Window_CopyToVram ldr r1, [r4] - ldr r0, _08029F04 + ldr r0, =0x00003014 adds r1, r0 b _08029F8E .align 2, 0 -_08029EF0: .4byte 0x085eddfb -_08029EF4: .4byte 0x02022cf8 -_08029EF8: .4byte 0x00003009 -_08029EFC: .4byte 0x02021fc4 -_08029F00: .4byte 0x00003008 -_08029F04: .4byte 0x00003014 + .pool _08029F08: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _08029F2C - ldr r4, _08029F48 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r1, _08029F4C + ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] bl Window_WriteStandardTileMap ldr r0, [r4] - ldr r2, _08029F50 + ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] bl Window_WriteStandardTileMap _08029F2C: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _08029F54 + ldr r0, =0x0000020b movs r1, 0x14 movs r2, 0xA bl sub_80A2FBC - ldr r0, _08029F48 + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r0, _08029F58 + ldr r0, =0x00003014 adds r1, r0 b _08029F8E .align 2, 0 -_08029F48: .4byte 0x02022cf8 -_08029F4C: .4byte 0x00003008 -_08029F50: .4byte 0x00003009 -_08029F54: .4byte 0x0000020b -_08029F58: .4byte 0x00003014 + .pool _08029F5C: - ldr r4, _08029F98 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r1, _08029F9C + ldr r1, =0x0000301c adds r2, r0, r1 ldrh r0, [r2] adds r0, 0x1 @@ -86700,7 +84711,7 @@ _08029F5C: lsrs r0, 16 cmp r0, 0x1D bls _08029FF8 - ldr r0, _08029FA0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -86713,7 +84724,7 @@ _08029F5C: _08029F88: ldr r1, [r4] _08029F8A: - ldr r2, _08029FA4 + ldr r2, =0x00003014 adds r1, r2 _08029F8E: ldrb r0, [r1] @@ -86721,17 +84732,14 @@ _08029F8E: strb r0, [r1] b _08029FF8 .align 2, 0 -_08029F98: .4byte 0x02022cf8 -_08029F9C: .4byte 0x0000301c -_08029FA0: .4byte 0x030022c0 -_08029FA4: .4byte 0x00003014 + .pool _08029FA8: - ldr r5, _0802A008 + ldr r5, =0x00003008 adds r0, r1, r5 ldrb r0, [r0] bl Window_FillTileMap ldr r0, [r6] - ldr r4, _0802A00C + ldr r4, =0x00003009 adds r0, r4 ldrb r0, [r0] bl Window_FillTileMap @@ -86770,8 +84778,7 @@ _08029FF8: pop {r0} bx r0 .align 2, 0 -_0802A008: .4byte 0x00003008 -_0802A00C: .4byte 0x00003009 + .pool thumb_func_end sub_802988C thumb_func_start sub_802A010 @@ -86782,9 +84789,9 @@ sub_802A010: @ 802A010 mov r5, r8 push {r5-r7} sub sp, 0x10 - ldr r1, _0802A038 + ldr r1, =0x02022cf8 ldr r2, [r1] - ldr r3, _0802A03C + ldr r3, =0x00003014 adds r0, r2, r3 ldrb r6, [r0] adds r7, r1, 0 @@ -86796,8 +84803,7 @@ sub_802A010: @ 802A010 beq _0802A04E b _0802A2FC .align 2, 0 -_0802A038: .4byte 0x02022cf8 -_0802A03C: .4byte 0x00003014 + .pool _0802A040: cmp r6, 0x2 bne _0802A046 @@ -86809,11 +84815,11 @@ _0802A046: _0802A04C: b _0802A2FC _0802A04E: - ldr r0, _0802A0B4 + ldr r0, =0x082f7bd4 mov r9, r0 bl Window_AddFromTemplate ldr r1, [r7] - ldr r4, _0802A0B8 + ldr r4, =0x00003008 adds r1, r4 strb r0, [r1] movs r1, 0x8 @@ -86822,7 +84828,7 @@ _0802A04E: mov r0, r8 bl Window_AddFromTemplate ldr r1, [r7] - ldr r2, _0802A0BC + ldr r2, =0x00003009 adds r1, r2 strb r0, [r1] ldr r0, [r7] @@ -86830,7 +84836,7 @@ _0802A04E: ldrb r0, [r0] bl Window_FillTileMap ldr r0, [r7] - ldr r3, _0802A0BC + ldr r3, =0x00003009 adds r0, r3 ldrb r0, [r0] bl Window_FillTileMap @@ -86839,36 +84845,31 @@ _0802A04E: mov r0, r8 bl sub_8029074 ldr r1, [r7] - ldr r0, _0802A0C0 + ldr r0, =0x00003014 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] ldr r0, [r7] - ldr r1, _0802A0C4 + ldr r1, =0x00003020 adds r0, r1 strb r6, [r0] ldr r0, [r7] - ldr r2, _0802A0C8 + ldr r2, =0x00003024 adds r0, r2 strb r6, [r0] b _0802A35E .align 2, 0 -_0802A0B4: .4byte 0x082f7bd4 -_0802A0B8: .4byte 0x00003008 -_0802A0BC: .4byte 0x00003009 -_0802A0C0: .4byte 0x00003014 -_0802A0C4: .4byte 0x00003020 -_0802A0C8: .4byte 0x00003024 + .pool _0802A0CC: - ldr r3, _0802A178 + ldr r3, =0x00003008 mov r8, r3 adds r0, r2, r3 ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels ldr r0, [r7] - ldr r1, _0802A17C + ldr r1, =0x00003009 mov r10, r1 add r0, r10 ldrb r0, [r0] @@ -86877,7 +84878,7 @@ _0802A0CC: ldr r0, [r7] add r0, r8 ldrb r0, [r0] - ldr r2, _0802A180 + ldr r2, =0x085ede18 movs r1, 0x5 str r1, [sp] movs r3, 0xFF @@ -86891,7 +84892,7 @@ _0802A0CC: ldr r0, [r7] add r0, r10 ldrb r0, [r0] - ldr r2, _0802A184 + ldr r2, =0x085eae62 str r6, [sp] mov r3, r9 str r3, [sp, 0x4] @@ -86903,7 +84904,7 @@ _0802A0CC: ldr r0, [r7] add r0, r10 ldrb r0, [r0] - ldr r2, _0802A188 + ldr r2, =0x085eae66 movs r1, 0x11 str r1, [sp] mov r3, r9 @@ -86916,7 +84917,7 @@ _0802A0CC: ldr r0, [r7] add r0, r10 ldrb r0, [r0] - ldr r2, _0802A18C + ldr r2, =0x085e8d60 str r6, [sp] mov r3, r9 str r3, [sp, 0x4] @@ -86936,29 +84937,23 @@ _0802A0CC: movs r1, 0x2 bl Window_CopyToVram ldr r1, [r7] - ldr r2, _0802A190 + ldr r2, =0x00003014 adds r1, r2 b _0802A2EA .align 2, 0 -_0802A178: .4byte 0x00003008 -_0802A17C: .4byte 0x00003009 -_0802A180: .4byte 0x085ede18 -_0802A184: .4byte 0x085eae62 -_0802A188: .4byte 0x085eae66 -_0802A18C: .4byte 0x085e8d60 -_0802A190: .4byte 0x00003014 + .pool _0802A194: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _0802A1B6 ldr r0, [r7] - ldr r3, _0802A1C4 + ldr r3, =0x00003008 adds r0, r3 ldrb r0, [r0] bl Window_WriteStandardTileMap ldr r0, [r7] - ldr r1, _0802A1C8 + ldr r1, =0x00003009 adds r0, r1 ldrb r0, [r0] bl Window_WriteStandardTileMap @@ -86966,22 +84961,20 @@ _0802A1B6: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram ldr r1, [r7] - ldr r2, _0802A1CC + ldr r2, =0x00003014 adds r1, r2 b _0802A2EA .align 2, 0 -_0802A1C4: .4byte 0x00003008 -_0802A1C8: .4byte 0x00003009 -_0802A1CC: .4byte 0x00003014 + .pool _0802A1D0: - ldr r3, _0802A27C + ldr r3, =0x00003020 adds r0, r2, r3 ldrb r5, [r0] cmp r5, 0 bne _0802A1DC movs r5, 0x1 _0802A1DC: - ldr r0, _0802A280 + ldr r0, =0x00003009 mov r8, r0 adds r0, r2, r0 ldrb r0, [r0] @@ -86990,7 +84983,7 @@ _0802A1DC: ldr r0, [r7] add r0, r8 ldrb r0, [r0] - ldr r2, _0802A284 + ldr r2, =0x085eae62 movs r1, 0x1 str r1, [sp] movs r3, 0xFF @@ -87005,7 +84998,7 @@ _0802A1DC: ldr r0, [r7] add r0, r8 ldrb r0, [r0] - ldr r2, _0802A288 + ldr r2, =0x085eae66 movs r1, 0x11 str r1, [sp] mov r3, r10 @@ -87018,7 +85011,7 @@ _0802A1DC: ldr r0, [r7] add r0, r8 ldrb r0, [r0] - ldr r2, _0802A28C + ldr r2, =0x085e8d60 subs r1, r5, 0x1 lsls r1, 4 adds r1, 0x1 @@ -87037,7 +85030,7 @@ _0802A1DC: ldrb r0, [r0] movs r1, 0x3 bl Window_CopyToVram - ldr r0, _0802A290 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r5, 0x1 movs r2, 0x1 @@ -87047,7 +85040,7 @@ _0802A1DC: movs r0, 0x5 bl audio_play ldr r0, [r7] - ldr r3, _0802A27C + ldr r3, =0x00003020 adds r1, r0, r3 ldrb r0, [r1] cmp r0, 0 @@ -87055,12 +85048,7 @@ _0802A1DC: strb r5, [r1] b _0802A2E4 .align 2, 0 -_0802A27C: .4byte 0x00003020 -_0802A280: .4byte 0x00003009 -_0802A284: .4byte 0x085eae62 -_0802A288: .4byte 0x085eae66 -_0802A28C: .4byte 0x085e8d60 -_0802A290: .4byte 0x030022c0 + .pool _0802A294: movs r0, 0xC0 ands r0, r1 @@ -87069,7 +85057,7 @@ _0802A294: movs r0, 0x5 bl audio_play ldr r0, [r7] - ldr r2, _0802A2B8 + ldr r2, =0x00003020 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x1 @@ -87080,7 +85068,7 @@ _0802A294: beq _0802A2C2 b _0802A35E .align 2, 0 -_0802A2B8: .4byte 0x00003020 + .pool _0802A2BC: cmp r0, 0x2 beq _0802A2C8 @@ -87100,13 +85088,13 @@ _0802A2CC: movs r0, 0x5 bl audio_play ldr r0, [r7] - ldr r3, _0802A2F4 + ldr r3, =0x00003020 adds r0, r3 movs r1, 0x2 strb r1, [r0] _0802A2E4: ldr r1, [r7] - ldr r0, _0802A2F8 + ldr r0, =0x00003014 adds r1, r0 _0802A2EA: ldrb r0, [r1] @@ -87114,23 +85102,22 @@ _0802A2EA: strb r0, [r1] b _0802A35E .align 2, 0 -_0802A2F4: .4byte 0x00003020 -_0802A2F8: .4byte 0x00003014 + .pool _0802A2FC: ldr r0, [r7] - ldr r2, _0802A370 + ldr r2, =0x00003020 adds r1, r0, r2 ldrb r1, [r1] - ldr r3, _0802A374 + ldr r3, =0x00003024 adds r0, r3 strb r1, [r0] ldr r0, [r7] - ldr r6, _0802A378 + ldr r6, =0x00003008 adds r0, r6 ldrb r0, [r0] bl Window_FillTileMap ldr r0, [r7] - ldr r1, _0802A37C + ldr r1, =0x00003009 adds r0, r1 ldrb r0, [r0] bl Window_FillTileMap @@ -87139,7 +85126,7 @@ _0802A2FC: ldrb r0, [r0] bl Window_Remove ldr r0, [r7] - ldr r2, _0802A37C + ldr r2, =0x00003009 adds r0, r2 ldrb r0, [r0] bl Window_Remove @@ -87170,19 +85157,16 @@ _0802A35E: pop {r0} bx r0 .align 2, 0 -_0802A370: .4byte 0x00003020 -_0802A374: .4byte 0x00003024 -_0802A378: .4byte 0x00003008 -_0802A37C: .4byte 0x00003009 + .pool thumb_func_end sub_802A010 thumb_func_start sub_802A380 sub_802A380: @ 802A380 push {r4-r6,lr} sub sp, 0x10 - ldr r5, _0802A39C + ldr r5, =0x02022cf8 ldr r0, [r5] - ldr r6, _0802A3A0 + ldr r6, =0x00003014 adds r0, r6 ldrb r4, [r0] cmp r4, 0x1 @@ -87193,8 +85177,7 @@ sub_802A380: @ 802A380 beq _0802A3AE b _0802A420 .align 2, 0 -_0802A39C: .4byte 0x02022cf8 -_0802A3A0: .4byte 0x00003014 + .pool _0802A3A4: cmp r4, 0x2 beq _0802A3EC @@ -87205,7 +85188,7 @@ _0802A3AE: movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, _0802A3D4 + ldr r2, =0x082c8959 str r4, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -87219,30 +85202,30 @@ _0802A3AE: bl text_box_related_one b _0802A410 .align 2, 0 -_0802A3D4: .4byte 0x082c8959 + .pool _0802A3D8: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram ldr r1, [r5] - ldr r0, _0802A3E8 + ldr r0, =0x00003014 adds r1, r0 b _0802A414 .align 2, 0 -_0802A3E8: .4byte 0x00003014 + .pool _0802A3EC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _0802A448 - ldr r0, _0802A400 + ldr r0, =sub_8153688 + 1 movs r1, 0 bl AddTask b _0802A410 .align 2, 0 -_0802A400: .4byte sub_8153688 + 1 + .pool _0802A404: - ldr r0, _0802A41C + ldr r0, =sub_8153688 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -87256,7 +85239,7 @@ _0802A414: strb r0, [r1] b _0802A448 .align 2, 0 -_0802A41C: .4byte sub_8153688 + 1 + .pool _0802A420: movs r0, 0x1E str r0, [sp] @@ -87269,7 +85252,7 @@ _0802A420: bl bg_fill_tilemap_rect movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _0802A450 + ldr r0, =0x02022cf8 ldr r0, [r0] movs r1, 0xC0 lsls r1, 6 @@ -87282,16 +85265,16 @@ _0802A448: pop {r0} bx r0 .align 2, 0 -_0802A450: .4byte 0x02022cf8 + .pool thumb_func_end sub_802A380 thumb_func_start sub_802A454 sub_802A454: @ 802A454 push {r4-r6,lr} sub sp, 0xC - ldr r1, _0802A474 + ldr r1, =0x02022cf8 ldr r2, [r1] - ldr r6, _0802A478 + ldr r6, =0x00003014 adds r0, r2, r6 ldrb r0, [r0] adds r5, r1, 0 @@ -87303,18 +85286,17 @@ sub_802A454: @ 802A454 beq _0802A482 b _0802A520 .align 2, 0 -_0802A474: .4byte 0x02022cf8 -_0802A478: .4byte 0x00003014 + .pool _0802A47C: cmp r0, 0x2 beq _0802A4F4 b _0802A520 _0802A482: - ldr r4, _0802A4A4 + ldr r4, =0x082f7bec adds r0, r4, 0 bl Window_AddFromTemplate ldr r1, [r5] - ldr r2, _0802A4A8 + ldr r2, =0x00003008 adds r1, r2 strb r0, [r1] ldr r0, [r5] @@ -87325,10 +85307,9 @@ _0802A482: bl sub_8029174 b _0802A510 .align 2, 0 -_0802A4A4: .4byte 0x082f7bec -_0802A4A8: .4byte 0x00003008 + .pool _0802A4AC: - ldr r4, _0802A4E8 + ldr r4, =0x00003008 adds r0, r2, r4 ldrb r0, [r0] movs r1, 0x11 @@ -87336,7 +85317,7 @@ _0802A4AC: ldr r0, [r5] adds r0, r4 ldrb r0, [r0] - ldr r2, _0802A4EC + ldr r2, =0x085ede65 movs r1, 0x5 str r1, [sp] movs r1, 0xFF @@ -87352,20 +85333,18 @@ _0802A4AC: movs r1, 0x2 bl Window_CopyToVram ldr r1, [r5] - ldr r0, _0802A4F0 + ldr r0, =0x00003014 adds r1, r0 b _0802A514 .align 2, 0 -_0802A4E8: .4byte 0x00003008 -_0802A4EC: .4byte 0x085ede65 -_0802A4F0: .4byte 0x00003014 + .pool _0802A4F4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _0802A50A ldr r0, [r5] - ldr r1, _0802A51C + ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] bl Window_WriteStandardTileMap @@ -87381,7 +85360,7 @@ _0802A514: strb r0, [r1] b _0802A52C .align 2, 0 -_0802A51C: .4byte 0x00003008 + .pool _0802A520: ldr r0, [r5] movs r1, 0xC0 @@ -87400,9 +85379,9 @@ _0802A52C: sub_802A534: @ 802A534 push {r4,r5,lr} sub sp, 0x8 - ldr r5, _0802A580 + ldr r5, =0x02022cf8 ldr r0, [r5] - ldr r4, _0802A584 + ldr r4, =0x00003008 adds r0, r4 ldrb r0, [r0] bl Window_FillTileMap @@ -87432,17 +85411,16 @@ sub_802A534: @ 802A534 pop {r0} bx r0 .align 2, 0 -_0802A580: .4byte 0x02022cf8 -_0802A584: .4byte 0x00003008 + .pool thumb_func_end sub_802A534 thumb_func_start sub_802A588 sub_802A588: @ 802A588 push {r4-r7,lr} sub sp, 0xC - ldr r0, _0802A5A8 + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r7, _0802A5AC + ldr r7, =0x00003014 adds r2, r1, r7 ldrb r5, [r2] adds r6, r0, 0 @@ -87454,8 +85432,7 @@ sub_802A588: @ 802A588 beq _0802A5BA b _0802A6A4 .align 2, 0 -_0802A5A8: .4byte 0x02022cf8 -_0802A5AC: .4byte 0x00003014 + .pool _0802A5B0: cmp r5, 0x2 beq _0802A658 @@ -87463,11 +85440,11 @@ _0802A5B0: beq _0802A684 b _0802A6A4 _0802A5BA: - ldr r4, _0802A600 + ldr r4, =0x082f7be4 adds r0, r4, 0 bl Window_AddFromTemplate ldr r1, [r6] - ldr r2, _0802A604 + ldr r2, =0x00003008 adds r1, r2 strb r0, [r1] ldr r0, [r6] @@ -87482,11 +85459,11 @@ _0802A5BA: adds r0, 0x1 strb r0, [r1] ldr r0, [r6] - ldr r2, _0802A608 + ldr r2, =0x0000301c adds r1, r0, r2 movs r2, 0 strh r5, [r1] - ldr r1, _0802A60C + ldr r1, =0x00003020 adds r0, r1 strb r2, [r0] ldr r0, [r6] @@ -87495,12 +85472,9 @@ _0802A5BA: strb r2, [r0] b _0802A6EA .align 2, 0 -_0802A600: .4byte 0x082f7be4 -_0802A604: .4byte 0x00003008 -_0802A608: .4byte 0x0000301c -_0802A60C: .4byte 0x00003020 + .pool _0802A610: - ldr r4, _0802A64C + ldr r4, =0x00003008 adds r0, r1, r4 ldrb r0, [r0] movs r1, 0x11 @@ -87508,7 +85482,7 @@ _0802A610: ldr r0, [r6] adds r0, r4 ldrb r0, [r0] - ldr r2, _0802A650 + ldr r2, =0x085ede2c movs r1, 0x5 str r1, [sp] movs r1, 0xFF @@ -87524,20 +85498,18 @@ _0802A610: movs r1, 0x2 bl Window_CopyToVram ldr r1, [r6] - ldr r2, _0802A654 + ldr r2, =0x00003014 adds r1, r2 b _0802A678 .align 2, 0 -_0802A64C: .4byte 0x00003008 -_0802A650: .4byte 0x085ede2c -_0802A654: .4byte 0x00003014 + .pool _0802A658: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _0802A66E ldr r0, [r6] - ldr r1, _0802A680 + ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] bl Window_WriteStandardTileMap @@ -87552,9 +85524,9 @@ _0802A678: strb r0, [r1] b _0802A6EA .align 2, 0 -_0802A680: .4byte 0x00003008 + .pool _0802A684: - ldr r0, _0802A6A0 + ldr r0, =0x0000301c adds r1, r0 ldrh r0, [r1] adds r0, 0x1 @@ -87568,15 +85540,15 @@ _0802A684: strb r0, [r2] b _0802A6EA .align 2, 0 -_0802A6A0: .4byte 0x0000301c + .pool _0802A6A4: ldr r0, [r6] - ldr r1, _0802A6F4 + ldr r1, =0x00003024 adds r0, r1 movs r1, 0x5 strb r1, [r0] ldr r0, [r6] - ldr r4, _0802A6F8 + ldr r4, =0x00003008 adds r0, r4 ldrb r0, [r0] bl Window_FillTileMap @@ -87607,16 +85579,15 @@ _0802A6EA: pop {r0} bx r0 .align 2, 0 -_0802A6F4: .4byte 0x00003024 -_0802A6F8: .4byte 0x00003008 + .pool thumb_func_end sub_802A588 thumb_func_start unused_0 unused_0: @ 802A6FC push {r4,lr} - ldr r4, _0802A720 + ldr r4, =0x02022cf8 ldr r0, [r4] - ldr r1, _0802A724 + ldr r1, =0x00003004 adds r0, r1 ldrb r0, [r0] bl remove_task @@ -87630,8 +85601,7 @@ unused_0: @ 802A6FC pop {r0} bx r0 .align 2, 0 -_0802A720: .4byte 0x02022cf8 -_0802A724: .4byte 0x00003004 + .pool thumb_func_end unused_0 thumb_func_start nullsub_16 @@ -87642,9 +85612,9 @@ nullsub_16: @ 802A728 thumb_func_start sub_802A72C sub_802A72C: @ 802A72C push {r4,lr} - ldr r2, _0802A750 + ldr r2, =0x02022cf8 ldr r1, [r2] - ldr r3, _0802A754 + ldr r3, =0x00003014 adds r1, r3 movs r3, 0 strb r3, [r1] @@ -87653,35 +85623,32 @@ sub_802A72C: @ 802A72C lsls r4, 6 adds r2, r1, r4 str r3, [r2] - ldr r2, _0802A758 + ldr r2, =0x00003028 adds r1, r2 str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_0802A750: .4byte 0x02022cf8 -_0802A754: .4byte 0x00003014 -_0802A758: .4byte 0x00003028 + .pool thumb_func_end sub_802A72C thumb_func_start sub_802A75C sub_802A75C: @ 802A75C - ldr r0, _0802A768 + ldr r0, =0x02022cf8 ldr r0, [r0] - ldr r1, _0802A76C + ldr r1, =0x00003028 adds r0, r1 ldr r0, [r0] bx lr .align 2, 0 -_0802A768: .4byte 0x02022cf8 -_0802A76C: .4byte 0x00003028 + .pool thumb_func_end sub_802A75C thumb_func_start sub_802A770 sub_802A770: @ 802A770 push {lr} - ldr r0, _0802A788 + ldr r0, =0x02022cf8 ldr r0, [r0] movs r1, 0xC0 lsls r1, 6 @@ -87692,7 +85659,7 @@ sub_802A770: @ 802A770 movs r0, 0x1 b _0802A78E .align 2, 0 -_0802A788: .4byte 0x02022cf8 + .pool _0802A78C: movs r0, 0 _0802A78E: @@ -87702,15 +85669,14 @@ _0802A78E: thumb_func_start sub_802A794 sub_802A794: @ 802A794 - ldr r0, _0802A7A0 + ldr r0, =0x02022cf8 ldr r0, [r0] - ldr r1, _0802A7A4 + ldr r1, =0x00003024 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_0802A7A0: .4byte 0x02022cf8 -_0802A7A4: .4byte 0x00003024 + .pool thumb_func_end sub_802A794 thumb_func_start sub_802A7A8 @@ -87727,10 +85693,10 @@ sub_802A7A8: @ 802A7A8 mov r8, r0 mov r2, sp movs r6, 0 - ldr r1, _0802A8D8 + ldr r1, =0x040000d4 movs r5, 0x80 lsls r5, 5 - ldr r7, _0802A8DC + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -87760,7 +85726,7 @@ _0802A7CE: lsls r3, 3 movs r4, 0 str r4, [sp, 0x4] - ldr r2, _0802A8D8 + ldr r2, =0x040000d4 mov r1, r8 str r1, [r2] str r0, [r2, 0x4] @@ -87787,7 +85753,7 @@ _0802A7CE: bl lcd_io_set movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0802A8E0 + ldr r1, =0x082f7ba4 movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -87829,7 +85795,7 @@ _0802A7CE: lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r4, _0802A8E4 + ldr r4, =0x02022cf8 ldr r1, [r4] movs r0, 0x3 bl bg_set_tilemap @@ -87852,32 +85818,27 @@ _0802A7CE: pop {r0} bx r0 .align 2, 0 -_0802A8D8: .4byte 0x040000d4 -_0802A8DC: .4byte 0x81000800 -_0802A8E0: .4byte 0x082f7ba4 -_0802A8E4: .4byte 0x02022cf8 + .pool thumb_func_end sub_802A7A8 thumb_func_start sub_802A8E8 sub_802A8E8: @ 802A8E8 push {lr} sub sp, 0x4 - ldr r0, _0802A904 + ldr r0, =0x02022cf8 ldr r0, [r0] - ldr r2, _0802A908 + ldr r2, =0x00003018 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x5 bhi _0802A982 lsls r0, 2 - ldr r1, _0802A90C + ldr r1, =_0802A910 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802A904: .4byte 0x02022cf8 -_0802A908: .4byte 0x00003018 -_0802A90C: .4byte _0802A910 + .pool .align 2, 0 _0802A910: .4byte _0802A928 @@ -87887,26 +85848,26 @@ _0802A910: .4byte _0802A964 .4byte _0802A972 _0802A928: - ldr r0, _0802A934 + ldr r0, =0x082f7df0 movs r1, 0 movs r2, 0x40 bl gpu_pal_apply b _0802A98A .align 2, 0 -_0802A934: .4byte 0x082f7df0 + .pool _0802A938: bl reset_temp_tile_data_buffers b _0802A98A _0802A93E: - ldr r1, _0802A948 + ldr r1, =0x082f8084 movs r0, 0 str r0, [sp] movs r0, 0x3 b _0802A954 .align 2, 0 -_0802A948: .4byte 0x082f8084 + .pool _0802A94C: - ldr r1, _0802A960 + ldr r1, =0x082f8914 movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -87916,7 +85877,7 @@ _0802A954: bl decompress_and_copy_tile_data_to_vram b _0802A98A .align 2, 0 -_0802A960: .4byte 0x082f8914 + .pool _0802A964: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -87937,9 +85898,9 @@ _0802A982: movs r0, 0x1 b _0802A99A _0802A98A: - ldr r0, _0802A9A0 + ldr r0, =0x02022cf8 ldr r1, [r0] - ldr r0, _0802A9A4 + ldr r0, =0x00003018 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 @@ -87951,8 +85912,7 @@ _0802A99A: pop {r1} bx r1 .align 2, 0 -_0802A9A0: .4byte 0x02022cf8 -_0802A9A4: .4byte 0x00003018 + .pool thumb_func_end sub_802A8E8 thumb_func_start sub_802A9A8 @@ -87961,18 +85921,18 @@ sub_802A9A8: @ 802A9A8 adds r6, r1, 0 lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _0802AA20 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0802AA3C - ldr r5, _0802AA24 - ldr r0, _0802AA28 + ldr r5, =0x02022cfc + ldr r0, =0x000083b0 bl malloc str r0, [r5] cmp r0, 0 beq _0802AA3C bl clear_tasks - ldr r0, _0802AA2C + ldr r0, =sub_802ACA0 + 1 movs r1, 0x1 bl AddTask adds r4, r0, 0 @@ -87991,12 +85951,12 @@ sub_802A9A8: @ 802A9A8 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 - ldr r2, _0802AA30 + ldr r2, =0x000082a8 adds r1, r2 adds r0, r1 movs r1, 0x64 muls r1, r7 - ldr r2, _0802AA34 + ldr r2, =0x020244ec adds r1, r2 bl sub_802AC2C ldr r0, [r5] @@ -88005,17 +85965,11 @@ sub_802A9A8: @ 802A9A8 adds r0, r4, 0 movs r1, 0x2 bl set_word_task_arg - ldr r0, _0802AA38 + ldr r0, =sub_802AC6C + 1 bl set_callback2 b _0802AA42 .align 2, 0 -_0802AA20: .4byte 0x03003124 -_0802AA24: .4byte 0x02022cfc -_0802AA28: .4byte 0x000083b0 -_0802AA2C: .4byte sub_802ACA0 + 1 -_0802AA30: .4byte 0x000082a8 -_0802AA34: .4byte 0x020244ec -_0802AA38: .4byte sub_802AC6C + 1 + .pool _0802AA3C: adds r0, r6, 0 bl set_callback2 @@ -88029,13 +85983,13 @@ _0802AA42: sub_802AA48: @ 802AA48 push {lr} bl sub_802D0AC - ldr r0, _0802AA5C + ldr r0, =0x02022cfc ldr r0, [r0] bl free pop {r0} bx r0 .align 2, 0 -_0802AA5C: .4byte 0x02022cfc + .pool thumb_func_end sub_802AA48 thumb_func_start sub_802AA60 @@ -88143,16 +86097,16 @@ sub_802AB20: @ 802AB20 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _0802AB80 + ldr r7, =0x02022cfc movs r6, 0 movs r5, 0 - ldr r0, _0802AB84 + ldr r0, =0x082fb464 mov r8, r0 movs r4, 0x4 _0802AB32: ldr r0, [r7] adds r0, r5 - ldr r1, _0802AB88 + ldr r1, =0x000082a8 adds r0, r1 ldrh r0, [r0] bl sub_802AC00 @@ -88162,7 +86116,7 @@ _0802AB32: asrs r0, 14 add r0, r8 ldrh r0, [r0, 0x2] - ldr r2, _0802AB8C + ldr r2, =0x000082f0 adds r1, r2 strh r0, [r1] adds r6, 0x28 @@ -88170,15 +86124,15 @@ _0802AB32: subs r4, 0x1 cmp r4, 0 bge _0802AB32 - ldr r0, _0802AB80 + ldr r0, =0x02022cfc ldr r1, [r0] - ldr r0, _0802AB90 + ldr r0, =0x000083ac adds r3, r1, r0 ldrb r2, [r1, 0x6] lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r2, _0802AB94 + ldr r2, =0x000082e4 adds r0, r2 adds r1, r0 str r1, [r3] @@ -88188,43 +86142,38 @@ _0802AB32: pop {r0} bx r0 .align 2, 0 -_0802AB80: .4byte 0x02022cfc -_0802AB84: .4byte 0x082fb464 -_0802AB88: .4byte 0x000082a8 -_0802AB8C: .4byte 0x000082f0 -_0802AB90: .4byte 0x000083ac -_0802AB94: .4byte 0x000082e4 + .pool thumb_func_end sub_802AB20 thumb_func_start sub_802AB98 sub_802AB98: @ 802AB98 push {r4-r7,lr} movs r5, 0 - ldr r6, _0802ABE8 + ldr r6, =0x02022cfc movs r4, 0 movs r3, 0 _0802ABA2: ldr r2, [r6] adds r1, r2, r3 - ldr r7, _0802ABEC + ldr r7, =0x000082f2 adds r0, r1, r7 strh r4, [r0] adds r7, 0x2 adds r0, r1, r7 strh r4, [r0] - ldr r0, _0802ABF0 + ldr r0, =0x000082f6 adds r1, r0 strh r4, [r1] - ldr r1, _0802ABF4 + ldr r1, =0x000082e4 adds r0, r2, r1 adds r0, r3 str r4, [r0] subs r7, 0xC adds r0, r2, r7 adds r0, r3 - ldr r1, _0802ABF8 + ldr r1, =0x7fffffff str r1, [r0] - ldr r1, _0802ABFC + ldr r1, =0x000082f8 adds r0, r2, r1 adds r0, r3 str r4, [r0] @@ -88240,12 +86189,7 @@ _0802ABA2: pop {r0} bx r0 .align 2, 0 -_0802ABE8: .4byte 0x02022cfc -_0802ABEC: .4byte 0x000082f2 -_0802ABF0: .4byte 0x000082f6 -_0802ABF4: .4byte 0x000082e4 -_0802ABF8: .4byte 0x7fffffff -_0802ABFC: .4byte 0x000082f8 + .pool thumb_func_end sub_802AB98 thumb_func_start sub_802AC00 @@ -88254,7 +86198,7 @@ sub_802AC00: @ 802AC00 lsls r0, 16 lsrs r3, r0, 16 movs r1, 0 - ldr r2, _0802AC18 + ldr r2, =0x082fb464 _0802AC0A: ldrh r0, [r2] cmp r0, r3 @@ -88263,7 +86207,7 @@ _0802AC0A: asrs r0, 16 b _0802AC28 .align 2, 0 -_0802AC18: .4byte 0x082fb464 + .pool _0802AC1C: adds r2, 0x4 adds r1, 0x1 @@ -88324,7 +86268,7 @@ sub_802AC84: @ 802AC84 push {lr} movs r1, 0x1 bl AddTask - ldr r2, _0802AC9C + ldr r2, =0x02022cfc ldr r1, [r2] movs r3, 0 strb r0, [r1, 0x4] @@ -88333,7 +86277,7 @@ sub_802AC84: @ 802AC84 pop {r0} bx r0 .align 2, 0 -_0802AC9C: .4byte 0x02022cfc + .pool thumb_func_end sub_802AC84 thumb_func_start sub_802ACA0 @@ -88342,7 +86286,7 @@ sub_802ACA0: @ 802ACA0 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0802ACC0 + ldr r1, =0x02022cfc ldr r0, [r1] ldrh r0, [r0, 0x8] adds r2, r1, 0 @@ -88351,13 +86295,12 @@ sub_802ACA0: @ 802ACA0 b _0802AE08 _0802ACB6: lsls r0, 2 - ldr r1, _0802ACC4 + ldr r1, =_0802ACC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802ACC0: .4byte 0x02022cfc -_0802ACC4: .4byte _0802ACC8 + .pool .align 2, 0 _0802ACC8: .4byte _0802ACE0 @@ -88371,24 +86314,23 @@ _0802ACE0: bl SetVBlankCallback bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, _0802AD04 + ldr r0, =sub_802BD84 + 1 movs r1, 0x5 bl sub_802BE60 movs r0, 0x4 bl sub_80A2F50 - ldr r0, _0802AD08 + ldr r0, =0x02022cfc ldr r1, [r0] b _0802ADC0 .align 2, 0 -_0802AD04: .4byte sub_802BD84 + 1 -_0802AD08: .4byte 0x02022cfc + .pool _0802AD0C: - ldr r0, _0802AD34 + ldr r0, =sub_802BD84 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 bne _0802AE08 - ldr r4, _0802AD38 + ldr r4, =0x02022cfc ldr r0, [r4] adds r0, 0xA4 bl sub_802D074 @@ -88399,8 +86341,7 @@ _0802AD0C: ldr r1, [r4] b _0802ADC0 .align 2, 0 -_0802AD34: .4byte sub_802BD84 + 1 -_0802AD38: .4byte 0x02022cfc + .pool _0802AD3C: bl sub_802D0F0 cmp r0, 0 @@ -88410,15 +86351,14 @@ _0802AD3C: lsrs r0, 24 cmp r0, 0x1 bne _0802AE08 - ldr r0, _0802AD60 + ldr r0, =0x0000021a movs r1, 0x8 bl sub_80A2F88 - ldr r0, _0802AD64 + ldr r0, =0x02022cfc ldr r1, [r0] b _0802ADC0 .align 2, 0 -_0802AD60: .4byte 0x0000021a -_0802AD64: .4byte 0x02022cfc + .pool _0802AD68: bl sub_800A520 lsls r0, 24 @@ -88437,17 +86377,16 @@ _0802AD68: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _0802AD9C + ldr r0, =sub_802AC58 + 1 bl SetVBlankCallback - ldr r0, _0802ADA0 + ldr r0, =0x02022cfc ldr r1, [r0] b _0802ADC0 .align 2, 0 -_0802AD9C: .4byte sub_802AC58 + 1 -_0802ADA0: .4byte 0x02022cfc + .pool _0802ADA4: bl fade_and_return_progress_probably - ldr r0, _0802ADC8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -88455,7 +86394,7 @@ _0802ADA4: lsrs r2, r0, 24 cmp r2, 0 bne _0802AE08 - ldr r1, _0802ADCC + ldr r1, =0x02022cfc ldr r0, [r1] strb r2, [r0, 0x7] ldr r1, [r1] @@ -88465,8 +86404,7 @@ _0802ADC0: strh r0, [r1, 0x8] b _0802AE08 .align 2, 0 -_0802ADC8: .4byte 0x02037fd4 -_0802ADCC: .4byte 0x02022cfc + .pool _0802ADD0: ldr r0, [r2] ldrb r1, [r0, 0x7] @@ -88481,13 +86419,13 @@ _0802ADD0: ldrb r0, [r0] cmp r0, 0 beq _0802ADF8 - ldr r0, _0802ADF4 + ldr r0, =sub_802AF80 + 1 bl sub_802AC84 b _0802ADFE .align 2, 0 -_0802ADF4: .4byte sub_802AF80 + 1 + .pool _0802ADF8: - ldr r0, _0802AE10 + ldr r0, =sub_802B194 + 1 bl sub_802AC84 _0802ADFE: bl sub_802BE80 @@ -88499,7 +86437,7 @@ _0802AE08: pop {r0} bx r0 .align 2, 0 -_0802AE10: .4byte sub_802B194 + 1 + .pool thumb_func_end sub_802ACA0 thumb_func_start sub_802AE14 @@ -88508,18 +86446,17 @@ sub_802AE14: @ 802AE14 adds r1, r0, 0 cmp r1, 0 bne _0802AE34 - ldr r0, _0802AE2C + ldr r0, =0x02022cfc ldr r1, [r0] - ldr r0, _0802AE30 + ldr r0, =0x00001111 str r0, [r1, 0x30] movs r0, 0x1 str r0, [r1, 0x2C] b _0802AE46 .align 2, 0 -_0802AE2C: .4byte 0x02022cfc -_0802AE30: .4byte 0x00001111 + .pool _0802AE34: - ldr r0, _0802AE4C + ldr r0, =0x02022cfc ldr r2, [r0] subs r1, 0x1 movs r0, 0x1 @@ -88532,13 +86469,13 @@ _0802AE46: pop {r0} bx r0 .align 2, 0 -_0802AE4C: .4byte 0x02022cfc + .pool thumb_func_end sub_802AE14 thumb_func_start sub_802AE50 sub_802AE50: @ 802AE50 push {r4-r6,lr} - ldr r4, _0802AE9C + ldr r4, =0x02022cfc ldr r1, [r4] adds r1, 0x70 movs r2, 0 @@ -88559,7 +86496,7 @@ sub_802AE50: @ 802AE50 cmp r3, r0 bge _0802AE94 adds r6, r4, 0 - ldr r5, _0802AEA0 + ldr r5, =0x000082fc movs r4, 0 movs r2, 0x28 _0802AE82: @@ -88577,8 +86514,7 @@ _0802AE94: pop {r0} bx r0 .align 2, 0 -_0802AE9C: .4byte 0x02022cfc -_0802AEA0: .4byte 0x000082fc + .pool thumb_func_end sub_802AE50 thumb_func_start sub_802AEA4 @@ -88592,7 +86528,7 @@ sub_802AEA4: @ 802AEA4 movs r4, 0x1 movs r0, 0 str r0, [sp, 0x4] - ldr r7, _0802AF6C + ldr r7, =0x02022cfc ldr r0, [r7] ldrb r0, [r0, 0x5] cmp r4, r0 @@ -88602,14 +86538,14 @@ sub_802AEA4: @ 802AEA4 movs r2, 0x2 add r2, sp mov r8, r2 - ldr r3, _0802AF70 + ldr r3, =0x0000830c mov r9, r3 movs r6, 0x28 _0802AED0: mov r1, r10 ldr r0, [r1] adds r1, r0, r6 - ldr r2, _0802AF74 + ldr r2, =0x000082f4 adds r1, r2 ldrh r5, [r1] add r0, r9 @@ -88634,13 +86570,13 @@ _0802AED0: strb r0, [r2] ldr r0, [r7] adds r0, r6 - ldr r1, _0802AF78 + ldr r1, =0x000082f6 adds r0, r1 strh r5, [r0] _0802AF10: mov r2, r10 ldr r1, [r2] - ldr r3, _0802AF7C + ldr r3, =0x000082fc adds r0, r1, r3 adds r0, r6 ldr r0, [r0] @@ -88662,13 +86598,13 @@ _0802AF36: add r9, r1 adds r6, 0x28 adds r4, 0x1 - ldr r7, _0802AF6C + ldr r7, =0x02022cfc ldr r0, [r7] ldrb r0, [r0, 0x5] cmp r4, r0 blt _0802AED0 _0802AF48: - ldr r2, _0802AF6C + ldr r2, =0x02022cfc ldr r1, [r2] ldrb r0, [r1, 0x5] subs r0, 0x1 @@ -88688,11 +86624,7 @@ _0802AF5C: pop {r0} bx r0 .align 2, 0 -_0802AF6C: .4byte 0x02022cfc -_0802AF70: .4byte 0x0000830c -_0802AF74: .4byte 0x000082f4 -_0802AF78: .4byte 0x000082f6 -_0802AF7C: .4byte 0x000082fc + .pool thumb_func_end sub_802AEA4 thumb_func_start sub_802AF80 @@ -88700,7 +86632,7 @@ sub_802AF80: @ 802AF80 push {r4,r5,lr} bl sub_802AEA4 bl sub_802C43C - ldr r0, _0802AFFC + ldr r0, =0x02022cfc ldr r1, [r0] adds r0, r1, 0 adds r0, 0x48 @@ -88719,14 +86651,14 @@ sub_802AF80: @ 802AF80 movs r0, 0x3 bl sub_802AE14 _0802AFB2: - ldr r4, _0802AFFC + ldr r4, =0x02022cfc ldr r2, [r4] adds r0, r2, 0 adds r0, 0x48 ldrb r5, [r0] cmp r5, 0x1 bne _0802AFEE - ldr r1, _0802B000 + ldr r1, =0x082fb5f4 adds r0, 0x28 ldrb r0, [r0] lsls r0, 2 @@ -88744,7 +86676,7 @@ _0802AFB2: lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r2, _0802B004 + ldr r2, =0x000082fc adds r1, r2 adds r1, r0 str r5, [r1] @@ -88755,27 +86687,25 @@ _0802AFEE: pop {r0} bx r0 .align 2, 0 -_0802AFFC: .4byte 0x02022cfc -_0802B000: .4byte 0x082fb5f4 -_0802B004: .4byte 0x000082fc + .pool thumb_func_end sub_802AF80 thumb_func_start sub_802B008 sub_802B008: @ 802B008 push {r4,lr} - ldr r4, _0802B038 + ldr r4, =0x02022cfc ldr r1, [r4] ldr r0, [r1, 0x2C] cmp r0, 0 bne _0802B01E - ldr r2, _0802B03C + ldr r2, =0x000082e4 adds r0, r1, r2 adds r1, 0x70 bl sub_802E138 _0802B01E: ldr r1, [r4] ldr r2, [r1, 0x30] - ldr r0, _0802B040 + ldr r0, =0x00001111 cmp r2, r0 beq _0802B030 ldr r0, [r1, 0x2C] @@ -88787,14 +86717,12 @@ _0802B030: pop {r0} bx r0 .align 2, 0 -_0802B038: .4byte 0x02022cfc -_0802B03C: .4byte 0x000082e4 -_0802B040: .4byte 0x00001111 + .pool thumb_func_end sub_802B008 thumb_func_start sub_802B044 sub_802B044: @ 802B044 - ldr r2, _0802B070 + ldr r2, =0x02022cfc ldr r1, [r2] adds r1, 0x70 movs r3, 0 @@ -88810,14 +86738,13 @@ sub_802B044: @ 802B044 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r2, _0802B074 + ldr r2, =0x000082fc adds r1, r2 adds r1, r0 str r3, [r1] bx lr .align 2, 0 -_0802B070: .4byte 0x02022cfc -_0802B074: .4byte 0x000082fc + .pool thumb_func_end sub_802B044 thumb_func_start sub_802B078 @@ -88826,13 +86753,13 @@ sub_802B078: @ 802B078 mov r7, r8 push {r7} sub sp, 0x10 - ldr r4, _0802B0F4 + ldr r4, =0x02022cfc ldr r0, [r4] - ldr r2, _0802B0F8 + ldr r2, =0x000082f4 adds r1, r0, r2 ldrh r1, [r1] mov r8, r1 - ldr r3, _0802B0FC + ldr r3, =0x000082e4 adds r0, r3 mov r1, sp bl sub_802E1BC @@ -88843,7 +86770,7 @@ sub_802B078: @ 802B078 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r3, _0802B100 + ldr r3, =0x000082fc adds r0, r2, r3 adds r0, r1 ldr r0, [r0] @@ -88860,7 +86787,7 @@ sub_802B078: @ 802B078 ldrb r0, [r0] bl sub_802B044 _0802B0C6: - ldr r3, _0802B0F4 + ldr r3, =0x02022cfc ldr r2, [r3] ldr r0, [r2, 0x78] ldr r1, [sp, 0x8] @@ -88884,15 +86811,12 @@ _0802B0C6: strb r4, [r0] b _0802B108 .align 2, 0 -_0802B0F4: .4byte 0x02022cfc -_0802B0F8: .4byte 0x000082f4 -_0802B0FC: .4byte 0x000082e4 -_0802B100: .4byte 0x000082fc + .pool _0802B104: adds r0, 0x4D strb r1, [r0] _0802B108: - ldr r0, _0802B184 + ldr r0, =0x02022cfc ldr r1, [r0] mov r0, sp ldrh r0, [r0, 0x2] @@ -88904,19 +86828,19 @@ _0802B108: adds r0, r1, 0 adds r0, 0x74 strh r2, [r0] - ldr r0, _0802B188 + ldr r0, =0x000082f6 adds r1, r0 mov r2, r8 strh r2, [r1] _0802B128: movs r4, 0x1 - ldr r2, _0802B184 + ldr r2, =0x02022cfc ldr r0, [r2] ldrb r0, [r0, 0x5] cmp r4, r0 bge _0802B176 adds r7, r2, 0 - ldr r6, _0802B18C + ldr r6, =0x0000830c movs r5, 0x28 _0802B13A: ldr r1, [r7] @@ -88924,7 +86848,7 @@ _0802B13A: cmp r4, r3 beq _0802B168 adds r0, r1, r5 - ldr r3, _0802B190 + ldr r3, =0x000082f4 adds r0, r3 ldrh r0, [r0] mov r8, r0 @@ -88937,7 +86861,7 @@ _0802B13A: beq _0802B168 ldr r0, [r7] adds r0, r5 - ldr r1, _0802B188 + ldr r1, =0x000082f6 adds r0, r1 mov r3, r8 strh r3, [r0] @@ -88957,24 +86881,21 @@ _0802B176: pop {r0} bx r0 .align 2, 0 -_0802B184: .4byte 0x02022cfc -_0802B188: .4byte 0x000082f6 -_0802B18C: .4byte 0x0000830c -_0802B190: .4byte 0x000082f4 + .pool thumb_func_end sub_802B078 thumb_func_start sub_802B194 sub_802B194: @ 802B194 push {r4,lr} bl sub_802B078 - ldr r4, _0802B1F0 + ldr r4, =0x02022cfc ldr r2, [r4] adds r0, r2, 0 adds r0, 0x48 ldrb r0, [r0] cmp r0, 0 beq _0802B1E0 - ldr r1, _0802B1F4 + ldr r1, =0x082fb618 adds r0, r2, 0 adds r0, 0x70 ldrb r0, [r0] @@ -88993,7 +86914,7 @@ sub_802B194: @ 802B194 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r2, _0802B1F8 + ldr r2, =0x000082fc adds r1, r2 adds r1, r0 movs r0, 0x1 @@ -89007,15 +86928,13 @@ _0802B1E0: pop {r0} bx r0 .align 2, 0 -_0802B1F0: .4byte 0x02022cfc -_0802B1F4: .4byte 0x082fb618 -_0802B1F8: .4byte 0x000082fc + .pool thumb_func_end sub_802B194 thumb_func_start sub_802B1FC sub_802B1FC: @ 802B1FC push {r4,lr} - ldr r4, _0802B23C + ldr r4, =0x02022cfc ldr r2, [r4] ldr r0, [r2, 0x2C] cmp r0, 0 @@ -89024,7 +86943,7 @@ sub_802B1FC: @ 802B1FC lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0802B240 + ldr r1, =0x000082e4 adds r0, r1 adds r0, r2, r0 adds r1, r2, 0 @@ -89036,7 +86955,7 @@ sub_802B1FC: @ 802B1FC _0802B224: ldr r1, [r4] ldr r2, [r1, 0x30] - ldr r0, _0802B244 + ldr r0, =0x00001111 cmp r2, r0 beq _0802B236 ldr r0, [r1, 0x2C] @@ -89048,15 +86967,13 @@ _0802B236: pop {r0} bx r0 .align 2, 0 -_0802B23C: .4byte 0x02022cfc -_0802B240: .4byte 0x000082e4 -_0802B244: .4byte 0x00001111 + .pool thumb_func_end sub_802B1FC thumb_func_start sub_802B248 sub_802B248: @ 802B248 push {r4,lr} - ldr r4, _0802B25C + ldr r4, =0x02022cfc ldr r0, [r4] ldrh r0, [r0, 0x8] cmp r0, 0 @@ -89065,7 +86982,7 @@ sub_802B248: @ 802B248 beq _0802B26E b _0802B294 .align 2, 0 -_0802B25C: .4byte 0x02022cfc + .pool _0802B260: movs r0, 0x3 bl sub_802AE14 @@ -89077,7 +86994,7 @@ _0802B26E: bl sub_802B7E0 cmp r0, 0 bne _0802B294 - ldr r0, _0802B290 + ldr r0, =0x02022cfc ldr r1, [r0] adds r0, r1, 0 adds r0, 0x4A @@ -89091,7 +87008,7 @@ _0802B26E: movs r0, 0 b _0802B296 .align 2, 0 -_0802B290: .4byte 0x02022cfc + .pool _0802B294: movs r0, 0x1 _0802B296: @@ -89103,7 +87020,7 @@ _0802B296: thumb_func_start sub_802B29C sub_802B29C: @ 802B29C push {r4,lr} - ldr r4, _0802B2B0 + ldr r4, =0x02022cfc ldr r0, [r4] ldrh r0, [r0, 0x8] cmp r0, 0 @@ -89113,7 +87030,7 @@ sub_802B29C: @ 802B29C movs r0, 0x1 b _0802B2CE .align 2, 0 -_0802B2B0: .4byte 0x02022cfc + .pool _0802B2B4: movs r0, 0 bl sub_802AE14 @@ -89136,7 +87053,7 @@ _0802B2CE: thumb_func_start sub_802B2D4 sub_802B2D4: @ 802B2D4 push {r4,lr} - ldr r4, _0802B2E8 + ldr r4, =0x02022cfc ldr r1, [r4] ldrh r0, [r1, 0x8] cmp r0, 0 @@ -89145,7 +87062,7 @@ sub_802B2D4: @ 802B2D4 beq _0802B300 b _0802B314 .align 2, 0 -_0802B2E8: .4byte 0x02022cfc + .pool _0802B2EC: bl sub_802C0E8 movs r0, 0x5 @@ -89177,7 +87094,7 @@ _0802B316: thumb_func_start sub_802B31C sub_802B31C: @ 802B31C push {r4,lr} - ldr r4, _0802B330 + ldr r4, =0x02022cfc ldr r0, [r4] ldrh r0, [r0, 0x8] cmp r0, 0 @@ -89186,7 +87103,7 @@ sub_802B31C: @ 802B31C beq _0802B352 b _0802B35E .align 2, 0 -_0802B330: .4byte 0x02022cfc + .pool _0802B334: bl sub_802C0E8 movs r0, 0 @@ -89221,7 +87138,7 @@ sub_802B368: @ 802B368 bl sub_802B8CC cmp r0, 0 bne _0802B390 - ldr r0, _0802B38C + ldr r0, =0x02022cfc ldr r1, [r0] adds r0, r1, 0 adds r0, 0x4A @@ -89234,7 +87151,7 @@ sub_802B368: @ 802B368 strb r0, [r1] b _0802B3AA .align 2, 0 -_0802B38C: .4byte 0x02022cfc + .pool _0802B390: bl sub_802C538 cmp r0, 0 @@ -89243,7 +87160,7 @@ _0802B390: b _0802B3AC _0802B39C: bl sub_802C0B8 - ldr r0, _0802B3B0 + ldr r0, =0x02022cfc ldr r0, [r0] adds r0, 0x4C movs r1, 0x3 @@ -89254,7 +87171,7 @@ _0802B3AC: pop {r1} bx r1 .align 2, 0 -_0802B3B0: .4byte 0x02022cfc + .pool thumb_func_end sub_802B368 thumb_func_start sub_802B3B4 @@ -89280,7 +87197,7 @@ _0802B3D0: thumb_func_start sub_802B3D4 sub_802B3D4: @ 802B3D4 push {r4,lr} - ldr r4, _0802B3EC + ldr r4, =0x02022cfc ldr r0, [r4] ldrh r0, [r0, 0x8] cmp r0, 0x1 @@ -89291,7 +87208,7 @@ sub_802B3D4: @ 802B3D4 beq _0802B3F6 b _0802B468 .align 2, 0 -_0802B3EC: .4byte 0x02022cfc + .pool _0802B3F0: cmp r0, 0x2 beq _0802B460 @@ -89344,7 +87261,7 @@ _0802B448: movs r0, 0x4 _0802B454: strb r0, [r1] - ldr r0, _0802B464 + ldr r0, =0x02022cfc ldr r1, [r0] ldrh r0, [r1, 0x8] adds r0, 0x1 @@ -89353,7 +87270,7 @@ _0802B460: movs r0, 0 b _0802B46A .align 2, 0 -_0802B464: .4byte 0x02022cfc + .pool _0802B468: movs r0, 0x1 _0802B46A: @@ -89365,7 +87282,7 @@ _0802B46A: thumb_func_start sub_802B470 sub_802B470: @ 802B470 push {r4,lr} - ldr r4, _0802B488 + ldr r4, =0x02022cfc ldr r0, [r4] ldrh r0, [r0, 0x8] cmp r0, 0x1 @@ -89376,7 +87293,7 @@ sub_802B470: @ 802B470 beq _0802B492 b _0802B4C4 .align 2, 0 -_0802B488: .4byte 0x02022cfc + .pool _0802B48C: cmp r0, 0x2 beq _0802B4C0 @@ -89417,7 +87334,7 @@ _0802B4C6: thumb_func_start sub_802B4CC sub_802B4CC: @ 802B4CC push {r4,lr} - ldr r4, _0802B4E4 + ldr r4, =0x02022cfc ldr r0, [r4] ldrh r1, [r0, 0x8] cmp r1, 0x1 @@ -89428,7 +87345,7 @@ sub_802B4CC: @ 802B4CC beq _0802B4F2 b _0802B560 .align 2, 0 -_0802B4E4: .4byte 0x02022cfc + .pool _0802B4E8: cmp r1, 0x2 beq _0802B52C @@ -89446,7 +87363,7 @@ _0802B500: bl sub_802BB84 cmp r0, 0 bne _0802B560 - ldr r4, _0802B528 + ldr r4, =0x02022cfc ldr r2, [r4] ldr r0, [r2, 0x78] adds r1, r2, 0 @@ -89461,7 +87378,7 @@ _0802B500: strh r0, [r1, 0x8] b _0802B560 .align 2, 0 -_0802B528: .4byte 0x02022cfc + .pool _0802B52C: adds r0, 0x49 ldrb r0, [r0] @@ -89480,7 +87397,7 @@ _0802B544: movs r1, 0x6 _0802B54A: strb r1, [r0] - ldr r0, _0802B55C + ldr r0, =0x02022cfc ldr r1, [r0] ldrh r0, [r1, 0x8] adds r0, 0x1 @@ -89489,7 +87406,7 @@ _0802B556: movs r0, 0 b _0802B562 .align 2, 0 -_0802B55C: .4byte 0x02022cfc + .pool _0802B560: movs r0, 0x1 _0802B562: @@ -89501,7 +87418,7 @@ _0802B562: thumb_func_start sub_802B568 sub_802B568: @ 802B568 push {r4,lr} - ldr r4, _0802B57C + ldr r4, =0x02022cfc ldr r0, [r4] ldrh r0, [r0, 0x8] cmp r0, 0 @@ -89510,7 +87427,7 @@ sub_802B568: @ 802B568 beq _0802B58E b _0802B5C0 .align 2, 0 -_0802B57C: .4byte 0x02022cfc + .pool _0802B580: movs r0, 0 bl sub_802AE14 @@ -89522,7 +87439,7 @@ _0802B58E: bl sub_802BB84 cmp r0, 0 bne _0802B5C0 - ldr r4, _0802B5BC + ldr r4, =0x02022cfc ldr r2, [r4] ldr r0, [r2, 0x78] adds r1, r2, 0 @@ -89540,7 +87457,7 @@ _0802B58E: movs r0, 0 b _0802B5C2 .align 2, 0 -_0802B5BC: .4byte 0x02022cfc + .pool _0802B5C0: movs r0, 0x1 _0802B5C2: @@ -89552,7 +87469,7 @@ _0802B5C2: thumb_func_start sub_802B5C8 sub_802B5C8: @ 802B5C8 push {r4,lr} - ldr r4, _0802B5DC + ldr r4, =0x02022cfc ldr r1, [r4] ldrh r0, [r1, 0x8] cmp r0, 0 @@ -89561,7 +87478,7 @@ sub_802B5C8: @ 802B5C8 beq _0802B5F2 b _0802B61E .align 2, 0 -_0802B5DC: .4byte 0x02022cfc + .pool _0802B5E0: bl sub_802BD30 cmp r0, 0 @@ -89603,7 +87520,7 @@ _0802B620: thumb_func_start sub_802B628 sub_802B628: @ 802B628 push {r4,lr} - ldr r4, _0802B63C + ldr r4, =0x02022cfc ldr r0, [r4] ldrh r0, [r0, 0x8] cmp r0, 0 @@ -89612,7 +87529,7 @@ sub_802B628: @ 802B628 beq _0802B656 b _0802B65A .align 2, 0 -_0802B63C: .4byte 0x02022cfc + .pool _0802B640: bl sub_802BD30 cmp r0, 0 @@ -89637,7 +87554,7 @@ _0802B65C: thumb_func_start sub_802B664 sub_802B664: @ 802B664 push {r4,lr} - ldr r4, _0802B67C + ldr r4, =0x02022cfc ldr r1, [r4] ldrh r0, [r1, 0x8] cmp r0, 0x1 @@ -89648,7 +87565,7 @@ sub_802B664: @ 802B664 beq _0802B686 b _0802B6B0 .align 2, 0 -_0802B67C: .4byte 0x02022cfc + .pool _0802B680: cmp r0, 0x2 beq _0802B69C @@ -89683,7 +87600,7 @@ _0802B6B0: thumb_func_start sub_802B6B8 sub_802B6B8: @ 802B6B8 push {r4,lr} - ldr r4, _0802B6CC + ldr r4, =0x02022cfc ldr r0, [r4] ldrh r0, [r0, 0x8] cmp r0, 0 @@ -89692,7 +87609,7 @@ sub_802B6B8: @ 802B6B8 beq _0802B6E0 b _0802B6FC .align 2, 0 -_0802B6CC: .4byte 0x02022cfc + .pool _0802B6D0: movs r0, 0x4 bl sub_802AE14 @@ -89743,20 +87660,19 @@ _0802B71A: thumb_func_start sub_802B720 sub_802B720: @ 802B720 push {r4,lr} - ldr r1, _0802B738 + ldr r1, =0x02022cfc ldr r0, [r1] ldrh r0, [r0, 0x8] adds r4, r1, 0 cmp r0, 0x4 bhi _0802B7D8 lsls r0, 2 - ldr r1, _0802B73C + ldr r1, =_0802B740 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802B738: .4byte 0x02022cfc -_0802B73C: .4byte _0802B740 + .pool .align 2, 0 _0802B740: .4byte _0802B754 @@ -89788,21 +87704,21 @@ _0802B780: bl sub_802C70C cmp r0, 0 beq _0802B7D8 - ldr r0, _0802B794 + ldr r0, =sub_8153688 + 1 movs r1, 0x6 bl AddTask b _0802B7A8 .align 2, 0 -_0802B794: .4byte sub_8153688 + 1 + .pool _0802B798: - ldr r0, _0802B7B4 + ldr r0, =sub_8153688 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 bne _0802B7D8 bl sub_802DA14 _0802B7A8: - ldr r0, _0802B7B8 + ldr r0, =0x02022cfc ldr r1, [r0] _0802B7AC: ldrh r0, [r1, 0x8] @@ -89810,13 +87726,12 @@ _0802B7AC: strh r0, [r1, 0x8] b _0802B7D8 .align 2, 0 -_0802B7B4: .4byte sub_8153688 + 1 -_0802B7B8: .4byte 0x02022cfc + .pool _0802B7BC: bl sub_802DA44 cmp r0, 0 bne _0802B7D8 - ldr r0, _0802B7D4 + ldr r0, =0x02022cfc ldr r0, [r0] adds r0, 0x4C movs r1, 0x4 @@ -89824,7 +87739,7 @@ _0802B7BC: movs r0, 0 b _0802B7DA .align 2, 0 -_0802B7D4: .4byte 0x02022cfc + .pool _0802B7D8: movs r0, 0x1 _0802B7DA: @@ -89836,20 +87751,19 @@ _0802B7DA: thumb_func_start sub_802B7E0 sub_802B7E0: @ 802B7E0 push {r4,r5,lr} - ldr r1, _0802B7F8 + ldr r1, =0x02022cfc ldr r0, [r1] ldrh r0, [r0, 0xA] adds r4, r1, 0 cmp r0, 0x7 bhi _0802B8C4 lsls r0, 2 - ldr r1, _0802B7FC + ldr r1, =_0802B800 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802B7F8: .4byte 0x02022cfc -_0802B7FC: .4byte _0802B800 + .pool .align 2, 0 _0802B800: .4byte _0802B820 @@ -89870,7 +87784,7 @@ _0802B82C: adds r5, r0, 0 cmp r5, 0 bne _0802B8C4 - ldr r4, _0802B848 + ldr r4, =0x02022cfc ldr r0, [r4] ldrb r0, [r0, 0x6] bl sub_802DDF4 @@ -89878,7 +87792,7 @@ _0802B82C: strh r5, [r1, 0x3C] b _0802B894 .align 2, 0 -_0802B848: .4byte 0x02022cfc + .pool _0802B84C: ldr r1, [r4] ldrh r0, [r1, 0x3C] @@ -89911,7 +87825,7 @@ _0802B880: bl sub_802C260 bl sub_802D764 _0802B890: - ldr r0, _0802B89C + ldr r0, =0x02022cfc ldr r1, [r0] _0802B894: ldrh r0, [r1, 0xA] @@ -89919,14 +87833,14 @@ _0802B894: strh r0, [r1, 0xA] b _0802B8C4 .align 2, 0 -_0802B89C: .4byte 0x02022cfc + .pool _0802B8A0: bl sub_802D788 cmp r0, 0 bne _0802B8C4 bl sub_802C270 bl sub_802BEA0 - ldr r0, _0802B8C0 + ldr r0, =0x02022cfc ldr r1, [r0] ldrh r0, [r1, 0xA] adds r0, 0x1 @@ -89935,7 +87849,7 @@ _0802B8BA: movs r0, 0 b _0802B8C6 .align 2, 0 -_0802B8C0: .4byte 0x02022cfc + .pool _0802B8C4: movs r0, 0x1 _0802B8C6: @@ -89948,7 +87862,7 @@ _0802B8C6: sub_802B8CC: @ 802B8CC push {r4,r5,lr} bl sub_802BEE4 - ldr r5, _0802B8E4 + ldr r5, =0x02022cfc ldr r1, [r5] ldrh r4, [r1, 0x36] cmp r4, 0 @@ -89957,7 +87871,7 @@ sub_802B8CC: @ 802B8CC strh r0, [r1, 0x36] b _0802B95C .align 2, 0 -_0802B8E4: .4byte 0x02022cfc + .pool _0802B8E8: ldrh r0, [r1, 0xA] cmp r0, 0x1 @@ -89983,7 +87897,7 @@ _0802B902: adds r0, 0x1 strh r0, [r1, 0xA] _0802B914: - ldr r0, _0802B930 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -89992,12 +87906,11 @@ _0802B914: bl sub_802C164 movs r0, 0x3 bl sub_802AE14 - ldr r0, _0802B934 + ldr r0, =0x02022cfc ldr r1, [r0] b _0802B944 .align 2, 0 -_0802B930: .4byte 0x030022c0 -_0802B934: .4byte 0x02022cfc + .pool _0802B938: movs r0, 0x1 bl sub_802C130 @@ -90027,20 +87940,19 @@ _0802B95C: thumb_func_start sub_802B964 sub_802B964: @ 802B964 push {r4-r6,lr} - ldr r1, _0802B97C + ldr r1, =0x02022cfc ldr r0, [r1] ldrh r0, [r0, 0xA] adds r5, r1, 0 cmp r0, 0x4 bhi _0802BA50 lsls r0, 2 - ldr r1, _0802B980 + ldr r1, =_0802B984 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802B97C: .4byte 0x02022cfc -_0802B980: .4byte _0802B984 + .pool .align 2, 0 _0802B984: .4byte _0802B998 @@ -90079,7 +87991,7 @@ _0802B9BC: _0802B9CA: ldr r0, [r6] adds r0, r5 - ldr r1, _0802B9F8 + ldr r1, =0x000082f4 adds r0, r1 ldrh r0, [r0] cmp r0, 0x2 @@ -90097,12 +88009,11 @@ _0802B9E0: _0802B9EC: movs r0, 0x1 bl sub_802D0C8 - ldr r0, _0802B9FC + ldr r0, =0x02022cfc ldr r1, [r0] b _0802BA18 .align 2, 0 -_0802B9F8: .4byte 0x000082f4 -_0802B9FC: .4byte 0x02022cfc + .pool _0802BA00: ldr r1, [r5] ldrh r0, [r1, 0x3C] @@ -90129,7 +88040,7 @@ _0802BA24: cmp r5, 0 bne _0802BA50 bl sub_802DDCC - ldr r4, _0802BA4C + ldr r4, =0x02022cfc ldr r0, [r4] adds r0, 0x71 strb r5, [r0] @@ -90142,7 +88053,7 @@ _0802BA46: movs r0, 0 b _0802BA52 .align 2, 0 -_0802BA4C: .4byte 0x02022cfc + .pool _0802BA50: movs r0, 0x1 _0802BA52: @@ -90154,7 +88065,7 @@ _0802BA52: thumb_func_start sub_802BA58 sub_802BA58: @ 802BA58 push {r4,lr} - ldr r1, _0802BA74 + ldr r1, =0x02022cfc ldr r0, [r1] ldrh r0, [r0, 0xA] adds r4, r1, 0 @@ -90163,13 +88074,12 @@ sub_802BA58: @ 802BA58 b _0802BB7C _0802BA68: lsls r0, 2 - ldr r1, _0802BA78 + ldr r1, =_0802BA7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802BA74: .4byte 0x02022cfc -_0802BA78: .4byte _0802BA7C + .pool .align 2, 0 _0802BA7C: .4byte _0802BA98 @@ -90199,18 +88109,18 @@ _0802BAB8: adds r2, r0, 0 cmp r2, 0 bne _0802BB7C - ldr r0, _0802BACC + ldr r0, =0x02022cfc ldr r1, [r0] strh r2, [r1, 0x3C] b _0802BAF2 .align 2, 0 -_0802BACC: .4byte 0x02022cfc + .pool _0802BAD0: ldr r1, [r4] ldrh r0, [r1, 0x3C] adds r2, r0, 0x1 strh r2, [r1, 0x3C] - ldr r0, _0802BAFC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -90230,12 +88140,12 @@ _0802BAF2: strh r0, [r1, 0xA] b _0802BB7C .align 2, 0 -_0802BAFC: .4byte 0x030022c0 + .pool _0802BB00: bl sub_802DA44 cmp r0, 0 bne _0802BB7C - ldr r4, _0802BB4C + ldr r4, =0x02022cfc ldr r1, [r4] ldrh r0, [r1, 0x3E] adds r1, 0x40 @@ -90266,14 +88176,14 @@ _0802BB00: bl sub_802D884 b _0802BB62 .align 2, 0 -_0802BB4C: .4byte 0x02022cfc + .pool _0802BB50: ldr r1, [r4] movs r0, 0x6 strh r0, [r1, 0xA] b _0802BB7C _0802BB58: - ldr r4, _0802BB6C + ldr r4, =0x02022cfc ldr r0, [r4] ldrh r0, [r0, 0x3E] bl sub_802D8FC @@ -90283,7 +88193,7 @@ _0802BB62: strh r0, [r1, 0xA] b _0802BB7C .align 2, 0 -_0802BB6C: .4byte 0x02022cfc + .pool _0802BB70: bl sub_802DA44 cmp r0, 0 @@ -90301,19 +88211,18 @@ _0802BB7E: thumb_func_start sub_802BB84 sub_802BB84: @ 802BB84 push {r4,lr} - ldr r0, _0802BB9C + ldr r0, =0x02022cfc ldr r0, [r0] ldrh r0, [r0, 0xA] cmp r0, 0x6 bhi _0802BC58 lsls r0, 2 - ldr r1, _0802BBA0 + ldr r1, =_0802BBA4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802BB9C: .4byte 0x02022cfc -_0802BBA0: .4byte _0802BBA4 + .pool .align 2, 0 _0802BBA4: .4byte _0802BBC0 @@ -90348,7 +88257,7 @@ _0802BBE8: cmp r1, 0x1 bne _0802BC58 _0802BBEC: - ldr r4, _0802BC00 + ldr r4, =0x02022cfc ldr r0, [r4] adds r0, 0x45 movs r1, 0x1 @@ -90358,9 +88267,9 @@ _0802BBEC: ldr r1, [r4] b _0802BC30 .align 2, 0 -_0802BC00: .4byte 0x02022cfc + .pool _0802BC04: - ldr r4, _0802BC18 + ldr r4, =0x02022cfc ldr r0, [r4] adds r0, 0x45 movs r1, 0x2 @@ -90370,7 +88279,7 @@ _0802BC04: ldr r1, [r4] b _0802BC30 .align 2, 0 -_0802BC18: .4byte 0x02022cfc + .pool _0802BC1C: bl sub_802D0F0 cmp r0, 0 @@ -90381,7 +88290,7 @@ _0802BC26: _0802BC28: bl sub_802D0C8 _0802BC2C: - ldr r0, _0802BC38 + ldr r0, =0x02022cfc ldr r1, [r0] _0802BC30: ldrh r0, [r1, 0xA] @@ -90389,12 +88298,12 @@ _0802BC30: strh r0, [r1, 0xA] b _0802BC58 .align 2, 0 -_0802BC38: .4byte 0x02022cfc + .pool _0802BC3C: bl sub_802D0F0 cmp r0, 0 bne _0802BC58 - ldr r0, _0802BC54 + ldr r0, =0x02022cfc ldr r1, [r0] ldrh r0, [r1, 0xA] adds r0, 0x1 @@ -90403,7 +88312,7 @@ _0802BC4E: movs r0, 0 b _0802BC5A .align 2, 0 -_0802BC54: .4byte 0x02022cfc + .pool _0802BC58: movs r0, 0x1 _0802BC5A: @@ -90416,20 +88325,19 @@ _0802BC5A: sub_802BC60: @ 802BC60 push {r4,lr} sub sp, 0x4 - ldr r1, _0802BC7C + ldr r1, =0x02022cfc ldr r0, [r1] ldrh r0, [r0, 0xA] adds r4, r1, 0 cmp r0, 0x5 bhi _0802BD24 lsls r0, 2 - ldr r1, _0802BC80 + ldr r1, =_0802BC84 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802BC7C: .4byte 0x02022cfc -_0802BC80: .4byte _0802BC84 + .pool .align 2, 0 _0802BC84: .4byte _0802BC9C @@ -90453,12 +88361,12 @@ _0802BCB2: adds r2, r0, 0 cmp r2, 0 bne _0802BD24 - ldr r0, _0802BCC4 + ldr r0, =0x02022cfc ldr r1, [r0] strh r2, [r1, 0x3C] b _0802BD02 .align 2, 0 -_0802BCC4: .4byte 0x02022cfc + .pool _0802BCC8: ldr r1, [r4] ldrh r0, [r1, 0x3C] @@ -90479,7 +88387,7 @@ _0802BCC8: ldr r1, [r4] b _0802BD02 _0802BCEE: - ldr r0, _0802BD0C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -90487,7 +88395,7 @@ _0802BCEE: bne _0802BD24 bl sub_800AC34 _0802BCFE: - ldr r0, _0802BD10 + ldr r0, =0x02022cfc ldr r1, [r0] _0802BD02: ldrh r0, [r1, 0xA] @@ -90495,17 +88403,16 @@ _0802BD02: strh r0, [r1, 0xA] b _0802BD24 .align 2, 0 -_0802BD0C: .4byte 0x02037fd4 -_0802BD10: .4byte 0x02022cfc + .pool _0802BD14: - ldr r0, _0802BD20 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0802BD24 movs r0, 0 b _0802BD26 .align 2, 0 -_0802BD20: .4byte 0x03003124 + .pool _0802BD24: movs r0, 0x1 _0802BD26: @@ -90518,7 +88425,7 @@ _0802BD26: thumb_func_start sub_802BD30 sub_802BD30: @ 802BD30 push {r4,lr} - ldr r4, _0802BD48 + ldr r4, =0x02022cfc ldr r0, [r4] ldrh r0, [r0, 0xA] cmp r0, 0x1 @@ -90529,7 +88436,7 @@ sub_802BD30: @ 802BD30 beq _0802BD52 b _0802BD7A .align 2, 0 -_0802BD48: .4byte 0x02022cfc + .pool _0802BD4C: cmp r0, 0x2 beq _0802BD76 @@ -90576,7 +88483,7 @@ sub_802BD84: @ 802BD84 lsls r0, 2 add r0, r10 lsls r0, 3 - ldr r1, _0802BDB8 + ldr r1, =0x03005e08 adds r6, r0, r1 mov r0, r10 movs r1, 0xE @@ -90590,7 +88497,7 @@ sub_802BD84: @ 802BD84 beq _0802BDDC b _0802BE48 .align 2, 0 -_0802BDB8: .4byte 0x03005e08 + .pool _0802BDBC: bl sub_802AB20 mov r0, r10 @@ -90614,7 +88521,7 @@ _0802BDDC: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r4, _0802BE58 + ldr r4, =0x000082a8 adds r0, r4 add r0, r8 bl sub_802E0AC @@ -90637,7 +88544,7 @@ _0802BDFE: ldr r2, [sp] cmp r0, 0 beq _0802BE38 - ldr r1, _0802BE5C + ldr r1, =0x020229f0 add r1, r9 adds r0, r7, 0 bl gf_strcpy @@ -90672,8 +88579,7 @@ _0802BE48: pop {r0} bx r0 .align 2, 0 -_0802BE58: .4byte 0x000082a8 -_0802BE5C: .4byte 0x020229f0 + .pool thumb_func_end sub_802BD84 thumb_func_start sub_802BE60 @@ -90684,19 +88590,19 @@ sub_802BE60: @ 802BE60 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r1, _0802BE7C + ldr r1, =0x02022cfc ldr r2, [r1] movs r1, 0xE bl set_word_task_arg pop {r0} bx r0 .align 2, 0 -_0802BE7C: .4byte 0x02022cfc + .pool thumb_func_end sub_802BE60 thumb_func_start sub_802BE80 sub_802BE80: @ 802BE80 - ldr r0, _0802BE9C + ldr r0, =0x02022cfc ldr r2, [r0] adds r0, r2, 0 adds r0, 0x4A @@ -90710,20 +88616,20 @@ sub_802BE80: @ 802BE80 str r1, [r2, 0x10] bx lr .align 2, 0 -_0802BE9C: .4byte 0x02022cfc + .pool thumb_func_end sub_802BE80 thumb_func_start sub_802BEA0 sub_802BEA0: @ 802BEA0 push {r4,lr} - ldr r3, _0802BEDC + ldr r3, =0x02022cfc ldr r0, [r3] adds r1, r0, 0 adds r1, 0x4A movs r4, 0 movs r2, 0 strh r2, [r1] - ldr r1, _0802BEE0 + ldr r1, =0x000006ff strh r1, [r0, 0x34] movs r1, 0x7 str r1, [r0, 0x14] @@ -90745,14 +88651,13 @@ sub_802BEA0: @ 802BEA0 pop {r0} bx r0 .align 2, 0 -_0802BEDC: .4byte 0x02022cfc -_0802BEE0: .4byte 0x000006ff + .pool thumb_func_end sub_802BEA0 thumb_func_start sub_802BEE4 sub_802BEE4: @ 802BEE4 push {r4,lr} - ldr r4, _0802BF3C + ldr r4, =0x02022cfc ldr r1, [r4] adds r0, r1, 0 adds r0, 0x46 @@ -90769,10 +88674,10 @@ sub_802BEE4: @ 802BEE4 adds r2, r1, r0 strh r2, [r3, 0x34] lsls r1, r2, 16 - ldr r0, _0802BF40 + ldr r0, =0x09fe0000 cmp r1, r0 bls _0802BF16 - ldr r1, _0802BF44 + ldr r1, =0xfffff601 adds r0, r2, r1 strh r0, [r3, 0x34] _0802BF16: @@ -90795,15 +88700,13 @@ _0802BF34: pop {r0} bx r0 .align 2, 0 -_0802BF3C: .4byte 0x02022cfc -_0802BF40: .4byte 0x09fe0000 -_0802BF44: .4byte 0xfffff601 + .pool thumb_func_end sub_802BEE4 thumb_func_start sub_802BF48 sub_802BF48: @ 802BF48 push {lr} - ldr r0, _0802BF58 + ldr r0, =0x02022cfc ldr r2, [r0] ldr r0, [r2, 0x10] cmp r0, 0 @@ -90811,11 +88714,11 @@ sub_802BF48: @ 802BF48 movs r0, 0 b _0802BF72 .align 2, 0 -_0802BF58: .4byte 0x02022cfc + .pool _0802BF5C: ldr r3, [r2, 0x1C] ldrh r1, [r2, 0x34] - ldr r0, _0802BF78 + ldr r0, =0x000005ff cmp r1, r0 bhi _0802BF70 ldr r0, [r2, 0x20] @@ -90829,13 +88732,13 @@ _0802BF72: pop {r1} bx r1 .align 2, 0 -_0802BF78: .4byte 0x000005ff + .pool thumb_func_end sub_802BF48 thumb_func_start sub_802BF7C sub_802BF7C: @ 802BF7C push {r4,lr} - ldr r4, _0802BFAC + ldr r4, =0x02022cfc ldr r3, [r4] movs r0, 0 str r0, [r3, 0x20] @@ -90857,7 +88760,7 @@ sub_802BF7C: @ 802BF7C ldr r1, [r4] b _0802C086 .align 2, 0 -_0802BFAC: .4byte 0x02022cfc + .pool _0802BFB0: ldr r1, [r4] ldr r0, [r1, 0x28] @@ -90876,7 +88779,7 @@ _0802BFC0: ands r0, r1 cmp r0, 0 bne _0802C014 - ldr r0, _0802C00C + ldr r0, =0x082fb63c ldrb r1, [r2] lsls r1, 1 adds r1, r0 @@ -90890,7 +88793,7 @@ _0802BFC0: str r0, [r3, 0x28] bl sub_802C098 ldr r2, [r4] - ldr r3, _0802C010 + ldr r3, =0x082fb64c movs r1, 0x3 ands r1, r0 lsls r1, 1 @@ -90906,8 +88809,7 @@ _0802BFC0: strb r0, [r2] b _0802C082 .align 2, 0 -_0802C00C: .4byte 0x082fb63c -_0802C010: .4byte 0x082fb64c + .pool _0802C014: lsls r0, r1, 24 lsrs r0, 24 @@ -90925,8 +88827,8 @@ _0802C02C: movs r0, 0x1 str r0, [r3, 0x6C] _0802C030: - ldr r2, _0802C090 - ldr r4, _0802C094 + ldr r2, =0x082fb63c + ldr r4, =0x02022cfc ldr r0, [r4] mov r12, r0 mov r3, r12 @@ -90967,7 +88869,7 @@ _0802C07A: movs r1, 0 strb r1, [r0] _0802C082: - ldr r0, _0802C094 + ldr r0, =0x02022cfc ldr r1, [r0] _0802C086: ldr r0, [r1, 0x28] @@ -90978,62 +88880,58 @@ _0802C08A: pop {r0} bx r0 .align 2, 0 -_0802C090: .4byte 0x082fb63c -_0802C094: .4byte 0x02022cfc + .pool thumb_func_end sub_802BF7C thumb_func_start sub_802C098 sub_802C098: @ 802C098 - ldr r0, _0802C0AC + ldr r0, =0x02022cfc ldr r2, [r0] ldr r1, [r2, 0x24] - ldr r0, _0802C0B0 + ldr r0, =0x41c64e6d muls r0, r1 - ldr r1, _0802C0B4 + ldr r1, =0x00006073 adds r0, r1 str r0, [r2, 0x24] lsrs r0, 16 bx lr .align 2, 0 -_0802C0AC: .4byte 0x02022cfc -_0802C0B0: .4byte 0x41c64e6d -_0802C0B4: .4byte 0x00006073 + .pool thumb_func_end sub_802C098 thumb_func_start sub_802C0B8 sub_802C0B8: @ 802C0B8 push {lr} - ldr r0, _0802C0D4 + ldr r0, =0x02022cfc ldr r1, [r0] movs r0, 0x1 str r0, [r1, 0x10] movs r0, 0x6 str r0, [r1, 0x14] - ldr r0, _0802C0D8 + ldr r0, =0x000005ff strh r0, [r1, 0x34] bl sub_802C270 pop {r0} bx r0 .align 2, 0 -_0802C0D4: .4byte 0x02022cfc -_0802C0D8: .4byte 0x000005ff + .pool thumb_func_end sub_802C0B8 thumb_func_start sub_802C0DC sub_802C0DC: @ 802C0DC - ldr r0, _0802C0E4 + ldr r0, =0x02022cfc ldr r0, [r0] ldr r0, [r0, 0x10] bx lr .align 2, 0 -_0802C0E4: .4byte 0x02022cfc + .pool thumb_func_end sub_802C0DC thumb_func_start sub_802C0E8 sub_802C0E8: @ 802C0E8 push {r4,r5,lr} - ldr r5, _0802C10C - ldr r4, _0802C110 + ldr r5, =0x02022cfc + ldr r4, =0x000082f8 movs r3, 0 movs r2, 0 movs r1, 0x4 @@ -91050,15 +88948,14 @@ _0802C0F4: pop {r0} bx r0 .align 2, 0 -_0802C10C: .4byte 0x02022cfc -_0802C110: .4byte 0x000082f8 + .pool thumb_func_end sub_802C0E8 thumb_func_start sub_802C114 sub_802C114: @ 802C114 - ldr r0, _0802C128 + ldr r0, =0x02022cfc ldr r0, [r0] - ldr r1, _0802C12C + ldr r1, =0x000083ac adds r0, r1 ldr r1, [r0] movs r2, 0 @@ -91067,8 +88964,7 @@ sub_802C114: @ 802C114 strh r2, [r0, 0x12] bx lr .align 2, 0 -_0802C128: .4byte 0x02022cfc -_0802C12C: .4byte 0x000083ac + .pool thumb_func_end sub_802C114 thumb_func_start sub_802C130 @@ -91076,14 +88972,14 @@ sub_802C130: @ 802C130 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r1, _0802C154 + ldr r1, =0x02022cfc ldr r2, [r1] ldrb r3, [r2, 0x6] lsls r1, r3, 2 adds r1, r3 lsls r1, 3 adds r2, r1 - ldr r1, _0802C158 + ldr r1, =0x000082f4 adds r2, r1 ldrh r1, [r2] cmp r1, r0 @@ -91091,8 +88987,7 @@ sub_802C130: @ 802C130 movs r0, 0 b _0802C15E .align 2, 0 -_0802C154: .4byte 0x02022cfc -_0802C158: .4byte 0x000082f4 + .pool _0802C15C: movs r0, 0x1 _0802C15E: @@ -91102,9 +88997,9 @@ _0802C15E: thumb_func_start sub_802C164 sub_802C164: @ 802C164 - ldr r0, _0802C184 + ldr r0, =0x02022cfc ldr r0, [r0] - ldr r1, _0802C188 + ldr r1, =0x000083ac adds r2, r0, r1 ldr r1, [r2] adds r0, 0x4A @@ -91118,16 +89013,15 @@ sub_802C164: @ 802C164 strh r0, [r1, 0x10] bx lr .align 2, 0 -_0802C184: .4byte 0x02022cfc -_0802C188: .4byte 0x000083ac + .pool thumb_func_end sub_802C164 thumb_func_start sub_802C18C sub_802C18C: @ 802C18C push {r4,lr} - ldr r0, _0802C1B4 + ldr r0, =0x02022cfc ldr r2, [r0] - ldr r0, _0802C1B8 + ldr r0, =0x000083ac adds r3, r2, r0 ldr r1, [r3] ldrh r0, [r1, 0x10] @@ -91145,15 +89039,14 @@ sub_802C18C: @ 802C18C pop {r0} bx r0 .align 2, 0 -_0802C1B4: .4byte 0x02022cfc -_0802C1B8: .4byte 0x000083ac + .pool thumb_func_end sub_802C18C thumb_func_start sub_802C1BC sub_802C1BC: @ 802C1BC - ldr r0, _0802C1D4 + ldr r0, =0x02022cfc ldr r0, [r0] - ldr r1, _0802C1D8 + ldr r1, =0x000083ac adds r0, r1 ldr r1, [r0] ldrh r2, [r1, 0x10] @@ -91163,14 +89056,13 @@ sub_802C1BC: @ 802C1BC strh r3, [r0, 0x10] bx lr .align 2, 0 -_0802C1D4: .4byte 0x02022cfc -_0802C1D8: .4byte 0x000083ac + .pool thumb_func_end sub_802C1BC thumb_func_start sub_802C1DC sub_802C1DC: @ 802C1DC push {r4,r5,lr} - ldr r4, _0802C238 + ldr r4, =0x02022cfc ldr r1, [r4] ldr r0, [r1, 0x5C] cmp r0, 0 @@ -91189,7 +89081,7 @@ sub_802C1DC: @ 802C1DC adds r0, 0x71 ldrb r0, [r0] bl sub_802DCCC - ldr r1, _0802C23C + ldr r1, =0x082fb654 subs r0, 0x2 lsls r0, 1 adds r0, r1 @@ -91199,7 +89091,7 @@ sub_802C1DC: @ 802C1DC adds r0, 0x4D strb r5, [r0] _0802C21C: - ldr r0, _0802C238 + ldr r0, =0x02022cfc ldr r0, [r0] adds r0, 0x74 ldrh r0, [r0] @@ -91210,14 +89102,13 @@ _0802C21C: pop {r0} bx r0 .align 2, 0 -_0802C238: .4byte 0x02022cfc -_0802C23C: .4byte 0x082fb654 + .pool thumb_func_end sub_802C1DC thumb_func_start sub_802C240 sub_802C240: @ 802C240 push {lr} - ldr r0, _0802C25C + ldr r0, =0x02022cfc ldr r1, [r0] adds r0, r1, 0 adds r0, 0x46 @@ -91230,31 +89121,31 @@ _0802C256: pop {r0} bx r0 .align 2, 0 -_0802C25C: .4byte 0x02022cfc + .pool thumb_func_end sub_802C240 thumb_func_start sub_802C260 sub_802C260: @ 802C260 - ldr r0, _0802C26C + ldr r0, =0x02022cfc ldr r0, [r0] adds r0, 0x46 movs r1, 0 strb r1, [r0] bx lr .align 2, 0 -_0802C26C: .4byte 0x02022cfc + .pool thumb_func_end sub_802C260 thumb_func_start sub_802C270 sub_802C270: @ 802C270 - ldr r0, _0802C27C + ldr r0, =0x02022cfc ldr r0, [r0] adds r0, 0x46 movs r1, 0x1 strb r1, [r0] bx lr .align 2, 0 -_0802C27C: .4byte 0x02022cfc + .pool thumb_func_end sub_802C270 thumb_func_start sub_802C280 @@ -91266,7 +89157,7 @@ sub_802C280: @ 802C280 push {r5-r7} sub sp, 0x4 movs r6, 0 - ldr r2, _0802C2BC + ldr r2, =0x02022cfc ldr r0, [r2] ldrb r0, [r0, 0x5] mov r9, r0 @@ -91280,7 +89171,7 @@ _0802C2A2: mov r0, r10 ldr r3, [r0] adds r1, r3, r7 - ldr r2, _0802C2C0 + ldr r2, =0x000082f4 adds r0, r1, r2 ldrh r2, [r0] cmp r2, 0x1 @@ -91291,8 +89182,7 @@ _0802C2A2: beq _0802C2CA b _0802C354 .align 2, 0 -_0802C2BC: .4byte 0x02022cfc -_0802C2C0: .4byte 0x000082f4 + .pool _0802C2C4: cmp r2, 0x2 beq _0802C338 @@ -91303,12 +89193,12 @@ _0802C2CA: bl sub_802DC80 b _0802C354 _0802C2D4: - ldr r0, _0802C328 + ldr r0, =0x000082f6 adds r4, r1, r0 ldrh r0, [r4] cmp r0, 0x1 bne _0802C2F6 - ldr r0, _0802C32C + ldr r0, =0x000082f2 adds r0, r1 adds r1, r3, 0 adds r1, 0x9A @@ -91329,16 +89219,16 @@ _0802C2FE: orrs r6, r2 mov r1, r10 ldr r2, [r1] - ldr r1, _0802C330 + ldr r1, =0x000082e8 adds r0, r2, r1 adds r0, r7 - ldr r1, _0802C334 + ldr r1, =0x7fffffff str r1, [r0] adds r1, r2, 0 adds r1, 0x9A add r1, r8 adds r2, r7 - ldr r0, _0802C32C + ldr r0, =0x000082f2 adds r2, r0 ldrh r0, [r2] strh r0, [r1] @@ -91347,12 +89237,9 @@ _0802C31E: bl sub_802C398 b _0802C354 .align 2, 0 -_0802C328: .4byte 0x000082f6 -_0802C32C: .4byte 0x000082f2 -_0802C330: .4byte 0x000082e8 -_0802C334: .4byte 0x7fffffff + .pool _0802C338: - ldr r0, _0802C374 + ldr r0, =0x000082f6 adds r1, r0 ldrh r0, [r1] cmp r0, 0x2 @@ -91383,7 +89270,7 @@ _0802C360: bl audio_play b _0802C386 .align 2, 0 -_0802C374: .4byte 0x000082f6 + .pool _0802C378: movs r0, 0x1 ands r6, r0 @@ -91406,7 +89293,7 @@ _0802C386: sub_802C398: @ 802C398 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, _0802C3C4 + ldr r0, =0x02022cfc ldr r2, [r0] ldr r0, [r2, 0x68] cmp r0, 0 @@ -91414,11 +89301,11 @@ sub_802C398: @ 802C398 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0802C3C8 + ldr r1, =0x000082e4 adds r0, r1 adds r5, r2, r0 ldr r1, [r5, 0x4] - ldr r0, _0802C3CC + ldr r0, =0x7fffffff cmp r1, r0 beq _0802C3D0 adds r0, r1, 0x1 @@ -91426,19 +89313,17 @@ sub_802C398: @ 802C398 adds r3, r0, 0 b _0802C3E8 .align 2, 0 -_0802C3C4: .4byte 0x02022cfc -_0802C3C8: .4byte 0x000082e4 -_0802C3CC: .4byte 0x7fffffff + .pool _0802C3D0: adds r0, r2, 0 adds r0, 0x4A ldrh r1, [r0] ldrh r0, [r5, 0xE] subs r3, r1, r0 - ldr r0, _0802C408 + ldr r0, =0x0000fde7 cmp r3, r0 ble _0802C3E6 - ldr r0, _0802C40C + ldr r0, =0xffff0218 adds r3, r0 adds r3, r1 _0802C3E6: @@ -91449,7 +89334,7 @@ _0802C3E8: subs r3, 0x4 cmp r3, 0x2F bgt _0802C414 - ldr r2, _0802C410 + ldr r2, =0x082fb65c ldrh r1, [r5, 0xC] lsls r0, r1, 1 adds r0, r1 @@ -91460,9 +89345,7 @@ _0802C3E8: ldrsb r4, [r0, r4] b _0802C416 .align 2, 0 -_0802C408: .4byte 0x0000fde7 -_0802C40C: .4byte 0xffff0218 -_0802C410: .4byte 0x082fb65c + .pool _0802C414: movs r4, 0 _0802C416: @@ -91471,7 +89354,7 @@ _0802C416: bl sub_802DC80 cmp r4, 0 bne _0802C430 - ldr r0, _0802C438 + ldr r0, =0x02022cfc ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r6, r0 @@ -91484,13 +89367,13 @@ _0802C432: pop {r0} bx r0 .align 2, 0 -_0802C438: .4byte 0x02022cfc + .pool thumb_func_end sub_802C398 thumb_func_start sub_802C43C sub_802C43C: @ 802C43C push {r4,r5,lr} - ldr r5, _0802C468 + ldr r5, =0x02022cfc ldr r1, [r5] ldr r0, [r1, 0x14] cmp r0, 0x8 @@ -91510,7 +89393,7 @@ sub_802C43C: @ 802C43C strb r4, [r0] b _0802C4CE .align 2, 0 -_0802C468: .4byte 0x02022cfc + .pool _0802C46C: ldr r0, [r1, 0x54] cmp r0, 0x5 @@ -91525,7 +89408,7 @@ _0802C480: movs r0, 0 strh r0, [r1, 0xC] _0802C484: - ldr r4, _0802C530 + ldr r4, =0x02022cfc ldr r1, [r4] ldr r0, [r1, 0x54] cmp r0, 0x1 @@ -91550,7 +89433,7 @@ _0802C49E: adds r2, r0, 0 adds r2, 0x74 ldrh r1, [r2] - ldr r0, _0802C534 + ldr r0, =0x0000270e cmp r1, r0 bhi _0802C4C2 adds r0, r1, 0x1 @@ -91561,7 +89444,7 @@ _0802C4C2: movs r0, 0x3 bl sub_802AE14 _0802C4CE: - ldr r4, _0802C530 + ldr r4, =0x02022cfc ldr r0, [r4] ldr r0, [r0, 0x64] cmp r0, 0 @@ -91585,7 +89468,7 @@ _0802C4E8: movs r0, 0 str r0, [r1, 0x64] _0802C504: - ldr r4, _0802C530 + ldr r4, =0x02022cfc ldr r0, [r4] ldr r0, [r0, 0x58] cmp r0, 0 @@ -91607,19 +89490,18 @@ _0802C52A: pop {r0} bx r0 .align 2, 0 -_0802C530: .4byte 0x02022cfc -_0802C534: .4byte 0x0000270e + .pool thumb_func_end sub_802C43C thumb_func_start sub_802C538 sub_802C538: @ 802C538 push {r4,r5,lr} - ldr r5, _0802C56C + ldr r5, =0x02022cfc ldr r1, [r5] ldr r0, [r1, 0x14] cmp r0, 0x6 bne _0802C582 - ldr r4, _0802C570 + ldr r4, =0x000083ac adds r0, r1, r4 ldr r1, [r0] ldr r0, [r1] @@ -91638,8 +89520,7 @@ sub_802C538: @ 802C538 str r1, [r0, 0x14] b _0802C582 .align 2, 0 -_0802C56C: .4byte 0x02022cfc -_0802C570: .4byte 0x000083ac + .pool _0802C574: movs r0, 0 b _0802C5CA @@ -91648,7 +89529,7 @@ _0802C578: movs r0, 0x3 bl sub_802AE14 _0802C582: - ldr r0, _0802C5D0 + ldr r0, =0x02022cfc ldr r1, [r0] ldr r0, [r1, 0x14] cmp r0, 0x7 @@ -91656,7 +89537,7 @@ _0802C582: ldr r0, [r1, 0x18] cmp r0, 0x6 bne _0802C5A8 - ldr r2, _0802C5D4 + ldr r2, =0x000083ac adds r0, r1, r2 ldr r1, [r0] ldrh r0, [r1, 0x10] @@ -91668,13 +89549,13 @@ _0802C582: bl sub_802AE14 _0802C5A8: movs r2, 0 - ldr r0, _0802C5D0 + ldr r0, =0x02022cfc ldr r0, [r0] ldrb r1, [r0, 0x5] cmp r2, r1 bge _0802C5C8 adds r3, r1, 0 - ldr r4, _0802C5D8 + ldr r4, =0x000082f4 adds r1, r0, r4 _0802C5BA: ldrh r0, [r1] @@ -91691,21 +89572,19 @@ _0802C5CA: pop {r1} bx r1 .align 2, 0 -_0802C5D0: .4byte 0x02022cfc -_0802C5D4: .4byte 0x000083ac -_0802C5D8: .4byte 0x000082f4 + .pool thumb_func_end sub_802C538 thumb_func_start sub_802C5DC sub_802C5DC: @ 802C5DC push {r4,lr} - ldr r0, _0802C610 + ldr r0, =0x02022cfc ldr r0, [r0] ldrb r3, [r0, 0x5] movs r4, 0 cmp r4, r3 bge _0802C600 - ldr r1, _0802C614 + ldr r1, =0x000082f8 adds r2, r0, r1 adds r1, r3, 0 _0802C5F0: @@ -91728,21 +89607,20 @@ _0802C608: pop {r1} bx r1 .align 2, 0 -_0802C610: .4byte 0x02022cfc -_0802C614: .4byte 0x000082f8 + .pool thumb_func_end sub_802C5DC thumb_func_start sub_802C618 sub_802C618: @ 802C618 push {r4,lr} movs r2, 0 - ldr r0, _0802C638 + ldr r0, =0x02022cfc ldr r0, [r0] ldrb r1, [r0, 0x5] cmp r2, r1 bge _0802C648 adds r3, r1, 0 - ldr r4, _0802C63C + ldr r4, =0x000082f8 adds r1, r0, r4 _0802C62C: ldr r0, [r1] @@ -91751,8 +89629,7 @@ _0802C62C: movs r0, 0 b _0802C64A .align 2, 0 -_0802C638: .4byte 0x02022cfc -_0802C63C: .4byte 0x000082f8 + .pool _0802C640: adds r1, 0x28 adds r2, 0x1 @@ -91769,7 +89646,7 @@ _0802C64A: thumb_func_start sub_802C650 sub_802C650: @ 802C650 push {lr} - ldr r0, _0802C664 + ldr r0, =0x02022cfc ldr r1, [r0] adds r0, r1, 0 adds r0, 0x45 @@ -91780,7 +89657,7 @@ _0802C660: movs r0, 0 b _0802C684 .align 2, 0 -_0802C664: .4byte 0x02022cfc + .pool _0802C668: movs r2, 0x1 ldrb r0, [r1, 0x5] @@ -91806,14 +89683,14 @@ _0802C684: thumb_func_start sub_802C688 sub_802C688: @ 802C688 push {lr} - ldr r1, _0802C6A8 + ldr r1, =0x02022cfc ldr r2, [r1] ldr r1, [r2, 0x78] adds r1, r0 str r1, [r2, 0x78] movs r0, 0x1 str r0, [r2, 0x5C] - ldr r0, _0802C6AC + ldr r0, =0x00018695 cmp r1, r0 bls _0802C6A2 adds r0, 0x1 @@ -91822,15 +89699,14 @@ _0802C6A2: pop {r0} bx r0 .align 2, 0 -_0802C6A8: .4byte 0x02022cfc -_0802C6AC: .4byte 0x00018695 + .pool thumb_func_end sub_802C688 thumb_func_start sub_802C6B0 sub_802C6B0: @ 802C6B0 push {r4-r7,lr} movs r5, 0 - ldr r1, _0802C6E8 + ldr r1, =0x02022cfc ldr r0, [r1] ldrb r4, [r0, 0x5] movs r2, 0 @@ -91838,7 +89714,7 @@ sub_802C6B0: @ 802C6B0 bge _0802C702 mov r12, r1 movs r3, 0 - ldr r7, _0802C6EC + ldr r7, =0x000082e4 movs r6, 0x1E negs r6, r6 _0802C6CA: @@ -91857,8 +89733,7 @@ _0802C6CA: adds r5, 0x1 b _0802C6FA .align 2, 0 -_0802C6E8: .4byte 0x02022cfc -_0802C6EC: .4byte 0x000082e4 + .pool _0802C6F0: adds r0, r1, 0 adds r0, 0x7C @@ -91881,13 +89756,13 @@ _0802C702: sub_802C70C: @ 802C70C push {lr} movs r2, 0 - ldr r1, _0802C730 - ldr r3, _0802C734 + ldr r1, =0x03005000 + ldr r3, =0x000009e6 adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 bne _0802C728 - ldr r3, _0802C738 + ldr r3, =0x00000c1a adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 @@ -91898,9 +89773,7 @@ _0802C728: pop {r1} bx r1 .align 2, 0 -_0802C730: .4byte 0x03005000 -_0802C734: .4byte 0x000009e6 -_0802C738: .4byte 0x00000c1a + .pool thumb_func_end sub_802C70C thumb_func_start sub_802C73C @@ -91910,7 +89783,7 @@ sub_802C73C: @ 802C73C movs r1, 0 movs r2, 0 movs r3, 0 - ldr r6, _0802C77C + ldr r6, =0x02022cfc movs r5, 0x1 _0802C74A: adds r0, r4, r1 @@ -91940,30 +89813,30 @@ _0802C772: pop {r1} bx r1 .align 2, 0 -_0802C77C: .4byte 0x02022cfc + .pool thumb_func_end sub_802C73C thumb_func_start sub_802C780 sub_802C780: @ 802C780 - ldr r0, _0802C78C + ldr r0, =0x02022cfc ldr r0, [r0] adds r0, 0x44 movs r1, 0 strb r1, [r0] bx lr .align 2, 0 -_0802C78C: .4byte 0x02022cfc + .pool thumb_func_end sub_802C780 thumb_func_start sub_802C790 sub_802C790: @ 802C790 - ldr r1, _0802C79C + ldr r1, =0x082fb6ec lsls r0, 2 adds r0, r1 ldr r0, [r0] bx lr .align 2, 0 -_0802C79C: .4byte 0x082fb6ec + .pool thumb_func_end sub_802C790 thumb_func_start sub_802C7A0 @@ -91971,7 +89844,7 @@ sub_802C7A0: @ 802C7A0 push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _0802C7B8 + ldr r0, =0x02022cfc ldr r0, [r0] ldrh r2, [r0, 0xE] cmp r1, r2 @@ -91981,15 +89854,15 @@ _0802C7B2: pop {r0} bx r0 .align 2, 0 -_0802C7B8: .4byte 0x02022cfc + .pool thumb_func_end sub_802C7A0 thumb_func_start sub_802C7BC sub_802C7BC: @ 802C7BC push {lr} - ldr r0, _0802C7D0 + ldr r0, =0x02022cfc ldr r0, [r0] - ldr r1, _0802C7D4 + ldr r1, =0x082fb714 ldr r2, [r0, 0x78] ldr r0, [r1] cmp r2, r0 @@ -91997,8 +89870,7 @@ sub_802C7BC: @ 802C7BC movs r0, 0 b _0802C7DA .align 2, 0 -_0802C7D0: .4byte 0x02022cfc -_0802C7D4: .4byte 0x082fb714 + .pool _0802C7D8: movs r0, 0x1 _0802C7DA: @@ -92016,7 +89888,7 @@ sub_802C7E0: @ 802C7E0 bl sub_802C838 lsls r0, 16 lsrs r0, 4 - ldr r1, _0802C804 + ldr r1, =0x00000fff ands r4, r1 orrs r0, r4 lsls r0, 16 @@ -92025,7 +89897,7 @@ sub_802C7E0: @ 802C7E0 pop {r1} bx r1 .align 2, 0 -_0802C804: .4byte 0x00000fff + .pool thumb_func_end sub_802C7E0 thumb_func_start sub_802C808 @@ -92047,14 +89919,14 @@ sub_802C818: @ 802C818 movs r1, 0xE0 lsls r1, 11 ands r1, r0 - ldr r0, _0802C834 + ldr r0, =0x082fb704 lsrs r1, 15 adds r1, r0 ldrh r0, [r1] pop {r1} bx r1 .align 2, 0 -_0802C834: .4byte 0x082fb704 + .pool thumb_func_end sub_802C818 thumb_func_start sub_802C838 @@ -92062,9 +89934,9 @@ sub_802C838: @ 802C838 push {r4-r6,lr} movs r5, 0 movs r4, 0 - ldr r3, _0802C86C + ldr r3, =0x02022cfc ldr r0, [r3] - ldr r2, _0802C870 + ldr r2, =0x082fb714 ldr r1, [r0, 0x78] ldr r0, [r2] cmp r1, r0 @@ -92086,8 +89958,7 @@ _0802C852: ldr r5, [r3] b _0802C852 .align 2, 0 -_0802C86C: .4byte 0x02022cfc -_0802C870: .4byte 0x082fb714 + .pool _0802C874: lsls r0, r5, 16 lsrs r0, 16 @@ -92136,30 +90007,29 @@ sub_802C8AC: @ 802C8AC thumb_func_start sub_802C8BC sub_802C8BC: @ 802C8BC - ldr r0, _0802C8C4 + ldr r0, =0x02022cfc ldr r0, [r0] ldrb r0, [r0, 0x6] bx lr .align 2, 0 -_0802C8C4: .4byte 0x02022cfc + .pool thumb_func_end sub_802C8BC thumb_func_start sub_802C8C8 sub_802C8C8: @ 802C8C8 lsls r0, 24 lsrs r0, 24 - ldr r2, _0802C8E0 + ldr r2, =0x02022cfc lsls r1, r0, 1 adds r1, r0 lsls r1, 2 - ldr r0, _0802C8E4 + ldr r0, =0x000082a8 adds r1, r0 ldr r0, [r2] adds r0, r1 bx lr .align 2, 0 -_0802C8E0: .4byte 0x02022cfc -_0802C8E4: .4byte 0x000082a8 + .pool thumb_func_end sub_802C8C8 thumb_func_start sub_802C8E8 @@ -92167,7 +90037,7 @@ sub_802C8E8: @ 802C8E8 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _0802C904 + ldr r2, =0x02022cfc lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -92178,7 +90048,7 @@ sub_802C8E8: @ 802C8E8 adds r0, r1 bx lr .align 2, 0 -_0802C904: .4byte 0x02022cfc + .pool thumb_func_end sub_802C8E8 thumb_func_start sub_802C908 @@ -92203,7 +90073,7 @@ _0802C924: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0802C954 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -92218,17 +90088,16 @@ _0802C924: bl sub_802C908 cmp r0, 0 beq _0802C95C - ldr r1, _0802C958 + ldr r1, =0x020375f0 movs r0, 0x1 b _0802C966 .align 2, 0 -_0802C954: .4byte 0x020244ec -_0802C958: .4byte 0x020375f0 + .pool _0802C95C: adds r5, 0x1 cmp r5, 0x5 ble _0802C924 - ldr r1, _0802C970 + ldr r1, =0x020375f0 movs r0, 0 _0802C966: strh r0, [r1] @@ -92236,7 +90105,7 @@ _0802C966: pop {r0} bx r0 .align 2, 0 -_0802C970: .4byte 0x020375f0 + .pool thumb_func_end sub_802C920 thumb_func_start sub_802C974 @@ -92244,7 +90113,7 @@ sub_802C974: @ 802C974 push {r4-r6,lr} adds r6, r0, 0 movs r4, 0 - ldr r5, _0802C9B4 + ldr r5, =0x082fbe08 _0802C97C: adds r0, r5, 0 bl gpu_tile_obj_decompress_and_load @@ -92253,7 +90122,7 @@ _0802C97C: cmp r4, 0x4 bls _0802C97C movs r4, 0 - ldr r5, _0802C9B8 + ldr r5, =0x082fbe30 _0802C98E: adds r0, r5, 0 bl gpu_pal_obj_alloc_tag_and_apply @@ -92271,8 +90140,7 @@ _0802C98E: pop {r0} bx r0 .align 2, 0 -_0802C9B4: .4byte 0x082fbe08 -_0802C9B8: .4byte 0x082fbe30 + .pool thumb_func_end sub_802C974 thumb_func_start sub_802C9BC @@ -92311,7 +90179,7 @@ sub_802C9D4: @ 802C9D4 lsls r0, 24 lsrs r6, r0, 24 mov r1, sp - ldr r0, _0802CA28 + ldr r0, =0x082fbe40 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2-r4} @@ -92332,7 +90200,7 @@ sub_802C9D4: @ 802C9D4 movs r0, 0x3 b _0802CA32 .align 2, 0 -_0802CA28: .4byte 0x082fbe40 + .pool _0802CA2C: adds r0, r6, 0x4 lsls r0, 24 @@ -92347,7 +90215,7 @@ _0802CA32: beq _0802CAF4 ldrh r2, [r7] lsls r0, r2, 3 - ldr r1, _0802CAE0 + ldr r1, =0x08301418 adds r0, r1 ldr r3, [r7, 0x8] mov r1, r8 @@ -92356,7 +90224,7 @@ _0802CA32: str r3, [sp, 0x18] adds r4, r6, 0 add r0, sp, 0x18 - ldr r5, _0802CAE4 + ldr r5, =0xffff0000 lsls r1, r4, 16 movs r2, 0x80 lsls r2, 4 @@ -92401,16 +90269,16 @@ _0802CA32: cmp r1, 0x40 beq _0802CAF4 lsls r0, r6, 2 - ldr r2, _0802CAE8 + ldr r2, =0x000081a8 add r2, r9 adds r2, r0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0802CAEC + ldr r1, =0x02020630 adds r0, r1 str r0, [r2] - ldr r0, _0802CAF0 + ldr r0, =0x000081fc add r0, r9 adds r0, r6 add r1, sp, 0x30 @@ -92418,14 +90286,10 @@ _0802CA32: strb r1, [r0] b _0802CB00 .align 2, 0 -_0802CAE0: .4byte 0x08301418 -_0802CAE4: .4byte 0xffff0000 -_0802CAE8: .4byte 0x000081a8 -_0802CAEC: .4byte 0x02020630 -_0802CAF0: .4byte 0x000081fc + .pool _0802CAF4: lsls r0, r6, 2 - ldr r1, _0802CB10 + ldr r1, =0x000081a8 add r1, r9 adds r1, r0 movs r0, 0 @@ -92440,7 +90304,7 @@ _0802CB00: pop {r0} bx r0 .align 2, 0 -_0802CB10: .4byte 0x000081a8 + .pool thumb_func_end sub_802C9D4 thumb_func_start sub_802CB14 @@ -92448,17 +90312,17 @@ sub_802CB14: @ 802CB14 push {r4-r6,lr} adds r4, r0, 0 lsls r6, r1, 2 - ldr r0, _0802CB6C + ldr r0, =0x000081bc adds r5, r4, r0 adds r5, r6 ldr r0, [r5] bl sub_802C9BC ldr r2, [r5] - ldr r0, _0802CB70 + ldr r0, =0x000081a8 adds r4, r0 adds r4, r6 ldr r1, [r4] - ldr r0, _0802CB74 + ldr r0, =0x02020630 subs r1, r0 lsls r0, r1, 4 subs r0, r1 @@ -92480,7 +90344,7 @@ sub_802CB14: @ 802CB14 movs r0, 0x60 strh r0, [r1, 0x22] ldr r0, [r5] - ldr r1, _0802CB78 + ldr r1, =sub_802CB7C + 1 str r1, [r0, 0x1C] movs r1, 0x1 bl obj_anim_image_start @@ -92488,10 +90352,7 @@ sub_802CB14: @ 802CB14 pop {r0} bx r0 .align 2, 0 -_0802CB6C: .4byte 0x000081bc -_0802CB70: .4byte 0x000081a8 -_0802CB74: .4byte 0x02020630 -_0802CB78: .4byte sub_802CB7C + 1 + .pool thumb_func_end sub_802CB14 thumb_func_start sub_802CB7C @@ -92552,24 +90413,24 @@ _0802CBD6: movs r1, 0x4 orrs r0, r1 strb r0, [r3] - ldr r0, _0802CBEC + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _0802CBE6: pop {r0} bx r0 .align 2, 0 -_0802CBEC: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_802CB7C thumb_func_start sub_802CBF0 sub_802CBF0: @ 802CBF0 push {lr} lsls r1, 2 - ldr r2, _0802CC10 + ldr r2, =0x000081a8 adds r0, r2 adds r0, r1 ldr r2, [r0] - ldr r1, _0802CC14 + ldr r1, =sub_802CC40 + 1 str r1, [r2, 0x1C] movs r1, 0 strh r1, [r2, 0x26] @@ -92578,8 +90439,7 @@ sub_802CBF0: @ 802CBF0 pop {r0} bx r0 .align 2, 0 -_0802CC10: .4byte 0x000081a8 -_0802CC14: .4byte sub_802CC40 + 1 + .pool thumb_func_end sub_802CBF0 thumb_func_start sub_802CC18 @@ -92587,12 +90447,12 @@ sub_802CC18: @ 802CC18 push {lr} movs r2, 0 lsls r1, 2 - ldr r3, _0802CC38 + ldr r3, =0x000081a8 adds r0, r3 adds r0, r1 ldr r0, [r0] ldr r1, [r0, 0x1C] - ldr r0, _0802CC3C + ldr r0, =sub_802CC40 + 1 cmp r1, r0 bne _0802CC30 movs r2, 0x1 @@ -92601,8 +90461,7 @@ _0802CC30: pop {r1} bx r1 .align 2, 0 -_0802CC38: .4byte 0x000081a8 -_0802CC3C: .4byte sub_802CC40 + 1 + .pool thumb_func_end sub_802CC18 thumb_func_start sub_802CC40 @@ -92626,7 +90485,7 @@ sub_802CC40: @ 802CC40 movs r0, 0x2 b _0802CC66 _0802CC64: - ldr r0, _0802CC80 + ldr r0, =0x0000fffe _0802CC66: strh r0, [r2, 0x26] movs r0, 0 @@ -92638,14 +90497,13 @@ _0802CC6C: ble _0802CC7C movs r0, 0 strh r0, [r2, 0x26] - ldr r0, _0802CC84 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _0802CC7C: pop {r0} bx r0 .align 2, 0 -_0802CC80: .4byte 0x0000fffe -_0802CC84: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_802CC40 thumb_func_start sub_802CC88 @@ -92653,20 +90511,19 @@ sub_802CC88: @ 802CC88 push {r4,lr} adds r4, r0, 0 lsls r1, 2 - ldr r0, _0802CCA8 + ldr r0, =0x000081a8 adds r4, r0 adds r4, r1 ldr r0, [r4] bl sub_802C9BC ldr r1, [r4] - ldr r0, _0802CCAC + ldr r0, =sub_802CD08 + 1 str r0, [r1, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0802CCA8: .4byte 0x000081a8 -_0802CCAC: .4byte sub_802CD08 + 1 + .pool thumb_func_end sub_802CC88 thumb_func_start sub_802CCB0 @@ -92681,10 +90538,10 @@ sub_802CCB0: @ 802CCB0 movs r1, 0x5 negs r1, r1 mov r12, r1 - ldr r1, _0802CCFC + ldr r1, =0x000081a8 adds r3, r4, r1 - ldr r7, _0802CD00 - ldr r6, _0802CD04 + ldr r7, =sub_802CD08 + 1 + ldr r6, =nullsub_12 + 1 movs r5, 0xA adds r4, r0, 0 _0802CCD2: @@ -92711,9 +90568,7 @@ _0802CCF4: pop {r0} bx r0 .align 2, 0 -_0802CCFC: .4byte 0x000081a8 -_0802CD00: .4byte sub_802CD08 + 1 -_0802CD04: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_802CCB0 thumb_func_start sub_802CD08 @@ -92756,7 +90611,7 @@ sub_802CD3C: @ 802CD3C movs r2, 0 cmp r2, r3 bge _0802CD66 - ldr r0, _0802CD6C + ldr r0, =0x000081fc adds r5, r4, r0 subs r0, 0x54 adds r4, r0 @@ -92774,7 +90629,7 @@ _0802CD66: pop {r0} bx r0 .align 2, 0 -_0802CD6C: .4byte 0x000081fc + .pool thumb_func_end sub_802CD3C thumb_func_start sub_802CD70 @@ -92782,20 +90637,19 @@ sub_802CD70: @ 802CD70 push {r4,lr} adds r4, r0, 0 lsls r1, 2 - ldr r0, _0802CD90 + ldr r0, =0x000081a8 adds r4, r0 adds r4, r1 ldr r0, [r4] bl sub_802C9BC ldr r1, [r4] - ldr r0, _0802CD94 + ldr r0, =sub_802CDD4 + 1 str r0, [r1, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0802CD90: .4byte 0x000081a8 -_0802CD94: .4byte sub_802CDD4 + 1 + .pool thumb_func_end sub_802CD70 thumb_func_start sub_802CD98 @@ -92808,8 +90662,8 @@ sub_802CD98: @ 802CD98 movs r2, 0 cmp r2, r3 bge _0802CDCC - ldr r5, _0802CDBC - ldr r0, _0802CDC0 + ldr r5, =sub_802CDD4 + 1 + ldr r0, =0x000081a8 adds r1, r4, r0 _0802CDB0: ldr r0, [r1] @@ -92819,8 +90673,7 @@ _0802CDB0: movs r0, 0x1 b _0802CDCE .align 2, 0 -_0802CDBC: .4byte sub_802CDD4 + 1 -_0802CDC0: .4byte 0x000081a8 + .pool _0802CDC4: adds r1, 0x4 adds r2, 0x1 @@ -92863,7 +90716,7 @@ _0802CDF4: movs r0, 0 strh r0, [r5, 0x30] _0802CE06: - ldr r1, _0802CE34 + ldr r1, =0x08329f40 movs r2, 0x30 ldrsh r0, [r5, r2] lsls r0, 1 @@ -92887,16 +90740,16 @@ _0802CE06: strh r1, [r5, 0x2E] b _0802CE3C .align 2, 0 -_0802CE34: .4byte 0x08329f40 + .pool _0802CE38: - ldr r0, _0802CE44 + ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] _0802CE3C: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0802CE44: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_802CDD4 thumb_func_start sub_802CE48 @@ -92905,7 +90758,7 @@ sub_802CE48: @ 802CE48 adds r5, r0, 0 lsls r3, 24 lsrs r4, r3, 24 - ldr r0, _0802CE90 + ldr r0, =0x082fc00c lsls r1, 16 asrs r1, 16 lsls r2, 16 @@ -92916,7 +90769,7 @@ sub_802CE48: @ 802CE48 lsrs r2, r0, 24 cmp r2, 0x40 beq _0802CE88 - ldr r0, _0802CE94 + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -92928,7 +90781,7 @@ sub_802CE48: @ 802CE48 orrs r0, r2 strb r0, [r3] lsls r2, r4, 2 - ldr r3, _0802CE98 + ldr r3, =0x000081bc adds r0, r5, r3 adds r0, r2 str r1, [r0] @@ -92937,9 +90790,7 @@ _0802CE88: pop {r0} bx r0 .align 2, 0 -_0802CE90: .4byte 0x082fc00c -_0802CE94: .4byte 0x02020630 -_0802CE98: .4byte 0x000081bc + .pool thumb_func_end sub_802CE48 thumb_func_start sub_802CE9C @@ -92948,13 +90799,13 @@ sub_802CE9C: @ 802CE9C adds r7, r0, 0 movs r5, 0 movs r4, 0 - ldr r6, _0802CF3C + ldr r6, =0x082fbe58 _0802CEA6: - ldr r1, _0802CF40 + ldr r1, =0x082fbeb8 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] - ldr r2, _0802CF44 + ldr r2, =0x082fbea8 lsls r1, r5, 1 adds r1, r2 movs r2, 0 @@ -92966,13 +90817,13 @@ _0802CEA6: lsls r0, 24 lsrs r1, r0, 24 lsls r0, r5, 2 - ldr r3, _0802CF48 + ldr r3, =0x000081d0 adds r2, r7, r3 adds r2, r0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0802CF4C + ldr r1, =0x02020630 adds r0, r1 str r0, [r2] adds r5, 0x1 @@ -92983,16 +90834,16 @@ _0802CEA6: movs r4, 0x3 movs r6, 0x3C _0802CEE8: - ldr r1, _0802CF40 + ldr r1, =0x082fbeb8 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] - ldr r2, _0802CF44 + ldr r2, =0x082fbea8 lsls r1, r5, 1 adds r1, r2 movs r2, 0 ldrsh r1, [r1, r2] - ldr r2, _0802CF3C + ldr r2, =0x082fbe58 adds r2, r6, r2 movs r3, 0 ldrsh r2, [r2, r3] @@ -93001,13 +90852,13 @@ _0802CEE8: lsls r0, 24 lsrs r1, r0, 24 lsls r0, r5, 2 - ldr r3, _0802CF48 + ldr r3, =0x000081d0 adds r2, r7, r3 adds r2, r0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0802CF4C + ldr r1, =0x02020630 adds r0, r1 str r0, [r2] adds r0, 0x3F @@ -93024,11 +90875,7 @@ _0802CEE8: pop {r0} bx r0 .align 2, 0 -_0802CF3C: .4byte 0x082fbe58 -_0802CF40: .4byte 0x082fbeb8 -_0802CF44: .4byte 0x082fbea8 -_0802CF48: .4byte 0x000081d0 -_0802CF4C: .4byte 0x02020630 + .pool thumb_func_end sub_802CE9C thumb_func_start sub_802CF50 @@ -93062,7 +90909,7 @@ _0802CF78: mov r9, r0 lsls r1, 24 mov r8, r1 - ldr r0, _0802D03C + ldr r0, =0x082fbe58 adds r4, r2, r0 ldr r3, [sp] lsls r3, 2 @@ -93071,7 +90918,7 @@ _0802CF78: _0802CF92: lsls r0, r6, 2 ldr r7, [sp, 0x8] - ldr r1, _0802D040 + ldr r1, =0x000081d0 adds r2, r7, r1 adds r2, r0 ldr r1, [r2] @@ -93103,7 +90950,7 @@ _0802CF92: cmp r5, 0 bge _0802CF92 movs r5, 0x3 - ldr r0, _0802D03C + ldr r0, =0x082fbe58 ldr r3, [sp, 0x4] adds r0, r3, r0 adds r4, r0, 0 @@ -93114,7 +90961,7 @@ _0802CF92: _0802CFE8: lsls r0, r6, 2 ldr r1, [sp, 0x8] - ldr r3, _0802D040 + ldr r3, =0x000081d0 adds r2, r1, r3 adds r2, r0 ldr r1, [r2] @@ -93154,8 +91001,7 @@ _0802CFE8: pop {r0} bx r0 .align 2, 0 -_0802D03C: .4byte 0x082fbe58 -_0802D040: .4byte 0x000081d0 + .pool thumb_func_end sub_802CF50 thumb_func_start sub_802D044 @@ -93189,10 +91035,10 @@ sub_802D068: @ 802D068 thumb_func_start sub_802D074 sub_802D074: @ 802D074 push {r4,lr} - ldr r4, _0802D0A0 + ldr r4, =0x02022d00 str r0, [r4] bl sub_802D0BC - ldr r0, _0802D0A4 + ldr r0, =sub_802D12C + 1 movs r1, 0x3 bl AddTask ldr r1, [r4] @@ -93201,15 +91047,13 @@ sub_802D074: @ 802D074 ldrb r0, [r2, 0x6] movs r1, 0x2 bl set_word_task_arg - ldr r0, _0802D0A8 + ldr r0, =sub_802D150 + 1 bl sub_802D108 pop {r4} pop {r0} bx r0 .align 2, 0 -_0802D0A0: .4byte 0x02022d00 -_0802D0A4: .4byte sub_802D12C + 1 -_0802D0A8: .4byte sub_802D150 + 1 + .pool thumb_func_end sub_802D074 thumb_func_start sub_802D0AC @@ -93236,7 +91080,7 @@ sub_802D0C8: @ 802D0C8 push {r4-r6,lr} adds r6, r0, 0 movs r5, 0 - ldr r4, _0802D0EC + ldr r4, =0x082fe18c _0802D0D0: ldr r0, [r4] cmp r0, r6 @@ -93252,12 +91096,12 @@ _0802D0DC: pop {r0} bx r0 .align 2, 0 -_0802D0EC: .4byte 0x082fe18c + .pool thumb_func_end sub_802D0C8 thumb_func_start sub_802D0F0 sub_802D0F0: @ 802D0F0 - ldr r0, _0802D104 + ldr r0, =0x02022d00 ldr r0, [r0] ldr r1, [r0] movs r0, 0x1 @@ -93267,14 +91111,14 @@ sub_802D0F0: @ 802D0F0 lsrs r0, 31 bx lr .align 2, 0 -_0802D104: .4byte 0x02022d00 + .pool thumb_func_end sub_802D0F0 thumb_func_start sub_802D108 sub_802D108: @ 802D108 push {r4,lr} adds r2, r0, 0 - ldr r4, _0802D128 + ldr r4, =0x02022d00 ldr r0, [r4] ldrb r0, [r0, 0x6] movs r1, 0 @@ -93287,7 +91131,7 @@ sub_802D108: @ 802D108 pop {r0} bx r0 .align 2, 0 -_0802D128: .4byte 0x02022d00 + .pool thumb_func_end sub_802D108 thumb_func_start sub_802D12C @@ -93295,7 +91139,7 @@ sub_802D12C: @ 802D12C push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0802D14C + ldr r0, =0x02022d00 ldr r0, [r0] ldr r0, [r0] cmp r0, 0 @@ -93308,14 +91152,14 @@ _0802D148: pop {r0} bx r0 .align 2, 0 -_0802D14C: .4byte 0x02022d00 + .pool thumb_func_end sub_802D12C thumb_func_start sub_802D150 sub_802D150: @ 802D150 push {r4-r6,lr} sub sp, 0x8 - ldr r6, _0802D16C + ldr r6, =0x02022d00 ldr r1, [r6] ldrh r5, [r1, 0x4] cmp r5, 0x1 @@ -93328,7 +91172,7 @@ _0802D160: beq _0802D178 b _0802D2DA .align 2, 0 -_0802D16C: .4byte 0x02022d00 + .pool _0802D170: cmp r5, 0x2 bne _0802D176 @@ -93338,66 +91182,66 @@ _0802D176: _0802D178: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0802D268 + ldr r1, =0x082fe164 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r0, _0802D26C + ldr r0, =0x082fe174 bl Window_InitFromTemplates bl reset_temp_tile_data_buffers ldr r0, [r6] bl sub_802C974 bl sub_802DD08 - ldr r0, _0802D270 + ldr r0, =0x082fc044 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _0802D274 + ldr r1, =0x082fc064 str r5, [sp] movs r0, 0x3 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _0802D278 + ldr r1, =0x082fc290 movs r4, 0x1 str r4, [sp] movs r0, 0x3 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r0, _0802D27C + ldr r0, =0x082fc440 movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _0802D280 + ldr r1, =0x082fc460 str r5, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _0802D284 + ldr r1, =0x082fcdb0 str r4, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r0, _0802D288 + ldr r0, =0x082fd168 movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _0802D28C + ldr r1, =0x082fd188 str r5, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _0802D290 + ldr r1, =0x082fdc38 str r4, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r0, _0802D294 + ldr r0, =0x082fc024 movs r1, 0x20 movs r2, 0x20 bl gpu_pal_apply @@ -93431,18 +91275,7 @@ _0802D178: bl sub_8199D98 b _0802D2CC .align 2, 0 -_0802D268: .4byte 0x082fe164 -_0802D26C: .4byte 0x082fe174 -_0802D270: .4byte 0x082fc044 -_0802D274: .4byte 0x082fc064 -_0802D278: .4byte 0x082fc290 -_0802D27C: .4byte 0x082fc440 -_0802D280: .4byte 0x082fc460 -_0802D284: .4byte 0x082fcdb0 -_0802D288: .4byte 0x082fd168 -_0802D28C: .4byte 0x082fd188 -_0802D290: .4byte 0x082fdc38 -_0802D294: .4byte 0x082fc024 + .pool _0802D298: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -93481,7 +91314,7 @@ _0802D2DA: thumb_func_start sub_802D2E4 sub_802D2E4: @ 802D2E4 push {r4,lr} - ldr r4, _0802D2FC + ldr r4, =0x02022d00 ldr r0, [r4] ldrh r0, [r0, 0x4] cmp r0, 0x1 @@ -93492,7 +91325,7 @@ sub_802D2E4: @ 802D2E4 beq _0802D30A b _0802D34A .align 2, 0 -_0802D2FC: .4byte 0x02022d00 + .pool _0802D300: cmp r0, 0x2 beq _0802D322 @@ -93539,7 +91372,7 @@ _0802D34A: thumb_func_start sub_802D350 sub_802D350: @ 802D350 push {r4,lr} - ldr r4, _0802D368 + ldr r4, =0x02022d00 ldr r0, [r4] ldrh r0, [r0, 0x4] cmp r0, 0x1 @@ -93550,7 +91383,7 @@ sub_802D350: @ 802D350 beq _0802D376 b _0802D3B6 .align 2, 0 -_0802D368: .4byte 0x02022d00 + .pool _0802D36C: cmp r0, 0x2 beq _0802D38E @@ -93600,7 +91433,7 @@ sub_802D3BC: @ 802D3BC bl sub_802C8AC lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _0802D3D8 + ldr r0, =0x02022d00 ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0 @@ -93609,13 +91442,13 @@ sub_802D3BC: @ 802D3BC beq _0802D410 b _0802D43E .align 2, 0 -_0802D3D8: .4byte 0x02022d00 + .pool _0802D3DC: movs r4, 0 cmp r4, r5 bge _0802D3F8 _0802D3E2: - ldr r0, _0802D40C + ldr r0, =0x02022d00 ldr r0, [r0] lsls r1, r4, 1 adds r0, 0x1C @@ -93628,14 +91461,14 @@ _0802D3E2: _0802D3F8: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _0802D40C + ldr r0, =0x02022d00 ldr r1, [r0] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] b _0802D43E .align 2, 0 -_0802D40C: .4byte 0x02022d00 + .pool _0802D410: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -93645,7 +91478,7 @@ _0802D410: cmp r4, r5 bge _0802D436 _0802D420: - ldr r0, _0802D444 + ldr r0, =0x02022d00 ldr r0, [r0] lsls r1, r4, 1 adds r0, 0x1C @@ -93656,7 +91489,7 @@ _0802D420: cmp r4, r5 blt _0802D420 _0802D436: - ldr r0, _0802D444 + ldr r0, =0x02022d00 ldr r1, [r0] movs r0, 0x1 str r0, [r1] @@ -93665,14 +91498,14 @@ _0802D43E: pop {r0} bx r0 .align 2, 0 -_0802D444: .4byte 0x02022d00 + .pool thumb_func_end sub_802D3BC thumb_func_start sub_802D448 sub_802D448: @ 802D448 push {r4,r5,lr} sub sp, 0xC - ldr r5, _0802D460 + ldr r5, =0x02022d00 ldr r0, [r5] ldrh r4, [r0, 0x4] cmp r4, 0x1 @@ -93683,7 +91516,7 @@ sub_802D448: @ 802D448 beq _0802D46A b _0802D4EC .align 2, 0 -_0802D460: .4byte 0x02022d00 + .pool _0802D464: cmp r4, 0x2 beq _0802D4DC @@ -93698,7 +91531,7 @@ _0802D46A: strh r0, [r1, 0x12] lsls r0, 24 lsrs r0, 24 - ldr r2, _0802D4A0 + ldr r2, =0x085edf2a movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -93713,7 +91546,7 @@ _0802D46A: bl Window_CopyToVram b _0802D4D2 .align 2, 0 -_0802D4A0: .4byte 0x085edf2a + .pool _0802D4A4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -93758,7 +91591,7 @@ _0802D4EC: sub_802D4F4: @ 802D4F4 push {r4,r5,lr} sub sp, 0xC - ldr r5, _0802D50C + ldr r5, =0x02022d00 ldr r0, [r5] ldrh r4, [r0, 0x4] cmp r4, 0x1 @@ -93769,7 +91602,7 @@ sub_802D4F4: @ 802D4F4 beq _0802D516 b _0802D58E .align 2, 0 -_0802D50C: .4byte 0x02022d00 + .pool _0802D510: cmp r4, 0x2 beq _0802D57E @@ -93784,7 +91617,7 @@ _0802D516: strh r0, [r1, 0x12] lsls r0, 24 lsrs r0, 24 - ldr r2, _0802D54C + ldr r2, =0x082c8959 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -93799,7 +91632,7 @@ _0802D516: bl Window_CopyToVram b _0802D574 .align 2, 0 -_0802D54C: .4byte 0x082c8959 + .pool _0802D550: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -93839,7 +91672,7 @@ _0802D58E: thumb_func_start sub_802D598 sub_802D598: @ 802D598 push {r4,r5,lr} - ldr r5, _0802D5AC + ldr r5, =0x02022d00 ldr r0, [r5] ldrh r4, [r0, 0x4] cmp r4, 0 @@ -93848,7 +91681,7 @@ sub_802D598: @ 802D598 beq _0802D5C8 b _0802D5DE .align 2, 0 -_0802D5AC: .4byte 0x02022d00 + .pool _0802D5B0: bl sub_802DA14 bl sub_8198C78 @@ -93879,7 +91712,7 @@ _0802D5DE: sub_802D5E4: @ 802D5E4 push {r4,r5,lr} sub sp, 0xC - ldr r5, _0802D5FC + ldr r5, =0x02022d00 ldr r0, [r5] ldrh r4, [r0, 0x4] cmp r4, 0x1 @@ -93890,7 +91723,7 @@ sub_802D5E4: @ 802D5E4 beq _0802D606 b _0802D67E .align 2, 0 -_0802D5FC: .4byte 0x02022d00 + .pool _0802D600: cmp r4, 0x2 beq _0802D66E @@ -93905,7 +91738,7 @@ _0802D606: strh r0, [r1, 0x12] lsls r0, 24 lsrs r0, 24 - ldr r2, _0802D63C + ldr r2, =0x085edf3e movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -93920,7 +91753,7 @@ _0802D606: bl Window_CopyToVram b _0802D664 .align 2, 0 -_0802D63C: .4byte 0x085edf3e + .pool _0802D640: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -93961,7 +91794,7 @@ _0802D67E: sub_802D688: @ 802D688 push {r4,r5,lr} sub sp, 0xC - ldr r5, _0802D6A0 + ldr r5, =0x02022d00 ldr r0, [r5] ldrh r4, [r0, 0x4] cmp r4, 0x1 @@ -93972,7 +91805,7 @@ sub_802D688: @ 802D688 beq _0802D6AA b _0802D722 .align 2, 0 -_0802D6A0: .4byte 0x02022d00 + .pool _0802D6A4: cmp r4, 0x2 beq _0802D712 @@ -93987,7 +91820,7 @@ _0802D6AA: strh r0, [r1, 0x12] lsls r0, 24 lsrs r0, 24 - ldr r2, _0802D6E0 + ldr r2, =0x085edf6f movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -94002,7 +91835,7 @@ _0802D6AA: bl Window_CopyToVram b _0802D708 .align 2, 0 -_0802D6E0: .4byte 0x085edf6f + .pool _0802D6E4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -94042,7 +91875,7 @@ _0802D722: thumb_func_start sub_802D72C sub_802D72C: @ 802D72C push {r4,r5,lr} - ldr r5, _0802D740 + ldr r5, =0x02022d00 ldr r0, [r5] ldrh r4, [r0, 0x4] cmp r4, 0 @@ -94051,7 +91884,7 @@ sub_802D72C: @ 802D72C beq _0802D752 b _0802D75E .align 2, 0 -_0802D740: .4byte 0x02022d00 + .pool _0802D744: bl sub_802D044 ldr r1, [r5] @@ -94074,7 +91907,7 @@ _0802D75E: thumb_func_start sub_802D764 sub_802D764: @ 802D764 push {lr} - ldr r1, _0802D784 + ldr r1, =0x02022d00 ldr r0, [r1] movs r2, 0 strb r2, [r0, 0xA] @@ -94089,13 +91922,13 @@ sub_802D764: @ 802D764 pop {r0} bx r0 .align 2, 0 -_0802D784: .4byte 0x02022d00 + .pool thumb_func_end sub_802D764 thumb_func_start sub_802D788 sub_802D788: @ 802D788 push {r4,lr} - ldr r0, _0802D79C + ldr r0, =0x02022d00 ldr r2, [r0] ldrb r3, [r2, 0xA] adds r4, r0, 0 @@ -94105,7 +91938,7 @@ sub_802D788: @ 802D788 beq _0802D7DA b _0802D7DE .align 2, 0 -_0802D79C: .4byte 0x02022d00 + .pool _0802D7A0: ldrb r0, [r2, 0xB] adds r0, 0x1 @@ -94156,7 +91989,7 @@ sub_802D7E8: @ 802D7E8 lsrs r0, 16 lsls r4, 16 lsrs r4, 16 - ldr r5, _0802D878 + ldr r5, =0x02022d00 ldr r1, [r5] adds r1, 0x26 adds r2, r4, 0 @@ -94178,7 +92011,7 @@ sub_802D7E8: @ 802D7E8 bl sub_81AFC0C ldr r0, [r5] adds r0, 0xA6 - ldr r1, _0802D87C + ldr r1, =0x085eded3 bl sub_81AFC28 movs r0, 0x4 movs r1, 0x8 @@ -94204,7 +92037,7 @@ sub_802D7E8: @ 802D7E8 movs r1, 0x2 bl Window_CopyToVram ldr r1, [r5] - ldr r0, _0802D880 + ldr r0, =0x0000016f strh r0, [r1, 0x14] strb r4, [r1, 0xD] add sp, 0xC @@ -94212,9 +92045,7 @@ sub_802D7E8: @ 802D7E8 pop {r0} bx r0 .align 2, 0 -_0802D878: .4byte 0x02022d00 -_0802D87C: .4byte 0x085eded3 -_0802D880: .4byte 0x0000016f + .pool thumb_func_end sub_802D7E8 thumb_func_start sub_802D884 @@ -94223,7 +92054,7 @@ sub_802D884: @ 802D884 sub sp, 0xC lsls r0, 16 lsrs r0, 16 - ldr r4, _0802D8F4 + ldr r4, =0x02022d00 ldr r1, [r4] adds r1, 0x26 bl itemid_get_name @@ -94234,7 +92065,7 @@ sub_802D884: @ 802D884 bl sub_81AFC0C ldr r0, [r4] adds r0, 0xA6 - ldr r1, _0802D8F8 + ldr r1, =0x085edef4 bl sub_81AFC28 movs r0, 0x4 movs r1, 0x8 @@ -94268,8 +92099,7 @@ sub_802D884: @ 802D884 pop {r0} bx r0 .align 2, 0 -_0802D8F4: .4byte 0x02022d00 -_0802D8F8: .4byte 0x085edef4 + .pool thumb_func_end sub_802D884 thumb_func_start sub_802D8FC @@ -94278,7 +92108,7 @@ sub_802D8FC: @ 802D8FC sub sp, 0xC lsls r0, 16 lsrs r0, 16 - ldr r4, _0802D96C + ldr r4, =0x02022d00 ldr r1, [r4] adds r1, 0x26 bl itemid_get_name @@ -94289,7 +92119,7 @@ sub_802D8FC: @ 802D8FC bl sub_81AFC0C ldr r0, [r4] adds r0, 0xA6 - ldr r1, _0802D970 + ldr r1, =0x085edf11 bl sub_81AFC28 movs r0, 0x4 movs r1, 0x9 @@ -94323,14 +92153,13 @@ sub_802D8FC: @ 802D8FC pop {r0} bx r0 .align 2, 0 -_0802D96C: .4byte 0x02022d00 -_0802D970: .4byte 0x085edf11 + .pool thumb_func_end sub_802D8FC thumb_func_start sub_802D974 sub_802D974: @ 802D974 push {r4,lr} - ldr r4, _0802D98C + ldr r4, =0x02022d00 ldr r0, [r4] ldrb r0, [r0, 0xD] cmp r0, 0x1 @@ -94341,7 +92170,7 @@ sub_802D974: @ 802D974 beq _0802D99A b _0802DA0C .align 2, 0 -_0802D98C: .4byte 0x02022d00 + .pool _0802D990: cmp r0, 0x2 beq _0802D9EE @@ -94392,7 +92221,7 @@ _0802D9EE: lsls r0, 24 cmp r0, 0 beq _0802DA0C - ldr r0, _0802DA08 + ldr r0, =0x02022d00 ldr r1, [r0] ldrb r0, [r1, 0xD] adds r0, 0x1 @@ -94402,7 +92231,7 @@ _0802DA02: movs r0, 0 b _0802DA0E .align 2, 0 -_0802DA08: .4byte 0x02022d00 + .pool _0802DA0C: movs r0, 0x1 _0802DA0E: @@ -94414,7 +92243,7 @@ _0802DA0E: thumb_func_start sub_802DA14 sub_802DA14: @ 802DA14 push {r4,lr} - ldr r4, _0802DA40 + ldr r4, =0x02022d00 ldr r0, [r4] ldrh r0, [r0, 0x12] cmp r0, 0xFF @@ -94434,13 +92263,13 @@ _0802DA38: pop {r0} bx r0 .align 2, 0 -_0802DA40: .4byte 0x02022d00 + .pool thumb_func_end sub_802DA14 thumb_func_start sub_802DA44 sub_802DA44: @ 802DA44 push {r4,lr} - ldr r4, _0802DA54 + ldr r4, =0x02022d00 ldr r1, [r4] ldrh r0, [r1, 0x12] cmp r0, 0xFF @@ -94449,7 +92278,7 @@ _0802DA50: movs r0, 0 b _0802DA84 .align 2, 0 -_0802DA54: .4byte 0x02022d00 + .pool _0802DA58: ldrb r0, [r1, 0xD] cmp r0, 0 @@ -94493,21 +92322,21 @@ sub_802DA8C: @ 802DA8C sub_802DA9C: @ 802DA9C push {r4-r6,lr} sub sp, 0x8 - ldr r6, _0802DB04 + ldr r6, =0xffffff00 ldr r4, [sp] ands r4, r6 lsls r0, 24 lsrs r0, 16 - ldr r5, _0802DB08 + ldr r5, =0xffff00ff ands r4, r5 orrs r4, r0 lsls r1, 24 lsrs r1, 8 - ldr r0, _0802DB0C + ldr r0, =0xff00ffff ands r4, r0 orrs r4, r1 lsls r2, 24 - ldr r0, _0802DB10 + ldr r0, =0x00ffffff ands r4, r0 orrs r4, r2 str r4, [sp] @@ -94520,7 +92349,7 @@ sub_802DA9C: @ 802DA9C movs r1, 0xF0 lsls r1, 4 orrs r0, r1 - ldr r1, _0802DB14 + ldr r1, =0x0000ffff ands r0, r1 movs r1, 0x86 lsls r1, 15 @@ -94541,11 +92370,7 @@ sub_802DA9C: @ 802DA9C pop {r1} bx r1 .align 2, 0 -_0802DB04: .4byte 0xffffff00 -_0802DB08: .4byte 0xffff00ff -_0802DB0C: .4byte 0xff00ffff -_0802DB10: .4byte 0x00ffffff -_0802DB14: .4byte 0x0000ffff + .pool thumb_func_end sub_802DA9C thumb_func_start sub_802DB18 @@ -94555,20 +92380,20 @@ sub_802DB18: @ 802DB18 adds r3, r2, 0 lsls r3, 24 lsrs r3, 24 - ldr r5, _0802DB78 + ldr r5, =0xffffff00 ldr r2, [sp] ands r2, r5 lsls r0, 24 lsrs r0, 16 - ldr r4, _0802DB7C + ldr r4, =0xffff00ff ands r2, r4 orrs r2, r0 lsls r1, 24 lsrs r1, 8 - ldr r0, _0802DB80 + ldr r0, =0xff00ffff ands r2, r0 orrs r2, r1 - ldr r0, _0802DB84 + ldr r0, =0x00ffffff ands r2, r0 movs r0, 0xC0 lsls r0, 19 @@ -94582,7 +92407,7 @@ sub_802DB18: @ 802DB18 movs r1, 0x80 lsls r1, 2 orrs r0, r1 - ldr r1, _0802DB88 + ldr r1, =0x0000ffff ands r0, r1 movs r1, 0xAC lsls r1, 14 @@ -94597,18 +92422,14 @@ sub_802DB18: @ 802DB18 pop {r0} bx r0 .align 2, 0 -_0802DB78: .4byte 0xffffff00 -_0802DB7C: .4byte 0xffff00ff -_0802DB80: .4byte 0xff00ffff -_0802DB84: .4byte 0x00ffffff -_0802DB88: .4byte 0x0000ffff + .pool thumb_func_end sub_802DB18 thumb_func_start sub_802DB8C sub_802DB8C: @ 802DB8C push {r4,lr} sub sp, 0x10 - ldr r1, _0802DBEC + ldr r1, =0x082fe1dc add r0, sp, 0xC movs r2, 0x3 bl memcpy @@ -94626,7 +92447,7 @@ sub_802DB8C: @ 802DB8C str r0, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, _0802DBF0 + ldr r0, =0x085ede7c str r0, [sp, 0x8] movs r0, 0 movs r1, 0 @@ -94636,7 +92457,7 @@ sub_802DB8C: @ 802DB8C add r0, sp, 0xC str r0, [sp] str r4, [sp, 0x4] - ldr r0, _0802DBF4 + ldr r0, =0x085ede84 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0 @@ -94648,9 +92469,7 @@ sub_802DB8C: @ 802DB8C pop {r0} bx r0 .align 2, 0 -_0802DBEC: .4byte 0x082fe1dc -_0802DBF0: .4byte 0x085ede7c -_0802DBF4: .4byte 0x085ede84 + .pool thumb_func_end sub_802DB8C thumb_func_start sub_802DBF8 @@ -94665,7 +92484,7 @@ sub_802DBF8: @ 802DBF8 lsls r0, 16 lsrs r0, 16 mov r10, r0 - ldr r1, _0802DC74 + ldr r1, =0x082fe260 subs r0, 0x2 lsls r0, 2 adds r0, r1 @@ -94673,9 +92492,9 @@ sub_802DBF8: @ 802DBF8 movs r6, 0 cmp r6, r10 bge _0802DC62 - ldr r0, _0802DC78 + ldr r0, =0x08300d38 mov r9, r0 - ldr r1, _0802DC7C + ldr r1, =0x02022d00 mov r8, r1 _0802DC26: lsls r4, r6, 24 @@ -94715,36 +92534,33 @@ _0802DC62: pop {r0} bx r0 .align 2, 0 -_0802DC74: .4byte 0x082fe260 -_0802DC78: .4byte 0x08300d38 -_0802DC7C: .4byte 0x02022d00 + .pool thumb_func_end sub_802DBF8 thumb_func_start sub_802DC80 sub_802DC80: @ 802DC80 - ldr r2, _0802DC94 + ldr r2, =0x02022d00 ldr r2, [r2] lsls r0, 2 - ldr r3, _0802DC98 + ldr r3, =0x000081a8 adds r2, r3 adds r2, r0 ldr r0, [r2] strh r1, [r0, 0x26] bx lr .align 2, 0 -_0802DC94: .4byte 0x02022d00 -_0802DC98: .4byte 0x000081a8 + .pool thumb_func_end sub_802DC80 thumb_func_start sub_802DC9C sub_802DC9C: @ 802DC9C push {r4,lr} adds r4, r0, 0 - ldr r0, _0802DCC4 + ldr r0, =0x02022d00 ldr r0, [r0] adds r1, r4, 0 bl sub_802CF50 - ldr r0, _0802DCC8 + ldr r0, =0x082fe1df adds r4, r0 ldrb r0, [r4] lsls r1, r0, 2 @@ -94757,8 +92573,7 @@ sub_802DC9C: @ 802DC9C pop {r0} bx r0 .align 2, 0 -_0802DCC4: .4byte 0x02022d00 -_0802DCC8: .4byte 0x082fe1df + .pool thumb_func_end sub_802DC9C thumb_func_start sub_802DCCC @@ -94773,7 +92588,7 @@ _0802DCD6: ands r0, r4 cmp r0, 0 beq _0802DCEA - ldr r0, _0802DD04 + ldr r0, =0x02022d00 ldr r0, [r0] adds r1, r5, 0 bl sub_802CB14 @@ -94792,7 +92607,7 @@ _0802DCEA: pop {r1} bx r1 .align 2, 0 -_0802DD04: .4byte 0x02022d00 + .pool thumb_func_end sub_802DCCC thumb_func_start sub_802DD08 @@ -94810,9 +92625,9 @@ sub_802DD08: @ 802DD08 strh r0, [r1, 0x4] movs r4, 0x6 strh r4, [r1, 0x6] - ldr r0, _0802DD5C + ldr r0, =0x082fe1ec str r0, [sp, 0x8] - ldr r0, _0802DD60 + ldr r0, =0x082fe1f4 str r0, [sp, 0xC] movs r0, 0x2 bl sub_8034C54 @@ -94836,8 +92651,7 @@ sub_802DD08: @ 802DD08 pop {r0} bx r0 .align 2, 0 -_0802DD5C: .4byte 0x082fe1ec -_0802DD60: .4byte 0x082fe1f4 + .pool thumb_func_end sub_802DD08 thumb_func_start sub_802DD64 @@ -94868,13 +92682,13 @@ sub_802DD88: @ 802DD88 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _0802DD9C + ldr r0, =0x02022d00 ldr r0, [r0] bl sub_802CBF0 pop {r0} bx r0 .align 2, 0 -_0802DD9C: .4byte 0x02022d00 + .pool thumb_func_end sub_802DD88 thumb_func_start sub_802DDA0 @@ -94883,75 +92697,75 @@ sub_802DDA0: @ 802DDA0 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _0802DDB4 + ldr r0, =0x02022d00 ldr r0, [r0] bl sub_802CC88 pop {r0} bx r0 .align 2, 0 -_0802DDB4: .4byte 0x02022d00 + .pool thumb_func_end sub_802DDA0 thumb_func_start sub_802DDB8 sub_802DDB8: @ 802DDB8 push {lr} adds r1, r0, 0 - ldr r0, _0802DDC8 + ldr r0, =0x02022d00 ldr r0, [r0] bl sub_802CC18 pop {r1} bx r1 .align 2, 0 -_0802DDC8: .4byte 0x02022d00 + .pool thumb_func_end sub_802DDB8 thumb_func_start sub_802DDCC sub_802DDCC: @ 802DDCC push {lr} - ldr r0, _0802DDDC + ldr r0, =0x02022d00 ldr r0, [r0] bl sub_802CCB0 pop {r0} bx r0 .align 2, 0 -_0802DDDC: .4byte 0x02022d00 + .pool thumb_func_end sub_802DDCC thumb_func_start sub_802DDE0 sub_802DDE0: @ 802DDE0 push {lr} - ldr r0, _0802DDF0 + ldr r0, =0x02022d00 ldr r0, [r0] bl sub_802CD3C pop {r0} bx r0 .align 2, 0 -_0802DDF0: .4byte 0x02022d00 + .pool thumb_func_end sub_802DDE0 thumb_func_start sub_802DDF4 sub_802DDF4: @ 802DDF4 push {lr} adds r1, r0, 0 - ldr r0, _0802DE04 + ldr r0, =0x02022d00 ldr r0, [r0] bl sub_802CD70 pop {r0} bx r0 .align 2, 0 -_0802DE04: .4byte 0x02022d00 + .pool thumb_func_end sub_802DDF4 thumb_func_start sub_802DE08 sub_802DE08: @ 802DE08 push {lr} - ldr r0, _0802DE18 + ldr r0, =0x02022d00 ldr r0, [r0] bl sub_802CD98 pop {r1} bx r1 .align 2, 0 -_0802DE18: .4byte 0x02022d00 + .pool thumb_func_end sub_802DE08 thumb_func_start sub_802DE1C @@ -94961,15 +92775,15 @@ sub_802DE1C: @ 802DE1C bl sub_802C8AC lsls r0, 16 lsrs r7, r0, 16 - ldr r1, _0802DEBC + ldr r1, =0x082fe234 subs r0, r7, 0x2 lsls r0, 2 adds r0, r1 ldr r4, [r0] - ldr r2, _0802DEC0 + ldr r2, =0xffffff00 ldr r0, [sp] ands r0, r2 - ldr r1, _0802DEC4 + ldr r1, =0x00ffffff ands r0, r1 movs r1, 0x80 lsls r1, 20 @@ -94979,12 +92793,12 @@ sub_802DE1C: @ 802DE1C ands r0, r2 movs r1, 0x2 orrs r0, r1 - ldr r1, _0802DEC8 + ldr r1, =0xffff00ff ands r0, r1 movs r1, 0x80 lsls r1, 2 orrs r0, r1 - ldr r1, _0802DECC + ldr r1, =0x0000ffff ands r0, r1 movs r1, 0xAC lsls r1, 14 @@ -94997,20 +92811,20 @@ sub_802DE1C: @ 802DE1C _0802DE6A: ldrb r0, [r4] lsls r0, 8 - ldr r2, _0802DEC8 + ldr r2, =0xffff00ff ldr r1, [sp] ands r1, r2 orrs r1, r0 str r1, [sp] ldrb r2, [r4, 0x2] lsls r2, 16 - ldr r0, _0802DED0 + ldr r0, =0xff00ffff ands r0, r1 orrs r0, r2 str r0, [sp] mov r0, sp bl Window_AddFromTemplate - ldr r1, _0802DED4 + ldr r1, =0x02022d00 ldr r1, [r1] lsls r2, r5, 1 adds r1, 0x1C @@ -95034,13 +92848,7 @@ _0802DEAC: pop {r0} bx r0 .align 2, 0 -_0802DEBC: .4byte 0x082fe234 -_0802DEC0: .4byte 0xffffff00 -_0802DEC4: .4byte 0x00ffffff -_0802DEC8: .4byte 0xffff00ff -_0802DECC: .4byte 0x0000ffff -_0802DED0: .4byte 0xff00ffff -_0802DED4: .4byte 0x02022d00 + .pool thumb_func_end sub_802DE1C thumb_func_start sub_802DED8 @@ -95059,7 +92867,7 @@ sub_802DED8: @ 802DED8 strb r1, [r0] strb r2, [r0, 0x1] strb r3, [r0, 0x2] - ldr r6, _0802DF6C + ldr r6, =0x02022d00 ldr r0, [r6] lsls r1, r5, 1 mov r8, r1 @@ -95113,7 +92921,7 @@ sub_802DED8: @ 802DED8 pop {r0} bx r0 .align 2, 0 -_0802DF6C: .4byte 0x02022d00 + .pool thumb_func_end sub_802DED8 thumb_func_start sub_802DF70 @@ -95180,7 +92988,7 @@ sub_802DFD4: @ 802DFD4 cmp r4, r5 bge _0802DFFA _0802DFE4: - ldr r0, _0802E008 + ldr r0, =0x02022d00 ldr r0, [r0] lsls r1, r4, 1 adds r0, 0x1C @@ -95197,7 +93005,7 @@ _0802DFFA: pop {r0} bx r0 .align 2, 0 -_0802E008: .4byte 0x02022d00 + .pool thumb_func_end sub_802DFD4 thumb_func_start sub_802E00C @@ -95206,7 +93014,7 @@ sub_802E00C: @ 802E00C adds r1, r0, 0 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _0802E050 + ldr r0, =0x02022d00 ldr r2, [r0] movs r0, 0 str r0, [r2, 0x18] @@ -95225,21 +93033,20 @@ sub_802E00C: @ 802E00C bl bg_change_y_offset movs r0, 0x1 bl gpu_sync_bg_show - ldr r0, _0802E054 + ldr r0, =sub_802E090 + 1 movs r1, 0x4 bl AddTask pop {r4} pop {r0} bx r0 .align 2, 0 -_0802E050: .4byte 0x02022d00 -_0802E054: .4byte sub_802E090 + 1 + .pool thumb_func_end sub_802E00C thumb_func_start sub_802E058 sub_802E058: @ 802E058 push {r4,lr} - ldr r4, _0802E068 + ldr r4, =0x02022d00 ldr r0, [r4] ldr r0, [r0, 0x18] cmp r0, 0x1F @@ -95247,7 +93054,7 @@ sub_802E058: @ 802E058 movs r0, 0 b _0802E08A .align 2, 0 -_0802E068: .4byte 0x02022d00 + .pool _0802E06C: movs r0, 0x1 movs r1, 0x80 @@ -95310,7 +93117,7 @@ sub_802E0D0: @ 802E0D0 push {r4,lr} sub sp, 0xC adds r4, r1, 0 - ldr r3, _0802E104 + ldr r3, =0x03003090 lsls r2, r0, 4 adds r0, r2, r3 ldrh r1, [r0] @@ -95334,7 +93141,7 @@ _0802E100: movs r0, 0 b _0802E118 .align 2, 0 -_0802E104: .4byte 0x03003090 + .pool _0802E108: mov r0, sp ldrh r0, [r0, 0x2] @@ -95378,7 +93185,7 @@ sub_802E138: @ 802E138 ldr r3, [r1, 0x8] lsls r3, 15 ldr r2, [sp, 0x8] - ldr r4, _0802E1B4 + ldr r4, =0x00007fff mov r8, r4 ands r2, r4 orrs r2, r3 @@ -95404,7 +93211,7 @@ sub_802E138: @ 802E138 mov r1, r8 ands r2, r1 ldrh r3, [r4, 0x8] - ldr r1, _0802E1B8 + ldr r1, =0xffff8000 ands r1, r3 orrs r1, r2 strh r1, [r4, 0x8] @@ -95430,8 +93237,7 @@ sub_802E138: @ 802E138 pop {r0} bx r0 .align 2, 0 -_0802E1B4: .4byte 0x00007fff -_0802E1B8: .4byte 0xffff8000 + .pool thumb_func_end sub_802E138 thumb_func_start sub_802E1BC @@ -95440,7 +93246,7 @@ sub_802E1BC: @ 802E1BC sub sp, 0xC adds r5, r0, 0 adds r4, r1, 0 - ldr r2, _0802E224 + ldr r2, =0x03003090 ldrh r0, [r2] movs r1, 0xFF lsls r1, 8 @@ -95488,7 +93294,7 @@ sub_802E1BC: @ 802E1BC movs r0, 0x1 b _0802E22A .align 2, 0 -_0802E224: .4byte 0x03003090 + .pool _0802E228: movs r0, 0 _0802E22A: @@ -95531,7 +93337,7 @@ sub_802E264: @ 802E264 adds r4, r0, 0 adds r5, r2, 0 adds r6, r3, 0 - ldr r3, _0802E2C0 + ldr r3, =0x03003090 lsls r2, r1, 4 adds r0, r2, r3 ldrh r1, [r0] @@ -95572,7 +93378,7 @@ sub_802E264: @ 802E264 movs r0, 0x1 b _0802E2C6 .align 2, 0 -_0802E2C0: .4byte 0x03003090 + .pool _0802E2C4: movs r0, 0 _0802E2C6: @@ -95587,7 +93393,7 @@ sub_802E2D0: @ 802E2D0 push {r4,lr} sub sp, 0xC adds r4, r0, 0 - ldr r3, _0802E31C + ldr r3, =0x03003090 lsls r2, r1, 4 adds r0, r2, r3 ldrh r1, [r0] @@ -95622,7 +93428,7 @@ sub_802E2D0: @ 802E2D0 movs r0, 0x1 b _0802E322 .align 2, 0 -_0802E31C: .4byte 0x03003090 + .pool _0802E320: movs r0, 0 _0802E322: @@ -95634,14 +93440,14 @@ _0802E322: thumb_func_start sub_802E32C sub_802E32C: @ 802E32C - ldr r0, _0802E338 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xFE lsls r1, 1 adds r0, r1 bx lr .align 2, 0 -_0802E338: .4byte 0x03005d90 + .pool thumb_func_end sub_802E32C thumb_func_start sub_802E33C @@ -95673,7 +93479,7 @@ sub_802E354: @ 802E354 ldr r0, [r1, 0xC] cmp r0, r4 bcs _0802E378 - ldr r0, _0802E3A0 + ldr r0, =0x00018696 cmp r4, r0 bhi _0802E378 str r4, [r1, 0xC] @@ -95682,7 +93488,7 @@ _0802E378: ldrh r0, [r1] cmp r0, r5 bcs _0802E388 - ldr r0, _0802E3A4 + ldr r0, =0x0000270f cmp r5, r0 bhi _0802E388 strh r5, [r1] @@ -95691,7 +93497,7 @@ _0802E388: ldrh r0, [r1, 0x4] cmp r0, r6 bcs _0802E398 - ldr r0, _0802E3A4 + ldr r0, =0x0000270f cmp r6, r0 bhi _0802E398 strh r6, [r1, 0x4] @@ -95702,8 +93508,7 @@ _0802E398: pop {r1} bx r1 .align 2, 0 -_0802E3A0: .4byte 0x00018696 -_0802E3A4: .4byte 0x0000270f + .pool thumb_func_end sub_802E354 thumb_func_start sub_802E3A8 @@ -95712,7 +93517,7 @@ sub_802E3A8: @ 802E3A8 bl sub_802E32C adds r2, r0, 0 ldrh r1, [r2, 0x6] - ldr r0, _0802E3C0 + ldr r0, =0x0000270e cmp r1, r0 bhi _0802E3BC adds r0, r1, 0x1 @@ -95721,13 +93526,13 @@ _0802E3BC: pop {r0} bx r0 .align 2, 0 -_0802E3C0: .4byte 0x0000270e + .pool thumb_func_end sub_802E3A8 thumb_func_start sub_802E3C4 sub_802E3C4: @ 802E3C4 push {r4,lr} - ldr r4, _0802E3E0 + ldr r4, =sub_802E3E4 + 1 adds r0, r4, 0 movs r1, 0 bl AddTask @@ -95738,7 +93543,7 @@ sub_802E3C4: @ 802E3C4 pop {r0} bx r0 .align 2, 0 -_0802E3E0: .4byte sub_802E3E4 + 1 + .pool thumb_func_end sub_802E3C4 thumb_func_start sub_802E3E4 @@ -95750,7 +93555,7 @@ sub_802E3E4: @ 802E3E4 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0802E408 + ldr r1, =0x03005e08 adds r7, r0, r1 movs r1, 0 ldrsh r0, [r7, r1] @@ -95762,7 +93567,7 @@ sub_802E3E4: @ 802E3E4 beq _0802E416 b _0802E4F6 .align 2, 0 -_0802E408: .4byte 0x03005e08 + .pool _0802E40C: cmp r0, 0x2 beq _0802E4B4 @@ -95770,18 +93575,18 @@ _0802E40C: beq _0802E4DC b _0802E4F6 _0802E416: - ldr r0, _0802E494 + ldr r0, =0x082fe270 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] - ldr r1, _0802E498 + ldr r1, =0x085ede8d movs r0, 0x1 movs r2, 0 bl font_get_width_of_string adds r4, r0, 0 movs r6, 0 - ldr r5, _0802E49C + ldr r5, =0x082fe278 _0802E430: ldr r1, [r5] movs r0, 0x1 @@ -95815,12 +93620,12 @@ _0802E45E: asrs r1, 1 lsls r1, 24 lsrs r1, 16 - ldr r2, _0802E4A0 + ldr r2, =0xffff00ff ldr r0, [sp] ands r0, r2 orrs r0, r1 lsls r2, r4, 24 - ldr r1, _0802E4A4 + ldr r1, =0x00ffffff ands r0, r1 orrs r0, r2 str r0, [sp] @@ -95834,11 +93639,7 @@ _0802E45E: movs r1, 0x3 b _0802E4CA .align 2, 0 -_0802E494: .4byte 0x082fe270 -_0802E498: .4byte 0x085ede8d -_0802E49C: .4byte 0x082fe278 -_0802E4A0: .4byte 0xffff00ff -_0802E4A4: .4byte 0x00ffffff + .pool _0802E4A8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -95846,7 +93647,7 @@ _0802E4A8: bne _0802E4F6 b _0802E4CE _0802E4B4: - ldr r0, _0802E4D8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -95864,7 +93665,7 @@ _0802E4CE: strh r0, [r7] b _0802E4F6 .align 2, 0 -_0802E4D8: .4byte 0x030022c0 + .pool _0802E4DC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -95904,7 +93705,7 @@ sub_802E500: @ 802E500 ldr r0, [sp, 0x18] lsls r4, r0, 24 lsrs r4, 24 - ldr r5, _0802E610 + ldr r5, =0x0000021d adds r0, r4, 0 adds r1, r5, 0 movs r2, 0xD0 @@ -95916,7 +93717,7 @@ sub_802E500: @ 802E500 adds r0, r4, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r5, _0802E614 + ldr r5, =0x085ede8d ldr r1, [sp, 0x1C] lsls r2, r1, 3 movs r0, 0x1 @@ -95946,9 +93747,9 @@ sub_802E500: @ 802E500 movs r0, 0xC8 lsls r0, 21 mov r8, r0 - ldr r5, _0802E618 + ldr r5, =0x02021cc4 _0802E58A: - ldr r1, _0802E61C + ldr r1, =0x082fe278 lsls r0, r6, 2 adds r0, r1 ldr r2, [r0] @@ -96009,10 +93810,7 @@ _0802E58A: pop {r0} bx r0 .align 2, 0 -_0802E610: .4byte 0x0000021d -_0802E614: .4byte 0x085ede8d -_0802E618: .4byte 0x02021cc4 -_0802E61C: .4byte 0x082fe278 + .pool thumb_func_end sub_802E500 thumb_func_start sub_802E620 @@ -96043,7 +93841,7 @@ sub_802E63C: @ 802E63C lsrs r5, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, _0802E67C + ldr r0, =sub_802E6D0 + 1 bl AddTask adds r4, r0, 0 lsls r4, 24 @@ -96051,12 +93849,12 @@ sub_802E63C: @ 802E63C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0802E680 + ldr r1, =0x03005e00 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x8] strh r5, [r0, 0xA] - ldr r0, _0802E684 + ldr r0, =0x082fe748 lsls r5, 4 adds r5, r0 ldr r1, [r5] @@ -96067,21 +93865,19 @@ sub_802E63C: @ 802E63C pop {r1} bx r1 .align 2, 0 -_0802E67C: .4byte sub_802E6D0 + 1 -_0802E680: .4byte 0x03005e00 -_0802E684: .4byte 0x082fe748 + .pool thumb_func_end sub_802E63C thumb_func_start sub_802E688 sub_802E688: @ 802E688 push {lr} - ldr r0, _0802E6AC + ldr r0, =sub_802E6D0 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF beq _0802E6B4 - ldr r0, _0802E6B0 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -96091,8 +93887,7 @@ sub_802E688: @ 802E688 movs r0, 0x1 b _0802E6B6 .align 2, 0 -_0802E6AC: .4byte sub_802E6D0 + 1 -_0802E6B0: .4byte 0x03005e00 + .pool _0802E6B4: movs r0, 0 _0802E6B6: @@ -96103,14 +93898,14 @@ _0802E6B6: thumb_func_start sub_802E6BC sub_802E6BC: @ 802E6BC push {lr} - ldr r0, _0802E6CC + ldr r0, =sub_802E6D0 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_0802E6CC: .4byte sub_802E6D0 + 1 + .pool thumb_func_end sub_802E6BC thumb_func_start sub_802E6D0 @@ -96121,7 +93916,7 @@ sub_802E6D0: @ 802E6D0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0802E6F4 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -96133,13 +93928,13 @@ sub_802E6D0: @ 802E6D0 beq _0802E6FE b _0802E752 .align 2, 0 -_0802E6F4: .4byte 0x03005e08 + .pool _0802E6F8: cmp r0, 0x4 beq _0802E738 b _0802E752 _0802E6FE: - ldr r1, _0802E718 + ldr r1, =0x082fe748 movs r2, 0x2 ldrsh r0, [r4, r2] lsls r0, 4 @@ -96152,9 +93947,9 @@ _0802E6FE: strh r0, [r4] b _0802E752 .align 2, 0 -_0802E718: .4byte 0x082fe748 + .pool _0802E71C: - ldr r0, _0802E734 + ldr r0, =0x082fe748 movs r2, 0x2 ldrsh r1, [r4, r2] lsls r1, 4 @@ -96165,9 +93960,9 @@ _0802E71C: bl _call_via_r1 b _0802E752 .align 2, 0 -_0802E734: .4byte 0x082fe748 + .pool _0802E738: - ldr r0, _0802E758 + ldr r0, =0x082fe748 movs r2, 0x2 ldrsh r1, [r4, r2] lsls r1, 4 @@ -96183,7 +93978,7 @@ _0802E752: pop {r0} bx r0 .align 2, 0 -_0802E758: .4byte 0x082fe748 + .pool thumb_func_end sub_802E6D0 thumb_func_start sub_802E75C @@ -96198,13 +93993,13 @@ sub_802E75C: @ 802E75C movs r1, 0x6 ldrsh r0, [r4, r1] lsls r0, 3 - ldr r1, _0802E82C + ldr r1, =0x082fe6c8 adds r0, r1 bl gpu_tile_obj_decompress_and_load movs r2, 0x8 ldrsh r0, [r4, r2] lsls r0, 3 - ldr r1, _0802E830 + ldr r1, =0x082fe6d8 adds r0, r1 bl gpu_pal_obj_alloc_tag_and_apply movs r5, 0 @@ -96218,7 +94013,7 @@ _0802E790: lsls r0, r1, 1 adds r0, r1 lsls r0, 3 - ldr r1, _0802E834 + ldr r1, =0x082fe730 adds r0, r1 movs r2, 0x12 ldrsh r1, [r4, r2] @@ -96248,7 +94043,7 @@ _0802E7C4: movs r3, 0xD negs r3, r3 mov r12, r3 - ldr r6, _0802E838 + ldr r6, =0x02020630 _0802E7D8: lsls r0, r5, 1 adds r0, r4 @@ -96293,10 +94088,7 @@ _0802E820: pop {r0} bx r0 .align 2, 0 -_0802E82C: .4byte 0x082fe6c8 -_0802E830: .4byte 0x082fe6d8 -_0802E834: .4byte 0x082fe730 -_0802E838: .4byte 0x02020630 + .pool thumb_func_end sub_802E75C thumb_func_start sub_802E83C @@ -96307,7 +94099,7 @@ sub_802E83C: @ 802E83C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r1, _0802E8BC + ldr r1, =0x03005e08 adds r4, r1 movs r5, 0 strh r5, [r4, 0x4] @@ -96330,7 +94122,7 @@ sub_802E83C: @ 802E83C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0802E8C0 + ldr r5, =0x02020630 adds r0, r5 movs r1, 0x4 bl obj_anim_image_start @@ -96340,7 +94132,7 @@ sub_802E83C: @ 802E83C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0802E8C4 + ldr r1, =0x0000ffe0 strh r1, [r0, 0x24] movs r0, 0x1E ldrsh r1, [r4, r0] @@ -96362,9 +94154,7 @@ sub_802E83C: @ 802E83C pop {r0} bx r0 .align 2, 0 -_0802E8BC: .4byte 0x03005e08 -_0802E8C0: .4byte 0x02020630 -_0802E8C4: .4byte 0x0000ffe0 + .pool thumb_func_end sub_802E83C thumb_func_start sub_802E8C8 @@ -96376,11 +94166,11 @@ sub_802E8C8: @ 802E8C8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0802E8DC + ldr r0, =0x03005e08 adds r4, r1, r0 b _0802E8FC .align 2, 0 -_0802E8DC: .4byte 0x03005e08 + .pool _0802E8E0: lsls r0, r5, 1 adds r0, r4 @@ -96389,7 +94179,7 @@ _0802E8E0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0802E92C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r5, 0x1 @@ -96400,14 +94190,14 @@ _0802E8FC: ldrsh r0, [r4, r1] cmp r5, r0 blt _0802E8E0 - ldr r1, _0802E930 + ldr r1, =0x082fe6c8 movs r2, 0x6 ldrsh r0, [r4, r2] lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x6] bl gpu_tile_obj_free_by_tag - ldr r1, _0802E934 + ldr r1, =0x082fe6d8 movs r2, 0x8 ldrsh r0, [r4, r2] lsls r0, 3 @@ -96418,9 +94208,7 @@ _0802E8FC: pop {r0} bx r0 .align 2, 0 -_0802E92C: .4byte 0x02020630 -_0802E930: .4byte 0x082fe6c8 -_0802E934: .4byte 0x082fe6d8 + .pool thumb_func_end sub_802E8C8 thumb_func_start sub_802E938 @@ -96432,7 +94220,7 @@ sub_802E938: @ 802E938 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0802E97C + ldr r1, =0x03005e08 adds r5, r0, r1 movs r1, 0x16 ldrsh r0, [r5, r1] @@ -96454,13 +94242,12 @@ sub_802E938: @ 802E938 cmp r0, 0x4 bhi _0802EA44 lsls r0, 2 - ldr r1, _0802E980 + ldr r1, =_0802E984 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802E97C: .4byte 0x03005e08 -_0802E980: .4byte _0802E984 + .pool .align 2, 0 _0802E984: .4byte _0802E998 @@ -96493,7 +94280,7 @@ _0802E9BA: lsrs r1, 24 adds r0, r6, 0 bl obj_anim_image_start - ldr r4, _0802EA00 + ldr r4, =0x02020630 movs r2, 0x1C ldrsh r0, [r5, r2] lsls r1, r0, 4 @@ -96519,7 +94306,7 @@ _0802E9BA: strb r2, [r0] b _0802EA44 .align 2, 0 -_0802EA00: .4byte 0x02020630 + .pool _0802EA04: adds r1, r6, 0 adds r1, 0x3E @@ -96527,7 +94314,7 @@ _0802EA04: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r3, _0802EA40 + ldr r3, =0x02020630 movs r0, 0x1C ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -96552,7 +94339,7 @@ _0802EA04: strh r0, [r5] b _0802EA4A .align 2, 0 -_0802EA40: .4byte 0x02020630 + .pool _0802EA44: ldrh r0, [r6, 0x32] adds r0, 0x1 @@ -96571,11 +94358,11 @@ sub_802EA50: @ 802EA50 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _0802EAA4 + ldr r5, =0x03005e08 adds r6, r4, r5 movs r0, 0x38 bl audio_play - ldr r2, _0802EAA8 + ldr r2, =0x02020630 movs r0, 0x1A ldrsh r1, [r6, r0] lsls r0, r1, 4 @@ -96584,7 +94371,7 @@ sub_802EA50: @ 802EA50 adds r1, r2, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0802EAAC + ldr r1, =sub_802E938 + 1 str r1, [r0] movs r0, 0x1A ldrsh r1, [r6, r0] @@ -96606,9 +94393,7 @@ sub_802EA50: @ 802EA50 pop {r0} bx r0 .align 2, 0 -_0802EAA4: .4byte 0x03005e08 -_0802EAA8: .4byte 0x02020630 -_0802EAAC: .4byte sub_802E938 + 1 + .pool thumb_func_end sub_802EA50 thumb_func_start sub_802EAB0 @@ -96620,15 +94405,15 @@ sub_802EAB0: @ 802EAB0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0802EB04 + ldr r0, =0x03005e08 adds r4, r1, r0 - ldr r0, _0802EB08 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0802EB14 - ldr r1, _0802EB0C + ldr r1, =0x03003090 ldrh r0, [r1, 0x2] - ldr r5, _0802EB10 + ldr r5, =0x00007fff cmp r0, r5 bne _0802EAD8 ldrh r0, [r1, 0x4] @@ -96654,10 +94439,7 @@ _0802EAD8: bl sub_800FE50 b _0802EB1A .align 2, 0 -_0802EB04: .4byte 0x03005e08 -_0802EB08: .4byte 0x03003124 -_0802EB0C: .4byte 0x03003090 -_0802EB10: .4byte 0x00007fff + .pool _0802EB14: ldrh r0, [r4, 0x16] adds r0, 0x1 @@ -96690,13 +94472,13 @@ sub_802EB24: @ 802EB24 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0802EB7C + ldr r0, =sub_802EB98 + 1 movs r1, 0x50 str r3, [sp] bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0802EB80 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -96715,21 +94497,20 @@ sub_802EB24: @ 802EB24 pop {r0} bx r0 .align 2, 0 -_0802EB7C: .4byte sub_802EB98 + 1 -_0802EB80: .4byte 0x03005e00 + .pool thumb_func_end sub_802EB24 thumb_func_start sub_802EB84 sub_802EB84: @ 802EB84 push {lr} - ldr r0, _0802EB94 + ldr r0, =sub_802EB98 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_0802EB94: .4byte sub_802EB98 + 1 + .pool thumb_func_end sub_802EB84 thumb_func_start sub_802EB98 @@ -96741,7 +94522,7 @@ sub_802EB98: @ 802EB98 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0802EBBC + ldr r1, =0x03005e08 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -96753,7 +94534,7 @@ sub_802EB98: @ 802EB98 beq _0802EBC6 b _0802EC8A .align 2, 0 -_0802EBBC: .4byte 0x03005e08 + .pool _0802EBC0: cmp r0, 0x2 beq _0802EC4C @@ -96803,7 +94584,7 @@ _0802EC08: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0802EC48 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry movs r3, 0xE @@ -96819,7 +94600,7 @@ _0802EC3E: strh r0, [r5] b _0802EC8A .align 2, 0 -_0802EC48: .4byte 0x02020630 + .pool _0802EC4C: ldrb r0, [r5, 0x10] bl sub_802EE30 @@ -96830,7 +94611,7 @@ _0802EC4C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0802EC94 + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles movs r0, 0x12 @@ -96852,7 +94633,7 @@ _0802EC8A: pop {r0} bx r0 .align 2, 0 -_0802EC94: .4byte 0x02020630 + .pool thumb_func_end sub_802EB98 thumb_func_start sub_802EC98 @@ -96863,7 +94644,7 @@ sub_802EC98: @ 802EC98 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0802ECBC + ldr r0, =0x02020630 adds r4, r1, r0 movs r1, 0x2E ldrsh r0, [r4, r1] @@ -96872,13 +94653,12 @@ sub_802EC98: @ 802EC98 b _0802EDC4 _0802ECB2: lsls r0, 2 - ldr r1, _0802ECC0 + ldr r1, =_0802ECC4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802ECBC: .4byte 0x02020630 -_0802ECC0: .4byte _0802ECC4 + .pool .align 2, 0 _0802ECC4: .4byte _0802ECE4 @@ -97026,13 +94806,13 @@ sub_802EDCC: @ 802EDCC lsrs r1, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, _0802EE24 + ldr r0, =0x02020630 mov r8, r0 lsls r4, r1, 4 adds r4, r1 lsls r4, 2 adds r5, r4, r0 - ldr r0, _0802EE28 + ldr r0, =0x0000ffd8 strh r0, [r5, 0x26] lsls r3, r2, 4 adds r3, r2 @@ -97054,7 +94834,7 @@ sub_802EDCC: @ 802EDCC movs r0, 0x1C add r8, r0 add r4, r8 - ldr r0, _0802EE2C + ldr r0, =sub_802EE5C + 1 str r0, [r4] add r3, r8 str r0, [r3] @@ -97064,9 +94844,7 @@ sub_802EDCC: @ 802EDCC pop {r0} bx r0 .align 2, 0 -_0802EE24: .4byte 0x02020630 -_0802EE28: .4byte 0x0000ffd8 -_0802EE2C: .4byte sub_802EE5C + 1 + .pool thumb_func_end sub_802EDCC thumb_func_start sub_802EE30 @@ -97075,14 +94853,14 @@ sub_802EE30: @ 802EE30 lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r2, _0802EE54 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r2, 0x1C adds r1, r2 ldr r1, [r1] - ldr r0, _0802EE58 + ldr r0, =sub_802EE5C + 1 cmp r1, r0 bne _0802EE4E movs r3, 0x1 @@ -97091,8 +94869,7 @@ _0802EE4E: pop {r1} bx r1 .align 2, 0 -_0802EE54: .4byte 0x02020630 -_0802EE58: .4byte sub_802EE5C + 1 + .pool thumb_func_end sub_802EE30 thumb_func_start sub_802EE5C @@ -97106,12 +94883,12 @@ sub_802EE5C: @ 802EE5C cmp r0, 0x4 bhi _0802EF46 lsls r0, 2 - ldr r1, _0802EE78 + ldr r1, =_0802EE7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0802EE78: .4byte _0802EE7C + .pool .align 2, 0 _0802EE7C: .4byte _0802EE90 @@ -97164,7 +94941,7 @@ _0802EEC8: adds r0, 0x1 strh r0, [r4] _0802EEE6: - ldr r0, _0802EEF8 + ldr r0, =0x08329f40 movs r2, 0x2 ldrsh r1, [r4, r2] lsls r1, 1 @@ -97174,7 +94951,7 @@ _0802EEE6: asrs r0, 4 b _0802EF2A .align 2, 0 -_0802EEF8: .4byte 0x08329f40 + .pool _0802EEFC: ldrh r0, [r4, 0x2] adds r0, 0x10 @@ -97191,7 +94968,7 @@ _0802EEFC: adds r0, 0x1 strh r0, [r4] _0802EF1A: - ldr r1, _0802EF30 + ldr r1, =0x08329f40 movs r2, 0x2 ldrsh r0, [r4, r2] lsls r0, 1 @@ -97204,7 +94981,7 @@ _0802EF2A: strh r0, [r5, 0x26] b _0802EF46 .align 2, 0 -_0802EF30: .4byte 0x08329f40 + .pool _0802EF34: ldrh r0, [r4, 0x2] adds r0, 0x1 @@ -97213,14 +94990,14 @@ _0802EF34: asrs r0, 16 cmp r0, 0x28 ble _0802EF46 - ldr r0, _0802EF4C + ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] _0802EF46: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0802EF4C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_802EE5C thumb_func_start sub_802EF50 @@ -97229,23 +95006,23 @@ sub_802EF50: @ 802EF50 sub sp, 0x10 lsls r1, 16 lsrs r1, 16 - ldr r2, _0802EF98 + ldr r2, =0x082febcc ldr r3, [r2, 0x4] ldr r2, [r2] str r2, [sp] str r3, [sp, 0x4] - ldr r2, _0802EF9C + ldr r2, =0x082febd4 ldr r3, [r2, 0x4] ldr r2, [r2] str r2, [sp, 0x8] str r3, [sp, 0xC] lsls r0, 16 - ldr r3, _0802EFA0 + ldr r3, =0x0000ffff ldr r2, [sp, 0x4] ands r2, r3 orrs r2, r0 str r2, [sp, 0x4] - ldr r2, _0802EFA4 + ldr r2, =0xffff0000 add r4, sp, 0x8 ldr r0, [r4, 0x4] ands r0, r2 @@ -97260,10 +95037,7 @@ sub_802EF50: @ 802EF50 pop {r0} bx r0 .align 2, 0 -_0802EF98: .4byte 0x082febcc -_0802EF9C: .4byte 0x082febd4 -_0802EFA0: .4byte 0x0000ffff -_0802EFA4: .4byte 0xffff0000 + .pool thumb_func_end sub_802EF50 thumb_func_start sub_802EFA8 @@ -97280,7 +95054,7 @@ sub_802EFA8: @ 802EFA8 lsrs r3, 24 mov r8, r3 mov r5, sp - ldr r4, _0802EFF8 + ldr r4, =0x082fec90 ldm r4!, {r3,r6,r7} stm r5!, {r3,r6,r7} ldm r4!, {r3,r6,r7} @@ -97308,7 +95082,7 @@ sub_802EFA8: @ 802EFA8 pop {r1} bx r1 .align 2, 0 -_0802EFF8: .4byte 0x082fec90 + .pool thumb_func_end sub_802EFA8 thumb_func_start sub_802EFFC @@ -97331,7 +95105,7 @@ sub_802EFFC: @ 802EFFC lsrs r6, 24 mov r10, r6 mov r4, sp - ldr r3, _0802F0C0 + ldr r3, =0x082feca8 ldm r3!, {r5-r7} stm r4!, {r5-r7} ldm r3!, {r5-r7} @@ -97342,7 +95116,7 @@ sub_802EFFC: @ 802EFFC strh r1, [r0, 0x2] lsls r2, 16 asrs r4, r2, 16 - ldr r0, _0802F0C4 + ldr r0, =0xffe00000 adds r2, r0 asrs r2, 16 mov r1, r12 @@ -97369,7 +95143,7 @@ sub_802EFFC: @ 802EFFC lsrs r0, 24 mov r4, r8 strh r0, [r4] - ldr r2, _0802F0C8 + ldr r2, =0x02020630 mov r5, r9 movs r6, 0 ldrsh r1, [r5, r6] @@ -97409,35 +95183,31 @@ sub_802EFFC: @ 802EFFC pop {r0} bx r0 .align 2, 0 -_0802F0C0: .4byte 0x082feca8 -_0802F0C4: .4byte 0xffe00000 -_0802F0C8: .4byte 0x02020630 + .pool thumb_func_end sub_802EFFC thumb_func_start sub_802F0CC sub_802F0CC: @ 802F0CC - ldr r2, _0802F0DC - ldr r1, _0802F0E0 + ldr r2, =0x03000dce + ldr r1, =0x04000208 ldrh r0, [r1] strh r0, [r2] movs r0, 0 strh r0, [r1] bx lr .align 2, 0 -_0802F0DC: .4byte 0x03000dce -_0802F0E0: .4byte 0x04000208 + .pool thumb_func_end sub_802F0CC thumb_func_start sub_802F0E4 sub_802F0E4: @ 802F0E4 - ldr r0, _0802F0F0 - ldr r1, _0802F0F4 + ldr r0, =0x04000208 + ldr r1, =0x03000dce ldrh r1, [r1] strh r1, [r0] bx lr .align 2, 0 -_0802F0F0: .4byte 0x04000208 -_0802F0F4: .4byte 0x03000dce + .pool thumb_func_end sub_802F0E4 thumb_func_start sub_802F0F8 @@ -97515,7 +95285,7 @@ sub_802F154: @ 802F154 cmp r4, 0 blt _0802F192 _0802F170: - ldr r1, _0802F1D8 + ldr r1, =0x0000016d adds r0, r5, r1 lsls r0, 16 lsrs r5, r0, 16 @@ -97536,7 +95306,7 @@ _0802F192: subs r0, r6, 0x1 cmp r0, 0 ble _0802F1AA - ldr r1, _0802F1DC + ldr r1, =0x082feccc adds r4, r0, 0 _0802F19C: ldm r1!, {r0} @@ -97570,8 +95340,7 @@ _0802F1C2: pop {r1} bx r1 .align 2, 0 -_0802F1D8: .4byte 0x0000016d -_0802F1DC: .4byte 0x082feccc + .pool thumb_func_end sub_802F154 thumb_func_start sub_802F1E0 @@ -97606,13 +95375,13 @@ sub_802F1E0: @ 802F1E0 thumb_func_start sub_802F21C sub_802F21C: @ 802F21C push {r4,r5,lr} - ldr r5, _0802F248 + ldr r5, =0x03000db8 movs r0, 0 strh r0, [r5] bl sub_802F0CC bl sub_82E2150 bl sub_82E2180 - ldr r4, _0802F24C + ldr r4, =0x03000dcc strb r0, [r4] bl sub_802F0E4 ldrb r4, [r4] @@ -97624,8 +95393,7 @@ sub_802F21C: @ 802F21C strh r0, [r5] b _0802F26E .align 2, 0 -_0802F248: .4byte 0x03000db8 -_0802F24C: .4byte 0x03000dcc + .pool _0802F250: movs r0, 0xF0 ands r0, r4 @@ -97634,36 +95402,35 @@ _0802F250: movs r0, 0x2 _0802F25A: strh r0, [r5] - ldr r4, _0802F274 + ldr r4, =0x03000dc0 adds r0, r4, 0 bl sub_802F2E8 adds r0, r4, 0 bl sub_802F2FC - ldr r1, _0802F278 + ldr r1, =0x03000db8 strh r0, [r1] _0802F26E: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0802F274: .4byte 0x03000dc0 -_0802F278: .4byte 0x03000db8 + .pool thumb_func_end sub_802F21C thumb_func_start sub_802F27C sub_802F27C: @ 802F27C - ldr r0, _0802F284 + ldr r0, =0x03000db8 ldrh r0, [r0] bx lr .align 2, 0 -_0802F284: .4byte 0x03000db8 + .pool thumb_func_end sub_802F27C thumb_func_start sub_802F288 sub_802F288: @ 802F288 push {r4,lr} adds r2, r0, 0 - ldr r0, _0802F2A4 + ldr r0, =0x03000db8 ldrh r1, [r0] movs r0, 0xFF lsls r0, 4 @@ -97671,13 +95438,12 @@ sub_802F288: @ 802F288 cmp r0, 0 beq _0802F2AC adds r1, r2, 0 - ldr r0, _0802F2A8 + ldr r0, =0x082fecc0 ldm r0!, {r2-r4} stm r1!, {r2-r4} b _0802F2B2 .align 2, 0 -_0802F2A4: .4byte 0x03000db8 -_0802F2A8: .4byte 0x082fecc0 + .pool _0802F2AC: adds r0, r2, 0 bl sub_802F2E8 @@ -97790,14 +95556,14 @@ _0802F36A: bl sub_802F120 lsls r0, 24 lsrs r0, 24 - ldr r1, _0802F380 + ldr r1, =0x082feccc ldr r1, [r1, 0x4] adds r0, r1 b _0802F38E .align 2, 0 -_0802F380: .4byte 0x082feccc + .pool _0802F384: - ldr r0, _0802F3F4 + ldr r0, =0x082feccc subs r1, r6, 0x1 lsls r1, 2 adds r1, r0 @@ -97855,7 +95621,7 @@ _0802F3E6: pop {r1} bx r1 .align 2, 0 -_0802F3F4: .4byte 0x082feccc + .pool thumb_func_end sub_802F2FC thumb_func_start sub_802F3F8 @@ -97927,7 +95693,7 @@ sub_802F444: @ 802F444 thumb_func_start sub_802F47C sub_802F47C: @ 802F47C push {lr} - ldr r3, _0802F490 + ldr r3, =0x03000dc0 ldrb r1, [r3, 0x4] ldrb r2, [r3, 0x5] ldrb r3, [r3, 0x6] @@ -97935,7 +95701,7 @@ sub_802F47C: @ 802F47C pop {r0} bx r0 .align 2, 0 -_0802F490: .4byte 0x03000dc0 + .pool thumb_func_end sub_802F47C thumb_func_start sub_802F494 @@ -98066,11 +95832,11 @@ _0802F582: thumb_func_start sub_802F588 sub_802F588: @ 802F588 push {r4,lr} - ldr r4, _0802F5A8 + ldr r4, =0x03000dc0 adds r0, r4, 0 bl sub_802F288 - ldr r1, _0802F5AC - ldr r0, _0802F5B0 + ldr r1, =0x03005cf8 + ldr r0, =0x03005d90 ldr r2, [r0] adds r2, 0x98 adds r0, r4, 0 @@ -98079,9 +95845,7 @@ sub_802F588: @ 802F588 pop {r0} bx r0 .align 2, 0 -_0802F5A8: .4byte 0x03000dc0 -_0802F5AC: .4byte 0x03005cf8 -_0802F5B0: .4byte 0x03005d90 + .pool thumb_func_end sub_802F588 thumb_func_start sub_802F5B4 @@ -98100,15 +95864,15 @@ sub_802F5B4: @ 802F5B4 thumb_func_start sub_802F5C8 sub_802F5C8: @ 802F5C8 push {r4,r5,lr} - ldr r4, _0802F5F0 + ldr r4, =0x03005cf8 strh r0, [r4] strb r1, [r4, 0x2] strb r2, [r4, 0x3] strb r3, [r4, 0x4] - ldr r5, _0802F5F4 + ldr r5, =0x03000dc0 adds r0, r5, 0 bl sub_802F288 - ldr r0, _0802F5F8 + ldr r0, =0x03005d90 ldr r1, [r0] adds r1, 0x98 adds r0, r5, 0 @@ -98118,9 +95882,7 @@ sub_802F5C8: @ 802F5C8 pop {r0} bx r0 .align 2, 0 -_0802F5F0: .4byte 0x03005cf8 -_0802F5F4: .4byte 0x03000dc0 -_0802F5F8: .4byte 0x03005d90 + .pool thumb_func_end sub_802F5C8 thumb_func_start sub_802F5FC @@ -98184,7 +95946,7 @@ _0802F65C: thumb_func_start sub_802F664 sub_802F664: @ 802F664 push {r4,lr} - ldr r4, _0802F698 + ldr r4, =0x03000dc0 adds r0, r4, 0 bl sub_802F288 adds r0, r4, 0 @@ -98207,20 +95969,20 @@ sub_802F664: @ 802F664 pop {r1} bx r1 .align 2, 0 -_0802F698: .4byte 0x03000dc0 + .pool thumb_func_end sub_802F664 thumb_func_start sub_802F69C sub_802F69C: @ 802F69C push {lr} - ldr r0, _0802F6AC + ldr r0, =0x03000dc0 bl sub_802F1E0 lsls r0, 16 lsrs r0, 16 pop {r1} bx r1 .align 2, 0 -_0802F6AC: .4byte 0x03000dc0 + .pool thumb_func_end sub_802F69C thumb_func_start c2_title_menu_3 @@ -98304,13 +96066,13 @@ init_title_menu: @ 802F6F4 add r1, sp, 0x4 movs r0, 0 strh r0, [r1] - ldr r1, _0802F7D0 + ldr r1, =0x040000d4 add r0, sp, 0x4 str r0, [r1] movs r0, 0xC0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _0802F7D4 + ldr r0, =0x8100c000 str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r5, 0 @@ -98320,23 +96082,23 @@ init_title_menu: @ 802F6F4 movs r0, 0xE0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _0802F7D8 + ldr r0, =0x85000100 str r0, [r1, 0x8] ldr r0, [r1, 0x8] add r0, sp, 0x4 strh r5, [r0] str r0, [r1] - ldr r0, _0802F7DC + ldr r0, =0x05000002 str r0, [r1, 0x4] - ldr r0, _0802F7E0 + ldr r0, =0x810001ff str r0, [r1, 0x8] ldr r0, [r1, 0x8] bl sub_80A1A74 - ldr r0, _0802F7E4 + ldr r0, =0x082ff0a0 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0802F7E8 + ldr r0, =0x082ff0c0 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -98355,17 +96117,11 @@ init_title_menu: @ 802F6F4 bl sub_80A1AD4 b _0802F7FE .align 2, 0 -_0802F7D0: .4byte 0x040000d4 -_0802F7D4: .4byte 0x8100c000 -_0802F7D8: .4byte 0x85000100 -_0802F7DC: .4byte 0x05000002 -_0802F7E0: .4byte 0x810001ff -_0802F7E4: .4byte 0x082ff0a0 -_0802F7E8: .4byte 0x082ff0c0 + .pool _0802F7EC: movs r0, 0x1 negs r0, r0 - ldr r1, _0802F8BC + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0x10 @@ -98374,7 +96130,7 @@ _0802F7EC: _0802F7FE: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0802F8C0 + ldr r1, =0x082ff0e8 movs r0, 0 movs r2, 0x2 bl bg_vram_setup @@ -98394,10 +96150,10 @@ _0802F7FE: movs r1, 0 movs r2, 0 bl bg_change_y_offset - ldr r0, _0802F8C4 + ldr r0, =0x082ff038 bl Window_InitFromTemplates bl TextBox_ResetSomeField - ldr r1, _0802F8C8 + ldr r1, =0x000001d5 movs r0, 0 bl unknown_title_pattern_data_to_vram movs r0, 0x40 @@ -98423,9 +96179,9 @@ _0802F7FE: bl lcd_io_set movs r0, 0x1 bl enable_irqs - ldr r0, _0802F8CC + ldr r0, =sub_802F6C8 + 1 bl SetVBlankCallback - ldr r0, _0802F8D0 + ldr r0, =c2_title_menu_3 + 1 bl set_callback2 movs r1, 0xC1 lsls r1, 6 @@ -98435,7 +96191,7 @@ _0802F7FE: bl gpu_sync_bg_show movs r0, 0x1 bl gpu_sync_bg_hide - ldr r0, _0802F8D4 + ldr r0, =task_init_title_menu_graphics + 1 movs r1, 0 bl AddTask movs r0, 0 @@ -98444,13 +96200,7 @@ _0802F7FE: pop {r1} bx r1 .align 2, 0 -_0802F8BC: .4byte 0x0000ffff -_0802F8C0: .4byte 0x082ff0e8 -_0802F8C4: .4byte 0x082ff038 -_0802F8C8: .4byte 0x000001d5 -_0802F8CC: .4byte sub_802F6C8 + 1 -_0802F8D0: .4byte c2_title_menu_3 + 1 -_0802F8D4: .4byte task_init_title_menu_graphics + 1 + .pool thumb_func_end init_title_menu thumb_func_start task_init_title_menu_graphics @@ -98463,10 +96213,10 @@ task_init_title_menu_graphics: @ 802F8D8 lsls r0, r6, 2 adds r0, r6 lsls r7, r0, 3 - ldr r0, _0802F95C + ldr r0, =0x03005e08 mov r8, r0 adds r4, r7, r0 - ldr r0, _0802F960 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -98504,7 +96254,7 @@ _0802F900: movs r0, 0x1 strh r0, [r4, 0x1E] _0802F946: - ldr r0, _0802F964 + ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0x2 beq _0802F990 @@ -98516,9 +96266,7 @@ _0802F946: beq _0802F972 b _0802F9D0 .align 2, 0 -_0802F95C: .4byte 0x03005e08 -_0802F960: .4byte 0x02037fd4 -_0802F964: .4byte 0x03006210 + .pool _0802F968: cmp r0, 0x4 beq _0802F9EC @@ -98537,12 +96285,12 @@ _0802F982: mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, _0802F98C + ldr r1, =task_init_title_menu_graphics_2 + 1 b _0802F9FC .align 2, 0 -_0802F98C: .4byte task_init_title_menu_graphics_2 + 1 + .pool _0802F990: - ldr r0, _0802F9A0 + ldr r0, =0x085e8405 bl draw_text_box strh r5, [r4] mov r0, r8 @@ -98550,14 +96298,14 @@ _0802F990: adds r0, r7, r0 b _0802F9FA .align 2, 0 -_0802F9A0: .4byte 0x085e8405 + .pool _0802F9A4: - ldr r0, _0802F9C8 + ldr r0, =0x085e83c2 bl draw_text_box mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, _0802F9CC + ldr r1, =task_init_title_menu_save_file_corrupt + 1 str r1, [r0] movs r0, 0x1 strh r0, [r4] @@ -98569,34 +96317,32 @@ _0802F9A4: strh r0, [r4] b _0802F9FE .align 2, 0 -_0802F9C8: .4byte 0x085e83c2 -_0802F9CC: .4byte task_init_title_menu_save_file_corrupt + 1 + .pool _0802F9D0: movs r0, 0 strh r0, [r4] - ldr r1, _0802F9E4 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _0802F9E8 + ldr r1, =task_init_title_menu_graphics_2 + 1 b _0802F9FC .align 2, 0 -_0802F9E4: .4byte 0x03005e00 -_0802F9E8: .4byte task_init_title_menu_graphics_2 + 1 + .pool _0802F9EC: - ldr r0, _0802FA20 + ldr r0, =0x085e8440 bl draw_text_box mov r0, r8 subs r0, 0x8 adds r0, r7, r0 strh r5, [r0, 0x8] _0802F9FA: - ldr r1, _0802FA24 + ldr r1, =task_init_title_menu_save_file_corrupt + 1 _0802F9FC: str r1, [r0] _0802F9FE: - ldr r2, _0802FA28 + ldr r2, =0x02022d06 ldrh r1, [r2] movs r0, 0x80 lsls r0, 8 @@ -98613,9 +96359,7 @@ _0802F9FE: beq _0802FA3A b _0802FA3E .align 2, 0 -_0802FA20: .4byte 0x085e8440 -_0802FA24: .4byte task_init_title_menu_save_file_corrupt + 1 -_0802FA28: .4byte 0x02022d06 + .pool _0802FA2C: cmp r0, 0 blt _0802FA3E @@ -98631,7 +96375,7 @@ _0802FA3C: strh r0, [r2] _0802FA3E: ldrh r1, [r2] - ldr r0, _0802FA58 + ldr r0, =0x00007fff ands r0, r1 strh r0, [r2] strh r0, [r4, 0x2] @@ -98645,7 +96389,7 @@ _0802FA4E: pop {r0} bx r0 .align 2, 0 -_0802FA58: .4byte 0x00007fff + .pool thumb_func_end task_init_title_menu_graphics thumb_func_start task_init_title_menu_save_file_corrupt @@ -98659,7 +96403,7 @@ task_init_title_menu_save_file_corrupt: @ 802FA5C lsls r0, 16 cmp r0, 0 bne _0802FA98 - ldr r0, _0802FAA0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -98667,24 +96411,21 @@ task_init_title_menu_save_file_corrupt: @ 802FA5C beq _0802FA98 movs r0, 0x7 bl Window_FillTileMap - ldr r0, _0802FAA4 + ldr r0, =0x082ff070 bl sub_8032250 - ldr r1, _0802FAA8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0802FAAC + ldr r1, =task_init_title_menu_graphics_2 + 1 str r1, [r0] _0802FA98: pop {r4} pop {r0} bx r0 .align 2, 0 -_0802FAA0: .4byte 0x030022c0 -_0802FAA4: .4byte 0x082ff070 -_0802FAA8: .4byte 0x03005e00 -_0802FAAC: .4byte task_init_title_menu_graphics_2 + 1 + .pool thumb_func_end task_init_title_menu_save_file_corrupt thumb_func_start task_init_title_menu_graphics_2 @@ -98693,7 +96434,7 @@ task_init_title_menu_graphics_2: @ 802FAB0 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, _0802FB1C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -98726,36 +96467,32 @@ task_init_title_menu_graphics_2: @ 802FAB0 ands r1, r0 cmp r1, 0 bne _0802FB28 - ldr r0, _0802FB20 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0802FB24 + ldr r0, =task_init_title_menu_graphics_3 + 1 str r0, [r1] b _0802FB3C .align 2, 0 -_0802FB1C: .4byte 0x02037fd4 -_0802FB20: .4byte 0x03005e00 -_0802FB24: .4byte task_init_title_menu_graphics_3 + 1 + .pool _0802FB28: - ldr r0, _0802FB44 + ldr r0, =0x085e8453 bl draw_text_box - ldr r1, _0802FB48 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0802FB4C + ldr r1, =task_init_title_menu_battery_dry + 1 str r1, [r0] _0802FB3C: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0802FB44: .4byte 0x085e8453 -_0802FB48: .4byte 0x03005e00 -_0802FB4C: .4byte task_init_title_menu_battery_dry + 1 + .pool thumb_func_end task_init_title_menu_graphics_2 thumb_func_start task_init_title_menu_battery_dry @@ -98769,7 +96506,7 @@ task_init_title_menu_battery_dry: @ 802FB50 lsls r0, 16 cmp r0, 0 bne _0802FB8C - ldr r0, _0802FB94 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -98777,24 +96514,21 @@ task_init_title_menu_battery_dry: @ 802FB50 beq _0802FB8C movs r0, 0x7 bl Window_FillTileMap - ldr r0, _0802FB98 + ldr r0, =0x082ff070 bl sub_8032250 - ldr r1, _0802FB9C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0802FBA0 + ldr r1, =task_init_title_menu_graphics_3 + 1 str r1, [r0] _0802FB8C: pop {r4} pop {r0} bx r0 .align 2, 0 -_0802FB94: .4byte 0x030022c0 -_0802FB98: .4byte 0x082ff070 -_0802FB9C: .4byte 0x03005e00 -_0802FBA0: .4byte task_init_title_menu_graphics_3 + 1 + .pool thumb_func_end task_init_title_menu_battery_dry thumb_func_start task_init_title_menu_graphics_3 @@ -98809,9 +96543,9 @@ task_init_title_menu_graphics_3: @ 802FBA4 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _0802FC68 + ldr r1, =0x03005e08 adds r6, r0, r1 - ldr r0, _0802FC6C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -98848,7 +96582,7 @@ _0802FBCE: movs r2, 0x2 bl gpu_pal_apply add r1, sp, 0xC - ldr r2, _0802FC70 + ldr r2, =0x00007fff adds r0, r2, 0 strh r0, [r1] adds r0, r1, 0 @@ -98856,7 +96590,7 @@ _0802FBCE: movs r2, 0x2 bl gpu_pal_apply add r1, sp, 0xC - ldr r2, _0802FC74 + ldr r2, =0x0000318c adds r0, r2, 0 strh r0, [r1] adds r0, r1, 0 @@ -98864,20 +96598,20 @@ _0802FBCE: movs r2, 0x2 bl gpu_pal_apply add r1, sp, 0xC - ldr r2, _0802FC78 + ldr r2, =0x0000675a adds r0, r2, 0 strh r0, [r1] adds r0, r1, 0 movs r1, 0xFC movs r2, 0x2 bl gpu_pal_apply - ldr r0, _0802FC7C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 bne _0802FC84 add r1, sp, 0xC - ldr r2, _0802FC80 + ldr r2, =0x00007e04 adds r0, r2, 0 strh r0, [r1] adds r0, r1, 0 @@ -98886,16 +96620,10 @@ _0802FBCE: bl gpu_pal_apply b _0802FC96 .align 2, 0 -_0802FC68: .4byte 0x03005e08 -_0802FC6C: .4byte 0x02037fd4 -_0802FC70: .4byte 0x00007fff -_0802FC74: .4byte 0x0000318c -_0802FC78: .4byte 0x0000675a -_0802FC7C: .4byte 0x03005d90 -_0802FC80: .4byte 0x00007e04 + .pool _0802FC84: add r1, sp, 0xC - ldr r2, _0802FD28 + ldr r2, =0x0000547f adds r0, r2, 0 strh r0, [r1] adds r0, r1, 0 @@ -98903,7 +96631,7 @@ _0802FC84: movs r2, 0x2 bl gpu_pal_apply _0802FC96: - ldr r0, _0802FD2C + ldr r0, =0x03005e00 mov r8, r0 lsls r1, r7, 2 adds r0, r1, r7 @@ -98930,12 +96658,12 @@ _0802FCBC: movs r0, 0x1 movs r1, 0xAA bl Window_FastFillPixels - ldr r5, _0802FD30 + ldr r5, =0x082ff0e0 str r5, [sp] movs r4, 0x1 negs r4, r4 str r4, [sp, 0x4] - ldr r0, _0802FD34 + ldr r0, =0x085e827c str r0, [sp, 0x8] movs r0, 0 movs r1, 0x1 @@ -98944,7 +96672,7 @@ _0802FCBC: bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _0802FD38 + ldr r0, =0x085e828e str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -98961,21 +96689,15 @@ _0802FCBC: movs r0, 0x1 movs r1, 0x2 bl Window_CopyToVram - ldr r4, _0802FD3C - ldr r5, _0802FD40 + ldr r4, =0x082ff038 + ldr r5, =0x000001d5 adds r0, r4, 0 adds r1, r5, 0 bl write_textbox_border_to_bg_tilemap adds r4, 0x8 b _0802FED4 .align 2, 0 -_0802FD28: .4byte 0x0000547f -_0802FD2C: .4byte 0x03005e00 -_0802FD30: .4byte 0x082ff0e0 -_0802FD34: .4byte 0x085e827c -_0802FD38: .4byte 0x085e828e -_0802FD3C: .4byte 0x082ff038 -_0802FD40: .4byte 0x000001d5 + .pool _0802FD44: movs r0, 0x2 movs r1, 0xAA @@ -98986,12 +96708,12 @@ _0802FD44: movs r0, 0x4 movs r1, 0xAA bl Window_FastFillPixels - ldr r5, _0802FDE8 + ldr r5, =0x082ff0e0 str r5, [sp] movs r4, 0x1 negs r4, r4 str r4, [sp, 0x4] - ldr r0, _0802FDEC + ldr r0, =0x085e8285 str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0x1 @@ -99000,7 +96722,7 @@ _0802FD44: bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _0802FDF0 + ldr r0, =0x085e827c str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -99009,7 +96731,7 @@ _0802FD44: bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _0802FDF4 + ldr r0, =0x085e828e str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -99032,8 +96754,8 @@ _0802FD44: movs r0, 0x4 movs r1, 0x2 bl Window_CopyToVram - ldr r4, _0802FDF8 - ldr r5, _0802FDFC + ldr r4, =0x082ff048 + ldr r5, =0x000001d5 adds r0, r4, 0 adds r1, r5, 0 bl write_textbox_border_to_bg_tilemap @@ -99044,12 +96766,7 @@ _0802FD44: adds r4, 0x10 b _0802FED4 .align 2, 0 -_0802FDE8: .4byte 0x082ff0e0 -_0802FDEC: .4byte 0x085e8285 -_0802FDF0: .4byte 0x085e827c -_0802FDF4: .4byte 0x085e828e -_0802FDF8: .4byte 0x082ff048 -_0802FDFC: .4byte 0x000001d5 + .pool _0802FE00: movs r0, 0x2 movs r1, 0xAA @@ -99063,12 +96780,12 @@ _0802FE00: movs r0, 0x5 movs r1, 0xAA bl Window_FastFillPixels - ldr r5, _0802FEE0 + ldr r5, =0x082ff0e0 str r5, [sp] movs r4, 0x1 negs r4, r4 str r4, [sp, 0x4] - ldr r0, _0802FEE4 + ldr r0, =0x085e8285 str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0x1 @@ -99077,7 +96794,7 @@ _0802FE00: bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _0802FEE8 + ldr r0, =0x085e827c str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -99086,7 +96803,7 @@ _0802FE00: bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _0802FEEC + ldr r0, =0x085e8295 str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -99095,7 +96812,7 @@ _0802FE00: bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _0802FEF0 + ldr r0, =0x085e828e str r0, [sp, 0x8] movs r0, 0x5 movs r1, 0x1 @@ -99123,8 +96840,8 @@ _0802FE00: movs r0, 0x5 movs r1, 0x2 bl Window_CopyToVram - ldr r4, _0802FEF4 - ldr r5, _0802FEF8 + ldr r4, =0x082ff048 + ldr r5, =0x000001d5 adds r0, r4, 0 adds r1, r5, 0 bl write_textbox_border_to_bg_tilemap @@ -99143,13 +96860,7 @@ _0802FED4: bl write_textbox_border_to_bg_tilemap b _0803005E .align 2, 0 -_0802FEE0: .4byte 0x082ff0e0 -_0802FEE4: .4byte 0x085e8285 -_0802FEE8: .4byte 0x085e827c -_0802FEEC: .4byte 0x085e8295 -_0802FEF0: .4byte 0x085e828e -_0802FEF4: .4byte 0x082ff048 -_0802FEF8: .4byte 0x000001d5 + .pool _0802FEFC: movs r0, 0x2 movs r1, 0xAA @@ -99166,12 +96877,12 @@ _0802FEFC: movs r0, 0x6 movs r1, 0xAA bl Window_FastFillPixels - ldr r5, _0803007C + ldr r5, =0x082ff0e0 str r5, [sp] movs r4, 0x1 negs r4, r4 str r4, [sp, 0x4] - ldr r0, _08030080 + ldr r0, =0x085e8285 str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0x1 @@ -99180,7 +96891,7 @@ _0802FEFC: bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _08030084 + ldr r0, =0x085e827c str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -99189,7 +96900,7 @@ _0802FEFC: bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _08030088 + ldr r0, =0x085e82a2 str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -99198,7 +96909,7 @@ _0802FEFC: bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _0803008C + ldr r0, =0x085e82af str r0, [sp, 0x8] movs r0, 0x5 movs r1, 0x1 @@ -99207,7 +96918,7 @@ _0802FEFC: bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _08030090 + ldr r0, =0x085e828e str r0, [sp, 0x8] movs r0, 0x6 movs r1, 0x1 @@ -99240,8 +96951,8 @@ _0802FEFC: movs r0, 0x6 movs r1, 0x2 bl Window_CopyToVram - ldr r5, _08030094 - ldr r4, _08030098 + ldr r5, =0x082ff048 + ldr r4, =0x000001d5 adds r0, r5, 0 adds r1, r4, 0 bl write_textbox_border_to_bg_tilemap @@ -99261,8 +96972,8 @@ _0802FEFC: adds r0, 0x20 adds r1, r4, 0 bl write_textbox_border_to_bg_tilemap - ldr r0, _0803009C - ldr r4, _080300A0 + ldr r0, =0x082ff0f4 + ldr r4, =0x02022d06 adds r1, r4, 0 bl sub_81AF380 lsls r0, 24 @@ -99274,7 +96985,7 @@ _0802FEFC: adds r0, r1 lsls r0, 3 add r0, r8 - ldr r1, _080300A4 + ldr r1, =sub_81AF59C + 1 str r1, [r0] ldrh r0, [r4] cmp r0, 0x4 @@ -99300,12 +97011,12 @@ _0802FEFC: movs r1, 0x1 strh r1, [r0, 0x26] _0803005E: - ldr r0, _080300A8 + ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r7 lsls r1, 3 adds r1, r0 - ldr r0, _080300AC + ldr r0, =task_title_menu_highlight_selected_menu_items + 1 str r0, [r1] _0803006C: add sp, 0x10 @@ -99316,19 +97027,7 @@ _0803006C: pop {r0} bx r0 .align 2, 0 -_0803007C: .4byte 0x082ff0e0 -_08030080: .4byte 0x085e8285 -_08030084: .4byte 0x085e827c -_08030088: .4byte 0x085e82a2 -_0803008C: .4byte 0x085e82af -_08030090: .4byte 0x085e828e -_08030094: .4byte 0x082ff048 -_08030098: .4byte 0x000001d5 -_0803009C: .4byte 0x082ff0f4 -_080300A0: .4byte 0x02022d06 -_080300A4: .4byte sub_81AF59C + 1 -_080300A8: .4byte 0x03005e00 -_080300AC: .4byte task_title_menu_highlight_selected_menu_items + 1 + .pool thumb_func_end task_init_title_menu_graphics_3 thumb_func_start task_title_menu_highlight_selected_menu_items @@ -99336,7 +97035,7 @@ task_title_menu_highlight_selected_menu_items: @ 80300B0 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080300D8 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -99346,14 +97045,13 @@ task_title_menu_highlight_selected_menu_items: @ 80300B0 movs r3, 0x24 ldrsh r2, [r4, r3] bl title_menu_highlight_selected_menu_items - ldr r0, _080300DC + ldr r0, =task_title_menu_handle_input + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_080300D8: .4byte 0x03005e00 -_080300DC: .4byte task_title_menu_handle_input + 1 + .pool thumb_func_end task_title_menu_highlight_selected_menu_items thumb_func_start title_menu_handle_input @@ -99365,9 +97063,9 @@ title_menu_handle_input: @ 80300E0 lsls r1, r0, 2 adds r1, r0 lsls r4, r1, 3 - ldr r7, _08030124 + ldr r7, =0x03005e08 adds r5, r4, r7 - ldr r1, _08030128 + ldr r1, =0x030022c0 ldrh r2, [r1, 0x2E] movs r0, 0x1 ands r0, r2 @@ -99386,13 +97084,11 @@ title_menu_handle_input: @ 80300E0 adds r0, r7, 0 subs r0, 0x8 adds r0, r4, r0 - ldr r1, _0803012C + ldr r1, =title_menu_handle_keypad_a_pressed + 1 str r1, [r0] b _08030240 .align 2, 0 -_08030124: .4byte 0x03005e08 -_08030128: .4byte 0x030022c0 -_0803012C: .4byte title_menu_handle_keypad_a_pressed + 1 + .pool _08030130: movs r0, 0x2 ands r0, r2 @@ -99404,7 +97100,7 @@ _08030130: bl audio_play movs r0, 0x1 negs r0, r0 - ldr r1, _08030170 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0 @@ -99419,12 +97115,11 @@ _08030130: adds r0, r7, 0 subs r0, 0x8 adds r0, r4, r0 - ldr r1, _08030174 + ldr r1, =sub_8030544 + 1 str r1, [r0] b _08030240 .align 2, 0 -_08030170: .4byte 0x0000ffff -_08030174: .4byte sub_8030544 + 1 + .pool _08030178: movs r0, 0x40 ands r0, r2 @@ -99501,7 +97196,7 @@ _080301CA: adds r1, r4, 0 movs r2, 0x1 bl bg_change_y_offset - ldr r2, _08030238 + ldr r2, =0x03005e00 movs r0, 0x1A ldrsh r1, [r5, r0] lsls r0, r1, 2 @@ -99517,13 +97212,12 @@ _08030228: adds r0, 0x1 _0803022C: strh r0, [r5, 0x2] - ldr r1, _0803023C + ldr r1, =0x02022d06 strh r0, [r1] movs r0, 0x1 b _08030242 .align 2, 0 -_08030238: .4byte 0x03005e00 -_0803023C: .4byte 0x02022d06 + .pool _08030240: movs r0, 0 _08030242: @@ -99543,20 +97237,19 @@ task_title_menu_handle_input: @ 803024C lsls r0, 24 cmp r0, 0 beq _0803026C - ldr r0, _08030274 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08030278 + ldr r0, =task_title_menu_highlight_selected_menu_items + 1 str r0, [r1] _0803026C: pop {r4} pop {r0} bx r0 .align 2, 0 -_08030274: .4byte 0x03005e00 -_08030278: .4byte task_title_menu_highlight_selected_menu_items + 1 + .pool thumb_func_end task_title_menu_handle_input thumb_func_start title_menu_handle_keypad_a_pressed @@ -99565,7 +97258,7 @@ title_menu_handle_keypad_a_pressed: @ 803027C sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0803031C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -99573,7 +97266,7 @@ title_menu_handle_keypad_a_pressed: @ 803027C beq _08030292 b _08030536 _08030292: - ldr r2, _08030320 + ldr r2, =0x03005e00 lsls r1, r6, 2 adds r0, r1, r6 lsls r0, 3 @@ -99634,8 +97327,7 @@ _0803030C: bne _08030388 b _080303D8 .align 2, 0 -_0803031C: .4byte 0x02037fd4 -_08030320: .4byte 0x03005e00 + .pool _08030324: movs r2, 0xA ldrsh r0, [r4, r2] @@ -99671,12 +97363,12 @@ _08030358: cmp r0, 0x4 bhi _08030384 lsls r0, 2 - ldr r1, _0803036C + ldr r1, =_08030370 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0803036C: .4byte _08030370 + .pool .align 2, 0 _08030370: .4byte _08030384 @@ -99691,7 +97383,7 @@ _08030388: movs r5, 0 b _080303DA _0803038C: - ldr r0, _080303A8 + ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -99706,7 +97398,7 @@ _0803038C: strh r2, [r1, 0x8] b _080303DA .align 2, 0 -_080303A8: .4byte 0x03005e00 + .pool _080303AC: cmp r2, 0 beq _080303B8 @@ -99721,7 +97413,7 @@ _080303BC: cmp r2, 0 beq _080303D4 movs r5, 0x6 - ldr r0, _080303D0 + ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -99729,7 +97421,7 @@ _080303BC: strh r0, [r1, 0x8] b _080303DA .align 2, 0 -_080303D0: .4byte 0x03005e00 + .pool _080303D4: movs r5, 0x4 b _080303DA @@ -99747,12 +97439,12 @@ _080303DA: cmp r5, 0x6 bhi _0803041C lsls r0, r5, 2 - ldr r1, _080303FC + ldr r1, =_08030400 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080303FC: .4byte _08030400 + .pool .align 2, 0 _08030400: .4byte _0803041C @@ -99763,80 +97455,73 @@ _08030400: .4byte _08030488 .4byte _0803049C _0803041C: - ldr r0, _08030434 + ldr r0, =0x02037714 movs r1, 0 strh r1, [r0] - ldr r0, _08030438 + ldr r0, =0x02037b14 strh r1, [r0] - ldr r1, _0803043C + ldr r1, =0x03005e00 adds r0, r7, r6 lsls r0, 3 adds r0, r1 - ldr r1, _08030440 + ldr r1, =task_new_game_prof_birch_speech_1 + 1 str r1, [r0] b _08030514 .align 2, 0 -_08030434: .4byte 0x02037714 -_08030438: .4byte 0x02037b14 -_0803043C: .4byte 0x03005e00 -_08030440: .4byte task_new_game_prof_birch_speech_1 + 1 + .pool _08030444: - ldr r0, _08030454 + ldr r0, =0x02037714 movs r1, 0 strh r1, [r0] - ldr r0, _08030458 + ldr r0, =0x02037b14 strh r1, [r0] - ldr r0, _0803045C + ldr r0, =sub_8086230 + 1 b _0803048A .align 2, 0 -_08030454: .4byte 0x02037714 -_08030458: .4byte 0x02037b14 -_0803045C: .4byte sub_8086230 + 1 + .pool _08030460: - ldr r0, _0803046C - ldr r1, _08030470 + ldr r0, =0x030022c0 + ldr r1, =c2_title_menu_2_dupe + 1 str r1, [r0, 0x8] - ldr r0, _08030474 + ldr r0, =c2_options_menu + 1 b _0803048A .align 2, 0 -_0803046C: .4byte 0x030022c0 -_08030470: .4byte c2_title_menu_2_dupe + 1 -_08030474: .4byte c2_options_menu + 1 + .pool _08030478: - ldr r0, _0803047C + ldr r0, =c2_mystery_gift + 1 b _0803048A .align 2, 0 -_0803047C: .4byte c2_mystery_gift + 1 + .pool _08030480: - ldr r0, _08030484 + ldr r0, =sub_8178974 + 1 b _0803048A .align 2, 0 -_08030484: .4byte sub_8178974 + 1 + .pool _08030488: - ldr r0, _08030498 + ldr r0, =sub_801867C + 1 _0803048A: bl set_callback2 adds r0, r6, 0 bl remove_task b _08030514 .align 2, 0 -_08030498: .4byte sub_801867C + 1 + .pool _0803049C: - ldr r1, _08030500 + ldr r1, =0x03005e00 adds r0, r7, r6 lsls r0, 3 adds r0, r1 movs r4, 0 strh r4, [r0, 0xA] - ldr r1, _08030504 + ldr r1, =sub_80305A4 + 1 str r1, [r0] - ldr r0, _08030508 + ldr r0, =0x02037714 movs r2, 0xF1 lsls r2, 1 adds r0, r2 - ldr r1, _0803050C + ldr r1, =0x00007fff strh r1, [r0] - ldr r0, _08030510 + ldr r0, =0x02037b14 adds r0, r2 strh r1, [r0] movs r0, 0x18 @@ -99866,23 +97551,19 @@ _0803049C: bl sub_80A1AD4 b _08030536 .align 2, 0 -_08030500: .4byte 0x03005e00 -_08030504: .4byte sub_80305A4 + 1 -_08030508: .4byte 0x02037714 -_0803050C: .4byte 0x00007fff -_08030510: .4byte 0x02037b14 + .pool _08030514: bl Window_FreeMemory cmp r5, 0x2 beq _08030528 - ldr r1, _08030524 + ldr r1, =0x02022d06 movs r0, 0 strh r0, [r1] b _08030536 .align 2, 0 -_08030524: .4byte 0x02022d06 + .pool _08030528: - ldr r0, _08030540 + ldr r0, =0x02022d06 ldrh r1, [r0] movs r3, 0x80 lsls r3, 8 @@ -99895,7 +97576,7 @@ _08030536: pop {r0} bx r0 .align 2, 0 -_08030540: .4byte 0x02022d06 + .pool thumb_func_end title_menu_handle_keypad_a_pressed thumb_func_start sub_8030544 @@ -99904,7 +97585,7 @@ sub_8030544: @ 8030544 lsls r0, 24 lsrs r2, r0, 24 adds r5, r2, 0 - ldr r0, _08030594 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -99912,7 +97593,7 @@ sub_8030544: @ 8030544 lsrs r4, r0, 24 cmp r4, 0 bne _0803058C - ldr r0, _08030598 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -99926,10 +97607,10 @@ sub_8030544: @ 8030544 lsrs r0, 24 bl sub_81AF620 _08030578: - ldr r0, _0803059C + ldr r0, =0x02022d06 strh r4, [r0] bl Window_FreeMemory - ldr r0, _080305A0 + ldr r0, =c2_title_screen_1 + 1 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -99938,10 +97619,7 @@ _0803058C: pop {r0} bx r0 .align 2, 0 -_08030594: .4byte 0x02037fd4 -_08030598: .4byte 0x03005e00 -_0803059C: .4byte 0x02022d06 -_080305A0: .4byte c2_title_screen_1 + 1 + .pool thumb_func_end sub_8030544 thumb_func_start sub_80305A4 @@ -99950,7 +97628,7 @@ sub_80305A4: @ 80305A4 sub sp, 0x8 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080305C8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -99965,7 +97643,7 @@ sub_80305A4: @ 80305A4 beq _080305D6 b _08030688 .align 2, 0 -_080305C8: .4byte 0x03005e00 + .pool _080305CC: cmp r1, 0x2 beq _0803064C @@ -99996,22 +97674,22 @@ _080305FC: beq _0803061C b _08030622 _08030602: - ldr r0, _0803060C + ldr r0, =0x085e82be bl draw_text_box b _08030622 .align 2, 0 -_0803060C: .4byte 0x085e82be + .pool _08030610: - ldr r0, _08030618 + ldr r0, =0x085e82e5 bl draw_text_box b _08030622 .align 2, 0 -_08030618: .4byte 0x085e82e5 + .pool _0803061C: - ldr r0, _08030634 + ldr r0, =0x085e8328 bl draw_text_box _08030622: - ldr r0, _08030638 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -100021,16 +97699,15 @@ _08030622: strh r0, [r1, 0xA] b _08030688 .align 2, 0 -_08030634: .4byte 0x085e8328 -_08030638: .4byte 0x03005e00 + .pool _0803063C: - ldr r0, _08030648 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 b _08030658 .align 2, 0 -_08030648: .4byte 0x02037fd4 + .pool _0803064C: bl run_remoboxes movs r0, 0x7 @@ -100044,7 +97721,7 @@ _08030658: strh r0, [r4, 0xA] b _08030688 _08030664: - ldr r0, _08030690 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] ands r1, r0 cmp r1, 0 @@ -100058,7 +97735,7 @@ _08030664: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08030694 + ldr r0, =sub_8030544 + 1 str r0, [r4] _08030688: add sp, 0x8 @@ -100066,8 +97743,7 @@ _08030688: pop {r0} bx r0 .align 2, 0 -_08030690: .4byte 0x030022c0 -_08030694: .4byte sub_8030544 + 1 + .pool thumb_func_end sub_80305A4 thumb_func_start title_menu_highlight_selected_menu_items @@ -100079,7 +97755,7 @@ title_menu_highlight_selected_menu_items: @ 8030698 lsrs r4, r1, 24 lsls r2, 16 lsrs r6, r2, 16 - ldr r1, _080306CC + ldr r1, =0x000009e7 movs r0, 0x40 bl lcd_io_set cmp r5, 0x1 @@ -100096,16 +97772,15 @@ _080306BE: cmp r4, 0x1 beq _080306D4 _080306C6: - ldr r1, _080306D0 + ldr r1, =0x0000011f b _0803078E .align 2, 0 -_080306CC: .4byte 0x000009e7 -_080306D0: .4byte 0x0000011f + .pool _080306D4: - ldr r1, _080306D8 + ldr r1, =0x0000213f b _0803078E .align 2, 0 -_080306D8: .4byte 0x0000213f + .pool _080306DC: cmp r4, 0x1 beq _080306F0 @@ -100114,20 +97789,20 @@ _080306DC: cmp r4, 0x2 beq _080306F8 _080306E8: - ldr r1, _080306EC + ldr r1, =0x0000013f b _0803078E .align 2, 0 -_080306EC: .4byte 0x0000013f + .pool _080306F0: - ldr r1, _080306F4 + ldr r1, =0x0000415f b _0803078E .align 2, 0 -_080306F4: .4byte 0x0000415f + .pool _080306F8: - ldr r1, _080306FC + ldr r1, =0x0000617f b _0803078E .align 2, 0 -_080306FC: .4byte 0x0000617f + .pool _08030700: cmp r4, 0x1 beq _08030718 @@ -100138,30 +97813,30 @@ _08030700: cmp r4, 0x3 beq _0803078C _08030710: - ldr r1, _08030714 + ldr r1, =0x0000013f b _0803078E .align 2, 0 -_08030714: .4byte 0x0000013f + .pool _08030718: - ldr r1, _0803071C + ldr r1, =0x0000415f b _0803078E .align 2, 0 -_0803071C: .4byte 0x0000415f + .pool _08030720: - ldr r1, _08030724 + ldr r1, =0x0000617f b _0803078E .align 2, 0 -_08030724: .4byte 0x0000617f + .pool _08030728: cmp r4, 0x4 bhi _08030750 lsls r0, r4, 2 - ldr r1, _08030738 + ldr r1, =_0803073C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08030738: .4byte _0803073C + .pool .align 2, 0 _0803073C: .4byte _08030750 @@ -100170,51 +97845,51 @@ _0803073C: .4byte _08030780 .4byte _0803079C _08030750: - ldr r1, _08030754 + ldr r1, =0x0000013f b _0803078E .align 2, 0 -_08030754: .4byte 0x0000013f + .pool _08030758: cmp r6, 0 beq _08030764 - ldr r1, _08030760 + ldr r1, =0x0000213f b _0803078E .align 2, 0 -_08030760: .4byte 0x0000213f + .pool _08030764: - ldr r1, _08030768 + ldr r1, =0x0000415f b _0803078E .align 2, 0 -_08030768: .4byte 0x0000415f + .pool _0803076C: cmp r6, 0 beq _08030778 - ldr r1, _08030774 + ldr r1, =0x0000415f b _0803078E .align 2, 0 -_08030774: .4byte 0x0000415f + .pool _08030778: - ldr r1, _0803077C + ldr r1, =0x0000617f b _0803078E .align 2, 0 -_0803077C: .4byte 0x0000617f + .pool _08030780: cmp r6, 0 beq _0803078C - ldr r1, _08030788 + ldr r1, =0x0000617f b _0803078E .align 2, 0 -_08030788: .4byte 0x0000617f + .pool _0803078C: - ldr r1, _08030798 + ldr r1, =0x0000819f _0803078E: movs r0, 0x44 bl lcd_io_set b _080307A4 .align 2, 0 -_08030798: .4byte 0x0000819f + .pool _0803079C: - ldr r1, _080307AC + ldr r1, =0x0000819f movs r0, 0x44 bl lcd_io_set _080307A4: @@ -100222,7 +97897,7 @@ _080307A4: pop {r0} bx r0 .align 2, 0 -_080307AC: .4byte 0x0000819f + .pool thumb_func_end title_menu_highlight_selected_menu_items thumb_func_start task_new_game_prof_birch_speech_1 @@ -100239,7 +97914,7 @@ task_new_game_prof_birch_speech_1: @ 80307B0 lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _08030890 + ldr r0, =0x082ff0f0 bl bg_init_bg_config_2_from_bg_config_3 movs r0, 0x40 movs r1, 0 @@ -100262,18 +97937,18 @@ task_new_game_prof_birch_speech_1: @ 80307B0 movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r0, _08030894 + ldr r0, =0x082fed3c movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _08030898 - ldr r1, _0803089C + ldr r0, =0x082feef0 + ldr r1, =0x06003800 bl LZ77UnCompVram - ldr r0, _080308A0 + ldr r0, =0x082fecfc movs r1, 0 movs r2, 0x40 bl gpu_pal_apply - ldr r0, _080308A4 + ldr r0, =0x082ff028 movs r1, 0x1 movs r2, 0x10 bl gpu_pal_apply @@ -100291,13 +97966,13 @@ task_new_game_prof_birch_speech_1: @ 80307B0 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r1, _080308A8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 strh r5, [r0, 0x10] - ldr r1, _080308AC + ldr r1, =task_new_game_prof_birch_speech_2 + 1 str r1, [r0] movs r1, 0xFF strh r1, [r0, 0xC] @@ -100316,14 +97991,7 @@ task_new_game_prof_birch_speech_1: @ 80307B0 pop {r0} bx r0 .align 2, 0 -_08030890: .4byte 0x082ff0f0 -_08030894: .4byte 0x082fed3c -_08030898: .4byte 0x082feef0 -_0803089C: .4byte 0x06003800 -_080308A0: .4byte 0x082fecfc -_080308A4: .4byte 0x082ff028 -_080308A8: .4byte 0x03005e00 -_080308AC: .4byte task_new_game_prof_birch_speech_2 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_1 thumb_func_start task_new_game_prof_birch_speech_2 @@ -100331,7 +97999,7 @@ task_new_game_prof_birch_speech_2: @ 80308B0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080308D0 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -100345,10 +98013,10 @@ task_new_game_prof_birch_speech_2: @ 80308B0 strh r0, [r4, 0x16] b _0803091A .align 2, 0 -_080308D0: .4byte 0x03005e00 + .pool _080308D4: ldrb r0, [r4, 0x18] - ldr r2, _08030920 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -100378,15 +98046,14 @@ _080308D4: bl sub_8031D34 movs r0, 0x50 strh r0, [r4, 0x16] - ldr r0, _08030924 + ldr r0, =task_new_game_prof_birch_speech_3 + 1 str r0, [r4] _0803091A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08030920: .4byte 0x02020630 -_08030924: .4byte task_new_game_prof_birch_speech_3 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_2 thumb_func_start task_new_game_prof_birch_speech_3 @@ -100394,7 +98061,7 @@ task_new_game_prof_birch_speech_3: @ 8030928 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08030968 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -100403,7 +98070,7 @@ task_new_game_prof_birch_speech_3: @ 8030928 ldrsh r0, [r4, r1] cmp r0, 0 beq _080309B6 - ldr r2, _0803096C + ldr r2, =0x02020630 movs r1, 0x18 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -100424,10 +98091,9 @@ task_new_game_prof_birch_speech_3: @ 8030928 strh r0, [r4, 0x16] b _080309B6 .align 2, 0 -_08030968: .4byte 0x03005e00 -_0803096C: .4byte 0x02020630 + .pool _08030970: - ldr r0, _080309BC + ldr r0, =0x082ff080 bl Window_InitFromTemplates movs r0, 0 movs r1, 0xF3 @@ -100446,22 +98112,19 @@ _08030970: bl Window_CopyToVram movs r0, 0 bl sub_8032318 - ldr r0, _080309C0 - ldr r1, _080309C4 + ldr r0, =0x02021fc4 + ldr r1, =0x082c897b bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r0, _080309C8 + ldr r0, =task_new_game_prof_birch_speech_4 + 1 str r0, [r4] _080309B6: pop {r4} pop {r0} bx r0 .align 2, 0 -_080309BC: .4byte 0x082ff080 -_080309C0: .4byte 0x02021fc4 -_080309C4: .4byte 0x082c897b -_080309C8: .4byte task_new_game_prof_birch_speech_4 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_3 thumb_func_start task_new_game_prof_birch_speech_4 @@ -100469,7 +98132,7 @@ task_new_game_prof_birch_speech_4: @ 80309CC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08030A10 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -100479,33 +98142,27 @@ task_new_game_prof_birch_speech_4: @ 80309CC lsls r0, 16 cmp r0, 0 bne _08030A0A - ldr r1, _08030A14 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08030A18 + ldr r1, =task_new_game_prof_birch_speech_5 + 1 str r1, [r0] - ldr r0, _08030A1C - ldr r1, _08030A20 + ldr r0, =0x02021fc4 + ldr r1, =0x085e8692 bl ExpandTextCodes - ldr r1, _08030A24 + ldr r1, =sub_80323A0 + 1 movs r0, 0x1 bl sub_8197A9C - ldr r0, _08030A28 + ldr r0, =0x03000dd0 strb r4, [r0] _08030A0A: pop {r4} pop {r0} bx r0 .align 2, 0 -_08030A10: .4byte 0x02037fd4 -_08030A14: .4byte 0x03005e00 -_08030A18: .4byte task_new_game_prof_birch_speech_5 + 1 -_08030A1C: .4byte 0x02021fc4 -_08030A20: .4byte 0x085e8692 -_08030A24: .4byte sub_80323A0 + 1 -_08030A28: .4byte 0x03000dd0 + .pool thumb_func_end task_new_game_prof_birch_speech_4 thumb_func_start task_new_game_prof_birch_speech_5 @@ -100517,27 +98174,24 @@ task_new_game_prof_birch_speech_5: @ 8030A2C lsls r0, 16 cmp r0, 0 bne _08030A58 - ldr r0, _08030A60 - ldr r1, _08030A64 + ldr r0, =0x02021fc4 + ldr r1, =0x082c8a1f bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r1, _08030A68 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08030A6C + ldr r1, =task_new_game_prof_birch_speech_6 + 1 str r1, [r0] _08030A58: pop {r4} pop {r0} bx r0 .align 2, 0 -_08030A60: .4byte 0x02021fc4 -_08030A64: .4byte 0x082c8a1f -_08030A68: .4byte 0x03005e00 -_08030A6C: .4byte task_new_game_prof_birch_speech_6 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_5 thumb_func_start sub_8030A70 @@ -100549,8 +98203,8 @@ sub_8030A70: @ 8030A70 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r6, _08030AFC - ldr r0, _08030B00 + ldr r6, =0x03005e00 + ldr r0, =0x03000dd0 mov r8, r0 ldrb r1, [r0] lsls r0, r1, 2 @@ -100558,7 +98212,7 @@ sub_8030A70: @ 8030A70 lsls r0, 3 adds r0, r6 ldrb r0, [r0, 0x1A] - ldr r1, _08030B04 + ldr r1, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -100584,9 +98238,9 @@ sub_8030A70: @ 8030A70 str r5, [sp, 0x4] movs r2, 0x20 str r2, [sp, 0x8] - ldr r2, _08030B08 + ldr r2, =0x0000ffff str r2, [sp, 0xC] - ldr r2, _08030B0C + ldr r2, =0x00000127 str r2, [sp, 0x10] movs r2, 0x70 movs r3, 0x3A @@ -100595,7 +98249,7 @@ sub_8030A70: @ 8030A70 adds r0, r4 lsls r0, 3 adds r0, r6 - ldr r1, _08030B10 + ldr r1, =sub_8030B14 + 1 str r1, [r0] mov r0, r8 ldrb r1, [r0] @@ -100611,12 +98265,7 @@ sub_8030A70: @ 8030A70 pop {r0} bx r0 .align 2, 0 -_08030AFC: .4byte 0x03005e00 -_08030B00: .4byte 0x03000dd0 -_08030B04: .4byte 0x02020630 -_08030B08: .4byte 0x0000ffff -_08030B0C: .4byte 0x00000127 -_08030B10: .4byte sub_8030B14 + 1 + .pool thumb_func_end sub_8030A70 thumb_func_start sub_8030B14 @@ -100629,11 +98278,11 @@ sub_8030B14: @ 8030B14 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08030B58 + ldr r1, =0x03005e08 adds r5, r0, r1 subs r1, 0x8 mov r8, r1 - ldr r2, _08030B5C + ldr r2, =0x03000dd0 ldrb r1, [r2] lsls r0, r1, 2 adds r0, r1 @@ -100645,7 +98294,7 @@ sub_8030B14: @ 8030B14 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08030B60 + ldr r1, =0x02020630 adds r3, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -100656,12 +98305,10 @@ sub_8030B14: @ 8030B14 beq _08030B7C b _08030B98 .align 2, 0 -_08030B58: .4byte 0x03005e08 -_08030B5C: .4byte 0x03000dd0 -_08030B60: .4byte 0x02020630 + .pool _08030B64: ldr r1, [r3, 0x1C] - ldr r0, _08030B78 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08030BBA ldrb r1, [r3, 0x1] @@ -100671,7 +98318,7 @@ _08030B64: strb r0, [r3, 0x1] b _08030B98 .align 2, 0 -_08030B78: .4byte nullsub_12 + 1 + .pool _08030B7C: movs r1, 0x16 ldrsh r0, [r6, r1] @@ -100690,7 +98337,7 @@ _08030B98: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - ldr r2, _08030BC4 + ldr r2, =0x03005e00 ldrb r1, [r7] lsls r0, r1, 2 adds r0, r1 @@ -100700,7 +98347,7 @@ _08030BAA: ldrh r3, [r2, 0x16] movs r0, 0x16 ldrsh r1, [r2, r0] - ldr r0, _08030BC8 + ldr r0, =0x00003fff cmp r1, r0 bgt _08030BBA adds r0, r3, 0x1 @@ -100712,8 +98359,7 @@ _08030BBA: pop {r0} bx r0 .align 2, 0 -_08030BC4: .4byte 0x03005e00 -_08030BC8: .4byte 0x00003fff + .pool thumb_func_end sub_8030B14 thumb_func_start task_new_game_prof_birch_speech_6 @@ -100726,30 +98372,26 @@ task_new_game_prof_birch_speech_6: @ 8030BCC lsrs r1, r0, 16 cmp r1, 0 bne _08030BFE - ldr r0, _08030C04 + ldr r0, =0x02022d04 strb r1, [r0] - ldr r0, _08030C08 - ldr r1, _08030C0C + ldr r0, =0x02021fc4 + ldr r1, =0x082c8bd0 bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r1, _08030C10 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08030C14 + ldr r1, =task_new_game_prof_birch_speech_7 + 1 str r1, [r0] _08030BFE: pop {r4} pop {r0} bx r0 .align 2, 0 -_08030C04: .4byte 0x02022d04 -_08030C08: .4byte 0x02021fc4 -_08030C0C: .4byte 0x082c8bd0 -_08030C10: .4byte 0x03005e00 -_08030C14: .4byte task_new_game_prof_birch_speech_7 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_6 thumb_func_start task_new_game_prof_birch_speech_7 @@ -100761,8 +98403,8 @@ task_new_game_prof_birch_speech_7: @ 8030C18 lsls r0, 16 cmp r0, 0 bne _08030C7C - ldr r5, _08030C84 - ldr r0, _08030C88 + ldr r5, =0x02020630 + ldr r0, =0x03005e00 lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -100799,16 +98441,14 @@ task_new_game_prof_birch_speech_7: @ 8030C18 bl sub_8031C88 movs r0, 0x40 strh r0, [r4, 0x16] - ldr r0, _08030C8C + ldr r0, =task_new_game_prof_birch_speech_8 + 1 str r0, [r4] _08030C7C: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08030C84: .4byte 0x02020630 -_08030C88: .4byte 0x03005e00 -_08030C8C: .4byte task_new_game_prof_birch_speech_8 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_7 thumb_func_start task_new_game_prof_birch_speech_8 @@ -100816,7 +98456,7 @@ task_new_game_prof_birch_speech_8: @ 8030C90 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08030CBC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -100835,18 +98475,17 @@ task_new_game_prof_birch_speech_8: @ 8030C90 bl lcd_io_set b _08030CC8 .align 2, 0 -_08030CBC: .4byte 0x03005e00 + .pool _08030CC0: - ldr r0, _08030CCC + ldr r0, =0x0000ffc4 strh r0, [r2, 0x10] - ldr r0, _08030CD0 + ldr r0, =task_new_game_prof_birch_speech_9 + 1 str r0, [r2] _08030CC8: pop {r0} bx r0 .align 2, 0 -_08030CCC: .4byte 0x0000ffc4 -_08030CD0: .4byte task_new_game_prof_birch_speech_9 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_8 thumb_func_start task_new_game_prof_birch_speech_9 @@ -100855,7 +98494,7 @@ task_new_game_prof_birch_speech_9: @ 8030CD4 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _08030D2C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -100864,7 +98503,7 @@ task_new_game_prof_birch_speech_9: @ 8030CD4 ldrsh r0, [r4, r1] cmp r0, 0 beq _08030D7A - ldr r2, _08030D30 + ldr r2, =0x02020630 movs r0, 0x18 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -100895,8 +98534,7 @@ task_new_game_prof_birch_speech_9: @ 8030CD4 strh r0, [r4, 0x16] b _08030D7A .align 2, 0 -_08030D2C: .4byte 0x03005e00 -_08030D30: .4byte 0x02020630 + .pool _08030D34: ldrb r3, [r4, 0x1C] lsls r1, r3, 4 @@ -100929,14 +98567,14 @@ _08030D34: adds r0, r5, 0 movs r1, 0x1 bl sub_8031D34 - ldr r0, _08030D80 + ldr r0, =task_new_game_prof_birch_speech_10 + 1 str r0, [r4] _08030D7A: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08030D80: .4byte task_new_game_prof_birch_speech_10 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_9 thumb_func_start task_new_game_prof_birch_speech_10 @@ -100944,7 +98582,7 @@ task_new_game_prof_birch_speech_10: @ 8030D84 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08030DBC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -100953,7 +98591,7 @@ task_new_game_prof_birch_speech_10: @ 8030D84 ldrsh r0, [r3, r1] cmp r0, 0 beq _08030DB8 - ldr r2, _08030DC0 + ldr r2, =0x02020630 movs r1, 0xC ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -100965,15 +98603,13 @@ task_new_game_prof_birch_speech_10: @ 8030D84 negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r0, _08030DC4 + ldr r0, =task_new_game_prof_birch_speech_11 + 1 str r0, [r3] _08030DB8: pop {r0} bx r0 .align 2, 0 -_08030DBC: .4byte 0x03005e00 -_08030DC0: .4byte 0x02020630 -_08030DC4: .4byte task_new_game_prof_birch_speech_11 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_10 thumb_func_start task_new_game_prof_birch_speech_11 @@ -100984,26 +98620,23 @@ task_new_game_prof_birch_speech_11: @ 8030DC8 lsrs r4, 24 movs r0, 0 bl sub_8032318 - ldr r0, _08030DF8 - ldr r1, _08030DFC + ldr r0, =0x02021fc4 + ldr r1, =0x082c8bdd bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r1, _08030E00 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08030E04 + ldr r1, =task_new_game_prof_birch_speech_12 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08030DF8: .4byte 0x02021fc4 -_08030DFC: .4byte 0x082c8bdd -_08030E00: .4byte 0x03005e00 -_08030E04: .4byte task_new_game_prof_birch_speech_12 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_11 thumb_func_start task_new_game_prof_birch_speech_12 @@ -101016,20 +98649,19 @@ task_new_game_prof_birch_speech_12: @ 8030E08 cmp r0, 0 bne _08030E2A bl sub_8031D74 - ldr r0, _08030E30 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08030E34 + ldr r0, =task_new_game_prof_birch_speech_13 + 1 str r0, [r1] _08030E2A: pop {r4} pop {r0} bx r0 .align 2, 0 -_08030E30: .4byte 0x03005e00 -_08030E34: .4byte task_new_game_prof_birch_speech_13 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_12 thumb_func_start task_new_game_prof_birch_speech_13 @@ -101049,25 +98681,25 @@ task_new_game_prof_birch_speech_13: @ 8030E38 _08030E52: movs r0, 0x5 bl audio_play - ldr r0, _08030EC0 + ldr r0, =0x03005d90 ldr r0, [r0] strb r4, [r0, 0x8] movs r0, 0x1 movs r1, 0x1 bl sub_80322E0 - ldr r1, _08030EC4 + ldr r1, =0x03005e00 lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08030EC8 + ldr r1, =task_new_game_prof_birch_speech_14 + 1 str r1, [r0] adds r4, r2, 0 _08030E76: bl GetMenuCursorPos lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _08030EC4 + ldr r1, =0x03005e00 adds r0, r4, r5 lsls r0, 3 adds r4, r0, r1 @@ -101076,7 +98708,7 @@ _08030E76: cmp r3, r0 beq _08030EB8 strh r3, [r4, 0x14] - ldr r2, _08030ECC + ldr r2, =0x02020630 movs r0, 0xC ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -101093,18 +98725,14 @@ _08030E76: adds r0, r5, 0 movs r1, 0 bl sub_8031ACC - ldr r0, _08030ED0 + ldr r0, =sub_8030ED4 + 1 str r0, [r4] _08030EB8: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08030EC0: .4byte 0x03005d90 -_08030EC4: .4byte 0x03005e00 -_08030EC8: .4byte task_new_game_prof_birch_speech_14 + 1 -_08030ECC: .4byte 0x02020630 -_08030ED0: .4byte sub_8030ED4 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_13 thumb_func_start sub_8030ED4 @@ -101112,7 +98740,7 @@ sub_8030ED4: @ 8030ED4 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08030F04 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -101123,7 +98751,7 @@ sub_8030ED4: @ 8030ED4 adds r7, r1, 0 cmp r0, 0 bne _08030F0C - ldr r0, _08030F08 + ldr r0, =0x02020630 lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -101133,10 +98761,9 @@ sub_8030ED4: @ 8030ED4 strh r0, [r1, 0x20] b _08030F72 .align 2, 0 -_08030F04: .4byte 0x03005e00 -_08030F08: .4byte 0x02020630 + .pool _08030F0C: - ldr r3, _08030F2C + ldr r3, =0x02020630 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -101153,7 +98780,7 @@ _08030F0C: ldrb r5, [r4, 0x1E] b _08030F32 .align 2, 0 -_08030F2C: .4byte 0x02020630 + .pool _08030F30: ldrb r5, [r4, 0x1C] _08030F32: @@ -101186,14 +98813,14 @@ _08030F32: adds r0, r6, 0 movs r1, 0 bl sub_8031BAC - ldr r0, _08030F78 + ldr r0, =sub_8030F7C + 1 str r0, [r4] _08030F72: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08030F78: .4byte sub_8030F7C + 1 + .pool thumb_func_end sub_8030ED4 thumb_func_start sub_8030F7C @@ -101201,13 +98828,13 @@ sub_8030F7C: @ 8030F7C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08030FA8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r3, r1, r2 ldrb r1, [r3, 0xC] - ldr r2, _08030FAC + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -101221,8 +98848,7 @@ sub_8030F7C: @ 8030F7C strh r0, [r2, 0x20] b _08030FCA .align 2, 0 -_08030FA8: .4byte 0x03005e00 -_08030FAC: .4byte 0x02020630 + .pool _08030FB0: movs r0, 0xB4 strh r0, [r2, 0x20] @@ -101235,14 +98861,14 @@ _08030FB0: negs r1, r1 ands r1, r0 strb r1, [r2, 0x1] - ldr r0, _08030FD0 + ldr r0, =task_new_game_prof_birch_speech_13 + 1 str r0, [r3] _08030FCA: pop {r4} pop {r0} bx r0 .align 2, 0 -_08030FD0: .4byte task_new_game_prof_birch_speech_13 + 1 + .pool thumb_func_end sub_8030F7C thumb_func_start task_new_game_prof_birch_speech_14 @@ -101253,26 +98879,23 @@ task_new_game_prof_birch_speech_14: @ 8030FD4 lsrs r4, 24 movs r0, 0 bl sub_8032318 - ldr r0, _08031004 - ldr r1, _08031008 + ldr r0, =0x02021fc4 + ldr r1, =0x082c8bff bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r1, _0803100C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08031010 + ldr r1, =task_new_game_prof_birch_speech_15 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08031004: .4byte 0x02021fc4 -_08031008: .4byte 0x082c8bff -_0803100C: .4byte 0x03005e00 -_08031010: .4byte task_new_game_prof_birch_speech_15 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_14 thumb_func_start task_new_game_prof_birch_speech_15 @@ -101284,20 +98907,19 @@ task_new_game_prof_birch_speech_15: @ 8031014 lsls r0, 16 cmp r0, 0 bne _08031032 - ldr r0, _08031038 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0803103C + ldr r0, =task_new_game_prof_birch_speech_16 + 1 str r0, [r1] _08031032: pop {r4} pop {r0} bx r0 .align 2, 0 -_08031038: .4byte 0x03005e00 -_0803103C: .4byte task_new_game_prof_birch_speech_16 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_15 thumb_func_start task_new_game_prof_birch_speech_16 @@ -101306,7 +98928,7 @@ task_new_game_prof_birch_speech_16: @ 8031040 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08031084 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -101324,12 +98946,12 @@ _0803105C: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _08031088 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0803108C + ldr r1, =task_new_game_prof_birch_speech_17 + 1 str r1, [r0] _0803107A: add sp, 0x4 @@ -101337,9 +98959,7 @@ _0803107A: pop {r0} bx r0 .align 2, 0 -_08031084: .4byte 0x030022c0 -_08031088: .4byte 0x03005e00 -_0803108C: .4byte task_new_game_prof_birch_speech_17 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_16 thumb_func_start task_new_game_prof_birch_speech_17 @@ -101348,7 +98968,7 @@ task_new_game_prof_birch_speech_17: @ 8031090 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080310F4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -101357,7 +98977,7 @@ task_new_game_prof_birch_speech_17: @ 8031090 cmp r5, 0 bne _080310EC bl Window_FreeMemory - ldr r1, _080310F8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -101374,11 +98994,11 @@ task_new_game_prof_birch_speech_17: @ 8031090 bl set_default_player_name adds r0, r4, 0 bl remove_task - ldr r0, _080310FC + ldr r0, =0x03005d90 ldr r1, [r0] ldrb r2, [r1, 0x8] str r5, [sp] - ldr r0, _08031100 + ldr r0, =new_game_prof_birch_speech_part2_start + 1 str r0, [sp, 0x4] movs r0, 0 movs r3, 0 @@ -101389,10 +99009,7 @@ _080310EC: pop {r0} bx r0 .align 2, 0 -_080310F4: .4byte 0x02037fd4 -_080310F8: .4byte 0x03005e00 -_080310FC: .4byte 0x03005d90 -_08031100: .4byte new_game_prof_birch_speech_part2_start + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_17 thumb_func_start task_new_game_prof_birch_speech_part2_2 @@ -101403,26 +99020,23 @@ task_new_game_prof_birch_speech_part2_2: @ 8031104 lsrs r4, 24 movs r0, 0 bl sub_8032318 - ldr r0, _08031134 - ldr r1, _08031138 + ldr r0, =0x02021fc4 + ldr r1, =0x082c8c1c bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r1, _0803113C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08031140 + ldr r1, =task_new_game_prof_birch_speech_part2_3 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08031134: .4byte 0x02021fc4 -_08031138: .4byte 0x082c8c1c -_0803113C: .4byte 0x03005e00 -_08031140: .4byte task_new_game_prof_birch_speech_part2_3 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_2 thumb_func_start task_new_game_prof_birch_speech_part2_3 @@ -101444,12 +99058,12 @@ task_new_game_prof_birch_speech_part2_3: @ 8031144 movs r2, 0xF3 movs r3, 0xDF bl sub_80323CC - ldr r1, _08031180 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08031184 + ldr r1, =task_new_game_prof_birch_speech_part2_4 + 1 str r1, [r0] _08031178: add sp, 0x8 @@ -101457,8 +99071,7 @@ _08031178: pop {r0} bx r0 .align 2, 0 -_08031180: .4byte 0x03005e00 -_08031184: .4byte task_new_game_prof_birch_speech_part2_4 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_3 thumb_func_start task_new_game_prof_birch_speech_part2_4 @@ -101485,8 +99098,8 @@ _080311A8: _080311AE: movs r0, 0x5 bl audio_play - ldr r2, _080311F0 - ldr r0, _080311F4 + ldr r2, =0x02020630 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -101510,30 +99123,27 @@ _080311AE: adds r0, r5, 0 movs r1, 0x1 bl sub_8031C88 - ldr r0, _080311F8 + ldr r0, =task_new_game_prof_birch_speech_part2_5 + 1 str r0, [r4] b _08031210 .align 2, 0 -_080311F0: .4byte 0x02020630 -_080311F4: .4byte 0x03005e00 -_080311F8: .4byte task_new_game_prof_birch_speech_part2_5 + 1 + .pool _080311FC: movs r0, 0x5 bl audio_play - ldr r0, _08031218 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _0803121C + ldr r0, =task_new_game_prof_birch_speech_11 + 1 str r0, [r1] _08031210: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08031218: .4byte 0x03005e00 -_0803121C: .4byte task_new_game_prof_birch_speech_11 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_4 thumb_func_start task_new_game_prof_birch_speech_part2_5 @@ -101541,7 +99151,7 @@ task_new_game_prof_birch_speech_part2_5: @ 8031220 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08031248 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -101558,15 +99168,15 @@ task_new_game_prof_birch_speech_part2_5: @ 8031220 bl lcd_io_set b _08031250 .align 2, 0 -_08031248: .4byte 0x03005e00 + .pool _0803124C: - ldr r0, _08031254 + ldr r0, =task_new_game_prof_birch_speech_part2_6 + 1 str r0, [r1] _08031250: pop {r0} bx r0 .align 2, 0 -_08031254: .4byte task_new_game_prof_birch_speech_part2_6 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_5 thumb_func_start task_new_game_prof_birch_speech_part2_6 @@ -101574,7 +99184,7 @@ task_new_game_prof_birch_speech_part2_6: @ 8031258 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08031328 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -101583,7 +99193,7 @@ task_new_game_prof_birch_speech_part2_6: @ 8031258 ldrsh r0, [r7, r1] cmp r0, 0 beq _08031320 - ldr r5, _0803132C + ldr r5, =0x02020630 movs r2, 0x1C ldrsh r1, [r7, r2] lsls r0, r1, 4 @@ -101659,23 +99269,19 @@ task_new_game_prof_birch_speech_part2_6: @ 8031258 bl sub_8031D34 movs r0, 0 bl sub_8032318 - ldr r0, _08031330 - ldr r1, _08031334 + ldr r0, =0x02021fc4 + ldr r1, =0x082c8c2a bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r0, _08031338 + ldr r0, =task_new_game_prof_birch_speech_part2_7 + 1 str r0, [r7] _08031320: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08031328: .4byte 0x03005e00 -_0803132C: .4byte 0x02020630 -_08031330: .4byte 0x02021fc4 -_08031334: .4byte 0x082c8c2a -_08031338: .4byte task_new_game_prof_birch_speech_part2_7 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_6 thumb_func_start task_new_game_prof_birch_speech_part2_7 @@ -101683,7 +99289,7 @@ task_new_game_prof_birch_speech_part2_7: @ 803133C push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080313D8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -101692,7 +99298,7 @@ task_new_game_prof_birch_speech_part2_7: @ 803133C ldrsh r0, [r4, r1] cmp r0, 0 beq _080313D2 - ldr r7, _080313DC + ldr r7, =0x02020630 movs r1, 0x18 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -101750,16 +99356,14 @@ task_new_game_prof_birch_speech_part2_7: @ 803133C bl sub_8031C88 movs r0, 0x40 strh r0, [r4, 0x16] - ldr r0, _080313E0 + ldr r0, =task_new_game_prof_birch_speech_part2_8 + 1 str r0, [r4] _080313D2: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080313D8: .4byte 0x03005e00 -_080313DC: .4byte 0x02020630 -_080313E0: .4byte task_new_game_prof_birch_speech_part2_8 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_7 thumb_func_start task_new_game_prof_birch_speech_part2_8 @@ -101767,7 +99371,7 @@ task_new_game_prof_birch_speech_part2_8: @ 80313E4 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0803143C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -101777,7 +99381,7 @@ task_new_game_prof_birch_speech_part2_8: @ 80313E4 adds r7, r1, 0 cmp r0, 0 beq _080314B0 - ldr r2, _08031440 + ldr r2, =0x02020630 movs r3, 0x18 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -101808,10 +99412,9 @@ task_new_game_prof_birch_speech_part2_8: @ 80313E4 strh r0, [r4, 0x16] b _080314B0 .align 2, 0 -_0803143C: .4byte 0x03005e00 -_08031440: .4byte 0x02020630 + .pool _08031444: - ldr r0, _08031454 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 @@ -101819,7 +99422,7 @@ _08031444: ldrb r5, [r4, 0x1E] b _0803145A .align 2, 0 -_08031454: .4byte 0x03005d90 + .pool _08031458: ldrb r5, [r4, 0x1C] _0803145A: @@ -101855,21 +99458,19 @@ _0803145A: adds r0, r6, 0 movs r1, 0x1 bl sub_8031D34 - ldr r0, _080314B8 - ldr r1, _080314BC + ldr r0, =0x02021fc4 + ldr r1, =0x082c8c7a bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r0, _080314C0 + ldr r0, =task_new_game_prof_birch_speech_part2_9 + 1 str r0, [r4] _080314B0: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080314B8: .4byte 0x02021fc4 -_080314BC: .4byte 0x082c8c7a -_080314C0: .4byte task_new_game_prof_birch_speech_part2_9 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_8 thumb_func_start task_new_game_prof_birch_speech_part2_9 @@ -101880,7 +99481,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r2, _08031568 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -101889,7 +99490,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4 ldrsh r0, [r6, r1] cmp r0, 0 beq _0803155C - ldr r7, _0803156C + ldr r7, =0x02020630 movs r1, 0xC ldrsh r0, [r6, r1] lsls r1, r0, 4 @@ -101922,7 +99523,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4 adds r0, r7, 0 adds r0, 0x10 adds r0, r4, r0 - ldr r1, _08031570 + ldr r1, =0x082ff114 str r1, [r0] adds r0, r5, 0 bl obj_alloc_rotscale_entry @@ -101932,9 +99533,9 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4 adds r0, r7, 0 adds r0, 0x1C adds r4, r0 - ldr r0, _08031574 + ldr r0, =sub_80318D8 + 1 str r0, [r4] - ldr r0, _08031578 + ldr r0, =0x0000ffff mov r1, r8 str r1, [sp] movs r1, 0 @@ -101943,7 +99544,7 @@ task_new_game_prof_birch_speech_part2_9: @ 80314C4 bl sub_80A1AD4 movs r0, 0x4 bl play_sound_effect - ldr r0, _0803157C + ldr r0, =task_new_game_prof_birch_speech_part2_10 + 1 str r0, [r6] _0803155C: add sp, 0x4 @@ -101953,12 +99554,7 @@ _0803155C: pop {r0} bx r0 .align 2, 0 -_08031568: .4byte 0x03005e00 -_0803156C: .4byte 0x02020630 -_08031570: .4byte 0x082ff114 -_08031574: .4byte sub_80318D8 + 1 -_08031578: .4byte 0x0000ffff -_0803157C: .4byte task_new_game_prof_birch_speech_part2_10 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_9 thumb_func_start task_new_game_prof_birch_speech_part2_10 @@ -101966,13 +99562,13 @@ task_new_game_prof_birch_speech_part2_10: @ 8031580 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080315B0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r3, r1, r2 ldrb r1, [r3, 0xC] - ldr r2, _080315B4 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -101982,15 +99578,13 @@ task_new_game_prof_birch_speech_part2_10: @ 8031580 lsls r0, 26 cmp r0, 0 bge _080315AA - ldr r0, _080315B8 + ldr r0, =task_new_game_prof_birch_speech_part2_11 + 1 str r0, [r3] _080315AA: pop {r0} bx r0 .align 2, 0 -_080315B0: .4byte 0x03005e00 -_080315B4: .4byte 0x02020630 -_080315B8: .4byte task_new_game_prof_birch_speech_part2_11 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_10 thumb_func_start task_new_game_prof_birch_speech_part2_11 @@ -101999,38 +99593,38 @@ task_new_game_prof_birch_speech_part2_11: @ 80315BC sub sp, 0x4 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08031614 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0803160A - ldr r0, _08031618 + ldr r0, =0x03005e00 lsls r4, r2, 2 adds r4, r2 lsls r4, 3 adds r4, r0 ldrb r2, [r4, 0xC] - ldr r1, _0803161C + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 adds r1, 0x1C adds r0, r1 - ldr r1, _08031620 + ldr r1, =nullsub_11 + 1 str r1, [r0] movs r1, 0x82 lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _08031624 - ldr r1, _08031628 + ldr r0, =0xffff0000 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0803162C + ldr r0, =task_new_game_prof_birch_speech_part2_12 + 1 str r0, [r4] _0803160A: add sp, 0x4 @@ -102038,13 +99632,7 @@ _0803160A: pop {r0} bx r0 .align 2, 0 -_08031614: .4byte 0x02037fd4 -_08031618: .4byte 0x03005e00 -_0803161C: .4byte 0x02020630 -_08031620: .4byte nullsub_11 + 1 -_08031624: .4byte 0xffff0000 -_08031628: .4byte 0x0000ffff -_0803162C: .4byte task_new_game_prof_birch_speech_part2_12 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_11 thumb_func_start task_new_game_prof_birch_speech_part2_12 @@ -102052,14 +99640,14 @@ task_new_game_prof_birch_speech_part2_12: @ 8031630 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0803166C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08031666 bl Window_FreeMemory - ldr r1, _08031670 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -102067,7 +99655,7 @@ task_new_game_prof_birch_speech_part2_12: @ 8031630 ldrh r0, [r0, 0x1A] bl sub_818D820 bl dp13_810BB8C - ldr r0, _08031674 + ldr r0, =c2_new_game + 1 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -102076,9 +99664,7 @@ _08031666: pop {r0} bx r0 .align 2, 0 -_0803166C: .4byte 0x02037fd4 -_08031670: .4byte 0x03005e00 -_08031674: .4byte c2_new_game + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_12 thumb_func_start new_game_prof_birch_speech_part2_start @@ -102094,11 +99680,11 @@ new_game_prof_birch_speech_part2_start: @ 8031678 lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r1, _080317A0 + ldr r1, =0x082ff0e8 movs r0, 0 movs r2, 0x2 bl bg_vram_setup - ldr r0, _080317A4 + ldr r0, =0x082ff0f0 bl bg_init_bg_config_2_from_bg_config_3 movs r0, 0 bl SetVBlankCallback @@ -102132,12 +99718,12 @@ new_game_prof_birch_speech_part2_start: @ 8031678 add r0, sp, 0x4 movs r4, 0 strh r4, [r0] - ldr r1, _080317A8 + ldr r1, =0x040000d4 str r0, [r1] movs r4, 0xC0 lsls r4, 19 str r4, [r1, 0x4] - ldr r0, _080317AC + ldr r0, =0x8100c000 str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r2, 0 @@ -102147,7 +99733,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678 movs r0, 0xE0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _080317B0 + ldr r0, =0x85000100 str r0, [r1, 0x8] ldr r0, [r1, 0x8] add r0, sp, 0x4 @@ -102156,38 +99742,38 @@ new_game_prof_birch_speech_part2_start: @ 8031678 movs r0, 0xA0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _080317B4 + ldr r0, =0x81000200 str r0, [r1, 0x8] ldr r0, [r1, 0x8] bl sub_80A1A74 - ldr r0, _080317B8 + ldr r0, =0x082fed3c adds r1, r4, 0 bl LZ77UnCompVram - ldr r0, _080317BC - ldr r1, _080317C0 + ldr r0, =0x082feef0 + ldr r1, =0x06003800 bl LZ77UnCompVram - ldr r0, _080317C4 + ldr r0, =0x082fecfc movs r1, 0 movs r2, 0x40 bl gpu_pal_apply - ldr r0, _080317C8 + ldr r0, =0x082ff01a movs r1, 0x1 movs r2, 0x10 bl gpu_pal_apply bl clear_tasks - ldr r0, _080317CC + ldr r0, =task_new_game_prof_birch_speech_part2_1 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080317D0 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r4, r0, r1 movs r0, 0x5 strh r0, [r4, 0x16] - ldr r0, _080317D4 + ldr r0, =0x0000ffc4 strh r0, [r4, 0x10] bl remove_some_task bl reset_all_obj_data @@ -102195,7 +99781,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678 bl dp13_810BB8C adds r0, r5, 0 bl sub_803192C - ldr r0, _080317D8 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 @@ -102205,26 +99791,12 @@ new_game_prof_birch_speech_part2_start: @ 8031678 ldrb r3, [r4, 0x1E] b _080317E0 .align 2, 0 -_080317A0: .4byte 0x082ff0e8 -_080317A4: .4byte 0x082ff0f0 -_080317A8: .4byte 0x040000d4 -_080317AC: .4byte 0x8100c000 -_080317B0: .4byte 0x85000100 -_080317B4: .4byte 0x81000200 -_080317B8: .4byte 0x082fed3c -_080317BC: .4byte 0x082feef0 -_080317C0: .4byte 0x06003800 -_080317C4: .4byte 0x082fecfc -_080317C8: .4byte 0x082ff01a -_080317CC: .4byte task_new_game_prof_birch_speech_part2_1 + 1 -_080317D0: .4byte 0x03005e00 -_080317D4: .4byte 0x0000ffc4 -_080317D8: .4byte 0x03005d90 + .pool _080317DC: strh r0, [r4, 0x14] ldrb r3, [r4, 0x1C] _080317E0: - ldr r0, _080318B4 + ldr r0, =0x02020630 lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -102239,13 +99811,13 @@ _080317E0: subs r0, 0x41 ands r0, r2 strb r0, [r1] - ldr r1, _080318B8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 strh r3, [r0, 0xC] - ldr r1, _080318BC + ldr r1, =0x0000ffc4 movs r0, 0x14 bl lcd_io_set movs r0, 0x1 @@ -102280,20 +99852,20 @@ _080317E0: bl gpu_sync_bg_show movs r0, 0x1 bl gpu_sync_bg_show - ldr r3, _080318C0 + ldr r3, =0x04000208 ldrh r2, [r3] strh r4, [r3] - ldr r4, _080318C4 + ldr r4, =0x04000200 ldrh r0, [r4] movs r1, 0x1 orrs r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, _080318C8 + ldr r0, =sub_802F6C8 + 1 bl SetVBlankCallback - ldr r0, _080318CC + ldr r0, =c2_title_menu_3 + 1 bl set_callback2 - ldr r0, _080318D0 + ldr r0, =0x082ff080 bl Window_InitFromTemplates movs r0, 0 movs r1, 0xF3 @@ -102312,14 +99884,7 @@ _080317E0: pop {r0} bx r0 .align 2, 0 -_080318B4: .4byte 0x02020630 -_080318B8: .4byte 0x03005e00 -_080318BC: .4byte 0x0000ffc4 -_080318C0: .4byte 0x04000208 -_080318C4: .4byte 0x04000200 -_080318C8: .4byte sub_802F6C8 + 1 -_080318CC: .4byte c2_title_menu_3 + 1 -_080318D0: .4byte 0x082ff080 + .pool thumb_func_end new_game_prof_birch_speech_part2_start thumb_func_start nullsub_11 @@ -102352,12 +99917,12 @@ sub_80318F4: @ 80318F4 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _08031924 + ldr r2, =0x00000127 str r0, [sp] str r1, [sp, 0x4] movs r0, 0xE str r0, [sp, 0x8] - ldr r0, _08031928 + ldr r0, =0x0000ffff str r0, [sp, 0xC] adds r0, r2, 0 movs r1, 0x8 @@ -102370,8 +99935,7 @@ sub_80318F4: @ 80318F4 pop {r1} bx r1 .align 2, 0 -_08031924: .4byte 0x00000127 -_08031928: .4byte 0x0000ffff + .pool thumb_func_end sub_80318F4 thumb_func_start sub_803192C @@ -102391,7 +99955,7 @@ sub_803192C: @ 803192C bl sub_80B5F44 lsls r0, 24 lsrs r0, 24 - ldr r1, _08031A4C + ldr r1, =0x02020630 mov r9, r1 lsls r2, r0, 4 adds r2, r0 @@ -102400,7 +99964,7 @@ sub_803192C: @ 803192C add r3, r9 mov r8, r3 adds r1, r2, r3 - ldr r7, _08031A50 + ldr r7, =nullsub_11 + 1 str r7, [r1] add r2, r9 ldrb r3, [r2, 0x5] @@ -102416,7 +99980,7 @@ sub_803192C: @ 803192C mov r3, r10 orrs r1, r3 strb r1, [r2] - ldr r1, _08031A54 + ldr r1, =0x03005e00 lsls r5, r4, 2 adds r5, r4 lsls r5, 3 @@ -102448,7 +100012,7 @@ sub_803192C: @ 803192C bl sub_806EFF0 lsls r0, 24 lsrs r0, 24 - ldr r4, _08031A58 + ldr r4, =0x0201c000 str r4, [sp] movs r1, 0x78 movs r2, 0x3C @@ -102478,7 +100042,7 @@ sub_803192C: @ 803192C bl sub_806EFF0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08031A58 + ldr r1, =0x0201c000 movs r2, 0x80 lsls r2, 4 adds r4, r1, r2 @@ -102515,10 +100079,7 @@ sub_803192C: @ 803192C pop {r0} bx r0 .align 2, 0 -_08031A4C: .4byte 0x02020630 -_08031A50: .4byte nullsub_11 + 1 -_08031A54: .4byte 0x03005e00 -_08031A58: .4byte 0x0201c000 + .pool thumb_func_end sub_803192C thumb_func_start waterfall_4_check_if_can_continue @@ -102526,7 +100087,7 @@ waterfall_4_check_if_can_continue: @ 8031A5C push {r4,r5,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r4, _08031A90 + ldr r4, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -102548,7 +100109,7 @@ waterfall_4_check_if_can_continue: @ 8031A5C bl remove_task b _08031AC4 .align 2, 0 -_08031A90: .4byte 0x03005e00 + .pool _08031A94: ldrh r3, [r2, 0x10] movs r4, 0x10 @@ -102601,7 +100162,7 @@ sub_8031ACC: @ 8031ACC movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r0, _08031B34 + ldr r0, =0x03005e00 mov r8, r0 lsls r0, r4, 2 adds r0, r4 @@ -102609,7 +100170,7 @@ sub_8031ACC: @ 8031ACC add r0, r8 movs r6, 0 strh r6, [r0, 0x12] - ldr r0, _08031B38 + ldr r0, =waterfall_4_check_if_can_continue + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -102630,8 +100191,7 @@ sub_8031ACC: @ 8031ACC pop {r0} bx r0 .align 2, 0 -_08031B34: .4byte 0x03005e00 -_08031B38: .4byte waterfall_4_check_if_can_continue + 1 + .pool thumb_func_end sub_8031ACC thumb_func_start sub_8031B3C @@ -102639,7 +100199,7 @@ sub_8031B3C: @ 8031B3C push {r4,r5,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r4, _08031B70 + ldr r4, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -102661,7 +100221,7 @@ sub_8031B3C: @ 8031B3C bl remove_task b _08031BA4 .align 2, 0 -_08031B70: .4byte 0x03005e00 + .pool _08031B74: ldrh r3, [r2, 0x10] movs r4, 0x10 @@ -102715,7 +100275,7 @@ sub_8031BAC: @ 8031BAC movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r0, _08031C14 + ldr r0, =0x03005e00 mov r8, r0 lsls r0, r4, 2 adds r0, r4 @@ -102723,7 +100283,7 @@ sub_8031BAC: @ 8031BAC add r0, r8 movs r6, 0 strh r6, [r0, 0x12] - ldr r0, _08031C18 + ldr r0, =sub_8031B3C + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -102744,8 +100304,7 @@ sub_8031BAC: @ 8031BAC pop {r0} bx r0 .align 2, 0 -_08031C14: .4byte 0x03005e00 -_08031C18: .4byte sub_8031B3C + 1 + .pool thumb_func_end sub_8031BAC thumb_func_start sub_8031C1C @@ -102753,7 +100312,7 @@ sub_8031C1C: @ 8031C1C push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08031C3C + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -102767,7 +100326,7 @@ sub_8031C1C: @ 8031C1C strh r0, [r1, 0xC] b _08031C7C .align 2, 0 -_08031C3C: .4byte 0x03005e00 + .pool _08031C40: ldrh r3, [r1, 0xA] movs r4, 0xA @@ -102794,7 +100353,7 @@ _08031C62: movs r2, 0xA ldrsh r0, [r1, r2] lsls r0, 1 - ldr r1, _08031C84 + ldr r1, =0x082ff018 adds r0, r1 movs r1, 0x1 movs r2, 0x10 @@ -102804,7 +100363,7 @@ _08031C7C: pop {r0} bx r0 .align 2, 0 -_08031C84: .4byte 0x082ff018 + .pool thumb_func_end sub_8031C1C thumb_func_start sub_8031C88 @@ -102816,12 +100375,12 @@ sub_8031C88: @ 8031C88 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _08031CC0 + ldr r0, =sub_8031C1C + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08031CC4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -102837,8 +100396,7 @@ sub_8031C88: @ 8031C88 pop {r0} bx r0 .align 2, 0 -_08031CC0: .4byte sub_8031C1C + 1 -_08031CC4: .4byte 0x03005e00 + .pool thumb_func_end sub_8031C88 thumb_func_start sub_8031CC8 @@ -102846,7 +100404,7 @@ sub_8031CC8: @ 8031CC8 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08031CE8 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -102860,7 +100418,7 @@ sub_8031CC8: @ 8031CC8 strh r0, [r1, 0xC] b _08031D28 .align 2, 0 -_08031CE8: .4byte 0x03005e00 + .pool _08031CEC: ldrh r3, [r1, 0xA] movs r4, 0xA @@ -102887,7 +100445,7 @@ _08031D0E: movs r2, 0xA ldrsh r0, [r1, r2] lsls r0, 1 - ldr r1, _08031D30 + ldr r1, =0x082ff018 adds r0, r1 movs r1, 0x1 movs r2, 0x10 @@ -102897,7 +100455,7 @@ _08031D28: pop {r0} bx r0 .align 2, 0 -_08031D30: .4byte 0x082ff018 + .pool thumb_func_end sub_8031CC8 thumb_func_start sub_8031D34 @@ -102909,12 +100467,12 @@ sub_8031D34: @ 8031D34 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _08031D6C + ldr r0, =sub_8031CC8 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08031D70 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -102929,20 +100487,19 @@ sub_8031D34: @ 8031D34 pop {r0} bx r0 .align 2, 0 -_08031D6C: .4byte sub_8031CC8 + 1 -_08031D70: .4byte 0x03005e00 + .pool thumb_func_end sub_8031D34 thumb_func_start sub_8031D74 sub_8031D74: @ 8031D74 push {lr} - ldr r0, _08031DAC + ldr r0, =0x082ff088 movs r1, 0xF3 bl write_textbox_border_to_bg_tilemap movs r0, 0x1 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _08031DB0 + ldr r2, =0x082ff118 movs r0, 0x1 movs r1, 0x2 bl PrintMenuTable @@ -102958,8 +100515,7 @@ sub_8031D74: @ 8031D74 pop {r0} bx r0 .align 2, 0 -_08031DAC: .4byte 0x082ff088 -_08031DB0: .4byte 0x082ff118 + .pool thumb_func_end sub_8031D74 thumb_func_start sub_8031DB4 @@ -102977,25 +100533,24 @@ set_default_player_name: @ 8031DC4 push {r4,r5,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08031DDC + ldr r1, =0x03005d90 ldr r0, [r1] ldrb r0, [r0, 0x8] adds r5, r1, 0 cmp r0, 0 bne _08031DE4 - ldr r1, _08031DE0 + ldr r1, =0x082ff128 b _08031DE6 .align 2, 0 -_08031DDC: .4byte 0x03005d90 -_08031DE0: .4byte 0x082ff128 + .pool _08031DE4: - ldr r1, _08031E10 + ldr r1, =0x082ff178 _08031DE6: lsls r0, r2, 2 adds r0, r1 ldr r3, [r0] movs r2, 0 - ldr r4, _08031E14 + ldr r4, =0x03005d90 _08031DF0: ldr r1, [r4] adds r1, r2 @@ -103014,8 +100569,7 @@ _08031DF0: pop {r0} bx r0 .align 2, 0 -_08031E10: .4byte 0x082ff178 -_08031E14: .4byte 0x03005d90 + .pool thumb_func_end set_default_player_name thumb_func_start draw_text_box @@ -103042,13 +100596,13 @@ draw_text_box: @ 8031E18 movs r0, 0x7 movs r1, 0x2 bl Window_CopyToVram - ldr r0, _08031E6C - ldr r1, _08031E70 + ldr r0, =0x082ff070 + ldr r1, =0x000001d5 bl write_textbox_border_to_bg_tilemap - ldr r1, _08031E74 + ldr r1, =0x000009e7 movs r0, 0x40 bl lcd_io_set - ldr r1, _08031E78 + ldr r1, =0x0000719f movs r0, 0x44 bl lcd_io_set add sp, 0xC @@ -103056,10 +100610,7 @@ draw_text_box: @ 8031E18 pop {r0} bx r0 .align 2, 0 -_08031E6C: .4byte 0x082ff070 -_08031E70: .4byte 0x000001d5 -_08031E74: .4byte 0x000009e7 -_08031E78: .4byte 0x0000719f + .pool thumb_func_end draw_text_box thumb_func_start fmt_savegame @@ -103077,11 +100628,11 @@ fmt_savegame: @ 8031E7C fmt_time: @ 8031E94 push {r4-r6,lr} sub sp, 0xC - ldr r4, _08031EE8 - ldr r1, _08031EEC + ldr r4, =0x02021fc4 + ldr r1, =0x085edcc3 adds r0, r4, 0 bl ExpandTextCodes - ldr r6, _08031EF0 + ldr r6, =0x082ff0e3 str r6, [sp] movs r5, 0x1 negs r5, r5 @@ -103092,7 +100643,7 @@ fmt_time: @ 8031E94 movs r2, 0 movs r3, 0x11 bl box_print - ldr r4, _08031EF4 + ldr r4, =0x03005d90 ldr r1, [r4] movs r0, 0x1 movs r2, 0x64 @@ -103113,21 +100664,18 @@ fmt_time: @ 8031E94 pop {r0} bx r0 .align 2, 0 -_08031EE8: .4byte 0x02021fc4 -_08031EEC: .4byte 0x085edcc3 -_08031EF0: .4byte 0x082ff0e3 -_08031EF4: .4byte 0x03005d90 + .pool thumb_func_end fmt_time thumb_func_start fmt_player fmt_player: @ 8031EF8 push {r4-r6,lr} sub sp, 0x2C - ldr r4, _08031F6C - ldr r1, _08031F70 + ldr r4, =0x02021fc4 + ldr r1, =0x085edcca adds r0, r4, 0 bl ExpandTextCodes - ldr r6, _08031F74 + ldr r6, =0x082ff0e3 str r6, [sp] movs r5, 0x1 negs r5, r5 @@ -103138,7 +100686,7 @@ fmt_player: @ 8031EF8 movs r2, 0x6C movs r3, 0x11 bl box_print - ldr r4, _08031F78 + ldr r4, =0x03005d90 ldr r0, [r4] ldrh r1, [r0, 0xE] add r0, sp, 0xC @@ -103173,17 +100721,14 @@ fmt_player: @ 8031EF8 pop {r0} bx r0 .align 2, 0 -_08031F6C: .4byte 0x02021fc4 -_08031F70: .4byte 0x085edcca -_08031F74: .4byte 0x082ff0e3 -_08031F78: .4byte 0x03005d90 + .pool thumb_func_end fmt_player thumb_func_start fmt_pokedex fmt_pokedex: @ 8031F7C push {r4-r7,lr} sub sp, 0x2C - ldr r0, _08031FA0 + ldr r0, =0x00000861 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -103196,18 +100741,18 @@ fmt_pokedex: @ 8031F7C bl pokedex_count b _08031FAA .align 2, 0 -_08031FA0: .4byte 0x00000861 + .pool _08031FA4: movs r0, 0x1 bl sub_80C0844 _08031FAA: lsls r0, 16 lsrs r7, r0, 16 - ldr r4, _08032008 - ldr r1, _0803200C + ldr r4, =0x02021fc4 + ldr r1, =0x085edccf adds r0, r4, 0 bl ExpandTextCodes - ldr r6, _08032010 + ldr r6, =0x082ff0e3 str r6, [sp] movs r5, 0x1 negs r5, r5 @@ -103244,9 +100789,7 @@ _08031FFE: pop {r0} bx r0 .align 2, 0 -_08032008: .4byte 0x02021fc4 -_0803200C: .4byte 0x085edccf -_08032010: .4byte 0x082ff0e3 + .pool thumb_func_end fmt_pokedex thumb_func_start fmt_badges @@ -103254,7 +100797,7 @@ fmt_badges: @ 8032014 push {r4-r7,lr} sub sp, 0x2C movs r7, 0 - ldr r4, _08032090 + ldr r4, =0x00000867 _0803201C: lsls r0, r4, 16 lsrs r0, 16 @@ -103267,14 +100810,14 @@ _0803201C: lsrs r7, r0, 24 _08032030: adds r4, 0x1 - ldr r0, _08032094 + ldr r0, =0x0000086e cmp r4, r0 bls _0803201C - ldr r4, _08032098 - ldr r1, _0803209C + ldr r4, =0x02021fc4 + ldr r1, =0x085edcd7 adds r0, r4, 0 bl ExpandTextCodes - ldr r6, _080320A0 + ldr r6, =0x082ff0e3 str r6, [sp] movs r5, 0x1 negs r5, r5 @@ -103310,11 +100853,7 @@ _08032030: pop {r0} bx r0 .align 2, 0 -_08032090: .4byte 0x00000867 -_08032094: .4byte 0x0000086e -_08032098: .4byte 0x02021fc4 -_0803209C: .4byte 0x085edcd7 -_080320A0: .4byte 0x082ff0e3 + .pool thumb_func_end fmt_badges thumb_func_start unknown_title_pattern_data_to_vram @@ -103326,7 +100865,7 @@ unknown_title_pattern_data_to_vram: @ 80320A4 lsrs r4, 24 lsls r5, 16 lsrs r5, 16 - ldr r6, _080320E8 + ldr r6, =0x03005d90 ldr r0, [r6] ldrb r0, [r0, 0x14] lsrs r0, 3 @@ -103349,7 +100888,7 @@ unknown_title_pattern_data_to_vram: @ 80320A4 pop {r0} bx r0 .align 2, 0 -_080320E8: .4byte 0x03005d90 + .pool thumb_func_end unknown_title_pattern_data_to_vram thumb_func_start write_textbox_border_to_bg_tilemap @@ -103610,7 +101149,7 @@ sub_80322E0: @ 80322E0 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, _08032314 + ldr r1, =sub_8032298 + 1 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -103628,7 +101167,7 @@ _0803230E: pop {r0} bx r0 .align 2, 0 -_08032314: .4byte sub_8032298 + 1 + .pool thumb_func_end sub_80322E0 thumb_func_start sub_8032318 @@ -103704,21 +101243,20 @@ sub_80323A0: @ 80323A0 ldrb r0, [r0] cmp r0, 0x8 bne _080323C0 - ldr r1, _080323C4 + ldr r1, =0x02022d04 ldrb r0, [r1] cmp r0, 0 bne _080323C0 movs r0, 0x1 strb r0, [r1] - ldr r0, _080323C8 + ldr r0, =sub_8030A70 + 1 movs r1, 0 bl AddTask _080323C0: pop {r0} bx r0 .align 2, 0 -_080323C4: .4byte 0x02022d04 -_080323C8: .4byte sub_8030A70 + 1 + .pool thumb_func_end sub_80323A0 thumb_func_start sub_80323CC @@ -103786,7 +101324,7 @@ unknown_rbox_to_vram: @ 803243C lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, _08032470 + ldr r1, =sub_8032474 + 1 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -103804,7 +101342,7 @@ _0803246A: pop {r0} bx r0 .align 2, 0 -_08032470: .4byte sub_8032474 + 1 + .pool thumb_func_end unknown_rbox_to_vram thumb_func_start sub_8032474 @@ -103879,7 +101417,7 @@ sub_8032474: @ 8032474 ldr r2, [sp, 0xC] adds r3, r5, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _08032600 + ldr r1, =0x00000101 ldr r7, [sp, 0xC] add r7, r9 subs r0, r7, 0x1 @@ -103903,7 +101441,7 @@ sub_8032474: @ 8032474 adds r2, r7, 0 adds r3, r5, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _08032604 + ldr r1, =0x00000103 str r4, [sp] movs r5, 0x5 str r5, [sp, 0x4] @@ -103912,7 +101450,7 @@ sub_8032474: @ 8032474 ldr r2, [sp, 0x14] mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _08032608 + ldr r1, =0x00000105 mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -103933,7 +101471,7 @@ sub_8032474: @ 8032474 adds r2, r7, 0 mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _0803260C + ldr r1, =0x000008fd ldr r2, [sp, 0x10] add r10, r2 mov r0, r10 @@ -103947,7 +101485,7 @@ sub_8032474: @ 8032474 ldr r2, [sp, 0x14] mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _08032610 + ldr r1, =0x000008ff str r4, [sp] str r4, [sp, 0x4] str r6, [sp, 0x8] @@ -103970,7 +101508,7 @@ sub_8032474: @ 8032474 ldr r2, [sp, 0xC] mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _08032614 + ldr r1, =0x00000901 str r4, [sp] str r4, [sp, 0x4] str r6, [sp, 0x8] @@ -103978,7 +101516,7 @@ sub_8032474: @ 8032474 ldr r2, [sp, 0x1C] mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _08032618 + ldr r1, =0x00000902 str r4, [sp] str r4, [sp, 0x4] str r6, [sp, 0x8] @@ -103995,13 +101533,7 @@ sub_8032474: @ 8032474 pop {r0} bx r0 .align 2, 0 -_08032600: .4byte 0x00000101 -_08032604: .4byte 0x00000103 -_08032608: .4byte 0x00000105 -_0803260C: .4byte 0x000008fd -_08032610: .4byte 0x000008ff -_08032614: .4byte 0x00000901 -_08032618: .4byte 0x00000902 + .pool thumb_func_end sub_8032474 thumb_func_start task_new_game_prof_birch_speech_part2_1 @@ -104009,7 +101541,7 @@ task_new_game_prof_birch_speech_part2_1: @ 803261C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0803264C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -104023,39 +101555,38 @@ task_new_game_prof_birch_speech_part2_1: @ 803261C movs r0, 0 movs r1, 0x1 bl unknown_rbox_to_vram - ldr r0, _08032650 + ldr r0, =task_new_game_prof_birch_speech_part2_2 + 1 str r0, [r4] _08032644: pop {r4} pop {r0} bx r0 .align 2, 0 -_0803264C: .4byte 0x03005e00 -_08032650: .4byte task_new_game_prof_birch_speech_part2_2 + 1 + .pool thumb_func_end task_new_game_prof_birch_speech_part2_1 thumb_func_start battle_wireless_setup_if_required_maybe battle_wireless_setup_if_required_maybe: @ 8032654 push {lr} - ldr r0, _0803268C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 beq _08032686 - ldr r0, _08032690 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0803266E bl sub_800B488 _0803266E: - ldr r0, _08032694 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0803267A bl sub_8009734 _0803267A: - ldr r0, _08032698 + ldr r0, =task00_08081A90 + 1 movs r1, 0 bl AddTask bl sub_8033244 @@ -104063,28 +101594,25 @@ _08032686: pop {r0} bx r0 .align 2, 0 -_0803268C: .4byte 0x02022fec -_08032690: .4byte 0x030030fc -_08032694: .4byte 0x03003124 -_08032698: .4byte task00_08081A90 + 1 + .pool thumb_func_end battle_wireless_setup_if_required_maybe thumb_func_start sub_803269C sub_803269C: @ 803269C push {r4-r7,lr} sub sp, 0x14 - ldr r0, _08032738 - ldr r1, _0803273C + ldr r0, =0x03005d04 + ldr r1, =nullsub_20 + 1 str r1, [r0] movs r0, 0 str r0, [sp, 0x10] movs r1, 0 - ldr r7, _08032740 - ldr r6, _08032744 + ldr r7, =0x03005d60 + ldr r6, =0x020244ac movs r2, 0 - ldr r5, _08032748 - ldr r4, _0803274C - ldr r3, _08032750 + ldr r5, =0x020244b0 + ldr r4, =nullsub_21 + 1 + ldr r3, =0x02024076 _080326B8: lsls r0, r1, 2 adds r0, r7 @@ -104105,21 +101633,21 @@ _080326B8: cmp r1, 0x3 ble _080326B8 bl battle_wireless_setup_if_required_maybe - ldr r0, _08032754 + ldr r0, =0x02024068 movs r5, 0 str r5, [r0] bl sub_80A3934 bl sub_806E414 movs r0, 0xF bl sub_81308C8 - ldr r0, _08032758 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x10 ands r0, r1 cmp r0, 0 beq _08032728 bl zero_enemy_party_data - ldr r4, _0803275C + ldr r4, =0x02024744 movs r1, 0x90 lsls r1, 1 str r5, [sp] @@ -104136,33 +101664,22 @@ _080326B8: add r2, sp, 0x10 bl pokemon_setattr _08032728: - ldr r0, _08032760 + ldr r0, =0x02022ff4 str r5, [r0] - ldr r0, _08032764 + ldr r0, =0x0202428c strb r5, [r0] add sp, 0x14 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08032738: .4byte 0x03005d04 -_0803273C: .4byte nullsub_20 + 1 -_08032740: .4byte 0x03005d60 -_08032744: .4byte 0x020244ac -_08032748: .4byte 0x020244b0 -_0803274C: .4byte nullsub_21 + 1 -_08032750: .4byte 0x02024076 -_08032754: .4byte 0x02024068 -_08032758: .4byte 0x02022fec -_0803275C: .4byte 0x02024744 -_08032760: .4byte 0x02022ff4 -_08032764: .4byte 0x0202428c + .pool thumb_func_end sub_803269C thumb_func_start sub_8032768 sub_8032768: @ 8032768 push {r4,r5,lr} - ldr r0, _08032780 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -104173,12 +101690,12 @@ sub_8032768: @ 8032768 bl sub_8184DA4 b _0803278A .align 2, 0 -_08032780: .4byte 0x02022fec + .pool _08032784: movs r0, 0x2 bl sub_8184DA4 _0803278A: - ldr r4, _080327AC + ldr r4, =0x02022fec ldr r0, [r4] movs r1, 0x80 lsls r1, 17 @@ -104195,19 +101712,19 @@ _0803279C: bl b_setup_bx_link b _080327B4 .align 2, 0 -_080327AC: .4byte 0x02022fec + .pool _080327B0: bl b_setup_bx _080327B4: bl sub_8033050 - ldr r0, _08032818 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _080327E2 movs r4, 0 - ldr r0, _0803281C + ldr r0, =0x0202406c ldrb r1, [r0] cmp r4, r1 bge _080327E2 @@ -104223,7 +101740,7 @@ _080327D0: blt _080327D0 _080327E2: movs r4, 0 - ldr r3, _08032820 + ldr r3, =0x0202449c movs r2, 0xD2 lsls r2, 1 movs r1, 0 @@ -104236,7 +101753,7 @@ _080327EC: cmp r4, 0x5F bls _080327EC movs r4, 0 - ldr r3, _08032820 + ldr r3, =0x0202449c movs r2, 0x81 lsls r2, 2 movs r1, 0 @@ -104252,9 +101769,7 @@ _08032804: pop {r0} bx r0 .align 2, 0 -_08032818: .4byte 0x02022fec -_0803281C: .4byte 0x0202406c -_08032820: .4byte 0x0202449c + .pool thumb_func_end sub_8032768 thumb_func_start b_setup_bx @@ -104264,54 +101779,49 @@ b_setup_bx: @ 8032824 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _0803285C + ldr r0, =0x02022fec ldr r3, [r0] movs r5, 0x80 lsls r5, 15 ands r5, r3 cmp r5, 0 beq _080328E4 - ldr r1, _08032860 - ldr r0, _08032864 + ldr r1, =0x03005d04 + ldr r0, =sub_8039ECC + 1 str r0, [r1] movs r4, 0x80 lsls r4, 17 ands r4, r3 cmp r4, 0 beq _08032874 - ldr r2, _08032868 - ldr r0, _0803286C + ldr r2, =0x03005d60 + ldr r0, =sub_818994C + 1 str r0, [r2] - ldr r1, _08032870 + ldr r1, =0x02024076 movs r0, 0 strb r0, [r1] b _0803287E .align 2, 0 -_0803285C: .4byte 0x02022fec -_08032860: .4byte 0x03005d04 -_08032864: .4byte sub_8039ECC + 1 -_08032868: .4byte 0x03005d60 -_0803286C: .4byte sub_818994C + 1 -_08032870: .4byte 0x02024076 + .pool _08032874: - ldr r2, _080328C8 - ldr r0, _080328CC + ldr r2, =0x03005d60 + ldr r0, =sub_805745C + 1 str r0, [r2] - ldr r1, _080328D0 + ldr r1, =0x02024076 strb r4, [r1] _0803287E: - ldr r3, _080328D4 + ldr r3, =sub_805F164 + 1 str r3, [r2, 0x4] movs r0, 0x1 strb r0, [r1, 0x1] - ldr r0, _080328D8 + ldr r0, =sub_81BADF4 + 1 str r0, [r2, 0x8] movs r0, 0x2 strb r0, [r1, 0x2] str r3, [r2, 0xC] movs r0, 0x3 strb r0, [r1, 0x3] - ldr r1, _080328DC + ldr r1, =0x0202406c movs r0, 0x4 strb r0, [r1] movs r0, 0 @@ -104326,20 +101836,14 @@ _0803287E: movs r0, 0x3 movs r1, 0x1 bl sub_81B8D64 - ldr r0, _080328E0 + ldr r0, =0x0202406e movs r1, 0 strh r1, [r0] strh r1, [r0, 0x2] movs r1, 0x3 b _08032A76 .align 2, 0 -_080328C8: .4byte 0x03005d60 -_080328CC: .4byte sub_805745C + 1 -_080328D0: .4byte 0x02024076 -_080328D4: .4byte sub_805F164 + 1 -_080328D8: .4byte sub_81BADF4 + 1 -_080328DC: .4byte 0x0202406c -_080328E0: .4byte 0x0202406e + .pool _080328E4: movs r7, 0x1 adds r0, r3, 0 @@ -104348,55 +101852,51 @@ _080328E4: beq _080328F0 b _080329E0 _080328F0: - ldr r0, _08032908 - ldr r2, _0803290C + ldr r0, =0x03005d04 + ldr r2, =sub_8039ECC + 1 str r2, [r0] movs r1, 0x80 ands r1, r3 mov r12, r2 cmp r1, 0 beq _08032918 - ldr r1, _08032910 - ldr r0, _08032914 + ldr r1, =0x03005d60 + ldr r0, =sub_815936C + 1 b _08032934 .align 2, 0 -_08032908: .4byte 0x03005d04 -_0803290C: .4byte sub_8039ECC + 1 -_08032910: .4byte 0x03005d60 -_08032914: .4byte sub_815936C + 1 + .pool _08032918: movs r0, 0x80 lsls r0, 2 ands r3, r0 cmp r3, 0 beq _08032930 - ldr r1, _08032928 - ldr r0, _0803292C + ldr r1, =0x03005d60 + ldr r0, =bx_goto_buffer_A_ch0_tbl3 + 1 b _08032934 .align 2, 0 -_08032928: .4byte 0x03005d60 -_0803292C: .4byte bx_goto_buffer_A_ch0_tbl3 + 1 + .pool _08032930: - ldr r1, _08032990 - ldr r0, _08032994 + ldr r1, =0x03005d60 + ldr r0, =sub_805745C + 1 _08032934: str r0, [r1] mov r10, r1 - ldr r4, _08032998 + ldr r4, =0x02024076 movs r0, 0 mov r9, r0 mov r1, r9 strb r1, [r4] mov r5, r10 - ldr r2, _0803299C + ldr r2, =sub_805F164 + 1 mov r8, r2 str r2, [r5, 0x4] movs r6, 0x1 strb r6, [r4, 0x1] - ldr r2, _080329A0 + ldr r2, =0x0202406c movs r7, 0x2 strb r7, [r2] - ldr r0, _080329A4 + ldr r0, =0x02022fec ldr r3, [r0] movs r0, 0x80 lsls r0, 17 @@ -104416,41 +101916,32 @@ _08032964: cmp r1, 0 beq _080329B4 mov r1, r12 - ldr r0, _080329A8 + ldr r0, =0x03005d04 str r1, [r0] - ldr r0, _080329AC + ldr r0, =sub_818994C + 1 str r0, [r5] mov r1, r9 strb r1, [r4] - ldr r0, _080329B0 + ldr r0, =sub_81864EC + 1 str r0, [r5, 0x4] strb r6, [r4, 0x1] strb r7, [r2] b _08032CB2 .align 2, 0 -_08032990: .4byte 0x03005d60 -_08032994: .4byte sub_805745C + 1 -_08032998: .4byte 0x02024076 -_0803299C: .4byte sub_805F164 + 1 -_080329A0: .4byte 0x0202406c -_080329A4: .4byte 0x02022fec -_080329A8: .4byte 0x03005d04 -_080329AC: .4byte sub_818994C + 1 -_080329B0: .4byte sub_81864EC + 1 + .pool _080329B4: - ldr r0, _080329C4 + ldr r0, =sub_818994C + 1 str r0, [r5, 0x4] strb r1, [r4, 0x1] - ldr r0, _080329C8 + ldr r0, =sub_81864EC + 1 str r0, [r5] strb r6, [r4] strb r7, [r2] b _08032CB2 .align 2, 0 -_080329C4: .4byte sub_818994C + 1 -_080329C8: .4byte sub_81864EC + 1 + .pool _080329CC: - ldr r0, _080329DC + ldr r0, =sub_818994C + 1 mov r2, r10 str r0, [r2] strb r1, [r4] @@ -104459,17 +101950,17 @@ _080329CC: strb r6, [r4, 0x1] b _08032CB2 .align 2, 0 -_080329DC: .4byte sub_818994C + 1 + .pool _080329E0: - ldr r1, _08032A7C - ldr r2, _08032A80 + ldr r1, =sub_8039ECC + 1 + ldr r2, =0x03005d04 str r1, [r2] - ldr r2, _08032A84 - ldr r0, _08032A88 + ldr r2, =0x03005d60 + ldr r0, =sub_805745C + 1 str r0, [r2] - ldr r4, _08032A8C + ldr r4, =0x02024076 strb r5, [r4] - ldr r6, _08032A90 + ldr r6, =sub_805F164 + 1 str r6, [r2, 0x4] strb r7, [r4, 0x1] str r0, [r2, 0x8] @@ -104482,7 +101973,7 @@ _080329E0: mov r8, r0 mov r1, r8 strb r1, [r4, 0x3] - ldr r0, _08032A94 + ldr r0, =0x0202406c mov r10, r0 movs r1, 0x4 mov r9, r1 @@ -104500,10 +101991,10 @@ _08032A20: ands r0, r1 cmp r0, r1 bne _08032AA0 - ldr r0, _08032A7C - ldr r1, _08032A80 + ldr r0, =sub_8039ECC + 1 + ldr r1, =0x03005d04 str r0, [r1] - ldr r0, _08032A98 + ldr r0, =sub_818994C + 1 str r0, [r2] strb r5, [r4] str r6, [r2, 0x4] @@ -104529,7 +102020,7 @@ _08032A20: movs r0, 0x3 movs r1, 0x1 bl sub_81B8D64 - ldr r0, _08032A9C + ldr r0, =0x0202406e strh r5, [r0] strh r5, [r0, 0x2] mov r1, r8 @@ -104538,15 +102029,7 @@ _08032A76: strh r1, [r0, 0x6] b _08032CB2 .align 2, 0 -_08032A7C: .4byte sub_8039ECC + 1 -_08032A80: .4byte 0x03005d04 -_08032A84: .4byte 0x03005d60 -_08032A88: .4byte sub_805745C + 1 -_08032A8C: .4byte 0x02024076 -_08032A90: .4byte sub_805F164 + 1 -_08032A94: .4byte 0x0202406c -_08032A98: .4byte sub_818994C + 1 -_08032A9C: .4byte 0x0202406e + .pool _08032AA0: movs r5, 0x40 ands r5, r3 @@ -104554,15 +102037,15 @@ _08032AA0: bne _08032AAA b _08032C3C _08032AAA: - ldr r0, _08032AD8 + ldr r0, =0x0203c7b4 ldrb r5, [r0] movs r0, 0 mov r10, r0 - ldr r1, _08032ADC + ldr r1, =0x020229e8 mov r12, r1 adds r7, r4, 0 mov r8, r0 - ldr r6, _08032AE0 + ldr r6, =0x0202406e movs r4, 0 movs r2, 0x3 mov r9, r2 @@ -104578,21 +102061,19 @@ _08032AC2: beq _08032AE8 b _08032B06 .align 2, 0 -_08032AD8: .4byte 0x0203c7b4 -_08032ADC: .4byte 0x020229e8 -_08032AE0: .4byte 0x0202406e + .pool _08032AE4: cmp r0, 0x3 bne _08032B06 _08032AE8: - ldr r0, _08032AF8 + ldr r0, =0x020229e8 adds r0, r4, r0 ldrb r0, [r0, 0x18] movs r1, 0 bl sub_81B8D64 b _08032B06 .align 2, 0 -_08032AF8: .4byte 0x020229e8 + .pool _08032AFC: lsls r0, 24 lsrs r0, 24 @@ -104601,13 +102082,13 @@ _08032AFC: _08032B06: cmp r10, r5 bne _08032B56 - ldr r0, _08032B2C + ldr r0, =0x020229e8 adds r3, r4, r0 ldrh r1, [r3, 0x18] lsls r1, 2 - ldr r2, _08032B30 + ldr r2, =0x03005d60 adds r1, r2 - ldr r2, _08032B34 + ldr r2, =sub_818994C + 1 str r2, [r1] ldrh r1, [r3, 0x18] mov r12, r0 @@ -104619,9 +102100,7 @@ _08032B06: beq _08032B3C b _08032C2C .align 2, 0 -_08032B2C: .4byte 0x020229e8 -_08032B30: .4byte 0x03005d60 -_08032B34: .4byte sub_818994C + 1 + .pool _08032B38: cmp r1, 0x3 bne _08032C2C @@ -104641,7 +102120,7 @@ _08032B4C: ldrh r0, [r3, 0x18] b _08032C24 _08032B56: - ldr r2, _08032B7C + ldr r2, =0x020229e8 adds r0, r4, r2 ldrh r1, [r0, 0x18] movs r3, 0x1 @@ -104661,7 +102140,7 @@ _08032B56: beq _08032B92 b _08032BD8 .align 2, 0 -_08032B7C: .4byte 0x020229e8 + .pool _08032B80: lsls r0, r5, 3 subs r0, r5 @@ -104677,9 +102156,9 @@ _08032B92: adds r2, r4, r0 ldrh r0, [r2, 0x18] lsls r0, 2 - ldr r1, _08032BB4 + ldr r1, =0x03005d60 adds r0, r1 - ldr r1, _08032BB8 + ldr r1, =sub_818994C + 1 str r1, [r0] ldrh r1, [r2, 0x18] cmp r1, 0x2 @@ -104690,8 +102169,7 @@ _08032B92: beq _08032BC0 b _08032C2C .align 2, 0 -_08032BB4: .4byte 0x03005d60 -_08032BB8: .4byte sub_818994C + 1 + .pool _08032BBC: cmp r1, 0x3 bne _08032C2C @@ -104714,9 +102192,9 @@ _08032BD8: adds r2, r4, r0 ldrh r0, [r2, 0x18] lsls r0, 2 - ldr r1, _08032BF8 + ldr r1, =0x03005d60 adds r0, r1 - ldr r1, _08032BFC + ldr r1, =sub_81864EC + 1 str r1, [r0] ldrh r0, [r2, 0x18] cmp r0, 0x2 @@ -104727,8 +102205,7 @@ _08032BD8: beq _08032C04 b _08032C2C .align 2, 0 -_08032BF8: .4byte 0x03005d60 -_08032BFC: .4byte sub_81864EC + 1 + .pool _08032C00: cmp r0, 0x3 bne _08032C2C @@ -104772,7 +102249,7 @@ _08032C3C: ands r1, r3 cmp r1, 0 beq _08032C7C - ldr r0, _08032C68 + ldr r0, =sub_818994C + 1 str r0, [r2] strb r5, [r4] str r0, [r2, 0x8] @@ -104783,7 +102260,7 @@ _08032C3C: ands r3, r0 cmp r3, 0 beq _08032C70 - ldr r0, _08032C6C + ldr r0, =sub_81864EC + 1 str r0, [r2, 0x4] strb r7, [r4, 0x1] str r0, [r2, 0xC] @@ -104791,8 +102268,7 @@ _08032C3C: strb r1, [r4, 0x3] b _08032CB2 .align 2, 0 -_08032C68: .4byte sub_818994C + 1 -_08032C6C: .4byte sub_81864EC + 1 + .pool _08032C70: str r6, [r2, 0x4] strb r7, [r4, 0x1] @@ -104801,7 +102277,7 @@ _08032C70: strb r2, [r4, 0x3] b _08032CB2 _08032C7C: - ldr r0, _08032CA0 + ldr r0, =sub_818994C + 1 str r0, [r2, 0x4] strb r1, [r4, 0x1] str r0, [r2, 0xC] @@ -104812,7 +102288,7 @@ _08032C7C: ands r3, r0 cmp r3, 0 beq _08032CA8 - ldr r0, _08032CA4 + ldr r0, =sub_81864EC + 1 str r0, [r2] strb r7, [r4] str r0, [r2, 0x8] @@ -104820,8 +102296,7 @@ _08032C7C: strb r1, [r4, 0x2] b _08032CB2 .align 2, 0 -_08032CA0: .4byte sub_818994C + 1 -_08032CA4: .4byte sub_81864EC + 1 + .pool _08032CA8: str r6, [r2] strb r7, [r4] @@ -104845,7 +102320,7 @@ b_setup_bx_link: @ 8032CC0 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _08032CFC + ldr r4, =0x02022fec ldr r1, [r4] movs r5, 0x1 adds r3, r1, 0 @@ -104856,47 +102331,36 @@ b_setup_bx_link: @ 8032CC0 ands r4, r1 cmp r4, 0 beq _08032D1C - ldr r1, _08032D00 - ldr r0, _08032D04 + ldr r1, =0x03005d04 + ldr r0, =sub_8039ECC + 1 str r0, [r1] - ldr r2, _08032D08 - ldr r0, _08032D0C + ldr r2, =0x03005d60 + ldr r0, =sub_805745C + 1 str r0, [r2] - ldr r1, _08032D10 + ldr r1, =0x02024076 strb r3, [r1] - ldr r0, _08032D14 + ldr r0, =sub_8064394 + 1 str r0, [r2, 0x4] strb r5, [r1, 0x1] - ldr r1, _08032D18 + ldr r1, =0x0202406c movs r0, 0x2 b _0803303A .align 2, 0 -_08032CFC: .4byte 0x02022fec -_08032D00: .4byte 0x03005d04 -_08032D04: .4byte sub_8039ECC + 1 -_08032D08: .4byte 0x03005d60 -_08032D0C: .4byte sub_805745C + 1 -_08032D10: .4byte 0x02024076 -_08032D14: .4byte sub_8064394 + 1 -_08032D18: .4byte 0x0202406c + .pool _08032D1C: - ldr r2, _08032D34 - ldr r0, _08032D38 + ldr r2, =0x03005d60 + ldr r0, =sub_805745C + 1 str r0, [r2, 0x4] - ldr r1, _08032D3C + ldr r1, =0x02024076 strb r4, [r1, 0x1] - ldr r0, _08032D40 + ldr r0, =sub_8064394 + 1 str r0, [r2] strb r5, [r1] - ldr r1, _08032D44 + ldr r1, =0x0202406c movs r0, 0x2 b _0803303A .align 2, 0 -_08032D34: .4byte 0x03005d60 -_08032D38: .4byte sub_805745C + 1 -_08032D3C: .4byte 0x02024076 -_08032D40: .4byte sub_8064394 + 1 -_08032D44: .4byte 0x0202406c + .pool _08032D48: movs r0, 0x41 ands r0, r1 @@ -104907,16 +102371,16 @@ _08032D48: ands r3, r1 cmp r3, 0 beq _08032D98 - ldr r1, _08032D80 - ldr r0, _08032D84 + ldr r1, =0x03005d04 + ldr r0, =sub_8039ECC + 1 str r0, [r1] - ldr r2, _08032D88 - ldr r4, _08032D8C + ldr r2, =0x03005d60 + ldr r4, =sub_805745C + 1 str r4, [r2] - ldr r1, _08032D90 + ldr r1, =0x02024076 movs r0, 0 strb r0, [r1] - ldr r3, _08032D94 + ldr r3, =sub_8064394 + 1 str r3, [r2, 0x4] strb r5, [r1, 0x1] str r4, [r2, 0x8] @@ -104927,19 +102391,14 @@ _08032D48: strb r0, [r1, 0x3] b _08032DB4 .align 2, 0 -_08032D80: .4byte 0x03005d04 -_08032D84: .4byte sub_8039ECC + 1 -_08032D88: .4byte 0x03005d60 -_08032D8C: .4byte sub_805745C + 1 -_08032D90: .4byte 0x02024076 -_08032D94: .4byte sub_8064394 + 1 + .pool _08032D98: - ldr r2, _08032DBC - ldr r0, _08032DC0 + ldr r2, =0x03005d60 + ldr r0, =sub_805745C + 1 str r0, [r2, 0x4] - ldr r1, _08032DC4 + ldr r1, =0x02024076 strb r3, [r1, 0x1] - ldr r3, _08032DC8 + ldr r3, =sub_8064394 + 1 str r3, [r2] strb r5, [r1] str r0, [r2, 0xC] @@ -104949,15 +102408,11 @@ _08032D98: movs r0, 0x3 strb r0, [r1, 0x2] _08032DB4: - ldr r0, _08032DCC + ldr r0, =0x0202406c strb r6, [r0] b _0803303C .align 2, 0 -_08032DBC: .4byte 0x03005d60 -_08032DC0: .4byte sub_805745C + 1 -_08032DC4: .4byte 0x02024076 -_08032DC8: .4byte sub_8064394 + 1 -_08032DCC: .4byte 0x0202406c + .pool _08032DD0: movs r0, 0x80 lsls r0, 1 @@ -104969,38 +102424,32 @@ _08032DD0: ands r3, r1 cmp r3, 0 beq _08032E1C - ldr r1, _08032E00 - ldr r0, _08032E04 + ldr r1, =0x03005d04 + ldr r0, =sub_8039ECC + 1 str r0, [r1] - ldr r2, _08032E08 - ldr r0, _08032E0C + ldr r2, =0x03005d60 + ldr r0, =sub_805745C + 1 str r0, [r2] - ldr r1, _08032E10 + ldr r1, =0x02024076 movs r0, 0 strb r0, [r1] - ldr r3, _08032E14 + ldr r3, =sub_805F164 + 1 str r3, [r2, 0x4] strb r5, [r1, 0x1] - ldr r0, _08032E18 + ldr r0, =sub_814AEB0 + 1 b _08032E2E .align 2, 0 -_08032E00: .4byte 0x03005d04 -_08032E04: .4byte sub_8039ECC + 1 -_08032E08: .4byte 0x03005d60 -_08032E0C: .4byte sub_805745C + 1 -_08032E10: .4byte 0x02024076 -_08032E14: .4byte sub_805F164 + 1 -_08032E18: .4byte sub_814AEB0 + 1 + .pool _08032E1C: - ldr r2, _08032E70 - ldr r0, _08032E74 + ldr r2, =0x03005d60 + ldr r0, =sub_814AEB0 + 1 str r0, [r2] - ldr r1, _08032E78 + ldr r1, =0x02024076 strb r3, [r1] - ldr r3, _08032E7C + ldr r3, =sub_8064394 + 1 str r3, [r2, 0x4] strb r5, [r1, 0x1] - ldr r0, _08032E80 + ldr r0, =sub_805745C + 1 _08032E2E: str r0, [r2, 0x8] movs r0, 0x2 @@ -105008,7 +102457,7 @@ _08032E2E: str r3, [r2, 0xC] movs r0, 0x3 strb r0, [r1, 0x3] - ldr r0, _08032E84 + ldr r0, =0x0202406c strb r4, [r0] movs r0, 0 movs r1, 0 @@ -105022,7 +102471,7 @@ _08032E2E: movs r0, 0x3 movs r1, 0x1 bl sub_81B8D64 - ldr r0, _08032E88 + ldr r0, =0x0202406e movs r1, 0 strh r1, [r0] strh r1, [r0, 0x2] @@ -105031,13 +102480,7 @@ _08032E2E: strh r1, [r0, 0x6] b _0803303C .align 2, 0 -_08032E70: .4byte 0x03005d60 -_08032E74: .4byte sub_814AEB0 + 1 -_08032E78: .4byte 0x02024076 -_08032E7C: .4byte sub_8064394 + 1 -_08032E80: .4byte sub_805745C + 1 -_08032E84: .4byte 0x0202406c -_08032E88: .4byte 0x0202406e + .pool _08032E8C: bl link_get_multiplayer_id lsls r0, 24 @@ -105047,17 +102490,17 @@ _08032E8C: ands r0, r1 cmp r0, 0 beq _08032EA4 - ldr r1, _08032ECC - ldr r0, _08032ED0 + ldr r1, =0x03005d04 + ldr r0, =sub_8039ECC + 1 str r0, [r1] _08032EA4: movs r0, 0 mov r10, r0 - ldr r1, _08032ED4 + ldr r1, =0x020229e8 mov r12, r1 - ldr r7, _08032ED8 + ldr r7, =0x02024076 mov r8, r0 - ldr r6, _08032EDC + ldr r6, =0x0202406e movs r4, 0 movs r2, 0x3 mov r9, r2 @@ -105073,23 +102516,19 @@ _08032EB8: beq _08032EE4 b _08032F02 .align 2, 0 -_08032ECC: .4byte 0x03005d04 -_08032ED0: .4byte sub_8039ECC + 1 -_08032ED4: .4byte 0x020229e8 -_08032ED8: .4byte 0x02024076 -_08032EDC: .4byte 0x0202406e + .pool _08032EE0: cmp r0, 0x3 bne _08032F02 _08032EE4: - ldr r0, _08032EF4 + ldr r0, =0x020229e8 adds r0, r4, r0 ldrb r0, [r0, 0x18] movs r1, 0 bl sub_81B8D64 b _08032F02 .align 2, 0 -_08032EF4: .4byte 0x020229e8 + .pool _08032EF8: lsls r0, 24 lsrs r0, 24 @@ -105098,13 +102537,13 @@ _08032EF8: _08032F02: cmp r10, r5 bne _08032F52 - ldr r0, _08032F28 + ldr r0, =0x020229e8 adds r3, r4, r0 ldrh r1, [r3, 0x18] lsls r1, 2 - ldr r2, _08032F2C + ldr r2, =0x03005d60 adds r1, r2 - ldr r2, _08032F30 + ldr r2, =sub_805745C + 1 str r2, [r1] ldrh r1, [r3, 0x18] mov r12, r0 @@ -105116,9 +102555,7 @@ _08032F02: beq _08032F38 b _08033028 .align 2, 0 -_08032F28: .4byte 0x020229e8 -_08032F2C: .4byte 0x03005d60 -_08032F30: .4byte sub_805745C + 1 + .pool _08032F34: cmp r1, 0x3 bne _08033028 @@ -105138,7 +102575,7 @@ _08032F48: ldrh r0, [r3, 0x18] b _08033020 _08032F52: - ldr r2, _08032F78 + ldr r2, =0x020229e8 adds r0, r4, r2 ldrh r1, [r0, 0x18] movs r3, 0x1 @@ -105158,7 +102595,7 @@ _08032F52: beq _08032F8E b _08032FD4 .align 2, 0 -_08032F78: .4byte 0x020229e8 + .pool _08032F7C: lsls r0, r5, 3 subs r0, r5 @@ -105174,9 +102611,9 @@ _08032F8E: adds r2, r4, r0 ldrh r0, [r2, 0x18] lsls r0, 2 - ldr r1, _08032FB0 + ldr r1, =0x03005d60 adds r0, r1 - ldr r1, _08032FB4 + ldr r1, =sub_814AEB0 + 1 str r1, [r0] ldrh r1, [r2, 0x18] cmp r1, 0x2 @@ -105187,8 +102624,7 @@ _08032F8E: beq _08032FBC b _08033028 .align 2, 0 -_08032FB0: .4byte 0x03005d60 -_08032FB4: .4byte sub_814AEB0 + 1 + .pool _08032FB8: cmp r1, 0x3 bne _08033028 @@ -105211,9 +102647,9 @@ _08032FD4: adds r2, r4, r0 ldrh r0, [r2, 0x18] lsls r0, 2 - ldr r1, _08032FF4 + ldr r1, =0x03005d60 adds r0, r1 - ldr r1, _08032FF8 + ldr r1, =sub_8064394 + 1 str r1, [r0] ldrh r0, [r2, 0x18] cmp r0, 0x2 @@ -105224,8 +102660,7 @@ _08032FD4: beq _08033000 b _08033028 .align 2, 0 -_08032FF4: .4byte 0x03005d60 -_08032FF8: .4byte sub_8064394 + 1 + .pool _08032FFC: cmp r0, 0x3 bne _08033028 @@ -105263,7 +102698,7 @@ _08033028: bgt _08033036 b _08032EB8 _08033036: - ldr r1, _0803304C + ldr r1, =0x0202406c movs r0, 0x4 _0803303A: strb r0, [r1] @@ -105276,7 +102711,7 @@ _0803303C: pop {r0} bx r0 .align 2, 0 -_0803304C: .4byte 0x0202406c + .pool thumb_func_end b_setup_bx_link thumb_func_start sub_8033050 @@ -105286,7 +102721,7 @@ sub_8033050: @ 8033050 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08033070 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -105298,13 +102733,13 @@ _08033068: mov r8, r0 b _0803317A .align 2, 0 -_08033070: .4byte 0x02022fec + .pool _08033074: movs r5, 0 movs r0, 0x1 add r0, r8 mov r10, r0 - ldr r0, _080330A0 + ldr r0, =0x02024076 add r0, r8 mov r9, r0 mov r0, r8 @@ -105320,13 +102755,12 @@ _08033088: ands r0, r1 cmp r0, 0 bne _080330A8 - ldr r0, _080330A4 + ldr r0, =0x020244ec b _080330AA .align 2, 0 -_080330A0: .4byte 0x02024076 -_080330A4: .4byte 0x020244ec + .pool _080330A8: - ldr r0, _080330E8 + ldr r0, =0x02024744 _080330AA: adds r4, r7, r0 adds r0, r4, 0 @@ -105351,13 +102785,12 @@ _080330AA: bl pokemon_getattr cmp r0, 0 bne _08033170 - ldr r0, _080330EC + ldr r0, =0x0202406e adds r0, r6, r0 strh r5, [r0] b _08033178 .align 2, 0 -_080330E8: .4byte 0x02024744 -_080330EC: .4byte 0x0202406e + .pool _080330F0: mov r0, r9 ldrb r1, [r0] @@ -105365,7 +102798,7 @@ _080330F0: ands r0, r1 cmp r0, 0 bne _08033118 - ldr r0, _08033114 + ldr r0, =0x020244ec adds r4, r7, r0 adds r0, r4, 0 movs r1, 0x39 @@ -105376,9 +102809,9 @@ _080330F0: movs r1, 0xB b _0803312C .align 2, 0 -_08033114: .4byte 0x020244ec + .pool _08033118: - ldr r0, _08033168 + ldr r0, =0x02024744 adds r4, r7, r0 adds r0, r4, 0 movs r1, 0x39 @@ -105403,7 +102836,7 @@ _0803312C: bl pokemon_getattr cmp r0, 0 bne _08033170 - ldr r1, _0803316C + ldr r1, =0x0202406e mov r0, r8 subs r0, 0x2 lsls r0, 1 @@ -105415,8 +102848,7 @@ _0803312C: strh r5, [r0] b _08033178 .align 2, 0 -_08033168: .4byte 0x02024744 -_0803316C: .4byte 0x0202406e + .pool _08033170: adds r7, 0x64 adds r5, 0x1 @@ -105425,20 +102857,20 @@ _08033170: _08033178: mov r8, r10 _0803317A: - ldr r0, _080331AC + ldr r0, =0x0202406c ldrb r0, [r0] cmp r8, r0 bge _08033184 b _08033074 _08033184: - ldr r0, _080331B0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 8 ands r0, r1 cmp r0, 0 beq _0803319C - ldr r0, _080331B4 + ldr r0, =0x0202406e movs r1, 0 strh r1, [r0, 0x2] movs r1, 0x3 @@ -105452,9 +102884,7 @@ _0803319C: pop {r0} bx r0 .align 2, 0 -_080331AC: .4byte 0x0202406c -_080331B0: .4byte 0x02022fec -_080331B4: .4byte 0x0202406e + .pool thumb_func_end sub_8033050 thumb_func_start dp01_prepare_buffer @@ -105466,7 +102896,7 @@ dp01_prepare_buffer: @ 80331B8 adds r5, r3, 0 lsls r2, 16 lsrs r2, 16 - ldr r0, _080331E0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -105478,7 +102908,7 @@ dp01_prepare_buffer: @ 80331B8 bl dp01_prepare_buffer_wireless_probably b _08033236 .align 2, 0 -_080331E0: .4byte 0x02022fec + .pool _080331E4: cmp r5, 0 beq _080331EE @@ -105489,8 +102919,8 @@ _080331EE: movs r3, 0 cmp r3, r2 bge _08033236 - ldr r6, _08033210 - ldr r5, _08033214 + ldr r6, =0x02023064 + ldr r5, =0x02024064 _080331F8: ldrb r0, [r5] lsls r0, 9 @@ -105504,14 +102934,13 @@ _080331F8: blt _080331F8 b _08033236 .align 2, 0 -_08033210: .4byte 0x02023064 -_08033214: .4byte 0x02024064 + .pool _08033218: movs r3, 0 cmp r3, r2 bge _08033236 - ldr r6, _0803323C - ldr r5, _08033240 + ldr r6, =0x02023864 + ldr r5, =0x02024064 _08033222: ldrb r0, [r5] lsls r0, 9 @@ -105528,19 +102957,18 @@ _08033236: pop {r0} bx r0 .align 2, 0 -_0803323C: .4byte 0x02023864 -_08033240: .4byte 0x02024064 + .pool thumb_func_end dp01_prepare_buffer thumb_func_start sub_8033244 sub_8033244: @ 8033244 push {r4-r6,lr} - ldr r0, _080332DC + ldr r0, =task00_wireless_something + 1 movs r1, 0 bl AddTask - ldr r2, _080332E0 + ldr r2, =0x02022d08 strb r0, [r2] - ldr r5, _080332E4 + ldr r5, =0x03005e00 ldrb r1, [r2] lsls r0, r1, 2 adds r0, r1 @@ -105573,10 +103001,10 @@ sub_8033244: @ 8033244 lsls r0, 3 adds r0, r5 strh r4, [r0, 0x26] - ldr r0, _080332E8 + ldr r0, =sub_803375C + 1 movs r1, 0 bl AddTask - ldr r2, _080332EC + ldr r2, =0x02022d09 strb r0, [r2] ldrb r1, [r2] lsls r0, r1, 2 @@ -105602,18 +103030,13 @@ sub_8033244: @ 8033244 lsls r0, 3 adds r0, r5 strh r4, [r0, 0x26] - ldr r0, _080332F0 + ldr r0, =0x02022d0a strb r6, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080332DC: .4byte task00_wireless_something + 1 -_080332E0: .4byte 0x02022d08 -_080332E4: .4byte 0x03005e00 -_080332E8: .4byte sub_803375C + 1 -_080332EC: .4byte 0x02022d09 -_080332F0: .4byte 0x02022d0a + .pool thumb_func_end sub_8033244 thumb_func_start dp01_prepare_buffer_wireless_probably @@ -105634,8 +103057,8 @@ dp01_prepare_buffer_wireless_probably: @ 80332F4 bics r0, r1 adds r0, 0x4 mov r8, r0 - ldr r2, _08033454 - ldr r3, _08033458 + ldr r2, =0x03005e00 + ldr r3, =0x02022d08 ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -105667,7 +103090,7 @@ _08033346: adds r0, r5 movs r2, 0x24 ldrsh r1, [r0, r2] - ldr r4, _0803345C + ldr r4, =0x020244a0 ldr r0, [r4] adds r0, r1 strb r6, [r0] @@ -105680,7 +103103,7 @@ _08033346: ldrsh r1, [r0, r7] ldr r0, [r4] adds r1, r0 - ldr r0, _08033460 + ldr r0, =0x02024064 ldrb r0, [r0] strb r0, [r1, 0x1] ldrb r1, [r3] @@ -105692,7 +103115,7 @@ _08033346: ldrsh r1, [r0, r2] ldr r0, [r4] adds r1, r0 - ldr r0, _08033464 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r1, 0x2] ldrb r1, [r3] @@ -105704,7 +103127,7 @@ _08033346: ldrsh r1, [r0, r7] ldr r0, [r4] adds r1, r0 - ldr r0, _08033468 + ldr r0, =0x0202420c ldrb r0, [r0] strb r0, [r1, 0x3] ldrb r1, [r3] @@ -105742,7 +103165,7 @@ _08033346: ldrsh r1, [r0, r7] ldr r0, [r4] adds r1, r0 - ldr r0, _0803346C + ldr r0, =0x02024210 ldrb r0, [r0] strb r0, [r1, 0x6] ldrb r1, [r3] @@ -105754,7 +103177,7 @@ _08033346: ldrsh r1, [r0, r2] ldr r0, [r4] adds r1, r0 - ldr r0, _08033470 + ldr r0, =0x0202420e ldrb r0, [r0] strb r0, [r1, 0x7] movs r2, 0 @@ -105798,14 +103221,7 @@ _08033434: pop {r0} bx r0 .align 2, 0 -_08033454: .4byte 0x03005e00 -_08033458: .4byte 0x02022d08 -_0803345C: .4byte 0x020244a0 -_08033460: .4byte 0x02024064 -_08033464: .4byte 0x0202420b -_08033468: .4byte 0x0202420c -_0803346C: .4byte 0x02024210 -_08033470: .4byte 0x0202420e + .pool thumb_func_end dp01_prepare_buffer_wireless_probably thumb_func_start task00_wireless_something @@ -105813,7 +103229,7 @@ task00_wireless_something: @ 8033474 push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0803349C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -105826,13 +103242,12 @@ task00_wireless_something: @ 8033474 b _08033640 _08033490: lsls r0, 2 - ldr r1, _080334A0 + ldr r1, =_080334A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0803349C: .4byte 0x03005e00 -_080334A0: .4byte _080334A4 + .pool .align 2, 0 _080334A4: .4byte _080334BC @@ -105866,7 +103281,7 @@ _080334E0: adds r0, 0x1 b _0803363E _080334E6: - ldr r0, _08033500 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08033504 @@ -105880,9 +103295,9 @@ _080334F6: strh r1, [r0, 0x1E] b _08033640 .align 2, 0 -_08033500: .4byte 0x030030fc + .pool _08033504: - ldr r0, _08033518 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 1 @@ -105892,7 +103307,7 @@ _08033504: movs r5, 0x2 b _0803352A .align 2, 0 -_08033518: .4byte 0x02022fec + .pool _0803351C: movs r0, 0x40 ands r1, r0 @@ -105915,7 +103330,7 @@ _08033538: cmp r0, 0 beq _0803355C bl sub_800A620 - ldr r0, _08033558 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -105924,9 +103339,9 @@ _08033538: adds r0, 0x1 b _0803363E .align 2, 0 -_08033558: .4byte 0x03005e00 + .pool _0803355C: - ldr r0, _0803356C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -105935,7 +103350,7 @@ _0803355C: adds r0, 0x1 b _0803363E .align 2, 0 -_0803356C: .4byte 0x03005e00 + .pool _08033570: lsls r1, r4, 2 adds r0, r1, r4 @@ -105967,7 +103382,7 @@ _080335A0: adds r4, r7 movs r0, 0x26 ldrsh r1, [r4, r0] - ldr r5, _080335DC + ldr r5, =0x020244a0 ldr r0, [r5] adds r1, r0 ldrb r0, [r1, 0x4] @@ -105991,7 +103406,7 @@ _080335A0: strh r0, [r4, 0x1E] b _08033640 .align 2, 0 -_080335DC: .4byte 0x020244a0 + .pool _080335E0: subs r0, 0x1 strh r0, [r2, 0x22] @@ -106001,14 +103416,14 @@ _080335E6: lsls r0, 24 cmp r0, 0 beq _08033640 - ldr r0, _0803361C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 movs r3, 0x26 ldrsh r2, [r1, r3] - ldr r0, _08033620 + ldr r0, =0x020244a0 ldr r0, [r0] adds r2, r0 ldrb r0, [r2, 0x4] @@ -106023,8 +103438,7 @@ _080335E6: strh r0, [r1, 0x26] b _0803363C .align 2, 0 -_0803361C: .4byte 0x03005e00 -_08033620: .4byte 0x020244a0 + .pool _08033624: lsls r0, r4, 2 adds r0, r4 @@ -106055,11 +103469,11 @@ sub_8033648: @ 8033648 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08033674 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08033738 - ldr r0, _08033678 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x20 ands r0, r1 @@ -106067,18 +103481,16 @@ sub_8033648: @ 8033648 beq _08033738 bl sub_8011BD0 movs r4, 0 - ldr r0, _0803367C + ldr r0, =0x020223c4 mov r10, r0 b _0803372C .align 2, 0 -_08033674: .4byte 0x03003124 -_08033678: .4byte 0x02022fec -_0803367C: .4byte 0x020223c4 + .pool _08033680: bl sub_800A550 lsls r0, 24 lsrs r0, 24 - ldr r2, _08033748 + ldr r2, =0x0832a328 lsls r1, r4, 2 adds r1, r2 ldr r1, [r1] @@ -106092,11 +103504,11 @@ _08033680: lsls r0, r4, 8 mov r4, r10 adds r3, r0, r4 - ldr r1, _0803374C + ldr r1, =0x020223c8 adds r0, r1 ldrh r6, [r0] - ldr r7, _08033750 - ldr r4, _08033754 + ldr r7, =0x03005e00 + ldr r4, =0x02022d09 mov r12, r4 ldrb r1, [r4] lsls r0, r1, 2 @@ -106122,7 +103534,7 @@ _08033680: movs r1, 0 strh r1, [r0, 0x24] _080336E0: - ldr r2, _08033758 + ldr r2, =0x020244a4 mov r4, r12 ldrb r1, [r4] lsls r0, r1, 2 @@ -106178,11 +103590,7 @@ _08033738: pop {r0} bx r0 .align 2, 0 -_08033748: .4byte 0x0832a328 -_0803374C: .4byte 0x020223c8 -_08033750: .4byte 0x03005e00 -_08033754: .4byte 0x02022d09 -_08033758: .4byte 0x020244a4 + .pool thumb_func_end sub_8033648 thumb_func_start sub_803375C @@ -106193,7 +103601,7 @@ sub_803375C: @ 803375C push {r6,r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080337C4 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -106222,7 +103630,7 @@ _08033792: adds r5, r0, r1 movs r0, 0x26 ldrsh r1, [r5, r0] - ldr r3, _080337C8 + ldr r3, =0x020244a4 mov r8, r3 ldr r0, [r3] adds r3, r1, r0 @@ -106241,15 +103649,14 @@ _08033792: beq _080337D2 b _0803388A .align 2, 0 -_080337C4: .4byte 0x03005e00 -_080337C8: .4byte 0x020244a4 + .pool _080337CC: cmp r0, 0x2 beq _08033874 b _0803388A _080337D2: - ldr r2, _0803383C - ldr r1, _08033840 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 lsls r0, r4, 2 adds r0, r1 ldr r1, [r2] @@ -106258,7 +103665,7 @@ _080337D2: cmp r1, 0 bne _0803389C lsls r0, r4, 9 - ldr r1, _08033844 + ldr r1, =0x02023064 adds r0, r1 adds r1, r3, 0 adds r1, 0x8 @@ -106266,13 +103673,13 @@ _080337D2: bl memcpy adds r0, r4, 0 bl sub_803F850 - ldr r0, _08033848 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x4 ands r0, r1 cmp r0, 0 bne _0803388A - ldr r2, _0803384C + ldr r2, =0x0202420b movs r4, 0x26 ldrsh r0, [r5, r4] mov r3, r8 @@ -106280,19 +103687,19 @@ _080337D2: adds r0, r1 ldrb r0, [r0, 0x2] strb r0, [r2] - ldr r2, _08033850 + ldr r2, =0x0202420c movs r4, 0x26 ldrsh r0, [r5, r4] adds r0, r1 ldrb r0, [r0, 0x3] strb r0, [r2] - ldr r2, _08033854 + ldr r2, =0x02024210 movs r3, 0x26 ldrsh r0, [r5, r3] adds r0, r1 ldrb r0, [r0, 0x6] strb r0, [r2] - ldr r2, _08033858 + ldr r2, =0x0202420e movs r4, 0x26 ldrsh r0, [r5, r4] adds r0, r1 @@ -106300,17 +103707,10 @@ _080337D2: strb r0, [r2] b _0803388A .align 2, 0 -_0803383C: .4byte 0x02024068 -_08033840: .4byte 0x0832a328 -_08033844: .4byte 0x02023064 -_08033848: .4byte 0x02022fec -_0803384C: .4byte 0x0202420b -_08033850: .4byte 0x0202420c -_08033854: .4byte 0x02024210 -_08033858: .4byte 0x0202420e + .pool _0803385C: lsls r0, r4, 9 - ldr r1, _08033870 + ldr r1, =0x02023864 adds r0, r1 adds r1, r3, 0 adds r1, 0x8 @@ -106318,11 +103718,11 @@ _0803385C: bl memcpy b _0803388A .align 2, 0 -_08033870: .4byte 0x02023864 + .pool _08033874: ldrb r2, [r3, 0x8] - ldr r3, _080338A8 - ldr r1, _080338AC + ldr r3, =0x02024068 + ldr r1, =0x0832a328 lsls r0, r4, 2 adds r0, r1 lsls r2, 2 @@ -106332,7 +103732,7 @@ _08033874: bics r0, r1 str r0, [r3] _0803388A: - ldr r0, _080338B0 + ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r7 lsls r1, 3 @@ -106349,9 +103749,7 @@ _0803389C: pop {r0} bx r0 .align 2, 0 -_080338A8: .4byte 0x02024068 -_080338AC: .4byte 0x0832a328 -_080338B0: .4byte 0x03005e00 + .pool thumb_func_end sub_803375C thumb_func_start dp01_build_cmdbuf_x00_a_b_0 @@ -106360,7 +103758,7 @@ dp01_build_cmdbuf_x00_a_b_0: @ 80338B4 adds r4, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _080338D4 + ldr r1, =0x02022d10 movs r3, 0 strb r3, [r1] strb r4, [r1, 0x1] @@ -106372,7 +103770,7 @@ dp01_build_cmdbuf_x00_a_b_0: @ 80338B4 pop {r0} bx r0 .align 2, 0 -_080338D4: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x00_a_b_0 thumb_func_start dp01_build_cmdbuf_x01_a_b_0 @@ -106381,7 +103779,7 @@ dp01_build_cmdbuf_x01_a_b_0: @ 80338D8 adds r5, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _080338FC + ldr r1, =0x02022d10 movs r4, 0 movs r3, 0x1 strb r3, [r1] @@ -106394,7 +103792,7 @@ dp01_build_cmdbuf_x01_a_b_0: @ 80338D8 pop {r0} bx r0 .align 2, 0 -_080338FC: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x01_a_b_0 thumb_func_start dp01_build_cmdbuf_x02_a_b_varargs @@ -106405,7 +103803,7 @@ dp01_build_cmdbuf_x02_a_b_varargs: @ 8033900 lsrs r6, r0, 24 lsls r3, 24 lsrs r5, r3, 24 - ldr r0, _0803393C + ldr r0, =0x02022d10 movs r3, 0x2 strb r3, [r0] strb r1, [r0, 0x1] @@ -106431,7 +103829,7 @@ _0803392E: pop {r0} bx r0 .align 2, 0 -_0803393C: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x02_a_b_varargs thumb_func_start sub_8033940 @@ -106441,7 +103839,7 @@ sub_8033940: @ 8033940 lsrs r6, r0, 24 lsls r2, 24 lsrs r4, r2, 24 - ldr r0, _0803397C + ldr r0, =0x02022d10 movs r2, 0x3 strb r2, [r0] strb r1, [r0, 0x1] @@ -106468,7 +103866,7 @@ _0803396C: pop {r0} bx r0 .align 2, 0 -_0803397C: .4byte 0x02022d10 + .pool thumb_func_end sub_8033940 thumb_func_start dp01_build_cmdbuf_x04_4_4_4 @@ -106476,7 +103874,7 @@ dp01_build_cmdbuf_x04_4_4_4: @ 8033980 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0803399C + ldr r1, =0x02022d10 movs r2, 0x4 strb r2, [r1] strb r2, [r1, 0x1] @@ -106486,7 +103884,7 @@ dp01_build_cmdbuf_x04_4_4_4: @ 8033980 pop {r0} bx r0 .align 2, 0 -_0803399C: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x04_4_4_4 thumb_func_start dp01_build_cmdbuf_x05_a_b_c @@ -106495,7 +103893,7 @@ dp01_build_cmdbuf_x05_a_b_c: @ 80339A0 adds r4, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _080339C0 + ldr r1, =0x02022d10 movs r3, 0x5 strb r3, [r1] strb r4, [r1, 0x1] @@ -106507,7 +103905,7 @@ dp01_build_cmdbuf_x05_a_b_c: @ 80339A0 pop {r0} bx r0 .align 2, 0 -_080339C0: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x05_a_b_c thumb_func_start dp01_build_cmdbuf_x06_a @@ -106516,7 +103914,7 @@ dp01_build_cmdbuf_x06_a: @ 80339C4 adds r3, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _080339E0 + ldr r1, =0x02022d10 movs r2, 0x6 strb r2, [r1] strb r3, [r1, 0x1] @@ -106525,7 +103923,7 @@ dp01_build_cmdbuf_x06_a: @ 80339C4 pop {r0} bx r0 .align 2, 0 -_080339E0: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x06_a thumb_func_start dp01_build_cmdbuf_x07_7_7_7 @@ -106533,7 +103931,7 @@ dp01_build_cmdbuf_x07_7_7_7: @ 80339E4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08033A00 + ldr r1, =0x02022d10 movs r2, 0x7 strb r2, [r1] strb r2, [r1, 0x1] @@ -106544,7 +103942,7 @@ dp01_build_cmdbuf_x07_7_7_7: @ 80339E4 pop {r0} bx r0 .align 2, 0 -_08033A00: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x07_7_7_7 thumb_func_start dp01_build_cmdbuf_x08_8_8_8 @@ -106552,7 +103950,7 @@ dp01_build_cmdbuf_x08_8_8_8: @ 8033A04 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08033A20 + ldr r1, =0x02022d10 movs r2, 0x8 strb r2, [r1] strb r2, [r1, 0x1] @@ -106563,7 +103961,7 @@ dp01_build_cmdbuf_x08_8_8_8: @ 8033A04 pop {r0} bx r0 .align 2, 0 -_08033A20: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x08_8_8_8 thumb_func_start dp01_build_cmdbuf_x09_9_9_9 @@ -106571,7 +103969,7 @@ dp01_build_cmdbuf_x09_9_9_9: @ 8033A24 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08033A40 + ldr r1, =0x02022d10 movs r2, 0x9 strb r2, [r1] strb r2, [r1, 0x1] @@ -106582,7 +103980,7 @@ dp01_build_cmdbuf_x09_9_9_9: @ 8033A24 pop {r0} bx r0 .align 2, 0 -_08033A40: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x09_9_9_9 thumb_func_start dp01_build_cmdbuf_x0A_A_A_A @@ -106590,7 +103988,7 @@ dp01_build_cmdbuf_x0A_A_A_A: @ 8033A44 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08033A60 + ldr r1, =0x02022d10 movs r2, 0xA strb r2, [r1] strb r2, [r1, 0x1] @@ -106601,7 +103999,7 @@ dp01_build_cmdbuf_x0A_A_A_A: @ 8033A44 pop {r0} bx r0 .align 2, 0 -_08033A60: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x0A_A_A_A thumb_func_start dp01_build_cmdbuf_x0B_B_B_B @@ -106609,7 +104007,7 @@ dp01_build_cmdbuf_x0B_B_B_B: @ 8033A64 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08033A80 + ldr r1, =0x02022d10 movs r2, 0xB strb r2, [r1] strb r2, [r1, 0x1] @@ -106620,7 +104018,7 @@ dp01_build_cmdbuf_x0B_B_B_B: @ 8033A64 pop {r0} bx r0 .align 2, 0 -_08033A80: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x0B_B_B_B thumb_func_start dp01_build_cmdbuf_x0C_C_C_C @@ -106628,7 +104026,7 @@ dp01_build_cmdbuf_x0C_C_C_C: @ 8033A84 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08033AA0 + ldr r1, =0x02022d10 movs r2, 0xC strb r2, [r1] strb r2, [r1, 0x1] @@ -106639,7 +104037,7 @@ dp01_build_cmdbuf_x0C_C_C_C: @ 8033A84 pop {r0} bx r0 .align 2, 0 -_08033AA0: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x0C_C_C_C thumb_func_start dp01_build_cmdbuf_x0D_a @@ -106648,7 +104046,7 @@ dp01_build_cmdbuf_x0D_a: @ 8033AA4 adds r3, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08033AC0 + ldr r1, =0x02022d10 movs r2, 0xD strb r2, [r1] strb r3, [r1, 0x1] @@ -106657,7 +104055,7 @@ dp01_build_cmdbuf_x0D_a: @ 8033AA4 pop {r0} bx r0 .align 2, 0 -_08033AC0: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x0D_a thumb_func_start sub_8033AC4 @@ -106667,7 +104065,7 @@ sub_8033AC4: @ 8033AC4 lsrs r6, r0, 24 lsls r1, 24 lsrs r4, r1, 24 - ldr r1, _08033B08 + ldr r1, =0x02022d10 movs r0, 0xE strb r0, [r1] strb r4, [r1, 0x1] @@ -106697,7 +104095,7 @@ _08033AF2: pop {r0} bx r0 .align 2, 0 -_08033B08: .4byte 0x02022d10 + .pool thumb_func_end sub_8033AC4 thumb_func_start dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes @@ -106718,7 +104116,7 @@ dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C lsrs r1, 16 lsls r3, 16 lsrs r3, 16 - ldr r7, _08033BA4 + ldr r7, =0x02022d10 movs r0, 0 mov r12, r0 movs r0, 0xF @@ -106767,7 +104165,7 @@ dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C lsls r0, 24 cmp r0, 0 bne _08033BAC - ldr r0, _08033BA8 + ldr r0, =0x020243cc ldrh r0, [r0] strb r0, [r7, 0xC] ands r6, r0 @@ -106776,10 +104174,9 @@ dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C adds r4, r7, 0 b _08033BB6 .align 2, 0 -_08033BA4: .4byte 0x02022d10 -_08033BA8: .4byte 0x020243cc + .pool _08033BAC: - ldr r0, _08033BE0 + ldr r0, =0x02022d10 movs r1, 0 strb r1, [r0, 0xC] strb r1, [r0, 0xD] @@ -106805,7 +104202,7 @@ _08033BB6: pop {r0} bx r0 .align 2, 0 -_08033BE0: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes thumb_func_start dp01_build_cmdbuf_x10_TODO @@ -106820,10 +104217,10 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4 mov r10, r0 lsls r1, 16 lsrs r1, 16 - ldr r2, _08033CC4 + ldr r2, =0x02022d10 movs r0, 0x10 strb r0, [r2] - ldr r0, _08033CC8 + ldr r0, =0x0202433a ldrb r0, [r0] strb r0, [r2, 0x1] strb r1, [r2, 0x2] @@ -106831,23 +104228,23 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4 strb r1, [r2, 0x3] adds r0, r2, 0x4 mov r12, r0 - ldr r4, _08033CCC + ldr r4, =0x020241ea ldrh r0, [r4] strh r0, [r2, 0x4] - ldr r0, _08033CD0 + ldr r0, =0x020241ec ldrh r0, [r0] mov r1, r12 strh r0, [r1, 0x2] - ldr r0, _08033CD4 + ldr r0, =0x02024208 ldrh r0, [r0] strh r0, [r1, 0x4] - ldr r0, _08033CD8 + ldr r0, =0x0202420a ldrb r0, [r0] strb r0, [r1, 0x6] - ldr r0, _08033CDC + ldr r0, =0x02024474 ldrb r0, [r0, 0x17] strb r0, [r1, 0x7] - ldr r0, _08033CE0 + ldr r0, =0x0202449c ldr r0, [r0] adds r1, r0, 0 adds r1, 0x52 @@ -106857,10 +104254,10 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4 adds r0, 0xB1 ldrb r0, [r0] strb r0, [r3, 0x9] - ldr r0, _08033CE4 + ldr r0, =0x0202420f ldrb r0, [r0] strb r0, [r3, 0xA] - ldr r3, _08033CE8 + ldr r3, =0x0831c898 ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -106871,10 +104268,10 @@ dp01_build_cmdbuf_x10_TODO: @ 8033BE4 strb r0, [r7, 0xB] movs r3, 0 mov r9, r2 - ldr r0, _08033CEC + ldr r0, =0x02022f78 mov r8, r0 adds r2, 0x10 - ldr r0, _08033CF0 + ldr r0, =0x02024084 adds r4, r0, 0 adds r4, 0x20 _08033C6A: @@ -106890,12 +104287,12 @@ _08033C6A: adds r5, 0x10 mov r4, r12 adds r4, 0x20 - ldr r6, _08033CF4 + ldr r6, =0x02022f68 mov r2, r12 adds r2, 0x30 _08033C88: adds r1, r5, r3 - ldr r7, _08033CF8 + ldr r7, =0x02022f58 adds r0, r3, r7 ldrb r0, [r0] strb r0, [r1] @@ -106923,20 +104320,7 @@ _08033C88: pop {r0} bx r0 .align 2, 0 -_08033CC4: .4byte 0x02022d10 -_08033CC8: .4byte 0x0202433a -_08033CCC: .4byte 0x020241ea -_08033CD0: .4byte 0x020241ec -_08033CD4: .4byte 0x02024208 -_08033CD8: .4byte 0x0202420a -_08033CDC: .4byte 0x02024474 -_08033CE0: .4byte 0x0202449c -_08033CE4: .4byte 0x0202420f -_08033CE8: .4byte 0x0831c898 -_08033CEC: .4byte 0x02022f78 -_08033CF0: .4byte 0x02024084 -_08033CF4: .4byte 0x02022f68 -_08033CF8: .4byte 0x02022f58 + .pool thumb_func_end dp01_build_cmdbuf_x10_TODO thumb_func_start dp01_build_cmdbuf_x11_TODO @@ -106951,7 +104335,7 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC mov r10, r0 lsls r1, 16 lsrs r1, 16 - ldr r2, _08033DB8 + ldr r2, =0x02022d10 movs r0, 0x11 strb r0, [r2] strb r0, [r2, 0x1] @@ -106960,34 +104344,34 @@ dp01_build_cmdbuf_x11_TODO: @ 8033CFC strb r1, [r2, 0x3] adds r0, r2, 0x4 mov r12, r0 - ldr r0, _08033DBC + ldr r0, =0x020241ea ldrh r0, [r0] strh r0, [r2, 0x4] - ldr r0, _08033DC0 + ldr r0, =0x020241ec ldrh r0, [r0] mov r1, r12 strh r0, [r1, 0x2] - ldr r0, _08033DC4 + ldr r0, =0x02024208 ldrh r0, [r0] strh r0, [r1, 0x4] - ldr r0, _08033DC8 + ldr r0, =0x0202420a ldrb r0, [r0] strb r0, [r1, 0x6] - ldr r0, _08033DCC + ldr r0, =0x02024474 ldrb r0, [r0, 0x17] strb r0, [r1, 0x7] - ldr r0, _08033DD0 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x52 ldrb r0, [r0] strb r0, [r1, 0x8] movs r3, 0 mov r9, r2 - ldr r7, _08033DD4 + ldr r7, =0x02022f78 mov r8, r7 mov r4, r9 adds r4, 0x10 - ldr r0, _08033DD8 + ldr r0, =0x02024084 adds r2, r0, 0 adds r2, 0x20 _08033D5E: @@ -107003,12 +104387,12 @@ _08033D5E: adds r5, 0x10 mov r4, r12 adds r4, 0x20 - ldr r6, _08033DDC + ldr r6, =0x02022f68 mov r2, r12 adds r2, 0x30 _08033D7C: adds r1, r5, r3 - ldr r7, _08033DE0 + ldr r7, =0x02022f58 adds r0, r3, r7 ldrb r0, [r0] strb r0, [r1] @@ -107036,17 +104420,7 @@ _08033D7C: pop {r0} bx r0 .align 2, 0 -_08033DB8: .4byte 0x02022d10 -_08033DBC: .4byte 0x020241ea -_08033DC0: .4byte 0x020241ec -_08033DC4: .4byte 0x02024208 -_08033DC8: .4byte 0x0202420a -_08033DCC: .4byte 0x02024474 -_08033DD0: .4byte 0x0202449c -_08033DD4: .4byte 0x02022f78 -_08033DD8: .4byte 0x02024084 -_08033DDC: .4byte 0x02022f68 -_08033DE0: .4byte 0x02022f58 + .pool thumb_func_end dp01_build_cmdbuf_x11_TODO thumb_func_start dp01_build_cmdbuf_x12_a_bb @@ -107057,7 +104431,7 @@ dp01_build_cmdbuf_x12_a_bb: @ 8033DE4 lsrs r0, 24 lsls r2, 16 lsrs r2, 16 - ldr r1, _08033E0C + ldr r1, =0x02022d10 movs r3, 0x12 strb r3, [r1] strb r4, [r1, 0x1] @@ -107070,7 +104444,7 @@ dp01_build_cmdbuf_x12_a_bb: @ 8033DE4 pop {r0} bx r0 .align 2, 0 -_08033E0C: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x12_a_bb thumb_func_start sub_8033E10 @@ -107078,7 +104452,7 @@ sub_8033E10: @ 8033E10 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08033E2C + ldr r1, =0x02022d10 movs r2, 0x13 strb r2, [r1] strb r2, [r1, 0x1] @@ -107089,7 +104463,7 @@ sub_8033E10: @ 8033E10 pop {r0} bx r0 .align 2, 0 -_08033E2C: .4byte 0x02022d10 + .pool thumb_func_end sub_8033E10 thumb_func_start sub_8033E30 @@ -107098,7 +104472,7 @@ sub_8033E30: @ 8033E30 adds r5, r3, 0 lsls r0, 24 lsrs r6, r0, 24 - ldr r3, _08033E68 + ldr r3, =0x02022d10 movs r4, 0 movs r0, 0x14 strb r0, [r3] @@ -107123,7 +104497,7 @@ _08033E4C: pop {r0} bx r0 .align 2, 0 -_08033E68: .4byte 0x02022d10 + .pool thumb_func_end sub_8033E30 thumb_func_start sub_8033E6C @@ -107132,7 +104506,7 @@ sub_8033E6C: @ 8033E6C adds r4, r1, 0 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08033E9C + ldr r1, =0x02022d10 movs r0, 0x15 strb r0, [r1] movs r2, 0 @@ -107152,7 +104526,7 @@ _08033E7E: pop {r0} bx r0 .align 2, 0 -_08033E9C: .4byte 0x02022d10 + .pool thumb_func_end sub_8033E6C thumb_func_start dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f @@ -107161,7 +104535,7 @@ dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f: @ 8033EA0 ldr r6, [sp, 0x10] lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _08033ED8 + ldr r4, =0x02022d10 movs r0, 0x16 strb r0, [r4] strb r1, [r4, 0x1] @@ -107185,7 +104559,7 @@ _08033EBA: pop {r0} bx r0 .align 2, 0 -_08033ED8: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f thumb_func_start dp01_build_cmdbuf_x17_17_17_17 @@ -107193,7 +104567,7 @@ dp01_build_cmdbuf_x17_17_17_17: @ 8033EDC push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08033EF8 + ldr r1, =0x02022d10 movs r2, 0x17 strb r2, [r1] strb r2, [r1, 0x1] @@ -107204,7 +104578,7 @@ dp01_build_cmdbuf_x17_17_17_17: @ 8033EDC pop {r0} bx r0 .align 2, 0 -_08033EF8: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x17_17_17_17 thumb_func_start dp01_build_cmdbuf_x18_0_aa_health_bar_update @@ -107214,7 +104588,7 @@ dp01_build_cmdbuf_x18_0_aa_health_bar_update: @ 8033EFC lsrs r0, 24 lsls r1, 16 lsrs r1, 16 - ldr r3, _08033F30 + ldr r3, =0x02022d10 movs r4, 0 movs r2, 0x18 strb r2, [r3] @@ -107234,7 +104608,7 @@ dp01_build_cmdbuf_x18_0_aa_health_bar_update: @ 8033EFC pop {r0} bx r0 .align 2, 0 -_08033F30: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x18_0_aa_health_bar_update thumb_func_start dp01_build_cmdbuf_x19_a_bb @@ -107245,7 +104619,7 @@ dp01_build_cmdbuf_x19_a_bb: @ 8033F34 lsrs r0, 24 lsls r2, 16 lsrs r2, 16 - ldr r1, _08033F64 + ldr r1, =0x02022d10 movs r3, 0x19 strb r3, [r1] strb r4, [r1, 0x1] @@ -107263,7 +104637,7 @@ dp01_build_cmdbuf_x19_a_bb: @ 8033F34 pop {r0} bx r0 .align 2, 0 -_08033F64: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x19_a_bb thumb_func_start dp01_build_cmdbuf_x1A_aaaa_bbbb @@ -107272,7 +104646,7 @@ dp01_build_cmdbuf_x1A_aaaa_bbbb: @ 8033F68 adds r4, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08033FB8 + ldr r1, =0x02022d10 movs r3, 0x1A strb r3, [r1] strb r4, [r1, 0x1] @@ -107307,7 +104681,7 @@ dp01_build_cmdbuf_x1A_aaaa_bbbb: @ 8033F68 pop {r0} bx r0 .align 2, 0 -_08033FB8: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x1A_aaaa_bbbb thumb_func_start dp01_build_cmdbuf_x1B_aaaa_b @@ -107316,7 +104690,7 @@ dp01_build_cmdbuf_x1B_aaaa_b: @ 8033FBC adds r4, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08033FF4 + ldr r1, =0x02022d10 movs r3, 0x1B strb r3, [r1] strb r4, [r1, 0x1] @@ -107339,7 +104713,7 @@ dp01_build_cmdbuf_x1B_aaaa_b: @ 8033FBC pop {r0} bx r0 .align 2, 0 -_08033FF4: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x1B_aaaa_b thumb_func_start dp01_build_cmdbuf_x1C_a @@ -107348,7 +104722,7 @@ dp01_build_cmdbuf_x1C_a: @ 8033FF8 adds r3, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08034014 + ldr r1, =0x02022d10 movs r2, 0x1C strb r2, [r1] strb r3, [r1, 0x1] @@ -107357,7 +104731,7 @@ dp01_build_cmdbuf_x1C_a: @ 8033FF8 pop {r0} bx r0 .align 2, 0 -_08034014: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x1C_a thumb_func_start dp01_build_cmdbuf_x1D_1D_numargs_varargs @@ -107367,7 +104741,7 @@ dp01_build_cmdbuf_x1D_1D_numargs_varargs: @ 8034018 lsrs r6, r0, 24 lsls r1, 16 lsrs r4, r1, 16 - ldr r1, _0803405C + ldr r1, =0x02022d10 movs r0, 0x1D strb r0, [r1] strb r0, [r1, 0x1] @@ -107398,7 +104772,7 @@ _08034048: pop {r0} bx r0 .align 2, 0 -_0803405C: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x1D_1D_numargs_varargs thumb_func_start sub_8034060 @@ -107409,7 +104783,7 @@ sub_8034060: @ 8034060 lsrs r6, r0, 24 lsls r2, 16 lsrs r5, r2, 16 - ldr r2, _080340C4 + ldr r2, =0x02022d10 movs r0, 0x1E strb r0, [r2] strb r1, [r2, 0x1] @@ -107454,7 +104828,7 @@ _080340B0: pop {r0} bx r0 .align 2, 0 -_080340C4: .4byte 0x02022d10 + .pool thumb_func_end sub_8034060 thumb_func_start sub_80340C8 @@ -107464,7 +104838,7 @@ sub_80340C8: @ 80340C8 lsrs r6, r0, 24 lsls r1, 16 lsrs r4, r1, 16 - ldr r1, _0803410C + ldr r1, =0x02022d10 movs r0, 0x1F strb r0, [r1] strb r4, [r1, 0x1] @@ -107494,7 +104868,7 @@ _080340F6: pop {r0} bx r0 .align 2, 0 -_0803410C: .4byte 0x02022d10 + .pool thumb_func_end sub_80340C8 thumb_func_start sub_8034110 @@ -107504,7 +104878,7 @@ sub_8034110: @ 8034110 lsrs r6, r0, 24 lsls r1, 16 lsrs r4, r1, 16 - ldr r1, _08034154 + ldr r1, =0x02022d10 movs r0, 0x20 strb r0, [r1] strb r4, [r1, 0x1] @@ -107534,7 +104908,7 @@ _0803413E: pop {r0} bx r0 .align 2, 0 -_08034154: .4byte 0x02022d10 + .pool thumb_func_end sub_8034110 thumb_func_start dp01_build_cmdbuf_x21_a_bb @@ -107545,7 +104919,7 @@ dp01_build_cmdbuf_x21_a_bb: @ 8034158 lsrs r0, 24 lsls r2, 16 lsrs r2, 16 - ldr r1, _08034180 + ldr r1, =0x02022d10 movs r3, 0x21 strb r3, [r1] strb r4, [r1, 0x1] @@ -107558,7 +104932,7 @@ dp01_build_cmdbuf_x21_a_bb: @ 8034158 pop {r0} bx r0 .align 2, 0 -_08034180: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x21_a_bb thumb_func_start dp01_build_cmdbuf_x22_a_three_bytes @@ -107567,7 +104941,7 @@ dp01_build_cmdbuf_x22_a_three_bytes: @ 8034184 adds r4, r2, 0 lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _080341B8 + ldr r2, =0x02022d10 movs r0, 0x22 strb r0, [r2] strb r1, [r2, 0x1] @@ -107589,7 +104963,7 @@ _08034198: pop {r0} bx r0 .align 2, 0 -_080341B8: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x22_a_three_bytes thumb_func_start dp01_build_cmdbuf_x23_aa_0 @@ -107599,7 +104973,7 @@ dp01_build_cmdbuf_x23_aa_0: @ 80341BC lsrs r0, 24 lsls r1, 16 lsrs r1, 16 - ldr r3, _080341E4 + ldr r3, =0x02022d10 movs r4, 0 movs r2, 0x23 strb r2, [r3] @@ -107614,7 +104988,7 @@ dp01_build_cmdbuf_x23_aa_0: @ 80341BC pop {r0} bx r0 .align 2, 0 -_080341E4: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x23_aa_0 thumb_func_start dp01_build_cmdbuf_x24_aa_0 @@ -107624,7 +104998,7 @@ dp01_build_cmdbuf_x24_aa_0: @ 80341E8 lsrs r0, 24 lsls r1, 16 lsrs r1, 16 - ldr r3, _08034210 + ldr r3, =0x02022d10 movs r4, 0 movs r2, 0x24 strb r2, [r3] @@ -107639,7 +105013,7 @@ dp01_build_cmdbuf_x24_aa_0: @ 80341E8 pop {r0} bx r0 .align 2, 0 -_08034210: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x24_aa_0 thumb_func_start dp01_build_cmdbuf_x25_25_25_25 @@ -107647,7 +105021,7 @@ dp01_build_cmdbuf_x25_25_25_25: @ 8034214 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08034230 + ldr r1, =0x02022d10 movs r2, 0x25 strb r2, [r1] strb r2, [r1, 0x1] @@ -107658,7 +105032,7 @@ dp01_build_cmdbuf_x25_25_25_25: @ 8034214 pop {r0} bx r0 .align 2, 0 -_08034230: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x25_25_25_25 thumb_func_start dp01_build_cmdbuf_x26_a @@ -107667,7 +105041,7 @@ dp01_build_cmdbuf_x26_a: @ 8034234 adds r3, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08034250 + ldr r1, =0x02022d10 movs r2, 0x26 strb r2, [r1] strb r3, [r1, 0x1] @@ -107676,7 +105050,7 @@ dp01_build_cmdbuf_x26_a: @ 8034234 pop {r0} bx r0 .align 2, 0 -_08034250: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x26_a thumb_func_start dp01_build_cmdbuf_x27_27_27_27 @@ -107684,7 +105058,7 @@ dp01_build_cmdbuf_x27_27_27_27: @ 8034254 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08034270 + ldr r1, =0x02022d10 movs r2, 0x27 strb r2, [r1] strb r2, [r1, 0x1] @@ -107695,7 +105069,7 @@ dp01_build_cmdbuf_x27_27_27_27: @ 8034254 pop {r0} bx r0 .align 2, 0 -_08034270: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x27_27_27_27 thumb_func_start dp01_build_cmdbuf_x28_28_28_28 @@ -107703,7 +105077,7 @@ dp01_build_cmdbuf_x28_28_28_28: @ 8034274 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08034290 + ldr r1, =0x02022d10 movs r2, 0x28 strb r2, [r1] strb r2, [r1, 0x1] @@ -107714,7 +105088,7 @@ dp01_build_cmdbuf_x28_28_28_28: @ 8034274 pop {r0} bx r0 .align 2, 0 -_08034290: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x28_28_28_28 thumb_func_start dp01_build_cmdbuf_x29_29_29_29 @@ -107722,7 +105096,7 @@ dp01_build_cmdbuf_x29_29_29_29: @ 8034294 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080342B0 + ldr r1, =0x02022d10 movs r2, 0x29 strb r2, [r1] strb r2, [r1, 0x1] @@ -107733,7 +105107,7 @@ dp01_build_cmdbuf_x29_29_29_29: @ 8034294 pop {r0} bx r0 .align 2, 0 -_080342B0: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x29_29_29_29 thumb_func_start dp01_build_cmdbuf_x2A_2A_2A_2A @@ -107741,7 +105115,7 @@ dp01_build_cmdbuf_x2A_2A_2A_2A: @ 80342B4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080342D0 + ldr r1, =0x02022d10 movs r2, 0x2A strb r2, [r1] strb r2, [r1, 0x1] @@ -107752,7 +105126,7 @@ dp01_build_cmdbuf_x2A_2A_2A_2A: @ 80342B4 pop {r0} bx r0 .align 2, 0 -_080342D0: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x2A_2A_2A_2A thumb_func_start dp01_build_cmdbuf_x2B_aa_0 @@ -107762,7 +105136,7 @@ dp01_build_cmdbuf_x2B_aa_0: @ 80342D4 lsrs r0, 24 lsls r1, 16 lsrs r1, 16 - ldr r3, _080342FC + ldr r3, =0x02022d10 movs r4, 0 movs r2, 0x2B strb r2, [r3] @@ -107777,7 +105151,7 @@ dp01_build_cmdbuf_x2B_aa_0: @ 80342D4 pop {r0} bx r0 .align 2, 0 -_080342FC: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x2B_aa_0 thumb_func_start sub_8034300 @@ -107787,7 +105161,7 @@ sub_8034300: @ 8034300 lsrs r0, 24 lsls r1, 16 lsrs r1, 16 - ldr r4, _08034328 + ldr r4, =0x02022d10 movs r3, 0x2C strb r3, [r4] strb r1, [r4, 0x1] @@ -107801,7 +105175,7 @@ sub_8034300: @ 8034300 pop {r0} bx r0 .align 2, 0 -_08034328: .4byte 0x02022d10 + .pool thumb_func_end sub_8034300 thumb_func_start dp01_build_cmdbuf_x2D_2D_2D_2D @@ -107809,7 +105183,7 @@ dp01_build_cmdbuf_x2D_2D_2D_2D: @ 803432C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08034348 + ldr r1, =0x02022d10 movs r2, 0x2D strb r2, [r1] strb r2, [r1, 0x1] @@ -107820,7 +105194,7 @@ dp01_build_cmdbuf_x2D_2D_2D_2D: @ 803432C pop {r0} bx r0 .align 2, 0 -_08034348: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x2D_2D_2D_2D thumb_func_start dp01_build_cmdbuf_x2E_a @@ -107829,7 +105203,7 @@ dp01_build_cmdbuf_x2E_a: @ 803434C adds r3, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08034368 + ldr r1, =0x02022d10 movs r2, 0x2E strb r2, [r1] strb r3, [r1, 0x1] @@ -107838,7 +105212,7 @@ dp01_build_cmdbuf_x2E_a: @ 803434C pop {r0} bx r0 .align 2, 0 -_08034368: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x2E_a thumb_func_start dp01_build_cmdbuf_x2F_2F_2F_2F @@ -107846,7 +105220,7 @@ dp01_build_cmdbuf_x2F_2F_2F_2F: @ 803436C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08034388 + ldr r1, =0x02022d10 movs r2, 0x2F strb r2, [r1] strb r2, [r1, 0x1] @@ -107857,7 +105231,7 @@ dp01_build_cmdbuf_x2F_2F_2F_2F: @ 803436C pop {r0} bx r0 .align 2, 0 -_08034388: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x2F_2F_2F_2F thumb_func_start dp01_build_cmdbuf_x30_TODO @@ -107868,7 +105242,7 @@ dp01_build_cmdbuf_x30_TODO: @ 803438C lsrs r5, r0, 24 lsls r2, 24 lsrs r2, 24 - ldr r1, _080343D0 + ldr r1, =0x02022d10 movs r3, 0x30 strb r3, [r1] movs r0, 0x7F @@ -107897,7 +105271,7 @@ _080343B4: pop {r0} bx r0 .align 2, 0 -_080343D0: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x30_TODO thumb_func_start dp01_build_cmdbuf_x31_31_31_31 @@ -107905,7 +105279,7 @@ dp01_build_cmdbuf_x31_31_31_31: @ 80343D4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080343F0 + ldr r1, =0x02022d10 movs r2, 0x31 strb r2, [r1] strb r2, [r1, 0x1] @@ -107916,7 +105290,7 @@ dp01_build_cmdbuf_x31_31_31_31: @ 80343D4 pop {r0} bx r0 .align 2, 0 -_080343F0: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x31_31_31_31 thumb_func_start dp01_build_cmdbuf_x32_32_32_32 @@ -107924,7 +105298,7 @@ dp01_build_cmdbuf_x32_32_32_32: @ 80343F4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08034410 + ldr r1, =0x02022d10 movs r2, 0x32 strb r2, [r1] strb r2, [r1, 0x1] @@ -107935,7 +105309,7 @@ dp01_build_cmdbuf_x32_32_32_32: @ 80343F4 pop {r0} bx r0 .align 2, 0 -_08034410: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x32_32_32_32 thumb_func_start dp01_build_cmdbuf_x33_a_33_33 @@ -107944,7 +105318,7 @@ dp01_build_cmdbuf_x33_a_33_33: @ 8034414 adds r3, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _08034434 + ldr r1, =0x02022d10 movs r2, 0x33 strb r2, [r1] strb r3, [r1, 0x1] @@ -107955,7 +105329,7 @@ dp01_build_cmdbuf_x33_a_33_33: @ 8034414 pop {r0} bx r0 .align 2, 0 -_08034434: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x33_a_33_33 thumb_func_start dp01_build_cmdbuf_x34_a_bb_aka_battle_anim @@ -107966,7 +105340,7 @@ dp01_build_cmdbuf_x34_a_bb_aka_battle_anim: @ 8034438 lsrs r0, 24 lsls r2, 16 lsrs r2, 16 - ldr r1, _08034460 + ldr r1, =0x02022d10 movs r3, 0x34 strb r3, [r1] strb r4, [r1, 0x1] @@ -107979,7 +105353,7 @@ dp01_build_cmdbuf_x34_a_bb_aka_battle_anim: @ 8034438 pop {r0} bx r0 .align 2, 0 -_08034460: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x34_a_bb_aka_battle_anim thumb_func_start sub_8034464 @@ -107989,7 +105363,7 @@ sub_8034464: @ 8034464 lsrs r5, r0, 24 lsls r2, 24 lsrs r2, 24 - ldr r4, _08034488 + ldr r4, =0x02022d10 movs r0, 0x35 strb r0, [r4] strb r1, [r4, 0x1] @@ -108001,12 +105375,12 @@ sub_8034464: @ 8034464 strb r0, [r4, 0x3] b _08034490 .align 2, 0 -_08034488: .4byte 0x02022d10 + .pool _0803448C: strb r2, [r4, 0x2] strb r2, [r4, 0x3] _08034490: - ldr r1, _080344A4 + ldr r1, =0x02022d10 ldrb r2, [r1, 0x2] adds r2, 0x4 adds r0, r5, 0 @@ -108015,7 +105389,7 @@ _08034490: pop {r0} bx r0 .align 2, 0 -_080344A4: .4byte 0x02022d10 + .pool thumb_func_end sub_8034464 thumb_func_start dp01_build_cmdbuf_x38_a @@ -108024,7 +105398,7 @@ dp01_build_cmdbuf_x38_a: @ 80344A8 adds r3, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _080344C4 + ldr r1, =0x02022d10 movs r2, 0x36 strb r2, [r1] strb r3, [r1, 0x1] @@ -108033,7 +105407,7 @@ dp01_build_cmdbuf_x38_a: @ 80344A8 pop {r0} bx r0 .align 2, 0 -_080344C4: .4byte 0x02022d10 + .pool thumb_func_end dp01_build_cmdbuf_x38_a thumb_func_start dp01_build_cmdbuf_x37_a @@ -108042,13 +105416,13 @@ dp01_build_cmdbuf_x37_a: @ 80344C8 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r4, _0803450C + ldr r4, =0x02022d10 movs r0, 0x37 strb r0, [r4] strb r1, [r4, 0x1] - ldr r0, _08034510 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _08034514 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] lsls r0, 28 @@ -108071,9 +105445,7 @@ dp01_build_cmdbuf_x37_a: @ 80344C8 pop {r0} bx r0 .align 2, 0 -_0803450C: .4byte 0x02022d10 -_08034510: .4byte 0x03005d90 -_08034514: .4byte 0x00000ca9 + .pool thumb_func_end dp01_build_cmdbuf_x37_a thumb_func_start call_LZZUnCompWram @@ -108098,7 +105470,7 @@ gpu_tile_obj_decompress_and_load: @ 8034530 sub sp, 0x8 adds r4, r0, 0 ldr r0, [r4] - ldr r5, _08034560 + ldr r5, =0x0201c000 adds r1, r5, 0 bl LZ77UnCompWram str r5, [sp] @@ -108116,7 +105488,7 @@ gpu_tile_obj_decompress_and_load: @ 8034530 pop {r1} bx r1 .align 2, 0 -_08034560: .4byte 0x0201c000 + .pool thumb_func_end gpu_tile_obj_decompress_and_load thumb_func_start gpu_tile_obj_decompress_and_load2 @@ -108147,12 +105519,12 @@ gpu_pal_obj_decompress_and_apply: @ 803458C sub sp, 0x8 adds r5, r0, 0 ldr r0, [r5] - ldr r4, _080345B8 + ldr r4, =0x0201c000 adds r1, r4, 0 bl LZ77UnCompWram str r4, [sp] ldrh r2, [r5, 0x4] - ldr r1, _080345BC + ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 orrs r0, r2 @@ -108164,8 +105536,7 @@ gpu_pal_obj_decompress_and_apply: @ 803458C pop {r0} bx r0 .align 2, 0 -_080345B8: .4byte 0x0201c000 -_080345BC: .4byte 0xffff0000 + .pool thumb_func_end gpu_pal_obj_decompress_and_apply thumb_func_start gpu_pal_obj_decompress_and_apply2 @@ -108178,7 +105549,7 @@ gpu_pal_obj_decompress_and_apply2: @ 80345C0 bl LZ77UnCompWram str r4, [sp] ldrh r2, [r5, 0x4] - ldr r1, _080345EC + ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 orrs r0, r2 @@ -108190,7 +105561,7 @@ gpu_pal_obj_decompress_and_apply2: @ 80345C0 pop {r0} bx r0 .align 2, 0 -_080345EC: .4byte 0xffff0000 + .pool thumb_func_end gpu_pal_obj_decompress_and_apply2 thumb_func_start sub_80345F0 @@ -108203,12 +105574,12 @@ sub_80345F0: @ 80345F0 lsls r0, 1 cmp r5, r0 ble _08034610 - ldr r0, _0803460C + ldr r0, =0x0830a18c ldr r0, [r0] bl LZ77UnCompWram b _08034618 .align 2, 0 -_0803460C: .4byte 0x0830a18c + .pool _08034610: ldr r0, [r3] adds r1, r4, 0 @@ -108229,7 +105600,7 @@ sub_8034628: @ 8034628 adds r4, r0, 0 adds r5, r1, 0 lsls r0, r2, 3 - ldr r1, _08034650 + ldr r1, =0x0830a18c adds r0, r1 movs r1, 0 cmp r4, r0 @@ -108245,7 +105616,7 @@ _0803463E: pop {r0} bx r0 .align 2, 0 -_08034650: .4byte 0x0830a18c + .pool thumb_func_end sub_8034628 thumb_func_start sub_8034654 @@ -108298,34 +105669,34 @@ _080346AC: mov r0, r8 cmp r0, 0 bne _080346C0 - ldr r0, _080346BC + ldr r0, =0x083028b8 lsls r1, 3 adds r1, r0 ldr r0, [r1] b _080346DC .align 2, 0 -_080346BC: .4byte 0x083028b8 + .pool _080346C0: - ldr r0, _080346CC + ldr r0, =0x0830a18c lsls r1, 3 adds r1, r0 ldr r0, [r1] b _080346DC .align 2, 0 -_080346CC: .4byte 0x0830a18c + .pool _080346D0: movs r0, 0xCE lsls r0, 1 cmp r7, r0 ble _080346E8 - ldr r0, _080346E4 + ldr r0, =0x0830a18c ldr r0, [r0] _080346DC: adds r1, r4, 0 bl LZ77UnCompWram b _080346F0 .align 2, 0 -_080346E4: .4byte 0x0830a18c + .pool _080346E8: ldr r0, [r6] adds r1, r4, 0 @@ -108534,7 +105905,7 @@ _08034840: adds r1, r3, r0 ldrb r0, [r2, 0x10] strb r0, [r1] - ldr r0, _08034898 + ldr r0, =0x00000103 adds r1, r3, r0 ldrb r0, [r2, 0x11] strb r0, [r1] @@ -108543,7 +105914,7 @@ _08034840: adds r1, r3, r0 ldrb r0, [r2, 0x12] strb r0, [r1] - ldr r0, _0803489C + ldr r0, =0x00000121 adds r1, r3, r0 ldrb r0, [r2, 0x13] strb r0, [r1] @@ -108566,8 +105937,7 @@ _0803488E: adds r5, 0x20 b _080348A8 .align 2, 0 -_08034898: .4byte 0x00000103 -_0803489C: .4byte 0x00000121 + .pool _080348A0: mov r4, r9 cmp r4, 0x5 @@ -108755,7 +106125,7 @@ gpu_pal_obj_decompress_and_apply3: @ 80349C4 bl LZ77UnCompWram str r5, [sp] ldrh r2, [r4, 0x4] - ldr r1, _08034A04 + ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 orrs r0, r2 @@ -108770,7 +106140,7 @@ gpu_pal_obj_decompress_and_apply3: @ 80349C4 pop {r1} bx r1 .align 2, 0 -_08034A04: .4byte 0xffff0000 + .pool thumb_func_end gpu_pal_obj_decompress_and_apply3 thumb_func_start LZ77UnCompAnyRam @@ -108783,12 +106153,12 @@ LZ77UnCompAnyRam: @ 8034A08 lsls r0, 1 cmp r5, r0 ble _08034A28 - ldr r0, _08034A24 + ldr r0, =0x0830a18c ldr r0, [r0] bl LZ77UnCompWram b _08034A30 .align 2, 0 -_08034A24: .4byte 0x0830a18c + .pool _08034A28: ldr r0, [r3] adds r1, r4, 0 @@ -108852,34 +106222,34 @@ _08034A98: mov r0, r8 cmp r0, 0 bne _08034AAC - ldr r0, _08034AA8 + ldr r0, =0x083028b8 lsls r1, 3 adds r1, r0 ldr r0, [r1] b _08034AC8 .align 2, 0 -_08034AA8: .4byte 0x083028b8 + .pool _08034AAC: - ldr r0, _08034AB8 + ldr r0, =0x0830a18c lsls r1, 3 adds r1, r0 ldr r0, [r1] b _08034AC8 .align 2, 0 -_08034AB8: .4byte 0x0830a18c + .pool _08034ABC: movs r0, 0xCE lsls r0, 1 cmp r7, r0 ble _08034AD4 - ldr r0, _08034AD0 + ldr r0, =0x0830a18c ldr r0, [r0] _08034AC8: adds r1, r4, 0 bl LZ77UnCompWram b _08034ADC .align 2, 0 -_08034AD0: .4byte 0x0830a18c + .pool _08034AD4: ldr r0, [r6] adds r1, r4, 0 @@ -108908,7 +106278,7 @@ help_system_enable_unless_flashback__sp199: @ 8034AFC adds r4, r0, 0 adds r5, r1, 0 lsls r0, r2, 3 - ldr r1, _08034B24 + ldr r1, =0x0830a18c adds r0, r1 movs r1, 0 cmp r4, r0 @@ -108924,7 +106294,7 @@ _08034B12: pop {r0} bx r0 .align 2, 0 -_08034B24: .4byte 0x0830a18c + .pool thumb_func_end help_system_enable_unless_flashback__sp199 thumb_func_start sub_8034B28 @@ -108935,12 +106305,12 @@ sub_8034B28: @ 8034B28 lsls r0, 1 cmp r2, r0 ble _08034B44 - ldr r0, _08034B40 + ldr r0, =0x0830a18c ldr r0, [r0] bl LZ77UnCompWram b _08034B4A .align 2, 0 -_08034B40: .4byte 0x0830a18c + .pool _08034B44: ldr r0, [r3] bl LZ77UnCompWram @@ -108956,7 +106326,7 @@ sub_8034B50: @ 8034B50 adds r4, r0, 0 adds r5, r1, 0 lsls r0, r2, 3 - ldr r1, _08034B78 + ldr r1, =0x0830a18c adds r0, r1 movs r1, 0 cmp r4, r0 @@ -108972,7 +106342,7 @@ _08034B66: pop {r0} bx r0 .align 2, 0 -_08034B78: .4byte 0x0830a18c + .pool thumb_func_end sub_8034B50 thumb_func_start sub_8034B7C @@ -109025,34 +106395,34 @@ _08034BD4: mov r0, r8 cmp r0, 0 bne _08034BE8 - ldr r0, _08034BE4 + ldr r0, =0x083028b8 lsls r1, 3 adds r1, r0 ldr r0, [r1] b _08034C04 .align 2, 0 -_08034BE4: .4byte 0x083028b8 + .pool _08034BE8: - ldr r0, _08034BF4 + ldr r0, =0x0830a18c lsls r1, 3 adds r1, r0 ldr r0, [r1] b _08034C04 .align 2, 0 -_08034BF4: .4byte 0x0830a18c + .pool _08034BF8: movs r0, 0xCE lsls r0, 1 cmp r7, r0 ble _08034C10 - ldr r0, _08034C0C + ldr r0, =0x0830a18c ldr r0, [r0] _08034C04: adds r1, r5, 0 bl LZ77UnCompWram b _08034C18 .align 2, 0 -_08034C0C: .4byte 0x0830a18c + .pool _08034C10: ldr r0, [r6] adds r1, r5, 0 @@ -109082,21 +106452,21 @@ duplicate_deoxys_graphics_data: @ 8034C30 movs r1, 0x80 lsls r1, 4 adds r0, r3, r1 - ldr r2, _08034C50 + ldr r2, =0x04000200 adds r1, r3, 0 bl CpuSet _08034C4A: pop {r0} bx r0 .align 2, 0 -_08034C50: .4byte 0x04000200 + .pool thumb_func_end duplicate_deoxys_graphics_data thumb_func_start sub_8034C54 sub_8034C54: @ 8034C54 push {r4-r7,lr} adds r4, r0, 0 - ldr r5, _08034C74 + ldr r5, =0x02022e10 ldr r0, [r5] cmp r0, 0 beq _08034C64 @@ -109110,7 +106480,7 @@ _08034C64: movs r0, 0 b _08034CC0 .align 2, 0 -_08034C74: .4byte 0x02022e10 + .pool _08034C78: lsls r0, r4, 3 subs r0, r4 @@ -109158,7 +106528,7 @@ _08034CC0: thumb_func_start sub_8034CC8 sub_8034CC8: @ 8034CC8 push {r4,r5,lr} - ldr r2, _08034D10 + ldr r2, =0x02022e10 ldr r1, [r2] cmp r1, 0 beq _08034D08 @@ -109179,12 +106549,12 @@ _08034CE2: cmp r4, r0 bcc _08034CE2 _08034CF2: - ldr r0, _08034D10 + ldr r0, =0x02022e10 ldr r0, [r0] ldr r0, [r0, 0x4] bl free _08034CFC: - ldr r4, _08034D10 + ldr r4, =0x02022e10 ldr r0, [r4] bl free movs r0, 0 @@ -109194,7 +106564,7 @@ _08034D08: pop {r0} bx r0 .align 2, 0 -_08034D10: .4byte 0x02022e10 + .pool thumb_func_end sub_8034CC8 thumb_func_start sub_8034D14 @@ -109208,7 +106578,7 @@ sub_8034D14: @ 8034D14 mov r8, r0 mov r10, r1 adds r5, r2, 0 - ldr r6, _08034D8C + ldr r6, =0x02022e10 ldr r0, [r6] cmp r0, 0 beq _08034DD4 @@ -109244,7 +106614,7 @@ sub_8034D14: @ 8034D14 ldr r0, [r2, 0x4] adds r0, r4, r0 ldrh r1, [r0, 0xA] - ldr r7, _08034D90 + ldr r7, =0xffff0000 lsrs r0, r7, 16 cmp r1, r0 bne _08034DE0 @@ -109257,8 +106627,7 @@ sub_8034D14: @ 8034D14 bl gpu_tile_obj_alloc_tag_and_copy_to_vram b _08034DB4 .align 2, 0 -_08034D8C: .4byte 0x02022e10 -_08034D90: .4byte 0xffff0000 + .pool _08034D94: ldr r0, [r2] ldr r1, [r2, 0x4] @@ -109279,7 +106648,7 @@ _08034DB4: ldr r1, [r1, 0x4] adds r1, r4, r1 strh r0, [r1, 0xA] - ldr r0, _08034DD8 + ldr r0, =0x02022e10 ldr r0, [r0] ldr r1, [r0, 0x4] mov r2, r9 @@ -109288,20 +106657,19 @@ _08034DB4: lsls r0, 2 adds r0, r1 ldrh r1, [r0, 0xA] - ldr r0, _08034DDC + ldr r0, =0x0000ffff cmp r1, r0 bne _08034DE0 _08034DD4: movs r0, 0 b _08034EE8 .align 2, 0 -_08034DD8: .4byte 0x02022e10 -_08034DDC: .4byte 0x0000ffff + .pool _08034DE0: ldr r0, [r5, 0xC] ldrh r0, [r0, 0x4] bl gpu_pal_tags_index_of - ldr r6, _08034EF8 + ldr r6, =0x02022e10 ldr r1, [r6] ldr r1, [r1, 0x4] mov r4, r9 @@ -109415,7 +106783,7 @@ _08034EB2: cmp r3, r2 bcc _08034EB2 _08034ECA: - ldr r0, _08034EF8 + ldr r0, =0x02022e10 ldr r0, [r0] mov r3, r9 mov r4, r8 @@ -109438,7 +106806,7 @@ _08034EE8: pop {r1} bx r1 .align 2, 0 -_08034EF8: .4byte 0x02022e10 + .pool thumb_func_end sub_8034D14 thumb_func_start sub_8034EFC @@ -109460,7 +106828,7 @@ sub_8034EFC: @ 8034EFC movs r0, 0 strh r0, [r1] lsls r1, r5, 3 - ldr r2, _0803502C + ldr r2, =0x030022f8 mov r9, r2 add r1, r9 mov r0, r8 @@ -109481,18 +106849,18 @@ sub_8034EFC: @ 8034EFC mov r9, r2 _08034F46: lsls r0, r5, 3 - ldr r1, _08035030 + ldr r1, =0x030022c0 adds r3, r0, r1 ldrh r1, [r4, 0xE] adds r0, r3, 0 adds r0, 0x38 strb r1, [r0] - ldr r2, _08035034 + ldr r2, =0x000001ff adds r0, r2, 0 adds r1, r7, 0 ands r1, r0 ldrh r2, [r3, 0x3A] - ldr r0, _08035038 + ldr r0, =0xfffffe00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x3A] @@ -109519,10 +106887,10 @@ _08034F46: mov r1, r12 strb r0, [r1] ldrh r0, [r4, 0xA] - ldr r1, _0803503C + ldr r1, =0x000003ff ands r1, r0 ldrh r2, [r3, 0x3C] - ldr r0, _08035040 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x3C] @@ -109550,18 +106918,18 @@ _08034F46: bcc _08034F46 _08034FCE: subs r5, 0x1 - ldr r0, _08035030 + ldr r0, =0x030022c0 lsls r3, r5, 3 adds r3, r0 movs r2, 0xC ldrsh r1, [r4, r2] ldrb r0, [r4, 0x8] subs r1, r0 - ldr r2, _08035034 + ldr r2, =0x000001ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r3, 0x3A] - ldr r0, _08035038 + ldr r0, =0xfffffe00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x3A] @@ -109580,11 +106948,11 @@ _08034FCE: lsls r1, 1 ldrh r4, [r4, 0xA] adds r1, r4 - ldr r2, _0803503C + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r3, 0x3C] - ldr r0, _08035040 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x3C] @@ -109597,12 +106965,7 @@ _08034FCE: pop {r0} bx r0 .align 2, 0 -_0803502C: .4byte 0x030022f8 -_08035030: .4byte 0x030022c0 -_08035034: .4byte 0x000001ff -_08035038: .4byte 0xfffffe00 -_0803503C: .4byte 0x000003ff -_08035040: .4byte 0xfffffc00 + .pool thumb_func_end sub_8034EFC thumb_func_start sub_8035044 @@ -109610,7 +106973,7 @@ sub_8035044: @ 8035044 push {r4-r6,lr} adds r3, r0, 0 adds r4, r1, 0 - ldr r0, _08035074 + ldr r0, =0x02022e10 ldr r1, [r0] adds r6, r0, 0 cmp r1, 0 @@ -109631,7 +106994,7 @@ sub_8035044: @ 8035044 negs r4, r4 b _0803507A .align 2, 0 -_08035074: .4byte 0x02022e10 + .pool _08035078: movs r2, 0 _0803507A: @@ -109677,7 +107040,7 @@ sub_80350B0: @ 80350B0 str r2, [sp] ldr r5, [r0, 0x14] ldrb r7, [r0, 0x1] - ldr r0, _08035134 + ldr r0, =0x030022c0 mov r10, r0 cmp r5, 0 beq _0803511A @@ -109706,11 +107069,11 @@ _080350D6: mov r2, r8 ldrh r2, [r2, 0xA] adds r1, r2 - ldr r2, _08035138 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r0, [r6] - ldr r2, _0803513C + ldr r2, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r6] @@ -109732,9 +107095,7 @@ _0803511A: strb r1, [r0] b _08035154 .align 2, 0 -_08035134: .4byte 0x030022c0 -_08035138: .4byte 0x000003ff -_0803513C: .4byte 0xfffffc00 + .pool _08035140: lsls r2, r7, 3 add r2, r10 @@ -109769,18 +107130,18 @@ sub_8035164: @ 8035164 mov r8, r1 str r2, [sp] ldr r5, [r6, 0x14] - ldr r3, _0803520C + ldr r3, =0x03000dd4 ldrb r0, [r6, 0x1] str r0, [r3] - ldr r2, _08035210 + ldr r2, =0x03000dd8 movs r0, 0 str r0, [r2] - ldr r1, _08035214 + ldr r1, =0x03000ddc subs r0, 0x1 str r0, [r1] adds r7, r3, 0 mov r10, r1 - ldr r0, _08035218 + ldr r0, =0x030022c0 mov r9, r0 cmp r5, 0 beq _0803524C @@ -109817,11 +107178,11 @@ _080351C8: muls r3, r0 ldrh r4, [r6, 0xA] adds r3, r4 - ldr r1, _0803521C + ldr r1, =0x000003ff adds r0, r1, 0 ands r3, r0 ldrh r0, [r2, 0x3C] - ldr r4, _08035220 + ldr r4, =0xfffffc00 adds r1, r4, 0 ands r0, r1 orrs r0, r3 @@ -109838,17 +107199,12 @@ _080351C8: negs r0, r0 cmp r1, r0 bne _0803523A - ldr r4, _08035210 + ldr r4, =0x03000dd8 ldr r0, [r4] str r0, [r2] b _0803523A .align 2, 0 -_0803520C: .4byte 0x03000dd4 -_08035210: .4byte 0x03000dd8 -_08035214: .4byte 0x03000ddc -_08035218: .4byte 0x030022c0 -_0803521C: .4byte 0x000003ff -_08035220: .4byte 0xfffffc00 + .pool _08035224: ldr r0, [r7] lsls r0, 3 @@ -109865,7 +107221,7 @@ _0803523A: ldr r0, [r7] adds r0, 0x1 str r0, [r7] - ldr r4, _0803528C + ldr r4, =0x03000dd8 ldr r0, [r4] adds r0, 0x1 str r0, [r4] @@ -109895,19 +107251,17 @@ _0803524C: ldrb r1, [r6, 0x8] muls r0, r1 adds r2, r0 - ldr r1, _08035290 + ldr r1, =0x000001ff adds r0, r1, 0 ands r2, r0 ldrh r1, [r3, 0x3A] - ldr r0, _08035294 + ldr r0, =0xfffffe00 ands r0, r1 orrs r0, r2 strh r0, [r3, 0x3A] b _080352AE .align 2, 0 -_0803528C: .4byte 0x03000dd8 -_08035290: .4byte 0x000001ff -_08035294: .4byte 0xfffffe00 + .pool _08035298: ldr r0, [r7] lsls r0, 3 @@ -109953,7 +107307,7 @@ _080352E0: lsls r0, r3, 3 adds r1, r0, 0 adds r1, 0x39 - ldr r2, _080353A4 + ldr r2, =0x030022c0 adds r7, r1, r2 adds r0, 0x3C adds r6, r0, r2 @@ -109989,11 +107343,11 @@ _0803531E: muls r2, r0 ldrh r4, [r1, 0xA] adds r2, r4 - ldr r1, _080353A8 + ldr r1, =0x000003ff adds r0, r1, 0 ands r2, r0 ldrh r0, [r6] - ldr r4, _080353AC + ldr r4, =0xfffffc00 adds r1, r4, 0 ands r0, r1 orrs r0, r2 @@ -110016,7 +107370,7 @@ _0803535A: ldrb r0, [r0, 0x3] cmp r9, r0 bge _0803538A - ldr r1, _080353A4 + ldr r1, =0x030022c0 movs r5, 0x4 negs r5, r5 movs r4, 0x2 @@ -110042,7 +107396,7 @@ _0803538A: cmp r1, 0 beq _080353B0 lsls r0, r3, 3 - ldr r2, _080353A4 + ldr r2, =0x030022c0 adds r0, r2 adds r0, 0x39 ldrb r2, [r0] @@ -110052,12 +107406,10 @@ _0803538A: strb r1, [r0] b _080353C6 .align 2, 0 -_080353A4: .4byte 0x030022c0 -_080353A8: .4byte 0x000003ff -_080353AC: .4byte 0xfffffc00 + .pool _080353B0: lsls r2, r3, 3 - ldr r4, _080353D8 + ldr r4, =0x030022c0 adds r2, r4 adds r2, 0x39 ldrb r1, [r2] @@ -110077,14 +107429,14 @@ _080353C6: pop {r0} bx r0 .align 2, 0 -_080353D8: .4byte 0x030022c0 + .pool thumb_func_end sub_80352C0 thumb_func_start sub_80353DC sub_80353DC: @ 80353DC push {r4-r7,lr} adds r4, r0, 0 - ldr r0, _08035474 + ldr r0, =0x02022e10 ldr r0, [r0] cmp r0, 0 beq _0803546E @@ -110102,7 +107454,7 @@ sub_80353DC: @ 80353DC ldrb r2, [r2, 0x1] cmp r0, 0 beq _08035426 - ldr r1, _08035478 + ldr r1, =0x030022c0 movs r7, 0x4 negs r7, r7 movs r6, 0x2 @@ -110125,7 +107477,7 @@ _08035426: bl sub_8035570 cmp r0, 0 bne _08035442 - ldr r0, _08035474 + ldr r0, =0x02022e10 ldr r0, [r0] ldr r1, [r0, 0x4] subs r0, r5, r4 @@ -110138,7 +107490,7 @@ _08035442: bl sub_80355B4 cmp r0, 0 bne _0803545E - ldr r0, _08035474 + ldr r0, =0x02022e10 ldr r0, [r0] ldr r1, [r0, 0x4] subs r0, r5, r4 @@ -110147,7 +107499,7 @@ _08035442: ldrh r0, [r0, 0x12] bl gpu_pal_free_tag _0803545E: - ldr r0, _08035474 + ldr r0, =0x02022e10 ldr r0, [r0] ldr r1, [r0, 0x4] subs r0, r5, r4 @@ -110160,8 +107512,7 @@ _0803546E: pop {r0} bx r0 .align 2, 0 -_08035474: .4byte 0x02022e10 -_08035478: .4byte 0x030022c0 + .pool thumb_func_end sub_80353DC thumb_func_start sub_803547C @@ -110169,7 +107520,7 @@ sub_803547C: @ 803547C push {r4-r7,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _080354D0 + ldr r0, =0x02022e10 ldr r1, [r0] adds r7, r0, 0 cmp r1, 0 @@ -110190,7 +107541,7 @@ sub_803547C: @ 803547C beq _080354D8 cmp r1, 0 beq _0803550C - ldr r1, _080354D4 + ldr r1, =0x030022c0 movs r5, 0x4 negs r5, r5 movs r4, 0x2 @@ -110210,12 +107561,11 @@ _080354BC: bne _080354BC b _0803550C .align 2, 0 -_080354D0: .4byte 0x02022e10 -_080354D4: .4byte 0x030022c0 + .pool _080354D8: cmp r1, 0 beq _080354FA - ldr r1, _08035514 + ldr r1, =0x030022c0 movs r5, 0x4 negs r5, r5 adds r3, 0x1 @@ -110245,7 +107595,7 @@ _0803550C: pop {r0} bx r0 .align 2, 0 -_08035514: .4byte 0x030022c0 + .pool thumb_func_end sub_803547C thumb_func_start sub_8035518 @@ -110255,7 +107605,7 @@ sub_8035518: @ 8035518 lsrs r4, r0, 24 movs r5, 0x40 movs r3, 0 - ldr r0, _08035544 + ldr r0, =0x02022e10 ldr r0, [r0] ldr r2, [r0] cmp r3, r2 @@ -110274,7 +107624,7 @@ _0803552E: ldrb r0, [r1, 0x1] b _0803556A .align 2, 0 -_08035544: .4byte 0x02022e10 + .pool _08035548: adds r0, r5, 0x1 ldrb r5, [r1, 0x3] @@ -110307,7 +107657,7 @@ sub_8035570: @ 8035570 push {r4-r6,lr} adds r3, r0, 0 movs r2, 0 - ldr r0, _080355A0 + ldr r0, =0x02022e10 ldr r0, [r0] ldr r4, [r0] cmp r2, r4 @@ -110330,7 +107680,7 @@ _0803558A: movs r0, 0x1 b _080355AE .align 2, 0 -_080355A0: .4byte 0x02022e10 + .pool _080355A4: adds r1, 0x1C adds r2, 0x1 @@ -110349,7 +107699,7 @@ sub_80355B4: @ 80355B4 push {r4-r6,lr} adds r3, r0, 0 movs r2, 0 - ldr r0, _080355E4 + ldr r0, =0x02022e10 ldr r0, [r0] ldr r4, [r0] cmp r2, r4 @@ -110372,7 +107722,7 @@ _080355CE: movs r0, 0x1 b _080355F2 .align 2, 0 -_080355E4: .4byte 0x02022e10 + .pool _080355E8: adds r1, 0x1C adds r2, 0x1 @@ -110388,28 +107738,28 @@ _080355F2: thumb_func_start sub_80355F8 sub_80355F8: @ 80355F8 - ldr r2, _08035604 + ldr r2, =0x082ff1c8 lsls r0, 2 adds r1, r0 adds r1, r2 ldrb r0, [r1] bx lr .align 2, 0 -_08035604: .4byte 0x082ff1c8 + .pool thumb_func_end sub_80355F8 thumb_func_start sub_8035608 sub_8035608: @ 8035608 push {lr} bl reset_all_obj_data - ldr r0, _0803563C + ldr r0, =0x0831ac88 movs r1, 0 movs r2, 0 movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _08035640 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -110419,14 +107769,12 @@ sub_8035608: @ 8035608 movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r0, _08035644 + ldr r0, =sub_8035648 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0803563C: .4byte 0x0831ac88 -_08035640: .4byte 0x02020630 -_08035644: .4byte sub_8035648 + 1 + .pool thumb_func_end sub_8035608 thumb_func_start sub_8035648 @@ -110443,22 +107791,22 @@ trs_config: @ 8035658 push {r4,lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08035694 + ldr r1, =0x0831aa08 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r0, _08035698 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 11 ands r1, r0 cmp r1, 0 beq _080356A4 - ldr r0, _0803569C + ldr r0, =0x02024474 adds r0, 0x24 movs r1, 0x1 strb r1, [r0] - ldr r4, _080356A0 + ldr r4, =0x02023060 ldr r1, [r4] movs r0, 0x1 bl bg_set_tilemap @@ -110467,17 +107815,14 @@ trs_config: @ 8035658 bl bg_set_tilemap b _080356AA .align 2, 0 -_08035694: .4byte 0x0831aa08 -_08035698: .4byte 0x02022fec -_0803569C: .4byte 0x02024474 -_080356A0: .4byte 0x02023060 + .pool _080356A4: - ldr r0, _080356C8 + ldr r0, =0x02024474 adds r0, 0x24 strb r1, [r0] _080356AA: - ldr r1, _080356CC - ldr r0, _080356C8 + ldr r1, =0x0831aba0 + ldr r0, =0x02024474 adds r0, 0x24 ldrb r0, [r0] lsls r0, 2 @@ -110489,8 +107834,7 @@ _080356AA: pop {r0} bx r0 .align 2, 0 -_080356C8: .4byte 0x02024474 -_080356CC: .4byte 0x0831aba0 + .pool thumb_func_end trs_config thumb_func_start c2_berry_program_update_menu @@ -110510,13 +107854,13 @@ c2_berry_program_update_menu: @ 80356D0 movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r1, _08035708 + ldr r1, =0x0000b040 movs r0, 0 bl lcd_io_set pop {r0} bx r0 .align 2, 0 -_08035708: .4byte 0x0000b040 + .pool thumb_func_end c2_berry_program_update_menu thumb_func_start sub_803570C @@ -110530,11 +107874,11 @@ sub_803570C: @ 803570C movs r1, 0x22 movs r2, 0x10 bl sub_809882C - ldr r0, _08035760 + ldr r0, =0x08d85600 movs r1, 0x50 movs r2, 0x20 bl decompress_palette - ldr r0, _08035764 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 @@ -110547,115 +107891,94 @@ sub_803570C: @ 803570C movs r1, 0x30 movs r2, 0x70 bl copy_textbox_border_tile_patterns_to_vram - ldr r0, _08035768 + ldr r0, =0x02037714 adds r0, 0xEC movs r1, 0 strh r1, [r0] - ldr r1, _0803576C + ldr r1, =0x02037c00 movs r2, 0x1 bl CpuSet _0803575A: pop {r0} bx r0 .align 2, 0 -_08035760: .4byte 0x08d85600 -_08035764: .4byte 0x02022fec -_08035768: .4byte 0x02037714 -_0803576C: .4byte 0x02037c00 + .pool thumb_func_end sub_803570C thumb_func_start sub_8035770 sub_8035770: @ 8035770 push {r4,r5,lr} - ldr r0, _08035794 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _08035798 + ldr r0, =0x023f0902 ands r0, r1 cmp r0, 0 beq _080357B0 - ldr r0, _0803579C - ldr r1, _080357A0 + ldr r0, =0x08d7c440 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _080357A4 - ldr r1, _080357A8 + ldr r0, =0x08d7ca28 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _080357AC + ldr r0, =0x08d7c9ec b _08035A52 .align 2, 0 -_08035794: .4byte 0x02022fec -_08035798: .4byte 0x023f0902 -_0803579C: .4byte 0x08d7c440 -_080357A0: .4byte 0x06008000 -_080357A4: .4byte 0x08d7ca28 -_080357A8: .4byte 0x0600d000 -_080357AC: .4byte 0x08d7c9ec + .pool _080357B0: movs r0, 0x80 lsls r0, 21 ands r0, r1 cmp r0, 0 beq _080357E4 - ldr r0, _080357D0 - ldr r1, _080357D4 + ldr r0, =0x08d7bb14 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _080357D8 - ldr r1, _080357DC + ldr r0, =0x08d7c154 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _080357E0 + ldr r0, =0x08d7df30 b _08035A52 .align 2, 0 -_080357D0: .4byte 0x08d7bb14 -_080357D4: .4byte 0x06008000 -_080357D8: .4byte 0x08d7c154 -_080357DC: .4byte 0x0600d000 -_080357E0: .4byte 0x08d7df30 + .pool _080357E4: movs r0, 0x80 lsls r0, 22 ands r0, r1 cmp r0, 0 beq _08035818 - ldr r0, _08035804 - ldr r1, _08035808 + ldr r0, =0x08d7a108 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _0803580C - ldr r1, _08035810 + ldr r0, =0x08d7a720 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _08035814 + ldr r0, =0x08d7def4 b _08035A52 .align 2, 0 -_08035804: .4byte 0x08d7a108 -_08035808: .4byte 0x06008000 -_0803580C: .4byte 0x08d7a720 -_08035810: .4byte 0x0600d000 -_08035814: .4byte 0x08d7def4 + .pool _08035818: movs r0, 0x80 lsls r0, 23 ands r0, r1 cmp r0, 0 beq _0803584C - ldr r0, _08035838 - ldr r1, _0803583C + ldr r0, =0x08d7d590 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _08035840 - ldr r1, _08035844 + ldr r0, =0x08d7dc04 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _08035848 + ldr r0, =0x08d7e234 b _08035A52 .align 2, 0 -_08035838: .4byte 0x08d7d590 -_0803583C: .4byte 0x06008000 -_08035840: .4byte 0x08d7dc04 -_08035844: .4byte 0x0600d000 -_08035848: .4byte 0x08d7e234 + .pool _0803584C: movs r0, 0x8 ands r1, r0 cmp r1, 0 beq _080358C4 - ldr r2, _0803587C - ldr r0, _08035880 + ldr r2, =0x08310030 + ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -110664,39 +107987,29 @@ _0803584C: ldrb r0, [r0, 0x1] cmp r0, 0x20 bne _08035898 - ldr r0, _08035884 - ldr r1, _08035888 + ldr r0, =0x08d7c440 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _0803588C - ldr r1, _08035890 + ldr r0, =0x08d7ca28 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _08035894 + ldr r0, =0x08d7dfc4 b _08035A52 .align 2, 0 -_0803587C: .4byte 0x08310030 -_08035880: .4byte 0x02038bca -_08035884: .4byte 0x08d7c440 -_08035888: .4byte 0x06008000 -_0803588C: .4byte 0x08d7ca28 -_08035890: .4byte 0x0600d000 -_08035894: .4byte 0x08d7dfc4 + .pool _08035898: cmp r0, 0x26 bne _080358C4 - ldr r0, _080358B0 - ldr r1, _080358B4 + ldr r0, =0x08d7ccd8 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _080358B8 - ldr r1, _080358BC + ldr r0, =0x08d7d2e0 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _080358C0 + ldr r0, =0x08d7e1f8 b _08035A52 .align 2, 0 -_080358B0: .4byte 0x08d7ccd8 -_080358B4: .4byte 0x06008000 -_080358B8: .4byte 0x08d7d2e0 -_080358BC: .4byte 0x0600d000 -_080358C0: .4byte 0x08d7e1f8 + .pool _080358C4: bl sav1_map_get_battletype lsls r0, 24 @@ -110704,12 +108017,12 @@ _080358C4: cmp r0, 0x8 bhi _08035904 lsls r0, 2 - ldr r1, _080358DC + ldr r1, =_080358E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080358DC: .4byte _080358E0 + .pool .align 2, 0 _080358E0: .4byte _08035904 @@ -110722,15 +108035,15 @@ _080358E0: .4byte _08035A40 .4byte _08035A70 _08035904: - ldr r4, _08035940 - ldr r5, _08035944 + ldr r4, =0x0831aba8 + ldr r5, =0x02022ff0 ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 lsls r0, 2 adds r0, r4 ldr r0, [r0] - ldr r1, _08035948 + ldr r1, =0x06008000 bl call_LZZUnCompVram ldrb r1, [r5] lsls r0, r1, 2 @@ -110739,7 +108052,7 @@ _08035904: adds r1, r4, 0x4 adds r0, r1 ldr r0, [r0] - ldr r1, _0803594C + ldr r1, =0x0600d000 bl call_LZZUnCompVram ldrb r1, [r5] lsls r0, r1, 2 @@ -110750,127 +108063,96 @@ _08035904: ldr r0, [r0] b _08035A52 .align 2, 0 -_08035940: .4byte 0x0831aba8 -_08035944: .4byte 0x02022ff0 -_08035948: .4byte 0x06008000 -_0803594C: .4byte 0x0600d000 + .pool _08035950: - ldr r0, _08035964 - ldr r1, _08035968 + ldr r0, =0x08d7c440 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _0803596C - ldr r1, _08035970 + ldr r0, =0x08d7ca28 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _08035974 + ldr r0, =0x08d7df88 b _08035A52 .align 2, 0 -_08035964: .4byte 0x08d7c440 -_08035968: .4byte 0x06008000 -_0803596C: .4byte 0x08d7ca28 -_08035970: .4byte 0x0600d000 -_08035974: .4byte 0x08d7df88 + .pool _08035978: - ldr r0, _0803598C - ldr r1, _08035990 + ldr r0, =0x08d7ccd8 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _08035994 - ldr r1, _08035998 + ldr r0, =0x08d7d2e0 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _0803599C + ldr r0, =0x08d7e060 b _08035A52 .align 2, 0 -_0803598C: .4byte 0x08d7ccd8 -_08035990: .4byte 0x06008000 -_08035994: .4byte 0x08d7d2e0 -_08035998: .4byte 0x0600d000 -_0803599C: .4byte 0x08d7e060 + .pool _080359A0: - ldr r0, _080359B4 - ldr r1, _080359B8 + ldr r0, =0x08d7ccd8 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _080359BC - ldr r1, _080359C0 + ldr r0, =0x08d7d2e0 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _080359C4 + ldr r0, =0x08d7e000 b _08035A52 .align 2, 0 -_080359B4: .4byte 0x08d7ccd8 -_080359B8: .4byte 0x06008000 -_080359BC: .4byte 0x08d7d2e0 -_080359C0: .4byte 0x0600d000 -_080359C4: .4byte 0x08d7e000 + .pool _080359C8: - ldr r0, _080359DC - ldr r1, _080359E0 + ldr r0, =0x08d7ccd8 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _080359E4 - ldr r1, _080359E8 + ldr r0, =0x08d7d2e0 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _080359EC + ldr r0, =0x08d7e0cc b _08035A52 .align 2, 0 -_080359DC: .4byte 0x08d7ccd8 -_080359E0: .4byte 0x06008000 -_080359E4: .4byte 0x08d7d2e0 -_080359E8: .4byte 0x0600d000 -_080359EC: .4byte 0x08d7e0cc + .pool _080359F0: - ldr r0, _08035A04 - ldr r1, _08035A08 + ldr r0, =0x08d7ccd8 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _08035A0C - ldr r1, _08035A10 + ldr r0, =0x08d7d2e0 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _08035A14 + ldr r0, =0x08d7e11c b _08035A52 .align 2, 0 -_08035A04: .4byte 0x08d7ccd8 -_08035A08: .4byte 0x06008000 -_08035A0C: .4byte 0x08d7d2e0 -_08035A10: .4byte 0x0600d000 -_08035A14: .4byte 0x08d7e11c + .pool _08035A18: - ldr r0, _08035A2C - ldr r1, _08035A30 + ldr r0, =0x08d7ccd8 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _08035A34 - ldr r1, _08035A38 + ldr r0, =0x08d7d2e0 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _08035A3C + ldr r0, =0x08d7e164 b _08035A52 .align 2, 0 -_08035A2C: .4byte 0x08d7ccd8 -_08035A30: .4byte 0x06008000 -_08035A34: .4byte 0x08d7d2e0 -_08035A38: .4byte 0x0600d000 -_08035A3C: .4byte 0x08d7e164 + .pool _08035A40: - ldr r0, _08035A5C - ldr r1, _08035A60 + ldr r0, =0x08d7ccd8 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _08035A64 - ldr r1, _08035A68 + ldr r0, =0x08d7d2e0 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _08035A6C + ldr r0, =0x08d7e1a8 _08035A52: movs r1, 0x20 movs r2, 0x60 bl decompress_palette b _08035A8A .align 2, 0 -_08035A5C: .4byte 0x08d7ccd8 -_08035A60: .4byte 0x06008000 -_08035A64: .4byte 0x08d7d2e0 -_08035A68: .4byte 0x0600d000 -_08035A6C: .4byte 0x08d7e1a8 + .pool _08035A70: - ldr r0, _08035A90 - ldr r1, _08035A94 + ldr r0, =0x08d7c440 + ldr r1, =0x06008000 bl call_LZZUnCompVram - ldr r0, _08035A98 - ldr r1, _08035A9C + ldr r0, =0x08d7ca28 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r0, _08035AA0 + ldr r0, =0x08d7c9ec movs r1, 0x20 movs r2, 0x60 bl decompress_palette @@ -110879,28 +108161,24 @@ _08035A8A: pop {r0} bx r0 .align 2, 0 -_08035A90: .4byte 0x08d7c440 -_08035A94: .4byte 0x06008000 -_08035A98: .4byte 0x08d7ca28 -_08035A9C: .4byte 0x0600d000 -_08035AA0: .4byte 0x08d7c9ec + .pool thumb_func_end sub_8035770 thumb_func_start sub_8035AA4 sub_8035AA4: @ 8035AA4 push {lr} - ldr r0, _08035AD8 + ldr r0, =0x08c00000 movs r1, 0xC0 lsls r1, 19 bl call_LZZUnCompVram - ldr r1, _08035ADC + ldr r1, =0x08c00524 movs r0, 0 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _08035AE0 + ldr r0, =0x08c004e0 movs r1, 0 movs r2, 0x40 bl decompress_palette @@ -110909,9 +108187,7 @@ sub_8035AA4: @ 8035AA4 pop {r0} bx r0 .align 2, 0 -_08035AD8: .4byte 0x08c00000 -_08035ADC: .4byte 0x08c00524 -_08035AE0: .4byte 0x08c004e0 + .pool thumb_func_end sub_8035AA4 thumb_func_start sub_8035AE4 @@ -110937,13 +108213,13 @@ sub_8035AE4: @ 8035AE4 lsrs r4, 24 mov r9, r4 movs r4, 0 - ldr r0, _08035B3C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _08035BCC - ldr r0, _08035B40 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -110960,8 +108236,7 @@ sub_8035AE4: @ 8035AE4 beq _08035B4E b _08035B88 .align 2, 0 -_08035B3C: .4byte 0x02022fec -_08035B40: .4byte 0x03005e00 + .pool _08035B44: cmp r5, 0x2 beq _08035B52 @@ -111010,7 +108285,7 @@ _08035B80: _08035B88: movs r2, 0 movs r6, 0x3 - ldr r0, _08035BC8 + ldr r0, =0x00006001 adds r5, r0, 0 add r3, sp, 0xC _08035B92: @@ -111040,14 +108315,14 @@ _08035B92: bl gpu_copy_wram_bg_tilemap_to_vram b _08035C36 .align 2, 0 -_08035BC8: .4byte 0x00006001 + .pool _08035BCC: - ldr r0, _08035BE4 + ldr r0, =0x02024474 adds r0, 0x25 ldrb r0, [r0] cmp r5, r0 bne _08035BEC - ldr r1, _08035BE8 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -111055,10 +108330,9 @@ _08035BCC: ldrh r4, [r0, 0xE] b _08035BF8 .align 2, 0 -_08035BE4: .4byte 0x02024474 -_08035BE8: .4byte 0x03005e00 + .pool _08035BEC: - ldr r1, _08035C44 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -111067,7 +108341,7 @@ _08035BEC: _08035BF8: movs r2, 0 movs r6, 0x3 - ldr r0, _08035C48 + ldr r0, =0x00006001 adds r5, r0, 0 add r3, sp, 0xC _08035C02: @@ -111104,26 +108378,24 @@ _08035C36: pop {r0} bx r0 .align 2, 0 -_08035C44: .4byte 0x03005e00 -_08035C48: .4byte 0x00006001 + .pool thumb_func_end sub_8035AE4 thumb_func_start sub_8035C4C sub_8035C4C: @ 8035C4C push {lr} - ldr r0, _08035C60 + ldr r0, =0x0202433a ldrb r2, [r0] cmp r2, 0x3 bne _08035C68 - ldr r0, _08035C64 + ldr r0, =0x085ccbad movs r1, 0x15 bl battle_show_message_maybe b _08035D68 .align 2, 0 -_08035C60: .4byte 0x0202433a -_08035C64: .4byte 0x085ccbad + .pool _08035C68: - ldr r0, _08035C98 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -111131,8 +108403,8 @@ _08035C68: beq _08035CE2 cmp r2, 0x1 bne _08035CAE - ldr r2, _08035C9C - ldr r0, _08035CA0 + ldr r2, =0x020229e8 + ldr r0, =0x02024474 adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 @@ -111148,9 +108420,7 @@ _08035C68: beq _08035D36 b _08035D68 .align 2, 0 -_08035C98: .4byte 0x02022fec -_08035C9C: .4byte 0x020229e8 -_08035CA0: .4byte 0x02024474 + .pool _08035CA4: cmp r0, 0x2 beq _08035D36 @@ -111158,8 +108428,8 @@ _08035CA4: bne _08035D68 b _08035CFC _08035CAE: - ldr r2, _08035CD0 - ldr r0, _08035CD4 + ldr r2, =0x020229e8 + ldr r0, =0x02024474 adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 @@ -111175,8 +108445,7 @@ _08035CAE: beq _08035CFC b _08035D68 .align 2, 0 -_08035CD0: .4byte 0x020229e8 -_08035CD4: .4byte 0x02024474 + .pool _08035CD8: cmp r0, 0x2 beq _08035CFC @@ -111186,8 +108455,8 @@ _08035CD8: _08035CE2: cmp r2, 0x1 bne _08035D20 - ldr r2, _08035D10 - ldr r0, _08035D14 + ldr r2, =0x020229e8 + ldr r0, =0x02024474 adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 @@ -111198,21 +108467,18 @@ _08035CE2: cmp r0, 0 beq _08035D36 _08035CFC: - ldr r0, _08035D18 + ldr r0, =0x085ccb9e movs r1, 0x17 bl battle_show_message_maybe - ldr r0, _08035D1C + ldr r0, =0x085ccba5 movs r1, 0x16 bl battle_show_message_maybe b _08035D68 .align 2, 0 -_08035D10: .4byte 0x020229e8 -_08035D14: .4byte 0x02024474 -_08035D18: .4byte 0x085ccb9e -_08035D1C: .4byte 0x085ccba5 + .pool _08035D20: - ldr r2, _08035D48 - ldr r0, _08035D4C + ldr r2, =0x020229e8 + ldr r0, =0x02024474 adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 @@ -111223,31 +108489,27 @@ _08035D20: cmp r0, 0 beq _08035D58 _08035D36: - ldr r0, _08035D50 + ldr r0, =0x085ccb9e movs r1, 0x16 bl battle_show_message_maybe - ldr r0, _08035D54 + ldr r0, =0x085ccba5 movs r1, 0x17 bl battle_show_message_maybe b _08035D68 .align 2, 0 -_08035D48: .4byte 0x020229e8 -_08035D4C: .4byte 0x02024474 -_08035D50: .4byte 0x085ccb9e -_08035D54: .4byte 0x085ccba5 + .pool _08035D58: - ldr r0, _08035D6C + ldr r0, =0x085ccb9e movs r1, 0x17 bl battle_show_message_maybe - ldr r0, _08035D70 + ldr r0, =0x085ccba5 movs r1, 0x16 bl battle_show_message_maybe _08035D68: pop {r0} bx r0 .align 2, 0 -_08035D6C: .4byte 0x085ccb9e -_08035D70: .4byte 0x085ccba5 + .pool thumb_func_end sub_8035C4C thumb_func_start task00_0800F6FC @@ -111258,7 +108520,7 @@ task00_0800F6FC: @ 8035D74 sub sp, 0x4 lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _08035DA0 + ldr r1, =0x03005e00 lsls r0, r7, 2 mov r8, r0 adds r0, r7 @@ -111276,7 +108538,7 @@ _08035D96: beq _08035DAC b _08036138 .align 2, 0 -_08035DA0: .4byte 0x03005e00 + .pool _08035DA4: cmp r0, 0x2 bne _08035DAA @@ -111284,7 +108546,7 @@ _08035DA4: _08035DAA: b _08036138 _08035DAC: - ldr r0, _08035DD4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -111293,7 +108555,7 @@ _08035DAC: movs r5, 0 movs r6, 0x3 _08035DBC: - ldr r0, _08035DD8 + ldr r0, =0x020229f0 adds r1, r5, r0 subs r0, 0x8 adds r4, r5, r0 @@ -111306,8 +108568,7 @@ _08035DBC: beq _08035DE6 b _08035E3A .align 2, 0 -_08035DD4: .4byte 0x02022fec -_08035DD8: .4byte 0x020229f0 + .pool _08035DDC: cmp r0, 0x2 beq _08035E08 @@ -111363,14 +108624,14 @@ _08035E3A: bge _08035DBC b _08035EA6 _08035E44: - ldr r0, _08035EB8 + ldr r0, =0x02024474 adds r0, 0x25 ldrb r5, [r0] movs r0, 0x1 adds r6, r5, 0 eors r6, r0 adds r1, r6, 0 - ldr r4, _08035EBC + ldr r4, =0x020229e8 lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -111410,7 +108671,7 @@ _08035E66: movs r3, 0x2 bl sub_8035AE4 _08035EA6: - ldr r0, _08035EC0 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -111420,33 +108681,31 @@ _08035EA6: strh r0, [r1, 0x8] b _08036138 .align 2, 0 -_08035EB8: .4byte 0x02024474 -_08035EBC: .4byte 0x020229e8 -_08035EC0: .4byte 0x03005e00 + .pool _08035EC4: - ldr r0, _08035F40 + ldr r0, =0x00002710 bl gpu_pal_alloc_new lsls r0, 24 - ldr r2, _08035F44 + ldr r2, =0x02037714 lsrs r0, 19 - ldr r3, _08035F48 + ldr r3, =0x0000021e adds r0, r3 adds r2, r0, r2 - ldr r1, _08035F4C + ldr r1, =0x02037b14 adds r0, r1 - ldr r1, _08035F50 + ldr r1, =0x00007fff strh r1, [r0] strh r1, [r2] - ldr r0, _08035F54 + ldr r0, =0x0831a9d0 movs r1, 0x6F movs r2, 0x50 movs r3, 0 bl obj_add_from_template_forward_search - ldr r4, _08035F58 + ldr r4, =0x0202449c ldr r1, [r4] adds r1, 0x7D strb r0, [r1] - ldr r0, _08035F5C + ldr r0, =0x0831a9e8 movs r1, 0x81 movs r2, 0x50 movs r3, 0 @@ -111454,7 +108713,7 @@ _08035EC4: ldr r1, [r4] adds r1, 0x7E strb r0, [r1] - ldr r3, _08035F60 + ldr r3, =0x02020630 ldr r0, [r4] adds r0, 0x7D ldrb r1, [r0] @@ -111483,21 +108742,13 @@ _08035EC4: strh r0, [r5, 0x8] b _08036138 .align 2, 0 -_08035F40: .4byte 0x00002710 -_08035F44: .4byte 0x02037714 -_08035F48: .4byte 0x0000021e -_08035F4C: .4byte 0x02037b14 -_08035F50: .4byte 0x00007fff -_08035F54: .4byte 0x0831a9d0 -_08035F58: .4byte 0x0202449c -_08035F5C: .4byte 0x0831a9e8 -_08035F60: .4byte 0x02020630 + .pool _08035F64: movs r1, 0x12 ldrsh r0, [r5, r1] cmp r0, 0 beq _08035FCC - ldr r4, _08035FB8 + ldr r4, =0x02022e18 ldrh r0, [r5, 0xA] bl sine2 lsls r0, 16 @@ -111512,7 +108763,7 @@ _08035F7E: adds r0, r2, 0 subs r0, r1 strh r0, [r4] - ldr r4, _08035FBC + ldr r4, =0x02022e1c ldrh r0, [r5, 0xC] bl sine2 lsls r0, 16 @@ -111527,21 +108778,17 @@ _08035F9C: adds r0, r3, 0 subs r0, r1 strh r0, [r4] - ldr r0, _08035FC0 - ldr r2, _08035FC4 + ldr r0, =0x02022e1a + ldr r2, =0x0000ffdc adds r1, r2, 0 strh r1, [r0] - ldr r0, _08035FC8 + ldr r0, =0x02022e1e strh r1, [r0] b _08036038 .align 2, 0 -_08035FB8: .4byte 0x02022e18 -_08035FBC: .4byte 0x02022e1c -_08035FC0: .4byte 0x02022e1a -_08035FC4: .4byte 0x0000ffdc -_08035FC8: .4byte 0x02022e1e + .pool _08035FCC: - ldr r4, _0803605C + ldr r4, =0x02022e18 ldrh r0, [r5, 0xA] bl sine2 lsls r0, 16 @@ -111556,7 +108803,7 @@ _08035FDE: adds r0, r3, 0 subs r0, r1 strh r0, [r4] - ldr r4, _08036060 + ldr r4, =0x02022e1a ldrh r0, [r5, 0xA] bl cosine2 lsls r0, 16 @@ -111568,7 +108815,7 @@ _08035FFC: asrs r0, 5 subs r0, 0xA4 strh r0, [r4] - ldr r4, _08036064 + ldr r4, =0x02022e1c ldrh r0, [r5, 0xC] bl sine2 lsls r0, 16 @@ -111583,7 +108830,7 @@ _08036014: adds r0, r2, 0 subs r0, r1 strh r0, [r4] - ldr r4, _08036068 + ldr r4, =0x02022e1e ldrh r0, [r5, 0xC] bl cosine2 lsls r0, 16 @@ -111596,7 +108843,7 @@ _08036032: subs r0, 0xA4 strh r0, [r4] _08036038: - ldr r1, _0803606C + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -111614,11 +108861,7 @@ _08036038: strh r0, [r1, 0xA] b _08036138 .align 2, 0 -_0803605C: .4byte 0x02022e18 -_08036060: .4byte 0x02022e1a -_08036064: .4byte 0x02022e1c -_08036068: .4byte 0x02022e1e -_0803606C: .4byte 0x03005e00 + .pool _08036070: movs r3, 0x12 ldrsh r0, [r1, r3] @@ -111630,8 +108873,8 @@ _0803607C: bl audio_play adds r0, r7, 0 bl remove_task - ldr r4, _08036144 - ldr r5, _08036148 + ldr r4, =0x02020630 + ldr r5, =0x0202449c ldr r0, [r5] adds r0, 0x7D ldrb r0, [r0] @@ -111669,10 +108912,10 @@ _0803607C: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x40 - ldr r7, _0803614C + ldr r7, =0x000003ff adds r0, r7, 0 ands r1, r0 - ldr r0, _08036150 + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] @@ -111726,28 +108969,25 @@ _08036138: pop {r0} bx r0 .align 2, 0 -_08036144: .4byte 0x02020630 -_08036148: .4byte 0x0202449c -_0803614C: .4byte 0x000003ff -_08036150: .4byte 0xfffffc00 + .pool thumb_func_end task00_0800F6FC thumb_func_start sub_8036154 sub_8036154: @ 8036154 push {r4,r5,lr} - ldr r0, _080361D8 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _08036208 - ldr r0, _080361DC - ldr r1, _080361E0 + ldr r0, =0x08d778f0 + ldr r1, =0x06004000 bl call_LZZUnCompVram - ldr r0, _080361E4 - ldr r1, _080361E8 + ldr r0, =0x08d77b0c + ldr r1, =0x06010000 bl call_LZZUnCompVram - ldr r0, _080361EC + ldr r0, =0x08d77ae4 movs r1, 0x60 movs r2, 0x20 bl decompress_palette @@ -111755,10 +108995,10 @@ sub_8036154: @ 8036154 movs r1, 0x3 movs r2, 0x1 bl gpu_bg_config_set_field - ldr r1, _080361F0 + ldr r1, =0x00005c04 movs r0, 0xA bl lcd_io_set - ldr r4, _080361F4 + ldr r4, =0x08d779d8 movs r0, 0x1 adds r1, r4, 0 movs r2, 0 @@ -111779,30 +109019,19 @@ sub_8036154: @ 8036154 movs r0, 0x4A movs r1, 0x36 bl lcd_io_set - ldr r0, _080361F8 - ldr r2, _080361FC + ldr r0, =0x02022e1a + ldr r2, =0x0000ff5c adds r1, r2, 0 strh r1, [r0] - ldr r0, _08036200 + ldr r0, =0x02022e1e strh r1, [r0] - ldr r0, _08036204 + ldr r0, =0x0831aa00 bl gpu_tile_obj_decompress_and_load3 b _080363AC .align 2, 0 -_080361D8: .4byte 0x02022fec -_080361DC: .4byte 0x08d778f0 -_080361E0: .4byte 0x06004000 -_080361E4: .4byte 0x08d77b0c -_080361E8: .4byte 0x06010000 -_080361EC: .4byte 0x08d77ae4 -_080361F0: .4byte 0x00005c04 -_080361F4: .4byte 0x08d779d8 -_080361F8: .4byte 0x02022e1a -_080361FC: .4byte 0x0000ff5c -_08036200: .4byte 0x02022e1e -_08036204: .4byte 0x0831aa00 + .pool _08036208: - ldr r0, _08036230 + ldr r0, =0x023f0902 ands r0, r1 cmp r0, 0 beq _0803628C @@ -111811,24 +109040,19 @@ _08036208: ands r1, r0 cmp r1, 0 beq _08036224 - ldr r0, _08036234 + ldr r0, =0x02038bce ldrh r1, [r0] - ldr r0, _08036238 + ldr r0, =0x00000c03 cmp r1, r0 bne _08036248 _08036224: - ldr r0, _0803623C - ldr r1, _08036240 + ldr r0, =0x08d820d4 + ldr r1, =0x06004000 bl call_LZZUnCompVram - ldr r0, _08036244 + ldr r0, =0x08d824e4 b _08036382 .align 2, 0 -_08036230: .4byte 0x023f0902 -_08036234: .4byte 0x02038bce -_08036238: .4byte 0x00000c03 -_0803623C: .4byte 0x08d820d4 -_08036240: .4byte 0x06004000 -_08036244: .4byte 0x08d824e4 + .pool _08036248: movs r0, 0x1 movs r1, 0x1 @@ -111838,12 +109062,12 @@ _08036248: movs r1, 0x1 movs r2, 0x2 bl gpu_bg_config_set_field - ldr r1, _08036284 + ldr r1, =0x08d857a8 movs r0, 0x1 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r1, _08036288 + ldr r1, =0x08d85a1c movs r0, 0x2 movs r2, 0 movs r3, 0 @@ -111854,60 +109078,53 @@ _08036248: bl gpu_copy_wram_bg_tilemap_to_vram b _080363AC .align 2, 0 -_08036284: .4byte 0x08d857a8 -_08036288: .4byte 0x08d85a1c + .pool _0803628C: movs r0, 0x80 lsls r0, 21 ands r0, r1 cmp r0, 0 beq _080362B0 - ldr r0, _080362A4 - ldr r1, _080362A8 + ldr r0, =0x08d81610 + ldr r1, =0x06004000 bl call_LZZUnCompVram - ldr r0, _080362AC + ldr r0, =0x08d81e2c b _08036382 .align 2, 0 -_080362A4: .4byte 0x08d81610 -_080362A8: .4byte 0x06004000 -_080362AC: .4byte 0x08d81e2c + .pool _080362B0: movs r0, 0x80 lsls r0, 22 ands r0, r1 cmp r0, 0 beq _080362D4 - ldr r0, _080362C8 - ldr r1, _080362CC + ldr r0, =0x08d7f9f8 + ldr r1, =0x06004000 bl call_LZZUnCompVram - ldr r0, _080362D0 + ldr r0, =0x08d7fec4 b _08036382 .align 2, 0 -_080362C8: .4byte 0x08d7f9f8 -_080362CC: .4byte 0x06004000 -_080362D0: .4byte 0x08d7fec4 + .pool _080362D4: movs r0, 0x80 lsls r0, 23 ands r0, r1 cmp r0, 0 beq _080362F8 - ldr r0, _080362EC - ldr r1, _080362F0 + ldr r0, =0x08d82608 + ldr r1, =0x06004000 bl call_LZZUnCompVram - ldr r0, _080362F4 + ldr r0, =0x08d82c70 b _08036382 .align 2, 0 -_080362EC: .4byte 0x08d82608 -_080362F0: .4byte 0x06004000 -_080362F4: .4byte 0x08d82c70 + .pool _080362F8: movs r0, 0x8 ands r1, r0 cmp r1, 0 beq _08036350 - ldr r2, _08036320 - ldr r0, _08036324 + ldr r2, =0x08310030 + ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -111916,36 +109133,30 @@ _080362F8: ldrb r0, [r0, 0x1] cmp r0, 0x20 bne _08036334 - ldr r0, _08036328 - ldr r1, _0803632C + ldr r0, =0x08d820d4 + ldr r1, =0x06004000 bl call_LZZUnCompVram - ldr r0, _08036330 + ldr r0, =0x08d824e4 b _08036382 .align 2, 0 -_08036320: .4byte 0x08310030 -_08036324: .4byte 0x02038bca -_08036328: .4byte 0x08d820d4 -_0803632C: .4byte 0x06004000 -_08036330: .4byte 0x08d824e4 + .pool _08036334: cmp r0, 0x26 bne _08036350 - ldr r0, _08036344 - ldr r1, _08036348 + ldr r0, =0x08d820d4 + ldr r1, =0x06004000 bl call_LZZUnCompVram - ldr r0, _0803634C + ldr r0, =0x08d824e4 b _08036382 .align 2, 0 -_08036344: .4byte 0x08d820d4 -_08036348: .4byte 0x06004000 -_0803634C: .4byte 0x08d824e4 + .pool _08036350: bl sav1_map_get_battletype lsls r0, 24 cmp r0, 0 bne _0803639C - ldr r4, _0803638C - ldr r5, _08036390 + ldr r4, =0x0831aba8 + ldr r5, =0x02022ff0 ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -111954,7 +109165,7 @@ _08036350: adds r1, 0x8 adds r0, r1 ldr r0, [r0] - ldr r1, _08036394 + ldr r1, =0x06004000 bl call_LZZUnCompVram ldrb r1, [r5] lsls r0, r1, 2 @@ -111964,30 +109175,24 @@ _08036350: adds r0, r4 ldr r0, [r0] _08036382: - ldr r1, _08036398 + ldr r1, =0x0600e000 bl call_LZZUnCompVram b _080363AC .align 2, 0 -_0803638C: .4byte 0x0831aba8 -_08036390: .4byte 0x02022ff0 -_08036394: .4byte 0x06004000 -_08036398: .4byte 0x0600e000 + .pool _0803639C: - ldr r0, _080363B4 - ldr r1, _080363B8 + ldr r0, =0x08d820d4 + ldr r1, =0x06004000 bl call_LZZUnCompVram - ldr r0, _080363BC - ldr r1, _080363C0 + ldr r0, =0x08d824e4 + ldr r1, =0x0600e000 bl call_LZZUnCompVram _080363AC: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080363B4: .4byte 0x08d820d4 -_080363B8: .4byte 0x06004000 -_080363BC: .4byte 0x08d824e4 -_080363C0: .4byte 0x0600e000 + .pool thumb_func_end sub_8036154 thumb_func_start sub_80363C4 @@ -112001,12 +109206,12 @@ sub_80363C4: @ 80363C4 b _08036756 _080363D2: lsls r0, 2 - ldr r1, _080363DC + ldr r1, =_080363E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080363DC: .4byte _080363E0 + .pool .align 2, 0 _080363E0: .4byte _080363FC @@ -112017,15 +109222,15 @@ _080363E0: .4byte _08036638 .4byte _08036750 _080363FC: - ldr r0, _08036408 + ldr r0, =0x08c00000 movs r1, 0xC0 lsls r1, 19 bl call_LZZUnCompVram b _08036758 .align 2, 0 -_08036408: .4byte 0x08c00000 + .pool _0803640C: - ldr r1, _08036420 + ldr r1, =0x08c00524 movs r0, 0 movs r2, 0 movs r3, 0 @@ -112034,19 +109239,19 @@ _0803640C: bl gpu_copy_wram_bg_tilemap_to_vram b _08036758 .align 2, 0 -_08036420: .4byte 0x08c00524 + .pool _08036424: - ldr r0, _08036430 + ldr r0, =0x08c004e0 movs r1, 0 movs r2, 0x40 bl decompress_palette b _08036758 .align 2, 0 -_08036430: .4byte 0x08c004e0 + .pool _08036434: - ldr r0, _08036450 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _08036454 + ldr r0, =0x023f0902 ands r0, r1 cmp r0, 0 bne _08036518 @@ -112055,19 +109260,17 @@ _08036434: ands r0, r1 cmp r0, 0 beq _0803645C - ldr r0, _08036458 + ldr r0, =0x08d7bb14 b _0803651A .align 2, 0 -_08036450: .4byte 0x02022fec -_08036454: .4byte 0x023f0902 -_08036458: .4byte 0x08d7bb14 + .pool _0803645C: movs r0, 0x8 ands r1, r0 cmp r1, 0 beq _0803648C - ldr r2, _08036480 - ldr r0, _08036484 + ldr r2, =0x08310030 + ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -112078,12 +109281,10 @@ _0803645C: beq _08036518 cmp r0, 0x26 bne _0803648C - ldr r0, _08036488 + ldr r0, =0x08d7ccd8 b _0803651A .align 2, 0 -_08036480: .4byte 0x08310030 -_08036484: .4byte 0x02038bca -_08036488: .4byte 0x08d7ccd8 + .pool _0803648C: bl sav1_map_get_battletype lsls r0, 24 @@ -112091,12 +109292,12 @@ _0803648C: cmp r0, 0x8 bhi _080364CC lsls r0, 2 - ldr r1, _080364A4 + ldr r1, =_080364A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080364A4: .4byte _080364A8 + .pool .align 2, 0 _080364A8: .4byte _080364CC @@ -112109,8 +109310,8 @@ _080364A8: .4byte _08036510 .4byte _08036518 _080364CC: - ldr r2, _080364E0 - ldr r0, _080364E4 + ldr r2, =0x0831aba8 + ldr r0, =0x02022ff0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -112119,51 +109320,49 @@ _080364CC: ldr r0, [r0] b _0803651A .align 2, 0 -_080364E0: .4byte 0x0831aba8 -_080364E4: .4byte 0x02022ff0 + .pool _080364E8: - ldr r0, _080364EC + ldr r0, =0x08d7ccd8 b _0803651A .align 2, 0 -_080364EC: .4byte 0x08d7ccd8 + .pool _080364F0: - ldr r0, _080364F4 + ldr r0, =0x08d7ccd8 b _0803651A .align 2, 0 -_080364F4: .4byte 0x08d7ccd8 + .pool _080364F8: - ldr r0, _080364FC + ldr r0, =0x08d7ccd8 b _0803651A .align 2, 0 -_080364FC: .4byte 0x08d7ccd8 + .pool _08036500: - ldr r0, _08036504 + ldr r0, =0x08d7ccd8 b _0803651A .align 2, 0 -_08036504: .4byte 0x08d7ccd8 + .pool _08036508: - ldr r0, _0803650C + ldr r0, =0x08d7ccd8 b _0803651A .align 2, 0 -_0803650C: .4byte 0x08d7ccd8 + .pool _08036510: - ldr r0, _08036514 + ldr r0, =0x08d7ccd8 b _0803651A .align 2, 0 -_08036514: .4byte 0x08d7ccd8 + .pool _08036518: - ldr r0, _08036524 + ldr r0, =0x08d7c440 _0803651A: - ldr r1, _08036528 + ldr r1, =0x06008000 bl call_LZZUnCompVram b _08036758 .align 2, 0 -_08036524: .4byte 0x08d7c440 -_08036528: .4byte 0x06008000 + .pool _0803652C: - ldr r0, _08036550 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _08036554 + ldr r0, =0x023f0902 ands r0, r1 cmp r0, 0 beq _0803653A @@ -112174,29 +109373,26 @@ _0803653A: ands r0, r1 cmp r0, 0 beq _08036568 - ldr r0, _08036558 + ldr r0, =0x082e9530 ldrb r0, [r0] cmp r0, 0x2 bne _08036560 - ldr r0, _0803655C + ldr r0, =0x08d7c154 b _08036626 .align 2, 0 -_08036550: .4byte 0x02022fec -_08036554: .4byte 0x023f0902 -_08036558: .4byte 0x082e9530 -_0803655C: .4byte 0x08d7c154 + .pool _08036560: - ldr r0, _08036564 + ldr r0, =0x08d7a720 b _08036626 .align 2, 0 -_08036564: .4byte 0x08d7a720 + .pool _08036568: movs r0, 0x8 ands r1, r0 cmp r1, 0 beq _08036598 - ldr r2, _0803658C - ldr r0, _08036590 + ldr r2, =0x08310030 + ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -112207,12 +109403,10 @@ _08036568: beq _08036624 cmp r0, 0x26 bne _08036598 - ldr r0, _08036594 + ldr r0, =0x08d7d2e0 b _08036626 .align 2, 0 -_0803658C: .4byte 0x08310030 -_08036590: .4byte 0x02038bca -_08036594: .4byte 0x08d7d2e0 + .pool _08036598: bl sav1_map_get_battletype lsls r0, 24 @@ -112220,12 +109414,12 @@ _08036598: cmp r0, 0x8 bhi _080365D8 lsls r0, 2 - ldr r1, _080365B0 + ldr r1, =_080365B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080365B0: .4byte _080365B4 + .pool .align 2, 0 _080365B4: .4byte _080365D8 @@ -112238,8 +109432,8 @@ _080365B4: .4byte _0803661C .4byte _08036624 _080365D8: - ldr r2, _080365EC - ldr r0, _080365F0 + ldr r2, =0x0831aba8 + ldr r0, =0x02022ff0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -112249,51 +109443,49 @@ _080365D8: ldr r0, [r0] b _08036626 .align 2, 0 -_080365EC: .4byte 0x0831aba8 -_080365F0: .4byte 0x02022ff0 + .pool _080365F4: - ldr r0, _080365F8 + ldr r0, =0x08d7d2e0 b _08036626 .align 2, 0 -_080365F8: .4byte 0x08d7d2e0 + .pool _080365FC: - ldr r0, _08036600 + ldr r0, =0x08d7d2e0 b _08036626 .align 2, 0 -_08036600: .4byte 0x08d7d2e0 + .pool _08036604: - ldr r0, _08036608 + ldr r0, =0x08d7d2e0 b _08036626 .align 2, 0 -_08036608: .4byte 0x08d7d2e0 + .pool _0803660C: - ldr r0, _08036610 + ldr r0, =0x08d7d2e0 b _08036626 .align 2, 0 -_08036610: .4byte 0x08d7d2e0 + .pool _08036614: - ldr r0, _08036618 + ldr r0, =0x08d7d2e0 b _08036626 .align 2, 0 -_08036618: .4byte 0x08d7d2e0 + .pool _0803661C: - ldr r0, _08036620 + ldr r0, =0x08d7d2e0 b _08036626 .align 2, 0 -_08036620: .4byte 0x08d7d2e0 + .pool _08036624: - ldr r0, _08036630 + ldr r0, =0x08d7ca28 _08036626: - ldr r1, _08036634 + ldr r1, =0x0600d000 bl call_LZZUnCompVram b _08036758 .align 2, 0 -_08036630: .4byte 0x08d7ca28 -_08036634: .4byte 0x0600d000 + .pool _08036638: - ldr r0, _0803665C + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _08036660 + ldr r0, =0x023f0902 ands r0, r1 cmp r0, 0 beq _08036646 @@ -112304,29 +109496,26 @@ _08036646: ands r0, r1 cmp r0, 0 beq _08036674 - ldr r0, _08036664 + ldr r0, =0x082e9530 ldrb r0, [r0] cmp r0, 0x2 bne _0803666C - ldr r0, _08036668 + ldr r0, =0x08d7df30 b _08036742 .align 2, 0 -_0803665C: .4byte 0x02022fec -_08036660: .4byte 0x023f0902 -_08036664: .4byte 0x082e9530 -_08036668: .4byte 0x08d7df30 + .pool _0803666C: - ldr r0, _08036670 + ldr r0, =0x08d7def4 b _08036742 .align 2, 0 -_08036670: .4byte 0x08d7def4 + .pool _08036674: movs r0, 0x8 ands r1, r0 cmp r1, 0 beq _080366AC - ldr r2, _08036694 - ldr r0, _08036698 + ldr r2, =0x08310030 + ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -112335,19 +109524,17 @@ _08036674: ldrb r0, [r0, 0x1] cmp r0, 0x20 bne _080366A0 - ldr r0, _0803669C + ldr r0, =0x08d7dfc4 b _08036742 .align 2, 0 -_08036694: .4byte 0x08310030 -_08036698: .4byte 0x02038bca -_0803669C: .4byte 0x08d7dfc4 + .pool _080366A0: cmp r0, 0x26 bne _080366AC - ldr r0, _080366A8 + ldr r0, =0x08d7e1f8 b _08036742 .align 2, 0 -_080366A8: .4byte 0x08d7e1f8 + .pool _080366AC: bl sav1_map_get_battletype lsls r0, 24 @@ -112355,12 +109542,12 @@ _080366AC: cmp r0, 0x8 bhi _080366EC lsls r0, 2 - ldr r1, _080366C4 + ldr r1, =_080366C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080366C4: .4byte _080366C8 + .pool .align 2, 0 _080366C8: .4byte _080366EC @@ -112373,8 +109560,8 @@ _080366C8: .4byte _08036738 .4byte _08036740 _080366EC: - ldr r2, _08036700 - ldr r0, _08036704 + ldr r2, =0x0831aba8 + ldr r0, =0x02022ff0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -112384,52 +109571,51 @@ _080366EC: ldr r0, [r0] b _08036742 .align 2, 0 -_08036700: .4byte 0x0831aba8 -_08036704: .4byte 0x02022ff0 + .pool _08036708: - ldr r0, _0803670C + ldr r0, =0x08d7df88 b _08036742 .align 2, 0 -_0803670C: .4byte 0x08d7df88 + .pool _08036710: - ldr r0, _08036714 + ldr r0, =0x08d7e060 b _08036742 .align 2, 0 -_08036714: .4byte 0x08d7e060 + .pool _08036718: - ldr r0, _0803671C + ldr r0, =0x08d7e000 b _08036742 .align 2, 0 -_0803671C: .4byte 0x08d7e000 + .pool _08036720: - ldr r0, _08036724 + ldr r0, =0x08d7e0cc b _08036742 .align 2, 0 -_08036724: .4byte 0x08d7e0cc + .pool _08036728: - ldr r0, _0803672C + ldr r0, =0x08d7e11c b _08036742 .align 2, 0 -_0803672C: .4byte 0x08d7e11c + .pool _08036730: - ldr r0, _08036734 + ldr r0, =0x08d7e164 b _08036742 .align 2, 0 -_08036734: .4byte 0x08d7e164 + .pool _08036738: - ldr r0, _0803673C + ldr r0, =0x08d7e1a8 b _08036742 .align 2, 0 -_0803673C: .4byte 0x08d7e1a8 + .pool _08036740: - ldr r0, _0803674C + ldr r0, =0x08d7c9ec _08036742: movs r1, 0x20 movs r2, 0x60 bl decompress_palette b _08036758 .align 2, 0 -_0803674C: .4byte 0x08d7c9ec + .pool _08036750: bl sub_803570C b _08036758 @@ -112450,7 +109636,7 @@ sub_8036760: @ 8036760 bl dp11_init bl init_uns_table_pokemon_copy bl sub_8185F84 - ldr r0, _08036794 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x40 ands r0, r1 @@ -112464,7 +109650,7 @@ sub_8036760: @ 8036760 bl sub_80367D4 b _080367BA .align 2, 0 -_08036794: .4byte 0x02022fec + .pool _08036798: movs r0, 0x80 lsls r0, 15 @@ -112472,22 +109658,21 @@ _08036798: cmp r1, 0 bne _080367B4 bl battle_wireless_setup_if_required_maybe - ldr r0, _080367B0 + ldr r0, =sub_8037ADC + 1 bl set_callback2 b _080367BA .align 2, 0 -_080367B0: .4byte sub_8037ADC + 1 + .pool _080367B4: - ldr r0, _080367C4 + ldr r0, =intro_end + 1 bl set_callback2 _080367BA: - ldr r1, _080367C8 + ldr r1, =0x02024332 movs r0, 0 strb r0, [r1] b _080367D0 .align 2, 0 -_080367C4: .4byte intro_end + 1 -_080367C8: .4byte 0x02024332 + .pool _080367CC: bl sub_80367D4 _080367D0: @@ -112507,7 +109692,7 @@ sub_80367D4: @ 80367D4 str r0, [sp] movs r1, 0xC0 lsls r1, 19 - ldr r2, _0803684C + ldr r2, =0x05006000 mov r0, sp bl CpuSet movs r0, 0x4C @@ -112516,7 +109701,7 @@ sub_80367D4: @ 80367D4 movs r0, 0x40 movs r1, 0xF0 bl lcd_io_set - ldr r1, _08036850 + ldr r1, =0x00005051 movs r0, 0x44 bl lcd_io_set movs r0, 0x48 @@ -112525,47 +109710,39 @@ sub_80367D4: @ 80367D4 movs r0, 0x4A movs r1, 0 bl lcd_io_set - ldr r0, _08036854 + ldr r0, =0x02022e24 movs r2, 0xF0 strh r2, [r0] - ldr r0, _08036858 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 beq _08036870 - ldr r0, _0803685C + ldr r0, =0x02038bce ldrh r1, [r0] - ldr r0, _08036860 + ldr r0, =0x00000c03 cmp r1, r0 beq _08036870 - ldr r1, _08036864 + ldr r1, =0x02022e26 movs r0, 0x9F strh r0, [r1] - ldr r0, _08036868 + ldr r0, =0x02022e28 strh r2, [r0] - ldr r1, _0803686C + ldr r1, =0x02022e2a movs r0, 0x20 strh r0, [r1] b _080368BE .align 2, 0 -_0803684C: .4byte 0x05006000 -_08036850: .4byte 0x00005051 -_08036854: .4byte 0x02022e24 -_08036858: .4byte 0x02022fec -_0803685C: .4byte 0x02038bce -_08036860: .4byte 0x00000c03 -_08036864: .4byte 0x02022e26 -_08036868: .4byte 0x02022e28 -_0803686C: .4byte 0x02022e2a + .pool _08036870: - ldr r0, _08036948 - ldr r2, _0803694C + ldr r0, =0x02022e26 + ldr r2, =0x00005051 adds r1, r2, 0 strh r1, [r0] bl dp12_8087EA4 - ldr r0, _08036950 + ldr r0, =0x02038c28 movs r3, 0xF0 movs r5, 0xF0 lsls r5, 3 @@ -112580,9 +109757,9 @@ _08036888: cmp r1, 0 bge _08036888 movs r1, 0x50 - ldr r4, _08036954 - ldr r0, _08036950 - ldr r3, _08036958 + ldr r4, =0x0831ac70 + ldr r0, =0x02038c28 + ldr r3, =0x0000ff10 movs r5, 0x82 lsls r5, 4 adds r2, r0, r5 @@ -112601,27 +109778,27 @@ _080368A6: bl sub_80BA038 _080368BE: bl sub_80A1A74 - ldr r0, _0803695C + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _08036960 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r0, _08036964 + ldr r0, =0x02022e18 strh r1, [r0] - ldr r0, _08036968 + ldr r0, =0x02022e1a strh r1, [r0] - ldr r0, _0803696C + ldr r0, =0x02022e1c strh r1, [r0] - ldr r0, _08036970 + ldr r0, =0x02022e1e strh r1, [r0] - ldr r0, _08036974 + ldr r0, =0x02022e20 strh r1, [r0] - ldr r0, _08036978 + ldr r0, =0x02022e22 strh r1, [r0] bl sub_80B0BD0 - ldr r2, _0803697C + ldr r2, =0x02022ff0 strb r0, [r2] - ldr r4, _08036980 + ldr r4, =0x02022fec ldr r0, [r4] movs r1, 0x80 lsls r1, 17 @@ -112637,10 +109814,10 @@ _080368FE: bl clear_tasks bl sub_8036154 bl gpu_pal_allocator_reset - ldr r1, _08036984 + ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - ldr r0, _08036988 + ldr r0, =vblank_cb_08078BB4 + 1 bl SetVBlankCallback bl sub_803269C ldr r2, [r4] @@ -112650,57 +109827,39 @@ _080368FE: ands r0, r1 cmp r0, r1 beq _0803693E - ldr r1, _0803698C + ldr r1, =0x00400040 adds r0, r2, 0 ands r0, r1 cmp r0, r1 bne _08036994 _0803693E: - ldr r0, _08036990 + ldr r0, =sub_8037458 + 1 bl set_callback2 b _080369AE .align 2, 0 -_08036948: .4byte 0x02022e26 -_0803694C: .4byte 0x00005051 -_08036950: .4byte 0x02038c28 -_08036954: .4byte 0x0831ac70 -_08036958: .4byte 0x0000ff10 -_0803695C: .4byte 0x02022e14 -_08036960: .4byte 0x02022e16 -_08036964: .4byte 0x02022e18 -_08036968: .4byte 0x02022e1a -_0803696C: .4byte 0x02022e1c -_08036970: .4byte 0x02022e1e -_08036974: .4byte 0x02022e20 -_08036978: .4byte 0x02022e22 -_0803697C: .4byte 0x02022ff0 -_08036980: .4byte 0x02022fec -_08036984: .4byte 0x0300301c -_08036988: .4byte vblank_cb_08078BB4 + 1 -_0803698C: .4byte 0x00400040 -_08036990: .4byte sub_8037458 + 1 + .pool _08036994: movs r0, 0x40 ands r2, r0 cmp r2, 0 beq _080369A8 - ldr r0, _080369A4 + ldr r0, =sub_8037DF4 + 1 bl set_callback2 b _080369AE .align 2, 0 -_080369A4: .4byte sub_8037DF4 + 1 + .pool _080369A8: - ldr r0, _08036A2C + ldr r0, =sub_8036FAC + 1 bl set_callback2 _080369AE: - ldr r5, _08036A30 + ldr r5, =0x02022fec ldr r0, [r5] - ldr r1, _08036A34 + ldr r1, =0x01000002 ands r0, r1 cmp r0, 0 bne _080369E8 - ldr r4, _08036A38 - ldr r0, _08036A3C + ldr r4, =0x02024744 + ldr r0, =0x02038bca ldrh r1, [r0] adds r0, r4, 0 movs r2, 0x1 @@ -112714,30 +109873,30 @@ _080369AE: movs r1, 0x96 lsls r1, 1 adds r0, r4, r1 - ldr r1, _08036A40 + ldr r1, =0x02038bcc ldrh r1, [r1] movs r2, 0 bl sub_80385E8 _080369E4: bl sub_806EA68 _080369E8: - ldr r1, _08036A44 - ldr r2, _08036A48 + ldr r1, =0x030022c0 + ldr r2, =0x00000439 adds r1, r2 ldrb r0, [r1] movs r2, 0x2 orrs r0, r2 strb r0, [r1] - ldr r0, _08036A4C + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r5, _08036A50 + ldr r5, =0x00000ca9 adds r1, r5 ldrb r2, [r1] movs r0, 0x9 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r4, _08036A54 + ldr r4, =0x020244ec movs r0, 0xFA lsls r0, 1 adds r5, r4, r0 @@ -112749,25 +109908,14 @@ _08036A10: cmp r4, r5 ble _08036A10 movs r1, 0 - ldr r0, _08036A58 + ldr r0, =0x02024332 strb r1, [r0] add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08036A2C: .4byte sub_8036FAC + 1 -_08036A30: .4byte 0x02022fec -_08036A34: .4byte 0x01000002 -_08036A38: .4byte 0x02024744 -_08036A3C: .4byte 0x02038bca -_08036A40: .4byte 0x02038bcc -_08036A44: .4byte 0x030022c0 -_08036A48: .4byte 0x00000439 -_08036A4C: .4byte 0x03005d90 -_08036A50: .4byte 0x00000ca9 -_08036A54: .4byte 0x020244ec -_08036A58: .4byte 0x02024332 + .pool thumb_func_end sub_80367D4 thumb_func_start sub_8036A5C @@ -112787,7 +109935,7 @@ _08036A72: movs r0, 0x64 mov r4, r9 muls r4, r0 - ldr r0, _08036B34 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -112854,18 +110002,18 @@ _08036AEE: mov r2, r9 cmp r2, 0x5 ble _08036A72 - ldr r4, _08036B38 + ldr r4, =0x0202449c ldr r0, [r4] movs r1, 0xC1 lsls r1, 1 adds r0, r1 strb r6, [r0] ldr r0, [r4] - ldr r5, _08036B3C + ldr r5, =0x00000183 adds r0, r5 lsrs r1, r6, 8 strb r1, [r0] - ldr r0, _08036B40 + ldr r0, =0x000008d2 bl flag_check ldr r1, [r4] adds r1, r5 @@ -112881,16 +110029,13 @@ _08036AEE: pop {r0} bx r0 .align 2, 0 -_08036B34: .4byte 0x020244ec -_08036B38: .4byte 0x0202449c -_08036B3C: .4byte 0x00000183 -_08036B40: .4byte 0x000008d2 + .pool thumb_func_end sub_8036A5C thumb_func_start sub_8036B44 sub_8036B44: @ 8036B44 push {r4-r7,lr} - ldr r0, _08036BAC + ldr r0, =0x0202449c ldr r5, [r0] movs r0, 0xC2 lsls r0, 1 @@ -112899,12 +110044,12 @@ sub_8036B44: @ 8036B44 cmp r0, 0x1 bne _08036BC0 movs r2, 0 - ldr r7, _08036BB0 + ldr r7, =0x03005d8c movs r1, 0xC6 lsls r1, 1 adds r5, r1 adds r6, r7, 0 - ldr r3, _08036BB4 + ldr r3, =0x000031f8 _08036B66: adds r0, r4, r2 ldr r1, [r6] @@ -112920,8 +110065,8 @@ _08036B66: strb r0, [r1] movs r2, 0 adds r3, r5, 0 - ldr r6, _08036BB0 - ldr r5, _08036BB8 + ldr r6, =0x03005d8c + ldr r5, =0x00003214 _08036B86: adds r0, r3, r2 ldr r1, [r6] @@ -112933,7 +110078,7 @@ _08036B86: cmp r2, 0x11 ble _08036B86 ldr r0, [r7] - ldr r1, _08036BBC + ldr r1, =0x00003226 adds r0, r1 ldrb r0, [r0] strb r0, [r4, 0x7] @@ -112943,11 +110088,7 @@ _08036B86: ldrb r0, [r0] b _08036C00 .align 2, 0 -_08036BAC: .4byte 0x0202449c -_08036BB0: .4byte 0x03005d8c -_08036BB4: .4byte 0x000031f8 -_08036BB8: .4byte 0x00003214 -_08036BBC: .4byte 0x00003226 + .pool _08036BC0: movs r0, 0xAF bl berryid_from_itemid @@ -112995,7 +110136,7 @@ berry_801017C: @ 8036C08 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08036CC0 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x2 ands r0, r1 @@ -113007,12 +110148,12 @@ _08036C20: cmp r0, 0x1 bne _08036CDC movs r5, 0 - ldr r3, _08036CC4 - ldr r0, _08036CC8 + ldr r3, =0x02024404 + ldr r0, =0x03005d8c mov r8, r0 adds r6, r3, 0 mov r4, r8 - ldr r2, _08036CCC + ldr r2, =0x000031f8 adds r7, r3, 0 adds r7, 0x38 _08036C3A: @@ -113043,8 +110184,8 @@ _08036C3A: movs r5, 0 adds r7, r3, 0 adds r7, 0x8 - ldr r4, _08036CC8 - ldr r2, _08036CD0 + ldr r4, =0x03005d8c + ldr r2, =0x00003214 adds r6, r3, 0 adds r6, 0x40 _08036C78: @@ -113065,7 +110206,7 @@ _08036C78: ble _08036C78 mov r1, r8 ldr r0, [r1] - ldr r2, _08036CD4 + ldr r2, =0x00003226 adds r0, r2 ldrb r1, [r0] strb r1, [r3, 0x7] @@ -113075,7 +110216,7 @@ _08036C78: strb r0, [r1] mov r4, r8 ldr r0, [r4] - ldr r1, _08036CD8 + ldr r1, =0x00003227 adds r0, r1 ldrb r1, [r0] strb r1, [r3, 0x1A] @@ -113085,13 +110226,7 @@ _08036C78: strb r1, [r0] b _08036EA0 .align 2, 0 -_08036CC0: .4byte 0x02022fec -_08036CC4: .4byte 0x02024404 -_08036CC8: .4byte 0x03005d8c -_08036CCC: .4byte 0x000031f8 -_08036CD0: .4byte 0x00003214 -_08036CD4: .4byte 0x00003226 -_08036CD8: .4byte 0x00003227 + .pool _08036CDC: movs r0, 0xAF bl berryid_from_itemid @@ -113100,7 +110235,7 @@ _08036CDC: bl sub_80E167C adds r6, r0, 0 movs r5, 0 - ldr r4, _08036D48 + ldr r4, =0x02024404 adds r7, r4, 0 adds r7, 0x38 adds r3, r4, 0 @@ -113148,7 +110283,7 @@ _08036D28: strb r1, [r0] b _08036EA0 .align 2, 0 -_08036D48: .4byte 0x02024404 + .pool _08036D4C: movs r0, 0x40 ands r0, r1 @@ -113169,16 +110304,16 @@ _08036D66: blt _08036D6E b _08036EA0 _08036D6E: - ldr r0, _08036DE4 + ldr r0, =0x020229e8 mov r12, r0 - ldr r3, _08036DE8 + ldr r3, =0x02024404 adds r6, r3, 0 movs r1, 0x8 adds r1, r6 mov r9, r1 _08036D7C: lsls r1, r5, 8 - ldr r0, _08036DEC + ldr r0, =0x020223c8 adds r7, r1, r0 lsls r0, r5, 3 subs r0, r5 @@ -113232,16 +110367,14 @@ _08036DC0: blt _08036D7C b _08036EA0 .align 2, 0 -_08036DE4: .4byte 0x020229e8 -_08036DE8: .4byte 0x02024404 -_08036DEC: .4byte 0x020223c8 + .pool _08036DF0: movs r5, 0 - ldr r4, _08036EB0 + ldr r4, =0x02024404 mov r9, r4 _08036DF6: lsls r0, r5, 8 - ldr r1, _08036EB4 + ldr r1, =0x020223c8 adds r7, r0, r1 movs r4, 0 adds r2, r5, 0x1 @@ -113290,7 +110423,7 @@ _08036E1C: orrs r0, r4 strb r0, [r1] movs r4, 0 - ldr r0, _08036EB0 + ldr r0, =0x02024404 adds r0, 0x8 adds r2, r0 adds r3, r0 @@ -113336,8 +110469,7 @@ _08036EA0: pop {r0} bx r0 .align 2, 0 -_08036EB0: .4byte 0x02024404 -_08036EB4: .4byte 0x020223c8 + .pool thumb_func_end berry_801017C thumb_func_start sub_8036EB8 @@ -113350,7 +110482,7 @@ sub_8036EB8: @ 8036EB8 lsls r1, 24 lsrs r3, r1, 24 movs r6, 0 - ldr r0, _08036EE4 + ldr r0, =0x020223c4 ldrh r2, [r0] movs r1, 0x80 lsls r1, 1 @@ -113359,15 +110491,14 @@ sub_8036EB8: @ 8036EB8 bne _08036EFC cmp r3, 0 bne _08036EEC - ldr r0, _08036EE8 + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0xC b _08036EF2 .align 2, 0 -_08036EE4: .4byte 0x020223c4 -_08036EE8: .4byte 0x02022fec + .pool _08036EEC: - ldr r0, _08036F30 + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x8 _08036EF2: @@ -113382,7 +110513,7 @@ _08036EFC: movs r2, 0 cmp r2, r4 bge _08036F20 - ldr r1, _08036F34 + ldr r1, =0x020223c4 mov r8, r1 movs r5, 0x80 lsls r5, 1 @@ -113401,15 +110532,14 @@ _08036F20: bne _08036F48 cmp r3, 0 bne _08036F38 - ldr r0, _08036F30 + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0xC b _08036F3E .align 2, 0 -_08036F30: .4byte 0x02022fec -_08036F34: .4byte 0x020223c4 + .pool _08036F38: - ldr r0, _08036F94 + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x8 _08036F3E: @@ -113422,7 +110552,7 @@ _08036F48: cmp r6, 0 bne _08036FA0 movs r2, 0 - ldr r5, _08036F94 + ldr r5, =0x02022fec cmp r2, r4 bge _08036F8A mov r0, r12 @@ -113462,7 +110592,7 @@ _08036F8A: movs r1, 0xC b _08036F9C .align 2, 0 -_08036F94: .4byte 0x02022fec + .pool _08036F98: ldr r0, [r5] movs r1, 0x8 @@ -113486,27 +110616,25 @@ sub_8036FAC: @ 8036FAC bl link_get_multiplayer_id lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08036FE4 + ldr r0, =0x02024474 adds r0, 0x25 strb r6, [r0] movs r0, 0x1 adds r5, r6, 0 eors r5, r0 - ldr r0, _08036FE8 + ldr r0, =0x02024332 ldrb r0, [r0] cmp r0, 0x12 bls _08036FD8 b _0803744C _08036FD8: lsls r0, 2 - ldr r1, _08036FEC + ldr r1, =_08036FF0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08036FE4: .4byte 0x02024474 -_08036FE8: .4byte 0x02024332 -_08036FEC: .4byte _08036FF0 + .pool .align 2, 0 _08036FF0: .4byte _0803703C @@ -113542,11 +110670,11 @@ _0803703C: movs r0, 0x3 bl gpu_sync_bg_show bl sub_805EF14 - ldr r1, _08037078 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1] _08037068: - ldr r0, _0803707C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _08037072 @@ -113555,17 +110683,16 @@ _08037072: bl sub_800E0E8 b _0803744C .align 2, 0 -_08037078: .4byte 0x02024332 -_0803707C: .4byte 0x030030fc + .pool _08037080: - ldr r2, _08037104 + ldr r2, =0x02022fec ldr r1, [r2] movs r6, 0x2 adds r0, r1, 0 ands r0, r6 cmp r0, 0 beq _08037124 - ldr r0, _08037108 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08037098 @@ -113575,7 +110702,7 @@ _08037098: lsls r0, 24 cmp r0, 0 beq _080370EE - ldr r4, _0803710C + ldr r4, =0x0202449c ldr r0, [r4] movs r5, 0xC0 lsls r5, 1 @@ -113583,19 +110710,19 @@ _08037098: movs r1, 0 strb r1, [r0] ldr r0, [r4] - ldr r2, _08037110 + ldr r2, =0x00000181 adds r1, r0, r2 movs r0, 0x3 strb r0, [r1] bl sub_8036A5C bl sub_8036B44 - ldr r0, _08037114 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 cmp r1, r0 bne _080370D8 - ldr r0, _08037118 + ldr r0, =0x020229e8 movs r1, 0 strh r1, [r0, 0x18] movs r1, 0x1 @@ -113608,10 +110735,10 @@ _080370D8: adds r1, r5 movs r2, 0x20 bl link_0800A448 - ldr r0, _0803711C + ldr r0, =0x02024332 strb r6, [r0] _080370EE: - ldr r0, _08037120 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _080370F8 @@ -113622,14 +110749,7 @@ _080370F8: bl sub_800DFB4 b _0803744C .align 2, 0 -_08037104: .4byte 0x02022fec -_08037108: .4byte 0x03003124 -_0803710C: .4byte 0x0202449c -_08037110: .4byte 0x00000181 -_08037114: .4byte 0x02038bca -_08037118: .4byte 0x020229e8 -_0803711C: .4byte 0x02024332 -_08037120: .4byte 0x030030fc + .pool _08037124: movs r0, 0x80 lsls r0, 17 @@ -113640,13 +110760,13 @@ _08037124: orrs r1, r0 str r1, [r2] _08037134: - ldr r1, _08037140 + ldr r1, =0x02024332 movs r0, 0xF strb r0, [r1] bl berry_801017C b _0803744C .align 2, 0 -_08037140: .4byte 0x02024332 + .pool _08037144: bl sub_800A550 movs r1, 0x3 @@ -113660,12 +110780,12 @@ _08037152: adds r1, r6, 0 bl sub_8036EB8 bl berry_801017C - ldr r0, _080371C4 + ldr r0, =task00_0800F6FC + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r1, _080371C8 + ldr r1, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -113677,7 +110797,7 @@ _08037152: movs r0, 0x5A strh r0, [r2, 0xC] strh r1, [r2, 0x12] - ldr r0, _080371CC + ldr r0, =0x0202449c ldr r3, [r0] movs r4, 0xC1 lsls r4, 1 @@ -113689,7 +110809,7 @@ _08037152: lsls r0, 8 orrs r1, r0 strh r1, [r2, 0xE] - ldr r1, _080371D0 + ldr r1, =0x020223c4 lsls r4, r5, 8 adds r1, 0x2 adds r4, r1 @@ -113702,14 +110822,10 @@ _08037152: ldrh r0, [r4] bl sub_8185F90 bl sub_8068AA4 - ldr r1, _080371D4 + ldr r1, =0x02024332 b _08037446 .align 2, 0 -_080371C4: .4byte task00_0800F6FC + 1 -_080371C8: .4byte 0x03005e00 -_080371CC: .4byte 0x0202449c -_080371D0: .4byte 0x020223c4 -_080371D4: .4byte 0x02024332 + .pool _080371D8: bl sub_800A520 lsls r0, 24 @@ -113720,14 +110836,13 @@ _080371E4: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _080371F8 + ldr r1, =0x020244ec movs r2, 0xC8 bl link_0800A448 - ldr r1, _080371FC + ldr r1, =0x02024332 b _08037446 .align 2, 0 -_080371F8: .4byte 0x020244ec -_080371FC: .4byte 0x02024332 + .pool _08037200: bl sub_800A550 movs r1, 0x3 @@ -113737,18 +110852,16 @@ _08037200: b _0803744C _0803720E: bl sub_800A5B4 - ldr r0, _08037224 + ldr r0, =0x02024744 lsls r1, r5, 8 - ldr r2, _08037228 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0xC8 bl memcpy - ldr r1, _0803722C + ldr r1, =0x02024332 b _08037446 .align 2, 0 -_08037224: .4byte 0x02024744 -_08037228: .4byte 0x020223c4 -_0803722C: .4byte 0x02024332 + .pool _08037230: bl sub_800A520 lsls r0, 24 @@ -113759,14 +110872,13 @@ _0803723C: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _08037250 + ldr r1, =0x020245b4 movs r2, 0xC8 bl link_0800A448 - ldr r1, _08037254 + ldr r1, =0x02024332 b _08037446 .align 2, 0 -_08037250: .4byte 0x020245b4 -_08037254: .4byte 0x02024332 + .pool _08037258: bl sub_800A550 movs r1, 0x3 @@ -113776,18 +110888,16 @@ _08037258: b _0803744C _08037266: bl sub_800A5B4 - ldr r0, _0803727C + ldr r0, =0x0202480c lsls r1, r5, 8 - ldr r2, _08037280 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0xC8 bl memcpy - ldr r1, _08037284 + ldr r1, =0x02024332 b _08037446 .align 2, 0 -_0803727C: .4byte 0x0202480c -_08037280: .4byte 0x020223c4 -_08037284: .4byte 0x02024332 + .pool _08037288: bl sub_800A520 lsls r0, 24 @@ -113798,14 +110908,13 @@ _08037294: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _080372A8 + ldr r1, =0x0202467c movs r2, 0xC8 bl link_0800A448 - ldr r1, _080372AC + ldr r1, =0x02024332 b _08037446 .align 2, 0 -_080372A8: .4byte 0x0202467c -_080372AC: .4byte 0x02024332 + .pool _080372B0: bl sub_800A550 movs r1, 0x3 @@ -113815,17 +110924,17 @@ _080372B0: b _0803744C _080372BE: bl sub_800A5B4 - ldr r4, _08037304 + ldr r4, =0x020248d4 lsls r1, r5, 8 - ldr r0, _08037308 + ldr r0, =0x020223c4 adds r1, r0 adds r0, r4, 0 movs r2, 0xC8 bl memcpy - ldr r1, _0803730C + ldr r1, =0xfffffe70 adds r0, r4, r1 bl shedinja_something - ldr r2, _08037310 + ldr r2, =0xfffffed4 adds r0, r4, r2 bl shedinja_something adds r0, r4, 0 @@ -113839,29 +110948,25 @@ _080372BE: adds r0, r4, 0 adds r0, 0x64 bl shedinja_something - ldr r1, _08037314 + ldr r1, =0x02024332 b _08037446 .align 2, 0 -_08037304: .4byte 0x020248d4 -_08037308: .4byte 0x020223c4 -_0803730C: .4byte 0xfffffe70 -_08037310: .4byte 0xfffffed4 -_08037314: .4byte 0x02024332 + .pool _08037318: bl sub_8032768 bl sub_8184E58 - ldr r2, _08037360 + ldr r2, =0x02024332 movs r0, 0 strb r0, [r2, 0x1] strb r0, [r2, 0x2] - ldr r0, _08037364 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 beq _08037372 movs r3, 0 - ldr r1, _08037368 + ldr r1, =0x020229e8 ldrb r0, [r1] adds r5, r2, 0 cmp r0, 0x3 @@ -113885,9 +110990,7 @@ _08037356: strb r0, [r5] b _0803744C .align 2, 0 -_08037360: .4byte 0x02024332 -_08037364: .4byte 0x02022fec -_08037368: .4byte 0x020229e8 + .pool _0803736C: movs r0, 0x12 strb r0, [r5] @@ -113904,14 +111007,13 @@ _08037378: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _08037398 + ldr r1, =0x0203bd2c movs r2, 0x4 bl link_0800A448 - ldr r1, _0803739C + ldr r1, =0x02024332 b _08037446 .align 2, 0 -_08037398: .4byte 0x0203bd2c -_0803739C: .4byte 0x02024332 + .pool _080373A0: bl sub_800A550 movs r1, 0x3 @@ -113919,42 +111021,39 @@ _080373A0: cmp r1, 0x3 bne _0803744C bl sub_800A5B4 - ldr r0, _080373D0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x4 ands r0, r1 cmp r0, 0 bne _080373CA - ldr r0, _080373D4 + ldr r0, =0x0203bd2c lsls r1, r5, 8 - ldr r2, _080373D8 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x4 bl memcpy _080373CA: - ldr r1, _080373DC + ldr r1, =0x02024332 b _08037446 .align 2, 0 -_080373D0: .4byte 0x02022fec -_080373D4: .4byte 0x0203bd2c -_080373D8: .4byte 0x020223c4 -_080373DC: .4byte 0x02024332 + .pool _080373E0: - ldr r0, _08037414 + ldr r0, =0x02024333 adds r1, r0, 0x1 bl battle_load_something lsls r0, 24 cmp r0, 0 beq _0803744C - ldr r2, _08037418 - ldr r1, _0803741C + ldr r2, =0x03005d00 + ldr r1, =0x030022c0 ldr r0, [r1] str r0, [r2] - ldr r0, _08037420 + ldr r0, =sub_8039EF0 + 1 str r0, [r1] - ldr r0, _08037424 + ldr r0, =sub_8038420 + 1 bl set_callback2 - ldr r2, _08037428 + ldr r2, =0x02022fec ldr r1, [r2] movs r0, 0x2 ands r0, r1 @@ -113965,21 +111064,16 @@ _080373E0: str r1, [r2] b _0803744C .align 2, 0 -_08037414: .4byte 0x02024333 -_08037418: .4byte 0x03005d00 -_0803741C: .4byte 0x030022c0 -_08037420: .4byte sub_8039EF0 + 1 -_08037424: .4byte sub_8038420 + 1 -_08037428: .4byte 0x02022fec + .pool _0803742C: - ldr r0, _08037454 + ldr r0, =0x02024332 ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] movs r1, 0x1 strb r1, [r0, 0x1] _08037438: - ldr r1, _08037454 + ldr r1, =0x02024332 ldrb r0, [r1, 0x1] subs r0, 0x1 strb r0, [r1, 0x1] @@ -113995,7 +111089,7 @@ _0803744C: pop {r0} bx r0 .align 2, 0 -_08037454: .4byte 0x02024332 + .pool thumb_func_end sub_8036FAC thumb_func_start sub_8037458 @@ -114008,27 +111102,25 @@ sub_8037458: @ 8037458 bl link_get_multiplayer_id lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08037490 + ldr r0, =0x02024474 adds r0, 0x25 strb r6, [r0] movs r0, 0x1 adds r7, r6, 0 eors r7, r0 - ldr r0, _08037494 + ldr r0, =0x02024332 ldrb r0, [r0] cmp r0, 0x10 bls _08037486 b _080379D6 _08037486: lsls r0, 2 - ldr r1, _08037498 + ldr r1, =_0803749C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08037490: .4byte 0x02024474 -_08037494: .4byte 0x02024332 -_08037498: .4byte _0803749C + .pool .align 2, 0 _0803749C: .4byte _080374E0 @@ -114062,30 +111154,30 @@ _080374E0: movs r0, 0x3 bl gpu_sync_bg_show bl sub_805EF14 - ldr r1, _080375D8 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1] _0803750C: - ldr r0, _080375DC + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08037518 bl sub_800E0E8 _08037518: - ldr r2, _080375E0 + ldr r2, =0x02022fec ldr r1, [r2] movs r3, 0x2 adds r0, r1, 0 ands r0, r3 cmp r0, 0 beq _080375FC - ldr r0, _080375E4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08037530 b _080379D6 _08037530: - ldr r6, _080375E8 + ldr r6, =0x020229e8 movs r0, 0 strh r0, [r6, 0x18] strh r3, [r6, 0x34] @@ -114098,12 +111190,12 @@ _08037530: strh r0, [r1] adds r0, r6, 0 adds r0, 0x40 - ldr r4, _080375EC + ldr r4, =0x02038bca ldrh r1, [r4] bl sub_8162E20 adds r0, r6, 0 adds r0, 0x5C - ldr r5, _080375F0 + ldr r5, =0x02038bcc ldrh r1, [r5] bl sub_8162E20 ldrh r1, [r4] @@ -114126,7 +111218,7 @@ _08037530: lsls r0, 24 cmp r0, 0 beq _080375C4 - ldr r4, _080375F4 + ldr r4, =0x0202449c ldr r0, [r4] movs r5, 0xC0 lsls r5, 1 @@ -114134,7 +111226,7 @@ _08037530: movs r1, 0 strb r1, [r0] ldr r0, [r4] - ldr r2, _080375F8 + ldr r2, =0x00000181 adds r1, r0, r2 movs r0, 0x3 strb r0, [r1] @@ -114147,11 +111239,11 @@ _08037530: adds r1, r5 movs r2, 0x20 bl link_0800A448 - ldr r1, _080375D8 + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1] _080375C4: - ldr r0, _080375DC + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _080375CE @@ -114162,15 +111254,7 @@ _080375CE: bl sub_800DFB4 b _080379D6 .align 2, 0 -_080375D8: .4byte 0x02024332 -_080375DC: .4byte 0x030030fc -_080375E0: .4byte 0x02022fec -_080375E4: .4byte 0x03003124 -_080375E8: .4byte 0x020229e8 -_080375EC: .4byte 0x02038bca -_080375F0: .4byte 0x02038bcc -_080375F4: .4byte 0x0202449c -_080375F8: .4byte 0x00000181 + .pool _080375FC: movs r0, 0x80 lsls r0, 17 @@ -114181,13 +111265,13 @@ _080375FC: orrs r1, r0 str r1, [r2] _0803760C: - ldr r1, _08037618 + ldr r1, =0x02024332 movs r0, 0xD strb r0, [r1] bl berry_801017C b _080379D6 .align 2, 0 -_08037618: .4byte 0x02024332 + .pool _0803761C: bl sub_800A550 movs r1, 0x3 @@ -114201,12 +111285,12 @@ _0803762A: adds r1, r6, 0 bl sub_8036EB8 bl berry_801017C - ldr r0, _08037668 + ldr r0, =task00_0800F6FC + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0803766C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -114223,8 +111307,7 @@ _0803762A: strh r0, [r1, 0x10] b _08037986 .align 2, 0 -_08037668: .4byte task00_0800F6FC + 1 -_0803766C: .4byte 0x03005e00 + .pool _08037670: bl sub_800A520 lsls r0, 24 @@ -114235,13 +111318,13 @@ _0803767C: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _08037690 + ldr r1, =0x020244ec _08037686: movs r2, 0xC8 bl link_0800A448 b _08037986 .align 2, 0 -_08037690: .4byte 0x020244ec + .pool _08037694: bl sub_800A550 movs r1, 0x3 @@ -114251,7 +111334,7 @@ _08037694: b _080379D6 _080376A2: bl sub_800A5B4 - ldr r0, _080376DC + ldr r0, =0x020229e8 lsls r1, r6, 3 subs r1, r6 lsls r1, 2 @@ -114259,9 +111342,9 @@ _080376A2: ldrh r0, [r1, 0x18] cmp r0, 0 beq _080376E8 - ldr r4, _080376E0 + ldr r4, =0x020244ec lsls r1, r7, 8 - ldr r5, _080376E4 + ldr r5, =0x020223c4 adds r1, r5 adds r0, r4, 0 movs r2, 0xC8 @@ -114276,13 +111359,11 @@ _080376A2: bl memcpy b _08037986 .align 2, 0 -_080376DC: .4byte 0x020229e8 -_080376E0: .4byte 0x020244ec -_080376E4: .4byte 0x020223c4 + .pool _080376E8: - ldr r4, _08037708 + ldr r4, =0x020244ec lsls r1, r6, 8 - ldr r5, _0803770C + ldr r5, =0x020223c4 adds r1, r5 adds r0, r4, 0 movs r2, 0xC8 @@ -114296,8 +111377,7 @@ _080376E8: movs r2, 0xC8 b _08037982 .align 2, 0 -_08037708: .4byte 0x020244ec -_0803770C: .4byte 0x020223c4 + .pool _08037710: bl sub_800A520 lsls r0, 24 @@ -114308,12 +111388,12 @@ _0803771C: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _08037730 + ldr r1, =0x020245b4 movs r2, 0x64 bl link_0800A448 b _08037986 .align 2, 0 -_08037730: .4byte 0x020245b4 + .pool _08037734: bl sub_800A550 movs r1, 0x3 @@ -114323,7 +111403,7 @@ _08037734: b _080379D6 _08037742: bl sub_800A5B4 - ldr r0, _0803777C + ldr r0, =0x020229e8 lsls r1, r6, 3 subs r1, r6 lsls r1, 2 @@ -114331,9 +111411,9 @@ _08037742: ldrh r0, [r1, 0x18] cmp r0, 0 beq _08037788 - ldr r4, _08037780 + ldr r4, =0x020245b4 lsls r1, r7, 8 - ldr r5, _08037784 + ldr r5, =0x020223c4 adds r1, r5 adds r0, r4, 0 movs r2, 0x64 @@ -114348,13 +111428,11 @@ _08037742: bl memcpy b _08037986 .align 2, 0 -_0803777C: .4byte 0x020229e8 -_08037780: .4byte 0x020245b4 -_08037784: .4byte 0x020223c4 + .pool _08037788: - ldr r4, _080377A8 + ldr r4, =0x020245b4 lsls r1, r6, 8 - ldr r5, _080377AC + ldr r5, =0x020223c4 adds r1, r5 adds r0, r4, 0 movs r2, 0x64 @@ -114368,8 +111446,7 @@ _08037788: movs r2, 0x64 b _08037982 .align 2, 0 -_080377A8: .4byte 0x020245b4 -_080377AC: .4byte 0x020223c4 + .pool _080377B0: bl sub_800A520 lsls r0, 24 @@ -114380,10 +111457,10 @@ _080377BC: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _080377C8 + ldr r1, =0x02024744 b _08037686 .align 2, 0 -_080377C8: .4byte 0x02024744 + .pool _080377CC: bl sub_800A550 movs r1, 0x3 @@ -114399,13 +111476,12 @@ _080377DA: bne _080377EA b _08037986 _080377EA: - ldr r0, _080377F4 - ldr r1, _080377F8 + ldr r0, =0x02024744 + ldr r1, =0x020223c4 movs r2, 0xC8 b _08037982 .align 2, 0 -_080377F4: .4byte 0x02024744 -_080377F8: .4byte 0x020223c4 + .pool _080377FC: bl sub_800A520 lsls r0, 24 @@ -114416,10 +111492,10 @@ _08037808: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _08037814 + ldr r1, =0x0202480c b _08037686 .align 2, 0 -_08037814: .4byte 0x0202480c + .pool _08037818: bl sub_800A550 movs r1, 0x3 @@ -114435,13 +111511,12 @@ _08037826: bne _08037836 b _08037986 _08037836: - ldr r0, _08037840 - ldr r1, _08037844 + ldr r0, =0x0202480c + ldr r1, =0x020223c4 movs r2, 0xC8 b _08037982 .align 2, 0 -_08037840: .4byte 0x0202480c -_08037844: .4byte 0x020223c4 + .pool _08037848: bl sub_800A520 lsls r0, 24 @@ -114452,10 +111527,10 @@ _08037854: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _08037860 + ldr r1, =0x020248d4 b _08037686 .align 2, 0 -_08037860: .4byte 0x020248d4 + .pool _08037864: bl sub_800A550 movs r1, 0x3 @@ -114469,12 +111544,12 @@ _08037872: lsls r0, 24 cmp r0, 0 beq _0803788A - ldr r0, _080378F8 - ldr r1, _080378FC + ldr r0, =0x020248d4 + ldr r1, =0x020223c4 movs r2, 0xC8 bl memcpy _0803788A: - ldr r4, _08037900 + ldr r4, =0x020244ec adds r0, r4, 0 bl shedinja_something adds r0, r4, 0 @@ -114495,7 +111570,7 @@ _0803788A: lsls r1, 1 adds r0, r4, r1 bl shedinja_something - ldr r4, _08037904 + ldr r4, =0x02024744 adds r0, r4, 0 bl shedinja_something adds r0, r4, 0 @@ -114518,18 +111593,15 @@ _0803788A: bl shedinja_something b _08037986 .align 2, 0 -_080378F8: .4byte 0x020248d4 -_080378FC: .4byte 0x020223c4 -_08037900: .4byte 0x020244ec -_08037904: .4byte 0x02024744 + .pool _08037908: bl sub_8032768 bl sub_8184E58 - ldr r2, _0803792C + ldr r2, =0x02024332 movs r0, 0 strb r0, [r2, 0x1] strb r0, [r2, 0x2] - ldr r0, _08037930 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -114539,8 +111611,7 @@ _08037908: strb r0, [r2] b _080379D6 .align 2, 0 -_0803792C: .4byte 0x02024332 -_08037930: .4byte 0x02022fec + .pool _08037934: movs r0, 0x10 strb r0, [r2] @@ -114553,12 +111624,12 @@ _0803793A: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _08037958 + ldr r1, =0x0203bd2c movs r2, 0x4 bl link_0800A448 b _08037986 .align 2, 0 -_08037958: .4byte 0x0203bd2c + .pool _0803795C: bl sub_800A550 movs r1, 0x3 @@ -114566,47 +111637,44 @@ _0803795C: cmp r1, 0x3 bne _080379D6 bl sub_800A5B4 - ldr r0, _08037990 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x4 ands r0, r1 cmp r0, 0 bne _08037986 - ldr r0, _08037994 + ldr r0, =0x0203bd2c lsls r1, r7, 8 - ldr r2, _08037998 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x4 _08037982: bl memcpy _08037986: - ldr r1, _0803799C + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _080379D6 .align 2, 0 -_08037990: .4byte 0x02022fec -_08037994: .4byte 0x0203bd2c -_08037998: .4byte 0x020223c4 -_0803799C: .4byte 0x02024332 + .pool _080379A0: - ldr r0, _080379E0 + ldr r0, =0x02024333 adds r1, r0, 0x1 bl battle_load_something lsls r0, 24 cmp r0, 0 beq _080379D6 bl sub_8166188 - ldr r2, _080379E4 - ldr r1, _080379E8 + ldr r2, =0x03005d00 + ldr r1, =0x030022c0 ldr r0, [r1] str r0, [r2] - ldr r0, _080379EC + ldr r0, =sub_8039EF0 + 1 str r0, [r1] - ldr r0, _080379F0 + ldr r0, =sub_8038420 + 1 bl set_callback2 - ldr r2, _080379F4 + ldr r2, =0x02022fec ldr r1, [r2] movs r0, 0x2 ands r0, r1 @@ -114621,12 +111689,7 @@ _080379D6: pop {r0} bx r0 .align 2, 0 -_080379E0: .4byte 0x02024333 -_080379E4: .4byte 0x03005d00 -_080379E8: .4byte 0x030022c0 -_080379EC: .4byte sub_8039EF0 + 1 -_080379F0: .4byte sub_8038420 + 1 -_080379F4: .4byte 0x02022fec + .pool thumb_func_end sub_8037458 thumb_func_start sub_80379F8 @@ -114642,7 +111705,7 @@ sub_80379F8: @ 80379F8 str r0, [sp] movs r0, 0 mov r8, r0 - ldr r6, _08037AD0 + ldr r6, =0x02022ff8 mov r10, r6 _08037A12: ldr r1, [sp] @@ -114650,7 +111713,7 @@ _08037A12: movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _08037AD4 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -114713,7 +111776,7 @@ _08037AA4: mov r0, r8 cmp r0, 0x2 ble _08037A12 - ldr r0, _08037AD8 + ldr r0, =0x02023058 ldr r0, [r0] mov r1, r9 subs r1, 0x4 @@ -114728,9 +111791,7 @@ _08037AA4: pop {r0} bx r0 .align 2, 0 -_08037AD0: .4byte 0x02022ff8 -_08037AD4: .4byte 0x020244ec -_08037AD8: .4byte 0x02023058 + .pool thumb_func_end sub_80379F8 thumb_func_start sub_8037ADC @@ -114744,7 +111805,7 @@ sub_8037ADC: @ 8037ADC movs r0, 0x4 mov r9, r0 movs r4, 0xF - ldr r6, _08037B40 + ldr r6, =0x02022fec ldr r0, [r6] movs r1, 0x80 lsls r1, 1 @@ -114758,12 +111819,12 @@ _08037B02: bl link_get_multiplayer_id lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08037B44 + ldr r0, =0x02024474 adds r0, 0x25 movs r2, 0 mov r8, r2 strb r7, [r0] - ldr r0, _08037B48 + ldr r0, =0x0202449c ldr r0, [r0] adds r1, r0, 0 adds r1, 0xB4 @@ -114773,7 +111834,7 @@ _08037B02: bl run_active_tasks bl call_obj_callbacks bl obj_sync_something - ldr r5, _08037B4C + ldr r5, =0x02024332 ldrb r0, [r5] cmp r0, 0x1 beq _08037BA4 @@ -114783,10 +111844,7 @@ _08037B02: beq _08037B5E b _08037D0A .align 2, 0 -_08037B40: .4byte 0x02022fec -_08037B44: .4byte 0x02024474 -_08037B48: .4byte 0x0202449c -_08037B4C: .4byte 0x02024332 + .pool _08037B50: cmp r0, 0x2 bne _08037B56 @@ -114798,7 +111856,7 @@ _08037B56: _08037B5C: b _08037D0A _08037B5E: - ldr r0, _08037B9C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08037B68 @@ -114810,7 +111868,7 @@ _08037B68: bne _08037B74 b _08037D0A _08037B74: - ldr r4, _08037BA0 + ldr r4, =0x02023058 movs r0, 0x60 bl malloc str r0, [r4] @@ -114827,8 +111885,7 @@ _08037B74: strb r0, [r5] b _08037D0A .align 2, 0 -_08037B9C: .4byte 0x03003124 -_08037BA0: .4byte 0x02023058 + .pool _08037BA4: bl sub_800A550 adds r1, r4, 0 @@ -114845,14 +111902,14 @@ _08037BB2: subs r0, r7 lsls r6, r0, 2 mov r8, r5 - ldr r4, _08037BF0 + ldr r4, =0x020223c4 _08037BC6: cmp r5, r7 beq _08037C1E mov r2, r9 cmp r2, 0x4 bne _08037C14 - ldr r2, _08037BF4 + ldr r2, =0x020229e8 mov r1, r8 adds r0, r1, r2 ldrh r1, [r0, 0x18] @@ -114869,8 +111926,7 @@ _08037BC6: beq _08037C04 b _08037C1E .align 2, 0 -_08037BF0: .4byte 0x020223c4 -_08037BF4: .4byte 0x020229e8 + .pool _08037BF8: adds r0, r6, r2 ldrh r1, [r0, 0x18] @@ -114879,15 +111935,15 @@ _08037BF8: cmp r0, 0 beq _08037C1E _08037C04: - ldr r0, _08037C10 + ldr r0, =0x02022ff8 adds r1, r4, 0 movs r2, 0x60 bl memcpy b _08037C1E .align 2, 0 -_08037C10: .4byte 0x02022ff8 + .pool _08037C14: - ldr r0, _08037C50 + ldr r0, =0x02022ff8 adds r1, r4, 0 movs r2, 0x60 bl memcpy @@ -114901,34 +111957,30 @@ _08037C1E: cmp r5, r9 blt _08037BC6 _08037C2E: - ldr r1, _08037C54 + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, _08037C58 + ldr r1, =0x030022c0 ldr r0, [r1, 0x8] ldr r2, [sp] str r0, [r2] - ldr r0, _08037C5C + ldr r0, =0x02022fec ldr r0, [r0] mov r2, r10 str r0, [r2] - ldr r0, _08037C60 + ldr r0, =sub_8037ADC + 1 str r0, [r1, 0x8] bl sub_81B9150 b _08037D0A .align 2, 0 -_08037C50: .4byte 0x02022ff8 -_08037C54: .4byte 0x02024332 -_08037C58: .4byte 0x030022c0 -_08037C5C: .4byte 0x02022fec -_08037C60: .4byte sub_8037ADC + 1 + .pool _08037C64: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _08037D0A - ldr r0, _08037C90 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -114937,20 +111989,19 @@ _08037C64: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - ldr r0, _08037C94 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08037C98 bl sub_800ADF8 b _08037D0A .align 2, 0 -_08037C90: .4byte 0x02037fd4 -_08037C94: .4byte 0x030030fc + .pool _08037C98: bl sub_800AC34 b _08037D0A _08037C9E: - ldr r0, _08037CD4 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08037CE4 @@ -114961,38 +112012,35 @@ _08037C9E: mov r1, r10 ldr r0, [r1] str r0, [r6] - ldr r1, _08037CD8 + ldr r1, =0x030022c0 ldr r2, [sp] ldr r0, [r2] str r0, [r1, 0x8] - ldr r0, _08037CDC + ldr r0, =sub_80367D4 + 1 bl set_callback2 - ldr r4, _08037CE0 + ldr r4, =0x02023058 ldr r0, [r4] bl free mov r0, r8 str r0, [r4] b _08037D0A .align 2, 0 -_08037CD4: .4byte 0x030030fc -_08037CD8: .4byte 0x030022c0 -_08037CDC: .4byte sub_80367D4 + 1 -_08037CE0: .4byte 0x02023058 + .pool _08037CE4: - ldr r0, _08037D1C + ldr r0, =0x03003124 ldrb r5, [r0] cmp r5, 0 bne _08037D0A mov r1, r10 ldr r0, [r1] str r0, [r6] - ldr r1, _08037D20 + ldr r1, =0x030022c0 ldr r2, [sp] ldr r0, [r2] str r0, [r1, 0x8] - ldr r0, _08037D24 + ldr r0, =sub_80367D4 + 1 bl set_callback2 - ldr r4, _08037D28 + ldr r4, =0x02023058 ldr r0, [r4] bl free str r5, [r4] @@ -115006,10 +112054,7 @@ _08037D0A: pop {r0} bx r0 .align 2, 0 -_08037D1C: .4byte 0x03003124 -_08037D20: .4byte 0x030022c0 -_08037D24: .4byte sub_80367D4 + 1 -_08037D28: .4byte 0x02023058 + .pool thumb_func_end sub_8037ADC thumb_func_start intro_end @@ -115017,7 +112062,7 @@ intro_end: @ 8037D2C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _08037D5C + ldr r0, =0x0202449c ldr r0, [r0] movs r1, 0xB4 adds r1, r0 @@ -115027,7 +112072,7 @@ intro_end: @ 8037D2C bl run_active_tasks bl call_obj_callbacks bl obj_sync_something - ldr r5, _08037D60 + ldr r5, =0x02024332 ldrb r0, [r5] cmp r0, 0 beq _08037D64 @@ -115035,10 +112080,9 @@ intro_end: @ 8037D2C beq _08037DA4 b _08037DD6 .align 2, 0 -_08037D5C: .4byte 0x0202449c -_08037D60: .4byte 0x02024332 + .pool _08037D64: - ldr r4, _08037D94 + ldr r4, =0x02023058 movs r0, 0x60 bl malloc str r0, [r4] @@ -115047,24 +112091,21 @@ _08037D64: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - ldr r1, _08037D98 + ldr r1, =0x030022c0 ldr r0, [r1, 0x8] mov r2, r8 str r0, [r2] - ldr r0, _08037D9C + ldr r0, =0x02022fec ldr r0, [r0] str r0, [r7] - ldr r0, _08037DA0 + ldr r0, =intro_end + 1 str r0, [r1, 0x8] bl sub_81B9150 b _08037DD6 .align 2, 0 -_08037D94: .4byte 0x02023058 -_08037D98: .4byte 0x030022c0 -_08037D9C: .4byte 0x02022fec -_08037DA0: .4byte intro_end + 1 + .pool _08037DA4: - ldr r0, _08037DE0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -115074,16 +112115,16 @@ _08037DA4: bne _08037DD6 movs r0, 0x2 strb r0, [r5] - ldr r1, _08037DE4 + ldr r1, =0x02022fec ldr r0, [r7] str r0, [r1] - ldr r1, _08037DE8 + ldr r1, =0x030022c0 mov r2, r8 ldr r0, [r2] str r0, [r1, 0x8] - ldr r0, _08037DEC + ldr r0, =sub_80367D4 + 1 bl set_callback2 - ldr r4, _08037DF0 + ldr r4, =0x02023058 ldr r0, [r4] bl free str r6, [r4] @@ -115094,11 +112135,7 @@ _08037DD6: pop {r0} bx r0 .align 2, 0 -_08037DE0: .4byte 0x02037fd4 -_08037DE4: .4byte 0x02022fec -_08037DE8: .4byte 0x030022c0 -_08037DEC: .4byte sub_80367D4 + 1 -_08037DF0: .4byte 0x02023058 + .pool thumb_func_end intro_end thumb_func_start sub_8037DF4 @@ -115110,27 +112147,25 @@ sub_8037DF4: @ 8037DF4 bl link_get_multiplayer_id lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08037E2C + ldr r0, =0x02024474 adds r0, 0x25 strb r7, [r0] bl run_active_tasks bl call_obj_callbacks bl obj_sync_something - ldr r0, _08037E30 + ldr r0, =0x02024332 ldrb r0, [r0] cmp r0, 0xA bls _08037E20 b _080383F8 _08037E20: lsls r0, 2 - ldr r1, _08037E34 + ldr r1, =_08037E38 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08037E2C: .4byte 0x02024474 -_08037E30: .4byte 0x02024332 -_08037E34: .4byte _08037E38 + .pool .align 2, 0 _08037E38: .4byte _08037E64 @@ -115158,11 +112193,11 @@ _08037E64: movs r0, 0x3 bl gpu_sync_bg_show bl sub_805EF14 - ldr r1, _08037EA0 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1] _08037E90: - ldr r0, _08037EA4 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _08037E9A @@ -115171,16 +112206,15 @@ _08037E9A: bl sub_800E0E8 b _080383F8 .align 2, 0 -_08037EA0: .4byte 0x02024332 -_08037EA4: .4byte 0x030030fc + .pool _08037EA8: - ldr r2, _08037F18 + ldr r2, =0x02022fec ldr r1, [r2] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _08037F30 - ldr r0, _08037F1C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08037EBE @@ -115190,7 +112224,7 @@ _08037EBE: lsls r0, 24 cmp r0, 0 beq _08037F02 - ldr r4, _08037F20 + ldr r4, =0x0202449c ldr r0, [r4] movs r5, 0xC0 lsls r5, 1 @@ -115198,7 +112232,7 @@ _08037EBE: movs r1, 0 strb r1, [r0] ldr r0, [r4] - ldr r2, _08037F24 + ldr r2, =0x00000181 adds r1, r0, r2 movs r0, 0x3 strb r0, [r1] @@ -115211,12 +112245,12 @@ _08037EBE: adds r1, r5 movs r2, 0x20 bl link_0800A448 - ldr r1, _08037F28 + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] _08037F02: - ldr r0, _08037F2C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _08037F0C @@ -115227,12 +112261,7 @@ _08037F0C: bl sub_800DFB4 b _080383F8 .align 2, 0 -_08037F18: .4byte 0x02022fec -_08037F1C: .4byte 0x03003124 -_08037F20: .4byte 0x0202449c -_08037F24: .4byte 0x00000181 -_08037F28: .4byte 0x02024332 -_08037F2C: .4byte 0x030030fc + .pool _08037F30: movs r0, 0x80 lsls r0, 17 @@ -115243,13 +112272,13 @@ _08037F30: orrs r1, r0 str r1, [r2] _08037F40: - ldr r1, _08037F4C + ldr r1, =0x02024332 movs r0, 0x7 strb r0, [r1] bl berry_801017C b _080383F8 .align 2, 0 -_08037F4C: .4byte 0x02024332 + .pool _08037F50: bl sub_800A550 movs r1, 0xF @@ -115264,12 +112293,12 @@ _08037F5E: bl sub_8036EB8 bl berry_801017C bl sub_8068AA4 - ldr r0, _08037FC4 + ldr r0, =task00_0800F6FC + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08037FC8 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -115283,7 +112312,7 @@ _08037F5E: strh r2, [r0, 0x12] strh r2, [r0, 0xE] strh r2, [r0, 0x10] - ldr r1, _08037FCC + ldr r1, =0x020223c4 adds r4, r0, 0 adds r5, r1, 0x2 movs r7, 0x3F @@ -115292,7 +112321,7 @@ _08037FA4: ldrh r0, [r5] str r2, [sp] bl sub_8185F90 - ldr r0, _08037FD0 + ldr r0, =0x020229e8 ldr r2, [sp] adds r0, r2, r0 ldrh r0, [r0, 0x18] @@ -115304,10 +112333,7 @@ _08037FA4: beq _08037FDE b _0803800C .align 2, 0 -_08037FC4: .4byte task00_0800F6FC + 1 -_08037FC8: .4byte 0x03005e00 -_08037FCC: .4byte 0x020223c4 -_08037FD0: .4byte 0x020229e8 + .pool _08037FD4: cmp r0, 0x2 beq _08037FEE @@ -115352,7 +112378,7 @@ _0803800C: cmp r6, 0 bge _08037FA4 bl zero_enemy_party_data - ldr r1, _08038044 + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -115366,13 +112392,12 @@ _08038032: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _08038048 + ldr r1, =0x020244ec movs r2, 0xC8 bl link_0800A448 b _080383A6 .align 2, 0 -_08038044: .4byte 0x02024332 -_08038048: .4byte 0x020244ec + .pool _0803804C: bl sub_800A550 movs r1, 0xF @@ -115387,12 +112412,12 @@ _0803805A: subs r0, r7 lsls r0, 2 mov r8, r0 - ldr r4, _08038084 + ldr r4, =0x020223c4 movs r5, 0 _0803806C: cmp r6, r7 bne _080380A0 - ldr r0, _08038088 + ldr r0, =0x020229e8 adds r0, r5, r0 ldrh r0, [r0, 0x18] cmp r0, 0x2 @@ -115403,23 +112428,22 @@ _0803806C: beq _08038090 b _0803812A .align 2, 0 -_08038084: .4byte 0x020223c4 -_08038088: .4byte 0x020229e8 + .pool _0803808C: cmp r0, 0x3 bne _0803812A _08038090: - ldr r0, _08038094 + ldr r0, =0x020244ec b _08038110 .align 2, 0 -_08038094: .4byte 0x020244ec + .pool _08038098: - ldr r0, _0803809C + ldr r0, =0x02024618 b _08038110 .align 2, 0 -_0803809C: .4byte 0x02024618 + .pool _080380A0: - ldr r2, _080380C0 + ldr r2, =0x020229e8 adds r0, r5, r2 ldrh r1, [r0, 0x18] movs r3, 0x1 @@ -115436,7 +112460,7 @@ _080380A0: beq _080380D2 b _080380F8 .align 2, 0 -_080380C0: .4byte 0x020229e8 + .pool _080380C4: mov r1, r8 adds r0, r1, r2 @@ -115459,15 +112483,15 @@ _080380E4: cmp r0, 0x3 bne _0803812A _080380E8: - ldr r0, _080380EC + ldr r0, =0x020244ec b _08038110 .align 2, 0 -_080380EC: .4byte 0x020244ec + .pool _080380F0: - ldr r0, _080380F4 + ldr r0, =0x02024618 b _08038110 .align 2, 0 -_080380F4: .4byte 0x02024618 + .pool _080380F8: adds r0, r5, r2 ldrh r0, [r0, 0x18] @@ -115482,16 +112506,16 @@ _0803810A: cmp r0, 0x3 bne _0803812A _0803810E: - ldr r0, _0803811C + ldr r0, =0x02024744 _08038110: adds r1, r4, 0 movs r2, 0xC8 bl memcpy b _0803812A .align 2, 0 -_0803811C: .4byte 0x02024744 + .pool _08038120: - ldr r0, _0803813C + ldr r0, =0x02024870 adds r1, r4, 0 movs r2, 0xC8 bl memcpy @@ -115505,7 +112529,7 @@ _0803812A: ble _0803806C b _080383A6 .align 2, 0 -_0803813C: .4byte 0x02024870 + .pool _08038140: bl sub_800A520 lsls r0, 24 @@ -115516,12 +112540,12 @@ _0803814C: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _08038160 + ldr r1, =0x020245b4 movs r2, 0x64 bl link_0800A448 b _080383A6 .align 2, 0 -_08038160: .4byte 0x020245b4 + .pool _08038164: bl sub_800A550 movs r1, 0xF @@ -115536,12 +112560,12 @@ _08038172: subs r0, r7 lsls r0, 2 mov r8, r0 - ldr r4, _0803819C + ldr r4, =0x020223c4 movs r5, 0 _08038184: cmp r6, r7 bne _080381B8 - ldr r0, _080381A0 + ldr r0, =0x020229e8 adds r0, r5, r0 ldrh r0, [r0, 0x18] cmp r0, 0x2 @@ -115552,23 +112576,22 @@ _08038184: beq _080381A8 b _08038242 .align 2, 0 -_0803819C: .4byte 0x020223c4 -_080381A0: .4byte 0x020229e8 + .pool _080381A4: cmp r0, 0x3 bne _08038242 _080381A8: - ldr r0, _080381AC + ldr r0, =0x020245b4 b _08038228 .align 2, 0 -_080381AC: .4byte 0x020245b4 + .pool _080381B0: - ldr r0, _080381B4 + ldr r0, =0x020246e0 b _08038228 .align 2, 0 -_080381B4: .4byte 0x020246e0 + .pool _080381B8: - ldr r2, _080381D8 + ldr r2, =0x020229e8 adds r0, r5, r2 ldrh r1, [r0, 0x18] movs r3, 0x1 @@ -115585,7 +112608,7 @@ _080381B8: beq _080381EA b _08038210 .align 2, 0 -_080381D8: .4byte 0x020229e8 + .pool _080381DC: mov r1, r8 adds r0, r1, r2 @@ -115608,15 +112631,15 @@ _080381FC: cmp r0, 0x3 bne _08038242 _08038200: - ldr r0, _08038204 + ldr r0, =0x020245b4 b _08038228 .align 2, 0 -_08038204: .4byte 0x020245b4 + .pool _08038208: - ldr r0, _0803820C + ldr r0, =0x020246e0 b _08038228 .align 2, 0 -_0803820C: .4byte 0x020246e0 + .pool _08038210: adds r0, r5, r2 ldrh r0, [r0, 0x18] @@ -115631,16 +112654,16 @@ _08038222: cmp r0, 0x3 bne _08038242 _08038226: - ldr r0, _08038234 + ldr r0, =0x0202480c _08038228: adds r1, r4, 0 movs r2, 0x64 bl memcpy b _08038242 .align 2, 0 -_08038234: .4byte 0x0202480c + .pool _08038238: - ldr r0, _080382C0 + ldr r0, =0x02024938 adds r1, r4, 0 movs r2, 0x64 bl memcpy @@ -115652,7 +112675,7 @@ _08038242: adds r6, 0x1 cmp r6, 0x3 ble _08038184 - ldr r4, _080382C4 + ldr r4, =0x020244ec adds r0, r4, 0 bl shedinja_something adds r0, r4, 0 @@ -115673,7 +112696,7 @@ _08038242: lsls r1, 1 adds r0, r4, r1 bl shedinja_something - ldr r4, _080382C8 + ldr r4, =0x02024744 adds r0, r4, 0 bl shedinja_something adds r0, r4, 0 @@ -115696,24 +112719,22 @@ _08038242: bl shedinja_something b _080383A6 .align 2, 0 -_080382C0: .4byte 0x02024938 -_080382C4: .4byte 0x020244ec -_080382C8: .4byte 0x02024744 + .pool _080382CC: bl sub_8032768 bl sub_8184E58 - ldr r3, _08038314 + ldr r3, =0x02024332 movs r0, 0 strb r0, [r3, 0x1] strb r0, [r3, 0x2] - ldr r0, _08038318 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 beq _08038326 movs r6, 0 - ldr r0, _0803831C + ldr r0, =0x020229e8 ldrb r1, [r0] adds r4, r3, 0 adds r2, r0, 0 @@ -115737,9 +112758,7 @@ _0803830A: strb r0, [r4] b _080383F8 .align 2, 0 -_08038314: .4byte 0x02024332 -_08038318: .4byte 0x02022fec -_0803831C: .4byte 0x020229e8 + .pool _08038320: movs r0, 0xA strb r0, [r4] @@ -115753,15 +112772,15 @@ _0803832C: lsls r0, 24 cmp r0, 0 beq _080383F8 - ldr r0, _08038360 + ldr r0, =0x0202449c ldr r4, [r0] movs r0, 0xC0 lsls r0, 1 adds r4, r0 - ldr r0, _08038364 + ldr r0, =0x02022fec ldr r0, [r0] str r0, [r4] - ldr r0, _08038368 + ldr r0, =0x0203bd2c ldr r0, [r0] str r0, [r4, 0x4] bl bitmask_all_link_players_but_self @@ -115772,9 +112791,7 @@ _0803832C: bl link_0800A448 b _080383A6 .align 2, 0 -_08038360: .4byte 0x0202449c -_08038364: .4byte 0x02022fec -_08038368: .4byte 0x0203bd2c + .pool _0803836C: bl sub_800A550 movs r1, 0xF @@ -115791,7 +112808,7 @@ _08038380: _08038386: cmp r2, 0x3 bhi _080383A6 - ldr r4, _080383B0 + ldr r4, =0x020223c4 lsls r3, r2, 8 adds r0, r3, r4 ldrh r0, [r0] @@ -115801,41 +112818,39 @@ _08038386: beq _08038380 adds r1, r4, 0x4 adds r1, r3, r1 - ldr r0, _080383B4 + ldr r0, =0x0203bd2c movs r2, 0x4 bl memcpy _080383A6: - ldr r1, _080383B8 + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _080383F8 .align 2, 0 -_080383B0: .4byte 0x020223c4 -_080383B4: .4byte 0x0203bd2c -_080383B8: .4byte 0x02024332 + .pool _080383BC: - ldr r0, _08038404 + ldr r0, =0x02024333 adds r1, r0, 0x1 bl battle_load_something lsls r0, 24 cmp r0, 0 beq _080383F8 - ldr r2, _08038408 - ldr r1, _0803840C + ldr r2, =0x03005d00 + ldr r1, =0x030022c0 ldr r0, [r1] str r0, [r2] - ldr r0, _08038410 + ldr r0, =sub_8039EF0 + 1 str r0, [r1] - ldr r0, _08038414 + ldr r0, =sub_8038420 + 1 bl set_callback2 - ldr r3, _08038418 + ldr r3, =0x02022fec ldr r2, [r3] movs r0, 0x2 ands r0, r2 cmp r0, 0 beq _080383F8 - ldr r0, _0803841C + ldr r0, =0x02038bca movs r4, 0x80 lsls r4, 4 adds r1, r4, 0 @@ -115851,13 +112866,7 @@ _080383F8: pop {r0} bx r0 .align 2, 0 -_08038404: .4byte 0x02024333 -_08038408: .4byte 0x03005d00 -_0803840C: .4byte 0x030022c0 -_08038410: .4byte sub_8039EF0 + 1 -_08038414: .4byte sub_8038420 + 1 -_08038418: .4byte 0x02022fec -_0803841C: .4byte 0x02038bca + .pool thumb_func_end sub_8037DF4 thumb_func_start sub_8038420 @@ -115869,13 +112878,13 @@ sub_8038420: @ 8038420 bl run_remoboxes bl fade_and_return_progress_probably bl run_active_tasks - ldr r0, _08038488 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _08038482 - ldr r0, _0803848C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -115886,8 +112895,8 @@ sub_8038420: @ 8038420 lsls r0, 24 cmp r0, 0 beq _08038482 - ldr r2, _08038490 - ldr r1, _08038494 + ldr r2, =0x020375f0 + ldr r1, =0x0202433a movs r0, 0x5 strb r0, [r1] movs r0, 0x5 @@ -115900,31 +112909,27 @@ sub_8038420: @ 8038420 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08038498 + ldr r0, =sub_80384E4 + 1 bl set_callback2 _08038482: add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08038488: .4byte 0x030022c0 -_0803848C: .4byte 0x02022fec -_08038490: .4byte 0x020375f0 -_08038494: .4byte 0x0202433a -_08038498: .4byte sub_80384E4 + 1 + .pool thumb_func_end sub_8038420 thumb_func_start sub_803849C sub_803849C: @ 803849C push {lr} - ldr r1, _080384D4 - ldr r0, _080384D8 + ldr r1, =0x030022c0 + ldr r0, =0x03005d00 ldr r0, [r0] str r0, [r1] - ldr r2, _080384DC + ldr r2, =0x02039b28 movs r0, 0x3 strb r0, [r2, 0x15] - ldr r0, _080384E0 + ldr r0, =0x00000439 adds r1, r0 ldrb r2, [r1] movs r0, 0x3 @@ -115940,57 +112945,51 @@ sub_803849C: @ 803849C pop {r0} bx r0 .align 2, 0 -_080384D4: .4byte 0x030022c0 -_080384D8: .4byte 0x03005d00 -_080384DC: .4byte 0x02039b28 -_080384E0: .4byte 0x00000439 + .pool thumb_func_end sub_803849C thumb_func_start sub_80384E4 sub_80384E4: @ 80384E4 push {lr} bl fade_and_return_progress_probably - ldr r0, _08038518 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08038512 - ldr r0, _0803851C + ldr r0, =0x030075f0 bl MPlayStop_rev01 - ldr r0, _08038520 + ldr r0, =0x03007630 bl MPlayStop_rev01 bl sub_803849C bl Window_FreeMemory - ldr r0, _08038524 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 _08038512: pop {r0} bx r0 .align 2, 0 -_08038518: .4byte 0x02037fd4 -_0803851C: .4byte 0x030075f0 -_08038520: .4byte 0x03007630 -_08038524: .4byte 0x030022c0 + .pool thumb_func_end sub_80384E4 thumb_func_start sub_8038528 sub_8038528: @ 8038528 movs r1, 0 strh r1, [r0, 0x2E] - ldr r1, _08038534 + ldr r1, =sub_8038538 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_08038534: .4byte sub_8038538 + 1 + .pool thumb_func_end sub_8038528 thumb_func_start sub_8038538 sub_8038538: @ 8038538 push {r4,r5,lr} adds r3, r0, 0 - ldr r5, _08038550 + ldr r5, =0x0201c000 movs r0, 0x2E ldrsh r1, [r3, r0] cmp r1, 0x1 @@ -116001,7 +113000,7 @@ sub_8038538: @ 8038538 beq _0803855A b _080385DC .align 2, 0 -_08038550: .4byte 0x0201c000 + .pool _08038554: cmp r1, 0x2 beq _080385C8 @@ -116011,7 +113010,7 @@ _0803855A: adds r0, 0x1 strh r0, [r3, 0x2E] strh r1, [r3, 0x30] - ldr r0, _080385C4 + ldr r0, =0x00000281 strh r0, [r3, 0x32] strh r1, [r3, 0x34] movs r0, 0x1 @@ -116062,7 +113061,7 @@ _0803859A: strh r0, [r3, 0x30] b _080385DC .align 2, 0 -_080385C4: .4byte 0x00000281 + .pool _080385C8: ldrh r0, [r3, 0x30] subs r0, 0x1 @@ -116071,14 +113070,14 @@ _080385C8: asrs r0, 16 cmp r0, 0x14 bne _080385DC - ldr r0, _080385E4 + ldr r0, =sub_8036760 + 1 bl set_callback2 _080385DC: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080385E4: .4byte sub_8036760 + 1 + .pool thumb_func_end sub_8038538 thumb_func_start sub_80385E8 @@ -116104,9 +113103,9 @@ sub_80385E8: @ 80385E8 movs r0, 0 b _080389E2 _08038610: - ldr r4, _0803865C + ldr r4, =0x02022fec ldr r0, [r4] - ldr r1, _08038660 + ldr r1, =0x043f0908 ands r0, r1 ldr r1, [sp, 0x14] lsls r1, 2 @@ -116125,7 +113124,7 @@ _0803862C: ands r0, r1 cmp r0, 0 beq _08038668 - ldr r0, _08038664 + ldr r0, =0x08310030 ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] adds r1, r2, r3 @@ -116143,11 +113142,9 @@ _0803862C: str r2, [sp, 0x1C] b _0803867C .align 2, 0 -_0803865C: .4byte 0x02022fec -_08038660: .4byte 0x043f0908 -_08038664: .4byte 0x08310030 + .pool _08038668: - ldr r1, _08038684 + ldr r1, =0x08310030 ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] adds r0, r2, r3 @@ -116162,7 +113159,7 @@ _0803867C: str r0, [sp, 0x18] b _080389B4 .align 2, 0 -_08038684: .4byte 0x08310030 + .pool _08038688: ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] @@ -116250,7 +113247,7 @@ _0803870E: ldrh r1, [r0, 0x4] movs r0, 0xB muls r0, r1 - ldr r1, _08038790 + ldr r1, =0x083185c8 adds r0, r1 ldrb r0, [r0] adds r5, r2, 0 @@ -116305,7 +113302,7 @@ _08038750: bl create_pokemon_set_level b _080389AC .align 2, 0 -_08038790: .4byte 0x083185c8 + .pool _08038794: adds r0, r4, 0 adds r0, 0x24 @@ -116318,7 +113315,7 @@ _08038794: ldrh r1, [r0, 0x4] movs r0, 0xB muls r0, r1 - ldr r1, _0803884C + ldr r1, =0x083185c8 adds r0, r1 ldrb r0, [r0] mov r8, r2 @@ -116389,7 +113386,7 @@ _08038820: lsls r2, r0, 1 adds r2, r0 lsls r2, 2 - ldr r0, _08038850 + ldr r0, =0x0831c89c adds r2, r0 adds r0, r5, 0 bl pokemon_setattr @@ -116399,8 +113396,7 @@ _08038820: ble _08038820 b _080389AC .align 2, 0 -_0803884C: .4byte 0x083185c8 -_08038850: .4byte 0x0831c89c + .pool _08038854: adds r0, r4, 0 adds r0, 0x24 @@ -116413,7 +113409,7 @@ _08038854: ldrh r1, [r0, 0x4] movs r0, 0xB muls r0, r1 - ldr r1, _080388E4 + ldr r1, =0x083185c8 adds r0, r1 ldrb r0, [r0] adds r5, r2, 0 @@ -116474,7 +113470,7 @@ _08038896: bl pokemon_setattr b _080389AC .align 2, 0 -_080388E4: .4byte 0x083185c8 + .pool _080388E8: adds r0, r4, 0 adds r0, 0x24 @@ -116487,7 +113483,7 @@ _080388E8: ldrh r1, [r0, 0x4] movs r0, 0xB muls r0, r1 - ldr r1, _080389F4 + ldr r1, =0x083185c8 adds r0, r1 ldrb r0, [r0] mov r8, r2 @@ -116564,7 +113560,7 @@ _08038982: lsls r2, r0, 1 adds r2, r0 lsls r2, 2 - ldr r0, _080389F8 + ldr r0, =0x0831c89c adds r2, r0 adds r0, r5, 0 bl pokemon_setattr @@ -116575,7 +113571,7 @@ _08038982: _080389AC: ldr r4, [sp, 0x24] str r4, [sp, 0x18] - ldr r4, _080389FC + ldr r4, =0x08310030 ldr r0, [sp, 0x18] _080389B4: ldr r1, [sp, 0x1C] @@ -116583,8 +113579,8 @@ _080389B4: bge _080389BC b _08038688 _080389BC: - ldr r2, _08038A00 - ldr r1, _080389FC + ldr r2, =0x02022fec + ldr r1, =0x08310030 ldr r3, [sp, 0x20] ldr r4, [sp, 0x14] adds r0, r3, r4 @@ -116595,7 +113591,7 @@ _080389BC: orrs r0, r1 str r0, [r2] _080389D2: - ldr r0, _080389FC + ldr r0, =0x08310030 ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] adds r1, r2, r3 @@ -116613,16 +113609,13 @@ _080389E2: pop {r1} bx r1 .align 2, 0 -_080389F4: .4byte 0x083185c8 -_080389F8: .4byte 0x0831c89c -_080389FC: .4byte 0x08310030 -_08038A00: .4byte 0x02022fec + .pool thumb_func_end sub_80385E8 thumb_func_start sub_8038A04 sub_8038A04: @ 8038A04 push {lr} - ldr r0, _08038A24 + ldr r0, =0x04000006 ldrh r0, [r0] subs r0, 0x6F lsls r0, 16 @@ -116637,65 +113630,65 @@ _08038A1E: pop {r0} bx r0 .align 2, 0 -_08038A24: .4byte 0x04000006 + .pool thumb_func_end sub_8038A04 thumb_func_start vblank_cb_08078BB4 vblank_cb_08078BB4: @ 8038A28 push {lr} - ldr r0, _08038AC8 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08038ACC + ldr r1, =0x013f0102 ands r0, r1 cmp r0, 0 bne _08038A3A bl GenerateRandomNumber _08038A3A: - ldr r0, _08038AD0 + ldr r0, =0x02022e14 ldrh r1, [r0] movs r0, 0x10 bl lcd_io_set - ldr r0, _08038AD4 + ldr r0, =0x02022e16 ldrh r1, [r0] movs r0, 0x12 bl lcd_io_set - ldr r0, _08038AD8 + ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 bl lcd_io_set - ldr r0, _08038ADC + ldr r0, =0x02022e1a ldrh r1, [r0] movs r0, 0x16 bl lcd_io_set - ldr r0, _08038AE0 + ldr r0, =0x02022e1c ldrh r1, [r0] movs r0, 0x18 bl lcd_io_set - ldr r0, _08038AE4 + ldr r0, =0x02022e1e ldrh r1, [r0] movs r0, 0x1A bl lcd_io_set - ldr r0, _08038AE8 + ldr r0, =0x02022e20 ldrh r1, [r0] movs r0, 0x1C bl lcd_io_set - ldr r0, _08038AEC + ldr r0, =0x02022e22 ldrh r1, [r0] movs r0, 0x1E bl lcd_io_set - ldr r0, _08038AF0 + ldr r0, =0x02022e24 ldrh r1, [r0] movs r0, 0x40 bl lcd_io_set - ldr r0, _08038AF4 + ldr r0, =0x02022e26 ldrh r1, [r0] movs r0, 0x44 bl lcd_io_set - ldr r0, _08038AF8 + ldr r0, =0x02022e28 ldrh r1, [r0] movs r0, 0x42 bl lcd_io_set - ldr r0, _08038AFC + ldr r0, =0x02022e2a ldrh r1, [r0] movs r0, 0x46 bl lcd_io_set @@ -116706,20 +113699,7 @@ _08038A3A: pop {r0} bx r0 .align 2, 0 -_08038AC8: .4byte 0x02022fec -_08038ACC: .4byte 0x013f0102 -_08038AD0: .4byte 0x02022e14 -_08038AD4: .4byte 0x02022e16 -_08038AD8: .4byte 0x02022e18 -_08038ADC: .4byte 0x02022e1a -_08038AE0: .4byte 0x02022e1c -_08038AE4: .4byte 0x02022e1e -_08038AE8: .4byte 0x02022e20 -_08038AEC: .4byte 0x02022e22 -_08038AF0: .4byte 0x02022e24 -_08038AF4: .4byte 0x02022e26 -_08038AF8: .4byte 0x02022e28 -_08038AFC: .4byte 0x02022e2a + .pool thumb_func_end vblank_cb_08078BB4 thumb_func_start nullsub_17 @@ -116769,7 +113749,7 @@ _08038B36: ands r0, r1 cmp r0, 0 beq _08038B6A - ldr r4, _08038B70 + ldr r4, =0x00002710 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -116783,7 +113763,7 @@ _08038B6A: pop {r0} bx r0 .align 2, 0 -_08038B70: .4byte 0x00002710 + .pool thumb_func_end sub_8038B04 thumb_func_start sub_8038B74 @@ -116792,7 +113772,7 @@ sub_8038B74: @ 8038B74 adds r4, r0, 0 movs r1, 0x1 bl sub_8008258 - ldr r0, _08038B90 + ldr r0, =sub_8038B04 + 1 str r0, [r4, 0x1C] movs r0, 0x68 bl audio_play @@ -116800,7 +113780,7 @@ sub_8038B74: @ 8038B74 pop {r0} bx r0 .align 2, 0 -_08038B90: .4byte sub_8038B04 + 1 + .pool thumb_func_end sub_8038B74 thumb_func_start sub_8038B94 @@ -116818,16 +113798,16 @@ sub_8038B94: @ 8038B94 str r0, [sp, 0x4] movs r1, 0 str r1, [sp, 0x8] - ldr r0, _08038BDC + ldr r0, =0x02024474 adds r0, 0x25 ldrb r2, [r0] - ldr r0, _08038BE0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _08038C04 - ldr r1, _08038BE4 + ldr r1, =0x020229e8 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -116841,27 +113821,24 @@ sub_8038B94: @ 8038B94 beq _08038C04 b _08038C0C .align 2, 0 -_08038BDC: .4byte 0x02024474 -_08038BE0: .4byte 0x02022fec -_08038BE4: .4byte 0x020229e8 + .pool _08038BE8: cmp r0, 0x2 beq _08038C04 cmp r0, 0x3 bne _08038C0C _08038BF0: - ldr r0, _08038BFC + ldr r0, =0x02024744 str r0, [sp, 0x4] - ldr r1, _08038C00 + ldr r1, =0x020244ec str r1, [sp, 0x8] b _08038C0C .align 2, 0 -_08038BFC: .4byte 0x02024744 -_08038C00: .4byte 0x020244ec + .pool _08038C04: - ldr r2, _08038D58 + ldr r2, =0x020244ec str r2, [sp, 0x4] - ldr r3, _08038D5C + ldr r3, =0x02024744 str r3, [sp, 0x8] _08038C0C: movs r7, 0 @@ -116939,7 +113916,7 @@ _08038C90: mov r0, r8 cmp r0, 0x5 ble _08038C20 - ldr r1, _08038D60 + ldr r1, =0x03005e00 ldr r2, [sp, 0xC] ldr r3, [sp] adds r0, r2, r3 @@ -117018,7 +113995,7 @@ _08038D2A: mov r1, r8 cmp r1, 0x5 ble _08038CBA - ldr r1, _08038D60 + ldr r1, =0x03005e00 ldr r2, [sp, 0xC] ldr r3, [sp] adds r0, r2, r3 @@ -117034,9 +114011,7 @@ _08038D2A: pop {r0} bx r0 .align 2, 0 -_08038D58: .4byte 0x020244ec -_08038D5C: .4byte 0x02024744 -_08038D60: .4byte 0x03005e00 + .pool thumb_func_end sub_8038B94 thumb_func_start sub_8038D64 @@ -117047,17 +114022,17 @@ sub_8038D64: @ 8038D64 bl SetHBlankCallback movs r0, 0 bl SetVBlankCallback - ldr r0, _08038DA0 + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x21 negs r2, r2 ands r1, r2 str r1, [r0] - ldr r0, _08038DA4 + ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 beq _08038DAC - ldr r0, _08038DA8 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 bl sub_8057028 @@ -117065,14 +114040,12 @@ sub_8038D64: @ 8038D64 bl sub_805F094 b _08038EB6 .align 2, 0 -_08038DA0: .4byte 0x02022fec -_08038DA4: .4byte 0x003f0100 -_08038DA8: .4byte 0x030022c0 + .pool _08038DAC: str r0, [sp] movs r1, 0xC0 lsls r1, 19 - ldr r2, _08038EC0 + ldr r2, =0x05006000 mov r0, sp bl CpuSet movs r0, 0x4C @@ -117081,7 +114054,7 @@ _08038DAC: movs r0, 0x40 movs r1, 0xF0 bl lcd_io_set - ldr r4, _08038EC4 + ldr r4, =0x00005051 movs r0, 0x44 adds r1, r4, 0 bl lcd_io_set @@ -117091,13 +114064,13 @@ _08038DAC: movs r0, 0x4A movs r1, 0 bl lcd_io_set - ldr r1, _08038EC8 + ldr r1, =0x02022e24 movs r0, 0xF0 strh r0, [r1] - ldr r0, _08038ECC + ldr r0, =0x02022e26 strh r4, [r0] bl dp12_8087EA4 - ldr r0, _08038ED0 + ldr r0, =0x02038c28 movs r3, 0xF0 movs r1, 0xF0 lsls r1, 3 @@ -117112,8 +114085,8 @@ _08038DFE: cmp r1, 0 bge _08038DFE movs r1, 0x50 - ldr r0, _08038ED0 - ldr r3, _08038ED4 + ldr r0, =0x02038c28 + ldr r3, =0x0000ff10 movs r4, 0x82 lsls r4, 4 adds r2, r0, r4 @@ -117127,25 +114100,25 @@ _08038E1A: cmp r1, 0x9F ble _08038E1A bl sub_80A1A74 - ldr r0, _08038ED8 + ldr r0, =0x02022e14 movs r4, 0 strh r4, [r0] - ldr r0, _08038EDC + ldr r0, =0x02022e16 strh r4, [r0] - ldr r0, _08038EE0 + ldr r0, =0x02022e18 strh r4, [r0] - ldr r0, _08038EE4 + ldr r0, =0x02022e1a strh r4, [r0] - ldr r0, _08038EE8 + ldr r0, =0x02022e1c strh r4, [r0] - ldr r0, _08038EEC + ldr r0, =0x02022e1e strh r4, [r0] - ldr r0, _08038EF0 + ldr r0, =0x02022e20 strh r4, [r0] - ldr r0, _08038EF4 + ldr r0, =0x02022e22 strh r4, [r0] bl c2_berry_program_update_menu - ldr r0, _08038EF8 + ldr r0, =0x08c004e0 movs r1, 0 movs r2, 0x40 bl decompress_palette @@ -117157,17 +114130,17 @@ _08038E1A: movs r1, 0x37 bl lcd_io_set bl gpu_pal_allocator_reset - ldr r1, _08038EFC + ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - ldr r0, _08038F00 + ldr r0, =vblank_cb_08078BB4 + 1 bl SetVBlankCallback - ldr r0, _08038F04 + ldr r0, =task00_0800F6FC + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08038F08 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -117180,9 +114153,9 @@ _08038E1A: movs r2, 0x1 strh r2, [r1, 0x12] bl sub_8038B94 - ldr r0, _08038F0C + ldr r0, =sub_8038F14 + 1 bl set_callback2 - ldr r0, _08038F10 + ldr r0, =0x02024332 strb r4, [r0] _08038EB6: add sp, 0x4 @@ -117190,27 +114163,7 @@ _08038EB6: pop {r0} bx r0 .align 2, 0 -_08038EC0: .4byte 0x05006000 -_08038EC4: .4byte 0x00005051 -_08038EC8: .4byte 0x02022e24 -_08038ECC: .4byte 0x02022e26 -_08038ED0: .4byte 0x02038c28 -_08038ED4: .4byte 0x0000ff10 -_08038ED8: .4byte 0x02022e14 -_08038EDC: .4byte 0x02022e16 -_08038EE0: .4byte 0x02022e18 -_08038EE4: .4byte 0x02022e1a -_08038EE8: .4byte 0x02022e1c -_08038EEC: .4byte 0x02022e1e -_08038EF0: .4byte 0x02022e20 -_08038EF4: .4byte 0x02022e22 -_08038EF8: .4byte 0x08c004e0 -_08038EFC: .4byte 0x0300301c -_08038F00: .4byte vblank_cb_08078BB4 + 1 -_08038F04: .4byte task00_0800F6FC + 1 -_08038F08: .4byte 0x03005e00 -_08038F0C: .4byte sub_8038F14 + 1 -_08038F10: .4byte 0x02024332 + .pool thumb_func_end sub_8038D64 thumb_func_start sub_8038F14 @@ -117230,7 +114183,7 @@ sub_8038F14: @ 8038F14 sub_8038F34: @ 8038F34 push {r4-r6,lr} sub sp, 0x8 - ldr r0, _08038F50 + ldr r0, =0x02024332 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x9 @@ -117238,13 +114191,12 @@ sub_8038F34: @ 8038F34 b _080391C6 _08038F44: lsls r0, r1, 2 - ldr r1, _08038F54 + ldr r1, =_08038F58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08038F50: .4byte 0x02024332 -_08038F54: .4byte _08038F58 + .pool .align 2, 0 _08038F58: .4byte _08038F80 @@ -117264,12 +114216,12 @@ _08038F80: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - ldr r1, _08038F9C + ldr r1, =0x02024332 movs r0, 0xFF strb r0, [r1, 0x1] b _08039174 .align 2, 0 -_08038F9C: .4byte 0x02024332 + .pool _08038FA0: ldrb r0, [r4, 0x1] subs r0, 0x1 @@ -117289,7 +114241,7 @@ _08038FB0: bl sub_80A1AD4 b _0803910C _08038FC2: - ldr r0, _08039050 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -117298,8 +114250,8 @@ _08038FC2: b _080391C6 _08038FD0: bl sub_8185FAC - ldr r2, _08039054 - ldr r1, _08039058 + ldr r2, =0x030022c0 + ldr r1, =0x00000439 adds r2, r1 movs r1, 0x1 ands r1, r0 @@ -117310,7 +114262,7 @@ _08038FD0: ands r0, r3 orrs r0, r1 strb r0, [r2] - ldr r0, _0803905C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -117320,10 +114272,10 @@ _08038FD0: movs r3, 0x4 _08038FFC: movs r4, 0 - ldr r6, _08039060 + ldr r6, =0x03005d90 cmp r4, r3 bge _08039022 - ldr r1, _08039064 + ldr r1, =0x020229e8 ldrb r0, [r1] cmp r0, 0x3 bne _08039022 @@ -117341,7 +114293,7 @@ _08039010: beq _08039010 _08039022: ldr r0, [r6] - ldr r1, _08039068 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r1, [r0] movs r0, 0x8 @@ -117350,28 +114302,20 @@ _08039022: bne _080390AC cmp r4, r3 bne _080390AC - ldr r0, _0803906C + ldr r0, =0x000008d2 bl flag_check lsls r0, 24 cmp r0, 0 beq _08039074 bl Window_FreeMemory - ldr r0, _08039070 + ldr r0, =sub_80392A8 + 1 bl set_callback2 b _080391C6 .align 2, 0 -_08039050: .4byte 0x02037fd4 -_08039054: .4byte 0x030022c0 -_08039058: .4byte 0x00000439 -_0803905C: .4byte 0x02022fec -_08039060: .4byte 0x03005d90 -_08039064: .4byte 0x020229e8 -_08039068: .4byte 0x00000ca9 -_0803906C: .4byte 0x000008d2 -_08039070: .4byte sub_80392A8 + 1 + .pool _08039074: - ldr r2, _08039088 - ldr r1, _0803908C + ldr r2, =0x030022c0 + ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x4 @@ -117381,22 +114325,20 @@ _08039074: ldr r0, [r2, 0x8] b _080390B0 .align 2, 0 -_08039088: .4byte 0x030022c0 -_0803908C: .4byte 0x00000439 + .pool _08039090: - ldr r0, _080390A4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08039172 - ldr r0, _080390A8 + ldr r0, =sub_80B3AF8 + 1 movs r1, 0x5 bl AddTask b _08039172 .align 2, 0 -_080390A4: .4byte 0x03003124 -_080390A8: .4byte sub_80B3AF8 + 1 + .pool _080390AC: - ldr r0, _080390C4 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] _080390B0: bl set_callback2 @@ -117405,13 +114347,13 @@ _080390B0: bl sub_805F094 b _080391C6 .align 2, 0 -_080390C4: .4byte 0x030022c0 + .pool _080390C8: movs r0, 0 str r0, [sp, 0x4] movs r1, 0xC0 lsls r1, 19 - ldr r2, _080390FC + ldr r2, =0x05006000 add r0, sp, 0x4 bl CpuSet movs r4, 0 @@ -117431,9 +114373,9 @@ _080390DA: bl sub_80A1AD4 b _08039172 .align 2, 0 -_080390FC: .4byte 0x05006000 + .pool _08039100: - ldr r0, _08039114 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -117445,16 +114387,16 @@ _0803910C: strb r0, [r4] b _080391C6 .align 2, 0 -_08039114: .4byte 0x02037fd4 + .pool _08039118: - ldr r0, _08039128 + ldr r0, =sub_80B3AF8 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 bne _080391C6 b _08039172 .align 2, 0 -_08039128: .4byte sub_80B3AF8 + 1 + .pool _0803912C: bl sub_800A520 lsls r0, 24 @@ -117462,12 +114404,12 @@ _0803912C: cmp r0, 0x1 bne _080391C6 bl sub_800ADF8 - ldr r0, _08039148 + ldr r0, =0x0824978d movs r1, 0 bl battle_show_message_maybe b _08039172 .align 2, 0 -_08039148: .4byte 0x0824978d + .pool _0803914C: movs r0, 0 bl a_pressed_maybe @@ -117481,24 +114423,23 @@ _0803914C: bne _080391C6 b _08039172 _08039166: - ldr r0, _0803917C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _08039172 bl sub_800AC34 _08039172: - ldr r1, _08039180 + ldr r1, =0x02024332 _08039174: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _080391C6 .align 2, 0 -_0803917C: .4byte 0x030030fc -_08039180: .4byte 0x02024332 + .pool _08039184: - ldr r2, _080391D0 - ldr r1, _080391D4 + ldr r2, =0x030022c0 + ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x4 @@ -117506,16 +114447,16 @@ _08039184: adds r3, r2, 0 cmp r0, 0 beq _080391A6 - ldr r0, _080391D8 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _080391A6 - ldr r0, _080391DC + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 beq _080391C6 _080391A6: - ldr r0, _080391D4 + ldr r0, =0x00000439 adds r2, r3, r0 ldrb r1, [r2] movs r0, 0x5 @@ -117533,10 +114474,7 @@ _080391C6: pop {r0} bx r0 .align 2, 0 -_080391D0: .4byte 0x030022c0 -_080391D4: .4byte 0x00000439 -_080391D8: .4byte 0x030030fc -_080391DC: .4byte 0x03003124 + .pool thumb_func_end sub_8038F34 thumb_func_start sub_80391E0 @@ -117550,12 +114488,12 @@ sub_80391E0: @ 80391E0 cmp r1, 0x6 bhi _080392A0 lsls r0, r1, 2 - ldr r1, _080391FC + ldr r1, =_08039200 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080391FC: .4byte _08039200 + .pool .align 2, 0 _08039200: .4byte _0803921C @@ -117566,7 +114504,7 @@ _08039200: .4byte _08039280 .4byte _08039294 _0803921C: - ldr r0, _0803922C + ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1] @@ -117574,9 +114512,9 @@ _0803921C: lsrs r0, 30 b _080392A0 .align 2, 0 -_0803922C: .4byte 0x0831aa08 + .pool _08039230: - ldr r0, _08039240 + ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1] @@ -117584,9 +114522,9 @@ _08039230: lsrs r0, 30 b _080392A0 .align 2, 0 -_08039240: .4byte 0x0831aa08 + .pool _08039244: - ldr r0, _08039254 + ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrh r0, [r1] @@ -117594,9 +114532,9 @@ _08039244: lsrs r0, 27 b _080392A0 .align 2, 0 -_08039254: .4byte 0x0831aa08 + .pool _08039258: - ldr r0, _08039268 + ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] @@ -117604,9 +114542,9 @@ _08039258: lsrs r0, 30 b _080392A0 .align 2, 0 -_08039268: .4byte 0x0831aa08 + .pool _0803926C: - ldr r0, _0803927C + ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] @@ -117614,9 +114552,9 @@ _0803926C: lsrs r0, 31 b _080392A0 .align 2, 0 -_0803927C: .4byte 0x0831aa08 + .pool _08039280: - ldr r0, _08039290 + ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] @@ -117624,9 +114562,9 @@ _08039280: lsrs r0, 30 b _080392A0 .align 2, 0 -_08039290: .4byte 0x0831aa08 + .pool _08039294: - ldr r0, _080392A4 + ldr r0, =0x0831aa08 lsls r1, r2, 2 adds r1, r0 ldr r0, [r1] @@ -117636,7 +114574,7 @@ _080392A0: pop {r1} bx r1 .align 2, 0 -_080392A4: .4byte 0x0831aa08 + .pool thumb_func_end sub_80391E0 thumb_func_start sub_80392A8 @@ -117651,25 +114589,25 @@ sub_80392A8: @ 80392A8 str r4, [sp, 0x4] movs r1, 0xC0 lsls r1, 19 - ldr r2, _08039348 + ldr r2, =0x05006000 add r0, sp, 0x4 bl CpuSet bl sub_80A1A74 - ldr r0, _0803934C + ldr r0, =0x02022e14 strh r4, [r0] - ldr r0, _08039350 + ldr r0, =0x02022e16 strh r4, [r0] - ldr r0, _08039354 + ldr r0, =0x02022e18 strh r4, [r0] - ldr r0, _08039358 + ldr r0, =0x02022e1a strh r4, [r0] - ldr r0, _0803935C + ldr r0, =0x02022e1c strh r4, [r0] - ldr r0, _08039360 + ldr r0, =0x02022e1e strh r4, [r0] - ldr r0, _08039364 + ldr r0, =0x02022e20 strh r4, [r0] - ldr r0, _08039368 + ldr r0, =0x02022e22 strh r4, [r0] bl c2_berry_program_update_menu movs r1, 0x82 @@ -117687,12 +114625,12 @@ _080392FE: bl reset_all_obj_data bl clear_tasks bl gpu_pal_allocator_reset - ldr r1, _0803936C + ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - ldr r0, _08039370 + ldr r0, =vblank_cb_08078BB4 + 1 bl SetVBlankCallback - ldr r0, _08039374 + ldr r0, =sub_803937C + 1 bl set_callback2 movs r0, 0x1 negs r0, r0 @@ -117702,26 +114640,14 @@ _080392FE: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _08039378 + ldr r0, =0x02024332 strb r4, [r0] add sp, 0x8 pop {r4} pop {r0} bx r0 .align 2, 0 -_08039348: .4byte 0x05006000 -_0803934C: .4byte 0x02022e14 -_08039350: .4byte 0x02022e16 -_08039354: .4byte 0x02022e18 -_08039358: .4byte 0x02022e1a -_0803935C: .4byte 0x02022e1c -_08039360: .4byte 0x02022e1e -_08039364: .4byte 0x02022e20 -_08039368: .4byte 0x02022e22 -_0803936C: .4byte 0x0300301c -_08039370: .4byte vblank_cb_08078BB4 + 1 -_08039374: .4byte sub_803937C + 1 -_08039378: .4byte 0x02024332 + .pool thumb_func_end sub_80392A8 thumb_func_start sub_803937C @@ -117741,7 +114667,7 @@ sub_803937C: @ 803937C sub_803939C: @ 803939C push {r4,r5,lr} sub sp, 0x4 - ldr r0, _080393B8 + ldr r0, =0x02024332 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0xC @@ -117749,13 +114675,12 @@ sub_803939C: @ 803939C b _0803975E _080393AC: lsls r0, r1, 2 - ldr r1, _080393BC + ldr r1, =_080393C0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080393B8: .4byte 0x02024332 -_080393BC: .4byte _080393C0 + .pool .align 2, 0 _080393C0: .4byte _080393F4 @@ -117778,56 +114703,51 @@ _080393F4: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - ldr r1, _08039410 + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 b _0803975C .align 2, 0 -_08039410: .4byte 0x02024332 + .pool _08039414: - ldr r0, _0803943C - ldr r1, _08039440 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 cmp r0, 0 beq _08039434 - ldr r0, _08039444 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08039434 - ldr r0, _08039448 + ldr r0, =sub_80B3AF8 + 1 movs r1, 0x5 bl AddTask _08039434: - ldr r1, _0803944C + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 b _0803975C .align 2, 0 -_0803943C: .4byte 0x030022c0 -_08039440: .4byte 0x00000439 -_08039444: .4byte 0x03003124 -_08039448: .4byte sub_80B3AF8 + 1 -_0803944C: .4byte 0x02024332 + .pool _08039450: - ldr r0, _08039468 + ldr r0, =sub_80B3AF8 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 beq _0803945E b _0803975E _0803945E: - ldr r1, _0803946C + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 b _0803975C .align 2, 0 -_08039468: .4byte sub_80B3AF8 + 1 -_0803946C: .4byte 0x02024332 + .pool _08039470: - ldr r0, _08039490 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -117835,17 +114755,15 @@ _08039470: beq _0803947E b _0803975E _0803947E: - ldr r0, _08039494 + ldr r0, =0x085cd28f movs r1, 0 bl battle_show_message_maybe - ldr r1, _08039498 + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 b _0803975C .align 2, 0 -_08039490: .4byte 0x02037fd4 -_08039494: .4byte 0x085cd28f -_08039498: .4byte 0x02024332 + .pool _0803949C: movs r0, 0 bl a_pressed_maybe @@ -117861,19 +114779,18 @@ _080394AC: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, _080394D0 + ldr r0, =0x085ccabb movs r1, 0xC bl battle_show_message_maybe - ldr r4, _080394D4 + ldr r4, =0x02024332 movs r0, 0x1 strb r0, [r4, 0x1] bl sub_8056B74 b _080396EA .align 2, 0 -_080394D0: .4byte 0x085ccabb -_080394D4: .4byte 0x02024332 + .pool _080394D8: - ldr r0, _080394FC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -117891,7 +114808,7 @@ _080394EC: movs r0, 0 b _0803951E .align 2, 0 -_080394FC: .4byte 0x030022c0 + .pool _08039500: movs r0, 0x80 ands r0, r1 @@ -117919,7 +114836,7 @@ _08039526: beq _08039560 movs r0, 0x5 bl audio_play - ldr r4, _0803955C + ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 beq _08039540 @@ -117937,7 +114854,7 @@ _08039540: strb r0, [r4] b _0803975E .align 2, 0 -_0803955C: .4byte 0x02024332 + .pool _08039560: movs r0, 0x2 ands r0, r1 @@ -117947,12 +114864,12 @@ _08039560: _0803956A: movs r0, 0x5 bl audio_play - ldr r1, _08039578 + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 b _0803975C .align 2, 0 -_08039578: .4byte 0x02024332 + .pool _0803957C: bl sub_800A520 lsls r0, 24 @@ -117967,8 +114884,8 @@ _0803958A: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, _080395BC - ldr r1, _080395C0 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x4 @@ -117976,19 +114893,16 @@ _0803958A: cmp r0, 0 beq _080395B4 bl sub_800ADF8 - ldr r0, _080395C4 + ldr r0, =0x0824978d movs r1, 0 bl battle_show_message_maybe _080395B4: - ldr r1, _080395C8 + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 b _0803975C .align 2, 0 -_080395BC: .4byte 0x030022c0 -_080395C0: .4byte 0x00000439 -_080395C4: .4byte 0x0824978d -_080395C8: .4byte 0x02024332 + .pool _080395CC: ldrb r0, [r4, 0x1] subs r0, 0x1 @@ -117998,32 +114912,29 @@ _080395CC: beq _080395DA b _0803975E _080395DA: - ldr r0, _08039600 - ldr r1, _08039604 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 cmp r0, 0 beq _080395F6 - ldr r0, _08039608 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _080395F6 bl sub_800AC34 _080395F6: - ldr r1, _0803960C + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 b _0803975C .align 2, 0 -_08039600: .4byte 0x030022c0 -_08039604: .4byte 0x00000439 -_08039608: .4byte 0x030030fc -_0803960C: .4byte 0x02024332 + .pool _08039610: - ldr r2, _08039664 - ldr r1, _08039668 + ldr r2, =0x030022c0 + ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x4 @@ -118031,24 +114942,24 @@ _08039610: adds r3, r2, 0 cmp r0, 0 beq _08039634 - ldr r0, _0803966C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _08039634 - ldr r0, _08039670 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 bne _08039634 b _0803975E _08039634: - ldr r0, _08039668 + ldr r0, =0x00000439 adds r2, r3, r0 ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _08039674 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -118063,34 +114974,29 @@ _08039650: bl sub_805F094 b _0803975E .align 2, 0 -_08039664: .4byte 0x030022c0 -_08039668: .4byte 0x00000439 -_0803966C: .4byte 0x030030fc -_08039670: .4byte 0x03003124 -_08039674: .4byte 0x02037fd4 + .pool _08039678: ldrb r0, [r4, 0x1] cmp r0, 0x1 bne _080396A0 movs r0, 0x37 bl audio_play - ldr r0, _08039698 + ldr r0, =0x085cd2cb _08039686: bl sub_814E6F0 - ldr r0, _0803969C + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe movs r0, 0x80 strb r0, [r4, 0x1] b _080396EA .align 2, 0 -_08039698: .4byte 0x085cd2cb -_0803969C: .4byte 0x02022e2c + .pool _080396A0: - ldr r0, _080396A4 + ldr r0, =0x08242481 b _08039686 .align 2, 0 -_080396A4: .4byte 0x08242481 + .pool _080396A8: bl sub_800A520 lsls r0, 24 @@ -118102,15 +115008,15 @@ _080396A8: lsls r0, 16 cmp r0, 0 bne _0803975E - ldr r4, _080396F4 + ldr r4, =0x02024332 ldrb r0, [r4, 0x1] subs r0, 0x1 strb r0, [r4, 0x1] lsls r0, 24 cmp r0, 0 bne _0803975E - ldr r0, _080396F8 - ldr r1, _080396FC + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x4 @@ -118118,7 +115024,7 @@ _080396A8: cmp r0, 0 beq _080396EA bl sub_800ADF8 - ldr r0, _08039700 + ldr r0, =0x0824978d movs r1, 0 bl battle_show_message_maybe _080396EA: @@ -118127,10 +115033,7 @@ _080396EA: strb r0, [r4] b _0803975E .align 2, 0 -_080396F4: .4byte 0x02024332 -_080396F8: .4byte 0x030022c0 -_080396FC: .4byte 0x00000439 -_08039700: .4byte 0x0824978d + .pool _08039704: movs r0, 0 bl a_pressed_maybe @@ -118138,8 +115041,8 @@ _08039704: lsrs r4, r0, 16 cmp r4, 0 bne _0803975E - ldr r0, _0803973C - ldr r1, _08039740 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x4 @@ -118158,8 +115061,7 @@ _08039704: str r4, [sp] b _0803974A .align 2, 0 -_0803973C: .4byte 0x030022c0 -_08039740: .4byte 0x00000439 + .pool _08039744: movs r0, 0x1 negs r0, r0 @@ -118169,7 +115071,7 @@ _0803974A: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _08039768 + ldr r1, =0x02024332 movs r0, 0x20 strb r0, [r1, 0x1] movs r0, 0x8 @@ -118181,7 +115083,7 @@ _0803975E: pop {r0} bx r0 .align 2, 0 -_08039768: .4byte 0x02024332 + .pool thumb_func_end sub_803939C thumb_func_start shedinja_something @@ -118195,7 +115097,7 @@ shedinja_something: @ 803976C adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr - ldr r1, _080397BC + ldr r1, =0x0000012f cmp r0, r1 bne _080397B4 adds r0, r4, 0 @@ -118208,7 +115110,7 @@ shedinja_something: @ 803976C movs r1, 0x2 mov r2, sp bl pokemon_getattr - ldr r1, _080397C0 + ldr r1, =0x0831aca0 mov r0, sp bl sub_80092BC cmp r0, 0 @@ -118223,13 +115125,12 @@ _080397B4: pop {r0} bx r0 .align 2, 0 -_080397BC: .4byte 0x0000012f -_080397C0: .4byte 0x0831aca0 + .pool thumb_func_end shedinja_something thumb_func_start sub_80397C4 sub_80397C4: @ 80397C4 - ldr r2, _080397D8 + ldr r2, =0x0831aba0 lsls r0, 2 adds r0, r2 ldr r0, [r0] @@ -118239,20 +115140,20 @@ sub_80397C4: @ 80397C4 lsls r0, 3 bx lr .align 2, 0 -_080397D8: .4byte 0x0831aba0 + .pool thumb_func_end sub_80397C4 thumb_func_start oac_poke_opponent oac_poke_opponent: @ 80397DC push {lr} sub sp, 0x4 - ldr r1, _08039804 + ldr r1, =sub_803980C + 1 str r1, [r0, 0x1C] movs r1, 0 bl obj_anim_image_start_if_different movs r0, 0x80 lsls r0, 10 - ldr r1, _08039808 + ldr r1, =0x00002108 str r1, [sp] movs r1, 0 movs r2, 0xA @@ -118262,15 +115163,14 @@ oac_poke_opponent: @ 80397DC pop {r0} bx r0 .align 2, 0 -_08039804: .4byte sub_803980C + 1 -_08039808: .4byte 0x00002108 + .pool thumb_func_end oac_poke_opponent thumb_func_start sub_803980C sub_803980C: @ 803980C push {lr} adds r2, r0, 0 - ldr r0, _08039830 + ldr r0, =0x020243fc ldrh r1, [r0] movs r0, 0x1 ands r0, r1 @@ -118282,14 +115182,13 @@ sub_803980C: @ 803980C lsls r0, 16 cmp r0, 0 bne _0803982C - ldr r0, _08039834 + ldr r0, =sub_8039838 + 1 str r0, [r2, 0x1C] _0803982C: pop {r0} bx r0 .align 2, 0 -_08039830: .4byte 0x020243fc -_08039834: .4byte sub_8039838 + 1 + .pool thumb_func_end sub_803980C thumb_func_start sub_8039838 @@ -118307,20 +115206,20 @@ sub_8039838: @ 8039838 lsls r0, 24 lsrs r0, 24 bl sub_8076918 - ldr r1, _08039888 + ldr r1, =0x03005d70 movs r2, 0x2E ldrsh r0, [r4, r2] adds r0, r1 ldrb r0, [r0] bl sub_80729D0 - ldr r0, _0803988C + ldr r0, =sub_8039894 + 1 str r0, [r4, 0x1C] adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start_if_different movs r0, 0x80 lsls r0, 10 - ldr r1, _08039890 + ldr r1, =0x00002108 str r1, [sp] movs r1, 0 movs r2, 0xA @@ -118332,16 +115231,14 @@ _08039880: pop {r0} bx r0 .align 2, 0 -_08039888: .4byte 0x03005d70 -_0803988C: .4byte sub_8039894 + 1 -_08039890: .4byte 0x00002108 + .pool thumb_func_end sub_8039838 thumb_func_start sub_8039894 sub_8039894: @ 8039894 push {lr} adds r2, r0, 0 - ldr r0, _080398B4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -118356,7 +115253,7 @@ _080398B0: pop {r0} bx r0 .align 2, 0 -_080398B4: .4byte 0x02037fd4 + .pool thumb_func_end sub_8039894 thumb_func_start nullsub_18 @@ -118370,11 +115267,11 @@ sub_80398BC: @ 80398BC strh r1, [r0, 0x34] movs r1, 0x1 strh r1, [r0, 0x36] - ldr r1, _080398CC + ldr r1, =sub_80398D0 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_080398CC: .4byte sub_80398D0 + 1 + .pool thumb_func_end sub_80398BC thumb_func_start sub_80398D0 @@ -118417,17 +115314,16 @@ sub_80398D0: @ 80398D0 ands r0, r1 mov r1, r12 strb r0, [r1] - ldr r0, _0803992C + ldr r0, =nullsub_18 + 1 str r0, [r3, 0x1C] - ldr r0, _08039930 + ldr r0, =0x02022f88 str r2, [r0] _08039924: pop {r4} pop {r0} bx r0 .align 2, 0 -_0803992C: .4byte nullsub_18 + 1 -_08039930: .4byte 0x02022f88 + .pool thumb_func_end sub_80398D0 thumb_func_start sub_8039934 @@ -118440,7 +115336,7 @@ sub_8039934: @ 8039934 ldrh r0, [r0, 0x2E] lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08039958 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r6, 2 @@ -118451,12 +115347,12 @@ sub_8039934: @ 8039934 adds r4, r0, 0 b _08039960 .align 2, 0 -_08039958: .4byte 0x020244d0 + .pool _0803995C: mov r0, r9 ldrh r4, [r0, 0x32] _08039960: - ldr r1, _080399C8 + ldr r1, =0x0202406e lsls r0, r6, 1 adds r5, r0, r1 ldrh r0, [r5] @@ -118465,7 +115361,7 @@ _08039960: mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r7, _080399CC + ldr r7, =0x02024744 adds r0, r7 movs r1, 0 bl pokemon_getattr @@ -118505,8 +115401,7 @@ _08039960: movs r0, 0xC9 b _080399DA .align 2, 0 -_080399C8: .4byte 0x0202406e -_080399CC: .4byte 0x02024744 + .pool _080399D0: movs r1, 0xCE lsls r1, 1 @@ -118514,17 +115409,17 @@ _080399D0: lsls r0, 16 lsrs r0, 16 _080399DA: - ldr r1, _080399E0 + ldr r1, =0x08300d38 lsls r0, 2 b _08039A1C .align 2, 0 -_080399E0: .4byte 0x08300d38 + .pool _080399E4: - ldr r0, _080399FC + ldr r0, =0x00000181 cmp r4, r0 bne _08039A08 - ldr r0, _08039A00 - ldr r1, _08039A04 + ldr r0, =0x08525f78 + ldr r1, =0x020244e4 adds r1, r6, r1 ldrb r1, [r1] lsls r1, 2 @@ -118532,20 +115427,18 @@ _080399E4: ldrb r0, [r1, 0x1] b _08039A20 .align 2, 0 -_080399FC: .4byte 0x00000181 -_08039A00: .4byte 0x08525f78 -_08039A04: .4byte 0x020244e4 + .pool _08039A08: movs r0, 0xCE lsls r0, 1 cmp r4, r0 bls _08039A18 - ldr r0, _08039A14 + ldr r0, =0x08300d38 b _08039A1E .align 2, 0 -_08039A14: .4byte 0x08300d38 + .pool _08039A18: - ldr r1, _08039A40 + ldr r1, =0x08300d38 lsls r0, r4, 2 _08039A1C: adds r0, r1 @@ -118559,7 +115452,7 @@ _08039A20: strh r0, [r1, 0x34] movs r0, 0x1 strh r0, [r1, 0x36] - ldr r0, _08039A44 + ldr r0, =sub_8039A48 + 1 str r0, [r1, 0x1C] pop {r3,r4} mov r8, r3 @@ -118568,8 +115461,7 @@ _08039A20: pop {r0} bx r0 .align 2, 0 -_08039A40: .4byte 0x08300d38 -_08039A44: .4byte sub_8039A48 + 1 + .pool thumb_func_end sub_8039934 thumb_func_start sub_8039A48 @@ -118603,13 +115495,13 @@ _08039A7C: lsls r0, 24 lsrs r0, 24 bl battle_get_per_side_status - ldr r1, _08039AD0 + ldr r1, =0x020244d4 ldr r1, [r1] lsls r0, 24 lsrs r0, 22 adds r1, 0x4 adds r1, r0 - ldr r2, _08039AD4 + ldr r2, =0x020244e4 movs r3, 0x2E ldrsh r0, [r4, r3] adds r0, r2 @@ -118629,7 +115521,7 @@ _08039AAE: subs r0, 0x1 cmp r0, 0 bge _08039AAE - ldr r0, _08039AD4 + ldr r0, =0x020244e4 movs r3, 0x2E ldrsh r1, [r4, r3] adds r1, r0 @@ -118641,8 +115533,7 @@ _08039AC8: pop {r0} bx r0 .align 2, 0 -_08039AD0: .4byte 0x020244d4 -_08039AD4: .4byte 0x020244e4 + .pool thumb_func_end sub_8039A48 thumb_func_start sub_8039AD8 @@ -118655,11 +115546,11 @@ sub_8039AD8: @ 8039AD8 lsls r1, 29 lsrs r1, 31 strh r1, [r0, 0x36] - ldr r1, _08039AF0 + ldr r1, =sub_8039AF4 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_08039AF0: .4byte sub_8039AF4 + 1 + .pool thumb_func_end sub_8039AD8 thumb_func_start sub_8039AF4 @@ -118713,11 +115604,11 @@ sub_8039B2C: @ 8039B2C strb r1, [r2] movs r1, 0 strh r1, [r0, 0x36] - ldr r1, _08039B54 + ldr r1, =nullsub_18 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_08039B54: .4byte nullsub_18 + 1 + .pool thumb_func_end sub_8039B2C thumb_func_start sub_8039B58 @@ -118730,15 +115621,15 @@ sub_8039B58: @ 8039B58 ands r0, r1 cmp r0, 0 beq _08039BA0 - ldr r0, _08039BA8 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 beq _08039B80 - ldr r0, _08039BAC + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08039BB0 + ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 beq _08039B94 @@ -118762,25 +115653,23 @@ _08039BA0: pop {r0} bx r0 .align 2, 0 -_08039BA8: .4byte 0x02024280 -_08039BAC: .4byte 0x02022fec -_08039BB0: .4byte 0x02000002 + .pool thumb_func_end sub_8039B58 thumb_func_start sub_8039BB4 sub_8039BB4: @ 8039BB4 - ldr r1, _08039BBC + ldr r1, =oac_poke_ally_ + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_08039BBC: .4byte oac_poke_ally_ + 1 + .pool thumb_func_end sub_8039BB4 thumb_func_start oac_poke_ally_ oac_poke_ally_: @ 8039BC0 push {lr} adds r2, r0, 0 - ldr r0, _08039BE8 + ldr r0, =0x020243fc ldrh r1, [r0] movs r0, 0x1 ands r0, r1 @@ -118793,24 +115682,23 @@ oac_poke_ally_: @ 8039BC0 asrs r1, r0, 16 cmp r1, 0 bne _08039BE4 - ldr r0, _08039BEC + ldr r0, =nullsub_19 + 1 str r0, [r2, 0x1C] strh r1, [r2, 0x30] _08039BE4: pop {r0} bx r0 .align 2, 0 -_08039BE8: .4byte 0x020243fc -_08039BEC: .4byte nullsub_19 + 1 + .pool thumb_func_end oac_poke_ally_ thumb_func_start sub_8039BF0 sub_8039BF0: @ 8039BF0 - ldr r1, _08039BF8 + ldr r1, =nullsub_19 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_08039BF8: .4byte nullsub_19 + 1 + .pool thumb_func_end sub_8039BF0 thumb_func_start nullsub_19 @@ -118822,7 +115710,7 @@ nullsub_19: @ 8039BFC sub_8039C00: @ 8039C00 push {lr} adds r2, r0, 0 - ldr r0, _08039C24 + ldr r0, =0x020243fc ldrh r1, [r0] movs r0, 0x1 ands r0, r1 @@ -118840,7 +115728,7 @@ _08039C20: pop {r0} bx r0 .align 2, 0 -_08039C24: .4byte 0x020243fc + .pool thumb_func_end sub_8039C00 thumb_func_start dp11b_obj_instanciate @@ -118863,7 +115751,7 @@ dp11b_obj_instanciate: @ 8039C28 mov r10, r3 cmp r1, 0 beq _08039C64 - ldr r0, _08039C60 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r2, r4, 1 @@ -118874,9 +115762,9 @@ dp11b_obj_instanciate: @ 8039C28 movs r0, 0x2 b _08039C76 .align 2, 0 -_08039C60: .4byte 0x020244d0 + .pool _08039C64: - ldr r0, _08039CC0 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r2, r4, 1 @@ -118890,17 +115778,17 @@ _08039C76: adds r6, r2, 0 cmp r0, 0 bne _08039D2C - ldr r0, _08039CC4 + ldr r0, =objc_dp11b_pingpong + 1 bl object_new_hidden_with_callback lsls r0, 24 lsrs r5, r0, 24 mov r0, r8 cmp r0, 0x1 bne _08039CD0 - ldr r0, _08039CC8 + ldr r0, =0x03005d70 adds r0, r4, r0 ldrb r7, [r0] - ldr r2, _08039CC0 + ldr r2, =0x020244d0 ldr r0, [r2] ldr r0, [r0, 0x4] adds r1, r6, r4 @@ -118914,7 +115802,7 @@ _08039C76: movs r2, 0x2 orrs r0, r2 strb r0, [r1] - ldr r2, _08039CCC + ldr r2, =0x02020630 lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -118922,15 +115810,12 @@ _08039C76: movs r1, 0x80 b _08039CFE .align 2, 0 -_08039CC0: .4byte 0x020244d0 -_08039CC4: .4byte objc_dp11b_pingpong + 1 -_08039CC8: .4byte 0x03005d70 -_08039CCC: .4byte 0x02020630 + .pool _08039CD0: - ldr r0, _08039D3C + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r7, [r0] - ldr r2, _08039D40 + ldr r2, =0x020244d0 ldr r0, [r2] ldr r0, [r0, 0x4] adds r1, r6, r4 @@ -118944,7 +115829,7 @@ _08039CD0: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r2, _08039D44 + ldr r2, =0x02020630 lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -118983,9 +115868,7 @@ _08039D2C: pop {r0} bx r0 .align 2, 0 -_08039D3C: .4byte 0x020241e4 -_08039D40: .4byte 0x020244d0 -_08039D44: .4byte 0x02020630 + .pool thumb_func_end dp11b_obj_instanciate thumb_func_start dp11b_obj_free @@ -118997,7 +115880,7 @@ dp11b_obj_free: @ 8039D48 lsrs r1, 24 cmp r1, 0x1 bne _08039D9C - ldr r6, _08039D94 + ldr r6, =0x020244d0 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -119009,7 +115892,7 @@ dp11b_obj_free: @ 8039D48 ands r0, r1 cmp r0, 0 beq _08039DEA - ldr r2, _08039D98 + ldr r2, =0x02020630 ldrb r1, [r3, 0x2] lsls r0, r1, 4 adds r0, r1 @@ -119027,10 +115910,9 @@ dp11b_obj_free: @ 8039D48 negs r0, r0 b _08039DD6 .align 2, 0 -_08039D94: .4byte 0x020244d0 -_08039D98: .4byte 0x02020630 + .pool _08039D9C: - ldr r6, _08039DF0 + ldr r6, =0x020244d0 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -119042,7 +115924,7 @@ _08039D9C: ands r0, r1 cmp r0, 0 beq _08039DEA - ldr r2, _08039DF4 + ldr r2, =0x02020630 ldrb r1, [r3, 0x3] lsls r0, r1, 4 adds r0, r1 @@ -119061,7 +115943,7 @@ _08039D9C: _08039DD6: ands r0, r2 strb r0, [r1] - ldr r0, _08039DF4 + ldr r0, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -119074,8 +115956,7 @@ _08039DEA: pop {r0} bx r0 .align 2, 0 -_08039DF0: .4byte 0x020244d0 -_08039DF4: .4byte 0x02020630 + .pool thumb_func_end dp11b_obj_free thumb_func_start objc_dp11b_pingpong @@ -119099,7 +115980,7 @@ _08039E14: movs r2, 0x32 ldrsh r1, [r4, r2] bl sine - ldr r2, _08039E40 + ldr r2, =0x02020630 lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -119117,7 +115998,7 @@ _08039E14: pop {r0} bx r0 .align 2, 0 -_08039E40: .4byte 0x02020630 + .pool thumb_func_end objc_dp11b_pingpong thumb_func_start sub_8039E44 @@ -119150,14 +116031,14 @@ sub_8039E60: @ 8039E60 ands r0, r1 cmp r0, 0 beq _08039E7A - ldr r0, _08039E80 + ldr r0, =nullsub_19 + 1 str r0, [r4, 0x1C] _08039E7A: pop {r4} pop {r0} bx r0 .align 2, 0 -_08039E80: .4byte nullsub_19 + 1 + .pool thumb_func_end sub_8039E60 thumb_func_start sub_8039E84 @@ -119166,13 +116047,13 @@ sub_8039E84: @ 8039E84 adds r4, r0, 0 movs r1, 0x1 bl obj_anim_image_start - ldr r0, _08039E98 + ldr r0, =sub_8039E60 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08039E98: .4byte sub_8039E60 + 1 + .pool thumb_func_end sub_8039E84 thumb_func_start sub_8039E9C @@ -119185,7 +116066,7 @@ sub_8039E9C: @ 8039E9C ands r0, r1 cmp r0, 0 bne _08039EBE - ldr r1, _08039EC4 + ldr r1, =0x0831ace0 adds r0, r2, 0 adds r0, 0x2B ldrb r0, [r0] @@ -119198,7 +116079,7 @@ _08039EBE: pop {r0} bx r0 .align 2, 0 -_08039EC4: .4byte 0x0831ace0 + .pool thumb_func_end sub_8039E9C thumb_func_start nullsub_20 @@ -119210,34 +116091,32 @@ nullsub_20: @ 8039EC8 sub_8039ECC: @ 8039ECC push {lr} bl sub_8039F40 - ldr r1, _08039EE4 + ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x1] - ldr r1, _08039EE8 - ldr r0, _08039EEC + ldr r1, =0x03005d04 + ldr r0, =bc_8012FAC + 1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08039EE4: .4byte 0x02024332 -_08039EE8: .4byte 0x03005d04 -_08039EEC: .4byte bc_8012FAC + 1 + .pool thumb_func_end sub_8039ECC thumb_func_start sub_8039EF0 sub_8039EF0: @ 8039EF0 push {r4,r5,lr} - ldr r0, _08039F30 + ldr r0, =0x03005d04 ldr r0, [r0] bl _call_via_r0 - ldr r1, _08039F34 + ldr r1, =0x02024064 movs r0, 0 strb r0, [r1] - ldr r0, _08039F38 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0 beq _08039F2A - ldr r5, _08039F3C + ldr r5, =0x03005d60 adds r4, r1, 0 _08039F0C: ldrb r0, [r4] @@ -119248,7 +116127,7 @@ _08039F0C: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _08039F38 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -119259,10 +116138,7 @@ _08039F2A: pop {r0} bx r0 .align 2, 0 -_08039F30: .4byte 0x03005d04 -_08039F34: .4byte 0x02024064 -_08039F38: .4byte 0x0202406c -_08039F3C: .4byte 0x03005d60 + .pool thumb_func_end sub_8039EF0 thumb_func_start sub_8039F40 @@ -119277,20 +116153,20 @@ sub_8039F40: @ 8039F40 bl sub_803D6A0 movs r2, 0 movs r3, 0 - ldr r0, _0803A03C + ldr r0, =0x02024260 mov r10, r0 - ldr r1, _0803A040 + ldr r1, =0x02024258 mov r9, r1 - ldr r0, _0803A044 + ldr r0, =0x02024250 mov r8, r0 - ldr r1, _0803A048 + ldr r1, =0x02024248 mov r12, r1 - ldr r5, _0803A04C + ldr r5, =0x020242bc movs r4, 0 - ldr r7, _0803A050 - ldr r6, _0803A054 + ldr r7, =0x02024240 + ldr r6, =0x02024268 _08039F70: - ldr r0, _0803A058 + ldr r0, =0x020242ac adds r0, r4, r0 str r3, [r0] movs r1, 0 @@ -119302,7 +116178,7 @@ _08039F78: bls _08039F78 movs r0, 0x2 strb r0, [r5, 0x16] - ldr r1, _0803A05C + ldr r1, =0x02024284 adds r0, r2, r1 strb r3, [r0] mov r0, r12 @@ -119313,18 +116189,18 @@ _08039F78: strh r3, [r0] mov r1, r10 strh r3, [r1] - ldr r0, _0803A060 + ldr r0, =0x02024270 adds r1, r2, r0 movs r0, 0xFF strb r0, [r1] strh r3, [r6] strh r3, [r7] - ldr r1, _0803A064 + ldr r1, =0x020244a8 ldr r0, [r1] ldr r0, [r0, 0x4] adds r0, r4 str r3, [r0] - ldr r1, _0803A068 + ldr r1, =0x02024230 adds r0, r4, r1 str r3, [r0] movs r0, 0x2 @@ -119340,8 +116216,8 @@ _08039F78: cmp r2, 0x3 ble _08039F70 movs r5, 0 - ldr r3, _0803A06C - ldr r4, _0803A070 + ldr r3, =0x02024294 + ldr r4, =0x0202428e movs r2, 0x1 _08039FD8: strh r5, [r4] @@ -119358,13 +116234,13 @@ _08039FDC: cmp r2, 0 bge _08039FD8 movs r1, 0 - ldr r2, _0803A074 + ldr r2, =0x0202420b strb r1, [r2] - ldr r0, _0803A078 + ldr r0, =0x0202420c strb r1, [r0] - ldr r2, _0803A07C + ldr r2, =0x020243cc strh r1, [r2] - ldr r1, _0803A080 + ldr r1, =0x020243d0 movs r2, 0 movs r3, 0 _0803A004: @@ -119373,10 +116249,10 @@ _0803A004: adds r2, 0x1 cmp r2, 0x2B bls _0803A004 - ldr r2, _0803A084 + ldr r2, =0x02024280 movs r0, 0 str r0, [r2] - ldr r0, _0803A088 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 17 @@ -119387,7 +116263,7 @@ _0803A004: ands r1, r0 cmp r1, 0 bne _0803A0AE - ldr r0, _0803A08C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r1, [r0, 0x15] movs r0, 0x4 @@ -119397,29 +116273,9 @@ _0803A004: movs r0, 0x80 b _0803A0AC .align 2, 0 -_0803A03C: .4byte 0x02024260 -_0803A040: .4byte 0x02024258 -_0803A044: .4byte 0x02024250 -_0803A048: .4byte 0x02024248 -_0803A04C: .4byte 0x020242bc -_0803A050: .4byte 0x02024240 -_0803A054: .4byte 0x02024268 -_0803A058: .4byte 0x020242ac -_0803A05C: .4byte 0x02024284 -_0803A060: .4byte 0x02024270 -_0803A064: .4byte 0x020244a8 -_0803A068: .4byte 0x02024230 -_0803A06C: .4byte 0x02024294 -_0803A070: .4byte 0x0202428e -_0803A074: .4byte 0x0202420b -_0803A078: .4byte 0x0202420c -_0803A07C: .4byte 0x020243cc -_0803A080: .4byte 0x020243d0 -_0803A084: .4byte 0x02024280 -_0803A088: .4byte 0x02022fec -_0803A08C: .4byte 0x03005d90 + .pool _0803A090: - ldr r0, _0803A22C + ldr r0, =0x02000002 ands r1, r0 cmp r1, 0 bne _0803A0AE @@ -119427,32 +116283,32 @@ _0803A090: lsls r0, 24 cmp r0, 0 beq _0803A0AE - ldr r1, _0803A230 + ldr r1, =0x02024280 ldr r0, [r1] movs r1, 0x80 orrs r0, r1 - ldr r2, _0803A230 + ldr r2, =0x02024280 _0803A0AC: str r0, [r2] _0803A0AE: - ldr r3, _0803A234 - ldr r0, _0803A238 + ldr r3, =0x02024474 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x15] lsls r0, 30 lsrs r0, 31 movs r1, 0 strb r0, [r3, 0x1D] - ldr r0, _0803A23C + ldr r0, =0x02024212 strb r1, [r0] - ldr r0, _0803A240 + ldr r0, =0x0202433a strb r1, [r0] - ldr r0, _0803A244 + ldr r0, =0x02024068 str r1, [r0] - ldr r0, _0803A248 + ldr r0, =0x0202432e movs r2, 0 strh r1, [r0] - ldr r1, _0803A24C + ldr r1, =0x020244a8 ldr r0, [r1] ldr r0, [r0, 0x8] adds r0, 0x20 @@ -119461,16 +116317,16 @@ _0803A0AE: ldr r0, [r0, 0xC] adds r0, 0x20 strb r2, [r0] - ldr r5, _0803A250 - ldr r6, _0803A254 - ldr r7, _0803A258 - ldr r0, _0803A25C + ldr r5, =0x0202432c + ldr r6, =0x020241f0 + ldr r7, =0x020243fc + ldr r0, =0x03005d54 mov r8, r0 - ldr r1, _0803A260 + ldr r1, =0x02024210 mov r9, r1 - ldr r2, _0803A264 + ldr r2, =0x02024744 mov r10, r2 - ldr r1, _0803A268 + ldr r1, =0x02024332 movs r2, 0 adds r0, r1, 0x7 _0803A0FA: @@ -119489,7 +116345,7 @@ _0803A0FA: strb r4, [r0] mov r1, r9 strb r4, [r1] - ldr r5, _0803A26C + ldr r5, =0x0202449c ldr r0, [r5] adds r0, 0x6C strb r4, [r0] @@ -119504,7 +116360,7 @@ _0803A0FA: bl pokemon_getattr ldr r6, [r5] adds r6, 0x7C - ldr r2, _0803A270 + ldr r2, =0x083203cc lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -119512,7 +116368,7 @@ _0803A0FA: ldrb r1, [r1, 0x8] movs r0, 0x64 muls r0, r1 - ldr r1, _0803A274 + ldr r1, =0x000004fb bl __divsi3 strb r0, [r6] ldr r0, [r5] @@ -119565,7 +116421,7 @@ _0803A16A: cmp r2, 0x7 ble _0803A16A movs r2, 0 - ldr r4, _0803A26C + ldr r4, =0x0202449c movs r3, 0xA5 lsls r3, 2 movs r1, 0x6 @@ -119585,9 +116441,9 @@ _0803A1BA: adds r0, 0x92 strb r1, [r0] bl GenerateRandomNumber - ldr r1, _0803A278 + ldr r1, =0x02024330 strh r0, [r1] - ldr r1, _0803A27C + ldr r1, =0x03005d10 movs r2, 0 movs r3, 0 _0803A1E4: @@ -119596,9 +116452,9 @@ _0803A1E4: adds r2, 0x1 cmp r2, 0x43 bls _0803A1E4 - ldr r0, _0803A264 + ldr r0, =0x02024744 bl sub_806EBA4 - ldr r3, _0803A27C + ldr r3, =0x03005d10 movs r1, 0x1 ands r1, r0 lsls r1, 6 @@ -119608,7 +116464,7 @@ _0803A1E4: ands r0, r2 orrs r0, r1 strb r0, [r3, 0x5] - ldr r2, _0803A26C + ldr r2, =0x0202449c ldr r0, [r2] movs r1, 0xA8 lsls r1, 2 @@ -119616,7 +116472,7 @@ _0803A1E4: movs r1, 0 strb r1, [r0] ldr r0, [r2] - ldr r2, _0803A280 + ldr r2, =0x000002a1 adds r0, r2 strb r1, [r0] pop {r3-r5} @@ -119627,28 +116483,7 @@ _0803A1E4: pop {r0} bx r0 .align 2, 0 -_0803A22C: .4byte 0x02000002 -_0803A230: .4byte 0x02024280 -_0803A234: .4byte 0x02024474 -_0803A238: .4byte 0x03005d90 -_0803A23C: .4byte 0x02024212 -_0803A240: .4byte 0x0202433a -_0803A244: .4byte 0x02024068 -_0803A248: .4byte 0x0202432e -_0803A24C: .4byte 0x020244a8 -_0803A250: .4byte 0x0202432c -_0803A254: .4byte 0x020241f0 -_0803A258: .4byte 0x020243fc -_0803A25C: .4byte 0x03005d54 -_0803A260: .4byte 0x02024210 -_0803A264: .4byte 0x02024744 -_0803A268: .4byte 0x02024332 -_0803A26C: .4byte 0x0202449c -_0803A270: .4byte 0x083203cc -_0803A274: .4byte 0x000004fb -_0803A278: .4byte 0x02024330 -_0803A27C: .4byte 0x03005d10 -_0803A280: .4byte 0x000002a1 + .pool thumb_func_end sub_8039F40 thumb_func_start sub_803A284 @@ -119659,8 +116494,8 @@ sub_803A284: @ 803A284 mov r5, r8 push {r5-r7} sub sp, 0x20 - ldr r4, _0803A3E8 - ldr r5, _0803A3EC + ldr r4, =0x020242bc + ldr r5, =0x02024064 ldrb r1, [r5] lsls r0, r1, 3 subs r0, r1 @@ -119673,8 +116508,8 @@ sub_803A284: @ 803A284 stm r1!, {r2,r3,r7} ldr r0, [r0] str r0, [r1] - ldr r2, _0803A3F0 - ldr r3, _0803A3F4 + ldr r2, =0x0831c898 + ldr r3, =0x020241ea ldrh r1, [r3] lsls r0, r1, 1 adds r0, r1 @@ -119683,14 +116518,14 @@ sub_803A284: @ 803A284 ldrb r0, [r0] mov r12, r4 mov r9, r5 - ldr r6, _0803A3F8 + ldr r6, =0x020242ac mov r10, r6 cmp r0, 0x7F beq _0803A35C movs r5, 0 mov r6, r9 movs r4, 0x58 - ldr r2, _0803A3FC + ldr r2, =0x02024084 adds r2, 0x18 movs r1, 0x6 _0803A2D4: @@ -119703,14 +116538,14 @@ _0803A2D4: cmp r5, 0x7 ble _0803A2D4 movs r5, 0 - ldr r7, _0803A400 + ldr r7, =0x0202406c ldrb r7, [r7] cmp r5, r7 bge _0803A348 - ldr r0, _0803A404 + ldr r0, =0x020240d4 mov r8, r0 - ldr r4, _0803A3E8 - ldr r3, _0803A3F8 + ldr r4, =0x020242bc + ldr r3, =0x020242ac _0803A2F6: movs r0, 0x58 muls r0, r5 @@ -119723,11 +116558,11 @@ _0803A2F6: cmp r0, 0 beq _0803A31A ldrb r0, [r4, 0x14] - ldr r6, _0803A3EC + ldr r6, =0x02024064 ldrb r6, [r6] cmp r0, r6 bne _0803A31A - ldr r0, _0803A408 + ldr r0, =0xfbffffff ands r1, r0 str r1, [r2] _0803A31A: @@ -119737,7 +116572,7 @@ _0803A31A: cmp r0, 0 beq _0803A33A ldrb r0, [r4, 0x15] - ldr r7, _0803A3EC + ldr r7, =0x02024064 ldrb r7, [r7] cmp r0, r7 bne _0803A33A @@ -119751,17 +116586,17 @@ _0803A33A: adds r4, 0x1C adds r3, 0x4 adds r5, 0x1 - ldr r0, _0803A400 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 blt _0803A2F6 _0803A348: - ldr r1, _0803A3F4 + ldr r1, =0x020241ea ldrh r0, [r1] lsls r1, r0, 1 adds r1, r0 lsls r1, 2 - ldr r2, _0803A3F0 + ldr r2, =0x0831c898 adds r1, r2 ldrb r0, [r1] cmp r0, 0x7F @@ -119772,22 +116607,22 @@ _0803A35C: movs r0, 0x58 adds r2, r1, 0 muls r2, r0 - ldr r0, _0803A3FC + ldr r0, =0x02024084 adds r0, 0x50 adds r2, r0 ldr r0, [r2] - ldr r1, _0803A40C + ldr r1, =0x15100007 ands r0, r1 str r0, [r2] ldrb r1, [r3] lsls r1, 2 add r1, r10 ldr r0, [r1] - ldr r2, _0803A410 + ldr r2, =0x0003043f ands r0, r2 str r0, [r1] movs r5, 0 - ldr r6, _0803A400 + ldr r6, =0x0202406c ldrb r6, [r6] cmp r5, r6 bge _0803A430 @@ -119804,7 +116639,7 @@ _0803A390: lsls r0, 24 cmp r4, r0 beq _0803A3D0 - ldr r1, _0803A3F8 + ldr r1, =0x020242ac lsls r0, r5, 2 adds r2, r0, r1 ldr r1, [r2] @@ -119812,7 +116647,7 @@ _0803A390: ands r0, r1 cmp r0, 0 beq _0803A3D0 - ldr r0, _0803A3E8 + ldr r0, =0x020242bc adds r0, r6, r0 ldrb r0, [r0, 0x15] ldrb r3, [r7] @@ -119827,33 +116662,23 @@ _0803A390: _0803A3D0: adds r6, 0x1C adds r5, 0x1 - ldr r0, _0803A400 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 blt _0803A390 - ldr r6, _0803A3E8 + ldr r6, =0x020242bc mov r12, r6 - ldr r7, _0803A3EC + ldr r7, =0x02024064 mov r9, r7 b _0803A430 .align 2, 0 -_0803A3E8: .4byte 0x020242bc -_0803A3EC: .4byte 0x02024064 -_0803A3F0: .4byte 0x0831c898 -_0803A3F4: .4byte 0x020241ea -_0803A3F8: .4byte 0x020242ac -_0803A3FC: .4byte 0x02024084 -_0803A400: .4byte 0x0202406c -_0803A404: .4byte 0x020240d4 -_0803A408: .4byte 0xfbffffff -_0803A40C: .4byte 0x15100007 -_0803A410: .4byte 0x0003043f + .pool _0803A414: mov r0, r9 ldrb r1, [r0] movs r0, 0x58 muls r0, r1 - ldr r1, _0803A710 + ldr r1, =0x02024084 adds r1, 0x50 adds r0, r1 movs r1, 0 @@ -119865,17 +116690,17 @@ _0803A414: str r1, [r0] _0803A430: movs r5, 0 - ldr r3, _0803A714 + ldr r3, =0x0202449c mov r8, r3 - ldr r6, _0803A718 + ldr r6, =0x020244ac mov r10, r6 - ldr r7, _0803A71C + ldr r7, =0x0202406c ldrb r7, [r7] cmp r5, r7 bge _0803A490 - ldr r3, _0803A720 - ldr r7, _0803A724 - ldr r6, _0803A728 + ldr r3, =0x020240d4 + ldr r7, =0x0832a328 + ldr r6, =0x02024064 _0803A448: movs r0, 0x58 muls r0, r5 @@ -119906,12 +116731,12 @@ _0803A466: ldrb r2, [r6] cmp r0, r2 bne _0803A486 - ldr r0, _0803A72C + ldr r0, =0xffff1fff ands r1, r0 str r1, [r4] _0803A486: adds r5, 0x1 - ldr r0, _0803A71C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 blt _0803A448 @@ -119923,7 +116748,7 @@ _0803A490: strb r1, [r0] mov r2, r9 ldrb r0, [r2] - ldr r3, _0803A730 + ldr r3, =0x020244b0 adds r0, r3 strb r1, [r0] ldrb r1, [r2] @@ -119940,12 +116765,12 @@ _0803A4B4: adds r5, 0x1 cmp r5, 0x1B bls _0803A4B4 - ldr r7, _0803A734 + ldr r7, =0x020241ea ldrh r0, [r7] lsls r1, r0, 1 adds r1, r0 lsls r1, 2 - ldr r0, _0803A738 + ldr r0, =0x0831c898 adds r1, r0 ldrb r0, [r1] cmp r0, 0x7F @@ -120007,7 +116832,7 @@ _0803A4B4: strb r1, [r0, 0x14] _0803A540: movs r0, 0 - ldr r6, _0803A73C + ldr r6, =0x0202427c strb r0, [r6] mov r7, r9 ldrb r1, [r7] @@ -120035,33 +116860,33 @@ _0803A540: strb r0, [r1, 0x18] ldrb r0, [r7] lsls r0, 1 - ldr r1, _0803A740 + ldr r1, =0x02024248 adds r0, r1 movs r2, 0 strh r4, [r0] ldrb r0, [r7] lsls r0, 1 - ldr r3, _0803A744 + ldr r3, =0x02024250 adds r0, r3 strh r4, [r0] ldrb r0, [r7] lsls r0, 1 - ldr r6, _0803A748 + ldr r6, =0x02024258 adds r0, r6 strh r4, [r0] ldrb r0, [r7] lsls r0, 1 - ldr r7, _0803A74C + ldr r7, =0x02024260 adds r0, r7 strh r4, [r0] mov r1, r9 ldrb r0, [r1] lsls r0, 1 - ldr r3, _0803A750 + ldr r3, =0x02024240 adds r0, r3 strh r4, [r0] ldrb r0, [r1] - ldr r6, _0803A754 + ldr r6, =0x02024270 adds r0, r6 movs r1, 0xFF strb r1, [r0] @@ -120131,14 +116956,14 @@ _0803A540: adds r1, 0x92 ldrb r0, [r7] lsls r0, 2 - ldr r6, _0803A724 + ldr r6, =0x0832a328 adds r0, r6 ldr r2, [r0] ldrb r0, [r1] bics r0, r2 strb r0, [r1] movs r5, 0 - ldr r7, _0803A71C + ldr r7, =0x0202406c ldrb r7, [r7] cmp r5, r7 bge _0803A6B4 @@ -120188,7 +117013,7 @@ _0803A68C: adds r0, 0xE1 strb r6, [r0] adds r5, 0x1 - ldr r0, _0803A71C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 blt _0803A656 @@ -120210,7 +117035,7 @@ _0803A6B4: adds r0, r1 adds r0, 0xC9 strb r2, [r0] - ldr r0, _0803A758 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x4] ldrb r0, [r3] @@ -120218,7 +117043,7 @@ _0803A6B4: adds r1, r0 movs r2, 0 str r2, [r1] - ldr r0, _0803A734 + ldr r0, =0x020241ea strh r2, [r0] ldr r0, [r6] adds r0, 0xDA @@ -120238,25 +117063,7 @@ _0803A6B4: pop {r0} bx r0 .align 2, 0 -_0803A710: .4byte 0x02024084 -_0803A714: .4byte 0x0202449c -_0803A718: .4byte 0x020244ac -_0803A71C: .4byte 0x0202406c -_0803A720: .4byte 0x020240d4 -_0803A724: .4byte 0x0832a328 -_0803A728: .4byte 0x02024064 -_0803A72C: .4byte 0xffff1fff -_0803A730: .4byte 0x020244b0 -_0803A734: .4byte 0x020241ea -_0803A738: .4byte 0x0831c898 -_0803A73C: .4byte 0x0202427c -_0803A740: .4byte 0x02024248 -_0803A744: .4byte 0x02024250 -_0803A748: .4byte 0x02024258 -_0803A74C: .4byte 0x02024260 -_0803A750: .4byte 0x02024240 -_0803A754: .4byte 0x02024270 -_0803A758: .4byte 0x020244a8 + .pool thumb_func_end sub_803A284 thumb_func_start sub_803A75C @@ -120268,17 +117075,17 @@ sub_803A75C: @ 803A75C push {r5-r7} sub sp, 0x4 movs r5, 0 - ldr r6, _0803AB20 - ldr r0, _0803AB24 + ldr r6, =0x02024084 + ldr r0, =0x020242ac mov r8, r0 - ldr r1, _0803AB28 + ldr r1, =0x0202449c mov r12, r1 - ldr r2, _0803AB2C + ldr r2, =0x020244ac mov r9, r2 - ldr r3, _0803AB30 + ldr r3, =0x020244b0 mov r10, r3 - ldr r7, _0803AB34 - ldr r4, _0803AB38 + ldr r7, =0x0202433c + ldr r4, =0x02024064 movs r3, 0x58 adds r2, r6, 0 adds r2, 0x18 @@ -120292,7 +117099,7 @@ _0803A788: adds r5, 0x1 cmp r5, 0x7 ble _0803A788 - ldr r0, _0803AB38 + ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -120301,19 +117108,19 @@ _0803A788: adds r0, r2 movs r1, 0 str r1, [r0] - ldr r3, _0803AB38 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 2 add r0, r8 str r1, [r0] movs r5, 0 - ldr r6, _0803AB3C + ldr r6, =0x0202406c ldrb r6, [r6] cmp r5, r6 bge _0803A830 adds r3, r2, 0 movs r4, 0 - ldr r0, _0803AB40 + ldr r0, =0x0832a328 mov r8, r0 _0803A7C6: ldr r1, [r3] @@ -120322,18 +117129,18 @@ _0803A7C6: ands r0, r1 cmp r0, 0 beq _0803A7E6 - ldr r2, _0803AB44 + ldr r2, =0x020242bc adds r0, r4, r2 ldrb r0, [r0, 0x14] - ldr r6, _0803AB38 + ldr r6, =0x02024064 ldrb r6, [r6] cmp r0, r6 bne _0803A7E6 - ldr r0, _0803AB48 + ldr r0, =0xfbffffff ands r1, r0 str r1, [r3] _0803A7E6: - ldr r1, _0803AB38 + ldr r1, =0x02024064 ldrb r0, [r1] lsls r0, 2 add r0, r8 @@ -120357,28 +117164,28 @@ _0803A800: ldr r0, [r2] adds r0, r5, r0 ldrb r0, [r0, 0x14] - ldr r6, _0803AB38 + ldr r6, =0x02024064 ldrb r6, [r6] cmp r0, r6 bne _0803A822 - ldr r0, _0803AB4C + ldr r0, =0xffff1fff ands r1, r0 str r1, [r3] _0803A822: adds r3, 0x58 adds r4, 0x1C adds r5, 0x1 - ldr r0, _0803AB3C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 blt _0803A7C6 _0803A830: - ldr r1, _0803AB38 + ldr r1, =0x02024064 ldrb r0, [r1] add r0, r9 movs r1, 0 strb r1, [r0] - ldr r2, _0803AB38 + ldr r2, =0x02024064 ldrb r0, [r2] add r0, r10 strb r1, [r0] @@ -120386,7 +117193,7 @@ _0803A830: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r3, _0803AB44 + ldr r3, =0x020242bc adds r1, r0, r3 movs r5, 0 movs r2, 0 @@ -120396,7 +117203,7 @@ _0803A852: adds r5, 0x1 cmp r5, 0x1B bls _0803A852 - ldr r6, _0803AB38 + ldr r6, =0x02024064 ldrb r1, [r6] lsls r1, 4 adds r1, r7 @@ -120425,7 +117232,7 @@ _0803A852: adds r0, r6, 0 ands r0, r2 strb r0, [r1] - ldr r0, _0803AB38 + ldr r0, =0x02024064 ldrb r1, [r0] lsls r1, 4 adds r1, r7 @@ -120435,7 +117242,7 @@ _0803A852: mov r0, r10 ands r0, r2 strb r0, [r1] - ldr r0, _0803AB38 + ldr r0, =0x02024064 ldrb r1, [r0] lsls r1, 4 adds r1, r7 @@ -120444,7 +117251,7 @@ _0803A852: negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r2, _0803AB38 + ldr r2, =0x02024064 ldrb r1, [r2] lsls r1, 4 adds r1, r7 @@ -120454,7 +117261,7 @@ _0803A852: adds r0, r5, 0 ands r0, r2 strb r0, [r1] - ldr r3, _0803AB38 + ldr r3, =0x02024064 ldrb r1, [r3] lsls r1, 4 adds r1, r7 @@ -120472,7 +117279,7 @@ _0803A852: adds r0, r3, 0 ands r0, r2 strb r0, [r1] - ldr r0, _0803AB38 + ldr r0, =0x02024064 ldrb r1, [r0] lsls r1, 4 adds r1, r7 @@ -120480,7 +117287,7 @@ _0803A852: mov r0, r9 ands r0, r2 strb r0, [r1, 0x1] - ldr r2, _0803AB38 + ldr r2, =0x02024064 ldrb r1, [r2] lsls r1, 4 adds r1, r7 @@ -120488,7 +117295,7 @@ _0803A852: mov r0, r8 ands r0, r2 strb r0, [r1, 0x1] - ldr r0, _0803AB38 + ldr r0, =0x02024064 ldrb r1, [r0] lsls r1, 4 adds r1, r7 @@ -120496,7 +117303,7 @@ _0803A852: adds r0, r6, 0 ands r0, r2 strb r0, [r1, 0x1] - ldr r2, _0803AB38 + ldr r2, =0x02024064 ldrb r1, [r2] lsls r1, 4 adds r1, r7 @@ -120505,14 +117312,14 @@ _0803A852: negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r1, _0803AB38 + ldr r1, =0x02024064 ldrb r0, [r1] lsls r0, 4 adds r0, r7 ldrb r1, [r0, 0x1] ands r5, r1 strb r5, [r0, 0x1] - ldr r2, _0803AB38 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 4 adds r0, r7 @@ -120539,7 +117346,7 @@ _0803A852: mov r2, r8 ands r2, r1 strb r2, [r0, 0x2] - ldr r3, _0803AB38 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 4 adds r0, r7 @@ -120557,42 +117364,42 @@ _0803A852: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0803AB44 + ldr r1, =0x020242bc adds r0, r1 movs r2, 0 movs r1, 0x2 strb r1, [r0, 0x16] ldrb r0, [r3] lsls r0, 1 - ldr r3, _0803AB50 + ldr r3, =0x02024248 adds r0, r3 movs r3, 0 strh r2, [r0] - ldr r6, _0803AB38 + ldr r6, =0x02024064 ldrb r0, [r6] lsls r0, 1 - ldr r1, _0803AB54 + ldr r1, =0x02024250 adds r0, r1 strh r2, [r0] ldrb r0, [r6] lsls r0, 1 - ldr r6, _0803AB58 + ldr r6, =0x02024258 adds r0, r6 strh r2, [r0] - ldr r1, _0803AB38 + ldr r1, =0x02024064 ldrb r0, [r1] lsls r0, 1 - ldr r6, _0803AB5C + ldr r6, =0x02024260 adds r0, r6 strh r2, [r0] ldrb r0, [r1] lsls r0, 1 - ldr r1, _0803AB60 + ldr r1, =0x02024240 adds r0, r1 strh r2, [r0] - ldr r2, _0803AB38 + ldr r2, =0x02024064 ldrb r0, [r2] - ldr r6, _0803AB64 + ldr r6, =0x02024270 adds r0, r6 movs r1, 0xFF strb r1, [r0] @@ -120603,7 +117410,7 @@ _0803A852: adds r0, r1 adds r0, 0xC8 strb r3, [r0] - ldr r6, _0803AB38 + ldr r6, =0x02024064 ldrb r0, [r6] ldr r1, [r2] lsls r0, 1 @@ -120674,14 +117481,14 @@ _0803A852: adds r1, 0x92 ldrb r0, [r6] lsls r0, 2 - ldr r2, _0803AB40 + ldr r2, =0x0832a328 adds r0, r2 ldr r2, [r0] ldrb r0, [r1] bics r0, r2 strb r0, [r1] movs r5, 0 - ldr r3, _0803AB3C + ldr r3, =0x0202406c ldrb r3, [r3] cmp r5, r3 bge _0803AB02 @@ -120731,49 +117538,31 @@ _0803AADA: adds r0, 0xE1 strb r6, [r0] adds r5, 0x1 - ldr r0, _0803AB3C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 blt _0803AAA4 _0803AB02: - ldr r0, _0803AB68 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x4] - ldr r2, _0803AB38 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r1, r0 movs r0, 0 str r0, [r1] - ldr r4, _0803AB20 + ldr r4, =0x02024084 ldrb r0, [r2] movs r3, 0x58 adds r2, r0, 0 muls r2, r3 b _0803AB6C .align 2, 0 -_0803AB20: .4byte 0x02024084 -_0803AB24: .4byte 0x020242ac -_0803AB28: .4byte 0x0202449c -_0803AB2C: .4byte 0x020244ac -_0803AB30: .4byte 0x020244b0 -_0803AB34: .4byte 0x0202433c -_0803AB38: .4byte 0x02024064 -_0803AB3C: .4byte 0x0202406c -_0803AB40: .4byte 0x0832a328 -_0803AB44: .4byte 0x020242bc -_0803AB48: .4byte 0xfbffffff -_0803AB4C: .4byte 0xffff1fff -_0803AB50: .4byte 0x02024248 -_0803AB54: .4byte 0x02024250 -_0803AB58: .4byte 0x02024258 -_0803AB5C: .4byte 0x02024260 -_0803AB60: .4byte 0x02024240 -_0803AB64: .4byte 0x02024270 -_0803AB68: .4byte 0x020244a8 + .pool _0803AB6C: adds r2, r4 - ldr r5, _0803ABB8 + ldr r5, =0x083203cc ldrh r1, [r2] lsls r0, r1, 3 subs r0, r1 @@ -120782,7 +117571,7 @@ _0803AB6C: ldrb r0, [r0, 0x6] adds r2, 0x21 strb r0, [r2] - ldr r6, _0803ABBC + ldr r6, =0x02024064 ldrb r0, [r6] adds r1, r0, 0 muls r1, r3 @@ -120808,14 +117597,13 @@ _0803AB6C: pop {r0} bx r0 .align 2, 0 -_0803ABB8: .4byte 0x083203cc -_0803ABBC: .4byte 0x02024064 + .pool thumb_func_end sub_803A75C thumb_func_start bc_8012FAC bc_8012FAC: @ 803ABC0 push {r4,r5,lr} - ldr r5, _0803ABD0 + ldr r5, =0x02024332 ldrb r0, [r5] cmp r0, 0 beq _0803ABD4 @@ -120823,9 +117611,9 @@ bc_8012FAC: @ 803ABC0 beq _0803ABF8 b _0803AC2E .align 2, 0 -_0803ABD0: .4byte 0x02024332 + .pool _0803ABD4: - ldr r4, _0803ABF4 + ldr r4, =0x02024064 ldrb r0, [r5, 0x1] strb r0, [r4] movs r0, 0 @@ -120839,30 +117627,27 @@ _0803ABD4: strb r0, [r5] b _0803AC2E .align 2, 0 -_0803ABF4: .4byte 0x02024064 + .pool _0803ABF8: - ldr r0, _0803AC1C + ldr r0, =0x02024068 ldr r2, [r0] cmp r2, 0 bne _0803AC2E ldrb r0, [r5, 0x1] adds r0, 0x1 strb r0, [r5, 0x1] - ldr r1, _0803AC20 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 bne _0803AC2C - ldr r1, _0803AC24 - ldr r0, _0803AC28 + ldr r1, =0x03005d04 + ldr r0, =bc_load_battlefield + 1 str r0, [r1] b _0803AC2E .align 2, 0 -_0803AC1C: .4byte 0x02024068 -_0803AC20: .4byte 0x0202406c -_0803AC24: .4byte 0x03005d04 -_0803AC28: .4byte bc_load_battlefield + 1 + .pool _0803AC2C: strb r2, [r5] _0803AC2E: @@ -120874,24 +117659,24 @@ _0803AC2E: thumb_func_start bc_load_battlefield bc_load_battlefield: @ 803AC34 push {r4,r5,lr} - ldr r0, _0803AC6C + ldr r0, =0x02024068 ldr r5, [r0] cmp r5, 0 bne _0803AC64 movs r0, 0 bl battle_get_side_with_given_state - ldr r4, _0803AC70 + ldr r4, =0x02024064 strb r0, [r4] - ldr r0, _0803AC74 + ldr r0, =0x02022ff0 ldrb r1, [r0] movs r0, 0 bl dp01_build_cmdbuf_x2E_a ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0803AC78 - ldr r0, _0803AC7C + ldr r1, =0x03005d04 + ldr r0, =sub_803AC84 + 1 str r0, [r1] - ldr r0, _0803AC80 + ldr r0, =0x02024332 strb r5, [r0] strb r5, [r0, 0x1] _0803AC64: @@ -120899,12 +117684,7 @@ _0803AC64: pop {r0} bx r0 .align 2, 0 -_0803AC6C: .4byte 0x02024068 -_0803AC70: .4byte 0x02024064 -_0803AC74: .4byte 0x02022ff0 -_0803AC78: .4byte 0x03005d04 -_0803AC7C: .4byte sub_803AC84 + 1 -_0803AC80: .4byte 0x02024332 + .pool thumb_func_end bc_load_battlefield thumb_func_start sub_803AC84 @@ -120914,35 +117694,35 @@ sub_803AC84: @ 803AC84 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _0803ACE8 + ldr r0, =0x02024068 ldr r1, [r0] cmp r1, 0 beq _0803AC98 b _0803AF4E _0803AC98: - ldr r2, _0803ACEC + ldr r2, =0x02024064 strb r1, [r2] - ldr r0, _0803ACF0 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r1, r0 bcc _0803ACA6 b _0803AF48 _0803ACA6: movs r7, 0x58 - ldr r0, _0803ACF4 + ldr r0, =0x02024084 mov r8, r0 mov r9, r2 movs r1, 0x48 add r1, r8 mov r10, r1 _0803ACB4: - ldr r0, _0803ACF8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 beq _0803ACFC - ldr r4, _0803ACEC + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -120962,11 +117742,7 @@ _0803ACDA: bls _0803ACDA b _0803ADCA .align 2, 0 -_0803ACE8: .4byte 0x02024068 -_0803ACEC: .4byte 0x02024064 -_0803ACF0: .4byte 0x0202406c -_0803ACF4: .4byte 0x02024084 -_0803ACF8: .4byte 0x02022fec + .pool _0803ACFC: mov r1, r9 ldrb r0, [r1] @@ -120974,9 +117750,9 @@ _0803ACFC: mov r2, r8 adds r3, r0, r2 movs r2, 0 - ldr r6, _0803AE44 - ldr r5, _0803AE48 - ldr r4, _0803AE4C + ldr r6, =0x083203cc + ldr r5, =0x02023864 + ldr r4, =0x02024064 _0803AD0E: adds r0, r3, r2 ldrb r1, [r4] @@ -121032,7 +117808,7 @@ _0803AD0E: strb r0, [r1] ldrb r0, [r2] bl battle_side_get_owner - ldr r1, _0803AE50 + ldr r1, =0x0202449c lsls r0, 24 lsrs r0, 23 adds r0, 0xA8 @@ -121045,9 +117821,9 @@ _0803AD0E: ldrh r0, [r0, 0x28] strh r0, [r1] movs r2, 0 - ldr r4, _0803AE4C + ldr r4, =0x02024064 movs r5, 0x58 - ldr r1, _0803AE54 + ldr r1, =0x0202409c adds r6, r4, 0 movs r0, 0x18 negs r0, r0 @@ -121072,7 +117848,7 @@ _0803ADAA: movs r0, 0 str r0, [r1] _0803ADCA: - ldr r4, _0803AE4C + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 @@ -121083,7 +117859,7 @@ _0803ADCA: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0803ADE4: - ldr r5, _0803AE58 + ldr r5, =0x02022fec ldr r0, [r5] movs r1, 0x8 ands r0, r1 @@ -121107,7 +117883,7 @@ _0803AE0A: cmp r0, 0x1 bne _0803AEC0 ldr r0, [r5] - ldr r1, _0803AE5C + ldr r1, =0x063f0902 ands r0, r1 cmp r0, 0 bne _0803AEC0 @@ -121126,13 +117902,7 @@ _0803AE0A: bl sub_806F01C b _0803AEC0 .align 2, 0 -_0803AE44: .4byte 0x083203cc -_0803AE48: .4byte 0x02023864 -_0803AE4C: .4byte 0x02024064 -_0803AE50: .4byte 0x0202449c -_0803AE54: .4byte 0x0202409c -_0803AE58: .4byte 0x02022fec -_0803AE5C: .4byte 0x063f0902 + .pool _0803AE60: ldrb r0, [r4] bl battle_side_get_owner @@ -121141,7 +117911,7 @@ _0803AE60: cmp r0, 0x1 bne _0803AEC0 ldr r0, [r5] - ldr r1, _0803AF5C + ldr r1, =0x063f0902 ands r0, r1 cmp r0, 0 bne _0803AE96 @@ -121163,28 +117933,28 @@ _0803AE96: bl dp01_build_cmdbuf_x04_4_4_4 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0803AF60 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0803AF64 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB movs r2, 0 bl pokemon_getattr - ldr r1, _0803AF68 + ldr r1, =0x03005d10 strh r0, [r1, 0x20] _0803AEC0: - ldr r0, _0803AF6C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _0803AEF6 - ldr r4, _0803AF70 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 @@ -121203,14 +117973,14 @@ _0803AEEA: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0803AEF6: - ldr r0, _0803AF6C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 8 ands r0, r1 cmp r0, 0 beq _0803AF20 - ldr r4, _0803AF70 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 @@ -121222,7 +117992,7 @@ _0803AEF6: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0803AF20: - ldr r0, _0803AF6C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 @@ -121235,7 +118005,7 @@ _0803AF32: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, _0803AF74 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -121243,8 +118013,8 @@ _0803AF32: bcs _0803AF48 b _0803ACB4 _0803AF48: - ldr r1, _0803AF78 - ldr r0, _0803AF7C + ldr r1, =0x03005d04 + ldr r0, =bc_801333C + 1 str r0, [r1] _0803AF4E: pop {r3-r5} @@ -121255,15 +118025,7 @@ _0803AF4E: pop {r0} bx r0 .align 2, 0 -_0803AF5C: .4byte 0x063f0902 -_0803AF60: .4byte 0x0202406e -_0803AF64: .4byte 0x02024744 -_0803AF68: .4byte 0x03005d10 -_0803AF6C: .4byte 0x02022fec -_0803AF70: .4byte 0x02024064 -_0803AF74: .4byte 0x0202406c -_0803AF78: .4byte 0x03005d04 -_0803AF7C: .4byte bc_801333C + 1 + .pool thumb_func_end sub_803AC84 thumb_func_start bc_801333C @@ -121272,13 +118034,13 @@ bc_801333C: @ 803AF80 mov r7, r8 push {r7} sub sp, 0x30 - ldr r0, _0803AFD8 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _0803AF92 b _0803B10C _0803AF92: - ldr r0, _0803AFDC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 @@ -121295,7 +118057,7 @@ _0803AFAA: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0803AFE0 + ldr r0, =0x02024744 adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -121310,15 +118072,12 @@ _0803AFAA: cmp r0, r1 bne _0803AFE8 _0803AFD0: - ldr r0, _0803AFE4 + ldr r0, =0x0000ffff strh r0, [r5] movs r0, 0 b _0803AFFA .align 2, 0 -_0803AFD8: .4byte 0x02024068 -_0803AFDC: .4byte 0x02022fec -_0803AFE0: .4byte 0x02024744 -_0803AFE4: .4byte 0x0000ffff + .pool _0803AFE8: adds r0, r4, 0 movs r1, 0x39 @@ -121336,7 +118095,7 @@ _0803AFFA: ble _0803AFAA movs r0, 0x1 bl battle_get_side_with_given_state - ldr r4, _0803B054 + ldr r4, =0x02024064 strb r0, [r4] movs r0, 0 mov r1, sp @@ -121351,7 +118110,7 @@ _0803B026: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0803B058 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -121366,14 +118125,12 @@ _0803B026: cmp r0, r1 bne _0803B060 _0803B04C: - ldr r0, _0803B05C + ldr r0, =0x0000ffff strh r0, [r5] movs r0, 0 b _0803B072 .align 2, 0 -_0803B054: .4byte 0x02024064 -_0803B058: .4byte 0x020244ec -_0803B05C: .4byte 0x0000ffff + .pool _0803B060: adds r0, r4, 0 movs r1, 0x39 @@ -121391,7 +118148,7 @@ _0803B072: ble _0803B026 movs r0, 0 bl battle_get_side_with_given_state - ldr r4, _0803B0A0 + ldr r4, =0x02024064 strb r0, [r4] movs r0, 0 mov r1, sp @@ -121399,13 +118156,11 @@ _0803B072: bl dp01_build_cmdbuf_x30_TODO ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0803B0A4 - ldr r0, _0803B0A8 + ldr r1, =0x03005d04 + ldr r0, =bc_battle_begin_message + 1 b _0803B10A .align 2, 0 -_0803B0A0: .4byte 0x02024064 -_0803B0A4: .4byte 0x03005d04 -_0803B0A8: .4byte bc_battle_begin_message + 1 + .pool _0803B0AC: movs r7, 0 add r6, sp, 0x4 @@ -121414,7 +118169,7 @@ _0803B0B2: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0803B0E0 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -121429,13 +118184,12 @@ _0803B0B2: cmp r0, r1 bne _0803B0E8 _0803B0D8: - ldr r0, _0803B0E4 + ldr r0, =0x0000ffff strh r0, [r5] movs r0, 0 b _0803B0FA .align 2, 0 -_0803B0E0: .4byte 0x020244ec -_0803B0E4: .4byte 0x0000ffff + .pool _0803B0E8: adds r0, r4, 0 movs r1, 0x39 @@ -121451,8 +118205,8 @@ _0803B0FA: adds r7, 0x1 cmp r7, 0x5 ble _0803B0B2 - ldr r1, _0803B118 - ldr r0, _0803B11C + ldr r1, =0x03005d04 + ldr r0, =bc_8013568 + 1 _0803B10A: str r0, [r1] _0803B10C: @@ -121463,46 +118217,42 @@ _0803B10C: pop {r0} bx r0 .align 2, 0 -_0803B118: .4byte 0x03005d04 -_0803B11C: .4byte bc_8013568 + 1 + .pool thumb_func_end bc_801333C thumb_func_start bc_battle_begin_message bc_battle_begin_message: @ 803B120 push {lr} - ldr r0, _0803B148 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0803B142 movs r0, 0x1 bl battle_get_side_with_given_state - ldr r1, _0803B14C + ldr r1, =0x02024064 strb r0, [r1] ldrb r1, [r1] movs r0, 0 bl b_std_message - ldr r1, _0803B150 - ldr r0, _0803B154 + ldr r1, =0x03005d04 + ldr r0, =sub_803B180 + 1 str r0, [r1] _0803B142: pop {r0} bx r0 .align 2, 0 -_0803B148: .4byte 0x02024068 -_0803B14C: .4byte 0x02024064 -_0803B150: .4byte 0x03005d04 -_0803B154: .4byte sub_803B180 + 1 + .pool thumb_func_end bc_battle_begin_message thumb_func_start bc_8013568 bc_8013568: @ 803B158 push {lr} - ldr r0, _0803B174 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0803B170 - ldr r1, _0803B178 - ldr r0, _0803B17C + ldr r1, =0x03005d04 + ldr r0, =sub_803B3CC + 1 str r0, [r1] movs r0, 0 movs r1, 0 @@ -121511,19 +118261,17 @@ _0803B170: pop {r0} bx r0 .align 2, 0 -_0803B174: .4byte 0x02024068 -_0803B178: .4byte 0x03005d04 -_0803B17C: .4byte sub_803B3CC + 1 + .pool thumb_func_end bc_8013568 thumb_func_start sub_803B180 sub_803B180: @ 803B180 push {lr} - ldr r0, _0803B1B0 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0803B1D0 - ldr r0, _0803B1B4 + ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x80 lsls r0, 17 @@ -121543,8 +118291,7 @@ sub_803B180: @ 803B180 lsrs r0, 31 b _0803B1BA .align 2, 0 -_0803B1B0: .4byte 0x02024068 -_0803B1B4: .4byte 0x02022fec + .pool _0803B1B8: movs r0, 0x1 _0803B1BA: @@ -121554,21 +118301,20 @@ _0803B1BA: lsrs r1, 24 movs r0, 0x1 bl b_std_message - ldr r1, _0803B1D4 - ldr r0, _0803B1D8 + ldr r1, =0x03005d04 + ldr r0, =sub_803B25C + 1 str r0, [r1] _0803B1D0: pop {r0} bx r0 .align 2, 0 -_0803B1D4: .4byte 0x03005d04 -_0803B1D8: .4byte sub_803B25C + 1 + .pool thumb_func_end sub_803B180 thumb_func_start sub_803B1DC sub_803B1DC: @ 803B1DC push {r4,r5,lr} - ldr r0, _0803B248 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 17 @@ -121586,10 +118332,10 @@ sub_803B1DC: @ 803B1DC _0803B1FC: movs r5, 0x3 _0803B1FE: - ldr r1, _0803B24C + ldr r1, =0x02024064 movs r0, 0 strb r0, [r1] - ldr r0, _0803B250 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0 beq _0803B23A @@ -121609,31 +118355,27 @@ _0803B228: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _0803B250 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 bcc _0803B20E _0803B23A: - ldr r1, _0803B254 - ldr r0, _0803B258 + ldr r1, =0x03005d04 + ldr r0, =bc_801362C + 1 str r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0803B248: .4byte 0x02022fec -_0803B24C: .4byte 0x02024064 -_0803B250: .4byte 0x0202406c -_0803B254: .4byte 0x03005d04 -_0803B258: .4byte bc_801362C + 1 + .pool thumb_func_end sub_803B1DC thumb_func_start sub_803B25C sub_803B25C: @ 803B25C push {r4-r6,lr} - ldr r0, _0803B284 + ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x80 lsls r0, 17 @@ -121653,24 +118395,23 @@ sub_803B25C: @ 803B25C lsrs r5, r0, 31 b _0803B29A .align 2, 0 -_0803B284: .4byte 0x02022fec + .pool _0803B288: - ldr r1, _0803B290 - ldr r0, _0803B294 + ldr r1, =0x03005d04 + ldr r0, =sub_803B1DC + 1 b _0803B2F0 .align 2, 0 -_0803B290: .4byte 0x03005d04 -_0803B294: .4byte sub_803B1DC + 1 + .pool _0803B298: movs r5, 0x1 _0803B29A: - ldr r0, _0803B2F8 + ldr r0, =0x02024068 ldr r2, [r0] cmp r2, 0 bne _0803B2F2 - ldr r0, _0803B2FC + ldr r0, =0x02024064 strb r2, [r0] - ldr r1, _0803B300 + ldr r1, =0x0202406c adds r4, r0, 0 ldrb r1, [r1] cmp r2, r1 @@ -121687,9 +118428,9 @@ _0803B2B2: bl dp01_build_cmdbuf_x2F_2F_2F_2F ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r0, _0803B304 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0803B308 + ldr r1, =0x00008040 ands r0, r1 cmp r0, 0 bne _0803B288 @@ -121697,16 +118438,16 @@ _0803B2D8: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - ldr r1, _0803B300 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 - ldr r4, _0803B2FC + ldr r4, =0x02024064 ldrb r1, [r1] cmp r0, r1 bcc _0803B2B2 _0803B2EC: - ldr r1, _0803B30C - ldr r0, _0803B310 + ldr r1, =0x03005d04 + ldr r0, =bc_801362C + 1 _0803B2F0: str r0, [r1] _0803B2F2: @@ -121714,30 +118455,24 @@ _0803B2F2: pop {r0} bx r0 .align 2, 0 -_0803B2F8: .4byte 0x02024068 -_0803B2FC: .4byte 0x02024064 -_0803B300: .4byte 0x0202406c -_0803B304: .4byte 0x02022fec -_0803B308: .4byte 0x00008040 -_0803B30C: .4byte 0x03005d04 -_0803B310: .4byte bc_801362C + 1 + .pool thumb_func_end sub_803B25C thumb_func_start bc_801362C bc_801362C: @ 803B314 push {r4-r7,lr} - ldr r0, _0803B38C + ldr r0, =0x02024068 ldr r1, [r0] cmp r1, 0 bne _0803B384 - ldr r2, _0803B390 + ldr r2, =0x02024064 strb r1, [r2] - ldr r0, _0803B394 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r1, r0 bcs _0803B37E adds r4, r2, 0 - ldr r6, _0803B398 + ldr r6, =0x02024084 movs r5, 0x58 adds r7, r6, 0 adds r7, 0x48 @@ -121748,9 +118483,9 @@ _0803B334: lsrs r0, 24 cmp r0, 0x1 bne _0803B36C - ldr r0, _0803B39C + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0803B3A0 + ldr r1, =0x063f0902 ands r0, r1 cmp r0, 0 bne _0803B36C @@ -121771,58 +118506,49 @@ _0803B36C: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _0803B394 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 bcc _0803B334 _0803B37E: - ldr r1, _0803B3A4 - ldr r0, _0803B3A8 + ldr r1, =0x03005d04 + ldr r0, =sub_803B3CC + 1 str r0, [r1] _0803B384: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0803B38C: .4byte 0x02024068 -_0803B390: .4byte 0x02024064 -_0803B394: .4byte 0x0202406c -_0803B398: .4byte 0x02024084 -_0803B39C: .4byte 0x02022fec -_0803B3A0: .4byte 0x063f0902 -_0803B3A4: .4byte 0x03005d04 -_0803B3A8: .4byte sub_803B3CC + 1 + .pool thumb_func_end bc_801362C thumb_func_start sub_803B3AC sub_803B3AC: @ 803B3AC push {lr} - ldr r0, _0803B3C0 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0803B3BC - ldr r1, _0803B3C4 - ldr r0, _0803B3C8 + ldr r1, =0x03005d04 + ldr r0, =sub_803B3CC + 1 str r0, [r1] _0803B3BC: pop {r0} bx r0 .align 2, 0 -_0803B3C0: .4byte 0x02024068 -_0803B3C4: .4byte 0x03005d04 -_0803B3C8: .4byte sub_803B3CC + 1 + .pool thumb_func_end sub_803B3AC thumb_func_start sub_803B3CC sub_803B3CC: @ 803B3CC push {lr} - ldr r0, _0803B41C + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0803B418 - ldr r1, _0803B420 + ldr r1, =0x02022fec ldr r2, [r1] movs r0, 0x80 lsls r0, 17 @@ -121853,23 +118579,20 @@ _0803B3F6: movs r0, 0x1 bl b_std_message _0803B412: - ldr r1, _0803B424 - ldr r0, _0803B428 + ldr r1, =0x03005d04 + ldr r0, =sub_803B4C8 + 1 str r0, [r1] _0803B418: pop {r0} bx r0 .align 2, 0 -_0803B41C: .4byte 0x02024068 -_0803B420: .4byte 0x02022fec -_0803B424: .4byte 0x03005d04 -_0803B428: .4byte sub_803B4C8 + 1 + .pool thumb_func_end sub_803B3CC thumb_func_start sub_803B42C sub_803B42C: @ 803B42C push {r4,r5,lr} - ldr r0, _0803B4B0 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 17 @@ -121887,10 +118610,10 @@ sub_803B42C: @ 803B42C _0803B44C: movs r5, 0x2 _0803B44E: - ldr r1, _0803B4B4 + ldr r1, =0x02024064 movs r0, 0 strb r0, [r1] - ldr r0, _0803B4B8 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0 beq _0803B48A @@ -121910,14 +118633,14 @@ _0803B478: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _0803B4B8 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 bcc _0803B45E _0803B48A: - ldr r2, _0803B4BC + ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C movs r1, 0 @@ -121930,25 +118653,20 @@ _0803B48A: lsls r2, 1 adds r0, r2 strb r1, [r0] - ldr r1, _0803B4C0 - ldr r0, _0803B4C4 + ldr r1, =0x03005d04 + ldr r0, =sub_803B628 + 1 str r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0803B4B0: .4byte 0x02022fec -_0803B4B4: .4byte 0x02024064 -_0803B4B8: .4byte 0x0202406c -_0803B4BC: .4byte 0x0202449c -_0803B4C0: .4byte 0x03005d04 -_0803B4C4: .4byte sub_803B628 + 1 + .pool thumb_func_end sub_803B42C thumb_func_start sub_803B4C8 sub_803B4C8: @ 803B4C8 push {r4-r6,lr} - ldr r0, _0803B4EC + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 17 @@ -121965,24 +118683,23 @@ sub_803B4C8: @ 803B4C8 bge _0803B502 b _0803B500 .align 2, 0 -_0803B4EC: .4byte 0x02022fec + .pool _0803B4F0: - ldr r1, _0803B4F8 - ldr r0, _0803B4FC + ldr r1, =0x03005d04 + ldr r0, =sub_803B42C + 1 b _0803B572 .align 2, 0 -_0803B4F8: .4byte 0x03005d04 -_0803B4FC: .4byte sub_803B42C + 1 + .pool _0803B500: movs r6, 0 _0803B502: - ldr r0, _0803B57C + ldr r0, =0x02024068 ldr r2, [r0] cmp r2, 0 bne _0803B574 - ldr r0, _0803B580 + ldr r0, =0x02024064 strb r2, [r0] - ldr r1, _0803B584 + ldr r1, =0x0202406c adds r4, r0, 0 ldrb r1, [r1] cmp r2, r1 @@ -121999,7 +118716,7 @@ _0803B51A: bl dp01_build_cmdbuf_x2F_2F_2F_2F ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r0, _0803B588 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -122009,15 +118726,15 @@ _0803B540: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - ldr r1, _0803B584 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 - ldr r4, _0803B580 + ldr r4, =0x02024064 ldrb r1, [r1] cmp r0, r1 bcc _0803B51A _0803B554: - ldr r2, _0803B58C + ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C movs r1, 0 @@ -122030,8 +118747,8 @@ _0803B554: lsls r2, 1 adds r0, r2 strb r1, [r0] - ldr r1, _0803B590 - ldr r0, _0803B594 + ldr r1, =0x03005d04 + ldr r0, =sub_803B628 + 1 _0803B572: str r0, [r1] _0803B574: @@ -122039,30 +118756,24 @@ _0803B574: pop {r0} bx r0 .align 2, 0 -_0803B57C: .4byte 0x02024068 -_0803B580: .4byte 0x02024064 -_0803B584: .4byte 0x0202406c -_0803B588: .4byte 0x02022fec -_0803B58C: .4byte 0x0202449c -_0803B590: .4byte 0x03005d04 -_0803B594: .4byte sub_803B628 + 1 + .pool thumb_func_end sub_803B4C8 thumb_func_start sub_803B598 sub_803B598: @ 803B598 push {r4,r5,lr} - ldr r0, _0803B60C + ldr r0, =0x02024068 ldr r1, [r0] cmp r1, 0 bne _0803B606 - ldr r2, _0803B610 + ldr r2, =0x02024064 strb r1, [r2] - ldr r0, _0803B614 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r1, r0 bcs _0803B5E6 adds r4, r2, 0 - ldr r5, _0803B618 + ldr r5, =0x0202406e _0803B5B2: ldrb r0, [r4] bl battle_side_get_owner @@ -122082,14 +118793,14 @@ _0803B5D4: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _0803B614 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 bcc _0803B5B2 _0803B5E6: - ldr r2, _0803B61C + ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C movs r1, 0 @@ -122102,21 +118813,15 @@ _0803B5E6: lsls r2, 1 adds r0, r2 strb r1, [r0] - ldr r1, _0803B620 - ldr r0, _0803B624 + ldr r1, =0x03005d04 + ldr r0, =sub_803B628 + 1 str r0, [r1] _0803B606: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0803B60C: .4byte 0x02024068 -_0803B610: .4byte 0x02024064 -_0803B614: .4byte 0x0202406c -_0803B618: .4byte 0x0202406e -_0803B61C: .4byte 0x0202449c -_0803B620: .4byte 0x03005d04 -_0803B624: .4byte sub_803B628 + 1 + .pool thumb_func_end sub_803B598 thumb_func_start sub_803B628 @@ -122129,25 +118834,25 @@ sub_803B628: @ 803B628 sub sp, 0x4 movs r0, 0 mov r9, r0 - ldr r0, _0803B66C + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _0803B642 b _0803B8B2 _0803B642: - ldr r0, _0803B670 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x4C ldrb r0, [r0] cmp r0, 0 bne _0803B6C2 movs r5, 0 - ldr r1, _0803B674 + ldr r1, =0x0202406c mov r10, r1 ldrb r3, [r1] cmp r5, r3 bge _0803B668 - ldr r2, _0803B678 + ldr r2, =0x0202407e _0803B65C: adds r0, r5, r2 strb r5, [r0] @@ -122159,18 +118864,15 @@ _0803B668: movs r5, 0 b _0803B6B8 .align 2, 0 -_0803B66C: .4byte 0x02024068 -_0803B670: .4byte 0x0202449c -_0803B674: .4byte 0x0202406c -_0803B678: .4byte 0x0202407e + .pool _0803B67C: adds r4, r5, 0x1 mov r8, r4 ldrb r1, [r1] cmp r8, r1 bge _0803B6B6 - ldr r6, _0803B6F0 - ldr r1, _0803B6F4 + ldr r6, =0x0202407e + ldr r1, =0x0202406c mov r10, r1 lsls r7, r5, 24 _0803B68E: @@ -122189,7 +118891,7 @@ _0803B68E: bl sub_803CEDC _0803B6AC: adds r4, 0x1 - ldr r0, _0803B6F4 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _0803B68E @@ -122202,7 +118904,7 @@ _0803B6B8: cmp r5, r0 blt _0803B67C _0803B6C2: - ldr r5, _0803B6F8 + ldr r5, =0x0202449c ldr r0, [r5] movs r4, 0xD1 lsls r4, 1 @@ -122225,19 +118927,17 @@ _0803B6C2: strb r1, [r0] b _0803B8B2 .align 2, 0 -_0803B6F0: .4byte 0x0202407e -_0803B6F4: .4byte 0x0202406c -_0803B6F8: .4byte 0x0202449c + .pool _0803B6FC: - ldr r2, _0803B8C4 + ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C - ldr r1, _0803B8C8 + ldr r1, =0x0202406c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 bcs _0803B756 - ldr r5, _0803B8CC + ldr r5, =0x0202407e adds r4, r2, 0 _0803B710: ldr r0, [r4] @@ -122271,7 +118971,7 @@ _0803B736: _0803B748: ldr r0, [r4] adds r0, 0x4C - ldr r1, _0803B8C8 + ldr r1, =0x0202406c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 @@ -122301,15 +119001,15 @@ _0803B770: beq _0803B786 b _0803B8B2 _0803B786: - ldr r2, _0803B8C4 + ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0xD9 - ldr r1, _0803B8C8 + ldr r1, =0x0202406c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 bcs _0803B7DA - ldr r5, _0803B8CC + ldr r5, =0x0202407e adds r4, r2, 0 _0803B79A: ldr r0, [r4] @@ -122339,18 +119039,18 @@ _0803B7BC: bne _0803B8B2 ldr r0, [r4] adds r0, 0xD9 - ldr r1, _0803B8C8 + ldr r1, =0x0202406c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 bcc _0803B79A _0803B7DA: movs r5, 0 - ldr r1, _0803B8C4 + ldr r1, =0x0202449c mov r8, r1 movs r7, 0x6 - ldr r6, _0803B8D0 - ldr r2, _0803B8D4 + ldr r6, =0x0202421c + ldr r2, =0x02024274 movs r4, 0xFF movs r3, 0 _0803B7EA: @@ -122371,20 +119071,20 @@ _0803B7EA: movs r0, 0 bl sub_803D580 bl sub_803D6A0 - ldr r0, _0803B8C4 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x91 - ldr r1, _0803B8D8 + ldr r1, =0x02024210 ldrb r1, [r1] strb r1, [r0] - ldr r0, _0803B8DC + ldr r0, =0x085cc23e movs r1, 0 bl battle_show_message_maybe - ldr r1, _0803B8E0 - ldr r0, _0803B8E4 + ldr r1, =0x03005d04 + ldr r0, =sub_803BE74 + 1 str r0, [r1] bl sub_803F988 - ldr r1, _0803B8E8 + ldr r1, =0x02024332 movs r2, 0 adds r0, r1, 0x7 _0803B834: @@ -122393,14 +119093,14 @@ _0803B834: cmp r0, r1 bge _0803B834 movs r5, 0 - ldr r3, _0803B8C8 - ldr r2, _0803B8C4 - ldr r6, _0803B8EC - ldr r7, _0803B8F0 + ldr r3, =0x0202406c + ldr r2, =0x0202449c + ldr r6, =0x02024474 + ldr r7, =0x0202427c ldrb r0, [r3] cmp r5, r0 bge _0803B866 - ldr r0, _0803B8F4 + ldr r0, =0x02024084 movs r4, 0x9 negs r4, r4 adds r1, r0, 0 @@ -122438,9 +119138,9 @@ _0803B866: strb r1, [r0, 0x3] strb r1, [r7] bl GenerateRandomNumber - ldr r1, _0803B8F8 + ldr r1, =0x02024330 strh r0, [r1] - ldr r0, _0803B8FC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 @@ -122448,7 +119148,7 @@ _0803B866: cmp r0, 0 beq _0803B8B2 bl sub_80A369C - ldr r0, _0803B900 + ldr r0, =0x082db8be bl b_call_bc_move_exec _0803B8B2: add sp, 0x4 @@ -122460,36 +119160,21 @@ _0803B8B2: pop {r0} bx r0 .align 2, 0 -_0803B8C4: .4byte 0x0202449c -_0803B8C8: .4byte 0x0202406c -_0803B8CC: .4byte 0x0202407e -_0803B8D0: .4byte 0x0202421c -_0803B8D4: .4byte 0x02024274 -_0803B8D8: .4byte 0x02024210 -_0803B8DC: .4byte 0x085cc23e -_0803B8E0: .4byte 0x03005d04 -_0803B8E4: .4byte sub_803BE74 + 1 -_0803B8E8: .4byte 0x02024332 -_0803B8EC: .4byte 0x02024474 -_0803B8F0: .4byte 0x0202427c -_0803B8F4: .4byte 0x02024084 -_0803B8F8: .4byte 0x02024330 -_0803B8FC: .4byte 0x02022fec -_0803B900: .4byte 0x082db8be + .pool thumb_func_end sub_803B628 thumb_func_start bc_8013B1C bc_8013B1C: @ 803B904 push {r4-r6,lr} - ldr r0, _0803B99C + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0803B994 - ldr r1, _0803B9A0 - ldr r0, _0803B9A4 + ldr r1, =0x03005d04 + ldr r0, =sub_803B9BC + 1 str r0, [r1] - ldr r3, _0803B9A8 - ldr r1, _0803B9AC + ldr r3, =0x0202406c + ldr r1, =0x02024332 movs r2, 0 adds r0, r1, 0x7 _0803B91C: @@ -122501,7 +119186,7 @@ _0803B91C: ldrb r3, [r3] cmp r4, r3 bge _0803B96E - ldr r5, _0803B9B0 + ldr r5, =0x02024084 adds r6, r5, 0 adds r6, 0x4C _0803B932: @@ -122531,12 +119216,12 @@ _0803B932: bl b_cancel_multi_turn_move_maybe _0803B964: adds r4, 0x1 - ldr r0, _0803B9A8 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _0803B932 _0803B96E: - ldr r2, _0803B9B4 + ldr r2, =0x0202449c ldr r0, [r2] movs r1, 0 strb r1, [r0] @@ -122553,21 +119238,14 @@ _0803B96E: strb r1, [r0] ldr r0, [r2] strb r1, [r0, 0x3] - ldr r0, _0803B9B8 + ldr r0, =0x0202427c strb r1, [r0] _0803B994: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0803B99C: .4byte 0x02024068 -_0803B9A0: .4byte 0x03005d04 -_0803B9A4: .4byte sub_803B9BC + 1 -_0803B9A8: .4byte 0x0202406c -_0803B9AC: .4byte 0x02024332 -_0803B9B0: .4byte 0x02024084 -_0803B9B4: .4byte 0x0202449c -_0803B9B8: .4byte 0x0202427c + .pool thumb_func_end bc_8013B1C thumb_func_start sub_803B9BC @@ -122578,7 +119256,7 @@ sub_803B9BC: @ 803B9BC push {r6,r7} movs r0, 0x1 bl sub_803D580 - ldr r0, _0803BA60 + ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0 bne _0803B9EA @@ -122601,7 +119279,7 @@ _0803B9EA: beq _0803B9F8 b _0803BB78 _0803B9F8: - ldr r0, _0803BA64 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x4D strb r1, [r0] @@ -122614,26 +119292,26 @@ _0803B9F8: _0803BA0E: movs r0, 0 bl sub_803D580 - ldr r2, _0803BA68 + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _0803BA6C + ldr r1, =0xfffffdff ands r0, r1 - ldr r1, _0803BA70 + ldr r1, =0xfff7ffff ands r0, r1 - ldr r1, _0803BA74 + ldr r1, =0xffbfffff ands r0, r1 - ldr r1, _0803BA78 + ldr r1, =0xffefffff ands r0, r1 str r0, [r2] - ldr r0, _0803BA7C + ldr r0, =0x02024474 strb r4, [r0, 0x18] strb r4, [r0, 0x19] strb r4, [r0, 0x14] - ldr r0, _0803BA80 + ldr r0, =0x020241f0 str r4, [r0] - ldr r0, _0803BA84 + ldr r0, =0x0202427c strb r4, [r0] - ldr r1, _0803BA88 + ldr r1, =0x02024332 movs r2, 0 adds r0, r1, 0x4 _0803BA40: @@ -122641,36 +119319,23 @@ _0803BA40: subs r0, 0x1 cmp r0, r1 bge _0803BA40 - ldr r0, _0803BA60 + ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0 beq _0803BA98 - ldr r1, _0803BA8C + ldr r1, =0x02024083 movs r0, 0xC strb r0, [r1] - ldr r1, _0803BA90 - ldr r0, _0803BA94 + ldr r1, =0x03005d04 + ldr r0, =bc_bs_exec + 1 str r0, [r1] b _0803BB78 .align 2, 0 -_0803BA60: .4byte 0x0202433a -_0803BA64: .4byte 0x0202449c -_0803BA68: .4byte 0x02024280 -_0803BA6C: .4byte 0xfffffdff -_0803BA70: .4byte 0xfff7ffff -_0803BA74: .4byte 0xffbfffff -_0803BA78: .4byte 0xffefffff -_0803BA7C: .4byte 0x02024474 -_0803BA80: .4byte 0x020241f0 -_0803BA84: .4byte 0x0202427c -_0803BA88: .4byte 0x02024332 -_0803BA8C: .4byte 0x02024083 -_0803BA90: .4byte 0x03005d04 -_0803BA94: .4byte bc_bs_exec + 1 + .pool _0803BA98: - ldr r1, _0803BB2C + ldr r1, =0x03005d10 ldrb r0, [r1, 0x13] - ldr r2, _0803BB30 + ldr r2, =0x0202449c mov r8, r2 cmp r0, 0xFE bhi _0803BAB2 @@ -122683,18 +119348,18 @@ _0803BA98: strb r0, [r1] _0803BAB2: movs r2, 0 - ldr r4, _0803BB34 - ldr r0, _0803BB38 + ldr r4, =0x0202406c + ldr r0, =0x02024210 mov r12, r0 - ldr r1, _0803BB3C + ldr r1, =0x085cc23e mov r9, r1 ldrb r0, [r4] cmp r2, r0 bge _0803BAE0 - ldr r7, _0803BB40 + ldr r7, =0x0202421c movs r6, 0xFF movs r5, 0 - ldr r3, _0803BB44 + ldr r3, =0x02024274 _0803BACC: adds r1, r2, r7 ldrb r0, [r1] @@ -122708,7 +119373,7 @@ _0803BACC: blt _0803BACC _0803BAE0: movs r2, 0 - ldr r3, _0803BB30 + ldr r3, =0x0202449c movs r1, 0x6 _0803BAE6: ldr r0, [r3] @@ -122727,35 +119392,24 @@ _0803BAE6: mov r0, r9 movs r1, 0 bl battle_show_message_maybe - ldr r1, _0803BB48 - ldr r0, _0803BB4C + ldr r1, =0x03005d04 + ldr r0, =sub_803BE74 + 1 str r0, [r1] bl GenerateRandomNumber - ldr r1, _0803BB50 + ldr r1, =0x02024330 strh r0, [r1] - ldr r0, _0803BB54 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 10 ands r0, r1 cmp r0, 0 beq _0803BB5C - ldr r0, _0803BB58 + ldr r0, =0x082db881 bl b_call_bc_move_exec b _0803BB78 .align 2, 0 -_0803BB2C: .4byte 0x03005d10 -_0803BB30: .4byte 0x0202449c -_0803BB34: .4byte 0x0202406c -_0803BB38: .4byte 0x02024210 -_0803BB3C: .4byte 0x085cc23e -_0803BB40: .4byte 0x0202421c -_0803BB44: .4byte 0x02024274 -_0803BB48: .4byte 0x03005d04 -_0803BB4C: .4byte sub_803BE74 + 1 -_0803BB50: .4byte 0x02024330 -_0803BB54: .4byte 0x02022fec -_0803BB58: .4byte 0x082db881 + .pool _0803BB5C: movs r0, 0x80 lsls r0, 11 @@ -122768,7 +119422,7 @@ _0803BB5C: ldrb r0, [r0] cmp r0, 0 bne _0803BB78 - ldr r0, _0803BB84 + ldr r0, =0x082db8be bl b_call_bc_move_exec _0803BB78: pop {r3,r4} @@ -122778,15 +119432,15 @@ _0803BB78: pop {r0} bx r0 .align 2, 0 -_0803BB84: .4byte 0x082db8be + .pool thumb_func_end sub_803B9BC thumb_func_start sub_803BB88 sub_803BB88: @ 803BB88 push {r4-r7,lr} sub sp, 0x4 - ldr r1, _0803BBAC - ldr r0, _0803BBB0 + ldr r1, =0x02024084 + ldr r0, =0x02024064 ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -122794,7 +119448,7 @@ sub_803BB88: @ 803BB88 ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0803BBB8 - ldr r1, _0803BBB4 + ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -122802,24 +119456,22 @@ sub_803BB88: @ 803BB88 ldrb r2, [r0, 0x7] b _0803BBC2 .align 2, 0 -_0803BBAC: .4byte 0x02024084 -_0803BBB0: .4byte 0x02024064 -_0803BBB4: .4byte 0x02024404 + .pool _0803BBB8: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 lsrs r2, r0, 24 _0803BBC2: - ldr r1, _0803BCD8 - ldr r3, _0803BCDC + ldr r1, =0x0202420f + ldr r3, =0x02024064 ldrb r0, [r3] strb r0, [r1] cmp r2, 0x25 bne _0803BBD0 b _0803BD4C _0803BBD0: - ldr r0, _0803BCE0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -122827,7 +119479,7 @@ _0803BBD0: beq _0803BBDE b _0803BD4C _0803BBDE: - ldr r1, _0803BCE4 + ldr r1, =0x02024084 ldrb r2, [r3] movs r0, 0x58 muls r0, r2 @@ -122843,7 +119495,7 @@ _0803BBF2: lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r0, _0803BCE8 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 bge _0803BC86 @@ -122856,7 +119508,7 @@ _0803BC08: lsrs r0, 24 cmp r6, r0 beq _0803BC2C - ldr r1, _0803BCE4 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r5 adds r0, r1 @@ -122873,8 +119525,8 @@ _0803BC2C: lsrs r0, 24 cmp r6, r0 beq _0803BC76 - ldr r3, _0803BCE4 - ldr r0, _0803BCDC + ldr r3, =0x02024084 + ldr r0, =0x02024064 ldrb r0, [r0] movs r2, 0x58 muls r0, r2 @@ -122908,12 +119560,12 @@ _0803BC76: lsls r0, 17 adds r7, r0 adds r5, 0x1 - ldr r0, _0803BCE8 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 blt _0803BC08 _0803BC86: - ldr r4, _0803BCDC + ldr r4, =0x02024064 ldrb r1, [r4] movs r0, 0 str r0, [sp] @@ -122925,7 +119577,7 @@ _0803BC86: lsrs r5, r0, 24 cmp r5, 0 beq _0803BCF8 - ldr r6, _0803BCE4 + ldr r6, =0x02024084 ldrb r0, [r4] movs r3, 0x58 muls r0, r3 @@ -122941,42 +119593,35 @@ _0803BC86: cmp r0, 0x8 bne _0803BCF8 _0803BCBE: - ldr r0, _0803BCEC + ldr r0, =0x02024474 subs r1, r5, 0x1 strb r1, [r0, 0x17] - ldr r2, _0803BCF0 + ldr r2, =0x0202420a adds r0, r1, 0 muls r0, r3 adds r0, r6 adds r0, 0x20 ldrb r0, [r0] strb r0, [r2] - ldr r1, _0803BCF4 + ldr r1, =0x02024332 movs r0, 0x2 b _0803BD90 .align 2, 0 -_0803BCD8: .4byte 0x0202420f -_0803BCDC: .4byte 0x02024064 -_0803BCE0: .4byte 0x02022fec -_0803BCE4: .4byte 0x02024084 -_0803BCE8: .4byte 0x0202406c -_0803BCEC: .4byte 0x02024474 -_0803BCF0: .4byte 0x0202420a -_0803BCF4: .4byte 0x02024332 + .pool _0803BCF8: - ldr r1, _0803BD2C - ldr r0, _0803BD30 + ldr r1, =0x02024084 + ldr r0, =0x02024064 ldrb r2, [r0] movs r0, 0x58 muls r0, r2 adds r1, 0x50 adds r0, r1 ldr r0, [r0] - ldr r1, _0803BD34 + ldr r1, =0x0400e000 ands r0, r1 cmp r0, 0 bne _0803BD22 - ldr r1, _0803BD38 + ldr r1, =0x020242ac lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] @@ -122986,19 +119631,15 @@ _0803BCF8: cmp r0, 0 beq _0803BD40 _0803BD22: - ldr r1, _0803BD3C + ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] movs r0, 0x1 b _0803BD92 .align 2, 0 -_0803BD2C: .4byte 0x02024084 -_0803BD30: .4byte 0x02024064 -_0803BD34: .4byte 0x0400e000 -_0803BD38: .4byte 0x020242ac -_0803BD3C: .4byte 0x02024332 + .pool _0803BD40: - ldr r0, _0803BD50 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x10 ands r0, r1 @@ -123008,35 +119649,31 @@ _0803BD4C: movs r0, 0 b _0803BD92 .align 2, 0 -_0803BD50: .4byte 0x02022fec + .pool _0803BD54: - ldr r0, _0803BD64 + ldr r0, =0x02024474 strb r5, [r0, 0x17] - ldr r1, _0803BD68 + ldr r1, =0x0202420a ldrb r0, [r2] strb r0, [r1] - ldr r1, _0803BD6C + ldr r1, =0x02024332 movs r0, 0x2 b _0803BD90 .align 2, 0 -_0803BD64: .4byte 0x02024474 -_0803BD68: .4byte 0x0202420a -_0803BD6C: .4byte 0x02024332 + .pool _0803BD70: - ldr r0, _0803BD80 + ldr r0, =0x02024474 strb r5, [r0, 0x17] - ldr r1, _0803BD84 + ldr r1, =0x0202420a ldrb r0, [r2] strb r0, [r1] - ldr r1, _0803BD88 + ldr r1, =0x02024332 movs r0, 0x2 b _0803BD90 .align 2, 0 -_0803BD80: .4byte 0x02024474 -_0803BD84: .4byte 0x0202420a -_0803BD88: .4byte 0x02024332 + .pool _0803BD8C: - ldr r1, _0803BD9C + ldr r1, =0x02024332 movs r0, 0x1 _0803BD90: strb r0, [r1, 0x5] @@ -123046,7 +119683,7 @@ _0803BD92: pop {r1} bx r1 .align 2, 0 -_0803BD9C: .4byte 0x02024332 + .pool thumb_func_end sub_803BB88 thumb_func_start sub_803BDA0 @@ -123057,11 +119694,11 @@ sub_803BDA0: @ 803BDA0 lsls r0, 24 lsrs r5, r0, 24 movs r3, 0 - ldr r0, _0803BE3C + ldr r0, =0x0202406e mov r8, r0 - ldr r1, _0803BE40 + ldr r1, =0x0203cf00 mov r12, r1 - ldr r7, _0803BE44 + ldr r7, =0x0202449c lsls r0, r5, 1 adds r4, r0, r5 adds r6, r0, 0 @@ -123084,7 +119721,7 @@ _0803BDBC: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r7, _0803BE44 + ldr r7, =0x0202449c ldr r0, [r7] adds r0, r5, r0 adds r0, 0x5C @@ -123095,7 +119732,7 @@ _0803BDBC: lsrs r1, 24 adds r0, r4, 0 bl sub_81B8FB0 - ldr r0, _0803BE48 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -123107,7 +119744,7 @@ _0803BDBC: movs r0, 0x2 adds r1, r5, 0 eors r1, r0 - ldr r7, _0803BE40 + ldr r7, =0x0203cf00 lsls r0, r1, 1 adds r5, r0, r1 _0803BE1A: @@ -123129,14 +119766,11 @@ _0803BE1A: ble _0803BE1A b _0803BE66 .align 2, 0 -_0803BE3C: .4byte 0x0202406e -_0803BE40: .4byte 0x0203cf00 -_0803BE44: .4byte 0x0202449c -_0803BE48: .4byte 0x02022fec + .pool _0803BE4C: movs r3, 0 adds r2, r6, r5 - ldr r4, _0803BE70 + ldr r4, =0x0203cf00 _0803BE52: ldr r0, [r7] adds r1, r2, r3 @@ -123155,7 +119789,7 @@ _0803BE66: pop {r0} bx r0 .align 2, 0 -_0803BE70: .4byte 0x0203cf00 + .pool thumb_func_end sub_803BDA0 thumb_func_start sub_803BE74 @@ -123166,24 +119800,22 @@ sub_803BE74: @ 803BE74 mov r5, r8 push {r5-r7} sub sp, 0x1C - ldr r0, _0803BE90 + ldr r0, =0x02024332 movs r1, 0 strb r1, [r0, 0x4] - ldr r0, _0803BE94 + ldr r0, =0x02024064 strb r1, [r0] - ldr r0, _0803BE98 + ldr r0, =0x0202406c bl _0803CD12 .align 2, 0 -_0803BE90: .4byte 0x02024332 -_0803BE94: .4byte 0x02024064 -_0803BE98: .4byte 0x0202406c + .pool _0803BE9C: - ldr r4, _0803BEC4 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0803BEC8 + ldr r1, =0x02024332 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -123192,14 +119824,12 @@ _0803BE9C: bl _0803CD04 _0803BEB8: lsls r0, 2 - ldr r1, _0803BECC + ldr r1, =_0803BED0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0803BEC4: .4byte 0x02024064 -_0803BEC8: .4byte 0x02024332 -_0803BECC: .4byte _0803BED0 + .pool .align 2, 0 _0803BED0: .4byte _0803BEF4 @@ -123213,24 +119843,23 @@ _0803BED0: .4byte _0803CC38 _0803BEF4: bl sub_8185FD0 - ldr r1, _0803BF04 - ldr r0, _0803BF08 + ldr r1, =0x02024332 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 bl _0803CC20 .align 2, 0 -_0803BF04: .4byte 0x02024332 -_0803BF08: .4byte 0x02024064 + .pool _0803BF0C: - ldr r0, _0803BFA4 + ldr r0, =0x02024064 ldrb r1, [r0] - ldr r4, _0803BFA8 + ldr r4, =0x0202449c ldr r0, [r4] adds r1, r0 adds r1, 0x5C movs r0, 0x6 strb r0, [r1] - ldr r0, _0803BFAC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -123247,7 +119876,7 @@ _0803BF0C: ldr r1, [r4] adds r1, 0x91 ldrb r1, [r1] - ldr r2, _0803BFB0 + ldr r2, =0x0832a328 lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -123255,7 +119884,7 @@ _0803BF0C: ands r1, r0 cmp r1, 0 bne _0803BF68 - ldr r4, _0803BFB4 + ldr r4, =0x02024332 adds r0, r5, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -123266,12 +119895,12 @@ _0803BF0C: beq _0803BF68 bl _0803CD04 _0803BF68: - ldr r0, _0803BFA8 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x91 ldrb r3, [r0] - ldr r1, _0803BFB0 - ldr r4, _0803BFA4 + ldr r1, =0x0832a328 + ldr r4, =0x02024064 ldrb r2, [r4] lsls r0, r2, 2 adds r0, r1 @@ -123279,40 +119908,35 @@ _0803BF68: ands r3, r0 cmp r3, 0 beq _0803BFD0 - ldr r0, _0803BFB8 + ldr r0, =0x0202421c adds r0, r2, r0 movs r1, 0xD strb r1, [r0] - ldr r0, _0803BFAC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _0803BFBC - ldr r0, _0803BFB4 + ldr r0, =0x02024332 ldrb r1, [r4] adds r1, r0 movs r0, 0x5 strb r0, [r1] bl _0803CD04 .align 2, 0 -_0803BFA4: .4byte 0x02024064 -_0803BFA8: .4byte 0x0202449c -_0803BFAC: .4byte 0x02022fec -_0803BFB0: .4byte 0x0832a328 -_0803BFB4: .4byte 0x02024332 -_0803BFB8: .4byte 0x0202421c + .pool _0803BFBC: - ldr r0, _0803BFCC + ldr r0, =0x02024332 ldrb r1, [r4] adds r1, r0 movs r0, 0x4 strb r0, [r1] bl _0803CD04 .align 2, 0 -_0803BFCC: .4byte 0x02024332 + .pool _0803BFD0: - ldr r1, _0803C000 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 adds r1, 0x50 @@ -123329,20 +119953,18 @@ _0803BFD0: cmp r1, 0 beq _0803C00C _0803BFF0: - ldr r0, _0803C004 + ldr r0, =0x0202421c adds r0, r2, r0 strb r3, [r0] - ldr r1, _0803C008 + ldr r1, =0x02024332 ldrb r0, [r4] bl _0803CC72 .align 2, 0 -_0803C000: .4byte 0x02024084 -_0803C004: .4byte 0x0202421c -_0803C008: .4byte 0x02024332 + .pool _0803C00C: - ldr r0, _0803C024 + ldr r0, =0x0202421c ldrb r1, [r0] - ldr r0, _0803C028 + ldr r0, =0x02023864 ldrb r2, [r0, 0x1] ldrb r0, [r0, 0x2] lsls r0, 8 @@ -123351,12 +119973,11 @@ _0803C00C: bl dp01_build_cmdbuf_x12_a_bb bl _0803CB68 .align 2, 0 -_0803C024: .4byte 0x0202421c -_0803C028: .4byte 0x02023864 + .pool _0803C02C: - ldr r3, _0803C090 - ldr r1, _0803C094 - ldr r6, _0803C098 + ldr r3, =0x02024068 + ldr r1, =0x0832a328 + ldr r6, =0x02024064 ldrb r5, [r6] lsls r0, r5, 2 adds r0, r1 @@ -123376,14 +119997,14 @@ _0803C02C: beq _0803C058 bl _0803CD04 _0803C058: - ldr r4, _0803C09C + ldr r4, =0x02023864 lsls r0, r5, 9 adds r4, 0x1 adds r0, r4 ldrb r1, [r0] adds r0, r5, 0 bl sub_8184FBC - ldr r1, _0803C0A0 + ldr r1, =0x0202421c ldrb r0, [r6] adds r1, r0, r1 lsls r0, 9 @@ -123399,17 +120020,12 @@ _0803C058: b _0803C6C4 _0803C084: lsls r0, 2 - ldr r1, _0803C0A4 + ldr r1, =_0803C0A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0803C090: .4byte 0x02024068 -_0803C094: .4byte 0x0832a328 -_0803C098: .4byte 0x02024064 -_0803C09C: .4byte 0x02023864 -_0803C0A0: .4byte 0x0202421c -_0803C0A4: .4byte _0803C0A8 + .pool .align 2, 0 _0803C0A8: .4byte _0803C0DC @@ -123430,15 +120046,15 @@ _0803C0DC: lsls r0, 24 cmp r0, 0 beq _0803C134 - ldr r0, _0803C124 - ldr r3, _0803C128 + ldr r0, =0x02024332 + ldr r3, =0x02024064 ldrb r1, [r3] adds r1, r0 movs r4, 0 movs r0, 0x6 strb r0, [r1] ldrb r1, [r3] - ldr r2, _0803C12C + ldr r2, =0x0202449c ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -123452,7 +120068,7 @@ _0803C0DC: ldrb r1, [r3] ldr r2, [r2] adds r2, r1, r2 - ldr r0, _0803C130 + ldr r0, =0x02023864 lsls r1, 9 adds r0, 0x3 adds r1, r0 @@ -123460,13 +120076,10 @@ _0803C0DC: strb r0, [r2, 0xC] bl _0803CD70 .align 2, 0 -_0803C124: .4byte 0x02024332 -_0803C128: .4byte 0x02024064 -_0803C12C: .4byte 0x0202449c -_0803C130: .4byte 0x02023864 + .pool _0803C134: - ldr r3, _0803C174 - ldr r5, _0803C178 + ldr r3, =0x020242bc + ldr r5, =0x02024064 ldrb r4, [r5] lsls r0, r4, 3 subs r0, r4 @@ -123475,12 +120088,12 @@ _0803C134: ldrh r2, [r0, 0x6] cmp r2, 0 beq _0803C188 - ldr r1, _0803C17C + ldr r1, =0x02024274 lsls r0, r4, 1 adds r0, r1 strh r2, [r0] ldrb r2, [r5] - ldr r0, _0803C180 + ldr r0, =0x0202449c ldr r1, [r0] adds r1, r2, r1 adds r1, 0x80 @@ -123490,21 +120103,17 @@ _0803C134: adds r0, r3 ldrb r0, [r0, 0xC] strb r0, [r1] - ldr r1, _0803C184 + ldr r1, =0x02024332 ldrb r0, [r5] adds r0, r1 movs r1, 0x4 strb r1, [r0] bl _0803CD70 .align 2, 0 -_0803C174: .4byte 0x020242bc -_0803C178: .4byte 0x02024064 -_0803C17C: .4byte 0x02024274 -_0803C180: .4byte 0x0202449c -_0803C184: .4byte 0x02024332 + .pool _0803C188: add r2, sp, 0x4 - ldr r3, _0803C228 + ldr r3, =0x02024084 movs r1, 0x58 adds r0, r4, 0 muls r0, r1 @@ -123573,7 +120182,7 @@ _0803C1CA: adds r4, 0x1 cmp r4, 0x3 ble _0803C1CA - ldr r0, _0803C22C + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 ands r1, r0 @@ -123583,46 +120192,41 @@ _0803C1CA: bl sub_8033E30 b _0803C42E .align 2, 0 -_0803C228: .4byte 0x02024084 -_0803C22C: .4byte 0x02022fec + .pool _0803C230: - ldr r0, _0803C254 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0803C258 + ldr r1, =0x021f0902 ands r0, r1 cmp r0, 0 bne _0803C23E b _0803C48C _0803C23E: - ldr r4, _0803C25C + ldr r4, =0x02024064 ldrb r0, [r4] movs r1, 0x1 bl sub_8185008 - ldr r1, _0803C260 + ldr r1, =0x02024220 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0803C264 + ldr r1, =0x082db879 b _0803C784 .align 2, 0 -_0803C254: .4byte 0x02022fec -_0803C258: .4byte 0x021f0902 -_0803C25C: .4byte 0x02024064 -_0803C260: .4byte 0x02024220 -_0803C264: .4byte 0x082db879 + .pool _0803C268: - ldr r5, _0803C2D0 + ldr r5, =0x02024064 ldrb r0, [r5] - ldr r3, _0803C2D4 + ldr r3, =0x0202449c ldr r1, [r3] adds r1, r0, r1 adds r1, 0x58 - ldr r2, _0803C2D8 + ldr r2, =0x0202406e lsls r0, 1 adds r0, r2 ldrh r0, [r0] strb r0, [r1] - ldr r7, _0803C2DC + ldr r7, =0x02024084 ldrb r2, [r5] movs r6, 0x58 adds r0, r2, 0 @@ -123631,18 +120235,18 @@ _0803C268: adds r1, 0x50 adds r0, r1 ldr r1, [r0] - ldr r0, _0803C2E0 + ldr r0, =0x0400e000 ands r1, r0 cmp r1, 0 bne _0803C2B8 - ldr r0, _0803C2E4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 bne _0803C2B8 - ldr r0, _0803C2E8 + ldr r0, =0x020242ac lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -123652,7 +120256,7 @@ _0803C268: cmp r1, 0 beq _0803C2EC _0803C2B8: - ldr r0, _0803C2D0 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r1, r0, 1 adds r1, r0 @@ -123665,13 +120269,7 @@ _0803C2B8: movs r2, 0x6 b _0803C400 .align 2, 0 -_0803C2D0: .4byte 0x02024064 -_0803C2D4: .4byte 0x0202449c -_0803C2D8: .4byte 0x0202406e -_0803C2DC: .4byte 0x02024084 -_0803C2E0: .4byte 0x0400e000 -_0803C2E4: .4byte 0x02022fec -_0803C2E8: .4byte 0x020242ac + .pool _0803C2EC: str r1, [sp] movs r0, 0xC @@ -123712,7 +120310,7 @@ _0803C2EC: cmp r0, 0x1A bne _0803C374 _0803C33C: - ldr r5, _0803C3A0 + ldr r5, =0x02024064 ldrb r1, [r5] movs r0, 0 str r0, [sp] @@ -123724,7 +120322,7 @@ _0803C33C: lsrs r4, r0, 24 cmp r4, 0 beq _0803C3B0 - ldr r2, _0803C3A4 + ldr r2, =0x02024084 ldrb r1, [r5] movs r0, 0x58 muls r0, r1 @@ -123746,10 +120344,10 @@ _0803C374: orrs r1, r0 lsls r1, 24 lsrs r1, 24 - ldr r0, _0803C3A8 + ldr r0, =0x0202420a ldrb r3, [r0] - ldr r4, _0803C3AC - ldr r0, _0803C3A0 + ldr r4, =0x0202449c + ldr r0, =0x02024064 ldrb r0, [r0] lsls r2, r0, 1 adds r2, r0 @@ -123762,38 +120360,33 @@ _0803C374: bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f b _0803C42E .align 2, 0 -_0803C3A0: .4byte 0x02024064 -_0803C3A4: .4byte 0x02024084 -_0803C3A8: .4byte 0x0202420a -_0803C3AC: .4byte 0x0202449c + .pool _0803C3B0: - ldr r0, _0803C3CC + ldr r0, =0x02024064 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x2 bne _0803C3D8 - ldr r0, _0803C3D0 + ldr r0, =0x0202421c ldrb r0, [r0] cmp r0, 0x2 bne _0803C3D8 - ldr r0, _0803C3D4 + ldr r0, =0x0202449c ldr r3, [r0] adds r0, r3, 0 adds r0, 0x5C b _0803C3EE .align 2, 0 -_0803C3CC: .4byte 0x02024064 -_0803C3D0: .4byte 0x0202421c -_0803C3D4: .4byte 0x0202449c + .pool _0803C3D8: ldrb r0, [r4] cmp r0, 0x3 bne _0803C410 - ldr r0, _0803C408 + ldr r0, =0x0202421c ldrb r0, [r0, 0x1] cmp r0, 0x2 bne _0803C410 - ldr r0, _0803C40C + ldr r0, =0x0202449c ldr r3, [r0] adds r0, r3, 0 adds r0, 0x5D @@ -123812,11 +120405,10 @@ _0803C400: bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f b _0803C42E .align 2, 0 -_0803C408: .4byte 0x0202421c -_0803C40C: .4byte 0x0202449c + .pool _0803C410: - ldr r2, _0803C438 - ldr r0, _0803C43C + ldr r2, =0x0202449c + ldr r0, =0x02024064 ldrb r0, [r0] lsls r1, r0, 1 adds r1, r0 @@ -123830,13 +120422,12 @@ _0803C410: movs r3, 0 bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f _0803C42E: - ldr r0, _0803C43C + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution b _0803C6C4 .align 2, 0 -_0803C438: .4byte 0x0202449c -_0803C43C: .4byte 0x02024064 + .pool _0803C440: bl sub_806B8B0 lsls r0, 24 @@ -123844,21 +120435,21 @@ _0803C440: bne _0803C44C b _0803C6C4 _0803C44C: - ldr r1, _0803C478 - ldr r3, _0803C47C + ldr r1, =0x02024220 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 2 adds r0, r1 - ldr r1, _0803C480 + ldr r1, =0x082dab11 str r1, [r0] - ldr r0, _0803C484 + ldr r0, =0x02024332 ldrb r1, [r3] adds r1, r0 movs r4, 0 movs r0, 0x6 strb r0, [r1] ldrb r1, [r3] - ldr r2, _0803C488 + ldr r2, =0x0202449c ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -123866,14 +120457,10 @@ _0803C44C: ldrb r1, [r3] b _0803C7A0 .align 2, 0 -_0803C478: .4byte 0x02024220 -_0803C47C: .4byte 0x02024064 -_0803C480: .4byte 0x082dab11 -_0803C484: .4byte 0x02024332 -_0803C488: .4byte 0x0202449c + .pool _0803C48C: - ldr r2, _0803C4AC - ldr r4, _0803C4B0 + ldr r2, =0x0202449c + ldr r4, =0x02024064 ldrb r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -123886,11 +120473,10 @@ _0803C48C: bl dp01_battle_side_mark_buffer_for_execution b _0803C6C4 .align 2, 0 -_0803C4AC: .4byte 0x0202449c -_0803C4B0: .4byte 0x02024064 + .pool _0803C4B4: - ldr r4, _0803C544 - ldr r5, _0803C548 + ldr r4, =0x02024332 + ldr r5, =0x02024064 ldrb r0, [r5] adds r0, r4 movs r1, 0x7 @@ -123915,7 +120501,7 @@ _0803C4B4: lsls r0, 24 lsrs r0, 24 bl battle_get_side_with_given_state - ldr r1, _0803C54C + ldr r1, =0x02024084 lsls r0, 24 lsrs r0, 24 movs r7, 0x58 @@ -123952,11 +120538,9 @@ _0803C532: bl dp01_battle_side_mark_buffer_for_execution bl _0803CD70 .align 2, 0 -_0803C544: .4byte 0x02024332 -_0803C548: .4byte 0x02024064 -_0803C54C: .4byte 0x02024084 + .pool _0803C550: - ldr r4, _0803C58C + ldr r4, =0x0202421c ldrb r0, [r5] bl battle_get_per_side_status eors r0, r6 @@ -123981,7 +120565,7 @@ _0803C550: bl sub_8185008 b _0803C6AE .align 2, 0 -_0803C58C: .4byte 0x0202421c + .pool _0803C590: ldrb r0, [r5] bl battle_get_per_side_status @@ -124012,7 +120596,7 @@ _0803C5B6: ldrb r0, [r0] cmp r0, 0 bne _0803C628 - ldr r4, _0803C620 + ldr r4, =0x0202433c ldrb r0, [r5] bl battle_get_per_side_status eors r0, r6 @@ -124026,7 +120610,7 @@ _0803C5B6: lsls r0, 29 cmp r0, 0 blt _0803C616 - ldr r4, _0803C624 + ldr r4, =0x020242bc ldrb r0, [r5] bl battle_get_per_side_status eors r0, r6 @@ -124048,18 +120632,17 @@ _0803C616: eors r0, r6 b _0803C668 .align 2, 0 -_0803C620: .4byte 0x0202433c -_0803C624: .4byte 0x020242bc + .pool _0803C628: - ldr r0, _0803C67C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 beq _0803C690 - ldr r4, _0803C680 - ldr r6, _0803C684 + ldr r4, =0x0202421c + ldr r6, =0x02024064 ldrb r0, [r6] bl battle_get_per_side_status movs r5, 0x2 @@ -124073,8 +120656,8 @@ _0803C628: ldrb r0, [r0] cmp r0, 0 bne _0803C690 - ldr r1, _0803C688 - ldr r0, _0803C68C + ldr r1, =0x03005d80 + ldr r0, =0x0203bd30 ldr r0, [r0] str r0, [r1] ldrb r0, [r6] @@ -124090,13 +120673,9 @@ _0803C668: bl sub_8185008 b _0803C6AE .align 2, 0 -_0803C67C: .4byte 0x02022fec -_0803C680: .4byte 0x0202421c -_0803C684: .4byte 0x02024064 -_0803C688: .4byte 0x03005d80 -_0803C68C: .4byte 0x0203bd30 + .pool _0803C690: - ldr r0, _0803C6C0 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status movs r1, 0x2 @@ -124111,14 +120690,14 @@ _0803C690: _0803C6AE: movs r0, 0 bl dp01_build_cmdbuf_x32_32_32_32 - ldr r0, _0803C6C0 + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution b _0803CD70 .align 2, 0 -_0803C6C0: .4byte 0x02024064 + .pool _0803C6C4: - ldr r1, _0803C704 + ldr r1, =0x02022fec ldr r2, [r1] movs r5, 0x8 adds r0, r2, 0 @@ -124126,12 +120705,12 @@ _0803C6C4: adds r3, r1, 0 cmp r0, 0 beq _0803C720 - ldr r0, _0803C708 + ldr r0, =0x043f0100 ands r2, r0 cmp r2, 0 beq _0803C720 - ldr r0, _0803C70C - ldr r4, _0803C710 + ldr r0, =0x02023864 + ldr r4, =0x02024064 ldrb r2, [r4] lsls r1, r2, 9 adds r0, 0x1 @@ -124139,33 +120718,27 @@ _0803C6C4: ldrb r0, [r1] cmp r0, 0x3 bne _0803C720 - ldr r1, _0803C714 + ldr r1, =0x02024220 lsls r0, r2, 2 adds r0, r1 - ldr r1, _0803C718 + ldr r1, =0x082db9ba str r1, [r0] - ldr r1, _0803C71C + ldr r1, =0x02024332 ldrb r0, [r4] adds r0, r1 movs r3, 0 strb r5, [r0] b _0803C792 .align 2, 0 -_0803C704: .4byte 0x02022fec -_0803C708: .4byte 0x043f0100 -_0803C70C: .4byte 0x02023864 -_0803C710: .4byte 0x02024064 -_0803C714: .4byte 0x02024220 -_0803C718: .4byte 0x082db9ba -_0803C71C: .4byte 0x02024332 + .pool _0803C720: ldr r0, [r3] - ldr r1, _0803C74C + ldr r1, =0x0200000a ands r0, r1 cmp r0, 0x8 bne _0803C760 - ldr r0, _0803C750 - ldr r4, _0803C754 + ldr r0, =0x02023864 + ldr r4, =0x02024064 ldrb r1, [r4] lsls r1, 9 adds r0, 0x1 @@ -124173,25 +120746,21 @@ _0803C720: ldrb r0, [r1] cmp r0, 0x3 bne _0803C760 - ldr r0, _0803C758 + ldr r0, =0x082daafe bl b_call_bc_move_exec - ldr r1, _0803C75C + ldr r1, =0x02024332 ldrb r0, [r4] adds r0, r1 b _0803CC20 .align 2, 0 -_0803C74C: .4byte 0x0200000a -_0803C750: .4byte 0x02023864 -_0803C754: .4byte 0x02024064 -_0803C758: .4byte 0x082daafe -_0803C75C: .4byte 0x02024332 + .pool _0803C760: bl sub_803BB88 lsls r0, 24 cmp r0, 0 beq _0803C7C4 - ldr r0, _0803C7AC - ldr r4, _0803C7B0 + ldr r0, =0x02023864 + ldr r4, =0x02024064 ldrb r2, [r4] lsls r1, r2, 9 adds r0, 0x1 @@ -124199,13 +120768,13 @@ _0803C760: ldrb r0, [r1] cmp r0, 0x3 bne _0803C7C4 - ldr r1, _0803C7B4 + ldr r1, =0x02024220 lsls r0, r2, 2 adds r0, r1 - ldr r1, _0803C7B8 + ldr r1, =0x082dab0b _0803C784: str r1, [r0] - ldr r0, _0803C7BC + ldr r0, =0x02024332 ldrb r1, [r4] adds r1, r0 movs r3, 0 @@ -124213,7 +120782,7 @@ _0803C784: strb r0, [r1] _0803C792: ldrb r1, [r4] - ldr r2, _0803C7C0 + ldr r2, =0x0202449c ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -124227,25 +120796,19 @@ _0803C7A0: strb r0, [r1] b _0803CD70 .align 2, 0 -_0803C7AC: .4byte 0x02023864 -_0803C7B0: .4byte 0x02024064 -_0803C7B4: .4byte 0x02024220 -_0803C7B8: .4byte 0x082dab0b -_0803C7BC: .4byte 0x02024332 -_0803C7C0: .4byte 0x0202449c + .pool _0803C7C4: - ldr r2, _0803C7D0 - ldr r0, _0803C7D4 + ldr r2, =0x02024332 + ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 b _0803CB74 .align 2, 0 -_0803C7D0: .4byte 0x02024332 -_0803C7D4: .4byte 0x02024064 + .pool _0803C7D8: - ldr r4, _0803C81C - ldr r1, _0803C820 - ldr r3, _0803C824 + ldr r4, =0x02024068 + ldr r1, =0x0832a328 + ldr r3, =0x02024064 ldrb r5, [r3] lsls r0, r5, 2 adds r0, r1 @@ -124266,7 +120829,7 @@ _0803C7D8: beq _0803C804 b _0803CD04 _0803C804: - ldr r1, _0803C828 + ldr r1, =0x0202421c adds r0, r5, r1 ldrb r0, [r0] adds r2, r1, 0 @@ -124275,16 +120838,12 @@ _0803C804: b _0803CD04 _0803C812: lsls r0, 2 - ldr r1, _0803C82C + ldr r1, =_0803C830 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0803C81C: .4byte 0x02024068 -_0803C820: .4byte 0x0832a328 -_0803C824: .4byte 0x02024064 -_0803C828: .4byte 0x0202421c -_0803C82C: .4byte _0803C830 + .pool .align 2, 0 _0803C830: .4byte _0803C858 @@ -124298,7 +120857,7 @@ _0803C830: .4byte _0803CA98 .4byte _0803CABC _0803C858: - ldr r1, _0803C874 + ldr r1, =0x02023864 ldrb r3, [r4] lsls r0, r3, 9 adds r1, 0x1 @@ -124312,7 +120871,7 @@ _0803C858: beq _0803C87E b _0803C88A .align 2, 0 -_0803C874: .4byte 0x02023864 + .pool _0803C878: adds r0, r3, r2 strb r1, [r0] @@ -124326,8 +120885,8 @@ _0803C87E: _0803C88A: movs r0, 0x2 bl sub_818603C - ldr r4, _0803C8C0 - ldr r6, _0803C8C4 + ldr r4, =0x02023864 + ldr r6, =0x02024064 ldrb r3, [r6] lsls r1, r3, 9 adds r5, r4, 0x2 @@ -124338,10 +120897,10 @@ _0803C88A: ldrb r0, [r1] lsls r0, 8 orrs r2, r0 - ldr r0, _0803C8C8 + ldr r0, =0x0000ffff cmp r2, r0 bne _0803C8D0 - ldr r0, _0803C8CC + ldr r0, =0x02024332 adds r0, r3, r0 movs r1, 0x1 strb r1, [r0] @@ -124349,10 +120908,7 @@ _0803C88A: bl sub_8185008 b _0803CD04 .align 2, 0 -_0803C8C0: .4byte 0x02023864 -_0803C8C4: .4byte 0x02024064 -_0803C8C8: .4byte 0x0000ffff -_0803C8CC: .4byte 0x02024332 + .pool _0803C8D0: bl sub_803FB4C lsls r0, 24 @@ -124361,14 +120917,14 @@ _0803C8D0: ldrb r0, [r6] movs r1, 0x1 bl sub_8185008 - ldr r0, _0803C914 + ldr r0, =0x02024332 ldrb r1, [r6] adds r1, r0 movs r3, 0 movs r0, 0x6 strb r0, [r1] ldrb r1, [r6] - ldr r2, _0803C918 + ldr r2, =0x0202449c ldr r0, [r2] adds r1, r0 adds r1, 0x54 @@ -124386,10 +120942,9 @@ _0803C8D0: strb r0, [r1] b _0803CD70 .align 2, 0 -_0803C914: .4byte 0x02024332 -_0803C918: .4byte 0x0202449c + .pool _0803C91C: - ldr r0, _0803C988 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 @@ -124408,7 +120963,7 @@ _0803C91C: bl sub_8184FBC _0803C942: ldrb r0, [r6] - ldr r4, _0803C98C + ldr r4, =0x0202449c ldr r1, [r4] adds r1, r0, r1 adds r1, 0x80 @@ -124416,11 +120971,11 @@ _0803C942: adds r0, r5 ldrb r0, [r0] strb r0, [r1] - ldr r0, _0803C990 + ldr r0, =0x02024274 ldrb r2, [r6] lsls r5, r2, 1 adds r5, r0 - ldr r3, _0803C994 + ldr r3, =0x02024084 ldr r4, [r4] adds r0, r2, r4 adds r0, 0x80 @@ -124439,18 +120994,14 @@ _0803C942: adds r0, r7 ldrb r0, [r0] strb r0, [r4, 0xC] - ldr r0, _0803C998 + ldr r0, =0x02024332 ldrb r1, [r6] b _0803CB72 .align 2, 0 -_0803C988: .4byte 0x02022fec -_0803C98C: .4byte 0x0202449c -_0803C990: .4byte 0x02024274 -_0803C994: .4byte 0x02024084 -_0803C998: .4byte 0x02024332 + .pool _0803C99C: - ldr r2, _0803C9C4 - ldr r5, _0803C9C8 + ldr r2, =0x02023864 + ldr r5, =0x02024064 ldrb r4, [r5] lsls r1, r4, 9 adds r0, r2, 0x1 @@ -124465,19 +121016,16 @@ _0803C99C: bne _0803C9BA b _0803CC1C _0803C9BA: - ldr r0, _0803C9CC + ldr r0, =0x02024208 strh r3, [r0] - ldr r0, _0803C9D0 + ldr r0, =0x02024332 ldrb r1, [r5] b _0803CB72 .align 2, 0 -_0803C9C4: .4byte 0x02023864 -_0803C9C8: .4byte 0x02024064 -_0803C9CC: .4byte 0x02024208 -_0803C9D0: .4byte 0x02024332 + .pool _0803C9D4: - ldr r0, _0803C9F8 - ldr r4, _0803C9FC + ldr r0, =0x02023864 + ldr r4, =0x02024064 ldrb r2, [r4] lsls r1, r2, 9 adds r0, 0x1 @@ -124485,7 +121033,7 @@ _0803C9D4: ldrb r0, [r1] cmp r0, 0x6 bne _0803CA04 - ldr r0, _0803CA00 + ldr r0, =0x02024332 adds r0, r2, r0 movs r1, 0x1 strb r1, [r0] @@ -124493,49 +121041,43 @@ _0803C9D4: bl sub_8185008 b _0803CD04 .align 2, 0 -_0803C9F8: .4byte 0x02023864 -_0803C9FC: .4byte 0x02024064 -_0803CA00: .4byte 0x02024332 + .pool _0803CA04: bl sub_803CDF8 b _0803CB6E _0803CA0A: - ldr r2, _0803CA20 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 8 orrs r0, r1 str r0, [r2] - ldr r2, _0803CA24 - ldr r0, _0803CA28 + ldr r2, =0x02024332 + ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 b _0803CB74 .align 2, 0 -_0803CA20: .4byte 0x02024280 -_0803CA24: .4byte 0x02024332 -_0803CA28: .4byte 0x02024064 + .pool _0803CA2C: - ldr r2, _0803CA38 - ldr r0, _0803CA3C + ldr r2, =0x02024332 + ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 b _0803CB74 .align 2, 0 -_0803CA38: .4byte 0x02024332 -_0803CA3C: .4byte 0x02024064 + .pool _0803CA40: - ldr r2, _0803CA4C - ldr r0, _0803CA50 + ldr r2, =0x02024332 + ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 b _0803CB74 .align 2, 0 -_0803CA4C: .4byte 0x02024332 -_0803CA50: .4byte 0x02024064 + .pool _0803CA54: - ldr r3, _0803CA78 - ldr r0, _0803CA7C + ldr r3, =0x02023864 + ldr r0, =0x02024064 ldrb r4, [r0] lsls r1, r4, 9 adds r0, r3, 0x1 @@ -124550,51 +121092,45 @@ _0803CA54: bne _0803CA72 b _0803CC1C _0803CA72: - ldr r1, _0803CA80 + ldr r1, =0x02024332 adds r1, r4, r1 b _0803CB74 .align 2, 0 -_0803CA78: .4byte 0x02023864 -_0803CA7C: .4byte 0x02024064 -_0803CA80: .4byte 0x02024332 + .pool _0803CA84: - ldr r2, _0803CA90 - ldr r0, _0803CA94 + ldr r2, =0x02024332 + ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 b _0803CB74 .align 2, 0 -_0803CA90: .4byte 0x02024332 -_0803CA94: .4byte 0x02024064 + .pool _0803CA98: - ldr r2, _0803CAB0 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 8 orrs r0, r1 str r0, [r2] - ldr r2, _0803CAB4 - ldr r0, _0803CAB8 + ldr r2, =0x02024332 + ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 b _0803CB74 .align 2, 0 -_0803CAB0: .4byte 0x02024280 -_0803CAB4: .4byte 0x02024332 -_0803CAB8: .4byte 0x02024064 + .pool _0803CABC: - ldr r2, _0803CAC8 - ldr r0, _0803CACC + ldr r2, =0x02024332 + ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 b _0803CB74 .align 2, 0 -_0803CAC8: .4byte 0x02024332 -_0803CACC: .4byte 0x02024064 + .pool _0803CAD0: - ldr r3, _0803CB48 - ldr r6, _0803CB4C - ldr r0, _0803CB50 + ldr r3, =0x02024068 + ldr r6, =0x0832a328 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r6 @@ -124620,7 +121156,7 @@ _0803CAFA: negs r1, r0 orrs r1, r0 lsrs r4, r1, 31 - ldr r0, _0803CB54 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x41 ands r0, r1 @@ -124634,7 +121170,7 @@ _0803CAFA: adds r0, r5, 0 eors r0, r1 bl battle_get_side_with_given_state - ldr r1, _0803CB58 + ldr r1, =0x0202449c ldr r1, [r1] adds r1, 0x91 ldrb r1, [r1] @@ -124652,23 +121188,19 @@ _0803CB3C: bl sub_8034464 b _0803CB66 .align 2, 0 -_0803CB48: .4byte 0x02024068 -_0803CB4C: .4byte 0x0832a328 -_0803CB50: .4byte 0x02024064 -_0803CB54: .4byte 0x02022fec -_0803CB58: .4byte 0x0202449c + .pool _0803CB5C: movs r0, 0 movs r1, 0x1 adds r2, r4, 0 bl sub_8034464 _0803CB66: - ldr r4, _0803CB7C + ldr r4, =0x02024064 _0803CB68: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0803CB6E: - ldr r0, _0803CB80 + ldr r0, =0x02024332 ldrb r1, [r4] _0803CB72: adds r1, r0 @@ -124678,12 +121210,11 @@ _0803CB74: strb r0, [r1] b _0803CD04 .align 2, 0 -_0803CB7C: .4byte 0x02024064 -_0803CB80: .4byte 0x02024332 + .pool _0803CB84: - ldr r3, _0803CBB8 - ldr r1, _0803CBBC - ldr r0, _0803CBC0 + ldr r3, =0x02024068 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -124703,20 +121234,17 @@ _0803CB84: beq _0803CBAE b _0803CD04 _0803CBAE: - ldr r1, _0803CBC4 + ldr r1, =0x02024332 ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] b _0803CD04 .align 2, 0 -_0803CBB8: .4byte 0x02024068 -_0803CBBC: .4byte 0x0832a328 -_0803CBC0: .4byte 0x02024064 -_0803CBC4: .4byte 0x02024332 + .pool _0803CBC8: - ldr r5, _0803CBE8 + ldr r5, =0x02024064 ldrb r2, [r5] - ldr r0, _0803CBEC + ldr r0, =0x0202449c ldr r0, [r0] adds r1, r2, r0 adds r0, r1, 0 @@ -124724,20 +121252,18 @@ _0803CBC8: ldrb r0, [r0] cmp r0, 0 beq _0803CCB4 - ldr r0, _0803CBF0 + ldr r0, =0x02024332 adds r0, r2, r0 adds r1, 0x84 ldrb r1, [r1] strb r1, [r0] b _0803CD04 .align 2, 0 -_0803CBE8: .4byte 0x02024064 -_0803CBEC: .4byte 0x0202449c -_0803CBF0: .4byte 0x02024332 + .pool _0803CBF4: - ldr r3, _0803CC28 - ldr r1, _0803CC2C - ldr r0, _0803CC30 + ldr r3, =0x02024068 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r4, [r0] lsls r0, r4, 2 adds r0, r1 @@ -124756,46 +121282,43 @@ _0803CBF4: cmp r0, 0 bne _0803CD04 _0803CC1C: - ldr r0, _0803CC34 + ldr r0, =0x02024332 adds r0, r4, r0 _0803CC20: movs r1, 0x1 strb r1, [r0] b _0803CD04 .align 2, 0 -_0803CC28: .4byte 0x02024068 -_0803CC2C: .4byte 0x0832a328 -_0803CC30: .4byte 0x02024064 -_0803CC34: .4byte 0x02024332 + .pool _0803CC38: - ldr r5, _0803CC7C + ldr r5, =0x02024064 ldrb r2, [r5] - ldr r4, _0803CC80 + ldr r4, =0x0202449c ldr r0, [r4] adds r0, r2, r0 adds r0, 0x54 ldrb r0, [r0] cmp r0, 0 beq _0803CCB4 - ldr r0, _0803CC84 + ldr r0, =0x02023864 lsls r1, r2, 9 adds r0, 0x1 adds r1, r0 ldrb r0, [r1] cmp r0, 0xD bne _0803CC94 - ldr r2, _0803CC88 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 8 orrs r0, r1 str r0, [r2] - ldr r1, _0803CC8C + ldr r1, =0x0202421c ldrb r0, [r5] adds r0, r1 movs r1, 0x3 strb r1, [r0] - ldr r1, _0803CC90 + ldr r1, =0x02024332 ldrb r0, [r5] _0803CC72: adds r0, r1 @@ -124803,17 +121326,12 @@ _0803CC72: strb r1, [r0] b _0803CD04 .align 2, 0 -_0803CC7C: .4byte 0x02024064 -_0803CC80: .4byte 0x0202449c -_0803CC84: .4byte 0x02023864 -_0803CC88: .4byte 0x02024280 -_0803CC8C: .4byte 0x0202421c -_0803CC90: .4byte 0x02024332 + .pool _0803CC94: adds r0, r2, 0 movs r1, 0x1 bl sub_8185008 - ldr r2, _0803CCB0 + ldr r2, =0x02024332 ldrb r0, [r5] adds r2, r0, r2 ldr r1, [r4] @@ -124823,19 +121341,19 @@ _0803CC94: strb r0, [r2] b _0803CD04 .align 2, 0 -_0803CCB0: .4byte 0x02024332 + .pool _0803CCB4: - ldr r0, _0803CD80 + ldr r0, =0x0202420b strb r2, [r0] - ldr r7, _0803CD84 - ldr r6, _0803CD88 + ldr r7, =0x02024214 + ldr r6, =0x02024220 ldrb r0, [r5] lsls r0, 2 adds r0, r6 ldr r4, [r0] str r4, [r7] - ldr r3, _0803CD8C - ldr r1, _0803CD90 + ldr r3, =0x02024068 + ldr r1, =0x0832a328 ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -124853,7 +121371,7 @@ _0803CCB4: ands r0, r1 cmp r0, 0 bne _0803CCFA - ldr r0, _0803CD94 + ldr r0, =0x0831bd10 ldrb r1, [r4] lsls r1, 2 adds r1, r0 @@ -124866,11 +121384,11 @@ _0803CCFA: ldr r1, [r7] str r1, [r0] _0803CD04: - ldr r0, _0803CD98 + ldr r0, =0x02024064 ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, _0803CD9C + ldr r0, =0x0202406c lsls r1, 24 lsrs r1, 24 _0803CD12: @@ -124880,17 +121398,17 @@ _0803CD12: bcs _0803CD1E bl _0803BE9C _0803CD1E: - ldr r0, _0803CDA0 + ldr r0, =0x02024332 ldrb r0, [r0, 0x4] ldrb r1, [r5] cmp r0, r1 bne _0803CD70 movs r0, 0x1 bl sub_818603C - ldr r1, _0803CDA4 - ldr r0, _0803CDA8 + ldr r1, =0x03005d04 + ldr r0, =sub_803D2E8 + 1 str r0, [r1] - ldr r0, _0803CDAC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 15 @@ -124902,14 +121420,14 @@ _0803CD1E: cmp r4, r5 bge _0803CD70 _0803CD4A: - ldr r0, _0803CDB0 + ldr r0, =0x0202421c adds r0, r4, r0 ldrb r0, [r0] cmp r0, 0x2 bne _0803CD66 lsls r0, r4, 24 lsrs r0, 24 - ldr r1, _0803CDB4 + ldr r1, =0x0202449c ldr r1, [r1] adds r1, r4, r1 adds r1, 0x5C @@ -124917,7 +121435,7 @@ _0803CD4A: bl sub_80571DC _0803CD66: adds r4, 0x1 - ldr r0, _0803CD9C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _0803CD4A @@ -124931,20 +121449,7 @@ _0803CD70: pop {r0} bx r0 .align 2, 0 -_0803CD80: .4byte 0x0202420b -_0803CD84: .4byte 0x02024214 -_0803CD88: .4byte 0x02024220 -_0803CD8C: .4byte 0x02024068 -_0803CD90: .4byte 0x0832a328 -_0803CD94: .4byte 0x0831bd10 -_0803CD98: .4byte 0x02024064 -_0803CD9C: .4byte 0x0202406c -_0803CDA0: .4byte 0x02024332 -_0803CDA4: .4byte 0x03005d04 -_0803CDA8: .4byte sub_803D2E8 + 1 -_0803CDAC: .4byte 0x02022fec -_0803CDB0: .4byte 0x0202421c -_0803CDB4: .4byte 0x0202449c + .pool thumb_func_end sub_803BE74 thumb_func_start sub_803CDB8 @@ -124952,12 +121457,12 @@ sub_803CDB8: @ 803CDB8 push {r4,r5,lr} movs r3, 0 movs r1, 0 - ldr r0, _0803CDE8 + ldr r0, =0x0202406c ldrb r2, [r0] adds r5, r0, 0 cmp r3, r2 bge _0803CDDA - ldr r4, _0803CDEC + ldr r4, =0x02024332 _0803CDCA: adds r0, r1, r4 ldrb r0, [r0] @@ -124976,8 +121481,7 @@ _0803CDDA: movs r0, 0 b _0803CDF2 .align 2, 0 -_0803CDE8: .4byte 0x0202406c -_0803CDEC: .4byte 0x02024332 + .pool _0803CDF0: movs r0, 0x1 _0803CDF2: @@ -124989,13 +121493,13 @@ _0803CDF2: thumb_func_start sub_803CDF8 sub_803CDF8: @ 803CDF8 push {r4-r7,lr} - ldr r7, _0803CECC + ldr r7, =0x02024064 ldrb r0, [r7] - ldr r6, _0803CED0 + ldr r6, =0x0202449c ldr r1, [r6] adds r1, r0, r1 adds r1, 0x5C - ldr r4, _0803CED4 + ldr r4, =0x02023864 lsls r0, 9 adds r2, r4, 0x1 adds r0, r2 @@ -125006,7 +121510,7 @@ sub_803CDF8: @ 803CDF8 adds r1, r2 ldrb r1, [r1] bl sub_8184FBC - ldr r0, _0803CED8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 @@ -125095,10 +121599,7 @@ _0803CEC6: pop {r0} bx r0 .align 2, 0 -_0803CECC: .4byte 0x02024064 -_0803CED0: .4byte 0x0202449c -_0803CED4: .4byte 0x02023864 -_0803CED8: .4byte 0x02022fec + .pool thumb_func_end sub_803CDF8 thumb_func_start sub_803CEDC @@ -125108,14 +121609,14 @@ sub_803CEDC: @ 803CEDC lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _0803CF08 + ldr r2, =0x0202407a adds r4, r0, r2 ldrb r5, [r4] adds r2, r1, r2 ldrb r3, [r2] strb r3, [r4] strb r5, [r2] - ldr r2, _0803CF0C + ldr r2, =0x0202407e adds r0, r2 ldrb r5, [r0] adds r1, r2 @@ -125126,8 +121627,7 @@ sub_803CEDC: @ 803CEDC pop {r0} bx r0 .align 2, 0 -_0803CF08: .4byte 0x0202407a -_0803CF0C: .4byte 0x0202407e + .pool thumb_func_end sub_803CEDC thumb_func_start b_first_side @@ -125168,7 +121668,7 @@ b_first_side: @ 803CF10 lsls r0, 24 cmp r0, 0 bne _0803CFD8 - ldr r1, _0803CF90 + ldr r1, =0x02024084 movs r0, 0x58 mov r2, r9 muls r2, r0 @@ -125178,7 +121678,7 @@ b_first_side: @ 803CF10 ldrb r3, [r0] cmp r3, 0x21 bne _0803CF7C - ldr r0, _0803CF94 + ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x7 ands r0, r1 @@ -125187,7 +121687,7 @@ b_first_side: @ 803CF10 _0803CF7C: cmp r3, 0x22 bne _0803CF98 - ldr r0, _0803CF94 + ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -125197,8 +121697,7 @@ _0803CF8C: movs r3, 0x2 b _0803CF9A .align 2, 0 -_0803CF90: .4byte 0x02024084 -_0803CF94: .4byte 0x020243cc + .pool _0803CF98: movs r3, 0x1 _0803CF9A: @@ -125206,13 +121705,13 @@ _0803CF9A: mov r1, r10 muls r1, r0 adds r0, r1, 0 - ldr r2, _0803CFD0 + ldr r2, =0x02024084 adds r0, r2 adds r0, 0x20 ldrb r2, [r0] cmp r2, 0x21 bne _0803CFBA - ldr r0, _0803CFD4 + ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x7 ands r0, r1 @@ -125221,7 +121720,7 @@ _0803CF9A: _0803CFBA: cmp r2, 0x22 bne _0803CFDA - ldr r0, _0803CFD4 + ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -125231,14 +121730,13 @@ _0803CFCA: movs r7, 0x2 b _0803CFDC .align 2, 0 -_0803CFD0: .4byte 0x02024084 -_0803CFD4: .4byte 0x020243cc + .pool _0803CFD8: movs r3, 0x1 _0803CFDA: movs r7, 0x1 _0803CFDC: - ldr r1, _0803D020 + ldr r1, =0x02024084 movs r0, 0x58 mov r2, r9 muls r2, r0 @@ -125246,7 +121744,7 @@ _0803CFDC: adds r4, r0, r1 ldrh r0, [r4, 0x6] muls r3, r0 - ldr r2, _0803D024 + ldr r2, =0x08329d2e movs r1, 0x1B ldrsb r1, [r4, r1] lsls r1, 1 @@ -125261,7 +121759,7 @@ _0803CFDC: ldrh r0, [r4, 0x2E] cmp r0, 0xAF bne _0803D02C - ldr r1, _0803D028 + ldr r1, =0x02024404 mov r3, r9 lsls r0, r3, 3 subs r0, r3 @@ -125271,9 +121769,7 @@ _0803CFDC: ldrb r5, [r0, 0x1A] b _0803D040 .align 2, 0 -_0803D020: .4byte 0x02024084 -_0803D024: .4byte 0x08329d2e -_0803D028: .4byte 0x02024404 + .pool _0803D02C: ldrh r0, [r4, 0x2E] bl itemid_get_x12 @@ -125284,13 +121780,13 @@ _0803D02C: lsls r0, 24 lsrs r5, r0, 24 _0803D040: - ldr r0, _0803D0FC + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0803D100 + ldr r1, =0x023f0102 ands r0, r1 cmp r0, 0 bne _0803D074 - ldr r0, _0803D104 + ldr r0, =0x00000869 bl flag_check lsls r0, 24 cmp r0, 0 @@ -125314,7 +121810,7 @@ _0803D074: lsrs r2, 1 mov r8, r2 _0803D07E: - ldr r1, _0803D108 + ldr r1, =0x02024084 movs r0, 0x58 mov r3, r9 muls r3, r0 @@ -125332,7 +121828,7 @@ _0803D07E: _0803D09C: cmp r6, 0x1A bne _0803D0B8 - ldr r0, _0803D10C + ldr r0, =0x02024330 ldrh r4, [r0] lsls r0, r5, 16 subs r0, r5 @@ -125344,7 +121840,7 @@ _0803D09C: negs r1, r1 mov r8, r1 _0803D0B8: - ldr r1, _0803D108 + ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -125353,7 +121849,7 @@ _0803D0B8: ldrh r0, [r4, 0x6] adds r3, r0, 0 muls r3, r7 - ldr r2, _0803D110 + ldr r2, =0x08329d2e movs r1, 0x1B ldrsb r1, [r4, r1] lsls r1, 1 @@ -125368,7 +121864,7 @@ _0803D0B8: ldrh r0, [r4, 0x2E] cmp r0, 0xAF bne _0803D118 - ldr r1, _0803D114 + ldr r1, =0x02024404 mov r3, r10 lsls r0, r3, 3 subs r0, r3 @@ -125378,13 +121874,7 @@ _0803D0B8: ldrb r5, [r0, 0x1A] b _0803D12C .align 2, 0 -_0803D0FC: .4byte 0x02022fec -_0803D100: .4byte 0x023f0102 -_0803D104: .4byte 0x00000869 -_0803D108: .4byte 0x02024084 -_0803D10C: .4byte 0x02024330 -_0803D110: .4byte 0x08329d2e -_0803D114: .4byte 0x02024404 + .pool _0803D118: ldrh r0, [r4, 0x2E] bl itemid_get_x12 @@ -125395,13 +121885,13 @@ _0803D118: lsls r0, 24 lsrs r5, r0, 24 _0803D12C: - ldr r0, _0803D1A4 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0803D1A8 + ldr r1, =0x023f0102 ands r0, r1 cmp r0, 0 bne _0803D15C - ldr r0, _0803D1AC + ldr r0, =0x00000869 bl flag_check lsls r0, 24 cmp r0, 0 @@ -125421,7 +121911,7 @@ _0803D15C: bne _0803D162 lsrs r7, 1 _0803D162: - ldr r2, _0803D1B0 + ldr r2, =0x02024084 movs r0, 0x58 mov r1, r10 muls r1, r0 @@ -125438,7 +121928,7 @@ _0803D162: _0803D17E: cmp r6, 0x1A bne _0803D198 - ldr r0, _0803D1B4 + ldr r0, =0x02024330 ldrh r4, [r0] lsls r0, r5, 16 subs r0, r5 @@ -125455,20 +121945,16 @@ _0803D198: movs r3, 0 b _0803D254 .align 2, 0 -_0803D1A4: .4byte 0x02022fec -_0803D1A8: .4byte 0x023f0102 -_0803D1AC: .4byte 0x00000869 -_0803D1B0: .4byte 0x02024084 -_0803D1B4: .4byte 0x02024330 + .pool _0803D1B8: - ldr r0, _0803D1D8 + ldr r0, =0x0202421c mov r3, r9 adds r1, r3, r0 ldrb r1, [r1] adds r2, r0, 0 cmp r1, 0 bne _0803D208 - ldr r0, _0803D1DC + ldr r0, =0x0202433c lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1] @@ -125478,10 +121964,9 @@ _0803D1B8: movs r3, 0xA5 b _0803D20A .align 2, 0 -_0803D1D8: .4byte 0x0202421c -_0803D1DC: .4byte 0x0202433c + .pool _0803D1E0: - ldr r0, _0803D200 + ldr r0, =0x0202449c ldr r0, [r0] add r0, r9 adds r0, 0x80 @@ -125492,14 +121977,13 @@ _0803D1E0: muls r3, r1 adds r1, r3, 0 adds r0, r1 - ldr r1, _0803D204 + ldr r1, =0x02024084 adds r1, 0xC adds r0, r1 ldrh r3, [r0] b _0803D20A .align 2, 0 -_0803D200: .4byte 0x0202449c -_0803D204: .4byte 0x02024084 + .pool _0803D208: movs r3, 0 _0803D20A: @@ -125508,7 +121992,7 @@ _0803D20A: ldrb r0, [r0] cmp r0, 0 bne _0803D254 - ldr r0, _0803D228 + ldr r0, =0x0202433c lsls r1, 4 adds r1, r0 ldrb r0, [r1] @@ -125518,9 +122002,9 @@ _0803D20A: movs r2, 0xA5 b _0803D256 .align 2, 0 -_0803D228: .4byte 0x0202433c + .pool _0803D22C: - ldr r0, _0803D24C + ldr r0, =0x0202449c ldr r0, [r0] add r0, r10 adds r0, 0x80 @@ -125531,18 +122015,17 @@ _0803D22C: muls r2, r1 adds r1, r2, 0 adds r0, r1 - ldr r1, _0803D250 + ldr r1, =0x02024084 adds r1, 0xC adds r0, r1 ldrh r2, [r0] b _0803D256 .align 2, 0 -_0803D24C: .4byte 0x0202449c -_0803D250: .4byte 0x02024084 + .pool _0803D254: movs r2, 0 _0803D256: - ldr r4, _0803D2A0 + ldr r4, =0x0831c898 lsls r0, r3, 1 adds r0, r3 lsls r0, 2 @@ -125579,7 +122062,7 @@ _0803D27A: movs r3, 0x2 b _0803D2D4 .align 2, 0 -_0803D2A0: .4byte 0x0831c898 + .pool _0803D2A4: cmp r8, r7 bcs _0803D2D6 @@ -125629,25 +122112,25 @@ sub_803D2E8: @ 803D2E8 mov r5, r8 push {r5-r7} movs r3, 0 - ldr r0, _0803D33C + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0803D354 - ldr r0, _0803D340 + ldr r0, =0x02024064 strb r3, [r0] - ldr r4, _0803D344 + ldr r4, =0x0202406c mov r8, r0 ldrb r0, [r4] cmp r3, r0 bcc _0803D310 b _0803D54A _0803D310: - ldr r7, _0803D348 - ldr r6, _0803D34C + ldr r7, =0x0202407a + ldr r6, =0x0202421c mov r2, r8 - ldr r5, _0803D350 + ldr r5, =0x0202407e _0803D318: adds r1, r3, r7 ldrb r0, [r2] @@ -125668,26 +122151,21 @@ _0803D318: bcc _0803D318 b _0803D54A .align 2, 0 -_0803D33C: .4byte 0x02022fec -_0803D340: .4byte 0x02024064 -_0803D344: .4byte 0x0202406c -_0803D348: .4byte 0x0202407a -_0803D34C: .4byte 0x0202421c -_0803D350: .4byte 0x0202407e + .pool _0803D354: movs r2, 0x2 ands r1, r2 cmp r1, 0 beq _0803D3A4 - ldr r0, _0803D398 + ldr r0, =0x02024064 strb r3, [r0] - ldr r1, _0803D39C + ldr r1, =0x0202406c mov r8, r0 adds r2, r1, 0 ldrb r2, [r2] cmp r3, r2 bcs _0803D3C0 - ldr r0, _0803D3A0 + ldr r0, =0x0202421c ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x3 @@ -125699,7 +122177,7 @@ _0803D376: strb r0, [r7] lsls r0, 24 lsrs r0, 24 - ldr r1, _0803D39C + ldr r1, =0x0202406c ldrb r1, [r1] cmp r0, r1 bcs _0803D3C0 @@ -125710,13 +122188,11 @@ _0803D376: bne _0803D376 b _0803D3BE .align 2, 0 -_0803D398: .4byte 0x02024064 -_0803D39C: .4byte 0x0202406c -_0803D3A0: .4byte 0x0202421c + .pool _0803D3A4: - ldr r1, _0803D428 + ldr r1, =0x0202421c ldrb r0, [r1] - ldr r4, _0803D42C + ldr r4, =0x02024064 mov r8, r4 cmp r0, 0x3 bne _0803D3B4 @@ -125733,34 +122209,34 @@ _0803D3BE: _0803D3C0: cmp r3, 0x5 bne _0803D448 - ldr r6, _0803D430 - ldr r1, _0803D428 + ldr r6, =0x0202407a + ldr r1, =0x0202421c mov r2, r8 ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] strb r0, [r6] - ldr r2, _0803D434 + ldr r2, =0x0202407e mov r3, r8 ldrb r0, [r3] strb r0, [r2] movs r3, 0x1 movs r5, 0 adds r4, r1, 0 - ldr r7, _0803D438 + ldr r7, =0x03005d04 mov r10, r7 - ldr r0, _0803D43C + ldr r0, =bc_80154A0 + 1 mov r12, r0 - ldr r1, _0803D440 + ldr r1, =0x0202449c mov r9, r1 - ldr r7, _0803D444 + ldr r7, =0x0202406c ldrb r7, [r7] cmp r5, r7 bge _0803D41A adds r7, r6, 0 adds r6, r4, 0 adds r4, r2, 0 - ldr r2, _0803D444 + ldr r2, =0x0202406c _0803D3FC: mov r0, r8 ldrb r0, [r0] @@ -125786,26 +122262,19 @@ _0803D41A: ldr r0, [r4] b _0803D554 .align 2, 0 -_0803D428: .4byte 0x0202421c -_0803D42C: .4byte 0x02024064 -_0803D430: .4byte 0x0202407a -_0803D434: .4byte 0x0202407e -_0803D438: .4byte 0x03005d04 -_0803D43C: .4byte bc_80154A0 + 1 -_0803D440: .4byte 0x0202449c -_0803D444: .4byte 0x0202406c + .pool _0803D448: movs r0, 0 mov r7, r8 strb r0, [r7] - ldr r1, _0803D4D8 + ldr r1, =0x0202406c ldrb r0, [r1] cmp r0, 0 beq _0803D48E - ldr r6, _0803D4DC + ldr r6, =0x0202421c mov r2, r8 - ldr r5, _0803D4E0 - ldr r4, _0803D4E4 + ldr r5, =0x0202407a + ldr r4, =0x0202407e _0803D45E: ldrb r0, [r2] adds r0, r6 @@ -125828,7 +122297,7 @@ _0803D47C: strb r0, [r2] lsls r0, 24 lsrs r0, 24 - ldr r1, _0803D4D8 + ldr r1, =0x0202406c ldrb r1, [r1] cmp r0, r1 bcc _0803D45E @@ -125836,13 +122305,13 @@ _0803D48E: movs r0, 0 mov r2, r8 strb r0, [r2] - ldr r4, _0803D4D8 + ldr r4, =0x0202406c ldrb r0, [r4] cmp r0, 0 beq _0803D4D2 - ldr r6, _0803D4DC - ldr r5, _0803D4E0 - ldr r4, _0803D4E4 + ldr r6, =0x0202421c + ldr r5, =0x0202407a + ldr r4, =0x0202407e _0803D4A2: ldrb r0, [r2] adds r0, r6 @@ -125865,7 +122334,7 @@ _0803D4C0: strb r0, [r2] lsls r0, 24 lsrs r0, 24 - ldr r1, _0803D4D8 + ldr r1, =0x0202406c ldrb r1, [r1] cmp r0, r1 bcc _0803D4A2 @@ -125873,21 +122342,18 @@ _0803D4D2: movs r5, 0 b _0803D540 .align 2, 0 -_0803D4D8: .4byte 0x0202406c -_0803D4DC: .4byte 0x0202421c -_0803D4E0: .4byte 0x0202407a -_0803D4E4: .4byte 0x0202407e + .pool _0803D4E8: adds r4, r5, 0x1 adds r7, r4, 0 ldrb r1, [r1] cmp r7, r1 bge _0803D53E - ldr r6, _0803D568 + ldr r6, =0x0202407a lsls r2, r5, 24 mov r8, r2 _0803D4F8: - ldr r0, _0803D56C + ldr r0, =0x0202407e adds r1, r5, r0 ldrb r3, [r1] adds r0, r4, r0 @@ -125917,23 +122383,23 @@ _0803D4F8: bl sub_803CEDC _0803D534: adds r4, 0x1 - ldr r0, _0803D570 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _0803D4F8 _0803D53E: adds r5, r7, 0 _0803D540: - ldr r1, _0803D570 + ldr r1, =0x0202406c ldrb r0, [r1] subs r0, 0x1 cmp r5, r0 blt _0803D4E8 _0803D54A: - ldr r1, _0803D574 - ldr r0, _0803D578 + ldr r1, =0x03005d04 + ldr r0, =bc_80154A0 + 1 str r0, [r1] - ldr r0, _0803D57C + ldr r0, =0x0202449c ldr r0, [r0] _0803D554: adds r0, 0x48 @@ -125947,12 +122413,7 @@ _0803D554: pop {r0} bx r0 .align 2, 0 -_0803D568: .4byte 0x0202407a -_0803D56C: .4byte 0x0202407e -_0803D570: .4byte 0x0202406c -_0803D574: .4byte 0x03005d04 -_0803D578: .4byte bc_80154A0 + 1 -_0803D57C: .4byte 0x0202449c + .pool thumb_func_end sub_803D2E8 thumb_func_start sub_803D580 @@ -125965,19 +122426,19 @@ sub_803D580: @ 803D580 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _0803D5D8 + ldr r1, =0x02024064 movs r0, 0 strb r0, [r1] - ldr r0, _0803D5DC + ldr r0, =0x0202406c ldrb r2, [r0] adds r5, r1, 0 cmp r2, 0 beq _0803D678 - ldr r7, _0803D5E0 + ldr r7, =0x0202433c adds r6, r5, 0 - ldr r0, _0803D5E4 + ldr r0, =0x020240d4 mov r12, r0 - ldr r1, _0803D5E8 + ldr r1, =0x020242bc mov r8, r1 mov r10, r8 _0803D5AE: @@ -126002,11 +122463,7 @@ _0803D5AE: strb r0, [r1] b _0803D648 .align 2, 0 -_0803D5D8: .4byte 0x02024064 -_0803D5DC: .4byte 0x0202406c -_0803D5E0: .4byte 0x0202433c -_0803D5E4: .4byte 0x020240d4 -_0803D5E8: .4byte 0x020242bc + .pool _0803D5EC: ldrb r0, [r6] lsls r0, 4 @@ -126053,7 +122510,7 @@ _0803D616: muls r2, r0 add r2, r12 ldr r0, [r2] - ldr r1, _0803D690 + ldr r1, =0xffbfffff ands r0, r1 str r0, [r2] _0803D648: @@ -126069,7 +122526,7 @@ _0803D648: muls r2, r0 add r2, r12 ldr r0, [r2] - ldr r1, _0803D694 + ldr r1, =0xfeffffff ands r0, r1 str r0, [r2] _0803D666: @@ -126078,13 +122535,13 @@ _0803D666: strb r0, [r5] lsls r0, 24 lsrs r0, 24 - ldr r1, _0803D698 + ldr r1, =0x0202406c ldrb r1, [r1] cmp r0, r1 bcc _0803D5AE _0803D678: movs r0, 0 - ldr r2, _0803D69C + ldr r2, =0x02024294 strb r0, [r2, 0x8] strb r0, [r2, 0x14] pop {r3-r5} @@ -126095,26 +122552,23 @@ _0803D678: pop {r0} bx r0 .align 2, 0 -_0803D690: .4byte 0xffbfffff -_0803D694: .4byte 0xfeffffff -_0803D698: .4byte 0x0202406c -_0803D69C: .4byte 0x02024294 + .pool thumb_func_end sub_803D580 thumb_func_start sub_803D6A0 sub_803D6A0: @ 803D6A0 push {r4-r6,lr} - ldr r2, _0803D6E4 + ldr r2, =0x02024064 movs r0, 0 strb r0, [r2] - ldr r0, _0803D6E8 + ldr r0, =0x0202406c ldrb r1, [r0] adds r6, r0, 0 cmp r1, 0 beq _0803D6DE adds r3, r2, 0 movs r4, 0 - ldr r5, _0803D6EC + ldr r5, =0x0202437c _0803D6B8: ldrb r1, [r3] lsls r0, r1, 2 @@ -126141,33 +122595,31 @@ _0803D6DE: pop {r0} bx r0 .align 2, 0 -_0803D6E4: .4byte 0x02024064 -_0803D6E8: .4byte 0x0202406c -_0803D6EC: .4byte 0x0202437c + .pool thumb_func_end sub_803D6A0 thumb_func_start bc_80154A0 bc_80154A0: @ 803D6F0 push {r4-r7,lr} - ldr r0, _0803D778 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 8 ands r0, r1 cmp r0, 0 bne _0803D7AE - ldr r2, _0803D77C + ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x48 - ldr r1, _0803D780 + ldr r1, =0x0202406c ldrb r0, [r0] mov r12, r2 adds r6, r1, 0 ldrb r1, [r6] cmp r0, r1 bcs _0803D7AE - ldr r5, _0803D784 - ldr r4, _0803D788 + ldr r5, =0x02024064 + ldr r4, =0x0202420b movs r7, 0x84 lsls r7, 1 _0803D71C: @@ -126179,14 +122631,14 @@ _0803D71C: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, _0803D78C + ldr r1, =0x02024274 ldrb r3, [r5] lsls r0, r3, 1 adds r0, r1 ldrh r0, [r0] cmp r0, r7 bne _0803D7A0 - ldr r1, _0803D790 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 adds r1, 0x4C @@ -126196,7 +122648,7 @@ _0803D71C: ands r0, r1 cmp r0, 0 bne _0803D7A0 - ldr r2, _0803D794 + ldr r2, =0x020242bc ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -126206,27 +122658,18 @@ _0803D71C: lsls r0, 31 cmp r0, 0 bne _0803D7A0 - ldr r0, _0803D798 + ldr r0, =0x0202433c lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 29 cmp r0, 0 blt _0803D7A0 - ldr r0, _0803D79C + ldr r0, =0x082db1ff bl b_call_bc_move_exec b _0803D7E8 .align 2, 0 -_0803D778: .4byte 0x02024280 -_0803D77C: .4byte 0x0202449c -_0803D780: .4byte 0x0202406c -_0803D784: .4byte 0x02024064 -_0803D788: .4byte 0x0202420b -_0803D78C: .4byte 0x02024274 -_0803D790: .4byte 0x02024084 -_0803D794: .4byte 0x020242bc -_0803D798: .4byte 0x0202433c -_0803D79C: .4byte 0x082db1ff + .pool _0803D7A0: mov r2, r12 ldr r0, [r2] @@ -126237,29 +122680,29 @@ _0803D7A0: bcc _0803D71C _0803D7AE: bl b_clear_atk_up_if_hit_flag_unless_enraged - ldr r1, _0803D7F0 + ldr r1, =0x02024082 movs r0, 0 strb r0, [r1] - ldr r1, _0803D7F4 - ldr r0, _0803D7F8 + ldr r1, =0x02024083 + ldr r0, =0x0202407a movs r3, 0 ldrb r0, [r0] strb r0, [r1] - ldr r0, _0803D7FC + ldr r0, =0x02024400 movs r2, 0 strh r3, [r0] - ldr r0, _0803D800 + ldr r0, =0x0202449c ldr r0, [r0] strb r2, [r0, 0x13] - ldr r1, _0803D804 - ldr r0, _0803D808 + ldr r1, =0x03005d04 + ldr r0, =bc_bs_exec + 1 str r0, [r1] - ldr r0, _0803D80C + ldr r0, =0x02024332 strb r2, [r0, 0x3] strb r2, [r0, 0x4] - ldr r0, _0803D810 + ldr r0, =0x02024474 strb r2, [r0, 0x16] - ldr r0, _0803D814 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0x20 @@ -126269,53 +122712,44 @@ _0803D7E8: pop {r0} bx r0 .align 2, 0 -_0803D7F0: .4byte 0x02024082 -_0803D7F4: .4byte 0x02024083 -_0803D7F8: .4byte 0x0202407a -_0803D7FC: .4byte 0x02024400 -_0803D800: .4byte 0x0202449c -_0803D804: .4byte 0x03005d04 -_0803D808: .4byte bc_bs_exec + 1 -_0803D80C: .4byte 0x02024332 -_0803D810: .4byte 0x02024474 -_0803D814: .4byte 0x020244a8 + .pool thumb_func_end bc_80154A0 thumb_func_start bc_bs_exec bc_bs_exec: @ 803D818 push {r4-r6,lr} - ldr r6, _0803D86C + ldr r6, =0x0202433a ldrb r0, [r6] - ldr r2, _0803D870 + ldr r2, =0x02024083 cmp r0, 0 beq _0803D828 movs r0, 0xC strb r0, [r2] _0803D828: - ldr r5, _0803D874 + ldr r5, =0x0202449c ldr r0, [r5] adds r0, 0x4B - ldr r4, _0803D878 + ldr r4, =0x02024082 ldrb r1, [r4] strb r1, [r0] - ldr r1, _0803D87C + ldr r1, =0x0831bc0c ldrb r0, [r2] lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _call_via_r0 - ldr r0, _0803D880 + ldr r0, =0x0202406c ldrb r1, [r4] ldrb r0, [r0] cmp r1, r0 bcc _0803D894 - ldr r2, _0803D884 + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _0803D888 + ldr r1, =0xffefffff ands r0, r1 str r0, [r2] - ldr r3, _0803D88C - ldr r2, _0803D890 + ldr r3, =0x03005d04 + ldr r2, =0x0831bc44 ldrb r1, [r6] movs r0, 0x7F ands r0, r1 @@ -126325,27 +122759,18 @@ _0803D828: str r0, [r3] b _0803D8AC .align 2, 0 -_0803D86C: .4byte 0x0202433a -_0803D870: .4byte 0x02024083 -_0803D874: .4byte 0x0202449c -_0803D878: .4byte 0x02024082 -_0803D87C: .4byte 0x0831bc0c -_0803D880: .4byte 0x0202406c -_0803D884: .4byte 0x02024280 -_0803D888: .4byte 0xffefffff -_0803D88C: .4byte 0x03005d04 -_0803D890: .4byte 0x0831bc44 + .pool _0803D894: ldr r0, [r5] adds r0, 0x4B ldrb r0, [r0] cmp r0, r1 beq _0803D8AC - ldr r2, _0803D8B4 + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _0803D8B8 + ldr r1, =0xfffffdff ands r0, r1 - ldr r1, _0803D8BC + ldr r1, =0xfff7ffff ands r0, r1 str r0, [r2] _0803D8AC: @@ -126353,36 +122778,34 @@ _0803D8AC: pop {r0} bx r0 .align 2, 0 -_0803D8B4: .4byte 0x02024280 -_0803D8B8: .4byte 0xfffffdff -_0803D8BC: .4byte 0xfff7ffff + .pool thumb_func_end bc_bs_exec thumb_func_start sub_803D8C0 sub_803D8C0: @ 803D8C0 push {r4,lr} - ldr r1, _0803D8FC + ldr r1, =0x02024083 movs r0, 0 strb r0, [r1] - ldr r1, _0803D900 + ldr r1, =0x02022fec ldr r2, [r1] - ldr r0, _0803D904 + ldr r0, =0x02000002 ands r0, r2 cmp r0, 0 beq _0803D920 - ldr r1, _0803D908 - ldr r4, _0803D90C + ldr r1, =0x020375f0 + ldr r4, =0x0202433a ldrb r0, [r4] strh r0, [r1] - ldr r1, _0803D910 + ldr r1, =0x02022f58 ldrb r0, [r4] strb r0, [r1] movs r0, 0 bl battle_get_side_with_given_state - ldr r1, _0803D914 + ldr r1, =0x0202420b strb r0, [r1] - ldr r1, _0803D918 - ldr r0, _0803D91C + ldr r1, =0x02024214 + ldr r0, =0x082daa35 str r0, [r1] ldrb r1, [r4] movs r0, 0x7F @@ -126390,42 +122813,30 @@ sub_803D8C0: @ 803D8C0 strb r0, [r4] b _0803DAA4 .align 2, 0 -_0803D8FC: .4byte 0x02024083 -_0803D900: .4byte 0x02022fec -_0803D904: .4byte 0x02000002 -_0803D908: .4byte 0x020375f0 -_0803D90C: .4byte 0x0202433a -_0803D910: .4byte 0x02022f58 -_0803D914: .4byte 0x0202420b -_0803D918: .4byte 0x02024214 -_0803D91C: .4byte 0x082daa35 + .pool _0803D920: movs r0, 0x8 ands r0, r2 cmp r0, 0 beq _0803D95C - ldr r0, _0803D948 + ldr r0, =0x043f0900 ands r2, r0 cmp r2, 0 beq _0803D95C bl sub_805EA60 - ldr r1, _0803D94C - ldr r0, _0803D950 + ldr r1, =0x02024214 + ldr r0, =0x082daa87 str r0, [r1] - ldr r0, _0803D954 + ldr r0, =0x02038bca ldrh r1, [r0] - ldr r0, _0803D958 + ldr r0, =0x000003fe cmp r1, r0 bne _0803D946 b _0803DA8A _0803D946: b _0803DA94 .align 2, 0 -_0803D948: .4byte 0x043f0900 -_0803D94C: .4byte 0x02024214 -_0803D950: .4byte 0x082daa87 -_0803D954: .4byte 0x02038bca -_0803D958: .4byte 0x000003fe + .pool _0803D95C: ldr r0, [r1] movs r1, 0xA @@ -126435,11 +122846,11 @@ _0803D95C: b _0803DA9E _0803D968: bl sub_805EA60 - ldr r1, _0803D994 - ldr r0, _0803D998 + ldr r1, =0x02024214 + ldr r0, =0x082da92d str r0, [r1] - ldr r2, _0803D99C - ldr r0, _0803D9A0 + ldr r2, =0x08310030 + ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -126452,16 +122863,12 @@ _0803D968: b _0803DA94 _0803D98A: lsls r0, 2 - ldr r1, _0803D9A4 + ldr r1, =_0803D9A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0803D994: .4byte 0x02024214 -_0803D998: .4byte 0x082da92d -_0803D99C: .4byte 0x08310030 -_0803D9A0: .4byte 0x02038bca -_0803D9A4: .4byte _0803D9A8 + .pool .align 2, 0 _0803D9A8: .4byte _0803DA80 @@ -126516,11 +122923,11 @@ _0803D9A8: .4byte _0803DA94 .4byte _0803DA80 _0803DA74: - ldr r0, _0803DA7C + ldr r0, =0x00000163 bl song_play_for_text b _0803DAA4 .align 2, 0 -_0803DA7C: .4byte 0x00000163 + .pool _0803DA80: movs r0, 0xD4 lsls r0, 1 @@ -126537,54 +122944,51 @@ _0803DA94: bl song_play_for_text b _0803DAA4 _0803DA9E: - ldr r1, _0803DAB0 - ldr r0, _0803DAB4 + ldr r1, =0x02024214 + ldr r0, =0x082da96a str r0, [r1] _0803DAA4: - ldr r1, _0803DAB8 - ldr r0, _0803DABC + ldr r1, =0x03005d04 + ldr r0, =sub_803DCD8 + 1 str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_0803DAB0: .4byte 0x02024214 -_0803DAB4: .4byte 0x082da96a -_0803DAB8: .4byte 0x03005d04 -_0803DABC: .4byte sub_803DCD8 + 1 + .pool thumb_func_end sub_803D8C0 thumb_func_start sub_803DAC0 sub_803DAC0: @ 803DAC0 push {r4,lr} - ldr r1, _0803DB08 + ldr r1, =0x02024083 movs r0, 0 strb r0, [r1] - ldr r0, _0803DB0C + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _0803DB10 + ldr r0, =0x02000002 ands r0, r1 cmp r0, 0 beq _0803DB7C - ldr r0, _0803DB14 + ldr r0, =0x003f0100 ands r1, r0 cmp r1, 0 beq _0803DB44 - ldr r3, _0803DB18 + ldr r3, =0x0202433a ldrb r2, [r3] movs r0, 0x80 ands r0, r2 cmp r0, 0 beq _0803DB2C - ldr r1, _0803DB1C - ldr r0, _0803DB20 + ldr r1, =0x02024214 + ldr r0, =0x082db9c8 str r0, [r1] movs r0, 0x7F ands r0, r2 strb r0, [r3] - ldr r0, _0803DB24 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _0803DB28 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x8 @@ -126592,37 +122996,28 @@ sub_803DAC0: @ 803DAC0 strb r0, [r1] b _0803DB82 .align 2, 0 -_0803DB08: .4byte 0x02024083 -_0803DB0C: .4byte 0x02022fec -_0803DB10: .4byte 0x02000002 -_0803DB14: .4byte 0x003f0100 -_0803DB18: .4byte 0x0202433a -_0803DB1C: .4byte 0x02024214 -_0803DB20: .4byte 0x082db9c8 -_0803DB24: .4byte 0x03005d90 -_0803DB28: .4byte 0x00000ca9 + .pool _0803DB2C: - ldr r1, _0803DB3C - ldr r0, _0803DB40 + ldr r1, =0x02024214 + ldr r0, =0x082daa0b str r0, [r1] movs r0, 0x7F ands r0, r2 strb r0, [r3] b _0803DB82 .align 2, 0 -_0803DB3C: .4byte 0x02024214 -_0803DB40: .4byte 0x082daa0b + .pool _0803DB44: - ldr r1, _0803DB68 - ldr r4, _0803DB6C + ldr r1, =0x02022f58 + ldr r4, =0x0202433a ldrb r0, [r4] strb r0, [r1] movs r0, 0 bl battle_get_side_with_given_state - ldr r1, _0803DB70 + ldr r1, =0x0202420b strb r0, [r1] - ldr r1, _0803DB74 - ldr r0, _0803DB78 + ldr r1, =0x02024214 + ldr r0, =0x082daa35 str r0, [r1] ldrb r1, [r4] movs r0, 0x7F @@ -126630,38 +123025,31 @@ _0803DB44: strb r0, [r4] b _0803DB82 .align 2, 0 -_0803DB68: .4byte 0x02022f58 -_0803DB6C: .4byte 0x0202433a -_0803DB70: .4byte 0x0202420b -_0803DB74: .4byte 0x02024214 -_0803DB78: .4byte 0x082daa35 + .pool _0803DB7C: - ldr r1, _0803DB90 - ldr r0, _0803DB94 + ldr r1, =0x02024214 + ldr r0, =0x082da96d str r0, [r1] _0803DB82: - ldr r1, _0803DB98 - ldr r0, _0803DB9C + ldr r1, =0x03005d04 + ldr r0, =sub_803DCD8 + 1 str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_0803DB90: .4byte 0x02024214 -_0803DB94: .4byte 0x082da96d -_0803DB98: .4byte 0x03005d04 -_0803DB9C: .4byte sub_803DCD8 + 1 + .pool thumb_func_end sub_803DAC0 thumb_func_start sub_803DBA0 sub_803DBA0: @ 803DBA0 push {lr} - ldr r1, _0803DBDC + ldr r1, =0x02024083 movs r0, 0 strb r0, [r1] - ldr r1, _0803DBE0 + ldr r1, =0x02022fec ldr r2, [r1] - ldr r0, _0803DBE4 + ldr r0, =0x003f0100 ands r0, r2 cmp r0, 0 beq _0803DBFC @@ -126669,15 +123057,15 @@ sub_803DBA0: @ 803DBA0 ands r2, r0 cmp r2, 0 beq _0803DBFC - ldr r1, _0803DBE8 - ldr r0, _0803DBEC + ldr r1, =0x02024214 + ldr r0, =0x082db9c1 str r0, [r1] - ldr r1, _0803DBF0 + ldr r1, =0x0202433a movs r0, 0x9 strb r0, [r1] - ldr r0, _0803DBF4 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _0803DBF8 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x8 @@ -126685,14 +123073,7 @@ sub_803DBA0: @ 803DBA0 strb r0, [r1] b _0803DC6A .align 2, 0 -_0803DBDC: .4byte 0x02024083 -_0803DBE0: .4byte 0x02022fec -_0803DBE4: .4byte 0x003f0100 -_0803DBE8: .4byte 0x02024214 -_0803DBEC: .4byte 0x082db9c1 -_0803DBF0: .4byte 0x0202433a -_0803DBF4: .4byte 0x03005d90 -_0803DBF8: .4byte 0x00000ca9 + .pool _0803DBFC: ldr r0, [r1] movs r1, 0x80 @@ -126700,20 +123081,18 @@ _0803DBFC: ands r0, r1 cmp r0, 0 beq _0803DC24 - ldr r1, _0803DC18 - ldr r0, _0803DC1C + ldr r1, =0x02024214 + ldr r0, =0x082db9c1 str r0, [r1] - ldr r1, _0803DC20 + ldr r1, =0x0202433a movs r0, 0x9 strb r0, [r1] b _0803DC6A .align 2, 0 -_0803DC18: .4byte 0x02024214 -_0803DC1C: .4byte 0x082db9c1 -_0803DC20: .4byte 0x0202433a + .pool _0803DC24: - ldr r1, _0803DC44 - ldr r0, _0803DC48 + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -126724,53 +123103,46 @@ _0803DC24: beq _0803DC54 cmp r0, 0x2 beq _0803DC64 - ldr r1, _0803DC4C - ldr r0, _0803DC50 + ldr r1, =0x02024214 + ldr r0, =0x082daaf0 b _0803DC68 .align 2, 0 -_0803DC44: .4byte 0x0202433c -_0803DC48: .4byte 0x0202420b -_0803DC4C: .4byte 0x02024214 -_0803DC50: .4byte 0x082daaf0 + .pool _0803DC54: - ldr r1, _0803DC5C - ldr r0, _0803DC60 + ldr r1, =0x02024214 + ldr r0, =0x082daadb b _0803DC68 .align 2, 0 -_0803DC5C: .4byte 0x02024214 -_0803DC60: .4byte 0x082daadb + .pool _0803DC64: - ldr r1, _0803DC74 - ldr r0, _0803DC78 + ldr r1, =0x02024214 + ldr r0, =0x082daae9 _0803DC68: str r0, [r1] _0803DC6A: - ldr r1, _0803DC7C - ldr r0, _0803DC80 + ldr r1, =0x03005d04 + ldr r0, =sub_803DCD8 + 1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0803DC74: .4byte 0x02024214 -_0803DC78: .4byte 0x082daae9 -_0803DC7C: .4byte 0x03005d04 -_0803DC80: .4byte sub_803DCD8 + 1 + .pool thumb_func_end sub_803DBA0 thumb_func_start bc_80158BC bc_80158BC: @ 803DC84 - ldr r1, _0803DCB8 + ldr r1, =0x02024083 movs r0, 0 strb r0, [r1] - ldr r1, _0803DCBC + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] - ldr r2, _0803DCC0 + ldr r2, =0x0202420b ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, _0803DCC4 + ldr r3, =0x0202406e ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -126778,22 +123150,15 @@ bc_80158BC: @ 803DC84 strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _0803DCC8 - ldr r0, _0803DCCC + ldr r1, =0x02024214 + ldr r0, =0x082daaf7 str r0, [r1] - ldr r1, _0803DCD0 - ldr r0, _0803DCD4 + ldr r1, =0x03005d04 + ldr r0, =sub_803DCD8 + 1 str r0, [r1] bx lr .align 2, 0 -_0803DCB8: .4byte 0x02024083 -_0803DCBC: .4byte 0x02022f58 -_0803DCC0: .4byte 0x0202420b -_0803DCC4: .4byte 0x0202406e -_0803DCC8: .4byte 0x02024214 -_0803DCCC: .4byte 0x082daaf7 -_0803DCD0: .4byte 0x03005d04 -_0803DCD4: .4byte sub_803DCD8 + 1 + .pool thumb_func_end bc_80158BC thumb_func_start sub_803DCD8 @@ -126801,7 +123166,7 @@ sub_803DCD8: @ 803DCD8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0803DD54 + ldr r0, =0x02024083 ldrb r0, [r0] subs r0, 0xB lsls r0, 24 @@ -126810,30 +123175,30 @@ sub_803DCD8: @ 803DCD8 bls _0803DCEE b _0803DE10 _0803DCEE: - ldr r0, _0803DD58 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _0803DD5C + ldr r0, =0x023f0b92 ands r1, r0 cmp r1, 0 bne _0803DDB6 - ldr r2, _0803DD60 + ldr r2, =0x02024064 strb r1, [r2] - ldr r0, _0803DD64 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r1, r0 bcs _0803DDB2 adds r5, r2, 0 - ldr r0, _0803DD68 + ldr r0, =0x0202406e mov r8, r0 movs r7, 0x64 - ldr r6, _0803DD6C + ldr r6, =0x020244ec _0803DD10: ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0803DDA0 - ldr r4, _0803DD70 + ldr r4, =0x03005d10 ldrh r0, [r4, 0x6] cmp r0, 0 bne _0803DD74 @@ -126859,14 +123224,7 @@ _0803DD10: bl pokemon_getattr b _0803DDA0 .align 2, 0 -_0803DD54: .4byte 0x02024083 -_0803DD58: .4byte 0x02022fec -_0803DD5C: .4byte 0x023f0b92 -_0803DD60: .4byte 0x02024064 -_0803DD64: .4byte 0x0202406c -_0803DD68: .4byte 0x0202406e -_0803DD6C: .4byte 0x020244ec -_0803DD70: .4byte 0x03005d10 + .pool _0803DD74: ldrb r0, [r5] lsls r0, 1 @@ -126892,7 +123250,7 @@ _0803DDA0: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - ldr r1, _0803DDF0 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -126901,13 +123259,13 @@ _0803DDA0: _0803DDB2: bl sub_80EC728 _0803DDB6: - ldr r0, _0803DDF4 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0803DDF8 + ldr r1, =0x023f0b9a ands r0, r1 cmp r0, 0 bne _0803DDD2 - ldr r0, _0803DDFC + ldr r0, =0x03005d10 ldrb r1, [r0, 0x5] movs r0, 0x40 ands r0, r1 @@ -126920,29 +123278,22 @@ _0803DDD2: bl sub_80A2390 movs r0, 0x5 bl sub_80A2F50 - ldr r1, _0803DE00 - ldr r0, _0803DE04 + ldr r1, =0x03005d04 + ldr r0, =sub_803DE40 + 1 str r0, [r1] - ldr r1, _0803DE08 - ldr r0, _0803DE0C + ldr r1, =0x030061e8 + ldr r0, =sub_8038420 + 1 str r0, [r1] b _0803DE2A .align 2, 0 -_0803DDF0: .4byte 0x0202406c -_0803DDF4: .4byte 0x02022fec -_0803DDF8: .4byte 0x023f0b9a -_0803DDFC: .4byte 0x03005d10 -_0803DE00: .4byte 0x03005d04 -_0803DE04: .4byte sub_803DE40 + 1 -_0803DE08: .4byte 0x030061e8 -_0803DE0C: .4byte sub_8038420 + 1 + .pool _0803DE10: - ldr r0, _0803DE34 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0803DE2A - ldr r1, _0803DE38 - ldr r0, _0803DE3C + ldr r1, =0x0831bd10 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -126956,47 +123307,41 @@ _0803DE2A: pop {r0} bx r0 .align 2, 0 -_0803DE34: .4byte 0x02024068 -_0803DE38: .4byte 0x0831bd10 -_0803DE3C: .4byte 0x02024214 + .pool thumb_func_end sub_803DCD8 thumb_func_start sub_803DE40 sub_803DE40: @ 803DE40 push {lr} - ldr r0, _0803DE6C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0803DE86 bl reset_all_obj_data - ldr r0, _0803DE70 + ldr r0, =0x03005d54 ldrb r0, [r0] cmp r0, 0 beq _0803DE62 - ldr r0, _0803DE74 + ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 beq _0803DE80 _0803DE62: - ldr r1, _0803DE78 - ldr r0, _0803DE7C + ldr r1, =0x03005d04 + ldr r0, =c4_overworld + 1 str r0, [r1] b _0803DEA2 .align 2, 0 -_0803DE6C: .4byte 0x02037fd4 -_0803DE70: .4byte 0x03005d54 -_0803DE74: .4byte 0x0202433a -_0803DE78: .4byte 0x03005d04 -_0803DE7C: .4byte c4_overworld + 1 + .pool _0803DE80: - ldr r1, _0803DEA8 - ldr r0, _0803DEAC + ldr r1, =0x03005d04 + ldr r0, =bc_evolution_cutscene + 1 str r0, [r1] _0803DE86: bl Window_FreeMemory - ldr r0, _0803DEB0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -127009,15 +123354,13 @@ _0803DEA2: pop {r0} bx r0 .align 2, 0 -_0803DEA8: .4byte 0x03005d04 -_0803DEAC: .4byte bc_evolution_cutscene + 1 -_0803DEB0: .4byte 0x02022fec + .pool thumb_func_end sub_803DE40 thumb_func_start bc_evolution_cutscene bc_evolution_cutscene: @ 803DEB4 push {r4-r6,lr} - ldr r0, _0803DF0C + ldr r0, =0x03005d54 ldrb r1, [r0] adds r3, r0, 0 cmp r1, 0 @@ -127026,7 +123369,7 @@ _0803DEC0: movs r6, 0 _0803DEC2: ldrb r2, [r3] - ldr r0, _0803DF10 + ldr r0, =0x0832a328 lsls r1, r6, 2 adds r1, r0 ldr r1, [r1] @@ -127039,7 +123382,7 @@ _0803DEC2: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _0803DF14 + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0 @@ -127049,8 +123392,8 @@ _0803DEC2: cmp r4, 0 beq _0803DF20 bl Window_FreeMemory - ldr r0, _0803DF18 - ldr r1, _0803DF1C + ldr r0, =0x03005d04 + ldr r1, =sub_803DF48 + 1 str r1, [r0] lsls r3, r6, 24 lsrs r3, 24 @@ -127060,64 +123403,55 @@ _0803DEC2: bl evolution_cutscene b _0803DF34 .align 2, 0 -_0803DF0C: .4byte 0x03005d54 -_0803DF10: .4byte 0x0832a328 -_0803DF14: .4byte 0x020244ec -_0803DF18: .4byte 0x03005d04 -_0803DF1C: .4byte sub_803DF48 + 1 + .pool _0803DF20: adds r6, 0x1 - ldr r3, _0803DF3C + ldr r3, =0x03005d54 cmp r6, 0x5 ble _0803DEC2 ldrb r0, [r3] cmp r0, 0 bne _0803DEC0 _0803DF2E: - ldr r1, _0803DF40 - ldr r0, _0803DF44 + ldr r1, =0x03005d04 + ldr r0, =c4_overworld + 1 str r0, [r1] _0803DF34: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0803DF3C: .4byte 0x03005d54 -_0803DF40: .4byte 0x03005d04 -_0803DF44: .4byte c4_overworld + 1 + .pool thumb_func_end bc_evolution_cutscene thumb_func_start sub_803DF48 sub_803DF48: @ 803DF48 push {lr} - ldr r0, _0803DF60 + ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, _0803DF64 + ldr r0, =sub_8038420 + 1 cmp r1, r0 bne _0803DF5A - ldr r1, _0803DF68 - ldr r0, _0803DF6C + ldr r1, =0x03005d04 + ldr r0, =bc_evolution_cutscene + 1 str r0, [r1] _0803DF5A: pop {r0} bx r0 .align 2, 0 -_0803DF60: .4byte 0x030022c0 -_0803DF64: .4byte sub_8038420 + 1 -_0803DF68: .4byte 0x03005d04 -_0803DF6C: .4byte bc_evolution_cutscene + 1 + .pool thumb_func_end sub_803DF48 thumb_func_start c4_overworld c4_overworld: @ 803DF70 push {r4-r6,lr} - ldr r6, _0803DFF4 + ldr r6, =0x02022fec ldr r0, [r6] movs r5, 0x2 ands r0, r5 cmp r0, 0 bne _0803DF8C - ldr r4, _0803DFF8 + ldr r4, =0x020244ec adds r0, r4, 0 bl sub_806DCB4 adds r0, r4, 0 @@ -127128,24 +123462,24 @@ _0803DF8C: ands r0, r5 cmp r0, 0 beq _0803DF9E - ldr r0, _0803DFFC + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0803DFEC _0803DF9E: - ldr r1, _0803E000 - ldr r5, _0803E004 + ldr r1, =0x020375f0 + ldr r5, =0x0202433a ldrb r0, [r5] strh r0, [r1] - ldr r3, _0803E008 - ldr r0, _0803E00C + ldr r3, =0x030022c0 + ldr r0, =0x00000439 adds r2, r3, r0 ldrb r1, [r2] movs r0, 0x3 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _0803E010 + ldr r0, =0x03005d00 ldr r0, [r0] str r0, [r3] movs r0, 0x80 @@ -127153,7 +123487,7 @@ _0803DF9E: ands r4, r0 cmp r4, 0 beq _0803DFDE - ldr r0, _0803E014 + ldr r0, =0x02024744 bl sub_8161F18 ldrb r1, [r5] movs r0, 0x1 @@ -127167,7 +123501,7 @@ _0803DFDA: _0803DFDE: movs r0, 0x5A bl m4aSongNumStop - ldr r0, _0803E008 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 _0803DFEC: @@ -127175,28 +123509,20 @@ _0803DFEC: pop {r0} bx r0 .align 2, 0 -_0803DFF4: .4byte 0x02022fec -_0803DFF8: .4byte 0x020244ec -_0803DFFC: .4byte 0x03003124 -_0803E000: .4byte 0x020375f0 -_0803E004: .4byte 0x0202433a -_0803E008: .4byte 0x030022c0 -_0803E00C: .4byte 0x00000439 -_0803E010: .4byte 0x03005d00 -_0803E014: .4byte 0x02024744 + .pool thumb_func_end c4_overworld thumb_func_start bc_move_exec_returning bc_move_exec_returning: @ 803E018 push {lr} - ldr r0, _0803E054 + ldr r0, =0x02024083 ldrb r0, [r0] subs r0, 0xB lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bhi _0803E060 - ldr r3, _0803E058 + ldr r3, =0x020244a8 ldr r0, [r3] ldr r0, [r0, 0xC] adds r1, r0, 0 @@ -127207,7 +123533,7 @@ bc_move_exec_returning: @ 803E018 subs r0, 0x1 strb r0, [r1] _0803E03C: - ldr r2, _0803E05C + ldr r2, =0x03005d04 ldr r0, [r3] ldr r1, [r0, 0xC] adds r0, r1, 0 @@ -127219,16 +123545,14 @@ _0803E03C: str r0, [r2] b _0803E07A .align 2, 0 -_0803E054: .4byte 0x02024083 -_0803E058: .4byte 0x020244a8 -_0803E05C: .4byte 0x03005d04 + .pool _0803E060: - ldr r0, _0803E080 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0803E07A - ldr r1, _0803E084 - ldr r0, _0803E088 + ldr r1, =0x0831bd10 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -127239,20 +123563,18 @@ _0803E07A: pop {r0} bx r0 .align 2, 0 -_0803E080: .4byte 0x02024068 -_0803E084: .4byte 0x0831bd10 -_0803E088: .4byte 0x02024214 + .pool thumb_func_end bc_move_exec_returning thumb_func_start sub_803E08C sub_803E08C: @ 803E08C push {lr} - ldr r0, _0803E0AC + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0803E0A8 - ldr r1, _0803E0B0 - ldr r0, _0803E0B4 + ldr r1, =0x0831bd10 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -127263,9 +123585,7 @@ _0803E0A8: pop {r0} bx r0 .align 2, 0 -_0803E0AC: .4byte 0x02024068 -_0803E0B0: .4byte 0x0831bd10 -_0803E0B4: .4byte 0x02024214 + .pool thumb_func_end sub_803E08C thumb_func_start sub_803E0B8 @@ -127278,19 +123598,19 @@ sub_803E0B8: @ 803E0B8 sub sp, 0x4 movs r0, 0x4 str r0, [sp] - ldr r6, _0803E0F8 - ldr r1, _0803E0FC - ldr r0, _0803E100 + ldr r6, =0x0202420b + ldr r1, =0x0202407e + ldr r0, =0x02024082 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] strb r0, [r6] - ldr r1, _0803E104 + ldr r1, =0x0202449c ldr r3, [r1] adds r0, r3, 0 adds r0, 0x91 ldrb r2, [r0] - ldr r1, _0803E108 + ldr r1, =0x0832a328 ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -127298,37 +123618,32 @@ sub_803E0B8: @ 803E0B8 ands r2, r0 cmp r2, 0 beq _0803E110 - ldr r1, _0803E10C + ldr r1, =0x02024083 movs r0, 0xC b _0803E83C .align 2, 0 -_0803E0F8: .4byte 0x0202420b -_0803E0FC: .4byte 0x0202407e -_0803E100: .4byte 0x02024082 -_0803E104: .4byte 0x0202449c -_0803E108: .4byte 0x0832a328 -_0803E10C: .4byte 0x02024083 + .pool _0803E110: - ldr r1, _0803E188 + ldr r1, =0x02024211 movs r0, 0x1 strb r0, [r1] - ldr r1, _0803E18C + ldr r1, =0x02024474 movs r0, 0x1 strb r0, [r1, 0xE] - ldr r5, _0803E190 + ldr r5, =0x000001a3 adds r0, r3, r5 strb r2, [r0] - ldr r0, _0803E194 + ldr r0, =0x0202427c strb r2, [r0] - ldr r0, _0803E198 + ldr r0, =0x02024212 strb r2, [r0] - ldr r0, _0803E19C + ldr r0, =0x02024332 strb r2, [r0, 0x6] - ldr r2, _0803E1A0 - ldr r0, _0803E1A4 + ldr r2, =0x020241e8 + ldr r0, =0x020241e9 mov r9, r0 ldrb r0, [r6] - ldr r3, _0803E1A8 + ldr r3, =0x0202449c ldr r1, [r3] adds r0, r1 adds r0, 0x80 @@ -127336,7 +123651,7 @@ _0803E110: mov r5, r9 strb r0, [r5] strb r0, [r2] - ldr r1, _0803E1AC + ldr r1, =0x0202433c ldrb r4, [r6] lsls r0, r4, 4 adds r3, r0, r1 @@ -127349,12 +123664,12 @@ _0803E110: negs r0, r0 ands r0, r1 strb r0, [r3] - ldr r2, _0803E1B0 - ldr r1, _0803E1B4 + ldr r2, =0x020241ea + ldr r1, =0x020241ec movs r0, 0xA5 strh r0, [r1] strh r0, [r2] - ldr r2, _0803E1B8 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 4 @@ -127364,25 +123679,13 @@ _0803E110: movs r1, 0 bl sub_80458E0 ldrb r1, [r6] - ldr r3, _0803E1A8 + ldr r3, =0x0202449c ldr r2, [r3] b _0803E316 .align 2, 0 -_0803E188: .4byte 0x02024211 -_0803E18C: .4byte 0x02024474 -_0803E190: .4byte 0x000001a3 -_0803E194: .4byte 0x0202427c -_0803E198: .4byte 0x02024212 -_0803E19C: .4byte 0x02024332 -_0803E1A0: .4byte 0x020241e8 -_0803E1A4: .4byte 0x020241e9 -_0803E1A8: .4byte 0x0202449c -_0803E1AC: .4byte 0x0202433c -_0803E1B0: .4byte 0x020241ea -_0803E1B4: .4byte 0x020241ec -_0803E1B8: .4byte 0x02024280 + .pool _0803E1BC: - ldr r5, _0803E1F4 + ldr r5, =0x02024084 mov r10, r5 movs r0, 0x58 adds r5, r4, 0 @@ -127402,9 +123705,9 @@ _0803E1BC: cmp r7, 0 beq _0803E204 _0803E1E2: - ldr r3, _0803E1F8 - ldr r2, _0803E1FC - ldr r1, _0803E200 + ldr r3, =0x020241ea + ldr r2, =0x020241ec + ldr r1, =0x02024268 lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] @@ -127412,12 +123715,9 @@ _0803E1E2: strh r0, [r3] b _0803E33C .align 2, 0 -_0803E1F4: .4byte 0x02024084 -_0803E1F8: .4byte 0x020241ea -_0803E1FC: .4byte 0x020241ec -_0803E200: .4byte 0x02024268 + .pool _0803E204: - ldr r1, _0803E258 + ldr r1, =0x020242bc mov r12, r1 lsls r0, r4, 3 subs r0, r4 @@ -127436,8 +123736,8 @@ _0803E204: ldrh r0, [r0] cmp r1, r0 bne _0803E268 - ldr r2, _0803E25C - ldr r0, _0803E260 + ldr r2, =0x020241ea + ldr r0, =0x020241ec strh r3, [r0] strh r3, [r2] ldrb r1, [r6] @@ -127454,14 +123754,11 @@ _0803E204: movs r1, 0 bl sub_80458E0 ldrb r1, [r6] - ldr r3, _0803E264 + ldr r3, =0x0202449c ldr r2, [r3] b _0803E316 .align 2, 0 -_0803E258: .4byte 0x020242bc -_0803E25C: .4byte 0x020241ea -_0803E260: .4byte 0x020241ec -_0803E264: .4byte 0x0202449c + .pool _0803E268: cmp r1, 0 beq _0803E2DC @@ -127471,8 +123768,8 @@ _0803E268: strb r2, [r5] mov r0, r8 strb r2, [r0] - ldr r3, _0803E2D0 - ldr r2, _0803E2D4 + ldr r3, =0x020241ea + ldr r2, =0x020241ec ldrb r0, [r0] lsls r0, 1 ldrb r1, [r6] @@ -127510,61 +123807,54 @@ _0803E268: movs r1, 0 bl sub_80458E0 ldrb r1, [r6] - ldr r3, _0803E2D8 + ldr r3, =0x0202449c ldr r2, [r3] b _0803E316 .align 2, 0 -_0803E2D0: .4byte 0x020241ea -_0803E2D4: .4byte 0x020241ec -_0803E2D8: .4byte 0x0202449c + .pool _0803E2DC: - ldr r3, _0803E31C + ldr r3, =0x02024084 mov r5, r8 ldrb r0, [r5] lsls r0, 1 - ldr r4, _0803E320 + ldr r4, =0x0202420b ldrb r2, [r4] movs r1, 0x58 muls r1, r2 adds r0, r1 adds r3, 0xC adds r0, r3 - ldr r1, _0803E324 + ldr r1, =0x02024274 lsls r2, 1 adds r2, r1 ldrh r3, [r0] ldrh r2, [r2] cmp r3, r2 beq _0803E334 - ldr r1, _0803E328 - ldr r0, _0803E32C + ldr r1, =0x020241ea + ldr r0, =0x020241ec strh r3, [r0] strh r3, [r1] ldrh r0, [r1] movs r1, 0 bl sub_80458E0 ldrb r1, [r4] - ldr r2, _0803E330 + ldr r2, =0x0202449c ldr r2, [r2] _0803E316: adds r1, r2 strb r0, [r1, 0xC] b _0803E33C .align 2, 0 -_0803E31C: .4byte 0x02024084 -_0803E320: .4byte 0x0202420b -_0803E324: .4byte 0x02024274 -_0803E328: .4byte 0x020241ea -_0803E32C: .4byte 0x020241ec -_0803E330: .4byte 0x0202449c + .pool _0803E334: - ldr r1, _0803E368 - ldr r0, _0803E36C + ldr r1, =0x020241ea + ldr r0, =0x020241ec strh r3, [r0] strh r3, [r1] _0803E33C: - ldr r2, _0803E370 - ldr r1, _0803E374 + ldr r2, =0x02024084 + ldr r1, =0x0202420b ldrb r3, [r1] movs r0, 0x58 muls r0, r3 @@ -127578,20 +123868,16 @@ _0803E33C: lsls r0, 24 cmp r0, 0 bne _0803E37C - ldr r0, _0803E378 - ldr r1, _0803E368 + ldr r0, =0x03005d10 + ldr r1, =0x020241ea ldrh r1, [r1] strh r1, [r0, 0x22] b _0803E384 .align 2, 0 -_0803E368: .4byte 0x020241ea -_0803E36C: .4byte 0x020241ec -_0803E370: .4byte 0x02024084 -_0803E374: .4byte 0x0202420b -_0803E378: .4byte 0x03005d10 + .pool _0803E37C: - ldr r0, _0803E3E8 - ldr r1, _0803E3EC + ldr r0, =0x03005d10 + ldr r1, =0x020241ea ldrh r1, [r1] strh r1, [r0, 0x24] _0803E384: @@ -127602,7 +123888,7 @@ _0803E384: eors r0, r1 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0803E3F0 + ldr r1, =0x02024294 lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -127610,8 +123896,8 @@ _0803E384: ldrb r0, [r5, 0x8] cmp r0, 0 beq _0803E400 - ldr r2, _0803E3F4 - ldr r0, _0803E3EC + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -127630,7 +123916,7 @@ _0803E384: lsls r0, 24 cmp r4, r0 beq _0803E400 - ldr r1, _0803E3F8 + ldr r1, =0x02024084 ldrb r2, [r5, 0x9] movs r0, 0x58 muls r0, r2 @@ -127638,28 +123924,23 @@ _0803E384: ldrh r0, [r0, 0x28] cmp r0, 0 beq _0803E400 - ldr r0, _0803E3FC + ldr r0, =0x0202420c strb r2, [r0] b _0803E76A .align 2, 0 -_0803E3E8: .4byte 0x03005d10 -_0803E3EC: .4byte 0x020241ea -_0803E3F0: .4byte 0x02024294 -_0803E3F4: .4byte 0x0831c898 -_0803E3F8: .4byte 0x02024084 -_0803E3FC: .4byte 0x0202420c + .pool _0803E400: - ldr r0, _0803E51C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 - ldr r5, _0803E520 + ldr r5, =0x0202420b mov r8, r5 cmp r0, 0 bne _0803E412 b _0803E6E0 _0803E412: - ldr r1, _0803E524 + ldr r1, =0x02024294 lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -127669,8 +123950,8 @@ _0803E412: beq _0803E424 b _0803E630 _0803E424: - ldr r2, _0803E528 - ldr r0, _0803E52C + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -127684,10 +123965,10 @@ _0803E424: bne _0803E440 b _0803E630 _0803E440: - ldr r3, _0803E530 - ldr r2, _0803E520 + ldr r3, =0x02024084 + ldr r2, =0x0202420b ldrb r6, [r2] - ldr r0, _0803E534 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, r6, r0 ldrb r1, [r0, 0xC] @@ -127710,9 +123991,9 @@ _0803E468: bl battle_side_get_owner lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0803E538 + ldr r1, =0x02024064 strb r5, [r1] - ldr r0, _0803E53C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 bcs _0803E4E0 @@ -127724,16 +124005,16 @@ _0803E480: lsrs r0, 24 cmp r6, r0 beq _0803E4CE - ldr r0, _0803E520 + ldr r0, =0x0202420b ldrb r1, [r0] - ldr r0, _0803E534 + ldr r0, =0x0202449c ldr r0, [r0] adds r1, r0 ldrb r0, [r1, 0xC] ldrb r1, [r4] cmp r0, r1 beq _0803E4CE - ldr r1, _0803E530 + ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -127758,7 +124039,7 @@ _0803E4CE: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _0803E53C + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -127770,8 +124051,8 @@ _0803E4E0: beq _0803E4E8 b _0803E5E2 _0803E4E8: - ldr r2, _0803E528 - ldr r0, _0803E540 + ldr r2, =0x0831c898 + ldr r0, =0x020241ec ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -127781,7 +124062,7 @@ _0803E4E8: ands r5, r0 cmp r5, 0 beq _0803E568 - ldr r0, _0803E520 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -127795,16 +124076,7 @@ _0803E4E8: movs r0, 0x1 b _0803E55A .align 2, 0 -_0803E51C: .4byte 0x02022fec -_0803E520: .4byte 0x0202420b -_0803E524: .4byte 0x02024294 -_0803E528: .4byte 0x0831c898 -_0803E52C: .4byte 0x020241ea -_0803E530: .4byte 0x02024084 -_0803E534: .4byte 0x0202449c -_0803E538: .4byte 0x02024064 -_0803E53C: .4byte 0x0202406c -_0803E540: .4byte 0x020241ec + .pool _0803E544: movs r0, 0x3 b _0803E55A @@ -127820,26 +124092,26 @@ _0803E558: movs r0, 0x2 _0803E55A: bl battle_get_side_with_given_state - ldr r1, _0803E564 + ldr r1, =0x0202420c strb r0, [r1] b _0803E578 .align 2, 0 -_0803E564: .4byte 0x0202420c + .pool _0803E568: - ldr r2, _0803E5B0 - ldr r0, _0803E5B4 + ldr r2, =0x0202420c + ldr r0, =0x0202420b ldrb r0, [r0] - ldr r1, _0803E5B8 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r2] _0803E578: - ldr r7, _0803E5BC + ldr r7, =0x02024210 ldrb r0, [r7] - ldr r1, _0803E5C0 + ldr r1, =0x0832a328 mov r8, r1 - ldr r5, _0803E5B0 + ldr r5, =0x0202420c ldrb r1, [r5] lsls r1, 2 add r1, r8 @@ -127849,7 +124121,7 @@ _0803E578: bne _0803E592 b _0803E76A _0803E592: - ldr r6, _0803E5B4 + ldr r6, =0x0202420b ldrb r0, [r6] bl battle_side_get_owner adds r4, r0, 0 @@ -127862,11 +124134,7 @@ _0803E592: ldrb r0, [r5] b _0803E758 .align 2, 0 -_0803E5B0: .4byte 0x0202420c -_0803E5B4: .4byte 0x0202420b -_0803E5B8: .4byte 0x0202449c -_0803E5BC: .4byte 0x02024210 -_0803E5C0: .4byte 0x0832a328 + .pool _0803E5C4: ldrb r0, [r6] bl battle_get_per_side_status @@ -127882,21 +124150,21 @@ _0803E5C4: add r0, r8 b _0803E74E _0803E5E2: - ldr r4, _0803E61C - ldr r0, _0803E620 + ldr r4, =0x02024064 + ldr r0, =0x0202407e ldr r3, [sp] adds r0, r3, r0 ldrb r0, [r0] strb r0, [r4] ldrb r0, [r4] - ldr r2, _0803E624 + ldr r2, =0x02024084 movs r1, 0x58 muls r1, r0 adds r1, r2 adds r1, 0x20 ldrb r1, [r1] bl b_history__record_ability_usage_of_player - ldr r2, _0803E628 + ldr r2, =0x0202437c ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -127906,25 +124174,21 @@ _0803E5E2: movs r2, 0x2 orrs r1, r2 strb r1, [r0] - ldr r1, _0803E62C + ldr r1, =0x0202420c ldrb r0, [r4] strb r0, [r1] b _0803E76A .align 2, 0 -_0803E61C: .4byte 0x02024064 -_0803E620: .4byte 0x0202407e -_0803E624: .4byte 0x02024084 -_0803E628: .4byte 0x0202437c -_0803E62C: .4byte 0x0202420c + .pool _0803E630: - ldr r0, _0803E674 + ldr r0, =0x02022fec ldr r0, [r0] movs r4, 0x1 ands r0, r4 cmp r0, 0 beq _0803E6E0 - ldr r2, _0803E678 - ldr r0, _0803E67C + ldr r2, =0x0831c898 + ldr r0, =0x020241ec ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -127949,9 +124213,7 @@ _0803E630: movs r0, 0x1 b _0803E696 .align 2, 0 -_0803E674: .4byte 0x02022fec -_0803E678: .4byte 0x0831c898 -_0803E67C: .4byte 0x020241ec + .pool _0803E680: movs r0, 0x3 b _0803E696 @@ -127967,12 +124229,12 @@ _0803E694: movs r0, 0x2 _0803E696: bl battle_get_side_with_given_state - ldr r1, _0803E6D0 + ldr r1, =0x0202420c strb r0, [r1] - ldr r0, _0803E6D4 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _0803E6D8 - ldr r5, _0803E6D0 + ldr r2, =0x0832a328 + ldr r5, =0x0202420c ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -127980,7 +124242,7 @@ _0803E696: ands r1, r0 cmp r1, 0 beq _0803E76A - ldr r0, _0803E6DC + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner adds r4, r0, 0 @@ -127993,22 +124255,19 @@ _0803E696: ldrb r0, [r5] b _0803E758 .align 2, 0 -_0803E6D0: .4byte 0x0202420c -_0803E6D4: .4byte 0x02024210 -_0803E6D8: .4byte 0x0832a328 -_0803E6DC: .4byte 0x0202420b + .pool _0803E6E0: - ldr r5, _0803E720 + ldr r5, =0x0202420c mov r2, r8 ldrb r0, [r2] - ldr r1, _0803E724 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r5] - ldr r6, _0803E728 + ldr r6, =0x02024210 ldrb r1, [r6] - ldr r7, _0803E72C + ldr r7, =0x0832a328 ldrb r0, [r5] lsls r0, 2 adds r0, r7 @@ -128028,10 +124287,7 @@ _0803E6E0: ldrb r0, [r5] b _0803E758 .align 2, 0 -_0803E720: .4byte 0x0202420c -_0803E724: .4byte 0x0202449c -_0803E728: .4byte 0x02024210 -_0803E72C: .4byte 0x0832a328 + .pool _0803E730: mov r1, r8 ldrb r0, [r1] @@ -128061,7 +124317,7 @@ _0803E758: bl battle_get_side_with_given_state strb r0, [r5] _0803E76A: - ldr r0, _0803E7A0 + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x80 lsls r2, 10 @@ -128069,8 +124325,8 @@ _0803E76A: adds r5, r0, 0 cmp r1, 0 beq _0803E808 - ldr r0, _0803E7A4 - ldr r4, _0803E7A8 + ldr r0, =0x0202433c + ldr r4, =0x0202420b ldrb r2, [r4] lsls r1, r2, 4 adds r1, r0 @@ -128078,34 +124334,30 @@ _0803E76A: lsls r0, 27 cmp r0, 0 bge _0803E808 - ldr r1, _0803E7AC + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 bne _0803E7B4 - ldr r1, _0803E7B0 + ldr r1, =0x02024083 movs r0, 0xC b _0803E83C .align 2, 0 -_0803E7A0: .4byte 0x02022fec -_0803E7A4: .4byte 0x0202433c -_0803E7A8: .4byte 0x0202420b -_0803E7AC: .4byte 0x02024084 -_0803E7B0: .4byte 0x02024083 + .pool _0803E7B4: - ldr r3, _0803E7E0 + ldr r3, =0x02024230 lsls r0, r2, 2 adds r0, r3 ldr r0, [r0] cmp r0, 0 beq _0803E7EC - ldr r1, _0803E7E4 + ldr r1, =0x02024332 movs r2, 0 movs r0, 0x4 strb r0, [r1, 0x5] - ldr r1, _0803E7E8 + ldr r1, =0x02024214 ldrb r0, [r4] lsls r0, 2 adds r0, r3 @@ -128117,26 +124369,22 @@ _0803E7B4: str r2, [r0] b _0803E824 .align 2, 0 -_0803E7E0: .4byte 0x02024230 -_0803E7E4: .4byte 0x02024332 -_0803E7E8: .4byte 0x02024214 + .pool _0803E7EC: - ldr r1, _0803E7FC + ldr r1, =0x02024332 movs r0, 0x4 strb r0, [r1, 0x5] - ldr r1, _0803E800 - ldr r0, _0803E804 + ldr r1, =0x02024214 + ldr r0, =0x082db6ad str r0, [r1] b _0803E824 .align 2, 0 -_0803E7FC: .4byte 0x02024332 -_0803E800: .4byte 0x02024214 -_0803E804: .4byte 0x082db6ad + .pool _0803E808: - ldr r4, _0803E850 - ldr r3, _0803E854 - ldr r2, _0803E858 - ldr r0, _0803E85C + ldr r4, =0x02024214 + ldr r3, =0x082d86a8 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -128154,11 +124402,11 @@ _0803E824: ands r0, r1 cmp r0, 0 beq _0803E838 - ldr r0, _0803E860 + ldr r0, =0x0202420b ldrb r0, [r0] bl sub_81A56E8 _0803E838: - ldr r1, _0803E864 + ldr r1, =0x02024083 movs r0, 0xA _0803E83C: strb r0, [r1] @@ -128171,38 +124419,33 @@ _0803E83C: pop {r0} bx r0 .align 2, 0 -_0803E850: .4byte 0x02024214 -_0803E854: .4byte 0x082d86a8 -_0803E858: .4byte 0x0831c898 -_0803E85C: .4byte 0x020241ea -_0803E860: .4byte 0x0202420b -_0803E864: .4byte 0x02024083 + .pool thumb_func_end sub_803E0B8 thumb_func_start bs2_8016374 bs2_8016374: @ 803E868 push {r4,lr} - ldr r3, _0803E8D4 - ldr r1, _0803E8D8 - ldr r0, _0803E8DC + ldr r3, =0x0202420b + ldr r1, =0x0202407e + ldr r0, =0x02024082 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] strb r0, [r3] - ldr r0, _0803E8E0 + ldr r0, =0x02022e14 movs r2, 0 strh r2, [r0] - ldr r0, _0803E8E4 + ldr r0, =0x02022e16 strh r2, [r0] - ldr r1, _0803E8E8 + ldr r1, =0x020244ac ldrb r0, [r3] adds r0, r1 strb r2, [r0] - ldr r1, _0803E8EC + ldr r1, =0x020244b0 ldrb r0, [r3] adds r0, r1 strb r2, [r0] - ldr r2, _0803E8F0 + ldr r2, =0x02022f58 movs r0, 0xFD strb r0, [r2] movs r0, 0x7 @@ -128210,7 +124453,7 @@ bs2_8016374: @ 803E868 ldrb r4, [r3] strb r4, [r2, 0x2] ldrb r0, [r3] - ldr r1, _0803E8F4 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 adds r0, 0x58 @@ -128218,15 +124461,15 @@ bs2_8016374: @ 803E868 strb r0, [r2, 0x3] movs r0, 0xFF strb r0, [r2, 0x4] - ldr r0, _0803E8F8 + ldr r0, =0x02024474 strb r4, [r0, 0x17] - ldr r1, _0803E8FC - ldr r0, _0803E900 + ldr r1, =0x02024214 + ldr r0, =0x082dab15 str r0, [r1] - ldr r1, _0803E904 + ldr r1, =0x02024083 movs r0, 0xA strb r0, [r1] - ldr r1, _0803E908 + ldr r1, =0x03005d10 ldrb r0, [r1, 0x2] cmp r0, 0xFE bhi _0803E8CE @@ -128237,20 +124480,7 @@ _0803E8CE: pop {r0} bx r0 .align 2, 0 -_0803E8D4: .4byte 0x0202420b -_0803E8D8: .4byte 0x0202407e -_0803E8DC: .4byte 0x02024082 -_0803E8E0: .4byte 0x02022e14 -_0803E8E4: .4byte 0x02022e16 -_0803E8E8: .4byte 0x020244ac -_0803E8EC: .4byte 0x020244b0 -_0803E8F0: .4byte 0x02022f58 -_0803E8F4: .4byte 0x0202449c -_0803E8F8: .4byte 0x02024474 -_0803E8FC: .4byte 0x02024214 -_0803E900: .4byte 0x082dab15 -_0803E904: .4byte 0x02024083 -_0803E908: .4byte 0x03005d10 + .pool thumb_func_end bs2_8016374 thumb_func_start sub_803E90C @@ -128260,24 +124490,24 @@ sub_803E90C: @ 803E90C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _0803E96C - ldr r2, _0803E970 - ldr r1, _0803E974 - ldr r0, _0803E978 + ldr r4, =0x0202420b + ldr r2, =0x0202420c + ldr r1, =0x0202407e + ldr r0, =0x02024082 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] strb r0, [r2] strb r0, [r4] - ldr r0, _0803E97C + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _0803E980 + ldr r0, =0x02022e16 strh r1, [r0] ldrb r0, [r4] bl sub_8045868 - ldr r5, _0803E984 - ldr r2, _0803E988 + ldr r5, =0x02024208 + ldr r2, =0x02023864 ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -128291,28 +124521,18 @@ sub_803E90C: @ 803E90C strh r3, [r5] cmp r3, 0xC bhi _0803E998 - ldr r2, _0803E98C - ldr r1, _0803E990 + ldr r2, =0x02024214 + ldr r1, =0x082dbd08 ldrh r0, [r5] lsls r0, 2 adds r0, r1 ldr r0, [r0] str r0, [r2] - ldr r0, _0803E994 + ldr r0, =0x02024083 mov r10, r0 b _0803EBF6 .align 2, 0 -_0803E96C: .4byte 0x0202420b -_0803E970: .4byte 0x0202420c -_0803E974: .4byte 0x0202407e -_0803E978: .4byte 0x02024082 -_0803E97C: .4byte 0x02022e14 -_0803E980: .4byte 0x02022e16 -_0803E984: .4byte 0x02024208 -_0803E988: .4byte 0x02023864 -_0803E98C: .4byte 0x02024214 -_0803E990: .4byte 0x082dbd08 -_0803E994: .4byte 0x02024083 + .pool _0803E998: adds r0, r3, 0 subs r0, 0x50 @@ -128320,70 +124540,61 @@ _0803E998: lsrs r0, 16 cmp r0, 0x1 bhi _0803E9C0 - ldr r0, _0803E9B4 - ldr r1, _0803E9B8 + ldr r0, =0x02024214 + ldr r1, =0x082dbd54 ldr r1, [r1] str r1, [r0] - ldr r1, _0803E9BC + ldr r1, =0x02024083 mov r10, r1 b _0803EBF6 .align 2, 0 -_0803E9B4: .4byte 0x02024214 -_0803E9B8: .4byte 0x082dbd54 -_0803E9BC: .4byte 0x02024083 + .pool _0803E9C0: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0803E9E8 - ldr r0, _0803E9DC - ldr r1, _0803E9E0 + ldr r0, =0x02024214 + ldr r1, =0x082dbd3c ldr r1, [r1] str r1, [r0] - ldr r2, _0803E9E4 + ldr r2, =0x02024083 mov r10, r2 b _0803EBF6 .align 2, 0 -_0803E9DC: .4byte 0x02024214 -_0803E9E0: .4byte 0x082dbd3c -_0803E9E4: .4byte 0x02024083 + .pool _0803E9E8: - ldr r3, _0803EA20 + ldr r3, =0x02024474 ldrb r0, [r4] strb r0, [r3, 0x17] lsls r0, 24 lsrs r0, 25 - ldr r2, _0803EA24 + ldr r2, =0x0202449c ldr r1, [r2] adds r0, r1 adds r0, 0xC4 ldrb r0, [r0] subs r0, 0x1 mov r8, r4 - ldr r1, _0803EA28 + ldr r1, =0x02024214 mov r9, r1 - ldr r6, _0803EA2C + ldr r6, =0x082dbd3c mov r12, r3 adds r7, r2, 0 - ldr r2, _0803EA30 + ldr r2, =0x02024083 mov r10, r2 cmp r0, 0x4 bls _0803EA14 b _0803EBDE _0803EA14: lsls r0, 2 - ldr r1, _0803EA34 + ldr r1, =_0803EA38 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0803EA20: .4byte 0x02024474 -_0803EA24: .4byte 0x0202449c -_0803EA28: .4byte 0x02024214 -_0803EA2C: .4byte 0x082dbd3c -_0803EA30: .4byte 0x02024083 -_0803EA34: .4byte _0803EA38 + .pool .align 2, 0 _0803EA38: .4byte _0803EBDE @@ -128392,10 +124603,10 @@ _0803EA38: .4byte _0803EAE0 .4byte _0803EBB0 _0803EA4C: - ldr r5, _0803EA84 + ldr r5, =0x02024332 movs r0, 0 strb r0, [r5, 0x5] - ldr r2, _0803EA88 + ldr r2, =0x0202420b ldrb r0, [r2] lsrs r0, 1 ldr r1, [r7] @@ -128409,10 +124620,10 @@ _0803EA4C: beq _0803EA98 movs r0, 0x3E ands r0, r1 - ldr r1, _0803EA8C + ldr r1, =0x02024214 mov r9, r1 - ldr r6, _0803EA90 - ldr r2, _0803EA94 + ldr r6, =0x082dbd3c + ldr r2, =0x02024083 mov r10, r2 cmp r0, 0 bne _0803EA7E @@ -128422,16 +124633,12 @@ _0803EA7E: strb r0, [r5, 0x5] b _0803EBDE .align 2, 0 -_0803EA84: .4byte 0x02024332 -_0803EA88: .4byte 0x0202420b -_0803EA8C: .4byte 0x02024214 -_0803EA90: .4byte 0x082dbd3c -_0803EA94: .4byte 0x02024083 + .pool _0803EA98: - ldr r0, _0803EAD4 + ldr r0, =0x02024214 mov r9, r0 - ldr r6, _0803EAD8 - ldr r1, _0803EADC + ldr r6, =0x082dbd3c + ldr r1, =0x02024083 mov r10, r1 mov r4, r8 adds r3, r7, 0 @@ -128460,14 +124667,12 @@ _0803EAA8: beq _0803EAA8 b _0803EBDE .align 2, 0 -_0803EAD4: .4byte 0x02024214 -_0803EAD8: .4byte 0x082dbd3c -_0803EADC: .4byte 0x02024083 + .pool _0803EAE0: - ldr r3, _0803EB14 + ldr r3, =0x02024332 movs r0, 0x4 strb r0, [r3, 0x5] - ldr r2, _0803EB18 + ldr r2, =0x0202420b ldrb r0, [r2] lsrs r0, 1 ldr r1, [r7] @@ -128484,20 +124689,16 @@ _0803EAE0: beq _0803EB28 movs r0, 0x5 strb r0, [r3, 0x5] - ldr r2, _0803EB1C + ldr r2, =0x02024214 mov r9, r2 - ldr r6, _0803EB20 - ldr r0, _0803EB24 + ldr r6, =0x082dbd3c + ldr r0, =0x02024083 mov r10, r0 b _0803EBDE .align 2, 0 -_0803EB14: .4byte 0x02024332 -_0803EB18: .4byte 0x0202420b -_0803EB1C: .4byte 0x02024214 -_0803EB20: .4byte 0x082dbd3c -_0803EB24: .4byte 0x02024083 + .pool _0803EB28: - ldr r3, _0803EB9C + ldr r3, =0x02022f58 movs r4, 0xFD strb r4, [r3] movs r0, 0x5 @@ -128506,7 +124707,7 @@ _0803EB28: strb r2, [r3, 0x2] movs r0, 0xFF strb r0, [r3, 0x3] - ldr r1, _0803EBA0 + ldr r1, =0x02022f68 strb r4, [r1] strb r5, [r1, 0x1] movs r0, 0xD2 @@ -128516,10 +124717,10 @@ _0803EB28: strb r0, [r1, 0x4] ldrb r0, [r6] ands r2, r0 - ldr r1, _0803EBA4 + ldr r1, =0x02024214 mov r9, r1 - ldr r6, _0803EBA8 - ldr r0, _0803EBAC + ldr r6, =0x082dbd3c + ldr r0, =0x02024083 mov r10, r0 cmp r2, 0 bne _0803EB8C @@ -128557,35 +124758,30 @@ _0803EB8C: strb r1, [r2, 0x11] b _0803EBDE .align 2, 0 -_0803EB9C: .4byte 0x02022f58 -_0803EBA0: .4byte 0x02022f68 -_0803EBA4: .4byte 0x02024214 -_0803EBA8: .4byte 0x082dbd3c -_0803EBAC: .4byte 0x02024083 + .pool _0803EBB0: - ldr r0, _0803EBC4 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 ands r1, r0 cmp r1, 0 beq _0803EBCC - ldr r1, _0803EBC8 + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] b _0803EBD0 .align 2, 0 -_0803EBC4: .4byte 0x02022fec -_0803EBC8: .4byte 0x02024332 + .pool _0803EBCC: - ldr r0, _0803EC0C + ldr r0, =0x02024332 strb r1, [r0, 0x5] _0803EBD0: - ldr r0, _0803EC10 + ldr r0, =0x0202420b mov r8, r0 - ldr r1, _0803EC14 + ldr r1, =0x02024214 mov r9, r1 - ldr r6, _0803EC18 - ldr r2, _0803EC1C + ldr r6, =0x082dbd3c + ldr r2, =0x02024083 mov r10, r2 _0803EBDE: mov r1, r8 @@ -128612,11 +124808,7 @@ _0803EBF6: pop {r0} bx r0 .align 2, 0 -_0803EC0C: .4byte 0x02024332 -_0803EC10: .4byte 0x0202420b -_0803EC14: .4byte 0x02024214 -_0803EC18: .4byte 0x082dbd3c -_0803EC1C: .4byte 0x02024083 + .pool thumb_func_end sub_803E90C thumb_func_start sub_803EC20 @@ -128629,14 +124821,14 @@ sub_803EC20: @ 803EC20 lsls r0, 24 lsrs r5, r0, 24 movs r7, 0 - ldr r1, _0803EC4C + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r5 adds r1, r0, r1 ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0803EC54 - ldr r1, _0803EC50 + ldr r1, =0x02024404 lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -128644,26 +124836,25 @@ sub_803EC20: @ 803EC20 ldrb r1, [r0, 0x7] b _0803EC5E .align 2, 0 -_0803EC4C: .4byte 0x02024084 -_0803EC50: .4byte 0x02024404 + .pool _0803EC54: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 lsrs r1, r0, 24 _0803EC5E: - ldr r0, _0803EC8C + ldr r0, =0x0202420f strb r5, [r0] cmp r1, 0x25 bne _0803EC9C - ldr r2, _0803EC90 - ldr r1, _0803EC94 + ldr r2, =0x02024208 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r5 adds r0, r1 ldrh r0, [r0, 0x2E] strh r0, [r2] - ldr r0, _0803EC98 + ldr r0, =0x0202433c lsls r2, r5, 4 adds r2, r0 ldrb r1, [r2, 0x1] @@ -128675,12 +124866,9 @@ _0803EC5E: strb r0, [r2, 0x1] b _0803ED70 .align 2, 0 -_0803EC8C: .4byte 0x0202420f -_0803EC90: .4byte 0x02024208 -_0803EC94: .4byte 0x02024084 -_0803EC98: .4byte 0x0202433c + .pool _0803EC9C: - ldr r0, _0803ED28 + ldr r0, =0x02024084 mov r10, r0 movs r2, 0x58 mov r9, r2 @@ -128696,7 +124884,7 @@ _0803EC9C: lsls r0, 24 cmp r0, 0 beq _0803ED38 - ldr r4, _0803ED2C + ldr r4, =0x0202449c ldr r1, [r4] adds r1, 0x6C ldrb r0, [r1] @@ -128733,9 +124921,9 @@ _0803EC9C: bhi _0803ED0C b _0803EE12 _0803ED0C: - ldr r0, _0803ED30 + ldr r0, =0x0202420a strb r6, [r0] - ldr r0, _0803ED34 + ldr r0, =0x0202433c lsls r2, r5, 4 adds r2, r0 ldrb r1, [r2, 0x1] @@ -128747,14 +124935,11 @@ _0803ED0C: strb r0, [r2, 0x1] b _0803ED70 .align 2, 0 -_0803ED28: .4byte 0x02024084 -_0803ED2C: .4byte 0x0202449c -_0803ED30: .4byte 0x0202420a -_0803ED34: .4byte 0x0202433c + .pool _0803ED38: - ldr r0, _0803ED54 + ldr r0, =0x0202420a strb r6, [r0] - ldr r0, _0803ED58 + ldr r0, =0x0202433c lsls r2, r5, 4 adds r2, r0 ldrb r1, [r2, 0x1] @@ -128766,12 +124951,11 @@ _0803ED38: strb r0, [r2, 0x1] b _0803ED70 .align 2, 0 -_0803ED54: .4byte 0x0202420a -_0803ED58: .4byte 0x0202433c + .pool _0803ED5C: - ldr r1, _0803ED78 + ldr r1, =0x02022fec ldr r2, [r1] - ldr r0, _0803ED7C + ldr r0, =0x043f0100 ands r0, r2 cmp r0, 0 beq _0803ED80 @@ -128785,8 +124969,7 @@ _0803ED70: lsrs r7, r0, 24 b _0803EE12 .align 2, 0 -_0803ED78: .4byte 0x02022fec -_0803ED7C: .4byte 0x043f0100 + .pool _0803ED80: ldr r0, [r1] movs r1, 0x1 @@ -128800,7 +124983,7 @@ _0803ED80: bl sub_81A9E28 lsls r0, 24 lsrs r1, r0, 24 - ldr r4, _0803EDB8 + ldr r4, =0x02024084 movs r3, 0x58 adds r0, r5, 0 muls r0, r3 @@ -128814,9 +124997,9 @@ _0803ED80: adds r1, r4 b _0803EDDA .align 2, 0 -_0803EDB8: .4byte 0x02024084 + .pool _0803EDBC: - ldr r3, _0803EE34 + ldr r3, =0x02024084 movs r2, 0x58 adds r0, r5, 0 muls r0, r2 @@ -128834,7 +125017,7 @@ _0803EDBC: _0803EDDA: ldrh r1, [r1, 0x6] bl __divsi3 - ldr r1, _0803EE38 + ldr r1, =0x0202449c ldr r1, [r1] adds r1, 0x6C ldrb r2, [r1] @@ -128854,7 +125037,7 @@ _0803EE00: lsls r0, 24 lsrs r7, r0, 24 _0803EE06: - ldr r0, _0803EE38 + ldr r0, =0x0202449c ldr r1, [r0] adds r1, 0x6C ldrb r0, [r1] @@ -128863,11 +125046,11 @@ _0803EE06: _0803EE12: cmp r7, 0 beq _0803EE24 - ldr r1, _0803EE3C - ldr r0, _0803EE40 + ldr r1, =0x02024082 + ldr r0, =0x0202406c ldrb r0, [r0] strb r0, [r1] - ldr r1, _0803EE44 + ldr r1, =0x0202433a movs r0, 0x4 strb r0, [r1] _0803EE24: @@ -128880,41 +125063,37 @@ _0803EE24: pop {r1} bx r1 .align 2, 0 -_0803EE34: .4byte 0x02024084 -_0803EE38: .4byte 0x0202449c -_0803EE3C: .4byte 0x02024082 -_0803EE40: .4byte 0x0202406c -_0803EE44: .4byte 0x0202433a + .pool thumb_func_end sub_803EC20 thumb_func_start sub_803EE48 sub_803EE48: @ 803EE48 push {r4-r6,lr} - ldr r4, _0803EE98 - ldr r1, _0803EE9C - ldr r5, _0803EEA0 + ldr r4, =0x0202420b + ldr r1, =0x0202407e + ldr r5, =0x02024082 ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] strb r0, [r4] - ldr r0, _0803EEA4 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0803EEA8 + ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 beq _0803EF0C - ldr r0, _0803EEAC + ldr r0, =0x0202406c ldrb r1, [r0] strb r1, [r5] - ldr r2, _0803EEB0 + ldr r2, =0x02024064 movs r0, 0 strb r0, [r2] lsls r1, 24 cmp r1, 0 beq _0803EEE0 adds r4, r2, 0 - ldr r6, _0803EEB4 - ldr r5, _0803EEB8 + ldr r6, =0x0202421c + ldr r5, =0x0202433a _0803EE7C: ldrb r0, [r4] bl battle_side_get_owner @@ -128930,15 +125109,7 @@ _0803EE7C: movs r1, 0x2 b _0803EECA .align 2, 0 -_0803EE98: .4byte 0x0202420b -_0803EE9C: .4byte 0x0202407e -_0803EEA0: .4byte 0x02024082 -_0803EEA4: .4byte 0x02022fec -_0803EEA8: .4byte 0x02000002 -_0803EEAC: .4byte 0x0202406c -_0803EEB0: .4byte 0x02024064 -_0803EEB4: .4byte 0x0202421c -_0803EEB8: .4byte 0x0202433a + .pool _0803EEBC: ldrb r0, [r4] adds r0, r6 @@ -128954,31 +125125,28 @@ _0803EECE: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _0803EEFC + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 bcc _0803EE7C _0803EEE0: - ldr r2, _0803EF00 + ldr r2, =0x0202433a ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r0, _0803EF04 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _0803EF08 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x8 orrs r0, r2 b _0803EF96 .align 2, 0 -_0803EEFC: .4byte 0x0202406c -_0803EF00: .4byte 0x0202433a -_0803EF04: .4byte 0x03005d90 -_0803EF08: .4byte 0x00000ca9 + .pool _0803EF0C: ldrb r0, [r4] bl battle_side_get_owner @@ -128992,53 +125160,45 @@ _0803EF0C: bne _0803EF98 ldrb r0, [r4] bl sub_8045868 - ldr r1, _0803EF3C + ldr r1, =0x02024332 movs r0, 0x3 strb r0, [r1, 0x5] - ldr r1, _0803EF40 - ldr r0, _0803EF44 + ldr r1, =0x02024214 + ldr r0, =0x082dab02 str r0, [r1] - ldr r1, _0803EF48 + ldr r1, =0x02024083 movs r0, 0xA b _0803EF96 .align 2, 0 -_0803EF3C: .4byte 0x02024332 -_0803EF40: .4byte 0x02024214 -_0803EF44: .4byte 0x082dab02 -_0803EF48: .4byte 0x02024083 + .pool _0803EF4C: - ldr r1, _0803EF74 + ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 muls r0, r2 adds r1, 0x50 adds r0, r1 ldr r0, [r0] - ldr r1, _0803EF78 + ldr r1, =0x0400e000 ands r0, r1 cmp r0, 0 beq _0803EF8C - ldr r1, _0803EF7C + ldr r1, =0x02024332 movs r0, 0x4 strb r0, [r1, 0x5] - ldr r1, _0803EF80 - ldr r0, _0803EF84 + ldr r1, =0x02024214 + ldr r0, =0x082dab02 str r0, [r1] - ldr r1, _0803EF88 + ldr r1, =0x02024083 movs r0, 0xA b _0803EF96 .align 2, 0 -_0803EF74: .4byte 0x02024084 -_0803EF78: .4byte 0x0400e000 -_0803EF7C: .4byte 0x02024332 -_0803EF80: .4byte 0x02024214 -_0803EF84: .4byte 0x082dab02 -_0803EF88: .4byte 0x02024083 + .pool _0803EF8C: - ldr r0, _0803EFA0 + ldr r0, =0x0202406c ldrb r0, [r0] strb r0, [r5] - ldr r1, _0803EFA4 + ldr r1, =0x0202433a movs r0, 0x6 _0803EF96: strb r0, [r1] @@ -129047,102 +125207,85 @@ _0803EF98: pop {r0} bx r0 .align 2, 0 -_0803EFA0: .4byte 0x0202406c -_0803EFA4: .4byte 0x0202433a + .pool thumb_func_end sub_803EE48 thumb_func_start sub_803EFA8 sub_803EFA8: @ 803EFA8 - ldr r2, _0803EFD0 - ldr r1, _0803EFD4 - ldr r0, _0803EFD8 + ldr r2, =0x0202420b + ldr r1, =0x0202407e + ldr r0, =0x02024082 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] strb r0, [r2] - ldr r0, _0803EFDC + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _0803EFE0 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r1, _0803EFE4 - ldr r0, _0803EFE8 + ldr r1, =0x02024214 + ldr r0, =0x082dbd58 ldr r0, [r0] str r0, [r1] - ldr r1, _0803EFEC + ldr r1, =0x02024083 movs r0, 0xA strb r0, [r1] bx lr .align 2, 0 -_0803EFD0: .4byte 0x0202420b -_0803EFD4: .4byte 0x0202407e -_0803EFD8: .4byte 0x02024082 -_0803EFDC: .4byte 0x02022e14 -_0803EFE0: .4byte 0x02022e16 -_0803EFE4: .4byte 0x02024214 -_0803EFE8: .4byte 0x082dbd58 -_0803EFEC: .4byte 0x02024083 + .pool thumb_func_end sub_803EFA8 thumb_func_start bs5_8016AC0 bs5_8016AC0: @ 803EFF0 - ldr r2, _0803F028 - ldr r1, _0803F02C - ldr r0, _0803F030 + ldr r2, =0x0202420b + ldr r1, =0x0202407e + ldr r0, =0x02024082 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] strb r0, [r2] - ldr r0, _0803F034 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _0803F038 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r1, _0803F03C + ldr r1, =0x0203a04c ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] - ldr r1, _0803F040 + ldr r1, =0x02024208 movs r0, 0x5 strh r0, [r1] - ldr r1, _0803F044 - ldr r0, _0803F048 + ldr r1, =0x02024214 + ldr r0, =0x082dbd08 ldr r0, [r0, 0x14] str r0, [r1] - ldr r1, _0803F04C + ldr r1, =0x02024083 movs r0, 0xA strb r0, [r1] bx lr .align 2, 0 -_0803F028: .4byte 0x0202420b -_0803F02C: .4byte 0x0202407e -_0803F030: .4byte 0x02024082 -_0803F034: .4byte 0x02022e14 -_0803F038: .4byte 0x02022e16 -_0803F03C: .4byte 0x0203a04c -_0803F040: .4byte 0x02024208 -_0803F044: .4byte 0x02024214 -_0803F048: .4byte 0x082dbd08 -_0803F04C: .4byte 0x02024083 + .pool thumb_func_end bs5_8016AC0 thumb_func_start sub_803F050 sub_803F050: @ 803F050 push {r4-r6,lr} - ldr r3, _0803F0D0 - ldr r1, _0803F0D4 - ldr r0, _0803F0D8 + ldr r3, =0x0202420b + ldr r1, =0x0202407e + ldr r0, =0x02024082 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] strb r0, [r3] - ldr r0, _0803F0DC + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _0803F0E0 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r6, _0803F0E4 - ldr r2, _0803F0E8 + ldr r6, =0x02024332 + ldr r2, =0x02023864 ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -129150,21 +125293,21 @@ sub_803F050: @ 803F050 ldrb r0, [r0] subs r0, 0x1 strb r0, [r6, 0x5] - ldr r1, _0803F0EC + ldr r1, =0x02024208 ldrb r0, [r3] lsls r0, 9 adds r2, 0x2 adds r0, r2 ldrb r0, [r0] strh r0, [r1] - ldr r1, _0803F0F0 + ldr r1, =0x03005d10 ldrb r0, [r1, 0x1F] cmp r0, 0xFE bhi _0803F096 adds r0, 0x1 strb r0, [r1, 0x1F] _0803F096: - ldr r2, _0803F0F4 + ldr r2, =0x0202449c ldr r0, [r2] adds r1, r0, 0 adds r1, 0x7A @@ -129181,7 +125324,7 @@ _0803F0A8: adds r4, r5, 0 cmp r4, 0x1 bls _0803F100 - ldr r2, _0803F0F8 + ldr r2, =0x0831bce0 adds r0, 0x7A ldrb r1, [r0] lsls r0, r1, 1 @@ -129195,58 +125338,46 @@ _0803F0A8: movs r0, 0x1 b _0803F0FE .align 2, 0 -_0803F0D0: .4byte 0x0202420b -_0803F0D4: .4byte 0x0202407e -_0803F0D8: .4byte 0x02024082 -_0803F0DC: .4byte 0x02022e14 -_0803F0E0: .4byte 0x02022e16 -_0803F0E4: .4byte 0x02024332 -_0803F0E8: .4byte 0x02023864 -_0803F0EC: .4byte 0x02024208 -_0803F0F0: .4byte 0x03005d10 -_0803F0F4: .4byte 0x0202449c -_0803F0F8: .4byte 0x0831bce0 + .pool _0803F0FC: subs r0, r5, r0 _0803F0FE: strb r0, [r3] _0803F100: - ldr r1, _0803F114 - ldr r0, _0803F118 + ldr r1, =0x02024214 + ldr r0, =0x082dbd58 ldr r0, [r0, 0x8] str r0, [r1] - ldr r1, _0803F11C + ldr r1, =0x02024083 movs r0, 0xA strb r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0803F114: .4byte 0x02024214 -_0803F118: .4byte 0x082dbd58 -_0803F11C: .4byte 0x02024083 + .pool thumb_func_end sub_803F050 thumb_func_start sub_803F120 sub_803F120: @ 803F120 push {r4,lr} - ldr r2, _0803F1A0 - ldr r1, _0803F1A4 - ldr r0, _0803F1A8 + ldr r2, =0x0202420b + ldr r1, =0x0202407e + ldr r0, =0x02024082 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] strb r0, [r2] - ldr r0, _0803F1AC + ldr r0, =0x02022e14 movs r4, 0 strh r4, [r0] - ldr r0, _0803F1B0 + ldr r0, =0x02022e16 strh r4, [r0] - ldr r3, _0803F1B4 + ldr r3, =0x0202449c ldr r0, [r3] adds r2, r0, 0 adds r2, 0x7C - ldr r1, _0803F1B8 + ldr r1, =0x0831bcef adds r0, 0x79 ldrb r0, [r0] adds r0, r1 @@ -129266,7 +125397,7 @@ _0803F162: ldr r0, [r3] adds r2, r0, 0 adds r2, 0x7B - ldr r1, _0803F1BC + ldr r1, =0x0831bcf3 adds r0, 0x79 ldrb r0, [r0] adds r0, r1 @@ -129291,91 +125422,76 @@ _0803F188: bhi _0803F1C4 adds r0, 0x1 strb r0, [r1] - ldr r0, _0803F1C0 + ldr r0, =0x02024332 strb r4, [r0, 0x5] b _0803F1CA .align 2, 0 -_0803F1A0: .4byte 0x0202420b -_0803F1A4: .4byte 0x0202407e -_0803F1A8: .4byte 0x02024082 -_0803F1AC: .4byte 0x02022e14 -_0803F1B0: .4byte 0x02022e16 -_0803F1B4: .4byte 0x0202449c -_0803F1B8: .4byte 0x0831bcef -_0803F1BC: .4byte 0x0831bcf3 -_0803F1C0: .4byte 0x02024332 + .pool _0803F1C4: - ldr r1, _0803F1E0 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] _0803F1CA: - ldr r1, _0803F1E4 - ldr r0, _0803F1E8 + ldr r1, =0x02024214 + ldr r0, =0x082dbd58 ldr r0, [r0, 0x4] str r0, [r1] - ldr r1, _0803F1EC + ldr r1, =0x02024083 movs r0, 0xA strb r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_0803F1E0: .4byte 0x02024332 -_0803F1E4: .4byte 0x02024214 -_0803F1E8: .4byte 0x082dbd58 -_0803F1EC: .4byte 0x02024083 + .pool thumb_func_end sub_803F120 thumb_func_start bs8_exit_by_flight bs8_exit_by_flight: @ 803F1F0 push {r4,lr} - ldr r2, _0803F218 - ldr r1, _0803F21C - ldr r4, _0803F220 + ldr r2, =0x0202420b + ldr r1, =0x0202407e + ldr r4, =0x02024082 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] strb r0, [r2] movs r0, 0x11 bl audio_play - ldr r0, _0803F224 + ldr r0, =0x0202406c ldrb r0, [r0] strb r0, [r4] - ldr r1, _0803F228 + ldr r1, =0x0202433a movs r0, 0x4 strb r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_0803F218: .4byte 0x0202420b -_0803F21C: .4byte 0x0202407e -_0803F220: .4byte 0x02024082 -_0803F224: .4byte 0x0202406c -_0803F228: .4byte 0x0202433a + .pool thumb_func_end bs8_exit_by_flight thumb_func_start bs9_8016C9C bs9_8016C9C: @ 803F22C - ldr r3, _0803F278 - ldr r1, _0803F27C - ldr r0, _0803F280 + ldr r3, =0x0202420b + ldr r1, =0x0202407e + ldr r0, =0x02024082 ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] strb r2, [r3] - ldr r0, _0803F284 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _0803F288 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r1, _0803F28C + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] strb r2, [r1, 0x2] - ldr r2, _0803F290 + ldr r2, =0x0202406e ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -129383,29 +125499,19 @@ bs9_8016C9C: @ 803F22C strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _0803F294 - ldr r0, _0803F298 + ldr r1, =0x02024214 + ldr r0, =0x082dbd58 ldr r0, [r0, 0xC] str r0, [r1] - ldr r1, _0803F29C + ldr r1, =0x02024083 movs r0, 0xA strb r0, [r1] - ldr r1, _0803F2A0 + ldr r1, =0x0202407a movs r0, 0xC strb r0, [r1, 0x1] bx lr .align 2, 0 -_0803F278: .4byte 0x0202420b -_0803F27C: .4byte 0x0202407e -_0803F280: .4byte 0x02024082 -_0803F284: .4byte 0x02022e14 -_0803F288: .4byte 0x02022e16 -_0803F28C: .4byte 0x02022f58 -_0803F290: .4byte 0x0202406e -_0803F294: .4byte 0x02024214 -_0803F298: .4byte 0x082dbd58 -_0803F29C: .4byte 0x02024083 -_0803F2A0: .4byte 0x0202407a + .pool thumb_func_end bs9_8016C9C thumb_func_start bsB_exit_by_move @@ -129416,56 +125522,51 @@ bsB_exit_by_move: @ 803F2A4 lsrs r1, r0, 24 cmp r1, 0 bne _0803F2C0 - ldr r0, _0803F2C4 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x4D strb r1, [r0] - ldr r1, _0803F2C8 + ldr r1, =0x02024083 movs r0, 0xC strb r0, [r1] _0803F2C0: pop {r0} bx r0 .align 2, 0 -_0803F2C4: .4byte 0x0202449c -_0803F2C8: .4byte 0x02024083 + .pool thumb_func_end bsB_exit_by_move thumb_func_start bsD_proceed bsD_proceed: @ 803F2CC - ldr r1, _0803F2EC + ldr r1, =0x02024082 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r3, _0803F2F0 - ldr r2, _0803F2F4 + ldr r3, =0x02024083 + ldr r2, =0x0202407a ldrb r0, [r1] adds r0, r2 ldrb r0, [r0] strb r0, [r3] - ldr r2, _0803F2F8 + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _0803F2FC + ldr r1, =0xf1e892af ands r0, r1 str r0, [r2] bx lr .align 2, 0 -_0803F2EC: .4byte 0x02024082 -_0803F2F0: .4byte 0x02024083 -_0803F2F4: .4byte 0x0202407a -_0803F2F8: .4byte 0x02024280 -_0803F2FC: .4byte 0xf1e892af + .pool thumb_func_end bsD_proceed thumb_func_start bsC_8016D70 bsC_8016D70: @ 803F300 push {r4-r6,lr} - ldr r1, _0803F388 - ldr r2, _0803F38C + ldr r1, =0x0202407e + ldr r2, =0x02024082 ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] - ldr r6, _0803F390 + ldr r6, =0x0202449c ldr r1, [r6] adds r0, r1 adds r0, 0x5C @@ -129474,50 +125575,50 @@ bsC_8016D70: @ 803F300 ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - ldr r3, _0803F394 - ldr r1, _0803F398 + ldr r3, =0x02024083 + ldr r1, =0x0202407a ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] strb r0, [r3] bl sub_803D6A0 - ldr r2, _0803F39C + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _0803F3A0 + ldr r1, =0xf1e892af ands r0, r1 str r0, [r2] - ldr r0, _0803F3A4 + ldr r0, =0x020241ea movs r1, 0 strh r1, [r0] - ldr r0, _0803F3A8 + ldr r0, =0x020241f0 movs r4, 0 str r4, [r0] - ldr r0, _0803F3AC + ldr r0, =0x0202427c strb r1, [r0] - ldr r5, _0803F3B0 + ldr r5, =0x02024474 strb r1, [r5, 0x18] strb r1, [r5, 0x19] - ldr r2, _0803F3B4 - ldr r3, _0803F3B8 + ldr r2, =0x02024250 + ldr r3, =0x0202420b ldrb r0, [r3] lsls r0, 1 adds r0, r2 strh r4, [r0] - ldr r2, _0803F3BC + ldr r2, =0x02024258 ldrb r0, [r3] lsls r0, 1 adds r0, r2 strh r4, [r0] ldr r0, [r6] strb r1, [r0, 0x13] - ldr r0, _0803F3C0 + ldr r0, =0x02024400 strh r4, [r0] strb r1, [r5, 0x14] - ldr r0, _0803F3C4 + ldr r0, =0x02024332 strb r1, [r0, 0x3] strb r1, [r0, 0x4] strb r1, [r5, 0x16] - ldr r0, _0803F3C8 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0x20 @@ -129526,23 +125627,7 @@ bsC_8016D70: @ 803F300 pop {r0} bx r0 .align 2, 0 -_0803F388: .4byte 0x0202407e -_0803F38C: .4byte 0x02024082 -_0803F390: .4byte 0x0202449c -_0803F394: .4byte 0x02024083 -_0803F398: .4byte 0x0202407a -_0803F39C: .4byte 0x02024280 -_0803F3A0: .4byte 0xf1e892af -_0803F3A4: .4byte 0x020241ea -_0803F3A8: .4byte 0x020241f0 -_0803F3AC: .4byte 0x0202427c -_0803F3B0: .4byte 0x02024474 -_0803F3B4: .4byte 0x02024250 -_0803F3B8: .4byte 0x0202420b -_0803F3BC: .4byte 0x02024258 -_0803F3C0: .4byte 0x02024400 -_0803F3C4: .4byte 0x02024332 -_0803F3C8: .4byte 0x020244a8 + .pool thumb_func_end bsC_8016D70 thumb_func_start get_battle_side_of_something @@ -129554,12 +125639,12 @@ get_battle_side_of_something: @ 803F3CC cmp r1, 0xE bhi _0803F47A lsls r0, r1, 2 - ldr r1, _0803F3E4 + ldr r1, =_0803F3E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0803F3E4: .4byte _0803F3E8 + .pool .align 2, 0 _0803F3E8: .4byte _0803F424 @@ -129578,38 +125663,38 @@ _0803F3E8: .4byte _0803F46C .4byte _0803F470 _0803F424: - ldr r0, _0803F42C + ldr r0, =0x0202420c ldrb r0, [r0] b _0803F47A .align 2, 0 -_0803F42C: .4byte 0x0202420c + .pool _0803F430: - ldr r0, _0803F438 + ldr r0, =0x0202420b ldrb r0, [r0] b _0803F47A .align 2, 0 -_0803F438: .4byte 0x0202420b + .pool _0803F43C: - ldr r0, _0803F444 + ldr r0, =0x0202420e ldrb r0, [r0] b _0803F47A .align 2, 0 -_0803F444: .4byte 0x0202420e + .pool _0803F448: movs r0, 0 b _0803F47A _0803F44C: - ldr r0, _0803F454 + ldr r0, =0x02024474 ldrb r0, [r0, 0x17] b _0803F47A .align 2, 0 -_0803F454: .4byte 0x02024474 + .pool _0803F458: - ldr r0, _0803F460 + ldr r0, =0x0202420d ldrb r0, [r0] b _0803F47A .align 2, 0 -_0803F460: .4byte 0x0202420d + .pool _0803F464: movs r0, 0 b _0803F472 @@ -129640,7 +125725,7 @@ sub_803F480: @ 803F480 lsrs r5, r1, 24 lsls r2, 16 lsrs r2, 16 - ldr r1, _0803F4B0 + ldr r1, =0x02024084 movs r4, 0x58 muls r0, r4 adds r0, r1 @@ -129656,7 +125741,7 @@ sub_803F480: @ 803F480 adds r1, r0, r1 b _0803F4BC .align 2, 0 -_0803F4B0: .4byte 0x02024084 + .pool _0803F4B4: adds r1, 0x2 adds r3, 0x1 @@ -129691,21 +125776,21 @@ _0803F4DE: ands r0, r1 cmp r0, 0 bne _0803F532 - ldr r1, _0803F53C + ldr r1, =0x020242bc lsls r0, r5, 3 subs r0, r5 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _0803F540 + ldr r2, =0x0832a328 lsls r0, r3, 2 adds r0, r2 ldr r0, [r0] ands r1, r0 cmp r1, 0 bne _0803F532 - ldr r4, _0803F544 + ldr r4, =0x02024064 strb r5, [r4] adds r1, r3, 0 adds r1, 0x9 @@ -129728,9 +125813,7 @@ _0803F532: pop {r0} bx r0 .align 2, 0 -_0803F53C: .4byte 0x020242bc -_0803F540: .4byte 0x0832a328 -_0803F544: .4byte 0x02024064 + .pool thumb_func_end sub_803F480 thumb_func_start sub_803F548 @@ -129751,11 +125834,11 @@ sub_803F548: @ 803F548 lsrs r0, 24 mov r9, r0 movs r4, 0 - ldr r0, _0803F668 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 bge _0803F5F0 - ldr r1, _0803F66C + ldr r1, =0x02024084 movs r0, 0x58 adds r7, r5, 0 muls r7, r0 @@ -129770,7 +125853,7 @@ _0803F57E: adds r6, r4, 0x1 cmp r9, r0 beq _0803F5E6 - ldr r0, _0803F66C + ldr r0, =0x02024084 movs r3, 0x58 adds r1, r4, 0 muls r1, r3 @@ -129817,7 +125900,7 @@ _0803F5CE: strb r0, [r1] _0803F5E6: adds r4, r6, 0 - ldr r0, _0803F668 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _0803F57E @@ -129825,7 +125908,7 @@ _0803F5F0: mov r1, r8 cmp r1, 0x4 beq _0803F658 - ldr r6, _0803F66C + ldr r6, =0x02024084 movs r3, 0x58 adds r0, r5, 0 muls r0, r3 @@ -129838,14 +125921,14 @@ _0803F5F0: ands r0, r1 cmp r0, 0 bne _0803F658 - ldr r1, _0803F670 + ldr r1, =0x020242bc lsls r0, r5, 3 subs r0, r5 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _0803F674 + ldr r2, =0x0832a328 mov r4, r8 lsls r0, r4, 2 adds r0, r2 @@ -129853,7 +125936,7 @@ _0803F5F0: ands r1, r0 cmp r1, 0 bne _0803F658 - ldr r4, _0803F678 + ldr r4, =0x02024064 strb r5, [r4] mov r1, r8 adds r1, 0x9 @@ -129882,11 +125965,7 @@ _0803F658: pop {r0} bx r0 .align 2, 0 -_0803F668: .4byte 0x0202406c -_0803F66C: .4byte 0x02024084 -_0803F670: .4byte 0x020242bc -_0803F674: .4byte 0x0832a328 -_0803F678: .4byte 0x02024064 + .pool thumb_func_end sub_803F548 thumb_func_start sub_803F67C @@ -129901,12 +125980,12 @@ sub_803F67C: @ 803F67C lsrs r3, r0, 24 movs r6, 0x4 movs r1, 0 - ldr r0, _0803F774 + ldr r0, =0x0202406c mov r8, r0 ldrb r0, [r0] cmp r1, r0 bge _0803F6FE - ldr r7, _0803F778 + ldr r7, =0x02024084 movs r2, 0x58 mov r12, r2 mov r5, r12 @@ -129932,7 +126011,7 @@ _0803F6AE: ldrh r0, [r1] cmp r0, 0xC3 beq _0803F6DE - ldr r1, _0803F77C + ldr r1, =0x02024090 add r1, r9 _0803F6D0: adds r1, 0x2 @@ -129947,7 +126026,7 @@ _0803F6DE: beq _0803F6F4 adds r6, r2, 0 adds r0, r6, r5 - ldr r2, _0803F780 + ldr r2, =0x020240a8 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 @@ -129963,7 +126042,7 @@ _0803F6F4: _0803F6FE: cmp r6, 0x4 beq _0803F762 - ldr r7, _0803F778 + ldr r7, =0x02024084 movs r5, 0x58 adds r0, r3, 0 muls r0, r5 @@ -129976,21 +126055,21 @@ _0803F6FE: ands r0, r1 cmp r0, 0 bne _0803F762 - ldr r1, _0803F784 + ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _0803F788 + ldr r2, =0x0832a328 lsls r0, r6, 2 adds r0, r2 ldr r0, [r0] ands r1, r0 cmp r1, 0 bne _0803F762 - ldr r4, _0803F78C + ldr r4, =0x02024064 strb r3, [r4] adds r1, r6, 0 adds r1, 0x9 @@ -130019,31 +126098,25 @@ _0803F762: pop {r0} bx r0 .align 2, 0 -_0803F774: .4byte 0x0202406c -_0803F778: .4byte 0x02024084 -_0803F77C: .4byte 0x02024090 -_0803F780: .4byte 0x020240a8 -_0803F784: .4byte 0x020242bc -_0803F788: .4byte 0x0832a328 -_0803F78C: .4byte 0x02024064 + .pool thumb_func_end sub_803F67C thumb_func_start sub_803F790 sub_803F790: @ 803F790 push {r4,r5,lr} - ldr r0, _0803F7C0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 beq _0803F7D0 movs r2, 0 - ldr r4, _0803F7C4 + ldr r4, =0x0202406c ldrb r0, [r4] cmp r2, r0 bge _0803F7EE - ldr r3, _0803F7C8 - ldr r5, _0803F7CC + ldr r3, =0x02024068 + ldr r5, =0x0832a328 _0803F7AC: ldm r5!, {r1} lsls r1, 28 @@ -130056,18 +126129,15 @@ _0803F7AC: blt _0803F7AC b _0803F7EE .align 2, 0 -_0803F7C0: .4byte 0x02022fec -_0803F7C4: .4byte 0x0202406c -_0803F7C8: .4byte 0x02024068 -_0803F7CC: .4byte 0x0832a328 + .pool _0803F7D0: movs r2, 0 - ldr r4, _0803F7F4 + ldr r4, =0x0202406c ldrb r0, [r4] cmp r2, r0 bge _0803F7EE - ldr r3, _0803F7F8 - ldr r5, _0803F7FC + ldr r3, =0x02024068 + ldr r5, =0x0832a328 _0803F7DE: ldr r0, [r3] ldm r5!, {r1} @@ -130082,9 +126152,7 @@ _0803F7EE: pop {r0} bx r0 .align 2, 0 -_0803F7F4: .4byte 0x0202406c -_0803F7F8: .4byte 0x02024068 -_0803F7FC: .4byte 0x0832a328 + .pool thumb_func_end sub_803F790 thumb_func_start dp01_battle_side_mark_buffer_for_execution @@ -130092,14 +126160,14 @@ dp01_battle_side_mark_buffer_for_execution: @ 803F800 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _0803F828 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 beq _0803F834 - ldr r2, _0803F82C - ldr r1, _0803F830 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 lsls r0, r3, 2 adds r0, r1 ldr r1, [r0] @@ -130109,12 +126177,10 @@ dp01_battle_side_mark_buffer_for_execution: @ 803F800 str r0, [r2] b _0803F844 .align 2, 0 -_0803F828: .4byte 0x02022fec -_0803F82C: .4byte 0x02024068 -_0803F830: .4byte 0x0832a328 + .pool _0803F834: - ldr r2, _0803F848 - ldr r1, _0803F84C + ldr r2, =0x02024068 + ldr r1, =0x0832a328 lsls r0, r3, 2 adds r0, r1 ldr r1, [r2] @@ -130125,8 +126191,7 @@ _0803F844: pop {r0} bx r0 .align 2, 0 -_0803F848: .4byte 0x02024068 -_0803F84C: .4byte 0x0832a328 + .pool thumb_func_end dp01_battle_side_mark_buffer_for_execution thumb_func_start sub_803F850 @@ -130135,14 +126200,13 @@ sub_803F850: @ 803F850 lsls r0, 24 lsrs r7, r0, 24 movs r4, 0 - ldr r5, _0803F864 - ldr r1, _0803F868 + ldr r5, =0x02024068 + ldr r1, =0x0832a328 lsls r0, r7, 2 adds r6, r0, r1 b _0803F87A .align 2, 0 -_0803F864: .4byte 0x02024068 -_0803F868: .4byte 0x0832a328 + .pool _0803F86C: lsls r0, r4, 2 ldr r1, [r6] @@ -130157,7 +126221,7 @@ _0803F87A: lsrs r0, 24 cmp r4, r0 blt _0803F86C - ldr r2, _0803F89C + ldr r2, =0x02024068 movs r1, 0x80 lsls r1, 21 lsls r1, r7 @@ -130168,38 +126232,38 @@ _0803F87A: pop {r0} bx r0 .align 2, 0 -_0803F89C: .4byte 0x02024068 + .pool thumb_func_end sub_803F850 thumb_func_start b_cancel_multi_turn_move_maybe b_cancel_multi_turn_move_maybe: @ 803F8A0 lsls r0, 24 lsrs r0, 24 - ldr r1, _0803F8F0 + ldr r1, =0x02024084 movs r2, 0x58 adds r3, r0, 0 muls r3, r2 adds r1, 0x50 adds r3, r1 ldr r1, [r3] - ldr r2, _0803F8F4 + ldr r2, =0xffffefff ands r1, r2 - ldr r2, _0803F8F8 + ldr r2, =0xfffff3ff ands r1, r2 movs r2, 0x71 negs r2, r2 ands r1, r2 - ldr r2, _0803F8FC + ldr r2, =0xfffffcff ands r1, r2 str r1, [r3] - ldr r1, _0803F900 + ldr r1, =0x020242ac lsls r2, r0, 2 adds r2, r1 ldr r1, [r2] - ldr r3, _0803F904 + ldr r3, =0xfffbff3f ands r1, r3 str r1, [r2] - ldr r2, _0803F908 + ldr r2, =0x020242bc lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -130213,20 +126277,14 @@ b_cancel_multi_turn_move_maybe: @ 803F8A0 strb r0, [r1, 0x10] bx lr .align 2, 0 -_0803F8F0: .4byte 0x02024084 -_0803F8F4: .4byte 0xffffefff -_0803F8F8: .4byte 0xfffff3ff -_0803F8FC: .4byte 0xfffffcff -_0803F900: .4byte 0x020242ac -_0803F904: .4byte 0xfffbff3f -_0803F908: .4byte 0x020242bc + .pool thumb_func_end b_cancel_multi_turn_move_maybe thumb_func_start sub_803F90C sub_803F90C: @ 803F90C push {lr} lsls r0, 24 - ldr r1, _0803F958 + ldr r1, =0x0202433c lsrs r0, 20 adds r1, r0, r1 ldrb r0, [r1] @@ -130263,7 +126321,7 @@ _0803F952: movs r0, 0x1 b _0803F95E .align 2, 0 -_0803F958: .4byte 0x0202433c + .pool _0803F95C: movs r0, 0 _0803F95E: @@ -130277,7 +126335,7 @@ b_std_message: @ 803F964 adds r2, r0, 0 lsls r2, 16 lsrs r2, 16 - ldr r4, _0803F984 + ldr r4, =0x02024064 strb r1, [r4] movs r0, 0 adds r1, r2, 0 @@ -130288,25 +126346,25 @@ b_std_message: @ 803F964 pop {r0} bx r0 .align 2, 0 -_0803F984: .4byte 0x02024064 + .pool thumb_func_end b_std_message thumb_func_start sub_803F988 sub_803F988: @ 803F988 push {r4-r6,lr} movs r3, 0 - ldr r0, _0803F9DC + ldr r0, =0x020243fe strb r3, [r0] strb r3, [r0, 0x1] movs r1, 0 - ldr r0, _0803F9E0 + ldr r0, =0x0202406c ldrb r2, [r0] adds r6, r0, 0 cmp r1, r2 bge _0803F9B6 - ldr r5, _0803F9E4 + ldr r5, =0x0832a328 adds r4, r2, 0 - ldr r2, _0803F9E8 + ldr r2, =0x0202406e _0803F9A4: ldrh r0, [r2] lsls r0, 2 @@ -130323,7 +126381,7 @@ _0803F9B6: ldrb r0, [r2] cmp r1, r0 bge _0803F9D6 - ldr r5, _0803F9DC + ldr r5, =0x020243fe movs r4, 0x2 _0803F9C4: adds r0, r1, 0 @@ -130340,10 +126398,7 @@ _0803F9D6: pop {r0} bx r0 .align 2, 0 -_0803F9DC: .4byte 0x020243fe -_0803F9E0: .4byte 0x0202406c -_0803F9E4: .4byte 0x0832a328 -_0803F9E8: .4byte 0x0202406e + .pool thumb_func_end sub_803F988 thumb_func_start sub_803F9EC @@ -130365,20 +126420,20 @@ sub_803F9EC: @ 803F9EC lsls r0, 24 lsrs r0, 25 mov r12, r0 - ldr r1, _0803FA5C + ldr r1, =0x020243fe adds r0, r1 strb r4, [r0] adds r5, r4, 0 - ldr r0, _0803FA60 + ldr r0, =0x0202406c ldrb r2, [r0] mov r8, r1 cmp r4, r2 bge _0803FA4A - ldr r0, _0803FA64 + ldr r0, =0x02024210 ldrb r7, [r0] - ldr r1, _0803FA68 + ldr r1, =0x0832a328 adds r6, r2, 0 - ldr r3, _0803FA6C + ldr r3, =0x0202406e adds r2, r1, 0 _0803FA2E: ldr r0, [r2] @@ -130407,11 +126462,7 @@ _0803FA50: pop {r0} bx r0 .align 2, 0 -_0803FA5C: .4byte 0x020243fe -_0803FA60: .4byte 0x0202406c -_0803FA64: .4byte 0x02024210 -_0803FA68: .4byte 0x0832a328 -_0803FA6C: .4byte 0x0202406e + .pool thumb_func_end sub_803F9EC thumb_func_start sub_803FA70 @@ -130430,15 +126481,15 @@ sub_803FA70: @ 803FA70 b _0803FAC2 _0803FA8C: movs r3, 0x1 - ldr r5, _0803FAC8 + ldr r5, =0x0202406c ldrb r0, [r5] cmp r3, r0 bge _0803FAC2 - ldr r0, _0803FACC + ldr r0, =0x020243fe mov r12, r0 movs r7, 0x2 - ldr r6, _0803FAD0 - ldr r1, _0803FAD4 + ldr r6, =0x0832a328 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r4, r0, r1 _0803FAA4: @@ -130462,16 +126513,13 @@ _0803FAC2: pop {r0} bx r0 .align 2, 0 -_0803FAC8: .4byte 0x0202406c -_0803FACC: .4byte 0x020243fe -_0803FAD0: .4byte 0x0832a328 -_0803FAD4: .4byte 0x0202406e + .pool thumb_func_end sub_803FA70 thumb_func_start b_movescr_stack_push b_movescr_stack_push: @ 803FAD8 push {r4,lr} - ldr r1, _0803FAF8 + ldr r1, =0x020244a8 ldr r1, [r1] ldr r3, [r1, 0x8] adds r4, r3, 0 @@ -130487,12 +126535,12 @@ b_movescr_stack_push: @ 803FAD8 pop {r0} bx r0 .align 2, 0 -_0803FAF8: .4byte 0x020244a8 + .pool thumb_func_end b_movescr_stack_push thumb_func_start b_movescr_stack_push_cursor b_movescr_stack_push_cursor: @ 803FAFC - ldr r0, _0803FB1C + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x8] adds r3, r2, 0 @@ -130503,19 +126551,18 @@ b_movescr_stack_push_cursor: @ 803FAFC lsls r0, 24 lsrs r0, 22 adds r2, r0 - ldr r0, _0803FB20 + ldr r0, =0x02024214 ldr r0, [r0] str r0, [r2] bx lr .align 2, 0 -_0803FB1C: .4byte 0x020244a8 -_0803FB20: .4byte 0x02024214 + .pool thumb_func_end b_movescr_stack_push_cursor thumb_func_start b_movescr_stack_pop_cursor b_movescr_stack_pop_cursor: @ 803FB24 - ldr r3, _0803FB44 - ldr r0, _0803FB48 + ldr r3, =0x02024214 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x8] adds r2, r1, 0 @@ -130530,8 +126577,7 @@ b_movescr_stack_pop_cursor: @ 803FB24 str r0, [r3] bx lr .align 2, 0 -_0803FB44: .4byte 0x02024214 -_0803FB48: .4byte 0x020244a8 + .pool thumb_func_end b_movescr_stack_pop_cursor thumb_func_start sub_803FB4C @@ -130540,9 +126586,9 @@ sub_803FB4C: @ 803FB4C mov r7, r8 push {r7} movs r6, 0 - ldr r2, _0803FBCC - ldr r1, _0803FBD0 - ldr r3, _0803FBD4 + ldr r2, =0x02024084 + ldr r1, =0x02023864 + ldr r3, =0x02024064 ldrb r4, [r3] lsls r0, r4, 9 adds r1, 0x2 @@ -130555,13 +126601,13 @@ sub_803FB4C: @ 803FB4C adds r2, 0xC adds r0, r2 ldrh r5, [r0] - ldr r1, _0803FBD8 + ldr r1, =0x0202449c lsls r0, r4, 1 adds r0, 0xC8 ldr r1, [r1] adds r1, r0 mov r8, r1 - ldr r1, _0803FBDC + ldr r1, =0x020242bc lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -130573,24 +126619,24 @@ sub_803FB4C: @ 803FB4C bne _0803FC06 cmp r5, 0 beq _0803FC06 - ldr r0, _0803FBE0 + ldr r0, =0x02024474 strb r4, [r0, 0x17] - ldr r0, _0803FBE4 + ldr r0, =0x020241ea strh r5, [r0] - ldr r0, _0803FBE8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 beq _0803FBF8 - ldr r1, _0803FBEC + ldr r1, =0x02024230 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, _0803FBF0 + ldr r1, =0x082dae2a str r1, [r0] - ldr r0, _0803FBF4 + ldr r0, =0x0202433c ldrb r1, [r7] lsls r1, 4 adds r1, r0 @@ -130600,27 +126646,17 @@ sub_803FB4C: @ 803FB4C strb r0, [r1, 0x2] b _0803FC06 .align 2, 0 -_0803FBCC: .4byte 0x02024084 -_0803FBD0: .4byte 0x02023864 -_0803FBD4: .4byte 0x02024064 -_0803FBD8: .4byte 0x0202449c -_0803FBDC: .4byte 0x020242bc -_0803FBE0: .4byte 0x02024474 -_0803FBE4: .4byte 0x020241ea -_0803FBE8: .4byte 0x02022fec -_0803FBEC: .4byte 0x02024230 -_0803FBF0: .4byte 0x082dae2a -_0803FBF4: .4byte 0x0202433c + .pool _0803FBF8: - ldr r0, _0803FC5C + ldr r0, =0x02024220 ldrb r1, [r7] lsls r1, 2 adds r1, r0 - ldr r0, _0803FC60 + ldr r0, =0x082dae1f str r0, [r1] movs r6, 0x1 _0803FC06: - ldr r1, _0803FC64 + ldr r1, =0x02024248 ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -130629,7 +126665,7 @@ _0803FC06: bne _0803FC90 cmp r5, 0xA5 beq _0803FC90 - ldr r1, _0803FC68 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 adds r1, 0x50 @@ -130639,20 +126675,20 @@ _0803FC06: bge _0803FC90 adds r0, r2, 0 bl b_cancel_multi_turn_move_maybe - ldr r0, _0803FC6C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 beq _0803FC7C - ldr r1, _0803FC70 + ldr r1, =0x02024230 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, _0803FC74 + ldr r1, =0x082db098 str r1, [r0] - ldr r0, _0803FC78 + ldr r0, =0x0202433c ldrb r1, [r7] lsls r1, 4 adds r1, r0 @@ -130662,26 +126698,19 @@ _0803FC06: strb r0, [r1, 0x2] b _0803FC8E .align 2, 0 -_0803FC5C: .4byte 0x02024220 -_0803FC60: .4byte 0x082dae1f -_0803FC64: .4byte 0x02024248 -_0803FC68: .4byte 0x02024084 -_0803FC6C: .4byte 0x02022fec -_0803FC70: .4byte 0x02024230 -_0803FC74: .4byte 0x082db098 -_0803FC78: .4byte 0x0202433c + .pool _0803FC7C: - ldr r1, _0803FCE4 + ldr r1, =0x02024220 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, _0803FCE8 + ldr r1, =0x082db089 str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 _0803FC8E: - ldr r3, _0803FCEC + ldr r3, =0x020242bc _0803FC90: ldrb r0, [r7] lsls r1, r0, 3 @@ -130692,7 +126721,7 @@ _0803FC90: lsls r0, 28 cmp r0, 0 beq _0803FD1A - ldr r0, _0803FCF0 + ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 lsls r1, 2 @@ -130700,22 +126729,22 @@ _0803FC90: ldrb r0, [r1, 0x1] cmp r0, 0 bne _0803FD1A - ldr r0, _0803FCF4 + ldr r0, =0x020241ea strh r5, [r0] - ldr r0, _0803FCF8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 beq _0803FD08 - ldr r1, _0803FCFC + ldr r1, =0x02024230 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, _0803FD00 + ldr r1, =0x082db0af str r1, [r0] - ldr r0, _0803FD04 + ldr r0, =0x0202433c ldrb r1, [r7] lsls r1, 4 adds r1, r0 @@ -130725,49 +126754,41 @@ _0803FC90: strb r0, [r1, 0x2] b _0803FD1A .align 2, 0 -_0803FCE4: .4byte 0x02024220 -_0803FCE8: .4byte 0x082db089 -_0803FCEC: .4byte 0x020242bc -_0803FCF0: .4byte 0x0831c898 -_0803FCF4: .4byte 0x020241ea -_0803FCF8: .4byte 0x02022fec -_0803FCFC: .4byte 0x02024230 -_0803FD00: .4byte 0x082db0af -_0803FD04: .4byte 0x0202433c + .pool _0803FD08: - ldr r1, _0803FD5C + ldr r1, =0x02024220 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, _0803FD60 + ldr r1, =0x082db0a0 str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 _0803FD1A: - ldr r4, _0803FD64 + ldr r4, =0x02024064 ldrb r0, [r4] adds r1, r5, 0 bl sub_8040130 lsls r0, 24 cmp r0, 0 beq _0803FD8E - ldr r0, _0803FD68 + ldr r0, =0x020241ea strh r5, [r0] - ldr r0, _0803FD6C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 beq _0803FD7C - ldr r1, _0803FD70 + ldr r1, =0x02024230 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0803FD74 + ldr r1, =0x082db185 str r1, [r0] - ldr r0, _0803FD78 + ldr r0, =0x0202433c ldrb r1, [r4] lsls r1, 4 adds r1, r0 @@ -130777,27 +126798,20 @@ _0803FD1A: strb r0, [r1, 0x2] b _0803FD8E .align 2, 0 -_0803FD5C: .4byte 0x02024220 -_0803FD60: .4byte 0x082db0a0 -_0803FD64: .4byte 0x02024064 -_0803FD68: .4byte 0x020241ea -_0803FD6C: .4byte 0x02022fec -_0803FD70: .4byte 0x02024230 -_0803FD74: .4byte 0x082db185 -_0803FD78: .4byte 0x0202433c + .pool _0803FD7C: - ldr r1, _0803FDB0 + ldr r1, =0x02024220 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0803FDB4 + ldr r1, =0x082db181 str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 _0803FD8E: - ldr r1, _0803FDB8 - ldr r0, _0803FDBC + ldr r1, =0x02024084 + ldr r0, =0x02024064 ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -130805,7 +126819,7 @@ _0803FD8E: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0803FDC4 - ldr r1, _0803FDC0 + ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -130813,22 +126827,18 @@ _0803FD8E: ldrb r4, [r0, 0x7] b _0803FDCE .align 2, 0 -_0803FDB0: .4byte 0x02024220 -_0803FDB4: .4byte 0x082db181 -_0803FDB8: .4byte 0x02024084 -_0803FDBC: .4byte 0x02024064 -_0803FDC0: .4byte 0x02024404 + .pool _0803FDC4: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 lsrs r4, r0, 24 _0803FDCE: - ldr r2, _0803FE28 - ldr r1, _0803FE2C + ldr r2, =0x0202420f + ldr r1, =0x02024064 ldrb r0, [r1] strb r0, [r2] - ldr r0, _0803FE30 + ldr r0, =0x02024084 mov r12, r0 adds r7, r1, 0 cmp r4, 0x1D @@ -130838,21 +126848,21 @@ _0803FDCE: adds r2, r1, 0 cmp r2, 0 beq _0803FE58 - ldr r0, _0803FE34 + ldr r0, =0x0000ffff cmp r2, r0 beq _0803FE58 cmp r2, r5 beq _0803FE58 - ldr r0, _0803FE38 + ldr r0, =0x020241ea strh r1, [r0] - ldr r2, _0803FE3C + ldr r2, =0x02024208 ldrb r1, [r7] movs r0, 0x58 muls r0, r1 add r0, r12 ldrh r0, [r0, 0x2E] strh r0, [r2] - ldr r0, _0803FE40 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 10 @@ -130860,7 +126870,7 @@ _0803FDCE: ldrb r2, [r7] cmp r1, 0 beq _0803FE48 - ldr r0, _0803FE44 + ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x2] @@ -130869,25 +126879,18 @@ _0803FDCE: strb r0, [r1, 0x2] b _0803FE58 .align 2, 0 -_0803FE28: .4byte 0x0202420f -_0803FE2C: .4byte 0x02024064 -_0803FE30: .4byte 0x02024084 -_0803FE34: .4byte 0x0000ffff -_0803FE38: .4byte 0x020241ea -_0803FE3C: .4byte 0x02024208 -_0803FE40: .4byte 0x02022fec -_0803FE44: .4byte 0x0202433c + .pool _0803FE48: - ldr r1, _0803FE94 + ldr r1, =0x02024220 lsls r0, r2, 2 adds r0, r1 - ldr r1, _0803FE98 + ldr r1, =0x082db812 str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 _0803FE58: - ldr r0, _0803FE9C + ldr r0, =0x02023864 ldrb r3, [r7] lsls r1, r3, 9 adds r0, 0x2 @@ -130902,14 +126905,14 @@ _0803FE58: ldrb r0, [r0] cmp r0, 0 bne _0803FEB8 - ldr r0, _0803FEA0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 beq _0803FEA8 - ldr r0, _0803FEA4 + ldr r0, =0x0202433c lsls r1, r3, 4 adds r1, r0 ldrb r0, [r1, 0x2] @@ -130918,16 +126921,12 @@ _0803FE58: strb r0, [r1, 0x2] b _0803FEB8 .align 2, 0 -_0803FE94: .4byte 0x02024220 -_0803FE98: .4byte 0x082db812 -_0803FE9C: .4byte 0x02023864 -_0803FEA0: .4byte 0x02022fec -_0803FEA4: .4byte 0x0202433c + .pool _0803FEA8: - ldr r1, _0803FEC4 + ldr r1, =0x02024220 lsls r0, r3, 2 adds r0, r1 - ldr r1, _0803FEC8 + ldr r1, =0x082db076 str r1, [r0] adds r0, r6, 0x1 lsls r0, 24 @@ -130940,8 +126939,7 @@ _0803FEB8: pop {r1} bx r1 .align 2, 0 -_0803FEC4: .4byte 0x02024220 -_0803FEC8: .4byte 0x082db076 + .pool thumb_func_end sub_803FB4C thumb_func_start sub_803FECC @@ -130958,20 +126956,20 @@ sub_803FECC: @ 803FECC lsrs r4, r1, 24 lsls r2, 24 lsrs r3, r2, 24 - ldr r1, _0803FF10 + ldr r1, =0x0202449c lsls r0, r7, 1 adds r0, 0xC8 ldr r1, [r1] adds r1, r0 str r1, [sp, 0x4] - ldr r1, _0803FF14 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 adds r1, r0, r1 ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0803FF1C - ldr r2, _0803FF18 + ldr r2, =0x02024404 lsls r1, r7, 3 subs r0, r1, r7 lsls r0, 2 @@ -130980,9 +126978,7 @@ sub_803FECC: @ 803FECC str r0, [sp] b _0803FF2E .align 2, 0 -_0803FF10: .4byte 0x0202449c -_0803FF14: .4byte 0x02024084 -_0803FF18: .4byte 0x02024404 + .pool _0803FF1C: ldrh r0, [r1, 0x2E] str r3, [sp, 0x14] @@ -130993,20 +126989,20 @@ _0803FF1C: lsls r1, r7, 3 ldr r3, [sp, 0x14] _0803FF2E: - ldr r0, _080400A8 + ldr r0, =0x0202420f strb r7, [r0] movs r0, 0 mov r9, r0 lsls r2, r7, 1 str r2, [sp, 0xC] - ldr r5, _080400AC + ldr r5, =0x020242bc mov r12, r5 - ldr r0, _080400B0 + ldr r0, =0x02024084 movs r2, 0x58 adds r6, r7, 0 muls r6, r2 str r6, [sp, 0x8] - ldr r2, _080400B4 + ldr r2, =0x02024090 adds r5, r6, r2 movs r6, 0 str r6, [sp, 0x10] @@ -131014,7 +127010,7 @@ _0803FF2E: subs r0, r1, r7 lsls r0, 2 mov r8, r0 - ldr r6, _080400B8 + ldr r6, =0x0832a328 _0803FF5A: ldrh r0, [r5] cmp r0, 0 @@ -131065,10 +127061,10 @@ _0803FFAC: muls r2, r0 ldr r1, [sp, 0x10] adds r0, r1, r2 - ldr r1, _080400B4 + ldr r1, =0x02024090 adds r0, r1 mov r12, r0 - ldr r1, _080400BC + ldr r1, =0x02024248 ldr r0, [sp, 0xC] adds r1, r0, r1 str r1, [sp, 0x18] @@ -131094,7 +127090,7 @@ _0803FFAC: lsls r0, r4, 24 lsrs r4, r0, 24 _0803FFEE: - ldr r0, _080400AC + ldr r0, =0x020242bc add r0, r8 ldrb r0, [r0, 0x13] lsls r0, 28 @@ -131104,7 +127100,7 @@ _0803FFEE: ands r0, r3 cmp r0, 0 beq _0804001C - ldr r2, _080400C0 + ldr r2, =0x0831c898 ldrh r1, [r5] lsls r0, r1, 1 adds r0, r1 @@ -131135,7 +127131,7 @@ _0804001C: lsls r0, r4, 24 lsrs r4, r0, 24 _0804003E: - ldr r1, _080400AC + ldr r1, =0x020242bc mov r0, r8 adds r2, r0, r1 ldrb r0, [r2, 0xE] @@ -131159,7 +127155,7 @@ _0804005E: ldrh r1, [r0] cmp r1, 0 beq _08040080 - ldr r0, _080400C4 + ldr r0, =0x0000ffff cmp r1, r0 beq _08040080 ldrh r2, [r5] @@ -131192,20 +127188,13 @@ _08040096: pop {r1} bx r1 .align 2, 0 -_080400A8: .4byte 0x0202420f -_080400AC: .4byte 0x020242bc -_080400B0: .4byte 0x02024084 -_080400B4: .4byte 0x02024090 -_080400B8: .4byte 0x0832a328 -_080400BC: .4byte 0x02024248 -_080400C0: .4byte 0x0831c898 -_080400C4: .4byte 0x0000ffff + .pool thumb_func_end sub_803FECC thumb_func_start sub_80400C8 sub_80400C8: @ 80400C8 push {r4,lr} - ldr r4, _080400FC + ldr r4, =0x02024064 ldrb r0, [r4] movs r1, 0 movs r2, 0xFF @@ -131214,7 +127203,7 @@ sub_80400C8: @ 80400C8 lsrs r3, r0, 24 cmp r3, 0xF bne _0804010C - ldr r0, _08040100 + ldr r0, =0x0202433c ldrb r1, [r4] lsls r1, 4 adds r1, r0 @@ -131222,20 +127211,17 @@ sub_80400C8: @ 80400C8 movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r1, _08040104 + ldr r1, =0x02024220 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08040108 + ldr r1, =0x082db072 str r1, [r0] b _0804011E .align 2, 0 -_080400FC: .4byte 0x02024064 -_08040100: .4byte 0x0202433c -_08040104: .4byte 0x02024220 -_08040108: .4byte 0x082db072 + .pool _0804010C: - ldr r0, _0804012C + ldr r0, =0x0202433c ldrb r1, [r4] lsls r1, 4 adds r1, r0 @@ -131254,7 +127240,7 @@ _08040126: pop {r1} bx r1 .align 2, 0 -_0804012C: .4byte 0x0202433c + .pool thumb_func_end sub_80400C8 thumb_func_start sub_8040130 @@ -131273,11 +127259,11 @@ sub_8040130: @ 8040130 lsrs r0, 24 mov r9, r0 movs r4, 0 - ldr r0, _080401C4 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 bge _080401B4 - ldr r7, _080401C8 + ldr r7, =0x02024090 mov r8, r7 _0804015A: lsls r0, r4, 24 @@ -131288,7 +127274,7 @@ _0804015A: adds r3, r4, 0x1 cmp r9, r0 beq _080401AA - ldr r1, _080401CC + ldr r1, =0x020242ac lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] @@ -131323,7 +127309,7 @@ _080401A0: lsrs r6, r0, 24 _080401AA: adds r4, r3, 0 - ldr r0, _080401C4 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _0804015A @@ -131336,9 +127322,7 @@ _080401B4: pop {r1} bx r1 .align 2, 0 -_080401C4: .4byte 0x0202406c -_080401C8: .4byte 0x02024090 -_080401CC: .4byte 0x020242ac + .pool thumb_func_end sub_8040130 thumb_func_start sub_80401D0 @@ -131350,21 +127334,21 @@ sub_80401D0: @ 80401D0 push {r5-r7} movs r0, 0 mov r9, r0 - ldr r1, _08040274 + ldr r1, =0x0202420b mov r2, r9 strb r2, [r1] - ldr r0, _08040278 + ldr r0, =0x0202406c ldrb r4, [r0] adds r6, r1, 0 mov r10, r0 - ldr r7, _0804027C - ldr r3, _08040280 + ldr r7, =0x0202420c + ldr r3, =0x0202449c mov r12, r3 cmp r9, r4 bcs _08040224 - ldr r2, _08040284 + ldr r2, =0x02024210 ldrb r1, [r2] - ldr r5, _08040288 + ldr r5, =0x0832a328 ldr r0, [r5] ands r1, r0 cmp r1, 0 @@ -131393,9 +127377,9 @@ _08040224: ldrb r4, [r0] cmp r4, 0 beq _0804025E - ldr r2, _08040284 + ldr r2, =0x02024210 ldrb r1, [r2] - ldr r5, _08040288 + ldr r5, =0x0832a328 ldr r0, [r5] ands r1, r0 cmp r1, 0 @@ -131426,18 +127410,12 @@ _0804025E: b _080408F6 _0804026A: lsls r0, 2 - ldr r1, _0804028C + ldr r1, =_08040290 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08040274: .4byte 0x0202420b -_08040278: .4byte 0x0202406c -_0804027C: .4byte 0x0202420c -_08040280: .4byte 0x0202449c -_08040284: .4byte 0x02024210 -_08040288: .4byte 0x0832a328 -_0804028C: .4byte _08040290 + .pool .align 2, 0 _08040290: .4byte _080402BC @@ -131453,12 +127431,12 @@ _08040290: .4byte _080408EC _080402BC: movs r5, 0 - ldr r1, _080402DC + ldr r1, =0x0202406c mov r10, r1 ldrb r2, [r1] cmp r5, r2 bge _080402D6 - ldr r2, _080402E0 + ldr r2, =0x0202407e _080402CA: adds r0, r5, r2 strb r5, [r0] @@ -131470,16 +127448,15 @@ _080402D6: movs r5, 0 b _08040324 .align 2, 0 -_080402DC: .4byte 0x0202406c -_080402E0: .4byte 0x0202407e + .pool _080402E4: adds r4, r5, 0x1 adds r6, r4, 0 ldrb r1, [r1] cmp r6, r1 bge _08040322 - ldr r7, _080403E0 - ldr r0, _080403E4 + ldr r7, =0x0202407e + ldr r0, =0x0202406c mov r10, r0 lsls r1, r5, 24 mov r8, r1 @@ -131500,7 +127477,7 @@ _080402F8: bl sub_803CEDC _08040318: adds r4, 0x1 - ldr r0, _080403E4 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _080402F8 @@ -131512,7 +127489,7 @@ _08040324: subs r0, 0x1 cmp r5, r0 blt _080402E4 - ldr r2, _080403E8 + ldr r2, =0x0202449c ldr r1, [r2] ldrb r0, [r1, 0x3] adds r0, 0x1 @@ -131531,16 +127508,16 @@ _08040342: bls _08040350 b _0804062C _08040350: - ldr r3, _080403EC + ldr r3, =0x02024064 mov r8, r3 movs r7, 0 - ldr r6, _080403F0 - ldr r5, _080403F4 + ldr r6, =0x0202420b + ldr r5, =0x02022f58 _0804035A: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] - ldr r2, _080403F8 + ldr r2, =0x02024294 lsls r1, r4, 1 adds r0, r1, r4 lsls r0, 2 @@ -131549,7 +127526,7 @@ _0804035A: strb r0, [r6] mov r3, r8 strb r0, [r3] - ldr r0, _080403FC + ldr r0, =0x0202428e adds r3, r1, r0 ldrh r1, [r3] movs r0, 0x1 @@ -131564,11 +127541,11 @@ _0804035A: cmp r0, 0 bne _080403BC ldrh r0, [r3] - ldr r2, _08040400 + ldr r2, =0x0000fffe adds r1, r2, 0 ands r0, r1 strh r0, [r3] - ldr r0, _08040404 + ldr r0, =0x082dacfa bl b_call_bc_move_exec movs r0, 0xFD strb r0, [r5] @@ -131586,7 +127563,7 @@ _0804035A: lsrs r0, 24 mov r9, r0 _080403BC: - ldr r2, _080403E8 + ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -131606,16 +127583,7 @@ _080403D2: bls _0804035A b _0804062C .align 2, 0 -_080403E0: .4byte 0x0202407e -_080403E4: .4byte 0x0202406c -_080403E8: .4byte 0x0202449c -_080403EC: .4byte 0x02024064 -_080403F0: .4byte 0x0202420b -_080403F4: .4byte 0x02022f58 -_080403F8: .4byte 0x02024294 -_080403FC: .4byte 0x0202428e -_08040400: .4byte 0x0000fffe -_08040404: .4byte 0x082dacfa + .pool _08040408: mov r1, r12 ldr r0, [r1] @@ -131629,22 +127597,22 @@ _08040416: mov r10, r0 movs r2, 0 mov r8, r2 - ldr r7, _080404B0 - ldr r5, _080404B4 + ldr r7, =0x0202420b + ldr r5, =0x02022f58 _08040422: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] - ldr r2, _080404B8 + ldr r2, =0x02024294 lsls r1, r4, 1 adds r0, r1, r4 lsls r0, 2 adds r2, r0, r2 ldrb r0, [r2, 0x3] strb r0, [r7] - ldr r3, _080404BC + ldr r3, =0x02024064 strb r0, [r3] - ldr r0, _080404C0 + ldr r0, =0x0202428e adds r3, r1, r0 ldrh r1, [r3] movs r0, 0x2 @@ -131659,13 +127627,13 @@ _08040422: cmp r0, 0 bne _0804048A ldrh r0, [r3] - ldr r2, _080404C4 + ldr r2, =0x0000fffd adds r1, r2, 0 ands r0, r1 strh r0, [r3] - ldr r0, _080404C8 + ldr r0, =0x082dacfa bl b_call_bc_move_exec - ldr r0, _080404CC + ldr r0, =0x02024332 strb r4, [r0, 0x5] movs r0, 0xFD strb r0, [r5] @@ -131684,7 +127652,7 @@ _08040422: lsrs r0, 24 mov r9, r0 _0804048A: - ldr r2, _080404D0 + ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -131704,15 +127672,7 @@ _080404A0: bls _08040422 b _08040570 .align 2, 0 -_080404B0: .4byte 0x0202420b -_080404B4: .4byte 0x02022f58 -_080404B8: .4byte 0x02024294 -_080404BC: .4byte 0x02024064 -_080404C0: .4byte 0x0202428e -_080404C4: .4byte 0x0000fffd -_080404C8: .4byte 0x082dacfa -_080404CC: .4byte 0x02024332 -_080404D0: .4byte 0x0202449c + .pool _080404D4: mov r1, r12 ldr r0, [r1] @@ -131720,17 +127680,17 @@ _080404D4: ldrb r0, [r0] cmp r0, 0x1 bhi _08040570 - ldr r0, _0804058C + ldr r0, =0x02024064 mov r10, r0 movs r2, 0 mov r8, r2 - ldr r7, _08040590 - ldr r5, _08040594 + ldr r7, =0x0202420b + ldr r5, =0x02022f58 _080404EC: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] - ldr r1, _08040598 + ldr r1, =0x02024294 lsls r3, r4, 1 adds r0, r3, r4 lsls r0, 2 @@ -131748,16 +127708,16 @@ _080404EC: lsls r0, 24 cmp r0, 0 bne _0804054E - ldr r2, _0804059C + ldr r2, =0x0202428e adds r2, r3, r2 ldrh r0, [r2] - ldr r3, _080405A0 + ldr r3, =0x0000feff adds r1, r3, 0 ands r0, r1 strh r0, [r2] - ldr r0, _080405A4 + ldr r0, =0x082dacfa bl b_call_bc_move_exec - ldr r0, _080405A8 + ldr r0, =0x02024332 strb r4, [r0, 0x5] movs r0, 0xFD strb r0, [r5] @@ -131776,7 +127736,7 @@ _080404EC: lsrs r0, 24 mov r9, r0 _0804054E: - ldr r2, _080405AC + ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -131810,15 +127770,7 @@ _08040578: strb r2, [r0] b _080408F6 .align 2, 0 -_0804058C: .4byte 0x02024064 -_08040590: .4byte 0x0202420b -_08040594: .4byte 0x02022f58 -_08040598: .4byte 0x02024294 -_0804059C: .4byte 0x0202428e -_080405A0: .4byte 0x0000feff -_080405A4: .4byte 0x082dacfa -_080405A8: .4byte 0x02024332 -_080405AC: .4byte 0x0202449c + .pool _080405B0: mov r1, r12 ldr r0, [r1] @@ -131826,13 +127778,13 @@ _080405B0: ldrb r0, [r0] cmp r0, 0x1 bhi _0804062C - ldr r6, _0804064C - ldr r5, _08040650 + ldr r6, =0x02024064 + ldr r5, =0x0202420b _080405C0: ldr r0, [r1] adds r0, 0xDB ldrb r4, [r0] - ldr r2, _08040654 + ldr r2, =0x02024294 lsls r1, r4, 1 adds r0, r1, r4 lsls r0, 2 @@ -131840,7 +127792,7 @@ _080405C0: ldrb r0, [r2, 0x7] strb r0, [r5] strb r0, [r6] - ldr r0, _08040658 + ldr r0, =0x0202428e adds r3, r1, r0 ldrh r1, [r3] movs r0, 0x20 @@ -131854,11 +127806,11 @@ _080405C0: cmp r0, 0 bne _0804060A ldrh r0, [r3] - ldr r2, _0804065C + ldr r2, =0x0000ffdf adds r1, r2, 0 ands r0, r1 strh r0, [r3] - ldr r0, _08040660 + ldr r0, =0x082dad0b bl b_call_bc_move_exec mov r0, r9 adds r0, 0x1 @@ -131866,7 +127818,7 @@ _080405C0: lsrs r0, 24 mov r9, r0 _0804060A: - ldr r2, _08040664 + ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -131902,24 +127854,18 @@ _08040634: strb r3, [r0] b _080408F6 .align 2, 0 -_0804064C: .4byte 0x02024064 -_08040650: .4byte 0x0202420b -_08040654: .4byte 0x02024294 -_08040658: .4byte 0x0202428e -_0804065C: .4byte 0x0000ffdf -_08040660: .4byte 0x082dad0b -_08040664: .4byte 0x0202449c + .pool _08040668: mov r2, r12 ldr r0, [r2] adds r0, 0xDB - ldr r1, _080406FC + ldr r1, =0x0202406c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 bcs _080406E8 - ldr r4, _08040700 - ldr r5, _08040704 + ldr r4, =0x02024064 + ldr r5, =0x0202407e _0804067C: ldr r0, [r2] adds r0, 0xDB @@ -131927,7 +127873,7 @@ _0804067C: adds r0, r5 ldrb r0, [r0] strb r0, [r4] - ldr r0, _08040708 + ldr r0, =0x020243d0 adds r0, 0x20 ldrb r2, [r4] adds r1, r0, r2 @@ -131939,7 +127885,7 @@ _0804067C: lsls r0, 24 cmp r0, 0 bne _080406C4 - ldr r1, _0804070C + ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -131947,9 +127893,9 @@ _0804067C: ldrh r0, [r0, 0x28] cmp r0, 0 beq _080406C4 - ldr r0, _08040710 + ldr r0, =0x0202420c strb r2, [r0] - ldr r0, _08040714 + ldr r0, =0x082db0b7 bl b_call_bc_move_exec mov r0, r9 adds r0, 0x1 @@ -131957,7 +127903,7 @@ _0804067C: lsrs r0, 24 mov r9, r0 _080406C4: - ldr r2, _08040718 + ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB ldrb r0, [r1] @@ -131971,7 +127917,7 @@ _080406C4: _080406DA: ldr r0, [r2] adds r0, 0xDB - ldr r1, _080406FC + ldr r1, =0x0202406c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 @@ -131989,16 +127935,9 @@ _080406F0: strb r0, [r1, 0x3] b _080408F6 .align 2, 0 -_080406FC: .4byte 0x0202406c -_08040700: .4byte 0x02024064 -_08040704: .4byte 0x0202407e -_08040708: .4byte 0x020243d0 -_0804070C: .4byte 0x02024084 -_08040710: .4byte 0x0202420c -_08040714: .4byte 0x082db0b7 -_08040718: .4byte 0x0202449c + .pool _0804071C: - ldr r3, _08040754 + ldr r3, =0x020243cc ldrh r2, [r3] movs r0, 0x7 ands r0, r2 @@ -132010,7 +127949,7 @@ _0804072A: ands r0, r2 cmp r0, 0 bne _08040776 - ldr r1, _08040758 + ldr r1, =0x020243d0 adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -132018,21 +127957,17 @@ _0804072A: lsls r0, 24 cmp r0, 0 bne _08040768 - ldr r0, _0804075C + ldr r0, =0x0000fffe ands r0, r2 - ldr r1, _08040760 + ldr r1, =0x0000fffd ands r0, r1 strh r0, [r3] - ldr r1, _08040764 + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] b _08040794 .align 2, 0 -_08040754: .4byte 0x020243cc -_08040758: .4byte 0x020243d0 -_0804075C: .4byte 0x0000fffe -_08040760: .4byte 0x0000fffd -_08040764: .4byte 0x02024332 + .pool _08040768: movs r0, 0x2 ands r0, r2 @@ -132049,23 +127984,22 @@ _08040776: cmp r1, 0 beq _08040790 _08040782: - ldr r1, _0804078C + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] b _08040794 .align 2, 0 -_0804078C: .4byte 0x02024332 + .pool _08040790: - ldr r0, _08040798 + ldr r0, =0x02024332 strb r1, [r0, 0x5] _08040794: - ldr r0, _0804079C + ldr r0, =0x082dac2c b _080408BA .align 2, 0 -_08040798: .4byte 0x02024332 -_0804079C: .4byte 0x082dac2c + .pool _080407A0: - ldr r3, _080407D4 + ldr r3, =0x020243cc ldrh r2, [r3] movs r0, 0x18 ands r0, r2 @@ -132077,7 +128011,7 @@ _080407AE: ands r0, r2 cmp r0, 0 bne _080407E8 - ldr r1, _080407D8 + ldr r1, =0x020243d0 adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -132085,38 +128019,31 @@ _080407AE: lsls r0, 24 cmp r0, 0 bne _080407E8 - ldr r0, _080407DC + ldr r0, =0x0000fff7 ands r0, r2 strh r0, [r3] - ldr r1, _080407E0 - ldr r0, _080407E4 + ldr r1, =0x02024214 + ldr r0, =0x082dacc9 b _080407EC .align 2, 0 -_080407D4: .4byte 0x020243cc -_080407D8: .4byte 0x020243d0 -_080407DC: .4byte 0x0000fff7 -_080407E0: .4byte 0x02024214 -_080407E4: .4byte 0x082dacc9 + .pool _080407E8: - ldr r1, _08040800 - ldr r0, _08040804 + ldr r1, =0x02024214 + ldr r0, =0x082dac47 _080407EC: str r0, [r1] adds r3, r1, 0 - ldr r1, _08040808 + ldr r1, =0x02024474 movs r2, 0 movs r0, 0xC strb r0, [r1, 0x10] - ldr r0, _0804080C + ldr r0, =0x02024332 strb r2, [r0, 0x5] b _080408B8 .align 2, 0 -_08040800: .4byte 0x02024214 -_08040804: .4byte 0x082dac47 -_08040808: .4byte 0x02024474 -_0804080C: .4byte 0x02024332 + .pool _08040810: - ldr r3, _08040840 + ldr r3, =0x020243cc ldrh r2, [r3] movs r0, 0x60 ands r0, r2 @@ -132126,7 +128053,7 @@ _08040810: ands r0, r2 cmp r0, 0 bne _08040854 - ldr r1, _08040844 + ldr r1, =0x020243d0 adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -132134,36 +128061,31 @@ _08040810: lsls r0, 24 cmp r0, 0 bne _08040854 - ldr r0, _08040848 + ldr r0, =0x0000ffdf ands r0, r2 strh r0, [r3] - ldr r1, _0804084C - ldr r0, _08040850 + ldr r1, =0x02024214 + ldr r0, =0x082dace0 b _08040858 .align 2, 0 -_08040840: .4byte 0x020243cc -_08040844: .4byte 0x020243d0 -_08040848: .4byte 0x0000ffdf -_0804084C: .4byte 0x02024214 -_08040850: .4byte 0x082dace0 + .pool _08040854: - ldr r1, _08040860 - ldr r0, _08040864 + ldr r1, =0x02024214 + ldr r0, =0x082dacd2 _08040858: str r0, [r1] adds r3, r1, 0 b _080408B8 .align 2, 0 -_08040860: .4byte 0x02024214 -_08040864: .4byte 0x082dacd2 + .pool _08040868: - ldr r3, _08040890 + ldr r3, =0x020243cc ldrh r2, [r3] movs r0, 0x80 ands r0, r2 cmp r0, 0 beq _080408C8 - ldr r1, _08040894 + ldr r1, =0x020243d0 adds r1, 0x28 ldrb r0, [r1] subs r0, 0x1 @@ -132171,28 +128093,24 @@ _08040868: lsls r0, 24 cmp r0, 0 bne _080408A4 - ldr r0, _08040898 + ldr r0, =0x0000ff7f ands r0, r2 strh r0, [r3] - ldr r1, _0804089C - ldr r0, _080408A0 + ldr r1, =0x02024214 + ldr r0, =0x082dacc9 b _080408A8 .align 2, 0 -_08040890: .4byte 0x020243cc -_08040894: .4byte 0x020243d0 -_08040898: .4byte 0x0000ff7f -_0804089C: .4byte 0x02024214 -_080408A0: .4byte 0x082dacc9 + .pool _080408A4: - ldr r1, _080408D8 - ldr r0, _080408DC + ldr r1, =0x02024214 + ldr r0, =0x082dac47 _080408A8: str r0, [r1] adds r3, r1, 0 - ldr r1, _080408E0 + ldr r1, =0x02024474 movs r0, 0xD strb r0, [r1, 0x10] - ldr r1, _080408E4 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] _080408B8: @@ -132205,7 +128123,7 @@ _080408BA: lsrs r0, 24 mov r9, r0 _080408C8: - ldr r2, _080408E8 + ldr r2, =0x0202449c ldr r1, [r2] ldrb r0, [r1, 0x3] adds r0, 0x1 @@ -132213,11 +128131,7 @@ _080408C8: mov r12, r2 b _080408F6 .align 2, 0 -_080408D8: .4byte 0x02024214 -_080408DC: .4byte 0x082dac47 -_080408E0: .4byte 0x02024474 -_080408E4: .4byte 0x02024332 -_080408E8: .4byte 0x0202449c + .pool _080408EC: mov r0, r9 adds r0, 0x1 @@ -132230,9 +128144,9 @@ _080408F6: bne _080408FE b _0804025E _080408FE: - ldr r0, _0804091C + ldr r0, =0x03005d04 ldr r1, [r0] - ldr r0, _08040920 + ldr r0, =sub_803B9BC + 1 eors r1, r0 negs r0, r1 orrs r0, r1 @@ -132245,8 +128159,7 @@ _080408FE: pop {r1} bx r1 .align 2, 0 -_0804091C: .4byte 0x03005d04 -_08040920: .4byte sub_803B9BC + 1 + .pool thumb_func_end sub_80401D0 thumb_func_start sub_8040924 @@ -132259,14 +128172,14 @@ sub_8040924: @ 8040924 sub sp, 0x8 movs r0, 0 mov r9, r0 - ldr r2, _08040958 + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _0804095C + ldr r1, =0x01000020 orrs r0, r1 str r0, [r2] - ldr r5, _08040960 + ldr r5, =0x0202449c ldr r2, [r5] - ldr r0, _08040964 + ldr r0, =0x0202406c ldrb r1, [r2, 0x1] adds r7, r5, 0 mov r8, r0 @@ -132277,23 +128190,20 @@ sub_8040924: @ 8040924 _08040954: bl _0804132E .align 2, 0 -_08040958: .4byte 0x02024280 -_0804095C: .4byte 0x01000020 -_08040960: .4byte 0x0202449c -_08040964: .4byte 0x0202406c + .pool _08040968: - ldr r3, _0804099C - ldr r4, _080409A0 - ldr r1, _080409A4 + ldr r3, =0x02024064 + ldr r4, =0x0202420b + ldr r1, =0x0202407e ldr r5, [r5] ldrb r0, [r5, 0x1] adds r0, r1 ldrb r0, [r0] strb r0, [r4] strb r0, [r3] - ldr r0, _080409A8 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _080409AC + ldr r2, =0x0832a328 ldrb r0, [r3] lsls r0, 2 adds r0, r2 @@ -132307,11 +128217,7 @@ _08040968: strb r0, [r5, 0x1] bl _0804131C .align 2, 0 -_0804099C: .4byte 0x02024064 -_080409A0: .4byte 0x0202420b -_080409A4: .4byte 0x0202407e -_080409A8: .4byte 0x02024210 -_080409AC: .4byte 0x0832a328 + .pool _080409B0: ldrb r0, [r5] cmp r0, 0x13 @@ -132319,12 +128225,12 @@ _080409B0: bl _08041312 _080409BA: lsls r0, 2 - ldr r1, _080409C4 + ldr r1, =_080409C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080409C4: .4byte _080409C8 + .pool .align 2, 0 _080409C8: .4byte _08040A18 @@ -132348,7 +128254,7 @@ _080409C8: .4byte _08040AAE .4byte _08041304 _08040A18: - ldr r1, _08040A68 + ldr r1, =0x020242ac ldrb r3, [r6] lsls r0, r3, 2 adds r0, r1 @@ -132360,7 +128266,7 @@ _08040A18: bne _08040A30 bl _080412DE _08040A30: - ldr r0, _08040A6C + ldr r0, =0x02024084 movs r1, 0x58 muls r1, r3 adds r0, r1, r0 @@ -132374,7 +128280,7 @@ _08040A44: bne _08040A4C bl _080412DE _08040A4C: - ldr r1, _08040A70 + ldr r1, =0x020241f0 ldrh r0, [r0, 0x2C] lsrs r0, 4 str r0, [r1] @@ -132386,13 +128292,10 @@ _08040A5C: ldr r0, [r1] negs r0, r0 str r0, [r1] - ldr r0, _08040A74 + ldr r0, =0x082db0ee bl _080412D0 .align 2, 0 -_08040A68: .4byte 0x020242ac -_08040A6C: .4byte 0x02024084 -_08040A70: .4byte 0x020241f0 -_08040A74: .4byte 0x082db0ee + .pool _08040A78: ldrb r1, [r6] movs r0, 0 @@ -132430,7 +128333,7 @@ _08040AAE: _08040AC2: bl _080412D4 _08040AC6: - ldr r0, _08040B2C + ldr r0, =0x020242ac ldrb r2, [r6] lsls r1, r2, 2 adds r1, r0 @@ -132441,7 +128344,7 @@ _08040AC6: bne _08040ADC bl _080412DE _08040ADC: - ldr r3, _08040B30 + ldr r3, =0x02024084 movs r5, 0x3 ands r5, r1 movs r1, 0x58 @@ -132461,9 +128364,9 @@ _08040AF4: bne _08040B04 bl _080412DE _08040B04: - ldr r0, _08040B34 + ldr r0, =0x0202420c strb r5, [r0] - ldr r2, _08040B38 + ldr r2, =0x020241f0 ldrb r0, [r6] muls r0, r1 adds r0, r3 @@ -132475,21 +128378,16 @@ _08040B04: movs r0, 0x1 str r0, [r2] _08040B1E: - ldr r1, _08040B3C + ldr r1, =0x02024474 strb r5, [r1, 0x10] ldrb r0, [r4] strb r0, [r1, 0x11] - ldr r0, _08040B40 + ldr r0, =0x082dad15 b _080412D0 .align 2, 0 -_08040B2C: .4byte 0x020242ac -_08040B30: .4byte 0x02024084 -_08040B34: .4byte 0x0202420c -_08040B38: .4byte 0x020241f0 -_08040B3C: .4byte 0x02024474 -_08040B40: .4byte 0x082dad15 + .pool _08040B44: - ldr r2, _08040B80 + ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 adds r3, r1, 0 @@ -132510,7 +128408,7 @@ _08040B60: bne _08040B6A b _080412DE _08040B6A: - ldr r2, _08040B84 + ldr r2, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 3 str r0, [r2] @@ -132519,14 +128417,12 @@ _08040B6A: movs r0, 0x1 str r0, [r2] _08040B7A: - ldr r0, _08040B88 + ldr r0, =0x082db23d b _080412D0 .align 2, 0 -_08040B80: .4byte 0x02024084 -_08040B84: .4byte 0x020241f0 -_08040B88: .4byte 0x082db23d + .pool _08040B8C: - ldr r4, _08040C00 + ldr r4, =0x02024084 ldrb r0, [r6] movs r7, 0x58 mov r8, r7 @@ -132548,7 +128444,7 @@ _08040BAA: bne _08040BB4 b _080412DE _08040BB4: - ldr r5, _08040C04 + ldr r5, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 4 str r0, [r5] @@ -132585,14 +128481,12 @@ _08040BE4: ldr r1, [r5] muls r0, r1 str r0, [r5] - ldr r0, _08040C08 + ldr r0, =0x082db23d b _080412D0 .align 2, 0 -_08040C00: .4byte 0x02024084 -_08040C04: .4byte 0x020241f0 -_08040C08: .4byte 0x082db23d + .pool _08040C0C: - ldr r2, _08040C48 + ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 adds r3, r1, 0 @@ -132613,7 +128507,7 @@ _08040C28: bne _08040C32 b _080412DE _08040C32: - ldr r2, _08040C4C + ldr r2, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 3 str r0, [r2] @@ -132622,14 +128516,12 @@ _08040C32: movs r0, 0x1 str r0, [r2] _08040C42: - ldr r0, _08040C50 + ldr r0, =0x082db25f b _080412D0 .align 2, 0 -_08040C48: .4byte 0x02024084 -_08040C4C: .4byte 0x020241f0 -_08040C50: .4byte 0x082db25f + .pool _08040C54: - ldr r4, _08040CA0 + ldr r4, =0x02024084 ldrb r1, [r6] movs r0, 0x58 muls r1, r0 @@ -132658,7 +128550,7 @@ _08040C7A: ands r0, r1 cmp r0, 0 beq _08040CAC - ldr r1, _08040CA4 + ldr r1, =0x020241f0 ldrh r0, [r3, 0x2C] lsrs r0, 2 str r0, [r1] @@ -132667,21 +128559,19 @@ _08040C7A: movs r0, 0x1 str r0, [r1] _08040C9A: - ldr r0, _08040CA8 + ldr r0, =0x082db33f b _080412D0 .align 2, 0 -_08040CA0: .4byte 0x02024084 -_08040CA4: .4byte 0x020241f0 -_08040CA8: .4byte 0x082db33f + .pool _08040CAC: - ldr r0, _08040CB4 + ldr r0, =0xf7ffffff ands r2, r0 str r2, [r5] b _080412DE .align 2, 0 -_08040CB4: .4byte 0xf7ffffff + .pool _08040CB8: - ldr r2, _08040CF4 + ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 adds r3, r1, 0 @@ -132703,7 +128593,7 @@ _08040CD6: bne _08040CE0 b _080412DE _08040CE0: - ldr r2, _08040CF8 + ldr r2, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 2 str r0, [r2] @@ -132712,14 +128602,12 @@ _08040CE0: movs r0, 0x1 str r0, [r2] _08040CF0: - ldr r0, _08040CFC + ldr r0, =0x082db350 b _080412D0 .align 2, 0 -_08040CF4: .4byte 0x02024084 -_08040CF8: .4byte 0x020241f0 -_08040CFC: .4byte 0x082db350 + .pool _08040D00: - ldr r3, _08040DA0 + ldr r3, =0x02024084 mov r8, r3 ldrb r0, [r6] movs r3, 0x58 @@ -132745,7 +128633,7 @@ _08040D24: bne _08040D30 b _080412DE _08040D30: - ldr r1, _08040DA4 + ldr r1, =0xffffe000 adds r0, r2, r1 str r0, [r4] ldrb r4, [r6] @@ -132756,8 +128644,8 @@ _08040D30: ands r0, r5 cmp r0, 0 beq _08040DC0 - ldr r1, _08040DA8 - ldr r0, _08040DAC + ldr r1, =0x02024474 + ldr r0, =0x0202449c ldr r2, [r0] lsls r0, r4, 1 adds r0, r2 @@ -132768,7 +128656,7 @@ _08040D30: adds r0, r2 ldrb r0, [r0, 0x5] strb r0, [r1, 0x11] - ldr r1, _08040DB0 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -132785,10 +128673,10 @@ _08040D30: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08040DB4 - ldr r0, _08040DB8 + ldr r1, =0x02024214 + ldr r0, =0x082db30e str r0, [r1] - ldr r2, _08040DBC + ldr r2, =0x020241f0 ldrb r0, [r6] muls r0, r3 add r0, r8 @@ -132801,22 +128689,15 @@ _08040D30: str r0, [r2] b _08040DEC .align 2, 0 -_08040DA0: .4byte 0x02024084 -_08040DA4: .4byte 0xffffe000 -_08040DA8: .4byte 0x02024474 -_08040DAC: .4byte 0x0202449c -_08040DB0: .4byte 0x02022f58 -_08040DB4: .4byte 0x02024214 -_08040DB8: .4byte 0x082db30e -_08040DBC: .4byte 0x020241f0 + .pool _08040DC0: - ldr r2, _08040DF0 + ldr r2, =0x02022f58 movs r0, 0xFD strb r0, [r2] movs r0, 0x2 strb r0, [r2, 0x1] ldrb r1, [r6] - ldr r0, _08040DF4 + ldr r0, =0x0202449c ldr r3, [r0] lsls r1, 1 adds r1, r3 @@ -132829,17 +128710,14 @@ _08040DC0: strb r0, [r2, 0x3] movs r0, 0xFF strb r0, [r2, 0x4] - ldr r1, _08040DF8 - ldr r0, _08040DFC + ldr r1, =0x02024214 + ldr r0, =0x082db320 str r0, [r1] _08040DEC: ldr r0, [r1] b _080412D0 .align 2, 0 -_08040DF0: .4byte 0x02022f58 -_08040DF4: .4byte 0x0202449c -_08040DF8: .4byte 0x02024214 -_08040DFC: .4byte 0x082db320 + .pool _08040E00: movs r0, 0x8 negs r0, r0 @@ -132852,15 +128730,15 @@ _08040E00: adds r0, 0x50 adds r2, r0 ldr r0, [r2] - ldr r1, _08040E50 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r1, _08040E54 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - ldr r0, _08040E58 + ldr r0, =0x082db234 bl b_call_bc_move_exec - ldr r4, _08040E5C + ldr r4, =0x02024064 ldrb r0, [r6] strb r0, [r4] ldrb r0, [r4] @@ -132878,12 +128756,9 @@ _08040E00: bl dp01_battle_side_mark_buffer_for_execution b _08040EC8 .align 2, 0 -_08040E50: .4byte 0xf7ffffff -_08040E54: .4byte 0x02024332 -_08040E58: .4byte 0x082db234 -_08040E5C: .4byte 0x02024064 + .pool _08040E60: - ldr r2, _08040EDC + ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 muls r0, r1 @@ -132938,8 +128813,8 @@ _08040EBA: cmp r0, r1 bcc _08040E9A _08040EC8: - ldr r2, _08040EE0 - ldr r1, _08040EE4 + ldr r2, =0x0202420b + ldr r1, =0x0202406c ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 @@ -132948,14 +128823,12 @@ _08040EC8: mov r9, r3 b _08041318 .align 2, 0 -_08040EDC: .4byte 0x02024084 -_08040EE0: .4byte 0x0202420b -_08040EE4: .4byte 0x0202406c + .pool _08040EE8: - ldr r5, _08040F20 + ldr r5, =0x02024064 ldrb r0, [r5] strb r0, [r2] - ldr r2, _08040F24 + ldr r2, =0x02024084 ldrb r0, [r5] movs r7, 0x58 adds r1, r0, 0 @@ -132974,14 +128847,12 @@ _08040EE8: beq _08040F2C ldrb r0, [r5] bl b_cancel_multi_turn_move_maybe - ldr r1, _08040F28 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] b _08040F60 .align 2, 0 -_08040F20: .4byte 0x02024064 -_08040F24: .4byte 0x02024084 -_08040F28: .4byte 0x02024332 + .pool _08040F2C: ldrb r3, [r5] adds r0, r3, 0 @@ -132992,7 +128863,7 @@ _08040F2C: ands r0, r1 cmp r0, 0 beq _08040F54 - ldr r0, _08040F50 + ldr r0, =0x02024332 strb r4, [r0, 0x5] ldr r0, [r2] movs r1, 0x80 @@ -133001,15 +128872,15 @@ _08040F2C: str r0, [r2] b _08040F60 .align 2, 0 -_08040F50: .4byte 0x02024332 + .pool _08040F54: - ldr r1, _08040F74 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] adds r0, r3, 0 bl b_cancel_multi_turn_move_maybe _08040F60: - ldr r0, _08040F78 + ldr r0, =0x082db2a6 bl b_call_bc_move_exec movs r5, 0x1 mov r9, r5 @@ -133021,10 +128892,9 @@ _08040F6A: _08040F72: b _080412DE .align 2, 0 -_08040F74: .4byte 0x02024332 -_08040F78: .4byte 0x082db2a6 + .pool _08040F7C: - ldr r1, _08040FB4 + ldr r1, =0x02024084 ldrb r0, [r6] movs r7, 0x58 muls r0, r7 @@ -133040,7 +128910,7 @@ _08040F7C: bne _08040F9A b _080412DE _08040F9A: - ldr r3, _08040FB8 + ldr r3, =0xfffffc00 adds r0, r1, r3 str r0, [r2] ldrb r0, [r6] @@ -133052,8 +128922,7 @@ _08040F9A: bl b_cancel_multi_turn_move_maybe b _080412DE .align 2, 0 -_08040FB4: .4byte 0x02024084 -_08040FB8: .4byte 0xfffffc00 + .pool _08040FBC: ldrb r0, [r6] muls r0, r7 @@ -133072,7 +128941,7 @@ _08040FCE: bne _08040FDA b _080412DE _08040FDA: - ldr r0, _08041018 + ldr r0, =0xffffefff ands r1, r0 str r1, [r2] ldrb r0, [r6] @@ -133085,7 +128954,7 @@ _08040FDA: beq _08040FF2 b _080412DE _08040FF2: - ldr r1, _0804101C + ldr r1, =0x02024332 movs r0, 0x47 strb r0, [r1, 0x3] movs r0, 0x1 @@ -133100,15 +128969,13 @@ _08040FF2: bne _08041010 b _080412D4 _08041010: - ldr r0, _08041020 + ldr r0, =0x082db2af bl b_call_bc_move_exec b _080412D4 .align 2, 0 -_08041018: .4byte 0xffffefff -_0804101C: .4byte 0x02024332 -_08041020: .4byte 0x082db2af + .pool _08041024: - ldr r0, _080410A4 + ldr r0, =0x020242bc ldrb r3, [r6] lsls r1, r3, 3 subs r1, r3 @@ -133122,7 +128989,7 @@ _08041024: b _080412DE _0804103C: movs r4, 0 - ldr r2, _080410A8 + ldr r2, =0x02024084 movs r0, 0x58 adds r1, r3, 0 muls r1, r0 @@ -133175,8 +129042,7 @@ _0804107A: strb r0, [r1, 0xB] b _080412DE .align 2, 0 -_080410A4: .4byte 0x020242bc -_080410A8: .4byte 0x02024084 + .pool _080410AC: ldrb r0, [r6] lsls r2, r0, 3 @@ -133205,12 +129071,12 @@ _080410D4: lsls r0, 2 adds r0, r7 strh r2, [r0, 0x4] - ldr r0, _080410E4 + ldr r0, =0x082dae23 b _080412D0 .align 2, 0 -_080410E4: .4byte 0x082dae23 + .pool _080410E8: - ldr r3, _08041134 + ldr r3, =0x020242bc ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -133222,7 +129088,7 @@ _080410E8: bne _080410FE b _080412DE _080410FE: - ldr r7, _08041138 + ldr r7, =0x02024084 mov r8, r7 ldrb r0, [r2, 0xC] lsls r0, 1 @@ -133250,8 +129116,7 @@ _080410FE: strb r0, [r1, 0xE] b _080412DE .align 2, 0 -_08041134: .4byte 0x020242bc -_08041138: .4byte 0x02024084 + .pool _0804113C: lsrs r1, r4, 28 subs r1, 0x1 @@ -133297,12 +129162,12 @@ _08041172: adds r0, r4, 0 ands r0, r2 strb r0, [r1, 0xE] - ldr r0, _08041198 + ldr r0, =0x082dae37 b _080412D0 .align 2, 0 -_08041198: .4byte 0x082dae37 + .pool _0804119C: - ldr r0, _080411B8 + ldr r0, =0x020242ac ldrb r1, [r6] lsls r1, 2 adds r1, r0 @@ -133318,9 +129183,9 @@ _080411B4: ldr r1, [r7] b _080412E2 .align 2, 0 -_080411B8: .4byte 0x020242ac + .pool _080411BC: - ldr r2, _080411FC + ldr r2, =0x020242bc ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -133341,23 +129206,21 @@ _080411BC: strb r0, [r3, 0x12] cmp r1, 0 bne _080411F6 - ldr r0, _08041200 + ldr r0, =0x020242ac ldrb r2, [r6] lsls r2, 2 adds r2, r0 ldr r0, [r2] - ldr r1, _08041204 + ldr r1, =0xfffffdff ands r0, r1 str r0, [r2] _080411F6: ldr r1, [r7] b _080412E2 .align 2, 0 -_080411FC: .4byte 0x020242bc -_08041200: .4byte 0x020242ac -_08041204: .4byte 0xfffffdff + .pool _08041208: - ldr r2, _08041234 + ldr r2, =0x020242bc ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -133380,9 +129243,9 @@ _0804122E: ldr r1, [r7] b _080412E2 .align 2, 0 -_08041234: .4byte 0x020242bc + .pool _08041238: - ldr r4, _080412EC + ldr r4, =0x020242ac ldrb r0, [r6] lsls r0, 2 adds r2, r0, r4 @@ -133393,7 +129256,7 @@ _08041238: ands r0, r3 cmp r0, 0 beq _080412DE - ldr r5, _080412F0 + ldr r5, =0xfffff800 adds r0, r1, r5 str r0, [r2] ldrb r2, [r6] @@ -133403,7 +129266,7 @@ _08041238: ands r0, r3 cmp r0, 0 bne _080412DE - ldr r3, _080412F4 + ldr r3, =0x02024084 movs r5, 0x58 adds r1, r2, 0 muls r1, r5 @@ -133449,10 +129312,10 @@ _08041238: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r6] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _080412F8 + ldr r1, =0x0202420e ldrb r0, [r6] strb r0, [r1] - ldr r0, _080412FC + ldr r0, =0x082db378 _080412D0: bl b_call_bc_move_exec _080412D4: @@ -133462,7 +129325,7 @@ _080412D4: lsrs r0, 24 mov r9, r0 _080412DE: - ldr r0, _08041300 + ldr r0, =0x0202449c ldr r1, [r0] _080412E2: ldrb r0, [r1] @@ -133470,12 +129333,7 @@ _080412E2: strb r0, [r1] b _08041312 .align 2, 0 -_080412EC: .4byte 0x020242ac -_080412F0: .4byte 0xfffff800 -_080412F4: .4byte 0x02024084 -_080412F8: .4byte 0x0202420e -_080412FC: .4byte 0x082db378 -_08041300: .4byte 0x0202449c + .pool _08041304: ldr r1, [r7] movs r0, 0 @@ -133492,9 +129350,9 @@ _08041318: mov r0, r9 b _08041344 _0804131C: - ldr r5, _08041354 + ldr r5, =0x0202449c ldr r2, [r5] - ldr r0, _08041358 + ldr r0, =0x0202406c ldrb r1, [r2, 0x1] adds r7, r5, 0 mov r8, r0 @@ -133507,9 +129365,9 @@ _0804132E: bhi _08041338 bl _08040968 _08041338: - ldr r0, _0804135C + ldr r0, =0x02024280 ldr r1, [r0] - ldr r2, _08041360 + ldr r2, =0xfeffffdf ands r1, r2 str r1, [r0] movs r0, 0 @@ -133523,10 +129381,7 @@ _08041344: pop {r1} bx r1 .align 2, 0 -_08041354: .4byte 0x0202449c -_08041358: .4byte 0x0202406c -_0804135C: .4byte 0x02024280 -_08041360: .4byte 0xfeffffdf + .pool thumb_func_end sub_8040924 thumb_func_start sub_8041364 @@ -133536,12 +129391,12 @@ sub_8041364: @ 8041364 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _08041398 + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _0804139C + ldr r1, =0x01000020 orrs r0, r1 str r0, [r2] - ldr r1, _080413A0 + ldr r1, =0x0202449c ldr r3, [r1] movs r4, 0xD0 lsls r4, 1 @@ -133559,9 +129414,7 @@ _0804138E: beq _080413AC b _08041708 .align 2, 0 -_08041398: .4byte 0x02024280 -_0804139C: .4byte 0x01000020 -_080413A0: .4byte 0x0202449c + .pool _080413A4: cmp r0, 0x2 bne _080413AA @@ -133569,9 +129422,9 @@ _080413A4: _080413AA: b _08041708 _080413AC: - ldr r2, _080413F0 + ldr r2, =0x000001a1 adds r0, r3, r2 - ldr r1, _080413F4 + ldr r1, =0x0202406c ldrb r0, [r0] mov r8, r1 ldrb r7, [r1] @@ -133579,9 +129432,9 @@ _080413AC: bcc _080413BE b _08041532 _080413BE: - ldr r4, _080413F8 - ldr r5, _080413FC - ldr r7, _08041400 + ldr r4, =0x02024064 + ldr r5, =0x02022f58 + ldr r7, =0x020243d0 movs r0, 0x18 adds r0, r7 mov r12, r0 @@ -133590,9 +129443,9 @@ _080413CA: adds r3, r0, r2 ldrb r0, [r3] strb r0, [r4] - ldr r0, _08041404 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08041408 + ldr r2, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r2 @@ -133605,18 +129458,12 @@ _080413CA: strb r0, [r3] b _08041520 .align 2, 0 -_080413F0: .4byte 0x000001a1 -_080413F4: .4byte 0x0202406c -_080413F8: .4byte 0x02024064 -_080413FC: .4byte 0x02022f58 -_08041400: .4byte 0x020243d0 -_08041404: .4byte 0x02024210 -_08041408: .4byte 0x0832a328 + .pool _0804140C: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] - ldr r1, _08041450 + ldr r1, =0x020243d0 ldrb r0, [r4] adds r2, r0, r1 ldrb r0, [r2] @@ -133631,7 +129478,7 @@ _08041422: lsrs r3, r0, 24 cmp r3, 0 bne _08041520 - ldr r1, _08041454 + ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -133644,15 +129491,13 @@ _08041422: ldrh r0, [r0] cmp r0, 0xF8 bne _0804145C - ldr r0, _08041458 + ldr r0, =0x02024332 strb r3, [r0, 0x5] b _08041462 .align 2, 0 -_08041450: .4byte 0x020243d0 -_08041454: .4byte 0x02024084 -_08041458: .4byte 0x02024332 + .pool _0804145C: - ldr r1, _080414FC + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] _08041462: @@ -133674,16 +129519,16 @@ _08041462: strb r0, [r5, 0x3] movs r0, 0xFF strb r0, [r5, 0x4] - ldr r5, _08041500 + ldr r5, =0x0202420c ldrb r0, [r4] strb r0, [r5] - ldr r1, _08041504 + ldr r1, =0x0202420b adds r0, r7, 0x4 ldrb r2, [r4] adds r0, r2 ldrb r0, [r0] strb r0, [r1] - ldr r2, _08041508 + ldr r2, =0x020241f0 ldrb r0, [r4] lsls r0, 2 adds r1, r7, 0 @@ -133691,16 +129536,16 @@ _08041462: adds r0, r1 ldr r0, [r0] str r0, [r2] - ldr r2, _0804150C + ldr r2, =0x0202437c ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 lsls r0, 2 adds r2, 0x4 adds r0, r2 - ldr r1, _08041510 + ldr r1, =0x0000ffff str r1, [r0] - ldr r0, _08041514 + ldr r0, =0x082dafe4 bl b_call_bc_move_exec ldrb r1, [r4] adds r0, r1, r7 @@ -133719,7 +129564,7 @@ _080414CC: _080414DA: ldrb r0, [r5] bl battle_get_per_side_status - ldr r2, _08041518 + ldr r2, =0x0202428e lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -133727,24 +129572,16 @@ _080414DA: lsls r0, 1 adds r0, r2 ldrh r1, [r0] - ldr r4, _0804151C + ldr r4, =0x0000ffbf adds r2, r4, 0 ands r1, r2 strh r1, [r0] b _08041664 .align 2, 0 -_080414FC: .4byte 0x02024332 -_08041500: .4byte 0x0202420c -_08041504: .4byte 0x0202420b -_08041508: .4byte 0x020241f0 -_0804150C: .4byte 0x0202437c -_08041510: .4byte 0x0000ffff -_08041514: .4byte 0x082dafe4 -_08041518: .4byte 0x0202428e -_0804151C: .4byte 0x0000ffbf + .pool _08041520: ldr r0, [r6] - ldr r2, _08041598 + ldr r2, =0x000001a1 adds r0, r2 ldrb r0, [r0] mov r1, r8 @@ -133760,16 +129597,16 @@ _08041532: movs r1, 0x1 strb r1, [r0] ldr r0, [r6] - ldr r3, _08041598 + ldr r3, =0x000001a1 adds r1, r0, r3 movs r0, 0 strb r0, [r1] _08041548: adds r3, r6, 0 ldr r0, [r6] - ldr r2, _08041598 + ldr r2, =0x000001a1 adds r0, r2 - ldr r1, _0804159C + ldr r1, =0x0202406c ldrb r0, [r0] mov r8, r1 ldrb r4, [r1] @@ -133777,14 +129614,14 @@ _08041548: bcc _0804155E b _08041684 _0804155E: - ldr r5, _080415A0 - ldr r4, _080415A4 - ldr r7, _080415A8 + ldr r5, =0x02024064 + ldr r4, =0x02022f58 + ldr r7, =0x020242bc mov r12, r7 - ldr r0, _080415AC + ldr r0, =0x0202420b mov r9, r0 _0804156A: - ldr r1, _080415B0 + ldr r1, =0x0202407e ldr r0, [r3] adds r3, r0, r2 ldrb r0, [r3] @@ -133793,9 +129630,9 @@ _0804156A: mov r1, r9 strb r0, [r1] strb r0, [r5] - ldr r0, _080415B4 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _080415B8 + ldr r2, =0x0832a328 ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -133808,20 +129645,12 @@ _0804156A: strb r0, [r3] b _08041670 .align 2, 0 -_08041598: .4byte 0x000001a1 -_0804159C: .4byte 0x0202406c -_080415A0: .4byte 0x02024064 -_080415A4: .4byte 0x02022f58 -_080415A8: .4byte 0x020242bc -_080415AC: .4byte 0x0202420b -_080415B0: .4byte 0x0202407e -_080415B4: .4byte 0x02024210 -_080415B8: .4byte 0x0832a328 + .pool _080415BC: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] - ldr r7, _08041630 + ldr r7, =0x020242ac ldrb r0, [r5] lsls r0, 2 adds r0, r7 @@ -133864,23 +129693,19 @@ _080415BC: negs r1, r1 ands r0, r1 str r0, [r2] - ldr r3, _08041634 - ldr r2, _08041638 + ldr r3, =0x020241f0 + ldr r2, =0x02024084 ldrb r1, [r5] movs r0, 0x58 muls r0, r1 adds r0, r2 ldrh r0, [r0, 0x28] str r0, [r3] - ldr r1, _0804163C - ldr r0, _08041640 + ldr r1, =0x02024214 + ldr r0, =0x082daf05 b _0804165C .align 2, 0 -_08041630: .4byte 0x020242ac -_08041634: .4byte 0x020241f0 -_08041638: .4byte 0x02024084 -_0804163C: .4byte 0x02024214 -_08041640: .4byte 0x082daf05 + .pool _08041644: lsrs r1, 28 subs r1, 0x1 @@ -133892,8 +129717,8 @@ _08041644: ands r0, r3 orrs r0, r1 strb r0, [r4, 0xF] - ldr r1, _08041668 - ldr r0, _0804166C + ldr r1, =0x02024214 + ldr r0, =0x082daf20 _0804165C: str r0, [r1] ldr r0, [r1] @@ -133902,12 +129727,11 @@ _08041664: movs r0, 0x1 b _08041714 .align 2, 0 -_08041668: .4byte 0x02024214 -_0804166C: .4byte 0x082daf20 + .pool _08041670: adds r3, r6, 0 ldr r0, [r6] - ldr r2, _080416F0 + ldr r2, =0x000001a1 adds r0, r2 ldrb r0, [r0] mov r1, r8 @@ -133923,12 +129747,12 @@ _08041684: movs r1, 0x2 strb r1, [r0] ldr r0, [r6] - ldr r3, _080416F0 + ldr r3, =0x000001a1 adds r1, r0, r3 movs r0, 0 strb r0, [r1] _0804169A: - ldr r0, _080416F4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 @@ -133940,7 +129764,7 @@ _0804169A: ldrb r0, [r0] cmp r0, 0x2 bne _08041708 - ldr r1, _080416F8 + ldr r1, =0x02024084 ldrh r0, [r1, 0x28] cmp r0, 0 beq _08041708 @@ -133957,11 +129781,11 @@ _080416C6: adds r4, 0x1 cmp r4, 0x1 ble _080416C6 - ldr r1, _080416FC - ldr r0, _08041700 + ldr r1, =0x02024214 + ldr r0, =0x082db8f3 str r0, [r1] bl b_call_bc_move_exec - ldr r0, _08041704 + ldr r0, =0x0202449c ldr r1, [r0] movs r4, 0xD0 lsls r4, 1 @@ -133971,16 +129795,11 @@ _080416C6: strb r0, [r1] b _08041664 .align 2, 0 -_080416F0: .4byte 0x000001a1 -_080416F4: .4byte 0x02022fec -_080416F8: .4byte 0x02024084 -_080416FC: .4byte 0x02024214 -_08041700: .4byte 0x082db8f3 -_08041704: .4byte 0x0202449c + .pool _08041708: mov r7, r10 ldr r0, [r7] - ldr r1, _08041724 + ldr r1, =0xfeffffdf ands r0, r1 str r0, [r7] movs r0, 0 @@ -133993,7 +129812,7 @@ _08041714: pop {r1} bx r1 .align 2, 0 -_08041724: .4byte 0xfeffffdf + .pool thumb_func_end sub_8041364 thumb_func_start sub_8041728 @@ -134002,7 +129821,7 @@ sub_8041728: @ 8041728 mov r7, r8 push {r7} sub sp, 0x4 - ldr r0, _08041740 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -134010,18 +129829,18 @@ sub_8041728: @ 8041728 beq _08041770 b _08041A0A .align 2, 0 -_08041740: .4byte 0x02022fec + .pool _08041744: - ldr r0, _08041754 + ldr r0, =0x082da7c4 bl b_call_bc_move_exec ldr r0, [r5] adds r0, 0x4D movs r1, 0x2 b _08041764 .align 2, 0 -_08041754: .4byte 0x082da7c4 + .pool _08041758: - ldr r0, _0804176C + ldr r0, =0x082da7cd bl b_call_bc_move_exec ldr r0, [r5] adds r0, 0x4D @@ -134032,9 +129851,9 @@ _08041766: movs r0, 0x1 b _08041A0C .align 2, 0 -_0804176C: .4byte 0x082da7cd + .pool _08041770: - ldr r0, _0804178C + ldr r0, =0x0202449c mov r8, r0 _08041774: mov r1, r8 @@ -134046,13 +129865,12 @@ _08041774: b _080419FC _08041782: lsls r0, 2 - ldr r1, _08041790 + ldr r1, =_08041794 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804178C: .4byte 0x0202449c -_08041790: .4byte _08041794 + .pool .align 2, 0 _08041794: .4byte _080417B4 @@ -134075,14 +129893,14 @@ _080417B4: adds r0, 0x1 strb r0, [r1] movs r5, 0 - ldr r0, _08041880 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 bge _08041806 - ldr r6, _08041884 + ldr r6, =0x02024210 _080417D4: ldrb r0, [r6] - ldr r2, _08041888 + ldr r2, =0x0832a328 lsls r1, r5, 2 adds r1, r2 ldr r4, [r1] @@ -134102,19 +129920,19 @@ _080417D4: strb r0, [r6] _080417FC: adds r5, 0x1 - ldr r0, _08041880 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 blt _080417D4 _08041806: - ldr r0, _0804188C + ldr r0, =0x0202449c mov r8, r0 - ldr r1, _08041890 + ldr r1, =0x0202420d mov r12, r1 - ldr r2, _08041894 + ldr r2, =0x0202420c mov r5, r8 - ldr r7, _08041898 - ldr r6, _0804189C + ldr r7, =0x02024084 + ldr r6, =0x0202406e _08041816: ldr r3, [r5] adds r1, r3, 0 @@ -134133,7 +129951,7 @@ _08041816: adds r0, r3, 0 adds r0, 0xDF ldrb r1, [r0] - ldr r3, _08041888 + ldr r3, =0x0832a328 lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] @@ -134143,7 +129961,7 @@ _08041816: ands r1, r0 cmp r1, 0 bne _0804185E - ldr r0, _08041884 + ldr r0, =0x02024210 ldrb r1, [r0] lsls r0, r4, 2 adds r0, r3 @@ -134158,7 +129976,7 @@ _0804185E: ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, _08041880 + ldr r0, =0x0202406c lsls r1, 24 lsrs r1, 24 ldrb r0, [r0] @@ -134171,25 +129989,18 @@ _0804185E: strb r1, [r0] b _080419FC .align 2, 0 -_08041880: .4byte 0x0202406c -_08041884: .4byte 0x02024210 -_08041888: .4byte 0x0832a328 -_0804188C: .4byte 0x0202449c -_08041890: .4byte 0x0202420d -_08041894: .4byte 0x0202420c -_08041898: .4byte 0x02024084 -_0804189C: .4byte 0x0202406e + .pool _080418A0: - ldr r0, _080418CC + ldr r0, =0x0202420d ldrb r0, [r0] bl sub_803F9EC - ldr r2, _080418D0 + ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0x4E ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, _080418D4 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -134201,9 +130012,7 @@ _080418A0: strb r1, [r0] b _080419FA .align 2, 0 -_080418CC: .4byte 0x0202420d -_080418D0: .4byte 0x0202449c -_080418D4: .4byte 0x0202406c + .pool _080418D8: ldr r0, [r2] adds r0, 0x4D @@ -134222,12 +130031,12 @@ _080418E2: adds r0, 0x1 strb r0, [r1] _080418F6: - ldr r0, _08041944 + ldr r0, =0x0202420d mov r12, r0 - ldr r7, _08041948 - ldr r5, _0804194C - ldr r2, _08041950 - ldr r6, _08041954 + ldr r7, =0x0202420c + ldr r5, =0x0202449c + ldr r2, =0x02024084 + ldr r6, =0x0832a328 _08041902: ldr r0, [r5] adds r4, r0, 0 @@ -134243,7 +130052,7 @@ _08041902: ldrh r0, [r0, 0x28] cmp r0, 0 bne _08041930 - ldr r0, _08041958 + ldr r0, =0x02024210 ldrb r1, [r0] lsls r0, r3, 2 adds r0, r6 @@ -134255,7 +130064,7 @@ _08041902: _08041930: adds r0, r3, 0x1 strb r0, [r4] - ldr r1, _0804195C + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -134263,13 +130072,7 @@ _08041930: bne _08041902 b _08041978 .align 2, 0 -_08041944: .4byte 0x0202420d -_08041948: .4byte 0x0202420c -_0804194C: .4byte 0x0202449c -_08041950: .4byte 0x02024084 -_08041954: .4byte 0x0832a328 -_08041958: .4byte 0x02024210 -_0804195C: .4byte 0x0202406c + .pool _08041960: mov r1, r8 ldr r0, [r1] @@ -134277,7 +130080,7 @@ _08041960: ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, _08041984 + ldr r0, =0x0202406c lsls r1, 24 lsrs r1, 24 ldrb r0, [r0] @@ -134291,7 +130094,7 @@ _08041978: strb r1, [r0] b _080419FC .align 2, 0 -_08041984: .4byte 0x0202406c + .pool _08041988: mov r1, r8 ldr r0, [r1] @@ -134345,7 +130148,7 @@ _080419D8: beq _080419EE b _08041766 _080419EE: - ldr r2, _08041A18 + ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0x4D ldrb r0, [r1] @@ -134371,22 +130174,22 @@ _08041A0C: pop {r1} bx r1 .align 2, 0 -_08041A18: .4byte 0x0202449c + .pool thumb_func_end sub_8041728 thumb_func_start b_clear_atk_up_if_hit_flag_unless_enraged b_clear_atk_up_if_hit_flag_unless_enraged: @ 8041A1C push {r4-r6,lr} movs r3, 0 - ldr r0, _08041A5C + ldr r0, =0x0202406c adds r5, r0, 0 ldrb r0, [r5] cmp r3, r0 bge _08041A54 - ldr r4, _08041A60 + ldr r4, =0x02024274 movs r6, 0x80 lsls r6, 16 - ldr r2, _08041A64 + ldr r2, =0x020240d4 _08041A32: ldr r1, [r2] adds r0, r1, 0 @@ -134396,7 +130199,7 @@ _08041A32: ldrh r0, [r4] cmp r0, 0x63 beq _08041A48 - ldr r0, _08041A68 + ldr r0, =0xff7fffff ands r1, r0 str r1, [r2] _08041A48: @@ -134411,10 +130214,7 @@ _08041A54: pop {r0} bx r0 .align 2, 0 -_08041A5C: .4byte 0x0202406c -_08041A60: .4byte 0x02024274 -_08041A64: .4byte 0x020240d4 -_08041A68: .4byte 0xff7fffff + .pool thumb_func_end b_clear_atk_up_if_hit_flag_unless_enraged thumb_func_start sub_8041A6C @@ -134427,14 +130227,13 @@ sub_8041A6C: @ 8041A6C sub sp, 0x10 movs r0, 0 mov r9, r0 - ldr r1, _08041A88 + ldr r1, =0x02024478 mov r10, r1 - ldr r2, _08041A8C + ldr r2, =0x0202449c mov r8, r2 b _08041A9A .align 2, 0 -_08041A88: .4byte 0x02024478 -_08041A8C: .4byte 0x0202449c + .pool _08041A90: mov r3, r9 cmp r3, 0 @@ -134443,7 +130242,7 @@ _08041A90: _08041A9A: mov r4, r8 ldr r0, [r4] - ldr r7, _08041AB8 + ldr r7, =0x000001a3 adds r0, r7 ldrb r0, [r0] cmp r0, 0xE @@ -134451,13 +130250,12 @@ _08041A9A: bl _08042376 _08041AAC: lsls r0, 2 - ldr r1, _08041ABC + ldr r1, =_08041AC0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08041AB8: .4byte 0x000001a3 -_08041ABC: .4byte _08041AC0 + .pool .align 2, 0 _08041AC0: .4byte _08041AFC @@ -134476,40 +130274,35 @@ _08041AC0: .4byte _0804231C .4byte _08042376 _08041AFC: - ldr r1, _08041B30 - ldr r3, _08041B34 + ldr r1, =0x02024084 + ldr r3, =0x0202420b ldrb r2, [r3] movs r0, 0x58 muls r2, r0 adds r1, 0x50 adds r2, r1 ldr r0, [r2] - ldr r1, _08041B38 + ldr r1, =0xfdffffff ands r0, r1 str r0, [r2] - ldr r0, _08041B3C + ldr r0, =0x020242ac ldrb r2, [r3] lsls r2, 2 adds r2, r0 ldr r0, [r2] - ldr r1, _08041B40 + ldr r1, =0xffffbfff ands r0, r1 str r0, [r2] mov r1, r8 ldr r0, [r1] - ldr r2, _08041B44 + ldr r2, =0x000001a3 adds r1, r0, r2 bl _08042370 .align 2, 0 -_08041B30: .4byte 0x02024084 -_08041B34: .4byte 0x0202420b -_08041B38: .4byte 0xfdffffff -_08041B3C: .4byte 0x020242ac -_08041B40: .4byte 0xffffbfff -_08041B44: .4byte 0x000001a3 + .pool _08041B48: - ldr r7, _08041BB0 - ldr r4, _08041BB4 + ldr r7, =0x02024084 + ldr r4, =0x0202420b ldrb r1, [r4] movs r5, 0x58 adds r0, r1, 0 @@ -134546,26 +130339,21 @@ _08041B68: adds r0, 0x50 adds r2, r0 ldr r0, [r2] - ldr r1, _08041BB8 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _08041BBC + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - ldr r1, _08041BC0 - ldr r0, _08041BC4 + ldr r1, =0x02024214 + ldr r0, =0x082db220 str r0, [r1] movs r4, 0x2 mov r9, r4 b _08041C6E .align 2, 0 -_08041BB0: .4byte 0x02024084 -_08041BB4: .4byte 0x0202420b -_08041BB8: .4byte 0xf7ffffff -_08041BBC: .4byte 0x02024332 -_08041BC0: .4byte 0x02024214 -_08041BC4: .4byte 0x082db220 + .pool _08041BC8: ldrb r0, [r4] adds r1, r0, 0 @@ -134594,8 +130382,8 @@ _08041BF4: subs r0, r1, r3 str r0, [r2] _08041BF8: - ldr r2, _08041C38 - ldr r0, _08041C3C + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -134607,16 +130395,16 @@ _08041BF8: ands r4, r0 cmp r4, 0 beq _08041C50 - ldr r0, _08041C40 + ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xAD beq _08041C6E cmp r0, 0xD6 beq _08041C6E - ldr r1, _08041C44 - ldr r0, _08041C48 + ldr r1, =0x02024214 + ldr r0, =0x082db213 str r0, [r1] - ldr r2, _08041C4C + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -134626,43 +130414,33 @@ _08041BF8: mov r9, r0 b _08041C6E .align 2, 0 -_08041C38: .4byte 0x02024084 -_08041C3C: .4byte 0x0202420b -_08041C40: .4byte 0x020241ea -_08041C44: .4byte 0x02024214 -_08041C48: .4byte 0x082db213 -_08041C4C: .4byte 0x02024280 + .pool _08041C50: adds r2, 0x50 adds r2, r1, r2 ldr r0, [r2] - ldr r1, _08041C78 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r0, _08041C7C + ldr r0, =0x02024332 strb r4, [r0, 0x5] - ldr r1, _08041C80 - ldr r0, _08041C84 + ldr r1, =0x02024214 + ldr r0, =0x082db220 str r0, [r1] movs r1, 0x2 mov r9, r1 _08041C6E: - ldr r1, _08041C88 + ldr r1, =0x0202449c ldr r0, [r1] - ldr r3, _08041C8C + ldr r3, =0x000001a3 adds r2, r0, r3 b _0804216A .align 2, 0 -_08041C78: .4byte 0xf7ffffff -_08041C7C: .4byte 0x02024332 -_08041C80: .4byte 0x02024214 -_08041C84: .4byte 0x082db220 -_08041C88: .4byte 0x0202449c -_08041C8C: .4byte 0x000001a3 + .pool _08041C90: - ldr r1, _08041CEC - ldr r7, _08041CF0 + ldr r1, =0x02024084 + ldr r7, =0x0202420b ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -134683,8 +130461,8 @@ _08041C90: lsrs r4, r0, 16 cmp r4, 0 beq _08041D08 - ldr r2, _08041CF4 - ldr r0, _08041CF8 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -134695,10 +130473,10 @@ _08041C90: bne _08041CD6 b _08042162 _08041CD6: - ldr r1, _08041CFC - ldr r0, _08041D00 + ldr r1, =0x02024214 + ldr r0, =0x082db26a str r0, [r1] - ldr r2, _08041D04 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 2 @@ -134706,13 +130484,7 @@ _08041CD6: str r0, [r2] b _08041D28 .align 2, 0 -_08041CEC: .4byte 0x02024084 -_08041CF0: .4byte 0x0202420b -_08041CF4: .4byte 0x0831c898 -_08041CF8: .4byte 0x020241ea -_08041CFC: .4byte 0x02024214 -_08041D00: .4byte 0x082db26a -_08041D04: .4byte 0x02024280 + .pool _08041D08: ldrb r0, [r7] adds r2, r0, 0 @@ -134724,31 +130496,27 @@ _08041D08: ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _08041D3C - ldr r0, _08041D40 + ldr r1, =0x02024214 + ldr r0, =0x082db277 str r0, [r1] - ldr r0, _08041D44 + ldr r0, =0x02024332 strb r4, [r0, 0x5] _08041D28: movs r7, 0x2 mov r9, r7 - ldr r0, _08041D48 + ldr r0, =0x0202449c mov r8, r0 _08041D30: mov r1, r8 ldr r0, [r1] - ldr r2, _08041D4C + ldr r2, =0x000001a3 adds r1, r0, r2 b _08042370 .align 2, 0 -_08041D3C: .4byte 0x02024214 -_08041D40: .4byte 0x082db277 -_08041D44: .4byte 0x02024332 -_08041D48: .4byte 0x0202449c -_08041D4C: .4byte 0x000001a3 + .pool _08041D50: - ldr r1, _08041DA4 - ldr r0, _08041DA8 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -134759,7 +130527,7 @@ _08041D50: beq _08041D66 b _08042162 _08041D66: - ldr r0, _08041DAC + ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -134772,36 +130540,29 @@ _08041D66: _08041D7A: adds r0, r2, 0 bl b_cancel_multi_turn_move_maybe - ldr r2, _08041DB0 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] - ldr r1, _08041DB4 + ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] - ldr r1, _08041DB8 - ldr r0, _08041DBC + ldr r1, =0x02024214 + ldr r0, =0x082db6ad str r0, [r1] - ldr r2, _08041DC0 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] b _0804215E .align 2, 0 -_08041DA4: .4byte 0x02024084 -_08041DA8: .4byte 0x0202420b -_08041DAC: .4byte 0x020242bc -_08041DB0: .4byte 0x02024280 -_08041DB4: .4byte 0x02024332 -_08041DB8: .4byte 0x02024214 -_08041DBC: .4byte 0x082db6ad -_08041DC0: .4byte 0x0202427c + .pool _08041DC4: - ldr r1, _08041E1C - ldr r3, _08041E20 + ldr r1, =0x02024084 + ldr r3, =0x0202420b ldrb r2, [r3] movs r0, 0x58 muls r0, r2 @@ -134813,10 +130574,10 @@ _08041DC4: ands r0, r1 cmp r0, 0 beq _08041E10 - ldr r0, _08041E24 + ldr r0, =0xffbfffff ands r1, r0 str r1, [r2] - ldr r2, _08041E28 + ldr r2, =0x020242bc ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -134826,10 +130587,10 @@ _08041DC4: strb r1, [r0, 0x19] ldrb r0, [r3] bl b_cancel_multi_turn_move_maybe - ldr r1, _08041E2C - ldr r0, _08041E30 + ldr r1, =0x02024214 + ldr r0, =0x082d9462 str r0, [r1] - ldr r2, _08041E34 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -134838,24 +130599,16 @@ _08041DC4: movs r7, 0x1 mov r9, r7 _08041E10: - ldr r1, _08041E38 + ldr r1, =0x0202449c ldr r0, [r1] - ldr r3, _08041E3C + ldr r3, =0x000001a3 adds r2, r0, r3 b _0804216A .align 2, 0 -_08041E1C: .4byte 0x02024084 -_08041E20: .4byte 0x0202420b -_08041E24: .4byte 0xffbfffff -_08041E28: .4byte 0x020242bc -_08041E2C: .4byte 0x02024214 -_08041E30: .4byte 0x082d9462 -_08041E34: .4byte 0x02024280 -_08041E38: .4byte 0x0202449c -_08041E3C: .4byte 0x000001a3 + .pool _08041E40: - ldr r1, _08041E98 - ldr r3, _08041E9C + ldr r1, =0x02024084 + ldr r3, =0x0202420b ldrb r2, [r3] movs r0, 0x58 muls r0, r2 @@ -134870,7 +130623,7 @@ _08041E40: negs r0, r0 ands r1, r0 str r1, [r2] - ldr r0, _08041EA0 + ldr r0, =0x0202433c ldrb r2, [r3] lsls r2, 4 adds r2, r0 @@ -134880,10 +130633,10 @@ _08041E40: strb r0, [r2, 0x2] ldrb r0, [r3] bl b_cancel_multi_turn_move_maybe - ldr r1, _08041EA4 - ldr r0, _08041EA8 + ldr r1, =0x02024214 + ldr r0, =0x082db29b str r0, [r1] - ldr r2, _08041EAC + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -134892,51 +130645,44 @@ _08041E40: movs r4, 0x1 mov r9, r4 _08041E8C: - ldr r1, _08041EB0 + ldr r1, =0x0202449c ldr r0, [r1] - ldr r7, _08041EB4 + ldr r7, =0x000001a3 adds r2, r0, r7 b _0804216A .align 2, 0 -_08041E98: .4byte 0x02024084 -_08041E9C: .4byte 0x0202420b -_08041EA0: .4byte 0x0202433c -_08041EA4: .4byte 0x02024214 -_08041EA8: .4byte 0x082db29b -_08041EAC: .4byte 0x02024280 -_08041EB0: .4byte 0x0202449c -_08041EB4: .4byte 0x000001a3 + .pool _08041EB8: - ldr r0, _08041F10 - ldr r3, _08041F14 + ldr r0, =0x020242bc + ldr r3, =0x0202420b ldrb r2, [r3] lsls r1, r2, 3 subs r1, r2 lsls r1, 2 adds r1, r0 - ldr r0, _08041F18 + ldr r0, =0x020241ea ldrh r1, [r1, 0x4] ldrh r0, [r0] cmp r1, r0 bne _08041F04 cmp r1, 0 beq _08041F04 - ldr r0, _08041F1C + ldr r0, =0x0202433c lsls r2, 4 adds r2, r0 ldrb r0, [r2, 0x1] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x1] - ldr r1, _08041F20 + ldr r1, =0x02024474 ldrb r0, [r3] strb r0, [r1, 0x17] ldrb r0, [r3] bl b_cancel_multi_turn_move_maybe - ldr r1, _08041F24 - ldr r0, _08041F28 + ldr r1, =0x02024214 + ldr r0, =0x082dae14 str r0, [r1] - ldr r2, _08041F2C + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -134945,25 +130691,16 @@ _08041EB8: movs r0, 0x1 mov r9, r0 _08041F04: - ldr r1, _08041F30 + ldr r1, =0x0202449c ldr r0, [r1] - ldr r3, _08041F34 + ldr r3, =0x000001a3 adds r2, r0, r3 b _0804216A .align 2, 0 -_08041F10: .4byte 0x020242bc -_08041F14: .4byte 0x0202420b -_08041F18: .4byte 0x020241ea -_08041F1C: .4byte 0x0202433c -_08041F20: .4byte 0x02024474 -_08041F24: .4byte 0x02024214 -_08041F28: .4byte 0x082dae14 -_08041F2C: .4byte 0x02024280 -_08041F30: .4byte 0x0202449c -_08041F34: .4byte 0x000001a3 + .pool _08041F38: - ldr r0, _08041F98 - ldr r4, _08041F9C + ldr r0, =0x020242bc + ldr r4, =0x0202420b ldrb r3, [r4] lsls r1, r3, 3 subs r1, r3 @@ -134973,8 +130710,8 @@ _08041F38: lsls r0, 28 cmp r0, 0 beq _08041F8C - ldr r2, _08041FA0 - ldr r0, _08041FA4 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -134983,7 +130720,7 @@ _08041F38: ldrb r0, [r0, 0x1] cmp r0, 0 bne _08041F8C - ldr r0, _08041FA8 + ldr r0, =0x0202433c lsls r2, r3, 4 adds r2, r0 ldrb r0, [r2, 0x2] @@ -134992,10 +130729,10 @@ _08041F38: strb r0, [r2, 0x2] ldrb r0, [r4] bl b_cancel_multi_turn_move_maybe - ldr r1, _08041FAC - ldr r0, _08041FB0 + ldr r1, =0x02024214 + ldr r0, =0x082db0a4 str r0, [r1] - ldr r2, _08041FB4 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -135004,32 +130741,23 @@ _08041F38: movs r4, 0x1 mov r9, r4 _08041F8C: - ldr r1, _08041FB8 + ldr r1, =0x0202449c ldr r0, [r1] - ldr r7, _08041FBC + ldr r7, =0x000001a3 adds r2, r0, r7 b _0804216A .align 2, 0 -_08041F98: .4byte 0x020242bc -_08041F9C: .4byte 0x0202420b -_08041FA0: .4byte 0x0831c898 -_08041FA4: .4byte 0x020241ea -_08041FA8: .4byte 0x0202433c -_08041FAC: .4byte 0x02024214 -_08041FB0: .4byte 0x082db0a4 -_08041FB4: .4byte 0x02024280 -_08041FB8: .4byte 0x0202449c -_08041FBC: .4byte 0x000001a3 + .pool _08041FC0: - ldr r4, _08042008 + ldr r4, =0x0202420b ldrb r0, [r4] - ldr r1, _0804200C + ldr r1, =0x020241ea ldrh r1, [r1] bl sub_8040130 lsls r0, 24 cmp r0, 0 beq _08041FFE - ldr r0, _08042010 + ldr r0, =0x0202433c ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -135039,10 +130767,10 @@ _08041FC0: strb r0, [r2, 0x1] ldrb r0, [r4] bl b_cancel_multi_turn_move_maybe - ldr r1, _08042014 - ldr r0, _08042018 + ldr r1, =0x02024214 + ldr r0, =0x082db176 str r0, [r1] - ldr r2, _0804201C + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -135051,23 +130779,16 @@ _08041FC0: movs r0, 0x1 mov r9, r0 _08041FFE: - ldr r1, _08042020 + ldr r1, =0x0202449c ldr r0, [r1] - ldr r3, _08042024 + ldr r3, =0x000001a3 adds r2, r0, r3 b _0804216A .align 2, 0 -_08042008: .4byte 0x0202420b -_0804200C: .4byte 0x020241ea -_08042010: .4byte 0x0202433c -_08042014: .4byte 0x02024214 -_08042018: .4byte 0x082db176 -_0804201C: .4byte 0x02024280 -_08042020: .4byte 0x0202449c -_08042024: .4byte 0x000001a3 + .pool _08042028: - ldr r7, _08042070 - ldr r5, _08042074 + ldr r7, =0x02024084 + ldr r5, =0x0202420b ldrb r0, [r5] movs r6, 0x58 muls r0, r6 @@ -135095,20 +130816,18 @@ _08042028: ands r2, r0 cmp r2, 0 beq _0804207C - ldr r1, _08042078 + ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] bl b_movescr_stack_push_cursor b _080420C6 .align 2, 0 -_08042070: .4byte 0x02024084 -_08042074: .4byte 0x0202420b -_08042078: .4byte 0x02024332 + .pool _0804207C: - ldr r0, _080420CC + ldr r0, =0x02024332 movs r4, 0x1 strb r1, [r0, 0x5] - ldr r1, _080420D0 + ldr r1, =0x0202420c ldrb r0, [r5] strb r0, [r1] ldrb r0, [r5] @@ -135126,57 +130845,48 @@ _0804207C: movs r2, 0x1 movs r3, 0 bl sub_806957C - ldr r1, _080420D4 + ldr r1, =0x020241f0 str r0, [r1] - ldr r0, _080420D8 + ldr r0, =0x0202433c ldrb r1, [r5] lsls r1, 4 adds r1, r0 ldrb r0, [r1, 0x1] orrs r0, r4 strb r0, [r1, 0x1] - ldr r2, _080420DC + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] _080420C6: - ldr r1, _080420E0 - ldr r0, _080420E4 + ldr r1, =0x02024214 + ldr r0, =0x082db2bd b _080420F0 .align 2, 0 -_080420CC: .4byte 0x02024332 -_080420D0: .4byte 0x0202420c -_080420D4: .4byte 0x020241f0 -_080420D8: .4byte 0x0202433c -_080420DC: .4byte 0x02024280 -_080420E0: .4byte 0x02024214 -_080420E4: .4byte 0x082db2bd + .pool _080420E8: bl b_movescr_stack_push_cursor - ldr r1, _08042104 - ldr r0, _08042108 + ldr r1, =0x02024214 + ldr r0, =0x082db300 _080420F0: str r0, [r1] movs r4, 0x1 mov r9, r4 - ldr r7, _0804210C + ldr r7, =0x0202449c mov r8, r7 _080420FA: mov r1, r8 ldr r0, [r1] - ldr r2, _08042110 + ldr r2, =0x000001a3 adds r1, r0, r2 b _08042370 .align 2, 0 -_08042104: .4byte 0x02024214 -_08042108: .4byte 0x082db300 -_0804210C: .4byte 0x0202449c -_08042110: .4byte 0x000001a3 + .pool _08042114: - ldr r1, _08042174 - ldr r4, _08042178 + ldr r1, =0x02024084 + ldr r4, =0x0202420b ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -135194,7 +130904,7 @@ _08042114: ands r1, r0 cmp r1, 0 bne _08042162 - ldr r0, _0804217C + ldr r0, =0x0202433c ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -135202,10 +130912,10 @@ _08042114: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _08042180 - ldr r0, _08042184 + ldr r1, =0x02024214 + ldr r0, =0x082db28b str r0, [r1] - ldr r2, _08042188 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -135215,9 +130925,9 @@ _0804215E: movs r3, 0x1 mov r9, r3 _08042162: - ldr r1, _0804218C + ldr r1, =0x0202449c ldr r0, [r1] - ldr r4, _08042190 + ldr r4, =0x000001a3 adds r2, r0, r4 _0804216A: ldrb r0, [r2] @@ -135226,17 +130936,10 @@ _0804216A: mov r8, r1 b _08042376 .align 2, 0 -_08042174: .4byte 0x02024084 -_08042178: .4byte 0x0202420b -_0804217C: .4byte 0x0202433c -_08042180: .4byte 0x02024214 -_08042184: .4byte 0x082db28b -_08042188: .4byte 0x02024280 -_0804218C: .4byte 0x0202449c -_08042190: .4byte 0x000001a3 + .pool _08042194: - ldr r1, _080421CC - ldr r4, _080421D0 + ldr r1, =0x02024084 + ldr r4, =0x0202420b ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -135250,7 +130953,7 @@ _08042194: beq _0804220E lsrs r0, r1, 16 bl sub_806F8A8 - ldr r1, _080421D4 + ldr r1, =0x02024474 strb r0, [r1, 0x17] bl GenerateRandomNumber movs r1, 0x1 @@ -135260,19 +130963,17 @@ _08042194: bl b_movescr_stack_push_cursor b _08042200 .align 2, 0 -_080421CC: .4byte 0x02024084 -_080421D0: .4byte 0x0202420b -_080421D4: .4byte 0x02024474 + .pool _080421D8: - ldr r0, _08042218 + ldr r0, =0x082db334 bl b_movescr_stack_push - ldr r2, _0804221C + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 12 orrs r0, r1 str r0, [r2] - ldr r0, _08042220 + ldr r0, =0x0202433c ldrb r2, [r4] lsls r2, 4 adds r2, r0 @@ -135283,30 +130984,24 @@ _080421D8: ldrb r0, [r4] bl b_cancel_multi_turn_move_maybe _08042200: - ldr r1, _08042224 - ldr r0, _08042228 + ldr r1, =0x02024214 + ldr r0, =0x082db327 str r0, [r1] movs r7, 0x1 mov r9, r7 - ldr r0, _0804222C + ldr r0, =0x0202449c mov r8, r0 _0804220E: mov r1, r8 ldr r0, [r1] - ldr r2, _08042230 + ldr r2, =0x000001a3 adds r1, r0, r2 b _08042370 .align 2, 0 -_08042218: .4byte 0x082db334 -_0804221C: .4byte 0x02024280 -_08042220: .4byte 0x0202433c -_08042224: .4byte 0x02024214 -_08042228: .4byte 0x082db327 -_0804222C: .4byte 0x0202449c -_08042230: .4byte 0x000001a3 + .pool _08042234: - ldr r1, _0804226C - ldr r6, _08042270 + ldr r1, =0x02024084 + ldr r6, =0x0202420b ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -135319,7 +131014,7 @@ _08042234: ands r0, r4 cmp r0, 0 beq _08042306 - ldr r7, _08042274 + ldr r7, =0xffffff00 adds r0, r2, r7 str r0, [r3] ldrb r2, [r6] @@ -135330,23 +131025,19 @@ _08042234: ands r0, r4 cmp r0, 0 beq _08042280 - ldr r1, _08042278 - ldr r0, _0804227C + ldr r1, =0x02024214 + ldr r0, =0x082dad71 b _08042300 .align 2, 0 -_0804226C: .4byte 0x02024084 -_08042270: .4byte 0x0202420b -_08042274: .4byte 0xffffff00 -_08042278: .4byte 0x02024214 -_0804227C: .4byte 0x082dad71 + .pool _08042280: - ldr r3, _080422D8 + ldr r3, =0x020241f8 lsls r0, r2, 2 adds r0, r3 ldr r0, [r0] cmp r0, 0 beq _080422FC - ldr r1, _080422DC + ldr r1, =0x020241ea movs r0, 0x75 strh r0, [r1] ldrb r0, [r6] @@ -135356,15 +131047,15 @@ _08042280: lsls r0, 1 mov r1, r10 str r0, [r1] - ldr r4, _080422E0 - ldr r1, _080422E4 + ldr r4, =0x0202420c + ldr r1, =0x02024288 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] strb r0, [r4] - ldr r0, _080422E8 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _080422EC + ldr r2, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r2 @@ -135377,25 +131068,17 @@ _08042280: bl sub_80458E0 strb r0, [r4] _080422CA: - ldr r1, _080422F0 - ldr r0, _080422F4 + ldr r1, =0x02024214 + ldr r0, =0x082dad7c str r0, [r1] - ldr r2, _080422F8 + ldr r2, =0x0202449c mov r8, r2 b _08042302 .align 2, 0 -_080422D8: .4byte 0x020241f8 -_080422DC: .4byte 0x020241ea -_080422E0: .4byte 0x0202420c -_080422E4: .4byte 0x02024288 -_080422E8: .4byte 0x02024210 -_080422EC: .4byte 0x0832a328 -_080422F0: .4byte 0x02024214 -_080422F4: .4byte 0x082dad7c -_080422F8: .4byte 0x0202449c + .pool _080422FC: - ldr r1, _08042310 - ldr r0, _08042314 + ldr r1, =0x02024214 + ldr r0, =0x082dadc4 _08042300: str r0, [r1] _08042302: @@ -135404,16 +131087,14 @@ _08042302: _08042306: mov r4, r8 ldr r0, [r4] - ldr r7, _08042318 + ldr r7, =0x000001a3 adds r1, r0, r7 b _08042370 .align 2, 0 -_08042310: .4byte 0x02024214 -_08042314: .4byte 0x082dadc4 -_08042318: .4byte 0x000001a3 + .pool _0804231C: - ldr r1, _080423C8 - ldr r0, _080423CC + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -135424,8 +131105,8 @@ _0804231C: ands r0, r3 cmp r0, 0 beq _08042368 - ldr r2, _080423D0 - ldr r0, _080423D4 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -135439,21 +131120,21 @@ _0804231C: ands r3, r0 str r3, [r4] bl b_movescr_stack_push_cursor - ldr r1, _080423D8 - ldr r0, _080423DC + ldr r1, =0x02024214 + ldr r0, =0x082db277 str r0, [r1] - ldr r1, _080423E0 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] _08042360: movs r0, 0x2 mov r9, r0 - ldr r1, _080423E4 + ldr r1, =0x0202449c mov r8, r1 _08042368: mov r2, r8 ldr r0, [r2] - ldr r3, _080423E8 + ldr r3, =0x000001a3 adds r1, r0, r3 _08042370: ldrb r0, [r1] @@ -135462,7 +131143,7 @@ _08042370: _08042376: mov r4, r8 ldr r0, [r4] - ldr r7, _080423E8 + ldr r7, =0x000001a3 adds r0, r7 ldrb r0, [r0] cmp r0, 0xE @@ -135472,14 +131153,14 @@ _08042388: mov r0, r9 cmp r0, 0x2 bne _080423B4 - ldr r4, _080423EC - ldr r0, _080423CC + ldr r4, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r4] ldrb r1, [r4] movs r0, 0x58 muls r0, r1 - ldr r1, _080423F0 + ldr r1, =0x020240d0 adds r0, r1 str r0, [sp] movs r0, 0 @@ -135500,17 +131181,7 @@ _080423B4: pop {r1} bx r1 .align 2, 0 -_080423C8: .4byte 0x02024084 -_080423CC: .4byte 0x0202420b -_080423D0: .4byte 0x0831c898 -_080423D4: .4byte 0x020241ea -_080423D8: .4byte 0x02024214 -_080423DC: .4byte 0x082db277 -_080423E0: .4byte 0x02024332 -_080423E4: .4byte 0x0202449c -_080423E8: .4byte 0x000001a3 -_080423EC: .4byte 0x02024064 -_080423F0: .4byte 0x020240d0 + .pool thumb_func_end sub_8041A6C thumb_func_start sub_80423F4 @@ -135528,7 +131199,7 @@ sub_80423F4: @ 80423F4 lsls r2, 24 lsrs r2, 24 mov r9, r2 - ldr r0, _08042420 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 ands r0, r1 @@ -135537,7 +131208,7 @@ sub_80423F4: @ 80423F4 movs r0, 0 b _080426A0 .align 2, 0 -_08042420: .4byte 0x02022fec + .pool _08042424: movs r0, 0x80 lsls r0, 15 @@ -135547,11 +131218,11 @@ _08042424: adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 - ldr r1, _08042494 + ldr r1, =0x02024744 mov r8, r1 cmp r0, 0 bne _08042442 - ldr r2, _08042498 + ldr r2, =0x020244ec mov r8, r2 _08042442: movs r0, 0x2 @@ -135596,8 +131267,7 @@ _0804248C: adds r0, r6 b _08042556 .align 2, 0 -_08042494: .4byte 0x02024744 -_08042498: .4byte 0x020244ec + .pool _0804249C: movs r0, 0x40 ands r0, r1 @@ -135613,7 +131283,7 @@ _0804249C: lsls r0, 24 cmp r0, 0 bne _080424D0 - ldr r2, _080424CC + ldr r2, =0x020244ec mov r8, r2 adds r0, r4, 0 bl sub_806D864 @@ -135621,9 +131291,9 @@ _0804249C: lsrs r7, r0, 24 b _08042502 .align 2, 0 -_080424CC: .4byte 0x020244ec + .pool _080424D0: - ldr r0, _080424E0 + ldr r0, =0x02024744 mov r8, r0 movs r1, 0x1 eors r1, r4 @@ -135632,7 +131302,7 @@ _080424D0: lsrs r6, r0, 31 b _0804250C .align 2, 0 -_080424E0: .4byte 0x02024744 + .pool _080424E4: adds r0, r4, 0 bl sub_806D864 @@ -135641,11 +131311,11 @@ _080424E4: adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 - ldr r1, _08042564 + ldr r1, =0x02024744 mov r8, r1 cmp r0, 0 bne _08042502 - ldr r2, _08042568 + ldr r2, =0x020244ec mov r8, r2 _08042502: adds r0, r7, 0 @@ -135699,8 +131369,7 @@ _0804255E: adds r0, r1, 0 b _080426A0 .align 2, 0 -_08042564: .4byte 0x02024744 -_08042568: .4byte 0x020244ec + .pool _0804256C: movs r0, 0x80 lsls r0, 8 @@ -135713,7 +131382,7 @@ _0804256C: lsrs r0, 24 cmp r0, 0x1 bne _080425DA - ldr r0, _08042598 + ldr r0, =0x02024744 mov r8, r0 movs r6, 0x3 cmp r4, 0x1 @@ -135724,7 +131393,7 @@ _08042590: adds r6, r4, 0x3 b _0804259E .align 2, 0 -_08042598: .4byte 0x02024744 + .pool _0804259C: adds r4, 0x1 _0804259E: @@ -135771,11 +131440,11 @@ _080425DA: bl battle_get_side_with_given_state lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _08042604 + ldr r2, =0x02024744 mov r8, r2 b _08042620 .align 2, 0 -_08042604: .4byte 0x02024744 + .pool _08042608: movs r0, 0 bl battle_get_side_with_given_state @@ -135785,13 +131454,13 @@ _08042608: bl battle_get_side_with_given_state lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080426B0 + ldr r0, =0x020244ec mov r8, r0 _08042620: mov r1, r10 cmp r1, 0x6 bne _08042630 - ldr r1, _080426B4 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrb r0, [r0] @@ -135800,7 +131469,7 @@ _08042630: mov r2, r9 cmp r2, 0x6 bne _08042640 - ldr r1, _080426B4 + ldr r1, =0x0202406e lsls r0, r6, 1 adds r0, r1 ldrb r0, [r0] @@ -135833,7 +131502,7 @@ _08042642: beq _08042692 cmp r4, r9 beq _08042692 - ldr r0, _080426B8 + ldr r0, =0x0202449c ldr r1, [r0] adds r0, r7, r1 adds r0, 0x5C @@ -135864,9 +131533,7 @@ _080426A0: pop {r1} bx r1 .align 2, 0 -_080426B0: .4byte 0x020244ec -_080426B4: .4byte 0x0202406e -_080426B8: .4byte 0x0202449c + .pool thumb_func_end sub_80423F4 thumb_func_start castform_switch @@ -135876,12 +131543,12 @@ castform_switch: @ 80426BC lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r1, _0804272C + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r6 adds r4, r0, r1 ldrh r1, [r4] - ldr r0, _08042730 + ldr r0, =0x00000181 cmp r1, r0 bne _08042760 adds r0, r4, 0 @@ -135926,8 +131593,7 @@ _0804270E: movs r0, 0x1 b _08042818 .align 2, 0 -_0804272C: .4byte 0x02024084 -_08042730: .4byte 0x00000181 + .pool _08042734: movs r0, 0 str r0, [sp] @@ -135953,14 +131619,14 @@ _08042760: movs r0, 0 b _08042818 _08042764: - ldr r1, _08042820 + ldr r1, =0x020243cc ldrh r0, [r1] movs r2, 0xE7 ands r2, r0 adds r4, r1, 0 cmp r2, 0 bne _08042792 - ldr r1, _08042824 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r6 adds r1, r0, r1 @@ -135982,7 +131648,7 @@ _08042792: ands r0, r1 cmp r0, 0 beq _080427BE - ldr r1, _08042824 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r6 adds r1, r0, r1 @@ -136005,7 +131671,7 @@ _080427BE: ands r0, r1 cmp r0, 0 beq _080427EA - ldr r1, _08042824 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r6 adds r1, r0, r1 @@ -136028,7 +131694,7 @@ _080427EA: ands r0, r1 cmp r0, 0 beq _08042816 - ldr r1, _08042824 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r6 adds r1, r0, r1 @@ -136053,8 +131719,7 @@ _08042818: pop {r1} bx r1 .align 2, 0 -_08042820: .4byte 0x020243cc -_08042824: .4byte 0x02024084 + .pool thumb_func_end castform_switch thumb_func_start ability_something @@ -136081,8 +131746,8 @@ ability_something: @ 8042828 lsrs r4, 16 movs r0, 0 mov r9, r0 - ldr r5, _08042884 - ldr r1, _08042888 + ldr r5, =0x0202420b + ldr r1, =0x0202406c ldrb r0, [r5] ldrb r1, [r1] cmp r0, r1 @@ -136095,33 +131760,30 @@ _08042864: lsls r0, 24 cmp r0, 0 bne _08042894 - ldr r1, _0804288C + ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08042890 + ldr r0, =0x020244ec b _080428A4 .align 2, 0 -_08042884: .4byte 0x0202420b -_08042888: .4byte 0x0202406c -_0804288C: .4byte 0x0202406e -_08042890: .4byte 0x020244ec + .pool _08042894: - ldr r1, _080428D4 + ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080428D8 + ldr r0, =0x02024744 _080428A4: adds r7, r1, r0 - ldr r5, _080428DC - ldr r1, _080428E0 + ldr r5, =0x0202420c + ldr r1, =0x0202406c ldrb r0, [r5] ldrb r1, [r1] cmp r0, r1 @@ -136134,30 +131796,26 @@ _080428B6: lsls r0, 24 cmp r0, 0 bne _080428E8 - ldr r1, _080428D4 + ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080428E4 + ldr r0, =0x020244ec b _080428F8 .align 2, 0 -_080428D4: .4byte 0x0202406e -_080428D8: .4byte 0x02024744 -_080428DC: .4byte 0x0202420c -_080428E0: .4byte 0x0202406c -_080428E4: .4byte 0x020244ec + .pool _080428E8: - ldr r1, _08042948 + ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0804294C + ldr r0, =0x02024744 _080428F8: adds r5, r1, r0 adds r0, r7, 0 @@ -136180,7 +131838,7 @@ _080428F8: movs r1, 0 bl pokemon_getattr str r0, [sp, 0x14] - ldr r0, _08042950 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -136191,18 +131849,15 @@ _0804293A: mov r3, r8 cmp r3, 0 beq _08042958 - ldr r0, _08042954 + ldr r0, =0x0202420a strb r3, [r0] adds r7, r0, 0 b _0804296E .align 2, 0 -_08042948: .4byte 0x0202406e -_0804294C: .4byte 0x02024744 -_08042950: .4byte 0x02022fec -_08042954: .4byte 0x0202420a + .pool _08042958: - ldr r2, _08042978 - ldr r1, _0804297C + ldr r2, =0x0202420a + ldr r1, =0x02024084 movs r0, 0x58 mov r5, r10 muls r5, r0 @@ -136218,13 +131873,12 @@ _0804296E: adds r5, r4, 0 b _08042984 .align 2, 0 -_08042978: .4byte 0x0202420a -_0804297C: .4byte 0x02024084 + .pool _08042980: - ldr r0, _08042998 + ldr r0, =0x020241ea ldrh r5, [r0] _08042984: - ldr r1, _0804299C + ldr r1, =0x0202449c ldr r0, [r1] ldrb r0, [r0, 0x13] mov r8, r1 @@ -136234,10 +131888,9 @@ _08042984: ands r3, r0 b _080429AC .align 2, 0 -_08042998: .4byte 0x020241ea -_0804299C: .4byte 0x0202449c + .pool _080429A0: - ldr r1, _080429C0 + ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -136250,13 +131903,12 @@ _080429AC: bl _0804441E _080429B6: lsls r0, 2 - ldr r1, _080429C4 + ldr r1, =_080429C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080429C0: .4byte 0x0831c898 -_080429C4: .4byte _080429C8 + .pool .align 2, 0 _080429C8: .4byte _08042A18 @@ -136280,8 +131932,8 @@ _080429C8: .4byte _080443EC .4byte _08044196 _08042A18: - ldr r2, _08042A4C - ldr r0, _08042A50 + ldr r2, =0x0202420b + ldr r0, =0x0202406c ldrb r1, [r2] adds r5, r0, 0 ldrb r3, [r5] @@ -136309,8 +131961,7 @@ _08042A3C: _08042A46: bl _0804441E .align 2, 0 -_08042A4C: .4byte 0x0202420b -_08042A50: .4byte 0x0202406c + .pool _08042A54: cmp r0, 0x16 bne _08042A5A @@ -136342,7 +131993,7 @@ _08042A7E: beq _08042A86 bl _0804441E _08042A86: - ldr r0, _08042AAC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -136356,13 +132007,12 @@ _08042A86: cmp r0, 0xA bhi _08042B4C lsls r0, 2 - ldr r1, _08042AB0 + ldr r1, =_08042AB4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08042AAC: .4byte 0x02022fec -_08042AB0: .4byte _08042AB4 + .pool .align 2, 0 _08042AB4: .4byte _08042AE0 @@ -136377,7 +132027,7 @@ _08042AB4: .4byte _08042B28 .4byte _08042AE0 _08042AE0: - ldr r2, _08042AFC + ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x7 ands r0, r1 @@ -136385,17 +132035,16 @@ _08042AE0: bne _08042B4C movs r0, 0x5 strh r0, [r2] - ldr r1, _08042B00 + ldr r1, =0x02024474 movs r0, 0xA strb r0, [r1, 0x10] mov r2, r10 strb r2, [r1, 0x17] b _08042B42 .align 2, 0 -_08042AFC: .4byte 0x020243cc -_08042B00: .4byte 0x02024474 + .pool _08042B04: - ldr r3, _08042B20 + ldr r3, =0x020243cc ldrh r1, [r3] movs r2, 0x18 adds r0, r2, 0 @@ -136403,17 +132052,16 @@ _08042B04: cmp r0, 0 bne _08042B4C strh r2, [r3] - ldr r1, _08042B24 + ldr r1, =0x02024474 movs r0, 0xC strb r0, [r1, 0x10] mov r3, r10 strb r3, [r1, 0x17] b _08042B42 .align 2, 0 -_08042B20: .4byte 0x020243cc -_08042B24: .4byte 0x02024474 + .pool _08042B28: - ldr r3, _08042B68 + ldr r3, =0x020243cc ldrh r1, [r3] movs r2, 0x60 adds r0, r2, 0 @@ -136421,7 +132069,7 @@ _08042B28: cmp r0, 0 bne _08042B4C strh r2, [r3] - ldr r1, _08042B6C + ldr r1, =0x02024474 movs r0, 0xB strb r0, [r1, 0x10] mov r5, r10 @@ -136439,18 +132087,15 @@ _08042B4C: bl _0804443A _08042B56: bl weather_get_current - ldr r1, _08042B70 + ldr r1, =0x02024332 strb r0, [r1, 0x5] - ldr r0, _08042B74 + ldr r0, =0x082dace7 bl b_push_move_exec bl _0804441E .align 2, 0 -_08042B68: .4byte 0x020243cc -_08042B6C: .4byte 0x02024474 -_08042B70: .4byte 0x02024332 -_08042B74: .4byte 0x082dace7 + .pool _08042B78: - ldr r2, _08042B9C + ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x4 ands r0, r1 @@ -136460,18 +132105,16 @@ _08042B78: _08042B88: movs r0, 0x5 strh r0, [r2] - ldr r0, _08042BA0 + ldr r0, =0x082db430 bl b_push_move_exec - ldr r0, _08042BA4 + ldr r0, =0x02024474 mov r1, r10 strb r1, [r0, 0x17] bl _080443D0 .align 2, 0 -_08042B9C: .4byte 0x020243cc -_08042BA0: .4byte 0x082db430 -_08042BA4: .4byte 0x02024474 + .pool _08042BA8: - ldr r2, _08042BCC + ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x10 ands r0, r1 @@ -136481,18 +132124,16 @@ _08042BA8: _08042BB8: movs r0, 0x18 strh r0, [r2] - ldr r0, _08042BD0 + ldr r0, =0x082db470 bl b_push_move_exec - ldr r0, _08042BD4 + ldr r0, =0x02024474 mov r2, r10 strb r2, [r0, 0x17] bl _080443D0 .align 2, 0 -_08042BCC: .4byte 0x020243cc -_08042BD0: .4byte 0x082db470 -_08042BD4: .4byte 0x02024474 + .pool _08042BD8: - ldr r2, _08042BFC + ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x40 ands r0, r1 @@ -136502,18 +132143,16 @@ _08042BD8: _08042BE8: movs r0, 0x60 strh r0, [r2] - ldr r0, _08042C00 + ldr r0, =0x082db52a bl b_push_move_exec - ldr r0, _08042C04 + ldr r0, =0x02024474 mov r3, r10 strb r3, [r0, 0x17] bl _080443D0 .align 2, 0 -_08042BFC: .4byte 0x020243cc -_08042C00: .4byte 0x082db52a -_08042C04: .4byte 0x02024474 + .pool _08042C08: - ldr r0, _08042C34 + ldr r0, =0x0202437c mov r5, r10 lsls r2, r5, 2 adds r1, r2, r5 @@ -136525,7 +132164,7 @@ _08042C08: bge _08042C20 bl _0804441E _08042C20: - ldr r1, _08042C38 + ldr r1, =0x020242ac adds r1, r2, r1 ldr r0, [r1] movs r2, 0x80 @@ -136536,8 +132175,7 @@ _08042C20: movs r1, 0x8 b _08042C92 .align 2, 0 -_08042C34: .4byte 0x0202437c -_08042C38: .4byte 0x020242ac + .pool _08042C3C: mov r0, r10 bl castform_switch @@ -136548,17 +132186,16 @@ _08042C3C: bne _08042C50 bl _0804443A _08042C50: - ldr r0, _08042C60 + ldr r0, =0x082db4a9 bl b_push_move_exec - ldr r0, _08042C64 + ldr r0, =0x02024474 mov r1, r10 strb r1, [r0, 0x17] bl _080442E2 .align 2, 0 -_08042C60: .4byte 0x082db4a9 -_08042C64: .4byte 0x02024474 + .pool _08042C68: - ldr r0, _08042C9C + ldr r0, =0x0202437c mov r3, r10 lsls r2, r3, 2 adds r1, r2, r3 @@ -136570,7 +132207,7 @@ _08042C68: bge _08042C80 bl _0804441E _08042C80: - ldr r1, _08042CA0 + ldr r1, =0x020242ac adds r1, r2, r1 ldr r0, [r1] movs r2, 0x80 @@ -136584,8 +132221,7 @@ _08042C92: strb r0, [r3] bl _0804441E .align 2, 0 -_08042C9C: .4byte 0x0202437c -_08042CA0: .4byte 0x020242ac + .pool _08042CA4: movs r6, 0 ldrb r5, [r5] @@ -136605,15 +132241,15 @@ _08042CC4: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08042CD8 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 bcc _08042CB0 bl _0804441E .align 2, 0 -_08042CD8: .4byte 0x0202406c + .pool _08042CDC: - ldr r5, _08042D0C + ldr r5, =0x02024084 mov r8, r5 movs r0, 0x58 mov r6, r10 @@ -136624,7 +132260,7 @@ _08042CDC: bne _08042CF2 bl _0804441E _08042CF2: - ldr r0, _08042D10 + ldr r0, =0x0202420b mov r1, r10 strb r1, [r0] ldrb r5, [r7] @@ -136638,8 +132274,7 @@ _08042CF2: _08042D08: bl _0804441E .align 2, 0 -_08042D0C: .4byte 0x02024084 -_08042D10: .4byte 0x0202420b + .pool _08042D14: cmp r5, 0x36 bne _08042D1A @@ -136673,7 +132308,7 @@ _08042D3E: beq _08042D56 bl _0804441E _08042D56: - ldr r0, _08042D94 + ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x7 ands r0, r1 @@ -136688,9 +132323,9 @@ _08042D66: bl _0804441E _08042D72: strb r5, [r7] - ldr r0, _08042D98 + ldr r0, =0x082db45c bl b_push_move_exec - ldr r1, _08042D9C + ldr r1, =0x020241f0 ldrh r0, [r4, 0x2C] lsrs r0, 4 str r0, [r1] @@ -136704,9 +132339,7 @@ _08042D8A: str r0, [r1] bl _080443D0 .align 2, 0 -_08042D94: .4byte 0x020243cc -_08042D98: .4byte 0x082db45c -_08042D9C: .4byte 0x020241f0 + .pool _08042DA0: mov r0, r8 adds r0, 0x4C @@ -136732,8 +132365,8 @@ _08042DCA: ands r0, r1 cmp r0, 0 beq _08042DDC - ldr r0, _08042E5C - ldr r1, _08042E60 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc70 bl gf_strcpy _08042DDC: ldr r0, [r5] @@ -136741,8 +132374,8 @@ _08042DDC: ands r0, r1 cmp r0, 0 beq _08042DEE - ldr r0, _08042E5C - ldr r1, _08042E64 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc78 bl gf_strcpy _08042DEE: ldr r0, [r5] @@ -136750,8 +132383,8 @@ _08042DEE: ands r0, r1 cmp r0, 0 beq _08042E00 - ldr r0, _08042E5C - ldr r1, _08042E68 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc80 bl gf_strcpy _08042E00: ldr r0, [r5] @@ -136759,8 +132392,8 @@ _08042E00: ands r0, r1 cmp r0, 0 beq _08042E12 - ldr r0, _08042E5C - ldr r1, _08042E6C + ldr r0, =0x02022f58 + ldr r1, =0x0831bc88 bl gf_strcpy _08042E12: ldr r0, [r5] @@ -136768,8 +132401,8 @@ _08042E12: ands r0, r1 cmp r0, 0 beq _08042E24 - ldr r0, _08042E5C - ldr r1, _08042E70 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc90 bl gf_strcpy _08042E24: str r4, [r5] @@ -136777,15 +132410,15 @@ _08042E24: adds r1, 0x50 adds r1, r6, r1 ldr r0, [r1] - ldr r2, _08042E74 + ldr r2, =0xf7ffffff ands r0, r2 str r0, [r1] - ldr r0, _08042E78 - ldr r4, _08042E7C + ldr r0, =0x02024474 + ldr r4, =0x02024064 mov r3, r10 strb r3, [r4] strb r3, [r0, 0x17] - ldr r0, _08042E80 + ldr r0, =0x082db484 bl b_push_move_exec str r5, [sp] movs r0, 0 @@ -136797,16 +132430,7 @@ _08042E24: bl dp01_battle_side_mark_buffer_for_execution bl _080443D0 .align 2, 0 -_08042E5C: .4byte 0x02022f58 -_08042E60: .4byte 0x0831bc70 -_08042E64: .4byte 0x0831bc78 -_08042E68: .4byte 0x0831bc80 -_08042E6C: .4byte 0x0831bc88 -_08042E70: .4byte 0x0831bc90 -_08042E74: .4byte 0xf7ffffff -_08042E78: .4byte 0x02024474 -_08042E7C: .4byte 0x02024064 -_08042E80: .4byte 0x082db484 + .pool _08042E84: ldrb r2, [r4, 0x1B] movs r0, 0x1B @@ -136815,7 +132439,7 @@ _08042E84: ble _08042E92 bl _0804441E _08042E92: - ldr r0, _08042EC4 + ldr r0, =0x020242bc mov r5, r10 lsls r1, r5, 3 subs r1, r5 @@ -136829,20 +132453,18 @@ _08042EA8: adds r0, r2, 0x1 movs r1, 0 strb r0, [r4, 0x1B] - ldr r4, _08042EC8 + ldr r4, =0x02024474 movs r0, 0x11 strb r0, [r4, 0x10] strb r1, [r4, 0x11] - ldr r0, _08042ECC + ldr r0, =0x082db444 bl b_push_move_exec strb r5, [r4, 0x17] bl _080443D0 .align 2, 0 -_08042EC4: .4byte 0x020242bc -_08042EC8: .4byte 0x02024474 -_08042ECC: .4byte 0x082db444 + .pool _08042ED0: - ldr r2, _08042EF4 + ldr r2, =0x020242bc ldrb r0, [r0] lsls r1, r0, 3 subs r1, r0 @@ -136860,7 +132482,7 @@ _08042ED0: strb r0, [r1, 0x18] bl _0804441E .align 2, 0 -_08042EF4: .4byte 0x020242bc + .pool _08042EF8: ldrb r0, [r7] cmp r0, 0x2B @@ -136868,9 +132490,9 @@ _08042EF8: bl _0804441E _08042F02: movs r4, 0 - ldr r0, _08042F70 + ldr r0, =0x0831bcf8 ldrh r2, [r0] - ldr r3, _08042F74 + ldr r3, =0x0000ffff adds r1, r0, 0 cmp r2, r3 bne _08042F14 @@ -136893,13 +132515,13 @@ _08042F2C: lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] - ldr r0, _08042F74 + ldr r0, =0x0000ffff cmp r1, r0 bne _08042F3C bl _0804441E _08042F3C: - ldr r1, _08042F78 - ldr r0, _08042F7C + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -136911,27 +132533,21 @@ _08042F3C: ands r0, r1 cmp r0, 0 beq _08042F62 - ldr r0, _08042F80 + ldr r0, =0x02024280 ldr r1, [r0] movs r2, 0x80 lsls r2, 4 orrs r1, r2 str r1, [r0] _08042F62: - ldr r1, _08042F84 - ldr r0, _08042F88 + ldr r1, =0x02024214 + ldr r0, =0x082db61f str r0, [r1] movs r0, 0x1 mov r9, r0 bl _08044424 .align 2, 0 -_08042F70: .4byte 0x0831bcf8 -_08042F74: .4byte 0x0000ffff -_08042F78: .4byte 0x02024084 -_08042F7C: .4byte 0x0202420b -_08042F80: .4byte 0x02024280 -_08042F84: .4byte 0x02024214 -_08042F88: .4byte 0x082db61f + .pool _08042F8C: cmp r5, 0 bne _08042F94 @@ -136954,7 +132570,7 @@ _08042FAA: beq _08042FB0 b _08043126 _08042FB0: - ldr r0, _08042FDC + ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 lsls r1, 2 @@ -136964,8 +132580,8 @@ _08042FB0: bne _08042FC2 b _08043126 _08042FC2: - ldr r1, _08042FE0 - ldr r0, _08042FE4 + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -136973,31 +132589,26 @@ _08042FC2: lsls r0, 28 cmp r0, 0 bge _08042FF0 - ldr r1, _08042FE8 - ldr r0, _08042FEC + ldr r1, =0x02024214 + ldr r0, =0x082db56f b _08042FF4 .align 2, 0 -_08042FDC: .4byte 0x0831c898 -_08042FE0: .4byte 0x0202433c -_08042FE4: .4byte 0x0202420b -_08042FE8: .4byte 0x02024214 -_08042FEC: .4byte 0x082db56f + .pool _08042FF0: - ldr r1, _08042FFC - ldr r0, _08043000 + ldr r1, =0x02024214 + ldr r0, =0x082db56e _08042FF4: str r0, [r1] movs r1, 0x1 b _08043124 .align 2, 0 -_08042FFC: .4byte 0x02024214 -_08043000: .4byte 0x082db56e + .pool _08043004: cmp r3, 0xB beq _0804300A b _08043126 _0804300A: - ldr r0, _08043034 + ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 lsls r1, 2 @@ -137007,8 +132618,8 @@ _0804300A: bne _0804301C b _08043126 _0804301C: - ldr r1, _08043038 - ldr r0, _0804303C + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -137016,30 +132627,25 @@ _0804301C: lsls r0, 28 cmp r0, 0 bge _08043048 - ldr r1, _08043040 - ldr r0, _08043044 + ldr r1, =0x02024214 + ldr r0, =0x082db56f b _0804304C .align 2, 0 -_08043034: .4byte 0x0831c898 -_08043038: .4byte 0x0202433c -_0804303C: .4byte 0x0202420b -_08043040: .4byte 0x02024214 -_08043044: .4byte 0x082db56f + .pool _08043048: - ldr r1, _08043054 - ldr r0, _08043058 + ldr r1, =0x02024214 + ldr r0, =0x082db56e _0804304C: str r0, [r1] movs r2, 0x1 mov r9, r2 b _08043126 .align 2, 0 -_08043054: .4byte 0x02024214 -_08043058: .4byte 0x082db56e + .pool _0804305C: cmp r3, 0xA bne _08043126 - ldr r1, _080430AC + ldr r1, =0x02024084 movs r0, 0x58 mov r3, r10 muls r3, r0 @@ -137051,7 +132657,7 @@ _0804305C: ands r0, r1 cmp r0, 0 bne _08043126 - ldr r2, _080430B0 + ldr r2, =0x020244a8 ldr r0, [r2] ldr r0, [r0, 0x4] mov r5, r10 @@ -137063,10 +132669,10 @@ _0804305C: adds r5, r1, 0 cmp r3, 0 bne _080430EC - ldr r0, _080430B4 + ldr r0, =0x02024332 strb r3, [r0, 0x5] - ldr r1, _080430B8 - ldr r0, _080430BC + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -137074,20 +132680,14 @@ _0804305C: lsls r0, 28 cmp r0, 0 bge _080430C8 - ldr r1, _080430C0 - ldr r0, _080430C4 + ldr r1, =0x02024214 + ldr r0, =0x082db5a8 b _080430CC .align 2, 0 -_080430AC: .4byte 0x02024084 -_080430B0: .4byte 0x020244a8 -_080430B4: .4byte 0x02024332 -_080430B8: .4byte 0x0202433c -_080430BC: .4byte 0x0202420b -_080430C0: .4byte 0x02024214 -_080430C4: .4byte 0x082db5a8 + .pool _080430C8: - ldr r1, _080430E4 - ldr r0, _080430E8 + ldr r1, =0x02024214 + ldr r0, =0x082db5a7 _080430CC: str r0, [r1] ldr r0, [r2] @@ -137101,13 +132701,12 @@ _080430CC: mov r9, r0 b _08043126 .align 2, 0 -_080430E4: .4byte 0x02024214 -_080430E8: .4byte 0x082db5a7 + .pool _080430EC: - ldr r0, _08043108 + ldr r0, =0x02024332 strb r4, [r0, 0x5] - ldr r1, _0804310C - ldr r0, _08043110 + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -137115,18 +132714,14 @@ _080430EC: lsls r0, 28 cmp r0, 0 bge _0804311C - ldr r1, _08043114 - ldr r0, _08043118 + ldr r1, =0x02024214 + ldr r0, =0x082db5a8 b _08043120 .align 2, 0 -_08043108: .4byte 0x02024332 -_0804310C: .4byte 0x0202433c -_08043110: .4byte 0x0202420b -_08043114: .4byte 0x02024214 -_08043118: .4byte 0x082db5a8 + .pool _0804311C: - ldr r1, _08043160 - ldr r0, _08043164 + ldr r1, =0x02024214 + ldr r0, =0x082db5a7 _08043120: str r0, [r1] movs r1, 0x2 @@ -137138,7 +132733,7 @@ _08043126: beq _08043130 bl _0804441E _08043130: - ldr r1, _08043168 + ldr r1, =0x02024084 movs r0, 0x58 mov r3, r10 muls r3, r0 @@ -137148,8 +132743,8 @@ _08043130: ldrh r5, [r1, 0x28] cmp r0, r5 bne _0804318C - ldr r1, _0804316C - ldr r0, _08043170 + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -137157,27 +132752,21 @@ _08043130: lsls r0, 28 cmp r0, 0 bge _08043178 - ldr r1, _08043160 - ldr r0, _08043174 + ldr r1, =0x02024214 + ldr r0, =0x082db592 str r0, [r1] bl _0804441E .align 2, 0 -_08043160: .4byte 0x02024214 -_08043164: .4byte 0x082db5a7 -_08043168: .4byte 0x02024084 -_0804316C: .4byte 0x0202433c -_08043170: .4byte 0x0202420b -_08043174: .4byte 0x082db592 + .pool _08043178: - ldr r1, _08043184 - ldr r0, _08043188 + ldr r1, =0x02024214 + ldr r0, =0x082db591 str r0, [r1] bl _0804441E .align 2, 0 -_08043184: .4byte 0x02024214 -_08043188: .4byte 0x082db591 + .pool _0804318C: - ldr r2, _080431A8 + ldr r2, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 2 str r0, [r2] @@ -137191,7 +132780,7 @@ _0804319C: str r0, [r2] bl _0804441E .align 2, 0 -_080431A8: .4byte 0x020241f0 + .pool _080431AC: ldrb r0, [r7] subs r0, 0x9 @@ -137200,12 +132789,12 @@ _080431AC: bl _0804441E _080431B8: lsls r0, 2 - ldr r1, _080431C4 + ldr r1, =_080431C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080431C4: .4byte _080431C8 + .pool .align 2, 0 _080431C8: .4byte _080435E4 @@ -137257,7 +132846,7 @@ _080431C8: .4byte _0804441E .4byte _0804379C _08043288: - ldr r0, _08043330 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -137269,7 +132858,7 @@ _08043298: bne _080432A0 bl _0804441E _080432A0: - ldr r0, _08043334 + ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 lsls r1, 2 @@ -137279,8 +132868,8 @@ _080432A0: bne _080432B4 bl _0804441E _080432B4: - ldr r2, _08043338 - ldr r0, _0804333C + ldr r2, =0x0202437c + ldr r0, =0x0202420c ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -137299,7 +132888,7 @@ _080432B4: bne _080432DC bl _0804441E _080432DC: - ldr r1, _08043340 + ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -137326,7 +132915,7 @@ _08043304: _0804330E: strb r3, [r4] strb r3, [r2] - ldr r1, _08043344 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -137335,21 +132924,14 @@ _0804330E: movs r0, 0xFF strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, _08043348 - ldr r0, _0804334C + ldr r1, =0x02024214 + ldr r0, =0x082db64d str r0, [r1] bl _080443D0 .align 2, 0 -_08043330: .4byte 0x0202427c -_08043334: .4byte 0x0831c898 -_08043338: .4byte 0x0202437c -_0804333C: .4byte 0x0202420c -_08043340: .4byte 0x02024084 -_08043344: .4byte 0x02022f58 -_08043348: .4byte 0x02024214 -_0804334C: .4byte 0x082db64d + .pool _08043350: - ldr r0, _080433E8 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -137357,8 +132939,8 @@ _08043350: beq _08043360 bl _0804441E _08043360: - ldr r1, _080433EC - ldr r0, _080433F0 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -137368,7 +132950,7 @@ _08043360: bne _08043376 bl _0804441E _08043376: - ldr r0, _080433F4 + ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -137377,8 +132959,8 @@ _08043376: beq _08043388 bl _0804441E _08043388: - ldr r2, _080433F8 - ldr r0, _080433FC + ldr r2, =0x0202437c + ldr r0, =0x0202420c ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -137397,7 +132979,7 @@ _08043388: bne _080433B0 bl _0804441E _080433B0: - ldr r1, _08043400 + ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -137410,7 +132992,7 @@ _080433B0: bne _080433CA bl _0804441E _080433CA: - ldr r1, _08043404 + ldr r1, =0x020241f0 ldrh r0, [r3, 0x2C] lsrs r0, 4 str r0, [r1] @@ -137419,23 +133001,14 @@ _080433CA: str r2, [r1] _080433D8: bl b_movescr_stack_push_cursor - ldr r1, _08043408 - ldr r0, _0804340C + ldr r1, =0x02024214 + ldr r0, =0x082db654 str r0, [r1] bl _080443D0 .align 2, 0 -_080433E8: .4byte 0x0202427c -_080433EC: .4byte 0x02024084 -_080433F0: .4byte 0x0202420b -_080433F4: .4byte 0x0202433c -_080433F8: .4byte 0x0202437c -_080433FC: .4byte 0x0202420c -_08043400: .4byte 0x0831c898 -_08043404: .4byte 0x020241f0 -_08043408: .4byte 0x02024214 -_0804340C: .4byte 0x082db654 + .pool _08043410: - ldr r0, _080434DC + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -137443,8 +133016,8 @@ _08043410: beq _08043420 bl _0804441E _08043420: - ldr r1, _080434E0 - ldr r0, _080434E4 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -137454,7 +133027,7 @@ _08043420: bne _08043436 bl _0804441E _08043436: - ldr r0, _080434E8 + ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -137463,8 +133036,8 @@ _08043436: beq _08043448 bl _0804441E _08043448: - ldr r2, _080434EC - ldr r0, _080434F0 + ldr r2, =0x0202437c + ldr r0, =0x0202420c ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -137483,7 +133056,7 @@ _08043448: bne _08043470 bl _0804441E _08043470: - ldr r1, _080434F4 + ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -137505,7 +133078,7 @@ _08043488: beq _080434A0 bl _0804441E _080434A0: - ldr r5, _080434F8 + ldr r5, =0x02024332 movs r4, 0x3 _080434A4: bl GenerateRandomNumber @@ -137513,7 +133086,7 @@ _080434A4: strb r0, [r5, 0x3] cmp r0, 0 beq _080434A4 - ldr r1, _080434F8 + ldr r1, =0x02024332 ldrb r0, [r1, 0x3] cmp r0, 0x3 bne _080434BC @@ -137524,10 +133097,10 @@ _080434BC: adds r0, 0x40 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, _080434FC - ldr r0, _08043500 + ldr r1, =0x02024214 + ldr r0, =0x082db67c str r0, [r1] - ldr r2, _08043504 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -137535,19 +133108,9 @@ _080434BC: str r0, [r2] bl _080443D0 .align 2, 0 -_080434DC: .4byte 0x0202427c -_080434E0: .4byte 0x02024084 -_080434E4: .4byte 0x0202420b -_080434E8: .4byte 0x0202433c -_080434EC: .4byte 0x0202437c -_080434F0: .4byte 0x0202420c -_080434F4: .4byte 0x0831c898 -_080434F8: .4byte 0x02024332 -_080434FC: .4byte 0x02024214 -_08043500: .4byte 0x082db67c -_08043504: .4byte 0x02024280 + .pool _08043508: - ldr r0, _080435B8 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -137555,8 +133118,8 @@ _08043508: beq _08043518 bl _0804441E _08043518: - ldr r1, _080435BC - ldr r0, _080435C0 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -137566,7 +133129,7 @@ _08043518: bne _0804352E bl _0804441E _0804352E: - ldr r0, _080435C4 + ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -137575,8 +133138,8 @@ _0804352E: beq _08043540 bl _0804441E _08043540: - ldr r2, _080435C8 - ldr r0, _080435CC + ldr r2, =0x0202437c + ldr r0, =0x0202420c ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -137595,7 +133158,7 @@ _08043540: bne _08043568 bl _0804441E _08043568: - ldr r1, _080435D0 + ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -137617,14 +133180,14 @@ _08043580: beq _08043598 bl _0804441E _08043598: - ldr r1, _080435D4 + ldr r1, =0x02024332 movs r0, 0x42 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, _080435D8 - ldr r0, _080435DC + ldr r1, =0x02024214 + ldr r0, =0x082db67c str r0, [r1] - ldr r2, _080435E0 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -137632,19 +133195,9 @@ _08043598: str r0, [r2] bl _080443D0 .align 2, 0 -_080435B8: .4byte 0x0202427c -_080435BC: .4byte 0x02024084 -_080435C0: .4byte 0x0202420b -_080435C4: .4byte 0x0202433c -_080435C8: .4byte 0x0202437c -_080435CC: .4byte 0x0202420c -_080435D0: .4byte 0x0831c898 -_080435D4: .4byte 0x02024332 -_080435D8: .4byte 0x02024214 -_080435DC: .4byte 0x082db67c -_080435E0: .4byte 0x02024280 + .pool _080435E4: - ldr r0, _08043694 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -137652,8 +133205,8 @@ _080435E4: beq _080435F4 bl _0804441E _080435F4: - ldr r1, _08043698 - ldr r0, _0804369C + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -137663,7 +133216,7 @@ _080435F4: bne _0804360A bl _0804441E _0804360A: - ldr r0, _080436A0 + ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -137672,8 +133225,8 @@ _0804360A: beq _0804361C bl _0804441E _0804361C: - ldr r2, _080436A4 - ldr r0, _080436A8 + ldr r2, =0x0202437c + ldr r0, =0x0202420c ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -137692,7 +133245,7 @@ _0804361C: bne _08043644 bl _0804441E _08043644: - ldr r1, _080436AC + ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -137714,14 +133267,14 @@ _0804365C: beq _08043674 bl _0804441E _08043674: - ldr r1, _080436B0 + ldr r1, =0x02024332 movs r0, 0x45 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, _080436B4 - ldr r0, _080436B8 + ldr r1, =0x02024214 + ldr r0, =0x082db67c str r0, [r1] - ldr r2, _080436BC + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -137729,19 +133282,9 @@ _08043674: str r0, [r2] bl _080443D0 .align 2, 0 -_08043694: .4byte 0x0202427c -_08043698: .4byte 0x02024084 -_0804369C: .4byte 0x0202420b -_080436A0: .4byte 0x0202433c -_080436A4: .4byte 0x0202437c -_080436A8: .4byte 0x0202420c -_080436AC: .4byte 0x0831c898 -_080436B0: .4byte 0x02024332 -_080436B4: .4byte 0x02024214 -_080436B8: .4byte 0x082db67c -_080436BC: .4byte 0x02024280 + .pool _080436C0: - ldr r0, _08043770 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -137749,8 +133292,8 @@ _080436C0: beq _080436D0 bl _0804441E _080436D0: - ldr r1, _08043774 - ldr r0, _08043778 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -137760,7 +133303,7 @@ _080436D0: bne _080436E6 bl _0804441E _080436E6: - ldr r0, _0804377C + ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -137769,7 +133312,7 @@ _080436E6: beq _080436F8 bl _0804441E _080436F8: - ldr r1, _08043780 + ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -137781,8 +133324,8 @@ _080436F8: bne _08043710 bl _0804441E _08043710: - ldr r2, _08043784 - ldr r0, _08043788 + ldr r2, =0x0202437c + ldr r0, =0x0202420c ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -137811,14 +133354,14 @@ _08043738: beq _08043750 bl _0804441E _08043750: - ldr r1, _0804378C + ldr r1, =0x02024332 movs r0, 0x43 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor - ldr r1, _08043790 - ldr r0, _08043794 + ldr r1, =0x02024214 + ldr r0, =0x082db67c str r0, [r1] - ldr r2, _08043798 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 6 @@ -137826,19 +133369,9 @@ _08043750: str r0, [r2] bl _080443D0 .align 2, 0 -_08043770: .4byte 0x0202427c -_08043774: .4byte 0x02024084 -_08043778: .4byte 0x0202420b -_0804377C: .4byte 0x0202433c -_08043780: .4byte 0x0831c898 -_08043784: .4byte 0x0202437c -_08043788: .4byte 0x0202420c -_0804378C: .4byte 0x02024332 -_08043790: .4byte 0x02024214 -_08043794: .4byte 0x082db67c -_08043798: .4byte 0x02024280 + .pool _0804379C: - ldr r0, _080438E0 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -137846,8 +133379,8 @@ _0804379C: beq _080437AC bl _0804441E _080437AC: - ldr r6, _080438E4 - ldr r3, _080438E8 + ldr r6, =0x02024084 + ldr r3, =0x0202420b mov r8, r3 ldrb r1, [r3] movs r7, 0x58 @@ -137859,7 +133392,7 @@ _080437AC: bne _080437C6 bl _0804441E _080437C6: - ldr r0, _080438EC + ldr r0, =0x0202433c lsls r1, 4 adds r1, r0 ldrb r0, [r1, 0x1] @@ -137868,7 +133401,7 @@ _080437C6: beq _080437D8 bl _0804441E _080437D8: - ldr r1, _080438F0 + ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -137880,8 +133413,8 @@ _080437D8: bne _080437F0 bl _0804441E _080437F0: - ldr r3, _080438F4 - ldr r5, _080438F8 + ldr r3, =0x0202437c + ldr r5, =0x0202420c ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -137978,7 +133511,7 @@ _080438B6: adds r2, r0, 0 muls r2, r7 adds r2, r4 - ldr r1, _080438FC + ldr r1, =0x0832a328 ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -137988,31 +133521,22 @@ _080438B6: orrs r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _08043900 - ldr r0, _08043904 + ldr r1, =0x02024214 + ldr r0, =0x082db66f str r0, [r1] bl _080443D0 .align 2, 0 -_080438E0: .4byte 0x0202427c -_080438E4: .4byte 0x02024084 -_080438E8: .4byte 0x0202420b -_080438EC: .4byte 0x0202433c -_080438F0: .4byte 0x0831c898 -_080438F4: .4byte 0x0202437c -_080438F8: .4byte 0x0202420c -_080438FC: .4byte 0x0832a328 -_08043900: .4byte 0x02024214 -_08043904: .4byte 0x082db66f + .pool _08043908: movs r5, 0 mov r10, r5 - ldr r0, _0804393C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 bcc _08043918 bl _0804441E _08043918: - ldr r1, _08043940 + ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -138027,14 +133551,12 @@ _08043918: b _08043B96 _08043932: lsls r0, 2 - ldr r1, _08043944 + ldr r1, =_08043948 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804393C: .4byte 0x0202406c -_08043940: .4byte 0x02024084 -_08043944: .4byte _08043948 + .pool .align 2, 0 _08043948: .4byte _08043AAC @@ -138112,19 +133634,17 @@ _08043A50: adds r1, 0x4C adds r0, r1 ldr r0, [r0] - ldr r1, _08043A70 + ldr r1, =0x00000f88 ands r0, r1 cmp r0, 0 bne _08043A6A b _08043B96 _08043A6A: - ldr r0, _08043A74 - ldr r1, _08043A78 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc70 b _08043B5C .align 2, 0 -_08043A70: .4byte 0x00000f88 -_08043A74: .4byte 0x02022f58 -_08043A78: .4byte 0x0831bc70 + .pool _08043A7C: movs r0, 0x58 mov r1, r10 @@ -138140,15 +133660,14 @@ _08043A7C: bne _08043A96 b _08043B96 _08043A96: - ldr r0, _08043AA4 - ldr r1, _08043AA8 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc98 bl gf_strcpy movs r2, 0x2 mov r9, r2 b _08043B9C .align 2, 0 -_08043AA4: .4byte 0x02022f58 -_08043AA8: .4byte 0x0831bc98 + .pool _08043AAC: movs r0, 0x58 mov r3, r10 @@ -138162,12 +133681,11 @@ _08043AAC: ands r0, r1 cmp r0, 0 beq _08043B96 - ldr r0, _08043ACC - ldr r1, _08043AD0 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc80 b _08043B5C .align 2, 0 -_08043ACC: .4byte 0x02022f58 -_08043AD0: .4byte 0x0831bc80 + .pool _08043AD4: movs r0, 0x58 mov r3, r10 @@ -138183,19 +133701,17 @@ _08043AD4: adds r2, 0x50 adds r2, r3, r2 ldr r0, [r2] - ldr r1, _08043B04 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r0, _08043B08 - ldr r1, _08043B0C + ldr r0, =0x02022f58 + ldr r1, =0x0831bc78 bl gf_strcpy movs r0, 0x1 mov r9, r0 b _08043B9C .align 2, 0 -_08043B04: .4byte 0xf7ffffff -_08043B08: .4byte 0x02022f58 -_08043B0C: .4byte 0x0831bc78 + .pool _08043B10: movs r0, 0x58 mov r1, r10 @@ -138209,15 +133725,14 @@ _08043B10: ands r0, r1 cmp r0, 0 beq _08043B96 - ldr r0, _08043B38 - ldr r1, _08043B3C + ldr r0, =0x02022f58 + ldr r1, =0x0831bc88 bl gf_strcpy movs r2, 0x1 mov r9, r2 b _08043B9C .align 2, 0 -_08043B38: .4byte 0x02022f58 -_08043B3C: .4byte 0x0831bc88 + .pool _08043B40: movs r0, 0x58 mov r3, r10 @@ -138231,16 +133746,15 @@ _08043B40: ands r0, r1 cmp r0, 0 beq _08043B96 - ldr r0, _08043B68 - ldr r1, _08043B6C + ldr r0, =0x02022f58 + ldr r1, =0x0831bc90 _08043B5C: bl gf_strcpy movs r5, 0x1 mov r9, r5 b _08043B9C .align 2, 0 -_08043B68: .4byte 0x02022f58 -_08043B6C: .4byte 0x0831bc90 + .pool _08043B70: movs r0, 0x58 mov r1, r10 @@ -138255,8 +133769,8 @@ _08043B70: ands r0, r1 cmp r0, 0 beq _08043B96 - ldr r0, _08043BAC - ldr r1, _08043BB0 + ldr r0, =0x02022f58 + ldr r1, =0x0831bca0 bl gf_strcpy movs r2, 0x3 mov r9, r2 @@ -138274,15 +133788,14 @@ _08043B9C: beq _08043BBC b _08043BFC .align 2, 0 -_08043BAC: .4byte 0x02022f58 -_08043BB0: .4byte 0x0831bca0 + .pool _08043BB4: mov r0, r9 cmp r0, 0x3 beq _08043BE8 b _08043BFC _08043BBC: - ldr r1, _08043BCC + ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -138291,9 +133804,9 @@ _08043BBC: movs r0, 0 b _08043BFA .align 2, 0 -_08043BCC: .4byte 0x02024084 + .pool _08043BD0: - ldr r1, _08043BE4 + ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 muls r2, r0 @@ -138304,34 +133817,34 @@ _08043BD0: negs r1, r1 b _08043BF8 .align 2, 0 -_08043BE4: .4byte 0x02024084 + .pool _08043BE8: - ldr r1, _08043C34 + ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 muls r2, r0 adds r1, 0x50 adds r2, r1 ldr r0, [r2] - ldr r1, _08043C38 + ldr r1, =0xfff0ffff _08043BF8: ands r0, r1 _08043BFA: str r0, [r2] _08043BFC: bl b_movescr_stack_push_cursor - ldr r1, _08043C3C - ldr r0, _08043C40 + ldr r1, =0x02024214 + ldr r0, =0x082db68c str r0, [r1] - ldr r0, _08043C44 + ldr r0, =0x02024474 mov r1, r10 strb r1, [r0, 0x17] - ldr r4, _08043C48 + ldr r4, =0x02024064 strb r1, [r4] ldrb r1, [r4] movs r0, 0x58 muls r0, r1 - ldr r1, _08043C4C + ldr r1, =0x020240d0 adds r0, r1 str r0, [sp] movs r0, 0 @@ -138343,20 +133856,14 @@ _08043BFC: bl dp01_battle_side_mark_buffer_for_execution bl _0804443A .align 2, 0 -_08043C34: .4byte 0x02024084 -_08043C38: .4byte 0xfff0ffff -_08043C3C: .4byte 0x02024214 -_08043C40: .4byte 0x082db68c -_08043C44: .4byte 0x02024474 -_08043C48: .4byte 0x02024064 -_08043C4C: .4byte 0x020240d0 + .pool _08043C50: mov r0, r10 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _08043C68 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 bcs _08043C64 @@ -138364,17 +133871,17 @@ _08043C50: _08043C64: bl _0804441E .align 2, 0 -_08043C68: .4byte 0x0202406c + .pool _08043C6C: movs r2, 0 mov r10, r2 - ldr r0, _08043CB4 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 bcc _08043C7A b _0804441E _08043C7A: - ldr r4, _08043CB8 + ldr r4, =0x02024084 _08043C7C: movs r0, 0x58 mov r3, r10 @@ -138399,21 +133906,20 @@ _08043CA0: lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _08043CB4 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 bcc _08043C7C b _0804441E .align 2, 0 -_08043CB4: .4byte 0x0202406c -_08043CB8: .4byte 0x02024084 + .pool _08043CBC: ldrb r0, [r7] cmp r0, 0x1C beq _08043CC4 b _0804441E _08043CC4: - ldr r4, _08043D24 + ldr r4, =0x02024280 ldr r1, [r4] movs r0, 0x80 lsls r0, 7 @@ -138422,7 +133928,7 @@ _08043CC4: bne _08043CD4 b _0804441E _08043CD4: - ldr r0, _08043D28 + ldr r0, =0xffffbfff ands r1, r0 str r1, [r4] mov r5, r8 @@ -138441,20 +133947,20 @@ _08043CD4: movs r0, 0x2 strb r0, [r1] _08043CF8: - ldr r1, _08043D2C + ldr r1, =0x02024332 mov r2, r8 ldr r0, [r2] adds r0, 0xB2 ldrb r0, [r0] adds r0, 0x40 strb r0, [r1, 0x3] - ldr r1, _08043D30 - ldr r0, _08043D34 + ldr r1, =0x02024474 + ldr r0, =0x0202420c ldrb r0, [r0] strb r0, [r1, 0x17] bl b_movescr_stack_push_cursor - ldr r1, _08043D38 - ldr r0, _08043D3C + ldr r1, =0x02024214 + ldr r0, =0x082db67f str r0, [r1] ldr r0, [r4] movs r1, 0x80 @@ -138463,20 +133969,14 @@ _08043CF8: str r0, [r4] b _080443D0 .align 2, 0 -_08043D24: .4byte 0x02024280 -_08043D28: .4byte 0xffffbfff -_08043D2C: .4byte 0x02024332 -_08043D30: .4byte 0x02024474 -_08043D34: .4byte 0x0202420c -_08043D38: .4byte 0x02024214 -_08043D3C: .4byte 0x082db67f + .pool _08043D40: ldrb r0, [r7] cmp r0, 0x1C beq _08043D48 b _0804441E _08043D48: - ldr r4, _08043DA8 + ldr r4, =0x02024280 ldr r1, [r4] movs r0, 0x80 lsls r0, 7 @@ -138485,7 +133985,7 @@ _08043D48: bne _08043D58 b _0804441E _08043D58: - ldr r0, _08043DAC + ldr r0, =0xffffbfff ands r1, r0 str r1, [r4] mov r3, r8 @@ -138504,19 +134004,19 @@ _08043D58: movs r0, 0x2 strb r0, [r1] _08043D7C: - ldr r1, _08043DB0 + ldr r1, =0x02024332 mov r3, r8 ldr r0, [r3] adds r0, 0xB2 ldrb r0, [r0] strb r0, [r1, 0x3] - ldr r1, _08043DB4 - ldr r0, _08043DB8 + ldr r1, =0x02024474 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r1, 0x17] bl b_movescr_stack_push_cursor - ldr r1, _08043DBC - ldr r0, _08043DC0 + ldr r1, =0x02024214 + ldr r0, =0x082db67f str r0, [r1] ldr r0, [r4] movs r1, 0x80 @@ -138525,24 +134025,18 @@ _08043D7C: str r0, [r4] b _080443D0 .align 2, 0 -_08043DA8: .4byte 0x02024280 -_08043DAC: .4byte 0xffffbfff -_08043DB0: .4byte 0x02024332 -_08043DB4: .4byte 0x02024474 -_08043DB8: .4byte 0x0202420b -_08043DBC: .4byte 0x02024214 -_08043DC0: .4byte 0x082db67f + .pool _08043DC4: movs r4, 0 - ldr r0, _08043DFC + ldr r0, =0x0202406c ldrb r1, [r0] cmp r4, r1 blt _08043DD0 b _0804441E _08043DD0: - ldr r0, _08043E00 + ldr r0, =0x02024084 adds r5, r1, 0 - ldr r2, _08043E04 + ldr r2, =0x020242ac adds r3, r0, 0 adds r3, 0x20 movs r6, 0x80 @@ -138564,20 +134058,18 @@ _08043DEE: blt _08043DDE b _0804441E .align 2, 0 -_08043DFC: .4byte 0x0202406c -_08043E00: .4byte 0x02024084 -_08043E04: .4byte 0x020242ac + .pool _08043E08: movs r4, 0 - ldr r0, _08043EE4 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _08043E14 b _0804441E _08043E14: - ldr r5, _08043EE8 + ldr r5, =0x02024064 mov r8, r5 - ldr r0, _08043EEC + ldr r0, =0x02024084 adds r0, 0x20 str r0, [sp, 0x1C] movs r1, 0 @@ -138589,7 +134081,7 @@ _08043E22: beq _08043E2C b _08043FBE _08043E2C: - ldr r0, _08043EF0 + ldr r0, =0x020242ac ldr r3, [sp, 0x20] adds r0, r3, r0 ldr r1, [r0] @@ -138616,7 +134108,7 @@ _08043E42: bl battle_get_side_with_given_state lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08043EF4 + ldr r0, =0x02022fec ldr r0, [r0] movs r2, 0x1 ands r0, r2 @@ -138627,7 +134119,7 @@ _08043E74: movs r1, 0x58 adds r0, r6, 0 muls r0, r1 - ldr r3, _08043EEC + ldr r3, =0x02024084 adds r1, r0, r3 adds r0, r1, 0 adds r0, 0x20 @@ -138663,7 +134155,7 @@ _08043E74: ldrb r0, [r2] movs r3, 0x58 muls r0, r3 - ldr r5, _08043EEC + ldr r5, =0x02024084 adds r0, r5 adds r0, 0x20 ldrb r0, [r0] @@ -138674,18 +134166,13 @@ _08043E74: adds r0, r5 adds r0, 0x20 ldrb r0, [r0] - ldr r2, _08043EF8 + ldr r2, =0x0202420a strb r0, [r2] b _08043FAC .align 2, 0 -_08043EE4: .4byte 0x0202406c -_08043EE8: .4byte 0x02024064 -_08043EEC: .4byte 0x02024084 -_08043EF0: .4byte 0x020242ac -_08043EF4: .4byte 0x02022fec -_08043EF8: .4byte 0x0202420a + .pool _08043EFC: - ldr r3, _08043F3C + ldr r3, =0x02024084 movs r2, 0x58 adds r0, r6, 0 muls r0, r2 @@ -138717,9 +134204,9 @@ _08043EFC: ldrb r0, [r0] b _08043FA8 .align 2, 0 -_08043F3C: .4byte 0x02024084 + .pool _08043F40: - ldr r3, _08043F80 + ldr r3, =0x02024084 movs r2, 0x58 adds r0, r7, 0 muls r0, r2 @@ -138751,14 +134238,14 @@ _08043F40: ldrb r0, [r0] b _08043FA8 .align 2, 0 -_08043F80: .4byte 0x02024084 + .pool _08043F84: mov r2, r8 strb r6, [r2] movs r3, 0x58 adds r0, r6, 0 muls r0, r3 - ldr r5, _08043FD8 + ldr r5, =0x02024084 adds r0, r5 adds r2, r0, 0 adds r2, 0x20 @@ -138772,7 +134259,7 @@ _08043F84: strb r1, [r0] ldrb r0, [r2] _08043FA8: - ldr r1, _08043FDC + ldr r1, =0x0202420a strb r0, [r1] _08043FAC: mov r0, r9 @@ -138793,7 +134280,7 @@ _08043FBE: adds r5, 0x4 str r5, [sp, 0x20] adds r4, 0x1 - ldr r0, _08043FE0 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 bge _08043FD6 @@ -138801,20 +134288,18 @@ _08043FBE: _08043FD6: b _0804441E .align 2, 0 -_08043FD8: .4byte 0x02024084 -_08043FDC: .4byte 0x0202420a -_08043FE0: .4byte 0x0202406c + .pool _08043FE4: movs r4, 0 - ldr r0, _0804401C + ldr r0, =0x0202406c ldrb r1, [r0] cmp r4, r1 blt _08043FF0 b _0804441E _08043FF0: - ldr r0, _08044020 + ldr r0, =0x02024084 adds r5, r1, 0 - ldr r2, _08044024 + ldr r2, =0x020242ac adds r3, r0, 0 adds r3, 0x20 movs r6, 0x80 @@ -138836,22 +134321,20 @@ _0804400E: blt _08043FFE b _0804441E .align 2, 0 -_0804401C: .4byte 0x0202406c -_08044020: .4byte 0x02024084 -_08044024: .4byte 0x020242ac + .pool _08044028: mov r0, r10 bl battle_side_get_owner lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _08044078 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _0804403E b _0804441E _0804403E: - ldr r7, _0804407C + ldr r7, =0x02024084 _08044040: lsls r0, r4, 24 lsrs r0, 24 @@ -138868,35 +134351,33 @@ _08044040: ldrb r0, [r0] cmp r0, r6 bne _0804406A - ldr r0, _08044080 + ldr r0, =0x0202420a strb r6, [r0] lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 _0804406A: adds r4, r3, 0 - ldr r0, _08044078 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _08044040 b _0804441E .align 2, 0 -_08044078: .4byte 0x0202406c -_0804407C: .4byte 0x02024084 -_08044080: .4byte 0x0202420a + .pool _08044084: mov r0, r10 bl battle_side_get_owner lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _080440D4 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _0804409A b _0804441E _0804409A: - ldr r7, _080440D8 + ldr r7, =0x02024084 _0804409C: lsls r0, r4, 24 lsrs r0, 24 @@ -138913,22 +134394,20 @@ _0804409C: ldrb r0, [r0] cmp r0, r6 bne _080440C6 - ldr r0, _080440DC + ldr r0, =0x0202420a strb r6, [r0] lsls r0, r3, 24 lsrs r0, 24 mov r9, r0 _080440C6: adds r4, r3, 0 - ldr r0, _080440D4 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _0804409C b _0804441E .align 2, 0 -_080440D4: .4byte 0x0202406c -_080440D8: .4byte 0x02024084 -_080440DC: .4byte 0x0202420a + .pool _080440E0: ldrb r0, [r7] cmp r0, 0xFD @@ -138936,27 +134415,26 @@ _080440E0: cmp r0, 0xFE beq _0804413C movs r4, 0 - ldr r0, _080440FC + ldr r0, =0x0202406c adds r5, r0, 0 ldrb r0, [r5] cmp r4, r0 blt _080440F8 b _0804441E _080440F8: - ldr r2, _08044100 + ldr r2, =0x02024084 b _08044174 .align 2, 0 -_080440FC: .4byte 0x0202406c -_08044100: .4byte 0x02024084 + .pool _08044104: movs r4, 0 - ldr r0, _08044134 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _08044110 b _0804441E _08044110: - ldr r5, _08044138 + ldr r5, =0x020242ac movs r2, 0x80 lsls r2, 9 adds r1, r0, 0 @@ -138977,17 +134455,16 @@ _0804412C: blt _08044118 b _0804441E .align 2, 0 -_08044134: .4byte 0x0202406c -_08044138: .4byte 0x020242ac + .pool _0804413C: movs r4, 0 - ldr r0, _0804416C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _08044148 b _0804441E _08044148: - ldr r5, _08044170 + ldr r5, =0x020242ac movs r2, 0x80 lsls r2, 10 adds r1, r0, 0 @@ -139008,8 +134485,7 @@ _08044164: blt _08044150 b _0804441E .align 2, 0 -_0804416C: .4byte 0x0202406c -_08044170: .4byte 0x020242ac + .pool _08044174: movs r0, 0x58 muls r0, r4 @@ -139031,13 +134507,13 @@ _0804418C: b _0804441E _08044196: movs r4, 0 - ldr r0, _080441D4 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _080441A2 b _0804441E _080441A2: - ldr r2, _080441D8 + ldr r2, =0x02024084 mov r8, r2 adds r2, r0, 0 movs r5, 0x58 @@ -139065,20 +134541,19 @@ _080441CC: blt _080441AA b _0804441E .align 2, 0 -_080441D4: .4byte 0x0202406c -_080441D8: .4byte 0x02024084 + .pool _080441DC: movs r4, 0 - ldr r0, _08044214 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _080441E8 b _0804441E _080441E8: - ldr r7, _08044218 + ldr r7, =0x02024084 adds r1, r0, 0 movs r5, 0x58 - ldr r2, _0804421C + ldr r2, =0x0202420a _080441F0: adds r0, r4, 0 muls r0, r5 @@ -139100,22 +134575,20 @@ _0804420C: blt _080441F0 b _0804441E .align 2, 0 -_08044214: .4byte 0x0202406c -_08044218: .4byte 0x02024084 -_0804421C: .4byte 0x0202420a + .pool _08044220: mov r0, r10 bl battle_side_get_owner lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _08044270 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _08044236 b _0804441E _08044236: - ldr r7, _08044274 + ldr r7, =0x02024084 _08044238: lsls r0, r4, 24 lsrs r0, 24 @@ -139131,7 +134604,7 @@ _08044238: ldrb r0, [r0] cmp r0, r6 bne _08044264 - ldr r0, _08044278 + ldr r0, =0x0202420a strb r6, [r0] mov r0, r9 adds r0, 0x1 @@ -139140,28 +134613,26 @@ _08044238: mov r9, r0 _08044264: adds r4, 0x1 - ldr r0, _08044270 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _08044238 b _0804441E .align 2, 0 -_08044270: .4byte 0x0202406c -_08044274: .4byte 0x02024084 -_08044278: .4byte 0x0202420a + .pool _0804427C: mov r0, r10 bl battle_side_get_owner lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _080442CC + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _08044292 b _0804441E _08044292: - ldr r7, _080442D0 + ldr r7, =0x02024084 _08044294: lsls r0, r4, 24 lsrs r0, 24 @@ -139177,7 +134648,7 @@ _08044294: ldrb r0, [r0] cmp r0, r6 bne _080442C0 - ldr r0, _080442D4 + ldr r0, =0x0202420a strb r6, [r0] mov r0, r9 adds r0, 0x1 @@ -139186,22 +134657,20 @@ _08044294: mov r9, r0 _080442C0: adds r4, 0x1 - ldr r0, _080442CC + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _08044294 b _0804441E .align 2, 0 -_080442CC: .4byte 0x0202406c -_080442D0: .4byte 0x02024084 -_080442D4: .4byte 0x0202420a + .pool _080442D8: - ldr r0, _080442F0 + ldr r0, =0x082db4a9 bl b_push_move_exec - ldr r0, _080442F4 + ldr r0, =0x02024474 strb r6, [r0, 0x17] _080442E2: - ldr r0, _080442F8 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x7F mov r1, r9 @@ -139209,16 +134678,14 @@ _080442E2: strb r1, [r0] b _0804441E .align 2, 0 -_080442F0: .4byte 0x082db4a9 -_080442F4: .4byte 0x02024474 -_080442F8: .4byte 0x0202449c + .pool _080442FC: - ldr r0, _08044318 + ldr r0, =0x082db4a9 bl b_push_move_exec - ldr r0, _0804431C + ldr r0, =0x02024474 mov r5, r10 strb r5, [r0, 0x17] - ldr r0, _08044320 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x7F mov r1, r9 @@ -139226,42 +134693,39 @@ _080442FC: strb r1, [r0] b _0804443A .align 2, 0 -_08044318: .4byte 0x082db4a9 -_0804431C: .4byte 0x02024474 -_08044320: .4byte 0x0202449c + .pool _08044324: strb r1, [r7] ldr r0, [r2] - ldr r1, _08044338 + ldr r1, =0xfff7ffff ands r0, r1 str r0, [r2] - ldr r0, _0804433C + ldr r0, =0x082db4b8 bl b_push_move_exec b _080443C8 .align 2, 0 -_08044338: .4byte 0xfff7ffff -_0804433C: .4byte 0x082db4b8 + .pool _08044340: - ldr r0, _08044390 + ldr r0, =0x082db452 bl b_push_move_exec - ldr r1, _08044394 + ldr r1, =0x020242ac ldr r0, [sp, 0x18] adds r1, r0, r1 ldr r0, [r1] - ldr r2, _08044398 + ldr r2, =0xffefffff ands r0, r2 str r0, [r1] - ldr r0, _0804439C + ldr r0, =0x02024474 strb r4, [r0, 0x17] - ldr r1, _080443A0 + ldr r1, =0x02022f58 movs r4, 0xFD strb r4, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r2, _080443A4 + ldr r2, =0x02024064 ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, _080443A8 + ldr r3, =0x0202406e ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -139269,11 +134733,11 @@ _08044340: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _080443AC + ldr r1, =0x02022f68 strb r4, [r1] movs r0, 0x9 strb r0, [r1, 0x1] - ldr r0, _080443B0 + ldr r0, =0x0202420a ldrb r0, [r0] strb r0, [r1, 0x2] movs r0, 0x1 @@ -139281,27 +134745,19 @@ _08044340: strb r0, [r1, 0x3] b _0804441E .align 2, 0 -_08044390: .4byte 0x082db452 -_08044394: .4byte 0x020242ac -_08044398: .4byte 0xffefffff -_0804439C: .4byte 0x02024474 -_080443A0: .4byte 0x02022f58 -_080443A4: .4byte 0x02024064 -_080443A8: .4byte 0x0202406e -_080443AC: .4byte 0x02022f68 -_080443B0: .4byte 0x0202420a + .pool _080443B4: strb r1, [r7] ldr r0, [r2] - ldr r1, _080443DC + ldr r1, =0xfff7ffff ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _080443E0 - ldr r0, _080443E4 + ldr r1, =0x02024214 + ldr r0, =0x082db4c1 str r0, [r1] _080443C8: - ldr r0, _080443E8 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xD8 strb r4, [r0] @@ -139313,21 +134769,18 @@ _080443D0: mov r9, r0 b _0804441E .align 2, 0 -_080443DC: .4byte 0xfff7ffff -_080443E0: .4byte 0x02024214 -_080443E4: .4byte 0x082db4c1 -_080443E8: .4byte 0x0202449c + .pool _080443EC: movs r4, 0 - ldr r0, _0804444C + ldr r0, =0x0202406c ldrb r1, [r0] cmp r4, r1 bge _0804441E - ldr r0, _08044450 + ldr r0, =0x02024084 adds r2, r1, 0 adds r1, r0, 0 adds r1, 0x20 - ldr r3, _08044454 + ldr r3, =0x0202420a _08044400: ldrb r0, [r1] cmp r0, r6 @@ -139353,7 +134806,7 @@ _08044424: ldr r2, [sp, 0x4] cmp r2, 0xB bhi _0804443A - ldr r1, _08044454 + ldr r1, =0x0202420a ldrb r0, [r1] cmp r0, 0xFF beq _0804443A @@ -139371,16 +134824,14 @@ _0804443A: pop {r1} bx r1 .align 2, 0 -_0804444C: .4byte 0x0202406c -_08044450: .4byte 0x02024084 -_08044454: .4byte 0x0202420a + .pool thumb_func_end ability_something thumb_func_start b_call_bc_move_exec b_call_bc_move_exec: @ 8044458 - ldr r1, _08044484 + ldr r1, =0x02024214 str r0, [r1] - ldr r0, _08044488 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0xC] adds r3, r2, 0 @@ -139391,21 +134842,17 @@ b_call_bc_move_exec: @ 8044458 lsls r0, 24 lsrs r0, 22 adds r2, r0 - ldr r1, _0804448C + ldr r1, =0x03005d04 ldr r0, [r1] str r0, [r2] - ldr r0, _08044490 + ldr r0, =bc_move_exec_returning + 1 str r0, [r1] - ldr r1, _08044494 + ldr r1, =0x02024083 movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_08044484: .4byte 0x02024214 -_08044488: .4byte 0x020244a8 -_0804448C: .4byte 0x03005d04 -_08044490: .4byte bc_move_exec_returning + 1 -_08044494: .4byte 0x02024083 + .pool thumb_func_end b_call_bc_move_exec thumb_func_start b_push_move_exec @@ -139413,9 +134860,9 @@ b_push_move_exec: @ 8044498 push {r4,lr} adds r4, r0, 0 bl b_movescr_stack_push_cursor - ldr r0, _080444CC + ldr r0, =0x02024214 str r4, [r0] - ldr r0, _080444D0 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0xC] adds r3, r2, 0 @@ -139426,19 +134873,16 @@ b_push_move_exec: @ 8044498 lsls r0, 24 lsrs r0, 22 adds r2, r0 - ldr r1, _080444D4 + ldr r1, =0x03005d04 ldr r0, [r1] str r0, [r2] - ldr r0, _080444D8 + ldr r0, =sub_803E08C + 1 str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_080444CC: .4byte 0x02024214 -_080444D0: .4byte 0x020244a8 -_080444D4: .4byte 0x03005d04 -_080444D8: .4byte sub_803E08C + 1 + .pool thumb_func_end b_push_move_exec thumb_func_start berry_effects_maybe @@ -139462,8 +134906,8 @@ berry_effects_maybe: @ 80444DC str r1, [sp, 0xC] add r0, sp, 0x4 strb r1, [r0] - ldr r4, _08044528 - ldr r1, _0804452C + ldr r4, =0x02024208 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 adds r0, r1 @@ -139473,7 +134917,7 @@ berry_effects_maybe: @ 80444DC lsrs r0, 16 cmp r0, 0xAF bne _08044534 - ldr r1, _08044530 + ldr r1, =0x02024404 lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -139482,9 +134926,7 @@ berry_effects_maybe: @ 80444DC ldrb r0, [r0, 0x1A] b _08044548 .align 2, 0 -_08044528: .4byte 0x02024208 -_0804452C: .4byte 0x02024084 -_08044530: .4byte 0x02024404 + .pool _08044534: ldrh r0, [r4] bl itemid_get_x12 @@ -139496,8 +134938,8 @@ _08044534: lsrs r0, 24 _08044548: mov r9, r0 - ldr r1, _08044570 - ldr r0, _08044574 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -139506,7 +134948,7 @@ _08044548: str r0, [sp, 0x14] cmp r0, 0xAF bne _0804457C - ldr r1, _08044578 + ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -139516,9 +134958,7 @@ _08044548: ldrb r0, [r0, 0x1A] b _08044592 .align 2, 0 -_08044570: .4byte 0x02024084 -_08044574: .4byte 0x0202420b -_08044578: .4byte 0x02024404 + .pool _0804457C: ldr r0, [sp, 0x14] bl itemid_get_x12 @@ -139531,8 +134971,8 @@ _0804457C: lsrs r0, 24 _08044592: str r0, [sp, 0x10] - ldr r2, _080445C8 - ldr r0, _080445CC + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -139551,14 +134991,12 @@ _080445B2: bl _0804582A _080445BC: lsls r0, 2 - ldr r1, _080445D0 + ldr r1, =_080445D4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080445C8: .4byte 0x02024084 -_080445CC: .4byte 0x0202420c -_080445D0: .4byte _080445D4 + .pool .align 2, 0 _080445D4: .4byte _080445E8 @@ -139580,16 +135018,16 @@ _080445F4: beq _08044604 bl _0804582A _08044604: - ldr r0, _08044614 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x4A movs r1, 0x2 strb r1, [r0] bl _0804582A .align 2, 0 -_08044614: .4byte 0x0202449c + .pool _08044618: - ldr r1, _08044670 + ldr r1, =0x02024084 mov r8, r1 movs r0, 0x58 adds r1, r7, 0 @@ -139621,26 +135059,21 @@ _0804463C: bne _08044654 bl _0804582A _08044654: - ldr r0, _08044674 + ldr r0, =0x02024474 strb r7, [r0, 0x17] - ldr r0, _08044678 + ldr r0, =0x0202420f strb r7, [r0] - ldr r1, _0804467C - ldr r0, _08044680 + ldr r1, =0x02024064 + ldr r0, =0x0202420b strb r7, [r0] strb r7, [r1] - ldr r0, _08044684 + ldr r0, =0x082db7ae bl b_call_bc_move_exec bl _0804582A .align 2, 0 -_08044670: .4byte 0x02024084 -_08044674: .4byte 0x02024474 -_08044678: .4byte 0x0202420f -_0804467C: .4byte 0x02024064 -_08044680: .4byte 0x0202420b -_08044684: .4byte 0x082db7ae + .pool _08044688: - ldr r1, _080446B0 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 adds r0, r1 @@ -139656,13 +135089,12 @@ _0804469C: bl _080451D6 _080446A6: lsls r0, 2 - ldr r1, _080446B4 + ldr r1, =_080446B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080446B0: .4byte 0x02024084 -_080446B4: .4byte _080446B8 + .pool .align 2, 0 _080446B8: .4byte _08044764 @@ -139724,7 +135156,7 @@ _0804477A: beq _08044782 bl _080451D6 _08044782: - ldr r4, _080447A8 + ldr r4, =0x020241f0 mov r3, r9 str r3, [r4] ldrh r3, [r2, 0x28] @@ -139739,12 +135171,11 @@ _08044798: ldr r0, [r4] negs r0, r0 str r0, [r4] - ldr r0, _080447AC + ldr r0, =0x082db7c4 bl b_call_bc_move_exec b _08044B02 .align 2, 0 -_080447A8: .4byte 0x020241f0 -_080447AC: .4byte 0x082db7c4 + .pool _080447B0: cmp r6, 0 beq _080447B8 @@ -139755,25 +135186,24 @@ _080447B8: lsls r0, 24 cmp r0, 0 bne _080447DC - ldr r1, _080447D4 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080447D8 + ldr r0, =0x020244ec b _080447EA .align 2, 0 -_080447D4: .4byte 0x0202406e -_080447D8: .4byte 0x020244ec + .pool _080447DC: - ldr r1, _08044858 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0804485C + ldr r0, =0x02024744 _080447EA: adds r4, r1, r0 movs r1, 0 @@ -139829,13 +135259,12 @@ _08044836: strb r2, [r0] b _08044864 .align 2, 0 -_08044858: .4byte 0x0202406e -_0804485C: .4byte 0x02024744 + .pool _08044860: add r0, sp, 0x4 strb r1, [r0] _08044864: - ldr r1, _080448A4 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -139845,7 +135274,7 @@ _08044864: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r0, _080448A8 + ldr r0, =0x082db7e1 bl b_call_bc_move_exec mov r1, r10 adds r1, 0x9 @@ -139857,18 +135286,16 @@ _08044864: movs r2, 0 movs r3, 0x1 bl dp01_build_cmdbuf_x02_a_b_varargs - ldr r0, _080448AC + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution movs r0, 0x3 str r0, [sp, 0xC] bl _080451DE .align 2, 0 -_080448A4: .4byte 0x02022f58 -_080448A8: .4byte 0x082db7e1 -_080448AC: .4byte 0x02024064 + .pool _080448B0: - ldr r0, _08044904 + ldr r0, =0x02024084 movs r1, 0x58 muls r1, r7 adds r0, 0x18 @@ -139899,24 +135326,19 @@ _080448CE: bne _080448EA bl _0804582A _080448EA: - ldr r0, _08044908 + ldr r0, =0x02024474 strb r7, [r0, 0x17] - ldr r0, _0804490C + ldr r0, =0x0202420f strb r7, [r0] - ldr r1, _08044910 - ldr r0, _08044914 + ldr r1, =0x02024064 + ldr r0, =0x0202420b strb r7, [r0] strb r7, [r1] - ldr r0, _08044918 + ldr r0, =0x082db7ae bl b_call_bc_move_exec bl _080451D6 .align 2, 0 -_08044904: .4byte 0x02024084 -_08044908: .4byte 0x02024474 -_0804490C: .4byte 0x0202420f -_08044910: .4byte 0x02024064 -_08044914: .4byte 0x0202420b -_08044918: .4byte 0x082db7ae + .pool _0804491C: movs r0, 0x58 muls r0, r7 @@ -139932,7 +135354,7 @@ _08044930: beq _08044938 bl _080451D6 _08044938: - ldr r3, _08044974 + ldr r3, =0x020241f0 ldrh r0, [r1, 0x2C] lsrs r0, 4 str r0, [r3] @@ -139953,7 +135375,7 @@ _08044958: ldr r0, [r3] negs r0, r0 str r0, [r3] - ldr r0, _08044978 + ldr r0, =0x082db7f1 bl b_call_bc_move_exec movs r0, 0x4 str r0, [sp, 0xC] @@ -139962,8 +135384,7 @@ _08044958: bl b_history__record_item_x12_of_player bl _080451D6 .align 2, 0 -_08044974: .4byte 0x020241f0 -_08044978: .4byte 0x082db7f1 + .pool _0804497C: movs r0, 0x58 adds r1, r7, 0 @@ -139982,7 +135403,7 @@ _08044996: beq _0804499E bl _080451D6 _0804499E: - ldr r1, _080449F4 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -139990,7 +135411,7 @@ _0804499E: strb r6, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r5, _080449F8 + ldr r5, =0x020241f0 ldrh r0, [r4, 0x2C] mov r1, r9 bl __divsi3 @@ -140026,8 +135447,7 @@ _080449D2: _080449F0: b _08044B90 .align 2, 0 -_080449F4: .4byte 0x02022f58 -_080449F8: .4byte 0x020241f0 + .pool _080449FC: movs r0, 0x58 adds r5, r7, 0 @@ -140045,7 +135465,7 @@ _08044A14: beq _08044A1C bl _080451D6 _08044A1C: - ldr r1, _08044A70 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -140054,7 +135474,7 @@ _08044A1C: strb r6, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r4, _08044A74 + ldr r4, =0x020241f0 ldrh r0, [r5, 0x2C] mov r1, r9 bl __divsi3 @@ -140089,8 +135509,7 @@ _08044A50: _08044A6E: b _08044C24 .align 2, 0 -_08044A70: .4byte 0x02022f58 -_08044A74: .4byte 0x020241f0 + .pool _08044A78: movs r0, 0x58 adds r3, r7, 0 @@ -140109,7 +135528,7 @@ _08044A90: beq _08044A96 b _080451D6 _08044A96: - ldr r1, _08044AF0 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -140118,7 +135537,7 @@ _08044A96: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r4, _08044AF4 + ldr r4, =0x020241f0 ldrh r0, [r5, 0x2C] mov r1, r9 bl __divsi3 @@ -140150,22 +135569,20 @@ _08044ACC: lsls r0, 24 cmp r0, 0 bge _08044AFC - ldr r0, _08044AF8 + ldr r0, =0x082db824 bl b_call_bc_move_exec b _08044B02 .align 2, 0 -_08044AF0: .4byte 0x02022f58 -_08044AF4: .4byte 0x020241f0 -_08044AF8: .4byte 0x082db824 + .pool _08044AFC: - ldr r0, _08044B08 + ldr r0, =0x082db7c4 bl b_call_bc_move_exec _08044B02: movs r0, 0x4 str r0, [sp, 0xC] b _080451DE .align 2, 0 -_08044B08: .4byte 0x082db7c4 + .pool _08044B0C: movs r0, 0x58 adds r1, r7, 0 @@ -140184,7 +135601,7 @@ _08044B24: beq _08044B2A b _080451D6 _08044B2A: - ldr r1, _08044B84 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -140193,7 +135610,7 @@ _08044B2A: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r4, _08044B88 + ldr r4, =0x020241f0 ldrh r0, [r5, 0x2C] mov r1, r9 bl __divsi3 @@ -140226,22 +135643,20 @@ _08044B60: cmp r0, 0 bge _08044B90 _08044B7C: - ldr r0, _08044B8C + ldr r0, =0x082db824 bl b_call_bc_move_exec b _08044B96 .align 2, 0 -_08044B84: .4byte 0x02022f58 -_08044B88: .4byte 0x020241f0 -_08044B8C: .4byte 0x082db824 + .pool _08044B90: - ldr r0, _08044B9C + ldr r0, =0x082db7c4 bl b_call_bc_move_exec _08044B96: movs r3, 0x4 str r3, [sp, 0xC] b _080451DE .align 2, 0 -_08044B9C: .4byte 0x082db7c4 + .pool _08044BA0: movs r0, 0x58 adds r5, r7, 0 @@ -140259,7 +135674,7 @@ _08044BB6: beq _08044BBC b _080451D6 _08044BBC: - ldr r1, _08044C18 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x8 @@ -140268,7 +135683,7 @@ _08044BBC: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r4, _08044C1C + ldr r4, =0x020241f0 ldrh r0, [r5, 0x2C] mov r1, r9 bl __divsi3 @@ -140301,22 +135716,20 @@ _08044BF2: cmp r0, 0 bge _08044C24 _08044C0E: - ldr r0, _08044C20 + ldr r0, =0x082db824 bl b_call_bc_move_exec b _08044C2A .align 2, 0 -_08044C18: .4byte 0x02022f58 -_08044C1C: .4byte 0x020241f0 -_08044C20: .4byte 0x082db824 + .pool _08044C24: - ldr r0, _08044C30 + ldr r0, =0x082db7c4 bl b_call_bc_move_exec _08044C2A: movs r2, 0x4 str r2, [sp, 0xC] b _080451DE .align 2, 0 -_08044C30: .4byte 0x082db7c4 + .pool _08044C34: movs r0, 0x58 muls r0, r7 @@ -140340,7 +135753,7 @@ _08044C52: ble _08044C5C b _080451D6 _08044C5C: - ldr r1, _08044C8C + ldr r1, =0x02022f58 movs r2, 0xFD strb r2, [r1] movs r0, 0x5 @@ -140349,7 +135762,7 @@ _08044C5C: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, _08044C90 + ldr r1, =0x02022f68 strb r2, [r1] strb r6, [r1, 0x1] movs r0, 0xD2 @@ -140357,18 +135770,15 @@ _08044C5C: strb r6, [r1, 0x3] subs r0, 0xD3 strb r0, [r1, 0x4] - ldr r0, _08044C94 + ldr r0, =0x0202420e strb r7, [r0] - ldr r1, _08044C98 + ldr r1, =0x02024474 movs r0, 0x11 strb r0, [r1, 0x1A] movs r0, 0xF b _08044DF0 .align 2, 0 -_08044C8C: .4byte 0x02022f58 -_08044C90: .4byte 0x02022f68 -_08044C94: .4byte 0x0202420e -_08044C98: .4byte 0x02024474 + .pool _08044C9C: movs r0, 0x58 muls r0, r7 @@ -140392,7 +135802,7 @@ _08044CBA: ble _08044CC4 b _080451D6 _08044CC4: - ldr r1, _08044CE4 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -140401,17 +135811,15 @@ _08044CC4: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r0, _08044CE8 + ldr r0, =0x0202420e strb r7, [r0] - ldr r1, _08044CEC + ldr r1, =0x02024474 movs r0, 0x12 strb r0, [r1, 0x1A] movs r0, 0x10 b _08044D8A .align 2, 0 -_08044CE4: .4byte 0x02022f58 -_08044CE8: .4byte 0x0202420e -_08044CEC: .4byte 0x02024474 + .pool _08044CF0: movs r0, 0x58 muls r0, r7 @@ -140435,7 +135843,7 @@ _08044D0E: ble _08044D18 b _080451D6 _08044D18: - ldr r1, _08044D38 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -140444,17 +135852,15 @@ _08044D18: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r0, _08044D3C + ldr r0, =0x0202420e strb r7, [r0] - ldr r1, _08044D40 + ldr r1, =0x02024474 movs r0, 0x13 strb r0, [r1, 0x1A] movs r0, 0x11 b _08044DF0 .align 2, 0 -_08044D38: .4byte 0x02022f58 -_08044D3C: .4byte 0x0202420e -_08044D40: .4byte 0x02024474 + .pool _08044D44: movs r0, 0x58 muls r0, r7 @@ -140478,7 +135884,7 @@ _08044D62: ble _08044D6C b _080451D6 _08044D6C: - ldr r1, _08044D9C + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -140487,25 +135893,22 @@ _08044D6C: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r0, _08044DA0 + ldr r0, =0x0202420e strb r7, [r0] - ldr r1, _08044DA4 + ldr r1, =0x02024474 movs r0, 0x14 strb r0, [r1, 0x1A] movs r0, 0x12 _08044D8A: strb r0, [r1, 0x10] strb r6, [r1, 0x11] - ldr r0, _08044DA8 + ldr r0, =0x082db84e bl b_call_bc_move_exec movs r2, 0x5 str r2, [sp, 0xC] b _080451DE .align 2, 0 -_08044D9C: .4byte 0x02022f58 -_08044DA0: .4byte 0x0202420e -_08044DA4: .4byte 0x02024474 -_08044DA8: .4byte 0x082db84e + .pool _08044DAC: movs r0, 0x58 muls r0, r7 @@ -140529,7 +135932,7 @@ _08044DCA: ble _08044DD4 b _080451D6 _08044DD4: - ldr r1, _08044E00 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x5 @@ -140537,25 +135940,22 @@ _08044DD4: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r0, _08044E04 + ldr r0, =0x0202420e strb r7, [r0] - ldr r1, _08044E08 + ldr r1, =0x02024474 movs r0, 0x15 strb r0, [r1, 0x1A] movs r0, 0x13 _08044DF0: strb r0, [r1, 0x10] strb r6, [r1, 0x11] - ldr r0, _08044E0C + ldr r0, =0x082db84e bl b_call_bc_move_exec movs r5, 0x5 str r5, [sp, 0xC] b _080451DE .align 2, 0 -_08044E00: .4byte 0x02022f58 -_08044E04: .4byte 0x0202420e -_08044E08: .4byte 0x02024474 -_08044E0C: .4byte 0x082db84e + .pool _08044E10: movs r0, 0x58 adds r5, r7, 0 @@ -140588,13 +135988,13 @@ _08044E30: _08044E46: orrs r2, r3 str r2, [r1] - ldr r0, _08044E58 + ldr r0, =0x082db869 bl b_call_bc_move_exec movs r2, 0x2 str r2, [sp, 0xC] b _080451DE .align 2, 0 -_08044E58: .4byte 0x082db869 + .pool _08044E5C: cmp r6, 0 beq _08044E62 @@ -140647,7 +136047,7 @@ _08044EB4: movs r0, 0x58 muls r0, r7 adds r4, r0, 0x1 - ldr r5, _08044F2C + ldr r5, =0x0202409c _08044EBC: bl GenerateRandomNumber lsls r0, 16 @@ -140664,7 +136064,7 @@ _08044EBC: asrs r0, 24 cmp r0, 0xC beq _08044EBC - ldr r1, _08044F30 + ldr r1, =0x02022f58 movs r2, 0 movs r3, 0xFD strb r3, [r1] @@ -140675,7 +136075,7 @@ _08044EBC: strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r0, _08044F34 + ldr r0, =0x02022f68 strb r3, [r0] strb r2, [r0, 0x1] movs r1, 0xD1 @@ -140687,27 +136087,22 @@ _08044EBC: strb r2, [r0, 0x6] subs r1, 0xD3 strb r1, [r0, 0x7] - ldr r0, _08044F38 + ldr r0, =0x0202420e strb r7, [r0] - ldr r1, _08044F3C + ldr r1, =0x02024474 mov r0, r10 adds r0, 0x21 strb r0, [r1, 0x1A] adds r0, 0x6 strb r0, [r1, 0x10] strb r2, [r1, 0x11] - ldr r0, _08044F40 + ldr r0, =0x082db84e bl b_call_bc_move_exec movs r0, 0x5 str r0, [sp, 0xC] b _080451DE .align 2, 0 -_08044F2C: .4byte 0x0202409c -_08044F30: .4byte 0x02022f58 -_08044F34: .4byte 0x02022f68 -_08044F38: .4byte 0x0202420e -_08044F3C: .4byte 0x02024474 -_08044F40: .4byte 0x082db84e + .pool _08044F44: movs r0, 0x58 adds r1, r7, 0 @@ -140726,13 +136121,13 @@ _08044F5C: negs r0, r0 ands r2, r0 str r2, [r1] - ldr r0, _08044F70 + ldr r0, =0x082db706 bl b_call_bc_move_exec movs r1, 0x1 str r1, [sp, 0xC] b _080451DE .align 2, 0 -_08044F70: .4byte 0x082db706 + .pool _08044F74: movs r0, 0x58 adds r1, r7, 0 @@ -140747,17 +136142,16 @@ _08044F74: bne _08044F8C b _080451D6 _08044F8C: - ldr r0, _08044FA0 + ldr r0, =0xfffff077 ands r2, r0 str r2, [r1] - ldr r0, _08044FA4 + ldr r0, =0x082db71e bl b_call_bc_move_exec movs r2, 0x1 str r2, [sp, 0xC] b _080451DE .align 2, 0 -_08044FA0: .4byte 0xfffff077 -_08044FA4: .4byte 0x082db71e + .pool _08044FA8: movs r0, 0x58 adds r1, r7, 0 @@ -140776,13 +136170,13 @@ _08044FC0: negs r0, r0 ands r2, r0 str r2, [r1] - ldr r0, _08044FD4 + ldr r0, =0x082db736 bl b_call_bc_move_exec movs r3, 0x1 str r3, [sp, 0xC] b _080451DE .align 2, 0 -_08044FD4: .4byte 0x082db736 + .pool _08044FD8: movs r0, 0x58 adds r1, r7, 0 @@ -140801,13 +136195,13 @@ _08044FF0: negs r0, r0 ands r2, r0 str r2, [r1] - ldr r0, _08045004 + ldr r0, =0x082db74e bl b_call_bc_move_exec movs r5, 0x1 str r5, [sp, 0xC] b _080451DE .align 2, 0 -_08045004: .4byte 0x082db74e + .pool _08045008: movs r0, 0x58 adds r3, r7, 0 @@ -140830,14 +136224,13 @@ _08045020: adds r1, 0x50 adds r1, r3, r1 ldr r0, [r1] - ldr r2, _0804503C + ldr r2, =0xf7ffffff ands r0, r2 str r0, [r1] - ldr r0, _08045040 + ldr r0, =0x082db766 b _0804518A .align 2, 0 -_0804503C: .4byte 0xf7ffffff -_08045040: .4byte 0x082db766 + .pool _08045044: movs r0, 0x58 adds r1, r7, 0 @@ -140856,13 +136249,13 @@ _0804505C: negs r0, r0 ands r2, r0 str r2, [r1] - ldr r0, _08045070 + ldr r0, =0x082db77e bl b_call_bc_move_exec movs r1, 0x2 str r1, [sp, 0xC] b _080451DE .align 2, 0 -_08045070: .4byte 0x082db77e + .pool _08045074: movs r0, 0x58 adds r5, r7, 0 @@ -140890,8 +136283,8 @@ _0804509A: ands r2, r0 cmp r2, 0 beq _080450B2 - ldr r0, _08045140 - ldr r1, _08045144 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc70 bl gf_strcpy movs r0, 0x1 mov r10, r0 @@ -140906,11 +136299,11 @@ _080450B2: beq _080450D8 adds r2, r5, r6 ldr r0, [r2] - ldr r1, _08045148 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r0, _08045140 - ldr r1, _0804514C + ldr r0, =0x02022f58 + ldr r1, =0x0831bc78 bl gf_strcpy movs r2, 0x1 add r10, r2 @@ -140920,8 +136313,8 @@ _080450D8: ands r0, r1 cmp r0, 0 beq _080450EE - ldr r0, _08045140 - ldr r1, _08045150 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc80 bl gf_strcpy movs r3, 0x1 add r10, r3 @@ -140931,8 +136324,8 @@ _080450EE: ands r0, r1 cmp r0, 0 beq _08045104 - ldr r0, _08045140 - ldr r1, _08045154 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc88 bl gf_strcpy movs r0, 0x1 add r10, r0 @@ -140942,8 +136335,8 @@ _08045104: ands r0, r1 cmp r0, 0 beq _0804511A - ldr r0, _08045140 - ldr r1, _08045158 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc90 bl gf_strcpy movs r1, 0x1 add r10, r1 @@ -140954,8 +136347,8 @@ _0804511A: ands r0, r2 cmp r0, 0 beq _08045132 - ldr r0, _08045140 - ldr r1, _0804515C + ldr r0, =0x02022f58 + ldr r1, =0x0831bc98 bl gf_strcpy movs r3, 0x1 add r10, r3 @@ -140963,25 +136356,17 @@ _08045132: mov r5, r10 cmp r5, 0x1 bgt _08045164 - ldr r1, _08045160 + ldr r1, =0x02024332 movs r0, 0 b _08045168 .align 2, 0 -_08045140: .4byte 0x02022f58 -_08045144: .4byte 0x0831bc70 -_08045148: .4byte 0xf7ffffff -_0804514C: .4byte 0x0831bc78 -_08045150: .4byte 0x0831bc80 -_08045154: .4byte 0x0831bc88 -_08045158: .4byte 0x0831bc90 -_0804515C: .4byte 0x0831bc98 -_08045160: .4byte 0x02024332 + .pool _08045164: - ldr r1, _08045194 + ldr r1, =0x02024332 movs r0, 0x1 _08045168: strb r0, [r1, 0x5] - ldr r2, _08045198 + ldr r2, =0x02024084 movs r0, 0x58 adds r3, r7, 0 muls r3, r0 @@ -140996,16 +136381,14 @@ _08045168: subs r1, 0x8 ands r0, r1 str r0, [r3] - ldr r0, _0804519C + ldr r0, =0x082db794 _0804518A: bl b_call_bc_move_exec movs r0, 0x1 str r0, [sp, 0xC] b _080451DE .align 2, 0 -_08045194: .4byte 0x02024332 -_08045198: .4byte 0x02024084 -_0804519C: .4byte 0x082db794 + .pool _080451A0: movs r0, 0x58 adds r1, r7, 0 @@ -141019,15 +136402,15 @@ _080451A0: ands r0, r2 cmp r0, 0 beq _080451D6 - ldr r0, _080451FC + ldr r0, =0xfff0ffff ands r2, r0 str r2, [r1] - ldr r0, _08045200 - ldr r1, _08045204 + ldr r0, =0x02022f58 + ldr r1, =0x0831bca0 bl gf_strcpy - ldr r0, _08045208 + ldr r0, =0x082db794 bl b_call_bc_move_exec - ldr r1, _0804520C + ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] movs r1, 0x2 @@ -141038,12 +136421,12 @@ _080451D6: bne _080451DE b _0804582A _080451DE: - ldr r0, _08045210 + ldr r0, =0x02024474 strb r7, [r0, 0x17] - ldr r0, _08045214 + ldr r0, =0x0202420f strb r7, [r0] - ldr r4, _08045218 - ldr r0, _0804521C + ldr r4, =0x02024064 + ldr r0, =0x0202420b strb r7, [r0] strb r7, [r4] ldr r3, [sp, 0xC] @@ -141053,21 +136436,13 @@ _080451DE: beq _08045226 b _0804582A .align 2, 0 -_080451FC: .4byte 0xfff0ffff -_08045200: .4byte 0x02022f58 -_08045204: .4byte 0x0831bca0 -_08045208: .4byte 0x082db794 -_0804520C: .4byte 0x02024332 -_08045210: .4byte 0x02024474 -_08045214: .4byte 0x0202420f -_08045218: .4byte 0x02024064 -_0804521C: .4byte 0x0202420b + .pool _08045220: movs r0, 0x58 muls r0, r7 b _0804568C _08045226: - ldr r4, _08045274 + ldr r4, =0x02024084 movs r0, 0x58 adds r3, r7, 0 muls r3, r0 @@ -141082,14 +136457,14 @@ _08045226: beq _08045242 b _0804582A _08045242: - ldr r1, _08045278 + ldr r1, =0x020242bc lsls r0, r7, 3 subs r0, r7 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _0804527C + ldr r2, =0x0832a328 mov r5, r10 lsls r0, r5, 2 adds r0, r2 @@ -141108,19 +136483,17 @@ _08045262: strb r0, [r1] b _0804582A .align 2, 0 -_08045274: .4byte 0x02024084 -_08045278: .4byte 0x020242bc -_0804527C: .4byte 0x0832a328 + .pool _08045280: movs r7, 0 - ldr r0, _080452B0 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r7, r0 bcc _0804528C b _0804582A _0804528C: - ldr r4, _080452B4 - ldr r1, _080452B8 + ldr r4, =0x02024208 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 adds r0, r1 @@ -141130,7 +136503,7 @@ _0804528C: lsrs r0, 16 cmp r0, 0xAF bne _080452C0 - ldr r1, _080452BC + ldr r1, =0x02024404 lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -141138,10 +136511,7 @@ _0804528C: ldrb r5, [r0, 0x7] b _080452D0 .align 2, 0 -_080452B0: .4byte 0x0202406c -_080452B4: .4byte 0x02024208 -_080452B8: .4byte 0x02024084 -_080452BC: .4byte 0x02024404 + .pool _080452C0: ldrh r0, [r4] bl itemid_get_x12 @@ -141156,12 +136526,12 @@ _080452D0: b _08045674 _080452D8: lsls r0, 2 - ldr r1, _080452E4 + ldr r1, =_080452E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080452E4: .4byte _080452E8 + .pool .align 2, 0 _080452E8: .4byte _08045354 @@ -141192,7 +136562,7 @@ _080452E8: .4byte _08045674 .4byte _080454C8 _08045354: - ldr r1, _08045384 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 adds r1, 0x4C @@ -141209,18 +136579,16 @@ _0804536A: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, _08045388 - ldr r0, _0804538C + ldr r1, =0x02024214 + ldr r0, =0x082db70c str r0, [r1] movs r0, 0x1 str r0, [sp, 0xC] b _0804567A .align 2, 0 -_08045384: .4byte 0x02024084 -_08045388: .4byte 0x02024214 -_0804538C: .4byte 0x082db70c + .pool _08045390: - ldr r1, _080453BC + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 adds r1, 0x4C @@ -141232,23 +136600,20 @@ _08045390: bne _080453A6 b _08045674 _080453A6: - ldr r0, _080453C0 + ldr r0, =0xfffff077 ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, _080453C4 - ldr r0, _080453C8 + ldr r1, =0x02024214 + ldr r0, =0x082db724 str r0, [r1] movs r1, 0x1 str r1, [sp, 0xC] b _0804567A .align 2, 0 -_080453BC: .4byte 0x02024084 -_080453C0: .4byte 0xfffff077 -_080453C4: .4byte 0x02024214 -_080453C8: .4byte 0x082db724 + .pool _080453CC: - ldr r1, _080453FC + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 adds r1, 0x4C @@ -141265,18 +136630,16 @@ _080453E2: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, _08045400 - ldr r0, _08045404 + ldr r1, =0x02024214 + ldr r0, =0x082db73c str r0, [r1] movs r2, 0x1 str r2, [sp, 0xC] b _0804567A .align 2, 0 -_080453FC: .4byte 0x02024084 -_08045400: .4byte 0x02024214 -_08045404: .4byte 0x082db73c + .pool _08045408: - ldr r1, _08045438 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 adds r1, 0x4C @@ -141293,18 +136656,16 @@ _0804541E: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, _0804543C - ldr r0, _08045440 + ldr r1, =0x02024214 + ldr r0, =0x082db754 str r0, [r1] movs r3, 0x1 str r3, [sp, 0xC] b _0804567A .align 2, 0 -_08045438: .4byte 0x02024084 -_0804543C: .4byte 0x02024214 -_08045440: .4byte 0x082db754 + .pool _08045444: - ldr r2, _0804547C + ldr r2, =0x02024084 movs r0, 0x58 adds r4, r7, 0 muls r4, r0 @@ -141325,20 +136686,17 @@ _0804545E: adds r2, 0x50 adds r2, r4, r2 ldr r0, [r2] - ldr r1, _08045480 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _08045484 - ldr r0, _08045488 + ldr r1, =0x02024214 + ldr r0, =0x082db76c b _080455DC .align 2, 0 -_0804547C: .4byte 0x02024084 -_08045480: .4byte 0xf7ffffff -_08045484: .4byte 0x02024214 -_08045488: .4byte 0x082db76c + .pool _0804548C: - ldr r1, _080454BC + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 adds r1, 0x50 @@ -141355,18 +136713,16 @@ _080454A2: ands r1, r0 str r1, [r2] bl b_movescr_stack_push_cursor - ldr r1, _080454C0 - ldr r0, _080454C4 + ldr r1, =0x02024214 + ldr r0, =0x082db784 str r0, [r1] movs r0, 0x2 str r0, [sp, 0xC] b _0804567A .align 2, 0 -_080454BC: .4byte 0x02024084 -_080454C0: .4byte 0x02024214 -_080454C4: .4byte 0x082db784 + .pool _080454C8: - ldr r1, _08045504 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 adds r1, 0x50 @@ -141379,32 +136735,26 @@ _080454C8: bne _080454E0 b _08045674 _080454E0: - ldr r0, _08045508 + ldr r0, =0xfff0ffff ands r1, r0 str r1, [r2] - ldr r0, _0804550C - ldr r1, _08045510 + ldr r0, =0x02022f58 + ldr r1, =0x0831bca0 bl gf_strcpy bl b_movescr_stack_push_cursor - ldr r1, _08045514 + ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] - ldr r1, _08045518 - ldr r0, _0804551C + ldr r1, =0x02024214 + ldr r0, =0x082db79a str r0, [r1] movs r1, 0x2 str r1, [sp, 0xC] b _0804567A .align 2, 0 -_08045504: .4byte 0x02024084 -_08045508: .4byte 0xfff0ffff -_0804550C: .4byte 0x02022f58 -_08045510: .4byte 0x0831bca0 -_08045514: .4byte 0x02024332 -_08045518: .4byte 0x02024214 -_0804551C: .4byte 0x082db79a + .pool _08045520: - ldr r4, _080455E4 + ldr r4, =0x02024084 movs r0, 0x58 adds r5, r7, 0 muls r5, r0 @@ -141429,8 +136779,8 @@ _08045548: ands r2, r0 cmp r2, 0 beq _08045558 - ldr r0, _080455E8 - ldr r1, _080455EC + ldr r0, =0x02022f58 + ldr r1, =0x0831bc70 bl gf_strcpy _08045558: ldr r0, [r6] @@ -141442,11 +136792,11 @@ _08045558: beq _08045578 adds r2, r5, r4 ldr r0, [r2] - ldr r1, _080455F0 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - ldr r0, _080455E8 - ldr r1, _080455F4 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc78 bl gf_strcpy _08045578: ldr r0, [r6] @@ -141454,8 +136804,8 @@ _08045578: ands r0, r1 cmp r0, 0 beq _0804558A - ldr r0, _080455E8 - ldr r1, _080455F8 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc80 bl gf_strcpy _0804558A: ldr r0, [r6] @@ -141463,8 +136813,8 @@ _0804558A: ands r0, r1 cmp r0, 0 beq _0804559C - ldr r0, _080455E8 - ldr r1, _080455FC + ldr r0, =0x02022f58 + ldr r1, =0x0831bc88 bl gf_strcpy _0804559C: ldr r0, [r6] @@ -141472,8 +136822,8 @@ _0804559C: ands r0, r1 cmp r0, 0 beq _080455AE - ldr r0, _080455E8 - ldr r1, _08045600 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc90 bl gf_strcpy _080455AE: adds r5, r4 @@ -141482,8 +136832,8 @@ _080455AE: ands r0, r3 cmp r0, 0 beq _080455C2 - ldr r0, _080455E8 - ldr r1, _08045604 + ldr r0, =0x02022f58 + ldr r1, =0x0831bc98 bl gf_strcpy _080455C2: movs r4, 0 @@ -141494,30 +136844,19 @@ _080455C2: ands r0, r1 str r0, [r5] bl b_movescr_stack_push_cursor - ldr r0, _08045608 + ldr r0, =0x02024332 strb r4, [r0, 0x5] - ldr r1, _0804560C - ldr r0, _08045610 + ldr r1, =0x02024214 + ldr r0, =0x082db79a _080455DC: str r0, [r1] movs r5, 0x1 str r5, [sp, 0xC] b _0804567A .align 2, 0 -_080455E4: .4byte 0x02024084 -_080455E8: .4byte 0x02022f58 -_080455EC: .4byte 0x0831bc70 -_080455F0: .4byte 0xf7ffffff -_080455F4: .4byte 0x0831bc78 -_080455F8: .4byte 0x0831bc80 -_080455FC: .4byte 0x0831bc88 -_08045600: .4byte 0x0831bc90 -_08045604: .4byte 0x0831bc98 -_08045608: .4byte 0x02024332 -_0804560C: .4byte 0x02024214 -_08045610: .4byte 0x082db79a + .pool _08045614: - ldr r0, _08045660 + ldr r0, =0x02024084 mov r8, r0 movs r0, 0x58 adds r1, r7, 0 @@ -141547,37 +136886,33 @@ _08045638: ldr r5, [sp, 0xC] cmp r5, 0 beq _080456B8 - ldr r0, _08045664 + ldr r0, =0x02024474 strb r7, [r0, 0x17] - ldr r0, _08045668 + ldr r0, =0x0202420f strb r7, [r0] bl b_movescr_stack_push_cursor - ldr r1, _0804566C - ldr r0, _08045670 + ldr r1, =0x02024214 + ldr r0, =0x082db7b4 str r0, [r1] b _0804582A .align 2, 0 -_08045660: .4byte 0x02024084 -_08045664: .4byte 0x02024474 -_08045668: .4byte 0x0202420f -_0804566C: .4byte 0x02024214 -_08045670: .4byte 0x082db7b4 + .pool _08045674: ldr r0, [sp, 0xC] cmp r0, 0 beq _080456B8 _0804567A: - ldr r0, _080456A8 + ldr r0, =0x02024474 strb r7, [r0, 0x17] - ldr r0, _080456AC + ldr r0, =0x0202420f strb r7, [r0] - ldr r4, _080456B0 + ldr r4, =0x02024064 strb r7, [r4] ldrb r1, [r4] movs r0, 0x58 muls r0, r1 _0804568C: - ldr r1, _080456B4 + ldr r1, =0x020240d0 adds r0, r1 str r0, [sp] movs r0, 0 @@ -141589,15 +136924,12 @@ _0804568C: bl dp01_battle_side_mark_buffer_for_execution b _0804582A .align 2, 0 -_080456A8: .4byte 0x02024474 -_080456AC: .4byte 0x0202420f -_080456B0: .4byte 0x02024064 -_080456B4: .4byte 0x020240d0 + .pool _080456B8: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080456CC + ldr r0, =0x0202406c ldrb r0, [r0] cmp r7, r0 bcs _080456C8 @@ -141605,9 +136937,9 @@ _080456B8: _080456C8: b _0804582A .align 2, 0 -_080456CC: .4byte 0x0202406c + .pool _080456D0: - ldr r7, _080456E8 + ldr r7, =0x020241f0 ldr r0, [r7] cmp r0, 0 bne _080456DA @@ -141620,9 +136952,9 @@ _080456DA: beq _08045794 b _0804582A .align 2, 0 -_080456E8: .4byte 0x020241f0 + .pool _080456EC: - ldr r0, _08045778 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -141630,8 +136962,8 @@ _080456EC: beq _080456FA b _0804582A _080456FA: - ldr r2, _0804577C - ldr r4, _08045780 + ldr r2, =0x0202437c + ldr r4, =0x0202420c ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -141660,8 +136992,8 @@ _08045720: ldr r2, [sp, 0x10] cmp r0, r2 bcs _0804582A - ldr r2, _08045784 - ldr r0, _08045788 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -141672,7 +137004,7 @@ _08045720: ands r0, r1 cmp r0, 0 beq _0804582A - ldr r2, _0804578C + ldr r2, =0x02024084 ldrb r1, [r4] movs r0, 0x58 muls r0, r1 @@ -141680,7 +137012,7 @@ _08045720: ldrh r0, [r0, 0x28] cmp r0, 0 beq _0804582A - ldr r1, _08045790 + ldr r1, =0x02024332 movs r0, 0x8 strb r0, [r1, 0x3] bl b_movescr_stack_push_cursor @@ -141690,22 +137022,16 @@ _08045720: bl b_movescr_stack_pop_cursor b _0804582A .align 2, 0 -_08045778: .4byte 0x0202427c -_0804577C: .4byte 0x0202437c -_08045780: .4byte 0x0202420c -_08045784: .4byte 0x0831c898 -_08045788: .4byte 0x020241ea -_0804578C: .4byte 0x02024084 -_08045790: .4byte 0x02024332 + .pool _08045794: - ldr r0, _0804583C + ldr r0, =0x0202427c ldrb r0, [r0] movs r5, 0x29 ands r5, r0 cmp r5, 0 bne _0804582A - ldr r1, _08045840 - ldr r4, _08045844 + ldr r1, =0x0202437c + ldr r4, =0x0202420c ldrb r2, [r4] lsls r0, r2, 2 adds r0, r2 @@ -141715,14 +137041,14 @@ _08045794: ldr r1, [r0] cmp r1, 0 beq _0804582A - ldr r0, _08045848 + ldr r0, =0x0000ffff cmp r1, r0 beq _0804582A - ldr r0, _0804584C + ldr r0, =0x0202420b ldrb r3, [r0] cmp r3, r2 beq _0804582A - ldr r2, _08045850 + ldr r2, =0x02024084 ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -141733,13 +137059,13 @@ _08045794: beq _0804582A cmp r1, 0 beq _0804582A - ldr r0, _08045854 + ldr r0, =0x02024208 mov r1, sp ldrh r1, [r1, 0x14] strh r1, [r0] - ldr r0, _08045858 + ldr r0, =0x0202420f strb r3, [r0] - ldr r0, _0804585C + ldr r0, =0x02024474 strb r3, [r0, 0x17] ldrb r1, [r4] lsls r0, r1, 2 @@ -141764,8 +137090,8 @@ _0804580C: adds r0, r6 str r5, [r0] bl b_movescr_stack_push_cursor - ldr r1, _08045860 - ldr r0, _08045864 + ldr r1, =0x02024214 + ldr r0, =0x082db7f7 str r0, [r1] ldr r0, [sp, 0xC] adds r0, 0x1 @@ -141783,65 +137109,51 @@ _0804582A: pop {r1} bx r1 .align 2, 0 -_0804583C: .4byte 0x0202427c -_08045840: .4byte 0x0202437c -_08045844: .4byte 0x0202420c -_08045848: .4byte 0x0000ffff -_0804584C: .4byte 0x0202420b -_08045850: .4byte 0x02024084 -_08045854: .4byte 0x02024208 -_08045858: .4byte 0x0202420f -_0804585C: .4byte 0x02024474 -_08045860: .4byte 0x02024214 -_08045864: .4byte 0x082db7f7 + .pool thumb_func_end berry_effects_maybe thumb_func_start sub_8045868 sub_8045868: @ 8045868 lsls r0, 24 lsrs r0, 24 - ldr r2, _080458A0 + ldr r2, =0x020242bc lsls r1, r0, 3 subs r1, r0 lsls r1, 2 adds r1, r2 movs r2, 0 strb r2, [r1, 0x10] - ldr r1, _080458A4 + ldr r1, =0x02024084 movs r2, 0x58 adds r3, r0, 0 muls r3, r2 adds r1, 0x50 adds r3, r1 ldr r1, [r3] - ldr r2, _080458A8 + ldr r2, =0xfdffffff ands r1, r2 str r1, [r3] - ldr r1, _080458AC + ldr r1, =0x020242ac lsls r0, 2 adds r0, r1 ldr r1, [r0] - ldr r2, _080458B0 + ldr r2, =0xffffbfff ands r1, r2 str r1, [r0] bx lr .align 2, 0 -_080458A0: .4byte 0x020242bc -_080458A4: .4byte 0x02024084 -_080458A8: .4byte 0xfdffffff -_080458AC: .4byte 0x020242ac -_080458B0: .4byte 0xffffbfff + .pool thumb_func_end sub_8045868 thumb_func_start sub_80458B4 sub_80458B4: @ 80458B4 push {lr} - ldr r0, _080458D4 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _080458D0 - ldr r1, _080458D8 - ldr r0, _080458DC + ldr r1, =0x0831bd10 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -141852,9 +137164,7 @@ _080458D0: pop {r0} bx r0 .align 2, 0 -_080458D4: .4byte 0x02024068 -_080458D8: .4byte 0x0831bd10 -_080458DC: .4byte 0x02024214 + .pool thumb_func_end sub_80458B4 thumb_func_start sub_80458E0 @@ -141875,7 +137185,7 @@ sub_80458E0: @ 80458E0 lsrs r6, r0, 24 b _0804590A _080458FE: - ldr r1, _0804591C + ldr r1, =0x0831c898 lsls r0, r7, 1 adds r0, r7 lsls r0, 2 @@ -141887,13 +137197,12 @@ _0804590A: b _08045C20 _08045910: lsls r0, r6, 2 - ldr r1, _08045920 + ldr r1, =_08045924 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804591C: .4byte 0x0831c898 -_08045920: .4byte _08045924 + .pool .align 2, 0 _08045924: .4byte _08045A28 @@ -141962,14 +137271,14 @@ _08045924: .4byte _08045C20 .4byte _08045B28 _08045A28: - ldr r0, _08045B08 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08045B0C + ldr r1, =0x02024294 lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -141977,7 +137286,7 @@ _08045A28: ldrb r0, [r2, 0x8] cmp r0, 0 beq _08045A5A - ldr r1, _08045B10 + ldr r1, =0x02024084 ldrb r4, [r2, 0x9] movs r0, 0x58 muls r0, r4 @@ -141987,7 +137296,7 @@ _08045A28: beq _08045A5A b _08045B70 _08045A5A: - ldr r0, _08045B08 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -141998,12 +137307,12 @@ _08045A6A: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 - ldr r1, _08045B14 + ldr r1, =0x0202406c ldrb r1, [r1] bl __modsi3 lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _08045B08 + ldr r6, =0x0202420b ldrb r3, [r6] cmp r5, r3 beq _08045A6A @@ -142013,16 +137322,16 @@ _08045A6A: lsrs r0, 24 cmp r4, r0 beq _08045A6A - ldr r0, _08045B18 + ldr r0, =0x02024210 ldrb r2, [r0] - ldr r1, _08045B1C + ldr r1, =0x0832a328 lsls r0, r5, 2 adds r0, r1 ldr r0, [r0] ands r2, r0 cmp r2, 0 bne _08045A6A - ldr r0, _08045B20 + ldr r0, =0x0831c898 mov r3, r8 adds r1, r3, r7 lsls r1, 2 @@ -142043,7 +137352,7 @@ _08045AB8: bne _08045ACE b _08045C20 _08045ACE: - ldr r2, _08045B10 + ldr r2, =0x02024084 movs r1, 0x58 adds r0, r5, 0 muls r0, r1 @@ -142063,7 +137372,7 @@ _08045AE2: ldrb r1, [r0] adds r0, r5, 0 bl b_history__record_ability_usage_of_player - ldr r1, _08045B24 + ldr r1, =0x0202437c lsls r0, r5, 2 adds r0, r5 lsls r0, 2 @@ -142073,16 +137382,9 @@ _08045AE2: strb r1, [r0] b _08045C20 .align 2, 0 -_08045B08: .4byte 0x0202420b -_08045B0C: .4byte 0x02024294 -_08045B10: .4byte 0x02024084 -_08045B14: .4byte 0x0202406c -_08045B18: .4byte 0x02024210 -_08045B1C: .4byte 0x0832a328 -_08045B20: .4byte 0x0831c898 -_08045B24: .4byte 0x0202437c + .pool _08045B28: - ldr r0, _08045B3C + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status adds r1, r0, 0 @@ -142092,16 +137394,16 @@ _08045B28: eors r0, r2 b _08045BD2 .align 2, 0 -_08045B3C: .4byte 0x0202420b + .pool _08045B40: - ldr r0, _08045B74 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08045B78 + ldr r1, =0x02024294 lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -142109,7 +137411,7 @@ _08045B40: ldrb r0, [r2, 0x8] cmp r0, 0 beq _08045B80 - ldr r1, _08045B7C + ldr r1, =0x02024084 ldrb r4, [r2, 0x9] movs r0, 0x58 muls r0, r4 @@ -142121,11 +137423,9 @@ _08045B70: adds r5, r4, 0 b _08045C20 .align 2, 0 -_08045B74: .4byte 0x0202420b -_08045B78: .4byte 0x02024294 -_08045B7C: .4byte 0x02024084 + .pool _08045B80: - ldr r0, _08045BB4 + ldr r0, =0x02022fec ldr r0, [r0] movs r4, 0x1 ands r0, r4 @@ -142135,7 +137435,7 @@ _08045B80: ands r6, r0 cmp r6, 0 beq _08045BFC - ldr r0, _08045BB8 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -142149,8 +137449,7 @@ _08045B80: movs r0, 0x1 b _08045BD2 .align 2, 0 -_08045BB4: .4byte 0x02022fec -_08045BB8: .4byte 0x0202420b + .pool _08045BBC: movs r0, 0x3 b _08045BD2 @@ -142168,9 +137467,9 @@ _08045BD2: bl battle_get_side_with_given_state lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08045BF4 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08045BF8 + ldr r2, =0x0832a328 lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -142181,10 +137480,9 @@ _08045BD2: eors r5, r0 b _08045C20 .align 2, 0 -_08045BF4: .4byte 0x02024210 -_08045BF8: .4byte 0x0832a328 + .pool _08045BFC: - ldr r0, _08045C18 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status adds r1, r0, 0 @@ -142197,14 +137495,14 @@ _08045BFC: lsrs r5, r0, 24 b _08045C20 .align 2, 0 -_08045C18: .4byte 0x0202420b + .pool _08045C1C: - ldr r0, _08045C3C + ldr r0, =0x0202420b ldrb r5, [r0] _08045C20: - ldr r0, _08045C3C + ldr r0, =0x0202420b ldrb r0, [r0] - ldr r1, _08045C40 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 strb r5, [r0, 0xC] @@ -142216,8 +137514,7 @@ _08045C20: pop {r1} bx r1 .align 2, 0 -_08045C3C: .4byte 0x0202420b -_08045C40: .4byte 0x0202449c + .pool thumb_func_end sub_80458E0 thumb_func_start sub_8045C44 @@ -142231,13 +137528,13 @@ sub_8045C44: @ 8045C44 lsrs r0, 24 cmp r0, 0x1 beq _08045C8A - ldr r0, _08045C90 + ldr r0, =0x0202406e lsls r4, 1 adds r5, r4, r0 ldrh r0, [r5] movs r7, 0x64 muls r0, r7 - ldr r6, _08045C94 + ldr r6, =0x020244ec adds r0, r6 movs r1, 0xB movs r2, 0 @@ -142258,15 +137555,14 @@ _08045C8A: movs r0, 0x1 b _08045CAE .align 2, 0 -_08045C90: .4byte 0x0202406e -_08045C94: .4byte 0x020244ec + .pool _08045C98: - ldr r0, _08045CB4 + ldr r0, =0x0202406e adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08045CB8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x50 movs r2, 0 @@ -142276,8 +137572,7 @@ _08045CAE: pop {r1} bx r1 .align 2, 0 -_08045CB4: .4byte 0x0202406e -_08045CB8: .4byte 0x020244ec + .pool thumb_func_end sub_8045C44 thumb_func_start sub_8045CBC @@ -142288,13 +137583,13 @@ sub_8045CBC: @ 8045CBC push {r6,r7} sub sp, 0x10 movs r6, 0 - ldr r5, _08045DB0 + ldr r5, =0x02022fec ldr r0, [r5] - ldr r1, _08045DB4 + ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 bne _08045DAC - ldr r4, _08045DB8 + ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -142318,9 +137613,9 @@ sub_8045CBC: @ 8045CBC cmp r0, 0x2 beq _08045DAC _08045D08: - ldr r0, _08045DB0 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _08045DBC + ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 bne _08045DAC @@ -142329,8 +137624,8 @@ _08045D08: ands r1, r0 cmp r1, 0 bne _08045DAC - ldr r2, _08045DC0 - ldr r0, _08045DB8 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -142344,35 +137639,35 @@ _08045D08: lsls r0, 24 cmp r0, 0 beq _08045DAC - ldr r0, _08045DC4 + ldr r0, =0x0000086e bl flag_check lsls r0, 24 cmp r0, 0 bne _08045DAC movs r6, 0xA - ldr r0, _08045DC8 + ldr r0, =0x00000868 bl flag_check lsls r0, 24 cmp r0, 0 beq _08045D5A movs r6, 0x1E _08045D5A: - ldr r0, _08045DCC + ldr r0, =0x0000086a bl flag_check lsls r0, 24 cmp r0, 0 beq _08045D68 movs r6, 0x32 _08045D68: - ldr r0, _08045DD0 + ldr r0, =0x0000086c bl flag_check lsls r0, 24 cmp r0, 0 beq _08045D76 movs r6, 0x46 _08045D76: - ldr r5, _08045DC0 - ldr r0, _08045DB8 + ldr r5, =0x02024084 + ldr r0, =0x0202420b mov r8, r0 ldrb r0, [r0] movs r7, 0x58 @@ -142401,17 +137696,9 @@ _08045DAC: movs r0, 0 b _08045FD0 .align 2, 0 -_08045DB0: .4byte 0x02022fec -_08045DB4: .4byte 0x02000002 -_08045DB8: .4byte 0x0202420b -_08045DBC: .4byte 0x003f0100 -_08045DC0: .4byte 0x02024084 -_08045DC4: .4byte 0x0000086e -_08045DC8: .4byte 0x00000868 -_08045DCC: .4byte 0x0000086a -_08045DD0: .4byte 0x0000086c + .pool _08045DD4: - ldr r3, _08045E10 + ldr r3, =0x020241ea ldrh r0, [r3] cmp r0, 0x63 bne _08045DEA @@ -142419,7 +137706,7 @@ _08045DD4: adds r0, 0x50 adds r0, r2, r0 ldr r1, [r0] - ldr r2, _08045E14 + ldr r2, =0xff7fffff ands r1, r2 str r1, [r0] _08045DEA: @@ -142440,21 +137727,18 @@ _08045DEA: cmp r0, 0xD6 bne _08045E20 _08045E0A: - ldr r1, _08045E18 - ldr r0, _08045E1C + ldr r1, =0x02024214 + ldr r0, =0x082db695 b _08045F7A .align 2, 0 -_08045E10: .4byte 0x020241ea -_08045E14: .4byte 0xff7fffff -_08045E18: .4byte 0x02024214 -_08045E1C: .4byte 0x082db695 + .pool _08045E20: bl GenerateRandomNumber movs r5, 0xFF adds r1, r5, 0 ands r1, r0 - ldr r7, _08045EC0 - ldr r2, _08045EC4 + ldr r7, =0x02024084 + ldr r2, =0x0202420b mov r9, r2 ldrb r3, [r2] movs r0, 0x58 @@ -142469,8 +137753,8 @@ _08045E20: asrs r4, r0, 8 cmp r4, r6 bge _08045EE8 - ldr r6, _08045EC8 - ldr r5, _08045ECC + ldr r6, =0x0832a328 + ldr r5, =0x020241e8 ldrb r0, [r5] lsls r0, 2 adds r0, r6 @@ -142484,7 +137768,7 @@ _08045E20: bne _08045E68 b _08045F6A _08045E68: - ldr r1, _08045ED0 + ldr r1, =0x020241e9 mov r8, r1 movs r7, 0x3 _08045E6E: @@ -142500,12 +137784,12 @@ _08045E6E: ands r0, r4 cmp r0, 0 bne _08045E6E - ldr r4, _08045ED4 - ldr r3, _08045EC0 - ldr r0, _08045ECC + ldr r4, =0x020241ee + ldr r3, =0x02024084 + ldr r0, =0x020241e8 ldrb r0, [r0] lsls r0, 1 - ldr r1, _08045EC4 + ldr r1, =0x0202420b ldrb r2, [r1] movs r1, 0x58 muls r1, r2 @@ -142514,30 +137798,21 @@ _08045E6E: adds r0, r3 ldrh r0, [r0] strh r0, [r4] - ldr r1, _08045ED8 - ldr r0, _08045EDC + ldr r1, =0x02024214 + ldr r0, =0x082db6a5 str r0, [r1] ldrh r0, [r4] movs r1, 0 bl sub_80458E0 - ldr r1, _08045EE0 + ldr r1, =0x0202420c strb r0, [r1] - ldr r2, _08045EE4 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 14 b _08045FCA .align 2, 0 -_08045EC0: .4byte 0x02024084 -_08045EC4: .4byte 0x0202420b -_08045EC8: .4byte 0x0832a328 -_08045ECC: .4byte 0x020241e8 -_08045ED0: .4byte 0x020241e9 -_08045ED4: .4byte 0x020241ee -_08045ED8: .4byte 0x02024214 -_08045EDC: .4byte 0x082db6a5 -_08045EE0: .4byte 0x0202420c -_08045EE4: .4byte 0x02024280 + .pool _08045EE8: subs r0, r2, r6 lsls r0, 24 @@ -142566,7 +137841,7 @@ _08045EE8: cmp r0, 0xF beq _08045F64 movs r2, 0 - ldr r0, _08045F58 + ldr r0, =0x0202406c ldrb r3, [r0] mov r8, r0 cmp r2, r3 @@ -142593,39 +137868,35 @@ _08045F4A: ldrb r0, [r0] cmp r2, r0 bne _08045F64 - ldr r1, _08045F5C - ldr r0, _08045F60 + ldr r1, =0x02024214 + ldr r0, =0x082db6d9 b _08045F7A .align 2, 0 -_08045F58: .4byte 0x0202406c -_08045F5C: .4byte 0x02024214 -_08045F60: .4byte 0x082db6d9 + .pool _08045F64: subs r4, r6 cmp r4, r6 blt _08045F8C _08045F6A: bl GenerateRandomNumber - ldr r2, _08045F80 + ldr r2, =0x02024332 movs r1, 0x3 ands r1, r0 strb r1, [r2, 0x5] - ldr r1, _08045F84 - ldr r0, _08045F88 + ldr r1, =0x02024214 + ldr r0, =0x082db6ad _08045F7A: str r0, [r1] movs r0, 0x1 b _08045FD0 .align 2, 0 -_08045F80: .4byte 0x02024332 -_08045F84: .4byte 0x02024214 -_08045F88: .4byte 0x082db6ad + .pool _08045F8C: - ldr r4, _08045FE0 + ldr r4, =0x0202420b ldrb r1, [r4] movs r0, 0x58 muls r1, r0 - ldr r0, _08045FE4 + ldr r0, =0x02024084 adds r1, r0 movs r0, 0x28 str r0, [sp] @@ -142639,15 +137910,15 @@ _08045F8C: movs r2, 0x1 movs r3, 0 bl sub_806957C - ldr r1, _08045FE8 + ldr r1, =0x020241f0 str r0, [r1] - ldr r1, _08045FEC + ldr r1, =0x0202420c ldrb r0, [r4] strb r0, [r1] - ldr r1, _08045FF0 - ldr r0, _08045FF4 + ldr r1, =0x02024214 + ldr r0, =0x082db6f0 str r0, [r1] - ldr r2, _08045FF8 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 12 @@ -142664,13 +137935,7 @@ _08045FD0: pop {r1} bx r1 .align 2, 0 -_08045FE0: .4byte 0x0202420b -_08045FE4: .4byte 0x02024084 -_08045FE8: .4byte 0x020241f0 -_08045FEC: .4byte 0x0202420c -_08045FF0: .4byte 0x02024214 -_08045FF4: .4byte 0x082db6f0 -_08045FF8: .4byte 0x02024280 + .pool thumb_func_end sub_8045CBC thumb_func_start atk00_attackcanceler @@ -142680,20 +137945,19 @@ atk00_attackcanceler: @ 8045FFC mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r0, _08046018 + ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0 beq _08046020 - ldr r1, _0804601C + ldr r1, =0x02024083 movs r0, 0xC strb r0, [r1] b _08046398 .align 2, 0 -_08046018: .4byte 0x0202433a -_0804601C: .4byte 0x02024083 + .pool _08046020: - ldr r2, _08046050 - ldr r0, _08046054 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -142701,7 +137965,7 @@ _08046020: ldrh r0, [r0, 0x28] cmp r0, 0 bne _08046064 - ldr r2, _08046058 + ldr r2, =0x02024280 ldr r1, [r2] movs r0, 0x80 lsls r0, 2 @@ -142712,15 +137976,11 @@ _08046020: lsls r0, 12 orrs r1, r0 str r1, [r2] - ldr r1, _0804605C - ldr r0, _08046060 + ldr r1, =0x02024214 + ldr r0, =0x082d8a4e b _08046396 .align 2, 0 -_08046050: .4byte 0x02024084 -_08046054: .4byte 0x0202420b -_08046058: .4byte 0x02024280 -_0804605C: .4byte 0x02024214 -_08046060: .4byte 0x082d8a4e + .pool _08046064: bl sub_8041A6C lsls r0, 24 @@ -142729,7 +137989,7 @@ _08046064: beq _08046072 b _08046398 _08046072: - ldr r0, _080460E0 + ldr r0, =0x0202420c ldrb r1, [r0] str r2, [sp] movs r0, 0x2 @@ -142741,10 +138001,10 @@ _08046072: beq _0804608A b _08046398 _0804608A: - ldr r4, _080460E4 - ldr r0, _080460E8 + ldr r4, =0x02024084 + ldr r0, =0x020241e8 ldrb r1, [r0] - ldr r3, _080460EC + ldr r3, =0x0202420b ldrb r2, [r3] movs r0, 0x58 muls r2, r0 @@ -142753,15 +138013,15 @@ _0804608A: adds r0, 0x24 adds r1, r0 ldrb r0, [r1] - ldr r5, _080460F0 + ldr r5, =0x02024280 cmp r0, 0 bne _08046108 - ldr r0, _080460F4 + ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xA5 beq _08046108 ldr r0, [r5] - ldr r1, _080460F8 + ldr r1, =0x00800200 ands r0, r1 cmp r0, 0 bne _08046108 @@ -142774,29 +138034,20 @@ _0804608A: ands r0, r1 cmp r0, 0 bne _08046108 - ldr r1, _080460FC - ldr r0, _08046100 + ldr r1, =0x02024214 + ldr r0, =0x082db07a str r0, [r1] - ldr r2, _08046104 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] b _08046398 .align 2, 0 -_080460E0: .4byte 0x0202420c -_080460E4: .4byte 0x02024084 -_080460E8: .4byte 0x020241e8 -_080460EC: .4byte 0x0202420b -_080460F0: .4byte 0x02024280 -_080460F4: .4byte 0x020241ea -_080460F8: .4byte 0x00800200 -_080460FC: .4byte 0x02024214 -_08046100: .4byte 0x082db07a -_08046104: .4byte 0x0202427c + .pool _08046108: ldr r0, [r5] - ldr r1, _0804614C + ldr r1, =0xff7fffff ands r0, r1 str r0, [r5] movs r6, 0x80 @@ -142828,25 +138079,25 @@ _08046108: str r0, [r5] b _08046398 .align 2, 0 -_0804614C: .4byte 0xff7fffff + .pool _08046150: - ldr r0, _0804615C + ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] b _08046398 .align 2, 0 -_0804615C: .4byte 0x0202427c + .pool _08046160: - ldr r2, _080461C4 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 18 orrs r0, r1 str r0, [r2] - ldr r2, _080461C8 - ldr r1, _080461CC + ldr r2, =0x0202433c + ldr r1, =0x0202420c ldrb r3, [r1] lsls r0, r3, 4 adds r0, r2 @@ -142856,8 +138107,8 @@ _08046160: mov r9, r2 cmp r0, 0 bge _080461E8 - ldr r2, _080461D0 - ldr r0, _080461D4 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -142868,9 +138119,9 @@ _08046160: ands r0, r1 cmp r0, 0 beq _080461E8 - ldr r0, _080461D8 + ldr r0, =0x0202420b ldrb r0, [r0] - ldr r2, _080461DC + ldr r2, =0x00000115 adds r1, r3, 0 bl sub_803F480 mov r0, r8 @@ -142883,30 +138134,22 @@ _08046160: ands r0, r2 strb r0, [r1] bl b_movescr_stack_push_cursor - ldr r1, _080461E0 - ldr r0, _080461E4 + ldr r1, =0x02024214 + ldr r0, =0x082db194 b _08046396 .align 2, 0 -_080461C4: .4byte 0x02024280 -_080461C8: .4byte 0x0202433c -_080461CC: .4byte 0x0202420c -_080461D0: .4byte 0x0831c898 -_080461D4: .4byte 0x020241ea -_080461D8: .4byte 0x0202420b -_080461DC: .4byte 0x00000115 -_080461E0: .4byte 0x02024214 -_080461E4: .4byte 0x082db194 + .pool _080461E8: movs r2, 0 - ldr r0, _08046264 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r2, r0 bge _0804622A - ldr r6, _08046268 - ldr r1, _0804626C + ldr r6, =0x0202433c + ldr r1, =0x0831c898 mov r12, r1 adds r5, r0, 0 - ldr r7, _08046270 + ldr r7, =0x0202407e _080461FC: adds r4, r2, r7 ldrb r3, [r4] @@ -142916,7 +138159,7 @@ _080461FC: lsls r0, 26 cmp r0, 0 bge _08046224 - ldr r0, _08046274 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -142933,7 +138176,7 @@ _08046224: cmp r2, r5 blt _080461FC _0804622A: - ldr r0, _08046278 + ldr r0, =0x0202437c mov r1, r8 ldrb r2, [r1] lsls r1, r2, 2 @@ -142948,12 +138191,12 @@ _0804622A: negs r0, r0 ands r0, r3 strb r0, [r1] - ldr r4, _0804627C + ldr r4, =0x0202420a movs r0, 0x1F strb r0, [r4] bl b_movescr_stack_push_cursor - ldr r1, _08046280 - ldr r0, _08046284 + ldr r1, =0x02024214 + ldr r0, =0x082db53e str r0, [r1] mov r1, r8 ldrb r0, [r1] @@ -142961,15 +138204,7 @@ _0804622A: bl b_history__record_ability_usage_of_player b _08046398 .align 2, 0 -_08046264: .4byte 0x0202406c -_08046268: .4byte 0x0202433c -_0804626C: .4byte 0x0831c898 -_08046270: .4byte 0x0202407e -_08046274: .4byte 0x020241ea -_08046278: .4byte 0x0202437c -_0804627C: .4byte 0x0202420a -_08046280: .4byte 0x02024214 -_08046284: .4byte 0x082db53e + .pool _08046288: lsls r0, r2, 4 add r0, r9 @@ -142979,8 +138214,8 @@ _08046288: bne _08046296 b _08046390 _08046296: - ldr r1, _0804632C - ldr r2, _08046330 + ldr r1, =0x0831c898 + ldr r2, =0x020241ea ldrh r3, [r2] lsls r0, r3, 1 adds r0, r3 @@ -142994,8 +138229,8 @@ _08046296: beq _08046390 cmp r3, 0xAE bne _080462D4 - ldr r2, _08046334 - ldr r0, _08046338 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -143016,8 +138251,8 @@ _080462D4: lsls r0, 24 cmp r0, 0 beq _080462FA - ldr r1, _08046334 - ldr r0, _08046338 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -143030,44 +138265,36 @@ _080462D4: cmp r0, 0 beq _08046390 _080462FA: - ldr r0, _08046338 + ldr r0, =0x0202420b ldrb r0, [r0] bl b_cancel_multi_turn_move_maybe - ldr r2, _0804633C + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08046340 - ldr r3, _08046344 + ldr r1, =0x02024250 + ldr r3, =0x0202420c ldrb r0, [r3] lsls r0, 1 adds r0, r1 movs r2, 0 strh r2, [r0] - ldr r1, _08046348 + ldr r1, =0x02024258 ldrb r0, [r3] lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r1, _0804634C + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x6] b _08046390 .align 2, 0 -_0804632C: .4byte 0x0831c898 -_08046330: .4byte 0x020241ea -_08046334: .4byte 0x02024084 -_08046338: .4byte 0x0202420b -_0804633C: .4byte 0x0202427c -_08046340: .4byte 0x02024250 -_08046344: .4byte 0x0202420c -_08046348: .4byte 0x02024258 -_0804634C: .4byte 0x02024332 + .pool _08046350: - ldr r0, _0804637C + ldr r0, =0x0202420b ldrb r0, [r0] - ldr r2, _08046380 + ldr r2, =0x00000121 adds r1, r3, 0 bl sub_803F480 ldrb r1, [r4] @@ -143078,21 +138305,17 @@ _08046350: negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _08046384 + ldr r1, =0x02024474 ldrb r0, [r4] strb r0, [r1, 0x17] bl b_movescr_stack_push_cursor - ldr r1, _08046388 - ldr r0, _0804638C + ldr r1, =0x02024214 + ldr r0, =0x082db1ac b _08046396 .align 2, 0 -_0804637C: .4byte 0x0202420b -_08046380: .4byte 0x00000121 -_08046384: .4byte 0x02024474 -_08046388: .4byte 0x02024214 -_0804638C: .4byte 0x082db1ac + .pool _08046390: - ldr r1, _080463A8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 _08046396: @@ -143106,7 +138329,7 @@ _08046398: pop {r0} bx r0 .align 2, 0 -_080463A8: .4byte 0x02024214 + .pool thumb_func_end atk00_attackcanceler thumb_func_start mcmd_jump_if_move_not_executed @@ -143117,23 +138340,23 @@ mcmd_jump_if_move_not_executed: @ 80463AC lsrs r0, 24 lsls r1, 16 lsrs r6, r1, 16 - ldr r1, _080463F8 + ldr r1, =0x02024214 ldr r5, [r1] adds r4, r5, r0 - ldr r0, _080463FC + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 beq _0804640C - ldr r1, _08046400 - ldr r3, _08046404 + ldr r1, =0x02024250 + ldr r3, =0x0202420c ldrb r0, [r3] lsls r0, 1 adds r0, r1 movs r2, 0 strh r2, [r0] - ldr r1, _08046408 + ldr r1, =0x02024258 ldrb r0, [r3] lsls r0, 1 adds r0, r1 @@ -143150,14 +138373,10 @@ mcmd_jump_if_move_not_executed: @ 80463AC orrs r4, r0 b _08046426 .align 2, 0 -_080463F8: .4byte 0x02024214 -_080463FC: .4byte 0x0202427c -_08046400: .4byte 0x02024250 -_08046404: .4byte 0x0202420c -_08046408: .4byte 0x02024258 + .pool _0804640C: bl b_feature_update_destiny_bond - ldr r0, _08046434 + ldr r0, =0x0202420c ldrb r1, [r0] str r6, [sp] movs r0, 0x3 @@ -143168,7 +138387,7 @@ _0804640C: cmp r0, 0 bne _0804642A _08046426: - ldr r0, _08046438 + ldr r0, =0x02024214 str r4, [r0] _0804642A: add sp, 0x4 @@ -143176,15 +138395,14 @@ _0804642A: pop {r0} bx r0 .align 2, 0 -_08046434: .4byte 0x0202420c -_08046438: .4byte 0x02024214 + .pool thumb_func_end mcmd_jump_if_move_not_executed thumb_func_start atk40_801DBA0 atk40_801DBA0: @ 804643C push {lr} - ldr r1, _08046484 - ldr r0, _08046488 + ldr r1, =0x0202433c + ldr r0, =0x0202420c ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -143192,8 +138410,8 @@ atk40_801DBA0: @ 804643C lsls r0, 31 cmp r0, 0 beq _0804649C - ldr r2, _0804648C - ldr r0, _08046490 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -143204,7 +138422,7 @@ atk40_801DBA0: @ 804643C ands r0, r1 cmp r0, 0 beq _0804649C - ldr r2, _08046494 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -143212,19 +138430,14 @@ atk40_801DBA0: @ 804643C movs r0, 0x5 movs r1, 0 bl mcmd_jump_if_move_not_executed - ldr r1, _08046498 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x6] b _080464A4 .align 2, 0 -_08046484: .4byte 0x0202433c -_08046488: .4byte 0x0202420c -_0804648C: .4byte 0x0831c898 -_08046490: .4byte 0x020241ea -_08046494: .4byte 0x0202427c -_08046498: .4byte 0x02024332 + .pool _0804649C: - ldr r1, _080464A8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -143232,7 +138445,7 @@ _080464A4: pop {r0} bx r0 .align 2, 0 -_080464A8: .4byte 0x02024214 + .pool thumb_func_end atk40_801DBA0 thumb_func_start sub_80464AC @@ -143241,8 +138454,8 @@ sub_80464AC: @ 80464AC lsls r0, 16 lsrs r3, r0, 16 movs r4, 0 - ldr r1, _08046500 - ldr r0, _08046504 + ldr r1, =0x0202433c + ldr r0, =0x0202420c ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -143250,8 +138463,8 @@ sub_80464AC: @ 80464AC lsls r0, 31 cmp r0, 0 beq _080464F8 - ldr r2, _08046508 - ldr r0, _0804650C + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -143262,7 +138475,7 @@ sub_80464AC: @ 80464AC ands r0, r1 cmp r0, 0 beq _080464F8 - ldr r2, _08046510 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -143270,7 +138483,7 @@ sub_80464AC: @ 80464AC movs r0, 0x7 adds r1, r3, 0 bl mcmd_jump_if_move_not_executed - ldr r1, _08046514 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x6] movs r4, 0x1 @@ -143280,12 +138493,7 @@ _080464F8: pop {r1} bx r1 .align 2, 0 -_08046500: .4byte 0x0202433c -_08046504: .4byte 0x0202420c -_08046508: .4byte 0x0831c898 -_0804650C: .4byte 0x020241ea -_08046510: .4byte 0x0202427c -_08046514: .4byte 0x02024332 + .pool thumb_func_end sub_80464AC thumb_func_start sub_8046518 @@ -143294,8 +138502,8 @@ sub_8046518: @ 8046518 sub sp, 0x4 lsls r0, 16 lsrs r5, r0, 16 - ldr r2, _08046578 - ldr r3, _0804657C + ldr r2, =0x020242ac + ldr r3, =0x0202420c ldrb r4, [r3] lsls r0, r4, 2 adds r0, r2 @@ -143305,18 +138513,18 @@ sub_8046518: @ 8046518 adds r6, r2, 0 cmp r1, 0 beq _0804654A - ldr r1, _08046580 + ldr r1, =0x020242bc lsls r0, r4, 3 subs r0, r4 lsls r0, 2 adds r0, r1 - ldr r1, _08046584 + ldr r1, =0x0202420b ldrb r0, [r0, 0x15] ldrb r1, [r1] cmp r0, r1 beq _08046634 _0804654A: - ldr r0, _08046588 + ldr r0, =0x02024280 ldr r1, [r0] movs r2, 0x80 lsls r2, 9 @@ -143333,22 +138541,17 @@ _0804654A: cmp r0, 0 beq _08046590 _0804656A: - ldr r0, _0804658C + ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] b _08046634 .align 2, 0 -_08046578: .4byte 0x020242ac -_0804657C: .4byte 0x0202420c -_08046580: .4byte 0x020242bc -_08046584: .4byte 0x0202420b -_08046588: .4byte 0x02024280 -_0804658C: .4byte 0x0202427c + .pool _08046590: ldr r0, [r2] - ldr r1, _08046640 + ldr r1, =0xfffeffff ands r0, r1 str r0, [r2] movs r1, 0x80 @@ -143366,7 +138569,7 @@ _08046590: bne _0804656A _080465B2: ldr r0, [r2] - ldr r1, _08046644 + ldr r1, =0xfffdffff ands r0, r1 str r0, [r2] movs r1, 0x80 @@ -143383,7 +138586,7 @@ _080465B2: bne _0804656A _080465D2: ldr r0, [r2] - ldr r1, _08046648 + ldr r1, =0xfffbffff ands r0, r1 str r0, [r2] movs r0, 0 @@ -143407,13 +138610,13 @@ _080465D2: lsls r0, 24 cmp r0, 0 bne _08046622 - ldr r0, _0804664C + ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x7 ands r0, r1 cmp r0, 0 beq _08046622 - ldr r0, _08046650 + ldr r0, =0x0831c898 adds r1, r4, r5 lsls r1, 2 adds r1, r0 @@ -143421,7 +138624,7 @@ _080465D2: cmp r0, 0x98 beq _08046634 _08046622: - ldr r1, _08046650 + ldr r1, =0x0831c898 adds r0, r4, r5 lsls r0, 2 adds r0, r1 @@ -143437,11 +138640,7 @@ _08046634: movs r0, 0x1 b _08046656 .align 2, 0 -_08046640: .4byte 0xfffeffff -_08046644: .4byte 0xfffdffff -_08046648: .4byte 0xfffbffff -_0804664C: .4byte 0x020243cc -_08046650: .4byte 0x0831c898 + .pool _08046654: movs r0, 0 _08046656: @@ -143459,7 +138658,7 @@ atk01_accuracycheck: @ 8046660 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _080466B8 + ldr r0, =0x02024214 ldr r5, [r0] ldrb r6, [r5, 0x5] ldrb r1, [r5, 0x6] @@ -143471,8 +138670,8 @@ atk01_accuracycheck: @ 8046660 adds r7, r0, 0 cmp r1, 0x1 bhi _0804671C - ldr r2, _080466BC - ldr r3, _080466C0 + ldr r2, =0x020242ac + ldr r3, =0x0202420c ldrb r4, [r3] lsls r0, r4, 2 adds r0, r2 @@ -143481,15 +138680,15 @@ atk01_accuracycheck: @ 8046660 ands r1, r0 cmp r1, 0 beq _080466D0 - ldr r0, _080466C4 + ldr r0, =0x0000ffff cmp r6, r0 bne _080466D0 - ldr r1, _080466C8 + ldr r1, =0x020242bc lsls r0, r4, 3 subs r0, r4 lsls r0, 2 adds r0, r1 - ldr r1, _080466CC + ldr r1, =0x0202420b ldrb r0, [r0, 0x15] ldrb r1, [r1] cmp r0, r1 @@ -143498,18 +138697,13 @@ atk01_accuracycheck: @ 8046660 str r0, [r7] b _080469D2 .align 2, 0 -_080466B8: .4byte 0x02024214 -_080466BC: .4byte 0x020242ac -_080466C0: .4byte 0x0202420c -_080466C4: .4byte 0x0000ffff -_080466C8: .4byte 0x020242bc -_080466CC: .4byte 0x0202420b + .pool _080466D0: ldrb r0, [r3] lsls r0, 2 adds r0, r2 ldr r0, [r0] - ldr r1, _080466FC + ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 beq _08046700 @@ -143527,7 +138721,7 @@ _080466D0: str r1, [r7] b _080469D2 .align 2, 0 -_080466FC: .4byte 0x000400c0 + .pool _08046700: movs r0, 0 bl sub_80464AC @@ -143536,20 +138730,20 @@ _08046700: beq _0804670E b _080469D2 _0804670E: - ldr r1, _08046718 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x7 str r0, [r1] b _080469D2 .align 2, 0 -_08046718: .4byte 0x02024214 + .pool _0804671C: cmp r6, 0 bne _08046724 - ldr r0, _0804673C + ldr r0, =0x020241ea ldrh r6, [r0] _08046724: - ldr r0, _08046740 + ldr r0, =0x0202449c ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -143561,10 +138755,9 @@ _08046724: mov r10, r2 b _08046752 .align 2, 0 -_0804673C: .4byte 0x020241ea -_08046740: .4byte 0x0202449c + .pool _08046744: - ldr r1, _08046798 + ldr r1, =0x0831c898 lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -143586,8 +138779,8 @@ _08046760: beq _0804676E b _080469D2 _0804676E: - ldr r3, _0804679C - ldr r0, _080467A0 + ldr r3, =0x02024084 + ldr r0, =0x0202420c ldrb r0, [r0] movs r2, 0x58 adds r4, r0, 0 @@ -143601,19 +138794,16 @@ _0804676E: ands r0, r1 cmp r0, 0 beq _080467A8 - ldr r0, _080467A4 + ldr r0, =0x0202420b ldrb r0, [r0] muls r0, r2 adds r0, r3 ldrb r5, [r0, 0x1E] b _080467BE .align 2, 0 -_08046798: .4byte 0x0831c898 -_0804679C: .4byte 0x02024084 -_080467A0: .4byte 0x0202420c -_080467A4: .4byte 0x0202420b + .pool _080467A8: - ldr r0, _0804690C + ldr r0, =0x0202420b ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -143636,7 +138826,7 @@ _080467C6: ble _080467D0 movs r5, 0xC _080467D0: - ldr r1, _08046910 + ldr r1, =0x0831c898 lsls r4, r6, 1 adds r0, r4, r6 lsls r0, 2 @@ -143664,7 +138854,7 @@ _080467D0: lsls r0, 24 cmp r0, 0 bne _08046822 - ldr r0, _08046914 + ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -143676,7 +138866,7 @@ _080467D0: movs r0, 0x32 mov r8, r0 _08046822: - ldr r1, _08046918 + ldr r1, =0x0831c0f4 lsls r0, r5, 24 asrs r0, 22 adds r0, r1 @@ -143688,8 +138878,8 @@ _08046822: bl __divsi3 lsls r0, 16 lsrs r4, r0, 16 - ldr r7, _0804691C - ldr r0, _0804690C + ldr r7, =0x02024084 + ldr r0, =0x0202420b ldrb r0, [r0] movs r5, 0x58 muls r0, r5 @@ -143726,7 +138916,7 @@ _08046860: lsls r0, 24 cmp r0, 0 bne _080468B8 - ldr r0, _08046920 + ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r5 adds r0, r7 @@ -143734,7 +138924,7 @@ _08046860: ldrb r0, [r0] cmp r0, 0x8 bne _080468B8 - ldr r0, _08046914 + ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x18 ands r0, r1 @@ -143748,8 +138938,8 @@ _08046860: lsls r0, 16 lsrs r4, r0, 16 _080468B8: - ldr r2, _0804691C - ldr r0, _0804690C + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -143770,7 +138960,7 @@ _080468B8: lsls r0, 16 lsrs r4, r0, 16 _080468E4: - ldr r2, _08046920 + ldr r2, =0x0202420c mov r8, r2 ldrb r2, [r2] movs r7, 0x58 @@ -143781,7 +138971,7 @@ _080468E4: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _08046928 - ldr r1, _08046924 + ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -143790,13 +138980,7 @@ _080468E4: ldrb r2, [r0, 0x1A] b _08046944 .align 2, 0 -_0804690C: .4byte 0x0202420b -_08046910: .4byte 0x0831c898 -_08046914: .4byte 0x020243cc -_08046918: .4byte 0x0831c0f4 -_0804691C: .4byte 0x02024084 -_08046920: .4byte 0x0202420c -_08046924: .4byte 0x02024404 + .pool _08046928: ldrh r0, [r1, 0x2E] bl itemid_get_x12 @@ -143811,8 +138995,8 @@ _08046928: lsls r0, 24 lsrs r2, r0, 24 _08046944: - ldr r0, _080469A8 - ldr r1, _080469AC + ldr r0, =0x0202420f + ldr r1, =0x0202420c ldrb r1, [r1] strb r1, [r0] cmp r5, 0x16 @@ -143835,18 +139019,18 @@ _08046960: adds r0, 0x1 cmp r0, r4 ble _080469CA - ldr r2, _080469B0 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r0, _080469B4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _080469C0 - ldr r1, _080469B8 + ldr r1, =0x0831c898 ldr r2, [sp, 0x4] adds r0, r2, r6 lsls r0, 2 @@ -143857,18 +139041,13 @@ _08046960: cmp r0, 0x20 bne _080469C0 _080469A2: - ldr r1, _080469BC + ldr r1, =0x02024332 movs r0, 0x2 b _080469C4 .align 2, 0 -_080469A8: .4byte 0x0202420f -_080469AC: .4byte 0x0202420c -_080469B0: .4byte 0x0202427c -_080469B4: .4byte 0x02022fec -_080469B8: .4byte 0x0831c898 -_080469BC: .4byte 0x02024332 + .pool _080469C0: - ldr r1, _080469E4 + ldr r1, =0x02024332 movs r0, 0 _080469C4: strb r0, [r1, 0x6] @@ -143887,24 +139066,24 @@ _080469D2: pop {r0} bx r0 .align 2, 0 -_080469E4: .4byte 0x02024332 + .pool thumb_func_end atk01_accuracycheck thumb_func_start atk02_attackstring atk02_attackstring: @ 80469E8 push {r4,r5,lr} - ldr r0, _08046A28 + ldr r0, =0x02024068 ldr r5, [r0] cmp r5, 0 bne _08046A20 - ldr r4, _08046A2C + ldr r4, =0x02024280 ldr r0, [r4] movs r1, 0xC0 lsls r1, 3 ands r0, r1 cmp r0, 0 bne _08046A14 - ldr r0, _08046A30 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x4 bl b_std_message @@ -143914,22 +139093,18 @@ atk02_attackstring: @ 80469E8 orrs r0, r1 str r0, [r4] _08046A14: - ldr r0, _08046A34 + ldr r0, =0x02024214 ldr r1, [r0] adds r1, 0x1 str r1, [r0] - ldr r0, _08046A38 + ldr r0, =0x02024332 strb r5, [r0, 0x7] _08046A20: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08046A28: .4byte 0x02024068 -_08046A2C: .4byte 0x02024280 -_08046A30: .4byte 0x0202420b -_08046A34: .4byte 0x02024214 -_08046A38: .4byte 0x02024332 + .pool thumb_func_end atk02_attackstring thumb_func_start atk03_ppreduce @@ -143941,14 +139116,14 @@ atk03_ppreduce: @ 8046A3C push {r5-r7} sub sp, 0x4 movs r6, 0x1 - ldr r0, _08046A8C + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _08046A54 b _08046BEE _08046A54: - ldr r1, _08046A90 - ldr r2, _08046A94 + ldr r1, =0x0202437c + ldr r2, =0x0202420b ldrb r3, [r2] lsls r0, r3, 2 adds r0, r3 @@ -143960,8 +139135,8 @@ _08046A54: mov r9, r2 cmp r4, 0 bne _08046AF6 - ldr r2, _08046A98 - ldr r0, _08046A9C + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -143976,11 +139151,7 @@ _08046A54: beq _08046ABC b _08046AD6 .align 2, 0 -_08046A8C: .4byte 0x02024068 -_08046A90: .4byte 0x0202437c -_08046A94: .4byte 0x0202420b -_08046A98: .4byte 0x0831c898 -_08046A9C: .4byte 0x020241ea + .pool _08046AA0: cmp r0, 0x40 beq _08046ABC @@ -144010,13 +139181,13 @@ _08046ABC: adds r6, r0 b _08046AF6 _08046AD6: - ldr r1, _08046B58 + ldr r1, =0x0202420c mov r2, r9 ldrb r0, [r2] ldrb r7, [r1] cmp r0, r7 beq _08046AF6 - ldr r2, _08046B5C + ldr r2, =0x02024084 ldrb r1, [r1] movs r0, 0x58 muls r0, r1 @@ -144027,16 +139198,16 @@ _08046AD6: bne _08046AF6 adds r6, 0x1 _08046AF6: - ldr r0, _08046B60 + ldr r0, =0x02024280 ldr r4, [r0] movs r0, 0xA0 lsls r0, 4 ands r4, r0 cmp r4, 0 bne _08046BDC - ldr r2, _08046B5C - ldr r3, _08046B64 - ldr r1, _08046B68 + ldr r2, =0x02024084 + ldr r3, =0x020241e8 + ldr r1, =0x0202420b ldrb r5, [r1] movs r0, 0x58 mov r8, r0 @@ -144054,7 +139225,7 @@ _08046AF6: adds r7, r3, 0 cmp r0, 0 beq _08046BDC - ldr r0, _08046B6C + ldr r0, =0x0202433c lsls r1, r5, 4 adds r1, r0 ldrb r0, [r1, 0x2] @@ -144077,12 +139248,7 @@ _08046AF6: strb r0, [r2] b _08046B72 .align 2, 0 -_08046B58: .4byte 0x0202420c -_08046B5C: .4byte 0x02024084 -_08046B60: .4byte 0x02024280 -_08046B64: .4byte 0x020241e8 -_08046B68: .4byte 0x0202420b -_08046B6C: .4byte 0x0202433c + .pool _08046B70: strb r4, [r2] _08046B72: @@ -144100,14 +139266,14 @@ _08046B72: ands r0, r1 cmp r0, 0 bne _08046BDC - ldr r1, _08046C00 + ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _08046C04 + ldr r2, =0x0832a328 ldrb r0, [r7] lsls r0, 2 adds r0, r2 @@ -144115,7 +139281,7 @@ _08046B72: ands r1, r0 cmp r1, 0 bne _08046BDC - ldr r0, _08046C08 + ldr r0, =0x02024064 strb r3, [r0] ldrb r1, [r7] adds r1, 0x9 @@ -144138,12 +139304,12 @@ _08046B72: ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution _08046BDC: - ldr r2, _08046C0C + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _08046C10 + ldr r1, =0xfffff7ff ands r0, r1 str r0, [r2] - ldr r1, _08046C14 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -144157,19 +139323,14 @@ _08046BEE: pop {r0} bx r0 .align 2, 0 -_08046C00: .4byte 0x020242bc -_08046C04: .4byte 0x0832a328 -_08046C08: .4byte 0x02024064 -_08046C0C: .4byte 0x02024280 -_08046C10: .4byte 0xfffff7ff -_08046C14: .4byte 0x02024214 + .pool thumb_func_end atk03_ppreduce thumb_func_start atk04_critcalc atk04_critcalc: @ 8046C18 push {r4-r7,lr} - ldr r1, _08046C3C - ldr r0, _08046C40 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -144177,7 +139338,7 @@ atk04_critcalc: @ 8046C18 ldrh r0, [r0, 0x2E] cmp r0, 0xAF bne _08046C48 - ldr r1, _08046C44 + ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -144185,19 +139346,17 @@ atk04_critcalc: @ 8046C18 ldrb r6, [r0, 0x7] b _08046C50 .align 2, 0 -_08046C3C: .4byte 0x02024084 -_08046C40: .4byte 0x0202420b -_08046C44: .4byte 0x02024404 + .pool _08046C48: bl itemid_get_x12 lsls r0, 24 lsrs r6, r0, 24 _08046C50: - ldr r1, _08046CDC - ldr r3, _08046CE0 + ldr r1, =0x0202420f + ldr r3, =0x0202420b ldrb r0, [r3] strb r0, [r1] - ldr r4, _08046CE4 + ldr r4, =0x02024084 ldrb r1, [r3] movs r0, 0x58 adds r7, r1, 0 @@ -144213,8 +139372,8 @@ _08046C50: asrs r5, r0, 31 movs r0, 0x2 ands r5, r0 - ldr r2, _08046CE8 - ldr r0, _08046CEC + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -144270,11 +139429,7 @@ _08046CD0: adds r0, r2, r0 b _08046CF2 .align 2, 0 -_08046CDC: .4byte 0x0202420f -_08046CE0: .4byte 0x0202420b -_08046CE4: .4byte 0x02024084 -_08046CE8: .4byte 0x0831c898 -_08046CEC: .4byte 0x020241ea + .pool _08046CF0: adds r0, r2, r5 _08046CF2: @@ -144286,7 +139441,7 @@ _08046CF2: bls _08046D00 movs r5, 0x4 _08046D00: - ldr r0, _08046D5C + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -144297,7 +139452,7 @@ _08046D00: beq _08046D70 cmp r4, 0x4B beq _08046D70 - ldr r1, _08046D60 + ldr r1, =0x020242ac mov r2, r12 ldrb r0, [r2] lsls r0, 2 @@ -144308,7 +139463,7 @@ _08046D00: ands r0, r1 cmp r0, 0 bne _08046D70 - ldr r0, _08046D64 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x84 lsls r1, 2 @@ -144316,7 +139471,7 @@ _08046D00: cmp r0, 0 bne _08046D70 bl GenerateRandomNumber - ldr r2, _08046D68 + ldr r2, =0x0831c128 lsls r1, r5, 1 adds r1, r2 lsls r0, 16 @@ -144326,21 +139481,17 @@ _08046D00: lsls r0, 16 cmp r0, 0 bne _08046D70 - ldr r1, _08046D6C + ldr r1, =0x02024211 movs r0, 0x2 b _08046D74 .align 2, 0 -_08046D5C: .4byte 0x0202420c -_08046D60: .4byte 0x020242ac -_08046D64: .4byte 0x02022fec -_08046D68: .4byte 0x0831c128 -_08046D6C: .4byte 0x02024211 + .pool _08046D70: - ldr r1, _08046D84 + ldr r1, =0x02024211 movs r0, 0x1 _08046D74: strb r0, [r1] - ldr r1, _08046D88 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -144348,16 +139499,15 @@ _08046D74: pop {r0} bx r0 .align 2, 0 -_08046D84: .4byte 0x02024211 -_08046D88: .4byte 0x02024214 + .pool thumb_func_end atk04_critcalc thumb_func_start atk05_cmd5 atk05_cmd5: @ 8046D8C push {r4-r7,lr} sub sp, 0x10 - ldr r4, _08046E44 - ldr r5, _08046E48 + ldr r4, =0x0202428e + ldr r5, =0x0202420c ldrb r0, [r5] bl battle_get_per_side_status movs r1, 0x1 @@ -144365,21 +139515,21 @@ atk05_cmd5: @ 8046D8C lsls r1, 1 adds r1, r4 ldrh r3, [r1] - ldr r6, _08046E4C + ldr r6, =0x0202420b ldrb r0, [r6] movs r4, 0x58 muls r0, r4 - ldr r2, _08046E50 + ldr r2, =0x02024084 adds r0, r2 ldrb r1, [r5] muls r1, r4 adds r1, r2 - ldr r7, _08046E54 + ldr r7, =0x020241ea ldrh r2, [r7] - ldr r4, _08046E58 + ldr r4, =0x02024400 ldrh r4, [r4] str r4, [sp] - ldr r4, _08046E5C + ldr r4, =0x0202449c ldr r4, [r4] ldrb r4, [r4, 0x13] str r4, [sp, 0x4] @@ -144388,16 +139538,16 @@ atk05_cmd5: @ 8046D8C ldrb r4, [r5] str r4, [sp, 0xC] bl sub_806957C - ldr r4, _08046E60 - ldr r1, _08046E64 + ldr r4, =0x020241f0 + ldr r1, =0x02024211 ldrb r1, [r1] muls r1, r0 - ldr r0, _08046E68 + ldr r0, =0x02024474 ldrb r0, [r0, 0xE] adds r3, r1, 0 muls r3, r0 str r3, [r4] - ldr r1, _08046E6C + ldr r1, =0x020242ac ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -144407,7 +139557,7 @@ atk05_cmd5: @ 8046D8C ands r0, r1 cmp r0, 0 beq _08046E10 - ldr r2, _08046E70 + ldr r2, =0x0831c898 ldrh r1, [r7] lsls r0, r1, 1 adds r0, r1 @@ -144419,8 +139569,8 @@ atk05_cmd5: @ 8046D8C lsls r0, r3, 1 str r0, [r4] _08046E10: - ldr r1, _08046E74 - ldr r0, _08046E4C + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -144428,7 +139578,7 @@ _08046E10: lsls r0, 28 cmp r0, 0 bge _08046E32 - ldr r4, _08046E60 + ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 subs r0, r1 @@ -144436,7 +139586,7 @@ _08046E10: bl __divsi3 str r0, [r4] _08046E32: - ldr r1, _08046E78 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -144445,20 +139595,7 @@ _08046E32: pop {r0} bx r0 .align 2, 0 -_08046E44: .4byte 0x0202428e -_08046E48: .4byte 0x0202420c -_08046E4C: .4byte 0x0202420b -_08046E50: .4byte 0x02024084 -_08046E54: .4byte 0x020241ea -_08046E58: .4byte 0x02024400 -_08046E5C: .4byte 0x0202449c -_08046E60: .4byte 0x020241f0 -_08046E64: .4byte 0x02024211 -_08046E68: .4byte 0x02024474 -_08046E6C: .4byte 0x020242ac -_08046E70: .4byte 0x0831c898 -_08046E74: .4byte 0x0202433c -_08046E78: .4byte 0x02024214 + .pool thumb_func_end atk05_cmd5 thumb_func_start sub_8046E7C @@ -144472,7 +139609,7 @@ sub_8046E7C: @ 8046E7C lsrs r7, r0, 24 lsls r5, 24 lsrs r5, 24 - ldr r4, _08046F34 + ldr r4, =0x0202428e adds r0, r5, 0 bl battle_get_per_side_status movs r1, 0x1 @@ -144483,35 +139620,35 @@ sub_8046E7C: @ 8046E7C movs r1, 0x58 adds r0, r7, 0 muls r0, r1 - ldr r2, _08046F38 + ldr r2, =0x02024084 adds r0, r2 muls r1, r5 adds r1, r2 - ldr r2, _08046F3C + ldr r2, =0x020241ea mov r8, r2 ldrh r2, [r2] - ldr r6, _08046F40 + ldr r6, =0x02024400 ldrh r4, [r6] str r4, [sp] - ldr r4, _08046F44 + ldr r4, =0x0202449c ldr r4, [r4] ldrb r4, [r4, 0x13] str r4, [sp, 0x4] str r7, [sp, 0x8] str r5, [sp, 0xC] bl sub_806957C - ldr r4, _08046F48 + ldr r4, =0x020241f0 movs r1, 0 strh r1, [r6] - ldr r1, _08046F4C + ldr r1, =0x02024211 ldrb r1, [r1] muls r1, r0 - ldr r0, _08046F50 + ldr r0, =0x02024474 ldrb r0, [r0, 0xE] adds r3, r1, 0 muls r3, r0 str r3, [r4] - ldr r1, _08046F54 + ldr r1, =0x020242ac lsls r0, r7, 2 adds r0, r1 ldr r0, [r0] @@ -144520,7 +139657,7 @@ sub_8046E7C: @ 8046E7C ands r0, r1 cmp r0, 0 beq _08046F0A - ldr r2, _08046F58 + ldr r2, =0x0831c898 mov r0, r8 ldrh r1, [r0] lsls r0, r1, 1 @@ -144533,14 +139670,14 @@ sub_8046E7C: @ 8046E7C lsls r0, r3, 1 str r0, [r4] _08046F0A: - ldr r0, _08046F5C + ldr r0, =0x0202433c lsls r1, r7, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 28 cmp r0, 0 bge _08046F28 - ldr r4, _08046F48 + ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 subs r0, r1 @@ -144555,17 +139692,7 @@ _08046F28: pop {r0} bx r0 .align 2, 0 -_08046F34: .4byte 0x0202428e -_08046F38: .4byte 0x02024084 -_08046F3C: .4byte 0x020241ea -_08046F40: .4byte 0x02024400 -_08046F44: .4byte 0x0202449c -_08046F48: .4byte 0x020241f0 -_08046F4C: .4byte 0x02024211 -_08046F50: .4byte 0x02024474 -_08046F54: .4byte 0x020242ac -_08046F58: .4byte 0x0831c898 -_08046F5C: .4byte 0x0202433c + .pool thumb_func_end sub_8046E7C thumb_func_start battle_attack_damage_modulate_by_effectivity @@ -144573,7 +139700,7 @@ battle_attack_damage_modulate_by_effectivity: @ 8046F60 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _08046F90 + ldr r5, =0x020241f0 ldr r0, [r5] muls r0, r4 movs r1, 0xA @@ -144594,13 +139721,13 @@ _08046F80: beq _08046F9A b _08047032 .align 2, 0 -_08046F90: .4byte 0x020241f0 + .pool _08046F94: cmp r4, 0x14 beq _08046FF0 b _08047032 _08046F9A: - ldr r2, _08046FAC + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x8 orrs r0, r1 @@ -144610,10 +139737,10 @@ _08046F9A: ands r0, r1 b _08047030 .align 2, 0 -_08046FAC: .4byte 0x0202427c + .pool _08046FB0: - ldr r2, _08046FE0 - ldr r0, _08046FE4 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -144622,7 +139749,7 @@ _08046FB0: ldrb r0, [r0, 0x1] cmp r0, 0 beq _08047032 - ldr r2, _08046FE8 + ldr r2, =0x0202427c ldrb r1, [r2] movs r0, 0x29 ands r0, r1 @@ -144636,15 +139763,13 @@ _08046FB0: ands r0, r1 b _08047030 .align 2, 0 -_08046FE0: .4byte 0x0831c898 -_08046FE4: .4byte 0x020241ea -_08046FE8: .4byte 0x0202427c + .pool _08046FEC: movs r0, 0x4 b _0804702E _08046FF0: - ldr r2, _08047020 - ldr r0, _08047024 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -144653,7 +139778,7 @@ _08046FF0: ldrb r0, [r0, 0x1] cmp r0, 0 beq _08047032 - ldr r2, _08047028 + ldr r2, =0x0202427c ldrb r1, [r2] movs r0, 0x29 ands r0, r1 @@ -144667,9 +139792,7 @@ _08046FF0: ands r0, r1 b _08047030 .align 2, 0 -_08047020: .4byte 0x0831c898 -_08047024: .4byte 0x020241ea -_08047028: .4byte 0x0202427c + .pool _0804702C: movs r0, 0x2 _0804702E: @@ -144689,13 +139812,13 @@ sub_8047038: @ 8047038 push {r7} sub sp, 0x8 movs r3, 0 - ldr r1, _08047060 + ldr r1, =0x020241ea ldrh r0, [r1] cmp r0, 0xA5 bne _0804704C b _08047260 _0804704C: - ldr r0, _08047064 + ldr r0, =0x0202449c ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -144706,10 +139829,9 @@ _0804704C: mov r8, r1 b _08047078 .align 2, 0 -_08047060: .4byte 0x020241ea -_08047064: .4byte 0x0202449c + .pool _08047068: - ldr r2, _08047100 + ldr r2, =0x0831c898 ldrh r1, [r1] lsls r0, r1, 1 adds r0, r1 @@ -144718,8 +139840,8 @@ _08047068: ldrb r0, [r0, 0x2] mov r8, r0 _08047078: - ldr r2, _08047104 - ldr r0, _08047108 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -144736,7 +139858,7 @@ _08047078: cmp r0, r8 bne _080470B0 _0804709A: - ldr r4, _0804710C + ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 subs r0, r1 @@ -144747,7 +139869,7 @@ _0804709A: str r0, [r4] ldr r3, [sp, 0x4] _080470B0: - ldr r2, _08047110 + ldr r2, =0x0202420c ldrb r1, [r2] movs r0, 0x58 muls r0, r1 @@ -144760,25 +139882,25 @@ _080470B0: mov r1, r8 cmp r1, 0x4 bne _08047128 - ldr r3, _08047114 + ldr r3, =0x0202420a strb r0, [r3] - ldr r2, _08047118 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x9 orrs r0, r1 strb r0, [r2] - ldr r1, _0804711C + ldr r1, =0x02024250 ldrb r0, [r4] lsls r0, 1 adds r0, r1 movs r2, 0 strh r2, [r0] - ldr r1, _08047120 + ldr r1, =0x02024258 ldrb r0, [r4] lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r0, _08047124 + ldr r0, =0x02024332 mov r1, r8 strb r1, [r0, 0x6] ldrb r0, [r4] @@ -144786,37 +139908,28 @@ _080470B0: bl b_history__record_ability_usage_of_player b _080471C4 .align 2, 0 -_08047100: .4byte 0x0831c898 -_08047104: .4byte 0x02024084 -_08047108: .4byte 0x0202420b -_0804710C: .4byte 0x020241f0 -_08047110: .4byte 0x0202420c -_08047114: .4byte 0x0202420a -_08047118: .4byte 0x0202427c -_0804711C: .4byte 0x02024250 -_08047120: .4byte 0x02024258 -_08047124: .4byte 0x02024332 + .pool _08047128: - ldr r1, _08047134 + ldr r1, =0x0831ace8 adds r0, r3, r1 ldrb r0, [r0] adds r2, r1, 0 b _080471A4 .align 2, 0 -_08047134: .4byte 0x0831ace8 + .pool _08047138: adds r3, 0x3 b _080471A0 _0804713C: - ldr r5, _08047274 + ldr r5, =0x0831ace8 adds r0, r3, r5 ldrb r0, [r0] cmp r0, r8 bne _08047198 adds r1, r3, 0x1 adds r1, r5 - ldr r2, _08047278 - ldr r7, _0804727C + ldr r2, =0x02024084 + ldr r7, =0x0202420c ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -144855,9 +139968,9 @@ _08047172: ldr r3, [sp, 0x4] _08047198: adds r3, 0x3 - ldr r5, _08047278 - ldr r4, _0804727C - ldr r2, _08047274 + ldr r5, =0x02024084 + ldr r4, =0x0202420c + ldr r2, =0x0831ace8 _080471A0: adds r0, r3, r2 ldrb r0, [r0] @@ -144879,8 +139992,8 @@ _080471A4: cmp r0, 0 beq _08047138 _080471C4: - ldr r2, _08047278 - ldr r5, _0804727C + ldr r2, =0x02024084 + ldr r5, =0x0202420c ldrb r1, [r5] movs r0, 0x58 muls r0, r1 @@ -144889,16 +140002,16 @@ _080471C4: ldrb r6, [r0] cmp r6, 0x19 bne _08047242 - ldr r0, _08047280 + ldr r0, =0x0202420b ldrb r0, [r0] - ldr r7, _08047284 + ldr r7, =0x020241ea ldrh r1, [r7] bl move_weather_interaction lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 bne _08047242 - ldr r1, _08047288 + ldr r1, =0x0202427c mov r8, r1 ldrb r4, [r1] ands r0, r4 @@ -144909,7 +140022,7 @@ _080471C4: cmp r0, 0x6 bne _08047242 _08047200: - ldr r2, _0804728C + ldr r2, =0x0831c898 ldrh r1, [r7] lsls r0, r1, 1 adds r0, r1 @@ -144918,38 +140031,38 @@ _08047200: ldrb r0, [r0, 0x1] cmp r0, 0 beq _08047242 - ldr r3, _08047290 + ldr r3, =0x0202420a strb r6, [r3] movs r0, 0x1 orrs r0, r4 mov r1, r8 strb r0, [r1] - ldr r1, _08047294 + ldr r1, =0x02024250 ldrb r0, [r5] lsls r0, 1 adds r0, r1 movs r2, 0 strh r2, [r0] - ldr r1, _08047298 + ldr r1, =0x02024258 ldrb r0, [r5] lsls r0, 1 adds r0, r1 strh r2, [r0] - ldr r1, _0804729C + ldr r1, =0x02024332 movs r0, 0x3 strb r0, [r1, 0x6] ldrb r0, [r5] ldrb r1, [r3] bl b_history__record_ability_usage_of_player _08047242: - ldr r0, _08047288 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x8 ands r0, r1 cmp r0, 0 beq _08047260 - ldr r2, _080472A0 - ldr r0, _08047280 + ldr r2, =0x0202433c + ldr r0, =0x0202420b ldrb r1, [r0] lsls r1, 4 adds r1, r2 @@ -144958,7 +140071,7 @@ _08047242: orrs r0, r2 strb r0, [r1, 0x1] _08047260: - ldr r1, _080472A4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -144969,19 +140082,7 @@ _08047260: pop {r0} bx r0 .align 2, 0 -_08047274: .4byte 0x0831ace8 -_08047278: .4byte 0x02024084 -_0804727C: .4byte 0x0202420c -_08047280: .4byte 0x0202420b -_08047284: .4byte 0x020241ea -_08047288: .4byte 0x0202427c -_0804728C: .4byte 0x0831c898 -_08047290: .4byte 0x0202420a -_08047294: .4byte 0x02024250 -_08047298: .4byte 0x02024258 -_0804729C: .4byte 0x02024332 -_080472A0: .4byte 0x0202433c -_080472A4: .4byte 0x02024214 + .pool thumb_func_end sub_8047038 thumb_func_start b_wonderguard_and_levitate @@ -144992,14 +140093,14 @@ b_wonderguard_and_levitate: @ 80472A8 push {r6,r7} movs r6, 0 movs r5, 0 - ldr r0, _080472E8 + ldr r0, =0x020241ea ldrh r1, [r0] mov r9, r0 cmp r1, 0xA5 bne _080472C0 b _08047508 _080472C0: - ldr r2, _080472EC + ldr r2, =0x0831c898 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 @@ -145009,7 +140110,7 @@ _080472C0: bne _080472D2 b _08047508 _080472D2: - ldr r0, _080472F0 + ldr r0, =0x0202449c ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0 @@ -145021,15 +140122,13 @@ _080472D2: mov r12, r2 b _080472F8 .align 2, 0 -_080472E8: .4byte 0x020241ea -_080472EC: .4byte 0x0831c898 -_080472F0: .4byte 0x0202449c + .pool _080472F4: ldrb r1, [r1, 0x2] mov r12, r1 _080472F8: - ldr r2, _0804732C - ldr r3, _08047330 + ldr r2, =0x02024084 + ldr r3, =0x0202420c ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -145043,9 +140142,9 @@ _080472F8: mov r0, r12 cmp r0, 0x4 bne _0804733C - ldr r0, _08047334 + ldr r0, =0x0202420a strb r1, [r0] - ldr r0, _08047338 + ldr r0, =0x02024332 mov r1, r12 strb r1, [r0, 0x6] ldrb r0, [r3] @@ -145053,18 +140152,15 @@ _080472F8: bl b_history__record_ability_usage_of_player b _08047508 .align 2, 0 -_0804732C: .4byte 0x02024084 -_08047330: .4byte 0x0202420c -_08047334: .4byte 0x0202420a -_08047338: .4byte 0x02024332 + .pool _0804733C: - ldr r1, _08047348 + ldr r1, =0x0831ace8 adds r0, r5, r1 ldrb r0, [r0] adds r4, r1, 0 b _0804748E .align 2, 0 -_08047348: .4byte 0x0831ace8 + .pool _0804734C: adds r0, r5, r4 ldrb r0, [r0] @@ -145090,13 +140186,13 @@ _08047356: ldrb r0, [r0] cmp r0, 0 bne _08047396 - ldr r2, _08047514 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, _08047518 - ldr r0, _0804751C + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r2, [r0] lsls r2, 4 adds r2, r1 @@ -145126,13 +140222,13 @@ _08047396: ldrb r0, [r0] cmp r0, 0 bne _080473DC - ldr r2, _08047514 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, _08047518 - ldr r0, _0804751C + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r2, [r0] lsls r2, 4 adds r2, r1 @@ -145264,7 +140360,7 @@ _080474B2: ldrb r4, [r0] cmp r4, 0x19 bne _08047508 - ldr r0, _0804751C + ldr r0, =0x0202420b ldrb r0, [r0] mov r2, r9 ldrh r1, [r2] @@ -145277,7 +140373,7 @@ _080474B2: ands r6, r0 cmp r6, 0x1 beq _08047508 - ldr r2, _08047520 + ldr r2, =0x0831c898 mov r0, r9 ldrh r1, [r0] lsls r0, r1, 1 @@ -145287,9 +140383,9 @@ _080474B2: ldrb r0, [r0, 0x1] cmp r0, 0 beq _08047508 - ldr r0, _08047524 + ldr r0, =0x0202420a strb r4, [r0] - ldr r1, _08047528 + ldr r1, =0x02024332 movs r0, 0x3 strb r0, [r1, 0x6] mov r1, r8 @@ -145304,12 +140400,7 @@ _08047508: pop {r0} bx r0 .align 2, 0 -_08047514: .4byte 0x0202427c -_08047518: .4byte 0x0202433c -_0804751C: .4byte 0x0202420b -_08047520: .4byte 0x0831c898 -_08047524: .4byte 0x0202420a -_08047528: .4byte 0x02024332 + .pool thumb_func_end b_wonderguard_and_levitate thumb_func_start b_attack_effectivity_adapt @@ -145320,7 +140411,7 @@ b_attack_effectivity_adapt: @ 804752C lsrs r4, r0, 24 lsls r1, 16 lsrs r5, r1, 16 - ldr r7, _08047560 + ldr r7, =0x020241f0 ldr r0, [r7] muls r0, r4 movs r1, 0xA @@ -145341,7 +140432,7 @@ _08047552: beq _0804756A b _080475DE .align 2, 0 -_08047560: .4byte 0x020241f0 + .pool _08047564: cmp r4, 0x14 beq _080475AC @@ -145356,7 +140447,7 @@ _0804756A: ands r0, r1 b _080475DC _0804757A: - ldr r0, _080475A4 + ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 lsls r1, 2 @@ -145377,12 +140468,12 @@ _0804757A: ands r0, r1 b _080475DC .align 2, 0 -_080475A4: .4byte 0x0831c898 + .pool _080475A8: movs r0, 0x4 b _080475DA _080475AC: - ldr r0, _080475D4 + ldr r0, =0x0831c898 lsls r1, r5, 1 adds r1, r5 lsls r1, 2 @@ -145403,7 +140494,7 @@ _080475AC: ands r0, r1 b _080475DC .align 2, 0 -_080475D4: .4byte 0x0831c898 + .pool _080475D8: movs r0, 0x2 _080475DA: @@ -145444,7 +140535,7 @@ move_effectiveness_something: @ 80475E4 movs r0, 0 b _0804779E _08047616: - ldr r1, _08047684 + ldr r1, =0x0831c898 mov r3, r10 lsls r2, r3, 1 adds r0, r2, r3 @@ -145452,7 +140543,7 @@ _08047616: adds r0, r1 ldrb r0, [r0, 0x2] str r0, [sp, 0x8] - ldr r1, _08047688 + ldr r1, =0x02024084 movs r0, 0x58 ldr r3, [sp, 0x4] muls r0, r3 @@ -145471,7 +140562,7 @@ _08047616: cmp r0, r1 bne _0804765C _0804764A: - ldr r4, _0804768C + ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 subs r0, r1 @@ -145500,11 +140591,9 @@ _0804765C: strb r0, [r1] b _08047740 .align 2, 0 -_08047684: .4byte 0x0831c898 -_08047688: .4byte 0x02024084 -_0804768C: .4byte 0x020241f0 + .pool _08047690: - ldr r1, _080476AC + ldr r1, =0x0831ace8 mov r2, r8 adds r0, r2, r1 ldrb r0, [r0] @@ -145519,13 +140608,13 @@ _08047690: adds r0, r3, 0 b _0804772E .align 2, 0 -_080476AC: .4byte 0x0831ace8 + .pool _080476B0: movs r0, 0x3 add r8, r0 b _08047718 _080476B6: - ldr r7, _080477B0 + ldr r7, =0x0831ace8 mov r1, r8 adds r0, r1, r7 ldrb r0, [r0] @@ -145534,7 +140623,7 @@ _080476B6: bne _08047710 adds r1, 0x1 adds r1, r7 - ldr r2, _080477B4 + ldr r2, =0x02024084 movs r0, 0x58 mov r3, r9 muls r3, r0 @@ -145572,8 +140661,8 @@ _080476F0: _08047710: movs r1, 0x3 add r8, r1 - ldr r5, _080477B4 - ldr r2, _080477B0 + ldr r5, =0x02024084 + ldr r2, =0x0831ace8 _08047718: mov r3, r8 adds r0, r3, r2 @@ -145630,7 +140719,7 @@ _08047740: cmp r0, 0x6 bne _0804779A _08047782: - ldr r0, _080477B8 + ldr r0, =0x0831c898 ldr r1, [sp, 0xC] add r1, r10 lsls r1, 2 @@ -145655,9 +140744,7 @@ _0804779E: pop {r1} bx r1 .align 2, 0 -_080477B0: .4byte 0x0831ace8 -_080477B4: .4byte 0x02024084 -_080477B8: .4byte 0x0831c898 + .pool thumb_func_end move_effectiveness_something thumb_func_start ai_rate_move @@ -145678,7 +140765,7 @@ ai_rate_move: @ 80477BC movs r7, 0 mov r0, sp strb r7, [r0] - ldr r2, _080477F8 + ldr r2, =0x083203cc lsls r0, r1, 3 subs r0, r1 lsls r0, 2 @@ -145692,9 +140779,9 @@ ai_rate_move: @ 80477BC movs r0, 0 b _080478A0 .align 2, 0 -_080477F8: .4byte 0x083203cc + .pool _080477FC: - ldr r2, _08047820 + ldr r2, =0x0831c898 lsls r1, r6, 1 adds r0, r1, r6 lsls r0, 2 @@ -145712,9 +140799,9 @@ _080477FC: strb r1, [r0] b _0804786A .align 2, 0 -_08047820: .4byte 0x0831c898 + .pool _08047824: - ldr r0, _080478B0 + ldr r0, =0x0831ace8 adds r1, r7, r0 ldrb r0, [r1] cmp r0, 0xFF @@ -145745,7 +140832,7 @@ _0804784A: _0804785C: adds r4, 0x3 adds r7, 0x3 - ldr r1, _080478B0 + ldr r1, =0x0831ace8 adds r0, r7, r1 ldrb r0, [r0] cmp r0, 0xFF @@ -145765,7 +140852,7 @@ _0804786A: cmp r0, 0x6 bne _0804789C _08047884: - ldr r0, _080478B4 + ldr r0, =0x0831c898 ldr r3, [sp, 0x8] adds r1, r3, r6 lsls r1, 2 @@ -145790,8 +140877,7 @@ _080478A0: pop {r1} bx r1 .align 2, 0 -_080478B0: .4byte 0x0831ace8 -_080478B4: .4byte 0x0831c898 + .pool thumb_func_end ai_rate_move thumb_func_start sub_80478B8 @@ -145806,7 +140892,7 @@ sub_80478B8: @ 80478B8 subs r1, r0 lsls r1, 16 lsrs r1, 16 - ldr r4, _080478F0 + ldr r4, =0x020241f0 ldr r0, [r4] cmp r0, 0 beq _080478EA @@ -145824,7 +140910,7 @@ _080478EA: pop {r0} bx r0 .align 2, 0 -_080478F0: .4byte 0x020241f0 + .pool thumb_func_end sub_80478B8 thumb_func_start atk07_cmd7 @@ -145839,7 +140925,7 @@ atk07_cmd7: @ 80478F4 subs r1, r0 lsls r1, 16 lsrs r1, 16 - ldr r4, _0804794C + ldr r4, =0x020241f0 ldr r0, [r4] cmp r0, 0 beq _08047926 @@ -145853,8 +140939,8 @@ atk07_cmd7: @ 80478F4 movs r0, 0x1 str r0, [r4] _08047926: - ldr r7, _08047950 - ldr r6, _08047954 + ldr r7, =0x02024084 + ldr r6, =0x0202420c ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -145863,7 +140949,7 @@ _08047926: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0804795C - ldr r1, _08047958 + ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -145872,10 +140958,7 @@ _08047926: ldrb r6, [r0, 0x1A] b _08047976 .align 2, 0 -_0804794C: .4byte 0x020241f0 -_08047950: .4byte 0x02024084 -_08047954: .4byte 0x0202420c -_08047958: .4byte 0x02024404 + .pool _0804795C: ldrh r0, [r1, 0x2E] bl itemid_get_x12 @@ -145889,8 +140972,8 @@ _0804795C: lsls r0, 24 lsrs r6, r0, 24 _08047976: - ldr r1, _08047A38 - ldr r5, _08047A3C + ldr r1, =0x0202420f + ldr r5, =0x0202420c ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -145907,7 +140990,7 @@ _08047976: ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player - ldr r2, _08047A40 + ldr r2, =0x0202437c ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -145918,8 +141001,8 @@ _08047976: orrs r1, r2 strb r1, [r0] _080479B4: - ldr r2, _08047A44 - ldr r3, _08047A3C + ldr r2, =0x02024084 + ldr r3, =0x0202420c ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -145933,8 +141016,8 @@ _080479B4: adds r5, r2, 0 cmp r1, 0 bne _08047A84 - ldr r2, _08047A48 - ldr r0, _08047A4C + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -145943,14 +141026,14 @@ _080479B4: ldrb r0, [r0] cmp r0, 0x65 beq _08047A06 - ldr r0, _08047A50 + ldr r0, =0x0202433c lsls r1, r4, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 blt _08047A06 - ldr r0, _08047A40 + ldr r0, =0x0202437c lsls r1, r4, 2 adds r1, r4 lsls r1, 2 @@ -145965,13 +141048,13 @@ _08047A06: muls r0, r4 adds r0, r5 ldrh r1, [r0, 0x28] - ldr r2, _08047A54 + ldr r2, =0x020241f0 ldr r0, [r2] cmp r1, r0 bgt _08047A84 subs r0, r1, 0x1 str r0, [r2] - ldr r1, _08047A50 + ldr r1, =0x0202433c ldrb r3, [r3] lsls r0, r3, 4 adds r0, r1 @@ -145979,24 +141062,16 @@ _08047A06: lsls r0, 30 cmp r0, 0 bge _08047A5C - ldr r0, _08047A58 + ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x40 orrs r1, r2 strb r1, [r0] b _08047A84 .align 2, 0 -_08047A38: .4byte 0x0202420f -_08047A3C: .4byte 0x0202420c -_08047A40: .4byte 0x0202437c -_08047A44: .4byte 0x02024084 -_08047A48: .4byte 0x0831c898 -_08047A4C: .4byte 0x020241ea -_08047A50: .4byte 0x0202433c -_08047A54: .4byte 0x020241f0 -_08047A58: .4byte 0x0202427c + .pool _08047A5C: - ldr r0, _08047A94 + ldr r0, =0x0202437c lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -146005,19 +141080,19 @@ _08047A5C: lsrs r0, 7 cmp r0, 0 beq _08047A84 - ldr r2, _08047A98 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _08047A9C + ldr r1, =0x02024208 adds r0, r3, 0 muls r0, r4 adds r0, r5 ldrh r0, [r0, 0x2E] strh r0, [r1] _08047A84: - ldr r1, _08047AA0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -146025,10 +141100,7 @@ _08047A84: pop {r0} bx r0 .align 2, 0 -_08047A94: .4byte 0x0202437c -_08047A98: .4byte 0x0202427c -_08047A9C: .4byte 0x02024208 -_08047AA0: .4byte 0x02024214 + .pool thumb_func_end atk07_cmd7 thumb_func_start atk08_cmd8 @@ -146043,7 +141115,7 @@ atk08_cmd8: @ 8047AA4 subs r1, r0 lsls r1, 16 lsrs r1, 16 - ldr r4, _08047AFC + ldr r4, =0x020241f0 ldr r0, [r4] cmp r0, 0 beq _08047AD6 @@ -146057,8 +141129,8 @@ atk08_cmd8: @ 8047AA4 movs r0, 0x1 str r0, [r4] _08047AD6: - ldr r7, _08047B00 - ldr r6, _08047B04 + ldr r7, =0x02024084 + ldr r6, =0x0202420c ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -146067,7 +141139,7 @@ _08047AD6: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _08047B0C - ldr r1, _08047B08 + ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -146076,10 +141148,7 @@ _08047AD6: ldrb r6, [r0, 0x1A] b _08047B26 .align 2, 0 -_08047AFC: .4byte 0x020241f0 -_08047B00: .4byte 0x02024084 -_08047B04: .4byte 0x0202420c -_08047B08: .4byte 0x02024404 + .pool _08047B0C: ldrh r0, [r1, 0x2E] bl itemid_get_x12 @@ -146093,8 +141162,8 @@ _08047B0C: lsls r0, 24 lsrs r6, r0, 24 _08047B26: - ldr r1, _08047BCC - ldr r5, _08047BD0 + ldr r1, =0x0202420f + ldr r5, =0x0202420c ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -146111,7 +141180,7 @@ _08047B26: ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player - ldr r2, _08047BD4 + ldr r2, =0x0202437c ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -146122,8 +141191,8 @@ _08047B26: orrs r1, r2 strb r1, [r0] _08047B64: - ldr r4, _08047BD8 - ldr r6, _08047BD0 + ldr r4, =0x02024084 + ldr r6, =0x0202420c ldrb r2, [r6] movs r7, 0x58 adds r3, r2, 0 @@ -146137,14 +141206,14 @@ _08047B64: ands r0, r1 cmp r0, 0 bne _08047C10 - ldr r5, _08047BDC + ldr r5, =0x0202433c lsls r0, r2, 4 adds r0, r5 ldrb r0, [r0] lsls r0, 30 cmp r0, 0 blt _08047BA2 - ldr r0, _08047BD4 + ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -146156,7 +141225,7 @@ _08047B64: _08047BA2: adds r0, r3, r4 ldrh r1, [r0, 0x28] - ldr r2, _08047BE0 + ldr r2, =0x020241f0 ldr r0, [r2] cmp r1, r0 bgt _08047C10 @@ -146169,22 +141238,16 @@ _08047BA2: lsls r0, 30 cmp r0, 0 bge _08047BE8 - ldr r0, _08047BE4 + ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x40 orrs r1, r2 strb r1, [r0] b _08047C10 .align 2, 0 -_08047BCC: .4byte 0x0202420f -_08047BD0: .4byte 0x0202420c -_08047BD4: .4byte 0x0202437c -_08047BD8: .4byte 0x02024084 -_08047BDC: .4byte 0x0202433c -_08047BE0: .4byte 0x020241f0 -_08047BE4: .4byte 0x0202427c + .pool _08047BE8: - ldr r0, _08047C20 + ldr r0, =0x0202437c lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -146193,19 +141256,19 @@ _08047BE8: lsrs r0, 7 cmp r0, 0 beq _08047C10 - ldr r2, _08047C24 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _08047C28 + ldr r1, =0x02024208 adds r0, r3, 0 muls r0, r7 adds r0, r4 ldrh r0, [r0, 0x2E] strh r0, [r1] _08047C10: - ldr r1, _08047C2C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -146213,27 +141276,24 @@ _08047C10: pop {r0} bx r0 .align 2, 0 -_08047C20: .4byte 0x0202437c -_08047C24: .4byte 0x0202427c -_08047C28: .4byte 0x02024208 -_08047C2C: .4byte 0x02024214 + .pool thumb_func_end atk08_cmd8 thumb_func_start atk09_attackanimation atk09_attackanimation: @ 8047C30 push {r4-r7,lr} sub sp, 0x10 - ldr r0, _08047C74 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _08047C3E b _08047DB6 _08047C3E: - ldr r0, _08047C78 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 - ldr r5, _08047C7C + ldr r5, =0x020241ea cmp r0, 0 beq _08047C8C ldrh r0, [r5] @@ -146241,13 +141301,13 @@ _08047C3E: beq _08047C8C cmp r0, 0xA4 beq _08047C8C - ldr r4, _08047C80 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _08047C84 + ldr r0, =0x082dabb9 str r0, [r4] - ldr r1, _08047C88 + ldr r1, =0x02024474 ldrb r0, [r1, 0x18] adds r0, 0x1 strb r0, [r1, 0x18] @@ -146256,14 +141316,9 @@ _08047C3E: strb r0, [r1, 0x19] b _08047DB6 .align 2, 0 -_08047C74: .4byte 0x02024068 -_08047C78: .4byte 0x02024280 -_08047C7C: .4byte 0x020241ea -_08047C80: .4byte 0x02024214 -_08047C84: .4byte 0x082dabb9 -_08047C88: .4byte 0x02024474 + .pool _08047C8C: - ldr r2, _08047CF8 + ldr r2, =0x0831c898 ldrh r1, [r5] lsls r0, r1, 1 adds r0, r1 @@ -146283,23 +141338,23 @@ _08047C8C: cmp r0, 0 beq _08047CBA _08047CB2: - ldr r0, _08047CFC + ldr r0, =0x02024474 ldrb r0, [r0, 0x19] cmp r0, 0 bne _08047D88 _08047CBA: - ldr r0, _08047D00 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 bne _08047DA8 - ldr r1, _08047D04 - ldr r3, _08047D08 + ldr r1, =0x02024064 + ldr r3, =0x0202420b ldrb r0, [r3] strb r0, [r1] - ldr r2, _08047D0C - ldr r0, _08047D10 + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 adds r4, r1, 0 @@ -146315,27 +141370,20 @@ _08047CBA: mov r12, r2 cmp r1, 0 beq _08047D18 - ldr r0, _08047D14 + ldr r0, =0x02024212 ldrb r6, [r0] b _08047D42 .align 2, 0 -_08047CF8: .4byte 0x0831c898 -_08047CFC: .4byte 0x02024474 -_08047D00: .4byte 0x0202427c -_08047D04: .4byte 0x02024064 -_08047D08: .4byte 0x0202420b -_08047D0C: .4byte 0x02024084 -_08047D10: .4byte 0x0202420c -_08047D14: .4byte 0x02024212 + .pool _08047D18: - ldr r3, _08047D38 + ldr r3, =0x02024212 ldrb r0, [r3] cmp r0, 0x1 bls _08047D40 mov r1, r12 adds r0, r4, r1 ldrh r2, [r0, 0x28] - ldr r0, _08047D3C + ldr r0, =0x020241f0 ldr r1, [r0] movs r6, 0x1 adds r4, r0, 0 @@ -146344,17 +141392,16 @@ _08047D18: ldrb r6, [r3] b _08047D44 .align 2, 0 -_08047D38: .4byte 0x02024212 -_08047D3C: .4byte 0x020241f0 + .pool _08047D40: ldrb r6, [r3] _08047D42: - ldr r4, _08047D94 + ldr r4, =0x020241f0 _08047D44: ldrh r1, [r5] - ldr r5, _08047D98 + ldr r5, =0x02024474 ldrb r2, [r5, 0x18] - ldr r0, _08047D9C + ldr r0, =0x020244e0 ldrh r3, [r0] ldr r0, [r4] str r0, [sp] @@ -146369,7 +141416,7 @@ _08047D44: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r4, _08047DA0 + ldr r4, =0x020242bc adds r0, r4 str r0, [sp, 0x8] str r6, [sp, 0xC] @@ -146384,23 +141431,19 @@ _08047D44: ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution _08047D88: - ldr r1, _08047DA4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] b _08047DB6 .align 2, 0 -_08047D94: .4byte 0x020241f0 -_08047D98: .4byte 0x02024474 -_08047D9C: .4byte 0x020244e0 -_08047DA0: .4byte 0x020242bc -_08047DA4: .4byte 0x02024214 + .pool _08047DA8: - ldr r4, _08047DC0 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _08047DC4 + ldr r0, =0x082dabb9 str r0, [r4] _08047DB6: add sp, 0x10 @@ -146408,18 +141451,17 @@ _08047DB6: pop {r0} bx r0 .align 2, 0 -_08047DC0: .4byte 0x02024214 -_08047DC4: .4byte 0x082dabb9 + .pool thumb_func_end atk09_attackanimation thumb_func_start sub_8047DC8 sub_8047DC8: @ 8047DC8 push {lr} - ldr r0, _08047DE0 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _08047DDA - ldr r1, _08047DE4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -146427,30 +141469,29 @@ _08047DDA: pop {r0} bx r0 .align 2, 0 -_08047DE0: .4byte 0x02024068 -_08047DE4: .4byte 0x02024214 + .pool thumb_func_end sub_8047DC8 thumb_func_start atk0B_graphicalhpupdate atk0B_graphicalhpupdate: @ 8047DE8 push {r4,lr} - ldr r0, _08047E4C + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _08047EAA - ldr r0, _08047E50 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 bne _08047EA2 - ldr r0, _08047E54 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r2, _08047E58 + ldr r2, =0x02024064 strb r0, [r2] - ldr r1, _08047E5C + ldr r1, =0x02024084 ldrb r2, [r2] movs r0, 0x58 muls r0, r2 @@ -146462,7 +141503,7 @@ atk0B_graphicalhpupdate: @ 8047DE8 ands r0, r1 cmp r0, 0 beq _08047E68 - ldr r0, _08047E60 + ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -146470,7 +141511,7 @@ atk0B_graphicalhpupdate: @ 8047DE8 ldrb r0, [r1, 0xA] cmp r0, 0 beq _08047E68 - ldr r0, _08047E64 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 1 @@ -146482,17 +141523,11 @@ atk0B_graphicalhpupdate: @ 8047DE8 bl b_std_message b _08047EA2 .align 2, 0 -_08047E4C: .4byte 0x02024068 -_08047E50: .4byte 0x0202427c -_08047E54: .4byte 0x02024214 -_08047E58: .4byte 0x02024064 -_08047E5C: .4byte 0x02024084 -_08047E60: .4byte 0x020242bc -_08047E64: .4byte 0x02024280 + .pool _08047E68: - ldr r0, _08047EB0 + ldr r0, =0x020241f0 ldr r0, [r0] - ldr r1, _08047EB4 + ldr r1, =0x00002710 cmp r0, r1 bgt _08047E76 lsls r0, 16 @@ -146500,7 +141535,7 @@ _08047E68: _08047E76: movs r0, 0 bl dp01_build_cmdbuf_x18_0_aa_health_bar_update - ldr r4, _08047EB8 + ldr r4, =0x02024064 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution ldrb r0, [r4] @@ -146508,17 +141543,17 @@ _08047E76: lsls r0, 24 cmp r0, 0 bne _08047EA2 - ldr r0, _08047EB0 + ldr r0, =0x020241f0 ldr r0, [r0] cmp r0, 0 ble _08047EA2 - ldr r0, _08047EBC + ldr r0, =0x03005d10 ldrb r1, [r0, 0x5] movs r2, 0x1 orrs r1, r2 strb r1, [r0, 0x5] _08047EA2: - ldr r1, _08047EC0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -146527,24 +141562,20 @@ _08047EAA: pop {r0} bx r0 .align 2, 0 -_08047EB0: .4byte 0x020241f0 -_08047EB4: .4byte 0x00002710 -_08047EB8: .4byte 0x02024064 -_08047EBC: .4byte 0x03005d10 -_08047EC0: .4byte 0x02024214 + .pool thumb_func_end atk0B_graphicalhpupdate thumb_func_start atk0C_datahpupdate atk0C_datahpupdate: @ 8047EC4 push {r4-r7,lr} sub sp, 0x4 - ldr r0, _08047EEC + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _08047ED2 b _080482A2 _08047ED2: - ldr r0, _08047EF0 + ldr r0, =0x0202449c ldr r0, [r0] ldrb r1, [r0, 0x13] cmp r1, 0 @@ -146557,11 +141588,10 @@ _08047ED2: ands r6, r1 b _08047F04 .align 2, 0 -_08047EEC: .4byte 0x02024068 -_08047EF0: .4byte 0x0202449c + .pool _08047EF4: - ldr r2, _08047F90 - ldr r0, _08047F94 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -146569,7 +141599,7 @@ _08047EF4: adds r0, r2 ldrb r6, [r0, 0x2] _08047F04: - ldr r0, _08047F98 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -146577,13 +141607,13 @@ _08047F04: beq _08047F12 b _08048274 _08047F12: - ldr r0, _08047F9C + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r7, _08047FA0 + ldr r7, =0x02024064 strb r0, [r7] - ldr r1, _08047FA4 + ldr r1, =0x02024084 ldrb r2, [r7] movs r0, 0x58 muls r0, r2 @@ -146595,7 +141625,7 @@ _08047F12: ands r0, r1 cmp r0, 0 beq _08048028 - ldr r0, _08047FA8 + ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -146604,7 +141634,7 @@ _08047F12: mov r12, r0 cmp r1, 0 beq _08048028 - ldr r0, _08047FAC + ldr r0, =0x02024280 ldr r3, [r0] movs r0, 0x80 lsls r0, 1 @@ -146612,11 +141642,11 @@ _08047F12: cmp r3, 0 bne _08048028 adds r5, r1, 0 - ldr r6, _08047FB0 + ldr r6, =0x020241f0 ldr r4, [r6] cmp r5, r4 blt _08047FBC - ldr r0, _08047FB4 + ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -146636,24 +141666,14 @@ _08047F76: ldrb r0, [r1, 0xA] subs r0, r2 strb r0, [r1, 0xA] - ldr r1, _08047FB8 + ldr r1, =0x020241f4 ldr r0, [r6] str r0, [r1] b _08047FEC .align 2, 0 -_08047F90: .4byte 0x0831c898 -_08047F94: .4byte 0x020241ea -_08047F98: .4byte 0x0202427c -_08047F9C: .4byte 0x02024214 -_08047FA0: .4byte 0x02024064 -_08047FA4: .4byte 0x02024084 -_08047FA8: .4byte 0x020242bc -_08047FAC: .4byte 0x02024280 -_08047FB0: .4byte 0x020241f0 -_08047FB4: .4byte 0x0202437c -_08047FB8: .4byte 0x020241f4 + .pool _08047FBC: - ldr r0, _08048014 + ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -146664,7 +141684,7 @@ _08047FBC: bne _08047FD0 str r5, [r1] _08047FD0: - ldr r2, _08048018 + ldr r2, =0x020241f4 ldrb r1, [r7] lsls r0, r1, 3 subs r0, r1 @@ -146679,7 +141699,7 @@ _08047FD0: add r0, r12 strb r3, [r0, 0xA] _08047FEC: - ldr r0, _0804801C + ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -146690,34 +141710,30 @@ _08047FEC: beq _08048000 b _0804829A _08048000: - ldr r4, _08048020 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x2 str r0, [r4] bl b_movescr_stack_push_cursor - ldr r0, _08048024 + ldr r0, =0x082db6fb str r0, [r4] b _080482A2 .align 2, 0 -_08048014: .4byte 0x0202437c -_08048018: .4byte 0x020241f4 -_0804801C: .4byte 0x02024064 -_08048020: .4byte 0x02024214 -_08048024: .4byte 0x082db6fb + .pool _08048028: - ldr r0, _08048068 + ldr r0, =0x02024280 ldr r2, [r0] - ldr r1, _0804806C + ldr r1, =0xfffffeff ands r2, r1 str r2, [r0] - ldr r1, _08048070 + ldr r1, =0x020241f0 ldr r5, [r1] mov r12, r0 adds r7, r1, 0 cmp r5, 0 bge _0804807C - ldr r4, _08048074 - ldr r2, _08048078 + ldr r4, =0x02024084 + ldr r2, =0x02024064 ldrb r0, [r2] movs r3, 0x58 adds r1, r0, 0 @@ -146739,11 +141755,7 @@ _08048064: strh r3, [r1, 0x28] b _0804823A .align 2, 0 -_08048068: .4byte 0x02024280 -_0804806C: .4byte 0xfffffeff -_08048070: .4byte 0x020241f0 -_08048074: .4byte 0x02024084 -_08048078: .4byte 0x02024064 + .pool _0804807C: movs r0, 0x20 ands r0, r2 @@ -146754,46 +141766,42 @@ _0804807C: ands r2, r0 mov r0, r12 str r2, [r0] - ldr r5, _08048094 + ldr r5, =0x02024064 b _080480E0 .align 2, 0 -_08048094: .4byte 0x02024064 + .pool _08048098: - ldr r0, _080480C0 - ldr r2, _080480C4 + ldr r0, =0x020241f8 + ldr r2, =0x02024064 ldrb r1, [r2] lsls r1, 2 adds r1, r0 ldr r0, [r1] adds r0, r5 str r0, [r1] - ldr r0, _080480C8 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] adds r5, r2, 0 cmp r0, 0 bne _080480D4 - ldr r1, _080480CC + ldr r1, =0x02024288 ldrb r0, [r5] adds r0, r1 - ldr r1, _080480D0 + ldr r1, =0x0202420b b _080480DC .align 2, 0 -_080480C0: .4byte 0x020241f8 -_080480C4: .4byte 0x02024064 -_080480C8: .4byte 0x02024214 -_080480CC: .4byte 0x02024288 -_080480D0: .4byte 0x0202420b + .pool _080480D4: - ldr r1, _08048100 + ldr r1, =0x02024288 ldrb r0, [r5] adds r0, r1 - ldr r1, _08048104 + ldr r1, =0x0202420c _080480DC: ldrb r1, [r1] strb r1, [r0] _080480E0: - ldr r4, _08048108 + ldr r4, =0x02024084 ldrb r0, [r5] movs r3, 0x58 muls r0, r3 @@ -146804,17 +141812,14 @@ _080480E0: ble _08048110 subs r0, r1 strh r0, [r2, 0x28] - ldr r0, _0804810C + ldr r0, =0x020241f4 str r1, [r0] adds r7, r0, 0 b _08048120 .align 2, 0 -_08048100: .4byte 0x02024288 -_08048104: .4byte 0x0202420c -_08048108: .4byte 0x02024084 -_0804810C: .4byte 0x020241f4 + .pool _08048110: - ldr r2, _08048194 + ldr r2, =0x020241f4 str r0, [r2] ldrb r0, [r5] muls r0, r3 @@ -146823,7 +141828,7 @@ _08048110: strh r1, [r0, 0x28] adds r7, r2, 0 _08048120: - ldr r2, _08048198 + ldr r2, =0x0202437c ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -146853,11 +141858,11 @@ _08048148: ands r0, r1 cmp r0, 0 bne _080481CC - ldr r0, _0804819C + ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xDC beq _080481CC - ldr r3, _080481A0 + ldr r3, =0x0202433c ldrb r0, [r5] lsls r0, 4 adds r1, r3, 0x4 @@ -146872,7 +141877,7 @@ _08048148: adds r1, 0x8 adds r0, r1 str r2, [r0] - ldr r0, _080481A4 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -146880,20 +141885,15 @@ _08048148: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _080481A8 + ldr r2, =0x0202420b b _080481B4 .align 2, 0 -_08048194: .4byte 0x020241f4 -_08048198: .4byte 0x0202437c -_0804819C: .4byte 0x020241ea -_080481A0: .4byte 0x0202433c -_080481A4: .4byte 0x02024214 -_080481A8: .4byte 0x0202420b + .pool _080481AC: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _080481C8 + ldr r2, =0x0202420c _080481B4: ldrb r1, [r2] strb r1, [r0, 0xC] @@ -146906,7 +141906,7 @@ _080481B4: strb r1, [r0, 0x10] b _0804823A .align 2, 0 -_080481C8: .4byte 0x0202420c + .pool _080481CC: cmp r6, 0x8 bls _0804823A @@ -146918,7 +141918,7 @@ _080481D0: ands r0, r1 cmp r0, 0 bne _0804823A - ldr r3, _08048214 + ldr r3, =0x0202433c ldrb r0, [r5] lsls r0, 4 adds r1, r3, 0 @@ -146934,7 +141934,7 @@ _080481D0: adds r1, 0xC adds r0, r1 str r2, [r0] - ldr r0, _08048218 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -146942,17 +141942,15 @@ _080481D0: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _0804821C + ldr r2, =0x0202420b b _08048228 .align 2, 0 -_08048214: .4byte 0x0202433c -_08048218: .4byte 0x02024214 -_0804821C: .4byte 0x0202420b + .pool _08048220: ldrb r0, [r5] lsls r0, 4 adds r0, r3 - ldr r2, _08048268 + ldr r2, =0x0202420c _08048228: ldrb r1, [r2] strb r1, [r0, 0xD] @@ -146966,14 +141964,14 @@ _08048228: _0804823A: mov r1, r12 ldr r0, [r1] - ldr r1, _0804826C + ldr r1, =0xffefffff ands r0, r1 mov r1, r12 str r0, [r1] ldrb r1, [r5] movs r0, 0x58 muls r0, r1 - ldr r1, _08048270 + ldr r1, =0x020240ac adds r0, r1 str r0, [sp] movs r0, 0 @@ -146985,17 +141983,15 @@ _0804823A: bl dp01_battle_side_mark_buffer_for_execution b _0804829A .align 2, 0 -_08048268: .4byte 0x0202420c -_0804826C: .4byte 0xffefffff -_08048270: .4byte 0x020240ac + .pool _08048274: - ldr r0, _080482AC + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, _080482B0 + ldr r1, =0x02024064 strb r0, [r1] - ldr r2, _080482B4 + ldr r2, =0x0202437c ldrb r1, [r1] lsls r0, r1, 2 adds r0, r1 @@ -147005,10 +142001,10 @@ _08048274: ldr r0, [r1] cmp r0, 0 bne _0804829A - ldr r0, _080482B8 + ldr r0, =0x0000ffff str r0, [r1] _0804829A: - ldr r1, _080482AC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -147018,38 +142014,35 @@ _080482A2: pop {r0} bx r0 .align 2, 0 -_080482AC: .4byte 0x02024214 -_080482B0: .4byte 0x02024064 -_080482B4: .4byte 0x0202437c -_080482B8: .4byte 0x0000ffff + .pool thumb_func_end atk0C_datahpupdate thumb_func_start atk0D_critmessage atk0D_critmessage: @ 80482BC push {lr} - ldr r0, _080482F8 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _080482F2 - ldr r0, _080482FC + ldr r0, =0x02024211 ldrb r0, [r0] cmp r0, 0x2 bne _080482EA - ldr r0, _08048300 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 bne _080482EA - ldr r0, _08048304 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0xD9 bl b_std_message - ldr r1, _08048308 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x7] _080482EA: - ldr r1, _0804830C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -147057,26 +142050,21 @@ _080482F2: pop {r0} bx r0 .align 2, 0 -_080482F8: .4byte 0x02024068 -_080482FC: .4byte 0x02024211 -_08048300: .4byte 0x0202427c -_08048304: .4byte 0x0202420b -_08048308: .4byte 0x02024332 -_0804830C: .4byte 0x02024214 + .pool thumb_func_end atk0D_critmessage thumb_func_start atk0E_missmessage atk0E_missmessage: @ 8048310 push {r4,lr} - ldr r0, _08048348 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _080483D0 - ldr r4, _0804834C - ldr r0, _08048350 + ldr r4, =0x02024064 + ldr r0, =0x0202420c ldrb r0, [r0] strb r0, [r4] - ldr r1, _08048354 + ldr r1, =0x0202427c ldrb r2, [r1] movs r0, 0x1 ands r0, r2 @@ -147096,10 +142084,7 @@ atk0E_missmessage: @ 8048310 beq _0804836C b _08048382 .align 2, 0 -_08048348: .4byte 0x02024068 -_0804834C: .4byte 0x02024064 -_08048350: .4byte 0x0202420c -_08048354: .4byte 0x0202427c + .pool _08048358: cmp r0, 0x8 beq _080483C8 @@ -147142,12 +142127,12 @@ _08048392: movs r1, 0xC _0804839E: bl dp01_build_cmdbuf_x2B_aa_0 - ldr r0, _080483AC + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution b _080483C8 .align 2, 0 -_080483AC: .4byte 0x02024064 + .pool _080483B0: movs r0, 0x28 ands r0, r1 @@ -147156,11 +142141,11 @@ _080483B0: movs r0, 0 movs r1, 0xD bl dp01_build_cmdbuf_x2B_aa_0 - ldr r0, _080483D8 + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution _080483C8: - ldr r1, _080483DC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -147169,27 +142154,26 @@ _080483D0: pop {r0} bx r0 .align 2, 0 -_080483D8: .4byte 0x02024064 -_080483DC: .4byte 0x02024214 + .pool thumb_func_end atk0E_missmessage thumb_func_start atk0F_resultmessage atk0F_resultmessage: @ 80483E0 push {r4-r7,lr} movs r3, 0 - ldr r0, _0804841C + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _080483EE b _08048580 _080483EE: - ldr r1, _08048420 + ldr r1, =0x0202427c ldrb r2, [r1] movs r4, 0x1 adds r0, r4, 0 ands r0, r2 adds r6, r1, 0 - ldr r7, _08048424 + ldr r7, =0x02024332 cmp r0, 0 beq _0804842C movs r0, 0x8 @@ -147200,7 +142184,7 @@ _080483EE: cmp r0, 0x2 bls _0804842C _0804840E: - ldr r1, _08048428 + ldr r1, =0x085cc834 ldrb r0, [r7, 0x6] lsls r0, 1 adds r0, r1 @@ -147208,10 +142192,7 @@ _0804840E: strb r4, [r7, 0x7] b _0804856A .align 2, 0 -_0804841C: .4byte 0x02024068 -_08048420: .4byte 0x0202427c -_08048424: .4byte 0x02024332 -_08048428: .4byte 0x085cc834 + .pool _0804842C: movs r0, 0x1 strb r0, [r7, 0x7] @@ -147260,32 +142241,27 @@ _08048474: movs r3, 0x99 b _0804856E _08048478: - ldr r4, _080484A0 - ldr r2, _080484A4 - ldr r3, _080484A8 + ldr r4, =0x02024208 + ldr r2, =0x02024084 + ldr r3, =0x0202420c ldrb r1, [r3] movs r0, 0x58 muls r0, r1 adds r0, r2 ldrh r0, [r0, 0x2E] strh r0, [r4] - ldr r1, _080484AC + ldr r1, =0x0202420f ldrb r0, [r3] strb r0, [r1] movs r0, 0x3F ands r0, r5 strb r0, [r6] bl b_movescr_stack_push_cursor - ldr r1, _080484B0 - ldr r0, _080484B4 + ldr r1, =0x02024214 + ldr r0, =0x082db816 b _0804857E .align 2, 0 -_080484A0: .4byte 0x02024208 -_080484A4: .4byte 0x02024084 -_080484A8: .4byte 0x0202420c -_080484AC: .4byte 0x0202420f -_080484B0: .4byte 0x02024214 -_080484B4: .4byte 0x082db816 + .pool _080484B8: adds r2, r6, 0 ldrb r5, [r2] @@ -147309,12 +142285,11 @@ _080484C8: ands r0, r1 strb r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _080484E8 - ldr r0, _080484EC + ldr r1, =0x02024214 + ldr r0, =0x082db1ce b _0804857E .align 2, 0 -_080484E8: .4byte 0x02024214 -_080484EC: .4byte 0x082db1ce + .pool _080484F0: movs r0, 0x40 ands r0, r5 @@ -147324,43 +142299,37 @@ _080484F0: ands r0, r5 strb r0, [r2] bl b_movescr_stack_push_cursor - ldr r1, _08048508 - ldr r0, _0804850C + ldr r1, =0x02024214 + ldr r0, =0x082db1c7 b _0804857E .align 2, 0 -_08048508: .4byte 0x02024214 -_0804850C: .4byte 0x082db1c7 + .pool _08048510: movs r0, 0x80 ands r0, r5 cmp r0, 0 beq _08048558 - ldr r4, _08048540 - ldr r2, _08048544 - ldr r3, _08048548 + ldr r4, =0x02024208 + ldr r2, =0x02024084 + ldr r3, =0x0202420c ldrb r1, [r3] movs r0, 0x58 muls r0, r1 adds r0, r2 ldrh r0, [r0, 0x2E] strh r0, [r4] - ldr r1, _0804854C + ldr r1, =0x0202420f ldrb r0, [r3] strb r0, [r1] movs r0, 0x3F ands r0, r5 strb r0, [r6] bl b_movescr_stack_push_cursor - ldr r1, _08048550 - ldr r0, _08048554 + ldr r1, =0x02024214 + ldr r0, =0x082db816 b _0804857E .align 2, 0 -_08048540: .4byte 0x02024208 -_08048544: .4byte 0x02024084 -_08048548: .4byte 0x0202420c -_0804854C: .4byte 0x0202420f -_08048550: .4byte 0x02024214 -_08048554: .4byte 0x082db816 + .pool _08048558: movs r0, 0x20 ands r0, r5 @@ -147378,11 +142347,11 @@ _0804856A: beq _08048578 _0804856E: adds r0, r3, 0 - ldr r1, _08048588 + ldr r1, =0x0202420b ldrb r1, [r1] bl b_std_message _08048578: - ldr r1, _0804858C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 _0804857E: @@ -147392,30 +142361,29 @@ _08048580: pop {r0} bx r0 .align 2, 0 -_08048588: .4byte 0x0202420b -_0804858C: .4byte 0x02024214 + .pool thumb_func_end atk0F_resultmessage thumb_func_start atk10_printstring atk10_printstring: @ 8048590 push {r4,lr} - ldr r0, _080485C0 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _080485BA - ldr r4, _080485C4 + ldr r4, =0x02024214 ldr r1, [r4] ldrb r0, [r1, 0x1] ldrb r1, [r1, 0x2] lsls r1, 8 orrs r0, r1 - ldr r1, _080485C8 + ldr r1, =0x0202420b ldrb r1, [r1] bl b_std_message ldr r0, [r4] adds r0, 0x3 str r0, [r4] - ldr r1, _080485CC + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x7] _080485BA: @@ -147423,20 +142391,17 @@ _080485BA: pop {r0} bx r0 .align 2, 0 -_080485C0: .4byte 0x02024068 -_080485C4: .4byte 0x02024214 -_080485C8: .4byte 0x0202420b -_080485CC: .4byte 0x02024332 + .pool thumb_func_end atk10_printstring thumb_func_start atk11_printstring2 atk11_printstring2: @ 80485D0 push {r4,r5,lr} - ldr r5, _08048604 - ldr r0, _08048608 + ldr r5, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r5] - ldr r4, _0804860C + ldr r4, =0x02024214 ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -147449,47 +142414,42 @@ atk11_printstring2: @ 80485D0 ldr r0, [r4] adds r0, 0x3 str r0, [r4] - ldr r1, _08048610 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x7] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08048604: .4byte 0x02024064 -_08048608: .4byte 0x0202420b -_0804860C: .4byte 0x02024214 -_08048610: .4byte 0x02024332 + .pool thumb_func_end atk11_printstring2 thumb_func_start atk12_waitmessage atk12_waitmessage: @ 8048614 push {r4-r6,lr} - ldr r0, _08048630 + ldr r0, =0x02024068 ldr r4, [r0] cmp r4, 0 bne _08048662 - ldr r6, _08048634 + ldr r6, =0x02024332 ldrb r0, [r6, 0x7] cmp r0, 0 bne _0804863C - ldr r1, _08048638 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x3 str r0, [r1] b _08048662 .align 2, 0 -_08048630: .4byte 0x02024068 -_08048634: .4byte 0x02024332 -_08048638: .4byte 0x02024214 + .pool _0804863C: - ldr r5, _08048668 + ldr r5, =0x02024214 ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 orrs r1, r0 - ldr r3, _0804866C + ldr r3, =0x0202432c ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] @@ -147507,18 +142467,17 @@ _08048662: pop {r0} bx r0 .align 2, 0 -_08048668: .4byte 0x02024214 -_0804866C: .4byte 0x0202432c + .pool thumb_func_end atk12_waitmessage thumb_func_start atk13_printfromtable atk13_printfromtable: @ 8048670 push {r4,r5,lr} - ldr r0, _080486B4 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _080486AE - ldr r4, _080486B8 + ldr r4, =0x02024214 ldr r2, [r4] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -147530,12 +142489,12 @@ atk13_printfromtable: @ 8048670 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r5, _080486BC + ldr r5, =0x02024332 ldrb r0, [r5, 0x5] lsls r0, 1 adds r1, r0 ldrh r0, [r1] - ldr r1, _080486C0 + ldr r1, =0x0202420b ldrb r1, [r1] bl b_std_message ldr r0, [r4] @@ -147548,20 +142507,17 @@ _080486AE: pop {r0} bx r0 .align 2, 0 -_080486B4: .4byte 0x02024068 -_080486B8: .4byte 0x02024214 -_080486BC: .4byte 0x02024332 -_080486C0: .4byte 0x0202420b + .pool thumb_func_end atk13_printfromtable thumb_func_start atk14_printfromtable2 atk14_printfromtable2: @ 80486C4 push {r4-r6,lr} - ldr r0, _08048714 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0804870E - ldr r5, _08048718 + ldr r5, =0x02024214 ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -147573,12 +142529,12 @@ atk14_printfromtable2: @ 80486C4 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r6, _0804871C + ldr r6, =0x02024332 ldrb r0, [r6, 0x5] lsls r0, 1 adds r1, r0 - ldr r4, _08048720 - ldr r0, _08048724 + ldr r4, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r4] ldrh r1, [r1] @@ -147596,11 +142552,7 @@ _0804870E: pop {r0} bx r0 .align 2, 0 -_08048714: .4byte 0x02024068 -_08048718: .4byte 0x02024214 -_0804871C: .4byte 0x02024332 -_08048720: .4byte 0x02024064 -_08048724: .4byte 0x0202420b + .pool thumb_func_end atk14_printfromtable2 thumb_func_start sub_8048728 @@ -147609,11 +142561,11 @@ sub_8048728: @ 8048728 lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r0, _08048758 + ldr r0, =0x0202406c ldrb r3, [r0] cmp r1, r3 bge _0804874E - ldr r4, _0804875C + ldr r4, =0x0202407e ldrb r0, [r4] cmp r0, r2 beq _0804874E @@ -147632,8 +142584,7 @@ _0804874E: pop {r1} bx r1 .align 2, 0 -_08048758: .4byte 0x0202406c -_0804875C: .4byte 0x0202407e + .pool thumb_func_end sub_8048728 thumb_func_start sub_8048760 @@ -147653,14 +142604,14 @@ sub_8048760: @ 8048760 movs r7, 0 movs r1, 0x1 str r1, [sp, 0x4] - ldr r1, _080487A4 + ldr r1, =0x02024332 ldrb r3, [r1, 0x3] movs r0, 0x40 ands r0, r3 cmp r0, 0 beq _080487B8 - ldr r2, _080487A8 - ldr r0, _080487AC + ldr r2, =0x0202420e + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r2] movs r0, 0xBF @@ -147668,27 +142619,23 @@ sub_8048760: @ 8048760 adds r3, r1, 0 strb r0, [r3, 0x3] movs r7, 0x40 - ldr r1, _080487B0 - ldr r0, _080487B4 + ldr r1, =0x02024474 + ldr r0, =0x0202420c b _080487C4 .align 2, 0 -_080487A4: .4byte 0x02024332 -_080487A8: .4byte 0x0202420e -_080487AC: .4byte 0x0202420b -_080487B0: .4byte 0x02024474 -_080487B4: .4byte 0x0202420c + .pool _080487B8: - ldr r2, _08048808 - ldr r0, _0804880C + ldr r2, =0x0202420e + ldr r0, =0x0202420c ldrb r0, [r0] strb r0, [r2] - ldr r1, _08048810 - ldr r0, _08048814 + ldr r1, =0x02024474 + ldr r0, =0x0202420b _080487C4: ldrb r0, [r0] strb r0, [r1, 0x17] mov r9, r2 - ldr r2, _08048818 + ldr r2, =0x02024084 mov r4, r9 ldrb r1, [r4] movs r0, 0x58 @@ -147698,7 +142645,7 @@ _080487C4: ldrb r0, [r0] cmp r0, 0x13 bne _08048828 - ldr r0, _0804881C + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -147707,31 +142654,24 @@ _080487C4: bne _08048828 cmp r5, 0 bne _08048828 - ldr r1, _08048820 + ldr r1, =0x02024332 ldrb r0, [r1, 0x3] cmp r0, 0x9 bhi _08048828 - ldr r1, _08048824 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r2, _08048820 + ldr r2, =0x02024332 strb r5, [r2, 0x3] bl _080499B8 .align 2, 0 -_08048808: .4byte 0x0202420e -_0804880C: .4byte 0x0202420c -_08048810: .4byte 0x02024474 -_08048814: .4byte 0x0202420b -_08048818: .4byte 0x02024084 -_0804881C: .4byte 0x02024280 -_08048820: .4byte 0x02024332 -_08048824: .4byte 0x02024214 + .pool _08048828: mov r3, r9 ldrb r0, [r3] bl battle_get_per_side_status - ldr r2, _08048870 + ldr r2, =0x0202428e movs r1, 0x1 ands r1, r0 lsls r1, 1 @@ -147741,7 +142681,7 @@ _08048828: ands r0, r1 cmp r0, 0 beq _08048880 - ldr r0, _08048874 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -147750,25 +142690,22 @@ _08048828: bne _08048880 cmp r5, 0 bne _08048880 - ldr r0, _08048878 + ldr r0, =0x02024332 ldrb r1, [r0, 0x3] cmp r1, 0x7 bhi _08048880 - ldr r1, _0804887C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r4, _08048878 + ldr r4, =0x02024332 strb r5, [r4, 0x3] bl _080499B8 .align 2, 0 -_08048870: .4byte 0x0202428e -_08048874: .4byte 0x02024280 -_08048878: .4byte 0x02024332 -_0804887C: .4byte 0x02024214 + .pool _08048880: - ldr r3, _080488B4 - ldr r2, _080488B8 + ldr r3, =0x02024084 + ldr r2, =0x0202420e ldrb r1, [r2] movs r0, 0x58 muls r0, r1 @@ -147778,24 +142715,21 @@ _08048880: mov r8, r3 cmp r4, 0 bne _080488C4 - ldr r1, _080488BC + ldr r1, =0x02024332 ldrb r0, [r1, 0x3] cmp r0, 0xB beq _080488C4 cmp r0, 0x1F beq _080488C4 - ldr r1, _080488C0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r2, _080488BC + ldr r2, =0x02024332 strb r4, [r2, 0x3] bl _080499B8 .align 2, 0 -_080488B4: .4byte 0x02024084 -_080488B8: .4byte 0x0202420e -_080488BC: .4byte 0x02024332 -_080488C0: .4byte 0x02024214 + .pool _080488C4: mov r3, r9 ldrb r1, [r3] @@ -147812,26 +142746,25 @@ _080488C4: beq _080488FC cmp r7, 0x40 beq _080488FC - ldr r0, _080488F4 + ldr r0, =0x02024214 ldr r1, [r0] adds r1, 0x1 str r1, [r0] movs r0, 0 - ldr r4, _080488F8 + ldr r4, =0x02024332 strb r0, [r4, 0x3] bl _080499B8 .align 2, 0 -_080488F4: .4byte 0x02024214 -_080488F8: .4byte 0x02024332 + .pool _080488FC: - ldr r1, _08048928 + ldr r1, =0x02024332 ldrb r0, [r1, 0x3] cmp r0, 0x6 bls _08048906 b _08048F40 _08048906: - ldr r1, _0804892C - ldr r2, _08048928 + ldr r1, =0x0831c134 + ldr r2, =0x02024332 ldrb r0, [r2, 0x3] lsls r0, 2 adds r0, r1 @@ -147848,8 +142781,7 @@ _08048918: beq _08048A00 b _08048DF4 .align 2, 0 -_08048928: .4byte 0x02024332 -_0804892C: .4byte 0x0831c134 + .pool _08048930: cmp r0, 0x40 bne _08048936 @@ -147878,10 +142810,10 @@ _0804894A: ldrb r0, [r0] cmp r0, 0x2B beq _080489AC - ldr r0, _080489A4 + ldr r0, =0x02024064 movs r1, 0 strb r1, [r0] - ldr r1, _080489A8 + ldr r1, =0x0202406c ldrb r3, [r1] adds r7, r0, 0 mov r12, r1 @@ -147915,11 +142847,10 @@ _08048984: beq _08048984 b _080489B8 .align 2, 0 -_080489A4: .4byte 0x02024064 -_080489A8: .4byte 0x0202406c + .pool _080489AC: - ldr r0, _080489F8 - ldr r2, _080489FC + ldr r0, =0x02024064 + ldr r2, =0x0202406c ldrb r1, [r2] strb r1, [r0] adds r7, r0, 0 @@ -147961,8 +142892,7 @@ _080489F0: bl b_cancel_multi_turn_move_maybe b _08048DE4 .align 2, 0 -_080489F8: .4byte 0x02024064 -_080489FC: .4byte 0x0202406c + .pool _08048A00: mov r2, r9 ldrb r1, [r2] @@ -147978,19 +142908,19 @@ _08048A00: cmp r6, 0x80 bne _08048A70 _08048A1A: - ldr r0, _08048A58 + ldr r0, =0x0202420a strb r1, [r0] mov r3, r9 ldrb r0, [r3] movs r1, 0x11 bl b_history__record_ability_usage_of_player - ldr r4, _08048A5C + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _08048A60 + ldr r0, =0x082db5e9 str r0, [r4] - ldr r2, _08048A64 + ldr r2, =0x02024280 ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -148000,20 +142930,15 @@ _08048A1A: b _08048D20 _08048A46: movs r0, 0x1 - ldr r4, _08048A68 + ldr r4, =0x02024332 strb r0, [r4, 0x5] _08048A4C: - ldr r0, _08048A6C + ldr r0, =0xffffdfff ands r1, r0 str r1, [r2] bl _080499B2 .align 2, 0 -_08048A58: .4byte 0x0202420a -_08048A5C: .4byte 0x02024214 -_08048A60: .4byte 0x082db5e9 -_08048A64: .4byte 0x02024280 -_08048A68: .4byte 0x02024332 -_08048A6C: .4byte 0xffffdfff + .pool _08048A70: mov r2, r9 ldrb r0, [r2] @@ -148034,7 +142959,7 @@ _08048A70: cmp r0, 0x8 bne _08048AAE _08048A94: - ldr r0, _08048AF8 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -148093,7 +143018,7 @@ _08048AEA: _08048AF6: b _08048DE4 .align 2, 0 -_08048AF8: .4byte 0x02024280 + .pool _08048AFC: mov r2, r9 ldrb r1, [r2] @@ -148109,19 +143034,19 @@ _08048AFC: cmp r6, 0x80 bne _08048B54 _08048B16: - ldr r0, _08048B44 + ldr r0, =0x0202420a strb r1, [r0] mov r3, r9 ldrb r0, [r3] movs r1, 0x29 bl b_history__record_ability_usage_of_player - ldr r4, _08048B48 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _08048B4C + ldr r0, =0x082db5d1 str r0, [r4] - ldr r2, _08048B50 + ldr r2, =0x02024280 ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -148132,10 +143057,7 @@ _08048B16: _08048B42: b _08048D20 .align 2, 0 -_08048B44: .4byte 0x0202420a -_08048B48: .4byte 0x02024214 -_08048B4C: .4byte 0x082db5d1 -_08048B50: .4byte 0x02024280 + .pool _08048B54: mov r2, r9 ldrb r1, [r2] @@ -148154,7 +143076,7 @@ _08048B54: cmp r0, 0xA bne _08048BA4 _08048B74: - ldr r0, _08048B98 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -148166,16 +143088,14 @@ _08048B74: cmp r6, 0x80 bne _08048BA4 _08048B8A: - ldr r4, _08048B9C + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _08048BA0 + ldr r0, =0x082db5d1 b _08048D72 .align 2, 0 -_08048B98: .4byte 0x02024280 -_08048B9C: .4byte 0x02024214 -_08048BA0: .4byte 0x082db5d1 + .pool _08048BA4: mov r4, r9 ldrb r0, [r4] @@ -148237,7 +143157,7 @@ _08048BEA: lsls r0, 24 cmp r0, 0 bne _08048C26 - ldr r0, _08048C78 + ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -148246,8 +143166,8 @@ _08048BEA: movs r2, 0 str r2, [sp, 0x4] _08048C26: - ldr r4, _08048C7C - ldr r0, _08048C80 + ldr r4, =0x02024084 + ldr r0, =0x0202420e ldrb r3, [r0] movs r0, 0x58 adds r2, r3, 0 @@ -148291,9 +143211,7 @@ _08048C6E: bl b_cancel_multi_turn_move_maybe b _08048DE4 .align 2, 0 -_08048C78: .4byte 0x020243cc -_08048C7C: .4byte 0x02024084 -_08048C80: .4byte 0x0202420e + .pool _08048C84: mov r2, r9 ldrb r1, [r2] @@ -148311,19 +143229,19 @@ _08048C84: beq _08048CA2 b _08048DF4 _08048CA2: - ldr r0, _08048CD4 + ldr r0, =0x0202420a strb r2, [r0] mov r4, r9 ldrb r0, [r4] movs r1, 0x7 bl b_history__record_ability_usage_of_player - ldr r4, _08048CD8 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _08048CDC + ldr r0, =0x082db5dd str r0, [r4] - ldr r2, _08048CE0 + ldr r2, =0x02024280 ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -148331,21 +143249,17 @@ _08048CA2: cmp r0, 0 beq _08048CE8 movs r0, 0x1 - ldr r3, _08048CE4 + ldr r3, =0x02024332 strb r0, [r3, 0x5] b _08048A4C .align 2, 0 -_08048CD4: .4byte 0x0202420a -_08048CD8: .4byte 0x02024214 -_08048CDC: .4byte 0x082db5dd -_08048CE0: .4byte 0x02024280 -_08048CE4: .4byte 0x02024332 + .pool _08048CE8: - ldr r4, _08048CF0 + ldr r4, =0x02024332 strb r0, [r4, 0x5] bl _080499B2 .align 2, 0 -_08048CF0: .4byte 0x02024332 + .pool _08048CF4: mov r0, r8 adds r0, 0x4C @@ -148372,11 +143286,11 @@ _08048D1A: bne _08048D2C b _08048A1A _08048D20: - ldr r1, _08048D28 + ldr r1, =0x02024332 strb r0, [r1, 0x5] bl _080499B2 .align 2, 0 -_08048D28: .4byte 0x02024332 + .pool _08048D2C: mov r2, r9 ldrb r0, [r2] @@ -148397,7 +143311,7 @@ _08048D2C: cmp r0, 0x8 bne _08048D94 _08048D50: - ldr r0, _08048D84 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -148409,24 +143323,21 @@ _08048D50: cmp r6, 0x80 bne _08048D94 _08048D66: - ldr r4, _08048D88 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _08048D8C + ldr r0, =0x082db5e9 _08048D72: str r0, [r4] - ldr r1, _08048D90 + ldr r1, =0x02024332 movs r2, 0 movs r0, 0x2 strb r0, [r1, 0x5] strb r2, [r1, 0x3] bl _080499B8 .align 2, 0 -_08048D84: .4byte 0x02024280 -_08048D88: .4byte 0x02024214 -_08048D8C: .4byte 0x082db5e9 -_08048D90: .4byte 0x02024332 + .pool _08048D94: mov r3, r9 ldrb r0, [r3] @@ -148473,7 +143384,7 @@ _08048DE4: mov r10, r0 b _08048DF4 _08048DEA: - ldr r0, _08048E38 + ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x8 orrs r1, r2 @@ -148484,12 +143395,12 @@ _08048DF4: beq _08048DFC b _08048F1C _08048DFC: - ldr r0, _08048E3C + ldr r0, =0x02024214 ldr r0, [r0] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _08048E40 - ldr r0, _08048E44 + ldr r1, =0x0831c134 + ldr r0, =0x02024332 ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -148497,8 +143408,8 @@ _08048DFC: cmp r3, 0x7 bne _08048E50 bl GenerateRandomNumber - ldr r2, _08048E48 - ldr r1, _08048E4C + ldr r2, =0x02024084 + ldr r1, =0x0202420e ldrb r3, [r1] movs r1, 0x58 muls r3, r1 @@ -148512,15 +143423,10 @@ _08048DFC: str r0, [r3] b _08048E64 .align 2, 0 -_08048E38: .4byte 0x0202427c -_08048E3C: .4byte 0x02024214 -_08048E40: .4byte 0x0831c134 -_08048E44: .4byte 0x02024332 -_08048E48: .4byte 0x02024084 -_08048E4C: .4byte 0x0202420e + .pool _08048E50: - ldr r2, _08048EB4 - ldr r0, _08048EB8 + ldr r2, =0x02024084 + ldr r0, =0x0202420e ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -148530,22 +143436,22 @@ _08048E50: orrs r0, r3 str r0, [r1] _08048E64: - ldr r2, _08048EBC - ldr r1, _08048EC0 - ldr r5, _08048EC4 + ldr r2, =0x02024214 + ldr r1, =0x0831c224 + ldr r5, =0x02024332 ldrb r0, [r5, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] str r0, [r2] - ldr r4, _08048EC8 - ldr r1, _08048EB8 + ldr r4, =0x02024064 + ldr r1, =0x0202420e ldrb r0, [r1] strb r0, [r4] ldrb r1, [r1] movs r0, 0x58 muls r0, r1 - ldr r1, _08048ECC + ldr r1, =0x020240d0 adds r0, r1 str r0, [sp] movs r0, 0 @@ -148555,7 +143461,7 @@ _08048E64: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r2, _08048ED0 + ldr r2, =0x02024280 ldr r1, [r2] movs r0, 0x80 lsls r0, 6 @@ -148564,24 +143470,16 @@ _08048E64: beq _08048ED8 movs r0, 0x1 strb r0, [r5, 0x5] - ldr r0, _08048ED4 + ldr r0, =0xffffdfff ands r1, r0 str r1, [r2] b _08048EDA .align 2, 0 -_08048EB4: .4byte 0x02024084 -_08048EB8: .4byte 0x0202420e -_08048EBC: .4byte 0x02024214 -_08048EC0: .4byte 0x0831c224 -_08048EC4: .4byte 0x02024332 -_08048EC8: .4byte 0x02024064 -_08048ECC: .4byte 0x020240d0 -_08048ED0: .4byte 0x02024280 -_08048ED4: .4byte 0xffffdfff + .pool _08048ED8: strb r0, [r5, 0x5] _08048EDA: - ldr r0, _08048F10 + ldr r0, =0x02024332 ldrb r2, [r0, 0x3] cmp r2, 0x2 beq _08048EF2 @@ -148593,13 +143491,13 @@ _08048EDA: beq _08048EF2 bl _080499B8 _08048EF2: - ldr r0, _08048F14 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB2 - ldr r2, _08048F10 + ldr r2, =0x02024332 ldrb r1, [r2, 0x3] strb r1, [r0] - ldr r2, _08048F18 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 7 @@ -148607,25 +143505,22 @@ _08048EF2: str r0, [r2] bl _080499B8 .align 2, 0 -_08048F10: .4byte 0x02024332 -_08048F14: .4byte 0x0202449c -_08048F18: .4byte 0x02024280 + .pool _08048F1C: mov r3, r10 cmp r3, 0 beq _08048F26 bl _080499B8 _08048F26: - ldr r0, _08048F38 + ldr r0, =0x02024332 strb r3, [r0, 0x3] - ldr r1, _08048F3C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bl _080499B8 .align 2, 0 -_08048F38: .4byte 0x02024332 -_08048F3C: .4byte 0x02024214 + .pool _08048F40: mov r4, r9 ldrb r1, [r4] @@ -148634,8 +143529,8 @@ _08048F40: mov r0, r8 adds r0, 0x50 adds r1, r0 - ldr r2, _08048F7C - ldr r0, _08048F80 + ldr r2, =0x0831c134 + ldr r0, =0x02024332 ldrb r3, [r0, 0x3] lsls r0, r3, 2 adds r0, r2 @@ -148652,14 +143547,12 @@ _08048F66: bl _080499B2 _08048F70: lsls r0, 2 - ldr r1, _08048F84 + ldr r1, =_08048F88 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08048F7C: .4byte 0x0831c134 -_08048F80: .4byte 0x02024332 -_08048F84: .4byte _08048F88 + .pool .align 2, 0 _08048F88: .4byte _0804905C @@ -148754,21 +143647,19 @@ _0804908A: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r4, _080490C4 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _080490C8 - ldr r0, _080490CC + ldr r1, =0x0831c224 + ldr r0, =0x02024332 ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _080499B0 .align 2, 0 -_080490C4: .4byte 0x02024214 -_080490C8: .4byte 0x0831c224 -_080490CC: .4byte 0x02024332 + .pool _080490D0: mov r4, r9 ldrb r2, [r4] @@ -148786,24 +143677,22 @@ _080490D0: beq _080490F0 bl _08049994 _080490F0: - ldr r0, _08049108 + ldr r0, =0x0202420a strb r1, [r0] mov r1, r9 ldrb r0, [r1] movs r1, 0x27 bl b_history__record_ability_usage_of_player - ldr r1, _0804910C - ldr r0, _08049110 + ldr r1, =0x02024214 + ldr r0, =0x082db603 str r0, [r1] bl _080499B2 .align 2, 0 -_08049108: .4byte 0x0202420a -_0804910C: .4byte 0x02024214 -_08049110: .4byte 0x082db603 + .pool _08049114: adds r0, r2, 0 bl sub_8048728 - ldr r1, _08049150 + ldr r1, =0x02024082 lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -148818,8 +143707,8 @@ _0804912A: mov r0, r8 adds r0, 0x50 adds r2, r0 - ldr r1, _08049154 - ldr r0, _08049158 + ldr r1, =0x0831c134 + ldr r0, =0x02024332 ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 @@ -148829,9 +143718,7 @@ _0804912A: str r1, [r2] bl _08049994 .align 2, 0 -_08049150: .4byte 0x02024082 -_08049154: .4byte 0x0831c134 -_08049158: .4byte 0x02024332 + .pool _0804915C: mov r3, r9 ldrb r0, [r3] @@ -148851,11 +143738,11 @@ _08049178: lsls r0, 5 orrs r1, r0 str r1, [r2] - ldr r1, _080491C4 + ldr r1, =0x02024268 ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, _080491C8 + ldr r1, =0x020241ea ldrh r1, [r1] strh r1, [r0] bl GenerateRandomNumber @@ -148871,34 +143758,30 @@ _08049178: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r4, _080491CC + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _080491D0 - ldr r0, _080491D4 + ldr r1, =0x0831c224 + ldr r0, =0x02024332 ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _080499B0 .align 2, 0 -_080491C4: .4byte 0x02024268 -_080491C8: .4byte 0x020241ea -_080491CC: .4byte 0x02024214 -_080491D0: .4byte 0x0831c224 -_080491D4: .4byte 0x02024332 + .pool _080491D8: - ldr r5, _08049228 + ldr r5, =0x0202420b ldrb r0, [r5] bl battle_get_per_side_status movs r1, 0x1 ands r1, r0 cmp r1, 0 bne _08049210 - ldr r4, _0804922C + ldr r4, =0x0202432e ldrh r3, [r4] - ldr r2, _08049230 + ldr r2, =0x02024084 ldrb r1, [r5] movs r0, 0x58 muls r0, r1 @@ -148913,29 +143796,23 @@ _080491D8: lsrs r0, 16 cmp r3, r0 bls _08049210 - ldr r3, _08049234 + ldr r3, =0x0000ffff adds r0, r3, 0 strh r0, [r4] _08049210: - ldr r4, _08049238 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _0804923C - ldr r0, _08049240 + ldr r1, =0x0831c224 + ldr r0, =0x02024332 ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] b _080499B0 .align 2, 0 -_08049228: .4byte 0x0202420b -_0804922C: .4byte 0x0202432e -_08049230: .4byte 0x02024084 -_08049234: .4byte 0x0000ffff -_08049238: .4byte 0x02024214 -_0804923C: .4byte 0x0831c224 -_08049240: .4byte 0x02024332 + .pool _08049244: mov r4, r9 ldrb r1, [r4] @@ -148950,7 +143827,7 @@ _08049244: b _08049994 _0804925A: bl GenerateRandomNumber - ldr r4, _08049278 + ldr r4, =0x02024332 lsls r0, 16 lsrs r0, 16 movs r1, 0x3 @@ -148962,7 +143839,7 @@ _0804925A: bl sub_8048760 b _080499B2 .align 2, 0 -_08049278: .4byte 0x02024332 + .pool _0804927C: mov r0, r9 ldrb r1, [r0] @@ -148977,15 +143854,15 @@ _0804927C: lsls r1, 5 orrs r0, r1 str r0, [r2] - ldr r1, _080492B8 + ldr r1, =0x02024268 mov r2, r9 ldrb r0, [r2] lsls r0, 1 adds r0, r1 - ldr r1, _080492BC + ldr r1, =0x020241ea ldrh r1, [r1] strh r1, [r0] - ldr r0, _080492C0 + ldr r0, =0x0202433c ldrb r1, [r2] lsls r1, 4 adds r1, r0 @@ -148995,9 +143872,7 @@ _0804927C: strb r0, [r1, 0x1] b _08049994 .align 2, 0 -_080492B8: .4byte 0x02024268 -_080492BC: .4byte 0x020241ea -_080492C0: .4byte 0x0202433c + .pool _080492C4: mov r3, r9 ldrb r0, [r3] @@ -149029,11 +143904,11 @@ _080492E0: str r0, [r2] mov r3, r9 ldrb r1, [r3] - ldr r2, _08049374 + ldr r2, =0x0202449c ldr r0, [r2] lsls r1, 1 adds r1, r0 - ldr r6, _08049378 + ldr r6, =0x020241ea ldrh r0, [r6] strb r0, [r1, 0x4] ldrb r1, [r3] @@ -149046,22 +143921,22 @@ _080492E0: ldrb r1, [r3] ldr r0, [r2] adds r1, r0 - ldr r0, _0804937C + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r1, 0x14] - ldr r4, _08049380 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _08049384 - ldr r2, _08049388 + ldr r1, =0x0831c224 + ldr r2, =0x02024332 ldrb r0, [r2, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] str r0, [r4] strb r5, [r2, 0x5] - ldr r3, _0804938C + ldr r3, =0x085cc982 ldrh r0, [r3] ldrh r4, [r6] cmp r0, r4 @@ -149089,16 +143964,10 @@ _08049362: bne _08049352 b _080499B2 .align 2, 0 -_08049374: .4byte 0x0202449c -_08049378: .4byte 0x020241ea -_0804937C: .4byte 0x0202420b -_08049380: .4byte 0x02024214 -_08049384: .4byte 0x0831c224 -_08049388: .4byte 0x02024332 -_0804938C: .4byte 0x085cc982 + .pool _08049390: - ldr r1, _080493C0 - ldr r0, _080493C4 + ldr r1, =0x020241f0 + ldr r0, =0x020241f4 ldr r0, [r0] cmp r0, 0 bge _0804939C @@ -149111,25 +143980,21 @@ _0804939C: movs r0, 0x1 str r0, [r1] _080493A8: - ldr r4, _080493C8 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _080493CC - ldr r0, _080493D0 + ldr r1, =0x0831c224 + ldr r0, =0x02024332 ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] b _080499B0 .align 2, 0 -_080493C0: .4byte 0x020241f0 -_080493C4: .4byte 0x020241f4 -_080493C8: .4byte 0x02024214 -_080493CC: .4byte 0x0831c224 -_080493D0: .4byte 0x02024332 + .pool _080493D4: - ldr r4, _0804940C + ldr r4, =0x02024332 ldrb r1, [r4, 0x3] adds r1, 0xF2 lsls r1, 24 @@ -149144,27 +144009,24 @@ _080493D4: beq _080493F2 b _08049994 _080493F2: - ldr r2, _08049410 + ldr r2, =0x02024474 ldrb r1, [r4, 0x3] movs r0, 0x3F ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, _08049414 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _08049418 + ldr r0, =0x082d8cd4 b _080499B0 .align 2, 0 -_0804940C: .4byte 0x02024332 -_08049410: .4byte 0x02024474 -_08049414: .4byte 0x02024214 -_08049418: .4byte 0x082d8cd4 + .pool _0804941C: movs r0, 0x70 negs r0, r0 - ldr r4, _08049458 + ldr r4, =0x02024332 ldrb r1, [r4, 0x3] adds r1, 0xEB lsls r1, 24 @@ -149178,25 +144040,22 @@ _0804941C: beq _0804943C b _08049994 _0804943C: - ldr r2, _0804945C + ldr r2, =0x02024474 ldrb r1, [r4, 0x3] movs r0, 0x3F ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, _08049460 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _08049464 + ldr r0, =0x082d8d65 b _080499B0 .align 2, 0 -_08049458: .4byte 0x02024332 -_0804945C: .4byte 0x02024474 -_08049460: .4byte 0x02024214 -_08049464: .4byte 0x082d8d65 + .pool _08049468: - ldr r4, _080494A0 + ldr r4, =0x02024332 ldrb r1, [r4, 0x3] adds r1, 0xDA lsls r1, 24 @@ -149211,27 +144070,24 @@ _08049468: beq _08049486 b _08049994 _08049486: - ldr r2, _080494A4 + ldr r2, =0x02024474 ldrb r1, [r4, 0x3] movs r0, 0x3F ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, _080494A8 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _080494AC + ldr r0, =0x082d8cd4 b _080499B0 .align 2, 0 -_080494A0: .4byte 0x02024332 -_080494A4: .4byte 0x02024474 -_080494A8: .4byte 0x02024214 -_080494AC: .4byte 0x082d8cd4 + .pool _080494B0: movs r0, 0x60 negs r0, r0 - ldr r4, _080494EC + ldr r4, =0x02024332 ldrb r1, [r4, 0x3] adds r1, 0xD3 lsls r1, 24 @@ -149245,23 +144101,20 @@ _080494B0: beq _080494D0 b _08049994 _080494D0: - ldr r2, _080494F0 + ldr r2, =0x02024474 ldrb r1, [r4, 0x3] movs r0, 0x3F ands r0, r1 strb r0, [r2, 0x10] strb r3, [r2, 0x11] - ldr r4, _080494F4 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _080494F8 + ldr r0, =0x082d8d65 b _080499B0 .align 2, 0 -_080494EC: .4byte 0x02024332 -_080494F0: .4byte 0x02024474 -_080494F4: .4byte 0x02024214 -_080494F8: .4byte 0x082d8d65 + .pool _080494FC: mov r0, r9 ldrb r1, [r0] @@ -149276,7 +144129,7 @@ _080494FC: lsls r1, 15 orrs r0, r1 str r0, [r2] - ldr r2, _08049538 + ldr r2, =0x020242bc mov r3, r9 ldrb r1, [r3] lsls r0, r1, 3 @@ -149285,20 +144138,18 @@ _080494FC: adds r0, r2 movs r1, 0x2 strb r1, [r0, 0x19] - ldr r1, _0804953C + ldr r1, =0x02024268 ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, _08049540 + ldr r1, =0x020241ea ldrh r1, [r1] strh r1, [r0] b _08049994 .align 2, 0 -_08049538: .4byte 0x020242bc -_0804953C: .4byte 0x02024268 -_08049540: .4byte 0x020241ea + .pool _08049544: - ldr r0, _08049560 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 adds r2, r1, 0 @@ -149314,9 +144165,9 @@ _0804955A: str r0, [r2] b _08049994 .align 2, 0 -_08049560: .4byte 0x0202420b + .pool _08049564: - ldr r5, _0804959C + ldr r5, =0x02022fec ldr r0, [r5] movs r1, 0x80 lsls r1, 19 @@ -149325,7 +144176,7 @@ _08049564: beq _08049574 b _08049994 _08049574: - ldr r6, _080495A0 + ldr r6, =0x0202420b ldrb r0, [r6] bl battle_side_get_owner lsls r0, 24 @@ -149337,27 +144188,25 @@ _08049574: cmp r0, 0x1 bne _080495A8 ldr r0, [r5] - ldr r1, _080495A4 + ldr r1, =0x0a3f0902 ands r0, r1 cmp r0, 0 bne _080495D4 b _08049994 .align 2, 0 -_0804959C: .4byte 0x02022fec -_080495A0: .4byte 0x0202420b -_080495A4: .4byte 0x0a3f0902 + .pool _080495A8: ldr r0, [r5] - ldr r1, _08049618 + ldr r1, =0x0a3f0902 ands r0, r1 cmp r0, 0 bne _080495D4 - ldr r0, _0804961C + ldr r0, =0x020243d0 adds r0, 0x29 adds r0, r4, r0 ldrb r1, [r0] - ldr r3, _08049620 - ldr r2, _08049624 + ldr r3, =0x0832a328 + ldr r2, =0x0202406e ldrb r0, [r6] lsls r0, 1 adds r0, r2 @@ -149370,8 +144219,8 @@ _080495A8: beq _080495D4 b _08049994 _080495D4: - ldr r2, _08049628 - ldr r1, _0804962C + ldr r2, =0x02024084 + ldr r1, =0x0202420c ldrb r0, [r1] movs r5, 0x58 muls r0, r5 @@ -149387,10 +144236,10 @@ _080495D4: cmp r0, 0x3C bne _0804963C bl b_movescr_stack_push_cursor - ldr r1, _08049630 - ldr r0, _08049634 + ldr r1, =0x02024214 + ldr r0, =0x082db682 str r0, [r1] - ldr r1, _08049638 + ldr r1, =0x0202420a ldrb r0, [r7] muls r0, r5 add r0, r8 @@ -149402,17 +144251,9 @@ _080495D4: bl b_history__record_ability_usage_of_player b _080499B2 .align 2, 0 -_08049618: .4byte 0x0a3f0902 -_0804961C: .4byte 0x020243d0 -_08049620: .4byte 0x0832a328 -_08049624: .4byte 0x0202406e -_08049628: .4byte 0x02024084 -_0804962C: .4byte 0x0202420c -_08049630: .4byte 0x02024214 -_08049634: .4byte 0x082db682 -_08049638: .4byte 0x0202420a + .pool _0804963C: - ldr r4, _08049708 + ldr r4, =0x0202420b mov r10, r4 ldrb r2, [r4] movs r0, 0x58 @@ -149448,12 +144289,12 @@ _08049676: bne _0804967C b _08049994 _0804967C: - ldr r5, _0804970C + ldr r5, =0x0202449c lsls r0, r2, 1 adds r0, 0xD0 ldr r1, [r5] adds r1, r0 - ldr r2, _08049710 + ldr r2, =0x02024208 strh r3, [r1] strh r3, [r2] ldrb r0, [r7] @@ -149463,7 +144304,7 @@ _0804967C: add r0, r8 movs r6, 0 strh r4, [r0, 0x2E] - ldr r4, _08049714 + ldr r4, =0x02024064 mov r1, r10 ldrb r0, [r1] strb r0, [r4] @@ -149493,11 +144334,11 @@ _0804967C: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution - ldr r4, _08049718 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0804971C + ldr r0, =0x082db422 str r0, [r4] ldrb r0, [r7] ldr r1, [r5] @@ -149513,14 +144354,9 @@ _0804967C: strb r6, [r0] b _080499B2 .align 2, 0 -_08049708: .4byte 0x0202420b -_0804970C: .4byte 0x0202449c -_08049710: .4byte 0x02024208 -_08049714: .4byte 0x02024064 -_08049718: .4byte 0x02024214 -_0804971C: .4byte 0x082db422 + .pool _08049720: - ldr r3, _08049750 + ldr r3, =0x0202420c ldrb r1, [r3] movs r0, 0x58 adds r2, r1, 0 @@ -149533,22 +144369,20 @@ _08049720: lsls r1, 19 orrs r0, r1 str r0, [r2] - ldr r2, _08049754 + ldr r2, =0x020242bc ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _08049758 + ldr r1, =0x0202420b ldrb r1, [r1] strb r1, [r0, 0x14] b _08049994 .align 2, 0 -_08049750: .4byte 0x0202420c -_08049754: .4byte 0x020242bc -_08049758: .4byte 0x0202420b + .pool _0804975C: - ldr r0, _08049774 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 adds r2, r1, 0 @@ -149561,29 +144395,27 @@ _0804975C: lsls r1, 20 b _0804955A .align 2, 0 -_08049774: .4byte 0x0202420c + .pool _08049778: - ldr r4, _08049788 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0804978C + ldr r0, =0x082daf27 b _080499B0 .align 2, 0 -_08049788: .4byte 0x02024214 -_0804978C: .4byte 0x082daf27 + .pool _08049790: - ldr r4, _080497A0 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _080497A4 + ldr r0, =0x082dafc3 b _080499B0 .align 2, 0 -_080497A0: .4byte 0x02024214 -_080497A4: .4byte 0x082dafc3 + .pool _080497A8: - ldr r6, _080497F8 + ldr r6, =0x0202420c ldrb r0, [r6] movs r2, 0x58 muls r0, r2 @@ -149601,7 +144433,7 @@ _080497C2: negs r0, r0 ands r4, r0 str r4, [r5] - ldr r4, _080497FC + ldr r4, =0x02024064 ldrb r0, [r6] strb r0, [r4] ldrb r0, [r4] @@ -149615,30 +144447,26 @@ _080497C2: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r4, _08049800 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _08049804 + ldr r0, =0x082db361 b _080499B0 .align 2, 0 -_080497F8: .4byte 0x0202420c -_080497FC: .4byte 0x02024064 -_08049800: .4byte 0x02024214 -_08049804: .4byte 0x082db361 + .pool _08049808: - ldr r4, _08049818 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0804981C + ldr r0, =0x082db117 b _080499B0 .align 2, 0 -_08049818: .4byte 0x02024214 -_0804981C: .4byte 0x082db117 + .pool _08049820: - ldr r4, _08049850 - ldr r0, _08049854 + ldr r4, =0x020241f0 + ldr r0, =0x020241f4 ldr r0, [r0] movs r1, 0x3 bl __divsi3 @@ -149648,23 +144476,19 @@ _08049820: movs r0, 0x1 str r0, [r4] _08049836: - ldr r4, _08049858 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r1, _0804985C - ldr r0, _08049860 + ldr r1, =0x0831c224 + ldr r0, =0x02024332 ldrb r0, [r0, 0x3] lsls r0, 2 adds r0, r1 ldr r0, [r0] b _080499B0 .align 2, 0 -_08049850: .4byte 0x020241f0 -_08049854: .4byte 0x020241f4 -_08049858: .4byte 0x02024214 -_0804985C: .4byte 0x0831c224 -_08049860: .4byte 0x02024332 + .pool _08049864: mov r4, r9 ldrb r0, [r4] @@ -149685,12 +144509,12 @@ _08049880: lsls r0, 5 orrs r1, r0 str r1, [r2] - ldr r1, _080498B8 + ldr r1, =0x02024268 mov r2, r9 ldrb r0, [r2] lsls r0, 1 adds r0, r1 - ldr r1, _080498BC + ldr r1, =0x020241ea ldrh r1, [r1] strh r1, [r0] bl GenerateRandomNumber @@ -149708,8 +144532,7 @@ _08049880: str r0, [r2] b _080499B2 .align 2, 0 -_080498B8: .4byte 0x02024268 -_080498BC: .4byte 0x020241ea + .pool _080498C0: mov r4, r9 ldrb r3, [r4] @@ -149726,19 +144549,17 @@ _080498C0: ldrh r0, [r1, 0x2E] cmp r0, 0 beq _08049994 - ldr r0, _080498F4 + ldr r0, =0x0202420a strb r2, [r0] - ldr r1, _080498F8 - ldr r0, _080498FC + ldr r1, =0x02024214 + ldr r0, =0x082db63f str r0, [r1] ldrb r0, [r4] movs r1, 0x3C bl b_history__record_ability_usage_of_player b _080499B2 .align 2, 0 -_080498F4: .4byte 0x0202420a -_080498F8: .4byte 0x02024214 -_080498FC: .4byte 0x082db63f + .pool _08049900: ldrh r0, [r1, 0x2E] cmp r0, 0 @@ -149747,7 +144568,7 @@ _08049900: bl battle_side_get_owner lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08049978 + ldr r1, =0x02024208 mov r3, r9 ldrb r0, [r3] muls r0, r5 @@ -149760,11 +144581,11 @@ _08049900: movs r5, 0 movs r1, 0 strh r1, [r0, 0x2E] - ldr r2, _0804997C + ldr r2, =0x020243d0 adds r2, 0x29 adds r2, r4, r2 - ldr r3, _08049980 - ldr r1, _08049984 + ldr r3, =0x0832a328 + ldr r1, =0x0202406e mov r4, r9 ldrb r0, [r4] lsls r0, 1 @@ -149776,15 +144597,15 @@ _08049900: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r4, _08049988 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0804998C + ldr r0, =0x082db168 str r0, [r4] mov r1, r9 ldrb r0, [r1] - ldr r2, _08049990 + ldr r2, =0x0202449c ldr r1, [r2] lsls r0, 1 adds r0, r1 @@ -149799,31 +144620,25 @@ _08049900: strb r5, [r0] b _080499B2 .align 2, 0 -_08049978: .4byte 0x02024208 -_0804997C: .4byte 0x020243d0 -_08049980: .4byte 0x0832a328 -_08049984: .4byte 0x0202406e -_08049988: .4byte 0x02024214 -_0804998C: .4byte 0x082db168 -_08049990: .4byte 0x0202449c + .pool _08049994: - ldr r1, _080499A0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] b _080499B2 .align 2, 0 -_080499A0: .4byte 0x02024214 + .pool _080499A4: - ldr r4, _080499C8 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _080499CC + ldr r0, =0x082db1d5 _080499B0: str r0, [r4] _080499B2: - ldr r1, _080499D0 + ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x3] _080499B8: @@ -149836,16 +144651,14 @@ _080499B8: pop {r0} bx r0 .align 2, 0 -_080499C8: .4byte 0x02024214 -_080499CC: .4byte 0x082db1d5 -_080499D0: .4byte 0x02024332 + .pool thumb_func_end sub_8048760 thumb_func_start atk15_seteffectwithchancetarget atk15_seteffectwithchancetarget: @ 80499D4 push {r4,lr} - ldr r2, _08049A00 - ldr r0, _08049A04 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -149854,8 +144667,8 @@ atk15_seteffectwithchancetarget: @ 80499D4 ldrb r0, [r0] cmp r0, 0x20 bne _08049A10 - ldr r2, _08049A08 - ldr r0, _08049A0C + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -149865,13 +144678,10 @@ atk15_seteffectwithchancetarget: @ 80499D4 lsls r4, r0, 1 b _08049A20 .align 2, 0 -_08049A00: .4byte 0x02024084 -_08049A04: .4byte 0x0202420b -_08049A08: .4byte 0x0831c898 -_08049A0C: .4byte 0x020241ea + .pool _08049A10: - ldr r2, _08049A40 - ldr r0, _08049A44 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -149879,13 +144689,13 @@ _08049A10: adds r0, r2 ldrb r4, [r0, 0x5] _08049A20: - ldr r3, _08049A48 + ldr r3, =0x02024332 ldrb r2, [r3, 0x3] movs r0, 0x80 ands r0, r2 cmp r0, 0 beq _08049A50 - ldr r0, _08049A4C + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -149896,10 +144706,7 @@ _08049A20: strb r0, [r3, 0x3] b _08049A7E .align 2, 0 -_08049A40: .4byte 0x0831c898 -_08049A44: .4byte 0x020241ea -_08049A48: .4byte 0x02024332 -_08049A4C: .4byte 0x0202427c + .pool _08049A50: bl GenerateRandomNumber lsls r0, 16 @@ -149910,11 +144717,11 @@ _08049A50: lsrs r0, 16 cmp r0, r4 bcs _08049A9A - ldr r0, _08049A88 + ldr r0, =0x02024332 ldrb r0, [r0, 0x3] cmp r0, 0 beq _08049A9A - ldr r0, _08049A8C + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -149928,31 +144735,28 @@ _08049A7E: bl sub_8048760 b _08049AA2 .align 2, 0 -_08049A88: .4byte 0x02024332 -_08049A8C: .4byte 0x0202427c + .pool _08049A90: movs r0, 0 movs r1, 0 bl sub_8048760 b _08049AA2 _08049A9A: - ldr r1, _08049AB4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] _08049AA2: - ldr r0, _08049AB8 + ldr r0, =0x02024332 movs r1, 0 strb r1, [r0, 0x3] - ldr r0, _08049ABC + ldr r0, =0x02024474 strb r1, [r0, 0x16] pop {r4} pop {r0} bx r0 .align 2, 0 -_08049AB4: .4byte 0x02024214 -_08049AB8: .4byte 0x02024332 -_08049ABC: .4byte 0x02024474 + .pool thumb_func_end atk15_seteffectwithchancetarget thumb_func_start sub_8049AC0 @@ -149978,36 +144782,33 @@ sub_8049AD0: @ 8049AD0 thumb_func_start sub_8049AE0 sub_8049AE0: @ 8049AE0 push {lr} - ldr r0, _08049B04 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r2, _08049B08 + ldr r2, =0x02024064 strb r0, [r2] - ldr r3, _08049B0C + ldr r3, =0x02024332 ldrb r0, [r3, 0x3] cmp r0, 0x6 bhi _08049B14 - ldr r1, _08049B10 + ldr r1, =0x02024084 ldrb r2, [r2] movs r0, 0x58 muls r2, r0 adds r1, 0x4C b _08049B1E .align 2, 0 -_08049B04: .4byte 0x02024214 -_08049B08: .4byte 0x02024064 -_08049B0C: .4byte 0x02024332 -_08049B10: .4byte 0x02024084 + .pool _08049B14: - ldr r1, _08049B48 + ldr r1, =0x02024084 ldrb r2, [r2] movs r0, 0x58 muls r2, r0 adds r1, 0x50 _08049B1E: adds r2, r1 - ldr r1, _08049B4C + ldr r1, =0x0831c134 ldrb r0, [r3, 0x3] lsls r0, 2 adds r0, r1 @@ -150015,23 +144816,19 @@ _08049B1E: ldr r0, [r2] bics r0, r1 str r0, [r2] - ldr r0, _08049B50 + ldr r0, =0x02024332 movs r2, 0 strb r2, [r0, 0x3] - ldr r1, _08049B54 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] - ldr r0, _08049B58 + ldr r0, =0x02024474 strb r2, [r0, 0x16] pop {r0} bx r0 .align 2, 0 -_08049B48: .4byte 0x02024084 -_08049B4C: .4byte 0x0831c134 -_08049B50: .4byte 0x02024332 -_08049B54: .4byte 0x02024214 -_08049B58: .4byte 0x02024474 + .pool thumb_func_end sub_8049AE0 thumb_func_start atk19_faintpokemon @@ -150041,7 +144838,7 @@ atk19_faintpokemon: @ 8049B5C mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r0, _08049BC8 + ldr r0, =0x02024214 ldr r2, [r0] ldrb r1, [r2, 0x2] adds r6, r0, 0 @@ -150049,10 +144846,10 @@ atk19_faintpokemon: @ 8049B5C beq _08049BE0 ldrb r0, [r2, 0x1] bl get_battle_side_of_something - ldr r5, _08049BCC + ldr r5, =0x02024064 strb r0, [r5] - ldr r2, _08049BD0 - ldr r1, _08049BD4 + ldr r2, =0x02024280 + ldr r1, =0x0832a328 ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -150079,54 +144876,46 @@ _08049B94: str r4, [r6] ldrb r0, [r5] bl battle_side_get_owner - ldr r1, _08049BD8 + ldr r1, =0x0202428e lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r2, [r0] - ldr r1, _08049BDC + ldr r1, =0x0000fdff ands r1, r2 strh r1, [r0] b _08049E32 .align 2, 0 -_08049BC8: .4byte 0x02024214 -_08049BCC: .4byte 0x02024064 -_08049BD0: .4byte 0x02024280 -_08049BD4: .4byte 0x0832a328 -_08049BD8: .4byte 0x0202428e -_08049BDC: .4byte 0x0000fdff + .pool _08049BE0: ldrb r0, [r2, 0x1] cmp r0, 0x1 bne _08049C08 - ldr r1, _08049BF8 - ldr r0, _08049BFC + ldr r1, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r1] - ldr r0, _08049C00 + ldr r0, =0x0202420c ldrb r0, [r0] mov r9, r0 - ldr r4, _08049C04 + ldr r4, =0x082da7aa b _08049C18 .align 2, 0 -_08049BF8: .4byte 0x02024064 -_08049BFC: .4byte 0x0202420b -_08049C00: .4byte 0x0202420c -_08049C04: .4byte 0x082da7aa + .pool _08049C08: - ldr r1, _08049C80 - ldr r0, _08049C84 + ldr r1, =0x02024064 + ldr r0, =0x0202420c ldrb r0, [r0] strb r0, [r1] - ldr r0, _08049C88 + ldr r0, =0x0202420b ldrb r0, [r0] mov r9, r0 - ldr r4, _08049C8C + ldr r4, =0x082da7b7 _08049C18: mov r8, r1 - ldr r0, _08049C90 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08049C94 + ldr r2, =0x0832a328 mov r7, r8 ldrb r3, [r7] lsls r0, r3, 2 @@ -150137,7 +144926,7 @@ _08049C18: beq _08049C32 b _08049E2C _08049C32: - ldr r1, _08049C98 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 adds r0, r1 @@ -150146,7 +144935,7 @@ _08049C32: beq _08049C42 b _08049E2C _08049C42: - ldr r5, _08049C9C + ldr r5, =0x02024280 lsls r1, r2, 28 ldr r0, [r5] orrs r0, r1 @@ -150165,7 +144954,7 @@ _08049C42: lsls r1, 15 orrs r0, r1 str r0, [r5] - ldr r1, _08049CA0 + ldr r1, =0x03005d10 ldrb r0, [r1] cmp r0, 0xFE bhi _08049C78 @@ -150176,24 +144965,16 @@ _08049C78: bl sub_80570F4 b _08049CCE .align 2, 0 -_08049C80: .4byte 0x02024064 -_08049C84: .4byte 0x0202420c -_08049C88: .4byte 0x0202420b -_08049C8C: .4byte 0x082da7b7 -_08049C90: .4byte 0x02024210 -_08049C94: .4byte 0x0832a328 -_08049C98: .4byte 0x02024084 -_08049C9C: .4byte 0x02024280 -_08049CA0: .4byte 0x03005d10 + .pool _08049CA4: - ldr r4, _08049DEC + ldr r4, =0x03005d10 ldrb r0, [r4, 0x1] cmp r0, 0xFE bhi _08049CB0 adds r0, 0x1 strb r0, [r4, 0x1] _08049CB0: - ldr r1, _08049DF0 + ldr r1, =0x0202406e mov r2, r8 ldrb r0, [r2] lsls r0, 1 @@ -150201,21 +144982,21 @@ _08049CB0: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08049DF4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB movs r2, 0 bl pokemon_getattr strh r0, [r4, 0x20] _08049CCE: - ldr r2, _08049DF8 + ldr r2, =0x02024280 ldr r1, [r2] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _08049D0C - ldr r6, _08049DFC - ldr r0, _08049E00 + ldr r6, =0x02024084 + ldr r0, =0x0202420b ldrb r0, [r0] movs r5, 0x58 muls r0, r5 @@ -150227,20 +145008,20 @@ _08049CCE: negs r0, r0 ands r1, r0 str r1, [r2] - ldr r4, _08049E04 + ldr r4, =0x02024214 ldr r0, [r4] bl b_movescr_stack_push - ldr r1, _08049E08 + ldr r1, =0x020241f0 mov r0, r9 muls r0, r5 adds r0, r6 ldrh r0, [r0, 0x28] str r0, [r1] - ldr r0, _08049E0C + ldr r0, =0x082dae3e str r0, [r4] _08049D0C: - ldr r1, _08049E10 - ldr r6, _08049E14 + ldr r1, =0x020242ac + ldr r6, =0x0202420c ldrb r0, [r6] lsls r0, 2 adds r0, r1 @@ -150252,7 +145033,7 @@ _08049D0C: bne _08049D24 b _08049E32 _08049D24: - ldr r0, _08049DF8 + ldr r0, =0x02024280 ldr r5, [r0] movs r0, 0x80 lsls r0, 17 @@ -150261,7 +145042,7 @@ _08049D24: beq _08049D34 b _08049E32 _08049D34: - ldr r3, _08049E00 + ldr r3, =0x0202420b mov r8, r3 ldrb r0, [r3] bl battle_side_get_owner @@ -150272,7 +145053,7 @@ _08049D34: lsls r0, 24 cmp r4, r0 beq _08049E32 - ldr r0, _08049DFC + ldr r0, =0x02024084 mov r9, r0 mov r2, r8 ldrb r1, [r2] @@ -150283,11 +145064,11 @@ _08049D34: ldrh r0, [r0, 0x28] cmp r0, 0 beq _08049E32 - ldr r0, _08049E18 + ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xA5 beq _08049E32 - ldr r0, _08049E1C + ldr r0, =0x0202449c ldr r0, [r0] adds r0, r1, r0 adds r0, 0x80 @@ -150297,12 +145078,12 @@ _08049D34: adds r6, 0x24 adds r0, r6 strb r5, [r0] - ldr r5, _08049E04 + ldr r5, =0x02024214 ldr r0, [r5] bl b_movescr_stack_push - ldr r0, _08049E20 + ldr r0, =0x082db18d str r0, [r5] - ldr r5, _08049E24 + ldr r5, =0x02024064 mov r3, r8 ldrb r0, [r3] strb r0, [r5] @@ -150321,7 +145102,7 @@ _08049D34: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08049E28 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -150348,22 +145129,7 @@ _08049D34: strb r0, [r1, 0x4] b _08049E32 .align 2, 0 -_08049DEC: .4byte 0x03005d10 -_08049DF0: .4byte 0x0202406e -_08049DF4: .4byte 0x02024744 -_08049DF8: .4byte 0x02024280 -_08049DFC: .4byte 0x02024084 -_08049E00: .4byte 0x0202420b -_08049E04: .4byte 0x02024214 -_08049E08: .4byte 0x020241f0 -_08049E0C: .4byte 0x082dae3e -_08049E10: .4byte 0x020242ac -_08049E14: .4byte 0x0202420c -_08049E18: .4byte 0x020241ea -_08049E1C: .4byte 0x0202449c -_08049E20: .4byte 0x082db18d -_08049E24: .4byte 0x02024064 -_08049E28: .4byte 0x02022f58 + .pool _08049E2C: ldr r0, [r6] adds r0, 0x7 @@ -150381,15 +145147,15 @@ _08049E32: thumb_func_start sub_8049E40 sub_8049E40: @ 8049E40 push {r4,r5,lr} - ldr r0, _08049E70 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _08049E6A - ldr r5, _08049E74 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, _08049E78 + ldr r4, =0x02024064 strb r0, [r4] movs r0, 0 bl dp01_build_cmdbuf_x0A_A_A_A @@ -150403,33 +145169,31 @@ _08049E6A: pop {r0} bx r0 .align 2, 0 -_08049E70: .4byte 0x02024068 -_08049E74: .4byte 0x02024214 -_08049E78: .4byte 0x02024064 + .pool thumb_func_end sub_8049E40 thumb_func_start sub_8049E7C sub_8049E7C: @ 8049E7C push {r4,r5,lr} sub sp, 0x4 - ldr r0, _08049EF0 + ldr r0, =0x02024068 ldr r5, [r0] cmp r5, 0 bne _08049EE8 - ldr r0, _08049EF4 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, _08049EF8 + ldr r4, =0x02024064 strb r0, [r4] - ldr r0, _08049EFC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 beq _08049EB4 - ldr r2, _08049F00 + ldr r2, =0x02024084 ldrb r1, [r4] movs r0, 0x58 muls r0, r1 @@ -150438,7 +145202,7 @@ sub_8049E7C: @ 8049E7C cmp r0, 0 bne _08049EDC _08049EB4: - ldr r1, _08049F00 + ldr r1, =0x02024084 ldrb r0, [r4] movs r2, 0x58 muls r0, r2 @@ -150458,7 +145222,7 @@ _08049EB4: bl dp01_battle_side_mark_buffer_for_execution _08049EDC: bl sub_803A75C - ldr r1, _08049EF4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -150468,17 +145232,13 @@ _08049EE8: pop {r0} bx r0 .align 2, 0 -_08049EF0: .4byte 0x02024068 -_08049EF4: .4byte 0x02024214 -_08049EF8: .4byte 0x02024064 -_08049EFC: .4byte 0x02022fec -_08049F00: .4byte 0x02024084 + .pool thumb_func_end sub_8049E7C thumb_func_start atk1C_jumpifstatus atk1C_jumpifstatus: @ 8049F04 push {r4,r5,lr} - ldr r5, _08049F60 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something @@ -150505,7 +145265,7 @@ atk1C_jumpifstatus: @ 8049F04 ldrb r1, [r2, 0x9] lsls r1, 24 adds r3, r1 - ldr r2, _08049F64 + ldr r2, =0x02024084 movs r1, 0x58 muls r1, r0 adds r0, r2, 0 @@ -150522,10 +145282,9 @@ atk1C_jumpifstatus: @ 8049F04 str r3, [r5] b _08049F70 .align 2, 0 -_08049F60: .4byte 0x02024214 -_08049F64: .4byte 0x02024084 + .pool _08049F68: - ldr r1, _08049F78 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0xA str r0, [r1] @@ -150534,13 +145293,13 @@ _08049F70: pop {r0} bx r0 .align 2, 0 -_08049F78: .4byte 0x02024214 + .pool thumb_func_end atk1C_jumpifstatus thumb_func_start atk1D_jumpifsecondarystatus atk1D_jumpifsecondarystatus: @ 8049F7C push {r4,r5,lr} - ldr r5, _08049FD8 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something @@ -150567,7 +145326,7 @@ atk1D_jumpifsecondarystatus: @ 8049F7C ldrb r1, [r2, 0x9] lsls r1, 24 adds r3, r1 - ldr r2, _08049FDC + ldr r2, =0x02024084 movs r1, 0x58 muls r1, r0 adds r0, r2, 0 @@ -150584,10 +145343,9 @@ atk1D_jumpifsecondarystatus: @ 8049F7C str r3, [r5] b _08049FE8 .align 2, 0 -_08049FD8: .4byte 0x02024214 -_08049FDC: .4byte 0x02024084 + .pool _08049FE0: - ldr r1, _08049FF0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0xA str r0, [r1] @@ -150596,7 +145354,7 @@ _08049FE8: pop {r0} bx r0 .align 2, 0 -_08049FF0: .4byte 0x02024214 + .pool thumb_func_end atk1D_jumpifsecondarystatus thumb_func_start atk1E_jumpifability @@ -150605,7 +145363,7 @@ atk1E_jumpifability: @ 8049FF4 mov r7, r8 push {r7} sub sp, 0x4 - ldr r6, _0804A048 + ldr r6, =0x02024214 ldr r2, [r6] ldrb r5, [r2, 0x2] mov r8, r5 @@ -150622,7 +145380,7 @@ atk1E_jumpifability: @ 8049FF4 ldrb r0, [r2, 0x1] cmp r0, 0x8 bne _0804A054 - ldr r0, _0804A04C + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0 str r0, [sp] @@ -150634,7 +145392,7 @@ atk1E_jumpifability: @ 8049FF4 lsrs r4, r0, 24 cmp r4, 0 beq _0804A0C8 - ldr r1, _0804A050 + ldr r1, =0x0202420a strb r5, [r1] str r7, [r6] subs r4, 0x1 @@ -150643,13 +145401,11 @@ atk1E_jumpifability: @ 8049FF4 ldrb r1, [r1] b _0804A0B0 .align 2, 0 -_0804A048: .4byte 0x02024214 -_0804A04C: .4byte 0x0202420b -_0804A050: .4byte 0x0202420a + .pool _0804A054: cmp r0, 0x9 bne _0804A08C - ldr r0, _0804A084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0 str r0, [sp] @@ -150661,7 +145417,7 @@ _0804A054: lsrs r4, r0, 24 cmp r4, 0 beq _0804A0C8 - ldr r1, _0804A088 + ldr r1, =0x0202420a strb r5, [r1] str r7, [r6] subs r4, 0x1 @@ -150670,14 +145426,13 @@ _0804A054: ldrb r1, [r1] b _0804A0B0 .align 2, 0 -_0804A084: .4byte 0x0202420b -_0804A088: .4byte 0x0202420a + .pool _0804A08C: ldrb r0, [r2, 0x1] bl get_battle_side_of_something lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0804A0BC + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r4 adds r0, r1 @@ -150685,20 +145440,18 @@ _0804A08C: ldrb r1, [r0] cmp r1, r8 bne _0804A0C8 - ldr r0, _0804A0C0 + ldr r0, =0x0202420a strb r1, [r0] str r7, [r6] ldrb r1, [r0] adds r0, r4, 0 _0804A0B0: bl b_history__record_ability_usage_of_player - ldr r0, _0804A0C4 + ldr r0, =0x02024474 strb r4, [r0, 0x15] b _0804A0CE .align 2, 0 -_0804A0BC: .4byte 0x02024084 -_0804A0C0: .4byte 0x0202420a -_0804A0C4: .4byte 0x02024474 + .pool _0804A0C8: ldr r0, [r6] adds r0, 0x7 @@ -150715,26 +145468,25 @@ _0804A0CE: thumb_func_start sub_804A0DC sub_804A0DC: @ 804A0DC push {r4-r6,lr} - ldr r0, _0804A0F4 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r4, [r0, 0x1] cmp r4, 0x1 bne _0804A0FC - ldr r0, _0804A0F8 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status b _0804A106 .align 2, 0 -_0804A0F4: .4byte 0x02024214 -_0804A0F8: .4byte 0x0202420b + .pool _0804A0FC: - ldr r0, _0804A13C + ldr r0, =0x0202420c ldrb r0, [r0] bl battle_get_per_side_status movs r4, 0x1 _0804A106: ands r4, r0 - ldr r6, _0804A140 + ldr r6, =0x02024214 ldr r3, [r6] ldrb r2, [r3, 0x2] ldrb r0, [r3, 0x3] @@ -150750,7 +145502,7 @@ _0804A106: ldrb r0, [r3, 0x7] lsls r0, 24 adds r5, r1, r0 - ldr r1, _0804A144 + ldr r1, =0x0202428e lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] @@ -150760,9 +145512,7 @@ _0804A106: str r5, [r6] b _0804A14E .align 2, 0 -_0804A13C: .4byte 0x0202420c -_0804A140: .4byte 0x02024214 -_0804A144: .4byte 0x0202428e + .pool _0804A148: adds r0, r3, 0 adds r0, 0x8 @@ -150777,13 +145527,13 @@ _0804A14E: sub_804A154: @ 804A154 push {r4,r5,lr} movs r5, 0 - ldr r4, _0804A188 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something lsls r0, 24 lsrs r0, 24 - ldr r2, _0804A18C + ldr r2, =0x02024084 ldr r3, [r4] movs r1, 0x58 muls r0, r1 @@ -150796,14 +145546,12 @@ sub_804A154: @ 804A154 cmp r0, 0x5 bhi _0804A212 lsls r0, 2 - ldr r1, _0804A190 + ldr r1, =_0804A194 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804A188: .4byte 0x02024214 -_0804A18C: .4byte 0x02024084 -_0804A190: .4byte _0804A194 + .pool .align 2, 0 _0804A194: .4byte _0804A1AC @@ -150813,43 +145561,43 @@ _0804A194: .4byte _0804A1EC .4byte _0804A200 _0804A1AC: - ldr r0, _0804A1B8 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 bne _0804A212 b _0804A20C .align 2, 0 -_0804A1B8: .4byte 0x02024214 + .pool _0804A1BC: - ldr r0, _0804A1C8 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 beq _0804A212 b _0804A20C .align 2, 0 -_0804A1C8: .4byte 0x02024214 + .pool _0804A1CC: - ldr r0, _0804A1D8 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 bls _0804A212 b _0804A20C .align 2, 0 -_0804A1D8: .4byte 0x02024214 + .pool _0804A1DC: - ldr r0, _0804A1E8 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 bcs _0804A212 b _0804A20C .align 2, 0 -_0804A1E8: .4byte 0x02024214 + .pool _0804A1EC: - ldr r0, _0804A1FC + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] ands r2, r0 @@ -150857,9 +145605,9 @@ _0804A1EC: beq _0804A212 b _0804A20C .align 2, 0 -_0804A1FC: .4byte 0x02024214 + .pool _0804A200: - ldr r0, _0804A234 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] ands r2, r0 @@ -150872,7 +145620,7 @@ _0804A20C: _0804A212: cmp r5, 0 beq _0804A238 - ldr r3, _0804A234 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -150887,9 +145635,9 @@ _0804A212: str r1, [r3] b _0804A240 .align 2, 0 -_0804A234: .4byte 0x02024214 + .pool _0804A238: - ldr r1, _0804A248 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x9 str r0, [r1] @@ -150898,17 +145646,17 @@ _0804A240: pop {r0} bx r0 .align 2, 0 -_0804A248: .4byte 0x02024214 + .pool thumb_func_end sub_804A154 thumb_func_start atk21_jumpifspecialstatusflag atk21_jumpifspecialstatusflag: @ 804A24C push {r4-r6,lr} - ldr r4, _0804A2A0 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r5, _0804A2A4 + ldr r5, =0x02024064 strb r0, [r5] ldr r2, [r4] ldrb r1, [r2, 0x2] @@ -150934,7 +145682,7 @@ atk21_jumpifspecialstatusflag: @ 804A24C ldrb r0, [r2, 0x6] cmp r0, 0 beq _0804A2AC - ldr r0, _0804A2A8 + ldr r0, =0x020242ac ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -150944,11 +145692,9 @@ atk21_jumpifspecialstatusflag: @ 804A24C bne _0804A2C4 b _0804A2BC .align 2, 0 -_0804A2A0: .4byte 0x02024214 -_0804A2A4: .4byte 0x02024064 -_0804A2A8: .4byte 0x020242ac + .pool _0804A2AC: - ldr r0, _0804A2C0 + ldr r0, =0x020242ac ldrb r1, [r5] lsls r1, 2 adds r1, r0 @@ -150960,7 +145706,7 @@ _0804A2BC: str r3, [r4] b _0804A2CA .align 2, 0 -_0804A2C0: .4byte 0x020242ac + .pool _0804A2C4: adds r0, r2, 0 adds r0, 0xB @@ -150974,7 +145720,7 @@ _0804A2CA: thumb_func_start sub_804A2D0 sub_804A2D0: @ 804A2D0 push {r4-r6,lr} - ldr r4, _0804A318 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something @@ -150992,7 +145738,7 @@ sub_804A2D0: @ 804A2D0 ldrb r1, [r3, 0x6] lsls r1, 24 adds r6, r2, r1 - ldr r2, _0804A31C + ldr r2, =0x02024084 movs r1, 0x58 muls r0, r1 adds r1, r0, r2 @@ -151010,8 +145756,7 @@ _0804A314: str r6, [r4] b _0804A324 .align 2, 0 -_0804A318: .4byte 0x02024214 -_0804A31C: .4byte 0x02024084 + .pool _0804A320: adds r0, r3, 0x7 str r0, [r4] @@ -151028,17 +145773,17 @@ sub_804A32C: @ 804A32C mov r6, r8 push {r6,r7} movs r6, 0 - ldr r0, _0804A374 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x50 mov r9, r0 - ldr r0, _0804A378 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, _0804A37C + ldr r1, =0x0202420d strb r0, [r1] - ldr r2, _0804A380 + ldr r2, =0x020243fe movs r1, 0x2 ands r1, r0 lsls r1, 24 @@ -151046,24 +145791,19 @@ sub_804A32C: @ 804A32C adds r1, r2 ldrb r1, [r1] mov r8, r1 - ldr r0, _0804A384 + ldr r0, =0x02024474 ldrb r0, [r0, 0x1C] cmp r0, 0x6 bls _0804A368 bl _0804ACB2 _0804A368: lsls r0, 2 - ldr r1, _0804A388 + ldr r1, =_0804A38C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804A374: .4byte 0x0202449c -_0804A378: .4byte 0x02024214 -_0804A37C: .4byte 0x0202420d -_0804A380: .4byte 0x020243fe -_0804A384: .4byte 0x02024474 -_0804A388: .4byte _0804A38C + .pool .align 2, 0 _0804A38C: .4byte _0804A3A8 @@ -151074,7 +145814,7 @@ _0804A38C: .4byte _0804AC40 .4byte _0804AC88 _0804A3A8: - ldr r4, _0804A3F8 + ldr r4, =0x0202420d ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -151083,23 +145823,23 @@ _0804A3A8: beq _0804A3BC bl _0804AC7C _0804A3BC: - ldr r0, _0804A3FC + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0804A400 + ldr r1, =0x063f0982 ands r0, r1 cmp r0, 0 beq _0804A3CC bl _0804AC7C _0804A3CC: - ldr r1, _0804A404 + ldr r1, =0x02024474 ldrb r0, [r1, 0x1C] adds r0, 0x1 strb r0, [r1, 0x1C] - ldr r0, _0804A408 + ldr r0, =0x0202449c ldr r2, [r0] adds r2, 0xDF - ldr r3, _0804A40C - ldr r1, _0804A410 + ldr r3, =0x0832a328 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -151112,13 +145852,7 @@ _0804A3CC: strb r0, [r2] bl _0804ACB2 .align 2, 0 -_0804A3F8: .4byte 0x0202420d -_0804A3FC: .4byte 0x02022fec -_0804A400: .4byte 0x063f0982 -_0804A404: .4byte 0x02024474 -_0804A408: .4byte 0x0202449c -_0804A40C: .4byte 0x0832a328 -_0804A410: .4byte 0x0202406e + .pool _0804A414: movs r5, 0 movs r7, 0 @@ -151126,7 +145860,7 @@ _0804A418: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0804A468 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -151138,7 +145872,7 @@ _0804A418: bl pokemon_getattr cmp r0, 0 beq _0804A486 - ldr r0, _0804A46C + ldr r0, =0x0832a328 lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] @@ -151155,17 +145889,14 @@ _0804A44C: lsrs r0, 16 cmp r0, 0xAF bne _0804A478 - ldr r0, _0804A470 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0804A474 + ldr r2, =0x00003226 adds r0, r2 ldrb r4, [r0] b _0804A480 .align 2, 0 -_0804A468: .4byte 0x020244ec -_0804A46C: .4byte 0x0832a328 -_0804A470: .4byte 0x03005d8c -_0804A474: .4byte 0x00003226 + .pool _0804A478: bl itemid_get_x12 lsls r0, 24 @@ -151178,9 +145909,9 @@ _0804A486: adds r7, 0x1 cmp r7, 0x5 ble _0804A418 - ldr r3, _0804A4EC - ldr r2, _0804A4F0 - ldr r0, _0804A4F4 + ldr r3, =0x083203cc + ldr r2, =0x02024084 + ldr r0, =0x0202420d ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -151212,7 +145943,7 @@ _0804A486: movs r0, 0x1 strh r0, [r1] _0804A4D2: - ldr r5, _0804A4F8 + ldr r5, =0x02024402 adds r0, r4, 0 adds r1, r6, 0 bl __divsi3 @@ -151224,10 +145955,7 @@ _0804A4D2: strh r0, [r5] b _0804A516 .align 2, 0 -_0804A4EC: .4byte 0x083203cc -_0804A4F0: .4byte 0x02024084 -_0804A4F4: .4byte 0x0202420d -_0804A4F8: .4byte 0x02024402 + .pool _0804A4FC: adds r0, r1, 0 adds r1, r5, 0 @@ -151240,15 +145968,15 @@ _0804A4FC: movs r0, 0x1 strh r0, [r2] _0804A512: - ldr r0, _0804A560 + ldr r0, =0x02024402 strh r6, [r0] _0804A516: - ldr r1, _0804A564 + ldr r1, =0x02024474 ldrb r0, [r1, 0x1C] adds r0, 0x1 movs r2, 0 strb r0, [r1, 0x1C] - ldr r1, _0804A568 + ldr r1, =0x0202449c ldr r0, [r1] strb r2, [r0, 0x10] ldr r0, [r1] @@ -151256,18 +145984,18 @@ _0804A516: mov r4, r8 strb r4, [r0] _0804A52E: - ldr r0, _0804A56C + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _0804A538 b _0804ACB2 _0804A538: - ldr r0, _0804A568 + ldr r0, =0x0202449c ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _0804A570 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC bl pokemon_getattr @@ -151275,26 +146003,20 @@ _0804A538: lsrs r0, 16 cmp r0, 0xAF bne _0804A57C - ldr r0, _0804A574 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0804A578 + ldr r1, =0x00003226 adds r0, r1 ldrb r4, [r0] b _0804A584 .align 2, 0 -_0804A560: .4byte 0x02024402 -_0804A564: .4byte 0x02024474 -_0804A568: .4byte 0x0202449c -_0804A56C: .4byte 0x02024068 -_0804A570: .4byte 0x020244ec -_0804A574: .4byte 0x03005d8c -_0804A578: .4byte 0x00003226 + .pool _0804A57C: bl itemid_get_x12 lsls r0, 24 lsrs r4, r0, 24 _0804A584: - ldr r5, _0804A5A4 + ldr r5, =0x0202449c cmp r4, 0x19 beq _0804A5AC ldr r0, [r5] @@ -151307,17 +146029,16 @@ _0804A584: bne _0804A5AC lsrs r0, 1 strb r0, [r1] - ldr r1, _0804A5A8 + ldr r1, =0x02024474 b _0804A5D0 .align 2, 0 -_0804A5A4: .4byte 0x0202449c -_0804A5A8: .4byte 0x02024474 + .pool _0804A5AC: ldr r0, [r5] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _0804A5DC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 bl pokemon_getattr @@ -151328,26 +146049,24 @@ _0804A5AC: ldrb r0, [r1] lsrs r0, 1 strb r0, [r1] - ldr r1, _0804A5E0 + ldr r1, =0x02024474 movs r2, 0 _0804A5D0: movs r0, 0x5 strb r0, [r1, 0x1C] - ldr r0, _0804A5E4 + ldr r0, =0x020241f0 str r2, [r0] b _0804ACB2 .align 2, 0 -_0804A5DC: .4byte 0x020244ec -_0804A5E0: .4byte 0x02024474 -_0804A5E4: .4byte 0x020241f0 + .pool _0804A5E8: - ldr r0, _0804A64C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 bne _0804A616 - ldr r0, _0804A650 + ldr r0, =0x02024084 ldrh r0, [r0, 0x28] cmp r0, 0 beq _0804A616 @@ -151356,19 +146075,19 @@ _0804A5E8: cmp r0, 0 bne _0804A616 bl sub_805EA60 - ldr r0, _0804A654 + ldr r0, =0x00000161 bl song_play_for_text ldr r1, [r5] ldrb r0, [r1, 0x12] adds r0, 0x1 strb r0, [r1, 0x12] _0804A616: - ldr r5, _0804A658 + ldr r5, =0x0202449c ldr r0, [r5] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _0804A65C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 bl pokemon_getattr @@ -151383,27 +146102,22 @@ _0804A630: ands r3, r0 cmp r3, 0 beq _0804A664 - ldr r1, _0804A660 + ldr r1, =0x020241f0 mov r2, r9 ldrh r0, [r2] str r0, [r1] mov r9, r1 b _0804A66A .align 2, 0 -_0804A64C: .4byte 0x02022fec -_0804A650: .4byte 0x02024084 -_0804A654: .4byte 0x00000161 -_0804A658: .4byte 0x0202449c -_0804A65C: .4byte 0x020244ec -_0804A660: .4byte 0x020241f0 + .pool _0804A664: - ldr r0, _0804A6E0 + ldr r0, =0x020241f0 str r3, [r0] mov r9, r0 _0804A66A: cmp r4, 0x19 bne _0804A67A - ldr r0, _0804A6E4 + ldr r0, =0x02024402 ldrh r1, [r0] mov r2, r9 ldr r0, [r2] @@ -151420,13 +146134,13 @@ _0804A67A: bl __divsi3 str r0, [r4] _0804A68E: - ldr r5, _0804A6E8 + ldr r5, =0x02022fec ldr r0, [r5] movs r1, 0x8 ands r0, r1 cmp r0, 0 beq _0804A6AA - ldr r4, _0804A6E0 + ldr r4, =0x020241f0 ldr r1, [r4] movs r0, 0x96 muls r0, r1 @@ -151434,12 +146148,12 @@ _0804A68E: bl __divsi3 str r0, [r4] _0804A6AA: - ldr r4, _0804A6EC + ldr r4, =0x0202449c ldr r0, [r4] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _0804A6F0 + ldr r1, =0x020244ec adds r0, r1 bl sub_806E8A8 lsls r0, 24 @@ -151455,19 +146169,14 @@ _0804A6AA: ldrb r0, [r0, 0x10] cmp r0, 0x2 bls _0804A6F8 - ldr r7, _0804A6F4 - ldr r0, _0804A6E0 + ldr r7, =0x00000149 + ldr r0, =0x020241f0 mov r9, r0 b _0804A71A .align 2, 0 -_0804A6E0: .4byte 0x020241f0 -_0804A6E4: .4byte 0x02024402 -_0804A6E8: .4byte 0x02022fec -_0804A6EC: .4byte 0x0202449c -_0804A6F0: .4byte 0x020244ec -_0804A6F4: .4byte 0x00000149 + .pool _0804A6F8: - ldr r4, _0804A710 + ldr r4, =0x020241f0 ldr r1, [r4] movs r0, 0x96 muls r0, r1 @@ -151479,25 +146188,25 @@ _0804A6F8: mov r9, r4 b _0804A71A .align 2, 0 -_0804A710: .4byte 0x020241f0 + .pool _0804A714: - ldr r7, _0804A750 - ldr r1, _0804A754 + ldr r7, =0x00000149 + ldr r1, =0x020241f0 mov r9, r1 _0804A71A: - ldr r0, _0804A758 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 ands r1, r0 cmp r1, 0 beq _0804A786 - ldr r0, _0804A75C - ldr r1, _0804A760 + ldr r0, =0x0202406e + ldr r1, =0x0202449c ldr r4, [r1] ldrh r0, [r0, 0x4] adds r5, r1, 0 - ldr r3, _0804A764 - ldr r2, _0804A768 + ldr r3, =0x0832a328 + ldr r2, =0x02024210 ldrb r1, [r4, 0x10] cmp r0, r1 bne _0804A76C @@ -151512,13 +146221,7 @@ _0804A71A: strb r0, [r1] b _0804A78E .align 2, 0 -_0804A750: .4byte 0x00000149 -_0804A754: .4byte 0x020241f0 -_0804A758: .4byte 0x02022fec -_0804A75C: .4byte 0x0202406e -_0804A760: .4byte 0x0202449c -_0804A764: .4byte 0x0832a328 -_0804A768: .4byte 0x02024210 + .pool _0804A76C: ldrb r2, [r2] ldr r0, [r3] @@ -151535,20 +146238,20 @@ _0804A77E: movs r1, 0x2 b _0804A78C _0804A786: - ldr r0, _0804A834 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x8F _0804A78C: strb r1, [r0] _0804A78E: - ldr r1, _0804A838 + ldr r1, =0x02022f58 movs r2, 0 mov r12, r2 movs r3, 0xFD strb r3, [r1] movs r5, 0x4 strb r5, [r1, 0x1] - ldr r6, _0804A834 + ldr r6, =0x0202449c ldr r2, [r6] movs r4, 0x8F adds r4, r2 @@ -151559,7 +146262,7 @@ _0804A78E: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _0804A83C + ldr r1, =0x02022f68 strb r3, [r1] mov r0, r12 strb r0, [r1, 0x1] @@ -151572,7 +146275,7 @@ _0804A78E: movs r0, 0x1 negs r0, r0 strb r0, [r1, 0x4] - ldr r1, _0804A840 + ldr r1, =0x02022f78 strb r3, [r1] movs r0, 0x1 strb r0, [r1, 0x1] @@ -151604,10 +146307,10 @@ _0804A78E: ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _0804A844 + ldr r1, =0x020244ec adds r0, r1 - ldr r3, _0804A848 - ldr r1, _0804A84C + ldr r3, =0x02024084 + ldr r1, =0x0202420d ldrb r2, [r1] movs r1, 0x58 muls r1, r2 @@ -151615,7 +146318,7 @@ _0804A78E: ldrh r1, [r1] bl sub_806DADC _0804A824: - ldr r0, _0804A834 + ldr r0, =0x0202449c ldr r1, [r0] adds r1, 0x53 ldrb r0, [r1] @@ -151623,22 +146326,16 @@ _0804A824: strb r0, [r1] b _0804A92A .align 2, 0 -_0804A834: .4byte 0x0202449c -_0804A838: .4byte 0x02022f58 -_0804A83C: .4byte 0x02022f68 -_0804A840: .4byte 0x02022f78 -_0804A844: .4byte 0x020244ec -_0804A848: .4byte 0x02024084 -_0804A84C: .4byte 0x0202420d + .pool _0804A850: - ldr r0, _0804A934 + ldr r0, =0x02024068 ldr r2, [r0] cmp r2, 0 beq _0804A85A b _0804ACB2 _0804A85A: - ldr r1, _0804A938 - ldr r7, _0804A93C + ldr r1, =0x02023864 + ldr r7, =0x0202449c ldr r0, [r7] adds r0, 0x8F ldrb r0, [r0] @@ -151649,7 +146346,7 @@ _0804A85A: ldrb r0, [r0, 0x10] movs r6, 0x64 muls r0, r6 - ldr r5, _0804A940 + ldr r5, =0x020244ec adds r0, r5 movs r1, 0x39 bl pokemon_getattr @@ -151669,7 +146366,7 @@ _0804A85A: adds r0, r5 movs r1, 0x3A bl pokemon_getattr - ldr r4, _0804A944 + ldr r4, =0x020244a8 ldr r1, [r4] ldr r1, [r1, 0x10] strh r0, [r1] @@ -151718,49 +146415,42 @@ _0804A85A: ldr r1, [r4] ldr r1, [r1, 0x10] strh r0, [r1, 0xA] - ldr r4, _0804A948 + ldr r4, =0x02024064 ldr r1, [r7] adds r0, r1, 0 adds r0, 0x8F ldrb r0, [r0] strb r0, [r4] ldrb r1, [r1, 0x10] - ldr r0, _0804A94C + ldr r0, =0x020241f0 ldrh r2, [r0] movs r0, 0 bl dp01_build_cmdbuf_x19_a_bb ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0804A92A: - ldr r1, _0804A950 + ldr r1, =0x02024474 ldrb r0, [r1, 0x1C] adds r0, 0x1 strb r0, [r1, 0x1C] b _0804ACB2 .align 2, 0 -_0804A934: .4byte 0x02024068 -_0804A938: .4byte 0x02023864 -_0804A93C: .4byte 0x0202449c -_0804A940: .4byte 0x020244ec -_0804A944: .4byte 0x020244a8 -_0804A948: .4byte 0x02024064 -_0804A94C: .4byte 0x020241f0 -_0804A950: .4byte 0x02024474 + .pool _0804A954: - ldr r0, _0804ABEC + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _0804A95E b _0804ACB2 _0804A95E: - ldr r1, _0804ABF0 - ldr r0, _0804ABF4 + ldr r1, =0x02024064 + ldr r0, =0x0202449c ldr r4, [r0] adds r0, r4, 0 adds r0, 0x8F ldrb r0, [r0] strb r0, [r1] - ldr r3, _0804ABF8 + ldr r3, =0x02023864 ldrb r2, [r1] lsls r1, r2, 9 adds r0, r1, r3 @@ -151776,13 +146466,13 @@ _0804A97C: beq _0804A988 b _0804AC28 _0804A988: - ldr r0, _0804ABFC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 beq _0804A9B2 - ldr r0, _0804AC00 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrh r0, [r1] @@ -151792,27 +146482,27 @@ _0804A988: adds r1, r0, 0 movs r0, 0x64 muls r0, r1 - ldr r1, _0804AC04 + ldr r1, =0x020244ec adds r0, r1 adds r1, r2, 0 bl sub_805E990 _0804A9B2: - ldr r1, _0804AC08 + ldr r1, =0x02022f58 movs r3, 0xFD strb r3, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r6, _0804ABF0 + ldr r6, =0x02024064 ldrb r0, [r6] strb r0, [r1, 0x2] - ldr r4, _0804ABF4 + ldr r4, =0x0202449c mov r9, r4 ldr r2, [r4] ldrb r0, [r2, 0x10] strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r4, _0804AC0C + ldr r4, =0x02022f68 strb r3, [r4] movs r0, 0x1 strb r0, [r4, 0x1] @@ -151825,7 +146515,7 @@ _0804A9B2: mov r2, r8 muls r2, r0 adds r0, r2, 0 - ldr r7, _0804AC04 + ldr r7, =0x020244ec adds r0, r7 movs r1, 0x38 bl pokemon_getattr @@ -151834,8 +146524,8 @@ _0804A9B2: negs r0, r0 strb r0, [r4, 0x5] bl b_movescr_stack_push_cursor - ldr r2, _0804AC10 - ldr r1, _0804AC14 + ldr r2, =0x03005d54 + ldr r1, =0x0832a328 mov r4, r9 ldr r5, [r4] ldrb r0, [r5, 0x10] @@ -151845,11 +146535,11 @@ _0804A9B2: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r1, _0804AC18 - ldr r0, _0804AC1C + ldr r1, =0x02024214 + ldr r0, =0x082dabbd str r0, [r1] - ldr r4, _0804AC20 - ldr r2, _0804ABF8 + ldr r4, =0x020241f0 + ldr r2, =0x02023864 ldrb r1, [r6] lsls r1, 9 adds r0, r2, 0x2 @@ -151868,14 +146558,14 @@ _0804A9B2: adds r0, r7 movs r1, 0 bl happiness_algorithm - ldr r1, _0804AC00 + ldr r1, =0x0202406e mov r2, r9 ldr r0, [r2] ldrb r2, [r0, 0x10] ldrh r0, [r1] cmp r0, r2 bne _0804AB1E - ldr r4, _0804AC24 + ldr r4, =0x02024084 ldrh r0, [r4, 0x28] cmp r0, 0 beq _0804AB1E @@ -151968,8 +146658,8 @@ _0804A9B2: bl pokemon_getattr strh r0, [r4, 0xA] _0804AB1E: - ldr r0, _0804AC00 - ldr r7, _0804ABF4 + ldr r0, =0x0202406e + ldr r7, =0x0202449c ldr r1, [r7] ldrb r2, [r1, 0x10] ldrh r0, [r0, 0x4] @@ -151977,14 +146667,14 @@ _0804AB1E: beq _0804AB2E b _0804AC2E _0804AB2E: - ldr r6, _0804AC24 + ldr r6, =0x02024084 movs r4, 0xD8 adds r4, r6 mov r8, r4 ldrh r0, [r4] cmp r0, 0 beq _0804AC2E - ldr r0, _0804ABFC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -151993,7 +146683,7 @@ _0804AB2E: movs r5, 0x64 adds r0, r2, 0 muls r0, r5 - ldr r4, _0804AC04 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x38 bl pokemon_getattr @@ -152064,47 +146754,31 @@ _0804AB2E: strh r0, [r1] b _0804AC2E .align 2, 0 -_0804ABEC: .4byte 0x02024068 -_0804ABF0: .4byte 0x02024064 -_0804ABF4: .4byte 0x0202449c -_0804ABF8: .4byte 0x02023864 -_0804ABFC: .4byte 0x02022fec -_0804AC00: .4byte 0x0202406e -_0804AC04: .4byte 0x020244ec -_0804AC08: .4byte 0x02022f58 -_0804AC0C: .4byte 0x02022f68 -_0804AC10: .4byte 0x03005d54 -_0804AC14: .4byte 0x0832a328 -_0804AC18: .4byte 0x02024214 -_0804AC1C: .4byte 0x082dabbd -_0804AC20: .4byte 0x020241f0 -_0804AC24: .4byte 0x02024084 + .pool _0804AC28: - ldr r1, _0804AC38 + ldr r1, =0x020241f0 movs r0, 0 str r0, [r1] _0804AC2E: - ldr r1, _0804AC3C + ldr r1, =0x02024474 movs r0, 0x5 strb r0, [r1, 0x1C] b _0804ACB2 .align 2, 0 -_0804AC38: .4byte 0x020241f0 -_0804AC3C: .4byte 0x02024474 + .pool _0804AC40: - ldr r0, _0804AC50 + ldr r0, =0x020241f0 ldr r0, [r0] cmp r0, 0 beq _0804AC58 - ldr r1, _0804AC54 + ldr r1, =0x02024474 movs r0, 0x3 strb r0, [r1, 0x1C] b _0804ACB2 .align 2, 0 -_0804AC50: .4byte 0x020241f0 -_0804AC54: .4byte 0x02024474 + .pool _0804AC58: - ldr r2, _0804AC74 + ldr r2, =0x0202449c ldr r1, [r2] ldrb r0, [r1, 0x10] adds r0, 0x1 @@ -152113,27 +146787,26 @@ _0804AC58: ldrb r0, [r0, 0x10] cmp r0, 0x5 bhi _0804AC7C - ldr r1, _0804AC78 + ldr r1, =0x02024474 movs r0, 0x2 strb r0, [r1, 0x1C] b _0804ACB2 .align 2, 0 -_0804AC74: .4byte 0x0202449c -_0804AC78: .4byte 0x02024474 + .pool _0804AC7C: - ldr r1, _0804AC84 + ldr r1, =0x02024474 movs r0, 0x6 strb r0, [r1, 0x1C] b _0804ACB2 .align 2, 0 -_0804AC84: .4byte 0x02024474 + .pool _0804AC88: - ldr r0, _0804ACC0 + ldr r0, =0x02024068 ldr r5, [r0] cmp r5, 0 bne _0804ACB2 - ldr r4, _0804ACC4 - ldr r2, _0804ACC8 + ldr r4, =0x02024084 + ldr r2, =0x0202420d ldrb r0, [r2] movs r1, 0x58 muls r0, r1 @@ -152145,7 +146818,7 @@ _0804AC88: adds r0, r4 adds r0, 0x20 strb r3, [r0] - ldr r1, _0804ACCC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -152157,10 +146830,7 @@ _0804ACB2: pop {r0} bx r0 .align 2, 0 -_0804ACC0: .4byte 0x02024068 -_0804ACC4: .4byte 0x02024084 -_0804ACC8: .4byte 0x0202420d -_0804ACCC: .4byte 0x02024214 + .pool thumb_func_end sub_804A32C thumb_func_start sub_804ACD0 @@ -152169,22 +146839,22 @@ sub_804ACD0: @ 804ACD0 mov r7, r8 push {r7} movs r6, 0 - ldr r0, _0804AD34 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _0804ACE2 b _0804AF22 _0804ACE2: - ldr r0, _0804AD38 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 beq _0804AD48 - ldr r0, _0804AD3C + ldr r0, =0x02038bce ldrh r1, [r0] - ldr r0, _0804AD40 + ldr r0, =0x00000c03 cmp r1, r0 bne _0804AD48 movs r5, 0 @@ -152192,7 +146862,7 @@ _0804ACFC: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0804AD44 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -152216,18 +146886,14 @@ _0804AD2C: ble _0804ACFC b _0804ADA8 .align 2, 0 -_0804AD34: .4byte 0x02024068 -_0804AD38: .4byte 0x02022fec -_0804AD3C: .4byte 0x02038bce -_0804AD40: .4byte 0x00000c03 -_0804AD44: .4byte 0x020244ec + .pool _0804AD48: movs r5, 0 _0804AD4A: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0804AEC0 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -152239,20 +146905,20 @@ _0804AD4A: bl pokemon_getattr cmp r0, 0 bne _0804ADA2 - ldr r0, _0804AEC4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 beq _0804AD94 - ldr r0, _0804AEC8 + ldr r0, =0x0202449c ldr r0, [r0] movs r1, 0xA8 lsls r1, 2 adds r0, r1 ldrb r1, [r0] - ldr r2, _0804AECC + ldr r2, =0x0832a328 lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -152273,7 +146939,7 @@ _0804ADA2: _0804ADA8: cmp r6, 0 bne _0804ADB6 - ldr r0, _0804AED0 + ldr r0, =0x0202433a ldrb r1, [r0] movs r2, 0x2 orrs r1, r2 @@ -152285,7 +146951,7 @@ _0804ADBA: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0804AED4 + ldr r0, =0x02024744 adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -152297,19 +146963,19 @@ _0804ADBA: bl pokemon_getattr cmp r0, 0 bne _0804AE10 - ldr r0, _0804AEC4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 beq _0804AE02 - ldr r0, _0804AEC8 + ldr r0, =0x0202449c ldr r0, [r0] - ldr r1, _0804AED8 + ldr r1, =0x000002a1 adds r0, r1 ldrb r1, [r0] - ldr r2, _0804AECC + ldr r2, =0x0832a328 lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -152327,7 +146993,7 @@ _0804AE10: adds r5, 0x1 cmp r5, 0x5 ble _0804ADBA - ldr r2, _0804AED0 + ldr r2, =0x0202433a cmp r6, 0 bne _0804AE24 ldrb r0, [r2] @@ -152338,27 +147004,27 @@ _0804AE24: ldrb r0, [r2] cmp r0, 0 bne _0804AF1A - ldr r0, _0804AEC4 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r2, _0804AEDC + ldr r2, =0x02000002 ands r1, r2 mov r8, r0 cmp r1, 0 beq _0804AF1A movs r3, 0 movs r5, 0 - ldr r0, _0804AEE0 + ldr r0, =0x0202406c ldrb r1, [r0] mov r12, r0 - ldr r7, _0804AEE4 + ldr r7, =0x02024214 cmp r3, r1 bge _0804AE70 - ldr r0, _0804AEE8 + ldr r0, =0x02024280 movs r6, 0x80 lsls r6, 21 ldr r4, [r0] adds r2, r1, 0 - ldr r1, _0804AEEC + ldr r1, =0x0202437c _0804AE54: adds r0, r6, 0 lsls r0, r5 @@ -152382,12 +147048,12 @@ _0804AE70: ldrb r1, [r4] cmp r5, r1 bge _0804AEAA - ldr r0, _0804AEE8 + ldr r0, =0x02024280 movs r4, 0x80 lsls r4, 21 mov r12, r4 ldr r6, [r0] - ldr r0, _0804AEEC + ldr r0, =0x0202437c adds r4, r1, 0 adds r1, r0, 0 adds r1, 0x14 @@ -152419,18 +147085,7 @@ _0804AEAA: bgt _0804AEF8 b _0804AF12 .align 2, 0 -_0804AEC0: .4byte 0x020244ec -_0804AEC4: .4byte 0x02022fec -_0804AEC8: .4byte 0x0202449c -_0804AECC: .4byte 0x0832a328 -_0804AED0: .4byte 0x0202433a -_0804AED4: .4byte 0x02024744 -_0804AED8: .4byte 0x000002a1 -_0804AEDC: .4byte 0x02000002 -_0804AEE0: .4byte 0x0202406c -_0804AEE4: .4byte 0x02024214 -_0804AEE8: .4byte 0x02024280 -_0804AEEC: .4byte 0x0202437c + .pool _0804AEF0: cmp r2, 0 beq _0804AF12 @@ -152456,7 +147111,7 @@ _0804AF12: str r0, [r7] b _0804AF22 _0804AF1A: - ldr r1, _0804AF2C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -152467,58 +147122,53 @@ _0804AF22: pop {r0} bx r0 .align 2, 0 -_0804AF2C: .4byte 0x02024214 + .pool thumb_func_end sub_804ACD0 thumb_func_start sub_804AF30 sub_804AF30: @ 804AF30 - ldr r1, _0804AF58 + ldr r1, =0x0202427c movs r0, 0 strb r0, [r1] - ldr r0, _0804AF5C + ldr r0, =0x02024474 movs r2, 0 movs r1, 0x1 strb r1, [r0, 0xE] - ldr r0, _0804AF60 + ldr r0, =0x02024211 strb r1, [r0] - ldr r0, _0804AF64 + ldr r0, =0x02024332 strb r2, [r0, 0x3] strb r2, [r0, 0x6] - ldr r2, _0804AF68 + ldr r2, =0x02024280 ldr r0, [r2] subs r1, 0x42 ands r0, r1 - ldr r1, _0804AF6C + ldr r1, =0xffffbfff ands r0, r1 str r0, [r2] bx lr .align 2, 0 -_0804AF58: .4byte 0x0202427c -_0804AF5C: .4byte 0x02024474 -_0804AF60: .4byte 0x02024211 -_0804AF64: .4byte 0x02024332 -_0804AF68: .4byte 0x02024280 -_0804AF6C: .4byte 0xffffbfff + .pool thumb_func_end sub_804AF30 thumb_func_start atk25_cmd25 atk25_cmd25: @ 804AF70 push {lr} bl sub_804AF30 - ldr r1, _0804AF84 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0804AF84: .4byte 0x02024214 + .pool thumb_func_end atk25_cmd25 thumb_func_start atk26_80225F0_storebyteforjump atk26_80225F0_storebyteforjump: @ 804AF88 - ldr r3, _0804AF98 - ldr r2, _0804AF9C + ldr r3, =0x02024212 + ldr r2, =0x02024214 ldr r0, [r2] ldrb r1, [r0, 0x1] strb r1, [r3] @@ -152526,30 +147176,28 @@ atk26_80225F0_storebyteforjump: @ 804AF88 str r0, [r2] bx lr .align 2, 0 -_0804AF98: .4byte 0x02024212 -_0804AF9C: .4byte 0x02024214 + .pool thumb_func_end atk26_80225F0_storebyteforjump thumb_func_start atk27_cmd27 atk27_cmd27: @ 804AFA0 push {lr} - ldr r1, _0804AFBC + ldr r1, =0x02024212 ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] lsls r0, 24 cmp r0, 0 bne _0804AFC4 - ldr r1, _0804AFC0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0804AFDE .align 2, 0 -_0804AFBC: .4byte 0x02024212 -_0804AFC0: .4byte 0x02024214 + .pool _0804AFC4: - ldr r3, _0804AFE4 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -152566,12 +147214,12 @@ _0804AFDE: pop {r0} bx r0 .align 2, 0 -_0804AFE4: .4byte 0x02024214 + .pool thumb_func_end atk27_cmd27 thumb_func_start atk28_goto atk28_goto: @ 804AFE8 - ldr r3, _0804B004 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -152586,13 +147234,13 @@ atk28_goto: @ 804AFE8 str r1, [r3] bx lr .align 2, 0 -_0804B004: .4byte 0x02024214 + .pool thumb_func_end atk28_goto thumb_func_start atk29_jumpifbyte atk29_jumpifbyte: @ 804B008 push {r4-r6,lr} - ldr r3, _0804B04C + ldr r3, =0x02024214 ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -152621,13 +147269,12 @@ atk29_jumpifbyte: @ 804B008 cmp r6, 0x5 bhi _0804B0A0 lsls r0, r6, 2 - ldr r1, _0804B050 + ldr r1, =_0804B054 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804B04C: .4byte 0x02024214 -_0804B050: .4byte _0804B054 + .pool .align 2, 0 _0804B054: .4byte _0804B06C @@ -152678,7 +147325,7 @@ _0804B0A0: thumb_func_start sub_804B0A8 sub_804B0A8: @ 804B0A8 push {r4-r6,lr} - ldr r3, _0804B0F4 + ldr r3, =0x02024214 ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -152710,13 +147357,12 @@ sub_804B0A8: @ 804B0A8 cmp r6, 0x5 bhi _0804B148 lsls r0, r6, 2 - ldr r1, _0804B0F8 + ldr r1, =_0804B0FC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804B0F4: .4byte 0x02024214 -_0804B0F8: .4byte _0804B0FC + .pool .align 2, 0 _0804B0FC: .4byte _0804B114 @@ -152767,7 +147413,7 @@ _0804B148: thumb_func_start sub_804B150 sub_804B150: @ 804B150 push {r4-r6,lr} - ldr r3, _0804B1A8 + ldr r3, =0x02024214 ldr r1, [r3] ldrb r6, [r1, 0x1] ldrb r2, [r1, 0x2] @@ -152805,13 +147451,12 @@ sub_804B150: @ 804B150 cmp r6, 0x5 bhi _0804B1FC lsls r0, r6, 2 - ldr r1, _0804B1AC + ldr r1, =_0804B1B0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804B1A8: .4byte 0x02024214 -_0804B1AC: .4byte _0804B1B0 + .pool .align 2, 0 _0804B1B0: .4byte _0804B1C8 @@ -152862,7 +147507,7 @@ _0804B1FC: thumb_func_start sub_804B204 sub_804B204: @ 804B204 push {r4-r7,lr} - ldr r2, _0804B25C + ldr r2, =0x02024214 ldr r3, [r2] ldrb r1, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -152906,7 +147551,7 @@ sub_804B204: @ 804B204 adds r0, r3, 0 b _0804B278 .align 2, 0 -_0804B25C: .4byte 0x02024214 + .pool _0804B260: adds r5, 0x1 adds r4, 0x1 @@ -152938,7 +147583,7 @@ _0804B284: sub_804B28C: @ 804B28C push {r4-r7,lr} movs r7, 0 - ldr r3, _0804B300 + ldr r3, =0x02024214 ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -152997,7 +147642,7 @@ _0804B2F6: mov r0, r12 b _0804B308 .align 2, 0 -_0804B300: .4byte 0x02024214 + .pool _0804B304: ldr r0, [r3] adds r0, 0xE @@ -153010,7 +147655,7 @@ _0804B308: thumb_func_start sub_804B310 sub_804B310: @ 804B310 - ldr r3, _0804B334 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -153029,12 +147674,12 @@ sub_804B310: @ 804B310 str r0, [r3] bx lr .align 2, 0 -_0804B334: .4byte 0x02024214 + .pool thumb_func_end sub_804B310 thumb_func_start sub_804B338 sub_804B338: @ 804B338 - ldr r3, _0804B360 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -153055,12 +147700,12 @@ sub_804B338: @ 804B338 str r0, [r3] bx lr .align 2, 0 -_0804B360: .4byte 0x02024214 + .pool thumb_func_end sub_804B338 thumb_func_start sub_804B364 sub_804B364: @ 804B364 - ldr r3, _0804B38C + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -153081,13 +147726,13 @@ sub_804B364: @ 804B364 str r0, [r3] bx lr .align 2, 0 -_0804B38C: .4byte 0x02024214 + .pool thumb_func_end sub_804B364 thumb_func_start atk31_copyarray atk31_copyarray: @ 804B390 push {r4-r6,lr} - ldr r3, _0804B3E0 + ldr r3, =0x02024214 ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -153129,13 +147774,13 @@ _0804B3D4: pop {r0} bx r0 .align 2, 0 -_0804B3E0: .4byte 0x02024214 + .pool thumb_func_end atk31_copyarray thumb_func_start atk32_memcpy_with_offset atk32_memcpy_with_offset: @ 804B3E4 push {r4-r7,lr} - ldr r3, _0804B44C + ldr r3, =0x02024214 ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -153189,12 +147834,12 @@ _0804B440: pop {r0} bx r0 .align 2, 0 -_0804B44C: .4byte 0x02024214 + .pool thumb_func_end atk32_memcpy_with_offset thumb_func_start atk33_orbyte atk33_orbyte: @ 804B450 - ldr r3, _0804B478 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -153215,13 +147860,13 @@ atk33_orbyte: @ 804B450 str r0, [r3] bx lr .align 2, 0 -_0804B478: .4byte 0x02024214 + .pool thumb_func_end atk33_orbyte thumb_func_start atk34_orhalfword atk34_orhalfword: @ 804B47C push {r4,lr} - ldr r4, _0804B4B0 + ldr r4, =0x02024214 ldr r3, [r4] ldrb r2, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -153247,13 +147892,13 @@ atk34_orhalfword: @ 804B47C pop {r0} bx r0 .align 2, 0 -_0804B4B0: .4byte 0x02024214 + .pool thumb_func_end atk34_orhalfword thumb_func_start atk35_orword atk35_orword: @ 804B4B4 push {r4,lr} - ldr r4, _0804B4F4 + ldr r4, =0x02024214 ldr r2, [r4] ldrb r3, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -153285,12 +147930,12 @@ atk35_orword: @ 804B4B4 pop {r0} bx r0 .align 2, 0 -_0804B4F4: .4byte 0x02024214 + .pool thumb_func_end atk35_orword thumb_func_start atk36_bicbyte atk36_bicbyte: @ 804B4F8 - ldr r3, _0804B520 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -153311,13 +147956,13 @@ atk36_bicbyte: @ 804B4F8 str r0, [r3] bx lr .align 2, 0 -_0804B520: .4byte 0x02024214 + .pool thumb_func_end atk36_bicbyte thumb_func_start atk37_bichalfword atk37_bichalfword: @ 804B524 push {r4,lr} - ldr r4, _0804B558 + ldr r4, =0x02024214 ldr r3, [r4] ldrb r1, [r3, 0x1] ldrb r0, [r3, 0x2] @@ -153343,13 +147988,13 @@ atk37_bichalfword: @ 804B524 pop {r0} bx r0 .align 2, 0 -_0804B558: .4byte 0x02024214 + .pool thumb_func_end atk37_bichalfword thumb_func_start atk38_bicword atk38_bicword: @ 804B55C push {r4,lr} - ldr r4, _0804B59C + ldr r4, =0x02024214 ldr r2, [r4] ldrb r3, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -153381,23 +148026,23 @@ atk38_bicword: @ 804B55C pop {r0} bx r0 .align 2, 0 -_0804B59C: .4byte 0x02024214 + .pool thumb_func_end atk38_bicword thumb_func_start atk39_pause atk39_pause: @ 804B5A0 push {r4,r5,lr} - ldr r0, _0804B5D4 + ldr r0, =0x02024068 ldr r4, [r0] cmp r4, 0 bne _0804B5CC - ldr r5, _0804B5D8 + ldr r5, =0x02024214 ldr r2, [r5] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 orrs r1, r0 - ldr r3, _0804B5DC + ldr r3, =0x0202432c ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] @@ -153413,19 +148058,17 @@ _0804B5CC: pop {r0} bx r0 .align 2, 0 -_0804B5D4: .4byte 0x02024068 -_0804B5D8: .4byte 0x02024214 -_0804B5DC: .4byte 0x0202432c + .pool thumb_func_end atk39_pause thumb_func_start sub_804B5E0 sub_804B5E0: @ 804B5E0 push {lr} - ldr r0, _0804B5F8 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0804B5F2 - ldr r1, _0804B5FC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -153433,49 +148076,43 @@ _0804B5F2: pop {r0} bx r0 .align 2, 0 -_0804B5F8: .4byte 0x02024068 -_0804B5FC: .4byte 0x02024214 + .pool thumb_func_end sub_804B5E0 thumb_func_start atk3B_8022C68 atk3B_8022C68: @ 804B600 push {lr} - ldr r0, _0804B614 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 bne _0804B620 - ldr r0, _0804B618 - ldr r1, _0804B61C + ldr r0, =0x02024064 + ldr r1, =0x0202420c b _0804B624 .align 2, 0 -_0804B614: .4byte 0x02024214 -_0804B618: .4byte 0x02024064 -_0804B61C: .4byte 0x0202420c + .pool _0804B620: - ldr r0, _0804B648 - ldr r1, _0804B64C + ldr r0, =0x02024064 + ldr r1, =0x0202420b _0804B624: ldrb r1, [r1] strb r1, [r0] - ldr r0, _0804B650 + ldr r0, =0x020241f0 ldrh r1, [r0] movs r0, 0 bl dp01_build_cmdbuf_x18_0_aa_health_bar_update - ldr r0, _0804B648 + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0804B654 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0804B648: .4byte 0x02024064 -_0804B64C: .4byte 0x0202420b -_0804B650: .4byte 0x020241f0 -_0804B654: .4byte 0x02024214 + .pool thumb_func_end atk3B_8022C68 thumb_func_start atk3C_return @@ -153489,54 +148126,49 @@ atk3C_return: @ 804B658 thumb_func_start sub_804B664 sub_804B664: @ 804B664 push {lr} - ldr r0, _0804B690 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 beq _0804B67C - ldr r0, _0804B694 + ldr r0, =0x0202420b ldrb r0, [r0] bl sub_81A5718 _0804B67C: - ldr r0, _0804B698 + ldr r0, =0x0202427c movs r1, 0 strb r1, [r0] - ldr r0, _0804B69C + ldr r0, =0x02024064 strb r1, [r0] - ldr r1, _0804B6A0 + ldr r1, =0x02024083 movs r0, 0xB strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_0804B690: .4byte 0x02022fec -_0804B694: .4byte 0x0202420b -_0804B698: .4byte 0x0202427c -_0804B69C: .4byte 0x02024064 -_0804B6A0: .4byte 0x02024083 + .pool thumb_func_end sub_804B664 thumb_func_start atk3E_end2 atk3E_end2: @ 804B6A4 - ldr r1, _0804B6B4 + ldr r1, =0x02024064 movs r0, 0 strb r0, [r1] - ldr r1, _0804B6B8 + ldr r1, =0x02024083 movs r0, 0xB strb r0, [r1] bx lr .align 2, 0 -_0804B6B4: .4byte 0x02024064 -_0804B6B8: .4byte 0x02024083 + .pool thumb_func_end atk3E_end2 thumb_func_start atk3F_end3 atk3F_end3: @ 804B6BC push {lr} bl b_movescr_stack_pop_cursor - ldr r3, _0804B6F0 + ldr r3, =0x020244a8 ldr r0, [r3] ldr r0, [r0, 0xC] adds r1, r0, 0 @@ -153547,7 +148179,7 @@ atk3F_end3: @ 804B6BC subs r0, 0x1 strb r0, [r1] _0804B6D6: - ldr r2, _0804B6F4 + ldr r2, =0x03005d04 ldr r0, [r3] ldr r1, [r0, 0xC] adds r0, r1, 0 @@ -153560,14 +148192,13 @@ _0804B6D6: pop {r0} bx r0 .align 2, 0 -_0804B6F0: .4byte 0x020244a8 -_0804B6F4: .4byte 0x03005d04 + .pool thumb_func_end atk3F_end3 thumb_func_start atk41_call atk41_call: @ 804B6F8 push {r4,lr} - ldr r4, _0804B724 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x5 bl b_movescr_stack_push @@ -153587,20 +148218,20 @@ atk41_call: @ 804B6F8 pop {r0} bx r0 .align 2, 0 -_0804B724: .4byte 0x02024214 + .pool thumb_func_end atk41_call thumb_func_start atk42_jumpiftype2 atk42_jumpiftype2: @ 804B728 push {r4,lr} - ldr r4, _0804B770 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something lsls r0, 24 lsrs r0, 24 ldr r3, [r4] - ldr r2, _0804B774 + ldr r2, =0x02024084 movs r1, 0x58 muls r0, r1 adds r0, r2 @@ -153628,8 +148259,7 @@ _0804B756: str r1, [r4] b _0804B77C .align 2, 0 -_0804B770: .4byte 0x02024214 -_0804B774: .4byte 0x02024084 + .pool _0804B778: adds r0, r3, 0x7 str r0, [r4] @@ -153643,7 +148273,7 @@ _0804B77C: sub_804B784: @ 804B784 push {r4,lr} sub sp, 0x4 - ldr r4, _0804B7BC + ldr r4, =0x02024214 ldr r0, [r4] ldrb r2, [r0, 0x1] movs r0, 0 @@ -153669,7 +148299,7 @@ sub_804B784: @ 804B784 str r1, [r4] b _0804B7C6 .align 2, 0 -_0804B7BC: .4byte 0x02024214 + .pool _0804B7C0: ldr r0, [r4] adds r0, 0x6 @@ -153683,9 +148313,9 @@ _0804B7C6: thumb_func_start sub_804B7D0 sub_804B7D0: @ 804B7D0 - ldr r0, _0804B7E4 + ldr r0, =0x0202420b ldrb r0, [r0] - ldr r1, _0804B7E8 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 adds r0, 0x54 @@ -153693,18 +148323,17 @@ sub_804B7D0: @ 804B7D0 strb r1, [r0] bx lr .align 2, 0 -_0804B7E4: .4byte 0x0202420b -_0804B7E8: .4byte 0x0202449c + .pool thumb_func_end sub_804B7D0 thumb_func_start atk46_cmd46 atk46_cmd46: @ 804B7EC push {r4-r6,lr} - ldr r5, _0804B840 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r6, _0804B844 + ldr r6, =0x02024064 strb r0, [r6] ldr r2, [r5] ldrb r1, [r2, 0x3] @@ -153726,13 +148355,13 @@ atk46_cmd46: @ 804B7EC cmp r0, 0x2 bne _0804B848 _0804B822: - ldr r4, _0804B840 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r1, [r0, 0x2] ldrh r2, [r3] movs r0, 0 bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim - ldr r0, _0804B844 + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution ldr r0, [r4] @@ -153740,10 +148369,9 @@ _0804B822: str r0, [r4] b _0804B8AA .align 2, 0 -_0804B840: .4byte 0x02024214 -_0804B844: .4byte 0x02024064 + .pool _0804B848: - ldr r0, _0804B860 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -153751,11 +148379,10 @@ _0804B848: beq _0804B868 adds r0, r2, 0x7 bl b_movescr_stack_push - ldr r0, _0804B864 + ldr r0, =0x082dabb9 b _0804B8A8 .align 2, 0 -_0804B860: .4byte 0x02024280 -_0804B864: .4byte 0x082dabb9 + .pool _0804B868: adds r0, r4, 0 subs r0, 0xA @@ -153763,20 +148390,19 @@ _0804B868: lsrs r0, 24 cmp r0, 0x3 bls _0804B894 - ldr r1, _0804B88C + ldr r1, =0x020242ac ldrb r0, [r6] lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _0804B890 + ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 beq _0804B894 adds r0, r2, 0x7 b _0804B8A8 .align 2, 0 -_0804B88C: .4byte 0x020242ac -_0804B890: .4byte 0x000400c0 + .pool _0804B894: ldrb r1, [r2, 0x2] ldrh r2, [r3] @@ -153797,11 +148423,11 @@ _0804B8AA: thumb_func_start sub_804B8B0 sub_804B8B0: @ 804B8B0 push {r4-r7,lr} - ldr r6, _0804B918 + ldr r6, =0x02024214 ldr r0, [r6] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r7, _0804B91C + ldr r7, =0x02024064 strb r0, [r7] ldr r2, [r6] ldrb r1, [r2, 0x2] @@ -153837,19 +148463,18 @@ _0804B8FA: ldrh r2, [r4] movs r0, 0 bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim - ldr r0, _0804B91C + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0804B918 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0xA str r0, [r1] b _0804B976 .align 2, 0 -_0804B918: .4byte 0x02024214 -_0804B91C: .4byte 0x02024064 + .pool _0804B920: - ldr r0, _0804B930 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -153858,7 +148483,7 @@ _0804B920: adds r0, r2, 0 b _0804B972 .align 2, 0 -_0804B930: .4byte 0x02024280 + .pool _0804B934: adds r0, r5, 0 subs r0, 0xA @@ -153866,20 +148491,19 @@ _0804B934: lsrs r0, 24 cmp r0, 0x3 bls _0804B960 - ldr r1, _0804B958 + ldr r1, =0x020242ac ldrb r0, [r7] lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _0804B95C + ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 beq _0804B960 adds r0, r2, 0 b _0804B972 .align 2, 0 -_0804B958: .4byte 0x020242ac -_0804B95C: .4byte 0x000400c0 + .pool _0804B960: ldrb r1, [r3] ldrh r2, [r4] @@ -153901,7 +148525,7 @@ _0804B976: sub_804B97C: @ 804B97C push {r4,lr} movs r3, 0 - ldr r1, _0804B998 + ldr r1, =0x02024474 ldrb r0, [r1, 0x1A] movs r2, 0xF0 ands r2, r0 @@ -153914,7 +148538,7 @@ sub_804B97C: @ 804B97C beq _0804B9A6 b _0804B9B4 .align 2, 0 -_0804B998: .4byte 0x02024474 + .pool _0804B99C: cmp r2, 0x90 beq _0804B9AE @@ -153941,7 +148565,7 @@ _0804B9B4: movs r1, 0 strb r0, [r4, 0x10] strb r1, [r4, 0x11] - ldr r1, _0804B9D4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -153949,7 +148573,7 @@ _0804B9B4: pop {r0} bx r0 .align 2, 0 -_0804B9D4: .4byte 0x02024214 + .pool thumb_func_end sub_804B97C thumb_func_start atk48_playstatchangeanimation @@ -153964,12 +148588,12 @@ atk48_playstatchangeanimation: @ 804B9D8 movs r0, 0 mov r8, r0 movs r3, 0 - ldr r5, _0804BA4C + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] str r3, [sp] bl get_battle_side_of_something - ldr r2, _0804BA50 + ldr r2, =0x02024064 strb r0, [r2] ldr r0, [r5] ldrb r4, [r0, 0x2] @@ -153990,7 +148614,7 @@ _0804BA18: beq _0804BAC0 movs r0, 0x1 mov r10, r0 - ldr r0, _0804BA54 + ldr r0, =0x0202409c mov r9, r0 lsls r5, r1, 16 _0804BA26: @@ -153999,25 +148623,23 @@ _0804BA26: ands r0, r1 cmp r0, 0 beq _0804BAB2 - ldr r0, _0804BA4C + ldr r0, =0x02024214 ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x8 ands r0, r1 cmp r0, 0 beq _0804BA58 - ldr r0, _0804BA50 + ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 muls r0, r1 adds r0, r7, r0 b _0804BAA0 .align 2, 0 -_0804BA4C: .4byte 0x02024214 -_0804BA50: .4byte 0x02024064 -_0804BA54: .4byte 0x0202409c + .pool _0804BA58: - ldr r6, _0804BADC + ldr r6, =0x02024064 ldrb r0, [r6] str r3, [sp] bl battle_get_per_side_status @@ -154026,13 +148648,13 @@ _0804BA58: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _0804BAE0 + ldr r1, =0x02024294 adds r0, r1 ldrb r0, [r0, 0x4] ldr r3, [sp] cmp r0, 0 bne _0804BAB2 - ldr r0, _0804BAE4 + ldr r0, =0x02024084 ldrb r2, [r6] movs r1, 0x58 muls r2, r1 @@ -154073,7 +148695,7 @@ _0804BAB2: cmp r4, 0 bne _0804BA26 _0804BAC0: - ldr r0, _0804BAE8 + ldr r0, =0x02024214 mov r9, r0 cmp r3, 0x1 ble _0804BB4E @@ -154088,10 +148710,7 @@ _0804BAC0: movs r0, 0x3A b _0804BB4C .align 2, 0 -_0804BADC: .4byte 0x02024064 -_0804BAE0: .4byte 0x02024294 -_0804BAE4: .4byte 0x02024084 -_0804BAE8: .4byte 0x02024214 + .pool _0804BAEC: movs r0, 0x2 ands r0, r1 @@ -154103,7 +148722,7 @@ _0804BAF8: mov r9, r5 cmp r4, 0 beq _0804BB34 - ldr r6, _0804BB68 + ldr r6, =0x0202409c adds r5, r2, 0 lsls r2, r1, 16 _0804BB04: @@ -154161,11 +148780,11 @@ _0804BB4E: mov r1, r9 b _0804BBBA .align 2, 0 -_0804BB68: .4byte 0x0202409c + .pool _0804BB6C: cmp r3, 0 beq _0804BBB4 - ldr r4, _0804BBA8 + ldr r4, =0x02024474 ldrb r0, [r4, 0x1B] cmp r0, 0 bne _0804BBB4 @@ -154174,10 +148793,10 @@ _0804BB6C: mov r2, r8 str r3, [sp] bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim - ldr r0, _0804BBAC + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r0, _0804BBB0 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x4 @@ -154190,12 +148809,10 @@ _0804BB6C: movs r0, 0x1 strb r0, [r4, 0x1B] _0804BBA4: - ldr r1, _0804BBB0 + ldr r1, =0x02024214 b _0804BBB6 .align 2, 0 -_0804BBA8: .4byte 0x02024474 -_0804BBAC: .4byte 0x02024064 -_0804BBB0: .4byte 0x02024214 + .pool _0804BBB4: mov r1, r9 _0804BBB6: @@ -154223,9 +148840,9 @@ sub_804BBCC: @ 804BBCC sub sp, 0x1C movs r0, 0 mov r10, r0 - ldr r2, _0804BC1C + ldr r2, =0x020241ec ldrh r1, [r2] - ldr r0, _0804BC20 + ldr r0, =0x0000ffff movs r3, 0 str r3, [sp, 0x18] cmp r1, r0 @@ -154233,14 +148850,14 @@ sub_804BBCC: @ 804BBCC ldrh r2, [r2] str r2, [sp, 0x18] _0804BBEE: - ldr r0, _0804BC24 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r4, [r0, 0x1] str r4, [sp, 0x10] ldrb r0, [r0, 0x2] str r0, [sp, 0x14] - ldr r1, _0804BC28 - ldr r0, _0804BC2C + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -154248,7 +148865,7 @@ _0804BBEE: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0804BC34 - ldr r1, _0804BC30 + ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -154256,12 +148873,7 @@ _0804BBEE: ldrb r0, [r0, 0x7] b _0804BC3E .align 2, 0 -_0804BC1C: .4byte 0x020241ec -_0804BC20: .4byte 0x0000ffff -_0804BC24: .4byte 0x02024214 -_0804BC28: .4byte 0x02024084 -_0804BC2C: .4byte 0x0202420b -_0804BC30: .4byte 0x02024404 + .pool _0804BC34: ldrh r0, [r1, 0x2E] bl itemid_get_x12 @@ -154269,8 +148881,8 @@ _0804BC34: lsrs r0, 24 _0804BC3E: str r0, [sp, 0x8] - ldr r1, _0804BC60 - ldr r0, _0804BC64 + ldr r1, =0x0202449c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, 0xC8 @@ -154285,10 +148897,9 @@ _0804BC3E: str r5, [sp, 0x4] b _0804BD02 .align 2, 0 -_0804BC60: .4byte 0x0202449c -_0804BC64: .4byte 0x0202420b + .pool _0804BC68: - ldr r4, _0804BC7C + ldr r4, =0x02024064 strb r2, [r4] movs r0, 0 movs r1, 0x1 @@ -154297,9 +148908,9 @@ _0804BC68: bl dp01_battle_side_mark_buffer_for_execution b _0804C15A .align 2, 0 -_0804BC7C: .4byte 0x02024064 + .pool _0804BC80: - ldr r4, _0804BCA4 + ldr r4, =0x02024064 strb r2, [r4] movs r0, 0 movs r1, 0 @@ -154310,22 +148921,21 @@ _0804BC80: lsls r1, 2 adds r1, r5 ldr r0, [r1] - ldr r2, _0804BCA8 + ldr r2, =0xfffbff3f ands r0, r2 str r0, [r1] b _0804C15A .align 2, 0 -_0804BCA4: .4byte 0x02024064 -_0804BCA8: .4byte 0xfffbff3f + .pool _0804BCAC: strb r2, [r7] ldr r0, [r5] orrs r0, r6 str r0, [r5] - ldr r0, _0804BCE0 + ldr r0, =0x02024474 strb r4, [r0, 0x14] bl sub_804AF30 - ldr r2, _0804BCE4 + ldr r2, =0x082d86a8 mov r0, r8 ldrh r1, [r0] lsls r0, r1, 1 @@ -154337,17 +148947,14 @@ _0804BCAC: adds r0, r2 ldr r0, [r0] bl b_movescr_stack_push - ldr r1, _0804BCE8 - ldr r0, _0804BCEC + ldr r1, =0x02024214 + ldr r0, =0x082db87d bl _0804C5B8 .align 2, 0 -_0804BCE0: .4byte 0x02024474 -_0804BCE4: .4byte 0x082d86a8 -_0804BCE8: .4byte 0x02024214 -_0804BCEC: .4byte 0x082db87d + .pool _0804BCF0: - ldr r2, _0804BD08 - ldr r0, _0804BD0C + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -154356,13 +148963,11 @@ _0804BCF0: ldrb r0, [r0, 0x2] str r0, [sp, 0x4] _0804BD02: - ldr r1, _0804BD10 + ldr r1, =0x02024474 mov r12, r1 b _0804BD1E .align 2, 0 -_0804BD08: .4byte 0x0831c898 -_0804BD0C: .4byte 0x020241ea -_0804BD10: .4byte 0x02024474 + .pool _0804BD14: mov r2, r10 cmp r2, 0 @@ -154376,12 +148981,12 @@ _0804BD1E: bl _0804C570 _0804BD2A: lsls r0, 2 - ldr r1, _0804BD34 + ldr r1, =_0804BD38 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804BD34: .4byte _0804BD38 + .pool .align 2, 0 _0804BD38: .4byte _0804BD80 @@ -154403,8 +149008,8 @@ _0804BD38: .4byte _0804C4E4 .4byte _0804C570 _0804BD80: - ldr r6, _0804BE38 - ldr r5, _0804BE3C + ldr r6, =0x02024084 + ldr r5, =0x0202420c ldrb r3, [r5] movs r7, 0x58 adds r2, r3, 0 @@ -154426,7 +149031,7 @@ _0804BDA0: bne _0804BDAA b _0804C184 _0804BDAA: - ldr r0, _0804BE40 + ldr r0, =0x0202420b ldrb r1, [r0] cmp r1, r3 bne _0804BDB4 @@ -154443,7 +149048,7 @@ _0804BDB4: bne _0804BDCC b _0804C184 _0804BDCC: - ldr r0, _0804BE44 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -154451,7 +149056,7 @@ _0804BDCC: beq _0804BDDA b _0804C184 _0804BDDA: - ldr r2, _0804BE48 + ldr r2, =0x0202437c ldrb r3, [r5] lsls r0, r3, 2 adds r0, r3 @@ -154470,8 +149075,8 @@ _0804BDDA: bne _0804BDFE b _0804C184 _0804BDFE: - ldr r2, _0804BE4C - ldr r0, _0804BE50 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -154495,23 +149100,15 @@ _0804BE26: adds r0, r2, 0x1 strb r0, [r1, 0x19] bl b_movescr_stack_push_cursor - ldr r1, _0804BE54 - ldr r0, _0804BE58 + ldr r1, =0x02024214 + ldr r0, =0x082dae0d str r0, [r1] b _0804C0B8 .align 2, 0 -_0804BE38: .4byte 0x02024084 -_0804BE3C: .4byte 0x0202420c -_0804BE40: .4byte 0x0202420b -_0804BE44: .4byte 0x0202427c -_0804BE48: .4byte 0x0202437c -_0804BE4C: .4byte 0x0831c898 -_0804BE50: .4byte 0x020241ea -_0804BE54: .4byte 0x02024214 -_0804BE58: .4byte 0x082dae0d + .pool _0804BE5C: - ldr r4, _0804BEF8 - ldr r6, _0804BEFC + ldr r4, =0x02024084 + ldr r6, =0x0202420c ldrb r2, [r6] movs r5, 0x58 mov r12, r5 @@ -154533,13 +149130,13 @@ _0804BE7C: bne _0804BE86 b _0804C184 _0804BE86: - ldr r0, _0804BF00 + ldr r0, =0x0202420b ldrb r0, [r0] cmp r0, r2 bne _0804BE90 b _0804C184 _0804BE90: - ldr r0, _0804BF04 + ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -154550,7 +149147,7 @@ _0804BE90: bne _0804BEA4 b _0804C184 _0804BEA4: - ldr r0, _0804BF08 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -154567,7 +149164,7 @@ _0804BEBA: negs r0, r0 ands r3, r0 str r3, [r5] - ldr r4, _0804BF0C + ldr r4, =0x02024064 ldrb r0, [r6] strb r0, [r4] ldrb r0, [r6] @@ -154584,23 +149181,16 @@ _0804BEBA: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution bl b_movescr_stack_push_cursor - ldr r1, _0804BF10 - ldr r0, _0804BF14 + ldr r1, =0x02024214 + ldr r0, =0x082db282 str r0, [r1] movs r2, 0x1 mov r10, r2 b _0804C184 .align 2, 0 -_0804BEF8: .4byte 0x02024084 -_0804BEFC: .4byte 0x0202420c -_0804BF00: .4byte 0x0202420b -_0804BF04: .4byte 0x0202437c -_0804BF08: .4byte 0x0202427c -_0804BF0C: .4byte 0x02024064 -_0804BF10: .4byte 0x02024214 -_0804BF14: .4byte 0x082db282 + .pool _0804BF18: - ldr r0, _0804BF38 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0 str r0, [sp] @@ -154617,9 +149207,9 @@ _0804BF32: mov r10, r3 b _0804C184 .align 2, 0 -_0804BF38: .4byte 0x0202420c + .pool _0804BF3C: - ldr r0, _0804BF50 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0 str r0, [sp] @@ -154629,7 +149219,7 @@ _0804BF3C: bl ability_something b _0804C0B2 .align 2, 0 -_0804BF50: .4byte 0x0202420c + .pool _0804BF54: movs r0, 0 str r0, [sp] @@ -154645,13 +149235,13 @@ _0804BF54: _0804BF6C: movs r5, 0x1 mov r10, r5 - ldr r0, _0804BF78 + ldr r0, =0x02024474 mov r12, r0 b _0804C570 .align 2, 0 -_0804BF78: .4byte 0x02024474 + .pool _0804BF7C: - ldr r0, _0804BF9C + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0 str r0, [sp] @@ -154668,9 +149258,9 @@ _0804BF96: mov r10, r1 b _0804C184 .align 2, 0 -_0804BF9C: .4byte 0x0202420b + .pool _0804BFA0: - ldr r0, _0804C030 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 18 @@ -154680,7 +149270,7 @@ _0804BFA0: ldr r2, [sp, 0x8] cmp r2, 0x1D bne _0804BFE4 - ldr r0, _0804C034 + ldr r0, =0x020241ec ldrh r2, [r0] adds r3, r0, 0 cmp r2, 0xA5 @@ -154689,13 +149279,13 @@ _0804BFA0: ldrh r1, [r4] cmp r1, 0 beq _0804BFCC - ldr r0, _0804C038 + ldr r0, =0x0000ffff cmp r1, r0 bne _0804BFE4 _0804BFCC: cmp r2, 0xE2 bne _0804BFDE - ldr r0, _0804C03C + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x20 ands r0, r1 @@ -154708,8 +149298,8 @@ _0804BFDE: strh r0, [r1] _0804BFE4: movs r4, 0 - ldr r2, _0804C040 - ldr r3, _0804C044 + ldr r2, =0x02024084 + ldr r3, =0x0202420b ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -154749,25 +149339,20 @@ _0804C026: strb r0, [r2, 0x14] b _0804C570 .align 2, 0 -_0804C030: .4byte 0x02024280 -_0804C034: .4byte 0x020241ec -_0804C038: .4byte 0x0000ffff -_0804C03C: .4byte 0x0202427c -_0804C040: .4byte 0x02024084 -_0804C044: .4byte 0x0202420b + .pool _0804C048: movs r4, 0 - ldr r0, _0804C07C + ldr r0, =0x0202406c ldrb r3, [r0] cmp r4, r3 blt _0804C054 b _0804C202 _0804C054: - ldr r7, _0804C080 + ldr r7, =0x0202449c movs r6, 0 movs r3, 0xD0 adds r5, r0, 0 - ldr r2, _0804C084 + ldr r2, =0x02024084 _0804C05E: ldr r0, [r7] adds r0, r3 @@ -154785,9 +149370,7 @@ _0804C06C: blt _0804C05E b _0804C202 .align 2, 0 -_0804C07C: .4byte 0x0202406c -_0804C080: .4byte 0x0202449c -_0804C084: .4byte 0x02024084 + .pool _0804C088: movs r0, 0x3 movs r1, 0 @@ -154798,11 +149381,11 @@ _0804C088: beq _0804C184 movs r2, 0x1 mov r10, r2 - ldr r3, _0804C0A4 + ldr r3, =0x02024474 mov r12, r3 b _0804C570 .align 2, 0 -_0804C0A4: .4byte 0x02024474 + .pool _0804C0A8: movs r0, 0x4 movs r1, 0 @@ -154817,19 +149400,19 @@ _0804C0B8: mov r10, r4 b _0804C184 _0804C0BE: - ldr r1, _0804C0E4 - ldr r0, _0804C0E8 + ldr r1, =0x020242ac + ldr r0, =0x0202420b ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _0804C0EC + ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 bne _0804C0D4 b _0804C4B6 _0804C0D4: - ldr r0, _0804C0F0 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -154839,24 +149422,21 @@ _0804C0D4: _0804C0E2: b _0804C4B6 .align 2, 0 -_0804C0E4: .4byte 0x020242ac -_0804C0E8: .4byte 0x0202420b -_0804C0EC: .4byte 0x000400c0 -_0804C0F0: .4byte 0x02024280 + .pool _0804C0F4: - ldr r0, _0804C164 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 bne _0804C120 - ldr r1, _0804C168 - ldr r0, _0804C16C + ldr r1, =0x020242ac + ldr r0, =0x0202420b ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _0804C170 + ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 beq _0804C120 @@ -154866,8 +149446,8 @@ _0804C0F4: cmp r0, 0 beq _0804C184 _0804C120: - ldr r4, _0804C174 - ldr r5, _0804C16C + ldr r4, =0x02024064 + ldr r5, =0x0202420b ldrb r0, [r5] strb r0, [r4] movs r0, 0 @@ -154875,15 +149455,15 @@ _0804C120: bl dp01_build_cmdbuf_x33_a_33_33 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r0, _0804C168 + ldr r0, =0x020242ac ldrb r2, [r5] lsls r2, 2 adds r2, r0 ldr r0, [r2] - ldr r1, _0804C178 + ldr r1, =0xfffbff3f ands r0, r1 str r0, [r2] - ldr r2, _0804C17C + ldr r2, =0x0202437c ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -154894,32 +149474,25 @@ _0804C120: orrs r1, r2 strb r1, [r0] _0804C15A: - ldr r1, _0804C180 + ldr r1, =0x02024474 ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] b _0804C5BA .align 2, 0 -_0804C164: .4byte 0x0202427c -_0804C168: .4byte 0x020242ac -_0804C16C: .4byte 0x0202420b -_0804C170: .4byte 0x000400c0 -_0804C174: .4byte 0x02024064 -_0804C178: .4byte 0xfffbff3f -_0804C17C: .4byte 0x0202437c -_0804C180: .4byte 0x02024474 + .pool _0804C184: - ldr r1, _0804C190 + ldr r1, =0x02024474 ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] mov r12, r1 b _0804C570 .align 2, 0 -_0804C190: .4byte 0x02024474 + .pool _0804C194: - ldr r0, _0804C1C4 - ldr r6, _0804C1C8 + ldr r0, =0x0202437c + ldr r6, =0x0202420c ldrb r2, [r6] lsls r3, r2, 2 adds r1, r3, r2 @@ -154929,14 +149502,14 @@ _0804C194: lsls r0, 29 cmp r0, 0 blt _0804C202 - ldr r0, _0804C1CC + ldr r0, =0x0202406c ldrb r0, [r0] cmp r2, r0 bcs _0804C202 - ldr r5, _0804C1D0 + ldr r5, =0x020242ac adds r0, r3, r5 ldr r0, [r0] - ldr r1, _0804C1D4 + ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 bne _0804C1C2 @@ -154944,21 +149517,17 @@ _0804C194: _0804C1C2: b _0804C202 .align 2, 0 -_0804C1C4: .4byte 0x0202437c -_0804C1C8: .4byte 0x0202420c -_0804C1CC: .4byte 0x0202406c -_0804C1D0: .4byte 0x020242ac -_0804C1D4: .4byte 0x000400c0 + .pool _0804C1D8: movs r4, 0 - ldr r0, _0804C20C + ldr r0, =0x0202406c ldrb r2, [r0] cmp r4, r2 bge _0804C202 - ldr r2, _0804C210 - ldr r5, _0804C214 + ldr r2, =0x020242bc + ldr r5, =0xfeffffff adds r3, r0, 0 - ldr r1, _0804C218 + ldr r1, =0x020240d4 _0804C1EA: ldrb r0, [r2, 0xA] cmp r0, 0 @@ -154980,30 +149549,27 @@ _0804C202: strb r0, [r1, 0x14] b _0804C570 .align 2, 0 -_0804C20C: .4byte 0x0202406c -_0804C210: .4byte 0x020242bc -_0804C214: .4byte 0xfeffffff -_0804C218: .4byte 0x020240d4 + .pool _0804C21C: - ldr r1, _0804C2D0 + ldr r1, =0x02024280 ldr r3, [r1] movs r0, 0x80 lsls r0, 5 ands r0, r3 - ldr r2, _0804C2D4 + ldr r2, =0x0202420b mov r9, r2 adds r5, r1, 0 cmp r0, 0 beq _0804C246 - ldr r0, _0804C2D8 + ldr r0, =0x02024064 ldrb r2, [r2] strb r2, [r0] - ldr r1, _0804C2DC + ldr r1, =0x0202420c ldrb r0, [r1] mov r4, r9 strb r0, [r4] strb r2, [r1] - ldr r0, _0804C2E0 + ldr r0, =0xffffefff ands r3, r0 str r3, [r5] _0804C246: @@ -155013,18 +149579,18 @@ _0804C246: ands r0, r1 cmp r0, 0 beq _0804C262 - ldr r0, _0804C2E4 + ldr r0, =0x02024240 mov r2, r9 ldrb r1, [r2] lsls r1, 1 adds r1, r0 - ldr r0, _0804C2E8 + ldr r0, =0x020241ec ldrh r0, [r0] strh r0, [r1] _0804C262: - ldr r0, _0804C2EC + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _0804C2F0 + ldr r2, =0x0832a328 mov r3, r9 ldrb r4, [r3] lsls r0, r4, 2 @@ -155036,7 +149602,7 @@ _0804C262: beq _0804C27C b _0804C3E8 _0804C27C: - ldr r0, _0804C2F4 + ldr r0, =0x0202449c ldr r1, [r0] adds r1, 0x91 ldrb r1, [r1] @@ -155046,7 +149612,7 @@ _0804C27C: beq _0804C28E b _0804C3E8 _0804C28E: - ldr r0, _0804C2F8 + ldr r0, =0x0831c898 ldr r2, [sp, 0x18] lsls r1, r2, 1 adds r1, r2 @@ -155064,43 +149630,30 @@ _0804C2A4: ands r0, r1 cmp r0, 0 beq _0804C308 - ldr r0, _0804C2FC + ldr r0, =0x02024248 lsls r1, r4, 1 adds r1, r0 - ldr r0, _0804C2E8 + ldr r0, =0x020241ec ldrh r0, [r0] strh r0, [r1] - ldr r0, _0804C300 + ldr r0, =0x02024260 mov r3, r9 ldrb r1, [r3] lsls r1, 1 adds r1, r0 - ldr r0, _0804C304 + ldr r0, =0x020241ea ldrh r0, [r0] strh r0, [r1] b _0804C322 .align 2, 0 -_0804C2D0: .4byte 0x02024280 -_0804C2D4: .4byte 0x0202420b -_0804C2D8: .4byte 0x02024064 -_0804C2DC: .4byte 0x0202420c -_0804C2E0: .4byte 0xffffefff -_0804C2E4: .4byte 0x02024240 -_0804C2E8: .4byte 0x020241ec -_0804C2EC: .4byte 0x02024210 -_0804C2F0: .4byte 0x0832a328 -_0804C2F4: .4byte 0x0202449c -_0804C2F8: .4byte 0x0831c898 -_0804C2FC: .4byte 0x02024248 -_0804C300: .4byte 0x02024260 -_0804C304: .4byte 0x020241ea + .pool _0804C308: - ldr r1, _0804C370 + ldr r1, =0x02024248 lsls r0, r4, 1 adds r0, r1 - ldr r1, _0804C374 + ldr r1, =0x0000ffff strh r1, [r0] - ldr r1, _0804C378 + ldr r1, =0x02024260 mov r4, r9 ldrb r0, [r4] lsls r0, 1 @@ -155109,7 +149662,7 @@ _0804C308: negs r1, r1 strh r1, [r0] _0804C322: - ldr r2, _0804C37C + ldr r2, =0x0202420c ldrb r3, [r2] lsls r0, r3, 2 adds r0, r6 @@ -155119,7 +149672,7 @@ _0804C322: ands r1, r0 cmp r1, 0 bne _0804C340 - ldr r0, _0804C380 + ldr r0, =0x02024270 adds r0, r3, r0 mov r3, r9 ldrb r1, [r3] @@ -155131,45 +149684,38 @@ _0804C340: ands r0, r1 cmp r0, 0 beq _0804C3DC - ldr r0, _0804C384 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 bne _0804C3DC - ldr r0, _0804C388 + ldr r0, =0x020241ec ldrh r3, [r0] - ldr r0, _0804C374 + ldr r0, =0x0000ffff cmp r3, r0 bne _0804C390 - ldr r1, _0804C38C + ldr r1, =0x02024250 ldrb r0, [r2] lsls r0, 1 adds r0, r1 strh r3, [r0] b _0804C3E8 .align 2, 0 -_0804C370: .4byte 0x02024248 -_0804C374: .4byte 0x0000ffff -_0804C378: .4byte 0x02024260 -_0804C37C: .4byte 0x0202420c -_0804C380: .4byte 0x02024270 -_0804C384: .4byte 0x0202427c -_0804C388: .4byte 0x020241ec -_0804C38C: .4byte 0x02024250 + .pool _0804C390: - ldr r0, _0804C3B4 + ldr r0, =0x02024250 ldrb r1, [r2] lsls r1, 1 adds r1, r0 - ldr r4, _0804C3B8 + ldr r4, =0x020241ea ldrh r0, [r4] strh r0, [r1] ldr r0, [r7] ldrb r3, [r0, 0x13] cmp r3, 0 beq _0804C3C0 - ldr r0, _0804C3BC + ldr r0, =0x02024258 ldrb r1, [r2] lsls r1, 1 adds r1, r0 @@ -155177,11 +149723,9 @@ _0804C390: ands r0, r3 b _0804C3E6 .align 2, 0 -_0804C3B4: .4byte 0x02024250 -_0804C3B8: .4byte 0x020241ea -_0804C3BC: .4byte 0x02024258 + .pool _0804C3C0: - ldr r0, _0804C3D8 + ldr r0, =0x02024258 ldrb r2, [r2] lsls r2, 1 adds r2, r0 @@ -155194,13 +149738,13 @@ _0804C3C0: strh r0, [r2] b _0804C3E8 .align 2, 0 -_0804C3D8: .4byte 0x02024258 + .pool _0804C3DC: - ldr r0, _0804C3F4 + ldr r0, =0x02024250 ldrb r1, [r2] lsls r1, 1 adds r1, r0 - ldr r0, _0804C3F8 + ldr r0, =0x0000ffff _0804C3E6: strh r0, [r1] _0804C3E8: @@ -155210,13 +149754,12 @@ _0804C3E8: strb r0, [r4, 0x14] b _0804C570 .align 2, 0 -_0804C3F4: .4byte 0x02024250 -_0804C3F8: .4byte 0x0000ffff + .pool _0804C3FC: - ldr r0, _0804C4C0 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r7, _0804C4C4 - ldr r2, _0804C4C8 + ldr r7, =0x0832a328 + ldr r2, =0x0202420b ldrb r3, [r2] lsls r0, r3, 2 adds r0, r7 @@ -155225,7 +149768,7 @@ _0804C3FC: mov r9, r2 cmp r1, 0 bne _0804C4B6 - ldr r6, _0804C4CC + ldr r6, =0x0202449c ldr r5, [r6] adds r0, r5, 0 adds r0, 0x91 @@ -155233,7 +149776,7 @@ _0804C3FC: ands r0, r4 cmp r0, 0 bne _0804C4B6 - ldr r1, _0804C4D0 + ldr r1, =0x0831c898 ldr r2, [sp, 0x18] lsls r0, r2, 1 adds r0, r2 @@ -155244,14 +149787,14 @@ _0804C3FC: ands r0, r1 cmp r0, 0 beq _0804C4B6 - ldr r0, _0804C4D4 + ldr r0, =0x02024280 ldr r1, [r0] movs r0, 0x80 lsls r0, 18 ands r0, r1 cmp r0, 0 beq _0804C4B6 - ldr r4, _0804C4D8 + ldr r4, =0x0202420c ldrb r0, [r4] cmp r3, r0 beq _0804C4B6 @@ -155263,7 +149806,7 @@ _0804C3FC: ands r1, r0 cmp r1, 0 bne _0804C4B6 - ldr r0, _0804C4DC + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -155272,7 +149815,7 @@ _0804C3FC: lsls r1, r2, 1 adds r1, r5 adds r1, 0x98 - ldr r3, _0804C4E0 + ldr r3, =0x020241ec ldrh r0, [r3] strb r0, [r1] ldrb r1, [r4] @@ -155313,31 +149856,23 @@ _0804C4B6: strb r0, [r5, 0x14] b _0804C570 .align 2, 0 -_0804C4C0: .4byte 0x02024210 -_0804C4C4: .4byte 0x0832a328 -_0804C4C8: .4byte 0x0202420b -_0804C4CC: .4byte 0x0202449c -_0804C4D0: .4byte 0x0831c898 -_0804C4D4: .4byte 0x02024280 -_0804C4D8: .4byte 0x0202420c -_0804C4DC: .4byte 0x0202427c -_0804C4E0: .4byte 0x020241ec + .pool _0804C4E4: - ldr r5, _0804C5CC + ldr r5, =0x02024280 ldr r2, [r5] movs r0, 0x80 lsls r0, 12 ands r0, r2 cmp r0, 0 bne _0804C568 - ldr r0, _0804C5D0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0804C568 - ldr r1, _0804C5D4 - ldr r0, _0804C5D8 + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 4 adds r0, r1 @@ -155345,9 +149880,9 @@ _0804C4E4: lsls r0, 29 cmp r0, 0 blt _0804C568 - ldr r0, _0804C5DC + ldr r0, =0x0831c898 mov r9, r0 - ldr r1, _0804C5E0 + ldr r1, =0x020241ea mov r8, r1 ldrh r0, [r1] lsls r1, r0, 1 @@ -155363,7 +149898,7 @@ _0804C4E4: ands r4, r2 cmp r4, 0 bne _0804C568 - ldr r7, _0804C5E4 + ldr r7, =0x0202420c ldrb r0, [r7] bl battle_get_per_side_status movs r1, 0x2 @@ -155373,7 +149908,7 @@ _0804C4E4: bl battle_get_side_with_given_state lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _0804C5E8 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 adds r0, r1 @@ -155385,7 +149920,7 @@ _0804C55E: ldr r0, [r5] orrs r0, r6 str r0, [r5] - ldr r2, _0804C5EC + ldr r2, =0x02024474 mov r12, r2 _0804C568: mov r3, r12 @@ -155428,7 +149963,7 @@ _0804C5A4: mov r2, r10 cmp r2, 0 bne _0804C5BA - ldr r1, _0804C5F0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x3 _0804C5B8: @@ -155443,16 +149978,7 @@ _0804C5BA: pop {r0} bx r0 .align 2, 0 -_0804C5CC: .4byte 0x02024280 -_0804C5D0: .4byte 0x02022fec -_0804C5D4: .4byte 0x0202433c -_0804C5D8: .4byte 0x0202420b -_0804C5DC: .4byte 0x0831c898 -_0804C5E0: .4byte 0x020241ea -_0804C5E4: .4byte 0x0202420c -_0804C5E8: .4byte 0x02024084 -_0804C5EC: .4byte 0x02024474 -_0804C5F0: .4byte 0x02024214 + .pool thumb_func_end sub_804BBCC thumb_func_start atk4A_damagecalc2 @@ -155462,8 +149988,8 @@ atk4A_damagecalc2: @ 804C5F4 push {r7} movs r4, 0 movs r5, 0 - ldr r2, _0804C658 - ldr r0, _0804C65C + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -155471,8 +149997,8 @@ atk4A_damagecalc2: @ 804C5F4 adds r0, r2 ldrb r0, [r0, 0x2] mov r8, r0 - ldr r2, _0804C660 - ldr r3, _0804C664 + ldr r2, =0x02024084 + ldr r3, =0x0202420c ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -155486,19 +150012,19 @@ atk4A_damagecalc2: @ 804C5F4 mov r1, r8 cmp r1, 0x4 bne _0804C688 - ldr r3, _0804C668 + ldr r3, =0x0202420a strb r0, [r3] - ldr r2, _0804C66C + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x9 orrs r0, r1 strb r0, [r2] - ldr r1, _0804C670 + ldr r1, =0x02024250 ldrb r0, [r7] lsls r0, 1 adds r0, r1 strh r4, [r0] - ldr r0, _0804C674 + ldr r0, =0x02024332 mov r2, r8 strb r2, [r0, 0x6] ldrb r0, [r7] @@ -155506,31 +150032,24 @@ atk4A_damagecalc2: @ 804C5F4 bl b_history__record_ability_usage_of_player b _0804C76A .align 2, 0 -_0804C658: .4byte 0x0831c898 -_0804C65C: .4byte 0x020241ea -_0804C660: .4byte 0x02024084 -_0804C664: .4byte 0x0202420c -_0804C668: .4byte 0x0202420a -_0804C66C: .4byte 0x0202427c -_0804C670: .4byte 0x02024250 -_0804C674: .4byte 0x02024332 + .pool _0804C678: - ldr r0, _0804C684 + ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x8 orrs r1, r2 strb r1, [r0] b _0804C76A .align 2, 0 -_0804C684: .4byte 0x0202427c + .pool _0804C688: - ldr r1, _0804C694 + ldr r1, =0x0831ace8 adds r0, r5, r1 ldrb r0, [r0] adds r6, r1, 0 b _0804C74A .align 2, 0 -_0804C694: .4byte 0x0831ace8 + .pool _0804C698: adds r0, r5, r6 ldrb r0, [r0] @@ -155644,8 +150163,8 @@ _0804C74A: cmp r0, 0 beq _0804C744 _0804C76A: - ldr r2, _0804C818 - ldr r0, _0804C81C + ldr r2, =0x02024084 + ldr r0, =0x0202420c mov r8, r0 ldrb r1, [r0] movs r0, 0x58 @@ -155659,9 +150178,9 @@ _0804C76A: ands r5, r4 cmp r5, 0 bne _0804C7E6 - ldr r0, _0804C820 + ldr r0, =0x0202420b ldrb r0, [r0] - ldr r7, _0804C824 + ldr r7, =0x020241ea ldrh r1, [r7] bl move_weather_interaction lsls r0, 24 @@ -155677,7 +150196,7 @@ _0804C76A: cmp r4, 0x6 bne _0804C7E6 _0804C7AC: - ldr r2, _0804C828 + ldr r2, =0x0831c898 ldrh r1, [r7] lsls r0, r1, 1 adds r0, r1 @@ -155686,34 +150205,34 @@ _0804C7AC: ldrb r0, [r0, 0x1] cmp r0, 0 beq _0804C7E6 - ldr r3, _0804C82C + ldr r3, =0x0202420a strb r6, [r3] - ldr r2, _0804C830 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _0804C834 + ldr r1, =0x02024250 mov r2, r8 ldrb r0, [r2] lsls r0, 1 adds r0, r1 strh r5, [r0] - ldr r1, _0804C838 + ldr r1, =0x02024332 movs r0, 0x3 strb r0, [r1, 0x6] ldrb r0, [r2] ldrb r1, [r3] bl b_history__record_ability_usage_of_player _0804C7E6: - ldr r0, _0804C830 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x8 ands r0, r1 cmp r0, 0 beq _0804C804 - ldr r2, _0804C83C - ldr r0, _0804C820 + ldr r2, =0x0202433c + ldr r0, =0x0202420b ldrb r1, [r0] lsls r1, 4 adds r1, r2 @@ -155722,7 +150241,7 @@ _0804C7E6: orrs r0, r2 strb r0, [r1, 0x1] _0804C804: - ldr r1, _0804C840 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -155732,28 +150251,18 @@ _0804C804: pop {r0} bx r0 .align 2, 0 -_0804C818: .4byte 0x02024084 -_0804C81C: .4byte 0x0202420c -_0804C820: .4byte 0x0202420b -_0804C824: .4byte 0x020241ea -_0804C828: .4byte 0x0831c898 -_0804C82C: .4byte 0x0202420a -_0804C830: .4byte 0x0202427c -_0804C834: .4byte 0x02024250 -_0804C838: .4byte 0x02024332 -_0804C83C: .4byte 0x0202433c -_0804C840: .4byte 0x02024214 + .pool thumb_func_end atk4A_damagecalc2 thumb_func_start atk4B_cmd4b atk4B_cmd4b: @ 804C844 push {r4,lr} - ldr r4, _0804C880 - ldr r0, _0804C884 + ldr r4, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r4] - ldr r2, _0804C888 - ldr r1, _0804C88C + ldr r2, =0x02024280 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -155769,7 +150278,7 @@ atk4B_cmd4b: @ 804C844 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0804C872: - ldr r1, _0804C890 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -155777,37 +150286,33 @@ _0804C872: pop {r0} bx r0 .align 2, 0 -_0804C880: .4byte 0x02024064 -_0804C884: .4byte 0x0202420b -_0804C888: .4byte 0x02024280 -_0804C88C: .4byte 0x0832a328 -_0804C890: .4byte 0x02024214 + .pool thumb_func_end atk4B_cmd4b thumb_func_start atk4C_switch1 atk4C_switch1: @ 804C894 push {r4,r5,lr} - ldr r0, _0804C8EC + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0804C8E4 - ldr r5, _0804C8F0 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, _0804C8F4 + ldr r4, =0x02024064 strb r0, [r4] - ldr r3, _0804C8F8 + ldr r3, =0x0202406e ldrb r0, [r4] lsls r2, r0, 1 adds r2, r3 - ldr r1, _0804C8FC + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 adds r0, 0x5C ldrb r0, [r0] strh r0, [r2] - ldr r1, _0804C900 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 1 adds r0, r3 @@ -155828,31 +150333,26 @@ _0804C8E4: pop {r0} bx r0 .align 2, 0 -_0804C8EC: .4byte 0x02024068 -_0804C8F0: .4byte 0x02024214 -_0804C8F4: .4byte 0x02024064 -_0804C8F8: .4byte 0x0202406e -_0804C8FC: .4byte 0x0202449c -_0804C900: .4byte 0x0832a328 + .pool thumb_func_end atk4C_switch1 thumb_func_start sub_804C904 sub_804C904: @ 804C904 push {r4-r7,lr} sub sp, 0x58 - ldr r0, _0804CAAC + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _0804C912 b _0804CAA4 _0804C912: - ldr r0, _0804CAB0 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, _0804CAB4 + ldr r4, =0x02024064 strb r0, [r4] - ldr r6, _0804CAB8 + ldr r6, =0x02024084 ldrb r0, [r4] movs r5, 0x58 adds r1, r0, 0 @@ -155865,7 +150365,7 @@ _0804C912: muls r0, r5 adds r3, r0, r6 movs r2, 0 - ldr r5, _0804CABC + ldr r5, =0x02023864 _0804C93E: adds r0, r3, r2 ldrb r1, [r4] @@ -155878,14 +150378,14 @@ _0804C93E: adds r2, 0x1 cmp r2, 0x57 bls _0804C93E - ldr r4, _0804CAB8 - ldr r6, _0804CAB4 + ldr r4, =0x02024084 + ldr r6, =0x02024064 ldrb r0, [r6] movs r7, 0x58 adds r2, r0, 0 muls r2, r7 adds r2, r4 - ldr r3, _0804CAC0 + ldr r3, =0x083203cc ldrh r1, [r2] lsls r0, r1, 3 subs r0, r1 @@ -155923,12 +150423,12 @@ _0804C93E: bl battle_side_get_owner lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0804CAC4 + ldr r0, =0x020243d0 adds r0, 0x29 adds r0, r2, r0 ldrb r1, [r0] - ldr r3, _0804CAC8 - ldr r2, _0804CACC + ldr r3, =0x0832a328 + ldr r2, =0x0202406e ldrb r5, [r6] lsls r0, r5, 1 adds r0, r2 @@ -155946,8 +150446,8 @@ _0804C93E: movs r1, 0 strh r1, [r0, 0x2E] _0804C9DE: - ldr r2, _0804CAD0 - ldr r0, _0804CAD4 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -155974,7 +150474,7 @@ _0804C9FE: adds r2, 0x1 cmp r2, 0x7 ble _0804C9FE - ldr r0, _0804CAB4 + ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -155985,15 +150485,15 @@ _0804C9FE: str r1, [r0] _0804CA26: bl sub_803A284 - ldr r0, _0804CAD8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 beq _0804CA78 - ldr r4, _0804CAB8 - ldr r0, _0804CAB4 + ldr r4, =0x02024084 + ldr r0, =0x02024064 ldrb r3, [r0] movs r0, 0x58 adds r2, r3, 0 @@ -156014,10 +150514,10 @@ _0804CA26: ands r0, r1 cmp r0, 0 bne _0804CA78 - ldr r0, _0804CADC + ldr r0, =0x0202449c ldr r2, [r0] adds r2, 0x92 - ldr r1, _0804CAC8 + ldr r1, =0x0832a328 lsls r0, r3, 2 adds r0, r1 ldr r0, [r0] @@ -156025,17 +150525,17 @@ _0804CA26: orrs r0, r1 strb r0, [r2] _0804CA78: - ldr r0, _0804CAE0 - ldr r3, _0804CAB4 + ldr r0, =0x02024474 + ldr r3, =0x02024064 ldrb r2, [r3] strb r2, [r0, 0x17] - ldr r1, _0804CAE4 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] strb r2, [r1, 0x2] - ldr r2, _0804CACC + ldr r2, =0x0202406e ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -156043,7 +150543,7 @@ _0804CA78: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _0804CAB0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -156053,35 +150553,21 @@ _0804CAA4: pop {r0} bx r0 .align 2, 0 -_0804CAAC: .4byte 0x02024068 -_0804CAB0: .4byte 0x02024214 -_0804CAB4: .4byte 0x02024064 -_0804CAB8: .4byte 0x02024084 -_0804CABC: .4byte 0x02023864 -_0804CAC0: .4byte 0x083203cc -_0804CAC4: .4byte 0x020243d0 -_0804CAC8: .4byte 0x0832a328 -_0804CACC: .4byte 0x0202406e -_0804CAD0: .4byte 0x0831c898 -_0804CAD4: .4byte 0x020241ea -_0804CAD8: .4byte 0x02022fec -_0804CADC: .4byte 0x0202449c -_0804CAE0: .4byte 0x02024474 -_0804CAE4: .4byte 0x02022f58 + .pool thumb_func_end sub_804C904 thumb_func_start atk4E_switch3 atk4E_switch3: @ 804CAE8 push {r4-r6,lr} - ldr r0, _0804CB8C + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0804CB86 - ldr r0, _0804CB90 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r6, _0804CB94 + ldr r6, =0x02024064 strb r0, [r6] ldrb r0, [r6] bl battle_side_get_owner @@ -156089,13 +150575,13 @@ atk4E_switch3: @ 804CAE8 lsrs r0, 24 cmp r0, 0x1 bne _0804CB3E - ldr r0, _0804CB98 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0804CB9C + ldr r1, =0x063f0902 ands r0, r1 cmp r0, 0 bne _0804CB3E - ldr r4, _0804CBA0 + ldr r4, =0x02024084 ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -156112,9 +150598,9 @@ atk4E_switch3: @ 804CAE8 movs r1, 0x2 bl sub_806F01C _0804CB3E: - ldr r2, _0804CBA4 - ldr r1, _0804CBA8 - ldr r5, _0804CB94 + ldr r2, =0x02024210 + ldr r1, =0x0832a328 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -156122,12 +150608,12 @@ _0804CB3E: ldrb r0, [r2] bics r0, r1 strb r0, [r2] - ldr r1, _0804CBAC + ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrb r1, [r0] - ldr r4, _0804CB90 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r2, [r0, 0x2] movs r0, 0 @@ -156137,7 +150623,7 @@ _0804CB3E: ldr r0, [r4] adds r0, 0x3 str r0, [r4] - ldr r0, _0804CB98 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 @@ -156150,15 +150636,7 @@ _0804CB86: pop {r0} bx r0 .align 2, 0 -_0804CB8C: .4byte 0x02024068 -_0804CB90: .4byte 0x02024214 -_0804CB94: .4byte 0x02024064 -_0804CB98: .4byte 0x02022fec -_0804CB9C: .4byte 0x063f0902 -_0804CBA0: .4byte 0x02024084 -_0804CBA4: .4byte 0x02024210 -_0804CBA8: .4byte 0x0832a328 -_0804CBAC: .4byte 0x0202406e + .pool thumb_func_end atk4E_switch3 thumb_func_start atk4F_jumpifcannotswitch @@ -156166,13 +150644,13 @@ atk4F_jumpifcannotswitch: @ 804CBB0 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _0804CC14 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r1, [r0, 0x1] movs r0, 0x7F ands r0, r1 bl get_battle_side_of_something - ldr r3, _0804CC18 + ldr r3, =0x02024064 strb r0, [r3] ldr r2, [r4] ldrb r1, [r2, 0x1] @@ -156180,18 +150658,18 @@ atk4F_jumpifcannotswitch: @ 804CBB0 ands r0, r1 cmp r0, 0 bne _0804CC28 - ldr r1, _0804CC1C + ldr r1, =0x02024084 ldrb r3, [r3] movs r0, 0x58 muls r0, r3 adds r1, 0x50 adds r0, r1 ldr r0, [r0] - ldr r1, _0804CC20 + ldr r1, =0x0400e000 ands r0, r1 cmp r0, 0 bne _0804CBFC - ldr r1, _0804CC24 + ldr r1, =0x020242ac lsls r0, r3, 2 adds r0, r1 ldr r0, [r0] @@ -156214,29 +150692,25 @@ _0804CBFC: str r1, [r4] b _0804CF00 .align 2, 0 -_0804CC14: .4byte 0x02024214 -_0804CC18: .4byte 0x02024064 -_0804CC1C: .4byte 0x02024084 -_0804CC20: .4byte 0x0400e000 -_0804CC24: .4byte 0x020242ac + .pool _0804CC28: - ldr r0, _0804CCAC + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 15 ands r0, r1 cmp r0, 0 beq _0804CCC0 - ldr r5, _0804CCB0 + ldr r5, =0x02024064 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 - ldr r1, _0804CCB4 + ldr r1, =0x020244ec mov r8, r1 cmp r0, 0x1 bne _0804CC4E - ldr r0, _0804CCB8 + ldr r0, =0x02024744 mov r8, r0 _0804CC4E: movs r4, 0 @@ -156250,7 +150724,7 @@ _0804CC5C: adds r6, r4, 0x3 cmp r4, r6 bge _0804CCA4 - ldr r7, _0804CCBC + ldr r7, =0x0202406e _0804CC64: movs r0, 0x64 muls r0, r4 @@ -156271,7 +150745,7 @@ _0804CC64: bl pokemon_getattr cmp r0, 0 beq _0804CC9E - ldr r0, _0804CCB0 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r7 @@ -156289,11 +150763,7 @@ _0804CCA4: _0804CCAA: b _0804CEF8 .align 2, 0 -_0804CCAC: .4byte 0x02022fec -_0804CCB0: .4byte 0x02024064 -_0804CCB4: .4byte 0x020244ec -_0804CCB8: .4byte 0x02024744 -_0804CCBC: .4byte 0x0202406e + .pool _0804CCC0: movs r0, 0x40 ands r0, r1 @@ -156304,19 +150774,18 @@ _0804CCC0: ands r1, r0 cmp r1, 0 beq _0804CD00 - ldr r5, _0804CCE4 + ldr r5, =0x02024064 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0804CCEC - ldr r0, _0804CCE8 + ldr r0, =0x020244ec b _0804CD16 .align 2, 0 -_0804CCE4: .4byte 0x02024064 -_0804CCE8: .4byte 0x020244ec + .pool _0804CCEC: - ldr r1, _0804CCFC + ldr r1, =0x02024744 mov r8, r1 ldrb r0, [r5] movs r4, 0x3 @@ -156325,18 +150794,18 @@ _0804CCEC: movs r4, 0 b _0804CD32 .align 2, 0 -_0804CCFC: .4byte 0x02024744 + .pool _0804CD00: - ldr r5, _0804CD7C + ldr r5, =0x02024064 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 - ldr r1, _0804CD80 + ldr r1, =0x020244ec mov r8, r1 cmp r0, 0x1 bne _0804CD18 - ldr r0, _0804CD84 + ldr r0, =0x02024744 _0804CD16: mov r8, r0 _0804CD18: @@ -156355,7 +150824,7 @@ _0804CD32: adds r6, r4, 0x3 cmp r4, r6 bge _0804CCA4 - ldr r7, _0804CD88 + ldr r7, =0x0202406e _0804CD3A: movs r0, 0x64 muls r0, r4 @@ -156376,7 +150845,7 @@ _0804CD3A: bl pokemon_getattr cmp r0, 0 beq _0804CD74 - ldr r0, _0804CD7C + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r7 @@ -156389,24 +150858,21 @@ _0804CD74: blt _0804CD3A b _0804CCA4 .align 2, 0 -_0804CD7C: .4byte 0x02024064 -_0804CD80: .4byte 0x020244ec -_0804CD84: .4byte 0x02024744 -_0804CD88: .4byte 0x0202406e + .pool _0804CD8C: movs r0, 0x80 lsls r0, 8 ands r1, r0 cmp r1, 0 beq _0804CE10 - ldr r5, _0804CE04 + ldr r5, =0x02024064 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0804CE10 - ldr r0, _0804CE08 + ldr r0, =0x02024744 mov r8, r0 movs r4, 0 ldrb r0, [r5] @@ -156419,7 +150885,7 @@ _0804CDB4: blt _0804CDBC b _0804CCA4 _0804CDBC: - ldr r7, _0804CE0C + ldr r7, =0x0202406e _0804CDBE: movs r0, 0x64 muls r0, r4 @@ -156440,7 +150906,7 @@ _0804CDBE: bl pokemon_getattr cmp r0, 0 beq _0804CDFA - ldr r0, _0804CE04 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r7 @@ -156454,11 +150920,9 @@ _0804CDFA: blt _0804CDBE b _0804CCA4 .align 2, 0 -_0804CE04: .4byte 0x02024064 -_0804CE08: .4byte 0x02024744 -_0804CE0C: .4byte 0x0202406e + .pool _0804CE10: - ldr r0, _0804CE40 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -156469,7 +150933,7 @@ _0804CE10: bl battle_get_side_with_given_state lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0804CE44 + ldr r0, =0x02022fec ldr r0, [r0] ands r0, r4 cmp r0, 0 @@ -156480,22 +150944,21 @@ _0804CE10: lsrs r6, r0, 24 b _0804CE4A .align 2, 0 -_0804CE40: .4byte 0x02024064 -_0804CE44: .4byte 0x02022fec + .pool _0804CE48: adds r6, r7, 0 _0804CE4A: - ldr r0, _0804CE50 + ldr r0, =0x02024744 mov r8, r0 b _0804CE82 .align 2, 0 -_0804CE50: .4byte 0x02024744 + .pool _0804CE54: movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0804CE78 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -156507,11 +150970,11 @@ _0804CE54: lsrs r6, r0, 24 b _0804CE7E .align 2, 0 -_0804CE78: .4byte 0x02022fec + .pool _0804CE7C: adds r6, r7, 0 _0804CE7E: - ldr r1, _0804CEEC + ldr r1, =0x020244ec mov r8, r1 _0804CE82: movs r4, 0 @@ -156535,7 +150998,7 @@ _0804CE84: bl pokemon_getattr cmp r0, 0 bne _0804CEC6 - ldr r1, _0804CEF0 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -156554,7 +151017,7 @@ _0804CECC: cmp r4, 0x6 bne _0804CEF8 _0804CED0: - ldr r3, _0804CEF4 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -156569,11 +151032,9 @@ _0804CED0: str r1, [r3] b _0804CF00 .align 2, 0 -_0804CEEC: .4byte 0x020244ec -_0804CEF0: .4byte 0x0202406e -_0804CEF4: .4byte 0x02024214 + .pool _0804CEF8: - ldr r1, _0804CF0C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x6 str r0, [r1] @@ -156584,7 +151045,7 @@ _0804CF00: pop {r0} bx r0 .align 2, 0 -_0804CF0C: .4byte 0x02024214 + .pool thumb_func_end atk4F_jumpifcannotswitch thumb_func_start sub_804CF10 @@ -156594,13 +151055,13 @@ sub_804CF10: @ 804CF10 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r5, _0804CF78 + ldr r5, =0x02024064 ldrb r0, [r5] - ldr r4, _0804CF7C + ldr r4, =0x0202449c ldr r1, [r4] adds r1, r0, r1 adds r1, 0x58 - ldr r3, _0804CF80 + ldr r3, =0x0202406e lsls r0, 1 adds r0, r3 ldrh r0, [r0] @@ -156613,7 +151074,7 @@ sub_804CF10: @ 804CF10 strb r1, [r0] ldr r1, [r4] adds r1, 0x93 - ldr r3, _0804CF84 + ldr r3, =0x0832a328 ldrb r0, [r5] lsls r0, 2 adds r0, r3 @@ -156639,10 +151100,7 @@ sub_804CF10: @ 804CF10 pop {r0} bx r0 .align 2, 0 -_0804CF78: .4byte 0x02024064 -_0804CF7C: .4byte 0x0202449c -_0804CF80: .4byte 0x0202406e -_0804CF84: .4byte 0x0832a328 + .pool thumb_func_end sub_804CF10 thumb_func_start atk50_openpartyscreen @@ -156655,7 +151113,7 @@ atk50_openpartyscreen: @ 804CF88 movs r7, 0 movs r0, 0 mov r9, r0 - ldr r6, _0804D038 + ldr r6, =0x02024214 ldr r2, [r6] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -156675,24 +151133,24 @@ atk50_openpartyscreen: @ 804CF88 beq _0804CFBE b _0804D464 _0804CFBE: - ldr r0, _0804D03C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x41 ands r1, r0 cmp r1, 0x1 beq _0804D0B0 - ldr r1, _0804D040 + ldr r1, =0x02024064 strb r7, [r1] - ldr r0, _0804D044 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r7, r0 bcc _0804CFD8 b _0804D450 _0804CFD8: - ldr r7, _0804D048 - ldr r6, _0804D04C + ldr r7, =0x02024280 + ldr r6, =0x0832a328 adds r4, r1, 0 - ldr r2, _0804D050 + ldr r2, =0x02024210 mov r8, r2 _0804CFE2: ldrb r2, [r4] @@ -156735,15 +151193,9 @@ _0804CFE2: bl dp01_battle_side_mark_buffer_for_execution b _0804D098 .align 2, 0 -_0804D038: .4byte 0x02024214 -_0804D03C: .4byte 0x02022fec -_0804D040: .4byte 0x02024064 -_0804D044: .4byte 0x0202406c -_0804D048: .4byte 0x02024280 -_0804D04C: .4byte 0x0832a328 -_0804D050: .4byte 0x02024210 + .pool _0804D054: - ldr r5, _0804D084 + ldr r5, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -156766,7 +151218,7 @@ _0804D054: strb r1, [r0] b _0804D098 .align 2, 0 -_0804D084: .4byte 0x0202437c + .pool _0804D088: movs r0, 0 movs r1, 0x2 @@ -156778,7 +151230,7 @@ _0804D098: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _0804D0AC + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -156786,23 +151238,23 @@ _0804D098: bcc _0804CFE2 b _0804D450 .align 2, 0 -_0804D0AC: .4byte 0x0202406c + .pool _0804D0B0: ands r0, r1 cmp r0, 0 bne _0804D0B8 b _0804D450 _0804D0B8: - ldr r0, _0804D110 + ldr r0, =0x02024280 mov r8, r0 ldr r0, [r0] lsrs r5, r0, 28 - ldr r6, _0804D114 + ldr r6, =0x0832a328 ldr r0, [r6] ands r0, r5 cmp r0, 0 beq _0804D170 - ldr r4, _0804D118 + ldr r4, =0x02024064 strb r7, [r4] movs r0, 0 movs r1, 0x6 @@ -156811,7 +151263,7 @@ _0804D0B8: lsls r0, 24 cmp r0, 0 beq _0804D120 - ldr r2, _0804D11C + ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -156834,12 +151286,9 @@ _0804D0B8: bl dp01_battle_side_mark_buffer_for_execution b _0804D170 .align 2, 0 -_0804D110: .4byte 0x02024280 -_0804D114: .4byte 0x0832a328 -_0804D118: .4byte 0x02024064 -_0804D11C: .4byte 0x02024210 + .pool _0804D120: - ldr r6, _0804D154 + ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -156849,7 +151298,7 @@ _0804D120: lsls r0, 25 cmp r0, 0 blt _0804D15C - ldr r0, _0804D158 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5E ldrb r0, [r0] @@ -156865,8 +151314,7 @@ _0804D120: strb r1, [r0] b _0804D170 .align 2, 0 -_0804D154: .4byte 0x0202437c -_0804D158: .4byte 0x0202449c + .pool _0804D15C: movs r0, 0 movs r1, 0x2 @@ -156877,7 +151325,7 @@ _0804D15C: movs r0, 0x1 mov r9, r0 _0804D170: - ldr r6, _0804D1C8 + ldr r6, =0x0832a328 ldr r0, [r6, 0x8] ands r0, r5 cmp r0, 0 @@ -156886,7 +151334,7 @@ _0804D170: ands r0, r5 cmp r0, 0 bne _0804D22E - ldr r4, _0804D1CC + ldr r4, =0x02024064 movs r0, 0x2 strb r0, [r4] movs r0, 0x2 @@ -156896,7 +151344,7 @@ _0804D170: lsls r0, 24 cmp r0, 0 beq _0804D1D8 - ldr r2, _0804D1D0 + ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -156904,7 +151352,7 @@ _0804D170: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _0804D1D4 + ldr r2, =0x02024280 ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -156919,12 +151367,9 @@ _0804D170: bl dp01_battle_side_mark_buffer_for_execution b _0804D22E .align 2, 0 -_0804D1C8: .4byte 0x0832a328 -_0804D1CC: .4byte 0x02024064 -_0804D1D0: .4byte 0x02024210 -_0804D1D4: .4byte 0x02024280 + .pool _0804D1D8: - ldr r6, _0804D20C + ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -156934,7 +151379,7 @@ _0804D1D8: lsls r0, 25 cmp r0, 0 blt _0804D214 - ldr r0, _0804D210 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5C ldrb r0, [r0] @@ -156950,8 +151395,7 @@ _0804D1D8: strb r1, [r0] b _0804D22E .align 2, 0 -_0804D20C: .4byte 0x0202437c -_0804D210: .4byte 0x0202449c + .pool _0804D214: movs r0, 0x1 mov r1, r9 @@ -156965,12 +151409,12 @@ _0804D214: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0804D22E: - ldr r6, _0804D280 + ldr r6, =0x0832a328 ldr r0, [r6, 0x4] ands r0, r5 cmp r0, 0 beq _0804D2E4 - ldr r4, _0804D284 + ldr r4, =0x02024064 movs r0, 0x1 strb r0, [r4] movs r0, 0x1 @@ -156980,7 +151424,7 @@ _0804D22E: lsls r0, 24 cmp r0, 0 beq _0804D290 - ldr r2, _0804D288 + ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -156988,7 +151432,7 @@ _0804D22E: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _0804D28C + ldr r2, =0x02024280 ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -157003,12 +151447,9 @@ _0804D22E: bl dp01_battle_side_mark_buffer_for_execution b _0804D2E4 .align 2, 0 -_0804D280: .4byte 0x0832a328 -_0804D284: .4byte 0x02024064 -_0804D288: .4byte 0x02024210 -_0804D28C: .4byte 0x02024280 + .pool _0804D290: - ldr r6, _0804D2C4 + ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -157018,7 +151459,7 @@ _0804D290: lsls r0, 25 cmp r0, 0 blt _0804D2CC - ldr r0, _0804D2C8 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5F ldrb r0, [r0] @@ -157034,8 +151475,7 @@ _0804D290: strb r1, [r0] b _0804D2E4 .align 2, 0 -_0804D2C4: .4byte 0x0202437c -_0804D2C8: .4byte 0x0202449c + .pool _0804D2CC: movs r0, 0 movs r1, 0x2 @@ -157048,7 +151488,7 @@ _0804D2CC: orrs r2, r0 mov r9, r2 _0804D2E4: - ldr r6, _0804D33C + ldr r6, =0x0832a328 ldr r0, [r6, 0xC] ands r0, r5 cmp r0, 0 @@ -157057,7 +151497,7 @@ _0804D2E4: ands r0, r5 cmp r0, 0 bne _0804D3A2 - ldr r4, _0804D340 + ldr r4, =0x02024064 movs r0, 0x3 strb r0, [r4] movs r0, 0x3 @@ -157067,7 +151507,7 @@ _0804D2E4: lsls r0, 24 cmp r0, 0 beq _0804D34C - ldr r2, _0804D344 + ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -157075,7 +151515,7 @@ _0804D2E4: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _0804D348 + ldr r2, =0x02024280 ldrb r0, [r4] lsls r0, 2 adds r0, r6 @@ -157090,12 +151530,9 @@ _0804D2E4: bl dp01_battle_side_mark_buffer_for_execution b _0804D3A2 .align 2, 0 -_0804D33C: .4byte 0x0832a328 -_0804D340: .4byte 0x02024064 -_0804D344: .4byte 0x02024210 -_0804D348: .4byte 0x02024280 + .pool _0804D34C: - ldr r6, _0804D380 + ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -157105,7 +151542,7 @@ _0804D34C: lsls r0, 25 cmp r0, 0 blt _0804D388 - ldr r0, _0804D384 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5D ldrb r0, [r0] @@ -157121,8 +151558,7 @@ _0804D34C: strb r1, [r0] b _0804D3A2 .align 2, 0 -_0804D380: .4byte 0x0202437c -_0804D384: .4byte 0x0202449c + .pool _0804D388: movs r0, 0x2 mov r1, r9 @@ -157136,7 +151572,7 @@ _0804D388: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0804D3A2: - ldr r1, _0804D3D4 + ldr r1, =0x0202437c ldrb r0, [r1] lsls r0, 25 cmp r0, 0 @@ -157149,35 +151585,32 @@ _0804D3A2: blt _0804D3FA cmp r5, 0 beq _0804D3FA - ldr r0, _0804D3D8 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r0, _0804D3DC + ldr r0, =0x0832a328 ldr r0, [r0] ands r1, r0 cmp r1, 0 beq _0804D3E4 - ldr r1, _0804D3E0 + ldr r1, =0x02024064 movs r0, 0x2 strb r0, [r1] b _0804D3E8 .align 2, 0 -_0804D3D4: .4byte 0x0202437c -_0804D3D8: .4byte 0x02024210 -_0804D3DC: .4byte 0x0832a328 -_0804D3E0: .4byte 0x02024064 + .pool _0804D3E4: - ldr r0, _0804D428 + ldr r0, =0x02024064 strb r1, [r0] _0804D3E8: movs r0, 0 movs r1, 0x2 movs r2, 0 bl sub_8034464 - ldr r0, _0804D428 + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution _0804D3FA: - ldr r1, _0804D42C + ldr r1, =0x0202437c ldrb r0, [r1, 0x14] lsls r0, 25 cmp r0, 0 @@ -157190,23 +151623,20 @@ _0804D3FA: blt _0804D450 cmp r5, 0 beq _0804D450 - ldr r0, _0804D430 + ldr r0, =0x02024210 ldrb r0, [r0] - ldr r1, _0804D434 + ldr r1, =0x0832a328 ldr r1, [r1, 0x4] ands r0, r1 cmp r0, 0 beq _0804D438 - ldr r1, _0804D428 + ldr r1, =0x02024064 movs r0, 0x3 b _0804D43C .align 2, 0 -_0804D428: .4byte 0x02024064 -_0804D42C: .4byte 0x0202437c -_0804D430: .4byte 0x02024210 -_0804D434: .4byte 0x0832a328 + .pool _0804D438: - ldr r1, _0804D45C + ldr r1, =0x02024064 movs r0, 0x1 _0804D43C: strb r0, [r1] @@ -157214,24 +151644,23 @@ _0804D43C: movs r1, 0x2 movs r2, 0 bl sub_8034464 - ldr r0, _0804D45C + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution _0804D450: - ldr r1, _0804D460 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x6 str r0, [r1] b _0804D804 .align 2, 0 -_0804D45C: .4byte 0x02024064 -_0804D460: .4byte 0x02024214 + .pool _0804D464: cmp r0, 0x6 beq _0804D46A b _0804D658 _0804D46A: - ldr r0, _0804D4E0 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x40 ands r0, r1 @@ -157245,10 +151674,10 @@ _0804D478: bne _0804D482 b _0804D5F4 _0804D482: - ldr r7, _0804D4E4 + ldr r7, =0x02024280 ldr r0, [r7] lsrs r5, r0, 28 - ldr r4, _0804D4E8 + ldr r4, =0x0832a328 ldr r0, [r4, 0x8] ands r0, r5 cmp r0, 0 @@ -157257,10 +151686,10 @@ _0804D482: ands r0, r5 cmp r0, 0 beq _0804D52A - ldr r6, _0804D4EC + ldr r6, =0x02024064 movs r0, 0x2 strb r0, [r6] - ldr r0, _0804D4F0 + ldr r0, =0x02023864 ldrb r1, [r0, 0x1] movs r0, 0x2 movs r2, 0x6 @@ -157268,7 +151697,7 @@ _0804D482: lsls r0, 24 cmp r0, 0 beq _0804D4F8 - ldr r2, _0804D4F4 + ldr r2, =0x02024210 ldrb r0, [r6] lsls r0, 2 adds r0, r4 @@ -157290,14 +151719,9 @@ _0804D482: bl dp01_battle_side_mark_buffer_for_execution b _0804D52A .align 2, 0 -_0804D4E0: .4byte 0x02022fec -_0804D4E4: .4byte 0x02024280 -_0804D4E8: .4byte 0x0832a328 -_0804D4EC: .4byte 0x02024064 -_0804D4F0: .4byte 0x02023864 -_0804D4F4: .4byte 0x02024210 + .pool _0804D4F8: - ldr r4, _0804D588 + ldr r4, =0x0202437c ldrb r0, [r6] lsls r1, r0, 2 adds r1, r0 @@ -157307,7 +151731,7 @@ _0804D4F8: lsls r0, 25 cmp r0, 0 blt _0804D52A - ldr r0, _0804D58C + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5C ldrb r0, [r0] @@ -157322,7 +151746,7 @@ _0804D4F8: orrs r1, r2 strb r1, [r0] _0804D52A: - ldr r4, _0804D590 + ldr r4, =0x0832a328 ldr r0, [r4, 0xC] ands r0, r5 cmp r0, 0 @@ -157331,11 +151755,11 @@ _0804D52A: ands r5, r0 cmp r5, 0 beq _0804D5DA - ldr r5, _0804D594 + ldr r5, =0x02024064 movs r0, 0x3 strb r0, [r5] - ldr r0, _0804D598 - ldr r2, _0804D59C + ldr r0, =0x02023864 + ldr r2, =0x00000201 adds r0, r2 ldrb r1, [r0] movs r0, 0x3 @@ -157344,7 +151768,7 @@ _0804D52A: lsls r0, 24 cmp r0, 0 beq _0804D5A8 - ldr r2, _0804D5A0 + ldr r2, =0x02024210 ldrb r0, [r5] lsls r0, 2 adds r0, r4 @@ -157352,7 +151776,7 @@ _0804D52A: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _0804D5A4 + ldr r2, =0x02024280 ldrb r0, [r5] lsls r0, 2 adds r0, r4 @@ -157367,16 +151791,9 @@ _0804D52A: bl dp01_battle_side_mark_buffer_for_execution b _0804D5DA .align 2, 0 -_0804D588: .4byte 0x0202437c -_0804D58C: .4byte 0x0202449c -_0804D590: .4byte 0x0832a328 -_0804D594: .4byte 0x02024064 -_0804D598: .4byte 0x02023864 -_0804D59C: .4byte 0x00000201 -_0804D5A0: .4byte 0x02024210 -_0804D5A4: .4byte 0x02024280 + .pool _0804D5A8: - ldr r4, _0804D5E8 + ldr r4, =0x0202437c ldrb r0, [r5] lsls r1, r0, 2 adds r1, r0 @@ -157386,7 +151803,7 @@ _0804D5A8: lsls r0, 25 cmp r0, 0 blt _0804D5DA - ldr r0, _0804D5EC + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5D ldrb r0, [r0] @@ -157401,30 +151818,28 @@ _0804D5A8: orrs r1, r2 strb r1, [r0] _0804D5DA: - ldr r1, _0804D5F0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x6 str r0, [r1] mov r12, r1 b _0804D5F8 .align 2, 0 -_0804D5E8: .4byte 0x0202437c -_0804D5EC: .4byte 0x0202449c -_0804D5F0: .4byte 0x02024214 + .pool _0804D5F4: adds r0, r2, 0x6 str r0, [r6] _0804D5F8: - ldr r0, _0804D648 + ldr r0, =0x02024280 ldr r0, [r0] lsrs r5, r0, 28 - ldr r1, _0804D64C + ldr r1, =0x0202420d movs r0, 0 strb r0, [r1] - ldr r4, _0804D650 + ldr r4, =0x0832a328 ldr r2, [r4] ands r2, r5 - ldr r6, _0804D654 + ldr r6, =0x0202406c cmp r2, 0 bne _0804D634 adds r7, r6, 0 @@ -157458,10 +151873,7 @@ _0804D63E: str r1, [r2] b _0804D804 .align 2, 0 -_0804D648: .4byte 0x02024280 -_0804D64C: .4byte 0x0202420d -_0804D650: .4byte 0x0832a328 -_0804D654: .4byte 0x0202406c + .pool _0804D658: movs r0, 0x80 ands r0, r1 @@ -157475,7 +151887,7 @@ _0804D664: bl get_battle_side_of_something lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _0804D68C + ldr r1, =0x0202437c lsls r0, r7, 2 adds r0, r7 lsls r0, 2 @@ -157489,7 +151901,7 @@ _0804D664: str r0, [r6] b _0804D804 .align 2, 0 -_0804D68C: .4byte 0x0202437c + .pool _0804D690: adds r0, r7, 0 movs r1, 0x6 @@ -157498,10 +151910,10 @@ _0804D690: lsls r0, 24 cmp r0, 0 beq _0804D6E0 - ldr r2, _0804D6D0 + ldr r2, =0x02024064 strb r7, [r2] - ldr r3, _0804D6D4 - ldr r4, _0804D6D8 + ldr r3, =0x02024210 + ldr r4, =0x0832a328 ldrb r0, [r2] lsls r0, 2 adds r0, r4 @@ -157509,7 +151921,7 @@ _0804D690: ldrb r1, [r3] orrs r0, r1 strb r0, [r3] - ldr r3, _0804D6DC + ldr r3, =0x02024280 ldrb r0, [r2] lsls r0, 2 adds r0, r4 @@ -157522,19 +151934,16 @@ _0804D690: str r0, [r6] b _0804D804 .align 2, 0 -_0804D6D0: .4byte 0x02024064 -_0804D6D4: .4byte 0x02024210 -_0804D6D8: .4byte 0x0832a328 -_0804D6DC: .4byte 0x02024280 + .pool _0804D6E0: - ldr r4, _0804D7A8 + ldr r4, =0x02024064 strb r7, [r4] ldrb r0, [r4] - ldr r3, _0804D7AC + ldr r3, =0x0202449c ldr r1, [r3] adds r1, r0, r1 adds r1, 0x58 - ldr r2, _0804D7B0 + ldr r2, =0x0202406e lsls r0, 1 adds r0, r2 ldrh r0, [r0] @@ -157547,7 +151956,7 @@ _0804D6E0: strb r1, [r0] ldr r1, [r3] adds r1, 0x93 - ldr r2, _0804D7B4 + ldr r2, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r2 @@ -157582,23 +151991,23 @@ _0804D6E0: lsls r0, 24 cmp r0, 0 bne _0804D760 - ldr r1, _0804D7B8 + ldr r1, =0x03005d10 ldrb r0, [r1, 0x2] cmp r0, 0xFE bhi _0804D760 adds r0, 0x1 strb r0, [r1, 0x2] _0804D760: - ldr r0, _0804D7BC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _0804D7C4 - ldr r1, _0804D7A8 + ldr r1, =0x02024064 movs r0, 0 strb r0, [r1] - ldr r0, _0804D7C0 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0 beq _0804D804 @@ -157617,7 +152026,7 @@ _0804D792: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _0804D7C0 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -157625,13 +152034,7 @@ _0804D792: bcc _0804D77C b _0804D804 .align 2, 0 -_0804D7A8: .4byte 0x02024064 -_0804D7AC: .4byte 0x0202449c -_0804D7B0: .4byte 0x0202406e -_0804D7B4: .4byte 0x0832a328 -_0804D7B8: .4byte 0x03005d10 -_0804D7BC: .4byte 0x02022fec -_0804D7C0: .4byte 0x0202406c + .pool _0804D7C4: adds r0, r7, 0 bl battle_get_per_side_status @@ -157640,11 +152043,11 @@ _0804D7C4: lsls r0, 24 lsrs r0, 24 bl battle_get_side_with_given_state - ldr r4, _0804D814 + ldr r4, =0x02024064 strb r0, [r4] - ldr r0, _0804D818 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _0804D81C + ldr r2, =0x0832a328 ldrb r3, [r4] lsls r0, r3, 2 adds r0, r2 @@ -157671,25 +152074,23 @@ _0804D804: pop {r0} bx r0 .align 2, 0 -_0804D814: .4byte 0x02024064 -_0804D818: .4byte 0x02024210 -_0804D81C: .4byte 0x0832a328 + .pool thumb_func_end atk50_openpartyscreen thumb_func_start atk51_cmd51 atk51_cmd51: @ 804D820 push {r4-r7,lr} - ldr r0, _0804D84C + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _0804D82C b _0804DA8A _0804D82C: - ldr r4, _0804D850 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r5, _0804D854 + ldr r5, =0x02024064 strb r0, [r5] ldr r0, [r4] ldrb r0, [r0, 0x2] @@ -157701,9 +152102,7 @@ _0804D82C: beq _0804D862 b _0804DA82 .align 2, 0 -_0804D84C: .4byte 0x02024068 -_0804D850: .4byte 0x02024214 -_0804D854: .4byte 0x02024064 + .pool _0804D858: cmp r0, 0x2 beq _0804D8E8 @@ -157712,18 +152111,18 @@ _0804D858: b _0804DA82 _0804D862: movs r6, 0 - ldr r0, _0804D8BC + ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 blt _0804D86E b _0804DA82 _0804D86E: - ldr r7, _0804D8C0 + ldr r7, =0x02023864 _0804D870: ldrb r0, [r7] cmp r0, 0x22 bne _0804D8AA - ldr r5, _0804D8C4 + ldr r5, =0x0202449c ldr r0, [r5] adds r0, r6, r0 adds r0, 0x5C @@ -157732,7 +152131,7 @@ _0804D870: ldr r0, [r5] adds r0, 0x93 ldrb r1, [r0] - ldr r2, _0804D8C8 + ldr r2, =0x0832a328 lsls r0, r6, 2 adds r0, r2 ldr r4, [r0] @@ -157753,18 +152152,15 @@ _0804D8AA: lsls r0, 2 adds r7, r0 adds r6, 0x1 - ldr r0, _0804D8BC + ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 blt _0804D870 b _0804DA82 .align 2, 0 -_0804D8BC: .4byte 0x0202406c -_0804D8C0: .4byte 0x02023864 -_0804D8C4: .4byte 0x0202449c -_0804D8C8: .4byte 0x0832a328 + .pool _0804D8CC: - ldr r0, _0804D8E4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -157776,13 +152172,13 @@ _0804D8DA: bl sub_803BDA0 b _0804DA82 .align 2, 0 -_0804D8E4: .4byte 0x02022fec + .pool _0804D8E8: - ldr r4, _0804D9FC + ldr r4, =0x0202449c ldr r0, [r4] adds r0, 0x93 ldrb r1, [r0] - ldr r6, _0804DA00 + ldr r6, =0x0832a328 ldrb r2, [r5] lsls r0, r2, 2 adds r0, r6 @@ -157790,7 +152186,7 @@ _0804D8E8: ands r1, r0 cmp r1, 0 bne _0804D922 - ldr r0, _0804DA04 + ldr r0, =0x02023864 lsls r1, r2, 9 adds r0, 0x1 adds r1, r0 @@ -157807,9 +152203,9 @@ _0804D8E8: orrs r0, r1 strb r0, [r2] _0804D922: - ldr r1, _0804DA08 - ldr r6, _0804DA04 - ldr r7, _0804DA0C + ldr r1, =0x02024332 + ldr r6, =0x02023864 + ldr r7, =0x02024064 ldrb r0, [r7] lsls r0, 9 adds r2, r6, 0x1 @@ -157817,7 +152213,7 @@ _0804D922: ldrb r0, [r0] strb r0, [r1] ldrb r0, [r7] - ldr r1, _0804D9FC + ldr r1, =0x0202449c mov r12, r1 ldr r1, [r1] adds r1, r0, r1 @@ -157826,7 +152222,7 @@ _0804D922: adds r0, r2 ldrb r0, [r0] strb r0, [r1] - ldr r0, _0804DA10 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x42 ands r0, r1 @@ -157916,12 +152312,7 @@ _0804D922: strb r0, [r1] b _0804DA36 .align 2, 0 -_0804D9FC: .4byte 0x0202449c -_0804DA00: .4byte 0x0832a328 -_0804DA04: .4byte 0x02023864 -_0804DA08: .4byte 0x02024332 -_0804DA0C: .4byte 0x02024064 -_0804DA10: .4byte 0x02022fec + .pool _0804DA14: movs r0, 0x80 lsls r0, 15 @@ -157940,13 +152331,13 @@ _0804DA30: ldrb r0, [r7] bl sub_803BDA0 _0804DA36: - ldr r1, _0804DA90 + ldr r1, =0x02022f58 movs r5, 0xFD strb r5, [r1] movs r0, 0x6 strb r0, [r1, 0x1] - ldr r4, _0804DA94 - ldr r3, _0804DA98 + ldr r4, =0x02024084 + ldr r3, =0x0202420b ldrb r0, [r3] movs r2, 0x58 muls r0, r2 @@ -157961,14 +152352,14 @@ _0804DA36: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r2, _0804DA9C + ldr r2, =0x02022f68 strb r5, [r2] movs r0, 0x7 strb r0, [r2, 0x1] - ldr r3, _0804DAA0 + ldr r3, =0x02024064 ldrb r0, [r3] strb r0, [r2, 0x2] - ldr r1, _0804DAA4 + ldr r1, =0x02023864 ldrb r0, [r3] lsls r0, 9 adds r1, 0x1 @@ -157979,7 +152370,7 @@ _0804DA36: negs r0, r0 strb r0, [r2, 0x4] _0804DA82: - ldr r1, _0804DAA8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x3 str r0, [r1] @@ -157988,13 +152379,7 @@ _0804DA8A: pop {r0} bx r0 .align 2, 0 -_0804DA90: .4byte 0x02022f58 -_0804DA94: .4byte 0x02024084 -_0804DA98: .4byte 0x0202420b -_0804DA9C: .4byte 0x02022f68 -_0804DAA0: .4byte 0x02024064 -_0804DAA4: .4byte 0x02023864 -_0804DAA8: .4byte 0x02024214 + .pool thumb_func_end atk51_cmd51 thumb_func_start atk52_cmd52 @@ -158005,18 +152390,18 @@ atk52_cmd52: @ 804DAAC mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r0, _0804DBE4 + ldr r0, =0x02024214 mov r9, r0 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, _0804DBE8 + ldr r4, =0x02024064 strb r0, [r4] ldrb r0, [r4] bl sub_803FA70 - ldr r1, _0804DBEC + ldr r1, =0x02024280 mov r8, r1 - ldr r1, _0804DBF0 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -158026,7 +152411,7 @@ atk52_cmd52: @ 804DAAC ldr r0, [r2] bics r0, r1 str r0, [r2] - ldr r2, _0804DBF4 + ldr r2, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 adds r1, r0 @@ -158039,7 +152424,7 @@ atk52_cmd52: @ 804DAAC strb r0, [r1] ldrb r0, [r4] bl battle_side_get_owner - ldr r5, _0804DBF8 + ldr r5, =0x0202428e lsls r0, 24 lsrs r0, 23 adds r0, r5 @@ -158065,7 +152450,7 @@ _0804DB1C: bne _0804DB34 b _0804DC30 _0804DB34: - ldr r7, _0804DBFC + ldr r7, =0x02024084 ldrb r2, [r4] movs r6, 0x58 adds r0, r2, 0 @@ -158102,7 +152487,7 @@ _0804DB34: adds r0, 0x50 adds r2, r0 ldr r0, [r2] - ldr r1, _0804DC00 + ldr r1, =0xfdffffff ands r0, r1 str r0, [r2] mov r1, r8 @@ -158113,7 +152498,7 @@ _0804DB34: str r0, [r1] ldrb r0, [r4] bl battle_side_get_owner - ldr r2, _0804DC04 + ldr r2, =0x02024294 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -158125,7 +152510,7 @@ _0804DB34: subs r1, r0 lsls r1, 25 lsrs r1, 24 - ldr r5, _0804DC08 + ldr r5, =0x020241f0 ldrb r0, [r4] muls r0, r6 adds r0, r7 @@ -158137,7 +152522,7 @@ _0804DB34: movs r0, 0x1 str r0, [r5] _0804DBC8: - ldr r0, _0804DC0C + ldr r0, =0x02024474 ldrb r1, [r4] strb r1, [r0, 0x17] bl b_movescr_stack_push_cursor @@ -158146,41 +152531,30 @@ _0804DBC8: ldrb r0, [r0, 0x1] cmp r0, 0 bne _0804DC14 - ldr r0, _0804DC10 + ldr r0, =0x082dae90 str r0, [r7] b _0804DD8E .align 2, 0 -_0804DBE4: .4byte 0x02024214 -_0804DBE8: .4byte 0x02024064 -_0804DBEC: .4byte 0x02024280 -_0804DBF0: .4byte 0x0832a328 -_0804DBF4: .4byte 0x0202437c -_0804DBF8: .4byte 0x0202428e -_0804DBFC: .4byte 0x02024084 -_0804DC00: .4byte 0xfdffffff -_0804DC04: .4byte 0x02024294 -_0804DC08: .4byte 0x020241f0 -_0804DC0C: .4byte 0x02024474 -_0804DC10: .4byte 0x082dae90 + .pool _0804DC14: cmp r0, 0x1 bne _0804DC24 - ldr r0, _0804DC20 + ldr r0, =0x082dae59 mov r1, r9 str r0, [r1] b _0804DD8E .align 2, 0 -_0804DC20: .4byte 0x082dae59 + .pool _0804DC24: - ldr r0, _0804DC2C + ldr r0, =0x082daec7 mov r2, r9 str r0, [r2] b _0804DD8E .align 2, 0 -_0804DC2C: .4byte 0x082daec7 + .pool _0804DC30: - ldr r2, _0804DD2C - ldr r1, _0804DD30 + ldr r2, =0x02024084 + ldr r1, =0x02024064 ldrb r3, [r1] movs r0, 0x58 muls r0, r3 @@ -158188,7 +152562,7 @@ _0804DC30: adds r0, 0x20 ldrb r0, [r0] adds r5, r1, 0 - ldr r4, _0804DD34 + ldr r4, =0x020242bc cmp r0, 0x36 bne _0804DC5E lsls r0, r3, 3 @@ -158233,22 +152607,22 @@ _0804DC88: bne _0804DD8E ldrb r0, [r5] bl battle_side_get_owner - ldr r1, _0804DD38 + ldr r1, =0x0202428e lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r2, [r0] - ldr r1, _0804DD3C + ldr r1, =0x0000fdff ands r1, r2 strh r1, [r0] movs r4, 0 - ldr r0, _0804DD40 + ldr r0, =0x0202406c ldrb r7, [r0] cmp r4, r7 bge _0804DCD8 - ldr r6, _0804DD44 + ldr r6, =0x0202407e adds r1, r5, 0 - ldr r5, _0804DD48 + ldr r5, =0x0202407a movs r3, 0xC adds r2, r0, 0 _0804DCC2: @@ -158266,12 +152640,12 @@ _0804DCD0: blt _0804DCC2 _0804DCD8: movs r4, 0 - ldr r0, _0804DD40 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 bge _0804DD0C - ldr r6, _0804DD4C - ldr r5, _0804DD2C + ldr r6, =0x0202449c + ldr r5, =0x02024084 _0804DCE6: lsls r0, r4, 24 lsrs r0, 24 @@ -158287,42 +152661,30 @@ _0804DCE6: ldrh r0, [r0, 0x28] strh r0, [r1] adds r4, 0x1 - ldr r0, _0804DD40 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _0804DCE6 _0804DD0C: - ldr r0, _0804DD50 + ldr r0, =0x02024214 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x5 bne _0804DD88 - ldr r0, _0804DD54 + ldr r0, =0x02024280 ldr r0, [r0] lsrs r4, r0, 28 - ldr r1, _0804DD58 + ldr r1, =0x0202420d ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r2, _0804DD5C + ldr r2, =0x0832a328 b _0804DD6E .align 2, 0 -_0804DD2C: .4byte 0x02024084 -_0804DD30: .4byte 0x02024064 -_0804DD34: .4byte 0x020242bc -_0804DD38: .4byte 0x0202428e -_0804DD3C: .4byte 0x0000fdff -_0804DD40: .4byte 0x0202406c -_0804DD44: .4byte 0x0202407e -_0804DD48: .4byte 0x0202407a -_0804DD4C: .4byte 0x0202449c -_0804DD50: .4byte 0x02024214 -_0804DD54: .4byte 0x02024280 -_0804DD58: .4byte 0x0202420d -_0804DD5C: .4byte 0x0832a328 + .pool _0804DD60: - ldr r0, _0804DDA0 + ldr r0, =0x0202406c ldrb r3, [r1] ldrb r0, [r0] cmp r3, r0 @@ -158338,7 +152700,7 @@ _0804DD6E: ands r0, r3 cmp r0, 0 beq _0804DD60 - ldr r0, _0804DDA4 + ldr r0, =0x02024210 ldrb r0, [r0] ands r0, r3 cmp r0, 0 @@ -158357,18 +152719,17 @@ _0804DD8E: pop {r0} bx r0 .align 2, 0 -_0804DDA0: .4byte 0x0202406c -_0804DDA4: .4byte 0x02024210 + .pool thumb_func_end atk52_cmd52 thumb_func_start sub_804DDA8 sub_804DDA8: @ 804DDA8 push {r4,r5,lr} - ldr r5, _0804DDD0 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl battle_get_side_with_given_state - ldr r4, _0804DDD4 + ldr r4, =0x02024064 strb r0, [r4] movs r0, 0 bl dp01_build_cmdbuf_x08_8_8_8 @@ -158381,18 +152742,17 @@ sub_804DDA8: @ 804DDA8 pop {r0} bx r0 .align 2, 0 -_0804DDD0: .4byte 0x02024214 -_0804DDD4: .4byte 0x02024064 + .pool thumb_func_end sub_804DDA8 thumb_func_start atk54_802511C atk54_802511C: @ 804DDD8 push {r4,r5,lr} - ldr r5, _0804DE08 - ldr r0, _0804DE0C + ldr r5, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r5] - ldr r4, _0804DE10 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -158409,19 +152769,17 @@ atk54_802511C: @ 804DDD8 pop {r0} bx r0 .align 2, 0 -_0804DE08: .4byte 0x02024064 -_0804DE0C: .4byte 0x0202420b -_0804DE10: .4byte 0x02024214 + .pool thumb_func_end atk54_802511C thumb_func_start sub_804DE14 sub_804DE14: @ 804DE14 push {r4,r5,lr} - ldr r5, _0804DE44 - ldr r0, _0804DE48 + ldr r5, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r5] - ldr r4, _0804DE4C + ldr r4, =0x02024214 ldr r0, [r4] ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -158439,19 +152797,17 @@ sub_804DE14: @ 804DE14 pop {r0} bx r0 .align 2, 0 -_0804DE44: .4byte 0x02024064 -_0804DE48: .4byte 0x0202420b -_0804DE4C: .4byte 0x02024214 + .pool thumb_func_end sub_804DE14 thumb_func_start atk56_8025194 atk56_8025194: @ 804DE50 push {r4,r5,lr} - ldr r5, _0804DE78 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, _0804DE7C + ldr r4, =0x02024064 strb r0, [r4] movs r0, 0 bl dp01_build_cmdbuf_x2D_2D_2D_2D @@ -158464,8 +152820,7 @@ atk56_8025194: @ 804DE50 pop {r0} bx r0 .align 2, 0 -_0804DE78: .4byte 0x02024214 -_0804DE7C: .4byte 0x02024064 + .pool thumb_func_end atk56_8025194 thumb_func_start atk57_80251C4_flee @@ -158473,15 +152828,15 @@ atk57_80251C4_flee: @ 804DE80 push {r4,lr} movs r0, 0 bl battle_get_side_with_given_state - ldr r4, _0804DEAC + ldr r4, =0x02024064 strb r0, [r4] - ldr r0, _0804DEB0 + ldr r0, =0x0202433a ldrb r1, [r0] movs r0, 0 bl dp01_build_cmdbuf_x37_a ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0804DEB4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -158489,19 +152844,17 @@ atk57_80251C4_flee: @ 804DE80 pop {r0} bx r0 .align 2, 0 -_0804DEAC: .4byte 0x02024064 -_0804DEB0: .4byte 0x0202433a -_0804DEB4: .4byte 0x02024214 + .pool thumb_func_end atk57_80251C4_flee thumb_func_start atk58_cmd58 atk58_cmd58: @ 804DEB8 push {r4,r5,lr} - ldr r5, _0804DEE4 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, _0804DEE8 + ldr r4, =0x02024064 strb r0, [r4] movs r0, 0 movs r1, 0x1 @@ -158515,14 +152868,13 @@ atk58_cmd58: @ 804DEB8 pop {r0} bx r0 .align 2, 0 -_0804DEE4: .4byte 0x02024214 -_0804DEE8: .4byte 0x02024064 + .pool thumb_func_end atk58_cmd58 thumb_func_start atk59_8025230 atk59_8025230: @ 804DEEC push {r4-r7,lr} - ldr r0, _0804DF60 + ldr r0, =0x02024214 ldr r2, [r0] ldrb r6, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -158544,28 +152896,28 @@ atk59_8025230: @ 804DEEC ldrb r0, [r2, 0x8] lsls r0, 24 orrs r4, r0 - ldr r0, _0804DF64 + ldr r0, =0x0202449c ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _0804DF68 + ldr r1, =0x020244ec adds r0, r1 ldrb r1, [r2, 0x9] bl sub_8069318 lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _0804DF6C + ldr r0, =0x0000fffe cmp r5, r0 bne _0804DF56 adds r7, r5, 0 _0804DF3A: - ldr r0, _0804DF64 + ldr r0, =0x0202449c ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _0804DF68 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0 bl sub_8069318 @@ -158576,42 +152928,38 @@ _0804DF3A: _0804DF56: cmp r5, 0 bne _0804DF70 - ldr r0, _0804DF60 + ldr r0, =0x02024214 str r4, [r0] b _0804E018 .align 2, 0 -_0804DF60: .4byte 0x02024214 -_0804DF64: .4byte 0x0202449c -_0804DF68: .4byte 0x020244ec -_0804DF6C: .4byte 0x0000fffe + .pool _0804DF70: - ldr r0, _0804DF80 + ldr r0, =0x0000ffff cmp r5, r0 bne _0804DF88 - ldr r1, _0804DF84 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0xA str r0, [r1] b _0804E018 .align 2, 0 -_0804DF80: .4byte 0x0000ffff -_0804DF84: .4byte 0x02024214 + .pool _0804DF88: movs r0, 0 bl battle_get_side_with_given_state - ldr r1, _0804E020 + ldr r1, =0x02024064 strb r0, [r1] - ldr r2, _0804E024 + ldr r2, =0x0202406e ldrb r3, [r1] lsls r0, r3, 1 adds r0, r2 - ldr r1, _0804E028 + ldr r1, =0x0202449c ldr r1, [r1] ldrh r0, [r0] ldrb r1, [r1, 0x10] cmp r0, r1 bne _0804DFC8 - ldr r4, _0804E02C + ldr r4, =0x02024084 movs r0, 0x58 adds r2, r3, 0 muls r2, r0 @@ -158628,7 +152976,7 @@ _0804DF88: adds r1, r5, 0 bl sub_80691B0 _0804DFC8: - ldr r0, _0804E030 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -158636,19 +152984,19 @@ _0804DFC8: beq _0804E014 movs r0, 0x2 bl battle_get_side_with_given_state - ldr r1, _0804E020 + ldr r1, =0x02024064 strb r0, [r1] - ldr r2, _0804E024 + ldr r2, =0x0202406e ldrb r3, [r1] lsls r0, r3, 1 adds r0, r2 - ldr r1, _0804E028 + ldr r1, =0x0202449c ldr r1, [r1] ldrh r0, [r0] ldrb r1, [r1, 0x10] cmp r0, r1 bne _0804E014 - ldr r4, _0804E02C + ldr r4, =0x02024084 movs r0, 0x58 adds r2, r3, 0 muls r2, r0 @@ -158665,19 +153013,14 @@ _0804DFC8: adds r1, r5, 0 bl sub_80691B0 _0804E014: - ldr r0, _0804E034 + ldr r0, =0x02024214 str r6, [r0] _0804E018: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0804E020: .4byte 0x02024064 -_0804E024: .4byte 0x0202406e -_0804E028: .4byte 0x0202449c -_0804E02C: .4byte 0x02024084 -_0804E030: .4byte 0x02022fec -_0804E034: .4byte 0x02024214 + .pool thumb_func_end atk59_8025230 thumb_func_start sub_804E038 @@ -158686,10 +153029,10 @@ sub_804E038: @ 804E038 mov r7, r8 push {r7} sub sp, 0x4 - ldr r0, _0804E05C + ldr r0, =0x02024064 movs r1, 0 strb r1, [r0] - ldr r0, _0804E060 + ldr r0, =0x02024474 ldrb r1, [r0, 0x1F] adds r2, r0, 0 cmp r1, 0x6 @@ -158697,14 +153040,12 @@ sub_804E038: @ 804E038 b _0804E3B8 _0804E052: lsls r0, r1, 2 - ldr r1, _0804E064 + ldr r1, =_0804E068 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804E05C: .4byte 0x02024064 -_0804E060: .4byte 0x02024474 -_0804E064: .4byte _0804E068 + .pool .align 2, 0 _0804E068: .4byte _0804E084 @@ -158722,30 +153063,28 @@ _0804E084: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, _0804E0B0 + ldr r0, =0x085ccabb movs r1, 0xC bl battle_show_message_maybe - ldr r1, _0804E0B4 + ldr r1, =0x02024474 ldrb r0, [r1, 0x1F] adds r0, 0x1 strb r0, [r1, 0x1F] - ldr r0, _0804E0B8 + ldr r0, =0x02024332 strb r4, [r0, 0x1] movs r0, 0 bl sub_8056B74 b _0804E3B8 .align 2, 0 -_0804E0B0: .4byte 0x085ccabb -_0804E0B4: .4byte 0x02024474 -_0804E0B8: .4byte 0x02024332 + .pool _0804E0BC: - ldr r0, _0804E148 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _0804E0E4 - ldr r4, _0804E14C + ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 beq _0804E0E4 @@ -158757,13 +153096,13 @@ _0804E0BC: strb r0, [r4, 0x1] bl sub_8056B74 _0804E0E4: - ldr r0, _0804E148 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0804E10C - ldr r4, _0804E14C + ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 bne _0804E10C @@ -158775,7 +153114,7 @@ _0804E0E4: strb r0, [r4, 0x1] bl sub_8056B74 _0804E10C: - ldr r0, _0804E148 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r5, 0x1 adds r0, r5, 0 @@ -158784,7 +153123,7 @@ _0804E10C: beq _0804E150 movs r0, 0x5 bl audio_play - ldr r0, _0804E14C + ldr r0, =0x02024332 ldrb r4, [r0, 0x1] cmp r4, 0 bne _0804E20A @@ -158803,8 +153142,7 @@ _0804E10C: bl sub_80A1AD4 b _0804E192 .align 2, 0 -_0804E148: .4byte 0x030022c0 -_0804E14C: .4byte 0x02024332 + .pool _0804E150: movs r0, 0x2 ands r0, r1 @@ -158816,7 +153154,7 @@ _0804E15A: bl audio_play b _0804E20A _0804E162: - ldr r0, _0804E19C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -158825,36 +153163,30 @@ _0804E162: b _0804E3B8 _0804E170: bl Window_FreeMemory - ldr r0, _0804E1A0 - ldr r1, _0804E1A4 + ldr r0, =0x020244ec + ldr r1, =0x0202449c ldr r1, [r1] ldrb r1, [r1, 0x10] - ldr r2, _0804E1A8 + ldr r2, =0x020244e9 ldrb r2, [r2] subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, _0804E1AC - ldr r4, _0804E1B0 + ldr r3, =sub_80A92F8 + 1 + ldr r4, =0x020244e2 ldrh r4, [r4] str r4, [sp] bl sub_81BFA38 _0804E192: - ldr r1, _0804E1B4 + ldr r1, =0x02024474 ldrb r0, [r1, 0x1F] adds r0, 0x1 strb r0, [r1, 0x1F] b _0804E3B8 .align 2, 0 -_0804E19C: .4byte 0x02037fd4 -_0804E1A0: .4byte 0x020244ec -_0804E1A4: .4byte 0x0202449c -_0804E1A8: .4byte 0x020244e9 -_0804E1AC: .4byte sub_80A92F8 + 1 -_0804E1B0: .4byte 0x020244e2 -_0804E1B4: .4byte 0x02024474 + .pool _0804E1B8: - ldr r0, _0804E1D8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -158862,9 +153194,9 @@ _0804E1B8: beq _0804E1C6 b _0804E3B8 _0804E1C6: - ldr r0, _0804E1DC + ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, _0804E1E0 + ldr r0, =sub_8038420 + 1 cmp r1, r0 beq _0804E1D2 b _0804E3B8 @@ -158873,11 +153205,9 @@ _0804E1D2: adds r0, 0x1 b _0804E3B6 .align 2, 0 -_0804E1D8: .4byte 0x02037fd4 -_0804E1DC: .4byte 0x030022c0 -_0804E1E0: .4byte sub_8038420 + 1 + .pool _0804E1E4: - ldr r0, _0804E214 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -158885,9 +153215,9 @@ _0804E1E4: beq _0804E1F2 b _0804E3B8 _0804E1F2: - ldr r0, _0804E218 + ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, _0804E21C + ldr r0, =sub_8038420 + 1 cmp r1, r0 beq _0804E1FE b _0804E3B8 @@ -158898,17 +153228,14 @@ _0804E1FE: cmp r5, 0x4 bne _0804E224 _0804E20A: - ldr r1, _0804E220 + ldr r1, =0x02024474 movs r0, 0x5 strb r0, [r1, 0x1F] b _0804E3B8 .align 2, 0 -_0804E214: .4byte 0x02037fd4 -_0804E218: .4byte 0x030022c0 -_0804E21C: .4byte sub_8038420 + 1 -_0804E220: .4byte 0x02024474 + .pool _0804E224: - ldr r6, _0804E260 + ldr r6, =0x0202449c ldr r0, [r6] ldrb r0, [r0, 0x10] movs r1, 0x64 @@ -158916,7 +153243,7 @@ _0804E224: mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r7, _0804E264 + ldr r7, =0x020244ec adds r0, r7 adds r1, r5, 0 adds r1, 0xD @@ -158927,22 +153254,18 @@ _0804E224: bl sub_806E804 cmp r0, 0 beq _0804E274 - ldr r0, _0804E268 - ldr r1, _0804E26C + ldr r0, =0x0000013f + ldr r1, =0x02024064 ldrb r1, [r1] bl b_std_message - ldr r1, _0804E270 + ldr r1, =0x02024474 movs r0, 0x6 strb r0, [r1, 0x1F] b _0804E3B8 .align 2, 0 -_0804E260: .4byte 0x0202449c -_0804E264: .4byte 0x020244ec -_0804E268: .4byte 0x0000013f -_0804E26C: .4byte 0x02024064 -_0804E270: .4byte 0x02024474 + .pool _0804E274: - ldr r3, _0804E368 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -158955,7 +153278,7 @@ _0804E274: lsls r0, 24 orrs r1, r0 str r1, [r3] - ldr r1, _0804E36C + ldr r1, =0x02022f68 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -158979,27 +153302,27 @@ _0804E274: muls r1, r0 adds r0, r1, 0 adds r0, r7 - ldr r7, _0804E370 + ldr r7, =0x020244e2 ldrh r1, [r7] adds r2, r5, 0 bl sub_80691F4 - ldr r0, _0804E374 + ldr r0, =0x0202406e ldr r1, [r6] ldrh r0, [r0] ldrb r1, [r1, 0x10] cmp r0, r1 bne _0804E30A - ldr r4, _0804E378 + ldr r4, =0x02024084 ldr r0, [r4, 0x50] movs r1, 0x80 lsls r1, 14 ands r0, r1 cmp r0, 0 bne _0804E30A - ldr r0, _0804E37C + ldr r0, =0x020242bc ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _0804E380 + ldr r2, =0x0832a328 lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -159014,20 +153337,20 @@ _0804E274: adds r2, r5, 0 bl sub_8069234 _0804E30A: - ldr r0, _0804E384 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0804E3B8 - ldr r2, _0804E374 - ldr r0, _0804E388 + ldr r2, =0x0202406e + ldr r0, =0x0202449c ldr r1, [r0] ldrh r0, [r2, 0x4] ldrb r1, [r1, 0x10] cmp r0, r1 bne _0804E3B8 - ldr r4, _0804E378 + ldr r4, =0x02024084 movs r1, 0x80 lsls r1, 1 adds r0, r4, r1 @@ -159037,11 +153360,11 @@ _0804E30A: ands r0, r1 cmp r0, 0 bne _0804E3B8 - ldr r0, _0804E37C + ldr r0, =0x020242bc adds r0, 0x50 ldrb r1, [r0] lsrs r1, 4 - ldr r2, _0804E380 + ldr r2, =0x0832a328 lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -159052,22 +153375,14 @@ _0804E30A: adds r0, r4, 0 adds r1, r5, 0 bl sub_806B9E4 - ldr r0, _0804E370 + ldr r0, =0x020244e2 ldrh r1, [r0] adds r0, r4, 0 adds r2, r5, 0 bl sub_8069234 b _0804E3B8 .align 2, 0 -_0804E368: .4byte 0x02024214 -_0804E36C: .4byte 0x02022f68 -_0804E370: .4byte 0x020244e2 -_0804E374: .4byte 0x0202406e -_0804E378: .4byte 0x02024084 -_0804E37C: .4byte 0x020242bc -_0804E380: .4byte 0x0832a328 -_0804E384: .4byte 0x02022fec -_0804E388: .4byte 0x0202449c + .pool _0804E38C: movs r0, 0x1 str r0, [sp] @@ -159076,15 +153391,15 @@ _0804E38C: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r1, _0804E3A8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0804E3B8 .align 2, 0 -_0804E3A8: .4byte 0x02024214 + .pool _0804E3AC: - ldr r0, _0804E3C4 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0804E3B8 @@ -159099,14 +153414,14 @@ _0804E3B8: pop {r0} bx r0 .align 2, 0 -_0804E3C4: .4byte 0x02024068 + .pool thumb_func_end sub_804E038 thumb_func_start atk5B_80256E0 atk5B_80256E0: @ 804E3C8 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _0804E3DC + ldr r5, =0x02024474 ldrb r4, [r5, 0x1F] cmp r4, 0 beq _0804E3E0 @@ -159114,7 +153429,7 @@ atk5B_80256E0: @ 804E3C8 beq _0804E410 b _0804E4FA .align 2, 0 -_0804E3DC: .4byte 0x02024474 + .pool _0804E3E0: str r4, [sp] movs r0, 0x18 @@ -159122,28 +153437,27 @@ _0804E3E0: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, _0804E408 + ldr r0, =0x085ccabb movs r1, 0xC bl battle_show_message_maybe ldrb r0, [r5, 0x1F] adds r0, 0x1 strb r0, [r5, 0x1F] - ldr r0, _0804E40C + ldr r0, =0x02024332 strb r4, [r0, 0x1] movs r0, 0 bl sub_8056B74 b _0804E4FA .align 2, 0 -_0804E408: .4byte 0x085ccabb -_0804E40C: .4byte 0x02024332 + .pool _0804E410: - ldr r0, _0804E498 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _0804E438 - ldr r4, _0804E49C + ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 beq _0804E438 @@ -159155,13 +153469,13 @@ _0804E410: strb r0, [r4, 0x1] bl sub_8056B74 _0804E438: - ldr r0, _0804E498 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0804E460 - ldr r4, _0804E49C + ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 bne _0804E460 @@ -159173,7 +153487,7 @@ _0804E438: strb r0, [r4, 0x1] bl sub_8056B74 _0804E460: - ldr r0, _0804E498 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r4, 0x1 adds r0, r4, 0 @@ -159182,11 +153496,11 @@ _0804E460: beq _0804E4C4 movs r0, 0x5 bl audio_play - ldr r0, _0804E49C + ldr r0, =0x02024332 ldrb r0, [r0, 0x1] cmp r0, 0 beq _0804E4A4 - ldr r3, _0804E4A0 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -159201,11 +153515,9 @@ _0804E460: str r1, [r3] b _0804E4AC .align 2, 0 -_0804E498: .4byte 0x030022c0 -_0804E49C: .4byte 0x02024332 -_0804E4A0: .4byte 0x02024214 + .pool _0804E4A4: - ldr r1, _0804E4C0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -159219,7 +153531,7 @@ _0804E4AC: bl sub_8056A3C b _0804E4FA .align 2, 0 -_0804E4C0: .4byte 0x02024214 + .pool _0804E4C4: movs r0, 0x2 ands r0, r1 @@ -159227,7 +153539,7 @@ _0804E4C4: beq _0804E4FA movs r0, 0x5 bl audio_play - ldr r3, _0804E504 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -159252,32 +153564,32 @@ _0804E4FA: pop {r0} bx r0 .align 2, 0 -_0804E504: .4byte 0x02024214 + .pool thumb_func_end atk5B_80256E0 thumb_func_start atk5C_cmd5c atk5C_cmd5c: @ 804E508 push {r4,lr} - ldr r4, _0804E574 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r2, _0804E578 + ldr r2, =0x02024064 strb r0, [r2] - ldr r0, _0804E57C + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 bne _0804E58C - ldr r0, _0804E580 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 1 ands r0, r1 cmp r0, 0 beq _0804E55A - ldr r1, _0804E584 + ldr r1, =0x02024084 ldrb r2, [r2] movs r0, 0x58 muls r0, r2 @@ -159289,7 +153601,7 @@ atk5C_cmd5c: @ 804E508 ands r0, r1 cmp r0, 0 beq _0804E55A - ldr r0, _0804E588 + ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -159300,21 +153612,16 @@ atk5C_cmd5c: @ 804E508 _0804E55A: movs r0, 0 bl dp01_build_cmdbuf_x29_29_29_29 - ldr r0, _0804E578 + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0804E574 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] b _0804E592 .align 2, 0 -_0804E574: .4byte 0x02024214 -_0804E578: .4byte 0x02024064 -_0804E57C: .4byte 0x0202427c -_0804E580: .4byte 0x02024280 -_0804E584: .4byte 0x02024084 -_0804E588: .4byte 0x020242bc + .pool _0804E58C: ldr r0, [r4] adds r0, 0x2 @@ -159340,12 +153647,12 @@ sub_804E598: @ 804E598 lsls r0, 3 cmp r6, r0 bne _0804E5D8 - ldr r0, _0804E5D0 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0] adds r0, 0x94 ldrb r2, [r0] - ldr r0, _0804E5D4 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x4A ldrb r1, [r0] @@ -159355,10 +153662,9 @@ sub_804E598: @ 804E598 muls r0, r2 b _0804E6CA .align 2, 0 -_0804E5D0: .4byte 0x020244a8 -_0804E5D4: .4byte 0x0202449c + .pool _0804E5D8: - ldr r0, _0804E5F4 + ldr r0, =0x08310030 lsls r2, r6, 2 adds r1, r2, r6 lsls r1, 3 @@ -159373,7 +153679,7 @@ _0804E5D8: beq _0804E602 b _0804E644 .align 2, 0 -_0804E5F4: .4byte 0x08310030 + .pool _0804E5F8: cmp r3, 0x2 beq _0804E618 @@ -159418,14 +153724,14 @@ _0804E62E: _0804E642: ldrb r5, [r0, 0x2] _0804E644: - ldr r1, _0804E6A8 + ldr r1, =0x0831aeb8 lsls r0, r7, 2 adds r4, r0, r1 ldrb r3, [r4] - ldr r0, _0804E6AC + ldr r0, =0x0202449c mov r8, r0 mov r9, r1 - ldr r1, _0804E6B0 + ldr r1, =0x02022fec mov r10, r1 cmp r3, 0xFF beq _0804E67A @@ -159471,9 +153777,7 @@ _0804E67A: lsls r0, 1 b _0804E6C8 .align 2, 0 -_0804E6A8: .4byte 0x0831aeb8 -_0804E6AC: .4byte 0x0202449c -_0804E6B0: .4byte 0x02022fec + .pool _0804E6B4: mov r1, r8 ldr r0, [r1] @@ -159500,30 +153804,30 @@ _0804E6CA: thumb_func_start sub_804E6D8 sub_804E6D8: @ 804E6D8 push {r4,lr} - ldr r0, _0804E74C + ldr r0, =0x02038bca ldrh r0, [r0] bl sub_804E598 adds r4, r0, 0 - ldr r0, _0804E750 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 8 ands r0, r1 cmp r0, 0 beq _0804E6FC - ldr r0, _0804E754 + ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_804E598 adds r4, r0 _0804E6FC: - ldr r0, _0804E758 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 adds r0, r1 adds r1, r4, 0 bl add_money - ldr r1, _0804E75C + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x1 @@ -159547,7 +153851,7 @@ _0804E6FC: strb r0, [r1, 0x7] movs r0, 0xFF strb r0, [r1, 0x8] - ldr r1, _0804E760 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -159555,12 +153859,7 @@ _0804E6FC: pop {r0} bx r0 .align 2, 0 -_0804E74C: .4byte 0x02038bca -_0804E750: .4byte 0x02022fec -_0804E754: .4byte 0x02038bcc -_0804E758: .4byte 0x03005d8c -_0804E75C: .4byte 0x02022f58 -_0804E760: .4byte 0x02024214 + .pool thumb_func_end sub_804E6D8 thumb_func_start atk5E_8025A70 @@ -159568,13 +153867,13 @@ atk5E_8025A70: @ 804E764 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _0804E788 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r6, _0804E78C + ldr r6, =0x02024064 strb r0, [r6] - ldr r5, _0804E790 + ldr r5, =0x02024332 ldrb r0, [r5] mov r8, r4 cmp r0, 0 @@ -159583,9 +153882,7 @@ atk5E_8025A70: @ 804E764 beq _0804E7AC b _0804E800 .align 2, 0 -_0804E788: .4byte 0x02024214 -_0804E78C: .4byte 0x02024064 -_0804E790: .4byte 0x02024332 + .pool _0804E794: movs r0, 0 movs r1, 0 @@ -159598,19 +153895,19 @@ _0804E794: strb r0, [r5] b _0804E800 _0804E7AC: - ldr r0, _0804E80C + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0804E800 ldrb r0, [r6] lsls r0, 9 - ldr r1, _0804E810 + ldr r1, =0x02023868 adds r0, r1 mov r12, r0 movs r2, 0 adds r4, r6, 0 movs r5, 0x58 - ldr r6, _0804E814 + ldr r6, =0x020240a8 adds r7, r6, 0 subs r7, 0x18 mov r3, r12 @@ -159648,23 +153945,21 @@ _0804E800: pop {r0} bx r0 .align 2, 0 -_0804E80C: .4byte 0x02024068 -_0804E810: .4byte 0x02023868 -_0804E814: .4byte 0x020240a8 + .pool thumb_func_end atk5E_8025A70 thumb_func_start atk5F_8025B24 atk5F_8025B24: @ 804E818 push {lr} - ldr r0, _0804E840 - ldr r2, _0804E844 + ldr r0, =0x02024064 + ldr r2, =0x0202420b ldrb r3, [r2] strb r3, [r0] - ldr r1, _0804E848 + ldr r1, =0x0202420c ldrb r0, [r1] strb r0, [r2] strb r3, [r1] - ldr r2, _0804E84C + ldr r2, =0x02024280 ldr r1, [r2] movs r3, 0x80 lsls r3, 5 @@ -159672,52 +153967,47 @@ atk5F_8025B24: @ 804E818 ands r0, r3 cmp r0, 0 beq _0804E854 - ldr r0, _0804E850 + ldr r0, =0xffffefff ands r1, r0 b _0804E856 .align 2, 0 -_0804E840: .4byte 0x02024064 -_0804E844: .4byte 0x0202420b -_0804E848: .4byte 0x0202420c -_0804E84C: .4byte 0x02024280 -_0804E850: .4byte 0xffffefff + .pool _0804E854: orrs r1, r3 _0804E856: str r1, [r2] - ldr r1, _0804E864 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0804E864: .4byte 0x02024214 + .pool thumb_func_end atk5F_8025B24 thumb_func_start atk60_cmd60 atk60_cmd60: @ 804E868 push {lr} - ldr r0, _0804E890 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0804E882 - ldr r0, _0804E894 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl sav12_xor_increment _0804E882: - ldr r1, _0804E894 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0804E890: .4byte 0x0202420b -_0804E894: .4byte 0x02024214 + .pool thumb_func_end atk60_cmd60 thumb_func_start atk61_8025BA4 @@ -159726,24 +154016,24 @@ atk61_8025BA4: @ 804E898 mov r7, r8 push {r7} sub sp, 0x30 - ldr r0, _0804E8FC + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0804E94C - ldr r0, _0804E900 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, _0804E904 + ldr r1, =0x02024064 strb r0, [r1] ldrb r0, [r1] bl battle_side_get_owner lsls r0, 24 - ldr r1, _0804E908 + ldr r1, =0x02024744 mov r8, r1 cmp r0, 0 bne _0804E8CA - ldr r0, _0804E90C + ldr r0, =0x020244ec mov r8, r0 _0804E8CA: movs r7, 0 @@ -159767,17 +154057,12 @@ _0804E8D0: cmp r0, r1 bne _0804E914 _0804E8F4: - ldr r0, _0804E910 + ldr r0, =0x0000ffff strh r0, [r5] movs r0, 0 b _0804E926 .align 2, 0 -_0804E8FC: .4byte 0x02024068 -_0804E900: .4byte 0x02024214 -_0804E904: .4byte 0x02024064 -_0804E908: .4byte 0x02024744 -_0804E90C: .4byte 0x020244ec -_0804E910: .4byte 0x0000ffff + .pool _0804E914: adds r0, r4, 0 movs r1, 0x39 @@ -159797,10 +154082,10 @@ _0804E926: mov r1, sp movs r2, 0x1 bl dp01_build_cmdbuf_x30_TODO - ldr r0, _0804E958 + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0804E95C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -159812,18 +154097,17 @@ _0804E94C: pop {r0} bx r0 .align 2, 0 -_0804E958: .4byte 0x02024064 -_0804E95C: .4byte 0x02024214 + .pool thumb_func_end atk61_8025BA4 thumb_func_start atk62_08025C6C atk62_08025C6C: @ 804E960 push {r4,r5,lr} - ldr r5, _0804E988 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, _0804E98C + ldr r4, =0x02024064 strb r0, [r4] movs r0, 0 bl dp01_build_cmdbuf_x31_31_31_31 @@ -159836,39 +154120,36 @@ atk62_08025C6C: @ 804E960 pop {r0} bx r0 .align 2, 0 -_0804E988: .4byte 0x02024214 -_0804E98C: .4byte 0x02024064 + .pool thumb_func_end atk62_08025C6C thumb_func_start atk63_jumptoattack atk63_jumptoattack: @ 804E990 push {r4,lr} - ldr r0, _0804E9A8 + ldr r0, =0x02024214 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0 beq _0804E9B4 - ldr r0, _0804E9AC - ldr r1, _0804E9B0 + ldr r0, =0x020241ea + ldr r1, =0x020241ee ldrh r1, [r1] strh r1, [r0] b _0804E9C2 .align 2, 0 -_0804E9A8: .4byte 0x02024214 -_0804E9AC: .4byte 0x020241ea -_0804E9B0: .4byte 0x020241ee + .pool _0804E9B4: - ldr r2, _0804E9E0 - ldr r1, _0804E9E4 - ldr r0, _0804E9E8 + ldr r2, =0x020241ec + ldr r1, =0x020241ea + ldr r0, =0x020241ee ldrh r0, [r0] strh r0, [r1] strh r0, [r2] adds r0, r1, 0 _0804E9C2: - ldr r3, _0804E9EC - ldr r2, _0804E9F0 + ldr r3, =0x082d86a8 + ldr r2, =0x0831c898 ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -159883,36 +154164,32 @@ _0804E9C2: pop {r0} bx r0 .align 2, 0 -_0804E9E0: .4byte 0x020241ec -_0804E9E4: .4byte 0x020241ea -_0804E9E8: .4byte 0x020241ee -_0804E9EC: .4byte 0x082d86a8 -_0804E9F0: .4byte 0x0831c898 + .pool thumb_func_end atk63_jumptoattack thumb_func_start atk64_statusanimation atk64_statusanimation: @ 804E9F4 push {r4,lr} - ldr r0, _0804EA64 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0804EA5C - ldr r0, _0804EA68 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, _0804EA6C + ldr r4, =0x02024064 strb r0, [r4] - ldr r1, _0804EA70 + ldr r1, =0x020242ac ldrb r2, [r4] lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _0804EA74 + ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 bne _0804EA54 - ldr r0, _0804EA78 + ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -159920,13 +154197,13 @@ atk64_statusanimation: @ 804E9F4 ldrb r0, [r1, 0xA] cmp r0, 0 bne _0804EA54 - ldr r0, _0804EA7C + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 bne _0804EA54 - ldr r1, _0804EA80 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 adds r1, 0x4C @@ -159938,7 +154215,7 @@ atk64_statusanimation: @ 804E9F4 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _0804EA54: - ldr r1, _0804EA68 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -159947,28 +154224,21 @@ _0804EA5C: pop {r0} bx r0 .align 2, 0 -_0804EA64: .4byte 0x02024068 -_0804EA68: .4byte 0x02024214 -_0804EA6C: .4byte 0x02024064 -_0804EA70: .4byte 0x020242ac -_0804EA74: .4byte 0x000400c0 -_0804EA78: .4byte 0x020242bc -_0804EA7C: .4byte 0x02024280 -_0804EA80: .4byte 0x02024084 + .pool thumb_func_end atk64_statusanimation thumb_func_start atk65_8025D90 atk65_8025D90: @ 804EA84 push {r4,r5,lr} - ldr r0, _0804EB0C + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0804EB04 - ldr r4, _0804EB10 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r5, _0804EB14 + ldr r5, =0x02024064 strb r0, [r5] ldr r1, [r4] ldrb r3, [r1, 0x2] @@ -159981,16 +154251,16 @@ atk65_8025D90: @ 804EA84 ldrb r0, [r1, 0x5] lsls r0, 24 orrs r3, r0 - ldr r1, _0804EB18 + ldr r1, =0x020242ac ldrb r2, [r5] lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _0804EB1C + ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 bne _0804EAFC - ldr r0, _0804EB20 + ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -159998,13 +154268,13 @@ atk65_8025D90: @ 804EA84 ldrb r0, [r1, 0xA] cmp r0, 0 bne _0804EAFC - ldr r0, _0804EB24 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 bne _0804EAFC - ldr r1, _0804EB28 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 adds r1, 0x50 @@ -160017,7 +154287,7 @@ atk65_8025D90: @ 804EA84 ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution _0804EAFC: - ldr r1, _0804EB10 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x6 str r0, [r1] @@ -160026,28 +154296,21 @@ _0804EB04: pop {r0} bx r0 .align 2, 0 -_0804EB0C: .4byte 0x02024068 -_0804EB10: .4byte 0x02024214 -_0804EB14: .4byte 0x02024064 -_0804EB18: .4byte 0x020242ac -_0804EB1C: .4byte 0x000400c0 -_0804EB20: .4byte 0x020242bc -_0804EB24: .4byte 0x02024280 -_0804EB28: .4byte 0x02024084 + .pool thumb_func_end atk65_8025D90 thumb_func_start atk66_8025E38 atk66_8025E38: @ 804EB2C push {r4,r5,lr} - ldr r0, _0804EBA4 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _0804EB9E - ldr r4, _0804EBA8 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r5, _0804EBAC + ldr r5, =0x02024064 strb r0, [r5] ldr r4, [r4] ldrb r2, [r4, 0x3] @@ -160060,16 +154323,16 @@ atk66_8025E38: @ 804EB2C ldrb r0, [r4, 0x6] lsls r0, 24 orrs r2, r0 - ldr r1, _0804EBB0 + ldr r1, =0x020242ac ldrb r3, [r5] lsls r0, r3, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _0804EBB4 + ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 bne _0804EB96 - ldr r0, _0804EBB8 + ldr r0, =0x020242bc lsls r1, r3, 3 subs r1, r3 lsls r1, 2 @@ -160077,7 +154340,7 @@ atk66_8025E38: @ 804EB2C ldrb r0, [r1, 0xA] cmp r0, 0 bne _0804EB96 - ldr r0, _0804EBBC + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -160089,7 +154352,7 @@ atk66_8025E38: @ 804EB2C ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution _0804EB96: - ldr r1, _0804EBA8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x7 str r0, [r1] @@ -160098,20 +154361,14 @@ _0804EB9E: pop {r0} bx r0 .align 2, 0 -_0804EBA4: .4byte 0x02024068 -_0804EBA8: .4byte 0x02024214 -_0804EBAC: .4byte 0x02024064 -_0804EBB0: .4byte 0x020242ac -_0804EBB4: .4byte 0x000400c0 -_0804EBB8: .4byte 0x020242bc -_0804EBBC: .4byte 0x02024280 + .pool thumb_func_end atk66_8025E38 thumb_func_start atk67_8025ECC atk67_8025ECC: @ 804EBC0 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _0804EBD4 + ldr r5, =0x02024332 ldrb r4, [r5] cmp r4, 0 beq _0804EBD8 @@ -160119,7 +154376,7 @@ atk67_8025ECC: @ 804EBC0 beq _0804EC04 b _0804EC96 .align 2, 0 -_0804EBD4: .4byte 0x02024332 + .pool _0804EBD8: str r4, [sp] movs r0, 0x18 @@ -160127,7 +154384,7 @@ _0804EBD8: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, _0804EC00 + ldr r0, =0x085ccabb movs r1, 0xC bl battle_show_message_maybe ldrb r0, [r5] @@ -160138,9 +154395,9 @@ _0804EBD8: bl sub_8056B74 b _0804EC96 .align 2, 0 -_0804EC00: .4byte 0x085ccabb + .pool _0804EC04: - ldr r0, _0804EC68 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -160157,13 +154414,13 @@ _0804EC04: strb r0, [r5, 0x1] bl sub_8056B74 _0804EC2A: - ldr r0, _0804EC68 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0804EC52 - ldr r4, _0804EC6C + ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 bne _0804EC52 @@ -160175,19 +154432,18 @@ _0804EC2A: strb r0, [r4, 0x1] bl sub_8056B74 _0804EC52: - ldr r0, _0804EC68 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _0804EC70 - ldr r0, _0804EC6C + ldr r0, =0x02024332 movs r4, 0x1 strb r4, [r0, 0x1] b _0804EC7A .align 2, 0 -_0804EC68: .4byte 0x030022c0 -_0804EC6C: .4byte 0x02024332 + .pool _0804EC70: movs r4, 0x1 adds r0, r4, 0 @@ -160203,7 +154459,7 @@ _0804EC7A: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r1, _0804ECA0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -160213,19 +154469,19 @@ _0804EC96: pop {r0} bx r0 .align 2, 0 -_0804ECA0: .4byte 0x02024214 + .pool thumb_func_end atk67_8025ECC thumb_func_start sub_804ECA4 sub_804ECA4: @ 804ECA4 push {r4,r5,lr} movs r1, 0 - ldr r2, _0804ECD0 - ldr r5, _0804ECD4 + ldr r2, =0x0202406c + ldr r5, =0x02024214 ldrb r0, [r2] cmp r1, r0 bge _0804ECC2 - ldr r4, _0804ECD8 + ldr r4, =0x0202407a movs r3, 0xC _0804ECB6: adds r0, r1, r4 @@ -160242,16 +154498,14 @@ _0804ECC2: pop {r0} bx r0 .align 2, 0 -_0804ECD0: .4byte 0x0202406c -_0804ECD4: .4byte 0x02024214 -_0804ECD8: .4byte 0x0202407a + .pool thumb_func_end sub_804ECA4 thumb_func_start atk69_8025FE0 atk69_8025FE0: @ 804ECDC push {r4-r7,lr} - ldr r7, _0804ED04 - ldr r6, _0804ED08 + ldr r7, =0x02024084 + ldr r6, =0x0202420c ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -160260,7 +154514,7 @@ atk69_8025FE0: @ 804ECDC ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0804ED10 - ldr r1, _0804ED0C + ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -160269,9 +154523,7 @@ atk69_8025FE0: @ 804ECDC ldrb r6, [r0, 0x1A] b _0804ED2A .align 2, 0 -_0804ED04: .4byte 0x02024084 -_0804ED08: .4byte 0x0202420c -_0804ED0C: .4byte 0x02024404 + .pool _0804ED10: ldrh r0, [r1, 0x2E] bl itemid_get_x12 @@ -160285,8 +154537,8 @@ _0804ED10: lsls r0, 24 lsrs r6, r0, 24 _0804ED2A: - ldr r1, _0804EDEC - ldr r5, _0804EDF0 + ldr r1, =0x0202420f + ldr r5, =0x0202420c ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -160303,7 +154555,7 @@ _0804ED2A: ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player - ldr r2, _0804EDF4 + ldr r2, =0x0202437c ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -160314,8 +154566,8 @@ _0804ED2A: orrs r1, r2 strb r1, [r0] _0804ED68: - ldr r2, _0804EDF8 - ldr r3, _0804EDF0 + ldr r2, =0x02024084 + ldr r3, =0x0202420c ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -160329,8 +154581,8 @@ _0804ED68: adds r5, r2, 0 cmp r1, 0 bne _0804EE38 - ldr r2, _0804EDFC - ldr r0, _0804EE00 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -160339,14 +154591,14 @@ _0804ED68: ldrb r0, [r0] cmp r0, 0x65 beq _0804EDBA - ldr r0, _0804EE04 + ldr r0, =0x0202433c lsls r1, r4, 4 adds r1, r0 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 blt _0804EDBA - ldr r0, _0804EDF4 + ldr r0, =0x0202437c lsls r1, r4, 2 adds r1, r4 lsls r1, 2 @@ -160361,13 +154613,13 @@ _0804EDBA: muls r0, r4 adds r0, r5 ldrh r1, [r0, 0x28] - ldr r2, _0804EE08 + ldr r2, =0x020241f0 ldr r0, [r2] cmp r1, r0 bgt _0804EE38 subs r0, r1, 0x1 str r0, [r2] - ldr r1, _0804EE04 + ldr r1, =0x0202433c ldrb r3, [r3] lsls r0, r3, 4 adds r0, r1 @@ -160375,24 +154627,16 @@ _0804EDBA: lsls r0, 30 cmp r0, 0 bge _0804EE10 - ldr r0, _0804EE0C + ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x40 orrs r1, r2 strb r1, [r0] b _0804EE38 .align 2, 0 -_0804EDEC: .4byte 0x0202420f -_0804EDF0: .4byte 0x0202420c -_0804EDF4: .4byte 0x0202437c -_0804EDF8: .4byte 0x02024084 -_0804EDFC: .4byte 0x0831c898 -_0804EE00: .4byte 0x020241ea -_0804EE04: .4byte 0x0202433c -_0804EE08: .4byte 0x020241f0 -_0804EE0C: .4byte 0x0202427c + .pool _0804EE10: - ldr r0, _0804EE48 + ldr r0, =0x0202437c lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -160401,19 +154645,19 @@ _0804EE10: lsrs r0, 7 cmp r0, 0 beq _0804EE38 - ldr r2, _0804EE4C + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _0804EE50 + ldr r1, =0x02024208 adds r0, r3, 0 muls r0, r4 adds r0, r5 ldrh r0, [r0, 0x2E] strh r0, [r1] _0804EE38: - ldr r1, _0804EE54 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -160421,29 +154665,26 @@ _0804EE38: pop {r0} bx r0 .align 2, 0 -_0804EE48: .4byte 0x0202437c -_0804EE4C: .4byte 0x0202427c -_0804EE50: .4byte 0x02024208 -_0804EE54: .4byte 0x02024214 + .pool thumb_func_end atk69_8025FE0 thumb_func_start atk6A_stash_item_for_side atk6A_stash_item_for_side: @ 804EE58 push {r4-r6,lr} sub sp, 0x4 - ldr r6, _0804EEB8 + ldr r6, =0x02024214 ldr r0, [r6] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r5, _0804EEBC + ldr r5, =0x02024064 strb r0, [r5] - ldr r1, _0804EEC0 + ldr r1, =0x0202449c ldrb r4, [r5] lsls r0, r4, 1 adds r0, 0xB8 ldr r1, [r1] adds r1, r0 - ldr r2, _0804EEC4 + ldr r2, =0x02024084 movs r3, 0x58 adds r0, r4, 0 muls r0, r3 @@ -160475,23 +154716,20 @@ atk6A_stash_item_for_side: @ 804EE58 pop {r0} bx r0 .align 2, 0 -_0804EEB8: .4byte 0x02024214 -_0804EEBC: .4byte 0x02024064 -_0804EEC0: .4byte 0x0202449c -_0804EEC4: .4byte 0x02024084 + .pool thumb_func_end atk6A_stash_item_for_side thumb_func_start atk6B_end_battle_80261CC atk6B_end_battle_80261CC: @ 804EEC8 - ldr r1, _0804EEF4 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x7 strb r0, [r1, 0x1] - ldr r2, _0804EEF8 + ldr r2, =0x0202420b ldrb r0, [r2] strb r0, [r1, 0x2] - ldr r3, _0804EEFC + ldr r3, =0x0202406e ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -160499,23 +154737,20 @@ atk6B_end_battle_80261CC: @ 804EEC8 strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _0804EF00 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_0804EEF4: .4byte 0x02022f58 -_0804EEF8: .4byte 0x0202420b -_0804EEFC: .4byte 0x0202406e -_0804EF00: .4byte 0x02024214 + .pool thumb_func_end atk6B_end_battle_80261CC thumb_func_start atk6C_8026208 atk6C_8026208: @ 804EF04 push {r4,lr} sub sp, 0x4 - ldr r0, _0804EF20 + ldr r0, =0x02024474 ldrb r1, [r0, 0x1E] adds r4, r0, 0 cmp r1, 0 @@ -160526,7 +154761,7 @@ atk6C_8026208: @ 804EF04 movs r0, 0x3 b _0804EF26 .align 2, 0 -_0804EF20: .4byte 0x02024474 + .pool _0804EF24: movs r0, 0x1 _0804EF26: @@ -160539,12 +154774,12 @@ _0804EF28: b _0804F0F2 _0804EF32: lsls r0, 2 - ldr r1, _0804EF3C + ldr r1, =_0804EF40 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804EF3C: .4byte _0804EF40 + .pool .align 2, 0 _0804EF40: .4byte _0804EF68 @@ -160558,7 +154793,7 @@ _0804EF40: .4byte _0804F07C .4byte _0804F0C0 _0804EF68: - ldr r1, _0804EF8C + ldr r1, =0x02022e1e movs r0, 0x60 strh r0, [r1] movs r0, 0x2 @@ -160568,13 +154803,12 @@ _0804EF68: movs r0, 0x2 bl gpu_sync_bg_show bl sub_804F17C - ldr r1, _0804EF90 + ldr r1, =0x02024474 movs r0, 0x2 strb r0, [r1, 0x1E] b _0804F0F2 .align 2, 0 -_0804EF8C: .4byte 0x02022e1e -_0804EF90: .4byte 0x02024474 + .pool _0804EF94: bl sub_804F1CC lsls r0, 24 @@ -160582,17 +154816,17 @@ _0804EF94: beq _0804EFA0 b _0804F0F2 _0804EFA0: - ldr r1, _0804EFA8 + ldr r1, =0x02024474 movs r0, 0x3 strb r0, [r1, 0x1E] b _0804F0F2 .align 2, 0 -_0804EFA8: .4byte 0x02024474 + .pool _0804EFAC: - ldr r1, _0804EFF4 + ldr r1, =0x02022e18 movs r0, 0 strh r0, [r1] - ldr r1, _0804EFF8 + ldr r1, =0x02022e1a movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 @@ -160616,14 +154850,12 @@ _0804EFAC: movs r2, 0x1D movs r3, 0x13 bl sub_8056A3C - ldr r1, _0804EFFC + ldr r1, =0x02024474 movs r0, 0x4 strb r0, [r1, 0x1E] b _0804F0F2 .align 2, 0 -_0804EFF4: .4byte 0x02022e18 -_0804EFF8: .4byte 0x02022e1a -_0804EFFC: .4byte 0x02024474 + .pool _0804F000: bl sub_804F100 movs r0, 0xD @@ -160638,13 +154870,13 @@ _0804F014: lsrs r1, r0, 24 cmp r1, 0 bne _0804F0F2 - ldr r0, _0804F028 + ldr r0, =0x02022e1a strh r1, [r0] b _0804F06A .align 2, 0 -_0804F028: .4byte 0x02022e1a + .pool _0804F02C: - ldr r0, _0804F048 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] cmp r0, 0 beq _0804F0F2 @@ -160656,9 +154888,9 @@ _0804F02C: bl Window_CopyToVram b _0804F06A .align 2, 0 -_0804F048: .4byte 0x030022c0 + .pool _0804F04C: - ldr r0, _0804F074 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] cmp r0, 0 beq _0804F0F2 @@ -160672,14 +154904,13 @@ _0804F04C: movs r3, 0x13 bl sub_8056A3C _0804F06A: - ldr r1, _0804F078 + ldr r1, =0x02024474 ldrb r0, [r1, 0x1E] adds r0, 0x1 strb r0, [r1, 0x1E] b _0804F0F2 .align 2, 0 -_0804F074: .4byte 0x030022c0 -_0804F078: .4byte 0x02024474 + .pool _0804F07C: bl sub_804F344 lsls r0, 24 @@ -160701,12 +154932,12 @@ _0804F07C: bl gpu_bg_config_set_field movs r0, 0x2 bl gpu_sync_bg_show - ldr r1, _0804F0BC + ldr r1, =0x02024474 movs r0, 0xA strb r0, [r1, 0x1E] b _0804F0F2 .align 2, 0 -_0804F0BC: .4byte 0x02024474 + .pool _0804F0C0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -160724,7 +154955,7 @@ _0804F0C0: bl gpu_sync_bg_show movs r0, 0x1 bl gpu_sync_bg_show - ldr r1, _0804F0FC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -160734,23 +154965,23 @@ _0804F0F2: pop {r0} bx r0 .align 2, 0 -_0804F0FC: .4byte 0x02024214 + .pool thumb_func_end atk6C_8026208 thumb_func_start sub_804F100 sub_804F100: @ 804F100 push {lr} sub sp, 0x14 - ldr r0, _0804F138 + ldr r0, =0x0202449c ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _0804F13C + ldr r1, =0x020244ec adds r0, r1 add r1, sp, 0x8 bl sub_81D388C - ldr r0, _0804F140 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x10] movs r0, 0xD @@ -160765,21 +154996,19 @@ sub_804F100: @ 804F100 pop {r0} bx r0 .align 2, 0 -_0804F138: .4byte 0x0202449c -_0804F13C: .4byte 0x020244ec -_0804F140: .4byte 0x020244a8 + .pool thumb_func_end sub_804F100 thumb_func_start sub_804F144 sub_804F144: @ 804F144 push {lr} sub sp, 0x10 - ldr r0, _0804F174 + ldr r0, =0x0202449c ldr r0, [r0] ldrb r1, [r0, 0x10] movs r0, 0x64 muls r0, r1 - ldr r1, _0804F178 + ldr r1, =0x020244ec adds r0, r1 add r1, sp, 0x4 bl sub_81D388C @@ -160794,26 +155023,25 @@ sub_804F144: @ 804F144 pop {r0} bx r0 .align 2, 0 -_0804F174: .4byte 0x0202449c -_0804F178: .4byte 0x020244ec + .pool thumb_func_end sub_804F144 thumb_func_start sub_804F17C sub_804F17C: @ 804F17C push {lr} - ldr r1, _0804F1BC + ldr r1, =0x02022e1e movs r0, 0 strh r0, [r1] - ldr r1, _0804F1C0 + ldr r1, =0x02022e1c movs r2, 0xD0 lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0804F1C4 + ldr r0, =0x0831c2c8 movs r1, 0x60 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _0804F1C8 + ldr r1, =0x0831c2e8 movs r0, 0xE movs r2, 0 movs r3, 0 @@ -160827,10 +155055,7 @@ sub_804F17C: @ 804F17C pop {r0} bx r0 .align 2, 0 -_0804F1BC: .4byte 0x02022e1e -_0804F1C0: .4byte 0x02022e1c -_0804F1C4: .4byte 0x0831c2c8 -_0804F1C8: .4byte 0x0831c2e8 + .pool thumb_func_end sub_804F17C thumb_func_start sub_804F1CC @@ -160843,7 +155068,7 @@ sub_804F1CC: @ 804F1CC movs r0, 0x1 b _0804F216 _0804F1DC: - ldr r4, _0804F1EC + ldr r4, =0x02022e1c ldrh r1, [r4] movs r5, 0x80 lsls r5, 2 @@ -160852,7 +155077,7 @@ _0804F1DC: movs r0, 0 b _0804F216 .align 2, 0 -_0804F1EC: .4byte 0x02022e1c + .pool _0804F1F0: movs r0, 0xD0 lsls r0, 1 @@ -160864,7 +155089,7 @@ _0804F1FC: adds r0, 0x8 strh r0, [r4] lsls r0, 16 - ldr r1, _0804F21C + ldr r1, =0x01ff0000 cmp r0, r1 bls _0804F20C strh r5, [r4] @@ -160879,7 +155104,7 @@ _0804F216: pop {r1} bx r1 .align 2, 0 -_0804F21C: .4byte 0x01ff0000 + .pool thumb_func_end sub_804F1CC thumb_func_start sub_804F220 @@ -160888,12 +155113,12 @@ sub_804F220: @ 804F220 mov r7, r8 push {r7} sub sp, 0x10 - ldr r6, _0804F2F4 + ldr r6, =0x0202449c ldr r0, [r6] ldrb r0, [r0, 0x10] movs r5, 0x64 muls r0, r5 - ldr r4, _0804F2F8 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x38 bl pokemon_getattr @@ -160912,7 +155137,7 @@ sub_804F220: @ 804F220 ldrb r0, [r0, 0x10] muls r0, r5 adds r0, r4 - ldr r5, _0804F2FC + ldr r5, =0x02021fc4 adds r1, r5, 0 bl sub_81B1B44 str r5, [sp] @@ -160982,9 +155207,7 @@ sub_804F220: @ 804F220 movs r0, 0xB5 b _0804F318 .align 2, 0 -_0804F2F4: .4byte 0x0202449c -_0804F2F8: .4byte 0x020244ec -_0804F2FC: .4byte 0x02021fc4 + .pool _0804F300: adds r0, r5, 0 movs r1, 0 @@ -161023,7 +155246,7 @@ _0804F320: thumb_func_start sub_804F344 sub_804F344: @ 804F344 push {lr} - ldr r0, _0804F358 + ldr r0, =0x02022e1c ldrh r1, [r0] movs r3, 0xD0 lsls r3, 1 @@ -161033,18 +155256,18 @@ sub_804F344: @ 804F344 movs r0, 0 b _0804F380 .align 2, 0 -_0804F358: .4byte 0x02022e1c + .pool _0804F35C: ldrh r0, [r2] adds r1, r0, 0 subs r1, 0x10 - ldr r0, _0804F36C + ldr r0, =0x0000019f cmp r1, r0 bgt _0804F370 strh r3, [r2] b _0804F372 .align 2, 0 -_0804F36C: .4byte 0x0000019f + .pool _0804F370: strh r1, [r2] _0804F372: @@ -161066,13 +155289,13 @@ sub_804F384: @ 804F384 mov r6, r8 push {r6} sub sp, 0x10 - ldr r0, _0804F42C + ldr r0, =0x0202449c mov r8, r0 ldr r0, [r0] ldrb r0, [r0, 0x10] movs r6, 0x64 muls r0, r6 - ldr r5, _0804F430 + ldr r5, =0x020244ec adds r0, r5 movs r1, 0xB bl pokemon_getattr @@ -161091,15 +155314,15 @@ sub_804F384: @ 804F384 movs r2, 0x1 bl sub_80D2EDC str r0, [sp] - ldr r5, _0804F434 + ldr r5, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r5 movs r1, 0x80 lsls r1, 2 orrs r0, r1 - ldr r1, _0804F438 + ldr r1, =0x0000ffff ands r0, r1 - ldr r1, _0804F43C + ldr r1, =0xd75a0000 orrs r0, r1 str r0, [sp, 0x4] adds r0, r4, 0 @@ -161108,14 +155331,14 @@ sub_804F384: @ 804F384 add r4, sp, 0x8 ldr r0, [r4, 0x4] ands r0, r5 - ldr r1, _0804F440 + ldr r1, =0x0000d75a orrs r0, r1 str r0, [r4, 0x4] mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _0804F444 + ldr r0, =0x0831c3c0 movs r1, 0x80 lsls r1, 1 movs r2, 0xA @@ -161123,14 +155346,14 @@ sub_804F384: @ 804F384 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _0804F448 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r1, r2 movs r0, 0 strh r0, [r1, 0x2E] - ldr r0, _0804F44C + ldr r0, =0x02022e1c ldrh r0, [r0] strh r0, [r1, 0x30] add sp, 0x10 @@ -161140,22 +155363,14 @@ sub_804F384: @ 804F384 pop {r0} bx r0 .align 2, 0 -_0804F42C: .4byte 0x0202449c -_0804F430: .4byte 0x020244ec -_0804F434: .4byte 0xffff0000 -_0804F438: .4byte 0x0000ffff -_0804F43C: .4byte 0xd75a0000 -_0804F440: .4byte 0x0000d75a -_0804F444: .4byte 0x0831c3c0 -_0804F448: .4byte 0x02020630 -_0804F44C: .4byte 0x02022e1c + .pool thumb_func_end sub_804F384 thumb_func_start sub_804F450 sub_804F450: @ 804F450 push {r4,lr} adds r2, r0, 0 - ldr r0, _0804F46C + ldr r0, =0x02022e1c ldrh r1, [r2, 0x30] ldrh r0, [r0] subs r1, r0 @@ -161167,7 +155382,7 @@ sub_804F450: @ 804F450 strh r0, [r2, 0x2E] b _0804F48C .align 2, 0 -_0804F46C: .4byte 0x02022e1c + .pool _0804F470: movs r1, 0x2E ldrsh r0, [r2, r1] @@ -161175,7 +155390,7 @@ _0804F470: beq _0804F48C adds r0, r2, 0 bl obj_delete_and_free_tiles - ldr r4, _0804F494 + ldr r4, =0x0000d75a adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -161185,20 +155400,20 @@ _0804F48C: pop {r0} bx r0 .align 2, 0 -_0804F494: .4byte 0x0000d75a + .pool thumb_func_end sub_804F450 thumb_func_start sub_804F498 sub_804F498: @ 804F498 push {lr} - ldr r3, _0804F4C0 - ldr r0, _0804F4C4 + ldr r3, =0x0202406e + ldr r0, =0x0202449c ldr r0, [r0] ldrh r1, [r3] ldrb r2, [r0, 0x10] cmp r1, r2 beq _0804F4BA - ldr r0, _0804F4C8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -161211,9 +155426,7 @@ _0804F4BA: movs r0, 0x1 b _0804F4CE .align 2, 0 -_0804F4C0: .4byte 0x0202406e -_0804F4C4: .4byte 0x0202449c -_0804F4C8: .4byte 0x02022fec + .pool _0804F4CC: movs r0, 0 _0804F4CE: @@ -161225,14 +155438,14 @@ _0804F4CE: sub_804F4D4: @ 804F4D4 push {lr} bl sub_803F988 - ldr r1, _0804F4E8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0804F4E8: .4byte 0x02024214 + .pool thumb_func_end sub_804F4D4 thumb_func_start atk6E_state0_side_becomes_attacker @@ -161240,27 +155453,26 @@ atk6E_state0_side_becomes_attacker: @ 804F4EC push {lr} movs r0, 0 bl battle_get_side_with_given_state - ldr r1, _0804F504 + ldr r1, =0x0202420b strb r0, [r1] - ldr r1, _0804F508 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0804F504: .4byte 0x0202420b -_0804F508: .4byte 0x02024214 + .pool thumb_func_end atk6E_state0_side_becomes_attacker thumb_func_start atk6F_8026810 atk6F_8026810: @ 804F50C push {r4,r5,lr} - ldr r5, _0804F538 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, _0804F53C + ldr r4, =0x02024064 strb r0, [r4] movs r0, 0 movs r1, 0 @@ -161274,21 +155486,20 @@ atk6F_8026810: @ 804F50C pop {r0} bx r0 .align 2, 0 -_0804F538: .4byte 0x02024214 -_0804F53C: .4byte 0x02024064 + .pool thumb_func_end atk6F_8026810 thumb_func_start atk70_record_ability_usage_of_side atk70_record_ability_usage_of_side: @ 804F540 push {r4,lr} - ldr r4, _0804F568 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, _0804F56C + ldr r1, =0x02024064 strb r0, [r1] ldrb r0, [r1] - ldr r1, _0804F570 + ldr r1, =0x0202420a ldrb r1, [r1] bl b_history__record_ability_usage_of_player ldr r0, [r4] @@ -161298,19 +155509,17 @@ atk70_record_ability_usage_of_side: @ 804F540 pop {r0} bx r0 .align 2, 0 -_0804F568: .4byte 0x02024214 -_0804F56C: .4byte 0x02024064 -_0804F570: .4byte 0x0202420a + .pool thumb_func_end atk70_record_ability_usage_of_side thumb_func_start sub_804F574 sub_804F574: @ 804F574 - ldr r2, _0804F594 + ldr r2, =0x02022f68 movs r0, 0xFD strb r0, [r2] movs r0, 0x2 strb r0, [r2, 0x1] - ldr r0, _0804F598 + ldr r0, =0x020244e2 ldrh r1, [r0] strb r1, [r2, 0x2] movs r0, 0xFF @@ -161322,34 +155531,33 @@ sub_804F574: @ 804F574 strb r0, [r2, 0x4] bx lr .align 2, 0 -_0804F594: .4byte 0x02022f68 -_0804F598: .4byte 0x020244e2 + .pool thumb_func_end sub_804F574 thumb_func_start atk71_80268A0 atk71_80268A0: @ 804F59C push {lr} bl sub_804F574 - ldr r1, _0804F5B0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0804F5B0: .4byte 0x02024214 + .pool thumb_func_end atk71_80268A0 thumb_func_start atk72_flee atk72_flee: @ 804F5B4 push {lr} - ldr r0, _0804F5E0 + ldr r0, =0x0202420d ldrb r0, [r0] bl sub_803EC20 lsls r0, 24 cmp r0, 0 beq _0804F5E8 - ldr r3, _0804F5E4 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -161364,10 +155572,9 @@ atk72_flee: @ 804F5B4 str r1, [r3] b _0804F5F0 .align 2, 0 -_0804F5E0: .4byte 0x0202420d -_0804F5E4: .4byte 0x02024214 + .pool _0804F5E8: - ldr r1, _0804F5F4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -161375,29 +155582,29 @@ _0804F5F0: pop {r0} bx r0 .align 2, 0 -_0804F5F4: .4byte 0x02024214 + .pool thumb_func_end atk72_flee thumb_func_start atk73_cmd73 atk73_cmd73: @ 804F5F8 push {r4-r6,lr} - ldr r0, _0804F648 + ldr r0, =0x02022fec ldr r4, [r0] movs r6, 0x1 ands r4, r6 cmp r4, 0 bne _0804F68E - ldr r0, _0804F64C + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, _0804F650 + ldr r1, =0x02024064 strb r0, [r1] movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r2, _0804F654 + ldr r2, =0x02024084 movs r1, 0x58 muls r1, r0 adds r1, r2 @@ -161415,46 +155622,42 @@ _0804F636: cmp r5, 0 bne _0804F65C _0804F63E: - ldr r0, _0804F658 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 strb r4, [r0] b _0804F68E .align 2, 0 -_0804F648: .4byte 0x02022fec -_0804F64C: .4byte 0x02024214 -_0804F650: .4byte 0x02024064 -_0804F654: .4byte 0x02024084 -_0804F658: .4byte 0x0202449c + .pool _0804F65C: cmp r0, 0x27 ble _0804F670 - ldr r0, _0804F66C + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 strb r6, [r0] b _0804F68E .align 2, 0 -_0804F66C: .4byte 0x0202449c + .pool _0804F670: cmp r0, 0x9 ble _0804F684 - ldr r0, _0804F680 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 movs r1, 0x2 b _0804F68C .align 2, 0 -_0804F680: .4byte 0x0202449c + .pool _0804F684: - ldr r0, _0804F69C + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 movs r1, 0x3 _0804F68C: strb r1, [r0] _0804F68E: - ldr r1, _0804F6A0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -161462,8 +155665,7 @@ _0804F68E: pop {r0} bx r0 .align 2, 0 -_0804F69C: .4byte 0x0202449c -_0804F6A0: .4byte 0x02024214 + .pool thumb_func_end atk73_cmd73 thumb_func_start atk74_hp_tresholds_2 @@ -161471,19 +155673,19 @@ atk74_hp_tresholds_2: @ 804F6A4 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0804F708 + ldr r0, =0x02022fec ldr r7, [r0] movs r0, 0x1 mov r8, r0 ands r7, r0 cmp r7, 0 bne _0804F73E - ldr r0, _0804F70C + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] bl get_battle_side_of_something adds r4, r0, 0 - ldr r0, _0804F710 + ldr r0, =0x02024064 strb r4, [r0] movs r0, 0x1 eors r4, r0 @@ -161492,13 +155694,13 @@ atk74_hp_tresholds_2: @ 804F6A4 adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 - ldr r1, _0804F714 + ldr r1, =0x0202449c ldr r6, [r1] lsrs r0, 23 adds r0, r6 adds r0, 0xA8 ldrb r5, [r0] - ldr r1, _0804F718 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r4 adds r0, r1 @@ -161516,11 +155718,7 @@ atk74_hp_tresholds_2: @ 804F6A4 strb r7, [r0] b _0804F73E .align 2, 0 -_0804F708: .4byte 0x02022fec -_0804F70C: .4byte 0x02024214 -_0804F710: .4byte 0x02024064 -_0804F714: .4byte 0x0202449c -_0804F718: .4byte 0x02024084 + .pool _0804F71C: cmp r0, 0x1D bgt _0804F72A @@ -161543,7 +155741,7 @@ _0804F736: _0804F73C: strb r0, [r1] _0804F73E: - ldr r1, _0804F750 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -161553,27 +155751,27 @@ _0804F73E: pop {r0} bx r0 .align 2, 0 -_0804F750: .4byte 0x02024214 + .pool thumb_func_end atk74_hp_tresholds_2 thumb_func_start atk75_8026A58 atk75_8026A58: @ 804F754 push {lr} sub sp, 0x4 - ldr r2, _0804F794 - ldr r1, _0804F798 + ldr r2, =0x020244b8 + ldr r1, =0x0202420b ldrb r0, [r1] strb r0, [r2] - ldr r2, _0804F79C + ldr r2, =0x0202406e ldrb r0, [r1] lsls r0, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r1, _0804F7A0 + ldr r1, =0x02024744 adds r0, r1 - ldr r1, _0804F7A4 + ldr r1, =0x02024208 ldrh r1, [r1] lsls r2, 24 lsrs r2, 24 @@ -161581,7 +155779,7 @@ atk75_8026A58: @ 804F754 str r3, [sp] movs r3, 0 bl sub_806BD28 - ldr r1, _0804F7A8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -161589,12 +155787,7 @@ atk75_8026A58: @ 804F754 pop {r0} bx r0 .align 2, 0 -_0804F794: .4byte 0x020244b8 -_0804F798: .4byte 0x0202420b -_0804F79C: .4byte 0x0202406e -_0804F7A0: .4byte 0x02024744 -_0804F7A4: .4byte 0x02024208 -_0804F7A8: .4byte 0x02024214 + .pool thumb_func_end atk75_8026A58 thumb_func_start sub_804F7AC @@ -161602,11 +155795,11 @@ sub_804F7AC: @ 804F7AC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _0804F7D4 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, _0804F7D8 + ldr r1, =0x02024064 strb r0, [r1] ldr r0, [r4] ldrb r0, [r0, 0x2] @@ -161615,14 +155808,12 @@ sub_804F7AC: @ 804F7AC b _0804FD70 _0804F7CA: lsls r0, 2 - ldr r1, _0804F7DC + ldr r1, =_0804F7E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0804F7D4: .4byte 0x02024214 -_0804F7D8: .4byte 0x02024064 -_0804F7DC: .4byte _0804F7E0 + .pool .align 2, 0 _0804F7E0: .4byte _0804F84C @@ -161653,15 +155844,15 @@ _0804F7E0: .4byte _0804FD30 .4byte _0804FD5C _0804F84C: - ldr r0, _0804F858 + ldr r0, =0x02024064 ldrb r0, [r0] bl b_cancel_multi_turn_move_maybe b _0804FD70 .align 2, 0 -_0804F858: .4byte 0x02024064 + .pool _0804F85C: - ldr r1, _0804F898 - ldr r4, _0804F89C + ldr r1, =0x0202420b + ldr r4, =0x0202420c ldrb r0, [r4] strb r0, [r1] ldrb r0, [r1] @@ -161670,7 +155861,7 @@ _0804F85C: eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r2, _0804F8A0 + ldr r2, =0x02024294 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -161678,7 +155869,7 @@ _0804F85C: ldrb r0, [r2, 0x8] cmp r0, 0 beq _0804F8A8 - ldr r1, _0804F8A4 + ldr r1, =0x02024084 ldrb r2, [r2, 0x9] movs r0, 0x58 muls r0, r2 @@ -161689,41 +155880,36 @@ _0804F85C: strb r2, [r4] b _0804FD70 .align 2, 0 -_0804F898: .4byte 0x0202420b -_0804F89C: .4byte 0x0202420c -_0804F8A0: .4byte 0x02024294 -_0804F8A4: .4byte 0x02024084 + .pool _0804F8A8: - ldr r0, _0804F8B4 - ldr r1, _0804F8B8 + ldr r0, =0x0202420c + ldr r1, =0x02024064 ldrb r1, [r1] strb r1, [r0] b _0804FD70 .align 2, 0 -_0804F8B4: .4byte 0x0202420c -_0804F8B8: .4byte 0x02024064 + .pool _0804F8BC: bl sub_803BB88 - ldr r1, _0804F8C8 + ldr r1, =0x02024332 strb r0, [r1] b _0804FD70 .align 2, 0 -_0804F8C8: .4byte 0x02024332 + .pool _0804F8CC: - ldr r0, _0804F8DC + ldr r0, =0x020241ea ldrh r0, [r0] movs r1, 0 bl sub_80458E0 - ldr r1, _0804F8E0 + ldr r1, =0x0202420c strb r0, [r1] b _0804FD70 .align 2, 0 -_0804F8DC: .4byte 0x020241ea -_0804F8E0: .4byte 0x0202420c + .pool _0804F8E4: - ldr r2, _0804F904 - ldr r1, _0804F908 - ldr r0, _0804F90C + ldr r2, =0x02024280 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -161733,24 +155919,21 @@ _0804F8E4: ands r2, r0 cmp r2, 0 beq _0804F914 - ldr r1, _0804F910 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1] b _0804FD70 .align 2, 0 -_0804F904: .4byte 0x02024280 -_0804F908: .4byte 0x0832a328 -_0804F90C: .4byte 0x02024064 -_0804F910: .4byte 0x02024332 + .pool _0804F914: - ldr r0, _0804F91C + ldr r0, =0x02024332 strb r2, [r0] b _0804FD70 .align 2, 0 -_0804F91C: .4byte 0x02024332 + .pool _0804F920: - ldr r4, _0804F950 - ldr r3, _0804F954 + ldr r4, =0x0202437c + ldr r3, =0x02024064 ldrb r0, [r3] lsls r1, r0, 2 adds r1, r0 @@ -161773,11 +155956,10 @@ _0804F920: strb r0, [r1] b _0804FD70 .align 2, 0 -_0804F950: .4byte 0x0202437c -_0804F954: .4byte 0x02024064 + .pool _0804F958: - ldr r4, _0804F97C - ldr r1, _0804F980 + ldr r4, =0x0202406e + ldr r1, =0x0202449c ldr r0, [r1] ldrh r3, [r4] ldrb r2, [r0, 0x10] @@ -161792,15 +155974,13 @@ _0804F970: cmp r3, r0 bne _0804F988 _0804F974: - ldr r1, _0804F984 + ldr r1, =0x02024064 movs r0, 0 b _0804F98C .align 2, 0 -_0804F97C: .4byte 0x0202406e -_0804F980: .4byte 0x0202449c -_0804F984: .4byte 0x02024064 + .pool _0804F988: - ldr r1, _0804F9D8 + ldr r1, =0x02024064 movs r0, 0x2 _0804F98C: strb r0, [r1] @@ -161811,7 +155991,7 @@ _0804F98C: ldr r1, [r6] adds r4, r1, r0 movs r3, 0 - ldr r1, _0804F9DC + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 adds r1, 0xC @@ -161845,10 +156025,9 @@ _0804F9D2: strh r0, [r4] b _0804FD70 .align 2, 0 -_0804F9D8: .4byte 0x02024064 -_0804F9DC: .4byte 0x02024084 + .pool _0804F9E0: - ldr r0, _0804FA10 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0xB ands r0, r1 @@ -161856,7 +156035,7 @@ _0804F9E0: beq _0804F9EE b _0804FD70 _0804F9EE: - ldr r1, _0804FA14 + ldr r1, =0x02024084 ldrh r0, [r1, 0x28] cmp r0, 0 bne _0804F9F8 @@ -161869,33 +156048,30 @@ _0804F9F8: bne _0804FA04 b _0804FD70 _0804FA04: - ldr r0, _0804FA18 + ldr r0, =0x02024280 ldr r1, [r0] - ldr r2, _0804FA1C + ldr r2, =0xffbfffff ands r1, r2 str r1, [r0] b _0804FD70 .align 2, 0 -_0804FA10: .4byte 0x02022fec -_0804FA14: .4byte 0x02024084 -_0804FA18: .4byte 0x02024280 -_0804FA1C: .4byte 0xffbfffff + .pool _0804FA20: - ldr r2, _0804FAB0 + ldr r2, =0x02024332 mov r8, r2 movs r0, 0 strb r0, [r2] - ldr r1, _0804FAB4 - ldr r6, _0804FAB8 + ldr r1, =0x02024474 + ldr r6, =0x02024064 ldrb r0, [r2, 0x1] strb r0, [r6] strb r0, [r1, 0x17] - ldr r0, _0804FABC + ldr r0, =0x0202449c ldr r0, [r0] adds r7, r0, 0 adds r7, 0x92 ldrb r3, [r7] - ldr r1, _0804FAC0 + ldr r1, =0x0832a328 ldrb r2, [r6] lsls r0, r2, 2 adds r0, r1 @@ -161906,7 +156082,7 @@ _0804FA20: beq _0804FA50 b _0804FD70 _0804FA50: - ldr r4, _0804FAC4 + ldr r4, =0x02024084 movs r0, 0x58 mov r12, r0 mov r1, r12 @@ -161948,7 +156124,7 @@ _0804FA82: adds r0, r1 ldr r0, [r0] bl getNature - ldr r1, _0804FAC8 + ldr r1, =0x0831c4f8 lsls r0, 24 lsrs r0, 24 adds r0, r1 @@ -161957,15 +156133,9 @@ _0804FA82: strb r0, [r2, 0x5] b _0804FD70 .align 2, 0 -_0804FAB0: .4byte 0x02024332 -_0804FAB4: .4byte 0x02024474 -_0804FAB8: .4byte 0x02024064 -_0804FABC: .4byte 0x0202449c -_0804FAC0: .4byte 0x0832a328 -_0804FAC4: .4byte 0x02024084 -_0804FAC8: .4byte 0x0831c4f8 + .pool _0804FACC: - ldr r4, _0804FAE4 + ldr r4, =0x02024332 adds r0, r4, 0 bl sub_81A5258 lsls r0, 24 @@ -161977,24 +156147,24 @@ _0804FADE: strb r3, [r4, 0x1] b _0804FD70 .align 2, 0 -_0804FAE4: .4byte 0x02024332 + .pool _0804FAE8: - ldr r0, _0804FB20 + ldr r0, =0x02024084 adds r0, 0x80 movs r1, 0 strh r1, [r0] - ldr r2, _0804FB24 - ldr r3, _0804FB28 + ldr r2, =0x02024280 + ldr r3, =0x0832a328 ldr r1, [r3, 0x4] lsls r1, 28 ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r0, _0804FB2C + ldr r0, =0x0202449c ldr r2, [r0] - ldr r0, _0804FB30 + ldr r0, =0x000002a1 adds r2, r0 - ldr r0, _0804FB34 + ldr r0, =0x0202406e ldrh r0, [r0, 0x2] lsls r0, 2 adds r0, r3 @@ -162002,25 +156172,19 @@ _0804FAE8: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r1, _0804FB38 + ldr r1, =0x020242bc adds r1, 0x34 ldrb r0, [r1] movs r2, 0x2 b _0804FBF4 .align 2, 0 -_0804FB20: .4byte 0x02024084 -_0804FB24: .4byte 0x02024280 -_0804FB28: .4byte 0x0832a328 -_0804FB2C: .4byte 0x0202449c -_0804FB30: .4byte 0x000002a1 -_0804FB34: .4byte 0x0202406e -_0804FB38: .4byte 0x020242bc + .pool _0804FB3C: - ldr r1, _0804FB7C + ldr r1, =0x02024084 movs r0, 0 strh r0, [r1, 0x28] - ldr r2, _0804FB80 - ldr r3, _0804FB84 + ldr r2, =0x02024280 + ldr r3, =0x0832a328 ldr r1, [r3] lsls r1, 28 ldr r0, [r2] @@ -162029,12 +156193,12 @@ _0804FB3C: lsls r1, 15 orrs r0, r1 str r0, [r2] - ldr r0, _0804FB88 + ldr r0, =0x0202449c ldr r2, [r0] movs r1, 0xA8 lsls r1, 2 adds r2, r1 - ldr r0, _0804FB8C + ldr r0, =0x0202406e ldrh r0, [r0] lsls r0, 2 adds r0, r3 @@ -162042,27 +156206,22 @@ _0804FB3C: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r2, _0804FB90 + ldr r2, =0x020242bc ldrb r0, [r2, 0x18] movs r1, 0x2 orrs r0, r1 strb r0, [r2, 0x18] b _0804FD70 .align 2, 0 -_0804FB7C: .4byte 0x02024084 -_0804FB80: .4byte 0x02024280 -_0804FB84: .4byte 0x0832a328 -_0804FB88: .4byte 0x0202449c -_0804FB8C: .4byte 0x0202406e -_0804FB90: .4byte 0x020242bc + .pool _0804FB94: - ldr r0, _0804FBFC + ldr r0, =0x02024084 movs r1, 0 strh r1, [r0, 0x28] adds r0, 0x80 strh r1, [r0] - ldr r2, _0804FC00 - ldr r3, _0804FC04 + ldr r2, =0x02024280 + ldr r3, =0x0832a328 ldr r0, [r3] lsls r0, 28 ldr r1, [r2] @@ -162074,12 +156233,12 @@ _0804FB94: lsls r0, 15 orrs r1, r0 str r1, [r2] - ldr r5, _0804FC08 + ldr r5, =0x0202449c ldr r2, [r5] movs r0, 0xA8 lsls r0, 2 adds r2, r0 - ldr r4, _0804FC0C + ldr r4, =0x0202406e ldrh r0, [r4] lsls r0, 2 adds r0, r3 @@ -162088,7 +156247,7 @@ _0804FB94: orrs r0, r1 strb r0, [r2] ldr r2, [r5] - ldr r1, _0804FC10 + ldr r1, =0x000002a1 adds r2, r1 ldrh r0, [r4, 0x2] lsls r0, 2 @@ -162097,7 +156256,7 @@ _0804FB94: ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - ldr r1, _0804FC14 + ldr r1, =0x020242bc ldrb r0, [r1, 0x18] movs r2, 0x2 orrs r0, r2 @@ -162109,22 +156268,16 @@ _0804FBF4: strb r0, [r1] b _0804FD70 .align 2, 0 -_0804FBFC: .4byte 0x02024084 -_0804FC00: .4byte 0x02024280 -_0804FC04: .4byte 0x0832a328 -_0804FC08: .4byte 0x0202449c -_0804FC0C: .4byte 0x0202406e -_0804FC10: .4byte 0x000002a1 -_0804FC14: .4byte 0x020242bc + .pool _0804FC18: movs r0, 0 bl sub_8033E10 - ldr r0, _0804FC28 + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution b _0804FD70 .align 2, 0 -_0804FC28: .4byte 0x02024064 + .pool _0804FC2C: bl sub_81A5BF8 b _0804FD70 @@ -162132,22 +156285,20 @@ _0804FC32: bl sub_81A5D44 b _0804FD70 _0804FC38: - ldr r1, _0804FC54 - ldr r0, _0804FC58 + ldr r1, =0x085cd1c8 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] lsls r0, 2 adds r0, r1 ldr r0, [r0] bl sub_814E6F0 - ldr r0, _0804FC5C + ldr r0, =0x02022e2c movs r1, 0x16 bl battle_show_message_maybe b _0804FD70 .align 2, 0 -_0804FC54: .4byte 0x085cd1c8 -_0804FC58: .4byte 0x02024214 -_0804FC5C: .4byte 0x02022e2c + .pool _0804FC60: movs r0, 0x16 bl a_pressed_maybe @@ -162162,24 +156313,23 @@ _0804FC6A: _0804FC76: b _0804FD70 _0804FC78: - ldr r4, _0804FC84 + ldr r4, =0x02024064 movs r0, 0x1 strb r0, [r4] - ldr r0, _0804FC88 + ldr r0, =0x02024084 adds r0, 0x58 b _0804FCA2 .align 2, 0 -_0804FC84: .4byte 0x02024064 -_0804FC88: .4byte 0x02024084 + .pool _0804FC8C: - ldr r0, _0804FCB8 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0x3 bls _0804FD70 - ldr r4, _0804FCBC + ldr r4, =0x02024064 movs r0, 0x3 strb r0, [r4] - ldr r0, _0804FCC0 + ldr r0, =0x02024084 movs r2, 0x84 lsls r2, 1 adds r0, r2 @@ -162194,35 +156344,31 @@ _0804FCA2: bl dp01_battle_side_mark_buffer_for_execution b _0804FD70 .align 2, 0 -_0804FCB8: .4byte 0x0202406c -_0804FCBC: .4byte 0x02024064 -_0804FCC0: .4byte 0x02024084 + .pool _0804FCC4: - ldr r0, _0804FCD0 - ldr r1, _0804FCD4 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x55 bl MPlayVolumeControl b _0804FD70 .align 2, 0 -_0804FCD0: .4byte 0x03007420 -_0804FCD4: .4byte 0x0000ffff + .pool _0804FCD8: - ldr r0, _0804FCE8 - ldr r1, _0804FCEC + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl b _0804FD70 .align 2, 0 -_0804FCE8: .4byte 0x03007420 -_0804FCEC: .4byte 0x0000ffff + .pool _0804FCF0: - ldr r0, _0804FD0C + ldr r0, =0x0202449c ldr r2, [r0] - ldr r0, _0804FD10 + ldr r0, =0x000002a2 adds r2, r0 - ldr r1, _0804FD14 - ldr r0, _0804FD18 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -162232,12 +156378,9 @@ _0804FCF0: strb r0, [r2] b _0804FD70 .align 2, 0 -_0804FD0C: .4byte 0x0202449c -_0804FD10: .4byte 0x000002a2 -_0804FD14: .4byte 0x0832a328 -_0804FD18: .4byte 0x02024064 + .pool _0804FD1C: - ldr r0, _0804FD2C + ldr r0, =0x02024064 ldrb r0, [r0] bl sub_805725C _0804FD24: @@ -162245,39 +156388,38 @@ _0804FD24: bne _0804FD78 b _0804FD70 .align 2, 0 -_0804FD2C: .4byte 0x02024064 + .pool _0804FD30: - ldr r0, _0804FD48 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0804FD50 - ldr r1, _0804FD4C + ldr r1, =0x0202433a movs r0, 0x5 strb r0, [r1] b _0804FD70 .align 2, 0 -_0804FD48: .4byte 0x02024064 -_0804FD4C: .4byte 0x0202433a + .pool _0804FD50: - ldr r1, _0804FD58 + ldr r1, =0x0202433a movs r0, 0xA strb r0, [r1] b _0804FD70 .align 2, 0 -_0804FD58: .4byte 0x0202433a + .pool _0804FD5C: movs r1, 0xCE lsls r1, 1 movs r0, 0 movs r2, 0x1 bl sub_8034300 - ldr r0, _0804FD84 + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution _0804FD70: - ldr r1, _0804FD88 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x3 str r0, [r1] @@ -162288,8 +156430,7 @@ _0804FD78: pop {r0} bx r0 .align 2, 0 -_0804FD84: .4byte 0x02024064 -_0804FD88: .4byte 0x02024214 + .pool thumb_func_end sub_804F7AC thumb_func_start atk77_setprotect @@ -162298,14 +156439,14 @@ atk77_setprotect: @ 804FD8C mov r7, r8 push {r7} movs r6, 0x1 - ldr r2, _0804FE58 - ldr r1, _0804FE5C + ldr r2, =0x02024260 + ldr r1, =0x0202420b ldrb r3, [r1] lsls r0, r3, 1 adds r0, r2 ldrh r0, [r0] mov r8, r1 - ldr r7, _0804FE60 + ldr r7, =0x020242bc cmp r0, 0xB6 beq _0804FDBC cmp r0, 0xC5 @@ -162319,16 +156460,16 @@ atk77_setprotect: @ 804FD8C movs r1, 0 strb r1, [r0, 0x8] _0804FDBC: - ldr r0, _0804FE64 + ldr r0, =0x02024082 ldrb r1, [r0] - ldr r0, _0804FE68 + ldr r0, =0x0202406c ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 bne _0804FDCC movs r6, 0 _0804FDCC: - ldr r2, _0804FE6C + ldr r2, =0x0831c3d8 mov r5, r8 ldrb r1, [r5] lsls r0, r1, 3 @@ -162346,8 +156487,8 @@ _0804FDCC: bcc _0804FE80 cmp r6, 0 beq _0804FE80 - ldr r4, _0804FE70 - ldr r3, _0804FE74 + ldr r4, =0x0831c898 + ldr r3, =0x020241ea ldrh r0, [r3] lsls r1, r0, 1 adds r1, r0 @@ -162356,7 +156497,7 @@ _0804FDCC: ldrb r0, [r1] cmp r0, 0x6F bne _0804FE1C - ldr r0, _0804FE78 + ldr r0, =0x0202433c ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -162364,7 +156505,7 @@ _0804FDCC: movs r2, 0x1 orrs r0, r2 strb r0, [r1] - ldr r1, _0804FE7C + ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] _0804FE1C: @@ -162376,7 +156517,7 @@ _0804FE1C: ldrb r0, [r1] cmp r0, 0x74 bne _0804FE42 - ldr r0, _0804FE78 + ldr r0, =0x0202433c ldrb r1, [r5] lsls r1, 4 adds r1, r0 @@ -162384,7 +156525,7 @@ _0804FE1C: movs r2, 0x2 orrs r0, r2 strb r0, [r1] - ldr r1, _0804FE7C + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] _0804FE42: @@ -162399,19 +156540,10 @@ _0804FE42: strb r0, [r1, 0x8] b _0804FEA2 .align 2, 0 -_0804FE58: .4byte 0x02024260 -_0804FE5C: .4byte 0x0202420b -_0804FE60: .4byte 0x020242bc -_0804FE64: .4byte 0x02024082 -_0804FE68: .4byte 0x0202406c -_0804FE6C: .4byte 0x0831c3d8 -_0804FE70: .4byte 0x0831c898 -_0804FE74: .4byte 0x020241ea -_0804FE78: .4byte 0x0202433c -_0804FE7C: .4byte 0x02024332 + .pool _0804FE80: - ldr r2, _0804FEB4 - ldr r0, _0804FEB8 + ldr r2, =0x020242bc + ldr r0, =0x0202420b ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -162419,16 +156551,16 @@ _0804FE80: adds r0, r2 movs r1, 0 strb r1, [r0, 0x8] - ldr r1, _0804FEBC + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - ldr r2, _0804FEC0 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] _0804FEA2: - ldr r1, _0804FEC4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -162438,11 +156570,7 @@ _0804FEA2: pop {r0} bx r0 .align 2, 0 -_0804FEB4: .4byte 0x020242bc -_0804FEB8: .4byte 0x0202420b -_0804FEBC: .4byte 0x02024332 -_0804FEC0: .4byte 0x0202427c -_0804FEC4: .4byte 0x02024214 + .pool thumb_func_end atk77_setprotect thumb_func_start atk78_faintifabilitynotdamp @@ -162450,17 +156578,17 @@ atk78_faintifabilitynotdamp: @ 804FEC8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0804FF84 + ldr r0, =0x02024068 ldr r2, [r0] cmp r2, 0 bne _0804FFCC - ldr r1, _0804FF88 + ldr r1, =0x0202420c strb r2, [r1] - ldr r0, _0804FF8C + ldr r0, =0x0202406c ldrb r3, [r0] adds r5, r1, 0 mov r8, r0 - ldr r6, _0804FF90 + ldr r6, =0x02024084 cmp r2, r3 bcs _0804FF14 adds r0, r6, 0 @@ -162492,23 +156620,23 @@ _0804FF14: ldrb r1, [r1] cmp r0, r1 bne _0804FFB0 - ldr r4, _0804FF94 - ldr r7, _0804FF98 + ldr r4, =0x02024064 + ldr r7, =0x0202420b ldrb r0, [r7] strb r0, [r4] - ldr r2, _0804FF9C + ldr r2, =0x020241f0 ldrb r1, [r4] movs r0, 0x58 muls r0, r1 adds r0, r6 ldrh r0, [r0, 0x28] str r0, [r2] - ldr r1, _0804FFA0 + ldr r1, =0x00007fff movs r0, 0 bl dp01_build_cmdbuf_x18_0_aa_health_bar_update ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0804FFA4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -162520,9 +156648,9 @@ _0804FF14: beq _0804FFCC adds r3, r5, 0 ldrb r5, [r7] - ldr r7, _0804FFA8 + ldr r7, =0x0832a328 adds r4, r0, 0 - ldr r6, _0804FFAC + ldr r6, =0x02024210 _0804FF60: ldrb r2, [r3] cmp r2, r5 @@ -162544,19 +156672,9 @@ _0804FF76: bcc _0804FF60 b _0804FFCC .align 2, 0 -_0804FF84: .4byte 0x02024068 -_0804FF88: .4byte 0x0202420c -_0804FF8C: .4byte 0x0202406c -_0804FF90: .4byte 0x02024084 -_0804FF94: .4byte 0x02024064 -_0804FF98: .4byte 0x0202420b -_0804FF9C: .4byte 0x020241f0 -_0804FFA0: .4byte 0x00007fff -_0804FFA4: .4byte 0x02024214 -_0804FFA8: .4byte 0x0832a328 -_0804FFAC: .4byte 0x02024210 + .pool _0804FFB0: - ldr r1, _0804FFD8 + ldr r1, =0x0202420a movs r0, 0x6 strb r0, [r1] ldrb r0, [r5] @@ -162566,8 +156684,8 @@ _0804FFB0: adds r1, 0x20 ldrb r1, [r1] bl b_history__record_ability_usage_of_player - ldr r1, _0804FFDC - ldr r0, _0804FFE0 + ldr r1, =0x02024214 + ldr r0, =0x082db560 str r0, [r1] _0804FFCC: pop {r3} @@ -162576,24 +156694,22 @@ _0804FFCC: pop {r0} bx r0 .align 2, 0 -_0804FFD8: .4byte 0x0202420a -_0804FFDC: .4byte 0x02024214 -_0804FFE0: .4byte 0x082db560 + .pool thumb_func_end atk78_faintifabilitynotdamp thumb_func_start atk79_setuserhptozero atk79_setuserhptozero: @ 804FFE4 push {r4,lr} sub sp, 0x4 - ldr r0, _08050030 + ldr r0, =0x02024068 ldr r3, [r0] cmp r3, 0 bne _08050028 - ldr r4, _08050034 - ldr r0, _08050038 + ldr r4, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r4] - ldr r1, _0805003C + ldr r1, =0x02024084 ldrb r0, [r4] movs r2, 0x58 muls r0, r2 @@ -162611,7 +156727,7 @@ atk79_setuserhptozero: @ 804FFE4 bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08050040 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -162621,17 +156737,13 @@ _08050028: pop {r0} bx r0 .align 2, 0 -_08050030: .4byte 0x02024068 -_08050034: .4byte 0x02024064 -_08050038: .4byte 0x0202420b -_0805003C: .4byte 0x02024084 -_08050040: .4byte 0x02024214 + .pool thumb_func_end atk79_setuserhptozero thumb_func_start sub_8050044 sub_8050044: @ 8050044 push {r4-r7,lr} - ldr r3, _080500BC + ldr r3, =0x02024214 ldr r2, [r3] ldrb r4, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -162643,24 +156755,24 @@ sub_8050044: @ 8050044 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r4, r0 - ldr r0, _080500C0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 adds r7, r3, 0 cmp r0, 0 beq _080500DC - ldr r0, _080500C4 + ldr r0, =0x0202420c ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r2, _080500C8 + ldr r2, =0x0202420b lsls r1, 24 lsrs r1, 24 adds r3, r0, 0 - ldr r6, _080500CC - ldr r5, _080500D0 - ldr r0, _080500D4 + ldr r6, =0x02024210 + ldr r5, =0x0832a328 + ldr r0, =0x0202406c mov r12, r0 ldrb r0, [r2] cmp r1, r0 @@ -162693,13 +156805,7 @@ _0805009A: str r0, [r7] b _080500E0 .align 2, 0 -_080500BC: .4byte 0x02024214 -_080500C0: .4byte 0x02022fec -_080500C4: .4byte 0x0202420c -_080500C8: .4byte 0x0202420b -_080500CC: .4byte 0x02024210 -_080500D0: .4byte 0x0832a328 -_080500D4: .4byte 0x0202406c + .pool _080500D8: str r4, [r7] b _080500E0 @@ -162715,7 +156821,7 @@ _080500E0: thumb_func_start sub_80500E8 sub_80500E8: @ 80500E8 push {r4-r6,lr} - ldr r4, _08050144 + ldr r4, =0x02024214 ldr r1, [r4] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -162728,15 +156834,15 @@ sub_80500E8: @ 80500E8 lsls r0, 24 orrs r2, r0 ldrb r0, [r1, 0x5] - ldr r3, _08050148 + ldr r3, =0x0202420c cmp r0, 0x1 bne _08050110 - ldr r0, _0805014C + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r3] _08050110: - ldr r1, _08050150 - ldr r6, _08050154 + ldr r1, =0x020241f0 + ldr r6, =0x02024084 ldrb r0, [r3] movs r5, 0x58 muls r0, r5 @@ -162762,11 +156868,7 @@ _0805012A: str r2, [r4] b _0805015E .align 2, 0 -_08050144: .4byte 0x02024214 -_08050148: .4byte 0x0202420c -_0805014C: .4byte 0x0202420b -_08050150: .4byte 0x020241f0 -_08050154: .4byte 0x02024084 + .pool _08050158: ldr r0, [r4] adds r0, 0x6 @@ -162785,8 +156887,8 @@ sub_8050164: @ 8050164 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r2, _08050204 - ldr r0, _08050208 + ldr r2, =0x0202406c + ldr r0, =0x0202420b mov r10, r0 movs r1, 0 add r0, sp, 0x4 @@ -162801,13 +156903,13 @@ _0805017A: ldrb r1, [r2] cmp r5, r1 bge _080501D0 - ldr r0, _08050208 + ldr r0, =0x0202420b ldrb r6, [r0] - ldr r2, _0805020C + ldr r2, =0x0000ffff mov r9, r2 lsls r4, r6, 3 mov r2, sp - ldr r0, _08050210 + ldr r0, =0x0202449c mov r12, r0 adds r7, r1, 0 _080501A0: @@ -162839,7 +156941,7 @@ _080501C8: _080501D0: mov r1, r10 ldrb r0, [r1] - ldr r2, _08050210 + ldr r2, =0x0202449c ldr r1, [r2] lsls r0, 1 adds r0, r1 @@ -162852,32 +156954,26 @@ _080501D0: orrs r3, r0 cmp r3, 0 beq _08050220 - ldr r0, _0805020C + ldr r0, =0x0000ffff cmp r3, r0 beq _08050220 - ldr r2, _08050214 + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _08050218 + ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, _0805021C + ldr r4, =0x020241ea strh r3, [r4] b _0805024A .align 2, 0 -_08050204: .4byte 0x0202406c -_08050208: .4byte 0x0202420b -_0805020C: .4byte 0x0000ffff -_08050210: .4byte 0x0202449c -_08050214: .4byte 0x02024280 -_08050218: .4byte 0xfffffbff -_0805021C: .4byte 0x020241ea + .pool _08050220: mov r0, r8 cmp r0, 0 beq _08050290 - ldr r2, _08050274 + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _08050278 + ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] bl GenerateRandomNumber @@ -162886,7 +156982,7 @@ _08050220: mov r1, r8 bl __modsi3 adds r5, r0, 0 - ldr r4, _0805027C + ldr r4, =0x020241ea lsls r0, r5, 1 add r0, sp ldrh r0, [r0] @@ -162895,11 +156991,11 @@ _0805024A: ldrh r0, [r4] movs r1, 0 bl sub_80458E0 - ldr r1, _08050280 + ldr r1, =0x0202420c strb r0, [r1] - ldr r5, _08050284 - ldr r3, _08050288 - ldr r2, _0805028C + ldr r5, =0x02024214 + ldr r3, =0x082d86a8 + ldr r2, =0x0831c898 ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -162912,15 +157008,9 @@ _0805024A: str r0, [r5] b _080502AE .align 2, 0 -_08050274: .4byte 0x02024280 -_08050278: .4byte 0xfffffbff -_0805027C: .4byte 0x020241ea -_08050280: .4byte 0x0202420c -_08050284: .4byte 0x02024214 -_08050288: .4byte 0x082d86a8 -_0805028C: .4byte 0x0831c898 + .pool _08050290: - ldr r2, _080502C0 + ldr r2, =0x0202437c mov r0, r10 ldrb r1, [r0] lsls r0, r1, 2 @@ -162931,7 +157021,7 @@ _08050290: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r1, _080502C4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -162945,61 +157035,56 @@ _080502AE: pop {r0} bx r0 .align 2, 0 -_080502C0: .4byte 0x0202437c -_080502C4: .4byte 0x02024214 + .pool thumb_func_end sub_8050164 thumb_func_start sub_80502C8 sub_80502C8: @ 80502C8 push {lr} - ldr r2, _080502E8 + ldr r2, =0x020243cc ldrh r0, [r2] movs r1, 0x7 ands r1, r0 cmp r1, 0 beq _080502F4 - ldr r2, _080502EC + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _080502F0 + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] b _08050304 .align 2, 0 -_080502E8: .4byte 0x020243cc -_080502EC: .4byte 0x0202427c -_080502F0: .4byte 0x02024332 + .pool _080502F4: movs r0, 0x1 strh r0, [r2] - ldr r0, _08050310 + ldr r0, =0x02024332 strb r1, [r0, 0x5] - ldr r0, _08050314 + ldr r0, =0x020243d0 adds r0, 0x28 movs r1, 0x5 strb r1, [r0] _08050304: - ldr r1, _08050318 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08050310: .4byte 0x02024332 -_08050314: .4byte 0x020243d0 -_08050318: .4byte 0x02024214 + .pool thumb_func_end sub_80502C8 thumb_func_start atk7E_setreflect atk7E_setreflect: @ 805031C push {r4-r6,lr} - ldr r6, _0805034C + ldr r6, =0x0202420b ldrb r0, [r6] bl battle_get_per_side_status - ldr r4, _08050350 + ldr r4, =0x0202428e movs r5, 0x1 adds r1, r5, 0 ands r1, r0 @@ -163010,19 +157095,16 @@ atk7E_setreflect: @ 805031C ands r0, r1 cmp r0, 0 beq _0805035C - ldr r2, _08050354 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08050358 + ldr r1, =0x02024332 movs r0, 0 b _080503D0 .align 2, 0 -_0805034C: .4byte 0x0202420b -_08050350: .4byte 0x0202428e -_08050354: .4byte 0x0202427c -_08050358: .4byte 0x02024332 + .pool _0805035C: ldrb r0, [r6] bl battle_get_per_side_status @@ -163036,7 +157118,7 @@ _0805035C: strh r0, [r1] ldrb r0, [r6] bl battle_get_per_side_status - ldr r4, _080503C0 + ldr r4, =0x02024294 adds r1, r5, 0 ands r1, r0 lsls r0, r1, 1 @@ -163055,7 +157137,7 @@ _0805035C: adds r0, r4 ldrb r1, [r6] strb r1, [r0, 0x1] - ldr r0, _080503C4 + ldr r0, =0x02022fec ldr r0, [r0] ands r0, r5 cmp r0, 0 @@ -163066,20 +157148,18 @@ _0805035C: lsrs r1, r0, 24 cmp r1, 0x2 bne _080503CC - ldr r0, _080503C8 + ldr r0, =0x02024332 strb r1, [r0, 0x5] b _080503D2 .align 2, 0 -_080503C0: .4byte 0x02024294 -_080503C4: .4byte 0x02022fec -_080503C8: .4byte 0x02024332 + .pool _080503CC: - ldr r1, _080503E0 + ldr r1, =0x02024332 movs r0, 0x1 _080503D0: strb r0, [r1, 0x5] _080503D2: - ldr r1, _080503E4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -163087,8 +157167,7 @@ _080503D2: pop {r0} bx r0 .align 2, 0 -_080503E0: .4byte 0x02024332 -_080503E4: .4byte 0x02024214 + .pool thumb_func_end atk7E_setreflect thumb_func_start sub_80503E8 @@ -163097,15 +157176,15 @@ sub_80503E8: @ 80503E8 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r7, _08050428 + ldr r7, =0x0202427c ldrb r5, [r7] movs r0, 0x29 ands r0, r5 cmp r0, 0 bne _0805041A - ldr r0, _0805042C + ldr r0, =0x020242ac mov r9, r0 - ldr r1, _08050430 + ldr r1, =0x0202420c mov r8, r1 ldrb r4, [r1] lsls r0, r4, 2 @@ -163122,17 +157201,14 @@ _0805041A: movs r0, 0x1 orrs r0, r5 strb r0, [r7] - ldr r1, _08050434 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] b _08050488 .align 2, 0 -_08050428: .4byte 0x0202427c -_0805042C: .4byte 0x020242ac -_08050430: .4byte 0x0202420c -_08050434: .4byte 0x02024332 + .pool _08050438: - ldr r1, _08050464 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r4 adds r1, r0, r1 @@ -163150,15 +157226,14 @@ _08050454: movs r0, 0x1 orrs r0, r5 strb r0, [r7] - ldr r1, _08050468 + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] b _08050488 .align 2, 0 -_08050464: .4byte 0x02024084 -_08050468: .4byte 0x02024332 + .pool _0805046C: - ldr r0, _0805049C + ldr r0, =0x0202420b ldrb r0, [r0] orrs r2, r0 str r2, [r6] @@ -163170,10 +157245,10 @@ _0805046C: mov r2, r12 orrs r0, r2 str r0, [r1] - ldr r0, _080504A0 + ldr r0, =0x02024332 strb r3, [r0, 0x5] _08050488: - ldr r1, _080504A4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -163184,15 +157259,13 @@ _08050488: pop {r0} bx r0 .align 2, 0 -_0805049C: .4byte 0x0202420b -_080504A0: .4byte 0x02024332 -_080504A4: .4byte 0x02024214 + .pool thumb_func_end sub_80503E8 thumb_func_start atk80_manipulatedamage atk80_manipulatedamage: @ 80504A8 push {r4,lr} - ldr r1, _080504C0 + ldr r1, =0x02024214 ldr r0, [r1] ldrb r2, [r0, 0x1] adds r4, r1, 0 @@ -163204,20 +157277,20 @@ atk80_manipulatedamage: @ 80504A8 beq _080504CA b _08050518 .align 2, 0 -_080504C0: .4byte 0x02024214 + .pool _080504C4: cmp r2, 0x2 beq _08050510 b _08050518 _080504CA: - ldr r1, _080504D4 + ldr r1, =0x020241f0 ldr r0, [r1] negs r0, r0 b _08050516 .align 2, 0 -_080504D4: .4byte 0x020241f0 + .pool _080504D8: - ldr r3, _08050504 + ldr r3, =0x020241f0 ldr r0, [r3] lsrs r1, r0, 31 adds r0, r1 @@ -163227,8 +157300,8 @@ _080504D8: bne _080504EA str r2, [r3] _080504EA: - ldr r2, _08050508 - ldr r0, _0805050C + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -163241,11 +157314,9 @@ _080504EA: str r1, [r3] b _08050518 .align 2, 0 -_08050504: .4byte 0x020241f0 -_08050508: .4byte 0x02024084 -_0805050C: .4byte 0x0202420c + .pool _08050510: - ldr r1, _08050524 + ldr r1, =0x020241f0 ldr r0, [r1] lsls r0, 1 _08050516: @@ -163258,14 +157329,14 @@ _08050518: pop {r0} bx r0 .align 2, 0 -_08050524: .4byte 0x020241f0 + .pool thumb_func_end atk80_manipulatedamage thumb_func_start atk81_setrest atk81_setrest: @ 8050528 push {r4-r7,lr} sub sp, 0x4 - ldr r0, _08050580 + ldr r0, =0x02024214 mov r12, r0 ldr r1, [r0] ldrb r6, [r1, 0x1] @@ -163278,14 +157349,14 @@ atk81_setrest: @ 8050528 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r6, r0 - ldr r5, _08050584 - ldr r2, _08050588 - ldr r0, _0805058C + ldr r5, =0x02024064 + ldr r2, =0x0202420c + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r2] strb r0, [r5] - ldr r4, _08050590 - ldr r1, _08050594 + ldr r4, =0x020241f0 + ldr r1, =0x02024084 ldrb r0, [r2] movs r3, 0x58 muls r0, r3 @@ -163308,12 +157379,7 @@ atk81_setrest: @ 8050528 str r6, [r0] b _080505E8 .align 2, 0 -_08050580: .4byte 0x02024214 -_08050584: .4byte 0x02024064 -_08050588: .4byte 0x0202420c -_0805058C: .4byte 0x0202420b -_08050590: .4byte 0x020241f0 -_08050594: .4byte 0x02024084 + .pool _08050598: adds r0, r2, 0 adds r0, 0x4C @@ -163323,14 +157389,14 @@ _08050598: ands r1, r0 cmp r1, 0 beq _080505B4 - ldr r1, _080505B0 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] b _080505B8 .align 2, 0 -_080505B0: .4byte 0x02024332 + .pool _080505B4: - ldr r0, _080505F0 + ldr r0, =0x02024332 strb r1, [r0, 0x5] _080505B8: ldrb r0, [r5] @@ -163351,7 +157417,7 @@ _080505B8: bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _080505F4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -163361,14 +157427,13 @@ _080505E8: pop {r0} bx r0 .align 2, 0 -_080505F0: .4byte 0x02024332 -_080505F4: .4byte 0x02024214 + .pool thumb_func_end atk81_setrest thumb_func_start atk82_jumpifnotfirstturn atk82_jumpifnotfirstturn: @ 80505F8 push {r4,r5,lr} - ldr r5, _0805062C + ldr r5, =0x02024214 ldr r4, [r5] ldrb r3, [r4, 0x1] ldrb r0, [r4, 0x2] @@ -163380,8 +157445,8 @@ atk82_jumpifnotfirstturn: @ 80505F8 ldrb r0, [r4, 0x4] lsls r0, 24 orrs r3, r0 - ldr r2, _08050630 - ldr r0, _08050634 + ldr r2, =0x020242bc + ldr r0, =0x0202420b ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -163394,9 +157459,7 @@ atk82_jumpifnotfirstturn: @ 80505F8 str r0, [r5] b _0805063A .align 2, 0 -_0805062C: .4byte 0x02024214 -_08050630: .4byte 0x020242bc -_08050634: .4byte 0x0202420b + .pool _08050638: str r3, [r5] _0805063A: @@ -163407,13 +157470,13 @@ _0805063A: thumb_func_start sub_8050640 sub_8050640: @ 8050640 - ldr r1, _0805064C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_0805064C: .4byte 0x02024214 + .pool thumb_func_end sub_8050640 thumb_func_start sub_8050650 @@ -163424,12 +157487,12 @@ sub_8050650: @ 8050650 lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r0, _080506A8 + ldr r0, =0x0202406c ldrb r1, [r0] mov r8, r0 cmp r2, r1 bge _080506C4 - ldr r0, _080506AC + ldr r0, =0x02024084 mov r12, r0 movs r0, 0x58 muls r0, r3 @@ -163438,8 +157501,8 @@ sub_8050650: @ 8050650 adds r5, 0x20 adds r4, r1, 0 movs r3, 0 - ldr r6, _080506B0 - ldr r7, _080506B4 + ldr r6, =0x02024474 + ldr r7, =0x02024332 _0805067C: mov r0, r12 adds r0, 0x50 @@ -163454,7 +157517,7 @@ _0805067C: beq _080506BC movs r3, 0 strb r2, [r6, 0x17] - ldr r1, _080506B8 + ldr r1, =0x0202420c ldrb r0, [r1] cmp r0, 0xFF beq _080506DC @@ -163464,11 +157527,7 @@ _0805067C: strb r0, [r7, 0x5] b _080506C4 .align 2, 0 -_080506A8: .4byte 0x0202406c -_080506AC: .4byte 0x02024084 -_080506B0: .4byte 0x02024474 -_080506B4: .4byte 0x02024332 -_080506B8: .4byte 0x0202420c + .pool _080506BC: adds r3, 0x58 adds r2, 0x1 @@ -163482,11 +157541,11 @@ _080506C4: movs r0, 0x1 b _080506E2 _080506D0: - ldr r0, _080506D8 + ldr r0, =0x02024332 strb r3, [r0, 0x5] b _080506C4 .align 2, 0 -_080506D8: .4byte 0x02024332 + .pool _080506DC: strb r2, [r1] b _080506C4 @@ -163503,7 +157562,7 @@ _080506E2: thumb_func_start sub_80506EC sub_80506EC: @ 80506EC push {r4-r6,lr} - ldr r5, _08050718 + ldr r5, =0x02024214 ldr r1, [r5] ldrb r4, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -163515,7 +157574,7 @@ sub_80506EC: @ 80506EC ldrb r0, [r1, 0x4] lsls r0, 24 orrs r4, r0 - ldr r6, _0805071C + ldr r6, =0x0202420c ldrb r0, [r6] bl sub_8050650 lsls r0, 24 @@ -163524,10 +157583,9 @@ sub_80506EC: @ 80506EC str r4, [r5] b _08050762 .align 2, 0 -_08050718: .4byte 0x02024214 -_0805071C: .4byte 0x0202420c + .pool _08050720: - ldr r1, _08050750 + ldr r1, =0x02024084 ldrb r3, [r6] movs r0, 0x58 muls r0, r3 @@ -163540,9 +157598,9 @@ _08050720: cmp r1, 0x48 bne _0805075C _08050738: - ldr r2, _08050754 + ldr r2, =0x0202420a strb r0, [r2] - ldr r1, _08050758 + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] str r4, [r5] @@ -163551,9 +157609,7 @@ _08050738: bl b_history__record_ability_usage_of_player b _08050762 .align 2, 0 -_08050750: .4byte 0x02024084 -_08050754: .4byte 0x0202420a -_08050758: .4byte 0x02024332 + .pool _0805075C: ldr r0, [r5] adds r0, 0x5 @@ -163567,8 +157623,8 @@ _08050762: thumb_func_start sub_8050768 sub_8050768: @ 8050768 push {r4,r5,lr} - ldr r5, _08050790 - ldr r4, _08050794 + ldr r5, =0x020242bc + ldr r4, =0x0202420b ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -163577,25 +157633,22 @@ sub_8050768: @ 8050768 ldrb r0, [r1, 0x9] cmp r0, 0x3 bne _080507A0 - ldr r2, _08050798 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _0805079C + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] b _080507CA .align 2, 0 -_08050790: .4byte 0x020242bc -_08050794: .4byte 0x0202420b -_08050798: .4byte 0x0202427c -_0805079C: .4byte 0x02024332 + .pool _080507A0: adds r0, 0x1 movs r3, 0 strb r0, [r1, 0x9] - ldr r2, _080507D8 + ldr r2, =0x02022f58 movs r0, 0xFD strb r0, [r2] movs r0, 0x1 @@ -163611,10 +157664,10 @@ _080507A0: strb r0, [r2, 0x4] movs r0, 0xFF strb r0, [r2, 0x5] - ldr r0, _080507DC + ldr r0, =0x02024332 strb r3, [r0, 0x5] _080507CA: - ldr r1, _080507E0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -163622,9 +157675,7 @@ _080507CA: pop {r0} bx r0 .align 2, 0 -_080507D8: .4byte 0x02022f58 -_080507DC: .4byte 0x02024332 -_080507E0: .4byte 0x02024214 + .pool thumb_func_end sub_8050768 thumb_func_start atk86_stockpiletobasedamage @@ -163633,7 +157684,7 @@ atk86_stockpiletobasedamage: @ 80507E4 mov r7, r8 push {r7} sub sp, 0x10 - ldr r3, _0805081C + ldr r3, =0x02024214 ldr r1, [r3] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -163645,8 +157696,8 @@ atk86_stockpiletobasedamage: @ 80507E4 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r2, r0 - ldr r7, _08050820 - ldr r6, _08050824 + ldr r7, =0x020242bc + ldr r6, =0x0202420b ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -163658,18 +157709,16 @@ atk86_stockpiletobasedamage: @ 80507E4 str r2, [r3] b _080508CA .align 2, 0 -_0805081C: .4byte 0x02024214 -_08050820: .4byte 0x020242bc -_08050824: .4byte 0x0202420b + .pool _08050828: - ldr r0, _080508D8 + ldr r0, =0x02024332 ldrb r0, [r0, 0x6] cmp r0, 0x1 beq _080508B0 - ldr r0, _080508DC + ldr r0, =0x020241f0 mov r8, r0 - ldr r4, _080508E0 - ldr r5, _080508E4 + ldr r4, =0x0202428e + ldr r5, =0x0202420c ldrb r0, [r5] bl battle_get_per_side_status movs r1, 0x1 @@ -163680,12 +157729,12 @@ _08050828: ldrb r0, [r6] movs r4, 0x58 muls r0, r4 - ldr r2, _080508E8 + ldr r2, =0x02024084 adds r0, r2 ldrb r1, [r5] muls r1, r4 adds r1, r2 - ldr r2, _080508EC + ldr r2, =0x020241ea ldrh r2, [r2] movs r4, 0 str r4, [sp] @@ -163705,7 +157754,7 @@ _08050828: muls r3, r1 mov r1, r8 str r3, [r1] - ldr r2, _080508F0 + ldr r2, =0x02024474 ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -163713,7 +157762,7 @@ _08050828: adds r0, r7 ldrb r0, [r0, 0x9] strb r0, [r2, 0x18] - ldr r1, _080508F4 + ldr r1, =0x0202433c ldrb r0, [r6] lsls r0, 4 adds r0, r1 @@ -163728,8 +157777,8 @@ _08050828: mov r1, r8 str r0, [r1] _080508B0: - ldr r2, _080508F8 - ldr r0, _080508FC + ldr r2, =0x020242bc + ldr r0, =0x0202420b ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -163737,7 +157786,7 @@ _080508B0: adds r0, r2 movs r1, 0 strb r1, [r0, 0x9] - ldr r1, _08050900 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -163749,17 +157798,7 @@ _080508CA: pop {r0} bx r0 .align 2, 0 -_080508D8: .4byte 0x02024332 -_080508DC: .4byte 0x020241f0 -_080508E0: .4byte 0x0202428e -_080508E4: .4byte 0x0202420c -_080508E8: .4byte 0x02024084 -_080508EC: .4byte 0x020241ea -_080508F0: .4byte 0x02024474 -_080508F4: .4byte 0x0202433c -_080508F8: .4byte 0x020242bc -_080508FC: .4byte 0x0202420b -_08050900: .4byte 0x02024214 + .pool thumb_func_end atk86_stockpiletobasedamage thumb_func_start atk87_stockpiletohprecovery @@ -163767,7 +157806,7 @@ atk87_stockpiletohprecovery: @ 8050904 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _08050944 + ldr r7, =0x02024214 ldr r1, [r7] ldrb r2, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -163779,9 +157818,9 @@ atk87_stockpiletohprecovery: @ 8050904 ldrb r0, [r1, 0x4] lsls r0, 24 orrs r2, r0 - ldr r0, _08050948 + ldr r0, =0x020242bc mov r8, r0 - ldr r6, _0805094C + ldr r6, =0x0202420b ldrb r3, [r6] lsls r0, r3, 3 subs r0, r3 @@ -163792,16 +157831,13 @@ atk87_stockpiletohprecovery: @ 8050904 cmp r1, 0 bne _08050954 str r2, [r7] - ldr r0, _08050950 + ldr r0, =0x02024332 strb r1, [r0, 0x5] b _080509D0 .align 2, 0 -_08050944: .4byte 0x02024214 -_08050948: .4byte 0x020242bc -_0805094C: .4byte 0x0202420b -_08050950: .4byte 0x02024332 + .pool _08050954: - ldr r1, _08050978 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 adds r1, r0, r1 @@ -163812,19 +157848,17 @@ _08050954: movs r0, 0 strb r0, [r4, 0x9] str r2, [r7] - ldr r1, _0805097C + ldr r1, =0x0202420c ldrb r0, [r6] strb r0, [r1] - ldr r1, _08050980 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] b _080509D0 .align 2, 0 -_08050978: .4byte 0x02024084 -_0805097C: .4byte 0x0202420c -_08050980: .4byte 0x02024332 + .pool _08050984: - ldr r5, _080509DC + ldr r5, =0x020241f0 ldrh r0, [r1, 0x2C] ldrb r1, [r4, 0x9] movs r2, 0x3 @@ -163841,7 +157875,7 @@ _080509A0: ldr r0, [r5] negs r0, r0 str r0, [r5] - ldr r3, _080509E0 + ldr r3, =0x02024474 ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -163859,7 +157893,7 @@ _080509A0: ldr r0, [r7] adds r0, 0x5 str r0, [r7] - ldr r1, _080509E4 + ldr r1, =0x0202420c ldrb r0, [r6] strb r0, [r1] _080509D0: @@ -163869,16 +157903,14 @@ _080509D0: pop {r0} bx r0 .align 2, 0 -_080509DC: .4byte 0x020241f0 -_080509E0: .4byte 0x02024474 -_080509E4: .4byte 0x0202420c + .pool thumb_func_end atk87_stockpiletohprecovery thumb_func_start atk88_negativedamage atk88_negativedamage: @ 80509E8 push {lr} - ldr r2, _08050A10 - ldr r0, _08050A14 + ldr r2, =0x020241f0 + ldr r0, =0x020241f4 ldr r0, [r0] lsrs r1, r0, 31 adds r0, r1 @@ -163891,16 +157923,14 @@ atk88_negativedamage: @ 80509E8 negs r0, r0 str r0, [r2] _08050A04: - ldr r1, _08050A18 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08050A10: .4byte 0x020241f0 -_08050A14: .4byte 0x020241f4 -_08050A18: .4byte 0x02024214 + .pool thumb_func_end atk88_negativedamage thumb_func_start sub_8050A1C @@ -163924,15 +157954,14 @@ sub_8050A1C: @ 8050A1C ands r0, r5 cmp r0, 0 beq _08050A50 - ldr r0, _08050A48 - ldr r1, _08050A4C + ldr r0, =0x02024064 + ldr r1, =0x0202420b b _08050A54 .align 2, 0 -_08050A48: .4byte 0x02024064 -_08050A4C: .4byte 0x0202420b + .pool _08050A50: - ldr r0, _08050AF4 - ldr r1, _08050AF8 + ldr r0, =0x02024064 + ldr r1, =0x0202420c _08050A54: ldrb r1, [r1] strb r1, [r0] @@ -163962,7 +157991,7 @@ _08050A6E: _08050A84: movs r0, 0xDF ands r5, r0 - ldr r1, _08050AFC + ldr r1, =0x02022f58 movs r4, 0 movs r2, 0xFD strb r2, [r1] @@ -163979,8 +158008,8 @@ _08050A84: blt _08050AA8 b _08050D8C _08050AA8: - ldr r4, _08050B00 - ldr r1, _08050AF4 + ldr r4, =0x02024294 + ldr r1, =0x02024064 ldrb r0, [r1] bl battle_get_per_side_status movs r1, 0x1 @@ -163995,14 +158024,14 @@ _08050AA8: mov r2, r9 cmp r2, 0 bne _08050B48 - ldr r0, _08050B04 + ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xAE beq _08050B78 cmp r5, 0x1 bne _08050B68 - ldr r4, _08050B08 - ldr r3, _08050AF4 + ldr r4, =0x0202437c + ldr r3, =0x02024064 ldrb r0, [r3] lsls r1, r0, 2 adds r1, r0 @@ -164012,27 +158041,21 @@ _08050AA8: lsls r0, 31 cmp r0, 0 beq _08050B10 - ldr r0, _08050B0C + ldr r0, =0x02024214 mov r4, r8 str r4, [r0] b _08050B68 .align 2, 0 -_08050AF4: .4byte 0x02024064 -_08050AF8: .4byte 0x0202420c -_08050AFC: .4byte 0x02022f58 -_08050B00: .4byte 0x02024294 -_08050B04: .4byte 0x020241ea -_08050B08: .4byte 0x0202437c -_08050B0C: .4byte 0x02024214 + .pool _08050B10: mov r0, r8 bl b_movescr_stack_push - ldr r1, _08050B38 - ldr r6, _08050B3C + ldr r1, =0x02024474 + ldr r6, =0x02024064 ldrb r0, [r6] strb r0, [r1, 0x17] - ldr r1, _08050B40 - ldr r0, _08050B44 + ldr r1, =0x02024214 + ldr r0, =0x082dae03 str r0, [r1] ldrb r1, [r6] lsls r0, r1, 2 @@ -164045,12 +158068,9 @@ _08050B10: strb r1, [r0] b _08050B68 .align 2, 0 -_08050B38: .4byte 0x02024474 -_08050B3C: .4byte 0x02024064 -_08050B40: .4byte 0x02024214 -_08050B44: .4byte 0x082dae03 + .pool _08050B48: - ldr r0, _08050B6C + ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xAE beq _08050B78 @@ -164062,19 +158082,17 @@ _08050B48: lsls r0, 24 cmp r0, 0 beq _08050B78 - ldr r1, _08050B70 - ldr r0, _08050B74 + ldr r1, =0x02024214 + ldr r0, =0x082d9f1c str r0, [r1] _08050B68: movs r0, 0x1 b _08050E80 .align 2, 0 -_08050B6C: .4byte 0x020241ea -_08050B70: .4byte 0x02024214 -_08050B74: .4byte 0x082d9f1c + .pool _08050B78: - ldr r2, _08050BC0 - ldr r1, _08050BC4 + ldr r2, =0x02024084 + ldr r1, =0x02024064 ldrb r3, [r1] movs r4, 0x58 adds r0, r3, 0 @@ -164091,13 +158109,13 @@ _08050B94: mov r0, r9 cmp r0, 0 bne _08050C2C - ldr r0, _08050BC8 + ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xAE beq _08050C2C cmp r5, 0x1 bne _08050B68 - ldr r4, _08050BCC + ldr r4, =0x0202437c lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -164106,27 +158124,23 @@ _08050B94: lsls r0, 31 cmp r0, 0 beq _08050BD4 - ldr r0, _08050BD0 + ldr r0, =0x02024214 mov r1, r8 str r1, [r0] b _08050B68 .align 2, 0 -_08050BC0: .4byte 0x02024084 -_08050BC4: .4byte 0x02024064 -_08050BC8: .4byte 0x020241ea -_08050BCC: .4byte 0x0202437c -_08050BD0: .4byte 0x02024214 + .pool _08050BD4: mov r0, r8 bl b_movescr_stack_push - ldr r1, _08050C18 - ldr r2, _08050C1C + ldr r1, =0x02024474 + ldr r2, =0x02024064 ldrb r0, [r2] strb r0, [r1, 0x17] - ldr r1, _08050C20 - ldr r0, _08050C24 + ldr r1, =0x02024214 + ldr r0, =0x082db5c7 str r0, [r1] - ldr r1, _08050C28 + ldr r1, =0x0202420a ldrb r0, [r2] movs r3, 0x58 muls r0, r3 @@ -164137,7 +158151,7 @@ _08050BD4: ldrb r0, [r2] ldrb r1, [r1] bl b_history__record_ability_usage_of_player - ldr r6, _08050C1C + ldr r6, =0x02024064 ldrb r1, [r6] lsls r0, r1, 2 adds r0, r1 @@ -164149,13 +158163,9 @@ _08050BD4: strb r1, [r0] b _08050B68 .align 2, 0 -_08050C18: .4byte 0x02024474 -_08050C1C: .4byte 0x02024064 -_08050C20: .4byte 0x02024214 -_08050C24: .4byte 0x082db5c7 -_08050C28: .4byte 0x0202420a + .pool _08050C2C: - ldr r1, _08050C78 + ldr r1, =0x02024064 ldrb r0, [r1] movs r4, 0x58 muls r0, r4 @@ -164173,14 +158183,14 @@ _08050C2C: bne _08050B68 mov r0, r8 bl b_movescr_stack_push - ldr r1, _08050C7C - ldr r3, _08050C78 + ldr r1, =0x02024474 + ldr r3, =0x02024064 ldrb r0, [r3] strb r0, [r1, 0x17] - ldr r1, _08050C80 - ldr r0, _08050C84 + ldr r1, =0x02024214 + ldr r0, =0x082db62f str r0, [r1] - ldr r1, _08050C88 + ldr r1, =0x0202420a ldrb r0, [r3] muls r0, r4 add r0, r10 @@ -164192,13 +158202,9 @@ _08050C2C: bl b_history__record_ability_usage_of_player b _08050B68 .align 2, 0 -_08050C78: .4byte 0x02024064 -_08050C7C: .4byte 0x02024474 -_08050C80: .4byte 0x02024214 -_08050C84: .4byte 0x082db62f -_08050C88: .4byte 0x0202420a + .pool _08050C8C: - ldr r4, _08050CDC + ldr r4, =0x02024064 ldrb r0, [r4] movs r4, 0x58 muls r0, r4 @@ -164218,14 +158224,14 @@ _08050C8C: _08050CAE: mov r0, r8 bl b_movescr_stack_push - ldr r1, _08050CE0 - ldr r2, _08050CDC + ldr r1, =0x02024474 + ldr r2, =0x02024064 ldrb r0, [r2] strb r0, [r1, 0x17] - ldr r1, _08050CE4 - ldr r0, _08050CE8 + ldr r1, =0x02024214 + ldr r0, =0x082db62f str r0, [r1] - ldr r1, _08050CEC + ldr r1, =0x0202420a ldrb r0, [r2] muls r0, r4 add r0, r10 @@ -164237,13 +158243,9 @@ _08050CAE: bl b_history__record_ability_usage_of_player b _08050B68 .align 2, 0 -_08050CDC: .4byte 0x02024064 -_08050CE0: .4byte 0x02024474 -_08050CE4: .4byte 0x02024214 -_08050CE8: .4byte 0x082db62f -_08050CEC: .4byte 0x0202420a + .pool _08050CF0: - ldr r3, _08050D7C + ldr r3, =0x02024064 ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -164262,7 +158264,7 @@ _08050D08: ands r0, r1 negs r0, r0 lsls r0, 24 - ldr r3, _08050D80 + ldr r3, =0x02022f68 movs r4, 0 movs r1, 0xFD strb r1, [r3] @@ -164291,7 +158293,7 @@ _08050D32: adds r1, r2, r3 movs r0, 0xFF strb r0, [r1] - ldr r4, _08050D7C + ldr r4, =0x02024064 ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -164305,9 +158307,9 @@ _08050D32: cmp r0, 0 beq _08050DE2 movs r1, 0 - ldr r0, _08050D84 + ldr r0, =0x0202420c ldrb r0, [r0] - ldr r3, _08050D88 + ldr r3, =0x02024332 mov r8, r3 cmp r0, r2 bne _08050D76 @@ -164317,15 +158319,12 @@ _08050D76: strb r1, [r4, 0x5] b _08050E10 .align 2, 0 -_08050D7C: .4byte 0x02024064 -_08050D80: .4byte 0x02022f68 -_08050D84: .4byte 0x0202420c -_08050D88: .4byte 0x02024332 + .pool _08050D8C: asrs r6, r0, 28 movs r0, 0x7 ands r6, r0 - ldr r3, _08050DEC + ldr r3, =0x02022f68 strb r2, [r3] movs r2, 0x1 cmp r6, 0x2 @@ -164351,8 +158350,8 @@ _08050DA6: mov r2, r12 orrs r0, r2 strb r0, [r1] - ldr r2, _08050DF0 - ldr r4, _08050DF4 + ldr r2, =0x02024084 + ldr r4, =0x02024064 ldrb r3, [r4] movs r0, 0x58 muls r0, r3 @@ -164367,21 +158366,18 @@ _08050DA6: cmp r0, 0xC bne _08050DFC _08050DE2: - ldr r1, _08050DF8 + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] mov r8, r1 b _08050E10 .align 2, 0 -_08050DEC: .4byte 0x02022f68 -_08050DF0: .4byte 0x02024084 -_08050DF4: .4byte 0x02024064 -_08050DF8: .4byte 0x02024332 + .pool _08050DFC: movs r1, 0 - ldr r0, _08050E90 + ldr r0, =0x0202420c ldrb r0, [r0] - ldr r2, _08050E94 + ldr r2, =0x02024332 mov r8, r2 cmp r0, r3 bne _08050E0C @@ -164390,7 +158386,7 @@ _08050E0C: mov r3, r8 strb r1, [r3, 0x5] _08050E10: - ldr r2, _08050E98 + ldr r2, =0x02024064 ldrb r0, [r2] movs r4, 0x58 adds r1, r0, 0 @@ -164415,7 +158411,7 @@ _08050E10: movs r0, 0 strb r0, [r1] _08050E40: - ldr r1, _08050E98 + ldr r1, =0x02024064 ldrb r0, [r1] muls r0, r4 adds r0, r7, r0 @@ -164435,7 +158431,7 @@ _08050E56: ands r3, r5 cmp r3, 0 beq _08050E70 - ldr r0, _08050E9C + ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 @@ -164459,16 +158455,13 @@ _08050E80: pop {r1} bx r1 .align 2, 0 -_08050E90: .4byte 0x0202420c -_08050E94: .4byte 0x02024332 -_08050E98: .4byte 0x02024064 -_08050E9C: .4byte 0x0202427c + .pool thumb_func_end sub_8050A1C thumb_func_start atk89_statbuffchange atk89_statbuffchange: @ 8050EA0 push {r4,r5,lr} - ldr r5, _08050EE4 + ldr r5, =0x02024214 ldr r2, [r5] ldrb r3, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -164480,7 +158473,7 @@ atk89_statbuffchange: @ 8050EA0 ldrb r0, [r2, 0x5] lsls r0, 24 orrs r3, r0 - ldr r0, _08050EE8 + ldr r0, =0x02024474 ldrb r4, [r0, 0x1A] movs r0, 0xF0 ands r0, r4 @@ -164501,21 +158494,20 @@ _08050EDC: pop {r0} bx r0 .align 2, 0 -_08050EE4: .4byte 0x02024214 -_08050EE8: .4byte 0x02024474 + .pool thumb_func_end atk89_statbuffchange thumb_func_start atk8A_normalisebuffs atk8A_normalisebuffs: @ 8050EEC push {r4-r7,lr} movs r2, 0 - ldr r0, _08050F34 + ldr r0, =0x0202406c ldrb r1, [r0] - ldr r0, _08050F38 + ldr r0, =0x02024214 mov r12, r0 cmp r2, r1 bge _08050F24 - ldr r0, _08050F3C + ldr r0, =0x02024084 movs r4, 0x6 adds r5, r1, 0 movs r7, 0x58 @@ -164546,16 +158538,14 @@ _08050F24: pop {r0} bx r0 .align 2, 0 -_08050F34: .4byte 0x0202406c -_08050F38: .4byte 0x02024214 -_08050F3C: .4byte 0x02024084 + .pool thumb_func_end atk8A_normalisebuffs thumb_func_start atk8B_setbide atk8B_setbide: @ 8050F40 push {r4,r5,lr} - ldr r4, _08050F98 - ldr r3, _08050F9C + ldr r4, =0x02024084 + ldr r3, =0x0202420b ldrb r0, [r3] movs r5, 0x58 adds r2, r0, 0 @@ -164567,15 +158557,15 @@ atk8B_setbide: @ 8050F40 lsls r1, 5 orrs r0, r1 str r0, [r2] - ldr r1, _08050FA0 + ldr r1, =0x02024268 ldrb r0, [r3] lsls r0, 1 adds r0, r1 - ldr r1, _08050FA4 + ldr r1, =0x020241ea ldrh r1, [r1] movs r2, 0 strh r1, [r0] - ldr r1, _08050FA8 + ldr r1, =0x020241f8 ldrb r0, [r3] lsls r0, 2 adds r0, r1 @@ -164589,7 +158579,7 @@ atk8B_setbide: @ 8050F40 lsls r2, 2 orrs r0, r2 str r0, [r1] - ldr r1, _08050FAC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -164597,19 +158587,14 @@ atk8B_setbide: @ 8050F40 pop {r0} bx r0 .align 2, 0 -_08050F98: .4byte 0x02024084 -_08050F9C: .4byte 0x0202420b -_08050FA0: .4byte 0x02024268 -_08050FA4: .4byte 0x020241ea -_08050FA8: .4byte 0x020241f8 -_08050FAC: .4byte 0x02024214 + .pool thumb_func_end atk8B_setbide thumb_func_start atk8C_confuseifrepeatingattackends atk8C_confuseifrepeatingattackends: @ 8050FB0 push {lr} - ldr r1, _08050FE0 - ldr r0, _08050FE4 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -164621,39 +158606,35 @@ atk8C_confuseifrepeatingattackends: @ 8050FB0 ands r0, r1 cmp r0, 0 bne _08050FD2 - ldr r1, _08050FE8 + ldr r1, =0x02024332 movs r0, 0x75 strb r0, [r1, 0x3] _08050FD2: - ldr r1, _08050FEC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08050FE0: .4byte 0x02024084 -_08050FE4: .4byte 0x0202420b -_08050FE8: .4byte 0x02024332 -_08050FEC: .4byte 0x02024214 + .pool thumb_func_end atk8C_confuseifrepeatingattackends thumb_func_start atk8D_setloopcounter atk8D_setloopcounter: @ 8050FF0 push {r4,r5,lr} - ldr r0, _08051004 + ldr r0, =0x02024214 ldr r0, [r0] ldrb r1, [r0, 0x1] cmp r1, 0 beq _0805100C - ldr r0, _08051008 + ldr r0, =0x02024212 strb r1, [r0] b _08051026 .align 2, 0 -_08051004: .4byte 0x02024214 -_08051008: .4byte 0x02024212 + .pool _0805100C: - ldr r4, _08051034 + ldr r4, =0x02024212 bl GenerateRandomNumber movs r5, 0x3 ands r0, r5 @@ -164666,7 +158647,7 @@ _08051022: adds r0, 0x2 strb r0, [r4] _08051026: - ldr r1, _08051038 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -164674,13 +158655,12 @@ _08051026: pop {r0} bx r0 .align 2, 0 -_08051034: .4byte 0x02024212 -_08051038: .4byte 0x02024214 + .pool thumb_func_end atk8D_setloopcounter thumb_func_start atk8E_cmd8e atk8E_cmd8e: @ 805103C - ldr r1, _0805105C + ldr r1, =0x02024474 movs r2, 0 movs r0, 0xFD strb r0, [r1, 0x8] @@ -164691,28 +158671,27 @@ atk8E_cmd8e: @ 805103C strb r2, [r1, 0xC] movs r0, 0xFF strb r0, [r1, 0xD] - ldr r1, _08051060 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_0805105C: .4byte 0x02024474 -_08051060: .4byte 0x02024214 + .pool thumb_func_end atk8E_cmd8e thumb_func_start sub_8051064 sub_8051064: @ 8051064 push {r4-r7,lr} - ldr r6, _08051098 - ldr r7, _0805109C + ldr r6, =0x02024084 + ldr r7, =0x0202420b ldrb r0, [r7] movs r5, 0x58 adds r1, r0, 0 muls r1, r5 adds r1, r6 adds r1, 0x2A - ldr r4, _080510A0 + ldr r4, =0x0202420c ldrb r3, [r4] adds r0, r3, 0 muls r0, r5 @@ -164722,19 +158701,15 @@ sub_8051064: @ 8051064 ldrb r0, [r0] cmp r1, r0 bcc _080510AC - ldr r0, _080510A4 + ldr r0, =0x0202449c ldr r1, [r0] adds r1, r3, r1 adds r1, 0x58 - ldr r2, _080510A8 + ldr r2, =0x0202406e lsls r0, r3, 1 b _08051108 .align 2, 0 -_08051098: .4byte 0x02024084 -_0805109C: .4byte 0x0202420b -_080510A0: .4byte 0x0202420c -_080510A4: .4byte 0x0202449c -_080510A8: .4byte 0x0202406e + .pool _080510AC: bl GenerateRandomNumber movs r3, 0xFF @@ -164758,7 +158733,7 @@ _080510AC: lsrs r1, 2 cmp r0, r1 bhi _080510FC - ldr r3, _080510F8 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -164774,20 +158749,20 @@ _080510AC: movs r0, 0 b _08051116 .align 2, 0 -_080510F8: .4byte 0x02024214 + .pool _080510FC: - ldr r0, _0805111C + ldr r0, =0x0202449c ldr r1, [r0] adds r1, r4, r1 adds r1, 0x58 - ldr r2, _08051120 + ldr r2, =0x0202406e lsls r0, r4, 1 _08051108: adds r0, r2 ldrh r0, [r0] strb r0, [r1] - ldr r1, _08051124 - ldr r0, _08051128 + ldr r1, =0x02024214 + ldr r0, =0x082dadd8 str r0, [r1] movs r0, 0x1 _08051116: @@ -164795,10 +158770,7 @@ _08051116: pop {r1} bx r1 .align 2, 0 -_0805111C: .4byte 0x0202449c -_08051120: .4byte 0x0202406e -_08051124: .4byte 0x02024214 -_08051128: .4byte 0x082dadd8 + .pool thumb_func_end sub_8051064 thumb_func_start sub_805112C @@ -164811,7 +158783,7 @@ sub_805112C: @ 805112C sub sp, 0xC movs r0, 0 str r0, [sp, 0x4] - ldr r5, _08051198 + ldr r5, =0x02022fec ldr r0, [r5] movs r1, 0x8 ands r0, r1 @@ -164819,15 +158791,15 @@ sub_805112C: @ 805112C bne _0805114A b _08051410 _0805114A: - ldr r4, _0805119C + ldr r4, =0x0202420c ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 - ldr r1, _080511A0 + ldr r1, =0x02024744 str r1, [sp] cmp r0, 0 bne _08051160 - ldr r0, _080511A4 + ldr r0, =0x020244ec str r0, [sp] _08051160: ldr r2, [r5] @@ -164837,7 +158809,7 @@ _08051160: ands r0, r1 cmp r0, r1 beq _08051182 - ldr r1, _080511A8 + ldr r1, =0x02000100 adds r0, r2, 0 ands r0, r1 cmp r0, r1 @@ -164848,7 +158820,7 @@ _08051160: cmp r0, 0 beq _080511C8 _08051182: - ldr r2, _0805119C + ldr r2, =0x0202420c ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -164860,11 +158832,7 @@ _08051182: movs r0, 0x6 b _080511B2 .align 2, 0 -_08051198: .4byte 0x02022fec -_0805119C: .4byte 0x0202420c -_080511A0: .4byte 0x02024744 -_080511A4: .4byte 0x020244ec -_080511A8: .4byte 0x02000100 + .pool _080511AC: movs r0, 0 mov r9, r0 @@ -164875,17 +158843,17 @@ _080511B2: mov r10, r0 movs r0, 0x1 str r0, [sp, 0x8] - ldr r2, _080511C4 + ldr r2, =0x0202406e ldrb r1, [r1] b _0805128E .align 2, 0 -_080511C4: .4byte 0x0202406e + .pool _080511C8: movs r0, 0x42 ands r0, r2 cmp r0, 0x42 beq _080511DA - ldr r1, _080511F8 + ldr r1, =0x02000040 adds r0, r2, 0 ands r0, r1 cmp r0, r1 @@ -164905,7 +158873,7 @@ _080511DA: movs r0, 0x6 b _08051202 .align 2, 0 -_080511F8: .4byte 0x02000040 + .pool _080511FC: movs r1, 0 mov r9, r1 @@ -164916,13 +158884,12 @@ _08051202: mov r10, r1 movs r0, 0x1 str r0, [sp, 0x8] - ldr r2, _08051214 - ldr r0, _08051218 + ldr r2, =0x0202406e + ldr r0, =0x0202420c ldrb r1, [r0] b _0805128E .align 2, 0 -_08051214: .4byte 0x0202406e -_08051218: .4byte 0x0202420c + .pool _0805121C: movs r0, 0x80 lsls r0, 8 @@ -164962,13 +158929,12 @@ _08051258: movs r1, 0x1 _08051260: str r1, [sp, 0x8] - ldr r2, _0805126C - ldr r0, _08051270 + ldr r2, =0x0202406e + ldr r0, =0x0202420c ldrb r1, [r0] b _0805128E .align 2, 0 -_0805126C: .4byte 0x0202406e -_08051270: .4byte 0x0202420c + .pool _08051274: movs r0, 0x1 ands r2, r0 @@ -164981,7 +158947,7 @@ _08051274: mov r10, r1 movs r0, 0x2 str r0, [sp, 0x8] - ldr r2, _080512A0 + ldr r2, =0x0202406e ldrb r1, [r4] _0805128E: lsls r0, r1, 1 @@ -164994,7 +158960,7 @@ _0805128E: ldrh r5, [r1] b _080512BE .align 2, 0 -_080512A0: .4byte 0x0202406e + .pool _080512A4: movs r1, 0 mov r9, r1 @@ -165003,7 +158969,7 @@ _080512A4: mov r10, r0 movs r1, 0x1 str r1, [sp, 0x8] - ldr r1, _08051320 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -165045,7 +159011,7 @@ _080512FC: ldr r0, [sp, 0x8] cmp r1, r0 bgt _08051328 - ldr r3, _08051324 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -165060,8 +159026,7 @@ _080512FC: str r1, [r3] b _08051414 .align 2, 0 -_08051320: .4byte 0x0202406e -_08051324: .4byte 0x02024214 + .pool _08051328: bl sub_8051064 lsls r0, 24 @@ -165099,9 +159064,9 @@ _08051332: cmp r0, 0 beq _08051332 _08051378: - ldr r4, _080513FC + ldr r4, =0x0202420c ldrb r0, [r4] - ldr r1, _08051400 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 adds r0, 0x5C @@ -165113,7 +159078,7 @@ _08051378: ldrb r0, [r4] bl sub_803BDA0 _08051396: - ldr r0, _08051404 + ldr r0, =0x02022fec ldr r2, [r0] movs r1, 0x81 lsls r1, 1 @@ -165125,17 +159090,17 @@ _08051396: ands r0, r2 cmp r0, 0x42 beq _080513C0 - ldr r1, _08051408 + ldr r1, =0x02000100 adds r0, r2, 0 ands r0, r1 cmp r0, r1 beq _080513C0 - ldr r0, _0805140C + ldr r0, =0x02000040 ands r2, r0 cmp r2, r0 bne _080513DE _080513C0: - ldr r5, _080513FC + ldr r5, =0x0202420c ldrb r0, [r5] lsls r4, r6, 24 lsrs r4, 24 @@ -165149,25 +159114,21 @@ _080513C0: movs r2, 0x1 bl sub_81B8E80 _080513DE: - ldr r0, _08051404 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 beq _08051414 - ldr r0, _080513FC + ldr r0, =0x0202420c ldrb r0, [r0] lsls r1, r6, 24 lsrs r1, 24 bl sub_80571DC b _08051414 .align 2, 0 -_080513FC: .4byte 0x0202420c -_08051400: .4byte 0x0202449c -_08051404: .4byte 0x02022fec -_08051408: .4byte 0x02000100 -_0805140C: .4byte 0x02000040 + .pool _08051410: bl sub_8051064 _08051414: @@ -165189,8 +159150,8 @@ sub_8051424: @ 8051424 mov r5, r8 push {r5-r7} movs r6, 0 - ldr r2, _080514B8 - ldr r3, _080514BC + ldr r2, =0x02024084 + ldr r3, =0x0202420b ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -165221,11 +159182,11 @@ _08051466: movs r3, 0 cmp r3, r6 bcs _080514E8 - ldr r0, _080514C0 + ldr r0, =0x0831c898 mov r10, r0 - ldr r5, _080514B8 + ldr r5, =0x02024084 mov r12, r5 - ldr r7, _080514BC + ldr r7, =0x0202420b ldrb r0, [r7] movs r4, 0x58 adds r5, r0, 0 @@ -165261,9 +159222,7 @@ _080514B2: movs r2, 0x7 b _080514C6 .align 2, 0 -_080514B8: .4byte 0x02024084 -_080514BC: .4byte 0x0202420b -_080514C0: .4byte 0x0831c898 + .pool _080514C4: movs r2, 0 _080514C6: @@ -165288,7 +159247,7 @@ _080514DE: _080514E8: cmp r3, r6 bne _0805150C - ldr r3, _08051508 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -165303,10 +159262,10 @@ _080514E8: str r1, [r3] b _080515B0 .align 2, 0 -_08051508: .4byte 0x02024214 + .pool _0805150C: movs r7, 0x3 - ldr r5, _08051564 + ldr r5, =0x0831c898 mov r9, r5 _08051512: bl GenerateRandomNumber @@ -165314,9 +159273,9 @@ _08051512: ands r3, r7 cmp r3, r6 bcs _08051512 - ldr r4, _08051568 + ldr r4, =0x02024084 lsls r1, r3, 1 - ldr r3, _0805156C + ldr r3, =0x0202420b ldrb r2, [r3] movs r0, 0x58 adds r5, r2, 0 @@ -165351,9 +159310,7 @@ _08051560: movs r2, 0x7 b _08051572 .align 2, 0 -_08051564: .4byte 0x0831c898 -_08051568: .4byte 0x02024084 -_0805156C: .4byte 0x0202420b + .pool _08051570: movs r2, 0 _08051572: @@ -165376,7 +159333,7 @@ _08051572: add r0, r8 adds r0, 0x22 strb r2, [r0] - ldr r1, _080515C0 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -165384,7 +159341,7 @@ _08051572: strb r2, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, _080515C4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -165397,38 +159354,37 @@ _080515B0: pop {r0} bx r0 .align 2, 0 -_080515C0: .4byte 0x02022f58 -_080515C4: .4byte 0x02024214 + .pool thumb_func_end sub_8051424 thumb_func_start atk91_givemoney atk91_givemoney: @ 80515C8 push {r4,lr} - ldr r0, _08051630 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08051634 + ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 bne _08051650 - ldr r1, _08051638 + ldr r1, =0x0202432e ldrh r0, [r1] cmp r0, 0 beq _08051650 adds r1, r0, 0 - ldr r0, _0805163C + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x4A ldrb r0, [r0] adds r4, r1, 0 muls r4, r0 - ldr r0, _08051640 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 adds r0, r1 adds r1, r4, 0 bl add_money - ldr r1, _08051644 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x1 @@ -165445,24 +159401,17 @@ atk91_givemoney: @ 80515C8 strb r4, [r1, 0x5] movs r0, 0xFF strb r0, [r1, 0x6] - ldr r4, _08051648 + ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push - ldr r0, _0805164C + ldr r0, =0x082db307 str r0, [r4] b _08051658 .align 2, 0 -_08051630: .4byte 0x02022fec -_08051634: .4byte 0x02000002 -_08051638: .4byte 0x0202432e -_0805163C: .4byte 0x0202449c -_08051640: .4byte 0x03005d8c -_08051644: .4byte 0x02022f58 -_08051648: .4byte 0x02024214 -_0805164C: .4byte 0x082db307 + .pool _08051650: - ldr r1, _08051660 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -165471,16 +159420,16 @@ _08051658: pop {r0} bx r0 .align 2, 0 -_08051660: .4byte 0x02024214 + .pool thumb_func_end atk91_givemoney thumb_func_start atk92_setlightscreen atk92_setlightscreen: @ 8051664 push {r4-r6,lr} - ldr r5, _08051694 + ldr r5, =0x0202420b ldrb r0, [r5] bl battle_get_per_side_status - ldr r4, _08051698 + ldr r4, =0x0202428e movs r6, 0x1 adds r1, r6, 0 ands r1, r0 @@ -165491,19 +159440,16 @@ atk92_setlightscreen: @ 8051664 ands r0, r1 cmp r0, 0 beq _080516A4 - ldr r2, _0805169C + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _080516A0 + ldr r1, =0x02024332 movs r0, 0 b _08051718 .align 2, 0 -_08051694: .4byte 0x0202420b -_08051698: .4byte 0x0202428e -_0805169C: .4byte 0x0202427c -_080516A0: .4byte 0x02024332 + .pool _080516A4: ldrb r0, [r5] bl battle_get_per_side_status @@ -165517,7 +159463,7 @@ _080516A4: strh r0, [r1] ldrb r0, [r5] bl battle_get_per_side_status - ldr r4, _08051708 + ldr r4, =0x02024294 adds r1, r6, 0 ands r1, r0 lsls r0, r1, 1 @@ -165536,7 +159482,7 @@ _080516A4: adds r0, r4 ldrb r1, [r5] strb r1, [r0, 0x3] - ldr r0, _0805170C + ldr r0, =0x02022fec ldr r0, [r0] ands r0, r6 cmp r0, 0 @@ -165547,19 +159493,17 @@ _080516A4: lsrs r0, 24 cmp r0, 0x2 bne _08051714 - ldr r1, _08051710 + ldr r1, =0x02024332 movs r0, 0x4 b _08051718 .align 2, 0 -_08051708: .4byte 0x02024294 -_0805170C: .4byte 0x02022fec -_08051710: .4byte 0x02024332 + .pool _08051714: - ldr r1, _08051728 + ldr r1, =0x02024332 movs r0, 0x3 _08051718: strb r0, [r1, 0x5] - ldr r1, _0805172C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -165567,8 +159511,7 @@ _08051718: pop {r0} bx r0 .align 2, 0 -_08051728: .4byte 0x02024332 -_0805172C: .4byte 0x02024214 + .pool thumb_func_end atk92_setlightscreen thumb_func_start atk93_ko_move @@ -165577,8 +159520,8 @@ atk93_ko_move: @ 8051730 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r7, _0805175C - ldr r6, _08051760 + ldr r7, =0x02024084 + ldr r6, =0x0202420c ldrb r2, [r6] movs r5, 0x58 adds r0, r2, 0 @@ -165587,7 +159530,7 @@ atk93_ko_move: @ 8051730 ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _08051768 - ldr r1, _08051764 + ldr r1, =0x02024404 lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -165596,9 +159539,7 @@ atk93_ko_move: @ 8051730 ldrb r6, [r0, 0x1A] b _08051782 .align 2, 0 -_0805175C: .4byte 0x02024084 -_08051760: .4byte 0x0202420c -_08051764: .4byte 0x02024404 + .pool _08051768: ldrh r0, [r1, 0x2E] bl itemid_get_x12 @@ -165612,8 +159553,8 @@ _08051768: lsls r0, 24 lsrs r6, r0, 24 _08051782: - ldr r1, _080517FC - ldr r5, _08051800 + ldr r1, =0x0202420f + ldr r5, =0x0202420c ldrb r0, [r5] strb r0, [r1] cmp r4, 0x27 @@ -165630,7 +159571,7 @@ _08051782: ldrb r0, [r5] movs r1, 0x27 bl b_history__record_item_x12_of_player - ldr r2, _08051804 + ldr r2, =0x0202437c ldrb r1, [r5] lsls r0, r1, 2 adds r0, r1 @@ -165641,8 +159582,8 @@ _08051782: orrs r1, r2 strb r1, [r0] _080517C0: - ldr r1, _08051808 - ldr r2, _08051800 + ldr r1, =0x02024084 + ldr r2, =0x0202420c ldrb r3, [r2] movs r6, 0x58 adds r0, r3, 0 @@ -165655,15 +159596,15 @@ _080517C0: mov r9, r2 cmp r4, 0x5 bne _0805181C - ldr r2, _0805180C + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r0, _08051810 + ldr r0, =0x0202420a strb r4, [r0] - ldr r1, _08051814 - ldr r0, _08051818 + ldr r1, =0x02024214 + ldr r0, =0x082db552 str r0, [r1] mov r1, r9 ldrb r0, [r1] @@ -165671,16 +159612,9 @@ _080517C0: bl b_history__record_ability_usage_of_player b _08051A70 .align 2, 0 -_080517FC: .4byte 0x0202420f -_08051800: .4byte 0x0202420c -_08051804: .4byte 0x0202437c -_08051808: .4byte 0x02024084 -_0805180C: .4byte 0x0202427c -_08051810: .4byte 0x0202420a -_08051814: .4byte 0x02024214 -_08051818: .4byte 0x082db552 + .pool _0805181C: - ldr r1, _08051890 + ldr r1, =0x020242ac lsls r0, r3, 2 adds r0, r1 ldr r0, [r0] @@ -165688,14 +159622,14 @@ _0805181C: ands r0, r1 cmp r0, 0 bne _080518A0 - ldr r1, _08051894 - ldr r0, _08051898 + ldr r1, =0x0831c898 + ldr r0, =0x020241ea ldrh r0, [r0] lsls r2, r0, 1 adds r2, r0 lsls r2, 2 adds r2, r1 - ldr r7, _0805189C + ldr r7, =0x0202420b ldrb r0, [r7] muls r0, r6 add r0, r8 @@ -165738,17 +159672,14 @@ _08051870: bcs _08051936 b _08051A08 .align 2, 0 -_08051890: .4byte 0x020242ac -_08051894: .4byte 0x0831c898 -_08051898: .4byte 0x020241ea -_0805189C: .4byte 0x0202420b + .pool _080518A0: - ldr r1, _0805196C + ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 lsls r0, 2 adds r0, r1 - ldr r1, _08051970 + ldr r1, =0x0202420b ldrb r0, [r0, 0x15] adds r7, r1, 0 ldrb r3, [r7] @@ -165765,21 +159696,21 @@ _080518A0: cmp r0, r1 bcs _08051942 _080518CA: - ldr r1, _08051974 - ldr r0, _08051978 + ldr r1, =0x0831c898 + ldr r0, =0x020241ea ldrh r0, [r0] lsls r2, r0, 1 adds r2, r0 lsls r2, 2 adds r2, r1 - ldr r6, _0805197C + ldr r6, =0x02024084 ldrb r0, [r7] movs r5, 0x58 muls r0, r5 adds r0, r6 adds r0, 0x2A ldrb r1, [r0] - ldr r0, _08051980 + ldr r0, =0x0202420c mov r8, r0 ldrb r0, [r0] muls r0, r5 @@ -165819,14 +159750,14 @@ _080518CA: _08051934: movs r4, 0 _08051936: - ldr r3, _0805197C + ldr r3, =0x02024084 mov r8, r3 - ldr r0, _08051980 + ldr r0, =0x0202420c mov r9, r0 cmp r4, 0 beq _08051A08 _08051942: - ldr r0, _08051984 + ldr r0, =0x0202433c mov r1, r9 ldrb r2, [r1] lsls r1, r2, 4 @@ -165835,29 +159766,21 @@ _08051942: lsls r0, 30 cmp r0, 0 bge _08051990 - ldr r1, _08051988 + ldr r1, =0x020241f0 movs r0, 0x58 muls r0, r2 add r0, r8 ldrh r0, [r0, 0x28] subs r0, 0x1 str r0, [r1] - ldr r2, _0805198C + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x40 b _080519EE .align 2, 0 -_0805196C: .4byte 0x020242bc -_08051970: .4byte 0x0202420b -_08051974: .4byte 0x0831c898 -_08051978: .4byte 0x020241ea -_0805197C: .4byte 0x02024084 -_08051980: .4byte 0x0202420c -_08051984: .4byte 0x0202433c -_08051988: .4byte 0x020241f0 -_0805198C: .4byte 0x0202427c + .pool _08051990: - ldr r0, _080519CC + ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -165866,7 +159789,7 @@ _08051990: lsrs r0, 7 cmp r0, 0 beq _080519DC - ldr r1, _080519D0 + ldr r1, =0x020241f0 movs r3, 0x58 adds r0, r2, 0 muls r0, r3 @@ -165874,12 +159797,12 @@ _08051990: ldrh r0, [r0, 0x28] subs r0, 0x1 str r0, [r1] - ldr r2, _080519D4 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _080519D8 + ldr r1, =0x02024208 mov r2, r9 ldrb r0, [r2] muls r0, r3 @@ -165888,48 +159811,43 @@ _08051990: strh r0, [r1] b _080519F2 .align 2, 0 -_080519CC: .4byte 0x0202437c -_080519D0: .4byte 0x020241f0 -_080519D4: .4byte 0x0202427c -_080519D8: .4byte 0x02024208 + .pool _080519DC: - ldr r1, _080519FC + ldr r1, =0x020241f0 movs r0, 0x58 muls r0, r2 add r0, r8 ldrh r0, [r0, 0x28] str r0, [r1] - ldr r2, _08051A00 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x10 _080519EE: orrs r0, r1 strb r0, [r2] _080519F2: - ldr r1, _08051A04 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08051A70 .align 2, 0 -_080519FC: .4byte 0x020241f0 -_08051A00: .4byte 0x0202427c -_08051A04: .4byte 0x02024214 + .pool _08051A08: - ldr r2, _08051A3C + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r3, _08051A40 - ldr r0, _08051A44 + ldr r3, =0x02024084 + ldr r0, =0x0202420b ldrb r0, [r0] movs r2, 0x58 adds r1, r0, 0 muls r1, r2 adds r1, r3 adds r1, 0x2A - ldr r0, _08051A48 + ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -165938,21 +159856,17 @@ _08051A08: ldrb r0, [r0] cmp r1, r0 bcc _08051A50 - ldr r1, _08051A4C + ldr r1, =0x02024332 movs r0, 0 b _08051A54 .align 2, 0 -_08051A3C: .4byte 0x0202427c -_08051A40: .4byte 0x02024084 -_08051A44: .4byte 0x0202420b -_08051A48: .4byte 0x0202420c -_08051A4C: .4byte 0x02024332 + .pool _08051A50: - ldr r1, _08051A7C + ldr r1, =0x02024332 movs r0, 0x1 _08051A54: strb r0, [r1, 0x5] - ldr r3, _08051A80 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -165973,16 +159887,15 @@ _08051A70: pop {r0} bx r0 .align 2, 0 -_08051A7C: .4byte 0x02024332 -_08051A80: .4byte 0x02024214 + .pool thumb_func_end atk93_ko_move thumb_func_start atk94_gethalfcurrentenemyhp atk94_gethalfcurrentenemyhp: @ 8051A84 push {lr} - ldr r3, _08051AB0 - ldr r2, _08051AB4 - ldr r0, _08051AB8 + ldr r3, =0x020241f0 + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -165995,62 +159908,55 @@ atk94_gethalfcurrentenemyhp: @ 8051A84 movs r0, 0x1 str r0, [r3] _08051AA2: - ldr r1, _08051ABC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08051AB0: .4byte 0x020241f0 -_08051AB4: .4byte 0x02024084 -_08051AB8: .4byte 0x0202420c -_08051ABC: .4byte 0x02024214 + .pool thumb_func_end atk94_gethalfcurrentenemyhp thumb_func_start sub_8051AC0 sub_8051AC0: @ 8051AC0 push {lr} - ldr r2, _08051AE0 + ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x18 ands r0, r1 cmp r0, 0 beq _08051AEC - ldr r2, _08051AE4 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08051AE8 + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] b _08051AFE .align 2, 0 -_08051AE0: .4byte 0x020243cc -_08051AE4: .4byte 0x0202427c -_08051AE8: .4byte 0x02024332 + .pool _08051AEC: movs r0, 0x8 strh r0, [r2] - ldr r1, _08051B0C + ldr r1, =0x02024332 movs r0, 0x3 strb r0, [r1, 0x5] - ldr r0, _08051B10 + ldr r0, =0x020243d0 adds r0, 0x28 movs r1, 0x5 strb r1, [r0] _08051AFE: - ldr r1, _08051B14 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08051B0C: .4byte 0x02024332 -_08051B10: .4byte 0x020243d0 -_08051B14: .4byte 0x02024214 + .pool thumb_func_end sub_8051AC0 thumb_func_start sub_8051B18 @@ -166081,15 +159987,15 @@ _08051B36: beq _08051B4C b _08051C48 _08051B4C: - ldr r2, _08051BC0 + ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x18 ands r0, r1 adds r4, r2, 0 - ldr r5, _08051BC4 + ldr r5, =0x0202420b cmp r0, 0 beq _08051BDA - ldr r0, _08051BC8 + ldr r0, =0x02024084 ldrb r2, [r5] movs r1, 0x58 muls r1, r2 @@ -166117,7 +160023,7 @@ _08051B4C: ldrb r0, [r0] cmp r0, 0x8 beq _08051BD4 - ldr r0, _08051BCC + ldr r0, =0x020242ac lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -166130,7 +160036,7 @@ _08051B4C: ands r1, r0 cmp r1, 0 bne _08051BD4 - ldr r1, _08051BD0 + ldr r1, =0x020241f0 ldrh r0, [r3, 0x2C] lsrs r0, 4 str r0, [r1] @@ -166139,13 +160045,9 @@ _08051B4C: movs r0, 0x1 b _08051BD8 .align 2, 0 -_08051BC0: .4byte 0x020243cc -_08051BC4: .4byte 0x0202420b -_08051BC8: .4byte 0x02024084 -_08051BCC: .4byte 0x020242ac -_08051BD0: .4byte 0x020241f0 + .pool _08051BD4: - ldr r1, _08051C30 + ldr r1, =0x020241f0 movs r0, 0 _08051BD8: str r0, [r1] @@ -166156,7 +160058,7 @@ _08051BDA: ands r0, r1 cmp r0, 0 beq _08051C50 - ldr r1, _08051C34 + ldr r1, =0x02024084 ldrb r3, [r5] movs r0, 0x58 muls r0, r3 @@ -166171,7 +160073,7 @@ _08051BDA: ldrb r0, [r0] cmp r0, 0xF beq _08051C3C - ldr r0, _08051C38 + ldr r0, =0x020242ac lsls r1, r3, 2 adds r1, r0 ldr r1, [r1] @@ -166184,7 +160086,7 @@ _08051BDA: ands r1, r0 cmp r1, 0 bne _08051C3C - ldr r1, _08051C30 + ldr r1, =0x020241f0 ldrh r0, [r2, 0x2C] lsrs r0, 4 str r0, [r1] @@ -166194,25 +160096,23 @@ _08051BDA: str r0, [r1] b _08051C50 .align 2, 0 -_08051C30: .4byte 0x020241f0 -_08051C34: .4byte 0x02024084 -_08051C38: .4byte 0x020242ac + .pool _08051C3C: - ldr r1, _08051C44 + ldr r1, =0x020241f0 movs r0, 0 str r0, [r1] b _08051C50 .align 2, 0 -_08051C44: .4byte 0x020241f0 + .pool _08051C48: - ldr r1, _08051C7C + ldr r1, =0x020241f0 movs r0, 0 str r0, [r1] - ldr r5, _08051C80 + ldr r5, =0x0202420b _08051C50: - ldr r0, _08051C84 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08051C88 + ldr r2, =0x0832a328 ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -166220,11 +160120,11 @@ _08051C50: ands r1, r0 cmp r1, 0 beq _08051C6A - ldr r1, _08051C7C + ldr r1, =0x020241f0 movs r0, 0 str r0, [r1] _08051C6A: - ldr r1, _08051C8C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -166233,11 +160133,7 @@ _08051C6A: pop {r0} bx r0 .align 2, 0 -_08051C7C: .4byte 0x020241f0 -_08051C80: .4byte 0x0202420b -_08051C84: .4byte 0x02024210 -_08051C88: .4byte 0x0832a328 -_08051C8C: .4byte 0x02024214 + .pool thumb_func_end sub_8051B18 thumb_func_start atk97_tryinfatuatetarget @@ -166247,65 +160143,60 @@ atk97_tryinfatuatetarget: @ 8051C90 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _08051CBC + ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _08051CC8 - ldr r1, _08051CC0 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08051CC4 + ldr r0, =0x020244ec b _08051CD8 .align 2, 0 -_08051CBC: .4byte 0x0202420b -_08051CC0: .4byte 0x0202406e -_08051CC4: .4byte 0x020244ec + .pool _08051CC8: - ldr r1, _08051CFC + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08051D00 + ldr r0, =0x02024744 _08051CD8: adds r5, r1, r0 - ldr r4, _08051D04 + ldr r4, =0x0202420c ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _08051D0C - ldr r1, _08051CFC + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08051D08 + ldr r0, =0x020244ec b _08051D1C .align 2, 0 -_08051CFC: .4byte 0x0202406e -_08051D00: .4byte 0x02024744 -_08051D04: .4byte 0x0202420c -_08051D08: .4byte 0x020244ec + .pool _08051D0C: - ldr r1, _08051D78 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08051D7C + ldr r0, =0x02024744 _08051D1C: adds r4, r1, r0 adds r0, r5, 0 @@ -166328,33 +160219,27 @@ _08051D1C: movs r1, 0 bl pokemon_getattr adds r7, r0, 0 - ldr r5, _08051D80 + ldr r5, =0x0202420c ldrb r0, [r5] movs r6, 0x58 muls r0, r6 - ldr r1, _08051D84 + ldr r1, =0x02024084 adds r0, r1 adds r0, 0x20 ldrb r2, [r0] cmp r2, 0xC bne _08051D94 - ldr r1, _08051D88 - ldr r0, _08051D8C + ldr r1, =0x02024214 + ldr r0, =0x082db5f5 str r0, [r1] - ldr r0, _08051D90 + ldr r0, =0x0202420a strb r2, [r0] ldrb r0, [r5] movs r1, 0xC bl b_history__record_ability_usage_of_player b _08051E2C .align 2, 0 -_08051D78: .4byte 0x0202406e -_08051D7C: .4byte 0x02024744 -_08051D80: .4byte 0x0202420c -_08051D84: .4byte 0x02024084 -_08051D88: .4byte 0x02024214 -_08051D8C: .4byte 0x082db5f5 -_08051D90: .4byte 0x0202420a + .pool _08051D94: mov r0, r10 mov r1, r9 @@ -166369,7 +160254,7 @@ _08051D94: beq _08051DE4 ldrb r0, [r5] muls r0, r6 - ldr r4, _08051E00 + ldr r4, =0x02024084 adds r4, 0x50 adds r0, r4 ldr r0, [r0] @@ -166393,7 +160278,7 @@ _08051D94: cmp r0, 0xFF bne _08051E08 _08051DE4: - ldr r3, _08051E04 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -166408,15 +160293,14 @@ _08051DE4: str r1, [r3] b _08051E2C .align 2, 0 -_08051E00: .4byte 0x02024084 -_08051E04: .4byte 0x02024214 + .pool _08051E08: ldrb r0, [r5] adds r2, r0, 0 muls r2, r6 adds r2, r4 - ldr r1, _08051E3C - ldr r0, _08051E40 + ldr r1, =0x0832a328 + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -166425,7 +160309,7 @@ _08051E08: ldr r0, [r2] orrs r0, r1 str r0, [r2] - ldr r1, _08051E44 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -166438,27 +160322,25 @@ _08051E2C: pop {r0} bx r0 .align 2, 0 -_08051E3C: .4byte 0x0832a328 -_08051E40: .4byte 0x0202420b -_08051E44: .4byte 0x02024214 + .pool thumb_func_end atk97_tryinfatuatetarget thumb_func_start sub_8051E48 sub_8051E48: @ 8051E48 push {r4-r7,lr} - ldr r0, _08051E90 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 bne _08051F34 - ldr r5, _08051E94 + ldr r5, =0x02024214 ldr r1, [r5] ldrb r0, [r1, 0x1] cmp r0, 0x4 beq _08051EA0 bl get_battle_side_of_something - ldr r4, _08051E98 + ldr r4, =0x02024064 strb r0, [r4] - ldr r3, _08051E9C + ldr r3, =0x02024084 ldrb r1, [r4] movs r0, 0x58 adds r2, r1, 0 @@ -166479,18 +160361,15 @@ sub_8051E48: @ 8051E48 str r0, [r5] b _08051F34 .align 2, 0 -_08051E90: .4byte 0x02024068 -_08051E94: .4byte 0x02024214 -_08051E98: .4byte 0x02024064 -_08051E9C: .4byte 0x02024084 + .pool _08051EA0: - ldr r4, _08051F3C - ldr r5, _08051F40 + ldr r4, =0x02024064 + ldr r5, =0x0202420b ldrb r0, [r5] strb r0, [r4] - ldr r6, _08051F44 + ldr r6, =0x02024210 ldrb r1, [r6] - ldr r7, _08051F48 + ldr r7, =0x0832a328 ldrb r2, [r4] lsls r0, r2, 2 adds r0, r7 @@ -166498,7 +160377,7 @@ _08051EA0: ands r1, r0 cmp r1, 0 bne _08051EDC - ldr r3, _08051F4C + ldr r3, =0x02024084 movs r0, 0x58 muls r2, r0 adds r0, r3, 0 @@ -166513,7 +160392,7 @@ _08051EA0: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _08051EDC: - ldr r0, _08051F50 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -166535,7 +160414,7 @@ _08051EDC: ands r1, r0 cmp r1, 0 bne _08051F2C - ldr r3, _08051F4C + ldr r3, =0x02024084 movs r0, 0x58 muls r2, r0 adds r0, r3, 0 @@ -166550,7 +160429,7 @@ _08051EDC: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _08051F2C: - ldr r1, _08051F54 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -166559,20 +160438,14 @@ _08051F34: pop {r0} bx r0 .align 2, 0 -_08051F3C: .4byte 0x02024064 -_08051F40: .4byte 0x0202420b -_08051F44: .4byte 0x02024210 -_08051F48: .4byte 0x0832a328 -_08051F4C: .4byte 0x02024084 -_08051F50: .4byte 0x02022fec -_08051F54: .4byte 0x02024214 + .pool thumb_func_end sub_8051E48 thumb_func_start atk99_setmisteffect atk99_setmisteffect: @ 8051F58 push {r4-r6,lr} - ldr r6, _08051F88 - ldr r4, _08051F8C + ldr r6, =0x02024294 + ldr r4, =0x0202420b ldrb r0, [r4] bl battle_get_per_side_status movs r5, 0x1 @@ -166585,19 +160458,16 @@ atk99_setmisteffect: @ 8051F58 ldrb r0, [r0, 0x4] cmp r0, 0 beq _08051F98 - ldr r2, _08051F90 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r0, _08051F94 + ldr r0, =0x02024332 strb r5, [r0, 0x5] b _08051FE6 .align 2, 0 -_08051F88: .4byte 0x02024294 -_08051F8C: .4byte 0x0202420b -_08051F90: .4byte 0x0202427c -_08051F94: .4byte 0x02024332 + .pool _08051F98: ldrb r0, [r4] bl battle_get_per_side_status @@ -166621,7 +160491,7 @@ _08051F98: strb r1, [r0, 0x5] ldrb r0, [r4] bl battle_get_per_side_status - ldr r2, _08051FF4 + ldr r2, =0x0202428e adds r1, r5, 0 ands r1, r0 lsls r1, 1 @@ -166633,10 +160503,10 @@ _08051F98: movs r3, 0 orrs r0, r2 strh r0, [r1] - ldr r0, _08051FF8 + ldr r0, =0x02024332 strb r3, [r0, 0x5] _08051FE6: - ldr r1, _08051FFC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -166644,16 +160514,14 @@ _08051FE6: pop {r0} bx r0 .align 2, 0 -_08051FF4: .4byte 0x0202428e -_08051FF8: .4byte 0x02024332 -_08051FFC: .4byte 0x02024214 + .pool thumb_func_end atk99_setmisteffect thumb_func_start atk9A_setincreasedcriticalchance atk9A_setincreasedcriticalchance: @ 8052000 push {lr} - ldr r1, _08052030 - ldr r0, _08052034 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -166666,35 +160534,31 @@ atk9A_setincreasedcriticalchance: @ 8052000 ands r2, r3 cmp r2, 0 beq _08052040 - ldr r2, _08052038 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r1, _0805203C + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] b _08052048 .align 2, 0 -_08052030: .4byte 0x02024084 -_08052034: .4byte 0x0202420b -_08052038: .4byte 0x0202427c -_0805203C: .4byte 0x02024332 + .pool _08052040: orrs r1, r3 str r1, [r0] - ldr r0, _08052054 + ldr r0, =0x02024332 strb r2, [r0, 0x5] _08052048: - ldr r1, _08052058 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08052054: .4byte 0x02024332 -_08052058: .4byte 0x02024214 + .pool thumb_func_end atk9A_setincreasedcriticalchance thumb_func_start atk9B_transformdataexecution @@ -166702,16 +160566,16 @@ atk9B_transformdataexecution: @ 805205C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r1, _080520B4 - ldr r2, _080520B8 + ldr r1, =0x020241ec + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] - ldr r1, _080520BC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r7, _080520C0 - ldr r0, _080520C4 + ldr r7, =0x02024084 + ldr r0, =0x0202420c mov r12, r0 ldrb r1, [r0] movs r6, 0x58 @@ -166726,35 +160590,27 @@ atk9B_transformdataexecution: @ 805205C ands r0, r4 cmp r0, 0 bne _080520A2 - ldr r0, _080520C8 + ldr r0, =0x020242ac lsls r1, 2 adds r1, r0 ldr r2, [r1] - ldr r0, _080520CC + ldr r0, =0x000400c0 ands r2, r0 cmp r2, 0 beq _080520D8 _080520A2: - ldr r2, _080520D0 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x20 orrs r0, r1 strb r0, [r2] - ldr r1, _080520D4 + ldr r1, =0x02024332 movs r0, 0x1 b _080521EC .align 2, 0 -_080520B4: .4byte 0x020241ec -_080520B8: .4byte 0x0000ffff -_080520BC: .4byte 0x02024214 -_080520C0: .4byte 0x02024084 -_080520C4: .4byte 0x0202420c -_080520C8: .4byte 0x020242ac -_080520CC: .4byte 0x000400c0 -_080520D0: .4byte 0x0202427c -_080520D4: .4byte 0x02024332 + .pool _080520D8: - ldr r3, _080521AC + ldr r3, =0x0202420b ldrb r0, [r3] adds r1, r0, 0 muls r1, r6 @@ -166762,7 +160618,7 @@ _080520D8: ldr r0, [r1] orrs r0, r4 str r0, [r1] - ldr r4, _080521B0 + ldr r4, =0x020242bc ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -166801,7 +160657,7 @@ _080520D8: movs r0, 0xF ands r0, r2 strb r0, [r1, 0x18] - ldr r1, _080521B4 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x6 @@ -166828,7 +160684,7 @@ _080520D8: adds r2, r0, r7 movs r4, 0 adds r6, r3, 0 - ldr r0, _080521B8 + ldr r0, =0x02024064 mov r8, r0 _08052170: adds r0, r5, r4 @@ -166839,8 +160695,8 @@ _08052170: cmp r4, 0x23 bls _08052170 movs r4, 0 - ldr r7, _080521BC - ldr r3, _080521C0 + ldr r7, =0x0831c898 + ldr r3, =0x02024090 adds r5, r3, 0 adds r5, 0x18 _08052188: @@ -166862,12 +160718,7 @@ _08052188: adds r0, r5 b _080521CA .align 2, 0 -_080521AC: .4byte 0x0202420b -_080521B0: .4byte 0x020242bc -_080521B4: .4byte 0x02022f58 -_080521B8: .4byte 0x02024064 -_080521BC: .4byte 0x0831c898 -_080521C0: .4byte 0x02024090 + .pool _080521C4: adds r0, r4, r2 adds r0, r5 @@ -166886,7 +160737,7 @@ _080521CA: mov r2, r8 ldrb r0, [r2] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _080521F8 + ldr r1, =0x02024332 movs r0, 0 _080521EC: strb r0, [r1, 0x5] @@ -166896,14 +160747,14 @@ _080521EC: pop {r0} bx r0 .align 2, 0 -_080521F8: .4byte 0x02024332 + .pool thumb_func_end atk9B_transformdataexecution thumb_func_start sub_80521FC sub_80521FC: @ 80521FC push {r4-r7,lr} - ldr r7, _0805222C - ldr r6, _08052230 + ldr r7, =0x02024084 + ldr r6, =0x0202420b ldrb r0, [r6] movs r5, 0x58 muls r0, r5 @@ -166918,20 +160769,17 @@ _08052216: ldrh r0, [r3, 0x28] cmp r0, r2 bhi _0805223C - ldr r1, _08052234 + ldr r1, =0x020241f0 movs r0, 0 str r0, [r1] - ldr r1, _08052238 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] b _08052290 .align 2, 0 -_0805222C: .4byte 0x02024084 -_08052230: .4byte 0x0202420b -_08052234: .4byte 0x020241f0 -_08052238: .4byte 0x02024332 + .pool _0805223C: - ldr r4, _080522A0 + ldr r4, =0x020241f0 str r1, [r4] cmp r1, 0 bne _08052248 @@ -166954,10 +160802,10 @@ _08052248: muls r1, r5 adds r1, r3 ldr r0, [r1] - ldr r2, _080522A4 + ldr r2, =0xffff1fff ands r0, r2 str r0, [r1] - ldr r2, _080522A8 + ldr r2, =0x020242bc ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -166966,16 +160814,16 @@ _08052248: ldr r1, [r4] movs r2, 0 strb r1, [r0, 0xA] - ldr r0, _080522AC + ldr r0, =0x02024332 strb r2, [r0, 0x5] - ldr r2, _080522B0 + ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 lsls r1, 1 orrs r0, r1 str r0, [r2] _08052290: - ldr r1, _080522B4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -166983,12 +160831,7 @@ _08052290: pop {r0} bx r0 .align 2, 0 -_080522A0: .4byte 0x020241f0 -_080522A4: .4byte 0xffff1fff -_080522A8: .4byte 0x020242bc -_080522AC: .4byte 0x02024332 -_080522B0: .4byte 0x02024280 -_080522B4: .4byte 0x02024214 + .pool thumb_func_end sub_80521FC thumb_func_start sub_80522B8 @@ -166997,9 +160840,9 @@ sub_80522B8: @ 80522B8 lsls r0, 16 lsrs r2, r0, 16 movs r3, 0 - ldr r0, _080522F8 + ldr r0, =0x0831c3e0 ldrh r1, [r0] - ldr r4, _080522FC + ldr r4, =0x0000fffe adds r5, r0, 0 cmp r1, r4 beq _080522E0 @@ -167018,7 +160861,7 @@ _080522E0: lsls r0, r3, 1 adds r0, r5 ldrh r1, [r0] - ldr r0, _080522FC + ldr r0, =0x0000fffe eors r1, r0 negs r0, r1 orrs r0, r1 @@ -167027,8 +160870,7 @@ _080522E0: pop {r1} bx r1 .align 2, 0 -_080522F8: .4byte 0x0831c3e0 -_080522FC: .4byte 0x0000fffe + .pool thumb_func_end sub_80522B8 thumb_func_start atk9D_copyattack @@ -167038,12 +160880,12 @@ atk9D_copyattack: @ 8052300 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08052378 - ldr r1, _0805237C + ldr r0, =0x020241ec + ldr r1, =0x0000ffff adds r7, r1, 0 strh r7, [r0] - ldr r5, _08052380 - ldr r6, _08052384 + ldr r5, =0x02024248 + ldr r6, =0x0202420c ldrb r0, [r6] lsls r0, 1 adds r0, r5 @@ -167052,8 +160894,8 @@ atk9D_copyattack: @ 8052300 lsls r0, 24 cmp r0, 0 bne _0805235A - ldr r3, _08052388 - ldr r2, _0805238C + ldr r3, =0x02024084 + ldr r2, =0x0202420b ldrb r1, [r2] movs r0, 0x58 adds r4, r1, 0 @@ -167078,7 +160920,7 @@ atk9D_copyattack: @ 8052300 cmp r1, r7 bne _08052394 _0805235A: - ldr r3, _08052390 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -167093,20 +160935,14 @@ _0805235A: str r1, [r3] b _080524CC .align 2, 0 -_08052378: .4byte 0x020241ec -_0805237C: .4byte 0x0000ffff -_08052380: .4byte 0x02024248 -_08052384: .4byte 0x0202420c -_08052388: .4byte 0x02024084 -_0805238C: .4byte 0x0202420b -_08052390: .4byte 0x02024214 + .pool _08052394: movs r2, 0 mov r3, r12 adds r3, 0xC adds r0, r4, r3 ldrh r0, [r0] - ldr r4, _08052424 + ldr r4, =0x02024214 mov r10, r4 cmp r0, r1 beq _080523CE @@ -167134,7 +160970,7 @@ _080523B0: _080523CE: cmp r2, 0x4 bne _080524B0 - ldr r5, _08052428 + ldr r5, =0x020241e8 ldrb r1, [r5] lsls r1, 1 mov r2, r9 @@ -167145,14 +160981,14 @@ _080523CE: mov r0, r12 adds r0, 0xC adds r1, r0 - ldr r2, _0805242C - ldr r3, _08052430 + ldr r2, =0x02024248 + ldr r3, =0x0202420c ldrb r0, [r3] lsls r0, 1 adds r0, r2 ldrh r0, [r0] strh r0, [r1] - ldr r4, _08052434 + ldr r4, =0x0831c898 ldrb r0, [r3] lsls r0, 1 adds r0, r2 @@ -167175,11 +161011,7 @@ _080523CE: strb r4, [r0] b _0805244C .align 2, 0 -_08052424: .4byte 0x02024214 -_08052428: .4byte 0x020241e8 -_0805242C: .4byte 0x02024248 -_08052430: .4byte 0x0202420c -_08052434: .4byte 0x0831c898 + .pool _08052438: mov r4, r9 ldrb r0, [r4] @@ -167192,7 +161024,7 @@ _08052438: movs r1, 0x5 strb r1, [r0] _0805244C: - ldr r1, _080524A4 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -167210,7 +161042,7 @@ _0805244C: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _080524A8 + ldr r1, =0x020242bc mov r2, r9 ldrb r0, [r2] lsls r2, r0, 3 @@ -167219,7 +161051,7 @@ _0805244C: adds r2, r1 ldrb r4, [r2, 0x18] lsrs r3, r4, 4 - ldr r1, _080524AC + ldr r1, =0x0832a328 ldrb r0, [r5] lsls r0, 2 adds r0, r1 @@ -167236,9 +161068,7 @@ _0805244C: str r0, [r4] b _080524CC .align 2, 0 -_080524A4: .4byte 0x02022f58 -_080524A8: .4byte 0x020242bc -_080524AC: .4byte 0x0832a328 + .pool _080524B0: mov r0, r10 ldr r2, [r0] @@ -167269,15 +161099,15 @@ sub_80524DC: @ 80524DC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _0805255C + ldr r7, =0x020241ea movs r6, 0xB1 lsls r6, 1 - ldr r5, _08052560 - ldr r0, _08052564 + ldr r5, =0x0831c3e0 + ldr r0, =0x02024214 mov r8, r0 _080524EE: bl GenerateRandomNumber - ldr r2, _08052568 + ldr r2, =0x000001ff adds r1, r2, 0 ands r0, r1 adds r0, 0x1 @@ -167289,9 +161119,9 @@ _08052502: subs r0, 0x1 cmp r0, 0 bge _08052502 - ldr r4, _0805255C + ldr r4, =0x020241ea ldrh r2, [r4] - ldr r3, _0805256C + ldr r3, =0x0000ffff subs r0, r5, 0x2 _08052510: adds r0, 0x2 @@ -167301,16 +161131,16 @@ _08052510: cmp r1, r3 bne _08052510 _0805251C: - ldr r0, _0805256C + ldr r0, =0x0000ffff cmp r1, r0 bne _080524EE - ldr r2, _08052570 + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _08052574 + ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] - ldr r3, _08052578 - ldr r2, _0805257C + ldr r3, =0x082d86a8 + ldr r2, =0x0831c898 ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -167325,7 +161155,7 @@ _0805251C: ldrh r0, [r4] movs r1, 0 bl sub_80458E0 - ldr r1, _08052580 + ldr r1, =0x0202420c strb r0, [r1] pop {r3} mov r8, r3 @@ -167333,23 +161163,14 @@ _0805251C: pop {r0} bx r0 .align 2, 0 -_0805255C: .4byte 0x020241ea -_08052560: .4byte 0x0831c3e0 -_08052564: .4byte 0x02024214 -_08052568: .4byte 0x000001ff -_0805256C: .4byte 0x0000ffff -_08052570: .4byte 0x02024280 -_08052574: .4byte 0xfffffbff -_08052578: .4byte 0x082d86a8 -_0805257C: .4byte 0x0831c898 -_08052580: .4byte 0x0202420c + .pool thumb_func_end sub_80524DC thumb_func_start atk9F_nightshadedamageeffect atk9F_nightshadedamageeffect: @ 8052584 - ldr r3, _080525A4 - ldr r2, _080525A8 - ldr r0, _080525AC + ldr r3, =0x020241f0 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -167357,16 +161178,13 @@ atk9F_nightshadedamageeffect: @ 8052584 adds r0, 0x2A ldrb r0, [r0] str r0, [r3] - ldr r1, _080525B0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_080525A4: .4byte 0x020241f0 -_080525A8: .4byte 0x02024084 -_080525AC: .4byte 0x0202420b -_080525B0: .4byte 0x02024214 + .pool thumb_func_end atk9F_nightshadedamageeffect thumb_func_start atkA0_psywavedamageeffect @@ -167382,9 +161200,9 @@ _080525B8: lsls r0, r3, 2 adds r0, r3 lsls r3, r0, 1 - ldr r4, _080525F8 - ldr r2, _080525FC - ldr r0, _08052600 + ldr r4, =0x020241f0 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -167397,7 +161215,7 @@ _080525B8: movs r1, 0x64 bl __divsi3 str r0, [r4] - ldr r1, _08052604 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -167405,21 +161223,18 @@ _080525B8: pop {r0} bx r0 .align 2, 0 -_080525F8: .4byte 0x020241f0 -_080525FC: .4byte 0x02024084 -_08052600: .4byte 0x0202420b -_08052604: .4byte 0x02024214 + .pool thumb_func_end atkA0_psywavedamageeffect thumb_func_start atkA1_counterdamagecalculator atkA1_counterdamagecalculator: @ 8052608 push {r4-r6,lr} - ldr r4, _08052678 + ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _0805267C + ldr r5, =0x0202433c ldrb r0, [r4] lsls r0, 4 adds r0, r5 @@ -167436,7 +161251,7 @@ atkA1_counterdamagecalculator: @ 8052608 beq _080526BC cmp r6, r2 beq _080526BC - ldr r6, _08052680 + ldr r6, =0x02024084 adds r0, r1, r5 ldrb r0, [r0, 0xC] movs r4, 0x58 @@ -167445,10 +161260,10 @@ atkA1_counterdamagecalculator: @ 8052608 ldrh r0, [r0, 0x28] cmp r0, 0 beq _080526BC - ldr r1, _08052684 + ldr r1, =0x020241f0 lsls r0, r3, 1 str r0, [r1] - ldr r1, _08052688 + ldr r1, =0x02024294 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -167463,39 +161278,31 @@ atkA1_counterdamagecalculator: @ 8052608 ldrh r0, [r0, 0x28] cmp r0, 0 beq _08052690 - ldr r0, _0805268C + ldr r0, =0x0202420c strb r1, [r0] b _080526A0 .align 2, 0 -_08052678: .4byte 0x0202420b -_0805267C: .4byte 0x0202433c -_08052680: .4byte 0x02024084 -_08052684: .4byte 0x020241f0 -_08052688: .4byte 0x02024294 -_0805268C: .4byte 0x0202420c + .pool _08052690: - ldr r2, _080526AC - ldr r1, _080526B0 - ldr r0, _080526B4 + ldr r2, =0x0202420c + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r2] _080526A0: - ldr r1, _080526B8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080526EC .align 2, 0 -_080526AC: .4byte 0x0202420c -_080526B0: .4byte 0x0202433c -_080526B4: .4byte 0x0202420b -_080526B8: .4byte 0x02024214 + .pool _080526BC: - ldr r2, _080526F4 - ldr r0, _080526F8 + ldr r2, =0x0202437c + ldr r0, =0x0202420b ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -167505,7 +161312,7 @@ _080526BC: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, _080526FC + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -167523,20 +161330,18 @@ _080526EC: pop {r0} bx r0 .align 2, 0 -_080526F4: .4byte 0x0202437c -_080526F8: .4byte 0x0202420b -_080526FC: .4byte 0x02024214 + .pool thumb_func_end atkA1_counterdamagecalculator thumb_func_start atkA2_mirrorcoatdamagecalculator atkA2_mirrorcoatdamagecalculator: @ 8052700 push {r4-r6,lr} - ldr r4, _08052770 + ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _08052774 + ldr r5, =0x0202433c ldrb r0, [r4] lsls r0, 4 adds r0, r5 @@ -167554,7 +161359,7 @@ atkA2_mirrorcoatdamagecalculator: @ 8052700 beq _080527B4 cmp r6, r2 beq _080527B4 - ldr r6, _08052778 + ldr r6, =0x02024084 adds r0, r1, r5 ldrb r0, [r0, 0xD] movs r4, 0x58 @@ -167563,10 +161368,10 @@ atkA2_mirrorcoatdamagecalculator: @ 8052700 ldrh r0, [r0, 0x28] cmp r0, 0 beq _080527B4 - ldr r1, _0805277C + ldr r1, =0x020241f0 lsls r0, r3, 1 str r0, [r1] - ldr r1, _08052780 + ldr r1, =0x02024294 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -167581,39 +161386,31 @@ atkA2_mirrorcoatdamagecalculator: @ 8052700 ldrh r0, [r0, 0x28] cmp r0, 0 beq _08052788 - ldr r0, _08052784 + ldr r0, =0x0202420c strb r1, [r0] b _08052798 .align 2, 0 -_08052770: .4byte 0x0202420b -_08052774: .4byte 0x0202433c -_08052778: .4byte 0x02024084 -_0805277C: .4byte 0x020241f0 -_08052780: .4byte 0x02024294 -_08052784: .4byte 0x0202420c + .pool _08052788: - ldr r2, _080527A4 - ldr r1, _080527A8 - ldr r0, _080527AC + ldr r2, =0x0202420c + ldr r1, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 4 adds r0, r1 ldrb r0, [r0, 0xD] strb r0, [r2] _08052798: - ldr r1, _080527B0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080527E4 .align 2, 0 -_080527A4: .4byte 0x0202420c -_080527A8: .4byte 0x0202433c -_080527AC: .4byte 0x0202420b -_080527B0: .4byte 0x02024214 + .pool _080527B4: - ldr r2, _080527EC - ldr r0, _080527F0 + ldr r2, =0x0202437c + ldr r0, =0x0202420b ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -167623,7 +161420,7 @@ _080527B4: movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, _080527F4 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -167641,9 +161438,7 @@ _080527E4: pop {r0} bx r0 .align 2, 0 -_080527EC: .4byte 0x0202437c -_080527F0: .4byte 0x0202420b -_080527F4: .4byte 0x02024214 + .pool thumb_func_end atkA2_mirrorcoatdamagecalculator thumb_func_start atkA3_disablelastusedattack @@ -167653,21 +161448,21 @@ atkA3_disablelastusedattack: @ 80527F8 mov r6, r8 push {r6,r7} movs r4, 0 - ldr r2, _080528F8 - ldr r3, _080528FC + ldr r2, =0x02024084 + ldr r3, =0x0202420c ldrb r1, [r3] movs r0, 0x58 muls r0, r1 adds r7, r2, 0 adds r7, 0xC adds r0, r7 - ldr r5, _08052900 + ldr r5, =0x02024248 lsls r1, 1 adds r1, r5 ldrh r0, [r0] mov r9, r2 adds r6, r3, 0 - ldr r2, _08052904 + ldr r2, =0x020242bc mov r8, r2 ldrh r1, [r1] cmp r0, r1 @@ -167712,7 +161507,7 @@ _0805284C: ldrb r0, [r0] cmp r0, 0 beq _08052910 - ldr r1, _08052908 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -167772,20 +161567,15 @@ _0805284C: ands r0, r3 orrs r0, r2 strb r0, [r1, 0xB] - ldr r1, _0805290C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0805292A .align 2, 0 -_080528F8: .4byte 0x02024084 -_080528FC: .4byte 0x0202420c -_08052900: .4byte 0x02024248 -_08052904: .4byte 0x020242bc -_08052908: .4byte 0x02022f58 -_0805290C: .4byte 0x02024214 + .pool _08052910: - ldr r3, _08052938 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -167806,7 +161596,7 @@ _0805292A: pop {r0} bx r0 .align 2, 0 -_08052938: .4byte 0x02024214 + .pool thumb_func_end atkA3_disablelastusedattack thumb_func_start atkA4_setencore @@ -167817,21 +161607,21 @@ atkA4_setencore: @ 805293C mov r5, r8 push {r5-r7} movs r5, 0 - ldr r3, _08052A30 - ldr r4, _08052A34 + ldr r3, =0x02024084 + ldr r4, =0x0202420c ldrb r1, [r4] movs r0, 0x58 muls r0, r1 adds r6, r3, 0 adds r6, 0xC adds r0, r6 - ldr r2, _08052A38 + ldr r2, =0x02024248 lsls r1, 1 adds r1, r2 ldrh r0, [r0] mov r10, r3 mov r8, r2 - ldr r2, _08052A3C + ldr r2, =0x020242bc mov r9, r2 ldrh r1, [r1] cmp r0, r1 @@ -167931,19 +161721,15 @@ _080529AC: ands r0, r3 orrs r0, r2 strb r0, [r1, 0xE] - ldr r1, _08052A40 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08052A5E .align 2, 0 -_08052A30: .4byte 0x02024084 -_08052A34: .4byte 0x0202420c -_08052A38: .4byte 0x02024248 -_08052A3C: .4byte 0x020242bc -_08052A40: .4byte 0x02024214 + .pool _08052A44: - ldr r3, _08052A6C + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -167965,14 +161751,14 @@ _08052A5E: pop {r0} bx r0 .align 2, 0 -_08052A6C: .4byte 0x02024214 + .pool thumb_func_end atkA4_setencore thumb_func_start sub_8052A70 sub_8052A70: @ 8052A70 push {r4-r7,lr} - ldr r6, _08052AF0 - ldr r0, _08052AF4 + ldr r6, =0x02024084 + ldr r0, =0x0202420c mov r12, r0 ldrb r0, [r0] movs r7, 0x58 @@ -167987,7 +161773,7 @@ sub_8052A70: @ 8052A70 ands r0, r1 cmp r0, 0 bne _08052B10 - ldr r5, _08052AF8 + ldr r5, =0x0202420b ldrb r0, [r5] muls r0, r7 adds r0, r6 @@ -167996,10 +161782,10 @@ sub_8052A70: @ 8052A70 ldrh r1, [r0, 0x28] adds r3, r1 asrs r3, 1 - ldr r4, _08052AFC + ldr r4, =0x020241f0 subs r1, r3 str r1, [r4] - ldr r2, _08052B00 + ldr r2, =0x02024474 strb r1, [r2] movs r0, 0xFF lsls r0, 8 @@ -168019,7 +161805,7 @@ sub_8052A70: @ 8052A70 ldrh r0, [r0, 0x28] subs r0, r3 str r0, [r4] - ldr r2, _08052B04 + ldr r2, =0x0202437c mov r0, r12 ldrb r1, [r0] lsls r0, r1, 2 @@ -168027,24 +161813,17 @@ sub_8052A70: @ 8052A70 lsls r0, 2 adds r2, 0x4 adds r0, r2 - ldr r1, _08052B08 + ldr r1, =0x0000ffff str r1, [r0] - ldr r1, _08052B0C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08052B2A .align 2, 0 -_08052AF0: .4byte 0x02024084 -_08052AF4: .4byte 0x0202420c -_08052AF8: .4byte 0x0202420b -_08052AFC: .4byte 0x020241f0 -_08052B00: .4byte 0x02024474 -_08052B04: .4byte 0x0202437c -_08052B08: .4byte 0x0000ffff -_08052B0C: .4byte 0x02024214 + .pool _08052B10: - ldr r3, _08052B30 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -168062,7 +161841,7 @@ _08052B2A: pop {r0} bx r0 .align 2, 0 -_08052B30: .4byte 0x02024214 + .pool thumb_func_end sub_8052A70 thumb_func_start atkA6_settypetorandomresistance @@ -168072,15 +161851,15 @@ atkA6_settypetorandomresistance: @ 8052B34 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r1, _08052B9C - ldr r4, _08052BA0 + ldr r1, =0x02024250 + ldr r4, =0x0202420b ldrb r0, [r4] lsls r0, 1 adds r2, r0, r1 ldrh r1, [r2] cmp r1, 0 beq _08052B7E - ldr r0, _08052BA4 + ldr r0, =0x0000ffff cmp r1, r0 beq _08052B7E ldrh r0, [r2] @@ -168088,8 +161867,8 @@ atkA6_settypetorandomresistance: @ 8052B34 lsls r0, 24 cmp r0, 0 beq _08052C1C - ldr r1, _08052BA8 - ldr r2, _08052BAC + ldr r1, =0x02024084 + ldr r2, =0x02024270 ldrb r0, [r4] adds r0, r2 ldrb r2, [r0] @@ -168104,7 +161883,7 @@ atkA6_settypetorandomresistance: @ 8052B34 cmp r0, 0 beq _08052C1C _08052B7E: - ldr r3, _08052BB0 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -168119,12 +161898,7 @@ _08052B7E: str r1, [r3] b _08052D08 .align 2, 0 -_08052B9C: .4byte 0x02024250 -_08052BA0: .4byte 0x0202420b -_08052BA4: .4byte 0x0000ffff -_08052BA8: .4byte 0x02024084 -_08052BAC: .4byte 0x02024270 -_08052BB0: .4byte 0x02024214 + .pool _08052BB4: mov r0, r12 strb r5, [r0] @@ -168134,7 +161908,7 @@ _08052BB4: adds r0, r7 adds r0, 0x22 strb r5, [r0] - ldr r1, _08052BD8 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -168142,11 +161916,10 @@ _08052BB4: strb r5, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, _08052BDC + ldr r1, =0x02024214 b _08052C0A .align 2, 0 -_08052BD8: .4byte 0x02022f58 -_08052BDC: .4byte 0x02024214 + .pool _08052BE0: mov r0, r8 adds r0, 0x1 @@ -168156,11 +161929,11 @@ _08052BE0: mov r4, r10 ldrb r0, [r4] muls r0, r6 - ldr r7, _08052C14 + ldr r7, =0x02024084 adds r0, r7 adds r0, 0x22 strb r2, [r0] - ldr r1, _08052C18 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -168175,8 +161948,7 @@ _08052C0A: str r0, [r1] b _08052D08 .align 2, 0 -_08052C14: .4byte 0x02024084 -_08052C18: .4byte 0x02022f58 + .pool _08052C1C: movs r4, 0 mov r8, r4 @@ -168190,10 +161962,10 @@ _08052C24: bhi _08052C24 lsls r0, r4, 1 adds r4, r0, r4 - ldr r6, _08052D18 + ldr r6, =0x0831ace8 adds r3, r4, r6 - ldr r1, _08052D1C - ldr r2, _08052D20 + ldr r1, =0x02024258 + ldr r2, =0x0202420b ldrb r5, [r2] lsls r0, r5, 1 adds r0, r1 @@ -168207,7 +161979,7 @@ _08052C24: ldrb r0, [r0] cmp r0, 0x5 bhi _08052C80 - ldr r7, _08052D24 + ldr r7, =0x02024084 movs r2, 0x58 adds r0, r5, 0 muls r0, r2 @@ -168231,14 +162003,14 @@ _08052C24: _08052C80: movs r7, 0x1 add r8, r7 - ldr r0, _08052D28 + ldr r0, =0x000003e7 cmp r8, r0 ble _08052C24 movs r0, 0 mov r8, r0 - ldr r1, _08052D2C + ldr r1, =0x02024214 mov r12, r1 - ldr r3, _08052D18 + ldr r3, =0x0831ace8 adds r0, r4, 0x1 adds r0, r3 mov r9, r0 @@ -168253,7 +162025,7 @@ _08052CA6: mov r4, r10 ldrb r2, [r4] lsls r0, r2, 1 - ldr r7, _08052D1C + ldr r7, =0x02024258 adds r0, r7 ldrh r0, [r0] cmp r1, r0 @@ -168264,7 +162036,7 @@ _08052CA6: movs r6, 0x58 adds r0, r2, 0 muls r0, r6 - ldr r1, _08052D24 + ldr r1, =0x02024084 adds r2, r0, r1 adds r4, r2, 0 adds r4, 0x21 @@ -168283,7 +162055,7 @@ _08052CE0: adds r5, 0x3 movs r0, 0x3 add r8, r0 - ldr r0, _08052D30 + ldr r0, =0x0000014f cmp r8, r0 bls _08052C9C mov r1, r12 @@ -168309,20 +162081,14 @@ _08052D08: pop {r0} bx r0 .align 2, 0 -_08052D18: .4byte 0x0831ace8 -_08052D1C: .4byte 0x02024258 -_08052D20: .4byte 0x0202420b -_08052D24: .4byte 0x02024084 -_08052D28: .4byte 0x000003e7 -_08052D2C: .4byte 0x02024214 -_08052D30: .4byte 0x0000014f + .pool thumb_func_end atkA6_settypetorandomresistance thumb_func_start atkA7_setalwayshitflag atkA7_setalwayshitflag: @ 8052D34 push {r4,lr} - ldr r4, _08052D78 - ldr r3, _08052D7C + ldr r4, =0x020242ac + ldr r3, =0x0202420c ldrb r1, [r3] lsls r1, 2 adds r1, r4 @@ -168338,16 +162104,16 @@ atkA7_setalwayshitflag: @ 8052D34 movs r2, 0x10 orrs r0, r2 str r0, [r1] - ldr r2, _08052D80 + ldr r2, =0x020242bc ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _08052D84 + ldr r1, =0x0202420b ldrb r1, [r1] strb r1, [r0, 0x15] - ldr r1, _08052D88 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -168355,11 +162121,7 @@ atkA7_setalwayshitflag: @ 8052D34 pop {r0} bx r0 .align 2, 0 -_08052D78: .4byte 0x020242ac -_08052D7C: .4byte 0x0202420c -_08052D80: .4byte 0x020242bc -_08052D84: .4byte 0x0202420b -_08052D88: .4byte 0x02024214 + .pool thumb_func_end atkA7_setalwayshitflag thumb_func_start atkA8_copymovepermanently @@ -168370,12 +162132,12 @@ atkA8_copymovepermanently: @ 8052D8C mov r5, r8 push {r5-r7} sub sp, 0x14 - ldr r0, _08052EEC - ldr r1, _08052EF0 + ldr r0, =0x020241ec + ldr r1, =0x0000ffff adds r5, r1, 0 strh r5, [r0] - ldr r3, _08052EF4 - ldr r2, _08052EF8 + ldr r3, =0x02024084 + ldr r2, =0x0202420b ldrb r1, [r2] movs r0, 0x58 adds r4, r1, 0 @@ -168393,8 +162155,8 @@ atkA8_copymovepermanently: @ 8052D8C beq _08052DC4 b _08052F18 _08052DC4: - ldr r0, _08052EFC - ldr r2, _08052F00 + ldr r0, =0x02024240 + ldr r2, =0x0202420c ldrb r1, [r2] lsls r1, 1 adds r1, r0 @@ -168443,7 +162205,7 @@ _08052E12: beq _08052E18 b _08052F18 _08052E18: - ldr r4, _08052F04 + ldr r4, =0x020241e8 ldrb r1, [r4] lsls r1, 1 mov r2, r10 @@ -168469,7 +162231,7 @@ _08052E18: mov r5, r12 adds r5, 0x24 adds r2, r5 - ldr r4, _08052F08 + ldr r4, =0x0831c898 mov r1, r8 ldrb r0, [r1] lsls r0, 1 @@ -168481,7 +162243,7 @@ _08052E18: adds r0, r4 ldrb r0, [r0, 0x4] strb r0, [r2] - ldr r1, _08052F0C + ldr r1, =0x02024064 mov r2, r10 ldrb r0, [r2] strb r0, [r1] @@ -168520,16 +162282,16 @@ _08052E7A: movs r2, 0 movs r3, 0x10 bl dp01_build_cmdbuf_x02_a_b_varargs - ldr r0, _08052F0C + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08052F10 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 strb r0, [r1, 0x1] - ldr r3, _08052EFC - ldr r2, _08052F00 + ldr r3, =0x02024240 + ldr r2, =0x0202420c ldrb r0, [r2] lsls r0, 1 adds r0, r3 @@ -168543,25 +162305,15 @@ _08052E7A: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08052F14 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08052F32 .align 2, 0 -_08052EEC: .4byte 0x020241ec -_08052EF0: .4byte 0x0000ffff -_08052EF4: .4byte 0x02024084 -_08052EF8: .4byte 0x0202420b -_08052EFC: .4byte 0x02024240 -_08052F00: .4byte 0x0202420c -_08052F04: .4byte 0x020241e8 -_08052F08: .4byte 0x0831c898 -_08052F0C: .4byte 0x02024064 -_08052F10: .4byte 0x02022f58 -_08052F14: .4byte 0x02024214 + .pool _08052F18: - ldr r3, _08052F44 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -168584,7 +162336,7 @@ _08052F32: pop {r0} bx r0 .align 2, 0 -_08052F44: .4byte 0x02024214 + .pool thumb_func_end atkA8_copymovepermanently thumb_func_start sub_8052F48 @@ -168592,7 +162344,7 @@ sub_8052F48: @ 8052F48 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r2, _08052F78 + ldr r2, =0x0831c898 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -168614,7 +162366,7 @@ _08052F72: movs r0, 0x1 b _08052F7E .align 2, 0 -_08052F78: .4byte 0x0831c898 + .pool _08052F7C: movs r0, 0 _08052F7E: @@ -168654,7 +162406,7 @@ move_weather_interaction: @ 8052FAC push {lr} lsls r1, 16 lsrs r2, r1, 16 - ldr r1, _08053004 + ldr r1, =0x0831c898 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -168663,7 +162415,7 @@ move_weather_interaction: @ 8052FAC adds r3, r1, 0 cmp r0, 0x97 bne _08052FD0 - ldr r0, _08053008 + ldr r0, =0x020243cc ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -168688,7 +162440,7 @@ _08052FD0: cmp r0, 0x1A bne _08053010 _08052FF2: - ldr r0, _0805300C + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 20 @@ -168698,9 +162450,7 @@ _08052FF2: movs r0, 0x1 b _08053012 .align 2, 0 -_08053004: .4byte 0x0831c898 -_08053008: .4byte 0x020243cc -_0805300C: .4byte 0x02024280 + .pool _08053010: movs r0, 0x2 _08053012: @@ -168717,11 +162467,11 @@ sub_8053018: @ 8053018 push {r5-r7} movs r6, 0 movs r5, 0 - ldr r0, _080530A8 + ldr r0, =0x0202420b mov r9, r0 movs r1, 0x58 mov r8, r1 - ldr r7, _080530AC + ldr r7, =0x02024090 movs r0, 0x84 lsls r0, 1 mov r10, r0 @@ -168757,7 +162507,7 @@ _08053036: cmp r0, 0 beq _08053084 _08053076: - ldr r1, _080530B0 + ldr r1, =0x0832a328 lsls r0, r5, 2 adds r0, r1 ldr r0, [r0] @@ -168768,7 +162518,7 @@ _08053084: adds r5, 0x1 cmp r5, 0x3 ble _08053036 - ldr r0, _080530A8 + ldr r0, =0x0202420b ldrb r0, [r0] adds r1, r6, 0 movs r2, 0xFD @@ -168777,19 +162527,16 @@ _08053084: lsrs r6, r0, 24 cmp r6, 0xF bne _080530B8 - ldr r1, _080530B4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0805311C .align 2, 0 -_080530A8: .4byte 0x0202420b -_080530AC: .4byte 0x02024090 -_080530B0: .4byte 0x0832a328 -_080530B4: .4byte 0x02024214 + .pool _080530B8: movs r7, 0x3 - ldr r4, _0805312C + ldr r4, =0x0832a328 _080530BC: bl GenerateRandomNumber adds r5, r7, 0 @@ -168800,10 +162547,10 @@ _080530BC: ands r0, r6 cmp r0, 0 bne _080530BC - ldr r4, _08053130 - ldr r2, _08053134 + ldr r4, =0x020241ee + ldr r2, =0x02024084 lsls r1, r5, 1 - ldr r0, _08053138 + ldr r0, =0x0202420b ldrb r3, [r0] movs r0, 0x58 muls r0, r3 @@ -168812,19 +162559,19 @@ _080530BC: adds r1, r2 ldrh r0, [r1] strh r0, [r4] - ldr r0, _0805313C + ldr r0, =0x020241e8 strb r5, [r0] - ldr r2, _08053140 + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _08053144 + ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] ldrh r0, [r4] movs r1, 0 bl sub_80458E0 - ldr r1, _08053148 + ldr r1, =0x0202420c strb r0, [r1] - ldr r3, _0805314C + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -168846,21 +162593,13 @@ _0805311C: pop {r0} bx r0 .align 2, 0 -_0805312C: .4byte 0x0832a328 -_08053130: .4byte 0x020241ee -_08053134: .4byte 0x02024084 -_08053138: .4byte 0x0202420b -_0805313C: .4byte 0x020241e8 -_08053140: .4byte 0x02024280 -_08053144: .4byte 0xfffffbff -_08053148: .4byte 0x0202420c -_0805314C: .4byte 0x02024214 + .pool thumb_func_end sub_8053018 thumb_func_start atkAA_destinybondeffect atkAA_destinybondeffect: @ 8053150 - ldr r1, _08053174 - ldr r0, _08053178 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -168871,31 +162610,29 @@ atkAA_destinybondeffect: @ 8053150 lsls r1, 18 orrs r0, r1 str r0, [r2] - ldr r1, _0805317C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08053174: .4byte 0x02024084 -_08053178: .4byte 0x0202420b -_0805317C: .4byte 0x02024214 + .pool thumb_func_end atkAA_destinybondeffect thumb_func_start b_feature_update_destiny_bond b_feature_update_destiny_bond: @ 8053180 push {r4,r5,lr} - ldr r0, _080531D0 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080531D4 + ldr r4, =0x0202420c ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _080531D8 + ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -168909,7 +162646,7 @@ b_feature_update_destiny_bond: @ 8053180 beq _080531CA cmp r5, r3 beq _080531CA - ldr r2, _080531DC + ldr r2, =0x02024280 ldr r1, [r2] movs r0, 0x80 lsls r0, 17 @@ -168924,31 +162661,28 @@ _080531CA: pop {r0} bx r0 .align 2, 0 -_080531D0: .4byte 0x0202420b -_080531D4: .4byte 0x0202420c -_080531D8: .4byte 0x02024084 -_080531DC: .4byte 0x02024280 + .pool thumb_func_end b_feature_update_destiny_bond thumb_func_start atkAB_802A458 atkAB_802A458: @ 80531E0 push {lr} bl b_feature_update_destiny_bond - ldr r1, _080531F4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080531F4: .4byte 0x02024214 + .pool thumb_func_end atkAB_802A458 thumb_func_start atkAC_remaininghptopower atkAC_remaininghptopower: @ 80531F8 push {lr} - ldr r2, _0805324C - ldr r0, _08053250 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -168962,7 +162696,7 @@ atkAC_remaininghptopower: @ 80531F8 lsls r0, 24 lsrs r1, r0, 24 movs r3, 0 - ldr r0, _08053254 + ldr r0, =0x0831c408 ldrb r2, [r0] cmp r1, r2 ble _08053232 @@ -168976,24 +162710,20 @@ _08053224: cmp r1, r0 bgt _08053224 _08053232: - ldr r2, _08053258 - ldr r1, _08053254 + ldr r2, =0x02024400 + ldr r1, =0x0831c408 adds r0, r3, 0x1 adds r0, r1 ldrb r0, [r0] strh r0, [r2] - ldr r1, _0805325C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0805324C: .4byte 0x02024084 -_08053250: .4byte 0x0202420b -_08053254: .4byte 0x0831c408 -_08053258: .4byte 0x02024400 -_0805325C: .4byte 0x02024214 + .pool thumb_func_end atkAC_remaininghptopower thumb_func_start atkAD_reducepprandom @@ -169004,8 +162734,8 @@ atkAD_reducepprandom: @ 8053260 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r4, _080533E0 - ldr r1, _080533E4 + ldr r4, =0x02024248 + ldr r1, =0x0202420c ldrb r3, [r1] lsls r0, r3, 1 adds r0, r4 @@ -169015,13 +162745,13 @@ atkAD_reducepprandom: @ 8053260 bne _08053280 b _08053408 _08053280: - ldr r0, _080533E8 + ldr r0, =0x0000ffff cmp r2, r0 bne _08053288 b _08053408 _08053288: movs r7, 0 - ldr r0, _080533EC + ldr r0, =0x02024084 movs r1, 0x58 muls r1, r3 adds r3, r0, 0 @@ -169062,7 +162792,7 @@ _080532C6: muls r3, r0 adds r0, r3, 0 adds r0, r7, r0 - ldr r1, _080533EC + ldr r1, =0x02024084 adds r1, 0x24 mov r10, r1 add r0, r10 @@ -169086,12 +162816,12 @@ _080532E6: bge _08053304 adds r6, r0, 0 _08053304: - ldr r1, _080533F0 + ldr r1, =0x02022f58 movs r5, 0xFD strb r5, [r1] movs r0, 0x2 strb r0, [r1, 0x1] - ldr r2, _080533E0 + ldr r2, =0x02024248 mov r3, r8 ldrb r0, [r3] lsls r0, 1 @@ -169106,7 +162836,7 @@ _08053304: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r4, _080533F4 + ldr r4, =0x02022f68 adds r0, r4, 0 adds r1, r6, 0 movs r2, 0 @@ -169129,11 +162859,11 @@ _08053304: ldrb r0, [r1] subs r0, r6 strb r0, [r1] - ldr r4, _080533F8 + ldr r4, =0x02024064 mov r3, r8 ldrb r0, [r3] strb r0, [r4] - ldr r1, _080533FC + ldr r1, =0x020242bc ldrb r3, [r4] lsls r0, r3, 3 subs r0, r3 @@ -169141,7 +162871,7 @@ _08053304: adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _08053400 + ldr r2, =0x0832a328 lsls r0, r7, 2 adds r0, r2 ldr r0, [r0] @@ -169150,7 +162880,7 @@ _08053304: bne _080533B8 mov r2, r9 muls r2, r3 - ldr r0, _080533EC + ldr r0, =0x02024084 adds r0, 0x50 adds r0, r2, r0 ldr r0, [r0] @@ -169174,12 +162904,12 @@ _08053304: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _080533B8: - ldr r1, _08053404 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r1, _080533EC - ldr r0, _080533E4 + ldr r1, =0x02024084 + ldr r0, =0x0202420c ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -169193,18 +162923,9 @@ _080533B8: bl b_cancel_multi_turn_move_maybe b _08053422 .align 2, 0 -_080533E0: .4byte 0x02024248 -_080533E4: .4byte 0x0202420c -_080533E8: .4byte 0x0000ffff -_080533EC: .4byte 0x02024084 -_080533F0: .4byte 0x02022f58 -_080533F4: .4byte 0x02022f68 -_080533F8: .4byte 0x02024064 -_080533FC: .4byte 0x020242bc -_08053400: .4byte 0x0832a328 -_08053404: .4byte 0x02024214 + .pool _08053408: - ldr r3, _08053434 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -169227,7 +162948,7 @@ _08053422: pop {r0} bx r0 .align 2, 0 -_08053434: .4byte 0x02024214 + .pool thumb_func_end atkAD_reducepprandom thumb_func_start atkAE_clearstatusifnotsoundproofed @@ -169241,27 +162962,27 @@ atkAE_clearstatusifnotsoundproofed: @ 8053438 movs r4, 0 str r4, [sp, 0x4] mov r8, r4 - ldr r0, _080534A8 + ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0xD7 beq _08053454 b _0805363E _08053454: - ldr r6, _080534AC + ldr r6, =0x02024332 mov r0, r8 strb r0, [r6, 0x5] - ldr r5, _080534B0 + ldr r5, =0x0202420b ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 - ldr r1, _080534B4 + ldr r1, =0x02024744 mov r10, r1 cmp r0, 0 bne _08053470 - ldr r2, _080534B8 + ldr r2, =0x020244ec mov r10, r2 _08053470: - ldr r4, _080534BC + ldr r4, =0x02024084 ldrb r3, [r5] movs r7, 0x58 adds r2, r3, 0 @@ -169284,18 +163005,12 @@ _08053470: adds r0, 0x50 adds r2, r0 ldr r0, [r2] - ldr r1, _080534C0 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] b _080534D4 .align 2, 0 -_080534A8: .4byte 0x020241ea -_080534AC: .4byte 0x02024332 -_080534B0: .4byte 0x0202420b -_080534B4: .4byte 0x02024744 -_080534B8: .4byte 0x020244ec -_080534BC: .4byte 0x02024084 -_080534C0: .4byte 0xf7ffffff + .pool _080534C4: ldrb r1, [r1] adds r0, r3, 0 @@ -169305,8 +163020,8 @@ _080534C4: orrs r0, r1 strb r0, [r6, 0x5] _080534D4: - ldr r7, _08053548 - ldr r0, _0805354C + ldr r7, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status movs r2, 0x2 @@ -169316,18 +163031,18 @@ _080534D4: lsls r0, 24 lsrs r0, 24 bl battle_get_side_with_given_state - ldr r1, _08053550 + ldr r1, =0x02024474 strb r0, [r1, 0x17] strb r0, [r7] - ldr r0, _08053554 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0805357A - ldr r0, _08053558 + ldr r0, =0x02024210 ldrb r2, [r0] - ldr r1, _0805355C + ldr r1, =0x0832a328 ldrb r3, [r7] lsls r0, r3, 2 adds r0, r1 @@ -169335,7 +163050,7 @@ _080534D4: ands r2, r0 cmp r2, 0 bne _0805357A - ldr r5, _08053560 + ldr r5, =0x02024084 movs r6, 0x58 adds r4, r3, 0 muls r4, r6 @@ -169356,31 +163071,24 @@ _080534D4: adds r0, 0x50 adds r2, r0 ldr r0, [r2] - ldr r1, _08053564 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] b _0805357A .align 2, 0 -_08053548: .4byte 0x02024064 -_0805354C: .4byte 0x0202420b -_08053550: .4byte 0x02024474 -_08053554: .4byte 0x02022fec -_08053558: .4byte 0x02024210 -_0805355C: .4byte 0x0832a328 -_08053560: .4byte 0x02024084 -_08053564: .4byte 0xf7ffffff + .pool _08053568: ldrb r1, [r1] adds r0, r3, 0 bl b_history__record_ability_usage_of_player - ldr r1, _080535C0 + ldr r1, =0x02024332 ldrb r0, [r1, 0x5] mov r2, r9 orrs r0, r2 strb r0, [r1, 0x5] _0805357A: movs r6, 0 - ldr r7, _080535C4 + ldr r7, =0x02024084 _0805357E: movs r0, 0x64 adds r4, r6, 0 @@ -169402,8 +163110,8 @@ _0805357E: lsls r0, 1 cmp r5, r0 beq _08053636 - ldr r2, _080535C8 - ldr r0, _080535CC + ldr r2, =0x0202406e + ldr r0, =0x0202420b ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 @@ -169414,27 +163122,24 @@ _0805357E: muls r0, r1 b _08053600 .align 2, 0 -_080535C0: .4byte 0x02024332 -_080535C4: .4byte 0x02024084 -_080535C8: .4byte 0x0202406e -_080535CC: .4byte 0x0202420b + .pool _080535D0: - ldr r0, _08053608 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _08053618 - ldr r0, _0805360C + ldr r0, =0x02024064 ldrb r3, [r0] lsls r0, r3, 1 adds r0, r2 ldrh r0, [r0] cmp r0, r6 bne _08053618 - ldr r0, _08053610 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08053614 + ldr r2, =0x0832a328 lsls r0, r3, 2 adds r0, r2 ldr r0, [r0] @@ -169449,10 +163154,7 @@ _08053600: ldrb r0, [r0] b _08053624 .align 2, 0 -_08053608: .4byte 0x02022fec -_0805360C: .4byte 0x02024064 -_08053610: .4byte 0x02024210 -_08053614: .4byte 0x0832a328 + .pool _08053618: adds r0, r5, 0 adds r1, r4, 0 @@ -169475,13 +163177,13 @@ _08053636: ble _0805357E b _080536BC _0805363E: - ldr r1, _080536F8 + ldr r1, =0x02024332 movs r0, 0x4 strb r0, [r1, 0x5] movs r2, 0x3F mov r8, r2 - ldr r3, _080536FC - ldr r2, _08053700 + ldr r3, =0x02024084 + ldr r2, =0x0202420b ldrb r0, [r2] movs r5, 0x58 muls r0, r5 @@ -169497,7 +163199,7 @@ _0805363E: adds r7, 0x50 adds r1, r7 ldr r0, [r1] - ldr r6, _08053704 + ldr r6, =0xf7ffffff ands r0, r6 str r0, [r1] ldrb r0, [r2] @@ -169507,17 +163209,17 @@ _0805363E: lsls r0, 24 lsrs r0, 24 bl battle_get_side_with_given_state - ldr r4, _08053708 + ldr r4, =0x02024064 strb r0, [r4] - ldr r0, _0805370C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _080536BC - ldr r0, _08053710 + ldr r0, =0x02024210 ldrb r2, [r0] - ldr r1, _08053714 + ldr r1, =0x0832a328 ldrb r3, [r4] lsls r0, r3, 2 adds r0, r1 @@ -169540,8 +163242,8 @@ _080536BC: mov r2, r8 cmp r2, 0 beq _080536DE - ldr r4, _08053708 - ldr r0, _08053700 + ldr r4, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r4] add r0, sp, 0x4 @@ -169553,7 +163255,7 @@ _080536BC: ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution _080536DE: - ldr r1, _08053718 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -169566,22 +163268,14 @@ _080536DE: pop {r0} bx r0 .align 2, 0 -_080536F8: .4byte 0x02024332 -_080536FC: .4byte 0x02024084 -_08053700: .4byte 0x0202420b -_08053704: .4byte 0xf7ffffff -_08053708: .4byte 0x02024064 -_0805370C: .4byte 0x02022fec -_08053710: .4byte 0x02024210 -_08053714: .4byte 0x0832a328 -_08053718: .4byte 0x02024214 + .pool thumb_func_end atkAE_clearstatusifnotsoundproofed thumb_func_start atkAF_cursetarget atkAF_cursetarget: @ 805371C push {r4,r5,lr} - ldr r5, _0805375C - ldr r0, _08053760 + ldr r5, =0x02024084 + ldr r0, =0x0202420c ldrb r0, [r0] movs r4, 0x58 adds r1, r0, 0 @@ -169596,7 +163290,7 @@ atkAF_cursetarget: @ 805371C ands r0, r3 cmp r0, 0 beq _08053768 - ldr r3, _08053764 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -169611,14 +163305,12 @@ atkAF_cursetarget: @ 805371C str r1, [r3] b _0805378C .align 2, 0 -_0805375C: .4byte 0x02024084 -_08053760: .4byte 0x0202420c -_08053764: .4byte 0x02024214 + .pool _08053768: orrs r2, r3 str r2, [r1] - ldr r1, _08053794 - ldr r0, _08053798 + ldr r1, =0x020241f0 + ldr r0, =0x0202420b ldrb r0, [r0] muls r0, r4 adds r0, r5 @@ -169630,7 +163322,7 @@ _08053768: movs r0, 0x1 str r0, [r1] _08053784: - ldr r1, _0805379C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -169639,22 +163331,20 @@ _0805378C: pop {r0} bx r0 .align 2, 0 -_08053794: .4byte 0x020241f0 -_08053798: .4byte 0x0202420b -_0805379C: .4byte 0x02024214 + .pool thumb_func_end atkAF_cursetarget thumb_func_start atkB0_setspikes atkB0_setspikes: @ 80537A0 push {r4,lr} - ldr r4, _080537F4 + ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r1, _080537F8 + ldr r1, =0x02024294 lsls r2, r0, 1 adds r0, r2, r0 lsls r0, 2 @@ -169662,7 +163352,7 @@ atkB0_setspikes: @ 80537A0 ldrb r0, [r3, 0xA] cmp r0, 0x3 bne _08053804 - ldr r2, _080537FC + ldr r2, =0x0202437c ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -169672,7 +163362,7 @@ atkB0_setspikes: @ 80537A0 movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r3, _08053800 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -169687,12 +163377,9 @@ atkB0_setspikes: @ 80537A0 str r1, [r3] b _0805381E .align 2, 0 -_080537F4: .4byte 0x0202420b -_080537F8: .4byte 0x02024294 -_080537FC: .4byte 0x0202437c -_08053800: .4byte 0x02024214 + .pool _08053804: - ldr r1, _08053824 + ldr r1, =0x0202428e adds r1, r2, r1 ldrh r2, [r1] movs r0, 0x10 @@ -169701,7 +163388,7 @@ _08053804: ldrb r0, [r3, 0xA] adds r0, 0x1 strb r0, [r3, 0xA] - ldr r1, _08053828 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -169710,14 +163397,13 @@ _0805381E: pop {r0} bx r0 .align 2, 0 -_08053824: .4byte 0x0202428e -_08053828: .4byte 0x02024214 + .pool thumb_func_end atkB0_setspikes thumb_func_start atkB1_setforesight atkB1_setforesight: @ 805382C - ldr r1, _08053850 - ldr r0, _08053854 + ldr r1, =0x02024084 + ldr r0, =0x0202420c ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -169728,15 +163414,13 @@ atkB1_setforesight: @ 805382C lsls r1, 22 orrs r0, r1 str r0, [r2] - ldr r1, _08053858 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08053850: .4byte 0x02024084 -_08053854: .4byte 0x0202420c -_08053858: .4byte 0x02024214 + .pool thumb_func_end atkB1_setforesight thumb_func_start atkB2_setperishsong @@ -169747,20 +163431,20 @@ atkB2_setperishsong: @ 805385C push {r6,r7} movs r6, 0 movs r3, 0 - ldr r0, _080538A0 + ldr r0, =0x0202406c adds r7, r0, 0 - ldr r0, _080538A4 + ldr r0, =0x0202420b mov r8, r0 ldrb r1, [r7] cmp r6, r1 bge _080538C8 movs r5, 0x20 - ldr r0, _080538A8 + ldr r0, =0x02024084 mov r12, r0 - ldr r0, _080538AC + ldr r0, =0x020242bc adds r4, r0, 0 adds r4, 0xF - ldr r2, _080538B0 + ldr r2, =0x020242ac _08053884: ldr r1, [r2] adds r0, r1, 0 @@ -169778,11 +163462,7 @@ _0805389C: adds r6, 0x1 b _080538BC .align 2, 0 -_080538A0: .4byte 0x0202406c -_080538A4: .4byte 0x0202420b -_080538A8: .4byte 0x02024084 -_080538AC: .4byte 0x020242bc -_080538B0: .4byte 0x020242ac + .pool _080538B4: orrs r1, r5 str r1, [r2] @@ -169799,11 +163479,11 @@ _080538C8: mov r1, r8 ldrb r0, [r1] bl sub_803F67C - ldr r0, _080538F4 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 bne _080538FC - ldr r3, _080538F8 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -169818,10 +163498,9 @@ _080538C8: str r1, [r3] b _08053904 .align 2, 0 -_080538F4: .4byte 0x0202406c -_080538F8: .4byte 0x02024214 + .pool _080538FC: - ldr r1, _08053910 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -169833,7 +163512,7 @@ _08053904: pop {r0} bx r0 .align 2, 0 -_08053910: .4byte 0x02024214 + .pool thumb_func_end atkB2_setperishsong thumb_func_start atkB3_rolloutdamagecalculation @@ -169842,27 +163521,24 @@ atkB3_rolloutdamagecalculation: @ 8053914 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _08053938 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 beq _08053948 - ldr r0, _0805393C + ldr r0, =0x0202420b ldrb r0, [r0] bl b_cancel_multi_turn_move_maybe - ldr r1, _08053940 - ldr r0, _08053944 + ldr r1, =0x02024214 + ldr r0, =0x082d8a60 str r0, [r1] b _08053A60 .align 2, 0 -_08053938: .4byte 0x0202427c -_0805393C: .4byte 0x0202420b -_08053940: .4byte 0x02024214 -_08053944: .4byte 0x082d8a60 + .pool _08053948: - ldr r2, _08053A6C - ldr r1, _08053A70 + ldr r2, =0x02024084 + ldr r1, =0x0202420b ldrb r3, [r1] movs r5, 0x58 adds r0, r3, 0 @@ -169876,9 +163552,9 @@ _08053948: ands r0, r7 adds r6, r1, 0 mov r9, r2 - ldr r1, _08053A74 + ldr r1, =0x020242bc mov r12, r1 - ldr r2, _08053A78 + ldr r2, =0x020241ea mov r8, r2 cmp r0, 0 bne _080539BA @@ -169911,7 +163587,7 @@ _08053948: ldr r0, [r1] orrs r0, r7 str r0, [r1] - ldr r1, _08053A7C + ldr r1, =0x02024268 ldrb r0, [r6] lsls r0, 1 adds r0, r1 @@ -169942,12 +163618,12 @@ _080539BA: muls r1, r5 adds r1, r4 ldr r0, [r1] - ldr r2, _08053A80 + ldr r2, =0xffffefff ands r0, r2 str r0, [r1] _080539EE: - ldr r3, _08053A84 - ldr r2, _08053A88 + ldr r3, =0x02024400 + ldr r2, =0x0831c898 mov r0, r8 ldrh r1, [r0] lsls r0, r1, 1 @@ -169968,7 +163644,7 @@ _080539EE: lsrs r0, 28 movs r1, 0x5 subs r1, r0 - ldr r7, _08053A8C + ldr r7, =0x02024214 adds r5, r3, 0 cmp r2, r1 bge _08053A3C @@ -170014,22 +163690,14 @@ _08053A60: pop {r0} bx r0 .align 2, 0 -_08053A6C: .4byte 0x02024084 -_08053A70: .4byte 0x0202420b -_08053A74: .4byte 0x020242bc -_08053A78: .4byte 0x020241ea -_08053A7C: .4byte 0x02024268 -_08053A80: .4byte 0xffffefff -_08053A84: .4byte 0x02024400 -_08053A88: .4byte 0x0831c898 -_08053A8C: .4byte 0x02024214 + .pool thumb_func_end atkB3_rolloutdamagecalculation thumb_func_start atkB4_jumpifconfusedandattackmaxed atkB4_jumpifconfusedandattackmaxed: @ 8053A90 push {r4,r5,lr} - ldr r5, _08053AE0 - ldr r0, _08053AE4 + ldr r5, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 adds r3, r1, 0 @@ -170040,7 +163708,7 @@ atkB4_jumpifconfusedandattackmaxed: @ 8053A90 ldr r0, [r0] movs r1, 0x7 ands r0, r1 - ldr r4, _08053AE8 + ldr r4, =0x02024214 cmp r0, 0 beq _08053AEC ldr r2, [r4] @@ -170067,9 +163735,7 @@ atkB4_jumpifconfusedandattackmaxed: @ 8053A90 str r1, [r4] b _08053AF2 .align 2, 0 -_08053AE0: .4byte 0x02024084 -_08053AE4: .4byte 0x0202420c -_08053AE8: .4byte 0x02024214 + .pool _08053AEC: ldr r0, [r4] adds r0, 0x6 @@ -170083,14 +163749,14 @@ _08053AF2: thumb_func_start sub_8053AF8 sub_8053AF8: @ 8053AF8 push {r4,r5,lr} - ldr r0, _08053B20 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 beq _08053B34 - ldr r2, _08053B24 - ldr r0, _08053B28 + ldr r2, =0x020242bc + ldr r0, =0x0202420b ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -170098,19 +163764,15 @@ sub_8053AF8: @ 8053AF8 adds r0, r2 movs r1, 0 strb r1, [r0, 0x10] - ldr r1, _08053B2C - ldr r0, _08053B30 + ldr r1, =0x02024214 + ldr r0, =0x082d8a60 str r0, [r1] b _08053B8C .align 2, 0 -_08053B20: .4byte 0x0202427c -_08053B24: .4byte 0x020242bc -_08053B28: .4byte 0x0202420b -_08053B2C: .4byte 0x02024214 -_08053B30: .4byte 0x082d8a60 + .pool _08053B34: - ldr r5, _08053B94 - ldr r4, _08053B98 + ldr r5, =0x020242bc + ldr r4, =0x0202420b ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -170122,9 +163784,9 @@ _08053B34: adds r0, 0x1 strb r0, [r1, 0x10] _08053B4C: - ldr r3, _08053B9C - ldr r2, _08053BA0 - ldr r0, _08053BA4 + ldr r3, =0x02024400 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -170138,7 +163800,7 @@ _08053B4C: subs r0, r1 lsls r0, 2 adds r0, r5 - ldr r4, _08053BA8 + ldr r4, =0x02024214 ldrb r1, [r0, 0x10] cmp r2, r1 bge _08053B86 @@ -170161,19 +163823,14 @@ _08053B8C: pop {r0} bx r0 .align 2, 0 -_08053B94: .4byte 0x020242bc -_08053B98: .4byte 0x0202420b -_08053B9C: .4byte 0x02024400 -_08053BA0: .4byte 0x0831c898 -_08053BA4: .4byte 0x020241ea -_08053BA8: .4byte 0x02024214 + .pool thumb_func_end sub_8053AF8 thumb_func_start atkB6_happinesstodamagecalculation atkB6_happinesstodamagecalculation: @ 8053BAC push {r4,lr} - ldr r2, _08053BD8 - ldr r0, _08053BDC + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -170182,9 +163839,9 @@ atkB6_happinesstodamagecalculation: @ 8053BAC ldrb r0, [r0] cmp r0, 0x79 bne _08053BEC - ldr r4, _08053BE0 - ldr r2, _08053BE4 - ldr r0, _08053BE8 + ldr r4, =0x02024400 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -170193,15 +163850,11 @@ atkB6_happinesstodamagecalculation: @ 8053BAC ldrb r1, [r0] b _08053C02 .align 2, 0 -_08053BD8: .4byte 0x0831c898 -_08053BDC: .4byte 0x020241ea -_08053BE0: .4byte 0x02024400 -_08053BE4: .4byte 0x02024084 -_08053BE8: .4byte 0x0202420b + .pool _08053BEC: - ldr r4, _08053C20 - ldr r2, _08053C24 - ldr r0, _08053C28 + ldr r4, =0x02024400 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -170217,7 +163870,7 @@ _08053C02: movs r1, 0x19 bl __divsi3 strh r0, [r4] - ldr r1, _08053C2C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -170225,10 +163878,7 @@ _08053C02: pop {r0} bx r0 .align 2, 0 -_08053C20: .4byte 0x02024400 -_08053C24: .4byte 0x02024084 -_08053C28: .4byte 0x0202420b -_08053C2C: .4byte 0x02024214 + .pool thumb_func_end atkB6_happinesstodamagecalculation thumb_func_start atkB7_presentdamagecalculation @@ -170239,34 +163889,34 @@ atkB7_presentdamagecalculation: @ 8053C30 ands r4, r0 cmp r4, 0x65 bgt _08053C4C - ldr r1, _08053C48 + ldr r1, =0x02024400 movs r0, 0x28 strh r0, [r1] b _08053C8E .align 2, 0 -_08053C48: .4byte 0x02024400 + .pool _08053C4C: cmp r4, 0xB1 bgt _08053C5C - ldr r1, _08053C58 + ldr r1, =0x02024400 movs r0, 0x50 strh r0, [r1] b _08053C8E .align 2, 0 -_08053C58: .4byte 0x02024400 + .pool _08053C5C: cmp r4, 0xCB bgt _08053C6C - ldr r1, _08053C68 + ldr r1, =0x02024400 movs r0, 0x78 strh r0, [r1] b _08053C8E .align 2, 0 -_08053C68: .4byte 0x02024400 + .pool _08053C6C: - ldr r3, _08053C98 - ldr r2, _08053C9C - ldr r0, _08053CA0 + ldr r3, =0x020241f0 + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -170285,18 +163935,14 @@ _08053C88: _08053C8E: cmp r4, 0xCB bgt _08053CAC - ldr r1, _08053CA4 - ldr r0, _08053CA8 + ldr r1, =0x02024214 + ldr r0, =0x082d8a30 b _08053CE6 .align 2, 0 -_08053C98: .4byte 0x020241f0 -_08053C9C: .4byte 0x02024084 -_08053CA0: .4byte 0x0202420c -_08053CA4: .4byte 0x02024214 -_08053CA8: .4byte 0x082d8a30 + .pool _08053CAC: - ldr r2, _08053CC8 - ldr r0, _08053CCC + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -170305,40 +163951,35 @@ _08053CAC: ldrh r0, [r0, 0x28] cmp r1, r0 bne _08053CD8 - ldr r1, _08053CD0 - ldr r0, _08053CD4 + ldr r1, =0x02024214 + ldr r0, =0x082d9efb b _08053CE6 .align 2, 0 -_08053CC8: .4byte 0x02024084 -_08053CCC: .4byte 0x0202420c -_08053CD0: .4byte 0x02024214 -_08053CD4: .4byte 0x082d9efb + .pool _08053CD8: - ldr r2, _08053CF0 + ldr r2, =0x0202427c ldrb r1, [r2] movs r0, 0xF7 ands r0, r1 strb r0, [r2] - ldr r1, _08053CF4 - ldr r0, _08053CF8 + ldr r1, =0x02024214 + ldr r0, =0x082d9ee1 _08053CE6: str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_08053CF0: .4byte 0x0202427c -_08053CF4: .4byte 0x02024214 -_08053CF8: .4byte 0x082d9ee1 + .pool thumb_func_end atkB7_presentdamagecalculation thumb_func_start atkB8_setsafeguard atkB8_setsafeguard: @ 8053CFC push {r4-r7,lr} - ldr r7, _08053D30 + ldr r7, =0x0202420b ldrb r0, [r7] bl battle_get_per_side_status - ldr r4, _08053D34 + ldr r4, =0x0202428e movs r6, 0x1 adds r1, r6, 0 ands r1, r0 @@ -170349,20 +163990,17 @@ atkB8_setsafeguard: @ 8053CFC ands r0, r1 cmp r0, 0 beq _08053D40 - ldr r2, _08053D38 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08053D3C + ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] b _08053D88 .align 2, 0 -_08053D30: .4byte 0x0202420b -_08053D34: .4byte 0x0202428e -_08053D38: .4byte 0x0202427c -_08053D3C: .4byte 0x02024332 + .pool _08053D40: ldrb r0, [r7] bl battle_get_per_side_status @@ -170376,7 +164014,7 @@ _08053D40: strh r0, [r1] ldrb r0, [r7] bl battle_get_per_side_status - ldr r5, _08053D98 + ldr r5, =0x02024294 adds r1, r6, 0 ands r1, r0 lsls r0, r1, 1 @@ -170395,10 +164033,10 @@ _08053D40: adds r0, r5 ldrb r1, [r7] strb r1, [r0, 0x7] - ldr r0, _08053D9C + ldr r0, =0x02024332 strb r4, [r0, 0x5] _08053D88: - ldr r1, _08053DA0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -170406,9 +164044,7 @@ _08053D88: pop {r0} bx r0 .align 2, 0 -_08053D98: .4byte 0x02024294 -_08053D9C: .4byte 0x02024332 -_08053DA0: .4byte 0x02024214 + .pool thumb_func_end atkB8_setsafeguard thumb_func_start atkB9_magnitudedamagecalculation @@ -170425,70 +164061,70 @@ atkB9_magnitudedamagecalculation: @ 8053DA4 lsrs r3, r0, 16 cmp r3, 0x4 bgt _08053DD0 - ldr r1, _08053DCC + ldr r1, =0x02024400 movs r0, 0xA strh r0, [r1] movs r3, 0x4 b _08053E3C .align 2, 0 -_08053DCC: .4byte 0x02024400 + .pool _08053DD0: cmp r3, 0xE bgt _08053DE4 - ldr r1, _08053DE0 + ldr r1, =0x02024400 movs r0, 0x1E strh r0, [r1] movs r3, 0x5 b _08053E3C .align 2, 0 -_08053DE0: .4byte 0x02024400 + .pool _08053DE4: cmp r3, 0x22 bgt _08053DF8 - ldr r1, _08053DF4 + ldr r1, =0x02024400 movs r0, 0x32 strh r0, [r1] movs r3, 0x6 b _08053E3C .align 2, 0 -_08053DF4: .4byte 0x02024400 + .pool _08053DF8: cmp r3, 0x40 bgt _08053E0C - ldr r1, _08053E08 + ldr r1, =0x02024400 movs r0, 0x46 strh r0, [r1] movs r3, 0x7 b _08053E3C .align 2, 0 -_08053E08: .4byte 0x02024400 + .pool _08053E0C: cmp r3, 0x54 bgt _08053E20 - ldr r1, _08053E1C + ldr r1, =0x02024400 movs r0, 0x5A strh r0, [r1] movs r3, 0x8 b _08053E3C .align 2, 0 -_08053E1C: .4byte 0x02024400 + .pool _08053E20: cmp r3, 0x5E bgt _08053E34 - ldr r1, _08053E30 + ldr r1, =0x02024400 movs r0, 0x6E strh r0, [r1] movs r3, 0x9 b _08053E3C .align 2, 0 -_08053E30: .4byte 0x02024400 + .pool _08053E34: - ldr r1, _08053EA8 + ldr r1, =0x02024400 movs r0, 0x96 strh r0, [r1] movs r3, 0xA _08053E3C: - ldr r1, _08053EAC + ldr r1, =0x02022f58 movs r2, 0 movs r0, 0xFD strb r0, [r1] @@ -170500,21 +164136,21 @@ _08053E3C: strb r3, [r1, 0x4] movs r0, 0xFF strb r0, [r1, 0x5] - ldr r1, _08053EB0 + ldr r1, =0x0202420c strb r2, [r1] - ldr r0, _08053EB4 + ldr r0, =0x0202406c ldrb r3, [r0] adds r6, r1, 0 - ldr r0, _08053EB8 + ldr r0, =0x02024214 mov r8, r0 cmp r2, r3 bcs _08053E94 adds r4, r6, 0 - ldr r0, _08053EBC + ldr r0, =0x0202420b ldrb r5, [r0] - ldr r1, _08053EC0 + ldr r1, =0x0832a328 mov r12, r1 - ldr r7, _08053EC4 + ldr r7, =0x02024210 _08053E72: ldrb r2, [r4] cmp r2, r5 @@ -170545,14 +164181,7 @@ _08053E94: pop {r0} bx r0 .align 2, 0 -_08053EA8: .4byte 0x02024400 -_08053EAC: .4byte 0x02022f58 -_08053EB0: .4byte 0x0202420c -_08053EB4: .4byte 0x0202406c -_08053EB8: .4byte 0x02024214 -_08053EBC: .4byte 0x0202420b -_08053EC0: .4byte 0x0832a328 -_08053EC4: .4byte 0x02024210 + .pool thumb_func_end atkB9_magnitudedamagecalculation thumb_func_start atkBA_802B140 @@ -170562,11 +164191,11 @@ atkBA_802B140: @ 8053EC8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08053EEC + ldr r0, =0x02024212 ldrb r0, [r0] cmp r0, 0x1 bne _08053EF8 - ldr r0, _08053EF0 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -170575,13 +164204,12 @@ atkBA_802B140: @ 8053EC8 movs r0, 0x1 b _08053F12 .align 2, 0 -_08053EEC: .4byte 0x02024212 -_08053EF0: .4byte 0x0202420b + .pool _08053EF4: movs r0, 0 b _08053F12 _08053EF8: - ldr r0, _08053F0C + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -170590,15 +164218,15 @@ _08053EF8: movs r0, 0x3 b _08053F12 .align 2, 0 -_08053F0C: .4byte 0x0202420b + .pool _08053F10: movs r0, 0x2 _08053F12: bl battle_get_side_with_given_state - ldr r1, _08053FEC + ldr r1, =0x0202420c strb r0, [r1] - ldr r0, _08053FF0 - ldr r1, _08053FEC + ldr r0, =0x0202421c + ldr r1, =0x0202420c ldrb r3, [r1] adds r0, r3, r0 ldrb r0, [r0] @@ -170606,15 +164234,15 @@ _08053F12: beq _08053F2A b _08054030 _08053F2A: - ldr r5, _08053FF4 - ldr r0, _08053FF8 + ldr r5, =0x0202420b + ldr r0, =0x0202449c ldr r1, [r0] adds r1, r3, r1 ldrb r2, [r5] ldrb r1, [r1, 0xC] cmp r2, r1 bne _08054030 - ldr r4, _08053FFC + ldr r4, =0x02024084 movs r2, 0x58 adds r0, r3, 0 muls r0, r2 @@ -170632,7 +164260,7 @@ _08053F2A: ldrh r0, [r0, 0x28] cmp r0, 0 beq _08054030 - ldr r0, _08054000 + ldr r0, =0x020242bc lsls r1, r3, 3 subs r1, r3 lsls r1, 2 @@ -170641,28 +164269,28 @@ _08053F2A: lsls r0, 31 cmp r0, 0 bne _08054030 - ldr r0, _08054004 + ldr r0, =0x02024274 lsls r1, r3, 1 adds r1, r0 ldrh r0, [r1] cmp r0, 0xE4 bne _08054030 movs r1, 0 - ldr r0, _08054008 - ldr r2, _0805400C + ldr r0, =0x0202406c + ldr r2, =0x020241ea mov r8, r2 - ldr r7, _08054010 + ldr r7, =0x020241e8 mov r10, r7 - ldr r2, _08054014 + ldr r2, =0x020241e9 mov r9, r2 - ldr r7, _08054018 + ldr r7, =0x02024280 mov r12, r7 ldrb r2, [r0] cmp r1, r2 bge _08053FB6 - ldr r6, _0805401C - ldr r5, _08053FEC - ldr r4, _08054020 + ldr r6, =0x0202407e + ldr r5, =0x0202420c + ldr r4, =0x0202407a movs r3, 0xB adds r2, r0, 0 _08053FA0: @@ -170682,9 +164310,9 @@ _08053FB6: movs r0, 0xE4 mov r1, r8 strh r0, [r1] - ldr r2, _08053FEC + ldr r2, =0x0202420c ldrb r0, [r2] - ldr r7, _08053FF8 + ldr r7, =0x0202449c ldr r1, [r7] adds r0, r1 adds r0, 0x80 @@ -170693,39 +164321,23 @@ _08053FB6: strb r0, [r1] mov r2, r10 strb r0, [r2] - ldr r7, _08054024 + ldr r7, =0x02024214 ldr r0, [r7] adds r0, 0x5 str r0, [r7] movs r0, 0x1 - ldr r1, _08054028 + ldr r1, =0x02024474 strb r0, [r1, 0x18] mov r2, r12 ldr r0, [r2] - ldr r1, _0805402C + ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] b _0805404A .align 2, 0 -_08053FEC: .4byte 0x0202420c -_08053FF0: .4byte 0x0202421c -_08053FF4: .4byte 0x0202420b -_08053FF8: .4byte 0x0202449c -_08053FFC: .4byte 0x02024084 -_08054000: .4byte 0x020242bc -_08054004: .4byte 0x02024274 -_08054008: .4byte 0x0202406c -_0805400C: .4byte 0x020241ea -_08054010: .4byte 0x020241e8 -_08054014: .4byte 0x020241e9 -_08054018: .4byte 0x02024280 -_0805401C: .4byte 0x0202407e -_08054020: .4byte 0x0202407a -_08054024: .4byte 0x02024214 -_08054028: .4byte 0x02024474 -_0805402C: .4byte 0xfffffbff + .pool _08054030: - ldr r3, _08054058 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -170747,59 +164359,55 @@ _0805404A: pop {r0} bx r0 .align 2, 0 -_08054058: .4byte 0x02024214 + .pool thumb_func_end atkBA_802B140 thumb_func_start sub_805405C sub_805405C: @ 805405C push {lr} - ldr r2, _0805407C + ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x60 ands r0, r1 cmp r0, 0 beq _08054088 - ldr r2, _08054080 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08054084 + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] b _0805409A .align 2, 0 -_0805407C: .4byte 0x020243cc -_08054080: .4byte 0x0202427c -_08054084: .4byte 0x02024332 + .pool _08054088: movs r0, 0x20 strh r0, [r2] - ldr r1, _080540A8 + ldr r1, =0x02024332 movs r0, 0x4 strb r0, [r1, 0x5] - ldr r0, _080540AC + ldr r0, =0x020243d0 adds r0, 0x28 movs r1, 0x5 strb r1, [r0] _0805409A: - ldr r1, _080540B0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080540A8: .4byte 0x02024332 -_080540AC: .4byte 0x020243d0 -_080540B0: .4byte 0x02024214 + .pool thumb_func_end sub_805405C thumb_func_start atkBC_maxattackhalvehp atkBC_maxattackhalvehp: @ 80540B4 push {r4,r5,lr} - ldr r5, _08054100 - ldr r4, _08054104 + ldr r5, =0x02024084 + ldr r4, =0x0202420b ldrb r0, [r4] movs r3, 0x58 muls r0, r3 @@ -170819,7 +164427,7 @@ _080540CC: bls _08054110 movs r0, 0xC strb r0, [r2, 0x19] - ldr r1, _08054108 + ldr r1, =0x020241f0 ldrb r0, [r4] muls r0, r3 adds r0, r5 @@ -170831,18 +164439,15 @@ _080540CC: movs r0, 0x1 str r0, [r1] _080540F4: - ldr r1, _0805410C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0805412A .align 2, 0 -_08054100: .4byte 0x02024084 -_08054104: .4byte 0x0202420b -_08054108: .4byte 0x020241f0 -_0805410C: .4byte 0x02024214 + .pool _08054110: - ldr r3, _08054130 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -170860,18 +164465,18 @@ _0805412A: pop {r0} bx r0 .align 2, 0 -_08054130: .4byte 0x02024214 + .pool thumb_func_end atkBC_maxattackhalvehp thumb_func_start atkBD_copyfoestats atkBD_copyfoestats: @ 8054134 push {r4-r7,lr} movs r2, 0 - ldr r7, _0805416C - ldr r6, _08054170 + ldr r7, =0x02024214 + ldr r6, =0x0202420b movs r4, 0x58 - ldr r3, _08054174 - ldr r5, _08054178 + ldr r3, =0x0202409c + ldr r5, =0x0202420c _08054142: ldrb r0, [r6] adds r1, r0, 0 @@ -170894,17 +164499,14 @@ _08054142: pop {r0} bx r0 .align 2, 0 -_0805416C: .4byte 0x02024214 -_08054170: .4byte 0x0202420b -_08054174: .4byte 0x0202409c -_08054178: .4byte 0x0202420c + .pool thumb_func_end atkBD_copyfoestats thumb_func_start atkBE_breakfree atkBE_breakfree: @ 805417C push {r4-r6,lr} - ldr r1, _080541EC - ldr r5, _080541F0 + ldr r1, =0x02024084 + ldr r5, =0x0202420b ldrb r2, [r5] movs r6, 0x58 adds r0, r2, 0 @@ -170918,8 +164520,8 @@ atkBE_breakfree: @ 805417C ands r0, r1 cmp r0, 0 beq _08054210 - ldr r1, _080541F4 - ldr r3, _080541F8 + ldr r1, =0x02024474 + ldr r3, =0x0202420c ldrb r0, [r3] strb r0, [r1, 0x17] ldrb r0, [r5] @@ -170927,16 +164529,16 @@ atkBE_breakfree: @ 805417C muls r1, r6 adds r1, r4 ldr r0, [r1] - ldr r2, _080541FC + ldr r2, =0xffff1fff ands r0, r2 str r0, [r1] ldrb r0, [r5] - ldr r1, _08054200 + ldr r1, =0x0202449c ldr r2, [r1] adds r0, r2 ldrb r0, [r0, 0x14] strb r0, [r3] - ldr r1, _08054204 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -170954,21 +164556,13 @@ atkBE_breakfree: @ 805417C movs r0, 0xFF strb r0, [r1, 0x4] bl b_movescr_stack_push_cursor - ldr r1, _08054208 - ldr r0, _0805420C + ldr r1, =0x02024214 + ldr r0, =0x082dafc5 b _080542BA .align 2, 0 -_080541EC: .4byte 0x02024084 -_080541F0: .4byte 0x0202420b -_080541F4: .4byte 0x02024474 -_080541F8: .4byte 0x0202420c -_080541FC: .4byte 0xffff1fff -_08054200: .4byte 0x0202449c -_08054204: .4byte 0x02022f58 -_08054208: .4byte 0x02024214 -_0805420C: .4byte 0x082dafc5 + .pool _08054210: - ldr r4, _08054244 + ldr r4, =0x020242ac lsls r0, r2, 2 adds r3, r0, r4 ldr r1, [r3] @@ -170989,17 +164583,15 @@ _08054210: ands r0, r2 str r0, [r1] bl b_movescr_stack_push_cursor - ldr r1, _08054248 - ldr r0, _0805424C + ldr r1, =0x02024214 + ldr r0, =0x082dafd6 b _080542BA .align 2, 0 -_08054244: .4byte 0x020242ac -_08054248: .4byte 0x02024214 -_0805424C: .4byte 0x082dafd6 + .pool _08054250: adds r0, r2, 0 bl battle_side_get_owner - ldr r4, _080542A0 + ldr r4, =0x0202428e lsls r0, 24 lsrs r0, 23 adds r0, r4 @@ -171014,13 +164606,13 @@ _08054250: lsrs r0, 23 adds r0, r4 ldrh r2, [r0] - ldr r1, _080542A4 + ldr r1, =0x0000ffef ands r1, r2 movs r4, 0 strh r1, [r0] ldrb r0, [r5] bl battle_side_get_owner - ldr r2, _080542A8 + ldr r2, =0x02024294 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -171029,17 +164621,13 @@ _08054250: adds r1, r2 strb r4, [r1, 0xA] bl b_movescr_stack_push_cursor - ldr r1, _080542AC - ldr r0, _080542B0 + ldr r1, =0x02024214 + ldr r0, =0x082dafdd b _080542BA .align 2, 0 -_080542A0: .4byte 0x0202428e -_080542A4: .4byte 0x0000ffef -_080542A8: .4byte 0x02024294 -_080542AC: .4byte 0x02024214 -_080542B0: .4byte 0x082dafdd + .pool _080542B4: - ldr r1, _080542C4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 _080542BA: @@ -171048,13 +164636,13 @@ _080542BA: pop {r0} bx r0 .align 2, 0 -_080542C4: .4byte 0x02024214 + .pool thumb_func_end atkBE_breakfree thumb_func_start atkBF_setcurled atkBF_setcurled: @ 80542C8 - ldr r1, _080542EC - ldr r0, _080542F0 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r2, r0 @@ -171065,26 +164653,24 @@ atkBF_setcurled: @ 80542C8 lsls r1, 23 orrs r0, r1 str r0, [r2] - ldr r1, _080542F4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_080542EC: .4byte 0x02024084 -_080542F0: .4byte 0x0202420b -_080542F4: .4byte 0x02024214 + .pool thumb_func_end atkBF_setcurled thumb_func_start atkC0_recoverbasedonsunlight atkC0_recoverbasedonsunlight: @ 80542F8 push {r4-r7,lr} sub sp, 0x4 - ldr r1, _08054364 - ldr r5, _08054368 + ldr r1, =0x0202420c + ldr r5, =0x0202420b ldrb r0, [r5] strb r0, [r1] - ldr r7, _0805436C + ldr r7, =0x02024084 ldrb r0, [r5] movs r6, 0x58 muls r0, r6 @@ -171093,7 +164679,7 @@ atkC0_recoverbasedonsunlight: @ 80542F8 ldrh r0, [r0, 0x2C] cmp r1, r0 beq _080543D8 - ldr r4, _08054370 + ldr r4, =0x020243cc ldrh r0, [r4] cmp r0, 0 beq _0805434A @@ -171118,9 +164704,9 @@ atkC0_recoverbasedonsunlight: @ 80542F8 cmp r0, 0 beq _08054378 _0805434A: - ldr r3, _08054374 - ldr r2, _0805436C - ldr r0, _08054368 + ldr r3, =0x020241f0 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -171131,18 +164717,14 @@ _0805434A: adds r1, r3, 0 b _080543B2 .align 2, 0 -_08054364: .4byte 0x0202420c -_08054368: .4byte 0x0202420b -_0805436C: .4byte 0x02024084 -_08054370: .4byte 0x020243cc -_08054374: .4byte 0x020241f0 + .pool _08054378: ldrh r1, [r4] movs r0, 0x60 ands r0, r1 cmp r0, 0 beq _080543A4 - ldr r4, _080543A0 + ldr r4, =0x020241f0 ldrb r0, [r5] muls r0, r6 adds r0, r7 @@ -171156,9 +164738,9 @@ _08054378: adds r1, r4, 0 b _080543B2 .align 2, 0 -_080543A0: .4byte 0x020241f0 + .pool _080543A4: - ldr r1, _080543D0 + ldr r1, =0x020241f0 ldrb r0, [r5] muls r0, r6 adds r0, r7 @@ -171176,16 +164758,15 @@ _080543BE: ldr r0, [r1] negs r0, r0 str r0, [r1] - ldr r1, _080543D4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080543F2 .align 2, 0 -_080543D0: .4byte 0x020241f0 -_080543D4: .4byte 0x02024214 + .pool _080543D8: - ldr r3, _080543FC + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -171204,7 +164785,7 @@ _080543F2: pop {r0} bx r0 .align 2, 0 -_080543FC: .4byte 0x02024214 + .pool thumb_func_end atkC0_recoverbasedonsunlight thumb_func_start sub_8054400 @@ -171214,8 +164795,8 @@ sub_8054400: @ 8054400 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _08054510 - ldr r0, _08054514 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 adds r4, r1, 0 @@ -171305,7 +164886,7 @@ sub_8054400: @ 8054400 ands r1, r3 lsls r1, 5 orrs r4, r1 - ldr r5, _08054518 + ldr r5, =0x02024400 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -171313,7 +164894,7 @@ sub_8054400: @ 8054400 bl __divsi3 adds r0, 0x1E strh r0, [r5] - ldr r6, _0805451C + ldr r6, =0x0202449c ldr r5, [r6] lsls r0, r4, 4 subs r0, r4 @@ -171333,7 +164914,7 @@ _080544F0: movs r1, 0xC0 orrs r0, r1 strb r0, [r2, 0x13] - ldr r1, _08054520 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -171345,11 +164926,7 @@ _080544F0: pop {r0} bx r0 .align 2, 0 -_08054510: .4byte 0x02024084 -_08054514: .4byte 0x0202420b -_08054518: .4byte 0x02024400 -_0805451C: .4byte 0x0202449c -_08054520: .4byte 0x02024214 + .pool thumb_func_end sub_8054400 thumb_func_start atkC2_selectnexttarget @@ -171357,23 +164934,23 @@ atkC2_selectnexttarget: @ 8054524 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _08054580 + ldr r0, =0x0202420c movs r1, 0 strb r1, [r0] - ldr r1, _08054584 + ldr r1, =0x0202406c ldrb r1, [r1] adds r6, r0, 0 - ldr r0, _08054588 + ldr r0, =0x02024214 mov r8, r0 cmp r1, 0 beq _0805456E adds r3, r6, 0 - ldr r0, _0805458C + ldr r0, =0x0202420b ldrb r5, [r0] - ldr r0, _08054590 + ldr r0, =0x0832a328 mov r12, r0 adds r4, r1, 0 - ldr r7, _08054594 + ldr r7, =0x02024210 _0805454C: ldrb r2, [r3] cmp r2, r5 @@ -171404,12 +164981,7 @@ _0805456E: pop {r0} bx r0 .align 2, 0 -_08054580: .4byte 0x0202420c -_08054584: .4byte 0x0202406c -_08054588: .4byte 0x02024214 -_0805458C: .4byte 0x0202420b -_08054590: .4byte 0x0832a328 -_08054594: .4byte 0x02024210 + .pool thumb_func_end atkC2_selectnexttarget thumb_func_start atkC3_setfutureattack @@ -171420,15 +164992,15 @@ atkC3_setfutureattack: @ 8054598 mov r5, r8 push {r5-r7} sub sp, 0x14 - ldr r0, _080545D0 + ldr r0, =0x020243d0 mov r8, r0 - ldr r6, _080545D4 + ldr r6, =0x0202420c ldrb r1, [r6] adds r0, r1, r0 ldrb r7, [r0] cmp r7, 0 beq _080545DC - ldr r3, _080545D8 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -171443,13 +165015,11 @@ atkC3_setfutureattack: @ 8054598 str r1, [r3] b _080546CC .align 2, 0 -_080545D0: .4byte 0x020243d0 -_080545D4: .4byte 0x0202420c -_080545D8: .4byte 0x02024214 + .pool _080545DC: adds r0, r1, 0 bl battle_get_per_side_status - ldr r4, _080546A0 + ldr r4, =0x0202428e lsls r0, 24 lsrs r0, 24 movs r1, 0x1 @@ -171469,7 +165039,7 @@ _080545DC: mov r1, r8 adds r1, 0x18 adds r0, r1 - ldr r1, _080546A4 + ldr r1, =0x020241ea mov r9, r1 ldrh r1, [r1] strh r1, [r0] @@ -171477,7 +165047,7 @@ _080545DC: adds r0, 0x4 ldrb r2, [r6] adds r0, r2 - ldr r5, _080546A8 + ldr r5, =0x0202420b ldrb r1, [r5] strb r1, [r0] ldrb r0, [r6] @@ -171494,7 +165064,7 @@ _080545DC: ldrb r0, [r5] movs r4, 0x58 muls r0, r4 - ldr r2, _080546AC + ldr r2, =0x02024084 adds r0, r2 ldrb r1, [r6] muls r1, r4 @@ -171514,7 +165084,7 @@ _080545DC: adds r2, 0x8 adds r1, r2 str r0, [r1] - ldr r1, _080546B0 + ldr r1, =0x0202433c ldrb r0, [r5] lsls r0, 4 adds r0, r1 @@ -171534,28 +165104,22 @@ _080545DC: _0805468C: mov r5, r9 ldrh r1, [r5] - ldr r0, _080546B4 + ldr r0, =0x00000161 cmp r1, r0 bne _080546BC - ldr r0, _080546B8 + ldr r0, =0x02024332 mov r1, r10 strb r1, [r0, 0x5] b _080546C4 .align 2, 0 -_080546A0: .4byte 0x0202428e -_080546A4: .4byte 0x020241ea -_080546A8: .4byte 0x0202420b -_080546AC: .4byte 0x02024084 -_080546B0: .4byte 0x0202433c -_080546B4: .4byte 0x00000161 -_080546B8: .4byte 0x02024332 + .pool _080546BC: - ldr r0, _080546DC + ldr r0, =0x02024332 mov r2, sp ldrb r2, [r2, 0x10] strb r2, [r0, 0x5] _080546C4: - ldr r1, _080546E0 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -171569,8 +165133,7 @@ _080546CC: pop {r0} bx r0 .align 2, 0 -_080546DC: .4byte 0x02024332 -_080546E0: .4byte 0x02024214 + .pool thumb_func_end atkC3_setfutureattack thumb_func_start atkC4_802B910 @@ -171579,17 +165142,17 @@ atkC4_802B910: @ 80546E4 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _08054728 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 - ldr r7, _0805472C + ldr r7, =0x02024744 cmp r0, 0 bne _080546FE - ldr r7, _08054730 + ldr r7, =0x020244ec _080546FE: - ldr r2, _08054734 - ldr r0, _08054738 + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -171597,7 +165160,7 @@ _080546FE: ldrh r0, [r0, 0x28] cmp r0, 0 bne _08054740 - ldr r3, _0805473C + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -171609,14 +165172,9 @@ _080546FE: ldrb r0, [r2, 0x4] b _080548DC .align 2, 0 -_08054728: .4byte 0x0202420b -_0805472C: .4byte 0x02024744 -_08054730: .4byte 0x020244ec -_08054734: .4byte 0x02024084 -_08054738: .4byte 0x0202420c -_0805473C: .4byte 0x02024214 + .pool _08054740: - ldr r6, _0805487C + ldr r6, =0x02024332 ldrb r0, [r6] mov r8, r0 cmp r0, 0x5 @@ -171666,29 +165224,29 @@ _08054794: cmp r0, 0x5 bls _08054750 _080547A4: - ldr r1, _0805487C + ldr r1, =0x02024332 mov r9, r1 ldrb r2, [r1] cmp r2, 0x5 bhi _080548A8 - ldr r1, _08054880 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r6, _08054884 + ldr r6, =0x0202420b ldrb r0, [r6] strb r0, [r1, 0x2] strb r2, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08054888 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x9 str r0, [r1] - ldr r2, _0805488C + ldr r2, =0x020241f0 mov r8, r2 - ldr r5, _08054890 + ldr r5, =0x083203cc mov r1, r9 ldrb r0, [r1] movs r4, 0x64 @@ -171703,8 +165261,8 @@ _080547A4: ldrb r3, [r1, 0x1] mov r2, r8 str r3, [r2] - ldr r2, _08054894 - ldr r0, _08054898 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -171728,8 +165286,8 @@ _080547A4: ldr r1, [r2] muls r0, r1 str r0, [r2] - ldr r3, _0805489C - ldr r1, _080548A0 + ldr r3, =0x02024084 + ldr r1, =0x0202420c ldrb r2, [r1] movs r1, 0x58 muls r1, r2 @@ -171748,7 +165306,7 @@ _080547A4: adds r2, r0, 0x2 mov r0, r8 str r2, [r0] - ldr r1, _080548A4 + ldr r1, =0x0202433c ldrb r0, [r6] lsls r0, 4 adds r0, r1 @@ -171769,22 +165327,12 @@ _08054870: strb r0, [r2] b _080548E2 .align 2, 0 -_0805487C: .4byte 0x02024332 -_08054880: .4byte 0x02022f58 -_08054884: .4byte 0x0202420b -_08054888: .4byte 0x02024214 -_0805488C: .4byte 0x020241f0 -_08054890: .4byte 0x083203cc -_08054894: .4byte 0x0831c898 -_08054898: .4byte 0x020241ea -_0805489C: .4byte 0x02024084 -_080548A0: .4byte 0x0202420c -_080548A4: .4byte 0x0202433c + .pool _080548A8: mov r0, r8 cmp r0, 0 beq _080548C8 - ldr r3, _080548C4 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -171796,9 +165344,9 @@ _080548A8: ldrb r0, [r2, 0x4] b _080548DC .align 2, 0 -_080548C4: .4byte 0x02024214 + .pool _080548C8: - ldr r3, _080548F0 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x5] ldrb r0, [r2, 0x6] @@ -171820,13 +165368,13 @@ _080548E2: pop {r0} bx r0 .align 2, 0 -_080548F0: .4byte 0x02024214 + .pool thumb_func_end atkC4_802B910 thumb_func_start atkC5_hidepreattack atkC5_hidepreattack: @ 80548F4 push {lr} - ldr r0, _08054908 + ldr r0, =0x020241ea ldrh r1, [r0] cmp r1, 0x5B beq _08054934 @@ -171836,17 +165384,17 @@ atkC5_hidepreattack: @ 80548F4 beq _08054918 b _08054960 .align 2, 0 -_08054908: .4byte 0x020241ea + .pool _0805490C: - ldr r0, _08054928 + ldr r0, =0x00000123 cmp r1, r0 beq _0805494C adds r0, 0x31 cmp r1, r0 bne _08054960 _08054918: - ldr r2, _0805492C - ldr r0, _08054930 + ldr r2, =0x020242ac + ldr r0, =0x0202420b ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -171854,12 +165402,10 @@ _08054918: movs r2, 0x40 b _0805495C .align 2, 0 -_08054928: .4byte 0x00000123 -_0805492C: .4byte 0x020242ac -_08054930: .4byte 0x0202420b + .pool _08054934: - ldr r2, _08054944 - ldr r0, _08054948 + ldr r2, =0x020242ac + ldr r0, =0x0202420b ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -171867,11 +165413,10 @@ _08054934: movs r2, 0x80 b _0805495C .align 2, 0 -_08054944: .4byte 0x020242ac -_08054948: .4byte 0x0202420b + .pool _0805494C: - ldr r2, _0805496C - ldr r0, _08054970 + ldr r2, =0x020242ac + ldr r0, =0x0202420b ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -171882,22 +165427,20 @@ _0805495C: orrs r0, r2 str r0, [r1] _08054960: - ldr r1, _08054974 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0805496C: .4byte 0x020242ac -_08054970: .4byte 0x0202420b -_08054974: .4byte 0x02024214 + .pool thumb_func_end atkC5_hidepreattack thumb_func_start atkC6_unhidepostattack atkC6_unhidepostattack: @ 8054978 push {lr} - ldr r0, _0805498C + ldr r0, =0x020241ea ldrh r1, [r0] cmp r1, 0x5B beq _080549BC @@ -171907,17 +165450,17 @@ atkC6_unhidepostattack: @ 8054978 beq _0805499C b _080549EA .align 2, 0 -_0805498C: .4byte 0x020241ea + .pool _08054990: - ldr r0, _080549B0 + ldr r0, =0x00000123 cmp r1, r0 beq _080549D8 adds r0, 0x31 cmp r1, r0 bne _080549EA _0805499C: - ldr r2, _080549B4 - ldr r0, _080549B8 + ldr r2, =0x020242ac + ldr r0, =0x0202420b ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -171926,12 +165469,10 @@ _0805499C: negs r2, r2 b _080549E6 .align 2, 0 -_080549B0: .4byte 0x00000123 -_080549B4: .4byte 0x020242ac -_080549B8: .4byte 0x0202420b + .pool _080549BC: - ldr r2, _080549D0 - ldr r0, _080549D4 + ldr r2, =0x020242ac + ldr r0, =0x0202420b ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -171940,45 +165481,41 @@ _080549BC: negs r2, r2 b _080549E6 .align 2, 0 -_080549D0: .4byte 0x020242ac -_080549D4: .4byte 0x0202420b + .pool _080549D8: - ldr r2, _080549F8 - ldr r0, _080549FC + ldr r2, =0x020242ac + ldr r0, =0x0202420b ldrb r1, [r0] lsls r1, 2 adds r1, r2 ldr r0, [r1] - ldr r2, _08054A00 + ldr r2, =0xfffbffff _080549E6: ands r0, r2 str r0, [r1] _080549EA: - ldr r1, _08054A04 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080549F8: .4byte 0x020242ac -_080549FC: .4byte 0x0202420b -_08054A00: .4byte 0xfffbffff -_08054A04: .4byte 0x02024214 + .pool thumb_func_end atkC6_unhidepostattack thumb_func_start atkC7_setminimize atkC7_setminimize: @ 8054A08 push {lr} - ldr r0, _08054A38 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 beq _08054A2C - ldr r2, _08054A3C - ldr r0, _08054A40 + ldr r2, =0x020242ac + ldr r0, =0x0202420b ldrb r1, [r0] lsls r1, 2 adds r1, r2 @@ -171988,68 +165525,61 @@ atkC7_setminimize: @ 8054A08 orrs r0, r2 str r0, [r1] _08054A2C: - ldr r1, _08054A44 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08054A38: .4byte 0x02024280 -_08054A3C: .4byte 0x020242ac -_08054A40: .4byte 0x0202420b -_08054A44: .4byte 0x02024214 + .pool thumb_func_end atkC7_setminimize thumb_func_start sub_8054A48 sub_8054A48: @ 8054A48 push {lr} - ldr r3, _08054A6C + ldr r3, =0x020243cc ldrh r1, [r3] movs r2, 0x80 adds r0, r2, 0 ands r0, r1 cmp r0, 0 beq _08054A78 - ldr r2, _08054A70 + ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 strb r0, [r2] - ldr r1, _08054A74 + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] b _08054A86 .align 2, 0 -_08054A6C: .4byte 0x020243cc -_08054A70: .4byte 0x0202427c -_08054A74: .4byte 0x02024332 + .pool _08054A78: strh r2, [r3] - ldr r0, _08054A94 + ldr r0, =0x02024332 movs r1, 0x5 strb r1, [r0, 0x5] - ldr r0, _08054A98 + ldr r0, =0x020243d0 adds r0, 0x28 strb r1, [r0] _08054A86: - ldr r1, _08054A9C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08054A94: .4byte 0x02024332 -_08054A98: .4byte 0x020243d0 -_08054A9C: .4byte 0x02024214 + .pool thumb_func_end sub_8054A48 thumb_func_start atkC9_jumpifattackandspecialattackcannotfall atkC9_jumpifattackandspecialattackcannotfall: @ 8054AA0 push {r4,lr} - ldr r2, _08054AE4 - ldr r0, _08054AE8 + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -172063,11 +165593,11 @@ atkC9_jumpifattackandspecialattackcannotfall: @ 8054AA0 ldrsb r0, [r1, r0] cmp r0, 0 bne _08054AF4 - ldr r0, _08054AEC + ldr r0, =0x02024332 ldrb r0, [r0, 0x6] cmp r0, 0x1 beq _08054AF4 - ldr r3, _08054AF0 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -172082,28 +165612,25 @@ atkC9_jumpifattackandspecialattackcannotfall: @ 8054AA0 str r1, [r3] b _08054B20 .align 2, 0 -_08054AE4: .4byte 0x02024084 -_08054AE8: .4byte 0x0202420c -_08054AEC: .4byte 0x02024332 -_08054AF0: .4byte 0x02024214 + .pool _08054AF4: - ldr r4, _08054B28 - ldr r0, _08054B2C + ldr r4, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r4] - ldr r2, _08054B30 + ldr r2, =0x020241f0 ldrb r1, [r4] movs r0, 0x58 muls r0, r1 adds r0, r3 ldrh r0, [r0, 0x28] str r0, [r2] - ldr r1, _08054B34 + ldr r1, =0x00007fff movs r0, 0 bl dp01_build_cmdbuf_x18_0_aa_health_bar_update ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08054B38 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -172112,20 +165639,16 @@ _08054B20: pop {r0} bx r0 .align 2, 0 -_08054B28: .4byte 0x02024064 -_08054B2C: .4byte 0x0202420b -_08054B30: .4byte 0x020241f0 -_08054B34: .4byte 0x00007fff -_08054B38: .4byte 0x02024214 + .pool thumb_func_end atkC9_jumpifattackandspecialattackcannotfall thumb_func_start atkCA_setforcedtarget atkCA_setforcedtarget: @ 8054B3C push {r4,r5,lr} - ldr r4, _08054B7C + ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner - ldr r5, _08054B80 + ldr r5, =0x02024294 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 @@ -172144,7 +165667,7 @@ atkCA_setforcedtarget: @ 8054B3C adds r1, r5 ldrb r0, [r4] strb r0, [r1, 0x9] - ldr r1, _08054B84 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -172152,16 +165675,14 @@ atkCA_setforcedtarget: @ 8054B3C pop {r0} bx r0 .align 2, 0 -_08054B7C: .4byte 0x0202420b -_08054B80: .4byte 0x02024294 -_08054B84: .4byte 0x02024214 + .pool thumb_func_end atkCA_setforcedtarget thumb_func_start atkCB_setcharge atkCB_setcharge: @ 8054B88 push {r4,lr} - ldr r0, _08054BDC - ldr r3, _08054BE0 + ldr r0, =0x020242ac + ldr r3, =0x0202420b ldrb r1, [r3] lsls r1, 2 adds r1, r0 @@ -172170,7 +165691,7 @@ atkCB_setcharge: @ 8054B88 lsls r2, 2 orrs r0, r2 str r0, [r1] - ldr r4, _08054BE4 + ldr r4, =0x020242bc ldrb r1, [r3] lsls r0, r1, 3 subs r0, r1 @@ -172194,7 +165715,7 @@ atkCB_setcharge: @ 8054B88 movs r2, 0x20 orrs r1, r2 strb r1, [r0, 0x12] - ldr r1, _08054BE8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -172202,23 +165723,20 @@ atkCB_setcharge: @ 8054B88 pop {r0} bx r0 .align 2, 0 -_08054BDC: .4byte 0x020242ac -_08054BE0: .4byte 0x0202420b -_08054BE4: .4byte 0x020242bc -_08054BE8: .4byte 0x02024214 + .pool thumb_func_end atkCB_setcharge thumb_func_start atkCC_callterrainattack atkCC_callterrainattack: @ 8054BEC push {r4,lr} - ldr r2, _08054C3C + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _08054C40 + ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, _08054C44 - ldr r1, _08054C48 - ldr r0, _08054C4C + ldr r4, =0x020241ea + ldr r1, =0x0831c414 + ldr r0, =0x02022ff0 ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -172227,10 +165745,10 @@ atkCC_callterrainattack: @ 8054BEC ldrh r0, [r4] movs r1, 0 bl sub_80458E0 - ldr r1, _08054C50 + ldr r1, =0x0202420c strb r0, [r1] - ldr r3, _08054C54 - ldr r2, _08054C58 + ldr r3, =0x082d86a8 + ldr r2, =0x0831c898 ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -172241,7 +165759,7 @@ atkCC_callterrainattack: @ 8054BEC adds r0, r3 ldr r0, [r0] bl b_movescr_stack_push - ldr r1, _08054C5C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -172249,23 +165767,15 @@ atkCC_callterrainattack: @ 8054BEC pop {r0} bx r0 .align 2, 0 -_08054C3C: .4byte 0x02024280 -_08054C40: .4byte 0xfffffbff -_08054C44: .4byte 0x020241ea -_08054C48: .4byte 0x0831c414 -_08054C4C: .4byte 0x02022ff0 -_08054C50: .4byte 0x0202420c -_08054C54: .4byte 0x082d86a8 -_08054C58: .4byte 0x0831c898 -_08054C5C: .4byte 0x02024214 + .pool thumb_func_end atkCC_callterrainattack thumb_func_start atkCD_cureifburnedparalysedorpoisoned atkCD_cureifburnedparalysedorpoisoned: @ 8054C60 push {r4-r6,lr} sub sp, 0x4 - ldr r1, _08054CAC - ldr r3, _08054CB0 + ldr r1, =0x02024084 + ldr r3, =0x0202420b ldrb r0, [r3] movs r6, 0x58 muls r0, r6 @@ -172279,11 +165789,11 @@ atkCD_cureifburnedparalysedorpoisoned: @ 8054C60 beq _08054CBC movs r0, 0 str r0, [r2] - ldr r1, _08054CB4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r4, _08054CB8 + ldr r4, =0x02024064 ldrb r0, [r3] strb r0, [r4] ldrb r0, [r4] @@ -172299,12 +165809,9 @@ atkCD_cureifburnedparalysedorpoisoned: @ 8054C60 bl dp01_battle_side_mark_buffer_for_execution b _08054CD6 .align 2, 0 -_08054CAC: .4byte 0x02024084 -_08054CB0: .4byte 0x0202420b -_08054CB4: .4byte 0x02024214 -_08054CB8: .4byte 0x02024064 + .pool _08054CBC: - ldr r3, _08054CE0 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -172323,14 +165830,14 @@ _08054CD6: pop {r0} bx r0 .align 2, 0 -_08054CE0: .4byte 0x02024214 + .pool thumb_func_end atkCD_cureifburnedparalysedorpoisoned thumb_func_start atkCE_settorment atkCE_settorment: @ 8054CE4 push {lr} - ldr r1, _08054D1C - ldr r0, _08054D20 + ldr r1, =0x02024084 + ldr r0, =0x0202420c ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -172341,7 +165848,7 @@ atkCE_settorment: @ 8054CE4 lsls r2, 24 cmp r1, 0 bge _08054D28 - ldr r3, _08054D24 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -172356,13 +165863,11 @@ atkCE_settorment: @ 8054CE4 str r1, [r3] b _08054D34 .align 2, 0 -_08054D1C: .4byte 0x02024084 -_08054D20: .4byte 0x0202420c -_08054D24: .4byte 0x02024214 + .pool _08054D28: orrs r1, r2 str r1, [r0] - ldr r1, _08054D38 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -172370,14 +165875,14 @@ _08054D34: pop {r0} bx r0 .align 2, 0 -_08054D38: .4byte 0x02024214 + .pool thumb_func_end atkCE_settorment thumb_func_start atkCF_jumpifnodamage atkCF_jumpifnodamage: @ 8054D3C push {lr} - ldr r2, _08054D68 - ldr r0, _08054D6C + ldr r2, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r1, r0, 4 adds r0, r2, 0x4 @@ -172392,17 +165897,15 @@ atkCF_jumpifnodamage: @ 8054D3C cmp r0, 0 beq _08054D74 _08054D5C: - ldr r1, _08054D70 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08054D8E .align 2, 0 -_08054D68: .4byte 0x0202433c -_08054D6C: .4byte 0x0202420b -_08054D70: .4byte 0x02024214 + .pool _08054D74: - ldr r3, _08054D94 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -172419,14 +165922,14 @@ _08054D8E: pop {r0} bx r0 .align 2, 0 -_08054D94: .4byte 0x02024214 + .pool thumb_func_end atkCF_jumpifnodamage thumb_func_start atkD0_settaunt atkD0_settaunt: @ 8054D98 push {r4,lr} - ldr r4, _08054DDC - ldr r3, _08054DE0 + ldr r4, =0x020242bc + ldr r3, =0x0202420c ldrb r0, [r3] lsls r1, r0, 3 subs r1, r0 @@ -172453,17 +165956,15 @@ atkD0_settaunt: @ 8054D98 movs r2, 0x20 orrs r1, r2 strb r1, [r0, 0x13] - ldr r1, _08054DE4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08054E02 .align 2, 0 -_08054DDC: .4byte 0x020242bc -_08054DE0: .4byte 0x0202420c -_08054DE4: .4byte 0x02024214 + .pool _08054DE8: - ldr r3, _08054E08 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -172481,13 +165982,13 @@ _08054E02: pop {r0} bx r0 .align 2, 0 -_08054E08: .4byte 0x02024214 + .pool thumb_func_end atkD0_settaunt thumb_func_start atkD1_sethelpinghand atkD1_sethelpinghand: @ 8054E0C push {r4,lr} - ldr r4, _08054E74 + ldr r4, =0x0202420b ldrb r0, [r4] bl battle_get_per_side_status movs r1, 0x2 @@ -172495,17 +165996,17 @@ atkD1_sethelpinghand: @ 8054E0C lsls r0, 24 lsrs r0, 24 bl battle_get_side_with_given_state - ldr r3, _08054E78 + ldr r3, =0x0202420c strb r0, [r3] - ldr r0, _08054E7C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _08054E90 - ldr r0, _08054E80 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08054E84 + ldr r2, =0x0832a328 ldrb r3, [r3] lsls r0, r3, 2 adds r0, r2 @@ -172513,7 +166014,7 @@ atkD1_sethelpinghand: @ 8054E0C ands r1, r0 cmp r1, 0 bne _08054E90 - ldr r1, _08054E88 + ldr r1, =0x0202433c ldrb r0, [r4] lsls r0, 4 adds r0, r1 @@ -172530,21 +166031,15 @@ atkD1_sethelpinghand: @ 8054E0C movs r0, 0x8 orrs r0, r1 strb r0, [r2] - ldr r1, _08054E8C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08054EAA .align 2, 0 -_08054E74: .4byte 0x0202420b -_08054E78: .4byte 0x0202420c -_08054E7C: .4byte 0x02022fec -_08054E80: .4byte 0x02024210 -_08054E84: .4byte 0x0832a328 -_08054E88: .4byte 0x0202433c -_08054E8C: .4byte 0x02024214 + .pool _08054E90: - ldr r3, _08054EB0 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -172562,7 +166057,7 @@ _08054EAA: pop {r0} bx r0 .align 2, 0 -_08054EB0: .4byte 0x02024214 + .pool thumb_func_end atkD1_sethelpinghand thumb_func_start sub_8054EB4 @@ -172573,14 +166068,14 @@ sub_8054EB4: @ 8054EB4 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r4, _08054FB8 + ldr r4, =0x02022fec ldr r0, [r4] movs r1, 0x80 lsls r1, 19 ands r0, r1 cmp r0, 0 bne _08054F9A - ldr r0, _08054FBC + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -172588,34 +166083,34 @@ sub_8054EB4: @ 8054EB4 cmp r0, 0x1 bne _08054EE8 ldr r0, [r4] - ldr r1, _08054FC0 + ldr r1, =0x0a3f0902 ands r0, r1 cmp r0, 0 beq _08054F9A _08054EE8: - ldr r6, _08054FBC + ldr r6, =0x0202420b ldrb r0, [r6] bl battle_side_get_owner lsls r0, 24 lsrs r4, r0, 24 - ldr r7, _08054FC4 + ldr r7, =0x0202420c ldrb r0, [r7] bl battle_side_get_owner lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08054FB8 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08054FC0 + ldr r1, =0x0a3f0902 ands r0, r1 cmp r0, 0 bne _08054F46 - ldr r0, _08054FC8 + ldr r0, =0x020243d0 adds r2, r0, 0 adds r2, 0x29 adds r0, r4, r2 ldrb r1, [r0] - ldr r4, _08054FCC - ldr r3, _08054FD0 + ldr r4, =0x0832a328 + ldr r3, =0x0202406e ldrb r0, [r6] lsls r0, 1 adds r0, r3 @@ -172639,9 +166134,9 @@ _08054EE8: cmp r1, 0 bne _08054F9A _08054F46: - ldr r0, _08054FD4 + ldr r0, =0x02024084 mov r8, r0 - ldr r1, _08054FBC + ldr r1, =0x0202420b ldrb r4, [r1] movs r5, 0x58 adds r0, r4, 0 @@ -172652,7 +166147,7 @@ _08054F46: adds r1, r3, 0 cmp r1, 0 bne _08054F6E - ldr r0, _08054FC4 + ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r5 add r0, r8 @@ -172662,7 +166157,7 @@ _08054F46: _08054F6E: cmp r1, 0xAF beq _08054F9A - ldr r7, _08054FC4 + ldr r7, =0x0202420c ldrb r0, [r7] muls r0, r5 mov r2, r8 @@ -172683,7 +166178,7 @@ _08054F6E: cmp r0, 0xB bhi _08054FDC _08054F9A: - ldr r3, _08054FD8 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -172698,25 +166193,17 @@ _08054F9A: str r1, [r3] b _08055132 .align 2, 0 -_08054FB8: .4byte 0x02022fec -_08054FBC: .4byte 0x0202420b -_08054FC0: .4byte 0x0a3f0902 -_08054FC4: .4byte 0x0202420c -_08054FC8: .4byte 0x020243d0 -_08054FCC: .4byte 0x0832a328 -_08054FD0: .4byte 0x0202406e -_08054FD4: .4byte 0x02024084 -_08054FD8: .4byte 0x02024214 + .pool _08054FDC: adds r0, r1, 0 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x3C bne _08055010 - ldr r1, _08055004 - ldr r0, _08055008 + ldr r1, =0x02024214 + ldr r0, =0x082db63f str r0, [r1] - ldr r1, _0805500C + ldr r1, =0x0202420a ldrb r0, [r7] muls r0, r5 add r0, r8 @@ -172728,11 +166215,9 @@ _08054FDC: bl b_history__record_ability_usage_of_player b _08055132 .align 2, 0 -_08055004: .4byte 0x02024214 -_08055008: .4byte 0x082db63f -_0805500C: .4byte 0x0202420a + .pool _08055010: - ldr r3, _080550FC + ldr r3, =0x0202449c mov r10, r3 lsls r0, r4, 1 adds r0, 0xD0 @@ -172742,7 +166227,7 @@ _08055010: ldrh r0, [r0, 0x2E] mov r9, r0 strh r2, [r6] - ldr r1, _08055100 + ldr r1, =0x0202420b ldrb r0, [r1] muls r0, r5 add r0, r8 @@ -172753,8 +166238,8 @@ _08055010: add r0, r8 mov r2, r9 strh r2, [r0, 0x2E] - ldr r4, _08055104 - ldr r3, _08055100 + ldr r4, =0x02024064 + ldr r3, =0x0202420b ldrb r0, [r3] strb r0, [r4] str r6, [sp] @@ -172763,7 +166248,7 @@ _08055010: movs r2, 0 movs r3, 0x2 bl dp01_build_cmdbuf_x02_a_b_varargs - ldr r1, _08055100 + ldr r1, =0x0202420b ldrb r0, [r1] bl dp01_battle_side_mark_buffer_for_execution ldrb r0, [r7] @@ -172795,14 +166280,14 @@ _08055010: adds r0, r1 adds r0, 0xC9 strb r3, [r0] - ldr r1, _08055100 + ldr r1, =0x0202420b ldrb r0, [r1] ldr r1, [r2] lsls r0, 1 adds r0, r1 adds r0, 0xC8 strb r3, [r0] - ldr r2, _08055100 + ldr r2, =0x0202420b ldrb r0, [r2] mov r3, r10 ldr r1, [r3] @@ -172811,11 +166296,11 @@ _08055010: adds r0, 0xC9 movs r1, 0 strb r1, [r0] - ldr r1, _08055108 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r1, _0805510C + ldr r1, =0x02022f58 movs r3, 0xFD strb r3, [r1] movs r2, 0xA @@ -172827,7 +166312,7 @@ _08055010: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08055110 + ldr r1, =0x02022f68 strb r3, [r1] strb r2, [r1, 0x1] mov r2, r9 @@ -172843,29 +166328,23 @@ _08055010: ldrh r0, [r6] cmp r0, 0 beq _0805512C - ldr r1, _08055114 + ldr r1, =0x02024332 movs r0, 0x2 b _08055130 .align 2, 0 -_080550FC: .4byte 0x0202449c -_08055100: .4byte 0x0202420b -_08055104: .4byte 0x02024064 -_08055108: .4byte 0x02024214 -_0805510C: .4byte 0x02022f58 -_08055110: .4byte 0x02022f68 -_08055114: .4byte 0x02024332 + .pool _08055118: ldrh r0, [r6] cmp r0, 0 beq _0805512C - ldr r0, _08055128 + ldr r0, =0x02024332 movs r1, 0 strb r1, [r0, 0x5] b _08055132 .align 2, 0 -_08055128: .4byte 0x02024332 + .pool _0805512C: - ldr r1, _08055144 + ldr r1, =0x02024332 movs r0, 0x1 _08055130: strb r0, [r1, 0x5] @@ -172879,14 +166358,14 @@ _08055132: pop {r0} bx r0 .align 2, 0 -_08055144: .4byte 0x02024332 + .pool thumb_func_end sub_8054EB4 thumb_func_start sub_8055148 sub_8055148: @ 8055148 push {r4,lr} - ldr r3, _08055188 - ldr r4, _0805518C + ldr r3, =0x02024084 + ldr r4, =0x0202420c ldrb r0, [r4] movs r2, 0x58 muls r0, r2 @@ -172898,32 +166377,28 @@ sub_8055148: @ 8055148 beq _0805519C cmp r0, 0x19 beq _0805519C - ldr r0, _08055190 + ldr r0, =0x0202420b ldrb r0, [r0] muls r0, r2 adds r0, r3 adds r0, 0x20 strb r1, [r0] - ldr r1, _08055194 + ldr r1, =0x0202420a ldrb r0, [r4] muls r0, r2 adds r0, r3 adds r0, 0x20 ldrb r0, [r0] strb r0, [r1] - ldr r1, _08055198 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080551B6 .align 2, 0 -_08055188: .4byte 0x02024084 -_0805518C: .4byte 0x0202420c -_08055190: .4byte 0x0202420b -_08055194: .4byte 0x0202420a -_08055198: .4byte 0x02024214 + .pool _0805519C: - ldr r3, _080551BC + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -172941,13 +166416,13 @@ _080551B6: pop {r0} bx r0 .align 2, 0 -_080551BC: .4byte 0x02024214 + .pool thumb_func_end sub_8055148 thumb_func_start atkD4_802C408 atkD4_802C408: @ 80551C0 push {r4-r7,lr} - ldr r7, _080551D4 + ldr r7, =0x02024214 ldr r2, [r7] ldrb r3, [r2, 0x1] cmp r3, 0 @@ -172956,10 +166431,10 @@ atkD4_802C408: @ 80551C0 beq _08055210 b _0805528C .align 2, 0 -_080551D4: .4byte 0x02024214 + .pool _080551D8: - ldr r1, _08055204 - ldr r4, _08055208 + ldr r1, =0x020243d0 + ldr r4, =0x0202420b adds r0, r1, 0 adds r0, 0x20 ldrb r5, [r4] @@ -172972,7 +166447,7 @@ _080551D8: ldrb r0, [r4] adds r1, 0x24 adds r1, r0, r1 - ldr r2, _0805520C + ldr r2, =0x0202406e lsls r0, 1 adds r0, r2 ldrh r0, [r0] @@ -172981,19 +166456,17 @@ _080551D8: adds r0, 0x6 b _0805528A .align 2, 0 -_08055204: .4byte 0x020243d0 -_08055208: .4byte 0x0202420b -_0805520C: .4byte 0x0202406e + .pool _08055210: - ldr r1, _08055274 + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x4 strb r0, [r1, 0x1] - ldr r4, _08055278 + ldr r4, =0x0202420c ldrb r0, [r4] strb r0, [r1, 0x2] - ldr r0, _0805527C + ldr r0, =0x020243d0 adds r0, 0x24 ldrb r5, [r4] adds r0, r5 @@ -173001,8 +166474,8 @@ _08055210: strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - ldr r1, _08055280 - ldr r6, _08055284 + ldr r1, =0x020241f0 + ldr r6, =0x02024084 ldrb r0, [r4] movs r5, 0x58 muls r0, r5 @@ -173038,11 +166511,7 @@ _0805525C: str r1, [r7] b _0805528C .align 2, 0 -_08055274: .4byte 0x02022f58 -_08055278: .4byte 0x0202420c -_0805527C: .4byte 0x020243d0 -_08055280: .4byte 0x020241f0 -_08055284: .4byte 0x02024084 + .pool _08055288: adds r0, r2, 0x6 _0805528A: @@ -173056,8 +166525,8 @@ _0805528C: thumb_func_start sub_8055294 sub_8055294: @ 8055294 push {lr} - ldr r1, _080552CC - ldr r0, _080552D0 + ldr r1, =0x020242ac + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -173068,7 +166537,7 @@ sub_8055294: @ 8055294 ands r0, r3 cmp r0, 0 beq _080552D8 - ldr r3, _080552D4 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -173083,13 +166552,11 @@ sub_8055294: @ 8055294 str r1, [r3] b _080552E4 .align 2, 0 -_080552CC: .4byte 0x020242ac -_080552D0: .4byte 0x0202420b -_080552D4: .4byte 0x02024214 + .pool _080552D8: orrs r1, r3 str r1, [r2] - ldr r1, _080552E8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -173097,14 +166564,14 @@ _080552E4: pop {r0} bx r0 .align 2, 0 -_080552E8: .4byte 0x02024214 + .pool thumb_func_end sub_8055294 thumb_func_start atkD6_doubledamagedealtifdamaged atkD6_doubledamagedealtifdamaged: @ 80552EC push {lr} - ldr r3, _08055338 - ldr r0, _0805533C + ldr r3, =0x0202433c + ldr r0, =0x0202420b ldrb r0, [r0] lsls r2, r0, 4 adds r0, r3, 0x4 @@ -173113,7 +166580,7 @@ atkD6_doubledamagedealtifdamaged: @ 80552EC cmp r0, 0 beq _0805530C adds r0, r2, r3 - ldr r1, _08055340 + ldr r1, =0x0202420c ldrb r0, [r0, 0xC] ldrb r1, [r1] cmp r0, r1 @@ -173126,35 +166593,31 @@ _0805530C: cmp r0, 0 beq _0805532A adds r0, r2, r3 - ldr r1, _08055340 + ldr r1, =0x0202420c ldrb r0, [r0, 0xD] ldrb r1, [r1] cmp r0, r1 bne _0805532A _08055324: - ldr r1, _08055344 + ldr r1, =0x02024474 movs r0, 0x2 strb r0, [r1, 0xE] _0805532A: - ldr r1, _08055348 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08055338: .4byte 0x0202433c -_0805533C: .4byte 0x0202420b -_08055340: .4byte 0x0202420c -_08055344: .4byte 0x02024474 -_08055348: .4byte 0x02024214 + .pool thumb_func_end atkD6_doubledamagedealtifdamaged thumb_func_start sub_805534C sub_805534C: @ 805534C push {r4,lr} - ldr r1, _08055390 - ldr r0, _08055394 + ldr r1, =0x020242ac + ldr r0, =0x0202420c ldrb r3, [r0] lsls r0, r3, 2 adds r4, r0, r1 @@ -173164,7 +166627,7 @@ sub_805534C: @ 805534C ands r0, r2 cmp r0, 0 bne _08055374 - ldr r1, _08055398 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 adds r1, 0x4C @@ -173173,7 +166636,7 @@ sub_805534C: @ 805534C cmp r0, 0 beq _080553A0 _08055374: - ldr r3, _0805539C + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -173188,16 +166651,13 @@ _08055374: str r1, [r3] b _080553B0 .align 2, 0 -_08055390: .4byte 0x020242ac -_08055394: .4byte 0x0202420c -_08055398: .4byte 0x02024084 -_0805539C: .4byte 0x02024214 + .pool _080553A0: movs r0, 0x80 lsls r0, 5 orrs r2, r0 str r2, [r4] - ldr r1, _080553B8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -173206,19 +166666,19 @@ _080553B0: pop {r0} bx r0 .align 2, 0 -_080553B8: .4byte 0x02024214 + .pool thumb_func_end sub_805534C thumb_func_start atkD8_setdamagetohealthdifference atkD8_setdamagetohealthdifference: @ 80553BC push {lr} - ldr r2, _080553F8 - ldr r0, _080553FC + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r0, [r0] movs r1, 0x58 muls r0, r1 adds r3, r0, r2 - ldr r0, _08055400 + ldr r0, =0x0202420b ldrb r0, [r0] muls r0, r1 adds r1, r0, r2 @@ -173226,7 +166686,7 @@ atkD8_setdamagetohealthdifference: @ 80553BC ldrh r2, [r1, 0x28] cmp r0, r2 bhi _08055408 - ldr r3, _08055404 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -173241,17 +166701,14 @@ atkD8_setdamagetohealthdifference: @ 80553BC str r1, [r3] b _0805541A .align 2, 0 -_080553F8: .4byte 0x02024084 -_080553FC: .4byte 0x0202420c -_08055400: .4byte 0x0202420b -_08055404: .4byte 0x02024214 + .pool _08055408: - ldr r2, _08055420 + ldr r2, =0x020241f0 ldrh r0, [r3, 0x28] ldrh r1, [r1, 0x28] subs r0, r1 str r0, [r2] - ldr r1, _08055424 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -173259,27 +166716,26 @@ _0805541A: pop {r0} bx r0 .align 2, 0 -_08055420: .4byte 0x020241f0 -_08055424: .4byte 0x02024214 + .pool thumb_func_end atkD8_setdamagetohealthdifference thumb_func_start atkD9_scaledamagebyhealthratio atkD9_scaledamagebyhealthratio: @ 8055428 push {r4,lr} - ldr r4, _08055474 + ldr r4, =0x02024400 ldrh r0, [r4] cmp r0, 0 bne _08055464 - ldr r2, _08055478 - ldr r0, _0805547C + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 lsls r0, 2 adds r0, r2 ldrb r3, [r0, 0x1] - ldr r2, _08055480 - ldr r0, _08055484 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r1, r0 @@ -173295,7 +166751,7 @@ atkD9_scaledamagebyhealthratio: @ 8055428 movs r0, 0x1 strh r0, [r4] _08055464: - ldr r1, _08055488 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -173303,19 +166759,14 @@ _08055464: pop {r0} bx r0 .align 2, 0 -_08055474: .4byte 0x02024400 -_08055478: .4byte 0x0831c898 -_0805547C: .4byte 0x020241ea -_08055480: .4byte 0x02024084 -_08055484: .4byte 0x0202420b -_08055488: .4byte 0x02024214 + .pool thumb_func_end atkD9_scaledamagebyhealthratio thumb_func_start atkDA_abilityswap atkDA_abilityswap: @ 805548C push {r4-r6,lr} - ldr r5, _080554F0 - ldr r0, _080554F4 + ldr r5, =0x02024084 + ldr r0, =0x0202420b ldrb r0, [r0] movs r4, 0x58 muls r0, r4 @@ -173325,7 +166776,7 @@ atkDA_abilityswap: @ 805548C ldrb r1, [r2] cmp r1, 0 bne _080554B4 - ldr r0, _080554F8 + ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r4 adds r0, r5 @@ -173336,7 +166787,7 @@ atkDA_abilityswap: @ 805548C _080554B4: cmp r1, 0x19 beq _080554D4 - ldr r6, _080554F8 + ldr r6, =0x0202420c ldrb r0, [r6] muls r0, r4 adds r0, r5 @@ -173344,14 +166795,14 @@ _080554B4: ldrb r3, [r0] cmp r3, 0x19 beq _080554D4 - ldr r0, _080554FC + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 cmp r0, 0 beq _08055504 _080554D4: - ldr r3, _08055500 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -173366,11 +166817,7 @@ _080554D4: str r1, [r3] b _0805551A .align 2, 0 -_080554F0: .4byte 0x02024084 -_080554F4: .4byte 0x0202420b -_080554F8: .4byte 0x0202420c -_080554FC: .4byte 0x0202427c -_08055500: .4byte 0x02024214 + .pool _08055504: ldrb r1, [r2] strb r3, [r2] @@ -173379,7 +166826,7 @@ _08055504: adds r0, r5 adds r0, 0x20 strb r1, [r0] - ldr r1, _08055520 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -173388,7 +166835,7 @@ _0805551A: pop {r0} bx r0 .align 2, 0 -_08055520: .4byte 0x02024214 + .pool thumb_func_end atkDA_abilityswap thumb_func_start atkDB_imprisoneffect @@ -173397,8 +166844,8 @@ atkDB_imprisoneffect: @ 8055524 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r1, _08055544 - ldr r4, _08055548 + ldr r1, =0x020242ac + ldr r4, =0x0202420b ldrb r2, [r4] lsls r0, r2, 2 adds r0, r1 @@ -173410,10 +166857,9 @@ atkDB_imprisoneffect: @ 8055524 beq _08055574 b _080555F6 .align 2, 0 -_08055544: .4byte 0x020242ac -_08055548: .4byte 0x0202420b + .pool _0805554C: - ldr r0, _0805556C + ldr r0, =0x020242ac mov r2, r9 ldrb r1, [r2] lsls r1, 2 @@ -173423,14 +166869,13 @@ _0805554C: lsls r2, 6 orrs r0, r2 str r0, [r1] - ldr r1, _08055570 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080555EE .align 2, 0 -_0805556C: .4byte 0x020242ac -_08055570: .4byte 0x02024214 + .pool _08055574: adds r0, r2, 0 bl battle_side_get_owner @@ -173449,9 +166894,9 @@ _0805558A: cmp r8, r0 beq _080555E0 movs r4, 0 - ldr r7, _0805561C + ldr r7, =0x0202420b mov r9, r7 - ldr r0, _08055620 + ldr r0, =0x02024084 mov r12, r0 mov r1, r9 ldrb r0, [r1] @@ -173494,17 +166939,17 @@ _080555E0: lsls r0, 24 lsrs r6, r0, 24 _080555E6: - ldr r0, _08055624 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 bcc _0805558A _080555EE: - ldr r0, _08055624 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 bne _08055610 _080555F6: - ldr r3, _08055628 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -173525,17 +166970,14 @@ _08055610: pop {r0} bx r0 .align 2, 0 -_0805561C: .4byte 0x0202420b -_08055620: .4byte 0x02024084 -_08055624: .4byte 0x0202406c -_08055628: .4byte 0x02024214 + .pool thumb_func_end atkDB_imprisoneffect thumb_func_start atkDC_setgrudge atkDC_setgrudge: @ 805562C push {lr} - ldr r1, _08055664 - ldr r0, _08055668 + ldr r1, =0x020242ac + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -173546,7 +166988,7 @@ atkDC_setgrudge: @ 805562C ands r0, r3 cmp r0, 0 beq _08055670 - ldr r3, _0805566C + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -173561,13 +167003,11 @@ atkDC_setgrudge: @ 805562C str r1, [r3] b _0805567C .align 2, 0 -_08055664: .4byte 0x020242ac -_08055668: .4byte 0x0202420b -_0805566C: .4byte 0x02024214 + .pool _08055670: orrs r1, r3 str r1, [r2] - ldr r1, _08055680 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -173575,7 +167015,7 @@ _0805567C: pop {r0} bx r0 .align 2, 0 -_08055680: .4byte 0x02024214 + .pool thumb_func_end atkDC_setgrudge thumb_func_start atkDD_weightdamagecalculation @@ -173584,18 +167024,18 @@ atkDD_weightdamagecalculation: @ 8055684 mov r7, r8 push {r7} movs r5, 0 - ldr r2, _080556E8 + ldr r2, =0x0831c428 ldrh r0, [r2] - ldr r1, _080556EC + ldr r1, =0x0000ffff cmp r0, r1 beq _080556FC adds r6, r2, 0 - ldr r0, _080556F0 + ldr r0, =0x02024084 mov r8, r0 adds r7, r1, 0 adds r4, r6, 0 _080556A0: - ldr r0, _080556F4 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -173620,10 +167060,10 @@ _080556CE: lsls r0, r5, 1 adds r0, r6 ldrh r1, [r0] - ldr r0, _080556EC + ldr r0, =0x0000ffff cmp r1, r0 beq _080556FC - ldr r0, _080556F8 + ldr r0, =0x02024400 adds r1, r5, 0x1 lsls r1, 1 adds r1, r6 @@ -173631,17 +167071,13 @@ _080556CE: strh r1, [r0] b _08055702 .align 2, 0 -_080556E8: .4byte 0x0831c428 -_080556EC: .4byte 0x0000ffff -_080556F0: .4byte 0x02024084 -_080556F4: .4byte 0x0202420c -_080556F8: .4byte 0x02024400 + .pool _080556FC: - ldr r1, _08055714 + ldr r1, =0x02024400 movs r0, 0x78 strh r0, [r1] _08055702: - ldr r1, _08055718 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -173651,8 +167087,7 @@ _08055702: pop {r0} bx r0 .align 2, 0 -_08055714: .4byte 0x02024400 -_08055718: .4byte 0x02024214 + .pool thumb_func_end atkDD_weightdamagecalculation thumb_func_start atkDE_asistattackselect @@ -173665,26 +167100,26 @@ atkDE_asistattackselect: @ 805571C sub sp, 0xC movs r0, 0 mov r10, r0 - ldr r0, _0805583C + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x18 str r0, [sp, 0x4] - ldr r0, _08055840 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status movs r1, 0x1 ands r1, r0 - ldr r0, _08055844 + ldr r0, =0x020244ec str r0, [sp] cmp r1, 0 beq _0805574C - ldr r1, _08055848 + ldr r1, =0x02024744 str r1, [sp] _0805574C: movs r2, 0 _0805574E: - ldr r1, _0805584C - ldr r0, _08055840 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -173711,7 +167146,7 @@ _0805574E: cmp r0, r1 beq _080557F4 movs r5, 0 - ldr r1, _08055850 + ldr r1, =0x0000ffff mov r8, r1 mov r9, r6 mov r1, r10 @@ -173733,14 +167168,14 @@ _08055798: adds r1, r5, 0x1 cmp r0, 0 bne _080557EE - ldr r0, _08055854 + ldr r0, =0x0831c3e0 ldrh r2, [r0] adds r3, r0, 0 cmp r2, r8 beq _080557E2 cmp r4, r2 beq _080557D8 - ldr r5, _08055850 + ldr r5, =0x0000ffff adds r2, r3, 0 _080557CA: adds r2, 0x2 @@ -173774,12 +167209,12 @@ _080557F4: mov r1, r10 cmp r1, 0 beq _0805586C - ldr r2, _08055858 + ldr r2, =0x02024280 ldr r0, [r2] - ldr r1, _0805585C + ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] - ldr r4, _08055860 + ldr r4, =0x020241ee bl GenerateRandomNumber movs r1, 0xFF ands r1, r0 @@ -173794,28 +167229,17 @@ _080557F4: ldrh r0, [r4] movs r1, 0 bl sub_80458E0 - ldr r1, _08055864 + ldr r1, =0x0202420c strb r0, [r1] - ldr r1, _08055868 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08055886 .align 2, 0 -_0805583C: .4byte 0x0202449c -_08055840: .4byte 0x0202420b -_08055844: .4byte 0x020244ec -_08055848: .4byte 0x02024744 -_0805584C: .4byte 0x0202406e -_08055850: .4byte 0x0000ffff -_08055854: .4byte 0x0831c3e0 -_08055858: .4byte 0x02024280 -_0805585C: .4byte 0xfffffbff -_08055860: .4byte 0x020241ee -_08055864: .4byte 0x0202420c -_08055868: .4byte 0x02024214 + .pool _0805586C: - ldr r3, _08055898 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -173838,17 +167262,17 @@ _08055886: pop {r0} bx r0 .align 2, 0 -_08055898: .4byte 0x02024214 + .pool thumb_func_end atkDE_asistattackselect thumb_func_start atkDF_setmagiccoat atkDF_setmagiccoat: @ 805589C push {lr} - ldr r1, _080558E4 - ldr r3, _080558E8 + ldr r1, =0x0202420c + ldr r3, =0x0202420b ldrb r0, [r3] strb r0, [r1] - ldr r2, _080558EC + ldr r2, =0x0202437c ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -173858,14 +167282,14 @@ atkDF_setmagiccoat: @ 805589C movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r0, _080558F0 + ldr r0, =0x02024082 ldrb r1, [r0] - ldr r0, _080558F4 + ldr r0, =0x0202406c ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 bne _080558FC - ldr r3, _080558F8 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -173880,14 +167304,9 @@ atkDF_setmagiccoat: @ 805589C str r1, [r3] b _08055914 .align 2, 0 -_080558E4: .4byte 0x0202420c -_080558E8: .4byte 0x0202420b -_080558EC: .4byte 0x0202437c -_080558F0: .4byte 0x02024082 -_080558F4: .4byte 0x0202406c -_080558F8: .4byte 0x02024214 + .pool _080558FC: - ldr r0, _08055918 + ldr r0, =0x0202433c ldrb r1, [r3] lsls r1, 4 adds r1, r0 @@ -173895,7 +167314,7 @@ _080558FC: movs r2, 0x10 orrs r0, r2 strb r0, [r1] - ldr r1, _0805591C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -173903,15 +167322,14 @@ _08055914: pop {r0} bx r0 .align 2, 0 -_08055918: .4byte 0x0202433c -_0805591C: .4byte 0x02024214 + .pool thumb_func_end atkDF_setmagiccoat thumb_func_start atkE0_setstealstatchange atkE0_setstealstatchange: @ 8055920 push {lr} - ldr r2, _08055964 - ldr r3, _08055968 + ldr r2, =0x0202437c + ldr r3, =0x0202420b ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -173921,14 +167339,14 @@ atkE0_setstealstatchange: @ 8055920 movs r2, 0x20 orrs r1, r2 strb r1, [r0] - ldr r0, _0805596C + ldr r0, =0x02024082 ldrb r1, [r0] - ldr r0, _08055970 + ldr r0, =0x0202406c ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 bne _08055978 - ldr r3, _08055974 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -173943,20 +167361,16 @@ atkE0_setstealstatchange: @ 8055920 str r1, [r3] b _0805598E .align 2, 0 -_08055964: .4byte 0x0202437c -_08055968: .4byte 0x0202420b -_0805596C: .4byte 0x02024082 -_08055970: .4byte 0x0202406c -_08055974: .4byte 0x02024214 + .pool _08055978: - ldr r0, _08055994 + ldr r0, =0x0202433c ldrb r1, [r3] lsls r1, 4 adds r1, r0 ldrb r0, [r1] orrs r0, r2 strb r0, [r1] - ldr r1, _08055998 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -173964,15 +167378,14 @@ _0805598E: pop {r0} bx r0 .align 2, 0 -_08055994: .4byte 0x0202433c -_08055998: .4byte 0x02024214 + .pool thumb_func_end atkE0_setstealstatchange thumb_func_start atkE1_802CBE4 atkE1_802CBE4: @ 805599C push {r4-r6,lr} - ldr r4, _08055A40 - ldr r0, _08055A44 + ldr r4, =0x02024474 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xD8 ldrb r0, [r0] @@ -173981,12 +167394,12 @@ atkE1_802CBE4: @ 805599C bl battle_side_get_owner lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _08055A48 + ldr r2, =0x02022f58 movs r0, 0xFD strb r0, [r2] movs r0, 0x9 strb r0, [r2, 0x1] - ldr r3, _08055A4C + ldr r3, =0x02024084 ldrb r1, [r4, 0x17] movs r0, 0x58 muls r0, r1 @@ -173996,14 +167409,14 @@ atkE1_802CBE4: @ 805599C strb r0, [r2, 0x2] movs r0, 0xFF strb r0, [r2, 0x3] - ldr r2, _08055A50 - ldr r1, _08055A54 + ldr r2, =0x0202420c + ldr r1, =0x0202406c ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 bcs _08055A22 adds r4, r2, 0 - ldr r6, _08055A58 + ldr r6, =0x0832a328 _080559E2: ldrb r0, [r4] bl battle_side_get_owner @@ -174011,21 +167424,21 @@ _080559E2: lsrs r0, 24 cmp r0, r5 beq _08055A04 - ldr r0, _08055A5C + ldr r0, =0x02024210 ldrb r1, [r0] ldrb r0, [r4] lsls r0, 2 adds r0, r6 ldr r0, [r0] ands r1, r0 - ldr r2, _08055A54 + ldr r2, =0x0202406c cmp r1, 0 beq _08055A18 _08055A04: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _08055A54 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 adds r2, r1, 0 @@ -174033,13 +167446,13 @@ _08055A04: cmp r0, r1 bcc _080559E2 _08055A18: - ldr r0, _08055A50 + ldr r0, =0x0202420c ldrb r0, [r0] ldrb r2, [r2] cmp r0, r2 bcc _08055A64 _08055A22: - ldr r3, _08055A60 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -174054,17 +167467,9 @@ _08055A22: str r1, [r3] b _08055A6C .align 2, 0 -_08055A40: .4byte 0x02024474 -_08055A44: .4byte 0x0202449c -_08055A48: .4byte 0x02022f58 -_08055A4C: .4byte 0x02024084 -_08055A50: .4byte 0x0202420c -_08055A54: .4byte 0x0202406c -_08055A58: .4byte 0x0832a328 -_08055A5C: .4byte 0x02024210 -_08055A60: .4byte 0x02024214 + .pool _08055A64: - ldr r1, _08055A74 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -174073,20 +167478,20 @@ _08055A6C: pop {r0} bx r0 .align 2, 0 -_08055A74: .4byte 0x02024214 + .pool thumb_func_end atkE1_802CBE4 thumb_func_start atkE2_cmde2 atkE2_cmde2: @ 8055A78 push {r4-r6,lr} sub sp, 0x4 - ldr r5, _08055AE0 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r4, _08055AE4 + ldr r4, =0x02024064 strb r0, [r4] - ldr r3, _08055AE8 + ldr r3, =0x02024084 ldrb r0, [r4] movs r6, 0x58 adds r1, r0, 0 @@ -174100,9 +167505,9 @@ atkE2_cmde2: @ 8055A78 adds r1, r3 movs r0, 0 str r0, [r1] - ldr r2, _08055AEC + ldr r2, =0x0832a328 ldrb r1, [r4] - ldr r0, _08055AF0 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, r1, r0 adds r0, 0x58 @@ -174129,23 +167534,19 @@ _08055AD2: pop {r0} bx r0 .align 2, 0 -_08055AE0: .4byte 0x02024214 -_08055AE4: .4byte 0x02024064 -_08055AE8: .4byte 0x02024084 -_08055AEC: .4byte 0x0832a328 -_08055AF0: .4byte 0x0202449c + .pool thumb_func_end atkE2_cmde2 thumb_func_start atkE3_jumpiffainted atkE3_jumpiffainted: @ 8055AF4 push {r4,lr} - ldr r4, _08055B30 + ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] bl get_battle_side_of_something - ldr r1, _08055B34 + ldr r1, =0x02024064 strb r0, [r1] - ldr r2, _08055B38 + ldr r2, =0x02024084 ldrb r1, [r1] movs r0, 0x58 muls r0, r1 @@ -174167,9 +167568,7 @@ atkE3_jumpiffainted: @ 8055AF4 str r1, [r4] b _08055B42 .align 2, 0 -_08055B30: .4byte 0x02024214 -_08055B34: .4byte 0x02024064 -_08055B38: .4byte 0x02024084 + .pool _08055B3C: ldr r0, [r4] adds r0, 0x6 @@ -174183,18 +167582,17 @@ _08055B42: thumb_func_start sub_8055B48 sub_8055B48: @ 8055B48 push {lr} - ldr r0, _08055B5C + ldr r0, =0x02022ff0 ldrb r0, [r0] cmp r0, 0x7 bhi _08055BE4 lsls r0, 2 - ldr r1, _08055B60 + ldr r1, =_08055B64 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08055B5C: .4byte 0x02022ff0 -_08055B60: .4byte _08055B64 + .pool .align 2, 0 _08055B64: .4byte _08055B84 @@ -174206,67 +167604,66 @@ _08055B64: .4byte _08055BCC .4byte _08055BD8 _08055B84: - ldr r1, _08055B8C + ldr r1, =0x02024332 movs r0, 0x2 b _08055BE8 .align 2, 0 -_08055B8C: .4byte 0x02024332 + .pool _08055B90: - ldr r1, _08055B98 + ldr r1, =0x02024332 movs r0, 0x1 b _08055BE8 .align 2, 0 -_08055B98: .4byte 0x02024332 + .pool _08055B9C: - ldr r1, _08055BA4 + ldr r1, =0x02024332 movs r0, 0x1B b _08055BE8 .align 2, 0 -_08055BA4: .4byte 0x02024332 + .pool _08055BA8: - ldr r1, _08055BB0 + ldr r1, =0x02024332 movs r0, 0x17 b _08055BE8 .align 2, 0 -_08055BB0: .4byte 0x02024332 + .pool _08055BB4: - ldr r1, _08055BBC + ldr r1, =0x02024332 movs r0, 0x16 b _08055BE8 .align 2, 0 -_08055BBC: .4byte 0x02024332 + .pool _08055BC0: - ldr r1, _08055BC8 + ldr r1, =0x02024332 movs r0, 0x18 b _08055BE8 .align 2, 0 -_08055BC8: .4byte 0x02024332 + .pool _08055BCC: - ldr r1, _08055BD4 + ldr r1, =0x02024332 movs r0, 0x7 b _08055BE8 .align 2, 0 -_08055BD4: .4byte 0x02024332 + .pool _08055BD8: - ldr r1, _08055BE0 + ldr r1, =0x02024332 movs r0, 0x8 b _08055BE8 .align 2, 0 -_08055BE0: .4byte 0x02024332 + .pool _08055BE4: - ldr r1, _08055BF8 + ldr r1, =0x02024332 movs r0, 0x5 _08055BE8: strb r0, [r1, 0x3] - ldr r1, _08055BFC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08055BF8: .4byte 0x02024332 -_08055BFC: .4byte 0x02024214 + .pool thumb_func_end sub_8055B48 thumb_func_start sub_8055C00 @@ -174289,13 +167686,13 @@ _08055C18: beq _08055CC4 movs r6, 0 mov r7, sp - ldr r0, _08055C64 + ldr r0, =0x083203cc mov r8, r0 _08055C2A: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _08055C68 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -174318,8 +167715,7 @@ _08055C2A: ldrb r0, [r0, 0x17] b _08055C76 .align 2, 0 -_08055C64: .4byte 0x083203cc -_08055C68: .4byte 0x020244ec + .pool _08055C6C: lsls r0, r5, 3 subs r0, r5 @@ -174350,7 +167746,7 @@ _08055C76: strh r0, [r7] movs r0, 0x64 muls r0, r6 - ldr r1, _08055CC0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC mov r2, sp @@ -174361,12 +167757,12 @@ _08055CB6: ble _08055C2A b _08055DD8 .align 2, 0 -_08055CC0: .4byte 0x020244ec + .pool _08055CC4: movs r6, 0 movs r1, 0x64 mov r8, r1 - ldr r7, _08055D08 + ldr r7, =0x020244ec mov r10, sp _08055CCE: mov r4, r8 @@ -174390,13 +167786,12 @@ _08055CCE: lsls r0, r5, 3 subs r0, r5 lsls r0, 2 - ldr r1, _08055D0C + ldr r1, =0x083203cc adds r0, r1 ldrb r0, [r0, 0x17] b _08055D3C .align 2, 0 -_08055D08: .4byte 0x020244ec -_08055D0C: .4byte 0x083203cc + .pool _08055D10: mov r0, r8 muls r0, r6 @@ -174405,18 +167800,18 @@ _08055D10: adds r2, 0x63 subs r2, r4 lsls r2, 1 - ldr r1, _08055D2C + ldr r1, =0x0831c464 adds r2, r1 movs r1, 0xC bl pokemon_setattr b _08055DD0 .align 2, 0 -_08055D2C: .4byte 0x0831c464 + .pool _08055D30: lsls r0, r5, 3 subs r0, r5 lsls r0, 2 - ldr r1, _08055DA0 + ldr r1, =0x083203cc adds r0, r1 ldrb r0, [r0, 0x16] _08055D3C: @@ -174466,7 +167861,7 @@ _08055D9C: movs r2, 0 b _08055DAE .align 2, 0 -_08055DA0: .4byte 0x083203cc + .pool _08055DA4: adds r0, r4, 0 subs r0, 0x62 @@ -174476,7 +167871,7 @@ _08055DA4: _08055DAE: cmp r2, 0x8 bgt _08055DD0 - ldr r0, _08055DF0 + ldr r0, =0x0831c47a adds r0, r2, r0 ldrb r0, [r0] cmp r0, r4 @@ -174486,7 +167881,7 @@ _08055DAE: adds r0, r7 adds r2, r1, r2 lsls r2, 1 - ldr r1, _08055DF4 + ldr r1, =0x0831c440 adds r2, r1 movs r1, 0xC bl pokemon_setattr @@ -174496,7 +167891,7 @@ _08055DD0: bgt _08055DD8 b _08055CCE _08055DD8: - ldr r1, _08055DF8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -174509,19 +167904,17 @@ _08055DD8: pop {r0} bx r0 .align 2, 0 -_08055DF0: .4byte 0x0831c47a -_08055DF4: .4byte 0x0831c440 -_08055DF8: .4byte 0x02024214 + .pool thumb_func_end sub_8055C00 thumb_func_start atkE6_castform_transform atkE6_castform_transform: @ 8055DFC push {r4,lr} - ldr r4, _08055E50 - ldr r0, _08055E54 + ldr r4, =0x02024064 + ldr r0, =0x02024474 ldrb r0, [r0, 0x17] strb r0, [r4] - ldr r1, _08055E58 + ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 muls r0, r2 @@ -174531,7 +167924,7 @@ atkE6_castform_transform: @ 8055DFC movs r1, 0x80 lsls r1, 17 ands r0, r1 - ldr r3, _08055E5C + ldr r3, =0x0202449c cmp r0, 0 beq _08055E2C ldr r0, [r3] @@ -174549,7 +167942,7 @@ _08055E2C: bl dp01_build_cmdbuf_x34_a_bb_aka_battle_anim ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08055E60 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -174557,30 +167950,26 @@ _08055E2C: pop {r0} bx r0 .align 2, 0 -_08055E50: .4byte 0x02024064 -_08055E54: .4byte 0x02024474 -_08055E58: .4byte 0x02024084 -_08055E5C: .4byte 0x0202449c -_08055E60: .4byte 0x02024214 + .pool thumb_func_end atkE6_castform_transform thumb_func_start atkE7_castform_switch atkE7_castform_switch: @ 8055E64 push {r4,lr} - ldr r1, _08055E94 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r0, _08055E98 + ldr r0, =0x02024474 ldrb r0, [r0, 0x17] bl castform_switch lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 beq _08055E8E - ldr r0, _08055E9C + ldr r0, =0x082db4a9 bl b_push_move_exec - ldr r0, _08055EA0 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x7F subs r1, r4, 0x1 @@ -174590,18 +167979,15 @@ _08055E8E: pop {r0} bx r0 .align 2, 0 -_08055E94: .4byte 0x02024214 -_08055E98: .4byte 0x02024474 -_08055E9C: .4byte 0x082db4a9 -_08055EA0: .4byte 0x0202449c + .pool thumb_func_end atkE7_castform_switch thumb_func_start atkE8_settypebasedhalvers atkE8_settypebasedhalvers: @ 8055EA4 push {r4,lr} movs r4, 0 - ldr r2, _08055EE0 - ldr r0, _08055EE4 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -174610,8 +167996,8 @@ atkE8_settypebasedhalvers: @ 8055EA4 ldrb r0, [r0] cmp r0, 0xC9 bne _08055EF4 - ldr r1, _08055EE8 - ldr r0, _08055EEC + ldr r1, =0x020242ac + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -174624,18 +168010,14 @@ atkE8_settypebasedhalvers: @ 8055EA4 bne _08055F18 orrs r1, r3 str r1, [r2] - ldr r0, _08055EF0 + ldr r0, =0x02024332 strb r4, [r0, 0x5] b _08055F1C .align 2, 0 -_08055EE0: .4byte 0x0831c898 -_08055EE4: .4byte 0x020241ea -_08055EE8: .4byte 0x020242ac -_08055EEC: .4byte 0x0202420b -_08055EF0: .4byte 0x02024332 + .pool _08055EF4: - ldr r1, _08055F28 - ldr r0, _08055F2C + ldr r1, =0x020242ac + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 2 adds r2, r0, r1 @@ -174648,7 +168030,7 @@ _08055EF4: bne _08055F18 orrs r1, r3 str r1, [r2] - ldr r1, _08055F30 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] movs r4, 0x1 @@ -174656,18 +168038,15 @@ _08055F18: cmp r4, 0 beq _08055F38 _08055F1C: - ldr r1, _08055F34 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08055F52 .align 2, 0 -_08055F28: .4byte 0x020242ac -_08055F2C: .4byte 0x0202420b -_08055F30: .4byte 0x02024332 -_08055F34: .4byte 0x02024214 + .pool _08055F38: - ldr r3, _08055F58 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -174685,7 +168064,7 @@ _08055F52: pop {r0} bx r0 .align 2, 0 -_08055F58: .4byte 0x02024214 + .pool thumb_func_end atkE8_settypebasedhalvers thumb_func_start atkE9_seteffectbyweather @@ -174712,11 +168091,11 @@ atkE9_seteffectbyweather: @ 8055F5C lsls r0, 24 cmp r0, 0 bne _08055FFC - ldr r2, _08055FAC + ldr r2, =0x020243cc ldrb r0, [r2] cmp r0, 0 beq _08055F9A - ldr r1, _08055FB0 + ldr r1, =0x02024474 movs r0, 0x2 strb r0, [r1, 0xE] _08055F9A: @@ -174725,55 +168104,53 @@ _08055F9A: ands r0, r1 cmp r0, 0 beq _08055FB8 - ldr r0, _08055FB4 + ldr r0, =0x0202449c ldr r1, [r0] movs r0, 0x8B b _08055FFA .align 2, 0 -_08055FAC: .4byte 0x020243cc -_08055FB0: .4byte 0x02024474 -_08055FB4: .4byte 0x0202449c + .pool _08055FB8: movs r0, 0x18 ands r0, r1 cmp r0, 0 beq _08055FCC - ldr r0, _08055FC8 + ldr r0, =0x0202449c ldr r1, [r0] movs r0, 0x85 b _08055FFA .align 2, 0 -_08055FC8: .4byte 0x0202449c + .pool _08055FCC: movs r0, 0x60 ands r0, r1 cmp r0, 0 beq _08055FE0 - ldr r0, _08055FDC + ldr r0, =0x0202449c ldr r1, [r0] movs r0, 0x8A b _08055FFA .align 2, 0 -_08055FDC: .4byte 0x0202449c + .pool _08055FE0: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _08055FF4 - ldr r0, _08055FF0 + ldr r0, =0x0202449c ldr r1, [r0] movs r0, 0x8F b _08055FFA .align 2, 0 -_08055FF0: .4byte 0x0202449c + .pool _08055FF4: - ldr r0, _0805600C + ldr r0, =0x0202449c ldr r1, [r0] movs r0, 0x80 _08055FFA: strb r0, [r1, 0x13] _08055FFC: - ldr r1, _08056010 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -174781,19 +168158,18 @@ _08055FFC: pop {r0} bx r0 .align 2, 0 -_0805600C: .4byte 0x0202449c -_08056010: .4byte 0x02024214 + .pool thumb_func_end atkE9_seteffectbyweather thumb_func_start atkEA_recycleitem atkEA_recycleitem: @ 8056014 push {r4-r7,lr} sub sp, 0x4 - ldr r7, _0805607C - ldr r0, _08056080 + ldr r7, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r7] - ldr r1, _08056084 + ldr r1, =0x0202449c ldrb r2, [r7] lsls r0, r2, 1 adds r0, 0xB8 @@ -174802,7 +168178,7 @@ atkEA_recycleitem: @ 8056014 ldrh r5, [r6] cmp r5, 0 beq _08056094 - ldr r4, _08056088 + ldr r4, =0x02024084 movs r3, 0x58 adds r0, r2, 0 muls r0, r3 @@ -174810,7 +168186,7 @@ atkEA_recycleitem: @ 8056014 ldrh r0, [r0, 0x2E] cmp r0, 0 bne _08056094 - ldr r1, _0805608C + ldr r1, =0x02024208 strh r5, [r1] strh r0, [r6] ldrb r0, [r7] @@ -174831,20 +168207,15 @@ atkEA_recycleitem: @ 8056014 bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r7] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08056090 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _080560AE .align 2, 0 -_0805607C: .4byte 0x02024064 -_08056080: .4byte 0x0202420b -_08056084: .4byte 0x0202449c -_08056088: .4byte 0x02024084 -_0805608C: .4byte 0x02024208 -_08056090: .4byte 0x02024214 + .pool _08056094: - ldr r3, _080560B8 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -174863,7 +168234,7 @@ _080560AE: pop {r0} bx r0 .align 2, 0 -_080560B8: .4byte 0x02024214 + .pool thumb_func_end atkEA_recycleitem thumb_func_start atkEB_settypetoterrain @@ -174871,9 +168242,9 @@ atkEB_settypetoterrain: @ 80560BC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0805612C + ldr r0, =0x02024084 mov r8, r0 - ldr r7, _08056130 + ldr r7, =0x0202420b ldrb r0, [r7] movs r6, 0x58 muls r0, r6 @@ -174882,8 +168253,8 @@ atkEB_settypetoterrain: @ 80560BC movs r0, 0x21 adds r0, r3 mov r12, r0 - ldr r5, _08056134 - ldr r4, _08056138 + ldr r5, =0x0831c483 + ldr r4, =0x02022ff0 ldrb r0, [r4] adds r0, r5 ldrb r2, [r0] @@ -174908,7 +168279,7 @@ atkEB_settypetoterrain: @ 80560BC ldrb r0, [r0] adds r1, 0x22 strb r0, [r1] - ldr r1, _0805613C + ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] movs r0, 0x3 @@ -174919,20 +168290,15 @@ atkEB_settypetoterrain: @ 80560BC strb r0, [r1, 0x2] movs r0, 0xFF strb r0, [r1, 0x3] - ldr r1, _08056140 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _0805615E .align 2, 0 -_0805612C: .4byte 0x02024084 -_08056130: .4byte 0x0202420b -_08056134: .4byte 0x0831c483 -_08056138: .4byte 0x02022ff0 -_0805613C: .4byte 0x02022f58 -_08056140: .4byte 0x02024214 + .pool _08056144: - ldr r3, _08056168 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -174952,13 +168318,13 @@ _0805615E: pop {r0} bx r0 .align 2, 0 -_08056168: .4byte 0x02024214 + .pool thumb_func_end atkEB_settypetoterrain thumb_func_start atkEC_802D2A0 atkEC_802D2A0: @ 805616C push {r4-r6,lr} - ldr r5, _080561E0 + ldr r5, =0x0202420b ldrb r0, [r5] bl battle_get_per_side_status movs r1, 0x2 @@ -174966,17 +168332,17 @@ atkEC_802D2A0: @ 805616C lsls r0, 24 lsrs r0, 24 bl battle_get_side_with_given_state - ldr r4, _080561E4 + ldr r4, =0x02024064 strb r0, [r4] - ldr r0, _080561E8 + ldr r0, =0x02022fec ldr r0, [r0] movs r6, 0x1 ands r0, r6 cmp r0, 0 beq _0805620C - ldr r0, _080561EC + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _080561F0 + ldr r2, =0x0832a328 ldrb r3, [r4] lsls r0, r3, 2 adds r0, r2 @@ -174984,28 +168350,28 @@ atkEC_802D2A0: @ 805616C ands r1, r0 cmp r1, 0 bne _0805620C - ldr r0, _080561F4 + ldr r0, =0x0202421c adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0 bne _0805620C - ldr r1, _080561F8 + ldr r1, =0x02024274 lsls r0, r3, 1 adds r0, r1 ldrh r2, [r0] cmp r2, 0xE4 bne _0805620C - ldr r0, _080561FC + ldr r0, =0x0202407a adds r0, r3, r0 movs r1, 0xB strb r1, [r0] - ldr r0, _08056200 + ldr r0, =0x020241ea strh r2, [r0] - ldr r1, _08056204 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - ldr r0, _08056208 + ldr r0, =0x02024474 strb r6, [r0, 0x18] ldrb r1, [r5] adds r0, 0x20 @@ -175014,19 +168380,9 @@ atkEC_802D2A0: @ 805616C strb r0, [r5] b _08056226 .align 2, 0 -_080561E0: .4byte 0x0202420b -_080561E4: .4byte 0x02024064 -_080561E8: .4byte 0x02022fec -_080561EC: .4byte 0x02024210 -_080561F0: .4byte 0x0832a328 -_080561F4: .4byte 0x0202421c -_080561F8: .4byte 0x02024274 -_080561FC: .4byte 0x0202407a -_08056200: .4byte 0x020241ea -_08056204: .4byte 0x02024214 -_08056208: .4byte 0x02024474 + .pool _0805620C: - ldr r3, _0805622C + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -175044,41 +168400,38 @@ _08056226: pop {r0} bx r0 .align 2, 0 -_0805622C: .4byte 0x02024214 + .pool thumb_func_end atkEC_802D2A0 thumb_func_start atkED_802D364 atkED_802D364: @ 8056230 push {r4,lr} - ldr r1, _08056254 - ldr r3, _08056258 + ldr r1, =0x0202420e + ldr r3, =0x0202420b ldrb r0, [r3] strb r0, [r1] - ldr r2, _0805625C + ldr r2, =0x0202420c lsls r0, 24 lsrs r0, 24 adds r4, r1, 0 ldrb r1, [r2] cmp r0, r1 bne _08056264 - ldr r1, _08056260 + ldr r1, =0x02024474 ldrb r0, [r1, 0x17] strb r0, [r2] strb r0, [r3] b _0805626A .align 2, 0 -_08056254: .4byte 0x0202420e -_08056258: .4byte 0x0202420b -_0805625C: .4byte 0x0202420c -_08056260: .4byte 0x02024474 + .pool _08056264: - ldr r1, _0805627C + ldr r1, =0x02024474 ldrb r0, [r1, 0x17] strb r0, [r2] _0805626A: ldrb r0, [r4] strb r0, [r1, 0x17] - ldr r1, _08056280 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -175086,21 +168439,20 @@ _0805626A: pop {r0} bx r0 .align 2, 0 -_0805627C: .4byte 0x02024474 -_08056280: .4byte 0x02024214 + .pool thumb_func_end atkED_802D364 thumb_func_start atkEE_removereflectlightscreen atkEE_removereflectlightscreen: @ 8056284 push {r4,lr} - ldr r0, _080562CC + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r1, _080562D0 + ldr r1, =0x02024294 lsls r3, r0, 1 adds r0, r3, r0 lsls r0, 2 @@ -175112,35 +168464,30 @@ atkEE_removereflectlightscreen: @ 8056284 cmp r1, 0 beq _080562E4 _080562AC: - ldr r2, _080562D4 + ldr r2, =0x0202428e adds r2, r3, r2 ldrh r1, [r2] - ldr r0, _080562D8 + ldr r0, =0x0000fffe ands r0, r1 movs r3, 0 - ldr r1, _080562DC + ldr r1, =0x0000fffd ands r0, r1 strh r0, [r2] strb r3, [r4] strb r3, [r4, 0x2] - ldr r1, _080562E0 + ldr r1, =0x02024474 movs r0, 0x1 strb r0, [r1, 0x18] strb r0, [r1, 0x19] b _080562EA .align 2, 0 -_080562CC: .4byte 0x0202420b -_080562D0: .4byte 0x02024294 -_080562D4: .4byte 0x0202428e -_080562D8: .4byte 0x0000fffe -_080562DC: .4byte 0x0000fffd -_080562E0: .4byte 0x02024474 + .pool _080562E4: - ldr r0, _080562F8 + ldr r0, =0x02024474 strb r1, [r0, 0x18] strb r1, [r0, 0x19] _080562EA: - ldr r1, _080562FC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -175148,29 +168495,28 @@ _080562EA: pop {r0} bx r0 .align 2, 0 -_080562F8: .4byte 0x02024474 -_080562FC: .4byte 0x02024214 + .pool thumb_func_end atkEE_removereflectlightscreen thumb_func_start sub_8056300 sub_8056300: @ 8056300 push {r4-r6,lr} movs r4, 0 - ldr r0, _08056340 + ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 beq _0805630E b _08056696 _0805630E: - ldr r5, _08056344 - ldr r0, _08056348 + ldr r5, =0x02024064 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r5] - ldr r6, _0805634C + ldr r6, =0x0202420c movs r1, 0x1 eors r0, r1 strb r0, [r6] - ldr r0, _08056350 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r0, r1 @@ -175181,17 +168527,11 @@ _0805630E: bl dp01_build_cmdbuf_x0D_a ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _08056354 - ldr r0, _08056358 + ldr r1, =0x02024214 + ldr r0, =0x082dbe02 b _08056694 .align 2, 0 -_08056340: .4byte 0x02024068 -_08056344: .4byte 0x02024064 -_08056348: .4byte 0x0202420b -_0805634C: .4byte 0x0202420c -_08056350: .4byte 0x02022fec -_08056354: .4byte 0x02024214 -_08056358: .4byte 0x082dbe02 + .pool _0805635C: movs r0, 0x80 lsls r0, 2 @@ -175203,18 +168543,17 @@ _0805635C: bl dp01_build_cmdbuf_x0D_a ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _0805637C - ldr r0, _08056380 + ldr r1, =0x02024214 + ldr r0, =0x082dbdca b _08056694 .align 2, 0 -_0805637C: .4byte 0x02024214 -_08056380: .4byte 0x082dbdca + .pool _08056384: - ldr r0, _080563A8 + ldr r0, =0x02024208 ldrh r0, [r0] cmp r0, 0x5 bne _080563B0 - ldr r0, _080563AC + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x7C ldrb r0, [r0] @@ -175228,11 +168567,10 @@ _08056384: lsrs r5, r0, 24 b _080563C8 .align 2, 0 -_080563A8: .4byte 0x02024208 -_080563AC: .4byte 0x0202449c + .pool _080563B0: - ldr r3, _080563E4 - ldr r2, _080563E8 + ldr r3, =0x083203cc + ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 muls r0, r1 @@ -175244,7 +168582,7 @@ _080563B0: adds r0, r3 ldrb r5, [r0, 0x8] _080563C8: - ldr r2, _080563EC + ldr r2, =0x02024208 ldrh r0, [r2] cmp r0, 0x5 bhi _080563D2 @@ -175256,15 +168594,12 @@ _080563D2: b _080564D2 _080563DA: lsls r0, 2 - ldr r1, _080563F0 + ldr r1, =_080563F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080563E4: .4byte 0x083203cc -_080563E8: .4byte 0x02024084 -_080563EC: .4byte 0x02024208 -_080563F0: .4byte _080563F4 + .pool .align 2, 0 _080563F4: .4byte _08056410 @@ -175275,8 +168610,8 @@ _080563F4: .4byte _08056472 .4byte _08056472 _08056410: - ldr r2, _08056438 - ldr r0, _0805643C + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -175296,8 +168631,7 @@ _08056410: beq _080564A4 b _08056472 .align 2, 0 -_08056438: .4byte 0x02024084 -_0805643C: .4byte 0x0202420c + .pool _08056440: bl sav1_map_get_light_level lsls r0, 24 @@ -175308,8 +168642,8 @@ _08056440: movs r4, 0x23 b _080564D2 _08056452: - ldr r2, _08056478 - ldr r0, _0805647C + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -175328,11 +168662,10 @@ _08056472: movs r4, 0xA b _080564D2 .align 2, 0 -_08056478: .4byte 0x02024084 -_0805647C: .4byte 0x0202420c + .pool _08056480: - ldr r2, _080564A8 - ldr r0, _080564AC + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -175351,10 +168684,9 @@ _080564A4: movs r4, 0x1E b _080564D2 .align 2, 0 -_080564A8: .4byte 0x02024084 -_080564AC: .4byte 0x0202420c + .pool _080564B0: - ldr r0, _080564C4 + ldr r0, =0x03005d10 ldrb r0, [r0, 0x13] adds r0, 0xA lsls r0, 24 @@ -175364,9 +168696,9 @@ _080564B0: movs r4, 0x28 b _080564D2 .align 2, 0 -_080564C4: .4byte 0x03005d10 + .pool _080564C8: - ldr r1, _0805653C + ldr r1, =0x0831c48d ldrh r0, [r2] subs r0, 0x2 adds r0, r1 @@ -175376,8 +168708,8 @@ _080564D2: muls r0, r4 movs r1, 0xA bl __divsi3 - ldr r5, _08056540 - ldr r1, _08056544 + ldr r5, =0x02024084 + ldr r1, =0x0202420c ldrb r2, [r1] movs r1, 0x58 adds r4, r2, 0 @@ -175411,26 +168743,22 @@ _0805650E: bl __udivsi3 adds r6, r0, 0 _08056522: - ldr r1, _08056548 + ldr r1, =0x02024208 ldrh r0, [r1] cmp r0, 0x5 beq _08056564 cmp r0, 0x1 bne _08056550 - ldr r0, _0805654C + ldr r0, =0x03005d10 ldrb r1, [r0, 0x5] movs r2, 0x2 orrs r1, r2 strb r1, [r0, 0x5] b _08056564 .align 2, 0 -_0805653C: .4byte 0x0831c48d -_08056540: .4byte 0x02024084 -_08056544: .4byte 0x0202420c -_08056548: .4byte 0x02024208 -_0805654C: .4byte 0x03005d10 + .pool _08056550: - ldr r0, _080565A8 + ldr r0, =0x03005d10 ldrh r1, [r1] adds r0, r1 adds r1, r0, 0 @@ -175446,23 +168774,23 @@ _08056564: movs r0, 0 movs r1, 0x4 bl dp01_build_cmdbuf_x0D_a - ldr r0, _080565AC + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution - ldr r1, _080565B0 - ldr r0, _080565B4 + ldr r1, =0x02024214 + ldr r0, =0x082dbd84 str r0, [r1] - ldr r1, _080565B8 - ldr r0, _080565BC + ldr r1, =0x0202406e + ldr r0, =0x0202420c ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080565C0 + ldr r1, =0x02024744 adds r0, r1 - ldr r2, _080565C4 + ldr r2, =0x02024208 movs r1, 0x26 bl pokemon_setattr bl calc_player_party_count @@ -175472,14 +168800,7 @@ _08056564: beq _08056656 b _08056680 .align 2, 0 -_080565A8: .4byte 0x03005d10 -_080565AC: .4byte 0x02024064 -_080565B0: .4byte 0x02024214 -_080565B4: .4byte 0x082dbd84 -_080565B8: .4byte 0x0202406e -_080565BC: .4byte 0x0202420c -_080565C0: .4byte 0x02024744 -_080565C4: .4byte 0x02024208 + .pool _080565C8: movs r0, 0xFF lsls r0, 16 @@ -175491,14 +168812,14 @@ _080565C8: bl Sqrt lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _080565F0 + ldr r0, =0x000ffff0 adds r1, r6, 0 bl __udivsi3 adds r6, r0, 0 movs r4, 0 b _080565FA .align 2, 0 -_080565F0: .4byte 0x000ffff0 + .pool _080565F4: adds r0, r4, 0x1 lsls r0, 24 @@ -175512,7 +168833,7 @@ _080565FA: cmp r0, r6 bcc _080565F4 _0805660A: - ldr r5, _08056660 + ldr r5, =0x02024208 ldrh r0, [r5] cmp r0, 0x1 bne _08056614 @@ -175521,23 +168842,23 @@ _08056614: movs r0, 0 adds r1, r4, 0 bl dp01_build_cmdbuf_x0D_a - ldr r0, _08056664 + ldr r0, =0x02024064 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution cmp r4, 0x4 bne _0805668C - ldr r1, _08056668 - ldr r0, _0805666C + ldr r1, =0x02024214 + ldr r0, =0x082dbd84 str r0, [r1] - ldr r1, _08056670 - ldr r0, _08056674 + ldr r1, =0x0202406e + ldr r0, =0x0202420c ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08056678 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x26 adds r2, r5, 0 @@ -175548,31 +168869,24 @@ _08056614: cmp r0, 0x6 bne _08056680 _08056656: - ldr r1, _0805667C + ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] b _08056696 .align 2, 0 -_08056660: .4byte 0x02024208 -_08056664: .4byte 0x02024064 -_08056668: .4byte 0x02024214 -_0805666C: .4byte 0x082dbd84 -_08056670: .4byte 0x0202406e -_08056674: .4byte 0x0202420c -_08056678: .4byte 0x02024744 -_0805667C: .4byte 0x02024332 + .pool _08056680: - ldr r1, _08056688 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] b _08056696 .align 2, 0 -_08056688: .4byte 0x02024332 + .pool _0805668C: - ldr r0, _0805669C + ldr r0, =0x02024332 strb r4, [r0, 0x5] - ldr r1, _080566A0 - ldr r0, _080566A4 + ldr r1, =0x02024214 + ldr r0, =0x082dbdd4 _08056694: str r0, [r1] _08056696: @@ -175580,9 +168894,7 @@ _08056696: pop {r0} bx r0 .align 2, 0 -_0805669C: .4byte 0x02024332 -_080566A0: .4byte 0x02024214 -_080566A4: .4byte 0x082dbdd4 + .pool thumb_func_end sub_8056300 thumb_func_start atkF0_catch_pokemon @@ -175592,9 +168904,9 @@ atkF0_catch_pokemon: @ 80566A8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08056718 + ldr r0, =0x0202406e mov r9, r0 - ldr r5, _0805671C + ldr r5, =0x0202420b ldrb r0, [r5] movs r6, 0x1 eors r0, r6 @@ -175603,7 +168915,7 @@ atkF0_catch_pokemon: @ 80566A8 ldrh r0, [r0] movs r7, 0x64 muls r0, r7 - ldr r1, _08056720 + ldr r1, =0x02024744 mov r8, r1 add r0, r8 bl pokemon_catch @@ -175615,10 +168927,10 @@ atkF0_catch_pokemon: @ 80566A8 lsrs r1, r0, 24 cmp r1, 0 bne _08056734 - ldr r0, _08056724 + ldr r0, =0x02024332 strb r1, [r0, 0x5] - ldr r4, _08056728 - ldr r0, _0805672C + ldr r4, =0x02021cc4 + ldr r0, =0x00004036 bl var_get lsls r0, 24 lsrs r0, 24 @@ -175633,21 +168945,15 @@ atkF0_catch_pokemon: @ 80566A8 ldrh r0, [r0] muls r0, r7 add r0, r8 - ldr r2, _08056730 + ldr r2, =0x02021dc4 movs r1, 0x2 bl pokemon_getattr b _0805677E .align 2, 0 -_08056718: .4byte 0x0202406e -_0805671C: .4byte 0x0202420b -_08056720: .4byte 0x02024744 -_08056724: .4byte 0x02024332 -_08056728: .4byte 0x02021cc4 -_0805672C: .4byte 0x00004036 -_08056730: .4byte 0x02021dc4 + .pool _08056734: - ldr r4, _08056824 - ldr r0, _08056828 + ldr r4, =0x02021cc4 + ldr r0, =0x00004036 bl var_get lsls r0, 24 lsrs r0, 24 @@ -175662,10 +168968,10 @@ _08056734: ldrh r0, [r0] muls r0, r7 add r0, r8 - ldr r2, _0805682C + ldr r2, =0x02021dc4 movs r1, 0x2 bl pokemon_getattr - ldr r4, _08056830 + ldr r4, =0x02021ec4 bl get_unknown_box_id lsls r0, 24 lsrs r0, 24 @@ -175673,23 +168979,23 @@ _08056734: adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy - ldr r1, _08056834 + ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] _0805677E: - ldr r0, _08056838 + ldr r0, =0x000008ab bl flag_check lsls r0, 24 cmp r0, 0 beq _08056792 - ldr r1, _08056834 + ldr r1, =0x02024332 ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] _08056792: - ldr r0, _0805683C + ldr r0, =0x0202406e mov r10, r0 - ldr r1, _08056840 + ldr r1, =0x0202420b mov r9, r1 ldrb r0, [r1] movs r4, 0x1 @@ -175702,12 +169008,12 @@ _08056792: mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r6, _08056844 + ldr r6, =0x02024744 adds r0, r6 movs r1, 0xB movs r2, 0 bl pokemon_getattr - ldr r5, _08056848 + ldr r5, =0x03005d10 strh r0, [r5, 0x28] mov r1, r9 ldrb r0, [r1] @@ -175745,7 +169051,7 @@ _08056792: ands r1, r2 orrs r1, r0 strb r1, [r5, 0x5] - ldr r1, _0805684C + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -175757,23 +169063,13 @@ _08056792: pop {r0} bx r0 .align 2, 0 -_08056824: .4byte 0x02021cc4 -_08056828: .4byte 0x00004036 -_0805682C: .4byte 0x02021dc4 -_08056830: .4byte 0x02021ec4 -_08056834: .4byte 0x02024332 -_08056838: .4byte 0x000008ab -_0805683C: .4byte 0x0202406e -_08056840: .4byte 0x0202420b -_08056844: .4byte 0x02024744 -_08056848: .4byte 0x03005d10 -_0805684C: .4byte 0x02024214 + .pool thumb_func_end atkF0_catch_pokemon thumb_func_start atkF1_802D95C atkF1_802D95C: @ 8056850 push {r4,r5,lr} - ldr r4, _080568A0 + ldr r4, =0x02024744 adds r0, r4, 0 movs r1, 0xB movs r2, 0 @@ -175794,7 +169090,7 @@ atkF1_802D95C: @ 8056850 lsls r0, 24 cmp r0, 0 beq _080568A8 - ldr r3, _080568A4 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -175809,8 +169105,7 @@ atkF1_802D95C: @ 8056850 str r1, [r3] b _080568C2 .align 2, 0 -_080568A0: .4byte 0x02024744 -_080568A4: .4byte 0x02024214 + .pool _080568A8: adds r0, r5, 0 bl species_to_pokedex_index @@ -175819,7 +169114,7 @@ _080568A8: movs r1, 0x3 adds r2, r4, 0 bl sub_806F01C - ldr r1, _080568C8 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -175828,34 +169123,32 @@ _080568C2: pop {r0} bx r0 .align 2, 0 -_080568C8: .4byte 0x02024214 + .pool thumb_func_end atkF1_802D95C thumb_func_start sub_80568CC sub_80568CC: @ 80568CC push {r4,lr} sub sp, 0x4 - ldr r0, _080568F4 + ldr r0, =0x02024744 movs r1, 0xB movs r2, 0 bl pokemon_getattr lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _080568F8 + ldr r0, =0x02024332 ldrb r0, [r0] cmp r0, 0x5 bls _080568E8 b _08056A2C _080568E8: lsls r0, 2 - ldr r1, _080568FC + ldr r1, =_08056900 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080568F4: .4byte 0x02024744 -_080568F8: .4byte 0x02024332 -_080568FC: .4byte _08056900 + .pool .align 2, 0 _08056900: .4byte _08056918 @@ -175874,7 +169167,7 @@ _08056918: bl sub_80A1AD4 b _08056A06 _0805692A: - ldr r0, _08056968 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -175887,8 +169180,8 @@ _08056938: bl species_to_pokedex_index lsls r0, 16 lsrs r0, 16 - ldr r3, _0805696C - ldr r1, _08056970 + ldr r3, =0x02024084 + ldr r1, =0x0202420c ldrb r2, [r1] movs r1, 0x58 muls r2, r1 @@ -175900,28 +169193,25 @@ _08056938: adds r2, r3 ldr r2, [r2] bl sub_80BFDF4 - ldr r1, _08056974 + ldr r1, =0x02024332 strb r0, [r1, 0x1] b _08056A08 .align 2, 0 -_08056968: .4byte 0x02037fd4 -_0805696C: .4byte 0x02024084 -_08056970: .4byte 0x0202420c -_08056974: .4byte 0x02024332 + .pool _08056978: - ldr r0, _080569B0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08056A2C - ldr r0, _080569B4 + ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, _080569B8 + ldr r0, =sub_8038420 + 1 cmp r1, r0 bne _08056A2C - ldr r2, _080569BC - ldr r4, _080569C0 + ldr r2, =0x03005e00 + ldr r4, =0x02024332 ldrb r1, [r4, 0x1] lsls r0, r1, 2 adds r0, r1 @@ -175930,37 +169220,32 @@ _08056978: ldrb r0, [r0, 0x4] cmp r0, 0 bne _08056A2C - ldr r0, _080569C4 + ldr r0, =vblank_cb_08078BB4 + 1 bl SetVBlankCallback ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] b _08056A2C .align 2, 0 -_080569B0: .4byte 0x02037fd4 -_080569B4: .4byte 0x030022c0 -_080569B8: .4byte sub_8038420 + 1 -_080569BC: .4byte 0x03005e00 -_080569C0: .4byte 0x02024332 -_080569C4: .4byte vblank_cb_08078BB4 + 1 + .pool _080569C8: bl c2_berry_program_update_menu bl sub_8035AA4 - ldr r1, _080569DC + ldr r1, =0x02022e20 movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 strh r0, [r1] b _08056A06 .align 2, 0 -_080569DC: .4byte 0x02022e20 + .pool _080569E0: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 bne _08056A2C - ldr r0, _08056A10 + ldr r0, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0x10 @@ -175971,23 +169256,22 @@ _080569E0: movs r0, 0x3 bl gpu_sync_bg_show _08056A06: - ldr r1, _08056A14 + ldr r1, =0x02024332 _08056A08: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _08056A2C .align 2, 0 -_08056A10: .4byte 0x0000ffff -_08056A14: .4byte 0x02024332 + .pool _08056A18: - ldr r0, _08056A34 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08056A2C - ldr r1, _08056A38 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -175997,8 +169281,7 @@ _08056A2C: pop {r0} bx r0 .align 2, 0 -_08056A34: .4byte 0x02037fd4 -_08056A38: .4byte 0x02024214 + .pool thumb_func_end sub_80568CC thumb_func_start sub_8056A3C @@ -176048,63 +169331,63 @@ _08056A88: bne _08056AB4 cmp r4, r8 bne _08056A9C - ldr r0, _08056A98 + ldr r0, =0x00001022 b _08056AFE .align 2, 0 -_08056A98: .4byte 0x00001022 + .pool _08056A9C: ldr r2, [sp, 0x1C] cmp r4, r2 bne _08056AAC - ldr r0, _08056AA8 + ldr r0, =0x00001024 b _08056AFE .align 2, 0 -_08056AA8: .4byte 0x00001024 + .pool _08056AAC: - ldr r0, _08056AB0 + ldr r0, =0x00001023 b _08056AFE .align 2, 0 -_08056AB0: .4byte 0x00001023 + .pool _08056AB4: ldr r7, [sp, 0x14] cmp r6, r7 bne _08056AE0 cmp r4, r8 bne _08056AC8 - ldr r0, _08056AC4 + ldr r0, =0x00001028 b _08056AFE .align 2, 0 -_08056AC4: .4byte 0x00001028 + .pool _08056AC8: ldr r0, [sp, 0x1C] cmp r4, r0 bne _08056AD8 - ldr r0, _08056AD4 + ldr r0, =0x0000102a b _08056AFE .align 2, 0 -_08056AD4: .4byte 0x0000102a + .pool _08056AD8: - ldr r0, _08056ADC + ldr r0, =0x00001029 b _08056AFE .align 2, 0 -_08056ADC: .4byte 0x00001029 + .pool _08056AE0: cmp r4, r8 bne _08056AEC - ldr r0, _08056AE8 + ldr r0, =0x00001025 b _08056AFE .align 2, 0 -_08056AE8: .4byte 0x00001025 + .pool _08056AEC: ldr r2, [sp, 0x1C] cmp r4, r2 bne _08056AFC - ldr r0, _08056AF8 + ldr r0, =0x00001027 b _08056AFE .align 2, 0 -_08056AF8: .4byte 0x00001027 + .pool _08056AFC: - ldr r0, _08056B34 + ldr r0, =0x00001026 _08056AFE: strh r0, [r5] movs r1, 0x1 @@ -176133,7 +169416,7 @@ _08056B0E: bl bg_copy_tilemap_rect_simple b _08056B50 .align 2, 0 -_08056B34: .4byte 0x00001026 + .pool _08056B38: lsls r2, r4, 24 lsrs r2, 24 @@ -176204,7 +169487,7 @@ sub_8056BAC: @ 8056BAC sub sp, 0x10 adds r3, r0, 0 add r0, sp, 0xC - ldr r1, _08056BE8 + ldr r1, =0x00001016 strh r1, [r0] strh r1, [r0, 0x2] lsls r3, 25 @@ -176228,7 +169511,7 @@ sub_8056BAC: @ 8056BAC pop {r0} bx r0 .align 2, 0 -_08056BE8: .4byte 0x00001016 + .pool thumb_func_end sub_8056BAC thumb_func_start atkF3_receive_new_pokemon_maybe @@ -176239,7 +169522,7 @@ atkF3_receive_new_pokemon_maybe: @ 8056BEC mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _08056C10 + ldr r0, =0x02024332 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x4 @@ -176247,13 +169530,12 @@ atkF3_receive_new_pokemon_maybe: @ 8056BEC b _08056E62 _08056C04: lsls r0, r1, 2 - ldr r1, _08056C14 + ldr r1, =_08056C18 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08056C10: .4byte 0x02024332 -_08056C14: .4byte _08056C18 + .pool .align 2, 0 _08056C18: .4byte _08056C2C @@ -176269,10 +169551,10 @@ _08056C2C: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, _08056C58 + ldr r0, =0x085ccabb movs r1, 0xC bl battle_show_message_maybe - ldr r1, _08056C5C + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -176281,10 +169563,9 @@ _08056C2C: bl sub_8056B74 b _08056E62 .align 2, 0 -_08056C58: .4byte 0x085ccabb -_08056C5C: .4byte 0x02024332 + .pool _08056C60: - ldr r0, _08056CD8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -176301,13 +169582,13 @@ _08056C60: strb r0, [r4, 0x1] bl sub_8056B74 _08056C86: - ldr r0, _08056CD8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _08056CAE - ldr r4, _08056CDC + ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 bne _08056CAE @@ -176319,7 +169600,7 @@ _08056C86: strb r0, [r4, 0x1] bl sub_8056B74 _08056CAE: - ldr r0, _08056CD8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -176327,7 +169608,7 @@ _08056CAE: beq _08056CE0 movs r0, 0x5 bl audio_play - ldr r1, _08056CDC + ldr r1, =0x02024332 ldrb r0, [r1, 0x1] cmp r0, 0 bne _08056CF2 @@ -176338,8 +169619,7 @@ _08056CAE: bl sub_80A2390 b _08056E62 .align 2, 0 -_08056CD8: .4byte 0x030022c0 -_08056CDC: .4byte 0x02024332 + .pool _08056CE0: movs r0, 0x2 ands r0, r1 @@ -176349,15 +169629,15 @@ _08056CE0: _08056CEA: movs r0, 0x5 bl audio_play - ldr r1, _08056CF8 + ldr r1, =0x02024332 _08056CF2: movs r0, 0x4 strb r0, [r1] b _08056E62 .align 2, 0 -_08056CF8: .4byte 0x02024332 + .pool _08056CFC: - ldr r0, _08056DB8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -176365,8 +169645,8 @@ _08056CFC: beq _08056D0A b _08056E62 _08056D0A: - ldr r7, _08056DBC - ldr r0, _08056DC0 + ldr r7, =0x0202406e + ldr r0, =0x0202420b mov r10, r0 ldrb r0, [r0] movs r4, 0x1 @@ -176379,10 +169659,10 @@ _08056D0A: mov r2, r9 muls r2, r0 adds r0, r2, 0 - ldr r1, _08056DC4 + ldr r1, =0x02024744 mov r8, r1 add r0, r8 - ldr r1, _08056DC8 + ldr r1, =0x0202449c ldr r2, [r1] adds r2, 0x6D movs r1, 0x2 @@ -176430,43 +169710,37 @@ _08056D0A: movs r1, 0 movs r2, 0 bl pokemon_getattr - ldr r2, _08056DC8 + ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0x6D str r0, [sp] - ldr r0, _08056DCC + ldr r0, =sub_8038420 + 1 str r0, [sp, 0x4] movs r0, 0x2 adds r2, r6, 0 adds r3, r5, 0 bl do_choose_name_or_words_screen - ldr r1, _08056DD0 + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _08056E62 .align 2, 0 -_08056DB8: .4byte 0x02037fd4 -_08056DBC: .4byte 0x0202406e -_08056DC0: .4byte 0x0202420b -_08056DC4: .4byte 0x02024744 -_08056DC8: .4byte 0x0202449c -_08056DCC: .4byte sub_8038420 + 1 -_08056DD0: .4byte 0x02024332 + .pool _08056DD4: - ldr r0, _08056E10 + ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, _08056E14 + ldr r0, =sub_8038420 + 1 cmp r1, r0 bne _08056E62 - ldr r0, _08056E18 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08056E62 - ldr r2, _08056E1C - ldr r0, _08056E20 + ldr r2, =0x0202406e + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x1 eors r0, r1 @@ -176475,37 +169749,31 @@ _08056DD4: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08056E24 + ldr r1, =0x02024744 adds r0, r1 - ldr r1, _08056E28 + ldr r1, =0x0202449c ldr r2, [r1] adds r2, 0x6D movs r1, 0x2 bl pokemon_setattr b _08056E48 .align 2, 0 -_08056E10: .4byte 0x030022c0 -_08056E14: .4byte sub_8038420 + 1 -_08056E18: .4byte 0x02037fd4 -_08056E1C: .4byte 0x0202406e -_08056E20: .4byte 0x0202420b -_08056E24: .4byte 0x02024744 -_08056E28: .4byte 0x0202449c + .pool _08056E2C: bl calc_player_party_count lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 bne _08056E48 - ldr r1, _08056E44 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] b _08056E62 .align 2, 0 -_08056E44: .4byte 0x02024214 + .pool _08056E48: - ldr r3, _08056E74 + ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -176528,38 +169796,35 @@ _08056E62: pop {r0} bx r0 .align 2, 0 -_08056E74: .4byte 0x02024214 + .pool thumb_func_end atkF3_receive_new_pokemon_maybe thumb_func_start sub_8056E78 sub_8056E78: @ 8056E78 - ldr r2, _08056E98 - ldr r0, _08056E9C + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r1, r0 adds r1, r2 - ldr r0, _08056EA0 + ldr r0, =0x020241f0 ldr r2, [r0] ldrh r0, [r1, 0x28] subs r0, r2 strh r0, [r1, 0x28] - ldr r1, _08056EA4 + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08056E98: .4byte 0x02024084 -_08056E9C: .4byte 0x0202420b -_08056EA0: .4byte 0x020241f0 -_08056EA4: .4byte 0x02024214 + .pool thumb_func_end sub_8056E78 thumb_func_start atkF5_reset_attacker_bd_x4C atkF5_reset_attacker_bd_x4C: @ 8056EA8 - ldr r1, _08056EC4 - ldr r0, _08056EC8 + ldr r1, =0x02024084 + ldr r0, =0x0202420b ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -176567,51 +169832,47 @@ atkF5_reset_attacker_bd_x4C: @ 8056EA8 adds r0, r1 movs r1, 0 str r1, [r0] - ldr r1, _08056ECC + ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08056EC4: .4byte 0x02024084 -_08056EC8: .4byte 0x0202420b -_08056ECC: .4byte 0x02024214 + .pool thumb_func_end atkF5_reset_attacker_bd_x4C thumb_func_start sub_8056ED0 sub_8056ED0: @ 8056ED0 - ldr r1, _08056ED8 + ldr r1, =0x02024083 movs r0, 0xC strb r0, [r1] bx lr .align 2, 0 -_08056ED8: .4byte 0x02024083 + .pool thumb_func_end sub_8056ED0 thumb_func_start sub_8056EDC sub_8056EDC: @ 8056EDC - ldr r1, _08056EEC + ldr r1, =0x02024083 movs r0, 0xC strb r0, [r1] - ldr r1, _08056EF0 - ldr r0, _08056EF4 + ldr r1, =0x02024082 + ldr r0, =0x0202406c ldrb r0, [r0] strb r0, [r1] bx lr .align 2, 0 -_08056EEC: .4byte 0x02024083 -_08056EF0: .4byte 0x02024082 -_08056EF4: .4byte 0x0202406c + .pool thumb_func_end sub_8056EDC thumb_func_start sub_8056EF8 sub_8056EF8: @ 8056EF8 push {r4,r5,lr} - ldr r5, _08056F20 + ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] bl battle_get_side_with_given_state - ldr r4, _08056F24 + ldr r4, =0x02024064 strb r0, [r4] movs r0, 0 bl dp01_build_cmdbuf_x09_9_9_9 @@ -176624,15 +169885,14 @@ sub_8056EF8: @ 8056EF8 pop {r0} bx r0 .align 2, 0 -_08056F20: .4byte 0x02024214 -_08056F24: .4byte 0x02024064 + .pool thumb_func_end sub_8056EF8 thumb_func_start sub_8056F28 sub_8056F28: @ 8056F28 push {r4-r6,lr} - ldr r5, _08057000 - ldr r6, _08057004 + ldr r5, =0x020244a8 + ldr r6, =0x02022fec ldr r0, [r6] movs r1, 0x80 lsls r1, 19 @@ -176641,7 +169901,7 @@ sub_8056F28: @ 8056F28 beq _08056F3E bl sub_81D55D0 _08056F3E: - ldr r4, _08057008 + ldr r4, =0x0202449c movs r0, 0xA9 lsls r0, 2 bl malloc_and_clear @@ -176681,22 +169941,22 @@ _08056F3E: bl malloc_and_clear ldr r1, [r5] str r0, [r1, 0x1C] - ldr r4, _0805700C + ldr r4, =0x020244a0 movs r5, 0x80 lsls r5, 5 adds r0, r5, 0 bl malloc_and_clear str r0, [r4] - ldr r4, _08057010 + ldr r4, =0x020244a4 adds r0, r5, 0 bl malloc_and_clear str r0, [r4] - ldr r4, _08057014 + ldr r4, =0x0202305c movs r0, 0x80 lsls r0, 6 bl malloc_and_clear str r0, [r4] - ldr r4, _08057018 + ldr r4, =0x02023060 adds r0, r5, 0 bl malloc_and_clear str r0, [r4] @@ -176706,15 +169966,15 @@ _08056F3E: ands r0, r1 cmp r0, 0 beq _08056FFA - ldr r0, _0805701C + ldr r0, =0x00004054 bl var_get lsls r0, 16 lsrs r0, 16 - ldr r2, _08057020 + ldr r2, =0x03005d8c lsls r1, r0, 2 adds r1, r0 lsls r1, 5 - ldr r0, _08057024 + ldr r0, =0x00001a9c adds r1, r0 ldr r0, [r2] adds r0, r1 @@ -176724,22 +169984,13 @@ _08056FFA: pop {r0} bx r0 .align 2, 0 -_08057000: .4byte 0x020244a8 -_08057004: .4byte 0x02022fec -_08057008: .4byte 0x0202449c -_0805700C: .4byte 0x020244a0 -_08057010: .4byte 0x020244a4 -_08057014: .4byte 0x0202305c -_08057018: .4byte 0x02023060 -_0805701C: .4byte 0x00004054 -_08057020: .4byte 0x03005d8c -_08057024: .4byte 0x00001a9c + .pool thumb_func_end sub_8056F28 thumb_func_start sub_8057028 sub_8057028: @ 8057028 push {r4-r6,lr} - ldr r0, _080570D8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 19 @@ -176748,11 +169999,11 @@ sub_8057028: @ 8057028 beq _0805703C bl sub_81D5694 _0805703C: - ldr r6, _080570DC + ldr r6, =0x020244a8 ldr r0, [r6] cmp r0, 0 beq _080570D0 - ldr r4, _080570E0 + ldr r4, =0x0202449c ldr r0, [r4] bl free movs r5, 0 @@ -176792,19 +170043,19 @@ _0805703C: str r5, [r0, 0x1C] bl free str r5, [r6] - ldr r4, _080570E4 + ldr r4, =0x020244a0 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _080570E8 + ldr r4, =0x020244a4 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _080570EC + ldr r4, =0x0202305c ldr r0, [r4] bl free str r5, [r4] - ldr r4, _080570F0 + ldr r4, =0x02023060 ldr r0, [r4] bl free str r5, [r4] @@ -176813,13 +170064,7 @@ _080570D0: pop {r0} bx r0 .align 2, 0 -_080570D8: .4byte 0x02022fec -_080570DC: .4byte 0x020244a8 -_080570E0: .4byte 0x0202449c -_080570E4: .4byte 0x020244a0 -_080570E8: .4byte 0x020244a4 -_080570EC: .4byte 0x0202305c -_080570F0: .4byte 0x02023060 + .pool thumb_func_end sub_8057028 thumb_func_start sub_80570F4 @@ -176827,7 +170072,7 @@ sub_80570F4: @ 80570F4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08057138 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -176841,7 +170086,7 @@ sub_80570F4: @ 80570F4 bl battle_get_side_with_given_state lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _0805713C + ldr r2, =0x02024084 movs r0, 0x58 adds r1, r3, 0 muls r1, r0 @@ -176857,15 +170102,14 @@ sub_80570F4: @ 80570F4 adds r4, r3, 0 b _0805714A .align 2, 0 -_08057138: .4byte 0x02022fec -_0805713C: .4byte 0x02024084 + .pool _08057140: movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 lsrs r4, r0, 24 _0805714A: - ldr r2, _0805718C + ldr r2, =0x02024084 movs r1, 0x58 adds r0, r4, 0 muls r0, r1 @@ -176885,44 +170129,41 @@ _0805714A: subs r0, r1 cmp r0, 0x1D ble _08057198 - ldr r1, _08057190 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08057194 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x8 bl happiness_algorithm b _080571CE .align 2, 0 -_0805718C: .4byte 0x02024084 -_08057190: .4byte 0x0202406e -_08057194: .4byte 0x020244ec + .pool _08057198: - ldr r1, _080571B0 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080571B4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x6 bl happiness_algorithm b _080571CE .align 2, 0 -_080571B0: .4byte 0x0202406e -_080571B4: .4byte 0x020244ec + .pool _080571B8: - ldr r1, _080571D4 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080571D8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x6 bl happiness_algorithm @@ -176931,8 +170172,7 @@ _080571CE: pop {r0} bx r0 .align 2, 0 -_080571D4: .4byte 0x0202406e -_080571D8: .4byte 0x020244ec + .pool thumb_func_end sub_80570F4 thumb_func_start sub_80571DC @@ -176949,10 +170189,10 @@ sub_80571DC: @ 80571DC cmp r0, 0x1 beq _08057248 movs r2, 0 - ldr r6, _08057250 + ldr r6, =0x0202406e lsls r3, r4, 1 - ldr r5, _08057254 - ldr r4, _08057258 + ldr r5, =0x0203cf00 + ldr r4, =0x0202449c _080571FE: adds r0, r2, r5 ldr r1, [r4] @@ -176977,8 +170217,8 @@ _080571FE: adds r0, r4, 0 bl sub_81B8FB0 movs r2, 0 - ldr r4, _08057258 - ldr r3, _08057254 + ldr r4, =0x0202449c + ldr r3, =0x0203cf00 _08057236: ldr r0, [r4] adds r0, r2, r0 @@ -176994,9 +170234,7 @@ _08057248: pop {r0} bx r0 .align 2, 0 -_08057250: .4byte 0x0202406e -_08057254: .4byte 0x0203cf00 -_08057258: .4byte 0x0202449c + .pool thumb_func_end sub_80571DC thumb_func_start sub_805725C @@ -177012,11 +170250,11 @@ sub_805725C: @ 805725C mov r9, r0 movs r0, 0 mov r8, r0 - ldr r1, _08057278 + ldr r1, =0x02024332 mov r10, r1 b _08057284 .align 2, 0 -_08057278: .4byte 0x02024332 + .pool _0805727C: mov r2, r8 cmp r2, 0 @@ -177037,7 +170275,7 @@ _08057294: beq _0805729A b _080573FC _0805729A: - ldr r6, _080572EC + ldr r6, =0x02024084 movs r0, 0x58 mov r5, r9 muls r5, r0 @@ -177063,24 +170301,21 @@ _0805729A: adds r2, 0x50 adds r2, r5, r2 ldr r0, [r2] - ldr r1, _080572F0 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor movs r0, 0x1 mov r2, r10 strb r0, [r2, 0x5] - ldr r1, _080572F4 - ldr r0, _080572F8 + ldr r1, =0x02024214 + ldr r0, =0x082db220 str r0, [r1] movs r0, 0x2 mov r8, r0 b _08057372 .align 2, 0 -_080572EC: .4byte 0x02024084 -_080572F0: .4byte 0xf7ffffff -_080572F4: .4byte 0x02024214 -_080572F8: .4byte 0x082db220 + .pool _080572FC: adds r0, r5, r6 adds r0, 0x20 @@ -177104,7 +170339,7 @@ _0805731E: subs r0, r1, r2 str r0, [r4] _08057322: - ldr r2, _08057348 + ldr r2, =0x02024084 movs r0, 0x58 mov r1, r9 muls r1, r0 @@ -177116,45 +170351,40 @@ _08057322: ands r4, r0 cmp r4, 0 beq _08057354 - ldr r1, _0805734C - ldr r0, _08057350 + ldr r1, =0x02024214 + ldr r0, =0x082db213 str r0, [r1] movs r1, 0x2 mov r8, r1 b _08057372 .align 2, 0 -_08057348: .4byte 0x02024084 -_0805734C: .4byte 0x02024214 -_08057350: .4byte 0x082db213 + .pool _08057354: adds r2, 0x50 adds r2, r1, r2 ldr r0, [r2] - ldr r1, _08057380 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] bl b_movescr_stack_push_cursor - ldr r0, _08057384 + ldr r0, =0x02024332 strb r4, [r0, 0x5] - ldr r1, _08057388 - ldr r0, _0805738C + ldr r1, =0x02024214 + ldr r0, =0x082db220 str r0, [r1] movs r2, 0x2 mov r8, r2 _08057372: - ldr r1, _08057384 + ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] mov r10, r1 b _080573FC .align 2, 0 -_08057380: .4byte 0xf7ffffff -_08057384: .4byte 0x02024332 -_08057388: .4byte 0x02024214 -_0805738C: .4byte 0x082db220 + .pool _08057390: - ldr r1, _080573C8 + ldr r1, =0x02024084 movs r0, 0x58 mov r2, r9 muls r2, r0 @@ -177175,14 +170405,12 @@ _08057390: lsrs r5, r0, 16 cmp r5, 0 beq _080573D4 - ldr r1, _080573CC - ldr r0, _080573D0 + ldr r1, =0x02024214 + ldr r0, =0x082db26a str r0, [r1] b _080573EC .align 2, 0 -_080573C8: .4byte 0x02024084 -_080573CC: .4byte 0x02024214 -_080573D0: .4byte 0x082db26a + .pool _080573D4: ldr r0, [r4] movs r1, 0x21 @@ -177190,15 +170418,15 @@ _080573D4: ands r0, r1 str r0, [r4] bl b_movescr_stack_push_cursor - ldr r1, _08057444 - ldr r0, _08057448 + ldr r1, =0x02024214 + ldr r0, =0x082db277 str r0, [r1] mov r0, r10 strb r5, [r0, 0x5] _080573EC: movs r1, 0x2 mov r8, r1 - ldr r2, _0805744C + ldr r2, =0x02024332 mov r10, r2 _080573F4: mov r1, r10 @@ -177215,13 +170443,13 @@ _08057406: mov r0, r8 cmp r0, 0x2 bne _08057430 - ldr r4, _08057450 + ldr r4, =0x02024064 mov r1, r9 strb r1, [r4] ldrb r1, [r4] movs r0, 0x58 muls r0, r1 - ldr r1, _08057454 + ldr r1, =0x020240d0 adds r0, r1 str r0, [sp] movs r0, 0 @@ -177242,11 +170470,7 @@ _08057430: pop {r1} bx r1 .align 2, 0 -_08057444: .4byte 0x02024214 -_08057448: .4byte 0x082db277 -_0805744C: .4byte 0x02024332 -_08057450: .4byte 0x02024064 -_08057454: .4byte 0x020240d0 + .pool thumb_func_end sub_805725C thumb_func_start nullsub_21 @@ -177256,39 +170480,35 @@ nullsub_21: @ 8057458 thumb_func_start sub_805745C sub_805745C: @ 805745C - ldr r1, _08057478 - ldr r0, _0805747C + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08057480 + ldr r1, =bx_exec_buffer_A_ch0_tbl1 + 1 str r1, [r0] - ldr r0, _08057484 + ldr r0, =0x020244b9 movs r1, 0 strb r1, [r0] - ldr r0, _08057488 + ldr r0, =0x020244cc strb r1, [r0] bx lr .align 2, 0 -_08057478: .4byte 0x03005d60 -_0805747C: .4byte 0x02024064 -_08057480: .4byte bx_exec_buffer_A_ch0_tbl1 + 1 -_08057484: .4byte 0x020244b9 -_08057488: .4byte 0x020244cc + .pool thumb_func_end sub_805745C thumb_func_start dp01_tbl1_exec_completed dp01_tbl1_exec_completed: @ 805748C push {r4,lr} sub sp, 0x4 - ldr r1, _080574CC - ldr r4, _080574D0 + ldr r1, =0x03005d60 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _080574D4 + ldr r1, =bx_exec_buffer_A_ch0_tbl1 + 1 str r1, [r0] - ldr r0, _080574D8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -177301,7 +170521,7 @@ dp01_tbl1_exec_completed: @ 805748C movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _080574DC + ldr r1, =0x02023064 ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -177309,14 +170529,10 @@ dp01_tbl1_exec_completed: @ 805748C strb r1, [r0] b _080574F2 .align 2, 0 -_080574CC: .4byte 0x03005d60 -_080574D0: .4byte 0x02024064 -_080574D4: .4byte bx_exec_buffer_A_ch0_tbl1 + 1 -_080574D8: .4byte 0x02022fec -_080574DC: .4byte 0x02023064 + .pool _080574E0: - ldr r2, _080574FC - ldr r1, _08057500 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -177330,16 +170546,15 @@ _080574F2: pop {r0} bx r0 .align 2, 0 -_080574FC: .4byte 0x02024068 -_08057500: .4byte 0x0832a328 + .pool thumb_func_end dp01_tbl1_exec_completed thumb_func_start bx_exec_buffer_A_ch0_tbl1 bx_exec_buffer_A_ch0_tbl1: @ 8057504 push {lr} - ldr r2, _08057538 - ldr r1, _0805753C - ldr r0, _08057540 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -177348,13 +170563,13 @@ bx_exec_buffer_A_ch0_tbl1: @ 8057504 ands r1, r0 cmp r1, 0 beq _08057550 - ldr r0, _08057544 + ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _0805754C - ldr r0, _08057548 + ldr r0, =0x0831c514 ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -177362,11 +170577,7 @@ bx_exec_buffer_A_ch0_tbl1: @ 8057504 bl _call_via_r0 b _08057550 .align 2, 0 -_08057538: .4byte 0x02024068 -_0805753C: .4byte 0x0832a328 -_08057540: .4byte 0x02024064 -_08057544: .4byte 0x02023064 -_08057548: .4byte 0x0831c514 + .pool _0805754C: bl dp01_tbl1_exec_completed _08057550: @@ -177377,9 +170588,9 @@ _08057550: thumb_func_start bx_0802E404 bx_0802E404: @ 8057554 push {lr} - ldr r2, _0805757C - ldr r1, _08057580 - ldr r0, _08057584 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -177396,16 +170607,14 @@ _08057576: pop {r0} bx r0 .align 2, 0 -_0805757C: .4byte 0x02020630 -_08057580: .4byte 0x020241e4 -_08057584: .4byte 0x02024064 + .pool thumb_func_end bx_0802E404 thumb_func_start sub_8057588 sub_8057588: @ 8057588 push {r4-r7,lr} - ldr r3, _080575D8 - ldr r4, _080575DC + ldr r3, =0x02023064 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r2, r0, 9 adds r1, r3, 0x2 @@ -177425,33 +170634,29 @@ sub_8057588: @ 8057588 movs r2, 0x7 movs r3, 0x1 bl dp11b_obj_instanciate - ldr r0, _080575E0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] movs r0, 0xF0 ands r0, r1 cmp r0, 0 beq _080575EC - ldr r0, _080575E4 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x2 bne _080575EC - ldr r1, _080575E8 + ldr r1, =0x020244cc ldrb r0, [r1] adds r0, 0x1 b _080575F0 .align 2, 0 -_080575D8: .4byte 0x02023064 -_080575DC: .4byte 0x02024064 -_080575E0: .4byte 0x030022c0 -_080575E4: .4byte 0x03005d90 -_080575E8: .4byte 0x020244cc + .pool _080575EC: - ldr r1, _08057620 + ldr r1, =0x020244cc movs r0, 0 _080575F0: strb r0, [r1] - ldr r0, _08057624 + ldr r0, =0x030022c0 ldrh r2, [r0, 0x2E] movs r3, 0x1 adds r0, r3, 0 @@ -177460,8 +170665,8 @@ _080575F0: beq _08057658 movs r0, 0x5 bl audio_play - ldr r1, _08057628 - ldr r0, _0805762C + ldr r1, =0x020244ac + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -177473,10 +170678,7 @@ _080575F0: beq _0805763A b _080577C2 .align 2, 0 -_08057620: .4byte 0x020244cc -_08057624: .4byte 0x030022c0 -_08057628: .4byte 0x020244ac -_0805762C: .4byte 0x02024064 + .pool _08057630: cmp r0, 0x2 beq _08057646 @@ -177506,8 +170708,8 @@ _08057658: ands r0, r2 cmp r0, 0 beq _08057698 - ldr r5, _08057690 - ldr r4, _08057694 + ldr r5, =0x020244ac + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -177529,15 +170731,14 @@ _08057674: movs r2, 0x1 b _08057732 .align 2, 0 -_08057690: .4byte 0x020244ac -_08057694: .4byte 0x02024064 + .pool _08057698: movs r0, 0x10 ands r0, r2 cmp r0, 0 beq _080576D8 - ldr r5, _080576D0 - ldr r4, _080576D4 + ldr r5, =0x020244ac + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -177559,16 +170760,15 @@ _080576B4: movs r2, 0x1 b _08057732 .align 2, 0 -_080576D0: .4byte 0x020244ac -_080576D4: .4byte 0x02024064 + .pool _080576D8: movs r7, 0x40 adds r0, r7, 0 ands r0, r2 cmp r0, 0 beq _08057700 - ldr r5, _080576F8 - ldr r4, _080576FC + ldr r5, =0x020244ac + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -177578,15 +170778,14 @@ _080576D8: beq _080577E8 b _0805771A .align 2, 0 -_080576F8: .4byte 0x020244ac -_080576FC: .4byte 0x02024064 + .pool _08057700: movs r0, 0x80 ands r0, r2 cmp r0, 0 beq _0805774C - ldr r5, _08057744 - ldr r4, _08057748 + ldr r5, =0x020244ac + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -177615,8 +170814,7 @@ _08057732: bl sub_8059CB4 b _080577E8 .align 2, 0 -_08057744: .4byte 0x020244ac -_08057748: .4byte 0x02024064 + .pool _0805774C: movs r0, 0x2 ands r0, r2 @@ -177626,12 +170824,12 @@ _0805774C: cmp r0, 0x3B bls _080577DC _0805775A: - ldr r4, _080577C8 + ldr r4, =0x02022fec ldr r0, [r4] ands r0, r3 cmp r0, 0 beq _080577E8 - ldr r6, _080577CC + ldr r6, =0x02024064 ldrb r0, [r6] bl battle_get_per_side_status lsls r0, 24 @@ -177640,9 +170838,9 @@ _0805775A: bne _080577E8 movs r0, 0 bl battle_get_side_with_given_state - ldr r1, _080577D0 + ldr r1, =0x02024210 ldrb r1, [r1] - ldr r2, _080577D4 + ldr r2, =0x0832a328 lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -177654,7 +170852,7 @@ _0805775A: ands r0, r7 cmp r0, 0 bne _080577E8 - ldr r0, _080577D8 + ldr r0, =0x02023064 ldrb r1, [r6] lsls r1, 9 adds r0, 0x1 @@ -177679,11 +170877,7 @@ _080577C2: bl dp01_tbl1_exec_completed b _080577E8 .align 2, 0 -_080577C8: .4byte 0x02022fec -_080577CC: .4byte 0x02024064 -_080577D0: .4byte 0x02024210 -_080577D4: .4byte 0x0832a328 -_080577D8: .4byte 0x02023064 + .pool _080577DC: movs r0, 0x8 ands r0, r2 @@ -177699,49 +170893,47 @@ _080577E8: thumb_func_start sub_80577F0 sub_80577F0: @ 80577F0 push {r4,lr} - ldr r4, _08057818 + ldr r4, =0x02024064 ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free ldrb r0, [r4] movs r1, 0 bl dp11b_obj_free - ldr r1, _0805781C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08057820 + ldr r1, =sub_8057824 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08057818: .4byte 0x02024064 -_0805781C: .4byte 0x03005d60 -_08057820: .4byte sub_8057824 + 1 + .pool thumb_func_end sub_80577F0 thumb_func_start sub_8057824 sub_8057824: @ 8057824 push {r4,r5,lr} sub sp, 0x4 - ldr r1, _08057884 + ldr r1, =0x0831c5f8 mov r0, sp movs r2, 0x4 bl memcpy - ldr r0, _08057888 + ldr r0, =0x03005d74 ldrb r0, [r0] movs r1, 0x1 movs r2, 0xF movs r3, 0x1 bl dp11b_obj_instanciate movs r4, 0 - ldr r0, _0805788C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r0, 0 beq _08057866 _0805784A: - ldr r0, _08057888 + ldr r0, =0x03005d74 ldrb r0, [r0] cmp r4, r0 beq _0805785C @@ -177751,35 +170943,30 @@ _0805784A: bl dp11b_obj_free _0805785C: adds r4, 0x1 - ldr r0, _0805788C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 blt _0805784A _08057866: - ldr r2, _08057890 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0xF0 ands r0, r1 cmp r0, 0 beq _0805789C - ldr r0, _08057894 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x2 bne _0805789C - ldr r1, _08057898 + ldr r1, =0x020244cc ldrb r0, [r1] adds r0, 0x1 b _080578A0 .align 2, 0 -_08057884: .4byte 0x0831c5f8 -_08057888: .4byte 0x03005d74 -_0805788C: .4byte 0x0202406c -_08057890: .4byte 0x030022c0 -_08057894: .4byte 0x03005d90 -_08057898: .4byte 0x020244cc + .pool _0805789C: - ldr r1, _080578F4 + ldr r1, =0x020244cc movs r0, 0 _080578A0: strb r0, [r1] @@ -177790,9 +170977,9 @@ _080578A0: beq _08057910 movs r0, 0x5 bl audio_play - ldr r2, _080578F8 - ldr r1, _080578FC - ldr r4, _08057900 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r4, =0x03005d74 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -177801,10 +170988,10 @@ _080578A0: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _08057904 + ldr r1, =sub_8039B2C + 1 str r1, [r0] - ldr r1, _08057908 - ldr r0, _0805790C + ldr r1, =0x020244b0 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -177820,13 +171007,7 @@ _080578A0: bl dp01_tbl1_exec_completed b _08057BC8 .align 2, 0 -_080578F4: .4byte 0x020244cc -_080578F8: .4byte 0x02020630 -_080578FC: .4byte 0x020241e4 -_08057900: .4byte 0x03005d74 -_08057904: .4byte sub_8039B2C + 1 -_08057908: .4byte 0x020244b0 -_0805790C: .4byte 0x02024064 + .pool _08057910: movs r0, 0x2 ands r0, r2 @@ -177838,9 +171019,9 @@ _08057910: _0805791E: movs r0, 0x5 bl audio_play - ldr r2, _08057970 - ldr r1, _08057974 - ldr r5, _08057978 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r5, =0x03005d74 ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -177849,14 +171030,14 @@ _0805791E: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _0805797C + ldr r1, =sub_8039B2C + 1 str r1, [r0] - ldr r1, _08057980 - ldr r4, _08057984 + ldr r1, =0x03005d60 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08057988 + ldr r1, =sub_8057BFC + 1 str r1, [r0] ldrb r0, [r4] movs r1, 0x1 @@ -177873,13 +171054,7 @@ _0805791E: bl dp11b_obj_free b _08057BC8 .align 2, 0 -_08057970: .4byte 0x02020630 -_08057974: .4byte 0x020241e4 -_08057978: .4byte 0x03005d74 -_0805797C: .4byte sub_8039B2C + 1 -_08057980: .4byte 0x03005d60 -_08057984: .4byte 0x02024064 -_08057988: .4byte sub_8057BFC + 1 + .pool _0805798C: movs r0, 0x60 ands r0, r2 @@ -177889,9 +171064,9 @@ _0805798C: _08057996: movs r0, 0x5 bl audio_play - ldr r2, _080579C8 - ldr r1, _080579CC - ldr r3, _080579D0 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r3, =0x03005d74 ldrb r0, [r3] adds r0, r1 ldrb r1, [r0] @@ -177900,7 +171075,7 @@ _08057996: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _080579D4 + ldr r1, =sub_8039B2C + 1 str r1, [r0] adds r5, r3, 0 _080579B8: @@ -177912,10 +171087,7 @@ _080579B8: mov r0, sp b _080579E2 .align 2, 0 -_080579C8: .4byte 0x02020630 -_080579CC: .4byte 0x020241e4 -_080579D0: .4byte 0x03005d74 -_080579D4: .4byte sub_8039B2C + 1 + .pool _080579D8: adds r4, 0x1 cmp r4, 0x3 @@ -177937,7 +171109,7 @@ _080579F0: ldrb r0, [r0] bl battle_get_side_with_given_state strb r0, [r5] - ldr r1, _08057A24 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -177956,7 +171128,7 @@ _080579F0: beq _08057A32 b _08057A70 .align 2, 0 -_08057A24: .4byte 0x0202406c + .pool _08057A28: cmp r0, 0x2 beq _08057A32 @@ -177964,26 +171136,26 @@ _08057A28: beq _08057A6E b _08057A70 _08057A32: - ldr r2, _08057A90 + ldr r2, =0x02024064 ldrb r0, [r2] ldrb r1, [r5] cmp r0, r1 bne _08057A6E - ldr r1, _08057A94 + ldr r1, =0x0202406e ldrb r2, [r2] lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08057A98 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08057A9C + ldr r1, =0x020244b0 adds r2, r1 ldrb r1, [r2] adds r1, 0xD bl pokemon_getattr - ldr r2, _08057AA0 + ldr r2, =0x0831c898 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -177996,15 +171168,15 @@ _08057A32: _08057A6E: adds r4, 0x1 _08057A70: - ldr r0, _08057AA4 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08057AA8 + ldr r2, =0x0832a328 ldrb r0, [r5] lsls r0, 2 adds r0, r2 ldr r0, [r0] ands r1, r0 - ldr r0, _08057AAC + ldr r0, =0x03005d74 cmp r1, 0 beq _08057A88 movs r4, 0 @@ -178013,14 +171185,7 @@ _08057A88: beq _080579B8 b _08057BB0 .align 2, 0 -_08057A90: .4byte 0x02024064 -_08057A94: .4byte 0x0202406e -_08057A98: .4byte 0x020244ec -_08057A9C: .4byte 0x020244b0 -_08057AA0: .4byte 0x0831c898 -_08057AA4: .4byte 0x02024210 -_08057AA8: .4byte 0x0832a328 -_08057AAC: .4byte 0x03005d74 + .pool _08057AB0: movs r0, 0x90 ands r0, r2 @@ -178030,9 +171195,9 @@ _08057AB0: _08057ABA: movs r0, 0x5 bl audio_play - ldr r2, _08057AEC - ldr r1, _08057AF0 - ldr r3, _08057AF4 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r3, =0x03005d74 ldrb r0, [r3] adds r0, r1 ldrb r1, [r0] @@ -178041,7 +171206,7 @@ _08057ABA: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _08057AF8 + ldr r1, =sub_8039B2C + 1 str r1, [r0] adds r5, r3, 0 _08057ADC: @@ -178053,10 +171218,7 @@ _08057ADC: mov r0, sp b _08057B06 .align 2, 0 -_08057AEC: .4byte 0x02020630 -_08057AF0: .4byte 0x020241e4 -_08057AF4: .4byte 0x03005d74 -_08057AF8: .4byte sub_8039B2C + 1 + .pool _08057AFC: adds r4, 0x1 cmp r4, 0x3 @@ -178078,7 +171240,7 @@ _08057B14: ldrb r0, [r0] bl battle_get_side_with_given_state strb r0, [r5] - ldr r1, _08057B48 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -178097,7 +171259,7 @@ _08057B14: beq _08057B56 b _08057B94 .align 2, 0 -_08057B48: .4byte 0x0202406c + .pool _08057B4C: cmp r0, 0x2 beq _08057B56 @@ -178105,26 +171267,26 @@ _08057B4C: beq _08057B92 b _08057B94 _08057B56: - ldr r2, _08057BD0 + ldr r2, =0x02024064 ldrb r0, [r2] ldrb r1, [r5] cmp r0, r1 bne _08057B92 - ldr r1, _08057BD4 + ldr r1, =0x0202406e ldrb r2, [r2] lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08057BD8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08057BDC + ldr r1, =0x020244b0 adds r2, r1 ldrb r1, [r2] adds r1, 0xD bl pokemon_getattr - ldr r2, _08057BE0 + ldr r2, =0x0831c898 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -178137,15 +171299,15 @@ _08057B56: _08057B92: adds r4, 0x1 _08057B94: - ldr r0, _08057BE4 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08057BE8 + ldr r2, =0x0832a328 ldrb r0, [r5] lsls r0, 2 adds r0, r2 ldr r0, [r0] ands r1, r0 - ldr r0, _08057BEC + ldr r0, =0x03005d74 cmp r1, 0 beq _08057BAC movs r4, 0 @@ -178153,8 +171315,8 @@ _08057BAC: cmp r4, 0 beq _08057ADC _08057BB0: - ldr r2, _08057BF0 - ldr r1, _08057BF4 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -178163,7 +171325,7 @@ _08057BB0: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _08057BF8 + ldr r1, =sub_8039AD8 + 1 str r1, [r0] _08057BC8: add sp, 0x4 @@ -178171,17 +171333,7 @@ _08057BC8: pop {r0} bx r0 .align 2, 0 -_08057BD0: .4byte 0x02024064 -_08057BD4: .4byte 0x0202406e -_08057BD8: .4byte 0x020244ec -_08057BDC: .4byte 0x020244b0 -_08057BE0: .4byte 0x0831c898 -_08057BE4: .4byte 0x02024210 -_08057BE8: .4byte 0x0832a328 -_08057BEC: .4byte 0x03005d74 -_08057BF0: .4byte 0x02020630 -_08057BF4: .4byte 0x020241e4 -_08057BF8: .4byte sub_8039AD8 + 1 + .pool thumb_func_end sub_8057824 thumb_func_start sub_8057BFC @@ -178191,35 +171343,31 @@ sub_8057BFC: @ 8057BFC push {r7} movs r0, 0 mov r8, r0 - ldr r3, _08057C30 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 - ldr r1, _08057C34 + ldr r1, =0x02023068 adds r6, r0, r1 - ldr r2, _08057C38 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0xF0 ands r0, r1 adds r7, r3, 0 cmp r0, 0 beq _08057C44 - ldr r0, _08057C3C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x2 bne _08057C44 - ldr r1, _08057C40 + ldr r1, =0x020244cc ldrb r0, [r1] adds r0, 0x1 b _08057C48 .align 2, 0 -_08057C30: .4byte 0x02024064 -_08057C34: .4byte 0x02023068 -_08057C38: .4byte 0x030022c0 -_08057C3C: .4byte 0x03005d90 -_08057C40: .4byte 0x020244cc + .pool _08057C44: - ldr r1, _08057C8C + ldr r1, =0x020244cc movs r0, 0 _08057C48: strb r0, [r1] @@ -178233,8 +171381,8 @@ _08057C48: _08057C58: movs r0, 0x5 bl audio_play - ldr r1, _08057C90 - ldr r0, _08057C94 + ldr r1, =0x020244b0 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -178257,11 +171405,9 @@ _08057C58: ands r4, r0 b _08057CA6 .align 2, 0 -_08057C8C: .4byte 0x020244cc -_08057C90: .4byte 0x020244b0 -_08057C94: .4byte 0x02024064 + .pool _08057C98: - ldr r2, _08057CB8 + ldr r2, =0x0831c898 ldrh r1, [r1] lsls r0, r1, 1 adds r0, r1 @@ -178273,17 +171419,15 @@ _08057CA6: ands r0, r4 cmp r0, 0 beq _08057CC4 - ldr r0, _08057CBC - ldr r1, _08057CC0 + ldr r0, =0x03005d74 + ldr r1, =0x02024064 ldrb r1, [r1] strb r1, [r0] b _08057CDE .align 2, 0 -_08057CB8: .4byte 0x0831c898 -_08057CBC: .4byte 0x03005d74 -_08057CC0: .4byte 0x02024064 + .pool _08057CC4: - ldr r0, _08057D0C + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status adds r1, r0, 0 @@ -178292,11 +171436,11 @@ _08057CC4: ands r0, r1 eors r0, r2 bl battle_get_side_with_given_state - ldr r1, _08057D10 + ldr r1, =0x03005d74 strb r0, [r1] _08057CDE: - ldr r5, _08057D14 - ldr r0, _08057D0C + ldr r5, =0x02023064 + ldr r0, =0x02024064 ldrb r3, [r0] lsls r2, r3, 9 adds r1, r5, 0x1 @@ -178318,9 +171462,7 @@ _08057CDE: add r8, r0 b _08057D5A .align 2, 0 -_08057D0C: .4byte 0x02024064 -_08057D10: .4byte 0x03005d74 -_08057D14: .4byte 0x02023064 + .pool _08057D18: movs r0, 0x7D ands r0, r4 @@ -178329,7 +171471,7 @@ _08057D18: movs r0, 0x1 add r8, r0 _08057D24: - ldr r0, _08057D74 + ldr r0, =0x020244b0 adds r0, r3, r0 adds r1, r6, 0 adds r1, 0x8 @@ -178350,53 +171492,49 @@ _08057D24: bhi _08057D5A ldrb r0, [r7] bl sub_8069F34 - ldr r1, _08057D78 + ldr r1, =0x03005d74 strb r0, [r1] movs r0, 0 mov r8, r0 _08057D5A: - ldr r7, _08057D7C + ldr r7, =0x02024064 mov r0, r8 cmp r0, 0 bne _08057D80 _08057D62: - ldr r1, _08057D74 + ldr r1, =0x020244b0 ldrb r0, [r7] adds r0, r1 ldrb r2, [r0] - ldr r0, _08057D78 + ldr r0, =0x03005d74 ldrb r0, [r0] lsls r0, 8 orrs r2, r0 b _08057E1C .align 2, 0 -_08057D74: .4byte 0x020244b0 -_08057D78: .4byte 0x03005d74 -_08057D7C: .4byte 0x02024064 + .pool _08057D80: - ldr r1, _08057D9C + ldr r1, =0x03005d60 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, _08057DA0 + ldr r1, =sub_8057824 + 1 str r1, [r0] movs r0, 0x12 ands r4, r0 cmp r4, 0 beq _08057DA8 - ldr r1, _08057DA4 + ldr r1, =0x03005d74 ldrb r0, [r7] b _08057DD8 .align 2, 0 -_08057D9C: .4byte 0x03005d60 -_08057DA0: .4byte sub_8057824 + 1 -_08057DA4: .4byte 0x03005d74 + .pool _08057DA8: movs r0, 0x1 bl battle_get_side_with_given_state - ldr r1, _08057DC8 + ldr r1, =0x02024210 ldrb r1, [r1] - ldr r2, _08057DCC + ldr r2, =0x0832a328 lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -178407,18 +171545,17 @@ _08057DA8: movs r0, 0x3 b _08057DD2 .align 2, 0 -_08057DC8: .4byte 0x02024210 -_08057DCC: .4byte 0x0832a328 + .pool _08057DD0: movs r0, 0x1 _08057DD2: bl battle_get_side_with_given_state - ldr r1, _08057DF4 + ldr r1, =0x03005d74 _08057DD8: strb r0, [r1] - ldr r2, _08057DF8 - ldr r1, _08057DFC - ldr r0, _08057DF4 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x03005d74 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -178427,13 +171564,10 @@ _08057DD8: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _08057E00 + ldr r1, =sub_8039AD8 + 1 b _08057F9C .align 2, 0 -_08057DF4: .4byte 0x03005d74 -_08057DF8: .4byte 0x02020630 -_08057DFC: .4byte 0x020241e4 -_08057E00: .4byte sub_8039AD8 + 1 + .pool _08057E04: movs r6, 0x2 adds r0, r6, 0 @@ -178446,7 +171580,7 @@ _08057E04: _08057E14: movs r0, 0x5 bl audio_play - ldr r2, _08057E2C + ldr r2, =0x0000ffff _08057E1C: movs r0, 0x1 movs r1, 0xA @@ -178454,13 +171588,13 @@ _08057E1C: bl dp01_tbl1_exec_completed b _08057F9E .align 2, 0 -_08057E2C: .4byte 0x0000ffff + .pool _08057E30: movs r0, 0x20 ands r0, r2 cmp r0, 0 beq _08057E60 - ldr r4, _08057E5C + ldr r4, =0x020244b0 ldrb r0, [r7] adds r2, r0, r4 ldrb r1, [r2] @@ -178479,13 +171613,13 @@ _08057E4A: eors r0, r2 b _08057F08 .align 2, 0 -_08057E5C: .4byte 0x020244b0 + .pool _08057E60: movs r0, 0x10 ands r0, r2 cmp r0, 0 beq _08057EA4 - ldr r4, _08057E9C + ldr r4, =0x020244b0 ldrb r0, [r7] adds r3, r0, r4 ldrb r2, [r3] @@ -178496,7 +171630,7 @@ _08057E60: beq _08057E7C b _08057F9E _08057E7C: - ldr r1, _08057EA0 + ldr r1, =0x03005d78 adds r0, r6, 0 eors r0, r2 ldrb r1, [r1] @@ -178512,14 +171646,13 @@ _08057E8A: eors r0, r6 b _08057F08 .align 2, 0 -_08057E9C: .4byte 0x020244b0 -_08057EA0: .4byte 0x03005d78 + .pool _08057EA4: movs r0, 0x40 ands r0, r2 cmp r0, 0 beq _08057ED4 - ldr r4, _08057ED0 + ldr r4, =0x020244b0 ldrb r0, [r7] adds r2, r0, r4 ldrb r1, [r2] @@ -178536,13 +171669,13 @@ _08057EA4: eors r0, r2 b _08057F08 .align 2, 0 -_08057ED0: .4byte 0x020244b0 + .pool _08057ED4: movs r0, 0x80 ands r0, r2 cmp r0, 0 beq _08057F30 - ldr r4, _08057F28 + ldr r4, =0x020244b0 ldrb r0, [r7] adds r3, r0, r4 ldrb r2, [r3] @@ -178551,7 +171684,7 @@ _08057ED4: ands r0, r2 cmp r0, 0 bne _08057F9E - ldr r1, _08057F2C + ldr r1, =0x03005d78 adds r0, r5, 0 eors r0, r2 ldrb r1, [r1] @@ -178576,23 +171709,22 @@ _08057F08: bl sub_8059BB0 b _08057F9E .align 2, 0 -_08057F28: .4byte 0x020244b0 -_08057F2C: .4byte 0x03005d78 + .pool _08057F30: movs r0, 0x4 ands r0, r2 cmp r0, 0 beq _08057F9E - ldr r0, _08057F68 + ldr r0, =0x03005d78 ldrb r0, [r0] cmp r0, 0x1 bls _08057F9E - ldr r0, _08057F6C + ldr r0, =0x02022fec ldr r5, [r0] ands r5, r6 cmp r5, 0 bne _08057F9E - ldr r4, _08057F70 + ldr r4, =0x020244b0 ldrb r0, [r7] adds r0, r4 ldrb r0, [r0] @@ -178603,16 +171735,13 @@ _08057F30: ldrb r0, [r0] cmp r0, 0 beq _08057F78 - ldr r0, _08057F74 + ldr r0, =0x03005d74 strb r5, [r0] b _08057F80 .align 2, 0 -_08057F68: .4byte 0x03005d78 -_08057F6C: .4byte 0x02022fec -_08057F70: .4byte 0x020244b0 -_08057F74: .4byte 0x03005d74 + .pool _08057F78: - ldr r1, _08057FA8 + ldr r1, =0x03005d74 adds r0, 0x1 strb r0, [r1] adds r0, r1, 0 @@ -178620,15 +171749,15 @@ _08057F80: ldrb r0, [r0] movs r1, 0x1B bl battle_menu_cursor_related_2 - ldr r0, _08057FAC + ldr r0, =0x085ccaca movs r1, 0xB bl battle_show_message_maybe - ldr r1, _08057FB0 - ldr r0, _08057FB4 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08057FB8 + ldr r1, =sub_8058138 + 1 _08057F9C: str r1, [r0] _08057F9E: @@ -178638,18 +171767,14 @@ _08057F9E: pop {r0} bx r0 .align 2, 0 -_08057FA8: .4byte 0x03005d74 -_08057FAC: .4byte 0x085ccaca -_08057FB0: .4byte 0x03005d60 -_08057FB4: .4byte 0x02024064 -_08057FB8: .4byte sub_8058138 + 1 + .pool thumb_func_end sub_8057BFC thumb_func_start sub_8057FBC sub_8057FBC: @ 8057FBC push {r4-r7,lr} movs r7, 0 - ldr r4, _08058120 + ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r6, 0x1 adds r0, r6, 0 @@ -178667,10 +171792,10 @@ _08057FD6: beq _08057FF8 movs r0, 0x5 bl audio_play - ldr r1, _08058124 + ldr r1, =0x02022e14 movs r0, 0 strh r0, [r1] - ldr r1, _08058128 + ldr r1, =0x02022e16 movs r2, 0xA0 lsls r2, 1 adds r0, r2, 0 @@ -178682,8 +171807,8 @@ _08057FF8: ands r0, r1 cmp r0, 0 beq _08058038 - ldr r5, _0805812C - ldr r4, _08058130 + ldr r5, =0x020244b0 + ldr r4, =0x02024064 ldrb r0, [r4] adds r2, r0, r5 ldrb r1, [r2] @@ -178707,14 +171832,14 @@ _08057FF8: movs r1, 0 bl battle_menu_cursor_related_2 _08058038: - ldr r0, _08058120 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _08058086 - ldr r5, _0805812C - ldr r4, _08058130 + ldr r5, =0x020244b0 + ldr r4, =0x02024064 ldrb r0, [r4] adds r3, r0, r5 ldrb r2, [r3] @@ -178723,7 +171848,7 @@ _08058038: ands r0, r2 cmp r0, 0 bne _08058086 - ldr r1, _08058134 + ldr r1, =0x03005d78 adds r0, r6, 0 eors r0, r2 ldrb r1, [r1] @@ -178744,14 +171869,14 @@ _08058038: movs r1, 0 bl battle_menu_cursor_related_2 _08058086: - ldr r0, _08058120 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _080580C8 - ldr r5, _0805812C - ldr r4, _08058130 + ldr r5, =0x020244b0 + ldr r4, =0x02024064 ldrb r0, [r4] adds r2, r0, r5 ldrb r1, [r2] @@ -178775,14 +171900,14 @@ _08058086: movs r1, 0 bl battle_menu_cursor_related_2 _080580C8: - ldr r0, _08058120 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _08058116 - ldr r5, _0805812C - ldr r4, _08058130 + ldr r5, =0x020244b0 + ldr r4, =0x02024064 ldrb r0, [r4] adds r3, r0, r5 ldrb r2, [r3] @@ -178791,7 +171916,7 @@ _080580C8: ands r0, r2 cmp r0, 0 bne _08058116 - ldr r1, _08058134 + ldr r1, =0x03005d78 adds r0, r6, 0 eors r0, r2 ldrb r1, [r1] @@ -178817,12 +171942,7 @@ _08058116: pop {r1} bx r1 .align 2, 0 -_08058120: .4byte 0x030022c0 -_08058124: .4byte 0x02022e14 -_08058128: .4byte 0x02022e16 -_0805812C: .4byte 0x020244b0 -_08058130: .4byte 0x02024064 -_08058134: .4byte 0x03005d78 + .pool thumb_func_end sub_8057FBC thumb_func_start sub_8058138 @@ -178833,7 +171953,7 @@ sub_8058138: @ 8058138 mov r5, r8 push {r5-r7} sub sp, 0x24 - ldr r0, _080584D0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x5 ands r0, r1 @@ -178843,13 +171963,13 @@ sub_8058138: @ 8058138 _08058152: movs r0, 0x5 bl audio_play - ldr r0, _080584D4 + ldr r0, =0x020244b0 mov r10, r0 - ldr r1, _080584D8 + ldr r1, =0x02024064 mov r8, r1 ldrb r1, [r1] adds r2, r1, r0 - ldr r5, _080584DC + ldr r5, =0x03005d74 ldrb r0, [r2] ldrb r3, [r5] cmp r0, r3 @@ -178857,7 +171977,7 @@ _08058152: b _080584A8 _08058170: lsls r1, 9 - ldr r0, _080584E0 + ldr r0, =0x02023068 adds r1, r0 mov r9, r1 ldrb r1, [r2] @@ -178908,12 +172028,12 @@ _08058170: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r2, _080584E4 + ldr r2, =0x020242bc adds r6, r0, r2 ldrb r4, [r6, 0x18] lsls r3, r4, 24 lsrs r2, r3, 28 - ldr r0, _080584E8 + ldr r0, =0x0832a328 mov r12, r0 add r1, r10 ldrb r0, [r1] @@ -178936,7 +172056,7 @@ _08058170: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r3, _080584E4 + ldr r3, =0x020242bc adds r1, r3 ldrb r4, [r1, 0x18] lsrs r3, r4, 4 @@ -178956,7 +172076,7 @@ _0805822A: mov r5, sp adds r5, 0x18 str r5, [sp, 0x1C] - ldr r2, _080584EC + ldr r2, =0x02024084 mov r0, r8 ldrb r1, [r0] movs r0, 0x58 @@ -178980,7 +172100,7 @@ _0805824E: adds r6, 0x1 cmp r6, 0x3 ble _0805824E - ldr r1, _080584D4 + ldr r1, =0x020244b0 ldrb r0, [r7] adds r0, r1 ldrb r0, [r0] @@ -178993,7 +172113,7 @@ _0805824E: ldrb r0, [r0] mov r3, sp adds r2, r3, r0 - ldr r1, _080584DC + ldr r1, =0x03005d74 ldrb r0, [r1] add r0, sp ldrb r0, [r0] @@ -179058,7 +172178,7 @@ _080582D8: adds r6, 0x1 cmp r6, 0x3 ble _080582D8 - ldr r2, _080584D8 + ldr r2, =0x02024064 ldrb r1, [r2] movs r0, 0x58 muls r0, r1 @@ -179079,11 +172199,11 @@ _0805831A: str r1, [sp, 0x20] add r3, sp, 0xC mov r10, r3 - ldr r5, _080584F0 + ldr r5, =0x0202406e mov r9, r5 mov r8, r2 movs r7, 0x64 - ldr r5, _080584F4 + ldr r5, =0x020244ec adds r4, r1, 0 _08058332: mov r1, r8 @@ -179114,15 +172234,15 @@ _08058332: adds r6, 0x1 cmp r6, 0x3 ble _08058332 - ldr r1, _080584F0 - ldr r0, _080584D8 + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080584F4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -179144,8 +172264,8 @@ _08058392: adds r6, 0x1 cmp r6, 0x3 ble _08058392 - ldr r4, _080584D4 - ldr r3, _080584D8 + ldr r4, =0x020244b0 + ldr r3, =0x02024064 ldrb r0, [r3] adds r0, r4 ldrb r1, [r0] @@ -179153,7 +172273,7 @@ _08058392: ldr r2, [sp, 0x20] adds r1, r2, r1 ldrh r6, [r1] - ldr r2, _080584DC + ldr r2, =0x03005d74 ldrb r0, [r2] lsls r0, 1 ldr r5, [sp, 0x20] @@ -179215,13 +172335,13 @@ _0805841E: cmp r6, 0x3 ble _0805841E movs r6, 0 - ldr r5, _080584F0 + ldr r5, =0x0202406e mov r10, r5 - ldr r0, _080584D8 + ldr r0, =0x02024064 mov r9, r0 movs r1, 0x64 mov r8, r1 - ldr r7, _080584F4 + ldr r7, =0x020244ec ldr r5, [sp, 0x20] adds r5, 0x8 ldr r4, [sp, 0x20] @@ -179257,31 +172377,31 @@ _0805844A: adds r6, 0x1 cmp r6, 0x3 ble _0805844A - ldr r1, _080584F0 - ldr r0, _080584D8 + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080584F4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 ldr r2, [sp, 0x1C] bl pokemon_setattr _080584A8: - ldr r1, _080584F8 - ldr r2, _080584D8 + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _080584FC + ldr r1, =sub_8057BFC + 1 str r1, [r0] - ldr r3, _080584D4 + ldr r3, =0x020244b0 ldrb r0, [r2] adds r0, r3 - ldr r1, _080584DC + ldr r1, =0x03005d74 ldrb r1, [r1] strb r1, [r0] ldrb r0, [r2] @@ -179291,18 +172411,7 @@ _080584A8: bl battle_menu_cursor_related_2 b _08058532 .align 2, 0 -_080584D0: .4byte 0x030022c0 -_080584D4: .4byte 0x020244b0 -_080584D8: .4byte 0x02024064 -_080584DC: .4byte 0x03005d74 -_080584E0: .4byte 0x02023068 -_080584E4: .4byte 0x020242bc -_080584E8: .4byte 0x0832a328 -_080584EC: .4byte 0x02024084 -_080584F0: .4byte 0x0202406e -_080584F4: .4byte 0x020244ec -_080584F8: .4byte 0x03005d60 -_080584FC: .4byte sub_8057BFC + 1 + .pool _08058500: movs r0, 0x6 ands r0, r1 @@ -179310,21 +172419,21 @@ _08058500: beq _08058554 movs r0, 0x5 bl audio_play - ldr r0, _08058540 + ldr r0, =0x03005d74 ldrb r0, [r0] bl battle_menu_cursor_related - ldr r1, _08058544 - ldr r4, _08058548 + ldr r1, =0x020244b0 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] movs r1, 0 bl battle_menu_cursor_related_2 - ldr r1, _0805854C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08058550 + ldr r1, =sub_8057BFC + 1 str r1, [r0] _08058532: bl sub_8059B18 @@ -179332,17 +172441,13 @@ _08058532: bl sub_8059BB0 b _080586E8 .align 2, 0 -_08058540: .4byte 0x03005d74 -_08058544: .4byte 0x020244b0 -_08058548: .4byte 0x02024064 -_0805854C: .4byte 0x03005d60 -_08058550: .4byte sub_8057BFC + 1 + .pool _08058554: movs r0, 0x20 ands r0, r1 cmp r0, 0 beq _080585A4 - ldr r3, _08058584 + ldr r3, =0x03005d74 ldrb r2, [r3] movs r0, 0x1 ands r0, r2 @@ -179350,8 +172455,8 @@ _08058554: bne _0805856A b _080586E8 _0805856A: - ldr r0, _08058588 - ldr r1, _0805858C + ldr r0, =0x020244b0 + ldr r1, =0x02024064 ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] @@ -179363,25 +172468,23 @@ _08058578: bl battle_menu_cursor_related_2 b _08058596 .align 2, 0 -_08058584: .4byte 0x03005d74 -_08058588: .4byte 0x020244b0 -_0805858C: .4byte 0x02024064 + .pool _08058590: ldrb r0, [r3] bl battle_menu_cursor_related _08058596: - ldr r4, _080585A0 + ldr r4, =0x03005d74 ldrb r0, [r4] movs r1, 0x1 b _0805862C .align 2, 0 -_080585A0: .4byte 0x03005d74 + .pool _080585A4: movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _080585E8 - ldr r3, _080585D8 + ldr r3, =0x03005d74 ldrb r2, [r3] movs r0, 0x1 ands r0, r2 @@ -179389,7 +172492,7 @@ _080585A4: beq _080585BA b _080586E8 _080585BA: - ldr r1, _080585DC + ldr r1, =0x03005d78 movs r0, 0x1 eors r0, r2 ldrb r1, [r1] @@ -179397,8 +172500,8 @@ _080585BA: bcc _080585C8 b _080586E8 _080585C8: - ldr r0, _080585E0 - ldr r1, _080585E4 + ldr r0, =0x020244b0 + ldr r1, =0x02024064 ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] @@ -179406,23 +172509,20 @@ _080585C8: beq _08058578 b _08058590 .align 2, 0 -_080585D8: .4byte 0x03005d74 -_080585DC: .4byte 0x03005d78 -_080585E0: .4byte 0x020244b0 -_080585E4: .4byte 0x02024064 + .pool _080585E8: movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _0805865C - ldr r3, _08058614 + ldr r3, =0x03005d74 ldrb r2, [r3] movs r0, 0x2 ands r0, r2 cmp r0, 0 beq _080586E8 - ldr r0, _08058618 - ldr r1, _0805861C + ldr r0, =0x020244b0 + ldr r1, =0x02024064 ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] @@ -179433,14 +172533,12 @@ _080585E8: bl battle_menu_cursor_related_2 b _08058626 .align 2, 0 -_08058614: .4byte 0x03005d74 -_08058618: .4byte 0x020244b0 -_0805861C: .4byte 0x02024064 + .pool _08058620: ldrb r0, [r3] bl battle_menu_cursor_related _08058626: - ldr r4, _08058650 + ldr r4, =0x03005d74 ldrb r0, [r4] movs r1, 0x2 _0805862C: @@ -179448,8 +172546,8 @@ _0805862C: strb r0, [r4] movs r0, 0x5 bl audio_play - ldr r1, _08058654 - ldr r0, _08058658 + ldr r1, =0x020244b0 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -179461,28 +172559,26 @@ _0805862C: bl battle_menu_cursor_related_2 b _080586E8 .align 2, 0 -_08058650: .4byte 0x03005d74 -_08058654: .4byte 0x020244b0 -_08058658: .4byte 0x02024064 + .pool _0805865C: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _080586E8 - ldr r3, _08058694 + ldr r3, =0x03005d74 ldrb r2, [r3] movs r0, 0x2 ands r0, r2 cmp r0, 0 bne _080586E8 - ldr r1, _08058698 + ldr r1, =0x03005d78 movs r0, 0x2 eors r0, r2 ldrb r1, [r1] cmp r0, r1 bcs _080586E8 - ldr r0, _0805869C - ldr r1, _080586A0 + ldr r0, =0x020244b0 + ldr r1, =0x02024064 ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] @@ -179493,23 +172589,20 @@ _0805865C: bl battle_menu_cursor_related_2 b _080586AA .align 2, 0 -_08058694: .4byte 0x03005d74 -_08058698: .4byte 0x03005d78 -_0805869C: .4byte 0x020244b0 -_080586A0: .4byte 0x02024064 + .pool _080586A4: ldrb r0, [r3] bl battle_menu_cursor_related _080586AA: - ldr r4, _080586D4 + ldr r4, =0x03005d74 ldrb r0, [r4] movs r1, 0x2 eors r0, r1 strb r0, [r4] movs r0, 0x5 bl audio_play - ldr r1, _080586D8 - ldr r0, _080586DC + ldr r1, =0x020244b0 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r4] @@ -179522,9 +172615,7 @@ _080586CA: bl battle_menu_cursor_related_2 b _080586E8 .align 2, 0 -_080586D4: .4byte 0x03005d74 -_080586D8: .4byte 0x020244b0 -_080586DC: .4byte 0x02024064 + .pool _080586E0: ldrb r0, [r4] movs r1, 0x1B @@ -179543,30 +172634,30 @@ _080586E8: thumb_func_start sub_80586F8 sub_80586F8: @ 80586F8 push {lr} - ldr r0, _08058740 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _0805875C - ldr r0, _08058744 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08058798 movs r0, 0x5A bl m4aSongNumStop - ldr r3, _08058748 - ldr r0, _0805874C + ldr r3, =0x030022c0 + ldr r0, =0x00000439 adds r2, r3, r0 ldrb r1, [r2] movs r0, 0x3 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _08058750 + ldr r0, =0x03005d00 ldr r0, [r0] str r0, [r3] - ldr r0, _08058754 + ldr r0, =sub_8038D64 + 1 bl set_callback2 - ldr r0, _08058758 + ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 bne _08058738 @@ -179575,13 +172666,7 @@ _08058738: bl Window_FreeMemory b _08058798 .align 2, 0 -_08058740: .4byte 0x030030fc -_08058744: .4byte 0x03003124 -_08058748: .4byte 0x030022c0 -_0805874C: .4byte 0x00000439 -_08058750: .4byte 0x03005d00 -_08058754: .4byte sub_8038D64 + 1 -_08058758: .4byte 0x0202433a + .pool _0805875C: bl sub_800A520 lsls r0, 24 @@ -179589,20 +172674,20 @@ _0805875C: beq _08058798 movs r0, 0x5A bl m4aSongNumStop - ldr r3, _0805879C - ldr r0, _080587A0 + ldr r3, =0x030022c0 + ldr r0, =0x00000439 adds r2, r3, r0 ldrb r1, [r2] movs r0, 0x3 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _080587A4 + ldr r0, =0x03005d00 ldr r0, [r0] str r0, [r3] - ldr r0, _080587A8 + ldr r0, =sub_8038D64 + 1 bl set_callback2 - ldr r0, _080587AC + ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 bne _08058794 @@ -179613,23 +172698,19 @@ _08058798: pop {r0} bx r0 .align 2, 0 -_0805879C: .4byte 0x030022c0 -_080587A0: .4byte 0x00000439 -_080587A4: .4byte 0x03005d00 -_080587A8: .4byte sub_8038D64 + 1 -_080587AC: .4byte 0x0202433a + .pool thumb_func_end sub_80586F8 thumb_func_start sub_80587B0 sub_80587B0: @ 80587B0 push {lr} - ldr r0, _080587E4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08058832 - ldr r0, _080587E8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -179639,43 +172720,39 @@ sub_80587B0: @ 80587B0 lsls r0, 24 cmp r0, 0 beq _08058832 - ldr r0, _080587EC + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _080587F0 bl sub_800AC34 b _080587F4 .align 2, 0 -_080587E4: .4byte 0x02037fd4 -_080587E8: .4byte 0x02022fec -_080587EC: .4byte 0x030030fc + .pool _080587F0: bl sub_800ADF8 _080587F4: - ldr r1, _08058804 - ldr r0, _08058808 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0805880C + ldr r1, =sub_80586F8 + 1 str r1, [r0] b _08058832 .align 2, 0 -_08058804: .4byte 0x03005d60 -_08058808: .4byte 0x02024064 -_0805880C: .4byte sub_80586F8 + 1 + .pool _08058810: movs r0, 0x5A bl m4aSongNumStop - ldr r2, _08058838 - ldr r0, _0805883C + ldr r2, =0x030022c0 + ldr r0, =0x00000439 adds r3, r2, r0 ldrb r1, [r3] movs r0, 0x3 negs r0, r0 ands r0, r1 strb r0, [r3] - ldr r0, _08058840 + ldr r0, =0x03005d00 ldr r0, [r0] str r0, [r2] ldr r0, [r2, 0x8] @@ -179684,17 +172761,15 @@ _08058832: pop {r0} bx r0 .align 2, 0 -_08058838: .4byte 0x030022c0 -_0805883C: .4byte 0x00000439 -_08058840: .4byte 0x03005d00 + .pool thumb_func_end sub_80587B0 thumb_func_start sub_8058844 sub_8058844: @ 8058844 push {lr} - ldr r2, _0805886C - ldr r1, _08058870 - ldr r0, _08058874 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -179704,7 +172779,7 @@ sub_8058844: @ 8058844 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08058878 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08058868 bl dp01_tbl1_exec_completed @@ -179712,18 +172787,15 @@ _08058868: pop {r0} bx r0 .align 2, 0 -_0805886C: .4byte 0x02020630 -_08058870: .4byte 0x020241e4 -_08058874: .4byte 0x02024064 -_08058878: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8058844 thumb_func_start sub_805887C sub_805887C: @ 805887C push {lr} - ldr r2, _080588A4 - ldr r1, _080588A8 - ldr r0, _080588AC + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -179733,7 +172805,7 @@ sub_805887C: @ 805887C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080588B0 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _080588A0 bl dp01_tbl1_exec_completed @@ -179741,18 +172813,15 @@ _080588A0: pop {r0} bx r0 .align 2, 0 -_080588A4: .4byte 0x02020630 -_080588A8: .4byte 0x020241e4 -_080588AC: .4byte 0x02024064 -_080588B0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_805887C thumb_func_start bx_802F7A0 bx_802F7A0: @ 80588B4 push {r4-r6,lr} - ldr r6, _08058910 - ldr r5, _08058914 - ldr r4, _08058918 + ldr r6, =0x02020630 + ldr r5, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -179763,10 +172832,10 @@ bx_802F7A0: @ 80588B4 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _0805891C + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08058908 - ldr r0, _08058920 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] bl nullsub_25 @@ -179792,19 +172861,15 @@ _08058908: pop {r0} bx r0 .align 2, 0 -_08058910: .4byte 0x02020630 -_08058914: .4byte 0x020241e4 -_08058918: .4byte 0x02024064 -_0805891C: .4byte nullsub_12 + 1 -_08058920: .4byte 0x03005d90 + .pool thumb_func_end bx_802F7A0 thumb_func_start sub_8058924 sub_8058924: @ 8058924 push {r4,lr} - ldr r4, _08058964 + ldr r4, =0x020244d0 ldr r1, [r4] - ldr r3, _08058968 + ldr r3, =0x02024064 ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -179833,8 +172898,7 @@ _0805895C: pop {r0} bx r0 .align 2, 0 -_08058964: .4byte 0x020244d0 -_08058968: .4byte 0x02024064 + .pool thumb_func_end sub_8058924 thumb_func_start sub_805896C @@ -179853,16 +172917,16 @@ sub_805896C: @ 805896C lsls r0, 24 cmp r0, 0 beq _080589D0 - ldr r0, _080589BC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _080589D0 _08058998: - ldr r2, _080589C0 - ldr r1, _080589C4 - ldr r3, _080589C8 + ldr r2, =0x02020630 + ldr r1, =0x03005d70 + ldr r3, =0x02024064 ldrb r0, [r3] adds r0, r1 ldrb r1, [r0] @@ -179872,21 +172936,17 @@ _08058998: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080589CC + ldr r0, =nullsub_12 + 1 mov r10, r3 cmp r1, r0 bne _08058A0A b _08058A0E .align 2, 0 -_080589BC: .4byte 0x02022fec -_080589C0: .4byte 0x02020630 -_080589C4: .4byte 0x03005d70 -_080589C8: .4byte 0x02024064 -_080589CC: .4byte nullsub_12 + 1 + .pool _080589D0: - ldr r3, _08058B18 - ldr r6, _08058B1C - ldr r2, _08058B20 + ldr r3, =0x02020630 + ldr r6, =0x03005d70 + ldr r2, =0x02024064 ldrb r4, [r2] adds r0, r4, r6 ldrb r1, [r0] @@ -179897,7 +172957,7 @@ _080589D0: adds r5, 0x1C adds r0, r5 ldr r3, [r0] - ldr r0, _08058B24 + ldr r0, =nullsub_12 + 1 mov r10, r2 cmp r3, r0 bne _08058A0A @@ -179917,7 +172977,7 @@ _08058A0A: cmp r7, 0 beq _08058B08 _08058A0E: - ldr r0, _08058B28 + ldr r0, =0x020244d0 mov r9, r0 ldr r0, [r0] mov r6, r10 @@ -179991,19 +173051,19 @@ _08058A0E: ldrb r1, [r0, 0x1] ands r4, r1 strb r4, [r0, 0x1] - ldr r4, _08058B2C + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - ldr r7, _08058B30 + ldr r7, =0x0202406e ldrb r1, [r6] lsls r0, r1, 1 adds r0, r7 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _08058B34 + ldr r4, =0x020244ec adds r0, r4 bl sub_805E990 bl battle_type_is_double @@ -180031,12 +173091,12 @@ _08058AE4: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, _08058B38 + ldr r1, =0x03005d60 mov r2, r10 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _08058B3C + ldr r1, =sub_8058924 + 1 str r1, [r0] _08058B08: pop {r3-r5} @@ -180047,16 +173107,7 @@ _08058B08: pop {r0} bx r0 .align 2, 0 -_08058B18: .4byte 0x02020630 -_08058B1C: .4byte 0x03005d70 -_08058B20: .4byte 0x02024064 -_08058B24: .4byte nullsub_12 + 1 -_08058B28: .4byte 0x020244d0 -_08058B2C: .4byte 0x000027f9 -_08058B30: .4byte 0x0202406e -_08058B34: .4byte 0x020244ec -_08058B38: .4byte 0x03005d60 -_08058B3C: .4byte sub_8058924 + 1 + .pool thumb_func_end sub_805896C thumb_func_start sub_8058B40 @@ -180068,9 +173119,9 @@ sub_8058B40: @ 8058B40 movs r0, 0 mov r9, r0 mov r8, r0 - ldr r4, _08058CEC + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r7, _08058CF0 + ldr r7, =0x02024064 ldrb r2, [r7] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -180083,12 +173134,12 @@ sub_8058B40: @ 8058B40 ands r0, r1 cmp r0, 0 bne _08058B80 - ldr r0, _08058CF4 + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08058CF8 + ldr r0, =0x020244ec adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 @@ -180108,12 +173159,12 @@ _08058B80: ands r0, r1 cmp r0, 0 bne _08058BB2 - ldr r0, _08058CF4 + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08058CF8 + ldr r0, =0x020244ec adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 @@ -180151,25 +173202,25 @@ _08058BB2: lsls r0, 24 cmp r0, 0 beq _08058C38 - ldr r0, _08058CFC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _08058C38 - ldr r4, _08058D00 + ldr r4, =0x03005d70 ldrb r0, [r7] adds r1, r6, 0 eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _08058CF4 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08058CF8 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -180182,18 +173233,18 @@ _08058BB2: ldrb r0, [r0] bl sub_80729D0 _08058C38: - ldr r5, _08058D00 - ldr r4, _08058CF0 + ldr r5, =0x03005d70 + ldr r4, =0x02024064 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _08058CF4 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08058CF8 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -180204,9 +173255,9 @@ _08058C38: ldrb r0, [r0] bl sub_80729D0 _08058C68: - ldr r0, _08058CEC + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08058CF0 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -180218,9 +173269,9 @@ _08058C68: orrs r1, r2 strb r1, [r0, 0x1] _08058C82: - ldr r5, _08058CEC + ldr r5, =0x020244d0 ldr r0, [r5] - ldr r4, _08058CF0 + ldr r4, =0x02024064 ldrb r2, [r4] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -180259,33 +173310,27 @@ _08058C82: ands r0, r1 cmp r0, 0 bne _08058D14 - ldr r0, _08058CFC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 cmp r0, 0x42 bne _08058D08 - ldr r0, _08058D04 + ldr r0, =0x03007420 bl m4aMPlayContinue b _08058D14 .align 2, 0 -_08058CEC: .4byte 0x020244d0 -_08058CF0: .4byte 0x02024064 -_08058CF4: .4byte 0x0202406e -_08058CF8: .4byte 0x020244ec -_08058CFC: .4byte 0x02022fec -_08058D00: .4byte 0x03005d70 -_08058D04: .4byte 0x03007420 + .pool _08058D08: - ldr r0, _08058D88 - ldr r1, _08058D8C + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl _08058D14: - ldr r0, _08058D90 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08058D94 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -180307,16 +173352,16 @@ _08058D32: lsls r0, 24 cmp r0, 0 beq _08058DAC - ldr r0, _08058D98 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _08058DAC _08058D52: - ldr r2, _08058D9C - ldr r0, _08058DA0 - ldr r1, _08058D94 + ldr r2, =0x02020630 + ldr r0, =0x03005d7c + ldr r1, =0x02024064 ldrb r4, [r1] adds r0, r4, r0 ldrb r1, [r0] @@ -180326,10 +173371,10 @@ _08058D52: adds r2, 0x1C adds r0, r2 ldr r3, [r0] - ldr r0, _08058DA4 + ldr r0, =nullsub_12 + 1 cmp r3, r0 bne _08058E0A - ldr r0, _08058DA8 + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -180341,19 +173386,11 @@ _08058D52: bne _08058E0A b _08058E06 .align 2, 0 -_08058D88: .4byte 0x03007420 -_08058D8C: .4byte 0x0000ffff -_08058D90: .4byte 0x020244d0 -_08058D94: .4byte 0x02024064 -_08058D98: .4byte 0x02022fec -_08058D9C: .4byte 0x02020630 -_08058DA0: .4byte 0x03005d7c -_08058DA4: .4byte nullsub_12 + 1 -_08058DA8: .4byte 0x020241e4 + .pool _08058DAC: - ldr r2, _08058EB8 - ldr r7, _08058EBC - ldr r0, _08058EC0 + ldr r2, =0x02020630 + ldr r7, =0x03005d7c + ldr r0, =0x02024064 ldrb r3, [r0] adds r0, r3, r7 ldrb r1, [r0] @@ -180363,10 +173400,10 @@ _08058DAC: adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, _08058EC4 + ldr r0, =nullsub_12 + 1 cmp r4, r0 bne _08058E0A - ldr r6, _08058EC8 + ldr r6, =0x020241e4 adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -180410,14 +173447,14 @@ _08058E0A: lsls r0, 24 cmp r0, 0 beq _08058E48 - ldr r0, _08058ECC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _08058E48 - ldr r2, _08058EBC - ldr r0, _08058EC0 + ldr r2, =0x03005d7c + ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -180426,22 +173463,22 @@ _08058E0A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08058EB8 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles _08058E48: - ldr r1, _08058EBC - ldr r4, _08058EC0 + ldr r1, =0x03005d7c + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08058EB8 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles - ldr r3, _08058ED0 + ldr r3, =0x020244d0 ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r1, [r2, 0x9] @@ -180472,11 +173509,11 @@ _08058E48: movs r0, 0x7F ands r0, r2 strb r0, [r1, 0x1] - ldr r1, _08058ED4 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08058ED8 + ldr r1, =sub_805896C + 1 str r1, [r0] _08058EAA: pop {r3,r4} @@ -180486,23 +173523,15 @@ _08058EAA: pop {r0} bx r0 .align 2, 0 -_08058EB8: .4byte 0x02020630 -_08058EBC: .4byte 0x03005d7c -_08058EC0: .4byte 0x02024064 -_08058EC4: .4byte nullsub_12 + 1 -_08058EC8: .4byte 0x020241e4 -_08058ECC: .4byte 0x02022fec -_08058ED0: .4byte 0x020244d0 -_08058ED4: .4byte 0x03005d60 -_08058ED8: .4byte sub_805896C + 1 + .pool thumb_func_end sub_8058B40 thumb_func_start sub_8058EDC sub_8058EDC: @ 8058EDC push {r4-r6,lr} - ldr r2, _08058F9C - ldr r0, _08058FA0 - ldr r6, _08058FA4 + ldr r2, =0x02020630 + ldr r0, =0x03005d70 + ldr r6, =0x02024064 ldrb r3, [r6] adds r0, r3, r0 ldrb r1, [r0] @@ -180512,10 +173541,10 @@ sub_8058EDC: @ 8058EDC adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, _08058FA8 + ldr r0, =nullsub_12 + 1 cmp r4, r0 bne _08058F94 - ldr r5, _08058FAC + ldr r5, =0x020244d0 ldr r0, [r5] ldr r1, [r0, 0x4] lsls r0, r3, 1 @@ -180527,7 +173556,7 @@ sub_8058EDC: @ 8058EDC ands r0, r1 cmp r0, 0 beq _08058F94 - ldr r0, _08058FB0 + ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -180562,7 +173591,7 @@ sub_8058EDC: @ 8058EDC negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r4, _08058FB4 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -180582,34 +173611,26 @@ sub_8058EDC: @ 8058EDC movs r3, 0x6 bl move_anim_start_t4 _08058F88: - ldr r0, _08058FB8 + ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, _08058FBC + ldr r0, =sub_8058FC0 + 1 str r0, [r1] _08058F94: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08058F9C: .4byte 0x02020630 -_08058FA0: .4byte 0x03005d70 -_08058FA4: .4byte 0x02024064 -_08058FA8: .4byte nullsub_12 + 1 -_08058FAC: .4byte 0x020244d0 -_08058FB0: .4byte 0x020241e4 -_08058FB4: .4byte 0x000027f9 -_08058FB8: .4byte 0x03005d60 -_08058FBC: .4byte sub_8058FC0 + 1 + .pool thumb_func_end sub_8058EDC thumb_func_start sub_8058FC0 sub_8058FC0: @ 8058FC0 push {r4,lr} - ldr r0, _08059014 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r4, _08059018 + ldr r4, =0x02024064 ldrb r1, [r4] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -180625,19 +173646,19 @@ sub_8058FC0: @ 8058FC0 lsls r0, 24 cmp r0, 0 bne _0805900E - ldr r0, _0805901C - ldr r1, _08059020 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl - ldr r2, _08059024 + ldr r2, =0x0202406e ldrb r1, [r4] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _08059028 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 bl dp01_tbl1_exec_completed @@ -180646,20 +173667,15 @@ _0805900E: pop {r0} bx r0 .align 2, 0 -_08059014: .4byte 0x020244d0 -_08059018: .4byte 0x02024064 -_0805901C: .4byte 0x03007420 -_08059020: .4byte 0x0000ffff -_08059024: .4byte 0x0202406e -_08059028: .4byte 0x020244ec + .pool thumb_func_end sub_8058FC0 thumb_func_start sub_805902C sub_805902C: @ 805902C push {r4-r6,lr} - ldr r6, _080590D8 + ldr r6, =0x020244d0 ldr r0, [r6] - ldr r5, _080590DC + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -180671,18 +173687,18 @@ sub_805902C: @ 805902C ands r0, r1 cmp r0, 0 bne _0805905E - ldr r0, _080590E0 + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080590E4 + ldr r0, =0x020244ec adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 _0805905E: - ldr r4, _080590E8 - ldr r0, _080590EC + ldr r4, =0x02020630 + ldr r0, =0x03005d7c ldrb r2, [r5] adds r0, r2, r0 ldrb r1, [r0] @@ -180693,7 +173709,7 @@ _0805905E: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _080590F0 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _080590D2 ldr r0, [r6] @@ -180709,17 +173725,17 @@ _0805905E: bne _080590D2 adds r0, r3, r4 bl obj_delete_and_free_tiles - ldr r4, _080590F4 + ldr r4, =0x03005d70 ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _080590E0 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080590E4 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -180729,27 +173745,18 @@ _0805905E: adds r0, r4 ldrb r0, [r0] bl sub_80729D0 - ldr r1, _080590F8 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _080590FC + ldr r1, =sub_8058EDC + 1 str r1, [r0] _080590D2: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080590D8: .4byte 0x020244d0 -_080590DC: .4byte 0x02024064 -_080590E0: .4byte 0x0202406e -_080590E4: .4byte 0x020244ec -_080590E8: .4byte 0x02020630 -_080590EC: .4byte 0x03005d7c -_080590F0: .4byte nullsub_12 + 1 -_080590F4: .4byte 0x03005d70 -_080590F8: .4byte 0x03005d60 -_080590FC: .4byte sub_8058EDC + 1 + .pool thumb_func_end sub_805902C thumb_func_start c3_0802FDF4 @@ -180761,8 +173768,8 @@ c3_0802FDF4: @ 8059100 lsls r0, 24 cmp r0, 0 bne _08059122 - ldr r0, _08059128 - ldr r1, _0805912C + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl @@ -180773,16 +173780,15 @@ _08059122: pop {r0} bx r0 .align 2, 0 -_08059128: .4byte 0x03007420 -_0805912C: .4byte 0x0000ffff + .pool thumb_func_end c3_0802FDF4 thumb_func_start bx_t1_healthbar_update bx_t1_healthbar_update: @ 8059130 push {r4-r6,lr} - ldr r5, _08059170 + ldr r5, =0x02024064 ldrb r0, [r5] - ldr r6, _08059174 + ldr r6, =0x03005d70 adds r1, r0, r6 ldrb r1, [r1] movs r2, 0 @@ -180808,17 +173814,16 @@ bx_t1_healthbar_update: @ 8059130 bl heathbar_draw_hp b _08059192 .align 2, 0 -_08059170: .4byte 0x02024064 -_08059174: .4byte 0x03005d70 + .pool _08059178: - ldr r2, _08059198 + ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0805919C + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 bl dp01_tbl1_exec_completed @@ -180827,8 +173832,7 @@ _08059192: pop {r0} bx r0 .align 2, 0 -_08059198: .4byte 0x0202406e -_0805919C: .4byte 0x020244ec + .pool thumb_func_end bx_t1_healthbar_update thumb_func_start sub_80591A0 @@ -180856,7 +173860,7 @@ sub_80591B8: @ 80591B8 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _080592B8 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r9 lsls r0, 3 @@ -180874,7 +173878,7 @@ sub_80591B8: @ 80591B8 lsrs r0, 24 cmp r0, 0x1 beq _080591FE - ldr r1, _080592BC + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -180885,7 +173889,7 @@ _080591FE: movs r0, 0x64 mov r1, r10 muls r1, r0 - ldr r0, _080592C0 + ldr r0, =0x020244ec adds r6, r1, r0 adds r0, r6, 0 movs r1, 0xB @@ -180903,10 +173907,10 @@ _080591FE: movs r1, 0x19 bl pokemon_getattr str r0, [sp, 0x4] - ldr r3, _080592C4 + ldr r3, =0x0831f72c adds r4, 0x1 lsls r4, 2 - ldr r2, _080592C8 + ldr r2, =0x083203cc lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -180937,7 +173941,7 @@ _080591FE: subs r2, r0 ldr r0, [sp, 0xC] subs r2, r0, r2 - ldr r4, _080592CC + ldr r4, =0x02024064 ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -180951,7 +173955,7 @@ _080591FE: lsrs r0, 24 cmp r0, 0x1 bne _080592D4 - ldr r2, _080592BC + ldr r2, =0x0202406e lsls r0, r7, 1 adds r0, r2 mov r1, r10 @@ -180966,48 +173970,40 @@ _080591FE: cmp r1, r0 bne _080592D4 _080592B2: - ldr r0, _080592D0 + ldr r0, =sub_8059544 + 1 b _08059316 .align 2, 0 -_080592B8: .4byte 0x03005e00 -_080592BC: .4byte 0x0202406e -_080592C0: .4byte 0x020244ec -_080592C4: .4byte 0x0831f72c -_080592C8: .4byte 0x083203cc -_080592CC: .4byte 0x02024064 -_080592D0: .4byte sub_8059544 + 1 + .pool _080592D4: - ldr r0, _080592E4 + ldr r0, =0x03005e00 mov r2, r9 lsls r1, r2, 2 add r1, r9 lsls r1, 3 adds r1, r0 - ldr r0, _080592E8 + ldr r0, =sub_805965C + 1 b _08059318 .align 2, 0 -_080592E4: .4byte 0x03005e00 -_080592E8: .4byte sub_805965C + 1 + .pool _080592EC: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r6, 0 movs r1, 0x19 bl pokemon_setattr - ldr r1, _0805930C + ldr r1, =0x03005d60 ldr r3, [sp, 0x8] lsls r0, r3, 2 adds r0, r1 - ldr r1, _08059310 + ldr r1, =sub_80591A0 + 1 str r1, [r0] mov r0, r9 bl remove_task b _0805931A .align 2, 0 -_0805930C: .4byte 0x03005d60 -_08059310: .4byte sub_80591A0 + 1 + .pool _08059314: - ldr r0, _0805932C + ldr r0, =sub_8059330 + 1 _08059316: mov r1, r8 _08059318: @@ -181022,7 +174018,7 @@ _0805931A: pop {r0} bx r0 .align 2, 0 -_0805932C: .4byte sub_8059330 + 1 + .pool thumb_func_end sub_80591B8 thumb_func_start sub_8059330 @@ -181035,7 +174031,7 @@ sub_8059330: @ 8059330 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r1, _080593E8 + ldr r1, =0x03005e00 lsls r2, r0, 2 mov r8, r2 add r8, r0 @@ -181054,7 +174050,7 @@ sub_8059330: @ 8059330 movs r0, 0x64 adds r6, r1, 0 muls r6, r0 - ldr r0, _080593EC + ldr r0, =0x020244ec adds r6, r0 adds r0, r6, 0 movs r1, 0x38 @@ -181072,9 +174068,9 @@ sub_8059330: @ 8059330 movs r1, 0x19 bl pokemon_getattr adds r3, r0, 0 - ldr r6, _080593F0 + ldr r6, =0x0831f72c lsls r1, r4, 2 - ldr r2, _080593F4 + ldr r2, =0x083203cc lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -181093,7 +174089,7 @@ sub_8059330: @ 8059330 adds r4, r6 ldr r2, [r4] subs r2, r1 - ldr r0, _080593F8 + ldr r0, =0x03005d70 add r0, r10 ldrb r1, [r0] mov r0, r9 @@ -181103,7 +174099,7 @@ sub_8059330: @ 8059330 bl sub_807294C movs r0, 0x21 bl audio_play - ldr r0, _080593FC + ldr r0, =sub_8059400 + 1 mov r1, r8 str r0, [r1] add sp, 0x4 @@ -181115,12 +174111,7 @@ sub_8059330: @ 8059330 pop {r0} bx r0 .align 2, 0 -_080593E8: .4byte 0x03005e00 -_080593EC: .4byte 0x020244ec -_080593F0: .4byte 0x0831f72c -_080593F4: .4byte 0x083203cc -_080593F8: .4byte 0x03005d70 -_080593FC: .4byte sub_8059400 + 1 + .pool thumb_func_end sub_8059330 thumb_func_start sub_8059400 @@ -181134,7 +174125,7 @@ sub_8059400: @ 8059400 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _0805942C + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -181148,14 +174139,14 @@ sub_8059400: @ 8059400 strh r0, [r6, 0x1C] b _0805952C .align 2, 0 -_0805942C: .4byte 0x03005e00 + .pool _08059430: ldrb r0, [r6, 0x8] mov r9, r0 ldrh r2, [r6, 0xA] mov r10, r2 ldrb r7, [r6, 0xC] - ldr r5, _080594F8 + ldr r5, =0x03005d70 adds r5, r7, r5 ldrb r1, [r5] adds r0, r7, 0 @@ -181178,7 +174169,7 @@ _08059430: movs r0, 0x64 mov r1, r9 muls r1, r0 - ldr r0, _080594FC + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x38 @@ -181195,10 +174186,10 @@ _08059430: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - ldr r3, _08059500 + ldr r3, =0x0831f72c adds r4, 0x1 lsls r4, 2 - ldr r2, _08059504 + ldr r2, =0x083203cc lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -181229,7 +174220,7 @@ _08059430: ldrh r0, [r0] subs r2, r0 subs r2, r4, r2 - ldr r4, _08059508 + ldr r4, =0x02024064 ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -181238,26 +174229,21 @@ _08059430: movs r1, 0xB bl dp01_build_cmdbuf_x21_a_bb strb r5, [r4] - ldr r0, _0805950C + ldr r0, =sub_8059544 + 1 str r0, [r6] b _0805952C .align 2, 0 -_080594F8: .4byte 0x03005d70 -_080594FC: .4byte 0x020244ec -_08059500: .4byte 0x0831f72c -_08059504: .4byte 0x083203cc -_08059508: .4byte 0x02024064 -_0805950C: .4byte sub_8059544 + 1 + .pool _08059510: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r5, 0 movs r1, 0x19 bl pokemon_setattr - ldr r1, _0805953C + ldr r1, =0x03005d60 lsls r0, r7, 2 adds r0, r1 - ldr r1, _08059540 + ldr r1, =sub_80591A0 + 1 str r1, [r0] mov r0, r8 bl remove_task @@ -181271,8 +174257,7 @@ _0805952C: pop {r0} bx r0 .align 2, 0 -_0805953C: .4byte 0x03005d60 -_08059540: .4byte sub_80591A0 + 1 + .pool thumb_func_end sub_8059400 thumb_func_start sub_8059544 @@ -181280,7 +174265,7 @@ sub_8059544: @ 8059544 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08059598 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -181292,7 +174277,7 @@ sub_8059544: @ 8059544 lsrs r0, 24 cmp r0, 0x1 bne _08059578 - ldr r1, _0805959C + ldr r1, =0x0202406e movs r0, 0x2 adds r2, r4, 0 eors r2, r0 @@ -181308,20 +174293,18 @@ _08059578: adds r2, r4, 0 movs r3, 0 bl move_anim_start_t4 - ldr r0, _08059598 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _080595A0 + ldr r0, =sub_80595A4 + 1 str r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08059598: .4byte 0x03005e00 -_0805959C: .4byte 0x0202406e -_080595A0: .4byte sub_80595A4 + 1 + .pool thumb_func_end sub_8059544 thumb_func_start sub_80595A4 @@ -181329,13 +174312,13 @@ sub_80595A4: @ 80595A4 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08059610 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r2, r0, r1 ldrb r5, [r2, 0xC] - ldr r0, _08059614 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r5, 1 @@ -181351,7 +174334,7 @@ sub_80595A4: @ 80595A4 movs r0, 0x64 adds r1, r4, 0 muls r1, r0 - ldr r0, _08059618 + ldr r0, =0x020244ec adds r7, r1, r0 adds r0, r7, 0 movs r1, 0x38 @@ -181361,7 +174344,7 @@ sub_80595A4: @ 80595A4 lsrs r0, 24 cmp r0, 0x1 bne _08059624 - ldr r1, _0805961C + ldr r1, =0x0202406e movs r0, 0x2 adds r2, r5, 0 eors r2, r0 @@ -181370,7 +174353,7 @@ sub_80595A4: @ 80595A4 ldrh r0, [r0] cmp r4, r0 bne _08059624 - ldr r0, _08059620 + ldr r0, =0x03005d70 adds r0, r2, r0 ldrb r0, [r0] adds r1, r7, 0 @@ -181378,38 +174361,31 @@ sub_80595A4: @ 80595A4 bl healthbar_draw_field_maybe b _08059638 .align 2, 0 -_08059610: .4byte 0x03005e00 -_08059614: .4byte 0x020244d0 -_08059618: .4byte 0x020244ec -_0805961C: .4byte 0x0202406e -_08059620: .4byte 0x03005d70 + .pool _08059624: - ldr r0, _0805964C + ldr r0, =0x03005d70 adds r0, r5, r0 ldrb r0, [r0] movs r1, 0x64 muls r1, r4 - ldr r2, _08059650 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe _08059638: - ldr r0, _08059654 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _08059658 + ldr r0, =sub_805965C + 1 str r0, [r1] _08059646: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0805964C: .4byte 0x03005d70 -_08059650: .4byte 0x020244ec -_08059654: .4byte 0x03005e00 -_08059658: .4byte sub_805965C + 1 + .pool thumb_func_end sub_80595A4 thumb_func_start sub_805965C @@ -181418,7 +174394,7 @@ sub_805965C: @ 805965C adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _08059698 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -181426,15 +174402,15 @@ sub_805965C: @ 805965C ldrb r1, [r4, 0x8] movs r0, 0x64 muls r0, r1 - ldr r1, _0805969C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 bl pokemon_getattr ldrb r0, [r4, 0xC] - ldr r1, _080596A0 + ldr r1, =0x03005d60 lsls r0, 2 adds r0, r1 - ldr r1, _080596A4 + ldr r1, =sub_80591A0 + 1 str r1, [r0] adds r0, r5, 0 bl remove_task @@ -181442,18 +174418,15 @@ sub_805965C: @ 805965C pop {r0} bx r0 .align 2, 0 -_08059698: .4byte 0x03005e00 -_0805969C: .4byte 0x020244ec -_080596A0: .4byte 0x03005d60 -_080596A4: .4byte sub_80591A0 + 1 + .pool thumb_func_end sub_805965C thumb_func_start sub_80596A8 sub_80596A8: @ 80596A8 push {r4-r6,lr} - ldr r6, _0805972C - ldr r5, _08059730 - ldr r4, _08059734 + ldr r6, =0x02020630 + ldr r5, =0x020241e4 + ldr r4, =0x02024064 ldrb r2, [r4] adds r0, r2, r5 ldrb r1, [r0] @@ -181468,13 +174441,13 @@ sub_80596A8: @ 80596A8 adds r1, r0 cmp r1, 0xA0 ble _08059724 - ldr r1, _08059738 + ldr r1, =0x0202406e lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0805973C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -181500,7 +174473,7 @@ sub_80596A8: @ 80596A8 lsls r0, 2 adds r0, r6 bl obj_delete_and_free_tiles - ldr r1, _08059740 + ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -181511,20 +174484,15 @@ _08059724: pop {r0} bx r0 .align 2, 0 -_0805972C: .4byte 0x02020630 -_08059730: .4byte 0x020241e4 -_08059734: .4byte 0x02024064 -_08059738: .4byte 0x0202406e -_0805973C: .4byte 0x020244ec -_08059740: .4byte 0x03005d70 + .pool thumb_func_end sub_80596A8 thumb_func_start sub_8059744 sub_8059744: @ 8059744 push {r4-r6,lr} - ldr r0, _080597A0 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r6, _080597A4 + ldr r6, =0x02024064 ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -181536,13 +174504,13 @@ sub_8059744: @ 8059744 ands r0, r1 cmp r0, 0 bne _08059798 - ldr r5, _080597A8 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080597AC + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -181553,7 +174521,7 @@ sub_8059744: @ 8059744 lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r1, _080597B0 + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -181564,11 +174532,7 @@ _08059798: pop {r0} bx r0 .align 2, 0 -_080597A0: .4byte 0x020244d0 -_080597A4: .4byte 0x02024064 -_080597A8: .4byte 0x020241e4 -_080597AC: .4byte 0x02020630 -_080597B0: .4byte 0x03005d70 + .pool thumb_func_end sub_8059744 thumb_func_start sub_80597B4 @@ -181588,21 +174552,21 @@ _080597C6: thumb_func_start sub_80597CC sub_80597CC: @ 80597CC push {r4,lr} - ldr r0, _08059810 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0805980A - ldr r1, _08059814 - ldr r2, _08059818 + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _0805981C + ldr r1, =sub_8059828 + 1 str r1, [r0] - ldr r3, _08059820 - ldr r1, _08059824 + ldr r3, =0x03005e00 + ldr r1, =0x03005d7c ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] @@ -181620,53 +174584,43 @@ _0805980A: pop {r0} bx r0 .align 2, 0 -_08059810: .4byte 0x02037fd4 -_08059814: .4byte 0x03005d60 -_08059818: .4byte 0x02024064 -_0805981C: .4byte sub_8059828 + 1 -_08059820: .4byte 0x03005e00 -_08059824: .4byte 0x03005d7c + .pool thumb_func_end sub_80597CC thumb_func_start sub_8059828 sub_8059828: @ 8059828 push {lr} - ldr r0, _08059858 + ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, _0805985C + ldr r0, =sub_8038420 + 1 cmp r1, r0 bne _08059898 - ldr r0, _08059860 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08059898 - ldr r0, _08059864 + ldr r0, =0x0203cee8 ldrb r0, [r0] cmp r0, 0x1 bne _08059870 - ldr r0, _08059868 + ldr r0, =0x0203cee9 ldrb r1, [r0] - ldr r2, _0805986C + ldr r2, =0x0203cf00 movs r0, 0x1 bl dp01_build_cmdbuf_x22_a_three_bytes b _0805987A .align 2, 0 -_08059858: .4byte 0x030022c0 -_0805985C: .4byte sub_8038420 + 1 -_08059860: .4byte 0x02037fd4 -_08059864: .4byte 0x0203cee8 -_08059868: .4byte 0x0203cee9 -_0805986C: .4byte 0x0203cf00 + .pool _08059870: movs r0, 0x1 movs r1, 0x6 movs r2, 0 bl dp01_build_cmdbuf_x22_a_three_bytes _0805987A: - ldr r1, _0805989C - ldr r0, _080598A0 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -181683,25 +174637,24 @@ _08059898: pop {r0} bx r0 .align 2, 0 -_0805989C: .4byte 0x02023064 -_080598A0: .4byte 0x02024064 + .pool thumb_func_end sub_8059828 thumb_func_start sub_80598A4 sub_80598A4: @ 80598A4 push {lr} - ldr r0, _080598D0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080598CC - ldr r1, _080598D4 - ldr r0, _080598D8 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _080598DC + ldr r1, =sub_80598E0 + 1 str r1, [r0] bl nullsub_35 bl Window_FreeMemory @@ -181710,27 +174663,24 @@ _080598CC: pop {r0} bx r0 .align 2, 0 -_080598D0: .4byte 0x02037fd4 -_080598D4: .4byte 0x03005d60 -_080598D8: .4byte 0x02024064 -_080598DC: .4byte sub_80598E0 + 1 + .pool thumb_func_end sub_80598A4 thumb_func_start sub_80598E0 sub_80598E0: @ 80598E0 push {lr} - ldr r0, _0805990C + ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, _08059910 + ldr r0, =sub_8038420 + 1 cmp r1, r0 bne _08059906 - ldr r0, _08059914 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08059906 - ldr r0, _08059918 + ldr r0, =0x0203ce7c ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 @@ -181739,22 +174689,19 @@ _08059906: pop {r0} bx r0 .align 2, 0 -_0805990C: .4byte 0x030022c0 -_08059910: .4byte sub_8038420 + 1 -_08059914: .4byte 0x02037fd4 -_08059918: .4byte 0x0203ce7c + .pool thumb_func_end sub_80598E0 thumb_func_start bx_wait_t1 bx_wait_t1: @ 805991C push {lr} - ldr r0, _0805994C + ldr r0, =0x020244b9 ldrb r0, [r0] cmp r0, 0 beq _08059942 - ldr r0, _08059950 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08059954 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -181772,20 +174719,18 @@ _08059946: pop {r0} bx r0 .align 2, 0 -_0805994C: .4byte 0x020244b9 -_08059950: .4byte 0x020244d0 -_08059954: .4byte 0x02024064 + .pool thumb_func_end bx_wait_t1 thumb_func_start bx_blink_t1 bx_blink_t1: @ 8059958 push {r4,lr} - ldr r1, _08059994 - ldr r0, _08059998 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _0805999C + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -181803,15 +174748,12 @@ bx_blink_t1: @ 8059958 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, _080599A0 + ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl1_exec_completed b _080599CE .align 2, 0 -_08059994: .4byte 0x020241e4 -_08059998: .4byte 0x02024064 -_0805999C: .4byte 0x02020630 -_080599A0: .4byte 0x020244b9 + .pool _080599A4: ldrh r0, [r4, 0x30] movs r1, 0x3 @@ -181845,13 +174787,13 @@ _080599CE: sub_80599D4: @ 80599D4 push {r4,lr} sub sp, 0x4 - ldr r0, _08059A64 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _08059A02 - ldr r4, _08059A68 + ldr r4, =0x03005d74 ldrb r0, [r4] cmp r0, 0 beq _08059A02 @@ -181864,13 +174806,13 @@ sub_80599D4: @ 80599D4 movs r0, 0 bl sub_8056B74 _08059A02: - ldr r0, _08059A64 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _08059A2C - ldr r4, _08059A68 + ldr r4, =0x03005d74 ldrb r0, [r4] cmp r0, 0 bne _08059A2C @@ -181883,7 +174825,7 @@ _08059A02: movs r0, 0x1 bl sub_8056B74 _08059A2C: - ldr r0, _08059A64 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 @@ -181898,7 +174840,7 @@ _08059A2C: bl sub_8056A3C movs r0, 0x5 bl audio_play - ldr r0, _08059A68 + ldr r0, =0x03005d74 ldrb r0, [r0] cmp r0, 0 beq _08059A6C @@ -181908,8 +174850,7 @@ _08059A2C: bl dp01_build_cmdbuf_x21_a_bb b _08059A76 .align 2, 0 -_08059A64: .4byte 0x030022c0 -_08059A68: .4byte 0x03005d74 + .pool _08059A6C: movs r0, 0x1 movs r1, 0xD @@ -181918,7 +174859,7 @@ _08059A6C: _08059A76: bl dp01_tbl1_exec_completed _08059A7A: - ldr r0, _08059AA8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -181940,21 +174881,21 @@ _08059AA0: pop {r0} bx r0 .align 2, 0 -_08059AA8: .4byte 0x030022c0 + .pool thumb_func_end sub_80599D4 thumb_func_start sub_8059AAC sub_8059AAC: @ 8059AAC push {r4-r7,lr} - ldr r0, _08059B04 + ldr r0, =0x02024064 ldrb r1, [r0] lsls r1, 9 - ldr r3, _08059B08 - ldr r2, _08059B0C + ldr r3, =0x02023068 + ldr r2, =0x03005d78 movs r0, 0 strb r0, [r2] movs r5, 0 - ldr r7, _08059B10 + ldr r7, =0x02022e2c adds r4, r1, r3 adds r6, r2, 0 _08059AC4: @@ -181964,7 +174905,7 @@ _08059AC4: ldrh r1, [r4] movs r0, 0xD muls r1, r0 - ldr r0, _08059B14 + ldr r0, =0x0831977c adds r1, r0 adds r0, r7, 0 bl gf_strcpy @@ -181988,18 +174929,14 @@ _08059AF4: pop {r0} bx r0 .align 2, 0 -_08059B04: .4byte 0x02024064 -_08059B08: .4byte 0x02023068 -_08059B0C: .4byte 0x03005d78 -_08059B10: .4byte 0x02022e2c -_08059B14: .4byte 0x0831977c + .pool thumb_func_end sub_8059AAC thumb_func_start sub_8059B18 sub_8059B18: @ 8059B18 push {r4,lr} - ldr r4, _08059B34 - ldr r1, _08059B38 + ldr r4, =0x02022e2c + ldr r1, =0x085cca6f adds r0, r4, 0 bl gf_strcpy adds r0, r4, 0 @@ -182009,15 +174946,14 @@ sub_8059B18: @ 8059B18 pop {r0} bx r0 .align 2, 0 -_08059B34: .4byte 0x02022e2c -_08059B38: .4byte 0x085cca6f + .pool thumb_func_end sub_8059B18 thumb_func_start sub_8059B3C sub_8059B3C: @ 8059B3C push {r4-r7,lr} - ldr r5, _08059BA0 - ldr r7, _08059BA4 + ldr r5, =0x02023064 + ldr r7, =0x02024064 ldrb r0, [r7] lsls r0, 9 adds r1, r5, 0x2 @@ -182030,8 +174966,8 @@ sub_8059B3C: @ 8059B3C lsls r4, r1, 9 adds r0, r5, 0x4 adds r4, r0 - ldr r6, _08059BA8 - ldr r5, _08059BAC + ldr r6, =0x02022e2c + ldr r5, =0x020244b0 adds r1, r5 adds r0, r4, 0 adds r0, 0x8 @@ -182062,22 +174998,19 @@ _08059B98: pop {r0} bx r0 .align 2, 0 -_08059BA0: .4byte 0x02023064 -_08059BA4: .4byte 0x02024064 -_08059BA8: .4byte 0x02022e2c -_08059BAC: .4byte 0x020244b0 + .pool thumb_func_end sub_8059B3C thumb_func_start sub_8059BB0 sub_8059BB0: @ 8059BB0 push {r4-r6,lr} - ldr r5, _08059C0C + ldr r5, =0x02024064 ldrb r4, [r5] lsls r4, 9 - ldr r0, _08059C10 + ldr r0, =0x02023068 adds r4, r0 - ldr r6, _08059C14 - ldr r1, _08059C18 + ldr r6, =0x02022e2c + ldr r1, =0x085cca73 adds r0, r6, 0 bl gf_strcpy movs r1, 0xFC @@ -182089,8 +175022,8 @@ sub_8059BB0: @ 8059BB0 movs r1, 0x1 strb r1, [r0] adds r0, 0x1 - ldr r3, _08059C1C - ldr r2, _08059C20 + ldr r3, =0x0831c898 + ldr r2, =0x020244b0 ldrb r1, [r5] adds r1, r2 ldrb r1, [r1] @@ -182104,7 +175037,7 @@ sub_8059BB0: @ 8059BB0 ldrb r2, [r1, 0x2] lsls r1, r2, 3 subs r1, r2 - ldr r2, _08059C24 + ldr r2, =0x0831ae38 adds r1, r2 bl gf_strcpy adds r0, r6, 0 @@ -182114,13 +175047,7 @@ sub_8059BB0: @ 8059BB0 pop {r0} bx r0 .align 2, 0 -_08059C0C: .4byte 0x02024064 -_08059C10: .4byte 0x02023068 -_08059C14: .4byte 0x02022e2c -_08059C18: .4byte 0x085cca73 -_08059C1C: .4byte 0x0831c898 -_08059C20: .4byte 0x020244b0 -_08059C24: .4byte 0x0831ae38 + .pool thumb_func_end sub_8059BB0 thumb_func_start battle_menu_cursor_related_2 @@ -182169,7 +175096,7 @@ battle_menu_cursor_related: @ 8059C70 lsls r3, 24 lsrs r3, 24 add r0, sp, 0xC - ldr r1, _08059CB0 + ldr r1, =0x00001016 strh r1, [r0] strh r1, [r0, 0x2] movs r1, 0x1 @@ -182194,7 +175121,7 @@ battle_menu_cursor_related: @ 8059C70 pop {r0} bx r0 .align 2, 0 -_08059CB0: .4byte 0x00001016 + .pool thumb_func_end battle_menu_cursor_related thumb_func_start sub_8059CB4 @@ -182241,7 +175168,7 @@ sub_8059CF8: @ 8059CF8 lsls r3, 24 lsrs r3, 24 add r0, sp, 0xC - ldr r1, _08059D3C + ldr r1, =0x00001016 strh r1, [r0] strh r1, [r0, 0x2] movs r1, 0x1 @@ -182268,37 +175195,37 @@ sub_8059CF8: @ 8059CF8 pop {r0} bx r0 .align 2, 0 -_08059D3C: .4byte 0x00001016 + .pool thumb_func_end sub_8059CF8 thumb_func_start sub_8059D40 sub_8059D40: @ 8059D40 push {lr} - ldr r0, _08059D4C + ldr r0, =sub_80A92F8 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_08059D4C: .4byte sub_80A92F8 + 1 + .pool thumb_func_end sub_8059D40 thumb_func_start sub_8059D50 sub_8059D50: @ 8059D50 push {lr} - ldr r0, _08059D5C + ldr r0, =sub_80A92F8 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_08059D5C: .4byte sub_80A92F8 + 1 + .pool thumb_func_end sub_8059D50 thumb_func_start sub_8059D60 sub_8059D60: @ 8059D60 push {lr} - ldr r0, _08059D88 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08059D8C + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -182315,16 +175242,15 @@ _08059D82: pop {r0} bx r0 .align 2, 0 -_08059D88: .4byte 0x020244d0 -_08059D8C: .4byte 0x02024064 + .pool thumb_func_end sub_8059D60 thumb_func_start bx_8030B2C bx_8030B2C: @ 8059D90 push {lr} - ldr r0, _08059DB8 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08059DBC + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -182341,35 +175267,31 @@ _08059DB2: pop {r0} bx r0 .align 2, 0 -_08059DB8: .4byte 0x020244d0 -_08059DBC: .4byte 0x02024064 + .pool thumb_func_end bx_8030B2C thumb_func_start b_link_standby_message b_link_standby_message: @ 8059DC0 push {lr} - ldr r0, _08059DE4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 beq _08059DE0 - ldr r0, _08059DE8 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _08059DEC + ldr r0, =0x02022e16 strh r1, [r0] - ldr r0, _08059DF0 + ldr r0, =0x085cca29 movs r1, 0 bl battle_show_message_maybe _08059DE0: pop {r0} bx r0 .align 2, 0 -_08059DE4: .4byte 0x02022fec -_08059DE8: .4byte 0x02022e14 -_08059DEC: .4byte 0x02022e16 -_08059DF0: .4byte 0x085cca29 + .pool thumb_func_end b_link_standby_message thumb_func_start dp01t_00_1_getattr @@ -182377,8 +175299,8 @@ dp01t_00_1_getattr: @ 8059DF4 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _08059E20 - ldr r0, _08059E24 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -182386,7 +175308,7 @@ dp01t_00_1_getattr: @ 8059DF4 ldrb r0, [r1] cmp r0, 0 bne _08059E2C - ldr r0, _08059E28 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -182395,9 +175317,7 @@ dp01t_00_1_getattr: @ 8059DF4 adds r6, r0, 0 b _08059E4E .align 2, 0 -_08059E20: .4byte 0x02023064 -_08059E24: .4byte 0x02024064 -_08059E28: .4byte 0x0202406e + .pool _08059E2C: ldrb r4, [r1] movs r5, 0 @@ -182442,8 +175362,8 @@ dp01_getattr_by_ch1_for_player_pokemon_: @ 8059E68 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _08059E9C - ldr r3, _08059EA0 + ldr r2, =0x02023064 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -182454,14 +175374,12 @@ dp01_getattr_by_ch1_for_player_pokemon_: @ 8059E68 bl _0805A5FE _08059E92: lsls r0, 2 - ldr r1, _08059EA4 + ldr r1, =_08059EA8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08059E9C: .4byte 0x02023064 -_08059EA0: .4byte 0x02024064 -_08059EA4: .4byte _08059EA8 + .pool .align 2, 0 _08059EA8: .4byte _08059F98 @@ -182528,7 +175446,7 @@ _08059F98: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0805A1AC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -182581,7 +175499,7 @@ _08059FE4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0805A1AC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -182617,7 +175535,7 @@ _08059FE4: ands r0, r6 lsls r0, 5 ldrh r2, [r3, 0x14] - ldr r1, _0805A1B0 + ldr r1, =0xfffffc1f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x14] @@ -182640,7 +175558,7 @@ _08059FE4: ands r1, r0 lsls r1, 15 ldr r0, [sp, 0x14] - ldr r2, _0805A1B4 + ldr r2, =0xfff07fff ands r0, r2 orrs r0, r1 str r0, [sp, 0x14] @@ -182651,7 +175569,7 @@ _08059FE4: ands r0, r6 lsls r0, 4 ldrh r2, [r3, 0x16] - ldr r1, _0805A1B8 + ldr r1, =0xfffffe0f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x16] @@ -182765,28 +175683,25 @@ _0805A19C: bls _0805A19C b _0805A5FE .align 2, 0 -_0805A1AC: .4byte 0x020244ec -_0805A1B0: .4byte 0xfffffc1f -_0805A1B4: .4byte 0xfff07fff -_0805A1B8: .4byte 0xfffffe0f + .pool _0805A1BC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A1C8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB b _0805A536 .align 2, 0 -_0805A1C8: .4byte 0x020244ec + .pool _0805A1CC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A1D8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC b _0805A536 .align 2, 0 -_0805A1D8: .4byte 0x020244ec + .pool _0805A1DC: movs r6, 0 add r2, sp, 0x58 @@ -182796,7 +175711,7 @@ _0805A1DC: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0805A240 + ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 _0805A1F2: @@ -182820,7 +175735,7 @@ _0805A1F2: ble _0805A1F2 movs r0, 0x64 muls r0, r5 - ldr r1, _0805A240 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -182838,11 +175753,11 @@ _0805A230: bls _0805A230 b _0805A5FE .align 2, 0 -_0805A240: .4byte 0x020244ec + .pool _0805A244: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A25C + ldr r1, =0x020244ec adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -182852,13 +175767,13 @@ _0805A244: adds r1, 0x9 b _0805A536 .align 2, 0 -_0805A25C: .4byte 0x020244ec + .pool _0805A260: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _0805A298 + ldr r2, =0x020244ec mov r8, r2 _0805A26C: adds r1, r6, 0 @@ -182873,7 +175788,7 @@ _0805A26C: ble _0805A26C movs r0, 0x64 muls r0, r5 - ldr r1, _0805A298 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -182882,11 +175797,11 @@ _0805A26C: adds r6, 0x1 b _0805A5FE .align 2, 0 -_0805A298: .4byte 0x020244ec + .pool _0805A29C: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A2B4 + ldr r1, =0x020244ec adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -182896,20 +175811,20 @@ _0805A29C: adds r1, 0x8 b _0805A5F6 .align 2, 0 -_0805A2B4: .4byte 0x020244ec + .pool _0805A2B8: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A2C4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 b _0805A2D2 .align 2, 0 -_0805A2C4: .4byte 0x020244ec + .pool _0805A2C8: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A2F4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x19 _0805A2D2: @@ -182929,120 +175844,120 @@ _0805A2D2: movs r6, 0x3 b _0805A5FE .align 2, 0 -_0805A2F4: .4byte 0x020244ec + .pool _0805A2F8: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A304 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A b _0805A5F6 .align 2, 0 -_0805A304: .4byte 0x020244ec + .pool _0805A308: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A314 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B b _0805A5F6 .align 2, 0 -_0805A314: .4byte 0x020244ec + .pool _0805A318: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A324 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C b _0805A5F6 .align 2, 0 -_0805A324: .4byte 0x020244ec + .pool _0805A328: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A334 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D b _0805A5F6 .align 2, 0 -_0805A334: .4byte 0x020244ec + .pool _0805A338: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A344 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E b _0805A5F6 .align 2, 0 -_0805A344: .4byte 0x020244ec + .pool _0805A348: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A354 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F b _0805A5F6 .align 2, 0 -_0805A354: .4byte 0x020244ec + .pool _0805A358: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A364 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 b _0805A5F6 .align 2, 0 -_0805A364: .4byte 0x020244ec + .pool _0805A368: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A374 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 b _0805A5F6 .align 2, 0 -_0805A374: .4byte 0x020244ec + .pool _0805A378: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A384 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 b _0805A5F6 .align 2, 0 -_0805A384: .4byte 0x020244ec + .pool _0805A388: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A394 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 b _0805A5F6 .align 2, 0 -_0805A394: .4byte 0x020244ec + .pool _0805A398: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A3A4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 b _0805A5F6 .align 2, 0 -_0805A3A4: .4byte 0x020244ec + .pool _0805A3A8: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A3B4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 b _0805A5F6 .align 2, 0 -_0805A3B4: .4byte 0x020244ec + .pool _0805A3B8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0805A404 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -183071,83 +175986,83 @@ _0805A3B8: movs r6, 0x6 b _0805A5FE .align 2, 0 -_0805A404: .4byte 0x020244ec + .pool _0805A408: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A414 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 b _0805A5F6 .align 2, 0 -_0805A414: .4byte 0x020244ec + .pool _0805A418: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A424 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 b _0805A5F6 .align 2, 0 -_0805A424: .4byte 0x020244ec + .pool _0805A428: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A434 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 b _0805A5F6 .align 2, 0 -_0805A434: .4byte 0x020244ec + .pool _0805A438: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A444 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A b _0805A5F6 .align 2, 0 -_0805A444: .4byte 0x020244ec + .pool _0805A448: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A454 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B b _0805A5F6 .align 2, 0 -_0805A454: .4byte 0x020244ec + .pool _0805A458: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A464 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C b _0805A5F6 .align 2, 0 -_0805A464: .4byte 0x020244ec + .pool _0805A468: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A474 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0 b _0805A492 .align 2, 0 -_0805A474: .4byte 0x020244ec + .pool _0805A478: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A484 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 b _0805A536 .align 2, 0 -_0805A484: .4byte 0x020244ec + .pool _0805A488: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A4B8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x37 _0805A492: @@ -183169,74 +176084,74 @@ _0805A492: movs r6, 0x4 b _0805A5FE .align 2, 0 -_0805A4B8: .4byte 0x020244ec + .pool _0805A4BC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A4C8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 b _0805A5F6 .align 2, 0 -_0805A4C8: .4byte 0x020244ec + .pool _0805A4CC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A4D8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 b _0805A536 .align 2, 0 -_0805A4D8: .4byte 0x020244ec + .pool _0805A4DC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A4E8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A b _0805A536 .align 2, 0 -_0805A4E8: .4byte 0x020244ec + .pool _0805A4EC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A4F8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B b _0805A536 .align 2, 0 -_0805A4F8: .4byte 0x020244ec + .pool _0805A4FC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A508 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C b _0805A536 .align 2, 0 -_0805A508: .4byte 0x020244ec + .pool _0805A50C: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A518 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D b _0805A536 .align 2, 0 -_0805A518: .4byte 0x020244ec + .pool _0805A51C: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A528 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E b _0805A536 .align 2, 0 -_0805A528: .4byte 0x020244ec + .pool _0805A52C: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A548 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3F _0805A536: @@ -183249,101 +176164,101 @@ _0805A536: movs r6, 0x2 b _0805A5FE .align 2, 0 -_0805A548: .4byte 0x020244ec + .pool _0805A54C: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A558 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 b _0805A5F6 .align 2, 0 -_0805A558: .4byte 0x020244ec + .pool _0805A55C: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A568 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 b _0805A5F6 .align 2, 0 -_0805A568: .4byte 0x020244ec + .pool _0805A56C: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A578 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 b _0805A5F6 .align 2, 0 -_0805A578: .4byte 0x020244ec + .pool _0805A57C: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A588 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 b _0805A5F6 .align 2, 0 -_0805A588: .4byte 0x020244ec + .pool _0805A58C: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A598 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F b _0805A5F6 .align 2, 0 -_0805A598: .4byte 0x020244ec + .pool _0805A59C: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A5A8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 b _0805A5F6 .align 2, 0 -_0805A5A8: .4byte 0x020244ec + .pool _0805A5AC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A5B8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 b _0805A5F6 .align 2, 0 -_0805A5B8: .4byte 0x020244ec + .pool _0805A5BC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A5C8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 b _0805A5F6 .align 2, 0 -_0805A5C8: .4byte 0x020244ec + .pool _0805A5CC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A5D8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 b _0805A5F6 .align 2, 0 -_0805A5D8: .4byte 0x020244ec + .pool _0805A5DC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A5E8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 b _0805A5F6 .align 2, 0 -_0805A5E8: .4byte 0x020244ec + .pool _0805A5EC: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A610 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 _0805A5F6: @@ -183361,15 +176276,15 @@ _0805A5FE: pop {r1} bx r1 .align 2, 0 -_0805A610: .4byte 0x020244ec + .pool thumb_func_end dp01_getattr_by_ch1_for_player_pokemon_ thumb_func_start sub_805A614 sub_805A614: @ 805A614 push {r4-r7,lr} sub sp, 0x58 - ldr r2, _0805A68C - ldr r5, _0805A690 + ldr r2, =0x0202406e + ldr r5, =0x02024064 ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -183377,12 +176292,12 @@ sub_805A614: @ 805A614 movs r0, 0x64 adds r4, r2, 0 muls r4, r0 - ldr r3, _0805A694 + ldr r3, =0x02023064 lsls r1, 9 adds r0, r3, 0x1 adds r0, r1, r0 ldrb r2, [r0] - ldr r0, _0805A698 + ldr r0, =0x020244ec adds r0, r2, r0 adds r6, r4, r0 mov r0, sp @@ -183426,17 +176341,14 @@ _0805A66A: pop {r0} bx r0 .align 2, 0 -_0805A68C: .4byte 0x0202406e -_0805A690: .4byte 0x02024064 -_0805A694: .4byte 0x02023064 -_0805A698: .4byte 0x020244ec + .pool thumb_func_end sub_805A614 thumb_func_start dp01t_02_1_setattr dp01t_02_1_setattr: @ 805A69C push {r4,r5,lr} - ldr r1, _0805A6C0 - ldr r0, _0805A6C4 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -183444,16 +176356,14 @@ dp01t_02_1_setattr: @ 805A69C ldrb r0, [r1] cmp r0, 0 bne _0805A6CC - ldr r0, _0805A6C8 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl dp01_setattr_by_ch1_for_player_pokemon b _0805A6EA .align 2, 0 -_0805A6C0: .4byte 0x02023064 -_0805A6C4: .4byte 0x02024064 -_0805A6C8: .4byte 0x0202406e + .pool _0805A6CC: ldrb r4, [r1] movs r5, 0 @@ -183488,10 +176398,10 @@ dp01_setattr_by_ch1_for_player_pokemon: @ 805A6F4 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0805A72C + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 - ldr r2, _0805A730 + ldr r2, =0x02023067 adds r3, r0, r2 adds r6, r3, 0 subs r1, r2, 0x2 @@ -183503,14 +176413,12 @@ dp01_setattr_by_ch1_for_player_pokemon: @ 805A6F4 bl _0805B0BA _0805A720: lsls r0, 2 - ldr r1, _0805A734 + ldr r1, =_0805A738 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0805A72C: .4byte 0x02024064 -_0805A730: .4byte 0x02023067 -_0805A734: .4byte _0805A738 + .pool .align 2, 0 _0805A738: .4byte _0805A828 @@ -183577,7 +176485,7 @@ _0805A828: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0805A9BC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -183644,7 +176552,7 @@ _0805A88E: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0805A9BC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -183754,13 +176662,13 @@ _0805A88E: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805A9BC: .4byte 0x020244ec + .pool _0805A9C0: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A9D8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805A9DC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -183768,14 +176676,13 @@ _0805A9C0: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805A9D8: .4byte 0x020244ec -_0805A9DC: .4byte 0x02024064 + .pool _0805A9E0: movs r0, 0x64 muls r0, r5 - ldr r1, _0805A9F8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805A9FC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -183783,8 +176690,7 @@ _0805A9E0: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805A9F8: .4byte 0x020244ec -_0805A9FC: .4byte 0x02024064 + .pool _0805AA00: movs r0, 0 mov r8, r0 @@ -183794,7 +176700,7 @@ _0805AA00: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0805AA54 + ldr r0, =0x020244ec adds r7, r1, r0 adds r6, r3, 0 adds r6, 0x8 @@ -183819,21 +176725,21 @@ _0805AA1A: ble _0805AA1A movs r0, 0x64 muls r0, r5 - ldr r1, _0805AA54 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 mov r2, r9 bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AA54: .4byte 0x020244ec + .pool _0805AA58: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AA74 + ldr r1, =0x020244ec adds r0, r1 - ldr r3, _0805AA78 - ldr r1, _0805AA7C + ldr r3, =0x02023064 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -183842,16 +176748,14 @@ _0805AA58: adds r1, 0x9 b _0805AAFC .align 2, 0 -_0805AA74: .4byte 0x020244ec -_0805AA78: .4byte 0x02023064 -_0805AA7C: .4byte 0x02024064 + .pool _0805AA80: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0805AADC + ldr r0, =0x020244ec adds r4, r0 - ldr r5, _0805AAE0 + ldr r5, =0x02024064 ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -183888,15 +176792,14 @@ _0805AA80: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AADC: .4byte 0x020244ec -_0805AAE0: .4byte 0x02024064 + .pool _0805AAE4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AB08 + ldr r1, =0x020244ec adds r0, r1 - ldr r3, _0805AB0C - ldr r1, _0805AB10 + ldr r3, =0x02023064 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -183909,15 +176812,13 @@ _0805AAFC: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AB08: .4byte 0x020244ec -_0805AB0C: .4byte 0x02023064 -_0805AB10: .4byte 0x02024064 + .pool _0805AB14: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AB2C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AB30 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -183925,14 +176826,13 @@ _0805AB14: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AB2C: .4byte 0x020244ec -_0805AB30: .4byte 0x02024064 + .pool _0805AB34: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AB4C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AB50 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -183940,14 +176840,13 @@ _0805AB34: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AB4C: .4byte 0x020244ec -_0805AB50: .4byte 0x02024064 + .pool _0805AB54: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AB6C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AB70 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -183955,14 +176854,13 @@ _0805AB54: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AB6C: .4byte 0x020244ec -_0805AB70: .4byte 0x02024064 + .pool _0805AB74: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AB8C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AB90 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -183970,14 +176868,13 @@ _0805AB74: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AB8C: .4byte 0x020244ec -_0805AB90: .4byte 0x02024064 + .pool _0805AB94: movs r0, 0x64 muls r0, r5 - ldr r1, _0805ABAC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805ABB0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -183985,14 +176882,13 @@ _0805AB94: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805ABAC: .4byte 0x020244ec -_0805ABB0: .4byte 0x02024064 + .pool _0805ABB4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805ABCC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805ABD0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184000,14 +176896,13 @@ _0805ABB4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805ABCC: .4byte 0x020244ec -_0805ABD0: .4byte 0x02024064 + .pool _0805ABD4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805ABEC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805ABF0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184015,14 +176910,13 @@ _0805ABD4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805ABEC: .4byte 0x020244ec -_0805ABF0: .4byte 0x02024064 + .pool _0805ABF4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AC0C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AC10 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184030,14 +176924,13 @@ _0805ABF4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AC0C: .4byte 0x020244ec -_0805AC10: .4byte 0x02024064 + .pool _0805AC14: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AC2C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AC30 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184045,14 +176938,13 @@ _0805AC14: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AC2C: .4byte 0x020244ec -_0805AC30: .4byte 0x02024064 + .pool _0805AC34: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AC4C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AC50 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184060,14 +176952,13 @@ _0805AC34: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AC4C: .4byte 0x020244ec -_0805AC50: .4byte 0x02024064 + .pool _0805AC54: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AC6C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AC70 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184075,14 +176966,13 @@ _0805AC54: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AC6C: .4byte 0x020244ec -_0805AC70: .4byte 0x02024064 + .pool _0805AC74: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AC8C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AC90 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184090,14 +176980,13 @@ _0805AC74: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AC8C: .4byte 0x020244ec -_0805AC90: .4byte 0x02024064 + .pool _0805AC94: movs r0, 0x64 muls r0, r5 - ldr r1, _0805ACAC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805ACB0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184105,14 +176994,13 @@ _0805AC94: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805ACAC: .4byte 0x020244ec -_0805ACB0: .4byte 0x02024064 + .pool _0805ACB4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805ACCC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805ACD0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184120,15 +177008,14 @@ _0805ACB4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805ACCC: .4byte 0x020244ec -_0805ACD0: .4byte 0x02024064 + .pool _0805ACD4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0805AD3C + ldr r0, =0x020244ec adds r4, r0 - ldr r5, _0805AD40 + ldr r5, =0x02024064 ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -184170,14 +177057,13 @@ _0805ACD4: adds r0, r4, 0 b _0805ADF4 .align 2, 0 -_0805AD3C: .4byte 0x020244ec -_0805AD40: .4byte 0x02024064 + .pool _0805AD44: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AD5C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AD60 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184185,14 +177071,13 @@ _0805AD44: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AD5C: .4byte 0x020244ec -_0805AD60: .4byte 0x02024064 + .pool _0805AD64: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AD7C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AD80 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184200,14 +177085,13 @@ _0805AD64: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AD7C: .4byte 0x020244ec -_0805AD80: .4byte 0x02024064 + .pool _0805AD84: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AD9C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805ADA0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184215,14 +177099,13 @@ _0805AD84: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AD9C: .4byte 0x020244ec -_0805ADA0: .4byte 0x02024064 + .pool _0805ADA4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805ADBC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805ADC0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184230,14 +177113,13 @@ _0805ADA4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805ADBC: .4byte 0x020244ec -_0805ADC0: .4byte 0x02024064 + .pool _0805ADC4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805ADDC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805ADE0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184245,14 +177127,13 @@ _0805ADC4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805ADDC: .4byte 0x020244ec -_0805ADE0: .4byte 0x02024064 + .pool _0805ADE4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805ADFC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AE00 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184261,14 +177142,13 @@ _0805ADF4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805ADFC: .4byte 0x020244ec -_0805AE00: .4byte 0x02024064 + .pool _0805AE04: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AE1C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AE20 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184276,14 +177156,13 @@ _0805AE04: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AE1C: .4byte 0x020244ec -_0805AE20: .4byte 0x02024064 + .pool _0805AE24: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AE3C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AE40 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184291,14 +177170,13 @@ _0805AE24: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AE3C: .4byte 0x020244ec -_0805AE40: .4byte 0x02024064 + .pool _0805AE44: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AE5C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AE60 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184306,14 +177184,13 @@ _0805AE44: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AE5C: .4byte 0x020244ec -_0805AE60: .4byte 0x02024064 + .pool _0805AE64: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AE7C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AE80 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184321,14 +177198,13 @@ _0805AE64: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AE7C: .4byte 0x020244ec -_0805AE80: .4byte 0x02024064 + .pool _0805AE84: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AE9C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AEA0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184336,14 +177212,13 @@ _0805AE84: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AE9C: .4byte 0x020244ec -_0805AEA0: .4byte 0x02024064 + .pool _0805AEA4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AEBC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AEC0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184351,14 +177226,13 @@ _0805AEA4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AEBC: .4byte 0x020244ec -_0805AEC0: .4byte 0x02024064 + .pool _0805AEC4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AEDC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AEE0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184366,14 +177240,13 @@ _0805AEC4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AEDC: .4byte 0x020244ec -_0805AEE0: .4byte 0x02024064 + .pool _0805AEE4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AEFC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AF00 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184381,14 +177254,13 @@ _0805AEE4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AEFC: .4byte 0x020244ec -_0805AF00: .4byte 0x02024064 + .pool _0805AF04: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AF1C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AF20 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184396,14 +177268,13 @@ _0805AF04: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AF1C: .4byte 0x020244ec -_0805AF20: .4byte 0x02024064 + .pool _0805AF24: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AF3C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AF40 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184411,14 +177282,13 @@ _0805AF24: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AF3C: .4byte 0x020244ec -_0805AF40: .4byte 0x02024064 + .pool _0805AF44: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AF5C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AF60 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184426,14 +177296,13 @@ _0805AF44: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AF5C: .4byte 0x020244ec -_0805AF60: .4byte 0x02024064 + .pool _0805AF64: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AF7C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AF80 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184441,14 +177310,13 @@ _0805AF64: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AF7C: .4byte 0x020244ec -_0805AF80: .4byte 0x02024064 + .pool _0805AF84: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AF9C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AFA0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184456,14 +177324,13 @@ _0805AF84: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AF9C: .4byte 0x020244ec -_0805AFA0: .4byte 0x02024064 + .pool _0805AFA4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AFBC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AFC0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184471,14 +177338,13 @@ _0805AFA4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AFBC: .4byte 0x020244ec -_0805AFC0: .4byte 0x02024064 + .pool _0805AFC4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AFDC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805AFE0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184486,14 +177352,13 @@ _0805AFC4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AFDC: .4byte 0x020244ec -_0805AFE0: .4byte 0x02024064 + .pool _0805AFE4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805AFFC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805B000 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184501,14 +177366,13 @@ _0805AFE4: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805AFFC: .4byte 0x020244ec -_0805B000: .4byte 0x02024064 + .pool _0805B004: movs r0, 0x64 muls r0, r5 - ldr r1, _0805B01C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805B020 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184516,14 +177380,13 @@ _0805B004: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805B01C: .4byte 0x020244ec -_0805B020: .4byte 0x02024064 + .pool _0805B024: movs r0, 0x64 muls r0, r5 - ldr r1, _0805B03C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805B040 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184531,14 +177394,13 @@ _0805B024: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805B03C: .4byte 0x020244ec -_0805B040: .4byte 0x02024064 + .pool _0805B044: movs r0, 0x64 muls r0, r5 - ldr r1, _0805B05C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805B060 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184546,14 +177408,13 @@ _0805B044: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805B05C: .4byte 0x020244ec -_0805B060: .4byte 0x02024064 + .pool _0805B064: movs r0, 0x64 muls r0, r5 - ldr r1, _0805B07C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805B080 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184561,14 +177422,13 @@ _0805B064: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805B07C: .4byte 0x020244ec -_0805B080: .4byte 0x02024064 + .pool _0805B084: movs r0, 0x64 muls r0, r5 - ldr r1, _0805B09C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805B0A0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -184576,29 +177436,28 @@ _0805B084: bl pokemon_setattr b _0805B0BA .align 2, 0 -_0805B09C: .4byte 0x020244ec -_0805B0A0: .4byte 0x02024064 + .pool _0805B0A4: movs r0, 0x64 muls r0, r5 - ldr r1, _0805B0E4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0805B0E8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 bl pokemon_setattr _0805B0BA: - ldr r2, _0805B0EC - ldr r0, _0805B0E8 + ldr r2, =0x0202406e + ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0805B0E4 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 add sp, 0x34 @@ -184610,16 +177469,14 @@ _0805B0BA: pop {r0} bx r0 .align 2, 0 -_0805B0E4: .4byte 0x020244ec -_0805B0E8: .4byte 0x02024064 -_0805B0EC: .4byte 0x0202406e + .pool thumb_func_end dp01_setattr_by_ch1_for_player_pokemon thumb_func_start sub_805B0F0 sub_805B0F0: @ 805B0F0 push {r4-r7,lr} - ldr r1, _0805B154 - ldr r7, _0805B158 + ldr r1, =0x0202406e + ldr r7, =0x02024064 ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -184627,12 +177484,12 @@ sub_805B0F0: @ 805B0F0 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, _0805B15C + ldr r4, =0x02023064 lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 ldrb r0, [r0] - ldr r1, _0805B160 + ldr r1, =0x020244ec adds r0, r1 adds r5, r3, r0 movs r3, 0 @@ -184668,28 +177525,25 @@ _0805B148: pop {r0} bx r0 .align 2, 0 -_0805B154: .4byte 0x0202406e -_0805B158: .4byte 0x02024064 -_0805B15C: .4byte 0x02023064 -_0805B160: .4byte 0x020244ec + .pool thumb_func_end sub_805B0F0 thumb_func_start sub_805B164 sub_805B164: @ 805B164 push {r4,lr} - ldr r2, _0805B1B0 - ldr r4, _0805B1B4 + ldr r2, =0x0202406e + ldr r4, =0x02024064 ldrb r1, [r4] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0805B1B8 + ldr r2, =0x020244ec adds r0, r2 bl sub_805DD7C - ldr r2, _0805B1BC - ldr r0, _0805B1C0 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 ldrb r3, [r4] adds r0, r3, r0 ldrb r0, [r0] @@ -184703,37 +177557,31 @@ sub_805B164: @ 805B164 ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] - ldr r1, _0805B1C4 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0805B1C8 + ldr r1, =bx_0802E404 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0805B1B0: .4byte 0x0202406e -_0805B1B4: .4byte 0x02024064 -_0805B1B8: .4byte 0x020244ec -_0805B1BC: .4byte 0x02020630 -_0805B1C0: .4byte 0x020241e4 -_0805B1C4: .4byte 0x03005d60 -_0805B1C8: .4byte bx_0802E404 + 1 + .pool thumb_func_end sub_805B164 thumb_func_start sub_805B1CC sub_805B1CC: @ 805B1CC push {r4-r6,lr} - ldr r5, _0805B238 + ldr r5, =0x02024064 ldrb r0, [r5] - ldr r4, _0805B23C + ldr r4, =0x02023064 lsls r1, r0, 9 adds r6, r4, 0x2 adds r1, r6 ldrb r1, [r1] bl sub_805EF84 - ldr r2, _0805B240 + ldr r2, =0x0202406e ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -184749,14 +177597,14 @@ sub_805B1CC: @ 805B1CC ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0805B244 + ldr r2, =0x020244ec adds r0, r2 bl sub_805DD7C - ldr r1, _0805B248 + ldr r1, =0x020244ac ldrb r0, [r5] adds r0, r1 strb r4, [r0] - ldr r1, _0805B24C + ldr r1, =0x020244b0 ldrb r0, [r5] adds r0, r1 strb r4, [r0] @@ -184765,24 +177613,17 @@ sub_805B1CC: @ 805B1CC adds r1, r6 ldrb r1, [r1] bl sub_805B258 - ldr r1, _0805B250 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805B254 + ldr r1, =sub_805902C + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0805B238: .4byte 0x02024064 -_0805B23C: .4byte 0x02023064 -_0805B240: .4byte 0x0202406e -_0805B244: .4byte 0x020244ec -_0805B248: .4byte 0x020244ac -_0805B24C: .4byte 0x020244b0 -_0805B250: .4byte 0x03005d60 -_0805B254: .4byte sub_805902C + 1 + .pool thumb_func_end sub_805B1CC thumb_func_start sub_805B258 @@ -184799,10 +177640,10 @@ sub_805B258: @ 805B258 lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, _0805B3AC + ldr r0, =0x0202406e lsls r2, r6, 1 adds r2, r0 - ldr r0, _0805B3B0 + ldr r0, =0x02023064 lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -184811,7 +177652,7 @@ sub_805B258: @ 805B258 ldrh r1, [r2] movs r0, 0x64 muls r0, r1 - ldr r1, _0805B3B4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -184819,9 +177660,9 @@ sub_805B258: @ 805B258 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _0805B3B8 + ldr r0, =sub_805D714 + 1 bl object_new_hidden_with_callback - ldr r1, _0805B3BC + ldr r1, =0x03005d7c mov r9, r1 add r9, r6 mov r1, r9 @@ -184833,7 +177674,7 @@ sub_805B258: @ 805B258 lsrs r1, 24 mov r0, r8 bl sub_806A068 - ldr r0, _0805B3C0 + ldr r0, =0x0202499c mov r10, r0 adds r0, r6, 0 movs r1, 0x2 @@ -184855,10 +177696,10 @@ sub_805B258: @ 805B258 adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _0805B3C4 + ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] - ldr r5, _0805B3C8 + ldr r5, =0x02020630 mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -184903,7 +177744,7 @@ sub_805B258: @ 805B258 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0805B3CC + ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] bl obj_anim_image_start @@ -184924,7 +177765,7 @@ sub_805B258: @ 805B258 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0805B3D0 + ldr r1, =nullsub_12 + 1 str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -184946,23 +177787,14 @@ sub_805B258: @ 805B258 pop {r0} bx r0 .align 2, 0 -_0805B3AC: .4byte 0x0202406e -_0805B3B0: .4byte 0x02023064 -_0805B3B4: .4byte 0x020244ec -_0805B3B8: .4byte sub_805D714 + 1 -_0805B3BC: .4byte 0x03005d7c -_0805B3C0: .4byte 0x0202499c -_0805B3C4: .4byte 0x020241e4 -_0805B3C8: .4byte 0x02020630 -_0805B3CC: .4byte 0x020244e4 -_0805B3D0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_805B258 thumb_func_start sub_805B3D4 sub_805B3D4: @ 805B3D4 push {r4-r6,lr} - ldr r1, _0805B408 - ldr r6, _0805B40C + ldr r1, =0x02023064 + ldr r6, =0x02024064 ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -184970,7 +177802,7 @@ sub_805B3D4: @ 805B3D4 ldrb r3, [r0] cmp r3, 0 bne _0805B41C - ldr r0, _0805B410 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -184978,27 +177810,23 @@ sub_805B3D4: @ 805B3D4 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, _0805B414 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _0805B418 + ldr r1, =sub_805B464 + 1 str r1, [r0] b _0805B452 .align 2, 0 -_0805B408: .4byte 0x02023064 -_0805B40C: .4byte 0x02024064 -_0805B410: .4byte 0x020244d0 -_0805B414: .4byte 0x03005d60 -_0805B418: .4byte sub_805B464 + 1 + .pool _0805B41C: - ldr r5, _0805B458 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0805B45C + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -185009,7 +177837,7 @@ _0805B41C: lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r1, _0805B460 + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -185020,17 +177848,15 @@ _0805B452: pop {r0} bx r0 .align 2, 0 -_0805B458: .4byte 0x020241e4 -_0805B45C: .4byte 0x02020630 -_0805B460: .4byte 0x03005d70 + .pool thumb_func_end sub_805B3D4 thumb_func_start sub_805B464 sub_805B464: @ 805B464 push {r4-r6,lr} - ldr r6, _0805B484 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _0805B488 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -185044,8 +177870,7 @@ sub_805B464: @ 805B464 beq _0805B4BA b _0805B4E2 .align 2, 0 -_0805B484: .4byte 0x020244d0 -_0805B488: .4byte 0x02024064 + .pool _0805B48C: ldr r1, [r4] lsls r0, r2, 2 @@ -185084,19 +177909,18 @@ _0805B4BA: adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r1, _0805B4E8 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805B4EC + ldr r1, =sub_8059744 + 1 str r1, [r0] _0805B4E2: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0805B4E8: .4byte 0x03005d60 -_0805B4EC: .4byte sub_8059744 + 1 + .pool thumb_func_end sub_805B464 thumb_func_start sub_805B4F0 @@ -185105,14 +177929,14 @@ sub_805B4F0: @ 805B4F0 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0805B550 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 beq _0805B5B4 bl link_get_multiplayer_id - ldr r5, _0805B554 + ldr r5, =0x020229e8 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -185147,8 +177971,7 @@ _0805B538: adds r4, r0, 0x2 b _0805B5BA .align 2, 0 -_0805B550: .4byte 0x02022fec -_0805B554: .4byte 0x020229e8 + .pool _0805B558: bl link_get_multiplayer_id lsls r0, 24 @@ -185195,18 +178018,18 @@ _0805B5A0: ldrb r4, [r1, 0x13] b _0805B5BA _0805B5B4: - ldr r0, _0805B600 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r4, [r0, 0x8] _0805B5BA: - ldr r0, _0805B604 + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x40 ands r1, r2 adds r5, r0, 0 cmp r1, 0 beq _0805B63C - ldr r0, _0805B608 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status movs r1, 0x2 @@ -185224,24 +178047,19 @@ _0805B5E0: ands r0, r1 cmp r0, 0 beq _0805B618 - ldr r0, _0805B60C + ldr r0, =0x02038bce ldrh r1, [r0] - ldr r0, _0805B610 + ldr r0, =0x00000c03 cmp r1, r0 beq _0805B618 movs r0, 0x5A mov r9, r0 - ldr r1, _0805B614 + ldr r1, =0x083054e0 b _0805B642 .align 2, 0 -_0805B600: .4byte 0x03005d90 -_0805B604: .4byte 0x02022fec -_0805B608: .4byte 0x02024064 -_0805B60C: .4byte 0x02038bce -_0805B610: .4byte 0x00000c03 -_0805B614: .4byte 0x083054e0 + .pool _0805B618: - ldr r1, _0805B634 + ldr r1, =0x08305d2c lsls r0, r4, 2 adds r0, r1 ldrb r1, [r0] @@ -185252,15 +178070,14 @@ _0805B618: lsls r1, 15 adds r0, r1 lsrs r7, r0, 16 - ldr r5, _0805B638 + ldr r5, =0x02022fec b _0805B656 .align 2, 0 -_0805B634: .4byte 0x08305d2c -_0805B638: .4byte 0x02022fec + .pool _0805B63C: movs r0, 0x50 mov r9, r0 - ldr r1, _0805B768 + ldr r1, =0x08305d2c _0805B642: lsls r0, r4, 2 adds r0, r1 @@ -185281,21 +178098,21 @@ _0805B656: bne _0805B664 b _0805B794 _0805B664: - ldr r0, _0805B76C + ldr r0, =0x02038bce ldrh r1, [r0] - ldr r0, _0805B770 + ldr r0, =0x00000c03 cmp r1, r0 bne _0805B670 b _0805B794 _0805B670: - ldr r0, _0805B774 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] bl sub_806F000 lsls r0, 16 lsrs r4, r0, 16 adds r5, r4, 0 - ldr r6, _0805B778 + ldr r6, =0x02024064 ldrb r1, [r6] adds r0, r5, 0 bl sub_805DF38 @@ -185306,7 +178123,7 @@ _0805B670: lsrs r1, 24 adds r0, r5, 0 bl sub_806A1C0 - ldr r0, _0805B77C + ldr r0, =0x0202499c mov r8, r0 lsls r4, r7, 16 asrs r4, 16 @@ -185319,16 +178136,16 @@ _0805B670: mov r1, r9 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _0805B780 + ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r0, _0805B784 + ldr r0, =0x0830593c lsls r5, 3 adds r5, r0 ldrh r0, [r5, 0x4] bl gpu_pal_tags_index_of - ldr r5, _0805B788 + ldr r5, =0x02020630 ldrb r1, [r6] adds r1, r4 ldrb r1, [r1] @@ -185367,7 +178184,7 @@ _0805B670: adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0805B78C + ldr r1, =0x0000fffe strh r1, [r0, 0x2E] ldrb r0, [r6] adds r0, r4 @@ -185378,7 +178195,7 @@ _0805B670: adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0805B790 + ldr r1, =sub_805D7AC + 1 str r1, [r0] ldrb r0, [r6] adds r0, r4 @@ -185406,19 +178223,9 @@ _0805B670: strb r1, [r0] b _0805B82A .align 2, 0 -_0805B768: .4byte 0x08305d2c -_0805B76C: .4byte 0x02038bce -_0805B770: .4byte 0x00000c03 -_0805B774: .4byte 0x03005d90 -_0805B778: .4byte 0x02024064 -_0805B77C: .4byte 0x0202499c -_0805B780: .4byte 0x020241e4 -_0805B784: .4byte 0x0830593c -_0805B788: .4byte 0x02020630 -_0805B78C: .4byte 0x0000fffe -_0805B790: .4byte sub_805D7AC + 1 + .pool _0805B794: - ldr r5, _0805B844 + ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 bl sub_805DF84 @@ -185429,7 +178236,7 @@ _0805B794: lsrs r1, 24 adds r0, r4, 0 bl template_build_for_pokemon_or_trainer - ldr r6, _0805B848 + ldr r6, =0x0202499c mov r8, r9 lsls r4, r7, 16 asrs r4, 16 @@ -185442,11 +178249,11 @@ _0805B794: mov r1, r8 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r6, _0805B84C + ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _0805B850 + ldr r4, =0x02020630 ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -185476,7 +178283,7 @@ _0805B794: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0805B854 + ldr r1, =0x0000fffe strh r1, [r0, 0x2E] ldrb r0, [r5] adds r0, r6 @@ -185486,15 +178293,15 @@ _0805B794: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _0805B858 + ldr r1, =sub_805D7AC + 1 str r1, [r0] _0805B82A: - ldr r1, _0805B85C - ldr r0, _0805B844 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0805B860 + ldr r1, =sub_8058844 + 1 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -185503,27 +178310,20 @@ _0805B82A: pop {r0} bx r0 .align 2, 0 -_0805B844: .4byte 0x02024064 -_0805B848: .4byte 0x0202499c -_0805B84C: .4byte 0x020241e4 -_0805B850: .4byte 0x02020630 -_0805B854: .4byte 0x0000fffe -_0805B858: .4byte sub_805D7AC + 1 -_0805B85C: .4byte 0x03005d60 -_0805B860: .4byte sub_8058844 + 1 + .pool thumb_func_end sub_805B4F0 thumb_func_start dp01t_08_1_8032428 dp01t_08_1_8032428: @ 805B864 push {r4-r6,lr} - ldr r0, _0805B8BC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 beq _0805B920 bl link_get_multiplayer_id - ldr r5, _0805B8C0 + ldr r5, =0x020229e8 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -185558,8 +178358,7 @@ _0805B8A6: adds r4, r0, 0x2 b _0805B926 .align 2, 0 -_0805B8BC: .4byte 0x02022fec -_0805B8C0: .4byte 0x020229e8 + .pool _0805B8C4: bl link_get_multiplayer_id lsls r0, 24 @@ -185606,11 +178405,11 @@ _0805B90C: ldrb r4, [r1, 0x13] b _0805B926 _0805B920: - ldr r0, _0805B9D0 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r4, [r0, 0x8] _0805B926: - ldr r5, _0805B9D4 + ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 bl sub_805DF84 @@ -185621,8 +178420,8 @@ _0805B926: lsrs r1, 24 adds r0, r4, 0 bl template_build_for_pokemon_or_trainer - ldr r0, _0805B9D8 - ldr r1, _0805B9DC + ldr r0, =0x0202499c + ldr r1, =0x08305d2c lsls r4, 2 adds r4, r1 ldrb r1, [r4] @@ -185636,11 +178435,11 @@ _0805B926: movs r1, 0x50 movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r6, _0805B9E0 + ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _0805B9E4 + ldr r4, =0x02020630 ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -185661,7 +178460,7 @@ _0805B926: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0805B9E8 + ldr r1, =0x0000ffa0 strh r1, [r0, 0x24] ldrb r0, [r5] adds r0, r6 @@ -185680,42 +178479,33 @@ _0805B926: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _0805B9EC + ldr r1, =sub_805D7AC + 1 str r1, [r0] - ldr r1, _0805B9F0 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805B9F4 + ldr r1, =sub_805887C + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0805B9D0: .4byte 0x03005d90 -_0805B9D4: .4byte 0x02024064 -_0805B9D8: .4byte 0x0202499c -_0805B9DC: .4byte 0x08305d2c -_0805B9E0: .4byte 0x020241e4 -_0805B9E4: .4byte 0x02020630 -_0805B9E8: .4byte 0x0000ffa0 -_0805B9EC: .4byte sub_805D7AC + 1 -_0805B9F0: .4byte 0x03005d60 -_0805B9F4: .4byte sub_805887C + 1 + .pool thumb_func_end dp01t_08_1_8032428 thumb_func_start sub_805B9F8 sub_805B9F8: @ 805B9F8 push {r4-r6,lr} - ldr r5, _0805BA98 - ldr r6, _0805BA9C + ldr r5, =0x020241e4 + ldr r6, =0x02024064 ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0805BAA0 + ldr r4, =0x02020630 adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -185734,7 +178524,7 @@ sub_805B9F8: @ 805B9F8 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0805BAA4 + ldr r1, =0x0000ffd8 strh r1, [r0, 0x32] ldrb r0, [r6] adds r0, r5 @@ -185754,7 +178544,7 @@ sub_805B9F8: @ 805B9F8 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0805BAA8 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r0, [r6] adds r0, r5 @@ -185763,7 +178553,7 @@ sub_805B9F8: @ 805B9F8 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0805BAAC + ldr r1, =nullsub_12 + 1 bl oamt_set_x3A_32 ldrb r0, [r6] adds r0, r5 @@ -185774,32 +178564,25 @@ sub_805B9F8: @ 805B9F8 adds r0, r4 movs r1, 0x1 bl obj_anim_image_start - ldr r1, _0805BAB0 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _0805BAB4 + ldr r1, =bx_802F7A0 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0805BA98: .4byte 0x020241e4 -_0805BA9C: .4byte 0x02024064 -_0805BAA0: .4byte 0x02020630 -_0805BAA4: .4byte 0x0000ffd8 -_0805BAA8: .4byte sub_80A6EEC + 1 -_0805BAAC: .4byte nullsub_12 + 1 -_0805BAB0: .4byte 0x03005d60 -_0805BAB4: .4byte bx_802F7A0 + 1 + .pool thumb_func_end sub_805B9F8 thumb_func_start sub_805BAB8 sub_805BAB8: @ 805BAB8 push {r4-r6,lr} - ldr r6, _0805BB04 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _0805BB08 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -185834,8 +178617,7 @@ _0805BAEC: strb r1, [r0, 0x4] b _0805BB82 .align 2, 0 -_0805BB04: .4byte 0x020244d0 -_0805BB08: .4byte 0x02024064 + .pool _0805BB0C: ldrb r1, [r3] movs r0, 0x40 @@ -185845,22 +178627,22 @@ _0805BB0C: cmp r4, 0 bne _0805BB82 strb r4, [r3, 0x4] - ldr r2, _0805BB88 + ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0805BB8C + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 movs r1, 0x40 negs r1, r1 movs r0, 0x10 bl audio_play_and_stuff - ldr r2, _0805BB90 - ldr r3, _0805BB94 + ldr r2, =0x02020630 + ldr r3, =0x020241e4 ldrb r0, [r5] adds r0, r3 ldrb r1, [r0] @@ -185886,26 +178668,20 @@ _0805BB0C: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _0805BB98 + ldr r1, =sub_8039C00 + 1 str r1, [r0] - ldr r1, _0805BB9C + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805BBA0 + ldr r1, =sub_80596A8 + 1 str r1, [r0] _0805BB82: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0805BB88: .4byte 0x0202406e -_0805BB8C: .4byte 0x020244ec -_0805BB90: .4byte 0x02020630 -_0805BB94: .4byte 0x020241e4 -_0805BB98: .4byte sub_8039C00 + 1 -_0805BB9C: .4byte 0x03005d60 -_0805BBA0: .4byte sub_80596A8 + 1 + .pool thumb_func_end sub_805BAB8 thumb_func_start sub_805BBA4 @@ -185929,15 +178705,15 @@ sub_805BBA4: @ 805BBA4 thumb_func_start sub_805BBC4 sub_805BBC4: @ 805BBC4 push {r4,r5,lr} - ldr r0, _0805BC04 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x8] movs r0, 0x4 strb r0, [r1, 0x8] - ldr r1, _0805BC08 + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] - ldr r5, _0805BC0C + ldr r5, =0x02024064 ldrb r4, [r5] movs r0, 0x1 bl battle_get_side_with_given_state @@ -185948,38 +178724,34 @@ sub_805BBC4: @ 805BBC4 adds r1, r4, 0 movs r3, 0x3 bl move_anim_start_t4 - ldr r1, _0805BC10 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805BC14 + ldr r1, =bx_wait_t1 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0805BC04: .4byte 0x020244d0 -_0805BC08: .4byte 0x020244b9 -_0805BC0C: .4byte 0x02024064 -_0805BC10: .4byte 0x03005d60 -_0805BC14: .4byte bx_wait_t1 + 1 + .pool thumb_func_end sub_805BBC4 thumb_func_start sub_805BC18 sub_805BC18: @ 805BC18 push {r4,r5,lr} - ldr r1, _0805BC60 - ldr r5, _0805BC64 + ldr r1, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r1, [r0] - ldr r0, _0805BC68 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] strb r1, [r0, 0x8] - ldr r1, _0805BC6C + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] ldrb r4, [r5] @@ -185992,29 +178764,24 @@ sub_805BC18: @ 805BC18 adds r1, r4, 0 movs r3, 0x3 bl move_anim_start_t4 - ldr r1, _0805BC70 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805BC74 + ldr r1, =bx_wait_t1 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0805BC60: .4byte 0x02023064 -_0805BC64: .4byte 0x02024064 -_0805BC68: .4byte 0x020244d0 -_0805BC6C: .4byte 0x020244b9 -_0805BC70: .4byte 0x03005d60 -_0805BC74: .4byte bx_wait_t1 + 1 + .pool thumb_func_end sub_805BC18 thumb_func_start sub_805BC78 sub_805BC78: @ 805BC78 push {lr} - ldr r1, _0805BCA0 - ldr r0, _0805BCA4 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -186033,8 +178800,7 @@ _0805BC96: pop {r0} bx r0 .align 2, 0 -_0805BCA0: .4byte 0x02023064 -_0805BCA4: .4byte 0x02024064 + .pool thumb_func_end sub_805BC78 thumb_func_start dp01t_0F_1_move_anim @@ -186042,7 +178808,7 @@ dp01t_0F_1_move_anim: @ 805BCA8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r5, _0805BD98 + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 @@ -186050,7 +178816,7 @@ dp01t_0F_1_move_anim: @ 805BCA8 beq _0805BCBE b _0805BDE4 _0805BCBE: - ldr r0, _0805BD9C + ldr r0, =0x02023064 mov r12, r0 ldrb r1, [r5] lsls r1, 9 @@ -186063,7 +178829,7 @@ _0805BCBE: ldrb r0, [r0] lsls r0, 8 orrs r6, r0 - ldr r0, _0805BDA0 + ldr r0, =0x02038432 mov r8, r0 mov r0, r12 adds r0, 0x3 @@ -186071,7 +178837,7 @@ _0805BCBE: ldrb r0, [r1] mov r1, r8 strb r0, [r1] - ldr r3, _0805BDA4 + ldr r3, =0x02038408 ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -186085,7 +178851,7 @@ _0805BCBE: lsls r0, 8 orrs r2, r0 strh r2, [r3] - ldr r3, _0805BDA8 + ldr r3, =0x02038404 ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -186111,7 +178877,7 @@ _0805BCBE: lsls r0, 24 orrs r2, r0 str r2, [r3] - ldr r2, _0805BDAC + ldr r2, =0x0203841a ldrb r0, [r5] lsls r0, 9 mov r1, r12 @@ -186119,7 +178885,7 @@ _0805BCBE: adds r0, r1 ldrb r0, [r0] strb r0, [r2] - ldr r4, _0805BDB0 + ldr r4, =0x0203841c ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -186133,14 +178899,14 @@ _0805BCBE: lsls r0, 8 orrs r2, r0 strh r2, [r4] - ldr r7, _0805BDB4 + ldr r7, =0x02038400 ldrb r1, [r5] lsls r1, 9 mov r0, r12 adds r0, 0x10 adds r1, r0 str r1, [r7] - ldr r2, _0805BDB8 + ldr r2, =0x020244bc ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -186157,17 +178923,9 @@ _0805BCBE: bl dp01_tbl1_exec_completed b _0805BDE4 .align 2, 0 -_0805BD98: .4byte 0x02024064 -_0805BD9C: .4byte 0x02023064 -_0805BDA0: .4byte 0x02038432 -_0805BDA4: .4byte 0x02038408 -_0805BDA8: .4byte 0x02038404 -_0805BDAC: .4byte 0x0203841a -_0805BDB0: .4byte 0x0203841c -_0805BDB4: .4byte 0x02038400 -_0805BDB8: .4byte 0x020244bc + .pool _0805BDBC: - ldr r0, _0805BDF0 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -186176,11 +178934,11 @@ _0805BDBC: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, _0805BDF4 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805BDF8 + ldr r1, =bx_move_anim_1 + 1 str r1, [r0] ldrh r1, [r4] ldr r2, [r7] @@ -186193,9 +178951,7 @@ _0805BDE4: pop {r0} bx r0 .align 2, 0 -_0805BDF0: .4byte 0x020244d0 -_0805BDF4: .4byte 0x03005d60 -_0805BDF8: .4byte bx_move_anim_1 + 1 + .pool thumb_func_end dp01t_0F_1_move_anim thumb_func_start bx_move_anim_1 @@ -186205,8 +178961,8 @@ bx_move_anim_1: @ 805BDFC mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _0805BE48 - ldr r6, _0805BE4C + ldr r2, =0x02023064 + ldr r6, =0x02024064 ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -186223,7 +178979,7 @@ bx_move_anim_1: @ 805BDFC adds r1, r2 ldrb r1, [r1] mov r8, r1 - ldr r7, _0805BE50 + ldr r7, =0x020244d0 ldr r5, [r7] ldr r1, [r5, 0x4] lsls r0, r3, 1 @@ -186239,9 +178995,7 @@ bx_move_anim_1: @ 805BDFC beq _0805BE5E b _0805BF70 .align 2, 0 -_0805BE48: .4byte 0x02023064 -_0805BE4C: .4byte 0x02024064 -_0805BE50: .4byte 0x020244d0 + .pool _0805BE54: cmp r2, 0x2 beq _0805BEBE @@ -186297,10 +179051,10 @@ _0805BE94: strb r1, [r0, 0x4] b _0805BF70 _0805BEBE: - ldr r0, _0805BF24 + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _0805BF28 + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _0805BF70 @@ -186334,9 +179088,9 @@ _0805BEBE: ands r0, r2 strb r0, [r1] _0805BF0C: - ldr r0, _0805BF2C + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0805BF30 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -186347,10 +179101,7 @@ _0805BF0C: strb r1, [r0, 0x4] b _0805BF70 .align 2, 0 -_0805BF24: .4byte 0x020383f8 -_0805BF28: .4byte 0x020383fd -_0805BF2C: .4byte 0x020244d0 -_0805BF30: .4byte 0x02024064 + .pool _0805BF34: ldrb r1, [r0] movs r0, 0x40 @@ -186392,26 +179143,26 @@ _0805BF70: thumb_func_start sub_805BF80 sub_805BF80: @ 805BF80 push {r4,r5,lr} - ldr r0, _0805BFC4 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _0805BFC8 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r5, _0805BFCC + ldr r5, =0x02024064 ldrb r4, [r5] lsls r4, 9 - ldr r0, _0805BFD0 + ldr r0, =0x02023066 adds r4, r0 ldrh r0, [r4] bl battle_pick_message - ldr r0, _0805BFD4 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _0805BFD8 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805BFDC + ldr r1, =sub_80597B4 + 1 str r1, [r0] ldrh r0, [r4] bl sub_817C95C @@ -186422,19 +179173,13 @@ sub_805BF80: @ 805BF80 pop {r0} bx r0 .align 2, 0 -_0805BFC4: .4byte 0x02022e14 -_0805BFC8: .4byte 0x02022e16 -_0805BFCC: .4byte 0x02024064 -_0805BFD0: .4byte 0x02023066 -_0805BFD4: .4byte 0x02022e2c -_0805BFD8: .4byte 0x03005d60 -_0805BFDC: .4byte sub_80597B4 + 1 + .pool thumb_func_end sub_805BF80 thumb_func_start dp01t_11_1_message_for_player_only dp01t_11_1_message_for_player_only: @ 805BFE0 push {lr} - ldr r0, _0805BFF8 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -186443,7 +179188,7 @@ dp01t_11_1_message_for_player_only: @ 805BFE0 bl sub_805BF80 b _0805C000 .align 2, 0 -_0805BFF8: .4byte 0x02024064 + .pool _0805BFFC: bl dp01_tbl1_exec_completed _0805C000: @@ -186459,41 +179204,37 @@ sub_805C004: @ 805C004 lsrs r1, r0, 24 cmp r1, 0 bne _0805C02A - ldr r0, _0805C030 + ldr r0, =0x02022e14 strh r1, [r0] - ldr r1, _0805C034 + ldr r1, =0x02022e16 movs r0, 0xA0 strh r0, [r1] - ldr r1, _0805C038 - ldr r0, _0805C03C + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0805C040 + ldr r1, =sub_8057588 + 1 str r1, [r0] _0805C02A: pop {r0} bx r0 .align 2, 0 -_0805C030: .4byte 0x02022e14 -_0805C034: .4byte 0x02022e16 -_0805C038: .4byte 0x03005d60 -_0805C03C: .4byte 0x02024064 -_0805C040: .4byte sub_8057588 + 1 + .pool thumb_func_end sub_805C004 thumb_func_start dp01t_12_6_battle_menu dp01t_12_6_battle_menu: @ 805C044 push {r4,lr} - ldr r1, _0805C094 - ldr r0, _0805C098 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0805C09C + ldr r1, =sub_805C004 + 1 str r1, [r0] bl sub_817F2A8 - ldr r0, _0805C0A0 + ldr r0, =0x085cca3a movs r1, 0x2 bl battle_show_message_maybe movs r4, 0 @@ -186504,36 +179245,30 @@ _0805C062: adds r4, 0x1 cmp r4, 0x3 ble _0805C062 - ldr r1, _0805C0A4 - ldr r0, _0805C098 + ldr r1, =0x020244ac + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - ldr r0, _0805C0A8 + ldr r0, =0x085cc9f3 bl sub_814E6F0 - ldr r0, _0805C0AC + ldr r0, =0x02022e2c movs r1, 0x1 bl battle_show_message_maybe pop {r4} pop {r0} bx r0 .align 2, 0 -_0805C094: .4byte 0x03005d60 -_0805C098: .4byte 0x02024064 -_0805C09C: .4byte sub_805C004 + 1 -_0805C0A0: .4byte 0x085cca3a -_0805C0A4: .4byte 0x020244ac -_0805C0A8: .4byte 0x085cc9f3 -_0805C0AC: .4byte 0x02022e2c + .pool thumb_func_end dp01t_12_6_battle_menu thumb_func_start sub_805C0B0 sub_805C0B0: @ 805C0B0 push {r4,lr} sub sp, 0x4 - ldr r4, _0805C0F4 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -186546,27 +179281,23 @@ sub_805C0B0: @ 805C0B0 movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, _0805C0F8 + ldr r0, =0x085ccabb movs r1, 0xC bl battle_show_message_maybe - ldr r1, _0805C0FC + ldr r1, =0x03005d74 movs r0, 0x1 strb r0, [r1] movs r0, 0x1 bl sub_8056B74 - ldr r1, _0805C100 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0805C104 + ldr r1, =sub_80599D4 + 1 str r1, [r0] b _0805C10C .align 2, 0 -_0805C0F4: .4byte 0x02024064 -_0805C0F8: .4byte 0x085ccabb -_0805C0FC: .4byte 0x03005d74 -_0805C100: .4byte 0x03005d60 -_0805C104: .4byte sub_80599D4 + 1 + .pool _0805C108: bl dp01_tbl1_exec_completed _0805C10C: @@ -186584,37 +179315,33 @@ sub_805C114: @ 805C114 lsrs r1, r0, 24 cmp r1, 0 bne _0805C13E - ldr r0, _0805C144 + ldr r0, =0x02022e14 strh r1, [r0] - ldr r1, _0805C148 + ldr r1, =0x02022e16 movs r2, 0xA0 lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - ldr r1, _0805C14C - ldr r0, _0805C150 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0805C154 + ldr r1, =sub_8057BFC + 1 str r1, [r0] _0805C13E: pop {r0} bx r0 .align 2, 0 -_0805C144: .4byte 0x02022e14 -_0805C148: .4byte 0x02022e16 -_0805C14C: .4byte 0x03005d60 -_0805C150: .4byte 0x02024064 -_0805C154: .4byte sub_8057BFC + 1 + .pool thumb_func_end sub_805C114 thumb_func_start sub_805C158 sub_805C158: @ 805C158 push {lr} - ldr r0, _0805C198 + ldr r0, =0x02024064 ldrb r1, [r0] - ldr r0, _0805C19C + ldr r0, =0x0202449c ldr r0, [r0] adds r1, r0 movs r0, 0xA6 @@ -186626,8 +179353,8 @@ sub_805C158: @ 805C158 lsls r0, 24 cmp r0, 0 bne _0805C194 - ldr r1, _0805C1A0 - ldr r0, _0805C1A4 + ldr r1, =0x0203bd30 + ldr r0, =0x03005d80 ldr r0, [r0] str r0, [r1] bl sub_805D19C @@ -186642,25 +179369,22 @@ _0805C194: pop {r0} bx r0 .align 2, 0 -_0805C198: .4byte 0x02024064 -_0805C19C: .4byte 0x0202449c -_0805C1A0: .4byte 0x0203bd30 -_0805C1A4: .4byte 0x03005d80 + .pool thumb_func_end sub_805C158 thumb_func_start dp01t_14_5_move_menu_pokedude dp01t_14_5_move_menu_pokedude: @ 805C1A8 push {lr} - ldr r0, _0805C1D8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 beq _0805C1EC - ldr r2, _0805C1DC + ldr r2, =0x02024064 ldrb r0, [r2] - ldr r1, _0805C1E0 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 movs r1, 0xA6 @@ -186668,45 +179392,39 @@ dp01t_14_5_move_menu_pokedude: @ 805C1A8 adds r0, r1 movs r1, 0x8 strb r1, [r0] - ldr r1, _0805C1E4 + ldr r1, =0x03005d60 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _0805C1E8 + ldr r1, =sub_805C158 + 1 b _0805C1FC .align 2, 0 -_0805C1D8: .4byte 0x02022fec -_0805C1DC: .4byte 0x02024064 -_0805C1E0: .4byte 0x0202449c -_0805C1E4: .4byte 0x03005d60 -_0805C1E8: .4byte sub_805C158 + 1 + .pool _0805C1EC: bl sub_805C210 - ldr r1, _0805C204 - ldr r0, _0805C208 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0805C20C + ldr r1, =sub_805C114 + 1 _0805C1FC: str r1, [r0] pop {r0} bx r0 .align 2, 0 -_0805C204: .4byte 0x03005d60 -_0805C208: .4byte 0x02024064 -_0805C20C: .4byte sub_805C114 + 1 + .pool thumb_func_end dp01t_14_5_move_menu_pokedude thumb_func_start sub_805C210 sub_805C210: @ 805C210 push {lr} bl sub_8059AAC - ldr r1, _0805C23C + ldr r1, =0x03005d74 movs r0, 0xFF strb r0, [r1] - ldr r1, _0805C240 - ldr r0, _0805C244 + ldr r1, =0x020244b0 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -186718,9 +179436,7 @@ sub_805C210: @ 805C210 pop {r0} bx r0 .align 2, 0 -_0805C23C: .4byte 0x03005d74 -_0805C240: .4byte 0x020244b0 -_0805C244: .4byte 0x02024064 + .pool thumb_func_end sub_805C210 thumb_func_start sub_805C248 @@ -186734,19 +179450,19 @@ sub_805C248: @ 805C248 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _0805C294 - ldr r2, _0805C298 + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _0805C29C + ldr r1, =sub_80598A4 + 1 str r1, [r0] - ldr r1, _0805C2A0 + ldr r1, =0x020244b8 ldrb r0, [r2] strb r0, [r1] movs r3, 0 - ldr r5, _0805C2A4 - ldr r4, _0805C2A8 + ldr r5, =0x0203cf00 + ldr r4, =0x02023064 _0805C276: adds r0, r3, r5 ldrb r1, [r2] @@ -186764,12 +179480,7 @@ _0805C276: pop {r0} bx r0 .align 2, 0 -_0805C294: .4byte 0x03005d60 -_0805C298: .4byte 0x02024064 -_0805C29C: .4byte sub_80598A4 + 1 -_0805C2A0: .4byte 0x020244b8 -_0805C2A4: .4byte 0x0203cf00 -_0805C2A8: .4byte 0x02023064 + .pool thumb_func_end sub_805C248 thumb_func_start sub_805C2AC @@ -186779,12 +179490,12 @@ sub_805C2AC: @ 805C2AC push {r7} sub sp, 0x4 movs r3, 0 - ldr r0, _0805C31C + ldr r0, =0x0203cf00 mov r12, r0 - ldr r1, _0805C320 + ldr r1, =0x02023064 mov r8, r1 - ldr r2, _0805C324 - ldr r7, _0805C328 + ldr r2, =0x02024064 + ldr r7, =0x02022fec mov r6, r12 mov r5, r8 adds r4, r2, 0 @@ -186816,7 +179527,7 @@ _0805C2C8: ands r0, r1 cmp r0, 0x2 beq _0805C330 - ldr r1, _0805C32C + ldr r1, =0x0202406e lsls r0, r3, 1 adds r0, r1 ldrb r1, [r0] @@ -186829,23 +179540,19 @@ _0805C2C8: bl dp01_tbl1_exec_completed b _0805C3BC .align 2, 0 -_0805C31C: .4byte 0x0203cf00 -_0805C320: .4byte 0x02023064 -_0805C324: .4byte 0x02024064 -_0805C328: .4byte 0x02022fec -_0805C32C: .4byte 0x0202406e + .pool _0805C330: - ldr r0, _0805C3C8 + ldr r0, =nullsub_4 + 1 movs r1, 0xFF bl AddTask - ldr r3, _0805C3CC - ldr r4, _0805C3D0 + ldr r3, =0x03005d7c + ldr r4, =0x02024064 ldrb r1, [r4] adds r1, r3 movs r2, 0 mov r8, r2 strb r0, [r1] - ldr r5, _0805C3D4 + ldr r5, =0x03005e00 ldrb r2, [r4] adds r3, r2, r3 ldrb r0, [r3] @@ -186853,7 +179560,7 @@ _0805C330: adds r1, r0 lsls r1, 3 adds r1, r5 - ldr r5, _0805C3D8 + ldr r5, =0x02023064 lsls r2, 9 adds r6, r5, 0x1 adds r2, r6 @@ -186861,7 +179568,7 @@ _0805C330: movs r0, 0xF ands r0, r2 strh r0, [r1, 0x8] - ldr r3, _0805C3DC + ldr r3, =0x0202449c ldr r1, [r3] adds r1, 0x49 ldrb r0, [r4] @@ -186894,13 +179601,13 @@ _0805C330: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _0805C3E0 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0805C3E4 + ldr r1, =sub_80597CC + 1 str r1, [r0] - ldr r1, _0805C3E8 + ldr r1, =0x020244b8 ldrb r0, [r4] strb r0, [r1] _0805C3BC: @@ -186911,15 +179618,7 @@ _0805C3BC: pop {r0} bx r0 .align 2, 0 -_0805C3C8: .4byte nullsub_4 + 1 -_0805C3CC: .4byte 0x03005d7c -_0805C3D0: .4byte 0x02024064 -_0805C3D4: .4byte 0x03005e00 -_0805C3D8: .4byte 0x02023064 -_0805C3DC: .4byte 0x0202449c -_0805C3E0: .4byte 0x03005d60 -_0805C3E4: .4byte sub_80597CC + 1 -_0805C3E8: .4byte 0x020244b8 + .pool thumb_func_end sub_805C2AC thumb_func_start sub_805C3EC @@ -186950,8 +179649,8 @@ sub_805C410: @ 805C410 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _0805C498 - ldr r0, _0805C49C + ldr r3, =0x02023064 + ldr r0, =0x02024064 mov r9, r0 ldrb r1, [r0] lsls r1, 9 @@ -186967,15 +179666,15 @@ sub_805C410: @ 805C410 asrs r7, r2, 16 cmp r7, 0 ble _0805C44A - ldr r1, _0805C4A0 + ldr r1, =0x0203cd70 ldr r0, [r1] adds r0, r7 str r0, [r1] _0805C44A: - ldr r0, _0805C4A4 + ldr r0, =0x00007fff cmp r7, r0 beq _0805C4B4 - ldr r6, _0805C4A8 + ldr r6, =0x0202406e mov r1, r9 ldrb r0, [r1] lsls r0, 1 @@ -186983,7 +179682,7 @@ _0805C44A: ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _0805C4AC + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x3A bl pokemon_getattr @@ -187000,7 +179699,7 @@ _0805C44A: adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _0805C4B0 + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -187008,15 +179707,9 @@ _0805C44A: bl sub_807294C b _0805C4F2 .align 2, 0 -_0805C498: .4byte 0x02023064 -_0805C49C: .4byte 0x02024064 -_0805C4A0: .4byte 0x0203cd70 -_0805C4A4: .4byte 0x00007fff -_0805C4A8: .4byte 0x0202406e -_0805C4AC: .4byte 0x020244ec -_0805C4B0: .4byte 0x03005d70 + .pool _0805C4B4: - ldr r1, _0805C510 + ldr r1, =0x0202406e mov r2, r9 ldrb r0, [r2] lsls r0, 1 @@ -187024,14 +179717,14 @@ _0805C4B4: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0805C514 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A bl pokemon_getattr adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r4, _0805C518 + ldr r4, =0x03005d70 adds r1, r0, r4 ldrb r1, [r1] str r7, [sp] @@ -187045,12 +179738,12 @@ _0805C4B4: movs r2, 0 bl heathbar_draw_hp _0805C4F2: - ldr r1, _0805C51C - ldr r0, _0805C520 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0805C524 + ldr r1, =bx_t1_healthbar_update + 1 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -187060,19 +179753,14 @@ _0805C4F2: pop {r0} bx r0 .align 2, 0 -_0805C510: .4byte 0x0202406e -_0805C514: .4byte 0x020244ec -_0805C518: .4byte 0x03005d70 -_0805C51C: .4byte 0x03005d60 -_0805C520: .4byte 0x02024064 -_0805C524: .4byte bx_t1_healthbar_update + 1 + .pool thumb_func_end sub_805C410 thumb_func_start sub_805C528 sub_805C528: @ 805C528 push {r4-r7,lr} - ldr r5, _0805C554 - ldr r6, _0805C558 + ldr r5, =0x02023064 + ldr r6, =0x02024064 ldrb r0, [r6] lsls r0, 9 adds r1, r5, 0x1 @@ -187081,7 +179769,7 @@ sub_805C528: @ 805C528 movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0805C55C + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x38 @@ -187091,9 +179779,7 @@ sub_805C528: @ 805C528 bl dp01_tbl1_exec_completed b _0805C5AC .align 2, 0 -_0805C554: .4byte 0x02023064 -_0805C558: .4byte 0x02024064 -_0805C55C: .4byte 0x020244ec + .pool _0805C560: movs r0, 0x1 bl load_gfxc_health_bar @@ -187110,12 +179796,12 @@ _0805C560: ldrb r0, [r1] lsls r0, 8 orrs r4, r0 - ldr r0, _0805C5B4 + ldr r0, =sub_80591B8 + 1 movs r1, 0xA bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0805C5B8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -187124,48 +179810,45 @@ _0805C560: strh r4, [r1, 0xA] ldrb r0, [r6] strh r0, [r1, 0xC] - ldr r1, _0805C5BC + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _0805C5C0 + ldr r1, =nullsub_21 + 1 str r1, [r0] _0805C5AC: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0805C5B4: .4byte sub_80591B8 + 1 -_0805C5B8: .4byte 0x03005e00 -_0805C5BC: .4byte 0x03005d60 -_0805C5C0: .4byte nullsub_21 + 1 + .pool thumb_func_end sub_805C528 thumb_func_start sub_805C5C4 sub_805C5C4: @ 805C5C4 push {r4,lr} - ldr r4, _0805C620 + ldr r4, =0x02024064 ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0805C618 - ldr r0, _0805C624 + ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _0805C628 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0805C62C + ldr r2, =0x020244ec adds r1, r2 movs r2, 0x9 bl healthbar_draw_field_maybe ldrb r2, [r4] - ldr r0, _0805C630 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -187177,36 +179860,30 @@ sub_805C5C4: @ 805C5C4 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _0805C634 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0805C638 + ldr r1, =sub_8059D60 + 1 str r1, [r0] _0805C618: pop {r4} pop {r0} bx r0 .align 2, 0 -_0805C620: .4byte 0x02024064 -_0805C624: .4byte 0x03005d70 -_0805C628: .4byte 0x0202406e -_0805C62C: .4byte 0x020244ec -_0805C630: .4byte 0x020244d0 -_0805C634: .4byte 0x03005d60 -_0805C638: .4byte sub_8059D60 + 1 + .pool thumb_func_end sub_805C5C4 thumb_func_start sub_805C63C sub_805C63C: @ 805C63C push {r4,r5,lr} - ldr r5, _0805C694 + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0805C68C - ldr r4, _0805C698 + ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -187231,21 +179908,18 @@ sub_805C63C: @ 805C63C lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, _0805C69C + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805C6A0 + ldr r1, =sub_8059D60 + 1 str r1, [r0] _0805C68C: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0805C694: .4byte 0x02024064 -_0805C698: .4byte 0x02023064 -_0805C69C: .4byte 0x03005d60 -_0805C6A0: .4byte sub_8059D60 + 1 + .pool thumb_func_end sub_805C63C thumb_func_start sub_805C6A4 @@ -187254,20 +179928,20 @@ sub_805C6A4: @ 805C6A4 mov r6, r8 push {r6} sub sp, 0x4 - ldr r0, _0805C700 + ldr r0, =0x0202406e mov r8, r0 - ldr r4, _0805C704 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 1 add r0, r8 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _0805C708 + ldr r5, =0x020244ec adds r0, r5 movs r1, 0x37 bl pokemon_getattr - ldr r2, _0805C70C + ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 adds r2, 0x1 @@ -187293,10 +179967,7 @@ sub_805C6A4: @ 805C6A4 pop {r0} bx r0 .align 2, 0 -_0805C700: .4byte 0x0202406e -_0805C704: .4byte 0x02024064 -_0805C708: .4byte 0x020244ec -_0805C70C: .4byte 0x02023064 + .pool thumb_func_end sub_805C6A4 thumb_func_start sub_805C710 @@ -187310,8 +179981,8 @@ sub_805C710: @ 805C710 thumb_func_start sub_805C71C sub_805C71C: @ 805C71C push {r4,r5,lr} - ldr r3, _0805C780 - ldr r0, _0805C784 + ldr r3, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r2, 9 adds r0, r3, 0x1 @@ -187348,7 +180019,7 @@ sub_805C71C: @ 805C71C lsls r0, 5 cmp r4, r0 bhi _0805C78C - ldr r0, _0805C788 + ldr r0, =0x040000d4 str r2, [r0] str r5, [r0, 0x4] lsrs r1, 17 @@ -187359,21 +180030,19 @@ sub_805C71C: @ 805C71C ldr r0, [r0, 0x8] b _0805C7B8 .align 2, 0 -_0805C780: .4byte 0x02023064 -_0805C784: .4byte 0x02024064 -_0805C788: .4byte 0x040000d4 + .pool _0805C78C: - ldr r3, _0805C7C4 + ldr r3, =0x040000d4 str r2, [r3] str r5, [r3, 0x4] - ldr r0, _0805C7C8 + ldr r0, =0x80000800 str r0, [r3, 0x8] ldr r0, [r3, 0x8] movs r0, 0x80 lsls r0, 5 adds r2, r0 adds r5, r0 - ldr r1, _0805C7CC + ldr r1, =0xfffff000 adds r4, r1 cmp r4, r0 bhi _0805C78C @@ -187391,16 +180060,14 @@ _0805C7B8: pop {r0} bx r0 .align 2, 0 -_0805C7C4: .4byte 0x040000d4 -_0805C7C8: .4byte 0x80000800 -_0805C7CC: .4byte 0xfffff000 + .pool thumb_func_end sub_805C71C thumb_func_start sub_805C7D0 sub_805C7D0: @ 805C7D0 push {lr} - ldr r2, _0805C7F8 - ldr r0, _0805C7FC + ldr r2, =0x02023064 + ldr r0, =0x02024064 ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -187416,8 +180083,7 @@ sub_805C7D0: @ 805C7D0 pop {r0} bx r0 .align 2, 0 -_0805C7F8: .4byte 0x02023064 -_0805C7FC: .4byte 0x02024064 + .pool thumb_func_end sub_805C7D0 thumb_func_start sub_805C800 @@ -187477,7 +180143,7 @@ sub_805C848: @ 805C848 thumb_func_start sub_805C85C sub_805C85C: @ 805C85C push {lr} - ldr r2, _0805C874 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x80 negs r0, r0 @@ -187487,15 +180153,15 @@ sub_805C85C: @ 805C85C pop {r0} bx r0 .align 2, 0 -_0805C874: .4byte 0x02022d0c + .pool thumb_func_end sub_805C85C thumb_func_start sub_805C878 sub_805C878: @ 805C878 push {lr} - ldr r3, _0805C8A4 - ldr r1, _0805C8A8 - ldr r0, _0805C8AC + ldr r3, =0x02022d0c + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -187513,15 +180179,13 @@ sub_805C878: @ 805C878 pop {r0} bx r0 .align 2, 0 -_0805C8A4: .4byte 0x02022d0c -_0805C8A8: .4byte 0x02023064 -_0805C8AC: .4byte 0x02024064 + .pool thumb_func_end sub_805C878 thumb_func_start sub_805C8B0 sub_805C8B0: @ 805C8B0 push {lr} - ldr r2, _0805C8C4 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -187530,13 +180194,13 @@ sub_805C8B0: @ 805C8B0 pop {r0} bx r0 .align 2, 0 -_0805C8C4: .4byte 0x02022d0c + .pool thumb_func_end sub_805C8B0 thumb_func_start sub_805C8C8 sub_805C8C8: @ 805C8C8 push {lr} - ldr r3, _0805C8EC + ldr r3, =0x02022d0c ldr r1, [r3] lsls r1, 24 lsrs r1, 31 @@ -187552,15 +180216,15 @@ sub_805C8C8: @ 805C8C8 pop {r0} bx r0 .align 2, 0 -_0805C8EC: .4byte 0x02022d0c + .pool thumb_func_end sub_805C8C8 thumb_func_start dp01t_29_1_blink dp01t_29_1_blink: @ 805C8F0 push {r4,lr} - ldr r3, _0805C918 - ldr r2, _0805C91C - ldr r4, _0805C920 + ldr r3, =0x02020630 + ldr r2, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -187576,11 +180240,9 @@ dp01t_29_1_blink: @ 805C8F0 bl dp01_tbl1_exec_completed b _0805C94E .align 2, 0 -_0805C918: .4byte 0x02020630 -_0805C91C: .4byte 0x020241e4 -_0805C920: .4byte 0x02024064 + .pool _0805C924: - ldr r1, _0805C954 + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -187594,20 +180256,18 @@ _0805C924: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, _0805C958 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0805C95C + ldr r1, =bx_blink_t1 + 1 str r1, [r0] _0805C94E: pop {r4} pop {r0} bx r0 .align 2, 0 -_0805C954: .4byte 0x020244b9 -_0805C958: .4byte 0x03005d60 -_0805C95C: .4byte bx_blink_t1 + 1 + .pool thumb_func_end dp01t_29_1_blink thumb_func_start sub_805C960 @@ -187621,7 +180281,7 @@ sub_805C960: @ 805C960 thumb_func_start sub_805C96C sub_805C96C: @ 805C96C push {r4,lr} - ldr r4, _0805C9A8 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -187630,7 +180290,7 @@ sub_805C96C: @ 805C96C bne _0805C980 movs r3, 0xC0 _0805C980: - ldr r2, _0805C9AC + ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -187649,15 +180309,14 @@ _0805C980: pop {r0} bx r0 .align 2, 0 -_0805C9A8: .4byte 0x02024064 -_0805C9AC: .4byte 0x02023064 + .pool thumb_func_end sub_805C96C thumb_func_start sub_805C9B0 sub_805C9B0: @ 805C9B0 push {r4,r5,lr} - ldr r4, _0805C9E4 - ldr r5, _0805C9E8 + ldr r4, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -187679,8 +180338,7 @@ sub_805C9B0: @ 805C9B0 bl song_play_for_text b _0805CA00 .align 2, 0 -_0805C9E4: .4byte 0x02023064 -_0805C9E8: .4byte 0x02024064 + .pool _0805C9EC: adds r0, r4, 0x1 adds r0, r3, r0 @@ -187701,15 +180359,15 @@ _0805CA00: thumb_func_start sub_805CA0C sub_805CA0C: @ 805CA0C push {lr} - ldr r1, _0805CA40 - ldr r0, _0805CA44 + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0805CA48 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -187723,23 +180381,21 @@ sub_805CA0C: @ 805CA0C pop {r0} bx r0 .align 2, 0 -_0805CA40: .4byte 0x0202406e -_0805CA44: .4byte 0x02024064 -_0805CA48: .4byte 0x020244ec + .pool thumb_func_end sub_805CA0C thumb_func_start dp01t_2E_1_battle_intro dp01t_2E_1_battle_intro: @ 805CA4C push {lr} - ldr r1, _0805CA74 - ldr r0, _0805CA78 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r0, [r0] bl battle_intro_launch - ldr r2, _0805CA7C + ldr r2, =0x020243fc ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -187748,23 +180404,21 @@ dp01t_2E_1_battle_intro: @ 805CA4C pop {r0} bx r0 .align 2, 0 -_0805CA74: .4byte 0x02023064 -_0805CA78: .4byte 0x02024064 -_0805CA7C: .4byte 0x020243fc + .pool thumb_func_end dp01t_2E_1_battle_intro thumb_func_start dp01t_2F_1_pokemon_enter dp01t_2F_1_pokemon_enter: @ 805CA80 push {r4-r7,lr} - ldr r6, _0805CBC0 - ldr r7, _0805CBC4 + ldr r6, =0x020241e4 + ldr r7, =0x02024064 ldrb r0, [r7] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0805CBC8 + ldr r5, =0x02020630 adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r7] @@ -187783,7 +180437,7 @@ dp01t_2F_1_pokemon_enter: @ 805CA80 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0805CBCC + ldr r1, =0x0000ffd8 strh r1, [r0, 0x32] ldrb r0, [r7] adds r0, r6 @@ -187803,7 +180457,7 @@ dp01t_2F_1_pokemon_enter: @ 805CA80 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0805CBD0 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r2, [r7] adds r0, r2, r6 @@ -187820,7 +180474,7 @@ dp01t_2F_1_pokemon_enter: @ 805CA80 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0805CBD4 + ldr r1, =sub_805CC00 + 1 bl oamt_set_x3A_32 ldrb r0, [r7] adds r0, r6 @@ -187831,12 +180485,12 @@ dp01t_2F_1_pokemon_enter: @ 805CA80 adds r0, r5 movs r1, 0x1 bl obj_anim_image_start - ldr r0, _0805CBD8 + ldr r0, =0x0000d6f8 bl gpu_pal_alloc_new adds r4, r0, 0 lsls r4, 24 - ldr r1, _0805CBDC - ldr r0, _0805CBE0 + ldr r1, =0x08305d8c + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 3 @@ -187860,19 +180514,19 @@ dp01t_2F_1_pokemon_enter: @ 805CA80 ands r0, r2 orrs r0, r4 strb r0, [r1, 0x5] - ldr r0, _0805CBE4 + ldr r0, =task05_08033660 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r4, _0805CBE8 + ldr r4, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r4 ldrb r0, [r7] strh r0, [r1, 0x8] - ldr r3, _0805CBEC + ldr r3, =0x020244d0 ldr r0, [r3] ldrb r2, [r7] ldr r1, [r0, 0x4] @@ -187885,14 +180539,14 @@ dp01t_2F_1_pokemon_enter: @ 805CA80 ands r0, r1 cmp r0, 0 beq _0805CBA2 - ldr r0, _0805CBF0 + ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, _0805CBF4 + ldr r1, =sub_8073C30 + 1 str r1, [r0] _0805CBA2: ldr r0, [r3] @@ -187901,32 +180555,17 @@ _0805CBA2: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _0805CBF8 + ldr r1, =0x03005d60 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, _0805CBFC + ldr r1, =nullsub_21 + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0805CBC0: .4byte 0x020241e4 -_0805CBC4: .4byte 0x02024064 -_0805CBC8: .4byte 0x02020630 -_0805CBCC: .4byte 0x0000ffd8 -_0805CBD0: .4byte sub_80A6EEC + 1 -_0805CBD4: .4byte sub_805CC00 + 1 -_0805CBD8: .4byte 0x0000d6f8 -_0805CBDC: .4byte 0x08305d8c -_0805CBE0: .4byte 0x03005d90 -_0805CBE4: .4byte task05_08033660 + 1 -_0805CBE8: .4byte 0x03005e00 -_0805CBEC: .4byte 0x020244d0 -_0805CBF0: .4byte 0x020244b4 -_0805CBF4: .4byte sub_8073C30 + 1 -_0805CBF8: .4byte 0x03005d60 -_0805CBFC: .4byte nullsub_21 + 1 + .pool thumb_func_end dp01t_2F_1_pokemon_enter thumb_func_start sub_805CC00 @@ -187945,23 +180584,23 @@ sub_805CC00: @ 805CC00 bl gpu_pal_free_tag adds r0, r5, 0 bl obj_delete_and_free_tiles - ldr r1, _0805CC58 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0805CC5C + ldr r1, =0x020244ec adds r0, r1 adds r1, r4, 0 bl sub_805DD7C - ldr r0, _0805CC60 + ldr r0, =0x020241e4 adds r4, r0 ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805CC64 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 bl obj_anim_image_start @@ -187969,10 +180608,7 @@ sub_805CC00: @ 805CC00 pop {r0} bx r0 .align 2, 0 -_0805CC58: .4byte 0x0202406e -_0805CC5C: .4byte 0x020244ec -_0805CC60: .4byte 0x020241e4 -_0805CC64: .4byte 0x02020630 + .pool thumb_func_end sub_805CC00 thumb_func_start task05_08033660 @@ -187984,7 +180620,7 @@ task05_08033660: @ 805CC68 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _0805CC90 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -187998,9 +180634,9 @@ task05_08033660: @ 805CC68 strh r0, [r1, 0xA] b _0805CD50 .align 2, 0 -_0805CC90: .4byte 0x03005e00 + .pool _0805CC94: - ldr r7, _0805CCD4 + ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 ldrh r0, [r1, 0x8] @@ -188009,19 +180645,19 @@ _0805CC94: lsls r0, 24 cmp r0, 0 beq _0805CCB4 - ldr r0, _0805CCD8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _0805CCE4 _0805CCB4: - ldr r0, _0805CCDC + ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _0805CCE0 + ldr r0, =0x0202406e lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -188031,17 +180667,14 @@ _0805CCB4: bl sub_805B258 b _0805CD38 .align 2, 0 -_0805CCD4: .4byte 0x02024064 -_0805CCD8: .4byte 0x02022fec -_0805CCDC: .4byte 0x02023064 -_0805CCE0: .4byte 0x0202406e + .pool _0805CCE4: - ldr r4, _0805CD5C + ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r5, _0805CD60 + ldr r5, =0x0202406e lsls r0, 1 adds r0, r5 ldrh r0, [r0] @@ -188066,7 +180699,7 @@ _0805CCE4: ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0805CD64 + ldr r2, =0x020244ec adds r0, r2 bl sub_805DD7C ldrb r0, [r7] @@ -188076,12 +180709,12 @@ _0805CCE4: eors r0, r6 strb r0, [r7] _0805CD38: - ldr r1, _0805CD68 - ldr r2, _0805CD6C + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _0805CD70 + ldr r1, =sub_8058B40 + 1 str r1, [r0] mov r3, r9 strb r3, [r2] @@ -188095,19 +180728,14 @@ _0805CD50: pop {r0} bx r0 .align 2, 0 -_0805CD5C: .4byte 0x02023064 -_0805CD60: .4byte 0x0202406e -_0805CD64: .4byte 0x020244ec -_0805CD68: .4byte 0x03005d60 -_0805CD6C: .4byte 0x02024064 -_0805CD70: .4byte sub_8058B40 + 1 + .pool thumb_func_end task05_08033660 thumb_func_start sub_805CD74 sub_805CD74: @ 805CD74 push {r4-r6,lr} - ldr r1, _0805CD9C - ldr r0, _0805CDA0 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -188123,12 +180751,11 @@ sub_805CD74: @ 805CD74 bl dp01_tbl1_exec_completed b _0805CE18 .align 2, 0 -_0805CD9C: .4byte 0x02023064 -_0805CDA0: .4byte 0x02024064 + .pool _0805CDA4: - ldr r6, _0805CE20 + ldr r6, =0x020244d0 ldr r0, [r6] - ldr r5, _0805CE24 + ldr r5, =0x02024064 ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -188141,7 +180768,7 @@ _0805CDA4: strb r1, [r0] ldrb r0, [r5] lsls r3, r0, 9 - ldr r4, _0805CE28 + ldr r4, =0x02023068 adds r1, r3, r4 subs r2, r4, 0x3 adds r2, r3, r2 @@ -188150,7 +180777,7 @@ _0805CDA4: adds r3, r4 ldrb r3, [r3] bl sub_80735DC - ldr r2, _0805CE2C + ldr r2, =0x020244b4 ldrb r1, [r5] adds r1, r2 movs r3, 0 @@ -188178,31 +180805,26 @@ _0805CDA4: movs r1, 0x5D strb r1, [r0, 0x5] _0805CE0C: - ldr r0, _0805CE30 + ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, _0805CE34 + ldr r0, =sub_805CE38 + 1 str r0, [r1] _0805CE18: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0805CE20: .4byte 0x020244d0 -_0805CE24: .4byte 0x02024064 -_0805CE28: .4byte 0x02023068 -_0805CE2C: .4byte 0x020244b4 -_0805CE30: .4byte 0x03005d60 -_0805CE34: .4byte sub_805CE38 + 1 + .pool thumb_func_end sub_805CD74 thumb_func_start sub_805CE38 sub_805CE38: @ 805CE38 push {r4,lr} - ldr r4, _0805CE78 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _0805CE7C + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -188231,16 +180853,15 @@ _0805CE70: pop {r0} bx r0 .align 2, 0 -_0805CE78: .4byte 0x020244d0 -_0805CE7C: .4byte 0x02024064 + .pool thumb_func_end sub_805CE38 thumb_func_start sub_805CE80 sub_805CE80: @ 805CE80 push {lr} - ldr r0, _0805CEBC + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _0805CEC0 + ldr r0, =0x02024064 ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -188252,32 +180873,28 @@ sub_805CE80: @ 805CE80 ands r0, r1 cmp r0, 0 beq _0805CEB2 - ldr r2, _0805CEC4 - ldr r0, _0805CEC8 + ldr r2, =0x03005e00 + ldr r0, =0x020244b4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _0805CECC + ldr r1, =sub_8073C30 + 1 str r1, [r0] _0805CEB2: bl dp01_tbl1_exec_completed pop {r0} bx r0 .align 2, 0 -_0805CEBC: .4byte 0x020244d0 -_0805CEC0: .4byte 0x02024064 -_0805CEC4: .4byte 0x03005e00 -_0805CEC8: .4byte 0x020244b4 -_0805CECC: .4byte sub_8073C30 + 1 + .pool thumb_func_end sub_805CE80 thumb_func_start sub_805CED0 sub_805CED0: @ 805CED0 push {r4,lr} - ldr r4, _0805CEF0 + ldr r4, =0x02024064 ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free @@ -188289,20 +180906,20 @@ sub_805CED0: @ 805CED0 pop {r0} bx r0 .align 2, 0 -_0805CEF0: .4byte 0x02024064 + .pool thumb_func_end sub_805CED0 thumb_func_start dp01t_33_1_enemy_move dp01t_33_1_enemy_move: @ 805CEF4 push {r4,lr} - ldr r4, _0805CF44 + ldr r4, =0x02024064 ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _0805CF3A - ldr r3, _0805CF48 - ldr r0, _0805CF4C + ldr r3, =0x02020630 + ldr r0, =0x020241e4 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -188310,7 +180927,7 @@ dp01t_33_1_enemy_move: @ 805CEF4 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, _0805CF50 + ldr r0, =0x02023064 lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -188333,23 +180950,20 @@ _0805CF3A: pop {r0} bx r0 .align 2, 0 -_0805CF44: .4byte 0x02024064 -_0805CF48: .4byte 0x02020630 -_0805CF4C: .4byte 0x020241e4 -_0805CF50: .4byte 0x02023064 + .pool thumb_func_end dp01t_33_1_enemy_move thumb_func_start sub_805CF54 sub_805CF54: @ 805CF54 push {r4-r6,lr} sub sp, 0x4 - ldr r5, _0805CF9C + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0805CFB6 - ldr r4, _0805CFA0 + ldr r4, =0x02023064 ldrb r2, [r5] lsls r1, r2, 9 adds r0, r4, 0x1 @@ -188374,14 +180988,13 @@ sub_805CF54: @ 805CF54 bl dp01_tbl1_exec_completed b _0805CFB0 .align 2, 0 -_0805CF9C: .4byte 0x02024064 -_0805CFA0: .4byte 0x02023064 + .pool _0805CFA4: - ldr r0, _0805CFC0 + ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, _0805CFC4 + ldr r0, =bx_8030B2C + 1 str r0, [r1] _0805CFB0: adds r0, r6, 0 @@ -188392,17 +181005,16 @@ _0805CFB6: pop {r0} bx r0 .align 2, 0 -_0805CFC0: .4byte 0x03005d60 -_0805CFC4: .4byte bx_8030B2C + 1 + .pool thumb_func_end sub_805CF54 thumb_func_start dp01t_35_1_link_standby_message_and_free_vram dp01t_35_1_link_standby_message_and_free_vram: @ 805CFC8 push {r4,r5,lr} - ldr r5, _0805CFF0 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r0, 9 - ldr r4, _0805CFF4 + ldr r4, =0x02023066 adds r0, r4 bl sub_81851A8 ldrb r0, [r5] @@ -188418,8 +181030,7 @@ dp01t_35_1_link_standby_message_and_free_vram: @ 805CFC8 beq _0805CFFE b _0805D020 .align 2, 0 -_0805CFF0: .4byte 0x02024064 -_0805CFF4: .4byte 0x02023066 + .pool _0805CFF8: cmp r0, 0x2 beq _0805D01C @@ -188427,7 +181038,7 @@ _0805CFF8: _0805CFFE: bl b_link_standby_message _0805D002: - ldr r4, _0805D018 + ldr r4, =0x02024064 ldrb r0, [r4] movs r1, 0x1 bl dp11b_obj_free @@ -188436,7 +181047,7 @@ _0805D002: bl dp11b_obj_free b _0805D020 .align 2, 0 -_0805D018: .4byte 0x02024064 + .pool _0805D01C: bl b_link_standby_message _0805D020: @@ -188449,8 +181060,8 @@ _0805D020: thumb_func_start sub_805D02C sub_805D02C: @ 805D02C push {r4,lr} - ldr r1, _0805D04C - ldr r4, _0805D050 + ldr r1, =0x02023064 + ldr r4, =0x02024064 ldrb r3, [r4] lsls r0, r3, 9 adds r1, 0x1 @@ -188464,31 +181075,29 @@ sub_805D02C: @ 805D02C beq _0805D05A b _0805D084 .align 2, 0 -_0805D04C: .4byte 0x02023064 -_0805D050: .4byte 0x02024064 + .pool _0805D054: cmp r2, 0x2 beq _0805D07C b _0805D084 _0805D05A: - ldr r0, _0805D06C + ldr r0, =0x020244ac adds r0, r3, r0 strb r2, [r0] - ldr r1, _0805D070 + ldr r1, =0x020244b0 ldrb r0, [r4] adds r0, r1 strb r2, [r0] b _0805D084 .align 2, 0 -_0805D06C: .4byte 0x020244ac -_0805D070: .4byte 0x020244b0 + .pool _0805D074: - ldr r0, _0805D078 + ldr r0, =0x020244ac b _0805D07E .align 2, 0 -_0805D078: .4byte 0x020244ac + .pool _0805D07C: - ldr r0, _0805D090 + ldr r0, =0x020244b0 _0805D07E: adds r0, r3, r0 movs r1, 0 @@ -188499,33 +181108,33 @@ _0805D084: pop {r0} bx r0 .align 2, 0 -_0805D090: .4byte 0x020244b0 + .pool thumb_func_end sub_805D02C thumb_func_start sub_805D094 sub_805D094: @ 805D094 push {r4,r5,lr} - ldr r5, _0805D0F8 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r0, 9 - ldr r4, _0805D0FC + ldr r4, =0x02023068 adds r0, r4 bl sub_81851A8 - ldr r2, _0805D100 + ldr r2, =0x0202433a ldrb r0, [r5] lsls r0, 9 subs r1, r4, 0x3 adds r0, r1 ldrb r0, [r0] strb r0, [r2] - ldr r0, _0805D104 + ldr r0, =0x03005d90 ldr r3, [r0] ldrb r0, [r5] lsls r0, 9 subs r4, 0x2 adds r0, r4 ldrb r0, [r0] - ldr r1, _0805D108 + ldr r1, =0x00000ca9 adds r3, r1 movs r1, 0x1 ands r1, r0 @@ -188541,23 +181150,17 @@ sub_805D094: @ 805D094 movs r0, 0x3 bl sub_80A2390 bl dp01_tbl1_exec_completed - ldr r1, _0805D10C + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805D110 + ldr r1, =sub_80587B0 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0805D0F8: .4byte 0x02024064 -_0805D0FC: .4byte 0x02023068 -_0805D100: .4byte 0x0202433a -_0805D104: .4byte 0x03005d90 -_0805D108: .4byte 0x00000ca9 -_0805D10C: .4byte 0x03005d60 -_0805D110: .4byte sub_80587B0 + 1 + .pool thumb_func_end sub_805D094 thumb_func_start nullsub_22 @@ -188568,7 +181171,7 @@ nullsub_22: @ 805D114 thumb_func_start dp11_init dp11_init: @ 805D118 push {r4,lr} - ldr r4, _0805D154 + ldr r4, =0x020244d0 movs r0, 0x10 bl malloc_and_clear str r0, [r4] @@ -188592,13 +181195,13 @@ dp11_init: @ 805D118 pop {r0} bx r0 .align 2, 0 -_0805D154: .4byte 0x020244d0 + .pool thumb_func_end dp11_init thumb_func_start dp11_free dp11_free: @ 805D158 push {r4,r5,lr} - ldr r5, _0805D198 + ldr r5, =0x020244d0 ldr r0, [r5] cmp r0, 0 beq _0805D192 @@ -188626,7 +181229,7 @@ _0805D192: pop {r0} bx r0 .align 2, 0 -_0805D198: .4byte 0x020244d0 + .pool thumb_func_end dp11_free thumb_func_start sub_805D19C @@ -188639,10 +181242,10 @@ sub_805D19C: @ 805D19C movs r0, 0x1 negs r0, r0 mov r9, r0 - ldr r4, _0805D1FC + ldr r4, =0x02024064 ldrb r0, [r4] lsls r2, r0, 9 - ldr r1, _0805D200 + ldr r1, =0x02023068 adds r2, r1 mov r10, r2 movs r1, 0 @@ -188658,11 +181261,11 @@ sub_805D19C: @ 805D19C bl __umodsi3 lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _0805D204 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x92 ldrb r1, [r0] - ldr r2, _0805D208 + ldr r2, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r2 @@ -188677,27 +181280,24 @@ sub_805D19C: @ 805D19C adds r5, r4, 0x2 b _0805D20E .align 2, 0 -_0805D1FC: .4byte 0x02024064 -_0805D200: .4byte 0x02023068 -_0805D204: .4byte 0x0202449c -_0805D208: .4byte 0x0832a328 + .pool _0805D20C: adds r4, 0x1 _0805D20E: cmp r4, r5 bge _0805D234 - ldr r0, _0805D370 + ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 muls r0, r1 - ldr r1, _0805D374 + ldr r1, =0x020240cc adds r0, r1 ldr r0, [r0] bl getNature lsls r0, 24 lsrs r0, 22 adds r0, r4, r0 - ldr r2, _0805D378 + ldr r2, =0x0831c494 adds r0, r2 ldrb r0, [r0] cmp r0, r7 @@ -188728,7 +181328,7 @@ _0805D24A: ldrb r0, [r0] cmp r0, 0 beq _0805D26E - ldr r0, _0805D37C + ldr r0, =0x0832a328 lsls r1, r4, 2 adds r1, r0 ldr r0, [r1] @@ -188744,7 +181344,7 @@ _0805D26E: _0805D27C: cmp r6, 0 beq _0805D2AC - ldr r3, _0805D380 + ldr r3, =0x0202449c ldr r1, [r3] adds r1, 0x92 ldrb r2, [r1] @@ -188778,7 +181378,7 @@ _0805D2B6: _0805D2BE: movs r5, 0 movs r6, 0 - ldr r7, _0805D37C + ldr r7, =0x0832a328 mov r4, r10 _0805D2C6: ldrh r0, [r4] @@ -188823,7 +181423,7 @@ _0805D2F8: _0805D316: adds r7, 0x4 adds r4, 0x2 - ldr r0, _0805D37C + ldr r0, =0x0832a328 adds r0, 0xC cmp r7, r0 ble _0805D2C6 @@ -188839,7 +181439,7 @@ _0805D32C: ble _0805D336 adds r6, 0x1 _0805D336: - ldr r2, _0805D384 + ldr r2, =0x000001ff cmp r0, r2 ble _0805D33E adds r6, 0x1 @@ -188849,7 +181449,7 @@ _0805D33E: cmp r6, 0 bne _0805D388 _0805D346: - ldr r5, _0805D37C + ldr r5, =0x0832a328 _0805D348: bl GenerateRandomNumber lsls r0, 16 @@ -188872,12 +181472,7 @@ _0805D366: beq _0805D348 b _0805D3D4 .align 2, 0 -_0805D370: .4byte 0x02024064 -_0805D374: .4byte 0x020240cc -_0805D378: .4byte 0x0831c494 -_0805D37C: .4byte 0x0832a328 -_0805D380: .4byte 0x0202449c -_0805D384: .4byte 0x000001ff + .pool _0805D388: cmp r1, 0x1 ble _0805D38E @@ -188897,7 +181492,7 @@ _0805D39A: lsls r1, 10 ands r1, r0 lsrs r4, r1, 16 - ldr r1, _0805D400 + ldr r1, =0x0832a328 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] @@ -188930,8 +181525,8 @@ _0805D3D4: cmp r0, 0x31 bls _0805D40C _0805D3EA: - ldr r2, _0805D404 - ldr r0, _0805D408 + ldr r2, =0x0202433c + ldr r0, =0x02024064 ldrb r1, [r0] lsls r1, 4 adds r1, r2 @@ -188942,9 +181537,7 @@ _0805D3EA: movs r0, 0 b _0805D496 .align 2, 0 -_0805D400: .4byte 0x0832a328 -_0805D404: .4byte 0x0202433c -_0805D408: .4byte 0x02024064 + .pool _0805D40C: mov r1, r9 lsls r0, r1, 1 @@ -188967,7 +181560,7 @@ _0805D40C: ands r5, r0 b _0805D442 _0805D434: - ldr r2, _0805D454 + ldr r2, =0x0831c898 ldrh r1, [r1] lsls r0, r1, 1 adds r0, r1 @@ -188979,13 +181572,12 @@ _0805D442: ands r0, r5 cmp r0, 0 beq _0805D45C - ldr r0, _0805D458 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 8 b _0805D48A .align 2, 0 -_0805D454: .4byte 0x0831c898 -_0805D458: .4byte 0x02024064 + .pool _0805D45C: cmp r5, 0 bne _0805D470 @@ -188997,7 +181589,7 @@ _0805D45C: mov r9, r2 b _0805D490 _0805D470: - ldr r0, _0805D4A4 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status adds r1, r0, 0 @@ -189025,7 +181617,7 @@ _0805D496: pop {r1} bx r1 .align 2, 0 -_0805D4A4: .4byte 0x02024064 + .pool thumb_func_end sub_805D19C thumb_func_start sub_805D4A8 @@ -189033,7 +181625,7 @@ sub_805D4A8: @ 805D4A8 push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _0805D4CC + ldr r1, =0x0831c898 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -189045,13 +181637,12 @@ sub_805D4A8: @ 805D4A8 b _0805D5EE _0805D4C2: lsls r0, 2 - ldr r1, _0805D4D0 + ldr r1, =_0805D4D4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0805D4CC: .4byte 0x0831c898 -_0805D4D0: .4byte _0805D4D4 + .pool .align 2, 0 _0805D4D4: .4byte _0805D5D8 @@ -189146,13 +181737,13 @@ sub_805D5F4: @ 805D5F4 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0805D628 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0805D6FA - ldr r0, _0805D62C + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -189166,8 +181757,7 @@ sub_805D5F4: @ 805D5F4 movs r0, 0x3 b _0805D63E .align 2, 0 -_0805D628: .4byte 0x02022fec -_0805D62C: .4byte 0x02024064 + .pool _0805D630: movs r0, 0 bl battle_get_side_with_given_state @@ -189179,7 +181769,7 @@ _0805D63E: bl battle_get_side_with_given_state lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _0805D678 + ldr r1, =0x02024084 movs r2, 0x58 mov r0, r8 muls r0, r2 @@ -189193,7 +181783,7 @@ _0805D63E: bne _0805D680 bl GenerateRandomNumber adds r3, r0, 0 - ldr r0, _0805D67C + ldr r0, =0x02024064 ldrb r1, [r0] movs r2, 0x1 movs r0, 0x1 @@ -189204,11 +181794,10 @@ _0805D63E: adds r0, r1 b _0805D702 .align 2, 0 -_0805D678: .4byte 0x02024084 -_0805D67C: .4byte 0x02024064 + .pool _0805D680: - ldr r4, _0805D6AC - ldr r0, _0805D6B0 + ldr r4, =0x0831c604 + ldr r0, =0x02024064 mov r9, r0 ldrb r0, [r0] muls r0, r2 @@ -189228,8 +181817,7 @@ _0805D680: beq _0805D6BA b _0805D6FA .align 2, 0 -_0805D6AC: .4byte 0x0831c604 -_0805D6B0: .4byte 0x02024064 + .pool _0805D6B4: cmp r4, 0x2 beq _0805D6DE @@ -189271,7 +181859,7 @@ _0805D6DE: lsrs r0, 16 b _0805D704 _0805D6FA: - ldr r0, _0805D710 + ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x1 eors r0, r1 @@ -189285,7 +181873,7 @@ _0805D704: pop {r1} bx r1 .align 2, 0 -_0805D710: .4byte 0x02024064 + .pool thumb_func_end sub_805D5F4 thumb_func_start sub_805D714 @@ -189295,7 +181883,7 @@ sub_805D714: @ 805D714 ldrh r1, [r4, 0x30] lsls r1, 24 lsrs r1, 24 - ldr r2, _0805D758 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -189324,19 +181912,19 @@ sub_805D714: @ 805D714 strb r0, [r2] b _0805D766 .align 2, 0 -_0805D758: .4byte 0x02020630 + .pool _0805D75C: lsls r0, r3, 27 cmp r0, 0 bge _0805D766 - ldr r0, _0805D76C + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _0805D766: pop {r4} pop {r0} bx r0 .align 2, 0 -_0805D76C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_805D714 thumb_func_start sub_805D770 @@ -189350,7 +181938,7 @@ sub_805D770: @ 805D770 movs r2, 0x40 orrs r0, r2 strb r0, [r3] - ldr r0, _0805D794 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] cmp r1, 0 bne _0805D798 @@ -189359,7 +181947,7 @@ sub_805D770: @ 805D770 bl sub_8008258 b _0805D7A0 .align 2, 0 -_0805D794: .4byte nullsub_12 + 1 + .pool _0805D798: adds r0, r4, 0 movs r1, 0x1 @@ -189376,7 +181964,7 @@ _0805D7A0: sub_805D7AC: @ 805D7AC push {lr} adds r2, r0, 0 - ldr r0, _0805D7D8 + ldr r0, =0x020243fc ldrh r1, [r0] movs r0, 0x1 ands r0, r1 @@ -189393,20 +181981,19 @@ sub_805D7AC: @ 805D7AC ldrsh r0, [r2, r1] cmp r0, 0 beq _0805D7E0 - ldr r0, _0805D7DC + ldr r0, =sub_805D7EC + 1 b _0805D7E2 .align 2, 0 -_0805D7D8: .4byte 0x020243fc -_0805D7DC: .4byte sub_805D7EC + 1 + .pool _0805D7E0: - ldr r0, _0805D7E8 + ldr r0, =nullsub_12 + 1 _0805D7E2: str r0, [r2, 0x1C] _0805D7E4: pop {r0} bx r0 .align 2, 0 -_0805D7E8: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_805D7AC thumb_func_start sub_805D7EC @@ -189419,13 +182006,13 @@ sub_805D7EC: @ 805D7EC lsls r0, 16 cmp r0, 0 bne _0805D800 - ldr r0, _0805D804 + ldr r0, =nullsub_12 + 1 str r0, [r1, 0x1C] _0805D800: pop {r0} bx r0 .align 2, 0 -_0805D804: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_805D7EC thumb_func_start move_anim_start_t2_for_situation @@ -189433,9 +182020,9 @@ move_anim_start_t2_for_situation: @ 805D808 push {r4-r6,lr} adds r4, r1, 0 lsls r0, 24 - ldr r6, _0805D83C + ldr r6, =0x020244d0 ldr r1, [r6] - ldr r5, _0805D840 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r3, [r1, 0x4] lsls r1, r2, 1 @@ -189455,8 +182042,7 @@ move_anim_start_t2_for_situation: @ 805D808 bl move_anim_start_t2 b _0805D902 .align 2, 0 -_0805D83C: .4byte 0x020244d0 -_0805D840: .4byte 0x02024064 + .pool _0805D844: cmp r4, 0x8 beq _0805D850 @@ -189587,7 +182173,7 @@ move_anim_start_t3: @ 805D908 ands r0, r7 cmp r0, 0 beq _0805D950 - ldr r0, _0805D94C + ldr r0, =0x020244e4 adds r0, r6, r0 movs r2, 0x7F adds r1, r7, 0 @@ -189596,9 +182182,9 @@ move_anim_start_t3: @ 805D908 movs r0, 0x1 b _0805DA1E .align 2, 0 -_0805D94C: .4byte 0x020244e4 + .pool _0805D950: - ldr r0, _0805D97C + ldr r0, =0x020244d0 mov r9, r0 ldr r0, [r0] ldr r0, [r0] @@ -189619,7 +182205,7 @@ _0805D950: movs r0, 0x1 b _0805DA1E .align 2, 0 -_0805D97C: .4byte 0x020244d0 + .pool _0805D980: mov r1, r9 ldr r0, [r1] @@ -189632,8 +182218,8 @@ _0805D980: beq _0805D9CC cmp r5, 0x2 bne _0805D9CC - ldr r1, _0805D9C4 - ldr r0, _0805D9C8 + ldr r1, =0x02020630 + ldr r0, =0x020241e4 adds r0, r6, r0 ldrb r2, [r0] lsls r0, r2, 4 @@ -189653,30 +182239,29 @@ _0805D980: movs r0, 0x1 b _0805DA1E .align 2, 0 -_0805D9C4: .4byte 0x02020630 -_0805D9C8: .4byte 0x020241e4 + .pool _0805D9CC: - ldr r0, _0805DA30 + ldr r0, =0x02038436 mov r2, r10 strb r2, [r0] - ldr r0, _0805DA34 + ldr r0, =0x02038437 mov r1, sp ldrb r1, [r1] strb r1, [r0] - ldr r4, _0805DA38 + ldr r4, =0x020244d0 ldr r0, [r4] ldr r0, [r0, 0x8] strh r7, [r0] - ldr r0, _0805DA3C + ldr r0, =0x082c9320 adds r1, r5, 0 movs r2, 0 bl move_something - ldr r0, _0805DA40 + ldr r0, =task0A_0803415C + 1 movs r1, 0xA bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0805DA44 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -189705,12 +182290,7 @@ _0805DA1E: pop {r1} bx r1 .align 2, 0 -_0805DA30: .4byte 0x02038436 -_0805DA34: .4byte 0x02038437 -_0805DA38: .4byte 0x020244d0 -_0805DA3C: .4byte 0x082c9320 -_0805DA40: .4byte task0A_0803415C + 1 -_0805DA44: .4byte 0x03005e00 + .pool thumb_func_end move_anim_start_t3 thumb_func_start task0A_0803415C @@ -189718,16 +182298,16 @@ task0A_0803415C: @ 805DA48 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0805DA90 + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _0805DA94 + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _0805DA8A - ldr r0, _0805DA98 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r1, _0805DA9C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -189751,10 +182331,7 @@ _0805DA8A: pop {r0} bx r0 .align 2, 0 -_0805DA90: .4byte 0x020383f8 -_0805DA94: .4byte 0x020383fd -_0805DA98: .4byte 0x020244d0 -_0805DA9C: .4byte 0x03005e00 + .pool thumb_func_end task0A_0803415C thumb_func_start sub_805DAA0 @@ -189790,26 +182367,26 @@ move_anim_start_t4: @ 805DAC4 lsrs r4, 24 lsls r3, 24 lsrs r3, 24 - ldr r0, _0805DB1C + ldr r0, =0x02038436 strb r1, [r0] - ldr r0, _0805DB20 + ldr r0, =0x02038437 strb r2, [r0] - ldr r0, _0805DB24 + ldr r0, =0x082c937c adds r1, r3, 0 movs r2, 0 bl move_something - ldr r0, _0805DB28 + ldr r0, =task0A_08034248 + 1 movs r1, 0xA bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0805DB2C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 strh r4, [r1, 0x8] - ldr r0, _0805DB30 + ldr r0, =0x020244d0 ldr r0, [r0] movs r2, 0x8 ldrsh r1, [r1, r2] @@ -189826,12 +182403,7 @@ move_anim_start_t4: @ 805DAC4 pop {r0} bx r0 .align 2, 0 -_0805DB1C: .4byte 0x02038436 -_0805DB20: .4byte 0x02038437 -_0805DB24: .4byte 0x082c937c -_0805DB28: .4byte task0A_08034248 + 1 -_0805DB2C: .4byte 0x03005e00 -_0805DB30: .4byte 0x020244d0 + .pool thumb_func_end move_anim_start_t4 thumb_func_start task0A_08034248 @@ -189839,16 +182411,16 @@ task0A_08034248: @ 805DB34 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0805DB7C + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _0805DB80 + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _0805DB76 - ldr r0, _0805DB84 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r1, _0805DB88 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -189872,10 +182444,7 @@ _0805DB76: pop {r0} bx r0 .align 2, 0 -_0805DB7C: .4byte 0x020383f8 -_0805DB80: .4byte 0x020383fd -_0805DB84: .4byte 0x020244d0 -_0805DB88: .4byte 0x03005e00 + .pool thumb_func_end task0A_08034248 thumb_func_start sub_805DB8C @@ -189894,7 +182463,7 @@ mplay_80342A4: @ 805DB90 lsls r0, 24 cmp r0, 0 beq _0805DBD8 - ldr r2, _0805DBE0 + ldr r2, =0x020244d0 ldr r0, [r2] ldr r1, [r0, 0x4] lsls r0, r4, 1 @@ -189905,7 +182474,7 @@ mplay_80342A4: @ 805DB90 adds r1, 0x1 strb r1, [r0, 0x8] ldr r2, [r2] - ldr r0, _0805DBE4 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -189915,9 +182484,9 @@ mplay_80342A4: @ 805DB90 ldrb r0, [r0, 0x8] cmp r0, 0x1D bls _0805DBDC - ldr r0, _0805DBE8 + ldr r0, =0x030075f0 bl MPlayStop_rev01 - ldr r0, _0805DBEC + ldr r0, =0x03007630 bl MPlayStop_rev01 _0805DBD8: cmp r5, 0 @@ -189926,12 +182495,9 @@ _0805DBDC: movs r0, 0x1 b _0805DC02 .align 2, 0 -_0805DBE0: .4byte 0x020244d0 -_0805DBE4: .4byte 0x02024064 -_0805DBE8: .4byte 0x030075f0 -_0805DBEC: .4byte 0x03007630 + .pool _0805DBF0: - ldr r0, _0805DC08 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r4, 1 @@ -189945,7 +182511,7 @@ _0805DC02: pop {r1} bx r1 .align 2, 0 -_0805DC08: .4byte 0x020244d0 + .pool thumb_func_end mplay_80342A4 thumb_func_start sub_805DC0C @@ -189963,7 +182529,7 @@ sub_805DC0C: @ 805DC0C movs r1, 0 bl pokemon_getattr str r0, [sp] - ldr r0, _0805DC4C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] mov r2, r8 @@ -189980,10 +182546,10 @@ sub_805DC0C: @ 805DC0C ldr r6, [sp] b _0805DC58 .align 2, 0 -_0805DC4C: .4byte 0x020244d0 + .pool _0805DC50: ldrh r5, [r2, 0x2] - ldr r0, _0805DCAC + ldr r0, =0x020244bc adds r0, r1, r0 ldr r6, [r0] _0805DC58: @@ -189995,9 +182561,9 @@ _0805DC58: bl battle_get_per_side_status lsls r0, 24 lsls r2, r5, 3 - ldr r1, _0805DCB0 + ldr r1, =0x0830a18c adds r2, r1 - ldr r1, _0805DCB4 + ldr r1, =0x020244d4 ldr r1, [r1] lsrs r0, 22 adds r1, 0x4 @@ -190012,7 +182578,7 @@ _0805DC58: movs r0, 0x80 lsls r0, 1 adds r7, r2, r0 - ldr r0, _0805DCB8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] lsls r1, r3, 2 @@ -190026,10 +182592,7 @@ _0805DC58: bl pokemon_get_pal b _0805DCC6 .align 2, 0 -_0805DCAC: .4byte 0x020244bc -_0805DCB0: .4byte 0x0830a18c -_0805DCB4: .4byte 0x020244d4 -_0805DCB8: .4byte 0x020244d0 + .pool _0805DCBC: adds r0, r5, 0 mov r1, r10 @@ -190037,7 +182600,7 @@ _0805DCBC: bl species_and_otid_get_pal _0805DCC6: adds r6, r0, 0 - ldr r4, _0805DD58 + ldr r4, =0x0201c000 adds r0, r6, 0 adds r1, r4, 0 bl call_LZZUnCompWram @@ -190050,20 +182613,20 @@ _0805DCC6: adds r0, r4, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0805DD5C + ldr r0, =0x00000181 cmp r5, r0 bne _0805DD1A movs r7, 0x80 lsls r7, 1 add r7, r9 - ldr r5, _0805DD60 + ldr r5, =0x0202449c ldr r1, [r5] movs r4, 0x80 lsls r4, 1 adds r1, r4 adds r0, r6, 0 bl call_LZZUnCompWram - ldr r0, _0805DD64 + ldr r0, =0x020244e4 add r0, r8 ldrb r1, [r0] lsls r1, 5 @@ -190074,7 +182637,7 @@ _0805DCC6: movs r2, 0x20 bl gpu_pal_apply _0805DD1A: - ldr r0, _0805DD68 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] ldr r1, [sp, 0x4] @@ -190082,17 +182645,17 @@ _0805DD1A: ldrh r0, [r0, 0x2] cmp r0, 0 beq _0805DD46 - ldr r3, _0805DD6C + ldr r3, =0x00007fff adds r0, r7, 0 movs r1, 0x10 movs r2, 0x6 bl pal_fade_1 lsls r1, r7, 1 - ldr r0, _0805DD70 + ldr r0, =0x02037b14 adds r0, r1, r0 - ldr r2, _0805DD74 + ldr r2, =0x02037714 adds r1, r2 - ldr r2, _0805DD78 + ldr r2, =0x04000008 bl CpuSet _0805DD46: add sp, 0x8 @@ -190104,15 +182667,7 @@ _0805DD46: pop {r0} bx r0 .align 2, 0 -_0805DD58: .4byte 0x0201c000 -_0805DD5C: .4byte 0x00000181 -_0805DD60: .4byte 0x0202449c -_0805DD64: .4byte 0x020244e4 -_0805DD68: .4byte 0x020244d0 -_0805DD6C: .4byte 0x00007fff -_0805DD70: .4byte 0x02037b14 -_0805DD74: .4byte 0x02037714 -_0805DD78: .4byte 0x04000008 + .pool thumb_func_end sub_805DC0C thumb_func_start sub_805DD7C @@ -190130,7 +182685,7 @@ sub_805DD7C: @ 805DD7C movs r1, 0 bl pokemon_getattr str r0, [sp] - ldr r0, _0805DDBC + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] mov r2, r8 @@ -190147,10 +182702,10 @@ sub_805DD7C: @ 805DD7C ldr r4, [sp] b _0805DDC8 .align 2, 0 -_0805DDBC: .4byte 0x020244d0 + .pool _0805DDC0: ldrh r5, [r2, 0x2] - ldr r0, _0805DE1C + ldr r0, =0x020244bc adds r0, r1, r0 ldr r4, [r0] _0805DDC8: @@ -190172,7 +182727,7 @@ _0805DDC8: mov r10, r1 cmp r0, 0x1 beq _0805DE00 - ldr r0, _0805DE20 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] add r0, r10 @@ -190181,9 +182736,9 @@ _0805DDC8: beq _0805DE2C _0805DE00: lsls r0, r5, 3 - ldr r1, _0805DE24 + ldr r1, =0x083028b8 adds r0, r1 - ldr r1, _0805DE28 + ldr r1, =0x020244d4 ldr r1, [r1] lsls r2, r7, 2 adds r1, 0x4 @@ -190194,15 +182749,12 @@ _0805DE00: bl sub_8034B50 b _0805DE46 .align 2, 0 -_0805DE1C: .4byte 0x020244bc -_0805DE20: .4byte 0x020244d0 -_0805DE24: .4byte 0x083028b8 -_0805DE28: .4byte 0x020244d4 + .pool _0805DE2C: lsls r0, r5, 3 - ldr r1, _0805DE68 + ldr r1, =0x083028b8 adds r0, r1 - ldr r1, _0805DE6C + ldr r1, =0x020244d4 ldr r1, [r1] lsls r2, r7, 2 adds r1, 0x4 @@ -190217,7 +182769,7 @@ _0805DE46: movs r0, 0x80 lsls r0, 1 adds r7, r1, r0 - ldr r0, _0805DE70 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] add r0, r10 @@ -190229,9 +182781,7 @@ _0805DE46: bl pokemon_get_pal b _0805DE7E .align 2, 0 -_0805DE68: .4byte 0x083028b8 -_0805DE6C: .4byte 0x020244d4 -_0805DE70: .4byte 0x020244d0 + .pool _0805DE74: adds r0, r5, 0 ldr r1, [sp, 0x4] @@ -190239,7 +182789,7 @@ _0805DE74: bl species_and_otid_get_pal _0805DE7E: adds r6, r0, 0 - ldr r4, _0805DF0C + ldr r4, =0x0201c000 adds r0, r6, 0 adds r1, r4, 0 bl call_LZZUnCompWram @@ -190252,20 +182802,20 @@ _0805DE7E: adds r0, r4, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0805DF10 + ldr r0, =0x00000181 cmp r5, r0 bne _0805DED2 movs r7, 0x80 lsls r7, 1 add r7, r9 - ldr r5, _0805DF14 + ldr r5, =0x0202449c ldr r1, [r5] movs r4, 0x80 lsls r4, 1 adds r1, r4 adds r0, r6, 0 bl call_LZZUnCompWram - ldr r0, _0805DF18 + ldr r0, =0x020244e4 add r0, r8 ldrb r1, [r0] lsls r1, 5 @@ -190276,24 +182826,24 @@ _0805DE7E: movs r2, 0x20 bl gpu_pal_apply _0805DED2: - ldr r0, _0805DF1C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] add r0, r10 ldrh r0, [r0, 0x2] cmp r0, 0 beq _0805DEFC - ldr r3, _0805DF20 + ldr r3, =0x00007fff adds r0, r7, 0 movs r1, 0x10 movs r2, 0x6 bl pal_fade_1 lsls r1, r7, 1 - ldr r0, _0805DF24 + ldr r0, =0x02037b14 adds r0, r1, r0 - ldr r2, _0805DF28 + ldr r2, =0x02037714 adds r1, r2 - ldr r2, _0805DF2C + ldr r2, =0x04000008 bl CpuSet _0805DEFC: add sp, 0x8 @@ -190305,15 +182855,7 @@ _0805DEFC: pop {r0} bx r0 .align 2, 0 -_0805DF0C: .4byte 0x0201c000 -_0805DF10: .4byte 0x00000181 -_0805DF14: .4byte 0x0202449c -_0805DF18: .4byte 0x020244e4 -_0805DF1C: .4byte 0x020244d0 -_0805DF20: .4byte 0x00007fff -_0805DF24: .4byte 0x02037b14 -_0805DF28: .4byte 0x02037714 -_0805DF2C: .4byte 0x04000008 + .pool thumb_func_end sub_805DD7C thumb_func_start nullsub_23 @@ -190338,9 +182880,9 @@ sub_805DF38: @ 805DF38 bl battle_get_per_side_status lsls r0, 24 lsls r4, 3 - ldr r2, _0805DF78 + ldr r2, =0x08305654 adds r2, r4, r2 - ldr r1, _0805DF7C + ldr r1, =0x020244d4 ldr r1, [r1] lsrs r0, 22 adds r1, 0x4 @@ -190349,7 +182891,7 @@ sub_805DF38: @ 805DF38 adds r0, r2, 0 movs r2, 0 bl LZ77UnCompAnyRam - ldr r0, _0805DF80 + ldr r0, =0x0830593c adds r4, r0 adds r0, r4, 0 bl gpu_pal_obj_decompress_and_apply @@ -190357,9 +182899,7 @@ sub_805DF38: @ 805DF38 pop {r0} bx r0 .align 2, 0 -_0805DF78: .4byte 0x08305654 -_0805DF7C: .4byte 0x020244d4 -_0805DF80: .4byte 0x0830593c + .pool thumb_func_end sub_805DF38 thumb_func_start sub_805DF84 @@ -190375,9 +182915,9 @@ sub_805DF84: @ 805DF84 bl battle_get_per_side_status lsls r0, 24 lsls r5, 3 - ldr r2, _0805DFD4 + ldr r2, =0x08305d4c adds r2, r5, r2 - ldr r1, _0805DFD8 + ldr r1, =0x020244d4 ldr r1, [r1] lsrs r0, 22 adds r1, 0x4 @@ -190386,7 +182926,7 @@ sub_805DF84: @ 805DF84 adds r0, r2, 0 movs r2, 0 bl LZ77UnCompAnyRam - ldr r0, _0805DFDC + ldr r0, =0x08305d8c adds r5, r0 ldr r0, [r5] lsls r4, 20 @@ -190401,9 +182941,7 @@ sub_805DF84: @ 805DF84 pop {r0} bx r0 .align 2, 0 -_0805DFD4: .4byte 0x08305d4c -_0805DFD8: .4byte 0x020244d4 -_0805DFDC: .4byte 0x08305d8c + .pool thumb_func_end sub_805DF84 thumb_func_start nullsub_25 @@ -190415,7 +182953,7 @@ nullsub_25: @ 805DFE0 sub_805DFE4: @ 805DFE4 push {lr} lsls r0, 16 - ldr r1, _0805DFF8 + ldr r1, =0x0830593c lsrs r0, 13 adds r0, r1 ldrh r0, [r0, 0x4] @@ -190423,13 +182961,13 @@ sub_805DFE4: @ 805DFE4 pop {r0} bx r0 .align 2, 0 -_0805DFF8: .4byte 0x0830593c + .pool thumb_func_end sub_805DFE4 thumb_func_start sub_805DFFC sub_805DFFC: @ 805DFFC push {r4-r7,lr} - ldr r4, _0805E028 + ldr r4, =0x0832c128 adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply adds r4, 0x8 @@ -190439,24 +182977,22 @@ sub_805DFFC: @ 805DFFC lsls r0, 24 cmp r0, 0 bne _0805E034 - ldr r0, _0805E02C + ldr r0, =0x0832c0d0 bl gpu_tile_obj_decompress_and_load - ldr r0, _0805E030 + ldr r0, =0x0832c0d8 bl gpu_tile_obj_decompress_and_load movs r5, 0x2 b _0805E056 .align 2, 0 -_0805E028: .4byte 0x0832c128 -_0805E02C: .4byte 0x0832c0d0 -_0805E030: .4byte 0x0832c0d8 + .pool _0805E034: - ldr r4, _0805E07C + ldr r4, =0x0832c0e0 adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load adds r4, 0x8 adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load - ldr r4, _0805E080 + ldr r4, =0x0832c0f0 adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load adds r4, 0x8 @@ -190467,8 +183003,8 @@ _0805E056: movs r4, 0 cmp r4, r5 bcs _0805E076 - ldr r7, _0805E084 - ldr r6, _0805E088 + ldr r7, =0x02024076 + ldr r6, =0x0832c108 _0805E060: adds r0, r4, r7 ldrb r0, [r0] @@ -190485,10 +183021,7 @@ _0805E076: pop {r0} bx r0 .align 2, 0 -_0805E07C: .4byte 0x0832c0e0 -_0805E080: .4byte 0x0832c0f0 -_0805E084: .4byte 0x02024076 -_0805E088: .4byte 0x0832c108 + .pool thumb_func_end sub_805DFFC thumb_func_start sub_805E08C @@ -190504,7 +183037,7 @@ sub_805E08C: @ 805E08C _0805E09C: cmp r4, 0x1 bne _0805E0B8 - ldr r4, _0805E0B4 + ldr r4, =0x0832c128 adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply adds r4, 0x8 @@ -190512,7 +183045,7 @@ _0805E09C: bl gpu_pal_obj_alloc_tag_and_apply b _0805E1AE .align 2, 0 -_0805E0B4: .4byte 0x0832c128 + .pool _0805E0B8: bl battle_type_is_double lsls r0, 24 @@ -190520,118 +183053,116 @@ _0805E0B8: bne _0805E120 cmp r4, 0x2 bne _0805E0F0 - ldr r0, _0805E0DC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 beq _0805E0E4 - ldr r0, _0805E0E0 + ldr r0, =0x0832c100 bl gpu_tile_obj_decompress_and_load b _0805E1AE .align 2, 0 -_0805E0DC: .4byte 0x02022fec -_0805E0E0: .4byte 0x0832c100 + .pool _0805E0E4: - ldr r0, _0805E0EC + ldr r0, =0x0832c0d0 bl gpu_tile_obj_decompress_and_load b _0805E1AE .align 2, 0 -_0805E0EC: .4byte 0x0832c0d0 + .pool _0805E0F0: cmp r4, 0x3 bne _0805E100 - ldr r0, _0805E0FC + ldr r0, =0x0832c0d8 bl gpu_tile_obj_decompress_and_load b _0805E1AE .align 2, 0 -_0805E0FC: .4byte 0x0832c0d8 + .pool _0805E100: cmp r4, 0x4 bne _0805E110 - ldr r0, _0805E10C + ldr r0, =0x02024076 ldrb r0, [r0] b _0805E198 .align 2, 0 -_0805E10C: .4byte 0x02024076 + .pool _0805E110: cmp r4, 0x5 bne _0805E1AC - ldr r0, _0805E11C + ldr r0, =0x02024076 ldrb r0, [r0, 0x1] b _0805E198 .align 2, 0 -_0805E11C: .4byte 0x02024076 + .pool _0805E120: cmp r4, 0x2 bne _0805E130 - ldr r0, _0805E12C + ldr r0, =0x0832c0e0 bl gpu_tile_obj_decompress_and_load b _0805E1AE .align 2, 0 -_0805E12C: .4byte 0x0832c0e0 + .pool _0805E130: cmp r4, 0x3 bne _0805E140 - ldr r0, _0805E13C + ldr r0, =0x0832c0e8 bl gpu_tile_obj_decompress_and_load b _0805E1AE .align 2, 0 -_0805E13C: .4byte 0x0832c0e8 + .pool _0805E140: cmp r4, 0x4 bne _0805E150 - ldr r0, _0805E14C + ldr r0, =0x0832c0f0 bl gpu_tile_obj_decompress_and_load b _0805E1AE .align 2, 0 -_0805E14C: .4byte 0x0832c0f0 + .pool _0805E150: cmp r4, 0x5 bne _0805E160 - ldr r0, _0805E15C + ldr r0, =0x0832c0f8 bl gpu_tile_obj_decompress_and_load b _0805E1AE .align 2, 0 -_0805E15C: .4byte 0x0832c0f8 + .pool _0805E160: cmp r4, 0x6 bne _0805E170 - ldr r0, _0805E16C + ldr r0, =0x02024076 ldrb r0, [r0] b _0805E198 .align 2, 0 -_0805E16C: .4byte 0x02024076 + .pool _0805E170: cmp r4, 0x7 bne _0805E180 - ldr r0, _0805E17C + ldr r0, =0x02024076 ldrb r0, [r0, 0x1] b _0805E198 .align 2, 0 -_0805E17C: .4byte 0x02024076 + .pool _0805E180: cmp r4, 0x8 bne _0805E190 - ldr r0, _0805E18C + ldr r0, =0x02024076 ldrb r0, [r0, 0x2] b _0805E198 .align 2, 0 -_0805E18C: .4byte 0x02024076 + .pool _0805E190: cmp r5, 0x9 bne _0805E1AC - ldr r0, _0805E1A4 + ldr r0, =0x02024076 ldrb r0, [r0, 0x3] _0805E198: lsls r0, 3 - ldr r1, _0805E1A8 + ldr r1, =0x0832c108 adds r0, r1 bl gpu_tile_obj_decompress_and_load b _0805E1AE .align 2, 0 -_0805E1A4: .4byte 0x02024076 -_0805E1A8: .4byte 0x0832c108 + .pool _0805E1AC: movs r6, 0x1 _0805E1AE: @@ -190644,8 +183175,8 @@ _0805E1AE: thumb_func_start load_gfxc_health_bar load_gfxc_health_bar: @ 805E1B8 push {lr} - ldr r0, _0805E1D0 - ldr r1, _0805E1D4 + ldr r0, =0x08c093f0 + ldr r1, =0x020244d4 ldr r1, [r1] movs r2, 0xBA lsls r2, 1 @@ -190655,8 +183186,7 @@ load_gfxc_health_bar: @ 805E1B8 pop {r0} bx r0 .align 2, 0 -_0805E1D0: .4byte 0x08c093f0 -_0805E1D4: .4byte 0x020244d4 + .pool thumb_func_end load_gfxc_health_bar thumb_func_start battle_load_something @@ -190671,12 +183201,12 @@ battle_load_something: @ 805E1D8 b _0805E346 _0805E1E8: lsls r0, 2 - ldr r1, _0805E1F4 + ldr r1, =_0805E1F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0805E1F4: .4byte _0805E1F8 + .pool .align 2, 0 _0805E1F8: .4byte _0805E214 @@ -190702,7 +183232,7 @@ _0805E228: strb r0, [r4] b _0805E346 _0805E230: - ldr r0, _0805E248 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -190714,94 +183244,90 @@ _0805E230: bl battle_make_oam_safari_battle b _0805E252 .align 2, 0 -_0805E248: .4byte 0x02022fec + .pool _0805E24C: ldrb r0, [r4] bl battle_make_oam_normal_battle _0805E252: - ldr r2, _0805E25C + ldr r2, =0x03005d70 ldrb r1, [r4] adds r1, r2 strb r0, [r1] b _0805E30E .align 2, 0 -_0805E25C: .4byte 0x03005d70 + .pool _0805E260: ldrb r0, [r4] bl sub_8072B18 - ldr r0, _0805E280 + ldr r0, =0x02024076 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] cmp r0, 0x1 bhi _0805E288 - ldr r0, _0805E284 + ldr r0, =0x03005d70 adds r0, r1, r0 ldrb r0, [r0] movs r1, 0 bl nullsub_30 b _0805E30E .align 2, 0 -_0805E280: .4byte 0x02024076 -_0805E284: .4byte 0x03005d70 + .pool _0805E288: - ldr r0, _0805E298 + ldr r0, =0x03005d70 adds r0, r1, r0 ldrb r0, [r0] movs r1, 0x1 bl nullsub_30 b _0805E30E .align 2, 0 -_0805E298: .4byte 0x03005d70 + .pool _0805E29C: ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0805E2E4 - ldr r0, _0805E2D4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 bne _0805E302 - ldr r0, _0805E2D8 + ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _0805E2DC + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0805E2E0 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe b _0805E302 .align 2, 0 -_0805E2D4: .4byte 0x02022fec -_0805E2D8: .4byte 0x03005d70 -_0805E2DC: .4byte 0x0202406e -_0805E2E0: .4byte 0x020244ec + .pool _0805E2E4: - ldr r0, _0805E32C + ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _0805E330 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0805E334 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe _0805E302: - ldr r1, _0805E32C + ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -190810,7 +183336,7 @@ _0805E30E: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - ldr r1, _0805E338 + ldr r1, =0x0202406c lsls r0, 24 lsrs r0, 24 ldrb r1, [r1] @@ -190825,10 +183351,7 @@ _0805E324: strb r0, [r5] b _0805E346 .align 2, 0 -_0805E32C: .4byte 0x03005d70 -_0805E330: .4byte 0x0202406e -_0805E334: .4byte 0x02024744 -_0805E338: .4byte 0x0202406c + .pool _0805E33C: bl sub_805EC84 bl sub_81B8C68 @@ -190843,7 +183366,7 @@ _0805E346: thumb_func_start sub_805E350 sub_805E350: @ 805E350 push {r4,lr} - ldr r4, _0805E374 + ldr r4, =0x020244d0 ldr r0, [r4] ldr r0, [r0, 0x4] movs r1, 0 @@ -190858,14 +183381,14 @@ sub_805E350: @ 805E350 pop {r0} bx r0 .align 2, 0 -_0805E374: .4byte 0x020244d0 + .pool thumb_func_end sub_805E350 thumb_func_start sub_805E378 sub_805E378: @ 805E378 push {lr} bl sub_805E350 - ldr r0, _0805E390 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] movs r1, 0 @@ -190874,7 +183397,7 @@ sub_805E378: @ 805E378 pop {r0} bx r0 .align 2, 0 -_0805E390: .4byte 0x020244d0 + .pool thumb_func_end sub_805E378 thumb_func_start sub_805E394 @@ -190884,19 +183407,19 @@ sub_805E394: @ 805E394 mov r6, r8 push {r6,r7} movs r4, 0 - ldr r5, _0805E3F8 + ldr r5, =0x0202406c ldrb r0, [r5] cmp r4, r0 bge _0805E3EA - ldr r0, _0805E3FC + ldr r0, =0x02020630 mov r9, r0 movs r0, 0x1 mov r12, r0 movs r0, 0x2 negs r0, r0 mov r8, r0 - ldr r7, _0805E400 - ldr r6, _0805E404 + ldr r7, =0x020244d0 + ldr r6, =0x020241e4 _0805E3B8: ldr r0, [r7] ldr r0, [r0] @@ -190931,23 +183454,20 @@ _0805E3EA: pop {r0} bx r0 .align 2, 0 -_0805E3F8: .4byte 0x0202406c -_0805E3FC: .4byte 0x02020630 -_0805E400: .4byte 0x020244d0 -_0805E404: .4byte 0x020241e4 + .pool thumb_func_end sub_805E394 thumb_func_start sub_805E408 sub_805E408: @ 805E408 lsls r0, 24 lsrs r0, 24 - ldr r1, _0805E43C + ldr r1, =0x020244d0 ldr r1, [r1] ldr r1, [r1] lsls r3, r0, 2 adds r3, r1 - ldr r2, _0805E440 - ldr r1, _0805E444 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -190966,9 +183486,7 @@ sub_805E408: @ 805E408 strb r0, [r3] bx lr .align 2, 0 -_0805E43C: .4byte 0x020244d0 -_0805E440: .4byte 0x02020630 -_0805E444: .4byte 0x020241e4 + .pool thumb_func_end sub_805E408 thumb_func_start sub_805E448 @@ -190987,16 +183505,16 @@ sub_805E448: @ 805E448 lsls r2, 24 cmp r2, 0 beq _0805E51C - ldr r0, _0805E4F8 + ldr r0, =0x020241e4 adds r5, r7, r0 ldrb r1, [r5] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805E4FC + ldr r1, =0x02020630 mov r8, r1 add r0, r8 - ldr r4, _0805E500 + ldr r4, =0x020244d0 ldr r1, [r4] ldr r1, [r1, 0x8] ldrb r1, [r1] @@ -191006,7 +183524,7 @@ sub_805E448: @ 805E448 lsls r2, 17 adds r0, r2 lsrs r6, r0, 16 - ldr r2, _0805E504 + ldr r2, =0x0202449c ldr r0, [r4] ldr r0, [r0, 0x8] ldrh r1, [r0] @@ -191019,7 +183537,7 @@ sub_805E448: @ 805E448 adds r1, r6, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _0805E508 + ldr r1, =0x020244e4 adds r1, r7, r1 ldr r0, [r4] ldr r0, [r0, 0x8] @@ -191032,17 +183550,17 @@ sub_805E448: @ 805E448 ldrh r0, [r0, 0x2] cmp r0, 0 beq _0805E4DE - ldr r3, _0805E50C + ldr r3, =0x00007fff adds r0, r6, 0 movs r1, 0x10 movs r2, 0x6 bl pal_fade_1 lsls r1, r6, 1 - ldr r0, _0805E510 + ldr r0, =0x02037b14 adds r0, r1, r0 - ldr r2, _0805E514 + ldr r2, =0x02037714 adds r1, r2 - ldr r2, _0805E518 + ldr r2, =0x04000008 bl CpuSet _0805E4DE: adds r0, r7, 0 @@ -191057,15 +183575,7 @@ _0805E4DE: strh r0, [r1, 0x22] b _0805E77A .align 2, 0 -_0805E4F8: .4byte 0x020241e4 -_0805E4FC: .4byte 0x02020630 -_0805E500: .4byte 0x020244d0 -_0805E504: .4byte 0x0202449c -_0805E508: .4byte 0x020244e4 -_0805E50C: .4byte 0x00007fff -_0805E510: .4byte 0x02037b14 -_0805E514: .4byte 0x02037714 -_0805E518: .4byte 0x04000008 + .pool _0805E51C: bl sub_80A4DF0 lsls r0, 24 @@ -191073,7 +183583,7 @@ _0805E51C: beq _0805E558 movs r0, 0 mov r10, r0 - ldr r0, _0805E54C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x18] ldrh r1, [r2, 0x2] @@ -191082,17 +183592,15 @@ _0805E51C: mov r9, r3 ldr r4, [r2, 0xC] lsls r0, r1, 3 - ldr r1, _0805E550 + ldr r1, =0x083028b8 adds r0, r1 - ldr r1, _0805E554 + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x4] ldr r3, [r2, 0x10] b _0805E5FA .align 2, 0 -_0805E54C: .4byte 0x02039f34 -_0805E550: .4byte 0x083028b8 -_0805E554: .4byte 0x020244d4 + .pool _0805E558: adds r0, r7, 0 bl battle_get_per_side_status @@ -191105,27 +183613,26 @@ _0805E558: lsrs r0, 24 cmp r0, 0x1 bne _0805E58C - ldr r1, _0805E584 + ldr r1, =0x0202406e ldr r2, [sp] lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0805E588 + ldr r1, =0x02024744 b _0805E59C .align 2, 0 -_0805E584: .4byte 0x0202406e -_0805E588: .4byte 0x02024744 + .pool _0805E58C: - ldr r1, _0805E604 + ldr r1, =0x0202406e ldr r3, [sp] lsls r0, r3, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0805E608 + ldr r1, =0x020244ec _0805E59C: adds r0, r1 movs r1, 0xB @@ -191138,13 +183645,13 @@ _0805E59C: lsls r0, 24 cmp r0, 0 bne _0805E618 - ldr r0, _0805E604 + ldr r0, =0x0202406e lsls r4, r7, 1 adds r4, r0 ldrh r0, [r4] movs r6, 0x64 muls r0, r6 - ldr r5, _0805E608 + ldr r5, =0x020244ec adds r0, r5 movs r1, 0 bl pokemon_getattr @@ -191157,16 +183664,16 @@ _0805E59C: adds r4, r0, 0 mov r1, r8 lsls r0, r1, 3 - ldr r1, _0805E60C + ldr r1, =0x083028b8 adds r0, r1 - ldr r1, _0805E610 + ldr r1, =0x020244d4 ldr r1, [r1] mov r3, r10 lsls r2, r3, 2 adds r1, 0x4 adds r1, r2 ldr r1, [r1] - ldr r3, _0805E614 + ldr r3, =0x020244bc lsls r2, r7, 2 adds r2, r3 ldr r3, [r2] @@ -191175,19 +183682,15 @@ _0805E5FA: bl sub_8034B50 b _0805E662 .align 2, 0 -_0805E604: .4byte 0x0202406e -_0805E608: .4byte 0x020244ec -_0805E60C: .4byte 0x083028b8 -_0805E610: .4byte 0x020244d4 -_0805E614: .4byte 0x020244bc + .pool _0805E618: - ldr r0, _0805E78C + ldr r0, =0x0202406e lsls r4, r7, 1 adds r4, r0 ldrh r0, [r4] movs r6, 0x64 muls r0, r6 - ldr r5, _0805E790 + ldr r5, =0x02024744 adds r0, r5 movs r1, 0 bl pokemon_getattr @@ -191200,47 +183703,47 @@ _0805E618: adds r4, r0, 0 mov r1, r8 lsls r0, r1, 3 - ldr r1, _0805E794 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _0805E798 + ldr r1, =0x020244d4 ldr r1, [r1] mov r3, r10 lsls r2, r3, 2 adds r1, 0x4 adds r1, r2 ldr r1, [r1] - ldr r3, _0805E79C + ldr r3, =0x020244bc lsls r2, r7, 2 adds r2, r3 ldr r3, [r2] mov r2, r8 bl sub_8034B50 _0805E662: - ldr r0, _0805E798 + ldr r0, =0x020244d4 ldr r0, [r0] mov r2, r10 lsls r1, r2, 2 adds r0, 0x4 adds r0, r1 ldr r2, [r0] - ldr r0, _0805E7A0 + ldr r0, =0x020241e4 adds r0, r7 mov r10, r0 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r3, _0805E7A4 + ldr r3, =0x02020630 adds r0, r3 ldrh r0, [r0, 0x4] lsls r0, 22 lsrs r0, 17 - ldr r1, _0805E7A8 + ldr r1, =0x06010000 adds r0, r1 - ldr r1, _0805E7AC + ldr r1, =0x040000d4 str r2, [r1] str r0, [r1, 0x4] - ldr r0, _0805E7B0 + ldr r0, =0x84000200 str r0, [r1, 0x8] ldr r0, [r1, 0x8] lsls r0, r7, 20 @@ -191253,14 +183756,14 @@ _0805E662: mov r2, r9 bl species_and_otid_get_pal mov r9, r0 - ldr r4, _0805E7B4 + ldr r4, =0x0201c000 adds r1, r4, 0 bl call_LZZUnCompWram adds r0, r4, 0 adds r1, r6, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0805E7B8 + ldr r0, =0x00000181 cmp r8, r0 bne _0805E70A mov r2, r10 @@ -191268,23 +183771,23 @@ _0805E662: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805E7A4 + ldr r1, =0x02020630 adds r1, 0x8 adds r0, r1 - ldr r1, _0805E7BC + ldr r1, =0x08309aac mov r3, r8 lsls r2, r3, 2 adds r1, r2 ldr r1, [r1] str r1, [r0] - ldr r5, _0805E7C0 + ldr r5, =0x0202449c ldr r1, [r5] movs r4, 0x80 lsls r4, 1 adds r1, r4 mov r0, r9 bl call_LZZUnCompWram - ldr r0, _0805E7C4 + ldr r0, =0x020244e4 ldr r1, [sp] adds r0, r1, r0 ldrb r1, [r0] @@ -191296,30 +183799,30 @@ _0805E662: movs r2, 0x20 bl gpu_pal_apply _0805E70A: - ldr r3, _0805E7C8 + ldr r3, =0x00007fff adds r0, r6, 0 movs r1, 0x10 movs r2, 0x6 bl pal_fade_1 lsls r1, r6, 1 - ldr r0, _0805E7CC + ldr r0, =0x02037b14 adds r0, r1, r0 - ldr r2, _0805E7D0 + ldr r2, =0x02037714 adds r1, r2 - ldr r2, _0805E7D4 + ldr r2, =0x04000008 bl CpuSet bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 bne _0805E74A - ldr r0, _0805E7D8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r7, 2 adds r0, r1 mov r2, r8 strh r2, [r0, 0x2] - ldr r0, _0805E7C4 + ldr r0, =0x020244e4 adds r1, r7, r0 ldr r3, [sp] adds r0, r3, r0 @@ -191333,7 +183836,7 @@ _0805E74A: lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, _0805E7A4 + ldr r2, =0x02020630 adds r1, r2 lsls r0, 24 lsrs r0, 24 @@ -191344,7 +183847,7 @@ _0805E74A: adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _0805E7C4 + ldr r1, =0x020244e4 adds r1, r7, r1 ldrb r1, [r1] bl obj_anim_image_start @@ -191358,26 +183861,7 @@ _0805E77A: pop {r0} bx r0 .align 2, 0 -_0805E78C: .4byte 0x0202406e -_0805E790: .4byte 0x02024744 -_0805E794: .4byte 0x0830a18c -_0805E798: .4byte 0x020244d4 -_0805E79C: .4byte 0x020244bc -_0805E7A0: .4byte 0x020241e4 -_0805E7A4: .4byte 0x02020630 -_0805E7A8: .4byte 0x06010000 -_0805E7AC: .4byte 0x040000d4 -_0805E7B0: .4byte 0x84000200 -_0805E7B4: .4byte 0x0201c000 -_0805E7B8: .4byte 0x00000181 -_0805E7BC: .4byte 0x08309aac -_0805E7C0: .4byte 0x0202449c -_0805E7C4: .4byte 0x020244e4 -_0805E7C8: .4byte 0x00007fff -_0805E7CC: .4byte 0x02037b14 -_0805E7D0: .4byte 0x02037714 -_0805E7D4: .4byte 0x04000008 -_0805E7D8: .4byte 0x020244d0 + .pool thumb_func_end sub_805E448 thumb_func_start sub_805E7DC @@ -191405,19 +183889,19 @@ _0805E802: lsls r0, 24 cmp r0, 0 beq _0805E814 - ldr r0, _0805E810 + ldr r0, =0x08c2d120 b _0805E822 .align 2, 0 -_0805E810: .4byte 0x08c2d120 + .pool _0805E814: adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0805E83C - ldr r0, _0805E834 + ldr r0, =0x08c2cee0 _0805E822: - ldr r1, _0805E838 + ldr r1, =0x020244d4 ldr r1, [r1] lsls r4, 2 adds r1, 0x4 @@ -191426,11 +183910,10 @@ _0805E822: bl call_LZZUnCompVram b _0805E84E .align 2, 0 -_0805E834: .4byte 0x08c2cee0 -_0805E838: .4byte 0x020244d4 + .pool _0805E83C: - ldr r0, _0805E884 - ldr r1, _0805E888 + ldr r0, =0x08c2d120 + ldr r1, =0x020244d4 ldr r1, [r1] lsls r4, 2 adds r1, 0x4 @@ -191440,13 +183923,13 @@ _0805E83C: _0805E84E: movs r3, 0x1 lsls r6, r5, 4 - ldr r7, _0805E88C - ldr r0, _0805E888 + ldr r7, =0x08c2cebc + ldr r0, =0x020244d4 ldr r0, [r0] adds r0, 0x4 adds r4, r0, r4 - ldr r2, _0805E890 - ldr r5, _0805E894 + ldr r2, =0x040000d4 + ldr r5, =0x84000200 _0805E860: ldr r0, [r4] lsls r1, r3, 11 @@ -191466,11 +183949,7 @@ _0805E860: bl decompress_palette b _0805E8E6 .align 2, 0 -_0805E884: .4byte 0x08c2d120 -_0805E888: .4byte 0x020244d4 -_0805E88C: .4byte 0x08c2cebc -_0805E890: .4byte 0x040000d4 -_0805E894: .4byte 0x84000200 + .pool _0805E898: bl sub_80A4DF0 lsls r0, 24 @@ -191481,28 +183960,27 @@ _0805E898: lsls r0, 24 cmp r0, 0 beq _0805E8D0 - ldr r1, _0805E8C8 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0805E8CC + ldr r1, =0x02024744 adds r0, r1 adds r1, r4, 0 bl sub_805DC0C b _0805E8E6 .align 2, 0 -_0805E8C8: .4byte 0x0202406e -_0805E8CC: .4byte 0x02024744 + .pool _0805E8D0: - ldr r1, _0805E8EC + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0805E8F0 + ldr r1, =0x020244ec adds r0, r1 adds r1, r5, 0 bl sub_805DD7C @@ -191511,8 +183989,7 @@ _0805E8E6: pop {r0} bx r0 .align 2, 0 -_0805E8EC: .4byte 0x0202406e -_0805E8F0: .4byte 0x020244ec + .pool thumb_func_end sub_805E7DC thumb_func_start refresh_graphics_maybe @@ -191532,9 +184009,9 @@ refresh_graphics_maybe: @ 805E8F4 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _0805E930 + ldr r1, =0x02020630 adds r4, r0, r1 - ldr r0, _0805E934 + ldr r0, =0x020244e4 adds r0, r6, r0 ldrb r1, [r0] adds r0, r4, 0 @@ -191545,8 +184022,7 @@ refresh_graphics_maybe: @ 805E8F4 bl sub_80A614C b _0805E93E .align 2, 0 -_0805E930: .4byte 0x02020630 -_0805E934: .4byte 0x020244e4 + .pool _0805E938: adds r0, r6, 0 bl sub_80A6138 @@ -191568,7 +184044,7 @@ sub_805E94C: @ 805E94C lsrs r1, 16 cmp r1, 0xA4 bne _0805E96C - ldr r0, _0805E970 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] lsls r1, r2, 2 @@ -191581,13 +184057,13 @@ _0805E96C: pop {r0} bx r0 .align 2, 0 -_0805E970: .4byte 0x020244d0 + .pool thumb_func_end sub_805E94C thumb_func_start sub_805E974 sub_805E974: @ 805E974 lsls r0, 24 - ldr r1, _0805E98C + ldr r1, =0x020244d0 ldr r1, [r1] ldr r1, [r1] lsrs r0, 22 @@ -191599,7 +184075,7 @@ sub_805E974: @ 805E974 strb r1, [r0] bx lr .align 2, 0 -_0805E98C: .4byte 0x020244d0 + .pool thumb_func_end sub_805E974 thumb_func_start sub_805E990 @@ -191628,7 +184104,7 @@ sub_805E990: @ 805E990 lsrs r0, 24 cmp r0, 0x1 bne _0805EA08 - ldr r7, _0805EA04 + ldr r7, =0x020244d0 ldr r0, [r7] ldr r2, [r0] lsls r4, r6, 2 @@ -191660,9 +184136,9 @@ _0805E9F6: strb r0, [r1] b _0805EA5A .align 2, 0 -_0805EA04: .4byte 0x020244d0 + .pool _0805EA08: - ldr r4, _0805EA30 + ldr r4, =0x020244d0 ldr r0, [r4] ldr r0, [r0] lsls r1, r6, 2 @@ -191680,7 +184156,7 @@ _0805EA08: bl m4aSongNumStop b _0805EA5A .align 2, 0 -_0805EA30: .4byte 0x020244d0 + .pool _0805EA34: bl battle_type_is_double lsls r0, 24 @@ -191712,7 +184188,7 @@ sub_805EA60: @ 805EA60 bl battle_get_side_with_given_state lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _0805EAB0 + ldr r5, =0x020244d0 ldr r0, [r5] ldr r0, [r0] lsls r1, r4, 2 @@ -191745,7 +184221,7 @@ _0805EAA2: pop {r0} bx r0 .align 2, 0 -_0805EAB0: .4byte 0x020244d0 + .pool thumb_func_end sub_805EA60 thumb_func_start sub_805EAB4 @@ -191780,8 +184256,8 @@ sub_805EAE8: @ 805EAE8 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0805EB8C - ldr r1, _0805EB90 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -191798,7 +184274,7 @@ sub_805EAE8: @ 805EAE8 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r5, _0805EB94 + ldr r5, =0x0202406e mov r1, r8 lsls r0, r1, 1 adds r0, r5 @@ -191817,7 +184293,7 @@ sub_805EAE8: @ 805EAE8 movs r7, 0x64 adds r0, r4, 0 muls r0, r7 - ldr r6, _0805EB98 + ldr r6, =0x020244ec adds r4, r0, r6 adds r0, r4, 0 movs r1, 0x39 @@ -191851,10 +184327,7 @@ _0805EB7E: pop {r0} bx r0 .align 2, 0 -_0805EB8C: .4byte 0x030022c0 -_0805EB90: .4byte 0x00000439 -_0805EB94: .4byte 0x0202406e -_0805EB98: .4byte 0x020244ec + .pool thumb_func_end sub_805EAE8 thumb_func_start sub_805EB9C @@ -191868,7 +184341,7 @@ sub_805EB9C: @ 805EB9C lsrs r0, 24 mov r8, r0 movs r5, 0 - ldr r0, _0805EC2C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 bge _0805EC6C @@ -191888,8 +184361,8 @@ _0805EBC8: lsls r0, 24 cmp r0, 0 beq _0805EC60 - ldr r4, _0805EC30 - ldr r0, _0805EC34 + ldr r4, =0x02020630 + ldr r0, =0x020241e4 adds r3, r5, r0 ldrb r1, [r3] lsls r0, r1, 4 @@ -191907,7 +184380,7 @@ _0805EBC8: mov r7, r8 cmp r7, 0 bne _0805EC3C - ldr r0, _0805EC38 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r2, [r0, 0x4] adds r2, r6, r2 @@ -191931,17 +184404,14 @@ _0805EBC8: strb r1, [r0, 0x3] b _0805EC60 .align 2, 0 -_0805EC2C: .4byte 0x0202406c -_0805EC30: .4byte 0x02020630 -_0805EC34: .4byte 0x020241e4 -_0805EC38: .4byte 0x020244d0 + .pool _0805EC3C: ldrb r0, [r3] lsls r2, r0, 4 adds r2, r0 lsls r2, 2 adds r2, r4 - ldr r0, _0805EC7C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] adds r0, r6, r0 @@ -191957,7 +184427,7 @@ _0805EC3C: _0805EC60: adds r6, 0xC adds r5, 0x1 - ldr r0, _0805EC80 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 blt _0805EBC8 @@ -191970,8 +184440,7 @@ _0805EC6C: pop {r0} bx r0 .align 2, 0 -_0805EC7C: .4byte 0x020244d0 -_0805EC80: .4byte 0x0202406c + .pool thumb_func_end sub_805EB9C thumb_func_start sub_805EC84 @@ -191979,14 +184448,14 @@ sub_805EC84: @ 805EC84 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0805ED60 + ldr r0, =0x0831c6a0 bl gpu_tile_obj_decompress_and_load movs r0, 0x1 bl battle_get_side_with_given_state adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _0805ED64 + ldr r0, =0x0831c6b0 mov r8, r0 adds r0, r5, 0 movs r1, 0 @@ -192008,7 +184477,7 @@ sub_805EC84: @ 805EC84 adds r1, r4, 0 movs r3, 0xC8 bl obj_add_from_template_forward_search - ldr r6, _0805ED68 + ldr r6, =0x020244d0 ldr r1, [r6] ldr r2, [r1, 0x4] lsls r1, r5, 1 @@ -192016,7 +184485,7 @@ sub_805EC84: @ 805EC84 lsls r1, 2 adds r2, r1, r2 strb r0, [r2, 0x7] - ldr r7, _0805ED6C + ldr r7, =0x02020630 ldr r0, [r6] ldr r0, [r0, 0x4] adds r1, r0 @@ -192078,10 +184547,7 @@ _0805ED56: pop {r0} bx r0 .align 2, 0 -_0805ED60: .4byte 0x0831c6a0 -_0805ED64: .4byte 0x0831c6b0 -_0805ED68: .4byte 0x020244d0 -_0805ED6C: .4byte 0x02020630 + .pool thumb_func_end sub_805EC84 thumb_func_start sub_805ED70 @@ -192095,13 +184561,13 @@ sub_805ED70: @ 805ED70 ldrh r0, [r5, 0x2E] lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0805EDB4 + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805EDB8 + ldr r1, =0x02020630 adds r7, r0, r1 adds r6, r7, 0 adds r6, 0x3E @@ -192116,15 +184582,13 @@ sub_805ED70: @ 805ED70 cmp r0, 0 bne _0805EDC0 _0805EDAC: - ldr r0, _0805EDBC + ldr r0, =sub_805EE48 + 1 str r0, [r5, 0x1C] b _0805EE36 .align 2, 0 -_0805EDB4: .4byte 0x020241e4 -_0805EDB8: .4byte 0x02020630 -_0805EDBC: .4byte sub_805EE48 + 1 + .pool _0805EDC0: - ldr r0, _0805EDDC + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _0805EDD2 @@ -192136,14 +184600,13 @@ _0805EDC0: _0805EDD2: movs r0, 0x1 mov r8, r0 - ldr r2, _0805EDE0 + ldr r2, =0x020244d0 lsls r4, 2 b _0805EE06 .align 2, 0 -_0805EDDC: .4byte 0x020383fd -_0805EDE0: .4byte 0x020244d0 + .pool _0805EDE4: - ldr r2, _0805EE40 + ldr r2, =0x020244d0 ldr r0, [r2] ldr r0, [r0] lsls r1, r4, 2 @@ -192152,7 +184615,7 @@ _0805EDE4: adds r4, r1, 0 cmp r0, 0 beq _0805EE06 - ldr r0, _0805EE44 + ldr r0, =0x08305dcc ldrh r1, [r3, 0x2] adds r1, r0 ldrb r0, [r1] @@ -192193,8 +184656,7 @@ _0805EE36: pop {r0} bx r0 .align 2, 0 -_0805EE40: .4byte 0x020244d0 -_0805EE44: .4byte 0x08305dcc + .pool thumb_func_end sub_805ED70 thumb_func_start sub_805EE48 @@ -192220,7 +184682,7 @@ sub_805EE54: @ 805EE54 lsls r0, 24 cmp r0, 0 beq _0805EED0 - ldr r0, _0805EEA4 + ldr r0, =0x020244d0 ldr r3, [r0] ldr r1, [r3] lsls r0, r4, 2 @@ -192230,12 +184692,12 @@ sub_805EE54: @ 805EE54 beq _0805EE7E adds r5, r0, 0 _0805EE7E: - ldr r0, _0805EEA8 + ldr r0, =0x08305dcc adds r0, r5, r0 ldrb r0, [r0] cmp r0, 0 beq _0805EEB4 - ldr r2, _0805EEAC + ldr r2, =0x02020630 ldr r1, [r3, 0x4] lsls r0, r4, 1 adds r0, r4 @@ -192247,15 +184709,12 @@ _0805EE7E: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _0805EEB0 + ldr r1, =sub_805ED70 + 1 b _0805EECE .align 2, 0 -_0805EEA4: .4byte 0x020244d0 -_0805EEA8: .4byte 0x08305dcc -_0805EEAC: .4byte 0x02020630 -_0805EEB0: .4byte sub_805ED70 + 1 + .pool _0805EEB4: - ldr r2, _0805EED8 + ldr r2, =0x02020630 ldr r1, [r3, 0x4] lsls r0, r6, 1 adds r0, r6 @@ -192267,7 +184726,7 @@ _0805EEB4: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _0805EEDC + ldr r1, =sub_805EE48 + 1 _0805EECE: str r1, [r0] _0805EED0: @@ -192275,16 +184734,15 @@ _0805EED0: pop {r0} bx r0 .align 2, 0 -_0805EED8: .4byte 0x02020630 -_0805EEDC: .4byte sub_805EE48 + 1 + .pool thumb_func_end sub_805EE54 thumb_func_start sub_805EEE0 sub_805EEE0: @ 805EEE0 lsls r0, 24 lsrs r0, 24 - ldr r2, _0805EF08 - ldr r1, _0805EF0C + ldr r2, =0x02020630 + ldr r1, =0x020244d0 ldr r1, [r1] ldr r3, [r1, 0x4] lsls r1, r0, 1 @@ -192297,19 +184755,17 @@ sub_805EEE0: @ 805EEE0 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _0805EF10 + ldr r1, =sub_805EE48 + 1 str r1, [r0] bx lr .align 2, 0 -_0805EF08: .4byte 0x02020630 -_0805EF0C: .4byte 0x020244d0 -_0805EF10: .4byte sub_805EE48 + 1 + .pool thumb_func_end sub_805EEE0 thumb_func_start sub_805EF14 sub_805EF14: @ 805EF14 push {r4-r6,lr} - ldr r3, _0805EF80 + ldr r3, =0x06000240 movs r0, 0 movs r6, 0xF0 lsls r6, 8 @@ -192368,7 +184824,7 @@ _0805EF6A: pop {r0} bx r0 .align 2, 0 -_0805EF80: .4byte 0x06000240 + .pool thumb_func_end sub_805EF14 thumb_func_start sub_805EF84 @@ -192377,7 +184833,7 @@ sub_805EF84: @ 805EF84 lsls r0, 24 lsrs r4, r0, 24 lsls r1, 24 - ldr r0, _0805EFB4 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r2, [r0] lsls r0, r4, 2 @@ -192385,7 +184841,7 @@ sub_805EF84: @ 805EF84 movs r3, 0 movs r2, 0 strh r2, [r0, 0x2] - ldr r0, _0805EFB8 + ldr r0, =0x020244e4 adds r0, r4, r0 strb r3, [r0] cmp r1, 0 @@ -192397,8 +184853,7 @@ _0805EFAC: pop {r0} bx r0 .align 2, 0 -_0805EFB4: .4byte 0x020244d0 -_0805EFB8: .4byte 0x020244e4 + .pool thumb_func_end sub_805EF84 thumb_func_start init_uns_table_pokemon_copy @@ -192409,7 +184864,7 @@ init_uns_table_pokemon_copy: @ 805EFBC mov r5, r8 push {r5-r7} movs r6, 0 - ldr r4, _0805F08C + ldr r4, =0x020244d4 str r6, [r4] movs r0, 0xC0 lsls r0, 1 @@ -192421,7 +184876,7 @@ init_uns_table_pokemon_copy: @ 805EFBC ldr r1, [r4] str r0, [r1] _0805EFE2: - ldr r0, _0805F08C + ldr r0, =0x020244d4 ldr r1, [r0] lsls r4, r6, 2 adds r2, r1, 0x4 @@ -192434,7 +184889,7 @@ _0805EFE2: adds r0, r3, r6 lsls r0, 3 adds r1, r0, r1 - ldr r2, _0805F090 + ldr r2, =0x08329d98 adds r1, 0x14 adds r0, r2 ldm r0!, {r2,r5,r7} @@ -192450,7 +184905,7 @@ _0805EFE2: mov r12, r8 adds r7, r4, 0 _0805F01A: - ldr r2, _0805F08C + ldr r2, =0x020244d4 ldr r1, [r2] lsls r4, r5, 3 add r4, r12 @@ -192473,7 +184928,7 @@ _0805F01A: lsrs r5, r0, 24 cmp r5, 0x3 bls _0805F01A - ldr r1, _0805F08C + ldr r1, =0x020244d4 ldr r2, [r1] mov r5, r9 adds r0, r5, r6 @@ -192493,7 +184948,7 @@ _0805F01A: movs r0, 0x80 lsls r0, 5 bl malloc_and_clear - ldr r1, _0805F08C + ldr r1, =0x020244d4 ldr r1, [r1] movs r2, 0xBA lsls r2, 1 @@ -192507,14 +184962,13 @@ _0805F01A: pop {r0} bx r0 .align 2, 0 -_0805F08C: .4byte 0x020244d4 -_0805F090: .4byte 0x08329d98 + .pool thumb_func_end init_uns_table_pokemon_copy thumb_func_start sub_805F094 sub_805F094: @ 805F094 push {r4-r6,lr} - ldr r6, _0805F10C + ldr r6, =0x020244d4 ldr r0, [r6] cmp r0, 0 beq _0805F106 @@ -192572,7 +185026,7 @@ _0805F106: pop {r0} bx r0 .align 2, 0 -_0805F10C: .4byte 0x020244d4 + .pool thumb_func_end sub_805F094 thumb_func_start sub_805F110 @@ -192581,7 +185035,7 @@ sub_805F110: @ 805F110 adds r5, r0, 0 movs r1, 0x37 bl pokemon_getattr - ldr r1, _0805F154 + ldr r1, =0x00000fff ands r1, r0 cmp r1, 0 bne _0805F158 @@ -192608,7 +185062,7 @@ sub_805F110: @ 805F110 movs r0, 0x1 b _0805F15A .align 2, 0 -_0805F154: .4byte 0x00000fff + .pool _0805F158: movs r0, 0 _0805F15A: @@ -192624,26 +185078,24 @@ nullsub_26: @ 805F160 thumb_func_start sub_805F164 sub_805F164: @ 805F164 - ldr r1, _0805F174 - ldr r0, _0805F178 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0805F17C + ldr r1, =bx_exec_buffer_A_ch0_tbl7 + 1 str r1, [r0] bx lr .align 2, 0 -_0805F174: .4byte 0x03005d60 -_0805F178: .4byte 0x02024064 -_0805F17C: .4byte bx_exec_buffer_A_ch0_tbl7 + 1 + .pool thumb_func_end sub_805F164 thumb_func_start bx_exec_buffer_A_ch0_tbl7 bx_exec_buffer_A_ch0_tbl7: @ 805F180 push {lr} - ldr r2, _0805F1B4 - ldr r1, _0805F1B8 - ldr r0, _0805F1BC + ldr r2, =0x02024068 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -192652,13 +185104,13 @@ bx_exec_buffer_A_ch0_tbl7: @ 805F180 ands r1, r0 cmp r1, 0 beq _0805F1CC - ldr r0, _0805F1C0 + ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _0805F1C8 - ldr r0, _0805F1C4 + ldr r0, =0x0831c6c8 ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -192666,11 +185118,7 @@ bx_exec_buffer_A_ch0_tbl7: @ 805F180 bl _call_via_r0 b _0805F1CC .align 2, 0 -_0805F1B4: .4byte 0x02024068 -_0805F1B8: .4byte 0x0832a328 -_0805F1BC: .4byte 0x02024064 -_0805F1C0: .4byte 0x02023064 -_0805F1C4: .4byte 0x0831c6c8 + .pool _0805F1C8: bl dp01_tbl7_exec_completed _0805F1CC: @@ -192681,9 +185129,9 @@ _0805F1CC: thumb_func_start sub_805F1D0 sub_805F1D0: @ 805F1D0 push {lr} - ldr r2, _0805F1F8 - ldr r1, _0805F1FC - ldr r0, _0805F200 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -192693,7 +185141,7 @@ sub_805F1D0: @ 805F1D0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0805F204 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0805F1F4 bl dp01_tbl7_exec_completed @@ -192701,18 +185149,15 @@ _0805F1F4: pop {r0} bx r0 .align 2, 0 -_0805F1F8: .4byte 0x02020630 -_0805F1FC: .4byte 0x020241e4 -_0805F200: .4byte 0x02024064 -_0805F204: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_805F1D0 thumb_func_start sub_805F208 sub_805F208: @ 805F208 push {lr} - ldr r2, _0805F230 - ldr r1, _0805F234 - ldr r0, _0805F238 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -192722,7 +185167,7 @@ sub_805F208: @ 805F208 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0805F23C + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0805F22C bl dp01_tbl7_exec_completed @@ -192730,18 +185175,15 @@ _0805F22C: pop {r0} bx r0 .align 2, 0 -_0805F230: .4byte 0x02020630 -_0805F234: .4byte 0x020241e4 -_0805F238: .4byte 0x02024064 -_0805F23C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_805F208 thumb_func_start sub_805F240 sub_805F240: @ 805F240 push {r4-r6,lr} - ldr r5, _0805F298 - ldr r6, _0805F29C - ldr r4, _0805F2A0 + ldr r5, =0x02020630 + ldr r6, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] @@ -192752,7 +185194,7 @@ sub_805F240: @ 805F240 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, _0805F2A4 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0805F292 adds r0, r2, r5 @@ -192780,18 +185222,15 @@ _0805F292: pop {r0} bx r0 .align 2, 0 -_0805F298: .4byte 0x02020630 -_0805F29C: .4byte 0x020241e4 -_0805F2A0: .4byte 0x02024064 -_0805F2A4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_805F240 thumb_func_start sub_805F2A8 sub_805F2A8: @ 805F2A8 push {r4,lr} - ldr r4, _0805F2E8 + ldr r4, =0x020244d0 ldr r1, [r4] - ldr r3, _0805F2EC + ldr r3, =0x02024064 ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -192820,8 +185259,7 @@ _0805F2E0: pop {r0} bx r0 .align 2, 0 -_0805F2E8: .4byte 0x020244d0 -_0805F2EC: .4byte 0x02024064 + .pool thumb_func_end sub_805F2A8 thumb_func_start sub_805F2F0 @@ -192841,14 +185279,14 @@ sub_805F2F0: @ 805F2F0 lsls r0, 24 cmp r0, 0 beq _0805F31E - ldr r0, _0805F354 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _0805F32C _0805F31E: - ldr r0, _0805F354 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 8 @@ -192856,9 +185294,9 @@ _0805F31E: cmp r0, 0 beq _0805F368 _0805F32C: - ldr r2, _0805F358 - ldr r1, _0805F35C - ldr r3, _0805F360 + ldr r2, =0x02020630 + ldr r1, =0x03005d70 + ldr r3, =0x02024064 ldrb r0, [r3] adds r0, r1 ldrb r1, [r0] @@ -192868,7 +185306,7 @@ _0805F32C: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0805F364 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0805F34E movs r1, 0x1 @@ -192877,15 +185315,11 @@ _0805F34E: movs r6, 0 b _0805F3A2 .align 2, 0 -_0805F354: .4byte 0x02022fec -_0805F358: .4byte 0x02020630 -_0805F35C: .4byte 0x03005d70 -_0805F360: .4byte 0x02024064 -_0805F364: .4byte nullsub_12 + 1 + .pool _0805F368: - ldr r3, _0805F474 - ldr r6, _0805F478 - ldr r2, _0805F47C + ldr r3, =0x02020630 + ldr r6, =0x03005d70 + ldr r2, =0x02024064 ldrb r4, [r2] adds r0, r4, r6 ldrb r1, [r0] @@ -192895,7 +185329,7 @@ _0805F368: adds r3, 0x1C adds r0, r3 ldr r5, [r0] - ldr r0, _0805F480 + ldr r0, =nullsub_12 + 1 cmp r5, r0 bne _0805F3A0 movs r0, 0x2 @@ -192914,11 +185348,11 @@ _0805F368: _0805F3A0: movs r6, 0x1 _0805F3A2: - ldr r3, _0805F484 - ldr r1, _0805F488 + ldr r3, =0x020244d8 + ldr r1, =0x020244d0 mov r8, r1 ldr r2, [r1] - ldr r7, _0805F47C + ldr r7, =0x02024064 ldrb r1, [r7] lsls r0, r1, 1 adds r0, r1 @@ -192926,7 +185360,7 @@ _0805F3A2: ldr r5, [r2, 0x4] adds r0, r5, r0 str r0, [r3] - ldr r2, _0805F48C + ldr r2, =0x020244dc ldrb r0, [r7] movs r1, 0x2 mov r9, r1 @@ -193013,21 +185447,14 @@ _0805F408: ldrb r1, [r0, 0x1] ands r4, r1 strb r4, [r0, 0x1] - ldr r4, _0805F490 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag b _0805F51A .align 2, 0 -_0805F474: .4byte 0x02020630 -_0805F478: .4byte 0x03005d70 -_0805F47C: .4byte 0x02024064 -_0805F480: .4byte nullsub_12 + 1 -_0805F484: .4byte 0x020244d8 -_0805F488: .4byte 0x020244d0 -_0805F48C: .4byte 0x020244dc -_0805F490: .4byte 0x000027f9 + .pool _0805F494: ldrb r2, [r7] lsls r0, r2, 1 @@ -193061,7 +185488,7 @@ _0805F494: ands r0, r1 cmp r0, 0 bne _0805F53C - ldr r4, _0805F54C + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -193069,7 +185496,7 @@ _0805F494: _0805F4E4: mov r1, r8 ldr r0, [r1] - ldr r1, _0805F550 + ldr r1, =0x02024064 ldrb r2, [r1] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -193082,7 +185509,7 @@ _0805F4E4: strb r0, [r1] mov r1, r8 ldr r0, [r1] - ldr r1, _0805F550 + ldr r1, =0x02024064 ldrb r2, [r1] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -193095,9 +185522,9 @@ _0805F4E4: ands r0, r2 strb r0, [r1, 0x1] _0805F51A: - ldr r0, _0805F554 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r3, _0805F550 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -193106,11 +185533,11 @@ _0805F51A: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, _0805F558 + ldr r1, =0x03005d60 ldrb r0, [r3] lsls r0, 2 adds r0, r1 - ldr r1, _0805F55C + ldr r1, =sub_805F2A8 + 1 str r1, [r0] _0805F53C: pop {r3-r5} @@ -193121,11 +185548,7 @@ _0805F53C: pop {r0} bx r0 .align 2, 0 -_0805F54C: .4byte 0x000027f9 -_0805F550: .4byte 0x02024064 -_0805F554: .4byte 0x020244d0 -_0805F558: .4byte 0x03005d60 -_0805F55C: .4byte sub_805F2A8 + 1 + .pool thumb_func_end sub_805F2F0 thumb_func_start sub_805F560 @@ -193139,9 +185562,9 @@ sub_805F560: @ 805F560 movs r0, 0 str r0, [sp] mov r10, r0 - ldr r5, _0805F748 + ldr r5, =0x020244d0 ldr r0, [r5] - ldr r4, _0805F74C + ldr r4, =0x02024064 ldrb r2, [r4] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -193155,19 +185578,19 @@ sub_805F560: @ 805F560 ands r0, r1 cmp r0, 0 bne _0805F5A6 - ldr r0, _0805F750 + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0805F754 + ldr r0, =0x02024744 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 _0805F5A6: - ldr r0, _0805F758 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0805F75C + ldr r1, =0x00008040 ands r0, r1 cmp r0, 0 bne _0805F5EE @@ -193190,19 +185613,19 @@ _0805F5A6: ands r0, r1 cmp r0, 0 bne _0805F5EE - ldr r0, _0805F750 + ldr r0, =0x0202406e adds r0, r2, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0805F754 + ldr r0, =0x02024744 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 _0805F5EE: - ldr r2, _0805F748 + ldr r2, =0x020244d0 ldr r0, [r2] - ldr r1, _0805F74C + ldr r1, =0x02024064 mov r8, r1 ldrb r4, [r1] ldr r5, [r0, 0x4] @@ -193238,26 +185661,26 @@ _0805F5EE: lsls r0, 24 cmp r0, 0 beq _0805F684 - ldr r0, _0805F758 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _0805F684 - ldr r4, _0805F760 + ldr r4, =0x03005d70 mov r1, r8 ldrb r0, [r1] adds r1, r7, 0 eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _0805F750 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0805F754 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -193272,18 +185695,18 @@ _0805F5EE: ldrb r0, [r0] bl sub_80729D0 _0805F684: - ldr r5, _0805F760 - ldr r4, _0805F74C + ldr r5, =0x03005d70 + ldr r4, =0x02024064 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _0805F750 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0805F754 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -193294,9 +185717,9 @@ _0805F684: ldrb r0, [r0] bl sub_80729D0 _0805F6B4: - ldr r3, _0805F748 + ldr r3, =0x020244d0 ldr r2, [r3] - ldr r0, _0805F74C + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -193311,7 +185734,7 @@ _0805F6B4: _0805F6D0: mov r1, r9 ldr r0, [r1] - ldr r4, _0805F74C + ldr r4, =0x02024064 ldrb r2, [r4] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -193351,7 +185774,7 @@ _0805F6D0: ands r0, r1 cmp r0, 0 bne _0805F774 - ldr r0, _0805F758 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 @@ -193363,28 +185786,21 @@ _0805F6D0: lsrs r0, 24 cmp r0, 0x1 bne _0805F774 - ldr r0, _0805F764 + ldr r0, =0x03007420 bl m4aMPlayContinue b _0805F774 .align 2, 0 -_0805F748: .4byte 0x020244d0 -_0805F74C: .4byte 0x02024064 -_0805F750: .4byte 0x0202406e -_0805F754: .4byte 0x02024744 -_0805F758: .4byte 0x02022fec -_0805F75C: .4byte 0x00008040 -_0805F760: .4byte 0x03005d70 -_0805F764: .4byte 0x03007420 + .pool _0805F768: - ldr r0, _0805F7EC - ldr r1, _0805F7F0 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl _0805F774: - ldr r0, _0805F7F4 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0805F7F8 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -193406,16 +185822,16 @@ _0805F792: lsls r0, 24 cmp r0, 0 beq _0805F810 - ldr r0, _0805F7FC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _0805F810 _0805F7B2: - ldr r2, _0805F800 - ldr r0, _0805F804 - ldr r1, _0805F7F8 + ldr r2, =0x02020630 + ldr r0, =0x03005d7c + ldr r1, =0x02024064 ldrb r4, [r1] adds r0, r4, r0 ldrb r1, [r0] @@ -193425,10 +185841,10 @@ _0805F7B2: adds r2, 0x1C adds r0, r2 ldr r3, [r0] - ldr r0, _0805F808 + ldr r0, =nullsub_12 + 1 cmp r3, r0 bne _0805F86E - ldr r0, _0805F80C + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -193442,19 +185858,11 @@ _0805F7B2: mov r10, r1 b _0805F86E .align 2, 0 -_0805F7EC: .4byte 0x03007420 -_0805F7F0: .4byte 0x0000ffff -_0805F7F4: .4byte 0x020244d0 -_0805F7F8: .4byte 0x02024064 -_0805F7FC: .4byte 0x02022fec -_0805F800: .4byte 0x02020630 -_0805F804: .4byte 0x03005d7c -_0805F808: .4byte nullsub_12 + 1 -_0805F80C: .4byte 0x020241e4 + .pool _0805F810: - ldr r2, _0805F968 - ldr r7, _0805F96C - ldr r0, _0805F970 + ldr r2, =0x02020630 + ldr r7, =0x03005d7c + ldr r0, =0x02024064 ldrb r3, [r0] adds r0, r3, r7 ldrb r1, [r0] @@ -193464,10 +185872,10 @@ _0805F810: adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, _0805F974 + ldr r0, =nullsub_12 + 1 cmp r4, r0 bne _0805F86E - ldr r6, _0805F978 + ldr r6, =0x020241e4 adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -193510,14 +185918,14 @@ _0805F86E: lsls r0, 24 cmp r0, 0 beq _0805F8D2 - ldr r0, _0805F97C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _0805F8D2 - ldr r1, _0805F96C - ldr r5, _0805F970 + ldr r1, =0x03005d7c + ldr r5, =0x02024064 ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -193526,18 +185934,18 @@ _0805F86E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805F968 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles ldrb r0, [r5] eors r4, r0 - ldr r1, _0805F980 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0805F984 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -193547,25 +185955,25 @@ _0805F86E: adds r0, r4, 0 bl sub_805EE54 _0805F8D2: - ldr r1, _0805F96C - ldr r4, _0805F970 + ldr r1, =0x03005d7c + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805F968 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles ldrb r5, [r4] - ldr r1, _0805F980 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0805F984 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -193574,7 +185982,7 @@ _0805F8D2: lsrs r1, 16 adds r0, r5, 0 bl sub_805EE54 - ldr r3, _0805F988 + ldr r3, =0x020244d0 ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r1, [r2, 0x9] @@ -193605,11 +186013,11 @@ _0805F8D2: movs r0, 0x7F ands r0, r2 strb r0, [r1, 0x1] - ldr r1, _0805F98C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0805F990 + ldr r1, =sub_805F2F0 + 1 str r1, [r0] _0805F958: add sp, 0x4 @@ -193621,25 +186029,15 @@ _0805F958: pop {r0} bx r0 .align 2, 0 -_0805F968: .4byte 0x02020630 -_0805F96C: .4byte 0x03005d7c -_0805F970: .4byte 0x02024064 -_0805F974: .4byte nullsub_12 + 1 -_0805F978: .4byte 0x020241e4 -_0805F97C: .4byte 0x02022fec -_0805F980: .4byte 0x0202406e -_0805F984: .4byte 0x02024744 -_0805F988: .4byte 0x020244d0 -_0805F98C: .4byte 0x03005d60 -_0805F990: .4byte sub_805F2F0 + 1 + .pool thumb_func_end sub_805F560 thumb_func_start sub_805F994 sub_805F994: @ 805F994 push {r4,r5,lr} - ldr r2, _0805FA50 - ldr r0, _0805FA54 - ldr r1, _0805FA58 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 + ldr r1, =0x02024064 ldrb r3, [r1] adds r0, r3, r0 ldrb r1, [r0] @@ -193651,7 +186049,7 @@ sub_805F994: @ 805F994 ldrsh r0, [r0, r1] cmp r0, 0 bne _0805F9E0 - ldr r0, _0805FA5C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r2, r3, 1 @@ -193664,19 +186062,19 @@ sub_805F994: @ 805F994 ands r0, r1 cmp r0, 0 bne _0805F9E0 - ldr r0, _0805FA60 + ldr r0, =0x0202406e adds r0, r2, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0805FA64 + ldr r0, =0x02024744 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 _0805F9E0: - ldr r2, _0805FA50 - ldr r0, _0805FA54 - ldr r5, _0805FA58 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 + ldr r5, =0x02024064 ldrb r3, [r5] adds r0, r3, r0 ldrb r1, [r0] @@ -193686,10 +186084,10 @@ _0805F9E0: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0805FA68 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0805FA48 - ldr r4, _0805FA5C + ldr r4, =0x020244d0 ldr r0, [r4] ldr r1, [r0, 0x4] lsls r0, r3, 1 @@ -193717,7 +186115,7 @@ _0805F9E0: negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r4, _0805FA6C + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -193728,22 +186126,15 @@ _0805FA48: pop {r0} bx r0 .align 2, 0 -_0805FA50: .4byte 0x02020630 -_0805FA54: .4byte 0x020241e4 -_0805FA58: .4byte 0x02024064 -_0805FA5C: .4byte 0x020244d0 -_0805FA60: .4byte 0x0202406e -_0805FA64: .4byte 0x02024744 -_0805FA68: .4byte nullsub_12 + 1 -_0805FA6C: .4byte 0x000027f9 + .pool thumb_func_end sub_805F994 thumb_func_start sub_805FA70 sub_805FA70: @ 805FA70 push {r4-r6,lr} - ldr r6, _0805FAB0 + ldr r6, =0x02024064 ldrb r0, [r6] - ldr r5, _0805FAB4 + ldr r5, =0x03005d70 adds r1, r0, r5 ldrb r1, [r1] movs r2, 0 @@ -193769,8 +186160,7 @@ sub_805FA70: @ 805FA70 bl heathbar_draw_hp b _0805FABC .align 2, 0 -_0805FAB0: .4byte 0x02024064 -_0805FAB4: .4byte 0x03005d70 + .pool _0805FAB8: bl dp01_tbl7_exec_completed _0805FABC: @@ -193782,9 +186172,9 @@ _0805FABC: thumb_func_start sub_805FAC4 sub_805FAC4: @ 805FAC4 push {lr} - ldr r2, _0805FAF8 - ldr r0, _0805FAFC - ldr r1, _0805FB00 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 + ldr r1, =0x02024064 ldrb r3, [r1] adds r0, r3, r0 ldrb r1, [r0] @@ -193797,7 +186187,7 @@ sub_805FAC4: @ 805FAC4 lsls r0, 31 cmp r0, 0 bne _0805FAF2 - ldr r0, _0805FB04 + ldr r0, =0x03005d70 adds r0, r3, r0 ldrb r0, [r0] bl sub_8072984 @@ -193806,18 +186196,15 @@ _0805FAF2: pop {r0} bx r0 .align 2, 0 -_0805FAF8: .4byte 0x02020630 -_0805FAFC: .4byte 0x020241e4 -_0805FB00: .4byte 0x02024064 -_0805FB04: .4byte 0x03005d70 + .pool thumb_func_end sub_805FAC4 thumb_func_start sub_805FB08 sub_805FB08: @ 805FB08 push {r4-r6,lr} - ldr r0, _0805FB68 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r6, _0805FB6C + ldr r6, =0x02024064 ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -193829,13 +186216,13 @@ sub_805FB08: @ 805FB08 ands r0, r1 cmp r0, 0 bne _0805FB62 - ldr r5, _0805FB70 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0805FB74 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -193848,7 +186235,7 @@ sub_805FB08: @ 805FB08 bl obj_delete_and_free_tiles ldrb r0, [r6] bl sub_805EEE0 - ldr r1, _0805FB78 + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -193859,11 +186246,7 @@ _0805FB62: pop {r0} bx r0 .align 2, 0 -_0805FB68: .4byte 0x020244d0 -_0805FB6C: .4byte 0x02024064 -_0805FB70: .4byte 0x020241e4 -_0805FB74: .4byte 0x02020630 -_0805FB78: .4byte 0x03005d70 + .pool thumb_func_end sub_805FB08 thumb_func_start bx_t7_button_a @@ -193883,12 +186266,12 @@ _0805FB8E: thumb_func_start bx_blink_t7 bx_blink_t7: @ 805FB94 push {r4,lr} - ldr r1, _0805FBD0 - ldr r0, _0805FBD4 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _0805FBD8 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -193906,15 +186289,12 @@ bx_blink_t7: @ 805FB94 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, _0805FBDC + ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl7_exec_completed b _0805FC0A .align 2, 0 -_0805FBD0: .4byte 0x020241e4 -_0805FBD4: .4byte 0x02024064 -_0805FBD8: .4byte 0x02020630 -_0805FBDC: .4byte 0x020244b9 + .pool _0805FBE0: ldrh r0, [r4, 0x30] movs r1, 0x3 @@ -193947,9 +186327,9 @@ _0805FC0A: thumb_func_start sub_805FC10 sub_805FC10: @ 805FC10 push {r4,lr} - ldr r2, _0805FC64 - ldr r0, _0805FC68 - ldr r4, _0805FC6C + ldr r2, =0x02020630 + ldr r0, =0x03005d70 + ldr r4, =0x02024064 ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -193959,10 +186339,10 @@ sub_805FC10: @ 805FC10 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0805FC70 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0805FC5C - ldr r0, _0805FC74 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r3, 2 @@ -193978,32 +186358,26 @@ sub_805FC10: @ 805FC10 movs r3, 0x6 bl move_anim_start_t4 _0805FC50: - ldr r0, _0805FC78 + ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, _0805FC7C + ldr r0, =bx_803AEDC + 1 str r0, [r1] _0805FC5C: pop {r4} pop {r0} bx r0 .align 2, 0 -_0805FC64: .4byte 0x02020630 -_0805FC68: .4byte 0x03005d70 -_0805FC6C: .4byte 0x02024064 -_0805FC70: .4byte nullsub_12 + 1 -_0805FC74: .4byte 0x020244d0 -_0805FC78: .4byte 0x03005d60 -_0805FC7C: .4byte bx_803AEDC + 1 + .pool thumb_func_end sub_805FC10 thumb_func_start bx_803AEDC bx_803AEDC: @ 805FC80 push {r4,lr} - ldr r0, _0805FCE0 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r4, _0805FCE4 + ldr r4, =0x02024064 ldrb r1, [r4] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -194019,8 +186393,8 @@ bx_803AEDC: @ 805FC80 lsls r0, 24 cmp r0, 0 bne _0805FCDA - ldr r2, _0805FCE8 - ldr r1, _0805FCEC + ldr r2, =0x02020630 + ldr r1, =0x020241e4 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -194030,15 +186404,15 @@ bx_803AEDC: @ 805FC80 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0805FCF0 + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _0805FCCA - ldr r0, _0805FCF4 + ldr r0, =nullsub_18 + 1 cmp r1, r0 bne _0805FCDA _0805FCCA: - ldr r0, _0805FCF8 - ldr r1, _0805FCFC + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl @@ -194048,22 +186422,15 @@ _0805FCDA: pop {r0} bx r0 .align 2, 0 -_0805FCE0: .4byte 0x020244d0 -_0805FCE4: .4byte 0x02024064 -_0805FCE8: .4byte 0x02020630 -_0805FCEC: .4byte 0x020241e4 -_0805FCF0: .4byte nullsub_12 + 1 -_0805FCF4: .4byte nullsub_18 + 1 -_0805FCF8: .4byte 0x03007420 -_0805FCFC: .4byte 0x0000ffff + .pool thumb_func_end bx_803AEDC thumb_func_start sub_805FD00 sub_805FD00: @ 805FD00 push {r4-r7,lr} - ldr r4, _0805FDC4 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r5, _0805FDC8 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -194075,8 +186442,8 @@ sub_805FD00: @ 805FD00 ands r0, r1 cmp r0, 0 beq _0805FDBC - ldr r7, _0805FDCC - ldr r6, _0805FDD0 + ldr r7, =0x02020630 + ldr r6, =0x020241e4 adds r0, r2, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -194086,7 +186453,7 @@ sub_805FD00: @ 805FD00 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _0805FDD4 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0805FDBC ldrb r1, [r3] @@ -194105,7 +186472,7 @@ sub_805FD00: @ 805FD00 negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r4, _0805FDD8 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -194119,17 +186486,17 @@ sub_805FD00: @ 805FD00 adds r0, r7 movs r1, 0 bl obj_anim_image_start - ldr r4, _0805FDDC + ldr r4, =0x03005d70 ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _0805FDE0 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0805FDE4 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -194141,36 +186508,26 @@ sub_805FD00: @ 805FD00 bl sub_80729D0 ldrb r0, [r5] bl sub_805E408 - ldr r1, _0805FDE8 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805FDEC + ldr r1, =sub_805FC10 + 1 str r1, [r0] _0805FDBC: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0805FDC4: .4byte 0x020244d0 -_0805FDC8: .4byte 0x02024064 -_0805FDCC: .4byte 0x02020630 -_0805FDD0: .4byte 0x020241e4 -_0805FDD4: .4byte nullsub_12 + 1 -_0805FDD8: .4byte 0x000027f9 -_0805FDDC: .4byte 0x03005d70 -_0805FDE0: .4byte 0x0202406e -_0805FDE4: .4byte 0x02024744 -_0805FDE8: .4byte 0x03005d60 -_0805FDEC: .4byte sub_805FC10 + 1 + .pool thumb_func_end sub_805FD00 thumb_func_start sub_805FDF0 sub_805FDF0: @ 805FDF0 push {r4-r6,lr} - ldr r6, _0805FE94 + ldr r6, =0x020244d0 ldr r0, [r6] - ldr r5, _0805FE98 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -194182,18 +186539,18 @@ sub_805FDF0: @ 805FDF0 ands r0, r1 cmp r0, 0 bne _0805FE22 - ldr r0, _0805FE9C + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0805FEA0 + ldr r0, =0x02024744 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 _0805FE22: - ldr r4, _0805FEA4 - ldr r0, _0805FEA8 + ldr r4, =0x02020630 + ldr r0, =0x03005d7c ldrb r2, [r5] adds r0, r2, r0 ldrb r1, [r0] @@ -194204,7 +186561,7 @@ _0805FE22: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _0805FEAC + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0805FE8C ldr r0, [r6] @@ -194221,13 +186578,13 @@ _0805FE22: adds r0, r3, r4 bl obj_delete_and_free_tiles ldrb r4, [r5] - ldr r1, _0805FE9C + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0805FEA0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -194236,34 +186593,26 @@ _0805FE22: lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, _0805FEB0 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0805FEB4 + ldr r1, =sub_805FD00 + 1 str r1, [r0] _0805FE8C: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0805FE94: .4byte 0x020244d0 -_0805FE98: .4byte 0x02024064 -_0805FE9C: .4byte 0x0202406e -_0805FEA0: .4byte 0x02024744 -_0805FEA4: .4byte 0x02020630 -_0805FEA8: .4byte 0x03005d7c -_0805FEAC: .4byte nullsub_12 + 1 -_0805FEB0: .4byte 0x03005d60 -_0805FEB4: .4byte sub_805FD00 + 1 + .pool thumb_func_end sub_805FDF0 thumb_func_start sub_805FEB8 sub_805FEB8: @ 805FEB8 push {lr} - ldr r0, _0805FEE0 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0805FEE4 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -194280,16 +186629,15 @@ _0805FEDA: pop {r0} bx r0 .align 2, 0 -_0805FEE0: .4byte 0x020244d0 -_0805FEE4: .4byte 0x02024064 + .pool thumb_func_end sub_805FEB8 thumb_func_start bx_803B0F4 bx_803B0F4: @ 805FEE8 push {lr} - ldr r0, _0805FF10 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0805FF14 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -194306,22 +186654,21 @@ _0805FF0A: pop {r0} bx r0 .align 2, 0 -_0805FF10: .4byte 0x020244d0 -_0805FF14: .4byte 0x02024064 + .pool thumb_func_end bx_803B0F4 thumb_func_start dp01_tbl7_exec_completed dp01_tbl7_exec_completed: @ 805FF18 push {r4,lr} sub sp, 0x4 - ldr r1, _0805FF58 - ldr r4, _0805FF5C + ldr r1, =0x03005d60 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0805FF60 + ldr r1, =bx_exec_buffer_A_ch0_tbl7 + 1 str r1, [r0] - ldr r0, _0805FF64 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -194334,7 +186681,7 @@ dp01_tbl7_exec_completed: @ 805FF18 movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _0805FF68 + ldr r1, =0x02023064 ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -194342,14 +186689,10 @@ dp01_tbl7_exec_completed: @ 805FF18 strb r1, [r0] b _0805FF7E .align 2, 0 -_0805FF58: .4byte 0x03005d60 -_0805FF5C: .4byte 0x02024064 -_0805FF60: .4byte bx_exec_buffer_A_ch0_tbl7 + 1 -_0805FF64: .4byte 0x02022fec -_0805FF68: .4byte 0x02023064 + .pool _0805FF6C: - ldr r2, _0805FF88 - ldr r1, _0805FF8C + ldr r2, =0x02024068 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -194363,8 +186706,7 @@ _0805FF7E: pop {r0} bx r0 .align 2, 0 -_0805FF88: .4byte 0x02024068 -_0805FF8C: .4byte 0x0832a328 + .pool thumb_func_end dp01_tbl7_exec_completed thumb_func_start dp01t_00_7_getattr @@ -194372,8 +186714,8 @@ dp01t_00_7_getattr: @ 805FF90 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _0805FFBC - ldr r0, _0805FFC0 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -194381,7 +186723,7 @@ dp01t_00_7_getattr: @ 805FF90 ldrb r0, [r1] cmp r0, 0 bne _0805FFC8 - ldr r0, _0805FFC4 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -194390,9 +186732,7 @@ dp01t_00_7_getattr: @ 805FF90 adds r6, r0, 0 b _0805FFEA .align 2, 0 -_0805FFBC: .4byte 0x02023064 -_0805FFC0: .4byte 0x02024064 -_0805FFC4: .4byte 0x0202406e + .pool _0805FFC8: ldrb r4, [r1] movs r5, 0 @@ -194437,8 +186777,8 @@ sub_8060004: @ 8060004 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _08060038 - ldr r3, _0806003C + ldr r2, =0x02023064 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -194449,14 +186789,12 @@ sub_8060004: @ 8060004 bl _0806079A _0806002E: lsls r0, 2 - ldr r1, _08060040 + ldr r1, =_08060044 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08060038: .4byte 0x02023064 -_0806003C: .4byte 0x02024064 -_08060040: .4byte _08060044 + .pool .align 2, 0 _08060044: .4byte _08060134 @@ -194523,7 +186861,7 @@ _08060134: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08060348 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -194576,7 +186914,7 @@ _08060180: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08060348 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -194612,7 +186950,7 @@ _08060180: ands r0, r6 lsls r0, 5 ldrh r2, [r3, 0x14] - ldr r1, _0806034C + ldr r1, =0xfffffc1f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x14] @@ -194635,7 +186973,7 @@ _08060180: ands r1, r0 lsls r1, 15 ldr r0, [sp, 0x14] - ldr r2, _08060350 + ldr r2, =0xfff07fff ands r0, r2 orrs r0, r1 str r0, [sp, 0x14] @@ -194646,7 +186984,7 @@ _08060180: ands r0, r6 lsls r0, 4 ldrh r2, [r3, 0x16] - ldr r1, _08060354 + ldr r1, =0xfffffe0f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x16] @@ -194760,28 +187098,25 @@ _08060338: bls _08060338 b _0806079A .align 2, 0 -_08060348: .4byte 0x02024744 -_0806034C: .4byte 0xfffffc1f -_08060350: .4byte 0xfff07fff -_08060354: .4byte 0xfffffe0f + .pool _08060358: movs r0, 0x64 muls r0, r5 - ldr r1, _08060364 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB b _080606D2 .align 2, 0 -_08060364: .4byte 0x02024744 + .pool _08060368: movs r0, 0x64 muls r0, r5 - ldr r1, _08060374 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xC b _080606D2 .align 2, 0 -_08060374: .4byte 0x02024744 + .pool _08060378: movs r6, 0 add r2, sp, 0x58 @@ -194791,7 +187126,7 @@ _08060378: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080603DC + ldr r0, =0x02024744 adds r4, r1, r0 mov r8, r9 _0806038E: @@ -194815,7 +187150,7 @@ _0806038E: ble _0806038E movs r0, 0x64 muls r0, r5 - ldr r1, _080603DC + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -194833,11 +187168,11 @@ _080603CC: bls _080603CC b _0806079A .align 2, 0 -_080603DC: .4byte 0x02024744 + .pool _080603E0: movs r0, 0x64 muls r0, r5 - ldr r1, _080603F8 + ldr r1, =0x02024744 adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -194847,13 +187182,13 @@ _080603E0: adds r1, 0x9 b _080606D2 .align 2, 0 -_080603F8: .4byte 0x02024744 + .pool _080603FC: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _08060434 + ldr r2, =0x02024744 mov r8, r2 _08060408: adds r1, r6, 0 @@ -194868,7 +187203,7 @@ _08060408: ble _08060408 movs r0, 0x64 muls r0, r5 - ldr r1, _08060434 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -194877,11 +187212,11 @@ _08060408: adds r6, 0x1 b _0806079A .align 2, 0 -_08060434: .4byte 0x02024744 + .pool _08060438: movs r0, 0x64 muls r0, r5 - ldr r1, _08060450 + ldr r1, =0x02024744 adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -194891,20 +187226,20 @@ _08060438: adds r1, 0x8 b _08060792 .align 2, 0 -_08060450: .4byte 0x02024744 + .pool _08060454: movs r0, 0x64 muls r0, r5 - ldr r1, _08060460 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1 b _0806046E .align 2, 0 -_08060460: .4byte 0x02024744 + .pool _08060464: movs r0, 0x64 muls r0, r5 - ldr r1, _08060490 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x19 _0806046E: @@ -194924,120 +187259,120 @@ _0806046E: movs r6, 0x3 b _0806079A .align 2, 0 -_08060490: .4byte 0x02024744 + .pool _08060494: movs r0, 0x64 muls r0, r5 - ldr r1, _080604A0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1A b _08060792 .align 2, 0 -_080604A0: .4byte 0x02024744 + .pool _080604A4: movs r0, 0x64 muls r0, r5 - ldr r1, _080604B0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1B b _08060792 .align 2, 0 -_080604B0: .4byte 0x02024744 + .pool _080604B4: movs r0, 0x64 muls r0, r5 - ldr r1, _080604C0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1C b _08060792 .align 2, 0 -_080604C0: .4byte 0x02024744 + .pool _080604C4: movs r0, 0x64 muls r0, r5 - ldr r1, _080604D0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1D b _08060792 .align 2, 0 -_080604D0: .4byte 0x02024744 + .pool _080604D4: movs r0, 0x64 muls r0, r5 - ldr r1, _080604E0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1E b _08060792 .align 2, 0 -_080604E0: .4byte 0x02024744 + .pool _080604E4: movs r0, 0x64 muls r0, r5 - ldr r1, _080604F0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1F b _08060792 .align 2, 0 -_080604F0: .4byte 0x02024744 + .pool _080604F4: movs r0, 0x64 muls r0, r5 - ldr r1, _08060500 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x20 b _08060792 .align 2, 0 -_08060500: .4byte 0x02024744 + .pool _08060504: movs r0, 0x64 muls r0, r5 - ldr r1, _08060510 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x22 b _08060792 .align 2, 0 -_08060510: .4byte 0x02024744 + .pool _08060514: movs r0, 0x64 muls r0, r5 - ldr r1, _08060520 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x23 b _08060792 .align 2, 0 -_08060520: .4byte 0x02024744 + .pool _08060524: movs r0, 0x64 muls r0, r5 - ldr r1, _08060530 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x24 b _08060792 .align 2, 0 -_08060530: .4byte 0x02024744 + .pool _08060534: movs r0, 0x64 muls r0, r5 - ldr r1, _08060540 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x25 b _08060792 .align 2, 0 -_08060540: .4byte 0x02024744 + .pool _08060544: movs r0, 0x64 muls r0, r5 - ldr r1, _08060550 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x26 b _08060792 .align 2, 0 -_08060550: .4byte 0x02024744 + .pool _08060554: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080605A0 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -195066,83 +187401,83 @@ _08060554: movs r6, 0x6 b _0806079A .align 2, 0 -_080605A0: .4byte 0x02024744 + .pool _080605A4: movs r0, 0x64 muls r0, r5 - ldr r1, _080605B0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x27 b _08060792 .align 2, 0 -_080605B0: .4byte 0x02024744 + .pool _080605B4: movs r0, 0x64 muls r0, r5 - ldr r1, _080605C0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x28 b _08060792 .align 2, 0 -_080605C0: .4byte 0x02024744 + .pool _080605C4: movs r0, 0x64 muls r0, r5 - ldr r1, _080605D0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x29 b _08060792 .align 2, 0 -_080605D0: .4byte 0x02024744 + .pool _080605D4: movs r0, 0x64 muls r0, r5 - ldr r1, _080605E0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2A b _08060792 .align 2, 0 -_080605E0: .4byte 0x02024744 + .pool _080605E4: movs r0, 0x64 muls r0, r5 - ldr r1, _080605F0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2B b _08060792 .align 2, 0 -_080605F0: .4byte 0x02024744 + .pool _080605F4: movs r0, 0x64 muls r0, r5 - ldr r1, _08060600 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2C b _08060792 .align 2, 0 -_08060600: .4byte 0x02024744 + .pool _08060604: movs r0, 0x64 muls r0, r5 - ldr r1, _08060610 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0 b _0806062E .align 2, 0 -_08060610: .4byte 0x02024744 + .pool _08060614: movs r0, 0x64 muls r0, r5 - ldr r1, _08060620 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x9 b _080606D2 .align 2, 0 -_08060620: .4byte 0x02024744 + .pool _08060624: movs r0, 0x64 muls r0, r5 - ldr r1, _08060654 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x37 _0806062E: @@ -195164,74 +187499,74 @@ _0806062E: movs r6, 0x4 b _0806079A .align 2, 0 -_08060654: .4byte 0x02024744 + .pool _08060658: movs r0, 0x64 muls r0, r5 - ldr r1, _08060664 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x38 b _08060792 .align 2, 0 -_08060664: .4byte 0x02024744 + .pool _08060668: movs r0, 0x64 muls r0, r5 - ldr r1, _08060674 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 b _080606D2 .align 2, 0 -_08060674: .4byte 0x02024744 + .pool _08060678: movs r0, 0x64 muls r0, r5 - ldr r1, _08060684 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A b _080606D2 .align 2, 0 -_08060684: .4byte 0x02024744 + .pool _08060688: movs r0, 0x64 muls r0, r5 - ldr r1, _08060694 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3B b _080606D2 .align 2, 0 -_08060694: .4byte 0x02024744 + .pool _08060698: movs r0, 0x64 muls r0, r5 - ldr r1, _080606A4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3C b _080606D2 .align 2, 0 -_080606A4: .4byte 0x02024744 + .pool _080606A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080606B4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3D b _080606D2 .align 2, 0 -_080606B4: .4byte 0x02024744 + .pool _080606B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080606C4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3E b _080606D2 .align 2, 0 -_080606C4: .4byte 0x02024744 + .pool _080606C8: movs r0, 0x64 muls r0, r5 - ldr r1, _080606E4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3F _080606D2: @@ -195244,101 +187579,101 @@ _080606D2: movs r6, 0x2 b _0806079A .align 2, 0 -_080606E4: .4byte 0x02024744 + .pool _080606E8: movs r0, 0x64 muls r0, r5 - ldr r1, _080606F4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x16 b _08060792 .align 2, 0 -_080606F4: .4byte 0x02024744 + .pool _080606F8: movs r0, 0x64 muls r0, r5 - ldr r1, _08060704 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x17 b _08060792 .align 2, 0 -_08060704: .4byte 0x02024744 + .pool _08060708: movs r0, 0x64 muls r0, r5 - ldr r1, _08060714 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x18 b _08060792 .align 2, 0 -_08060714: .4byte 0x02024744 + .pool _08060718: movs r0, 0x64 muls r0, r5 - ldr r1, _08060724 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x21 b _08060792 .align 2, 0 -_08060724: .4byte 0x02024744 + .pool _08060728: movs r0, 0x64 muls r0, r5 - ldr r1, _08060734 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2F b _08060792 .align 2, 0 -_08060734: .4byte 0x02024744 + .pool _08060738: movs r0, 0x64 muls r0, r5 - ldr r1, _08060744 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x30 b _08060792 .align 2, 0 -_08060744: .4byte 0x02024744 + .pool _08060748: movs r0, 0x64 muls r0, r5 - ldr r1, _08060754 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x32 b _08060792 .align 2, 0 -_08060754: .4byte 0x02024744 + .pool _08060758: movs r0, 0x64 muls r0, r5 - ldr r1, _08060764 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x33 b _08060792 .align 2, 0 -_08060764: .4byte 0x02024744 + .pool _08060768: movs r0, 0x64 muls r0, r5 - ldr r1, _08060774 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x34 b _08060792 .align 2, 0 -_08060774: .4byte 0x02024744 + .pool _08060778: movs r0, 0x64 muls r0, r5 - ldr r1, _08060784 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x35 b _08060792 .align 2, 0 -_08060784: .4byte 0x02024744 + .pool _08060788: movs r0, 0x64 muls r0, r5 - ldr r1, _080607AC + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x36 _08060792: @@ -195356,15 +187691,15 @@ _0806079A: pop {r1} bx r1 .align 2, 0 -_080607AC: .4byte 0x02024744 + .pool thumb_func_end sub_8060004 thumb_func_start dp01t_01_2_read_pokmon_data_slice dp01t_01_2_read_pokmon_data_slice: @ 80607B0 push {r4-r7,lr} sub sp, 0x58 - ldr r2, _08060828 - ldr r5, _0806082C + ldr r2, =0x0202406e + ldr r5, =0x02024064 ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 @@ -195372,12 +187707,12 @@ dp01t_01_2_read_pokmon_data_slice: @ 80607B0 movs r0, 0x64 adds r4, r2, 0 muls r4, r0 - ldr r3, _08060830 + ldr r3, =0x02023064 lsls r1, 9 adds r0, r3, 0x1 adds r0, r1, r0 ldrb r2, [r0] - ldr r0, _08060834 + ldr r0, =0x02024744 adds r0, r2, r0 adds r6, r4, r0 mov r0, sp @@ -195421,17 +187756,14 @@ _08060806: pop {r0} bx r0 .align 2, 0 -_08060828: .4byte 0x0202406e -_0806082C: .4byte 0x02024064 -_08060830: .4byte 0x02023064 -_08060834: .4byte 0x02024744 + .pool thumb_func_end dp01t_01_2_read_pokmon_data_slice thumb_func_start dp01t_02_7_setattr dp01t_02_7_setattr: @ 8060838 push {r4,r5,lr} - ldr r1, _0806085C - ldr r0, _08060860 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -195439,16 +187771,14 @@ dp01t_02_7_setattr: @ 8060838 ldrb r0, [r1] cmp r0, 0 bne _08060868 - ldr r0, _08060864 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_8060890 b _08060886 .align 2, 0 -_0806085C: .4byte 0x02023064 -_08060860: .4byte 0x02024064 -_08060864: .4byte 0x0202406e + .pool _08060868: ldrb r4, [r1] movs r5, 0 @@ -195483,10 +187813,10 @@ sub_8060890: @ 8060890 sub sp, 0x38 lsls r0, 24 lsrs r5, r0, 24 - ldr r3, _080608C8 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 - ldr r2, _080608CC + ldr r2, =0x02023067 adds r4, r0, r2 adds r7, r4, 0 subs r1, r2, 0x2 @@ -195499,14 +187829,12 @@ sub_8060890: @ 8060890 bl _0806119C _080608BE: lsls r0, 2 - ldr r1, _080608D0 + ldr r1, =_080608D4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080608C8: .4byte 0x02024064 -_080608CC: .4byte 0x02023067 -_080608D0: .4byte _080608D4 + .pool .align 2, 0 _080608D4: .4byte _080609C4 @@ -195573,7 +187901,7 @@ _080609C4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08060B58 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -195640,7 +187968,7 @@ _08060A2A: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08060B58 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -195750,11 +188078,11 @@ _08060A2A: bl pokemon_setattr b _0806119C .align 2, 0 -_08060B58: .4byte 0x02024744 + .pool _08060B5C: movs r0, 0x64 muls r0, r5 - ldr r1, _08060B74 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -195763,11 +188091,11 @@ _08060B5C: bl pokemon_setattr b _0806119C .align 2, 0 -_08060B74: .4byte 0x02024744 + .pool _08060B78: movs r0, 0x64 muls r0, r5 - ldr r1, _08060B90 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -195776,7 +188104,7 @@ _08060B78: bl pokemon_setattr b _0806119C .align 2, 0 -_08060B90: .4byte 0x02024744 + .pool _08060B94: movs r0, 0 mov r8, r0 @@ -195786,7 +188114,7 @@ _08060B94: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08060BE4 + ldr r0, =0x02024744 adds r7, r1, r0 adds r6, r4, 0 adds r6, 0x8 @@ -195810,20 +188138,20 @@ _08060BAC: ble _08060BAC movs r0, 0x64 muls r0, r5 - ldr r1, _08060BE4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x15 mov r2, r9 bl pokemon_setattr b _0806119C .align 2, 0 -_08060BE4: .4byte 0x02024744 + .pool _08060BE8: movs r0, 0x64 muls r0, r5 - ldr r1, _08060C00 + ldr r1, =0x02024744 adds r0, r1 - ldr r3, _08060C04 + ldr r3, =0x02023064 ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -195832,13 +188160,12 @@ _08060BE8: adds r1, 0x9 b _08060C86 .align 2, 0 -_08060C00: .4byte 0x02024744 -_08060C04: .4byte 0x02023064 + .pool _08060C08: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08060C6C + ldr r0, =0x02024744 adds r4, r0 ldrb r2, [r6] lsls r2, 9 @@ -195881,13 +188208,13 @@ _08060C08: bl pokemon_setattr b _0806119C .align 2, 0 -_08060C6C: .4byte 0x02024744 + .pool _08060C70: movs r0, 0x64 muls r0, r5 - ldr r1, _08060C90 + ldr r1, =0x02024744 adds r0, r1 - ldr r3, _08060C94 + ldr r3, =0x02023064 ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -195900,12 +188227,11 @@ _08060C86: bl pokemon_setattr b _0806119C .align 2, 0 -_08060C90: .4byte 0x02024744 -_08060C94: .4byte 0x02023064 + .pool _08060C98: movs r0, 0x64 muls r0, r5 - ldr r1, _08060CB0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -195914,11 +188240,11 @@ _08060C98: bl pokemon_setattr b _0806119C .align 2, 0 -_08060CB0: .4byte 0x02024744 + .pool _08060CB4: movs r0, 0x64 muls r0, r5 - ldr r1, _08060CCC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -195927,11 +188253,11 @@ _08060CB4: bl pokemon_setattr b _0806119C .align 2, 0 -_08060CCC: .4byte 0x02024744 + .pool _08060CD0: movs r0, 0x64 muls r0, r5 - ldr r1, _08060CE8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -195940,11 +188266,11 @@ _08060CD0: bl pokemon_setattr b _0806119C .align 2, 0 -_08060CE8: .4byte 0x02024744 + .pool _08060CEC: movs r0, 0x64 muls r0, r5 - ldr r1, _08060D04 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -195953,11 +188279,11 @@ _08060CEC: bl pokemon_setattr b _0806119C .align 2, 0 -_08060D04: .4byte 0x02024744 + .pool _08060D08: movs r0, 0x64 muls r0, r5 - ldr r1, _08060D20 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -195966,11 +188292,11 @@ _08060D08: bl pokemon_setattr b _0806119C .align 2, 0 -_08060D20: .4byte 0x02024744 + .pool _08060D24: movs r0, 0x64 muls r0, r5 - ldr r1, _08060D3C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -195979,11 +188305,11 @@ _08060D24: bl pokemon_setattr b _0806119C .align 2, 0 -_08060D3C: .4byte 0x02024744 + .pool _08060D40: movs r0, 0x64 muls r0, r5 - ldr r1, _08060D58 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -195992,11 +188318,11 @@ _08060D40: bl pokemon_setattr b _0806119C .align 2, 0 -_08060D58: .4byte 0x02024744 + .pool _08060D5C: movs r0, 0x64 muls r0, r5 - ldr r1, _08060D74 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196005,11 +188331,11 @@ _08060D5C: bl pokemon_setattr b _0806119C .align 2, 0 -_08060D74: .4byte 0x02024744 + .pool _08060D78: movs r0, 0x64 muls r0, r5 - ldr r1, _08060D90 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196018,11 +188344,11 @@ _08060D78: bl pokemon_setattr b _0806119C .align 2, 0 -_08060D90: .4byte 0x02024744 + .pool _08060D94: movs r0, 0x64 muls r0, r5 - ldr r1, _08060DAC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196031,11 +188357,11 @@ _08060D94: bl pokemon_setattr b _0806119C .align 2, 0 -_08060DAC: .4byte 0x02024744 + .pool _08060DB0: movs r0, 0x64 muls r0, r5 - ldr r1, _08060DC8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196044,11 +188370,11 @@ _08060DB0: bl pokemon_setattr b _0806119C .align 2, 0 -_08060DC8: .4byte 0x02024744 + .pool _08060DCC: movs r0, 0x64 muls r0, r5 - ldr r1, _08060DE4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196057,11 +188383,11 @@ _08060DCC: bl pokemon_setattr b _0806119C .align 2, 0 -_08060DE4: .4byte 0x02024744 + .pool _08060DE8: movs r0, 0x64 muls r0, r5 - ldr r1, _08060E00 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196070,11 +188396,11 @@ _08060DE8: bl pokemon_setattr b _0806119C .align 2, 0 -_08060E00: .4byte 0x02024744 + .pool _08060E04: movs r0, 0x64 muls r0, r5 - ldr r1, _08060E1C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196083,12 +188409,12 @@ _08060E04: bl pokemon_setattr b _0806119C .align 2, 0 -_08060E1C: .4byte 0x02024744 + .pool _08060E20: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08060E90 + ldr r0, =0x02024744 adds r4, r0 ldrb r2, [r6] lsls r2, 9 @@ -196137,11 +188463,11 @@ _08060E20: adds r0, r4, 0 b _08060F2E .align 2, 0 -_08060E90: .4byte 0x02024744 + .pool _08060E94: movs r0, 0x64 muls r0, r5 - ldr r1, _08060EAC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196150,11 +188476,11 @@ _08060E94: bl pokemon_setattr b _0806119C .align 2, 0 -_08060EAC: .4byte 0x02024744 + .pool _08060EB0: movs r0, 0x64 muls r0, r5 - ldr r1, _08060EC8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196163,11 +188489,11 @@ _08060EB0: bl pokemon_setattr b _0806119C .align 2, 0 -_08060EC8: .4byte 0x02024744 + .pool _08060ECC: movs r0, 0x64 muls r0, r5 - ldr r1, _08060EE4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196176,11 +188502,11 @@ _08060ECC: bl pokemon_setattr b _0806119C .align 2, 0 -_08060EE4: .4byte 0x02024744 + .pool _08060EE8: movs r0, 0x64 muls r0, r5 - ldr r1, _08060F00 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196189,11 +188515,11 @@ _08060EE8: bl pokemon_setattr b _0806119C .align 2, 0 -_08060F00: .4byte 0x02024744 + .pool _08060F04: movs r0, 0x64 muls r0, r5 - ldr r1, _08060F1C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196202,11 +188528,11 @@ _08060F04: bl pokemon_setattr b _0806119C .align 2, 0 -_08060F1C: .4byte 0x02024744 + .pool _08060F20: movs r0, 0x64 muls r0, r5 - ldr r1, _08060F38 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196216,11 +188542,11 @@ _08060F2E: bl pokemon_setattr b _0806119C .align 2, 0 -_08060F38: .4byte 0x02024744 + .pool _08060F3C: movs r0, 0x64 muls r0, r5 - ldr r1, _08060F54 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196229,11 +188555,11 @@ _08060F3C: bl pokemon_setattr b _0806119C .align 2, 0 -_08060F54: .4byte 0x02024744 + .pool _08060F58: movs r0, 0x64 muls r0, r5 - ldr r1, _08060F70 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196242,11 +188568,11 @@ _08060F58: bl pokemon_setattr b _0806119C .align 2, 0 -_08060F70: .4byte 0x02024744 + .pool _08060F74: movs r0, 0x64 muls r0, r5 - ldr r1, _08060F8C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196255,11 +188581,11 @@ _08060F74: bl pokemon_setattr b _0806119C .align 2, 0 -_08060F8C: .4byte 0x02024744 + .pool _08060F90: movs r0, 0x64 muls r0, r5 - ldr r1, _08060FA8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196268,11 +188594,11 @@ _08060F90: bl pokemon_setattr b _0806119C .align 2, 0 -_08060FA8: .4byte 0x02024744 + .pool _08060FAC: movs r0, 0x64 muls r0, r5 - ldr r1, _08060FC4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196281,11 +188607,11 @@ _08060FAC: bl pokemon_setattr b _0806119C .align 2, 0 -_08060FC4: .4byte 0x02024744 + .pool _08060FC8: movs r0, 0x64 muls r0, r5 - ldr r1, _08060FE0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196294,11 +188620,11 @@ _08060FC8: bl pokemon_setattr b _0806119C .align 2, 0 -_08060FE0: .4byte 0x02024744 + .pool _08060FE4: movs r0, 0x64 muls r0, r5 - ldr r1, _08060FFC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196307,11 +188633,11 @@ _08060FE4: bl pokemon_setattr b _0806119C .align 2, 0 -_08060FFC: .4byte 0x02024744 + .pool _08061000: movs r0, 0x64 muls r0, r5 - ldr r1, _08061018 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196320,11 +188646,11 @@ _08061000: bl pokemon_setattr b _0806119C .align 2, 0 -_08061018: .4byte 0x02024744 + .pool _0806101C: movs r0, 0x64 muls r0, r5 - ldr r1, _08061034 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196333,11 +188659,11 @@ _0806101C: bl pokemon_setattr b _0806119C .align 2, 0 -_08061034: .4byte 0x02024744 + .pool _08061038: movs r0, 0x64 muls r0, r5 - ldr r1, _08061050 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196346,11 +188672,11 @@ _08061038: bl pokemon_setattr b _0806119C .align 2, 0 -_08061050: .4byte 0x02024744 + .pool _08061054: movs r0, 0x64 muls r0, r5 - ldr r1, _0806106C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196359,11 +188685,11 @@ _08061054: bl pokemon_setattr b _0806119C .align 2, 0 -_0806106C: .4byte 0x02024744 + .pool _08061070: movs r0, 0x64 muls r0, r5 - ldr r1, _08061088 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196372,11 +188698,11 @@ _08061070: bl pokemon_setattr b _0806119C .align 2, 0 -_08061088: .4byte 0x02024744 + .pool _0806108C: movs r0, 0x64 muls r0, r5 - ldr r1, _080610A4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196385,11 +188711,11 @@ _0806108C: bl pokemon_setattr b _0806119C .align 2, 0 -_080610A4: .4byte 0x02024744 + .pool _080610A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080610C0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196398,11 +188724,11 @@ _080610A8: bl pokemon_setattr b _0806119C .align 2, 0 -_080610C0: .4byte 0x02024744 + .pool _080610C4: movs r0, 0x64 muls r0, r5 - ldr r1, _080610DC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196411,11 +188737,11 @@ _080610C4: bl pokemon_setattr b _0806119C .align 2, 0 -_080610DC: .4byte 0x02024744 + .pool _080610E0: movs r0, 0x64 muls r0, r5 - ldr r1, _080610F8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196424,11 +188750,11 @@ _080610E0: bl pokemon_setattr b _0806119C .align 2, 0 -_080610F8: .4byte 0x02024744 + .pool _080610FC: movs r0, 0x64 muls r0, r5 - ldr r1, _08061114 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196437,11 +188763,11 @@ _080610FC: bl pokemon_setattr b _0806119C .align 2, 0 -_08061114: .4byte 0x02024744 + .pool _08061118: movs r0, 0x64 muls r0, r5 - ldr r1, _08061130 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196450,11 +188776,11 @@ _08061118: bl pokemon_setattr b _0806119C .align 2, 0 -_08061130: .4byte 0x02024744 + .pool _08061134: movs r0, 0x64 muls r0, r5 - ldr r1, _0806114C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196463,11 +188789,11 @@ _08061134: bl pokemon_setattr b _0806119C .align 2, 0 -_0806114C: .4byte 0x02024744 + .pool _08061150: movs r0, 0x64 muls r0, r5 - ldr r1, _08061168 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196476,11 +188802,11 @@ _08061150: bl pokemon_setattr b _0806119C .align 2, 0 -_08061168: .4byte 0x02024744 + .pool _0806116C: movs r0, 0x64 muls r0, r5 - ldr r1, _08061184 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196489,11 +188815,11 @@ _0806116C: bl pokemon_setattr b _0806119C .align 2, 0 -_08061184: .4byte 0x02024744 + .pool _08061188: movs r0, 0x64 muls r0, r5 - ldr r1, _080611AC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -196510,14 +188836,14 @@ _0806119C: pop {r0} bx r0 .align 2, 0 -_080611AC: .4byte 0x02024744 + .pool thumb_func_end sub_8060890 thumb_func_start sub_80611B0 sub_80611B0: @ 80611B0 push {r4-r7,lr} - ldr r1, _08061214 - ldr r7, _08061218 + ldr r1, =0x0202406e + ldr r7, =0x02024064 ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -196525,12 +188851,12 @@ sub_80611B0: @ 80611B0 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, _0806121C + ldr r4, =0x02023064 lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 ldrb r0, [r0] - ldr r1, _08061220 + ldr r1, =0x02024744 adds r0, r1 adds r5, r3, r0 movs r3, 0 @@ -196566,10 +188892,7 @@ _08061208: pop {r0} bx r0 .align 2, 0 -_08061214: .4byte 0x0202406e -_08061218: .4byte 0x02024064 -_0806121C: .4byte 0x02023064 -_08061220: .4byte 0x02024744 + .pool thumb_func_end sub_80611B0 thumb_func_start sub_8061224 @@ -196579,15 +188902,15 @@ sub_8061224: @ 8061224 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r6, _08061354 + ldr r6, =0x02024064 ldrb r0, [r6] lsls r0, 1 - ldr r1, _08061358 + ldr r1, =0x0202406e adds r0, r1 ldrh r0, [r0] movs r7, 0x64 muls r0, r7 - ldr r2, _0806135C + ldr r2, =0x02024744 mov r10, r2 add r0, r10 movs r1, 0xB @@ -196598,7 +188921,7 @@ sub_8061224: @ 8061224 mov r8, r0 ldrb r1, [r6] lsls r0, r1, 1 - ldr r2, _08061358 + ldr r2, =0x0202406e adds r0, r2 ldrh r0, [r0] muls r0, r7 @@ -196611,7 +188934,7 @@ sub_8061224: @ 8061224 lsrs r1, 24 mov r0, r8 bl sub_806A068 - ldr r0, _08061360 + ldr r0, =0x0202499c mov r9, r0 ldrb r0, [r6] movs r1, 0x2 @@ -196633,11 +188956,11 @@ sub_8061224: @ 8061224 adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _08061364 + ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, _08061368 + ldr r5, =0x02020630 ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -196645,7 +188968,7 @@ sub_8061224: @ 8061224 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0806136C + ldr r1, =0x0000ff10 strh r1, [r0, 0x24] ldrb r2, [r6] adds r0, r2, r4 @@ -196684,13 +189007,13 @@ sub_8061224: @ 8061224 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08061370 + ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] bl obj_anim_image_start ldrb r4, [r6] lsls r0, r4, 1 - ldr r2, _08061358 + ldr r2, =0x0202406e adds r0, r2 ldrh r0, [r0] muls r0, r7 @@ -196702,11 +189025,11 @@ sub_8061224: @ 8061224 lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, _08061374 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _08061378 + ldr r1, =sub_805F994 + 1 str r1, [r0] pop {r3-r5} mov r8, r3 @@ -196716,34 +189039,25 @@ sub_8061224: @ 8061224 pop {r0} bx r0 .align 2, 0 -_08061354: .4byte 0x02024064 -_08061358: .4byte 0x0202406e -_0806135C: .4byte 0x02024744 -_08061360: .4byte 0x0202499c -_08061364: .4byte 0x020241e4 -_08061368: .4byte 0x02020630 -_0806136C: .4byte 0x0000ff10 -_08061370: .4byte 0x020244e4 -_08061374: .4byte 0x03005d60 -_08061378: .4byte sub_805F994 + 1 + .pool thumb_func_end sub_8061224 thumb_func_start sub_806137C sub_806137C: @ 806137C push {r4,lr} - ldr r4, _080613C4 + ldr r4, =0x02024064 ldrb r0, [r4] - ldr r1, _080613C8 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 adds r0, 0x5C movs r1, 0x6 strb r1, [r0] - ldr r1, _080613CC + ldr r1, =0x0202406e ldrb r0, [r4] lsls r2, r0, 1 adds r2, r1 - ldr r3, _080613D0 + ldr r3, =0x02023064 lsls r0, 9 adds r1, r3, 0x1 adds r0, r1 @@ -196755,22 +189069,17 @@ sub_806137C: @ 806137C adds r1, r3 ldrb r1, [r1] bl sub_80613DC - ldr r1, _080613D4 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _080613D8 + ldr r1, =sub_805FDF0 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080613C4: .4byte 0x02024064 -_080613C8: .4byte 0x0202449c -_080613CC: .4byte 0x0202406e -_080613D0: .4byte 0x02023064 -_080613D4: .4byte 0x03005d60 -_080613D8: .4byte sub_805FDF0 + 1 + .pool thumb_func_end sub_806137C thumb_func_start sub_80613DC @@ -196787,10 +189096,10 @@ sub_80613DC: @ 80613DC lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, _08061544 + ldr r0, =0x0202406e lsls r4, r6, 1 adds r4, r0 - ldr r0, _08061548 + ldr r0, =0x02023064 lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -196802,7 +189111,7 @@ sub_80613DC: @ 80613DC mov r1, r9 muls r1, r0 adds r0, r1, 0 - ldr r5, _0806154C + ldr r5, =0x02024744 adds r0, r5 movs r1, 0xB bl pokemon_getattr @@ -196810,9 +189119,9 @@ sub_80613DC: @ 80613DC lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _08061550 + ldr r0, =sub_805D714 + 1 bl object_new_hidden_with_callback - ldr r1, _08061554 + ldr r1, =0x03005d7c mov r10, r1 add r10, r6 mov r1, r10 @@ -196831,7 +189140,7 @@ sub_80613DC: @ 80613DC lsrs r1, 24 mov r0, r8 bl sub_806A068 - ldr r0, _08061558 + ldr r0, =0x0202499c mov r9, r0 adds r0, r6, 0 movs r1, 0x2 @@ -196853,10 +189162,10 @@ sub_80613DC: @ 80613DC adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _0806155C + ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] - ldr r5, _08061560 + ldr r5, =0x02020630 ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -196901,7 +189210,7 @@ sub_80613DC: @ 80613DC adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08061564 + ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] bl obj_anim_image_start @@ -196922,7 +189231,7 @@ sub_80613DC: @ 80613DC adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08061568 + ldr r1, =nullsub_12 + 1 str r1, [r0] movs r0, 0 movs r1, 0xFE @@ -196944,23 +189253,14 @@ sub_80613DC: @ 80613DC pop {r0} bx r0 .align 2, 0 -_08061544: .4byte 0x0202406e -_08061548: .4byte 0x02023064 -_0806154C: .4byte 0x02024744 -_08061550: .4byte sub_805D714 + 1 -_08061554: .4byte 0x03005d7c -_08061558: .4byte 0x0202499c -_0806155C: .4byte 0x020241e4 -_08061560: .4byte 0x02020630 -_08061564: .4byte 0x020244e4 -_08061568: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80613DC thumb_func_start sub_806156C sub_806156C: @ 806156C push {r4-r6,lr} - ldr r1, _080615A0 - ldr r6, _080615A4 + ldr r1, =0x02023064 + ldr r6, =0x02024064 ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -196968,7 +189268,7 @@ sub_806156C: @ 806156C ldrb r3, [r0] cmp r3, 0 bne _080615B4 - ldr r0, _080615A8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -196976,27 +189276,23 @@ sub_806156C: @ 806156C lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, _080615AC + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _080615B0 + ldr r1, =sub_8061604 + 1 str r1, [r0] b _080615F0 .align 2, 0 -_080615A0: .4byte 0x02023064 -_080615A4: .4byte 0x02024064 -_080615A8: .4byte 0x020244d0 -_080615AC: .4byte 0x03005d60 -_080615B0: .4byte sub_8061604 + 1 + .pool _080615B4: - ldr r5, _080615F8 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080615FC + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -197009,7 +189305,7 @@ _080615B4: bl obj_delete_and_free_tiles ldrb r0, [r6] bl sub_805EEE0 - ldr r1, _08061600 + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -197020,17 +189316,15 @@ _080615F0: pop {r0} bx r0 .align 2, 0 -_080615F8: .4byte 0x020241e4 -_080615FC: .4byte 0x02020630 -_08061600: .4byte 0x03005d70 + .pool thumb_func_end sub_806156C thumb_func_start sub_8061604 sub_8061604: @ 8061604 push {r4-r6,lr} - ldr r6, _08061624 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _08061628 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -197044,8 +189338,7 @@ sub_8061604: @ 8061604 beq _0806165A b _08061682 .align 2, 0 -_08061624: .4byte 0x020244d0 -_08061628: .4byte 0x02024064 + .pool _0806162C: ldr r1, [r4] lsls r0, r2, 2 @@ -197084,19 +189377,18 @@ _0806165A: adds r1, r2, 0 movs r3, 0x2 bl move_anim_start_t4 - ldr r1, _08061688 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0806168C + ldr r1, =sub_805FB08 + 1 str r1, [r0] _08061682: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08061688: .4byte 0x03005d60 -_0806168C: .4byte sub_805FB08 + 1 + .pool thumb_func_end sub_8061604 thumb_func_start sub_8061690 @@ -197105,7 +189397,7 @@ sub_8061690: @ 8061690 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _080616AC + ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x80 lsls r0, 20 @@ -197115,18 +189407,17 @@ sub_8061690: @ 8061690 bl sub_806B830 b _0806175A .align 2, 0 -_080616AC: .4byte 0x02022fec + .pool _080616B0: - ldr r3, _080616C0 + ldr r3, =0x02038bca ldrh r1, [r3] - ldr r0, _080616C4 + ldr r0, =0x000003fe cmp r1, r0 bne _080616C8 bl sub_81A4CB0 b _0806175A .align 2, 0 -_080616C0: .4byte 0x02038bca -_080616C4: .4byte 0x000003fe + .pool _080616C8: movs r0, 0x80 lsls r0, 19 @@ -197138,7 +189429,7 @@ _080616C8: ands r2, r0 cmp r2, 0 beq _08061700 - ldr r0, _080616EC + ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 bne _080616F0 @@ -197146,28 +189437,28 @@ _080616C8: bl sub_81D5588 b _0806175A .align 2, 0 -_080616EC: .4byte 0x02024064 + .pool _080616F0: - ldr r0, _080616FC + ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_81D5588 b _0806175A .align 2, 0 -_080616FC: .4byte 0x02038bcc + .pool _08061700: ldrh r0, [r3] bl sub_81D5588 b _0806175A _08061708: - ldr r0, _08061728 + ldr r0, =0x003f0100 ands r0, r2 cmp r0, 0 beq _0806174C - ldr r0, _0806172C + ldr r0, =0x00808000 ands r2, r0 cmp r2, 0 beq _08061744 - ldr r0, _08061730 + ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 bne _08061734 @@ -197175,16 +189466,14 @@ _08061708: bl sub_8162AA0 b _0806175A .align 2, 0 -_08061728: .4byte 0x003f0100 -_0806172C: .4byte 0x00808000 -_08061730: .4byte 0x02024064 + .pool _08061734: - ldr r0, _08061740 + ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_8162AA0 b _0806175A .align 2, 0 -_08061740: .4byte 0x02038bcc + .pool _08061744: ldrh r0, [r3] bl sub_8162AA0 @@ -197206,20 +189495,18 @@ _08061760: ands r2, r0 cmp r2, 0 beq _08061788 - ldr r0, _0806177C + ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 beq _08061788 - ldr r2, _08061780 - ldr r0, _08061784 + ldr r2, =0x08310030 + ldr r0, =0x02038bcc ldrh r1, [r0] b _0806178C .align 2, 0 -_0806177C: .4byte 0x02024064 -_08061780: .4byte 0x08310030 -_08061784: .4byte 0x02038bcc + .pool _08061788: - ldr r2, _080617B8 + ldr r2, =0x08310030 ldrh r1, [r3] _0806178C: lsls r0, r1, 2 @@ -197228,13 +189515,13 @@ _0806178C: adds r0, r2 ldrb r4, [r0, 0x3] _08061796: - ldr r0, _080617BC + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _080617C0 + ldr r1, =0x00008040 ands r0, r1 cmp r0, 0 beq _080617C8 - ldr r0, _080617C4 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status movs r1, 0x2 @@ -197245,15 +189532,12 @@ _08061796: movs r7, 0x98 b _080617CA .align 2, 0 -_080617B8: .4byte 0x08310030 -_080617BC: .4byte 0x02022fec -_080617C0: .4byte 0x00008040 -_080617C4: .4byte 0x02024064 + .pool _080617C8: movs r7, 0xB0 _080617CA: mov r8, r4 - ldr r5, _080618B0 + ldr r5, =0x02024064 ldrb r1, [r5] mov r0, r8 bl sub_805DF38 @@ -197264,9 +189548,9 @@ _080617CA: lsrs r1, 24 mov r0, r8 bl template_build_for_pokemon_or_trainer - ldr r6, _080618B4 + ldr r6, =0x0202499c mov r9, r7 - ldr r1, _080618B8 + ldr r1, =0x083054e0 mov r2, r8 lsls r0, r2, 2 adds r0, r1 @@ -197287,11 +189571,11 @@ _080617CA: mov r1, r9 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r6, _080618BC + ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _080618C0 + ldr r4, =0x02020630 ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -197299,7 +189583,7 @@ _080617CA: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _080618C4 + ldr r1, =0x0000ff10 strh r1, [r0, 0x24] ldrb r0, [r5] adds r0, r6 @@ -197310,7 +189594,7 @@ _080617CA: adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x2E] - ldr r1, _080618C8 + ldr r1, =0x0830593c mov r2, r8 lsls r0, r2, 3 adds r0, r1 @@ -197346,13 +189630,13 @@ _080617CA: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _080618CC + ldr r1, =sub_805D7AC + 1 str r1, [r0] - ldr r1, _080618D0 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _080618D4 + ldr r1, =sub_805F1D0 + 1 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -197361,16 +189645,7 @@ _080617CA: pop {r0} bx r0 .align 2, 0 -_080618B0: .4byte 0x02024064 -_080618B4: .4byte 0x0202499c -_080618B8: .4byte 0x083054e0 -_080618BC: .4byte 0x020241e4 -_080618C0: .4byte 0x02020630 -_080618C4: .4byte 0x0000ff10 -_080618C8: .4byte 0x0830593c -_080618CC: .4byte sub_805D7AC + 1 -_080618D0: .4byte 0x03005d60 -_080618D4: .4byte sub_805F1D0 + 1 + .pool thumb_func_end sub_8061690 thumb_func_start sub_80618D8 @@ -197378,7 +189653,7 @@ sub_80618D8: @ 80618D8 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _080618F4 + ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x80 lsls r0, 20 @@ -197388,18 +189663,17 @@ sub_80618D8: @ 80618D8 bl sub_806B830 b _080619A2 .align 2, 0 -_080618F4: .4byte 0x02022fec + .pool _080618F8: - ldr r3, _08061908 + ldr r3, =0x02038bca ldrh r1, [r3] - ldr r0, _0806190C + ldr r0, =0x000003fe cmp r1, r0 bne _08061910 bl sub_81A4CB0 b _080619A2 .align 2, 0 -_08061908: .4byte 0x02038bca -_0806190C: .4byte 0x000003fe + .pool _08061910: movs r0, 0x80 lsls r0, 19 @@ -197411,7 +189685,7 @@ _08061910: ands r2, r0 cmp r2, 0 beq _08061948 - ldr r0, _08061934 + ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 bne _08061938 @@ -197419,28 +189693,28 @@ _08061910: bl sub_81D5588 b _080619A2 .align 2, 0 -_08061934: .4byte 0x02024064 + .pool _08061938: - ldr r0, _08061944 + ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_81D5588 b _080619A2 .align 2, 0 -_08061944: .4byte 0x02038bcc + .pool _08061948: ldrh r0, [r3] bl sub_81D5588 b _080619A2 _08061950: - ldr r0, _08061970 + ldr r0, =0x003f0100 ands r0, r2 cmp r0, 0 beq _08061994 - ldr r0, _08061974 + ldr r0, =0x00808000 ands r2, r0 cmp r2, 0 beq _0806198C - ldr r0, _08061978 + ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 bne _0806197C @@ -197448,16 +189722,14 @@ _08061950: bl sub_8162AA0 b _080619A2 .align 2, 0 -_08061970: .4byte 0x003f0100 -_08061974: .4byte 0x00808000 -_08061978: .4byte 0x02024064 + .pool _0806197C: - ldr r0, _08061988 + ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_8162AA0 b _080619A2 .align 2, 0 -_08061988: .4byte 0x02038bcc + .pool _0806198C: ldrh r0, [r3] bl sub_8162AA0 @@ -197479,20 +189751,18 @@ _080619A8: ands r2, r0 cmp r2, 0 beq _080619D0 - ldr r0, _080619C4 + ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 beq _080619D0 - ldr r2, _080619C8 - ldr r0, _080619CC + ldr r2, =0x08310030 + ldr r0, =0x02038bcc ldrh r1, [r0] b _080619D4 .align 2, 0 -_080619C4: .4byte 0x02024064 -_080619C8: .4byte 0x08310030 -_080619CC: .4byte 0x02038bcc + .pool _080619D0: - ldr r2, _08061AC4 + ldr r2, =0x08310030 ldrh r1, [r3] _080619D4: lsls r0, r1, 2 @@ -197502,7 +189772,7 @@ _080619D4: ldrb r0, [r0, 0x3] _080619DE: mov r8, r0 - ldr r6, _08061AC8 + ldr r6, =0x02024064 ldrb r1, [r6] bl sub_805DF38 ldrb r0, [r6] @@ -197512,8 +189782,8 @@ _080619DE: lsrs r1, 24 mov r0, r8 bl template_build_for_pokemon_or_trainer - ldr r0, _08061ACC - ldr r2, _08061AD0 + ldr r0, =0x0202499c + ldr r2, =0x083054e0 mov r3, r8 lsls r1, r3, 2 adds r1, r2 @@ -197528,11 +189798,11 @@ _080619DE: movs r1, 0xB0 movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r5, _08061AD4 + ldr r5, =0x020241e4 ldrb r1, [r6] adds r1, r5 strb r0, [r1] - ldr r4, _08061AD8 + ldr r4, =0x02020630 ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -197559,9 +189829,9 @@ _080619DE: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08061ADC + ldr r1, =0x0000fffe strh r1, [r0, 0x2E] - ldr r1, _08061AE0 + ldr r1, =0x0830593c mov r2, r8 lsls r0, r2, 3 adds r0, r1 @@ -197597,13 +189867,13 @@ _080619DE: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _08061AE4 + ldr r1, =sub_805D7AC + 1 str r1, [r0] - ldr r1, _08061AE8 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _08061AEC + ldr r1, =sub_805F208 + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -197611,31 +189881,21 @@ _080619DE: pop {r0} bx r0 .align 2, 0 -_08061AC4: .4byte 0x08310030 -_08061AC8: .4byte 0x02024064 -_08061ACC: .4byte 0x0202499c -_08061AD0: .4byte 0x083054e0 -_08061AD4: .4byte 0x020241e4 -_08061AD8: .4byte 0x02020630 -_08061ADC: .4byte 0x0000fffe -_08061AE0: .4byte 0x0830593c -_08061AE4: .4byte sub_805D7AC + 1 -_08061AE8: .4byte 0x03005d60 -_08061AEC: .4byte sub_805F208 + 1 + .pool thumb_func_end sub_80618D8 thumb_func_start sub_8061AF0 sub_8061AF0: @ 8061AF0 push {r4-r6,lr} - ldr r6, _08061B80 - ldr r4, _08061B84 + ldr r6, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08061B88 + ldr r5, =0x02020630 adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -197675,7 +189935,7 @@ sub_8061AF0: @ 8061AF0 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08061B8C + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -197684,33 +189944,27 @@ sub_8061AF0: @ 8061AF0 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08061B90 + ldr r1, =nullsub_12 + 1 bl oamt_set_x3A_32 - ldr r1, _08061B94 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08061B98 + ldr r1, =sub_805F240 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08061B80: .4byte 0x020241e4 -_08061B84: .4byte 0x02024064 -_08061B88: .4byte 0x02020630 -_08061B8C: .4byte sub_80A6EEC + 1 -_08061B90: .4byte nullsub_12 + 1 -_08061B94: .4byte 0x03005d60 -_08061B98: .4byte sub_805F240 + 1 + .pool thumb_func_end sub_8061AF0 thumb_func_start sub_8061B9C sub_8061B9C: @ 8061B9C push {r4-r6,lr} - ldr r6, _08061BE8 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _08061BEC + ldr r5, =0x02024064 ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -197745,8 +189999,7 @@ _08061BD0: strb r1, [r0, 0x4] b _08061C2C .align 2, 0 -_08061BE8: .4byte 0x020244d0 -_08061BEC: .4byte 0x02024064 + .pool _08061BF0: ldrb r1, [r3] movs r0, 0x40 @@ -197759,8 +190012,8 @@ _08061BF0: movs r0, 0x10 movs r1, 0x3F bl audio_play_and_stuff - ldr r2, _08061C34 - ldr r1, _08061C38 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -197769,24 +190022,20 @@ _08061BF0: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _08061C3C + ldr r1, =sub_8039934 + 1 str r1, [r0] - ldr r1, _08061C40 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08061C44 + ldr r1, =sub_805FAC4 + 1 str r1, [r0] _08061C2C: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08061C34: .4byte 0x02020630 -_08061C38: .4byte 0x020241e4 -_08061C3C: .4byte sub_8039934 + 1 -_08061C40: .4byte 0x03005d60 -_08061C44: .4byte sub_805FAC4 + 1 + .pool thumb_func_end sub_8061B9C thumb_func_start sub_8061C48 @@ -197824,7 +190073,7 @@ sub_8061C6C: @ 8061C6C thumb_func_start sub_8061C78 sub_8061C78: @ 8061C78 push {r4-r6,lr} - ldr r6, _08061D5C + ldr r6, =0x02024064 ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -197832,7 +190081,7 @@ sub_8061C78: @ 8061C78 beq _08061C8A b _08061D9E _08061C8A: - ldr r0, _08061D60 + ldr r0, =0x02023064 mov r12, r0 ldrb r2, [r6] lsls r2, 9 @@ -197845,13 +190094,13 @@ _08061C8A: ldrb r1, [r1] lsls r1, 8 orrs r0, r1 - ldr r5, _08061D64 + ldr r5, =0x02038432 mov r1, r12 adds r1, 0x3 adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, _08061D68 + ldr r4, =0x02038408 ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -197865,7 +190114,7 @@ _08061C8A: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, _08061D6C + ldr r4, =0x02038404 ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -197891,7 +190140,7 @@ _08061C8A: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, _08061D70 + ldr r3, =0x0203841a ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -197899,7 +190148,7 @@ _08061C8A: adds r1, r2 ldrb r1, [r1] strb r1, [r3] - ldr r4, _08061D74 + ldr r4, =0x0203841c ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -197913,14 +190162,14 @@ _08061C8A: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, _08061D78 + ldr r3, =0x02038400 ldrb r2, [r6] lsls r2, 9 mov r1, r12 adds r1, 0x10 adds r2, r1 str r2, [r3] - ldr r3, _08061D7C + ldr r3, =0x020244bc ldrb r1, [r6] lsls r1, 2 adds r1, r3 @@ -197935,17 +190184,9 @@ _08061C8A: bl dp01_tbl7_exec_completed b _08061D9E .align 2, 0 -_08061D5C: .4byte 0x02024064 -_08061D60: .4byte 0x02023064 -_08061D64: .4byte 0x02038432 -_08061D68: .4byte 0x02038408 -_08061D6C: .4byte 0x02038404 -_08061D70: .4byte 0x0203841a -_08061D74: .4byte 0x0203841c -_08061D78: .4byte 0x02038400 -_08061D7C: .4byte 0x020244bc + .pool _08061D80: - ldr r0, _08061DA4 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -197954,20 +190195,18 @@ _08061D80: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, _08061DA8 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _08061DAC + ldr r1, =bx_move_anim_7 + 1 str r1, [r0] _08061D9E: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08061DA4: .4byte 0x020244d0 -_08061DA8: .4byte 0x03005d60 -_08061DAC: .4byte bx_move_anim_7 + 1 + .pool thumb_func_end sub_8061C78 thumb_func_start bx_move_anim_7 @@ -197977,8 +190216,8 @@ bx_move_anim_7: @ 8061DB0 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _08061DFC - ldr r6, _08061E00 + ldr r2, =0x02023064 + ldr r6, =0x02024064 ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -197995,7 +190234,7 @@ bx_move_anim_7: @ 8061DB0 adds r1, r2 ldrb r1, [r1] mov r8, r1 - ldr r7, _08061E04 + ldr r7, =0x020244d0 ldr r5, [r7] ldr r1, [r5, 0x4] lsls r0, r3, 1 @@ -198011,9 +190250,7 @@ bx_move_anim_7: @ 8061DB0 beq _08061E12 b _08061F24 .align 2, 0 -_08061DFC: .4byte 0x02023064 -_08061E00: .4byte 0x02024064 -_08061E04: .4byte 0x020244d0 + .pool _08061E08: cmp r2, 0x2 beq _08061E72 @@ -198069,10 +190306,10 @@ _08061E48: strb r1, [r0, 0x4] b _08061F24 _08061E72: - ldr r0, _08061ED8 + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _08061EDC + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _08061F24 @@ -198106,9 +190343,9 @@ _08061E72: ands r0, r2 strb r0, [r1] _08061EC0: - ldr r0, _08061EE0 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08061EE4 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -198119,10 +190356,7 @@ _08061EC0: strb r1, [r0, 0x4] b _08061F24 .align 2, 0 -_08061ED8: .4byte 0x020383f8 -_08061EDC: .4byte 0x020383fd -_08061EE0: .4byte 0x020244d0 -_08061EE4: .4byte 0x02024064 + .pool _08061EE8: ldrb r1, [r0] movs r0, 0x40 @@ -198164,26 +190398,26 @@ _08061F24: thumb_func_start sub_8061F34 sub_8061F34: @ 8061F34 push {r4,r5,lr} - ldr r0, _08061F74 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _08061F78 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r5, _08061F7C + ldr r5, =0x02024064 ldrb r4, [r5] lsls r4, 9 - ldr r0, _08061F80 + ldr r0, =0x02023066 adds r4, r0 ldrh r0, [r4] bl battle_pick_message - ldr r0, _08061F84 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _08061F88 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08061F8C + ldr r1, =bx_t7_button_a + 1 str r1, [r0] ldrb r0, [r5] ldrh r1, [r4] @@ -198192,13 +190426,7 @@ sub_8061F34: @ 8061F34 pop {r0} bx r0 .align 2, 0 -_08061F74: .4byte 0x02022e14 -_08061F78: .4byte 0x02022e16 -_08061F7C: .4byte 0x02024064 -_08061F80: .4byte 0x02023066 -_08061F84: .4byte 0x02022e2c -_08061F88: .4byte 0x03005d60 -_08061F8C: .4byte bx_t7_button_a + 1 + .pool thumb_func_end sub_8061F34 thumb_func_start sub_8061F90 @@ -198229,7 +190457,7 @@ sub_8061FAC: @ 8061FAC thumb_func_start sub_8061FB8 sub_8061FB8: @ 8061FB8 push {r4-r6,lr} - ldr r0, _08061FE0 + ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x80 lsls r0, 10 @@ -198248,12 +190476,12 @@ _08061FDA: bl dp01_tbl7_exec_completed b _08062156 .align 2, 0 -_08061FE0: .4byte 0x02022fec + .pool _08061FE4: - ldr r0, _08062014 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 - ldr r1, _08062018 + ldr r1, =0x02023068 adds r5, r0, r1 movs r0, 0x93 lsls r0, 3 @@ -198273,8 +190501,7 @@ _08061FE4: beq _08062028 b _08062040 .align 2, 0 -_08062014: .4byte 0x02024064 -_08062018: .4byte 0x02023068 + .pool _0806201C: cmp r4, 0x6 beq _08062030 @@ -198290,15 +190517,15 @@ _0806202C: movs r2, 0 b _08061FD6 _08062030: - ldr r0, _0806203C + ldr r0, =0x0202420c ldrb r2, [r0] movs r0, 0x1 movs r1, 0xF b _08061FD6 .align 2, 0 -_0806203C: .4byte 0x0202420c + .pool _08062040: - ldr r3, _080620B0 + ldr r3, =0x0831c898 lsls r0, r4, 1 adds r2, r5, r0 ldrh r1, [r2] @@ -198311,8 +190538,8 @@ _08062040: ands r0, r1 cmp r0, 0 beq _08062062 - ldr r0, _080620B4 - ldr r1, _080620B8 + ldr r0, =0x0202420c + ldr r1, =0x02024064 ldrb r1, [r1] strb r1, [r0] _08062062: @@ -198328,11 +190555,11 @@ _08062062: beq _0806209C movs r0, 0 bl battle_get_side_with_given_state - ldr r5, _080620B4 + ldr r5, =0x0202420c strb r0, [r5] - ldr r0, _080620BC + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _080620C0 + ldr r2, =0x0832a328 ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -198344,7 +190571,7 @@ _08062062: bl battle_get_side_with_given_state strb r0, [r5] _0806209C: - ldr r0, _080620B4 + ldr r0, =0x0202420c ldrb r0, [r0] lsls r0, 8 orrs r4, r0 @@ -198354,11 +190581,7 @@ _0806209C: bl dp01_build_cmdbuf_x21_a_bb b _08061FDA .align 2, 0 -_080620B0: .4byte 0x0831c898 -_080620B4: .4byte 0x0202420c -_080620B8: .4byte 0x02024064 -_080620BC: .4byte 0x02024210 -_080620C0: .4byte 0x0832a328 + .pool _080620C4: movs r6, 0x3 _080620C6: @@ -198370,7 +190593,7 @@ _080620C6: ldrh r2, [r0] cmp r2, 0 beq _080620C6 - ldr r1, _08062100 + ldr r1, =0x0831c898 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -198380,7 +190603,7 @@ _080620C6: ands r0, r1 cmp r0, 0 beq _08062108 - ldr r0, _08062104 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 8 orrs r4, r0 @@ -198390,10 +190613,9 @@ _080620C6: bl dp01_build_cmdbuf_x21_a_bb b _08062152 .align 2, 0 -_08062100: .4byte 0x0831c898 -_08062104: .4byte 0x02024064 + .pool _08062108: - ldr r0, _08062138 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -198415,7 +190637,7 @@ _08062108: bl dp01_build_cmdbuf_x21_a_bb b _08062152 .align 2, 0 -_08062138: .4byte 0x02022fec + .pool _0806213C: movs r0, 0 bl battle_get_side_with_given_state @@ -198437,10 +190659,10 @@ _08062156: thumb_func_start sub_806215C sub_806215C: @ 806215C push {lr} - ldr r0, _08062180 + ldr r0, =0x02024064 ldrb r0, [r0] lsrs r0, 1 - ldr r1, _08062184 + ldr r1, =0x0202449c ldr r1, [r1] lsls r0, 1 adds r0, r1 @@ -198452,16 +190674,15 @@ sub_806215C: @ 806215C pop {r0} bx r0 .align 2, 0 -_08062180: .4byte 0x02024064 -_08062184: .4byte 0x0202449c + .pool thumb_func_end sub_806215C thumb_func_start sub_8062188 sub_8062188: @ 8062188 push {r4-r7,lr} - ldr r0, _080621C8 + ldr r0, =0x02024064 ldrb r0, [r0] - ldr r1, _080621CC + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 movs r2, 0xA5 @@ -198475,7 +190696,7 @@ sub_8062188: @ 8062188 lsrs r4, r0, 24 cmp r4, 0x6 bne _0806225A - ldr r0, _080621D0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -198488,9 +190709,7 @@ sub_8062188: @ 8062188 adds r7, r5, 0 b _080621E8 .align 2, 0 -_080621C8: .4byte 0x02024064 -_080621CC: .4byte 0x0202449c -_080621D0: .4byte 0x02022fec + .pool _080621D4: movs r0, 0x1 bl battle_get_side_with_given_state @@ -198501,13 +190720,13 @@ _080621D4: lsls r0, 24 lsrs r5, r0, 24 _080621E8: - ldr r0, _08062204 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08062208 + ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 beq _08062214 - ldr r0, _0806220C + ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 bne _08062210 @@ -198515,9 +190734,7 @@ _080621E8: movs r6, 0x3 b _08062218 .align 2, 0 -_08062204: .4byte 0x02022fec -_08062208: .4byte 0x00808000 -_0806220C: .4byte 0x02024064 + .pool _08062210: movs r0, 0x3 b _08062216 @@ -198535,13 +190752,13 @@ _0806221E: bge _0806225A movs r0, 0x64 muls r0, r4 - ldr r1, _0806224C + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 beq _0806221C - ldr r1, _08062250 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -198554,16 +190771,15 @@ _0806221E: beq _0806221C b _0806225A .align 2, 0 -_0806224C: .4byte 0x02024744 -_08062250: .4byte 0x0202406e + .pool _08062254: ldrb r4, [r1] movs r0, 0x6 strb r0, [r1] _0806225A: - ldr r0, _08062280 + ldr r0, =0x02024064 ldrb r0, [r0] - ldr r1, _08062284 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 adds r0, 0x5C @@ -198578,8 +190794,7 @@ _0806225A: pop {r0} bx r0 .align 2, 0 -_08062280: .4byte 0x02024064 -_08062284: .4byte 0x0202449c + .pool thumb_func_end sub_8062188 thumb_func_start sub_8062288 @@ -198599,8 +190814,8 @@ sub_8062294: @ 8062294 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _0806230C - ldr r0, _08062310 + ldr r3, =0x02023064 + ldr r0, =0x02024064 mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -198614,16 +190829,16 @@ sub_8062294: @ 8062294 orrs r0, r1 lsls r0, 16 asrs r7, r0, 16 - ldr r0, _08062314 + ldr r0, =0x00007fff cmp r7, r0 beq _08062324 - ldr r6, _08062318 + ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _0806231C + ldr r4, =0x02024744 adds r0, r4 movs r1, 0x3A bl pokemon_getattr @@ -198640,7 +190855,7 @@ sub_8062294: @ 8062294 adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _08062320 + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -198648,39 +190863,34 @@ sub_8062294: @ 8062294 bl sub_807294C b _0806234E .align 2, 0 -_0806230C: .4byte 0x02023064 -_08062310: .4byte 0x02024064 -_08062314: .4byte 0x00007fff -_08062318: .4byte 0x0202406e -_0806231C: .4byte 0x02024744 -_08062320: .4byte 0x03005d70 + .pool _08062324: - ldr r1, _0806236C + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08062370 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A bl pokemon_getattr adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _08062374 + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] movs r3, 0 bl sub_807294C _0806234E: - ldr r1, _08062378 - ldr r0, _0806237C + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08062380 + ldr r1, =sub_805FA70 + 1 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -198690,12 +190900,7 @@ _0806234E: pop {r0} bx r0 .align 2, 0 -_0806236C: .4byte 0x0202406e -_08062370: .4byte 0x02024744 -_08062374: .4byte 0x03005d70 -_08062378: .4byte 0x03005d60 -_0806237C: .4byte 0x02024064 -_08062380: .4byte sub_805FA70 + 1 + .pool thumb_func_end sub_8062294 thumb_func_start sub_8062384 @@ -198709,28 +190914,28 @@ sub_8062384: @ 8062384 thumb_func_start sub_8062390 sub_8062390: @ 8062390 push {r4,lr} - ldr r4, _080623EC + ldr r4, =0x02024064 ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _080623E4 - ldr r0, _080623F0 + ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _080623F4 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080623F8 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0x9 bl healthbar_draw_field_maybe ldrb r2, [r4] - ldr r0, _080623FC + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -198742,36 +190947,30 @@ sub_8062390: @ 8062390 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _08062400 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08062404 + ldr r1, =sub_805FEB8 + 1 str r1, [r0] _080623E4: pop {r4} pop {r0} bx r0 .align 2, 0 -_080623EC: .4byte 0x02024064 -_080623F0: .4byte 0x03005d70 -_080623F4: .4byte 0x0202406e -_080623F8: .4byte 0x02024744 -_080623FC: .4byte 0x020244d0 -_08062400: .4byte 0x03005d60 -_08062404: .4byte sub_805FEB8 + 1 + .pool thumb_func_end sub_8062390 thumb_func_start sub_8062408 sub_8062408: @ 8062408 push {r4,r5,lr} - ldr r5, _08062460 + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08062458 - ldr r4, _08062464 + ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -198796,21 +190995,18 @@ sub_8062408: @ 8062408 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, _08062468 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0806246C + ldr r1, =sub_805FEB8 + 1 str r1, [r0] _08062458: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08062460: .4byte 0x02024064 -_08062464: .4byte 0x02023064 -_08062468: .4byte 0x03005d60 -_0806246C: .4byte sub_805FEB8 + 1 + .pool thumb_func_end sub_8062408 thumb_func_start sub_8062470 @@ -198888,7 +191084,7 @@ sub_80624D0: @ 80624D0 thumb_func_start sub_80624DC sub_80624DC: @ 80624DC push {lr} - ldr r2, _080624F4 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x80 negs r0, r0 @@ -198898,15 +191094,15 @@ sub_80624DC: @ 80624DC pop {r0} bx r0 .align 2, 0 -_080624F4: .4byte 0x02022d0c + .pool thumb_func_end sub_80624DC thumb_func_start sub_80624F8 sub_80624F8: @ 80624F8 push {lr} - ldr r3, _08062524 - ldr r1, _08062528 - ldr r0, _0806252C + ldr r3, =0x02022d0c + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -198924,15 +191120,13 @@ sub_80624F8: @ 80624F8 pop {r0} bx r0 .align 2, 0 -_08062524: .4byte 0x02022d0c -_08062528: .4byte 0x02023064 -_0806252C: .4byte 0x02024064 + .pool thumb_func_end sub_80624F8 thumb_func_start sub_8062530 sub_8062530: @ 8062530 push {lr} - ldr r2, _08062544 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -198941,13 +191135,13 @@ sub_8062530: @ 8062530 pop {r0} bx r0 .align 2, 0 -_08062544: .4byte 0x02022d0c + .pool thumb_func_end sub_8062530 thumb_func_start sub_8062548 sub_8062548: @ 8062548 push {lr} - ldr r3, _0806256C + ldr r3, =0x02022d0c ldr r1, [r3] lsls r1, 24 lsrs r1, 31 @@ -198963,15 +191157,15 @@ sub_8062548: @ 8062548 pop {r0} bx r0 .align 2, 0 -_0806256C: .4byte 0x02022d0c + .pool thumb_func_end sub_8062548 thumb_func_start dp01t_29_7_blink dp01t_29_7_blink: @ 8062570 push {r4,lr} - ldr r3, _08062598 - ldr r2, _0806259C - ldr r4, _080625A0 + ldr r3, =0x02020630 + ldr r2, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -198987,11 +191181,9 @@ dp01t_29_7_blink: @ 8062570 bl dp01_tbl7_exec_completed b _080625CE .align 2, 0 -_08062598: .4byte 0x02020630 -_0806259C: .4byte 0x020241e4 -_080625A0: .4byte 0x02024064 + .pool _080625A4: - ldr r1, _080625D4 + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -199005,20 +191197,18 @@ _080625A4: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, _080625D8 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _080625DC + ldr r1, =bx_blink_t7 + 1 str r1, [r0] _080625CE: pop {r4} pop {r0} bx r0 .align 2, 0 -_080625D4: .4byte 0x020244b9 -_080625D8: .4byte 0x03005d60 -_080625DC: .4byte bx_blink_t7 + 1 + .pool thumb_func_end dp01t_29_7_blink thumb_func_start sub_80625E0 @@ -199032,7 +191222,7 @@ sub_80625E0: @ 80625E0 thumb_func_start sub_80625EC sub_80625EC: @ 80625EC push {r4,lr} - ldr r4, _08062628 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -199041,7 +191231,7 @@ sub_80625EC: @ 80625EC bne _08062600 movs r3, 0xC0 _08062600: - ldr r2, _0806262C + ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -199060,15 +191250,14 @@ _08062600: pop {r0} bx r0 .align 2, 0 -_08062628: .4byte 0x02024064 -_0806262C: .4byte 0x02023064 + .pool thumb_func_end sub_80625EC thumb_func_start sub_8062630 sub_8062630: @ 8062630 push {r4,r5,lr} - ldr r4, _08062664 - ldr r5, _08062668 + ldr r4, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -199090,8 +191279,7 @@ sub_8062630: @ 8062630 bl song_play_for_text b _08062680 .align 2, 0 -_08062664: .4byte 0x02023064 -_08062668: .4byte 0x02024064 + .pool _0806266C: adds r0, r4, 0x1 adds r0, r3, r0 @@ -199112,15 +191300,15 @@ _08062680: thumb_func_start sub_806268C sub_806268C: @ 806268C push {lr} - ldr r1, _080626BC - ldr r0, _080626C0 + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080626C4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -199133,23 +191321,21 @@ sub_806268C: @ 806268C pop {r0} bx r0 .align 2, 0 -_080626BC: .4byte 0x0202406e -_080626C0: .4byte 0x02024064 -_080626C4: .4byte 0x02024744 + .pool thumb_func_end sub_806268C thumb_func_start dp01t_2E_7_battle_intro dp01t_2E_7_battle_intro: @ 80626C8 push {lr} - ldr r1, _080626F0 - ldr r0, _080626F4 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r0, [r0] bl battle_intro_launch - ldr r2, _080626F8 + ldr r2, =0x020243fc ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -199158,23 +191344,21 @@ dp01t_2E_7_battle_intro: @ 80626C8 pop {r0} bx r0 .align 2, 0 -_080626F0: .4byte 0x02023064 -_080626F4: .4byte 0x02024064 -_080626F8: .4byte 0x020243fc + .pool thumb_func_end dp01t_2E_7_battle_intro thumb_func_start sub_80626FC sub_80626FC: @ 80626FC push {r4-r6,lr} - ldr r5, _080627DC - ldr r6, _080627E0 + ldr r5, =0x020241e4 + ldr r6, =0x02024064 ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080627E4 + ldr r4, =0x02020630 adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -199214,7 +191398,7 @@ sub_80626FC: @ 80626FC adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _080627E8 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r0, [r6] adds r0, r5 @@ -199223,21 +191407,21 @@ sub_80626FC: @ 80626FC adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _080627EC + ldr r1, =sub_806280C + 1 bl oamt_set_x3A_32 - ldr r0, _080627F0 + ldr r0, =sub_8062828 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r4, _080627F4 + ldr r4, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r4 ldrb r0, [r6] strh r0, [r1, 0x8] - ldr r3, _080627F8 + ldr r3, =0x020244d0 ldr r0, [r3] ldrb r2, [r6] ldr r1, [r0, 0x4] @@ -199250,14 +191434,14 @@ sub_80626FC: @ 80626FC ands r0, r1 cmp r0, 0 beq _080627BE - ldr r0, _080627FC + ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, _08062800 + ldr r1, =sub_8073C30 + 1 str r1, [r0] _080627BE: ldr r0, [r3] @@ -199266,28 +191450,17 @@ _080627BE: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _08062804 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _08062808 + ldr r1, =nullsub_26 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080627DC: .4byte 0x020241e4 -_080627E0: .4byte 0x02024064 -_080627E4: .4byte 0x02020630 -_080627E8: .4byte sub_80A6EEC + 1 -_080627EC: .4byte sub_806280C + 1 -_080627F0: .4byte sub_8062828 + 1 -_080627F4: .4byte 0x03005e00 -_080627F8: .4byte 0x020244d0 -_080627FC: .4byte 0x020244b4 -_08062800: .4byte sub_8073C30 + 1 -_08062804: .4byte 0x03005d60 -_08062808: .4byte nullsub_26 + 1 + .pool thumb_func_end sub_80626FC thumb_func_start sub_806280C @@ -199314,10 +191487,10 @@ sub_8062828: @ 8062828 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r7, _0806288C + ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 - ldr r1, _08062890 + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -199329,7 +191502,7 @@ sub_8062828: @ 8062828 lsls r0, 24 cmp r0, 0 beq _0806286C - ldr r0, _08062894 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x40 ands r0, r1 @@ -199341,12 +191514,12 @@ sub_8062828: @ 8062828 cmp r1, 0 beq _080628A0 _0806286C: - ldr r0, _08062898 + ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _0806289C + ldr r0, =0x0202406e lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -199356,18 +191529,14 @@ _0806286C: bl sub_80613DC b _080628E0 .align 2, 0 -_0806288C: .4byte 0x02024064 -_08062890: .4byte 0x03005e00 -_08062894: .4byte 0x02022fec -_08062898: .4byte 0x02023064 -_0806289C: .4byte 0x0202406e + .pool _080628A0: - ldr r4, _08062904 + ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r6, _08062908 + ldr r6, =0x0202406e lsls r0, 1 adds r0, r6 ldrh r0, [r0] @@ -199393,12 +191562,12 @@ _080628A0: eors r0, r5 strb r0, [r7] _080628E0: - ldr r1, _0806290C - ldr r2, _08062910 + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _08062914 + ldr r1, =sub_805F560 + 1 str r1, [r0] mov r0, r9 strb r0, [r2] @@ -199411,18 +191580,14 @@ _080628E0: pop {r0} bx r0 .align 2, 0 -_08062904: .4byte 0x02023064 -_08062908: .4byte 0x0202406e -_0806290C: .4byte 0x03005d60 -_08062910: .4byte 0x02024064 -_08062914: .4byte sub_805F560 + 1 + .pool thumb_func_end sub_8062828 thumb_func_start dp01t_30_7_0803D67C dp01t_30_7_0803D67C: @ 8062918 push {r4-r7,lr} - ldr r1, _08062940 - ldr r0, _08062944 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -199438,12 +191603,11 @@ dp01t_30_7_0803D67C: @ 8062918 bl dp01_tbl7_exec_completed b _08062A12 .align 2, 0 -_08062940: .4byte 0x02023064 -_08062944: .4byte 0x02024064 + .pool _08062948: - ldr r4, _080629A0 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _080629A4 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -199454,7 +191618,7 @@ _08062948: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - ldr r1, _080629A8 + ldr r1, =0x02023064 ldrb r2, [r3] lsls r0, r2, 9 adds r1, 0x2 @@ -199485,9 +191649,7 @@ _08062948: strb r1, [r3, 0x1] b _08062A12 .align 2, 0 -_080629A0: .4byte 0x020244d0 -_080629A4: .4byte 0x02024064 -_080629A8: .4byte 0x02023064 + .pool _080629AC: movs r0, 0x1F negs r0, r0 @@ -199497,7 +191659,7 @@ _080629B4: adds r5, r7, 0 ldrb r0, [r5] lsls r3, r0, 9 - ldr r4, _08062A18 + ldr r4, =0x02023068 adds r1, r3, r4 subs r2, r4, 0x3 adds r2, r3, r2 @@ -199506,12 +191668,12 @@ _080629B4: adds r3, r4 ldrb r3, [r3] bl sub_80735DC - ldr r2, _08062A1C + ldr r2, =0x020244b4 ldrb r1, [r5] adds r1, r2 movs r3, 0 strb r0, [r1] - ldr r6, _08062A20 + ldr r6, =0x020244d0 ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -199535,30 +191697,26 @@ _080629B4: movs r1, 0x5D strb r1, [r0, 0x5] _08062A06: - ldr r0, _08062A24 + ldr r0, =0x03005d60 ldrb r1, [r7] lsls r1, 2 adds r1, r0 - ldr r0, _08062A28 + ldr r0, =bx_0803D790_t7 + 1 str r0, [r1] _08062A12: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08062A18: .4byte 0x02023068 -_08062A1C: .4byte 0x020244b4 -_08062A20: .4byte 0x020244d0 -_08062A24: .4byte 0x03005d60 -_08062A28: .4byte bx_0803D790_t7 + 1 + .pool thumb_func_end dp01t_30_7_0803D67C thumb_func_start bx_0803D790_t7 bx_0803D790_t7: @ 8062A2C push {r4,lr} - ldr r4, _08062A6C + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _08062A70 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -199587,16 +191745,15 @@ _08062A64: pop {r0} bx r0 .align 2, 0 -_08062A6C: .4byte 0x020244d0 -_08062A70: .4byte 0x02024064 + .pool thumb_func_end bx_0803D790_t7 thumb_func_start sub_8062A74 sub_8062A74: @ 8062A74 push {lr} - ldr r0, _08062AB0 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _08062AB4 + ldr r0, =0x02024064 ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -199608,26 +191765,22 @@ sub_8062A74: @ 8062A74 ands r0, r1 cmp r0, 0 beq _08062AA6 - ldr r2, _08062AB8 - ldr r0, _08062ABC + ldr r2, =0x03005e00 + ldr r0, =0x020244b4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _08062AC0 + ldr r1, =sub_8073C30 + 1 str r1, [r0] _08062AA6: bl dp01_tbl7_exec_completed pop {r0} bx r0 .align 2, 0 -_08062AB0: .4byte 0x020244d0 -_08062AB4: .4byte 0x02024064 -_08062AB8: .4byte 0x03005e00 -_08062ABC: .4byte 0x020244b4 -_08062AC0: .4byte sub_8073C30 + 1 + .pool thumb_func_end sub_8062A74 thumb_func_start sub_8062AC4 @@ -199641,14 +191794,14 @@ sub_8062AC4: @ 8062AC4 thumb_func_start sub_8062AD0 sub_8062AD0: @ 8062AD0 push {r4,lr} - ldr r4, _08062B20 + ldr r4, =0x02024064 ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _08062B16 - ldr r3, _08062B24 - ldr r0, _08062B28 + ldr r3, =0x02020630 + ldr r0, =0x020241e4 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -199656,7 +191809,7 @@ sub_8062AD0: @ 8062AD0 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, _08062B2C + ldr r0, =0x02023064 lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -199679,23 +191832,20 @@ _08062B16: pop {r0} bx r0 .align 2, 0 -_08062B20: .4byte 0x02024064 -_08062B24: .4byte 0x02020630 -_08062B28: .4byte 0x020241e4 -_08062B2C: .4byte 0x02023064 + .pool thumb_func_end sub_8062AD0 thumb_func_start dp01t_34_7_move_anim_start_t3 dp01t_34_7_move_anim_start_t3: @ 8062B30 push {r4-r6,lr} sub sp, 0x4 - ldr r6, _08062B74 + ldr r6, =0x02024064 ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08062B88 - ldr r5, _08062B78 + ldr r5, =0x02023064 ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -199719,14 +191869,13 @@ dp01t_34_7_move_anim_start_t3: @ 8062B30 bl dp01_tbl7_exec_completed b _08062B88 .align 2, 0 -_08062B74: .4byte 0x02024064 -_08062B78: .4byte 0x02023064 + .pool _08062B7C: - ldr r0, _08062B90 + ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, _08062B94 + ldr r0, =bx_803B0F4 + 1 str r0, [r1] _08062B88: add sp, 0x4 @@ -199734,8 +191883,7 @@ _08062B88: pop {r0} bx r0 .align 2, 0 -_08062B90: .4byte 0x03005d60 -_08062B94: .4byte bx_803B0F4 + 1 + .pool thumb_func_end dp01t_34_7_move_anim_start_t3 thumb_func_start sub_8062B98 @@ -199757,21 +191905,21 @@ sub_8062BA4: @ 8062BA4 thumb_func_start sub_8062BB0 sub_8062BB0: @ 8062BB0 push {lr} - ldr r0, _08062BE4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x6 ands r0, r1 cmp r0, 0x2 bne _08062BDA - ldr r2, _08062BE8 - ldr r0, _08062BEC + ldr r2, =0x030022c0 + ldr r0, =0x00000439 adds r3, r2, r0 ldrb r1, [r3] movs r0, 0x3 negs r0, r0 ands r0, r1 strb r0, [r3] - ldr r0, _08062BF0 + ldr r0, =0x03005d00 ldr r0, [r0] str r0, [r2] ldr r0, [r2, 0x8] @@ -199781,10 +191929,7 @@ _08062BDA: pop {r0} bx r0 .align 2, 0 -_08062BE4: .4byte 0x02022fec -_08062BE8: .4byte 0x030022c0 -_08062BEC: .4byte 0x00000439 -_08062BF0: .4byte 0x03005d00 + .pool thumb_func_end sub_8062BB0 thumb_func_start nullsub_91 @@ -199795,8 +191940,8 @@ nullsub_91: @ 8062BF4 thumb_func_start ai_switch_perish_song ai_switch_perish_song: @ 8062BF8 push {lr} - ldr r1, _08062C40 - ldr r0, _08062C44 + ldr r1, =0x020242ac + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 2 adds r0, r1 @@ -199805,7 +191950,7 @@ ai_switch_perish_song: @ 8062BF8 ands r0, r1 cmp r0, 0 beq _08062C50 - ldr r0, _08062C48 + ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -199814,7 +191959,7 @@ ai_switch_perish_song: @ 8062BF8 lsls r0, 28 cmp r0, 0 bne _08062C50 - ldr r0, _08062C4C + ldr r0, =0x0202449c ldr r0, [r0] adds r0, r2, r0 movs r1, 0xA5 @@ -199829,10 +191974,7 @@ ai_switch_perish_song: @ 8062BF8 movs r0, 0x1 b _08062C52 .align 2, 0 -_08062C40: .4byte 0x020242ac -_08062C44: .4byte 0x02024064 -_08062C48: .4byte 0x020242bc -_08062C4C: .4byte 0x0202449c + .pool _08062C50: movs r0, 0 _08062C52: @@ -199848,7 +191990,7 @@ sub_8062C58: @ 8062C58 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r0, _08062D10 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -199856,7 +191998,7 @@ sub_8062C58: @ 8062C58 beq _08062C72 b _08062E2C _08062C72: - ldr r0, _08062D14 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status movs r1, 0x1 @@ -199864,7 +192006,7 @@ _08062C72: lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r4, _08062D18 + ldr r4, =0x02024084 bl battle_get_side_with_given_state lsls r0, 24 lsrs r0, 24 @@ -199892,7 +192034,7 @@ _08062C9E: mov r9, r0 _08062CBA: lsls r1, r6, 1 - ldr r5, _08062D14 + ldr r5, =0x02024064 ldrb r0, [r5] muls r0, r7 adds r1, r0 @@ -199917,9 +192059,9 @@ _08062CE8: adds r6, 0x1 cmp r6, 0x3 ble _08062CBA - ldr r0, _08062D10 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08062D1C + ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 beq _08062D50 @@ -199934,19 +192076,16 @@ _08062CE8: str r0, [sp] b _08062D58 .align 2, 0 -_08062D10: .4byte 0x02022fec -_08062D14: .4byte 0x02024064 -_08062D18: .4byte 0x02024084 -_08062D1C: .4byte 0x00808000 + .pool _08062D20: movs r4, 0x3 movs r3, 0x6 str r3, [sp] b _08062D58 _08062D28: - ldr r0, _08062D48 + ldr r0, =0x02024064 ldrb r0, [r0] - ldr r1, _08062D4C + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 movs r1, 0xA5 @@ -199960,8 +192099,7 @@ _08062D28: movs r0, 0x1 b _08062E2E .align 2, 0 -_08062D48: .4byte 0x02024064 -_08062D4C: .4byte 0x0202449c + .pool _08062D50: movs r4, 0 movs r3, 0x6 @@ -199971,11 +192109,11 @@ _08062D58: ldrb r0, [r1] bl battle_side_get_owner lsls r0, 24 - ldr r1, _08062E40 + ldr r1, =0x02024744 mov r9, r1 cmp r0, 0 bne _08062D6C - ldr r3, _08062E44 + ldr r3, =0x020244ec mov r9, r3 _08062D6C: adds r6, r4, 0 @@ -200005,8 +192143,8 @@ _08062D74: lsls r1, 1 cmp r0, r1 beq _08062E24 - ldr r1, _08062E48 - ldr r0, _08062E4C + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -200025,7 +192163,7 @@ _08062D74: lsrs r2, r0, 24 movs r4, 0 mov r8, r5 - ldr r1, _08062E50 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 adds r5, r0, r1 @@ -200080,11 +192218,7 @@ _08062E2E: pop {r1} bx r1 .align 2, 0 -_08062E40: .4byte 0x02024744 -_08062E44: .4byte 0x020244ec -_08062E48: .4byte 0x0202406e -_08062E4C: .4byte 0x02024064 -_08062E50: .4byte 0x02024084 + .pool thumb_func_end sub_8062C58 thumb_func_start sub_8062E54 @@ -200110,8 +192244,8 @@ sub_8062E54: @ 8062E54 beq _08062E82 b _080630AC _08062E82: - ldr r1, _08062EE8 - ldr r5, _08062EEC + ldr r1, =0x02024250 + ldr r5, =0x02024064 ldrb r3, [r5] lsls r0, r3, 1 adds r4, r0, r1 @@ -200120,12 +192254,12 @@ _08062E82: bne _08062E94 b _080630AC _08062E94: - ldr r0, _08062EF0 + ldr r0, =0x0000ffff cmp r1, r0 bne _08062E9C b _080630AC _08062E9C: - ldr r2, _08062EF4 + ldr r2, =0x0831c898 ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -200136,7 +192270,7 @@ _08062E9C: bne _08062EB0 b _080630AC _08062EB0: - ldr r0, _08062EF8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -200150,9 +192284,9 @@ _08062EB0: lsls r0, 24 lsrs r0, 24 bl battle_get_side_with_given_state - ldr r1, _08062EFC + ldr r1, =0x02024210 ldrb r1, [r1] - ldr r2, _08062F00 + ldr r2, =0x0832a328 lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -200163,13 +192297,7 @@ _08062EB0: ldrb r7, [r5] b _08062F1E .align 2, 0 -_08062EE8: .4byte 0x02024250 -_08062EEC: .4byte 0x02024064 -_08062EF0: .4byte 0x0000ffff -_08062EF4: .4byte 0x0831c898 -_08062EF8: .4byte 0x02022fec -_08062EFC: .4byte 0x02024210 -_08062F00: .4byte 0x0832a328 + .pool _08062F04: ldrb r0, [r5] bl battle_get_per_side_status @@ -200184,9 +192312,9 @@ _08062F1A: adds r7, r3, 0 mov r8, r7 _08062F1E: - ldr r3, _08062F40 - ldr r1, _08062F44 - ldr r2, _08062F48 + ldr r3, =0x0831c898 + ldr r1, =0x02024250 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 1 adds r0, r1 @@ -200201,9 +192329,7 @@ _08062F1E: movs r0, 0x12 b _08062F5E .align 2, 0 -_08062F40: .4byte 0x0831c898 -_08062F44: .4byte 0x02024250 -_08062F48: .4byte 0x02024064 + .pool _08062F4C: cmp r0, 0xB bne _08062F56 @@ -200219,7 +192345,7 @@ _08062F5C: _08062F5E: str r0, [sp] _08062F60: - ldr r1, _08062F90 + ldr r1, =0x02024084 ldrb r3, [r2] movs r0, 0x58 muls r0, r3 @@ -200231,9 +192357,9 @@ _08062F60: bne _08062F76 b _080630AC _08062F76: - ldr r0, _08062F94 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08062F98 + ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 beq _08062FCC @@ -200245,18 +192371,16 @@ _08062F76: movs r0, 0x3 b _08062FD0 .align 2, 0 -_08062F90: .4byte 0x02024084 -_08062F94: .4byte 0x02022fec -_08062F98: .4byte 0x00808000 + .pool _08062F9C: movs r4, 0x3 movs r1, 0x6 mov r10, r1 b _08062FD2 _08062FA4: - ldr r0, _08062FC4 + ldr r0, =0x02024064 ldrb r0, [r0] - ldr r1, _08062FC8 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 movs r2, 0xA5 @@ -200270,8 +192394,7 @@ _08062FA4: movs r0, 0x1 b _080630AE .align 2, 0 -_08062FC4: .4byte 0x02024064 -_08062FC8: .4byte 0x0202449c + .pool _08062FCC: movs r4, 0 movs r0, 0x6 @@ -200281,17 +192404,17 @@ _08062FD2: ldrb r0, [r2] bl battle_side_get_owner lsls r0, 24 - ldr r1, _08063074 + ldr r1, =0x02024744 str r1, [sp, 0x4] cmp r0, 0 bne _08062FE6 - ldr r2, _08063078 + ldr r2, =0x020244ec str r2, [sp, 0x4] _08062FE6: adds r5, r4, 0 cmp r5, r10 bge _080630AC - ldr r0, _0806307C + ldr r0, =0x083203cc mov r9, r0 _08062FF0: movs r0, 0x64 @@ -200315,7 +192438,7 @@ _08062FF0: lsls r1, 1 cmp r0, r1 beq _080630A6 - ldr r1, _08063080 + ldr r1, =0x0202406e mov r2, r8 lsls r0, r2, 1 adds r0, r1 @@ -200327,7 +192450,7 @@ _08062FF0: ldrh r0, [r0] cmp r5, r0 beq _080630A6 - ldr r0, _08063084 + ldr r0, =0x0202449c ldr r1, [r0] adds r0, r2, r1 adds r0, 0x5C @@ -200356,11 +192479,7 @@ _08062FF0: ldrb r0, [r0, 0x17] b _08063092 .align 2, 0 -_08063074: .4byte 0x02024744 -_08063078: .4byte 0x020244ec -_0806307C: .4byte 0x083203cc -_08063080: .4byte 0x0202406e -_08063084: .4byte 0x0202449c + .pool _08063088: lsls r0, r4, 3 subs r0, r4 @@ -200397,8 +192516,8 @@ _080630AE: thumb_func_start ai_switchout_natural_cure ai_switchout_natural_cure: @ 80630C0 push {r4,r5,lr} - ldr r3, _08063118 - ldr r5, _0806311C + ldr r3, =0x02024084 + ldr r5, =0x02024064 ldrb r4, [r5] movs r0, 0x58 adds r2, r4, 0 @@ -200422,13 +192541,13 @@ ai_switchout_natural_cure: @ 80630C0 lsrs r0, 1 cmp r1, r0 bcc _08063188 - ldr r1, _08063120 + ldr r1, =0x02024250 lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] cmp r1, 0 beq _08063106 - ldr r0, _08063124 + ldr r0, =0x0000ffff cmp r1, r0 bne _08063128 _08063106: @@ -200440,14 +192559,11 @@ _08063106: ldrb r0, [r5] b _08063190 .align 2, 0 -_08063118: .4byte 0x02024084 -_0806311C: .4byte 0x02024064 -_08063120: .4byte 0x02024250 -_08063124: .4byte 0x0000ffff + .pool _08063128: - ldr r2, _08063154 - ldr r1, _08063158 - ldr r4, _0806315C + ldr r2, =0x0831c898 + ldr r1, =0x02024250 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -200467,9 +192583,7 @@ _08063128: ldrb r0, [r4] b _08063190 .align 2, 0 -_08063154: .4byte 0x0831c898 -_08063158: .4byte 0x02024250 -_0806315C: .4byte 0x02024064 + .pool _08063160: movs r0, 0x8 movs r1, 0x1 @@ -200492,10 +192606,10 @@ _08063188: movs r0, 0 b _080631AC _0806318C: - ldr r0, _080631B4 + ldr r0, =0x02024064 ldrb r0, [r0] _08063190: - ldr r1, _080631B8 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 movs r1, 0xA5 @@ -200514,8 +192628,7 @@ _080631AC: pop {r1} bx r1 .align 2, 0 -_080631B4: .4byte 0x02024064 -_080631B8: .4byte 0x0202449c + .pool thumb_func_end ai_switchout_natural_cure thumb_func_start ai_has_super_effective_move_on_field @@ -200528,7 +192641,7 @@ ai_has_super_effective_move_on_field: @ 80631BC lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _08063264 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status movs r1, 0x1 @@ -200539,9 +192652,9 @@ ai_has_super_effective_move_on_field: @ 80631BC bl battle_get_side_with_given_state lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _08063268 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _0806326C + ldr r2, =0x0832a328 lsls r0, r3, 2 adds r0, r2 ldr r0, [r0] @@ -200549,7 +192662,7 @@ ai_has_super_effective_move_on_field: @ 80631BC cmp r1, 0 bne _08063256 movs r4, 0 - ldr r6, _08063270 + ldr r6, =0x02024084 movs r7, 0x58 adds r0, r3, 0 muls r0, r7 @@ -200559,7 +192672,7 @@ ai_has_super_effective_move_on_field: @ 80631BC mov r8, r0 _0806320A: lsls r1, r4, 1 - ldr r0, _08063264 + ldr r0, =0x02024064 ldrb r0, [r0] muls r0, r7 adds r1, r0 @@ -200595,7 +192708,7 @@ _08063250: cmp r4, 0x3 ble _0806320A _08063256: - ldr r0, _08063274 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -200603,11 +192716,7 @@ _08063256: bne _0806327C b _080632FA .align 2, 0 -_08063264: .4byte 0x02024064 -_08063268: .4byte 0x02024210 -_0806326C: .4byte 0x0832a328 -_08063270: .4byte 0x02024084 -_08063274: .4byte 0x02022fec + .pool _08063278: movs r0, 0x1 b _080632FC @@ -200618,9 +192727,9 @@ _0806327C: bl battle_get_side_with_given_state lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _0806330C + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08063310 + ldr r2, =0x0832a328 lsls r0, r3, 2 adds r0, r2 ldr r0, [r0] @@ -200628,7 +192737,7 @@ _0806327C: cmp r1, 0 bne _080632FA movs r4, 0 - ldr r6, _08063314 + ldr r6, =0x02024084 movs r7, 0x58 adds r0, r3, 0 muls r0, r7 @@ -200638,7 +192747,7 @@ _0806327C: mov r8, r3 _080632AE: lsls r1, r4, 1 - ldr r0, _08063318 + ldr r0, =0x02024064 ldrb r0, [r0] muls r0, r7 adds r1, r0 @@ -200684,18 +192793,15 @@ _080632FC: pop {r1} bx r1 .align 2, 0 -_0806330C: .4byte 0x02024210 -_08063310: .4byte 0x0832a328 -_08063314: .4byte 0x02024084 -_08063318: .4byte 0x02024064 + .pool thumb_func_end ai_has_super_effective_move_on_field thumb_func_start ai_is_too_invested_in_stat_buffs ai_is_too_invested_in_stat_buffs: @ 806331C push {r4,lr} movs r4, 0 - ldr r1, _0806335C - ldr r0, _08063360 + ldr r1, =0x02024084 + ldr r0, =0x02024064 ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -200728,8 +192834,7 @@ _08063356: pop {r1} bx r1 .align 2, 0 -_0806335C: .4byte 0x02024084 -_08063360: .4byte 0x02024064 + .pool thumb_func_end ai_is_too_invested_in_stat_buffs thumb_func_start ai_switchout_something @@ -200746,8 +192851,8 @@ ai_switchout_something: @ 8063364 lsls r1, 24 lsrs r1, 24 str r1, [sp, 0x4] - ldr r2, _080633F4 - ldr r1, _080633F8 + ldr r2, =0x02024250 + ldr r1, =0x02024064 ldrb r3, [r1] lsls r0, r3, 1 adds r4, r0, r2 @@ -200757,19 +192862,19 @@ ai_switchout_something: @ 8063364 bne _08063390 b _080635EE _08063390: - ldr r0, _080633FC + ldr r0, =0x0000ffff cmp r2, r0 bne _08063398 b _080635EE _08063398: - ldr r0, _08063400 + ldr r0, =0x02024270 adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0xFF bne _080633A4 b _080635EE _080633A4: - ldr r2, _08063404 + ldr r2, =0x0831c898 ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -200780,7 +192885,7 @@ _080633A4: bne _080633B8 b _080635EE _080633B8: - ldr r0, _08063408 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -200794,9 +192899,9 @@ _080633B8: lsls r0, 24 lsrs r0, 24 bl battle_get_side_with_given_state - ldr r1, _0806340C + ldr r1, =0x02024210 ldrb r1, [r1] - ldr r2, _08063410 + ldr r2, =0x0832a328 lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -200808,14 +192913,7 @@ _080633B8: mov r10, r5 b _08063430 .align 2, 0 -_080633F4: .4byte 0x02024250 -_080633F8: .4byte 0x02024064 -_080633FC: .4byte 0x0000ffff -_08063400: .4byte 0x02024270 -_08063404: .4byte 0x0831c898 -_08063408: .4byte 0x02022fec -_0806340C: .4byte 0x02024210 -_08063410: .4byte 0x0832a328 + .pool _08063414: ldrb r0, [r5] bl battle_get_per_side_status @@ -200831,13 +192929,13 @@ _0806342C: mov r9, r3 mov r10, r9 _08063430: - ldr r0, _08063454 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08063458 + ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 beq _08063490 - ldr r2, _0806345C + ldr r2, =0x02024064 ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -200849,18 +192947,16 @@ _08063430: str r0, [sp, 0x8] b _08063498 .align 2, 0 -_08063454: .4byte 0x02022fec -_08063458: .4byte 0x00808000 -_0806345C: .4byte 0x02024064 + .pool _08063460: movs r4, 0x3 movs r1, 0x6 str r1, [sp, 0x8] b _08063498 _08063468: - ldr r0, _08063488 + ldr r0, =0x02024064 ldrb r0, [r0] - ldr r1, _0806348C + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 movs r2, 0xA5 @@ -200874,30 +192970,27 @@ _08063468: movs r0, 0x1 b _080635F0 .align 2, 0 -_08063488: .4byte 0x02024064 -_0806348C: .4byte 0x0202449c + .pool _08063490: movs r4, 0 movs r0, 0x6 str r0, [sp, 0x8] - ldr r5, _080634B0 + ldr r5, =0x02024064 _08063498: ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 - ldr r1, _080634B4 + ldr r1, =0x02024744 str r1, [sp, 0xC] cmp r0, 0 bne _080634AC - ldr r2, _080634B8 + ldr r2, =0x020244ec str r2, [sp, 0xC] _080634AC: adds r6, r4, 0 b _080635E6 .align 2, 0 -_080634B0: .4byte 0x02024064 -_080634B4: .4byte 0x02024744 -_080634B8: .4byte 0x020244ec + .pool _080634BC: movs r0, 0x64 muls r0, r6 @@ -200924,7 +193017,7 @@ _080634E0: lsls r1, 1 cmp r0, r1 beq _080635E4 - ldr r1, _0806354C + ldr r1, =0x0202406e mov r2, r9 lsls r0, r2, 1 adds r0, r1 @@ -200937,7 +193030,7 @@ _080634E0: ldrh r0, [r0] cmp r6, r0 beq _080635E4 - ldr r0, _08063550 + ldr r0, =0x0202449c ldr r1, [r0] mov r2, r9 adds r0, r2, r1 @@ -200964,24 +193057,22 @@ _080634E0: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, _08063554 + ldr r1, =0x083203cc adds r0, r1 ldrb r2, [r0, 0x17] b _08063564 .align 2, 0 -_0806354C: .4byte 0x0202406e -_08063550: .4byte 0x0202449c -_08063554: .4byte 0x083203cc + .pool _08063558: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r2, _08063600 + ldr r2, =0x083203cc adds r0, r2 ldrb r2, [r0, 0x16] _08063564: - ldr r1, _08063604 - ldr r5, _08063608 + ldr r1, =0x02024250 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r0, 1 adds r0, r1 @@ -200992,7 +193083,7 @@ _08063564: ands r1, r0 cmp r1, 0 beq _080635E4 - ldr r1, _0806360C + ldr r1, =0x02024270 ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -201002,7 +193093,7 @@ _08063564: adds r1, r6, 0 muls r1, r0 mov r8, r1 - ldr r1, _08063610 + ldr r1, =0x02024084 movs r0, 0x58 mov r2, r9 muls r2, r0 @@ -201060,11 +193151,7 @@ _080635F0: pop {r1} bx r1 .align 2, 0 -_08063600: .4byte 0x083203cc -_08063604: .4byte 0x02024250 -_08063608: .4byte 0x02024064 -_0806360C: .4byte 0x02024270 -_08063610: .4byte 0x02024084 + .pool thumb_func_end ai_switchout_something thumb_func_start sub_8063614 @@ -201075,8 +193162,8 @@ sub_8063614: @ 8063614 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r6, _080636FC - ldr r4, _08063700 + ldr r6, =0x02024084 + ldr r4, =0x02024064 ldrb r2, [r4] movs r5, 0x58 adds r0, r2, 0 @@ -201085,13 +193172,13 @@ sub_8063614: @ 8063614 adds r1, 0x50 adds r0, r1 ldr r0, [r0] - ldr r1, _08063704 + ldr r1, =0x0400e000 ands r0, r1 cmp r0, 0 beq _0806363E b _0806386C _0806363E: - ldr r0, _08063708 + ldr r0, =0x020242ac lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] @@ -201152,7 +193239,7 @@ _080636A8: bne _080636B4 b _0806386C _080636B4: - ldr r0, _0806370C + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 11 @@ -201175,9 +193262,9 @@ _080636C4: lsls r0, 24 lsrs r0, 24 bl battle_get_side_with_given_state - ldr r1, _08063710 + ldr r1, =0x02024210 ldrb r1, [r1] - ldr r2, _08063714 + ldr r2, =0x0832a328 lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -201188,13 +193275,7 @@ _080636C4: ldrb r6, [r4] b _08063732 .align 2, 0 -_080636FC: .4byte 0x02024084 -_08063700: .4byte 0x02024064 -_08063704: .4byte 0x0400e000 -_08063708: .4byte 0x020242ac -_0806370C: .4byte 0x02022fec -_08063710: .4byte 0x02024210 -_08063714: .4byte 0x0832a328 + .pool _08063718: ldrb r0, [r4] bl battle_get_per_side_status @@ -201209,13 +193290,13 @@ _0806372E: ldrb r6, [r4] adds r7, r6, 0 _08063732: - ldr r0, _08063754 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08063758 + ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 beq _08063768 - ldr r2, _0806375C + ldr r2, =0x02024064 ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -201226,9 +193307,7 @@ _08063732: mov r8, r1 b _08063770 .align 2, 0 -_08063754: .4byte 0x02022fec -_08063758: .4byte 0x00808000 -_0806375C: .4byte 0x02024064 + .pool _08063760: movs r4, 0x3 movs r0, 0x6 @@ -201238,16 +193317,16 @@ _08063768: movs r4, 0 movs r1, 0x6 mov r8, r1 - ldr r2, _08063858 + ldr r2, =0x02024064 _08063770: ldrb r0, [r2] bl battle_side_get_owner lsls r0, 24 - ldr r1, _0806385C + ldr r1, =0x02024744 mov r9, r1 cmp r0, 0 bne _08063784 - ldr r0, _08063860 + ldr r0, =0x020244ec mov r9, r0 _08063784: adds r5, r4, 0 @@ -201275,7 +193354,7 @@ _0806378A: lsls r1, 1 cmp r0, r1 beq _080637EC - ldr r1, _08063864 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -201286,7 +193365,7 @@ _0806378A: ldrh r0, [r0] cmp r5, r0 beq _080637EC - ldr r0, _08063868 + ldr r0, =0x0202449c ldr r1, [r0] adds r0, r7, r1 adds r0, 0x5C @@ -201349,11 +193428,7 @@ _08063852: movs r0, 0x1 b _0806386E .align 2, 0 -_08063858: .4byte 0x02024064 -_0806385C: .4byte 0x02024744 -_08063860: .4byte 0x020244ec -_08063864: .4byte 0x0202406e -_08063868: .4byte 0x0202449c + .pool _0806386C: movs r0, 0 _0806386E: @@ -201372,7 +193447,7 @@ sub_8063880: @ 8063880 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _080638FC + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 @@ -201381,14 +193456,14 @@ sub_8063880: @ 8063880 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 - ldr r1, _08063900 + ldr r1, =0x02024744 mov r8, r1 cmp r0, 0 bne _080638A8 - ldr r2, _08063904 + ldr r2, =0x020244ec mov r8, r2 _080638A8: - ldr r7, _08063908 + ldr r7, =0x02022fec ldr r0, [r7] movs r1, 0x8 ands r0, r1 @@ -201403,7 +193478,7 @@ _080638B6: b _080639DC _080638C2: ldrb r0, [r4] - ldr r2, _0806390C + ldr r2, =0x0202449c ldr r1, [r2] adds r0, r1 movs r1, 0xA5 @@ -201429,11 +193504,7 @@ _080638C2: adds r6, r5, 0 b _08063928 .align 2, 0 -_080638FC: .4byte 0x02024064 -_08063900: .4byte 0x02024744 -_08063904: .4byte 0x020244ec -_08063908: .4byte 0x02022fec -_0806390C: .4byte 0x0202449c + .pool _08063910: adds r0, r5, 0 bl battle_get_side_with_given_state @@ -201446,13 +193517,13 @@ _08063910: lsls r0, 24 lsrs r5, r0, 24 _08063928: - ldr r0, _08063948 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0806394C + ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 beq _08063958 - ldr r0, _08063950 + ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 @@ -201462,9 +193533,7 @@ _08063928: movs r7, 0x3 b _0806395C .align 2, 0 -_08063948: .4byte 0x02022fec -_0806394C: .4byte 0x00808000 -_08063950: .4byte 0x02024064 + .pool _08063954: movs r0, 0x3 b _0806395A @@ -201484,7 +193553,7 @@ _08063962: bl pokemon_getattr cmp r0, 0 beq _080639A0 - ldr r1, _080639D0 + ldr r1, =0x0202406e lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] @@ -201495,7 +193564,7 @@ _08063962: ldrh r0, [r0] cmp r4, r0 beq _080639A0 - ldr r0, _080639D4 + ldr r0, =0x0202449c ldr r1, [r0] adds r0, r6, r1 adds r0, 0x5C @@ -201512,9 +193581,9 @@ _080639A0: cmp r4, r7 blt _08063962 _080639A6: - ldr r0, _080639D8 + ldr r0, =0x02024064 ldrb r0, [r0] - ldr r2, _080639D4 + ldr r2, =0x0202449c ldr r1, [r2] adds r0, r1 movs r1, 0xA5 @@ -201522,7 +193591,7 @@ _080639A6: adds r0, r1 strb r4, [r0] _080639B8: - ldr r0, _080639D8 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r0, [r2] adds r0, r1, r0 @@ -201535,16 +193604,14 @@ _080639B8: strb r0, [r1] b _080639F8 .align 2, 0 -_080639D0: .4byte 0x0202406e -_080639D4: .4byte 0x0202449c -_080639D8: .4byte 0x02024064 + .pool _080639DC: bl sub_8063EE0 lsls r0, 24 cmp r0, 0 bne _080639F8 _080639E6: - ldr r0, _08063A04 + ldr r0, =0x02024064 ldrb r0, [r0] movs r2, 0x1 eors r2, r0 @@ -201559,7 +193626,7 @@ _080639F8: pop {r0} bx r0 .align 2, 0 -_08063A04: .4byte 0x02024064 + .pool thumb_func_end sub_8063880 thumb_func_start sub_8063A08 @@ -201581,7 +193648,7 @@ sub_8063A08: @ 8063A08 lsrs r2, 24 mov r8, r2 movs r7, 0 - ldr r0, _08063A8C + ldr r0, =0x0831ace8 mov r10, r0 ldrb r0, [r0] cmp r0, 0xFF @@ -201632,7 +193699,7 @@ _08063A7A: pop {r0} bx r0 .align 2, 0 -_08063A8C: .4byte 0x0831ace8 + .pool thumb_func_end sub_8063A08 thumb_func_start sub_8063A90 @@ -201643,9 +193710,9 @@ sub_8063A90: @ 8063A90 mov r5, r8 push {r5-r7} sub sp, 0x24 - ldr r4, _08063AD0 + ldr r4, =0x02024064 ldrb r2, [r4] - ldr r0, _08063AD4 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, r2, r0 adds r1, r0, 0 @@ -201655,14 +193722,14 @@ sub_8063A90: @ 8063A90 beq _08063AB2 b _08063E50 _08063AB2: - ldr r0, _08063AD8 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 11 ands r0, r1 cmp r0, 0 beq _08063AE0 - ldr r1, _08063ADC + ldr r1, =0x0202406e lsls r0, r2, 1 adds r0, r1 ldrb r0, [r0] @@ -201671,10 +193738,7 @@ _08063AB2: lsrs r0, 24 b _08063E50 .align 2, 0 -_08063AD0: .4byte 0x02024064 -_08063AD4: .4byte 0x0202449c -_08063AD8: .4byte 0x02022fec -_08063ADC: .4byte 0x0202406e + .pool _08063AE0: movs r0, 0x1 ands r1, r0 @@ -201688,9 +193752,9 @@ _08063AE0: lsls r0, 24 lsrs r0, 24 bl battle_get_side_with_given_state - ldr r1, _08063B18 + ldr r1, =0x02024210 ldrb r1, [r1] - ldr r2, _08063B1C + ldr r2, =0x0832a328 lsls r0, 24 lsrs r0, 22 adds r0, r2 @@ -201702,8 +193766,7 @@ _08063AE0: str r4, [sp, 0x14] b _08063B36 .align 2, 0 -_08063B18: .4byte 0x02024210 -_08063B1C: .4byte 0x0832a328 + .pool _08063B20: ldrb r0, [r4] bl battle_get_per_side_status @@ -201721,9 +193784,9 @@ _08063B36: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] - ldr r0, _08063B64 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08063B68 + ldr r2, =0x0832a328 ldr r4, [sp, 0x4] lsls r0, r4, 2 adds r0, r2 @@ -201737,8 +193800,7 @@ _08063B36: str r0, [sp, 0x4] b _08063B8A .align 2, 0 -_08063B64: .4byte 0x02024210 -_08063B68: .4byte 0x0832a328 + .pool _08063B6C: adds r0, r2, 0 bl battle_get_per_side_status @@ -201754,13 +193816,13 @@ _08063B6C: str r4, [sp, 0x14] str r4, [sp, 0x10] _08063B8A: - ldr r0, _08063BAC + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08063BB0 + ldr r1, =0x00808000 ands r0, r1 cmp r0, 0 beq _08063BC2 - ldr r2, _08063BB4 + ldr r2, =0x02024064 ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -201772,9 +193834,7 @@ _08063B8A: str r1, [sp, 0x1C] b _08063BCC .align 2, 0 -_08063BAC: .4byte 0x02022fec -_08063BB0: .4byte 0x00808000 -_08063BB4: .4byte 0x02024064 + .pool _08063BB8: movs r4, 0x3 str r4, [sp, 0x18] @@ -201786,16 +193846,16 @@ _08063BC2: str r1, [sp, 0x18] movs r2, 0x6 str r2, [sp, 0x1C] - ldr r2, _08063CB8 + ldr r2, =0x02024064 _08063BCC: ldrb r0, [r2] bl battle_side_get_owner lsls r0, 24 - ldr r4, _08063CBC + ldr r4, =0x02024744 str r4, [sp, 0x20] cmp r0, 0 bne _08063BE0 - ldr r0, _08063CC0 + ldr r0, =0x020244ec str r0, [sp, 0x20] _08063BE0: movs r1, 0 @@ -201812,7 +193872,7 @@ _08063BE4: b _08063CF2 _08063BF6: lsls r0, r7, 2 - ldr r1, _08063CC4 + ldr r1, =0x0832a328 adds r0, r1 mov r8, r0 mov r10, sp @@ -201839,7 +193899,7 @@ _08063C00: ands r0, r1 cmp r0, 0 bne _08063CD8 - ldr r1, _08063CC8 + ldr r1, =0x0202406e ldr r2, [sp, 0x10] lsls r0, r2, 1 adds r0, r1 @@ -201852,7 +193912,7 @@ _08063C00: ldrh r0, [r0] cmp r0, r7 beq _08063CD8 - ldr r0, _08063CCC + ldr r0, =0x0202449c ldr r1, [r0] adds r0, r2, r1 adds r0, 0x5C @@ -201864,7 +193924,7 @@ _08063C00: ldrb r0, [r0] cmp r7, r0 beq _08063CD8 - ldr r1, _08063CD0 + ldr r1, =0x083203cc lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -201878,7 +193938,7 @@ _08063C00: ldr r2, [sp, 0x4] adds r4, r2, 0 muls r4, r0 - ldr r0, _08063CD4 + ldr r0, =0x02024084 adds r4, r0 adds r0, r4, 0 adds r0, 0x21 @@ -201906,14 +193966,7 @@ _08063C00: str r0, [sp, 0xC] b _08063CE6 .align 2, 0 -_08063CB8: .4byte 0x02024064 -_08063CBC: .4byte 0x02024744 -_08063CC0: .4byte 0x020244ec -_08063CC4: .4byte 0x0832a328 -_08063CC8: .4byte 0x0202406e -_08063CCC: .4byte 0x0202449c -_08063CD0: .4byte 0x083203cc -_08063CD4: .4byte 0x02024084 + .pool _08063CD8: mov r4, r8 ldr r0, [r4] @@ -201948,7 +194001,7 @@ _08063D02: lsrs r4, r0, 16 cmp r4, 0 beq _08063D2A - ldr r0, _08063D4C + ldr r0, =0x02024064 ldrb r1, [r0] adds r0, r4, 0 ldr r2, [sp, 0x4] @@ -201968,7 +194021,7 @@ _08063D30: _08063D36: ldr r4, [sp, 0xC] lsls r0, r4, 2 - ldr r1, _08063D50 + ldr r1, =0x0832a328 adds r0, r1 ldr r0, [r0] mov r2, r9 @@ -201978,8 +194031,7 @@ _08063D36: mov r9, r0 b _08063D58 .align 2, 0 -_08063D4C: .4byte 0x02024064 -_08063D50: .4byte 0x0832a328 + .pool _08063D54: movs r4, 0x3F mov r9, r4 @@ -201989,18 +194041,18 @@ _08063D58: beq _08063D60 b _08063BE4 _08063D60: - ldr r0, _08063E60 + ldr r0, =0x02024400 movs r1, 0 strh r1, [r0] - ldr r0, _08063E64 + ldr r0, =0x0202449c ldr r0, [r0] strb r1, [r0, 0x13] - ldr r0, _08063E68 + ldr r0, =0x02024474 movs r2, 0x1 strb r2, [r0, 0xE] - ldr r0, _08063E6C + ldr r0, =0x0202427c strb r1, [r0] - ldr r0, _08063E70 + ldr r0, =0x02024211 strb r2, [r0] movs r1, 0 str r1, [sp, 0x8] @@ -202029,7 +194081,7 @@ _08063D8A: bl pokemon_getattr cmp r0, 0 beq _08063E46 - ldr r1, _08063E74 + ldr r1, =0x0202406e ldr r2, [sp, 0x10] lsls r0, r2, 1 adds r0, r1 @@ -202042,7 +194094,7 @@ _08063D8A: ldrh r0, [r0] cmp r0, r7 beq _08063E46 - ldr r0, _08063E64 + ldr r0, =0x0202449c ldr r1, [r0] adds r0, r2, r1 adds r0, 0x5C @@ -202056,9 +194108,9 @@ _08063D8A: beq _08063E46 movs r5, 0 mov r9, r6 - ldr r0, _08063E78 + ldr r0, =0x020241f0 mov r8, r0 - ldr r6, _08063E7C + ldr r6, =0x02024064 _08063DEE: adds r1, r5, 0 adds r1, 0xD @@ -202072,7 +194124,7 @@ _08063DEE: str r0, [r1] cmp r4, 0 beq _08063E2A - ldr r0, _08063E80 + ldr r0, =0x0831c898 lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -202120,15 +194172,7 @@ _08063E50: pop {r1} bx r1 .align 2, 0 -_08063E60: .4byte 0x02024400 -_08063E64: .4byte 0x0202449c -_08063E68: .4byte 0x02024474 -_08063E6C: .4byte 0x0202427c -_08063E70: .4byte 0x02024211 -_08063E74: .4byte 0x0202406e -_08063E78: .4byte 0x020241f0 -_08063E7C: .4byte 0x02024064 -_08063E80: .4byte 0x0831c898 + .pool thumb_func_end sub_8063A90 thumb_func_start ai_identify_item_effect @@ -202199,14 +194243,14 @@ sub_8063EE0: @ 8063EE0 movs r0, 0 mov r10, r0 movs r7, 0 - ldr r0, _08063FC8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 beq _08063F12 - ldr r0, _08063FCC + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status lsls r0, 24 @@ -202215,14 +194259,14 @@ sub_8063EE0: @ 8063EE0 bne _08063F12 b _0806437C _08063F12: - ldr r0, _08063FCC + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 - ldr r5, _08063FD0 + ldr r5, =0x02024744 cmp r0, 0 bne _08063F24 - ldr r5, _08063FD4 + ldr r5, =0x020244ec _08063F24: movs r1, 0 mov r8, r1 @@ -202263,7 +194307,7 @@ _08063F64: movs r2, 0 mov r8, r2 _08063F72: - ldr r1, _08063FD8 + ldr r1, =0x020244a8 mov r0, r8 cmp r0, 0 beq _08063F8E @@ -202291,7 +194335,7 @@ _08063F8E: bne _08063FA6 b _08064370 _08063FA6: - ldr r1, _08063FDC + ldr r1, =0x0831e58c subs r0, 0xD lsls r0, 2 adds r0, r1 @@ -202303,20 +194347,13 @@ _08063FB6: mov r0, r9 cmp r0, 0xAF bne _08063FE8 - ldr r0, _08063FE0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08063FE4 + ldr r1, =0x00003214 adds r5, r0, r1 b _08063FEA .align 2, 0 -_08063FC8: .4byte 0x02022fec -_08063FCC: .4byte 0x02024064 -_08063FD0: .4byte 0x02024744 -_08063FD4: .4byte 0x020244ec -_08063FD8: .4byte 0x020244a8 -_08063FDC: .4byte 0x0831e58c -_08063FE0: .4byte 0x03005d8c -_08063FE4: .4byte 0x00003214 + .pool _08063FE8: adds r5, r1, 0 _08063FEA: @@ -202325,10 +194362,10 @@ _08063FEA: lsrs r0, 24 adds r1, r5, 0 bl ai_identify_item_effect - ldr r4, _08064024 + ldr r4, =0x02024064 ldrb r1, [r4] lsrs r1, 1 - ldr r3, _08064028 + ldr r3, =0x0202449c ldr r2, [r3] adds r1, r2 adds r1, 0xC4 @@ -202345,14 +194382,12 @@ _08063FEA: b _08064324 _0806401A: lsls r0, 2 - ldr r1, _0806402C + ldr r1, =_08064030 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08064024: .4byte 0x02024064 -_08064028: .4byte 0x0202449c -_0806402C: .4byte _08064030 + .pool .align 2, 0 _08064030: .4byte _08064048 @@ -202362,8 +194397,8 @@ _08064030: .4byte _080642F4 .4byte _0806437C _08064048: - ldr r2, _0806406C - ldr r0, _08064070 + ldr r2, =0x02024084 + ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -202382,8 +194417,7 @@ _08064066: movs r7, 0x1 b _08064328 .align 2, 0 -_0806406C: .4byte 0x02024084 -_08064070: .4byte 0x02024064 + .pool _08064074: mov r0, r9 movs r1, 0x4 @@ -202395,8 +194429,8 @@ _08064074: bne _08064088 b _08064324 _08064088: - ldr r2, _080640B4 - ldr r0, _080640B8 + ldr r2, =0x02024084 + ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -202420,13 +194454,12 @@ _0806409C: _080640B2: b _08064066 .align 2, 0 -_080640B4: .4byte 0x02024084 -_080640B8: .4byte 0x02024064 + .pool _080640BC: - ldr r3, _08064208 + ldr r3, =0x02024064 ldrb r0, [r3] lsrs r0, 1 - ldr r2, _0806420C + ldr r2, =0x0202449c ldr r1, [r2] adds r0, r1 adds r0, 0xC6 @@ -202438,7 +194471,7 @@ _080640BC: ands r0, r1 cmp r0, 0 beq _08064100 - ldr r1, _08064210 + ldr r1, =0x02024084 ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -202464,7 +194497,7 @@ _08064100: ands r0, r1 cmp r0, 0 beq _0806413A - ldr r1, _08064210 + ldr r1, =0x02024084 ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -202495,7 +194528,7 @@ _0806413A: ands r0, r1 cmp r0, 0 beq _0806416C - ldr r1, _08064210 + ldr r1, =0x02024084 ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -202521,7 +194554,7 @@ _0806416C: ands r0, r1 cmp r0, 0 beq _0806419E - ldr r1, _08064210 + ldr r1, =0x02024084 ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -202547,7 +194580,7 @@ _0806419E: ands r0, r1 cmp r0, 0 beq _080641D0 - ldr r1, _08064210 + ldr r1, =0x02024084 ldrb r4, [r3] movs r0, 0x58 muls r0, r4 @@ -202575,7 +194608,7 @@ _080641D0: bne _080641DE b _08064324 _080641DE: - ldr r1, _08064210 + ldr r1, =0x02024084 ldrb r3, [r3] movs r0, 0x58 muls r0, r3 @@ -202597,20 +194630,18 @@ _080641F6: strb r0, [r1] b _08064066 .align 2, 0 -_08064208: .4byte 0x02024064 -_0806420C: .4byte 0x0202449c -_08064210: .4byte 0x02024084 + .pool _08064214: - ldr r4, _080642E8 + ldr r4, =0x02024064 ldrb r0, [r4] lsrs r0, 1 - ldr r3, _080642EC + ldr r3, =0x0202449c ldr r1, [r3] adds r0, r1 adds r0, 0xC6 movs r1, 0 strb r1, [r0] - ldr r1, _080642F0 + ldr r1, =0x020242bc ldrb r2, [r4] lsls r0, r2, 3 subs r0, r2 @@ -202713,16 +194744,14 @@ _080642D2: strb r1, [r0] b _08064066 .align 2, 0 -_080642E8: .4byte 0x02024064 -_080642EC: .4byte 0x0202449c -_080642F0: .4byte 0x020242bc + .pool _080642F4: - ldr r4, _0806435C + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _08064360 + ldr r2, =0x020242bc ldrb r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -202731,7 +194760,7 @@ _080642F4: ldrb r0, [r0, 0x16] cmp r0, 0 beq _08064324 - ldr r0, _08064364 + ldr r0, =0x02024294 lsls r1, r3, 1 adds r1, r3 lsls r1, 2 @@ -202748,17 +194777,17 @@ _08064328: movs r1, 0x1 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb - ldr r0, _0806435C + ldr r0, =0x02024064 ldrb r0, [r0] lsrs r0, 1 - ldr r1, _08064368 + ldr r1, =0x0202449c ldr r1, [r1] lsls r0, 1 adds r0, r1 adds r0, 0xC0 mov r1, r9 strb r1, [r0] - ldr r0, _0806436C + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x18] adds r0, 0x48 @@ -202769,11 +194798,7 @@ _08064328: adds r0, r7, 0 b _0806437E .align 2, 0 -_0806435C: .4byte 0x02024064 -_08064360: .4byte 0x020242bc -_08064364: .4byte 0x02024294 -_08064368: .4byte 0x0202449c -_0806436C: .4byte 0x020244a8 + .pool _08064370: movs r0, 0x1 add r8, r0 @@ -202801,26 +194826,24 @@ nullsub_28: @ 8064390 thumb_func_start sub_8064394 sub_8064394: @ 8064394 - ldr r1, _080643A4 - ldr r0, _080643A8 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _080643AC + ldr r1, =sub_80643B0 + 1 str r1, [r0] bx lr .align 2, 0 -_080643A4: .4byte 0x03005d60 -_080643A8: .4byte 0x02024064 -_080643AC: .4byte sub_80643B0 + 1 + .pool thumb_func_end sub_8064394 thumb_func_start sub_80643B0 sub_80643B0: @ 80643B0 push {lr} - ldr r2, _080643E4 - ldr r1, _080643E8 - ldr r0, _080643EC + ldr r2, =0x02024068 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -202829,13 +194852,13 @@ sub_80643B0: @ 80643B0 ands r1, r0 cmp r1, 0 beq _080643FC - ldr r0, _080643F0 + ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _080643F8 - ldr r0, _080643F4 + ldr r0, =0x0831c7b4 ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -202843,11 +194866,7 @@ sub_80643B0: @ 80643B0 bl _call_via_r0 b _080643FC .align 2, 0 -_080643E4: .4byte 0x02024068 -_080643E8: .4byte 0x0832a328 -_080643EC: .4byte 0x02024064 -_080643F0: .4byte 0x02023064 -_080643F4: .4byte 0x0831c7b4 + .pool _080643F8: bl sub_8065068 _080643FC: @@ -202858,9 +194877,9 @@ _080643FC: thumb_func_start sub_8064400 sub_8064400: @ 8064400 push {lr} - ldr r2, _08064428 - ldr r1, _0806442C - ldr r0, _08064430 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -202870,7 +194889,7 @@ sub_8064400: @ 8064400 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08064434 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08064424 bl sub_8065068 @@ -202878,18 +194897,15 @@ _08064424: pop {r0} bx r0 .align 2, 0 -_08064428: .4byte 0x02020630 -_0806442C: .4byte 0x020241e4 -_08064430: .4byte 0x02024064 -_08064434: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8064400 thumb_func_start sub_8064438 sub_8064438: @ 8064438 push {lr} - ldr r2, _08064460 - ldr r1, _08064464 - ldr r0, _08064468 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -202899,7 +194915,7 @@ sub_8064438: @ 8064438 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0806446C + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0806445C bl sub_8065068 @@ -202907,18 +194923,15 @@ _0806445C: pop {r0} bx r0 .align 2, 0 -_08064460: .4byte 0x02020630 -_08064464: .4byte 0x020241e4 -_08064468: .4byte 0x02024064 -_0806446C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8064438 thumb_func_start sub_8064470 sub_8064470: @ 8064470 push {r4-r6,lr} - ldr r5, _080644C8 - ldr r6, _080644CC - ldr r4, _080644D0 + ldr r5, =0x02020630 + ldr r6, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] @@ -202929,7 +194942,7 @@ sub_8064470: @ 8064470 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, _080644D4 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _080644C2 adds r0, r2, r5 @@ -202957,18 +194970,15 @@ _080644C2: pop {r0} bx r0 .align 2, 0 -_080644C8: .4byte 0x02020630 -_080644CC: .4byte 0x020241e4 -_080644D0: .4byte 0x02024064 -_080644D4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8064470 thumb_func_start sub_80644D8 sub_80644D8: @ 80644D8 push {r4,lr} - ldr r4, _08064518 + ldr r4, =0x020244d0 ldr r1, [r4] - ldr r3, _0806451C + ldr r3, =0x02024064 ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -202997,8 +195007,7 @@ _08064510: pop {r0} bx r0 .align 2, 0 -_08064518: .4byte 0x020244d0 -_0806451C: .4byte 0x02024064 + .pool thumb_func_end sub_80644D8 thumb_func_start sub_8064520 @@ -203017,16 +195026,16 @@ sub_8064520: @ 8064520 lsls r0, 24 cmp r0, 0 beq _08064584 - ldr r0, _08064570 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _08064584 _0806454C: - ldr r2, _08064574 - ldr r1, _08064578 - ldr r3, _0806457C + ldr r2, =0x02020630 + ldr r1, =0x03005d70 + ldr r3, =0x02024064 ldrb r0, [r3] adds r0, r1 ldrb r1, [r0] @@ -203036,21 +195045,17 @@ _0806454C: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08064580 + ldr r0, =nullsub_12 + 1 adds r7, r3, 0 cmp r1, r0 bne _080645C2 b _080645CA .align 2, 0 -_08064570: .4byte 0x02022fec -_08064574: .4byte 0x02020630 -_08064578: .4byte 0x03005d70 -_0806457C: .4byte 0x02024064 -_08064580: .4byte nullsub_12 + 1 + .pool _08064584: - ldr r3, _08064684 - ldr r6, _08064688 - ldr r2, _0806468C + ldr r3, =0x02020630 + ldr r6, =0x03005d70 + ldr r2, =0x02024064 ldrb r4, [r2] adds r0, r4, r6 ldrb r1, [r0] @@ -203061,7 +195066,7 @@ _08064584: adds r5, 0x1C adds r0, r5 ldr r3, [r0] - ldr r0, _08064690 + ldr r0, =nullsub_12 + 1 adds r7, r2, 0 cmp r3, r0 bne _080645C0 @@ -203096,10 +195101,10 @@ _080645CA: cmp r0, 0 bne _0806469C _080645DE: - ldr r1, _08064694 + ldr r1, =0x020244d0 mov r12, r1 ldr r0, [r1] - ldr r7, _0806468C + ldr r7, =0x02024064 ldrb r2, [r7] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -203171,21 +195176,16 @@ _08064600: ldrb r1, [r0, 0x1] ands r4, r1 strb r4, [r0, 0x1] - ldr r4, _08064698 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag b _080646F2 .align 2, 0 -_08064684: .4byte 0x02020630 -_08064688: .4byte 0x03005d70 -_0806468C: .4byte 0x02024064 -_08064690: .4byte nullsub_12 + 1 -_08064694: .4byte 0x020244d0 -_08064698: .4byte 0x000027f9 + .pool _0806469C: - ldr r3, _08064720 + ldr r3, =0x020244d0 ldr r0, [r3] ldrb r1, [r7] ldr r2, [r0, 0x4] @@ -203220,15 +195220,15 @@ _0806469C: lsrs r0, 24 cmp r0, 0x3 bne _080646F2 - ldr r4, _08064724 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag _080646F2: - ldr r0, _08064720 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r3, _08064728 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -203237,11 +195237,11 @@ _080646F2: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, _0806472C + ldr r1, =0x03005d60 ldrb r0, [r3] lsls r0, 2 adds r0, r1 - ldr r1, _08064730 + ldr r1, =sub_80644D8 + 1 str r1, [r0] _08064714: pop {r3} @@ -203250,11 +195250,7 @@ _08064714: pop {r0} bx r0 .align 2, 0 -_08064720: .4byte 0x020244d0 -_08064724: .4byte 0x000027f9 -_08064728: .4byte 0x02024064 -_0806472C: .4byte 0x03005d60 -_08064730: .4byte sub_80644D8 + 1 + .pool thumb_func_end sub_8064520 thumb_func_start sub_8064734 @@ -203266,9 +195262,9 @@ sub_8064734: @ 8064734 push {r5-r7} movs r0, 0 mov r10, r0 - ldr r5, _08064914 + ldr r5, =0x020244d0 ldr r0, [r5] - ldr r4, _08064918 + ldr r4, =0x02024064 ldrb r2, [r4] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -203282,17 +195278,17 @@ sub_8064734: @ 8064734 ands r0, r1 cmp r0, 0 bne _08064776 - ldr r0, _0806491C + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08064920 + ldr r0, =0x02024744 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 _08064776: - ldr r0, _08064924 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -203313,19 +195309,19 @@ _08064776: ands r0, r1 cmp r0, 0 bne _080647B4 - ldr r0, _0806491C + ldr r0, =0x0202406e adds r0, r2, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08064920 + ldr r0, =0x02024744 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 _080647B4: - ldr r3, _08064914 + ldr r3, =0x020244d0 ldr r0, [r3] - ldr r2, _08064918 + ldr r2, =0x02024064 ldrb r5, [r2] ldr r4, [r0, 0x4] lsls r0, r5, 1 @@ -203361,26 +195357,26 @@ _080647B4: lsls r0, 24 cmp r0, 0 beq _0806484A - ldr r0, _08064924 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _0806484A - ldr r4, _08064928 + ldr r4, =0x03005d70 mov r1, r9 ldrb r0, [r1] adds r1, r7, 0 eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _0806491C + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08064920 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -203395,18 +195391,18 @@ _080647B4: ldrb r0, [r0] bl sub_80729D0 _0806484A: - ldr r5, _08064928 - ldr r4, _08064918 + ldr r5, =0x03005d70 + ldr r4, =0x02024064 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _0806491C + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08064920 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -203417,9 +195413,9 @@ _0806484A: ldrb r0, [r0] bl sub_80729D0 _0806487A: - ldr r4, _08064914 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _08064918 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -203476,7 +195472,7 @@ _08064898: ands r0, r1 cmp r0, 0 bne _0806493C - ldr r0, _08064924 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 @@ -203488,27 +195484,21 @@ _08064898: lsrs r0, 24 cmp r0, 0x1 bne _0806493C - ldr r0, _0806492C + ldr r0, =0x03007420 bl m4aMPlayContinue b _0806493C .align 2, 0 -_08064914: .4byte 0x020244d0 -_08064918: .4byte 0x02024064 -_0806491C: .4byte 0x0202406e -_08064920: .4byte 0x02024744 -_08064924: .4byte 0x02022fec -_08064928: .4byte 0x03005d70 -_0806492C: .4byte 0x03007420 + .pool _08064930: - ldr r0, _08064AD0 - ldr r1, _08064AD4 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl _0806493C: - ldr r0, _08064AD8 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08064ADC + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -203527,9 +195517,9 @@ _0806495A: bne _08064962 b _08064AC0 _08064962: - ldr r2, _08064AE0 - ldr r0, _08064AE4 - ldr r5, _08064ADC + ldr r2, =0x02020630 + ldr r0, =0x03005d7c + ldr r5, =0x02024064 ldrb r3, [r5] adds r0, r3, r0 ldrb r1, [r0] @@ -203539,12 +195529,12 @@ _08064962: adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, _08064AE8 + ldr r0, =nullsub_12 + 1 cmp r4, r0 beq _08064982 b _08064AC0 _08064982: - ldr r0, _08064AEC + ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -203556,7 +195546,7 @@ _08064982: beq _08064998 b _08064AC0 _08064998: - ldr r0, _08064AF0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -203568,7 +195558,7 @@ _08064998: lsrs r0, 24 cmp r0, 0x3 bne _080649E2 - ldr r3, _08064AD8 + ldr r3, =0x020244d0 ldr r0, [r3] ldrb r2, [r5] ldr r0, [r0, 0x4] @@ -203597,14 +195587,14 @@ _080649E2: lsls r0, 24 cmp r0, 0 beq _08064A3A - ldr r0, _08064AF0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _08064A3A - ldr r1, _08064AE4 - ldr r5, _08064ADC + ldr r1, =0x03005d7c + ldr r5, =0x02024064 ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -203613,18 +195603,18 @@ _080649E2: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08064AE0 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles ldrb r0, [r5] eors r4, r0 - ldr r1, _08064AF4 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08064AF8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -203634,25 +195624,25 @@ _080649E2: adds r0, r4, 0 bl sub_805EE54 _08064A3A: - ldr r1, _08064AE4 - ldr r4, _08064ADC + ldr r1, =0x03005d7c + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08064AE0 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles ldrb r5, [r4] - ldr r1, _08064AF4 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08064AF8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -203661,7 +195651,7 @@ _08064A3A: lsrs r1, 16 adds r0, r5, 0 bl sub_805EE54 - ldr r3, _08064AD8 + ldr r3, =0x020244d0 ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r1, [r2, 0x9] @@ -203692,11 +195682,11 @@ _08064A3A: movs r0, 0x7F ands r0, r2 strb r0, [r1, 0x1] - ldr r1, _08064AFC + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08064B00 + ldr r1, =sub_8064520 + 1 str r1, [r0] _08064AC0: pop {r3-r5} @@ -203707,27 +195697,15 @@ _08064AC0: pop {r0} bx r0 .align 2, 0 -_08064AD0: .4byte 0x03007420 -_08064AD4: .4byte 0x0000ffff -_08064AD8: .4byte 0x020244d0 -_08064ADC: .4byte 0x02024064 -_08064AE0: .4byte 0x02020630 -_08064AE4: .4byte 0x03005d7c -_08064AE8: .4byte nullsub_12 + 1 -_08064AEC: .4byte 0x020241e4 -_08064AF0: .4byte 0x02022fec -_08064AF4: .4byte 0x0202406e -_08064AF8: .4byte 0x02024744 -_08064AFC: .4byte 0x03005d60 -_08064B00: .4byte sub_8064520 + 1 + .pool thumb_func_end sub_8064734 thumb_func_start sub_8064B04 sub_8064B04: @ 8064B04 push {r4-r7,lr} - ldr r4, _08064B60 - ldr r0, _08064B64 - ldr r7, _08064B68 + ldr r4, =0x02020630 + ldr r0, =0x020241e4 + ldr r7, =0x02024064 ldrb r3, [r7] adds r0, r3, r0 ldrb r1, [r0] @@ -203738,7 +195716,7 @@ sub_8064B04: @ 8064B04 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, _08064B6C + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08064BB6 adds r0, r2, r4 @@ -203746,7 +195724,7 @@ sub_8064B04: @ 8064B04 ldrsh r0, [r0, r1] cmp r0, 0 bne _08064BB6 - ldr r6, _08064B70 + ldr r6, =0x020244d0 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r4, r3, 1 @@ -203758,24 +195736,18 @@ sub_8064B04: @ 8064B04 ands r0, r5 cmp r0, 0 bne _08064B7C - ldr r0, _08064B74 + ldr r0, =0x0202406e adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08064B78 + ldr r0, =0x02024744 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 b _08064BB6 .align 2, 0 -_08064B60: .4byte 0x02020630 -_08064B64: .4byte 0x020241e4 -_08064B68: .4byte 0x02024064 -_08064B6C: .4byte nullsub_12 + 1 -_08064B70: .4byte 0x020244d0 -_08064B74: .4byte 0x0202406e -_08064B78: .4byte 0x02024744 + .pool _08064B7C: ldrb r1, [r2, 0x1] movs r0, 0x1 @@ -203797,7 +195769,7 @@ _08064B7C: negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r4, _08064BBC + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -203808,15 +195780,15 @@ _08064BB6: pop {r0} bx r0 .align 2, 0 -_08064BBC: .4byte 0x000027f9 + .pool thumb_func_end sub_8064B04 thumb_func_start sub_8064BC0 sub_8064BC0: @ 8064BC0 push {r4-r6,lr} - ldr r6, _08064C00 + ldr r6, =0x02024064 ldrb r0, [r6] - ldr r5, _08064C04 + ldr r5, =0x03005d70 adds r1, r0, r5 ldrb r1, [r1] movs r2, 0 @@ -203842,8 +195814,7 @@ sub_8064BC0: @ 8064BC0 bl heathbar_draw_hp b _08064C0C .align 2, 0 -_08064C00: .4byte 0x02024064 -_08064C04: .4byte 0x03005d70 + .pool _08064C08: bl sub_8065068 _08064C0C: @@ -203855,9 +195826,9 @@ _08064C0C: thumb_func_start sub_8064C14 sub_8064C14: @ 8064C14 push {lr} - ldr r2, _08064C48 - ldr r0, _08064C4C - ldr r1, _08064C50 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 + ldr r1, =0x02024064 ldrb r3, [r1] adds r0, r3, r0 ldrb r1, [r0] @@ -203870,7 +195841,7 @@ sub_8064C14: @ 8064C14 lsls r0, 31 cmp r0, 0 bne _08064C42 - ldr r0, _08064C54 + ldr r0, =0x03005d70 adds r0, r3, r0 ldrb r0, [r0] bl sub_8072984 @@ -203879,18 +195850,15 @@ _08064C42: pop {r0} bx r0 .align 2, 0 -_08064C48: .4byte 0x02020630 -_08064C4C: .4byte 0x020241e4 -_08064C50: .4byte 0x02024064 -_08064C54: .4byte 0x03005d70 + .pool thumb_func_end sub_8064C14 thumb_func_start sub_8064C58 sub_8064C58: @ 8064C58 push {r4-r6,lr} - ldr r0, _08064CB8 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r6, _08064CBC + ldr r6, =0x02024064 ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -203902,13 +195870,13 @@ sub_8064C58: @ 8064C58 ands r0, r1 cmp r0, 0 bne _08064CB2 - ldr r5, _08064CC0 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08064CC4 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -203921,7 +195889,7 @@ sub_8064C58: @ 8064C58 bl obj_delete_and_free_tiles ldrb r0, [r6] bl sub_805EEE0 - ldr r1, _08064CC8 + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -203932,11 +195900,7 @@ _08064CB2: pop {r0} bx r0 .align 2, 0 -_08064CB8: .4byte 0x020244d0 -_08064CBC: .4byte 0x02024064 -_08064CC0: .4byte 0x020241e4 -_08064CC4: .4byte 0x02020630 -_08064CC8: .4byte 0x03005d70 + .pool thumb_func_end sub_8064C58 thumb_func_start sub_8064CCC @@ -203956,12 +195920,12 @@ _08064CDE: thumb_func_start sub_8064CE4 sub_8064CE4: @ 8064CE4 push {r4,lr} - ldr r1, _08064D20 - ldr r0, _08064D24 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _08064D28 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -203979,15 +195943,12 @@ sub_8064CE4: @ 8064CE4 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, _08064D2C + ldr r0, =0x020244b9 strb r3, [r0] bl sub_8065068 b _08064D5A .align 2, 0 -_08064D20: .4byte 0x020241e4 -_08064D24: .4byte 0x02024064 -_08064D28: .4byte 0x02020630 -_08064D2C: .4byte 0x020244b9 + .pool _08064D30: ldrh r0, [r4, 0x30] movs r1, 0x3 @@ -204020,9 +195981,9 @@ _08064D5A: thumb_func_start sub_8064D60 sub_8064D60: @ 8064D60 push {r4,lr} - ldr r2, _08064DB4 - ldr r0, _08064DB8 - ldr r4, _08064DBC + ldr r2, =0x02020630 + ldr r0, =0x03005d70 + ldr r4, =0x02024064 ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -204032,10 +195993,10 @@ sub_8064D60: @ 8064D60 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08064DC0 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08064DAC - ldr r0, _08064DC4 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r3, 2 @@ -204051,32 +196012,26 @@ sub_8064D60: @ 8064D60 movs r3, 0x6 bl move_anim_start_t4 _08064DA0: - ldr r0, _08064DC8 + ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, _08064DCC + ldr r0, =sub_8064DD0 + 1 str r0, [r1] _08064DAC: pop {r4} pop {r0} bx r0 .align 2, 0 -_08064DB4: .4byte 0x02020630 -_08064DB8: .4byte 0x03005d70 -_08064DBC: .4byte 0x02024064 -_08064DC0: .4byte nullsub_12 + 1 -_08064DC4: .4byte 0x020244d0 -_08064DC8: .4byte 0x03005d60 -_08064DCC: .4byte sub_8064DD0 + 1 + .pool thumb_func_end sub_8064D60 thumb_func_start sub_8064DD0 sub_8064DD0: @ 8064DD0 push {r4,lr} - ldr r0, _08064E30 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r4, _08064E34 + ldr r4, =0x02024064 ldrb r1, [r4] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -204092,8 +196047,8 @@ sub_8064DD0: @ 8064DD0 lsls r0, 24 cmp r0, 0 bne _08064E2A - ldr r2, _08064E38 - ldr r1, _08064E3C + ldr r2, =0x02020630 + ldr r1, =0x020241e4 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -204103,15 +196058,15 @@ sub_8064DD0: @ 8064DD0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08064E40 + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _08064E1A - ldr r0, _08064E44 + ldr r0, =nullsub_18 + 1 cmp r1, r0 bne _08064E2A _08064E1A: - ldr r0, _08064E48 - ldr r1, _08064E4C + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl @@ -204121,22 +196076,15 @@ _08064E2A: pop {r0} bx r0 .align 2, 0 -_08064E30: .4byte 0x020244d0 -_08064E34: .4byte 0x02024064 -_08064E38: .4byte 0x02020630 -_08064E3C: .4byte 0x020241e4 -_08064E40: .4byte nullsub_12 + 1 -_08064E44: .4byte nullsub_18 + 1 -_08064E48: .4byte 0x03007420 -_08064E4C: .4byte 0x0000ffff + .pool thumb_func_end sub_8064DD0 thumb_func_start sub_8064E50 sub_8064E50: @ 8064E50 push {r4-r7,lr} - ldr r4, _08064F14 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r5, _08064F18 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -204148,8 +196096,8 @@ sub_8064E50: @ 8064E50 ands r0, r1 cmp r0, 0 beq _08064F0C - ldr r7, _08064F1C - ldr r6, _08064F20 + ldr r7, =0x02020630 + ldr r6, =0x020241e4 adds r0, r2, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -204159,7 +196107,7 @@ sub_8064E50: @ 8064E50 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _08064F24 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08064F0C ldrb r1, [r3] @@ -204178,7 +196126,7 @@ sub_8064E50: @ 8064E50 negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r4, _08064F28 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -204192,17 +196140,17 @@ sub_8064E50: @ 8064E50 adds r0, r7 movs r1, 0 bl obj_anim_image_start - ldr r4, _08064F2C + ldr r4, =0x03005d70 ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _08064F30 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08064F34 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -204214,36 +196162,26 @@ sub_8064E50: @ 8064E50 bl sub_80729D0 ldrb r0, [r5] bl sub_805E408 - ldr r1, _08064F38 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08064F3C + ldr r1, =sub_8064D60 + 1 str r1, [r0] _08064F0C: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08064F14: .4byte 0x020244d0 -_08064F18: .4byte 0x02024064 -_08064F1C: .4byte 0x02020630 -_08064F20: .4byte 0x020241e4 -_08064F24: .4byte nullsub_12 + 1 -_08064F28: .4byte 0x000027f9 -_08064F2C: .4byte 0x03005d70 -_08064F30: .4byte 0x0202406e -_08064F34: .4byte 0x02024744 -_08064F38: .4byte 0x03005d60 -_08064F3C: .4byte sub_8064D60 + 1 + .pool thumb_func_end sub_8064E50 thumb_func_start sub_8064F40 sub_8064F40: @ 8064F40 push {r4-r6,lr} - ldr r6, _08064FE4 + ldr r6, =0x020244d0 ldr r0, [r6] - ldr r5, _08064FE8 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -204255,18 +196193,18 @@ sub_8064F40: @ 8064F40 ands r0, r1 cmp r0, 0 bne _08064F72 - ldr r0, _08064FEC + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08064FF0 + ldr r0, =0x02024744 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 _08064F72: - ldr r4, _08064FF4 - ldr r0, _08064FF8 + ldr r4, =0x02020630 + ldr r0, =0x03005d7c ldrb r2, [r5] adds r0, r2, r0 ldrb r1, [r0] @@ -204277,7 +196215,7 @@ _08064F72: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _08064FFC + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08064FDC ldr r0, [r6] @@ -204294,13 +196232,13 @@ _08064F72: adds r0, r3, r4 bl obj_delete_and_free_tiles ldrb r4, [r5] - ldr r1, _08064FEC + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08064FF0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -204309,34 +196247,26 @@ _08064F72: lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, _08065000 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08065004 + ldr r1, =sub_8064E50 + 1 str r1, [r0] _08064FDC: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08064FE4: .4byte 0x020244d0 -_08064FE8: .4byte 0x02024064 -_08064FEC: .4byte 0x0202406e -_08064FF0: .4byte 0x02024744 -_08064FF4: .4byte 0x02020630 -_08064FF8: .4byte 0x03005d7c -_08064FFC: .4byte nullsub_12 + 1 -_08065000: .4byte 0x03005d60 -_08065004: .4byte sub_8064E50 + 1 + .pool thumb_func_end sub_8064F40 thumb_func_start sub_8065008 sub_8065008: @ 8065008 push {lr} - ldr r0, _08065030 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08065034 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -204353,16 +196283,15 @@ _0806502A: pop {r0} bx r0 .align 2, 0 -_08065030: .4byte 0x020244d0 -_08065034: .4byte 0x02024064 + .pool thumb_func_end sub_8065008 thumb_func_start sub_8065038 sub_8065038: @ 8065038 push {lr} - ldr r0, _08065060 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08065064 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -204379,22 +196308,21 @@ _0806505A: pop {r0} bx r0 .align 2, 0 -_08065060: .4byte 0x020244d0 -_08065064: .4byte 0x02024064 + .pool thumb_func_end sub_8065038 thumb_func_start sub_8065068 sub_8065068: @ 8065068 push {r4,lr} sub sp, 0x4 - ldr r1, _080650A8 - ldr r4, _080650AC + ldr r1, =0x03005d60 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _080650B0 + ldr r1, =sub_80643B0 + 1 str r1, [r0] - ldr r0, _080650B4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -204407,7 +196335,7 @@ sub_8065068: @ 8065068 movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _080650B8 + ldr r1, =0x02023064 ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -204415,14 +196343,10 @@ sub_8065068: @ 8065068 strb r1, [r0] b _080650CE .align 2, 0 -_080650A8: .4byte 0x03005d60 -_080650AC: .4byte 0x02024064 -_080650B0: .4byte sub_80643B0 + 1 -_080650B4: .4byte 0x02022fec -_080650B8: .4byte 0x02023064 + .pool _080650BC: - ldr r2, _080650D8 - ldr r1, _080650DC + ldr r2, =0x02024068 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -204436,8 +196360,7 @@ _080650CE: pop {r0} bx r0 .align 2, 0 -_080650D8: .4byte 0x02024068 -_080650DC: .4byte 0x0832a328 + .pool thumb_func_end sub_8065068 thumb_func_start dp01t_00_2_getattr @@ -204445,8 +196368,8 @@ dp01t_00_2_getattr: @ 80650E0 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _0806510C - ldr r0, _08065110 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -204454,7 +196377,7 @@ dp01t_00_2_getattr: @ 80650E0 ldrb r0, [r1] cmp r0, 0 bne _08065118 - ldr r0, _08065114 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -204463,9 +196386,7 @@ dp01t_00_2_getattr: @ 80650E0 adds r6, r0, 0 b _0806513A .align 2, 0 -_0806510C: .4byte 0x02023064 -_08065110: .4byte 0x02024064 -_08065114: .4byte 0x0202406e + .pool _08065118: ldrb r4, [r1] movs r5, 0 @@ -204510,8 +196431,8 @@ dp01_getattr_by_ch1_for_opponent_pokemon: @ 8065154 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _08065188 - ldr r3, _0806518C + ldr r2, =0x02023064 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -204522,14 +196443,12 @@ dp01_getattr_by_ch1_for_opponent_pokemon: @ 8065154 bl _080658EA _0806517E: lsls r0, 2 - ldr r1, _08065190 + ldr r1, =_08065194 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08065188: .4byte 0x02023064 -_0806518C: .4byte 0x02024064 -_08065190: .4byte _08065194 + .pool .align 2, 0 _08065194: .4byte _08065284 @@ -204596,7 +196515,7 @@ _08065284: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08065498 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -204649,7 +196568,7 @@ _080652D0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08065498 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -204685,7 +196604,7 @@ _080652D0: ands r0, r6 lsls r0, 5 ldrh r2, [r3, 0x14] - ldr r1, _0806549C + ldr r1, =0xfffffc1f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x14] @@ -204708,7 +196627,7 @@ _080652D0: ands r1, r0 lsls r1, 15 ldr r0, [sp, 0x14] - ldr r2, _080654A0 + ldr r2, =0xfff07fff ands r0, r2 orrs r0, r1 str r0, [sp, 0x14] @@ -204719,7 +196638,7 @@ _080652D0: ands r0, r6 lsls r0, 4 ldrh r2, [r3, 0x16] - ldr r1, _080654A4 + ldr r1, =0xfffffe0f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x16] @@ -204833,28 +196752,25 @@ _08065488: bls _08065488 b _080658EA .align 2, 0 -_08065498: .4byte 0x02024744 -_0806549C: .4byte 0xfffffc1f -_080654A0: .4byte 0xfff07fff -_080654A4: .4byte 0xfffffe0f + .pool _080654A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080654B4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB b _08065822 .align 2, 0 -_080654B4: .4byte 0x02024744 + .pool _080654B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080654C4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xC b _08065822 .align 2, 0 -_080654C4: .4byte 0x02024744 + .pool _080654C8: movs r6, 0 add r2, sp, 0x58 @@ -204864,7 +196780,7 @@ _080654C8: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0806552C + ldr r0, =0x02024744 adds r4, r1, r0 mov r8, r9 _080654DE: @@ -204888,7 +196804,7 @@ _080654DE: ble _080654DE movs r0, 0x64 muls r0, r5 - ldr r1, _0806552C + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -204906,11 +196822,11 @@ _0806551C: bls _0806551C b _080658EA .align 2, 0 -_0806552C: .4byte 0x02024744 + .pool _08065530: movs r0, 0x64 muls r0, r5 - ldr r1, _08065548 + ldr r1, =0x02024744 adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -204920,13 +196836,13 @@ _08065530: adds r1, 0x9 b _08065822 .align 2, 0 -_08065548: .4byte 0x02024744 + .pool _0806554C: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _08065584 + ldr r2, =0x02024744 mov r8, r2 _08065558: adds r1, r6, 0 @@ -204941,7 +196857,7 @@ _08065558: ble _08065558 movs r0, 0x64 muls r0, r5 - ldr r1, _08065584 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -204950,11 +196866,11 @@ _08065558: adds r6, 0x1 b _080658EA .align 2, 0 -_08065584: .4byte 0x02024744 + .pool _08065588: movs r0, 0x64 muls r0, r5 - ldr r1, _080655A0 + ldr r1, =0x02024744 adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -204964,20 +196880,20 @@ _08065588: adds r1, 0x8 b _080658E2 .align 2, 0 -_080655A0: .4byte 0x02024744 + .pool _080655A4: movs r0, 0x64 muls r0, r5 - ldr r1, _080655B0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1 b _080655BE .align 2, 0 -_080655B0: .4byte 0x02024744 + .pool _080655B4: movs r0, 0x64 muls r0, r5 - ldr r1, _080655E0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x19 _080655BE: @@ -204997,120 +196913,120 @@ _080655BE: movs r6, 0x3 b _080658EA .align 2, 0 -_080655E0: .4byte 0x02024744 + .pool _080655E4: movs r0, 0x64 muls r0, r5 - ldr r1, _080655F0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1A b _080658E2 .align 2, 0 -_080655F0: .4byte 0x02024744 + .pool _080655F4: movs r0, 0x64 muls r0, r5 - ldr r1, _08065600 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1B b _080658E2 .align 2, 0 -_08065600: .4byte 0x02024744 + .pool _08065604: movs r0, 0x64 muls r0, r5 - ldr r1, _08065610 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1C b _080658E2 .align 2, 0 -_08065610: .4byte 0x02024744 + .pool _08065614: movs r0, 0x64 muls r0, r5 - ldr r1, _08065620 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1D b _080658E2 .align 2, 0 -_08065620: .4byte 0x02024744 + .pool _08065624: movs r0, 0x64 muls r0, r5 - ldr r1, _08065630 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1E b _080658E2 .align 2, 0 -_08065630: .4byte 0x02024744 + .pool _08065634: movs r0, 0x64 muls r0, r5 - ldr r1, _08065640 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1F b _080658E2 .align 2, 0 -_08065640: .4byte 0x02024744 + .pool _08065644: movs r0, 0x64 muls r0, r5 - ldr r1, _08065650 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x20 b _080658E2 .align 2, 0 -_08065650: .4byte 0x02024744 + .pool _08065654: movs r0, 0x64 muls r0, r5 - ldr r1, _08065660 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x22 b _080658E2 .align 2, 0 -_08065660: .4byte 0x02024744 + .pool _08065664: movs r0, 0x64 muls r0, r5 - ldr r1, _08065670 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x23 b _080658E2 .align 2, 0 -_08065670: .4byte 0x02024744 + .pool _08065674: movs r0, 0x64 muls r0, r5 - ldr r1, _08065680 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x24 b _080658E2 .align 2, 0 -_08065680: .4byte 0x02024744 + .pool _08065684: movs r0, 0x64 muls r0, r5 - ldr r1, _08065690 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x25 b _080658E2 .align 2, 0 -_08065690: .4byte 0x02024744 + .pool _08065694: movs r0, 0x64 muls r0, r5 - ldr r1, _080656A0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x26 b _080658E2 .align 2, 0 -_080656A0: .4byte 0x02024744 + .pool _080656A4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _080656F0 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -205139,83 +197055,83 @@ _080656A4: movs r6, 0x6 b _080658EA .align 2, 0 -_080656F0: .4byte 0x02024744 + .pool _080656F4: movs r0, 0x64 muls r0, r5 - ldr r1, _08065700 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x27 b _080658E2 .align 2, 0 -_08065700: .4byte 0x02024744 + .pool _08065704: movs r0, 0x64 muls r0, r5 - ldr r1, _08065710 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x28 b _080658E2 .align 2, 0 -_08065710: .4byte 0x02024744 + .pool _08065714: movs r0, 0x64 muls r0, r5 - ldr r1, _08065720 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x29 b _080658E2 .align 2, 0 -_08065720: .4byte 0x02024744 + .pool _08065724: movs r0, 0x64 muls r0, r5 - ldr r1, _08065730 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2A b _080658E2 .align 2, 0 -_08065730: .4byte 0x02024744 + .pool _08065734: movs r0, 0x64 muls r0, r5 - ldr r1, _08065740 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2B b _080658E2 .align 2, 0 -_08065740: .4byte 0x02024744 + .pool _08065744: movs r0, 0x64 muls r0, r5 - ldr r1, _08065750 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2C b _080658E2 .align 2, 0 -_08065750: .4byte 0x02024744 + .pool _08065754: movs r0, 0x64 muls r0, r5 - ldr r1, _08065760 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0 b _0806577E .align 2, 0 -_08065760: .4byte 0x02024744 + .pool _08065764: movs r0, 0x64 muls r0, r5 - ldr r1, _08065770 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x9 b _08065822 .align 2, 0 -_08065770: .4byte 0x02024744 + .pool _08065774: movs r0, 0x64 muls r0, r5 - ldr r1, _080657A4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x37 _0806577E: @@ -205237,74 +197153,74 @@ _0806577E: movs r6, 0x4 b _080658EA .align 2, 0 -_080657A4: .4byte 0x02024744 + .pool _080657A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080657B4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x38 b _080658E2 .align 2, 0 -_080657B4: .4byte 0x02024744 + .pool _080657B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080657C4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 b _08065822 .align 2, 0 -_080657C4: .4byte 0x02024744 + .pool _080657C8: movs r0, 0x64 muls r0, r5 - ldr r1, _080657D4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A b _08065822 .align 2, 0 -_080657D4: .4byte 0x02024744 + .pool _080657D8: movs r0, 0x64 muls r0, r5 - ldr r1, _080657E4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3B b _08065822 .align 2, 0 -_080657E4: .4byte 0x02024744 + .pool _080657E8: movs r0, 0x64 muls r0, r5 - ldr r1, _080657F4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3C b _08065822 .align 2, 0 -_080657F4: .4byte 0x02024744 + .pool _080657F8: movs r0, 0x64 muls r0, r5 - ldr r1, _08065804 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3D b _08065822 .align 2, 0 -_08065804: .4byte 0x02024744 + .pool _08065808: movs r0, 0x64 muls r0, r5 - ldr r1, _08065814 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3E b _08065822 .align 2, 0 -_08065814: .4byte 0x02024744 + .pool _08065818: movs r0, 0x64 muls r0, r5 - ldr r1, _08065834 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3F _08065822: @@ -205317,101 +197233,101 @@ _08065822: movs r6, 0x2 b _080658EA .align 2, 0 -_08065834: .4byte 0x02024744 + .pool _08065838: movs r0, 0x64 muls r0, r5 - ldr r1, _08065844 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x16 b _080658E2 .align 2, 0 -_08065844: .4byte 0x02024744 + .pool _08065848: movs r0, 0x64 muls r0, r5 - ldr r1, _08065854 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x17 b _080658E2 .align 2, 0 -_08065854: .4byte 0x02024744 + .pool _08065858: movs r0, 0x64 muls r0, r5 - ldr r1, _08065864 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x18 b _080658E2 .align 2, 0 -_08065864: .4byte 0x02024744 + .pool _08065868: movs r0, 0x64 muls r0, r5 - ldr r1, _08065874 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x21 b _080658E2 .align 2, 0 -_08065874: .4byte 0x02024744 + .pool _08065878: movs r0, 0x64 muls r0, r5 - ldr r1, _08065884 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2F b _080658E2 .align 2, 0 -_08065884: .4byte 0x02024744 + .pool _08065888: movs r0, 0x64 muls r0, r5 - ldr r1, _08065894 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x30 b _080658E2 .align 2, 0 -_08065894: .4byte 0x02024744 + .pool _08065898: movs r0, 0x64 muls r0, r5 - ldr r1, _080658A4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x32 b _080658E2 .align 2, 0 -_080658A4: .4byte 0x02024744 + .pool _080658A8: movs r0, 0x64 muls r0, r5 - ldr r1, _080658B4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x33 b _080658E2 .align 2, 0 -_080658B4: .4byte 0x02024744 + .pool _080658B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080658C4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x34 b _080658E2 .align 2, 0 -_080658C4: .4byte 0x02024744 + .pool _080658C8: movs r0, 0x64 muls r0, r5 - ldr r1, _080658D4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x35 b _080658E2 .align 2, 0 -_080658D4: .4byte 0x02024744 + .pool _080658D8: movs r0, 0x64 muls r0, r5 - ldr r1, _080658FC + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x36 _080658E2: @@ -205429,7 +197345,7 @@ _080658EA: pop {r1} bx r1 .align 2, 0 -_080658FC: .4byte 0x02024744 + .pool thumb_func_end dp01_getattr_by_ch1_for_opponent_pokemon thumb_func_start sub_8065900 @@ -205443,8 +197359,8 @@ sub_8065900: @ 8065900 thumb_func_start sub_806590C sub_806590C: @ 806590C push {r4,r5,lr} - ldr r1, _08065930 - ldr r0, _08065934 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -205452,16 +197368,14 @@ sub_806590C: @ 806590C ldrb r0, [r1] cmp r0, 0 bne _0806593C - ldr r0, _08065938 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_8065964 b _0806595A .align 2, 0 -_08065930: .4byte 0x02023064 -_08065934: .4byte 0x02024064 -_08065938: .4byte 0x0202406e + .pool _0806593C: ldrb r4, [r1] movs r5, 0 @@ -205496,10 +197410,10 @@ sub_8065964: @ 8065964 sub sp, 0x38 lsls r0, 24 lsrs r5, r0, 24 - ldr r3, _0806599C + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 - ldr r2, _080659A0 + ldr r2, =0x02023067 adds r4, r0, r2 adds r7, r4, 0 subs r1, r2, 0x2 @@ -205512,14 +197426,12 @@ sub_8065964: @ 8065964 bl _08066270 _08065992: lsls r0, 2 - ldr r1, _080659A4 + ldr r1, =_080659A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806599C: .4byte 0x02024064 -_080659A0: .4byte 0x02023067 -_080659A4: .4byte _080659A8 + .pool .align 2, 0 _080659A8: .4byte _08065A98 @@ -205586,7 +197498,7 @@ _08065A98: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08065C2C + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -205653,7 +197565,7 @@ _08065AFE: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08065C2C + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -205763,11 +197675,11 @@ _08065AFE: bl pokemon_setattr b _08066270 .align 2, 0 -_08065C2C: .4byte 0x02024744 + .pool _08065C30: movs r0, 0x64 muls r0, r5 - ldr r1, _08065C48 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -205776,11 +197688,11 @@ _08065C30: bl pokemon_setattr b _08066270 .align 2, 0 -_08065C48: .4byte 0x02024744 + .pool _08065C4C: movs r0, 0x64 muls r0, r5 - ldr r1, _08065C64 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -205789,7 +197701,7 @@ _08065C4C: bl pokemon_setattr b _08066270 .align 2, 0 -_08065C64: .4byte 0x02024744 + .pool _08065C68: movs r0, 0 mov r8, r0 @@ -205799,7 +197711,7 @@ _08065C68: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08065CB8 + ldr r0, =0x02024744 adds r7, r1, r0 adds r6, r4, 0 adds r6, 0x8 @@ -205823,20 +197735,20 @@ _08065C80: ble _08065C80 movs r0, 0x64 muls r0, r5 - ldr r1, _08065CB8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x15 mov r2, r9 bl pokemon_setattr b _08066270 .align 2, 0 -_08065CB8: .4byte 0x02024744 + .pool _08065CBC: movs r0, 0x64 muls r0, r5 - ldr r1, _08065CD4 + ldr r1, =0x02024744 adds r0, r1 - ldr r3, _08065CD8 + ldr r3, =0x02023064 ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -205845,13 +197757,12 @@ _08065CBC: adds r1, 0x9 b _08065D5A .align 2, 0 -_08065CD4: .4byte 0x02024744 -_08065CD8: .4byte 0x02023064 + .pool _08065CDC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08065D40 + ldr r0, =0x02024744 adds r4, r0 ldrb r2, [r6] lsls r2, 9 @@ -205894,13 +197805,13 @@ _08065CDC: bl pokemon_setattr b _08066270 .align 2, 0 -_08065D40: .4byte 0x02024744 + .pool _08065D44: movs r0, 0x64 muls r0, r5 - ldr r1, _08065D64 + ldr r1, =0x02024744 adds r0, r1 - ldr r3, _08065D68 + ldr r3, =0x02023064 ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -205913,12 +197824,11 @@ _08065D5A: bl pokemon_setattr b _08066270 .align 2, 0 -_08065D64: .4byte 0x02024744 -_08065D68: .4byte 0x02023064 + .pool _08065D6C: movs r0, 0x64 muls r0, r5 - ldr r1, _08065D84 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -205927,11 +197837,11 @@ _08065D6C: bl pokemon_setattr b _08066270 .align 2, 0 -_08065D84: .4byte 0x02024744 + .pool _08065D88: movs r0, 0x64 muls r0, r5 - ldr r1, _08065DA0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -205940,11 +197850,11 @@ _08065D88: bl pokemon_setattr b _08066270 .align 2, 0 -_08065DA0: .4byte 0x02024744 + .pool _08065DA4: movs r0, 0x64 muls r0, r5 - ldr r1, _08065DBC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -205953,11 +197863,11 @@ _08065DA4: bl pokemon_setattr b _08066270 .align 2, 0 -_08065DBC: .4byte 0x02024744 + .pool _08065DC0: movs r0, 0x64 muls r0, r5 - ldr r1, _08065DD8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -205966,11 +197876,11 @@ _08065DC0: bl pokemon_setattr b _08066270 .align 2, 0 -_08065DD8: .4byte 0x02024744 + .pool _08065DDC: movs r0, 0x64 muls r0, r5 - ldr r1, _08065DF4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -205979,11 +197889,11 @@ _08065DDC: bl pokemon_setattr b _08066270 .align 2, 0 -_08065DF4: .4byte 0x02024744 + .pool _08065DF8: movs r0, 0x64 muls r0, r5 - ldr r1, _08065E10 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -205992,11 +197902,11 @@ _08065DF8: bl pokemon_setattr b _08066270 .align 2, 0 -_08065E10: .4byte 0x02024744 + .pool _08065E14: movs r0, 0x64 muls r0, r5 - ldr r1, _08065E2C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206005,11 +197915,11 @@ _08065E14: bl pokemon_setattr b _08066270 .align 2, 0 -_08065E2C: .4byte 0x02024744 + .pool _08065E30: movs r0, 0x64 muls r0, r5 - ldr r1, _08065E48 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206018,11 +197928,11 @@ _08065E30: bl pokemon_setattr b _08066270 .align 2, 0 -_08065E48: .4byte 0x02024744 + .pool _08065E4C: movs r0, 0x64 muls r0, r5 - ldr r1, _08065E64 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206031,11 +197941,11 @@ _08065E4C: bl pokemon_setattr b _08066270 .align 2, 0 -_08065E64: .4byte 0x02024744 + .pool _08065E68: movs r0, 0x64 muls r0, r5 - ldr r1, _08065E80 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206044,11 +197954,11 @@ _08065E68: bl pokemon_setattr b _08066270 .align 2, 0 -_08065E80: .4byte 0x02024744 + .pool _08065E84: movs r0, 0x64 muls r0, r5 - ldr r1, _08065E9C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206057,11 +197967,11 @@ _08065E84: bl pokemon_setattr b _08066270 .align 2, 0 -_08065E9C: .4byte 0x02024744 + .pool _08065EA0: movs r0, 0x64 muls r0, r5 - ldr r1, _08065EB8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206070,11 +197980,11 @@ _08065EA0: bl pokemon_setattr b _08066270 .align 2, 0 -_08065EB8: .4byte 0x02024744 + .pool _08065EBC: movs r0, 0x64 muls r0, r5 - ldr r1, _08065ED4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206083,11 +197993,11 @@ _08065EBC: bl pokemon_setattr b _08066270 .align 2, 0 -_08065ED4: .4byte 0x02024744 + .pool _08065ED8: movs r0, 0x64 muls r0, r5 - ldr r1, _08065EF0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206096,12 +198006,12 @@ _08065ED8: bl pokemon_setattr b _08066270 .align 2, 0 -_08065EF0: .4byte 0x02024744 + .pool _08065EF4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08065F64 + ldr r0, =0x02024744 adds r4, r0 ldrb r2, [r6] lsls r2, 9 @@ -206150,11 +198060,11 @@ _08065EF4: adds r0, r4, 0 b _08066002 .align 2, 0 -_08065F64: .4byte 0x02024744 + .pool _08065F68: movs r0, 0x64 muls r0, r5 - ldr r1, _08065F80 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206163,11 +198073,11 @@ _08065F68: bl pokemon_setattr b _08066270 .align 2, 0 -_08065F80: .4byte 0x02024744 + .pool _08065F84: movs r0, 0x64 muls r0, r5 - ldr r1, _08065F9C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206176,11 +198086,11 @@ _08065F84: bl pokemon_setattr b _08066270 .align 2, 0 -_08065F9C: .4byte 0x02024744 + .pool _08065FA0: movs r0, 0x64 muls r0, r5 - ldr r1, _08065FB8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206189,11 +198099,11 @@ _08065FA0: bl pokemon_setattr b _08066270 .align 2, 0 -_08065FB8: .4byte 0x02024744 + .pool _08065FBC: movs r0, 0x64 muls r0, r5 - ldr r1, _08065FD4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206202,11 +198112,11 @@ _08065FBC: bl pokemon_setattr b _08066270 .align 2, 0 -_08065FD4: .4byte 0x02024744 + .pool _08065FD8: movs r0, 0x64 muls r0, r5 - ldr r1, _08065FF0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206215,11 +198125,11 @@ _08065FD8: bl pokemon_setattr b _08066270 .align 2, 0 -_08065FF0: .4byte 0x02024744 + .pool _08065FF4: movs r0, 0x64 muls r0, r5 - ldr r1, _0806600C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206229,11 +198139,11 @@ _08066002: bl pokemon_setattr b _08066270 .align 2, 0 -_0806600C: .4byte 0x02024744 + .pool _08066010: movs r0, 0x64 muls r0, r5 - ldr r1, _08066028 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206242,11 +198152,11 @@ _08066010: bl pokemon_setattr b _08066270 .align 2, 0 -_08066028: .4byte 0x02024744 + .pool _0806602C: movs r0, 0x64 muls r0, r5 - ldr r1, _08066044 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206255,11 +198165,11 @@ _0806602C: bl pokemon_setattr b _08066270 .align 2, 0 -_08066044: .4byte 0x02024744 + .pool _08066048: movs r0, 0x64 muls r0, r5 - ldr r1, _08066060 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206268,11 +198178,11 @@ _08066048: bl pokemon_setattr b _08066270 .align 2, 0 -_08066060: .4byte 0x02024744 + .pool _08066064: movs r0, 0x64 muls r0, r5 - ldr r1, _0806607C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206281,11 +198191,11 @@ _08066064: bl pokemon_setattr b _08066270 .align 2, 0 -_0806607C: .4byte 0x02024744 + .pool _08066080: movs r0, 0x64 muls r0, r5 - ldr r1, _08066098 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206294,11 +198204,11 @@ _08066080: bl pokemon_setattr b _08066270 .align 2, 0 -_08066098: .4byte 0x02024744 + .pool _0806609C: movs r0, 0x64 muls r0, r5 - ldr r1, _080660B4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206307,11 +198217,11 @@ _0806609C: bl pokemon_setattr b _08066270 .align 2, 0 -_080660B4: .4byte 0x02024744 + .pool _080660B8: movs r0, 0x64 muls r0, r5 - ldr r1, _080660D0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206320,11 +198230,11 @@ _080660B8: bl pokemon_setattr b _08066270 .align 2, 0 -_080660D0: .4byte 0x02024744 + .pool _080660D4: movs r0, 0x64 muls r0, r5 - ldr r1, _080660EC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206333,11 +198243,11 @@ _080660D4: bl pokemon_setattr b _08066270 .align 2, 0 -_080660EC: .4byte 0x02024744 + .pool _080660F0: movs r0, 0x64 muls r0, r5 - ldr r1, _08066108 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206346,11 +198256,11 @@ _080660F0: bl pokemon_setattr b _08066270 .align 2, 0 -_08066108: .4byte 0x02024744 + .pool _0806610C: movs r0, 0x64 muls r0, r5 - ldr r1, _08066124 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206359,11 +198269,11 @@ _0806610C: bl pokemon_setattr b _08066270 .align 2, 0 -_08066124: .4byte 0x02024744 + .pool _08066128: movs r0, 0x64 muls r0, r5 - ldr r1, _08066140 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206372,11 +198282,11 @@ _08066128: bl pokemon_setattr b _08066270 .align 2, 0 -_08066140: .4byte 0x02024744 + .pool _08066144: movs r0, 0x64 muls r0, r5 - ldr r1, _0806615C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206385,11 +198295,11 @@ _08066144: bl pokemon_setattr b _08066270 .align 2, 0 -_0806615C: .4byte 0x02024744 + .pool _08066160: movs r0, 0x64 muls r0, r5 - ldr r1, _08066178 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206398,11 +198308,11 @@ _08066160: bl pokemon_setattr b _08066270 .align 2, 0 -_08066178: .4byte 0x02024744 + .pool _0806617C: movs r0, 0x64 muls r0, r5 - ldr r1, _08066194 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206411,11 +198321,11 @@ _0806617C: bl pokemon_setattr b _08066270 .align 2, 0 -_08066194: .4byte 0x02024744 + .pool _08066198: movs r0, 0x64 muls r0, r5 - ldr r1, _080661B0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206424,11 +198334,11 @@ _08066198: bl pokemon_setattr b _08066270 .align 2, 0 -_080661B0: .4byte 0x02024744 + .pool _080661B4: movs r0, 0x64 muls r0, r5 - ldr r1, _080661CC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206437,11 +198347,11 @@ _080661B4: bl pokemon_setattr b _08066270 .align 2, 0 -_080661CC: .4byte 0x02024744 + .pool _080661D0: movs r0, 0x64 muls r0, r5 - ldr r1, _080661E8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206450,11 +198360,11 @@ _080661D0: bl pokemon_setattr b _08066270 .align 2, 0 -_080661E8: .4byte 0x02024744 + .pool _080661EC: movs r0, 0x64 muls r0, r5 - ldr r1, _08066204 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206463,11 +198373,11 @@ _080661EC: bl pokemon_setattr b _08066270 .align 2, 0 -_08066204: .4byte 0x02024744 + .pool _08066208: movs r0, 0x64 muls r0, r5 - ldr r1, _08066220 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206476,11 +198386,11 @@ _08066208: bl pokemon_setattr b _08066270 .align 2, 0 -_08066220: .4byte 0x02024744 + .pool _08066224: movs r0, 0x64 muls r0, r5 - ldr r1, _0806623C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206489,11 +198399,11 @@ _08066224: bl pokemon_setattr b _08066270 .align 2, 0 -_0806623C: .4byte 0x02024744 + .pool _08066240: movs r0, 0x64 muls r0, r5 - ldr r1, _08066258 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206502,11 +198412,11 @@ _08066240: bl pokemon_setattr b _08066270 .align 2, 0 -_08066258: .4byte 0x02024744 + .pool _0806625C: movs r0, 0x64 muls r0, r5 - ldr r1, _08066280 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -206523,14 +198433,14 @@ _08066270: pop {r0} bx r0 .align 2, 0 -_08066280: .4byte 0x02024744 + .pool thumb_func_end sub_8065964 thumb_func_start sub_8066284 sub_8066284: @ 8066284 push {r4-r7,lr} - ldr r1, _080662E8 - ldr r7, _080662EC + ldr r1, =0x0202406e + ldr r7, =0x02024064 ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -206538,12 +198448,12 @@ sub_8066284: @ 8066284 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, _080662F0 + ldr r4, =0x02023064 lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 ldrb r0, [r0] - ldr r1, _080662F4 + ldr r1, =0x02024744 adds r0, r1 adds r5, r3, r0 movs r3, 0 @@ -206579,10 +198489,7 @@ _080662DC: pop {r0} bx r0 .align 2, 0 -_080662E8: .4byte 0x0202406e -_080662EC: .4byte 0x02024064 -_080662F0: .4byte 0x02023064 -_080662F4: .4byte 0x02024744 + .pool thumb_func_end sub_8066284 thumb_func_start sub_80662F8 @@ -206592,8 +198499,8 @@ sub_80662F8: @ 80662F8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r7, _08066420 - ldr r6, _08066424 + ldr r7, =0x0202406e + ldr r6, =0x02024064 ldrb r0, [r6] lsls r0, 1 adds r0, r7 @@ -206603,7 +198510,7 @@ sub_80662F8: @ 80662F8 mov r2, r10 muls r2, r0 adds r0, r2, 0 - ldr r1, _08066428 + ldr r1, =0x02024744 mov r9, r1 add r0, r9 movs r1, 0xB @@ -206627,7 +198534,7 @@ sub_80662F8: @ 80662F8 lsrs r1, 24 adds r0, r4, 0 bl sub_806A068 - ldr r0, _0806642C + ldr r0, =0x0202499c mov r8, r0 ldrb r0, [r6] movs r1, 0x2 @@ -206649,11 +198556,11 @@ sub_80662F8: @ 80662F8 adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _08066430 + ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, _08066434 + ldr r5, =0x02020630 ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -206661,7 +198568,7 @@ sub_80662F8: @ 80662F8 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08066438 + ldr r1, =0x0000ff10 strh r1, [r0, 0x24] ldrb r2, [r6] adds r0, r2, r4 @@ -206691,7 +198598,7 @@ sub_80662F8: @ 80662F8 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0806643C + ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] bl obj_anim_image_start @@ -206710,11 +198617,11 @@ sub_80662F8: @ 80662F8 lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, _08066440 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _08066444 + ldr r1, =sub_8064B04 + 1 str r1, [r0] pop {r3-r5} mov r8, r3 @@ -206724,27 +198631,18 @@ sub_80662F8: @ 80662F8 pop {r0} bx r0 .align 2, 0 -_08066420: .4byte 0x0202406e -_08066424: .4byte 0x02024064 -_08066428: .4byte 0x02024744 -_0806642C: .4byte 0x0202499c -_08066430: .4byte 0x020241e4 -_08066434: .4byte 0x02020630 -_08066438: .4byte 0x0000ff10 -_0806643C: .4byte 0x020244e4 -_08066440: .4byte 0x03005d60 -_08066444: .4byte sub_8064B04 + 1 + .pool thumb_func_end sub_80662F8 thumb_func_start sub_8066448 sub_8066448: @ 8066448 push {r4,lr} - ldr r1, _08066480 - ldr r4, _08066484 + ldr r1, =0x0202406e + ldr r4, =0x02024064 ldrb r0, [r4] lsls r2, r0, 1 adds r2, r1 - ldr r3, _08066488 + ldr r3, =0x02023064 lsls r0, 9 adds r1, r3, 0x1 adds r0, r1 @@ -206756,21 +198654,17 @@ sub_8066448: @ 8066448 adds r1, r3 ldrb r1, [r1] bl sub_8066494 - ldr r1, _0806648C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08066490 + ldr r1, =sub_8064F40 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08066480: .4byte 0x0202406e -_08066484: .4byte 0x02024064 -_08066488: .4byte 0x02023064 -_0806648C: .4byte 0x03005d60 -_08066490: .4byte sub_8064F40 + 1 + .pool thumb_func_end sub_8066448 thumb_func_start sub_8066494 @@ -206787,10 +198681,10 @@ sub_8066494: @ 8066494 lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, _080665FC + ldr r0, =0x0202406e lsls r4, r6, 1 adds r4, r0 - ldr r0, _08066600 + ldr r0, =0x02023064 lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -206802,7 +198696,7 @@ sub_8066494: @ 8066494 mov r1, r9 muls r1, r0 adds r0, r1, 0 - ldr r5, _08066604 + ldr r5, =0x02024744 adds r0, r5 movs r1, 0xB bl pokemon_getattr @@ -206810,9 +198704,9 @@ sub_8066494: @ 8066494 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _08066608 + ldr r0, =sub_805D714 + 1 bl object_new_hidden_with_callback - ldr r1, _0806660C + ldr r1, =0x03005d7c mov r10, r1 add r10, r6 mov r1, r10 @@ -206831,7 +198725,7 @@ sub_8066494: @ 8066494 lsrs r1, 24 mov r0, r8 bl sub_806A068 - ldr r0, _08066610 + ldr r0, =0x0202499c mov r9, r0 adds r0, r6, 0 movs r1, 0x2 @@ -206853,10 +198747,10 @@ sub_8066494: @ 8066494 adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _08066614 + ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] - ldr r5, _08066618 + ldr r5, =0x02020630 mov r0, r10 ldrb r1, [r0] lsls r0, r1, 4 @@ -206901,7 +198795,7 @@ sub_8066494: @ 8066494 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0806661C + ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] bl obj_anim_image_start @@ -206922,7 +198816,7 @@ sub_8066494: @ 8066494 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08066620 + ldr r1, =nullsub_12 + 1 str r1, [r0] movs r0, 0 movs r1, 0xFE @@ -206944,23 +198838,14 @@ sub_8066494: @ 8066494 pop {r0} bx r0 .align 2, 0 -_080665FC: .4byte 0x0202406e -_08066600: .4byte 0x02023064 -_08066604: .4byte 0x02024744 -_08066608: .4byte sub_805D714 + 1 -_0806660C: .4byte 0x03005d7c -_08066610: .4byte 0x0202499c -_08066614: .4byte 0x020241e4 -_08066618: .4byte 0x02020630 -_0806661C: .4byte 0x020244e4 -_08066620: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8066494 thumb_func_start sub_8066624 sub_8066624: @ 8066624 push {r4-r6,lr} - ldr r1, _08066658 - ldr r6, _0806665C + ldr r1, =0x02023064 + ldr r6, =0x02024064 ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -206968,7 +198853,7 @@ sub_8066624: @ 8066624 ldrb r3, [r0] cmp r3, 0 bne _0806666C - ldr r0, _08066660 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -206976,27 +198861,23 @@ sub_8066624: @ 8066624 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, _08066664 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _08066668 + ldr r1, =sub_80666BC + 1 str r1, [r0] b _080666A8 .align 2, 0 -_08066658: .4byte 0x02023064 -_0806665C: .4byte 0x02024064 -_08066660: .4byte 0x020244d0 -_08066664: .4byte 0x03005d60 -_08066668: .4byte sub_80666BC + 1 + .pool _0806666C: - ldr r5, _080666B0 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080666B4 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -207009,7 +198890,7 @@ _0806666C: bl obj_delete_and_free_tiles ldrb r0, [r6] bl sub_805EEE0 - ldr r1, _080666B8 + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -207020,17 +198901,15 @@ _080666A8: pop {r0} bx r0 .align 2, 0 -_080666B0: .4byte 0x020241e4 -_080666B4: .4byte 0x02020630 -_080666B8: .4byte 0x03005d70 + .pool thumb_func_end sub_8066624 thumb_func_start sub_80666BC sub_80666BC: @ 80666BC push {r4-r6,lr} - ldr r6, _080666DC + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _080666E0 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -207044,8 +198923,7 @@ sub_80666BC: @ 80666BC beq _08066712 b _0806673A .align 2, 0 -_080666DC: .4byte 0x020244d0 -_080666E0: .4byte 0x02024064 + .pool _080666E4: ldr r1, [r4] lsls r0, r2, 2 @@ -207084,19 +198962,18 @@ _08066712: adds r1, r2, 0 movs r3, 0x2 bl move_anim_start_t4 - ldr r1, _08066740 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08066744 + ldr r1, =sub_8064C58 + 1 str r1, [r0] _0806673A: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08066740: .4byte 0x03005d60 -_08066744: .4byte sub_8064C58 + 1 + .pool thumb_func_end sub_80666BC thumb_func_start sub_8066748 @@ -207105,13 +198982,13 @@ sub_8066748: @ 8066748 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r4, _08066788 + ldr r4, =0x02022fec ldr r0, [r4] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _08066840 - ldr r5, _0806678C + ldr r5, =0x02024064 ldrb r0, [r5] bl battle_get_per_side_status movs r1, 0x2 @@ -207130,14 +199007,12 @@ _08066770: ldrb r0, [r5] cmp r0, 0x1 bne _08066794 - ldr r0, _08066790 + ldr r0, =0x02038bca b _08066796 .align 2, 0 -_08066788: .4byte 0x02022fec -_0806678C: .4byte 0x02024064 -_08066790: .4byte 0x02038bca + .pool _08066794: - ldr r0, _080667A4 + ldr r0, =0x02038bcc _08066796: ldrh r0, [r0] bl sub_8162AA0 @@ -207145,11 +199020,11 @@ _08066796: lsrs r0, 24 b _0806694C .align 2, 0 -_080667A4: .4byte 0x02038bcc + .pool _080667A8: ldrb r0, [r5] bl sub_806D864 - ldr r6, _080667F0 + ldr r6, =0x020229e8 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -207181,7 +199056,7 @@ _080667D8: bne _080668AA b _080668BC .align 2, 0 -_080667F0: .4byte 0x020229e8 + .pool _080667F4: ldrb r0, [r5] bl sub_806D864 @@ -207221,7 +199096,7 @@ _08066838: b _0806693A _08066840: movs r7, 0xB0 - ldr r0, _08066854 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 @@ -207230,10 +199105,10 @@ _08066840: bl sub_8068B48 b _08066948 .align 2, 0 -_08066854: .4byte 0x02038bca + .pool _08066858: bl link_get_multiplayer_id - ldr r6, _080668B4 + ldr r6, =0x020229e8 movs r5, 0x1 eors r0, r5 lsls r0, 24 @@ -207272,20 +199147,19 @@ _08066892: cmp r0, 0 beq _080668BC _080668AA: - ldr r0, _080668B8 + ldr r0, =0x0831f578 adds r0, 0x4F ldrb r0, [r0] b _0806694C .align 2, 0 -_080668B4: .4byte 0x020229e8 -_080668B8: .4byte 0x0831f578 + .pool _080668BC: - ldr r0, _080668C4 + ldr r0, =0x0831f578 adds r0, 0x4E ldrb r0, [r0] b _0806694C .align 2, 0 -_080668C4: .4byte 0x0831f578 + .pool _080668C8: bl link_get_multiplayer_id eors r0, r5 @@ -207325,19 +199199,19 @@ _080668FE: cmp r0, 0 beq _08066924 _08066916: - ldr r0, _08066920 + ldr r0, =0x0831f578 adds r0, 0x51 ldrb r0, [r0] b _0806694C .align 2, 0 -_08066920: .4byte 0x0831f578 + .pool _08066924: - ldr r0, _0806692C + ldr r0, =0x0831f578 adds r0, 0x50 ldrb r0, [r0] b _0806694C .align 2, 0 -_0806692C: .4byte 0x0831f578 + .pool _08066930: bl link_get_multiplayer_id eors r0, r5 @@ -207355,7 +199229,7 @@ _08066948: lsrs r0, 16 _0806694C: mov r8, r0 - ldr r5, _08066A30 + ldr r5, =0x02024064 ldrb r1, [r5] bl sub_805DF38 ldrb r0, [r5] @@ -207365,9 +199239,9 @@ _0806694C: lsrs r1, 24 mov r0, r8 bl template_build_for_pokemon_or_trainer - ldr r6, _08066A34 + ldr r6, =0x0202499c mov r9, r7 - ldr r1, _08066A38 + ldr r1, =0x083054e0 mov r2, r8 lsls r0, r2, 2 adds r0, r1 @@ -207388,11 +199262,11 @@ _0806694C: mov r1, r9 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r6, _08066A3C + ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _08066A40 + ldr r4, =0x02020630 ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -207400,7 +199274,7 @@ _0806694C: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08066A44 + ldr r1, =0x0000ff10 strh r1, [r0, 0x24] ldrb r0, [r5] adds r0, r6 @@ -207411,7 +199285,7 @@ _0806694C: adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x2E] - ldr r1, _08066A48 + ldr r1, =0x0830593c mov r2, r8 lsls r0, r2, 3 adds r0, r1 @@ -207447,13 +199321,13 @@ _0806694C: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _08066A4C + ldr r1, =sub_805D7AC + 1 str r1, [r0] - ldr r1, _08066A50 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08066A54 + ldr r1, =sub_8064400 + 1 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -207462,16 +199336,7 @@ _0806694C: pop {r0} bx r0 .align 2, 0 -_08066A30: .4byte 0x02024064 -_08066A34: .4byte 0x0202499c -_08066A38: .4byte 0x083054e0 -_08066A3C: .4byte 0x020241e4 -_08066A40: .4byte 0x02020630 -_08066A44: .4byte 0x0000ff10 -_08066A48: .4byte 0x0830593c -_08066A4C: .4byte sub_805D7AC + 1 -_08066A50: .4byte 0x03005d60 -_08066A54: .4byte sub_8064400 + 1 + .pool thumb_func_end sub_8066748 thumb_func_start sub_8066A58 @@ -207479,24 +199344,23 @@ sub_8066A58: @ 8066A58 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _08066A6C + ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 bne _08066A74 - ldr r0, _08066A70 + ldr r0, =0x02038bca b _08066A76 .align 2, 0 -_08066A6C: .4byte 0x02024064 -_08066A70: .4byte 0x02038bca + .pool _08066A74: - ldr r0, _08066B68 + ldr r0, =0x02038bcc _08066A76: ldrh r0, [r0] bl sub_8162AA0 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r6, _08066B6C + ldr r6, =0x02024064 ldrb r1, [r6] bl sub_805DF38 ldrb r0, [r6] @@ -207506,8 +199370,8 @@ _08066A76: lsrs r1, 24 mov r0, r8 bl template_build_for_pokemon_or_trainer - ldr r0, _08066B70 - ldr r2, _08066B74 + ldr r0, =0x0202499c + ldr r2, =0x083054e0 mov r3, r8 lsls r1, r3, 2 adds r1, r2 @@ -207522,11 +199386,11 @@ _08066A76: movs r1, 0xB0 movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r5, _08066B78 + ldr r5, =0x020241e4 ldrb r1, [r6] adds r1, r5 strb r0, [r1] - ldr r4, _08066B7C + ldr r4, =0x02020630 ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] @@ -207553,9 +199417,9 @@ _08066A76: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08066B80 + ldr r1, =0x0000fffe strh r1, [r0, 0x2E] - ldr r1, _08066B84 + ldr r1, =0x0830593c mov r2, r8 lsls r0, r2, 3 adds r0, r1 @@ -207591,13 +199455,13 @@ _08066A76: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _08066B88 + ldr r1, =sub_805D7AC + 1 str r1, [r0] - ldr r1, _08066B8C + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _08066B90 + ldr r1, =sub_8064438 + 1 str r1, [r0] bl sub_8065068 pop {r3} @@ -207606,31 +199470,21 @@ _08066A76: pop {r0} bx r0 .align 2, 0 -_08066B68: .4byte 0x02038bcc -_08066B6C: .4byte 0x02024064 -_08066B70: .4byte 0x0202499c -_08066B74: .4byte 0x083054e0 -_08066B78: .4byte 0x020241e4 -_08066B7C: .4byte 0x02020630 -_08066B80: .4byte 0x0000fffe -_08066B84: .4byte 0x0830593c -_08066B88: .4byte sub_805D7AC + 1 -_08066B8C: .4byte 0x03005d60 -_08066B90: .4byte sub_8064438 + 1 + .pool thumb_func_end sub_8066A58 thumb_func_start sub_8066B94 sub_8066B94: @ 8066B94 push {r4-r6,lr} - ldr r6, _08066C24 - ldr r4, _08066C28 + ldr r6, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08066C2C + ldr r5, =0x02020630 adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -207670,7 +199524,7 @@ sub_8066B94: @ 8066B94 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08066C30 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -207679,33 +199533,27 @@ sub_8066B94: @ 8066B94 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08066C34 + ldr r1, =nullsub_12 + 1 bl oamt_set_x3A_32 - ldr r1, _08066C38 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08066C3C + ldr r1, =sub_8064470 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08066C24: .4byte 0x020241e4 -_08066C28: .4byte 0x02024064 -_08066C2C: .4byte 0x02020630 -_08066C30: .4byte sub_80A6EEC + 1 -_08066C34: .4byte nullsub_12 + 1 -_08066C38: .4byte 0x03005d60 -_08066C3C: .4byte sub_8064470 + 1 + .pool thumb_func_end sub_8066B94 thumb_func_start sub_8066C40 sub_8066C40: @ 8066C40 push {r4-r6,lr} - ldr r6, _08066C8C + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _08066C90 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -207740,8 +199588,7 @@ _08066C74: strb r1, [r0, 0x4] b _08066CD0 .align 2, 0 -_08066C8C: .4byte 0x020244d0 -_08066C90: .4byte 0x02024064 + .pool _08066C94: ldrb r1, [r3] movs r0, 0x40 @@ -207754,8 +199601,8 @@ _08066C94: movs r0, 0x10 movs r1, 0x3F bl audio_play_and_stuff - ldr r2, _08066CD8 - ldr r1, _08066CDC + ldr r2, =0x02020630 + ldr r1, =0x020241e4 ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -207764,24 +199611,20 @@ _08066C94: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _08066CE0 + ldr r1, =sub_8039934 + 1 str r1, [r0] - ldr r1, _08066CE4 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08066CE8 + ldr r1, =sub_8064C14 + 1 str r1, [r0] _08066CD0: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08066CD8: .4byte 0x02020630 -_08066CDC: .4byte 0x020241e4 -_08066CE0: .4byte sub_8039934 + 1 -_08066CE4: .4byte 0x03005d60 -_08066CE8: .4byte sub_8064C14 + 1 + .pool thumb_func_end sub_8066C40 thumb_func_start sub_8066CEC @@ -207821,7 +199664,7 @@ sub_8066D1C: @ 8066D1C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r5, _08066E0C + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 @@ -207829,7 +199672,7 @@ sub_8066D1C: @ 8066D1C beq _08066D32 b _08066E58 _08066D32: - ldr r0, _08066E10 + ldr r0, =0x02023064 mov r12, r0 ldrb r1, [r5] lsls r1, 9 @@ -207842,7 +199685,7 @@ _08066D32: ldrb r0, [r0] lsls r0, 8 orrs r6, r0 - ldr r0, _08066E14 + ldr r0, =0x02038432 mov r8, r0 mov r0, r12 adds r0, 0x3 @@ -207850,7 +199693,7 @@ _08066D32: ldrb r0, [r1] mov r1, r8 strb r0, [r1] - ldr r3, _08066E18 + ldr r3, =0x02038408 ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -207864,7 +199707,7 @@ _08066D32: lsls r0, 8 orrs r2, r0 strh r2, [r3] - ldr r3, _08066E1C + ldr r3, =0x02038404 ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -207890,7 +199733,7 @@ _08066D32: lsls r0, 24 orrs r2, r0 str r2, [r3] - ldr r2, _08066E20 + ldr r2, =0x0203841a ldrb r0, [r5] lsls r0, 9 mov r1, r12 @@ -207898,7 +199741,7 @@ _08066D32: adds r0, r1 ldrb r0, [r0] strb r0, [r2] - ldr r4, _08066E24 + ldr r4, =0x0203841c ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -207912,14 +199755,14 @@ _08066D32: lsls r0, 8 orrs r2, r0 strh r2, [r4] - ldr r7, _08066E28 + ldr r7, =0x02038400 ldrb r1, [r5] lsls r1, 9 mov r0, r12 adds r0, 0x10 adds r1, r0 str r1, [r7] - ldr r2, _08066E2C + ldr r2, =0x020244bc ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -207936,17 +199779,9 @@ _08066D32: bl sub_8065068 b _08066E58 .align 2, 0 -_08066E0C: .4byte 0x02024064 -_08066E10: .4byte 0x02023064 -_08066E14: .4byte 0x02038432 -_08066E18: .4byte 0x02038408 -_08066E1C: .4byte 0x02038404 -_08066E20: .4byte 0x0203841a -_08066E24: .4byte 0x0203841c -_08066E28: .4byte 0x02038400 -_08066E2C: .4byte 0x020244bc + .pool _08066E30: - ldr r0, _08066E64 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -207955,11 +199790,11 @@ _08066E30: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, _08066E68 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08066E6C + ldr r1, =sub_8066E70 + 1 str r1, [r0] ldrh r1, [r4] ldr r2, [r7] @@ -207972,9 +199807,7 @@ _08066E58: pop {r0} bx r0 .align 2, 0 -_08066E64: .4byte 0x020244d0 -_08066E68: .4byte 0x03005d60 -_08066E6C: .4byte sub_8066E70 + 1 + .pool thumb_func_end sub_8066D1C thumb_func_start sub_8066E70 @@ -207984,8 +199817,8 @@ sub_8066E70: @ 8066E70 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _08066EBC - ldr r6, _08066EC0 + ldr r2, =0x02023064 + ldr r6, =0x02024064 ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -208002,7 +199835,7 @@ sub_8066E70: @ 8066E70 adds r1, r2 ldrb r1, [r1] mov r8, r1 - ldr r7, _08066EC4 + ldr r7, =0x020244d0 ldr r5, [r7] ldr r1, [r5, 0x4] lsls r0, r3, 1 @@ -208018,9 +199851,7 @@ sub_8066E70: @ 8066E70 beq _08066ED2 b _08066FE4 .align 2, 0 -_08066EBC: .4byte 0x02023064 -_08066EC0: .4byte 0x02024064 -_08066EC4: .4byte 0x020244d0 + .pool _08066EC8: cmp r2, 0x2 beq _08066F32 @@ -208076,10 +199907,10 @@ _08066F08: strb r1, [r0, 0x4] b _08066FE4 _08066F32: - ldr r0, _08066F98 + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _08066F9C + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _08066FE4 @@ -208113,9 +199944,9 @@ _08066F32: ands r0, r2 strb r0, [r1] _08066F80: - ldr r0, _08066FA0 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08066FA4 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -208126,10 +199957,7 @@ _08066F80: strb r1, [r0, 0x4] b _08066FE4 .align 2, 0 -_08066F98: .4byte 0x020383f8 -_08066F9C: .4byte 0x020383fd -_08066FA0: .4byte 0x020244d0 -_08066FA4: .4byte 0x02024064 + .pool _08066FA8: ldrb r1, [r0] movs r0, 0x40 @@ -208171,26 +199999,26 @@ _08066FE4: thumb_func_start sub_8066FF4 sub_8066FF4: @ 8066FF4 push {r4,r5,lr} - ldr r0, _08067030 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _08067034 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r5, _08067038 + ldr r5, =0x02024064 ldrb r4, [r5] lsls r4, 9 - ldr r0, _0806703C + ldr r0, =0x02023066 adds r4, r0 ldrh r0, [r4] bl battle_pick_message - ldr r0, _08067040 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _08067044 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08067048 + ldr r1, =sub_8064CCC + 1 str r1, [r0] ldrh r0, [r4] bl sub_817C95C @@ -208198,13 +200026,7 @@ sub_8066FF4: @ 8066FF4 pop {r0} bx r0 .align 2, 0 -_08067030: .4byte 0x02022e14 -_08067034: .4byte 0x02022e16 -_08067038: .4byte 0x02024064 -_0806703C: .4byte 0x02023066 -_08067040: .4byte 0x02022e2c -_08067044: .4byte 0x03005d60 -_08067048: .4byte sub_8064CCC + 1 + .pool thumb_func_end sub_8066FF4 thumb_func_start sub_806704C @@ -208272,8 +200094,8 @@ sub_80670A0: @ 80670A0 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _08067118 - ldr r0, _0806711C + ldr r3, =0x02023064 + ldr r0, =0x02024064 mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -208287,16 +200109,16 @@ sub_80670A0: @ 80670A0 orrs r1, r0 lsls r1, 16 asrs r7, r1, 16 - ldr r0, _08067120 + ldr r0, =0x00007fff cmp r7, r0 beq _08067130 - ldr r6, _08067124 + ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _08067128 + ldr r4, =0x02024744 adds r0, r4 movs r1, 0x3A bl pokemon_getattr @@ -208313,7 +200135,7 @@ sub_80670A0: @ 80670A0 adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _0806712C + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -208321,39 +200143,34 @@ sub_80670A0: @ 80670A0 bl sub_807294C b _0806715A .align 2, 0 -_08067118: .4byte 0x02023064 -_0806711C: .4byte 0x02024064 -_08067120: .4byte 0x00007fff -_08067124: .4byte 0x0202406e -_08067128: .4byte 0x02024744 -_0806712C: .4byte 0x03005d70 + .pool _08067130: - ldr r1, _08067178 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0806717C + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A bl pokemon_getattr adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _08067180 + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] movs r3, 0 bl sub_807294C _0806715A: - ldr r1, _08067184 - ldr r0, _08067188 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0806718C + ldr r1, =sub_8064BC0 + 1 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -208363,12 +200180,7 @@ _0806715A: pop {r0} bx r0 .align 2, 0 -_08067178: .4byte 0x0202406e -_0806717C: .4byte 0x02024744 -_08067180: .4byte 0x03005d70 -_08067184: .4byte 0x03005d60 -_08067188: .4byte 0x02024064 -_0806718C: .4byte sub_8064BC0 + 1 + .pool thumb_func_end sub_80670A0 thumb_func_start sub_8067190 @@ -208382,28 +200194,28 @@ sub_8067190: @ 8067190 thumb_func_start sub_806719C sub_806719C: @ 806719C push {r4,lr} - ldr r4, _080671F8 + ldr r4, =0x02024064 ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _080671F0 - ldr r0, _080671FC + ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _08067200 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08067204 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0x9 bl healthbar_draw_field_maybe ldrb r2, [r4] - ldr r0, _08067208 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -208415,36 +200227,30 @@ sub_806719C: @ 806719C negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _0806720C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08067210 + ldr r1, =sub_8065008 + 1 str r1, [r0] _080671F0: pop {r4} pop {r0} bx r0 .align 2, 0 -_080671F8: .4byte 0x02024064 -_080671FC: .4byte 0x03005d70 -_08067200: .4byte 0x0202406e -_08067204: .4byte 0x02024744 -_08067208: .4byte 0x020244d0 -_0806720C: .4byte 0x03005d60 -_08067210: .4byte sub_8065008 + 1 + .pool thumb_func_end sub_806719C thumb_func_start sub_8067214 sub_8067214: @ 8067214 push {r4,r5,lr} - ldr r5, _0806726C + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08067264 - ldr r4, _08067270 + ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -208469,21 +200275,18 @@ sub_8067214: @ 8067214 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, _08067274 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08067278 + ldr r1, =sub_8065008 + 1 str r1, [r0] _08067264: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0806726C: .4byte 0x02024064 -_08067270: .4byte 0x02023064 -_08067274: .4byte 0x03005d60 -_08067278: .4byte sub_8065008 + 1 + .pool thumb_func_end sub_8067214 thumb_func_start sub_806727C @@ -208561,7 +200364,7 @@ sub_80672DC: @ 80672DC thumb_func_start sub_80672E8 sub_80672E8: @ 80672E8 push {lr} - ldr r2, _08067300 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x80 negs r0, r0 @@ -208571,15 +200374,15 @@ sub_80672E8: @ 80672E8 pop {r0} bx r0 .align 2, 0 -_08067300: .4byte 0x02022d0c + .pool thumb_func_end sub_80672E8 thumb_func_start sub_8067304 sub_8067304: @ 8067304 push {lr} - ldr r3, _08067330 - ldr r1, _08067334 - ldr r0, _08067338 + ldr r3, =0x02022d0c + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -208597,15 +200400,13 @@ sub_8067304: @ 8067304 pop {r0} bx r0 .align 2, 0 -_08067330: .4byte 0x02022d0c -_08067334: .4byte 0x02023064 -_08067338: .4byte 0x02024064 + .pool thumb_func_end sub_8067304 thumb_func_start sub_806733C sub_806733C: @ 806733C push {lr} - ldr r2, _08067350 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -208614,13 +200415,13 @@ sub_806733C: @ 806733C pop {r0} bx r0 .align 2, 0 -_08067350: .4byte 0x02022d0c + .pool thumb_func_end sub_806733C thumb_func_start sub_8067354 sub_8067354: @ 8067354 push {lr} - ldr r3, _08067378 + ldr r3, =0x02022d0c ldr r1, [r3] lsls r1, 24 lsrs r1, 31 @@ -208636,15 +200437,15 @@ sub_8067354: @ 8067354 pop {r0} bx r0 .align 2, 0 -_08067378: .4byte 0x02022d0c + .pool thumb_func_end sub_8067354 thumb_func_start sub_806737C sub_806737C: @ 806737C push {r4,lr} - ldr r3, _080673A4 - ldr r2, _080673A8 - ldr r4, _080673AC + ldr r3, =0x02020630 + ldr r2, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -208660,11 +200461,9 @@ sub_806737C: @ 806737C bl sub_8065068 b _080673DA .align 2, 0 -_080673A4: .4byte 0x02020630 -_080673A8: .4byte 0x020241e4 -_080673AC: .4byte 0x02024064 + .pool _080673B0: - ldr r1, _080673E0 + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -208678,20 +200477,18 @@ _080673B0: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, _080673E4 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _080673E8 + ldr r1, =sub_8064CE4 + 1 str r1, [r0] _080673DA: pop {r4} pop {r0} bx r0 .align 2, 0 -_080673E0: .4byte 0x020244b9 -_080673E4: .4byte 0x03005d60 -_080673E8: .4byte sub_8064CE4 + 1 + .pool thumb_func_end sub_806737C thumb_func_start sub_80673EC @@ -208705,7 +200502,7 @@ sub_80673EC: @ 80673EC thumb_func_start sub_80673F8 sub_80673F8: @ 80673F8 push {r4,lr} - ldr r4, _08067434 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -208714,7 +200511,7 @@ sub_80673F8: @ 80673F8 bne _0806740C movs r3, 0xC0 _0806740C: - ldr r2, _08067438 + ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -208733,15 +200530,14 @@ _0806740C: pop {r0} bx r0 .align 2, 0 -_08067434: .4byte 0x02024064 -_08067438: .4byte 0x02023064 + .pool thumb_func_end sub_80673F8 thumb_func_start sub_806743C sub_806743C: @ 806743C push {r4,r5,lr} - ldr r4, _08067470 - ldr r5, _08067474 + ldr r4, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -208763,8 +200559,7 @@ sub_806743C: @ 806743C bl song_play_for_text b _0806748C .align 2, 0 -_08067470: .4byte 0x02023064 -_08067474: .4byte 0x02024064 + .pool _08067478: adds r0, r4, 0x1 adds r0, r3, r0 @@ -208785,15 +200580,15 @@ _0806748C: thumb_func_start sub_8067498 sub_8067498: @ 8067498 push {lr} - ldr r1, _080674C8 - ldr r0, _080674CC + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080674D0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -208806,23 +200601,21 @@ sub_8067498: @ 8067498 pop {r0} bx r0 .align 2, 0 -_080674C8: .4byte 0x0202406e -_080674CC: .4byte 0x02024064 -_080674D0: .4byte 0x02024744 + .pool thumb_func_end sub_8067498 thumb_func_start sub_80674D4 sub_80674D4: @ 80674D4 push {lr} - ldr r1, _080674FC - ldr r0, _08067500 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r0, [r0] bl battle_intro_launch - ldr r2, _08067504 + ldr r2, =0x020243fc ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -208831,23 +200624,21 @@ sub_80674D4: @ 80674D4 pop {r0} bx r0 .align 2, 0 -_080674FC: .4byte 0x02023064 -_08067500: .4byte 0x02024064 -_08067504: .4byte 0x020243fc + .pool thumb_func_end sub_80674D4 thumb_func_start sub_8067508 sub_8067508: @ 8067508 push {r4-r6,lr} - ldr r5, _080675E8 - ldr r6, _080675EC + ldr r5, =0x020241e4 + ldr r6, =0x02024064 ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080675F0 + ldr r4, =0x02020630 adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -208887,7 +200678,7 @@ sub_8067508: @ 8067508 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _080675F4 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r0, [r6] adds r0, r5 @@ -208896,21 +200687,21 @@ sub_8067508: @ 8067508 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _080675F8 + ldr r1, =sub_80676FC + 1 bl oamt_set_x3A_32 - ldr r0, _080675FC + ldr r0, =c3_08038DC4 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r4, _08067600 + ldr r4, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r4 ldrb r0, [r6] strh r0, [r1, 0x8] - ldr r3, _08067604 + ldr r3, =0x020244d0 ldr r0, [r3] ldrb r2, [r6] ldr r1, [r0, 0x4] @@ -208923,14 +200714,14 @@ sub_8067508: @ 8067508 ands r0, r1 cmp r0, 0 beq _080675CA - ldr r0, _08067608 + ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, _0806760C + ldr r1, =sub_8073C30 + 1 str r1, [r0] _080675CA: ldr r0, [r3] @@ -208939,28 +200730,17 @@ _080675CA: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _08067610 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _08067614 + ldr r1, =nullsub_28 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080675E8: .4byte 0x020241e4 -_080675EC: .4byte 0x02024064 -_080675F0: .4byte 0x02020630 -_080675F4: .4byte sub_80A6EEC + 1 -_080675F8: .4byte sub_80676FC + 1 -_080675FC: .4byte c3_08038DC4 + 1 -_08067600: .4byte 0x03005e00 -_08067604: .4byte 0x020244d0 -_08067608: .4byte 0x020244b4 -_0806760C: .4byte sub_8073C30 + 1 -_08067610: .4byte 0x03005d60 -_08067614: .4byte nullsub_28 + 1 + .pool thumb_func_end sub_8067508 thumb_func_start c3_08038DC4 @@ -208972,10 +200752,10 @@ c3_08038DC4: @ 8067618 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r7, _08067670 + ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 - ldr r1, _08067674 + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -208987,19 +200767,19 @@ c3_08038DC4: @ 8067618 lsls r0, 24 cmp r0, 0 beq _08067652 - ldr r0, _08067678 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _08067684 _08067652: - ldr r0, _0806767C + ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _08067680 + ldr r0, =0x0202406e lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -209009,18 +200789,14 @@ _08067652: bl sub_8066494 b _080676C4 .align 2, 0 -_08067670: .4byte 0x02024064 -_08067674: .4byte 0x03005e00 -_08067678: .4byte 0x02022fec -_0806767C: .4byte 0x02023064 -_08067680: .4byte 0x0202406e + .pool _08067684: - ldr r4, _080676E8 + ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r6, _080676EC + ldr r6, =0x0202406e lsls r0, 1 adds r0, r6 ldrh r0, [r0] @@ -209046,12 +200822,12 @@ _08067684: eors r0, r5 strb r0, [r7] _080676C4: - ldr r1, _080676F0 - ldr r2, _080676F4 + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _080676F8 + ldr r1, =sub_8064734 + 1 str r1, [r0] mov r0, r9 strb r0, [r2] @@ -209064,11 +200840,7 @@ _080676C4: pop {r0} bx r0 .align 2, 0 -_080676E8: .4byte 0x02023064 -_080676EC: .4byte 0x0202406e -_080676F0: .4byte 0x03005d60 -_080676F4: .4byte 0x02024064 -_080676F8: .4byte sub_8064734 + 1 + .pool thumb_func_end c3_08038DC4 thumb_func_start sub_80676FC @@ -209089,8 +200861,8 @@ sub_80676FC: @ 80676FC thumb_func_start sub_8067718 sub_8067718: @ 8067718 push {r4-r7,lr} - ldr r1, _08067740 - ldr r0, _08067744 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -209106,12 +200878,11 @@ sub_8067718: @ 8067718 bl sub_8065068 b _08067812 .align 2, 0 -_08067740: .4byte 0x02023064 -_08067744: .4byte 0x02024064 + .pool _08067748: - ldr r4, _080677A0 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _080677A4 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -209122,7 +200893,7 @@ _08067748: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - ldr r1, _080677A8 + ldr r1, =0x02023064 ldrb r2, [r3] lsls r0, r2, 9 adds r1, 0x2 @@ -209153,9 +200924,7 @@ _08067748: strb r1, [r3, 0x1] b _08067812 .align 2, 0 -_080677A0: .4byte 0x020244d0 -_080677A4: .4byte 0x02024064 -_080677A8: .4byte 0x02023064 + .pool _080677AC: movs r0, 0x1F negs r0, r0 @@ -209165,7 +200934,7 @@ _080677B4: adds r5, r7, 0 ldrb r0, [r5] lsls r3, r0, 9 - ldr r4, _08067818 + ldr r4, =0x02023068 adds r1, r3, r4 subs r2, r4, 0x3 adds r2, r3, r2 @@ -209174,12 +200943,12 @@ _080677B4: adds r3, r4 ldrb r3, [r3] bl sub_80735DC - ldr r2, _0806781C + ldr r2, =0x020244b4 ldrb r1, [r5] adds r1, r2 movs r3, 0 strb r0, [r1] - ldr r6, _08067820 + ldr r6, =0x020244d0 ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -209203,30 +200972,26 @@ _080677B4: movs r1, 0x5D strb r1, [r0, 0x5] _08067806: - ldr r0, _08067824 + ldr r0, =0x03005d60 ldrb r1, [r7] lsls r1, 2 adds r1, r0 - ldr r0, _08067828 + ldr r0, =sub_806782C + 1 str r0, [r1] _08067812: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08067818: .4byte 0x02023068 -_0806781C: .4byte 0x020244b4 -_08067820: .4byte 0x020244d0 -_08067824: .4byte 0x03005d60 -_08067828: .4byte sub_806782C + 1 + .pool thumb_func_end sub_8067718 thumb_func_start sub_806782C sub_806782C: @ 806782C push {r4,lr} - ldr r4, _0806786C + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _08067870 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -209255,16 +201020,15 @@ _08067864: pop {r0} bx r0 .align 2, 0 -_0806786C: .4byte 0x020244d0 -_08067870: .4byte 0x02024064 + .pool thumb_func_end sub_806782C thumb_func_start sub_8067874 sub_8067874: @ 8067874 push {lr} - ldr r0, _080678B0 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _080678B4 + ldr r0, =0x02024064 ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -209276,26 +201040,22 @@ sub_8067874: @ 8067874 ands r0, r1 cmp r0, 0 beq _080678A6 - ldr r2, _080678B8 - ldr r0, _080678BC + ldr r2, =0x03005e00 + ldr r0, =0x020244b4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _080678C0 + ldr r1, =sub_8073C30 + 1 str r1, [r0] _080678A6: bl sub_8065068 pop {r0} bx r0 .align 2, 0 -_080678B0: .4byte 0x020244d0 -_080678B4: .4byte 0x02024064 -_080678B8: .4byte 0x03005e00 -_080678BC: .4byte 0x020244b4 -_080678C0: .4byte sub_8073C30 + 1 + .pool thumb_func_end sub_8067874 thumb_func_start sub_80678C4 @@ -209309,14 +201069,14 @@ sub_80678C4: @ 80678C4 thumb_func_start sub_80678D0 sub_80678D0: @ 80678D0 push {r4,lr} - ldr r4, _08067920 + ldr r4, =0x02024064 ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _08067916 - ldr r3, _08067924 - ldr r0, _08067928 + ldr r3, =0x02020630 + ldr r0, =0x020241e4 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -209324,7 +201084,7 @@ sub_80678D0: @ 80678D0 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, _0806792C + ldr r0, =0x02023064 lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -209347,23 +201107,20 @@ _08067916: pop {r0} bx r0 .align 2, 0 -_08067920: .4byte 0x02024064 -_08067924: .4byte 0x02020630 -_08067928: .4byte 0x020241e4 -_0806792C: .4byte 0x02023064 + .pool thumb_func_end sub_80678D0 thumb_func_start sub_8067930 sub_8067930: @ 8067930 push {r4-r6,lr} sub sp, 0x4 - ldr r5, _08067978 + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08067992 - ldr r4, _0806797C + ldr r4, =0x02023064 ldrb r2, [r5] lsls r1, r2, 9 adds r0, r4, 0x1 @@ -209388,14 +201145,13 @@ sub_8067930: @ 8067930 bl sub_8065068 b _0806798C .align 2, 0 -_08067978: .4byte 0x02024064 -_0806797C: .4byte 0x02023064 + .pool _08067980: - ldr r0, _0806799C + ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, _080679A0 + ldr r0, =sub_8065038 + 1 str r0, [r1] _0806798C: adds r0, r6, 0 @@ -209406,25 +201162,23 @@ _08067992: pop {r0} bx r0 .align 2, 0 -_0806799C: .4byte 0x03005d60 -_080679A0: .4byte sub_8065038 + 1 + .pool thumb_func_end sub_8067930 thumb_func_start sub_80679A4 sub_80679A4: @ 80679A4 push {lr} - ldr r0, _080679BC + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 - ldr r1, _080679C0 + ldr r1, =0x02023066 adds r0, r1 bl sub_81851A8 bl sub_8065068 pop {r0} bx r0 .align 2, 0 -_080679BC: .4byte 0x02024064 -_080679C0: .4byte 0x02023066 + .pool thumb_func_end sub_80679A4 thumb_func_start sub_80679C4 @@ -209438,10 +201192,10 @@ sub_80679C4: @ 80679C4 thumb_func_start sub_80679D0 sub_80679D0: @ 80679D0 push {r4,r5,lr} - ldr r5, _080679F4 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r0, 9 - ldr r4, _080679F8 + ldr r4, =0x02023068 adds r0, r4 bl sub_81851A8 ldrb r0, [r5] @@ -209451,29 +201205,27 @@ sub_80679D0: @ 80679D0 ldrb r2, [r0] cmp r2, 0x3 bne _08067A00 - ldr r0, _080679FC + ldr r0, =0x0202433a strb r2, [r0] b _08067A08 .align 2, 0 -_080679F4: .4byte 0x02024064 -_080679F8: .4byte 0x02023068 -_080679FC: .4byte 0x0202433a + .pool _08067A00: - ldr r0, _08067A54 + ldr r0, =0x0202433a movs r1, 0x3 eors r1, r2 strb r1, [r0] _08067A08: - ldr r0, _08067A58 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r1, _08067A5C - ldr r4, _08067A60 + ldr r1, =0x02023064 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 9 adds r1, 0x2 adds r0, r1 ldrb r0, [r0] - ldr r1, _08067A64 + ldr r1, =0x00000ca9 adds r3, r1 movs r1, 0x1 ands r1, r0 @@ -209489,23 +201241,17 @@ _08067A08: movs r0, 0x3 bl sub_80A2390 bl sub_8065068 - ldr r1, _08067A68 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08067A6C + ldr r1, =sub_80587B0 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08067A54: .4byte 0x0202433a -_08067A58: .4byte 0x03005d90 -_08067A5C: .4byte 0x02023064 -_08067A60: .4byte 0x02024064 -_08067A64: .4byte 0x00000ca9 -_08067A68: .4byte 0x03005d60 -_08067A6C: .4byte sub_80587B0 + 1 + .pool thumb_func_end sub_80679D0 thumb_func_start nullsub_92 @@ -209588,7 +201334,7 @@ zero_pokemon_struct: @ 8067A8C thumb_func_start zero_player_party_data zero_player_party_data: @ 8067B0C push {r4,r5,lr} - ldr r4, _08067B28 + ldr r4, =0x020244ec movs r0, 0xFA lsls r0, 1 adds r5, r4, r0 @@ -209602,13 +201348,13 @@ _08067B16: pop {r0} bx r0 .align 2, 0 -_08067B28: .4byte 0x020244ec + .pool thumb_func_end zero_player_party_data thumb_func_start zero_enemy_party_data zero_enemy_party_data: @ 8067B2C push {r4,r5,lr} - ldr r4, _08067B48 + ldr r4, =0x02024744 movs r0, 0xFA lsls r0, 1 adds r5, r4, r0 @@ -209622,7 +201368,7 @@ _08067B36: pop {r0} bx r0 .align 2, 0 -_08067B48: .4byte 0x02024744 + .pool thumb_func_end zero_enemy_party_data thumb_func_start create_pokemon_set_level @@ -209731,9 +201477,9 @@ _08067C0C: mov r1, r10 cmp r1, 0x2 bne _08067C64 - ldr r2, _08067C5C + ldr r2, =0xffff0000 mov r8, r2 - ldr r6, _08067C60 + ldr r6, =0x0000ffff _08067C28: bl GenerateRandomNumber adds r4, r0, 0 @@ -209760,8 +201506,7 @@ _08067C28: bls _08067C28 b _08067C8A .align 2, 0 -_08067C5C: .4byte 0xffff0000 -_08067C60: .4byte 0x0000ffff + .pool _08067C64: mov r0, r10 cmp r0, 0x1 @@ -209770,7 +201515,7 @@ _08067C64: str r0, [sp, 0x18] b _08067C8A _08067C70: - ldr r0, _08067DB4 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0xA] ldrb r0, [r2, 0xB] @@ -209804,11 +201549,11 @@ _08067C8A: movs r1, 0x2 mov r2, sp bl pokemon_setattr_encrypted - ldr r2, _08067DB8 + ldr r2, =0x082e9531 adds r0, r7, 0 movs r1, 0x3 bl pokemon_setattr_encrypted - ldr r5, _08067DB4 + ldr r5, =0x03005d90 ldr r2, [r5] adds r0, r7, 0 movs r1, 0x7 @@ -209818,7 +201563,7 @@ _08067C8A: mov r2, sp adds r2, 0xE bl pokemon_setattr_encrypted - ldr r4, _08067DBC + ldr r4, =0x083203cc mov r2, sp ldrh r1, [r2, 0xE] lsls r0, r1, 3 @@ -209833,7 +201578,7 @@ _08067C8A: mov r3, sp ldrb r0, [r3, 0x10] lsls r0, 2 - ldr r1, _08067DC0 + ldr r1, =0x0831f72c adds r0, r1 adds r2, r0 adds r0, r7, 0 @@ -209861,7 +201606,7 @@ _08067C8A: movs r1, 0x24 add r2, sp, 0x10 bl pokemon_setattr_encrypted - ldr r2, _08067DC4 + ldr r2, =0x082e9530 adds r0, r7, 0 movs r1, 0x25 bl pokemon_setattr_encrypted @@ -209911,11 +201656,7 @@ _08067C8A: bl pokemon_setattr_encrypted b _08067E50 .align 2, 0 -_08067DB4: .4byte 0x03005d90 -_08067DB8: .4byte 0x082e9531 -_08067DBC: .4byte 0x083203cc -_08067DC0: .4byte 0x0831f72c -_08067DC4: .4byte 0x082e9530 + .pool _08067DC8: bl GenerateRandomNumber lsls r0, 16 @@ -209978,7 +201719,7 @@ _08067DC8: adds r2, r4, 0 bl pokemon_setattr_encrypted _08067E50: - ldr r2, _08067E8C + ldr r2, =0x083203cc mov r3, sp ldrh r1, [r3, 0xE] lsls r0, r1, 3 @@ -210008,7 +201749,7 @@ _08067E76: pop {r0} bx r0 .align 2, 0 -_08067E8C: .4byte 0x083203cc + .pool thumb_func_end create_pokemon thumb_func_start pokemon_make_with_nature @@ -210594,9 +202335,9 @@ sub_8068338: @ 8068338 adds r6, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _0806836C + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08068370 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r1, [r0] movs r0, 0x3 @@ -210610,8 +202351,7 @@ sub_8068338: @ 8068338 lsrs r3, r0, 24 b _0806837C .align 2, 0 -_0806836C: .4byte 0x03005d90 -_08068370: .4byte 0x00000ca9 + .pool _08068374: movs r3, 0x32 cmp r2, 0 @@ -210823,7 +202563,7 @@ sub_8068528: @ 8068528 mov r9, r1 lsls r2, 24 lsrs r2, 24 - ldr r6, _08068630 + ldr r6, =0x08610970 ldrb r0, [r1] lsls r3, r0, 27 lsrs r1, r3, 27 @@ -210940,7 +202680,7 @@ _080685E0: pop {r0} bx r0 .align 2, 0 -_08068630: .4byte 0x08610970 + .pool thumb_func_end sub_8068528 thumb_func_start sub_8068634 @@ -211157,7 +202897,7 @@ _08068738: ands r0, r5 lsls r0, 5 ldrh r2, [r6, 0x18] - ldr r1, _0806889C + ldr r1, =0xfffffc1f ands r1, r2 orrs r1, r0 strh r1, [r6, 0x18] @@ -211181,7 +202921,7 @@ _08068738: ands r1, r0 lsls r1, 15 ldr r0, [r6, 0x18] - ldr r2, _080688A0 + ldr r2, =0xfff07fff ands r0, r2 orrs r0, r1 str r0, [r6, 0x18] @@ -211192,7 +202932,7 @@ _08068738: ands r0, r5 lsls r0, 4 ldrh r2, [r6, 0x1A] - ldr r1, _080688A4 + ldr r1, =0xfffffe0f ands r1, r2 orrs r1, r0 strh r1, [r6, 0x1A] @@ -211234,9 +202974,7 @@ _08068738: pop {r0} bx r0 .align 2, 0 -_0806889C: .4byte 0xfffffc1f -_080688A0: .4byte 0xfff07fff -_080688A4: .4byte 0xfffffe0f + .pool thumb_func_end sub_80686FC thumb_func_start sub_80688A8 @@ -211290,12 +203028,12 @@ sub_80688F8: @ 80688F8 cmp r0, 0x5 bhi _080689CE lsls r0, 2 - ldr r1, _08068910 + ldr r1, =_08068914 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08068910: .4byte _08068914 + .pool .align 2, 0 _08068914: .4byte _080689CE @@ -211305,14 +203043,14 @@ _08068914: .4byte _08068A00 .4byte _08068990 _0806892C: - ldr r0, _0806894C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _080689CE - ldr r0, _08068950 - ldr r1, _08068954 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -211321,18 +203059,16 @@ _0806892C: beq _080689CE b _080689B6 .align 2, 0 -_0806894C: .4byte 0x02022fec -_08068950: .4byte 0x030022c0 -_08068954: .4byte 0x00000439 + .pool _08068958: - ldr r0, _08068984 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _080689CE - ldr r0, _08068988 - ldr r1, _0806898C + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -211347,19 +203083,17 @@ _08068958: beq _08068A00 b _080689CE .align 2, 0 -_08068984: .4byte 0x02022fec -_08068988: .4byte 0x030022c0 -_0806898C: .4byte 0x00000439 + .pool _08068990: - ldr r0, _080689D4 + ldr r0, =0x02022fec ldr r2, [r0] movs r3, 0x2 adds r0, r2, 0 ands r0, r3 cmp r0, 0 beq _080689E4 - ldr r0, _080689D8 - ldr r1, _080689DC + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] adds r0, r3, 0 @@ -211371,7 +203105,7 @@ _08068990: cmp r2, 0 beq _080689F4 _080689B6: - ldr r4, _080689E0 + ldr r4, =0x020229e8 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -211386,13 +203120,10 @@ _080689CE: movs r0, 0 b _08068A02 .align 2, 0 -_080689D4: .4byte 0x02022fec -_080689D8: .4byte 0x030022c0 -_080689DC: .4byte 0x00000439 -_080689E0: .4byte 0x020229e8 + .pool _080689E4: - ldr r0, _08068A08 - ldr r1, _08068A0C + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] adds r0, r3, 0 @@ -211412,8 +203143,7 @@ _08068A02: pop {r1} bx r1 .align 2, 0 -_08068A08: .4byte 0x030022c0 -_08068A0C: .4byte 0x00000439 + .pool thumb_func_end sub_80688F8 thumb_func_start get_pokemon_data_3 @@ -211421,7 +203151,7 @@ get_pokemon_data_3: @ 8068A10 push {r4-r6,lr} adds r5, r0, 0 adds r6, r1, 0 - ldr r0, _08068A38 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x20 ands r0, r1 @@ -211439,7 +203169,7 @@ _08068A34: movs r0, 0 b _08068A9A .align 2, 0 -_08068A38: .4byte 0x02022fec + .pool _08068A3C: adds r1, r6, 0 adds r1, 0x27 @@ -211452,7 +203182,7 @@ _08068A3C: adds r0, r5, 0 movs r2, 0 bl pokemon_getattr - ldr r2, _08068AA0 + ldr r2, =0x08329d48 lsls r1, r6, 1 adds r1, r2 ldrh r1, [r1] @@ -211489,7 +203219,7 @@ _08068A9A: pop {r1} bx r1 .align 2, 0 -_08068AA0: .4byte 0x08329d48 + .pool thumb_func_end get_pokemon_data_3 thumb_func_start sub_8068AA4 @@ -211501,7 +203231,7 @@ _08068AAA: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08068B44 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -211565,27 +203295,26 @@ _08068B34: pop {r0} bx r0 .align 2, 0 -_08068B44: .4byte 0x020244ec + .pool thumb_func_end sub_8068AA4 thumb_func_start sub_8068B48 sub_8068B48: @ 8068B48 push {lr} - ldr r0, _08068B64 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 beq _08068B6C - ldr r0, _08068B68 + ldr r0, =0x0203c7b4 ldrb r1, [r0] movs r0, 0x1 eors r0, r1 b _08068B78 .align 2, 0 -_08068B64: .4byte 0x02022fec -_08068B68: .4byte 0x0203c7b4 + .pool _08068B6C: bl link_get_multiplayer_id movs r1, 0x1 @@ -211593,7 +203322,7 @@ _08068B6C: lsls r0, 24 lsrs r0, 24 _08068B78: - ldr r3, _08068BA8 + ldr r3, =0x020229e8 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -211606,7 +203335,7 @@ _08068B78: ldrb r0, [r1, 0x13] lsls r0, 3 orrs r2, r0 - ldr r0, _08068BAC + ldr r0, =0x08329d54 lsls r2, 1 adds r2, r0 ldrh r0, [r2] @@ -211616,28 +203345,26 @@ _08068B78: pop {r1} bx r1 .align 2, 0 -_08068BA8: .4byte 0x020229e8 -_08068BAC: .4byte 0x08329d54 + .pool thumb_func_end sub_8068B48 thumb_func_start sub_8068BB0 sub_8068BB0: @ 8068BB0 push {lr} - ldr r0, _08068BCC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 beq _08068BD4 - ldr r0, _08068BD0 + ldr r0, =0x0203c7b4 ldrb r1, [r0] movs r0, 0x1 eors r0, r1 b _08068BE0 .align 2, 0 -_08068BCC: .4byte 0x02022fec -_08068BD0: .4byte 0x0203c7b4 + .pool _08068BD4: bl link_get_multiplayer_id movs r1, 0x1 @@ -211645,7 +203372,7 @@ _08068BD4: lsls r0, 24 lsrs r0, 24 _08068BE0: - ldr r3, _08068C0C + ldr r3, =0x020229e8 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -211658,8 +203385,8 @@ _08068BE0: ldrb r0, [r1, 0x13] lsls r0, 3 orrs r2, r0 - ldr r1, _08068C10 - ldr r0, _08068C14 + ldr r1, =0x0831f5ca + ldr r0, =0x08329d54 lsls r2, 1 adds r2, r0 ldrh r0, [r2] @@ -211668,23 +203395,21 @@ _08068BE0: pop {r1} bx r1 .align 2, 0 -_08068C0C: .4byte 0x020229e8 -_08068C10: .4byte 0x0831f5ca -_08068C14: .4byte 0x08329d54 + .pool thumb_func_end sub_8068BB0 thumb_func_start sub_8068C18 sub_8068C18: @ 8068C18 push {r4-r7,lr} sub sp, 0x14 - ldr r0, _08068C68 + ldr r0, =0x020375e0 ldrh r5, [r0] - ldr r0, _08068C6C + ldr r0, =0x020375e2 ldrh r4, [r0] - ldr r0, _08068C70 + ldr r0, =0x020375e4 ldrh r6, [r0] bl zero_enemy_party_data - ldr r7, _08068C74 + ldr r7, =0x02024744 lsls r4, 24 lsrs r4, 24 movs r0, 0 @@ -211714,10 +203439,7 @@ _08068C60: pop {r0} bx r0 .align 2, 0 -_08068C68: .4byte 0x020375e0 -_08068C6C: .4byte 0x020375e2 -_08068C70: .4byte 0x020375e4 -_08068C74: .4byte 0x02024744 + .pool thumb_func_end sub_8068C18 thumb_func_start pokemon_calc_checksum @@ -211890,7 +203612,7 @@ pokemon_calc_effective_stats: @ 8068D0C movs r1, 0x38 mov r2, sp bl pokemon_setattr - ldr r0, _08068DF4 + ldr r0, =0x0000012f cmp r7, r0 bne _08068DF8 movs r0, 0x1 @@ -211898,9 +203620,9 @@ pokemon_calc_effective_stats: @ 8068D0C lsls r6, r7, 3 b _08068E26 .align 2, 0 -_08068DF4: .4byte 0x0000012f + .pool _08068DF8: - ldr r1, _08068FC4 + ldr r1, =0x083203cc lsls r2, r7, 3 subs r0, r2, r7 lsls r0, 2 @@ -211924,7 +203646,7 @@ _08068E12: adds r0, 0xA str r0, [sp, 0x4] _08068E26: - ldr r1, _08068FC8 + ldr r1, =0x02024474 add r2, sp, 0x4 ldrb r0, [r2] mov r3, r8 @@ -211940,7 +203662,7 @@ _08068E3E: adds r0, r5, 0 movs r1, 0x3A bl pokemon_setattr - ldr r0, _08068FC4 + ldr r0, =0x083203cc subs r1, r6, r7 lsls r1, 2 adds r6, r1, r0 @@ -212104,7 +203826,7 @@ _08068F76: movs r1, 0x3F adds r2, r4, 0 bl pokemon_setattr - ldr r0, _08068FCC + ldr r0, =0x0000012f cmp r7, r0 bne _08068FD0 ldr r0, [sp, 0x1C] @@ -212117,9 +203839,7 @@ _08068FBE: movs r0, 0x1 b _08068FE8 .align 2, 0 -_08068FC4: .4byte 0x083203cc -_08068FC8: .4byte 0x02024474 -_08068FCC: .4byte 0x0000012f + .pool _08068FD0: ldr r1, [sp, 0x1C] cmp r1, 0 @@ -212205,8 +203925,8 @@ level_by_exp: @ 8069054 bl pokemon_getattr adds r3, r0, 0 movs r2, 0x1 - ldr r6, _080690B8 - ldr r1, _080690BC + ldr r6, =0x0831f72c + ldr r1, =0x083203cc lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -212241,8 +203961,7 @@ _080690AA: pop {r1} bx r1 .align 2, 0 -_080690B8: .4byte 0x0831f72c -_080690BC: .4byte 0x083203cc + .pool thumb_func_end level_by_exp thumb_func_start sub_80690C0 @@ -212261,8 +203980,8 @@ sub_80690C0: @ 80690C0 bl pokemon_getattr_encrypted adds r3, r0, 0 movs r2, 0x1 - ldr r6, _08069124 - ldr r1, _08069128 + ldr r6, =0x0831f72c + ldr r1, =0x083203cc lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -212297,8 +204016,7 @@ _08069116: pop {r1} bx r1 .align 2, 0 -_08069124: .4byte 0x0831f72c -_08069128: .4byte 0x083203cc + .pool thumb_func_end sub_80690C0 thumb_func_start pokemon_moveset_pad_ @@ -212343,34 +204061,34 @@ _0806914E: lsls r2, r0, 1 adds r2, r0 lsls r2, 2 - ldr r0, _08069188 + ldr r0, =0x0831c89c adds r2, r0 adds r0, r7, 0 bl pokemon_setattr_encrypted ldrh r0, [r6] b _080691A4 .align 2, 0 -_08069188: .4byte 0x0831c89c + .pool _0806918C: ldrh r1, [r6] cmp r0, r1 bne _0806919C - ldr r0, _08069198 + ldr r0, =0x0000fffe b _080691A4 .align 2, 0 -_08069198: .4byte 0x0000fffe + .pool _0806919C: adds r5, 0x1 cmp r5, 0x3 ble _0806914E - ldr r0, _080691AC + ldr r0, =0x0000ffff _080691A4: add sp, 0x4 pop {r4-r7} pop {r1} bx r1 .align 2, 0 -_080691AC: .4byte 0x0000ffff + .pool thumb_func_end pokemon_moveset_pad thumb_func_start sub_80691B0 @@ -212381,7 +204099,7 @@ sub_80691B0: @ 80691B0 movs r3, 0 adds r5, r0, 0 adds r5, 0x24 - ldr r2, _080691DC + ldr r2, =0x0831c898 lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -212399,19 +204117,19 @@ _080691CA: adds r0, r4, 0 b _080691EA .align 2, 0 -_080691DC: .4byte 0x0831c898 + .pool _080691E0: adds r1, 0x2 adds r3, 0x1 cmp r3, 0x3 ble _080691CA - ldr r0, _080691F0 + ldr r0, =0x0000ffff _080691EA: pop {r4,r5} pop {r1} bx r1 .align 2, 0 -_080691F0: .4byte 0x0000ffff + .pool thumb_func_end sub_80691B0 thumb_func_start sub_80691F4 @@ -212435,7 +204153,7 @@ sub_80691F4: @ 80691F4 lsls r2, r0, 1 adds r2, r0 lsls r2, 2 - ldr r0, _08069230 + ldr r0, =0x0831c89c adds r2, r0 adds r0, r5, 0 adds r1, r4, 0 @@ -212445,7 +204163,7 @@ sub_80691F4: @ 80691F4 pop {r0} bx r0 .align 2, 0 -_08069230: .4byte 0x0831c89c + .pool thumb_func_end sub_80691F4 thumb_func_start sub_8069234 @@ -212462,7 +204180,7 @@ sub_8069234: @ 8069234 strh r1, [r3] adds r0, 0x24 adds r0, r2 - ldr r3, _08069260 + ldr r3, =0x0831c898 lsls r2, r1, 1 adds r2, r1 lsls r2, 2 @@ -212473,7 +204191,7 @@ sub_8069234: @ 8069234 pop {r0} bx r0 .align 2, 0 -_08069260: .4byte 0x0831c898 + .pool thumb_func_end sub_8069234 thumb_func_start sub_8069264 @@ -212504,19 +204222,19 @@ sub_8069270: @ 8069270 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _0806930C + ldr r0, =0x0832937c lsls r6, r4, 2 adds r0, r6, r0 ldr r0, [r0] ldrh r1, [r0] - ldr r2, _08069310 + ldr r2, =0xffff0000 lsrs r0, r2, 16 cmp r1, r0 beq _080692FC mov r9, r2 movs r3, 0 _080692AE: - ldr r0, _0806930C + ldr r0, =0x0832937c adds r7, r6, r0 ldr r0, [r7] adds r0, r3, r0 @@ -212529,7 +204247,7 @@ _080692AE: lsls r1, r4, 9 cmp r0, r1 bgt _080692FC - ldr r1, _08069314 + ldr r1, =0x000001ff adds r0, r1, 0 adds r4, r0, 0 ands r4, r2 @@ -212564,9 +204282,7 @@ _080692FC: pop {r0} bx r0 .align 2, 0 -_0806930C: .4byte 0x0832937c -_08069310: .4byte 0xffff0000 -_08069314: .4byte 0x000001ff + .pool thumb_func_end sub_8069270 thumb_func_start sub_8069318 @@ -212598,11 +204314,11 @@ sub_8069318: @ 8069318 mov r10, r0 cmp r4, 0 beq _080693B0 - ldr r4, _0806939C + ldr r4, =0x020244e8 mov r1, sp ldrb r1, [r1] strb r1, [r4] - ldr r2, _080693A0 + ldr r2, =0x0832937c mov r5, r9 lsls r3, r5, 2 adds r5, r3, r2 @@ -212619,7 +204335,7 @@ sub_8069318: @ 8069318 cmp r0, r4 beq _080693D8 adds r2, r6, 0 - ldr r0, _080693A4 + ldr r0, =0x0000ffff mov r12, r0 adds r6, r7, 0 adds r3, r5, 0 @@ -212637,20 +204353,18 @@ _08069384: movs r0, 0 b _08069404 .align 2, 0 -_0806939C: .4byte 0x020244e8 -_080693A0: .4byte 0x0832937c -_080693A4: .4byte 0x0000ffff + .pool _080693A8: adds r0, r6, 0 ands r0, r1 cmp r0, r4 bne _08069384 _080693B0: - ldr r3, _08069414 + ldr r3, =0x0832937c mov r1, r9 lsls r4, r1, 2 adds r1, r4, r3 - ldr r2, _08069418 + ldr r2, =0x020244e8 ldrb r0, [r2] ldr r1, [r1] lsls r0, 1 @@ -212667,7 +204381,7 @@ _080693B0: cmp r0, r1 bne _08069402 _080693D8: - ldr r2, _0806941C + ldr r2, =0x020244e2 mov r0, r12 adds r1, r3, r0 ldrb r0, [r6] @@ -212675,7 +204389,7 @@ _080693D8: lsls r0, 1 adds r0, r1 ldrh r1, [r0] - ldr r0, _08069420 + ldr r0, =0x000001ff ands r0, r1 strh r0, [r2] ldrb r0, [r6] @@ -212699,10 +204413,7 @@ _08069404: pop {r1} bx r1 .align 2, 0 -_08069414: .4byte 0x0832937c -_08069418: .4byte 0x020244e8 -_0806941C: .4byte 0x020244e2 -_08069420: .4byte 0x000001ff + .pool thumb_func_end sub_8069318 thumb_func_start sub_8069424 @@ -212751,7 +204462,7 @@ _08069440: mov r0, sp mov r2, r8 strh r2, [r0, 0x6] - ldr r1, _080694CC + ldr r1, =0x0831c898 mov r2, r8 lsls r0, r2, 1 add r0, r8 @@ -212788,7 +204499,7 @@ _08069494: pop {r0} bx r0 .align 2, 0 -_080694CC: .4byte 0x0831c898 + .pool thumb_func_end sub_8069424 thumb_func_start sub_80694D0 @@ -212837,7 +204548,7 @@ _080694EC: mov r0, sp mov r2, r8 strh r2, [r0, 0x6] - ldr r1, _08069578 + ldr r1, =0x0831c898 mov r2, r8 lsls r0, r2, 1 add r0, r8 @@ -212874,7 +204585,7 @@ _08069540: pop {r0} bx r0 .align 2, 0 -_08069578: .4byte 0x0831c898 + .pool thumb_func_end sub_80694D0 thumb_func_start sub_806957C @@ -212908,8 +204619,8 @@ sub_806957C: @ 806957C movs r5, 0 cmp r3, 0 bne _080695D4 - ldr r2, _080695CC - ldr r1, _080695D0 + ldr r2, =0x020244e0 + ldr r1, =0x0831c898 ldr r3, [sp, 0x8] lsls r0, r3, 1 adds r0, r3 @@ -212919,15 +204630,14 @@ sub_806957C: @ 806957C strh r0, [r2] b _080695D8 .align 2, 0 -_080695CC: .4byte 0x020244e0 -_080695D0: .4byte 0x0831c898 + .pool _080695D4: - ldr r0, _080695F0 + ldr r0, =0x020244e0 strh r3, [r0] _080695D8: cmp r7, 0 bne _080695F8 - ldr r1, _080695F4 + ldr r1, =0x0831c898 ldr r7, [sp, 0x8] lsls r0, r7, 1 adds r0, r7 @@ -212937,8 +204647,7 @@ _080695D8: mov r10, r0 b _08069602 .align 2, 0 -_080695F0: .4byte 0x020244e0 -_080695F4: .4byte 0x0831c898 + .pool _080695F8: movs r0, 0x3F mov r10, r0 @@ -212958,7 +204667,7 @@ _08069602: ldrh r0, [r6, 0x2E] cmp r0, 0xAF bne _08069634 - ldr r1, _08069630 + ldr r1, =0x02024404 ldr r2, [sp, 0x10] lsls r0, r2, 3 subs r0, r2 @@ -212969,7 +204678,7 @@ _08069602: ldrb r0, [r0, 0x1A] b _0806964A .align 2, 0 -_08069630: .4byte 0x02024404 + .pool _08069634: ldrh r0, [r6, 0x2E] bl itemid_get_x12 @@ -212986,7 +204695,7 @@ _0806964A: ldrh r0, [r1, 0x2E] cmp r0, 0xAF bne _0806967E - ldr r1, _08069668 + ldr r1, =0x02024404 ldr r2, [sp, 0x14] lsls r0, r2, 3 subs r0, r2 @@ -212996,7 +204705,7 @@ _0806964A: str r0, [sp, 0x20] b _08069694 .align 2, 0 -_08069668: .4byte 0x02024404 + .pool _0806966C: ldr r0, [sp, 0x24] adds r0, 0x64 @@ -213029,7 +204738,7 @@ _080696A4: lsls r0, r7, 17 lsrs r7, r0, 16 _080696A8: - ldr r0, _08069764 + ldr r0, =0x00000867 ldr r1, [sp, 0x10] bl sub_8069ED8 lsls r0, 24 @@ -213042,7 +204751,7 @@ _080696A8: lsls r0, 16 lsrs r7, r0, 16 _080696C4: - ldr r0, _08069768 + ldr r0, =0x0000086b ldr r1, [sp, 0x14] bl sub_8069ED8 lsls r0, 24 @@ -213057,7 +204766,7 @@ _080696C4: lsrs r0, 16 str r0, [sp, 0x18] _080696E4: - ldr r4, _0806976C + ldr r4, =0x0000086d adds r0, r4, 0 ldr r1, [sp, 0x10] bl sub_8069ED8 @@ -213090,7 +204799,7 @@ _08069708: str r0, [sp, 0x1C] _08069728: movs r2, 0 - ldr r4, _08069770 + ldr r4, =0x08329d74 ldr r3, [sp, 0x4] adds r3, 0x20 str r3, [sp, 0x2C] @@ -213120,10 +204829,7 @@ _08069734: mov r8, r0 b _0806977C .align 2, 0 -_08069764: .4byte 0x00000867 -_08069768: .4byte 0x0000086b -_0806976C: .4byte 0x0000086d -_08069770: .4byte 0x08329d74 + .pool _08069774: adds r3, 0x2 adds r2, 0x1 @@ -213143,13 +204849,13 @@ _08069790: mov r0, r9 cmp r0, 0x22 bne _080697C6 - ldr r0, _08069A78 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08069A7C + ldr r1, =0x003f0100 ands r0, r1 cmp r0, 0 bne _080697C6 - ldr r1, _08069A80 + ldr r1, =0xfffffe69 adds r0, r1, 0 ldrh r2, [r6] adds r0, r2 @@ -213170,13 +204876,13 @@ _080697C6: ldr r0, [sp, 0x20] cmp r0, 0x22 bne _080697FC - ldr r0, _08069A78 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08069A7C + ldr r1, =0x003f0100 ands r0, r1 cmp r0, 0 bne _080697FC - ldr r1, _08069A80 + ldr r1, =0xfffffe69 adds r0, r1, 0 ldr r2, [sp, 0x4] ldrh r2, [r2] @@ -213198,7 +204904,7 @@ _080697FC: cmp r0, 0x23 bne _08069812 ldrh r1, [r6] - ldr r0, _08069A84 + ldr r0, =0x00000175 cmp r1, r0 bne _08069812 mov r1, r8 @@ -213211,7 +204917,7 @@ _08069812: bne _0806982A ldr r3, [sp, 0x4] ldrh r1, [r3] - ldr r0, _08069A84 + ldr r0, =0x00000175 cmp r1, r0 bne _0806982A ldr r1, [sp, 0x1C] @@ -213369,7 +205075,7 @@ _08069936: lsls r0, 24 cmp r0, 0 beq _0806995A - ldr r1, _08069A88 + ldr r1, =0x020244e0 ldrh r0, [r1] lsrs r0, 1 strh r0, [r1] @@ -213387,7 +205093,7 @@ _0806995A: lsls r0, 24 cmp r0, 0 beq _0806997E - ldr r1, _08069A88 + ldr r1, =0x020244e0 ldrh r0, [r1] lsrs r0, 1 strh r0, [r1] @@ -213407,7 +205113,7 @@ _0806997E: lsrs r0, 16 cmp r1, r0 bhi _080699AE - ldr r4, _08069A88 + ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 muls r0, r1 @@ -213430,7 +205136,7 @@ _080699AE: lsrs r0, 16 cmp r1, r0 bhi _080699DE - ldr r4, _08069A88 + ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 muls r0, r1 @@ -213453,7 +205159,7 @@ _080699DE: lsrs r0, 16 cmp r1, r0 bhi _08069A0E - ldr r4, _08069A88 + ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 muls r0, r1 @@ -213476,7 +205182,7 @@ _08069A0E: lsrs r0, 16 cmp r1, r0 bhi _08069A3E - ldr r4, _08069A88 + ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 muls r0, r1 @@ -213484,8 +205190,8 @@ _08069A0E: bl __divsi3 strh r0, [r4] _08069A3E: - ldr r2, _08069A8C - ldr r0, _08069A90 + ldr r2, =0x0831c898 + ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -213503,7 +205209,7 @@ _08069A58: bls _08069A60 b _08069BC2 _08069A60: - ldr r0, _08069A94 + ldr r0, =0x02024211 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x2 @@ -213512,23 +205218,15 @@ _08069A60: ldrsb r0, [r6, r0] cmp r0, 0x6 ble _08069A9C - ldr r2, _08069A98 + ldr r2, =0x08329d2e b _08069AA6 .align 2, 0 -_08069A78: .4byte 0x02022fec -_08069A7C: .4byte 0x003f0100 -_08069A80: .4byte 0xfffffe69 -_08069A84: .4byte 0x00000175 -_08069A88: .4byte 0x020244e0 -_08069A8C: .4byte 0x0831c898 -_08069A90: .4byte 0x020241ea -_08069A94: .4byte 0x02024211 -_08069A98: .4byte 0x08329d2e + .pool _08069A9C: adds r5, r7, 0 b _08069ABE _08069AA0: - ldr r2, _08069AF0 + ldr r2, =0x08329d2e movs r0, 0x19 ldrsb r0, [r6, r0] _08069AA6: @@ -213544,7 +205242,7 @@ _08069AA6: bl __divsi3 adds r5, r0, 0 _08069ABE: - ldr r0, _08069AF4 + ldr r0, =0x020244e0 ldrh r0, [r0] muls r5, r0 adds r0, r6, 0 @@ -213563,19 +205261,18 @@ _08069ABE: ldrsb r0, [r2, r0] cmp r0, 0x5 bgt _08069AF8 - ldr r2, _08069AF0 + ldr r2, =0x08329d2e ldr r3, [sp, 0x4] movs r0, 0x1A ldrsb r0, [r3, r0] b _08069B04 .align 2, 0 -_08069AF0: .4byte 0x08329d2e -_08069AF4: .4byte 0x020244e0 + .pool _08069AF8: ldr r3, [sp, 0x18] b _08069B1E _08069AFC: - ldr r2, _08069B7C + ldr r2, =0x08329d2e ldr r1, [sp, 0x4] movs r0, 0x1A ldrsb r0, [r1, r0] @@ -213621,7 +205318,7 @@ _08069B48: ldrb r1, [r4] cmp r1, 0x1 bne _08069B8A - ldr r0, _08069B80 + ldr r0, =0x02022fec ldr r0, [r0] ands r0, r1 cmp r0, 0 @@ -213638,20 +205335,19 @@ _08069B48: lsls r5, r0, 1 b _08069B8A .align 2, 0 -_08069B7C: .4byte 0x08329d2e -_08069B80: .4byte 0x02022fec + .pool _08069B84: lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 _08069B8A: - ldr r0, _08069BE8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _08069BBC - ldr r0, _08069BEC + ldr r0, =0x0831c898 ldr r3, [sp, 0x8] lsls r1, r3, 1 adds r1, r3 @@ -213684,7 +205380,7 @@ _08069BCA: bhi _08069BD2 b _08069DD4 _08069BD2: - ldr r0, _08069BF0 + ldr r0, =0x02024211 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0x2 @@ -213693,18 +205389,15 @@ _08069BD2: ldrsb r0, [r6, r0] cmp r0, 0x6 ble _08069BF8 - ldr r2, _08069BF4 + ldr r2, =0x08329d2e b _08069C02 .align 2, 0 -_08069BE8: .4byte 0x02022fec -_08069BEC: .4byte 0x0831c898 -_08069BF0: .4byte 0x02024211 -_08069BF4: .4byte 0x08329d2e + .pool _08069BF8: mov r5, r8 b _08069C1A _08069BFC: - ldr r2, _08069C48 + ldr r2, =0x08329d2e movs r0, 0x1C ldrsb r0, [r6, r0] _08069C02: @@ -213720,7 +205413,7 @@ _08069C02: bl __divsi3 adds r5, r0, 0 _08069C1A: - ldr r0, _08069C4C + ldr r0, =0x020244e0 ldrh r0, [r0] muls r5, r0 adds r0, r6, 0 @@ -213739,16 +205432,15 @@ _08069C1A: ldrsb r0, [r1, r0] cmp r0, 0x5 bgt _08069C50 - ldr r2, _08069C48 + ldr r2, =0x08329d2e b _08069C5C .align 2, 0 -_08069C48: .4byte 0x08329d2e -_08069C4C: .4byte 0x020244e0 + .pool _08069C50: ldr r3, [sp, 0x1C] b _08069C76 _08069C54: - ldr r2, _08069CBC + ldr r2, =0x08329d2e ldr r7, [sp, 0x4] movs r0, 0x1D ldrsb r0, [r7, r0] @@ -213781,7 +205473,7 @@ _08069C76: ldrb r1, [r4] cmp r1, 0x1 bne _08069CCA - ldr r0, _08069CC0 + ldr r0, =0x02022fec ldr r0, [r0] ands r0, r1 cmp r0, 0 @@ -213798,20 +205490,19 @@ _08069C76: lsls r5, r0, 1 b _08069CCA .align 2, 0 -_08069CBC: .4byte 0x08329d2e -_08069CC0: .4byte 0x02022fec + .pool _08069CC4: lsrs r0, r5, 31 adds r0, r5, r0 asrs r5, r0, 1 _08069CCA: - ldr r0, _08069D44 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _08069CFC - ldr r0, _08069D48 + ldr r0, =0x0831c898 ldr r2, [sp, 0x8] lsls r1, r2, 1 adds r1, r2 @@ -213850,7 +205541,7 @@ _08069CFC: lsls r0, 24 cmp r0, 0 bne _08069DAC - ldr r2, _08069D4C + ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x1 ands r0, r1 @@ -213864,9 +205555,7 @@ _08069CFC: beq _08069D58 b _08069D64 .align 2, 0 -_08069D44: .4byte 0x02022fec -_08069D48: .4byte 0x0831c898 -_08069D4C: .4byte 0x020243cc + .pool _08069D50: lsrs r0, r5, 31 adds r0, r5, r0 @@ -213884,7 +205573,7 @@ _08069D64: ands r0, r1 cmp r0, 0 beq _08069D7C - ldr r0, _08069D94 + ldr r0, =0x020241ea ldrh r0, [r0] cmp r0, 0x4C bne _08069D7C @@ -213904,7 +205593,7 @@ _08069D7C: beq _08069DA6 b _08069DAC .align 2, 0 -_08069D94: .4byte 0x020241ea + .pool _08069D98: lsls r0, r5, 4 subs r0, r5 @@ -213917,7 +205606,7 @@ _08069DA6: adds r0, r5, r0 asrs r5, r0, 1 _08069DAC: - ldr r0, _08069DE8 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x4] ldr r7, [sp, 0x10] @@ -213947,7 +205636,7 @@ _08069DD4: pop {r1} bx r1 .align 2, 0 -_08069DE8: .4byte 0x020244a8 + .pool thumb_func_end sub_806957C thumb_func_start sub_8069DEC @@ -213970,10 +205659,10 @@ _08069E04: b _08069EC2 _08069E0A: movs r5, 0 - ldr r0, _08069E34 + ldr r0, =0x02024064 ldrb r3, [r0] - ldr r4, _08069E38 - ldr r2, _08069E3C + ldr r4, =0x02024210 + ldr r2, =0x0832a328 _08069E14: cmp r5, r3 beq _08069E28 @@ -213992,9 +205681,7 @@ _08069E28: ble _08069E14 b _08069EC2 .align 2, 0 -_08069E34: .4byte 0x02024064 -_08069E38: .4byte 0x02024210 -_08069E3C: .4byte 0x0832a328 + .pool _08069E40: movs r5, 0 _08069E42: @@ -214002,16 +205689,16 @@ _08069E42: lsrs r0, 24 bl battle_side_get_owner adds r4, r0, 0 - ldr r0, _08069E7C + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _08069E74 - ldr r0, _08069E80 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08069E84 + ldr r2, =0x0832a328 lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -214027,9 +205714,7 @@ _08069E74: ble _08069E42 b _08069EC2 .align 2, 0 -_08069E7C: .4byte 0x0202420b -_08069E80: .4byte 0x02024210 -_08069E84: .4byte 0x0832a328 + .pool _08069E88: movs r5, 0 _08069E8A: @@ -214037,16 +205722,16 @@ _08069E8A: lsrs r0, 24 bl battle_side_get_owner adds r4, r0, 0 - ldr r0, _08069ECC + ldr r0, =0x0202420c ldrb r0, [r0] bl battle_side_get_owner lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _08069EBC - ldr r0, _08069ED0 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08069ED4 + ldr r2, =0x0832a328 lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -214066,9 +205751,7 @@ _08069EC2: pop {r1} bx r1 .align 2, 0 -_08069ECC: .4byte 0x0202420c -_08069ED0: .4byte 0x02024210 -_08069ED4: .4byte 0x0832a328 + .pool thumb_func_end sub_8069DEC thumb_func_start sub_8069ED8 @@ -214078,9 +205761,9 @@ sub_8069ED8: @ 8069ED8 lsrs r5, r0, 16 lsls r1, 24 lsrs r2, r1, 24 - ldr r4, _08069F20 + ldr r4, =0x02022fec ldr r0, [r4] - ldr r1, _08069F24 + ldr r1, =0x023f0902 ands r0, r1 cmp r0, 0 bne _08069F1C @@ -214094,7 +205777,7 @@ sub_8069ED8: @ 8069ED8 ands r0, r1 cmp r0, 0 beq _08069F10 - ldr r0, _08069F28 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 @@ -214110,9 +205793,7 @@ _08069F1C: movs r0, 0 b _08069F2E .align 2, 0 -_08069F20: .4byte 0x02022fec -_08069F24: .4byte 0x023f0902 -_08069F28: .4byte 0x02038bca + .pool _08069F2C: movs r0, 0x1 _08069F2E: @@ -214133,7 +205814,7 @@ sub_8069F34: @ 8069F34 ands r4, r0 eors r4, r1 adds r5, r4, 0 - ldr r0, _08069F58 + ldr r0, =0x02022fec ldr r0, [r0] ands r0, r6 cmp r0, 0 @@ -214141,7 +205822,7 @@ sub_8069F34: @ 8069F34 adds r0, r4, 0 b _08069FA6 .align 2, 0 -_08069F58: .4byte 0x02022fec + .pool _08069F5C: movs r0, 0 bl sub_8069DEC @@ -214161,9 +205842,9 @@ _08069F7C: adds r0, r4, 0 b _08069FA6 _08069F80: - ldr r0, _08069F98 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _08069F9C + ldr r2, =0x0832a328 lsls r0, r4, 2 adds r0, r2 ldr r0, [r0] @@ -214173,8 +205854,7 @@ _08069F80: adds r0, r4, 0 b _08069FA6 .align 2, 0 -_08069F98: .4byte 0x02024210 -_08069F9C: .4byte 0x0832a328 + .pool _08069FA0: movs r0, 0x2 eors r5, r0 @@ -214212,7 +205892,7 @@ pokemon_roll_gender: @ 8069FC4 movs r2, 0 bl pokemon_getattr_encrypted adds r2, r0, 0 - ldr r1, _0806A014 + ldr r1, =0x083203cc lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -214227,7 +205907,7 @@ pokemon_roll_gender: @ 8069FC4 cmp r0, 0xFE bge _0806A01A _08069FFC: - ldr r1, _0806A014 + ldr r1, =0x083203cc lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -214240,7 +205920,7 @@ _08069FFC: movs r0, 0 b _0806A01A .align 2, 0 -_0806A014: .4byte 0x083203cc + .pool _0806A018: movs r0, 0xFE _0806A01A: @@ -214255,7 +205935,7 @@ pokemon_species_get_gender_info: @ 806A020 adds r3, r1, 0 lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _0806A05C + ldr r1, =0x083203cc lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -214282,7 +205962,7 @@ _0806A044: movs r0, 0 b _0806A062 .align 2, 0 -_0806A05C: .4byte 0x083203cc + .pool _0806A060: movs r0, 0xFE _0806A062: @@ -214297,11 +205977,11 @@ sub_806A068: @ 806A068 lsrs r5, r0, 16 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _0806A094 + ldr r0, =0x020244d4 ldr r2, [r0] cmp r2, 0 beq _0806A09C - ldr r0, _0806A098 + ldr r0, =0x0202499c lsls r1, r4, 1 adds r1, r4 lsls r1, 3 @@ -214315,31 +205995,29 @@ sub_806A068: @ 806A068 adds r3, r0, 0 b _0806A0DA .align 2, 0 -_0806A094: .4byte 0x020244d4 -_0806A098: .4byte 0x0202499c + .pool _0806A09C: - ldr r1, _0806A0AC + ldr r1, =0x020249b4 ldr r0, [r1] cmp r0, 0 beq _0806A0B4 - ldr r3, _0806A0B0 + ldr r3, =0x0202499c ldr r2, [r0, 0xC] b _0806A0C8 .align 2, 0 -_0806A0AC: .4byte 0x020249b4 -_0806A0B0: .4byte 0x0202499c + .pool _0806A0B4: ldr r0, [r1, 0x4] cmp r0, 0 beq _0806A0C4 - ldr r3, _0806A0C0 + ldr r3, =0x0202499c ldr r2, [r0, 0xC] b _0806A0C8 .align 2, 0 -_0806A0C0: .4byte 0x0202499c + .pool _0806A0C4: - ldr r3, _0806A0EC - ldr r2, _0806A0F0 + ldr r3, =0x0202499c + ldr r2, =0x08329d98 _0806A0C8: lsls r0, r4, 1 adds r0, r4 @@ -214358,20 +206036,18 @@ _0806A0DA: cmp r4, 0x2 bne _0806A0F8 _0806A0E6: - ldr r0, _0806A0F4 + ldr r0, =0x082ff70c str r0, [r2, 0x8] b _0806A122 .align 2, 0 -_0806A0EC: .4byte 0x0202499c -_0806A0F0: .4byte 0x08329d98 -_0806A0F4: .4byte 0x082ff70c + .pool _0806A0F8: movs r0, 0xFA lsls r0, 1 cmp r5, r0 bls _0806A118 - ldr r0, _0806A110 - ldr r3, _0806A114 + ldr r0, =0x08309aac + ldr r3, =0xfffffe0c adds r1, r5, r3 lsls r1, 2 adds r1, r0 @@ -214379,10 +206055,9 @@ _0806A0F8: str r0, [r2, 0x8] b _0806A122 .align 2, 0 -_0806A110: .4byte 0x08309aac -_0806A114: .4byte 0xfffffe0c + .pool _0806A118: - ldr r0, _0806A128 + ldr r0, =0x08309aac lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -214392,7 +206067,7 @@ _0806A122: pop {r0} bx r0 .align 2, 0 -_0806A128: .4byte 0x08309aac + .pool thumb_func_end sub_806A068 thumb_func_start template_build_for_pokemon_or_trainer @@ -214402,7 +206077,7 @@ template_build_for_pokemon_or_trainer: @ 806A12C lsrs r4, r0, 16 lsls r1, 24 lsrs r3, r1, 24 - ldr r0, _0806A164 + ldr r0, =0x0202499c strh r4, [r0, 0x2] adds r5, r0, 0 cmp r3, 0 @@ -214410,7 +206085,7 @@ template_build_for_pokemon_or_trainer: @ 806A12C cmp r3, 0x2 bne _0806A170 _0806A144: - ldr r2, _0806A168 + ldr r2, =0x08329df8 lsls r0, r4, 1 adds r0, r4 lsls r0, 3 @@ -214420,17 +206095,15 @@ _0806A144: stm r1!, {r2,r3,r6} ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} - ldr r1, _0806A16C + ldr r1, =0x08305d0c lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] b _0806A1B0 .align 2, 0 -_0806A164: .4byte 0x0202499c -_0806A168: .4byte 0x08329df8 -_0806A16C: .4byte 0x08305d0c + .pool _0806A170: - ldr r0, _0806A190 + ldr r0, =0x020244d4 ldr r1, [r0] cmp r1, 0 beq _0806A194 @@ -214446,9 +206119,9 @@ _0806A170: stm r1!, {r2,r3,r6} b _0806A1A8 .align 2, 0 -_0806A190: .4byte 0x020244d4 + .pool _0806A194: - ldr r0, _0806A1B8 + ldr r0, =0x08329d98 lsls r1, r3, 1 adds r1, r3 lsls r1, 3 @@ -214459,7 +206132,7 @@ _0806A194: ldm r1!, {r0,r3,r6} stm r2!, {r0,r3,r6} _0806A1A8: - ldr r0, _0806A1BC + ldr r0, =0x0830536c lsls r1, r4, 2 adds r1, r0 ldr r0, [r1] @@ -214469,8 +206142,7 @@ _0806A1B0: pop {r0} bx r0 .align 2, 0 -_0806A1B8: .4byte 0x08329d98 -_0806A1BC: .4byte 0x0830536c + .pool thumb_func_end template_build_for_pokemon_or_trainer thumb_func_start sub_806A1C0 @@ -214480,11 +206152,11 @@ sub_806A1C0: @ 806A1C0 lsrs r5, r0, 16 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _0806A1EC + ldr r0, =0x020244d4 ldr r2, [r0] cmp r2, 0 beq _0806A1F4 - ldr r0, _0806A1F0 + ldr r0, =0x0202499c lsls r1, r4, 1 adds r1, r4 lsls r1, 3 @@ -214498,11 +206170,10 @@ sub_806A1C0: @ 806A1C0 adds r3, r0, 0 b _0806A20A .align 2, 0 -_0806A1EC: .4byte 0x020244d4 -_0806A1F0: .4byte 0x0202499c + .pool _0806A1F4: - ldr r3, _0806A21C - ldr r2, _0806A220 + ldr r3, =0x0202499c + ldr r2, =0x08329d98 lsls r0, r4, 1 adds r0, r4 lsls r0, 3 @@ -214514,7 +206185,7 @@ _0806A1F4: stm r1!, {r2,r4,r6} _0806A20A: strh r5, [r3, 0x2] - ldr r0, _0806A224 + ldr r0, =0x0830536c lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -214523,9 +206194,7 @@ _0806A20A: pop {r0} bx r0 .align 2, 0 -_0806A21C: .4byte 0x0202499c -_0806A220: .4byte 0x08329d98 -_0806A224: .4byte 0x0830536c + .pool thumb_func_end sub_806A1C0 thumb_func_start pokemon_encrypt @@ -214589,12 +206258,12 @@ pokemon_data_permutator: @ 806A270 b _0806A510 _0806A288: lsls r0, 2 - ldr r1, _0806A294 + ldr r1, =_0806A298 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806A294: .4byte _0806A298 + .pool .align 2, 0 _0806A298: .4byte _0806A2F8 @@ -214976,12 +206645,12 @@ pokemon_getattr: @ 806A518 b _0806A666 _0806A528: lsls r0, 2 - ldr r1, _0806A534 + ldr r1, =_0806A538 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806A534: .4byte _0806A538 + .pool .align 2, 0 _0806A538: .4byte _0806A5C0 @@ -215187,12 +206856,12 @@ _0806A6F2: b _0806AC8C _0806A6FA: lsls r0, 2 - ldr r1, _0806A704 + ldr r1, =_0806A708 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806A704: .4byte _0806A708 + .pool .align 2, 0 _0806A708: .4byte _0806A858 @@ -215295,7 +206964,7 @@ _0806A864: cmp r0, 0 beq _0806A89C movs r4, 0 - ldr r0, _0806A898 + ldr r0, =0x085ccb90 ldrb r1, [r0] adds r2, r0, 0 cmp r1, 0xFF @@ -215315,13 +206984,13 @@ _0806A87E: bne _0806A87E b _0806A944 .align 2, 0 -_0806A898: .4byte 0x085ccb90 + .pool _0806A89C: movs r0, 0x4 ands r0, r1 cmp r0, 0 beq _0806A8BC - ldr r1, _0806A8B8 + ldr r1, =0x085e8264 adds r0, r6, 0 bl gf_strcpy adds r0, r6, 0 @@ -215330,7 +206999,7 @@ _0806A89C: lsrs r4, r0, 16 b _0806AC8C .align 2, 0 -_0806A8B8: .4byte 0x085e8264 + .pool _0806A8BC: mov r1, r8 ldrb r0, [r1, 0x12] @@ -215723,7 +207392,7 @@ _0806AB20: b _0806AC8C _0806AB2A: ldrh r0, [r6] - ldr r1, _0806AB68 + ldr r1, =0x00000163 cmp r0, r1 bne _0806AB34 b _0806AC8C @@ -215732,7 +207401,7 @@ _0806AB34: ldrh r5, [r2] adds r7, r1, 0 adds r2, r6, 0 - ldr r1, _0806AB6C + ldr r1, =0x0832a328 _0806AB3E: ldrh r3, [r2] cmp r5, r3 @@ -215758,8 +207427,7 @@ _0806AB5C: bne _0806AB3E b _0806AC8C .align 2, 0 -_0806AB68: .4byte 0x00000163 -_0806AB6C: .4byte 0x0832a328 + .pool _0806AB70: movs r4, 0 mov r1, r9 @@ -215933,12 +207601,12 @@ pokemon_setattr: @ 806ACAC cmp r0, 0xA bhi _0806AD90 lsls r0, 2 - ldr r1, _0806ACC4 + ldr r1, =_0806ACC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806ACC4: .4byte _0806ACC8 + .pool .align 2, 0 _0806ACC8: .4byte _0806ACF4 @@ -216114,12 +207782,12 @@ _0806AE1C: b _0806B3D8 _0806AE24: lsls r0, 2 - ldr r1, _0806AE30 + ldr r1, =_0806AE34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806AE30: .4byte _0806AE34 + .pool .align 2, 0 _0806AE34: .4byte _0806AF78 @@ -216447,13 +208115,13 @@ _0806B10C: ands r1, r0 lsls r1, 7 ldrh r2, [r5, 0x2] - ldr r0, _0806B120 + ldr r0, =0xfffff87f ands r0, r2 orrs r0, r1 strh r0, [r5, 0x2] b _0806B3D8 .align 2, 0 -_0806B120: .4byte 0xfffff87f + .pool _0806B124: ldrb r1, [r4] movs r0, 0xF @@ -216492,13 +208160,13 @@ _0806B15E: ands r1, r0 lsls r1, 5 ldrh r2, [r5, 0x4] - ldr r0, _0806B174 + ldr r0, =0xfffffc1f ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] b _0806B3D8 .align 2, 0 -_0806B174: .4byte 0xfffffc1f + .pool _0806B178: ldrb r1, [r4] movs r0, 0x1F @@ -216517,26 +208185,26 @@ _0806B18E: ands r2, r0 lsls r2, 15 ldr r0, [r5, 0x4] - ldr r1, _0806B1A4 + ldr r1, =0xfff07fff ands r0, r1 orrs r0, r2 str r0, [r5, 0x4] b _0806B3D8 .align 2, 0 -_0806B1A4: .4byte 0xfff07fff + .pool _0806B1A8: ldrb r1, [r4] movs r0, 0x1F ands r1, r0 lsls r1, 4 ldrh r2, [r5, 0x6] - ldr r0, _0806B1BC + ldr r0, =0xfffffe0f ands r0, r2 orrs r0, r1 strh r0, [r5, 0x6] b _0806B3D8 .align 2, 0 -_0806B1BC: .4byte 0xfffffe0f + .pool _0806B1C0: ldrb r1, [r4] movs r0, 0x1F @@ -216612,13 +208280,13 @@ _0806B238: ands r1, r0 lsls r1, 6 ldrh r2, [r5, 0x8] - ldr r0, _0806B24C + ldr r0, =0xfffffe3f ands r0, r2 orrs r0, r1 strh r0, [r5, 0x8] b _0806B3D8 .align 2, 0 -_0806B24C: .4byte 0xfffffe3f + .pool _0806B250: ldrb r1, [r4] movs r0, 0x7 @@ -216797,7 +208465,7 @@ _0806B35E: ands r1, r4 lsls r1, 5 ldrh r2, [r5, 0x4] - ldr r0, _0806B3FC + ldr r0, =0xfffffc1f ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] @@ -216814,7 +208482,7 @@ _0806B35E: ands r1, r4 lsls r1, 15 ldr r0, [r5, 0x4] - ldr r2, _0806B400 + ldr r2, =0xfff07fff ands r0, r2 orrs r0, r1 str r0, [r5, 0x4] @@ -216822,7 +208490,7 @@ _0806B35E: ands r1, r4 lsls r1, 4 ldrh r2, [r5, 0x6] - ldr r0, _0806B404 + ldr r0, =0xfffffe0f ands r0, r2 orrs r0, r1 strh r0, [r5, 0x6] @@ -216854,9 +208522,7 @@ _0806B3EC: pop {r0} bx r0 .align 2, 0 -_0806B3FC: .4byte 0xfffffc1f -_0806B400: .4byte 0xfff07fff -_0806B404: .4byte 0xfffffe0f + .pool thumb_func_end pokemon_setattr_encrypted thumb_func_start memcpy_pokemon @@ -216871,7 +208537,7 @@ memcpy_pokemon: @ 806B408 pokemon_catch: @ 806B414 push {r4-r6,lr} adds r6, r0, 0 - ldr r4, _0806B440 + ldr r4, =0x03005d90 ldr r2, [r4] movs r1, 0x7 bl pokemon_setattr @@ -216888,7 +208554,7 @@ pokemon_catch: @ 806B414 movs r5, 0 b _0806B446 .align 2, 0 -_0806B440: .4byte 0x03005d90 + .pool _0806B444: adds r5, 0x1 _0806B446: @@ -216897,7 +208563,7 @@ _0806B446: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0806B478 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -216909,14 +208575,13 @@ _0806B446: adds r1, r6, 0 movs r2, 0x64 bl memcpy_pokemon - ldr r1, _0806B47C + ldr r1, =0x020244e9 adds r0, r5, 0x1 strb r0, [r1] movs r0, 0 b _0806B48A .align 2, 0 -_0806B478: .4byte 0x020244ec -_0806B47C: .4byte 0x020244e9 + .pool _0806B480: adds r0, r6, 0 bl pokemon_add_to_pc @@ -216934,7 +208599,7 @@ pokemon_add_to_pc: @ 806B490 mov r7, r8 push {r7} mov r8, r0 - ldr r0, _0806B504 + ldr r0, =0x00004036 bl var_get lsls r0, 24 lsrs r0, 24 @@ -216962,29 +208627,26 @@ _0806B4B2: mov r1, r8 movs r2, 0x50 bl memcpy_pokemon - ldr r0, _0806B508 + ldr r0, =0x020375f6 strh r5, [r0] - ldr r0, _0806B50C + ldr r0, =0x020375f8 strh r6, [r0] bl get_unknown_box_id lsls r0, 16 lsrs r0, 16 cmp r0, r5 beq _0806B4F4 - ldr r0, _0806B510 + ldr r0, =0x000008d7 bl flag_clear _0806B4F4: lsls r1, r5, 16 - ldr r0, _0806B504 + ldr r0, =0x00004036 lsrs r1, 16 bl var_set movs r0, 0x1 b _0806B530 .align 2, 0 -_0806B504: .4byte 0x00004036 -_0806B508: .4byte 0x020375f6 -_0806B50C: .4byte 0x020375f8 -_0806B510: .4byte 0x000008d7 + .pool _0806B514: adds r6, 0x1 cmp r6, 0x1D @@ -217011,12 +208673,12 @@ _0806B530: thumb_func_start calc_player_party_count calc_player_party_count: @ 806B53C push {r4,lr} - ldr r0, _0806B548 + ldr r0, =0x020244e9 movs r1, 0 strb r1, [r0] b _0806B554 .align 2, 0 -_0806B548: .4byte 0x020244e9 + .pool _0806B54C: ldrb r0, [r4] adds r0, 0x1 @@ -217030,7 +208692,7 @@ _0806B554: adds r1, r0, 0 movs r0, 0x64 muls r0, r1 - ldr r1, _0806B57C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB movs r2, 0 @@ -217043,18 +208705,18 @@ _0806B572: pop {r1} bx r1 .align 2, 0 -_0806B57C: .4byte 0x020244ec + .pool thumb_func_end calc_player_party_count thumb_func_start calc_enemy_party_count calc_enemy_party_count: @ 806B580 push {r4,lr} - ldr r0, _0806B58C + ldr r0, =0x020244ea movs r1, 0 strb r1, [r0] b _0806B598 .align 2, 0 -_0806B58C: .4byte 0x020244ea + .pool _0806B590: ldrb r0, [r4] adds r0, 0x1 @@ -217068,7 +208730,7 @@ _0806B598: adds r1, r0, 0 movs r0, 0x64 muls r0, r1 - ldr r1, _0806B5C0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB movs r2, 0 @@ -217081,7 +208743,7 @@ _0806B5B6: pop {r1} bx r1 .align 2, 0 -_0806B5C0: .4byte 0x02024744 + .pool thumb_func_end calc_enemy_party_count thumb_func_start sub_806B5C4 @@ -217089,7 +208751,7 @@ sub_806B5C4: @ 806B5C4 push {r4-r6,lr} movs r6, 0 bl calc_player_party_count - ldr r1, _0806B630 + ldr r1, =0x020244e9 ldrb r0, [r1] cmp r0, 0x1 beq _0806B628 @@ -217101,7 +208763,7 @@ _0806B5DC: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0806B634 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -217126,7 +208788,7 @@ _0806B5DC: adds r6, 0x1 _0806B616: adds r5, 0x1 - ldr r0, _0806B630 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 blt _0806B5DC @@ -217140,8 +208802,7 @@ _0806B628: pop {r1} bx r1 .align 2, 0 -_0806B630: .4byte 0x020244e9 -_0806B634: .4byte 0x020244ec + .pool thumb_func_end sub_806B5C4 thumb_func_start sub_806B638 @@ -217153,7 +208814,7 @@ _0806B63E: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0806B680 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -217182,7 +208843,7 @@ _0806B670: movs r0, 0x1 b _0806B68C .align 2, 0 -_0806B680: .4byte 0x020244ec + .pool _0806B684: movs r0, 0 cmp r6, 0x1 @@ -217202,8 +208863,8 @@ sub_806B694: @ 806B694 lsls r1, 24 cmp r1, 0 beq _0806B6B8 - ldr r2, _0806B6B0 - ldr r1, _0806B6B4 + ldr r2, =0x0202420a + ldr r1, =0x083203cc lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -217211,11 +208872,10 @@ sub_806B694: @ 806B694 ldrb r0, [r0, 0x17] b _0806B6C6 .align 2, 0 -_0806B6B0: .4byte 0x0202420a -_0806B6B4: .4byte 0x083203cc + .pool _0806B6B8: - ldr r2, _0806B6D0 - ldr r1, _0806B6D4 + ldr r2, =0x0202420a + ldr r1, =0x083203cc lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -217227,8 +208887,7 @@ _0806B6C6: pop {r1} bx r1 .align 2, 0 -_0806B6D0: .4byte 0x0202420a -_0806B6D4: .4byte 0x083203cc + .pool thumb_func_end sub_806B694 thumb_func_start sub_806B6D8 @@ -217267,7 +208926,7 @@ create_enemy_party: @ 806B70C sub sp, 0x14 adds r5, r0, 0 bl zero_enemy_party_data - ldr r4, _0806B824 + ldr r4, =0x020244a8 ldr r0, [r4] ldr r0, [r0] adds r1, r5, 0 @@ -217276,7 +208935,7 @@ create_enemy_party: @ 806B70C movs r0, 0 mov r9, r0 _0806B730: - ldr r1, _0806B824 + ldr r1, =0x020244a8 ldr r3, [r1] ldr r2, [r3] mov r4, r9 @@ -217292,7 +208951,7 @@ _0806B730: movs r0, 0x64 mov r6, r9 muls r6, r0 - ldr r4, _0806B828 + ldr r4, =0x02024744 mov r8, r4 adds r5, r6, r4 ldrh r1, [r1] @@ -217316,7 +208975,7 @@ _0806B730: adds r0, r5, 0 movs r3, 0xF bl create_pokemon_set_level - ldr r1, _0806B824 + ldr r1, =0x020244a8 ldr r0, [r1] adds r1, r7, 0 adds r1, 0x88 @@ -217333,7 +208992,7 @@ _0806B730: _0806B7A0: adds r1, r5, 0 adds r1, 0x1A - ldr r2, _0806B824 + ldr r2, =0x020244a8 ldr r0, [r2] ldr r2, [r0] adds r2, r7 @@ -217346,7 +209005,7 @@ _0806B7A0: movs r3, 0x64 mov r0, r9 muls r0, r3 - ldr r1, _0806B828 + ldr r1, =0x02024744 adds r7, r0, r1 mov r4, r10 lsls r0, r4, 1 @@ -217356,7 +209015,7 @@ _0806B7A0: _0806B7CE: adds r1, r5, 0 adds r1, 0xD - ldr r2, _0806B824 + ldr r2, =0x020244a8 ldr r0, [r2] ldr r2, [r0] adds r2, r6 @@ -217364,7 +209023,7 @@ _0806B7CE: bl pokemon_setattr adds r1, r5, 0 adds r1, 0x11 - ldr r3, _0806B824 + ldr r3, =0x020244a8 ldr r0, [r3] ldr r0, [r0] adds r0, 0x4C @@ -217373,7 +209032,7 @@ _0806B7CE: lsls r2, r0, 1 adds r2, r0 lsls r2, 2 - ldr r0, _0806B82C + ldr r0, =0x0831c89c adds r2, r0 adds r0, r7, 0 bl pokemon_setattr @@ -217396,16 +209055,14 @@ _0806B80A: pop {r0} bx r0 .align 2, 0 -_0806B824: .4byte 0x020244a8 -_0806B828: .4byte 0x02024744 -_0806B82C: .4byte 0x0831c89c + .pool thumb_func_end create_enemy_party thumb_func_start sub_806B830 sub_806B830: @ 806B830 push {r4,r5,lr} - ldr r5, _0806B864 - ldr r0, _0806B868 + ldr r5, =0x08329eb8 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r4, [r0] ldrb r0, [r4, 0x9] @@ -217421,23 +209078,21 @@ sub_806B830: @ 806B830 adds r0, r1 adds r0, r5 ldrb r0, [r0] - ldr r1, _0806B86C + ldr r1, =0x0831f578 adds r0, r1 ldrb r0, [r0] pop {r4,r5} pop {r1} bx r1 .align 2, 0 -_0806B864: .4byte 0x08329eb8 -_0806B868: .4byte 0x020244a8 -_0806B86C: .4byte 0x0831f578 + .pool thumb_func_end sub_806B830 thumb_func_start sub_806B870 sub_806B870: @ 806B870 push {r4,r5,lr} - ldr r5, _0806B8A4 - ldr r0, _0806B8A8 + ldr r5, =0x08329eb8 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r4, [r0] ldrb r0, [r4, 0x9] @@ -217453,16 +209108,14 @@ sub_806B870: @ 806B870 adds r0, r1 adds r0, r5 ldrb r0, [r0] - ldr r1, _0806B8AC + ldr r1, =0x0831f5ca adds r0, r1 ldrb r0, [r0] pop {r4,r5} pop {r1} bx r1 .align 2, 0 -_0806B8A4: .4byte 0x08329eb8 -_0806B8A8: .4byte 0x020244a8 -_0806B8AC: .4byte 0x0831f5ca + .pool thumb_func_end sub_806B870 thumb_func_start sub_806B8B0 @@ -217472,7 +209125,7 @@ sub_806B8B0: @ 806B8B0 _0806B8B4: movs r0, 0x64 muls r0, r4 - ldr r1, _0806B8CC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB movs r2, 0 @@ -217482,7 +209135,7 @@ _0806B8B4: movs r0, 0 b _0806B8DE .align 2, 0 -_0806B8CC: .4byte 0x020244ec + .pool _0806B8D0: adds r4, 0x1 cmp r4, 0x5 @@ -217537,14 +209190,14 @@ get_pokemon_name: @ 806B914 movs r0, 0xCE lsls r0, 1 mov r12, r0 - ldr r7, _0806B930 + ldr r7, =0x083185c8 movs r0, 0xB muls r0, r5 adds r3, r0, r7 adds r2, r6, 0 b _0806B93A .align 2, 0 -_0806B930: .4byte 0x083185c8 + .pool _0806B934: adds r3, 0x1 adds r2, 0x1 @@ -217580,13 +209233,13 @@ move_get_pp_info: @ 806B960 lsrs r0, 16 lsls r2, 24 lsrs r2, 24 - ldr r4, _0806B9A0 + ldr r4, =0x0831c898 lsls r3, r0, 1 adds r3, r0 lsls r3, 2 adds r3, r4 ldrb r4, [r3, 0x4] - ldr r0, _0806B9A4 + ldr r0, =0x08329d22 adds r0, r2, r0 ldrb r3, [r0] ands r3, r1 @@ -217606,8 +209259,7 @@ move_get_pp_info: @ 806B960 pop {r1} bx r1 .align 2, 0 -_0806B9A0: .4byte 0x0831c898 -_0806B9A4: .4byte 0x08329d22 + .pool thumb_func_end move_get_pp_info thumb_func_start sub_806B9A8 @@ -217624,7 +209276,7 @@ sub_806B9A8: @ 806B9A8 lsrs r0, 24 mov r1, sp strb r0, [r1] - ldr r1, _0806B9E0 + ldr r1, =0x08329d26 adds r4, r1 ldrb r1, [r4] ands r1, r0 @@ -217639,7 +209291,7 @@ sub_806B9A8: @ 806B9A8 pop {r0} bx r0 .align 2, 0 -_0806B9E0: .4byte 0x08329d26 + .pool thumb_func_end sub_806B9A8 thumb_func_start sub_806B9E4 @@ -217647,7 +209299,7 @@ sub_806B9E4: @ 806B9E4 lsls r1, 24 lsrs r1, 24 adds r0, 0x3B - ldr r2, _0806B9F8 + ldr r2, =0x08329d26 adds r1, r2 ldrb r2, [r0] ldrb r1, [r1] @@ -217655,7 +209307,7 @@ sub_806B9E4: @ 806B9E4 strb r1, [r0] bx lr .align 2, 0 -_0806B9F8: .4byte 0x08329d26 + .pool thumb_func_end sub_806B9E4 thumb_func_start battle_data_fill @@ -217675,13 +209327,13 @@ battle_data_fill: @ 806B9FC movs r0, 0x64 mov r5, r9 muls r5, r0 - ldr r0, _0806BCE8 + ldr r0, =0x020244ec adds r5, r0 adds r0, r5, 0 movs r1, 0xB movs r2, 0 bl pokemon_getattr - ldr r1, _0806BCEC + ldr r1, =0x02024084 mov r8, r1 movs r1, 0x58 ldr r2, [sp, 0x14] @@ -217724,7 +209376,7 @@ _0806BA4E: movs r0, 0x64 mov r4, r9 muls r4, r0 - ldr r0, _0806BCE8 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -217779,7 +209431,7 @@ _0806BA4E: ands r0, r2 lsls r0, 5 ldrh r2, [r7, 0x14] - ldr r1, _0806BCF0 + ldr r1, =0xfffffc1f ands r1, r2 orrs r1, r0 strh r1, [r7, 0x14] @@ -217803,7 +209455,7 @@ _0806BA4E: ands r1, r0 lsls r1, 15 ldr r0, [r7, 0x14] - ldr r2, _0806BCF4 + ldr r2, =0xfff07fff ands r0, r2 orrs r0, r1 str r0, [r7, 0x14] @@ -217815,7 +209467,7 @@ _0806BA4E: ands r0, r3 lsls r0, 4 ldrh r2, [r7, 0x16] - ldr r1, _0806BCF8 + ldr r1, =0xfffffe0f ands r1, r2 orrs r1, r0 strh r1, [r7, 0x16] @@ -217920,7 +209572,7 @@ _0806BA4E: adds r1, 0x48 adds r1, r5, r1 str r0, [r1] - ldr r2, _0806BCFC + ldr r2, =0x083203cc ldrh r1, [r7] lsls r0, r1, 3 subs r0, r1 @@ -217963,7 +209615,7 @@ _0806BA4E: bl pokemon_getattr ldr r0, [sp, 0x14] bl battle_side_get_owner - ldr r1, _0806BD00 + ldr r1, =0x0202449c lsls r0, 24 lsrs r0, 23 adds r0, 0xA8 @@ -218004,13 +209656,7 @@ _0806BCB2: pop {r0} bx r0 .align 2, 0 -_0806BCE8: .4byte 0x020244ec -_0806BCEC: .4byte 0x02024084 -_0806BCF0: .4byte 0xfffffc1f -_0806BCF4: .4byte 0xfff07fff -_0806BCF8: .4byte 0xfffffe0f -_0806BCFC: .4byte 0x083203cc -_0806BD00: .4byte 0x0202449c + .pool thumb_func_end battle_data_fill thumb_func_start sub_806BD04 @@ -218073,16 +209719,16 @@ sub_806BD28: @ 806BD28 lsrs r0, 16 cmp r0, 0xAF bne _0806BDBC - ldr r0, _0806BD98 - ldr r1, _0806BD9C + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _0806BDA8 - ldr r2, _0806BDA0 - ldr r0, _0806BDA4 + ldr r2, =0x02024404 + ldr r0, =0x020244b8 ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -218091,32 +209737,28 @@ sub_806BD28: @ 806BD28 ldrb r0, [r0, 0x7] b _0806BDC4 .align 2, 0 -_0806BD98: .4byte 0x030022c0 -_0806BD9C: .4byte 0x00000439 -_0806BDA0: .4byte 0x02024404 -_0806BDA4: .4byte 0x020244b8 + .pool _0806BDA8: - ldr r0, _0806BDB4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0806BDB8 + ldr r2, =0x00003226 adds r0, r2 ldrb r0, [r0] b _0806BDC4 .align 2, 0 -_0806BDB4: .4byte 0x03005d8c -_0806BDB8: .4byte 0x00003226 + .pool _0806BDBC: bl itemid_get_x12 lsls r0, 24 lsrs r0, 24 _0806BDC4: str r0, [sp, 0x34] - ldr r1, _0806BE20 - ldr r0, _0806BE24 + ldr r1, =0x0202420f + ldr r0, =0x020244b8 ldrb r2, [r0] strb r2, [r1] - ldr r0, _0806BE28 - ldr r3, _0806BE2C + ldr r0, =0x030022c0 + ldr r3, =0x00000439 adds r0, r3 ldrb r1, [r0] movs r0, 0x2 @@ -218125,7 +209767,7 @@ _0806BDC4: lsrs r1, r0, 24 cmp r1, 0 beq _0806BE64 - ldr r0, _0806BE30 + ldr r0, =0x02024064 strb r2, [r0] ldrb r0, [r0] bl battle_side_get_owner @@ -218135,13 +209777,13 @@ _0806BDC4: orrs r1, r0 lsrs r1, 31 str r1, [sp, 0x1C] - ldr r0, _0806BE34 + ldr r0, =0x0202406c ldr r4, [sp, 0xC] subs r4, 0xD ldrb r0, [r0] cmp r1, r0 bge _0806BE70 - ldr r2, _0806BE38 + ldr r2, =0x0202406e lsls r0, r1, 1 adds r0, r2 ldrh r3, [r0] @@ -218155,18 +209797,12 @@ _0806BDC4: str r0, [sp, 0x38] b _0806BE70 .align 2, 0 -_0806BE20: .4byte 0x0202420f -_0806BE24: .4byte 0x020244b8 -_0806BE28: .4byte 0x030022c0 -_0806BE2C: .4byte 0x00000439 -_0806BE30: .4byte 0x02024064 -_0806BE34: .4byte 0x0202406c -_0806BE38: .4byte 0x0202406e + .pool _0806BE3C: ldr r1, [sp, 0x1C] adds r1, 0x2 str r1, [sp, 0x1C] - ldr r0, _0806BE60 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r1, r0 bge _0806BE70 @@ -218182,9 +209818,9 @@ _0806BE3C: str r0, [sp, 0x38] b _0806BE70 .align 2, 0 -_0806BE60: .4byte 0x0202406c + .pool _0806BE64: - ldr r0, _0806BE8C + ldr r0, =0x02024064 strb r1, [r0] movs r3, 0x4 str r3, [sp, 0x38] @@ -218195,7 +209831,7 @@ _0806BE70: lsrs r0, 16 cmp r0, 0xA5 bhi _0806BEF0 - ldr r1, _0806BE90 + ldr r1, =0x0831e58c lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] @@ -218206,44 +209842,39 @@ _0806BE70: beq _0806BE9A b _0806BEF0 .align 2, 0 -_0806BE8C: .4byte 0x02024064 -_0806BE90: .4byte 0x0831e58c + .pool _0806BE94: ldr r1, [sp, 0xC] cmp r1, 0xAF bne _0806BEF6 _0806BE9A: - ldr r0, _0806BEBC - ldr r2, _0806BEC0 + ldr r0, =0x030022c0 + ldr r2, =0x00000439 adds r0, r2 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _0806BECC - ldr r0, _0806BEC4 + ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0806BEC8 + ldr r1, =0x0202440c adds r0, r1 b _0806BEF6 .align 2, 0 -_0806BEBC: .4byte 0x030022c0 -_0806BEC0: .4byte 0x00000439 -_0806BEC4: .4byte 0x02024064 -_0806BEC8: .4byte 0x0202440c + .pool _0806BECC: - ldr r0, _0806BED8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _0806BEDC + ldr r3, =0x00003214 adds r3, r0, r3 str r3, [sp, 0x24] b _0806BEF8 .align 2, 0 -_0806BED8: .4byte 0x03005d8c -_0806BEDC: .4byte 0x00003214 + .pool _0806BEE0: mov r0, r8 movs r2, 0 @@ -218266,12 +209897,12 @@ _0806BEFC: bl _0806CD4C _0806BF06: lsls r0, 2 - ldr r1, _0806BF10 + ldr r1, =_0806BF14 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806BF10: .4byte _0806BF14 + .pool .align 2, 0 _0806BF14: .4byte _0806BF2C @@ -218290,8 +209921,8 @@ _0806BF2C: adds r6, r2, 0 cmp r0, 0 beq _0806BF76 - ldr r0, _0806BFE8 - ldr r5, _0806BFEC + ldr r0, =0x030022c0 + ldr r5, =0x00000439 adds r0, r5 ldrb r1, [r0] movs r0, 0x2 @@ -218301,7 +209932,7 @@ _0806BF2C: ldr r0, [sp, 0x38] cmp r0, 0x4 beq _0806BF76 - ldr r1, _0806BFF0 + ldr r1, =0x02024084 movs r0, 0x58 ldr r2, [sp, 0x38] muls r0, r2 @@ -218313,7 +209944,7 @@ _0806BF2C: ands r0, r1 cmp r0, 0 beq _0806BF76 - ldr r0, _0806BFF4 + ldr r0, =0xfff0ffff ands r1, r0 str r1, [r2] movs r3, 0 @@ -218324,8 +209955,8 @@ _0806BF76: ands r0, r1 cmp r0, 0 beq _0806BFA4 - ldr r1, _0806BFF0 - ldr r0, _0806BFF8 + ldr r1, =0x02024084 + ldr r0, =0x02024064 ldrb r2, [r0] movs r0, 0x58 muls r0, r2 @@ -218350,8 +209981,8 @@ _0806BFA4: bne _0806BFB2 bl _0806CD4C _0806BFB2: - ldr r6, _0806BFF0 - ldr r5, _0806BFF8 + ldr r6, =0x02024084 + ldr r5, =0x02024064 ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -218378,11 +210009,7 @@ _0806BFE0: strb r0, [r1, 0x19] b _0806C110 .align 2, 0 -_0806BFE8: .4byte 0x030022c0 -_0806BFEC: .4byte 0x00000439 -_0806BFF0: .4byte 0x02024084 -_0806BFF4: .4byte 0xfff0ffff -_0806BFF8: .4byte 0x02024064 + .pool _0806BFFC: ldr r1, [sp, 0x24] ldr r3, [sp, 0x1C] @@ -218394,8 +210021,8 @@ _0806BFFC: adds r6, r2, 0 cmp r3, 0 beq _0806C042 - ldr r7, _0806C084 - ldr r5, _0806C088 + ldr r7, =0x02024084 + ldr r5, =0x02024064 ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -218428,8 +210055,8 @@ _0806C042: bne _0806C050 bl _0806CD4C _0806C050: - ldr r6, _0806C084 - ldr r5, _0806C088 + ldr r6, =0x02024084 + ldr r5, =0x02024064 ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -218454,8 +210081,7 @@ _0806C06A: strb r0, [r1, 0x1B] b _0806C110 .align 2, 0 -_0806C084: .4byte 0x02024084 -_0806C088: .4byte 0x02024064 + .pool _0806C08C: ldr r1, [sp, 0x24] ldr r3, [sp, 0x1C] @@ -218467,8 +210093,8 @@ _0806C08C: adds r6, r2, 0 cmp r3, 0 beq _0806C0D2 - ldr r7, _0806C118 - ldr r5, _0806C11C + ldr r7, =0x02024084 + ldr r5, =0x02024064 ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -218501,8 +210127,8 @@ _0806C0D2: bne _0806C0E0 bl _0806CD4C _0806C0E0: - ldr r6, _0806C118 - ldr r5, _0806C11C + ldr r6, =0x02024084 + ldr r5, =0x02024064 ldrb r0, [r5] movs r4, 0x58 muls r0, r4 @@ -218530,8 +210156,7 @@ _0806C110: str r0, [sp, 0x20] bl _0806CD4C .align 2, 0 -_0806C118: .4byte 0x02024084 -_0806C11C: .4byte 0x02024064 + .pool _0806C120: ldr r1, [sp, 0x24] ldr r3, [sp, 0x1C] @@ -218542,8 +210167,8 @@ _0806C120: adds r6, r2, 0 cmp r0, 0 beq _0806C168 - ldr r5, _0806C2DC - ldr r4, _0806C2E0 + ldr r5, =0x02024294 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -218579,7 +210204,7 @@ _0806C168: bl pokemon_getattr cmp r0, 0x64 beq _0806C1CA - ldr r5, _0806C2E4 + ldr r5, =0x0831f72c mov r0, r8 movs r1, 0x38 movs r2, 0 @@ -218591,7 +210216,7 @@ _0806C168: bl pokemon_getattr adds r4, 0x1 lsls r4, 2 - ldr r2, _0806C2E8 + ldr r2, =0x083203cc lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -218629,7 +210254,7 @@ _0806C1CA: ldr r1, [sp, 0x38] cmp r1, 0x4 beq _0806C202 - ldr r1, _0806C2EC + ldr r1, =0x02024084 movs r0, 0x58 ldr r3, [sp, 0x38] adds r2, r3, 0 @@ -218637,7 +210262,7 @@ _0806C1CA: adds r1, 0x50 adds r2, r1 ldr r0, [r2] - ldr r1, _0806C2F0 + ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] _0806C202: @@ -218649,7 +210274,7 @@ _0806C206: ands r0, r1 cmp r0, 0 beq _0806C226 - ldr r2, _0806C2F4 + ldr r2, =0x00000f88 mov r0, r8 ldr r1, [sp, 0x10] ldr r3, [sp, 0x38] @@ -218715,8 +210340,8 @@ _0806C286: bne _0806C294 bl _0806CD4C _0806C294: - ldr r0, _0806C2F8 - ldr r5, _0806C2FC + ldr r0, =0x030022c0 + ldr r5, =0x00000439 adds r0, r5 ldrb r1, [r0] movs r0, 0x2 @@ -218730,7 +210355,7 @@ _0806C2A8: bne _0806C2B2 bl _0806CD4C _0806C2B2: - ldr r1, _0806C2EC + ldr r1, =0x02024084 movs r0, 0x58 ldr r2, [sp, 0x38] muls r0, r2 @@ -218751,15 +210376,7 @@ _0806C2CC: str r3, [sp, 0x20] bl _0806CD4C .align 2, 0 -_0806C2DC: .4byte 0x02024294 -_0806C2E0: .4byte 0x02024064 -_0806C2E4: .4byte 0x0831f72c -_0806C2E8: .4byte 0x083203cc -_0806C2EC: .4byte 0x02024084 -_0806C2F0: .4byte 0xf7ffffff -_0806C2F4: .4byte 0x00000f88 -_0806C2F8: .4byte 0x030022c0 -_0806C2FC: .4byte 0x00000439 + .pool _0806C300: ldr r5, [sp, 0x24] ldr r1, [sp, 0x1C] @@ -218778,7 +210395,7 @@ _0806C300: movs r1, 0x15 movs r2, 0 bl pokemon_getattr - ldr r1, _0806C404 + ldr r1, =0x08329d22 ldr r3, [sp, 0x14] adds r1, r3, r1 ldrb r1, [r1] @@ -218818,7 +210435,7 @@ _0806C300: movs r1, 0x15 movs r2, 0 bl pokemon_getattr - ldr r1, _0806C408 + ldr r1, =0x08329d2a ldr r2, [sp, 0x14] adds r1, r2, r1 ldrb r1, [r1] @@ -218880,14 +210497,12 @@ _0806C3F2: b _0806C9AA _0806C3FA: lsls r0, r3, 2 - ldr r1, _0806C40C + ldr r1, =_0806C410 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806C404: .4byte 0x08329d22 -_0806C408: .4byte 0x08329d2a -_0806C40C: .4byte _0806C410 + .pool .align 2, 0 _0806C410: .4byte _0806C430 @@ -218907,7 +210522,7 @@ _0806C430: ldr r1, [sp, 0x28] adds r0, r5, r1 ldrb r5, [r0] - ldr r0, _0806C47C + ldr r0, =0x08329ec2 ldr r2, [sp, 0x2C] adds r0, r2, r0 ldrb r1, [r0] @@ -218920,7 +210535,7 @@ _0806C430: asrs r2, r0, 24 cmp r2, 0 ble _0806C498 - ldr r0, _0806C480 + ldr r0, =0x000001fd cmp r6, r0 bls _0806C466 b _0806BEF0 @@ -218938,8 +210553,7 @@ _0806C46E: subs r5, r0, r1 b _0806C486 .align 2, 0 -_0806C47C: .4byte 0x08329ec2 -_0806C480: .4byte 0x000001fd + .pool _0806C484: adds r5, r2, 0 _0806C486: @@ -218971,7 +210585,7 @@ _0806C4A8: _0806C4B2: str r0, [sp, 0x4] _0806C4B4: - ldr r0, _0806C4D8 + ldr r0, =0x08329ec2 ldr r5, [sp, 0x2C] adds r0, r5, r0 ldrb r1, [r0] @@ -218987,7 +210601,7 @@ _0806C4B4: str r0, [sp, 0x28] b _0806C978 .align 2, 0 -_0806C4D8: .4byte 0x08329ec2 + .pool _0806C4DC: movs r0, 0x10 mov r1, r10 @@ -219005,8 +210619,8 @@ _0806C4DC: lsls r0, 24 b _0806C83E _0806C4FC: - ldr r0, _0806C544 - ldr r2, _0806C548 + ldr r0, =0x030022c0 + ldr r2, =0x00000439 adds r0, r2 ldrb r1, [r0] movs r4, 0x2 @@ -219017,15 +210631,15 @@ _0806C4FC: ldr r3, [sp, 0x38] cmp r3, 0x4 beq _0806C55C - ldr r2, _0806C54C - ldr r1, _0806C550 + ldr r2, =0x02024210 + ldr r1, =0x0832a328 lsls r0, r3, 2 adds r0, r1 ldr r1, [r0] ldrb r0, [r2] bics r0, r1 strb r0, [r2] - ldr r1, _0806C554 + ldr r1, =0x0202406e lsls r0, r3, 1 adds r0, r1 ldrb r0, [r0] @@ -219035,20 +210649,15 @@ _0806C4FC: lsrs r1, 24 ldr r0, [sp, 0x38] bl battle_data_fill - ldr r0, _0806C558 + ldr r0, =0x02024064 ldrb r0, [r0] b _0806C574 .align 2, 0 -_0806C544: .4byte 0x030022c0 -_0806C548: .4byte 0x00000439 -_0806C54C: .4byte 0x02024210 -_0806C550: .4byte 0x0832a328 -_0806C554: .4byte 0x0202406e -_0806C558: .4byte 0x02024064 + .pool _0806C55C: - ldr r3, _0806C58C - ldr r1, _0806C590 - ldr r2, _0806C594 + ldr r3, =0x02024210 + ldr r1, =0x0832a328 + ldr r2, =0x02024064 ldrb r0, [r2] eors r0, r4 lsls r0, 2 @@ -219063,7 +210672,7 @@ _0806C574: lsls r0, 24 cmp r0, 0 bne _0806C5B2 - ldr r1, _0806C598 + ldr r1, =0x03005d10 ldrb r0, [r1, 0x4] cmp r0, 0xFE bhi _0806C5B2 @@ -219071,10 +210680,7 @@ _0806C574: strb r0, [r1, 0x4] b _0806C5B2 .align 2, 0 -_0806C58C: .4byte 0x02024210 -_0806C590: .4byte 0x0832a328 -_0806C594: .4byte 0x02024064 -_0806C598: .4byte 0x03005d10 + .pool _0806C59C: mov r0, r8 movs r1, 0x39 @@ -219131,7 +210737,7 @@ _0806C5F4: movs r0, 0x1 b _0806C610 _0806C60A: - ldr r0, _0806C6CC + ldr r0, =0x02024474 adds r0, 0x23 ldrb r0, [r0] _0806C610: @@ -219175,8 +210781,8 @@ _0806C65E: movs r1, 0x39 mov r2, sp bl pokemon_setattr - ldr r0, _0806C6D0 - ldr r1, _0806C6D4 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -219186,7 +210792,7 @@ _0806C65E: ldr r2, [sp, 0x38] cmp r2, 0x4 beq _0806C6EC - ldr r1, _0806C6D8 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 adds r0, r1 @@ -219197,13 +210803,13 @@ _0806C65E: ands r0, r3 cmp r0, 0 bne _0806C6EC - ldr r4, _0806C6DC + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0806C6EC - ldr r1, _0806C6E0 + ldr r1, =0x03005d10 ldrb r0, [r1, 0x3] cmp r0, 0xFE bhi _0806C6AE @@ -219223,14 +210829,9 @@ _0806C6AE: strb r5, [r4] b _0806C6EC .align 2, 0 -_0806C6CC: .4byte 0x02024474 -_0806C6D0: .4byte 0x030022c0 -_0806C6D4: .4byte 0x00000439 -_0806C6D8: .4byte 0x02024084 -_0806C6DC: .4byte 0x02024064 -_0806C6E0: .4byte 0x03005d10 + .pool _0806C6E4: - ldr r1, _0806C6FC + ldr r1, =0x020241f0 ldr r0, [sp] negs r0, r0 str r0, [r1] @@ -219244,7 +210845,7 @@ _0806C6F0: mov r10, r2 b _0806C9AA .align 2, 0 -_0806C6FC: .4byte 0x020241f0 + .pool _0806C700: movs r7, 0x2 mov r0, r10 @@ -219345,8 +210946,8 @@ _0806C7CC: mov r1, r9 mov r2, sp bl pokemon_setattr - ldr r0, _0806C844 - ldr r1, _0806C848 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -219356,7 +210957,7 @@ _0806C7CC: ldr r2, [sp, 0x38] cmp r2, 0x4 beq _0806C82E - ldr r4, _0806C84C + ldr r4, =0x02024084 movs r0, 0x58 adds r3, r2, 0 muls r3, r0 @@ -219369,14 +210970,14 @@ _0806C7CC: ands r1, r0 cmp r1, 0 bne _0806C82E - ldr r1, _0806C850 + ldr r1, =0x020242bc lsls r0, r2, 3 subs r0, r2 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _0806C854 + ldr r2, =0x0832a328 lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -219405,11 +211006,7 @@ _0806C83E: str r0, [sp, 0x28] b _0806C9AA .align 2, 0 -_0806C844: .4byte 0x030022c0 -_0806C848: .4byte 0x00000439 -_0806C84C: .4byte 0x02024084 -_0806C850: .4byte 0x020242bc -_0806C854: .4byte 0x0832a328 + .pool _0806C858: ldr r6, [sp, 0x14] adds r6, 0x11 @@ -219501,8 +211098,8 @@ _0806C914: adds r1, r6, 0 mov r2, sp bl pokemon_setattr - ldr r0, _0806C980 - ldr r1, _0806C984 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] adds r0, r7, 0 @@ -219512,7 +211109,7 @@ _0806C914: ldr r2, [sp, 0x38] cmp r2, 0x4 beq _0806C978 - ldr r4, _0806C988 + ldr r4, =0x02024084 movs r0, 0x58 adds r3, r2, 0 muls r3, r0 @@ -219525,14 +211122,14 @@ _0806C914: ands r0, r1 cmp r0, 0 bne _0806C978 - ldr r1, _0806C98C + ldr r1, =0x020242bc lsls r0, r2, 3 subs r0, r2 lsls r0, 2 adds r0, r1 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _0806C990 + ldr r2, =0x0832a328 ldr r5, [sp, 0x14] lsls r0, r5, 2 adds r0, r2 @@ -219551,11 +211148,7 @@ _0806C978: str r0, [sp, 0x20] b _0806C9AA .align 2, 0 -_0806C980: .4byte 0x030022c0 -_0806C984: .4byte 0x00000439 -_0806C988: .4byte 0x02024084 -_0806C98C: .4byte 0x020242bc -_0806C990: .4byte 0x0832a328 + .pool _0806C994: mov r0, r8 movs r1, 0x2 @@ -219604,12 +211197,12 @@ _0806C9E0: b _0806CD3A _0806C9E8: lsls r0, r3, 2 - ldr r1, _0806C9F4 + ldr r1, =_0806C9F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806C9F4: .4byte _0806C9F8 + .pool .align 2, 0 _0806C9F8: .4byte _0806CA18 @@ -219629,7 +211222,7 @@ _0806CA18: ldr r1, [sp, 0x28] adds r0, r5, r1 ldrb r5, [r0] - ldr r0, _0806CA68 + ldr r0, =0x08329ec2 ldr r4, [sp, 0x2C] adds r4, 0x2 adds r0, r4, r0 @@ -219643,7 +211236,7 @@ _0806CA18: asrs r2, r0, 24 cmp r2, 0 ble _0806CA84 - ldr r0, _0806CA6C + ldr r0, =0x000001fd cmp r6, r0 bls _0806CA52 bl _0806BEF0 @@ -219661,8 +211254,7 @@ _0806CA5A: subs r5, r0, r1 b _0806CA72 .align 2, 0 -_0806CA68: .4byte 0x08329ec2 -_0806CA6C: .4byte 0x000001fd + .pool _0806CA70: adds r5, r2, 0 _0806CA72: @@ -219691,7 +211283,7 @@ _0806CA8E: _0806CA98: str r0, [sp, 0x4] _0806CA9A: - ldr r0, _0806CAB4 + ldr r0, =0x08329ec2 adds r0, r4, r0 ldrb r1, [r0] add r2, sp, 0x4 @@ -219703,13 +211295,13 @@ _0806CA9A: str r3, [sp, 0x20] b _0806CD30 .align 2, 0 -_0806CAB4: .4byte 0x08329ec2 + .pool _0806CAB8: mov r0, r8 movs r1, 0x15 movs r2, 0 bl pokemon_getattr - ldr r1, _0806CB88 + ldr r1, =0x08329d22 ldr r5, [sp, 0x14] adds r1, r5, r1 ldrb r1, [r1] @@ -219752,13 +211344,13 @@ _0806CB10: movs r2, 0 bl pokemon_getattr str r0, [sp] - ldr r1, _0806CB8C + ldr r1, =0x08329d26 ldr r2, [sp, 0x14] adds r1, r2, r1 ldrb r2, [r1] ands r2, r0 str r2, [sp] - ldr r0, _0806CB90 + ldr r0, =0x08329d2a ldr r3, [sp, 0x14] adds r0, r3, r0 ldrb r1, [r0] @@ -219802,9 +211394,7 @@ _0806CB10: str r5, [sp, 0x20] b _0806CD3A .align 2, 0 -_0806CB88: .4byte 0x08329d22 -_0806CB8C: .4byte 0x08329d26 -_0806CB90: .4byte 0x08329d2a + .pool _0806CB94: mov r0, r8 movs r1, 0x20 @@ -220072,8 +211662,8 @@ pokemon_clear_ailments: @ 806CD6C movs r1, 0x37 mov r2, sp bl pokemon_setattr - ldr r0, _0806CDC4 - ldr r1, _0806CDC8 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -220082,7 +211672,7 @@ pokemon_clear_ailments: @ 806CD6C beq _0806CDBE cmp r6, 0x4 beq _0806CDBE - ldr r0, _0806CDCC + ldr r0, =0x02024084 movs r1, 0x58 muls r1, r6 adds r0, 0x4C @@ -220094,9 +211684,7 @@ _0806CDBE: movs r0, 0 b _0806CDD2 .align 2, 0 -_0806CDC4: .4byte 0x030022c0 -_0806CDC8: .4byte 0x00000439 -_0806CDCC: .4byte 0x02024084 + .pool _0806CDD0: movs r0, 0x1 _0806CDD2: @@ -220117,7 +211705,7 @@ _0806CDDC: lsls r2, 24 lsrs r5, r2, 24 movs r7, 0x6 - ldr r1, _0806CE04 + ldr r1, =0x0831e58c adds r0, r3, 0 subs r0, 0xD lsls r0, 2 @@ -220131,17 +211719,17 @@ _0806CE00: movs r0, 0 b _0806CF1C .align 2, 0 -_0806CE04: .4byte 0x0831e58c + .pool _0806CE08: cmp r3, 0xAF bne _0806CE1A _0806CE0C: - ldr r0, _0806CE2C + ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0806CE30 + ldr r1, =0x0202440c adds r0, r1 _0806CE1A: mov r12, r0 @@ -220155,8 +211743,7 @@ _0806CE1E: beq _0806CEC8 b _0806CF12 .align 2, 0 -_0806CE2C: .4byte 0x02024064 -_0806CE30: .4byte 0x0202440c + .pool _0806CE34: cmp r2, 0 blt _0806CF12 @@ -220184,12 +211771,12 @@ _0806CE54: cmp r6, 0x7 bhi _0806CEB4 lsls r0, r6, 2 - ldr r1, _0806CE6C + ldr r1, =_0806CE70 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806CE6C: .4byte _0806CE70 + .pool .align 2, 0 _0806CE70: .4byte _0806CE9C @@ -220293,13 +211880,13 @@ _0806CF1C: thumb_func_start sub_806CF24 sub_806CF24: @ 806CF24 push {lr} - ldr r2, _0806CF58 - ldr r1, _0806CF5C + ldr r2, =0x0202420c + ldr r1, =0x020244b8 ldrb r1, [r1] strb r1, [r2] - ldr r3, _0806CF60 - ldr r2, _0806CF64 - ldr r1, _0806CF68 + ldr r3, =0x02022f58 + ldr r2, =0x085cbe00 + ldr r1, =0x08329ec8 adds r0, r1 ldrb r0, [r0] lsls r0, 2 @@ -220307,22 +211894,15 @@ sub_806CF24: @ 806CF24 ldr r1, [r0] adds r0, r3, 0 bl gf_strcpy - ldr r0, _0806CF6C - ldr r1, _0806CF70 + ldr r0, =0x02022f68 + ldr r1, =0x085cb38a bl gf_strcpy - ldr r0, _0806CF74 + ldr r0, =0x085cb3aa bl sub_814E6F0 pop {r0} bx r0 .align 2, 0 -_0806CF58: .4byte 0x0202420c -_0806CF5C: .4byte 0x020244b8 -_0806CF60: .4byte 0x02022f58 -_0806CF64: .4byte 0x085cbe00 -_0806CF68: .4byte 0x08329ec8 -_0806CF6C: .4byte 0x02022f68 -_0806CF70: .4byte 0x085cb38a -_0806CF74: .4byte 0x085cb3aa + .pool thumb_func_end sub_806CF24 thumb_func_start sub_806CF78 @@ -220334,50 +211914,46 @@ sub_806CF78: @ 806CF78 lsrs r0, 16 cmp r0, 0xAF bne _0806CFCC - ldr r0, _0806CFA8 - ldr r1, _0806CFAC + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _0806CFB8 - ldr r2, _0806CFB0 + ldr r2, =0x020244b8 ldrb r1, [r2] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _0806CFB4 + ldr r1, =0x0202440c adds r7, r0, r1 b _0806CFD8 .align 2, 0 -_0806CFA8: .4byte 0x030022c0 -_0806CFAC: .4byte 0x00000439 -_0806CFB0: .4byte 0x020244b8 -_0806CFB4: .4byte 0x0202440c + .pool _0806CFB8: - ldr r0, _0806CFC4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0806CFC8 + ldr r1, =0x00003214 adds r7, r0, r1 b _0806CFD6 .align 2, 0 -_0806CFC4: .4byte 0x03005d8c -_0806CFC8: .4byte 0x00003214 + .pool _0806CFCC: - ldr r1, _0806D010 + ldr r1, =0x0831e58c subs r0, 0xD lsls r0, 2 adds r0, r1 ldr r7, [r0] _0806CFD6: - ldr r2, _0806D014 + ldr r2, =0x020244b8 _0806CFD8: - ldr r1, _0806D018 + ldr r1, =0x0202420f ldrb r0, [r2] strb r0, [r1] movs r5, 0 - ldr r0, _0806D01C + ldr r0, =0x0202420b mov r8, r0 movs r6, 0 _0806CFE6: @@ -220401,16 +211977,13 @@ _0806CFF8: bl sub_806CF24 b _0806D02E .align 2, 0 -_0806D010: .4byte 0x0831e58c -_0806D014: .4byte 0x020244b8 -_0806D018: .4byte 0x0202420f -_0806D01C: .4byte 0x0202420b + .pool _0806D020: - ldr r0, _0806D05C + ldr r0, =0x020244b8 ldrb r0, [r0] mov r1, r8 strb r0, [r1] - ldr r0, _0806D060 + ldr r0, =0x085ca459 bl sub_814E6F0 _0806D02E: adds r6, 0x2 @@ -220422,25 +211995,21 @@ _0806D02E: ands r0, r1 cmp r0, 0 beq _0806D04E - ldr r1, _0806D064 - ldr r0, _0806D05C + ldr r1, =0x0202420b + ldr r0, =0x020244b8 ldrb r0, [r0] strb r0, [r1] - ldr r0, _0806D068 + ldr r0, =0x085ca424 bl sub_814E6F0 _0806D04E: - ldr r0, _0806D06C + ldr r0, =0x02022e2c pop {r3} mov r8, r3 pop {r4-r7} pop {r1} bx r1 .align 2, 0 -_0806D05C: .4byte 0x020244b8 -_0806D060: .4byte 0x085ca459 -_0806D064: .4byte 0x0202420b -_0806D068: .4byte 0x085ca424 -_0806D06C: .4byte 0x02022e2c + .pool thumb_func_end sub_806CF78 thumb_func_start get_nature @@ -220514,15 +212083,14 @@ sub_806D098: @ 806D098 ldrh r0, [r0] cmp r0, 0xAF bne _0806D10C - ldr r0, _0806D104 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0806D108 + ldr r1, =0x00003226 adds r0, r1 ldrb r0, [r0] b _0806D114 .align 2, 0 -_0806D104: .4byte 0x03005d8c -_0806D108: .4byte 0x00003226 + .pool _0806D10C: bl itemid_get_x12 lsls r0, 24 @@ -220551,11 +212119,11 @@ _0806D130: _0806D136: movs r2, 0 str r2, [sp, 0x4] - ldr r3, _0806D140 + ldr r3, =0x0832531c lsls r6, r7, 2 b _0806D38E .align 2, 0 -_0806D140: .4byte 0x0832531c + .pool _0806D144: mov r0, r8 movs r1, 0x38 @@ -220575,7 +212143,7 @@ _0806D144: str r0, [sp, 0x4] lsls r6, r7, 2 _0806D16A: - ldr r1, _0806D190 + ldr r1, =0x0832531c ldr r0, [sp, 0x4] lsls r2, r0, 3 adds r0, r6, r7 @@ -220591,13 +212159,12 @@ _0806D16A: b _0806D332 _0806D186: lsls r0, 2 - ldr r1, _0806D194 + ldr r1, =_0806D198 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806D190: .4byte 0x0832531c -_0806D194: .4byte _0806D198 + .pool .align 2, 0 _0806D198: .4byte _0806D1D4 @@ -220628,7 +212195,7 @@ _0806D1DC: b _0806D228 _0806D1E6: bl sub_802F588 - ldr r0, _0806D204 + ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] subs r0, 0xC lsls r0, 24 @@ -220644,10 +212211,10 @@ _0806D1FA: _0806D202: b _0806D21E .align 2, 0 -_0806D204: .4byte 0x03005cf8 + .pool _0806D208: bl sub_802F588 - ldr r0, _0806D230 + ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] cmp r0, 0xB bls _0806D216 @@ -220658,7 +212225,7 @@ _0806D216: bhi _0806D21E b _0806D332 _0806D21E: - ldr r1, _0806D234 + ldr r1, =0x0832531c adds r0, r6, r7 lsls r0, 3 adds r0, r4, r0 @@ -220668,8 +212235,7 @@ _0806D228: mov r10, r0 b _0806D332 .align 2, 0 -_0806D230: .4byte 0x03005cf8 -_0806D234: .4byte 0x0832531c + .pool _0806D238: adds r0, r6, r7 lsls r0, 3 @@ -220809,7 +212375,7 @@ _0806D33E: b _0806D3AE _0806D340: lsls r6, r7, 2 - ldr r1, _0806D384 + ldr r1, =0x0832531c adds r0, r6, r7 lsls r0, 3 adds r4, r0, r1 @@ -220844,7 +212410,7 @@ _0806D374: bge _0806D350 b _0806D3AE .align 2, 0 -_0806D384: .4byte 0x0832531c + .pool _0806D388: ldrh r1, [r1, 0x4] mov r10, r1 @@ -220888,7 +212454,7 @@ sub_806D3C0: @ 806D3C0 cmp r2, 0 beq _0806D404 movs r1, 0 - ldr r3, _0806D3FC + ldr r3, =0x0831d94c ldrh r0, [r3] cmp r0, r2 beq _0806D3EC @@ -220906,7 +212472,7 @@ _0806D3D8: cmp r0, r2 bne _0806D3D8 _0806D3EC: - ldr r0, _0806D400 + ldr r0, =0x0000019b cmp r1, r0 beq _0806D404 adds r0, r1, 0x1 @@ -220914,8 +212480,7 @@ _0806D3EC: lsrs r0, 16 b _0806D406 .align 2, 0 -_0806D3FC: .4byte 0x0831d94c -_0806D400: .4byte 0x0000019b + .pool _0806D404: movs r0, 0 _0806D406: @@ -220932,7 +212497,7 @@ poke_something_2: @ 806D40C cmp r2, 0 beq _0806D450 movs r1, 0 - ldr r3, _0806D448 + ldr r3, =0x0831dc82 ldrh r0, [r3] cmp r0, r2 beq _0806D438 @@ -220950,7 +212515,7 @@ _0806D424: cmp r0, r2 bne _0806D424 _0806D438: - ldr r0, _0806D44C + ldr r0, =0x0000019b cmp r1, r0 beq _0806D450 adds r0, r1, 0x1 @@ -220958,8 +212523,7 @@ _0806D438: lsrs r0, 16 b _0806D452 .align 2, 0 -_0806D448: .4byte 0x0831dc82 -_0806D44C: .4byte 0x0000019b + .pool _0806D450: movs r0, 0 _0806D452: @@ -220976,7 +212540,7 @@ sub_806D458: @ 806D458 cmp r2, 0 beq _0806D49C movs r1, 0 - ldr r3, _0806D494 + ldr r3, =0x0831dfb8 ldrh r0, [r3] cmp r0, r2 beq _0806D484 @@ -220994,7 +212558,7 @@ _0806D470: cmp r0, r2 bne _0806D470 _0806D484: - ldr r0, _0806D498 + ldr r0, =0x0000019b cmp r1, r0 beq _0806D49C adds r0, r1, 0x1 @@ -221002,8 +212566,7 @@ _0806D484: lsrs r0, 16 b _0806D49E .align 2, 0 -_0806D494: .4byte 0x0831dfb8 -_0806D498: .4byte 0x0000019b + .pool _0806D49C: movs r0, 0 _0806D49E: @@ -221019,14 +212582,14 @@ species_to_pokedex_index: @ 806D4A4 lsrs r1, r0, 16 cmp r1, 0 beq _0806D4C0 - ldr r0, _0806D4BC + ldr r0, =0x0831dc82 subs r1, 0x1 lsls r1, 1 adds r1, r0 ldrh r0, [r1] b _0806D4C2 .align 2, 0 -_0806D4BC: .4byte 0x0831dc82 + .pool _0806D4C0: movs r0, 0 _0806D4C2: @@ -221041,14 +212604,14 @@ sub_806D4C8: @ 806D4C8 lsrs r1, r0, 16 cmp r1, 0 beq _0806D4E4 - ldr r0, _0806D4E0 + ldr r0, =0x0831d94c subs r1, 0x1 lsls r1, 1 adds r1, r0 ldrh r0, [r1] b _0806D4E6 .align 2, 0 -_0806D4E0: .4byte 0x0831d94c + .pool _0806D4E4: movs r0, 0 _0806D4E6: @@ -221063,14 +212626,14 @@ sub_806D4EC: @ 806D4EC lsrs r1, r0, 16 cmp r1, 0 beq _0806D508 - ldr r0, _0806D504 + ldr r0, =0x0831dfb8 subs r1, 0x1 lsls r1, 1 adds r1, r0 ldrh r0, [r1] b _0806D50A .align 2, 0 -_0806D504: .4byte 0x0831dfb8 + .pool _0806D508: movs r0, 0 _0806D50A: @@ -221086,20 +212649,18 @@ speciesid_conv: @ 806D510 adds r1, r0, 0 cmp r0, 0xFA bls _0806D53E - ldr r0, _0806D530 + ldr r0, =0x00000113 cmp r1, r0 bls _0806D53C - ldr r0, _0806D534 - ldr r2, _0806D538 + ldr r0, =0x0831f61c + ldr r2, =0xfffffeec adds r1, r2 lsls r1, 1 adds r1, r0 ldrh r0, [r1] b _0806D53E .align 2, 0 -_0806D530: .4byte 0x00000113 -_0806D534: .4byte 0x0831f61c -_0806D538: .4byte 0xfffffeec + .pool _0806D53C: movs r0, 0xC8 _0806D53E: @@ -221122,7 +212683,7 @@ sub_806D544: @ 806D544 lsls r1, 17 cmp r0, r1 bne _0806D652 - ldr r0, _0806D614 + ldr r0, =0x020244d4 ldr r1, [r0] ldr r0, [r1, 0x4] cmp r10, r0 @@ -221135,7 +212696,7 @@ _0806D570: lsls r3, r5, 3 adds r3, r5 lsls r3, 2 - ldr r0, _0806D618 + ldr r0, =0x0831e2f0 adds r4, r3, r0 ldrb r1, [r4] adds r1, 0xF8 @@ -221163,7 +212724,7 @@ _0806D570: _0806D5A8: lsls r0, r2, 1 add r0, r9 - ldr r3, _0806D61C + ldr r3, =0x0831e2f2 adds r0, r3 ldrh r3, [r0] mov r4, r12 @@ -221217,9 +212778,7 @@ _0806D5D4: adds r0, 0x40 b _0806D632 .align 2, 0 -_0806D614: .4byte 0x020244d4 -_0806D618: .4byte 0x0831e2f0 -_0806D61C: .4byte 0x0831e2f2 + .pool _0806D620: ldrb r1, [r2] movs r0, 0xF @@ -221284,7 +212843,7 @@ _0806D688: lsls r3, r6, 3 adds r3, r6 lsls r3, 2 - ldr r0, _0806D72C + ldr r0, =0x0831e2f0 adds r4, r3, r0 ldrb r1, [r4] adds r1, 0xF8 @@ -221312,7 +212871,7 @@ _0806D688: _0806D6C0: lsls r0, r2, 1 add r0, r9 - ldr r3, _0806D730 + ldr r3, =0x0831e2f2 adds r0, r3 ldrh r3, [r0] mov r4, r12 @@ -221367,8 +212926,7 @@ _0806D6EC: adds r0, 0x40 b _0806D746 .align 2, 0 -_0806D72C: .4byte 0x0831e2f0 -_0806D730: .4byte 0x0831e2f2 + .pool _0806D734: ldrb r1, [r2] movs r0, 0xF @@ -221422,7 +212980,7 @@ sub_806D778: @ 806D778 lsls r2, 16 lsrs r2, 16 mov r8, r2 - ldr r0, _0806D7E4 + ldr r0, =0x02021cc4 mov r9, r0 adds r0, r5, 0 movs r1, 0x2 @@ -221441,7 +212999,7 @@ sub_806D778: @ 806D778 movs r6, 0xB adds r0, r7, 0 muls r0, r6 - ldr r4, _0806D7E8 + ldr r4, =0x083185c8 adds r0, r4 mov r1, r9 bl sub_8008C44 @@ -221462,15 +213020,14 @@ _0806D7D4: pop {r0} bx r0 .align 2, 0 -_0806D7E4: .4byte 0x02021cc4 -_0806D7E8: .4byte 0x083185c8 + .pool thumb_func_end sub_806D778 thumb_func_start sub_806D7EC sub_806D7EC: @ 806D7EC push {r4,r5,lr} movs r5, 0 - ldr r4, _0806D814 + ldr r4, =0x020229e8 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -221487,7 +213044,7 @@ sub_806D7EC: @ 806D7EC beq _0806D81C b _0806D822 .align 2, 0 -_0806D814: .4byte 0x020229e8 + .pool _0806D818: cmp r0, 0x3 bne _0806D822 @@ -221509,7 +213066,7 @@ sub_806D82C: @ 806D82C lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r2, _0806D850 + ldr r2, =0x020229e8 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -221523,7 +213080,7 @@ sub_806D82C: @ 806D82C beq _0806D858 b _0806D85E .align 2, 0 -_0806D850: .4byte 0x020229e8 + .pool _0806D854: cmp r0, 0x3 bne _0806D85E @@ -221544,10 +213101,10 @@ sub_806D864: @ 806D864 lsls r0, 16 lsrs r3, r0, 16 movs r2, 0 - ldr r1, _0806D870 + ldr r1, =0x020229e8 b _0806D87C .align 2, 0 -_0806D870: .4byte 0x020229e8 + .pool _0806D874: adds r1, 0x1C adds r2, 0x1 @@ -221581,7 +213138,7 @@ _0806D8A2: lsls r0, 24 cmp r0, 0 bne _0806D8C4 - ldr r1, _0806D8C0 + ldr r1, =0x08310030 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -221591,7 +213148,7 @@ _0806D8A2: ands r0, r1 b _0806D8CE .align 2, 0 -_0806D8C0: .4byte 0x08310030 + .pool _0806D8C4: adds r0, r5, 0 bl sub_81D63C8 @@ -221622,7 +213179,7 @@ nature_stat_mod: @ 806D8D4 adds r0, r3, 0 b _0806D92E _0806D8F2: - ldr r0, _0806D914 + ldr r0, =0x0831e818 lsls r1, r4, 2 adds r1, r4 subs r1, 0x1 @@ -221640,7 +213197,7 @@ _0806D8F2: movs r0, 0x6E b _0806D91A .align 2, 0 -_0806D914: .4byte 0x0831e818 + .pool _0806D918: movs r0, 0x5A _0806D91A: @@ -221687,31 +213244,28 @@ _0806D94A: lsrs r0, 16 cmp r0, 0xAF bne _0806D9A0 - ldr r0, _0806D980 - ldr r1, _0806D984 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _0806D98C - ldr r0, _0806D988 + ldr r0, =0x02024404 ldrb r4, [r0, 0x7] b _0806D9A8 .align 2, 0 -_0806D980: .4byte 0x030022c0 -_0806D984: .4byte 0x00000439 -_0806D988: .4byte 0x02024404 + .pool _0806D98C: - ldr r0, _0806D998 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0806D99C + ldr r1, =0x00003226 adds r0, r1 ldrb r4, [r0] b _0806D9A8 .align 2, 0 -_0806D998: .4byte 0x03005d8c -_0806D99C: .4byte 0x00003226 + .pool _0806D9A0: bl itemid_get_x12 lsls r0, 24 @@ -221758,14 +213312,14 @@ _0806D9E0: _0806D9F0: cmp r5, 0x3 bne _0806DA20 - ldr r0, _0806DACC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 beq _0806DAC2 - ldr r2, _0806DAD0 - ldr r0, _0806DAD4 + ldr r2, =0x08310030 + ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -221781,7 +213335,7 @@ _0806D9F0: cmp r1, 0x26 bne _0806DAC2 _0806DA20: - ldr r1, _0806DAD8 + ldr r1, =0x08329ece lsls r0, r5, 1 adds r0, r5 adds r0, r6, r0 @@ -221868,10 +213422,7 @@ _0806DAC2: pop {r0} bx r0 .align 2, 0 -_0806DACC: .4byte 0x02022fec -_0806DAD0: .4byte 0x08310030 -_0806DAD4: .4byte 0x02038bca -_0806DAD8: .4byte 0x08329ece + .pool thumb_func_end happiness_algorithm thumb_func_start sub_806DADC @@ -221917,12 +213468,12 @@ _0806DB26: cmp r6, 0x5 bhi _0806DBC8 lsls r0, r6, 2 - ldr r1, _0806DB34 + ldr r1, =_0806DB38 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806DB34: .4byte _0806DB38 + .pool .align 2, 0 _0806DB38: .4byte _0806DB50 @@ -221932,7 +213483,7 @@ _0806DB38: .4byte _0806DBA0 .4byte _0806DBB4 _0806DB50: - ldr r0, _0806DB60 + ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -221941,9 +213492,9 @@ _0806DB50: lsls r0, 30 b _0806DBC2 .align 2, 0 -_0806DB60: .4byte 0x083203cc + .pool _0806DB64: - ldr r0, _0806DB74 + ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -221951,9 +213502,9 @@ _0806DB64: ldrb r0, [r1, 0xA] b _0806DBC0 .align 2, 0 -_0806DB74: .4byte 0x083203cc + .pool _0806DB78: - ldr r0, _0806DB88 + ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -221962,9 +213513,9 @@ _0806DB78: lsls r0, 26 b _0806DBC2 .align 2, 0 -_0806DB88: .4byte 0x083203cc + .pool _0806DB8C: - ldr r0, _0806DB9C + ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -221973,9 +213524,9 @@ _0806DB8C: lsrs r0, 6 b _0806DBC4 .align 2, 0 -_0806DB9C: .4byte 0x083203cc + .pool _0806DBA0: - ldr r0, _0806DBB0 + ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -221984,9 +213535,9 @@ _0806DBA0: lsls r0, 30 b _0806DBC2 .align 2, 0 -_0806DBB0: .4byte 0x083203cc + .pool _0806DBB4: - ldr r0, _0806DBF0 + ldr r0, =0x083203cc lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -222008,32 +213559,28 @@ _0806DBC8: lsrs r0, 16 cmp r0, 0xAF bne _0806DC14 - ldr r0, _0806DBF4 - ldr r1, _0806DBF8 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _0806DC00 - ldr r0, _0806DBFC + ldr r0, =0x02024404 ldrb r0, [r0, 0x7] b _0806DC1C .align 2, 0 -_0806DBF0: .4byte 0x083203cc -_0806DBF4: .4byte 0x030022c0 -_0806DBF8: .4byte 0x00000439 -_0806DBFC: .4byte 0x02024404 + .pool _0806DC00: - ldr r0, _0806DC0C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0806DC10 + ldr r2, =0x00003226 adds r0, r2 ldrb r0, [r0] b _0806DC1C .align 2, 0 -_0806DC0C: .4byte 0x03005d8c -_0806DC10: .4byte 0x00003226 + .pool _0806DC14: bl itemid_get_x12 lsls r0, 24 @@ -222085,7 +213632,7 @@ _0806DC58: cmp r6, 0x5 bgt _0806DC7A _0806DC72: - ldr r0, _0806DC88 + ldr r0, =0x000001fd cmp r7, r0 bhi _0806DC7A b _0806DB14 @@ -222097,7 +213644,7 @@ _0806DC7A: pop {r0} bx r0 .align 2, 0 -_0806DC88: .4byte 0x000001fd + .pool thumb_func_end sub_806DADC thumb_func_start sub_806DC8C @@ -222167,7 +213714,7 @@ _0806DCDA: bl pokemon_getattr cmp r0, 0 bne _0806DCDA - ldr r1, _0806DD78 + ldr r1, =0x0832a328 lsls r0, r5, 2 adds r0, r1 ldrb r1, [r0] @@ -222221,7 +213768,7 @@ _0806DD70: pop {r0} bx r0 .align 2, 0 -_0806DD78: .4byte 0x0832a328 + .pool thumb_func_end sub_806DCB4 thumb_func_start sub_806DD7C @@ -222346,7 +213893,7 @@ _0806DE50: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _0806DE90 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -222375,7 +213922,7 @@ _0806DE8A: ands r0, r2 b _0806DE96 .align 2, 0 -_0806DE90: .4byte 0x020244ec + .pool _0806DE94: subs r0, r2, r7 _0806DE96: @@ -222388,7 +213935,7 @@ _0806DE96: _0806DEA2: movs r0, 0x64 muls r0, r6 - ldr r1, _0806DEC0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 mov r2, sp @@ -222402,7 +213949,7 @@ _0806DEB2: pop {r0} bx r0 .align 2, 0 -_0806DEC0: .4byte 0x020244ec + .pool thumb_func_end sub_806DE44 thumb_func_start atkE5_pickupitemcalculation @@ -222515,8 +214062,8 @@ sub_806DF74: @ 806DF74 movs r2, 0 bl pokemon_getattr str r0, [sp, 0x4] - ldr r6, _0806DFF0 - ldr r2, _0806DFF4 + ldr r6, =0x0831f72c + ldr r2, =0x083203cc lsls r1, r4, 3 subs r1, r4 lsls r1, 2 @@ -222554,8 +214101,7 @@ _0806DFEA: movs r0, 0 b _0806E004 .align 2, 0 -_0806DFF0: .4byte 0x0831f72c -_0806DFF4: .4byte 0x083203cc + .pool _0806DFF8: adds r0, r5, 0 movs r1, 0x38 @@ -222594,7 +214140,7 @@ _0806E02E: subs r0, 0x20 movs r2, 0x1 lsls r2, r0 - ldr r0, _0806E048 + ldr r0, =0x0831e898 lsls r1, 3 adds r0, 0x4 adds r1, r0 @@ -222602,11 +214148,11 @@ _0806E02E: ands r0, r2 b _0806E05A .align 2, 0 -_0806E048: .4byte 0x0831e898 + .pool _0806E04C: movs r1, 0x1 lsls r1, r5 - ldr r2, _0806E060 + ldr r2, =0x0831e898 lsls r0, r3, 3 adds r0, r2 ldr r0, [r0] @@ -222616,7 +214162,7 @@ _0806E05A: pop {r1} bx r1 .align 2, 0 -_0806E060: .4byte 0x0831e898 + .pool thumb_func_end sub_806E00C thumb_func_start sub_806E064 @@ -222641,7 +214187,7 @@ _0806E07E: subs r0, 0x20 movs r2, 0x1 lsls r2, r0 - ldr r0, _0806E098 + ldr r0, =0x0831e898 lsls r1, r3, 3 adds r0, 0x4 adds r1, r0 @@ -222649,11 +214195,11 @@ _0806E07E: ands r0, r2 b _0806E0AA .align 2, 0 -_0806E098: .4byte 0x0831e898 + .pool _0806E09C: movs r1, 0x1 lsls r1, r2 - ldr r2, _0806E0B0 + ldr r2, =0x0831e898 lsls r0, r4, 3 adds r0, r2 ldr r0, [r0] @@ -222663,7 +214209,7 @@ _0806E0AA: pop {r1} bx r1 .align 2, 0 -_0806E0B0: .4byte 0x0831e898 + .pool thumb_func_end sub_806E064 thumb_func_start sub_806E0B4 @@ -222705,12 +214251,12 @@ _0806E0EA: cmp r5, 0x3 ble _0806E0EA movs r5, 0 - ldr r6, _0806E1F8 + ldr r6, =0x0832937c lsls r1, r7, 2 adds r2, r1, r6 ldr r3, [r2] ldrh r0, [r3] - ldr r4, _0806E1FC + ldr r4, =0x0000ffff str r1, [sp, 0x14] cmp r0, r4 beq _0806E1E4 @@ -222734,14 +214280,14 @@ _0806E118: movs r4, 0 mov r0, sp ldrh r1, [r0] - ldr r0, _0806E200 + ldr r0, =0x000001ff ands r0, r3 cmp r1, r0 beq _0806E168 ldr r0, [sp, 0x14] - ldr r1, _0806E1F8 + ldr r1, =0x0832937c adds r6, r0, r1 - ldr r2, _0806E200 + ldr r2, =0x000001ff mov r8, r2 mov r3, sp adds r5, r7, 0 @@ -222770,14 +214316,14 @@ _0806E168: ldrh r1, [r0] ldr r0, [sp, 0x8] ldrh r2, [r0] - ldr r0, _0806E200 + ldr r0, =0x000001ff ands r0, r1 cmp r2, r0 beq _0806E1AC ldr r1, [sp, 0x14] - ldr r2, _0806E1F8 + ldr r2, =0x0832937c adds r6, r1, r2 - ldr r0, _0806E200 + ldr r0, =0x000001ff mov r8, r0 ldr r3, [sp, 0x8] adds r5, r7, 0 @@ -222809,7 +214355,7 @@ _0806E1AC: ldr r0, [r4] adds r0, r7, r0 ldrh r1, [r0] - ldr r0, _0806E200 + ldr r0, =0x000001ff ands r0, r1 strh r0, [r2] _0806E1CE: @@ -222821,7 +214367,7 @@ _0806E1CE: lsls r1, r5, 1 adds r1, r0 ldrh r0, [r1] - ldr r2, _0806E1FC + ldr r2, =0x0000ffff cmp r0, r2 bne _0806E118 _0806E1E4: @@ -222835,9 +214381,7 @@ _0806E1E4: pop {r1} bx r1 .align 2, 0 -_0806E1F8: .4byte 0x0832937c -_0806E1FC: .4byte 0x0000ffff -_0806E200: .4byte 0x000001ff + .pool thumb_func_end sub_806E0B4 thumb_func_start sub_806E204 @@ -222847,15 +214391,15 @@ sub_806E204: @ 806E204 lsls r0, 16 movs r5, 0 movs r4, 0 - ldr r1, _0806E250 + ldr r1, =0x0832937c lsrs r0, 14 adds r0, r1 ldr r2, [r0] ldrh r0, [r2] - ldr r1, _0806E254 + ldr r1, =0x0000ffff cmp r0, r1 beq _0806E248 - ldr r0, _0806E258 + ldr r0, =0x000001ff mov r12, r0 adds r7, r1, 0 adds r3, r2, 0 @@ -222883,9 +214427,7 @@ _0806E248: pop {r1} bx r1 .align 2, 0 -_0806E250: .4byte 0x0832937c -_0806E254: .4byte 0x0000ffff -_0806E258: .4byte 0x000001ff + .pool thumb_func_end sub_806E204 thumb_func_start sub_806E25C @@ -222935,12 +214477,12 @@ _0806E2A0: cmp r5, 0x3 ble _0806E2A0 movs r5, 0 - ldr r3, _0806E3B4 + ldr r3, =0x0832937c ldr r2, [sp, 0x38] adds r1, r2, r3 ldr r0, [r1] ldrh r0, [r0] - ldr r2, _0806E3B8 + ldr r2, =0x0000ffff cmp r0, r2 beq _0806E3A0 mov r9, r1 @@ -222966,14 +214508,14 @@ _0806E2D0: movs r4, 0 mov r0, sp ldrh r1, [r0] - ldr r0, _0806E3BC + ldr r0, =0x000001ff ands r0, r3 cmp r1, r0 beq _0806E322 ldr r0, [sp, 0x38] - ldr r1, _0806E3B4 + ldr r1, =0x0832937c adds r6, r0, r1 - ldr r2, _0806E3BC + ldr r2, =0x000001ff mov r8, r2 mov r3, sp adds r5, r7, 0 @@ -223002,15 +214544,15 @@ _0806E322: ldrh r1, [r0] ldr r0, [sp, 0x34] ldrh r2, [r0] - ldr r0, _0806E3BC + ldr r0, =0x000001ff ands r0, r1 add r1, sp, 0x8 cmp r2, r0 beq _0806E368 ldr r2, [sp, 0x38] - ldr r0, _0806E3B4 + ldr r0, =0x0832937c adds r6, r2, r0 - ldr r2, _0806E3BC + ldr r2, =0x000001ff mov r8, r2 adds r3, r1, 0 adds r5, r7, 0 @@ -223042,7 +214584,7 @@ _0806E368: ldr r0, [r1] adds r0, r7, r0 ldrh r1, [r0] - ldr r0, _0806E3BC + ldr r0, =0x000001ff ands r0, r1 strh r0, [r2] _0806E38A: @@ -223054,7 +214596,7 @@ _0806E38A: lsls r1, r5, 1 adds r1, r0 ldrh r0, [r1] - ldr r4, _0806E3B8 + ldr r4, =0x0000ffff cmp r0, r4 bne _0806E2D0 _0806E3A0: @@ -223069,9 +214611,7 @@ _0806E3A2: pop {r1} bx r1 .align 2, 0 -_0806E3B4: .4byte 0x0832937c -_0806E3B8: .4byte 0x0000ffff -_0806E3BC: .4byte 0x000001ff + .pool thumb_func_end sub_806E25C thumb_func_start sub_806E3C0 @@ -223093,10 +214633,10 @@ _0806E3DA: adds r4, r0, 0 cmp r4, 0xCA bls _0806E3F0 - ldr r0, _0806E3EC + ldr r0, =0x0000ffff b _0806E3F2 .align 2, 0 -_0806E3EC: .4byte 0x0000ffff + .pool _0806E3F0: adds r0, r4, 0 _0806E3F2: @@ -223127,7 +214667,7 @@ _0806E410: thumb_func_start sub_806E414 sub_806E414: @ 806E414 push {lr} - ldr r1, _0806E428 + ldr r1, =0x020244e4 movs r2, 0 adds r0, r1, 0x3 _0806E41C: @@ -223138,13 +214678,13 @@ _0806E41C: pop {r0} bx r0 .align 2, 0 -_0806E428: .4byte 0x020244e4 + .pool thumb_func_end sub_806E414 thumb_func_start song_id_for_battle song_id_for_battle: @ 806E42C push {lr} - ldr r0, _0806E444 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 5 @@ -223155,19 +214695,19 @@ song_id_for_battle: @ 806E42C lsls r0, 1 b _0806E646 .align 2, 0 -_0806E444: .4byte 0x02022fec + .pool _0806E448: movs r0, 0x80 lsls r0, 7 ands r0, r1 cmp r0, 0 beq _0806E45C - ldr r0, _0806E458 + ldr r0, =0x000001df b _0806E646 .align 2, 0 -_0806E458: .4byte 0x000001df + .pool _0806E45C: - ldr r0, _0806E488 + ldr r0, =0x02000002 ands r0, r1 cmp r0, 0 beq _0806E466 @@ -223179,20 +214719,18 @@ _0806E466: bne _0806E470 b _0806E642 _0806E470: - ldr r0, _0806E48C + ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 beq _0806E494 - ldr r0, _0806E490 + ldr r0, =0x02038bca ldrh r0, [r0] bl sub_8162BD8 lsls r0, 24 lsrs r0, 24 b _0806E4B2 .align 2, 0 -_0806E488: .4byte 0x02000002 -_0806E48C: .4byte 0x003f0100 -_0806E490: .4byte 0x02038bca + .pool _0806E494: movs r0, 0x80 lsls r0, 19 @@ -223202,8 +214740,8 @@ _0806E494: movs r0, 0xA b _0806E4B2 _0806E4A2: - ldr r2, _0806E4C4 - ldr r0, _0806E4C8 + ldr r2, =0x08310030 + ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -223217,14 +214755,12 @@ _0806E4B2: b _0806E63C _0806E4BA: lsls r0, 2 - ldr r1, _0806E4CC + ldr r1, =_0806E4D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0806E4C4: .4byte 0x08310030 -_0806E4C8: .4byte 0x02038bca -_0806E4CC: .4byte _0806E4D0 + .pool .align 2, 0 _0806E4D0: .4byte _0806E5D0 @@ -223290,64 +214826,60 @@ _0806E4D0: .4byte _0806E632 .4byte _0806E632 _0806E5C8: - ldr r0, _0806E5CC + ldr r0, =0x000001e3 b _0806E646 .align 2, 0 -_0806E5CC: .4byte 0x000001e3 + .pool _0806E5D0: - ldr r0, _0806E5D4 + ldr r0, =0x000001db b _0806E646 .align 2, 0 -_0806E5D4: .4byte 0x000001db + .pool _0806E5D8: - ldr r0, _0806E5DC + ldr r0, =0x000001dd b _0806E646 .align 2, 0 -_0806E5DC: .4byte 0x000001dd + .pool _0806E5E0: movs r0, 0xEF lsls r0, 1 b _0806E646 _0806E5E6: - ldr r0, _0806E5F8 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0806E5FC + ldr r1, =0x003f0100 ands r0, r1 cmp r0, 0 beq _0806E604 _0806E5F2: - ldr r0, _0806E600 + ldr r0, =0x000001e1 b _0806E646 .align 2, 0 -_0806E5F8: .4byte 0x02022fec -_0806E5FC: .4byte 0x003f0100 -_0806E600: .4byte 0x000001e1 + .pool _0806E604: - ldr r0, _0806E620 + ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0806E624 + ldr r1, =0x08310034 adds r0, r1 - ldr r1, _0806E628 + ldr r1, =0x085ccb98 bl sub_8008C44 cmp r0, 0 beq _0806E63C b _0806E5F2 .align 2, 0 -_0806E620: .4byte 0x02038bca -_0806E624: .4byte 0x08310034 -_0806E628: .4byte 0x085ccb98 + .pool _0806E62C: movs r0, 0xF1 lsls r0, 1 b _0806E646 _0806E632: - ldr r0, _0806E638 + ldr r0, =0x000001d7 b _0806E646 .align 2, 0 -_0806E638: .4byte 0x000001d7 + .pool _0806E63C: movs r0, 0xEE lsls r0, 1 @@ -223404,12 +214936,12 @@ sub_806E694: @ 806E694 lsrs r4, 16 bl map_music_set_to_zero bl m4aMPlayAllStop - ldr r0, _0806E6C4 + ldr r0, =sub_806E6CC + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0806E6C8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -223419,8 +214951,7 @@ sub_806E694: @ 806E694 pop {r0} bx r0 .align 2, 0 -_0806E6C4: .4byte sub_806E6CC + 1 -_0806E6C8: .4byte 0x03005e00 + .pool thumb_func_end sub_806E694 thumb_func_start sub_806E6CC @@ -223428,7 +214959,7 @@ sub_806E6CC: @ 806E6CC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0806E6EC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -223441,7 +214972,7 @@ sub_806E6CC: @ 806E6CC bl current_map_music_set b _0806E6FC .align 2, 0 -_0806E6EC: .4byte 0x03005e00 + .pool _0806E6F0: bl song_id_for_battle lsls r0, 16 @@ -223494,14 +215025,14 @@ species_and_otid_get_pal: @ 806E740 lsls r0, 1 cmp r4, r0 bls _0806E75C - ldr r0, _0806E758 + ldr r0, =0x08303678 ldr r0, [r0] b _0806E788 .align 2, 0 -_0806E758: .4byte 0x08303678 + .pool _0806E75C: lsrs r0, r1, 16 - ldr r2, _0806E778 + ldr r2, =0x0000ffff ands r1, r2 eors r0, r1 lsrs r1, r3, 16 @@ -223510,14 +215041,13 @@ _0806E75C: eors r0, r3 cmp r0, 0x7 bls _0806E780 - ldr r0, _0806E77C + ldr r0, =0x08303678 lsls r1, r4, 3 b _0806E784 .align 2, 0 -_0806E778: .4byte 0x0000ffff -_0806E77C: .4byte 0x08303678 + .pool _0806E780: - ldr r0, _0806E790 + ldr r0, =0x08304438 lsls r1, r5, 3 _0806E784: adds r1, r0 @@ -223527,7 +215057,7 @@ _0806E788: pop {r1} bx r1 .align 2, 0 -_0806E790: .4byte 0x08304438 + .pool thumb_func_end species_and_otid_get_pal thumb_func_start sub_806E794 @@ -223564,7 +215094,7 @@ sub_806E7CC: @ 806E7CC lsls r0, 16 lsrs r4, r0, 16 lsrs r0, r1, 16 - ldr r3, _0806E7EC + ldr r3, =0x0000ffff ands r1, r3 eors r0, r1 lsrs r1, r2, 16 @@ -223574,21 +215104,20 @@ sub_806E7CC: @ 806E7CC cmp r0, 0x7 bls _0806E7F4 lsls r0, r4, 3 - ldr r1, _0806E7F0 + ldr r1, =0x08303678 b _0806E7F8 .align 2, 0 -_0806E7EC: .4byte 0x0000ffff -_0806E7F0: .4byte 0x08303678 + .pool _0806E7F4: lsls r0, r4, 3 - ldr r1, _0806E800 + ldr r1, =0x08304438 _0806E7F8: adds r0, r1 pop {r4} pop {r1} bx r1 .align 2, 0 -_0806E800: .4byte 0x08304438 + .pool thumb_func_end sub_806E7CC thumb_func_start sub_806E804 @@ -223596,9 +215125,9 @@ sub_806E804: @ 806E804 push {r4,lr} lsls r0, 16 lsrs r3, r0, 16 - ldr r2, _0806E828 + ldr r2, =0x08329eea ldrh r0, [r2] - ldr r1, _0806E82C + ldr r1, =0x0000ffff cmp r0, r1 beq _0806E836 adds r4, r1, 0 @@ -223612,8 +215141,7 @@ _0806E818: movs r0, 0x1 b _0806E838 .align 2, 0 -_0806E828: .4byte 0x08329eea -_0806E82C: .4byte 0x0000ffff + .pool _0806E830: ldrh r0, [r1] cmp r0, r4 @@ -223630,7 +215158,7 @@ _0806E838: sub_806E840: @ 806E840 lsls r0, 16 lsrs r0, 16 - ldr r2, _0806E854 + ldr r2, =0x083203cc lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -223639,7 +215167,7 @@ sub_806E840: @ 806E840 lsrs r0, 7 bx lr .align 2, 0 -_0806E854: .4byte 0x083203cc + .pool thumb_func_end sub_806E840 thumb_func_start sub_806E858 @@ -223650,7 +215178,7 @@ sub_806E858: @ 806E858 bl get_nature lsls r0, 24 lsrs r0, 24 - ldr r2, _0806E87C + ldr r2, =0x085b25a0 lsls r1, r0, 2 adds r1, r0 adds r1, r4 @@ -223661,7 +215189,7 @@ sub_806E858: @ 806E858 pop {r1} bx r1 .align 2, 0 -_0806E87C: .4byte 0x085b25a0 + .pool thumb_func_end sub_806E858 thumb_func_start sub_806E880 @@ -223672,7 +215200,7 @@ sub_806E880: @ 806E880 bl getNature lsls r0, 24 lsrs r0, 24 - ldr r2, _0806E8A4 + ldr r2, =0x085b25a0 lsls r1, r0, 2 adds r1, r0 adds r1, r4 @@ -223683,7 +215211,7 @@ sub_806E880: @ 806E880 pop {r1} bx r1 .align 2, 0 -_0806E8A4: .4byte 0x085b25a0 + .pool thumb_func_end sub_806E880 thumb_func_start sub_806E8A8 @@ -223712,7 +215240,7 @@ sub_806E8A8: @ 806E8A8 sub_806E8D4: @ 806E8D4 push {r4,r5,lr} adds r5, r1, 0 - ldr r1, _0806E918 + ldr r1, =0x03005d90 ldr r3, [r1] ldrb r2, [r3, 0xA] ldrb r1, [r3, 0xB] @@ -223746,7 +215274,7 @@ _0806E912: movs r0, 0 b _0806E91E .align 2, 0 -_0806E918: .4byte 0x03005d90 + .pool _0806E91C: movs r0, 0x1 _0806E91E: @@ -223816,14 +215344,14 @@ _0806E984: thumb_func_start sub_806E994 sub_806E994: @ 806E994 push {r4,r5,lr} - ldr r2, _0806E9D8 - ldr r5, _0806E9DC + ldr r2, =0x0202420a + ldr r5, =0x0202449c ldr r1, [r5] adds r0, r1, 0 adds r0, 0xB0 ldrb r0, [r0] strb r0, [r2] - ldr r4, _0806E9E0 + ldr r4, =0x02022f58 movs r0, 0xFD strb r0, [r4] movs r0, 0x4 @@ -223838,7 +215366,7 @@ sub_806E994: @ 806E994 lsls r0, 24 cmp r0, 0 bne _0806E9E8 - ldr r1, _0806E9E4 + ldr r1, =0x0202406e ldr r0, [r5] adds r0, 0x49 ldrb r0, [r0] @@ -223848,12 +215376,9 @@ sub_806E994: @ 806E994 bl pokemon_order_func b _0806E9F6 .align 2, 0 -_0806E9D8: .4byte 0x0202420a -_0806E9DC: .4byte 0x0202449c -_0806E9E0: .4byte 0x02022f58 -_0806E9E4: .4byte 0x0202406e + .pool _0806E9E8: - ldr r1, _0806EA2C + ldr r1, =0x0202406e ldr r0, [r5] adds r0, 0x49 ldrb r0, [r0] @@ -223862,15 +215387,15 @@ _0806E9E8: ldrh r0, [r0] _0806E9F6: strb r0, [r4, 0x3] - ldr r4, _0806EA30 + ldr r4, =0x02022f68 movs r0, 0xFD strb r0, [r4] movs r0, 0x4 strb r0, [r4, 0x1] - ldr r1, _0806EA34 + ldr r1, =0x020244b8 ldrb r0, [r1] strb r0, [r4, 0x2] - ldr r2, _0806EA2C + ldr r2, =0x0202406e ldrb r0, [r1] lsls r0, 1 adds r0, r2 @@ -223879,18 +215404,14 @@ _0806E9F6: strb r0, [r4, 0x3] movs r0, 0xFF strb r0, [r4, 0x4] - ldr r0, _0806EA38 - ldr r1, _0806EA3C + ldr r0, =0x085cb2a1 + ldr r1, =0x02021fc4 bl sub_814E764 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0806EA2C: .4byte 0x0202406e -_0806EA30: .4byte 0x02022f68 -_0806EA34: .4byte 0x020244b8 -_0806EA38: .4byte 0x085cb2a1 -_0806EA3C: .4byte 0x02021fc4 + .pool thumb_func_end sub_806E994 thumb_func_start sub_806EA40 @@ -223899,7 +215420,7 @@ sub_806EA40: @ 806EA40 lsls r0, 16 lsrs r3, r0, 16 movs r1, 0 - ldr r2, _0806EA54 + ldr r2, =0x08329efc _0806EA4A: ldrh r0, [r2] cmp r0, r3 @@ -223907,7 +215428,7 @@ _0806EA4A: adds r0, r1, 0 b _0806EA62 .align 2, 0 -_0806EA54: .4byte 0x08329efc + .pool _0806EA58: adds r2, 0x4 adds r1, 0x1 @@ -223924,9 +215445,9 @@ sub_806EA68: @ 806EA68 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0806EAEC + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0806EAF0 + ldr r1, =0x00302008 ands r0, r1 cmp r0, 0 beq _0806EA7C @@ -223939,7 +215460,7 @@ _0806EA7C: bl __umodsi3 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _0806EAF4 + ldr r0, =0x02024744 movs r1, 0xB movs r2, 0 bl pokemon_getattr @@ -223948,7 +215469,7 @@ _0806EA7C: movs r0, 0x2D mov r8, r0 movs r7, 0x5F - ldr r5, _0806EAF8 + ldr r5, =0x020244ec adds r0, r5, 0 movs r1, 0x6 movs r2, 0 @@ -223965,7 +215486,7 @@ _0806EA7C: mov r8, r2 movs r7, 0x50 _0806EAC6: - ldr r0, _0806EAFC + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] movs r0, 0xD2 lsls r0, 1 @@ -223978,39 +215499,33 @@ _0806EAC6: beq _0806EB04 cmp r6, r7 bcc _0806EB90 - ldr r0, _0806EAF4 + ldr r0, =0x02024744 lsls r2, 2 - ldr r1, _0806EB00 + ldr r1, =0x08329efe b _0806EB6C .align 2, 0 -_0806EAEC: .4byte 0x02022fec -_0806EAF0: .4byte 0x00302008 -_0806EAF4: .4byte 0x02024744 -_0806EAF8: .4byte 0x020244ec -_0806EAFC: .4byte 0x02037318 -_0806EB00: .4byte 0x08329efe + .pool _0806EB04: cmp r6, r8 bcc _0806EB90 cmp r6, r7 bcs _0806EB18 - ldr r0, _0806EB14 + ldr r0, =0x02024744 lsls r2, r4, 3 b _0806EB66 .align 2, 0 -_0806EB14: .4byte 0x02024744 + .pool _0806EB18: - ldr r0, _0806EB24 + ldr r0, =0x02024744 lsls r2, r4, 3 subs r2, r4 lsls r2, 2 - ldr r1, _0806EB28 + ldr r1, =0x083203da b _0806EB6C .align 2, 0 -_0806EB24: .4byte 0x02024744 -_0806EB28: .4byte 0x083203da + .pool _0806EB2C: - ldr r0, _0806EB54 + ldr r0, =0x083203cc mov r12, r0 lsls r0, r4, 3 subs r1, r0, r4 @@ -224024,24 +215539,23 @@ _0806EB2C: bne _0806EB5C cmp r3, 0 beq _0806EB5C - ldr r0, _0806EB58 + ldr r0, =0x02024744 mov r2, r12 adds r2, 0xC adds r2, r5, r2 b _0806EB6E .align 2, 0 -_0806EB54: .4byte 0x083203cc -_0806EB58: .4byte 0x02024744 + .pool _0806EB5C: cmp r6, r8 bcc _0806EB90 cmp r6, r7 bcs _0806EB80 - ldr r0, _0806EB78 + ldr r0, =0x02024744 _0806EB66: subs r2, r4 lsls r2, 2 - ldr r1, _0806EB7C + ldr r1, =0x083203d8 _0806EB6C: adds r2, r1 _0806EB6E: @@ -224049,13 +215563,12 @@ _0806EB6E: bl pokemon_setattr b _0806EB90 .align 2, 0 -_0806EB78: .4byte 0x02024744 -_0806EB7C: .4byte 0x083203d8 + .pool _0806EB80: - ldr r0, _0806EB9C + ldr r0, =0x02024744 subs r2, r4 lsls r2, 2 - ldr r1, _0806EBA0 + ldr r1, =0x083203da adds r2, r1 movs r1, 0xC bl pokemon_setattr @@ -224066,8 +215579,7 @@ _0806EB90: pop {r0} bx r0 .align 2, 0 -_0806EB9C: .4byte 0x02024744 -_0806EBA0: .4byte 0x083203da + .pool thumb_func_end sub_806EA68 thumb_func_start sub_806EBA4 @@ -224097,7 +215609,7 @@ sub_806EBD0: @ 806EBD0 push {r4,lr} movs r4, 0 lsrs r2, r0, 16 - ldr r3, _0806EBF4 + ldr r3, =0x0000ffff ands r0, r3 eors r2, r0 lsrs r0, r1, 16 @@ -224113,45 +215625,42 @@ _0806EBEA: pop {r1} bx r1 .align 2, 0 -_0806EBF4: .4byte 0x0000ffff + .pool thumb_func_end sub_806EBD0 thumb_func_start sub_806EBF8 sub_806EBF8: @ 806EBF8 push {r4,lr} - ldr r0, _0806EC18 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 beq _0806EC3C - ldr r2, _0806EC1C + ldr r2, =0x02038bce ldrh r1, [r2] - ldr r0, _0806EC20 + ldr r0, =0x00000c03 cmp r1, r0 bne _0806EC28 - ldr r0, _0806EC24 + ldr r0, =0x08317dd4 b _0806EC64 .align 2, 0 -_0806EC18: .4byte 0x02022fec -_0806EC1C: .4byte 0x02038bce -_0806EC20: .4byte 0x00000c03 -_0806EC24: .4byte 0x08317dd4 + .pool _0806EC28: - ldr r4, _0806EC38 + ldr r4, =0x02021cc4 ldrh r1, [r2] adds r0, r4, 0 bl sub_8162E20 adds r0, r4, 0 b _0806EC64 .align 2, 0 -_0806EC38: .4byte 0x02021cc4 + .pool _0806EC3C: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 - ldr r4, _0806EC6C + ldr r4, =0x020229e8 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -224171,7 +215680,7 @@ _0806EC64: pop {r1} bx r1 .align 2, 0 -_0806EC6C: .4byte 0x020229e8 + .pool thumb_func_end sub_806EBF8 thumb_func_start sub_806EC70 @@ -224179,7 +215688,7 @@ sub_806EC70: @ 806EC70 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0806ECA8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -224203,7 +215712,7 @@ _0806ECA0: pop {r0} bx r0 .align 2, 0 -_0806ECA8: .4byte 0x03005e00 + .pool thumb_func_end sub_806EC70 thumb_func_start sub_806ECAC @@ -224211,7 +215720,7 @@ sub_806ECAC: @ 806ECAC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0806ECE8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -224237,7 +215746,7 @@ _0806ECE2: pop {r0} bx r0 .align 2, 0 -_0806ECE8: .4byte 0x03005e00 + .pool thumb_func_end sub_806ECAC thumb_func_start sub_806ECEC @@ -224250,15 +215759,15 @@ sub_806ECEC: @ 806ECEC lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r0, _0806ED24 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 beq _0806ED30 - ldr r0, _0806ED28 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0806ED2C + ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 bne _0806ED30 @@ -224269,9 +215778,7 @@ sub_806ECEC: @ 806ECEC bl sub_806ED40 b _0806ED38 .align 2, 0 -_0806ED24: .4byte 0x02024280 -_0806ED28: .4byte 0x02022fec -_0806ED2C: .4byte 0x02000002 + .pool _0806ED30: adds r0, r5, 0 adds r1, r4, 0 @@ -224317,10 +215824,10 @@ _0806ED66: adds r0, r4, 0 bl cry_related _0806ED7C: - ldr r0, _0806ED80 + ldr r0, =nullsub_12 + 1 b _0806EDFA .align 2, 0 -_0806ED80: .4byte nullsub_12 + 1 + .pool _0806ED84: cmp r2, 0 bne _0806EDA6 @@ -224337,18 +215844,18 @@ _0806ED84: movs r1, 0x1 bl obj_anim_image_start _0806EDA6: - ldr r0, _0806EDDC + ldr r0, =0x08329b87 subs r4, 0x1 adds r6, r4, r0 ldrb r0, [r6] cmp r0, 0 beq _0806EDEC - ldr r0, _0806EDE0 + ldr r0, =sub_806EC70 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0806EDE4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -224356,7 +215863,7 @@ _0806EDA6: strh r5, [r1, 0x8] lsrs r0, r5, 16 strh r0, [r1, 0xA] - ldr r0, _0806EDE8 + ldr r0, =0x083299ec adds r0, r4, r0 ldrb r0, [r0] strh r0, [r1, 0xC] @@ -224364,26 +215871,22 @@ _0806EDA6: strh r0, [r1, 0xE] b _0806EDF8 .align 2, 0 -_0806EDDC: .4byte 0x08329b87 -_0806EDE0: .4byte sub_806EC70 + 1 -_0806EDE4: .4byte 0x03005e00 -_0806EDE8: .4byte 0x083299ec + .pool _0806EDEC: - ldr r0, _0806EE04 + ldr r0, =0x083299ec adds r0, r4, r0 ldrb r1, [r0] adds r0, r5, 0 bl sub_817F544 _0806EDF8: - ldr r0, _0806EE08 + ldr r0, =nullsub_18 + 1 _0806EDFA: str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0806EE04: .4byte 0x083299ec -_0806EE08: .4byte nullsub_18 + 1 + .pool thumb_func_end sub_806ED40 thumb_func_start sub_806EE0C @@ -224404,18 +215907,18 @@ sub_806EE0C: @ 806EE0C movs r1, 0x1 bl obj_anim_image_start _0806EE2E: - ldr r0, _0806EE70 + ldr r0, =0x08329b87 subs r4, 0x1 adds r6, r4, r0 ldrb r0, [r6] cmp r0, 0 beq _0806EE80 - ldr r0, _0806EE74 + ldr r0, =sub_806ECAC + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r1, _0806EE78 + ldr r1, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -224423,7 +215926,7 @@ _0806EE2E: strh r5, [r2, 0x8] lsrs r1, r5, 16 strh r1, [r2, 0xA] - ldr r1, _0806EE7C + ldr r1, =0x083299ec adds r1, r4, r1 ldrb r1, [r1] strh r1, [r2, 0xC] @@ -224434,12 +215937,9 @@ _0806EE2E: bl sub_817F60C b _0806EE8C .align 2, 0 -_0806EE70: .4byte 0x08329b87 -_0806EE74: .4byte sub_806ECAC + 1 -_0806EE78: .4byte 0x03005e00 -_0806EE7C: .4byte 0x083299ec + .pool _0806EE80: - ldr r0, _0806EE94 + ldr r0, =0x083299ec adds r0, r4, r0 ldrb r1, [r0] adds r0, r5, 0 @@ -224449,13 +215949,13 @@ _0806EE8C: pop {r0} bx r0 .align 2, 0 -_0806EE94: .4byte 0x083299ec + .pool thumb_func_end sub_806EE0C thumb_func_start sub_806EE98 sub_806EE98: @ 806EE98 push {lr} - ldr r0, _0806EEB0 + ldr r0, =sub_806ECAC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -224466,7 +215966,7 @@ _0806EEAC: pop {r0} bx r0 .align 2, 0 -_0806EEB0: .4byte sub_806ECAC + 1 + .pool thumb_func_end sub_806EE98 thumb_func_start sub_806EEB4 @@ -224475,25 +215975,22 @@ sub_806EEB4: @ 806EEB4 adds r4, r0, 0 lsls r1, 16 lsrs r2, r1, 16 - ldr r0, _0806EED8 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 beq _0806EEE8 - ldr r0, _0806EEDC + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0806EEE0 + ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 bne _0806EEE8 - ldr r0, _0806EEE4 + ldr r0, =nullsub_12 + 1 b _0806EEFC .align 2, 0 -_0806EED8: .4byte 0x02024280 -_0806EEDC: .4byte 0x02022fec -_0806EEE0: .4byte 0x02000002 -_0806EEE4: .4byte nullsub_12 + 1 + .pool _0806EEE8: adds r0, r2, 0 bl sub_817F474 @@ -224502,14 +215999,14 @@ _0806EEE8: lsrs r1, 24 adds r0, r4, 0 bl sub_817F594 - ldr r0, _0806EF04 + ldr r0, =nullsub_18 + 1 _0806EEFC: str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0806EF04: .4byte nullsub_18 + 1 + .pool thumb_func_end sub_806EEB4 thumb_func_start sub_806EF08 @@ -224521,7 +216018,7 @@ sub_806EF08: @ 806EF08 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 - ldr r2, _0806EF34 + ldr r2, =0x020229e8 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -224535,7 +216032,7 @@ sub_806EF08: @ 806EF08 beq _0806EF42 b _0806EF56 .align 2, 0 -_0806EF34: .4byte 0x020229e8 + .pool _0806EF38: cmp r0, 0x2 beq _0806EF42 @@ -224556,7 +216053,7 @@ _0806EF4C: ands r5, r0 _0806EF56: movs r2, 0 - ldr r4, _0806EF80 + ldr r4, =0x020229e8 ldrh r0, [r4, 0x18] adds r1, r5, 0 cmp r0, r1 @@ -224578,7 +216075,7 @@ _0806EF74: pop {r1} bx r1 .align 2, 0 -_0806EF80: .4byte 0x020229e8 + .pool thumb_func_end sub_806EF08 thumb_func_start sub_806EF84 @@ -224589,7 +216086,7 @@ sub_806EF84: @ 806EF84 lsls r1, 24 lsrs r1, 24 movs r4, 0 - ldr r2, _0806EFAC + ldr r2, =0x020229e8 lsls r0, r1, 3 subs r0, r1 lsls r0, 2 @@ -224603,7 +216100,7 @@ sub_806EF84: @ 806EF84 beq _0806EFBA b _0806EFCE .align 2, 0 -_0806EFAC: .4byte 0x020229e8 + .pool _0806EFB0: cmp r0, 0x2 beq _0806EFBA @@ -224648,12 +216145,12 @@ _0806EFE6: sub_806EFF0: @ 806EFF0 lsls r0, 16 lsrs r0, 16 - ldr r1, _0806EFFC + ldr r1, =0x0831f578 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_0806EFFC: .4byte 0x0831f578 + .pool thumb_func_end sub_806EFF0 thumb_func_start sub_806F000 @@ -224702,7 +216199,7 @@ sub_806F01C: @ 806F01C lsrs r0, 16 cmp r0, 0xC9 bne _0806F05C - ldr r0, _0806F078 + ldr r0, =0x03005d90 ldr r0, [r0] str r7, [r0, 0x1C] _0806F05C: @@ -224713,7 +216210,7 @@ _0806F05C: lsls r1, 17 cmp r0, r1 bne _0806F072 - ldr r0, _0806F078 + ldr r0, =0x03005d90 ldr r0, [r0] str r7, [r0, 0x20] _0806F072: @@ -224721,7 +216218,7 @@ _0806F072: pop {r0} bx r0 .align 2, 0 -_0806F078: .4byte 0x03005d90 + .pool thumb_func_end sub_806F01C thumb_func_start sub_806F07C @@ -224729,12 +216226,12 @@ sub_806F07C: @ 806F07C push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _0806F0A4 + ldr r0, =0x00000356 cmp r2, r0 bls _0806F08A movs r2, 0 _0806F08A: - ldr r1, _0806F0A8 + ldr r1, =0x08310030 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -224742,14 +216239,12 @@ _0806F08A: ldrb r1, [r0, 0x1] movs r0, 0xD muls r0, r1 - ldr r1, _0806F0AC + ldr r1, =0x0830fcd4 adds r0, r1 pop {r1} bx r1 .align 2, 0 -_0806F0A4: .4byte 0x00000356 -_0806F0A8: .4byte 0x08310030 -_0806F0AC: .4byte 0x0830fcd4 + .pool thumb_func_end sub_806F07C thumb_func_start sub_806F0B0 @@ -224757,7 +216252,7 @@ sub_806F0B0: @ 806F0B0 push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _0806F0CC + ldr r0, =0x00000356 cmp r1, r0 bls _0806F0BE movs r1, 0 @@ -224765,13 +216260,12 @@ _0806F0BE: lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0806F0D0 + ldr r1, =0x08310034 adds r0, r1 pop {r1} bx r1 .align 2, 0 -_0806F0CC: .4byte 0x00000356 -_0806F0D0: .4byte 0x08310034 + .pool thumb_func_end sub_806F0B0 thumb_func_start sub_806F0D4 @@ -224780,7 +216274,7 @@ sub_806F0D4: @ 806F0D4 lsls r0, 16 lsrs r2, r0, 16 movs r1, 0 - ldr r0, _0806F100 + ldr r0, =0x00000181 cmp r2, r0 beq _0806F0F8 adds r0, 0x19 @@ -224799,28 +216293,28 @@ _0806F0F8: pop {r1} bx r1 .align 2, 0 -_0806F100: .4byte 0x00000181 + .pool thumb_func_end sub_806F0D4 thumb_func_start sub_806F104 sub_806F104: @ 806F104 push {lr} - ldr r2, _0806F148 - ldr r1, _0806F14C + ldr r2, =0x030022c0 + ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _0806F122 - ldr r0, _0806F150 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0806F154 + ldr r1, =0x003f0100 ands r0, r1 cmp r0, 0 bne _0806F144 _0806F122: - ldr r1, _0806F14C + ldr r1, =0x00000439 adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x2 @@ -224839,10 +216333,7 @@ _0806F144: movs r0, 0x1 b _0806F15A .align 2, 0 -_0806F148: .4byte 0x030022c0 -_0806F14C: .4byte 0x00000439 -_0806F150: .4byte 0x02022fec -_0806F154: .4byte 0x003f0100 + .pool _0806F158: movs r0, 0 _0806F15A: @@ -224869,7 +216360,7 @@ _0806F176: adds r1, r2, r4 lsls r1, 3 adds r0, r1, r0 - ldr r3, _0806F1F8 + ldr r3, =0x08329d98 adds r1, r3 ldm r1!, {r3,r5,r7} stm r0!, {r3,r5,r7} @@ -224933,7 +216424,7 @@ _0806F1EA: pop {r0} bx r0 .align 2, 0 -_0806F1F8: .4byte 0x08329d98 + .pool thumb_func_end sub_806F160 thumb_func_start sub_806F1FC @@ -224949,7 +216440,7 @@ sub_806F1FC: @ 806F1FC movs r3, 0 cmp r0, 0 beq _0806F296 - ldr r0, _0806F2A4 + ldr r0, =0x08329f28 mov r10, r0 _0806F216: ldr r0, [r4, 0xC] @@ -225007,7 +216498,7 @@ _0806F26A: lsls r0, 3 adds r0, r7, r0 str r0, [r1, 0xC] - ldr r6, _0806F2A8 + ldr r6, =0x082ff70c str r6, [r1, 0x8] strh r3, [r1, 0x2] mov r7, r9 @@ -225027,8 +216518,7 @@ _0806F296: pop {r0} bx r0 .align 2, 0 -_0806F2A4: .4byte 0x08329f28 -_0806F2A8: .4byte 0x082ff70c + .pool thumb_func_end sub_806F1FC thumb_func_start sub_806F2AC @@ -225257,11 +216747,11 @@ _0806F448: _0806F45E: movs r0, 0xA3 strb r0, [r4, 0x2] - ldr r0, _0806F478 + ldr r0, =0x020249b4 add r0, r8 str r4, [r0] _0806F468: - ldr r0, _0806F478 + ldr r0, =0x020249b4 add r0, r8 ldr r0, [r0] _0806F46E: @@ -225271,7 +216761,7 @@ _0806F46E: pop {r1} bx r1 .align 2, 0 -_0806F478: .4byte 0x020249b4 + .pool thumb_func_end sub_806F2AC thumb_func_start sub_806F47C @@ -225281,7 +216771,7 @@ sub_806F47C: @ 806F47C lsrs r0, 24 movs r1, 0x1 ands r0, r1 - ldr r1, _0806F4A4 + ldr r1, =0x020249b4 lsls r0, 2 adds r0, r1 ldr r4, [r0] @@ -225296,7 +216786,7 @@ sub_806F47C: @ 806F47C bl memset b _0806F4F0 .align 2, 0 -_0806F4A4: .4byte 0x020249b4 + .pool _0806F4A8: ldr r0, [r4, 0x10] cmp r0, 0 @@ -225345,7 +216835,7 @@ sub_806F4F8: @ 806F4F8 lsrs r0, 24 lsls r1, 24 lsrs r3, r1, 24 - ldr r2, _0806F518 + ldr r2, =0x020249b4 movs r1, 0x1 ands r0, r1 lsls r0, 2 @@ -225357,7 +216847,7 @@ sub_806F4F8: @ 806F4F8 movs r0, 0 b _0806F530 .align 2, 0 -_0806F518: .4byte 0x020249b4 + .pool _0806F51C: ldrb r0, [r1] lsls r0, 28 @@ -225379,7 +216869,7 @@ _0806F530: sine: @ 806F534 lsls r1, 16 asrs r1, 16 - ldr r2, _0806F54C + ldr r2, =0x08329f40 lsls r0, 16 asrs r0, 15 adds r0, r2 @@ -225390,14 +216880,14 @@ sine: @ 806F534 asrs r0, 16 bx lr .align 2, 0 -_0806F54C: .4byte 0x08329f40 + .pool thumb_func_end sine thumb_func_start cosine cosine: @ 806F550 lsls r1, 16 asrs r1, 16 - ldr r2, _0806F56C + ldr r2, =0x08329f40 lsls r0, 16 asrs r0, 15 adds r0, 0x80 @@ -225409,7 +216899,7 @@ cosine: @ 806F550 asrs r0, 16 bx lr .align 2, 0 -_0806F56C: .4byte 0x08329f40 + .pool thumb_func_end cosine thumb_func_start sine2 @@ -225429,7 +216919,7 @@ sine2: @ 806F570 bl __udivsi3 movs r1, 0x1 ands r0, r1 - ldr r1, _0806F5A4 + ldr r1, =0x0832a1c0 lsls r4, 1 adds r4, r1 ldrh r1, [r4] @@ -225438,7 +216928,7 @@ sine2: @ 806F570 lsls r0, r1, 16 b _0806F5AC .align 2, 0 -_0806F5A4: .4byte 0x0832a1c0 + .pool _0806F5A8: lsls r0, r1, 16 negs r0, r0 @@ -225466,81 +216956,75 @@ cosine2: @ 806F5B4 thumb_func_start GenerateRandomNumber GenerateRandomNumber: @ 806F5CC - ldr r2, _0806F5E8 + ldr r2, =0x03005d80 ldr r1, [r2] - ldr r0, _0806F5EC + ldr r0, =0x41c64e6d muls r0, r1 - ldr r1, _0806F5F0 + ldr r1, =0x00006073 adds r0, r1 str r0, [r2] - ldr r2, _0806F5F4 + ldr r2, =0x020249c0 ldr r1, [r2] adds r1, 0x1 str r1, [r2] lsrs r0, 16 bx lr .align 2, 0 -_0806F5E8: .4byte 0x03005d80 -_0806F5EC: .4byte 0x41c64e6d -_0806F5F0: .4byte 0x00006073 -_0806F5F4: .4byte 0x020249c0 + .pool thumb_func_end GenerateRandomNumber thumb_func_start SeedRng SeedRng: @ 806F5F8 lsls r0, 16 lsrs r0, 16 - ldr r1, _0806F608 + ldr r1, =0x03005d80 str r0, [r1] - ldr r1, _0806F60C + ldr r1, =0x020249bc movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_0806F608: .4byte 0x03005d80 -_0806F60C: .4byte 0x020249bc + .pool thumb_func_end SeedRng thumb_func_start SeedRng2 SeedRng2: @ 806F610 lsls r0, 16 lsrs r0, 16 - ldr r1, _0806F61C + ldr r1, =0x03005d84 str r0, [r1] bx lr .align 2, 0 -_0806F61C: .4byte 0x03005d84 + .pool thumb_func_end SeedRng2 thumb_func_start GenerateRandomNumber2 GenerateRandomNumber2: @ 806F620 - ldr r2, _0806F634 + ldr r2, =0x03005d84 ldr r1, [r2] - ldr r0, _0806F638 + ldr r0, =0x41c64e6d muls r0, r1 - ldr r1, _0806F63C + ldr r1, =0x00006073 adds r0, r1 str r0, [r2] lsrs r0, 16 bx lr .align 2, 0 -_0806F634: .4byte 0x03005d84 -_0806F638: .4byte 0x41c64e6d -_0806F63C: .4byte 0x00006073 + .pool thumb_func_end GenerateRandomNumber2 thumb_func_start object_new_hidden_with_callback object_new_hidden_with_callback: @ 806F640 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, _0806F674 + ldr r0, =0x0832a3a8 movs r1, 0xF8 movs r2, 0xA8 movs r3, 0xE bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r5, _0806F678 + ldr r5, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -225557,8 +217041,7 @@ object_new_hidden_with_callback: @ 806F640 pop {r1} bx r1 .align 2, 0 -_0806F674: .4byte 0x0832a3a8 -_0806F678: .4byte 0x02020630 + .pool thumb_func_end object_new_hidden_with_callback thumb_func_start sub_806F67C @@ -225657,7 +217140,7 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: @ 806F70C ldr r7, [sp, 0x58] lsls r0, 24 lsls r1, 24 - ldr r2, _0806F73C + ldr r2, =0x0832a3c0 lsrs r1, 23 lsrs r0, 21 adds r1, r0 @@ -225671,7 +217154,7 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: @ 806F70C movs r0, 0 b _0806F88C .align 2, 0 -_0806F73C: .4byte 0x0832a3c0 + .pool _0806F740: movs r5, 0 adds r0, 0x1 @@ -225679,7 +217162,7 @@ _0806F740: b _0806F874 _0806F748: ldrh r0, [r4] - ldr r2, _0806F780 + ldr r2, =0x000003ff adds r1, r2, 0 ands r1, r0 lsls r1, 5 @@ -225695,7 +217178,7 @@ _0806F748: ldr r0, [sp, 0x20] add r0, r8 adds r1, r7, 0 - ldr r2, _0806F784 + ldr r2, =0x04000008 bl CpuSet adds r4, 0x2 str r4, [sp, 0x2C] @@ -225705,8 +217188,7 @@ _0806F748: mov r9, r5 b _0806F86A .align 2, 0 -_0806F780: .4byte 0x000003ff -_0806F784: .4byte 0x04000008 + .pool _0806F788: movs r0, 0x80 lsls r0, 4 @@ -225731,7 +217213,7 @@ _0806F7A0: adds r0, r1, r0 lsls r1, r4, 2 adds r1, r7, r1 - ldr r2, _0806F7C8 + ldr r2, =0x04000001 bl CpuSet adds r4, 0x1 lsls r4, 24 @@ -225741,7 +217223,7 @@ _0806F7A0: ble _0806F7A0 b _0806F86A .align 2, 0 -_0806F7C8: .4byte 0x04000001 + .pool _0806F7CC: movs r1, 0 adds r4, 0x2 @@ -225807,7 +217289,7 @@ _0806F836: add r0, sp lsls r1, r4, 2 adds r1, r7, r1 - ldr r2, _0806F85C + ldr r2, =0x04000001 bl CpuSet adds r4, 0x1 lsls r4, 24 @@ -225817,11 +217299,11 @@ _0806F836: ble _0806F836 b _0806F86A .align 2, 0 -_0806F85C: .4byte 0x04000001 + .pool _0806F860: mov r0, sp adds r1, r7, 0 - ldr r2, _0806F8A4 + ldr r2, =0x04000008 bl CpuSet _0806F86A: ldr r4, [sp, 0x2C] @@ -225858,7 +217340,7 @@ _0806F894: pop {r0} bx r0 .align 2, 0 -_0806F8A4: .4byte 0x04000008 + .pool thumb_func_end rfu_MBOOT_CHILD_inheritanceLinkStatus thumb_func_start sub_806F8A8 @@ -225892,12 +217374,12 @@ sub_806F8D0: @ 806F8D0 push {r4-r7,lr} adds r7, r0, 0 adds r4, r1, 0 - ldr r2, _0806F900 + ldr r2, =0x00001121 movs r3, 0 cmp r3, r4 bge _0806F91C movs r6, 0x1 - ldr r0, _0806F904 + ldr r0, =0x00008408 adds r5, r0, 0 _0806F8E4: adds r0, r7, r3 @@ -225916,8 +217398,7 @@ _0806F8EE: lsrs r2, r0, 16 b _0806F90A .align 2, 0 -_0806F900: .4byte 0x00001121 -_0806F904: .4byte 0x00008408 + .pool _0806F908: lsrs r2, 1 _0806F90A: @@ -225944,11 +217425,11 @@ sub_806F928: @ 806F928 push {r4-r6,lr} adds r5, r0, 0 adds r4, r1, 0 - ldr r2, _0806F964 + ldr r2, =0x00001121 movs r3, 0 cmp r3, r4 bcs _0806F956 - ldr r6, _0806F968 + ldr r6, =0x0832a3d8 _0806F938: lsrs r1, r2, 8 adds r0, r5, r3 @@ -225973,8 +217454,7 @@ _0806F956: pop {r1} bx r1 .align 2, 0 -_0806F964: .4byte 0x00001121 -_0806F968: .4byte 0x0832a3d8 + .pool thumb_func_end sub_806F928 thumb_func_start sub_806F96C @@ -226020,9 +217500,9 @@ pal_fade_1: @ 806F98C movs r6, 0 cmp r6, r12 bcs _0806FA12 - ldr r0, _0806FA24 + ldr r0, =0x02037714 mov r10, r0 - ldr r1, _0806FA28 + ldr r1, =0x02037b14 mov r9, r1 _0806F9BA: mov r0, r8 @@ -226079,8 +217559,7 @@ _0806FA12: pop {r0} bx r0 .align 2, 0 -_0806FA24: .4byte 0x02037714 -_0806FA28: .4byte 0x02037b14 + .pool thumb_func_end pal_fade_1 thumb_func_start pokemon_get_nick @@ -226246,7 +217725,7 @@ sub_806FB38: @ 806FB38 beq _0806FBBC adds r0, r5, 0 adds r0, 0x74 - ldr r1, _0806FBE8 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy adds r4, r5, 0 @@ -226278,7 +217757,7 @@ sub_806FB38: @ 806FB38 bl pokemon_getattr lsls r0, 24 lsrs r0, 24 - ldr r1, _0806FBEC + ldr r1, =0x03005d8c ldr r1, [r1] lsls r2, r0, 3 adds r2, r0 @@ -226286,7 +217765,7 @@ sub_806FB38: @ 806FB38 adds r1, r2 adds r0, r5, 0 adds r0, 0x50 - ldr r2, _0806FBF0 + ldr r2, =0x00002be0 adds r1, r2 ldm r1!, {r2-r4} stm r0!, {r2-r4} @@ -226315,9 +217794,7 @@ _0806FBBC: pop {r0} bx r0 .align 2, 0 -_0806FBE8: .4byte 0x03005d90 -_0806FBEC: .4byte 0x03005d8c -_0806FBF0: .4byte 0x00002be0 + .pool thumb_func_end sub_806FB38 thumb_func_start daycare_send @@ -226348,19 +217825,17 @@ daycare_send_selected_pokemon: @ 806FC18 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _0806FC3C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0806FC40 + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r2, _0806FC44 + ldr r2, =0x00003030 adds r1, r2 bl daycare_send pop {r0} bx r0 .align 2, 0 -_0806FC3C: .4byte 0x020244ec -_0806FC40: .4byte 0x03005d8c -_0806FC44: .4byte 0x00003030 + .pool thumb_func_end daycare_send_selected_pokemon thumb_func_start sub_806FC48 @@ -226413,7 +217888,7 @@ sub_806FCA4: @ 806FCA4 push {r4-r7,lr} adds r4, r0, 0 movs r5, 0 - ldr r7, _0806FCC0 + ldr r7, =0x0000ffff _0806FCAC: adds r0, r4, 0 bl sub_806DF74 @@ -226424,12 +217899,12 @@ _0806FCAC: adds r5, 0x1 b _0806FCD4 .align 2, 0 -_0806FCC0: .4byte 0x0000ffff + .pool _0806FCC4: movs r6, 0 cmp r0, r7 bne _0806FCD4 - ldr r0, _0806FCF4 + ldr r0, =0x020244e2 ldrh r1, [r0] adds r0, r4, 0 bl sub_8069424 @@ -226450,7 +217925,7 @@ _0806FCE8: pop {r0} bx r0 .align 2, 0 -_0806FCF4: .4byte 0x020244e2 + .pool thumb_func_end sub_806FCA4 thumb_func_start sub_806FCF8 @@ -226458,7 +217933,7 @@ sub_806FCF8: @ 806FCF8 push {r4-r7,lr} sub sp, 0x68 adds r5, r0, 0 - ldr r1, _0806FD94 + ldr r1, =0x02021cc4 bl pokemon_get_nick_ adds r0, r5, 0 movs r1, 0xB @@ -226488,7 +217963,7 @@ sub_806FCF8: @ 806FCF8 mov r0, sp bl sub_806FCA4 _0806FD46: - ldr r0, _0806FD98 + ldr r0, =0x020244ec movs r1, 0xFA lsls r1, 1 adds r6, r0, r1 @@ -226523,8 +217998,7 @@ _0806FD74: pop {r1} bx r1 .align 2, 0 -_0806FD94: .4byte 0x02021cc4 -_0806FD98: .4byte 0x020244ec + .pool thumb_func_end sub_806FCF8 thumb_func_start sub_806FD9C @@ -226551,11 +218025,11 @@ sub_806FD9C: @ 806FD9C thumb_func_start sub_806FDC4 sub_806FDC4: @ 806FDC4 push {lr} - ldr r0, _0806FDE0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0806FDE4 + ldr r1, =0x00003030 adds r0, r1 - ldr r1, _0806FDE8 + ldr r1, =0x020375e0 ldrb r1, [r1] bl sub_806FD9C lsls r0, 16 @@ -226563,9 +218037,7 @@ sub_806FDC4: @ 806FDC4 pop {r1} bx r1 .align 2, 0 -_0806FDE0: .4byte 0x03005d8c -_0806FDE4: .4byte 0x00003030 -_0806FDE8: .4byte 0x020375e0 + .pool thumb_func_end sub_806FDC4 thumb_func_start sub_806FDEC @@ -226628,12 +218100,12 @@ sub_806FE54: @ 806FE54 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0806FE80 + ldr r0, =0x02021dc4 adds r1, r4, 0 movs r2, 0 movs r3, 0x2 bl decimal_int_to_string - ldr r1, _0806FE84 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl pokemon_get_nick_ adds r0, r4, 0 @@ -226641,8 +218113,7 @@ sub_806FE54: @ 806FE54 pop {r1} bx r1 .align 2, 0 -_0806FE80: .4byte 0x02021dc4 -_0806FE84: .4byte 0x02021cc4 + .pool thumb_func_end sub_806FE54 thumb_func_start sub_806FE88 @@ -226653,13 +218124,13 @@ sub_806FE88: @ 806FE88 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _0806FEB8 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl pokemon_get_nick_ movs r0, 0x64 muls r4, r0 adds r4, 0x64 - ldr r0, _0806FEBC + ldr r0, =0x02021dc4 adds r1, r4, 0 movs r2, 0 movs r3, 0x5 @@ -226669,8 +218140,7 @@ sub_806FE88: @ 806FE88 pop {r1} bx r1 .align 2, 0 -_0806FEB8: .4byte 0x02021cc4 -_0806FEBC: .4byte 0x02021dc4 + .pool thumb_func_end sub_806FE88 thumb_func_start sub_806FEC0 @@ -226691,57 +218161,52 @@ sub_806FEC0: @ 806FEC0 thumb_func_start sub_806FED8 sub_806FED8: @ 806FED8 push {lr} - ldr r0, _0806FEF4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0806FEF8 + ldr r1, =0x00003030 adds r0, r1 - ldr r1, _0806FEFC + ldr r1, =0x020375e0 ldrb r1, [r1] bl sub_806FEC0 - ldr r1, _0806FF00 + ldr r1, =0x020375e2 strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_0806FEF4: .4byte 0x03005d8c -_0806FEF8: .4byte 0x00003030 -_0806FEFC: .4byte 0x020375e0 -_0806FF00: .4byte 0x020375e2 + .pool thumb_func_end sub_806FED8 thumb_func_start sub_806FF04 sub_806FF04: @ 806FF04 lsls r0, 16 lsrs r0, 16 - ldr r1, _0806FF24 + ldr r1, =0x03005d8c ldr r2, [r1] - ldr r1, _0806FF28 + ldr r1, =0x000030b8 adds r3, r2, r1 ldr r1, [r3] adds r1, r0 str r1, [r3] - ldr r1, _0806FF2C + ldr r1, =0x00003144 adds r2, r1 ldr r1, [r2] adds r1, r0 str r1, [r2] bx lr .align 2, 0 -_0806FF24: .4byte 0x03005d8c -_0806FF28: .4byte 0x000030b8 -_0806FF2C: .4byte 0x00003144 + .pool thumb_func_end sub_806FF04 thumb_func_start sub_806FF30 sub_806FF30: @ 806FF30 push {r4-r6,lr} - ldr r6, _0806FF54 - ldr r5, _0806FF58 + ldr r6, =0x03005d8c + ldr r5, =0x020375e0 ldrh r0, [r5] movs r4, 0x8C adds r1, r0, 0 muls r1, r4 - ldr r0, _0806FF5C + ldr r0, =0x00003030 adds r1, r0 ldr r0, [r6] adds r0, r1 @@ -226752,14 +218217,12 @@ sub_806FF30: @ 806FF30 movs r0, 0 b _0806FF76 .align 2, 0 -_0806FF54: .4byte 0x03005d8c -_0806FF58: .4byte 0x020375e0 -_0806FF5C: .4byte 0x00003030 + .pool _0806FF60: ldrh r0, [r5] adds r1, r0, 0 muls r1, r4 - ldr r0, _0806FF7C + ldr r0, =0x00003030 adds r1, r0 ldr r0, [r6] adds r0, r1 @@ -226771,7 +218234,7 @@ _0806FF76: pop {r1} bx r1 .align 2, 0 -_0806FF7C: .4byte 0x00003030 + .pool thumb_func_end sub_806FF30 thumb_func_start sub_806FF80 @@ -226858,7 +218321,7 @@ sub_8070004: @ 8070004 lsrs r2, r0, 16 movs r0, 0 mov r8, r0 - ldr r0, _08070030 + ldr r0, =0x0832531c mov r12, r0 _08070016: movs r7, 0 @@ -226876,7 +218339,7 @@ _08070024: lsrs r2, r4, 16 b _08070060 .align 2, 0 -_08070030: .4byte 0x0832531c + .pool _08070034: adds r1, 0x1 cmp r1, 0x4 @@ -226898,7 +218361,7 @@ _0807004A: adds r5, 0x28 adds r3, 0x28 adds r6, 0x1 - ldr r0, _08070080 + ldr r0, =0x0000019b cmp r6, r0 ble _08070024 _08070060: @@ -226919,7 +218382,7 @@ _08070072: pop {r1} bx r1 .align 2, 0 -_08070080: .4byte 0x0000019b + .pool thumb_func_end sub_8070004 thumb_func_start sub_8070084 @@ -226967,7 +218430,7 @@ _080700C8: bne _080700E2 bl GenerateRandomNumber lsls r0, 16 - ldr r1, _08070104 + ldr r1, =0x7ffe0000 movs r7, 0x1 cmp r0, r1 bls _080700E2 @@ -226982,7 +218445,7 @@ _080700E2: bne _080700FE bl GenerateRandomNumber lsls r0, 16 - ldr r1, _08070104 + ldr r1, =0x7ffe0000 cmp r0, r1 bls _08070108 _080700FE: @@ -226990,7 +218453,7 @@ _080700FE: negs r0, r0 b _0807010A .align 2, 0 -_08070104: .4byte 0x7ffe0000 + .pool _08070108: adds r0, r7, 0 _0807010A: @@ -227005,7 +218468,7 @@ sub_8070114: @ 8070114 push {r4-r7,lr} adds r5, r0, 0 movs r6, 0 - ldr r0, _08070158 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x24] bl SeedRng2 adds r0, r5, 0 @@ -227022,7 +218485,7 @@ sub_8070114: @ 8070114 lsls r4, 16 lsls r0, 16 lsrs r0, 16 - ldr r1, _0807015C + ldr r1, =0x0000fffe bl __umodsi3 lsls r0, 16 lsrs r0, 16 @@ -227031,8 +218494,7 @@ sub_8070114: @ 8070114 str r4, [r5] b _080701AC .align 2, 0 -_08070158: .4byte 0x030022c0 -_0807015C: .4byte 0x0000fffe + .pool _08070160: movs r0, 0x8C muls r0, r1 @@ -227103,31 +218565,29 @@ sub_80701B8: @ 80701B8 thumb_func_start sub_80701E0 sub_80701E0: @ 80701E0 push {lr} - ldr r0, _080701F4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080701F8 + ldr r1, =0x00003030 adds r0, r1 bl sub_8070114 pop {r0} bx r0 .align 2, 0 -_080701F4: .4byte 0x03005d8c -_080701F8: .4byte 0x00003030 + .pool thumb_func_end sub_80701E0 thumb_func_start sub_80701FC sub_80701FC: @ 80701FC push {lr} - ldr r0, _08070210 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08070214 + ldr r1, =0x00003030 adds r0, r1 bl sub_80701B8 pop {r0} bx r0 .align 2, 0 -_08070210: .4byte 0x03005d8c -_08070214: .4byte 0x00003030 + .pool thumb_func_end sub_80701FC thumb_func_start sub_8070218 @@ -227237,12 +218697,12 @@ _080702D2: cmp r0, 0x5 bhi _080703AE lsls r0, 2 - ldr r1, _080702E8 + ldr r1, =_080702EC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080702E8: .4byte _080702EC + .pool .align 2, 0 _080702EC: .4byte _08070304 @@ -227362,29 +218822,28 @@ pokemon_get_eggmoves: @ 80703C8 lsls r0, 16 lsrs r3, r0, 16 movs r2, 0 - ldr r5, _080703F0 + ldr r5, =0x0832add8 ldrh r1, [r5] - ldr r7, _080703F4 + ldr r7, =0x00004e20 adds r0, r3, r7 cmp r1, r0 bne _080703F8 movs r4, 0x1 b _0807041A .align 2, 0 -_080703F0: .4byte 0x0832add8 -_080703F4: .4byte 0x00004e20 + .pool _080703F8: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _08070464 - ldr r5, _08070468 + ldr r0, =0x00000471 + ldr r5, =0x0832add8 cmp r2, r0 bhi _0807041A lsls r0, r2, 1 adds r0, r5 ldrh r1, [r0] - ldr r7, _0807046C + ldr r7, =0x00004e20 adds r0, r3, r7 cmp r1, r0 bne _080703F8 @@ -227396,7 +218855,7 @@ _0807041A: lsls r0, r4, 1 adds r0, r5 ldrh r0, [r0] - ldr r1, _0807046C + ldr r1, =0x00004e20 cmp r0, r1 bhi _08070456 adds r7, r5, 0 @@ -227432,9 +218891,7 @@ _08070456: pop {r1} bx r1 .align 2, 0 -_08070464: .4byte 0x00000471 -_08070468: .4byte 0x0832add8 -_0807046C: .4byte 0x00004e20 + .pool thumb_func_end pokemon_get_eggmoves thumb_func_start daycare_build_child_moveset @@ -227451,10 +218908,10 @@ daycare_build_child_moveset: @ 8070470 movs r0, 0 str r0, [sp] movs r6, 0 - ldr r5, _08070574 + ldr r5, =0x02024a4c movs r2, 0 - ldr r4, _08070578 - ldr r3, _0807057C + ldr r4, =0x02024a28 + ldr r3, =0x02024a30 _08070490: lsls r1, r6, 1 adds r0, r1, r5 @@ -227469,7 +218926,7 @@ _08070490: cmp r6, 0x3 bls _08070490 movs r6, 0 - ldr r2, _08070580 + ldr r2, =0x02024a38 movs r1, 0 _080704AE: lsls r0, r6, 1 @@ -227481,7 +218938,7 @@ _080704AE: cmp r6, 0x9 bls _080704AE movs r6, 0 - ldr r2, _08070584 + ldr r2, =0x020249c4 movs r1, 0 _080704C4: lsls r0, r6, 1 @@ -227497,13 +218954,13 @@ _080704C4: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - ldr r1, _08070584 + ldr r1, =0x020249c4 bl sub_806E204 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] movs r6, 0 - ldr r1, _08070578 + ldr r1, =0x02024a28 mov r8, r1 _080704F2: adds r5, r6, 0 @@ -227518,7 +218975,7 @@ _080704F2: mov r0, r9 adds r1, r5, 0 bl pokemon_getattr_encrypted - ldr r1, _08070574 + ldr r1, =0x02024a4c adds r4, r1 strh r0, [r4] adds r0, r6, 0x1 @@ -227526,7 +218983,7 @@ _080704F2: lsrs r6, r0, 16 cmp r6, 0x3 bls _080704F2 - ldr r1, _08070580 + ldr r1, =0x02024a38 adds r0, r7, 0 bl pokemon_get_eggmoves lsls r0, 24 @@ -227534,7 +218991,7 @@ _080704F2: mov r8, r0 movs r6, 0 _0807052E: - ldr r0, _08070578 + ldr r0, =0x02024a28 lsls r1, r6, 1 adds r2, r1, r0 ldrh r1, [r2] @@ -227545,9 +219002,9 @@ _0807052E: cmp r5, r8 bcs _08070596 adds r4, r2, 0 - ldr r2, _08070588 + ldr r2, =0x0000ffff _08070546: - ldr r0, _08070580 + ldr r0, =0x02024a38 lsls r1, r5, 1 adds r1, r0 ldrh r0, [r4] @@ -227568,12 +219025,7 @@ _08070546: bl sub_8069424 b _08070596 .align 2, 0 -_08070574: .4byte 0x02024a4c -_08070578: .4byte 0x02024a28 -_0807057C: .4byte 0x02024a30 -_08070580: .4byte 0x02024a38 -_08070584: .4byte 0x020249c4 -_08070588: .4byte 0x0000ffff + .pool _0807058C: adds r0, r5, 0x1 lsls r0, 16 @@ -227584,7 +219036,7 @@ _08070596: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r3, _080706C0 + ldr r3, =0x02024a28 mov r9, r3 cmp r6, 0x3 bls _0807052E @@ -227601,12 +219053,12 @@ _080705A6: cmp r1, 0 beq _08070608 movs r5, 0 - ldr r0, _080706C0 + ldr r0, =0x02024a28 adds r4, r2, r0 - ldr r6, _080706C4 + ldr r6, =0x0000ffff mov r9, r0 _080705C2: - ldr r3, _080706C8 + ldr r3, =0x00000121 adds r0, r5, r3 lsls r0, 16 lsrs r0, 16 @@ -227647,12 +219099,12 @@ _08070608: movs r6, 0 mov r2, r9 ldrh r0, [r2] - ldr r3, _080706CC + ldr r3, =0x02024a30 mov r10, r3 cmp r0, 0 beq _08070672 mov r4, r9 - ldr r0, _080706D0 + ldr r0, =0x02024a4c mov r9, r0 mov r12, r10 _08070628: @@ -227708,9 +219160,9 @@ _0807067C: ldr r0, [sp, 0x4] cmp r5, r0 bcs _080706E4 - ldr r2, _080706C4 + ldr r2, =0x0000ffff _0807068A: - ldr r1, _080706D4 + ldr r1, =0x020249c4 lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -227736,12 +219188,7 @@ _0807068A: bl sub_8069424 b _080706E4 .align 2, 0 -_080706C0: .4byte 0x02024a28 -_080706C4: .4byte 0x0000ffff -_080706C8: .4byte 0x00000121 -_080706CC: .4byte 0x02024a30 -_080706D0: .4byte 0x02024a4c -_080706D4: .4byte 0x020249c4 + .pool _080706D8: adds r0, r5, 0x1 lsls r0, 16 @@ -227755,7 +219202,7 @@ _080706E4: lsrs r6, r0, 16 cmp r6, 0x3 bhi _080706FC - ldr r0, _0807070C + ldr r0, =0x02024a30 lsls r1, r6, 1 adds r1, r0 ldrh r1, [r1] @@ -227772,7 +219219,7 @@ _080706FC: pop {r0} bx r0 .align 2, 0 -_0807070C: .4byte 0x02024a30 + .pool thumb_func_end daycare_build_child_moveset thumb_func_start sub_8070710 @@ -227793,16 +219240,15 @@ sub_8070710: @ 8070710 thumb_func_start sub_8070728 sub_8070728: @ 8070728 push {lr} - ldr r0, _0807073C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08070740 + ldr r1, =0x00003030 adds r0, r1 bl sub_8070710 pop {r0} bx r0 .align 2, 0 -_0807073C: .4byte 0x03005d8c -_08070740: .4byte 0x00003030 + .pool thumb_func_end sub_8070728 thumb_func_start incense_effects @@ -227882,7 +219328,7 @@ _080707C6: adds r1, r4, 0 bl pokemon_moveset_pad_ lsls r0, 16 - ldr r1, _080707E8 + ldr r1, =0xffff0000 cmp r0, r1 bne _080707E2 adds r0, r6, 0 @@ -227893,7 +219339,7 @@ _080707E2: pop {r0} bx r0 .align 2, 0 -_080707E8: .4byte 0xffff0000 + .pool thumb_func_end sub_80707A4 thumb_func_start sub_80707EC @@ -227965,7 +219411,7 @@ _0807083E: beq _08070870 movs r4, 0x20 _08070870: - ldr r0, _080708C4 + ldr r0, =0x00000183 cmp r4, r0 bne _0807088C movs r1, 0x8C @@ -228008,7 +219454,7 @@ _080708B4: pop {r1} bx r1 .align 2, 0 -_080708C4: .4byte 0x00000183 + .pool thumb_func_end sub_80707EC thumb_func_start sub_80708C8 @@ -228055,7 +219501,7 @@ _08070918: mov r0, sp movs r1, 0x2D bl pokemon_setattr - ldr r0, _08070950 + ldr r0, =0x020244ec movs r1, 0xFA lsls r1, 1 adds r0, r1 @@ -228071,7 +219517,7 @@ _08070918: pop {r0} bx r0 .align 2, 0 -_08070950: .4byte 0x020244ec + .pool thumb_func_end sub_80708C8 thumb_func_start sub_8070954 @@ -228114,14 +219560,14 @@ sub_8070954: @ 8070954 movs r1, 0x26 add r2, sp, 0x10 bl pokemon_setattr - ldr r2, _08070A04 + ldr r2, =0x0832b708 adds r0, r7, 0 movs r1, 0x2 bl pokemon_setattr lsls r2, r5, 3 subs r2, r5 lsls r2, 2 - ldr r0, _08070A08 + ldr r0, =0x083203dd adds r2, r0 adds r0, r7, 0 movs r1, 0x20 @@ -228158,8 +219604,7 @@ _080709E6: pop {r0} bx r0 .align 2, 0 -_08070A04: .4byte 0x0832b708 -_08070A08: .4byte 0x083203dd + .pool thumb_func_end sub_8070954 thumb_func_start sub_8070A0C @@ -228204,14 +219649,14 @@ sub_8070A0C: @ 8070A0C movs r1, 0x26 add r2, sp, 0x10 bl pokemon_setattr - ldr r2, _08070AA0 + ldr r2, =0x0832b708 adds r0, r6, 0 movs r1, 0x2 bl pokemon_setattr lsls r2, r5, 3 subs r2, r5 lsls r2, 2 - ldr r0, _08070AA4 + ldr r0, =0x083203dd adds r2, r0 adds r0, r6, 0 movs r1, 0x20 @@ -228232,23 +219677,21 @@ sub_8070A0C: @ 8070A0C pop {r0} bx r0 .align 2, 0 -_08070AA0: .4byte 0x0832b708 -_08070AA4: .4byte 0x083203dd + .pool thumb_func_end sub_8070A0C thumb_func_start sp0B8_daycare sp0B8_daycare: @ 8070AA8 push {lr} - ldr r0, _08070ABC + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08070AC0 + ldr r1, =0x00003030 adds r0, r1 bl sub_80708C8 pop {r0} bx r0 .align 2, 0 -_08070ABC: .4byte 0x03005d8c -_08070AC0: .4byte 0x00003030 + .pool thumb_func_end sp0B8_daycare thumb_func_start sub_8070AC4 @@ -228301,7 +219744,7 @@ _08070AEE: lsrs r0, 16 movs r1, 0x64 muls r0, r1 - ldr r1, _08070B8C + ldr r1, =0x0000ffff bl __udivsi3 cmp r4, r0 bls _08070B34 @@ -228321,11 +219764,11 @@ _08070B34: lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r0, _08070B90 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 bcs _08070BC0 - ldr r4, _08070B94 + ldr r4, =0x020244ec _08070B5C: adds r0, r4, 0 movs r1, 0x2D @@ -228349,9 +219792,7 @@ _08070B5C: subs r0, r6 b _08070B9A .align 2, 0 -_08070B8C: .4byte 0x0000ffff -_08070B90: .4byte 0x020244e9 -_08070B94: .4byte 0x020244ec + .pool _08070B98: subs r0, r1, 0x1 _08070B9A: @@ -228362,16 +219803,16 @@ _08070B9A: bl pokemon_setattr b _08070BB4 _08070BA8: - ldr r0, _08070BB0 + ldr r0, =0x020375e0 strh r5, [r0] movs r0, 0x1 b _08070BC2 .align 2, 0 -_08070BB0: .4byte 0x020375e0 + .pool _08070BB4: adds r4, 0x64 adds r5, 0x1 - ldr r0, _08070BCC + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 bcc _08070B5C @@ -228383,15 +219824,15 @@ _08070BC2: pop {r1} bx r1 .align 2, 0 -_08070BCC: .4byte 0x020244e9 + .pool thumb_func_end sub_8070AC4 thumb_func_start sub_8070BD0 sub_8070BD0: @ 8070BD0 push {lr} - ldr r0, _08070BE8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08070BEC + ldr r1, =0x00003030 adds r0, r1 bl sub_8070AC4 lsls r0, 24 @@ -228399,8 +219840,7 @@ sub_8070BD0: @ 8070BD0 pop {r1} bx r1 .align 2, 0 -_08070BE8: .4byte 0x03005d8c -_08070BEC: .4byte 0x00003030 + .pool thumb_func_end sub_8070BD0 thumb_func_start sub_8070BF0 @@ -228427,14 +219867,14 @@ sub_8070C04: @ 8070C04 bl pokemon_getattr_encrypted cmp r0, 0 beq _08070C2E - ldr r1, _08070C4C + ldr r1, =0x02021cc4 adds r0, r4, 0 bl pokemon_get_nick_ adds r0, r4, 0 movs r1, 0x7 mov r2, sp bl pokemon_getattr_encrypted - ldr r0, _08070C50 + ldr r0, =0x02021ec4 mov r1, sp bl gf_strcpy _08070C2E: @@ -228444,7 +219884,7 @@ _08070C2E: bl pokemon_getattr_encrypted cmp r0, 0 beq _08070C44 - ldr r1, _08070C54 + ldr r1, =0x02021dc4 adds r0, r4, 0 bl pokemon_get_nick_ _08070C44: @@ -228453,9 +219893,7 @@ _08070C44: pop {r0} bx r0 .align 2, 0 -_08070C4C: .4byte 0x02021cc4 -_08070C50: .4byte 0x02021ec4 -_08070C54: .4byte 0x02021dc4 + .pool thumb_func_end sub_8070C04 thumb_func_start sub_8070C58 @@ -228466,9 +219904,9 @@ sub_8070C58: @ 8070C58 lsrs r0, 24 movs r5, 0x64 muls r0, r5 - ldr r4, _08070C8C + ldr r4, =0x020244ec adds r0, r4 - ldr r1, _08070C90 + ldr r1, =0x02021cc4 bl pokemon_get_nick_ bl brm_get_pokemon_selection lsls r0, 24 @@ -228483,31 +219921,29 @@ sub_8070C58: @ 8070C58 pop {r1} bx r1 .align 2, 0 -_08070C8C: .4byte 0x020244ec -_08070C90: .4byte 0x02021cc4 + .pool thumb_func_end sub_8070C58 thumb_func_start sp0B5_daycare sp0B5_daycare: @ 8070C94 push {lr} - ldr r0, _08070CA8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08070CAC + ldr r1, =0x00003030 adds r0, r1 bl sub_8070C04 pop {r0} bx r0 .align 2, 0 -_08070CA8: .4byte 0x03005d8c -_08070CAC: .4byte 0x00003030 + .pool thumb_func_end sp0B5_daycare thumb_func_start sp0B6_daycare sp0B6_daycare: @ 8070CB0 push {r4,lr} - ldr r4, _08070CC8 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _08070CCC + ldr r1, =0x00003030 adds r0, r1 bl sub_8070BF0 lsls r0, 24 @@ -228516,11 +219952,10 @@ sp0B6_daycare: @ 8070CB0 movs r0, 0x1 b _08070CF2 .align 2, 0 -_08070CC8: .4byte 0x03005d8c -_08070CCC: .4byte 0x00003030 + .pool _08070CD0: ldr r0, [r4] - ldr r1, _08070CE8 + ldr r1, =0x00003030 adds r0, r1 bl daycare_count_pokemon lsls r0, 24 @@ -228530,7 +219965,7 @@ _08070CD0: movs r0, 0 b _08070CF2 .align 2, 0 -_08070CE8: .4byte 0x00003030 + .pool _08070CEC: adds r0, 0x1 lsls r0, 24 @@ -228544,9 +219979,9 @@ _08070CF2: thumb_func_start sub_8070CF8 sub_8070CF8: @ 8070CF8 push {lr} - ldr r0, _08070D14 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08070D18 + ldr r1, =0x00003030 adds r0, r1 bl daycare_count_pokemon lsls r0, 24 @@ -228558,8 +219993,7 @@ _08070D10: pop {r1} bx r1 .align 2, 0 -_08070D14: .4byte 0x03005d8c -_08070D18: .4byte 0x00003030 + .pool thumb_func_end sub_8070CF8 thumb_func_start sub_8070D1C @@ -228613,7 +220047,7 @@ daycare_relationship_score: @ 8070D4C adds r2, 0x14 str r2, [sp, 0x24] subs r0, 0x6 - ldr r1, _08070E00 + ldr r1, =0x083203cc mov r10, r1 ldr r5, [sp, 0x20] mov r8, r0 @@ -228685,7 +220119,7 @@ _08070DFC: movs r0, 0 b _08070E5C .align 2, 0 -_08070E00: .4byte 0x083203cc + .pool _08070E04: cmp r0, 0xD bne _08070E14 @@ -228749,9 +220183,9 @@ _08070E5C: thumb_func_start daycare_relationship_score_from_savegame daycare_relationship_score_from_savegame: @ 8070E6C push {lr} - ldr r0, _08070E84 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08070E88 + ldr r1, =0x00003030 adds r0, r1 bl daycare_relationship_score lsls r0, 24 @@ -228759,8 +220193,7 @@ daycare_relationship_score_from_savegame: @ 8070E6C pop {r1} bx r1 .align 2, 0 -_08070E84: .4byte 0x03005d8c -_08070E88: .4byte 0x00003030 + .pool thumb_func_end daycare_relationship_score_from_savegame thumb_func_start sp0B9_daycare_relationship_comment @@ -228787,8 +220220,8 @@ _08070EAC: bne _08070EB2 movs r1, 0 _08070EB2: - ldr r0, _08070EC4 - ldr r2, _08070EC8 + ldr r0, =0x02021fc4 + ldr r2, =0x0832b6f8 lsls r1, 2 adds r1, r2 ldr r1, [r1] @@ -228796,8 +220229,7 @@ _08070EB2: pop {r0} bx r0 .align 2, 0 -_08070EC4: .4byte 0x02021fc4 -_08070EC8: .4byte 0x0832b6f8 + .pool thumb_func_end sp0B9_daycare_relationship_comment thumb_func_start sub_8070ECC @@ -228886,10 +220318,10 @@ sub_8070F48: @ 8070F48 lsls r0, 24 cmp r0, 0 bne _08070F84 - ldr r1, _08070F64 + ldr r1, =0x0832dac7 b _08070F86 .align 2, 0 -_08070F64: .4byte 0x0832dac7 + .pool _08070F68: cmp r1, 0xFE bne _08070F84 @@ -228899,12 +220331,12 @@ _08070F68: lsls r0, 24 cmp r0, 0 bne _08070F84 - ldr r1, _08070F80 + ldr r1, =0x0832dac9 b _08070F86 .align 2, 0 -_08070F80: .4byte 0x0832dac9 + .pool _08070F84: - ldr r1, _08070F94 + ldr r1, =0x0832dacb _08070F86: adds r0, r4, 0 bl gf_strcat @@ -228912,7 +220344,7 @@ _08070F86: pop {r1} bx r1 .align 2, 0 -_08070F94: .4byte 0x0832dacb + .pool thumb_func_end sub_8070F48 thumb_func_start sub_8070F98 @@ -228969,7 +220401,7 @@ _08070FCC: adds r0, r7, 0 mov r1, sp bl gf_strcpy - ldr r4, _08071030 + ldr r4, =0x085ef881 adds r0, r7, 0 adds r1, r4, 0 bl gf_strcat @@ -228979,7 +220411,7 @@ _08070FCC: adds r0, r7, 0 adds r1, r4, 0 bl gf_strcat - ldr r1, _08071034 + ldr r1, =0x085ef883 adds r0, r7, 0 bl gf_strcat add sp, 0x28 @@ -228990,8 +220422,7 @@ _08070FCC: pop {r0} bx r0 .align 2, 0 -_08071030: .4byte 0x085ef881 -_08071034: .4byte 0x085ef883 + .pool thumb_func_end sub_8070FB4 thumb_func_start sub_8071038 @@ -229005,7 +220436,7 @@ sub_8071038: @ 8071038 movs r5, 0 _08071046: adds r0, r4, 0 - ldr r1, _08071094 + ldr r1, =0x085ef888 bl gf_strcat movs r0, 0x8C adds r2, r5, 0 @@ -229027,7 +220458,7 @@ _08071046: mov r1, sp bl gf_strcat adds r0, r4, 0 - ldr r1, _08071098 + ldr r1, =0x085ef881 bl gf_strcat adds r0, r5, 0x1 lsls r0, 24 @@ -229039,8 +220470,7 @@ _08071046: pop {r0} bx r0 .align 2, 0 -_08071094: .4byte 0x085ef888 -_08071098: .4byte 0x085ef881 + .pool thumb_func_end sub_8071038 thumb_func_start sub_807109C @@ -229066,7 +220496,7 @@ sub_807109C: @ 807109C adds r0, r2, 0 ands r0, r1 strb r0, [r3, 0xC] - ldr r3, _0807110C + ldr r3, =0x03003014 ldrb r1, [r3] movs r0, 0x3 negs r0, r0 @@ -229101,7 +220531,7 @@ sub_807109C: @ 807109C pop {r0} bx r0 .align 2, 0 -_0807110C: .4byte 0x03003014 + .pool thumb_func_end sub_807109C thumb_func_start sub_8071110 @@ -229145,7 +220575,7 @@ sub_8071148: @ 8071148 mov r8, r3 lsls r5, 24 lsrs r5, 24 - ldr r1, _080711B4 + ldr r1, =0x085ef888 mov r0, sp bl gf_strcpy movs r0, 0x8C @@ -229183,7 +220613,7 @@ sub_8071148: @ 8071148 pop {r0} bx r0 .align 2, 0 -_080711B4: .4byte 0x085ef888 + .pool thumb_func_end sub_8071148 thumb_func_start sub_80711B8 @@ -229198,10 +220628,10 @@ sub_80711B8: @ 80711B8 lsrs r5, r2, 24 cmp r6, 0x1 bhi _080711F0 - ldr r0, _080711FC + ldr r0, =0x03005d8c mov r8, r0 ldr r0, [r0] - ldr r4, _08071200 + ldr r4, =0x00003030 adds r0, r4 adds r1, r7, 0 adds r2, r6, 0 @@ -229221,8 +220651,7 @@ _080711F0: pop {r0} bx r0 .align 2, 0 -_080711FC: .4byte 0x03005d8c -_08071200: .4byte 0x00003030 + .pool thumb_func_end sub_80711B8 thumb_func_start c3_080469FC @@ -229231,7 +220660,7 @@ c3_080469FC: @ 8071204 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _08071234 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -229239,7 +220668,7 @@ c3_080469FC: @ 8071204 ldrb r0, [r4, 0x8] bl sub_81AE604 adds r1, r0, 0 - ldr r0, _08071238 + ldr r0, =0x030022c0 ldrh r2, [r0, 0x2E] movs r0, 0x1 ands r0, r2 @@ -229251,20 +220680,19 @@ c3_080469FC: @ 8071204 beq _08071248 b _0807124E .align 2, 0 -_08071234: .4byte 0x03005e00 -_08071238: .4byte 0x030022c0 + .pool _0807123C: - ldr r0, _08071244 + ldr r0, =0x020375f0 strh r1, [r0] b _0807124E .align 2, 0 -_08071244: .4byte 0x020375f0 + .pool _08071248: - ldr r1, _0807127C + ldr r1, =0x020375f0 movs r0, 0x2 strh r0, [r1] _0807124E: - ldr r0, _08071280 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -229283,15 +220711,14 @@ _0807124E: bl script_env_2_enable_and_set_ctx_running b _080712B4 .align 2, 0 -_0807127C: .4byte 0x020375f0 -_08071280: .4byte 0x03005e00 + .pool _08071284: movs r1, 0x2 adds r0, r1, 0 ands r0, r2 cmp r0, 0 beq _080712B4 - ldr r0, _080712BC + ldr r0, =0x020375f0 strh r1, [r0] ldrb r0, [r4, 0x8] movs r1, 0 @@ -229310,14 +220737,14 @@ _080712B4: pop {r0} bx r0 .align 2, 0 -_080712BC: .4byte 0x020375f0 + .pool thumb_func_end c3_080469FC thumb_func_start sub_80712C0 sub_80712C0: @ 80712C0 push {r4,r5,lr} sub sp, 0x18 - ldr r0, _08071320 + ldr r0, =0x0832b6c0 bl Window_AddFromTemplate adds r4, r0, 0 lsls r4, 24 @@ -229326,7 +220753,7 @@ sub_80712C0: @ 80712C0 movs r1, 0 bl sub_81973FC mov r1, sp - ldr r0, _08071324 + ldr r0, =0x0832b6e0 ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} @@ -229342,12 +220769,12 @@ sub_80712C0: @ 80712C0 adds r0, r4, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _08071328 + ldr r0, =c3_080469FC + 1 movs r1, 0x3 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0807132C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -229359,24 +220786,20 @@ sub_80712C0: @ 80712C0 pop {r0} bx r0 .align 2, 0 -_08071320: .4byte 0x0832b6c0 -_08071324: .4byte 0x0832b6e0 -_08071328: .4byte c3_080469FC + 1 -_0807132C: .4byte 0x03005e00 + .pool thumb_func_end sub_80712C0 thumb_func_start sub_8071330 sub_8071330: @ 8071330 push {lr} bl sub_81B9328 - ldr r1, _08071340 - ldr r0, _08071344 + ldr r1, =0x030022c0 + ldr r0, =c2_exit_to_overworld_2_switch + 1 str r0, [r1, 0x8] pop {r0} bx r0 .align 2, 0 -_08071340: .4byte 0x030022c0 -_08071344: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_8071330 thumb_func_start sub_8071348 @@ -229563,9 +220986,9 @@ sub_80714B8: @ 80714B8 movs r1, 0x64 adds r5, r0, 0 muls r5, r1 - ldr r0, _0807156C + ldr r0, =0x020244ec adds r5, r0 - ldr r1, _08071570 + ldr r1, =0x02024744 adds r0, r5, 0 bl sub_8071348 adds r0, r5, 0 @@ -229596,7 +221019,7 @@ sub_80714B8: @ 80714B8 adds r0, r4, 0 movs r1, 0x3 bl pokedex_flag_operation - ldr r1, _08071574 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl pokemon_get_nick mov r2, sp @@ -229628,21 +221051,19 @@ sub_80714B8: @ 80714B8 pop {r0} bx r0 .align 2, 0 -_0807156C: .4byte 0x020244ec -_08071570: .4byte 0x02024744 -_08071574: .4byte 0x02021cc4 + .pool thumb_func_end sub_80714B8 thumb_func_start sub_8071578 sub_8071578: @ 8071578 push {lr} - ldr r0, _08071588 + ldr r0, =0x020375e0 ldrb r0, [r0] bl sub_80714B8 pop {r0} bx r0 .align 2, 0 -_08071588: .4byte 0x020375e0 + .pool thumb_func_end sub_8071578 thumb_func_start sub_807158C @@ -229671,24 +221092,24 @@ sub_807158C: @ 807158C adds r5, 0x74 cmp r0, 0 bne _080715CE - ldr r0, _080715F8 + ldr r0, =0x03005d90 ldr r0, [r0] adds r1, r5, 0 bl sub_80092BC cmp r0, 0 beq _08071608 _080715CE: - ldr r0, _080715FC + ldr r0, =0x02021cc4 mov r1, sp bl gf_strcpy - ldr r0, _08071600 + ldr r0, =0x02021dc4 adds r4, 0x87 ldrb r2, [r4] lsls r2, 28 lsrs r2, 28 adds r1, r5, 0 bl sub_81DB5E8 - ldr r0, _08071604 + ldr r0, =0x02021ec4 ldrb r2, [r4] lsrs r2, 4 adds r1, r6, 0 @@ -229696,10 +221117,7 @@ _080715CE: movs r0, 0x1 b _0807160A .align 2, 0 -_080715F8: .4byte 0x03005d90 -_080715FC: .4byte 0x02021cc4 -_08071600: .4byte 0x02021dc4 -_08071604: .4byte 0x02021ec4 + .pool _08071608: movs r0, 0 _0807160A: @@ -229712,11 +221130,11 @@ _0807160A: thumb_func_start sub_8071614 sub_8071614: @ 8071614 push {lr} - ldr r0, _08071630 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08071634 + ldr r1, =0x00003030 adds r0, r1 - ldr r1, _08071638 + ldr r1, =0x020375e0 ldrb r1, [r1] bl sub_807158C lsls r0, 24 @@ -229724,9 +221142,7 @@ sub_8071614: @ 8071614 pop {r1} bx r1 .align 2, 0 -_08071630: .4byte 0x03005d8c -_08071634: .4byte 0x00003030 -_08071638: .4byte 0x020375e0 + .pool thumb_func_end sub_8071614 thumb_func_start sub_807163C @@ -229751,7 +221167,7 @@ sub_807163C: @ 807163C bne _0807166A movs r0, 0x64 muls r1, r0 - ldr r0, _08071684 + ldr r0, =0x020244ec adds r5, r1, r0 movs r4, 0x1 _0807166A: @@ -229760,7 +221176,7 @@ _0807166A: movs r0, 0x64 adds r1, r2, 0 muls r1, r0 - ldr r0, _08071684 + ldr r0, =0x020244ec adds r5, r1, r0 movs r4, 0x3 _0807167A: @@ -229770,7 +221186,7 @@ _0807167A: beq _080716D8 b _08071712 .align 2, 0 -_08071684: .4byte 0x020244ec + .pool _08071688: adds r0, r5, 0 movs r1, 0xB @@ -229783,9 +221199,9 @@ _08071688: bl pokemon_getattr adds r3, r0, 0 lsls r0, r4, 3 - ldr r1, _080716D0 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _080716D4 + ldr r1, =0x020244d4 ldr r2, [r1] mov r6, r8 lsls r1, r6, 1 @@ -229803,22 +221219,21 @@ _08071688: strh r4, [r0] b _08071712 .align 2, 0 -_080716D0: .4byte 0x0830a18c -_080716D4: .4byte 0x020244d4 + .pool _080716D8: adds r0, r5, 0 bl sub_806E794 ldrh r0, [r0, 0x4] adds r1, r4, 0 bl sub_806A068 - ldr r0, _08071720 + ldr r0, =0x0202499c movs r1, 0x78 movs r2, 0x4B movs r3, 0x6 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _08071724 + ldr r4, =0x02020630 lsls r1, r7, 4 adds r1, r7 lsls r1, 2 @@ -229830,7 +221245,7 @@ _080716D8: strb r0, [r2] adds r4, 0x1C adds r1, r4 - ldr r0, _08071728 + ldr r0, =nullsub_12 + 1 str r0, [r1] _08071712: adds r0, r7, 0 @@ -229841,9 +221256,7 @@ _08071712: pop {r1} bx r1 .align 2, 0 -_08071720: .4byte 0x0202499c -_08071724: .4byte 0x02020630 -_08071728: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_807163C thumb_func_start sub_807172C @@ -229860,7 +221273,7 @@ sub_807172C: @ 807172C sub_8071740: @ 8071740 push {lr} bl script_env_2_enable - ldr r0, _0807175C + ldr r0, =sub_8071760 + 1 movs r1, 0xA bl AddTask movs r0, 0x1 @@ -229869,7 +221282,7 @@ sub_8071740: @ 8071740 pop {r0} bx r0 .align 2, 0 -_0807175C: .4byte sub_8071760 + 1 + .pool thumb_func_end sub_8071740 thumb_func_start sub_8071760 @@ -229877,17 +221290,17 @@ sub_8071760: @ 8071760 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08071790 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08071788 bl overworld_free_bg_tilemaps - ldr r0, _08071794 + ldr r0, =c1_hatching_egg + 1 bl set_callback2 - ldr r1, _08071798 - ldr r0, _0807179C + ldr r1, =0x03005dac + ldr r0, =sub_80AF168 + 1 str r0, [r1] adds r0, r4, 0 bl remove_task @@ -229896,17 +221309,14 @@ _08071788: pop {r0} bx r0 .align 2, 0 -_08071790: .4byte 0x02037fd4 -_08071794: .4byte c1_hatching_egg + 1 -_08071798: .4byte 0x03005dac -_0807179C: .4byte sub_80AF168 + 1 + .pool thumb_func_end sub_8071760 thumb_func_start c1_hatching_egg c1_hatching_egg: @ 80717A0 push {r4,lr} sub sp, 0x4 - ldr r0, _080717C0 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -229916,13 +221326,12 @@ c1_hatching_egg: @ 80717A0 b _080719D6 _080717B4: lsls r0, 2 - ldr r1, _080717C4 + ldr r1, =_080717C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080717C0: .4byte 0x030022c0 -_080717C4: .4byte _080717C8 + .pool .align 2, 0 _080717C8: .4byte _080717EC @@ -229938,27 +221347,27 @@ _080717EC: movs r0, 0 movs r1, 0 bl lcd_io_set - ldr r4, _080718A4 + ldr r4, =0x03000de0 movs r0, 0x14 bl malloc str r0, [r4] bl init_uns_table_pokemon_copy ldr r2, [r4] - ldr r0, _080718A8 + ldr r0, =0x020375e0 ldrh r0, [r0] movs r1, 0 strb r0, [r2, 0x4] ldr r0, [r4] strb r1, [r0, 0x7] - ldr r0, _080718AC + ldr r0, =sub_807172C + 1 bl SetVBlankCallback bl current_map_music_get - ldr r1, _080718B0 + ldr r1, =0x020375e2 strh r0, [r1] bl reset_temp_tile_data_buffers movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080718B4 + ldr r1, =0x0832c064 movs r0, 0 movs r2, 0x2 bl bg_vram_setup @@ -230003,67 +221412,58 @@ _080717EC: bl SoundVSyncOn_rev01 b _080719A6 .align 2, 0 -_080718A4: .4byte 0x03000de0 -_080718A8: .4byte 0x020375e0 -_080718AC: .4byte sub_807172C + 1 -_080718B0: .4byte 0x020375e2 -_080718B4: .4byte 0x0832c064 + .pool _080718B8: - ldr r0, _080718C8 + ldr r0, =0x0832c06c bl Window_InitFromTemplates - ldr r0, _080718CC + ldr r0, =0x03000de0 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x8] b _080719A6 .align 2, 0 -_080718C8: .4byte 0x0832c06c -_080718CC: .4byte 0x03000de0 + .pool _080718D0: - ldr r1, _080718F8 + ldr r1, =0x08c00000 movs r0, 0 str r0, [sp] movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _080718FC + ldr r1, =0x08c00524 movs r0, 0 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r0, _08071900 + ldr r0, =0x08c004e0 movs r1, 0 movs r2, 0x20 bl decompress_palette b _080719A6 .align 2, 0 -_080718F8: .4byte 0x08c00000 -_080718FC: .4byte 0x08c00524 -_08071900: .4byte 0x08c004e0 + .pool _08071904: - ldr r0, _08071918 + ldr r0, =0x0832bfe4 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0807191C + ldr r0, =0x0832bfec bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _08071920 + ldr r0, =0x0832bff4 bl gpu_pal_obj_alloc_tag_and_apply b _080719A6 .align 2, 0 -_08071918: .4byte 0x0832bfe4 -_0807191C: .4byte 0x0832bfec -_08071920: .4byte 0x0832bff4 + .pool _08071924: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _08071938 + ldr r0, =0x03000de0 ldr r0, [r0] ldrb r0, [r0, 0x4] bl sub_80714B8 b _080719A6 .align 2, 0 -_08071938: .4byte 0x03000de0 + .pool _0807193C: - ldr r0, _08071950 + ldr r0, =0x03000de0 ldr r3, [r0] ldrb r2, [r3, 0x4] adds r3, 0xC @@ -230072,9 +221472,9 @@ _0807193C: bl sub_807163C b _080719A6 .align 2, 0 -_08071950: .4byte 0x03000de0 + .pool _08071954: - ldr r4, _0807196C + ldr r4, =0x03000de0 ldr r3, [r4] ldrb r2, [r3, 0x4] adds r3, 0xC @@ -230085,23 +221485,23 @@ _08071954: strb r0, [r1, 0x1] b _080719A6 .align 2, 0 -_0807196C: .4byte 0x03000de0 + .pool _08071970: movs r1, 0x82 lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _080719B8 + ldr r0, =0x08dd7300 movs r1, 0x10 movs r2, 0xA0 bl gpu_pal_apply - ldr r1, _080719BC + ldr r1, =0x08dd7360 movs r2, 0xA1 lsls r2, 5 movs r0, 0x1 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r1, _080719C0 + ldr r1, =0x08331f60 movs r2, 0x80 lsls r2, 5 movs r0, 0x1 @@ -230110,7 +221510,7 @@ _08071970: movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram _080719A6: - ldr r1, _080719C4 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -230119,14 +221519,11 @@ _080719A6: strb r0, [r1] b _080719D6 .align 2, 0 -_080719B8: .4byte 0x08dd7300 -_080719BC: .4byte 0x08dd7360 -_080719C0: .4byte 0x08331f60 -_080719C4: .4byte 0x030022c0 + .pool _080719C8: - ldr r0, _080719F4 + ldr r0, =sub_8071A94 + 1 bl set_callback2 - ldr r0, _080719F8 + ldr r0, =0x03000de0 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x2] @@ -230141,36 +221538,31 @@ _080719D6: pop {r0} bx r0 .align 2, 0 -_080719F4: .4byte sub_8071A94 + 1 -_080719F8: .4byte 0x03000de0 + .pool thumb_func_end c1_hatching_egg thumb_func_start sub_80719FC sub_80719FC: @ 80719FC push {lr} - ldr r0, _08071A28 + ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08071A2C + ldr r1, =0x020244ec adds r0, r1 - ldr r2, _08071A30 + ldr r2, =0x02021ec4 movs r1, 0x2 bl pokemon_setattr bl sub_805F094 - ldr r0, _08071A34 + ldr r0, =0x03000de0 ldr r0, [r0] bl free - ldr r0, _08071A38 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_08071A28: .4byte 0x020375e0 -_08071A2C: .4byte 0x020244ec -_08071A30: .4byte 0x02021ec4 -_08071A34: .4byte 0x03000de0 -_08071A38: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_80719FC thumb_func_start c3_080472E4 @@ -230178,7 +221570,7 @@ c3_080472E4: @ 8071A3C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08071A8C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -230202,7 +221594,7 @@ _08071A6C: ldrsh r0, [r4, r1] cmp r0, 0x3C ble _08071A80 - ldr r0, _08071A90 + ldr r0, =0x00000179 bl song_play_for_text adds r0, r5, 0 bl remove_task @@ -230214,8 +221606,7 @@ _08071A80: pop {r0} bx r0 .align 2, 0 -_08071A8C: .4byte 0x03005e00 -_08071A90: .4byte 0x00000179 + .pool thumb_func_end c3_080472E4 thumb_func_start sub_8071A94 @@ -230225,7 +221616,7 @@ sub_8071A94: @ 8071A94 mov r6, r8 push {r6,r7} sub sp, 0x8 - ldr r1, _08071AB8 + ldr r1, =0x03000de0 ldr r0, [r1] ldrb r0, [r0, 0x2] adds r5, r1, 0 @@ -230234,13 +221625,12 @@ sub_8071A94: @ 8071A94 b _08071E06 _08071AAC: lsls r0, 2 - ldr r1, _08071ABC + ldr r1, =_08071AC0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08071AB8: .4byte 0x03000de0 -_08071ABC: .4byte _08071AC0 + .pool .align 2, 0 _08071AC0: .4byte _08071AF4 @@ -230264,12 +221654,12 @@ _08071AF4: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _08071B34 + ldr r0, =0x0832bffc movs r1, 0x78 movs r2, 0x4B movs r3, 0x5 bl obj_add_from_template_forward_search - ldr r4, _08071B38 + ldr r4, =0x03000de0 ldr r1, [r4] strb r0, [r1] movs r0, 0 @@ -230280,16 +221670,14 @@ _08071AF4: ldrb r0, [r1, 0x2] adds r0, 0x1 strb r0, [r1, 0x2] - ldr r0, _08071B3C + ldr r0, =c3_080472E4 + 1 movs r1, 0x5 bl AddTask b _08071E06 .align 2, 0 -_08071B34: .4byte 0x0832bffc -_08071B38: .4byte 0x03000de0 -_08071B3C: .4byte c3_080472E4 + 1 + .pool _08071B40: - ldr r0, _08071B64 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -230308,7 +221696,7 @@ _08071B52: ldr r1, [r5] b _08071DC8 .align 2, 0 -_08071B64: .4byte 0x02037fd4 + .pool _08071B68: ldr r1, [r5] ldrb r0, [r1, 0x3] @@ -230324,7 +221712,7 @@ _08071B7A: ldrb r0, [r1, 0x2] adds r0, 0x1 strb r0, [r1, 0x2] - ldr r2, _08071B98 + ldr r2, =0x02020630 ldr r0, [r5] ldrb r1, [r0] lsls r0, r1, 4 @@ -230332,14 +221720,13 @@ _08071B7A: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _08071B9C + ldr r1, =sub_8071E34 + 1 str r1, [r0] b _08071E06 .align 2, 0 -_08071B98: .4byte 0x02020630 -_08071B9C: .4byte sub_8071E34 + 1 + .pool _08071BA0: - ldr r4, _08071BEC + ldr r4, =0x02020630 ldr r2, [r5] ldrb r1, [r2] lsls r0, r1, 4 @@ -230349,7 +221736,7 @@ _08071BA0: adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _08071BF0 + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _08071BBC b _08071E06 @@ -230357,7 +221744,7 @@ _08071BBC: ldrb r1, [r2, 0x4] movs r0, 0x64 muls r0, r1 - ldr r1, _08071BF4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -230376,11 +221763,9 @@ _08071BBC: ldr r1, [r5] b _08071DC8 .align 2, 0 -_08071BEC: .4byte 0x02020630 -_08071BF0: .4byte nullsub_12 + 1 -_08071BF4: .4byte 0x020244ec + .pool _08071BF8: - ldr r2, _08071C1C + ldr r2, =0x02020630 ldr r3, [r5] ldrb r1, [r3, 0x1] lsls r0, r1, 4 @@ -230389,7 +221774,7 @@ _08071BF8: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08071C20 + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _08071C12 b _08071E06 @@ -230399,19 +221784,18 @@ _08071C12: strb r0, [r3, 0x2] b _08071E06 .align 2, 0 -_08071C1C: .4byte 0x02020630 -_08071C20: .4byte nullsub_12 + 1 + .pool _08071C24: ldr r0, [r5] ldrb r1, [r0, 0x4] movs r0, 0x64 muls r0, r1 - ldr r1, _08071C74 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08071C78 + ldr r1, =0x02021cc4 bl pokemon_get_nick - ldr r4, _08071C7C - ldr r1, _08071C80 + ldr r4, =0x02021fc4 + ldr r1, =0x085ed5a5 adds r0, r4, 0 bl ExpandTextCodes ldr r0, [r5] @@ -230422,7 +221806,7 @@ _08071C24: movs r2, 0 movs r3, 0x3 bl sub_8072214 - ldr r0, _08071C84 + ldr r0, =0x00000173 bl fanfare_play ldr r1, [r5] ldrb r0, [r1, 0x2] @@ -230437,11 +221821,7 @@ _08071C24: bl Window_CopyToVram b _08071E06 .align 2, 0 -_08071C74: .4byte 0x020244ec -_08071C78: .4byte 0x02021cc4 -_08071C7C: .4byte 0x02021fc4 -_08071C80: .4byte 0x085ed5a5 -_08071C84: .4byte 0x00000173 + .pool _08071C88: bl task_is_not_running_overworld_fanfare lsls r0, 24 @@ -230463,12 +221843,12 @@ _08071CA4: ldrb r1, [r0, 0x4] movs r0, 0x64 muls r0, r1 - ldr r1, _08071CD8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08071CDC + ldr r1, =0x02021cc4 bl pokemon_get_nick - ldr r4, _08071CE0 - ldr r1, _08071CE4 + ldr r4, =0x02021fc4 + ldr r1, =0x085ed5be adds r0, r4, 0 bl ExpandTextCodes ldr r0, [r5] @@ -230482,10 +221862,7 @@ _08071CA4: ldr r1, [r5] b _08071DC8 .align 2, 0 -_08071CD8: .4byte 0x020244ec -_08071CDC: .4byte 0x02021cc4 -_08071CE0: .4byte 0x02021fc4 -_08071CE4: .4byte 0x085ed5be + .pool _08071CE8: ldr r0, [r5] ldrb r0, [r0, 0x8] @@ -230502,7 +221879,7 @@ _08071CF8: adds r1, r4, 0 movs r2, 0xE0 bl sub_809882C - ldr r0, _08071D18 + ldr r0, =0x0832c07c adds r1, r4, 0 movs r2, 0xE movs r3, 0 @@ -230510,7 +221887,7 @@ _08071CF8: ldr r1, [r5] b _08071DC8 .align 2, 0 -_08071D18: .4byte 0x0832c07c + .pool _08071D1C: bl sub_8198C58 lsls r0, 24 @@ -230529,15 +221906,15 @@ _08071D36: beq _08071DC4 b _08071E06 _08071D3C: - ldr r0, _08071DA4 + ldr r0, =0x03000de0 mov r8, r0 ldr r0, [r0] ldrb r0, [r0, 0x4] movs r6, 0x64 muls r0, r6 - ldr r5, _08071DA8 + ldr r5, =0x020244ec adds r0, r5 - ldr r1, _08071DAC + ldr r1, =0x02021ec4 mov r9, r1 bl pokemon_get_nick mov r1, r8 @@ -230567,7 +221944,7 @@ _08071D3C: movs r2, 0 bl pokemon_getattr str r0, [sp] - ldr r0, _08071DB0 + ldr r0, =sub_80719FC + 1 str r0, [sp, 0x4] movs r0, 0x3 mov r1, r9 @@ -230576,10 +221953,7 @@ _08071D3C: bl do_choose_name_or_words_screen b _08071E06 .align 2, 0 -_08071DA4: .4byte 0x03000de0 -_08071DA8: .4byte 0x020244ec -_08071DAC: .4byte 0x02021ec4 -_08071DB0: .4byte sub_80719FC + 1 + .pool _08071DB4: movs r0, 0x1 negs r0, r0 @@ -230589,7 +221963,7 @@ _08071DB4: movs r3, 0x10 bl sub_80A1AD4 _08071DC4: - ldr r0, _08071DD0 + ldr r0, =0x03000de0 ldr r1, [r0] _08071DC8: ldrb r0, [r1, 0x2] @@ -230597,16 +221971,16 @@ _08071DC8: strb r0, [r1, 0x2] b _08071E06 .align 2, 0 -_08071DD0: .4byte 0x03000de0 + .pool _08071DD4: - ldr r0, _08071E28 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08071E06 bl sub_805F094 - ldr r4, _08071E2C + ldr r4, =0x03000de0 ldr r0, [r4] ldrb r0, [r0, 0x8] bl Window_Remove @@ -230616,7 +221990,7 @@ _08071DD4: bl bg_unset_tilemap ldr r0, [r4] bl free - ldr r0, _08071E30 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 _08071E06: bl run_active_tasks @@ -230632,9 +222006,7 @@ _08071E06: pop {r0} bx r0 .align 2, 0 -_08071E28: .4byte 0x02037fd4 -_08071E2C: .4byte 0x03000de0 -_08071E30: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_8071A94 thumb_func_start sub_8071E34 @@ -230648,13 +222020,13 @@ sub_8071E34: @ 8071E34 asrs r0, 16 cmp r0, 0x14 ble _08071E54 - ldr r0, _08071E50 + ldr r0, =sub_8071E8C + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x2E] b _08071E84 .align 2, 0 -_08071E50: .4byte sub_8071E8C + 1 + .pool _08071E54: ldrh r0, [r4, 0x30] adds r0, 0x14 @@ -230701,13 +222073,13 @@ sub_8071E8C: @ 8071E8C asrs r0, 16 cmp r0, 0x14 ble _08071EBC - ldr r0, _08071EB8 + ldr r0, =sub_8071EF0 + 1 str r0, [r4, 0x1C] strh r1, [r4, 0x2E] strh r1, [r4, 0x32] b _08071EE8 .align 2, 0 -_08071EB8: .4byte sub_8071EF0 + 1 + .pool _08071EBC: ldrh r0, [r4, 0x30] adds r0, 0x14 @@ -230753,19 +222125,19 @@ sub_8071EF0: @ 8071EF0 asrs r0, 16 cmp r0, 0x26 ble _08071F5C - ldr r0, _08071F4C + ldr r0, =sub_8071FA4 + 1 str r0, [r4, 0x1C] strh r5, [r4, 0x2E] - ldr r4, _08071F50 + ldr r4, =0x03000de0 ldr r0, [r4] ldrb r1, [r0, 0x4] movs r0, 0x64 muls r0, r1 - ldr r1, _08071F54 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr - ldr r3, _08071F58 + ldr r3, =0x02020630 ldr r2, [r4] ldrb r1, [r2, 0x1] lsls r0, r1, 4 @@ -230781,10 +222153,7 @@ sub_8071EF0: @ 8071EF0 strh r5, [r0, 0x26] b _08071F9E .align 2, 0 -_08071F4C: .4byte sub_8071FA4 + 1 -_08071F50: .4byte 0x03000de0 -_08071F54: .4byte 0x020244ec -_08071F58: .4byte 0x02020630 + .pool _08071F5C: ldrh r0, [r4, 0x30] adds r0, 0x14 @@ -230831,7 +222200,7 @@ sub_8071FA4: @ 8071FA4 asrs r0, 16 cmp r0, 0x32 ble _08071FBE - ldr r0, _08071FC4 + ldr r0, =sub_8071FC8 + 1 str r0, [r1, 0x1C] movs r0, 0 strh r0, [r1, 0x2E] @@ -230839,7 +222208,7 @@ _08071FBE: pop {r0} bx r0 .align 2, 0 -_08071FC4: .4byte sub_8071FC8 + 1 + .pool thumb_func_end sub_8071FA4 thumb_func_start sub_8071FC8 @@ -230853,7 +222222,7 @@ sub_8071FC8: @ 8071FC8 bne _08071FE8 movs r1, 0x1 negs r1, r1 - ldr r0, _0807203C + ldr r0, =0x0000ffff str r0, [sp] adds r0, r1, 0 movs r2, 0 @@ -230878,7 +222247,7 @@ _08072004: ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - ldr r0, _08072040 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -230894,7 +222263,7 @@ _08072004: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _08072044 + ldr r0, =sub_8072048 + 1 str r0, [r5, 0x1C] strh r4, [r5, 0x2E] _08072032: @@ -230903,9 +222272,7 @@ _08072032: pop {r0} bx r0 .align 2, 0 -_0807203C: .4byte 0x0000ffff -_08072040: .4byte 0x02037fd4 -_08072044: .4byte sub_8072048 + 1 + .pool thumb_func_end sub_8071FC8 thumb_func_start sub_8072048 @@ -230917,8 +222284,8 @@ sub_8072048: @ 8072048 ldrsh r0, [r5, r1] cmp r0, 0 bne _08072084 - ldr r4, _080720D8 - ldr r3, _080720DC + ldr r4, =0x02020630 + ldr r3, =0x03000de0 ldr r0, [r3] ldrb r1, [r0, 0x1] lsls r0, r1, 4 @@ -230946,7 +222313,7 @@ _08072084: bne _0807209E movs r1, 0x1 negs r1, r1 - ldr r0, _080720E0 + ldr r0, =0x0000ffff str r0, [sp] adds r0, r1, 0 movs r2, 0x10 @@ -230957,8 +222324,8 @@ _0807209E: ldrsh r0, [r5, r1] cmp r0, 0x9 bgt _080720BC - ldr r2, _080720D8 - ldr r0, _080720DC + ldr r2, =0x02020630 + ldr r0, =0x03000de0 ldr r0, [r0] ldrb r1, [r0, 0x1] lsls r0, r1, 4 @@ -230974,7 +222341,7 @@ _080720BC: ldrsh r0, [r5, r2] cmp r0, 0x28 ble _080720CA - ldr r0, _080720E4 + ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] _080720CA: adds r0, r1, 0x1 @@ -230984,10 +222351,7 @@ _080720CA: pop {r0} bx r0 .align 2, 0 -_080720D8: .4byte 0x02020630 -_080720DC: .4byte 0x03000de0 -_080720E0: .4byte 0x0000ffff -_080720E4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8072048 thumb_func_start sub_80720E8 @@ -231044,8 +222408,8 @@ _0807213A: sub_8072140: @ 8072140 push {r4-r6,lr} sub sp, 0x8 - ldr r2, _0807218C - ldr r0, _08072190 + ldr r2, =0x0832c084 + ldr r0, =0x03000de0 ldr r6, [r0] ldrb r3, [r6, 0x7] lsls r0, r3, 2 @@ -231079,8 +222443,7 @@ sub_8072140: @ 8072140 pop {r0} bx r0 .align 2, 0 -_0807218C: .4byte 0x0832c084 -_08072190: .4byte 0x03000de0 + .pool thumb_func_end sub_8072140 thumb_func_start sub_8072194 @@ -231116,7 +222479,7 @@ sub_8072194: @ 8072194 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _0807220C + ldr r0, =0x0832c04c adds r1, r4, 0 adds r2, r5, 0 movs r3, 0x4 @@ -231124,7 +222487,7 @@ sub_8072194: @ 8072194 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _08072210 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -231144,8 +222507,7 @@ sub_8072194: @ 8072194 pop {r0} bx r0 .align 2, 0 -_0807220C: .4byte 0x0832c04c -_08072210: .4byte 0x02020630 + .pool thumb_func_end sub_8072194 thumb_func_start sub_8072214 @@ -231173,7 +222535,7 @@ sub_8072214: @ 8072214 adds r0, r5, 0 movs r1, 0xFF bl Window_FastFillPixels - ldr r3, _08072288 + ldr r3, =0x03000de0 ldr r0, [r3] movs r2, 0 strb r2, [r0, 0xE] @@ -231206,7 +222568,7 @@ sub_8072214: @ 8072214 pop {r0} bx r0 .align 2, 0 -_08072288: .4byte 0x03000de0 + .pool thumb_func_end sub_8072214 thumb_func_start sub_807228C @@ -231222,7 +222584,7 @@ _0807229C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080722C8 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x6 @@ -231241,7 +222603,7 @@ _080722C4: movs r0, 0x2 b _080722D8 .align 2, 0 -_080722C8: .4byte 0x020244ec + .pool _080722CC: adds r0, r5, 0x1 lsls r0, 24 @@ -231554,7 +222916,7 @@ battle_make_oam_normal_battle: @ 80724DC lsls r0, 24 cmp r0, 0 bne _08072574 - ldr r4, _08072564 + ldr r4, =0x0832c140 adds r0, r4, 0 movs r1, 0xF0 movs r2, 0xA0 @@ -231569,7 +222931,7 @@ battle_make_oam_normal_battle: @ 80724DC bl obj_add_from_template_backward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _08072568 + ldr r4, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -231590,21 +222952,18 @@ battle_make_oam_normal_battle: @ 80724DC lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x40 - ldr r4, _0807256C + ldr r4, =0x000003ff adds r0, r4, 0 ands r1, r0 - ldr r0, _08072570 + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] b _080725BA .align 2, 0 -_08072564: .4byte 0x0832c140 -_08072568: .4byte 0x02020630 -_0807256C: .4byte 0x000003ff -_08072570: .4byte 0xfffffc00 + .pool _08072574: - ldr r4, _080725DC + ldr r4, =0x0832c170 adds r0, r4, 0 movs r1, 0xF0 movs r2, 0xA0 @@ -231619,7 +222978,7 @@ _08072574: bl obj_add_from_template_backward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080725E0 + ldr r0, =0x02020630 lsls r2, r7, 4 adds r2, r7 lsls r2, 2 @@ -231628,17 +222987,17 @@ _08072574: lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x20 - ldr r5, _080725E4 + ldr r5, =0x000003ff adds r0, r5, 0 ands r1, r0 - ldr r0, _080725E8 + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] movs r0, 0x2 str r0, [sp] _080725BA: - ldr r2, _080725E0 + ldr r2, =0x02020630 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -231651,15 +223010,11 @@ _080725BA: strh r6, [r1, 0x38] adds r2, 0x1C adds r0, r2 - ldr r1, _080725EC + ldr r1, =sub_8072924 + 1 str r1, [r0] b _08072718 .align 2, 0 -_080725DC: .4byte 0x0832c170 -_080725E0: .4byte 0x02020630 -_080725E4: .4byte 0x000003ff -_080725E8: .4byte 0xfffffc00 -_080725EC: .4byte sub_8072924 + 1 + .pool _080725F0: mov r0, r10 bl battle_side_get_owner @@ -231674,7 +223029,7 @@ _080725F0: lsls r0, r1, 1 adds r0, r1 lsls r0, 3 - ldr r4, _08072680 + ldr r4, =0x0832c140 adds r0, r4 movs r1, 0xF0 movs r2, 0xA0 @@ -231697,7 +223052,7 @@ _080725F0: bl obj_add_from_template_backward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _08072684 + ldr r4, =0x02020630 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -231714,26 +223069,22 @@ _080725F0: lsls r1, r5, 22 lsrs r1, 22 adds r1, 0x20 - ldr r5, _08072688 + ldr r5, =0x000003ff adds r0, r5, 0 ands r1, r0 - ldr r0, _0807268C + ldr r0, =0xfffffc00 mov r5, r8 ands r0, r5 orrs r0, r1 strh r0, [r3, 0x4] adds r4, 0x1C adds r2, r4 - ldr r0, _08072690 + ldr r0, =sub_8072924 + 1 str r0, [r2] movs r0, 0x1 b _08072716 .align 2, 0 -_08072680: .4byte 0x0832c140 -_08072684: .4byte 0x02020630 -_08072688: .4byte 0x000003ff -_0807268C: .4byte 0xfffffc00 -_08072690: .4byte sub_8072924 + 1 + .pool _08072694: mov r0, r10 bl battle_get_per_side_status @@ -231743,7 +223094,7 @@ _08072694: lsls r0, r1, 1 adds r0, r1 lsls r0, 3 - ldr r4, _080727DC + ldr r4, =0x0832c170 adds r0, r4 movs r1, 0xF0 movs r2, 0xA0 @@ -231766,7 +223117,7 @@ _08072694: bl obj_add_from_template_backward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _080727E0 + ldr r4, =0x02020630 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -231783,29 +223134,29 @@ _08072694: lsls r1, r5, 22 lsrs r1, 22 adds r1, 0x20 - ldr r5, _080727E4 + ldr r5, =0x000003ff adds r0, r5, 0 ands r1, r0 - ldr r0, _080727E8 + ldr r0, =0xfffffc00 mov r5, r8 ands r0, r5 orrs r0, r1 strh r0, [r3, 0x4] adds r4, 0x1C adds r2, r4 - ldr r0, _080727EC + ldr r0, =sub_8072924 + 1 str r0, [r2] movs r0, 0x2 _08072716: str r0, [sp] _08072718: - ldr r0, _080727F0 + ldr r0, =0x02024076 add r0, r10 ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 lsls r0, 3 - ldr r1, _080727F4 + ldr r1, =0x0832c1c0 adds r0, r1 movs r1, 0x8C movs r2, 0x3C @@ -231817,7 +223168,7 @@ _08072718: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r1, _080727E0 + ldr r1, =0x02020630 mov r8, r1 add r4, r8 mov r0, r10 @@ -231825,7 +223176,7 @@ _08072718: adds r1, r0, 0 lsls r1, 24 lsrs r1, 21 - ldr r0, _080727F8 + ldr r0, =0x0832c28c adds r1, r0 adds r0, r4, 0 bl obj_set_f18_to_r0_f42_to_40 @@ -231851,9 +223202,9 @@ _08072718: ldrh r1, [r4, 0x4] lsls r1, 22 lsrs r1, 17 - ldr r2, _080727FC + ldr r2, =0x06010000 adds r1, r2 - ldr r2, _08072800 + ldr r2, =0x04000010 bl CpuSet lsls r0, r6, 4 adds r0, r6 @@ -231893,16 +223244,7 @@ _08072718: pop {r1} bx r1 .align 2, 0 -_080727DC: .4byte 0x0832c170 -_080727E0: .4byte 0x02020630 -_080727E4: .4byte 0x000003ff -_080727E8: .4byte 0xfffffc00 -_080727EC: .4byte sub_8072924 + 1 -_080727F0: .4byte 0x02024076 -_080727F4: .4byte 0x0832c1c0 -_080727F8: .4byte 0x0832c28c -_080727FC: .4byte 0x06010000 -_08072800: .4byte 0x04000010 + .pool thumb_func_end battle_make_oam_normal_battle thumb_func_start battle_make_oam_safari_battle @@ -231911,7 +223253,7 @@ battle_make_oam_safari_battle: @ 8072804 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r4, _08072890 + ldr r4, =0x0832c1a0 adds r0, r4, 0 movs r1, 0xF0 movs r2, 0xA0 @@ -231927,7 +223269,7 @@ battle_make_oam_safari_battle: @ 8072804 bl obj_add_from_template_backward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _08072894 + ldr r1, =0x02020630 mov r9, r1 lsls r4, r6, 4 adds r4, r6 @@ -231952,10 +223294,10 @@ battle_make_oam_safari_battle: @ 8072804 lsls r2, r7, 22 lsrs r2, 22 adds r2, 0x40 - ldr r7, _08072898 + ldr r7, =0x000003ff adds r1, r7, 0 ands r2, r1 - ldr r1, _0807289C + ldr r1, =0xfffffc00 mov r7, r8 ands r1, r7 orrs r1, r2 @@ -231965,7 +223307,7 @@ battle_make_oam_safari_battle: @ 8072804 movs r0, 0x1C add r9, r0 add r3, r9 - ldr r0, _080728A0 + ldr r0, =sub_8072924 + 1 str r0, [r3] adds r0, r6, 0 pop {r3,r4} @@ -231975,22 +223317,18 @@ battle_make_oam_safari_battle: @ 8072804 pop {r1} bx r1 .align 2, 0 -_08072890: .4byte 0x0832c1a0 -_08072894: .4byte 0x02020630 -_08072898: .4byte 0x000003ff -_0807289C: .4byte 0xfffffc00 -_080728A0: .4byte sub_8072924 + 1 + .pool thumb_func_end battle_make_oam_safari_battle thumb_func_start sub_80728A4 sub_80728A4: @ 80728A4 lsls r0, 24 lsrs r0, 19 - ldr r1, _080728B0 + ldr r1, =0x08c11bdc adds r0, r1 bx lr .align 2, 0 -_080728B0: .4byte 0x08c11bdc + .pool thumb_func_end sub_80728A4 thumb_func_start sub_80728B4 @@ -232008,7 +223346,7 @@ sub_80728B4: @ 80728B4 bgt _080728F8 cmp r0, 0 bne _080728F8 - ldr r2, _080728E0 + ldr r2, =0x02020630 lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -232017,9 +223355,9 @@ sub_80728B4: @ 80728B4 adds r0, 0x10 b _08072906 .align 2, 0 -_080728E0: .4byte 0x02020630 + .pool _080728E4: - ldr r2, _080728F4 + ldr r2, =0x02020630 lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -232028,9 +223366,9 @@ _080728E4: adds r0, 0x10 b _08072906 .align 2, 0 -_080728F4: .4byte 0x02020630 + .pool _080728F8: - ldr r2, _08072920 + ldr r2, =0x02020630 lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -232052,7 +223390,7 @@ _08072906: pop {r0} bx r0 .align 2, 0 -_08072920: .4byte 0x02020630 + .pool thumb_func_end sub_80728B4 thumb_func_start sub_8072924 @@ -232060,7 +223398,7 @@ sub_8072924: @ 8072924 ldrh r1, [r0, 0x38] lsls r1, 24 lsrs r1, 24 - ldr r3, _08072948 + ldr r3, =0x02020630 lsls r2, r1, 4 adds r2, r1 lsls r2, 2 @@ -232076,7 +223414,7 @@ sub_8072924: @ 8072924 strh r1, [r0, 0x26] bx lr .align 2, 0 -_08072948: .4byte 0x02020630 + .pool thumb_func_end sub_8072924 thumb_func_start sub_807294C @@ -232085,7 +223423,7 @@ sub_807294C: @ 807294C ldr r7, [sp, 0x14] lsls r0, 24 lsrs r0, 24 - ldr r6, _0807297C + ldr r6, =0x020244d0 ldr r4, [r6] ldr r5, [r4, 0xC] lsls r4, r0, 2 @@ -232099,14 +223437,13 @@ sub_807294C: @ 807294C str r2, [r4, 0x4] str r3, [r4, 0x8] str r7, [r4, 0xC] - ldr r0, _08072980 + ldr r0, =0xffff8000 str r0, [r4, 0x10] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0807297C: .4byte 0x020244d0 -_08072980: .4byte 0xffff8000 + .pool thumb_func_end sub_807294C thumb_func_start sub_8072984 @@ -232114,7 +223451,7 @@ sub_8072984: @ 8072984 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _080729CC + ldr r4, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -232148,7 +223485,7 @@ sub_8072984: @ 8072984 pop {r0} bx r0 .align 2, 0 -_080729CC: .4byte 0x02020630 + .pool thumb_func_end sub_8072984 thumb_func_start sub_80729D0 @@ -232156,7 +223493,7 @@ sub_80729D0: @ 80729D0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08072A20 + ldr r5, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -232193,7 +223530,7 @@ sub_80729D0: @ 80729D0 pop {r0} bx r0 .align 2, 0 -_08072A20: .4byte 0x02020630 + .pool thumb_func_end sub_80729D0 thumb_func_start sub_8072A24 @@ -232201,7 +223538,7 @@ sub_8072A24: @ 8072A24 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _08072A40 + ldr r4, =0x02020630 lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -232212,7 +223549,7 @@ sub_8072A24: @ 8072A24 pop {r0} bx r0 .align 2, 0 -_08072A40: .4byte 0x02020630 + .pool thumb_func_end sub_8072A24 thumb_func_start sub_8072A44 @@ -232220,7 +223557,7 @@ sub_8072A44: @ 8072A44 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08072A80 + ldr r5, =0x02020630 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -232244,7 +223581,7 @@ sub_8072A44: @ 8072A44 pop {r0} bx r0 .align 2, 0 -_08072A80: .4byte 0x02020630 + .pool thumb_func_end sub_8072A44 thumb_func_start nullsub_30 @@ -232261,19 +223598,19 @@ sub_8072A88: @ 8072A88 lsls r0, 24 lsrs r0, 24 movs r6, 0 - ldr r1, _08072B0C + ldr r1, =0x0202406c mov r8, r1 ldrb r2, [r1] cmp r6, r2 bge _08072B00 - ldr r1, _08072B10 + ldr r1, =0x02020630 mov r12, r1 movs r1, 0x3 ands r0, r1 lsls r5, r0, 2 movs r7, 0xD negs r7, r7 - ldr r2, _08072B14 + ldr r2, =0x03005d70 mov r9, r2 _08072AB2: mov r1, r9 @@ -232323,9 +223660,7 @@ _08072B00: pop {r0} bx r0 .align 2, 0 -_08072B0C: .4byte 0x0202406c -_08072B10: .4byte 0x02020630 -_08072B14: .4byte 0x03005d70 + .pool thumb_func_end sub_8072A88 thumb_func_start sub_8072B18 @@ -232385,7 +223720,7 @@ _08072B78: movs r5, 0x20 movs r4, 0x2C _08072B7C: - ldr r0, _08072B90 + ldr r0, =0x03005d70 adds r0, r6, r0 ldrb r0, [r0] adds r1, r5, 0 @@ -232395,7 +223730,7 @@ _08072B7C: pop {r0} bx r0 .align 2, 0 -_08072B90: .4byte 0x03005d70 + .pool thumb_func_end sub_8072B18 thumb_func_start healthbar_draw_level @@ -232432,7 +223767,7 @@ healthbar_draw_level: @ 8072B94 movs r3, 0x2 bl write_to_rbox adds r5, r0, 0 - ldr r0, _08072C0C + ldr r0, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -232449,19 +223784,17 @@ healthbar_draw_level: @ 8072B94 bne _08072C18 bl battle_type_is_double lsls r0, 24 - ldr r2, _08072C10 + ldr r2, =0x06010420 adds r1, r4, r2 cmp r0, 0 bne _08072C1C - ldr r0, _08072C14 + ldr r0, =0x06010820 adds r1, r4, r0 b _08072C1C .align 2, 0 -_08072C0C: .4byte 0x02020630 -_08072C10: .4byte 0x06010420 -_08072C14: .4byte 0x06010820 + .pool _08072C18: - ldr r2, _08072C34 + ldr r2, =0x06010400 adds r1, r4, r2 _08072C1C: adds r0, r1, 0 @@ -232475,7 +223808,7 @@ _08072C1C: pop {r0} bx r0 .align 2, 0 -_08072C34: .4byte 0x06010400 + .pool thumb_func_end healthbar_draw_level thumb_func_start heathbar_draw_hp @@ -232494,7 +223827,7 @@ heathbar_draw_hp: @ 8072C38 lsls r2, 24 lsrs r2, 24 mov r8, r2 - ldr r1, _08072CB0 + ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -232531,13 +223864,12 @@ heathbar_draw_hp: @ 8072C38 movs r3, 0x2 bl write_to_rbox adds r4, r0, 0 - ldr r1, _08072CB4 + ldr r1, =0x06010b40 adds r0, r5, r1 adds r1, r4, 0 b _08072CF8 .align 2, 0 -_08072CB0: .4byte 0x02020630 -_08072CB4: .4byte 0x06010b40 + .pool _08072CB8: mov r2, r9 lsls r1, r2, 16 @@ -232559,12 +223891,12 @@ _08072CB8: movs r3, 0x2 bl write_to_rbox adds r4, r0, 0 - ldr r1, _08072D08 + ldr r1, =0x060103e0 adds r0, r5, r1 adds r1, r4, 0 movs r2, 0x1 bl sub_8075170 - ldr r2, _08072D0C + ldr r2, =0x06010b00 adds r0, r5, r2 adds r1, r4, 0 adds r1, 0x20 @@ -232575,14 +223907,13 @@ _08072CF8: bl sub_807512C b _08072DEA .align 2, 0 -_08072D08: .4byte 0x060103e0 -_08072D0C: .4byte 0x06010b00 + .pool _08072D10: - ldr r1, _08072D58 + ldr r1, =0x0832c3c4 add r0, sp, 0x4 movs r2, 0x14 bl memcpy - ldr r1, _08072D5C + ldr r1, =0x02020630 lsls r4, r7, 4 adds r0, r4, r7 lsls r0, 2 @@ -232611,8 +223942,7 @@ _08072D46: bl sub_8072E0C b _08072DEA .align 2, 0 -_08072D58: .4byte 0x0832c3c4 -_08072D5C: .4byte 0x02020630 + .pool _08072D60: ldrh r0, [r6, 0x3A] lsls r0, 24 @@ -232642,7 +223972,7 @@ _08072D86: movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string - ldr r0, _08072DFC + ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA lsls r1, 1 @@ -232652,13 +223982,13 @@ _08072D86: add r2, sp, 0x4 bl font_render_some movs r4, 0 - ldr r1, _08072E00 + ldr r1, =0x02020630 mov r2, r10 adds r0, r2, r7 lsls r0, 2 adds r5, r0, r1 _08072DB8: - ldr r0, _08072DFC + ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA lsls r1, 1 @@ -232673,9 +224003,9 @@ _08072DB8: adds r1, r6 adds r1, r4 lsls r1, 5 - ldr r2, _08072E04 + ldr r2, =0x06010000 adds r1, r2 - ldr r2, _08072E08 + ldr r2, =0x04000008 bl CpuSet adds r0, r4, 0x1 lsls r0, 24 @@ -232692,10 +224022,7 @@ _08072DEA: pop {r0} bx r0 .align 2, 0 -_08072DFC: .4byte 0x020244d4 -_08072E00: .4byte 0x02020630 -_08072E04: .4byte 0x06010000 -_08072E08: .4byte 0x04000008 + .pool thumb_func_end heathbar_draw_hp thumb_func_start sub_8072E0C @@ -232715,7 +224042,7 @@ sub_8072E0C: @ 8072E0C lsls r2, 24 lsrs r2, 24 mov r8, r2 - ldr r5, _08072EC4 + ldr r5, =0x02020630 lsls r0, 4 add r0, r9 lsls r0, 2 @@ -232727,7 +224054,7 @@ sub_8072E0C: @ 8072E0C lsls r0, 24 cmp r0, 0 bne _08072F28 - ldr r0, _08072EC8 + ldr r0, =0x020244d0 ldr r1, [r0] movs r2, 0x3A ldrsh r0, [r7, r2] @@ -232750,7 +224077,7 @@ _08072E5E: ldrh r0, [r0, 0x4] lsls r0, 22 lsrs r5, r0, 17 - ldr r0, _08072ECC + ldr r0, =0x06010000 adds r6, r5, r0 mov r0, r8 cmp r0, 0 @@ -232769,7 +224096,7 @@ _08072E5E: movs r3, 0 bl write_to_rbox adds r4, r0, 0 - ldr r1, _08072ED0 + ldr r1, =0x060100c0 adds r0, r5, r1 adds r1, r4, 0 movs r2, 0x2 @@ -232781,18 +224108,13 @@ _08072E5E: ldrh r1, [r7, 0x4] lsls r1, 22 lsrs r1, 17 - ldr r2, _08072ED4 + ldr r2, =0x06010680 adds r1, r2 - ldr r2, _08072ED8 + ldr r2, =0x04000008 bl CpuSet b _080730B8 .align 2, 0 -_08072EC4: .4byte 0x02020630 -_08072EC8: .4byte 0x020244d0 -_08072ECC: .4byte 0x06010000 -_08072ED0: .4byte 0x060100c0 -_08072ED4: .4byte 0x06010680 -_08072ED8: .4byte 0x04000008 + .pool _08072EDC: lsls r1, r4, 16 asrs r1, 16 @@ -232817,7 +224139,7 @@ _08072EDC: movs r1, 0 movs r2, 0x3 bl sub_807513C - ldr r3, _08072F24 + ldr r3, =0x06010060 adds r0, r5, r3 adds r1, r4, 0 movs r2, 0x3 @@ -232826,9 +224148,9 @@ _08072EDC: bl sub_807512C b _080730B8 .align 2, 0 -_08072F24: .4byte 0x06010060 + .pool _08072F28: - ldr r1, _08072FD8 + ldr r1, =0x0832c3d8 add r0, sp, 0x4 movs r2, 0x14 bl memcpy @@ -232836,7 +224158,7 @@ _08072F28: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x2C] - ldr r0, _08072FDC + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] ldr r2, [sp, 0x2C] @@ -232869,10 +224191,10 @@ _08072F52: mov r3, r8 cmp r3, 0 bne _08072F82 - ldr r1, _08072FE0 + ldr r1, =0x085e8d3e bl gf_strcpy _08072F82: - ldr r0, _08072FE4 + ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA lsls r1, 1 @@ -232892,7 +224214,7 @@ _08072F82: _08072FA6: cmp r4, 0x2 bhi _08072FF0 - ldr r0, _08072FE4 + ldr r0, =0x020244d4 ldr r0, [r0] movs r2, 0xBA lsls r2, 1 @@ -232908,20 +224230,15 @@ _08072FA6: adds r4, 0x1 adds r1, r4 lsls r1, 5 - ldr r3, _08072FE8 + ldr r3, =0x06010000 adds r1, r3 - ldr r2, _08072FEC + ldr r2, =0x04000008 bl CpuSet b _0807301A .align 2, 0 -_08072FD8: .4byte 0x0832c3d8 -_08072FDC: .4byte 0x020244d0 -_08072FE0: .4byte 0x085e8d3e -_08072FE4: .4byte 0x020244d4 -_08072FE8: .4byte 0x06010000 -_08072FEC: .4byte 0x04000008 + .pool _08072FF0: - ldr r0, _0807306C + ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA lsls r1, 1 @@ -232936,9 +224253,9 @@ _08072FF0: lsrs r1, 22 adds r1, r4, r1 lsls r1, 5 - ldr r2, _08073070 + ldr r2, =0x06010020 adds r1, r2 - ldr r2, _08073074 + ldr r2, =0x04000008 bl CpuSet adds r4, 0x1 _0807301A: @@ -232951,14 +224268,14 @@ _08073024: mov r3, r8 cmp r3, 0 bne _08073084 - ldr r0, _0807306C + ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA lsls r1, 1 adds r0, r1 ldr r0, [r0] adds r0, 0xE0 - ldr r1, _08073078 + ldr r1, =0x02020630 lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -232967,9 +224284,9 @@ _08073024: lsls r1, 22 lsrs r1, 17 adds r1, 0x80 - ldr r5, _0807307C + ldr r5, =0x06010000 adds r1, r5 - ldr r2, _08073074 + ldr r2, =0x04000008 bl CpuSet mov r2, r8 str r2, [sp, 0x24] @@ -232978,16 +224295,11 @@ _08073024: lsls r1, 22 lsrs r1, 17 adds r1, r5 - ldr r2, _08073080 + ldr r2, =0x05000008 bl CpuSet b _080730B8 .align 2, 0 -_0807306C: .4byte 0x020244d4 -_08073070: .4byte 0x06010020 -_08073074: .4byte 0x04000008 -_08073078: .4byte 0x02020630 -_0807307C: .4byte 0x06010000 -_08073080: .4byte 0x05000008 + .pool _08073084: ldr r0, [sp, 0x2C] bl battle_side_get_owner @@ -232996,7 +224308,7 @@ _08073084: bne _080730B8 movs r0, 0x74 bl sub_80728A4 - ldr r2, _080730C8 + ldr r2, =0x02020630 mov r3, r9 lsls r1, r3, 4 add r1, r9 @@ -233008,9 +224320,9 @@ _08073084: movs r2, 0xD0 lsls r2, 3 adds r1, r2 - ldr r2, _080730CC + ldr r2, =0x06010000 adds r1, r2 - ldr r2, _080730D0 + ldr r2, =0x04000008 bl CpuSet _080730B8: add sp, 0x30 @@ -233022,9 +224334,7 @@ _080730B8: pop {r0} bx r0 .align 2, 0 -_080730C8: .4byte 0x02020630 -_080730CC: .4byte 0x06010000 -_080730D0: .4byte 0x04000008 + .pool thumb_func_end sub_8072E0C thumb_func_start sub_80730D4 @@ -233039,11 +224349,11 @@ sub_80730D4: @ 80730D4 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x14] - ldr r1, _0807317C + ldr r1, =0x0832c3c4 mov r0, sp movs r2, 0x14 bl memcpy - ldr r1, _08073180 + ldr r1, =0x02020630 ldr r2, [sp, 0x14] lsls r0, r2, 4 adds r0, r2 @@ -233053,7 +224363,7 @@ sub_80730D4: @ 80730D4 lsls r0, 24 lsrs r0, 24 bl battle_get_per_side_status - ldr r1, _08073184 + ldr r1, =0x020244d4 ldr r2, [r1] movs r3, 0xBA lsls r3, 1 @@ -233075,7 +224385,7 @@ sub_80730D4: @ 80730D4 lsls r0, 24 mov r4, sp adds r4, 0x6 - ldr r1, _08073188 + ldr r1, =0x0861cb50 lsrs r0, 22 adds r0, r1 ldr r1, [r0] @@ -233110,10 +224420,7 @@ _08073176: movs r0, 0x2C b _080731AA .align 2, 0 -_0807317C: .4byte 0x0832c3c4 -_08073180: .4byte 0x02020630 -_08073184: .4byte 0x020244d4 -_08073188: .4byte 0x0861cb50 + .pool _0807318C: adds r0, r1, 0 subs r0, 0x4B @@ -233136,7 +224443,7 @@ _080731AA: bl sub_80728A4 lsls r1, r5, 6 adds r1, r6, r1 - ldr r2, _080732C0 + ldr r2, =0x04000008 bl CpuSet adds r0, r5, 0x1 lsls r0, 24 @@ -233153,8 +224460,8 @@ _080731AA: mov r9, r1 cmp r7, r9 bge _08073236 - ldr r1, _080732C4 - ldr r2, _080732C0 + ldr r1, =0x02020630 + ldr r2, =0x04000008 mov r10, r2 ldr r3, [sp, 0x14] adds r0, r3 @@ -233178,7 +224485,7 @@ _080731F6: lsls r5, 6 adds r0, r5 lsls r0, 5 - ldr r2, _080732C8 + ldr r2, =0x06010000 adds r1, r0, r2 adds r0, r6, 0 mov r2, r10 @@ -233192,7 +224499,7 @@ _080731F6: adds r0, r4 adds r0, r5 lsls r0, 5 - ldr r2, _080732C8 + ldr r2, =0x06010000 adds r1, r0, r2 adds r0, r6, 0 mov r2, r10 @@ -233202,7 +224509,7 @@ _080731F6: cmp r7, r9 blt _080731E6 _08073236: - ldr r6, _080732C4 + ldr r6, =0x02020630 ldr r3, [sp, 0x18] ldr r1, [sp, 0x14] adds r0, r3, r1 @@ -233211,7 +224518,7 @@ _08073236: ldrh r4, [r0, 0x38] lsls r4, 24 lsrs r4, 24 - ldr r5, _080732CC + ldr r5, =0x0202449c ldr r0, [r5] adds r0, 0x7C ldrb r1, [r0] @@ -233232,7 +224539,7 @@ _08073236: strb r0, [r1, 0x5] movs r0, 0xBA strb r0, [r1, 0x8] - ldr r5, _080732D0 + ldr r5, =0x020244d4 ldr r0, [r5] movs r2, 0xBA lsls r2, 1 @@ -233262,17 +224569,13 @@ _08073296: adds r2, r7, 0x2 adds r1, r2 lsls r1, 5 - ldr r2, _080732C8 + ldr r2, =0x06010000 adds r1, r2 - ldr r2, _080732C0 + ldr r2, =0x04000008 bl CpuSet b _080732F4 .align 2, 0 -_080732C0: .4byte 0x04000008 -_080732C4: .4byte 0x02020630 -_080732C8: .4byte 0x06010000 -_080732CC: .4byte 0x0202449c -_080732D0: .4byte 0x020244d4 + .pool _080732D4: ldr r0, [r5] movs r3, 0xBA @@ -233285,9 +224588,9 @@ _080732D4: lsrs r1, 22 adds r1, r7, r1 lsls r1, 5 - ldr r2, _0807330C + ldr r2, =0x060100c0 adds r1, r2 - ldr r2, _08073310 + ldr r2, =0x04000008 bl CpuSet _080732F4: adds r4, 0x40 @@ -233303,8 +224606,7 @@ _080732F4: pop {r0} bx r0 .align 2, 0 -_0807330C: .4byte 0x060100c0 -_08073310: .4byte 0x04000008 + .pool thumb_func_end sub_80730D4 thumb_func_start sub_8073314 @@ -233317,18 +224619,18 @@ sub_8073314: @ 8073314 sub sp, 0x4 movs r0, 0 mov r9, r0 - ldr r0, _08073440 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r9, r0 blt _0807332E b _080735BA _0807332E: - ldr r1, _08073444 + ldr r1, =0x02020630 mov r10, r1 - ldr r2, _08073448 + ldr r2, =0x0202406e mov r8, r2 _08073336: - ldr r0, _0807344C + ldr r0, =0x03005d70 mov r1, r9 adds r6, r1, r0 ldrb r1, [r6] @@ -233339,7 +224641,7 @@ _08073336: adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _08073450 + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _08073354 b _080735A8 @@ -233366,7 +224668,7 @@ _0807336A: bne _08073382 b _080735A8 _08073382: - ldr r5, _08073454 + ldr r5, =0x020244d0 ldr r0, [r5] ldr r3, [r0] mov r0, r9 @@ -233404,7 +224706,7 @@ _08073382: bne _080733D0 b _080735A8 _080733D0: - ldr r0, _08073458 + ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x80 ands r2, r0 @@ -233430,17 +224732,17 @@ _080733DE: ldrh r1, [r0, 0x4] lsls r1, 22 lsrs r1, 17 - ldr r2, _0807345C + ldr r2, =0x06010000 adds r1, r2 mov r0, sp - ldr r2, _08073460 + ldr r2, =0x05000040 bl CpuSet ldrb r4, [r6] mov r1, r8 ldrh r0, [r1] movs r2, 0x64 muls r0, r2 - ldr r1, _08073464 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 bl pokemon_getattr @@ -233455,19 +224757,10 @@ _080733DE: ldrh r0, [r2] movs r1, 0x64 muls r0, r1 - ldr r2, _08073464 + ldr r2, =0x020244ec b _08073536 .align 2, 0 -_08073440: .4byte 0x0202406c -_08073444: .4byte 0x02020630 -_08073448: .4byte 0x0202406e -_0807344C: .4byte 0x03005d70 -_08073450: .4byte nullsub_12 + 1 -_08073454: .4byte 0x020244d0 -_08073458: .4byte 0x02022fec -_0807345C: .4byte 0x06010000 -_08073460: .4byte 0x05000040 -_08073464: .4byte 0x020244ec + .pool _08073468: ldrb r0, [r6] bl draw_status_ailment_maybe @@ -233476,7 +224769,7 @@ _08073468: ldrh r1, [r2] movs r2, 0x64 muls r1, r2 - ldr r2, _080734A4 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0x5 bl healthbar_draw_field_maybe @@ -233490,19 +224783,17 @@ _08073468: ldrh r1, [r1, 0x4] lsls r1, 22 lsrs r1, 17 - ldr r2, _080734A8 + ldr r2, =0x06010680 adds r1, r2 - ldr r2, _080734AC + ldr r2, =0x04000008 bl CpuSet b _08073592 .align 2, 0 -_080734A4: .4byte 0x020244ec -_080734A8: .4byte 0x06010680 -_080734AC: .4byte 0x04000008 + .pool _080734B0: cmp r4, 0x1 bne _0807355C - ldr r0, _080734D4 + ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x80 ands r2, r0 @@ -233513,13 +224804,12 @@ _080734B0: ldrh r1, [r2] movs r2, 0x64 muls r1, r2 - ldr r2, _080734D8 + ldr r2, =0x02024744 adds r1, r2 bl sub_80730D4 b _08073592 .align 2, 0 -_080734D4: .4byte 0x02022fec -_080734D8: .4byte 0x02024744 + .pool _080734DC: ldrb r1, [r6] lsls r0, r1, 4 @@ -233537,17 +224827,17 @@ _080734DC: ldrh r1, [r0, 0x4] lsls r1, 22 lsrs r1, 17 - ldr r0, _08073550 + ldr r0, =0x06010000 adds r1, r0 mov r0, sp - ldr r2, _08073554 + ldr r2, =0x05000040 bl CpuSet ldrb r4, [r6] mov r1, r8 ldrh r0, [r1] movs r2, 0x64 muls r0, r2 - ldr r1, _08073558 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 bl pokemon_getattr @@ -233562,7 +224852,7 @@ _080734DC: ldrh r0, [r2] movs r1, 0x64 muls r0, r1 - ldr r2, _08073558 + ldr r2, =0x02024744 _08073536: adds r0, r2 movs r1, 0x3A @@ -233575,9 +224865,7 @@ _08073536: bl sub_8072E0C b _08073592 .align 2, 0 -_08073550: .4byte 0x06010000 -_08073554: .4byte 0x05000040 -_08073558: .4byte 0x02024744 + .pool _0807355C: ldrb r0, [r6] bl draw_status_ailment_maybe @@ -233586,11 +224874,11 @@ _0807355C: ldrh r1, [r2] movs r5, 0x64 muls r1, r5 - ldr r4, _080735CC + ldr r4, =0x02024744 adds r1, r4 movs r2, 0x5 bl healthbar_draw_field_maybe - ldr r0, _080735D0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 @@ -233604,7 +224892,7 @@ _0807355C: movs r2, 0x4 bl healthbar_draw_field_maybe _08073592: - ldr r0, _080735D4 + ldr r0, =0x03005d70 add r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -233620,7 +224908,7 @@ _080735A8: add r8, r0 movs r1, 0x1 add r9, r1 - ldr r0, _080735D8 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r9, r0 bge _080735BA @@ -233635,10 +224923,7 @@ _080735BA: pop {r0} bx r0 .align 2, 0 -_080735CC: .4byte 0x02024744 -_080735D0: .4byte 0x02022fec -_080735D4: .4byte 0x03005d70 -_080735D8: .4byte 0x0202406c + .pool thumb_func_end sub_8073314 thumb_func_start sub_80735DC @@ -233678,11 +224963,11 @@ _0807360C: movs r4, 0x60 movs r1, 0x64 mov r10, r1 - ldr r2, _0807362C + ldr r2, =0x0000fffb mov r8, r2 b _0807366C .align 2, 0 -_0807362C: .4byte 0x0000fffb + .pool _08073630: movs r3, 0x1 mov r9, r3 @@ -233700,36 +224985,36 @@ _08073648: movs r5, 0x68 movs r4, 0x10 _0807364C: - ldr r6, _08073658 + ldr r6, =0x0000ff9c mov r10, r6 movs r0, 0x5 mov r8, r0 b _0807366C .align 2, 0 -_08073658: .4byte 0x0000ff9c + .pool _0807365C: movs r1, 0x1 mov r9, r1 movs r5, 0x68 movs r4, 0x28 - ldr r2, _080736E0 + ldr r2, =0x0000ff9c mov r10, r2 movs r3, 0x5 mov r8, r3 _0807366C: - ldr r0, _080736E4 + ldr r0, =0x0832c334 bl gpu_tile_obj_decompress_and_load3 - ldr r0, _080736E8 + ldr r0, =0x0832c34c bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _080736EC + ldr r0, =0x0832c33c bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _080736F0 + ldr r0, =0x0832c344 bl gpu_pal_obj_alloc_tag_and_apply mov r0, r9 lsls r6, r0, 1 adds r0, r6, r0 lsls r0, 3 - ldr r1, _080736F4 + ldr r1, =0x0832c364 adds r0, r1 lsls r5, 16 asrs r1, r5, 16 @@ -233744,9 +225029,9 @@ _0807366C: ldr r1, [sp, 0x14] adds r0, r1 lsls r0, 2 - ldr r1, _080736F8 + ldr r1, =0x02020630 adds r7, r0, r1 - ldr r1, _080736FC + ldr r1, =0x0832c2c4 adds r0, r7, 0 bl obj_set_f18_to_r0_f42_to_40 mov r2, r10 @@ -233770,14 +225055,7 @@ _0807366C: strb r0, [r7, 0x3] b _08073706 .align 2, 0 -_080736E0: .4byte 0x0000ff9c -_080736E4: .4byte 0x0832c334 -_080736E8: .4byte 0x0832c34c -_080736EC: .4byte 0x0832c33c -_080736F0: .4byte 0x0832c344 -_080736F4: .4byte 0x0832c364 -_080736F8: .4byte 0x02020630 -_080736FC: .4byte 0x0832c2c4 + .pool _08073700: ldrh r0, [r7, 0x20] adds r0, 0x60 @@ -233785,7 +225063,7 @@ _08073700: _08073706: movs r0, 0 mov r8, r0 - ldr r1, _080737B4 + ldr r1, =0x02020630 mov r10, r1 mov r7, sp mov r2, r9 @@ -233795,9 +225073,9 @@ _08073706: movs r6, 0xA movs r5, 0 _0807371C: - ldr r0, _080737B8 + ldr r0, =0x0832c394 ldr r3, [sp, 0x20] - ldr r1, _080737BC + ldr r1, =0xfffc0000 adds r2, r3, r1 ldr r3, [sp, 0x18] adds r0, r3, r0 @@ -233814,12 +225092,12 @@ _0807371C: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r2, _080737C0 + ldr r2, =0x0202064c adds r1, r2 - ldr r0, _080737C4 + ldr r0, =sub_80741C8 + 1 str r0, [r1] _0807374C: - ldr r4, _080737B4 + ldr r4, =0x02020630 mov r3, r9 cmp r3, 0 bne _0807376E @@ -233872,11 +225150,7 @@ _0807376E: movs r1, 0x78 b _0807380A .align 2, 0 -_080737B4: .4byte 0x02020630 -_080737B8: .4byte 0x0832c394 -_080737BC: .4byte 0xfffc0000 -_080737C0: .4byte 0x0202064c -_080737C4: .4byte sub_80741C8 + 1 + .pool _080737C8: ldrb r0, [r7] lsls r2, r0, 4 @@ -233910,7 +225184,7 @@ _080737C8: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08073890 + ldr r1, =0x0000ff88 _0807380A: strh r1, [r0, 0x24] ldrb r1, [r7] @@ -233937,18 +225211,18 @@ _0807382C: beq _0807383A b _080739E8 _0807383A: - ldr r0, _08073894 + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x40 ands r1, r2 cmp r1, 0 beq _080738F4 - ldr r5, _08073898 + ldr r5, =0x0000ffff mov r10, r5 - ldr r6, _0807389C - ldr r0, _080738A0 + ldr r6, =0x02020630 + ldr r0, =0x000003ff adds r7, r0, 0 - ldr r1, _080738A4 + ldr r1, =0xfffffc00 mov r9, r1 mov r4, sp ldr r5, [sp, 0xC] @@ -233981,12 +225255,7 @@ _0807385C: strh r1, [r0, 0x3C] b _080738E2 .align 2, 0 -_08073890: .4byte 0x0000ff88 -_08073894: .4byte 0x02022fec -_08073898: .4byte 0x0000ffff -_0807389C: .4byte 0x02020630 -_080738A0: .4byte 0x000003ff -_080738A4: .4byte 0xfffffc00 + .pool _080738A8: cmp r0, 0 bne _080738C0 @@ -234033,17 +225302,17 @@ _080738F4: movs r1, 0x5 mov r10, r1 movs r7, 0 - ldr r2, _08073948 + ldr r2, =0x02020630 mov r8, r2 - ldr r3, _0807394C + ldr r3, =0x000003ff mov r9, r3 - ldr r5, _08073950 + ldr r5, =0xfffffc00 mov r12, r5 ldr r6, [sp, 0xC] mov r5, sp _0807390A: ldrh r0, [r6] - ldr r1, _08073954 + ldr r1, =0x0000ffff cmp r0, r1 bne _08073958 mov r4, sp @@ -234074,10 +225343,7 @@ _0807390A: add r10, r1 b _080739DE .align 2, 0 -_08073948: .4byte 0x02020630 -_0807394C: .4byte 0x000003ff -_08073950: .4byte 0xfffffc00 -_08073954: .4byte 0x0000ffff + .pool _08073958: cmp r0, 0 bne _08073970 @@ -234092,20 +225358,20 @@ _08073958: adds r1, 0x3 b _080739D0 _08073970: - ldr r1, _080739AC + ldr r1, =0x02022fec ldr r0, [r1] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 beq _080739B8 - ldr r0, _080739B0 + ldr r0, =0x0202449c ldr r0, [r0] movs r2, 0xA8 lsls r2, 2 adds r0, r2 ldrb r1, [r0] - ldr r2, _080739B4 + ldr r2, =0x0832a328 lsls r0, r7, 2 adds r0, r2 ldr r0, [r0] @@ -234123,9 +225389,7 @@ _08073970: adds r1, 0x3 b _080739D0 .align 2, 0 -_080739AC: .4byte 0x02022fec -_080739B0: .4byte 0x0202449c -_080739B4: .4byte 0x0832a328 + .pool _080739B8: ldr r0, [r6, 0x4] cmp r0, 0 @@ -234155,18 +225419,18 @@ _080739DE: ble _0807390A b _08073B9A _080739E8: - ldr r0, _08073A40 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r2, _08073A44 + ldr r2, =0x00008040 ands r1, r2 cmp r1, 0 beq _08073AA4 - ldr r1, _08073A48 + ldr r1, =0x0000ffff mov r10, r1 - ldr r6, _08073A4C - ldr r2, _08073A50 + ldr r6, =0x02020630 + ldr r2, =0x000003ff adds r7, r2, 0 - ldr r3, _08073A54 + ldr r3, =0xfffffc00 mov r9, r3 ldr r5, [sp, 0xC] mov r4, sp @@ -234200,12 +225464,7 @@ _08073A0C: strh r1, [r0, 0x3C] b _08073A92 .align 2, 0 -_08073A40: .4byte 0x02022fec -_08073A44: .4byte 0x00008040 -_08073A48: .4byte 0x0000ffff -_08073A4C: .4byte 0x02020630 -_08073A50: .4byte 0x000003ff -_08073A54: .4byte 0xfffffc00 + .pool _08073A58: cmp r0, 0 bne _08073A70 @@ -234252,18 +225511,18 @@ _08073AA4: movs r3, 0 mov r8, r3 movs r7, 0 - ldr r5, _08073AF8 + ldr r5, =0x02020630 mov r9, r5 - ldr r6, _08073AFC + ldr r6, =0x000003ff mov r12, r6 - ldr r0, _08073B00 + ldr r0, =0xfffffc00 mov r10, r0 ldr r6, [sp, 0xC] mov r5, sp adds r5, 0x5 _08073ABC: ldrh r0, [r6] - ldr r1, _08073B04 + ldr r1, =0x0000ffff cmp r0, r1 bne _08073B08 mov r4, sp @@ -234293,10 +225552,7 @@ _08073ABC: add r8, r1 b _08073B92 .align 2, 0 -_08073AF8: .4byte 0x02020630 -_08073AFC: .4byte 0x000003ff -_08073B00: .4byte 0xfffffc00 -_08073B04: .4byte 0x0000ffff + .pool _08073B08: cmp r0, 0 bne _08073B20 @@ -234311,20 +225567,20 @@ _08073B08: adds r1, 0x3 b _08073B84 _08073B20: - ldr r1, _08073B5C + ldr r1, =0x02022fec ldr r0, [r1] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 beq _08073B6C - ldr r2, _08073B60 + ldr r2, =0x0202449c ldr r0, [r2] - ldr r3, _08073B64 + ldr r3, =0x000002a1 adds r0, r3 ldrb r1, [r0] lsls r0, r7, 2 - ldr r2, _08073B68 + ldr r2, =0x0832a328 adds r0, r2 ldr r0, [r0] ands r1, r0 @@ -234341,10 +225597,7 @@ _08073B20: adds r1, 0x3 b _08073B84 .align 2, 0 -_08073B5C: .4byte 0x02022fec -_08073B60: .4byte 0x0202449c -_08073B64: .4byte 0x000002a1 -_08073B68: .4byte 0x0832a328 + .pool _08073B6C: ldr r0, [r6, 0x4] cmp r0, 0 @@ -234373,12 +225626,12 @@ _08073B92: cmp r7, 0x5 ble _08073ABC _08073B9A: - ldr r0, _08073C24 + ldr r0, =nullsub_4 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _08073C28 + ldr r2, =0x03005e00 lsls r3, r4, 2 adds r1, r3, r4 lsls r1, 3 @@ -234414,7 +225667,7 @@ _08073BC6: ldr r2, [sp, 0x10] cmp r2, 0 beq _08073C0A - ldr r0, _08073C2C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r3, [r0, 0x8] ldrb r2, [r3, 0x9] @@ -234443,9 +225696,7 @@ _08073C0A: pop {r1} bx r1 .align 2, 0 -_08073C24: .4byte nullsub_4 + 1 -_08073C28: .4byte 0x03005e00 -_08073C2C: .4byte 0x020244d0 + .pool thumb_func_end sub_80735DC thumb_func_start sub_8073C30 @@ -234459,7 +225710,7 @@ sub_8073C30: @ 8073C30 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r2, _08073D40 + ldr r2, =0x03005e00 lsls r3, r0, 2 adds r1, r3, r0 lsls r1, 3 @@ -234489,7 +225740,7 @@ _08073C5E: movs r0, 0x52 movs r1, 0x10 bl lcd_io_set - ldr r1, _08073D40 + ldr r1, =0x03005e00 ldr r0, [sp, 0xC] add r0, r8 lsls r0, 3 @@ -234500,7 +225751,7 @@ _08073C5E: mov r1, r10 lsls r1, 4 str r1, [sp, 0x10] - ldr r3, _08073D44 + ldr r3, =0x02020630 movs r6, 0xD negs r6, r6 mov r12, r3 @@ -234581,15 +225832,13 @@ _08073CE8: adds r0, r1 lsls r0, 2 adds r0, r3 - ldr r1, _08073D48 + ldr r1, =sub_8074158 + 1 str r1, [r0] - ldr r2, _08073D44 + ldr r2, =0x02020630 mov r12, r2 b _08073D82 .align 2, 0 -_08073D40: .4byte 0x03005e00 -_08073D44: .4byte 0x02020630 -_08073D48: .4byte sub_8074158 + 1 + .pool _08073D4C: ldrb r1, [r4] lsls r0, r1, 4 @@ -234614,9 +225863,9 @@ _08073D4C: adds r0, r1 lsls r0, 2 adds r0, r3 - ldr r1, _08073DC8 + ldr r1, =sub_8074158 + 1 str r1, [r0] - ldr r0, _08073DCC + ldr r0, =0x02020630 mov r12, r0 _08073D82: adds r4, 0x1 @@ -234640,32 +225889,27 @@ _08073D82: mov r1, r12 adds r1, 0x1C adds r3, r1 - ldr r1, _08073DD0 + ldr r1, =sub_8074090 + 1 str r1, [r3] - ldr r1, _08073DD4 + ldr r1, =0x0832c2cc bl obj_set_f18_to_r0_f42_to_40 - ldr r1, _08073DD8 + ldr r1, =0x03005e00 ldr r0, [sp, 0xC] add r0, r8 lsls r0, 3 adds r0, r1 - ldr r1, _08073DDC + ldr r1, =task_battle_throw_own_ball + 1 str r1, [r0] b _08073DEE .align 2, 0 -_08073DC8: .4byte sub_8074158 + 1 -_08073DCC: .4byte 0x02020630 -_08073DD0: .4byte sub_8074090 + 1 -_08073DD4: .4byte 0x0832c2cc -_08073DD8: .4byte 0x03005e00 -_08073DDC: .4byte task_battle_throw_own_ball + 1 + .pool _08073DE0: - ldr r0, _08073E00 + ldr r0, =0x03005e00 ldr r1, [sp, 0xC] add r1, r8 lsls r1, 3 adds r1, r0 - ldr r0, _08073E04 + ldr r0, =sub_8073F98 + 1 str r0, [r1] _08073DEE: add sp, 0x18 @@ -234677,8 +225921,7 @@ _08073DEE: pop {r0} bx r0 .align 2, 0 -_08073E00: .4byte 0x03005e00 -_08073E04: .4byte sub_8073F98 + 1 + .pool thumb_func_end sub_8073C30 thumb_func_start task_battle_throw_own_ball @@ -234686,7 +225929,7 @@ task_battle_throw_own_ball: @ 8073E08 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08073E5C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -234719,15 +225962,14 @@ _08073E48: ldrsh r0, [r4, r1] cmp r0, 0 bne _08073E54 - ldr r0, _08073E60 + ldr r0, =sub_8073E64 + 1 str r0, [r4] _08073E54: pop {r4} pop {r0} bx r0 .align 2, 0 -_08073E5C: .4byte 0x03005e00 -_08073E60: .4byte sub_8073E64 + 1 + .pool thumb_func_end task_battle_throw_own_ball thumb_func_start sub_8073E64 @@ -234736,7 +225978,7 @@ sub_8073E64: @ 8073E64 sub sp, 0x8 lsls r0, 24 lsrs r5, r0, 24 - ldr r7, _08073EF0 + ldr r7, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r3, r0, 3 @@ -234753,7 +225995,7 @@ sub_8073E64: @ 8073E64 bne _08073F54 ldrb r5, [r4, 0xA] movs r4, 0 - ldr r6, _08073EF4 + ldr r6, =0x020244d0 adds r0, r7, 0 adds r0, 0xE adds r2, r3, r0 @@ -234790,7 +226032,7 @@ _08073E96: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r4, _08073EF8 + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_resources mov r0, sp @@ -234802,14 +226044,12 @@ _08073E96: bl obj_delete_and_free_resources b _08073F32 .align 2, 0 -_08073EF0: .4byte 0x03005e00 -_08073EF4: .4byte 0x020244d0 -_08073EF8: .4byte 0x02020630 + .pool _08073EFC: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r5, _08073F50 + ldr r5, =0x02020630 adds r4, r5 adds r0, r4, 0 bl obj_free_rotscale_entry @@ -234831,7 +226071,7 @@ _08073EFC: bl obj_delete_and_free_tiles _08073F32: movs r4, 0x1 - ldr r5, _08073F50 + ldr r5, =0x02020630 _08073F36: mov r1, sp adds r0, r1, r4 @@ -234846,13 +226086,13 @@ _08073F36: ble _08073F36 b _08073F8A .align 2, 0 -_08073F50: .4byte 0x02020630 + .pool _08073F54: movs r0, 0x3 negs r0, r0 cmp r1, r0 bne _08073F8A - ldr r0, _08073F94 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -234878,7 +226118,7 @@ _08073F8A: pop {r0} bx r0 .align 2, 0 -_08073F94: .4byte 0x020244d0 + .pool thumb_func_end sub_8073E64 thumb_func_start sub_8073F98 @@ -234888,7 +226128,7 @@ sub_8073F98: @ 8073F98 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r7, _08073FD0 + ldr r7, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r6, r0, 3 @@ -234911,7 +226151,7 @@ sub_8073F98: @ 8073F98 bl lcd_io_set b _0807406A .align 2, 0 -_08073FD0: .4byte 0x03005e00 + .pool _08073FD4: movs r0, 0x1 negs r0, r0 @@ -234934,7 +226174,7 @@ _08073FE6: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r4, _08074030 + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_resources mov r0, sp @@ -234959,13 +226199,13 @@ _08074016: ble _08074016 b _0807406A .align 2, 0 -_08074030: .4byte 0x02020630 + .pool _08074034: movs r0, 0x3 negs r0, r0 cmp r2, r0 bne _0807406A - ldr r0, _08074074 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] lsls r1, r5, 1 @@ -234991,7 +226231,7 @@ _0807406A: pop {r0} bx r0 .align 2, 0 -_08074074: .4byte 0x020244d0 + .pool thumb_func_end sub_8073F98 thumb_func_start sub_8074078 @@ -235064,7 +226304,7 @@ _080740D8: adds r0, 0x38 lsls r1, r0, 16 lsrs r2, r1, 16 - ldr r0, _08074108 + ldr r0, =0x0000fff0 ands r2, r0 strh r2, [r4, 0x34] cmp r3, 0 @@ -235080,7 +226320,7 @@ _080740D8: strh r0, [r4, 0x24] b _0807411C .align 2, 0 -_08074108: .4byte 0x0000fff0 + .pool _0807410C: lsrs r1, 20 ldrh r0, [r4, 0x24] @@ -235115,14 +226355,14 @@ _08074140: movs r0, 0x73 bl sub_80A3808 _0807414A: - ldr r0, _08074154 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _0807414E: pop {r4} pop {r0} bx r0 .align 2, 0 -_08074154: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80740C4 thumb_func_start sub_8074158 @@ -235145,7 +226385,7 @@ _0807416C: adds r1, 0x38 lsls r4, r1, 16 lsrs r2, r4, 16 - ldr r1, _0807418C + ldr r1, =0x0000fff0 ands r2, r1 strh r2, [r3, 0x34] cmp r0, 0 @@ -235155,7 +226395,7 @@ _0807416C: adds r0, r1 b _08074196 .align 2, 0 -_0807418C: .4byte 0x0000fff0 + .pool _08074190: lsrs r1, r4, 20 ldrh r0, [r3, 0x24] @@ -235178,14 +226418,14 @@ _08074196: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _080741C4 + ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] _080741BC: pop {r4} pop {r0} bx r0 .align 2, 0 -_080741C4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8074158 thumb_func_start sub_80741C8 @@ -235193,7 +226433,7 @@ sub_80741C8: @ 80741C8 ldrh r2, [r0, 0x2E] lsls r2, 24 lsrs r2, 24 - ldr r3, _080741E4 + ldr r3, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -235204,7 +226444,7 @@ sub_80741C8: @ 80741C8 strh r1, [r0, 0x26] bx lr .align 2, 0 -_080741E4: .4byte 0x02020630 + .pool thumb_func_end sub_80741C8 thumb_func_start sub_80741E8 @@ -235214,8 +226454,8 @@ sub_80741E8: @ 80741E8 adds r4, r1, 0 lsls r0, 24 lsrs r7, r0, 24 - ldr r5, _08074258 - ldr r1, _0807425C + ldr r5, =0x02022e2c + ldr r1, =0x085ed228 adds r0, r5, 0 bl gf_strcpy adds r0, r4, 0 @@ -235245,7 +226485,7 @@ sub_80741E8: @ 80741E8 _08074236: movs r0, 0xB muls r1, r0 - ldr r0, _08074260 + ldr r0, =0x083185c8 adds r1, r0 add r0, sp, 0x4 bl sub_8008C44 @@ -235257,24 +226497,21 @@ _0807424A: beq _08074268 cmp r6, 0xFE beq _08074270 - ldr r1, _08074264 + ldr r1, =0x085ed238 b _08074272 .align 2, 0 -_08074258: .4byte 0x02022e2c -_0807425C: .4byte 0x085ed228 -_08074260: .4byte 0x083185c8 -_08074264: .4byte 0x085ed238 + .pool _08074268: - ldr r1, _0807426C + ldr r1, =0x085ed22e b _08074272 .align 2, 0 -_0807426C: .4byte 0x085ed22e + .pool _08074270: - ldr r1, _080742D8 + ldr r1, =0x085ed233 _08074272: adds r0, r5, 0 bl gf_strcpy - ldr r0, _080742DC + ldr r0, =0x02022e2c add r1, sp, 0x10 str r1, [sp] movs r1, 0 @@ -235282,7 +226519,7 @@ _08074272: movs r3, 0x2 bl write_to_rbox adds r6, r0, 0 - ldr r0, _080742E0 + ldr r0, =0x02020630 lsls r1, r7, 4 adds r1, r7 lsls r1, 2 @@ -235297,18 +226534,18 @@ _08074272: lsls r0, 24 cmp r0, 0 bne _080742F0 - ldr r1, _080742E4 + ldr r1, =0x06010040 adds r0, r4, r1 adds r1, r6, 0 movs r2, 0x6 bl sub_8075198 bl battle_type_is_double lsls r0, 24 - ldr r1, _080742E8 + ldr r1, =0x06010400 adds r5, r4, r1 cmp r0, 0 bne _080742C8 - ldr r0, _080742EC + ldr r0, =0x06010800 adds r5, r4, r0 _080742C8: adds r1, r6, 0 @@ -235318,14 +226555,9 @@ _080742C8: bl sub_8075198 b _080742FC .align 2, 0 -_080742D8: .4byte 0x085ed233 -_080742DC: .4byte 0x02022e2c -_080742E0: .4byte 0x02020630 -_080742E4: .4byte 0x06010040 -_080742E8: .4byte 0x06010400 -_080742EC: .4byte 0x06010800 + .pool _080742F0: - ldr r1, _0807430C + ldr r1, =0x06010020 adds r0, r4, r1 adds r1, r6, 0 movs r2, 0x7 @@ -235338,7 +226570,7 @@ _080742FC: pop {r0} bx r0 .align 2, 0 -_0807430C: .4byte 0x06010020 + .pool thumb_func_end sub_80741E8 thumb_func_start sub_8074310 @@ -235349,7 +226581,7 @@ sub_8074310: @ 8074310 lsrs r2, r0, 24 lsls r1, 24 lsrs r7, r1, 24 - ldr r0, _080743AC + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 2 @@ -235360,7 +226592,7 @@ sub_8074310: @ 8074310 ands r1, r0 cmp r1, 0 bne _080743E6 - ldr r6, _080743B0 + ldr r6, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -235373,13 +226605,13 @@ sub_8074310: @ 8074310 lsls r0, 24 cmp r0, 0 beq _080743E6 - ldr r1, _080743B4 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080743B8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -235410,18 +226642,13 @@ sub_8074310: @ 8074310 movs r2, 0x80 lsls r2, 1 adds r1, r2 - ldr r2, _080743BC + ldr r2, =0x06010000 adds r1, r2 - ldr r2, _080743C0 + ldr r2, =0x04000008 bl CpuSet b _080743E6 .align 2, 0 -_080743AC: .4byte 0x02022fec -_080743B0: .4byte 0x02020630 -_080743B4: .4byte 0x0202406e -_080743B8: .4byte 0x02024744 -_080743BC: .4byte 0x06010000 -_080743C0: .4byte 0x04000008 + .pool _080743C4: str r7, [sp] lsls r0, r4, 4 @@ -235434,9 +226661,9 @@ _080743C4: movs r0, 0x80 lsls r0, 1 adds r1, r0 - ldr r0, _080743F0 + ldr r0, =0x06010000 adds r1, r0 - ldr r2, _080743F4 + ldr r2, =0x05000008 mov r0, sp bl CpuSet _080743E6: @@ -235445,8 +226672,7 @@ _080743E6: pop {r0} bx r0 .align 2, 0 -_080743F0: .4byte 0x06010000 -_080743F4: .4byte 0x05000008 + .pool thumb_func_end sub_8074310 thumb_func_start draw_status_ailment_maybe @@ -235459,7 +226685,7 @@ draw_status_ailment_maybe: @ 80743F8 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _0807445C + ldr r0, =0x02020630 mov r2, r9 lsls r1, r2, 4 add r1, r9 @@ -235477,13 +226703,13 @@ draw_status_ailment_maybe: @ 80743F8 lsls r0, 24 cmp r0, 0 bne _08074468 - ldr r1, _08074460 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08074464 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x37 bl pokemon_getattr @@ -235498,17 +226724,15 @@ draw_status_ailment_maybe: @ 80743F8 mov r8, r0 b _08074484 .align 2, 0 -_0807445C: .4byte 0x02020630 -_08074460: .4byte 0x0202406e -_08074464: .4byte 0x020244ec + .pool _08074468: - ldr r1, _080744A4 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080744A8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x37 bl pokemon_getattr @@ -235530,8 +226754,7 @@ _08074484: movs r0, 0x2 b _080745B8 .align 2, 0 -_080744A4: .4byte 0x0202406e -_080744A8: .4byte 0x02024744 + .pool _080744AC: movs r0, 0x88 ands r0, r4 @@ -235599,7 +226822,7 @@ _08074524: lsls r3, 16 mov r8, r3 lsls r7, 2 - ldr r1, _080745A4 + ldr r1, =0x02020630 add r0, r9 lsls r0, 2 adds r5, r0, r1 @@ -235612,15 +226835,15 @@ _08074542: adds r1, r0 adds r1, r4 lsls r1, 5 - ldr r3, _080745A8 + ldr r3, =0x06010000 adds r1, r3 adds r0, r6, 0 - ldr r2, _080745AC + ldr r2, =0x04000008 bl CpuSet adds r4, 0x1 cmp r4, 0x2 ble _08074542 - ldr r0, _080745B0 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] adds r0, r7, r0 @@ -235631,7 +226854,7 @@ _08074542: bne _08074598 movs r0, 0x1 bl sub_80728A4 - ldr r2, _080745A4 + ldr r2, =0x02020630 mov r3, r10 lsls r1, r3, 4 add r1, r10 @@ -235640,9 +226863,9 @@ _08074542: ldrh r1, [r1, 0x4] lsls r1, 22 lsrs r1, 17 - ldr r2, _080745A8 + ldr r2, =0x06010000 adds r1, r2 - ldr r2, _080745B4 + ldr r2, =0x04000010 bl CpuSet _08074598: mov r0, r9 @@ -235650,24 +226873,20 @@ _08074598: bl sub_8074310 b _0807467A .align 2, 0 -_080745A4: .4byte 0x02020630 -_080745A8: .4byte 0x06010000 -_080745AC: .4byte 0x04000008 -_080745B0: .4byte 0x020244d0 -_080745B4: .4byte 0x04000010 + .pool _080745B8: mov r1, r9 lsls r5, r1, 4 add r5, r9 lsls r5, 2 - ldr r2, _08074688 + ldr r2, =0x02020630 adds r5, r2 ldrb r4, [r5, 0x5] lsrs r4, 4 lsls r4, 4 adds r4, 0xC adds r4, r7 - ldr r1, _0807468C + ldr r1, =0x0832c3ec lsls r0, 1 adds r0, r1 ldrh r0, [r0] @@ -235677,9 +226896,9 @@ _080745B8: movs r2, 0x2 bl rboxid_80040B8 lsls r4, 1 - ldr r0, _08074690 + ldr r0, =0x02037914 adds r0, r4, r0 - ldr r1, _08074694 + ldr r1, =0x05000200 adds r4, r1 adds r1, r4, 0 movs r2, 0x1 @@ -235689,10 +226908,10 @@ _080745B8: lsrs r1, 22 add r1, r8 lsls r1, 5 - ldr r2, _08074698 + ldr r2, =0x06010000 mov r8, r2 add r1, r8 - ldr r2, _0807469C + ldr r2, =0x04000018 adds r0, r6, 0 bl CpuSet bl battle_type_is_double @@ -235707,7 +226926,7 @@ _080745B8: cmp r0, 0x1 bne _08074672 _08074626: - ldr r0, _080746A0 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r7, 2 @@ -235723,13 +226942,13 @@ _08074626: lsls r4, r3, 4 add r4, r10 lsls r4, 2 - ldr r1, _08074688 + ldr r1, =0x02020630 adds r4, r1 ldrh r1, [r4, 0x4] lsls r1, 22 lsrs r1, 17 add r1, r8 - ldr r5, _080746A4 + ldr r5, =0x04000008 adds r2, r5, 0 bl CpuSet movs r0, 0x41 @@ -235754,14 +226973,7 @@ _0807467A: pop {r0} bx r0 .align 2, 0 -_08074688: .4byte 0x02020630 -_0807468C: .4byte 0x0832c3ec -_08074690: .4byte 0x02037914 -_08074694: .4byte 0x05000200 -_08074698: .4byte 0x06010000 -_0807469C: .4byte 0x04000018 -_080746A0: .4byte 0x020244d0 -_080746A4: .4byte 0x04000008 + .pool thumb_func_end draw_status_ailment_maybe thumb_func_start sub_80746A8 @@ -235776,12 +226988,12 @@ sub_80746A8: @ 80746A8 cmp r0, 0xC bhi _08074768 lsls r0, 2 - ldr r1, _080746C4 + ldr r1, =_080746C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080746C4: .4byte _080746C8 + .pool .align 2, 0 _080746C8: .4byte _080746FC @@ -235869,7 +227081,7 @@ sub_8074770: @ 8074770 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080747C8 + ldr r0, =0x085ccb2c add r1, sp, 0x4 str r1, [sp] movs r1, 0 @@ -235877,7 +227089,7 @@ sub_8074770: @ 8074770 movs r3, 0x2 bl write_to_rbox adds r5, r0, 0 - ldr r1, _080747CC + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -235885,12 +227097,12 @@ sub_8074770: @ 8074770 ldrh r4, [r0, 0x4] lsls r4, 22 lsrs r4, 17 - ldr r1, _080747D0 + ldr r1, =0x06010040 adds r0, r4, r1 adds r1, r5, 0 movs r2, 0x6 bl sub_8075198 - ldr r0, _080747D4 + ldr r0, =0x06010800 adds r4, r0 adds r5, 0xC0 adds r0, r4, 0 @@ -235904,10 +227116,7 @@ sub_8074770: @ 8074770 pop {r0} bx r0 .align 2, 0 -_080747C8: .4byte 0x085ccb2c -_080747CC: .4byte 0x02020630 -_080747D0: .4byte 0x06010040 -_080747D4: .4byte 0x06010800 + .pool thumb_func_end sub_8074770 thumb_func_start sub_80747D8 @@ -235917,10 +227126,10 @@ sub_80747D8: @ 80747D8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _0807484C + ldr r1, =0x085ccb3c add r0, sp, 0x4 bl gf_strcpy - ldr r1, _08074850 + ldr r1, =0x0203a04c ldrb r1, [r1] movs r2, 0 movs r3, 0x2 @@ -235937,7 +227146,7 @@ sub_80747D8: @ 80747D8 movs r3, 0x2 bl write_to_rbox adds r5, r0, 0 - ldr r1, _08074854 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -235945,12 +227154,12 @@ sub_80747D8: @ 80747D8 ldrh r4, [r0, 0x4] lsls r4, 22 lsrs r4, 17 - ldr r1, _08074858 + ldr r1, =0x060102c0 adds r0, r4, r1 adds r1, r5, 0 movs r2, 0x2 bl sub_80751E4 - ldr r0, _0807485C + ldr r0, =0x06010a00 adds r4, r0 adds r5, 0x40 adds r0, r4, 0 @@ -235964,11 +227173,7 @@ sub_80747D8: @ 80747D8 pop {r0} bx r0 .align 2, 0 -_0807484C: .4byte 0x085ccb3c -_08074850: .4byte 0x0203a04c -_08074854: .4byte 0x02020630 -_08074858: .4byte 0x060102c0 -_0807485C: .4byte 0x06010a00 + .pool thumb_func_end sub_80747D8 thumb_func_start healthbar_draw_field_maybe @@ -235984,7 +227189,7 @@ healthbar_draw_field_maybe: @ 8074860 lsrs r6, r0, 24 lsls r2, 24 lsrs r7, r2, 24 - ldr r1, _08074A0C + ldr r1, =0x02020630 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -236002,7 +227207,7 @@ healthbar_draw_field_maybe: @ 8074860 mov r0, r9 bl battle_side_get_owner _0807489C: - ldr r1, _08074A0C + ldr r1, =0x02020630 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -236113,10 +227318,10 @@ _0807495E: movs r1, 0x19 bl pokemon_getattr adds r3, r0, 0 - ldr r0, _08074A10 + ldr r0, =0x0831f72c mov r12, r0 lsls r1, r4, 2 - ldr r2, _08074A14 + ldr r2, =0x083203cc lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -236178,9 +227383,7 @@ _080749F6: bl sub_80747D8 b _08074A8E .align 2, 0 -_08074A0C: .4byte 0x02020630 -_08074A10: .4byte 0x0831f72c -_08074A14: .4byte 0x083203cc + .pool _08074A18: cmp r7, 0x3 beq _08074A20 @@ -236266,7 +227469,7 @@ sub_8074AA0: @ 8074AA0 mov r9, r2 cmp r2, 0 bne _08074AEC - ldr r0, _08074AE8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0xC] mov r1, r8 @@ -236287,9 +227490,9 @@ sub_8074AA0: @ 8074AA0 adds r7, r5, 0 b _08074B48 .align 2, 0 -_08074AE8: .4byte 0x020244d0 + .pool _08074AEC: - ldr r2, _08074B98 + ldr r2, =0x020244d0 mov r10, r2 ldr r0, [r2] ldr r2, [r0, 0xC] @@ -236340,7 +227543,7 @@ _08074B48: beq _08074B64 cmp r2, 0 bne _08074B6C - ldr r0, _08074B98 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] adds r0, r7, r0 @@ -236358,7 +227561,7 @@ _08074B6C: negs r0, r0 cmp r4, r0 bne _08074B86 - ldr r0, _08074B98 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0xC] mov r2, r8 @@ -236378,7 +227581,7 @@ _08074B86: pop {r1} bx r1 .align 2, 0 -_08074B98: .4byte 0x020244d0 + .pool thumb_func_end sub_8074AA0 thumb_func_start sub_8074B9C @@ -236398,7 +227601,7 @@ sub_8074B9C: @ 8074B9C beq _08074CA0 b _08074D9E _08074BB8: - ldr r0, _08074C4C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0xC] lsls r5, r6, 2 @@ -236429,10 +227632,10 @@ _08074BB8: mov r9, r4 _08074BF4: movs r5, 0 - ldr r0, _08074C50 + ldr r0, =0x02020630 mov r8, r0 _08074BFA: - ldr r0, _08074C4C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0xC] adds r0, r7, r6 @@ -236466,16 +227669,13 @@ _08074BFA: adds r2, r5, 0x2 adds r1, r2 lsls r1, 5 - ldr r2, _08074C54 + ldr r2, =0x06010000 adds r1, r2 - ldr r2, _08074C58 + ldr r2, =0x04000008 bl CpuSet b _08074C8A .align 2, 0 -_08074C4C: .4byte 0x020244d0 -_08074C50: .4byte 0x02020630 -_08074C54: .4byte 0x06010000 -_08074C58: .4byte 0x04000008 + .pool _08074C5C: mov r0, r9 bl sub_80728A4 @@ -236494,9 +227694,9 @@ _08074C5C: lsrs r1, 22 adds r1, r5, r1 lsls r1, 5 - ldr r4, _08074C98 + ldr r4, =0x06010040 adds r1, r4 - ldr r2, _08074C9C + ldr r2, =0x04000008 bl CpuSet _08074C8A: adds r0, r5, 0x1 @@ -236506,10 +227706,9 @@ _08074C8A: bls _08074BFA b _08074D9E .align 2, 0 -_08074C98: .4byte 0x06010040 -_08074C9C: .4byte 0x04000008 + .pool _08074CA0: - ldr r0, _08074D44 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0xC] lsls r5, r6, 2 @@ -236525,13 +227724,13 @@ _08074CA0: movs r4, 0x8 str r4, [sp, 0x4] bl sub_8074E8C - ldr r1, _08074D48 + ldr r1, =0x0202406e lsls r0, r6, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08074D4C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 bl pokemon_getattr @@ -236554,7 +227753,7 @@ _08074CE6: bls _08074CE6 _08074CF8: movs r5, 0 - ldr r0, _08074D50 + ldr r0, =0x02020630 mov r8, r0 adds r0, r7, r6 lsls r4, r0, 2 @@ -236569,7 +227768,7 @@ _08074D02: ldrb r1, [r1] lsls r1, 5 adds r0, r1 - ldr r1, _08074D44 + ldr r1, =0x020244d0 ldr r1, [r1] ldr r1, [r1, 0xC] adds r1, r4, r1 @@ -236585,18 +227784,13 @@ _08074D02: adds r2, 0x24 adds r1, r2 lsls r1, 5 - ldr r2, _08074D54 + ldr r2, =0x06010000 adds r1, r2 - ldr r2, _08074D58 + ldr r2, =0x04000008 bl CpuSet b _08074D94 .align 2, 0 -_08074D44: .4byte 0x020244d0 -_08074D48: .4byte 0x0202406e -_08074D4C: .4byte 0x020244ec -_08074D50: .4byte 0x02020630 -_08074D54: .4byte 0x06010000 -_08074D58: .4byte 0x04000008 + .pool _08074D5C: movs r0, 0xC bl sub_80728A4 @@ -236606,7 +227800,7 @@ _08074D5C: ldrb r1, [r1] lsls r1, 5 adds r0, r1 - ldr r1, _08074DAC + ldr r1, =0x020244d0 ldr r1, [r1] ldr r1, [r1, 0xC] adds r1, r4, r1 @@ -236620,9 +227814,9 @@ _08074D5C: lsrs r1, 22 adds r1, r5, r1 lsls r1, 5 - ldr r2, _08074DB0 + ldr r2, =0x06010b80 adds r1, r2 - ldr r2, _08074DB4 + ldr r2, =0x04000008 bl CpuSet _08074D94: adds r0, r5, 0x1 @@ -236639,9 +227833,7 @@ _08074D9E: pop {r0} bx r0 .align 2, 0 -_08074DAC: .4byte 0x020244d0 -_08074DB0: .4byte 0x06010b80 -_08074DB4: .4byte 0x04000008 + .pool thumb_func_end sub_8074B9C thumb_func_start sub_8074DB8 @@ -236660,7 +227852,7 @@ sub_8074DB8: @ 8074DB8 lsls r1, 27 lsrs r2, r1, 24 ldr r1, [r5] - ldr r0, _08074DE4 + ldr r0, =0xffff8000 cmp r1, r0 bne _08074DEA cmp r7, r2 @@ -236669,7 +227861,7 @@ sub_8074DB8: @ 8074DB8 str r0, [r5] b _08074DEA .align 2, 0 -_08074DE4: .4byte 0xffff8000 + .pool _08074DE8: str r4, [r5] _08074DEA: @@ -237068,7 +228260,7 @@ write_to_rbox: @ 8075094 mov r9, r2 adds r5, r3, 0 ldr r7, [sp, 0x40] - ldr r0, _08075128 + ldr r0, =0x0832c3f8 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x18] @@ -237128,7 +228320,7 @@ write_to_rbox: @ 8075094 pop {r1} bx r1 .align 2, 0 -_08075128: .4byte 0x0832c3f8 + .pool thumb_func_end write_to_rbox thumb_func_start sub_807512C @@ -237154,7 +228346,7 @@ sub_807513C: @ 807513C adds r0, r1 str r0, [sp] lsls r2, 3 - ldr r0, _0807516C + ldr r0, =0x001fffff ands r2, r0 movs r0, 0xA0 lsls r0, 19 @@ -237166,7 +228358,7 @@ sub_807513C: @ 807513C pop {r0} bx r0 .align 2, 0 -_0807516C: .4byte 0x001fffff + .pool thumb_func_end sub_807513C thumb_func_start sub_8075170 @@ -237178,7 +228370,7 @@ sub_8075170: @ 8075170 lsls r1, 1 adds r0, r1 lsls r2, 3 - ldr r1, _08075194 + ldr r1, =0x001fffff ands r2, r1 movs r1, 0x80 lsls r1, 19 @@ -237188,7 +228380,7 @@ sub_8075170: @ 8075170 pop {r0} bx r0 .align 2, 0 -_08075194: .4byte 0x001fffff + .pool thumb_func_end sub_8075170 thumb_func_start sub_8075198 @@ -237202,7 +228394,7 @@ sub_8075198: @ 8075198 adds r0, r5, r1 adds r1, r6, r1 lsls r2, r4, 3 - ldr r3, _080751DC + ldr r3, =0x001fffff ands r2, r3 movs r3, 0x80 lsls r3, 19 @@ -237215,7 +228407,7 @@ _080751BC: adds r0, 0x14 adds r1, r6, 0 adds r1, 0x14 - ldr r2, _080751E0 + ldr r2, =0x04000003 bl CpuSet adds r6, 0x20 adds r5, 0x20 @@ -237227,8 +228419,7 @@ _080751D4: pop {r0} bx r0 .align 2, 0 -_080751DC: .4byte 0x001fffff -_080751E0: .4byte 0x04000003 + .pool thumb_func_end sub_8075198 thumb_func_start sub_80751E4 @@ -237237,7 +228428,7 @@ sub_80751E4: @ 80751E4 adds r6, r0, 0 adds r5, r1, 0 lsls r4, r2, 3 - ldr r0, _08075218 + ldr r0, =0x001fffff ands r4, r0 movs r0, 0x80 lsls r0, 19 @@ -237258,7 +228449,7 @@ sub_80751E4: @ 80751E4 pop {r0} bx r0 .align 2, 0 -_08075218: .4byte 0x001fffff + .pool thumb_func_end sub_80751E4 thumb_func_start sub_807521C @@ -237274,19 +228465,19 @@ sub_807521C: @ 807521C lsrs r7, r1, 16 lsls r2, 24 lsrs r4, r2, 24 - ldr r5, _08075354 + ldr r5, =0x0831c620 ldrh r0, [r5, 0x6] bl gpu_tile_obj_tag_get_range_start lsls r0, 16 - ldr r1, _08075358 + ldr r1, =0xffff0000 cmp r0, r1 bne _0807524E adds r0, r5, 0 bl gpu_tile_obj_decompress_and_load3 - ldr r0, _0807535C + ldr r0, =0x0831c628 bl gpu_pal_obj_decompress_and_apply3 _0807524E: - ldr r0, _08075360 + ldr r0, =sub_8075370 + 1 bl object_new_hidden_with_callback mov r8, r0 mov r0, r8 @@ -237296,15 +228487,15 @@ _0807524E: lsls r5, r0, 4 add r5, r8 lsls r5, 2 - ldr r0, _08075364 + ldr r0, =0x02020630 adds r5, r0 strh r4, [r5, 0x30] - ldr r0, _08075368 + ldr r0, =0x0831c688 mov r9, r0 lsls r6, 16 asrs r0, r6, 16 mov r10, r0 - ldr r0, _0807536C + ldr r0, =0xfff00000 adds r6, r0 asrs r6, 16 lsls r4, r7, 16 @@ -237321,7 +228512,7 @@ _0807524E: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08075364 + ldr r0, =0x02020630 adds r1, r0 mov r0, r8 strh r0, [r1, 0x2E] @@ -237340,7 +228531,7 @@ _0807524E: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08075364 + ldr r0, =0x02020630 adds r4, r0 mov r0, r8 strh r0, [r4, 0x2E] @@ -237362,7 +228553,7 @@ _0807524E: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08075364 + ldr r0, =0x02020630 adds r4, r0 mov r0, r8 strh r0, [r4, 0x2E] @@ -237384,7 +228575,7 @@ _0807524E: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08075364 + ldr r0, =0x02020630 adds r4, r0 mov r0, r8 strh r0, [r4, 0x2E] @@ -237405,13 +228596,7 @@ _0807524E: pop {r1} bx r1 .align 2, 0 -_08075354: .4byte 0x0831c620 -_08075358: .4byte 0xffff0000 -_0807535C: .4byte 0x0831c628 -_08075360: .4byte sub_8075370 + 1 -_08075364: .4byte 0x02020630 -_08075368: .4byte 0x0831c688 -_0807536C: .4byte 0xfff00000 + .pool thumb_func_end sub_807521C thumb_func_start sub_8075370 @@ -237422,10 +228607,10 @@ sub_8075370: @ 8075370 ldrsh r0, [r4, r1] cmp r0, 0 bne _080753A8 - ldr r0, _0807539C + ldr r0, =0x0831c620 ldrh r0, [r0, 0x6] bl gpu_tile_obj_free_by_tag - ldr r0, _080753A0 + ldr r0, =0x0831c628 ldrh r0, [r0, 0x4] bl gpu_pal_free_tag movs r1, 0x30 @@ -237436,17 +228621,16 @@ sub_8075370: @ 8075370 bl obj_delete_and_free_tiles b _080753A8 .align 2, 0 -_0807539C: .4byte 0x0831c620 -_080753A0: .4byte 0x0831c628 + .pool _080753A4: - ldr r0, _080753B0 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _080753A8: pop {r4} pop {r0} bx r0 .align 2, 0 -_080753B0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8075370 thumb_func_start sub_80753B4 @@ -237459,7 +228643,7 @@ sub_80753B4: @ 80753B4 ands r0, r1 cmp r0, 0 beq _080753DE - ldr r2, _080753E4 + ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -237475,7 +228659,7 @@ _080753DE: pop {r0} bx r0 .align 2, 0 -_080753E4: .4byte 0x02020630 + .pool thumb_func_end sub_80753B4 thumb_func_start sub_80753E8 @@ -237487,12 +228671,12 @@ sub_80753E8: @ 80753E8 lsrs r4, 16 lsls r5, 24 lsrs r5, 24 - ldr r1, _0807543C + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] - ldr r0, _08075440 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r6, _08075444 + ldr r6, =0x02024064 ldrb r1, [r6] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -237503,12 +228687,12 @@ sub_80753E8: @ 80753E8 movs r2, 0x8 orrs r1, r2 strb r1, [r0] - ldr r0, _08075448 + ldr r0, =sub_8075450 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0807544C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -237522,11 +228706,7 @@ sub_80753E8: @ 80753E8 pop {r1} bx r1 .align 2, 0 -_0807543C: .4byte 0x020244b9 -_08075440: .4byte 0x020244d0 -_08075444: .4byte 0x02024064 -_08075448: .4byte sub_8075450 + 1 -_0807544C: .4byte 0x03005e00 + .pool thumb_func_end sub_80753E8 thumb_func_start sub_8075450 @@ -237542,7 +228722,7 @@ sub_8075450: @ 8075450 mov r10, r0 movs r0, 0 str r0, [sp] - ldr r1, _08075484 + ldr r1, =0x03005e00 mov r2, r10 lsls r0, r2, 2 add r0, r10 @@ -237557,7 +228737,7 @@ sub_8075450: @ 8075450 strh r0, [r1, 0x8] b _08075602 .align 2, 0 -_08075484: .4byte 0x03005e00 + .pool _08075488: ldrh r0, [r1, 0xC] mov r8, r0 @@ -237567,25 +228747,24 @@ _08075488: lsls r0, 24 cmp r0, 0 beq _080754B4 - ldr r1, _080754AC + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080754B0 + ldr r1, =0x02024744 b _080754C2 .align 2, 0 -_080754AC: .4byte 0x0202406e -_080754B0: .4byte 0x02024744 + .pool _080754B4: - ldr r1, _08075530 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08075534 + ldr r1, =0x020244ec _080754C2: adds r0, r1 movs r1, 0x26 @@ -237601,7 +228780,7 @@ _080754C2: lsls r0, r4, 1 adds r0, r4 lsls r0, 3 - ldr r1, _08075538 + ldr r1, =0x0832c588 adds r0, r1 movs r1, 0x20 movs r2, 0x50 @@ -237609,7 +228788,7 @@ _080754C2: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _0807553C + ldr r2, =0x02020630 mov r9, r2 lsls r0, r7, 4 adds r0, r7 @@ -237626,7 +228805,7 @@ _080754C2: beq _08075548 cmp r2, 0xFF bne _08075584 - ldr r0, _08075540 + ldr r0, =0x0202420c strb r5, [r0] movs r0, 0x18 strh r0, [r4, 0x20] @@ -237635,16 +228814,11 @@ _080754C2: mov r0, r9 adds r0, 0x1C adds r0, r6, r0 - ldr r1, _08075544 + ldr r1, =sub_80761B4 + 1 str r1, [r0] b _08075592 .align 2, 0 -_08075530: .4byte 0x0202406e -_08075534: .4byte 0x020244ec -_08075538: .4byte 0x0832c588 -_0807553C: .4byte 0x02020630 -_08075540: .4byte 0x0202420c -_08075544: .4byte sub_80761B4 + 1 + .pool _08075548: adds r0, r5, 0 movs r1, 0 @@ -237659,33 +228833,32 @@ _08075548: lsrs r0, 24 adds r0, 0x18 strh r0, [r4, 0x22] - ldr r0, _0807557C + ldr r0, =0x0202420c strb r5, [r0] movs r3, 0 strh r3, [r4, 0x2E] mov r0, r9 adds r0, 0x1C adds r0, r6, r0 - ldr r1, _08075580 + ldr r1, =sub_8076398 + 1 str r1, [r0] b _08075592 .align 2, 0 -_0807557C: .4byte 0x0202420c -_08075580: .4byte sub_8076398 + 1 + .pool _08075584: movs r0, 0x1 bl battle_get_side_with_given_state - ldr r1, _080755B0 + ldr r1, =0x0202420c strb r0, [r1] movs r0, 0x1 str r0, [sp] _08075592: - ldr r0, _080755B4 + ldr r0, =0x02020630 lsls r1, r7, 4 adds r1, r7 lsls r1, 2 adds r4, r1, r0 - ldr r5, _080755B0 + ldr r5, =0x0202420c ldrb r0, [r5] strh r0, [r4, 0x3A] ldr r2, [sp] @@ -237695,8 +228868,7 @@ _08075592: bl remove_task b _08075602 .align 2, 0 -_080755B0: .4byte 0x0202420c -_080755B4: .4byte 0x02020630 + .pool _080755B8: movs r0, 0x22 strh r0, [r4, 0x2E] @@ -237713,13 +228885,13 @@ _080755B8: lsrs r0, 24 subs r0, 0x10 strh r0, [r4, 0x36] - ldr r0, _08075614 + ldr r0, =0x0000ffd8 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 mov r3, r10 strh r3, [r4, 0x6] - ldr r1, _08075618 + ldr r1, =0x03005e00 mov r2, r10 lsls r0, r2, 2 add r0, r10 @@ -237727,7 +228899,7 @@ _080755B8: adds r0, r1 ldrb r1, [r5] strh r1, [r0, 0x10] - ldr r1, _0807561C + ldr r1, =nullsub_4 + 1 str r1, [r0] movs r0, 0x3D bl audio_play @@ -237741,9 +228913,7 @@ _08075602: pop {r0} bx r0 .align 2, 0 -_08075614: .4byte 0x0000ffd8 -_08075618: .4byte 0x03005e00 -_0807561C: .4byte nullsub_4 + 1 + .pool thumb_func_end sub_8075450 thumb_func_start objc_0804ABD4 @@ -237758,7 +228928,7 @@ objc_0804ABD4: @ 8075620 cmp r0, 0 beq _080756C0 ldrb r6, [r7, 0x6] - ldr r1, _080756CC + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -237819,7 +228989,7 @@ objc_0804ABD4: @ 8075620 strh r0, [r7, 0x3C] adds r0, r6, 0 bl remove_task - ldr r0, _080756D0 + ldr r0, =sub_80756D4 + 1 str r0, [r7, 0x1C] _080756C0: add sp, 0x4 @@ -237829,17 +228999,16 @@ _080756C0: pop {r0} bx r0 .align 2, 0 -_080756CC: .4byte 0x03005e00 -_080756D0: .4byte sub_80756D4 + 1 + .pool thumb_func_end objc_0804ABD4 thumb_func_start sub_80756D4 sub_80756D4: @ 80756D4 - ldr r1, _080756DC + ldr r1, =sub_80756E0 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_080756DC: .4byte sub_80756E0 + 1 + .pool thumb_func_end sub_80756D4 thumb_func_start sub_80756E0 @@ -237855,9 +229024,9 @@ sub_80756E0: @ 80756E0 cmp r0, 0xA bne _0807573A strh r7, [r6, 0x38] - ldr r0, _08075740 + ldr r0, =sub_807574C + 1 str r0, [r6, 0x1C] - ldr r5, _08075744 + ldr r5, =0x020241e4 movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r5 @@ -237865,7 +229034,7 @@ sub_80756E0: @ 80756E0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08075748 + ldr r4, =0x02020630 adds r0, r4 movs r1, 0x2 bl sub_8008258 @@ -237892,9 +229061,7 @@ _0807573A: pop {r0} bx r0 .align 2, 0 -_08075740: .4byte sub_807574C + 1 -_08075744: .4byte 0x020241e4 -_08075748: .4byte 0x02020630 + .pool thumb_func_end sub_80756E0 thumb_func_start sub_807574C @@ -237911,8 +229078,8 @@ sub_807574C: @ 807574C movs r0, 0x3C bl audio_play _08075764: - ldr r6, _080757B0 - ldr r5, _080757B4 + ldr r6, =0x02020630 + ldr r5, =0x020241e4 movs r1, 0x3A ldrsh r0, [r4, r1] adds r0, r5 @@ -237945,13 +229112,11 @@ _08075764: strb r1, [r0] movs r0, 0 strh r0, [r4, 0x38] - ldr r0, _080757B8 + ldr r0, =sub_80757E4 + 1 str r0, [r4, 0x1C] b _080757DC .align 2, 0 -_080757B0: .4byte 0x02020630 -_080757B4: .4byte 0x020241e4 -_080757B8: .4byte sub_80757E4 + 1 + .pool _080757BC: ldrh r0, [r1, 0x30] adds r0, 0x60 @@ -238009,14 +229174,14 @@ sub_80757E4: @ 80757E4 bl cosine negs r0, r0 strh r0, [r4, 0x26] - ldr r0, _08075834 + ldr r0, =sub_8075838 + 1 str r0, [r4, 0x1C] _0807582C: pop {r4} pop {r0} bx r0 .align 2, 0 -_08075834: .4byte sub_8075838 + 1 + .pool thumb_func_end sub_80757E4 thumb_func_start sub_8075838 @@ -238054,7 +229219,7 @@ _0807584E: ldrh r0, [r4, 0x36] subs r0, 0xA strh r0, [r4, 0x36] - ldr r1, _08075898 + ldr r1, =0x00000101 adds r0, r2, r1 strh r0, [r4, 0x34] lsls r0, 16 @@ -238071,7 +229236,7 @@ _0807588A: beq _080758A2 b _080758BA .align 2, 0 -_08075898: .4byte 0x00000101 + .pool _0807589C: cmp r0, 0x3 beq _080758B2 @@ -238111,7 +229276,7 @@ _080758C2: cmp r1, 0 bgt _080758EE strh r5, [r4, 0x38] - ldr r0, _08075914 + ldr r0, =0xffffff00 ands r0, r2 strh r0, [r4, 0x34] _080758EE: @@ -238130,14 +229295,13 @@ _080758EE: ldrsh r0, [r4, r2] cmp r0, 0 bne _0807591C - ldr r0, _08075918 + ldr r0, =sub_8075D14 + 1 str r0, [r4, 0x1C] b _08075926 .align 2, 0 -_08075914: .4byte 0xffffff00 -_08075918: .4byte sub_8075D14 + 1 + .pool _0807591C: - ldr r0, _0807592C + ldr r0, =sub_8075930 + 1 str r0, [r4, 0x1C] movs r0, 0x1 strh r0, [r4, 0x36] @@ -238147,7 +229311,7 @@ _08075926: pop {r0} bx r0 .align 2, 0 -_0807592C: .4byte sub_8075930 + 1 + .pool thumb_func_end sub_8075838 thumb_func_start sub_8075930 @@ -238172,7 +229336,7 @@ sub_8075930: @ 8075930 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r0, _0807596C + ldr r0, =sub_8075970 + 1 str r0, [r4, 0x1C] movs r0, 0x17 bl audio_play @@ -238181,7 +229345,7 @@ _08075964: pop {r0} bx r0 .align 2, 0 -_0807596C: .4byte sub_8075970 + 1 + .pool thumb_func_end sub_8075930 thumb_func_start sub_8075970 @@ -238194,12 +229358,12 @@ sub_8075970: @ 8075970 cmp r1, 0x4 bhi _08075A70 lsls r0, r1, 2 - ldr r1, _08075988 + ldr r1, =_0807598C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08075988: .4byte _0807598C + .pool .align 2, 0 _0807598C: .4byte _080759A0 @@ -238289,21 +229453,21 @@ _08075A26: ldrsh r1, [r4, r2] cmp r0, r1 bne _08075A48 - ldr r0, _08075A44 + ldr r0, =sub_8075D14 + 1 str r0, [r4, 0x1C] b _08075AB6 .align 2, 0 -_08075A44: .4byte sub_8075D14 + 1 + .pool _08075A48: cmp r1, 0x4 bne _08075A5C cmp r0, 0x3 bne _08075A5C - ldr r0, _08075A58 + ldr r0, =sub_8075FB4 + 1 str r0, [r4, 0x1C] b _08075A62 .align 2, 0 -_08075A58: .4byte sub_8075FB4 + 1 + .pool _08075A5C: ldrh r0, [r4, 0x34] adds r0, 0x1 @@ -238327,7 +229491,7 @@ _08075A70: movs r0, 0 strh r0, [r4, 0x38] ldrh r1, [r4, 0x34] - ldr r0, _08075AA4 + ldr r0, =0xffffff00 ands r0, r1 strh r0, [r4, 0x34] adds r0, r4, 0 @@ -238342,7 +229506,7 @@ _08075A70: bl sub_8008258 b _08075AB0 .align 2, 0 -_08075AA4: .4byte 0xffffff00 + .pool _08075AA8: adds r0, r4, 0 movs r1, 0x1 @@ -238363,7 +229527,7 @@ c3_0804B070: @ 8075ABC push {r7} lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _08075AFC + ldr r2, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -238385,13 +229549,12 @@ c3_0804B070: @ 8075ABC cmp r0, 0x20 bhi _08075B88 lsls r0, 2 - ldr r1, _08075B00 + ldr r1, =_08075B04 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08075AFC: .4byte 0x03005e00 -_08075B00: .4byte _08075B04 + .pool .align 2, 0 _08075B04: .4byte _08075B88 @@ -238428,7 +229591,7 @@ _08075B04: .4byte _08075C7E .4byte _08075CA8 _08075B88: - ldr r0, _08075BB0 + ldr r0, =0x02020630 lsls r1, r7, 4 adds r1, r7 lsls r1, 2 @@ -238449,7 +229612,7 @@ _08075B9E: strh r1, [r0, 0x26] b _08075D04 .align 2, 0 -_08075BB0: .4byte 0x02020630 + .pool _08075BB4: adds r0, r3, 0 bl sub_805F110 @@ -238470,7 +229633,7 @@ _08075BCC: b _08075C2E _08075BDA: bl sub_80A369C - ldr r1, _08075BF4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -238481,7 +229644,7 @@ _08075BDA: strh r1, [r0, 0x26] b _08075D04 .align 2, 0 -_08075BF4: .4byte 0x03005e00 + .pool _08075BF8: lsls r0, r4, 2 adds r0, r4 @@ -238509,7 +229672,7 @@ _08075C22: movs r2, 0xC bl sub_80A3344 _08075C2E: - ldr r0, _08075C50 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] mov r2, r8 @@ -238526,7 +229689,7 @@ _08075C2E: bl remove_task b _08075D04 .align 2, 0 -_08075C50: .4byte 0x020244d0 + .pool _08075C54: lsls r0, r4, 2 adds r0, r4 @@ -238556,7 +229719,7 @@ _08075C7E: cmp r0, 0 bne _08075D04 bl sub_80A369C - ldr r0, _08075CA4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -238568,7 +229731,7 @@ _08075C7E: strh r0, [r1, 0x26] b _08075D04 .align 2, 0 -_08075CA4: .4byte 0x03005e00 + .pool _08075CA8: lsls r0, r4, 2 adds r0, r4 @@ -238601,7 +229764,7 @@ _08075CD8: movs r2, 0xB bl sub_80A3344 _08075CE4: - ldr r0, _08075D10 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] mov r2, r8 @@ -238623,7 +229786,7 @@ _08075D04: pop {r0} bx r0 .align 2, 0 -_08075D10: .4byte 0x020244d0 + .pool thumb_func_end c3_0804B070 thumb_func_start sub_8075D14 @@ -238670,10 +229833,10 @@ sub_8075D14: @ 8075D14 lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x2E] - ldr r0, _08075DAC + ldr r0, =sub_8075FD4 + 1 str r0, [r6, 0x1C] - ldr r0, _08075DB0 - ldr r1, _08075DB4 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -238687,31 +229850,27 @@ _08075D88: lsls r0, 24 cmp r0, 0 beq _08075DC0 - ldr r0, _08075DB8 + ldr r0, =0x0202406e lsls r2, r5, 1 adds r0, r2, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08075DBC + ldr r0, =0x02024744 adds r7, r1, r0 movs r4, 0x19 mov r10, r4 b _08075DD4 .align 2, 0 -_08075DAC: .4byte sub_8075FD4 + 1 -_08075DB0: .4byte 0x030022c0 -_08075DB4: .4byte 0x00000439 -_08075DB8: .4byte 0x0202406e -_08075DBC: .4byte 0x02024744 + .pool _08075DC0: - ldr r0, _08075E38 + ldr r0, =0x0202406e lsls r2, r5, 1 adds r0, r2, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08075E3C + ldr r0, =0x020244ec adds r7, r1, r0 movs r0, 0xE7 mov r10, r0 @@ -238740,7 +229899,7 @@ _08075E00: lsls r0, 24 cmp r0, 0 beq _08075E56 - ldr r0, _08075E40 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r1, [r0, 0x9] @@ -238748,7 +229907,7 @@ _08075E00: ands r0, r1 cmp r0, 0 beq _08075E56 - ldr r0, _08075E44 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 @@ -238758,18 +229917,14 @@ _08075E00: lsls r0, 24 cmp r0, 0 beq _08075E56 - ldr r0, _08075E48 + ldr r0, =0x03007420 bl MPlayStop_rev01 b _08075E56 .align 2, 0 -_08075E38: .4byte 0x0202406e -_08075E3C: .4byte 0x020244ec -_08075E40: .4byte 0x020244d0 -_08075E44: .4byte 0x02022fec -_08075E48: .4byte 0x03007420 + .pool _08075E4C: - ldr r0, _08075E74 - ldr r1, _08075E78 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 bl MPlayVolumeControl _08075E56: @@ -238777,7 +229932,7 @@ _08075E56: lsls r0, 24 cmp r0, 0 beq _08075E70 - ldr r0, _08075E7C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r1, [r0, 0x9] @@ -238789,9 +229944,7 @@ _08075E70: movs r4, 0 b _08075EA2 .align 2, 0 -_08075E74: .4byte 0x03007420 -_08075E78: .4byte 0x0000ffff -_08075E7C: .4byte 0x020244d0 + .pool _08075E80: movs r0, 0 bl battle_get_side_with_given_state @@ -238811,7 +229964,7 @@ _08075E9C: _08075EA0: movs r4, 0x2 _08075EA2: - ldr r0, _08075F38 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] mov r2, r8 @@ -238822,12 +229975,12 @@ _08075EA2: movs r2, 0x40 orrs r0, r2 strb r0, [r1, 0x1] - ldr r0, _08075F3C + ldr r0, =c3_0804B070 + 1 movs r1, 0x3 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08075F40 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -238841,7 +229994,7 @@ _08075EA2: strh r0, [r1, 0xA] strh r4, [r1, 0xC] strh r5, [r1, 0xE] - ldr r2, _08075F44 + ldr r2, =0x020241e4 movs r4, 0x3A ldrsh r0, [r6, r4] adds r0, r2 @@ -238852,7 +230005,7 @@ _08075EA2: strh r7, [r1, 0x14] strh r3, [r1, 0x26] _08075EF4: - ldr r4, _08075F44 + ldr r4, =0x020241e4 movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r4 @@ -238860,7 +230013,7 @@ _08075EF4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08075F48 + ldr r5, =0x02020630 adds r0, r5 movs r1, 0x1 bl sub_8008258 @@ -238882,15 +230035,10 @@ _08075EF4: adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08075F4C + ldr r1, =sub_8039B58 + 1 b _08075F66 .align 2, 0 -_08075F38: .4byte 0x020244d0 -_08075F3C: .4byte c3_0804B070 + 1 -_08075F40: .4byte 0x03005e00 -_08075F44: .4byte 0x020241e4 -_08075F48: .4byte 0x02020630 -_08075F4C: .4byte sub_8039B58 + 1 + .pool _08075F50: movs r1, 0x3A ldrsh r0, [r6, r1] @@ -238902,10 +230050,10 @@ _08075F50: adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08075FA8 + ldr r1, =sub_8039E44 + 1 _08075F66: str r1, [r0] - ldr r5, _08075FAC + ldr r5, =0x020241e4 movs r2, 0x3A ldrsh r0, [r6, r2] adds r0, r5 @@ -238913,7 +230061,7 @@ _08075F66: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08075FB0 + ldr r4, =0x02020630 adds r0, r4 bl obj_anim_step movs r1, 0x3A @@ -238936,9 +230084,7 @@ _08075F66: pop {r0} bx r0 .align 2, 0 -_08075FA8: .4byte sub_8039E44 + 1 -_08075FAC: .4byte 0x020241e4 -_08075FB0: .4byte 0x02020630 + .pool thumb_func_end sub_8075D14 thumb_func_start sub_8075FB4 @@ -238949,7 +230095,7 @@ sub_8075FB4: @ 8075FB4 movs r2, 0x40 orrs r1, r2 strb r1, [r3] - ldr r1, _08075FD0 + ldr r1, =sub_80760F8 + 1 str r1, [r0, 0x1C] movs r1, 0 strh r1, [r0, 0x34] @@ -238957,7 +230103,7 @@ sub_8075FB4: @ 8075FB4 strh r1, [r0, 0x38] bx lr .align 2, 0 -_08075FD0: .4byte sub_80760F8 + 1 + .pool thumb_func_end sub_8075FB4 thumb_func_start sub_8075FD4 @@ -238968,8 +230114,8 @@ sub_8075FD4: @ 8075FD4 ldrh r0, [r5, 0x3A] lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _08076038 - ldr r0, _0807603C + ldr r4, =0x02020630 + ldr r0, =0x020241e4 adds r3, r6, r0 ldrb r1, [r3] lsls r0, r1, 4 @@ -239013,10 +230159,9 @@ _08076016: movs r7, 0x1 b _0807605C .align 2, 0 -_08076038: .4byte 0x02020630 -_0807603C: .4byte 0x020241e4 + .pool _08076040: - ldr r2, _080760E4 + ldr r2, =0xfffffee0 adds r0, r2, 0 ldrh r2, [r1, 0x30] adds r0, r2 @@ -239040,8 +230185,8 @@ _0807605C: beq _080760DE cmp r7, 0 beq _080760DE - ldr r2, _080760E8 - ldr r0, _080760EC + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r6, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -239051,9 +230196,9 @@ _0807605C: movs r2, 0 movs r1, 0 strh r1, [r0, 0x26] - ldr r0, _080760F0 + ldr r0, =0x020244b9 strb r2, [r0] - ldr r4, _080760F4 + ldr r4, =0x020244d0 ldr r0, [r4] ldr r0, [r0, 0x4] lsls r1, r6, 1 @@ -239101,11 +230246,7 @@ _080760DE: pop {r0} bx r0 .align 2, 0 -_080760E4: .4byte 0xfffffee0 -_080760E8: .4byte 0x02020630 -_080760EC: .4byte 0x020241e4 -_080760F0: .4byte 0x020244b9 -_080760F4: .4byte 0x020244d0 + .pool thumb_func_end sub_8075FD4 thumb_func_start sub_80760F8 @@ -239124,22 +230265,21 @@ sub_80760F8: @ 80760F8 beq _08076196 cmp r1, 0x5F bne _08076130 - ldr r0, _08076128 + ldr r0, =0x020244b9 movs r1, 0 strb r1, [r0] bl m4aMPlayAllStop - ldr r0, _0807612C + ldr r0, =0x00000173 bl audio_play b _08076196 .align 2, 0 -_08076128: .4byte 0x020244b9 -_0807612C: .4byte 0x00000173 + .pool _08076130: - ldr r0, _0807619C + ldr r0, =0x0000013b cmp r1, r0 bne _08076196 - ldr r5, _080761A0 - ldr r4, _080761A4 + ldr r5, =0x02020630 + ldr r4, =0x020241e4 movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r4 @@ -239163,15 +230303,15 @@ _08076130: bl obj_delete_and_free_tiles adds r0, r6, 0 bl obj_delete_and_free_resources - ldr r0, _080761A8 - ldr r1, _080761AC + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _08076196 - ldr r0, _080761B0 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] lsls r1, r7, 1 @@ -239188,12 +230328,7 @@ _08076196: pop {r0} bx r0 .align 2, 0 -_0807619C: .4byte 0x0000013b -_080761A0: .4byte 0x02020630 -_080761A4: .4byte 0x020241e4 -_080761A8: .4byte 0x030022c0 -_080761AC: .4byte 0x00000439 -_080761B0: .4byte 0x020244d0 + .pool thumb_func_end sub_80760F8 thumb_func_start sub_80761B4 @@ -239219,20 +230354,19 @@ sub_80761B4: @ 80761B4 lsrs r0, 24 adds r0, 0x18 strh r0, [r4, 0x36] - ldr r0, _080761FC + ldr r0, =0x0000ffe2 strh r0, [r4, 0x38] ldrh r0, [r4, 0x3A] strh r0, [r4, 0x6] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, _08076200 + ldr r0, =sub_8076204 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_080761FC: .4byte 0x0000ffe2 -_08076200: .4byte sub_8076204 + 1 + .pool thumb_func_end sub_80761B4 thumb_func_start sub_8076204 @@ -239379,7 +230513,7 @@ _080762F8: lsls r0, 24 cmp r0, 0 beq _08076358 - ldr r0, _08076350 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r1, [r0, 0x9] @@ -239395,13 +230529,12 @@ _080762F8: lsrs r0, 24 cmp r4, r0 bne _08076358 - ldr r0, _08076354 + ldr r0, =sub_8076374 + 1 b _0807635A .align 2, 0 -_08076350: .4byte 0x020244d0 -_08076354: .4byte sub_8076374 + 1 + .pool _08076358: - ldr r0, _08076370 + ldr r0, =sub_8075D14 + 1 _0807635A: str r0, [r5, 0x1C] adds r0, r5, 0 @@ -239414,7 +230547,7 @@ _08076364: pop {r0} bx r0 .align 2, 0 -_08076370: .4byte sub_8075D14 + 1 + .pool thumb_func_end sub_8076204 thumb_func_start sub_8076374 @@ -239430,13 +230563,13 @@ sub_8076374: @ 8076374 ble _0807638E movs r0, 0 strh r0, [r2, 0x2E] - ldr r0, _08076394 + ldr r0, =sub_8075D14 + 1 str r0, [r2, 0x1C] _0807638E: pop {r0} bx r0 .align 2, 0 -_08076394: .4byte sub_8075D14 + 1 + .pool thumb_func_end sub_8076374 thumb_func_start sub_8076398 @@ -239456,7 +230589,7 @@ sub_8076398: @ 8076398 lsls r0, 24 cmp r0, 0 beq _080763E8 - ldr r0, _080763E0 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r1, [r0, 0x9] @@ -239472,13 +230605,12 @@ sub_8076398: @ 8076398 lsrs r0, 24 cmp r4, r0 bne _080763E8 - ldr r0, _080763E4 + ldr r0, =sub_8076374 + 1 b _080763EA .align 2, 0 -_080763E0: .4byte 0x020244d0 -_080763E4: .4byte sub_8076374 + 1 + .pool _080763E8: - ldr r0, _080763F4 + ldr r0, =sub_8075D14 + 1 _080763EA: str r0, [r5, 0x1C] _080763EC: @@ -239486,7 +230618,7 @@ _080763EC: pop {r0} bx r0 .align 2, 0 -_080763F4: .4byte sub_8075D14 + 1 + .pool thumb_func_end sub_8076398 thumb_func_start sub_80763F8 @@ -239563,18 +230695,18 @@ sub_8076438: @ 8076438 str r0, [sp, 0x4] lsls r0, r2, 16 lsrs r7, r0, 16 - ldr r0, _08076510 + ldr r0, =0x0832c400 bl gpu_tile_obj_decompress_and_load3 - ldr r0, _08076514 + ldr r0, =0x0832c460 bl gpu_pal_obj_decompress_and_apply3 - ldr r0, _08076518 + ldr r0, =0x0832c588 mov r1, r9 mov r2, r10 adds r3, r4, 0 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _0807651C + ldr r1, =0x02020630 mov r8, r1 lsls r4, r0, 4 adds r4, r0 @@ -239618,7 +230750,7 @@ sub_8076438: @ 8076438 movs r0, 0x1C add r8, r0 add r4, r8 - ldr r0, _08076520 + ldr r0, =sub_8076524 + 1 str r0, [r4] adds r1, 0x3E ldrb r0, [r1] @@ -239634,11 +230766,7 @@ sub_8076438: @ 8076438 pop {r0} bx r0 .align 2, 0 -_08076510: .4byte 0x0832c400 -_08076514: .4byte 0x0832c460 -_08076518: .4byte 0x0832c588 -_0807651C: .4byte 0x02020630 -_08076520: .4byte sub_8076524 + 1 + .pool thumb_func_end sub_8076438 thumb_func_start sub_8076524 @@ -239698,9 +230826,9 @@ _08076560: lsrs r0, 24 movs r5, 0 strh r0, [r6, 0x30] - ldr r0, _080765C8 + ldr r0, =sub_80765E0 + 1 str r0, [r6, 0x1C] - ldr r0, _080765CC + ldr r0, =0x02020630 lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -239723,8 +230851,7 @@ _08076560: strh r5, [r6, 0x3C] b _080765D4 .align 2, 0 -_080765C8: .4byte sub_80765E0 + 1 -_080765CC: .4byte 0x02020630 + .pool _080765D0: subs r0, r1, 0x1 strh r0, [r6, 0x30] @@ -239763,7 +230890,7 @@ sub_80765E0: @ 80765E0 orrs r0, r1 strb r0, [r2] _08076610: - ldr r1, _080766A4 + ldr r1, =0x02020630 lsls r2, r6, 4 adds r0, r2, r6 lsls r0, 2 @@ -239820,7 +230947,7 @@ _08076668: ldrsh r0, [r4, r3] cmp r0, 0x7F bgt _080766AC - ldr r1, _080766A8 + ldr r1, =0x08329f40 lsls r0, r2, 24 lsrs r0, 23 adds r0, r1 @@ -239840,8 +230967,7 @@ _08076690: strh r0, [r5, 0x26] b _080766BA .align 2, 0 -_080766A4: .4byte 0x02020630 -_080766A8: .4byte 0x08329f40 + .pool _080766AC: ldrh r0, [r4, 0x38] strh r0, [r5, 0x20] @@ -239863,7 +230989,7 @@ _080766BA: beq _0807670E cmp r7, 0 beq _0807670E - ldr r1, _080766F8 + ldr r1, =0x02020630 mov r3, r8 adds r0, r3, r6 lsls r0, 2 @@ -239881,7 +231007,7 @@ _080766BA: bl sub_806ED40 b _08076708 .align 2, 0 -_080766F8: .4byte 0x02020630 + .pool _080766FC: ldrh r1, [r2, 0x3C] adds r0, r2, 0 @@ -239934,18 +231060,18 @@ sub_807671C: @ 807671C lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _080767C0 + ldr r0, =0x0832c400 bl gpu_tile_obj_decompress_and_load3 - ldr r0, _080767C4 + ldr r0, =0x0832c460 bl gpu_pal_obj_decompress_and_apply3 - ldr r0, _080767C8 + ldr r0, =0x0832c588 adds r1, r6, 0 mov r2, r8 adds r3, r4, 0 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r6, _080767CC + ldr r6, =0x02020630 lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -239972,7 +231098,7 @@ sub_807671C: @ 807671C strb r1, [r2, 0x5] adds r6, 0x1C adds r3, r6 - ldr r1, _080767D0 + ldr r1, =sub_80767D4 + 1 str r1, [r3] pop {r3-r5} mov r8, r3 @@ -239982,11 +231108,7 @@ sub_807671C: @ 807671C pop {r1} bx r1 .align 2, 0 -_080767C0: .4byte 0x0832c400 -_080767C4: .4byte 0x0832c460 -_080767C8: .4byte 0x0832c588 -_080767CC: .4byte 0x02020630 -_080767D0: .4byte sub_80767D4 + 1 + .pool thumb_func_end sub_807671C thumb_func_start sub_80767D4 @@ -240046,12 +231168,12 @@ _08076810: lsrs r0, 24 movs r5, 0 strh r0, [r4, 0x30] - ldr r0, _08076864 + ldr r0, =sub_807687C + 1 str r0, [r4, 0x1C] lsls r4, r7, 4 adds r4, r7 lsls r4, 2 - ldr r0, _08076868 + ldr r0, =0x02020630 adds r4, r0 adds r0, r4, 0 movs r1, 0x2 @@ -240061,8 +231183,7 @@ _08076810: strh r5, [r4, 0x30] b _08076870 .align 2, 0 -_08076864: .4byte sub_807687C + 1 -_08076868: .4byte 0x02020630 + .pool _0807686C: subs r0, r1, 0x1 strh r0, [r4, 0x30] @@ -240091,7 +231212,7 @@ _08076894: ldrh r1, [r5, 0x2E] lsls r1, 24 lsrs r1, 24 - ldr r2, _080768D0 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -240113,12 +231234,11 @@ _08076894: strb r0, [r2] movs r0, 0 strh r0, [r5, 0x38] - ldr r0, _080768D4 + ldr r0, =sub_80768F0 + 1 str r0, [r5, 0x1C] b _080768E8 .align 2, 0 -_080768D0: .4byte 0x02020630 -_080768D4: .4byte sub_80768F0 + 1 + .pool _080768D8: ldrh r0, [r4, 0x30] adds r0, 0x60 @@ -240144,13 +231264,13 @@ sub_80768F0: @ 80768F0 ands r0, r1 cmp r0, 0 beq _08076904 - ldr r0, _08076908 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _08076904: pop {r0} bx r0 .align 2, 0 -_08076908: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80768F0 thumb_func_start obj_delete_and_free_associated_resources_ @@ -240167,13 +231287,13 @@ sub_8076918: @ 8076918 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r0, _08076998 + ldr r0, =0x03005d70 adds r0, r5, r0 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, _0807699C + ldr r6, =0x02020630 adds r4, r0, r6 movs r1, 0 movs r0, 0x5 @@ -240182,7 +231302,7 @@ sub_8076918: @ 8076918 movs r0, 0x73 strh r0, [r4, 0x24] strh r1, [r4, 0x26] - ldr r0, _080769A0 + ldr r0, =sub_80769CC + 1 str r0, [r4, 0x1C] adds r0, r5, 0 bl battle_side_get_owner @@ -240219,17 +231339,14 @@ _08076966: lsrs r0, 24 cmp r0, 0x2 bne _08076990 - ldr r0, _080769A4 + ldr r0, =sub_80769A8 + 1 str r0, [r4, 0x1C] _08076990: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08076998: .4byte 0x03005d70 -_0807699C: .4byte 0x02020630 -_080769A0: .4byte sub_80769CC + 1 -_080769A4: .4byte sub_80769A8 + 1 + .pool thumb_func_end sub_8076918 thumb_func_start sub_80769A8 @@ -240245,13 +231362,13 @@ sub_80769A8: @ 80769A8 bne _080769C2 movs r0, 0 strh r0, [r1, 0x30] - ldr r0, _080769C8 + ldr r0, =sub_80769CC + 1 str r0, [r1, 0x1C] _080769C2: pop {r0} bx r0 .align 2, 0 -_080769C8: .4byte sub_80769CC + 1 + .pool thumb_func_end sub_80769A8 thumb_func_start sub_80769CC @@ -240269,13 +231386,13 @@ sub_80769CC: @ 80769CC ldr r0, [r2, 0x24] cmp r0, 0 bne _080769EA - ldr r0, _080769F0 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _080769EA: pop {r0} bx r0 .align 2, 0 -_080769F0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80769CC thumb_func_start sub_80769F4 @@ -240284,19 +231401,19 @@ sub_80769F4: @ 80769F4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _08076A2C + ldr r5, =oamc_804BEB4 + 1 adds r0, r5, 0 bl object_new_hidden_with_callback lsls r0, 24 lsrs r0, 24 - ldr r2, _08076A30 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r3, r1, r2 movs r0, 0x1 strh r0, [r3, 0x2E] - ldr r0, _08076A34 + ldr r0, =0x03005d70 adds r4, r0 ldrb r0, [r4] strh r0, [r3, 0x30] @@ -240307,9 +231424,7 @@ sub_80769F4: @ 80769F4 pop {r0} bx r0 .align 2, 0 -_08076A2C: .4byte oamc_804BEB4 + 1 -_08076A30: .4byte 0x02020630 -_08076A34: .4byte 0x03005d70 + .pool thumb_func_end sub_80769F4 thumb_func_start oamc_804BEB4 @@ -240319,7 +231434,7 @@ oamc_804BEB4: @ 8076A38 ldrh r1, [r3, 0x30] lsls r1, 24 lsrs r1, 24 - ldr r2, _08076A74 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -240345,7 +231460,7 @@ _08076A70: pop {r0} bx r0 .align 2, 0 -_08076A74: .4byte 0x02020630 + .pool thumb_func_end oamc_804BEB4 thumb_func_start sub_8076A78 @@ -240353,18 +231468,18 @@ sub_8076A78: @ 8076A78 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08076AD4 + ldr r0, =0x0832c400 lsls r6, r4, 3 adds r5, r6, r0 ldrh r0, [r5, 0x6] bl gpu_tile_obj_tag_get_range_start lsls r0, 16 - ldr r1, _08076AD8 + ldr r1, =0xffff0000 cmp r0, r1 bne _08076AA0 adds r0, r5, 0 bl gpu_tile_obj_decompress_and_load3 - ldr r0, _08076ADC + ldr r0, =0x0832c460 adds r0, r6, r0 bl gpu_pal_obj_decompress_and_apply3 _08076AA0: @@ -240377,16 +231492,16 @@ _08076AA0: cmp r4, 0xA bge _08076ACC _08076AB0: - ldr r1, _08076AD4 + ldr r1, =0x0832c400 lsls r0, r4, 3 adds r0, r1 ldrh r0, [r0, 0x6] bl gpu_tile_obj_tag_get_range_start adds r1, r0, 0 lsls r1, 16 - ldr r0, _08076AE0 + ldr r0, =0x08c02300 lsrs r1, 11 - ldr r2, _08076AE4 + ldr r2, =0x06010100 adds r1, r2 bl call_LZZUnCompVram _08076ACC: @@ -240394,11 +231509,7 @@ _08076ACC: pop {r0} bx r0 .align 2, 0 -_08076AD4: .4byte 0x0832c400 -_08076AD8: .4byte 0xffff0000 -_08076ADC: .4byte 0x0832c460 -_08076AE0: .4byte 0x08c02300 -_08076AE4: .4byte 0x06010100 + .pool thumb_func_end sub_8076A78 thumb_func_start sub_8076AE8 @@ -240406,12 +231517,12 @@ sub_8076AE8: @ 8076AE8 push {r4,lr} adds r4, r0, 0 lsls r4, 24 - ldr r0, _08076B0C + ldr r0, =0x0832c400 lsrs r4, 21 adds r0, r4, r0 ldrh r0, [r0, 0x6] bl gpu_tile_obj_free_by_tag - ldr r0, _08076B10 + ldr r0, =0x0832c460 adds r4, r0 ldrh r0, [r4, 0x4] bl gpu_pal_free_tag @@ -240419,8 +231530,7 @@ sub_8076AE8: @ 8076AE8 pop {r0} bx r0 .align 2, 0 -_08076B0C: .4byte 0x0832c400 -_08076B10: .4byte 0x0832c460 + .pool thumb_func_end sub_8076AE8 thumb_func_start sub_8076B14 @@ -240433,25 +231543,24 @@ sub_8076B14: @ 8076B14 lsls r0, 24 cmp r0, 0 beq _08076B40 - ldr r1, _08076B38 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08076B3C + ldr r1, =0x02024744 b _08076B4E .align 2, 0 -_08076B38: .4byte 0x0202406e -_08076B3C: .4byte 0x02024744 + .pool _08076B40: - ldr r1, _08076B60 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08076B64 + ldr r1, =0x020244ec _08076B4E: adds r0, r1 movs r1, 0x26 @@ -240462,8 +231571,7 @@ _08076B4E: pop {r1} bx r1 .align 2, 0 -_08076B60: .4byte 0x0202406e -_08076B64: .4byte 0x020244ec + .pool thumb_func_end sub_8076B14 thumb_func_start flash_timeout_start_on_timer_2_when_flash_present @@ -240473,22 +231581,22 @@ flash_timeout_start_on_timer_2_when_flash_present: @ 8076B68 lsls r0, 16 cmp r0, 0 bne _08076B84 - ldr r1, _08076B80 + ldr r1, =0x03005d88 movs r0, 0x1 str r0, [r1] bl flash_timeout_start_on_timer_2 b _08076B8A .align 2, 0 -_08076B80: .4byte 0x03005d88 + .pool _08076B84: - ldr r1, _08076B90 + ldr r1, =0x03005d88 movs r0, 0 str r0, [r1] _08076B8A: pop {r0} bx r0 .align 2, 0 -_08076B90: .4byte 0x03005d88 + .pool thumb_func_end flash_timeout_start_on_timer_2_when_flash_present thumb_func_start memclr_stdsav2 @@ -240498,16 +231606,15 @@ memclr_stdsav2: @ 8076B94 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _08076BB0 - ldr r2, _08076BB4 + ldr r1, =0x02024a54 + ldr r2, =0x010007d6 mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08076BB0: .4byte 0x02024a54 -_08076BB4: .4byte 0x010007d6 + .pool thumb_func_end memclr_stdsav2 thumb_func_start clear_sav1 @@ -240517,16 +231624,15 @@ clear_sav1: @ 8076BB8 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _08076BD4 - ldr r2, _08076BD8 + ldr r1, =0x02025a00 + ldr r2, =0x01001f04 mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08076BD4: .4byte 0x02025a00 -_08076BD8: .4byte 0x01001f04 + .pool thumb_func_end clear_sav1 thumb_func_start sub_8076BDC @@ -240535,20 +231641,20 @@ sub_8076BDC: @ 8076BDC adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r5, _08076C14 + ldr r5, =0x03005d8c bl GenerateRandomNumber adds r4, r0 movs r0, 0x7C ands r4, r0 - ldr r1, _08076C18 - ldr r0, _08076C1C + ldr r1, =0x03005d90 + ldr r0, =0x02024a54 adds r0, r4, r0 str r0, [r1] - ldr r0, _08076C20 + ldr r0, =0x02025a00 adds r0, r4, r0 str r0, [r5] - ldr r1, _08076C24 - ldr r0, _08076C28 + ldr r1, =0x03005d94 + ldr r0, =0x02029808 adds r4, r0 str r4, [r1] bl init_bag_pockets @@ -240557,12 +231663,7 @@ sub_8076BDC: @ 8076BDC pop {r0} bx r0 .align 2, 0 -_08076C14: .4byte 0x03005d8c -_08076C18: .4byte 0x03005d90 -_08076C1C: .4byte 0x02024a54 -_08076C20: .4byte 0x02025a00 -_08076C24: .4byte 0x03005d94 -_08076C28: .4byte 0x02029808 + .pool thumb_func_end sub_8076BDC thumb_func_start saveblock_randomize_and_relocate @@ -240573,7 +231674,7 @@ saveblock_randomize_and_relocate: @ 8076C2C mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r5, _08076CF8 + ldr r5, =0x030022c0 ldr r0, [r5, 0xC] str r0, [sp] ldr r1, [r5, 0x10] @@ -240581,28 +231682,28 @@ saveblock_randomize_and_relocate: @ 8076C2C movs r0, 0 str r0, [r5, 0xC] str r0, [r5, 0x10] - ldr r1, _08076CFC + ldr r1, =0x0203cf5c str r0, [r1] - ldr r4, _08076D00 - ldr r0, _08076D04 + ldr r4, =0x02000000 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r6, _08076D08 + ldr r6, =0x00000f2c adds r0, r4, 0 adds r2, r6, 0 bl memcpy - ldr r1, _08076D0C + ldr r1, =0x03005d8c mov r10, r1 ldr r1, [r1] - ldr r7, _08076D10 - ldr r0, _08076D14 + ldr r7, =0x00003d88 + ldr r0, =0x02000f2c adds r2, r7, 0 bl memcpy - ldr r0, _08076D18 + ldr r0, =0x03005d94 mov r8, r0 ldr r1, [r0] - ldr r0, _08076D1C + ldr r0, =0x000083d0 mov r9, r0 - ldr r0, _08076D20 + ldr r0, =0x02004cb4 mov r2, r9 bl memcpy ldrb r1, [r4, 0xA] @@ -240613,19 +231714,19 @@ saveblock_randomize_and_relocate: @ 8076C2C ldrb r0, [r4, 0xD] adds r0, r1 bl sub_8076BDC - ldr r1, _08076D04 + ldr r1, =0x03005d90 ldr r0, [r1] adds r1, r4, 0 adds r2, r6, 0 bl memcpy mov r1, r10 ldr r0, [r1] - ldr r1, _08076D14 + ldr r1, =0x02000f2c adds r2, r7, 0 bl memcpy mov r1, r8 ldr r0, [r1] - ldr r1, _08076D20 + ldr r1, =0x02004cb4 mov r2, r9 bl memcpy movs r1, 0xE0 @@ -240645,7 +231746,7 @@ saveblock_randomize_and_relocate: @ 8076C2C adds r4, r0 adds r0, r4, 0 bl saveblock_randomize_position - ldr r1, _08076D04 + ldr r1, =0x03005d90 ldr r0, [r1] adds r0, 0xAC str r4, [r0] @@ -240658,34 +231759,24 @@ saveblock_randomize_and_relocate: @ 8076C2C pop {r0} bx r0 .align 2, 0 -_08076CF8: .4byte 0x030022c0 -_08076CFC: .4byte 0x0203cf5c -_08076D00: .4byte 0x02000000 -_08076D04: .4byte 0x03005d90 -_08076D08: .4byte 0x00000f2c -_08076D0C: .4byte 0x03005d8c -_08076D10: .4byte 0x00003d88 -_08076D14: .4byte 0x02000f2c -_08076D18: .4byte 0x03005d94 -_08076D1C: .4byte 0x000083d0 -_08076D20: .4byte 0x02004cb4 + .pool thumb_func_end saveblock_randomize_and_relocate thumb_func_start sav2_x1_query_bit1 sav2_x1_query_bit1: @ 8076D24 - ldr r0, _08076D30 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r1, [r0, 0x9] movs r0, 0x1 ands r0, r1 bx lr .align 2, 0 -_08076D30: .4byte 0x03005d90 + .pool thumb_func_end sav2_x1_query_bit1 thumb_func_start sav2_x9_clear_bit1 sav2_x9_clear_bit1: @ 8076D34 - ldr r0, _08076D44 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0xFE @@ -240693,12 +231784,12 @@ sav2_x9_clear_bit1: @ 8076D34 strb r0, [r2, 0x9] bx lr .align 2, 0 -_08076D44: .4byte 0x03005d90 + .pool thumb_func_end sav2_x9_clear_bit1 thumb_func_start sub_8076D48 sub_8076D48: @ 8076D48 - ldr r0, _08076D58 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0x1 @@ -240706,7 +231797,7 @@ sub_8076D48: @ 8076D48 strb r0, [r2, 0x9] bx lr .align 2, 0 -_08076D58: .4byte 0x03005d90 + .pool thumb_func_end sub_8076D48 thumb_func_start sub_8076D5C @@ -240714,7 +231805,7 @@ sub_8076D5C: @ 8076D5C push {lr} movs r0, 0 bl sub_8084FAC - ldr r0, _08076D74 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0x1 @@ -240723,12 +231814,12 @@ sub_8076D5C: @ 8076D5C pop {r0} bx r0 .align 2, 0 -_08076D74: .4byte 0x03005d90 + .pool thumb_func_end sub_8076D5C thumb_func_start sav2_gender2_inplace_and_xFE sav2_gender2_inplace_and_xFE: @ 8076D78 - ldr r0, _08076D88 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0xFE @@ -240736,15 +231827,15 @@ sav2_gender2_inplace_and_xFE: @ 8076D78 strb r0, [r2, 0x9] bx lr .align 2, 0 -_08076D88: .4byte 0x03005d90 + .pool thumb_func_end sav2_gender2_inplace_and_xFE thumb_func_start copy_player_party_to_sav1 copy_player_party_to_sav1: @ 8076D8C push {r4,lr} - ldr r0, _08076DC8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08076DCC + ldr r1, =0x020244e9 ldrb r1, [r1] movs r2, 0x8D lsls r2, 2 @@ -240752,7 +231843,7 @@ copy_player_party_to_sav1: @ 8076D8C strb r1, [r0] movs r4, 0 _08076DA0: - ldr r0, _08076DC8 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x64 muls r1, r4 @@ -240760,7 +231851,7 @@ _08076DA0: movs r2, 0x8E lsls r2, 2 adds r0, r2 - ldr r2, _08076DD0 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0x64 bl memcpy @@ -240771,16 +231862,14 @@ _08076DA0: pop {r0} bx r0 .align 2, 0 -_08076DC8: .4byte 0x03005d8c -_08076DCC: .4byte 0x020244e9 -_08076DD0: .4byte 0x020244ec + .pool thumb_func_end copy_player_party_to_sav1 thumb_func_start copy_player_party_from_sav1 copy_player_party_from_sav1: @ 8076DD4 push {r4,r5,lr} - ldr r1, _08076E10 - ldr r0, _08076E14 + ldr r1, =0x020244e9 + ldr r0, =0x03005d8c ldr r0, [r0] movs r2, 0x8D lsls r2, 2 @@ -240788,13 +231877,13 @@ copy_player_party_from_sav1: @ 8076DD4 ldrb r0, [r0] strb r0, [r1] movs r4, 0 - ldr r5, _08076E18 + ldr r5, =0x020244ec _08076DEA: movs r0, 0x64 adds r2, r4, 0 muls r2, r0 adds r0, r2, r5 - ldr r1, _08076E14 + ldr r1, =0x03005d8c ldr r1, [r1] adds r1, r2 movs r2, 0x8E @@ -240809,9 +231898,7 @@ _08076DEA: pop {r0} bx r0 .align 2, 0 -_08076E10: .4byte 0x020244e9 -_08076E14: .4byte 0x03005d8c -_08076E18: .4byte 0x020244ec + .pool thumb_func_end copy_player_party_from_sav1 thumb_func_start save_serialize_npcs @@ -240819,12 +231906,12 @@ save_serialize_npcs: @ 8076E1C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _08076E5C + ldr r0, =0x03005d8c mov r12, r0 movs r5, 0xA3 lsls r5, 4 mov r8, r5 - ldr r4, _08076E60 + ldr r4, =0x02037350 movs r3, 0 movs r2, 0xF _08076E32: @@ -240850,8 +231937,7 @@ _08076E32: pop {r0} bx r0 .align 2, 0 -_08076E5C: .4byte 0x03005d8c -_08076E60: .4byte 0x02037350 + .pool thumb_func_end save_serialize_npcs thumb_func_start save_deserialize_npcs @@ -240859,12 +231945,12 @@ save_deserialize_npcs: @ 8076E64 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _08076EA4 + ldr r0, =0x03005d8c mov r12, r0 movs r5, 0xA3 lsls r5, 4 mov r8, r5 - ldr r4, _08076EA8 + ldr r4, =0x02037350 movs r3, 0 movs r2, 0xF _08076E7A: @@ -240890,8 +231976,7 @@ _08076E7A: pop {r0} bx r0 .align 2, 0 -_08076EA4: .4byte 0x03005d8c -_08076EA8: .4byte 0x02037350 + .pool thumb_func_end save_deserialize_npcs thumb_func_start save_serialize_game @@ -240920,14 +232005,14 @@ sub_8076ECC: @ 8076ECC mov r5, r8 push {r5-r7} movs r2, 0 - ldr r0, _08076FCC + ldr r0, =0x02032180 mov r12, r0 - ldr r1, _08076FD0 + ldr r1, =0x03005d90 mov r10, r1 - ldr r5, _08076FD4 + ldr r5, =0x03005d8c movs r3, 0xAC lsls r3, 3 - ldr r4, _08076FD8 + ldr r4, =0x02031c58 _08076EE8: lsls r0, r2, 2 ldr r1, [r5] @@ -240939,8 +232024,8 @@ _08076EE8: cmp r2, 0x1D ble _08076EE8 movs r2, 0 - ldr r0, _08076FD8 - ldr r5, _08076FD4 + ldr r0, =0x02031c58 + ldr r5, =0x03005d8c movs r3, 0xBB lsls r3, 3 adds r4, r0, 0 @@ -240956,8 +232041,8 @@ _08076F08: cmp r2, 0x1D ble _08076F08 movs r2, 0 - ldr r0, _08076FD8 - ldr r5, _08076FD4 + ldr r0, =0x02031c58 + ldr r5, =0x03005d8c movs r3, 0xCA lsls r3, 3 adds r4, r0, 0 @@ -240973,8 +232058,8 @@ _08076F28: cmp r2, 0xF ble _08076F28 movs r2, 0 - ldr r0, _08076FD8 - ldr r5, _08076FD4 + ldr r0, =0x02031c58 + ldr r5, =0x03005d8c movs r6, 0x98 lsls r6, 1 adds r4, r0, r6 @@ -240991,8 +232076,8 @@ _08076F4A: cmp r2, 0x3F ble _08076F4A movs r2, 0 - ldr r0, _08076FD8 - ldr r5, _08076FD4 + ldr r0, =0x02031c58 + ldr r5, =0x03005d8c movs r7, 0x8C lsls r7, 2 adds r4, r0, r7 @@ -241008,14 +232093,14 @@ _08076F6C: adds r2, 0x1 cmp r2, 0x2D ble _08076F6C - ldr r0, _08076FD8 - ldr r1, _08076FD4 + ldr r0, =0x02031c58 + ldr r1, =0x03005d8c mov r8, r1 movs r5, 0xBA lsls r5, 2 adds r4, r0, r5 movs r3, 0 - ldr r6, _08076FDC + ldr r6, =0x00002be0 mov r9, r6 movs r2, 0xF _08076F92: @@ -241049,11 +232134,7 @@ _08076F92: pop {r0} bx r0 .align 2, 0 -_08076FCC: .4byte 0x02032180 -_08076FD0: .4byte 0x03005d90 -_08076FD4: .4byte 0x03005d8c -_08076FD8: .4byte 0x02031c58 -_08076FDC: .4byte 0x00002be0 + .pool thumb_func_end sub_8076ECC thumb_func_start sub_8076FE0 @@ -241064,14 +232145,14 @@ sub_8076FE0: @ 8076FE0 mov r5, r8 push {r5-r7} movs r2, 0 - ldr r0, _080770EC + ldr r0, =0x03005d90 mov r8, r0 - ldr r1, _080770F0 + ldr r1, =0x02032180 mov r12, r1 - ldr r5, _080770F4 + ldr r5, =0x03005d8c movs r3, 0xAC lsls r3, 3 - ldr r4, _080770F8 + ldr r4, =0x02031c58 _08076FFC: ldr r0, [r5] lsls r1, r2, 2 @@ -241083,10 +232164,10 @@ _08076FFC: cmp r2, 0x1D ble _08076FFC movs r2, 0 - ldr r5, _080770F4 + ldr r5, =0x03005d8c movs r4, 0xBB lsls r4, 3 - ldr r0, _080770F8 + ldr r0, =0x02031c58 adds r3, r0, 0 adds r3, 0x78 _0807701C: @@ -241100,10 +232181,10 @@ _0807701C: cmp r2, 0x1D ble _0807701C movs r2, 0 - ldr r5, _080770F4 + ldr r5, =0x03005d8c movs r4, 0xCA lsls r4, 3 - ldr r0, _080770F8 + ldr r0, =0x02031c58 adds r3, r0, 0 adds r3, 0xF0 _0807703C: @@ -241117,10 +232198,10 @@ _0807703C: cmp r2, 0xF ble _0807703C movs r2, 0 - ldr r5, _080770F4 + ldr r5, =0x03005d8c movs r4, 0xD2 lsls r4, 3 - ldr r0, _080770F8 + ldr r0, =0x02031c58 movs r6, 0x98 lsls r6, 1 adds r3, r0, r6 @@ -241135,10 +232216,10 @@ _0807705E: cmp r2, 0x3F ble _0807705E movs r2, 0 - ldr r5, _080770F4 + ldr r5, =0x03005d8c movs r4, 0xF2 lsls r4, 3 - ldr r0, _080770F8 + ldr r0, =0x02031c58 movs r7, 0x8C lsls r7, 2 adds r3, r0, r7 @@ -241152,11 +232233,11 @@ _08077080: adds r2, 0x1 cmp r2, 0x2D ble _08077080 - ldr r0, _080770F4 + ldr r0, =0x03005d8c mov r9, r0 - ldr r1, _080770FC + ldr r1, =0x00002be0 mov r10, r1 - ldr r4, _080770F8 + ldr r4, =0x02031c58 movs r3, 0 movs r2, 0xF _080770A0: @@ -241198,16 +232279,12 @@ _080770A0: pop {r0} bx r0 .align 2, 0 -_080770EC: .4byte 0x03005d90 -_080770F0: .4byte 0x02032180 -_080770F4: .4byte 0x03005d8c -_080770F8: .4byte 0x02031c58 -_080770FC: .4byte 0x00002be0 + .pool thumb_func_end sub_8076FE0 thumb_func_start apply_u16_xor_crypto apply_u16_xor_crypto: @ 8077100 - ldr r2, _08077114 + ldr r2, =0x03005d90 ldr r2, [r2] adds r2, 0xAC ldr r2, [r2] @@ -241217,12 +232294,12 @@ apply_u16_xor_crypto: @ 8077100 strh r2, [r0] bx lr .align 2, 0 -_08077114: .4byte 0x03005d90 + .pool thumb_func_end apply_u16_xor_crypto thumb_func_start apply_u32_xor_crypto apply_u32_xor_crypto: @ 8077118 - ldr r2, _0807712C + ldr r2, =0x03005d90 ldr r3, [r2] adds r3, 0xAC ldr r2, [r0] @@ -241232,7 +232309,7 @@ apply_u32_xor_crypto: @ 8077118 str r2, [r0] bx lr .align 2, 0 -_0807712C: .4byte 0x03005d90 + .pool thumb_func_end apply_u32_xor_crypto thumb_func_start saveblock_randomize_position @@ -241244,7 +232321,7 @@ saveblock_randomize_position: @ 8077130 bl call_encrypt_decrypt_all_item_quantities adds r0, r4, 0 bl sub_8024690 - ldr r5, _08077168 + ldr r5, =0x03005d8c ldr r0, [r5] movs r1, 0x92 lsls r1, 3 @@ -241252,7 +232329,7 @@ saveblock_randomize_position: @ 8077130 adds r1, r4, 0 bl apply_u32_xor_crypto ldr r0, [r5] - ldr r1, _0807716C + ldr r1, =0x00000494 adds r0, r1 adds r1, r4, 0 bl apply_u16_xor_crypto @@ -241260,8 +232337,7 @@ saveblock_randomize_position: @ 8077130 pop {r0} bx r0 .align 2, 0 -_08077168: .4byte 0x03005d8c -_0807716C: .4byte 0x00000494 + .pool thumb_func_end saveblock_randomize_position thumb_func_start sub_8077170 @@ -241269,7 +232345,7 @@ sub_8077170: @ 8077170 push {r4,lr} adds r4, r0, 0 adds r3, r1, 0 - ldr r0, _08077190 + ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x1D beq _08077194 @@ -241282,9 +232358,9 @@ sub_8077170: @ 8077170 lsrs r0, 24 b _080771A2 .align 2, 0 -_08077190: .4byte 0x02022c2c + .pool _08077194: - ldr r0, _080771A8 + ldr r0, =0x03004140 ldrb r0, [r0] movs r1, 0x54 adds r2, r4, 0 @@ -241295,7 +232371,7 @@ _080771A2: pop {r1} bx r1 .align 2, 0 -_080771A8: .4byte 0x03004140 + .pool thumb_func_end sub_8077170 thumb_func_start sub_80771AC @@ -241311,12 +232387,12 @@ sub_80771AC: @ 80771AC thumb_func_start sub_80771BC sub_80771BC: @ 80771BC push {r4,lr} - ldr r0, _080771E0 + ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x1D bne _080771F0 - ldr r4, _080771E4 - ldr r0, _080771E8 + ldr r4, =0x03007880 + ldr r0, =0x03004140 ldrb r0, [r0] bl sub_800E87C lsls r0, 2 @@ -241328,9 +232404,7 @@ sub_80771BC: @ 80771BC movs r0, 0x1 b _080771F8 .align 2, 0 -_080771E0: .4byte 0x02022c2c -_080771E4: .4byte 0x03007880 -_080771E8: .4byte 0x03004140 + .pool _080771EC: movs r0, 0 b _080771F8 @@ -241360,13 +232434,13 @@ sub_8077210: @ 8077210 bl sub_8077260 cmp r0, 0 beq _0807722C - ldr r0, _08077228 + ldr r0, =0x03004140 ldrb r1, [r0] movs r0, 0xC bl rfu_clearSlot b _08077230 .align 2, 0 -_08077228: .4byte 0x03004140 + .pool _0807722C: bl sub_800A5B4 _08077230: @@ -241381,13 +232455,13 @@ sub_8077234: @ 8077234 bl sub_8077260 cmp r0, 0 beq _08077250 - ldr r0, _0807724C + ldr r0, =0x03004140 ldrb r1, [r0] movs r0, 0xC bl rfu_clearSlot b _08077258 .align 2, 0 -_0807724C: .4byte 0x03004140 + .pool _08077250: lsls r0, r4, 24 lsrs r0, 24 @@ -241401,19 +232475,18 @@ _08077258: thumb_func_start sub_8077260 sub_8077260: @ 8077260 push {lr} - ldr r0, _08077278 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08077280 - ldr r0, _0807727C + ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x1D bne _08077280 movs r0, 0x1 b _08077282 .align 2, 0 -_08077278: .4byte 0x030030fc -_0807727C: .4byte 0x02022c2c + .pool _08077280: movs r0, 0 _08077282: @@ -241447,14 +232520,14 @@ sub_80772A4: @ 80772A4 bl gpu_pal_allocator_reset bl clear_tasks bl sub_80A1A74 - ldr r2, _08077394 + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r0, _08077398 + ldr r0, =sub_807811C + 1 bl SetVBlankCallback - ldr r4, _0807739C + ldr r4, =0x0860f074 adds r0, r4, 0 movs r1, 0xF0 movs r2, 0x14 @@ -241465,18 +232538,18 @@ sub_80772A4: @ 80772A4 bl gpu_pal_apply movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080773A0 + ldr r1, =0x0832dee4 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r0, _080773A4 + ldr r0, =0x0203229c ldr r1, [r0] movs r0, 0x8F lsls r0, 4 adds r1, r0 movs r0, 0x1 bl bg_set_tilemap - ldr r0, _080773A8 + ldr r0, =0x0832def4 bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 @@ -241514,7 +232587,7 @@ _08077310: movs r2, 0xE0 bl sub_809882C bl sub_80D2F04 - ldr r2, _080773A4 + ldr r2, =0x0203229c ldr r0, [r2] adds r0, 0x69 movs r1, 0 @@ -241546,30 +232619,23 @@ _0807738C: pop {r0} bx r0 .align 2, 0 -_08077394: .4byte 0x02037fd4 -_08077398: .4byte sub_807811C + 1 -_0807739C: .4byte 0x0860f074 -_080773A0: .4byte 0x0832dee4 -_080773A4: .4byte 0x0203229c -_080773A8: .4byte 0x0832def4 + .pool thumb_func_end sub_80772A4 thumb_func_start sub_80773AC sub_80773AC: @ 80773AC push {lr} - ldr r0, _080773C4 + ldr r0, =sub_80773D0 + 1 bl set_callback2 - ldr r0, _080773C8 + ldr r0, =0x030022c0 movs r1, 0 str r1, [r0] - ldr r0, _080773CC + ldr r0, =0x020244ea strb r1, [r0] pop {r0} bx r0 .align 2, 0 -_080773C4: .4byte sub_80773D0 + 1 -_080773C8: .4byte 0x030022c0 -_080773CC: .4byte 0x020244ea + .pool thumb_func_end sub_80773AC thumb_func_start sub_80773D0 @@ -241578,7 +232644,7 @@ sub_80773D0: @ 80773D0 mov r7, r8 push {r7} sub sp, 0x28 - ldr r1, _080773F4 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -241589,13 +232655,12 @@ sub_80773D0: @ 80773D0 b _08077B46 _080773EA: lsls r0, 2 - ldr r1, _080773F8 + ldr r1, =_080773FC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080773F4: .4byte 0x030022c0 -_080773F8: .4byte _080773FC + .pool .align 2, 0 _080773FC: .4byte _08077458 @@ -241622,18 +232687,18 @@ _080773FC: .4byte _08077B10 .4byte _08077B30 _08077458: - ldr r4, _08077490 - ldr r0, _08077494 + ldr r4, =0x0203229c + ldr r0, =0x000010f0 bl malloc_and_clear str r0, [r4] bl sub_80772A4 - ldr r4, _08077498 + ldr r4, =0x02032184 movs r0, 0xE0 lsls r0, 4 bl malloc_and_clear str r0, [r4] movs r6, 0 - ldr r2, _0807749C + ldr r2, =0x02032188 _08077476: lsls r1, r6, 8 ldr r0, [r4] @@ -241642,19 +232707,15 @@ _08077476: adds r6, 0x1 cmp r6, 0xD ble _08077476 - ldr r1, _080774A0 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _08077B22 .align 2, 0 -_08077490: .4byte 0x0203229c -_08077494: .4byte 0x000010f0 -_08077498: .4byte 0x02032184 -_0807749C: .4byte 0x02032188 -_080774A0: .4byte 0x030022c0 + .pool _080774A4: - ldr r2, _0807750C + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -241664,7 +232725,7 @@ _080774A4: _080774B2: movs r0, 0x64 muls r0, r6 - ldr r1, _08077510 + ldr r1, =0x02024744 adds r0, r1 str r4, [sp] str r4, [sp, 0x4] @@ -241681,19 +232742,19 @@ _080774B2: bl sub_807A19C movs r0, 0 bl gpu_sync_bg_show - ldr r0, _08077514 + ldr r0, =0x03003124 ldrb r2, [r0] cmp r2, 0 bne _0807754C - ldr r1, _08077518 - ldr r5, _0807751C + ldr r1, =0x020229c6 + ldr r5, =0x00001122 adds r0, r5, 0 strh r0, [r1] - ldr r0, _08077520 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] - ldr r0, _08077524 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08077528 @@ -241702,31 +232763,24 @@ _080774B2: bl sub_8011BA4 b _08077B46 .align 2, 0 -_0807750C: .4byte 0x02037fd4 -_08077510: .4byte 0x02024744 -_08077514: .4byte 0x03003124 -_08077518: .4byte 0x020229c6 -_0807751C: .4byte 0x00001122 -_08077520: .4byte 0x0203229c -_08077524: .4byte 0x030030fc + .pool _08077528: bl sub_8009734 - ldr r0, _08077544 + ldr r0, =0x030022c0 movs r7, 0x87 lsls r7, 3 adds r0, r7 ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, _08077548 + ldr r0, =task00_08081A90 + 1 movs r1, 0x1 bl AddTask b _08077B46 .align 2, 0 -_08077544: .4byte 0x030022c0 -_08077548: .4byte task00_08081A90 + 1 + .pool _0807754C: - ldr r0, _0807755C + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -241734,9 +232788,9 @@ _0807754C: strb r1, [r0] b _08077B46 .align 2, 0 -_0807755C: .4byte 0x030022c0 + .pool _08077560: - ldr r2, _08077588 + ldr r2, =0x0203229c ldr r1, [r2] adds r1, 0xA8 ldrb r0, [r1] @@ -241757,7 +232811,7 @@ _0807757A: adds r1, r3, r2 b _08077B22 .align 2, 0 -_08077588: .4byte 0x0203229c + .pool _0807758C: bl sub_800ABAC adds r4, r0, 0 @@ -241772,7 +232826,7 @@ _080775A0: lsls r0, 24 cmp r0, 0 beq _080775D8 - ldr r0, _080775D0 + ldr r0, =0x0203229c ldr r1, [r0] adds r1, 0xA8 ldrb r0, [r1] @@ -241785,24 +232839,23 @@ _080775A0: b _08077B46 _080775C0: bl sub_800A620 - ldr r1, _080775D4 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _08077B22 .align 2, 0 -_080775D0: .4byte 0x0203229c -_080775D4: .4byte 0x030022c0 + .pool _080775D8: - ldr r1, _080775E4 + ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 b _08077B22 .align 2, 0 -_080775E4: .4byte 0x030022c0 + .pool _080775E8: - ldr r0, _08077638 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 beq _080775F2 @@ -241817,7 +232870,7 @@ _080775F2: _08077600: bl sub_8011BD0 bl calc_player_party_count - ldr r1, _0807763C + ldr r1, =0x030022c0 movs r7, 0x87 lsls r7, 3 adds r1, r7 @@ -241825,11 +232878,11 @@ _08077600: adds r0, 0x1 movs r2, 0 strb r0, [r1] - ldr r0, _08077640 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] - ldr r0, _08077644 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _0807762A @@ -241840,12 +232893,9 @@ _0807762A: bl sub_800ADF8 b _08077B46 .align 2, 0 -_08077638: .4byte 0x03003124 -_0807763C: .4byte 0x030022c0 -_08077640: .4byte 0x0203229c -_08077644: .4byte 0x030030fc + .pool _08077648: - ldr r0, _08077678 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08077680 @@ -241855,7 +232905,7 @@ _08077648: bne _0807765C b _08077B46 _0807765C: - ldr r1, _0807767C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -241868,8 +232918,7 @@ _0807765C: bl sub_800DFB4 b _08077B46 .align 2, 0 -_08077678: .4byte 0x030030fc -_0807767C: .4byte 0x030022c0 + .pool _08077680: movs r2, 0x87 lsls r2, 3 @@ -241883,13 +232932,13 @@ _08077688: b _08077B46 _08077694: bl sub_807A5B0 - ldr r1, _080776A4 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _08077B22 .align 2, 0 -_080776A4: .4byte 0x030022c0 + .pool _080776A8: bl calc_enemy_party_count movs r0, 0 @@ -241898,14 +232947,14 @@ _080776A8: movs r0, 0x50 movs r1, 0 bl lcd_io_set - ldr r2, _080777C4 + ldr r2, =0x0203229c ldr r0, [r2] - ldr r1, _080777C8 + ldr r1, =0x020244e9 ldrb r1, [r1] adds r0, 0x36 strb r1, [r0] ldr r0, [r2] - ldr r1, _080777CC + ldr r1, =0x020244ea ldrb r1, [r1] adds r0, 0x37 strb r1, [r0] @@ -241916,12 +232965,12 @@ _080776A8: cmp r6, r0 bge _08077740 mov r8, r2 - ldr r7, _080777D0 + ldr r7, =0x0832de24 _080776E2: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _080777D4 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -241940,7 +232989,7 @@ _080776E2: asrs r2, 16 ldrb r3, [r7, 0x1] lsls r3, 19 - ldr r1, _080777D8 + ldr r1, =0xfff40000 adds r3, r1 asrs r3, 16 movs r1, 0x1 @@ -241948,7 +232997,7 @@ _080776E2: str r0, [sp, 0x4] str r1, [sp, 0x8] adds r0, r5, 0 - ldr r1, _080777DC + ldr r1, =sub_80D3014 + 1 bl sub_80D2CC4 mov r2, r8 ldr r1, [r2] @@ -241964,13 +233013,13 @@ _080776E2: blt _080776E2 _08077740: movs r6, 0 - ldr r1, _080777C4 + ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x37 ldrb r0, [r0] cmp r6, r0 bge _080777B8 - ldr r0, _080777D0 + ldr r0, =0x0832de24 mov r8, r1 adds r7, r0, 0 adds r7, 0xC @@ -241978,7 +233027,7 @@ _08077756: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _080777E0 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -241998,7 +233047,7 @@ _08077756: asrs r2, 16 ldrb r3, [r7, 0x1] lsls r3, 19 - ldr r1, _080777D8 + ldr r1, =0xfff40000 adds r3, r1 asrs r3, 16 movs r1, 0x1 @@ -242007,7 +233056,7 @@ _08077756: movs r0, 0 str r0, [sp, 0x8] adds r0, r5, 0 - ldr r1, _080777DC + ldr r1, =sub_80D3014 + 1 bl sub_80D2CC4 mov r2, r8 ldr r1, [r2] @@ -242022,58 +233071,48 @@ _08077756: cmp r6, r0 blt _08077756 _080777B8: - ldr r1, _080777E4 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _08077B22 .align 2, 0 -_080777C4: .4byte 0x0203229c -_080777C8: .4byte 0x020244e9 -_080777CC: .4byte 0x020244ea -_080777D0: .4byte 0x0832de24 -_080777D4: .4byte 0x020244ec -_080777D8: .4byte 0xfff40000 -_080777DC: .4byte sub_80D3014 + 1 -_080777E0: .4byte 0x02024744 -_080777E4: .4byte 0x030022c0 + .pool _080777E8: bl sub_81B5D30 - ldr r0, _08077808 + ldr r0, =0x0203229c ldr r1, [r0] adds r0, r1, 0 adds r0, 0x36 adds r1, 0x28 movs r2, 0 bl sub_81B5D4C - ldr r1, _0807780C + ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 b _08077B22 .align 2, 0 -_08077808: .4byte 0x0203229c -_0807780C: .4byte 0x030022c0 + .pool _08077810: - ldr r0, _0807782C + ldr r0, =0x0203229c ldr r1, [r0] adds r0, r1, 0 adds r0, 0x36 adds r1, 0x28 movs r2, 0x1 bl sub_81B5D4C - ldr r1, _08077830 + ldr r1, =0x030022c0 movs r7, 0x87 lsls r7, 3 adds r1, r7 b _08077B22 .align 2, 0 -_0807782C: .4byte 0x0203229c -_08077830: .4byte 0x030022c0 + .pool _08077834: - ldr r0, _080778A4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r5, _080778A8 + ldr r5, =0x02032188 ldr r1, [r5] movs r4, 0x3 str r4, [sp] @@ -242089,14 +233128,14 @@ _08077834: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _080778AC + ldr r1, =0x020229f0 adds r0, r1 ldr r1, [r5, 0xC] str r4, [sp] movs r2, 0 movs r3, 0 bl sub_80C6D80 - ldr r4, _080778B0 + ldr r4, =0x0832de94 ldr r0, [r4] ldr r1, [r5, 0x18] movs r2, 0x2 @@ -242108,7 +233147,7 @@ _08077834: ldr r1, [r5, 0x20] movs r2, 0x18 bl sub_807A308 - ldr r1, _080778B4 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -242116,18 +233155,13 @@ _08077834: adds r0, 0x1 movs r2, 0 strb r0, [r1] - ldr r0, _080778B8 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] b _08077B46 .align 2, 0 -_080778A4: .4byte 0x03005d90 -_080778A8: .4byte 0x02032188 -_080778AC: .4byte 0x020229f0 -_080778B0: .4byte 0x0832de94 -_080778B4: .4byte 0x030022c0 -_080778B8: .4byte 0x0203229c + .pool _080778BC: bl sub_807A1F0 lsls r0, 24 @@ -242137,7 +233171,7 @@ _080778BC: _080778C8: b _08077B1A _080778CA: - ldr r0, _08077960 + ldr r0, =0x03005d90 ldr r1, [r0] movs r0, 0x1 movs r2, 0x78 @@ -242148,7 +233182,7 @@ _080778CA: adds r4, 0x10 _080778DE: add r1, sp, 0x10 - ldr r0, _08077964 + ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -242174,7 +233208,7 @@ _080778DE: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _08077968 + ldr r0, =0x020229f0 adds r1, r0 movs r0, 0x1 movs r2, 0x78 @@ -242185,7 +233219,7 @@ _080778DE: adds r4, 0x88 _0807792C: add r1, sp, 0x10 - ldr r0, _08077964 + ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -242204,18 +233238,15 @@ _0807792C: adds r6, 0x1 cmp r6, 0x2 ble _0807792C - ldr r1, _0807796C + ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 b _08077B22 .align 2, 0 -_08077960: .4byte 0x03005d90 -_08077964: .4byte 0x0832dcac -_08077968: .4byte 0x020229f0 -_0807796C: .4byte 0x030022c0 + .pool _08077970: - ldr r4, _08077A2C + ldr r4, =0x0832dcac add r1, sp, 0x10 adds r0, r4, 0 ldm r0!, {r2,r3,r7} @@ -242253,7 +233284,7 @@ _08077970: lsls r5, 13 _080779BC: add r1, sp, 0x10 - ldr r0, _08077A2C + ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -242274,8 +233305,8 @@ _080779BC: adds r6, 0x1 cmp r6, 0x5 ble _080779BC - ldr r0, _08077A30 - ldr r2, _08077A34 + ldr r0, =0x0832dc94 + ldr r2, =0x0832de24 ldrb r1, [r2] lsls r1, 19 movs r3, 0x80 @@ -242286,7 +233317,7 @@ _080779BC: lsls r2, 3 movs r3, 0x2 bl obj_add_from_template_forward_search - ldr r2, _08077A38 + ldr r2, =0x0203229c ldr r1, [r2] adds r1, 0x34 movs r3, 0 @@ -242294,7 +233325,7 @@ _080779BC: ldr r0, [r2] adds r0, 0x35 strb r3, [r0] - ldr r1, _08077A3C + ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 @@ -242305,43 +233336,37 @@ _080779BC: bl rbox_fill_rectangle b _08077B46 .align 2, 0 -_08077A2C: .4byte 0x0832dcac -_08077A30: .4byte 0x0832dc94 -_08077A34: .4byte 0x0832de24 -_08077A38: .4byte 0x0203229c -_08077A3C: .4byte 0x030022c0 + .pool _08077A40: movs r0, 0 bl sub_807A320 movs r0, 0 bl sub_8079BE0 - ldr r2, _08077A74 + ldr r2, =0x0203229c ldr r0, [r2] movs r1, 0 strb r1, [r0] ldr r0, [r2] strb r1, [r0, 0x1] bl sub_8078388 - ldr r1, _08077A78 + ldr r1, =0x030022c0 movs r7, 0x87 lsls r7, 3 adds r1, r7 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r0, _08077A7C + ldr r0, =0x000001b3 bl song_play_for_text b _08077B46 .align 2, 0 -_08077A74: .4byte 0x0203229c -_08077A78: .4byte 0x030022c0 -_08077A7C: .4byte 0x000001b3 + .pool _08077A80: movs r0, 0x1 bl sub_807A320 movs r0, 0x1 bl sub_8079BE0 - ldr r1, _08077AA4 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -242353,17 +233378,17 @@ _08077A9A: bl sub_80782B8 b _08077B1A .align 2, 0 -_08077AA4: .4byte 0x030022c0 + .pool _08077AA8: movs r0, 0x1 bl sub_80782B8 - ldr r1, _08077AB8 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _08077B22 .align 2, 0 -_08077AB8: .4byte 0x030022c0 + .pool _08077ABC: movs r0, 0x1 negs r0, r0 @@ -242372,13 +233397,13 @@ _08077ABC: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r1, _08077AD8 + ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 b _08077B22 .align 2, 0 -_08077AD8: .4byte 0x030022c0 + .pool _08077ADC: movs r1, 0x82 lsls r1, 5 @@ -242386,29 +233411,29 @@ _08077ADC: bl lcd_io_set movs r0, 0x2 bl sub_80782B8 - ldr r1, _08077AF8 + ldr r1, =0x030022c0 movs r7, 0x87 lsls r7, 3 adds r1, r7 b _08077B22 .align 2, 0 -_08077AF8: .4byte 0x030022c0 + .pool _08077AFC: movs r0, 0 bl sub_807A468 - ldr r1, _08077B0C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _08077B22 .align 2, 0 -_08077B0C: .4byte 0x030022c0 + .pool _08077B10: movs r0, 0x1 bl sub_807A468 bl sub_807A53C _08077B1A: - ldr r1, _08077B2C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -242418,17 +233443,17 @@ _08077B22: strb r0, [r1] b _08077B46 .align 2, 0 -_08077B2C: .4byte 0x030022c0 + .pool _08077B30: - ldr r0, _08077B68 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08077B46 - ldr r0, _08077B6C + ldr r0, =sub_8078C34 + 1 str r0, [r3] - ldr r0, _08077B70 + ldr r0, =sub_807825C + 1 bl set_callback2 _08077B46: bl run_remoboxes @@ -242443,9 +233468,7 @@ _08077B46: pop {r0} bx r0 .align 2, 0 -_08077B68: .4byte 0x02037fd4 -_08077B6C: .4byte sub_8078C34 + 1 -_08077B70: .4byte sub_807825C + 1 + .pool thumb_func_end sub_80773D0 thumb_func_start sub_8077B74 @@ -242454,7 +233477,7 @@ sub_8077B74: @ 8077B74 mov r7, r8 push {r7} sub sp, 0x24 - ldr r1, _08077B98 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -242465,13 +233488,12 @@ sub_8077B74: @ 8077B74 b _080780F6 _08077B8E: lsls r0, 2 - ldr r1, _08077B9C + ldr r1, =_08077BA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08077B98: .4byte 0x030022c0 -_08077B9C: .4byte _08077BA0 + .pool .align 2, 0 _08077BA0: .4byte _08077BFC @@ -242499,13 +233521,13 @@ _08077BA0: .4byte _080780E4 _08077BFC: bl sub_80772A4 - ldr r1, _08077C0C + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _080780D8 .align 2, 0 -_08077C0C: .4byte 0x030022c0 + .pool _08077C10: movs r5, 0x87 lsls r5, 3 @@ -242523,15 +233545,15 @@ _08077C20: b _080780D8 _08077C28: bl calc_player_party_count - ldr r1, _08077C38 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _080780D8 .align 2, 0 -_08077C38: .4byte 0x030022c0 + .pool _08077C3C: - ldr r0, _08077C5C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08077C50 @@ -242540,14 +233562,13 @@ _08077C3C: movs r1, 0 bl sub_800DFB4 _08077C50: - ldr r1, _08077C60 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _080780D8 .align 2, 0 -_08077C5C: .4byte 0x030030fc -_08077C60: .4byte 0x030022c0 + .pool _08077C64: movs r5, 0x87 lsls r5, 3 @@ -242555,14 +233576,14 @@ _08077C64: b _080780D8 _08077C6C: bl calc_enemy_party_count - ldr r4, _08077D8C + ldr r4, =0x0203229c ldr r0, [r4] - ldr r1, _08077D90 + ldr r1, =0x020244e9 ldrb r1, [r1] adds r0, 0x36 strb r1, [r0] ldr r0, [r4] - ldr r1, _08077D94 + ldr r1, =0x020244ea ldrb r1, [r1] adds r0, 0x37 strb r1, [r0] @@ -242579,12 +233600,12 @@ _08077C6C: cmp r6, r0 bge _08077D08 mov r8, r4 - ldr r7, _08077D98 + ldr r7, =0x0832de24 _08077CA8: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _08077D9C + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -242604,7 +233625,7 @@ _08077CA8: asrs r2, 16 ldrb r3, [r7, 0x1] lsls r3, 19 - ldr r1, _08077DA0 + ldr r1, =0xfff40000 adds r3, r1 asrs r3, 16 movs r1, 0x1 @@ -242612,7 +233633,7 @@ _08077CA8: str r0, [sp, 0x4] str r1, [sp, 0x8] adds r0, r5, 0 - ldr r1, _08077DA4 + ldr r1, =sub_80D3014 + 1 bl sub_80D2CC4 mov r2, r8 ldr r1, [r2] @@ -242628,13 +233649,13 @@ _08077CA8: blt _08077CA8 _08077D08: movs r6, 0 - ldr r1, _08077D8C + ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x37 ldrb r0, [r0] cmp r6, r0 bge _08077D80 - ldr r0, _08077D98 + ldr r0, =0x0832de24 mov r8, r1 adds r7, r0, 0 adds r7, 0xC @@ -242642,7 +233663,7 @@ _08077D1E: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _08077DA8 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -242662,7 +233683,7 @@ _08077D1E: asrs r2, 16 ldrb r3, [r7, 0x1] lsls r3, 19 - ldr r1, _08077DA0 + ldr r1, =0xfff40000 adds r3, r1 asrs r3, 16 movs r1, 0x1 @@ -242671,7 +233692,7 @@ _08077D1E: movs r0, 0 str r0, [sp, 0x8] adds r0, r5, 0 - ldr r1, _08077DA4 + ldr r1, =sub_80D3014 + 1 bl sub_80D2CC4 mov r2, r8 ldr r1, [r2] @@ -242686,58 +233707,48 @@ _08077D1E: cmp r6, r0 blt _08077D1E _08077D80: - ldr r1, _08077DAC + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _080780D8 .align 2, 0 -_08077D8C: .4byte 0x0203229c -_08077D90: .4byte 0x020244e9 -_08077D94: .4byte 0x020244ea -_08077D98: .4byte 0x0832de24 -_08077D9C: .4byte 0x020244ec -_08077DA0: .4byte 0xfff40000 -_08077DA4: .4byte sub_80D3014 + 1 -_08077DA8: .4byte 0x02024744 -_08077DAC: .4byte 0x030022c0 + .pool _08077DB0: bl sub_81B5D30 - ldr r0, _08077DD0 + ldr r0, =0x0203229c ldr r1, [r0] adds r0, r1, 0 adds r0, 0x36 adds r1, 0x28 movs r2, 0 bl sub_81B5D4C - ldr r1, _08077DD4 + ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 b _080780D8 .align 2, 0 -_08077DD0: .4byte 0x0203229c -_08077DD4: .4byte 0x030022c0 + .pool _08077DD8: - ldr r0, _08077DF4 + ldr r0, =0x0203229c ldr r1, [r0] adds r0, r1, 0 adds r0, 0x36 adds r1, 0x28 movs r2, 0x1 bl sub_81B5D4C - ldr r1, _08077DF8 + ldr r1, =0x030022c0 movs r7, 0x87 lsls r7, 3 adds r1, r7 b _080780D8 .align 2, 0 -_08077DF4: .4byte 0x0203229c -_08077DF8: .4byte 0x030022c0 + .pool _08077DFC: - ldr r0, _08077E6C + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r5, _08077E70 + ldr r5, =0x02032188 ldr r1, [r5] movs r4, 0x3 str r4, [sp] @@ -242753,14 +233764,14 @@ _08077DFC: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, _08077E74 + ldr r1, =0x020229f0 adds r0, r1 ldr r1, [r5, 0xC] str r4, [sp] movs r2, 0 movs r3, 0 bl sub_80C6D80 - ldr r4, _08077E78 + ldr r4, =0x0832de94 ldr r0, [r4] ldr r1, [r5, 0x18] movs r2, 0x2 @@ -242772,7 +233783,7 @@ _08077DFC: ldr r1, [r5, 0x20] movs r2, 0x18 bl sub_807A308 - ldr r1, _08077E7C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -242781,18 +233792,13 @@ _08077E58: adds r0, 0x1 movs r2, 0 strb r0, [r1] - ldr r0, _08077E80 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] b _080780F6 .align 2, 0 -_08077E6C: .4byte 0x03005d90 -_08077E70: .4byte 0x02032188 -_08077E74: .4byte 0x020229f0 -_08077E78: .4byte 0x0832de94 -_08077E7C: .4byte 0x030022c0 -_08077E80: .4byte 0x0203229c + .pool _08077E84: bl sub_807A1F0 lsls r0, 24 @@ -242800,15 +233806,15 @@ _08077E84: bne _08077E90 b _080780F6 _08077E90: - ldr r1, _08077E9C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _080780D8 .align 2, 0 -_08077E9C: .4byte 0x030022c0 + .pool _08077EA0: - ldr r0, _08077F38 + ldr r0, =0x03005d90 ldr r1, [r0] movs r0, 0x1 movs r2, 0x78 @@ -242819,7 +233825,7 @@ _08077EA0: adds r4, 0x10 _08077EB4: add r1, sp, 0xC - ldr r0, _08077F3C + ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -242845,7 +233851,7 @@ _08077EB4: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _08077F40 + ldr r0, =0x020229f0 adds r1, r0 movs r0, 0x1 movs r2, 0x78 @@ -242856,7 +233862,7 @@ _08077EB4: adds r4, 0x88 _08077F02: add r1, sp, 0xC - ldr r0, _08077F3C + ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -242875,18 +233881,15 @@ _08077F02: adds r6, 0x1 cmp r6, 0x2 ble _08077F02 - ldr r1, _08077F44 + ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 b _080780D8 .align 2, 0 -_08077F38: .4byte 0x03005d90 -_08077F3C: .4byte 0x0832dcac -_08077F40: .4byte 0x020229f0 -_08077F44: .4byte 0x030022c0 + .pool _08077F48: - ldr r4, _08077FD8 + ldr r4, =0x0832dcac add r1, sp, 0xC adds r0, r4, 0 ldm r0!, {r2,r3,r7} @@ -242924,7 +233927,7 @@ _08077F48: lsls r5, 13 _08077F94: add r1, sp, 0xC - ldr r0, _08077FD8 + ldr r0, =0x0832dcac ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -242945,7 +233948,7 @@ _08077F94: adds r6, 0x1 cmp r6, 0x5 ble _08077F94 - ldr r0, _08077FDC + ldr r0, =0x0203229c ldr r1, [r0] adds r2, r1, 0 adds r2, 0x35 @@ -242953,21 +233956,19 @@ _08077F94: adds r4, r0, 0 cmp r1, 0x5 bhi _08077FE4 - ldr r0, _08077FE0 + ldr r0, =0x0203cf20 ldrb r0, [r0] b _08077FEA .align 2, 0 -_08077FD8: .4byte 0x0832dcac -_08077FDC: .4byte 0x0203229c -_08077FE0: .4byte 0x0203cf20 + .pool _08077FE4: - ldr r0, _08078028 + ldr r0, =0x0203cf20 ldrb r0, [r0] adds r0, 0x6 _08077FEA: strb r0, [r2] - ldr r0, _0807802C - ldr r3, _08078030 + ldr r0, =0x0832dc94 + ldr r3, =0x0832de24 ldr r1, [r4] adds r1, 0x35 ldrb r2, [r1] @@ -242988,7 +233989,7 @@ _08077FEA: ldr r1, [r4] adds r1, 0x34 strb r0, [r1] - ldr r0, _08078034 + ldr r0, =0x030022c0 movs r7, 0x87 lsls r7, 3 adds r0, r7 @@ -242996,10 +233997,7 @@ _08077FEA: strb r1, [r0] b _080780F6 .align 2, 0 -_08078028: .4byte 0x0203cf20 -_0807802C: .4byte 0x0832dc94 -_08078030: .4byte 0x0832de24 -_08078034: .4byte 0x030022c0 + .pool _08078038: movs r0, 0 bl sub_80782B8 @@ -243007,23 +234005,22 @@ _08078038: _08078040: movs r0, 0x1 bl sub_80782B8 - ldr r2, _08078060 + ldr r2, =0x0203229c ldr r0, [r2] movs r1, 0 strb r1, [r0] ldr r0, [r2] strb r1, [r0, 0x1] bl sub_8078388 - ldr r1, _08078064 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _080780D8 .align 2, 0 -_08078060: .4byte 0x0203229c -_08078064: .4byte 0x030022c0 + .pool _08078068: - ldr r2, _0807809C + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -243041,14 +234038,13 @@ _08078068: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r1, _080780A0 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _080780D8 .align 2, 0 -_0807809C: .4byte 0x02037fd4 -_080780A0: .4byte 0x030022c0 + .pool _080780A4: movs r1, 0x82 lsls r1, 5 @@ -243056,13 +234052,13 @@ _080780A4: bl lcd_io_set movs r0, 0x2 bl sub_80782B8 - ldr r1, _080780C0 + ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 b _080780D8 .align 2, 0 -_080780C0: .4byte 0x030022c0 + .pool _080780C4: movs r7, 0x87 lsls r7, 3 @@ -243071,7 +234067,7 @@ _080780C4: _080780CC: bl sub_807A53C _080780D0: - ldr r1, _080780E0 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -243081,15 +234077,15 @@ _080780D8: strb r0, [r1] b _080780F6 .align 2, 0 -_080780E0: .4byte 0x030022c0 + .pool _080780E4: - ldr r0, _08078114 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080780F6 - ldr r0, _08078118 + ldr r0, =sub_807825C + 1 bl set_callback2 _080780F6: bl run_active_tasks @@ -243103,8 +234099,7 @@ _080780F6: pop {r0} bx r0 .align 2, 0 -_08078114: .4byte 0x02037fd4 -_08078118: .4byte sub_807825C + 1 + .pool thumb_func_end sub_8077B74 thumb_func_start sub_807811C @@ -243121,7 +234116,7 @@ sub_807811C: @ 807811C sub_8078130: @ 8078130 push {r4,lr} sub sp, 0x4 - ldr r4, _08078168 + ldr r4, =0x0203229c ldr r1, [r4] adds r1, 0xA8 ldrb r0, [r1] @@ -243148,20 +234143,20 @@ _08078160: pop {r0} bx r0 .align 2, 0 -_08078168: .4byte 0x0203229c + .pool thumb_func_end sub_8078130 thumb_func_start sub_807816C sub_807816C: @ 807816C push {r4,lr} - ldr r0, _080781A4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080781C2 - ldr r1, _080781A8 - ldr r4, _080781AC + ldr r1, =0x02032298 + ldr r4, =0x0203229c ldr r2, [r4] adds r0, r2, 0 adds r0, 0x35 @@ -243171,7 +234166,7 @@ sub_807816C: @ 807816C adds r0, 0x7E ldrb r0, [r0] strb r0, [r1, 0x1] - ldr r0, _080781B0 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080781B4 @@ -243181,10 +234176,7 @@ sub_807816C: @ 807816C strb r0, [r1] b _080781C2 .align 2, 0 -_080781A4: .4byte 0x02037fd4 -_080781A8: .4byte 0x02032298 -_080781AC: .4byte 0x0203229c -_080781B0: .4byte 0x030030fc + .pool _080781B4: movs r0, 0x20 bl sub_800ABF4 @@ -243201,10 +234193,10 @@ _080781C2: thumb_func_start sub_80781C8 sub_80781C8: @ 80781C8 push {r4,r5,lr} - ldr r5, _08078208 - ldr r0, _0807820C + ldr r5, =0x030022c0 + ldr r0, =sub_80773AC + 1 str r0, [r5, 0x8] - ldr r0, _08078210 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08078220 @@ -243212,50 +234204,42 @@ sub_80781C8: @ 80781C8 lsls r0, 24 cmp r0, 0 beq _08078244 - ldr r0, _08078214 + ldr r0, =0x02032184 ldr r0, [r0] bl free bl Window_FreeMemory - ldr r0, _08078218 + ldr r0, =0x0203229c ldr r0, [r0] bl free movs r0, 0 str r0, [r5] bl sub_800E084 - ldr r0, _0807821C + ldr r0, =sub_807AE50 + 1 bl set_callback2 b _08078244 .align 2, 0 -_08078208: .4byte 0x030022c0 -_0807820C: .4byte sub_80773AC + 1 -_08078210: .4byte 0x030030fc -_08078214: .4byte 0x02032184 -_08078218: .4byte 0x0203229c -_0807821C: .4byte sub_807AE50 + 1 + .pool _08078220: - ldr r0, _0807824C + ldr r0, =0x03003124 ldrb r4, [r0] cmp r4, 0 bne _08078244 - ldr r0, _08078250 + ldr r0, =0x02032184 ldr r0, [r0] bl free bl Window_FreeMemory - ldr r0, _08078254 + ldr r0, =0x0203229c ldr r0, [r0] bl free str r4, [r5] - ldr r0, _08078258 + ldr r0, =sub_807AE50 + 1 bl set_callback2 _08078244: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0807824C: .4byte 0x03003124 -_08078250: .4byte 0x02032184 -_08078254: .4byte 0x0203229c -_08078258: .4byte sub_807AE50 + 1 + .pool thumb_func_end sub_80781C8 thumb_func_start sub_807825C @@ -243267,7 +234251,7 @@ sub_807825C: @ 807825C bl sub_80796B4 movs r0, 0x1 bl sub_80796B4 - ldr r4, _080782B4 + ldr r4, =0x0203229c ldr r2, [r4] ldrb r1, [r2] adds r0, r1, 0x1 @@ -243294,7 +234278,7 @@ sub_807825C: @ 807825C pop {r0} bx r0 .align 2, 0 -_080782B4: .4byte 0x0203229c + .pool thumb_func_end sub_807825C thumb_func_start sub_80782B8 @@ -243315,17 +234299,17 @@ _080782CE: beq _0807834C b _0807837E _080782D4: - ldr r0, _08078314 + ldr r0, =0x08ddb3e4 movs r1, 0 movs r2, 0x60 bl gpu_pal_apply - ldr r1, _08078318 + ldr r1, =0x08ddb464 movs r2, 0x94 lsls r2, 5 movs r0, 0x1 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r1, _0807831C + ldr r1, =0x08ddcf04 movs r0, 0x20 str r0, [sp] movs r0, 0x14 @@ -243335,7 +234319,7 @@ _080782D4: movs r2, 0 movs r3, 0 bl bg_copy_tilemap_rect_simple - ldr r1, _08078320 + ldr r1, =0x0832cabc movs r2, 0x80 lsls r2, 4 movs r0, 0x2 @@ -243343,12 +234327,9 @@ _080782D4: bl gpu_copy_bg_tile_map_to_vram b _0807837E .align 2, 0 -_08078314: .4byte 0x08ddb3e4 -_08078318: .4byte 0x08ddb464 -_0807831C: .4byte 0x08ddcf04 -_08078320: .4byte 0x0832cabc + .pool _08078324: - ldr r1, _08078348 + ldr r1, =0x0832d2bc movs r2, 0x80 lsls r2, 4 movs r0, 0x3 @@ -243362,7 +234343,7 @@ _08078324: bl gpu_copy_wram_bg_tilemap_to_vram b _0807837E .align 2, 0 -_08078348: .4byte 0x0832d2bc + .pool _0807834C: movs r5, 0x80 lsls r5, 21 @@ -243399,9 +234380,9 @@ sub_8078388: @ 8078388 mov r6, r8 push {r6,r7} movs r3, 0 - ldr r5, _080783D8 + ldr r5, =0x0203229c mov r8, r5 - ldr r0, _080783DC + ldr r0, =0x02020630 mov r12, r0 movs r1, 0x5 negs r1, r1 @@ -243435,8 +234416,7 @@ _080783A6: strb r7, [r0] b _080783E6 .align 2, 0 -_080783D8: .4byte 0x0203229c -_080783DC: .4byte 0x02020630 + .pool _080783E0: adds r0, 0x38 adds r0, r3 @@ -243516,7 +234496,7 @@ shedinja_maker_maybe: @ 8078458 bl link_get_multiplayer_id lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0807847C + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x69 ldrb r0, [r0] @@ -243525,13 +234505,12 @@ shedinja_maker_maybe: @ 8078458 b _080787AA _08078472: lsls r0, 2 - ldr r1, _08078480 + ldr r1, =_08078484 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807847C: .4byte 0x0203229c -_08078480: .4byte _08078484 + .pool .align 2, 0 _08078484: .4byte _080784DC @@ -243557,11 +234536,11 @@ _08078484: .4byte _080786F0 .4byte _08078720 _080784DC: - ldr r0, _080784FC - ldr r1, _08078500 + ldr r0, =0x020228c4 + ldr r1, =0x020244ec movs r2, 0xC8 bl sub_8078438 - ldr r3, _08078504 + ldr r3, =0x0203229c ldr r1, [r3] adds r1, 0x69 ldrb r0, [r1] @@ -243573,9 +234552,7 @@ _080784DC: strb r2, [r0] b _080787AA .align 2, 0 -_080784FC: .4byte 0x020228c4 -_08078500: .4byte 0x020244ec -_08078504: .4byte 0x0203229c + .pool _08078508: bl sub_80771BC cmp r0, 0 @@ -243585,233 +234562,215 @@ _08078512: bl sub_8077200 cmp r0, 0 bne _08078524 - ldr r0, _08078520 + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_08078520: .4byte 0x0203229c + .pool _08078524: bl sub_8077210 - ldr r0, _08078530 + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_08078530: .4byte 0x0203229c + .pool _08078534: cmp r5, 0 bne _0807853E movs r0, 0x1 bl sub_80771AC _0807853E: - ldr r0, _08078544 + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_08078544: .4byte 0x0203229c + .pool _08078548: bl sub_8077200 cmp r0, 0x3 beq _08078552 b _080787AA _08078552: - ldr r0, _08078570 + ldr r0, =0x02024744 movs r2, 0x1 adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _08078574 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0xC8 bl sub_8078438 bl sub_8077210 - ldr r0, _08078578 + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_08078570: .4byte 0x02024744 -_08078574: .4byte 0x020223c4 -_08078578: .4byte 0x0203229c + .pool _0807857C: - ldr r0, _0807858C - ldr r1, _08078590 + ldr r0, =0x020228c4 + ldr r1, =0x020245b4 movs r2, 0xC8 bl sub_8078438 - ldr r0, _08078594 + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_0807858C: .4byte 0x020228c4 -_08078590: .4byte 0x020245b4 -_08078594: .4byte 0x0203229c + .pool _08078598: cmp r5, 0 bne _080785A2 movs r0, 0x1 bl sub_80771AC _080785A2: - ldr r0, _080785A8 + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_080785A8: .4byte 0x0203229c + .pool _080785AC: bl sub_8077200 cmp r0, 0x3 beq _080785B6 b _080787AA _080785B6: - ldr r0, _080785D4 + ldr r0, =0x0202480c movs r2, 0x1 adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _080785D8 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0xC8 bl sub_8078438 bl sub_8077210 - ldr r0, _080785DC + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_080785D4: .4byte 0x0202480c -_080785D8: .4byte 0x020223c4 -_080785DC: .4byte 0x0203229c + .pool _080785E0: - ldr r0, _080785F0 - ldr r1, _080785F4 + ldr r0, =0x020228c4 + ldr r1, =0x0202467c movs r2, 0xC8 bl sub_8078438 - ldr r0, _080785F8 + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_080785F0: .4byte 0x020228c4 -_080785F4: .4byte 0x0202467c -_080785F8: .4byte 0x0203229c + .pool _080785FC: cmp r5, 0 bne _08078606 movs r0, 0x1 bl sub_80771AC _08078606: - ldr r0, _0807860C + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_0807860C: .4byte 0x0203229c + .pool _08078610: bl sub_8077200 cmp r0, 0x3 beq _0807861A b _080787AA _0807861A: - ldr r0, _08078638 + ldr r0, =0x020248d4 movs r2, 0x1 adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0807863C + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0xC8 bl sub_8078438 bl sub_8077210 - ldr r0, _08078640 + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_08078638: .4byte 0x020248d4 -_0807863C: .4byte 0x020223c4 -_08078640: .4byte 0x0203229c + .pool _08078644: - ldr r0, _0807865C - ldr r1, _08078660 + ldr r0, =0x020228c4 + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r2, _08078664 + ldr r2, =0x00002be0 adds r1, r2 movs r2, 0xDC bl sub_8078438 - ldr r0, _08078668 + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_0807865C: .4byte 0x020228c4 -_08078660: .4byte 0x03005d8c -_08078664: .4byte 0x00002be0 -_08078668: .4byte 0x0203229c + .pool _0807866C: cmp r5, 0 bne _08078676 movs r0, 0x3 bl sub_80771AC _08078676: - ldr r0, _0807867C + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_0807867C: .4byte 0x0203229c + .pool _08078680: bl sub_8077200 cmp r0, 0x3 beq _0807868A b _080787AA _0807868A: - ldr r0, _080786A8 + ldr r0, =0x020321c0 movs r2, 0x1 adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _080786AC + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0xD8 bl sub_8078438 bl sub_8077210 - ldr r0, _080786B0 + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_080786A8: .4byte 0x020321c0 -_080786AC: .4byte 0x020223c4 -_080786B0: .4byte 0x0203229c + .pool _080786B4: - ldr r0, _080786CC - ldr r1, _080786D0 + ldr r0, =0x020228c4 + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r2, _080786D4 + ldr r2, =0x000031a8 adds r1, r2 movs r2, 0xB bl sub_8078438 - ldr r0, _080786D8 + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_080786CC: .4byte 0x020228c4 -_080786D0: .4byte 0x03005d8c -_080786D4: .4byte 0x000031a8 -_080786D8: .4byte 0x0203229c + .pool _080786DC: cmp r5, 0 bne _080786E6 movs r0, 0x4 bl sub_80771AC _080786E6: - ldr r0, _080786EC + ldr r0, =0x0203229c ldr r1, [r0] b _080787A2 .align 2, 0 -_080786EC: .4byte 0x0203229c + .pool _080786F0: bl sub_8077200 cmp r0, 0x3 bne _080787AA - ldr r4, _08078718 + ldr r4, =0x0203229c ldr r0, [r4] adds r0, 0xA9 movs r2, 0x1 adds r1, r5, 0 eors r1, r2 lsls r1, 8 - ldr r2, _0807871C + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0xB bl sub_8078438 @@ -243819,11 +234778,10 @@ _080786F0: ldr r1, [r4] b _080787A2 .align 2, 0 -_08078718: .4byte 0x0203229c -_0807871C: .4byte 0x020223c4 + .pool _08078720: - ldr r4, _08078774 - ldr r6, _08078778 + ldr r4, =0x02024744 + ldr r6, =0x0000012f movs r5, 0x5 _08078726: adds r0, r4, 0 @@ -243845,13 +234803,13 @@ _08078726: mov r2, sp bl pokemon_getattr mov r0, sp - ldr r1, _0807877C + ldr r1, =0x0832df94 bl sub_80092BC cmp r0, 0 bne _08078766 adds r0, r4, 0 movs r1, 0x2 - ldr r2, _08078780 + ldr r2, =0x083192cd bl pokemon_setattr _08078766: adds r4, 0x64 @@ -243861,12 +234819,9 @@ _08078766: movs r0, 0x1 b _080787AC .align 2, 0 -_08078774: .4byte 0x02024744 -_08078778: .4byte 0x0000012f -_0807877C: .4byte 0x0832df94 -_08078780: .4byte 0x083192cd + .pool _08078784: - ldr r2, _080787B4 + ldr r2, =0x0203229c ldr r1, [r2] adds r1, 0xA8 ldrb r0, [r1] @@ -243894,28 +234849,26 @@ _080787AC: pop {r1} bx r1 .align 2, 0 -_080787B4: .4byte 0x0203229c + .pool thumb_func_end shedinja_maker_maybe thumb_func_start sub_80787B8 sub_80787B8: @ 80787B8 push {lr} - ldr r0, _080787D4 - ldr r1, _080787D8 + ldr r0, =0x0832dae5 + ldr r1, =0x0203229c ldr r1, [r1] adds r1, 0x72 ldrh r1, [r1] lsls r1, 5 - ldr r2, _080787DC + ldr r2, =0x06010000 adds r1, r2 movs r2, 0x18 bl sub_807A308 pop {r0} bx r0 .align 2, 0 -_080787D4: .4byte 0x0832dae5 -_080787D8: .4byte 0x0203229c -_080787DC: .4byte 0x06010000 + .pool thumb_func_end sub_80787B8 thumb_func_start sub_80787E0 @@ -243928,54 +234881,50 @@ sub_80787E0: @ 80787E0 ands r0, r2 cmp r0, 0 beq _08078864 - ldr r0, _08078808 + ldr r0, =0x020223c4 ldrh r1, [r0] - ldr r0, _0807880C + ldr r0, =0x0000bbbb cmp r1, r0 beq _08078844 cmp r1, r0 bgt _08078814 - ldr r0, _08078810 + ldr r0, =0x0000aabb cmp r1, r0 beq _08078834 b _0807885E .align 2, 0 -_08078808: .4byte 0x020223c4 -_0807880C: .4byte 0x0000bbbb -_08078810: .4byte 0x0000aabb + .pool _08078814: - ldr r0, _08078828 + ldr r0, =0x0000bbcc cmp r1, r0 beq _08078854 - ldr r0, _0807882C + ldr r0, =0x0000eeaa cmp r1, r0 bne _0807885E - ldr r0, _08078830 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x78 b _0807885A .align 2, 0 -_08078828: .4byte 0x0000bbcc -_0807882C: .4byte 0x0000eeaa -_08078830: .4byte 0x0203229c + .pool _08078834: - ldr r0, _08078840 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x78 strb r2, [r0] b _0807885E .align 2, 0 -_08078840: .4byte 0x0203229c + .pool _08078844: - ldr r0, _08078850 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x7A strb r2, [r0] b _0807885E .align 2, 0 -_08078850: .4byte 0x0203229c + .pool _08078854: - ldr r0, _0807888C + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x7A _0807885A: @@ -243990,42 +234939,37 @@ _08078864: ands r0, r2 cmp r0, 0 beq _080788F6 - ldr r3, _08078890 + ldr r3, =0x020223c4 movs r1, 0x80 lsls r1, 1 adds r0, r3, r1 ldrh r1, [r0] - ldr r0, _08078894 + ldr r0, =0x0000bbbb cmp r1, r0 beq _080788D8 cmp r1, r0 bgt _0807889C - ldr r0, _08078898 + ldr r0, =0x0000aabb cmp r1, r0 beq _080788BC b _080788F0 .align 2, 0 -_0807888C: .4byte 0x0203229c -_08078890: .4byte 0x020223c4 -_08078894: .4byte 0x0000bbbb -_08078898: .4byte 0x0000aabb + .pool _0807889C: - ldr r0, _080788B0 + ldr r0, =0x0000bbcc cmp r1, r0 beq _080788E8 - ldr r0, _080788B4 + ldr r0, =0x0000eeaa cmp r1, r0 bne _080788F0 - ldr r0, _080788B8 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x79 b _080788EE .align 2, 0 -_080788B0: .4byte 0x0000bbcc -_080788B4: .4byte 0x0000eeaa -_080788B8: .4byte 0x0203229c + .pool _080788BC: - ldr r2, _080788D4 + ldr r2, =0x0203229c ldr r1, [r2] movs r4, 0x81 lsls r4, 1 @@ -244038,9 +234982,9 @@ _080788BC: adds r0, 0x79 b _080788DE .align 2, 0 -_080788D4: .4byte 0x0203229c + .pool _080788D8: - ldr r0, _080788E4 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x7B _080788DE: @@ -244048,9 +234992,9 @@ _080788DE: strb r1, [r0] b _080788F0 .align 2, 0 -_080788E4: .4byte 0x0203229c + .pool _080788E8: - ldr r0, _080788FC + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x7B _080788EE: @@ -244063,7 +235007,7 @@ _080788F6: pop {r0} bx r0 .align 2, 0 -_080788FC: .4byte 0x0203229c + .pool thumb_func_end sub_80787E0 thumb_func_start sub_8078900 @@ -244076,27 +235020,24 @@ sub_8078900: @ 8078900 ands r0, r5 cmp r0, 0 beq _080789E2 - ldr r2, _0807892C + ldr r2, =0x020223c4 ldrh r1, [r2] - ldr r0, _08078930 + ldr r0, =0x0000ddee cmp r1, r0 beq _080789CC cmp r1, r0 bgt _0807893C - ldr r0, _08078934 + ldr r0, =0x0000ccdd cmp r1, r0 beq _080789AC - ldr r0, _08078938 + ldr r0, =0x0000dddd cmp r1, r0 beq _08078978 b _080789DC .align 2, 0 -_0807892C: .4byte 0x020223c4 -_08078930: .4byte 0x0000ddee -_08078934: .4byte 0x0000ccdd -_08078938: .4byte 0x0000dddd + .pool _0807893C: - ldr r0, _0807894C + ldr r0, =0x0000eebb cmp r1, r0 beq _08078950 adds r0, 0x11 @@ -244104,7 +235045,7 @@ _0807893C: beq _08078974 b _080789DC .align 2, 0 -_0807894C: .4byte 0x0000eebb + .pool _08078950: movs r0, 0x1 negs r0, r0 @@ -244115,18 +235056,18 @@ _08078950: bl sub_80A1AD4 movs r0, 0x4 bl sub_807A19C - ldr r0, _08078970 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0xB b _080789DA .align 2, 0 -_08078970: .4byte 0x0203229c + .pool _08078974: movs r0, 0x5 b _080789CE _08078978: - ldr r4, _080789A8 + ldr r4, =0x0203229c ldr r1, [r4] ldrb r0, [r2, 0x2] adds r0, 0x6 @@ -244147,7 +235088,7 @@ _08078978: movs r1, 0x7 b _080789DA .align 2, 0 -_080789A8: .4byte 0x0203229c + .pool _080789AC: movs r0, 0x1 negs r0, r0 @@ -244156,18 +235097,18 @@ _080789AC: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080789C8 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0xA b _080789DA .align 2, 0 -_080789C8: .4byte 0x0203229c + .pool _080789CC: movs r0, 0x1 _080789CE: bl sub_807A19C - ldr r0, _080789F8 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x8 @@ -244189,14 +235130,14 @@ _080789F0: pop {r0} bx r0 .align 2, 0 -_080789F8: .4byte 0x0203229c + .pool thumb_func_end sub_8078900 thumb_func_start sub_80789FC sub_80789FC: @ 80789FC push {r4-r6,lr} sub sp, 0x4 - ldr r6, _08078A58 + ldr r6, =0x0203229c ldr r2, [r6] adds r1, r2, 0 adds r1, 0x78 @@ -244213,7 +235154,7 @@ _08078A10: b _08078B44 _08078A1C: ldrh r1, [r1] - ldr r0, _08078A5C + ldr r0, =0x00000101 cmp r1, r0 bne _08078A64 adds r1, r2, 0 @@ -244224,7 +235165,7 @@ _08078A1C: adds r1, r2, 0 adds r1, 0x80 movs r4, 0 - ldr r0, _08078A60 + ldr r0, =0x0000dddd strh r0, [r1] adds r0, r2, 0 adds r0, 0x35 @@ -244242,11 +235183,9 @@ _08078A1C: strb r4, [r0] b _08078B44 .align 2, 0 -_08078A58: .4byte 0x0203229c -_08078A5C: .4byte 0x00000101 -_08078A60: .4byte 0x0000dddd + .pool _08078A64: - ldr r0, _08078AAC + ldr r0, =0x00000201 cmp r1, r0 bne _08078AB4 movs r0, 0x1 @@ -244256,7 +235195,7 @@ _08078A64: adds r2, 0x80 movs r4, 0 movs r3, 0 - ldr r0, _08078AB0 + ldr r0, =0x0000eecc strh r0, [r2] adds r1, 0x82 strh r3, [r1] @@ -244280,8 +235219,7 @@ _08078A64: movs r1, 0x8 b _08078B42 .align 2, 0 -_08078AAC: .4byte 0x00000201 -_08078AB0: .4byte 0x0000eecc + .pool _08078AB4: movs r0, 0x81 lsls r0, 1 @@ -244294,7 +235232,7 @@ _08078AB4: adds r2, 0x80 movs r4, 0 movs r3, 0 - ldr r0, _08078AFC + ldr r0, =0x0000ddee strh r0, [r2] adds r1, 0x82 strh r3, [r1] @@ -244318,16 +235256,16 @@ _08078AB4: movs r1, 0x8 b _08078B42 .align 2, 0 -_08078AFC: .4byte 0x0000ddee + .pool _08078B00: - ldr r0, _08078BE4 + ldr r0, =0x00000202 cmp r1, r0 bne _08078B44 adds r1, r2, 0 adds r1, 0x80 movs r5, 0 movs r4, 0 - ldr r0, _08078BE8 + ldr r0, =0x0000eebb strh r0, [r1] adds r0, r2, 0 adds r0, 0x82 @@ -244354,7 +235292,7 @@ _08078B00: _08078B42: strb r1, [r0] _08078B44: - ldr r5, _08078BEC + ldr r5, =0x0203229c ldr r3, [r5] adds r1, r3, 0 adds r1, 0x7A @@ -244367,14 +235305,14 @@ _08078B44: cmp r0, 0 beq _08078BDC ldrh r1, [r1] - ldr r0, _08078BF0 + ldr r0, =0x00000101 cmp r1, r0 bne _08078B92 adds r1, r3, 0 adds r1, 0x80 movs r4, 0 movs r2, 0 - ldr r0, _08078BF4 + ldr r0, =0x0000ccdd strh r0, [r1] adds r0, r3, 0 adds r0, 0x82 @@ -244412,7 +235350,7 @@ _08078BA8: adds r2, 0x80 movs r4, 0 movs r3, 0 - ldr r0, _08078BF8 + ldr r0, =0x0000ddee strh r0, [r2] adds r1, 0x82 strh r3, [r1] @@ -244435,12 +235373,7 @@ _08078BDC: pop {r0} bx r0 .align 2, 0 -_08078BE4: .4byte 0x00000202 -_08078BE8: .4byte 0x0000eebb -_08078BEC: .4byte 0x0203229c -_08078BF0: .4byte 0x00000101 -_08078BF4: .4byte 0x0000ccdd -_08078BF8: .4byte 0x0000ddee + .pool thumb_func_end sub_80789FC thumb_func_start sub_8078BFC @@ -244464,7 +235397,7 @@ sub_8078C10: @ 8078C10 lsrs r3, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _08078C30 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x80 adds r1, r3, 0 @@ -244472,7 +235405,7 @@ sub_8078C10: @ 8078C10 pop {r0} bx r0 .align 2, 0 -_08078C30: .4byte 0x0203229c + .pool thumb_func_end sub_8078C10 thumb_func_start sub_8078C34 @@ -244513,9 +235446,9 @@ sub_8078C6C: @ 8078C6C lsrs r1, 24 movs r6, 0 movs r5, 0 - ldr r2, _08078CA0 + ldr r2, =0x0203229c ldr r3, [r2] - ldr r4, _08078CA4 + ldr r4, =0x0832dcec lsls r2, r1, 1 adds r2, r1 lsls r2, 1 @@ -244534,8 +235467,7 @@ _08078C92: adds r6, r1, 0 b _08078CB0 .align 2, 0 -_08078CA0: .4byte 0x0203229c -_08078CA4: .4byte 0x0832dcec + .pool _08078CA8: adds r2, 0x1 adds r5, 0x1 @@ -244560,14 +235492,14 @@ sub_8078CB8: @ 8078CB8 lsrs r6, r0, 24 cmp r6, 0xC bne _08078D10 - ldr r5, _08078D08 + ldr r5, =0x0203229c ldr r0, [r5] adds r0, 0x34 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08078D0C + ldr r4, =0x02020630 adds r0, r4 movs r1, 0x1 bl obj_anim_image_start @@ -244589,17 +235521,16 @@ sub_8078CB8: @ 8078CB8 strh r1, [r0, 0x22] b _08078D58 .align 2, 0 -_08078D08: .4byte 0x0203229c -_08078D0C: .4byte 0x02020630 + .pool _08078D10: - ldr r4, _08078D6C + ldr r4, =0x0203229c ldr r0, [r4] adds r0, 0x34 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08078D70 + ldr r5, =0x02020630 adds r0, r5 movs r1, 0 bl obj_anim_image_start @@ -244610,7 +235541,7 @@ _08078D10: adds r1, r0 lsls r1, 2 adds r1, r5 - ldr r2, _08078D74 + ldr r2, =0x0832de24 lsls r3, r6, 1 adds r0, r3, r2 ldrb r0, [r0] @@ -244639,9 +235570,7 @@ _08078D64: pop {r0} bx r0 .align 2, 0 -_08078D6C: .4byte 0x0203229c -_08078D70: .4byte 0x02020630 -_08078D74: .4byte 0x0832de24 + .pool thumb_func_end sub_8078CB8 thumb_func_start sub_8078D78 @@ -244649,7 +235578,7 @@ sub_8078D78: @ 8078D78 push {r4,lr} movs r0, 0 bl sub_807A19C - ldr r4, _08078DA4 + ldr r4, =0x0203229c ldr r0, [r4] adds r0, 0x6F movs r1, 0x64 @@ -244659,15 +235588,14 @@ sub_8078D78: @ 8078D78 lsrs r0, 24 cmp r0, 0x1 bne _08078DAC - ldr r0, _08078DA8 + ldr r0, =0x0000aabb ldr r1, [r4] adds r1, 0x35 ldrb r1, [r1] bl sub_8078C10 b _08078DB4 .align 2, 0 -_08078DA4: .4byte 0x0203229c -_08078DA8: .4byte 0x0000aabb + .pool _08078DAC: ldr r0, [r4] adds r0, 0x78 @@ -244683,59 +235611,58 @@ _08078DB4: sub_8078DBC: @ 8078DBC push {r4,lr} sub sp, 0x4 - ldr r0, _08078DDC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _08078DE4 - ldr r0, _08078DE0 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x35 movs r1, 0 bl sub_8078CB8 b _08078E30 .align 2, 0 -_08078DDC: .4byte 0x030022c0 -_08078DE0: .4byte 0x0203229c + .pool _08078DE4: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _08078E00 - ldr r0, _08078DFC + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x35 movs r1, 0x1 bl sub_8078CB8 b _08078E30 .align 2, 0 -_08078DFC: .4byte 0x0203229c + .pool _08078E00: movs r0, 0x20 ands r0, r1 cmp r0, 0 beq _08078E1C - ldr r0, _08078E18 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x35 movs r1, 0x2 bl sub_8078CB8 b _08078E30 .align 2, 0 -_08078E18: .4byte 0x0203229c + .pool _08078E1C: movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _08078E30 - ldr r0, _08078E8C + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x35 movs r1, 0x3 bl sub_8078CB8 _08078E30: - ldr r0, _08078E90 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -244743,7 +235670,7 @@ _08078E30: beq _08078EE4 movs r0, 0x5 bl audio_play - ldr r4, _08078E8C + ldr r4, =0x0203229c ldr r0, [r4] adds r0, 0x35 ldrb r0, [r0] @@ -244756,7 +235683,7 @@ _08078E30: movs r0, 0x1 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _08078E94 + ldr r2, =0x0832deac movs r0, 0x1 movs r1, 0x2 bl PrintMenuTable @@ -244775,9 +235702,7 @@ _08078E30: strb r1, [r0] b _08078EE4 .align 2, 0 -_08078E8C: .4byte 0x0203229c -_08078E90: .4byte 0x030022c0 -_08078E94: .4byte 0x0832deac + .pool _08078E98: cmp r0, 0xB bhi _08078EB6 @@ -244796,7 +235721,7 @@ _08078E98: _08078EB6: cmp r0, 0xC bne _08078EE4 - ldr r0, _08078EEC + ldr r0, =0x0832df8c movs r1, 0x1 movs r2, 0xE movs r3, 0 @@ -244805,13 +235730,13 @@ _08078EB6: adds r0, 0x6F movs r1, 0x4 strb r1, [r0] - ldr r0, _08078EF0 + ldr r0, =0x0832de94 ldr r0, [r0, 0x10] ldr r1, [r4] adds r1, 0x72 ldrh r1, [r1] lsls r1, 5 - ldr r2, _08078EF4 + ldr r2, =0x06010000 adds r1, r2 movs r2, 0x18 bl sub_807A308 @@ -244821,21 +235746,19 @@ _08078EE4: pop {r0} bx r0 .align 2, 0 -_08078EEC: .4byte 0x0832df8c -_08078EF0: .4byte 0x0832de94 -_08078EF4: .4byte 0x06010000 + .pool thumb_func_end sub_8078DBC thumb_func_start sub_8078EF8 sub_8078EF8: @ 8078EF8 push {lr} bl sub_8079F74 - ldr r3, _08078F40 + ldr r3, =0x0203229c ldr r0, [r3] adds r0, 0x6F movs r1, 0 strb r1, [r0] - ldr r2, _08078F44 + ldr r2, =0x02020630 ldr r0, [r3] adds r0, 0x34 ldrb r1, [r0] @@ -244849,23 +235772,20 @@ sub_8078EF8: @ 8078EF8 negs r1, r1 ands r1, r2 strb r1, [r0] - ldr r0, _08078F48 + ldr r0, =0x0832de94 ldr r0, [r0, 0x4] ldr r1, [r3] adds r1, 0x72 ldrh r1, [r1] lsls r1, 5 - ldr r2, _08078F4C + ldr r2, =0x06010000 adds r1, r2 movs r2, 0x18 bl sub_807A308 pop {r0} bx r0 .align 2, 0 -_08078F40: .4byte 0x0203229c -_08078F44: .4byte 0x02020630 -_08078F48: .4byte 0x0832de94 -_08078F4C: .4byte 0x06010000 + .pool thumb_func_end sub_8078EF8 thumb_func_start sub_8078F50 @@ -244898,18 +235818,18 @@ _08078F7E: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08078F98 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x2 b _08079028 .align 2, 0 -_08078F98: .4byte 0x0203229c + .pool _08078F9C: - ldr r0, _08078FBC - ldr r1, _08078FC0 + ldr r0, =0x020244ec + ldr r1, =0x020244e9 ldrb r1, [r1] - ldr r2, _08078FC4 + ldr r2, =0x0203229c ldr r2, [r2] adds r2, 0x35 ldrb r2, [r2] @@ -244917,15 +235837,12 @@ _08078F9C: cmp r0, 0x5 bhi _0807902A lsls r0, 2 - ldr r1, _08078FC8 + ldr r1, =_08078FCC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08078FBC: .4byte 0x020244ec -_08078FC0: .4byte 0x020244e9 -_08078FC4: .4byte 0x0203229c -_08078FC8: .4byte _08078FCC + .pool .align 2, 0 _08078FCC: .4byte _08078FE4 @@ -244936,8 +235853,8 @@ _08078FCC: .4byte _08079018 _08078FE4: bl sub_8078D78 - ldr r2, _08079004 - ldr r0, _08079008 + ldr r2, =0x02020630 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x34 ldrb r1, [r0] @@ -244951,8 +235868,7 @@ _08078FE4: orrs r1, r2 b _08079028 .align 2, 0 -_08079004: .4byte 0x02020630 -_08079008: .4byte 0x0203229c + .pool _0807900C: movs r0, 0x3 movs r1, 0x3 @@ -244966,7 +235882,7 @@ _08079018: movs r1, 0x7 _0807901C: bl sub_807A048 - ldr r0, _08079030 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x8 @@ -244977,13 +235893,13 @@ _0807902A: pop {r0} bx r0 .align 2, 0 -_08079030: .4byte 0x0203229c + .pool thumb_func_end sub_8078F50 thumb_func_start sub_8079034 sub_8079034: @ 8079034 push {lr} - ldr r0, _08079058 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -245001,45 +235917,42 @@ _08079054: pop {r0} bx r0 .align 2, 0 -_08079058: .4byte 0x030022c0 + .pool thumb_func_end sub_8079034 thumb_func_start sub_807905C sub_807905C: @ 807905C push {lr} sub sp, 0x4 - ldr r0, _08079094 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080790C4 - ldr r0, _08079098 + ldr r0, =0x0203229c ldr r0, [r0] adds r3, r0, 0 adds r3, 0x35 ldrb r2, [r3] cmp r2, 0x5 bhi _080790A4 - ldr r1, _0807909C + ldr r1, =0x020244ec ldrb r2, [r3] adds r0, 0x36 ldrb r3, [r0] subs r3, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, _080790A0 + ldr r0, =sub_8077B74 + 1 str r0, [sp] movs r0, 0x1 bl sub_81BF8EC b _080790C0 .align 2, 0 -_08079094: .4byte 0x02037fd4 -_08079098: .4byte 0x0203229c -_0807909C: .4byte 0x020244ec -_080790A0: .4byte sub_8077B74 + 1 + .pool _080790A4: - ldr r1, _080790CC + ldr r1, =0x02024744 subs r2, 0x6 lsls r2, 24 lsrs r2, 24 @@ -245048,7 +235961,7 @@ _080790A4: subs r3, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, _080790D0 + ldr r0, =sub_8077B74 + 1 str r0, [sp] movs r0, 0x1 bl sub_81BF8EC @@ -245059,8 +235972,7 @@ _080790C4: pop {r0} bx r0 .align 2, 0 -_080790CC: .4byte 0x02024744 -_080790D0: .4byte sub_8077B74 + 1 + .pool thumb_func_end sub_807905C thumb_func_start sub_80790D4 @@ -245075,7 +235987,7 @@ sub_80790D4: @ 80790D4 lsrs r6, r3, 24 movs r5, 0 movs r3, 0 - ldr r7, _0807915C + ldr r7, =0x02024744 cmp r5, r1 bge _08079102 _080790EE: @@ -245120,7 +236032,7 @@ _08079138: bl sub_809D42C cmp r0, 0 bne _08079164 - ldr r0, _08079160 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x57 adds r0, r6 @@ -245135,8 +236047,7 @@ _08079158: movs r0, 0x2 b _0807916C .align 2, 0 -_0807915C: .4byte 0x02024744 -_08079160: .4byte 0x0203229c + .pool _08079164: cmp r5, 0 beq _0807916A @@ -245154,7 +236065,7 @@ sub_8079174: @ 8079174 push {r4,r5,lr} sub sp, 0xC movs r2, 0 - ldr r0, _080791CC + ldr r0, =0x0203229c ldr r1, [r0] adds r3, r1, 0 adds r3, 0x36 @@ -245196,7 +236107,7 @@ _080791A0: beq _080791D6 b _0807920C .align 2, 0 -_080791CC: .4byte 0x0203229c + .pool _080791D0: cmp r0, 0x2 beq _08079200 @@ -245205,21 +236116,21 @@ _080791D6: movs r0, 0x3 movs r1, 0x3 bl sub_807A048 - ldr r0, _080791E4 + ldr r0, =0x0000bbcc b _080791F2 .align 2, 0 -_080791E4: .4byte 0x0000bbcc + .pool _080791E8: movs r0, 0x3 movs r1, 0x1 bl sub_807A048 - ldr r0, _080791FC + ldr r0, =0x0000bbbb _080791F2: movs r1, 0 bl sub_8078C10 b _0807920C .align 2, 0 -_080791FC: .4byte 0x0000bbbb + .pool _08079200: movs r0, 0x3 movs r1, 0x8 @@ -245258,15 +236169,15 @@ _0807923A: bl sub_8079174 cmp r0, 0 bne _08079250 - ldr r0, _0807924C + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x64 b _08079258 .align 2, 0 -_0807924C: .4byte 0x0203229c + .pool _08079250: - ldr r0, _08079264 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x11 @@ -245276,7 +236187,7 @@ _08079258: bl Window_WriteStandardTileMap b _08079290 .align 2, 0 -_08079264: .4byte 0x0203229c + .pool _08079268: movs r0, 0x3 movs r1, 0x1 @@ -245284,11 +236195,11 @@ _08079268: bl sub_80771BC cmp r0, 0 beq _08079280 - ldr r0, _08079294 + ldr r0, =0x0000bbcc movs r1, 0 bl sub_8078C10 _08079280: - ldr r0, _08079298 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x64 @@ -245299,15 +236210,14 @@ _08079290: pop {r0} bx r0 .align 2, 0 -_08079294: .4byte 0x0000bbcc -_08079298: .4byte 0x0203229c + .pool thumb_func_end sub_8079218 thumb_func_start sub_807929C sub_807929C: @ 807929C push {r4-r6,lr} movs r5, 0 - ldr r0, _080792E0 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x37 ldrb r0, [r0] @@ -245327,7 +236237,7 @@ _080792B2: lsls r0, 17 adds r6, r0 adds r5, 0x1 - ldr r0, _080792E0 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x37 ldrb r0, [r0] @@ -245339,7 +236249,7 @@ _080792D8: pop {r0} bx r0 .align 2, 0 -_080792E0: .4byte 0x0203229c + .pool thumb_func_end sub_807929C thumb_func_start sub_80792E4 @@ -245364,11 +236274,11 @@ _08079300: _08079306: movs r0, 0x4 bl sub_807A19C - ldr r0, _08079340 + ldr r0, =0x0000eeaa movs r1, 0 bl sub_8078C10 - ldr r2, _08079344 - ldr r3, _08079348 + ldr r2, =0x02020630 + ldr r3, =0x0203229c ldr r0, [r3] adds r0, 0x34 ldrb r1, [r0] @@ -245388,9 +236298,7 @@ _08079306: bl sub_807929C b _08079356 .align 2, 0 -_08079340: .4byte 0x0000eeaa -_08079344: .4byte 0x02020630 -_08079348: .4byte 0x0203229c + .pool _0807934C: movs r0, 0x5 bl audio_play @@ -245409,7 +236317,7 @@ sub_807935C: @ 807935C bne _08079384 movs r0, 0 bl rbox_fill_rectangle - ldr r4, _08079394 + ldr r4, =0x0203229c ldr r0, [r4] adds r0, 0x35 ldrb r0, [r0] @@ -245419,7 +236327,7 @@ sub_807935C: @ 807935C ldrb r0, [r0] bl sub_807967C _08079384: - ldr r0, _08079394 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x7 @@ -245428,17 +236336,17 @@ _08079384: pop {r0} bx r0 .align 2, 0 -_08079394: .4byte 0x0203229c + .pool thumb_func_end sub_807935C thumb_func_start sub_8079398 sub_8079398: @ 8079398 push {r4,lr} - ldr r4, _080793BC + ldr r4, =0x0203229c ldr r0, [r4] adds r0, 0x74 ldrh r1, [r0] - ldr r0, _080793C0 + ldr r0, =0x00000505 cmp r1, r0 bne _080793B4 bl sub_80787B8 @@ -245451,14 +236359,13 @@ _080793B4: pop {r0} bx r0 .align 2, 0 -_080793BC: .4byte 0x0203229c -_080793C0: .4byte 0x00000505 + .pool thumb_func_end sub_8079398 thumb_func_start sub_80793C4 sub_80793C4: @ 80793C4 push {r4,lr} - ldr r4, _08079400 + ldr r4, =0x0203229c ldr r1, [r4] adds r1, 0xA8 ldrb r0, [r1] @@ -245469,7 +236376,7 @@ sub_80793C4: @ 80793C4 ldrb r0, [r0] cmp r0, 0x78 bls _080793F8 - ldr r0, _08079404 + ldr r0, =0x0832df8c movs r1, 0x1 movs r2, 0xE movs r3, 0 @@ -245487,14 +236394,13 @@ _080793F8: pop {r0} bx r0 .align 2, 0 -_08079400: .4byte 0x0203229c -_08079404: .4byte 0x0832df8c + .pool thumb_func_end sub_80793C4 thumb_func_start sub_8079408 sub_8079408: @ 8079408 push {r4-r6,lr} - ldr r0, _08079484 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -245526,12 +236432,12 @@ _0807942E: bl sub_8079F88 movs r0, 0x1 bl sub_8079F88 - ldr r2, _08079488 + ldr r2, =0x0203229c ldr r0, [r2] adds r0, 0x6F movs r1, 0 strb r1, [r0] - ldr r3, _0807948C + ldr r3, =0x02020630 ldr r0, [r2] adds r0, 0x34 ldrb r1, [r0] @@ -245550,34 +236456,31 @@ _0807947C: pop {r0} bx r0 .align 2, 0 -_08079484: .4byte 0x030022c0 -_08079488: .4byte 0x0203229c -_0807948C: .4byte 0x02020630 + .pool thumb_func_end sub_8079408 thumb_func_start sub_8079490 sub_8079490: @ 8079490 push {lr} - ldr r0, _080794AC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080794C4 - ldr r0, _080794B0 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080794B4 bl sub_800ADF8 b _080794BA .align 2, 0 -_080794AC: .4byte 0x02037fd4 -_080794B0: .4byte 0x030030fc + .pool _080794B4: movs r0, 0xC bl sub_800ABF4 _080794BA: - ldr r0, _080794C8 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0xC @@ -245586,13 +236489,13 @@ _080794C4: pop {r0} bx r0 .align 2, 0 -_080794C8: .4byte 0x0203229c + .pool thumb_func_end sub_8079490 thumb_func_start sub_80794CC sub_80794CC: @ 80794CC push {lr} - ldr r0, _08079508 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08079518 @@ -245602,44 +236505,38 @@ sub_80794CC: @ 80794CC bl sub_807A09C cmp r0, 0 bne _0807953A - ldr r0, _0807950C + ldr r0, =0x02032184 ldr r0, [r0] bl free - ldr r0, _08079510 + ldr r0, =0x0203229c ldr r0, [r0] bl free bl Window_FreeMemory bl sub_800E084 - ldr r0, _08079514 + ldr r0, =c2_8056854 + 1 bl set_callback2 b _0807953A .align 2, 0 -_08079508: .4byte 0x030030fc -_0807950C: .4byte 0x02032184 -_08079510: .4byte 0x0203229c -_08079514: .4byte c2_8056854 + 1 + .pool _08079518: - ldr r0, _08079540 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0807953A - ldr r0, _08079544 + ldr r0, =0x02032184 ldr r0, [r0] bl free - ldr r0, _08079548 + ldr r0, =0x0203229c ldr r0, [r0] bl free bl Window_FreeMemory - ldr r0, _0807954C + ldr r0, =c2_8056854 + 1 bl set_callback2 _0807953A: pop {r0} bx r0 .align 2, 0 -_08079540: .4byte 0x03003124 -_08079544: .4byte 0x02032184 -_08079548: .4byte 0x0203229c -_0807954C: .4byte c2_8056854 + 1 + .pool thumb_func_end sub_80794CC thumb_func_start sub_8079550 @@ -245654,7 +236551,7 @@ sub_8079550: @ 8079550 cmp r0, 0 bne _08079574 bl sub_800ADF8 - ldr r0, _08079578 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0xD @@ -245663,22 +236560,22 @@ _08079574: pop {r0} bx r0 .align 2, 0 -_08079578: .4byte 0x0203229c + .pool thumb_func_end sub_8079550 thumb_func_start sub_807957C sub_807957C: @ 807957C push {lr} - ldr r0, _080795A0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _0807959C - ldr r0, _080795A4 + ldr r0, =0x0000bbcc movs r1, 0 bl sub_8078C10 - ldr r0, _080795A8 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x64 @@ -245687,28 +236584,25 @@ _0807959C: pop {r0} bx r0 .align 2, 0 -_080795A0: .4byte 0x030022c0 -_080795A4: .4byte 0x0000bbcc -_080795A8: .4byte 0x0203229c + .pool thumb_func_end sub_807957C thumb_func_start sub_80795AC sub_80795AC: @ 80795AC push {lr} - ldr r0, _080795C4 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F ldrb r0, [r0] cmp r0, 0x11 bhi _08079678 lsls r0, 2 - ldr r1, _080795C8 + ldr r1, =_080795CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080795C4: .4byte 0x0203229c -_080795C8: .4byte _080795CC + .pool .align 2, 0 _080795CC: .4byte _08079614 @@ -245794,7 +236688,7 @@ sub_807967C: @ 807967C bl __udivsi3 lsls r0, 24 lsrs r2, r0, 24 - ldr r3, _080796B0 + ldr r3, =0x0203229c ldr r0, [r3] adds r0, 0x74 adds r1, r0, r2 @@ -245812,7 +236706,7 @@ _080796A8: pop {r0} bx r0 .align 2, 0 -_080796B0: .4byte 0x0203229c + .pool thumb_func_end sub_807967C thumb_func_start sub_80796B4 @@ -245825,7 +236719,7 @@ sub_80796B4: @ 80796B4 sub sp, 0x68 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08079704 + ldr r0, =0x0203229c ldr r4, [r0] adds r0, r4, 0 adds r0, 0x76 @@ -245859,7 +236753,7 @@ _080796FA: beq _08079716 b _08079A24 .align 2, 0 -_08079704: .4byte 0x0203229c + .pool _08079708: cmp r0, 0x3 bne _0807970E @@ -245884,9 +236778,9 @@ _08079716: ldrb r0, [r0] cmp r8, r0 bcs _0807976A - ldr r0, _08079870 + ldr r0, =0x02020630 mov r8, r0 - ldr r4, _08079874 + ldr r4, =0x0203229c ldr r0, [sp, 0x60] add r0, r9 lsls r2, r0, 1 @@ -245931,9 +236825,9 @@ _08079772: lsrs r5, r0, 24 cmp r5, 0x5 bls _08079772 - ldr r1, _08079870 + ldr r1, =0x02020630 mov r8, r1 - ldr r2, _08079874 + ldr r2, =0x0203229c ldr r0, [r2] ldr r6, [sp, 0x60] add r6, r9 @@ -245952,7 +236846,7 @@ _08079772: negs r1, r1 ands r1, r2 strb r1, [r0] - ldr r0, _08079874 + ldr r0, =0x0203229c ldr r4, [r0] adds r4, 0x28 add r4, r10 @@ -245968,7 +236862,7 @@ _08079772: adds r2, r0 lsls r2, 2 add r2, r8 - ldr r5, _08079878 + ldr r5, =0x0832de24 lsls r6, 2 adds r0, r6, r5 ldrb r0, [r0] @@ -245997,9 +236891,9 @@ _08079772: adds r0, r1 lsls r0, 2 add r0, r8 - ldr r1, _0807987C + ldr r1, =sub_80D3014 + 1 bl oamt_set_x3A_32 - ldr r2, _08079874 + ldr r2, =0x0203229c ldr r1, [r2] adds r1, 0x74 adds r1, r7 @@ -246015,7 +236909,7 @@ _08079772: lsls r0, 2 add r0, r8 bl sub_80A6DEC - ldr r1, _08079880 + ldr r1, =0x0832c8be ldr r0, [sp, 0x64] subs r2, r0, r7 lsls r2, 24 @@ -246041,13 +236935,9 @@ _08079868: bl sub_8079F74 b _08079A24 .align 2, 0 -_08079870: .4byte 0x02020630 -_08079874: .4byte 0x0203229c -_08079878: .4byte 0x0832de24 -_0807987C: .4byte sub_80D3014 + 1 -_08079880: .4byte 0x0832c8be + .pool _08079884: - ldr r2, _080798B4 + ldr r2, =0x02020630 ldr r1, [sp, 0x60] lsls r0, r1, 1 adds r0, r1 @@ -246063,7 +236953,7 @@ _08079884: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080798B8 + ldr r0, =sub_80D3014 + 1 cmp r1, r0 beq _080798AC b _08079A24 @@ -246072,10 +236962,9 @@ _080798AC: strb r0, [r3] b _08079A24 .align 2, 0 -_080798B4: .4byte 0x02020630 -_080798B8: .4byte sub_80D3014 + 1 + .pool _080798BC: - ldr r1, _080799D8 + ldr r1, =0x0832c6c0 ldr r0, [sp, 0x60] lsls r2, r0, 4 subs r2, r0 @@ -246092,8 +236981,8 @@ _080798BC: bl bg_copy_tilemap_rect_simple movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r6, _080799DC - ldr r1, _080799E0 + ldr r6, =0x02020630 + ldr r1, =0x0203229c ldr r4, [r1] ldr r2, [sp, 0x60] lsls r3, r2, 1 @@ -246108,7 +236997,7 @@ _080798BC: adds r2, r0 lsls r2, 2 adds r2, r6 - ldr r5, _080799E4 + ldr r5, =0x0832de24 lsls r3, 2 adds r0, r3, r5 ldrb r0, [r0] @@ -246164,7 +237053,7 @@ _080798BC: asrs r2, 1 lsls r2, 24 lsrs r2, 24 - ldr r0, _080799E8 + ldr r0, =0x0832dee0 mov r8, r0 str r0, [sp] movs r1, 0 @@ -246204,17 +237093,13 @@ _080798BC: adds r0, r4, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _080799E0 + ldr r0, =0x0203229c ldr r1, [r0] b _08079A1A .align 2, 0 -_080799D8: .4byte 0x0832c6c0 -_080799DC: .4byte 0x02020630 -_080799E0: .4byte 0x0203229c -_080799E4: .4byte 0x0832de24 -_080799E8: .4byte 0x0832dee0 + .pool _080799EC: - ldr r0, _08079A34 + ldr r0, =0x0832df99 lsls r1, r7, 1 adds r4, r1, r0 ldrb r2, [r4] @@ -246234,7 +237119,7 @@ _080799EC: adds r0, r7, 0 mov r1, r10 bl sub_8079C4C - ldr r2, _08079A38 + ldr r2, =0x0203229c ldr r1, [r2] _08079A1A: adds r1, 0x74 @@ -246252,8 +237137,7 @@ _08079A24: pop {r0} bx r0 .align 2, 0 -_08079A34: .4byte 0x0832df99 -_08079A38: .4byte 0x0203229c + .pool thumb_func_end sub_80796B4 thumb_func_start sub_8079A3C @@ -246268,18 +237152,18 @@ sub_8079A3C: @ 8079A3C bne _08079A64 movs r0, 0x64 muls r0, r2 - ldr r1, _08079A60 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp bl pokemon_getattr b _08079A74 .align 2, 0 -_08079A60: .4byte 0x020244ec + .pool _08079A64: movs r0, 0x64 muls r0, r2 - ldr r1, _08079AA0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2 mov r2, sp @@ -246304,7 +237188,7 @@ _08079A74: pop {r1} bx r1 .align 2, 0 -_08079AA0: .4byte 0x02024744 + .pool thumb_func_end sub_8079A3C thumb_func_start sub_8079AA4 @@ -246319,7 +237203,7 @@ sub_8079AA4: @ 8079AA4 lsrs r7, r1, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, _08079AEC + ldr r0, =0x0203229c ldr r1, [r0] lsls r0, r7, 1 adds r0, r7 @@ -246334,9 +237218,9 @@ sub_8079AA4: @ 8079AA4 movs r0, 0x64 adds r5, r2, 0 muls r5, r0 - ldr r0, _08079AF0 + ldr r0, =0x020244ec mov r9, r0 - ldr r2, _08079AF4 + ldr r2, =0x02024744 mov r8, r2 _08079ADE: cmp r7, 0 @@ -246346,9 +237230,7 @@ _08079ADE: mov r2, r9 b _08079AFE .align 2, 0 -_08079AEC: .4byte 0x0203229c -_08079AF0: .4byte 0x020244ec -_08079AF4: .4byte 0x02024744 + .pool _08079AF8: adds r1, r4, 0 adds r1, 0xD @@ -246365,7 +237247,7 @@ _08079AFE: lsrs r4, r0, 16 cmp r4, 0x3 bls _08079ADE - ldr r1, _08079B50 + ldr r1, =0x0832dabc adds r0, r6, 0 bl gf_strcpy movs r4, 0 @@ -246379,13 +237261,13 @@ _08079B20: adds r1, r0, 0 movs r0, 0xD muls r1, r0 - ldr r0, _08079B54 + ldr r0, =0x0831977c adds r1, r0 adds r0, r6, 0 bl gf_strcat _08079B3C: adds r0, r6, 0 - ldr r1, _08079B58 + ldr r1, =0x0832dad2 bl gf_strcat adds r0, r4, 0x1 lsls r0, 16 @@ -246394,14 +237276,12 @@ _08079B3C: bls _08079B20 b _08079B6C .align 2, 0 -_08079B50: .4byte 0x0832dabc -_08079B54: .4byte 0x0831977c -_08079B58: .4byte 0x0832dad2 + .pool _08079B5C: - ldr r1, _08079B7C + ldr r1, =0x0832dabc adds r0, r6, 0 bl gf_strcpy - ldr r1, _08079B80 + ldr r1, =0x0832dadf adds r0, r6, 0 bl gf_strcat _08079B6C: @@ -246413,8 +237293,7 @@ _08079B6C: pop {r0} bx r0 .align 2, 0 -_08079B7C: .4byte 0x0832dabc -_08079B80: .4byte 0x0832dadf + .pool thumb_func_end sub_8079AA4 thumb_func_start sub_8079B84 @@ -246441,7 +237320,7 @@ sub_8079B84: @ 8079B84 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _08079BDC + ldr r0, =0x0832dee0 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -246460,7 +237339,7 @@ sub_8079B84: @ 8079B84 pop {r0} bx r0 .align 2, 0 -_08079BDC: .4byte 0x0832dee0 + .pool thumb_func_end sub_8079B84 thumb_func_start sub_8079BE0 @@ -246469,13 +237348,13 @@ sub_8079BE0: @ 8079BE0 sub sp, 0x34 lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _08079C40 + ldr r7, =0x02024744 cmp r6, 0 bne _08079BF0 - ldr r7, _08079C44 + ldr r7, =0x020244ec _08079BF0: movs r4, 0 - ldr r0, _08079C48 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x36 adds r0, r6 @@ -246500,7 +237379,7 @@ _08079C02: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08079C48 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x36 adds r0, r6 @@ -246513,9 +237392,7 @@ _08079C36: pop {r0} bx r0 .align 2, 0 -_08079C40: .4byte 0x02024744 -_08079C44: .4byte 0x020244ec -_08079C48: .4byte 0x0203229c + .pool thumb_func_end sub_8079BE0 thumb_func_start sub_8079C4C @@ -246543,7 +237420,7 @@ sub_8079C4C: @ 8079C4C lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r1, _08079CA8 + ldr r1, =0x08ddd704 movs r0, 0x6 str r0, [sp] movs r0, 0x3 @@ -246561,15 +237438,14 @@ sub_8079C4C: @ 8079C4C bne _08079CB0 movs r0, 0x64 muls r0, r7 - ldr r1, _08079CAC + ldr r1, =0x020244ec b _08079CB6 .align 2, 0 -_08079CA8: .4byte 0x08ddd704 -_08079CAC: .4byte 0x020244ec + .pool _08079CB0: movs r0, 0x64 muls r0, r7 - ldr r1, _08079D2C + ldr r1, =0x02024744 _08079CB6: adds r0, r1 movs r1, 0x38 @@ -246577,7 +237453,7 @@ _08079CB6: bl pokemon_getattr lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _08079D30 + ldr r4, =0x0203229c ldr r5, [r4] mov r1, r8 lsls r2, r1, 1 @@ -246629,8 +237505,7 @@ _08079D08: strh r0, [r4] b _08079D72 .align 2, 0 -_08079D2C: .4byte 0x02024744 -_08079D30: .4byte 0x0203229c + .pool _08079D34: mov r1, r10 lsls r0, r1, 5 @@ -246664,7 +237539,7 @@ _08079D34: orrs r0, r2 strh r0, [r1] _08079D72: - ldr r0, _08079D90 + ldr r0, =0x0203229c ldr r1, [r0] ldr r0, [sp, 0x18] add r0, r8 @@ -246679,7 +237554,7 @@ _08079D72: lsls r2, 3 b _08079E16 .align 2, 0 -_08079D90: .4byte 0x0203229c + .pool _08079D94: mov r0, r8 cmp r0, 0 @@ -246687,7 +237562,7 @@ _08079D94: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 - ldr r0, _08079DBC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 bl pokemon_get_gender @@ -246699,12 +237574,12 @@ _08079D94: bl pokemon_getattr b _08079DDE .align 2, 0 -_08079DBC: .4byte 0x020244ec + .pool _08079DC0: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 - ldr r0, _08079DEC + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 bl pokemon_get_gender @@ -246722,7 +237597,7 @@ _08079DDE: movs r2, 0x83 b _08079E16 .align 2, 0 -_08079DEC: .4byte 0x02024744 + .pool _08079DF0: add r0, sp, 0xC movs r1, 0 @@ -246743,7 +237618,7 @@ _08079E04: bne _08079E16 movs r2, 0x85 _08079E16: - ldr r0, _08079E40 + ldr r0, =0x0203229c ldr r1, [r0] mov r0, r10 subs r0, 0x1 @@ -246765,7 +237640,7 @@ _08079E16: pop {r0} bx r0 .align 2, 0 -_08079E40: .4byte 0x0203229c + .pool thumb_func_end sub_8079C4C thumb_func_start sub_8079E44 @@ -246775,7 +237650,7 @@ sub_8079E44: @ 8079E44 lsls r0, 24 lsrs r6, r0, 24 movs r7, 0 - ldr r0, _08079E9C + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x36 adds r0, r6 @@ -246784,10 +237659,10 @@ sub_8079E44: @ 8079E44 bge _08079E94 lsls r0, r6, 1 adds r0, r6 - ldr r1, _08079EA0 + ldr r1, =0x0832de3e lsls r0, 2 adds r5, r0, r1 - ldr r1, _08079EA4 + ldr r1, =0x0832de56 adds r4, r0, r1 _08079E6A: lsls r1, r7, 24 @@ -246803,7 +237678,7 @@ _08079E6A: adds r5, 0x2 adds r4, 0x2 adds r7, 0x1 - ldr r0, _08079E9C + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x36 adds r0, r6 @@ -246816,9 +237691,7 @@ _08079E94: pop {r0} bx r0 .align 2, 0 -_08079E9C: .4byte 0x0203229c -_08079EA0: .4byte 0x0832de3e -_08079EA4: .4byte 0x0832de56 + .pool thumb_func_end sub_8079E44 thumb_func_start sub_8079EA8 @@ -246832,21 +237705,21 @@ sub_8079EA8: @ 8079EA8 lsrs r0, 24 mov r12, r0 movs r7, 0 - ldr r3, _08079F68 + ldr r3, =0x0203229c ldr r0, [r3] adds r0, 0x36 add r0, r12 ldrb r0, [r0] cmp r7, r0 bge _08079F5A - ldr r6, _08079F6C + ldr r6, =0x02020630 mov r9, r3 mov r1, r12 lsls r0, r1, 1 add r0, r12 lsls r2, r0, 1 mov r10, r2 - ldr r1, _08079F70 + ldr r1, =0x0832de24 movs r2, 0 mov r8, r2 lsls r0, 2 @@ -246922,9 +237795,7 @@ _08079F5A: pop {r0} bx r0 .align 2, 0 -_08079F68: .4byte 0x0203229c -_08079F6C: .4byte 0x02020630 -_08079F70: .4byte 0x0832de24 + .pool thumb_func_end sub_8079EA8 thumb_func_start sub_8079F74 @@ -246945,7 +237816,7 @@ sub_8079F88: @ 8079F88 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08079FF0 + ldr r1, =0x0832c8be lsls r2, r4, 4 subs r2, r4 lsls r2, 24 @@ -246967,14 +237838,14 @@ sub_8079F88: @ 8079F88 bl sub_8079BE0 adds r0, r4, 0 bl sub_8079EA8 - ldr r0, _08079FF4 + ldr r0, =0x0832de94 ldr r0, [r0, 0x4] - ldr r5, _08079FF8 + ldr r5, =0x0203229c ldr r1, [r5] adds r1, 0x72 ldrh r1, [r1] lsls r1, 5 - ldr r2, _08079FFC + ldr r2, =0x06010000 adds r1, r2 movs r2, 0x18 bl sub_807A308 @@ -246987,10 +237858,7 @@ sub_8079F88: @ 8079F88 pop {r0} bx r0 .align 2, 0 -_08079FF0: .4byte 0x0832c8be -_08079FF4: .4byte 0x0832de94 -_08079FF8: .4byte 0x0203229c -_08079FFC: .4byte 0x06010000 + .pool thumb_func_end sub_8079F88 thumb_func_start sub_807A000 @@ -247041,7 +237909,7 @@ sub_807A048: @ 807A048 lsls r1, 24 lsrs r6, r1, 24 movs r3, 0 - ldr r4, _0807A088 + ldr r4, =0x0203229c mov r12, r4 movs r7, 0x8D lsls r7, 4 @@ -247054,7 +237922,7 @@ _0807A05C: ldrb r0, [r0] cmp r0, 0 bne _0807A090 - ldr r3, _0807A08C + ldr r3, =0x000008d2 adds r0, r2, r3 strh r5, [r0] adds r3, 0x2 @@ -247069,8 +237937,7 @@ _0807A05C: strb r1, [r0] b _0807A096 .align 2, 0 -_0807A088: .4byte 0x0203229c -_0807A08C: .4byte 0x000008d2 + .pool _0807A090: adds r3, 0x1 cmp r3, 0x3 @@ -247085,7 +237952,7 @@ _0807A096: sub_807A09C: @ 807A09C push {lr} movs r3, 0 - ldr r0, _0807A0C0 + ldr r0, =0x0203229c ldr r0, [r0] movs r2, 0x8D lsls r2, 4 @@ -247102,14 +237969,14 @@ _0807A0AC: pop {r1} bx r1 .align 2, 0 -_0807A0C0: .4byte 0x0203229c + .pool thumb_func_end sub_807A09C thumb_func_start sub_807A0C4 sub_807A0C4: @ 807A0C4 push {r4,r5,lr} movs r4, 0 - ldr r3, _0807A0F0 + ldr r3, =0x0203229c _0807A0CA: ldr r0, [r3] lsls r1, r4, 3 @@ -247121,7 +237988,7 @@ _0807A0CA: adds r5, r1, 0 cmp r0, 0 beq _0807A18C - ldr r0, _0807A0F4 + ldr r0, =0x000008d2 adds r1, r2, r0 ldrh r0, [r1] cmp r0, 0 @@ -247130,22 +237997,20 @@ _0807A0CA: strh r0, [r1] b _0807A18C .align 2, 0 -_0807A0F0: .4byte 0x0203229c -_0807A0F4: .4byte 0x000008d2 + .pool _0807A0F8: - ldr r1, _0807A10C + ldr r1, =0x000008d4 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x8 bhi _0807A17A lsls r0, 2 - ldr r1, _0807A110 + ldr r1, =_0807A114 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807A10C: .4byte 0x000008d4 -_0807A110: .4byte _0807A114 + .pool .align 2, 0 _0807A114: .4byte _0807A138 @@ -247158,14 +238023,14 @@ _0807A114: .4byte _0807A16C .4byte _0807A174 _0807A138: - ldr r0, _0807A148 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x80 movs r1, 0x14 bl sub_8077170 b _0807A17A .align 2, 0 -_0807A148: .4byte 0x0203229c + .pool _0807A14C: movs r0, 0 bl sub_807A19C @@ -247190,7 +238055,7 @@ _0807A174: movs r0, 0x8 bl sub_807A19C _0807A17A: - ldr r0, _0807A198 + ldr r0, =0x0203229c ldr r1, [r0] adds r1, r5 movs r2, 0x8D @@ -247207,7 +238072,7 @@ _0807A18C: pop {r0} bx r0 .align 2, 0 -_0807A198: .4byte 0x0203229c + .pool thumb_func_end sub_807A0C4 thumb_func_start sub_807A19C @@ -247220,7 +238085,7 @@ sub_807A19C: @ 807A19C movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _0807A1EC + ldr r0, =0x0832debc lsls r4, 2 adds r4, r0 ldr r2, [r4] @@ -247247,14 +238112,14 @@ sub_807A19C: @ 807A19C pop {r0} bx r0 .align 2, 0 -_0807A1EC: .4byte 0x0832debc + .pool thumb_func_end sub_807A19C thumb_func_start sub_807A1F0 sub_807A1F0: @ 807A1F0 push {r4,lr} sub sp, 0x8 - ldr r0, _0807A240 + ldr r0, =0x0203229c ldr r1, [r0] adds r3, r1, 0 adds r3, 0xA8 @@ -247262,13 +238127,13 @@ sub_807A1F0: @ 807A1F0 adds r4, r0, 0 cmp r1, 0xD bhi _0807A22C - ldr r1, _0807A244 + ldr r1, =0x02032188 ldrb r0, [r3] lsls r0, 2 adds r0, r1 ldr r0, [r0] str r0, [sp] - ldr r0, _0807A248 + ldr r0, =0xffff0000 ldr r2, [sp, 0x4] ands r2, r0 movs r0, 0x80 @@ -247278,7 +238143,7 @@ sub_807A1F0: @ 807A1F0 ldrb r1, [r3] adds r1, 0xC8 lsls r1, 16 - ldr r0, _0807A24C + ldr r0, =0x0000ffff ands r0, r2 orrs r0, r1 str r0, [sp, 0x4] @@ -247289,16 +238154,12 @@ _0807A22C: cmp r0, 0x11 bhi _0807A2FC lsls r0, 2 - ldr r1, _0807A250 + ldr r1, =_0807A254 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807A240: .4byte 0x0203229c -_0807A244: .4byte 0x02032188 -_0807A248: .4byte 0xffff0000 -_0807A24C: .4byte 0x0000ffff -_0807A250: .4byte _0807A254 + .pool .align 2, 0 _0807A254: .4byte _0807A29C @@ -247325,35 +238186,35 @@ _0807A29C: _0807A2A0: mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r1, _0807A2B4 + ldr r1, =0x0203229c ldr r1, [r1] adds r2, r1, 0 adds r2, 0x72 strh r0, [r2] b _0807A2DE .align 2, 0 -_0807A2B4: .4byte 0x0203229c + .pool _0807A2B8: mov r0, sp b _0807A2D6 _0807A2BC: - ldr r0, _0807A2C4 + ldr r0, =0x0832dce4 bl gpu_pal_obj_alloc_tag_and_apply b _0807A2DA .align 2, 0 -_0807A2C4: .4byte 0x0832dce4 + .pool _0807A2C8: - ldr r0, _0807A2D0 + ldr r0, =0x0832dc44 bl gpu_pal_obj_alloc_tag_and_apply b _0807A2DA .align 2, 0 -_0807A2D0: .4byte 0x0832dc44 + .pool _0807A2D4: - ldr r0, _0807A2E8 + ldr r0, =0x0832dc3c _0807A2D6: bl gpu_tile_obj_alloc_tag_and_copy_to_vram _0807A2DA: - ldr r0, _0807A2EC + ldr r0, =0x0203229c ldr r1, [r0] _0807A2DE: adds r1, 0xA8 @@ -247362,8 +238223,7 @@ _0807A2DE: strb r0, [r1] b _0807A2FC .align 2, 0 -_0807A2E8: .4byte 0x0832dc3c -_0807A2EC: .4byte 0x0203229c + .pool _0807A2F0: ldr r0, [r4] adds r0, 0xA8 @@ -247410,7 +238270,7 @@ sub_807A320: @ 807A320 b _0807A458 _0807A338: movs r7, 0 - ldr r1, _0807A378 + ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x36 ldrb r0, [r0] @@ -247425,7 +238285,7 @@ _0807A34E: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0807A37C + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x2D @@ -247443,8 +238303,7 @@ _0807A34E: adds r0, r5 b _0807A3B0 .align 2, 0 -_0807A378: .4byte 0x0203229c -_0807A37C: .4byte 0x020244ec + .pool _0807A380: adds r0, r4, 0 movs r1, 0x39 @@ -247472,7 +238331,7 @@ _0807A39E: mov r1, r9 _0807A3B0: strb r1, [r0] - ldr r0, _0807A3C8 + ldr r0, =0x0203229c adds r5, 0x1 adds r7, 0x1 ldr r0, [r0] @@ -247483,10 +238342,10 @@ _0807A3B0: blt _0807A34E b _0807A458 .align 2, 0 -_0807A3C8: .4byte 0x0203229c + .pool _0807A3CC: movs r7, 0 - ldr r1, _0807A40C + ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x37 ldrb r0, [r0] @@ -247500,7 +238359,7 @@ _0807A3E2: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _0807A410 + ldr r0, =0x02024744 adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x2D @@ -247518,8 +238377,7 @@ _0807A3E2: adds r0, r5 b _0807A444 .align 2, 0 -_0807A40C: .4byte 0x0203229c -_0807A410: .4byte 0x02024744 + .pool _0807A414: adds r0, r4, 0 movs r1, 0x39 @@ -247547,7 +238405,7 @@ _0807A432: mov r1, r9 _0807A444: strb r1, [r0] - ldr r0, _0807A464 + ldr r0, =0x0203229c adds r5, 0x1 adds r7, 0x1 ldr r0, [r0] @@ -247564,7 +238422,7 @@ _0807A458: pop {r0} bx r0 .align 2, 0 -_0807A464: .4byte 0x0203229c + .pool thumb_func_end sub_807A320 thumb_func_start sub_807A468 @@ -247579,7 +238437,7 @@ sub_807A468: @ 807A468 b _0807A52C _0807A478: movs r6, 0 - ldr r1, _0807A4D0 + ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x36 ldrb r0, [r0] @@ -247590,7 +238448,7 @@ _0807A488: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _0807A4D4 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x39 @@ -247620,11 +238478,10 @@ _0807A488: bcc _0807A488 b _0807A52C .align 2, 0 -_0807A4D0: .4byte 0x0203229c -_0807A4D4: .4byte 0x020244ec + .pool _0807A4D8: movs r6, 0 - ldr r1, _0807A534 + ldr r1, =0x0203229c ldr r0, [r1] adds r0, 0x37 ldrb r0, [r0] @@ -247635,7 +238492,7 @@ _0807A4E8: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _0807A538 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x39 @@ -247668,8 +238525,7 @@ _0807A52C: pop {r0} bx r0 .align 2, 0 -_0807A534: .4byte 0x0203229c -_0807A538: .4byte 0x02024744 + .pool thumb_func_end sub_807A468 thumb_func_start sub_807A53C @@ -247680,7 +238536,7 @@ sub_807A53C: @ 807A53C movs r5, 0 _0807A544: movs r4, 0 - ldr r2, _0807A5A8 + ldr r2, =0x0203229c ldr r0, [r2] adds r0, 0x36 adds r0, r5 @@ -247703,7 +238559,7 @@ _0807A560: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0807A5AC + ldr r1, =0x02020630 adds r0, r1 adds r2, 0x5D adds r2, r3 @@ -247730,16 +238586,15 @@ _0807A596: pop {r0} bx r0 .align 2, 0 -_0807A5A8: .4byte 0x0203229c -_0807A5AC: .4byte 0x02020630 + .pool thumb_func_end sub_807A53C thumb_func_start sub_807A5B0 sub_807A5B0: @ 807A5B0 push {r4,r5,lr} movs r3, 0 - ldr r5, _0807A5E8 - ldr r4, _0807A5EC + ldr r5, =0x03005d8c + ldr r4, =0x000031a8 _0807A5B8: ldr r0, [r5] adds r0, r4 @@ -247747,7 +238602,7 @@ _0807A5B8: ldrb r0, [r2] cmp r0, 0 bne _0807A5DA - ldr r0, _0807A5F0 + ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0xA9 adds r0, r3 @@ -247766,9 +238621,7 @@ _0807A5DA: pop {r0} bx r0 .align 2, 0 -_0807A5E8: .4byte 0x03005d8c -_0807A5EC: .4byte 0x000031a8 -_0807A5F0: .4byte 0x0203229c + .pool thumb_func_end sub_807A5B0 thumb_func_start sub_807A5F4 @@ -247833,7 +238686,7 @@ _0807A65C: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _0807A69C + ldr r0, =0x020229e8 adds r1, r0 ldrb r0, [r1] subs r0, 0x1 @@ -247856,7 +238709,7 @@ _0807A65C: movs r0, 0x5 b _0807A718 .align 2, 0 -_0807A69C: .4byte 0x020229e8 + .pool _0807A6A0: lsls r0, r1, 16 lsrs r0, 16 @@ -247940,13 +238793,13 @@ _0807A718: thumb_func_start sub_807A728 sub_807A728: @ 807A728 push {r4-r7,lr} - ldr r0, _0807A7A8 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0807A7B4 movs r4, 0 bl link_get_multiplayer_id - ldr r5, _0807A7AC + ldr r5, =0x020229e8 movs r7, 0x1 eors r0, r7 lsls r0, 24 @@ -248001,8 +238854,7 @@ _0807A762: movs r0, 0x2 b _0807A7B6 .align 2, 0 -_0807A7A8: .4byte 0x03003124 -_0807A7AC: .4byte 0x020229e8 + .pool _0807A7B0: movs r0, 0x1 b _0807A7B6 @@ -248098,7 +238950,7 @@ _0807A832: movs r0, 0x2 b _0807A8C0 _0807A84E: - ldr r0, _0807A868 + ldr r0, =0x083203cc lsls r1, r7, 3 subs r1, r7 lsls r1, 2 @@ -248112,7 +238964,7 @@ _0807A84E: movs r0, 0x1 b _0807A8C0 .align 2, 0 -_0807A868: .4byte 0x083203cc + .pool _0807A86C: movs r0, 0xCE lsls r0, 1 @@ -248221,7 +239073,7 @@ sub_807A918: @ 807A918 lsrs r1, 16 mov r8, r1 movs r5, 0 - ldr r0, _0807A964 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 bge _0807A95A @@ -248242,7 +239094,7 @@ _0807A934: _0807A94E: adds r4, 0x4 adds r5, 0x1 - ldr r0, _0807A964 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r5, r0 blt _0807A934 @@ -248250,11 +239102,10 @@ _0807A95A: movs r7, 0 movs r6, 0x1 movs r5, 0 - ldr r4, _0807A968 + ldr r4, =0x020229e8 b _0807A980 .align 2, 0 -_0807A964: .4byte 0x020244e9 -_0807A968: .4byte 0x020229e8 + .pool _0807A96C: ldrb r0, [r4] subs r0, 0x4 @@ -248278,7 +239129,7 @@ _0807A980: movs r4, 0 b _0807A9B4 _0807A992: - ldr r0, _0807A9DC + ldr r0, =0x020229e8 adds r2, r4, r0 ldrb r1, [r2, 0x10] movs r0, 0xF @@ -248316,7 +239167,7 @@ _0807A9B4: movs r0, 0x2 b _0807AA1A .align 2, 0 -_0807A9DC: .4byte 0x020229e8 + .pool _0807A9E0: ldr r0, [r4] cmp r0, 0 @@ -248326,7 +239177,7 @@ _0807A9E0: _0807A9EA: movs r2, 0 movs r5, 0 - ldr r0, _0807AA14 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r2, r0 bge _0807AA0A @@ -248348,7 +239199,7 @@ _0807AA0A: movs r0, 0 b _0807AA1A .align 2, 0 -_0807AA14: .4byte 0x020244e9 + .pool _0807AA18: movs r0, 0x1 _0807AA1A: @@ -248429,7 +239280,7 @@ _0807AA98: movs r1, 0x2E ldrsh r0, [r2, r1] lsls r0, 1 - ldr r1, _0807AAB8 + ldr r1, =0x08338ea4 adds r0, r1 ldrb r1, [r2, 0x5] lsrs r1, 4 @@ -248442,7 +239293,7 @@ _0807AAB2: pop {r0} bx r0 .align 2, 0 -_0807AAB8: .4byte 0x08338ea4 + .pool thumb_func_end sub_807AA7C thumb_func_start sub_807AABC @@ -248512,7 +239363,7 @@ _0807AB20: sub_807AB28: @ 807AB28 push {r4,r5,lr} sub sp, 0x20 - ldr r0, _0807ABC8 + ldr r0, =0x020322a0 ldr r0, [r0] mov r12, r0 adds r0, 0xD4 @@ -248581,13 +239432,13 @@ sub_807AB28: @ 807AB28 pop {r0} bx r0 .align 2, 0 -_0807ABC8: .4byte 0x020322a0 + .pool thumb_func_end sub_807AB28 thumb_func_start sub_807ABCC sub_807ABCC: @ 807ABCC push {r4,lr} - ldr r4, _0807AC14 + ldr r4, =0x020322a0 ldr r0, [r4] adds r0, 0xE0 ldrh r1, [r0] @@ -248618,7 +239469,7 @@ sub_807ABCC: @ 807ABCC bl lcd_io_set b _0807AC1C .align 2, 0 -_0807AC14: .4byte 0x020322a0 + .pool _0807AC18: bl sub_807AB28 _0807AC1C: @@ -248641,7 +239492,7 @@ sub_807AC24: @ 807AC24 thumb_func_start sub_807AC3C sub_807AC3C: @ 807AC3C push {r4,lr} - ldr r3, _0807AC60 + ldr r3, =0x020322a0 ldr r1, [r3] movs r0, 0x8A adds r0, r1 @@ -248659,13 +239510,13 @@ sub_807AC3C: @ 807AC3C pop {r0} bx r0 .align 2, 0 -_0807AC60: .4byte 0x020322a0 + .pool thumb_func_end sub_807AC3C thumb_func_start sub_807AC64 sub_807AC64: @ 807AC64 push {r4,r5,lr} - ldr r0, _0807AC88 + ldr r0, =0x020322a0 ldr r2, [r0] adds r1, r2, 0 adds r1, 0x88 @@ -248682,7 +239533,7 @@ sub_807AC64: @ 807AC64 adds r0, 0x1 b _0807AC92 .align 2, 0 -_0807AC88: .4byte 0x020322a0 + .pool _0807AC8C: adds r1, r2, 0 adds r1, 0x8A @@ -248698,7 +239549,7 @@ _0807AC92: cmp r1, r0 bls _0807ACC4 bl sub_80097E8 - ldr r0, _0807ACD8 + ldr r0, =c2_800ACD4 + 1 bl set_callback2 ldr r1, [r4] adds r3, r1, 0 @@ -248722,20 +239573,20 @@ _0807ACC4: pop {r0} bx r0 .align 2, 0 -_0807ACD8: .4byte c2_800ACD4 + 1 + .pool thumb_func_end sub_807AC64 thumb_func_start sub_807ACDC sub_807ACDC: @ 807ACDC push {lr} - ldr r0, _0807ACEC + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0807ACF0 movs r0, 0 b _0807ACF8 .align 2, 0 -_0807ACEC: .4byte 0x03003124 + .pool _0807ACF0: bl link_get_multiplayer_id lsls r0, 24 @@ -248758,18 +239609,18 @@ sub_807ACFC: @ 807ACFC mov r8, r4 cmp r6, 0 bne _0807AD22 - ldr r0, _0807AD4C + ldr r0, =0x02032298 ldrb r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0807AD50 + ldr r0, =0x020244ec adds r1, r0 mov r8, r1 movs r4, 0x1 _0807AD22: cmp r6, 0x1 bne _0807AD40 - ldr r0, _0807AD4C + ldr r0, =0x02032298 ldrb r0, [r0, 0x1] movs r1, 0x6 bl __umodsi3 @@ -248777,7 +239628,7 @@ _0807AD22: lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _0807AD54 + ldr r0, =0x02024744 adds r1, r0 mov r8, r1 movs r4, 0x3 @@ -248788,9 +239639,7 @@ _0807AD40: beq _0807ADE0 b _0807AE36 .align 2, 0 -_0807AD4C: .4byte 0x02032298 -_0807AD50: .4byte 0x020244ec -_0807AD54: .4byte 0x02024744 + .pool _0807AD58: mov r0, r8 movs r1, 0x41 @@ -248804,9 +239653,9 @@ _0807AD58: cmp r6, 0 bne _0807AD94 lsls r0, r5, 3 - ldr r1, _0807AD8C + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _0807AD90 + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x8] adds r2, r5, 0 @@ -248815,13 +239664,12 @@ _0807AD58: movs r4, 0 b _0807ADB2 .align 2, 0 -_0807AD8C: .4byte 0x0830a18c -_0807AD90: .4byte 0x020244d4 + .pool _0807AD94: lsls r0, r5, 3 - ldr r1, _0807ADD4 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _0807ADD8 + ldr r1, =0x020244d4 ldr r2, [r1] lsls r4, r6, 1 adds r1, r4, 0x1 @@ -248836,7 +239684,7 @@ _0807ADB2: mov r0, r8 bl sub_806E794 bl gpu_pal_obj_decompress_and_apply - ldr r0, _0807ADDC + ldr r0, =0x020322a0 ldr r1, [r0] adds r0, r1, 0 adds r0, 0xF0 @@ -248848,26 +239696,24 @@ _0807ADB2: str r7, [r1] b _0807AE36 .align 2, 0 -_0807ADD4: .4byte 0x0830a18c -_0807ADD8: .4byte 0x020244d4 -_0807ADDC: .4byte 0x020322a0 + .pool _0807ADE0: mov r0, r8 bl sub_806E794 ldrh r0, [r0, 0x4] adds r1, r4, 0 bl sub_806A068 - ldr r0, _0807AE40 + ldr r0, =0x0202499c movs r1, 0x78 movs r2, 0x3C movs r3, 0x6 bl obj_add_from_template_forward_search - ldr r4, _0807AE44 + ldr r4, =0x020322a0 ldr r1, [r4] adds r1, 0x8E adds r1, r6 strb r0, [r1] - ldr r3, _0807AE48 + ldr r3, =0x02020630 ldr r0, [r4] adds r0, 0x8E adds r0, r6 @@ -248890,7 +239736,7 @@ _0807ADE0: lsls r0, 2 adds r3, 0x1C adds r0, r3 - ldr r1, _0807AE4C + ldr r1, =nullsub_12 + 1 str r1, [r0] _0807AE36: pop {r3} @@ -248899,17 +239745,14 @@ _0807AE36: pop {r0} bx r0 .align 2, 0 -_0807AE40: .4byte 0x0202499c -_0807AE44: .4byte 0x020322a0 -_0807AE48: .4byte 0x02020630 -_0807AE4C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_807ACFC thumb_func_start sub_807AE50 sub_807AE50: @ 807AE50 push {r4,r5,lr} sub sp, 0x4 - ldr r1, _0807AE70 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -248920,13 +239763,12 @@ sub_807AE50: @ 807AE50 b _0807B116 _0807AE66: lsls r0, 2 - ldr r1, _0807AE74 + ldr r1, =_0807AE78 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807AE70: .4byte 0x030022c0 -_0807AE74: .4byte _0807AE78 + .pool .align 2, 0 _0807AE78: .4byte _0807AEAC @@ -248943,17 +239785,17 @@ _0807AE78: .4byte _0807B0D4 .4byte _0807B0F0 _0807AEAC: - ldr r0, _0807AF40 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0807AEC0 - ldr r1, _0807AF44 - ldr r2, _0807AF48 + ldr r1, =0x020229c6 + ldr r2, =0x00001144 adds r0, r2, 0 strh r0, [r1] bl sub_80097E8 _0807AEC0: - ldr r4, _0807AF4C + ldr r4, =0x020322a0 movs r5, 0x80 lsls r5, 1 adds r0, r5, 0 @@ -248963,11 +239805,11 @@ _0807AEC0: bl clear_tasks bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, _0807AF50 + ldr r0, =sub_807AC24 + 1 bl SetVBlankCallback bl sub_807B170 bl sub_807AC3C - ldr r1, _0807AF54 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -249009,24 +239851,19 @@ _0807AEC0: strh r2, [r0] b _0807B116 .align 2, 0 -_0807AF40: .4byte 0x03003124 -_0807AF44: .4byte 0x020229c6 -_0807AF48: .4byte 0x00001144 -_0807AF4C: .4byte 0x020322a0 -_0807AF50: .4byte sub_807AC24 + 1 -_0807AF54: .4byte 0x030022c0 + .pool _0807AF58: - ldr r0, _0807AF84 + ldr r0, =0x03003124 ldrb r5, [r0] cmp r5, 0 bne _0807AF90 - ldr r4, _0807AF88 + ldr r4, =0x020322a0 ldr r0, [r4] adds r0, 0xFA movs r1, 0x1 strb r1, [r0] bl sub_8009734 - ldr r1, _0807AF8C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -249037,9 +239874,7 @@ _0807AF58: str r5, [r0, 0x64] b _0807B116 .align 2, 0 -_0807AF84: .4byte 0x03003124 -_0807AF88: .4byte 0x020322a0 -_0807AF8C: .4byte 0x030022c0 + .pool _0807AF90: movs r0, 0x87 lsls r0, 3 @@ -249048,7 +239883,7 @@ _0807AF90: strb r0, [r1] b _0807B116 _0807AF9C: - ldr r0, _0807AFB8 + ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 @@ -249064,7 +239899,7 @@ _0807AFAC: adds r1, r2, r0 b _0807B0E4 .align 2, 0 -_0807AFB8: .4byte 0x020322a0 + .pool _0807AFBC: bl sub_800ABBC lsls r0, 24 @@ -249079,7 +239914,7 @@ _0807AFC8: lsls r0, 24 cmp r4, r0 bcc _0807B000 - ldr r0, _0807AFF8 + ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 @@ -249089,20 +239924,19 @@ _0807AFC8: b _0807B116 _0807AFEA: bl sub_800A620 - ldr r1, _0807AFFC + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _0807B0E4 .align 2, 0 -_0807AFF8: .4byte 0x020322a0 -_0807AFFC: .4byte 0x030022c0 + .pool _0807B000: bl sub_807AC64 b _0807B116 _0807B006: bl sub_807AC64 - ldr r0, _0807B02C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 beq _0807B014 @@ -249115,16 +239949,15 @@ _0807B014: beq _0807B022 b _0807B116 _0807B022: - ldr r1, _0807B030 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _0807B0E4 .align 2, 0 -_0807B02C: .4byte 0x03003124 -_0807B030: .4byte 0x030022c0 + .pool _0807B034: - ldr r2, _0807B054 + ldr r2, =0x020322a0 ldr r0, [r2] adds r0, 0x72 movs r1, 0 @@ -249139,18 +239972,18 @@ _0807B034: bl sub_807ACFC b _0807B0DC .align 2, 0 -_0807B054: .4byte 0x020322a0 + .pool _0807B058: movs r0, 0 movs r1, 0x1 bl sub_807ACFC - ldr r1, _0807B06C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _0807B0E4 .align 2, 0 -_0807B06C: .4byte 0x030022c0 + .pool _0807B070: movs r0, 0x1 movs r1, 0 @@ -249161,23 +239994,22 @@ _0807B07A: movs r1, 0x1 bl sub_807ACFC bl sub_807B154 - ldr r1, _0807B090 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _0807B0E4 .align 2, 0 -_0807B090: .4byte 0x030022c0 + .pool _0807B094: bl sub_807BA94 - ldr r0, _0807B0A8 + ldr r0, =0x08338d18 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0807B0AC + ldr r0, =0x08338d20 bl gpu_pal_obj_alloc_tag_and_apply b _0807B0DC .align 2, 0 -_0807B0A8: .4byte 0x08338d18 -_0807B0AC: .4byte 0x08338d20 + .pool _0807B0B0: movs r0, 0x1 negs r0, r0 @@ -249188,18 +240020,18 @@ _0807B0B0: bl sub_80A1AD4 movs r0, 0 bl gpu_sync_bg_show - ldr r1, _0807B0D0 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _0807B0E4 .align 2, 0 -_0807B0D0: .4byte 0x030022c0 + .pool _0807B0D4: bl sub_807B140 bl sub_807BAD8 _0807B0DC: - ldr r1, _0807B0EC + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -249209,15 +240041,15 @@ _0807B0E4: strb r0, [r1] b _0807B116 .align 2, 0 -_0807B0EC: .4byte 0x030022c0 + .pool _0807B0F0: - ldr r0, _0807B134 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0807B116 - ldr r0, _0807B138 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0807B110 @@ -249226,7 +240058,7 @@ _0807B0F0: movs r1, 0 bl sub_800DFB4 _0807B110: - ldr r0, _0807B13C + ldr r0, =sub_807EA2C + 1 bl set_callback2 _0807B116: bl run_active_tasks @@ -249239,9 +240071,7 @@ _0807B116: pop {r0} bx r0 .align 2, 0 -_0807B134: .4byte 0x02037fd4 -_0807B138: .4byte 0x030030fc -_0807B13C: .4byte sub_807EA2C + 1 + .pool thumb_func_end sub_807AE50 thumb_func_start sub_807B140 @@ -249283,7 +240113,7 @@ sub_807B170: @ 807B170 bl lcd_io_set movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0807B258 + ldr r1, =0x08339014 movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -249313,7 +240143,7 @@ sub_807B170: @ 807B170 movs r0, 0x3 bl bg_set_tilemap bl TextBox_ResetSomeField - ldr r0, _0807B25C + ldr r0, =0x08c00000 mov r10, r0 movs r0, 0 mov r9, r0 @@ -249322,9 +240152,9 @@ sub_807B170: @ 807B170 movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r0, _0807B260 + ldr r0, =0x08c00524 mov r8, r0 - ldr r4, _0807B264 + ldr r4, =0x0201c000 adds r1, r4, 0 bl call_LZZUnCompWram movs r0, 0 @@ -249332,12 +240162,12 @@ sub_807B170: @ 807B170 adds r2, r5, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r6, _0807B268 + ldr r6, =0x08c004e0 adds r0, r6, 0 movs r1, 0 movs r2, 0x20 bl decompress_palette - ldr r0, _0807B26C + ldr r0, =0x08338ffc bl Window_InitFromTemplates mov r0, r9 str r0, [sp] @@ -249367,12 +240197,7 @@ sub_807B170: @ 807B170 pop {r0} bx r0 .align 2, 0 -_0807B258: .4byte 0x08339014 -_0807B25C: .4byte 0x08c00000 -_0807B260: .4byte 0x08c00524 -_0807B264: .4byte 0x0201c000 -_0807B268: .4byte 0x08c004e0 -_0807B26C: .4byte 0x08338ffc + .pool thumb_func_end sub_807B170 thumb_func_start sub_807B270 @@ -249381,7 +240206,7 @@ sub_807B270: @ 807B270 mov r6, r8 push {r6} sub sp, 0xC - ldr r0, _0807B294 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -249391,13 +240216,12 @@ sub_807B270: @ 807B270 b _0807B43E _0807B288: lsls r0, 2 - ldr r1, _0807B298 + ldr r1, =_0807B29C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807B294: .4byte 0x030022c0 -_0807B298: .4byte _0807B29C + .pool .align 2, 0 _0807B29C: .4byte _0807B2D0 @@ -249414,19 +240238,19 @@ _0807B29C: .4byte _0807B414 .4byte _0807B438 _0807B2D0: - ldr r1, _0807B38C - ldr r0, _0807B390 + ldr r1, =0x02032298 + ldr r0, =0x020375e2 ldrh r0, [r0] movs r6, 0 strb r0, [r1] movs r0, 0x6 strb r0, [r1, 0x1] - ldr r4, _0807B394 - ldr r0, _0807B398 + ldr r4, =0x020229f0 + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r4, 0 bl gf_strcpy - ldr r5, _0807B39C + ldr r5, =0x02024744 adds r0, r5, 0 movs r1, 0x7 mov r2, sp @@ -249444,7 +240268,7 @@ _0807B2D0: movs r1, 0x3 bl pokemon_getattr strh r0, [r4, 0x36] - ldr r4, _0807B3A0 + ldr r4, =0x020322a0 movs r5, 0x80 lsls r5, 1 adds r0, r5, 0 @@ -249454,7 +240278,7 @@ _0807B2D0: bl clear_tasks bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, _0807B3A4 + ldr r0, =sub_807AC24 + 1 bl SetVBlankCallback bl sub_807B170 ldr r0, [r4] @@ -249489,7 +240313,7 @@ _0807B2D0: adds r0, 0x4 strh r6, [r0] str r6, [r2, 0x64] - ldr r0, _0807B3A8 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -249497,14 +240321,7 @@ _0807B2D0: strb r1, [r0] b _0807B43E .align 2, 0 -_0807B38C: .4byte 0x02032298 -_0807B390: .4byte 0x020375e2 -_0807B394: .4byte 0x020229f0 -_0807B398: .4byte 0x03005d90 -_0807B39C: .4byte 0x02024744 -_0807B3A0: .4byte 0x020322a0 -_0807B3A4: .4byte sub_807AC24 + 1 -_0807B3A8: .4byte 0x030022c0 + .pool _0807B3AC: movs r0, 0 movs r1, 0 @@ -249537,14 +240354,13 @@ _0807B3D0: b _0807B424 _0807B3F0: bl sub_807BA94 - ldr r0, _0807B404 + ldr r0, =0x08338d18 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0807B408 + ldr r0, =0x08338d20 bl gpu_pal_obj_alloc_tag_and_apply b _0807B424 .align 2, 0 -_0807B404: .4byte 0x08338d18 -_0807B408: .4byte 0x08338d20 + .pool _0807B40C: movs r0, 0 bl gpu_sync_bg_show @@ -249556,7 +240372,7 @@ _0807B414: bl sub_807B62C bl sub_807BAD8 _0807B424: - ldr r1, _0807B434 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -249565,9 +240381,9 @@ _0807B424: strb r0, [r1] b _0807B43E .align 2, 0 -_0807B434: .4byte 0x030022c0 + .pool _0807B438: - ldr r0, _0807B460 + ldr r0, =sub_807B60C + 1 bl set_callback2 _0807B43E: bl run_active_tasks @@ -249582,7 +240398,7 @@ _0807B43E: pop {r0} bx r0 .align 2, 0 -_0807B460: .4byte sub_807B60C + 1 + .pool thumb_func_end sub_807B270 thumb_func_start sub_807B464 @@ -249592,7 +240408,7 @@ sub_807B464: @ 807B464 lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _0807B4C0 + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x2D @@ -249628,7 +240444,7 @@ _0807B4B8: pop {r0} bx r0 .align 2, 0 -_0807B4C0: .4byte 0x020244ec + .pool thumb_func_end sub_807B464 thumb_func_start sub_807B4C4 @@ -249655,7 +240471,7 @@ sub_807B4D0: @ 807B4D0 movs r5, 0x64 mov r1, r9 muls r1, r5 - ldr r0, _0807B59C + ldr r0, =0x020244ec adds r7, r1, r0 adds r0, r7, 0 movs r1, 0x40 @@ -249664,7 +240480,7 @@ sub_807B4D0: @ 807B4D0 lsrs r6, r0, 16 adds r1, r4, 0 muls r1, r5 - ldr r0, _0807B5A0 + ldr r0, =0x02024744 adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x40 @@ -249674,17 +240490,17 @@ sub_807B4D0: @ 807B4D0 mov r8, r0 cmp r6, 0xFF beq _0807B52A - ldr r0, _0807B5A4 + ldr r0, =0x03005d8c lsls r1, r6, 3 adds r1, r6 lsls r1, 2 - ldr r2, _0807B5A8 + ldr r2, =0x00002be0 adds r1, r2 ldr r0, [r0] adds r0, r1 bl sub_80D439C _0807B52A: - ldr r4, _0807B5AC + ldr r4, =0x020322a0 ldr r0, [r4] adds r1, r7, 0 movs r2, 0x64 @@ -249716,14 +240532,14 @@ _0807B566: lsls r1, r0, 3 add r1, r8 lsls r1, 2 - ldr r0, _0807B5B0 + ldr r0, =0x020321c0 adds r1, r0 adds r0, r7, 0 bl sub_80D460C _0807B57C: mov r0, r9 bl sub_807B464 - ldr r0, _0807B5B4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0807B58E @@ -249737,19 +240553,13 @@ _0807B58E: pop {r0} bx r0 .align 2, 0 -_0807B59C: .4byte 0x020244ec -_0807B5A0: .4byte 0x02024744 -_0807B5A4: .4byte 0x03005d8c -_0807B5A8: .4byte 0x00002be0 -_0807B5AC: .4byte 0x020322a0 -_0807B5B0: .4byte 0x020321c0 -_0807B5B4: .4byte 0x03003124 + .pool thumb_func_end sub_807B4D0 thumb_func_start sub_807B5B8 sub_807B5B8: @ 807B5B8 push {r4,lr} - ldr r4, _0807B5CC + ldr r4, =0x020322a0 ldr r0, [r4] adds r0, 0x93 ldrb r0, [r0] @@ -249759,7 +240569,7 @@ sub_807B5B8: @ 807B5B8 beq _0807B5F6 b _0807B600 .align 2, 0 -_0807B5CC: .4byte 0x020322a0 + .pool _0807B5D0: bl sub_800A520 lsls r0, 24 @@ -249778,7 +240588,7 @@ _0807B5D0: adds r0, 0x1 strb r0, [r1] _0807B5F6: - ldr r0, _0807B608 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x93 movs r1, 0 @@ -249788,7 +240598,7 @@ _0807B600: pop {r0} bx r0 .align 2, 0 -_0807B608: .4byte 0x020322a0 + .pool thumb_func_end sub_807B5B8 thumb_func_start sub_807B60C @@ -249814,12 +240624,12 @@ sub_807B62C: @ 807B62C b _0807BA68 _0807B638: lsls r0, 2 - ldr r1, _0807B644 + ldr r1, =_0807B648 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807B644: .4byte _0807B648 + .pool .align 2, 0 _0807B648: .4byte _0807B668 @@ -249831,7 +240641,7 @@ _0807B648: .4byte _0807B924 .4byte _0807B9FC _0807B668: - ldr r0, _0807B6C0 + ldr r0, =0x020322a0 ldr r1, [r0] adds r2, r1, 0 adds r2, 0xE4 @@ -249844,19 +240654,19 @@ _0807B668: lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r1, _0807B6C4 + ldr r1, =0x00005206 movs r0, 0xC bl lcd_io_set - ldr r0, _0807B6C8 + ldr r0, =0x08dd7300 movs r1, 0x10 movs r2, 0x60 bl gpu_pal_apply - ldr r3, _0807B6CC - ldr r4, _0807B6D0 + ldr r3, =0x08dd7360 + ldr r4, =0x06004000 movs r5, 0xA1 lsls r5, 5 - ldr r1, _0807B6D4 - ldr r6, _0807B6D8 + ldr r1, =0x040000d4 + ldr r6, =0x80000800 movs r2, 0x80 lsls r2, 5 movs r7, 0x80 @@ -249873,15 +240683,9 @@ _0807B6AA: bhi _0807B6AA b _0807BA4C .align 2, 0 -_0807B6C0: .4byte 0x020322a0 -_0807B6C4: .4byte 0x00005206 -_0807B6C8: .4byte 0x08dd7300 -_0807B6CC: .4byte 0x08dd7360 -_0807B6D0: .4byte 0x06004000 -_0807B6D4: .4byte 0x040000d4 -_0807B6D8: .4byte 0x80000800 + .pool _0807B6DC: - ldr r4, _0807B714 + ldr r4, =0x020322a0 ldr r2, [r4] adds r1, r2, 0 adds r1, 0xE2 @@ -249893,10 +240697,10 @@ _0807B6DC: strh r1, [r2] movs r0, 0x16 bl lcd_io_set - ldr r1, _0807B718 + ldr r1, =0x00008502 movs r0, 0xA bl lcd_io_set - ldr r1, _0807B71C + ldr r1, =0x00009206 movs r0, 0xC bl lcd_io_set ldr r0, [r4] @@ -249904,30 +240708,27 @@ _0807B6DC: ldrb r0, [r0] cmp r0, 0 beq _0807B724 - ldr r1, _0807B720 + ldr r1, =0x083369a0 b _0807B726 .align 2, 0 -_0807B714: .4byte 0x020322a0 -_0807B718: .4byte 0x00008502 -_0807B71C: .4byte 0x00009206 -_0807B720: .4byte 0x083369a0 + .pool _0807B724: - ldr r1, _0807B770 + ldr r1, =0x083359a0 _0807B726: - ldr r2, _0807B774 - ldr r0, _0807B778 + ldr r2, =0x06002800 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _0807B77C + ldr r1, =0x80000800 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - ldr r3, _0807B780 + ldr r3, =0x08dd7360 movs r4, 0xC0 lsls r4, 19 movs r5, 0xA1 lsls r5, 5 - ldr r1, _0807B778 - ldr r6, _0807B77C + ldr r1, =0x040000d4 + ldr r6, =0x80000800 movs r2, 0x80 lsls r2, 5 movs r7, 0x80 @@ -249952,13 +240753,9 @@ _0807B74A: lsls r1, 5 b _0807B820 .align 2, 0 -_0807B770: .4byte 0x083359a0 -_0807B774: .4byte 0x06002800 -_0807B778: .4byte 0x040000d4 -_0807B77C: .4byte 0x80000800 -_0807B780: .4byte 0x08dd7360 + .pool _0807B784: - ldr r0, _0807B7B0 + ldr r0, =0x020322a0 ldr r2, [r0] adds r0, r2, 0 adds r0, 0xE0 @@ -249970,29 +240767,26 @@ _0807B784: ldrb r0, [r0] cmp r0, 0 bne _0807B7C0 - ldr r1, _0807B7B4 + ldr r1, =0x00001241 movs r0, 0 bl lcd_io_set - ldr r0, _0807B7B8 - ldr r1, _0807B7BC + ldr r0, =0x083379a0 + ldr r1, =0x06002800 bl LZ77UnCompVram movs r0, 0x8 b _0807B7DA .align 2, 0 -_0807B7B0: .4byte 0x020322a0 -_0807B7B4: .4byte 0x00001241 -_0807B7B8: .4byte 0x083379a0 -_0807B7BC: .4byte 0x06002800 + .pool _0807B7C0: - ldr r1, _0807B7E4 + ldr r1, =0x00001241 movs r0, 0 bl lcd_io_set - ldr r1, _0807B7E8 - ldr r2, _0807B7EC - ldr r0, _0807B7F0 + ldr r1, =0x0832ffc0 + ldr r2, =0x06002800 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _0807B7F4 + ldr r1, =0x80000400 str r1, [r0, 0x8] ldr r0, [r0, 0x8] movs r0, 0x1 @@ -250002,23 +240796,19 @@ _0807B7DA: bl sub_80A2A20 b _0807BA68 .align 2, 0 -_0807B7E4: .4byte 0x00001241 -_0807B7E8: .4byte 0x0832ffc0 -_0807B7EC: .4byte 0x06002800 -_0807B7F0: .4byte 0x040000d4 -_0807B7F4: .4byte 0x80000400 + .pool _0807B7F8: - ldr r0, _0807B828 + ldr r0, =0x08337ea0 movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0807B82C - ldr r1, _0807B830 + ldr r0, =0x08337ec0 + ldr r1, =0x06004000 bl LZ77UnCompVram - ldr r0, _0807B834 - ldr r1, _0807B838 + ldr r0, =0x08338550 + ldr r1, =0x06009000 bl LZ77UnCompVram - ldr r0, _0807B83C + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0xE4 movs r1, 0x50 @@ -250030,20 +240820,15 @@ _0807B820: bl lcd_io_set b _0807BA68 .align 2, 0 -_0807B828: .4byte 0x08337ea0 -_0807B82C: .4byte 0x08337ec0 -_0807B830: .4byte 0x06004000 -_0807B834: .4byte 0x08338550 -_0807B838: .4byte 0x06009000 -_0807B83C: .4byte 0x020322a0 + .pool _0807B840: - ldr r1, _0807B8C4 + ldr r1, =0x00001441 movs r0, 0 bl lcd_io_set - ldr r1, _0807B8C8 + ldr r1, =0x00001287 movs r0, 0xC bl lcd_io_set - ldr r0, _0807B8CC + ldr r0, =0x020322a0 ldr r3, [r0] adds r1, r3, 0 adds r1, 0xD4 @@ -250063,12 +240848,12 @@ _0807B840: adds r0, r3, 0 adds r0, 0xEC strh r2, [r0] - ldr r3, _0807B8D0 - ldr r4, _0807B8D4 + ldr r3, =0x08332f60 + ldr r4, =0x06004000 movs r5, 0xA1 lsls r5, 6 - ldr r1, _0807B8D8 - ldr r6, _0807B8DC + ldr r1, =0x040000d4 + ldr r6, =0x80000800 movs r2, 0x80 lsls r2, 5 movs r7, 0x80 @@ -250089,45 +240874,33 @@ _0807B88C: orrs r0, r7 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - ldr r0, _0807B8CC + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0xFA ldrb r0, [r0] cmp r0, 0 beq _0807B8EC - ldr r1, _0807B8E0 - ldr r2, _0807B8E4 - ldr r0, _0807B8D8 + ldr r1, =0x083357a0 + ldr r2, =0x06009000 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _0807B8E8 + ldr r1, =0x80000080 b _0807BA64 .align 2, 0 -_0807B8C4: .4byte 0x00001441 -_0807B8C8: .4byte 0x00001287 -_0807B8CC: .4byte 0x020322a0 -_0807B8D0: .4byte 0x08332f60 -_0807B8D4: .4byte 0x06004000 -_0807B8D8: .4byte 0x040000d4 -_0807B8DC: .4byte 0x80000800 -_0807B8E0: .4byte 0x083357a0 -_0807B8E4: .4byte 0x06009000 -_0807B8E8: .4byte 0x80000080 + .pool _0807B8EC: - ldr r1, _0807B8FC - ldr r2, _0807B900 - ldr r0, _0807B904 + ldr r1, =0x083358a0 + ldr r2, =0x06009000 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _0807B908 + ldr r1, =0x80000080 b _0807BA64 .align 2, 0 -_0807B8FC: .4byte 0x083358a0 -_0807B900: .4byte 0x06009000 -_0807B904: .4byte 0x040000d4 -_0807B908: .4byte 0x80000080 + .pool _0807B90C: - ldr r0, _0807B920 + ldr r0, =0x020322a0 ldr r0, [r0] adds r1, r0, 0 adds r1, 0xE0 @@ -250137,15 +240910,15 @@ _0807B90C: strh r2, [r0] b _0807BA68 .align 2, 0 -_0807B920: .4byte 0x020322a0 + .pool _0807B924: - ldr r1, _0807B9B4 + ldr r1, =0x00001441 movs r0, 0 bl lcd_io_set - ldr r1, _0807B9B8 + ldr r1, =0x00001287 movs r0, 0xC bl lcd_io_set - ldr r0, _0807B9BC + ldr r0, =0x020322a0 ldr r3, [r0] adds r1, r3, 0 adds r1, 0xD4 @@ -250170,12 +240943,12 @@ _0807B924: adds r0, r3, 0 adds r0, 0xEC strh r2, [r0] - ldr r3, _0807B9C0 - ldr r4, _0807B9C4 + ldr r3, =0x08332f60 + ldr r4, =0x06004000 movs r5, 0xA1 lsls r5, 6 - ldr r1, _0807B9C8 - ldr r6, _0807B9CC + ldr r1, =0x040000d4 + ldr r6, =0x80000800 movs r2, 0x80 lsls r2, 5 movs r7, 0x80 @@ -250196,45 +240969,33 @@ _0807B97A: orrs r0, r7 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - ldr r0, _0807B9BC + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0xFA ldrb r0, [r0] cmp r0, 0 beq _0807B9DC - ldr r1, _0807B9D0 - ldr r2, _0807B9D4 - ldr r0, _0807B9C8 + ldr r1, =0x083357a0 + ldr r2, =0x06009000 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _0807B9D8 + ldr r1, =0x80000080 b _0807BA64 .align 2, 0 -_0807B9B4: .4byte 0x00001441 -_0807B9B8: .4byte 0x00001287 -_0807B9BC: .4byte 0x020322a0 -_0807B9C0: .4byte 0x08332f60 -_0807B9C4: .4byte 0x06004000 -_0807B9C8: .4byte 0x040000d4 -_0807B9CC: .4byte 0x80000800 -_0807B9D0: .4byte 0x083357a0 -_0807B9D4: .4byte 0x06009000 -_0807B9D8: .4byte 0x80000080 + .pool _0807B9DC: - ldr r1, _0807B9EC - ldr r2, _0807B9F0 - ldr r0, _0807B9F4 + ldr r1, =0x083358a0 + ldr r2, =0x06009000 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _0807B9F8 + ldr r1, =0x80000080 b _0807BA64 .align 2, 0 -_0807B9EC: .4byte 0x083358a0 -_0807B9F0: .4byte 0x06009000 -_0807B9F4: .4byte 0x040000d4 -_0807B9F8: .4byte 0x80000080 + .pool _0807B9FC: - ldr r0, _0807BA70 + ldr r0, =0x020322a0 ldr r0, [r0] adds r1, r0, 0 adds r1, 0xE4 @@ -250245,19 +241006,19 @@ _0807B9FC: movs r0, 0x50 movs r1, 0 bl lcd_io_set - ldr r1, _0807BA74 + ldr r1, =0x00005206 movs r0, 0xC bl lcd_io_set - ldr r0, _0807BA78 + ldr r0, =0x08dd7300 movs r1, 0x10 movs r2, 0x60 bl gpu_pal_apply - ldr r3, _0807BA7C - ldr r4, _0807BA80 + ldr r3, =0x08dd7360 + ldr r4, =0x06004000 movs r5, 0xA1 lsls r5, 5 - ldr r1, _0807BA84 - ldr r6, _0807BA88 + ldr r1, =0x040000d4 + ldr r6, =0x80000800 movs r2, 0x80 lsls r2, 5 movs r7, 0x80 @@ -250279,12 +241040,12 @@ _0807BA4C: orrs r0, r7 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - ldr r1, _0807BA8C - ldr r2, _0807BA90 - ldr r0, _0807BA84 + ldr r1, =0x08331f60 + ldr r2, =0x06009000 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _0807BA88 + ldr r1, =0x80000800 _0807BA64: str r1, [r0, 0x8] ldr r0, [r0, 0x8] @@ -250293,48 +241054,35 @@ _0807BA68: pop {r0} bx r0 .align 2, 0 -_0807BA70: .4byte 0x020322a0 -_0807BA74: .4byte 0x00005206 -_0807BA78: .4byte 0x08dd7300 -_0807BA7C: .4byte 0x08dd7360 -_0807BA80: .4byte 0x06004000 -_0807BA84: .4byte 0x040000d4 -_0807BA88: .4byte 0x80000800 -_0807BA8C: .4byte 0x08331f60 -_0807BA90: .4byte 0x06009000 + .pool thumb_func_end sub_807B62C thumb_func_start sub_807BA94 sub_807BA94: @ 807BA94 push {lr} - ldr r0, _0807BAC0 + ldr r0, =0x08338d70 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0807BAC4 + ldr r0, =0x08338dc0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0807BAC8 + ldr r0, =0x08338df4 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0807BACC + ldr r0, =0x08338e6c bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0807BAD0 + ldr r0, =0x08338d78 bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _0807BAD4 + ldr r0, =0x08338d80 bl gpu_pal_obj_alloc_tag_and_apply pop {r0} bx r0 .align 2, 0 -_0807BAC0: .4byte 0x08338d70 -_0807BAC4: .4byte 0x08338dc0 -_0807BAC8: .4byte 0x08338df4 -_0807BACC: .4byte 0x08338e6c -_0807BAD0: .4byte 0x08338d78 -_0807BAD4: .4byte 0x08338d80 + .pool thumb_func_end sub_807BA94 thumb_func_start sub_807BAD8 sub_807BAD8: @ 807BAD8 push {r4,r5,lr} sub sp, 0x14 - ldr r0, _0807BB48 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0xEE ldrb r0, [r0] @@ -250342,7 +241090,7 @@ sub_807BAD8: @ 807BAD8 beq _0807BB68 bl link_get_multiplayer_id lsls r0, 24 - ldr r3, _0807BB4C + ldr r3, =0x02021cc4 movs r2, 0x80 lsls r2, 17 eors r2, r0 @@ -250350,11 +241098,11 @@ sub_807BAD8: @ 807BAD8 lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r0, _0807BB50 + ldr r0, =0x020229f0 adds r1, r0 adds r0, r3, 0 bl gf_strcpy - ldr r5, _0807BB54 + ldr r5, =0x02032298 ldrb r0, [r5, 0x1] movs r1, 0x6 bl __umodsi3 @@ -250362,59 +241110,52 @@ sub_807BAD8: @ 807BAD8 lsrs r0, 24 movs r4, 0x64 muls r0, r4 - ldr r1, _0807BB58 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2 mov r2, sp bl pokemon_getattr - ldr r0, _0807BB5C + ldr r0, =0x02021ec4 mov r1, sp bl strcpy_limit_10_chars ldrb r0, [r5] muls r0, r4 - ldr r1, _0807BB60 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp bl pokemon_getattr - ldr r0, _0807BB64 + ldr r0, =0x02021dc4 mov r1, sp bl strcpy_limit_10_chars b _0807BBA4 .align 2, 0 -_0807BB48: .4byte 0x020322a0 -_0807BB4C: .4byte 0x02021cc4 -_0807BB50: .4byte 0x020229f0 -_0807BB54: .4byte 0x02032298 -_0807BB58: .4byte 0x02024744 -_0807BB5C: .4byte 0x02021ec4 -_0807BB60: .4byte 0x020244ec -_0807BB64: .4byte 0x02021dc4 + .pool _0807BB68: - ldr r0, _0807BBAC + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 lsls r4, 2 - ldr r0, _0807BBB0 + ldr r0, =0x08338ed0 adds r4, r0 - ldr r0, _0807BBB4 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x2B bl gf_strcpy - ldr r0, _0807BBB8 + ldr r0, =0x02021ec4 adds r1, r4, 0 bl strcpy_limit_10_chars - ldr r0, _0807BBBC + ldr r0, =0x020375e2 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0807BBC0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp bl pokemon_getattr - ldr r0, _0807BBC4 + ldr r0, =0x02021dc4 mov r1, sp bl strcpy_limit_10_chars _0807BBA4: @@ -250423,19 +241164,13 @@ _0807BBA4: pop {r0} bx r0 .align 2, 0 -_0807BBAC: .4byte 0x020375e0 -_0807BBB0: .4byte 0x08338ed0 -_0807BBB4: .4byte 0x02021cc4 -_0807BBB8: .4byte 0x02021ec4 -_0807BBBC: .4byte 0x020375e2 -_0807BBC0: .4byte 0x020244ec -_0807BBC4: .4byte 0x02021dc4 + .pool thumb_func_end sub_807BAD8 thumb_func_start sub_807BBC8 sub_807BBC8: @ 807BBC8 push {lr} - ldr r0, _0807BBDC + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0xFA ldrb r0, [r0] @@ -250444,7 +241179,7 @@ sub_807BBC8: @ 807BBC8 bl sub_807CFC8 b _0807BBE4 .align 2, 0 -_0807BBDC: .4byte 0x020322a0 + .pool _0807BBE0: bl sub_807BBEC _0807BBE4: @@ -250458,25 +241193,23 @@ _0807BBE4: sub_807BBEC: @ 807BBEC push {r4-r7,lr} sub sp, 0x14 - ldr r0, _0807BC10 + ldr r0, =0x020322a0 ldr r1, [r0] adds r1, 0x94 ldrh r5, [r1] - ldr r1, _0807BC14 + ldr r1, =0x0000010b adds r7, r0, 0 cmp r5, r1 bls _0807BC04 bl _0807CFB4 _0807BC04: lsls r0, r5, 2 - ldr r1, _0807BC18 + ldr r1, =_0807BC1C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807BC10: .4byte 0x020322a0 -_0807BC14: .4byte 0x0000010b -_0807BC18: .4byte _0807BC1C + .pool .align 2, 0 _0807BC1C: .4byte _0807C04C @@ -250748,7 +241481,7 @@ _0807BC1C: .4byte _0807CFB4 .4byte _0807CE38 _0807C04C: - ldr r3, _0807C0B4 + ldr r3, =0x02020630 ldr r0, [r7] adds r0, 0x8E ldrb r1, [r0] @@ -250770,14 +241503,14 @@ _0807C04C: adds r0, r1 lsls r0, 2 adds r0, r3 - ldr r1, _0807C0B8 + ldr r1, =0x0000ff4c strh r1, [r0, 0x24] ldrb r0, [r2] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r1, r3 - ldr r2, _0807C0BC + ldr r2, =0x08300d38 adds r0, r4, 0 adds r0, 0xF0 ldrh r0, [r0] @@ -250794,14 +241527,11 @@ _0807C04C: ldr r1, [r7] adds r1, 0xF4 strh r0, [r1] - ldr r0, _0807C0C0 + ldr r0, =0x00000179 bl current_map_music_set bl _0807CFB4 .align 2, 0 -_0807C0B4: .4byte 0x02020630 -_0807C0B8: .4byte 0x0000ff4c -_0807C0BC: .4byte 0x08300d38 -_0807C0C0: .4byte 0x00000179 + .pool _0807C0C4: ldr r5, [r7] adds r6, r5, 0 @@ -250810,7 +241540,7 @@ _0807C0C4: ldrsh r0, [r6, r1] cmp r0, 0 ble _0807C0F8 - ldr r2, _0807C0F4 + ldr r2, =0x02020630 adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -250826,9 +241556,9 @@ _0807C0C4: strh r0, [r6] bl _0807CFB4 .align 2, 0 -_0807C0F4: .4byte 0x02020630 + .pool _0807C0F8: - ldr r2, _0807C11C + ldr r2, =0x02020630 adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -250845,17 +241575,17 @@ _0807C0F8: strh r0, [r1] bl _0807CFB4 .align 2, 0 -_0807C11C: .4byte 0x02020630 + .pool _0807C120: - ldr r4, _0807C15C - ldr r1, _0807C160 + ldr r4, =0x02021fc4 + ldr r1, =0x085ee942 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - ldr r4, _0807C164 + ldr r4, =0x020322a0 ldr r0, [r4] adds r2, r0, 0 adds r2, 0xF0 @@ -250875,9 +241605,7 @@ _0807C14E: movs r0, 0xB bl _0807CE06 .align 2, 0 -_0807C15C: .4byte 0x02021fc4 -_0807C160: .4byte 0x085ee942 -_0807C164: .4byte 0x020322a0 + .pool _0807C168: ldr r1, [r7] ldr r0, [r1, 0x64] @@ -250890,7 +241618,7 @@ _0807C178: adds r0, r1, 0 adds r0, 0x8E ldrb r0, [r0] - ldr r2, _0807C1CC + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -250903,7 +241631,7 @@ _0807C178: str r2, [sp, 0x4] movs r2, 0x14 str r2, [sp, 0x8] - ldr r2, _0807C1D0 + ldr r2, =0x000fffff str r2, [sp, 0xC] movs r2, 0x78 movs r3, 0x20 @@ -250916,8 +241644,8 @@ _0807C178: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - ldr r4, _0807C1D4 - ldr r1, _0807C1D8 + ldr r4, =0x02021fc4 + ldr r1, =0x085ee959 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -250926,12 +241654,9 @@ _0807C178: bl sub_807F1A8 bl _0807CFB4 .align 2, 0 -_0807C1CC: .4byte 0x02020630 -_0807C1D0: .4byte 0x000fffff -_0807C1D4: .4byte 0x02021fc4 -_0807C1D8: .4byte 0x085ee959 + .pool _0807C1DC: - ldr r5, _0807C238 + ldr r5, =0x02020630 ldr r0, [r7] adds r0, 0xD2 ldrb r1, [r0] @@ -250942,12 +241667,12 @@ _0807C1DC: adds r4, 0x1C adds r0, r4 ldr r1, [r0] - ldr r0, _0807C23C + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _0807C1FC bl _0807CFB4 _0807C1FC: - ldr r0, _0807C240 + ldr r0, =0x08338d28 movs r1, 0x78 movs r2, 0x20 movs r3, 0 @@ -250963,7 +241688,7 @@ _0807C1FC: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0807C244 + ldr r1, =sub_807E5D8 + 1 str r1, [r0] adds r2, 0xD2 ldrb r1, [r2] @@ -250975,10 +241700,7 @@ _0807C1FC: ldr r1, [r7] bl _0807CF4C .align 2, 0 -_0807C238: .4byte 0x02020630 -_0807C23C: .4byte nullsub_12 + 1 -_0807C240: .4byte 0x08338d28 -_0807C244: .4byte sub_807E5D8 + 1 + .pool _0807C248: movs r0, 0x1 negs r0, r0 @@ -250987,16 +241709,16 @@ _0807C248: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0807C268 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x14 strh r1, [r0] bl _0807CFB4 .align 2, 0 -_0807C268: .4byte 0x020322a0 + .pool _0807C26C: - ldr r0, _0807C298 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -251014,7 +241736,7 @@ _0807C27C: bl Window_CopyToVram bl _0807CF48 .align 2, 0 -_0807C298: .4byte 0x02037fd4 + .pool _0807C29C: movs r1, 0x1 negs r1, r1 @@ -251025,7 +241747,7 @@ _0807C29C: movs r3, 0 bl _0807CF44 _0807C2AE: - ldr r0, _0807C2CC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -251039,9 +241761,9 @@ _0807C2BE: strh r1, [r0] bl _0807CFB4 .align 2, 0 -_0807C2CC: .4byte 0x02037fd4 + .pool _0807C2D0: - ldr r4, _0807C2EC + ldr r4, =0x020322a0 ldr r0, [r4] adds r2, r0, 0 adds r2, 0xEA @@ -251055,7 +241777,7 @@ _0807C2D0: strh r0, [r2] b _0807C30C .align 2, 0 -_0807C2EC: .4byte 0x020322a0 + .pool _0807C2F0: movs r0, 0x1 bl sub_807B62C @@ -251071,11 +241793,11 @@ _0807C2F0: strh r0, [r1] str r2, [r3, 0x64] _0807C30C: - ldr r0, _0807C314 + ldr r0, =0x020322a0 ldr r4, [r0] bl _0807CB5C .align 2, 0 -_0807C314: .4byte 0x020322a0 + .pool _0807C318: ldr r1, [r7] ldr r0, [r1, 0x64] @@ -251086,7 +241808,7 @@ _0807C318: bl _0807CFB4 _0807C328: bl sub_807AB28 - ldr r0, _0807C344 + ldr r0, =0x08338e74 movs r1, 0x78 movs r2, 0x50 movs r3, 0 @@ -251097,9 +241819,9 @@ _0807C328: ldr r1, [r7] bl _0807CF4C .align 2, 0 -_0807C344: .4byte 0x08338e74 + .pool _0807C348: - ldr r2, _0807C388 + ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -251121,14 +241843,13 @@ _0807C368: lsls r1, 3 movs r0, 0x50 bl lcd_io_set - ldr r1, _0807C38C + ldr r1, =0x0000040c movs r0, 0x52 bl lcd_io_set ldr r1, [r7] bl _0807CF4C .align 2, 0 -_0807C388: .4byte 0x02020630 -_0807C38C: .4byte 0x0000040c + .pool _0807C390: ldr r2, [r7] adds r0, r2, 0 @@ -251157,7 +241878,7 @@ _0807C3B0: beq _0807C3C4 bl _0807CFB4 _0807C3C4: - ldr r0, _0807C3DC + ldr r0, =0x08338dfc movs r1, 0x80 movs r2, 0x41 movs r3, 0 @@ -251167,18 +241888,18 @@ _0807C3C4: strb r0, [r1] bl _0807CFB4 .align 2, 0 -_0807C3DC: .4byte 0x08338dfc + .pool _0807C3E0: - ldr r0, _0807C424 + ldr r0, =0x08338d88 movs r1, 0x80 movs r2, 0x50 movs r3, 0x3 bl obj_add_from_template_forward_search - ldr r4, _0807C428 + ldr r4, =0x020322a0 ldr r1, [r4] adds r1, 0x90 strb r0, [r1] - ldr r0, _0807C42C + ldr r0, =0x08338dc8 movs r1, 0x80 movs r2, 0x50 movs r3, 0 @@ -251192,17 +241913,14 @@ _0807C3E0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0807C430 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 bl obj_anim_image_start ldr r1, [r4] bl _0807CF4C .align 2, 0 -_0807C424: .4byte 0x08338d88 -_0807C428: .4byte 0x020322a0 -_0807C42C: .4byte 0x08338dc8 -_0807C430: .4byte 0x02020630 + .pool _0807C434: ldr r2, [r7] adds r1, r2, 0 @@ -251218,14 +241936,14 @@ _0807C434: movs r0, 0xC8 strh r0, [r1] _0807C44E: - ldr r1, _0807C45C + ldr r1, =0x00001241 movs r0, 0 bl lcd_io_set bl _0807CFB4 .align 2, 0 -_0807C45C: .4byte 0x00001241 + .pool _0807C460: - ldr r2, _0807C4B4 + ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -251266,7 +241984,7 @@ _0807C4A6: strh r0, [r1] bl _0807CFB4 .align 2, 0 -_0807C4B4: .4byte 0x02020630 + .pool _0807C4B8: movs r1, 0x1 negs r1, r1 @@ -251276,16 +241994,16 @@ _0807C4B8: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0807C4D8 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x1E strh r1, [r0] bl _0807CFB4 .align 2, 0 -_0807C4D8: .4byte 0x020322a0 + .pool _0807C4DC: - ldr r0, _0807C520 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -251299,7 +242017,7 @@ _0807C4EC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0807C524 + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles ldr r0, [r7] @@ -251315,8 +242033,7 @@ _0807C4EC: ldr r1, [r7] bl _0807CF4C .align 2, 0 -_0807C520: .4byte 0x02037fd4 -_0807C524: .4byte 0x02020630 + .pool _0807C528: movs r1, 0x1 negs r1, r1 @@ -251326,13 +242043,13 @@ _0807C528: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r5, _0807C56C + ldr r5, =0x08338dc8 adds r0, r5, 0 movs r1, 0x6F movs r2, 0xAA movs r3, 0 bl obj_add_from_template_forward_search - ldr r4, _0807C570 + ldr r4, =0x020322a0 ldr r1, [r4] adds r1, 0x90 strb r0, [r1] @@ -251348,10 +242065,9 @@ _0807C528: ldr r1, [r4] bl _0807CF4C .align 2, 0 -_0807C56C: .4byte 0x08338dc8 -_0807C570: .4byte 0x020322a0 + .pool _0807C574: - ldr r0, _0807C5C4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -251359,15 +242075,15 @@ _0807C574: bne _0807C592 movs r0, 0x2E bl audio_play - ldr r0, _0807C5C8 + ldr r0, =0x020322a0 ldr r1, [r0] adds r1, 0x94 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] _0807C592: - ldr r3, _0807C5CC - ldr r0, _0807C5C8 + ldr r3, =0x02020630 + ldr r0, =0x020322a0 ldr r2, [r0] adds r0, r2, 0 adds r0, 0x90 @@ -251390,11 +242106,9 @@ _0807C592: strh r1, [r0, 0x26] bl _0807CFB4 .align 2, 0 -_0807C5C4: .4byte 0x02037fd4 -_0807C5C8: .4byte 0x020322a0 -_0807C5CC: .4byte 0x02020630 + .pool _0807C5D0: - ldr r5, _0807C62C + ldr r5, =0x02020630 ldr r4, [r7] adds r2, r4, 0 adds r2, 0x90 @@ -251440,33 +242154,33 @@ _0807C616: adds r1, r4, 0 bl _0807CF4C .align 2, 0 -_0807C62C: .4byte 0x02020630 + .pool _0807C630: - ldr r2, _0807C640 + ldr r2, =0x0000ffff movs r0, 0x1 movs r1, 0x10 bl sub_80A2A20 bl _0807CF48 .align 2, 0 -_0807C640: .4byte 0x0000ffff + .pool _0807C644: - ldr r2, _0807C654 + ldr r2, =0x0000ffff movs r0, 0x1 movs r1, 0 bl sub_80A2A20 bl _0807CF48 .align 2, 0 -_0807C654: .4byte 0x0000ffff + .pool _0807C658: - ldr r2, _0807C668 + ldr r2, =0x0000ffff movs r0, 0x1 movs r1, 0x10 bl sub_80A2A20 bl _0807CF48 .align 2, 0 -_0807C668: .4byte 0x0000ffff + .pool _0807C66C: - ldr r5, _0807C6D8 + ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0xF0 ldrh r0, [r0] @@ -251474,7 +242188,7 @@ _0807C66C: lsls r0, 24 cmp r0, 0 bne _0807C6E4 - ldr r4, _0807C6DC + ldr r4, =0x02020630 ldr r2, [r5] adds r2, 0x8E ldrb r1, [r2] @@ -251484,7 +242198,7 @@ _0807C66C: adds r1, r4, 0 adds r1, 0x10 adds r0, r1 - ldr r1, _0807C6E0 + ldr r1, =0x08338ecc str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -251517,9 +242231,7 @@ _0807C66C: bl sub_8008258 b _0807C6FA .align 2, 0 -_0807C6D8: .4byte 0x020322a0 -_0807C6DC: .4byte 0x02020630 -_0807C6E0: .4byte 0x08338ecc + .pool _0807C6E4: ldr r0, [r5] adds r0, 0x8E @@ -251527,19 +242239,19 @@ _0807C6E4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0807C788 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 bl sub_8008258 _0807C6FA: - ldr r5, _0807C78C + ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0x8F ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0807C788 + ldr r4, =0x02020630 adds r0, r4 movs r1, 0 bl sub_8008258 @@ -251573,7 +242285,7 @@ _0807C6FA: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0807C790 + ldr r1, =0x0000ffe0 strh r1, [r0, 0x22] ldrb r0, [r3] lsls r1, r0, 4 @@ -251601,11 +242313,9 @@ _0807C6FA: ldr r1, [r5] bl _0807CF4C .align 2, 0 -_0807C788: .4byte 0x02020630 -_0807C78C: .4byte 0x020322a0 -_0807C790: .4byte 0x0000ffe0 + .pool _0807C794: - ldr r4, _0807C85C + ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 adds r3, 0x8E @@ -251699,16 +242409,15 @@ _0807C7FC: ldrb r1, [r0] orrs r1, r2 strb r1, [r0] - ldr r2, _0807C860 + ldr r2, =0x0000ffff movs r0, 0x1 movs r1, 0 bl sub_80A2A20 b _0807CFB4 .align 2, 0 -_0807C85C: .4byte 0x02020630 -_0807C860: .4byte 0x0000ffff + .pool _0807C864: - ldr r4, _0807C8E8 + ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 adds r3, 0x90 @@ -251773,9 +242482,9 @@ _0807C8A6: bl obj_delete_and_free_tiles b _0807CFB4 .align 2, 0 -_0807C8E8: .4byte 0x02020630 + .pool _0807C8EC: - ldr r0, _0807C954 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -251794,7 +242503,7 @@ _0807C8FA: adds r0, 0xE0 movs r1, 0xA6 strh r1, [r0] - ldr r0, _0807C958 + ldr r0, =0x08338d88 movs r4, 0x14 negs r4, r4 movs r1, 0x80 @@ -251804,7 +242513,7 @@ _0807C8FA: ldr r1, [r7] adds r1, 0x90 strb r0, [r1] - ldr r0, _0807C95C + ldr r0, =0x08338dc8 movs r1, 0x80 adds r2, r4, 0 movs r3, 0 @@ -251818,16 +242527,13 @@ _0807C8FA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0807C960 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 bl obj_anim_image_start b _0807CFB4 .align 2, 0 -_0807C954: .4byte 0x02037fd4 -_0807C958: .4byte 0x08338d88 -_0807C95C: .4byte 0x08338dc8 -_0807C960: .4byte 0x02020630 + .pool _0807C964: movs r1, 0x1 negs r1, r1 @@ -251842,7 +242548,7 @@ _0807C974: lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _0807C990 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -251852,9 +242558,9 @@ _0807C974: _0807C98C: b _0807CF48 .align 2, 0 -_0807C990: .4byte 0x02037fd4 + .pool _0807C994: - ldr r2, _0807C9E0 + ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -251893,7 +242599,7 @@ _0807C9DA: adds r1, r4, 0 b _0807CF4C .align 2, 0 -_0807C9E0: .4byte 0x02020630 + .pool _0807C9E4: ldr r1, [r7] adds r5, r1, 0 @@ -251918,7 +242624,7 @@ _0807CA02: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0807CA3C + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles ldr r0, [r7] @@ -251939,7 +242645,7 @@ _0807CA02: str r1, [r3, 0x64] b _0807CFB4 .align 2, 0 -_0807CA3C: .4byte 0x02020630 + .pool _0807CA40: ldr r1, [r7] ldr r0, [r1, 0x64] @@ -251987,7 +242693,7 @@ _0807CA86: bne _0807CA92 b _0807CFB4 _0807CA92: - ldr r0, _0807CABC + ldr r0, =0x08338dfc movs r1, 0x80 movs r2, 0x41 movs r3, 0 @@ -251995,7 +242701,7 @@ _0807CA92: ldr r1, [r7] adds r1, 0x92 strb r0, [r1] - ldr r2, _0807CAC0 + ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x92 ldrb r1, [r0] @@ -252004,20 +242710,18 @@ _0807CA92: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _0807CAC4 + ldr r1, =sub_807AAE0 + 1 str r1, [r0] b _0807CFB4 .align 2, 0 -_0807CABC: .4byte 0x08338dfc -_0807CAC0: .4byte 0x02020630 -_0807CAC4: .4byte sub_807AAE0 + 1 + .pool _0807CAC8: - ldr r0, _0807CAE8 + ldr r0, =0x08338e74 movs r1, 0x78 movs r2, 0x50 movs r3, 0 bl obj_add_from_template_forward_search - ldr r2, _0807CAEC + ldr r2, =0x020322a0 ldr r1, [r2] adds r1, 0x91 strb r0, [r1] @@ -252027,10 +242731,9 @@ _0807CAC8: strh r1, [r0] b _0807CFB4 .align 2, 0 -_0807CAE8: .4byte 0x08338e74 -_0807CAEC: .4byte 0x020322a0 + .pool _0807CAF0: - ldr r2, _0807CB2C + ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -252059,13 +242762,13 @@ _0807CB0E: bl audio_play b _0807CFB4 .align 2, 0 -_0807CB2C: .4byte 0x02020630 + .pool _0807CB30: ldr r1, [r7] adds r2, r1, 0 adds r2, 0xEA ldrh r3, [r2] - ldr r0, _0807CB48 + ldr r0, =0x000003ff cmp r3, r0 bhi _0807CB4C adds r0, r3, 0 @@ -252073,7 +242776,7 @@ _0807CB30: strh r0, [r2] b _0807CB5A .align 2, 0 -_0807CB48: .4byte 0x000003ff + .pool _0807CB4C: movs r0, 0x80 lsls r0, 3 @@ -252102,16 +242805,16 @@ _0807CB70: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0807CB8C + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x3C strh r1, [r0] b _0807CFB4 .align 2, 0 -_0807CB8C: .4byte 0x020322a0 + .pool _0807CB90: - ldr r4, _0807CBB4 + ldr r4, =0x02037fd4 ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -252129,9 +242832,9 @@ _0807CB9E: strb r0, [r4, 0x8] b _0807CF48 .align 2, 0 -_0807CBB4: .4byte 0x02037fd4 + .pool _0807CBB8: - ldr r2, _0807CBD0 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -252144,13 +242847,13 @@ _0807CBB8: movs r3, 0 b _0807CF44 .align 2, 0 -_0807CBD0: .4byte 0x02037fd4 + .pool _0807CBD4: movs r1, 0xA2 lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _0807CBF0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -252160,20 +242863,20 @@ _0807CBD4: _0807CBEC: b _0807CF48 .align 2, 0 -_0807CBF0: .4byte 0x02037fd4 + .pool _0807CBF4: - ldr r0, _0807CC88 + ldr r0, =0x08338d28 movs r2, 0x8 negs r2, r2 movs r1, 0x78 movs r3, 0 bl obj_add_from_template_forward_search - ldr r5, _0807CC8C + ldr r5, =0x020322a0 ldr r1, [r5] adds r1, 0xD3 movs r6, 0 strb r0, [r1] - ldr r4, _0807CC90 + ldr r4, =0x02020630 ldr r2, [r5] adds r2, 0xD3 ldrb r1, [r2] @@ -252190,7 +242893,7 @@ _0807CBF4: adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0807CC94 + ldr r1, =sub_807E6AC + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -252220,7 +242923,7 @@ _0807CBF4: adds r1, 0x10 movs r0, 0x1 lsls r0, r1 - ldr r2, _0807CC98 + ldr r2, =0x0000ffff movs r1, 0x10 bl sub_80A2A20 ldr r2, [r5] @@ -252232,13 +242935,9 @@ _0807CBF4: str r6, [r2, 0x64] b _0807CFB4 .align 2, 0 -_0807CC88: .4byte 0x08338d28 -_0807CC8C: .4byte 0x020322a0 -_0807CC90: .4byte 0x02020630 -_0807CC94: .4byte sub_807E6AC + 1 -_0807CC98: .4byte 0x0000ffff + .pool _0807CC9C: - ldr r2, _0807CCC8 + ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0xD3 ldrb r1, [r0] @@ -252251,7 +242950,7 @@ _0807CC9C: adds r1, 0x10 movs r0, 0x1 lsls r0, r1 - ldr r1, _0807CCCC + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0x1 movs r2, 0x10 @@ -252260,10 +242959,9 @@ _0807CC9C: ldr r1, [r7] b _0807CF4C .align 2, 0 -_0807CCC8: .4byte 0x02020630 -_0807CCCC: .4byte 0x0000ffff + .pool _0807CCD0: - ldr r2, _0807CD0C + ldr r2, =0x02020630 ldr r3, [r7] adds r0, r3, 0 adds r0, 0xD3 @@ -252274,7 +242972,7 @@ _0807CCD0: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0807CD10 + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _0807CCEE b _0807CFB4 @@ -252283,9 +242981,9 @@ _0807CCEE: adds r0, 0xF2 ldrh r2, [r0] lsls r0, r2, 3 - ldr r1, _0807CD14 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _0807CD18 + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x10] ldr r3, [r3, 0x6C] @@ -252293,12 +242991,9 @@ _0807CCEE: ldr r1, [r7] b _0807CF4C .align 2, 0 -_0807CD0C: .4byte 0x02020630 -_0807CD10: .4byte nullsub_12 + 1 -_0807CD14: .4byte 0x0830a18c -_0807CD18: .4byte 0x020244d4 + .pool _0807CD1C: - ldr r4, _0807CDD0 + ldr r4, =0x02020630 ldr r2, [r7] adds r6, r2, 0 adds r6, 0x8F @@ -252315,7 +243010,7 @@ _0807CD1C: adds r1, r0 lsls r1, 2 adds r1, r4 - ldr r3, _0807CDD4 + ldr r3, =0x08300d38 adds r2, 0xF2 ldrh r0, [r2] lsls r0, 2 @@ -252358,7 +243053,7 @@ _0807CD1C: str r2, [sp, 0x4] movs r2, 0x14 str r2, [sp, 0x8] - ldr r2, _0807CDD8 + ldr r2, =0x000fffff str r2, [sp, 0xC] adds r3, 0xF2 ldrh r2, [r3] @@ -252385,23 +243080,21 @@ _0807CD1C: ldr r1, [r7] b _0807CF4C .align 2, 0 -_0807CDD0: .4byte 0x02020630 -_0807CDD4: .4byte 0x08300d38 -_0807CDD8: .4byte 0x000fffff + .pool _0807CDDC: movs r1, 0xAA lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r4, _0807CE0C - ldr r1, _0807CE10 + ldr r4, =0x02021fc4 + ldr r1, =0x085ee966 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - ldr r0, _0807CE14 + ldr r0, =0x020322a0 ldr r3, [r0] adds r1, r3, 0 adds r1, 0x94 @@ -252412,9 +243105,7 @@ _0807CE06: str r2, [r3, 0x64] b _0807CFB4 .align 2, 0 -_0807CE0C: .4byte 0x02021fc4 -_0807CE10: .4byte 0x085ee966 -_0807CE14: .4byte 0x020322a0 + .pool _0807CE18: ldr r3, [r7] ldr r0, [r3, 0x64] @@ -252427,12 +243118,12 @@ _0807CE26: adds r0, r3, 0 adds r0, 0x94 movs r2, 0 - ldr r1, _0807CE34 + ldr r1, =0x0000010b strh r1, [r0] str r2, [r3, 0x64] b _0807CFB4 .align 2, 0 -_0807CE34: .4byte 0x0000010b + .pool _0807CE38: bl sub_80A3678 lsls r0, 24 @@ -252440,14 +243131,14 @@ _0807CE38: bne _0807CE44 b _0807CFB4 _0807CE44: - ldr r0, _0807CE50 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x44 strh r1, [r0] b _0807CFB4 .align 2, 0 -_0807CE50: .4byte 0x020322a0 + .pool _0807CE54: ldr r1, [r7] ldr r0, [r1, 0x64] @@ -252455,7 +243146,7 @@ _0807CE54: str r0, [r1, 0x64] cmp r0, 0xA bne _0807CE66 - ldr r0, _0807CE94 + ldr r0, =0x00000173 bl fanfare_play _0807CE66: ldr r1, [r7] @@ -252469,8 +243160,8 @@ _0807CE70: adds r0, 0x1 movs r5, 0 strh r0, [r1] - ldr r4, _0807CE98 - ldr r1, _0807CE9C + ldr r4, =0x02021fc4 + ldr r1, =0x085ee977 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -252481,9 +243172,7 @@ _0807CE70: str r5, [r0, 0x64] b _0807CFB4 .align 2, 0 -_0807CE94: .4byte 0x00000173 -_0807CE98: .4byte 0x02021fc4 -_0807CE9C: .4byte 0x085ee977 + .pool _0807CEA0: ldr r1, [r7] ldr r0, [r1, 0x64] @@ -252507,7 +243196,7 @@ _0807CEB6: movs r0, 0x1 b _0807CFB6 _0807CEC6: - ldr r0, _0807CED8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -252516,20 +243205,20 @@ _0807CEC6: adds r1, r2, 0 b _0807CF4C .align 2, 0 -_0807CED8: .4byte 0x030022c0 + .pool _0807CEDC: - ldr r0, _0807CF20 + ldr r0, =0x020375e2 ldrb r0, [r0] movs r1, 0 bl sub_807B4D0 - ldr r1, _0807CF24 - ldr r0, _0807CF28 + ldr r1, =0x030061e8 + ldr r0, =sub_807B60C + 1 str r0, [r1] - ldr r7, _0807CF2C + ldr r7, =0x02032298 ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _0807CF30 + ldr r5, =0x020244ec adds r0, r5 movs r1, 0x1 movs r2, 0 @@ -252542,7 +243231,7 @@ _0807CEDC: adds r0, r3, 0 muls r0, r6 adds r0, r5 - ldr r1, _0807CF34 + ldr r1, =0x020322a0 ldr r1, [r1] adds r1, 0x8F ldrb r2, [r1] @@ -252550,12 +243239,7 @@ _0807CEDC: bl sub_813E1D4 b _0807CF48 .align 2, 0 -_0807CF20: .4byte 0x020375e2 -_0807CF24: .4byte 0x030061e8 -_0807CF28: .4byte sub_807B60C + 1 -_0807CF2C: .4byte 0x02032298 -_0807CF30: .4byte 0x020244ec -_0807CF34: .4byte 0x020322a0 + .pool _0807CF38: movs r0, 0x1 negs r0, r0 @@ -252566,7 +243250,7 @@ _0807CF38: _0807CF44: bl sub_80A1AD4 _0807CF48: - ldr r0, _0807CF58 + ldr r0, =0x020322a0 ldr r1, [r0] _0807CF4C: adds r1, 0x94 @@ -252575,9 +243259,9 @@ _0807CF4C: strh r0, [r1] b _0807CFB4 .align 2, 0 -_0807CF58: .4byte 0x020322a0 + .pool _0807CF5C: - ldr r0, _0807CFC0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -252607,7 +243291,7 @@ _0807CF5C: bl free str r4, [r7] _0807CFAA: - ldr r0, _0807CFC4 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 bl sub_807E784 _0807CFB4: @@ -252618,33 +243302,30 @@ _0807CFB6: pop {r1} bx r1 .align 2, 0 -_0807CFC0: .4byte 0x02037fd4 -_0807CFC4: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_807BBEC thumb_func_start sub_807CFC8 sub_807CFC8: @ 807CFC8 push {r4-r7,lr} sub sp, 0x14 - ldr r0, _0807CFEC + ldr r0, =0x020322a0 ldr r1, [r0] adds r1, 0x94 ldrh r5, [r1] - ldr r1, _0807CFF0 + ldr r1, =0x0000010b adds r7, r0, 0 cmp r5, r1 bls _0807CFE0 bl _0807E400 _0807CFE0: lsls r0, r5, 2 - ldr r1, _0807CFF4 + ldr r1, =_0807CFF8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807CFEC: .4byte 0x020322a0 -_0807CFF0: .4byte 0x0000010b -_0807CFF4: .4byte _0807CFF8 + .pool .align 2, 0 _0807CFF8: .4byte _0807D428 @@ -252916,7 +243597,7 @@ _0807CFF8: .4byte _0807E400 .4byte _0807E284 _0807D428: - ldr r3, _0807D490 + ldr r3, =0x02020630 ldr r0, [r7] adds r0, 0x8E ldrb r1, [r0] @@ -252938,14 +243619,14 @@ _0807D428: adds r0, r1 lsls r0, 2 adds r0, r3 - ldr r1, _0807D494 + ldr r1, =0x0000ff4c strh r1, [r0, 0x24] ldrb r0, [r2] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r1, r3 - ldr r2, _0807D498 + ldr r2, =0x08300d38 adds r0, r4, 0 adds r0, 0xF0 ldrh r0, [r0] @@ -252962,14 +243643,11 @@ _0807D428: ldr r1, [r7] adds r1, 0xF4 strh r0, [r1] - ldr r0, _0807D49C + ldr r0, =0x00000179 bl current_map_music_set bl _0807E400 .align 2, 0 -_0807D490: .4byte 0x02020630 -_0807D494: .4byte 0x0000ff4c -_0807D498: .4byte 0x08300d38 -_0807D49C: .4byte 0x00000179 + .pool _0807D4A0: ldr r5, [r7] adds r6, r5, 0 @@ -252978,7 +243656,7 @@ _0807D4A0: ldrsh r0, [r6, r1] cmp r0, 0 ble _0807D4D4 - ldr r2, _0807D4D0 + ldr r2, =0x02020630 adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -252994,9 +243672,9 @@ _0807D4A0: strh r0, [r6] bl _0807E400 .align 2, 0 -_0807D4D0: .4byte 0x02020630 + .pool _0807D4D4: - ldr r2, _0807D4F8 + ldr r2, =0x02020630 adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -253013,17 +243691,17 @@ _0807D4D4: strh r0, [r1] bl _0807E400 .align 2, 0 -_0807D4F8: .4byte 0x02020630 + .pool _0807D4FC: - ldr r4, _0807D538 - ldr r1, _0807D53C + ldr r4, =0x02021fc4 + ldr r1, =0x085ee942 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - ldr r4, _0807D540 + ldr r4, =0x020322a0 ldr r0, [r4] adds r2, r0, 0 adds r2, 0xF0 @@ -253043,9 +243721,7 @@ _0807D52A: movs r0, 0xB bl _0807E252 .align 2, 0 -_0807D538: .4byte 0x02021fc4 -_0807D53C: .4byte 0x085ee942 -_0807D540: .4byte 0x020322a0 + .pool _0807D544: ldr r1, [r7] ldr r0, [r1, 0x64] @@ -253058,7 +243734,7 @@ _0807D554: adds r0, r1, 0 adds r0, 0x8E ldrb r0, [r0] - ldr r2, _0807D5A8 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -253071,7 +243747,7 @@ _0807D554: str r2, [sp, 0x4] movs r2, 0x14 str r2, [sp, 0x8] - ldr r2, _0807D5AC + ldr r2, =0x000fffff str r2, [sp, 0xC] movs r2, 0x78 movs r3, 0x20 @@ -253084,8 +243760,8 @@ _0807D554: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - ldr r4, _0807D5B0 - ldr r1, _0807D5B4 + ldr r4, =0x02021fc4 + ldr r1, =0x085ee959 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -253094,12 +243770,9 @@ _0807D554: bl sub_807F1A8 bl _0807E400 .align 2, 0 -_0807D5A8: .4byte 0x02020630 -_0807D5AC: .4byte 0x000fffff -_0807D5B0: .4byte 0x02021fc4 -_0807D5B4: .4byte 0x085ee959 + .pool _0807D5B8: - ldr r5, _0807D614 + ldr r5, =0x02020630 ldr r0, [r7] adds r0, 0xD2 ldrb r1, [r0] @@ -253110,12 +243783,12 @@ _0807D5B8: adds r4, 0x1C adds r0, r4 ldr r1, [r0] - ldr r0, _0807D618 + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _0807D5D8 bl _0807E400 _0807D5D8: - ldr r0, _0807D61C + ldr r0, =0x08338d28 movs r1, 0x78 movs r2, 0x20 movs r3, 0 @@ -253131,7 +243804,7 @@ _0807D5D8: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0807D620 + ldr r1, =sub_807E5D8 + 1 str r1, [r0] adds r2, 0xD2 ldrb r1, [r2] @@ -253143,10 +243816,7 @@ _0807D5D8: ldr r1, [r7] bl _0807E398 .align 2, 0 -_0807D614: .4byte 0x02020630 -_0807D618: .4byte nullsub_12 + 1 -_0807D61C: .4byte 0x08338d28 -_0807D620: .4byte sub_807E5D8 + 1 + .pool _0807D624: movs r0, 0x1 negs r0, r0 @@ -253155,16 +243825,16 @@ _0807D624: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0807D644 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x14 strh r1, [r0] bl _0807E400 .align 2, 0 -_0807D644: .4byte 0x020322a0 + .pool _0807D648: - ldr r0, _0807D674 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -253182,7 +243852,7 @@ _0807D658: bl Window_CopyToVram bl _0807E394 .align 2, 0 -_0807D674: .4byte 0x02037fd4 + .pool _0807D678: movs r1, 0x1 negs r1, r1 @@ -253193,7 +243863,7 @@ _0807D678: movs r3, 0 bl _0807E390 _0807D68A: - ldr r0, _0807D6A8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -253207,9 +243877,9 @@ _0807D69A: strh r1, [r0] bl _0807E400 .align 2, 0 -_0807D6A8: .4byte 0x02037fd4 + .pool _0807D6AC: - ldr r4, _0807D6C8 + ldr r4, =0x020322a0 ldr r0, [r4] adds r2, r0, 0 adds r2, 0xEA @@ -253223,7 +243893,7 @@ _0807D6AC: strh r0, [r2] b _0807D6E6 .align 2, 0 -_0807D6C8: .4byte 0x020322a0 + .pool _0807D6CC: movs r0, 0x1 bl sub_807B62C @@ -253238,11 +243908,11 @@ _0807D6CC: strh r0, [r1] str r2, [r3, 0x64] _0807D6E6: - ldr r0, _0807D6F0 + ldr r0, =0x020322a0 ldr r4, [r0] bl _0807DFA8 .align 2, 0 -_0807D6F0: .4byte 0x020322a0 + .pool _0807D6F4: ldr r1, [r7] ldr r0, [r1, 0x64] @@ -253254,7 +243924,7 @@ _0807D6F4: _0807D704: movs r0, 0x3 bl sub_807B62C - ldr r0, _0807D724 + ldr r0, =0x08338e8c movs r1, 0x78 movs r2, 0x50 movs r3, 0 @@ -253265,9 +243935,9 @@ _0807D704: ldr r1, [r7] bl _0807E398 .align 2, 0 -_0807D724: .4byte 0x08338e8c + .pool _0807D728: - ldr r2, _0807D770 + ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -253285,39 +243955,36 @@ _0807D728: _0807D748: adds r0, r1, 0 bl obj_delete_and_free_tiles - ldr r1, _0807D774 + ldr r1, =0x00000452 movs r0, 0x50 bl lcd_io_set movs r1, 0x82 lsls r1, 3 movs r0, 0x52 bl lcd_io_set - ldr r0, _0807D778 + ldr r0, =c3_08054588 + 1 movs r1, 0x5 bl AddTask ldr r1, [r7] bl _0807E398 .align 2, 0 -_0807D770: .4byte 0x02020630 -_0807D774: .4byte 0x00000452 -_0807D778: .4byte c3_08054588 + 1 + .pool _0807D77C: - ldr r0, _0807D79C + ldr r0, =c3_08054588 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 beq _0807D78C bl _0807E400 _0807D78C: - ldr r0, _0807D7A0 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x1A strh r1, [r0] bl _0807E400 .align 2, 0 -_0807D79C: .4byte c3_08054588 + 1 -_0807D7A0: .4byte 0x020322a0 + .pool _0807D7A4: ldr r2, [r7] adds r0, r2, 0 @@ -253335,16 +244002,16 @@ _0807D7BE: adds r1, r2, 0 bl _0807E398 _0807D7C4: - ldr r0, _0807D81C + ldr r0, =0x08338d88 movs r1, 0x78 movs r2, 0x50 movs r3, 0x3 bl obj_add_from_template_forward_search - ldr r4, _0807D820 + ldr r4, =0x020322a0 ldr r1, [r4] adds r1, 0x90 strb r0, [r1] - ldr r5, _0807D824 + ldr r5, =0x02020630 ldr r0, [r4] adds r0, 0x90 ldrb r1, [r0] @@ -253354,9 +244021,9 @@ _0807D7C4: adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0807D828 + ldr r1, =sub_807AA4C + 1 str r1, [r0] - ldr r0, _0807D82C + ldr r0, =0x08338dc8 movs r1, 0x78 movs r2, 0x50 movs r3, 0 @@ -253376,11 +244043,7 @@ _0807D7C4: ldr r1, [r4] bl _0807E398 .align 2, 0 -_0807D81C: .4byte 0x08338d88 -_0807D820: .4byte 0x020322a0 -_0807D824: .4byte 0x02020630 -_0807D828: .4byte sub_807AA4C + 1 -_0807D82C: .4byte 0x08338dc8 + .pool _0807D830: ldr r2, [r7] adds r1, r2, 0 @@ -253396,14 +244059,14 @@ _0807D830: movs r0, 0xC8 strh r0, [r1] _0807D84A: - ldr r1, _0807D858 + ldr r1, =0x00001241 movs r0, 0 bl lcd_io_set bl _0807E400 .align 2, 0 -_0807D858: .4byte 0x00001241 + .pool _0807D85C: - ldr r2, _0807D8B0 + ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -253444,7 +244107,7 @@ _0807D8A2: strh r0, [r1] bl _0807E400 .align 2, 0 -_0807D8B0: .4byte 0x02020630 + .pool _0807D8B4: movs r1, 0x1 negs r1, r1 @@ -253454,16 +244117,16 @@ _0807D8B4: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0807D8D4 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x1E strh r1, [r0] bl _0807E400 .align 2, 0 -_0807D8D4: .4byte 0x020322a0 + .pool _0807D8D8: - ldr r0, _0807D91C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -253477,7 +244140,7 @@ _0807D8E8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0807D920 + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles ldr r0, [r7] @@ -253493,8 +244156,7 @@ _0807D8E8: ldr r1, [r7] bl _0807E398 .align 2, 0 -_0807D91C: .4byte 0x02037fd4 -_0807D920: .4byte 0x02020630 + .pool _0807D924: movs r1, 0x1 negs r1, r1 @@ -253504,13 +244166,13 @@ _0807D924: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r5, _0807D968 + ldr r5, =0x08338dc8 adds r0, r5, 0 movs r1, 0x6F movs r2, 0xAA movs r3, 0 bl obj_add_from_template_forward_search - ldr r4, _0807D96C + ldr r4, =0x020322a0 ldr r1, [r4] adds r1, 0x90 strb r0, [r1] @@ -253526,10 +244188,9 @@ _0807D924: ldr r1, [r4] bl _0807E398 .align 2, 0 -_0807D968: .4byte 0x08338dc8 -_0807D96C: .4byte 0x020322a0 + .pool _0807D970: - ldr r0, _0807D9C0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -253537,15 +244198,15 @@ _0807D970: bne _0807D98E movs r0, 0x2E bl audio_play - ldr r0, _0807D9C4 + ldr r0, =0x020322a0 ldr r1, [r0] adds r1, 0x94 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] _0807D98E: - ldr r3, _0807D9C8 - ldr r0, _0807D9C4 + ldr r3, =0x02020630 + ldr r0, =0x020322a0 ldr r2, [r0] adds r0, r2, 0 adds r0, 0x90 @@ -253568,11 +244229,9 @@ _0807D98E: strh r1, [r0, 0x26] bl _0807E400 .align 2, 0 -_0807D9C0: .4byte 0x02037fd4 -_0807D9C4: .4byte 0x020322a0 -_0807D9C8: .4byte 0x02020630 + .pool _0807D9CC: - ldr r5, _0807DA30 + ldr r5, =0x02020630 ldr r4, [r7] adds r2, r4, 0 adds r2, 0x90 @@ -253620,37 +244279,36 @@ _0807DA12: ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - ldr r0, _0807DA34 + ldr r0, =c3_0805465C + 1 b _0807DC5A .align 2, 0 -_0807DA30: .4byte 0x02020630 -_0807DA34: .4byte c3_0805465C + 1 + .pool _0807DA38: - ldr r2, _0807DA48 + ldr r2, =0x0000ffff movs r0, 0x8 movs r1, 0x10 bl sub_80A2A20 bl _0807E394 .align 2, 0 -_0807DA48: .4byte 0x0000ffff + .pool _0807DA4C: - ldr r2, _0807DA5C + ldr r2, =0x0000ffff movs r0, 0x8 movs r1, 0x10 bl sub_80A2A20 bl _0807E394 .align 2, 0 -_0807DA5C: .4byte 0x0000ffff + .pool _0807DA60: - ldr r2, _0807DA70 + ldr r2, =0x0000ffff movs r0, 0x8 movs r1, 0x10 bl sub_80A2A20 bl _0807E394 .align 2, 0 -_0807DA70: .4byte 0x0000ffff + .pool _0807DA74: - ldr r5, _0807DAE0 + ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0xF0 ldrh r0, [r0] @@ -253658,7 +244316,7 @@ _0807DA74: lsls r0, 24 cmp r0, 0 bne _0807DAEC - ldr r4, _0807DAE4 + ldr r4, =0x02020630 ldr r2, [r5] adds r2, 0x8E ldrb r1, [r2] @@ -253668,7 +244326,7 @@ _0807DA74: adds r1, r4, 0 adds r1, 0x10 adds r0, r1 - ldr r1, _0807DAE8 + ldr r1, =0x08338ecc str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -253701,9 +244359,7 @@ _0807DA74: bl sub_8008258 b _0807DB02 .align 2, 0 -_0807DAE0: .4byte 0x020322a0 -_0807DAE4: .4byte 0x02020630 -_0807DAE8: .4byte 0x08338ecc + .pool _0807DAEC: ldr r0, [r5] adds r0, 0x8E @@ -253711,19 +244367,19 @@ _0807DAEC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0807DB90 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 bl sub_8008258 _0807DB02: - ldr r5, _0807DB94 + ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0x8F ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0807DB90 + ldr r4, =0x02020630 adds r0, r4 movs r1, 0 bl sub_8008258 @@ -253757,7 +244413,7 @@ _0807DB02: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0807DB98 + ldr r1, =0x0000ffe0 strh r1, [r0, 0x22] ldrb r0, [r3] lsls r1, r0, 4 @@ -253785,11 +244441,9 @@ _0807DB02: ldr r1, [r5] bl _0807E398 .align 2, 0 -_0807DB90: .4byte 0x02020630 -_0807DB94: .4byte 0x020322a0 -_0807DB98: .4byte 0x0000ffe0 + .pool _0807DB9C: - ldr r4, _0807DC64 + ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 adds r3, 0x8E @@ -253883,16 +244537,15 @@ _0807DC04: ldrb r1, [r0] orrs r1, r2 strb r1, [r0] - ldr r0, _0807DC68 + ldr r0, =sub_807F39C + 1 _0807DC5A: movs r1, 0x5 bl AddTask b _0807E400 .align 2, 0 -_0807DC64: .4byte 0x02020630 -_0807DC68: .4byte sub_807F39C + 1 + .pool _0807DC6C: - ldr r4, _0807DCF0 + ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 adds r3, 0x90 @@ -253957,9 +244610,9 @@ _0807DCAE: bl obj_delete_and_free_tiles b _0807E400 .align 2, 0 -_0807DCF0: .4byte 0x02020630 + .pool _0807DCF4: - ldr r0, _0807DD80 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -253985,7 +244638,7 @@ _0807DD02: movs r1, 0xCE lsls r1, 1 strh r1, [r0] - ldr r0, _0807DD84 + ldr r0, =0x08338d88 movs r4, 0x14 negs r4, r4 movs r1, 0x78 @@ -253995,7 +244648,7 @@ _0807DD02: ldr r1, [r7] adds r1, 0x90 strb r0, [r1] - ldr r5, _0807DD88 + ldr r5, =0x02020630 ldr r0, [r7] adds r0, 0x90 ldrb r1, [r0] @@ -254005,9 +244658,9 @@ _0807DD02: adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0807DD8C + ldr r1, =sub_807AA4C + 1 str r1, [r0] - ldr r0, _0807DD90 + ldr r0, =0x08338dc8 movs r1, 0x78 adds r2, r4, 0 movs r3, 0 @@ -254026,11 +244679,7 @@ _0807DD02: bl obj_anim_image_start b _0807E400 .align 2, 0 -_0807DD80: .4byte 0x02037fd4 -_0807DD84: .4byte 0x08338d88 -_0807DD88: .4byte 0x02020630 -_0807DD8C: .4byte sub_807AA4C + 1 -_0807DD90: .4byte 0x08338dc8 + .pool _0807DD94: movs r1, 0x1 negs r1, r1 @@ -254045,7 +244694,7 @@ _0807DDA4: lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _0807DDC0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -254055,9 +244704,9 @@ _0807DDA4: _0807DDBC: b _0807E394 .align 2, 0 -_0807DDC0: .4byte 0x02037fd4 + .pool _0807DDC4: - ldr r2, _0807DE18 + ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -254101,13 +244750,13 @@ _0807DE0A: str r0, [r4, 0x64] b _0807E400 .align 2, 0 -_0807DE18: .4byte 0x02020630 + .pool _0807DE1C: movs r1, 0xB2 lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r4, _0807DE78 + ldr r4, =0x020322a0 ldr r2, [r4] adds r1, r2, 0 adds r1, 0xE0 @@ -254123,12 +244772,12 @@ _0807DE1C: str r0, [r2, 0x64] cmp r0, 0xA bne _0807DE60 - ldr r0, _0807DE7C + ldr r0, =c3_08054588 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0807DE80 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -254150,9 +244799,7 @@ _0807DE74: strh r2, [r3] b _0807E398 .align 2, 0 -_0807DE78: .4byte 0x020322a0 -_0807DE7C: .4byte c3_08054588 + 1 -_0807DE80: .4byte 0x03005e00 + .pool _0807DE84: ldr r0, [r7] adds r0, 0x90 @@ -254160,7 +244807,7 @@ _0807DE84: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0807DEBC + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles ldr r0, [r7] @@ -254181,9 +244828,9 @@ _0807DE84: str r1, [r3, 0x64] b _0807E400 .align 2, 0 -_0807DEBC: .4byte 0x02020630 + .pool _0807DEC0: - ldr r0, _0807DEE0 + ldr r0, =c3_08054588 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r3, r0, 24 @@ -254191,7 +244838,7 @@ _0807DEC0: beq _0807DED0 b _0807E400 _0807DED0: - ldr r0, _0807DEE4 + ldr r0, =0x020322a0 ldr r2, [r0] adds r1, r2, 0 adds r1, 0x94 @@ -254200,8 +244847,7 @@ _0807DED0: str r3, [r2, 0x64] b _0807E400 .align 2, 0 -_0807DEE0: .4byte c3_08054588 + 1 -_0807DEE4: .4byte 0x020322a0 + .pool _0807DEE8: ldr r1, [r7] ldr r0, [r1, 0x64] @@ -254230,12 +244876,12 @@ _0807DF12: strh r6, [r5] b _0807E398 _0807DF16: - ldr r0, _0807DF34 + ldr r0, =0x08338e74 movs r1, 0x78 movs r2, 0x50 movs r3, 0 bl obj_add_from_template_forward_search - ldr r2, _0807DF38 + ldr r2, =0x020322a0 ldr r1, [r2] adds r1, 0x91 strb r0, [r1] @@ -254245,10 +244891,9 @@ _0807DF16: strh r1, [r0] b _0807E400 .align 2, 0 -_0807DF34: .4byte 0x08338e74 -_0807DF38: .4byte 0x020322a0 + .pool _0807DF3C: - ldr r2, _0807DF78 + ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -254277,13 +244922,13 @@ _0807DF5A: bl audio_play b _0807E400 .align 2, 0 -_0807DF78: .4byte 0x02020630 + .pool _0807DF7C: ldr r1, [r7] adds r2, r1, 0 adds r2, 0xEA ldrh r3, [r2] - ldr r0, _0807DF94 + ldr r0, =0x000003ff cmp r3, r0 bhi _0807DF98 adds r0, r3, 0 @@ -254291,7 +244936,7 @@ _0807DF7C: strh r0, [r2] b _0807DFA6 .align 2, 0 -_0807DF94: .4byte 0x000003ff + .pool _0807DF98: movs r0, 0x80 lsls r0, 3 @@ -254320,16 +244965,16 @@ _0807DFBC: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0807DFD8 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x3C strh r1, [r0] b _0807E400 .align 2, 0 -_0807DFD8: .4byte 0x020322a0 + .pool _0807DFDC: - ldr r4, _0807E000 + ldr r4, =0x02037fd4 ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -254347,9 +244992,9 @@ _0807DFEA: strb r0, [r4, 0x8] b _0807E394 .align 2, 0 -_0807E000: .4byte 0x02037fd4 + .pool _0807E004: - ldr r2, _0807E01C + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -254362,13 +245007,13 @@ _0807E004: movs r3, 0 b _0807E390 .align 2, 0 -_0807E01C: .4byte 0x02037fd4 + .pool _0807E020: movs r1, 0xA2 lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _0807E03C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -254378,20 +245023,20 @@ _0807E020: _0807E038: b _0807E394 .align 2, 0 -_0807E03C: .4byte 0x02037fd4 + .pool _0807E040: - ldr r0, _0807E0D4 + ldr r0, =0x08338d28 movs r2, 0x8 negs r2, r2 movs r1, 0x78 movs r3, 0 bl obj_add_from_template_forward_search - ldr r5, _0807E0D8 + ldr r5, =0x020322a0 ldr r1, [r5] adds r1, 0xD3 movs r6, 0 strb r0, [r1] - ldr r4, _0807E0DC + ldr r4, =0x02020630 ldr r2, [r5] adds r2, 0xD3 ldrb r1, [r2] @@ -254408,7 +245053,7 @@ _0807E040: adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0807E0E0 + ldr r1, =sub_807E6AC + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -254438,7 +245083,7 @@ _0807E040: adds r1, 0x10 movs r0, 0x1 lsls r0, r1 - ldr r2, _0807E0E4 + ldr r2, =0x0000ffff movs r1, 0x10 bl sub_80A2A20 ldr r2, [r5] @@ -254450,13 +245095,9 @@ _0807E040: str r6, [r2, 0x64] b _0807E400 .align 2, 0 -_0807E0D4: .4byte 0x08338d28 -_0807E0D8: .4byte 0x020322a0 -_0807E0DC: .4byte 0x02020630 -_0807E0E0: .4byte sub_807E6AC + 1 -_0807E0E4: .4byte 0x0000ffff + .pool _0807E0E8: - ldr r2, _0807E114 + ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0xD3 ldrb r1, [r0] @@ -254469,7 +245110,7 @@ _0807E0E8: adds r1, 0x10 movs r0, 0x1 lsls r0, r1 - ldr r1, _0807E118 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0x1 movs r2, 0x10 @@ -254478,10 +245119,9 @@ _0807E0E8: ldr r1, [r7] b _0807E398 .align 2, 0 -_0807E114: .4byte 0x02020630 -_0807E118: .4byte 0x0000ffff + .pool _0807E11C: - ldr r2, _0807E158 + ldr r2, =0x02020630 ldr r3, [r7] adds r0, r3, 0 adds r0, 0xD3 @@ -254492,7 +245132,7 @@ _0807E11C: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0807E15C + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _0807E13A b _0807E400 @@ -254501,9 +245141,9 @@ _0807E13A: adds r0, 0xF2 ldrh r2, [r0] lsls r0, r2, 3 - ldr r1, _0807E160 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _0807E164 + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x10] ldr r3, [r3, 0x6C] @@ -254511,12 +245151,9 @@ _0807E13A: ldr r1, [r7] b _0807E398 .align 2, 0 -_0807E158: .4byte 0x02020630 -_0807E15C: .4byte nullsub_12 + 1 -_0807E160: .4byte 0x0830a18c -_0807E164: .4byte 0x020244d4 + .pool _0807E168: - ldr r4, _0807E21C + ldr r4, =0x02020630 ldr r2, [r7] adds r6, r2, 0 adds r6, 0x8F @@ -254533,7 +245170,7 @@ _0807E168: adds r1, r0 lsls r1, 2 adds r1, r4 - ldr r3, _0807E220 + ldr r3, =0x08300d38 adds r2, 0xF2 ldrh r0, [r2] lsls r0, 2 @@ -254576,7 +245213,7 @@ _0807E168: str r2, [sp, 0x4] movs r2, 0x14 str r2, [sp, 0x8] - ldr r2, _0807E224 + ldr r2, =0x000fffff str r2, [sp, 0xC] adds r3, 0xF2 ldrh r2, [r3] @@ -254603,23 +245240,21 @@ _0807E168: ldr r1, [r7] b _0807E398 .align 2, 0 -_0807E21C: .4byte 0x02020630 -_0807E220: .4byte 0x08300d38 -_0807E224: .4byte 0x000fffff + .pool _0807E228: movs r1, 0xAA lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r4, _0807E258 - ldr r1, _0807E25C + ldr r4, =0x02021fc4 + ldr r1, =0x085ee966 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - ldr r0, _0807E260 + ldr r0, =0x020322a0 ldr r3, [r0] adds r1, r3, 0 adds r1, 0x94 @@ -254630,9 +245265,7 @@ _0807E252: str r2, [r3, 0x64] b _0807E400 .align 2, 0 -_0807E258: .4byte 0x02021fc4 -_0807E25C: .4byte 0x085ee966 -_0807E260: .4byte 0x020322a0 + .pool _0807E264: ldr r3, [r7] ldr r0, [r3, 0x64] @@ -254645,12 +245278,12 @@ _0807E272: adds r0, r3, 0 adds r0, 0x94 movs r2, 0 - ldr r1, _0807E280 + ldr r1, =0x0000010b strh r1, [r0] str r2, [r3, 0x64] b _0807E400 .align 2, 0 -_0807E280: .4byte 0x0000010b + .pool _0807E284: bl sub_80A3678 lsls r0, 24 @@ -254658,14 +245291,14 @@ _0807E284: bne _0807E290 b _0807E400 _0807E290: - ldr r0, _0807E29C + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0x44 strh r1, [r0] b _0807E400 .align 2, 0 -_0807E29C: .4byte 0x020322a0 + .pool _0807E2A0: ldr r1, [r7] ldr r0, [r1, 0x64] @@ -254673,7 +245306,7 @@ _0807E2A0: str r0, [r1, 0x64] cmp r0, 0xA bne _0807E2B2 - ldr r0, _0807E2E0 + ldr r0, =0x00000173 bl fanfare_play _0807E2B2: ldr r1, [r7] @@ -254687,8 +245320,8 @@ _0807E2BC: adds r0, 0x1 movs r5, 0 strh r0, [r1] - ldr r4, _0807E2E4 - ldr r1, _0807E2E8 + ldr r4, =0x02021fc4 + ldr r1, =0x085ee977 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -254699,9 +245332,7 @@ _0807E2BC: str r5, [r0, 0x64] b _0807E400 .align 2, 0 -_0807E2E0: .4byte 0x00000173 -_0807E2E4: .4byte 0x02021fc4 -_0807E2E8: .4byte 0x085ee977 + .pool _0807E2EC: ldr r1, [r7] ldr r0, [r1, 0x64] @@ -254725,7 +245356,7 @@ _0807E302: movs r0, 0x1 b _0807E402 _0807E312: - ldr r0, _0807E324 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -254734,20 +245365,20 @@ _0807E312: adds r1, r2, 0 b _0807E398 .align 2, 0 -_0807E324: .4byte 0x030022c0 + .pool _0807E328: - ldr r0, _0807E36C + ldr r0, =0x020375e2 ldrb r0, [r0] movs r1, 0 bl sub_807B4D0 - ldr r1, _0807E370 - ldr r0, _0807E374 + ldr r1, =0x030061e8 + ldr r0, =sub_807B60C + 1 str r0, [r1] - ldr r7, _0807E378 + ldr r7, =0x02032298 ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _0807E37C + ldr r5, =0x020244ec adds r0, r5 movs r1, 0x1 movs r2, 0 @@ -254760,7 +245391,7 @@ _0807E328: adds r0, r3, 0 muls r0, r6 adds r0, r5 - ldr r1, _0807E380 + ldr r1, =0x020322a0 ldr r1, [r1] adds r1, 0x8F ldrb r2, [r1] @@ -254768,12 +245399,7 @@ _0807E328: bl sub_813E1D4 b _0807E394 .align 2, 0 -_0807E36C: .4byte 0x020375e2 -_0807E370: .4byte 0x030061e8 -_0807E374: .4byte sub_807B60C + 1 -_0807E378: .4byte 0x02032298 -_0807E37C: .4byte 0x020244ec -_0807E380: .4byte 0x020322a0 + .pool _0807E384: movs r0, 0x1 negs r0, r0 @@ -254784,7 +245410,7 @@ _0807E384: _0807E390: bl sub_80A1AD4 _0807E394: - ldr r0, _0807E3A4 + ldr r0, =0x020322a0 ldr r1, [r0] _0807E398: adds r1, 0x94 @@ -254793,9 +245419,9 @@ _0807E398: strh r0, [r1] b _0807E400 .align 2, 0 -_0807E3A4: .4byte 0x020322a0 + .pool _0807E3A8: - ldr r0, _0807E40C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -254825,7 +245451,7 @@ _0807E3A8: bl free str r4, [r7] _0807E3F6: - ldr r0, _0807E410 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 bl sub_807E784 _0807E400: @@ -254836,8 +245462,7 @@ _0807E402: pop {r1} bx r1 .align 2, 0 -_0807E40C: .4byte 0x02037fd4 -_0807E410: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_807CFC8 thumb_func_start c2_08053788 @@ -254845,7 +245470,7 @@ c2_08053788: @ 807E414 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0807E430 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r0, r2 @@ -254856,25 +245481,25 @@ c2_08053788: @ 807E414 beq _0807E444 b _0807E4B4 .align 2, 0 -_0807E430: .4byte 0x030022c0 + .pool _0807E434: movs r0, 0x4 strb r0, [r1] - ldr r1, _0807E440 + ldr r1, =0x03002700 movs r0, 0x1 b _0807E4B2 .align 2, 0 -_0807E440: .4byte 0x03002700 + .pool _0807E444: - ldr r0, _0807E480 - ldr r1, _0807E484 + ldr r0, =0x030061e8 + ldr r1, =sub_807EB50 + 1 mov r8, r1 str r1, [r0] - ldr r7, _0807E488 + ldr r7, =0x02032298 ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _0807E48C + ldr r5, =0x020244ec adds r0, r5 movs r1, 0x1 movs r2, 0 @@ -254887,7 +245512,7 @@ _0807E444: adds r0, r3, 0 muls r0, r6 adds r0, r5 - ldr r1, _0807E490 + ldr r1, =0x020322a0 ldr r1, [r1] adds r1, 0x8F ldrb r2, [r1] @@ -254895,25 +245520,21 @@ _0807E444: bl sub_813E1D4 b _0807E4AE .align 2, 0 -_0807E480: .4byte 0x030061e8 -_0807E484: .4byte sub_807EB50 + 1 -_0807E488: .4byte 0x02032298 -_0807E48C: .4byte 0x020244ec -_0807E490: .4byte 0x020322a0 + .pool _0807E494: bl sub_8077260 cmp r0, 0 beq _0807E4A8 - ldr r0, _0807E4A4 + ldr r0, =sub_807F464 + 1 bl set_callback2 b _0807E4AE .align 2, 0 -_0807E4A4: .4byte sub_807F464 + 1 + .pool _0807E4A8: mov r0, r8 bl set_callback2 _0807E4AE: - ldr r1, _0807E4D8 + ldr r1, =0x02032298 movs r0, 0xFF _0807E4B2: strb r0, [r1] @@ -254933,7 +245554,7 @@ _0807E4C2: pop {r0} bx r0 .align 2, 0 -_0807E4D8: .4byte 0x02032298 + .pool thumb_func_end c2_08053788 thumb_func_start sub_807E4DC @@ -254948,19 +245569,19 @@ sub_807E4DC: @ 807E4DC ands r0, r6 cmp r0, 0 beq _0807E51A - ldr r4, _0807E548 + ldr r4, =0x020223c4 ldrh r1, [r4] - ldr r0, _0807E54C + ldr r0, =0x0000dcba cmp r1, r0 bne _0807E504 - ldr r0, _0807E550 + ldr r0, =c2_08053788 + 1 bl set_callback2 _0807E504: ldrh r1, [r4] - ldr r0, _0807E554 + ldr r0, =0x0000abcd cmp r1, r0 bne _0807E514 - ldr r0, _0807E558 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x72 strb r6, [r0] @@ -254972,15 +245593,15 @@ _0807E51A: ands r0, r5 cmp r0, 0 beq _0807E542 - ldr r0, _0807E548 + ldr r0, =0x020223c4 movs r1, 0x80 lsls r1, 1 adds r0, r1 ldrh r1, [r0] - ldr r0, _0807E554 + ldr r0, =0x0000abcd cmp r1, r0 bne _0807E53C - ldr r0, _0807E558 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x73 movs r1, 0x1 @@ -254993,11 +245614,7 @@ _0807E542: pop {r0} bx r0 .align 2, 0 -_0807E548: .4byte 0x020223c4 -_0807E54C: .4byte 0x0000dcba -_0807E550: .4byte c2_08053788 + 1 -_0807E554: .4byte 0x0000abcd -_0807E558: .4byte 0x020322a0 + .pool thumb_func_end sub_807E4DC thumb_func_start sub_807E55C @@ -255056,14 +245673,14 @@ _0807E5B6: bne _0807E5CE movs r0, 0x1 strh r0, [r5, 0x3C] - ldr r0, _0807E5D4 + ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] _0807E5CE: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0807E5D4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_807E55C thumb_func_start sub_807E5D8 @@ -255071,7 +245688,7 @@ sub_807E5D8: @ 807E5D8 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r1, _0807E640 + ldr r1, =0x08339024 movs r2, 0x2E ldrsh r0, [r4, r2] adds r0, r1 @@ -255097,7 +245714,7 @@ _0807E600: bne _0807E636 movs r0, 0x8C bl audio_play - ldr r0, _0807E644 + ldr r0, =sub_807E64C + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x2E] @@ -255108,7 +245725,7 @@ _0807E600: lsls r0, r1 movs r1, 0x1 negs r1, r1 - ldr r2, _0807E648 + ldr r2, =0x0000ffff str r2, [sp] movs r2, 0 movs r3, 0x10 @@ -255119,9 +245736,7 @@ _0807E636: pop {r0} bx r0 .align 2, 0 -_0807E640: .4byte 0x08339024 -_0807E644: .4byte sub_807E64C + 1 -_0807E648: .4byte 0x0000ffff + .pool thumb_func_end sub_807E5D8 thumb_func_start sub_807E64C @@ -255143,7 +245758,7 @@ _0807E660: asrs r0, 16 cmp r0, 0x14 ble _0807E69E - ldr r1, _0807E6A4 + ldr r1, =0x08339024 movs r2, 0x2E ldrsh r0, [r4, r2] adds r0, r1 @@ -255161,7 +245776,7 @@ _0807E660: bne _0807E69E adds r0, r4, 0 bl obj_delete_and_free_tiles - ldr r0, _0807E6A8 + ldr r0, =0x020322a0 ldr r0, [r0] adds r0, 0x94 movs r1, 0xE @@ -255171,8 +245786,7 @@ _0807E69E: pop {r0} bx r0 .align 2, 0 -_0807E6A4: .4byte 0x08339024 -_0807E6A8: .4byte 0x020322a0 + .pool thumb_func_end sub_807E64C thumb_func_start sub_807E6AC @@ -255222,7 +245836,7 @@ _0807E6F8: movs r0, 0x3B bl audio_play _0807E706: - ldr r1, _0807E734 + ldr r1, =0x08339024 movs r2, 0x2E ldrsh r0, [r4, r2] adds r0, r1 @@ -255239,35 +245853,34 @@ _0807E706: asrs r0, 16 cmp r0, 0x6C bne _0807E72C - ldr r0, _0807E738 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _0807E72C: pop {r4} pop {r0} bx r0 .align 2, 0 -_0807E734: .4byte 0x08339024 -_0807E738: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_807E6AC thumb_func_start sub_807E73C sub_807E73C: @ 807E73C push {r4-r6,lr} - ldr r0, _0807E770 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 lsls r4, 2 - ldr r0, _0807E774 + ldr r0, =0x08338ed0 adds r4, r0 - ldr r0, _0807E778 + ldr r0, =0x02021cc4 ldrh r1, [r4, 0x38] movs r6, 0xB muls r1, r6 - ldr r5, _0807E77C + ldr r5, =0x083185c8 adds r1, r5 bl gf_strcpy - ldr r0, _0807E780 + ldr r0, =0x02021dc4 ldrh r1, [r4, 0xC] muls r1, r6 adds r1, r5 @@ -255277,41 +245890,37 @@ sub_807E73C: @ 807E73C pop {r1} bx r1 .align 2, 0 -_0807E770: .4byte 0x020375e0 -_0807E774: .4byte 0x08338ed0 -_0807E778: .4byte 0x02021cc4 -_0807E77C: .4byte 0x083185c8 -_0807E780: .4byte 0x02021dc4 + .pool thumb_func_end sub_807E73C thumb_func_start sub_807E784 sub_807E784: @ 807E784 push {r4,lr} sub sp, 0x20 - ldr r0, _0807E7CC + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r4, r0, 4 subs r4, r0 lsls r4, 2 - ldr r0, _0807E7D0 + ldr r0, =0x08338ed0 adds r4, r0 - ldr r0, _0807E7D4 + ldr r0, =0x020375e2 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0807E7D8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp bl pokemon_getattr - ldr r0, _0807E7DC + ldr r0, =0x02021cc4 mov r1, sp bl strcpy_limit_10_chars - ldr r0, _0807E7E0 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0xC] movs r1, 0xB muls r1, r2 - ldr r2, _0807E7E4 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy add sp, 0x20 @@ -255319,13 +245928,7 @@ sub_807E784: @ 807E784 pop {r0} bx r0 .align 2, 0 -_0807E7CC: .4byte 0x020375e0 -_0807E7D0: .4byte 0x08338ed0 -_0807E7D4: .4byte 0x020375e2 -_0807E7D8: .4byte 0x020244ec -_0807E7DC: .4byte 0x02021cc4 -_0807E7E0: .4byte 0x02021dc4 -_0807E7E4: .4byte 0x083185c8 + .pool thumb_func_end sub_807E784 thumb_func_start sub_807E7E8 @@ -255339,11 +245942,11 @@ sub_807E7E8: @ 807E7E8 lsls r2, r1, 4 subs r2, r1 lsls r2, 2 - ldr r1, _0807E944 + ldr r1, =0x08338ed0 adds r5, r2, r1 movs r1, 0x64 muls r0, r1 - ldr r1, _0807E948 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 bl pokemon_getattr @@ -255353,7 +245956,7 @@ sub_807E7E8: @ 807E7E8 add r4, sp, 0x34 movs r0, 0xFE strb r0, [r4] - ldr r6, _0807E94C + ldr r6, =0x02024744 ldrh r1, [r5, 0xC] movs r3, 0x1 str r3, [sp] @@ -255462,7 +246065,7 @@ sub_807E7E8: @ 807E7E8 add r0, sp, 0x10 adds r1, r5, 0 bl sub_807E974 - ldr r0, _0807E950 + ldr r0, =0x020321c0 add r1, sp, 0x10 ldm r1!, {r2,r3,r7} stm r0!, {r2,r3,r7} @@ -255481,10 +246084,7 @@ sub_807E7E8: @ 807E7E8 bl pokemon_setattr b _0807E960 .align 2, 0 -_0807E944: .4byte 0x08338ed0 -_0807E948: .4byte 0x020244ec -_0807E94C: .4byte 0x02024744 -_0807E950: .4byte 0x020321c0 + .pool _0807E954: adds r2, r5, 0 adds r2, 0x28 @@ -255492,14 +246092,14 @@ _0807E954: movs r1, 0xC bl pokemon_setattr _0807E960: - ldr r0, _0807E970 + ldr r0, =0x02024744 bl pokemon_calc_effective_stats add sp, 0x38 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0807E970: .4byte 0x02024744 + .pool thumb_func_end sub_807E7E8 thumb_func_start sub_807E974 @@ -255507,7 +246107,7 @@ sub_807E974: @ 807E974 push {r4-r6,lr} adds r5, r0, 0 adds r6, r1, 0 - ldr r2, _0807E9D0 + ldr r2, =0x08338fc0 adds r0, r6, 0 adds r0, 0x2A ldrb r1, [r0] @@ -255550,17 +246150,17 @@ _0807E98E: pop {r0} bx r0 .align 2, 0 -_0807E9D0: .4byte 0x08338fc0 + .pool thumb_func_end sub_807E974 thumb_func_start sub_807E9D4 sub_807E9D4: @ 807E9D4 push {r4-r6,lr} - ldr r6, _0807EA00 + ldr r6, =0x020375e2 ldrh r0, [r6] movs r5, 0x64 muls r0, r5 - ldr r4, _0807EA04 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x2D bl pokemon_getattr @@ -255575,8 +246175,7 @@ sub_807E9D4: @ 807E9D4 lsrs r0, 16 b _0807EA0A .align 2, 0 -_0807EA00: .4byte 0x020375e2 -_0807EA04: .4byte 0x020244ec + .pool _0807EA08: movs r0, 0 _0807EA0A: @@ -255588,16 +246187,15 @@ _0807EA0A: thumb_func_start sub_807EA10 sub_807EA10: @ 807EA10 push {lr} - ldr r0, _0807EA24 + ldr r0, =0x020375e2 ldrb r0, [r0] - ldr r1, _0807EA28 + ldr r1, =0x020375e0 ldrb r1, [r1] bl sub_807E7E8 pop {r0} bx r0 .align 2, 0 -_0807EA24: .4byte 0x020375e2 -_0807EA28: .4byte 0x020375e0 + .pool thumb_func_end sub_807EA10 thumb_func_start sub_807EA2C @@ -255608,14 +246206,14 @@ sub_807EA2C: @ 807EA2C lsrs r6, r0, 24 cmp r6, 0x1 bne _0807EA96 - ldr r5, _0807EAB8 + ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0x8E ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0807EABC + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles ldr r0, [r5] @@ -255626,7 +246224,7 @@ sub_807EA2C: @ 807EA2C lsls r0, 2 adds r0, r4 bl obj_free_rotscale_entry - ldr r0, _0807EAC0 + ldr r0, =0x02032298 ldrb r4, [r0] ldrb r0, [r0, 0x1] movs r1, 0x6 @@ -255642,12 +246240,12 @@ sub_807EA2C: @ 807EA2C ldr r0, [r5] adds r2, r0, 0 adds r2, 0x74 - ldr r1, _0807EAC4 + ldr r1, =0x0000abcd strh r1, [r2] adds r0, 0x93 strb r6, [r0] _0807EA90: - ldr r0, _0807EAC8 + ldr r0, =sub_807EACC + 1 bl set_callback2 _0807EA96: bl sub_807B5B8 @@ -255661,11 +246259,7 @@ _0807EA96: pop {r0} bx r0 .align 2, 0 -_0807EAB8: .4byte 0x020322a0 -_0807EABC: .4byte 0x02020630 -_0807EAC0: .4byte 0x02032298 -_0807EAC4: .4byte 0x0000abcd -_0807EAC8: .4byte sub_807EACC + 1 + .pool thumb_func_end sub_807EA2C thumb_func_start sub_807EACC @@ -255677,26 +246271,26 @@ sub_807EACC: @ 807EACC bl sub_8077260 cmp r0, 0 beq _0807EAEC - ldr r0, _0807EAE8 + ldr r0, =c2_08053788 + 1 bl set_callback2 b _0807EB2C .align 2, 0 -_0807EAE8: .4byte c2_08053788 + 1 + .pool _0807EAEC: bl sub_807E4DC cmp r4, 0 bne _0807EB2C - ldr r4, _0807EB44 + ldr r4, =0x020322a0 ldr r2, [r4] adds r0, r2, 0 adds r0, 0x72 ldrh r1, [r0] - ldr r0, _0807EB48 + ldr r0, =0x00000101 cmp r1, r0 bne _0807EB2C adds r1, r2, 0 adds r1, 0x74 - ldr r0, _0807EB4C + ldr r0, =0x0000dcba strh r0, [r1] bl bitmask_all_link_players_but_self lsls r0, 24 @@ -255721,16 +246315,14 @@ _0807EB2C: pop {r0} bx r0 .align 2, 0 -_0807EB44: .4byte 0x020322a0 -_0807EB48: .4byte 0x00000101 -_0807EB4C: .4byte 0x0000dcba + .pool thumb_func_end sub_807EACC thumb_func_start sub_807EB50 sub_807EB50: @ 807EB50 push {r4,lr} sub sp, 0x4 - ldr r1, _0807EB70 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -255741,13 +246333,12 @@ sub_807EB50: @ 807EB50 b _0807F03A _0807EB66: lsls r0, 2 - ldr r1, _0807EB74 + ldr r1, =_0807EB78 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807EB70: .4byte 0x030022c0 -_0807EB74: .4byte _0807EB78 + .pool .align 2, 0 _0807EB78: .4byte _0807ED10 @@ -255859,16 +246450,15 @@ _0807ED10: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r4, _0807ED24 - ldr r1, _0807ED28 + ldr r4, =0x02021fc4 + ldr r1, =0x085ef6d2 b _0807EDA6 .align 2, 0 -_0807ED24: .4byte 0x02021fc4 -_0807ED28: .4byte 0x085ef6d2 + .pool _0807ED2C: movs r0, 0 bl sub_8077288 - ldr r0, _0807ED40 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -255876,9 +246466,9 @@ _0807ED2C: movs r1, 0x64 b _0807EE88 .align 2, 0 -_0807ED40: .4byte 0x030022c0 + .pool _0807ED44: - ldr r0, _0807ED74 + ldr r0, =0x020322a0 ldr r3, [r0] ldr r0, [r3, 0x64] adds r0, 0x1 @@ -255898,21 +246488,20 @@ _0807ED60: bne _0807ED6A b _0807F03A _0807ED6A: - ldr r0, _0807ED78 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 b _0807ED8E .align 2, 0 -_0807ED74: .4byte 0x020322a0 -_0807ED78: .4byte 0x030022c0 + .pool _0807ED7C: bl sub_8077294 cmp r0, 0 bne _0807ED86 b _0807F03A _0807ED86: - ldr r0, _0807ED94 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -255921,15 +246510,15 @@ _0807ED8E: strb r1, [r0] b _0807F03A .align 2, 0 -_0807ED94: .4byte 0x030022c0 + .pool _0807ED98: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 movs r0, 0x32 strb r0, [r1] - ldr r4, _0807EDB8 - ldr r1, _0807EDBC + ldr r4, =0x02021fc4 + ldr r1, =0x082c8959 _0807EDA6: adds r0, r4, 0 bl ExpandTextCodes @@ -255939,8 +246528,7 @@ _0807EDA6: bl sub_807F1A8 b _0807F03A .align 2, 0 -_0807EDB8: .4byte 0x02021fc4 -_0807EDBC: .4byte 0x082c8959 + .pool _0807EDC0: bl in_trade_center cmp r0, 0 @@ -255948,11 +246536,11 @@ _0807EDC0: movs r0, 0x15 bl sav12_xor_increment _0807EDCE: - ldr r0, _0807EE10 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0807EDF6 - ldr r4, _0807EE14 + ldr r4, =0x020229e8 bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 @@ -255969,7 +246557,7 @@ _0807EDCE: _0807EDF6: bl sub_8076D5C bl sub_8153380 - ldr r1, _0807EE18 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -255979,11 +246567,9 @@ _0807EDF6: strb r0, [r1] b _0807EE8A .align 2, 0 -_0807EE10: .4byte 0x030030fc -_0807EE14: .4byte 0x020229e8 -_0807EE18: .4byte 0x030022c0 + .pool _0807EE1C: - ldr r0, _0807EE34 + ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 @@ -255997,7 +246583,7 @@ _0807EE2C: adds r1, r2, r0 b _0807EFE4 .align 2, 0 -_0807EE34: .4byte 0x020322a0 + .pool _0807EE38: bl sub_81533AC lsls r0, 24 @@ -256005,7 +246591,7 @@ _0807EE38: cmp r1, 0 beq _0807EE5C bl sav2_gender2_inplace_and_xFE - ldr r0, _0807EE58 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -256013,12 +246599,12 @@ _0807EE38: strb r1, [r0] b _0807F03A .align 2, 0 -_0807EE58: .4byte 0x030022c0 + .pool _0807EE5C: - ldr r0, _0807EE70 + ldr r0, =0x020322a0 ldr r0, [r0] str r1, [r0, 0x64] - ldr r0, _0807EE74 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -256026,11 +246612,10 @@ _0807EE5C: strb r1, [r0] b _0807F03A .align 2, 0 -_0807EE70: .4byte 0x020322a0 -_0807EE74: .4byte 0x030022c0 + .pool _0807EE78: bl sub_81533E0 - ldr r0, _0807EE94 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -256039,15 +246624,14 @@ _0807EE78: _0807EE88: strb r1, [r0] _0807EE8A: - ldr r0, _0807EE98 + ldr r0, =0x020322a0 ldr r0, [r0] str r2, [r0, 0x64] b _0807F03A .align 2, 0 -_0807EE94: .4byte 0x030022c0 -_0807EE98: .4byte 0x020322a0 + .pool _0807EE9C: - ldr r4, _0807EED0 + ldr r4, =0x020322a0 ldr r1, [r4] ldr r0, [r1, 0x64] adds r0, 0x1 @@ -256071,13 +246655,13 @@ _0807EEAC: str r0, [r4, 0x64] b _0807EEDA .align 2, 0 -_0807EED0: .4byte 0x020322a0 + .pool _0807EED4: ldr r1, [r4] movs r0, 0 str r0, [r1, 0x64] _0807EEDA: - ldr r0, _0807EEE8 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -256085,16 +246669,16 @@ _0807EEDA: strb r1, [r0] b _0807F03A .align 2, 0 -_0807EEE8: .4byte 0x030022c0 + .pool _0807EEEC: - ldr r0, _0807EF0C + ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] cmp r0, 0 bne _0807EF14 movs r0, 0x1 bl sub_8077288 - ldr r0, _0807EF10 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -256102,8 +246686,7 @@ _0807EEEC: strb r1, [r0] b _0807F03A .align 2, 0 -_0807EF0C: .4byte 0x020322a0 -_0807EF10: .4byte 0x030022c0 + .pool _0807EF14: subs r0, 0x1 str r0, [r1, 0x64] @@ -256115,7 +246698,7 @@ _0807EF1A: b _0807F03A _0807EF24: bl sub_8153408 - ldr r0, _0807EF38 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -256123,9 +246706,9 @@ _0807EF24: strb r1, [r0] b _0807F03A .align 2, 0 -_0807EF38: .4byte 0x030022c0 + .pool _0807EF3C: - ldr r0, _0807EF60 + ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 @@ -256142,7 +246725,7 @@ _0807EF3C: bl sub_8077288 b _0807F03A .align 2, 0 -_0807EF60: .4byte 0x020322a0 + .pool _0807EF64: bl sub_8077294 cmp r0, 0 @@ -256156,7 +246739,7 @@ _0807EF64: bl sub_80A1AD4 b _0807EFDC _0807EF7E: - ldr r0, _0807EF9C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -256164,40 +246747,37 @@ _0807EF7E: bne _0807F03A movs r0, 0x3 bl play_sound_effect - ldr r1, _0807EFA0 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0807EFE4 .align 2, 0 -_0807EF9C: .4byte 0x02037fd4 -_0807EFA0: .4byte 0x030022c0 + .pool _0807EFA4: bl sub_80A3258 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0807F03A - ldr r0, _0807EFCC + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0807EFD8 - ldr r0, _0807EFD0 + ldr r0, =0x030022c0 ldr r1, [r0, 0x8] - ldr r0, _0807EFD4 + ldr r0, =sub_80773AC + 1 cmp r1, r0 bne _0807EFD8 movs r0, 0x3 bl sub_8077288 b _0807EFDC .align 2, 0 -_0807EFCC: .4byte 0x030030fc -_0807EFD0: .4byte 0x030022c0 -_0807EFD4: .4byte sub_80773AC + 1 + .pool _0807EFD8: bl sub_800AC34 _0807EFDC: - ldr r1, _0807EFEC + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -256207,38 +246787,35 @@ _0807EFE4: strb r0, [r1] b _0807F03A .align 2, 0 -_0807EFEC: .4byte 0x030022c0 + .pool _0807EFF0: - ldr r0, _0807F018 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0807F028 ldr r1, [r2, 0x8] - ldr r0, _0807F01C + ldr r0, =sub_80773AC + 1 cmp r1, r0 bne _0807F028 bl sub_8077294 cmp r0, 0 beq _0807F03A - ldr r0, _0807F020 + ldr r0, =0x03002700 movs r1, 0 strb r1, [r0] - ldr r0, _0807F024 + ldr r0, =c2_080543C4 + 1 bl set_callback2 b _0807F03A .align 2, 0 -_0807F018: .4byte 0x030030fc -_0807F01C: .4byte sub_80773AC + 1 -_0807F020: .4byte 0x03002700 -_0807F024: .4byte c2_080543C4 + 1 + .pool _0807F028: - ldr r0, _0807F05C + ldr r0, =0x03003124 ldrb r1, [r0] cmp r1, 0 bne _0807F03A - ldr r0, _0807F060 + ldr r0, =0x03002700 strb r1, [r0] - ldr r0, _0807F064 + ldr r0, =c2_080543C4 + 1 bl set_callback2 _0807F03A: bl sub_800B33C @@ -256255,15 +246832,13 @@ _0807F048: pop {r0} bx r0 .align 2, 0 -_0807F05C: .4byte 0x03003124 -_0807F060: .4byte 0x03002700 -_0807F064: .4byte c2_080543C4 + 1 + .pool thumb_func_end sub_807EB50 thumb_func_start c2_080543C4 c2_080543C4: @ 807F068 push {r4,r5,lr} - ldr r0, _0807F0D4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -256282,17 +246857,17 @@ c2_080543C4: @ 807F068 bl bg_get_tilemap bl free bl sub_805F094 - ldr r4, _0807F0D8 + ldr r4, =0x020322a0 ldr r0, [r4] bl free str r5, [r4] - ldr r0, _0807F0DC + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0807F0B6 bl sub_800E084 _0807F0B6: - ldr r0, _0807F0E0 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 _0807F0BE: @@ -256304,10 +246879,7 @@ _0807F0BE: pop {r0} bx r0 .align 2, 0 -_0807F0D4: .4byte 0x02037fd4 -_0807F0D8: .4byte 0x020322a0 -_0807F0DC: .4byte 0x030030fc -_0807F0E0: .4byte 0x030022c0 + .pool thumb_func_end c2_080543C4 thumb_func_start sub_807F0E4 @@ -256315,7 +246887,7 @@ sub_807F0E4: @ 807F0E4 push {lr} sub sp, 0x4 bl script_env_2_enable - ldr r0, _0807F10C + ldr r0, =sub_807F110 + 1 movs r1, 0xA bl AddTask movs r0, 0x1 @@ -256329,7 +246901,7 @@ sub_807F0E4: @ 807F0E4 pop {r0} bx r0 .align 2, 0 -_0807F10C: .4byte sub_807F110 + 1 + .pool thumb_func_end sub_807F0E4 thumb_func_start sub_807F110 @@ -256337,16 +246909,16 @@ sub_807F110: @ 807F110 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0807F13C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0807F134 - ldr r0, _0807F140 + ldr r0, =sub_807B270 + 1 bl set_callback2 - ldr r1, _0807F144 - ldr r0, _0807F148 + ldr r1, =0x03005dac + ldr r0, =sub_80AF168 + 1 str r0, [r1] adds r0, r4, 0 bl remove_task @@ -256355,10 +246927,7 @@ _0807F134: pop {r0} bx r0 .align 2, 0 -_0807F13C: .4byte 0x02037fd4 -_0807F140: .4byte sub_807B270 + 1 -_0807F144: .4byte 0x03005dac -_0807F148: .4byte sub_80AF168 + 1 + .pool thumb_func_end sub_807F110 thumb_func_start sub_807F14C @@ -256367,7 +246936,7 @@ sub_807F14C: @ 807F14C movs r5, 0 movs r4, 0 _0807F152: - ldr r0, _0807F190 + ldr r0, =0x02032298 ldrb r0, [r0, 0x1] movs r1, 0x6 bl __umodsi3 @@ -256375,7 +246944,7 @@ _0807F152: lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _0807F194 + ldr r1, =0x02024744 adds r0, r1 adds r1, r4, 0 adds r1, 0x43 @@ -256390,16 +246959,14 @@ _0807F152: bls _0807F152 cmp r5, 0 beq _0807F18A - ldr r0, _0807F198 + ldr r0, =0x0000089b bl flag_set _0807F18A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0807F190: .4byte 0x02032298 -_0807F194: .4byte 0x02024744 -_0807F198: .4byte 0x0000089b + .pool thumb_func_end sub_807F14C thumb_func_start sub_807F19C @@ -256424,7 +246991,7 @@ sub_807F1A8: @ 807F1A8 adds r0, r5, 0 movs r1, 0xFF bl Window_FastFillPixels - ldr r2, _0807F20C + ldr r2, =0x020322a0 ldr r0, [r2] adds r0, 0xF6 movs r3, 0 @@ -256460,7 +247027,7 @@ sub_807F1A8: @ 807F1A8 pop {r0} bx r0 .align 2, 0 -_0807F20C: .4byte 0x020322a0 + .pool thumb_func_end sub_807F1A8 thumb_func_start c3_08054588 @@ -256471,9 +247038,9 @@ c3_08054588: @ 807F210 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0807F248 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r1, _0807F24C + ldr r1, =0x08339090 movs r2, 0 ldrsh r0, [r4, r2] lsls r0, 1 @@ -256490,36 +247057,34 @@ c3_08054588: @ 807F210 cmp r1, r0 beq _0807F25C lsls r0, r1, 1 - ldr r1, _0807F250 + ldr r1, =0x08337aa0 adds r0, r1 b _0807F25E .align 2, 0 -_0807F248: .4byte 0x03005e08 -_0807F24C: .4byte 0x08339090 -_0807F250: .4byte 0x08337aa0 + .pool _0807F254: movs r0, 0x80 lsls r0, 1 cmp r1, r0 bne _0807F26C _0807F25C: - ldr r0, _0807F268 + ldr r0, =0x08337ea0 _0807F25E: movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply b _0807F27A .align 2, 0 -_0807F268: .4byte 0x08337ea0 + .pool _0807F26C: lsls r0, r2, 1 - ldr r1, _0807F2D0 + ldr r1, =0x08337ca0 adds r0, r1 movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply _0807F27A: - ldr r0, _0807F2D4 + ldr r0, =0x08339090 movs r2, 0 ldrsh r1, [r4, r2] lsls r1, 1 @@ -256536,7 +247101,7 @@ _0807F27A: _0807F298: movs r0, 0x2 ldrsh r2, [r4, r0] - ldr r1, _0807F2D4 + ldr r1, =0x08339090 movs r3, 0 ldrsh r0, [r4, r3] lsls r0, 1 @@ -256561,8 +247126,7 @@ _0807F298: bl remove_task b _0807F2DE .align 2, 0 -_0807F2D0: .4byte 0x08337ca0 -_0807F2D4: .4byte 0x08339090 + .pool _0807F2D8: ldrh r0, [r4, 0x2] adds r0, 0x1 @@ -256582,13 +247146,13 @@ c3_0805465C: @ 807F2E4 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0807F394 + ldr r1, =0x03005e08 adds r5, r0, r1 movs r0, 0 ldrsh r4, [r5, r0] cmp r4, 0 bne _0807F336 - ldr r2, _0807F398 + ldr r2, =0x020322a0 ldr r0, [r2] adds r3, r0, 0 adds r3, 0xFD @@ -256614,7 +247178,7 @@ c3_0805465C: @ 807F2E4 movs r1, 0x13 bl lcd_io_set _0807F336: - ldr r4, _0807F398 + ldr r4, =0x020322a0 ldr r0, [r4] adds r1, r0, 0 adds r1, 0xFD @@ -256660,8 +247224,7 @@ _0807F38E: pop {r0} bx r0 .align 2, 0 -_0807F394: .4byte 0x03005e08 -_0807F398: .4byte 0x020322a0 + .pool thumb_func_end c3_0805465C thumb_func_start sub_807F39C @@ -256673,13 +247236,13 @@ sub_807F39C: @ 807F39C lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0807F440 + ldr r1, =0x03005e08 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0 bne _0807F3D8 - ldr r2, _0807F444 + ldr r2, =0x020322a0 ldr r0, [r2] adds r0, 0xFB movs r1, 0x50 @@ -256695,7 +247258,7 @@ sub_807F39C: @ 807F39C movs r1, 0x13 bl lcd_io_set _0807F3D8: - ldr r4, _0807F444 + ldr r4, =0x020322a0 ldr r0, [r4] adds r1, r0, 0 adds r1, 0xFD @@ -256739,15 +247302,13 @@ _0807F3D8: ldrb r0, [r0] cmp r0, 0x73 bls _0807F45C - ldr r2, _0807F448 + ldr r2, =0x0000ffff movs r0, 0x8 movs r1, 0 bl sub_80A2A20 b _0807F45C .align 2, 0 -_0807F440: .4byte 0x03005e08 -_0807F444: .4byte 0x020322a0 -_0807F448: .4byte 0x0000ffff + .pool _0807F44C: movs r1, 0x80 lsls r1, 6 @@ -256765,7 +247326,7 @@ _0807F45C: sub_807F464: @ 807F464 push {r4,r5,lr} sub sp, 0x4 - ldr r1, _0807F484 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -256776,13 +247337,12 @@ sub_807F464: @ 807F464 b _0807F70C _0807F47A: lsls r0, 2 - ldr r1, _0807F488 + ldr r1, =_0807F48C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807F484: .4byte 0x030022c0 -_0807F488: .4byte _0807F48C + .pool .align 2, 0 _0807F48C: .4byte _0807F4C0 @@ -256804,8 +247364,8 @@ _0807F4C0: adds r1, r2, r0 movs r0, 0x1 strb r0, [r1] - ldr r4, _0807F4E0 - ldr r1, _0807F4E4 + ldr r4, =0x02021fc4 + ldr r1, =0x085ef6d2 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -256814,12 +247374,11 @@ _0807F4C0: bl sub_807F1A8 b _0807F70C .align 2, 0 -_0807F4E0: .4byte 0x02021fc4 -_0807F4E4: .4byte 0x085ef6d2 + .pool _0807F4E8: movs r0, 0 bl sub_8077288 - ldr r0, _0807F4FC + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -256827,22 +247386,22 @@ _0807F4E8: movs r1, 0x2 b _0807F5BC .align 2, 0 -_0807F4FC: .4byte 0x030022c0 + .pool _0807F500: bl sub_8077294 cmp r0, 0 bne _0807F50A b _0807F70C _0807F50A: - ldr r0, _0807F540 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 movs r5, 0 movs r1, 0x3 strb r1, [r0] - ldr r4, _0807F544 - ldr r1, _0807F548 + ldr r4, =0x02021fc4 + ldr r1, =0x082c8959 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -256852,17 +247411,14 @@ _0807F50A: movs r0, 0x15 bl sav12_xor_increment bl sub_8153380 - ldr r0, _0807F54C + ldr r0, =0x020322a0 ldr r0, [r0] str r5, [r0, 0x64] b _0807F70C .align 2, 0 -_0807F540: .4byte 0x030022c0 -_0807F544: .4byte 0x02021fc4 -_0807F548: .4byte 0x082c8959 -_0807F54C: .4byte 0x020322a0 + .pool _0807F550: - ldr r0, _0807F56C + ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 @@ -256878,14 +247434,14 @@ _0807F560: strb r0, [r1] b _0807F70C .align 2, 0 -_0807F56C: .4byte 0x020322a0 + .pool _0807F570: bl sub_81533AC lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 beq _0807F590 - ldr r0, _0807F58C + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -256893,12 +247449,12 @@ _0807F570: strb r1, [r0] b _0807F70C .align 2, 0 -_0807F58C: .4byte 0x030022c0 + .pool _0807F590: - ldr r0, _0807F5A4 + ldr r0, =0x020322a0 ldr r0, [r0] str r1, [r0, 0x64] - ldr r0, _0807F5A8 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -256906,11 +247462,10 @@ _0807F590: strb r1, [r0] b _0807F70C .align 2, 0 -_0807F5A4: .4byte 0x020322a0 -_0807F5A8: .4byte 0x030022c0 + .pool _0807F5AC: bl sub_81533E0 - ldr r0, _0807F5C8 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -256918,15 +247473,14 @@ _0807F5AC: movs r1, 0x6 _0807F5BC: strb r1, [r0] - ldr r0, _0807F5CC + ldr r0, =0x020322a0 ldr r0, [r0] str r2, [r0, 0x64] b _0807F70C .align 2, 0 -_0807F5C8: .4byte 0x030022c0 -_0807F5CC: .4byte 0x020322a0 + .pool _0807F5D0: - ldr r4, _0807F604 + ldr r4, =0x020322a0 ldr r1, [r4] ldr r0, [r1, 0x64] adds r0, 0x1 @@ -256950,13 +247504,13 @@ _0807F5E0: str r0, [r4, 0x64] b _0807F60E .align 2, 0 -_0807F604: .4byte 0x020322a0 + .pool _0807F608: ldr r1, [r4] movs r0, 0 str r0, [r1, 0x64] _0807F60E: - ldr r0, _0807F61C + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -256964,16 +247518,16 @@ _0807F60E: strb r1, [r0] b _0807F70C .align 2, 0 -_0807F61C: .4byte 0x030022c0 + .pool _0807F620: - ldr r0, _0807F640 + ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] cmp r0, 0 bne _0807F648 movs r0, 0x1 bl sub_8077288 - ldr r0, _0807F644 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -256981,8 +247535,7 @@ _0807F620: strb r1, [r0] b _0807F70C .align 2, 0 -_0807F640: .4byte 0x020322a0 -_0807F644: .4byte 0x030022c0 + .pool _0807F648: subs r0, 0x1 str r0, [r1, 0x64] @@ -256992,7 +247545,7 @@ _0807F64E: cmp r0, 0 beq _0807F70C bl sub_8153408 - ldr r0, _0807F668 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -257000,9 +247553,9 @@ _0807F64E: strb r1, [r0] b _0807F70C .align 2, 0 -_0807F668: .4byte 0x030022c0 + .pool _0807F66C: - ldr r0, _0807F690 + ldr r0, =0x020322a0 ldr r1, [r0] ldr r0, [r1, 0x64] adds r0, 0x1 @@ -257019,7 +247572,7 @@ _0807F66C: bl sub_8077288 b _0807F70C .align 2, 0 -_0807F690: .4byte 0x020322a0 + .pool _0807F694: bl sub_8077294 cmp r0, 0 @@ -257033,7 +247586,7 @@ _0807F694: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0807F6C0 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -257041,9 +247594,9 @@ _0807F694: strb r1, [r0] b _0807F70C .align 2, 0 -_0807F6C0: .4byte 0x030022c0 + .pool _0807F6C4: - ldr r0, _0807F6F0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -257056,7 +247609,7 @@ _0807F6C4: bne _0807F70C movs r0, 0x3 bl sub_8077288 - ldr r0, _0807F6F4 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -257064,16 +247617,15 @@ _0807F6C4: strb r1, [r0] b _0807F70C .align 2, 0 -_0807F6F0: .4byte 0x02037fd4 -_0807F6F4: .4byte 0x030022c0 + .pool _0807F6F8: bl sub_8077294 cmp r0, 0 beq _0807F70C - ldr r0, _0807F730 + ldr r0, =0x03002700 movs r1, 0 strb r1, [r0] - ldr r0, _0807F734 + ldr r0, =c2_080543C4 + 1 bl set_callback2 _0807F70C: bl sub_800B33C @@ -257090,16 +247642,15 @@ _0807F71A: pop {r0} bx r0 .align 2, 0 -_0807F730: .4byte 0x03002700 -_0807F734: .4byte c2_080543C4 + 1 + .pool thumb_func_end sub_807F464 thumb_func_start sub_807F738 sub_807F738: @ 807F738 push {lr} - ldr r0, _0807F758 - ldr r1, _0807F75C - ldr r2, _0807F760 + ldr r0, =0x03007630 + ldr r1, =0x0000ffff + ldr r2, =0x020322a4 ldr r2, [r2] adds r2, 0x4C movs r3, 0 @@ -257111,9 +247662,7 @@ sub_807F738: @ 807F738 pop {r0} bx r0 .align 2, 0 -_0807F758: .4byte 0x03007630 -_0807F75C: .4byte 0x0000ffff -_0807F760: .4byte 0x020322a4 + .pool thumb_func_end sub_807F738 thumb_func_start sub_807F764 @@ -257121,7 +247670,7 @@ sub_807F764: @ 807F764 push {r4,lr} sub sp, 0x10 bl sub_8082DF4 - ldr r0, _0807F7D4 + ldr r0, =0x020322a4 ldr r0, [r0] mov r12, r0 movs r0, 0xA0 @@ -257170,13 +247719,13 @@ sub_807F764: @ 807F764 pop {r0} bx r0 .align 2, 0 -_0807F7D4: .4byte 0x020322a4 + .pool thumb_func_end sub_807F764 thumb_func_start sub_807F7D8 sub_807F7D8: @ 807F7D8 push {r4,r5,lr} - ldr r1, _0807F7F4 + ldr r1, =0x020322a4 ldr r0, [r1] ldrb r0, [r0, 0x1] adds r5, r1, 0 @@ -257185,13 +247734,12 @@ sub_807F7D8: @ 807F7D8 b _0807F9C8 _0807F7E8: lsls r0, 2 - ldr r1, _0807F7F8 + ldr r1, =_0807F7FC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807F7F4: .4byte 0x020322a4 -_0807F7F8: .4byte _0807F7FC + .pool .align 2, 0 _0807F7FC: .4byte _0807F824 @@ -257205,15 +247753,15 @@ _0807F7FC: .4byte _0807F950 .4byte _0807F980 _0807F824: - ldr r5, _0807F848 + ldr r5, =0x08d91598 adds r0, r5, 0 bl sub_8034974 adds r0, 0x64 bl malloc_and_clear adds r1, r0, 0 - ldr r4, _0807F84C + ldr r4, =0x020322a4 ldr r0, [r4] - ldr r2, _0807F850 + ldr r2, =0x000011bc adds r0, r2 str r1, [r0] adds r0, r5, 0 @@ -257221,11 +247769,9 @@ _0807F824: ldr r1, [r4] b _0807F966 .align 2, 0 -_0807F848: .4byte 0x08d91598 -_0807F84C: .4byte 0x020322a4 -_0807F850: .4byte 0x000011bc + .pool _0807F854: - ldr r1, _0807F878 + ldr r1, =0x083390f4 movs r2, 0x80 lsls r2, 3 movs r0, 0x2 @@ -257233,21 +247779,20 @@ _0807F854: bl gpu_copy_to_wram_bg_tile_map movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _0807F87C + ldr r0, =0x083390d4 movs r2, 0x80 lsls r2, 1 movs r1, 0 bl gpu_pal_apply b _0807F962 .align 2, 0 -_0807F878: .4byte 0x083390f4 -_0807F87C: .4byte 0x083390d4 + .pool _0807F880: ldr r0, [r5] - ldr r1, _0807F8A4 + ldr r1, =0x000011bc adds r0, r1 ldr r4, [r0] - ldr r0, _0807F8A8 + ldr r0, =0x08d91598 bl sub_8034974 adds r2, r0, 0 lsls r2, 16 @@ -257259,26 +247804,24 @@ _0807F880: ldr r1, [r5] b _0807F966 .align 2, 0 -_0807F8A4: .4byte 0x000011bc -_0807F8A8: .4byte 0x08d91598 + .pool _0807F8AC: - ldr r0, _0807F8C0 + ldr r0, =0x08d91db8 ldr r1, [r5] - ldr r2, _0807F8C4 + ldr r2, =0x000011bc adds r1, r2 ldr r1, [r1] bl call_LZZUnCompWram ldr r1, [r5] b _0807F966 .align 2, 0 -_0807F8C0: .4byte 0x08d91db8 -_0807F8C4: .4byte 0x000011bc + .pool _0807F8C8: ldr r0, [r5] - ldr r1, _0807F8EC + ldr r1, =0x000011bc adds r0, r1 ldr r4, [r0] - ldr r0, _0807F8F0 + ldr r0, =0x08d91db8 bl sub_8034974 adds r2, r0, 0 lsls r2, 16 @@ -257290,26 +247833,24 @@ _0807F8C8: ldr r1, [r5] b _0807F966 .align 2, 0 -_0807F8EC: .4byte 0x000011bc -_0807F8F0: .4byte 0x08d91db8 + .pool _0807F8F4: - ldr r0, _0807F908 + ldr r0, =0x08d927ec ldr r1, [r5] - ldr r2, _0807F90C + ldr r2, =0x000011bc adds r1, r2 ldr r1, [r1] bl call_LZZUnCompWram ldr r1, [r5] b _0807F966 .align 2, 0 -_0807F908: .4byte 0x08d927ec -_0807F90C: .4byte 0x000011bc + .pool _0807F910: ldr r0, [r5] - ldr r1, _0807F938 + ldr r1, =0x000011bc adds r0, r1 ldr r4, [r0] - ldr r0, _0807F93C + ldr r0, =0x08d927ec bl sub_8034974 adds r2, r0, 0 lsls r2, 16 @@ -257323,25 +247864,24 @@ _0807F910: ldr r1, [r5] b _0807F966 .align 2, 0 -_0807F938: .4byte 0x000011bc -_0807F93C: .4byte 0x08d927ec + .pool _0807F940: - ldr r0, _0807F94C + ldr r0, =0x083394f4 movs r1, 0x80 movs r2, 0x20 bl gpu_pal_apply b _0807F962 .align 2, 0 -_0807F94C: .4byte 0x083394f4 + .pool _0807F950: - ldr r0, _0807F970 + ldr r0, =0x08339ac0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0807F974 + ldr r0, =0x08339bd8 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0807F978 + ldr r0, =0x08339b38 bl gpu_tile_obj_alloc_tag_and_copy_to_vram _0807F962: - ldr r0, _0807F97C + ldr r0, =0x020322a4 ldr r1, [r0] _0807F966: ldrb r0, [r1, 0x1] @@ -257349,22 +247889,19 @@ _0807F966: strb r0, [r1, 0x1] b _0807F9C8 .align 2, 0 -_0807F970: .4byte 0x08339ac0 -_0807F974: .4byte 0x08339bd8 -_0807F978: .4byte 0x08339b38 -_0807F97C: .4byte 0x020322a4 + .pool _0807F980: - ldr r0, _0807F9B0 + ldr r0, =0x08339c24 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0807F9B4 + ldr r0, =0x08339c58 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0807F9B8 + ldr r0, =0x08339ad0 bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _0807F9BC + ldr r0, =0x08339ac8 bl gpu_pal_obj_alloc_tag_and_apply - ldr r4, _0807F9C0 + ldr r4, =0x020322a4 ldr r0, [r4] - ldr r2, _0807F9C4 + ldr r2, =0x000011bc adds r0, r2 ldr r0, [r0] bl free @@ -257374,12 +247911,7 @@ _0807F980: movs r0, 0x1 b _0807F9CA .align 2, 0 -_0807F9B0: .4byte 0x08339c24 -_0807F9B4: .4byte 0x08339c58 -_0807F9B8: .4byte 0x08339ad0 -_0807F9BC: .4byte 0x08339ac8 -_0807F9C0: .4byte 0x020322a4 -_0807F9C4: .4byte 0x000011bc + .pool _0807F9C8: movs r0, 0 _0807F9CA: @@ -257436,7 +247968,7 @@ sub_807F9D0: @ 807F9D0 sub_807FA34: @ 807FA34 push {r4,lr} sub sp, 0x8 - ldr r0, _0807FA7C + ldr r0, =0x08339980 bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 @@ -257468,13 +248000,13 @@ _0807FA74: pop {r0} bx r0 .align 2, 0 -_0807FA7C: .4byte 0x08339980 + .pool thumb_func_end sub_807FA34 thumb_func_start sub_807FA80 sub_807FA80: @ 807FA80 push {r4,lr} - ldr r4, _0807FABC + ldr r4, =0x020322a4 ldr r0, [r4] cmp r0, 0 bne _0807FA94 @@ -257492,25 +248024,23 @@ _0807FA94: ldr r0, [r4] adds r0, 0x63 strb r1, [r0] - ldr r0, _0807FAC0 + ldr r0, =0x020375e0 ldrb r0, [r0] bl sub_807FE54 - ldr r0, _0807FAC4 + ldr r0, =sub_807FAC8 + 1 bl set_callback2 pop {r4} pop {r0} bx r0 .align 2, 0 -_0807FABC: .4byte 0x020322a4 -_0807FAC0: .4byte 0x020375e0 -_0807FAC4: .4byte sub_807FAC8 + 1 + .pool thumb_func_end sub_807FA80 thumb_func_start sub_807FAC8 sub_807FAC8: @ 807FAC8 push {r4-r6,lr} sub sp, 0x4 - ldr r1, _0807FAE4 + ldr r1, =0x020322a4 ldr r0, [r1] ldrb r0, [r0] adds r6, r1, 0 @@ -257519,13 +248049,12 @@ sub_807FAC8: @ 807FAC8 b _0807FCE2 _0807FADA: lsls r0, 2 - ldr r1, _0807FAE8 + ldr r1, =_0807FAEC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0807FAE4: .4byte 0x020322a4 -_0807FAE8: .4byte _0807FAEC + .pool .align 2, 0 _0807FAEC: .4byte _0807FB08 @@ -257545,11 +248074,11 @@ _0807FB08: bl SetVBlankCallback movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0807FBA0 + ldr r1, =0x08339974 movs r0, 0x1 movs r2, 0x3 bl bg_vram_setup - ldr r4, _0807FBA4 + ldr r4, =0x020322a4 ldr r1, [r4] movs r0, 0xDC lsls r0, 1 @@ -257557,7 +248086,7 @@ _0807FB08: movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _0807FBA8 + ldr r0, =0x000009b8 adds r1, r0 movs r0, 0x2 bl bg_set_tilemap @@ -257601,9 +248130,7 @@ _0807FB08: bl sub_8082D28 b _0807FCE2 .align 2, 0 -_0807FBA0: .4byte 0x08339974 -_0807FBA4: .4byte 0x020322a4 -_0807FBA8: .4byte 0x000009b8 + .pool _0807FBAC: bl sub_807F7D8 lsls r0, 24 @@ -257612,12 +248139,12 @@ _0807FBAC: b _0807FCE2 _0807FBB8: movs r4, 0 - ldr r5, _0807FC1C - ldr r6, _0807FC20 + ldr r5, =0x083399c8 + ldr r6, =0x020322a4 _0807FBBE: ldrb r1, [r5] ldrb r2, [r5, 0x1] - ldr r0, _0807FC24 + ldr r0, =0x08339ad8 movs r3, 0x1 bl obj_add_from_template_forward_search ldr r1, [r6] @@ -257631,7 +248158,7 @@ _0807FBBE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0807FC28 + ldr r1, =0x02020630 adds r0, r1 adds r1, r4, 0 adds r1, 0x8 @@ -257642,11 +248169,11 @@ _0807FBBE: adds r4, 0x1 cmp r4, 0x3 ble _0807FBBE - ldr r0, _0807FC2C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0807FC14 - ldr r0, _0807FC30 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0807FC14 @@ -257655,17 +248182,11 @@ _0807FBBE: movs r1, 0 bl sub_800DFB4 _0807FC14: - ldr r0, _0807FC34 + ldr r0, =sub_807F764 + 1 bl SetVBlankCallback b _0807FCA0 .align 2, 0 -_0807FC1C: .4byte 0x083399c8 -_0807FC20: .4byte 0x020322a4 -_0807FC24: .4byte 0x08339ad8 -_0807FC28: .4byte 0x02020630 -_0807FC2C: .4byte 0x03003124 -_0807FC30: .4byte 0x030030fc -_0807FC34: .4byte sub_807F764 + 1 + .pool _0807FC38: movs r0, 0x1 negs r0, r0 @@ -257678,7 +248199,7 @@ _0807FC38: b _0807FCA0 _0807FC4E: bl sub_807F9D0 - ldr r0, _0807FC60 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -257686,12 +248207,12 @@ _0807FC4E: bne _0807FCE2 b _0807FCA0 .align 2, 0 -_0807FC60: .4byte 0x02037fd4 + .pool _0807FC64: ldr r4, [r6] - ldr r0, _0807FC88 + ldr r0, =0x000011b8 adds r4, r0 - ldr r5, _0807FC8C + ldr r5, =0x0833973a bl sav2_get_text_speed adds r2, r0, 0 lsls r2, 24 @@ -257704,8 +248225,7 @@ _0807FC64: ldr r1, [r6] b _0807FCA4 .align 2, 0 -_0807FC88: .4byte 0x000011b8 -_0807FC8C: .4byte 0x0833973a + .pool _0807FC90: movs r0, 0x1 negs r0, r0 @@ -257715,7 +248235,7 @@ _0807FC90: movs r3, 0x10 bl sub_80A1AD4 _0807FCA0: - ldr r0, _0807FCAC + ldr r0, =0x020322a4 ldr r1, [r0] _0807FCA4: ldrb r0, [r1] @@ -257723,9 +248243,9 @@ _0807FCA4: strb r0, [r1] b _0807FCE2 .align 2, 0 -_0807FCAC: .4byte 0x020322a4 + .pool _0807FCB0: - ldr r0, _0807FCFC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -257740,9 +248260,9 @@ _0807FCB0: bl bg_unset_tilemap movs r0, 0 bl SetVBlankCallback - ldr r0, _0807FD00 + ldr r0, =sub_807FFA4 + 1 bl sub_81AABF0 - ldr r0, _0807FD04 + ldr r0, =0x020322a4 ldr r0, [r0] strb r4, [r0] _0807FCE2: @@ -257755,9 +248275,7 @@ _0807FCE2: pop {r0} bx r0 .align 2, 0 -_0807FCFC: .4byte 0x02037fd4 -_0807FD00: .4byte sub_807FFA4 + 1 -_0807FD04: .4byte 0x020322a4 + .pool thumb_func_end sub_807FAC8 thumb_func_start sub_807FD08 @@ -257827,13 +248345,13 @@ sub_807FD64: @ 807FD64 strh r4, [r0, 0x38] strh r5, [r0, 0x3A] strh r6, [r0, 0x3C] - ldr r1, _0807FD8C + ldr r1, =sub_807FD08 + 1 str r1, [r0, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0807FD8C: .4byte sub_807FD08 + 1 + .pool thumb_func_end sub_807FD64 thumb_func_start sub_807FD90 @@ -257863,9 +248381,9 @@ sub_807FD90: @ 807FD90 mov r3, r8 lsls r3, 2 mov r8, r3 - ldr r0, _0807FE0C + ldr r0, =0x02020630 add r8, r0 - ldr r5, _0807FE10 + ldr r5, =0x08339c78 lsls r4, r6, 2 adds r4, r6 lsls r4, 1 @@ -257899,8 +248417,7 @@ sub_807FD90: @ 807FD90 pop {r0} bx r0 .align 2, 0 -_0807FE0C: .4byte 0x02020630 -_0807FE10: .4byte 0x08339c78 + .pool thumb_func_end sub_807FD90 thumb_func_start sub_807FE14 @@ -257955,21 +248472,21 @@ _0807FE68: beq _0807FF3C b _0807FF88 _0807FE72: - ldr r0, _0807FE78 + ldr r0, =0x03005d98 strb r5, [r0] b _0807FF88 .align 2, 0 -_0807FE78: .4byte 0x03005d98 + .pool _0807FE7C: - ldr r0, _0807FEB4 + ldr r0, =0x03005d98 strb r5, [r0] - ldr r0, _0807FEB8 + ldr r0, =0x020322a4 ldr r0, [r0] adds r0, 0x7C movs r1, 0x2 strb r1, [r0] - ldr r4, _0807FEBC - ldr r0, _0807FEC0 + ldr r4, =0x020229f0 + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r4, 0 bl gf_strcpy @@ -257981,47 +248498,42 @@ _0807FE7C: bne _0807FEC8 adds r0, r4, 0 adds r0, 0x1C - ldr r1, _0807FEC4 + ldr r1, =0x083397d0 ldr r1, [r1, 0xC] bl gf_strcpy b _0807FED4 .align 2, 0 -_0807FEB4: .4byte 0x03005d98 -_0807FEB8: .4byte 0x020322a4 -_0807FEBC: .4byte 0x020229f0 -_0807FEC0: .4byte 0x03005d90 -_0807FEC4: .4byte 0x083397d0 + .pool _0807FEC8: adds r0, r4, 0 adds r0, 0x1C - ldr r1, _0807FEE0 + ldr r1, =0x083397d0 ldr r1, [r1] bl gf_strcpy _0807FED4: - ldr r1, _0807FEE4 + ldr r1, =0x020229e8 movs r0, 0x2 strh r0, [r1, 0x1A] strh r0, [r1, 0x36] b _0807FF88 .align 2, 0 -_0807FEE0: .4byte 0x083397d0 -_0807FEE4: .4byte 0x020229e8 + .pool _0807FEE8: - ldr r0, _0807FF28 + ldr r0, =0x03005d98 strb r5, [r0] - ldr r0, _0807FF2C + ldr r0, =0x020322a4 ldr r0, [r0] adds r0, 0x7C movs r1, 0x3 strb r1, [r0] - ldr r6, _0807FF30 - ldr r0, _0807FF34 + ldr r6, =0x020229f0 + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r6, 0 bl gf_strcpy adds r0, r6, 0 adds r0, 0x1C - ldr r4, _0807FF38 + ldr r4, =0x083397d0 ldr r1, [r4, 0x10] bl gf_strcpy adds r0, r6, 0 @@ -258036,27 +248548,23 @@ _0807FEE8: strh r5, [r0] b _0807FF88 .align 2, 0 -_0807FF28: .4byte 0x03005d98 -_0807FF2C: .4byte 0x020322a4 -_0807FF30: .4byte 0x020229f0 -_0807FF34: .4byte 0x03005d90 -_0807FF38: .4byte 0x083397d0 + .pool _0807FF3C: - ldr r0, _0807FF90 + ldr r0, =0x03005d98 strb r5, [r0] - ldr r0, _0807FF94 + ldr r0, =0x020322a4 ldr r0, [r0] adds r0, 0x7C movs r1, 0x4 strb r1, [r0] - ldr r5, _0807FF98 - ldr r0, _0807FF9C + ldr r5, =0x020229f0 + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r5, 0 bl gf_strcpy adds r0, r5, 0 adds r0, 0x1C - ldr r4, _0807FFA0 + ldr r4, =0x083397d0 ldr r1, [r4, 0x14] bl gf_strcpy adds r0, r5, 0 @@ -258081,11 +248589,7 @@ _0807FF88: pop {r0} bx r0 .align 2, 0 -_0807FF90: .4byte 0x03005d98 -_0807FF94: .4byte 0x020322a4 -_0807FF98: .4byte 0x020229f0 -_0807FF9C: .4byte 0x03005d90 -_0807FFA0: .4byte 0x083397d0 + .pool thumb_func_end sub_807FE54 thumb_func_start sub_807FFA4 @@ -258094,7 +248598,7 @@ sub_807FFA4: @ 807FFA4 movs r0, 0 movs r1, 0 bl lcd_io_set - ldr r4, _0807FFFC + ldr r4, =0x020322a4 ldr r0, [r4] cmp r0, 0 bne _0807FFC0 @@ -258112,7 +248616,7 @@ _0807FFC0: adds r0, r2 str r1, [r0] movs r2, 0 - ldr r5, _08080000 + ldr r5, =0x020375e0 movs r3, 0 _0807FFD6: ldr r0, [r4] @@ -258128,29 +248632,27 @@ _0807FFD6: ldrh r0, [r5] cmp r0, 0 bne _08080008 - ldr r0, _08080004 + ldr r0, =sub_8080018 + 1 bl set_callback2 b _0808000E .align 2, 0 -_0807FFFC: .4byte 0x020322a4 -_08080000: .4byte 0x020375e0 -_08080004: .4byte sub_8080018 + 1 + .pool _08080008: - ldr r0, _08080014 + ldr r0, =sub_80808D4 + 1 bl set_callback2 _0808000E: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08080014: .4byte sub_80808D4 + 1 + .pool thumb_func_end sub_807FFA4 thumb_func_start sub_8080018 sub_8080018: @ 8080018 push {r4-r7,lr} sub sp, 0x4 - ldr r1, _08080034 + ldr r1, =0x020322a4 ldr r0, [r1] ldrb r0, [r0] adds r2, r1, 0 @@ -258159,13 +248661,12 @@ sub_8080018: @ 8080018 b _08080546 _0808002A: lsls r0, 2 - ldr r1, _08080038 + ldr r1, =_0808003C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08080034: .4byte 0x020322a4 -_08080038: .4byte _0808003C + .pool .align 2, 0 _0808003C: .4byte _08080094 @@ -258192,11 +248693,11 @@ _0808003C: .4byte _08080508 _08080094: bl sub_8080588 - ldr r1, _080800F4 - ldr r2, _080800F8 + ldr r1, =0x020229c6 + ldr r2, =0x00004422 adds r0, r2, 0 strh r0, [r1] - ldr r2, _080800FC + ldr r2, =0x020322a4 ldr r0, [r2] adds r0, 0x72 movs r1, 0 @@ -258227,7 +248728,7 @@ _080800C4: adds r5, r4, 0 cmp r5, 0x3 ble _080800B2 - ldr r3, _080800FC + ldr r3, =0x020322a4 ldr r4, [r3] adds r1, r4, 0 adds r1, 0x70 @@ -258240,9 +248741,7 @@ _080800C4: ldr r1, [r3] b _080804FC .align 2, 0 -_080800F4: .4byte 0x020229c6 -_080800F8: .4byte 0x00004422 -_080800FC: .4byte 0x020322a4 + .pool _08080100: bl sub_807F7D8 lsls r0, 24 @@ -258250,7 +248749,7 @@ _08080100: bne _0808010C b _08080546 _0808010C: - ldr r0, _0808011C + ldr r0, =0x020322a4 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -258258,15 +248757,15 @@ _0808010C: bl sub_8082D28 b _08080546 .align 2, 0 -_0808011C: .4byte 0x020322a4 + .pool _08080120: movs r5, 0 - ldr r4, _08080184 - ldr r6, _08080188 + ldr r4, =0x083399c8 + ldr r6, =0x020322a4 _08080126: ldrb r1, [r4] ldrb r2, [r4, 0x1] - ldr r0, _0808018C + ldr r0, =0x08339ad8 movs r3, 0x1 bl obj_add_from_template_forward_search ldr r1, [r6] @@ -258280,7 +248779,7 @@ _08080126: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08080190 + ldr r1, =0x02020630 adds r0, r1 adds r1, r5, 0 adds r1, 0x8 @@ -258291,13 +248790,13 @@ _08080126: adds r5, 0x1 cmp r5, 0x3 ble _08080126 - ldr r0, _08080194 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0808016A b _080804F8 _0808016A: - ldr r0, _08080198 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _08080174 @@ -258309,12 +248808,7 @@ _08080174: bl sub_800DFB4 b _080804F8 .align 2, 0 -_08080184: .4byte 0x083399c8 -_08080188: .4byte 0x020322a4 -_0808018C: .4byte 0x08339ad8 -_08080190: .4byte 0x02020630 -_08080194: .4byte 0x03003124 -_08080198: .4byte 0x030030fc + .pool _0808019C: movs r0, 0x1 negs r0, r0 @@ -258326,7 +248820,7 @@ _0808019C: b _080804F8 _080801AE: bl sub_807F9D0 - ldr r0, _080801C4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -258336,13 +248830,13 @@ _080801AE: _080801C0: b _080804F8 .align 2, 0 -_080801C4: .4byte 0x02037fd4 + .pool _080801C8: - ldr r4, _080801EC + ldr r4, =0x020322a4 ldr r0, [r4] - ldr r3, _080801F0 + ldr r3, =0x000011b8 adds r0, r3 - ldr r1, _080801F4 + ldr r1, =0x0833981a movs r2, 0 bl sub_808417C ldr r1, [r4] @@ -258356,11 +248850,9 @@ _080801C8: str r2, [r0] b _08080546 .align 2, 0 -_080801EC: .4byte 0x020322a4 -_080801F0: .4byte 0x000011b8 -_080801F4: .4byte 0x0833981a + .pool _080801F8: - ldr r4, _0808023C + ldr r4, =0x020322a4 ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 @@ -258375,10 +248867,10 @@ _080801F8: movs r5, 0xAC lsls r5, 1 adds r0, r5 - ldr r1, _08080240 + ldr r1, =0x0203ce7c ldrh r1, [r1] bl sub_807FE14 - ldr r0, _08080244 + ldr r0, =0x020228c4 ldr r1, [r4] adds r1, r5 movs r2, 0x10 @@ -258391,9 +248883,7 @@ _080801F8: str r6, [r0] b _08080546 .align 2, 0 -_0808023C: .4byte 0x020322a4 -_08080240: .4byte 0x0203ce7c -_08080244: .4byte 0x020228c4 + .pool _08080248: bl sub_800A520 lsls r0, 24 @@ -258412,7 +248902,7 @@ _08080264: bl sub_800A4D8 b _080804F8 _0808026C: - ldr r6, _080802A8 + ldr r6, =0x020322a4 ldr r1, [r6] movs r0, 0x84 lsls r0, 1 @@ -258442,14 +248932,14 @@ _0808029E: lsls r6, 1 b _080802D4 .align 2, 0 -_080802A8: .4byte 0x020322a4 + .pool _080802AC: ldr r0, [r7] lsls r4, r5, 4 adds r0, r4, r0 adds r0, r6 lsls r1, r5, 8 - ldr r2, _080802E8 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x10 bl memcpy @@ -258472,7 +248962,7 @@ _080802D4: bl sub_800A5B4 b _080804F8 .align 2, 0 -_080802E8: .4byte 0x020223c4 + .pool _080802EC: ldrb r1, [r4] lsls r1, 1 @@ -258486,7 +248976,7 @@ _080802EC: b _08080336 _08080302: bl sub_8009FCC - ldr r2, _08080354 + ldr r2, =0x020322a4 ldr r1, [r2] adds r1, 0x7C strb r0, [r1] @@ -258495,7 +248985,7 @@ _08080302: movs r1, 0x8A lsls r1, 1 adds r4, r2, r1 - ldr r1, _08080358 + ldr r1, =0x083399d0 adds r0, r2, 0 adds r0, 0x7C ldrb r0, [r0] @@ -258512,7 +249002,7 @@ _08080328: cmp r5, 0x3 ble _08080328 _08080336: - ldr r3, _08080354 + ldr r3, =0x020322a4 ldr r1, [r3] movs r0, 0x84 lsls r0, 1 @@ -258528,8 +249018,7 @@ _08080336: adds r1, r2 b _080804FC .align 2, 0 -_08080354: .4byte 0x020322a4 -_08080358: .4byte 0x083399d0 + .pool _0808035C: ldr r3, [r2] movs r0, 0x84 @@ -258555,8 +249044,8 @@ _08080370: adds r0, 0x1 strb r0, [r3] ldr r2, [r2] - ldr r3, _080803AC - ldr r1, _080803B0 + ldr r3, =0x083399dc + ldr r1, =0x083399e4 adds r0, r2, 0 adds r0, 0x7C ldrb r0, [r0] @@ -258565,7 +249054,7 @@ _08080370: ldrb r0, [r0] lsls r0, 1 adds r0, r3 - ldr r3, _080803B4 + ldr r3, =0xffffa800 adds r1, r3, 0 ldrh r0, [r0] adds r1, r0 @@ -258573,15 +249062,13 @@ _08080370: strh r1, [r2] b _080803BE .align 2, 0 -_080803AC: .4byte 0x083399dc -_080803B0: .4byte 0x083399e4 -_080803B4: .4byte 0xffffa800 + .pool _080803B8: ldrb r0, [r3] subs r0, 0x1 strb r0, [r3] _080803BE: - ldr r0, _080803D0 + ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0x84 lsls r1, 1 @@ -258590,7 +249077,7 @@ _080803BE: str r1, [r0] b _08080546 .align 2, 0 -_080803D0: .4byte 0x020322a4 + .pool _080803D4: bl sub_800A520 lsls r0, 24 @@ -258598,7 +249085,7 @@ _080803D4: bne _080803E0 b _08080546 _080803E0: - ldr r2, _08080404 + ldr r2, =0x020322a4 ldr r1, [r2] ldrb r0, [r1] adds r0, 0x1 @@ -258614,13 +249101,13 @@ _080803E0: bl gpu_sync_bg_show b _08080546 .align 2, 0 -_08080404: .4byte 0x020322a4 + .pool _08080408: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl lcd_io_set_bits - ldr r4, _08080490 + ldr r4, =0x020322a4 ldr r2, [r4] adds r1, r2, 0 adds r1, 0x4A @@ -258654,8 +249141,8 @@ _08080408: movs r0, 0x80 lsls r0, 1 strh r0, [r1] - ldr r2, _08080494 - ldr r1, _08080498 + ldr r2, =0x083399dc + ldr r1, =0x083399e4 adds r0, r3, 0 adds r0, 0x7C ldrb r0, [r0] @@ -258681,15 +249168,13 @@ _0808048C: ldr r0, [r4] b _080804BE .align 2, 0 -_08080490: .4byte 0x020322a4 -_08080494: .4byte 0x083399dc -_08080498: .4byte 0x083399e4 + .pool _0808049C: bl sub_8083380 lsls r0, 24 cmp r0, 0 beq _080804BA - ldr r0, _080804CC + ldr r0, =0x020322a4 ldr r1, [r0] movs r3, 0x84 lsls r3, 1 @@ -258700,7 +249185,7 @@ _0808049C: adds r0, 0x1 strb r0, [r1] _080804BA: - ldr r0, _080804CC + ldr r0, =0x020322a4 ldr r0, [r0] _080804BE: movs r1, 0xA0 @@ -258709,9 +249194,9 @@ _080804BE: bl sub_8082CB4 b _08080546 .align 2, 0 -_080804CC: .4byte 0x020322a4 + .pool _080804D0: - ldr r0, _080804E0 + ldr r0, =0x08339c2c movs r2, 0x10 negs r2, r2 movs r1, 0x78 @@ -258719,7 +249204,7 @@ _080804D0: bl obj_add_from_template_forward_search b _080804F8 .align 2, 0 -_080804E0: .4byte 0x08339c2c + .pool _080804E4: bl sub_800ADF8 b _080804F8 @@ -258730,7 +249215,7 @@ _080804EA: beq _08080546 bl sub_800A418 _080804F8: - ldr r0, _08080504 + ldr r0, =0x020322a4 ldr r1, [r0] _080804FC: ldrb r0, [r1] @@ -258738,9 +249223,9 @@ _080804FC: strb r0, [r1] b _08080546 .align 2, 0 -_08080504: .4byte 0x020322a4 + .pool _08080508: - ldr r5, _0808057C + ldr r5, =0x020322a4 ldr r3, [r5] adds r1, r3, 0 adds r1, 0x4C @@ -258751,12 +249236,12 @@ _08080508: lsls r1, 1 adds r0, r3, r1 str r2, [r0] - ldr r0, _08080580 + ldr r0, =sub_8081898 + 1 bl set_callback2 bl current_map_music_get lsls r0, 16 lsrs r0, 16 - ldr r4, _08080584 + ldr r4, =0x00000193 cmp r0, r4 beq _08080540 bl current_map_music_get @@ -258769,7 +249254,7 @@ _08080540: adds r0, r4, 0 bl song_play_for_text _08080546: - ldr r0, _0808057C + ldr r0, =0x020322a4 ldr r1, [r0] movs r3, 0x8E lsls r3, 1 @@ -258791,9 +249276,7 @@ _08080546: pop {r0} bx r0 .align 2, 0 -_0808057C: .4byte 0x020322a4 -_08080580: .4byte sub_8081898 + 1 -_08080584: .4byte 0x00000193 + .pool thumb_func_end sub_8080018 thumb_func_start sub_8080588 @@ -258805,15 +249288,15 @@ sub_8080588: @ 8080588 bl reset_all_obj_data bl gpu_pal_allocator_reset bl clear_tasks - ldr r0, _08080614 + ldr r0, =sub_807F764 + 1 bl SetVBlankCallback movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08080618 + ldr r1, =0x08339974 movs r0, 0x1 movs r2, 0x3 bl bg_vram_setup - ldr r4, _0808061C + ldr r4, =0x020322a4 ldr r1, [r4] movs r0, 0xDC lsls r0, 1 @@ -258821,7 +249304,7 @@ sub_8080588: @ 8080588 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r3, _08080620 + ldr r3, =0x000009b8 adds r1, r3 movs r0, 0x2 bl bg_set_tilemap @@ -258856,10 +249339,7 @@ sub_8080588: @ 8080588 pop {r0} bx r0 .align 2, 0 -_08080614: .4byte sub_807F764 + 1 -_08080618: .4byte 0x08339974 -_0808061C: .4byte 0x020322a4 -_08080620: .4byte 0x000009b8 + .pool thumb_func_end sub_8080588 thumb_func_start task_tutorial_oak_boy_girl @@ -258870,13 +249350,13 @@ task_tutorial_oak_boy_girl: @ 8080624 lsrs r0, 24 adds r2, r0, 0 adds r2, 0x18 - ldr r0, _08080660 + ldr r0, =0x020322a4 ldr r0, [r0] lsrs r1, 23 adds r0, 0x96 adds r0, r1 ldrb r0, [r0] - ldr r1, _08080664 + ldr r1, =0x083399e7 adds r0, r1 ldrb r1, [r0] cmp r2, r1 @@ -258894,8 +249374,7 @@ task_tutorial_oak_boy_girl: @ 8080624 movs r0, 0x2 b _0808066E .align 2, 0 -_08080660: .4byte 0x020322a4 -_08080664: .4byte 0x083399e7 + .pool _08080668: movs r0, 0x1 b _0808066E @@ -258957,7 +249436,7 @@ _080806C8: movs r4, 0 cmp r4, r7 bge _08080734 - ldr r0, _08080740 + ldr r0, =0x08339ca0 mov r9, r0 adds r0, r5, 0 subs r0, 0xA3 @@ -258976,7 +249455,7 @@ _080806DC: lsls r0, 24 cmp r0, 0 bne _0808071A - ldr r0, _08080744 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x1 bne _0808071A @@ -258985,7 +249464,7 @@ _080806DC: bl __umodsi3 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _08080748 + ldr r0, =0x08339cbe adds r0, r6, r0 ldrb r5, [r0] mov r0, r8 @@ -259015,18 +249494,16 @@ _08080734: pop {r0} bx r0 .align 2, 0 -_08080740: .4byte 0x08339ca0 -_08080744: .4byte 0x020375e0 -_08080748: .4byte 0x08339cbe + .pool thumb_func_end sub_8080674 thumb_func_start sub_808074C sub_808074C: @ 808074C push {r4-r7,lr} movs r4, 0 - ldr r7, _080807B4 + ldr r7, =0x020322a4 movs r6, 0xFF - ldr r5, _080807B8 + ldr r5, =0x083399d0 _08080756: ldr r3, [r7] lsls r2, r4, 1 @@ -259050,7 +249527,7 @@ _08080756: cmp r4, 0x3 ble _08080756 movs r3, 0 - ldr r7, _080807B4 + ldr r7, =0x020322a4 _08080784: movs r4, 0 adds r6, r3, 0x1 @@ -259079,8 +249556,7 @@ _080807A2: pop {r0} bx r0 .align 2, 0 -_080807B4: .4byte 0x020322a4 -_080807B8: .4byte 0x083399d0 + .pool thumb_func_end sub_808074C thumb_func_start sub_80807BC @@ -259093,7 +249569,7 @@ sub_80807BC: @ 80807BC sub sp, 0x1C movs r0, 0 mov r10, r0 - ldr r0, _08080880 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080807DE @@ -259103,7 +249579,7 @@ sub_80807BC: @ 80807BC mov r10, r0 _080807DE: movs r6, 0 - ldr r7, _08080884 + ldr r7, =0x020322a4 mov r8, r6 _080807E4: ldr r2, [r7] @@ -259136,7 +249612,7 @@ _080807E4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08080888 + ldr r1, =0x02020630 adds r0, r1 mov r1, r8 lsrs r4, r1, 24 @@ -259152,7 +249628,7 @@ _080807E4: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _0808088C + ldr r0, =0x020229f0 adds r1, r0 add r0, sp, 0x8 bl gf_strcpy @@ -259180,10 +249656,7 @@ _080807E4: bl sub_80840D4 b _080808A6 .align 2, 0 -_08080880: .4byte 0x03003124 -_08080884: .4byte 0x020322a4 -_08080888: .4byte 0x02020630 -_0808088C: .4byte 0x020229f0 + .pool _08080890: lsls r2, 24 lsrs r2, 24 @@ -259223,7 +249696,7 @@ _080808B6: sub_80808D4: @ 80808D4 push {r4-r7,lr} sub sp, 0x4 - ldr r1, _080808F0 + ldr r1, =0x020322a4 ldr r0, [r1] ldrb r0, [r0] adds r2, r1, 0 @@ -259232,13 +249705,12 @@ sub_80808D4: @ 80808D4 b _08080DAE _080808E6: lsls r0, 2 - ldr r1, _080808F4 + ldr r1, =_080808F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080808F0: .4byte 0x020322a4 -_080808F4: .4byte _080808F8 + .pool .align 2, 0 _080808F8: .4byte _08080950 @@ -259266,11 +249738,11 @@ _080808F8: _08080950: bl sub_800B4C0 bl sub_8080588 - ldr r4, _080809D4 + ldr r4, =0x0203ce7c ldrh r1, [r4] movs r0, 0 bl sub_8082FDC - ldr r5, _080809D8 + ldr r5, =0x020322a4 ldr r0, [r5] movs r6, 0xAC lsls r6, 1 @@ -259286,7 +249758,7 @@ _08080950: bl sub_8080674 movs r4, 0 movs r6, 0 - ldr r0, _080809DC + ldr r0, =0x020229c6 mov r12, r0 movs r7, 0x92 lsls r7, 1 @@ -259312,7 +249784,7 @@ _080809A0: adds r4, r3, 0 cmp r4, 0x3 ble _0808098E - ldr r4, _080809D8 + ldr r4, =0x020322a4 ldr r3, [r4] adds r1, r3, 0 adds r1, 0x70 @@ -259320,17 +249792,14 @@ _080809A0: movs r0, 0 strh r0, [r1] strb r2, [r3, 0x1] - ldr r1, _080809E0 + ldr r1, =0x00004422 adds r0, r1, 0 mov r2, r12 strh r0, [r2] ldr r1, [r4] b _08080CB2 .align 2, 0 -_080809D4: .4byte 0x0203ce7c -_080809D8: .4byte 0x020322a4 -_080809DC: .4byte 0x020229c6 -_080809E0: .4byte 0x00004422 + .pool _080809E4: bl sub_807F7D8 lsls r0, 24 @@ -259338,7 +249807,7 @@ _080809E4: bne _080809F0 b _08080DAE _080809F0: - ldr r0, _08080A00 + ldr r0, =0x020322a4 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -259346,15 +249815,15 @@ _080809F0: bl sub_8082D28 b _08080DAE .align 2, 0 -_08080A00: .4byte 0x020322a4 + .pool _08080A04: movs r4, 0 - ldr r5, _08080A48 - ldr r6, _08080A4C + ldr r5, =0x083399c8 + ldr r6, =0x020322a4 _08080A0A: ldrb r1, [r5] ldrb r2, [r5, 0x1] - ldr r0, _08080A50 + ldr r0, =0x08339ad8 movs r3, 0x1 bl obj_add_from_template_forward_search ldr r1, [r6] @@ -259368,7 +249837,7 @@ _08080A0A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08080A54 + ldr r1, =0x02020630 adds r0, r1 adds r1, r4, 0 adds r1, 0x8 @@ -259381,10 +249850,7 @@ _08080A0A: ble _08080A0A b _08080CAE .align 2, 0 -_08080A48: .4byte 0x083399c8 -_08080A4C: .4byte 0x020322a4 -_08080A50: .4byte 0x08339ad8 -_08080A54: .4byte 0x02020630 + .pool _08080A58: movs r0, 0x1 negs r0, r0 @@ -259394,7 +249860,7 @@ _08080A58: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r2, _08080A80 + ldr r2, =0x020322a4 ldr r1, [r2] ldrb r0, [r1] adds r0, 0x1 @@ -259406,9 +249872,9 @@ _08080A58: str r4, [r0] b _08080DAE .align 2, 0 -_08080A80: .4byte 0x020322a4 + .pool _08080A84: - ldr r4, _08080AB4 + ldr r4, =0x020322a4 ldr r1, [r4] movs r5, 0x84 lsls r5, 1 @@ -259420,7 +249886,7 @@ _08080A84: bne _08080A9C bl sub_807F9D0 _08080A9C: - ldr r0, _08080AB8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -259433,10 +249899,9 @@ _08080AAA: strb r0, [r1] b _08080DAE .align 2, 0 -_08080AB4: .4byte 0x020322a4 -_08080AB8: .4byte 0x02037fd4 + .pool _08080ABC: - ldr r2, _08080AD4 + ldr r2, =0x020322a4 ldr r1, [r2] movs r3, 0 movs r0, 0xB @@ -259448,7 +249913,7 @@ _08080ABC: strb r3, [r0] b _08080DAE .align 2, 0 -_08080AD4: .4byte 0x020322a4 + .pool _08080AD8: lsls r1, 1 adds r0, r3, 0 @@ -259461,8 +249926,8 @@ _08080AD8: b _08080B16 _08080AEC: movs r4, 0 - ldr r2, _08080B34 - ldr r0, _08080B38 + ldr r2, =0x083399d0 + ldr r0, =0x020322a4 ldr r3, [r0] adds r0, r3, 0 adds r0, 0x7C @@ -259483,7 +249948,7 @@ _08080B08: cmp r4, 0x3 ble _08080B08 _08080B16: - ldr r3, _08080B38 + ldr r3, =0x020322a4 ldr r1, [r3] movs r5, 0x84 lsls r5, 1 @@ -259499,8 +249964,7 @@ _08080B16: adds r1, r0 b _08080CB2 .align 2, 0 -_08080B34: .4byte 0x083399d0 -_08080B38: .4byte 0x020322a4 + .pool _08080B3C: ldr r3, [r2] movs r2, 0x84 @@ -259522,15 +249986,15 @@ _08080B50: ldrb r1, [r4] cmp r0, r1 bcc _08080B94 - ldr r2, _08080B88 - ldr r1, _08080B8C + ldr r2, =0x083399dc + ldr r1, =0x083399e4 ldrb r0, [r4] subs r0, 0x2 adds r0, r1 ldrb r0, [r0] lsls r0, 1 adds r0, r2 - ldr r2, _08080B90 + ldr r2, =0xffffa800 adds r1, r2, 0 ldrh r0, [r0] adds r1, r0 @@ -259541,15 +250005,13 @@ _08080B50: adds r0, 0x1 b _08080B98 .align 2, 0 -_08080B88: .4byte 0x083399dc -_08080B8C: .4byte 0x083399e4 -_08080B90: .4byte 0xffffa800 + .pool _08080B94: ldrb r0, [r3] subs r0, 0x1 _08080B98: strb r0, [r3] - ldr r0, _08080BAC + ldr r0, =0x020322a4 ldr r0, [r0] movs r3, 0x84 lsls r3, 1 @@ -259558,9 +250020,9 @@ _08080B98: str r1, [r0] b _08080DAE .align 2, 0 -_08080BAC: .4byte 0x020322a4 + .pool _08080BB0: - ldr r4, _08080BD8 + ldr r4, =0x020322a4 ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 @@ -259577,13 +250039,13 @@ _08080BB0: bl gpu_sync_bg_show b _08080DAE .align 2, 0 -_08080BD8: .4byte 0x020322a4 + .pool _08080BDC: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl lcd_io_set_bits - ldr r4, _08080C6C + ldr r4, =0x020322a4 ldr r2, [r4] adds r1, r2, 0 adds r1, 0x4A @@ -259613,8 +250075,8 @@ _08080BDC: movs r0, 0x80 lsls r0, 1 strh r0, [r1] - ldr r2, _08080C70 - ldr r1, _08080C74 + ldr r2, =0x083399dc + ldr r1, =0x083399e4 adds r0, r3, 0 adds r0, 0x7C ldrb r0, [r0] @@ -259647,21 +250109,19 @@ _08080C5C: bl sub_8082CB4 b _08080DAE .align 2, 0 -_08080C6C: .4byte 0x020322a4 -_08080C70: .4byte 0x083399dc -_08080C74: .4byte 0x083399e4 + .pool _08080C78: bl sub_8083380 lsls r0, 24 cmp r0, 0 beq _08080C8C - ldr r0, _08080C9C + ldr r0, =0x020322a4 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] _08080C8C: - ldr r0, _08080C9C + ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0xA0 lsls r1, 1 @@ -259669,16 +250129,16 @@ _08080C8C: bl sub_8082CB4 b _08080DAE .align 2, 0 -_08080C9C: .4byte 0x020322a4 + .pool _08080CA0: - ldr r0, _08080CBC + ldr r0, =0x08339c2c movs r2, 0x10 negs r2, r2 movs r1, 0x78 movs r3, 0x3 bl obj_add_from_template_forward_search _08080CAE: - ldr r0, _08080CC0 + ldr r0, =0x020322a4 ldr r1, [r0] _08080CB2: ldrb r0, [r1] @@ -259686,11 +250146,10 @@ _08080CB2: strb r0, [r1] b _08080DAE .align 2, 0 -_08080CBC: .4byte 0x08339c2c -_08080CC0: .4byte 0x020322a4 + .pool _08080CC4: bl sub_8080DF8 - ldr r5, _08080D1C + ldr r5, =0x020322a4 ldr r4, [r5] adds r1, r4, 0 adds r1, 0x4C @@ -259702,15 +250161,15 @@ _08080CC4: lsls r1, 1 adds r0, r4, r1 str r2, [r0] - ldr r2, _08080D20 + ldr r2, =0x00000123 adds r0, r4, r2 strb r3, [r0] ldr r0, [r5] adds r0, 0x72 strb r3, [r0] - ldr r0, _08080D24 + ldr r0, =sub_8081898 + 1 bl set_callback2 - ldr r0, _08080D28 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x1 bne _08080D44 @@ -259720,7 +250179,7 @@ _08080CC4: lsls r0, 24 cmp r0, 0 bne _08080D30 - ldr r0, _08080D2C + ldr r0, =sub_8081224 + 1 movs r1, 0xA bl AddTask ldr r1, [r5] @@ -259729,13 +250188,9 @@ _08080CC4: adds r1, r3 b _08080D42 .align 2, 0 -_08080D1C: .4byte 0x020322a4 -_08080D20: .4byte 0x00000123 -_08080D24: .4byte sub_8081898 + 1 -_08080D28: .4byte 0x020375e0 -_08080D2C: .4byte sub_8081224 + 1 + .pool _08080D30: - ldr r0, _08080DE8 + ldr r0, =0x083399ec ldr r0, [r0] movs r1, 0xA bl AddTask @@ -259746,7 +250201,7 @@ _08080D30: _08080D42: strb r0, [r1] _08080D44: - ldr r1, _08080DEC + ldr r1, =0x020375e0 ldrh r0, [r1] cmp r0, 0x1 bls _08080D80 @@ -259756,12 +250211,12 @@ _08080D44: bge _08080D80 movs r5, 0xA0 lsls r5, 20 - ldr r6, _08080DE8 + ldr r6, =0x083399ec _08080D5A: ldm r6!, {r0} lsrs r1, r5, 24 bl AddTask - ldr r1, _08080DF0 + ldr r1, =0x020322a4 ldr r1, [r1] movs r2, 0x90 lsls r2, 1 @@ -259772,7 +250227,7 @@ _08080D5A: lsls r3, 17 adds r5, r3 adds r4, 0x1 - ldr r0, _08080DEC + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r4, r0 blt _08080D5A @@ -259780,11 +250235,11 @@ _08080D80: bl current_map_music_get lsls r0, 16 lsrs r0, 16 - ldr r4, _08080DF4 + ldr r4, =0x00000193 cmp r0, r4 beq _08080D9E bl current_map_music_get - ldr r1, _08080DF0 + ldr r1, =0x020322a4 ldr r1, [r1] movs r5, 0xAA lsls r5, 1 @@ -259797,7 +250252,7 @@ _08080D9E: bl audio_play bl sub_807F738 _08080DAE: - ldr r0, _08080DF0 + ldr r0, =0x020322a4 ldr r1, [r0] movs r2, 0x8E lsls r2, 1 @@ -259820,18 +250275,15 @@ _08080DAE: pop {r0} bx r0 .align 2, 0 -_08080DE8: .4byte 0x083399ec -_08080DEC: .4byte 0x020375e0 -_08080DF0: .4byte 0x020322a4 -_08080DF4: .4byte 0x00000193 + .pool thumb_func_end sub_80808D4 thumb_func_start sub_8080DF8 sub_8080DF8: @ 8080DF8 push {lr} - ldr r3, _08080E18 + ldr r3, =0x03003110 movs r0, 0 - ldr r1, _08080E1C + ldr r1, =0x03003090 movs r2, 0x3 _08080E02: strh r0, [r3] @@ -259845,8 +250297,7 @@ _08080E02: pop {r0} bx r0 .align 2, 0 -_08080E18: .4byte 0x03003110 -_08080E1C: .4byte 0x03003090 + .pool thumb_func_end sub_8080DF8 thumb_func_start sub_8080E20 @@ -259854,7 +250305,7 @@ sub_8080E20: @ 8080E20 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _08080E60 + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -259868,13 +250319,13 @@ sub_8080E20: @ 8080E20 ldrsh r1, [r2, r4] cmp r0, r1 ble _08080E58 - ldr r0, _08080E64 + ldr r0, =0x03003090 movs r4, 0xC ldrsh r1, [r2, r4] lsls r1, 4 adds r0, 0x4 adds r1, r0 - ldr r0, _08080E68 + ldr r0, =0x00002345 strh r0, [r1] adds r0, r3, 0 bl remove_task @@ -259883,9 +250334,7 @@ _08080E58: pop {r0} bx r0 .align 2, 0 -_08080E60: .4byte 0x03005e00 -_08080E64: .4byte 0x03003090 -_08080E68: .4byte 0x00002345 + .pool thumb_func_end sub_8080E20 thumb_func_start sub_8080E6C @@ -259897,12 +250346,12 @@ sub_8080E6C: @ 8080E6C lsrs r5, 24 lsls r4, 24 lsrs r4, 24 - ldr r0, _08080E9C + ldr r0, =sub_8080E20 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08080EA0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -259913,8 +250362,7 @@ sub_8080E6C: @ 8080E6C pop {r0} bx r0 .align 2, 0 -_08080E9C: .4byte sub_8080E20 + 1 -_08080EA0: .4byte 0x03005e00 + .pool thumb_func_end sub_8080E6C thumb_func_start sub_8080EA4 @@ -259922,7 +250370,7 @@ sub_8080EA4: @ 8080EA4 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _08080F10 + ldr r4, =0x020322a4 ldr r0, [r4] adds r0, 0x4A ldrh r0, [r0] @@ -259934,7 +250382,7 @@ sub_8080EA4: @ 8080EA4 beq _08080EC2 b _08080FB8 _08080EC2: - ldr r2, _08080F14 + ldr r2, =0x03005e00 lsls r1, r5, 2 adds r0, r1, r5 lsls r0, 3 @@ -259947,7 +250395,7 @@ _08080EC2: b _08080FC6 _08080ED8: ldr r0, [r4] - ldr r1, _08080F18 + ldr r1, =0x00000123 adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -259955,7 +250403,7 @@ _08080ED8: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 - ldr r1, _08080F1C + ldr r1, =0x0000028f bl __udivsi3 lsls r0, 24 lsrs r1, r0, 24 @@ -259964,34 +250412,27 @@ _08080ED8: adds r0, 0x4C movs r4, 0 ldrsh r2, [r0, r4] - ldr r0, _08080F20 + ldr r0, =0x000001f3 cmp r2, r0 bgt _08080F40 cmp r1, 0x4B bls _08080F2C - ldr r1, _08080F24 - ldr r0, _08080F28 + ldr r1, =0x03003090 + ldr r0, =0x00004523 b _08080F30 .align 2, 0 -_08080F10: .4byte 0x020322a4 -_08080F14: .4byte 0x03005e00 -_08080F18: .4byte 0x00000123 -_08080F1C: .4byte 0x0000028f -_08080F20: .4byte 0x000001f3 -_08080F24: .4byte 0x03003090 -_08080F28: .4byte 0x00004523 + .pool _08080F2C: - ldr r1, _08080F38 - ldr r0, _08080F3C + ldr r1, =0x03003090 + ldr r0, =0x00005432 _08080F30: strh r0, [r1, 0x14] - ldr r0, _08080F3C + ldr r0, =0x00005432 b _08080F9E .align 2, 0 -_08080F38: .4byte 0x03003090 -_08080F3C: .4byte 0x00005432 + .pool _08080F40: - ldr r0, _08080F5C + ldr r0, =0x000005db cmp r2, r0 bgt _08080F6E cmp r1, 0x50 @@ -260002,13 +250443,11 @@ _08080F40: lsrs r0, 24 cmp r0, 0x3B bhi _08080F68 - ldr r1, _08080F60 - ldr r0, _08080F64 + ldr r1, =0x03003090 + ldr r0, =0x00005432 b _08080F9E .align 2, 0 -_08080F5C: .4byte 0x000005db -_08080F60: .4byte 0x03003090 -_08080F64: .4byte 0x00005432 + .pool _08080F68: cmp r1, 0x9 bhi _08080FA0 @@ -260022,12 +250461,11 @@ _08080F6E: lsrs r0, 24 cmp r0, 0x13 bhi _08080F8C - ldr r1, _08080F84 - ldr r0, _08080F88 + ldr r1, =0x03003090 + ldr r0, =0x00005432 b _08080F9E .align 2, 0 -_08080F84: .4byte 0x03003090 -_08080F88: .4byte 0x00005432 + .pool _08080F8C: cmp r3, 0x1D bhi _08080FA0 @@ -260037,23 +250475,21 @@ _08080F90: bl sub_8080E6C b _08080FA0 _08080F9A: - ldr r1, _08080FAC - ldr r0, _08080FB0 + ldr r1, =0x03003090 + ldr r0, =0x00004523 _08080F9E: strh r0, [r1, 0x14] _08080FA0: - ldr r0, _08080FB4 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 movs r0, 0x1 b _08080FC4 .align 2, 0 -_08080FAC: .4byte 0x03003090 -_08080FB0: .4byte 0x00004523 -_08080FB4: .4byte 0x03005e00 + .pool _08080FB8: - ldr r0, _08080FCC + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -260066,7 +250502,7 @@ _08080FC6: pop {r0} bx r0 .align 2, 0 -_08080FCC: .4byte 0x03005e00 + .pool thumb_func_end sub_8080EA4 thumb_func_start sub_8080FD0 @@ -260074,7 +250510,7 @@ sub_8080FD0: @ 8080FD0 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _08081054 + ldr r6, =0x020322a4 ldr r3, [r6] adds r0, r3, 0 adds r0, 0x4A @@ -260082,13 +250518,13 @@ sub_8080FD0: @ 8080FD0 movs r1, 0xC0 lsls r1, 5 adds r0, r1 - ldr r1, _08081058 + ldr r1, =0x0000ffff ands r0, r1 adds r1, r3, 0 adds r1, 0x9A ldrb r1, [r1] lsrs r2, r0, 8 - ldr r0, _0808105C + ldr r0, =0x083399e7 adds r1, r0 ldrb r1, [r1] adds r0, r1, 0 @@ -260098,7 +250534,7 @@ sub_8080FD0: @ 8080FD0 adds r0, 0x14 cmp r2, r0 bcs _080810E0 - ldr r2, _08081060 + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r0, r1, r4 lsls r0, 3 @@ -260108,7 +250544,7 @@ sub_8080FD0: @ 8080FD0 adds r5, r1, 0 cmp r0, 0 bne _080810EE - ldr r1, _08081064 + ldr r1, =0x00000123 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 @@ -260116,7 +250552,7 @@ sub_8080FD0: @ 8080FD0 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 - ldr r1, _08081068 + ldr r1, =0x0000028f bl __udivsi3 lsls r0, 24 lsrs r2, r0, 24 @@ -260125,38 +250561,29 @@ sub_8080FD0: @ 8080FD0 adds r0, 0x4C movs r6, 0 ldrsh r1, [r0, r6] - ldr r0, _0808106C + ldr r0, =0x000001f3 cmp r1, r0 bgt _08081088 cmp r2, 0x42 bls _08081078 - ldr r1, _08081070 - ldr r0, _08081074 + ldr r1, =0x03003090 + ldr r0, =0x00004523 strh r0, [r1, 0x24] b _080810B0 .align 2, 0 -_08081054: .4byte 0x020322a4 -_08081058: .4byte 0x0000ffff -_0808105C: .4byte 0x083399e7 -_08081060: .4byte 0x03005e00 -_08081064: .4byte 0x00000123 -_08081068: .4byte 0x0000028f -_0808106C: .4byte 0x000001f3 -_08081070: .4byte 0x03003090 -_08081074: .4byte 0x00004523 + .pool _08081078: - ldr r1, _08081080 - ldr r0, _08081084 + ldr r1, =0x03003090 + ldr r0, =0x00005432 strh r0, [r1, 0x24] b _080810B0 .align 2, 0 -_08081080: .4byte 0x03003090 -_08081084: .4byte 0x00005432 + .pool _08081088: cmp r2, 0x41 bls _08081092 - ldr r1, _080810BC - ldr r0, _080810C0 + ldr r1, =0x03003090 + ldr r0, =0x00004523 strh r0, [r1, 0x24] _08081092: adds r0, r2, 0 @@ -260165,8 +250592,8 @@ _08081092: lsrs r0, 24 cmp r0, 0x18 bhi _080810A4 - ldr r1, _080810BC - ldr r0, _080810C4 + ldr r1, =0x03003090 + ldr r0, =0x00005432 strh r0, [r1, 0x24] _080810A4: cmp r3, 0x9 @@ -260175,29 +250602,25 @@ _080810A4: movs r1, 0x5 bl sub_8080E6C _080810B0: - ldr r0, _080810C8 + ldr r0, =0x03005e00 adds r1, r5, r4 lsls r1, 3 adds r1, r0 movs r0, 0x1 b _080810EC .align 2, 0 -_080810BC: .4byte 0x03003090 -_080810C0: .4byte 0x00004523 -_080810C4: .4byte 0x00005432 -_080810C8: .4byte 0x03005e00 + .pool _080810CC: - ldr r0, _080810D8 - ldr r1, _080810DC + ldr r0, =0x03003090 + ldr r1, =0x00004523 strh r1, [r0, 0x24] movs r0, 0x1 strh r0, [r2, 0x8] b _080810EE .align 2, 0 -_080810D8: .4byte 0x03003090 -_080810DC: .4byte 0x00004523 + .pool _080810E0: - ldr r0, _080810F4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -260210,7 +250633,7 @@ _080810EE: pop {r0} bx r0 .align 2, 0 -_080810F4: .4byte 0x03005e00 + .pool thumb_func_end sub_8080FD0 thumb_func_start sub_80810F8 @@ -260218,7 +250641,7 @@ sub_80810F8: @ 80810F8 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _08081178 + ldr r5, =0x020322a4 ldr r3, [r5] adds r0, r3, 0 adds r0, 0x4A @@ -260226,13 +250649,13 @@ sub_80810F8: @ 80810F8 movs r1, 0xC0 lsls r1, 5 adds r0, r1 - ldr r1, _0808117C + ldr r1, =0x0000ffff ands r0, r1 adds r1, r3, 0 adds r1, 0x9C ldrb r1, [r1] lsrs r2, r0, 8 - ldr r0, _08081180 + ldr r0, =0x083399e7 adds r1, r0 ldrb r1, [r1] adds r0, r1, 0 @@ -260242,7 +250665,7 @@ sub_80810F8: @ 80810F8 adds r0, 0x14 cmp r2, r0 bcs _0808120C - ldr r2, _08081184 + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r0, r1, r4 lsls r0, 3 @@ -260252,7 +250675,7 @@ sub_80810F8: @ 80810F8 adds r6, r1, 0 cmp r0, 0 bne _0808121A - ldr r1, _08081188 + ldr r1, =0x00000123 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 @@ -260260,7 +250683,7 @@ sub_80810F8: @ 80810F8 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 - ldr r1, _0808118C + ldr r1, =0x0000028f bl __udivsi3 lsls r0, 24 lsrs r2, r0, 24 @@ -260268,42 +250691,32 @@ sub_80810F8: @ 80810F8 adds r0, 0x4C movs r3, 0 ldrsh r1, [r0, r3] - ldr r0, _08081190 + ldr r0, =0x000001f3 cmp r1, r0 bgt _080811AC cmp r2, 0x58 bls _0808119C - ldr r1, _08081194 - ldr r0, _08081198 + ldr r1, =0x03003090 + ldr r0, =0x00004523 strh r0, [r1, 0x34] b _080811DE .align 2, 0 -_08081178: .4byte 0x020322a4 -_0808117C: .4byte 0x0000ffff -_08081180: .4byte 0x083399e7 -_08081184: .4byte 0x03005e00 -_08081188: .4byte 0x00000123 -_0808118C: .4byte 0x0000028f -_08081190: .4byte 0x000001f3 -_08081194: .4byte 0x03003090 -_08081198: .4byte 0x00004523 + .pool _0808119C: - ldr r1, _080811A4 - ldr r0, _080811A8 + ldr r1, =0x03003090 + ldr r0, =0x00005432 strh r0, [r1, 0x34] b _080811DE .align 2, 0 -_080811A4: .4byte 0x03003090 -_080811A8: .4byte 0x00005432 + .pool _080811AC: cmp r2, 0x3C bls _080811C0 - ldr r1, _080811B8 - ldr r0, _080811BC + ldr r1, =0x03003090 + ldr r0, =0x00004523 b _080811D0 .align 2, 0 -_080811B8: .4byte 0x03003090 -_080811BC: .4byte 0x00004523 + .pool _080811C0: adds r0, r2, 0 subs r0, 0x38 @@ -260311,8 +250724,8 @@ _080811C0: lsrs r0, 24 cmp r0, 0x4 bhi _080811D2 - ldr r1, _080811EC - ldr r0, _080811F0 + ldr r1, =0x03003090 + ldr r0, =0x00005432 _080811D0: strh r0, [r1, 0x34] _080811D2: @@ -260322,28 +250735,25 @@ _080811D2: movs r1, 0x5 bl sub_8080E6C _080811DE: - ldr r0, _080811F4 + ldr r0, =0x03005e00 adds r1, r6, r4 lsls r1, 3 adds r1, r0 movs r0, 0x1 b _08081218 .align 2, 0 -_080811EC: .4byte 0x03003090 -_080811F0: .4byte 0x00005432 -_080811F4: .4byte 0x03005e00 + .pool _080811F8: - ldr r0, _08081204 - ldr r1, _08081208 + ldr r0, =0x03003090 + ldr r1, =0x00004523 strh r1, [r0, 0x34] movs r0, 0x1 strh r0, [r2, 0x8] b _0808121A .align 2, 0 -_08081204: .4byte 0x03003090 -_08081208: .4byte 0x00004523 + .pool _0808120C: - ldr r0, _08081220 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -260356,7 +250766,7 @@ _0808121A: pop {r0} bx r0 .align 2, 0 -_08081220: .4byte 0x03005e00 + .pool thumb_func_end sub_80810F8 thumb_func_start sub_8081224 @@ -260364,7 +250774,7 @@ sub_8081224: @ 8081224 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08081260 + ldr r0, =0x020322a4 ldr r0, [r0] adds r0, 0x4A ldrh r0, [r0] @@ -260374,7 +250784,7 @@ sub_8081224: @ 8081224 lsrs r0, 24 cmp r0, 0x2 bne _08081270 - ldr r0, _08081264 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -260383,19 +250793,16 @@ sub_8081224: @ 8081224 ldrsh r0, [r2, r1] cmp r0, 0 bne _0808127E - ldr r0, _08081268 - ldr r1, _0808126C + ldr r0, =0x03003090 + ldr r1, =0x00004523 strh r1, [r0, 0x14] movs r0, 0x1 strh r0, [r2, 0x8] b _0808127E .align 2, 0 -_08081260: .4byte 0x020322a4 -_08081264: .4byte 0x03005e00 -_08081268: .4byte 0x03003090 -_0808126C: .4byte 0x00004523 + .pool _08081270: - ldr r0, _08081284 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -260407,7 +250814,7 @@ _0808127E: pop {r0} bx r0 .align 2, 0 -_08081284: .4byte 0x03005e00 + .pool thumb_func_end sub_8081224 thumb_func_start sub_8081288 @@ -260419,12 +250826,12 @@ sub_8081288: @ 8081288 lsrs r7, r0, 16 mov r8, r7 lsls r1, 24 - ldr r0, _080812FC - ldr r4, _08081300 + ldr r0, =0x08339b40 + ldr r4, =0x083399c8 lsrs r1, 23 adds r2, r1, r4 ldrb r6, [r2] - ldr r5, _08081304 + ldr r5, =0x083399c0 adds r2, r1, r5 movs r3, 0 ldrsb r3, [r2, r3] @@ -260449,38 +250856,33 @@ sub_8081288: @ 8081288 lsls r0, 24 lsrs r1, r0, 24 adds r2, r1, 0 - ldr r0, _08081308 + ldr r0, =0x00004523 cmp r7, r0 bne _08081314 lsls r4, r1, 4 adds r4, r1 lsls r4, 2 - ldr r5, _0808130C + ldr r5, =0x02020630 adds r0, r4, r5 movs r1, 0x2 bl obj_anim_image_start adds r5, 0x1C adds r4, r5 - ldr r0, _08081310 + ldr r0, =sub_8082F9C + 1 str r0, [r4] movs r0, 0x28 bl audio_play b _08081358 .align 2, 0 -_080812FC: .4byte 0x08339b40 -_08081300: .4byte 0x083399c8 -_08081304: .4byte 0x083399c0 -_08081308: .4byte 0x00004523 -_0808130C: .4byte 0x02020630 -_08081310: .4byte sub_8082F9C + 1 + .pool _08081314: - ldr r0, _08081334 + ldr r0, =0x00005432 cmp r7, r0 bne _0808133C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08081338 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 bl obj_anim_image_start @@ -260488,16 +250890,15 @@ _08081314: bl audio_play b _08081358 .align 2, 0 -_08081334: .4byte 0x00005432 -_08081338: .4byte 0x02020630 + .pool _0808133C: - ldr r0, _08081368 + ldr r0, =0x00002345 cmp r8, r0 bne _08081358 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r1, _0808136C + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 bl obj_anim_image_start @@ -260511,8 +250912,7 @@ _08081358: pop {r0} bx r0 .align 2, 0 -_08081368: .4byte 0x00002345 -_0808136C: .4byte 0x02020630 + .pool thumb_func_end sub_8081288 thumb_func_start sub_8081370 @@ -260522,37 +250922,36 @@ sub_8081370: @ 8081370 lsrs r4, r0, 16 adds r5, r4, 0 bl sub_807F738 - ldr r0, _08081390 + ldr r0, =0x00004523 cmp r4, r0 beq _080813A4 cmp r4, r0 bgt _08081398 - ldr r0, _08081394 + ldr r0, =0x00002345 cmp r4, r0 beq _08081474 b _080814A0 .align 2, 0 -_08081390: .4byte 0x00004523 -_08081394: .4byte 0x00002345 + .pool _08081398: - ldr r0, _080813A0 + ldr r0, =0x00005432 cmp r5, r0 beq _0808143C b _080814A0 .align 2, 0 -_080813A0: .4byte 0x00005432 + .pool _080813A4: - ldr r7, _080813D4 + ldr r7, =0x020322a4 ldr r4, [r7] adds r5, r4, 0 adds r5, 0x4C ldrh r6, [r5] movs r0, 0 ldrsh r1, [r5, r0] - ldr r0, _080813D8 + ldr r0, =0x000005db cmp r1, r0 bgt _080813E0 - ldr r1, _080813DC + ldr r1, =0x08339cc3 adds r0, r4, 0 adds r0, 0x7C ldrb r0, [r0] @@ -260565,11 +250964,9 @@ _080813A4: strh r0, [r5] b _080814A0 .align 2, 0 -_080813D4: .4byte 0x020322a4 -_080813D8: .4byte 0x000005db -_080813DC: .4byte 0x08339cc3 + .pool _080813E0: - ldr r1, _08081438 + ldr r1, =0x08339cc3 adds r0, r4, 0 adds r0, 0x7C ldrb r0, [r0] @@ -260609,19 +251006,19 @@ _080813E0: bl sub_80832BC b _080814A0 .align 2, 0 -_08081438: .4byte 0x08339cc3 + .pool _0808143C: - ldr r0, _08081468 + ldr r0, =0x020322a4 ldr r2, [r0] adds r4, r2, 0 adds r4, 0x4C ldrh r5, [r4] movs r0, 0 ldrsh r1, [r4, r0] - ldr r0, _0808146C + ldr r0, =0x000005db cmp r1, r0 bgt _080814A0 - ldr r1, _08081470 + ldr r1, =0x08339cc3 adds r0, r2, 0 adds r0, 0x7C ldrb r0, [r0] @@ -260633,15 +251030,13 @@ _0808143C: adds r0, r5, r0 b _0808149E .align 2, 0 -_08081468: .4byte 0x020322a4 -_0808146C: .4byte 0x000005db -_08081470: .4byte 0x08339cc3 + .pool _08081474: - ldr r0, _080814A8 + ldr r0, =0x020322a4 ldr r0, [r0] adds r4, r0, 0 adds r4, 0x4C - ldr r1, _080814AC + ldr r1, =0x08339cc3 adds r0, 0x7C ldrb r0, [r0] adds r0, r1 @@ -260664,8 +251059,7 @@ _080814A0: pop {r0} bx r0 .align 2, 0 -_080814A8: .4byte 0x020322a4 -_080814AC: .4byte 0x08339cc3 + .pool thumb_func_end sub_8081370 thumb_func_start sub_80814B0 @@ -260677,11 +251071,11 @@ sub_80814B0: @ 80814B0 lsrs r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _080814DC + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080814E4 - ldr r0, _080814E0 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080814E4 @@ -260693,8 +251087,7 @@ sub_80814B0: @ 80814B0 movs r0, 0x1 b _080814EE .align 2, 0 -_080814DC: .4byte 0x03003124 -_080814E0: .4byte 0x030030fc + .pool _080814E4: cmp r3, r1 bne _080814EC @@ -260715,23 +251108,23 @@ sub_80814F4: @ 80814F4 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _080815D4 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 beq _0808153C - ldr r3, _080815D8 + ldr r3, =0x03003110 ldrh r0, [r3, 0x4] - ldr r2, _080815DC + ldr r2, =0x03003090 cmp r0, 0 beq _0808151C movs r1, 0 strh r0, [r2, 0x4] - ldr r0, _080815E0 + ldr r0, =0x00004444 strh r0, [r2] strh r1, [r3, 0x4] _0808151C: - ldr r0, _080815DC - ldr r3, _080815E0 + ldr r0, =0x03003090 + ldr r3, =0x00004444 adds r1, r2, 0 adds r1, 0x10 adds r2, r0, 0 @@ -260750,7 +251143,7 @@ _08081532: bge _0808152A _0808153C: movs r7, 0 - ldr r1, _080815E4 + ldr r1, =0x020322a4 ldr r0, [r1] adds r0, 0x7C ldrb r0, [r0] @@ -260758,7 +251151,7 @@ _0808153C: blt _0808154C b _080816F6 _0808154C: - ldr r0, _080815DC + ldr r0, =0x03003090 adds r2, r0, 0 adds r2, 0x20 str r2, [sp] @@ -260767,12 +251160,12 @@ _0808154C: movs r2, 0 str r2, [sp, 0x4] mov r8, r0 - ldr r0, _080815E8 + ldr r0, =0x00005432 mov r10, r0 _08081562: mov r1, r8 ldrh r0, [r1] - ldr r1, _080815E0 + ldr r1, =0x00004444 movs r2, 0x88 lsls r2, 7 bl sub_80814B0 @@ -260780,7 +251173,7 @@ _08081562: bne _08081576 b _080816D2 _08081576: - ldr r6, _080815E4 + ldr r6, =0x020322a4 ldr r0, [r6] adds r0, 0x96 ldr r2, [sp, 0x4] @@ -260788,7 +251181,7 @@ _08081576: ldrh r5, [r0] mov r0, r8 ldrh r4, [r0, 0x4] - ldr r1, _080815EC + ldr r1, =0x00004523 cmp r4, r1 bne _080815F4 adds r0, r1, 0 @@ -260806,7 +251199,7 @@ _08081576: adds r1, r0 strh r1, [r4] lsls r1, 16 - ldr r0, _080815F0 + ldr r0, =0x03e70000 cmp r1, r0 bls _080815BA movs r0, 0xFA @@ -260815,7 +251208,7 @@ _08081576: _080815BA: lsls r1, r5, 24 lsrs r1, 24 - ldr r0, _080815EC + ldr r0, =0x00004523 bl sub_8081288 ldr r1, [r6] movs r2, 0x92 @@ -260826,14 +251219,7 @@ _080815BA: adds r0, 0x1 b _0808165E .align 2, 0 -_080815D4: .4byte 0x020375e0 -_080815D8: .4byte 0x03003110 -_080815DC: .4byte 0x03003090 -_080815E0: .4byte 0x00004444 -_080815E4: .4byte 0x020322a4 -_080815E8: .4byte 0x00005432 -_080815EC: .4byte 0x00004523 -_080815F0: .4byte 0x03e70000 + .pool _080815F4: cmp r4, r10 bne _08081632 @@ -260864,7 +251250,7 @@ _080815F4: adds r0, 0x1 b _0808165E _08081632: - ldr r0, _080816AC + ldr r0, =0x00002345 cmp r4, r0 bne _0808166A lsls r1, r5, 24 @@ -260880,7 +251266,7 @@ _08081632: mov r2, r9 adds r1, r0, r2 ldrh r2, [r1] - ldr r0, _080816B0 + ldr r0, =0x000003e6 cmp r2, r0 bhi _08081660 adds r0, r2, 0x1 @@ -260889,29 +251275,29 @@ _0808165E: _08081660: mov r0, r8 ldrh r1, [r0, 0x4] - ldr r0, _080816AC + ldr r0, =0x00002345 cmp r1, r0 beq _08081678 _0808166A: ldr r1, [sp] ldrh r0, [r1] - ldr r2, _080816B4 + ldr r2, =0x00004523 cmp r0, r2 beq _08081678 cmp r0, r10 bne _080816D2 _08081678: - ldr r0, _080816B8 + ldr r0, =0x020322a4 ldr r0, [r0] adds r2, r0, 0 adds r2, 0x4C movs r0, 0 ldrsh r1, [r2, r0] - ldr r0, _080816BC + ldr r0, =0x000005dc cmp r1, r0 ble _080816C8 adds r0, r1, 0 - ldr r2, _080816C0 + ldr r2, =0xfffffd12 adds r0, r2 movs r1, 0x14 bl __divsi3 @@ -260921,19 +251307,13 @@ _08081678: adds r1, r0 lsls r1, 16 lsrs r1, 16 - ldr r0, _080816C4 + ldr r0, =0x03007420 bl MPlayTempoControl b _080816D2 .align 2, 0 -_080816AC: .4byte 0x00002345 -_080816B0: .4byte 0x000003e6 -_080816B4: .4byte 0x00004523 -_080816B8: .4byte 0x020322a4 -_080816BC: .4byte 0x000005dc -_080816C0: .4byte 0xfffffd12 -_080816C4: .4byte 0x03007420 + .pool _080816C8: - ldr r0, _08081734 + ldr r0, =0x03007420 movs r1, 0x80 lsls r1, 1 bl MPlayTempoControl @@ -260949,7 +251329,7 @@ _080816D2: movs r1, 0x10 add r8, r1 adds r7, 0x1 - ldr r0, _08081738 + ldr r0, =0x020322a4 ldr r0, [r0] adds r0, 0x7C ldrb r0, [r0] @@ -260957,19 +251337,19 @@ _080816D2: bge _080816F6 b _08081562 _080816F6: - ldr r0, _0808173C + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 beq _08081722 movs r7, 0 - ldr r3, _08081738 + ldr r3, =0x020322a4 ldr r0, [r3] adds r0, 0x7C ldrb r0, [r0] cmp r7, r0 bge _08081722 movs r2, 0 - ldr r1, _08081740 + ldr r1, =0x03003090 _08081710: strh r2, [r1] strh r2, [r1, 0x4] @@ -260990,10 +251370,7 @@ _08081722: pop {r0} bx r0 .align 2, 0 -_08081734: .4byte 0x03007420 -_08081738: .4byte 0x020322a4 -_0808173C: .4byte 0x020375e0 -_08081740: .4byte 0x03003090 + .pool thumb_func_end sub_80814F4 thumb_func_start sub_8081744 @@ -261001,7 +251378,7 @@ sub_8081744: @ 8081744 push {r4-r6,lr} movs r4, 0 movs r6, 0 - ldr r0, _08081794 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0808175A @@ -261009,7 +251386,7 @@ sub_8081744: @ 8081744 lsls r0, 24 lsrs r6, r0, 24 _0808175A: - ldr r3, _08081798 + ldr r3, =0x020322a4 ldr r1, [r3] lsls r2, r6, 1 adds r0, r1, 0 @@ -261020,32 +251397,28 @@ _0808175A: ldrb r0, [r1] cmp r0, 0 bne _0808182C - ldr r0, _0808179C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x2 bne _080817A8 - ldr r2, _080817A0 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080817B6 ldrh r2, [r2, 0x28] - ldr r1, _080817A4 + ldr r1, =0x00000201 adds r0, r1, 0 ands r0, r2 cmp r0, r1 beq _080817B6 b _080817BA .align 2, 0 -_08081794: .4byte 0x03003124 -_08081798: .4byte 0x020322a4 -_0808179C: .4byte 0x03005d90 -_080817A0: .4byte 0x030022c0 -_080817A4: .4byte 0x00000201 + .pool _080817A8: - ldr r0, _080817FC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -261056,7 +251429,7 @@ _080817B6: cmp r4, 0 beq _0808182C _080817BA: - ldr r4, _08081800 + ldr r4, =0x020322a4 ldr r1, [r4] lsls r2, r5, 1 adds r0, r1, 0 @@ -261069,7 +251442,7 @@ _080817BA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08081804 + ldr r1, =0x02020630 adds r0, r1 adds r1, r5, 0x4 lsls r1, 24 @@ -261084,27 +251457,22 @@ _080817BA: lsrs r0, 24 cmp r0, 0x2 bne _08081810 - ldr r1, _08081808 - ldr r0, _0808180C + ldr r1, =0x03003110 + ldr r0, =0x00004523 b _08081828 .align 2, 0 -_080817FC: .4byte 0x030022c0 -_08081800: .4byte 0x020322a4 -_08081804: .4byte 0x02020630 -_08081808: .4byte 0x03003110 -_0808180C: .4byte 0x00004523 + .pool _08081810: cmp r0, 0x1 bne _08081824 - ldr r1, _0808181C - ldr r0, _08081820 + ldr r1, =0x03003110 + ldr r0, =0x00005432 b _08081828 .align 2, 0 -_0808181C: .4byte 0x03003110 -_08081820: .4byte 0x00005432 + .pool _08081824: - ldr r1, _08081884 - ldr r0, _08081888 + ldr r1, =0x03003110 + ldr r0, =0x00002345 _08081828: strh r0, [r1, 0x4] adds r3, r4, 0 @@ -261134,11 +251502,11 @@ _08081852: movs r1, 0 strb r1, [r0] _0808185A: - ldr r0, _0808188C + ldr r0, =0x020322d5 ldrb r0, [r0] cmp r0, 0 beq _0808187E - ldr r0, _08081890 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 lsls r0, 2 @@ -261146,7 +251514,7 @@ _0808185A: cmp r0, 0 beq _0808187E ldr r0, [r3] - ldr r1, _08081894 + ldr r1, =0x00000123 adds r2, r0, r1 ldrb r0, [r2] movs r1, 0x1 @@ -261157,24 +251525,20 @@ _0808187E: pop {r0} bx r0 .align 2, 0 -_08081884: .4byte 0x03003110 -_08081888: .4byte 0x00002345 -_0808188C: .4byte 0x020322d5 -_08081890: .4byte 0x030022c0 -_08081894: .4byte 0x00000123 + .pool thumb_func_end sub_8081744 thumb_func_start sub_8081898 sub_8081898: @ 8081898 push {r4-r6,lr} bl sub_8082D28 - ldr r4, _08081950 + ldr r4, =0x020322a4 ldr r0, [r4] movs r1, 0x82 lsls r1, 1 adds r2, r0, r1 ldr r1, [r2] - ldr r0, _08081954 + ldr r0, =0x00057e03 cmp r1, r0 bhi _080818B4 adds r0, r1, 0x1 @@ -261214,17 +251578,17 @@ _080818B4: lsls r1, 1 adds r0, r2, r1 ldrh r1, [r0] - ldr r0, _08081958 + ldr r0, =0x000003e7 cmp r1, r0 bls _0808191A adds r0, r2, r5 strh r6, [r0] movs r0, 0x1 strb r0, [r3] - ldr r0, _0808195C + ldr r0, =sub_8081FC8 + 1 bl set_callback2 _0808191A: - ldr r0, _08081950 + ldr r0, =0x020322a4 ldr r1, [r0] movs r2, 0x8E lsls r2, 1 @@ -261246,10 +251610,7 @@ _0808191A: pop {r0} bx r0 .align 2, 0 -_08081950: .4byte 0x020322a4 -_08081954: .4byte 0x00057e03 -_08081958: .4byte 0x000003e7 -_0808195C: .4byte sub_8081FC8 + 1 + .pool thumb_func_end sub_8081898 thumb_func_start nullsub_31 @@ -261276,14 +251637,14 @@ help_system_is_not_first_time: @ 8081964 cmp r0, 0 bne _080819B0 ldr r0, [r4, 0x8] - ldr r2, _080819A8 + ldr r2, =0xffffff00 ands r0, r2 ldr r1, [r5, 0x8] ands r1, r2 cmp r0, r1 bne _080819B0 ldr r0, [r4, 0xC] - ldr r2, _080819AC + ldr r2, =0x00ffffff ands r0, r2 ldr r1, [r5, 0xC] ands r1, r2 @@ -261293,8 +251654,7 @@ _080819A2: movs r0, 0x1 b _080819B2 .align 2, 0 -_080819A8: .4byte 0xffffff00 -_080819AC: .4byte 0x00ffffff + .pool _080819B0: movs r0, 0 _080819B2: @@ -261480,7 +251840,7 @@ _08081AEA: cmp r2, 0x2 bne _08081B9C movs r4, 0 - ldr r5, _08081B34 + ldr r5, =0x03000df8 mov r1, sp adds r2, r5, 0 _08081AF6: @@ -261516,7 +251876,7 @@ _08081B02: lsls r0, r2, 16 b _08081B62 .align 2, 0 -_08081B34: .4byte 0x03000df8 + .pool _08081B38: cmp r0, 0x1 bne _08081B40 @@ -261597,40 +251957,40 @@ _08081B9E: thumb_func_start sub_8081BB0 sub_8081BB0: @ 8081BB0 - ldr r1, _08081BB8 + ldr r1, =0x03000e04 strh r0, [r1] bx lr .align 2, 0 -_08081BB8: .4byte 0x03000e04 + .pool thumb_func_end sub_8081BB0 thumb_func_start sub_8081BBC sub_8081BBC: @ 8081BBC - ldr r0, _08081BC4 + ldr r0, =0x03000e04 movs r1, 0 ldrsh r0, [r0, r1] bx lr .align 2, 0 -_08081BC4: .4byte 0x03000e04 + .pool thumb_func_end sub_8081BBC thumb_func_start sub_8081BC8 sub_8081BC8: @ 8081BC8 - ldr r1, _08081BD0 + ldr r1, =0x03000e06 strh r0, [r1] bx lr .align 2, 0 -_08081BD0: .4byte 0x03000e06 + .pool thumb_func_end sub_8081BC8 thumb_func_start sub_8081BD4 sub_8081BD4: @ 8081BD4 - ldr r0, _08081BDC + ldr r0, =0x03000e06 movs r1, 0 ldrsh r0, [r0, r1] bx lr .align 2, 0 -_08081BDC: .4byte 0x03000e06 + .pool thumb_func_end sub_8081BD4 thumb_func_start sub_8081BE0 @@ -261651,7 +252011,7 @@ sub_8081BE0: @ 8081BE0 lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x8] - ldr r7, _08081C9C + ldr r7, =0x03000de8 adds r2, r7, 0 movs r1, 0 adds r0, r7, 0 @@ -261664,7 +252024,7 @@ _08081C0A: movs r6, 0 cmp r6, r9 bge _08081C40 - ldr r0, _08081C9C + ldr r0, =0x03000de8 mov r12, r0 ldr r5, [sp] adds r5, 0x9 @@ -261724,7 +252084,7 @@ _08081C76: lsrs r0, 24 mov r10, r0 movs r4, 0 - ldr r1, _08081C9C + ldr r1, =0x03000de8 movs r6, 0x4 _08081C8A: ldrh r2, [r1] @@ -261737,7 +252097,7 @@ _08081C8A: strh r4, [r1] b _08081CA4 .align 2, 0 -_08081C9C: .4byte 0x03000de8 + .pool _08081CA0: subs r0, r2, r3 strh r0, [r1] @@ -261746,8 +252106,8 @@ _08081CA4: subs r6, 0x1 cmp r6, 0 bge _08081C8A - ldr r1, _08081D84 - ldr r2, _08081D88 + ldr r1, =0x03000de8 + ldr r2, =0x020322a8 movs r6, 0x4 _08081CB2: movs r3, 0 @@ -261757,14 +252117,14 @@ _08081CB2: subs r6, 0x1 cmp r6, 0 bge _08081CB2 - ldr r1, _08081D8C + ldr r1, =0x0000014d ldr r0, [sp, 0x8] bl __udivsi3 lsls r0, 16 lsrs r0, 16 adds r3, r0, 0 adds r3, 0x64 - ldr r4, _08081D90 + ldr r4, =0x020322d0 str r3, [r4] movs r6, 0x4 _08081CD6: @@ -261793,8 +252153,8 @@ _08081D02: subs r6, 0x1 cmp r6, 0 bge _08081CD6 - ldr r1, _08081D84 - ldr r2, _08081D94 + ldr r1, =0x03000de8 + ldr r2, =0x020322bc movs r6, 0x4 _08081D12: movs r3, 0 @@ -261804,7 +252164,7 @@ _08081D12: subs r6, 0x1 cmp r6, 0 bge _08081D12 - ldr r4, _08081D84 + ldr r4, =0x03000de8 ldr r0, [sp] adds r1, r4, 0 mov r2, r9 @@ -261837,7 +252197,7 @@ _08081D4C: lsls r0, 16 lsrs r3, r0, 16 movs r6, 0 - ldr r0, _08081D98 + ldr r0, =0x08339cc8 adds r0, r3, r0 ldrb r0, [r0] adds r1, r4, 0 @@ -261852,12 +252212,7 @@ _08081D74: strh r3, [r1] b _08081D9E .align 2, 0 -_08081D84: .4byte 0x03000de8 -_08081D88: .4byte 0x020322a8 -_08081D8C: .4byte 0x0000014d -_08081D90: .4byte 0x020322d0 -_08081D94: .4byte 0x020322bc -_08081D98: .4byte 0x08339cc8 + .pool _08081D9C: strh r2, [r1] _08081D9E: @@ -261866,7 +252221,7 @@ _08081D9E: cmp r6, 0x4 ble _08081D74 _08081DA6: - ldr r7, _08081E00 + ldr r7, =0x03000de8 movs r2, 0xFF adds r1, r7, 0 movs r6, 0x5 @@ -261914,7 +252269,7 @@ _08081DDE: pop {r0} bx r0 .align 2, 0 -_08081E00: .4byte 0x03000de8 + .pool thumb_func_end sub_8081BE0 thumb_func_start sub_8081E04 @@ -261937,7 +252292,7 @@ sub_8081E04: @ 8081E04 thumb_func_start sub_8081E20 sub_8081E20: @ 8081E20 push {r4-r6,lr} - ldr r0, _08081E40 + ldr r0, =0x020322a4 ldr r0, [r0] movs r2, 0x82 lsls r2, 1 @@ -261946,29 +252301,27 @@ sub_8081E20: @ 8081E20 adds r0, 0x4E ldrh r4, [r0] movs r2, 0 - ldr r5, _08081E44 + ldr r5, =0x00000383 cmp r1, r5 bhi _08081E48 movs r2, 0x5 b _08081E9A .align 2, 0 -_08081E40: .4byte 0x020322a4 -_08081E44: .4byte 0x00000383 + .pool _08081E48: - ldr r3, _08081E5C + ldr r3, =0xfffffc7c adds r0, r1, r3 lsls r0, 16 lsrs r0, 16 - ldr r3, _08081E60 + ldr r3, =0x00000257 cmp r0, r3 bhi _08081E64 movs r2, 0x4 b _08081E9A .align 2, 0 -_08081E5C: .4byte 0xfffffc7c -_08081E60: .4byte 0x00000257 + .pool _08081E64: - ldr r6, _08081E74 + ldr r6, =0xfffffa24 adds r0, r1, r6 lsls r0, 16 lsrs r0, 16 @@ -261977,9 +252330,9 @@ _08081E64: movs r2, 0x3 b _08081E9A .align 2, 0 -_08081E74: .4byte 0xfffffa24 + .pool _08081E78: - ldr r3, _08081E88 + ldr r3, =0xfffff7cc adds r0, r1, r3 lsls r0, 16 lsrs r0, 16 @@ -261988,12 +252341,12 @@ _08081E78: movs r2, 0x2 b _08081E9A .align 2, 0 -_08081E88: .4byte 0xfffff7cc + .pool _08081E8C: - ldr r6, _08081EB8 + ldr r6, =0xfffff31c adds r0, r1, r6 lsls r0, 16 - ldr r1, _08081EBC + ldr r1, =0x012b0000 cmp r0, r1 bhi _08081E9A movs r2, 0x1 @@ -262010,12 +252363,10 @@ _08081E9A: lsrs r0, 16 cmp r0, 0x31 bhi _08081EC4 - ldr r2, _08081EC0 + ldr r2, =0x0000ffff b _08081F7C .align 2, 0 -_08081EB8: .4byte 0xfffff31c -_08081EBC: .4byte 0x012b0000 -_08081EC0: .4byte 0x0000ffff + .pool _08081EC4: adds r0, r4, 0 subs r0, 0x64 @@ -262023,10 +252374,10 @@ _08081EC4: lsrs r0, 16 cmp r0, 0x31 bhi _08081ED8 - ldr r2, _08081ED4 + ldr r2, =0x0000fffe b _08081F7C .align 2, 0 -_08081ED4: .4byte 0x0000fffe + .pool _08081ED8: adds r0, r4, 0 subs r0, 0x96 @@ -262034,10 +252385,10 @@ _08081ED8: lsrs r0, 16 cmp r0, 0x31 bhi _08081EEC - ldr r2, _08081EE8 + ldr r2, =0x0000fffd b _08081F7C .align 2, 0 -_08081EE8: .4byte 0x0000fffd + .pool _08081EEC: adds r0, r4, 0 subs r0, 0xC8 @@ -262045,10 +252396,10 @@ _08081EEC: lsrs r0, 16 cmp r0, 0x31 bhi _08081F00 - ldr r2, _08081EFC + ldr r2, =0x0000fffc b _08081F7C .align 2, 0 -_08081EFC: .4byte 0x0000fffc + .pool _08081F00: adds r0, r4, 0 subs r0, 0xFA @@ -262056,63 +252407,59 @@ _08081F00: lsrs r0, 16 cmp r0, 0x31 bhi _08081F14 - ldr r2, _08081F10 + ldr r2, =0x0000fffb b _08081F7C .align 2, 0 -_08081F10: .4byte 0x0000fffb + .pool _08081F14: - ldr r1, _08081F24 + ldr r1, =0xfffffea2 adds r0, r4, r1 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 bhi _08081F2C - ldr r2, _08081F28 + ldr r2, =0x0000fffa b _08081F7C .align 2, 0 -_08081F24: .4byte 0xfffffea2 -_08081F28: .4byte 0x0000fffa + .pool _08081F2C: - ldr r3, _08081F3C + ldr r3, =0xfffffe70 adds r0, r4, r3 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 bhi _08081F44 - ldr r2, _08081F40 + ldr r2, =0x0000fff9 b _08081F7C .align 2, 0 -_08081F3C: .4byte 0xfffffe70 -_08081F40: .4byte 0x0000fff9 + .pool _08081F44: - ldr r6, _08081F54 + ldr r6, =0xfffffe0c adds r0, r4, r6 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 bhi _08081F5C - ldr r2, _08081F58 + ldr r2, =0x0000fff8 b _08081F7C .align 2, 0 -_08081F54: .4byte 0xfffffe0c -_08081F58: .4byte 0x0000fff8 + .pool _08081F5C: - ldr r1, _08081F6C + ldr r1, =0xfffffdda adds r0, r4, r1 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 bhi _08081F74 - ldr r2, _08081F70 + ldr r2, =0x0000fff7 b _08081F7C .align 2, 0 -_08081F6C: .4byte 0xfffffdda -_08081F70: .4byte 0x0000fff7 + .pool _08081F74: - ldr r0, _08081F8C + ldr r0, =0x00000257 cmp r4, r0 bls _08081F7C - ldr r2, _08081F90 + ldr r2, =0x0000fff6 _08081F7C: lsls r0, r2, 16 asrs r0, 16 @@ -262121,19 +252468,18 @@ _08081F7C: pop {r0} bx r0 .align 2, 0 -_08081F8C: .4byte 0x00000257 -_08081F90: .4byte 0x0000fff6 + .pool thumb_func_end sub_8081E20 thumb_func_start sub_8081F94 sub_8081F94: @ 8081F94 push {lr} adds r1, r0, 0 - ldr r0, _08081FB0 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08081FB8 - ldr r0, _08081FB4 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08081FB8 @@ -262141,17 +252487,16 @@ sub_8081F94: @ 8081F94 lsls r2, 6 b _08081FBA .align 2, 0 -_08081FB0: .4byte 0x03003124 -_08081FB4: .4byte 0x030030fc + .pool _08081FB8: - ldr r2, _08081FC4 + ldr r2, =0x00002fff _08081FBA: adds r0, r2, 0 strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_08081FC4: .4byte 0x00002fff + .pool thumb_func_end sub_8081F94 thumb_func_start sub_8081FC8 @@ -262159,7 +252504,7 @@ sub_8081FC8: @ 8081FC8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _08081FFC + ldr r4, =0x020322a4 ldr r0, [r4] adds r0, 0x63 ldrb r0, [r0] @@ -262177,13 +252522,12 @@ _08081FDE: b _0808249E _08081FF0: lsls r0, 2 - ldr r1, _08082000 + ldr r1, =_08082004 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08081FFC: .4byte 0x020322a4 -_08082000: .4byte _08082004 + .pool .align 2, 0 _08082004: .4byte _08082038 @@ -262200,16 +252544,16 @@ _08082004: .4byte _08082430 .4byte _0808246C _08082038: - ldr r0, _08082048 + ldr r0, =0x03007420 movs r1, 0x80 lsls r1, 1 bl MPlayTempoControl movs r4, 0 b _08082064 .align 2, 0 -_08082048: .4byte 0x03007420 + .pool _0808204C: - ldr r0, _08082070 + ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0x90 lsls r1, 1 @@ -262221,16 +252565,15 @@ _0808204C: lsls r0, 24 lsrs r4, r0, 24 _08082064: - ldr r0, _08082074 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r4, r0 bcc _0808204C b _08082458 .align 2, 0 -_08082070: .4byte 0x020322a4 -_08082074: .4byte 0x020375e0 + .pool _08082078: - ldr r4, _080820A8 + ldr r4, =0x020322a4 ldr r1, [r4] adds r1, 0x4C ldrh r0, [r1] @@ -262245,7 +252588,7 @@ _08082078: adds r1, 0x4C movs r0, 0 strh r0, [r1] - ldr r0, _080820AC + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080820B0 @@ -262254,26 +252597,24 @@ _08082078: adds r0, 0x1 b _080820B6 .align 2, 0 -_080820A8: .4byte 0x020322a4 -_080820AC: .4byte 0x03003124 + .pool _080820B0: adds r1, r2, 0 adds r1, 0x63 movs r0, 0x5 _080820B6: strb r0, [r1] - ldr r0, _080820CC + ldr r0, =0x020322a4 ldr r1, [r0] movs r0, 0 strb r0, [r1] - ldr r0, _080820D0 + ldr r0, =0x03007630 bl MPlayStop_rev01 _080820C6: bl sub_807F738 b _0808249E .align 2, 0 -_080820CC: .4byte 0x020322a4 -_080820D0: .4byte 0x03007630 + .pool _080820D4: bl link_get_multiplayer_id lsls r0, 24 @@ -262287,15 +252628,15 @@ _080820E0: bne _080820EC b _0808249E _080820EC: - ldr r0, _08082178 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _0808218C - ldr r0, _0808217C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0808218C - ldr r3, _08082180 + ldr r3, =0x020322a4 ldr r1, [r3] movs r4, 0x8E lsls r4, 5 @@ -262308,13 +252649,13 @@ _080820EC: adds r0, r1, 0 adds r0, 0x4E ldrh r0, [r0] - ldr r2, _08082184 + ldr r2, =0x000011c4 adds r1, r2 strh r0, [r1] movs r4, 0 mov r8, r3 mov r12, r8 - ldr r7, _08082188 + ldr r7, =0x000011c8 movs r6, 0x92 lsls r6, 1 _08082128: @@ -262360,13 +252701,9 @@ _08082172: ldr r1, [r5] b _0808245C .align 2, 0 -_08082178: .4byte 0x03003124 -_0808217C: .4byte 0x030030fc -_08082180: .4byte 0x020322a4 -_08082184: .4byte 0x000011c4 -_08082188: .4byte 0x000011c8 + .pool _0808218C: - ldr r4, _080821C4 + ldr r4, =0x020322a4 ldr r3, [r4] movs r0, 0xCC lsls r0, 1 @@ -262394,7 +252731,7 @@ _080821BE: ldr r1, [r4] b _0808245C .align 2, 0 -_080821C4: .4byte 0x020322a4 + .pool _080821C8: bl sub_800A550 lsls r0, 24 @@ -262403,21 +252740,21 @@ _080821C8: b _0808249E _080821D4: bl sub_800A5B4 - ldr r5, _08082244 + ldr r5, =0x020322a4 ldr r1, [r5] adds r1, 0x63 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r0, _08082248 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08082254 - ldr r0, _0808224C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08082254 - ldr r2, _08082250 + ldr r2, =0x020223c4 ldr r3, [r5] ldrh r0, [r2, 0x4] adds r1, r3, 0 @@ -262460,13 +252797,10 @@ _08082220: bls _08082216 b _0808249E .align 2, 0 -_08082244: .4byte 0x020322a4 -_08082248: .4byte 0x03003124 -_0808224C: .4byte 0x030030fc -_08082250: .4byte 0x020223c4 + .pool _08082254: - ldr r2, _08082270 - ldr r0, _08082274 + ldr r2, =0x020223c4 + ldr r0, =0x020322a4 ldr r3, [r0] ldrh r0, [r2, 0x4] adds r1, r3, 0 @@ -262479,8 +252813,7 @@ _08082254: str r0, [r1] b _0808249E .align 2, 0 -_08082270: .4byte 0x020223c4 -_08082274: .4byte 0x020322a4 + .pool _08082278: bl sub_8083B08 lsls r0, 24 @@ -262496,7 +252829,7 @@ _08082286: bne _08082292 b _0808249E _08082292: - ldr r0, _080822A4 + ldr r0, =0x03005d98 ldrb r0, [r0] cmp r0, 0 bne _080822A8 @@ -262504,17 +252837,17 @@ _08082292: bl sav12_xor_increment b _08082458 .align 2, 0 -_080822A4: .4byte 0x03005d98 + .pool _080822A8: movs r0, 0x21 bl sav12_xor_increment b _08082458 _080822B0: - ldr r6, _080822D8 + ldr r6, =0x020322a4 ldr r4, [r6] - ldr r5, _080822DC + ldr r5, =0x000011b8 adds r4, r5 - ldr r5, _080822E0 + ldr r5, =0x08339831 bl sav2_get_text_speed adds r2, r0, 0 lsls r2, 24 @@ -262529,16 +252862,14 @@ _080822D2: ldr r1, [r6] b _0808245C .align 2, 0 -_080822D8: .4byte 0x020322a4 -_080822DC: .4byte 0x000011b8 -_080822E0: .4byte 0x08339831 + .pool _080822E4: - ldr r4, _08082300 + ldr r4, =0x020322a4 ldr r0, [r4] adds r0, 0x9E movs r1, 0 strb r1, [r0] - ldr r0, _08082304 + ldr r0, =0x083399b8 movs r1, 0x1 movs r2, 0xD movs r3, 0 @@ -262546,8 +252877,7 @@ _080822E4: ldr r1, [r4] b _0808245C .align 2, 0 -_08082300: .4byte 0x020322a4 -_08082304: .4byte 0x083399b8 + .pool _08082308: bl sub_8198C58 lsls r0, 24 @@ -262566,7 +252896,7 @@ _08082322: beq _08082328 b _0808249E _08082328: - ldr r2, _08082368 + ldr r2, =0x020322a4 ldr r0, [r2] adds r0, 0x9E movs r1, 0x1 @@ -262578,7 +252908,7 @@ _08082328: strb r0, [r1] movs r4, 0 _0808233E: - ldr r0, _08082368 + ldr r0, =0x020322a4 ldr r0, [r0] lsls r1, r4, 1 adds r0, 0x8E @@ -262599,9 +252929,9 @@ _0808235C: bls _0808233E b _0808249E .align 2, 0 -_08082368: .4byte 0x020322a4 + .pool _0808236C: - ldr r1, _080823AC + ldr r1, =0x020322a4 ldr r0, [r1] adds r0, 0x9E strb r2, [r0] @@ -262612,7 +252942,7 @@ _0808236C: strb r0, [r1] movs r4, 0 _08082380: - ldr r0, _080823AC + ldr r0, =0x020322a4 ldr r0, [r0] lsls r1, r4, 1 adds r0, 0x8E @@ -262633,12 +252963,12 @@ _0808239E: bls _08082380 b _0808249E .align 2, 0 -_080823AC: .4byte 0x020322a4 + .pool _080823B0: - ldr r6, _080823E0 + ldr r6, =0x03003110 adds r0, r6, 0 bl sub_8081F94 - ldr r4, _080823E4 + ldr r4, =0x020322a4 ldr r2, [r4] adds r0, r2, 0 adds r0, 0x9E @@ -262654,12 +252984,10 @@ _080823B0: adds r0, 0x70 movs r1, 0x2 strh r1, [r0] - ldr r0, _080823E8 + ldr r0, =0x00009999 b _08082414 .align 2, 0 -_080823E0: .4byte 0x03003110 -_080823E4: .4byte 0x020322a4 -_080823E8: .4byte 0x00009999 + .pool _080823EC: bl sub_8136EF4 lsls r0, 24 @@ -262672,39 +253000,39 @@ _080823EC: adds r0, 0x70 movs r1, 0x3 strh r1, [r0] - ldr r0, _08082408 + ldr r0, =0x0000aaaa b _08082414 .align 2, 0 -_08082408: .4byte 0x0000aaaa + .pool _0808240C: ldr r0, [r4] adds r0, 0x70 strh r5, [r0] - ldr r0, _08082418 + ldr r0, =0x00007779 _08082414: strh r0, [r6, 0x2] b _08082458 .align 2, 0 -_08082418: .4byte 0x00007779 + .pool _0808241C: adds r1, r2, 0 adds r1, 0x70 movs r0, 0x1 strh r0, [r1] - ldr r0, _0808242C + ldr r0, =0x00008888 strh r0, [r6, 0x2] subs r1, 0xD b _0808245E .align 2, 0 -_0808242C: .4byte 0x00008888 + .pool _08082430: - ldr r0, _0808244C + ldr r0, =0x03005d98 ldrb r0, [r0] cmp r0, 0 beq _08082458 - ldr r0, _08082450 + ldr r0, =sub_8082924 + 1 bl set_callback2 - ldr r2, _08082454 + ldr r2, =0x020322a4 ldr r0, [r2] adds r0, 0x63 movs r1, 0 @@ -262712,11 +253040,9 @@ _08082430: ldr r0, [r2] b _0808249C .align 2, 0 -_0808244C: .4byte 0x03005d98 -_08082450: .4byte sub_8082924 + 1 -_08082454: .4byte 0x020322a4 + .pool _08082458: - ldr r0, _08082468 + ldr r0, =0x020322a4 ldr r1, [r0] _0808245C: adds r1, 0x63 @@ -262726,13 +253052,13 @@ _0808245E: strb r0, [r1] b _0808249E .align 2, 0 -_08082468: .4byte 0x020322a4 + .pool _0808246C: - ldr r6, _080824EC + ldr r6, =0x020322a4 ldr r4, [r6] - ldr r0, _080824F0 + ldr r0, =0x000011b8 adds r4, r0 - ldr r5, _080824F4 + ldr r5, =0x0833981a bl sav2_get_text_speed adds r2, r0, 0 lsls r2, 24 @@ -262742,7 +253068,7 @@ _0808246C: bl sub_808417C cmp r0, 0 beq _0808249E - ldr r0, _080824F8 + ldr r0, =sub_8082644 + 1 bl set_callback2 ldr r0, [r6] adds r0, 0x63 @@ -262753,7 +253079,7 @@ _0808249C: strb r1, [r0] _0808249E: bl sub_808330C - ldr r4, _080824EC + ldr r4, =0x020322a4 ldr r0, [r4] adds r0, 0x4C ldrh r0, [r0] @@ -262782,16 +253108,13 @@ _0808249E: pop {r0} bx r0 .align 2, 0 -_080824EC: .4byte 0x020322a4 -_080824F0: .4byte 0x000011b8 -_080824F4: .4byte 0x0833981a -_080824F8: .4byte sub_8082644 + 1 + .pool thumb_func_end sub_8081FC8 thumb_func_start sub_80824FC sub_80824FC: @ 80824FC push {r4,lr} - ldr r1, _0808251C + ldr r1, =0x020322a4 ldr r0, [r1] movs r2, 0xD0 lsls r2, 1 @@ -262803,13 +253126,12 @@ sub_80824FC: @ 80824FC b _0808263C _08082512: lsls r0, 2 - ldr r1, _08082520 + ldr r1, =_08082524 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0808251C: .4byte 0x020322a4 -_08082520: .4byte _08082524 + .pool .align 2, 0 _08082524: .4byte _08082540 @@ -262821,7 +253143,7 @@ _08082524: .4byte _0808261A _08082540: bl sub_800ADF8 - ldr r0, _08082554 + ldr r0, =0x020322a4 ldr r2, [r0] movs r3, 0xD0 lsls r3, 1 @@ -262829,13 +253151,13 @@ _08082540: movs r0, 0x1 b _0808260C .align 2, 0 -_08082554: .4byte 0x020322a4 + .pool _08082558: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _0808263C - ldr r0, _0808257C + ldr r0, =0x020322a4 ldr r1, [r0] movs r2, 0xD0 lsls r2, 1 @@ -262843,20 +253165,19 @@ _08082558: ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r1, _08082580 + ldr r1, =0x03002700 movs r0, 0x1 strb r0, [r1] b _0808263C .align 2, 0 -_0808257C: .4byte 0x020322a4 -_08082580: .4byte 0x03002700 + .pool _08082584: bl sub_8153430 - ldr r0, _08082590 + ldr r0, =0x020322a4 ldr r2, [r0] b _08082602 .align 2, 0 -_08082590: .4byte 0x020322a4 + .pool _08082594: ldr r1, [r4] movs r2, 0x84 @@ -262886,7 +253207,7 @@ _080825BA: lsrs r2, r0, 24 cmp r2, 0 beq _080825E4 - ldr r0, _080825E0 + ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0xD0 lsls r1, 1 @@ -262895,9 +253216,9 @@ _080825BA: str r1, [r0] b _0808263C .align 2, 0 -_080825E0: .4byte 0x020322a4 + .pool _080825E4: - ldr r0, _080825FC + ldr r0, =0x020322a4 ldr r1, [r0] movs r3, 0x84 lsls r3, 1 @@ -262910,7 +253231,7 @@ _080825E4: str r0, [r1] b _0808263C .align 2, 0 -_080825FC: .4byte 0x020322a4 + .pool _08082600: ldr r2, [r4] _08082602: @@ -262937,13 +253258,13 @@ _0808261A: str r0, [r1] cmp r0, 0x5 ble _0808263C - ldr r1, _08082638 + ldr r1, =0x03002700 movs r0, 0 strb r0, [r1] movs r0, 0x1 b _0808263E .align 2, 0 -_08082638: .4byte 0x03002700 + .pool _0808263C: movs r0, 0 _0808263E: @@ -262956,7 +253277,7 @@ _0808263E: sub_8082644: @ 8082644 push {r4-r6,lr} sub sp, 0x4 - ldr r1, _08082664 + ldr r1, =0x020322a4 ldr r0, [r1] adds r0, 0x63 ldrb r0, [r0] @@ -262966,13 +253287,12 @@ sub_8082644: @ 8082644 b _080828DC _08082658: lsls r0, 2 - ldr r1, _08082668 + ldr r1, =_0808266C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08082664: .4byte 0x020322a4 -_08082668: .4byte _0808266C + .pool .align 2, 0 _0808266C: .4byte _080826A0 @@ -262993,12 +253313,12 @@ _080826A0: adds r0, r1, 0 adds r0, 0x64 ldrh r2, [r0] - ldr r0, _080826CC + ldr r0, =0x00002222 cmp r2, r0 bne _080826B0 b _080827A2 _080826B0: - ldr r0, _080826D0 + ldr r0, =0x00001111 cmp r2, r0 beq _080826B8 b _080828DC @@ -263006,7 +253326,7 @@ _080826B8: adds r0, r1, 0 adds r0, 0x6C ldrh r2, [r0] - ldr r0, _080826D4 + ldr r0, =0x00009999 cmp r2, r0 bne _080826D8 adds r1, 0x63 @@ -263014,11 +253334,9 @@ _080826B8: strb r0, [r1] b _080828DC .align 2, 0 -_080826CC: .4byte 0x00002222 -_080826D0: .4byte 0x00001111 -_080826D4: .4byte 0x00009999 + .pool _080826D8: - ldr r0, _080826E8 + ldr r0, =0x0000aaaa cmp r2, r0 bne _080827A2 adds r1, 0x63 @@ -263026,60 +253344,56 @@ _080826D8: strb r0, [r1] b _080828DC .align 2, 0 -_080826E8: .4byte 0x0000aaaa + .pool _080826EC: ldr r0, [r6] adds r0, 0x63 movs r1, 0x3 strb r1, [r0] - ldr r4, _08082710 + ldr r4, =0x02021fc4 ldr r0, [r6] adds r0, 0x6E ldrh r0, [r0] lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _08082714 + ldr r0, =0x020229f0 adds r1, r0 adds r0, r4, 0 bl gf_strcpy - ldr r1, _08082718 + ldr r1, =0x083398dd b _08082740 .align 2, 0 -_08082710: .4byte 0x02021fc4 -_08082714: .4byte 0x020229f0 -_08082718: .4byte 0x083398dd + .pool _0808271C: ldr r1, [r6] adds r1, 0x63 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r4, _08082748 + ldr r4, =0x02021fc4 ldr r0, [r6] adds r0, 0x6E ldrh r0, [r0] lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _0808274C + ldr r0, =0x020229f0 adds r1, r0 adds r0, r4, 0 bl gf_strcpy - ldr r1, _08082750 + ldr r1, =0x083398b0 _08082740: adds r0, r4, 0 bl gf_strcat b _080828DC .align 2, 0 -_08082748: .4byte 0x02021fc4 -_0808274C: .4byte 0x020229f0 -_08082750: .4byte 0x083398b0 + .pool _08082754: ldr r4, [r6] - ldr r0, _08082784 + ldr r0, =0x000011b8 adds r4, r0 - ldr r5, _08082788 + ldr r5, =0x02021fc4 bl sav2_get_text_speed adds r2, r0, 0 lsls r2, 24 @@ -263099,8 +253413,7 @@ _08082774: str r0, [r2] b _080828BC .align 2, 0 -_08082784: .4byte 0x000011b8 -_08082788: .4byte 0x02021fc4 + .pool _0808278C: ldr r4, [r6] movs r2, 0x84 @@ -263121,16 +253434,15 @@ _080827A2: b _080828DC _080827AA: ldr r0, [r6] - ldr r1, _080827C0 + ldr r1, =0x000011b8 adds r0, r1 - ldr r1, _080827C4 + ldr r1, =0x085ee42d movs r2, 0 bl sub_808417C bl sub_800ADF8 b _080828BA .align 2, 0 -_080827C0: .4byte 0x000011b8 -_080827C4: .4byte 0x085ee42d + .pool _080827C8: bl sub_800A520 lsls r0, 24 @@ -263138,7 +253450,7 @@ _080827C8: bne _080827D4 b _080828DC _080827D4: - ldr r3, _080827F8 + ldr r3, =0x020322a4 ldr r1, [r3] movs r2, 0x84 lsls r2, 1 @@ -263156,7 +253468,7 @@ _080827D4: str r2, [r0] b _080828DC .align 2, 0 -_080827F8: .4byte 0x020322a4 + .pool _080827FC: bl sub_80824FC lsls r0, 24 @@ -263164,11 +253476,11 @@ _080827FC: beq _080828DC movs r0, 0x37 bl audio_play - ldr r0, _08082814 + ldr r0, =0x020322a4 ldr r1, [r0] b _080828BC .align 2, 0 -_08082814: .4byte 0x020322a4 + .pool _08082818: ldr r1, [r6] adds r1, 0x63 @@ -263189,13 +253501,13 @@ _08082828: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08082848 + ldr r0, =0x020322a4 ldr r1, [r0] b _080828BC .align 2, 0 -_08082848: .4byte 0x020322a4 + .pool _0808284C: - ldr r0, _0808288C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -263207,7 +253519,7 @@ _0808284C: adds r0, r2, 0 adds r0, 0x64 ldrh r1, [r0] - ldr r0, _08082890 + ldr r0, =0x00002222 cmp r1, r0 bne _08082898 bl Window_FreeMemory @@ -263218,13 +253530,11 @@ _0808284C: ldr r0, [r6] bl free str r4, [r6] - ldr r0, _08082894 + ldr r0, =sub_807FA80 + 1 bl set_callback2 b _080828DC .align 2, 0 -_0808288C: .4byte 0x02037fd4 -_08082890: .4byte 0x00002222 -_08082894: .4byte sub_807FA80 + 1 + .pool _08082898: movs r1, 0x84 lsls r1, 1 @@ -263252,18 +253562,18 @@ _080828BC: strb r0, [r1] b _080828DC _080828C6: - ldr r0, _08082918 + ldr r0, =0x03003124 ldrb r4, [r0] cmp r4, 0 bne _080828DC ldr r0, [r6] bl free str r4, [r6] - ldr r0, _0808291C + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 _080828DC: bl sub_8082AD4 - ldr r0, _08082920 + ldr r0, =0x020322a4 ldr r1, [r0] movs r2, 0x8E lsls r2, 1 @@ -263286,15 +253596,13 @@ _080828DC: pop {r0} bx r0 .align 2, 0 -_08082918: .4byte 0x03003124 -_0808291C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 -_08082920: .4byte 0x020322a4 + .pool thumb_func_end sub_8082644 thumb_func_start sub_8082924 sub_8082924: @ 8082924 push {r4-r6,lr} - ldr r1, _08082940 + ldr r1, =0x020322a4 ldr r0, [r1] adds r0, 0x63 ldrb r0, [r0] @@ -263304,13 +253612,12 @@ sub_8082924: @ 8082924 b _08082A92 _08082936: lsls r0, 2 - ldr r1, _08082944 + ldr r1, =_08082948 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08082940: .4byte 0x020322a4 -_08082944: .4byte _08082948 + .pool .align 2, 0 _08082948: .4byte _08082974 @@ -263361,17 +253668,15 @@ _080829AA: movs r1, 0x3 strb r1, [r0] ldr r0, [r6] - ldr r1, _080829C8 + ldr r1, =0x000011b8 adds r0, r1 strh r2, [r0] - ldr r0, _080829CC - ldr r1, _080829D0 + ldr r0, =0x02021fc4 + ldr r1, =0x08339896 bl gf_strcpy b _08082A92 .align 2, 0 -_080829C8: .4byte 0x000011b8 -_080829CC: .4byte 0x02021fc4 -_080829D0: .4byte 0x08339896 + .pool _080829D4: ldr r1, [r6] adds r1, 0x63 @@ -263380,22 +253685,20 @@ _080829D4: movs r2, 0 strb r0, [r1] ldr r0, [r6] - ldr r1, _080829F4 + ldr r1, =0x000011b8 adds r0, r1 strh r2, [r0] - ldr r0, _080829F8 - ldr r1, _080829FC + ldr r0, =0x02021fc4 + ldr r1, =0x08339858 bl gf_strcpy b _08082A92 .align 2, 0 -_080829F4: .4byte 0x000011b8 -_080829F8: .4byte 0x02021fc4 -_080829FC: .4byte 0x08339858 + .pool _08082A00: ldr r4, [r6] - ldr r2, _08082A28 + ldr r2, =0x000011b8 adds r4, r2 - ldr r5, _08082A2C + ldr r5, =0x02021fc4 bl sav2_get_text_speed adds r2, r0, 0 lsls r2, 24 @@ -263411,12 +253714,11 @@ _08082A00: strb r1, [r0] b _08082A92 .align 2, 0 -_08082A28: .4byte 0x000011b8 -_08082A2C: .4byte 0x02021fc4 + .pool _08082A30: movs r0, 0x3 bl sub_80A2390 - ldr r0, _08082A44 + ldr r0, =0x020322a4 ldr r1, [r0] adds r1, 0x63 ldrb r0, [r1] @@ -263424,9 +253726,9 @@ _08082A30: strb r0, [r1] b _08082A92 .align 2, 0 -_08082A44: .4byte 0x020322a4 + .pool _08082A48: - ldr r0, _08082A68 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -263437,14 +253739,13 @@ _08082A48: ldrh r0, [r0] cmp r0, 0 bne _08082A70 - ldr r0, _08082A6C + ldr r0, =sub_807FA80 + 1 bl set_callback2 b _08082A76 .align 2, 0 -_08082A68: .4byte 0x02037fd4 -_08082A6C: .4byte sub_807FA80 + 1 + .pool _08082A70: - ldr r0, _08082ACC + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 _08082A76: bl Window_FreeMemory @@ -263452,14 +253753,14 @@ _08082A76: bl bg_unset_tilemap movs r0, 0x1 bl bg_unset_tilemap - ldr r4, _08082AD0 + ldr r4, =0x020322a4 ldr r0, [r4] bl free movs r0, 0 str r0, [r4] _08082A92: bl sub_8082AD4 - ldr r0, _08082AD0 + ldr r0, =0x020322a4 ldr r1, [r0] movs r2, 0x8E lsls r2, 1 @@ -263481,58 +253782,51 @@ _08082A92: pop {r0} bx r0 .align 2, 0 -_08082ACC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 -_08082AD0: .4byte 0x020322a4 + .pool thumb_func_end sub_8082924 thumb_func_start sub_8082AD4 sub_8082AD4: @ 8082AD4 push {r4-r7,lr} - ldr r0, _08082B0C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08082AE0 b _08082CA4 _08082AE0: - ldr r4, _08082B10 + ldr r4, =0x03003090 ldrh r0, [r4] - ldr r1, _08082B14 + ldr r1, =0x00002fff movs r2, 0xBC lsls r2, 6 bl sub_80814B0 cmp r0, 0 beq _08082B66 ldrh r1, [r4, 0x2] - ldr r0, _08082B18 + ldr r0, =0x00001111 cmp r1, r0 bne _08082B58 ldrh r3, [r4, 0x4] - ldr r0, _08082B1C + ldr r0, =0x00009999 cmp r3, r0 beq _08082B38 cmp r3, r0 bgt _08082B24 - ldr r0, _08082B20 + ldr r0, =0x00008888 b _08082B26 .align 2, 0 -_08082B0C: .4byte 0x03003124 -_08082B10: .4byte 0x03003090 -_08082B14: .4byte 0x00002fff -_08082B18: .4byte 0x00001111 -_08082B1C: .4byte 0x00009999 -_08082B20: .4byte 0x00008888 + .pool _08082B24: - ldr r0, _08082B30 + ldr r0, =0x0000aaaa _08082B26: cmp r3, r0 beq _08082B38 - ldr r2, _08082B34 + ldr r2, =0x020322a4 b _08082B48 .align 2, 0 -_08082B30: .4byte 0x0000aaaa -_08082B34: .4byte 0x020322a4 + .pool _08082B38: - ldr r2, _08082B50 + ldr r2, =0x020322a4 ldr r0, [r2] adds r1, r0, 0 adds r1, 0x6C @@ -263543,16 +253837,15 @@ _08082B38: _08082B48: ldr r0, [r2] adds r0, 0x64 - ldr r1, _08082B54 + ldr r1, =0x00001111 b _08082B64 .align 2, 0 -_08082B50: .4byte 0x020322a4 -_08082B54: .4byte 0x00001111 + .pool _08082B58: - ldr r0, _08082B90 + ldr r0, =0x00002222 cmp r1, r0 bne _08082B66 - ldr r0, _08082B94 + ldr r0, =0x020322a4 ldr r0, [r0] adds r0, 0x64 _08082B64: @@ -263564,16 +253857,16 @@ _08082B66: beq _08082B72 b _08082CA4 _08082B72: - ldr r2, _08082B94 + ldr r2, =0x020322a4 ldr r0, [r2] adds r0, 0x64 ldrh r1, [r0] - ldr r0, _08082B98 + ldr r0, =0x00001111 cmp r1, r0 bne _08082B82 b _08082CA4 _08082B82: - ldr r0, _08082B90 + ldr r0, =0x00002222 cmp r1, r0 bne _08082B8A b _08082CA4 @@ -263582,15 +253875,13 @@ _08082B8A: adds r7, r2, 0 b _08082BF4 .align 2, 0 -_08082B90: .4byte 0x00002222 -_08082B94: .4byte 0x020322a4 -_08082B98: .4byte 0x00001111 + .pool _08082B9C: - ldr r6, _08082BC8 + ldr r6, =0x03003090 lsls r4, r5, 4 adds r0, r4, r6 ldrh r0, [r0] - ldr r1, _08082BCC + ldr r1, =0x00002fff movs r2, 0xBC lsls r2, 6 bl sub_80814B0 @@ -263599,23 +253890,20 @@ _08082B9C: adds r0, r6, 0x2 adds r0, r4, r0 ldrh r2, [r0] - ldr r0, _08082BD0 + ldr r0, =0x00008888 cmp r2, r0 beq _08082BE4 cmp r2, r0 bgt _08082BD8 - ldr r0, _08082BD4 + ldr r0, =0x00007779 b _08082BE0 .align 2, 0 -_08082BC8: .4byte 0x03003090 -_08082BCC: .4byte 0x00002fff -_08082BD0: .4byte 0x00008888 -_08082BD4: .4byte 0x00007779 + .pool _08082BD8: - ldr r0, _08082C04 + ldr r0, =0x00009999 cmp r2, r0 beq _08082BE4 - ldr r0, _08082C08 + ldr r0, =0x0000aaaa _08082BE0: cmp r2, r0 bne _08082BEE @@ -263638,8 +253926,7 @@ _08082BF4: movs r5, 0 b _08082C12 .align 2, 0 -_08082C04: .4byte 0x00009999 -_08082C08: .4byte 0x0000aaaa + .pool _08082C0C: adds r0, r5, 0x1 lsls r0, 24 @@ -263650,7 +253937,7 @@ _08082C12: lsrs r0, 24 cmp r5, r0 bcs _08082C2E - ldr r0, _08082C40 + ldr r0, =0x020322a4 ldr r0, [r0] lsls r1, r5, 1 adds r0, 0x64 @@ -263665,11 +253952,10 @@ _08082C2E: cmp r5, r0 bne _08082CA4 movs r5, 0 - ldr r4, _08082C44 + ldr r4, =0x00007779 b _08082C4E .align 2, 0 -_08082C40: .4byte 0x020322a4 -_08082C44: .4byte 0x00007779 + .pool _08082C48: adds r0, r5, 0x1 lsls r0, 24 @@ -263680,7 +253966,7 @@ _08082C4E: lsrs r0, 24 cmp r5, r0 bcs _08082C6A - ldr r0, _08082C84 + ldr r0, =0x020322a4 ldr r0, [r0] lsls r1, r5, 1 adds r0, 0x64 @@ -263689,7 +253975,7 @@ _08082C4E: cmp r0, r4 beq _08082C48 _08082C6A: - ldr r4, _08082C88 + ldr r4, =0x03003110 adds r0, r4, 0 bl sub_8081F94 bl sub_8009FCC @@ -263697,17 +253983,15 @@ _08082C6A: lsrs r0, 24 cmp r5, r0 bne _08082C90 - ldr r0, _08082C8C + ldr r0, =0x00002222 strh r0, [r4, 0x2] b _08082CA4 .align 2, 0 -_08082C84: .4byte 0x020322a4 -_08082C88: .4byte 0x03003110 -_08082C8C: .4byte 0x00002222 + .pool _08082C90: - ldr r0, _08082CAC + ldr r0, =0x00001111 strh r0, [r4, 0x2] - ldr r0, _08082CB0 + ldr r0, =0x020322a4 ldr r0, [r0] lsls r1, r5, 1 adds r0, 0x64 @@ -263720,8 +254004,7 @@ _08082CA4: pop {r0} bx r0 .align 2, 0 -_08082CAC: .4byte 0x00001111 -_08082CB0: .4byte 0x020322a4 + .pool thumb_func_end sub_8082AD4 thumb_func_start sub_8082CB4 @@ -263735,7 +254018,7 @@ sub_8082CB4: @ 8082CB4 lsls r1, 7 str r1, [sp, 0x4] mov r3, sp - ldr r1, _08082D14 + ldr r1, =0x020322a4 ldr r1, [r1] mov r12, r1 movs r1, 0x8E @@ -263774,25 +254057,25 @@ sub_8082CB4: @ 8082CB4 pop {r0} bx r0 .align 2, 0 -_08082D14: .4byte 0x020322a4 + .pool thumb_func_end sub_8082CB4 thumb_func_start sub_8082D18 sub_8082D18: @ 8082D18 - ldr r0, _08082D24 + ldr r0, =0x020322a4 ldr r0, [r0] adds r0, 0x4A ldrh r0, [r0] bx lr .align 2, 0 -_08082D24: .4byte 0x020322a4 + .pool thumb_func_end sub_8082D18 thumb_func_start sub_8082D28 sub_8082D28: @ 8082D28 push {r4,lr} movs r1, 0 - ldr r4, _08082D80 + ldr r4, =0x03003124 ldrb r0, [r4] cmp r0, 0 beq _08082D3C @@ -263800,7 +254083,7 @@ sub_8082D28: @ 8082D28 lsls r0, 24 lsrs r1, r0, 24 _08082D3C: - ldr r0, _08082D84 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08082DCC @@ -263809,7 +254092,7 @@ _08082D3C: beq _08082DCC cmp r1, 0 bne _08082D90 - ldr r0, _08082D88 + ldr r0, =0x020322a4 ldr r3, [r0] adds r2, r3, 0 adds r2, 0x4A @@ -263819,7 +254102,7 @@ _08082D3C: ldrh r1, [r2] adds r0, r1 strh r0, [r2] - ldr r1, _08082D8C + ldr r1, =0x03003110 movs r4, 0x8B lsls r4, 1 adds r0, r3, r4 @@ -263833,12 +254116,9 @@ _08082D3C: bl sub_8082CB4 b _08082DEA .align 2, 0 -_08082D80: .4byte 0x03003124 -_08082D84: .4byte 0x030030fc -_08082D88: .4byte 0x020322a4 -_08082D8C: .4byte 0x03003110 + .pool _08082D90: - ldr r3, _08082DC4 + ldr r3, =0x03003090 ldrh r0, [r3] movs r1, 0xFF lsls r1, 8 @@ -263847,7 +254127,7 @@ _08082D90: lsls r0, 7 cmp r1, r0 bne _08082DEA - ldr r0, _08082DC8 + ldr r0, =0x020322a4 ldr r2, [r0] ldrh r0, [r3, 0xA] movs r4, 0x8B @@ -263864,10 +254144,9 @@ _08082D90: bl sub_8082CB4 b _08082DEA .align 2, 0 -_08082DC4: .4byte 0x03003090 -_08082DC8: .4byte 0x020322a4 + .pool _08082DCC: - ldr r0, _08082DF0 + ldr r0, =0x020322a4 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x4A @@ -263886,13 +254165,13 @@ _08082DEA: pop {r0} bx r0 .align 2, 0 -_08082DF0: .4byte 0x020322a4 + .pool thumb_func_end sub_8082D28 thumb_func_start sub_8082DF4 sub_8082DF4: @ 8082DF4 push {r4-r6,lr} - ldr r4, _08082E38 + ldr r4, =0x020322a4 ldr r0, [r4] movs r6, 0x8E lsls r6, 1 @@ -263921,7 +254200,7 @@ sub_8082DF4: @ 8082DF4 pop {r0} bx r0 .align 2, 0 -_08082E38: .4byte 0x020322a4 + .pool thumb_func_end sub_8082DF4 thumb_func_start sub_8082E3C @@ -263981,9 +254260,9 @@ sub_8082E84: @ 8082E84 adds r0, r1, 0x1 cmp r0, 0 beq _08082F40 - ldr r0, _08082F50 + ldr r0, =0x08329f40 mov r9, r0 - ldr r2, _08082F54 + ldr r2, =0x02020630 mov r10, r2 adds r6, r1, 0x1 movs r3, 0x1F @@ -263991,7 +254270,7 @@ sub_8082E84: @ 8082E84 movs r7, 0x10 _08082EB0: bl GenerateRandomNumber - ldr r1, _08082F58 + ldr r1, =0x020322a4 ldr r4, [r1] adds r4, 0x4A lsls r0, 16 @@ -264027,7 +254306,7 @@ _08082EF4: asrs r2, r0, 2 adds r1, 0x78 adds r2, 0x50 - ldr r0, _08082F5C + ldr r0, =0x08339be0 movs r3, 0x1 bl obj_add_from_template_forward_search adds r4, r0, 0 @@ -264052,9 +254331,9 @@ _08082EF4: ands r0, r2 subs r0, r7, r0 strh r0, [r4, 0x30] - ldr r3, _08082F60 + ldr r3, =0x0202064c adds r5, r3 - ldr r0, _08082F64 + ldr r0, =sub_8082E3C + 1 str r0, [r5] subs r6, 0x1 cmp r6, 0 @@ -264068,12 +254347,7 @@ _08082F40: pop {r0} bx r0 .align 2, 0 -_08082F50: .4byte 0x08329f40 -_08082F54: .4byte 0x02020630 -_08082F58: .4byte 0x020322a4 -_08082F5C: .4byte 0x08339be0 -_08082F60: .4byte 0x0202064c -_08082F64: .4byte sub_8082E3C + 1 + .pool thumb_func_end sub_8082E84 thumb_func_start sub_8082F68 @@ -264122,7 +254396,7 @@ sub_8082F9C: @ 8082F9C negs r1, r1 cmp r0, r1 bge _08082FC0 - ldr r0, _08082FD8 + ldr r0, =0x0000fff4 strh r0, [r2, 0x26] _08082FC0: adds r0, r2, 0 @@ -264138,7 +254412,7 @@ _08082FD4: pop {r0} bx r0 .align 2, 0 -_08082FD8: .4byte 0x0000fff4 + .pool thumb_func_end sub_8082F9C thumb_func_start sub_8082FDC @@ -264148,7 +254422,7 @@ sub_8082FDC: @ 8082FDC lsrs r0, 24 lsls r1, 16 lsrs r1, 16 - ldr r2, _0808300C + ldr r2, =0x020322a4 ldr r3, [r2] lsls r4, r0, 1 adds r2, r3, 0 @@ -264166,7 +254440,7 @@ sub_8082FDC: @ 8082FDC pop {r0} bx r0 .align 2, 0 -_0808300C: .4byte 0x020322a4 + .pool thumb_func_end sub_8082FDC thumb_func_start sub_8083010 @@ -264234,7 +254508,7 @@ _08083066: bne _080830A0 adds r0, r4, 0 bl obj_delete_and_free_tiles - ldr r0, _0808309C + ldr r0, =0x08339c60 movs r2, 0x14 negs r2, r2 movs r1, 0x78 @@ -264242,11 +254516,11 @@ _08083066: bl obj_add_from_template_forward_search b _080830B2 .align 2, 0 -_0808309C: .4byte 0x08339c60 + .pool _080830A0: movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, _080830BC + ldr r0, =0x0000fff0 strh r0, [r4, 0x30] lsls r1, 24 lsrs r1, 24 @@ -264259,7 +254533,7 @@ _080830B2: pop {r0} bx r0 .align 2, 0 -_080830BC: .4byte 0x0000fff0 + .pool thumb_func_end sub_8083010 thumb_func_start sub_80830C0 @@ -264315,7 +254589,7 @@ _08083112: asrs r0, 16 cmp r0, 0xB0 ble _08083130 - ldr r0, _0808313C + ldr r0, =0x020322a4 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -264329,7 +254603,7 @@ _08083130: pop {r0} bx r0 .align 2, 0 -_0808313C: .4byte 0x020322a4 + .pool thumb_func_end sub_80830C0 thumb_func_start sub_8083140 @@ -264339,7 +254613,7 @@ sub_8083140: @ 8083140 lsrs r0, 16 lsls r1, 16 lsrs r3, r1, 16 - ldr r1, _0808316C + ldr r1, =0x020322a4 ldr r1, [r1] movs r2, 0x8C lsls r2, 1 @@ -264356,7 +254630,7 @@ _08083166: pop {r0} bx r0 .align 2, 0 -_0808316C: .4byte 0x020322a4 + .pool thumb_func_end sub_8083140 thumb_func_start sub_8083170 @@ -264365,7 +254639,7 @@ sub_8083170: @ 8083170 lsls r0, 16 lsls r1, 16 lsrs r1, 16 - ldr r7, _08083200 + ldr r7, =0x06006000 lsrs r0, 10 bl __divsi3 adds r1, r0, 0 @@ -264377,7 +254651,7 @@ _08083188: movs r3, 0 cmp r3, r4 bge _080831B0 - ldr r0, _08083204 + ldr r0, =0x000080e9 adds r6, r0, 0 adds r0, 0x10 adds r5, r0, 0 @@ -264407,7 +254681,7 @@ _080831B8: beq _080831D6 lsls r0, r3, 1 adds r0, r7 - ldr r4, _08083208 + ldr r4, =0xffff80e1 adds r1, r2, r4 strh r1, [r0, 0x16] adds r0, 0x56 @@ -264418,7 +254692,7 @@ _080831B8: _080831D6: cmp r3, 0x7 bgt _080831FA - ldr r0, _0808320C + ldr r0, =0x000080e1 adds r4, r0, 0 adds r0, 0x10 adds r2, r0, 0 @@ -264440,10 +254714,7 @@ _080831FA: pop {r0} bx r0 .align 2, 0 -_08083200: .4byte 0x06006000 -_08083204: .4byte 0x000080e9 -_08083208: .4byte 0xffff80e1 -_0808320C: .4byte 0x000080e1 + .pool thumb_func_end sub_8083170 thumb_func_start sub_8083210 @@ -264451,19 +254722,18 @@ sub_8083210: @ 8083210 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r1, _08083228 + ldr r1, =0x00057e40 muls r0, r1 cmp r0, 0 bge _08083222 - ldr r1, _0808322C + ldr r1, =0x0000ffff adds r0, r1 _08083222: asrs r0, 16 pop {r1} bx r1 .align 2, 0 -_08083228: .4byte 0x00057e40 -_0808322C: .4byte 0x0000ffff + .pool thumb_func_end sub_8083210 thumb_func_start sub_8083230 @@ -264474,7 +254744,7 @@ sub_8083230: @ 8083230 lsrs r0, 16 bl sub_8083210 adds r5, r0, 0 - ldr r0, _080832B0 + ldr r0, =0x020322a4 ldr r0, [r0] adds r1, r0, 0 adds r1, 0x4E @@ -264500,9 +254770,9 @@ _08083250: lsrs r6, r0, 24 cmp r6, 0x4 bls _08083250 - ldr r2, _080832B4 + ldr r2, =0x06006458 mov r0, sp - ldr r3, _080832B8 + ldr r3, =0x00008072 adds r1, r3, 0 ldrb r0, [r0, 0x4] adds r0, r1, r0 @@ -264532,9 +254802,7 @@ _08083250: pop {r0} bx r0 .align 2, 0 -_080832B0: .4byte 0x020322a4 -_080832B4: .4byte 0x06006458 -_080832B8: .4byte 0x00008072 + .pool thumb_func_end sub_8083230 thumb_func_start sub_80832BC @@ -264588,7 +254856,7 @@ _08083308: thumb_func_start sub_808330C sub_808330C: @ 808330C push {r4,lr} - ldr r4, _08083330 + ldr r4, =0x020322a4 ldr r0, [r4] movs r1, 0x8E lsls r1, 1 @@ -264603,7 +254871,7 @@ sub_808330C: @ 808330C pop {r0} bx r0 .align 2, 0 -_08083330: .4byte 0x020322a4 + .pool thumb_func_end sub_808330C thumb_func_start sub_8083334 @@ -264653,7 +254921,7 @@ _08083378: thumb_func_start sub_8083380 sub_8083380: @ 8083380 push {r4,r5,lr} - ldr r5, _080833D8 + ldr r5, =0x020322a4 ldr r2, [r5] movs r4, 0x84 lsls r4, 1 @@ -264695,7 +254963,7 @@ _080833A0: movs r0, 0 b _080833F0 .align 2, 0 -_080833D8: .4byte 0x020322a4 + .pool _080833DC: movs r1, 0x8E lsls r1, 1 @@ -264715,7 +254983,7 @@ _080833F0: thumb_func_start sub_80833F8 sub_80833F8: @ 80833F8 - ldr r1, _08083414 + ldr r1, =0x020322a4 ldr r2, [r1] movs r3, 0x8E lsls r3, 1 @@ -264730,22 +254998,22 @@ sub_80833F8: @ 80833F8 strh r1, [r0, 0x26] bx lr .align 2, 0 -_08083414: .4byte 0x020322a4 + .pool thumb_func_end sub_80833F8 thumb_func_start sub_8083418 sub_8083418: @ 8083418 push {lr} - ldr r0, _08083444 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r0, _08083448 + ldr r0, =0x020322a4 ldr r1, [r0] adds r0, r1, 0 adds r0, 0x7C ldrb r0, [r0] subs r0, 0x2 lsls r0, 1 - ldr r3, _0808344C + ldr r3, =0x000009bc adds r2, r3 adds r2, r0 adds r1, 0x4E @@ -264758,9 +255026,7 @@ _0808343E: pop {r0} bx r0 .align 2, 0 -_08083444: .4byte 0x03005d8c -_08083448: .4byte 0x020322a4 -_0808344C: .4byte 0x000009bc + .pool thumb_func_end sub_8083418 thumb_func_start sub_8083450 @@ -264771,7 +255037,7 @@ sub_8083450: @ 8083450 mov r5, r8 push {r5-r7} sub sp, 0x4C - ldr r1, _08083474 + ldr r1, =0x020322a4 ldr r0, [r1] ldrb r0, [r0] adds r4, r1, 0 @@ -264780,13 +255046,12 @@ sub_8083450: @ 8083450 b _08083898 _0808346A: lsls r0, 2 - ldr r1, _08083478 + ldr r1, =_0808347C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08083474: .4byte 0x020322a4 -_08083478: .4byte _0808347C + .pool .align 2, 0 _0808347C: .4byte _08083498 @@ -264837,7 +255102,7 @@ _080834C8: _080834DC: movs r6, 0 _080834DE: - ldr r4, _08083510 + ldr r4, =0x020322a4 ldr r0, [r4] adds r0, 0x46 adds r0, r6 @@ -264845,7 +255110,7 @@ _080834DE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08083514 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r6, 0x1 @@ -264861,10 +255126,9 @@ _080834DE: str r0, [r2] b _08083854 .align 2, 0 -_08083510: .4byte 0x020322a4 -_08083514: .4byte 0x02020630 + .pool _08083518: - ldr r4, _08083760 + ldr r4, =0x083398f5 movs r0, 0x1 adds r1, r4, 0 movs r2, 0xA8 @@ -264879,7 +255143,7 @@ _08083518: adds r1, r4, 0 movs r3, 0x1 bl sub_80840D4 - ldr r1, _08083764 + ldr r1, =0x020322a4 ldr r0, [r1] adds r2, r0, 0 adds r2, 0x7C @@ -264917,18 +255181,18 @@ _08083564: bl decimal_int_to_string ldr r0, [r7] adds r0, 0x9F - ldr r1, _08083768 + ldr r1, =0x08339941 bl gf_strcat ldr r0, [r7] adds r0, 0x9F - ldr r1, _0808376C + ldr r1, =0x085e8d5e bl gf_strcat ldr r0, [r7] adds r0, 0x9F lsls r4, r5, 3 subs r4, r5 lsls r4, 2 - ldr r3, _08083770 + ldr r3, =0x020229f0 adds r1, r4, r3 bl gf_strcat ldr r1, [r7] @@ -264956,13 +255220,13 @@ _08083564: bl gf_strcpy ldr r0, [r7] adds r0, 0x9F - ldr r2, _08083774 + ldr r2, =0x020229e8 adds r4, r2 ldrb r1, [r4, 0x1A] bl sub_8009308 ldr r0, [r7] adds r0, 0x9F - ldr r1, _08083778 + ldr r1, =0x08339914 bl gf_strcat ldr r1, [r7] adds r1, 0x9F @@ -264985,7 +255249,7 @@ _08083564: cmp r6, r0 bcc _08083564 _0808361A: - ldr r1, _0808377C + ldr r1, =0x0833992e movs r3, 0xFF mov r10, r3 str r3, [sp] @@ -264996,7 +255260,7 @@ _0808361A: movs r2, 0 movs r3, 0x51 bl sub_80840D4 - ldr r6, _08083764 + ldr r6, =0x020322a4 ldr r0, [r6] adds r4, r0, 0 adds r4, 0x9F @@ -265013,7 +255277,7 @@ _0808361A: bl decimal_int_to_string ldr r0, [r6] adds r0, 0x9F - ldr r1, _08083768 + ldr r1, =0x08339941 bl gf_strcat ldr r0, [r6] adds r0, 0x4E @@ -265033,7 +255297,7 @@ _0808361A: bl gf_strcat ldr r0, [r6] adds r0, 0x9F - ldr r1, _08083780 + ldr r1, =0x0833993c bl gf_strcat ldr r1, [r6] adds r1, 0x9F @@ -265051,7 +255315,7 @@ _0808361A: movs r0, 0x5 movs r3, 0x51 bl sub_80840D4 - ldr r1, _08083784 + ldr r1, =0x0833991b mov r2, r10 str r2, [sp] mov r3, r9 @@ -265087,7 +255351,7 @@ _0808361A: bl decimal_int_to_string ldr r0, [r6] adds r0, 0x9F - ldr r1, _08083788 + ldr r1, =0x08339921 bl gf_strcat adds r1, r4, 0 movs r2, 0x2 @@ -265095,7 +255359,7 @@ _0808361A: bl decimal_int_to_string ldr r0, [r6] adds r0, 0x9F - ldr r1, _0808378C + ldr r1, =0x08339928 bl gf_strcat ldr r1, [r6] adds r1, 0x9F @@ -265127,20 +255391,9 @@ _0808361A: bl Window_CopyToVram b _08083898 .align 2, 0 -_08083760: .4byte 0x083398f5 -_08083764: .4byte 0x020322a4 -_08083768: .4byte 0x08339941 -_0808376C: .4byte 0x085e8d5e -_08083770: .4byte 0x020229f0 -_08083774: .4byte 0x020229e8 -_08083778: .4byte 0x08339914 -_0808377C: .4byte 0x0833992e -_08083780: .4byte 0x0833993c -_08083784: .4byte 0x0833991b -_08083788: .4byte 0x08339921 -_0808378C: .4byte 0x08339928 + .pool _08083790: - ldr r0, _080837A4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -265151,14 +255404,14 @@ _0808379E: ldr r1, [r4] b _08083854 .align 2, 0 -_080837A4: .4byte 0x030022c0 + .pool _080837A8: movs r0, 0x5 movs r1, 0x1 bl sub_8198070 movs r6, 0 add r7, sp, 0x40 - ldr r5, _0808385C + ldr r5, =0x020322a4 _080837B6: ldr r0, [r5] lsls r2, r6, 1 @@ -265192,7 +255445,7 @@ _080837EA: cmp r6, 0x3 bls _080837B6 bl sub_8081E20 - ldr r4, _0808385C + ldr r4, =0x020322a4 ldr r3, [r4] movs r1, 0xAC lsls r1, 1 @@ -265216,18 +255469,18 @@ _080837EA: adds r1, r2 adds r0, r7, 0 bl sub_8083F94 - ldr r0, _08083860 + ldr r0, =sub_8083F3C + 1 movs r1, 0x6 bl AddTask bl sub_80EECEC - ldr r0, _08083864 + ldr r0, =0x0203ce7c ldrh r0, [r0] movs r1, 0x1 bl sub_80D6AA4 adds r0, r7, 0 bl sub_8136F2C ldr r1, [r4] - ldr r3, _08083868 + ldr r3, =0x000011b8 adds r2, r1, r3 movs r0, 0 strh r0, [r2] @@ -265237,13 +255490,10 @@ _08083854: strb r0, [r1] b _08083898 .align 2, 0 -_0808385C: .4byte 0x020322a4 -_08083860: .4byte sub_8083F3C + 1 -_08083864: .4byte 0x0203ce7c -_08083868: .4byte 0x000011b8 + .pool _0808386C: ldr r4, [r4] - ldr r0, _08083894 + ldr r0, =0x000011b8 adds r5, r4, r0 adds r4, 0x9F bl sav2_get_text_speed @@ -265259,7 +255509,7 @@ _0808386C: movs r0, 0x1 b _0808389A .align 2, 0 -_08083894: .4byte 0x000011b8 + .pool _08083898: movs r0, 0 _0808389A: @@ -265281,17 +255531,17 @@ sub_80838AC: @ 80838AC adds r6, r1, 0 movs r0, 0xFF strb r0, [r6] - ldr r1, _08083940 + ldr r1, =0x085b262c ldrb r0, [r5] lsls r0, 2 adds r0, r1 ldr r1, [r0] adds r0, r6, 0 bl gf_strcpy - ldr r1, _08083944 + ldr r1, =0x0833979d adds r0, r6, 0 bl gf_strcat - ldr r1, _08083948 + ldr r1, =0x08339943 adds r0, r6, 0 bl gf_strcat adds r0, r5, 0 @@ -265304,7 +255554,7 @@ sub_80838AC: @ 80838AC adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r1, _0808394C + ldr r1, =0x0833994f adds r0, r6, 0 bl gf_strcat mov r0, sp @@ -265315,7 +255565,7 @@ sub_80838AC: @ 80838AC adds r0, r6, 0 mov r1, sp bl gf_strcat - ldr r1, _08083950 + ldr r1, =0x0833995d adds r0, r6, 0 bl gf_strcat mov r0, sp @@ -265326,10 +255576,10 @@ sub_80838AC: @ 80838AC adds r0, r6, 0 mov r1, sp bl gf_strcat - ldr r1, _08083954 + ldr r1, =0x08339970 adds r0, r6, 0 bl gf_strcat - ldr r1, _08083958 + ldr r1, =0x0833979b adds r0, r6, 0 bl gf_strcat add sp, 0xC @@ -265337,13 +255587,7 @@ sub_80838AC: @ 80838AC pop {r0} bx r0 .align 2, 0 -_08083940: .4byte 0x085b262c -_08083944: .4byte 0x0833979d -_08083948: .4byte 0x08339943 -_0808394C: .4byte 0x0833994f -_08083950: .4byte 0x0833995d -_08083954: .4byte 0x08339970 -_08083958: .4byte 0x0833979b + .pool thumb_func_end sub_80838AC thumb_func_start sub_808395C @@ -265408,7 +255652,7 @@ sub_80839B4: @ 80839B4 push {r5-r7} sub sp, 0x14 movs r5, 0 - ldr r2, _080839D0 + ldr r2, =0x020322a4 ldr r0, [r2] adds r0, 0x7C adds r1, r2, 0 @@ -265416,7 +255660,7 @@ sub_80839B4: @ 80839B4 mov r10, r3 b _080839E4 .align 2, 0 -_080839D0: .4byte 0x020322a4 + .pool _080839D4: mov r4, sp adds r0, r4, r5 @@ -265490,7 +255734,7 @@ _08083A10: cmp r5, r1 bcc _08083A10 _08083A5E: - ldr r4, _08083AAC + ldr r4, =0x020322a4 ldr r0, [r4] adds r0, 0x7C ldrb r1, [r0] @@ -265523,22 +255767,21 @@ _08083A80: cmp r5, r0 bcc _08083A80 _08083A9E: - ldr r0, _08083AB0 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08083AB4 movs r3, 0 b _08083ABC .align 2, 0 -_08083AAC: .4byte 0x020322a4 -_08083AB0: .4byte 0x03003124 + .pool _08083AB4: bl link_get_multiplayer_id lsls r0, 24 lsrs r3, r0, 24 _08083ABC: movs r5, 0 - ldr r1, _08083B04 + ldr r1, =0x020322a4 ldr r0, [r1] adds r0, 0x7C ldrb r0, [r0] @@ -265576,7 +255819,7 @@ _08083AF2: pop {r0} bx r0 .align 2, 0 -_08083B04: .4byte 0x020322a4 + .pool thumb_func_end sub_80839B4 thumb_func_start sub_8083B08 @@ -265587,7 +255830,7 @@ sub_8083B08: @ 8083B08 mov r5, r8 push {r5-r7} sub sp, 0xC - ldr r1, _08083B2C + ldr r1, =0x020322a4 ldr r0, [r1] ldrb r0, [r0] adds r2, r1, 0 @@ -265596,13 +255839,12 @@ sub_8083B08: @ 8083B08 b _08083E12 _08083B22: lsls r0, 2 - ldr r1, _08083B30 + ldr r1, =_08083B34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08083B2C: .4byte 0x020322a4 -_08083B30: .4byte _08083B34 + .pool .align 2, 0 _08083B34: .4byte _08083B50 @@ -265660,7 +255902,7 @@ _08083B9A: movs r2, 0x1 movs r3, 0xD bl SetWindowBorderStyle - ldr r4, _08083DA8 + ldr r4, =0x08339947 movs r0, 0x1 adds r1, r4, 0 movs r2, 0xA8 @@ -265676,14 +255918,14 @@ _08083B9A: adds r1, r4, 0 movs r3, 0x1 bl sub_80840D4 - ldr r1, _08083DAC + ldr r1, =0x08339b40 mov r8, r1 mov r0, r8 movs r1, 0x80 movs r2, 0x34 movs r3, 0 bl obj_add_from_template_forward_search - ldr r7, _08083DB0 + ldr r7, =0x020322a4 ldr r1, [r7] adds r1, 0x46 strb r0, [r1] @@ -265693,7 +255935,7 @@ _08083B9A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, _08083DB4 + ldr r6, =0x02020630 adds r0, r6 movs r1, 0x3 bl obj_anim_image_start @@ -265706,7 +255948,7 @@ _08083B9A: adds r5, r6, 0 adds r5, 0x1C adds r0, r5 - ldr r4, _08083DB8 + ldr r4, =nullsub_12 + 1 str r4, [r0] mov r0, r8 movs r1, 0xA0 @@ -265780,18 +256022,18 @@ _08083C84: bl decimal_int_to_string ldr r0, [r7] adds r0, 0x9F - ldr r1, _08083DBC + ldr r1, =0x08339941 bl gf_strcat ldr r0, [r7] adds r0, 0x9F - ldr r1, _08083DC0 + ldr r1, =0x085e8d5e bl gf_strcat ldr r0, [r7] adds r0, 0x9F lsls r1, r5, 3 subs r1, r5 lsls r1, 2 - ldr r2, _08083DC4 + ldr r2, =0x020229f0 adds r1, r2 bl gf_strcat ldr r1, [r7] @@ -265891,7 +256133,7 @@ _08083D8A: movs r0, 0x5 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _08083DB0 + ldr r0, =0x020322a4 ldr r1, [r0] movs r3, 0x84 lsls r3, 1 @@ -265900,14 +256142,7 @@ _08083D8A: str r0, [r2] b _08083DF8 .align 2, 0 -_08083DA8: .4byte 0x08339947 -_08083DAC: .4byte 0x08339b40 -_08083DB0: .4byte 0x020322a4 -_08083DB4: .4byte 0x02020630 -_08083DB8: .4byte nullsub_12 + 1 -_08083DBC: .4byte 0x08339941 -_08083DC0: .4byte 0x085e8d5e -_08083DC4: .4byte 0x020229f0 + .pool _08083DC8: ldr r2, [r2] movs r0, 0x84 @@ -265923,7 +256158,7 @@ _08083DC8: strb r0, [r2] b _08083E12 _08083DE2: - ldr r0, _08083E00 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -265931,7 +256166,7 @@ _08083DE2: beq _08083E12 movs r0, 0x5 bl audio_play - ldr r0, _08083E04 + ldr r0, =0x020322a4 ldr r1, [r0] _08083DF8: ldrb r0, [r1] @@ -265939,8 +256174,7 @@ _08083DF8: strb r0, [r1] b _08083E12 .align 2, 0 -_08083E00: .4byte 0x030022c0 -_08083E04: .4byte 0x020322a4 + .pool _08083E08: ldr r1, [r2] movs r0, 0 @@ -265964,12 +256198,12 @@ _08083E14: sub_8083E24: @ 8083E24 push {r4-r7,lr} sub sp, 0x34 - ldr r0, _08083F1C + ldr r0, =0x08339d14 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x2C] str r1, [sp, 0x30] - ldr r5, _08083F20 + ldr r5, =0x0203ab74 add r0, sp, 0x2C bl Window_AddFromTemplate strb r0, [r5] @@ -265979,7 +256213,7 @@ sub_8083E24: @ 8083E24 ldrb r0, [r5] movs r1, 0x11 bl Window_FastFillPixels - ldr r6, _08083F24 + ldr r6, =0x085ee44f movs r0, 0x1 adds r1, r6, 0 movs r2, 0x90 @@ -265996,7 +256230,7 @@ sub_8083E24: @ 8083E24 adds r2, r6, 0 bl Print ldrb r0, [r5] - ldr r2, _08083F28 + ldr r2, =0x085ee473 movs r1, 0x29 str r1, [sp] str r4, [sp, 0x4] @@ -266008,10 +256242,10 @@ sub_8083E24: @ 8083E24 movs r7, 0xA4 lsls r7, 22 _08083E8A: - ldr r0, _08083F2C + ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r6, 1 - ldr r2, _08083F30 + ldr r2, =0x000009bc adds r0, r2 adds r0, r1 ldrh r4, [r0] @@ -266024,7 +256258,7 @@ _08083E8A: movs r3, 0x3 bl decimal_int_to_string adds r5, r0, 0 - ldr r1, _08083F34 + ldr r1, =0x08339941 bl gf_strcat adds r5, r0, 0 adds r0, r4, 0 @@ -266036,14 +256270,14 @@ _08083E8A: movs r3, 0x2 bl decimal_int_to_string adds r5, r0, 0 - ldr r1, _08083F38 + ldr r1, =0x0833993c bl gf_strcat movs r0, 0x1 add r1, sp, 0xC movs r2, 0x8C bl sub_81DB368 adds r3, r0, 0 - ldr r4, _08083F20 + ldr r4, =0x0203ab74 ldrb r0, [r4] lsls r3, 24 lsrs r3, 24 @@ -266071,14 +256305,7 @@ _08083E8A: pop {r0} bx r0 .align 2, 0 -_08083F1C: .4byte 0x08339d14 -_08083F20: .4byte 0x0203ab74 -_08083F24: .4byte 0x085ee44f -_08083F28: .4byte 0x085ee473 -_08083F2C: .4byte 0x03005d8c -_08083F30: .4byte 0x000009bc -_08083F34: .4byte 0x08339941 -_08083F38: .4byte 0x0833993c + .pool thumb_func_end sub_8083E24 thumb_func_start sub_8083F3C @@ -266087,7 +256314,7 @@ sub_8083F3C: @ 8083F3C lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _08083F88 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -266096,7 +256323,7 @@ sub_8083F3C: @ 8083F3C ldrsh r0, [r4, r1] cmp r0, 0 bne _08083F62 - ldr r0, _08083F8C + ldr r0, =0x0000016f bl fanfare_play ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -266106,7 +256333,7 @@ _08083F62: lsls r0, 24 cmp r0, 0 beq _08083F82 - ldr r0, _08083F90 + ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0xAA lsls r1, 1 @@ -266120,9 +256347,7 @@ _08083F82: pop {r0} bx r0 .align 2, 0 -_08083F88: .4byte 0x03005e00 -_08083F8C: .4byte 0x0000016f -_08083F90: .4byte 0x020322a4 + .pool thumb_func_end sub_8083F3C thumb_func_start sub_8083F94 @@ -266154,11 +256379,11 @@ sub_8083F94: @ 8083F94 strb r0, [r7, 0xC] movs r0, 0xFF strb r0, [r7] - ldr r0, _0808404C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080840C4 - ldr r0, _08084050 + ldr r0, =0x020322a4 ldr r2, [r0] movs r4, 0xD2 lsls r4, 1 @@ -266182,7 +256407,7 @@ sub_8083F94: @ 8083F94 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r5, _08084054 + ldr r5, =0x020229f0 adds r1, r5 adds r0, r7, 0 bl gf_strcpy @@ -266214,9 +256439,7 @@ sub_8083F94: @ 8083F94 bne _080840BA b _080840C4 .align 2, 0 -_0808404C: .4byte 0x03003124 -_08084050: .4byte 0x020322a4 -_08084054: .4byte 0x020229f0 + .pool _08084058: mov r0, r8 ldr r2, [r0] @@ -266239,7 +256462,7 @@ _08084058: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r5, _080840C0 + ldr r5, =0x020229f0 adds r1, r5 adds r0, r7, 0 bl gf_strcpy @@ -266268,7 +256491,7 @@ _080840BA: movs r0, 0x1 b _080840C6 .align 2, 0 -_080840C0: .4byte 0x020229f0 + .pool _080840C4: movs r0, 0 _080840C6: @@ -266431,10 +256654,10 @@ _080841DC: thumb_func_start reset_playtime reset_playtime: @ 80841E4 - ldr r1, _08084200 + ldr r1, =0x03000e08 movs r0, 0 strb r0, [r1] - ldr r2, _08084204 + ldr r2, =0x03005d90 ldr r3, [r2] movs r1, 0 movs r0, 0 @@ -266446,20 +256669,19 @@ reset_playtime: @ 80841E4 strb r1, [r0, 0x12] bx lr .align 2, 0 -_08084200: .4byte 0x03000e08 -_08084204: .4byte 0x03005d90 + .pool thumb_func_end reset_playtime thumb_func_start set_max_playtime_if_appropriate set_max_playtime_if_appropriate: @ 8084208 push {lr} - ldr r1, _08084224 + ldr r1, =0x03000e08 movs r0, 0x1 strb r0, [r1] - ldr r0, _08084228 + ldr r0, =0x03005d90 ldr r0, [r0] ldrh r1, [r0, 0xE] - ldr r0, _0808422C + ldr r0, =0x000003e7 cmp r1, r0 bls _08084220 bl set_max_playtime @@ -266467,29 +256689,27 @@ _08084220: pop {r0} bx r0 .align 2, 0 -_08084224: .4byte 0x03000e08 -_08084228: .4byte 0x03005d90 -_0808422C: .4byte 0x000003e7 + .pool thumb_func_end set_max_playtime_if_appropriate thumb_func_start sub_8084230 sub_8084230: @ 8084230 - ldr r1, _08084238 + ldr r1, =0x03000e08 movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_08084238: .4byte 0x03000e08 + .pool thumb_func_end sub_8084230 thumb_func_start gametime_increment gametime_increment: @ 808423C push {lr} - ldr r0, _08084298 + ldr r0, =0x03000e08 ldrb r0, [r0] cmp r0, 0x1 bne _08084294 - ldr r2, _0808429C + ldr r2, =0x03005d90 ldr r0, [r2] ldrb r1, [r0, 0x12] adds r1, 0x1 @@ -266523,7 +256743,7 @@ gametime_increment: @ 808423C adds r1, 0x1 strh r1, [r0, 0xE] lsls r1, 16 - ldr r0, _080842A0 + ldr r0, =0x03e70000 cmp r1, r0 bls _08084294 bl set_max_playtime @@ -266531,19 +256751,17 @@ _08084294: pop {r0} bx r0 .align 2, 0 -_08084298: .4byte 0x03000e08 -_0808429C: .4byte 0x03005d90 -_080842A0: .4byte 0x03e70000 + .pool thumb_func_end gametime_increment thumb_func_start set_max_playtime set_max_playtime: @ 80842A4 - ldr r1, _080842C0 + ldr r1, =0x03000e08 movs r0, 0x2 strb r0, [r1] - ldr r2, _080842C4 + ldr r2, =0x03005d90 ldr r3, [r2] - ldr r0, _080842C8 + ldr r0, =0x000003e7 strh r0, [r3, 0xE] movs r1, 0x3B strb r1, [r3, 0x10] @@ -266553,9 +256771,7 @@ set_max_playtime: @ 80842A4 strb r1, [r0, 0x12] bx lr .align 2, 0 -_080842C0: .4byte 0x03000e08 -_080842C4: .4byte 0x03005d90 -_080842C8: .4byte 0x000003e7 + .pool thumb_func_end set_max_playtime thumb_func_start write_word_to_mem @@ -266615,7 +256831,7 @@ set_player_trainer_id: @ 8084310 lsls r0, 16 lsrs r0, 16 orrs r4, r0 - ldr r0, _08084338 + ldr r0, =0x03005d90 ldr r1, [r0] adds r1, 0xA adds r0, r4, 0 @@ -266624,12 +256840,12 @@ set_player_trainer_id: @ 8084310 pop {r0} bx r0 .align 2, 0 -_08084338: .4byte 0x03005d90 + .pool thumb_func_end set_player_trainer_id thumb_func_start init_options init_options: @ 808433C - ldr r3, _0808438C + ldr r3, =0x03005d90 ldr r2, [r3] ldrb r1, [r2, 0x14] movs r0, 0x8 @@ -266669,16 +256885,16 @@ init_options: @ 808433C strb r0, [r2, 0x15] bx lr .align 2, 0 -_0808438C: .4byte 0x03005d90 + .pool thumb_func_end init_options thumb_func_start sub_8084390 sub_8084390: @ 8084390 push {r4,lr} - ldr r1, _080843B8 + ldr r1, =0x030060b0 movs r0, 0 strb r0, [r1] - ldr r4, _080843BC + ldr r4, =0x03005d90 ldr r0, [r4] adds r0, 0x28 movs r1, 0 @@ -266693,8 +256909,7 @@ sub_8084390: @ 8084390 pop {r0} bx r0 .align 2, 0 -_080843B8: .4byte 0x030060b0 -_080843BC: .4byte 0x03005d90 + .pool thumb_func_end sub_8084390 thumb_func_start sub_80843C0 @@ -266702,10 +256917,10 @@ sub_80843C0: @ 80843C0 push {r4-r7,lr} bl sub_80DF040 movs r2, 0x8 - ldr r0, _080843F4 + ldr r0, =0x03005d8c mov r12, r0 - ldr r4, _080843F8 - ldr r3, _080843FC + ldr r4, =0x00002e90 + ldr r3, =0x08339d1c _080843D0: mov r1, r12 ldr r0, [r1] @@ -266726,9 +256941,7 @@ _080843D0: pop {r0} bx r0 .align 2, 0 -_080843F4: .4byte 0x03005d8c -_080843F8: .4byte 0x00002e90 -_080843FC: .4byte 0x08339d1c + .pool thumb_func_end sub_80843C0 thumb_func_start sub_8084400 @@ -266737,20 +256950,20 @@ sub_8084400: @ 8084400 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r4, _08084438 + ldr r4, =0x03005d90 ldr r1, [r4] - ldr r0, _0808443C + ldr r0, =0x0000064c adds r1, r0 - ldr r2, _08084440 + ldr r2, =0x05000238 mov r0, sp bl CpuSet ldr r0, [r4] - ldr r1, _08084444 + ldr r1, =0x00000ee1 adds r0, r1 movs r1, 0xFF strb r1, [r0] ldr r0, [r4] - ldr r1, _08084448 + ldr r1, =0x00000ee9 adds r0, r1 movs r1, 0x1 negs r1, r1 @@ -266760,11 +256973,7 @@ sub_8084400: @ 8084400 pop {r0} bx r0 .align 2, 0 -_08084438: .4byte 0x03005d90 -_0808443C: .4byte 0x0000064c -_08084440: .4byte 0x05000238 -_08084444: .4byte 0x00000ee1 -_08084448: .4byte 0x00000ee9 + .pool thumb_func_end sub_8084400 thumb_func_start sub_808444C @@ -266796,7 +257005,7 @@ init_sav2: @ 808446C thumb_func_start sub_808447C sub_808447C: @ 808447C push {lr} - ldr r1, _0808449C + ldr r1, =0x020322d4 movs r0, 0 strb r0, [r1] bl sub_80BB358 @@ -266807,13 +257016,13 @@ sub_808447C: @ 808447C pop {r0} bx r0 .align 2, 0 -_0808449C: .4byte 0x020322d4 + .pool thumb_func_end sub_808447C thumb_func_start new_game_init_data new_game_init_data: @ 80844A0 push {r4,r5,lr} - ldr r0, _080845AC + ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0 beq _080844AE @@ -266822,10 +257031,10 @@ new_game_init_data: @ 80844A0 _080844AE: bl sub_802F3F8 _080844B2: - ldr r1, _080845B0 + ldr r1, =0x020322d4 movs r0, 0x1 strb r0, [r1] - ldr r4, _080845B4 + ldr r4, =0x03005d90 ldr r0, [r4] adds r0, 0xAC movs r5, 0 @@ -266849,12 +257058,12 @@ _080844B2: bl sub_80EC21C bl sub_80E8B28 bl sub_80E1794 - ldr r4, _080845B8 + ldr r4, =0x03005d8c ldr r0, [r4] movs r1, 0x92 lsls r1, 3 adds r0, r1 - ldr r1, _080845BC + ldr r1, =0x00000bb8 bl encrypt_money movs r0, 0 bl sub_8145C58 @@ -266864,14 +257073,14 @@ _080844B2: bl sub_813C1F8 bl sub_80F9A7C bl sub_80F9AD4 - ldr r0, _080845C0 + ldr r0, =0x020244e9 strb r5, [r0] bl zero_player_party_data bl sub_80C7770 bl sub_8161B34 bl sub_8161B60 ldr r0, [r4] - ldr r1, _080845C4 + ldr r1, =0x00000496 adds r0, r1 strh r5, [r0] bl sub_80D7094 @@ -266884,7 +257093,7 @@ _080844B2: bl sub_813BA10 bl sub_8177558 bl sub_808444C - ldr r0, _080845C8 + ldr r0, =0x082715de bl script_env_2_execute_new_script bl sub_80845CC bl copy_strings_to_sav1 @@ -266900,14 +257109,7 @@ _080844B2: pop {r0} bx r0 .align 2, 0 -_080845AC: .4byte 0x03006210 -_080845B0: .4byte 0x020322d4 -_080845B4: .4byte 0x03005d90 -_080845B8: .4byte 0x03005d8c -_080845BC: .4byte 0x00000bb8 -_080845C0: .4byte 0x020244e9 -_080845C4: .4byte 0x00000496 -_080845C8: .4byte 0x082715de + .pool thumb_func_end new_game_init_data thumb_func_start sub_80845CC @@ -266917,12 +257119,12 @@ sub_80845CC: @ 80845CC mov r0, sp movs r5, 0 strh r5, [r0] - ldr r4, _08084618 + ldr r4, =0x03005d90 ldr r1, [r4] movs r0, 0xF6 lsls r0, 1 adds r1, r0 - ldr r6, _0808461C + ldr r6, =0x01000008 mov r0, sp adds r2, r6, 0 bl CpuSet @@ -266947,16 +257149,15 @@ sub_80845CC: @ 80845CC pop {r0} bx r0 .align 2, 0 -_08084618: .4byte 0x03005d90 -_0808461C: .4byte 0x01000008 + .pool thumb_func_end sub_80845CC thumb_func_start sub_8084620 sub_8084620: @ 8084620 push {r4,lr} - ldr r0, _08084658 + ldr r0, =0x08271857 bl script_env_2_execute_new_script - ldr r0, _0808465C + ldr r0, =0x03005d8c ldr r4, [r0] movs r0, 0x92 lsls r0, 3 @@ -266975,100 +257176,86 @@ sub_8084620: @ 8084620 pop {r0} bx r0 .align 2, 0 -_08084658: .4byte 0x08271857 -_0808465C: .4byte 0x03005d8c + .pool thumb_func_end sub_8084620 thumb_func_start flag_var_implications_of_teleport_ flag_var_implications_of_teleport_: @ 8084660 push {lr} bl player_avatar_init_params_reset - ldr r0, _08084688 + ldr r0, =0x0000088b bl flag_clear - ldr r0, _0808468C + ldr r0, =0x0000088d bl flag_clear - ldr r0, _08084690 + ldr r0, =0x0000088c bl flag_clear - ldr r0, _08084694 + ldr r0, =0x00000889 bl flag_clear - ldr r0, _08084698 + ldr r0, =0x00000888 bl flag_clear pop {r0} bx r0 .align 2, 0 -_08084688: .4byte 0x0000088b -_0808468C: .4byte 0x0000088d -_08084690: .4byte 0x0000088c -_08084694: .4byte 0x00000889 -_08084698: .4byte 0x00000888 + .pool thumb_func_end flag_var_implications_of_teleport_ thumb_func_start new_game new_game: @ 808469C push {lr} bl player_avatar_init_params_reset - ldr r0, _080846CC + ldr r0, =0x0000088b bl flag_clear - ldr r0, _080846D0 + ldr r0, =0x0000088d bl flag_clear - ldr r0, _080846D4 + ldr r0, =0x0000088c bl flag_clear - ldr r0, _080846D8 + ldr r0, =0x00000889 bl flag_clear - ldr r0, _080846DC + ldr r0, =0x00000888 bl flag_clear - ldr r0, _080846E0 + ldr r0, =0x08271862 bl script_env_2_execute_new_script pop {r0} bx r0 .align 2, 0 -_080846CC: .4byte 0x0000088b -_080846D0: .4byte 0x0000088d -_080846D4: .4byte 0x0000088c -_080846D8: .4byte 0x00000889 -_080846DC: .4byte 0x00000888 -_080846E0: .4byte 0x08271862 + .pool thumb_func_end new_game thumb_func_start flagmods_08054D70 flagmods_08054D70: @ 80846E4 push {lr} bl player_avatar_init_params_reset - ldr r0, _0808470C + ldr r0, =0x0000088b bl flag_clear - ldr r0, _08084710 + ldr r0, =0x0000088d bl flag_clear - ldr r0, _08084714 + ldr r0, =0x0000088c bl flag_clear - ldr r0, _08084718 + ldr r0, =0x00000889 bl flag_clear - ldr r0, _0808471C + ldr r0, =0x00000888 bl flag_clear pop {r0} bx r0 .align 2, 0 -_0808470C: .4byte 0x0000088b -_08084710: .4byte 0x0000088d -_08084714: .4byte 0x0000088c -_08084718: .4byte 0x00000889 -_0808471C: .4byte 0x00000888 + .pool thumb_func_end flagmods_08054D70 thumb_func_start sub_8084720 sub_8084720: @ 8084720 push {r4,lr} bl player_avatar_init_params_reset - ldr r0, _0808476C + ldr r0, =0x0000088b bl flag_clear - ldr r0, _08084770 + ldr r0, =0x0000088d bl flag_clear - ldr r0, _08084774 + ldr r0, =0x0000088c bl flag_clear - ldr r0, _08084778 + ldr r0, =0x00000889 bl flag_clear - ldr r0, _0808477C + ldr r0, =0x00000888 bl flag_clear - ldr r4, _08084780 + ldr r4, =0x00004039 adds r0, r4, 0 bl var_get lsls r0, 16 @@ -267078,7 +257265,7 @@ sub_8084720: @ 8084720 adds r0, r4, 0 movs r1, 0 bl var_set - ldr r0, _08084784 + ldr r0, =0x00004037 movs r1, 0 bl var_set _08084764: @@ -267086,19 +257273,13 @@ _08084764: pop {r0} bx r0 .align 2, 0 -_0808476C: .4byte 0x0000088b -_08084770: .4byte 0x0000088d -_08084774: .4byte 0x0000088c -_08084778: .4byte 0x00000889 -_0808477C: .4byte 0x00000888 -_08084780: .4byte 0x00004039 -_08084784: .4byte 0x00004037 + .pool thumb_func_end sub_8084720 thumb_func_start sub_8084788 sub_8084788: @ 8084788 push {lr} - ldr r0, _080847A4 + ldr r0, =0x0000088c bl flag_clear bl sub_8085B2C bl wild_pokemon_reroll @@ -267107,7 +257288,7 @@ sub_8084788: @ 8084788 pop {r0} bx r0 .align 2, 0 -_080847A4: .4byte 0x0000088c + .pool thumb_func_end sub_8084788 thumb_func_start sub_80847A8 @@ -267137,15 +257318,15 @@ sav12_xor_increment: @ 80847C4 adds r0, r4, 0 bl sub_80847F8 adds r1, r0, 0 - ldr r0, _080847E0 + ldr r0, =0x00fffffe cmp r1, r0 bhi _080847E4 adds r1, 0x1 b _080847E6 .align 2, 0 -_080847E0: .4byte 0x00fffffe + .pool _080847E4: - ldr r1, _080847F4 + ldr r1, =0x00ffffff _080847E6: adds r0, r4, 0 bl sav12_xor_set @@ -267154,7 +257335,7 @@ _080847EC: pop {r0} bx r0 .align 2, 0 -_080847F4: .4byte 0x00ffffff + .pool thumb_func_end sav12_xor_increment thumb_func_start sub_80847F8 @@ -267164,13 +257345,13 @@ sub_80847F8: @ 80847F8 lsrs r1, r0, 24 cmp r1, 0x33 bhi _08084828 - ldr r0, _0808481C + ldr r0, =0x03005d8c ldr r2, [r0] lsls r0, r1, 2 - ldr r1, _08084820 + ldr r1, =0x0000159c adds r2, r1 adds r2, r0 - ldr r0, _08084824 + ldr r0, =0x03005d90 ldr r1, [r0] adds r1, 0xAC ldr r0, [r2] @@ -267178,9 +257359,7 @@ sub_80847F8: @ 80847F8 eors r0, r1 b _0808482A .align 2, 0 -_0808481C: .4byte 0x03005d8c -_08084820: .4byte 0x0000159c -_08084824: .4byte 0x03005d90 + .pool _08084828: movs r0, 0 _0808482A: @@ -267196,13 +257375,13 @@ sav12_xor_set: @ 8084830 lsrs r2, r0, 24 cmp r2, 0x33 bhi _08084854 - ldr r0, _08084858 + ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r2, 2 - ldr r2, _0808485C + ldr r2, =0x0000159c adds r1, r2 adds r1, r0 - ldr r0, _08084860 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xAC ldr r0, [r0] @@ -267212,9 +257391,7 @@ _08084854: pop {r0} bx r0 .align 2, 0 -_08084858: .4byte 0x03005d8c -_0808485C: .4byte 0x0000159c -_08084860: .4byte 0x03005d90 + .pool thumb_func_end sav12_xor_set thumb_func_start sub_8084864 @@ -267222,10 +257399,10 @@ sub_8084864: @ 8084864 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 - ldr r6, _0808488C + ldr r6, =0x03005d8c _0808486C: lsls r1, r4, 2 - ldr r0, _08084890 + ldr r0, =0x0000159c adds r1, r0 ldr r0, [r6] adds r0, r1 @@ -267240,8 +257417,7 @@ _0808486C: pop {r0} bx r0 .align 2, 0 -_0808488C: .4byte 0x03005d8c -_08084890: .4byte 0x0000159c + .pool thumb_func_end sub_8084864 thumb_func_start sub_8084894 @@ -267250,15 +257426,15 @@ sub_8084894: @ 8084894 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r5, _080848D4 + ldr r5, =0x03005d8c ldr r1, [r5] movs r4, 0xC7 lsls r4, 4 adds r1, r4 - ldr r2, _080848D8 + ldr r2, =0x05000180 mov r0, sp bl CpuSet - ldr r0, _080848DC + ldr r0, =0x02037318 ldr r2, [r0, 0x4] ldr r0, [r2, 0x4] ldr r1, [r5] @@ -267276,17 +257452,15 @@ sub_8084894: @ 8084894 pop {r0} bx r0 .align 2, 0 -_080848D4: .4byte 0x03005d8c -_080848D8: .4byte 0x05000180 -_080848DC: .4byte 0x02037318 + .pool thumb_func_end sub_8084894 thumb_func_start sub_80848E0 sub_80848E0: @ 80848E0 push {lr} - ldr r0, _08084908 + ldr r0, =0x02037318 ldr r1, [r0, 0x4] - ldr r0, _0808490C + ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, [r1, 0x4] movs r3, 0xC7 @@ -267304,8 +257478,7 @@ _080848F4: pop {r0} bx r0 .align 2, 0 -_08084908: .4byte 0x02037318 -_0808490C: .4byte 0x03005d8c + .pool thumb_func_end sub_80848E0 thumb_func_start sub_8084910 @@ -267317,7 +257490,7 @@ sub_8084910: @ 8084910 lsrs r4, r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _08084938 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0 movs r6, 0xC7 @@ -267331,7 +257504,7 @@ _0808492A: strh r2, [r3, 0x6] b _08084944 .align 2, 0 -_08084938: .4byte 0x03005d8c + .pool _0808493C: adds r3, 0x18 adds r1, 0x1 @@ -267350,7 +257523,7 @@ sub_808494C: @ 808494C lsrs r4, r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, _0808496C + ldr r0, =0x03005d8c ldr r0, [r0] movs r3, 0 movs r5, 0xC7 @@ -267363,7 +257536,7 @@ _08084962: strb r1, [r2, 0x9] b _08084978 .align 2, 0 -_0808496C: .4byte 0x03005d8c + .pool _08084970: adds r2, 0x18 adds r3, 0x1 @@ -267379,7 +257552,7 @@ _08084978: mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980 push {r4,lr} bl move_tilemap_camera_to_upper_left_corner - ldr r4, _080849A4 + ldr r4, =0x02037318 ldr r0, [r4] bl copy_map_tileset1_tileset2_to_vram ldr r0, [r4] @@ -267390,13 +257563,13 @@ mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980 pop {r0} bx r0 .align 2, 0 -_080849A4: .4byte 0x02037318 + .pool thumb_func_end mapdata_load_assets_to_gpu_and_full_redraw thumb_func_start get_mapdata_header get_mapdata_header: @ 80849A8 push {lr} - ldr r0, _080849B8 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x32] cmp r1, 0 @@ -267404,9 +257577,9 @@ get_mapdata_header: @ 80849A8 movs r0, 0 b _080849C6 .align 2, 0 -_080849B8: .4byte 0x03005d8c + .pool _080849BC: - ldr r0, _080849CC + ldr r0, =0x08481dd4 subs r1, 0x1 lsls r1, 2 adds r1, r0 @@ -267415,58 +257588,51 @@ _080849C6: pop {r1} bx r1 .align 2, 0 -_080849CC: .4byte 0x08481dd4 + .pool thumb_func_end get_mapdata_header thumb_func_start warp_shift warp_shift: @ 80849D0 - ldr r3, _080849FC - ldr r0, _08084A00 + ldr r3, =0x020322dc + ldr r0, =0x03005d8c ldr r2, [r0] ldr r0, [r2, 0x4] ldr r1, [r2, 0x8] str r0, [r3] str r1, [r3, 0x4] - ldr r0, _08084A04 + ldr r0, =0x020322e4 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r2, 0x4] str r1, [r2, 0x8] - ldr r2, _08084A08 - ldr r0, _08084A0C + ldr r2, =0x020322ec + ldr r0, =0x08339d3c ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r2] str r1, [r2, 0x4] - ldr r2, _08084A10 + ldr r2, =0x020322f4 str r0, [r2] str r1, [r2, 0x4] bx lr .align 2, 0 -_080849FC: .4byte 0x020322dc -_08084A00: .4byte 0x03005d8c -_08084A04: .4byte 0x020322e4 -_08084A08: .4byte 0x020322ec -_08084A0C: .4byte 0x08339d3c -_08084A10: .4byte 0x020322f4 + .pool thumb_func_end warp_shift thumb_func_start set_warp2_warp3_to_neg_1 set_warp2_warp3_to_neg_1: @ 8084A14 - ldr r2, _08084A28 - ldr r0, _08084A2C + ldr r2, =0x020322ec + ldr r0, =0x08339d3c ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r2] str r1, [r2, 0x4] - ldr r2, _08084A30 + ldr r2, =0x020322f4 str r0, [r2] str r1, [r2, 0x4] bx lr .align 2, 0 -_08084A28: .4byte 0x020322ec -_08084A2C: .4byte 0x08339d3c -_08084A30: .4byte 0x020322f4 + .pool thumb_func_end set_warp2_warp3_to_neg_1 thumb_func_start warp_set @@ -267527,7 +257693,7 @@ _08084A8A: get_mapheader_by_bank_and_number: @ 8084A90 lsls r0, 16 lsls r1, 16 - ldr r2, _08084AA4 + ldr r2, =0x08486578 lsrs r0, 14 adds r0, r2 ldr r0, [r0] @@ -267536,13 +257702,13 @@ get_mapheader_by_bank_and_number: @ 8084A90 ldr r0, [r1] bx lr .align 2, 0 -_08084AA4: .4byte 0x08486578 + .pool thumb_func_end get_mapheader_by_bank_and_number thumb_func_start warp1_get_mapheader warp1_get_mapheader: @ 8084AA8 push {lr} - ldr r1, _08084AC8 + ldr r1, =0x020322e4 movs r0, 0 ldrsb r0, [r1, r0] lsls r0, 16 @@ -267556,17 +257722,17 @@ warp1_get_mapheader: @ 8084AA8 pop {r1} bx r1 .align 2, 0 -_08084AC8: .4byte 0x020322e4 + .pool thumb_func_end warp1_get_mapheader thumb_func_start set_current_map_header_from_sav1_save_old_name set_current_map_header_from_sav1_save_old_name: @ 8084ACC push {r4-r6,lr} - ldr r1, _08084B10 - ldr r4, _08084B14 + ldr r1, =0x020322fc + ldr r4, =0x02037318 ldrb r0, [r4, 0x14] strh r0, [r1] - ldr r5, _08084B18 + ldr r5, =0x03005d8c ldr r1, [r5] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -267594,16 +257760,14 @@ set_current_map_header_from_sav1_save_old_name: @ 8084ACC pop {r0} bx r0 .align 2, 0 -_08084B10: .4byte 0x020322fc -_08084B14: .4byte 0x02037318 -_08084B18: .4byte 0x03005d8c + .pool thumb_func_end set_current_map_header_from_sav1_save_old_name thumb_func_start set_current_map_header_from_sav1 set_current_map_header_from_sav1: @ 8084B1C push {r4,r5,lr} - ldr r4, _08084B54 - ldr r0, _08084B58 + ldr r4, =0x02037318 + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -267628,21 +257792,20 @@ set_current_map_header_from_sav1: @ 8084B1C pop {r0} bx r0 .align 2, 0 -_08084B54: .4byte 0x02037318 -_08084B58: .4byte 0x03005d8c + .pool thumb_func_end set_current_map_header_from_sav1 thumb_func_start update_camera_pos_from_warpid update_camera_pos_from_warpid: @ 8084B5C push {r4,r5,lr} - ldr r0, _08084B8C + ldr r0, =0x03005d8c ldr r2, [r0] movs r1, 0x6 ldrsb r1, [r2, r1] adds r4, r0, 0 cmp r1, 0 blt _08084B94 - ldr r3, _08084B90 + ldr r3, =0x02037318 ldr r0, [r3, 0x4] ldrb r5, [r0, 0x1] cmp r1, r5 @@ -267659,8 +257822,7 @@ update_camera_pos_from_warpid: @ 8084B5C strh r0, [r2, 0x2] b _08084BCC .align 2, 0 -_08084B8C: .4byte 0x03005d8c -_08084B90: .4byte 0x02037318 + .pool _08084B94: ldr r1, [r4] ldrh r3, [r1, 0x8] @@ -267678,7 +257840,7 @@ _08084B94: b _08084BCC _08084BB0: ldr r3, [r4] - ldr r2, _08084BD4 + ldr r2, =0x02037318 ldr r0, [r2] ldr r0, [r0] lsrs r1, r0, 31 @@ -267696,7 +257858,7 @@ _08084BCC: pop {r0} bx r0 .align 2, 0 -_08084BD4: .4byte 0x02037318 + .pool thumb_func_end update_camera_pos_from_warpid thumb_func_start warp_in @@ -267717,7 +257879,7 @@ warp1_set: @ 8084BEC adds r5, r1, 0 adds r6, r2, 0 ldr r1, [sp, 0x18] - ldr r0, _08084C24 + ldr r0, =0x020322e4 lsls r4, 24 asrs r4, 24 lsls r5, 24 @@ -267739,7 +257901,7 @@ warp1_set: @ 8084BEC pop {r0} bx r0 .align 2, 0 -_08084C24: .4byte 0x020322e4 + .pool thumb_func_end warp1_set thumb_func_start warp1_set_2 @@ -267765,7 +257927,7 @@ warp1_set_2: @ 8084C28 saved_warp2_set: @ 8084C48 push {r4,r5,lr} sub sp, 0x8 - ldr r0, _08084C78 + ldr r0, =0x03005d8c ldr r5, [r0] adds r0, r5, 0 adds r0, 0x14 @@ -267787,7 +257949,7 @@ saved_warp2_set: @ 8084C48 pop {r0} bx r0 .align 2, 0 -_08084C78: .4byte 0x03005d8c + .pool thumb_func_end saved_warp2_set thumb_func_start saved_warp2_set_2 @@ -267796,7 +257958,7 @@ saved_warp2_set_2: @ 8084C7C sub sp, 0x8 ldr r4, [sp, 0x14] ldr r5, [sp, 0x18] - ldr r0, _08084CB0 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x14 lsls r1, 24 @@ -267817,13 +257979,13 @@ saved_warp2_set_2: @ 8084C7C pop {r0} bx r0 .align 2, 0 -_08084CB0: .4byte 0x03005d8c + .pool thumb_func_end saved_warp2_set_2 thumb_func_start copy_saved_warp2_bank_and_enter_x_to_warp1 copy_saved_warp2_bank_and_enter_x_to_warp1: @ 8084CB4 - ldr r2, _08084CC4 - ldr r0, _08084CC8 + ldr r2, =0x020322e4 + ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, [r0, 0x18] ldr r0, [r0, 0x14] @@ -267831,8 +257993,7 @@ copy_saved_warp2_bank_and_enter_x_to_warp1: @ 8084CB4 str r1, [r2, 0x4] bx lr .align 2, 0 -_08084CC4: .4byte 0x020322e4 -_08084CC8: .4byte 0x03005d8c + .pool thumb_func_end copy_saved_warp2_bank_and_enter_x_to_warp1 thumb_func_start sub_8084CCC @@ -267867,8 +258028,8 @@ _08084CFA: thumb_func_start copy_saved_warp3_bank_and_enter_x_to_warp1 copy_saved_warp3_bank_and_enter_x_to_warp1: @ 8084D04 - ldr r2, _08084D14 - ldr r0, _08084D18 + ldr r2, =0x020322e4 + ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, [r0, 0x20] ldr r0, [r0, 0x1C] @@ -267876,8 +258037,7 @@ copy_saved_warp3_bank_and_enter_x_to_warp1: @ 8084D04 str r1, [r2, 0x4] bx lr .align 2, 0 -_08084D14: .4byte 0x020322e4 -_08084D18: .4byte 0x03005d8c + .pool thumb_func_end copy_saved_warp3_bank_and_enter_x_to_warp1 thumb_func_start sub_8084D1C @@ -267890,7 +258050,7 @@ sub_8084D1C: @ 8084D1C adds r5, r0, 0 cmp r5, 0 beq _08084D50 - ldr r0, _08084D58 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x1C movs r1, 0 @@ -267912,7 +258072,7 @@ _08084D50: pop {r0} bx r0 .align 2, 0 -_08084D58: .4byte 0x03005d8c + .pool thumb_func_end sub_8084D1C thumb_func_start sub_8084D5C @@ -267927,7 +258087,7 @@ sub_8084D5C: @ 8084D5C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08084DCC + ldr r1, =0x020322e4 movs r0, 0 ldrsb r0, [r1, r0] ldrb r1, [r1, 0x1] @@ -267947,7 +258107,7 @@ sub_8084D5C: @ 8084D5C lsrs r0, 24 cmp r0, 0x1 beq _08084DC4 - ldr r0, _08084DD0 + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -267970,8 +258130,7 @@ _08084DC4: pop {r0} bx r0 .align 2, 0 -_08084DCC: .4byte 0x020322e4 -_08084DD0: .4byte 0x03005d8c + .pool thumb_func_end sub_8084D5C thumb_func_start sub_8084DD4 @@ -267982,7 +258141,7 @@ sub_8084DD4: @ 8084DD4 adds r5, r1, 0 adds r6, r2, 0 ldr r1, [sp, 0x18] - ldr r0, _08084E10 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x24 lsls r4, 24 @@ -268006,13 +258165,13 @@ sub_8084DD4: @ 8084DD4 pop {r0} bx r0 .align 2, 0 -_08084E10: .4byte 0x03005d8c + .pool thumb_func_end sub_8084DD4 thumb_func_start sub_8084E14 sub_8084E14: @ 8084E14 - ldr r2, _08084E24 - ldr r0, _08084E28 + ldr r2, =0x020322e4 + ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, [r0, 0x28] ldr r0, [r0, 0x24] @@ -268020,8 +258179,7 @@ sub_8084E14: @ 8084E14 str r1, [r2, 0x4] bx lr .align 2, 0 -_08084E24: .4byte 0x020322e4 -_08084E28: .4byte 0x03005d8c + .pool thumb_func_end sub_8084E14 thumb_func_start sub_8084E2C @@ -268032,7 +258190,7 @@ sub_8084E2C: @ 8084E2C adds r5, r1, 0 adds r6, r2, 0 ldr r1, [sp, 0x18] - ldr r0, _08084E64 + ldr r0, =0x020322ec lsls r4, 24 asrs r4, 24 lsls r5, 24 @@ -268054,21 +258212,20 @@ sub_8084E2C: @ 8084E2C pop {r0} bx r0 .align 2, 0 -_08084E64: .4byte 0x020322ec + .pool thumb_func_end sub_8084E2C thumb_func_start warp1_set_to_warp2 warp1_set_to_warp2: @ 8084E68 - ldr r2, _08084E78 - ldr r0, _08084E7C + ldr r2, =0x020322e4 + ldr r0, =0x020322ec ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r2] str r1, [r2, 0x4] bx lr .align 2, 0 -_08084E78: .4byte 0x020322e4 -_08084E7C: .4byte 0x020322ec + .pool thumb_func_end warp1_set_to_warp2 thumb_func_start sub_8084E80 @@ -268079,7 +258236,7 @@ sub_8084E80: @ 8084E80 adds r5, r1, 0 adds r6, r2, 0 ldr r1, [sp, 0x18] - ldr r0, _08084EB8 + ldr r0, =0x020322f4 lsls r4, 24 asrs r4, 24 lsls r5, 24 @@ -268101,7 +258258,7 @@ sub_8084E80: @ 8084E80 pop {r0} bx r0 .align 2, 0 -_08084EB8: .4byte 0x020322f4 + .pool thumb_func_end sub_8084E80 thumb_func_start sub_8084EBC @@ -268112,22 +258269,20 @@ sub_8084EBC: @ 8084EBC lsrs r5, r0, 16 lsls r1, 16 lsrs r6, r1, 16 - ldr r4, _08084EE4 + ldr r4, =0x020322f4 adds r0, r4, 0 bl warp_data_is_not_neg_1 cmp r0, 0x1 bne _08084EF0 - ldr r2, _08084EE8 - ldr r0, _08084EEC + ldr r2, =0x020322e4 + ldr r0, =0x020322dc ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r2] str r1, [r2, 0x4] b _08084F0A .align 2, 0 -_08084EE4: .4byte 0x020322f4 -_08084EE8: .4byte 0x020322e4 -_08084EEC: .4byte 0x020322dc + .pool _08084EF0: movs r0, 0 ldrsb r0, [r4, r0] @@ -268150,8 +258305,8 @@ _08084F0A: thumb_func_start warp1_set_to_sav1w warp1_set_to_sav1w: @ 8084F14 - ldr r2, _08084F24 - ldr r0, _08084F28 + ldr r2, =0x020322e4 + ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, [r0, 0x10] ldr r0, [r0, 0xC] @@ -268159,8 +258314,7 @@ warp1_set_to_sav1w: @ 8084F14 str r1, [r2, 0x4] bx lr .align 2, 0 -_08084F24: .4byte 0x020322e4 -_08084F28: .4byte 0x03005d8c + .pool thumb_func_end warp1_set_to_sav1w thumb_func_start sub_8084F2C @@ -268171,7 +258325,7 @@ sub_8084F2C: @ 8084F2C adds r5, r1, 0 adds r6, r2, 0 ldr r1, [sp, 0x18] - ldr r0, _08084F68 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0xC lsls r4, 24 @@ -268195,7 +258349,7 @@ sub_8084F2C: @ 8084F2C pop {r0} bx r0 .align 2, 0 -_08084F68: .4byte 0x03005d8c + .pool thumb_func_end sub_8084F2C thumb_func_start sub_8084F6C @@ -268208,7 +258362,7 @@ sub_8084F6C: @ 8084F6C adds r5, r0, 0 cmp r5, 0 beq _08084FA0 - ldr r0, _08084FA8 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0xC movs r1, 0 @@ -268230,12 +258384,12 @@ _08084FA0: pop {r0} bx r0 .align 2, 0 -_08084FA8: .4byte 0x03005d8c + .pool thumb_func_end sub_8084F6C thumb_func_start sub_8084FAC sub_8084FAC: @ 8084FAC - ldr r0, _08084FBC + ldr r0, =0x03005d8c ldr r2, [r0] ldr r0, [r2, 0x14] ldr r1, [r2, 0x18] @@ -268243,7 +258397,7 @@ sub_8084FAC: @ 8084FAC str r1, [r2, 0x10] bx lr .align 2, 0 -_08084FBC: .4byte 0x03005d8c + .pool thumb_func_end sub_8084FAC thumb_func_start sub_8084FC0 @@ -268251,7 +258405,7 @@ sub_8084FC0: @ 8084FC0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08084FD4 + ldr r0, =0x02037318 ldr r0, [r0, 0xC] ldr r3, [r0] ldr r1, [r0, 0x4] @@ -268259,7 +258413,7 @@ sub_8084FC0: @ 8084FC0 bne _08084FDC b _08084FF0 .align 2, 0 -_08084FD4: .4byte 0x02037318 + .pool _08084FD8: adds r0, r1, 0 b _08084FF2 @@ -268313,14 +258467,14 @@ sub_8084FF8: @ 8084FF8 b _0808504C _08085030: bl mapheader_run_script_with_tag_x6 - ldr r0, _08085044 + ldr r0, =0x020322ec bl warp_data_is_not_neg_1 cmp r0, 0 beq _08085048 movs r0, 0 b _0808504E .align 2, 0 -_08085044: .4byte 0x020322ec + .pool _08085048: bl warp1_set_to_warp2 _0808504C: @@ -268387,7 +258541,7 @@ mliX_load_map: @ 8085098 str r3, [sp] adds r2, r3, 0 bl warp1_set - ldr r4, _08085158 + ldr r4, =0x02037318 ldrb r0, [r4, 0x14] cmp r0, 0x3A beq _080850C8 @@ -268428,11 +258582,11 @@ _08085116: bl sub_80AEE20 bl wild_encounter_reset_coro_args bl mapheader_run_script_with_tag_x5 - ldr r2, _08085158 + ldr r2, =0x02037318 ldrb r0, [r2, 0x14] cmp r0, 0x3A bne _0808514C - ldr r1, _0808515C + ldr r1, =0x020322fc ldrh r1, [r1] cmp r0, r1 beq _08085150 @@ -268444,8 +258598,7 @@ _08085150: pop {r0} bx r0 .align 2, 0 -_08085158: .4byte 0x02037318 -_0808515C: .4byte 0x020322fc + .pool thumb_func_end mliX_load_map thumb_func_start mli0_load_map @@ -268453,23 +258606,21 @@ mli0_load_map: @ 8085160 push {r4-r7,lr} adds r7, r0, 0 bl set_current_map_header_from_sav1_save_old_name - ldr r0, _08085184 + ldr r0, =0x020322d8 ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 bne _080851A2 - ldr r0, _08085188 + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] - ldr r0, _0808518C + ldr r0, =0x00000169 cmp r1, r0 bne _08085190 bl sub_81AA1D8 b _080851A2 .align 2, 0 -_08085184: .4byte 0x020322d8 -_08085188: .4byte 0x02037318 -_0808518C: .4byte 0x00000169 + .pool _08085190: bl sub_81D6074 cmp r0, 0 @@ -268479,7 +258630,7 @@ _08085190: _0808519E: bl sub_8084894 _080851A2: - ldr r4, _08085224 + ldr r4, =0x02037318 ldrb r0, [r4, 0x17] bl is_light_level_1_2_3_5_or_6 lsls r0, 24 @@ -268493,7 +258644,7 @@ _080851A2: bl sub_809D344 bl wild_pokemon_reroll bl prev_quest_postbuffer_cursor_backup_reset - ldr r0, _08085228 + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -268513,7 +258664,7 @@ _080851EE: bl sub_8085B2C cmp r5, 0 beq _08085200 - ldr r0, _0808522C + ldr r0, =0x00000888 bl flag_clear _08085200: bl update_sav1_flash_used_on_map @@ -268522,17 +258673,14 @@ _08085200: bl mapnumbers_history_shift_sav1_0_2_4_out bl sub_8161D00 ldrh r1, [r4, 0x12] - ldr r0, _08085230 + ldr r0, =0x00000169 cmp r1, r0 bne _08085234 movs r0, 0 bl sub_8087DAC b _08085246 .align 2, 0 -_08085224: .4byte 0x02037318 -_08085228: .4byte 0x03005d8c -_0808522C: .4byte 0x00000888 -_08085230: .4byte 0x00000169 + .pool _08085234: bl sub_81D6074 cmp r0, 0 @@ -268546,7 +258694,7 @@ _08085246: beq _0808525E cmp r6, 0 beq _0808525E - ldr r1, _08085264 + ldr r1, =0x03005dc0 ldr r0, [r1] ldr r1, [r1, 0x4] bl per_step_2 @@ -268557,25 +258705,25 @@ _0808525E: pop {r0} bx r0 .align 2, 0 -_08085264: .4byte 0x03005dc0 + .pool thumb_func_end mli0_load_map thumb_func_start player_avatar_init_params_reset player_avatar_init_params_reset: @ 8085268 - ldr r1, _08085274 + ldr r1, =0x02032300 movs r0, 0x1 strb r0, [r1, 0x1] strb r0, [r1] bx lr .align 2, 0 -_08085274: .4byte 0x02032300 + .pool thumb_func_end player_avatar_init_params_reset thumb_func_start walkrun_find_lowest_active_bit_in_bitfield walkrun_find_lowest_active_bit_in_bitfield: @ 8085278 push {r4,lr} bl player_get_direction__sp1AA - ldr r4, _08085294 + ldr r4, =0x02032300 strb r0, [r4, 0x1] movs r0, 0x2 bl walkrun_bitfield_and_r0 @@ -268585,7 +258733,7 @@ walkrun_find_lowest_active_bit_in_bitfield: @ 8085278 movs r0, 0x2 b _080852CA .align 2, 0 -_08085294: .4byte 0x02032300 + .pool _08085298: movs r0, 0x4 bl walkrun_bitfield_and_r0 @@ -268630,7 +258778,7 @@ sub_80852D4: @ 80852D4 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r6, _08085320 + ldr r6, =0x02032300 adds r0, r6, 0 adds r1, r4, 0 adds r2, r5, 0 @@ -268638,7 +258786,7 @@ sub_80852D4: @ 80852D4 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _08085324 + ldr r0, =0xffffff00 ands r7, r0 orrs r7, r1 adds r0, r6, 0 @@ -268647,7 +258795,7 @@ sub_80852D4: @ 80852D4 bl sub_808538C lsls r0, 24 lsrs r0, 16 - ldr r1, _08085328 + ldr r1, =0xffff00ff ands r7, r1 orrs r7, r0 str r7, [r6] @@ -268656,9 +258804,7 @@ sub_80852D4: @ 80852D4 pop {r1} bx r1 .align 2, 0 -_08085320: .4byte 0x02032300 -_08085324: .4byte 0xffffff00 -_08085328: .4byte 0xffff00ff + .pool thumb_func_end sub_80852D4 thumb_func_start sub_808532C @@ -268671,7 +258817,7 @@ sub_808532C: @ 808532C lsrs r4, r2, 24 cmp r4, 0x8 beq _08085348 - ldr r0, _08085350 + ldr r0, =0x0000088d bl flag_check lsls r0, 24 cmp r0, 0 @@ -268682,7 +258828,7 @@ _08085348: movs r0, 0x10 b _08085384 .align 2, 0 -_08085350: .4byte 0x0000088d + .pool _08085354: lsls r0, r5, 24 lsrs r0, 24 @@ -268725,7 +258871,7 @@ sub_808538C: @ 808538C lsrs r4, r2, 16 lsls r3, 24 lsrs r5, r3, 24 - ldr r0, _080853EC + ldr r0, =0x0000088d bl flag_check lsls r0, 24 cmp r0, 0 @@ -268763,7 +258909,7 @@ _080853E8: movs r0, 0x2 b _08085448 .align 2, 0 -_080853EC: .4byte 0x0000088d + .pool _080853F0: adds r0, r5, 0 bl sub_8088FD4 @@ -268821,7 +258967,7 @@ _08085448: thumb_func_start cur_mapdata_block_role_at_screen_center_acc_to_sav1 cur_mapdata_block_role_at_screen_center_acc_to_sav1: @ 8085450 push {lr} - ldr r0, _08085470 + ldr r0, =0x03005d8c ldr r1, [r0] movs r2, 0 ldrsh r0, [r1, r2] @@ -268835,13 +258981,13 @@ cur_mapdata_block_role_at_screen_center_acc_to_sav1: @ 8085450 pop {r1} bx r1 .align 2, 0 -_08085470: .4byte 0x03005d8c + .pool thumb_func_end cur_mapdata_block_role_at_screen_center_acc_to_sav1 thumb_func_start sav1_map_is_biking_allowed sav1_map_is_biking_allowed: @ 8085474 push {lr} - ldr r0, _08085488 + ldr r0, =0x02037318 ldrb r1, [r0, 0x1A] movs r0, 0x1 ands r0, r1 @@ -268850,7 +258996,7 @@ sav1_map_is_biking_allowed: @ 8085474 movs r0, 0x1 b _0808548E .align 2, 0 -_08085488: .4byte 0x02037318 + .pool _0808548C: movs r0, 0 _0808548E: @@ -268861,37 +259007,35 @@ _0808548E: thumb_func_start update_sav1_flash_used_on_map update_sav1_flash_used_on_map: @ 8085494 push {lr} - ldr r0, _080854A8 + ldr r0, =0x02037318 ldrb r1, [r0, 0x15] cmp r1, 0 bne _080854B0 - ldr r0, _080854AC + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x30 strb r1, [r0] b _080854DE .align 2, 0 -_080854A8: .4byte 0x02037318 -_080854AC: .4byte 0x03005d8c + .pool _080854B0: - ldr r0, _080854C8 + ldr r0, =0x00000888 bl flag_check lsls r0, 24 cmp r0, 0 beq _080854D0 - ldr r0, _080854CC + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x30 movs r1, 0x1 strb r1, [r0] b _080854DE .align 2, 0 -_080854C8: .4byte 0x00000888 -_080854CC: .4byte 0x03005d8c + .pool _080854D0: - ldr r0, _080854E4 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _080854E8 + ldr r0, =0x0854fe78 ldr r0, [r0] subs r0, 0x1 adds r1, 0x30 @@ -268900,8 +259044,7 @@ _080854DE: pop {r0} bx r0 .align 2, 0 -_080854E4: .4byte 0x03005d8c -_080854E8: .4byte 0x0854fe78 + .pool thumb_func_end update_sav1_flash_used_on_map thumb_func_start sub_80854EC @@ -268910,74 +259053,72 @@ sub_80854EC: @ 80854EC adds r1, r0, 0 cmp r1, 0 blt _080854FC - ldr r0, _0808550C + ldr r0, =0x0854fe78 ldr r0, [r0] cmp r1, r0 ble _080854FE _080854FC: movs r1, 0 _080854FE: - ldr r0, _08085510 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x30 strb r1, [r0] pop {r0} bx r0 .align 2, 0 -_0808550C: .4byte 0x0854fe78 -_08085510: .4byte 0x03005d8c + .pool thumb_func_end sub_80854EC thumb_func_start sav1_get_flash_used_on_map sav1_get_flash_used_on_map: @ 8085514 - ldr r0, _08085520 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x30 ldrb r0, [r0] bx lr .align 2, 0 -_08085520: .4byte 0x03005d8c + .pool thumb_func_end sav1_get_flash_used_on_map thumb_func_start sub_8085524 sub_8085524: @ 8085524 push {lr} - ldr r1, _08085538 + ldr r1, =0x03005d8c ldr r1, [r1] strh r0, [r1, 0x32] bl get_mapdata_header - ldr r1, _0808553C + ldr r1, =0x02037318 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08085538: .4byte 0x03005d8c -_0808553C: .4byte 0x02037318 + .pool thumb_func_end sub_8085524 thumb_func_start sub_8085540 sub_8085540: @ 8085540 - ldr r1, _08085548 + ldr r1, =0x020322d8 strb r0, [r1] bx lr .align 2, 0 -_08085548: .4byte 0x020322d8 + .pool thumb_func_end sub_8085540 thumb_func_start sub_808554C sub_808554C: @ 808554C - ldr r0, _08085554 + ldr r0, =0x020322d8 ldrb r0, [r0] bx lr .align 2, 0 -_08085554: .4byte 0x020322d8 + .pool thumb_func_end sub_808554C thumb_func_start sub_8085558 sub_8085558: @ 8085558 push {r4,lr} adds r4, r0, 0 - ldr r0, _080855A4 + ldr r0, =0x0000088a bl flag_check lsls r0, 24 cmp r0, 0 @@ -268997,7 +259138,7 @@ sub_8085558: @ 8085558 cmp r0, 0x27 bge _0808559E _08085584: - ldr r0, _080855A8 + ldr r0, =0x0000405e bl var_get lsls r0, 16 lsrs r0, 16 @@ -269013,8 +259154,7 @@ _0808559E: movs r0, 0x1 b _080855AE .align 2, 0 -_080855A4: .4byte 0x0000088a -_080855A8: .4byte 0x0000405e + .pool _080855AC: movs r0, 0 _080855AE: @@ -269027,7 +259167,7 @@ _080855AE: sub_80855B4: @ 80855B4 push {r4,lr} adds r4, r0, 0 - ldr r0, _080855DC + ldr r0, =0x000040ca bl var_get lsls r0, 16 lsrs r0, 16 @@ -269045,7 +259185,7 @@ _080855D6: movs r0, 0 b _080855E2 .align 2, 0 -_080855DC: .4byte 0x000040ca + .pool _080855E0: movs r0, 0x1 _080855E2: @@ -269058,7 +259198,7 @@ _080855E2: sub_80855E8: @ 80855E8 push {r4,lr} adds r4, r0, 0 - ldr r0, _0808560C + ldr r0, =0x000040b3 bl var_get lsls r0, 16 cmp r0, 0 @@ -269074,7 +259214,7 @@ _08085606: movs r0, 0 b _08085612 .align 2, 0 -_0808560C: .4byte 0x000040b3 + .pool _08085610: movs r0, 0x1 _08085612: @@ -269087,7 +259227,7 @@ _08085612: sub_8085618: @ 8085618 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08085650 + ldr r4, =0x0000405d adds r0, r4, 0 bl var_get lsls r0, 16 @@ -269113,7 +259253,7 @@ _0808564C: movs r0, 0 b _08085656 .align 2, 0 -_08085650: .4byte 0x0000405d + .pool _08085654: movs r0, 0x1 _08085656: @@ -269131,10 +259271,10 @@ warp_target_get_music: @ 808565C lsrs r0, 16 cmp r0, 0x1 bne _08085674 - ldr r0, _08085670 + ldr r0, =0x0000ffff b _080856CE .align 2, 0 -_08085670: .4byte 0x0000ffff + .pool _08085674: adds r0, r4, 0 bl sub_8085558 @@ -269142,10 +259282,10 @@ _08085674: lsrs r0, 16 cmp r0, 0x1 bne _0808568C - ldr r0, _08085688 + ldr r0, =0x000001bb b _080856CE .align 2, 0 -_08085688: .4byte 0x000001bb + .pool _0808568C: adds r0, r4, 0 bl sub_8085618 @@ -269153,10 +259293,10 @@ _0808568C: lsrs r0, 16 cmp r0, 0x1 bne _080856A4 - ldr r0, _080856A0 + ldr r0, =0x000001b9 b _080856CE .align 2, 0 -_080856A0: .4byte 0x000001b9 + .pool _080856A4: adds r0, r4, 0 bl sub_80855E8 @@ -269187,7 +259327,7 @@ _080856CE: thumb_func_start sav1_map_get_music sav1_map_get_music: @ 80856D4 push {r4,lr} - ldr r0, _080856F4 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0xD0 @@ -269199,26 +259339,24 @@ sav1_map_get_music: @ 80856D4 lsrs r0, 24 cmp r0, 0x8 bne _080856FC - ldr r0, _080856F8 + ldr r0, =0x00000199 b _08085730 .align 2, 0 -_080856F4: .4byte 0x03005d8c -_080856F8: .4byte 0x00000199 + .pool _080856FC: - ldr r4, _08085714 + ldr r4, =0x03005d8c ldr r0, [r4] adds r0, 0x4 bl warp_target_get_music lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _08085718 + ldr r0, =0x00007fff cmp r1, r0 beq _0808571C adds r0, r1, 0 b _08085730 .align 2, 0 -_08085714: .4byte 0x03005d8c -_08085718: .4byte 0x00007fff + .pool _0808571C: ldr r0, [r4] movs r1, 0 @@ -269240,20 +259378,19 @@ _08085730: thumb_func_start warp1_target_get_music warp1_target_get_music: @ 8085738 push {lr} - ldr r0, _08085750 + ldr r0, =0x020322e4 bl warp_target_get_music lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _08085754 + ldr r0, =0x00007fff cmp r1, r0 beq _08085758 adds r0, r1, 0 b _08085774 .align 2, 0 -_08085750: .4byte 0x020322e4 -_08085754: .4byte 0x00007fff + .pool _08085758: - ldr r0, _0808576C + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0x80 @@ -269263,7 +259400,7 @@ _08085758: subs r0, 0x6E b _08085774 .align 2, 0 -_0808576C: .4byte 0x03005d8c + .pool _08085770: movs r0, 0xB4 lsls r0, 1 @@ -269286,13 +259423,13 @@ sub_8085784: @ 8085784 bl sav1_map_get_music lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _080857A8 + ldr r0, =0x000001bb cmp r4, r0 beq _080857D6 - ldr r0, _080857AC + ldr r0, =0x0000ffff cmp r4, r0 beq _080857D6 - ldr r0, _080857B0 + ldr r0, =0x03005d8c ldr r1, [r0] ldrh r0, [r1, 0x2C] cmp r0, 0 @@ -269300,26 +259437,24 @@ sub_8085784: @ 8085784 adds r4, r0, 0 b _080857D6 .align 2, 0 -_080857A8: .4byte 0x000001bb -_080857AC: .4byte 0x0000ffff -_080857B0: .4byte 0x03005d8c + .pool _080857B4: bl sav1_map_get_light_level lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 bne _080857C8 - ldr r4, _080857C4 + ldr r4, =0x0000019b b _080857D6 .align 2, 0 -_080857C4: .4byte 0x0000019b + .pool _080857C8: movs r0, 0x8 bl walkrun_bitfield_and_r0 lsls r0, 24 cmp r0, 0 beq _080857D6 - ldr r4, _080857F0 + ldr r4, =0x0000016d _080857D6: bl current_map_music_get lsls r0, 16 @@ -269333,34 +259468,34 @@ _080857E8: pop {r0} bx r0 .align 2, 0 -_080857F0: .4byte 0x0000016d + .pool thumb_func_end sub_8085784 thumb_func_start sav1_set_x2C sav1_set_x2C: @ 80857F4 - ldr r1, _080857FC + ldr r1, =0x03005d8c ldr r1, [r1] strh r0, [r1, 0x2C] bx lr .align 2, 0 -_080857FC: .4byte 0x03005d8c + .pool thumb_func_end sav1_set_x2C thumb_func_start sav1_reset_x2C sav1_reset_x2C: @ 8085800 - ldr r0, _0808580C + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0 strh r0, [r1, 0x2C] bx lr .align 2, 0 -_0808580C: .4byte 0x03005d8c + .pool thumb_func_end sav1_reset_x2C thumb_func_start sub_8085810 sub_8085810: @ 8085810 push {r4-r6,lr} - ldr r0, _08085874 + ldr r0, =0x00004001 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -269372,16 +259507,16 @@ sub_8085810: @ 8085810 bl current_map_music_get lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _08085878 + ldr r0, =0x000001bb cmp r4, r0 beq _08085856 - ldr r0, _0808587C + ldr r0, =0x0000ffff cmp r4, r0 beq _08085856 - ldr r0, _08085880 + ldr r0, =0x0000019b cmp r5, r0 beq _08085890 - ldr r6, _08085884 + ldr r6, =0x0000016d cmp r5, r6 beq _08085890 movs r0, 0x8 @@ -269404,11 +259539,7 @@ _08085856: bl sub_80A2FBC b _08085890 .align 2, 0 -_08085874: .4byte 0x00004001 -_08085878: .4byte 0x000001bb -_0808587C: .4byte 0x0000ffff -_08085880: .4byte 0x0000019b -_08085884: .4byte 0x0000016d + .pool _08085888: adds r0, r4, 0 movs r1, 0x8 @@ -269452,7 +259583,7 @@ sub_80858C4: @ 80858C4 lsrs r1, r0, 16 cmp r1, r4 beq _080858E4 - ldr r0, _080858EC + ldr r0, =0x000001bb cmp r1, r0 beq _080858E4 adds r0, r4, 0 @@ -269463,7 +259594,7 @@ _080858E4: pop {r0} bx r0 .align 2, 0 -_080858EC: .4byte 0x000001bb + .pool thumb_func_end sub_80858C4 thumb_func_start is_warp1_light_level_8_or_9 @@ -269494,7 +259625,7 @@ music_something: @ 8085910 bl warp1_target_get_music lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _08085984 + ldr r0, =0x00004001 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -269505,30 +259636,30 @@ music_something: @ 8085910 lsrs r0, 16 cmp r4, r0 beq _0808597E - ldr r0, _08085988 + ldr r0, =0x0000016d cmp r5, r0 bne _08085972 - ldr r0, _0808598C + ldr r0, =0x000040ca bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 bne _08085972 - ldr r0, _08085990 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08085994 + ldr r1, =0x0000ffff ldrh r2, [r0, 0x4] movs r0, 0xE0 lsls r0, 3 cmp r2, r0 bne _08085972 - ldr r3, _08085998 + ldr r3, =0x020322e4 ldrh r0, [r3] ands r1, r0 cmp r1, r2 bne _08085972 ldr r1, [r3, 0x4] - ldr r0, _0808599C + ldr r0, =0x0035001d cmp r1, r0 beq _0808597E _08085972: @@ -269541,13 +259672,7 @@ _0808597E: pop {r0} bx r0 .align 2, 0 -_08085984: .4byte 0x00004001 -_08085988: .4byte 0x0000016d -_0808598C: .4byte 0x000040ca -_08085990: .4byte 0x03005d8c -_08085994: .4byte 0x0000ffff -_08085998: .4byte 0x020322e4 -_0808599C: .4byte 0x0035001d + .pool thumb_func_end music_something thumb_func_start sub_80859A0 @@ -269578,7 +259703,7 @@ sub_80859BC: @ 80859BC mov r0, sp adds r1, r4, 0 bl player_get_pos_to - ldr r0, _08085A34 + ldr r0, =0x02032306 ldrb r0, [r0] cmp r0, 0x1 bne _080859F0 @@ -269611,7 +259736,7 @@ _080859F0: bl __umodsi3 adds r2, r0, 0 adds r2, 0x32 - ldr r0, _08085A38 + ldr r0, =0x02032304 ldrh r0, [r0] lsls r4, 24 asrs r4, 24 @@ -269626,8 +259751,7 @@ _08085A2C: pop {r0} bx r0 .align 2, 0 -_08085A34: .4byte 0x02032306 -_08085A38: .4byte 0x02032304 + .pool thumb_func_end sub_80859BC thumb_func_start wild_encounter_related @@ -269643,12 +259767,12 @@ wild_encounter_related: @ 8085A3C cmp r0, 0x4 bhi _08085B20 lsls r0, 2 - ldr r1, _08085A5C + ldr r1, =_08085A60 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08085A5C: .4byte _08085A60 + .pool .align 2, 0 _08085A60: .4byte _08085A74 @@ -269657,14 +259781,14 @@ _08085A60: .4byte _08085B0C .4byte _08085B20 _08085A74: - ldr r0, _08085A80 + ldr r0, =0x02032304 ldrh r0, [r0] cmp r0, 0 bne _08085A84 movs r0, 0x4 b _08085B1E .align 2, 0 -_08085A80: .4byte 0x02032304 + .pool _08085A84: movs r0, 0x1 b _08085B1E @@ -269699,7 +259823,7 @@ _08085ABC: bcs _08085AE4 movs r0, 0x64 muls r0, r5 - ldr r4, _08085B08 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x6 bl pokemon_getattr @@ -269730,7 +259854,7 @@ _08085AE4: movs r0, 0x3 b _08085B1E .align 2, 0 -_08085B08: .4byte 0x020244ec + .pool _08085B0C: ldrh r0, [r7] subs r0, 0x1 @@ -269754,7 +259878,7 @@ _08085B20: thumb_func_start sub_8085B2C sub_8085B2C: @ 8085B2C push {lr} - ldr r0, _08085B54 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0xB4 @@ -269765,25 +259889,23 @@ sub_8085B2C: @ 8085B2C lsls r0, 24 cmp r0, 0 bne _08085B5C - ldr r1, _08085B58 + ldr r1, =0x02032306 movs r0, 0x1 strb r0, [r1] bl sub_80B582C b _08085B62 .align 2, 0 -_08085B54: .4byte 0x03005d8c -_08085B58: .4byte 0x02032306 + .pool _08085B5C: - ldr r0, _08085B6C + ldr r0, =0x02032306 bl wild_pokemon_rand_for_map _08085B62: - ldr r1, _08085B70 + ldr r1, =0x02032304 strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_08085B6C: .4byte 0x02032306 -_08085B70: .4byte 0x02032304 + .pool thumb_func_end sub_8085B2C thumb_func_start get_map_light_level_by_bank_and_number @@ -269819,7 +259941,7 @@ get_map_light_level_from_warp: @ 8085B8C thumb_func_start sav1_map_get_light_level sav1_map_get_light_level: @ 8085BA4 push {lr} - ldr r0, _08085BB8 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x4 bl get_map_light_level_from_warp @@ -269828,20 +259950,20 @@ sav1_map_get_light_level: @ 8085BA4 pop {r1} bx r1 .align 2, 0 -_08085BB8: .4byte 0x03005d8c + .pool thumb_func_end sav1_map_get_light_level thumb_func_start get_map_light_from_warp0 get_map_light_from_warp0: @ 8085BBC push {lr} - ldr r0, _08085BCC + ldr r0, =0x020322dc bl get_map_light_level_from_warp lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_08085BCC: .4byte 0x020322dc + .pool thumb_func_end get_map_light_from_warp0 thumb_func_start is_light_level_1_2_3_5_or_6 @@ -269914,7 +260036,7 @@ _08085C2A: thumb_func_start sav1_saved_warp2_map_get_name sav1_saved_warp2_map_get_name: @ 8085C30 push {lr} - ldr r0, _08085C54 + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x14 ldrsb r0, [r1, r0] @@ -269930,13 +260052,13 @@ sav1_saved_warp2_map_get_name: @ 8085C30 pop {r1} bx r1 .align 2, 0 -_08085C54: .4byte 0x03005d8c + .pool thumb_func_end sav1_saved_warp2_map_get_name thumb_func_start sav1_map_get_name sav1_map_get_name: @ 8085C58 push {lr} - ldr r0, _08085C7C + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -269952,13 +260074,13 @@ sav1_map_get_name: @ 8085C58 pop {r1} bx r1 .align 2, 0 -_08085C7C: .4byte 0x03005d8c + .pool thumb_func_end sav1_map_get_name thumb_func_start sav1_map_get_battletype sav1_map_get_battletype: @ 8085C80 push {lr} - ldr r0, _08085CA4 + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -269974,7 +260096,7 @@ sav1_map_get_battletype: @ 8085C80 pop {r1} bx r1 .align 2, 0 -_08085CA4: .4byte 0x03005d8c + .pool thumb_func_end sav1_map_get_battletype thumb_func_start overworld_bg_setup @@ -269982,7 +260104,7 @@ overworld_bg_setup: @ 8085CA8 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r1, _08085D24 + ldr r1, =0x08339dac movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -269998,7 +260120,7 @@ overworld_bg_setup: @ 8085CA8 movs r1, 0x5 movs r2, 0x1 bl gpu_bg_config_set_field - ldr r0, _08085D28 + ldr r0, =0x03005da0 mov r8, r0 movs r4, 0x80 lsls r4, 4 @@ -270006,11 +260128,11 @@ overworld_bg_setup: @ 8085CA8 bl malloc_and_clear mov r1, r8 str r0, [r1] - ldr r6, _08085D2C + ldr r6, =0x03005d9c adds r0, r4, 0 bl malloc_and_clear str r0, [r6] - ldr r5, _08085D30 + ldr r5, =0x03005da4 adds r0, r4, 0 bl malloc_and_clear str r0, [r5] @@ -270031,10 +260153,7 @@ overworld_bg_setup: @ 8085CA8 pop {r0} bx r0 .align 2, 0 -_08085D24: .4byte 0x08339dac -_08085D28: .4byte 0x03005da0 -_08085D2C: .4byte 0x03005d9c -_08085D30: .4byte 0x03005da4 + .pool thumb_func_end overworld_bg_setup thumb_func_start overworld_free_bg_tilemaps @@ -270042,7 +260161,7 @@ overworld_free_bg_tilemaps: @ 8085D34 push {r4,lr} bl sub_81BE72C bl sub_81971F4 - ldr r4, _08085D74 + ldr r4, =0x03005da4 ldr r0, [r4] cmp r0, 0 beq _08085D4E @@ -270050,7 +260169,7 @@ overworld_free_bg_tilemaps: @ 8085D34 movs r0, 0 str r0, [r4] _08085D4E: - ldr r4, _08085D78 + ldr r4, =0x03005d9c ldr r0, [r4] cmp r0, 0 beq _08085D5E @@ -270058,7 +260177,7 @@ _08085D4E: movs r0, 0 str r0, [r4] _08085D5E: - ldr r4, _08085D7C + ldr r4, =0x03005da0 ldr r0, [r4] cmp r0, 0 beq _08085D6E @@ -270070,9 +260189,7 @@ _08085D6E: pop {r0} bx r0 .align 2, 0 -_08085D74: .4byte 0x03005da4 -_08085D78: .4byte 0x03005d9c -_08085D7C: .4byte 0x03005da0 + .pool thumb_func_end overworld_free_bg_tilemaps thumb_func_start flag_clear_is_in_safari_zone_ @@ -270086,16 +260203,15 @@ flag_clear_is_in_safari_zone_: @ 8085D80 thumb_func_start is_c1_link_related_active is_c1_link_related_active: @ 8085D8C push {lr} - ldr r0, _08085D9C + ldr r0, =0x030022c0 ldr r1, [r0] - ldr r0, _08085DA0 + ldr r0, =c1_link_related + 1 cmp r1, r0 beq _08085DA4 movs r0, 0 b _08085DA6 .align 2, 0 -_08085D9C: .4byte 0x030022c0 -_08085DA0: .4byte c1_link_related + 1 + .pool _08085DA4: movs r0, 0x1 _08085DA6: @@ -270147,9 +260263,9 @@ _08085DFA: thumb_func_start c1_overworld c1_overworld: @ 8085E04 push {lr} - ldr r2, _08085E1C + ldr r2, =0x030022c0 ldr r1, [r2, 0x4] - ldr r0, _08085E20 + ldr r0, =c2_overworld + 1 cmp r1, r0 bne _08085E18 ldrh r0, [r2, 0x2E] @@ -270159,8 +260275,7 @@ _08085E18: pop {r0} bx r0 .align 2, 0 -_08085E1C: .4byte 0x030022c0 -_08085E20: .4byte c2_overworld + 1 + .pool thumb_func_end c1_overworld thumb_func_start c2_overworld_basic @@ -270190,7 +260305,7 @@ sub_8085E50: @ 8085E50 thumb_func_start c2_overworld c2_overworld: @ 8085E5C push {r4,lr} - ldr r0, _08085E84 + ldr r0, =0x02037fd4 ldrb r0, [r0, 0x7] lsrs r0, 7 adds r4, r0, 0 @@ -270208,31 +260323,31 @@ _08085E7C: pop {r0} bx r0 .align 2, 0 -_08085E84: .4byte 0x02037fd4 + .pool thumb_func_end c2_overworld thumb_func_start set_callback1 set_callback1: @ 8085E88 - ldr r1, _08085E90 + ldr r1, =0x030022c0 str r0, [r1] bx lr .align 2, 0 -_08085E90: .4byte 0x030022c0 + .pool thumb_func_end set_callback1 thumb_func_start sub_8085E94 sub_8085E94: @ 8085E94 - ldr r1, _08085E9C + ldr r1, =0x03000e0c str r0, [r1] bx lr .align 2, 0 -_08085E9C: .4byte 0x03000e0c + .pool thumb_func_end sub_8085E94 thumb_func_start map_post_load_hook_exec map_post_load_hook_exec: @ 8085EA0 push {r4,lr} - ldr r4, _08085EB8 + ldr r4, =0x03005db0 ldr r0, [r4] cmp r0, 0 beq _08085ECC @@ -270243,28 +260358,28 @@ map_post_load_hook_exec: @ 8085EA0 movs r0, 0 b _08085EEC .align 2, 0 -_08085EB8: .4byte 0x03005db0 + .pool _08085EBC: movs r1, 0 str r1, [r4] - ldr r0, _08085EC8 + ldr r0, =0x03005dac str r1, [r0] b _08085EEA .align 2, 0 -_08085EC8: .4byte 0x03005dac + .pool _08085ECC: - ldr r0, _08085EDC + ldr r0, =0x03005dac ldr r0, [r0] cmp r0, 0 beq _08085EE0 bl _call_via_r0 b _08085EE4 .align 2, 0 -_08085EDC: .4byte 0x03005dac + .pool _08085EE0: bl mapldr_default _08085EE4: - ldr r1, _08085EF4 + ldr r1, =0x03005dac movs r0, 0 str r0, [r1] _08085EEA: @@ -270274,7 +260389,7 @@ _08085EEC: pop {r1} bx r1 .align 2, 0 -_08085EF4: .4byte 0x03005dac + .pool thumb_func_end map_post_load_hook_exec thumb_func_start c2_new_game @@ -270288,35 +260403,30 @@ c2_new_game: @ 8085EF8 bl set_max_playtime_if_appropriate bl script_env_1_init bl script_env_2_disable - ldr r1, _08085F40 - ldr r0, _08085F44 + ldr r1, =0x03005dac + ldr r0, =sub_80FB4E0 + 1 str r0, [r1] - ldr r1, _08085F48 + ldr r1, =0x03005db0 movs r0, 0 str r0, [r1] - ldr r0, _08085F4C + ldr r0, =0x030026f8 bl do_load_map_stuff_loop bl set_vblank_callback_8086390 - ldr r0, _08085F50 + ldr r0, =c1_overworld + 1 bl set_callback1 - ldr r0, _08085F54 + ldr r0, =c2_overworld + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_08085F40: .4byte 0x03005dac -_08085F44: .4byte sub_80FB4E0 + 1 -_08085F48: .4byte 0x03005db0 -_08085F4C: .4byte 0x030026f8 -_08085F50: .4byte c1_overworld + 1 -_08085F54: .4byte c2_overworld + 1 + .pool thumb_func_end c2_new_game thumb_func_start c2_whiteout c2_whiteout: @ 8085F58 push {lr} sub sp, 0x4 - ldr r1, _08085FB8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -270334,8 +260444,8 @@ c2_whiteout: @ 8085F58 bl player_avatar_init_params_reset bl script_env_1_init bl script_env_2_disable - ldr r1, _08085FBC - ldr r0, _08085FC0 + ldr r1, =0x03005dac + ldr r0, =sub_80AF3C8 + 1 str r0, [r1] mov r1, sp movs r0, 0 @@ -270343,20 +260453,16 @@ c2_whiteout: @ 8085F58 mov r0, sp bl do_load_map_stuff_loop bl set_vblank_callback_8086390 - ldr r0, _08085FC4 + ldr r0, =c1_overworld + 1 bl set_callback1 - ldr r0, _08085FC8 + ldr r0, =c2_overworld + 1 bl set_callback2 _08085FB0: add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08085FB8: .4byte 0x030022c0 -_08085FBC: .4byte 0x03005dac -_08085FC0: .4byte sub_80AF3C8 + 1 -_08085FC4: .4byte c1_overworld + 1 -_08085FC8: .4byte c2_overworld + 1 + .pool thumb_func_end c2_whiteout thumb_func_start c2_load_new_map @@ -270367,41 +260473,37 @@ c2_load_new_map: @ 8085FCC bl script_env_2_disable movs r0, 0 bl set_callback1 - ldr r0, _08085FF0 + ldr r0, =c2_change_map + 1 bl set_callback2 - ldr r1, _08085FF4 - ldr r0, _08085FF8 + ldr r1, =0x030022c0 + ldr r0, =c2_load_new_map_2 + 1 str r0, [r1, 0x8] pop {r0} bx r0 .align 2, 0 -_08085FF0: .4byte c2_change_map + 1 -_08085FF4: .4byte 0x030022c0 -_08085FF8: .4byte c2_load_new_map_2 + 1 + .pool thumb_func_end c2_load_new_map thumb_func_start c2_load_new_map_2 c2_load_new_map_2: @ 8085FFC push {lr} - ldr r0, _08086018 + ldr r0, =0x030026f8 bl do_load_map_stuff_loop bl set_vblank_callback_8086390 - ldr r0, _0808601C + ldr r0, =c1_overworld + 1 bl set_callback1 - ldr r0, _08086020 + ldr r0, =c2_overworld + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_08086018: .4byte 0x030026f8 -_0808601C: .4byte c1_overworld + 1 -_08086020: .4byte c2_overworld + 1 + .pool thumb_func_end c2_load_new_map_2 thumb_func_start sub_8086024 sub_8086024: @ 8086024 push {r4,lr} - ldr r0, _08086068 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r4, r0, r1 @@ -270420,57 +260522,51 @@ _08086046: cmp r0, 0 beq _08086062 bl set_vblank_callback_8086390 - ldr r0, _0808606C + ldr r0, =c1_overworld + 1 bl set_callback1 - ldr r0, _08086070 + ldr r0, =c2_overworld + 1 bl set_callback2 _08086062: pop {r4} pop {r0} bx r0 .align 2, 0 -_08086068: .4byte 0x030022c0 -_0808606C: .4byte c1_overworld + 1 -_08086070: .4byte c2_overworld + 1 + .pool thumb_func_end sub_8086024 thumb_func_start sub_8086074 sub_8086074: @ 8086074 push {lr} bl sub_808631C - ldr r0, _0808608C - ldr r1, _08086090 + ldr r0, =0x03005dac + ldr r1, =sub_80AF314 + 1 str r1, [r0] - ldr r0, _08086094 + ldr r0, =c2_80567AC + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0808608C: .4byte 0x03005dac -_08086090: .4byte sub_80AF314 + 1 -_08086094: .4byte c2_80567AC + 1 + .pool thumb_func_end sub_8086074 thumb_func_start c2_80567AC c2_80567AC: @ 8086098 push {lr} - ldr r0, _080860BC + ldr r0, =0x030026f8 bl map_loading_iteration_3 cmp r0, 0 beq _080860B8 bl set_vblank_callback_8086390 - ldr r0, _080860C0 + ldr r0, =c1_link_related + 1 bl set_callback1 bl sub_8086C2C - ldr r0, _080860C4 + ldr r0, =c2_overworld + 1 bl set_callback2 _080860B8: pop {r0} bx r0 .align 2, 0 -_080860BC: .4byte 0x030026f8 -_080860C0: .4byte c1_link_related + 1 -_080860C4: .4byte c2_overworld + 1 + .pool thumb_func_end c2_80567AC thumb_func_start c2_exit_to_overworld_2_switch @@ -270479,38 +260575,37 @@ c2_exit_to_overworld_2_switch: @ 80860C8 bl is_c1_link_related_active cmp r0, 0x1 bne _080860E0 - ldr r0, _080860DC + ldr r0, =c2_exit_to_overworld_2_link + 1 bl set_callback2 b _080860EA .align 2, 0 -_080860DC: .4byte c2_exit_to_overworld_2_link + 1 + .pool _080860E0: bl sub_808631C - ldr r0, _080860F0 + ldr r0, =c2_exit_to_overworld_2_local + 1 bl set_callback2 _080860EA: pop {r0} bx r0 .align 2, 0 -_080860F0: .4byte c2_exit_to_overworld_2_local + 1 + .pool thumb_func_end c2_exit_to_overworld_2_switch thumb_func_start c2_exit_to_overworld_2_local c2_exit_to_overworld_2_local: @ 80860F4 push {lr} - ldr r0, _08086110 + ldr r0, =0x030026f8 bl sub_8086638 cmp r0, 0 beq _0808610A bl set_vblank_callback_8086390 - ldr r0, _08086114 + ldr r0, =c2_overworld + 1 bl set_callback2 _0808610A: pop {r0} bx r0 .align 2, 0 -_08086110: .4byte 0x030026f8 -_08086114: .4byte c2_overworld + 1 + .pool thumb_func_end c2_exit_to_overworld_2_local thumb_func_start c2_exit_to_overworld_2_link @@ -270519,18 +260614,17 @@ c2_exit_to_overworld_2_link: @ 8086118 bl sub_8087598 cmp r0, 0 bne _08086132 - ldr r0, _08086138 + ldr r0, =0x030026f8 bl map_loading_iteration_2_link cmp r0, 0 beq _08086132 - ldr r0, _0808613C + ldr r0, =c2_overworld + 1 bl set_callback2 _08086132: pop {r0} bx r0 .align 2, 0 -_08086138: .4byte 0x030026f8 -_0808613C: .4byte c2_overworld + 1 + .pool thumb_func_end c2_exit_to_overworld_2_link thumb_func_start c2_8056854 @@ -270538,24 +260632,21 @@ c2_8056854: @ 8086140 push {lr} bl sub_808631C bl sub_80A2F30 - ldr r0, _08086164 + ldr r0, =c1_link_related + 1 bl set_callback1 bl sub_8086C2C - ldr r0, _08086168 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08086174 - ldr r1, _0808616C - ldr r0, _08086170 + ldr r1, =0x03005dac + ldr r0, =sub_80AF314 + 1 b _08086178 .align 2, 0 -_08086164: .4byte c1_link_related + 1 -_08086168: .4byte 0x030030fc -_0808616C: .4byte 0x03005dac -_08086170: .4byte sub_80AF314 + 1 + .pool _08086174: - ldr r1, _0808618C - ldr r0, _08086190 + ldr r1, =0x03005dac + ldr r0, =sub_80AF214 + 1 _08086178: str r0, [r1] bl script_env_1_init @@ -270564,74 +260655,69 @@ _08086178: pop {r0} bx r0 .align 2, 0 -_0808618C: .4byte 0x03005dac -_08086190: .4byte sub_80AF214 + 1 + .pool thumb_func_end c2_8056854 thumb_func_start sub_8086194 sub_8086194: @ 8086194 push {lr} bl sub_808631C - ldr r1, _080861A8 - ldr r0, _080861AC + ldr r1, =0x03005db0 + ldr r0, =sub_80AF6A4 + 1 str r0, [r1] bl c2_exit_to_overworld_2_switch pop {r0} bx r0 .align 2, 0 -_080861A8: .4byte 0x03005db0 -_080861AC: .4byte sub_80AF6A4 + 1 + .pool thumb_func_end sub_8086194 thumb_func_start sub_80861B0 sub_80861B0: @ 80861B0 push {lr} bl sub_808631C - ldr r1, _080861C4 - ldr r0, _080861C8 + ldr r1, =0x03005dac + ldr r0, =sub_80AF188 + 1 str r0, [r1] bl c2_exit_to_overworld_2_switch pop {r0} bx r0 .align 2, 0 -_080861C4: .4byte 0x03005dac -_080861C8: .4byte sub_80AF188 + 1 + .pool thumb_func_end sub_80861B0 thumb_func_start c2_exit_to_overworld_1_continue_scripts_restart_music c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80861CC push {lr} bl sub_808631C - ldr r1, _080861E0 - ldr r0, _080861E4 + ldr r1, =0x03005dac + ldr r0, =sub_80AF168 + 1 str r0, [r1] bl c2_exit_to_overworld_2_switch pop {r0} bx r0 .align 2, 0 -_080861E0: .4byte 0x03005dac -_080861E4: .4byte sub_80AF168 + 1 + .pool thumb_func_end c2_exit_to_overworld_1_continue_scripts_restart_music thumb_func_start sub_80861E8 sub_80861E8: @ 80861E8 push {lr} bl sub_808631C - ldr r1, _080861FC - ldr r0, _08086200 + ldr r1, =0x03005dac + ldr r0, =sub_80AF3C8 + 1 str r0, [r1] bl c2_exit_to_overworld_2_switch pop {r0} bx r0 .align 2, 0 -_080861FC: .4byte 0x03005dac -_08086200: .4byte sub_80AF3C8 + 1 + .pool thumb_func_end sub_80861E8 thumb_func_start sub_8086204 sub_8086204: @ 8086204 push {lr} - ldr r0, _0808622C + ldr r0, =0x02037318 ldrb r1, [r0, 0x1A] movs r0, 0xF8 ands r0, r1 @@ -270648,7 +260734,7 @@ _08086222: pop {r0} bx r0 .align 2, 0 -_0808622C: .4byte 0x02037318 + .pool thumb_func_end sub_8086204 thumb_func_start sub_8086230 @@ -270657,7 +260743,7 @@ sub_8086230: @ 8086230 bl sub_808631C bl sub_80A2F30 bl flag_clear_is_in_safari_zone_ - ldr r0, _0808626C + ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0xFF bne _0808624A @@ -270668,17 +260754,15 @@ _0808624A: bl sub_81D609C lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08086270 + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] - ldr r0, _08086274 + ldr r0, =0x00000169 cmp r1, r0 bne _08086278 bl sub_81AA2F8 b _0808628A .align 2, 0 -_0808626C: .4byte 0x03006210 -_08086270: .4byte 0x02037318 -_08086274: .4byte 0x00000169 + .pool _08086278: cmp r4, 0 beq _08086286 @@ -270692,17 +260776,16 @@ _0808628A: bl sub_809757C bl sub_809E7B0 bl sub_8084788 - ldr r0, _080862A8 + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] - ldr r0, _080862AC + ldr r0, =0x00000169 cmp r1, r0 bne _080862B0 movs r0, 0x1 bl sub_8087DAC b _080862BE .align 2, 0 -_080862A8: .4byte 0x02037318 -_080862AC: .4byte 0x00000169 + .pool _080862B0: cmp r4, 0 beq _080862BA @@ -270722,17 +260805,17 @@ _080862BE: bl warp1_set_to_sav1w bl warp_in bl sub_80EDB44 - ldr r0, _080862F0 + ldr r0, =c2_load_new_map + 1 bl set_callback2 b _08086308 .align 2, 0 -_080862F0: .4byte c2_load_new_map + 1 + .pool _080862F4: bl sub_80EDB44 - ldr r0, _08086310 - ldr r1, _08086314 + ldr r0, =0x03005dac + ldr r1, =sub_8086204 + 1 str r1, [r0] - ldr r0, _08086318 + ldr r0, =c1_overworld + 1 bl set_callback1 bl c2_exit_to_overworld_2_switch _08086308: @@ -270740,9 +260823,7 @@ _08086308: pop {r0} bx r0 .align 2, 0 -_08086310: .4byte 0x03005dac -_08086314: .4byte sub_8086204 + 1 -_08086318: .4byte c1_overworld + 1 + .pool thumb_func_end sub_8086230 thumb_func_start sub_808631C @@ -270755,7 +260836,7 @@ sub_808631C: @ 808631C bne _0808632E bl sub_80097E8 _0808632E: - ldr r0, _08086344 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08086348 @@ -270765,14 +260846,14 @@ _0808632E: bl disable_irqs b _08086362 .align 2, 0 -_08086344: .4byte 0x030030fc + .pool _08086348: - ldr r4, _08086374 + ldr r4, =0x04000208 ldrh r3, [r4] strh r0, [r4] - ldr r2, _08086378 + ldr r2, =0x04000200 ldrh r1, [r2] - ldr r0, _0808637C + ldr r0, =0x0000fffd ands r0, r1 strh r0, [r2] ldrh r0, [r2] @@ -270789,20 +260870,18 @@ _08086362: pop {r0} bx r0 .align 2, 0 -_08086374: .4byte 0x04000208 -_08086378: .4byte 0x04000200 -_0808637C: .4byte 0x0000fffd + .pool thumb_func_end sub_808631C thumb_func_start set_vblank_callback_8086390 set_vblank_callback_8086390: @ 8086380 push {lr} - ldr r0, _0808638C + ldr r0, =vblank_cb_8086390 + 1 bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 -_0808638C: .4byte vblank_cb_8086390 + 1 + .pool thumb_func_end set_vblank_callback_8086390 thumb_func_start vblank_cb_8086390 @@ -270826,14 +260905,14 @@ sub_80863B0: @ 80863B0 cmp r0, 0 beq _080863D4 bl door_upload_tiles - ldr r2, _080863D0 + ldr r2, =0x08339dbc ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] bl sub_80BA038 b _080863F0 .align 2, 0 -_080863D0: .4byte 0x08339dbc + .pool _080863D4: bl sav1_get_flash_used_on_map lsls r0, 24 @@ -270841,7 +260920,7 @@ _080863D4: cmp r0, 0 beq _080863F0 bl sub_80B00E8 - ldr r2, _080863F4 + ldr r2, =0x08339dbc ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] @@ -270850,7 +260929,7 @@ _080863F0: pop {r0} bx r0 .align 2, 0 -_080863F4: .4byte 0x08339dbc + .pool thumb_func_end sub_80863B0 thumb_func_start map_loading_iteration_3 @@ -270863,12 +260942,12 @@ map_loading_iteration_3: @ 80863F8 b _08086512 _08086404: lsls r0, 2 - ldr r1, _08086410 + ldr r1, =_08086414 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08086410: .4byte _08086414 + .pool .align 2, 0 _08086414: .4byte _0808644C @@ -270915,31 +260994,31 @@ _08086492: bl move_tilemap_camera_to_upper_left_corner b _08086506 _08086498: - ldr r0, _080864A4 + ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset1_to_vram b _08086506 .align 2, 0 -_080864A4: .4byte 0x02037318 + .pool _080864A8: - ldr r0, _080864B4 + ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset2_to_vram b _08086506 .align 2, 0 -_080864B4: .4byte 0x02037318 + .pool _080864B8: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08086512 - ldr r0, _080864D0 + ldr r0, =0x02037318 ldr r0, [r0] bl apply_map_tileset1_tileset2_palette b _08086506 .align 2, 0 -_080864D0: .4byte 0x02037318 + .pool _080864D4: bl cur_mapdata_full_redraw b _08086506 @@ -270947,7 +261026,7 @@ _080864DA: bl cur_mapheader_run_tileset_funcs_after_some_cpuset b _08086506 _080864E0: - ldr r0, _080864F8 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08086506 @@ -270957,7 +261036,7 @@ _080864E0: bl sub_800DFB4 b _08086506 .align 2, 0 -_080864F8: .4byte 0x030030fc + .pool _080864FC: bl map_post_load_hook_exec lsls r0, 24 @@ -270990,12 +261069,12 @@ load_map_stuff: @ 808651C b _0808662E _0808652A: lsls r0, 2 - ldr r1, _08086534 + ldr r1, =_08086538 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08086534: .4byte _08086538 + .pool .align 2, 0 _08086538: .4byte _08086570 @@ -271038,31 +261117,31 @@ _080865A6: bl move_tilemap_camera_to_upper_left_corner b _08086622 _080865AC: - ldr r0, _080865B8 + ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset1_to_vram b _08086622 .align 2, 0 -_080865B8: .4byte 0x02037318 + .pool _080865BC: - ldr r0, _080865C8 + ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset2_to_vram b _08086622 .align 2, 0 -_080865C8: .4byte 0x02037318 + .pool _080865CC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _0808662E - ldr r0, _080865E4 + ldr r0, =0x02037318 ldr r0, [r0] bl apply_map_tileset1_tileset2_palette b _08086622 .align 2, 0 -_080865E4: .4byte 0x02037318 + .pool _080865E8: bl cur_mapdata_full_redraw b _08086622 @@ -271070,7 +261149,7 @@ _080865EE: bl cur_mapheader_run_tileset_funcs_after_some_cpuset b _08086622 _080865F4: - ldr r0, _08086614 + ldr r0, =0x02037318 ldrb r1, [r0, 0x1A] movs r0, 0xF8 ands r0, r1 @@ -271084,7 +261163,7 @@ _080865F4: bl sub_80D47E4 b _08086622 .align 2, 0 -_08086614: .4byte 0x02037318 + .pool _08086618: bl map_post_load_hook_exec lsls r0, 24 @@ -271167,12 +261246,12 @@ map_loading_iteration_2_link: @ 8086698 b _080867A8 _080866A4: lsls r0, 2 - ldr r1, _080866B0 + ldr r1, =_080866B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080866B0: .4byte _080866B4 + .pool .align 2, 0 _080866B4: .4byte _080866EC @@ -271212,31 +261291,31 @@ _0808671E: bl move_tilemap_camera_to_upper_left_corner b _08086792 _08086724: - ldr r0, _08086730 + ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset1_to_vram b _08086792 .align 2, 0 -_08086730: .4byte 0x02037318 + .pool _08086734: - ldr r0, _08086740 + ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset2_to_vram b _08086792 .align 2, 0 -_08086740: .4byte 0x02037318 + .pool _08086744: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080867A8 - ldr r0, _0808675C + ldr r0, =0x02037318 ldr r0, [r0] bl apply_map_tileset1_tileset2_palette b _08086792 .align 2, 0 -_0808675C: .4byte 0x02037318 + .pool _08086760: bl cur_mapdata_full_redraw b _08086792 @@ -271244,7 +261323,7 @@ _08086766: bl cur_mapheader_run_tileset_funcs_after_some_cpuset b _08086792 _0808676C: - ldr r0, _08086784 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08086792 @@ -271254,7 +261333,7 @@ _0808676C: bl sub_800DFB4 b _08086792 .align 2, 0 -_08086784: .4byte 0x030030fc + .pool _08086788: bl map_post_load_hook_exec lsls r0, 24 @@ -271312,15 +261391,15 @@ sub_80867D8: @ 80867D8 movs r1, 0 bl lcd_io_set bl remove_some_task - ldr r2, _08086850 + ldr r2, =0x05000002 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _08086854 + ldr r1, =0x040000d4 mov r0, sp str r0, [r1] str r2, [r1, 0x4] - ldr r0, _08086858 + ldr r0, =0x810001ff str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r2, 0xC0 @@ -271331,7 +261410,7 @@ sub_80867D8: @ 80867D8 movs r6, 0 movs r5, 0x80 lsls r5, 5 - ldr r7, _0808685C + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -271364,10 +261443,7 @@ _08086816: pop {r0} bx r0 .align 2, 0 -_08086850: .4byte 0x05000002 -_08086854: .4byte 0x040000d4 -_08086858: .4byte 0x810001ff -_0808685C: .4byte 0x81000800 + .pool thumb_func_end sub_80867D8 thumb_func_start sub_8086860 @@ -271389,10 +261465,10 @@ map_loading_lcd_reset: @ 8086878 movs r0, 0x4C movs r1, 0 bl lcd_io_set - ldr r1, _08086970 + ldr r1, =0x00001f1f movs r0, 0x48 bl lcd_io_set - ldr r1, _08086974 + ldr r1, =0x00000101 movs r0, 0x4A bl lcd_io_set movs r0, 0x40 @@ -271401,14 +261477,14 @@ map_loading_lcd_reset: @ 8086878 movs r0, 0x44 movs r1, 0xFF bl lcd_io_set - ldr r4, _08086978 + ldr r4, =0x0000ffff movs r0, 0x42 adds r1, r4, 0 bl lcd_io_set movs r0, 0x46 adds r1, r4, 0 bl lcd_io_set - ldr r0, _0808697C + ldr r0, =0x082ec7c4 ldrh r1, [r0, 0x2] ldrh r2, [r0, 0x4] orrs r1, r2 @@ -271420,7 +261496,7 @@ map_loading_lcd_reset: @ 8086878 orrs r1, r0 movs r0, 0x50 bl lcd_io_set - ldr r1, _08086980 + ldr r1, =0x0000070d movs r0, 0x52 bl lcd_io_set bl overworld_bg_setup @@ -271462,7 +261538,7 @@ map_loading_lcd_reset: @ 8086878 movs r1, 0 movs r2, 0 bl bg_change_y_offset - ldr r1, _08086984 + ldr r1, =0x00007060 movs r0, 0 bl lcd_io_set movs r0, 0 @@ -271478,12 +261554,7 @@ map_loading_lcd_reset: @ 8086878 pop {r0} bx r0 .align 2, 0 -_08086970: .4byte 0x00001f1f -_08086974: .4byte 0x00000101 -_08086978: .4byte 0x0000ffff -_0808697C: .4byte 0x082ec7c4 -_08086980: .4byte 0x0000070d -_08086984: .4byte 0x00007060 + .pool thumb_func_end map_loading_lcd_reset thumb_func_start sub_8086988 @@ -271523,10 +261594,10 @@ _080869CE: thumb_func_start sub_80869DC sub_80869DC: @ 80869DC push {lr} - ldr r0, _080869FC + ldr r0, =0x03005dec movs r1, 0 strh r1, [r0] - ldr r0, _08086A00 + ldr r0, =0x03005de8 strh r1, [r0] bl sub_808D438 movs r0, 0 @@ -271536,18 +261607,17 @@ sub_80869DC: @ 80869DC pop {r0} bx r0 .align 2, 0 -_080869FC: .4byte 0x03005dec -_08086A00: .4byte 0x03005de8 + .pool thumb_func_end sub_80869DC thumb_func_start mli4_mapscripts_and_other mli4_mapscripts_and_other: @ 8086A04 push {r4,r5,lr} sub sp, 0x4 - ldr r0, _08086A5C + ldr r0, =0x03005dec movs r1, 0 strh r1, [r0] - ldr r0, _08086A60 + ldr r0, =0x03005de8 strh r1, [r0] bl sub_808D438 mov r4, sp @@ -271563,7 +261633,7 @@ mli4_mapscripts_and_other: @ 8086A04 movs r2, 0 ldrsh r1, [r4, r2] ldrb r2, [r5, 0x1] - ldr r3, _08086A64 + ldr r3, =0x03005d90 ldr r3, [r3] ldrb r3, [r3, 0x8] bl player_avatar_init @@ -271579,9 +261649,7 @@ mli4_mapscripts_and_other: @ 8086A04 pop {r0} bx r0 .align 2, 0 -_08086A5C: .4byte 0x03005dec -_08086A60: .4byte 0x03005de8 -_08086A64: .4byte 0x03005d90 + .pool thumb_func_end mli4_mapscripts_and_other thumb_func_start sub_8086A68 @@ -271599,8 +261667,8 @@ sub_8086A68: @ 8086A68 thumb_func_start sub_8086A80 sub_8086A80: @ 8086A80 push {lr} - ldr r2, _08086AA4 - ldr r3, _08086AA8 + ldr r2, =0x02037350 + ldr r3, =0x02037590 ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -271615,14 +261683,13 @@ sub_8086A80: @ 8086A80 pop {r0} bx r0 .align 2, 0 -_08086AA4: .4byte 0x02037350 -_08086AA8: .4byte 0x02037590 + .pool thumb_func_end sub_8086A80 thumb_func_start sub_8086AAC sub_8086AAC: @ 8086AAC push {lr} - ldr r0, _08086AC4 + ldr r0, =0x03005db4 ldrb r0, [r0] bl sub_8087858 lsls r0, 24 @@ -271631,13 +261698,13 @@ sub_8086AAC: @ 8086AAC pop {r0} bx r0 .align 2, 0 -_08086AC4: .4byte 0x03005db4 + .pool thumb_func_end sub_8086AAC thumb_func_start sub_8086AC8 sub_8086AC8: @ 8086AC8 push {lr} - ldr r0, _08086AE0 + ldr r0, =0x03005db4 ldrb r0, [r0] bl sub_8087858 lsls r0, 24 @@ -271646,7 +261713,7 @@ sub_8086AC8: @ 8086AC8 pop {r0} bx r0 .align 2, 0 -_08086AE0: .4byte 0x03005db4 + .pool thumb_func_end sub_8086AC8 thumb_func_start sub_8086AE4 @@ -271659,7 +261726,7 @@ sub_8086AE4: @ 8086AE4 adds r1, r4, 0 bl sav1_camera_get_focus_coords mov r2, sp - ldr r0, _08086B10 + ldr r0, =0x03005db4 ldrb r1, [r0] ldrh r0, [r2] adds r0, r1 @@ -271672,7 +261739,7 @@ sub_8086AE4: @ 8086AE4 pop {r0} bx r0 .align 2, 0 -_08086B10: .4byte 0x03005db4 + .pool thumb_func_end sub_8086AE4 thumb_func_start sub_8086B14 @@ -271688,18 +261755,18 @@ sub_8086B14: @ 8086B14 bl sav1_camera_get_focus_coords mov r3, sp mov r2, sp - ldr r0, _08086B90 + ldr r0, =0x03005db4 ldrb r1, [r0] ldrh r0, [r2] subs r0, r1 strh r0, [r3] movs r6, 0 - ldr r0, _08086B94 + ldr r0, =0x03005db8 mov r8, r4 ldrb r0, [r0] cmp r6, r0 bcs _08086B7E - ldr r7, _08086B98 + ldr r7, =0x020229e8 _08086B44: lsls r5, r6, 24 lsrs r5, 24 @@ -271724,7 +261791,7 @@ _08086B44: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _08086B94 + ldr r0, =0x03005db8 ldrb r0, [r0] cmp r6, r0 bcc _08086B44 @@ -271737,20 +261804,18 @@ _08086B7E: pop {r0} bx r0 .align 2, 0 -_08086B90: .4byte 0x03005db4 -_08086B94: .4byte 0x03005db8 -_08086B98: .4byte 0x020229e8 + .pool thumb_func_end sub_8086B14 thumb_func_start sub_8086B9C sub_8086B9C: @ 8086B9C push {r4,r5,lr} movs r4, 0 - ldr r0, _08086BD0 + ldr r0, =0x03005db8 ldrb r0, [r0] cmp r4, r0 bcs _08086BCA - ldr r5, _08086BD4 + ldr r5, =0x020229e8 _08086BAA: lsls r0, r4, 24 lsrs r0, 24 @@ -271763,7 +261828,7 @@ _08086BAA: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _08086BD0 + ldr r0, =0x03005db8 ldrb r0, [r0] cmp r4, r0 bcc _08086BAA @@ -271772,14 +261837,13 @@ _08086BCA: pop {r0} bx r0 .align 2, 0 -_08086BD0: .4byte 0x03005db8 -_08086BD4: .4byte 0x020229e8 + .pool thumb_func_end sub_8086B9C thumb_func_start c1_link_related c1_link_related: @ 8086BD8 push {r4,lr} - ldr r0, _08086C1C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08086BF2 @@ -271790,12 +261854,12 @@ c1_link_related: @ 8086BD8 cmp r0, 0 bne _08086C14 _08086BF2: - ldr r0, _08086C20 + ldr r0, =0x03005db4 ldrb r4, [r0] - ldr r0, _08086C24 + ldr r0, =0x03003020 adds r1, r4, 0 bl sub_8086F38 - ldr r0, _08086C28 + ldr r0, =0x03000e14 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 @@ -271808,56 +261872,52 @@ _08086C14: pop {r0} bx r0 .align 2, 0 -_08086C1C: .4byte 0x030030fc -_08086C20: .4byte 0x03005db4 -_08086C24: .4byte 0x03003020 -_08086C28: .4byte 0x03000e14 + .pool thumb_func_end c1_link_related thumb_func_start sub_8086C2C sub_8086C2C: @ 8086C2C push {lr} bl sub_8086C90 - ldr r0, _08086C3C + ldr r0, =sub_80870B0 + 1 bl c1_link_related_func_set pop {r0} bx r0 .align 2, 0 -_08086C3C: .4byte sub_80870B0 + 1 + .pool thumb_func_end sub_8086C2C thumb_func_start sub_8086C40 sub_8086C40: @ 8086C40 push {lr} - ldr r0, _08086C4C + ldr r0, =0x03003020 bl sub_808709C pop {r0} bx r0 .align 2, 0 -_08086C4C: .4byte 0x03003020 + .pool thumb_func_end sub_8086C40 thumb_func_start c1_link_related_func_set c1_link_related_func_set: @ 8086C50 - ldr r2, _08086C5C + ldr r2, =0x03000e19 movs r1, 0 strb r1, [r2] - ldr r1, _08086C60 + ldr r1, =0x03000e14 str r0, [r1] bx lr .align 2, 0 -_08086C5C: .4byte 0x03000e19 -_08086C60: .4byte 0x03000e14 + .pool thumb_func_end c1_link_related_func_set thumb_func_start sub_8086C64 sub_8086C64: @ 8086C64 push {lr} - ldr r0, _08086C88 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08086C82 - ldr r1, _08086C8C + ldr r1, =0x03000e19 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -271870,14 +261930,13 @@ _08086C82: pop {r0} bx r0 .align 2, 0 -_08086C88: .4byte 0x030030fc -_08086C8C: .4byte 0x03000e19 + .pool thumb_func_end sub_8086C64 thumb_func_start sub_8086C90 sub_8086C90: @ 8086C90 push {lr} - ldr r1, _08086CA4 + ldr r1, =0x03000e10 movs r2, 0x80 adds r0, r1, 0x3 _08086C98: @@ -271888,7 +261947,7 @@ _08086C98: pop {r0} bx r0 .align 2, 0 -_08086CA4: .4byte 0x03000e10 + .pool thumb_func_end sub_8086C90 thumb_func_start sub_8086CA8 @@ -271896,12 +261955,12 @@ sub_8086CA8: @ 8086CA8 push {r4,lr} lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _08086CC8 + ldr r0, =0x03005db8 ldrb r2, [r0] movs r1, 0 cmp r1, r2 bge _08086CD6 - ldr r4, _08086CCC + ldr r4, =0x03000e10 _08086CBA: adds r0, r1, r4 ldrb r0, [r0] @@ -271910,8 +261969,7 @@ _08086CBA: movs r0, 0 b _08086CD8 .align 2, 0 -_08086CC8: .4byte 0x03005db8 -_08086CCC: .4byte 0x03000e10 + .pool _08086CD0: adds r1, 0x1 cmp r1, r2 @@ -271929,12 +261987,12 @@ sub_8086CE0: @ 8086CE0 push {r4,lr} lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _08086D00 + ldr r0, =0x03005db8 ldrb r2, [r0] movs r1, 0 cmp r1, r2 bge _08086D0E - ldr r4, _08086D04 + ldr r4, =0x03000e10 _08086CF2: adds r0, r1, r4 ldrb r0, [r0] @@ -271943,8 +262001,7 @@ _08086CF2: movs r0, 0x1 b _08086D10 .align 2, 0 -_08086D00: .4byte 0x03005db8 -_08086D04: .4byte 0x03000e10 + .pool _08086D08: adds r1, 0x1 cmp r1, r2 @@ -271969,7 +262026,7 @@ sub_8086D18: @ 8086D18 lsls r1, 16 lsrs r1, 16 mov r8, r1 - ldr r0, _08086D68 + ldr r0, =0x03000e10 adds r5, r7, r0 ldrb r0, [r5] cmp r0, 0x80 @@ -271991,14 +262048,13 @@ _08086D38: bne _08086D58 b _08086F26 _08086D58: - ldr r0, _08086D6C + ldr r0, =sub_80870F8 + 1 bl c1_link_related_func_set adds r0, r4, 0 bl sub_8087530 b _08086F26 .align 2, 0 -_08086D68: .4byte 0x03000e10 -_08086D6C: .4byte sub_80870F8 + 1 + .pool _08086D70: movs r0, 0x83 bl sub_8086CE0 @@ -272011,12 +262067,12 @@ _08086D70: bne _08086D86 b _08086F26 _08086D86: - ldr r0, _08086D94 + ldr r0, =sub_80870F8 + 1 bl c1_link_related_func_set bl sub_8087584 b _08086F26 .align 2, 0 -_08086D94: .4byte sub_80870F8 + 1 + .pool _08086D98: mov r0, r8 subs r0, 0x12 @@ -272025,12 +262081,12 @@ _08086D98: b _08086EB2 _08086DA2: lsls r0, 2 - ldr r1, _08086DAC + ldr r1, =_08086DB0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08086DAC: .4byte _08086DB0 + .pool .align 2, 0 _08086DB0: .4byte _08086E08 @@ -272049,92 +262105,88 @@ _08086DDC: bl sub_8087358 cmp r0, 0 beq _08086EB2 - ldr r0, _08086E00 + ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x81 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 beq _08086EB2 - ldr r0, _08086E04 + ldr r0, =sub_80870F8 + 1 bl c1_link_related_func_set bl sub_808751C b _08086EB2 .align 2, 0 -_08086E00: .4byte 0x03000e10 -_08086E04: .4byte sub_80870F8 + 1 + .pool _08086E08: adds r0, r6, 0 bl sub_8087388 cmp r0, 0x1 bne _08086EB2 - ldr r0, _08086E2C + ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x81 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 beq _08086EB2 - ldr r0, _08086E30 + ldr r0, =sub_80870F8 + 1 bl c1_link_related_func_set bl sub_808754C b _08086EB2 .align 2, 0 -_08086E2C: .4byte 0x03000e10 -_08086E30: .4byte sub_80870F8 + 1 + .pool _08086E34: adds r0, r6, 0 bl sub_80873B4 adds r4, r0, 0 cmp r4, 0 beq _08086EB2 - ldr r0, _08086E5C + ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x81 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 beq _08086EB2 - ldr r0, _08086E60 + ldr r0, =sub_80870F8 + 1 bl c1_link_related_func_set adds r0, r4, 0 bl sub_8087568 b _08086EB2 .align 2, 0 -_08086E5C: .4byte 0x03000e10 -_08086E60: .4byte sub_80870F8 + 1 + .pool _08086E64: adds r0, r6, 0 bl sub_8087340 cmp r0, 0 beq _08086EB2 - ldr r0, _08086E88 + ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x81 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 beq _08086EB2 - ldr r0, _08086E8C + ldr r0, =sub_808711C + 1 bl c1_link_related_func_set bl sub_8087510 b _08086EB2 .align 2, 0 -_08086E88: .4byte 0x03000e10 -_08086E8C: .4byte sub_808711C + 1 + .pool _08086E90: adds r0, r6, 0 bl sub_8087340 cmp r0, 0 beq _08086EB2 - ldr r0, _08086EC4 + ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x81 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 beq _08086EB2 - ldr r0, _08086EC8 + ldr r0, =sub_8087140 + 1 bl c1_link_related_func_set bl sub_8087510 _08086EB2: @@ -272147,8 +262199,7 @@ _08086EB2: beq _08086EE8 b _08086F26 .align 2, 0 -_08086EC4: .4byte 0x03000e10 -_08086EC8: .4byte sub_8087140 + 1 + .pool _08086ECC: mov r1, r8 cmp r1, 0x1A @@ -272157,37 +262208,36 @@ _08086ECC: beq _08086F18 b _08086F26 _08086ED8: - ldr r0, _08086EE4 + ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x83 strb r1, [r0] b _08086F26 .align 2, 0 -_08086EE4: .4byte 0x03000e10 + .pool _08086EE8: - ldr r0, _08086EF4 + ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x82 strb r1, [r0] b _08086F26 .align 2, 0 -_08086EF4: .4byte 0x03000e10 + .pool _08086EF8: - ldr r0, _08086F10 + ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x80 strb r1, [r0] ldrb r0, [r6, 0x1] cmp r0, 0 beq _08086F26 - ldr r0, _08086F14 + ldr r0, =sub_80870B0 + 1 bl c1_link_related_func_set b _08086F26 .align 2, 0 -_08086F10: .4byte 0x03000e10 -_08086F14: .4byte sub_80870B0 + 1 + .pool _08086F18: - ldr r0, _08086F34 + ldr r0, =0x03000e10 adds r1, r7, r0 ldrb r0, [r1] cmp r0, 0x82 @@ -272202,7 +262252,7 @@ _08086F26: pop {r0} bx r0 .align 2, 0 -_08086F34: .4byte 0x03000e10 + .pool thumb_func_end sub_8086D18 thumb_func_start sub_8086F38 @@ -272230,7 +262280,7 @@ _08086F4C: mov r2, sp adds r3, r5, 0 bl sub_8086D18 - ldr r0, _08086F9C + ldr r0, =0x03000e10 adds r0, r6, r0 ldrb r0, [r0] cmp r0, 0x80 @@ -272256,7 +262306,7 @@ _08086F7C: pop {r0} bx r0 .align 2, 0 -_08086F9C: .4byte 0x03000e10 + .pool thumb_func_end sub_8086F38 thumb_func_start sub_8086FA0 @@ -272264,23 +262314,22 @@ sub_8086FA0: @ 8086FA0 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 - ldr r1, _08086FB8 + ldr r1, =0xffef0000 adds r0, r1 lsrs r0, 16 cmp r0, 0xC bhi _08086FC0 - ldr r0, _08086FBC + ldr r0, =0x03005da8 strh r4, [r0] b _08086FC6 .align 2, 0 -_08086FB8: .4byte 0xffef0000 -_08086FBC: .4byte 0x03005da8 + .pool _08086FC0: - ldr r1, _08087004 + ldr r1, =0x03005da8 movs r0, 0x11 strh r0, [r1] _08086FC6: - ldr r0, _08087008 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08086FFC @@ -272302,7 +262351,7 @@ _08086FC6: cmp r4, 0x18 blt _08086FFC _08086FF6: - ldr r1, _08087004 + ldr r1, =0x03005da8 movs r0, 0 strh r0, [r1] _08086FFC: @@ -272310,14 +262359,13 @@ _08086FFC: pop {r0} bx r0 .align 2, 0 -_08087004: .4byte 0x03005da8 -_08087008: .4byte 0x030030fc + .pool thumb_func_end sub_8086FA0 thumb_func_start sub_808700C sub_808700C: @ 808700C push {lr} - ldr r2, _08087020 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0x40 ands r0, r1 @@ -272326,7 +262374,7 @@ sub_808700C: @ 808700C movs r0, 0x13 b _08087064 .align 2, 0 -_08087020: .4byte 0x030022c0 + .pool _08087024: movs r0, 0x80 ands r0, r1 @@ -272473,7 +262521,7 @@ sub_80870F8: @ 80870F8 cmp r0, 0x1 beq _08087110 movs r4, 0x1A - ldr r0, _08087118 + ldr r0, =sub_80870EC + 1 bl c1_link_related_func_set _08087110: adds r0, r4, 0 @@ -272481,7 +262529,7 @@ _08087110: pop {r1} bx r1 .align 2, 0 -_08087118: .4byte sub_80870EC + 1 + .pool thumb_func_end sub_80870F8 thumb_func_start sub_808711C @@ -272493,7 +262541,7 @@ sub_808711C: @ 808711C bhi _08087134 movs r4, 0x1A bl script_env_2_disable - ldr r0, _0808713C + ldr r0, =sub_80870EC + 1 bl c1_link_related_func_set _08087134: adds r0, r4, 0 @@ -272501,7 +262549,7 @@ _08087134: pop {r1} bx r1 .align 2, 0 -_0808713C: .4byte sub_80870EC + 1 + .pool thumb_func_end sub_808711C thumb_func_start sub_8087140 @@ -272513,7 +262561,7 @@ sub_8087140: @ 8087140 bhi _08087158 movs r4, 0x1A bl script_env_2_disable - ldr r0, _08087160 + ldr r0, =sub_80870EC + 1 bl c1_link_related_func_set _08087158: adds r0, r4, 0 @@ -272521,7 +262569,7 @@ _08087158: pop {r1} bx r1 .align 2, 0 -_08087160: .4byte sub_80870EC + 1 + .pool thumb_func_end sub_8087140 thumb_func_start sub_8087164 @@ -272536,25 +262584,23 @@ sub_8087164: @ 8087164 thumb_func_start sub_8087170 sub_8087170: @ 8087170 push {lr} - ldr r1, _08087194 + ldr r1, =0x03000e10 adds r0, r1 ldrb r0, [r0] cmp r0, 0x82 bne _080871A0 - ldr r0, _08087198 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _080871A4 - ldr r0, _0808719C + ldr r0, =sub_8087164 + 1 bl c1_link_related_func_set movs r0, 0x1D b _080871A6 .align 2, 0 -_08087194: .4byte 0x03000e10 -_08087198: .4byte 0x030022c0 -_0808719C: .4byte sub_8087164 + 1 + .pool _080871A0: bl sub_8086C64 _080871A4: @@ -272567,13 +262613,13 @@ _080871A6: thumb_func_start sub_80871AC sub_80871AC: @ 80871AC push {lr} - ldr r0, _080871BC + ldr r0, =sub_8087170 + 1 bl c1_link_related_func_set movs r0, 0x16 pop {r1} bx r1 .align 2, 0 -_080871BC: .4byte sub_8087170 + 1 + .pool thumb_func_end sub_80871AC thumb_func_start sub_80871C0 @@ -272585,7 +262631,7 @@ sub_80871C0: @ 80871C0 thumb_func_start sub_80871C4 sub_80871C4: @ 80871C4 push {lr} - ldr r1, _080871F0 + ldr r1, =0x03000e10 adds r0, r1 ldrb r0, [r0] cmp r0, 0x83 @@ -272596,30 +262642,28 @@ _080871D4: bl sub_8086CA8 cmp r0, 0x1 bne _080871EA - ldr r0, _080871F4 + ldr r0, =0x08277513 bl script_env_1_execute_new_script - ldr r0, _080871F8 + ldr r0, =sub_80871C0 + 1 bl c1_link_related_func_set _080871EA: movs r0, 0x11 pop {r1} bx r1 .align 2, 0 -_080871F0: .4byte 0x03000e10 -_080871F4: .4byte 0x08277513 -_080871F8: .4byte sub_80871C0 + 1 + .pool thumb_func_end sub_80871C4 thumb_func_start sub_80871FC sub_80871FC: @ 80871FC push {lr} - ldr r0, _0808720C + ldr r0, =sub_80871C4 + 1 bl c1_link_related_func_set movs r0, 0x17 pop {r1} bx r1 .align 2, 0 -_0808720C: .4byte sub_80871C4 + 1 + .pool thumb_func_end sub_80871FC thumb_func_start sub_8087210 @@ -272635,14 +262679,14 @@ sub_8087214: @ 8087214 bl sub_8086CE0 cmp r0, 0x1 beq _08087250 - ldr r0, _08087254 + ldr r0, =0x03000e14 ldr r2, [r0] - ldr r1, _08087258 + ldr r1, =sub_8087170 + 1 adds r3, r0, 0 cmp r2, r1 bne _0808723A - ldr r1, _0808725C - ldr r0, _08087260 + ldr r1, =0x03000e10 + ldr r0, =0x03005db4 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -272650,11 +262694,11 @@ sub_8087214: @ 8087214 bne _08087272 _0808723A: ldr r1, [r3] - ldr r0, _08087264 + ldr r0, =sub_8087164 + 1 cmp r1, r0 bne _08087268 - ldr r1, _0808725C - ldr r0, _08087260 + ldr r1, =0x03000e10 + ldr r0, =0x03005db4 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -272664,11 +262708,7 @@ _08087250: movs r0, 0x2 b _08087278 .align 2, 0 -_08087254: .4byte 0x03000e14 -_08087258: .4byte sub_8087170 + 1 -_0808725C: .4byte 0x03000e10 -_08087260: .4byte 0x03005db4 -_08087264: .4byte sub_8087164 + 1 + .pool _08087268: movs r0, 0x82 bl sub_8086CA8 @@ -272696,49 +262736,49 @@ sub_808727C: @ 808727C thumb_func_start sub_8087288 sub_8087288: @ 8087288 push {lr} - ldr r0, _08087298 + ldr r0, =sub_80871AC + 1 bl c1_link_related_func_set movs r0, 0 pop {r1} bx r1 .align 2, 0 -_08087298: .4byte sub_80871AC + 1 + .pool thumb_func_end sub_8087288 thumb_func_start sub_808729C sub_808729C: @ 808729C push {lr} - ldr r0, _080872AC + ldr r0, =sub_80870F8 + 1 bl c1_link_related_func_set movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080872AC: .4byte sub_80870F8 + 1 + .pool thumb_func_end sub_808729C thumb_func_start sub_80872B0 sub_80872B0: @ 80872B0 push {lr} - ldr r0, _080872C0 + ldr r0, =sub_80871FC + 1 bl c1_link_related_func_set movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080872C0: .4byte sub_80871FC + 1 + .pool thumb_func_end sub_80872B0 thumb_func_start sub_80872C4 sub_80872C4: @ 80872C4 push {lr} - ldr r0, _080872D4 + ldr r0, =sub_8087210 + 1 bl c1_link_related_func_set movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080872D4: .4byte sub_8087210 + 1 + .pool thumb_func_end sub_80872C4 thumb_func_start sub_80872D8 @@ -272754,7 +262794,7 @@ sub_80872D8: @ 80872D8 movs r0, 0x1 _080872EA: strb r0, [r6, 0x1] - ldr r1, _0808733C + ldr r1, =0x02032308 lsls r0, r4, 2 adds r0, r1 ldrb r0, [r0, 0x3] @@ -272790,7 +262830,7 @@ _080872EA: pop {r0} bx r0 .align 2, 0 -_0808733C: .4byte 0x02032308 + .pool thumb_func_end sub_80872D8 thumb_func_start sub_8087340 @@ -272891,7 +262931,7 @@ _080873C8: ldr r1, [r4, 0x8] str r0, [sp] str r1, [sp, 0x4] - ldr r3, _08087438 + ldr r3, =0x08339d64 ldrb r0, [r4, 0x3] lsls r0, 3 adds r0, r3 @@ -272901,7 +262941,7 @@ _080873C8: adds r0, r1 lsls r0, 16 lsrs r0, 16 - ldr r1, _0808743C + ldr r1, =0xffff0000 ldr r2, [sp] ands r2, r1 orrs r2, r0 @@ -272914,11 +262954,11 @@ _080873C8: ldr r0, [r0] adds r0, r1 lsls r0, 16 - ldr r1, _08087440 + ldr r1, =0x0000ffff ands r1, r2 orrs r1, r0 str r1, [sp] - ldr r2, _08087444 + ldr r2, =0xffffff00 ldr r0, [sp, 0x4] ands r0, r2 str r0, [sp, 0x4] @@ -272935,35 +262975,30 @@ _080873C8: ldrb r0, [r4, 0x1] cmp r0, 0 beq _08087434 - ldr r0, _08087448 + ldr r0, =0x03000e10 adds r0, r1, r0 ldrb r0, [r0] cmp r0, 0x80 beq _08087450 _08087434: - ldr r0, _0808744C + ldr r0, =0x0827749c b _08087476 .align 2, 0 -_08087438: .4byte 0x08339d64 -_0808743C: .4byte 0xffff0000 -_08087440: .4byte 0x0000ffff -_08087444: .4byte 0xffffff00 -_08087448: .4byte 0x03000e10 -_0808744C: .4byte 0x0827749c + .pool _08087450: adds r0, r2, 0 bl sub_80B39D4 cmp r0, 0 bne _08087464 - ldr r0, _08087460 + ldr r0, =0x0827747e b _08087476 .align 2, 0 -_08087460: .4byte 0x0827747e + .pool _08087464: - ldr r0, _08087468 + ldr r0, =0x0827748d b _08087476 .align 2, 0 -_08087468: .4byte 0x0827748d + .pool _0808746C: ldrb r1, [r4, 0xC] ldrb r2, [r4, 0x3] @@ -272980,62 +263015,52 @@ _08087476: sub_8087480: @ 8087480 push {lr} adds r1, r0, 0 - ldr r0, _080874CC + ldr r0, =0x08277388 cmp r1, r0 beq _080874C6 - ldr r0, _080874D0 + ldr r0, =0x082773a3 cmp r1, r0 beq _08087508 - ldr r0, _080874D4 + ldr r0, =0x082773be cmp r1, r0 beq _080874C6 - ldr r0, _080874D8 + ldr r0, =0x082773d9 cmp r1, r0 beq _08087508 - ldr r0, _080874DC + ldr r0, =0x0827741d cmp r1, r0 beq _080874C6 - ldr r0, _080874E0 + ldr r0, =0x08277432 cmp r1, r0 beq _08087508 - ldr r0, _080874E4 + ldr r0, =0x08277447 cmp r1, r0 beq _080874C6 - ldr r0, _080874E8 + ldr r0, =0x0827745c cmp r1, r0 beq _08087508 - ldr r0, _080874EC + ldr r0, =0x08277374 cmp r1, r0 beq _080874C6 - ldr r0, _080874F0 + ldr r0, =0x0827737e cmp r1, r0 beq _08087508 - ldr r0, _080874F4 + ldr r0, =0x082773f5 cmp r1, r0 bne _080874F8 _080874C6: movs r0, 0xA b _0808750A .align 2, 0 -_080874CC: .4byte 0x08277388 -_080874D0: .4byte 0x082773a3 -_080874D4: .4byte 0x082773be -_080874D8: .4byte 0x082773d9 -_080874DC: .4byte 0x0827741d -_080874E0: .4byte 0x08277432 -_080874E4: .4byte 0x08277447 -_080874E8: .4byte 0x0827745c -_080874EC: .4byte 0x08277374 -_080874F0: .4byte 0x0827737e -_080874F4: .4byte 0x082773f5 + .pool _080874F8: - ldr r0, _08087504 + ldr r0, =0x082773ff cmp r1, r0 beq _08087508 movs r0, 0 b _0808750A .align 2, 0 -_08087504: .4byte 0x082773ff + .pool _08087508: movs r0, 0x9 _0808750A: @@ -273081,13 +263106,13 @@ sub_808754C: @ 808754C push {lr} movs r0, 0x6 bl audio_play - ldr r0, _08087564 + ldr r0, =0x082774ef bl script_env_1_execute_new_script bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_08087564: .4byte 0x082774ef + .pool thumb_func_end sub_808754C thumb_func_start sub_8087568 @@ -273107,13 +263132,13 @@ sub_8087568: @ 8087568 thumb_func_start sub_8087584 sub_8087584: @ 8087584 push {lr} - ldr r0, _08087594 + ldr r0, =0x08277509 bl script_env_1_execute_new_script bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_08087594: .4byte 0x08277509 + .pool thumb_func_end sub_8087584 thumb_func_start sub_8087598 @@ -273128,13 +263153,13 @@ _080875A6: bl sub_800B4DC cmp r0, 0x2 bls _080875B8 - ldr r1, _080875B4 + ldr r1, =0x03000e18 movs r0, 0x1 b _080875BC .align 2, 0 -_080875B4: .4byte 0x03000e18 + .pool _080875B8: - ldr r1, _080875C4 + ldr r1, =0x03000e18 movs r0, 0 _080875BC: strb r0, [r1] @@ -273143,7 +263168,7 @@ _080875C0: pop {r1} bx r1 .align 2, 0 -_080875C4: .4byte 0x03000e18 + .pool thumb_func_end sub_8087598 thumb_func_start sub_80875C8 @@ -273158,21 +263183,21 @@ sub_80875C8: @ 80875C8 bl sub_8009F3C cmp r0, 0x1 bne _0808762C - ldr r0, _08087618 + ldr r0, =0x03000e14 ldr r1, [r0] - ldr r0, _0808761C + ldr r0, =sub_808711C + 1 cmp r1, r0 beq _08087614 - ldr r0, _08087620 + ldr r0, =sub_80870F8 + 1 cmp r1, r0 bne _0808762C - ldr r0, _08087624 + ldr r0, =0x03000e18 ldrb r2, [r0] movs r1, 0 strb r1, [r0] cmp r2, 0x1 beq _08087614 - ldr r2, _08087628 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -273187,11 +263212,7 @@ _08087614: movs r0, 0x1 b _0808762E .align 2, 0 -_08087618: .4byte 0x03000e14 -_0808761C: .4byte sub_808711C + 1 -_08087620: .4byte sub_80870F8 + 1 -_08087624: .4byte 0x03000e18 -_08087628: .4byte 0x02037fd4 + .pool _0808762C: movs r0, 0 _0808762E: @@ -273211,17 +263232,16 @@ sub_8087634: @ 8087634 bl sub_8009F3C cmp r0, 0x1 bne _08087658 - ldr r0, _0808765C + ldr r0, =0x03000e14 ldr r1, [r0] - ldr r0, _08087660 + ldr r0, =sub_8087140 + 1 cmp r1, r0 beq _08087664 _08087658: movs r0, 0 b _08087666 .align 2, 0 -_0808765C: .4byte 0x03000e14 -_08087660: .4byte sub_8087140 + 1 + .pool _08087664: movs r0, 0x1 _08087666: @@ -273232,7 +263252,7 @@ _08087666: thumb_func_start sub_808766C sub_808766C: @ 808766C push {lr} - ldr r0, _08087684 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _08087688 @@ -273242,7 +263262,7 @@ sub_808766C: @ 808766C movs r0, 0x1 b _0808768A .align 2, 0 -_08087684: .4byte 0x030030fc + .pool _08087688: movs r0, 0 _0808768A: @@ -273253,30 +263273,27 @@ _0808768A: thumb_func_start sub_8087690 sub_8087690: @ 8087690 push {lr} - ldr r0, _080876A4 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _080876B0 - ldr r0, _080876A8 - ldr r1, _080876AC + ldr r0, =0x03003170 + ldr r1, =0x00000339 adds r0, r1 ldrb r0, [r0] b _080876B8 .align 2, 0 -_080876A4: .4byte 0x030030fc -_080876A8: .4byte 0x03003170 -_080876AC: .4byte 0x00000339 + .pool _080876B0: - ldr r0, _080876BC - ldr r1, _080876C0 + ldr r0, =0x03005000 + ldr r1, =0x00000c1a adds r0, r1 ldrb r0, [r0] _080876B8: pop {r1} bx r1 .align 2, 0 -_080876BC: .4byte 0x03005000 -_080876C0: .4byte 0x00000c1a + .pool thumb_func_end sub_8087690 thumb_func_start sub_80876C4 @@ -273289,14 +263306,14 @@ sub_80876C4: @ 80876C4 thumb_func_start strange_npc_table_clear strange_npc_table_clear: @ 80876CC push {lr} - ldr r0, _080876DC + ldr r0, =0x02032308 movs r1, 0 movs r2, 0x10 bl memset pop {r0} bx r0 .align 2, 0 -_080876DC: .4byte 0x02032308 + .pool thumb_func_end strange_npc_table_clear thumb_func_start sub_80876E0 @@ -273338,12 +263355,12 @@ sub_80876F0: @ 80876F0 lsls r6, 24 lsrs r6, 24 lsls r4, r7, 2 - ldr r0, _08087794 + ldr r0, =0x02032308 adds r4, r0 lsls r5, r6, 3 adds r5, r6 lsls r5, 2 - ldr r0, _08087798 + ldr r0, =0x02037350 adds r5, r0 adds r0, r4, 0 bl sub_80876C4 @@ -273390,8 +263407,7 @@ sub_80876F0: @ 80876F0 pop {r0} bx r0 .align 2, 0 -_08087794: .4byte 0x02032308 -_08087798: .4byte 0x02037350 + .pool thumb_func_end sub_80876F0 thumb_func_start sub_808779C @@ -273433,7 +263449,7 @@ sub_80877DC: @ 80877DC lsls r0, 24 lsls r1, 24 lsrs r2, r1, 24 - ldr r1, _08087804 + ldr r1, =0x02032308 lsrs r0, 22 adds r1, r0, r1 ldrb r0, [r1] @@ -273443,15 +263459,14 @@ sub_80877DC: @ 80877DC lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08087808 + ldr r0, =0x02037350 adds r1, r0 strb r2, [r1, 0x19] _080877FE: pop {r0} bx r0 .align 2, 0 -_08087804: .4byte 0x02032308 -_08087808: .4byte 0x02037350 + .pool thumb_func_end sub_80877DC thumb_func_start sub_808780C @@ -273459,13 +263474,13 @@ sub_808780C: @ 808780C push {r4,r5,lr} lsls r0, 24 lsrs r0, 22 - ldr r1, _0808784C + ldr r1, =0x02032308 adds r5, r0, r1 ldrb r1, [r5, 0x2] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087850 + ldr r1, =0x02037350 adds r4, r0, r1 ldrb r0, [r4, 0x4] cmp r0, 0x40 @@ -273474,7 +263489,7 @@ sub_808780C: @ 808780C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08087854 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles _08087838: @@ -273488,41 +263503,38 @@ _08087838: pop {r0} bx r0 .align 2, 0 -_0808784C: .4byte 0x02032308 -_08087850: .4byte 0x02037350 -_08087854: .4byte 0x02020630 + .pool thumb_func_end sub_808780C thumb_func_start sub_8087858 sub_8087858: @ 8087858 lsls r0, 24 - ldr r1, _08087870 + ldr r1, =0x02032308 lsrs r0, 22 adds r0, r1 ldrb r1, [r0, 0x2] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087874 + ldr r1, =0x02037350 adds r0, r1 ldrb r0, [r0, 0x4] bx lr .align 2, 0 -_08087870: .4byte 0x02032308 -_08087874: .4byte 0x02037350 + .pool thumb_func_end sub_8087858 thumb_func_start sub_8087878 sub_8087878: @ 8087878 lsls r0, 24 - ldr r3, _08087898 + ldr r3, =0x02032308 lsrs r0, 22 adds r0, r3 ldrb r3, [r0, 0x2] lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r3, _0808789C + ldr r3, =0x02037350 adds r0, r3 ldrh r3, [r0, 0x10] strh r3, [r1] @@ -273530,61 +263542,58 @@ sub_8087878: @ 8087878 strh r0, [r2] bx lr .align 2, 0 -_08087898: .4byte 0x02032308 -_0808789C: .4byte 0x02037350 + .pool thumb_func_end sub_8087878 thumb_func_start sub_80878A0 sub_80878A0: @ 80878A0 lsls r0, 24 - ldr r1, _080878B8 + ldr r1, =0x02032308 lsrs r0, 22 adds r0, r1 ldrb r1, [r0, 0x2] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080878BC + ldr r1, =0x02037350 adds r0, r1 ldrb r0, [r0, 0x19] bx lr .align 2, 0 -_080878B8: .4byte 0x02032308 -_080878BC: .4byte 0x02037350 + .pool thumb_func_end sub_80878A0 thumb_func_start sub_80878C0 sub_80878C0: @ 80878C0 lsls r0, 24 - ldr r1, _080878DC + ldr r1, =0x02032308 lsrs r0, 22 adds r0, r1 ldrb r1, [r0, 0x2] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080878E0 + ldr r1, =0x02037350 adds r0, r1 ldrb r0, [r0, 0xB] lsls r0, 28 lsrs r0, 28 bx lr .align 2, 0 -_080878DC: .4byte 0x02032308 -_080878E0: .4byte 0x02037350 + .pool thumb_func_end sub_80878C0 thumb_func_start sub_80878E4 sub_80878E4: @ 80878E4 lsls r0, 24 - ldr r1, _08087904 + ldr r1, =0x02032308 lsrs r0, 22 adds r0, r1 ldrb r1, [r0, 0x2] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087908 + ldr r1, =0x02037350 adds r0, r1 adds r0, 0x21 movs r1, 0 @@ -273593,15 +263602,14 @@ sub_80878E4: @ 80878E4 subs r0, r1 bx lr .align 2, 0 -_08087904: .4byte 0x02032308 -_08087908: .4byte 0x02037350 + .pool thumb_func_end sub_80878E4 thumb_func_start sub_808790C sub_808790C: @ 808790C push {r4-r6,lr} movs r2, 0 - ldr r5, _08087950 + ldr r5, =0x02032308 lsls r0, 16 asrs r4, r0, 16 lsls r1, 16 @@ -273622,7 +263630,7 @@ _0808792E: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087954 + ldr r1, =0x02037350 adds r1, r0, r1 movs r6, 0x10 ldrsh r0, [r1, r6] @@ -273635,8 +263643,7 @@ _0808792E: adds r0, r2, 0 b _08087964 .align 2, 0 -_08087950: .4byte 0x02032308 -_08087954: .4byte 0x02037350 + .pool _08087958: adds r0, r2, 0x1 lsls r0, 24 @@ -273658,13 +263665,13 @@ sub_808796C: @ 808796C lsrs r3, r1, 24 adds r2, r3, 0 lsrs r0, 22 - ldr r1, _0808799C + ldr r1, =0x02032308 adds r5, r0, r1 ldrb r1, [r5, 0x2] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080879A0 + ldr r1, =0x02037350 adds r6, r0, r1 ldrb r0, [r5] cmp r0, 0 @@ -273677,11 +263684,10 @@ sub_808796C: @ 808796C strb r0, [r6] b _080879C8 .align 2, 0 -_0808799C: .4byte 0x02032308 -_080879A0: .4byte 0x02037350 + .pool _080879A4: - ldr r4, _080879D0 - ldr r1, _080879D4 + ldr r4, =0x08339e00 + ldr r1, =0x08339dc8 ldrb r0, [r5, 0x3] lsls r0, 2 adds r0, r1 @@ -273701,8 +263707,7 @@ _080879C8: pop {r0} bx r0 .align 2, 0 -_080879D0: .4byte 0x08339e00 -_080879D4: .4byte 0x08339dc8 + .pool thumb_func_end sub_808796C thumb_func_start sub_80879D8 @@ -273710,7 +263715,7 @@ sub_80879D8: @ 80879D8 push {r4,lr} lsls r2, 24 lsrs r2, 24 - ldr r4, _080879F4 + ldr r4, =0x08339dd4 lsls r3, r2, 2 adds r3, r4 ldr r3, [r3] @@ -273721,7 +263726,7 @@ sub_80879D8: @ 80879D8 pop {r1} bx r1 .align 2, 0 -_080879F4: .4byte 0x08339dd4 + .pool thumb_func_end sub_80879D8 thumb_func_start sub_80879F8 @@ -273735,7 +263740,7 @@ sub_80879FC: @ 80879FC push {r4,lr} lsls r2, 24 lsrs r2, 24 - ldr r4, _08087A18 + ldr r4, =0x08339dd4 lsls r3, r2, 2 adds r3, r4 ldr r3, [r3] @@ -273746,7 +263751,7 @@ sub_80879FC: @ 80879FC pop {r1} bx r1 .align 2, 0 -_08087A18: .4byte 0x08339dd4 + .pool thumb_func_end sub_80879FC thumb_func_start sub_8087A1C @@ -273871,12 +263876,12 @@ npc_something3: @ 8087AE0 cmp r0, 0x9 bhi _08087B38 lsls r0, 2 - ldr r1, _08087AFC + ldr r1, =_08087B00 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08087AFC: .4byte _08087B00 + .pool .align 2, 0 _08087B00: .4byte _08087B28 @@ -273923,7 +263928,7 @@ npc_080587EC: @ 8087B40 mov r12, r2 lsls r3, 16 movs r4, 0 - ldr r0, _08087BA4 + ldr r0, =0x02037350 mov r9, r0 lsrs r2, r3, 16 mov r10, r2 @@ -273963,7 +263968,7 @@ _08087B9E: movs r0, 0x1 b _08087BBE .align 2, 0 -_08087BA4: .4byte 0x02037350 + .pool _08087BA8: adds r0, r4, 0x1 lsls r0, 24 @@ -273994,13 +263999,13 @@ sub_8087BCC: @ 8087BCC lsls r1, 24 lsrs r3, r1, 24 lsls r2, r5, 2 - ldr r0, _08087C00 + ldr r0, =0x02032308 adds r2, r0 ldrb r1, [r2, 0x2] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087C04 + ldr r1, =0x02037350 adds r4, r0, r1 ldrb r0, [r2] cmp r0, 0 @@ -274009,14 +264014,12 @@ sub_8087BCC: @ 8087BCC cmp r0, 0x4 bhi _08087C56 lsls r0, 2 - ldr r1, _08087C08 + ldr r1, =_08087C0C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08087C00: .4byte 0x02032308 -_08087C04: .4byte 0x02037350 -_08087C08: .4byte _08087C0C + .pool .align 2, 0 _08087C0C: .4byte _08087C2C @@ -274045,7 +264048,7 @@ _08087C38: _08087C44: lsls r0, 24 lsrs r0, 24 - ldr r1, _08087C84 + ldr r1, =sub_8087C8C + 1 movs r2, 0 str r2, [sp] movs r3, 0 @@ -274056,7 +264059,7 @@ _08087C56: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08087C88 + ldr r1, =0x02020630 adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -274076,8 +264079,7 @@ _08087C7A: pop {r0} bx r0 .align 2, 0 -_08087C84: .4byte sub_8087C8C + 1 -_08087C88: .4byte 0x02020630 + .pool thumb_func_end sub_8087BCC thumb_func_start sub_8087C8C @@ -274087,13 +264089,13 @@ sub_8087C8C: @ 8087C8C movs r0, 0x2E ldrsh r4, [r5, r0] lsls r4, 2 - ldr r0, _08087CF0 + ldr r0, =0x02032308 adds r4, r0 ldrb r1, [r4, 0x2] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08087CF4 + ldr r1, =0x02037350 adds r6, r0, r1 ldrh r0, [r6, 0xC] strh r0, [r5, 0x20] @@ -274128,8 +264130,7 @@ sub_8087C8C: @ 8087C8C bl obj_anim_image_start b _08087D0A .align 2, 0 -_08087CF0: .4byte 0x02032308 -_08087CF4: .4byte 0x02037350 + .pool _08087CF8: ldrb r0, [r6, 0x19] bl an_run_any__impl_pulse @@ -274183,7 +264184,7 @@ mapconnection_get_mapheader: @ 8087D44 thumb_func_start sub_8087D54 sub_8087D54: @ 8087D54 push {r4,lr} - ldr r4, _08087D70 + ldr r4, =0x02037318 adds r0, r4, 0 bl mapheader_copy_mapdata_with_padding ldr r0, [r4, 0x4] @@ -274193,13 +264194,13 @@ sub_8087D54: @ 8087D54 pop {r0} bx r0 .align 2, 0 -_08087D70: .4byte 0x02037318 + .pool thumb_func_end sub_8087D54 thumb_func_start sub_8087D74 sub_8087D74: @ 8087D74 push {r4,lr} - ldr r4, _08087DA4 + ldr r4, =0x02037318 adds r0, r4, 0 bl mapheader_copy_mapdata_with_padding movs r0, 0 @@ -274208,7 +264209,7 @@ sub_8087D74: @ 8087D74 bl sub_80E8EE0 bl mapdata_from_sav2 bl mapheader_run_script_with_tag_x1 - ldr r1, _08087DA8 + ldr r1, =0x03005dc0 ldr r0, [r1] ldr r1, [r1, 0x4] bl per_step_2 @@ -274216,8 +264217,7 @@ sub_8087D74: @ 8087D74 pop {r0} bx r0 .align 2, 0 -_08087DA4: .4byte 0x02037318 -_08087DA8: .4byte 0x03005dc0 + .pool thumb_func_end sub_8087D74 thumb_func_start sub_8087DAC @@ -274227,10 +264227,10 @@ sub_8087DAC: @ 8087DAC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08087DD8 + ldr r0, =0x03ff03ff str r0, [sp] - ldr r5, _08087DDC - ldr r2, _08087DE0 + ldr r5, =0x02032318 + ldr r2, =0x01001400 mov r0, sp adds r1, r5, 0 bl CpuFastSet @@ -274242,19 +264242,17 @@ sub_8087DAC: @ 8087DAC pop {r0} bx r0 .align 2, 0 -_08087DD8: .4byte 0x03ff03ff -_08087DDC: .4byte 0x02032318 -_08087DE0: .4byte 0x01001400 + .pool thumb_func_end sub_8087DAC thumb_func_start sub_8087DE4 sub_8087DE4: @ 8087DE4 push {r4,lr} sub sp, 0x4 - ldr r0, _08087E08 + ldr r0, =0x03ff03ff str r0, [sp] - ldr r4, _08087E0C - ldr r2, _08087E10 + ldr r4, =0x02032318 + ldr r2, =0x01001400 mov r0, sp adds r1, r4, 0 bl CpuFastSet @@ -274265,9 +264263,7 @@ sub_8087DE4: @ 8087DE4 pop {r0} bx r0 .align 2, 0 -_08087E08: .4byte 0x03ff03ff -_08087E0C: .4byte 0x02032318 -_08087E10: .4byte 0x01001400 + .pool thumb_func_end sub_8087DE4 thumb_func_start mapheader_copy_mapdata_with_padding @@ -274276,14 +264272,14 @@ mapheader_copy_mapdata_with_padding: @ 8087E14 sub sp, 0x4 adds r6, r0, 0 ldr r5, [r6] - ldr r0, _08087E60 + ldr r0, =0x03ff03ff str r0, [sp] - ldr r4, _08087E64 - ldr r2, _08087E68 + ldr r4, =0x02032318 + ldr r2, =0x01001400 mov r0, sp adds r1, r4, 0 bl CpuFastSet - ldr r2, _08087E6C + ldr r2, =0x03005dc0 str r4, [r2, 0x8] ldr r1, [r5] adds r1, 0xF @@ -274308,10 +264304,7 @@ _08087E56: pop {r0} bx r0 .align 2, 0 -_08087E60: .4byte 0x03ff03ff -_08087E64: .4byte 0x02032318 -_08087E68: .4byte 0x01001400 -_08087E6C: .4byte 0x03005dc0 + .pool thumb_func_end mapheader_copy_mapdata_with_padding thumb_func_start map_copy_with_padding @@ -274326,7 +264319,7 @@ map_copy_with_padding: @ 8087E70 mov r8, r1 lsls r2, 16 lsrs r2, 16 - ldr r0, _08087EC4 + ldr r0, =0x03005dc0 ldr r4, [r0, 0x8] ldr r1, [r0] lsls r0, r1, 3 @@ -274360,7 +264353,7 @@ _08087EB8: pop {r0} bx r0 .align 2, 0 -_08087EC4: .4byte 0x03005dc0 + .pool thumb_func_end map_copy_with_padding thumb_func_start mapheader_copy_mapdata_of_adjacent_maps @@ -274372,8 +264365,8 @@ mapheader_copy_mapdata_of_adjacent_maps: @ 8087EC8 beq _08087F4C ldr r1, [r0] ldr r5, [r0, 0x4] - ldr r2, _08087F00 - ldr r0, _08087F04 + ldr r2, =0x02037340 + ldr r0, =0x08486ef8 ldr r0, [r0] str r0, [r2] cmp r1, 0 @@ -274394,8 +264387,7 @@ _08087EE6: beq _08087F12 b _08087F44 .align 2, 0 -_08087F00: .4byte 0x02037340 -_08087F04: .4byte 0x08486ef8 + .pool _08087F08: cmp r0, 0x3 beq _08087F2A @@ -274453,7 +264445,7 @@ sub_8087F54: @ 8087F54 lsls r2, 1 ldr r3, [r4, 0xC] adds r6, r3, r2 - ldr r3, _08087FB0 + ldr r3, =0x03005dc0 ldr r2, [r3] muls r1, r2 adds r1, r0 @@ -274464,7 +264456,7 @@ sub_8087F54: @ 8087F54 cmp r0, 0 ble _08087FA6 adds r4, r0, 0 - ldr r3, _08087FB4 + ldr r3, =0x001fffff mov r8, r3 _08087F86: adds r0, r6, 0 @@ -274473,7 +264465,7 @@ _08087F86: mov r3, r8 ands r2, r3 bl CpuSet - ldr r0, _08087FB0 + ldr r0, =0x03005dc0 ldr r0, [r0] lsls r0, 1 adds r5, r0 @@ -274489,8 +264481,7 @@ _08087FA6: pop {r0} bx r0 .align 2, 0 -_08087FB0: .4byte 0x03005dc0 -_08087FB4: .4byte 0x001fffff + .pool thumb_func_end sub_8087F54 thumb_func_start sub_8087FB8 @@ -274511,7 +264502,7 @@ sub_8087FB8: @ 8087FB8 bge _08087FEC negs r6, r2 adds r2, r4 - ldr r0, _08087FE8 + ldr r0, =0x03005dc0 ldr r3, [r0] cmp r2, r3 bge _08087FE2 @@ -274520,11 +264511,11 @@ _08087FE2: movs r2, 0 b _08087FFC .align 2, 0 -_08087FE8: .4byte 0x03005dc0 + .pool _08087FEC: movs r6, 0 adds r0, r2, r4 - ldr r1, _0808801C + ldr r1, =0x03005dc0 ldr r1, [r1] subs r3, r1, r2 cmp r0, r1 @@ -274547,7 +264538,7 @@ _08088012: pop {r0} bx r0 .align 2, 0 -_0808801C: .4byte 0x03005dc0 + .pool thumb_func_end sub_8087FB8 thumb_func_start sub_8088020 @@ -274566,7 +264557,7 @@ sub_8088020: @ 8088020 bge _08088050 negs r6, r2 adds r2, r4 - ldr r0, _0808804C + ldr r0, =0x03005dc0 ldr r3, [r0] cmp r2, r3 bge _08088046 @@ -274575,11 +264566,11 @@ _08088046: movs r2, 0 b _08088060 .align 2, 0 -_0808804C: .4byte 0x03005dc0 + .pool _08088050: movs r6, 0 adds r0, r2, r4 - ldr r1, _0808807C + ldr r1, =0x03005dc0 ldr r1, [r1] subs r3, r1, r2 cmp r0, r1 @@ -274601,7 +264592,7 @@ _08088074: pop {r0} bx r0 .align 2, 0 -_0808807C: .4byte 0x03005dc0 + .pool thumb_func_end sub_8088020 thumb_func_start sub_8088080 @@ -274620,7 +264611,7 @@ sub_8088080: @ 8088080 bge _080880B0 negs r6, r2 adds r1, r2, r4 - ldr r0, _080880AC + ldr r0, =0x03005dc0 ldr r3, [r0, 0x4] cmp r1, r3 bge _080880A6 @@ -274629,11 +264620,11 @@ _080880A6: movs r2, 0 b _080880C0 .align 2, 0 -_080880AC: .4byte 0x03005dc0 + .pool _080880B0: movs r6, 0 adds r0, r2, r4 - ldr r1, _080880DC + ldr r1, =0x03005dc0 ldr r1, [r1, 0x4] subs r3, r1, r2 cmp r0, r1 @@ -274655,7 +264646,7 @@ _080880D4: pop {r0} bx r0 .align 2, 0 -_080880DC: .4byte 0x03005dc0 + .pool thumb_func_end sub_8088080 thumb_func_start sub_80880E0 @@ -274676,7 +264667,7 @@ sub_80880E0: @ 80880E0 bge _08088114 negs r6, r2 adds r1, r2, r4 - ldr r0, _08088110 + ldr r0, =0x03005dc0 ldr r3, [r0, 0x4] cmp r1, r3 bge _0808810A @@ -274685,11 +264676,11 @@ _0808810A: movs r2, 0 b _08088124 .align 2, 0 -_08088110: .4byte 0x03005dc0 + .pool _08088114: movs r6, 0 adds r0, r2, r4 - ldr r1, _08088140 + ldr r1, =0x03005dc0 ldr r1, [r1, 0x4] subs r3, r1, r2 cmp r0, r1 @@ -274711,7 +264702,7 @@ _08088138: pop {r0} bx r0 .align 2, 0 -_08088140: .4byte 0x03005dc0 + .pool thumb_func_end sub_80880E0 thumb_func_start cur_mapdata_get_upper4bit_at @@ -274721,7 +264712,7 @@ cur_mapdata_get_upper4bit_at: @ 8088144 adds r4, r1, 0 cmp r2, 0 blt _08088174 - ldr r1, _08088170 + ldr r1, =0x03005dc0 ldr r3, [r1] cmp r2, r3 bge _08088174 @@ -274739,9 +264730,9 @@ cur_mapdata_get_upper4bit_at: @ 8088144 ldrh r1, [r0] b _08088196 .align 2, 0 -_08088170: .4byte 0x03005dc0 + .pool _08088174: - ldr r0, _080881A0 + ldr r0, =0x02037318 ldr r3, [r0] adds r1, r2, 0x1 movs r2, 0x1 @@ -274759,14 +264750,13 @@ _08088174: adds r0, r2, 0 orrs r1, r0 _08088196: - ldr r0, _080881A4 + ldr r0, =0x000003ff cmp r1, r0 beq _080881A8 lsrs r0, r1, 12 b _080881AA .align 2, 0 -_080881A0: .4byte 0x02037318 -_080881A4: .4byte 0x000003ff + .pool _080881A8: movs r0, 0 _080881AA: @@ -274782,7 +264772,7 @@ cur_mapdata_get_middle2bit_at: @ 80881B0 adds r4, r1, 0 cmp r2, 0 blt _080881E0 - ldr r1, _080881DC + ldr r1, =0x03005dc0 ldr r3, [r1] cmp r2, r3 bge _080881E0 @@ -274800,9 +264790,9 @@ cur_mapdata_get_middle2bit_at: @ 80881B0 ldrh r1, [r0] b _08088202 .align 2, 0 -_080881DC: .4byte 0x03005dc0 + .pool _080881E0: - ldr r0, _08088214 + ldr r0, =0x02037318 ldr r3, [r0] adds r1, r2, 0x1 movs r2, 0x1 @@ -274820,7 +264810,7 @@ _080881E0: adds r0, r2, 0 orrs r1, r0 _08088202: - ldr r0, _08088218 + ldr r0, =0x000003ff cmp r1, r0 beq _0808821C movs r0, 0xC0 @@ -274829,8 +264819,7 @@ _08088202: lsrs r0, r1, 10 b _0808821E .align 2, 0 -_08088214: .4byte 0x02037318 -_08088218: .4byte 0x000003ff + .pool _0808821C: movs r0, 0x1 _0808821E: @@ -274846,7 +264835,7 @@ cur_mapdata_get_blockid_at: @ 8088224 adds r6, r1, 0 cmp r5, 0 blt _08088254 - ldr r1, _08088250 + ldr r1, =0x03005dc0 ldr r2, [r1] cmp r5, r2 bge _08088254 @@ -274864,9 +264853,9 @@ cur_mapdata_get_blockid_at: @ 8088224 ldrh r4, [r0] b _08088278 .align 2, 0 -_08088250: .4byte 0x03005dc0 + .pool _08088254: - ldr r0, _08088284 + ldr r0, =0x02037318 ldr r3, [r0] adds r1, r5, 0x1 movs r2, 0x1 @@ -274885,17 +264874,16 @@ _08088254: adds r4, r0, 0 orrs r4, r1 _08088278: - ldr r0, _08088288 + ldr r0, =0x000003ff cmp r4, r0 beq _0808828C ands r4, r0 adds r0, r4, 0 b _080882B0 .align 2, 0 -_08088284: .4byte 0x02037318 -_08088288: .4byte 0x000003ff + .pool _0808828C: - ldr r0, _080882B8 + ldr r0, =0x02037318 ldr r3, [r0] adds r1, r5, 0x1 movs r2, 0x1 @@ -274918,7 +264906,7 @@ _080882B0: pop {r1} bx r1 .align 2, 0 -_080882B8: .4byte 0x02037318 + .pool thumb_func_end cur_mapdata_get_blockid_at thumb_func_start cur_mapdata_block_get_role_at @@ -274959,7 +264947,7 @@ setmaptile_0: @ 80882F0 lsrs r5, r2, 16 cmp r3, 0 blt _08088328 - ldr r2, _08088330 + ldr r2, =0x03005dc0 ldr r4, [r2] cmp r3, r4 bge _08088328 @@ -274977,7 +264965,7 @@ setmaptile_0: @ 80882F0 movs r2, 0xF0 lsls r2, 8 ands r2, r0 - ldr r0, _08088334 + ldr r0, =0x00000fff ands r0, r5 orrs r2, r0 strh r2, [r1] @@ -274986,8 +264974,7 @@ _08088328: pop {r0} bx r0 .align 2, 0 -_08088330: .4byte 0x03005dc0 -_08088334: .4byte 0x00000fff + .pool thumb_func_end setmaptile_0 thumb_func_start sub_8088338 @@ -274998,7 +264985,7 @@ sub_8088338: @ 8088338 lsrs r5, r2, 16 cmp r3, 0 blt _08088364 - ldr r2, _0808836C + ldr r2, =0x03005dc0 ldr r4, [r2] cmp r3, r4 bge _08088364 @@ -275019,7 +265006,7 @@ _08088364: pop {r0} bx r0 .align 2, 0 -_0808836C: .4byte 0x03005dc0 + .pool thumb_func_end sub_8088338 thumb_func_start cur_mapdata_get_behaviour_by_blockid @@ -275028,34 +265015,33 @@ cur_mapdata_get_behaviour_by_blockid: @ 8088370 lsls r0, 16 lsrs r2, r0, 16 adds r3, r2, 0 - ldr r0, _0808838C + ldr r0, =0x000001ff cmp r2, r0 bhi _08088394 - ldr r0, _08088390 + ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x10] ldr r1, [r0, 0x10] lsls r0, r2, 1 b _080883B2 .align 2, 0 -_0808838C: .4byte 0x000001ff -_08088390: .4byte 0x02037318 + .pool _08088394: - ldr r0, _080883A0 + ldr r0, =0x000003ff cmp r2, r0 bls _080883A4 movs r0, 0xFF b _080883B6 .align 2, 0 -_080883A0: .4byte 0x000003ff + .pool _080883A4: - ldr r0, _080883BC + ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r1, [r0, 0x10] lsls r0, r3, 1 adds r0, r1 - ldr r1, _080883C0 + ldr r1, =0xfffffc00 _080883B2: adds r0, r1 ldrh r0, [r0] @@ -275063,8 +265049,7 @@ _080883B6: pop {r1} bx r1 .align 2, 0 -_080883BC: .4byte 0x02037318 -_080883C0: .4byte 0xfffffc00 + .pool thumb_func_end cur_mapdata_get_behaviour_by_blockid thumb_func_start save_serialize_map @@ -275073,11 +265058,11 @@ save_serialize_map: @ 80883C4 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0808842C + ldr r0, =0x03005d8c ldr r1, [r0] adds r4, r1, 0 adds r4, 0x34 - ldr r0, _08088430 + ldr r0, =0x03005dc0 ldr r0, [r0] mov r8, r0 movs r0, 0 @@ -275089,7 +265074,7 @@ save_serialize_map: @ 80883C4 cmp r0, r1 bge _08088420 mov r12, r1 - ldr r1, _08088434 + ldr r1, =0x02032318 mov r9, r1 lsls r7, r6, 1 _080883F2: @@ -275126,9 +265111,7 @@ _08088420: pop {r0} bx r0 .align 2, 0 -_0808842C: .4byte 0x03005d8c -_08088430: .4byte 0x03005dc0 -_08088434: .4byte 0x02032318 + .pool thumb_func_end save_serialize_map thumb_func_start sub_8088438 @@ -275136,11 +265119,11 @@ sub_8088438: @ 8088438 push {r4,lr} movs r2, 0 movs r1, 0 - ldr r0, _08088464 + ldr r0, =0x03005d8c ldr r0, [r0] adds r3, r0, 0 adds r3, 0x34 - ldr r4, _08088468 + ldr r4, =0x000001ff _08088448: lsls r0, r1, 1 adds r0, r3, r0 @@ -275156,8 +265139,7 @@ _08088448: movs r0, 0 b _0808846E .align 2, 0 -_08088464: .4byte 0x03005d8c -_08088468: .4byte 0x000001ff + .pool _0808846C: movs r0, 0x1 _0808846E: @@ -275173,18 +265155,17 @@ sav2_mapdata_clear: @ 8088474 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r0, _08088494 + ldr r0, =0x03005d8c ldr r1, [r0] adds r1, 0x34 - ldr r2, _08088498 + ldr r2, =0x01000100 mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08088494: .4byte 0x03005d8c -_08088498: .4byte 0x01000100 + .pool thumb_func_end sav2_mapdata_clear thumb_func_start mapdata_from_sav2 @@ -275195,14 +265176,14 @@ mapdata_from_sav2: @ 808849C mov r5, r8 push {r5-r7} sub sp, 0x10 - ldr r4, _080884E4 + ldr r4, =0x03005d8c ldr r0, [r4] adds r7, r0, 0 adds r7, 0x34 bl sub_8088438 cmp r0, 0 bne _080885AC - ldr r0, _080884E8 + ldr r0, =0x03005dc0 ldr r0, [r0] str r0, [sp] ldr r0, [r4] @@ -275226,8 +265207,7 @@ _080884D6: mov r9, r0 b _08088508 .align 2, 0 -_080884E4: .4byte 0x03005d8c -_080884E8: .4byte 0x03005dc0 + .pool _080884EC: mov r0, r8 adds r0, 0xD @@ -275235,7 +265215,7 @@ _080884EC: mov r9, r1 cmp r6, r0 bne _08088508 - ldr r0, _080885BC + ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x4] subs r0, 0x1 @@ -275262,7 +265242,7 @@ _08088520: muls r0, r6 adds r0, r5, r0 lsls r0, 1 - ldr r1, _080885C0 + ldr r1, =0x02032318 adds r4, r0, r1 adds r0, r4, 0 lsrs r1, r3, 16 @@ -275310,7 +265290,7 @@ _08088574: asrs r1, r2, 16 bl sub_80D423C _08088584: - ldr r0, _080885BC + ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x4] subs r0, 0x1 @@ -275340,8 +265320,7 @@ _080885AC: pop {r0} bx r0 .align 2, 0 -_080885BC: .4byte 0x02037318 -_080885C0: .4byte 0x02032318 + .pool thumb_func_end mapdata_from_sav2 thumb_func_start sub_80885C4 @@ -275355,12 +265334,12 @@ sub_80885C4: @ 80885C4 lsls r0, 24 lsrs r3, r0, 24 adds r2, r3, 0 - ldr r0, _0808860C + ldr r0, =0x03005d8c ldr r1, [r0] adds r0, r1, 0 adds r0, 0x34 str r0, [sp, 0x4] - ldr r0, _08088610 + ldr r0, =0x03005dc0 ldr r0, [r0] str r0, [sp] movs r4, 0 @@ -275382,8 +265361,7 @@ sub_80885C4: @ 80885C4 beq _08088626 b _0808863E .align 2, 0 -_0808860C: .4byte 0x03005d8c -_08088610: .4byte 0x03005dc0 + .pool _08088614: cmp r2, 0x3 beq _08088630 @@ -275415,7 +265393,7 @@ _0808863E: movs r1, 0 cmp r1, r12 bge _08088682 - ldr r0, _08088698 + ldr r0, =0x02032318 mov r10, r0 _08088648: adds r4, r1, 0x1 @@ -275460,7 +265438,7 @@ _08088682: pop {r0} bx r0 .align 2, 0 -_08088698: .4byte 0x02032318 + .pool thumb_func_end sub_80885C4 thumb_func_start mapborder_visible_from_position @@ -275470,7 +265448,7 @@ mapborder_visible_from_position: @ 808869C adds r5, r1, 0 cmp r4, 0 blt _080886D8 - ldr r1, _080886D0 + ldr r1, =0x03005dc0 ldr r2, [r1] cmp r4, r2 bge _080886D8 @@ -275486,15 +265464,14 @@ mapborder_visible_from_position: @ 808869C lsls r0, 1 adds r0, r1 ldrh r1, [r0] - ldr r0, _080886D4 + ldr r0, =0x000003ff cmp r1, r0 beq _08088770 b _08088700 .align 2, 0 -_080886D0: .4byte 0x03005dc0 -_080886D4: .4byte 0x000003ff + .pool _080886D8: - ldr r0, _0808871C + ldr r0, =0x02037318 ldr r3, [r0] adds r1, r4, 0x1 movs r2, 0x1 @@ -275511,16 +265488,16 @@ _080886D8: lsls r2, 4 adds r0, r2, 0 orrs r0, r1 - ldr r1, _08088720 + ldr r1, =0x000003ff cmp r0, r1 beq _08088770 _08088700: - ldr r1, _08088724 + ldr r1, =0x03005dc0 ldr r0, [r1] subs r0, 0x8 cmp r4, r0 blt _0808872C - ldr r0, _08088728 + ldr r0, =0x02037340 ldrb r1, [r0] movs r0, 0x8 ands r0, r1 @@ -275529,14 +265506,11 @@ _08088700: movs r0, 0x4 b _08088782 .align 2, 0 -_0808871C: .4byte 0x02037318 -_08088720: .4byte 0x000003ff -_08088724: .4byte 0x03005dc0 -_08088728: .4byte 0x02037340 + .pool _0808872C: cmp r4, 0x6 bgt _08088744 - ldr r0, _08088740 + ldr r0, =0x02037340 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 @@ -275545,13 +265519,13 @@ _0808872C: movs r0, 0x3 b _08088782 .align 2, 0 -_08088740: .4byte 0x02037340 + .pool _08088744: ldr r0, [r1, 0x4] subs r0, 0x7 cmp r5, r0 blt _08088760 - ldr r0, _0808875C + ldr r0, =0x02037340 ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -275560,11 +265534,11 @@ _08088744: movs r0, 0x1 b _08088782 .align 2, 0 -_0808875C: .4byte 0x02037340 + .pool _08088760: cmp r5, 0x6 bgt _08088780 - ldr r0, _08088778 + ldr r0, =0x02037340 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 @@ -275575,7 +265549,7 @@ _08088770: negs r0, r0 b _08088782 .align 2, 0 -_08088778: .4byte 0x02037340 + .pool _0808877C: movs r0, 0x2 b _08088782 @@ -275591,7 +265565,7 @@ _08088782: sub_8088788: @ 8088788 push {r4,lr} adds r3, r1, 0 - ldr r1, _080887AC + ldr r1, =0x03005d8c ldr r1, [r1] movs r4, 0 ldrsh r2, [r1, r4] @@ -275607,17 +265581,17 @@ sub_8088788: @ 8088788 pop {r1} bx r1 .align 2, 0 -_080887AC: .4byte 0x03005d8c + .pool thumb_func_end sub_8088788 thumb_func_start sub_80887B0 sub_80887B0: @ 80887B0 push {r4,r5,lr} - ldr r1, _080887E8 + ldr r1, =0x03005d8c ldr r4, [r1] movs r1, 0 ldrsh r3, [r4, r1] - ldr r2, _080887EC + ldr r2, =0x08339d64 lsls r0, 3 adds r1, r0, r2 ldr r1, [r1] @@ -275639,8 +265613,7 @@ sub_80887B0: @ 80887B0 movs r0, 0x1 b _080887F2 .align 2, 0 -_080887E8: .4byte 0x03005d8c -_080887EC: .4byte 0x08339d64 + .pool _080887F0: movs r0, 0 _080887F2: @@ -275670,7 +265643,7 @@ _08088816: beq _08088834 cmp r4, 0x4 bne _08088872 - ldr r0, _08088830 + ldr r0, =0x03005d8c ldr r1, [r0] negs r0, r6 strh r0, [r1] @@ -275679,9 +265652,9 @@ _08088816: subs r0, r2 b _08088870 .align 2, 0 -_08088830: .4byte 0x03005d8c + .pool _08088834: - ldr r0, _08088848 + ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, [r3] ldr r0, [r0] @@ -275691,9 +265664,9 @@ _08088834: subs r0, r2 b _08088870 .align 2, 0 -_08088848: .4byte 0x03005d8c + .pool _0808884C: - ldr r0, _0808885C + ldr r0, =0x03005d8c ldr r1, [r0] ldr r2, [r5, 0x4] ldrh r0, [r1] @@ -275702,9 +265675,9 @@ _0808884C: negs r0, r7 b _08088870 .align 2, 0 -_0808885C: .4byte 0x03005d8c + .pool _08088860: - ldr r0, _08088878 + ldr r0, =0x03005d8c ldr r1, [r0] ldr r2, [r5, 0x4] ldrh r0, [r1] @@ -275719,7 +265692,7 @@ _08088872: pop {r0} bx r0 .align 2, 0 -_08088878: .4byte 0x03005d8c + .pool thumb_func_end sub_80887F8 thumb_func_start camera_move_maybe @@ -275731,12 +265704,12 @@ camera_move_maybe: @ 808887C push {r5-r7} mov r10, r0 mov r9, r1 - ldr r1, _080888BC + ldr r1, =0x02037334 ldrb r0, [r1] movs r1, 0x2 negs r1, r1 ands r1, r0 - ldr r2, _080888BC + ldr r2, =0x02037334 strb r1, [r2] mov r0, r10 mov r1, r9 @@ -275745,7 +265718,7 @@ camera_move_maybe: @ 808887C adds r0, r7, 0x1 cmp r0, 0x1 bhi _080888C4 - ldr r0, _080888C0 + ldr r0, =0x03005d8c ldr r1, [r0] ldrh r0, [r1] add r0, r10 @@ -275755,12 +265728,11 @@ camera_move_maybe: @ 808887C strh r0, [r1, 0x2] b _08088932 .align 2, 0 -_080888BC: .4byte 0x02037334 -_080888C0: .4byte 0x03005d8c + .pool _080888C4: bl save_serialize_map bl sub_81BE72C - ldr r1, _08088948 + ldr r1, =0x03005d8c ldr r0, [r1] movs r2, 0 ldrsh r5, [r0, r2] @@ -275781,23 +265753,23 @@ _080888C4: ldrb r0, [r4, 0x8] ldrb r1, [r4, 0x9] bl mliX_load_map - ldr r1, _0808894C + ldr r1, =0x02037334 ldrb r0, [r1] movs r1, 0x1 orrs r0, r1 - ldr r2, _0808894C + ldr r2, =0x02037334 strb r0, [r2] - ldr r0, _08088948 + ldr r0, =0x03005d8c ldr r1, [r0] movs r2, 0 ldrsh r0, [r1, r2] subs r5, r0 - ldr r0, _0808894C + ldr r0, =0x02037334 str r5, [r0, 0x4] movs r2, 0x2 ldrsh r0, [r1, r2] subs r6, r0 - ldr r0, _0808894C + ldr r0, =0x02037334 str r6, [r0, 0x8] ldrh r0, [r1] add r0, r10 @@ -275808,7 +265780,7 @@ _080888C4: mov r0, r8 bl sub_80885C4 _08088932: - ldr r0, _0808894C + ldr r0, =0x02037334 ldrb r0, [r0] lsls r0, 31 lsrs r0, 31 @@ -275820,8 +265792,7 @@ _08088932: pop {r1} bx r1 .align 2, 0 -_08088948: .4byte 0x03005d8c -_0808894C: .4byte 0x02037334 + .pool thumb_func_end camera_move_maybe thumb_func_start sub_8088950 @@ -275834,7 +265805,7 @@ sub_8088950: @ 8088950 mov r8, r2 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0808898C + ldr r0, =0x02037318 ldr r0, [r0, 0xC] ldr r7, [r0] ldr r4, [r0, 0x4] @@ -275857,7 +265828,7 @@ _0808896E: adds r0, r4, 0 b _0808899A .align 2, 0 -_0808898C: .4byte 0x02037318 + .pool _08088990: adds r5, 0x1 adds r4, 0xC @@ -275892,7 +265863,7 @@ sub_80889A8: @ 80889A8 blt _08088A00 cmp r4, 0x2 bgt _080889E0 - ldr r0, _080889DC + ldr r0, =0x02037318 ldr r0, [r0] ldr r1, [r0] ldr r0, [r2] @@ -275901,11 +265872,11 @@ sub_80889A8: @ 80889A8 adds r0, r7, 0 b _080889F2 .align 2, 0 -_080889DC: .4byte 0x02037318 + .pool _080889E0: cmp r6, 0x4 bgt _08088A00 - ldr r0, _080889FC + ldr r0, =0x02037318 ldr r0, [r0] ldr r1, [r0, 0x4] ldr r0, [r2] @@ -275918,7 +265889,7 @@ _080889F2: lsrs r0, 24 b _08088A02 .align 2, 0 -_080889FC: .4byte 0x02037318 + .pool _08088A00: movs r0, 0 _08088A02: @@ -276022,13 +265993,13 @@ sub_8088A8C: @ 8088A8C mov r8, r0 lsls r1, 16 lsrs r1, 16 - ldr r2, _08088AAC + ldr r2, =0x02037318 ldr r0, [r2, 0xC] cmp r0, 0 bne _08088AB4 b _08088B2A .align 2, 0 -_08088AAC: .4byte 0x02037318 + .pool _08088AB0: adds r0, r4, 0 b _08088B2C @@ -276115,7 +266086,7 @@ sub_8088B3C: @ 8088B3C lsrs r0, 16 lsls r1, 16 lsrs r1, 16 - ldr r2, _08088B54 + ldr r2, =0x03005d8c ldr r2, [r2] subs r0, 0x7 strh r0, [r2] @@ -276123,12 +266094,12 @@ sub_8088B3C: @ 8088B3C strh r1, [r2, 0x2] bx lr .align 2, 0 -_08088B54: .4byte 0x03005d8c + .pool thumb_func_end sub_8088B3C thumb_func_start sav1_camera_get_focus_coords sav1_camera_get_focus_coords: @ 8088B58 - ldr r2, _08088B6C + ldr r2, =0x03005d8c ldr r3, [r2] ldrh r2, [r3] adds r2, 0x7 @@ -276138,23 +266109,23 @@ sav1_camera_get_focus_coords: @ 8088B58 strh r0, [r1] bx lr .align 2, 0 -_08088B6C: .4byte 0x03005d8c + .pool thumb_func_end sav1_camera_get_focus_coords thumb_func_start sub_8088B70 sub_8088B70: @ 8088B70 - ldr r2, _08088B7C + ldr r2, =0x03005d8c ldr r2, [r2] strh r0, [r2] strh r1, [r2, 0x2] bx lr .align 2, 0 -_08088B7C: .4byte 0x03005d8c + .pool thumb_func_end sub_8088B70 thumb_func_start sub_8088B80 sub_8088B80: @ 8088B80 - ldr r2, _08088B90 + ldr r2, =0x03005d8c ldr r3, [r2] ldrh r2, [r3] strh r2, [r0] @@ -276162,7 +266133,7 @@ sub_8088B80: @ 8088B80 strh r0, [r1] bx lr .align 2, 0 -_08088B90: .4byte 0x03005d8c + .pool thumb_func_end sub_8088B80 thumb_func_start sub_8088B94 @@ -276173,7 +266144,7 @@ sub_8088B94: @ 8088B94 adds r5, r2, 0 cmp r4, 0 blt _08088BE6 - ldr r2, _08088BD0 + ldr r2, =0x03005dc0 ldr r1, [r2] cmp r4, r1 bge _08088BE6 @@ -276198,7 +266169,7 @@ sub_8088B94: @ 8088B94 strh r1, [r0] b _08088BE6 .align 2, 0 -_08088BD0: .4byte 0x03005dc0 + .pool _08088BD4: muls r1, r3 adds r1, r4, r1 @@ -276206,7 +266177,7 @@ _08088BD4: lsls r1, 1 adds r1, r0 ldrh r2, [r1] - ldr r0, _08088BEC + ldr r0, =0x0000f3ff ands r0, r2 strh r0, [r1] _08088BE6: @@ -276214,7 +266185,7 @@ _08088BE6: pop {r0} bx r0 .align 2, 0 -_08088BEC: .4byte 0x0000f3ff + .pool thumb_func_end sub_8088B94 thumb_func_start sub_8088BF0 @@ -276238,7 +266209,7 @@ _08088C0C: adds r3, r0 _08088C10: ldrh r1, [r3] - ldr r0, _08088C28 + ldr r0, =0x000003ff ands r0, r1 adds r1, r2, 0 bl sub_80FADE4 @@ -276250,7 +266221,7 @@ _08088C24: movs r0, 0 b _08088C2E .align 2, 0 -_08088C28: .4byte 0x000003ff + .pool _08088C2C: movs r0, 0x1 _08088C2E: @@ -276519,7 +266490,7 @@ sub_8088DF0: @ 8088DF0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08088E08 + ldr r1, =0x08486efc adds r0, r1 ldrb r1, [r0] movs r0, 0x1 @@ -276529,7 +266500,7 @@ sub_8088DF0: @ 8088DF0 movs r0, 0 b _08088E0E .align 2, 0 -_08088E08: .4byte 0x08486efc + .pool _08088E0C: movs r0, 0x1 _08088E0E: @@ -276826,7 +266797,7 @@ is_tile_grass_maybe: @ 8088F88 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08088FA0 + ldr r1, =0x08486efc adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -276836,7 +266807,7 @@ is_tile_grass_maybe: @ 8088F88 movs r0, 0 b _08088FA6 .align 2, 0 -_08088FA0: .4byte 0x08486efc + .pool _08088FA4: movs r0, 0x1 _08088FA6: @@ -279137,24 +269108,24 @@ coords8_add: @ 8089B84 thumb_func_start move_tilemap_camera_to_upper_left_corner move_tilemap_camera_to_upper_left_corner: @ 8089B94 push {lr} - ldr r0, _08089BA0 + ldr r0, =0x03000e20 bl move_tilemap_camera_to_upper_left_corner_ pop {r0} bx r0 .align 2, 0 -_08089BA0: .4byte 0x03000e20 + .pool thumb_func_end move_tilemap_camera_to_upper_left_corner thumb_func_start sub_8089BA4 sub_8089BA4: @ 8089BA4 push {r4,r5,lr} - ldr r1, _08089BFC - ldr r0, _08089C00 + ldr r1, =0x03000e20 + ldr r0, =0x03000e28 movs r2, 0 ldrsh r5, [r0, r2] ldrb r0, [r1] adds r5, r0 - ldr r0, _08089C04 + ldr r0, =0x03000e2a movs r2, 0 ldrsh r4, [r0, r2] ldrb r1, [r1, 0x1] @@ -279186,21 +269157,19 @@ sub_8089BA4: @ 8089BA4 pop {r0} bx r0 .align 2, 0 -_08089BFC: .4byte 0x03000e20 -_08089C00: .4byte 0x03000e28 -_08089C04: .4byte 0x03000e2a + .pool thumb_func_end sub_8089BA4 thumb_func_start sub_8089C08 sub_8089C08: @ 8089C08 push {r4,lr} - ldr r3, _08089C28 - ldr r2, _08089C2C + ldr r3, =0x03000e20 + ldr r2, =0x03000e28 ldrh r2, [r2] ldrb r4, [r3] adds r2, r4 strh r2, [r0] - ldr r0, _08089C30 + ldr r0, =0x03000e2a ldrh r0, [r0] ldrb r3, [r3, 0x1] adds r0, r3 @@ -279210,32 +269179,28 @@ sub_8089C08: @ 8089C08 pop {r0} bx r0 .align 2, 0 -_08089C28: .4byte 0x03000e20 -_08089C2C: .4byte 0x03000e28 -_08089C30: .4byte 0x03000e2a + .pool thumb_func_end sub_8089C08 thumb_func_start cur_mapdata_full_redraw cur_mapdata_full_redraw: @ 8089C34 push {lr} - ldr r0, _08089C54 + ldr r0, =0x03005d8c ldr r1, [r0] movs r2, 0 ldrsh r0, [r1, r2] movs r2, 0x2 ldrsh r1, [r1, r2] - ldr r2, _08089C58 + ldr r2, =0x02037318 ldr r2, [r2] bl cur_mapdata_redraw_all_blocks_at - ldr r1, _08089C5C + ldr r1, =0x03000e20 movs r0, 0x1 strb r0, [r1, 0x4] pop {r0} bx r0 .align 2, 0 -_08089C54: .4byte 0x03005d8c -_08089C58: .4byte 0x02037318 -_08089C5C: .4byte 0x03000e20 + .pool thumb_func_end cur_mapdata_full_redraw thumb_func_start cur_mapdata_redraw_all_blocks_at @@ -279251,7 +269216,7 @@ cur_mapdata_redraw_all_blocks_at: @ 8089C60 mov r8, r2 movs r1, 0 _08089C74: - ldr r2, _08089CE0 + ldr r2, =0x03000e20 ldrb r0, [r2, 0x3] adds r0, r1, r0 lsls r0, 24 @@ -279268,7 +269233,7 @@ _08089C88: str r7, [sp] lsrs r5, r1, 1 _08089C92: - ldr r1, _08089CE0 + ldr r1, =0x03000e20 ldrb r0, [r1, 0x2] adds r0, r4, r0 lsls r0, 24 @@ -279307,7 +269272,7 @@ _08089CA6: pop {r0} bx r0 .align 2, 0 -_08089CE0: .4byte 0x03000e20 + .pool thumb_func_end cur_mapdata_redraw_all_blocks_at thumb_func_start cur_mapheader_draw_map_slice @@ -279316,7 +269281,7 @@ cur_mapheader_draw_map_slice: @ 8089CE4 adds r5, r0, 0 adds r6, r1, 0 adds r7, r2, 0 - ldr r0, _08089D2C + ldr r0, =0x02037318 ldr r4, [r0] cmp r6, 0 ble _08089CFC @@ -279348,7 +269313,7 @@ _08089D20: pop {r0} bx r0 .align 2, 0 -_08089D2C: .4byte 0x02037318 + .pool thumb_func_end cur_mapheader_draw_map_slice thumb_func_start cur_mapheader_draw_map_slice_above @@ -279382,7 +269347,7 @@ _08089D5E: adds r1, r6, r0 lsls r1, 16 lsrs r1, 16 - ldr r0, _08089D8C + ldr r0, =0x03005d8c ldr r3, [r0] movs r0, 0 ldrsh r2, [r3, r0] @@ -279402,7 +269367,7 @@ _08089D5E: pop {r0} bx r0 .align 2, 0 -_08089D8C: .4byte 0x03005d8c + .pool thumb_func_end cur_mapheader_draw_map_slice_above thumb_func_start cur_mapheader_draw_map_slice_below @@ -279425,7 +269390,7 @@ _08089D9C: lsrs r0, 24 _08089DAE: adds r1, r6, r0 - ldr r0, _08089DD8 + ldr r0, =0x03005d8c ldr r3, [r0] movs r0, 0 ldrsh r2, [r3, r0] @@ -279444,7 +269409,7 @@ _08089DAE: pop {r0} bx r0 .align 2, 0 -_08089DD8: .4byte 0x03005d8c + .pool thumb_func_end cur_mapheader_draw_map_slice_below thumb_func_start cur_mapheader_draw_map_slice_right @@ -279471,7 +269436,7 @@ _08089DFC: adds r1, r6 lsls r1, 16 lsrs r1, 16 - ldr r0, _08089E30 + ldr r0, =0x03005d8c ldr r0, [r0] movs r3, 0 ldrsh r2, [r0, r3] @@ -279492,7 +269457,7 @@ _08089DFC: pop {r0} bx r0 .align 2, 0 -_08089E30: .4byte 0x03005d8c + .pool thumb_func_end cur_mapheader_draw_map_slice_right thumb_func_start cur_mapheader_draw_map_slice_left @@ -279529,7 +269494,7 @@ _08089E66: adds r1, r5 lsls r1, 16 lsrs r1, 16 - ldr r0, _08089E9C + ldr r0, =0x03005d8c ldr r0, [r0] movs r3, 0 ldrsh r2, [r0, r3] @@ -279551,7 +269516,7 @@ _08089E66: pop {r0} bx r0 .align 2, 0 -_08089E9C: .4byte 0x03005d8c + .pool thumb_func_end cur_mapheader_draw_map_slice_left thumb_func_start cur_mapdata_draw_block_at @@ -279559,7 +269524,7 @@ cur_mapdata_draw_block_at: @ 8089EA0 push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r6, _08089ED4 + ldr r6, =0x03000e20 adds r0, r6, 0 adds r1, r4, 0 adds r2, r5, 0 @@ -279567,7 +269532,7 @@ cur_mapdata_draw_block_at: @ 8089EA0 adds r1, r0, 0 cmp r1, 0 blt _08089ECC - ldr r0, _08089ED8 + ldr r0, =0x02037318 ldr r0, [r0] lsls r1, 16 lsrs r1, 16 @@ -279581,8 +269546,7 @@ _08089ECC: pop {r0} bx r0 .align 2, 0 -_08089ED4: .4byte 0x03000e20 -_08089ED8: .4byte 0x02037318 + .pool thumb_func_end cur_mapdata_draw_block_at thumb_func_start overworld_draw_block_type1_on_map_coord @@ -279591,7 +269555,7 @@ overworld_draw_block_type1_on_map_coord: @ 8089EDC adds r3, r0, 0 adds r4, r1, 0 adds r5, r2, 0 - ldr r6, _08089F0C + ldr r6, =0x03000e20 adds r0, r6, 0 adds r1, r3, 0 adds r2, r4, 0 @@ -279610,7 +269574,7 @@ _08089F04: pop {r0} bx r0 .align 2, 0 -_08089F0C: .4byte 0x03000e20 + .pool thumb_func_end overworld_draw_block_type1_on_map_coord thumb_func_start cur_mapdata_draw_block_at_internal @@ -279635,18 +269599,18 @@ cur_mapdata_draw_block_at_internal: @ 8089F10 bls _08089F38 movs r4, 0 _08089F38: - ldr r0, _08089F44 + ldr r0, =0x000001ff cmp r4, r0 bhi _08089F48 ldr r0, [r5, 0x10] ldr r5, [r0, 0xC] b _08089F54 .align 2, 0 -_08089F44: .4byte 0x000001ff + .pool _08089F48: ldr r0, [r5, 0x14] ldr r5, [r0, 0xC] - ldr r1, _08089F74 + ldr r1, =0xfffffe00 adds r0, r4, r1 lsls r0, 16 lsrs r4, r0, 16 @@ -279666,7 +269630,7 @@ _08089F54: pop {r0} bx r0 .align 2, 0 -_08089F74: .4byte 0xfffffe00 + .pool thumb_func_end cur_mapdata_draw_block_at_internal thumb_func_start overworld_draw_block @@ -279685,7 +269649,7 @@ overworld_draw_block: @ 8089F78 _08089F8E: cmp r0, 0x2 bne _0808A082 - ldr r0, _08089FC8 + ldr r0, =0x03005da4 ldr r0, [r0] lsls r3, r2, 1 adds r0, r3, r0 @@ -279700,7 +269664,7 @@ _08089F8E: adds r0, 0x42 ldrh r1, [r4, 0x6] strh r1, [r0] - ldr r0, _08089FCC + ldr r0, =0x03005d9c ldr r0, [r0] adds r0, r3, r0 movs r2, 0 @@ -279713,10 +269677,9 @@ _08089F8E: strh r2, [r0] b _0808A066 .align 2, 0 -_08089FC8: .4byte 0x03005da4 -_08089FCC: .4byte 0x03005d9c + .pool _08089FD0: - ldr r0, _0808A024 + ldr r0, =0x03005da4 ldr r0, [r0] lsls r3, r2, 1 adds r0, r3, r0 @@ -279731,7 +269694,7 @@ _08089FD0: adds r0, 0x42 ldrh r1, [r4, 0x6] strh r1, [r0] - ldr r0, _0808A028 + ldr r0, =0x03005d9c ldr r0, [r0] adds r0, r3, r0 ldrh r1, [r4, 0x8] @@ -279745,7 +269708,7 @@ _08089FD0: adds r0, 0x42 ldrh r1, [r4, 0xE] strh r1, [r0] - ldr r0, _0808A02C + ldr r0, =0x03005da0 ldr r0, [r0] adds r3, r0 movs r1, 0 @@ -279758,15 +269721,13 @@ _08089FD0: strh r1, [r3] b _0808A082 .align 2, 0 -_0808A024: .4byte 0x03005da4 -_0808A028: .4byte 0x03005d9c -_0808A02C: .4byte 0x03005da0 + .pool _0808A030: - ldr r0, _0808A09C + ldr r0, =0x03005da4 ldr r0, [r0] lsls r3, r2, 1 adds r0, r3, r0 - ldr r1, _0808A0A0 + ldr r1, =0x00003014 adds r2, r1, 0 strh r2, [r0] strh r2, [r0, 0x2] @@ -279775,7 +269736,7 @@ _0808A030: strh r2, [r1] adds r0, 0x42 strh r2, [r0] - ldr r0, _0808A0A4 + ldr r0, =0x03005d9c ldr r0, [r0] adds r0, r3, r0 ldrh r1, [r4] @@ -279790,7 +269751,7 @@ _0808A030: ldrh r1, [r4, 0x6] strh r1, [r0] _0808A066: - ldr r0, _0808A0A8 + ldr r0, =0x03005da0 ldr r0, [r0] adds r3, r0 ldrh r0, [r4, 0x8] @@ -279815,17 +269776,14 @@ _0808A082: pop {r0} bx r0 .align 2, 0 -_0808A09C: .4byte 0x03005da4 -_0808A0A0: .4byte 0x00003014 -_0808A0A4: .4byte 0x03005d9c -_0808A0A8: .4byte 0x03005da0 + .pool thumb_func_end overworld_draw_block thumb_func_start map_pos_to_screenspace map_pos_to_screenspace: @ 808A0AC push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _0808A0DC + ldr r0, =0x03005d8c ldr r3, [r0] movs r5, 0 ldrsh r0, [r3, r5] @@ -279850,7 +269808,7 @@ _0808A0D6: negs r0, r0 b _0808A0EE .align 2, 0 -_0808A0DC: .4byte 0x03005d8c + .pool _0808A0E0: ldrb r0, [r4, 0x3] adds r2, r0 @@ -279873,7 +269831,7 @@ sub_808A0F4: @ 808A0F4 ldr r2, [r3, 0x4] cmp r2, 0 beq _0808A114 - ldr r1, _0808A118 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -279888,12 +269846,12 @@ _0808A114: pop {r0} bx r0 .align 2, 0 -_0808A118: .4byte 0x02020630 + .pool thumb_func_end sub_808A0F4 thumb_func_start clear_all_callback6 clear_all_callback6: @ 808A11C - ldr r1, _0808A130 + ldr r1, =0x03005dd0 movs r0, 0 str r0, [r1, 0x8] str r0, [r1, 0xC] @@ -279903,7 +269861,7 @@ clear_all_callback6: @ 808A11C str r0, [r1] bx lr .align 2, 0 -_0808A130: .4byte 0x03005dd0 + .pool thumb_func_end clear_all_callback6 thumb_func_start sub_808A134 @@ -279911,14 +269869,14 @@ sub_808A134: @ 808A134 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _0808A168 + ldr r4, =0x03005dd0 ldr r1, [r4, 0x4] cmp r1, 0 beq _0808A150 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808A16C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles _0808A150: @@ -279927,16 +269885,14 @@ _0808A150: lsls r0, 24 lsrs r0, 24 str r0, [r4, 0x4] - ldr r0, _0808A170 + ldr r0, =sub_808A0F4 + 1 str r0, [r4] movs r0, 0 pop {r4,r5} pop {r1} bx r1 .align 2, 0 -_0808A168: .4byte 0x03005dd0 -_0808A16C: .4byte 0x02020630 -_0808A170: .4byte sub_808A0F4 + 1 + .pool thumb_func_end sub_808A134 thumb_func_start camera_update @@ -279944,7 +269900,7 @@ camera_update: @ 808A174 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r6, _0808A274 + ldr r6, =0x03005dd0 ldr r1, [r6] cmp r1, 0 beq _0808A188 @@ -279999,7 +269955,7 @@ _0808A1CC: ble _0808A1E0 movs r4, 0x1 _0808A1E0: - ldr r2, _0808A274 + ldr r2, =0x03005dd0 ldr r0, [r2, 0x10] adds r1, r0, r7 str r1, [r2, 0x10] @@ -280040,7 +269996,7 @@ _0808A218: adds r1, r5, 0 bl sub_80FBEA8 bl sub_80E1D6C - ldr r6, _0808A278 + ldr r6, =0x03000e20 lsls r4, 1 lsls r5, 1 adds r0, r6, 0 @@ -280052,15 +270008,15 @@ _0808A218: adds r2, r5, 0 bl cur_mapheader_draw_map_slice _0808A24E: - ldr r0, _0808A278 + ldr r0, =0x03000e20 adds r1, r7, 0 mov r2, r8 bl coords8_add - ldr r1, _0808A27C + ldr r1, =0x03005dec ldrh r0, [r1] subs r0, r7 strh r0, [r1] - ldr r1, _0808A280 + ldr r1, =0x03005de8 ldrh r0, [r1] mov r2, r8 subs r0, r2 @@ -280071,10 +270027,7 @@ _0808A24E: pop {r0} bx r0 .align 2, 0 -_0808A274: .4byte 0x03005dd0 -_0808A278: .4byte 0x03000e20 -_0808A27C: .4byte 0x03005dec -_0808A280: .4byte 0x03005de8 + .pool thumb_func_end camera_update thumb_func_start camera_move_and_redraw @@ -280089,12 +270042,12 @@ camera_move_and_redraw: @ 808A284 asrs r1, 16 bl overworld_rebase bl cur_mapdata_full_redraw - ldr r1, _0808A2B8 + ldr r1, =0x03005dec lsls r4, 4 ldrh r0, [r1] subs r0, r4 strh r0, [r1] - ldr r1, _0808A2BC + ldr r1, =0x03005de8 lsls r5, 4 ldrh r0, [r1] subs r0, r5 @@ -280103,76 +270056,70 @@ camera_move_and_redraw: @ 808A284 pop {r0} bx r0 .align 2, 0 -_0808A2B8: .4byte 0x03005dec -_0808A2BC: .4byte 0x03005de8 + .pool thumb_func_end camera_move_and_redraw thumb_func_start sub_808A2C0 sub_808A2C0: @ 808A2C0 - ldr r1, _0808A2C8 + ldr r1, =0x03000e30 str r0, [r1] bx lr .align 2, 0 -_0808A2C8: .4byte 0x03000e30 + .pool thumb_func_end sub_808A2C0 thumb_func_start sub_808A2CC sub_808A2CC: @ 808A2CC - ldr r2, _0808A2DC + ldr r2, =0x03000e28 strh r0, [r2] - ldr r0, _0808A2E0 + ldr r0, =0x03000e2a lsls r1, 16 asrs r1, 16 adds r1, 0x20 strh r1, [r0] bx lr .align 2, 0 -_0808A2DC: .4byte 0x03000e28 -_0808A2E0: .4byte 0x03000e2a + .pool thumb_func_end sub_808A2CC thumb_func_start sub_808A2E4 sub_808A2E4: @ 808A2E4 - ldr r1, _0808A300 - ldr r0, _0808A304 + ldr r1, =0x03000e30 + ldr r0, =nu_805AE74 + 1 str r0, [r1] - ldr r1, _0808A308 + ldr r1, =0x03000e2c movs r0, 0 strb r0, [r1] - ldr r1, _0808A30C + ldr r1, =0x03000e28 movs r0, 0 strh r0, [r1] - ldr r1, _0808A310 + ldr r1, =0x03000e2a movs r0, 0x20 strh r0, [r1] bx lr .align 2, 0 -_0808A300: .4byte 0x03000e30 -_0808A304: .4byte nu_805AE74 + 1 -_0808A308: .4byte 0x03000e2c -_0808A30C: .4byte 0x03000e28 -_0808A310: .4byte 0x03000e2a + .pool thumb_func_end sub_808A2E4 thumb_func_start sub_808A314 sub_808A314: @ 808A314 push {lr} - ldr r0, _0808A344 + ldr r0, =0x03000e30 ldr r0, [r0] cmp r0, 0 beq _0808A322 bl _call_via_r0 _0808A322: - ldr r2, _0808A348 - ldr r0, _0808A34C - ldr r1, _0808A350 + ldr r2, =0x02021bbc + ldr r0, =0x03005dec + ldr r1, =0x03000e28 ldrh r0, [r0] ldrh r1, [r1] subs r0, r1 strh r0, [r2] - ldr r2, _0808A354 - ldr r0, _0808A358 - ldr r1, _0808A35C + ldr r2, =0x02021bbe + ldr r0, =0x03005de8 + ldr r1, =0x03000e2a ldrh r0, [r0] ldrh r1, [r1] subs r0, r1 @@ -280181,32 +270128,26 @@ _0808A322: pop {r0} bx r0 .align 2, 0 -_0808A344: .4byte 0x03000e30 -_0808A348: .4byte 0x02021bbc -_0808A34C: .4byte 0x03005dec -_0808A350: .4byte 0x03000e28 -_0808A354: .4byte 0x02021bbe -_0808A358: .4byte 0x03005de8 -_0808A35C: .4byte 0x03000e2a + .pool thumb_func_end sub_808A314 thumb_func_start nu_805AE74 nu_805AE74: @ 808A360 push {lr} - ldr r0, _0808A370 + ldr r0, =0x02037348 ldrb r0, [r0] cmp r0, 0 bne _0808A374 bl sub_808A2E4 b _0808A3FC .align 2, 0 -_0808A370: .4byte 0x02037348 + .pool _0808A374: - ldr r0, _0808A38C + ldr r0, =0x02037590 ldrb r0, [r0, 0x3] cmp r0, 0x1 bne _0808A394 - ldr r0, _0808A390 + ldr r0, =0x03000e2c ldrb r1, [r0] movs r2, 0x1 eors r1, r2 @@ -280215,10 +270156,9 @@ _0808A374: beq _0808A3FC b _0808A39A .align 2, 0 -_0808A38C: .4byte 0x02037590 -_0808A390: .4byte 0x03000e2c + .pool _0808A394: - ldr r1, _0808A3BC + ldr r1, =0x03000e2c movs r0, 0 strb r0, [r1] _0808A39A: @@ -280227,7 +270167,7 @@ _0808A39A: lsrs r0, 24 cmp r0, 0x2 bne _0808A3C4 - ldr r2, _0808A3C0 + ldr r2, =0x03000e2a ldrh r3, [r2] movs r0, 0 ldrsh r1, [r2, r0] @@ -280238,12 +270178,11 @@ _0808A39A: subs r0, r3, 0x2 b _0808A3FA .align 2, 0 -_0808A3BC: .4byte 0x03000e2c -_0808A3C0: .4byte 0x03000e2a + .pool _0808A3C4: cmp r0, 0x1 bne _0808A3E0 - ldr r1, _0808A3DC + ldr r1, =0x03000e2a ldrh r2, [r1] movs r3, 0 ldrsh r0, [r1, r3] @@ -280253,9 +270192,9 @@ _0808A3C4: strh r0, [r1] b _0808A3FC .align 2, 0 -_0808A3DC: .4byte 0x03000e2a + .pool _0808A3E0: - ldr r2, _0808A3F0 + ldr r2, =0x03000e2a ldrh r0, [r2] movs r3, 0 ldrsh r1, [r2, r3] @@ -280264,7 +270203,7 @@ _0808A3E0: adds r0, 0x2 b _0808A3FA .align 2, 0 -_0808A3F0: .4byte 0x03000e2a + .pool _0808A3F4: cmp r1, 0x20 ble _0808A3FC @@ -280286,24 +270225,24 @@ sub_808A400: @ 808A400 ldrh r1, [r1, 0x2] ldr r0, [r2, 0x4] adds r0, r1 - ldr r1, _0808A41C + ldr r1, =0x06007e00 movs r2, 0x80 bl CpuFastSet b _0808A42E .align 2, 0 -_0808A41C: .4byte 0x06007e00 + .pool _0808A420: ldrh r1, [r1, 0x2] ldr r0, [r2, 0x4] adds r0, r1 - ldr r1, _0808A434 + ldr r1, =0x06007f00 movs r2, 0x40 bl CpuFastSet _0808A42E: pop {r0} bx r0 .align 2, 0 -_0808A434: .4byte 0x06007f00 + .pool thumb_func_end sub_808A400 thumb_func_start door_build_blockdef @@ -280468,7 +270407,7 @@ sub_808A568: @ 808A568 adds r6, r2, 0 adds r7, r3, 0 ldrh r1, [r5, 0x2] - ldr r0, _0808A5A4 + ldr r0, =0x0000ffff cmp r1, r0 bne _0808A5B0 adds r0, r4, 0 @@ -280479,19 +270418,17 @@ sub_808A568: @ 808A568 lsls r0, 24 cmp r0, 0 beq _0808A5E2 - ldr r0, _0808A5A8 + ldr r0, =0x020375e0 ldrh r1, [r0] adds r1, 0x7 - ldr r0, _0808A5AC + ldr r0, =0x020375e2 ldrh r2, [r0] adds r2, 0x7 adds r0, r4, 0 bl sub_808A530 b _0808A5E2 .align 2, 0 -_0808A5A4: .4byte 0x0000ffff -_0808A5A8: .4byte 0x020375e0 -_0808A5AC: .4byte 0x020375e2 + .pool _0808A5B0: adds r0, r4, 0 adds r1, r5, 0 @@ -280505,10 +270442,10 @@ _0808A5B0: lsls r0, 24 cmp r0, 0 beq _0808A5E2 - ldr r0, _0808A5E8 + ldr r0, =0x020375e0 ldrh r1, [r0] adds r1, 0x7 - ldr r0, _0808A5EC + ldr r0, =0x020375e2 ldrh r2, [r0] adds r2, 0x7 ldr r3, [r4, 0x8] @@ -280519,8 +270456,7 @@ _0808A5E2: pop {r0} bx r0 .align 2, 0 -_0808A5E8: .4byte 0x020375e0 -_0808A5EC: .4byte 0x020375e2 + .pool thumb_func_end sub_808A568 thumb_func_start sub_808A5F0 @@ -280587,7 +270523,7 @@ task50_overworld_door: @ 808A654 lsls r2, r4, 2 adds r2, r4 lsls r2, 3 - ldr r0, _0808A688 + ldr r0, =0x03005e08 adds r2, r0 ldrh r1, [r2] lsls r1, 16 @@ -280607,7 +270543,7 @@ _0808A682: pop {r0} bx r0 .align 2, 0 -_0808A688: .4byte 0x03005e08 + .pool thumb_func_end task50_overworld_door thumb_func_start door_frame_last @@ -280660,7 +270596,7 @@ task_overworld_door_add_if_inactive: @ 808A6C4 adds r5, r1, 0 adds r7, r2, 0 mov r8, r3 - ldr r4, _0808A710 + ldr r4, =task50_overworld_door + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -280675,7 +270611,7 @@ task_overworld_door_add_if_inactive: @ 808A6C4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _0808A714 + ldr r2, =0x03005e08 adds r1, r2 strh r7, [r1, 0xC] mov r2, r8 @@ -280690,8 +270626,7 @@ task_overworld_door_add_if_inactive: @ 808A6C4 asrs r0, 24 b _0808A71C .align 2, 0 -_0808A710: .4byte task50_overworld_door + 1 -_0808A714: .4byte 0x03005e08 + .pool _0808A718: movs r0, 0x1 negs r0, r0 @@ -280728,7 +270663,7 @@ sub_808A734: @ 808A734 adds r4, r0, 0 cmp r4, 0 beq _0808A76A - ldr r1, _0808A770 + ldr r1, =0x08496f8c adds r0, r1, 0 bl door_frame_last adds r1, r0, 0 @@ -280741,7 +270676,7 @@ _0808A76A: pop {r0} bx r0 .align 2, 0 -_0808A770: .4byte 0x08496f8c + .pool thumb_func_end sub_808A734 thumb_func_start task_overworld_door_add_for_opening_door_at @@ -280769,13 +270704,13 @@ _0808A79E: ldrb r0, [r2, 0x3] cmp r0, 0x2 beq _0808A7B0 - ldr r1, _0808A7AC + ldr r1, =0x08496f8c adds r0, r2, 0 b _0808A7B4 .align 2, 0 -_0808A7AC: .4byte 0x08496f8c + .pool _0808A7B0: - ldr r1, _0808A7C8 + ldr r1, =0x08496fb4 adds r0, r4, 0 _0808A7B4: adds r2, r5, 0 @@ -280788,7 +270723,7 @@ _0808A7C0: pop {r1} bx r1 .align 2, 0 -_0808A7C8: .4byte 0x08496fb4 + .pool thumb_func_end task_overworld_door_add_for_opening_door_at thumb_func_start sub_808A7CC @@ -280807,7 +270742,7 @@ sub_808A7CC: @ 808A7CC bl door_find cmp r0, 0 beq _0808A800 - ldr r1, _0808A7FC + ldr r1, =0x08496fa0 adds r2, r5, 0 adds r3, r6, 0 bl task_overworld_door_add_if_inactive @@ -280815,7 +270750,7 @@ sub_808A7CC: @ 808A7CC asrs r0, 24 b _0808A804 .align 2, 0 -_0808A7FC: .4byte 0x08496fa0 + .pool _0808A800: movs r0, 0x1 negs r0, r0 @@ -280857,13 +270792,13 @@ sub_808A83C: @ 808A83C push {lr} adds r3, r0, 0 adds r2, r1, 0 - ldr r0, _0808A850 + ldr r0, =0x08497174 adds r1, r3, 0 bl task_overworld_door_add_for_opening_door_at pop {r0} bx r0 .align 2, 0 -_0808A850: .4byte 0x08497174 + .pool thumb_func_end sub_808A83C thumb_func_start sub_808A854 @@ -280878,7 +270813,7 @@ sub_808A854: @ 808A854 lsls r0, 24 cmp r0, 0 beq _0808A876 - ldr r0, _0808A87C + ldr r0, =0x08497174 adds r1, r4, 0 adds r2, r5, 0 bl sub_808A734 @@ -280887,7 +270822,7 @@ _0808A876: pop {r0} bx r0 .align 2, 0 -_0808A87C: .4byte 0x08497174 + .pool thumb_func_end sub_808A854 thumb_func_start sub_808A880 @@ -280902,7 +270837,7 @@ sub_808A880: @ 808A880 lsls r0, 24 cmp r0, 0 beq _0808A8A2 - ldr r0, _0808A8A8 + ldr r0, =0x08497174 adds r1, r4, 0 adds r2, r5, 0 bl sub_808A728 @@ -280911,7 +270846,7 @@ _0808A8A2: pop {r0} bx r0 .align 2, 0 -_0808A8A8: .4byte 0x08497174 + .pool thumb_func_end sub_808A880 thumb_func_start sub_808A8AC @@ -280926,7 +270861,7 @@ sub_808A8AC: @ 808A8AC lsls r0, 24 cmp r0, 0 beq _0808A8D8 - ldr r0, _0808A8D4 + ldr r0, =0x08497174 adds r1, r4, 0 adds r2, r5, 0 bl sub_808A7CC @@ -280934,7 +270869,7 @@ sub_808A8AC: @ 808A8AC asrs r0, 24 b _0808A8DC .align 2, 0 -_0808A8D4: .4byte 0x08497174 + .pool _0808A8D8: movs r0, 0x1 negs r0, r0 @@ -280956,7 +270891,7 @@ task_overworld_door_add_if_role_69_for_opening_door_at: @ 808A8E4 lsls r0, 24 cmp r0, 0 beq _0808A910 - ldr r0, _0808A90C + ldr r0, =0x08497174 adds r1, r4, 0 adds r2, r5, 0 bl task_overworld_door_add_for_opening_door_at @@ -280964,7 +270899,7 @@ task_overworld_door_add_if_role_69_for_opening_door_at: @ 808A8E4 asrs r0, 24 b _0808A914 .align 2, 0 -_0808A90C: .4byte 0x08497174 + .pool _0808A910: movs r0, 0x1 negs r0, r0 @@ -280977,14 +270912,14 @@ _0808A914: thumb_func_start sub_808A91C sub_808A91C: @ 808A91C push {lr} - ldr r0, _0808A92C + ldr r0, =task50_overworld_door + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_0808A92C: .4byte task50_overworld_door + 1 + .pool thumb_func_end sub_808A91C thumb_func_start cur_mapdata_get_door_sound_at @@ -280992,7 +270927,7 @@ cur_mapdata_get_door_sound_at: @ 808A930 push {lr} adds r3, r0, 0 adds r2, r1, 0 - ldr r0, _0808A950 + ldr r0, =0x08497174 adds r1, r3, 0 bl cur_mapdata_get_door_x2_at lsls r0, 24 @@ -281004,7 +270939,7 @@ cur_mapdata_get_door_sound_at: @ 808A930 movs r0, 0x12 b _0808A95E .align 2, 0 -_0808A950: .4byte 0x08497174 + .pool _0808A954: cmp r0, 0x2 beq _0808A95C @@ -281021,23 +270956,21 @@ _0808A95E: thumb_func_start sub_808A964 sub_808A964: @ 808A964 push {lr} - ldr r0, _0808A984 + ldr r0, =0x00004002 bl flag_check lsls r0, 24 cmp r0, 0 beq _0808A990 - ldr r0, _0808A988 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _0808A98C + ldr r0, =0x0000101a cmp r1, r0 bne _0808A990 movs r0, 0x1 b _0808A992 .align 2, 0 -_0808A984: .4byte 0x00004002 -_0808A988: .4byte 0x03005d8c -_0808A98C: .4byte 0x0000101a + .pool _0808A990: movs r0, 0 _0808A992: @@ -281054,15 +270987,14 @@ sub_808A998: @ 808A998 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0808A9B4 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _0808A9B8 + ldr r2, =sub_808A9BC + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0808A9B4: .4byte 0x02037350 -_0808A9B8: .4byte sub_808A9BC + 1 + .pool thumb_func_end sub_808A998 thumb_func_start sub_808A9BC @@ -281083,12 +271015,12 @@ player_step: @ 808A9C0 lsrs r7, r1, 16 lsls r2, 16 lsrs r6, r2, 16 - ldr r4, _0808AA30 + ldr r4, =0x02037590 ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808AA34 + ldr r1, =0x02037350 adds r5, r0, r1 adds r0, r5, 0 bl sub_808C280 @@ -281123,8 +271055,7 @@ _0808AA26: pop {r0} bx r0 .align 2, 0 -_0808AA30: .4byte 0x02037590 -_0808AA34: .4byte 0x02037350 + .pool thumb_func_end player_step thumb_func_start sub_808AA38 @@ -281193,14 +271124,14 @@ npc_clear_strange_bits: @ 808AA9C adds r2, 0x2 ands r1, r2 strb r1, [r0, 0x1] - ldr r2, _0808AABC + ldr r2, =0x02037590 ldrb r1, [r2] movs r0, 0x7F ands r0, r1 strb r0, [r2] bx lr .align 2, 0 -_0808AABC: .4byte 0x02037590 + .pool thumb_func_end npc_clear_strange_bits thumb_func_start player_step_by_keypad @@ -281212,7 +271143,7 @@ player_step_by_keypad: @ 808AAC0 lsrs r4, r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _0808AAE4 + ldr r0, =0x02037590 ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -281223,7 +271154,7 @@ player_step_by_keypad: @ 808AAC0 bl dp04_initiate_movement b _0808AAF0 .align 2, 0 -_0808AAE4: .4byte 0x02037590 + .pool _0808AAE8: adds r0, r3, 0 adds r1, r2, 0 @@ -281237,7 +271168,7 @@ _0808AAF0: thumb_func_start walkrun_clear_x20_when_running_fast walkrun_clear_x20_when_running_fast: @ 808AAF8 push {lr} - ldr r2, _0808AB10 + ldr r2, =0x02037590 ldrb r0, [r2, 0x2] cmp r0, 0x2 bne _0808AB0A @@ -281249,13 +271180,13 @@ _0808AB0A: pop {r0} bx r0 .align 2, 0 -_0808AB10: .4byte 0x02037590 + .pool thumb_func_end walkrun_clear_x20_when_running_fast thumb_func_start sub_808AB14 sub_808AB14: @ 808AB14 push {r4,lr} - ldr r4, _0808AB34 + ldr r4, =0x08497444 bl sub_808AB38 lsls r0, 24 lsrs r0, 22 @@ -281268,19 +271199,19 @@ sub_808AB14: @ 808AB14 pop {r1} bx r1 .align 2, 0 -_0808AB34: .4byte 0x08497444 + .pool thumb_func_end sub_808AB14 thumb_func_start sub_808AB38 sub_808AB38: @ 808AB38 push {r4-r6,lr} - ldr r3, _0808AB74 + ldr r3, =0x02037590 ldrb r1, [r3] movs r0, 0x20 ands r0, r1 cmp r0, 0 bne _0808AB8A - ldr r2, _0808AB78 + ldr r2, =0x02037350 ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -281288,7 +271219,7 @@ sub_808AB38: @ 808AB38 adds r0, r2 ldrb r5, [r0, 0x1E] movs r4, 0 - ldr r6, _0808AB7C + ldr r6, =0x084973fc _0808AB58: lsls r0, r4, 2 adds r0, r6 @@ -281303,9 +271234,7 @@ _0808AB58: lsrs r0, 24 b _0808AB8C .align 2, 0 -_0808AB74: .4byte 0x02037590 -_0808AB78: .4byte 0x02037350 -_0808AB7C: .4byte 0x084973fc + .pool _0808AB80: adds r0, r4, 0x1 lsls r0, 24 @@ -281323,7 +271252,7 @@ _0808AB8C: thumb_func_start sub_808AB94 sub_808AB94: @ 808AB94 push {r4,lr} - ldr r4, _0808ABD8 + ldr r4, =0x02037590 ldrb r1, [r4] movs r0, 0x40 ands r0, r1 @@ -281333,7 +271262,7 @@ sub_808AB94: @ 808AB94 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808ABDC + ldr r1, =0x02037350 adds r0, r1 ldrb r2, [r0, 0x1] movs r1, 0x3 @@ -281356,8 +271285,7 @@ _0808ABCE: pop {r1} bx r1 .align 2, 0 -_0808ABD8: .4byte 0x02037590 -_0808ABDC: .4byte 0x02037350 + .pool thumb_func_end sub_808AB94 thumb_func_start sub_808ABE0 @@ -281370,7 +271298,7 @@ sub_808ABE0: @ 808ABE0 mov r9, r1 lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0808AC20 + ldr r6, =0x02037590 adds r0, r5, 0 bl sub_808AFBC lsls r0, 24 @@ -281392,7 +271320,7 @@ sub_808ABE0: @ 808ABE0 movs r0, 0 b _0808AC48 .align 2, 0 -_0808AC20: .4byte 0x02037590 + .pool _0808AC24: cmp r7, 0x6 bne _0808AC2E @@ -281427,12 +271355,12 @@ _0808AC48: sub_808AC58: @ 808AC58 push {lr} adds r1, r0, 0 - ldr r0, _0808AC84 + ldr r0, =0x02037590 ldrb r2, [r0, 0x5] lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0808AC88 + ldr r2, =0x02037350 adds r0, r2 ldrb r2, [r0, 0x1] movs r3, 0x4 @@ -281446,27 +271374,26 @@ sub_808AC58: @ 808AC58 pop {r1} bx r1 .align 2, 0 -_0808AC84: .4byte 0x02037590 -_0808AC88: .4byte 0x02037350 + .pool thumb_func_end sub_808AC58 thumb_func_start sub_808AC8C sub_808AC8C: @ 808AC8C push {lr} - ldr r0, _0808AC9C + ldr r0, =sub_808B738 + 1 bl sub_808AC58 lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_0808AC9C: .4byte sub_808B738 + 1 + .pool thumb_func_end sub_808AC8C thumb_func_start sub_808ACA0 sub_808ACA0: @ 808ACA0 push {lr} - ldr r1, _0808ACB4 + ldr r1, =sub_808B720 + 1 movs r0, 0x1 bl sub_808ABE0 lsls r0, 24 @@ -281474,13 +271401,13 @@ sub_808ACA0: @ 808ACA0 pop {r1} bx r1 .align 2, 0 -_0808ACB4: .4byte sub_808B720 + 1 + .pool thumb_func_end sub_808ACA0 thumb_func_start sub_808ACB8 sub_808ACB8: @ 808ACB8 push {lr} - ldr r1, _0808ACCC + ldr r1, =sub_808B720 + 1 movs r0, 0x2 bl sub_808ABE0 lsls r0, 24 @@ -281488,13 +271415,13 @@ sub_808ACB8: @ 808ACB8 pop {r1} bx r1 .align 2, 0 -_0808ACCC: .4byte sub_808B720 + 1 + .pool thumb_func_end sub_808ACB8 thumb_func_start sub_808ACD0 sub_808ACD0: @ 808ACD0 push {lr} - ldr r1, _0808ACE4 + ldr r1, =sub_808B720 + 1 movs r0, 0x3 bl sub_808ABE0 lsls r0, 24 @@ -281502,13 +271429,13 @@ sub_808ACD0: @ 808ACD0 pop {r1} bx r1 .align 2, 0 -_0808ACE4: .4byte sub_808B720 + 1 + .pool thumb_func_end sub_808ACD0 thumb_func_start sub_808ACE8 sub_808ACE8: @ 808ACE8 push {lr} - ldr r1, _0808ACFC + ldr r1, =sub_808B720 + 1 movs r0, 0x4 bl sub_808ABE0 lsls r0, 24 @@ -281516,13 +271443,13 @@ sub_808ACE8: @ 808ACE8 pop {r1} bx r1 .align 2, 0 -_0808ACFC: .4byte sub_808B720 + 1 + .pool thumb_func_end sub_808ACE8 thumb_func_start sub_808AD00 sub_808AD00: @ 808AD00 push {lr} - ldr r1, _0808AD14 + ldr r1, =sub_808B750 + 1 movs r0, 0x1 bl sub_808ABE0 lsls r0, 24 @@ -281530,13 +271457,13 @@ sub_808AD00: @ 808AD00 pop {r1} bx r1 .align 2, 0 -_0808AD14: .4byte sub_808B750 + 1 + .pool thumb_func_end sub_808AD00 thumb_func_start sub_808AD18 sub_808AD18: @ 808AD18 push {lr} - ldr r1, _0808AD2C + ldr r1, =sub_808B750 + 1 movs r0, 0x2 bl sub_808ABE0 lsls r0, 24 @@ -281544,13 +271471,13 @@ sub_808AD18: @ 808AD18 pop {r1} bx r1 .align 2, 0 -_0808AD2C: .4byte sub_808B750 + 1 + .pool thumb_func_end sub_808AD18 thumb_func_start sub_808AD30 sub_808AD30: @ 808AD30 push {lr} - ldr r1, _0808AD44 + ldr r1, =sub_808B750 + 1 movs r0, 0x3 bl sub_808ABE0 lsls r0, 24 @@ -281558,13 +271485,13 @@ sub_808AD30: @ 808AD30 pop {r1} bx r1 .align 2, 0 -_0808AD44: .4byte sub_808B750 + 1 + .pool thumb_func_end sub_808AD30 thumb_func_start sub_808AD48 sub_808AD48: @ 808AD48 push {lr} - ldr r1, _0808AD5C + ldr r1, =sub_808B750 + 1 movs r0, 0x4 bl sub_808ABE0 lsls r0, 24 @@ -281572,7 +271499,7 @@ sub_808AD48: @ 808AD48 pop {r1} bx r1 .align 2, 0 -_0808AD5C: .4byte sub_808B750 + 1 + .pool thumb_func_end sub_808AD48 thumb_func_start sub_808AD60 @@ -281580,12 +271507,12 @@ sub_808AD60: @ 808AD60 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0808AD90 + ldr r2, =0x02037590 ldrb r3, [r2, 0x5] lsls r2, r3, 3 adds r2, r3 lsls r2, 2 - ldr r3, _0808AD94 + ldr r3, =0x02037350 adds r2, r3 ldrb r3, [r2, 0x1] movs r4, 0x4 @@ -281600,14 +271527,13 @@ sub_808AD60: @ 808AD60 pop {r1} bx r1 .align 2, 0 -_0808AD90: .4byte 0x02037590 -_0808AD94: .4byte 0x02037350 + .pool thumb_func_end sub_808AD60 thumb_func_start sub_808AD98 sub_808AD98: @ 808AD98 push {lr} - ldr r1, _0808ADAC + ldr r1, =sub_808B738 + 1 movs r0, 0x1 bl sub_808AD60 lsls r0, 24 @@ -281615,13 +271541,13 @@ sub_808AD98: @ 808AD98 pop {r1} bx r1 .align 2, 0 -_0808ADAC: .4byte sub_808B738 + 1 + .pool thumb_func_end sub_808AD98 thumb_func_start sub_808ADB0 sub_808ADB0: @ 808ADB0 push {lr} - ldr r1, _0808ADC4 + ldr r1, =sub_808B738 + 1 movs r0, 0x2 bl sub_808AD60 lsls r0, 24 @@ -281629,13 +271555,13 @@ sub_808ADB0: @ 808ADB0 pop {r1} bx r1 .align 2, 0 -_0808ADC4: .4byte sub_808B738 + 1 + .pool thumb_func_end sub_808ADB0 thumb_func_start sub_808ADC8 sub_808ADC8: @ 808ADC8 push {lr} - ldr r1, _0808ADDC + ldr r1, =sub_808B738 + 1 movs r0, 0x3 bl sub_808AD60 lsls r0, 24 @@ -281643,13 +271569,13 @@ sub_808ADC8: @ 808ADC8 pop {r1} bx r1 .align 2, 0 -_0808ADDC: .4byte sub_808B738 + 1 + .pool thumb_func_end sub_808ADC8 thumb_func_start sub_808ADE0 sub_808ADE0: @ 808ADE0 push {lr} - ldr r1, _0808ADF4 + ldr r1, =sub_808B738 + 1 movs r0, 0x4 bl sub_808AD60 lsls r0, 24 @@ -281657,7 +271583,7 @@ sub_808ADE0: @ 808ADE0 pop {r1} bx r1 .align 2, 0 -_0808ADF4: .4byte sub_808B738 + 1 + .pool thumb_func_end sub_808ADE0 thumb_func_start sub_808ADF8 @@ -281681,12 +271607,12 @@ sub_808AE04: @ 808AE04 thumb_func_start sub_808AE10 sub_808AE10: @ 808AE10 push {r4,lr} - ldr r0, _0808AE54 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808AE58 + ldr r1, =0x02037350 adds r4, r0, r1 ldrb r1, [r4, 0x18] movs r0, 0xF0 @@ -281705,16 +271631,14 @@ _0808AE36: movs r1, 0x2 orrs r0, r1 strb r0, [r4, 0x1] - ldr r1, _0808AE5C + ldr r1, =sub_808B738 + 1 movs r0, 0x1 bl sub_808ABE0 lsls r0, 24 lsrs r0, 24 b _0808AE62 .align 2, 0 -_0808AE54: .4byte 0x02037590 -_0808AE58: .4byte 0x02037350 -_0808AE5C: .4byte sub_808B738 + 1 + .pool _0808AE60: movs r0, 0 _0808AE62: @@ -281732,7 +271656,7 @@ dp04_continue_movement: @ 808AE68 lsrs r4, 24 lsls r5, 16 lsrs r5, 16 - ldr r6, _0808AE94 + ldr r6, =0x08497490 adds r0, r4, 0 bl walkrun_accelerate lsls r0, 24 @@ -281746,7 +271670,7 @@ dp04_continue_movement: @ 808AE68 pop {r0} bx r0 .align 2, 0 -_0808AE94: .4byte 0x08497490 + .pool thumb_func_end dp04_continue_movement thumb_func_start walkrun_accelerate @@ -281756,28 +271680,28 @@ walkrun_accelerate: @ 808AE98 lsrs r4, r0, 24 cmp r4, 0 bne _0808AEB0 - ldr r0, _0808AEAC + ldr r0, =0x02037590 strb r4, [r0, 0x2] movs r0, 0 b _0808AED2 .align 2, 0 -_0808AEAC: .4byte 0x02037590 + .pool _0808AEB0: bl player_get_direction_upper_4bits lsls r0, 24 lsrs r0, 24 cmp r4, r0 beq _0808AECC - ldr r1, _0808AEC8 + ldr r1, =0x02037590 ldrb r0, [r1, 0x2] cmp r0, 0x2 beq _0808AECC movs r0, 0x1 b _0808AED0 .align 2, 0 -_0808AEC8: .4byte 0x02037590 + .pool _0808AECC: - ldr r1, _0808AED8 + ldr r1, =0x02037590 movs r0, 0x2 _0808AED0: strb r0, [r1, 0x2] @@ -281786,7 +271710,7 @@ _0808AED2: pop {r1} bx r1 .align 2, 0 -_0808AED8: .4byte 0x02037590 + .pool thumb_func_end walkrun_accelerate thumb_func_start dp04_look1 @@ -281849,7 +271773,7 @@ _0808AF3C: bl npc_use_some_d2s_and_conditional_sound b _0808AFB6 _0808AF4E: - ldr r4, _0808AF64 + ldr r4, =0x02037590 ldrb r1, [r4] movs r0, 0x8 ands r0, r1 @@ -281859,7 +271783,7 @@ _0808AF4E: bl sub_808B738 b _0808AFB6 .align 2, 0 -_0808AF64: .4byte 0x02037590 + .pool _0808AF68: movs r0, 0x10 ands r0, r1 @@ -281875,7 +271799,7 @@ _0808AF68: lsls r0, 24 cmp r0, 0 beq _0808AFB0 - ldr r2, _0808AFAC + ldr r2, =0x02037350 ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -281893,7 +271817,7 @@ _0808AF68: strb r0, [r4] b _0808AFB6 .align 2, 0 -_0808AFAC: .4byte 0x02037350 + .pool _0808AFB0: adds r0, r5, 0 bl sub_808B720 @@ -281910,12 +271834,12 @@ sub_808AFBC: @ 808AFBC adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _0808B020 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808B024 + ldr r0, =0x02037350 adds r4, r0 ldrh r1, [r4, 0x10] add r0, sp, 0x4 @@ -281952,8 +271876,7 @@ sub_808AFBC: @ 808AFBC pop {r1} bx r1 .align 2, 0 -_0808B020: .4byte 0x02037590 -_0808B024: .4byte 0x02037350 + .pool thumb_func_end sub_808AFBC thumb_func_start sub_808B028 @@ -281963,12 +271886,12 @@ sub_808B028: @ 808B028 adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _0808B08C + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808B090 + ldr r0, =0x02037350 adds r4, r0 ldrh r1, [r4, 0x10] add r0, sp, 0x4 @@ -282005,8 +271928,7 @@ sub_808B028: @ 808B028 pop {r1} bx r1 .align 2, 0 -_0808B08C: .4byte 0x02037590 -_0808B090: .4byte 0x02037350 + .pool thumb_func_end sub_808B028 thumb_func_start sub_808B094 @@ -282171,7 +272093,7 @@ sub_808B1BC: @ 808B1BC lsrs r4, r1, 16 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, _0808B208 + ldr r0, =0x02037590 ldrb r1, [r0] movs r0, 0x8 ands r0, r1 @@ -282199,7 +272121,7 @@ sub_808B1BC: @ 808B1BC movs r0, 0x1 b _0808B20E .align 2, 0 -_0808B208: .4byte 0x02037590 + .pool _0808B20C: movs r0, 0 _0808B20E: @@ -282241,7 +272163,7 @@ sub_808B238: @ 808B238 strh r1, [r5] lsls r2, 24 lsrs r7, r2, 24 - ldr r0, _0808B2D0 + ldr r0, =0x00000889 bl flag_check lsls r0, 24 cmp r0, 0 @@ -282256,7 +272178,7 @@ sub_808B238: @ 808B238 lsrs r6, r0, 24 cmp r6, 0x10 beq _0808B2D8 - ldr r0, _0808B2D4 + ldr r0, =0x02037350 lsls r1, r6, 3 adds r1, r6 lsls r1, 2 @@ -282302,8 +272224,7 @@ sub_808B238: @ 808B238 movs r0, 0x1 b _0808B2DA .align 2, 0 -_0808B2D0: .4byte 0x00000889 -_0808B2D4: .4byte 0x02037350 + .pool _0808B2D8: movs r0, 0 _0808B2DA: @@ -282320,7 +272241,7 @@ sub_808B2E4: @ 808B2E4 lsls r2, 24 lsrs r5, r2, 24 movs r4, 0 - ldr r7, _0808B30C + ldr r7, =0x0849749c _0808B2F0: lsls r0, r4, 2 adds r0, r7 @@ -282330,14 +272251,13 @@ _0808B2F0: lsls r0, 24 cmp r0, 0 beq _0808B314 - ldr r0, _0808B310 + ldr r0, =0x084974b0 adds r0, r4, r0 ldrb r0, [r0] strb r0, [r6] b _0808B31E .align 2, 0 -_0808B30C: .4byte 0x0849749c -_0808B310: .4byte 0x084974b0 + .pool _0808B314: adds r0, r4, 0x1 lsls r0, 24 @@ -282356,12 +272276,12 @@ sub_808B324: @ 808B324 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r1, _0808B3B8 + ldr r1, =0x02037590 ldrb r2, [r1, 0x5] lsls r1, r2, 3 adds r1, r2 lsls r1, 2 - ldr r5, _0808B3BC + ldr r5, =0x02037350 adds r3, r1, r5 ldrh r2, [r3, 0x10] mov r1, sp @@ -282425,8 +272345,7 @@ _0808B398: movs r0, 0x1 b _0808B3C2 .align 2, 0 -_0808B3B8: .4byte 0x02037590 -_0808B3BC: .4byte 0x02037350 + .pool _0808B3C0: movs r0, 0 _0808B3C2: @@ -282441,7 +272360,7 @@ walkrun_set_bike_bits: @ 808B3CC push {lr} lsls r0, 16 lsrs r0, 16 - ldr r2, _0808B3E4 + ldr r2, =0x02037590 ldrb r1, [r2, 0x1] orrs r0, r1 strb r0, [r2, 0x1] @@ -282449,13 +272368,13 @@ walkrun_set_bike_bits: @ 808B3CC pop {r0} bx r0 .align 2, 0 -_0808B3E4: .4byte 0x02037590 + .pool thumb_func_end walkrun_set_bike_bits thumb_func_start bike_related bike_related: @ 808B3E8 push {r4,r5,lr} - ldr r0, _0808B430 + ldr r0, =0x02037590 ldrb r4, [r0, 0x1] cmp r4, 0 beq _0808B428 @@ -282465,15 +272384,15 @@ _0808B3F4: ands r0, r4 cmp r0, 0 beq _0808B416 - ldr r0, _0808B434 + ldr r0, =0x084974b8 lsls r2, r5, 2 adds r2, r0 - ldr r0, _0808B430 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808B438 + ldr r1, =0x02037350 adds r0, r1 ldr r1, [r2] bl _call_via_r1 @@ -282484,7 +272403,7 @@ _0808B416: lsrs r4, 1 cmp r5, 0x7 bls _0808B3F4 - ldr r1, _0808B430 + ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x1] _0808B428: @@ -282492,9 +272411,7 @@ _0808B428: pop {r0} bx r0 .align 2, 0 -_0808B430: .4byte 0x02037590 -_0808B434: .4byte 0x084974b8 -_0808B438: .4byte 0x02037350 + .pool thumb_func_end bike_related thumb_func_start nullsub_32 @@ -282592,14 +272509,14 @@ sub_808B4D8: @ 808B4D8 bl npc_turn movs r0, 0x8 bl sub_808BF14 - ldr r1, _0808B52C + ldr r1, =0x02038c08 movs r2, 0x10 ldrsh r0, [r4, r2] str r0, [r1] movs r2, 0x12 ldrsh r0, [r4, r2] str r0, [r1, 0x4] - ldr r0, _0808B530 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] str r0, [r1, 0x8] movs r0, 0x8 @@ -282613,8 +272530,7 @@ sub_808B4D8: @ 808B4D8 pop {r0} bx r0 .align 2, 0 -_0808B52C: .4byte 0x02038c08 -_0808B530: .4byte 0x02037590 + .pool thumb_func_end sub_808B4D8 thumb_func_start sub_808B534 @@ -282644,20 +272560,20 @@ sub_808B534: @ 808B534 thumb_func_start sub_808B568 sub_808B568: @ 808B568 - ldr r2, _0808B574 + ldr r2, =0x02037590 ldrb r1, [r2] movs r0, 0x20 orrs r0, r1 strb r0, [r2] bx lr .align 2, 0 -_0808B574: .4byte 0x02037590 + .pool thumb_func_end sub_808B568 thumb_func_start sub_808B578 sub_808B578: @ 808B578 push {r4,lr} - ldr r4, _0808B5A4 + ldr r4, =0x02037590 movs r0, 0 strb r0, [r4, 0x3] bl player_bits_x42 @@ -282675,7 +272591,7 @@ sub_808B578: @ 808B578 movs r0, 0x1 b _0808B5B4 .align 2, 0 -_0808B5A4: .4byte 0x02037590 + .pool _0808B5A8: bl sub_808B618 lsls r0, 24 @@ -282693,8 +272609,8 @@ _0808B5B6: thumb_func_start sub_808B5BC sub_808B5BC: @ 808B5BC push {lr} - ldr r2, _0808B608 - ldr r0, _0808B60C + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -282731,8 +272647,7 @@ _0808B602: movs r0, 0x1 b _0808B612 .align 2, 0 -_0808B608: .4byte 0x02037350 -_0808B60C: .4byte 0x02037590 + .pool _0808B610: movs r0, 0 _0808B612: @@ -282747,14 +272662,14 @@ sub_808B618: @ 808B618 lsls r0, 24 cmp r0, 0 beq _0808B634 - ldr r0, _0808B630 + ldr r0, =0x02037590 ldrb r0, [r0, 0x2] cmp r0, 0x1 beq _0808B634 movs r0, 0x1 b _0808B636 .align 2, 0 -_0808B630: .4byte 0x02037590 + .pool _0808B634: movs r0, 0 _0808B636: @@ -282765,12 +272680,12 @@ _0808B636: thumb_func_start player_bits_x42 player_bits_x42: @ 808B63C push {lr} - ldr r0, _0808B658 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808B65C + ldr r1, =0x02037350 adds r0, r1 bl npc_is_visible_or_is_x40 lsls r0, 24 @@ -282778,19 +272693,18 @@ player_bits_x42: @ 808B63C pop {r1} bx r1 .align 2, 0 -_0808B658: .4byte 0x02037590 -_0808B65C: .4byte 0x02037350 + .pool thumb_func_end player_bits_x42 thumb_func_start sub_808B660 sub_808B660: @ 808B660 push {lr} - ldr r0, _0808B67C + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808B680 + ldr r1, =0x02037350 adds r0, r1 bl npc_get_bit7_or_const_x10_when_inactive lsls r0, 24 @@ -282798,14 +272712,13 @@ sub_808B660: @ 808B660 pop {r1} bx r1 .align 2, 0 -_0808B67C: .4byte 0x02037590 -_0808B680: .4byte 0x02037350 + .pool thumb_func_end sub_808B660 thumb_func_start player_set_x22 player_set_x22: @ 808B684 - ldr r3, _0808B698 - ldr r1, _0808B69C + ldr r3, =0x02037350 + ldr r1, =0x02037590 ldrb r2, [r1, 0x5] lsls r1, r2, 3 adds r1, r2 @@ -282815,14 +272728,13 @@ player_set_x22: @ 808B684 strb r0, [r1] bx lr .align 2, 0 -_0808B698: .4byte 0x02037350 -_0808B69C: .4byte 0x02037590 + .pool thumb_func_end player_set_x22 thumb_func_start player_get_x22 player_get_x22: @ 808B6A0 - ldr r2, _0808B6B4 - ldr r0, _0808B6B8 + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -282832,8 +272744,7 @@ player_get_x22: @ 808B6A0 ldrb r0, [r0] bx lr .align 2, 0 -_0808B6B4: .4byte 0x02037350 -_0808B6B8: .4byte 0x02037590 + .pool thumb_func_end player_get_x22 thumb_func_start sub_808B6BC @@ -282842,19 +272753,18 @@ sub_808B6BC: @ 808B6BC adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _0808B6DC + ldr r0, =0x02037590 ldrb r2, [r0, 0x5] lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0808B6E0 + ldr r2, =0x02037350 adds r0, r2 bl sub_8093208 pop {r0} bx r0 .align 2, 0 -_0808B6DC: .4byte 0x02037590 -_0808B6E0: .4byte 0x02037350 + .pool thumb_func_end sub_808B6BC thumb_func_start player_npc_set_state_and_x22_etc @@ -282870,12 +272780,12 @@ player_npc_set_state_and_x22_etc: @ 808B6E4 bne _0808B712 adds r0, r4, 0 bl player_set_x22 - ldr r0, _0808B718 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808B71C + ldr r1, =0x02037350 adds r0, r1 adds r1, r5, 0 bl npc_set_state_2 @@ -282884,8 +272794,7 @@ _0808B712: pop {r0} bx r0 .align 2, 0 -_0808B718: .4byte 0x02037590 -_0808B71C: .4byte 0x02037350 + .pool thumb_func_end player_npc_set_state_and_x22_etc thumb_func_start sub_808B720 @@ -283074,7 +272983,7 @@ npc_use_some_d2s_and_sound: @ 808B840 thumb_func_start sub_808B864 sub_808B864: @ 808B864 push {r4,lr} - ldr r4, _0808B8A0 + ldr r4, =0x02037590 ldrb r0, [r4, 0x3] cmp r0, 0x2 beq _0808B872 @@ -283085,7 +272994,7 @@ _0808B872: lsls r0, 24 cmp r0, 0 beq _0808B89A - ldr r2, _0808B8A4 + ldr r2, =0x02037350 ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -283103,8 +273012,7 @@ _0808B89A: pop {r0} bx r0 .align 2, 0 -_0808B8A0: .4byte 0x02037590 -_0808B8A4: .4byte 0x02037350 + .pool thumb_func_end sub_808B864 thumb_func_start sub_808B8A8 @@ -283292,15 +273200,15 @@ tile_conditional_sound: @ 808B9EC sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _0808BA5C - ldr r0, _0808BA60 + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 adds r0, r2 ldrb r0, [r0, 0x1E] - ldr r2, _0808BA64 + ldr r2, =0x084974d8 subs r1, r4, 0x1 lsls r1, 2 adds r1, r2 @@ -283341,9 +273249,7 @@ _0808BA54: pop {r0} bx r0 .align 2, 0 -_0808BA5C: .4byte 0x02037350 -_0808BA60: .4byte 0x02037590 -_0808BA64: .4byte 0x084974d8 + .pool thumb_func_end tile_conditional_sound thumb_func_start player_get_pos_to_plus_one_step_in_direction_player_is_facing @@ -283351,8 +273257,8 @@ player_get_pos_to_plus_one_step_in_direction_player_is_facing: @ 808BA68 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r3, _0808BAA4 - ldr r2, _0808BAA8 + ldr r3, =0x02037350 + ldr r2, =0x02037590 ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -283377,15 +273283,14 @@ player_get_pos_to_plus_one_step_in_direction_player_is_facing: @ 808BA68 pop {r0} bx r0 .align 2, 0 -_0808BAA4: .4byte 0x02037350 -_0808BAA8: .4byte 0x02037590 + .pool thumb_func_end player_get_pos_to_plus_one_step_in_direction_player_is_facing thumb_func_start player_get_pos_to player_get_pos_to: @ 808BAAC push {r4,r5,lr} - ldr r5, _0808BAD4 - ldr r4, _0808BAD8 + ldr r5, =0x02037350 + ldr r4, =0x02037590 ldrb r3, [r4, 0x5] lsls r2, r3, 3 adds r2, r3 @@ -283404,8 +273309,7 @@ player_get_pos_to: @ 808BAAC pop {r0} bx r0 .align 2, 0 -_0808BAD4: .4byte 0x02037350 -_0808BAD8: .4byte 0x02037590 + .pool thumb_func_end player_get_pos_to thumb_func_start plaer_get_pos_including_state_based_drift @@ -283413,12 +273317,12 @@ plaer_get_pos_including_state_based_drift: @ 808BADC push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _0808BB30 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808BB34 + ldr r1, =0x02037350 adds r3, r0, r1 ldrb r1, [r3] movs r0, 0xC0 @@ -283427,7 +273331,7 @@ plaer_get_pos_including_state_based_drift: @ 808BADC beq _0808BAFC b _0808BC24 _0808BAFC: - ldr r2, _0808BB38 + ldr r2, =0x02020630 ldrb r1, [r3, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -283450,15 +273354,12 @@ _0808BB12: b _0808BC24 _0808BB24: lsls r0, 2 - ldr r1, _0808BB3C + ldr r1, =_0808BB40 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0808BB30: .4byte 0x02037590 -_0808BB34: .4byte 0x02037350 -_0808BB38: .4byte 0x02020630 -_0808BB3C: .4byte _0808BB40 + .pool .align 2, 0 _0808BB40: .4byte _0808BC04 @@ -283547,8 +273448,8 @@ _0808BC30: thumb_func_start player_get_direction__sp1AA player_get_direction__sp1AA: @ 808BC38 - ldr r2, _0808BC50 - ldr r0, _0808BC54 + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -283559,14 +273460,13 @@ player_get_direction__sp1AA: @ 808BC38 lsrs r0, 28 bx lr .align 2, 0 -_0808BC50: .4byte 0x02037350 -_0808BC54: .4byte 0x02037590 + .pool thumb_func_end player_get_direction__sp1AA thumb_func_start player_get_direction_upper_4bits player_get_direction_upper_4bits: @ 808BC58 - ldr r2, _0808BC6C - ldr r0, _0808BC70 + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -283576,14 +273476,13 @@ player_get_direction_upper_4bits: @ 808BC58 lsrs r0, 4 bx lr .align 2, 0 -_0808BC6C: .4byte 0x02037350 -_0808BC70: .4byte 0x02037590 + .pool thumb_func_end player_get_direction_upper_4bits thumb_func_start player_get_height player_get_height: @ 808BC74 - ldr r2, _0808BC88 - ldr r0, _0808BC8C + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -283593,8 +273492,7 @@ player_get_height: @ 808BC74 lsrs r0, 4 bx lr .align 2, 0 -_0808BC88: .4byte 0x02037350 -_0808BC8C: .4byte 0x02037590 + .pool thumb_func_end player_get_height thumb_func_start sub_808BC90 @@ -283602,12 +273500,12 @@ sub_808BC90: @ 808BC90 push {lr} adds r3, r0, 0 adds r2, r1, 0 - ldr r0, _0808BCB8 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808BCBC + ldr r1, =0x02037350 adds r0, r1 lsls r3, 16 asrs r3, 16 @@ -283618,37 +273516,36 @@ sub_808BC90: @ 808BC90 pop {r0} bx r0 .align 2, 0 -_0808BCB8: .4byte 0x02037590 -_0808BCBC: .4byte 0x02037350 + .pool thumb_func_end sub_808BC90 thumb_func_start walkrun_bitfield_and_r0 walkrun_bitfield_and_r0: @ 808BCC0 - ldr r1, _0808BCCC + ldr r1, =0x02037590 ldrb r1, [r1] ands r1, r0 adds r0, r1, 0 bx lr .align 2, 0 -_0808BCCC: .4byte 0x02037590 + .pool thumb_func_end walkrun_bitfield_and_r0 thumb_func_start sub_808BCD0 sub_808BCD0: @ 808BCD0 - ldr r0, _0808BCD8 + ldr r0, =0x02037590 ldrb r0, [r0] bx lr .align 2, 0 -_0808BCD8: .4byte 0x02037590 + .pool thumb_func_end sub_808BCD0 thumb_func_start sub_808BCDC sub_808BCDC: @ 808BCDC - ldr r0, _0808BCE4 + ldr r0, =0x02037590 ldrb r0, [r0, 0x4] bx lr .align 2, 0 -_0808BCE4: .4byte 0x02037590 + .pool thumb_func_end sub_808BCDC thumb_func_start sub_808BCE8 @@ -283662,12 +273559,12 @@ sub_808BCE8: @ 808BCE8 thumb_func_start sub_808BCF4 sub_808BCF4: @ 808BCF4 push {r4,lr} - ldr r0, _0808BD34 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808BD38 + ldr r0, =0x02037350 adds r4, r0 adds r0, r4, 0 bl npc_clear_strange_bits @@ -283689,8 +273586,7 @@ _0808BD2C: pop {r0} bx r0 .align 2, 0 -_0808BD34: .4byte 0x02037590 -_0808BD38: .4byte 0x02037350 + .pool thumb_func_end sub_808BCF4 thumb_func_start sub_808BD3C @@ -283698,14 +273594,14 @@ sub_808BD3C: @ 808BD3C lsls r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _0808BD50 + ldr r2, =0x084974e8 lsrs r0, 23 adds r1, r0 adds r1, r2 ldrb r0, [r1] bx lr .align 2, 0 -_0808BD50: .4byte 0x084974e8 + .pool thumb_func_end sub_808BD3C thumb_func_start sub_808BD54 @@ -283713,38 +273609,38 @@ sub_808BD54: @ 808BD54 lsls r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _0808BD68 + ldr r2, =0x084974f8 lsrs r0, 23 adds r1, r0 adds r1, r2 ldrb r0, [r1] bx lr .align 2, 0 -_0808BD68: .4byte 0x084974f8 + .pool thumb_func_end sub_808BD54 thumb_func_start sub_808BD6C sub_808BD6C: @ 808BD6C lsls r0, 24 lsrs r0, 24 - ldr r1, _0808BD78 + ldr r1, =0x08497508 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_0808BD78: .4byte 0x08497508 + .pool thumb_func_end sub_808BD6C thumb_func_start sub_808BD7C sub_808BD7C: @ 808BD7C lsls r0, 24 lsrs r0, 24 - ldr r1, _0808BD88 + ldr r1, =0x0849750a adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_0808BD88: .4byte 0x0849750a + .pool thumb_func_end sub_808BD7C thumb_func_start sub_808BD8C @@ -283752,7 +273648,7 @@ sub_808BD8C: @ 808BD8C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0808BDA4 + ldr r1, =0x02037590 ldrb r1, [r1, 0x7] bl sub_808BD54 lsls r0, 24 @@ -283760,7 +273656,7 @@ sub_808BD8C: @ 808BD8C pop {r1} bx r1 .align 2, 0 -_0808BDA4: .4byte 0x02037590 + .pool thumb_func_end sub_808BD8C thumb_func_start sub_808BDA8 @@ -283852,7 +273748,7 @@ _0808BE2A: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0808BE4C + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -283866,7 +273762,7 @@ _0808BE46: pop {r1} bx r1 .align 2, 0 -_0808BE4C: .4byte 0x020244ec + .pool thumb_func_end party_has_pokemon_with_surf thumb_func_start sub_808BE50 @@ -283895,12 +273791,12 @@ _0808BE70: sub_808BE74: @ 808BE74 push {r4,r5,lr} sub sp, 0x4 - ldr r0, _0808BEEC + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808BEF0 + ldr r0, =0x02037350 adds r4, r0 ldrh r1, [r4, 0x10] mov r0, sp @@ -283949,8 +273845,7 @@ sub_808BE74: @ 808BE74 movs r0, 0x1 b _0808BEF6 .align 2, 0 -_0808BEEC: .4byte 0x02037590 -_0808BEF0: .4byte 0x02037350 + .pool _0808BEF4: movs r0, 0 _0808BEF6: @@ -283963,21 +273858,21 @@ _0808BEF6: thumb_func_start walkrun_state_clear walkrun_state_clear: @ 808BF00 push {lr} - ldr r0, _0808BF10 + ldr r0, =0x02037590 movs r1, 0 movs r2, 0x24 bl memset pop {r0} bx r0 .align 2, 0 -_0808BF10: .4byte 0x02037590 + .pool thumb_func_end walkrun_state_clear thumb_func_start sub_808BF14 sub_808BF14: @ 808BF14 lsls r0, 24 lsrs r0, 24 - ldr r3, _0808BF28 + ldr r3, =0x02037590 ldrb r2, [r3] movs r1, 0xE0 ands r1, r2 @@ -283985,7 +273880,7 @@ sub_808BF14: @ 808BF14 strb r0, [r3] bx lr .align 2, 0 -_0808BF28: .4byte 0x02037590 + .pool thumb_func_end sub_808BF14 thumb_func_start sub_808BF2C @@ -283996,7 +273891,7 @@ sub_808BF2C: @ 808BF2C lsls r1, 24 lsrs r1, 24 movs r2, 0 - ldr r3, _0808BF54 + ldr r3, =0x0849750c lsls r0, r1, 2 adds r0, r1 lsls r4, r0, 1 @@ -284012,7 +273907,7 @@ _0808BF42: ldrb r0, [r0] b _0808BF64 .align 2, 0 -_0808BF54: .4byte 0x0849750c + .pool _0808BF58: adds r0, r2, 0x1 lsls r0, 24 @@ -284029,10 +273924,10 @@ _0808BF64: thumb_func_start sub_808BF6C sub_808BF6C: @ 808BF6C push {r4-r6,lr} - ldr r0, _0808BF94 + ldr r0, =0x02037590 ldrb r5, [r0] movs r2, 0 - ldr r3, _0808BF98 + ldr r3, =0x0849750c ldrb r1, [r0, 0x7] lsls r0, r1, 2 adds r0, r1 @@ -284050,8 +273945,7 @@ _0808BF80: ldrb r0, [r0] b _0808BFA8 .align 2, 0 -_0808BF94: .4byte 0x02037590 -_0808BF98: .4byte 0x0849750c + .pool _0808BF9C: adds r0, r2, 0x1 lsls r0, 24 @@ -284073,7 +273967,7 @@ sub_808BFB0: @ 808BFB0 lsrs r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r5, _0808BFDC + ldr r5, =0x02037590 ldrb r1, [r5, 0x7] bl sub_808BF2C lsls r0, 24 @@ -284087,7 +273981,7 @@ sub_808BFB0: @ 808BFB0 pop {r0} bx r0 .align 2, 0 -_0808BFDC: .4byte 0x02037590 + .pool thumb_func_end sub_808BFB0 thumb_func_start player_avatar_init @@ -284153,7 +274047,7 @@ player_avatar_init: @ 808BFE0 lsls r4, r5, 3 adds r4, r5 lsls r4, 2 - ldr r0, _0808C0A0 + ldr r0, =0x02037350 adds r4, r0 ldrb r0, [r4, 0x2] movs r1, 0x1 @@ -284165,7 +274059,7 @@ player_avatar_init: @ 808BFE0 mov r1, r9 bl npc_turn bl walkrun_state_clear - ldr r0, _0808C0A4 + ldr r0, =0x02037590 strb r6, [r0, 0x2] strb r6, [r0, 0x3] strb r5, [r0, 0x5] @@ -284183,8 +274077,7 @@ player_avatar_init: @ 808BFE0 pop {r0} bx r0 .align 2, 0 -_0808C0A0: .4byte 0x02037350 -_0808C0A4: .4byte 0x02037590 + .pool thumb_func_end player_avatar_init thumb_func_start sub_808C0A8 @@ -284192,8 +274085,8 @@ sub_808C0A8: @ 808C0A8 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _0808C108 - ldr r5, _0808C10C + ldr r6, =0x02037350 + ldr r5, =0x02037590 ldrb r0, [r5, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -284213,7 +274106,7 @@ sub_808C0A8: @ 808C0A8 lsls r0, 24 cmp r0, 0 beq _0808C100 - ldr r2, _0808C110 + ldr r2, =0x02020630 ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -284237,20 +274130,18 @@ _0808C100: pop {r0} bx r0 .align 2, 0 -_0808C108: .4byte 0x02037350 -_0808C10C: .4byte 0x02037590 -_0808C110: .4byte 0x02020630 + .pool thumb_func_end sub_808C0A8 thumb_func_start sub_808C114 sub_808C114: @ 808C114 push {r4,r5,lr} - ldr r5, _0808C150 + ldr r5, =0x02037590 ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808C154 + ldr r0, =0x02037350 adds r4, r0 movs r0, 0x5 bl sub_808BD8C @@ -284263,7 +274154,7 @@ sub_808C114: @ 808C114 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808C158 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 bl obj_anim_image_start @@ -284271,9 +274162,7 @@ sub_808C114: @ 808C114 pop {r0} bx r0 .align 2, 0 -_0808C150: .4byte 0x02037590 -_0808C154: .4byte 0x02037350 -_0808C158: .4byte 0x02020630 + .pool thumb_func_end sub_808C114 thumb_func_start sub_808C15C @@ -284282,12 +274171,12 @@ sub_808C15C: @ 808C15C adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _0808C1A8 + ldr r6, =0x02037590 ldrb r0, [r6, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808C1AC + ldr r0, =0x02037350 adds r4, r0 movs r0, 0x6 bl sub_808BD8C @@ -284300,7 +274189,7 @@ sub_808C15C: @ 808C15C lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0808C1B0 + ldr r0, =0x02020630 adds r4, r0 adds r0, r5, 0 bl sub_8092A0C @@ -284313,9 +274202,7 @@ sub_808C15C: @ 808C15C pop {r0} bx r0 .align 2, 0 -_0808C1A8: .4byte 0x02037590 -_0808C1AC: .4byte 0x02037350 -_0808C1B0: .4byte 0x02020630 + .pool thumb_func_end sub_808C15C thumb_func_start sub_808C1B4 @@ -284326,12 +274213,12 @@ sub_808C1B4: @ 808C1B4 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _0808C21C + ldr r6, =0x02037590 ldrb r0, [r6, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808C220 + ldr r0, =0x02037350 adds r4, r0 movs r0, 0x2 bl sub_808BD8C @@ -284344,7 +274231,7 @@ sub_808C1B4: @ 808C1B4 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0808C224 + ldr r0, =0x02020630 mov r8, r0 add r4, r8 adds r0, r5, 0 @@ -284367,9 +274254,7 @@ sub_808C1B4: @ 808C1B4 pop {r0} bx r0 .align 2, 0 -_0808C21C: .4byte 0x02037590 -_0808C220: .4byte 0x02037350 -_0808C224: .4byte 0x02020630 + .pool thumb_func_end sub_808C1B4 thumb_func_start sub_808C228 @@ -284378,12 +274263,12 @@ sub_808C228: @ 808C228 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _0808C274 + ldr r6, =0x02037590 ldrb r0, [r6, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808C278 + ldr r0, =0x02037350 adds r4, r0 movs r0, 0x7 bl sub_808BD8C @@ -284396,7 +274281,7 @@ sub_808C228: @ 808C228 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0808C27C + ldr r0, =0x02020630 adds r4, r0 adds r0, r5, 0 bl npc_direction_to_obj_anim_image_number @@ -284409,9 +274294,7 @@ sub_808C228: @ 808C228 pop {r0} bx r0 .align 2, 0 -_0808C274: .4byte 0x02037590 -_0808C278: .4byte 0x02037350 -_0808C27C: .4byte 0x02020630 + .pool thumb_func_end sub_808C228 thumb_func_start sub_808C280 @@ -284428,7 +274311,7 @@ sub_808C280: @ 808C280 mov r0, sp strh r1, [r0] movs r6, 0x1 - ldr r1, _0808C2E4 + ldr r1, =0x08497520 mov r9, r1 mov r4, sp mov r7, sp @@ -284465,7 +274348,7 @@ _0808C2A2: bl sub_8154298 b _0808C302 .align 2, 0 -_0808C2E4: .4byte 0x08497520 + .pool _0808C2E8: ldrh r1, [r4] adds r1, 0x1 @@ -284498,13 +274381,13 @@ task_add_bump_boulder: @ 808C310 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r6, _0808C344 + ldr r6, =taskFF_bump_boulder + 1 adds r0, r6, 0 movs r1, 0xFF bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0808C348 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -284516,8 +274399,7 @@ task_add_bump_boulder: @ 808C310 pop {r0} bx r0 .align 2, 0 -_0808C344: .4byte taskFF_bump_boulder + 1 -_0808C348: .4byte 0x03005e00 + .pool thumb_func_end task_add_bump_boulder thumb_func_start taskFF_bump_boulder @@ -284525,9 +274407,9 @@ taskFF_bump_boulder: @ 808C34C push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r6, _0808C394 - ldr r2, _0808C398 - ldr r5, _0808C39C + ldr r6, =0x08497530 + ldr r2, =0x03005e00 + ldr r5, =0x02037350 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -284537,7 +274419,7 @@ _0808C360: ldrsh r3, [r4, r0] lsls r3, 2 adds r3, r6 - ldr r0, _0808C3A0 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -284559,10 +274441,7 @@ _0808C360: pop {r0} bx r0 .align 2, 0 -_0808C394: .4byte 0x08497530 -_0808C398: .4byte 0x03005e00 -_0808C39C: .4byte 0x02037350 -_0808C3A0: .4byte 0x02037590 + .pool thumb_func_end taskFF_bump_boulder thumb_func_start sub_808C3A4 @@ -284570,7 +274449,7 @@ sub_808C3A4: @ 808C3A4 push {r4,lr} adds r4, r0, 0 bl script_env_2_enable - ldr r1, _0808C3C0 + ldr r1, =0x02037590 movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -284581,7 +274460,7 @@ sub_808C3A4: @ 808C3A4 pop {r1} bx r1 .align 2, 0 -_0808C3C0: .4byte 0x02037590 + .pool thumb_func_end sub_808C3A4 thumb_func_start sub_808C3C4 @@ -284634,7 +274513,7 @@ _0808C3F0: lsrs r1, 24 adds r0, r4, 0 bl npc_set_state_2 - ldr r2, _0808C47C + ldr r2, =0x02038c08 movs r1, 0x10 ldrsh r0, [r4, r1] str r0, [r2] @@ -284644,7 +274523,7 @@ _0808C3F0: ldrb r0, [r4, 0xB] lsrs r0, 4 str r0, [r2, 0x8] - ldr r3, _0808C480 + ldr r3, =0x02020630 ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -284667,8 +274546,7 @@ _0808C472: pop {r1} bx r1 .align 2, 0 -_0808C47C: .4byte 0x02038c08 -_0808C480: .4byte 0x02020630 + .pool thumb_func_end sub_808C3C4 thumb_func_start sub_808C484 @@ -284690,11 +274568,11 @@ sub_808C484: @ 808C484 bl sub_8093284 adds r0, r5, 0 bl sub_8093284 - ldr r1, _0808C4D0 + ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x6] bl script_env_2_disable - ldr r0, _0808C4D4 + ldr r0, =taskFF_bump_boulder + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -284705,14 +274583,13 @@ _0808C4C6: pop {r1} bx r1 .align 2, 0 -_0808C4D0: .4byte 0x02037590 -_0808C4D4: .4byte taskFF_bump_boulder + 1 + .pool thumb_func_end sub_808C484 thumb_func_start sub_808C4D8 sub_808C4D8: @ 808C4D8 push {r4,lr} - ldr r4, _0808C4F4 + ldr r4, =sub_808C4F8 + 1 adds r0, r4, 0 movs r1, 0xFF bl AddTask @@ -284723,7 +274600,7 @@ sub_808C4D8: @ 808C4D8 pop {r0} bx r0 .align 2, 0 -_0808C4F4: .4byte sub_808C4F8 + 1 + .pool thumb_func_end sub_808C4D8 thumb_func_start sub_808C4F8 @@ -284731,8 +274608,8 @@ sub_808C4F8: @ 808C4F8 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0808C534 - ldr r2, _0808C538 + ldr r5, =0x0849753c + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -284742,12 +274619,12 @@ _0808C50A: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _0808C53C + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0808C540 + ldr r0, =0x02037350 adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -284759,10 +274636,7 @@ _0808C50A: pop {r0} bx r0 .align 2, 0 -_0808C534: .4byte 0x0849753c -_0808C538: .4byte 0x03005e00 -_0808C53C: .4byte 0x02037590 -_0808C540: .4byte 0x02037350 + .pool thumb_func_end sub_808C4F8 thumb_func_start sub_808C544 @@ -284770,7 +274644,7 @@ sub_808C544: @ 808C544 push {r4-r6,lr} adds r6, r0, 0 adds r4, r1, 0 - ldr r5, _0808C5A8 + ldr r5, =0x02037590 movs r0, 0x1 strb r0, [r5, 0x6] adds r0, r4, 0 @@ -284802,7 +274676,7 @@ sub_808C544: @ 808C544 movs r1, 0x20 orrs r0, r1 strb r0, [r5, 0x1] - ldr r0, _0808C5AC + ldr r0, =sub_808C4F8 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -284813,14 +274687,13 @@ _0808C5A0: pop {r1} bx r1 .align 2, 0 -_0808C5A8: .4byte 0x02037590 -_0808C5AC: .4byte sub_808C4F8 + 1 + .pool thumb_func_end sub_808C544 thumb_func_start sub_808C5B0 sub_808C5B0: @ 808C5B0 push {r4,lr} - ldr r4, _0808C5CC + ldr r4, =sub_808C5D0 + 1 adds r0, r4, 0 movs r1, 0xFF bl AddTask @@ -284831,7 +274704,7 @@ sub_808C5B0: @ 808C5B0 pop {r0} bx r0 .align 2, 0 -_0808C5CC: .4byte sub_808C5D0 + 1 + .pool thumb_func_end sub_808C5B0 thumb_func_start sub_808C5D0 @@ -284839,8 +274712,8 @@ sub_808C5D0: @ 808C5D0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0808C60C - ldr r2, _0808C610 + ldr r5, =0x08497540 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -284850,12 +274723,12 @@ _0808C5E2: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _0808C614 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0808C618 + ldr r0, =0x02037350 adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -284867,10 +274740,7 @@ _0808C5E2: pop {r0} bx r0 .align 2, 0 -_0808C60C: .4byte 0x08497540 -_0808C610: .4byte 0x03005e00 -_0808C614: .4byte 0x02037590 -_0808C618: .4byte 0x02037350 + .pool thumb_func_end sub_808C5D0 thumb_func_start sub_808C61C @@ -284882,7 +274752,7 @@ sub_808C61C: @ 808C61C ldrb r1, [r1, 0x18] lsrs r1, 4 strh r1, [r0, 0xA] - ldr r1, _0808C640 + ldr r1, =0x02037590 movs r0, 0x1 strb r0, [r1, 0x6] bl script_env_2_enable @@ -284892,7 +274762,7 @@ sub_808C61C: @ 808C61C pop {r1} bx r1 .align 2, 0 -_0808C640: .4byte 0x02037590 + .pool thumb_func_end sub_808C61C thumb_func_start sub_808C644 @@ -284901,7 +274771,7 @@ sub_808C644: @ 808C644 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _0808C6B8 + ldr r1, =0x08497550 mov r0, sp movs r2, 0x4 bl memcpy @@ -284952,7 +274822,7 @@ _0808C6AC: pop {r1} bx r1 .align 2, 0 -_0808C6B8: .4byte 0x08497550 + .pool thumb_func_end sub_808C644 thumb_func_start sub_808C6BC @@ -284961,7 +274831,7 @@ sub_808C6BC: @ 808C6BC sub sp, 0x8 adds r5, r0, 0 adds r4, r1, 0 - ldr r1, _0808C6F8 + ldr r1, =0x08497554 mov r0, sp movs r2, 0x5 bl memcpy @@ -284985,7 +274855,7 @@ _0808C6EC: pop {r1} bx r1 .align 2, 0 -_0808C6F8: .4byte 0x08497554 + .pool thumb_func_end sub_808C6BC thumb_func_start sub_808C6FC @@ -285009,10 +274879,10 @@ sub_808C6FC: @ 808C6FC adds r0, r5, 0 bl npc_set_state_2 bl script_env_2_disable - ldr r1, _0808C748 + ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x6] - ldr r0, _0808C74C + ldr r0, =sub_808C5D0 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -285023,8 +274893,7 @@ _0808C740: pop {r1} bx r1 .align 2, 0 -_0808C748: .4byte 0x02037590 -_0808C74C: .4byte sub_808C5D0 + 1 + .pool thumb_func_end sub_808C6FC thumb_func_start sub_808C750 @@ -285036,7 +274905,7 @@ sub_808C750: @ 808C750 bl script_env_2_enable bl sav1_reset_x2C bl sub_8085898 - ldr r2, _0808C79C + ldr r2, =0x02037590 ldrb r1, [r2] movs r0, 0xF7 ands r0, r1 @@ -285045,13 +274914,13 @@ sub_808C750: @ 808C750 strb r0, [r2] movs r0, 0x1 strb r0, [r2, 0x6] - ldr r5, _0808C7A0 + ldr r5, =taskFF_0805D1D4 + 1 adds r0, r5, 0 movs r1, 0xFF bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0808C7A4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -285062,9 +274931,7 @@ sub_808C750: @ 808C750 pop {r0} bx r0 .align 2, 0 -_0808C79C: .4byte 0x02037590 -_0808C7A0: .4byte taskFF_0805D1D4 + 1 -_0808C7A4: .4byte 0x03005e00 + .pool thumb_func_end sub_808C750 thumb_func_start taskFF_0805D1D4 @@ -285072,12 +274939,12 @@ taskFF_0805D1D4: @ 808C7A8 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0808C804 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808C808 + ldr r1, =0x02037350 adds r5, r0, r1 adds r0, r5, 0 bl npc_is_visible_or_is_x40 @@ -285093,7 +274960,7 @@ _0808C7D4: ldrb r0, [r5, 0x1A] movs r1, 0x2 bl sub_81555AC - ldr r0, _0808C80C + ldr r0, =0x03005e00 lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -285105,17 +274972,14 @@ _0808C7D4: lsrs r1, 24 adds r0, r5, 0 bl npc_set_state_2 - ldr r0, _0808C810 + ldr r0, =sub_808C814 + 1 str r0, [r4] _0808C7FC: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0808C804: .4byte 0x02037590 -_0808C808: .4byte 0x02037350 -_0808C80C: .4byte 0x03005e00 -_0808C810: .4byte sub_808C814 + 1 + .pool thumb_func_end taskFF_0805D1D4 thumb_func_start sub_808C814 @@ -285123,12 +274987,12 @@ sub_808C814: @ 808C814 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _0808C880 + ldr r6, =0x02037590 ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808C884 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl sub_8093284 @@ -285158,7 +275022,7 @@ sub_808C814: @ 808C814 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808C888 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r5, 0 @@ -285168,9 +275032,7 @@ _0808C87A: pop {r0} bx r0 .align 2, 0 -_0808C880: .4byte 0x02037590 -_0808C884: .4byte 0x02037350 -_0808C888: .4byte 0x02020630 + .pool thumb_func_end sub_808C814 thumb_func_start fishing_start @@ -285179,13 +275041,13 @@ fishing_start: @ 808C88C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _0808C8B8 + ldr r5, =sub_808C8C0 + 1 adds r0, r5, 0 movs r1, 0xFF bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0808C8BC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -285196,8 +275058,7 @@ fishing_start: @ 808C88C pop {r0} bx r0 .align 2, 0 -_0808C8B8: .4byte sub_808C8C0 + 1 -_0808C8BC: .4byte 0x03005e00 + .pool thumb_func_end fishing_start thumb_func_start sub_808C8C0 @@ -285205,8 +275066,8 @@ sub_808C8C0: @ 808C8C0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0808C8F0 - ldr r2, _0808C8F4 + ldr r5, =0x0849755c + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -285226,8 +275087,7 @@ _0808C8D2: pop {r0} bx r0 .align 2, 0 -_0808C8F0: .4byte 0x0849755c -_0808C8F4: .4byte 0x03005e00 + .pool thumb_func_end sub_808C8C0 thumb_func_start sub_808C8F8 @@ -285235,7 +275095,7 @@ sub_808C8F8: @ 808C8F8 push {r4,lr} adds r4, r0, 0 bl script_env_2_enable - ldr r1, _0808C914 + ldr r1, =0x02037590 movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -285246,7 +275106,7 @@ sub_808C8F8: @ 808C8F8 pop {r1} bx r1 .align 2, 0 -_0808C914: .4byte 0x02037590 + .pool thumb_func_end sub_808C8F8 thumb_func_start fish1 @@ -285254,12 +275114,12 @@ fish1: @ 808C918 push {r4-r6,lr} sub sp, 0x10 adds r5, r0, 0 - ldr r1, _0808C9A0 + ldr r1, =0x0849759c mov r0, sp movs r2, 0x6 bl memcpy add r4, sp, 0x8 - ldr r1, _0808C9A4 + ldr r1, =0x084975a2 adds r0, r4, 0 movs r2, 0x6 bl memcpy @@ -285280,8 +275140,8 @@ fish1: @ 808C918 ldrh r1, [r6] adds r1, r0 strh r1, [r5, 0x22] - ldr r3, _0808C9A8 - ldr r2, _0808C9AC + ldr r3, =0x02037350 + ldr r2, =0x02037590 ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -285313,10 +275173,7 @@ fish1: @ 808C918 pop {r1} bx r1 .align 2, 0 -_0808C9A0: .4byte 0x0849759c -_0808C9A4: .4byte 0x084975a2 -_0808C9A8: .4byte 0x02037350 -_0808C9AC: .4byte 0x02037590 + .pool thumb_func_end fish1 thumb_func_start fish2 @@ -285387,7 +275244,7 @@ sub_808CA20: @ 808CA20 push {r4,r5,lr} sub sp, 0x10 adds r4, r0, 0 - ldr r1, _0808CA5C + ldr r1, =0x084975a8 add r0, sp, 0xC movs r2, 0x2 bl memcpy @@ -285395,7 +275252,7 @@ sub_808CA20: @ 808CA20 ldrh r0, [r4, 0xA] adds r1, r0, 0x1 strh r1, [r4, 0xA] - ldr r0, _0808CA60 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] movs r5, 0x1 adds r2, r5, 0 @@ -285414,8 +275271,7 @@ _0808CA58: movs r0, 0x1 b _0808CAB4 .align 2, 0 -_0808CA5C: .4byte 0x084975a8 -_0808CA60: .4byte 0x030022c0 + .pool _0808CA64: lsls r0, r1, 16 asrs r0, 16 @@ -285483,7 +275339,7 @@ sub_808CABC: @ 808CABC strh r0, [r5, 0x8] b _0808CB5C _0808CADC: - ldr r4, _0808CB2C + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr @@ -285520,18 +275376,18 @@ _0808CB14: strh r0, [r5, 0x8] b _0808CB32 .align 2, 0 -_0808CB2C: .4byte 0x020244ec + .pool _0808CB30: movs r6, 0x1 _0808CB32: cmp r6, 0x1 bne _0808CB5C - ldr r0, _0808CB64 + ldr r0, =0x02037590 ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0808CB68 + ldr r0, =0x02020630 adds r4, r0 bl player_get_direction__sp1AA lsls r0, 24 @@ -285548,8 +275404,7 @@ _0808CB5C: pop {r1} bx r1 .align 2, 0 -_0808CB64: .4byte 0x02037590 -_0808CB68: .4byte 0x02020630 + .pool thumb_func_end sub_808CABC thumb_func_start sub_808CB6C @@ -285558,7 +275413,7 @@ sub_808CB6C: @ 808CB6C sub sp, 0xC adds r5, r0, 0 bl sub_808CF78 - ldr r2, _0808CBA0 + ldr r2, =0x085ee8f7 movs r0, 0x11 str r0, [sp] movs r4, 0 @@ -285578,7 +275433,7 @@ sub_808CB6C: @ 808CB6C pop {r1} bx r1 .align 2, 0 -_0808CBA0: .4byte 0x085ee8f7 + .pool thumb_func_end sub_808CB6C thumb_func_start fish7 @@ -285586,7 +275441,7 @@ fish7: @ 808CBA4 push {r4,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r1, _0808CBD8 + ldr r1, =0x084975aa mov r0, sp movs r2, 0x6 bl memcpy @@ -285607,9 +275462,9 @@ fish7: @ 808CBA4 movs r0, 0xC b _0808CBEC .align 2, 0 -_0808CBD8: .4byte 0x084975aa + .pool _0808CBDC: - ldr r0, _0808CBF8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -285626,7 +275481,7 @@ _0808CBEE: pop {r1} bx r1 .align 2, 0 -_0808CBF8: .4byte 0x030022c0 + .pool thumb_func_end fish7 thumb_func_start fish8 @@ -285634,7 +275489,7 @@ fish8: @ 808CBFC push {r4,lr} sub sp, 0xC adds r4, r0, 0 - ldr r1, _0808CC60 + ldr r1, =0x084975b0 mov r0, sp movs r2, 0xC bl memcpy @@ -285680,7 +275535,7 @@ _0808CC56: pop {r1} bx r1 .align 2, 0 -_0808CC60: .4byte 0x084975b0 + .pool thumb_func_end fish8 thumb_func_start sub_808CC64 @@ -285692,7 +275547,7 @@ sub_808CC64: @ 808CC64 movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _0808CCA4 + ldr r2, =0x085ee903 movs r5, 0 str r5, [sp] movs r0, 0x2 @@ -285715,7 +275570,7 @@ sub_808CC64: @ 808CC64 pop {r1} bx r1 .align 2, 0 -_0808CCA4: .4byte 0x085ee903 + .pool thumb_func_end sub_808CC64 thumb_func_start fishA_wait_for_a_pressed @@ -285741,12 +275596,12 @@ _0808CCBC: lsrs r6, r0, 16 cmp r6, 0 bne _0808CD50 - ldr r7, _0808CD44 + ldr r7, =0x02037590 ldrb r0, [r7, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808CD48 + ldr r0, =0x02037350 mov r8, r0 add r4, r8 ldrh r1, [r5, 0x24] @@ -285773,7 +275628,7 @@ _0808CCBC: movs r2, 0 bl sub_8155604 _0808CD1A: - ldr r2, _0808CD4C + ldr r2, =0x02020630 ldrb r1, [r7, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -285794,16 +275649,14 @@ _0808CD1A: strh r0, [r5, 0xA] b _0808CD80 .align 2, 0 -_0808CD44: .4byte 0x02037590 -_0808CD48: .4byte 0x02037350 -_0808CD4C: .4byte 0x02020630 + .pool _0808CD50: movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 beq _0808CD80 _0808CD58: - ldr r1, _0808CD8C + ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x6] bl script_env_2_disable @@ -285813,7 +275666,7 @@ _0808CD58: bl sub_80B5734 movs r0, 0x1 bl sub_80ED950 - ldr r0, _0808CD90 + ldr r0, =sub_808C8C0 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -285826,8 +275679,7 @@ _0808CD80: pop {r1} bx r1 .align 2, 0 -_0808CD8C: .4byte 0x02037590 -_0808CD90: .4byte sub_808C8C0 + 1 + .pool thumb_func_end fishA_wait_for_a_pressed thumb_func_start sub_808CD94 @@ -285836,12 +275688,12 @@ sub_808CD94: @ 808CD94 sub sp, 0x10 adds r5, r0, 0 bl sub_808CF78 - ldr r0, _0808CDF8 + ldr r0, =0x02037590 ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0808CDFC + ldr r0, =0x02020630 adds r4, r0 bl player_get_direction__sp1AA lsls r0, 24 @@ -285855,7 +275707,7 @@ sub_808CD94: @ 808CD94 movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _0808CE00 + ldr r2, =0x085ee91e movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -285876,9 +275728,7 @@ sub_808CD94: @ 808CD94 pop {r1} bx r1 .align 2, 0 -_0808CDF8: .4byte 0x02037590 -_0808CDFC: .4byte 0x02020630 -_0808CE00: .4byte 0x085ee91e + .pool thumb_func_end sub_808CD94 thumb_func_start sub_808CE04 @@ -285887,12 +275737,12 @@ sub_808CE04: @ 808CE04 sub sp, 0x10 adds r5, r0, 0 bl sub_808CF78 - ldr r0, _0808CE68 + ldr r0, =0x02037590 ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0808CE6C + ldr r0, =0x02020630 adds r4, r0 bl player_get_direction__sp1AA lsls r0, 24 @@ -285906,7 +275756,7 @@ sub_808CE04: @ 808CE04 movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _0808CE70 + ldr r2, =0x085ee933 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -285928,9 +275778,7 @@ sub_808CE04: @ 808CE04 pop {r1} bx r1 .align 2, 0 -_0808CE68: .4byte 0x02037590 -_0808CE6C: .4byte 0x02020630 -_0808CE70: .4byte 0x085ee933 + .pool thumb_func_end sub_808CE04 thumb_func_start sub_808CE74 @@ -285954,8 +275802,8 @@ sub_808CE8C: @ 808CE8C push {r7} adds r6, r0, 0 bl sub_808CF78 - ldr r7, _0808CF20 - ldr r5, _0808CF24 + ldr r7, =0x02020630 + ldr r5, =0x02037590 ldrb r0, [r5, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -285970,7 +275818,7 @@ sub_808CE8C: @ 808CE8C lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0808CF28 + ldr r0, =0x02037350 mov r8, r0 add r4, r8 ldrh r1, [r6, 0x24] @@ -286021,9 +275869,7 @@ _0808CF12: pop {r1} bx r1 .align 2, 0 -_0808CF20: .4byte 0x02020630 -_0808CF24: .4byte 0x02037590 -_0808CF28: .4byte 0x02037350 + .pool thumb_func_end sub_808CE8C thumb_func_start fishF @@ -286036,7 +275882,7 @@ fishF: @ 808CF2C lsrs r1, r0, 16 cmp r1, 0 bne _0808CF68 - ldr r0, _0808CF70 + ldr r0, =0x02037590 strb r1, [r0, 0x6] bl script_env_2_disable bl sub_809757C @@ -286045,7 +275891,7 @@ fishF: @ 808CF2C bl sub_8197434 movs r0, 0 bl sub_80ED950 - ldr r0, _0808CF74 + ldr r0, =sub_808C8C0 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -286055,19 +275901,18 @@ _0808CF68: pop {r1} bx r1 .align 2, 0 -_0808CF70: .4byte 0x02037590 -_0808CF74: .4byte sub_808C8C0 + 1 + .pool thumb_func_end fishF thumb_func_start sub_808CF78 sub_808CF78: @ 808CF78 push {r4-r7,lr} - ldr r0, _0808D064 + ldr r0, =0x02037590 ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808D068 + ldr r1, =0x02020630 adds r4, r0, r1 adds r0, r4, 0 bl obj_anim_step @@ -286144,12 +275989,12 @@ _0808CFF0: lsrs r0, 24 cmp r0, 0x3 bne _0808D022 - ldr r0, _0808D06C + ldr r0, =0x0000fff8 strh r0, [r4, 0x24] _0808D022: cmp r5, 0x5 bne _0808D02A - ldr r0, _0808D06C + ldr r0, =0x0000fff8 strh r0, [r4, 0x26] _0808D02A: adds r0, r5, 0 @@ -286161,13 +276006,13 @@ _0808D02A: movs r0, 0x8 strh r0, [r4, 0x26] _0808D03A: - ldr r3, _0808D064 + ldr r3, =0x02037590 ldrb r1, [r3] movs r0, 0x8 ands r0, r1 cmp r0, 0 beq _0808D05E - ldr r2, _0808D070 + ldr r2, =0x02037350 ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -286183,25 +276028,22 @@ _0808D05E: pop {r0} bx r0 .align 2, 0 -_0808D064: .4byte 0x02037590 -_0808D068: .4byte 0x02020630 -_0808D06C: .4byte 0x0000fff8 -_0808D070: .4byte 0x02037350 + .pool thumb_func_end sub_808CF78 thumb_func_start sub_808D074 sub_808D074: @ 808D074 - ldr r1, _0808D07C + ldr r1, =0x0203734c strb r0, [r1] bx lr .align 2, 0 -_0808D07C: .4byte 0x0203734c + .pool thumb_func_end sub_808D074 thumb_func_start sub_808D080 sub_808D080: @ 808D080 push {lr} - ldr r1, _0808D090 + ldr r1, =0x0203734c ldrb r0, [r1] cmp r0, 0 bne _0808D08C @@ -286210,7 +276052,7 @@ _0808D08C: pop {r1} bx r1 .align 2, 0 -_0808D090: .4byte 0x0203734c + .pool thumb_func_end sub_808D080 thumb_func_start sub_808D094 @@ -286221,23 +276063,23 @@ sub_808D094: @ 808D094 lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 - ldr r0, _0808D0D8 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808D0DC + ldr r1, =0x02037350 adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808D0E0 + ldr r1, =0x02020630 adds r7, r0, r1 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0808D0E4 + ldr r1, =0x03005e08 adds r5, r0, r1 movs r0, 0 ldrsh r6, [r5, r0] @@ -286249,10 +276091,7 @@ sub_808D094: @ 808D094 beq _0808D0EE b _0808D18A .align 2, 0 -_0808D0D8: .4byte 0x02037590 -_0808D0DC: .4byte 0x02037350 -_0808D0E0: .4byte 0x02020630 -_0808D0E4: .4byte 0x03005e08 + .pool _0808D0E8: cmp r6, 0x2 beq _0808D184 @@ -286316,7 +276155,7 @@ _0808D14A: strh r0, [r7, 0x22] movs r2, 0x22 ldrsh r1, [r7, r2] - ldr r0, _0808D180 + ldr r0, =0x03005de8 movs r2, 0 ldrsh r0, [r0, r2] adds r1, r0 @@ -286329,7 +276168,7 @@ _0808D14A: strh r0, [r5] b _0808D18A .align 2, 0 -_0808D180: .4byte 0x03005de8 + .pool _0808D184: adds r0, r2, 0 bl remove_task @@ -286344,7 +276183,7 @@ _0808D18A: thumb_func_start sub_808D194 sub_808D194: @ 808D194 push {r4,lr} - ldr r4, _0808D1B0 + ldr r4, =sub_808D1FC + 1 adds r0, r4, 0 movs r1, 0 bl AddTask @@ -286355,26 +276194,26 @@ sub_808D194: @ 808D194 pop {r0} bx r0 .align 2, 0 -_0808D1B0: .4byte sub_808D1FC + 1 + .pool thumb_func_end sub_808D194 thumb_func_start sub_808D1B4 sub_808D1B4: @ 808D1B4 push {lr} - ldr r0, _0808D1C4 + ldr r0, =sub_808D1FC + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_0808D1C4: .4byte sub_808D1FC + 1 + .pool thumb_func_end sub_808D1B4 thumb_func_start sub_808D1C8 sub_808D1C8: @ 808D1C8 push {r4,lr} - ldr r4, _0808D1E4 + ldr r4, =sub_808D094 + 1 adds r0, r4, 0 movs r1, 0 bl AddTask @@ -286385,20 +276224,20 @@ sub_808D1C8: @ 808D1C8 pop {r0} bx r0 .align 2, 0 -_0808D1E4: .4byte sub_808D094 + 1 + .pool thumb_func_end sub_808D1C8 thumb_func_start sub_808D1E8 sub_808D1E8: @ 808D1E8 push {lr} - ldr r0, _0808D1F8 + ldr r0, =sub_808D094 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_0808D1F8: .4byte sub_808D094 + 1 + .pool thumb_func_end sub_808D1E8 thumb_func_start sub_808D1FC @@ -286410,24 +276249,24 @@ sub_808D1FC: @ 808D1FC lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0808D244 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808D248 + ldr r1, =0x02037350 adds r4, r0, r1 ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808D24C + ldr r1, =0x02020630 adds r7, r0, r1 mov r1, r8 lsls r0, r1, 2 add r0, r8 lsls r0, 3 - ldr r1, _0808D250 + ldr r1, =0x03005e08 adds r5, r0, r1 movs r2, 0 ldrsh r6, [r5, r2] @@ -286439,10 +276278,7 @@ sub_808D1FC: @ 808D1FC beq _0808D25E b _0808D37E .align 2, 0 -_0808D244: .4byte 0x02037590 -_0808D248: .4byte 0x02037350 -_0808D24C: .4byte 0x02020630 -_0808D250: .4byte 0x03005e08 + .pool _0808D254: cmp r6, 0x2 beq _0808D31C @@ -286454,7 +276290,7 @@ _0808D25E: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xA] - ldr r1, _0808D318 + ldr r1, =0x084975bc movs r3, 0xA ldrsh r0, [r5, r3] adds r0, r1 @@ -286541,7 +276377,7 @@ _0808D2FE: strh r0, [r5, 0x10] b _0808D332 .align 2, 0 -_0808D318: .4byte 0x084975bc + .pool _0808D31C: adds r1, r5, 0x2 adds r0, r4, 0 @@ -286621,7 +276457,7 @@ _0808D3A8: lsls r0, 24 cmp r0, 0 beq _0808D3E4 - ldr r4, _0808D3E0 + ldr r4, =0x084975bc ldrb r0, [r5, 0x18] lsls r0, 28 lsrs r0, 28 @@ -286642,7 +276478,7 @@ _0808D3A8: ldrb r0, [r0] b _0808D3EA .align 2, 0 -_0808D3E0: .4byte 0x084975bc + .pool _0808D3E4: ldrb r0, [r5, 0x18] lsls r0, 28 @@ -286676,7 +276512,7 @@ npc_clear_ids_and_state: @ 808D3F0 npcs_clear_ids_and_state: @ 808D410 push {r4,r5,lr} movs r4, 0 - ldr r5, _0808D434 + ldr r5, =0x02037350 _0808D416: lsls r0, r4, 3 adds r0, r4 @@ -286692,7 +276528,7 @@ _0808D416: pop {r0} bx r0 .align 2, 0 -_0808D434: .4byte 0x02037350 + .pool thumb_func_end npcs_clear_ids_and_state thumb_func_start sub_808D438 @@ -286713,7 +276549,7 @@ sub_808D450: @ 808D450 mov r5, r9 mov r4, r8 push {r4-r6} - ldr r0, _0808D4EC + ldr r0, =0x085059f8 ldr r0, [r0, 0x54] mov r9, r0 movs r1, 0 @@ -286722,7 +276558,7 @@ sub_808D450: @ 808D450 bl obj_add_from_template_backward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _0808D4F0 + ldr r1, =0x02020630 mov r10, r1 lsls r4, r0, 4 adds r4, r0 @@ -286781,19 +276617,18 @@ sub_808D450: @ 808D450 pop {r0} bx r0 .align 2, 0 -_0808D4EC: .4byte 0x085059f8 -_0808D4F0: .4byte 0x02020630 + .pool thumb_func_end sub_808D450 thumb_func_start sub_808D4F4 sub_808D4F4: @ 808D4F4 push {lr} movs r1, 0 - ldr r2, _0808D500 + ldr r2, =0x02037350 ldrb r0, [r2] b _0808D518 .align 2, 0 -_0808D500: .4byte 0x02037350 + .pool _0808D504: adds r0, r1, 0x1 lsls r0, 24 @@ -286867,7 +276702,7 @@ _0808D56C: npc_id_by_pos: @ 808D574 push {r4-r6,lr} movs r3, 0 - ldr r5, _0808D5B4 + ldr r5, =0x02037350 lsls r0, 16 asrs r4, r0, 16 lsls r1, 16 @@ -286901,7 +276736,7 @@ _0808D5AC: pop {r1} bx r1 .align 2, 0 -_0808D5B4: .4byte 0x02037350 + .pool thumb_func_end npc_id_by_pos thumb_func_start npc_id_by_local_id_and_map @@ -286914,7 +276749,7 @@ npc_id_by_local_id_and_map: @ 808D5B8 lsls r2, 24 lsrs r2, 24 movs r1, 0 - ldr r6, _0808D5F0 + ldr r6, =0x02037350 _0808D5CA: lsls r0, r1, 3 adds r0, r1 @@ -286936,7 +276771,7 @@ _0808D5CA: adds r0, r1, 0 b _0808D600 .align 2, 0 -_0808D5F0: .4byte 0x02037350 + .pool _0808D5F4: adds r0, r1, 0x1 lsls r0, 24 @@ -286956,7 +276791,7 @@ npc_id_by_local_id_ignore_map: @ 808D608 lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r4, _0808D62C + ldr r4, =0x02037350 _0808D612: lsls r0, r2, 3 adds r0, r2 @@ -286972,7 +276807,7 @@ _0808D612: adds r0, r2, 0 b _0808D63C .align 2, 0 -_0808D62C: .4byte 0x02037350 + .pool _0808D630: adds r0, r2, 0x1 lsls r0, 24 @@ -287014,7 +276849,7 @@ _0808D66E: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808D770 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl npc_clear_ids_and_state @@ -287082,7 +276917,7 @@ _0808D66E: strb r0, [r4, 0x7] ldrh r0, [r5, 0xE] strb r0, [r4, 0x1D] - ldr r1, _0808D774 + ldr r1, =0x085055cd ldrb r0, [r5, 0x9] adds r0, r1 ldrb r1, [r0] @@ -287094,7 +276929,7 @@ _0808D66E: bl npc_set_direction adds r0, r4, 0 bl sub_808E6DC - ldr r1, _0808D778 + ldr r1, =0x0850557c ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -287139,9 +276974,7 @@ _0808D762: pop {r1} bx r1 .align 2, 0 -_0808D770: .4byte 0x02037350 -_0808D774: .4byte 0x085055cd -_0808D778: .4byte 0x0850557c + .pool thumb_func_end sub_808D644 thumb_func_start sub_808D77C @@ -287152,7 +276985,7 @@ sub_808D77C: @ 808D77C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r4, _0808D7A4 + ldr r4, =0x02037318 ldr r0, [r4, 0x4] cmp r0, 0 beq _0808D7FE @@ -287165,7 +276998,7 @@ sub_808D77C: @ 808D77C lsrs r6, r0, 24 b _0808D7CA .align 2, 0 -_0808D7A4: .4byte 0x02037318 + .pool _0808D7A8: bl sub_81D6074 cmp r0, 0 @@ -287188,7 +277021,7 @@ _0808D7CA: movs r5, 0 cmp r5, r6 bcs _0808D7FE - ldr r7, _0808D80C + ldr r7, =0x03005d8c _0808D7D2: lsls r0, r5, 1 adds r0, r5 @@ -287221,7 +277054,7 @@ _0808D800: pop {r1} bx r1 .align 2, 0 -_0808D80C: .4byte 0x03005d8c + .pool thumb_func_end sub_808D77C thumb_func_start sub_808D810 @@ -287235,7 +277068,7 @@ sub_808D810: @ 808D810 lsls r2, 24 lsrs r4, r2, 24 movs r2, 0 - ldr r1, _0808D86C + ldr r1, =0x02037350 ldrb r0, [r1] lsls r0, 31 adds r7, r1, 0 @@ -287277,11 +277110,11 @@ _0808D868: movs r0, 0x1 b _0808D8A4 .align 2, 0 -_0808D86C: .4byte 0x02037350 + .pool _0808D870: mov r0, r12 strb r2, [r0] - ldr r1, _0808D8AC + ldr r1, =0x02037350 _0808D876: lsls r0, r2, 3 adds r0, r2 @@ -287312,7 +277145,7 @@ _0808D8A4: pop {r1} bx r1 .align 2, 0 -_0808D8AC: .4byte 0x02037350 + .pool thumb_func_end sub_808D810 thumb_func_start npc_hide @@ -287354,7 +277187,7 @@ npc_hide_by_local_id_and_map: @ 808D8C4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808D908 + ldr r1, =0x02037350 adds r0, r1 bl npc_hide _0808D902: @@ -287362,7 +277195,7 @@ _0808D902: pop {r0} bx r0 .align 2, 0 -_0808D908: .4byte 0x02037350 + .pool thumb_func_end npc_hide_by_local_id_and_map thumb_func_start npc_delete_obj_and_free_tiles_for_npc_type @@ -287373,12 +277206,12 @@ npc_delete_obj_and_free_tiles_for_npc_type: @ 808D90C ldrb r0, [r4, 0x5] bl npc_get_type ldrh r2, [r0, 0x6] - ldr r1, _0808D950 + ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 orrs r0, r2 str r0, [sp, 0x4] - ldr r2, _0808D954 + ldr r2, =0x02020630 ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -287399,8 +277232,7 @@ npc_delete_obj_and_free_tiles_for_npc_type: @ 808D90C pop {r0} bx r0 .align 2, 0 -_0808D950: .4byte 0xffff0000 -_0808D954: .4byte 0x02020630 + .pool thumb_func_end npc_delete_obj_and_free_tiles_for_npc_type thumb_func_start npc_hide_all_but_player @@ -287408,14 +277240,14 @@ npc_hide_all_but_player: @ 808D958 push {r4,lr} movs r4, 0 _0808D95C: - ldr r0, _0808D984 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] cmp r4, r0 beq _0808D972 lsls r0, r4, 3 adds r0, r4 lsls r0, 2 - ldr r1, _0808D988 + ldr r1, =0x02037350 adds r0, r1 bl npc_hide _0808D972: @@ -287428,8 +277260,7 @@ _0808D972: pop {r0} bx r0 .align 2, 0 -_0808D984: .4byte 0x02037590 -_0808D988: .4byte 0x02037350 + .pool thumb_func_end npc_hide_all_but_player thumb_func_start npc_spawn_with_provided_template @@ -287468,7 +277299,7 @@ _0808D9C8: lsls r4, r0, 3 adds r0, r4, r0 lsls r0, 2 - ldr r1, _0808D9F0 + ldr r1, =0x02037350 adds r6, r0, r1 ldrb r0, [r6, 0x5] bl npc_get_type @@ -287483,7 +277314,7 @@ _0808D9C8: bl npc_load_two_palettes__no_record b _0808DA16 .align 2, 0 -_0808D9F0: .4byte 0x02037350 + .pool _0808D9F4: cmp r5, 0xA bne _0808DA02 @@ -287510,7 +277341,7 @@ _0808DA16: orrs r0, r1 strb r0, [r6, 0x1] _0808DA24: - ldr r1, _0808DA5C + ldr r1, =0x0000ffff adds r0, r1, 0 mov r2, r8 strh r0, [r2, 0x2] @@ -287524,7 +277355,7 @@ _0808DA24: mov r8, r0 cmp r0, 0x40 bne _0808DA64 - ldr r0, _0808DA60 + ldr r0, =0x02037350 mov r2, r9 adds r1, r4, r2 lsls r1, 2 @@ -287537,14 +277368,13 @@ _0808DA24: movs r0, 0x10 b _0808DB2C .align 2, 0 -_0808DA5C: .4byte 0x0000ffff -_0808DA60: .4byte 0x02037350 + .pool _0808DA64: mov r1, r8 lsls r0, r1, 4 add r0, r8 lsls r0, 2 - ldr r1, _0808DB3C + ldr r1, =0x02020630 adds r4, r0, r1 mov r2, r10 lsls r0, r2, 16 @@ -287646,7 +277476,7 @@ _0808DB2C: pop {r1} bx r1 .align 2, 0 -_0808DB3C: .4byte 0x02020630 + .pool thumb_func_end npc_spawn_with_provided_template thumb_func_start npc_instanciation_something @@ -287682,7 +277512,7 @@ npc_instanciation_something: @ 808DB40 add r1, sp, 0x8 bl rom_npc_to_template ldrh r3, [r7, 0x6] - ldr r2, _0808DBB8 + ldr r2, =0xffff0000 add r1, sp, 0x24 ldr r0, [r1, 0x4] ands r0, r2 @@ -287708,10 +277538,10 @@ npc_instanciation_something: @ 808DB40 movs r0, 0x10 b _0808DBF2 .align 2, 0 -_0808DBB8: .4byte 0xffff0000 + .pool _0808DBBC: - ldr r4, _0808DC00 - ldr r1, _0808DC04 + ldr r4, =0x02020630 + ldr r1, =0x02037350 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -287746,8 +277576,7 @@ _0808DBF2: pop {r1} bx r1 .align 2, 0 -_0808DC00: .4byte 0x02020630 -_0808DC04: .4byte 0x02037350 + .pool thumb_func_end npc_instanciation_something thumb_func_start player_avatar_instanciate_maybe @@ -287760,7 +277589,7 @@ player_avatar_instanciate_maybe: @ 808DC08 add r0, sp, 0x4 adds r1, r4, 0 bl sub_809312C - ldr r0, _0808DC40 + ldr r0, =0x03005d8c ldr r0, [r0] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -287779,7 +277608,7 @@ player_avatar_instanciate_maybe: @ 808DC08 pop {r1} bx r1 .align 2, 0 -_0808DC40: .4byte 0x03005d8c + .pool thumb_func_end player_avatar_instanciate_maybe thumb_func_start sub_808DC44 @@ -287794,7 +277623,7 @@ sub_808DC44: @ 808DC44 lsls r0, 24 lsrs r0, 24 lsls r3, 16 - ldr r5, _0808DCA8 + ldr r5, =0xfff90000 adds r3, r5 lsrs r3, 16 lsls r4, 16 @@ -287833,7 +277662,7 @@ sub_808DC44: @ 808DC44 pop {r1} bx r1 .align 2, 0 -_0808DCA8: .4byte 0xfff90000 + .pool thumb_func_end sub_808DC44 thumb_func_start show_sprite @@ -287914,7 +277743,7 @@ npc_to_objtemplate__with_indexed_objfunc: @ 808DD30 lsls r0, 16 lsrs r0, 16 lsls r1, 16 - ldr r4, _0808DD4C + ldr r4, =0x08505438 lsrs r1, 14 adds r1, r4 ldr r1, [r1] @@ -287923,7 +277752,7 @@ npc_to_objtemplate__with_indexed_objfunc: @ 808DD30 pop {r0} bx r0 .align 2, 0 -_0808DD4C: .4byte 0x08505438 + .pool thumb_func_end npc_to_objtemplate__with_indexed_objfunc thumb_func_start rom_npc_to_template @@ -287970,7 +277799,7 @@ sub_808DD68: @ 808DD68 mov r3, sp bl sub_808DCFC ldrh r1, [r6, 0x2] - ldr r0, _0808DE04 + ldr r0, =0x0000ffff cmp r1, r0 beq _0808DDAE adds r0, r1, 0 @@ -287996,7 +277825,7 @@ _0808DDAE: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r0, _0808DE08 + ldr r0, =0x02020630 adds r4, r0 adds r0, r4, 0 bl obj_set_f18_to_r0_f42_to_40 @@ -288017,8 +277846,7 @@ _0808DDF2: pop {r1} bx r1 .align 2, 0 -_0808DE04: .4byte 0x0000ffff -_0808DE08: .4byte 0x02020630 + .pool thumb_func_end sub_808DD68 thumb_func_start sprite_new @@ -288051,13 +277879,13 @@ sprite_new: @ 808DE0C adds r0, r5, 0 bl npc_get_type adds r4, r0, 0 - ldr r1, _0808DF0C + ldr r1, =sub_8097AC8 + 1 add r3, sp, 0x1C adds r0, r5, 0 mov r2, sp bl sub_808DCFC mov r1, sp - ldr r2, _0808DF10 + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1, 0x2] mov r1, r8 @@ -288089,7 +277917,7 @@ sprite_new: @ 808DE0C lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, _0808DF14 + ldr r1, =0x02020630 adds r5, r0, r1 ldrh r0, [r4, 0x8] lsls r0, 16 @@ -288148,9 +277976,7 @@ _0808DEE4: bl npc_load_two_palettes__and_record b _0808DF2C .align 2, 0 -_0808DF0C: .4byte sub_8097AC8 + 1 -_0808DF10: .4byte 0x0000ffff -_0808DF14: .4byte 0x02020630 + .pool _0808DF18: lsls r1, 28 lsrs r0, r1, 28 @@ -288216,11 +278042,11 @@ npc_culling_maybe: @ 808DF80 lsls r1, 16 lsrs r1, 16 str r1, [sp, 0x8] - ldr r5, _0808DFD8 + ldr r5, =0x02037318 ldr r0, [r5, 0x4] cmp r0, 0 beq _0808E078 - ldr r0, _0808DFDC + ldr r0, =0x03005d8c ldr r2, [r0] ldrh r1, [r2] subs r0, r1, 0x2 @@ -288246,8 +278072,7 @@ npc_culling_maybe: @ 808DF80 lsrs r6, r0, 24 b _0808DFF0 .align 2, 0 -_0808DFD8: .4byte 0x02037318 -_0808DFDC: .4byte 0x03005d8c + .pool _0808DFE0: bl sub_81D6074 cmp r0, 0 @@ -288275,7 +278100,7 @@ _0808E004: movs r2, 0xC7 lsls r2, 4 adds r0, r2 - ldr r3, _0808E088 + ldr r3, =0x03005d8c ldr r1, [r3] adds r4, r1, r0 ldrh r0, [r4, 0x4] @@ -288307,7 +278132,7 @@ _0808E004: lsls r0, 24 cmp r0, 0 bne _0808E06E - ldr r3, _0808E088 + ldr r3, =0x03005d8c ldr r0, [r3] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -288336,14 +278161,14 @@ _0808E078: pop {r0} bx r0 .align 2, 0 -_0808E088: .4byte 0x03005d8c + .pool thumb_func_end npc_culling_maybe thumb_func_start sub_808E08C sub_808E08C: @ 808E08C push {r4-r6,lr} movs r3, 0 - ldr r6, _0808E0E0 + ldr r6, =0x02032308 _0808E092: movs r2, 0 movs r4, 0 @@ -288369,10 +278194,10 @@ _0808E0AA: lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r1, _0808E0E4 + ldr r1, =0x02037350 adds r2, r0, r1 ldr r0, [r2] - ldr r1, _0808E0E8 + ldr r1, =0x00010001 ands r0, r1 cmp r0, 0x1 bne _0808E0D2 @@ -288387,16 +278212,14 @@ _0808E0D2: pop {r0} bx r0 .align 2, 0 -_0808E0E0: .4byte 0x02032308 -_0808E0E4: .4byte 0x02037350 -_0808E0E8: .4byte 0x00010001 + .pool thumb_func_end sub_808E08C thumb_func_start sub_808E0EC sub_808E0EC: @ 808E0EC push {r4-r7,lr} adds r3, r0, 0 - ldr r0, _0808E168 + ldr r0, =0x03005d8c ldr r2, [r0] ldrh r0, [r2] subs r1, r0, 0x2 @@ -288458,7 +278281,7 @@ _0808E160: pop {r0} bx r0 .align 2, 0 -_0808E168: .4byte 0x03005d8c + .pool thumb_func_end sub_808E0EC thumb_func_start sub_808E16C @@ -288472,7 +278295,7 @@ sub_808E16C: @ 808E16C lsrs r5, 16 bl walkrun_state_clear movs r6, 0 - ldr r7, _0808E1B4 + ldr r7, =0x02037350 lsls r4, 16 lsls r5, 16 _0808E186: @@ -288499,7 +278322,7 @@ _0808E1A0: pop {r0} bx r0 .align 2, 0 -_0808E1B4: .4byte 0x02037350 + .pool thumb_func_end sub_808E16C thumb_func_start sub_808E1B8 @@ -288520,7 +278343,7 @@ sub_808E1B8: @ 808E1B8 lsrs r2, 16 str r2, [sp, 0x24] movs r7, 0 - ldr r2, _0808E248 + ldr r2, =0x02032308 _0808E1DA: lsls r0, r7, 2 adds r1, r0, r2 @@ -288541,7 +278364,7 @@ _0808E1EC: lsls r0, r1, 3 add r0, r9 lsls r0, 2 - ldr r1, _0808E24C + ldr r1, =0x02037350 adds r6, r0, r1 movs r0, 0 str r0, [sp, 0x20] @@ -288549,7 +278372,7 @@ _0808E1EC: bl npc_get_type adds r5, r0, 0 ldrh r2, [r5, 0x6] - ldr r1, _0808E250 + ldr r1, =0xffff0000 add r4, sp, 0x18 ldr r0, [r4, 0x4] ands r0, r1 @@ -288562,7 +278385,7 @@ _0808E1EC: bl npc_to_objtemplate__with_indexed_objfunc str r4, [sp, 0xC] mov r1, sp - ldr r2, _0808E254 + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1, 0x2] ldrb r0, [r5, 0xC] @@ -288576,10 +278399,7 @@ _0808E1EC: bl npc_load_two_palettes__no_record b _0808E27E .align 2, 0 -_0808E248: .4byte 0x02032308 -_0808E24C: .4byte 0x02037350 -_0808E250: .4byte 0xffff0000 -_0808E254: .4byte 0x0000ffff + .pool _0808E258: mov r2, r8 cmp r2, 0xA @@ -288601,7 +278421,7 @@ _0808E268: bl sub_808EAB0 _0808E27E: mov r1, sp - ldr r2, _0808E384 + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1, 0x2] mov r0, sp @@ -288616,7 +278436,7 @@ _0808E27E: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _0808E388 + ldr r1, =0x02020630 adds r4, r0, r1 mov r1, r10 lsls r0, r1, 16 @@ -288727,8 +278547,7 @@ _0808E374: pop {r0} bx r0 .align 2, 0 -_0808E384: .4byte 0x0000ffff -_0808E388: .4byte 0x02020630 + .pool thumb_func_end sub_808E1B8 thumb_func_start sub_808E38C @@ -288767,10 +278586,10 @@ sub_808E3C4: @ 808E3C4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0808E3F0 + ldr r5, =0x02037590 strb r0, [r5, 0x5] strb r1, [r5, 0x4] - ldr r1, _0808E3F4 + ldr r1, =0x02037350 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 @@ -288785,8 +278604,7 @@ sub_808E3C4: @ 808E3C4 pop {r0} bx r0 .align 2, 0 -_0808E3F0: .4byte 0x02037590 -_0808E3F4: .4byte 0x02037350 + .pool thumb_func_end sub_808E3C4 thumb_func_start sub_808E3F8 @@ -288805,7 +278623,7 @@ sub_808E3F8: @ 808E3F8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808E430 + ldr r1, =0x02020630 adds r4, r0, r1 ldrb r0, [r6, 0xC] lsls r1, r0, 28 @@ -288817,7 +278635,7 @@ sub_808E3F8: @ 808E3F8 bl pal_patch_for_npc b _0808E456 .align 2, 0 -_0808E430: .4byte 0x02020630 + .pool _0808E434: cmp r5, 0xA bne _0808E442 @@ -288945,7 +278763,7 @@ sub_808E504: @ 808E504 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808E540 + ldr r1, =0x02037350 adds r0, r1 adds r1, r4, 0 bl sub_808E3F8 @@ -288955,7 +278773,7 @@ _0808E538: pop {r0} bx r0 .align 2, 0 -_0808E540: .4byte 0x02037350 + .pool thumb_func_end sub_808E504 thumb_func_start npc_turn @@ -288973,7 +278791,7 @@ npc_turn: @ 808E544 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r5, _0808E590 + ldr r5, =0x02020630 adds r4, r5 ldrb r0, [r6, 0x18] lsls r0, 28 @@ -288996,7 +278814,7 @@ _0808E58A: pop {r0} bx r0 .align 2, 0 -_0808E590: .4byte 0x02020630 + .pool thumb_func_end npc_turn thumb_func_start npc_turn_by_local_id_and_map @@ -289021,7 +278839,7 @@ npc_turn_by_local_id_and_map: @ 808E594 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808E5D0 + ldr r1, =0x02037350 adds r0, r1 adds r1, r4, 0 bl npc_turn @@ -289031,7 +278849,7 @@ _0808E5C8: pop {r0} bx r0 .align 2, 0 -_0808E5D0: .4byte 0x02037350 + .pool thumb_func_end npc_turn_by_local_id_and_map thumb_func_start sub_808E5D4 @@ -289043,13 +278861,13 @@ sub_808E5D4: @ 808E5D4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0808E5F0 + ldr r2, =0x02037350 adds r0, r2 bl npc_turn pop {r0} bx r0 .align 2, 0 -_0808E5F0: .4byte 0x02037350 + .pool thumb_func_end sub_808E5D4 thumb_func_start sub_808E5F4 @@ -289095,7 +278913,7 @@ sub_808E5F4: @ 808E5F4 bls _0808E648 movs r4, 0 _0808E648: - ldr r0, _0808E688 + ldr r0, =0x0850c908 lsls r4, 2 adds r0, r4, r0 ldr r0, [r0] @@ -289103,11 +278921,11 @@ _0808E648: ldrb r1, [r0] adds r0, r5, 0 bl sub_808E3F8 - ldr r0, _0808E68C + ldr r0, =0x0850c7b0 adds r0, r4, r0 ldr r0, [r0] str r0, [r7, 0xC] - ldr r0, _0808E690 + ldr r0, =0x0850c85c adds r4, r0 ldr r0, [r4] adds r0, r6 @@ -289126,9 +278944,7 @@ _0808E680: pop {r0} bx r0 .align 2, 0 -_0808E688: .4byte 0x0850c908 -_0808E68C: .4byte 0x0850c7b0 -_0808E690: .4byte 0x0850c85c + .pool thumb_func_end sub_808E5F4 thumb_func_start npc_get_type @@ -289149,19 +278965,19 @@ _0808E6AC: bne _0808E6C4 bl sub_81201C8 lsls r0, 24 - ldr r1, _0808E6C0 + ldr r1, =0x085059dc lsrs r0, 22 adds r0, r1 ldr r0, [r0] b _0808E6D2 .align 2, 0 -_0808E6C0: .4byte 0x085059dc + .pool _0808E6C4: cmp r1, 0xEE bls _0808E6CA movs r1, 0x5 _0808E6CA: - ldr r0, _0808E6D8 + ldr r0, =0x08505620 lsls r1, 2 adds r1, r0 ldr r0, [r1] @@ -289169,7 +278985,7 @@ _0808E6D2: pop {r1} bx r1 .align 2, 0 -_0808E6D8: .4byte 0x08505620 + .pool thumb_func_end npc_get_type thumb_func_start sub_808E6DC @@ -289207,7 +279023,7 @@ npc_by_local_id_and_map_set_field_1_bit_x20: @ 808E6F8 lsls r0, 24 cmp r0, 0 bne _0808E73A - ldr r2, _0808E744 + ldr r2, =0x02037350 mov r0, sp ldrb r0, [r0] lsls r1, r0, 3 @@ -289230,7 +279046,7 @@ _0808E73A: pop {r0} bx r0 .align 2, 0 -_0808E744: .4byte 0x02037350 + .pool thumb_func_end npc_by_local_id_and_map_set_field_1_bit_x20 thumb_func_start npc_get_local_id_and_mapnumbers @@ -289262,7 +279078,7 @@ sub_808E75C: @ 808E75C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808E788 + ldr r1, =0x02037350 adds r0, r1 ldrb r1, [r0] movs r2, 0x4 @@ -289272,7 +279088,7 @@ _0808E784: pop {r0} bx r0 .align 2, 0 -_0808E788: .4byte 0x02037350 + .pool thumb_func_end sub_808E75C thumb_func_start sub_808E78C @@ -289297,13 +279113,13 @@ sub_808E78C: @ 808E78C lsls r2, r0, 3 adds r2, r0 lsls r2, 2 - ldr r0, _0808E7DC + ldr r0, =0x02037350 adds r2, r0 ldrb r1, [r2, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808E7E0 + ldr r1, =0x02020630 adds r0, r1 ldrb r1, [r2, 0x3] movs r3, 0x4 @@ -289317,8 +279133,7 @@ _0808E7D2: pop {r0} bx r0 .align 2, 0 -_0808E7DC: .4byte 0x02037350 -_0808E7E0: .4byte 0x02020630 + .pool thumb_func_end sub_808E78C thumb_func_start sub_808E7E4 @@ -289341,7 +279156,7 @@ sub_808E7E4: @ 808E7E4 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0808E828 + ldr r0, =0x02037350 adds r1, r0 ldrb r2, [r1, 0x3] movs r0, 0x5 @@ -289357,7 +279172,7 @@ _0808E820: pop {r0} bx r0 .align 2, 0 -_0808E828: .4byte 0x02037350 + .pool thumb_func_end sub_808E7E4 thumb_func_start sub_808E82C @@ -289380,7 +279195,7 @@ sub_808E82C: @ 808E82C lsls r0, 24 cmp r0, 0 bne _0808E870 - ldr r2, _0808E878 + ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -289391,7 +279206,7 @@ sub_808E82C: @ 808E82C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808E87C + ldr r1, =0x02020630 adds r0, r1 strh r5, [r0, 0x24] strh r4, [r0, 0x26] @@ -289401,21 +279216,20 @@ _0808E870: pop {r0} bx r0 .align 2, 0 -_0808E878: .4byte 0x02037350 -_0808E87C: .4byte 0x02020630 + .pool thumb_func_end sub_808E82C thumb_func_start gpu_pal_allocator_reset__manage_upper_four gpu_pal_allocator_reset__manage_upper_four: @ 808E880 push {lr} bl gpu_pal_allocator_reset - ldr r1, _0808E890 + ldr r1, =0x0300301c movs r0, 0xC strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_0808E890: .4byte 0x0300301c + .pool thumb_func_end gpu_pal_allocator_reset__manage_upper_four thumb_func_start sub_808E894 @@ -289426,19 +279240,18 @@ sub_808E894: @ 808E894 bl npc_pal_idx_for_given_tag lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0808E8B8 + ldr r0, =0x000011ff cmp r1, r0 beq _0808E8B2 lsls r0, r1, 3 - ldr r1, _0808E8BC + ldr r1, =0x0850bbc8 adds r0, r1 bl sub_808E8F4 _0808E8B2: pop {r0} bx r0 .align 2, 0 -_0808E8B8: .4byte 0x000011ff -_0808E8BC: .4byte 0x0850bbc8 + .pool thumb_func_end sub_808E894 thumb_func_start sub_808E8C0 @@ -289447,7 +279260,7 @@ sub_808E8C0: @ 808E8C0 adds r5, r0, 0 movs r4, 0 ldrh r0, [r5] - ldr r1, _0808E8F0 + ldr r1, =0x000011ff cmp r0, r1 beq _0808E8EA adds r6, r1, 0 @@ -289469,7 +279282,7 @@ _0808E8EA: pop {r0} bx r0 .align 2, 0 -_0808E8F0: .4byte 0x000011ff + .pool thumb_func_end sub_808E8C0 thumb_func_start sub_808E8F4 @@ -289505,7 +279318,7 @@ pal_patch_for_npc: @ 808E91C lsrs r4, 24 bl npc_pal_idx_for_given_tag lsls r0, 24 - ldr r1, _0808E950 + ldr r1, =0x0850bbc8 lsrs r0, 21 adds r0, r1 ldr r0, [r0] @@ -289521,7 +279334,7 @@ pal_patch_for_npc: @ 808E91C pop {r0} bx r0 .align 2, 0 -_0808E950: .4byte 0x0850bbc8 + .pool thumb_func_end pal_patch_for_npc thumb_func_start pal_patch_for_npc_range @@ -289556,9 +279369,9 @@ npc_pal_idx_for_given_tag: @ 808E980 lsls r0, 16 lsrs r5, r0, 16 movs r2, 0 - ldr r0, _0808E9A8 + ldr r0, =0x0850bbc8 ldrh r1, [r0, 0x4] - ldr r3, _0808E9AC + ldr r3, =0x000011ff adds r4, r0, 0 cmp r1, r3 beq _0808E9C0 @@ -289573,8 +279386,7 @@ _0808E998: adds r0, r2, 0 b _0808E9C2 .align 2, 0 -_0808E9A8: .4byte 0x0850bbc8 -_0808E9AC: .4byte 0x000011ff + .pool _0808E9B0: adds r0, r2, 0x1 lsls r0, 24 @@ -289603,12 +279415,12 @@ npc_load_two_palettes__no_record: @ 808E9C8 adds r1, r5, 0 bl pal_patch_for_npc movs r3, 0 - ldr r1, _0808EA10 + ldr r1, =0x0850bd00 ldrh r0, [r1] - ldr r2, _0808EA14 + ldr r2, =0x000011ff cmp r0, r2 beq _0808EA30 - ldr r0, _0808EA18 + ldr r0, =0x084975c4 adds r5, r0 adds r6, r2, 0 _0808E9EC: @@ -289619,7 +279431,7 @@ _0808E9EC: bne _0808EA20 adds r1, 0x4 adds r1, r2, r1 - ldr r0, _0808EA1C + ldr r0, =0x020375b4 ldrb r0, [r0] ldr r1, [r1] lsls r0, 1 @@ -289629,10 +279441,7 @@ _0808E9EC: bl pal_patch_for_npc b _0808EA30 .align 2, 0 -_0808EA10: .4byte 0x0850bd00 -_0808EA14: .4byte 0x000011ff -_0808EA18: .4byte 0x084975c4 -_0808EA1C: .4byte 0x020375b4 + .pool _0808EA20: adds r0, r3, 0x1 lsls r0, 24 @@ -289655,18 +279464,18 @@ npc_load_two_palettes__and_record: @ 808EA38 lsrs r4, r0, 16 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _0808EA84 + ldr r0, =0x020375b6 strh r4, [r0] adds r0, r4, 0 adds r1, r5, 0 bl pal_patch_for_npc movs r3, 0 - ldr r1, _0808EA88 + ldr r1, =0x0850bd78 ldrh r0, [r1] - ldr r2, _0808EA8C + ldr r2, =0x000011ff cmp r0, r2 beq _0808EAA8 - ldr r0, _0808EA90 + ldr r0, =0x084975c4 adds r5, r0 adds r6, r2, 0 _0808EA60: @@ -289677,7 +279486,7 @@ _0808EA60: bne _0808EA98 adds r1, 0x4 adds r1, r2, r1 - ldr r0, _0808EA94 + ldr r0, =0x020375b4 ldrb r0, [r0] ldr r1, [r1] lsls r0, 1 @@ -289687,11 +279496,7 @@ _0808EA60: bl pal_patch_for_npc b _0808EAA8 .align 2, 0 -_0808EA84: .4byte 0x020375b6 -_0808EA88: .4byte 0x0850bd78 -_0808EA8C: .4byte 0x000011ff -_0808EA90: .4byte 0x084975c4 -_0808EA94: .4byte 0x020375b4 + .pool _0808EA98: adds r0, r3, 0x1 lsls r0, 24 @@ -289779,7 +279584,7 @@ sub_808EB08: @ 808EB08 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808EBA4 + ldr r1, =0x02020630 adds r7, r0, r1 ldrb r0, [r6, 0x5] bl npc_get_type @@ -289840,7 +279645,7 @@ _0808EB9A: pop {r0} bx r0 .align 2, 0 -_0808EBA4: .4byte 0x02020630 + .pool thumb_func_end sub_808EB08 thumb_func_start sub_808EBA8 @@ -289870,7 +279675,7 @@ sub_808EBA8: @ 808EBA8 lsls r0, r3, 3 adds r0, r3 lsls r0, 2 - ldr r3, _0808EBF8 + ldr r3, =0x02037350 adds r0, r3 movs r3, 0xE0 lsls r3, 11 @@ -289885,7 +279690,7 @@ _0808EBF0: pop {r0} bx r0 .align 2, 0 -_0808EBF8: .4byte 0x02037350 + .pool thumb_func_end sub_808EBA8 thumb_func_start npc_coords_shift_still @@ -289903,14 +279708,14 @@ npc_coords_shift_still: @ 808EBFC thumb_func_start npcs_rebase npcs_rebase: @ 808EC10 push {r4,r5,lr} - ldr r2, _0808EC70 + ldr r2, =0x02037334 ldrb r1, [r2] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _0808EC68 movs r3, 0 - ldr r5, _0808EC74 + ldr r5, =0x02037350 movs r0, 0x4 ldrsh r4, [r2, r0] movs r0, 0x8 @@ -289953,8 +279758,7 @@ _0808EC68: pop {r0} bx r0 .align 2, 0 -_0808EC70: .4byte 0x02037334 -_0808EC74: .4byte 0x02037350 + .pool thumb_func_end npcs_rebase thumb_func_start npc_id_by_pos_and_height @@ -289969,7 +279773,7 @@ npc_id_by_pos_and_height: @ 808EC78 lsls r2, 24 lsrs r5, r2, 24 movs r4, 0 - ldr r0, _0808ECC4 + ldr r0, =0x02037350 mov r8, r0 _0808EC90: lsls r0, r4, 3 @@ -289998,7 +279802,7 @@ _0808EC90: adds r0, r4, 0 b _0808ECD4 .align 2, 0 -_0808ECC4: .4byte 0x02037350 + .pool _0808ECC8: adds r0, r4, 0x1 lsls r0, 24 @@ -290068,14 +279872,14 @@ sub_808ED34: @ 808ED34 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0808ED70 + ldr r0, =0x084975d4 movs r1, 0 movs r2, 0 movs r3, 0x4 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _0808ED74 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -290093,8 +279897,7 @@ sub_808ED34: @ 808ED34 pop {r1} bx r1 .align 2, 0 -_0808ED70: .4byte 0x084975d4 -_0808ED74: .4byte 0x02020630 + .pool thumb_func_end sub_808ED34 thumb_func_start oac_0805F994 @@ -290102,7 +279905,7 @@ oac_0805F994: @ 808ED78 push {r4,r5,lr} sub sp, 0xC mov r2, sp - ldr r1, _0808ED9C + ldr r1, =0x084975ec ldm r1!, {r3-r5} stm r2!, {r3-r5} movs r2, 0x30 @@ -290116,13 +279919,13 @@ oac_0805F994: @ 808ED78 pop {r0} bx r0 .align 2, 0 -_0808ED9C: .4byte 0x084975ec + .pool thumb_func_end oac_0805F994 thumb_func_start sub_808EDA0 sub_808EDA0: @ 808EDA0 push {lr} - ldr r3, _0808EDD8 + ldr r3, =0x02020630 movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -290149,13 +279952,13 @@ sub_808EDA0: @ 808EDA0 pop {r0} bx r0 .align 2, 0 -_0808EDD8: .4byte 0x02020630 + .pool thumb_func_end sub_808EDA0 thumb_func_start sub_808EDDC sub_808EDDC: @ 808EDDC push {r4,r5,lr} - ldr r3, _0808EE10 + ldr r3, =0x02020630 movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -290180,13 +279983,13 @@ sub_808EDDC: @ 808EDDC pop {r0} bx r0 .align 2, 0 -_0808EE10: .4byte 0x02020630 + .pool thumb_func_end sub_808EDDC thumb_func_start sub_808EE14 sub_808EE14: @ 808EE14 push {r4,lr} - ldr r4, _0808EE40 + ldr r4, =0x02020630 movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -290208,14 +280011,14 @@ sub_808EE14: @ 808EE14 pop {r0} bx r0 .align 2, 0 -_0808EE40: .4byte 0x02020630 + .pool thumb_func_end sub_808EE14 thumb_func_start find_obj_using_oac_0805F994 find_obj_using_oac_0805F994: @ 808EE44 push {r4,r5,lr} movs r3, 0 - ldr r4, _0808EE70 + ldr r4, =0x02020630 adds r5, r4, 0 adds r5, 0x1C _0808EE4E: @@ -290231,14 +280034,13 @@ _0808EE4E: beq _0808EE78 adds r0, r1, r5 ldr r1, [r0] - ldr r0, _0808EE74 + ldr r0, =oac_0805F994 + 1 cmp r1, r0 bne _0808EE78 adds r0, r2, 0 b _0808EE84 .align 2, 0 -_0808EE70: .4byte 0x02020630 -_0808EE74: .4byte oac_0805F994 + 1 + .pool _0808EE78: adds r0, r3, 0x1 lsls r0, 24 @@ -290326,7 +280128,7 @@ sub_808EEEC: @ 808EEEC lsls r3, 24 lsrs r7, r3, 24 movs r5, 0 - ldr r1, _0808EF34 + ldr r1, =0x02020630 _0808EF06: lsls r0, r5, 4 adds r0, r5 @@ -290350,7 +280152,7 @@ _0808EF06: strb r7, [r0] b _0808EF42 .align 2, 0 -_0808EF34: .4byte 0x02020630 + .pool _0808EF38: adds r0, r5, 0x1 lsls r0, 24 @@ -290380,7 +280182,7 @@ obj_unfreeze: @ 808EF50 lsls r3, 24 lsrs r7, r3, 24 movs r5, 0x3F - ldr r3, _0808EFA4 + ldr r3, =0x02020630 movs r2, 0x1 negs r2, r2 _0808EF6E: @@ -290410,7 +280212,7 @@ _0808EF6E: lsrs r0, 24 b _0808EFB6 .align 2, 0 -_0808EFA4: .4byte 0x02020630 + .pool _0808EFA8: subs r0, r1, 0x1 lsls r0, 16 @@ -290485,7 +280287,7 @@ npc_get_script_by_npc_id: @ 808F01C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0808F03C + ldr r1, =0x02037350 lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -290497,7 +280299,7 @@ npc_get_script_by_npc_id: @ 808F01C pop {r1} bx r1 .align 2, 0 -_0808F03C: .4byte 0x02037350 + .pool thumb_func_end npc_get_script_by_npc_id thumb_func_start rom_npc_id_in_script_by_local_id_and_map @@ -290520,7 +280322,7 @@ rom_npc_id_in_script_by_npc_id: @ 808F058 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0808F07C + ldr r1, =0x02037350 lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -290534,7 +280336,7 @@ rom_npc_id_in_script_by_npc_id: @ 808F058 pop {r1} bx r1 .align 2, 0 -_0808F07C: .4byte 0x02037350 + .pool thumb_func_end rom_npc_id_in_script_by_npc_id thumb_func_start sub_808F080 @@ -290552,7 +280354,7 @@ sub_808F080: @ 808F080 lsls r0, 24 cmp r0, 0 bne _0808F0B4 - ldr r2, _0808F0B0 + ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -290562,7 +280364,7 @@ sub_808F080: @ 808F080 ldrb r0, [r0, 0x7] b _0808F0B6 .align 2, 0 -_0808F0B0: .4byte 0x02037350 + .pool _0808F0B4: movs r0, 0xFF _0808F0B6: @@ -290575,7 +280377,7 @@ _0808F0B6: sub_808F0BC: @ 808F0BC lsls r0, 24 lsrs r0, 24 - ldr r2, _0808F0D0 + ldr r2, =0x02037350 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -290583,7 +280385,7 @@ sub_808F0BC: @ 808F0BC ldrb r0, [r1, 0x7] bx lr .align 2, 0 -_0808F0D0: .4byte 0x02037350 + .pool thumb_func_end sub_808F0BC thumb_func_start sub_808F0D4 @@ -290601,7 +280403,7 @@ sub_808F0D4: @ 808F0D4 lsls r0, 24 cmp r0, 0 bne _0808F108 - ldr r2, _0808F104 + ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -290611,7 +280413,7 @@ sub_808F0D4: @ 808F0D4 ldrb r0, [r0, 0x1D] b _0808F10A .align 2, 0 -_0808F104: .4byte 0x02037350 + .pool _0808F108: movs r0, 0xFF _0808F10A: @@ -290624,7 +280426,7 @@ _0808F10A: sub_808F110: @ 808F110 lsls r0, 24 lsrs r0, 24 - ldr r2, _0808F124 + ldr r2, =0x02037350 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -290632,7 +280434,7 @@ sub_808F110: @ 808F110 ldrb r0, [r1, 0x1D] bx lr .align 2, 0 -_0808F124: .4byte 0x02037350 + .pool thumb_func_end sub_808F110 thumb_func_start rom_npc_by_local_id_and_map @@ -290644,7 +280446,7 @@ rom_npc_by_local_id_and_map: @ 808F128 lsrs r3, r1, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, _0808F158 + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x5 ldrsb r0, [r1, r0] @@ -290657,12 +280459,11 @@ rom_npc_by_local_id_and_map: @ 808F128 movs r0, 0xC7 lsls r0, 4 adds r1, r0 - ldr r0, _0808F15C + ldr r0, =0x02037318 ldr r0, [r0, 0x4] b _0808F16C .align 2, 0 -_0808F158: .4byte 0x03005d8c -_0808F15C: .4byte 0x02037318 + .pool _0808F160: adds r0, r2, 0 adds r1, r3, 0 @@ -290718,7 +280519,7 @@ sub_808F1B4: @ 808F1B4 push {r4,r5,lr} adds r3, r0, 0 ldrb r0, [r3, 0x9] - ldr r1, _0808F1D4 + ldr r1, =0x03005d8c ldr r2, [r1] movs r1, 0x5 ldrsb r1, [r2, r1] @@ -290731,7 +280532,7 @@ sub_808F1B4: @ 808F1B4 beq _0808F1E2 b _0808F200 .align 2, 0 -_0808F1D4: .4byte 0x03005d8c + .pool _0808F1D8: movs r1, 0xC7 lsls r1, 4 @@ -290832,7 +280633,7 @@ sub_808F254: @ 808F254 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808F288 + ldr r1, =0x02037350 adds r0, r1 bl sub_808F208 _0808F282: @@ -290840,7 +280641,7 @@ _0808F282: pop {r0} bx r0 .align 2, 0 -_0808F288: .4byte 0x02037350 + .pool thumb_func_end sub_808F254 thumb_func_start sub_808F28C @@ -290871,23 +280672,22 @@ _0808F2B6: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808F2CC + ldr r1, =0x02037350 adds r0, r1 - ldr r1, _0808F2D0 + ldr r1, =0x082766a2 bl sub_808F228 b _0808F2E8 .align 2, 0 -_0808F2CC: .4byte 0x02037350 -_0808F2D0: .4byte 0x082766a2 + .pool _0808F2D4: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808F2F0 + ldr r1, =0x02037350 adds r0, r1 - ldr r1, _0808F2F4 + ldr r1, =0x082766a6 bl sub_808F228 _0808F2E8: add sp, 0x4 @@ -290895,8 +280695,7 @@ _0808F2E8: pop {r0} bx r0 .align 2, 0 -_0808F2F0: .4byte 0x02037350 -_0808F2F4: .4byte 0x082766a6 + .pool thumb_func_end sub_808F28C thumb_func_start npc_paltag_set_load @@ -290906,15 +280705,15 @@ npc_paltag_set_load: @ 808F2F8 lsls r4, 24 lsrs r4, 24 bl gpu_pal_allocator_reset__manage_upper_four - ldr r1, _0808F330 - ldr r2, _0808F334 + ldr r1, =0x020375b6 + ldr r2, =0x000011ff adds r0, r2, 0 strh r0, [r1] - ldr r2, _0808F338 + ldr r2, =0x020375b4 strb r4, [r2] cmp r4, 0x1 bne _0808F344 - ldr r1, _0808F33C + ldr r1, =0x0850be38 ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -290922,18 +280721,14 @@ npc_paltag_set_load: @ 808F2F8 movs r1, 0 movs r2, 0x6 bl pal_patch_for_npc_range - ldr r1, _0808F340 + ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] b _0808F356 .align 2, 0 -_0808F330: .4byte 0x020375b6 -_0808F334: .4byte 0x000011ff -_0808F338: .4byte 0x020375b4 -_0808F33C: .4byte 0x0850be38 -_0808F340: .4byte 0x0300301c + .pool _0808F344: - ldr r0, _0808F35C + ldr r0, =0x0850be38 ldrb r1, [r2] lsls r1, 2 adds r1, r0 @@ -290946,7 +280741,7 @@ _0808F356: pop {r0} bx r0 .align 2, 0 -_0808F35C: .4byte 0x0850be38 + .pool thumb_func_end npc_paltag_set_load thumb_func_start npc_paltag_by_palslot @@ -290956,8 +280751,8 @@ npc_paltag_by_palslot: @ 808F360 lsrs r2, r0, 24 cmp r2, 0x9 bhi _0808F39C - ldr r1, _0808F37C - ldr r0, _0808F380 + ldr r1, =0x0850be38 + ldr r0, =0x020375b4 ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -290965,12 +280760,11 @@ npc_paltag_by_palslot: @ 808F360 lsls r0, r2, 1 b _0808F390 .align 2, 0 -_0808F37C: .4byte 0x0850be38 -_0808F380: .4byte 0x020375b4 + .pool _0808F384: adds r1, r4, 0x4 adds r1, r2, r1 - ldr r0, _0808F398 + ldr r0, =0x020375b4 ldrb r0, [r0] ldr r1, [r1] lsls r0, 1 @@ -290979,17 +280773,17 @@ _0808F390: ldrh r0, [r0] b _0808F3CE .align 2, 0 -_0808F398: .4byte 0x020375b4 + .pool _0808F39C: movs r3, 0 - ldr r0, _0808F3D4 + ldr r0, =0x0850bd78 ldrh r1, [r0] - ldr r2, _0808F3D8 + ldr r2, =0x000011ff adds r4, r0, 0 cmp r1, r2 beq _0808F3CC adds r6, r4, 0 - ldr r0, _0808F3DC + ldr r0, =0x020375b6 ldrh r1, [r0] adds r5, r2, 0 _0808F3B2: @@ -291007,15 +280801,13 @@ _0808F3B2: cmp r0, r5 bne _0808F3B2 _0808F3CC: - ldr r0, _0808F3D8 + ldr r0, =0x000011ff _0808F3CE: pop {r4-r6} pop {r1} bx r1 .align 2, 0 -_0808F3D4: .4byte 0x0850bd78 -_0808F3D8: .4byte 0x000011ff -_0808F3DC: .4byte 0x020375b6 + .pool thumb_func_end npc_paltag_by_palslot thumb_func_start sub_808F3E0 @@ -291027,15 +280819,14 @@ sub_808F3E0: @ 808F3E0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0808F3FC + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _0808F400 + ldr r2, =sub_808F404 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0808F3FC: .4byte 0x02037350 -_0808F400: .4byte sub_808F404 + 1 + .pool thumb_func_end sub_808F3E0 thumb_func_start sub_808F404 @@ -291053,21 +280844,20 @@ sub_808F408: @ 808F408 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0808F424 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _0808F428 + ldr r2, =sub_808F42C + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0808F424: .4byte 0x02037350 -_0808F428: .4byte sub_808F42C + 1 + .pool thumb_func_end sub_808F408 thumb_func_start sub_808F42C sub_808F42C: @ 808F42C push {r4,lr} - ldr r3, _0808F448 + ldr r3, =0x0850d6f4 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -291080,7 +280870,7 @@ sub_808F42C: @ 808F42C pop {r1} bx r1 .align 2, 0 -_0808F448: .4byte 0x0850d6f4 + .pool thumb_func_end sub_808F42C thumb_func_start sub_808F44C @@ -291126,7 +280916,7 @@ sub_808F48C: @ 808F48C lsls r0, 24 cmp r0, 0 beq _0808F4C0 - ldr r5, _0808F4BC + ldr r5, =0x0850d6dc bl GenerateRandomNumber movs r4, 0x3 adds r1, r4, 0 @@ -291141,7 +280931,7 @@ sub_808F48C: @ 808F48C movs r0, 0x1 b _0808F4C2 .align 2, 0 -_0808F4BC: .4byte 0x0850d6dc + .pool _0808F4C0: movs r0, 0 _0808F4C2: @@ -291177,7 +280967,7 @@ sub_808F4E8: @ 808F4E8 sub sp, 0x4 adds r5, r0, 0 adds r6, r1, 0 - ldr r1, _0808F530 + ldr r1, =0x0850d710 mov r0, sp movs r2, 0x4 bl memcpy @@ -291207,7 +280997,7 @@ _0808F526: pop {r1} bx r1 .align 2, 0 -_0808F530: .4byte 0x0850d710 + .pool thumb_func_end sub_808F4E8 thumb_func_start sub_808F534 @@ -291763,7 +281553,7 @@ _0808F908: lsls r0, 16 lsrs r3, r0, 16 _0808F916: - ldr r0, _0808F940 + ldr r0, =0x0850d714 lsls r4, r6, 2 adds r4, r0 mov r0, sp @@ -291785,7 +281575,7 @@ _0808F938: pop {r1} bx r1 .align 2, 0 -_0808F940: .4byte 0x0850d714 + .pool thumb_func_end sub_808F8BC thumb_func_start sub_808F944 @@ -291797,21 +281587,20 @@ sub_808F944: @ 808F944 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0808F960 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _0808F964 + ldr r2, =sub_808F968 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0808F960: .4byte 0x02037350 -_0808F964: .4byte sub_808F968 + 1 + .pool thumb_func_end sub_808F944 thumb_func_start sub_808F968 sub_808F968: @ 808F968 push {r4,lr} - ldr r3, _0808F984 + ldr r3, =0x0850d740 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -291824,7 +281613,7 @@ sub_808F968: @ 808F968 pop {r1} bx r1 .align 2, 0 -_0808F984: .4byte 0x0850d740 + .pool thumb_func_end sub_808F968 thumb_func_start sub_808F988 @@ -291871,7 +281660,7 @@ sub_808F9C8: @ 808F9C8 lsls r0, 24 cmp r0, 0 beq _0808F9FE - ldr r4, _0808FA08 + ldr r4, =0x0850d6dc bl GenerateRandomNumber movs r5, 0x3 adds r1, r5, 0 @@ -291894,7 +281683,7 @@ _0808F9FE: pop {r1} bx r1 .align 2, 0 -_0808FA08: .4byte 0x0850d6dc + .pool thumb_func_end sub_808F9C8 thumb_func_start sub_808FA0C @@ -291931,7 +281720,7 @@ sub_808FA3C: @ 808FA3C sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _0808FA80 + ldr r1, =0x0850d710 mov r0, sp movs r2, 0x4 bl memcpy @@ -291958,7 +281747,7 @@ _0808FA6C: pop {r1} bx r1 .align 2, 0 -_0808FA80: .4byte 0x0850d710 + .pool thumb_func_end sub_808FA3C thumb_func_start sub_808FA84 @@ -291970,21 +281759,20 @@ sub_808FA84: @ 808FA84 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0808FAA0 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _0808FAA4 + ldr r2, =sub_808FAA8 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0808FAA0: .4byte 0x02037350 -_0808FAA4: .4byte sub_808FAA8 + 1 + .pool thumb_func_end sub_808FA84 thumb_func_start sub_808FAA8 sub_808FAA8: @ 808FAA8 push {r4,lr} - ldr r3, _0808FAC4 + ldr r3, =0x0850d754 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -291997,7 +281785,7 @@ sub_808FAA8: @ 808FAA8 pop {r1} bx r1 .align 2, 0 -_0808FAC4: .4byte 0x0850d754 + .pool thumb_func_end sub_808FAA8 thumb_func_start sub_808FAC8 @@ -292043,7 +281831,7 @@ sub_808FB08: @ 808FB08 lsls r0, 24 cmp r0, 0 beq _0808FB3C - ldr r5, _0808FB38 + ldr r5, =0x0850d6dc bl GenerateRandomNumber movs r4, 0x3 adds r1, r4, 0 @@ -292058,7 +281846,7 @@ sub_808FB08: @ 808FB08 movs r0, 0x1 b _0808FB3E .align 2, 0 -_0808FB38: .4byte 0x0850d6dc + .pool _0808FB3C: movs r0, 0 _0808FB3E: @@ -292094,7 +281882,7 @@ sub_808FB64: @ 808FB64 sub sp, 0x4 adds r5, r0, 0 adds r6, r1, 0 - ldr r1, _0808FBAC + ldr r1, =0x0850d770 mov r0, sp movs r2, 0x2 bl memcpy @@ -292124,7 +281912,7 @@ _0808FBA2: pop {r1} bx r1 .align 2, 0 -_0808FBAC: .4byte 0x0850d770 + .pool thumb_func_end sub_808FB64 thumb_func_start sub_808FBB0 @@ -292185,21 +281973,20 @@ sub_808FC08: @ 808FC08 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0808FC24 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _0808FC28 + ldr r2, =sub_808FC2C + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0808FC24: .4byte 0x02037350 -_0808FC28: .4byte sub_808FC2C + 1 + .pool thumb_func_end sub_808FC08 thumb_func_start sub_808FC2C sub_808FC2C: @ 808FC2C push {r4,lr} - ldr r3, _0808FC48 + ldr r3, =0x0850d774 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -292212,7 +281999,7 @@ sub_808FC2C: @ 808FC2C pop {r1} bx r1 .align 2, 0 -_0808FC48: .4byte 0x0850d774 + .pool thumb_func_end sub_808FC2C thumb_func_start sub_808FC4C @@ -292258,7 +282045,7 @@ sub_808FC8C: @ 808FC8C lsls r0, 24 cmp r0, 0 beq _0808FCC0 - ldr r5, _0808FCBC + ldr r5, =0x0850d6dc bl GenerateRandomNumber movs r4, 0x3 adds r1, r4, 0 @@ -292273,7 +282060,7 @@ sub_808FC8C: @ 808FC8C movs r0, 0x1 b _0808FCC2 .align 2, 0 -_0808FCBC: .4byte 0x0850d6dc + .pool _0808FCC0: movs r0, 0 _0808FCC2: @@ -292309,7 +282096,7 @@ sub_808FCE8: @ 808FCE8 sub sp, 0x4 adds r5, r0, 0 adds r6, r1, 0 - ldr r1, _0808FD30 + ldr r1, =0x0850d790 mov r0, sp movs r2, 0x2 bl memcpy @@ -292339,7 +282126,7 @@ _0808FD26: pop {r1} bx r1 .align 2, 0 -_0808FD30: .4byte 0x0850d790 + .pool thumb_func_end sub_808FCE8 thumb_func_start sub_808FD34 @@ -292400,21 +282187,20 @@ sub_808FD8C: @ 808FD8C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0808FDA8 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _0808FDAC + ldr r2, =sub_808FDB0 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0808FDA8: .4byte 0x02037350 -_0808FDAC: .4byte sub_808FDB0 + 1 + .pool thumb_func_end sub_808FD8C thumb_func_start sub_808FDB0 sub_808FDB0: @ 808FDB0 push {r4,lr} - ldr r3, _0808FDCC + ldr r3, =0x0850d794 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -292427,7 +282213,7 @@ sub_808FDB0: @ 808FDB0 pop {r1} bx r1 .align 2, 0 -_0808FDCC: .4byte 0x0850d794 + .pool thumb_func_end sub_808FDB0 thumb_func_start sub_808FDD0 @@ -292493,7 +282279,7 @@ sub_808FE2C: @ 808FE2C lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0808FE68 + ldr r1, =0x02037350 adds r5, r0, r1 ldrh r1, [r4, 0x3C] movs r0, 0x1 @@ -292508,7 +282294,7 @@ sub_808FE2C: @ 808FE2C orrs r0, r1 strh r0, [r4, 0x3C] _0808FE58: - ldr r2, _0808FE6C + ldr r2, =sub_808FE70 + 1 adds r0, r5, 0 adds r1, r4, 0 bl meta_step @@ -292516,14 +282302,13 @@ _0808FE58: pop {r0} bx r0 .align 2, 0 -_0808FE68: .4byte 0x02037350 -_0808FE6C: .4byte sub_808FE70 + 1 + .pool thumb_func_end sub_808FE2C thumb_func_start sub_808FE70 sub_808FE70: @ 808FE70 push {r4,lr} - ldr r3, _0808FE8C + ldr r3, =0x0850d7a0 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -292536,7 +282321,7 @@ sub_808FE70: @ 808FE70 pop {r1} bx r1 .align 2, 0 -_0808FE8C: .4byte 0x0850d7a0 + .pool thumb_func_end sub_808FE70 thumb_func_start sub_808FE90 @@ -292570,7 +282355,7 @@ sub_808FE90: @ 808FE90 ldrb r0, [r6] cmp r0, 0x4 bne _0808FEF6 - ldr r1, _0808FEFC + ldr r1, =0x02038c08 movs r2, 0x10 ldrsh r0, [r4, r2] str r0, [r1] @@ -292593,7 +282378,7 @@ _0808FEF6: movs r0, 0 b _0808FF42 .align 2, 0 -_0808FEFC: .4byte 0x02038c08 + .pool _0808FF00: ldrb r1, [r4, 0x1] movs r0, 0x21 @@ -292668,7 +282453,7 @@ sub_808FF68: @ 808FF68 movs r2, 0x2 orrs r2, r3 strh r2, [r1, 0x3C] - ldr r3, _0808FFB0 + ldr r3, =0x02038c08 movs r4, 0x10 ldrsh r2, [r0, r4] str r2, [r3] @@ -292691,7 +282476,7 @@ sub_808FF68: @ 808FF68 pop {r1} bx r1 .align 2, 0 -_0808FFB0: .4byte 0x02038c08 + .pool thumb_func_end sub_808FF68 thumb_func_start sub_808FFB4 @@ -292791,21 +282576,20 @@ sub_8090050: @ 8090050 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0809006C + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08090070 + ldr r2, =sub_8090074 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0809006C: .4byte 0x02037350 -_08090070: .4byte sub_8090074 + 1 + .pool thumb_func_end sub_8090050 thumb_func_start sub_8090074 sub_8090074: @ 8090074 push {r4,lr} - ldr r3, _08090090 + ldr r3, =0x0850d7b4 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -292818,7 +282602,7 @@ sub_8090074: @ 8090074 pop {r1} bx r1 .align 2, 0 -_08090090: .4byte 0x0850d7b4 + .pool thumb_func_end sub_8090074 thumb_func_start sub_8090094 @@ -292865,7 +282649,7 @@ sub_80900D4: @ 80900D4 lsls r0, 24 cmp r0, 0 beq _0809010A - ldr r4, _08090114 + ldr r4, =0x0850d6dc bl GenerateRandomNumber movs r5, 0x3 adds r1, r5, 0 @@ -292888,7 +282672,7 @@ _0809010A: pop {r1} bx r1 .align 2, 0 -_08090114: .4byte 0x0850d6dc + .pool thumb_func_end sub_80900D4 thumb_func_start sub_8090118 @@ -292925,7 +282709,7 @@ sub_8090148: @ 8090148 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _0809018C + ldr r1, =0x0850d770 mov r0, sp movs r2, 0x2 bl memcpy @@ -292952,7 +282736,7 @@ _08090178: pop {r1} bx r1 .align 2, 0 -_0809018C: .4byte 0x0850d770 + .pool thumb_func_end sub_8090148 thumb_func_start sub_8090190 @@ -292964,21 +282748,20 @@ sub_8090190: @ 8090190 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080901AC + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080901B0 + ldr r2, =sub_80901B4 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080901AC: .4byte 0x02037350 -_080901B0: .4byte sub_80901B4 + 1 + .pool thumb_func_end sub_8090190 thumb_func_start sub_80901B4 sub_80901B4: @ 80901B4 push {r4,lr} - ldr r3, _080901D0 + ldr r3, =0x0850d7c8 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -292991,7 +282774,7 @@ sub_80901B4: @ 80901B4 pop {r1} bx r1 .align 2, 0 -_080901D0: .4byte 0x0850d7c8 + .pool thumb_func_end sub_80901B4 thumb_func_start sub_80901D4 @@ -293038,7 +282821,7 @@ sub_8090214: @ 8090214 lsls r0, 24 cmp r0, 0 beq _0809024A - ldr r4, _08090254 + ldr r4, =0x0850d6dc bl GenerateRandomNumber movs r5, 0x3 adds r1, r5, 0 @@ -293061,7 +282844,7 @@ _0809024A: pop {r1} bx r1 .align 2, 0 -_08090254: .4byte 0x0850d6dc + .pool thumb_func_end sub_8090214 thumb_func_start sub_8090258 @@ -293098,7 +282881,7 @@ sub_8090288: @ 8090288 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _080902CC + ldr r1, =0x0850d790 mov r0, sp movs r2, 0x2 bl memcpy @@ -293125,7 +282908,7 @@ _080902B8: pop {r1} bx r1 .align 2, 0 -_080902CC: .4byte 0x0850d790 + .pool thumb_func_end sub_8090288 thumb_func_start sub_80902D0 @@ -293137,21 +282920,20 @@ sub_80902D0: @ 80902D0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080902EC + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080902F0 + ldr r2, =sub_80902F4 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080902EC: .4byte 0x02037350 -_080902F0: .4byte sub_80902F4 + 1 + .pool thumb_func_end sub_80902D0 thumb_func_start sub_80902F4 sub_80902F4: @ 80902F4 push {r4,lr} - ldr r3, _08090310 + ldr r3, =0x0850d7dc movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -293164,7 +282946,7 @@ sub_80902F4: @ 80902F4 pop {r1} bx r1 .align 2, 0 -_08090310: .4byte 0x0850d7dc + .pool thumb_func_end sub_80902F4 thumb_func_start sub_8090314 @@ -293211,7 +282993,7 @@ sub_8090354: @ 8090354 lsls r0, 24 cmp r0, 0 beq _0809038A - ldr r4, _08090394 + ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 adds r1, r5, 0 @@ -293234,7 +283016,7 @@ _0809038A: pop {r1} bx r1 .align 2, 0 -_08090394: .4byte 0x0850d6ec + .pool thumb_func_end sub_8090354 thumb_func_start sub_8090398 @@ -293271,7 +283053,7 @@ sub_80903C8: @ 80903C8 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _0809040C + ldr r1, =0x0850d7f0 mov r0, sp movs r2, 0x2 bl memcpy @@ -293298,7 +283080,7 @@ _080903F8: pop {r1} bx r1 .align 2, 0 -_0809040C: .4byte 0x0850d7f0 + .pool thumb_func_end sub_80903C8 thumb_func_start sub_8090410 @@ -293310,21 +283092,20 @@ sub_8090410: @ 8090410 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0809042C + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08090430 + ldr r2, =sub_8090434 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0809042C: .4byte 0x02037350 -_08090430: .4byte sub_8090434 + 1 + .pool thumb_func_end sub_8090410 thumb_func_start sub_8090434 sub_8090434: @ 8090434 push {r4,lr} - ldr r3, _08090450 + ldr r3, =0x0850d7f4 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -293337,7 +283118,7 @@ sub_8090434: @ 8090434 pop {r1} bx r1 .align 2, 0 -_08090450: .4byte 0x0850d7f4 + .pool thumb_func_end sub_8090434 thumb_func_start sub_8090454 @@ -293384,7 +283165,7 @@ sub_8090494: @ 8090494 lsls r0, 24 cmp r0, 0 beq _080904CA - ldr r4, _080904D4 + ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 adds r1, r5, 0 @@ -293407,7 +283188,7 @@ _080904CA: pop {r1} bx r1 .align 2, 0 -_080904D4: .4byte 0x0850d6ec + .pool thumb_func_end sub_8090494 thumb_func_start sub_80904D8 @@ -293444,7 +283225,7 @@ sub_8090508: @ 8090508 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _0809054C + ldr r1, =0x0850d808 mov r0, sp movs r2, 0x2 bl memcpy @@ -293471,7 +283252,7 @@ _08090538: pop {r1} bx r1 .align 2, 0 -_0809054C: .4byte 0x0850d808 + .pool thumb_func_end sub_8090508 thumb_func_start sub_8090550 @@ -293483,21 +283264,20 @@ sub_8090550: @ 8090550 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0809056C + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08090570 + ldr r2, =sub_8090574 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0809056C: .4byte 0x02037350 -_08090570: .4byte sub_8090574 + 1 + .pool thumb_func_end sub_8090550 thumb_func_start sub_8090574 sub_8090574: @ 8090574 push {r4,lr} - ldr r3, _08090590 + ldr r3, =0x0850d80c movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -293510,7 +283290,7 @@ sub_8090574: @ 8090574 pop {r1} bx r1 .align 2, 0 -_08090590: .4byte 0x0850d80c + .pool thumb_func_end sub_8090574 thumb_func_start sub_8090594 @@ -293557,7 +283337,7 @@ sub_80905D4: @ 80905D4 lsls r0, 24 cmp r0, 0 beq _0809060A - ldr r4, _08090614 + ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 adds r1, r5, 0 @@ -293580,7 +283360,7 @@ _0809060A: pop {r1} bx r1 .align 2, 0 -_08090614: .4byte 0x0850d6ec + .pool thumb_func_end sub_80905D4 thumb_func_start sub_8090618 @@ -293617,7 +283397,7 @@ sub_8090648: @ 8090648 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _0809068C + ldr r1, =0x0850d820 mov r0, sp movs r2, 0x2 bl memcpy @@ -293644,7 +283424,7 @@ _08090678: pop {r1} bx r1 .align 2, 0 -_0809068C: .4byte 0x0850d820 + .pool thumb_func_end sub_8090648 thumb_func_start sub_8090690 @@ -293656,21 +283436,20 @@ sub_8090690: @ 8090690 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080906AC + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080906B0 + ldr r2, =sub_80906B4 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080906AC: .4byte 0x02037350 -_080906B0: .4byte sub_80906B4 + 1 + .pool thumb_func_end sub_8090690 thumb_func_start sub_80906B4 sub_80906B4: @ 80906B4 push {r4,lr} - ldr r3, _080906D0 + ldr r3, =0x0850d824 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -293683,7 +283462,7 @@ sub_80906B4: @ 80906B4 pop {r1} bx r1 .align 2, 0 -_080906D0: .4byte 0x0850d824 + .pool thumb_func_end sub_80906B4 thumb_func_start sub_80906D4 @@ -293730,7 +283509,7 @@ sub_8090714: @ 8090714 lsls r0, 24 cmp r0, 0 beq _0809074A - ldr r4, _08090754 + ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 adds r1, r5, 0 @@ -293753,7 +283532,7 @@ _0809074A: pop {r1} bx r1 .align 2, 0 -_08090754: .4byte 0x0850d6ec + .pool thumb_func_end sub_8090714 thumb_func_start sub_8090758 @@ -293790,7 +283569,7 @@ sub_8090788: @ 8090788 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _080907CC + ldr r1, =0x0850d838 mov r0, sp movs r2, 0x2 bl memcpy @@ -293817,7 +283596,7 @@ _080907B8: pop {r1} bx r1 .align 2, 0 -_080907CC: .4byte 0x0850d838 + .pool thumb_func_end sub_8090788 thumb_func_start sub_80907D0 @@ -293829,21 +283608,20 @@ sub_80907D0: @ 80907D0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080907EC + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080907F0 + ldr r2, =sub_80907F4 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080907EC: .4byte 0x02037350 -_080907F0: .4byte sub_80907F4 + 1 + .pool thumb_func_end sub_80907D0 thumb_func_start sub_80907F4 sub_80907F4: @ 80907F4 push {r4,lr} - ldr r3, _08090810 + ldr r3, =0x0850d83c movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -293856,7 +283634,7 @@ sub_80907F4: @ 80907F4 pop {r1} bx r1 .align 2, 0 -_08090810: .4byte 0x0850d83c + .pool thumb_func_end sub_80907F4 thumb_func_start sub_8090814 @@ -293903,7 +283681,7 @@ sub_8090854: @ 8090854 lsls r0, 24 cmp r0, 0 beq _0809088A - ldr r4, _08090894 + ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 adds r1, r5, 0 @@ -293926,7 +283704,7 @@ _0809088A: pop {r1} bx r1 .align 2, 0 -_08090894: .4byte 0x0850d6ec + .pool thumb_func_end sub_8090854 thumb_func_start sub_8090898 @@ -293963,7 +283741,7 @@ sub_80908C8: @ 80908C8 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _0809090C + ldr r1, =0x0850d850 mov r0, sp movs r2, 0x4 bl memcpy @@ -293990,7 +283768,7 @@ _080908F8: pop {r1} bx r1 .align 2, 0 -_0809090C: .4byte 0x0850d850 + .pool thumb_func_end sub_80908C8 thumb_func_start sub_8090910 @@ -294002,21 +283780,20 @@ sub_8090910: @ 8090910 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0809092C + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08090930 + ldr r2, =sub_8090934 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0809092C: .4byte 0x02037350 -_08090930: .4byte sub_8090934 + 1 + .pool thumb_func_end sub_8090910 thumb_func_start sub_8090934 sub_8090934: @ 8090934 push {r4,lr} - ldr r3, _08090950 + ldr r3, =0x0850d854 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -294029,7 +283806,7 @@ sub_8090934: @ 8090934 pop {r1} bx r1 .align 2, 0 -_08090950: .4byte 0x0850d854 + .pool thumb_func_end sub_8090934 thumb_func_start sub_8090954 @@ -294076,7 +283853,7 @@ sub_8090994: @ 8090994 lsls r0, 24 cmp r0, 0 beq _080909CA - ldr r4, _080909D4 + ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 adds r1, r5, 0 @@ -294099,7 +283876,7 @@ _080909CA: pop {r1} bx r1 .align 2, 0 -_080909D4: .4byte 0x0850d6ec + .pool thumb_func_end sub_8090994 thumb_func_start sub_80909D8 @@ -294136,7 +283913,7 @@ sub_8090A08: @ 8090A08 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08090A4C + ldr r1, =0x0850d868 mov r0, sp movs r2, 0x4 bl memcpy @@ -294163,7 +283940,7 @@ _08090A38: pop {r1} bx r1 .align 2, 0 -_08090A4C: .4byte 0x0850d868 + .pool thumb_func_end sub_8090A08 thumb_func_start sub_8090A50 @@ -294175,21 +283952,20 @@ sub_8090A50: @ 8090A50 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08090A6C + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08090A70 + ldr r2, =sub_8090A74 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08090A6C: .4byte 0x02037350 -_08090A70: .4byte sub_8090A74 + 1 + .pool thumb_func_end sub_8090A50 thumb_func_start sub_8090A74 sub_8090A74: @ 8090A74 push {r4,lr} - ldr r3, _08090A90 + ldr r3, =0x0850d86c movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -294202,7 +283978,7 @@ sub_8090A74: @ 8090A74 pop {r1} bx r1 .align 2, 0 -_08090A90: .4byte 0x0850d86c + .pool thumb_func_end sub_8090A74 thumb_func_start sub_8090A94 @@ -294249,7 +284025,7 @@ sub_8090AD4: @ 8090AD4 lsls r0, 24 cmp r0, 0 beq _08090B0A - ldr r4, _08090B14 + ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 adds r1, r5, 0 @@ -294272,7 +284048,7 @@ _08090B0A: pop {r1} bx r1 .align 2, 0 -_08090B14: .4byte 0x0850d6ec + .pool thumb_func_end sub_8090AD4 thumb_func_start sub_8090B18 @@ -294309,7 +284085,7 @@ sub_8090B48: @ 8090B48 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08090B8C + ldr r1, =0x0850d880 mov r0, sp movs r2, 0x4 bl memcpy @@ -294336,7 +284112,7 @@ _08090B78: pop {r1} bx r1 .align 2, 0 -_08090B8C: .4byte 0x0850d880 + .pool thumb_func_end sub_8090B48 thumb_func_start sub_8090B90 @@ -294348,21 +284124,20 @@ sub_8090B90: @ 8090B90 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08090BAC + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08090BB0 + ldr r2, =sub_8090BB4 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08090BAC: .4byte 0x02037350 -_08090BB0: .4byte sub_8090BB4 + 1 + .pool thumb_func_end sub_8090B90 thumb_func_start sub_8090BB4 sub_8090BB4: @ 8090BB4 push {r4,lr} - ldr r3, _08090BD0 + ldr r3, =0x0850d884 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -294375,7 +284150,7 @@ sub_8090BB4: @ 8090BB4 pop {r1} bx r1 .align 2, 0 -_08090BD0: .4byte 0x0850d884 + .pool thumb_func_end sub_8090BB4 thumb_func_start sub_8090BD4 @@ -294422,7 +284197,7 @@ sub_8090C14: @ 8090C14 lsls r0, 24 cmp r0, 0 beq _08090C4A - ldr r4, _08090C54 + ldr r4, =0x0850d6ec bl GenerateRandomNumber movs r5, 0x3 adds r1, r5, 0 @@ -294445,7 +284220,7 @@ _08090C4A: pop {r1} bx r1 .align 2, 0 -_08090C54: .4byte 0x0850d6ec + .pool thumb_func_end sub_8090C14 thumb_func_start sub_8090C58 @@ -294482,7 +284257,7 @@ sub_8090C88: @ 8090C88 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08090CCC + ldr r1, =0x0850d898 mov r0, sp movs r2, 0x4 bl memcpy @@ -294509,7 +284284,7 @@ _08090CB8: pop {r1} bx r1 .align 2, 0 -_08090CCC: .4byte 0x0850d898 + .pool thumb_func_end sub_8090C88 thumb_func_start sub_8090CD0 @@ -294521,21 +284296,20 @@ sub_8090CD0: @ 8090CD0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08090CEC + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08090CF0 + ldr r2, =sub_8090CF4 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08090CEC: .4byte 0x02037350 -_08090CF0: .4byte sub_8090CF4 + 1 + .pool thumb_func_end sub_8090CD0 thumb_func_start sub_8090CF4 sub_8090CF4: @ 8090CF4 push {r4,lr} - ldr r3, _08090D10 + ldr r3, =0x0850d89c movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -294548,7 +284322,7 @@ sub_8090CF4: @ 8090CF4 pop {r1} bx r1 .align 2, 0 -_08090D10: .4byte 0x0850d89c + .pool thumb_func_end sub_8090CF4 thumb_func_start sub_8090D14 @@ -294625,7 +284399,7 @@ sub_8090D90: @ 8090D90 sub sp, 0x8 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08090DD0 + ldr r1, =0x0850d8ac mov r0, sp movs r2, 0x5 bl memcpy @@ -294652,7 +284426,7 @@ _08090DBC: pop {r1} bx r1 .align 2, 0 -_08090DD0: .4byte 0x0850d8ac + .pool thumb_func_end sub_8090D90 thumb_func_start sub_8090DD4 @@ -294664,21 +284438,20 @@ sub_8090DD4: @ 8090DD4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08090DF0 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08090DF4 + ldr r2, =sub_8090DF8 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08090DF0: .4byte 0x02037350 -_08090DF4: .4byte sub_8090DF8 + 1 + .pool thumb_func_end sub_8090DD4 thumb_func_start sub_8090DF8 sub_8090DF8: @ 8090DF8 push {r4,lr} - ldr r3, _08090E14 + ldr r3, =0x0850d8b4 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -294691,7 +284464,7 @@ sub_8090DF8: @ 8090DF8 pop {r1} bx r1 .align 2, 0 -_08090E14: .4byte 0x0850d8b4 + .pool thumb_func_end sub_8090DF8 thumb_func_start sub_8090E18 @@ -294768,7 +284541,7 @@ sub_8090E94: @ 8090E94 sub sp, 0x8 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08090ED4 + ldr r1, =0x0850d8c4 mov r0, sp movs r2, 0x5 bl memcpy @@ -294795,7 +284568,7 @@ _08090EC0: pop {r1} bx r1 .align 2, 0 -_08090ED4: .4byte 0x0850d8c4 + .pool thumb_func_end sub_8090E94 thumb_func_start sub_8090ED8 @@ -294807,21 +284580,20 @@ sub_8090ED8: @ 8090ED8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08090EF4 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08090EF8 + ldr r2, =sub_8090EFC + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08090EF4: .4byte 0x02037350 -_08090EF8: .4byte sub_8090EFC + 1 + .pool thumb_func_end sub_8090ED8 thumb_func_start sub_8090EFC sub_8090EFC: @ 8090EFC push {r4,lr} - ldr r3, _08090F18 + ldr r3, =0x0850d8cc movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -294834,7 +284606,7 @@ sub_8090EFC: @ 8090EFC pop {r1} bx r1 .align 2, 0 -_08090F18: .4byte 0x0850d8cc + .pool thumb_func_end sub_8090EFC thumb_func_start sub_8090F1C @@ -294854,7 +284626,7 @@ sub_8090F30: @ 8090F30 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _08090F64 + ldr r0, =0x085055cd ldrb r1, [r4, 0x6] adds r1, r0 ldrb r1, [r1] @@ -294877,7 +284649,7 @@ _08090F52: pop {r1} bx r1 .align 2, 0 -_08090F64: .4byte 0x085055cd + .pool thumb_func_end sub_8090F30 thumb_func_start sub_8090F68 @@ -295123,21 +284895,20 @@ sub_8091138: @ 8091138 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091154 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091158 + ldr r2, =sub_809115C + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091154: .4byte 0x02037350 -_08091158: .4byte sub_809115C + 1 + .pool thumb_func_end sub_8091138 thumb_func_start sub_809115C sub_809115C: @ 809115C push {r4,lr} - ldr r3, _08091178 + ldr r3, =0x0850d8dc movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295150,7 +284921,7 @@ sub_809115C: @ 809115C pop {r1} bx r1 .align 2, 0 -_08091178: .4byte 0x0850d8dc + .pool thumb_func_end sub_809115C thumb_func_start sub_809117C @@ -295159,7 +284930,7 @@ sub_809117C: @ 809117C sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _080911C0 + ldr r1, =0x0850d8e8 mov r0, sp movs r2, 0x4 bl memcpy @@ -295188,7 +284959,7 @@ _080911A8: pop {r1} bx r1 .align 2, 0 -_080911C0: .4byte 0x0850d8e8 + .pool thumb_func_end sub_809117C thumb_func_start sub_80911C4 @@ -295200,21 +284971,20 @@ sub_80911C4: @ 80911C4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080911E0 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080911E4 + ldr r2, =sub_80911E8 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080911E0: .4byte 0x02037350 -_080911E4: .4byte sub_80911E8 + 1 + .pool thumb_func_end sub_80911C4 thumb_func_start sub_80911E8 sub_80911E8: @ 80911E8 push {r4,lr} - ldr r3, _08091204 + ldr r3, =0x0850d8ec movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295227,7 +284997,7 @@ sub_80911E8: @ 80911E8 pop {r1} bx r1 .align 2, 0 -_08091204: .4byte 0x0850d8ec + .pool thumb_func_end sub_80911E8 thumb_func_start sub_8091208 @@ -295236,7 +285006,7 @@ sub_8091208: @ 8091208 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _0809124C + ldr r1, =0x0850d8f8 mov r0, sp movs r2, 0x4 bl memcpy @@ -295265,7 +285035,7 @@ _08091234: pop {r1} bx r1 .align 2, 0 -_0809124C: .4byte 0x0850d8f8 + .pool thumb_func_end sub_8091208 thumb_func_start sub_8091250 @@ -295277,21 +285047,20 @@ sub_8091250: @ 8091250 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0809126C + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091270 + ldr r2, =sub_8091274 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0809126C: .4byte 0x02037350 -_08091270: .4byte sub_8091274 + 1 + .pool thumb_func_end sub_8091250 thumb_func_start sub_8091274 sub_8091274: @ 8091274 push {r4,lr} - ldr r3, _08091290 + ldr r3, =0x0850d8fc movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295304,7 +285073,7 @@ sub_8091274: @ 8091274 pop {r1} bx r1 .align 2, 0 -_08091290: .4byte 0x0850d8fc + .pool thumb_func_end sub_8091274 thumb_func_start sub_8091294 @@ -295313,7 +285082,7 @@ sub_8091294: @ 8091294 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _080912D8 + ldr r1, =0x0850d908 mov r0, sp movs r2, 0x4 bl memcpy @@ -295342,7 +285111,7 @@ _080912C0: pop {r1} bx r1 .align 2, 0 -_080912D8: .4byte 0x0850d908 + .pool thumb_func_end sub_8091294 thumb_func_start sub_80912DC @@ -295354,21 +285123,20 @@ sub_80912DC: @ 80912DC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080912F8 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080912FC + ldr r2, =sub_8091300 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080912F8: .4byte 0x02037350 -_080912FC: .4byte sub_8091300 + 1 + .pool thumb_func_end sub_80912DC thumb_func_start sub_8091300 sub_8091300: @ 8091300 push {r4,lr} - ldr r3, _0809131C + ldr r3, =0x0850d90c movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295381,7 +285149,7 @@ sub_8091300: @ 8091300 pop {r1} bx r1 .align 2, 0 -_0809131C: .4byte 0x0850d90c + .pool thumb_func_end sub_8091300 thumb_func_start sub_8091320 @@ -295390,7 +285158,7 @@ sub_8091320: @ 8091320 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091364 + ldr r1, =0x0850d918 mov r0, sp movs r2, 0x4 bl memcpy @@ -295419,7 +285187,7 @@ _0809134C: pop {r1} bx r1 .align 2, 0 -_08091364: .4byte 0x0850d918 + .pool thumb_func_end sub_8091320 thumb_func_start sub_8091368 @@ -295431,21 +285199,20 @@ sub_8091368: @ 8091368 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091384 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091388 + ldr r2, =sub_809138C + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091384: .4byte 0x02037350 -_08091388: .4byte sub_809138C + 1 + .pool thumb_func_end sub_8091368 thumb_func_start sub_809138C sub_809138C: @ 809138C push {r4,lr} - ldr r3, _080913A8 + ldr r3, =0x0850d91c movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295458,7 +285225,7 @@ sub_809138C: @ 809138C pop {r1} bx r1 .align 2, 0 -_080913A8: .4byte 0x0850d91c + .pool thumb_func_end sub_809138C thumb_func_start sub_80913AC @@ -295467,7 +285234,7 @@ sub_80913AC: @ 80913AC sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _080913F0 + ldr r1, =0x0850d928 mov r0, sp movs r2, 0x4 bl memcpy @@ -295496,7 +285263,7 @@ _080913D8: pop {r1} bx r1 .align 2, 0 -_080913F0: .4byte 0x0850d928 + .pool thumb_func_end sub_80913AC thumb_func_start sub_80913F4 @@ -295508,21 +285275,20 @@ sub_80913F4: @ 80913F4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091410 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091414 + ldr r2, =sub_8091418 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091410: .4byte 0x02037350 -_08091414: .4byte sub_8091418 + 1 + .pool thumb_func_end sub_80913F4 thumb_func_start sub_8091418 sub_8091418: @ 8091418 push {r4,lr} - ldr r3, _08091434 + ldr r3, =0x0850d92c movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295535,7 +285301,7 @@ sub_8091418: @ 8091418 pop {r1} bx r1 .align 2, 0 -_08091434: .4byte 0x0850d92c + .pool thumb_func_end sub_8091418 thumb_func_start sub_8091438 @@ -295544,7 +285310,7 @@ sub_8091438: @ 8091438 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _0809147C + ldr r1, =0x0850d938 mov r0, sp movs r2, 0x4 bl memcpy @@ -295573,7 +285339,7 @@ _08091464: pop {r1} bx r1 .align 2, 0 -_0809147C: .4byte 0x0850d938 + .pool thumb_func_end sub_8091438 thumb_func_start sub_8091480 @@ -295585,21 +285351,20 @@ sub_8091480: @ 8091480 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _0809149C + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080914A0 + ldr r2, =sub_80914A4 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_0809149C: .4byte 0x02037350 -_080914A0: .4byte sub_80914A4 + 1 + .pool thumb_func_end sub_8091480 thumb_func_start sub_80914A4 sub_80914A4: @ 80914A4 push {r4,lr} - ldr r3, _080914C0 + ldr r3, =0x0850d93c movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295612,7 +285377,7 @@ sub_80914A4: @ 80914A4 pop {r1} bx r1 .align 2, 0 -_080914C0: .4byte 0x0850d93c + .pool thumb_func_end sub_80914A4 thumb_func_start sub_80914C4 @@ -295621,7 +285386,7 @@ sub_80914C4: @ 80914C4 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091508 + ldr r1, =0x0850d710 mov r0, sp movs r2, 0x4 bl memcpy @@ -295650,7 +285415,7 @@ _080914F0: pop {r1} bx r1 .align 2, 0 -_08091508: .4byte 0x0850d710 + .pool thumb_func_end sub_80914C4 thumb_func_start sub_809150C @@ -295662,21 +285427,20 @@ sub_809150C: @ 809150C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091528 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _0809152C + ldr r2, =sub_8091530 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091528: .4byte 0x02037350 -_0809152C: .4byte sub_8091530 + 1 + .pool thumb_func_end sub_809150C thumb_func_start sub_8091530 sub_8091530: @ 8091530 push {r4,lr} - ldr r3, _0809154C + ldr r3, =0x0850d948 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295689,7 +285453,7 @@ sub_8091530: @ 8091530 pop {r1} bx r1 .align 2, 0 -_0809154C: .4byte 0x0850d948 + .pool thumb_func_end sub_8091530 thumb_func_start sub_8091550 @@ -295698,7 +285462,7 @@ sub_8091550: @ 8091550 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091594 + ldr r1, =0x0850d954 mov r0, sp movs r2, 0x4 bl memcpy @@ -295727,7 +285491,7 @@ _0809157C: pop {r1} bx r1 .align 2, 0 -_08091594: .4byte 0x0850d954 + .pool thumb_func_end sub_8091550 thumb_func_start sub_8091598 @@ -295739,21 +285503,20 @@ sub_8091598: @ 8091598 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080915B4 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080915B8 + ldr r2, =sub_80915BC + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080915B4: .4byte 0x02037350 -_080915B8: .4byte sub_80915BC + 1 + .pool thumb_func_end sub_8091598 thumb_func_start sub_80915BC sub_80915BC: @ 80915BC push {r4,lr} - ldr r3, _080915D8 + ldr r3, =0x0850d958 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295766,7 +285529,7 @@ sub_80915BC: @ 80915BC pop {r1} bx r1 .align 2, 0 -_080915D8: .4byte 0x0850d958 + .pool thumb_func_end sub_80915BC thumb_func_start sub_80915DC @@ -295775,7 +285538,7 @@ sub_80915DC: @ 80915DC sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091620 + ldr r1, =0x0850d964 mov r0, sp movs r2, 0x4 bl memcpy @@ -295804,7 +285567,7 @@ _08091608: pop {r1} bx r1 .align 2, 0 -_08091620: .4byte 0x0850d964 + .pool thumb_func_end sub_80915DC thumb_func_start sub_8091624 @@ -295816,21 +285579,20 @@ sub_8091624: @ 8091624 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091640 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091644 + ldr r2, =sub_8091648 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091640: .4byte 0x02037350 -_08091644: .4byte sub_8091648 + 1 + .pool thumb_func_end sub_8091624 thumb_func_start sub_8091648 sub_8091648: @ 8091648 push {r4,lr} - ldr r3, _08091664 + ldr r3, =0x0850d968 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295843,7 +285605,7 @@ sub_8091648: @ 8091648 pop {r1} bx r1 .align 2, 0 -_08091664: .4byte 0x0850d968 + .pool thumb_func_end sub_8091648 thumb_func_start sub_8091668 @@ -295852,7 +285614,7 @@ sub_8091668: @ 8091668 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _080916AC + ldr r1, =0x0850d974 mov r0, sp movs r2, 0x4 bl memcpy @@ -295881,7 +285643,7 @@ _08091694: pop {r1} bx r1 .align 2, 0 -_080916AC: .4byte 0x0850d974 + .pool thumb_func_end sub_8091668 thumb_func_start sub_80916B0 @@ -295893,21 +285655,20 @@ sub_80916B0: @ 80916B0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080916CC + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080916D0 + ldr r2, =sub_80916D4 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080916CC: .4byte 0x02037350 -_080916D0: .4byte sub_80916D4 + 1 + .pool thumb_func_end sub_80916B0 thumb_func_start sub_80916D4 sub_80916D4: @ 80916D4 push {r4,lr} - ldr r3, _080916F0 + ldr r3, =0x0850d978 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295920,7 +285681,7 @@ sub_80916D4: @ 80916D4 pop {r1} bx r1 .align 2, 0 -_080916F0: .4byte 0x0850d978 + .pool thumb_func_end sub_80916D4 thumb_func_start sub_80916F4 @@ -295929,7 +285690,7 @@ sub_80916F4: @ 80916F4 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091738 + ldr r1, =0x0850d984 mov r0, sp movs r2, 0x4 bl memcpy @@ -295958,7 +285719,7 @@ _08091720: pop {r1} bx r1 .align 2, 0 -_08091738: .4byte 0x0850d984 + .pool thumb_func_end sub_80916F4 thumb_func_start sub_809173C @@ -295970,21 +285731,20 @@ sub_809173C: @ 809173C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091758 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _0809175C + ldr r2, =sub_8091760 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091758: .4byte 0x02037350 -_0809175C: .4byte sub_8091760 + 1 + .pool thumb_func_end sub_809173C thumb_func_start sub_8091760 sub_8091760: @ 8091760 push {r4,lr} - ldr r3, _0809177C + ldr r3, =0x0850d988 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -295997,7 +285757,7 @@ sub_8091760: @ 8091760 pop {r1} bx r1 .align 2, 0 -_0809177C: .4byte 0x0850d988 + .pool thumb_func_end sub_8091760 thumb_func_start sub_8091780 @@ -296006,7 +285766,7 @@ sub_8091780: @ 8091780 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _080917C4 + ldr r1, =0x0850d994 mov r0, sp movs r2, 0x4 bl memcpy @@ -296035,7 +285795,7 @@ _080917AC: pop {r1} bx r1 .align 2, 0 -_080917C4: .4byte 0x0850d994 + .pool thumb_func_end sub_8091780 thumb_func_start sub_80917C8 @@ -296047,21 +285807,20 @@ sub_80917C8: @ 80917C8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080917E4 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080917E8 + ldr r2, =sub_80917EC + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080917E4: .4byte 0x02037350 -_080917E8: .4byte sub_80917EC + 1 + .pool thumb_func_end sub_80917C8 thumb_func_start sub_80917EC sub_80917EC: @ 80917EC push {r4,lr} - ldr r3, _08091808 + ldr r3, =0x0850d998 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296074,7 +285833,7 @@ sub_80917EC: @ 80917EC pop {r1} bx r1 .align 2, 0 -_08091808: .4byte 0x0850d998 + .pool thumb_func_end sub_80917EC thumb_func_start sub_809180C @@ -296083,7 +285842,7 @@ sub_809180C: @ 809180C sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091850 + ldr r1, =0x0850d9a4 mov r0, sp movs r2, 0x4 bl memcpy @@ -296112,7 +285871,7 @@ _08091838: pop {r1} bx r1 .align 2, 0 -_08091850: .4byte 0x0850d9a4 + .pool thumb_func_end sub_809180C thumb_func_start sub_8091854 @@ -296124,21 +285883,20 @@ sub_8091854: @ 8091854 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091870 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091874 + ldr r2, =sub_8091878 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091870: .4byte 0x02037350 -_08091874: .4byte sub_8091878 + 1 + .pool thumb_func_end sub_8091854 thumb_func_start sub_8091878 sub_8091878: @ 8091878 push {r4,lr} - ldr r3, _08091894 + ldr r3, =0x0850d9a8 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296151,7 +285909,7 @@ sub_8091878: @ 8091878 pop {r1} bx r1 .align 2, 0 -_08091894: .4byte 0x0850d9a8 + .pool thumb_func_end sub_8091878 thumb_func_start sub_8091898 @@ -296160,7 +285918,7 @@ sub_8091898: @ 8091898 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _080918DC + ldr r1, =0x0850d9b4 mov r0, sp movs r2, 0x4 bl memcpy @@ -296189,7 +285947,7 @@ _080918C4: pop {r1} bx r1 .align 2, 0 -_080918DC: .4byte 0x0850d9b4 + .pool thumb_func_end sub_8091898 thumb_func_start sub_80918E0 @@ -296201,21 +285959,20 @@ sub_80918E0: @ 80918E0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080918FC + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091900 + ldr r2, =sub_8091904 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080918FC: .4byte 0x02037350 -_08091900: .4byte sub_8091904 + 1 + .pool thumb_func_end sub_80918E0 thumb_func_start sub_8091904 sub_8091904: @ 8091904 push {r4,lr} - ldr r3, _08091920 + ldr r3, =0x0850d9b8 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296228,7 +285985,7 @@ sub_8091904: @ 8091904 pop {r1} bx r1 .align 2, 0 -_08091920: .4byte 0x0850d9b8 + .pool thumb_func_end sub_8091904 thumb_func_start sub_8091924 @@ -296237,7 +285994,7 @@ sub_8091924: @ 8091924 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091968 + ldr r1, =0x0850d9c4 mov r0, sp movs r2, 0x4 bl memcpy @@ -296266,7 +286023,7 @@ _08091950: pop {r1} bx r1 .align 2, 0 -_08091968: .4byte 0x0850d9c4 + .pool thumb_func_end sub_8091924 thumb_func_start sub_809196C @@ -296278,21 +286035,20 @@ sub_809196C: @ 809196C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091988 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _0809198C + ldr r2, =sub_8091990 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091988: .4byte 0x02037350 -_0809198C: .4byte sub_8091990 + 1 + .pool thumb_func_end sub_809196C thumb_func_start sub_8091990 sub_8091990: @ 8091990 push {r4,lr} - ldr r3, _080919AC + ldr r3, =0x0850d9c8 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296305,7 +286061,7 @@ sub_8091990: @ 8091990 pop {r1} bx r1 .align 2, 0 -_080919AC: .4byte 0x0850d9c8 + .pool thumb_func_end sub_8091990 thumb_func_start sub_80919B0 @@ -296314,7 +286070,7 @@ sub_80919B0: @ 80919B0 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _080919F4 + ldr r1, =0x0850d9d4 mov r0, sp movs r2, 0x4 bl memcpy @@ -296343,7 +286099,7 @@ _080919DC: pop {r1} bx r1 .align 2, 0 -_080919F4: .4byte 0x0850d9d4 + .pool thumb_func_end sub_80919B0 thumb_func_start sub_80919F8 @@ -296355,21 +286111,20 @@ sub_80919F8: @ 80919F8 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091A14 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091A18 + ldr r2, =sub_8091A1C + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091A14: .4byte 0x02037350 -_08091A18: .4byte sub_8091A1C + 1 + .pool thumb_func_end sub_80919F8 thumb_func_start sub_8091A1C sub_8091A1C: @ 8091A1C push {r4,lr} - ldr r3, _08091A38 + ldr r3, =0x0850d9d8 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296382,7 +286137,7 @@ sub_8091A1C: @ 8091A1C pop {r1} bx r1 .align 2, 0 -_08091A38: .4byte 0x0850d9d8 + .pool thumb_func_end sub_8091A1C thumb_func_start sub_8091A3C @@ -296391,7 +286146,7 @@ sub_8091A3C: @ 8091A3C sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091A80 + ldr r1, =0x0850d9e4 mov r0, sp movs r2, 0x4 bl memcpy @@ -296420,7 +286175,7 @@ _08091A68: pop {r1} bx r1 .align 2, 0 -_08091A80: .4byte 0x0850d9e4 + .pool thumb_func_end sub_8091A3C thumb_func_start sub_8091A84 @@ -296432,21 +286187,20 @@ sub_8091A84: @ 8091A84 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091AA0 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091AA4 + ldr r2, =sub_8091AA8 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091AA0: .4byte 0x02037350 -_08091AA4: .4byte sub_8091AA8 + 1 + .pool thumb_func_end sub_8091A84 thumb_func_start sub_8091AA8 sub_8091AA8: @ 8091AA8 push {r4,lr} - ldr r3, _08091AC4 + ldr r3, =0x0850d9e8 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296459,7 +286213,7 @@ sub_8091AA8: @ 8091AA8 pop {r1} bx r1 .align 2, 0 -_08091AC4: .4byte 0x0850d9e8 + .pool thumb_func_end sub_8091AA8 thumb_func_start sub_8091AC8 @@ -296468,7 +286222,7 @@ sub_8091AC8: @ 8091AC8 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091B0C + ldr r1, =0x0850d9f4 mov r0, sp movs r2, 0x4 bl memcpy @@ -296497,7 +286251,7 @@ _08091AF4: pop {r1} bx r1 .align 2, 0 -_08091B0C: .4byte 0x0850d9f4 + .pool thumb_func_end sub_8091AC8 thumb_func_start sub_8091B10 @@ -296509,21 +286263,20 @@ sub_8091B10: @ 8091B10 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091B2C + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091B30 + ldr r2, =sub_8091B34 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091B2C: .4byte 0x02037350 -_08091B30: .4byte sub_8091B34 + 1 + .pool thumb_func_end sub_8091B10 thumb_func_start sub_8091B34 sub_8091B34: @ 8091B34 push {r4,lr} - ldr r3, _08091B50 + ldr r3, =0x0850d9f8 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296536,7 +286289,7 @@ sub_8091B34: @ 8091B34 pop {r1} bx r1 .align 2, 0 -_08091B50: .4byte 0x0850d9f8 + .pool thumb_func_end sub_8091B34 thumb_func_start sub_8091B54 @@ -296545,7 +286298,7 @@ sub_8091B54: @ 8091B54 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091B98 + ldr r1, =0x0850da04 mov r0, sp movs r2, 0x4 bl memcpy @@ -296574,7 +286327,7 @@ _08091B80: pop {r1} bx r1 .align 2, 0 -_08091B98: .4byte 0x0850da04 + .pool thumb_func_end sub_8091B54 thumb_func_start sub_8091B9C @@ -296586,21 +286339,20 @@ sub_8091B9C: @ 8091B9C lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091BB8 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091BBC + ldr r2, =sub_8091BC0 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091BB8: .4byte 0x02037350 -_08091BBC: .4byte sub_8091BC0 + 1 + .pool thumb_func_end sub_8091B9C thumb_func_start sub_8091BC0 sub_8091BC0: @ 8091BC0 push {r4,lr} - ldr r3, _08091BDC + ldr r3, =0x0850da08 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296613,7 +286365,7 @@ sub_8091BC0: @ 8091BC0 pop {r1} bx r1 .align 2, 0 -_08091BDC: .4byte 0x0850da08 + .pool thumb_func_end sub_8091BC0 thumb_func_start sub_8091BE0 @@ -296622,7 +286374,7 @@ sub_8091BE0: @ 8091BE0 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091C24 + ldr r1, =0x0850da14 mov r0, sp movs r2, 0x4 bl memcpy @@ -296651,7 +286403,7 @@ _08091C0C: pop {r1} bx r1 .align 2, 0 -_08091C24: .4byte 0x0850da14 + .pool thumb_func_end sub_8091BE0 thumb_func_start sub_8091C28 @@ -296663,21 +286415,20 @@ sub_8091C28: @ 8091C28 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091C44 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091C48 + ldr r2, =sub_8091C4C + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091C44: .4byte 0x02037350 -_08091C48: .4byte sub_8091C4C + 1 + .pool thumb_func_end sub_8091C28 thumb_func_start sub_8091C4C sub_8091C4C: @ 8091C4C push {r4,lr} - ldr r3, _08091C68 + ldr r3, =0x0850da18 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296690,7 +286441,7 @@ sub_8091C4C: @ 8091C4C pop {r1} bx r1 .align 2, 0 -_08091C68: .4byte 0x0850da18 + .pool thumb_func_end sub_8091C4C thumb_func_start sub_8091C6C @@ -296699,7 +286450,7 @@ sub_8091C6C: @ 8091C6C sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091CB0 + ldr r1, =0x0850da24 mov r0, sp movs r2, 0x4 bl memcpy @@ -296728,7 +286479,7 @@ _08091C98: pop {r1} bx r1 .align 2, 0 -_08091CB0: .4byte 0x0850da24 + .pool thumb_func_end sub_8091C6C thumb_func_start sub_8091CB4 @@ -296740,21 +286491,20 @@ sub_8091CB4: @ 8091CB4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091CD0 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091CD4 + ldr r2, =sub_8091CD8 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091CD0: .4byte 0x02037350 -_08091CD4: .4byte sub_8091CD8 + 1 + .pool thumb_func_end sub_8091CB4 thumb_func_start sub_8091CD8 sub_8091CD8: @ 8091CD8 push {r4,lr} - ldr r3, _08091CF4 + ldr r3, =0x0850da28 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296767,7 +286517,7 @@ sub_8091CD8: @ 8091CD8 pop {r1} bx r1 .align 2, 0 -_08091CF4: .4byte 0x0850da28 + .pool thumb_func_end sub_8091CD8 thumb_func_start sub_8091CF8 @@ -296776,7 +286526,7 @@ sub_8091CF8: @ 8091CF8 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091D3C + ldr r1, =0x0850da34 mov r0, sp movs r2, 0x4 bl memcpy @@ -296805,7 +286555,7 @@ _08091D24: pop {r1} bx r1 .align 2, 0 -_08091D3C: .4byte 0x0850da34 + .pool thumb_func_end sub_8091CF8 thumb_func_start sub_8091D40 @@ -296817,21 +286567,20 @@ sub_8091D40: @ 8091D40 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091D5C + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091D60 + ldr r2, =sub_8091D64 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091D5C: .4byte 0x02037350 -_08091D60: .4byte sub_8091D64 + 1 + .pool thumb_func_end sub_8091D40 thumb_func_start sub_8091D64 sub_8091D64: @ 8091D64 push {r4,lr} - ldr r3, _08091D80 + ldr r3, =0x0850da38 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296844,7 +286593,7 @@ sub_8091D64: @ 8091D64 pop {r1} bx r1 .align 2, 0 -_08091D80: .4byte 0x0850da38 + .pool thumb_func_end sub_8091D64 thumb_func_start sub_8091D84 @@ -296853,7 +286602,7 @@ sub_8091D84: @ 8091D84 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091DC8 + ldr r1, =0x0850da44 mov r0, sp movs r2, 0x4 bl memcpy @@ -296882,7 +286631,7 @@ _08091DB0: pop {r1} bx r1 .align 2, 0 -_08091DC8: .4byte 0x0850da44 + .pool thumb_func_end sub_8091D84 thumb_func_start sub_8091DCC @@ -296894,21 +286643,20 @@ sub_8091DCC: @ 8091DCC lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091DE8 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091DEC + ldr r2, =sub_8091DF0 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091DE8: .4byte 0x02037350 -_08091DEC: .4byte sub_8091DF0 + 1 + .pool thumb_func_end sub_8091DCC thumb_func_start sub_8091DF0 sub_8091DF0: @ 8091DF0 push {r4,lr} - ldr r3, _08091E0C + ldr r3, =0x0850da48 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296921,7 +286669,7 @@ sub_8091DF0: @ 8091DF0 pop {r1} bx r1 .align 2, 0 -_08091E0C: .4byte 0x0850da48 + .pool thumb_func_end sub_8091DF0 thumb_func_start sub_8091E10 @@ -296930,7 +286678,7 @@ sub_8091E10: @ 8091E10 sub sp, 0x4 adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08091E54 + ldr r1, =0x0850da54 mov r0, sp movs r2, 0x4 bl memcpy @@ -296959,7 +286707,7 @@ _08091E3C: pop {r1} bx r1 .align 2, 0 -_08091E54: .4byte 0x0850da54 + .pool thumb_func_end sub_8091E10 thumb_func_start sub_8091E58 @@ -296971,21 +286719,20 @@ sub_8091E58: @ 8091E58 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08091E74 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08091E78 + ldr r2, =sub_8091E7C + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08091E74: .4byte 0x02037350 -_08091E78: .4byte sub_8091E7C + 1 + .pool thumb_func_end sub_8091E58 thumb_func_start sub_8091E7C sub_8091E7C: @ 8091E7C push {r4,lr} - ldr r3, _08091E98 + ldr r3, =0x0850da58 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -296998,7 +286745,7 @@ sub_8091E7C: @ 8091E7C pop {r1} bx r1 .align 2, 0 -_08091E98: .4byte 0x0850da58 + .pool thumb_func_end sub_8091E7C thumb_func_start mss_npc_reset_oampriv3_1_unk2_unk3 @@ -297026,8 +286773,8 @@ sub_8091EC0: @ 8091EC0 push {r4-r7,lr} adds r6, r0, 0 adds r7, r1, 0 - ldr r2, _08091EE4 - ldr r3, _08091EE8 + ldr r2, =0x02037350 + ldr r3, =0x02037590 ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -297043,10 +286790,9 @@ _08091EE0: movs r0, 0 b _08091F14 .align 2, 0 -_08091EE4: .4byte 0x02037350 -_08091EE8: .4byte 0x02037590 + .pool _08091EEC: - ldr r5, _08091F1C + ldr r5, =0x0850da64 bl player_get_x22 adds r4, r0, 0 lsls r4, 24 @@ -297068,7 +286814,7 @@ _08091F14: pop {r1} bx r1 .align 2, 0 -_08091F1C: .4byte 0x0850da64 + .pool thumb_func_end sub_8091EC0 thumb_func_start sub_8091F20 @@ -297107,7 +286853,7 @@ sub_8091F4C: @ 8091F4C adds r5, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r1, _08091F90 + ldr r1, =0x085055cd ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -297133,7 +286879,7 @@ sub_8091F4C: @ 8091F4C pop {r1} bx r1 .align 2, 0 -_08091F90: .4byte 0x085055cd + .pool thumb_func_end sub_8091F4C thumb_func_start sub_8091F94 @@ -297157,7 +286903,7 @@ sub_8091F94: @ 8091F94 cmp r5, 0 bne _08092012 adds r5, r6, 0 - ldr r1, _08091FF8 + ldr r1, =0x085055cd ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -297183,9 +286929,9 @@ sub_8091F94: @ 8091F94 bl npc_set_state_and_pq_record b _08092084 .align 2, 0 -_08091FF8: .4byte 0x085055cd + .pool _08091FFC: - ldr r1, _080920A0 + ldr r1, =0x085055cd ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -297261,7 +287007,7 @@ _08092084: pop {r1} bx r1 .align 2, 0 -_080920A0: .4byte 0x085055cd + .pool thumb_func_end sub_8091F94 thumb_func_start sub_80920A4 @@ -297275,7 +287021,7 @@ sub_80920A4: @ 80920A4 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08092158 + ldr r1, =0x085055cd ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -297350,7 +287096,7 @@ _0809213E: pop {r1} bx r1 .align 2, 0 -_08092158: .4byte 0x085055cd + .pool thumb_func_end sub_80920A4 thumb_func_start sub_809215C @@ -297364,7 +287110,7 @@ sub_809215C: @ 809215C mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08092210 + ldr r1, =0x085055cd ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -297439,7 +287185,7 @@ _080921F6: pop {r1} bx r1 .align 2, 0 -_08092210: .4byte 0x085055cd + .pool thumb_func_end sub_809215C thumb_func_start sub_8092214 @@ -297453,7 +287199,7 @@ sub_8092214: @ 8092214 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _080922C8 + ldr r1, =0x085055cd ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -297528,7 +287274,7 @@ _080922AE: pop {r1} bx r1 .align 2, 0 -_080922C8: .4byte 0x085055cd + .pool thumb_func_end sub_8092214 thumb_func_start cph_IM_DIFFERENT @@ -297538,7 +287284,7 @@ cph_IM_DIFFERENT: @ 80922CC adds r5, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r1, _08092310 + ldr r1, =0x085055cd ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -297564,7 +287310,7 @@ cph_IM_DIFFERENT: @ 80922CC pop {r1} bx r1 .align 2, 0 -_08092310: .4byte 0x085055cd + .pool thumb_func_end cph_IM_DIFFERENT thumb_func_start sub_8092314 @@ -297578,7 +287324,7 @@ sub_8092314: @ 8092314 mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _080923C8 + ldr r1, =0x085055cd ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -297653,7 +287399,7 @@ _080923AE: pop {r1} bx r1 .align 2, 0 -_080923C8: .4byte 0x085055cd + .pool thumb_func_end sub_8092314 thumb_func_start oac_hopping @@ -297667,7 +287413,7 @@ oac_hopping: @ 80923CC mov r8, r3 lsls r2, 24 lsrs r6, r2, 24 - ldr r1, _08092490 + ldr r1, =0x085055cd ldrb r0, [r4, 0x6] adds r0, r1 ldrb r0, [r0] @@ -297749,7 +287495,7 @@ _08092474: pop {r1} bx r1 .align 2, 0 -_08092490: .4byte 0x085055cd + .pool thumb_func_end oac_hopping thumb_func_start sub_8092494 @@ -297761,21 +287507,20 @@ sub_8092494: @ 8092494 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080924B0 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080924B4 + ldr r2, =sub_80924B8 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080924B0: .4byte 0x02037350 -_080924B4: .4byte sub_80924B8 + 1 + .pool thumb_func_end sub_8092494 thumb_func_start sub_80924B8 sub_80924B8: @ 80924B8 push {r4,lr} - ldr r3, _080924D4 + ldr r3, =0x0850da90 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -297788,7 +287533,7 @@ sub_80924B8: @ 80924B8 pop {r1} bx r1 .align 2, 0 -_080924D4: .4byte 0x0850da90 + .pool thumb_func_end sub_80924B8 thumb_func_start mss_08062EA4 @@ -297796,8 +287541,8 @@ mss_08062EA4: @ 80924D8 push {r4-r7,lr} adds r6, r0, 0 adds r7, r1, 0 - ldr r2, _080924FC - ldr r3, _08092500 + ldr r2, =0x02037350 + ldr r3, =0x02037590 ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -297813,10 +287558,9 @@ _080924F8: movs r0, 0 b _0809252C .align 2, 0 -_080924FC: .4byte 0x02037350 -_08092500: .4byte 0x02037590 + .pool _08092504: - ldr r5, _08092534 + ldr r5, =0x0850da64 bl player_get_x22 adds r4, r0, 0 lsls r4, 24 @@ -297826,7 +287570,7 @@ _08092504: adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r3, _08092538 + ldr r3, =sub_8088E64 + 1 ldr r4, [r4] adds r0, r6, 0 adds r1, r7, 0 @@ -297838,8 +287582,7 @@ _0809252C: pop {r1} bx r1 .align 2, 0 -_08092534: .4byte 0x0850da64 -_08092538: .4byte sub_8088E64 + 1 + .pool thumb_func_end mss_08062EA4 thumb_func_start sub_809253C @@ -297851,7 +287594,7 @@ sub_809253C: @ 809253C lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080925A0 + ldr r0, =0x02037350 adds r4, r1, r0 adds r6, r4, 0 adds r6, 0x21 @@ -297865,7 +287608,7 @@ sub_809253C: @ 809253C cmp r0, 0 bne _08092584 _08092564: - ldr r1, _080925A4 + ldr r1, =0x02038c08 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -297885,18 +287628,16 @@ _08092584: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080925A0 + ldr r1, =0x02037350 adds r0, r1 - ldr r2, _080925A8 + ldr r2, =sub_80925AC + 1 adds r1, r5, 0 bl meta_step pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080925A0: .4byte 0x02037350 -_080925A4: .4byte 0x02038c08 -_080925A8: .4byte sub_80925AC + 1 + .pool thumb_func_end sub_809253C thumb_func_start sub_80925AC @@ -297917,7 +287658,7 @@ sub_80925B8: @ 80925B8 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0809261C + ldr r0, =0x02037350 adds r4, r1, r0 adds r6, r4, 0 adds r6, 0x21 @@ -297931,7 +287672,7 @@ sub_80925B8: @ 80925B8 cmp r0, 0 bne _08092600 _080925E0: - ldr r1, _08092620 + ldr r1, =0x02038c08 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -297951,18 +287692,16 @@ _08092600: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0809261C + ldr r1, =0x02037350 adds r0, r1 - ldr r2, _08092624 + ldr r2, =sub_80925AC + 1 adds r1, r5, 0 bl meta_step pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0809261C: .4byte 0x02037350 -_08092620: .4byte 0x02038c08 -_08092624: .4byte sub_80925AC + 1 + .pool thumb_func_end sub_80925B8 thumb_func_start sub_8092628 @@ -297971,7 +287710,7 @@ sub_8092628: @ 8092628 adds r3, r0, 0 movs r1, 0x3C ldrsh r0, [r3, r1] - ldr r4, _08092684 + ldr r4, =0x02037350 cmp r0, 0 bne _08092668 movs r0, 0x2E @@ -298006,21 +287745,20 @@ _08092668: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r2, _08092688 + ldr r2, =sub_809268C + 1 adds r1, r3, 0 bl meta_step pop {r4} pop {r0} bx r0 .align 2, 0 -_08092684: .4byte 0x02037350 -_08092688: .4byte sub_809268C + 1 + .pool thumb_func_end sub_8092628 thumb_func_start sub_809268C sub_809268C: @ 809268C push {r4,lr} - ldr r3, _080926A8 + ldr r3, =0x0850da9c movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -298033,7 +287771,7 @@ sub_809268C: @ 809268C pop {r1} bx r1 .align 2, 0 -_080926A8: .4byte 0x0850da9c + .pool thumb_func_end sub_809268C thumb_func_start sub_80926AC @@ -298071,21 +287809,20 @@ sub_80926D4: @ 80926D4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080926F0 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080926F4 + ldr r2, =sub_80926F8 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080926F0: .4byte 0x02037350 -_080926F4: .4byte sub_80926F8 + 1 + .pool thumb_func_end sub_80926D4 thumb_func_start sub_80926F8 sub_80926F8: @ 80926F8 push {r4,lr} - ldr r3, _08092714 + ldr r3, =0x0850daa0 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -298098,7 +287835,7 @@ sub_80926F8: @ 80926F8 pop {r1} bx r1 .align 2, 0 -_08092714: .4byte 0x0850daa0 + .pool thumb_func_end sub_80926F8 thumb_func_start sub_8092718 @@ -298133,21 +287870,20 @@ sub_8092744: @ 8092744 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08092760 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08092764 + ldr r2, =sub_8092768 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08092760: .4byte 0x02037350 -_08092764: .4byte sub_8092768 + 1 + .pool thumb_func_end sub_8092744 thumb_func_start sub_8092768 sub_8092768: @ 8092768 push {r4,lr} - ldr r3, _08092784 + ldr r3, =0x0850daa8 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -298160,7 +287896,7 @@ sub_8092768: @ 8092768 pop {r1} bx r1 .align 2, 0 -_08092784: .4byte 0x0850daa8 + .pool thumb_func_end sub_8092768 thumb_func_start sub_8092788 @@ -298195,21 +287931,20 @@ sub_80927B4: @ 80927B4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080927D0 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080927D4 + ldr r2, =sub_80927D8 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080927D0: .4byte 0x02037350 -_080927D4: .4byte sub_80927D8 + 1 + .pool thumb_func_end sub_80927B4 thumb_func_start sub_80927D8 sub_80927D8: @ 80927D8 push {r4,lr} - ldr r3, _080927F4 + ldr r3, =0x0850dab0 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -298222,7 +287957,7 @@ sub_80927D8: @ 80927D8 pop {r1} bx r1 .align 2, 0 -_080927F4: .4byte 0x0850dab0 + .pool thumb_func_end sub_80927D8 thumb_func_start sub_80927F8 @@ -298257,21 +287992,20 @@ sub_8092824: @ 8092824 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _08092840 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _08092844 + ldr r2, =sub_8092848 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_08092840: .4byte 0x02037350 -_08092844: .4byte sub_8092848 + 1 + .pool thumb_func_end sub_8092824 thumb_func_start sub_8092848 sub_8092848: @ 8092848 push {r4,lr} - ldr r3, _08092864 + ldr r3, =0x0850dab8 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -298284,7 +288018,7 @@ sub_8092848: @ 8092848 pop {r1} bx r1 .align 2, 0 -_08092864: .4byte 0x0850dab8 + .pool thumb_func_end sub_8092848 thumb_func_start sub_8092868 @@ -298319,21 +288053,20 @@ sub_8092894: @ 8092894 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r2, _080928B0 + ldr r2, =0x02037350 adds r0, r2 - ldr r2, _080928B4 + ldr r2, =sub_80928B8 + 1 bl meta_step pop {r0} bx r0 .align 2, 0 -_080928B0: .4byte 0x02037350 -_080928B4: .4byte sub_80928B8 + 1 + .pool thumb_func_end sub_8092894 thumb_func_start sub_80928B8 sub_80928B8: @ 80928B8 push {r4,lr} - ldr r3, _080928D4 + ldr r3, =0x0850dac0 movs r4, 0x30 ldrsh r2, [r1, r4] lsls r2, 2 @@ -298346,7 +288079,7 @@ sub_80928B8: @ 80928B8 pop {r1} bx r1 .align 2, 0 -_080928D4: .4byte 0x0850dac0 + .pool thumb_func_end sub_80928B8 thumb_func_start sub_80928D8 @@ -298430,190 +288163,190 @@ npc_reset: @ 809293C npc_direction_to_obj_anim_image_number: @ 809295C lsls r0, 24 lsrs r0, 24 - ldr r1, _08092968 + ldr r1, =0x0850dacc adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08092968: .4byte 0x0850dacc + .pool thumb_func_end npc_direction_to_obj_anim_image_number thumb_func_start an_run_any__impl_pulse an_run_any__impl_pulse: @ 809296C lsls r0, 24 lsrs r0, 24 - ldr r1, _08092978 + ldr r1, =0x0850dad5 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08092978: .4byte 0x0850dad5 + .pool thumb_func_end an_run_any__impl_pulse thumb_func_start sub_809297C sub_809297C: @ 809297C lsls r0, 24 lsrs r0, 24 - ldr r1, _08092988 + ldr r1, =0x0850dade adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08092988: .4byte 0x0850dade + .pool thumb_func_end sub_809297C thumb_func_start sub_809298C sub_809298C: @ 809298C lsls r0, 24 lsrs r0, 24 - ldr r1, _08092998 + ldr r1, =0x0850dae7 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08092998: .4byte 0x0850dae7 + .pool thumb_func_end sub_809298C thumb_func_start sub_809299C sub_809299C: @ 809299C lsls r0, 24 lsrs r0, 24 - ldr r1, _080929A8 + ldr r1, =0x0850daf0 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080929A8: .4byte 0x0850daf0 + .pool thumb_func_end sub_809299C thumb_func_start sub_80929AC sub_80929AC: @ 80929AC lsls r0, 24 lsrs r0, 24 - ldr r1, _080929B8 + ldr r1, =0x0850daf9 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080929B8: .4byte 0x0850daf9 + .pool thumb_func_end sub_80929AC thumb_func_start sub_80929BC sub_80929BC: @ 80929BC lsls r0, 24 lsrs r0, 24 - ldr r1, _080929C8 + ldr r1, =0x0850db02 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080929C8: .4byte 0x0850db02 + .pool thumb_func_end sub_80929BC thumb_func_start sub_80929CC sub_80929CC: @ 80929CC lsls r0, 24 lsrs r0, 24 - ldr r1, _080929D8 + ldr r1, =0x0850db0b adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080929D8: .4byte 0x0850db0b + .pool thumb_func_end sub_80929CC thumb_func_start sub_80929DC sub_80929DC: @ 80929DC lsls r0, 24 lsrs r0, 24 - ldr r1, _080929E8 + ldr r1, =0x0850db14 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080929E8: .4byte 0x0850db14 + .pool thumb_func_end sub_80929DC thumb_func_start sub_80929EC sub_80929EC: @ 80929EC lsls r0, 24 lsrs r0, 24 - ldr r1, _080929F8 + ldr r1, =0x0850db1d adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080929F8: .4byte 0x0850db1d + .pool thumb_func_end sub_80929EC thumb_func_start sub_80929FC sub_80929FC: @ 80929FC lsls r0, 24 lsrs r0, 24 - ldr r1, _08092A08 + ldr r1, =0x0850db26 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08092A08: .4byte 0x0850db26 + .pool thumb_func_end sub_80929FC thumb_func_start sub_8092A0C sub_8092A0C: @ 8092A0C lsls r0, 24 lsrs r0, 24 - ldr r1, _08092A18 + ldr r1, =0x0850db2f adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08092A18: .4byte 0x0850db2f + .pool thumb_func_end sub_8092A0C thumb_func_start sub_8092A1C sub_8092A1C: @ 8092A1C lsls r0, 24 lsrs r0, 24 - ldr r1, _08092A28 + ldr r1, =0x0850db38 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08092A28: .4byte 0x0850db38 + .pool thumb_func_end sub_8092A1C thumb_func_start sub_8092A2C sub_8092A2C: @ 8092A2C lsls r0, 24 lsrs r0, 24 - ldr r1, _08092A38 + ldr r1, =0x0850db41 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08092A38: .4byte 0x0850db41 + .pool thumb_func_end sub_8092A2C thumb_func_start sub_8092A3C sub_8092A3C: @ 8092A3C lsls r0, 24 lsrs r0, 24 - ldr r1, _08092A48 + ldr r1, =0x0850db4a adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08092A48: .4byte 0x0850db4a + .pool thumb_func_end sub_8092A3C thumb_func_start sub_8092A4C sub_8092A4C: @ 8092A4C push {lr} adds r2, r0, 0 - ldr r1, _08092A54 + ldr r1, =0x085094ac b _08092A64 .align 2, 0 -_08092A54: .4byte 0x085094ac + .pool _08092A58: ldr r0, [r1] cmp r0, r2 @@ -298755,7 +288488,7 @@ npc_set_running_behaviour_etc: @ 8092B2C strb r3, [r0] adds r0, 0x1 strb r3, [r0] - ldr r4, _08092B70 + ldr r4, =0x02020630 mov r0, r12 ldrb r2, [r0, 0x4] lsls r0, r2, 4 @@ -298764,7 +288497,7 @@ npc_set_running_behaviour_etc: @ 8092B2C adds r2, r4, 0 adds r2, 0x1C adds r0, r2 - ldr r2, _08092B74 + ldr r2, =0x08505438 lsls r1, 2 adds r1, r2 ldr r1, [r1] @@ -298780,20 +288513,19 @@ npc_set_running_behaviour_etc: @ 8092B2C pop {r0} bx r0 .align 2, 0 -_08092B70: .4byte 0x02020630 -_08092B74: .4byte 0x08505438 + .pool thumb_func_end npc_set_running_behaviour_etc thumb_func_start npc_running_behaviour_by_direction npc_running_behaviour_by_direction: @ 8092B78 lsls r0, 24 lsrs r0, 24 - ldr r1, _08092B84 + ldr r1, =0x0850db53 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08092B84: .4byte 0x0850db53 + .pool thumb_func_end npc_running_behaviour_by_direction thumb_func_start sub_8092B88 @@ -299106,7 +288838,7 @@ tile_x30_to_x37_related: @ 8092DC8 lsls r2, 16 lsrs r7, r2, 16 lsls r3, 24 - ldr r1, _08092E10 + ldr r1, =0x0850db5c lsrs r3, 22 subs r5, r3, 0x4 adds r1, r5, r1 @@ -299116,7 +288848,7 @@ tile_x30_to_x37_related: @ 8092DC8 lsls r0, 24 cmp r0, 0 bne _08092E0A - ldr r4, _08092E14 + ldr r4, =0x0850db6c adds r4, r5, r4 lsls r0, r6, 16 asrs r0, 16 @@ -299134,8 +288866,7 @@ _08092E0A: movs r0, 0x1 b _08092E1A .align 2, 0 -_08092E10: .4byte 0x0850db5c -_08092E14: .4byte 0x0850db6c + .pool _08092E18: movs r0, 0 _08092E1A: @@ -299157,7 +288888,7 @@ _08092E2E: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 - ldr r1, _08092E84 + ldr r1, =0x02037350 adds r2, r0, r1 ldrb r0, [r2] lsls r0, 31 @@ -299198,7 +288929,7 @@ _08092E68: movs r0, 0x1 b _08092E94 .align 2, 0 -_08092E84: .4byte 0x02037350 + .pool _08092E88: adds r0, r4, 0x1 lsls r0, 24 @@ -299227,8 +288958,8 @@ sub_8092E9C: @ 8092E9C lsls r0, 24 cmp r0, 0 bne _08092EE8 - ldr r3, _08092EE0 - ldr r2, _08092EE4 + ldr r3, =0x02020630 + ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -299248,8 +288979,7 @@ sub_8092E9C: @ 8092E9C movs r0, 0x1 b _08092EEA .align 2, 0 -_08092EE0: .4byte 0x02020630 -_08092EE4: .4byte 0x02037350 + .pool _08092EE8: movs r0, 0 _08092EEA: @@ -299273,8 +289003,8 @@ sub_8092EF0: @ 8092EF0 lsls r0, 24 cmp r0, 0 bne _08092F2E - ldr r3, _08092F34 - ldr r2, _08092F38 + ldr r3, =0x02020630 + ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -299295,15 +289025,14 @@ _08092F2E: pop {r0} bx r0 .align 2, 0 -_08092F34: .4byte 0x02020630 -_08092F38: .4byte 0x02037350 + .pool thumb_func_end sub_8092EF0 thumb_func_start numbers_move_direction numbers_move_direction: @ 8092F3C push {r4,lr} lsls r0, 24 - ldr r3, _08092F5C + ldr r3, =0x0850db7c lsrs r0, 22 adds r0, r3 ldrh r3, [r0] @@ -299318,14 +289047,14 @@ numbers_move_direction: @ 8092F3C pop {r0} bx r0 .align 2, 0 -_08092F5C: .4byte 0x0850db7c + .pool thumb_func_end numbers_move_direction thumb_func_start sub_8092F60 sub_8092F60: @ 8092F60 push {r4,lr} lsls r0, 24 - ldr r3, _08092F84 + ldr r3, =0x0850db7c lsrs r0, 22 adds r0, r3 ldrh r3, [r0] @@ -299342,7 +289071,7 @@ sub_8092F60: @ 8092F60 pop {r0} bx r0 .align 2, 0 -_08092F84: .4byte 0x0850db7c + .pool thumb_func_end sub_8092F60 thumb_func_start sub_8092F88 @@ -299357,7 +289086,7 @@ sub_8092F88: @ 8092F88 lsls r1, 16 lsrs r6, r1, 16 mov r12, r6 - ldr r1, _08092FEC + ldr r1, =0x0850db7c lsrs r0, 22 adds r5, r0, r1 movs r0, 0 @@ -299401,13 +289130,13 @@ _08092FE4: pop {r0} bx r0 .align 2, 0 -_08092FEC: .4byte 0x0850db7c + .pool thumb_func_end sub_8092F88 thumb_func_start sub_8092FF0 sub_8092FF0: @ 8092FF0 push {r4,r5,lr} - ldr r5, _0809302C + ldr r5, =0x03005d8c ldr r4, [r5] ldrh r4, [r4] lsls r0, 16 @@ -299422,12 +289151,12 @@ sub_8092FF0: @ 8092FF0 subs r1, r0 lsls r1, 4 strh r1, [r3] - ldr r1, _08093030 + ldr r1, =0x03005dec ldrh r0, [r2] ldrh r1, [r1] subs r0, r1 strh r0, [r2] - ldr r1, _08093034 + ldr r1, =0x03005de8 ldrh r0, [r3] ldrh r1, [r1] subs r0, r1 @@ -299436,9 +289165,7 @@ sub_8092FF0: @ 8092FF0 pop {r0} bx r0 .align 2, 0 -_0809302C: .4byte 0x03005d8c -_08093030: .4byte 0x03005dec -_08093034: .4byte 0x03005de8 + .pool thumb_func_end sub_8092FF0 thumb_func_start sub_8093038 @@ -299450,15 +289177,15 @@ sub_8093038: @ 8093038 lsrs r5, r0, 16 lsls r1, 16 lsrs r6, r1, 16 - ldr r0, _080930CC + ldr r0, =0x03005dec ldrh r0, [r0] negs r0, r0 - ldr r1, _080930D0 + ldr r1, =0x03005dd0 ldr r2, [r1, 0x10] subs r0, r2 lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _080930D4 + ldr r0, =0x03005de8 ldrh r0, [r0] negs r0, r0 ldr r1, [r1, 0x14] @@ -299476,7 +289203,7 @@ _08093072: cmp r2, 0 bge _0809307E lsls r0, r3, 16 - ldr r2, _080930D8 + ldr r2, =0xfff00000 adds r0, r2 lsrs r3, r0, 16 _0809307E: @@ -299491,11 +289218,11 @@ _0809308C: cmp r1, 0 bge _08093098 lsls r0, r4, 16 - ldr r1, _080930D8 + ldr r1, =0xfff00000 adds r0, r1 lsrs r4, r0, 16 _08093098: - ldr r2, _080930DC + ldr r2, =0x03005d8c ldr r0, [r2] ldrh r1, [r0] lsls r0, r5, 16 @@ -299521,11 +289248,7 @@ _08093098: pop {r0} bx r0 .align 2, 0 -_080930CC: .4byte 0x03005dec -_080930D0: .4byte 0x03005dd0 -_080930D4: .4byte 0x03005de8 -_080930D8: .4byte 0xfff00000 -_080930DC: .4byte 0x03005d8c + .pool thumb_func_end sub_8093038 thumb_func_start sub_80930E0 @@ -299575,7 +289298,7 @@ sub_809312C: @ 809312C movs r0, 0 strh r0, [r2] strh r0, [r1] - ldr r3, _08093168 + ldr r3, =0x03005dd0 ldr r0, [r3, 0x10] cmp r0, 0 ble _08093142 @@ -299605,7 +289328,7 @@ _08093164: pop {r0} bx r0 .align 2, 0 -_08093168: .4byte 0x03005dd0 + .pool thumb_func_end sub_809312C thumb_func_start npc_move_direction_hypothetical @@ -299683,7 +289406,7 @@ npc_set_state_2: @ 80931C0 movs r1, 0x7F ands r0, r1 strb r0, [r4] - ldr r2, _080931FC + ldr r2, =0x02020630 ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -299693,7 +289416,7 @@ npc_set_state_2: @ 80931C0 movs r0, 0 b _08093202 .align 2, 0 -_080931FC: .4byte 0x02020630 + .pool _08093200: movs r0, 0x1 _08093202: @@ -299743,7 +289466,7 @@ rom_npc_by_local_id_and_map_get_trainer_flag: @ 809323C movs r2, 0x7F ands r1, r2 strb r1, [r0] - ldr r3, _0809326C + ldr r3, =0x02020630 ldrb r2, [r0, 0x4] lsls r1, r2, 4 adds r1, r2 @@ -299759,7 +289482,7 @@ rom_npc_by_local_id_and_map_get_trainer_flag: @ 809323C strh r2, [r0, 0x32] bx lr .align 2, 0 -_0809326C: .4byte 0x02020630 + .pool thumb_func_end rom_npc_by_local_id_and_map_get_trainer_flag thumb_func_start npc_get_bit7_or_const_x10_when_inactive @@ -299873,7 +289596,7 @@ d2s_look1: @ 8093330 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093358 + ldr r1, =0x0850dba0 mov r0, sp movs r2, 0x5 bl memcpy @@ -299889,7 +289612,7 @@ _08093348: pop {r1} bx r1 .align 2, 0 -_08093358: .4byte 0x0850dba0 + .pool thumb_func_end d2s_look1 thumb_func_start d2s_walk @@ -299898,7 +289621,7 @@ d2s_walk: @ 809335C sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093384 + ldr r1, =0x0850dba5 mov r0, sp movs r2, 0x5 bl memcpy @@ -299914,7 +289637,7 @@ _08093374: pop {r1} bx r1 .align 2, 0 -_08093384: .4byte 0x0850dba5 + .pool thumb_func_end d2s_walk thumb_func_start sub_8093388 @@ -299923,7 +289646,7 @@ sub_8093388: @ 8093388 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080933B0 + ldr r1, =0x0850dbaa mov r0, sp movs r2, 0x5 bl memcpy @@ -299939,7 +289662,7 @@ _080933A0: pop {r1} bx r1 .align 2, 0 -_080933B0: .4byte 0x0850dbaa + .pool thumb_func_end sub_8093388 thumb_func_start sub_80933B4 @@ -299948,7 +289671,7 @@ sub_80933B4: @ 80933B4 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080933DC + ldr r1, =0x0850dbaf mov r0, sp movs r2, 0x5 bl memcpy @@ -299964,7 +289687,7 @@ _080933CC: pop {r1} bx r1 .align 2, 0 -_080933DC: .4byte 0x0850dbaf + .pool thumb_func_end sub_80933B4 thumb_func_start sub_80933E0 @@ -299973,7 +289696,7 @@ sub_80933E0: @ 80933E0 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093408 + ldr r1, =0x0850dbb4 mov r0, sp movs r2, 0x5 bl memcpy @@ -299989,7 +289712,7 @@ _080933F8: pop {r1} bx r1 .align 2, 0 -_08093408: .4byte 0x0850dbb4 + .pool thumb_func_end sub_80933E0 thumb_func_start sub_809340C @@ -299998,7 +289721,7 @@ sub_809340C: @ 809340C sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093434 + ldr r1, =0x0850dbb9 mov r0, sp movs r2, 0x5 bl memcpy @@ -300014,7 +289737,7 @@ _08093424: pop {r1} bx r1 .align 2, 0 -_08093434: .4byte 0x0850dbb9 + .pool thumb_func_end sub_809340C thumb_func_start sub_8093438 @@ -300023,7 +289746,7 @@ sub_8093438: @ 8093438 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093460 + ldr r1, =0x0850dbbe mov r0, sp movs r2, 0x5 bl memcpy @@ -300039,7 +289762,7 @@ _08093450: pop {r1} bx r1 .align 2, 0 -_08093460: .4byte 0x0850dbbe + .pool thumb_func_end sub_8093438 thumb_func_start sub_8093464 @@ -300048,7 +289771,7 @@ sub_8093464: @ 8093464 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0809348C + ldr r1, =0x0850dbc3 mov r0, sp movs r2, 0x5 bl memcpy @@ -300064,7 +289787,7 @@ _0809347C: pop {r1} bx r1 .align 2, 0 -_0809348C: .4byte 0x0850dbc3 + .pool thumb_func_end sub_8093464 thumb_func_start d2s_08064110 @@ -300073,7 +289796,7 @@ d2s_08064110: @ 8093490 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080934B8 + ldr r1, =0x0850dbc8 mov r0, sp movs r2, 0x5 bl memcpy @@ -300089,7 +289812,7 @@ _080934A8: pop {r1} bx r1 .align 2, 0 -_080934B8: .4byte 0x0850dbc8 + .pool thumb_func_end d2s_08064110 thumb_func_start sub_80934BC @@ -300098,7 +289821,7 @@ sub_80934BC: @ 80934BC sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080934E4 + ldr r1, =0x0850dbcd mov r0, sp movs r2, 0x5 bl memcpy @@ -300114,7 +289837,7 @@ _080934D4: pop {r1} bx r1 .align 2, 0 -_080934E4: .4byte 0x0850dbcd + .pool thumb_func_end sub_80934BC thumb_func_start sub_80934E8 @@ -300123,7 +289846,7 @@ sub_80934E8: @ 80934E8 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093510 + ldr r1, =0x0850dbd2 mov r0, sp movs r2, 0x5 bl memcpy @@ -300139,7 +289862,7 @@ _08093500: pop {r1} bx r1 .align 2, 0 -_08093510: .4byte 0x0850dbd2 + .pool thumb_func_end sub_80934E8 thumb_func_start sub_8093514 @@ -300148,7 +289871,7 @@ sub_8093514: @ 8093514 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0809353C + ldr r1, =0x0850dbd7 mov r0, sp movs r2, 0x5 bl memcpy @@ -300164,7 +289887,7 @@ _0809352C: pop {r1} bx r1 .align 2, 0 -_0809353C: .4byte 0x0850dbd7 + .pool thumb_func_end sub_8093514 thumb_func_start sub_8093540 @@ -300173,7 +289896,7 @@ sub_8093540: @ 8093540 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093568 + ldr r1, =0x0850dbdc mov r0, sp movs r2, 0x5 bl memcpy @@ -300189,7 +289912,7 @@ _08093558: pop {r1} bx r1 .align 2, 0 -_08093568: .4byte 0x0850dbdc + .pool thumb_func_end sub_8093540 thumb_func_start sub_809356C @@ -300198,7 +289921,7 @@ sub_809356C: @ 809356C sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093594 + ldr r1, =0x0850dbe1 mov r0, sp movs r2, 0x5 bl memcpy @@ -300214,7 +289937,7 @@ _08093584: pop {r1} bx r1 .align 2, 0 -_08093594: .4byte 0x0850dbe1 + .pool thumb_func_end sub_809356C thumb_func_start d2s_08064244 @@ -300223,7 +289946,7 @@ d2s_08064244: @ 8093598 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080935C0 + ldr r1, =0x0850dbe6 mov r0, sp movs r2, 0x5 bl memcpy @@ -300239,7 +289962,7 @@ _080935B0: pop {r1} bx r1 .align 2, 0 -_080935C0: .4byte 0x0850dbe6 + .pool thumb_func_end d2s_08064244 thumb_func_start sub_80935C4 @@ -300248,7 +289971,7 @@ sub_80935C4: @ 80935C4 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080935EC + ldr r1, =0x0850dbeb mov r0, sp movs r2, 0x5 bl memcpy @@ -300264,7 +289987,7 @@ _080935DC: pop {r1} bx r1 .align 2, 0 -_080935EC: .4byte 0x0850dbeb + .pool thumb_func_end sub_80935C4 thumb_func_start sub_80935F0 @@ -300273,7 +289996,7 @@ sub_80935F0: @ 80935F0 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093618 + ldr r1, =0x0850dbf0 mov r0, sp movs r2, 0x5 bl memcpy @@ -300289,7 +290012,7 @@ _08093608: pop {r1} bx r1 .align 2, 0 -_08093618: .4byte 0x0850dbf0 + .pool thumb_func_end sub_80935F0 thumb_func_start npc_reciprocate_look @@ -300320,7 +290043,7 @@ sub_8093648: @ 8093648 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093670 + ldr r1, =0x0850dbf5 mov r0, sp movs r2, 0x5 bl memcpy @@ -300336,7 +290059,7 @@ _08093660: pop {r1} bx r1 .align 2, 0 -_08093670: .4byte 0x0850dbf5 + .pool thumb_func_end sub_8093648 thumb_func_start sub_8093674 @@ -300345,7 +290068,7 @@ sub_8093674: @ 8093674 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0809369C + ldr r1, =0x0850dbfa mov r0, sp movs r2, 0x5 bl memcpy @@ -300361,7 +290084,7 @@ _0809368C: pop {r1} bx r1 .align 2, 0 -_0809369C: .4byte 0x0850dbfa + .pool thumb_func_end sub_8093674 thumb_func_start sub_80936A0 @@ -300370,7 +290093,7 @@ sub_80936A0: @ 80936A0 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080936C8 + ldr r1, =0x0850dbff mov r0, sp movs r2, 0x5 bl memcpy @@ -300386,7 +290109,7 @@ _080936B8: pop {r1} bx r1 .align 2, 0 -_080936C8: .4byte 0x0850dbff + .pool thumb_func_end sub_80936A0 thumb_func_start sub_80936CC @@ -300395,7 +290118,7 @@ sub_80936CC: @ 80936CC sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080936F4 + ldr r1, =0x0850dc04 mov r0, sp movs r2, 0x5 bl memcpy @@ -300411,7 +290134,7 @@ _080936E4: pop {r1} bx r1 .align 2, 0 -_080936F4: .4byte 0x0850dc04 + .pool thumb_func_end sub_80936CC thumb_func_start sub_80936F8 @@ -300420,7 +290143,7 @@ sub_80936F8: @ 80936F8 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093720 + ldr r1, =0x0850dc09 mov r0, sp movs r2, 0x5 bl memcpy @@ -300436,7 +290159,7 @@ _08093710: pop {r1} bx r1 .align 2, 0 -_08093720: .4byte 0x0850dc09 + .pool thumb_func_end sub_80936F8 thumb_func_start sub_8093724 @@ -300445,7 +290168,7 @@ sub_8093724: @ 8093724 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0809374C + ldr r1, =0x0850dc0e mov r0, sp movs r2, 0x5 bl memcpy @@ -300461,7 +290184,7 @@ _0809373C: pop {r1} bx r1 .align 2, 0 -_0809374C: .4byte 0x0850dc0e + .pool thumb_func_end sub_8093724 thumb_func_start sub_8093750 @@ -300470,7 +290193,7 @@ sub_8093750: @ 8093750 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093778 + ldr r1, =0x0850dc13 mov r0, sp movs r2, 0x5 bl memcpy @@ -300486,7 +290209,7 @@ _08093768: pop {r1} bx r1 .align 2, 0 -_08093778: .4byte 0x0850dc13 + .pool thumb_func_end sub_8093750 thumb_func_start sub_809377C @@ -300495,7 +290218,7 @@ sub_809377C: @ 809377C sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080937A4 + ldr r1, =0x0850dc18 mov r0, sp movs r2, 0x5 bl memcpy @@ -300511,7 +290234,7 @@ _08093794: pop {r1} bx r1 .align 2, 0 -_080937A4: .4byte 0x0850dc18 + .pool thumb_func_end sub_809377C thumb_func_start sub_80937A8 @@ -300520,7 +290243,7 @@ sub_80937A8: @ 80937A8 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080937D0 + ldr r1, =0x0850dc1d mov r0, sp movs r2, 0x5 bl memcpy @@ -300536,7 +290259,7 @@ _080937C0: pop {r1} bx r1 .align 2, 0 -_080937D0: .4byte 0x0850dc1d + .pool thumb_func_end sub_80937A8 thumb_func_start d2s_08064034 @@ -300545,7 +290268,7 @@ d2s_08064034: @ 80937D4 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080937FC + ldr r1, =0x0850dc22 mov r0, sp movs r2, 0x5 bl memcpy @@ -300561,7 +290284,7 @@ _080937EC: pop {r1} bx r1 .align 2, 0 -_080937FC: .4byte 0x0850dc22 + .pool thumb_func_end d2s_08064034 thumb_func_start direction_reversed @@ -300570,7 +290293,7 @@ direction_reversed: @ 8093800 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08093824 + ldr r1, =0x0850dc27 mov r0, sp movs r2, 0x8 bl memcpy @@ -300584,7 +290307,7 @@ direction_reversed: @ 8093800 ldrb r0, [r0] b _0809382A .align 2, 0 -_08093824: .4byte 0x0850dc27 + .pool _08093828: adds r0, r4, 0 _0809382A: @@ -300599,7 +290322,7 @@ zffu_offset_calc: @ 8093834 lsls r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _08093848 + ldr r2, =0x0850dc2f lsrs r0, 22 subs r0, 0x5 adds r1, r0 @@ -300607,7 +290330,7 @@ zffu_offset_calc: @ 8093834 ldrb r0, [r1] bx lr .align 2, 0 -_08093848: .4byte 0x0850dc2f + .pool thumb_func_end zffu_offset_calc thumb_func_start state_to_direction @@ -300634,7 +290357,7 @@ _0809386C: _08093870: adds r1, r2, 0 bl zffu_offset_calc - ldr r2, _08093888 + ldr r2, =0x0850dc3f lsls r1, r4, 2 subs r1, 0x5 adds r0, r1 @@ -300645,14 +290368,14 @@ _08093882: pop {r1} bx r1 .align 2, 0 -_08093888: .4byte 0x0850dc3f + .pool thumb_func_end state_to_direction thumb_func_start npc_obj_exec_an_2 npc_obj_exec_an_2: @ 809388C push {r4,lr} adds r4, r0, 0 - ldr r2, _080938C0 + ldr r2, =0x0850dc50 ldrb r0, [r4, 0x1C] lsls r0, 2 adds r0, r2 @@ -300676,7 +290399,7 @@ _080938B8: pop {r0} bx r0 .align 2, 0 -_080938C0: .4byte 0x0850dc50 + .pool thumb_func_end npc_obj_exec_an_2 thumb_func_start npc_obj_exec_an @@ -300684,7 +290407,7 @@ npc_obj_exec_an: @ 80938C4 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _080938F0 + ldr r1, =0x0850dc50 ldrb r0, [r4, 0x1C] lsls r0, 2 adds r0, r1 @@ -300703,7 +290426,7 @@ npc_obj_exec_an: @ 80938C4 movs r0, 0 b _080938FE .align 2, 0 -_080938F0: .4byte 0x0850dc50 + .pool _080938F4: movs r0, 0xFF strb r0, [r4, 0x1C] @@ -300843,7 +290566,7 @@ npc_apply_direction: @ 8093990 negs r0, r0 ands r0, r1 strb r0, [r4] - ldr r0, _08093A28 + ldr r0, =0x020375b8 ldr r0, [r0] cmp r0, 0 beq _08093A0E @@ -300872,7 +290595,7 @@ _08093A0E: pop {r0} bx r0 .align 2, 0 -_08093A28: .4byte 0x020375b8 + .pool thumb_func_end npc_apply_direction thumb_func_start an_run_any @@ -300889,7 +290612,7 @@ an_run_any: @ 8093A2C lsls r4, 24 lsrs r4, 24 mov r1, sp - ldr r0, _08093A84 + ldr r0, =0x0850dee8 ldm r0!, {r3,r6,r7} stm r1!, {r3,r6,r7} ldm r0!, {r3,r6} @@ -300919,7 +290642,7 @@ an_run_any: @ 8093A2C pop {r0} bx r0 .align 2, 0 -_08093A84: .4byte 0x0850dee8 + .pool thumb_func_end an_run_any thumb_func_start sub_8093A88 @@ -301711,7 +291434,7 @@ sub_8093FC4: @ 8093FC4 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _0809407C + ldr r1, =0x0850dfbc add r0, sp, 0x4 movs r2, 0x6 bl memcpy @@ -301779,7 +291502,7 @@ sub_8093FC4: @ 8093FC4 pop {r0} bx r0 .align 2, 0 -_0809407C: .4byte 0x0850dfbc + .pool thumb_func_end sub_8093FC4 thumb_func_start maybe_shadow_1 @@ -301825,7 +291548,7 @@ sub_80940C4: @ 80940C4 adds r6, r0, 0 adds r7, r1, 0 adds r4, r2, 0 - ldr r1, _08094150 + ldr r1, =0x0850dfc2 add r0, sp, 0x4 movs r2, 0x6 bl memcpy @@ -301884,7 +291607,7 @@ sub_80940C4: @ 80940C4 strb r0, [r6] b _08094178 .align 2, 0 -_08094150: .4byte 0x0850dfc2 + .pool _08094154: mov r1, r8 cmp r1, 0xFF @@ -301916,27 +291639,27 @@ _08094178: thumb_func_start sub_8094188 sub_8094188: @ 8094188 push {lr} - ldr r2, _08094198 + ldr r2, =sub_809785C + 1 bl sub_80940C4 lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_08094198: .4byte sub_809785C + 1 + .pool thumb_func_end sub_8094188 thumb_func_start sub_809419C sub_809419C: @ 809419C push {lr} - ldr r2, _080941AC + ldr r2, =sub_80978E4 + 1 bl sub_80940C4 lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_080941AC: .4byte sub_80978E4 + 1 + .pool thumb_func_end sub_809419C thumb_func_start sub_80941B0 @@ -303901,7 +293624,7 @@ sub_8094F38: @ 8094F38 ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] - ldr r4, _08094F90 + ldr r4, =0x02037350 mov r2, sp ldrb r2, [r2] lsls r3, r2, 3 @@ -303927,7 +293650,7 @@ _08094F82: pop {r1} bx r1 .align 2, 0 -_08094F90: .4byte 0x02037350 + .pool thumb_func_end sub_8094F38 thumb_func_start sub_8094F94 @@ -303948,7 +293671,7 @@ sub_8094F94: @ 8094F94 ldrsh r0, [r5, r1] movs r2, 0x12 ldrsh r1, [r5, r2] - ldr r4, _08094FF4 + ldr r4, =0x02037350 mov r2, sp ldrb r2, [r2] lsls r3, r2, 3 @@ -303977,7 +293700,7 @@ _08094FE6: pop {r1} bx r1 .align 2, 0 -_08094FF4: .4byte 0x02037350 + .pool thumb_func_end sub_8094F94 thumb_func_start sub_8094FF8 @@ -304594,7 +294317,7 @@ _08095430: thumb_func_start sub_8095438 sub_8095438: @ 8095438 push {lr} - ldr r3, _0809544C + ldr r3, =0x085055cd ldrb r2, [r0, 0x6] adds r2, r3 ldrb r2, [r2] @@ -304603,7 +294326,7 @@ sub_8095438: @ 8095438 pop {r1} bx r1 .align 2, 0 -_0809544C: .4byte 0x085055cd + .pool thumb_func_end sub_8095438 thumb_func_start sub_8095450 @@ -304702,7 +294425,7 @@ sub_80954CC: @ 80954CC sub_80954DC: @ 80954DC push {r4,lr} adds r4, r1, 0 - ldr r1, _080954FC + ldr r1, =0x02038c08 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -304715,14 +294438,14 @@ sub_80954DC: @ 80954DC pop {r1} bx r1 .align 2, 0 -_080954FC: .4byte 0x02038c08 + .pool thumb_func_end sub_80954DC thumb_func_start sub_8095500 sub_8095500: @ 8095500 push {r4,lr} adds r4, r1, 0 - ldr r1, _08095520 + ldr r1, =0x02038c08 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -304735,14 +294458,14 @@ sub_8095500: @ 8095500 pop {r1} bx r1 .align 2, 0 -_08095520: .4byte 0x02038c08 + .pool thumb_func_end sub_8095500 thumb_func_start sub_8095524 sub_8095524: @ 8095524 push {r4,lr} adds r4, r1, 0 - ldr r1, _08095544 + ldr r1, =0x02038c08 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -304755,7 +294478,7 @@ sub_8095524: @ 8095524 pop {r1} bx r1 .align 2, 0 -_08095544: .4byte 0x02038c08 + .pool thumb_func_end sub_8095524 thumb_func_start sub_8095548 @@ -307083,7 +296806,7 @@ sub_8096530: @ 8096530 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 - ldr r2, _0809658C + ldr r2, =0x02021bbc adds r0, r1 ldrh r2, [r2] adds r0, r2 @@ -307097,14 +296820,13 @@ sub_8096530: @ 8096530 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 - ldr r2, _08096590 + ldr r2, =0x02021bbe adds r0, r1 ldrh r2, [r2] adds r0, r2 b _080965BC .align 2, 0 -_0809658C: .4byte 0x02021bbc -_08096590: .4byte 0x02021bbe + .pool _08096594: ldrh r1, [r4, 0x24] ldrh r0, [r4, 0x20] @@ -307330,7 +297052,7 @@ dp03_build_bits_water: @ 8096750 sub sp, 0x8 adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _08096794 + ldr r0, =0x0850e5dc ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] @@ -307360,7 +297082,7 @@ dp03_build_bits_water: @ 8096750 str r1, [r5] b _080967A2 .align 2, 0 -_08096794: .4byte 0x0850e5dc + .pool _08096798: ldrb r1, [r4, 0x2] movs r0, 0x3 @@ -307744,12 +297466,12 @@ dp03_build_bits_by_block_behaviour: @ 8096A30 adds r7, r0, 0 adds r6, r1, 0 ldr r0, [r7] - ldr r1, _08096A6C + ldr r1, =0x02000020 ands r0, r1 cmp r0, 0x20 bne _08096A82 movs r5, 0 - ldr r0, _08096A70 + ldr r0, =0x0850e5e4 mov r8, r0 _08096A4A: lsls r4, r5, 2 @@ -307761,7 +297483,7 @@ _08096A4A: lsls r0, 24 cmp r0, 0 beq _08096A78 - ldr r0, _08096A74 + ldr r0, =0x0850e5fc adds r0, r4, r0 ldr r1, [r6] ldr r0, [r0] @@ -307769,9 +297491,7 @@ _08096A4A: str r1, [r6] b _08096A82 .align 2, 0 -_08096A6C: .4byte 0x02000020 -_08096A70: .4byte 0x0850e5e4 -_08096A74: .4byte 0x0850e5fc + .pool _08096A78: adds r0, r5, 0x1 lsls r0, 24 @@ -308005,7 +297725,7 @@ _08096C28: bl cur_mapdata_block_get_role_at lsls r0, 24 lsrs r0, 24 - ldr r2, _08096C58 + ldr r2, =0x0850e614 lsls r1, r4, 2 adds r1, r2 ldr r1, [r1] @@ -308018,7 +297738,7 @@ _08096C52: movs r0, 0 b _08096C62 .align 2, 0 -_08096C58: .4byte 0x0850e614 + .pool _08096C5C: adds r0, r4, 0x1 lsls r0, 24 @@ -308122,7 +297842,7 @@ sub_8096D00: @ 8096D00 blt _08096D4E adds r0, r4, 0 bl sub_8096DB8 - ldr r1, _08096D54 + ldr r1, =0x0850e644 ldrb r2, [r4, 0xB] lsls r2, 24 lsrs r0, r2, 28 @@ -308138,7 +297858,7 @@ sub_8096D00: @ 8096D00 ands r0, r3 orrs r0, r1 strb r0, [r4] - ldr r0, _08096D58 + ldr r0, =0x0850e634 lsrs r2, 28 adds r2, r0 movs r0, 0x3 @@ -308156,8 +297876,7 @@ _08096D4E: pop {r0} bx r0 .align 2, 0 -_08096D54: .4byte 0x0850e644 -_08096D58: .4byte 0x0850e634 + .pool thumb_func_end sub_8096D00 thumb_func_start sub_8096D5C @@ -308165,7 +297884,7 @@ sub_8096D5C: @ 8096D5C push {r4,lr} lsls r1, 24 lsrs r1, 24 - ldr r2, _08096DA0 + ldr r2, =0x0850e644 adds r2, r1, r2 ldrb r2, [r2] movs r3, 0x42 @@ -308181,7 +297900,7 @@ sub_8096D5C: @ 8096D5C orrs r2, r3 mov r3, r12 strb r2, [r3] - ldr r2, _08096DA4 + ldr r2, =0x0850e634 adds r1, r2 movs r3, 0x3 ldrb r2, [r1] @@ -308197,20 +297916,19 @@ sub_8096D5C: @ 8096D5C pop {r0} bx r0 .align 2, 0 -_08096DA0: .4byte 0x0850e644 -_08096DA4: .4byte 0x0850e634 + .pool thumb_func_end sub_8096D5C thumb_func_start sub_8096DA8 sub_8096DA8: @ 8096DA8 lsls r0, 24 lsrs r0, 24 - ldr r1, _08096DB4 + ldr r1, =0x0850e634 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08096DB4: .4byte 0x0850e634 + .pool thumb_func_end sub_8096DA8 thumb_func_start sub_8096DB8 @@ -308270,7 +297988,7 @@ npc_y_height_related: @ 8096E0C movs r5, 0 ldrsb r5, [r3, r5] ldrh r4, [r1, 0x22] - ldr r3, _08096E4C + ldr r3, =0x02021bbe subs r4, r5 ldrh r3, [r3] adds r4, r3 @@ -308281,7 +297999,7 @@ npc_y_height_related: @ 8096E0C movs r3, 0x10 subs r3, r4 lsls r3, 17 - ldr r4, _08096E50 + ldr r4, =0x0850e624 adds r0, r4 lsrs r3, 16 ldrb r0, [r0] @@ -308293,8 +298011,7 @@ npc_y_height_related: @ 8096E0C pop {r0} bx r0 .align 2, 0 -_08096E4C: .4byte 0x02021bbe -_08096E50: .4byte 0x0850e624 + .pool thumb_func_end npc_y_height_related thumb_func_start npc_y_height_related_ @@ -308340,7 +298057,7 @@ _08096E8C: thumb_func_start dp03_step_grass_normal dp03_step_grass_normal: @ 8096E90 push {lr} - ldr r3, _08096ED4 + ldr r3, =0x02038c08 movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -308359,7 +298076,7 @@ dp03_step_grass_normal: @ 8096E90 str r1, [r3, 0x10] ldrb r0, [r0, 0xA] str r0, [r3, 0x14] - ldr r0, _08096ED8 + ldr r0, =0x03005d8c ldr r1, [r0] ldrb r0, [r1, 0x5] lsls r0, 8 @@ -308373,14 +298090,13 @@ dp03_step_grass_normal: @ 8096E90 pop {r0} bx r0 .align 2, 0 -_08096ED4: .4byte 0x02038c08 -_08096ED8: .4byte 0x03005d8c + .pool thumb_func_end dp03_step_grass_normal thumb_func_start dp03_step_grass_elastic dp03_step_grass_elastic: @ 8096EDC push {lr} - ldr r3, _08096F20 + ldr r3, =0x02038c08 movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -308399,7 +298115,7 @@ dp03_step_grass_elastic: @ 8096EDC str r1, [r3, 0x10] ldrb r0, [r0, 0xA] str r0, [r3, 0x14] - ldr r0, _08096F24 + ldr r0, =0x03005d8c ldr r1, [r0] ldrb r0, [r1, 0x5] lsls r0, 8 @@ -308413,14 +298129,13 @@ dp03_step_grass_elastic: @ 8096EDC pop {r0} bx r0 .align 2, 0 -_08096F20: .4byte 0x02038c08 -_08096F24: .4byte 0x03005d8c + .pool thumb_func_end dp03_step_grass_elastic thumb_func_start dp03_step_grass_tall_1 dp03_step_grass_tall_1: @ 8096F28 push {lr} - ldr r3, _08096F6C + ldr r3, =0x02038c08 movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -308439,7 +298154,7 @@ dp03_step_grass_tall_1: @ 8096F28 str r1, [r3, 0x10] ldrb r0, [r0, 0xA] str r0, [r3, 0x14] - ldr r0, _08096F70 + ldr r0, =0x03005d8c ldr r1, [r0] ldrb r0, [r1, 0x5] lsls r0, 8 @@ -308453,14 +298168,13 @@ dp03_step_grass_tall_1: @ 8096F28 pop {r0} bx r0 .align 2, 0 -_08096F6C: .4byte 0x02038c08 -_08096F70: .4byte 0x03005d8c + .pool thumb_func_end dp03_step_grass_tall_1 thumb_func_start dp03_step_grass_tall_0 dp03_step_grass_tall_0: @ 8096F74 push {lr} - ldr r3, _08096FB8 + ldr r3, =0x02038c08 movs r2, 0x10 ldrsh r1, [r0, r2] str r1, [r3] @@ -308479,7 +298193,7 @@ dp03_step_grass_tall_0: @ 8096F74 str r1, [r3, 0x10] ldrb r0, [r0, 0xA] str r0, [r3, 0x14] - ldr r0, _08096FBC + ldr r0, =0x03005d8c ldr r1, [r0] ldrb r0, [r1, 0x5] lsls r0, 8 @@ -308493,8 +298207,7 @@ dp03_step_grass_tall_0: @ 8096F74 pop {r0} bx r0 .align 2, 0 -_08096FB8: .4byte 0x02038c08 -_08096FBC: .4byte 0x03005d8c + .pool thumb_func_end dp03_step_grass_tall_0 thumb_func_start dp03_step_water_reflection_0 @@ -308532,7 +298245,7 @@ sub_8096FE8: @ 8096FE8 adds r5, r1, 0 ldrb r0, [r4, 0x5] bl npc_get_type - ldr r1, _08097010 + ldr r1, =0x0850e654 ldrb r0, [r0, 0xD] lsls r0, 2 adds r0, r1 @@ -308545,7 +298258,7 @@ sub_8096FE8: @ 8096FE8 pop {r0} bx r0 .align 2, 0 -_08097010: .4byte 0x0850e654 + .pool thumb_func_end sub_8096FE8 thumb_func_start dp03_step_sand_heavy @@ -308555,7 +298268,7 @@ dp03_step_sand_heavy: @ 8097014 adds r5, r1, 0 ldrb r0, [r4, 0x5] bl npc_get_type - ldr r1, _0809703C + ldr r1, =0x0850e654 ldrb r0, [r0, 0xD] lsls r0, 2 adds r0, r1 @@ -308568,7 +298281,7 @@ dp03_step_sand_heavy: @ 8097014 pop {r0} bx r0 .align 2, 0 -_0809703C: .4byte 0x0850e654 + .pool thumb_func_end dp03_step_sand_heavy thumb_func_start nullsub_93 @@ -308583,11 +298296,11 @@ sub_8097044: @ 8097044 adds r5, r0, 0 lsls r4, r2, 24 lsrs r4, 24 - ldr r1, _0809708C + ldr r1, =0x0850e660 mov r0, sp movs r2, 0x4 bl memcpy - ldr r1, _08097090 + ldr r1, =0x02038c08 movs r2, 0x14 ldrsh r0, [r5, r2] str r0, [r1] @@ -308612,8 +298325,7 @@ sub_8097044: @ 8097044 pop {r0} bx r0 .align 2, 0 -_0809708C: .4byte 0x0850e660 -_08097090: .4byte 0x02038c08 + .pool thumb_func_end sub_8097044 thumb_func_start sub_8097094 @@ -308624,7 +298336,7 @@ sub_8097094: @ 8097094 ldr r0, [r4, 0x14] cmp r1, r0 beq _080970D6 - ldr r2, _080970DC + ldr r2, =0x02038c08 movs r1, 0x14 ldrsh r0, [r4, r1] str r0, [r2] @@ -308635,7 +298347,7 @@ sub_8097094: @ 8097094 str r0, [r2, 0x8] movs r0, 0x2 str r0, [r2, 0xC] - ldr r3, _080970E0 + ldr r3, =0x0850e664 ldrb r1, [r4, 0x18] lsls r1, 28 lsrs r1, 28 @@ -308655,8 +298367,7 @@ _080970D6: pop {r0} bx r0 .align 2, 0 -_080970DC: .4byte 0x02038c08 -_080970E0: .4byte 0x0850e664 + .pool thumb_func_end sub_8097094 thumb_func_start sub_80970E4 @@ -308693,7 +298404,7 @@ dp03_step_grass_thin: @ 8097110 sub sp, 0x4 adds r5, r0, 0 adds r6, r1, 0 - ldr r1, _08097164 + ldr r1, =0x02038c08 movs r2, 0x10 ldrsh r0, [r5, r2] str r0, [r1] @@ -308729,13 +298440,13 @@ _0809715A: pop {r0} bx r0 .align 2, 0 -_08097164: .4byte 0x02038c08 + .pool thumb_func_end dp03_step_grass_thin thumb_func_start dp03_step_grass_heavy dp03_step_grass_heavy: @ 8097168 push {lr} - ldr r2, _0809718C + ldr r2, =0x02038c08 movs r3, 0x10 ldrsh r1, [r0, r3] str r1, [r2] @@ -308752,13 +298463,13 @@ dp03_step_grass_heavy: @ 8097168 pop {r0} bx r0 .align 2, 0 -_0809718C: .4byte 0x02038c08 + .pool thumb_func_end dp03_step_grass_heavy thumb_func_start dp03_step_bike_splash_probably dp03_step_bike_splash_probably: @ 8097190 push {r4,lr} - ldr r3, _080971BC + ldr r3, =0x02038c08 movs r4, 0x10 ldrsh r2, [r0, r4] str r2, [r3] @@ -308778,13 +298489,13 @@ dp03_step_bike_splash_probably: @ 8097190 pop {r0} bx r0 .align 2, 0 -_080971BC: .4byte 0x02038c08 + .pool thumb_func_end dp03_step_bike_splash_probably thumb_func_start dp03_step_drop_water dp03_step_drop_water: @ 80971C0 push {r4,lr} - ldr r3, _080971EC + ldr r3, =0x02038c08 movs r4, 0x10 ldrsh r2, [r0, r4] str r2, [r3] @@ -308804,13 +298515,13 @@ dp03_step_drop_water: @ 80971C0 pop {r0} bx r0 .align 2, 0 -_080971EC: .4byte 0x02038c08 + .pool thumb_func_end dp03_step_drop_water thumb_func_start dp03_step_dust dp03_step_dust: @ 80971F0 push {r4,lr} - ldr r3, _0809721C + ldr r3, =0x02038c08 movs r4, 0x10 ldrsh r2, [r0, r4] str r2, [r3] @@ -308830,7 +298541,7 @@ dp03_step_dust: @ 80971F0 pop {r0} bx r0 .align 2, 0 -_0809721C: .4byte 0x02038c08 + .pool thumb_func_end dp03_step_dust thumb_func_start dp03_step_grass_tiny @@ -308856,7 +298567,7 @@ sub_8097230: @ 8097230 thumb_func_start dp03_step_bubbles dp03_step_bubbles: @ 8097240 push {lr} - ldr r2, _0809725C + ldr r2, =0x02038c08 movs r3, 0x10 ldrsh r1, [r0, r3] str r1, [r2] @@ -308868,7 +298579,7 @@ dp03_step_bubbles: @ 8097240 pop {r0} bx r0 .align 2, 0 -_0809725C: .4byte 0x02038c08 + .pool thumb_func_end dp03_step_bubbles thumb_func_start ground_call_by_bits @@ -308891,7 +298602,7 @@ ground_call_by_bits: @ 8097260 beq _080972AC _08097284: movs r4, 0 - ldr r0, _080972B8 + ldr r0, =0x0850e674 mov r8, r0 _0809728A: movs r0, 0x1 @@ -308918,7 +298629,7 @@ _080972AC: pop {r0} bx r0 .align 2, 0 -_080972B8: .4byte 0x0850e674 + .pool thumb_func_end ground_call_by_bits thumb_func_start sub_80972BC @@ -308943,14 +298654,14 @@ sub_80972BC: @ 80972BC ands r0, r1 strb r0, [r2, 0x2] ldr r0, [r3] - ldr r1, _080972F0 + ldr r1, =0xfff9f7bd ands r0, r1 str r0, [r3] _080972EA: pop {r0} bx r0 .align 2, 0 -_080972F0: .4byte 0xfff9f7bd + .pool thumb_func_end sub_80972BC thumb_func_start ground_bits_filter_small_splashes @@ -308962,14 +298673,14 @@ ground_bits_filter_small_splashes: @ 80972F4 cmp r0, 0 bge _08097308 ldr r0, [r2] - ldr r1, _0809730C + ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] _08097308: pop {r0} bx r0 .align 2, 0 -_0809730C: .4byte 0xfffffbff + .pool thumb_func_end ground_bits_filter_small_splashes thumb_func_start dp03_something_2 @@ -309109,7 +298820,7 @@ sub_8097404: @ 8097404 movs r4, 0x1 orrs r0, r4 strb r0, [r5, 0x1] - ldr r3, _08097488 + ldr r3, =0x02020630 ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -309163,7 +298874,7 @@ sub_8097404: @ 8097404 movs r0, 0 b _0809748E .align 2, 0 -_08097488: .4byte 0x02020630 + .pool _0809748C: movs r0, 0x1 _0809748E: @@ -309176,7 +298887,7 @@ _0809748E: player_bitmagic: @ 8097494 push {r4,r5,lr} movs r4, 0 - ldr r5, _080974C8 + ldr r5, =0x02037350 _0809749A: lsls r0, r4, 3 adds r0, r4 @@ -309186,7 +298897,7 @@ _0809749A: lsls r0, 31 cmp r0, 0 beq _080974B8 - ldr r0, _080974CC + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] cmp r4, r0 beq _080974B8 @@ -309202,8 +298913,7 @@ _080974B8: pop {r0} bx r0 .align 2, 0 -_080974C8: .4byte 0x02037350 -_080974CC: .4byte 0x02037590 + .pool thumb_func_end player_bitmagic thumb_func_start sub_80974D0 @@ -309212,7 +298922,7 @@ sub_80974D0: @ 80974D0 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r6, _0809750C + ldr r6, =0x02037350 _080974DA: cmp r4, r5 beq _080974FC @@ -309224,7 +298934,7 @@ _080974DA: lsls r0, 31 cmp r0, 0 beq _080974FC - ldr r0, _08097510 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] cmp r4, r0 beq _080974FC @@ -309240,8 +298950,7 @@ _080974FC: pop {r0} bx r0 .align 2, 0 -_0809750C: .4byte 0x02037350 -_08097510: .4byte 0x02037590 + .pool thumb_func_end sub_80974D0 thumb_func_start npc_sync_anim_pause_bits @@ -309249,7 +298958,7 @@ npc_sync_anim_pause_bits: @ 8097514 push {r4,r5,lr} adds r5, r0, 0 ldrh r2, [r5] - ldr r1, _08097574 + ldr r1, =0x00000101 adds r0, r1, 0 ands r0, r2 cmp r0, r1 @@ -309259,7 +298968,7 @@ npc_sync_anim_pause_bits: @ 8097514 negs r0, r0 ands r0, r1 strb r0, [r5, 0x1] - ldr r4, _08097578 + ldr r4, =0x02020630 ldrb r0, [r5, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -309295,15 +299004,14 @@ _0809756C: pop {r0} bx r0 .align 2, 0 -_08097574: .4byte 0x00000101 -_08097578: .4byte 0x02020630 + .pool thumb_func_end npc_sync_anim_pause_bits thumb_func_start sub_809757C sub_809757C: @ 809757C push {r4,r5,lr} movs r4, 0 - ldr r5, _080975A8 + ldr r5, =0x02037350 _08097582: lsls r0, r4, 3 adds r0, r4 @@ -309325,13 +299033,13 @@ _08097598: pop {r0} bx r0 .align 2, 0 -_080975A8: .4byte 0x02037350 + .pool thumb_func_end sub_809757C thumb_func_start little_step little_step: @ 80975AC lsls r1, 24 - ldr r2, _080975C8 + ldr r2, =0x0850db7c lsrs r1, 22 adds r1, r2 ldrh r2, [r1] @@ -309344,13 +299052,13 @@ little_step: @ 80975AC strh r1, [r0, 0x22] bx lr .align 2, 0 -_080975C8: .4byte 0x0850db7c + .pool thumb_func_end little_step thumb_func_start double_little_steps double_little_steps: @ 80975CC lsls r1, 24 - ldr r2, _080975EC + ldr r2, =0x0850db7c lsrs r1, 22 adds r1, r2 ldrh r2, [r1] @@ -309365,13 +299073,13 @@ double_little_steps: @ 80975CC strh r1, [r0, 0x22] bx lr .align 2, 0 -_080975EC: .4byte 0x0850db7c + .pool thumb_func_end double_little_steps thumb_func_start triple_little_steps triple_little_steps: @ 80975F0 lsls r1, 24 - ldr r2, _08097614 + ldr r2, =0x0850db7c lsrs r1, 22 adds r1, r2 ldrh r2, [r1] @@ -309388,13 +299096,13 @@ triple_little_steps: @ 80975F0 strh r1, [r0, 0x22] bx lr .align 2, 0 -_08097614: .4byte 0x0850db7c + .pool thumb_func_end triple_little_steps thumb_func_start quad_little_steps quad_little_steps: @ 8097618 lsls r1, 24 - ldr r2, _08097638 + ldr r2, =0x0850db7c lsrs r1, 22 adds r1, r2 ldrh r2, [r1] @@ -309409,13 +299117,13 @@ quad_little_steps: @ 8097618 strh r1, [r0, 0x22] bx lr .align 2, 0 -_08097638: .4byte 0x0850db7c + .pool thumb_func_end quad_little_steps thumb_func_start oct_little_steps oct_little_steps: @ 809763C lsls r1, 24 - ldr r2, _0809765C + ldr r2, =0x0850db7c lsrs r1, 22 adds r1, r2 ldrh r2, [r1] @@ -309430,7 +299138,7 @@ oct_little_steps: @ 809763C strh r1, [r0, 0x22] bx lr .align 2, 0 -_0809765C: .4byte 0x0850db7c + .pool thumb_func_end oct_little_steps thumb_func_start oamt_npc_ministep_reset @@ -309450,7 +299158,7 @@ oamt_npc_ministep_reset: @ 8097660 obj_npc_ministep: @ 8097674 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080976CC + ldr r5, =0x0850e768 movs r0, 0x36 ldrsh r2, [r4, r0] lsls r0, r2, 1 @@ -309461,7 +299169,7 @@ obj_npc_ministep: @ 8097674 ldrsh r0, [r0, r3] cmp r1, r0 bge _080976D4 - ldr r1, _080976D0 + ldr r1, =0x0850e754 lsls r0, r2, 2 adds r0, r1 movs r1, 0x38 @@ -309491,8 +299199,7 @@ obj_npc_ministep: @ 8097674 movs r0, 0x1 b _080976D6 .align 2, 0 -_080976CC: .4byte 0x0850e768 -_080976D0: .4byte 0x0850e754 + .pool _080976D4: movs r0, 0 _080976D6: @@ -309549,7 +299256,7 @@ _08097720: thumb_func_start sub_8097728 sub_8097728: @ 8097728 - ldr r1, _08097738 + ldr r1, =0x0850e7ba lsls r0, 16 asrs r0, 16 adds r0, r1 @@ -309558,12 +299265,12 @@ sub_8097728: @ 8097728 asrs r0, 24 bx lr .align 2, 0 -_08097738: .4byte 0x0850e7ba + .pool thumb_func_end sub_8097728 thumb_func_start sub_809773C sub_809773C: @ 809773C - ldr r1, _0809774C + ldr r1, =0x0850e772 lsls r0, 16 asrs r0, 16 adds r0, r1 @@ -309572,7 +299279,7 @@ sub_809773C: @ 809773C asrs r0, 24 bx lr .align 2, 0 -_0809774C: .4byte 0x0850e772 + .pool thumb_func_end sub_809773C thumb_func_start sub_8097750 @@ -309694,7 +299401,7 @@ _08097818: thumb_func_start sub_8097820 sub_8097820: @ 8097820 lsls r1, 24 - ldr r2, _08097838 + ldr r2, =0x0850e834 lsrs r1, 22 adds r1, r2 lsls r0, 16 @@ -309705,7 +299412,7 @@ sub_8097820: @ 8097820 ldrsb r0, [r1, r0] bx lr .align 2, 0 -_08097838: .4byte 0x0850e834 + .pool thumb_func_end sub_8097820 thumb_func_start sub_809783C @@ -309732,12 +299439,12 @@ sub_809785C: @ 809785C push {r4-r6,lr} sub sp, 0xC adds r4, r0, 0 - ldr r1, _080978DC + ldr r1, =0x0850e840 mov r0, sp movs r2, 0x6 bl memcpy add r5, sp, 0x8 - ldr r1, _080978E0 + ldr r1, =0x0850e846 adds r0, r5, 0 movs r2, 0x3 bl memcpy @@ -309793,8 +299500,7 @@ _080978D2: pop {r1} bx r1 .align 2, 0 -_080978DC: .4byte 0x0850e840 -_080978E0: .4byte 0x0850e846 + .pool thumb_func_end sub_809785C thumb_func_start sub_80978E4 @@ -309802,12 +299508,12 @@ sub_80978E4: @ 80978E4 push {r4-r6,lr} sub sp, 0xC adds r5, r0, 0 - ldr r1, _08097970 + ldr r1, =0x0850e84a mov r0, sp movs r2, 0x6 bl memcpy add r4, sp, 0x8 - ldr r1, _08097974 + ldr r1, =0x0850e850 adds r0, r4, 0 movs r2, 0x3 bl memcpy @@ -309868,8 +299574,7 @@ _08097964: pop {r1} bx r1 .align 2, 0 -_08097970: .4byte 0x0850e84a -_08097974: .4byte 0x0850e850 + .pool thumb_func_end sub_80978E4 thumb_func_start sub_8097978 @@ -309965,7 +299670,7 @@ sub_80979D4: @ 80979D4 adds r4, 0x28 movs r0, 0 ldrsb r0, [r4, r0] - ldr r2, _08097A34 + ldr r2, =0x02021bbc adds r0, r1 ldrh r2, [r2] adds r0, r2 @@ -309978,7 +299683,7 @@ sub_80979D4: @ 80979D4 subs r3, 0x15 movs r0, 0 ldrsb r0, [r3, r0] - ldr r2, _08097A38 + ldr r2, =0x02021bbe adds r0, r1 ldrh r2, [r2] adds r0, r2 @@ -309987,8 +299692,7 @@ sub_80979D4: @ 80979D4 adds r2, r3, 0 b _08097A6A .align 2, 0 -_08097A34: .4byte 0x02021bbc -_08097A38: .4byte 0x02021bbe + .pool _08097A3C: mov r0, r12 ldrh r1, [r0, 0x24] @@ -310094,7 +299798,7 @@ sub_8097AF0: @ 8097AF0 movs r5, 0 movs r4, 0x3F _08097AF6: - ldr r0, _08097B24 + ldr r0, =0x02020630 adds r2, r5, r0 adds r0, r2, 0 adds r0, 0x3E @@ -310104,7 +299808,7 @@ _08097AF6: cmp r0, 0 beq _08097B16 ldr r1, [r2, 0x1C] - ldr r0, _08097B28 + ldr r0, =sub_8097AC8 + 1 cmp r1, r0 bne _08097B16 adds r0, r2, 0 @@ -310118,8 +299822,7 @@ _08097B16: pop {r0} bx r0 .align 2, 0 -_08097B24: .4byte 0x02020630 -_08097B28: .4byte sub_8097AC8 + 1 + .pool thumb_func_end sub_8097AF0 thumb_func_start sub_8097B2C @@ -310128,7 +299831,7 @@ sub_8097B2C: @ 8097B2C lsls r0, 24 lsrs r5, r0, 24 movs r3, 0 - ldr r6, _08097B60 + ldr r6, =0x02020630 movs r4, 0 _08097B38: adds r2, r4, r6 @@ -310140,7 +299843,7 @@ _08097B38: cmp r0, 0 beq _08097B68 ldr r1, [r2, 0x1C] - ldr r0, _08097B64 + ldr r0, =sub_8097AC8 + 1 cmp r1, r0 bne _08097B68 ldrh r0, [r2, 0x2E] @@ -310151,8 +299854,7 @@ _08097B38: adds r0, r3, 0 b _08097B72 .align 2, 0 -_08097B60: .4byte 0x02020630 -_08097B64: .4byte sub_8097AC8 + 1 + .pool _08097B68: adds r4, 0x44 adds r3, 0x1 @@ -310180,7 +299882,7 @@ sub_8097B78: @ 8097B78 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08097BB0 + ldr r0, =0x02020630 adds r4, r0 adds r0, r5, 0 bl npc_direction_to_obj_anim_image_number @@ -310194,7 +299896,7 @@ _08097BAA: pop {r0} bx r0 .align 2, 0 -_08097BB0: .4byte 0x02020630 + .pool thumb_func_end sub_8097B78 thumb_func_start sub_8097BB4 @@ -310211,7 +299913,7 @@ sub_8097BB4: @ 8097BB4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08097C18 + ldr r1, =0x02020630 adds r4, r0, r1 adds r0, r5, 0 bl npc_get_type @@ -310224,7 +299926,7 @@ sub_8097BB4: @ 8097BB4 str r2, [r4, 0x4] lsrs r3, 22 ldrh r2, [r4, 0x4] - ldr r1, _08097C1C + ldr r1, =0xfffffc00 ands r1, r2 orrs r1, r3 strh r1, [r4, 0x4] @@ -310247,8 +299949,7 @@ sub_8097BB4: @ 8097BB4 strb r1, [r0] b _08097C36 .align 2, 0 -_08097C18: .4byte 0x02020630 -_08097C1C: .4byte 0xfffffc00 + .pool _08097C20: adds r0, r4, 0 bl obj_set_f18_to_r0_f42_to_40 @@ -310284,7 +299985,7 @@ sub_8097C44: @ 8097C44 beq _08097C80 cmp r4, 0 beq _08097C74 - ldr r0, _08097C70 + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -310293,9 +299994,9 @@ sub_8097C44: @ 8097C44 strh r0, [r1, 0x32] b _08097C80 .align 2, 0 -_08097C70: .4byte 0x02020630 + .pool _08097C74: - ldr r1, _08097C88 + ldr r1, =0x02020630 lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -310306,7 +300007,7 @@ _08097C80: pop {r0} bx r0 .align 2, 0 -_08097C88: .4byte 0x02020630 + .pool thumb_func_end sub_8097C44 thumb_func_start sub_8097C8C @@ -310323,7 +300024,7 @@ sub_8097C8C: @ 8097C8C b _08097CBA _08097CA2: movs r3, 0 - ldr r0, _08097CC0 + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -310339,7 +300040,7 @@ _08097CBA: pop {r1} bx r1 .align 2, 0 -_08097CC0: .4byte 0x02020630 + .pool thumb_func_end sub_8097C8C thumb_func_start sub_8097CC4 @@ -310354,7 +300055,7 @@ sub_8097CC4: @ 8097CC4 lsrs r2, r0, 24 cmp r2, 0x40 beq _08097CEA - ldr r0, _08097CF0 + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -310367,7 +300068,7 @@ _08097CEA: pop {r0} bx r0 .align 2, 0 -_08097CF0: .4byte 0x02020630 + .pool thumb_func_end sub_8097CC4 thumb_func_start sub_8097CF4 @@ -310419,7 +300120,7 @@ sub_8097D30: @ 8097D30 beq _08097D4C b _08097D5E _08097D42: - ldr r0, _08097D64 + ldr r0, =0x0000ff60 strh r0, [r1, 0x26] ldrh r0, [r1, 0x36] adds r0, 0x1 @@ -310438,7 +300139,7 @@ _08097D5E: pop {r0} bx r0 .align 2, 0 -_08097D64: .4byte 0x0000ff60 + .pool thumb_func_end sub_8097D30 thumb_func_start sub_8097D68 @@ -310484,7 +300185,7 @@ sub_8097D9C: @ 8097D9C lsrs r2, r0, 24 cmp r2, 0x40 beq _08097DC0 - ldr r0, _08097DC4 + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -310497,7 +300198,7 @@ _08097DC0: movs r0, 0 b _08097DCA .align 2, 0 -_08097DC4: .4byte 0x02020630 + .pool _08097DC8: movs r0, 0x1 _08097DCA: @@ -310512,7 +300213,7 @@ oe_exec_and_other_stuff: @ 8097DD0 adds r0, r1, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08097DF4 + ldr r1, =0x02038c08 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -310523,7 +300224,7 @@ oe_exec_and_other_stuff: @ 8097DD0 pop {r1} bx r1 .align 2, 0 -_08097DF4: .4byte 0x02038c08 + .pool thumb_func_end oe_exec_and_other_stuff thumb_func_start do_animation_x03 @@ -310550,7 +300251,7 @@ sub_8097E14: @ 8097E14 adds r4, r1, 0 ldrb r0, [r0, 0x5] bl npc_get_type - ldr r2, _08097E4C + ldr r2, =0x02038c08 movs r3, 0x20 ldrsh r1, [r4, r3] str r1, [r2] @@ -310572,7 +300273,7 @@ sub_8097E14: @ 8097E14 pop {r0} bx r0 .align 2, 0 -_08097E4C: .4byte 0x02038c08 + .pool thumb_func_end sub_8097E14 thumb_func_start sub_8097E50 @@ -310584,7 +300285,7 @@ sub_8097E50: @ 8097E50 mov r8, r1 movs r0, 0 mov r12, r0 - ldr r0, _08097E7C + ldr r0, =0x020375b8 ldr r1, [r0] adds r6, r0, 0 cmp r1, 0 @@ -310599,7 +300300,7 @@ sub_8097E50: @ 8097E50 strb r0, [r1, 0x10] b _08097ECC .align 2, 0 -_08097E7C: .4byte 0x020375b8 + .pool _08097E80: movs r2, 0x10 movs r5, 0 @@ -310675,7 +300376,7 @@ sub_8097EF0: @ 8097EF0 mov r8, r1 movs r0, 0x1 strh r0, [r1, 0x32] - ldr r5, _08097F74 + ldr r5, =0x020375b8 ldr r0, [r5] cmp r0, 0 beq _08097F68 @@ -310735,14 +300436,14 @@ _08097F68: pop {r1} bx r1 .align 2, 0 -_08097F74: .4byte 0x020375b8 + .pool thumb_func_end sub_8097EF0 thumb_func_start sub_8097F78 sub_8097F78: @ 8097F78 push {lr} movs r2, 0 - ldr r1, _08097F90 + ldr r1, =0x020375b8 ldr r1, [r1] ldrb r3, [r0, 0x8] _08097F82: @@ -310753,7 +300454,7 @@ _08097F82: adds r0, r2, 0 b _08097FA0 .align 2, 0 -_08097F90: .4byte 0x020375b8 + .pool _08097F94: adds r0, r2, 0x1 lsls r0, 24 @@ -310770,7 +300471,7 @@ _08097FA0: sub_8097FA4: @ 8097FA4 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, _08097FD8 + ldr r0, =sub_8097FE4 + 1 movs r1, 0xFF bl AddTask adds r5, r0, 0 @@ -310779,22 +300480,20 @@ sub_8097FA4: @ 8097FA4 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _08097FDC + ldr r0, =0x03005e00 adds r4, r0 adds r0, r4, 0 adds r0, 0x8 adds r1, r6, 0 bl sub_806F67C strb r5, [r6, 0x1B] - ldr r0, _08097FE0 + ldr r0, =0x0000ffff strh r0, [r4, 0xE] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08097FD8: .4byte sub_8097FE4 + 1 -_08097FDC: .4byte 0x03005e00 -_08097FE0: .4byte 0x0000ffff + .pool thumb_func_end sub_8097FA4 thumb_func_start sub_8097FE4 @@ -310806,7 +300505,7 @@ sub_8097FE4: @ 8097FE4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0809803C + ldr r0, =0x03005e00 adds r4, r1, r0 adds r0, r4, 0 adds r0, 0x8 @@ -310817,7 +300516,7 @@ sub_8097FE4: @ 8097FE4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08098040 + ldr r1, =0x02020630 adds r2, r0, r1 ldrh r1, [r4, 0xC] movs r0, 0x3 @@ -310845,8 +300544,7 @@ _08098030: pop {r0} bx r0 .align 2, 0 -_0809803C: .4byte 0x03005e00 -_08098040: .4byte 0x02020630 + .pool thumb_func_end sub_8097FE4 thumb_func_start sub_8098044 @@ -310859,7 +300557,7 @@ sub_8098044: @ 8098044 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08098070 + ldr r1, =0x03005e00 adds r0, r1 adds r0, 0x8 mov r1, sp @@ -310871,7 +300569,7 @@ sub_8098044: @ 8098044 pop {r0} bx r0 .align 2, 0 -_08098070: .4byte 0x03005e00 + .pool thumb_func_end sub_8098044 thumb_func_start sub_8098074 @@ -310882,7 +300580,7 @@ sub_8098074: @ 8098074 lsls r1, 24 lsrs r5, r1, 24 movs r4, 0 - ldr r7, _080980B8 + ldr r7, =0x02037350 _08098082: cmp r4, r6 beq _080980A8 @@ -310896,7 +300594,7 @@ _08098082: lsls r0, 31 cmp r0, 0 beq _080980A8 - ldr r0, _080980BC + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] cmp r4, r0 beq _080980A8 @@ -310912,8 +300610,7 @@ _080980A8: pop {r0} bx r0 .align 2, 0 -_080980B8: .4byte 0x02037350 -_080980BC: .4byte 0x02037590 + .pool thumb_func_end sub_8098074 thumb_func_start sub_80980C0 @@ -310951,7 +300648,7 @@ _080980EC: thumb_func_start sub_80980F4 sub_80980F4: @ 80980F4 - ldr r0, _08098104 + ldr r0, =0x0000ff60 strh r0, [r1, 0x26] ldrh r0, [r1, 0x32] adds r0, 0x1 @@ -310959,7 +300656,7 @@ sub_80980F4: @ 80980F4 movs r0, 0 bx lr .align 2, 0 -_08098104: .4byte 0x0000ff60 + .pool thumb_func_end sub_80980F4 thumb_func_start sub_8098108 @@ -310988,10 +300685,10 @@ sub_8098124: @ 8098124 thumb_func_start sub_8098128 sub_8098128: @ 8098128 - ldr r1, _0809814C + ldr r1, =0x020375bc movs r0, 0 strb r0, [r1] - ldr r2, _08098150 + ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 @@ -311006,8 +300703,7 @@ sub_8098128: @ 8098128 strb r0, [r2] bx lr .align 2, 0 -_0809814C: .4byte 0x020375bc -_08098150: .4byte 0x03003014 + .pool thumb_func_end sub_8098128 thumb_func_start sub_8098154 @@ -311018,7 +300714,7 @@ sub_8098154: @ 8098154 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08098178 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -311030,7 +300726,7 @@ sub_8098154: @ 8098154 beq _08098182 b _080981B0 .align 2, 0 -_08098178: .4byte 0x03005e00 + .pool _0809817C: cmp r0, 0x2 beq _08098198 @@ -311053,7 +300749,7 @@ _08098198: lsrs r0, 16 cmp r0, 0x1 beq _080981B0 - ldr r1, _080981B8 + ldr r1, =0x020375bc movs r0, 0 strb r0, [r1] adds r0, r5, 0 @@ -311063,25 +300759,25 @@ _080981B0: pop {r0} bx r0 .align 2, 0 -_080981B8: .4byte 0x020375bc + .pool thumb_func_end sub_8098154 thumb_func_start task_add_textbox task_add_textbox: @ 80981BC push {lr} - ldr r0, _080981CC + ldr r0, =sub_8098154 + 1 movs r1, 0x50 bl AddTask pop {r0} bx r0 .align 2, 0 -_080981CC: .4byte sub_8098154 + 1 + .pool thumb_func_end task_add_textbox thumb_func_start task_del_textbox task_del_textbox: @ 80981D0 push {lr} - ldr r0, _080981E8 + ldr r0, =sub_8098154 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -311092,14 +300788,14 @@ _080981E4: pop {r0} bx r0 .align 2, 0 -_080981E8: .4byte sub_8098154 + 1 + .pool thumb_func_end task_del_textbox thumb_func_start box_related_two__2 box_related_two__2: @ 80981EC push {r4,lr} adds r1, r0, 0 - ldr r4, _08098208 + ldr r4, =0x020375bc ldrb r0, [r4] cmp r0, 0 bne _0809820C @@ -311111,7 +300807,7 @@ box_related_two__2: @ 80981EC movs r0, 0x1 b _0809820E .align 2, 0 -_08098208: .4byte 0x020375bc + .pool _0809820C: movs r0, 0 _0809820E: @@ -311129,7 +300825,7 @@ sub_8098214: @ 8098214 adds r1, r0, 0 cmp r1, 0 bne _0809822E - ldr r0, _08098234 + ldr r0, =0x020375bc strb r1, [r0] adds r0, r4, 0 bl remove_task @@ -311138,21 +300834,21 @@ _0809822E: pop {r0} bx r0 .align 2, 0 -_08098234: .4byte 0x020375bc + .pool thumb_func_end sub_8098214 thumb_func_start sub_8098238 sub_8098238: @ 8098238 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08098264 + ldr r5, =0x020375bc ldrb r0, [r5] cmp r0, 0 bne _08098270 - ldr r0, _08098268 + ldr r0, =0x02021fc4 adds r1, r4, 0 bl ExpandTextCodes - ldr r0, _0809826C + ldr r0, =sub_8098214 + 1 movs r1, 0 bl AddTask adds r0, r4, 0 @@ -311162,9 +300858,7 @@ sub_8098238: @ 8098238 movs r0, 0x1 b _08098272 .align 2, 0 -_08098264: .4byte 0x020375bc -_08098268: .4byte 0x02021fc4 -_0809826C: .4byte sub_8098214 + 1 + .pool _08098270: movs r0, 0 _08098272: @@ -311177,7 +300871,7 @@ _08098272: box_related_two__3: @ 8098278 push {lr} adds r1, r0, 0 - ldr r2, _08098294 + ldr r2, =0x020375bc ldrb r0, [r2] cmp r0, 0 bne _08098298 @@ -311189,7 +300883,7 @@ box_related_two__3: @ 8098278 movs r0, 0x1 b _0809829A .align 2, 0 -_08098294: .4byte 0x020375bc + .pool _08098298: movs r0, 0 _0809829A: @@ -311200,7 +300894,7 @@ _0809829A: thumb_func_start sub_80982A0 sub_80982A0: @ 80982A0 push {lr} - ldr r2, _080982B4 + ldr r2, =0x020375bc movs r1, 0x3 strb r1, [r2] movs r1, 0x1 @@ -311209,13 +300903,13 @@ sub_80982A0: @ 80982A0 pop {r1} bx r1 .align 2, 0 -_080982B4: .4byte 0x020375bc + .pool thumb_func_end sub_80982A0 thumb_func_start sub_80982B8 sub_80982B8: @ 80982B8 push {lr} - ldr r1, _080982D0 + ldr r1, =0x020375bc ldrb r0, [r1] cmp r0, 0 bne _080982D4 @@ -311225,7 +300919,7 @@ sub_80982B8: @ 80982B8 movs r0, 0x1 b _080982D6 .align 2, 0 -_080982D0: .4byte 0x020375bc + .pool _080982D4: movs r0, 0 _080982D6: @@ -311238,7 +300932,7 @@ textbox_fdecode_auto_and_task_add: @ 80982DC push {r4,lr} adds r2, r0, 0 adds r4, r1, 0 - ldr r0, _08098300 + ldr r0, =0x02021fc4 adds r1, r2, 0 bl ExpandTextCodes lsls r4, 24 @@ -311250,7 +300944,7 @@ textbox_fdecode_auto_and_task_add: @ 80982DC pop {r0} bx r0 .align 2, 0 -_08098300: .4byte 0x02021fc4 + .pool thumb_func_end textbox_fdecode_auto_and_task_add thumb_func_start textbox_auto_and_task_add @@ -311270,35 +300964,35 @@ textbox_close: @ 8098314 movs r0, 0 movs r1, 0x1 bl sub_8197434 - ldr r1, _0809832C + ldr r1, =0x020375bc movs r0, 0 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_0809832C: .4byte 0x020375bc + .pool thumb_func_end textbox_close thumb_func_start textbox_any_visible textbox_any_visible: @ 8098330 - ldr r0, _08098338 + ldr r0, =0x020375bc ldrb r0, [r0] bx lr .align 2, 0 -_08098338: .4byte 0x020375bc + .pool thumb_func_end textbox_any_visible thumb_func_start sub_809833C sub_809833C: @ 809833C push {lr} - ldr r0, _0809834C + ldr r0, =0x020375bc ldrb r0, [r0] cmp r0, 0 beq _08098350 movs r0, 0 b _08098352 .align 2, 0 -_0809834C: .4byte 0x020375bc + .pool _08098350: movs r0, 0x1 _08098352: @@ -311313,39 +301007,39 @@ sub_8098358: @ 8098358 movs r0, 0 movs r1, 0x1 bl sub_81973FC - ldr r1, _08098370 + ldr r1, =0x020375bc movs r0, 0 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_08098370: .4byte 0x020375bc + .pool thumb_func_end sub_8098358 thumb_func_start sub_8098374 sub_8098374: @ 8098374 push {lr} bl task_del_textbox - ldr r1, _08098384 + ldr r1, =0x020375bc movs r0, 0 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_08098384: .4byte 0x020375bc + .pool thumb_func_end sub_8098374 thumb_func_start walkrun_is_standing_still walkrun_is_standing_still: @ 8098388 push {lr} - ldr r0, _08098398 + ldr r0, =0x02037590 ldrb r0, [r0, 0x3] cmp r0, 0x1 beq _0809839C movs r0, 0x1 b _0809839E .align 2, 0 -_08098398: .4byte 0x02037590 + .pool _0809839C: movs r0, 0 _0809839E: @@ -311374,7 +301068,7 @@ _080983BE: thumb_func_start sub_80983C4 sub_80983C4: @ 80983C4 push {lr} - ldr r0, _080983DC + ldr r0, =sub_80983A4 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -311383,7 +301077,7 @@ sub_80983C4: @ 80983C4 movs r0, 0x1 b _080983E2 .align 2, 0 -_080983DC: .4byte sub_80983A4 + 1 + .pool _080983E0: movs r0, 0 _080983E2: @@ -311395,13 +301089,13 @@ _080983E2: sub_80983E8: @ 80983E8 push {lr} bl player_bitmagic - ldr r0, _080983FC + ldr r0, =sub_80983A4 + 1 movs r1, 0x50 bl AddTask pop {r0} bx r0 .align 2, 0 -_080983FC: .4byte sub_80983A4 + 1 + .pool thumb_func_end sub_80983E8 thumb_func_start sub_8098400 @@ -311412,7 +301106,7 @@ sub_8098400: @ 8098400 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08098470 + ldr r1, =0x03005e00 adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -311430,8 +301124,8 @@ _0809842A: ldrsh r0, [r5, r1] cmp r0, 0 bne _08098452 - ldr r2, _08098474 - ldr r0, _08098478 + ldr r2, =0x02037350 + ldr r0, =0x03005df0 ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -311461,15 +301155,13 @@ _08098468: pop {r0} bx r0 .align 2, 0 -_08098470: .4byte 0x03005e00 -_08098474: .4byte 0x02037350 -_08098478: .4byte 0x03005df0 + .pool thumb_func_end sub_8098400 thumb_func_start sub_809847C sub_809847C: @ 809847C push {lr} - ldr r0, _08098494 + ldr r0, =sub_8098400 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -311478,7 +301170,7 @@ sub_809847C: @ 809847C movs r0, 0x1 b _0809849A .align 2, 0 -_08098494: .4byte sub_8098400 + 1 + .pool _08098498: movs r0, 0 _0809849A: @@ -311489,15 +301181,15 @@ _0809849A: thumb_func_start sub_80984A0 sub_80984A0: @ 80984A0 push {r4,r5,lr} - ldr r4, _080984E4 + ldr r4, =0x03005df0 ldrb r0, [r4] bl sub_80974D0 - ldr r0, _080984E8 + ldr r0, =sub_8098400 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _080984EC + ldr r2, =0x02037350 ldrb r1, [r4] lsls r0, r1, 3 adds r0, r1 @@ -311509,7 +301201,7 @@ sub_80984A0: @ 80984A0 blt _080984DE adds r0, r1, 0 bl sub_8097404 - ldr r0, _080984F0 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -311521,10 +301213,7 @@ _080984DE: pop {r0} bx r0 .align 2, 0 -_080984E4: .4byte 0x03005df0 -_080984E8: .4byte sub_8098400 + 1 -_080984EC: .4byte 0x02037350 -_080984F0: .4byte 0x03005e00 + .pool thumb_func_end sub_80984A0 thumb_func_start sub_80984F4 @@ -311540,7 +301229,7 @@ sub_80984F4: @ 80984F4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08098520 + ldr r1, =0x02037350 adds r0, r1 bl sub_8093284 bl sub_80D338C @@ -311548,14 +301237,14 @@ sub_80984F4: @ 80984F4 pop {r0} bx r0 .align 2, 0 -_08098520: .4byte 0x02037350 + .pool thumb_func_end sub_80984F4 thumb_func_start sub_8098524 sub_8098524: @ 8098524 push {r4,lr} - ldr r4, _0809856C - ldr r0, _08098570 + ldr r4, =0x02037350 + ldr r0, =0x03005df0 ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -311586,47 +301275,43 @@ _08098542: pop {r0} bx r0 .align 2, 0 -_0809856C: .4byte 0x02037350 -_08098570: .4byte 0x03005df0 + .pool thumb_func_end sub_8098524 thumb_func_start sub_8098574 sub_8098574: @ 8098574 push {lr} - ldr r0, _08098590 + ldr r0, =0x03005df0 ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08098594 + ldr r1, =0x02037350 adds r0, r1 - ldr r1, _08098598 + ldr r1, =0x020375f4 ldrb r1, [r1] bl npc_reciprocate_look pop {r0} bx r0 .align 2, 0 -_08098590: .4byte 0x03005df0 -_08098594: .4byte 0x02037350 -_08098598: .4byte 0x020375f4 + .pool thumb_func_end sub_8098574 thumb_func_start sub_809859C sub_809859C: @ 809859C push {lr} - ldr r0, _080985B4 + ldr r0, =0x03005df0 ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080985B8 + ldr r1, =0x02037350 adds r0, r1 bl npc_hide_and_trainer_flag_clear_on_tile_x66_at_pos pop {r0} bx r0 .align 2, 0 -_080985B4: .4byte 0x03005df0 -_080985B8: .4byte 0x02037350 + .pool thumb_func_end sub_809859C thumb_func_start sub_80985BC @@ -311637,7 +301322,7 @@ sub_80985BC: @ 80985BC lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08098628 + ldr r1, =0x03005e00 adds r5, r0, r1 ldrb r7, [r5, 0xC] movs r1, 0x8 @@ -311656,7 +301341,7 @@ _080985E8: ldrsh r0, [r5, r1] cmp r0, 0 bne _0809860C - ldr r0, _0809862C + ldr r0, =0x02037350 lsls r1, r7, 3 adds r1, r7 lsls r1, 2 @@ -311685,8 +301370,7 @@ _08098622: pop {r0} bx r0 .align 2, 0 -_08098628: .4byte 0x03005e00 -_0809862C: .4byte 0x02037350 + .pool thumb_func_end sub_80985BC thumb_func_start sub_8098630 @@ -311699,7 +301383,7 @@ sub_8098630: @ 8098630 bl sub_80B47E0 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080986D0 + ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x2 bne _080986E0 @@ -311711,13 +301395,13 @@ sub_8098630: @ 8098630 adds r0, r4, 0 adds r1, r5, 0 bl sub_8098074 - ldr r7, _080986D4 + ldr r7, =sub_80985BC + 1 adds r0, r7, 0 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080986D8 + ldr r0, =0x03005e00 mov r9, r0 lsls r0, r2, 2 adds r0, r2 @@ -311725,7 +301409,7 @@ sub_8098630: @ 8098630 mov r1, r9 adds r6, r0, r1 strh r4, [r6, 0xC] - ldr r2, _080986DC + ldr r2, =0x02037350 mov r8, r2 lsls r0, r4, 3 adds r0, r4 @@ -311766,25 +301450,22 @@ _0809869A: strh r0, [r4, 0xA] b _0809871A .align 2, 0 -_080986D0: .4byte 0x030060a8 -_080986D4: .4byte sub_80985BC + 1 -_080986D8: .4byte 0x03005e00 -_080986DC: .4byte 0x02037350 + .pool _080986E0: adds r0, r4, 0 bl sub_80974D0 - ldr r0, _08098728 + ldr r0, =sub_80985BC + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _0809872C + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r5, r0, r1 strh r4, [r5, 0xC] - ldr r1, _08098730 + ldr r1, =0x02037350 lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -311805,15 +301486,13 @@ _0809871A: pop {r0} bx r0 .align 2, 0 -_08098728: .4byte sub_80985BC + 1 -_0809872C: .4byte 0x03005e00 -_08098730: .4byte 0x02037350 + .pool thumb_func_end sub_8098630 thumb_func_start sub_8098734 sub_8098734: @ 8098734 push {lr} - ldr r0, _0809874C + ldr r0, =sub_80985BC + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -311822,7 +301501,7 @@ sub_8098734: @ 8098734 movs r0, 0x1 b _08098752 .align 2, 0 -_0809874C: .4byte sub_80985BC + 1 + .pool _08098750: movs r0, 0 _08098752: @@ -311838,18 +301517,18 @@ sub_8098758: @ 8098758 cmp r0, 0x13 bhi _08098770 lsls r0, 3 - ldr r1, _0809876C + ldr r1, =0x0851021c adds r0, r1 b _08098772 .align 2, 0 -_0809876C: .4byte 0x0851021c + .pool _08098770: - ldr r0, _08098778 + ldr r0, =0x0851021c _08098772: pop {r1} bx r1 .align 2, 0 -_08098778: .4byte 0x0851021c + .pool thumb_func_end sub_8098758 thumb_func_start copy_textbox_border_tile_patterns_to_vram @@ -311867,7 +301546,7 @@ copy_textbox_border_tile_patterns_to_vram: @ 809877C bl Window_GetField lsls r0, 24 lsrs r0, 24 - ldr r1, _080987B8 + ldr r1, =0x08ddd748 movs r2, 0xE0 lsls r2, 1 adds r3, r4, 0 @@ -311880,7 +301559,7 @@ copy_textbox_border_tile_patterns_to_vram: @ 809877C pop {r0} bx r0 .align 2, 0 -_080987B8: .4byte 0x08ddd748 + .pool thumb_func_end copy_textbox_border_tile_patterns_to_vram thumb_func_start box_border_load_tiles_and_pal @@ -311919,7 +301598,7 @@ sub_80987D4: @ 80987D4 bl Window_GetField lsls r0, 24 lsrs r0, 24 - ldr r5, _08098828 + ldr r5, =0x0851021c lsls r4, 3 adds r1, r4, r5 ldr r1, [r1] @@ -311939,7 +301618,7 @@ sub_80987D4: @ 80987D4 pop {r0} bx r0 .align 2, 0 -_08098828: .4byte 0x0851021c + .pool thumb_func_end sub_80987D4 thumb_func_start sub_809882C @@ -311953,7 +301632,7 @@ sub_809882C: @ 809882C lsrs r4, 16 lsls r3, 24 lsrs r3, 24 - ldr r1, _08098854 + ldr r1, =0x03005d90 ldr r1, [r1] ldrb r1, [r1, 0x14] lsrs r1, 3 @@ -311963,7 +301642,7 @@ sub_809882C: @ 809882C pop {r0} bx r0 .align 2, 0 -_08098854: .4byte 0x03005d90 + .pool thumb_func_end sub_809882C thumb_func_start sub_8098858 @@ -312434,12 +302113,12 @@ stdpal_get: @ 8098C18 cmp r0, 0x4 bhi _08098C54 lsls r0, 2 - ldr r1, _08098C2C + ldr r1, =_08098C30 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08098C2C: .4byte _08098C30 + .pool .align 2, 0 _08098C30: .4byte _08098C44 @@ -312463,20 +302142,20 @@ _08098C54: movs r0, 0x40 _08098C56: lsls r0, 1 - ldr r1, _08098C60 + ldr r1, =0x0851017c adds r0, r1 pop {r1} bx r1 .align 2, 0 -_08098C60: .4byte 0x0851017c + .pool thumb_func_end stdpal_get thumb_func_start sub_8098C64 sub_8098C64: @ 8098C64 - ldr r0, _08098C68 + ldr r0, =0x08ddd728 bx lr .align 2, 0 -_08098C68: .4byte 0x08ddd728 + .pool thumb_func_end sub_8098C64 thumb_func_start sub_8098C6C @@ -312490,8 +302169,8 @@ sub_8098C6C: @ 8098C6C lsrs r3, 16 lsls r4, 24 lsrs r4, 24 - ldr r2, _08098CB0 - ldr r5, _08098CB4 + ldr r2, =0x0851021c + ldr r5, =0x03005d90 ldr r1, [r5] ldrb r1, [r1, 0x14] lsrs r1, 3 @@ -312513,8 +302192,7 @@ sub_8098C6C: @ 8098C6C pop {r0} bx r0 .align 2, 0 -_08098CB0: .4byte 0x0851021c -_08098CB4: .4byte 0x03005d90 + .pool thumb_func_end sub_8098C6C thumb_func_start script_env_init @@ -312623,7 +302301,7 @@ _08098D56: ldr r2, [r4, 0x8] cmp r2, 0 beq _08098D48 - ldr r0, _08098D68 + ldr r0, =0x085102bc ldr r0, [r0] cmp r2, r0 bne _08098D6C @@ -312631,7 +302309,7 @@ _08098D64: swi 0x2 b _08098D64 .align 2, 0 -_08098D68: .4byte 0x085102bc + .pool _08098D6C: ldrb r1, [r2] adds r0, r2, 0x1 @@ -312781,44 +302459,44 @@ script_read_word: @ 8098E24 thumb_func_start script_env_2_enable script_env_2_enable: @ 8098E54 - ldr r1, _08098E5C + ldr r1, =0x03000f2c movs r0, 0x1 strb r0, [r1] bx lr .align 2, 0 -_08098E5C: .4byte 0x03000f2c + .pool thumb_func_end script_env_2_enable thumb_func_start script_env_2_disable script_env_2_disable: @ 8098E60 - ldr r1, _08098E68 + ldr r1, =0x03000f2c movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_08098E68: .4byte 0x03000f2c + .pool thumb_func_end script_env_2_disable thumb_func_start script_env_2_is_enabled script_env_2_is_enabled: @ 8098E6C - ldr r0, _08098E74 + ldr r0, =0x03000f2c ldrb r0, [r0] bx lr .align 2, 0 -_08098E74: .4byte 0x03000f2c + .pool thumb_func_end script_env_2_is_enabled thumb_func_start script_env_context_is_running script_env_context_is_running: @ 8098E78 push {lr} - ldr r0, _08098E88 + ldr r0, =0x03000e38 ldrb r0, [r0] cmp r0, 0 beq _08098E8C movs r0, 0 b _08098E8E .align 2, 0 -_08098E88: .4byte 0x03000e38 + .pool _08098E8C: movs r0, 0x1 _08098E8E: @@ -312829,33 +302507,30 @@ _08098E8E: thumb_func_start script_env_1_init script_env_1_init: @ 8098E94 push {lr} - ldr r0, _08098EAC - ldr r1, _08098EB0 - ldr r2, _08098EB4 + ldr r0, =0x03000e40 + ldr r1, =0x081db67c + ldr r2, =0x081dba08 bl script_env_init - ldr r1, _08098EB8 + ldr r1, =0x03000e38 movs r0, 0x2 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_08098EAC: .4byte 0x03000e40 -_08098EB0: .4byte 0x081db67c -_08098EB4: .4byte 0x081dba08 -_08098EB8: .4byte 0x03000e38 + .pool thumb_func_end script_env_1_init thumb_func_start script_env_2_run_current_script script_env_2_run_current_script: @ 8098EBC push {r4,lr} - ldr r4, _08098EE0 + ldr r4, =0x03000e38 ldrb r0, [r4] cmp r0, 0x2 beq _08098EF0 cmp r0, 0x1 beq _08098EF0 bl script_env_2_enable - ldr r0, _08098EE4 + ldr r0, =0x03000e40 bl script_main_handler lsls r0, 24 cmp r0, 0 @@ -312863,8 +302538,7 @@ script_env_2_run_current_script: @ 8098EBC movs r0, 0x1 b _08098EF2 .align 2, 0 -_08098EE0: .4byte 0x03000e38 -_08098EE4: .4byte 0x03000e40 + .pool _08098EE8: movs r0, 0x2 strb r0, [r4] @@ -312881,65 +302555,62 @@ _08098EF2: script_env_1_execute_new_script: @ 8098EF8 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08098F20 - ldr r1, _08098F24 - ldr r2, _08098F28 + ldr r4, =0x03000e40 + ldr r1, =0x081db67c + ldr r2, =0x081dba08 adds r0, r4, 0 bl script_env_init adds r0, r4, 0 adds r1, r5, 0 bl script_setup_bytecode_script bl script_env_2_enable - ldr r1, _08098F2C + ldr r1, =0x03000e38 movs r0, 0 strb r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08098F20: .4byte 0x03000e40 -_08098F24: .4byte 0x081db67c -_08098F28: .4byte 0x081dba08 -_08098F2C: .4byte 0x03000e38 + .pool thumb_func_end script_env_1_execute_new_script thumb_func_start script_env_2_set_ctx_paused script_env_2_set_ctx_paused: @ 8098F30 - ldr r1, _08098F38 + ldr r1, =0x03000e38 movs r0, 0x1 strb r0, [r1] bx lr .align 2, 0 -_08098F38: .4byte 0x03000e38 + .pool thumb_func_end script_env_2_set_ctx_paused thumb_func_start script_env_2_enable_and_set_ctx_running script_env_2_enable_and_set_ctx_running: @ 8098F3C push {lr} - ldr r1, _08098F4C + ldr r1, =0x03000e38 movs r0, 0 strb r0, [r1] bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_08098F4C: .4byte 0x03000e38 + .pool thumb_func_end script_env_2_enable_and_set_ctx_running thumb_func_start script_env_2_execute_new_script script_env_2_execute_new_script: @ 8098F50 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08098F7C - ldr r1, _08098F80 - ldr r2, _08098F84 + ldr r4, =0x03000eb8 + ldr r1, =0x081db67c + ldr r2, =0x081dba08 adds r0, r4, 0 bl script_env_init adds r0, r4, 0 adds r1, r5, 0 bl script_setup_bytecode_script _08098F68: - ldr r0, _08098F7C + ldr r0, =0x03000eb8 bl script_main_handler lsls r0, 24 lsrs r0, 24 @@ -312949,9 +302620,7 @@ _08098F68: pop {r0} bx r0 .align 2, 0 -_08098F7C: .4byte 0x03000eb8 -_08098F80: .4byte 0x081db67c -_08098F84: .4byte 0x081dba08 + .pool thumb_func_end script_env_2_execute_new_script thumb_func_start mapheader_get_tagged_pointer @@ -312959,7 +302628,7 @@ mapheader_get_tagged_pointer: @ 8098F88 push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _08098FA0 + ldr r0, =0x02037318 ldr r2, [r0, 0x8] cmp r2, 0 beq _08098F9C @@ -312971,7 +302640,7 @@ _08098F9C: movs r0, 0 b _08098FC2 .align 2, 0 -_08098FA0: .4byte 0x02037318 + .pool _08098FA4: cmp r0, r1 beq _08098FAC @@ -313140,9 +302809,9 @@ _080990A8: thumb_func_start sub_80990AC sub_80990AC: @ 80990AC push {lr} - ldr r0, _080990C8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080990CC + ldr r1, =0x0000372c adds r0, r1 movs r1, 0xFA lsls r1, 2 @@ -313152,8 +302821,7 @@ sub_80990AC: @ 80990AC pop {r1} bx r1 .align 2, 0 -_080990C8: .4byte 0x03005d8c -_080990CC: .4byte 0x0000372c + .pool thumb_func_end sub_80990AC thumb_func_start killram @@ -313162,20 +302830,18 @@ killram: @ 80990D0 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r0, _080990F0 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _080990F4 + ldr r0, =0x00003728 adds r1, r0 - ldr r2, _080990F8 + ldr r2, =0x050000fb mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_080990F0: .4byte 0x03005d8c -_080990F4: .4byte 0x00003728 -_080990F8: .4byte 0x050000fb + .pool thumb_func_end killram thumb_func_start sub_80990FC @@ -313198,13 +302864,13 @@ sub_80990FC: @ 80990FC lsrs r7, r3, 24 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08099160 + ldr r0, =0x03005d8c mov r10, r0 ldr r5, [r0] - ldr r1, _08099164 + ldr r1, =0x0000372c adds r4, r5, r1 bl killram - ldr r0, _08099168 + ldr r0, =0x000003e3 cmp r8, r0 bhi _08099174 movs r0, 0x33 @@ -313213,7 +302879,7 @@ sub_80990FC: @ 80990FC strb r2, [r4, 0x1] strb r7, [r4, 0x2] strb r6, [r4, 0x3] - ldr r1, _0809916C + ldr r1, =0x00003730 adds r0, r5, r1 ldr r1, [sp] mov r2, r8 @@ -313221,17 +302887,13 @@ sub_80990FC: @ 80990FC bl sub_80990AC mov r2, r10 ldr r1, [r2] - ldr r2, _08099170 + ldr r2, =0x00003728 adds r1, r2 str r0, [r1] movs r0, 0x1 b _08099176 .align 2, 0 -_08099160: .4byte 0x03005d8c -_08099164: .4byte 0x0000372c -_08099168: .4byte 0x000003e3 -_0809916C: .4byte 0x00003730 -_08099170: .4byte 0x00003728 + .pool _08099174: movs r0, 0 _08099176: @@ -313251,11 +302913,11 @@ sub_8099188: @ 8099188 adds r4, r1, 0 lsls r0, 24 lsrs r3, r0, 24 - ldr r6, _080991D8 + ldr r6, =0x03005d8c ldr r5, [r6] - ldr r0, _080991DC + ldr r0, =0x0000372c adds r2, r5, r0 - ldr r7, _080991E0 + ldr r7, =0x020375c0 movs r0, 0 str r0, [r7] ldrb r0, [r2] @@ -313276,21 +302938,17 @@ sub_8099188: @ 8099188 bne _080991F0 bl sub_80990AC ldr r1, [r6] - ldr r2, _080991E4 + ldr r2, =0x00003728 adds r1, r2 ldr r1, [r1] cmp r0, r1 bne _080991EC str r4, [r7] - ldr r1, _080991E8 + ldr r1, =0x00003730 adds r0, r5, r1 b _080991F2 .align 2, 0 -_080991D8: .4byte 0x03005d8c -_080991DC: .4byte 0x0000372c -_080991E0: .4byte 0x020375c0 -_080991E4: .4byte 0x00003728 -_080991E8: .4byte 0x00003730 + .pool _080991EC: bl killram _080991F0: @@ -313304,9 +302962,9 @@ _080991F2: thumb_func_start sub_80991F8 sub_80991F8: @ 80991F8 push {r4,lr} - ldr r4, _08099230 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r2, _08099234 + ldr r2, =0x0000372c adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x33 @@ -313322,7 +302980,7 @@ sub_80991F8: @ 80991F8 bne _0809923C bl sub_80990AC ldr r1, [r4] - ldr r2, _08099238 + ldr r2, =0x00003728 adds r1, r2 ldr r1, [r1] cmp r0, r1 @@ -313330,9 +302988,7 @@ sub_80991F8: @ 80991F8 movs r0, 0x1 b _0809923E .align 2, 0 -_08099230: .4byte 0x03005d8c -_08099234: .4byte 0x0000372c -_08099238: .4byte 0x00003728 + .pool _0809923C: movs r0, 0 _0809923E: @@ -313344,9 +303000,9 @@ _0809923E: thumb_func_start sub_8099244 sub_8099244: @ 8099244 push {r4-r6,lr} - ldr r6, _08099284 + ldr r6, =0x03005d8c ldr r5, [r6] - ldr r0, _08099288 + ldr r0, =0x0000372c adds r4, r5, r0 bl sub_801B27C cmp r0, 0 @@ -313365,19 +303021,16 @@ sub_8099244: @ 8099244 bne _08099298 bl sub_80990AC ldr r1, [r6] - ldr r2, _0809928C + ldr r2, =0x00003728 adds r1, r2 ldr r1, [r1] cmp r0, r1 bne _08099294 - ldr r1, _08099290 + ldr r1, =0x00003730 adds r0, r5, r1 b _0809929A .align 2, 0 -_08099284: .4byte 0x03005d8c -_08099288: .4byte 0x0000372c -_0809928C: .4byte 0x00003728 -_08099290: .4byte 0x00003730 + .pool _08099294: bl killram _08099298: @@ -313395,7 +303048,7 @@ sub_80992A0: @ 80992A0 adds r2, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r0, _080992C8 + ldr r0, =0x000003e3 cmp r1, r0 bls _080992B2 adds r1, r0, 0 @@ -313410,7 +303063,7 @@ _080992B2: pop {r0} bx r0 .align 2, 0 -_080992C8: .4byte 0x000003e3 + .pool thumb_func_end sub_80992A0 thumb_func_start s00_nop @@ -313453,7 +303106,7 @@ s25_extended_cmd: @ 80992F8 push {lr} bl script_read_halfword lsls r0, 16 - ldr r1, _08099314 + ldr r1, =0x081dba64 lsrs r0, 14 adds r0, r1 ldr r0, [r0] @@ -313462,7 +303115,7 @@ s25_extended_cmd: @ 80992F8 pop {r1} bx r1 .align 2, 0 -_08099314: .4byte 0x081dba64 + .pool thumb_func_end s25_extended_cmd thumb_func_start s26_extended_cmd_setvar @@ -313474,7 +303127,7 @@ s26_extended_cmd_setvar: @ 8099318 lsrs r0, 16 bl var_get_pointer adds r6, r0, 0 - ldr r4, _08099348 + ldr r4, =0x081dba64 adds r0, r5, 0 bl script_read_halfword lsls r0, 16 @@ -313488,7 +303141,7 @@ s26_extended_cmd_setvar: @ 8099318 pop {r1} bx r1 .align 2, 0 -_08099348: .4byte 0x081dba64 + .pool thumb_func_end s26_extended_cmd_setvar thumb_func_start s23_execute_ASM @@ -313558,7 +303211,7 @@ s06_if_jump: @ 80993A4 adds r0, r5, 0 bl script_read_word adds r2, r0, 0 - ldr r1, _080993DC + ldr r1, =0x085102c0 lsls r0, r4, 1 adds r0, r4 ldrb r3, [r5, 0x2] @@ -313576,7 +303229,7 @@ _080993D2: pop {r1} bx r1 .align 2, 0 -_080993DC: .4byte 0x085102c0 + .pool thumb_func_end s06_if_jump thumb_func_start s07_if_call @@ -313590,7 +303243,7 @@ s07_if_call: @ 80993E0 adds r0, r5, 0 bl script_read_word adds r2, r0, 0 - ldr r1, _08099418 + ldr r1, =0x085102c0 lsls r0, r4, 1 adds r0, r4 ldrb r3, [r5, 0x2] @@ -313608,7 +303261,7 @@ _0809940E: pop {r1} bx r1 .align 2, 0 -_08099418: .4byte 0x085102c0 + .pool thumb_func_end s07_if_call thumb_func_start sB8_set_virtual_address @@ -313617,7 +303270,7 @@ sB8_set_virtual_address: @ 809941C ldr r4, [r0, 0x8] subs r4, 0x1 bl script_read_word - ldr r1, _08099434 + ldr r1, =0x020375c4 subs r0, r4 str r0, [r1] movs r0, 0 @@ -313625,7 +303278,7 @@ sB8_set_virtual_address: @ 809941C pop {r1} bx r1 .align 2, 0 -_08099434: .4byte 0x020375c4 + .pool thumb_func_end sB8_set_virtual_address thumb_func_start sB9_virtual_jump @@ -313634,7 +303287,7 @@ sB9_virtual_jump: @ 8099438 adds r4, r0, 0 bl script_read_word adds r1, r0, 0 - ldr r0, _08099458 + ldr r0, =0x020375c4 ldr r0, [r0] subs r1, r0 adds r0, r4, 0 @@ -313644,7 +303297,7 @@ sB9_virtual_jump: @ 8099438 pop {r1} bx r1 .align 2, 0 -_08099458: .4byte 0x020375c4 + .pool thumb_func_end sB9_virtual_jump thumb_func_start sBA_virtual_call @@ -313653,7 +303306,7 @@ sBA_virtual_call: @ 809945C adds r4, r0, 0 bl script_read_word adds r1, r0, 0 - ldr r0, _0809947C + ldr r0, =0x020375c4 ldr r0, [r0] subs r1, r0 adds r0, r4, 0 @@ -313663,7 +303316,7 @@ sBA_virtual_call: @ 809945C pop {r1} bx r1 .align 2, 0 -_0809947C: .4byte 0x020375c4 + .pool thumb_func_end sBA_virtual_call thumb_func_start sBB_virtual_if_jump @@ -313676,10 +303329,10 @@ sBB_virtual_if_jump: @ 8099480 str r0, [r5, 0x8] adds r0, r5, 0 bl script_read_word - ldr r1, _080994BC + ldr r1, =0x020375c4 ldr r1, [r1] subs r2, r0, r1 - ldr r1, _080994C0 + ldr r1, =0x085102c0 lsls r0, r4, 1 adds r0, r4 ldrb r3, [r5, 0x2] @@ -313697,8 +303350,7 @@ _080994B2: pop {r1} bx r1 .align 2, 0 -_080994BC: .4byte 0x020375c4 -_080994C0: .4byte 0x085102c0 + .pool thumb_func_end sBB_virtual_if_jump thumb_func_start sBC_virtual_if_call @@ -313711,10 +303363,10 @@ sBC_virtual_if_call: @ 80994C4 str r0, [r5, 0x8] adds r0, r5, 0 bl script_read_word - ldr r1, _08099500 + ldr r1, =0x020375c4 ldr r1, [r1] subs r2, r0, r1 - ldr r1, _08099504 + ldr r1, =0x085102c0 lsls r0, r4, 1 adds r0, r4 ldrb r3, [r5, 0x2] @@ -313732,8 +303384,7 @@ _080994F6: pop {r1} bx r1 .align 2, 0 -_08099500: .4byte 0x020375c4 -_08099504: .4byte 0x085102c0 + .pool thumb_func_end sBC_virtual_if_call thumb_func_start s08_jumpstd @@ -313745,9 +303396,9 @@ s08_jumpstd: @ 8099508 adds r0, 0x1 str r0, [r2, 0x8] lsls r1, 2 - ldr r0, _08099530 + ldr r0, =0x081dc2a0 adds r1, r0 - ldr r0, _08099534 + ldr r0, =0x081dc2cc cmp r1, r0 bcs _08099528 ldr r1, [r1] @@ -313758,8 +303409,7 @@ _08099528: pop {r1} bx r1 .align 2, 0 -_08099530: .4byte 0x081dc2a0 -_08099534: .4byte 0x081dc2cc + .pool thumb_func_end s08_jumpstd thumb_func_start s09_callstd @@ -313771,9 +303421,9 @@ s09_callstd: @ 8099538 adds r0, 0x1 str r0, [r2, 0x8] lsls r1, 2 - ldr r0, _08099560 + ldr r0, =0x081dc2a0 adds r1, r0 - ldr r0, _08099564 + ldr r0, =0x081dc2cc cmp r1, r0 bcs _08099558 ldr r1, [r1] @@ -313784,8 +303434,7 @@ _08099558: pop {r1} bx r1 .align 2, 0 -_08099560: .4byte 0x081dc2a0 -_08099564: .4byte 0x081dc2cc + .pool thumb_func_end s09_callstd thumb_func_start s0A_jumpstd_if @@ -313799,7 +303448,7 @@ s0A_jumpstd_if: @ 8099568 ldrb r4, [r0] adds r0, 0x1 str r0, [r3, 0x8] - ldr r1, _080995A8 + ldr r1, =0x085102c0 lsls r0, r2, 1 adds r0, r2 ldrb r2, [r3, 0x2] @@ -313809,9 +303458,9 @@ s0A_jumpstd_if: @ 8099568 cmp r0, 0x1 bne _080995A0 lsls r0, r4, 2 - ldr r1, _080995AC + ldr r1, =0x081dc2a0 adds r1, r0, r1 - ldr r0, _080995B0 + ldr r0, =0x081dc2cc cmp r1, r0 bcs _080995A0 ldr r1, [r1] @@ -313823,9 +303472,7 @@ _080995A0: pop {r1} bx r1 .align 2, 0 -_080995A8: .4byte 0x085102c0 -_080995AC: .4byte 0x081dc2a0 -_080995B0: .4byte 0x081dc2cc + .pool thumb_func_end s0A_jumpstd_if thumb_func_start s0B_callstd_if @@ -313839,7 +303486,7 @@ s0B_callstd_if: @ 80995B4 ldrb r4, [r0] adds r0, 0x1 str r0, [r3, 0x8] - ldr r1, _080995F4 + ldr r1, =0x085102c0 lsls r0, r2, 1 adds r0, r2 ldrb r2, [r3, 0x2] @@ -313849,9 +303496,9 @@ s0B_callstd_if: @ 80995B4 cmp r0, 0x1 bne _080995EC lsls r0, r4, 2 - ldr r1, _080995F8 + ldr r1, =0x081dc2a0 adds r1, r0, r1 - ldr r0, _080995FC + ldr r0, =0x081dc2cc cmp r1, r0 bcs _080995EC ldr r1, [r1] @@ -313863,22 +303510,20 @@ _080995EC: pop {r1} bx r1 .align 2, 0 -_080995F4: .4byte 0x085102c0 -_080995F8: .4byte 0x081dc2a0 -_080995FC: .4byte 0x081dc2cc + .pool thumb_func_end s0B_callstd_if thumb_func_start s0C_restore_execution_after_sCF s0C_restore_execution_after_sCF: @ 8099600 push {lr} - ldr r1, _08099610 + ldr r1, =0x020375c0 ldr r1, [r1] bl script_jump movs r0, 0 pop {r1} bx r1 .align 2, 0 -_08099610: .4byte 0x020375c0 + .pool thumb_func_end s0C_restore_execution_after_sCF thumb_func_start s0D_endscript_killram @@ -314357,7 +304002,7 @@ s8F_get_random_val: @ 809996C adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r5, _0809999C + ldr r5, =0x020375f0 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -314369,7 +304014,7 @@ s8F_get_random_val: @ 809996C pop {r1} bx r1 .align 2, 0 -_0809999C: .4byte 0x020375f0 + .pool thumb_func_end s8F_get_random_val thumb_func_start sub_80999A0 @@ -314389,7 +304034,7 @@ sub_80999A0: @ 80999A0 lsrs r0, 16 bl var_get adds r1, r0, 0 - ldr r5, _080999E0 + ldr r5, =0x020375f0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -314402,7 +304047,7 @@ sub_80999A0: @ 80999A0 pop {r1} bx r1 .align 2, 0 -_080999E0: .4byte 0x020375f0 + .pool thumb_func_end sub_80999A0 thumb_func_start sub_80999E4 @@ -314422,7 +304067,7 @@ sub_80999E4: @ 80999E4 lsrs r0, 16 bl var_get adds r1, r0, 0 - ldr r5, _08099A24 + ldr r5, =0x020375f0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -314435,7 +304080,7 @@ sub_80999E4: @ 80999E4 pop {r1} bx r1 .align 2, 0 -_08099A24: .4byte 0x020375f0 + .pool thumb_func_end sub_80999E4 thumb_func_start sub_8099A28 @@ -314455,7 +304100,7 @@ sub_8099A28: @ 8099A28 lsrs r0, 16 bl var_get adds r1, r0, 0 - ldr r5, _08099A68 + ldr r5, =0x020375f0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -314468,7 +304113,7 @@ sub_8099A28: @ 8099A28 pop {r1} bx r1 .align 2, 0 -_08099A68: .4byte 0x020375f0 + .pool thumb_func_end sub_8099A28 thumb_func_start sub_8099A6C @@ -314488,7 +304133,7 @@ sub_8099A6C: @ 8099A6C lsrs r0, 16 bl var_get adds r1, r0, 0 - ldr r5, _08099AAC + ldr r5, =0x020375f0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 @@ -314501,7 +304146,7 @@ sub_8099A6C: @ 8099A6C pop {r1} bx r1 .align 2, 0 -_08099AAC: .4byte 0x020375f0 + .pool thumb_func_end sub_8099A6C thumb_func_start s48_get_item_type @@ -314513,7 +304158,7 @@ s48_get_item_type: @ 8099AB0 bl var_get lsls r0, 16 lsrs r0, 16 - ldr r4, _08099AD8 + ldr r4, =0x020375f0 bl sub_80D6C68 lsls r0, 24 lsrs r0, 24 @@ -314523,7 +304168,7 @@ s48_get_item_type: @ 8099AB0 pop {r1} bx r1 .align 2, 0 -_08099AD8: .4byte 0x020375f0 + .pool thumb_func_end s48_get_item_type thumb_func_start sub_8099ADC @@ -314545,7 +304190,7 @@ sub_8099ADC: @ 8099ADC adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r5, _08099B1C + ldr r5, =0x020375f0 adds r0, r4, 0 bl sub_80D6D70 lsls r0, 24 @@ -314556,7 +304201,7 @@ sub_8099ADC: @ 8099ADC pop {r1} bx r1 .align 2, 0 -_08099B1C: .4byte 0x020375f0 + .pool thumb_func_end sub_8099ADC thumb_func_start sub_8099B20 @@ -314578,7 +304223,7 @@ sub_8099B20: @ 8099B20 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r5, _08099B60 + ldr r5, =0x020375f0 adds r0, r4, 0 bl sub_80D6D1C lsls r0, 24 @@ -314589,7 +304234,7 @@ sub_8099B20: @ 8099B20 pop {r1} bx r1 .align 2, 0 -_08099B60: .4byte 0x020375f0 + .pool thumb_func_end sub_8099B20 thumb_func_start sub_8099B64 @@ -314599,7 +304244,7 @@ sub_8099B64: @ 8099B64 lsls r0, 16 lsrs r0, 16 bl var_get - ldr r4, _08099B8C + ldr r4, =0x020375f0 lsls r0, 24 lsrs r0, 24 bl sub_8161960 @@ -314611,7 +304256,7 @@ sub_8099B64: @ 8099B64 pop {r1} bx r1 .align 2, 0 -_08099B8C: .4byte 0x020375f0 + .pool thumb_func_end sub_8099B64 thumb_func_start sub_8099B90 @@ -314621,7 +304266,7 @@ sub_8099B90: @ 8099B90 lsls r0, 16 lsrs r0, 16 bl var_get - ldr r4, _08099BB8 + ldr r4, =0x020375f0 lsls r0, 24 lsrs r0, 24 bl sub_81619DC @@ -314633,7 +304278,7 @@ sub_8099B90: @ 8099B90 pop {r1} bx r1 .align 2, 0 -_08099BB8: .4byte 0x020375f0 + .pool thumb_func_end sub_8099B90 thumb_func_start sub_8099BBC @@ -314643,7 +304288,7 @@ sub_8099BBC: @ 8099BBC lsls r0, 16 lsrs r0, 16 bl var_get - ldr r4, _08099BE4 + ldr r4, =0x020375f0 lsls r0, 24 lsrs r0, 24 bl sub_81619A8 @@ -314655,7 +304300,7 @@ sub_8099BBC: @ 8099BBC pop {r1} bx r1 .align 2, 0 -_08099BE4: .4byte 0x020375f0 + .pool thumb_func_end sub_8099BBC thumb_func_start sub_8099BE8 @@ -314665,7 +304310,7 @@ sub_8099BE8: @ 8099BE8 lsls r0, 16 lsrs r0, 16 bl var_get - ldr r4, _08099C10 + ldr r4, =0x020375f0 lsls r0, 24 lsrs r0, 24 bl sub_8161918 @@ -314677,7 +304322,7 @@ sub_8099BE8: @ 8099BE8 pop {r1} bx r1 .align 2, 0 -_08099C10: .4byte 0x020375f0 + .pool thumb_func_end sub_8099BE8 thumb_func_start s29_flag_set @@ -314766,7 +304411,7 @@ s99_unknown: @ 8099C8C thumb_func_start sub_8099CA8 sub_8099CA8: @ 8099CA8 push {lr} - ldr r0, _08099CBC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -314775,7 +304420,7 @@ sub_8099CA8: @ 8099CA8 movs r0, 0 b _08099CC2 .align 2, 0 -_08099CBC: .4byte 0x02037fd4 + .pool _08099CC0: movs r0, 0x1 _08099CC2: @@ -314793,7 +304438,7 @@ s97_screen_special_effect: @ 8099CC8 str r1, [r4, 0x8] movs r1, 0 bl fade_screen - ldr r1, _08099CEC + ldr r1, =sub_8099CA8 + 1 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -314801,7 +304446,7 @@ s97_screen_special_effect: @ 8099CC8 pop {r1} bx r1 .align 2, 0 -_08099CEC: .4byte sub_8099CA8 + 1 + .pool thumb_func_end s97_screen_special_effect thumb_func_start s98_refade_with_timer @@ -314818,7 +304463,7 @@ s98_refade_with_timer: @ 8099CF0 lsls r1, 24 asrs r1, 24 bl fade_screen - ldr r1, _08099D1C + ldr r1, =sub_8099CA8 + 1 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -314826,7 +304471,7 @@ s98_refade_with_timer: @ 8099CF0 pop {r1} bx r1 .align 2, 0 -_08099D1C: .4byte sub_8099CA8 + 1 + .pool thumb_func_end s98_refade_with_timer thumb_func_start sub_8099D20 @@ -314848,28 +304493,26 @@ _08099D3A: cmp r4, 0x2 beq _08099D60 _08099D3E: - ldr r0, _08099D54 - ldr r1, _08099D58 - ldr r2, _08099D5C + ldr r0, =0x02037714 + ldr r1, =0x02037fe8 + ldr r2, =0x04000100 bl CpuSet adds r0, r4, 0 movs r1, 0 bl fade_screen b _08099D72 .align 2, 0 -_08099D54: .4byte 0x02037714 -_08099D58: .4byte 0x02037fe8 -_08099D5C: .4byte 0x04000100 + .pool _08099D60: - ldr r0, _08099D84 - ldr r1, _08099D88 - ldr r2, _08099D8C + ldr r0, =0x02037fe8 + ldr r1, =0x02037714 + ldr r2, =0x04000100 bl CpuSet adds r0, r4, 0 movs r1, 0 bl fade_screen _08099D72: - ldr r1, _08099D90 + ldr r1, =sub_8099CA8 + 1 adds r0, r5, 0 bl script_setup_asm_script movs r0, 0x1 @@ -314877,16 +304520,13 @@ _08099D72: pop {r1} bx r1 .align 2, 0 -_08099D84: .4byte 0x02037fe8 -_08099D88: .4byte 0x02037714 -_08099D8C: .4byte 0x04000100 -_08099D90: .4byte sub_8099CA8 + 1 + .pool thumb_func_end sub_8099D20 thumb_func_start s28_pause_asm s28_pause_asm: @ 8099D94 push {lr} - ldr r1, _08099DA8 + ldr r1, =0x020375c8 ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] @@ -314896,7 +304536,7 @@ s28_pause_asm: @ 8099D94 movs r0, 0 b _08099DAE .align 2, 0 -_08099DA8: .4byte 0x020375c8 + .pool _08099DAC: movs r0, 0x1 _08099DAE: @@ -314909,9 +304549,9 @@ s28_pause: @ 8099DB4 push {r4,lr} adds r4, r0, 0 bl script_read_halfword - ldr r1, _08099DD0 + ldr r1, =0x020375c8 strh r0, [r1] - ldr r1, _08099DD4 + ldr r1, =s28_pause_asm + 1 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -314919,8 +304559,7 @@ s28_pause: @ 8099DB4 pop {r1} bx r1 .align 2, 0 -_08099DD0: .4byte 0x020375c8 -_08099DD4: .4byte s28_pause_asm + 1 + .pool thumb_func_end s28_pause thumb_func_start s2C_unknown @@ -314963,16 +304602,16 @@ s2D_unknown: @ 8099E10 s2E_unknown: @ 8099E1C push {lr} bl sub_802F588 - ldr r2, _08099E44 - ldr r1, _08099E48 + ldr r2, =0x020375d8 + ldr r1, =0x03005cf8 movs r0, 0x2 ldrsb r0, [r1, r0] strh r0, [r2] - ldr r2, _08099E4C + ldr r2, =0x020375da movs r0, 0x3 ldrsb r0, [r1, r0] strh r0, [r2] - ldr r2, _08099E50 + ldr r2, =0x020375dc movs r0, 0x4 ldrsb r0, [r1, r0] strh r0, [r2] @@ -314980,10 +304619,7 @@ s2E_unknown: @ 8099E1C pop {r1} bx r1 .align 2, 0 -_08099E44: .4byte 0x020375d8 -_08099E48: .4byte 0x03005cf8 -_08099E4C: .4byte 0x020375da -_08099E50: .4byte 0x020375dc + .pool thumb_func_end s2E_unknown thumb_func_start sA4_set_weather_data @@ -315753,7 +305389,7 @@ s42_get_map_camera_pos: @ 809A45C lsls r0, 16 lsrs r0, 16 bl var_get_pointer - ldr r2, _0809A494 + ldr r2, =0x03005d8c ldr r1, [r2] ldrh r1, [r1] strh r1, [r5] @@ -315765,13 +305401,13 @@ s42_get_map_camera_pos: @ 809A45C pop {r1} bx r1 .align 2, 0 -_0809A494: .4byte 0x03005d8c + .pool thumb_func_end s42_get_map_camera_pos thumb_func_start s43_get_player_party_count s43_get_player_party_count: @ 809A498 push {r4,lr} - ldr r4, _0809A4B0 + ldr r4, =0x020375f0 bl calc_player_party_count lsls r0, 24 lsrs r0, 24 @@ -315781,7 +305417,7 @@ s43_get_player_party_count: @ 809A498 pop {r1} bx r1 .align 2, 0 -_0809A4B0: .4byte 0x020375f0 + .pool thumb_func_end s43_get_player_party_count thumb_func_start s2F_music_play @@ -315815,13 +305451,13 @@ _0809A4DA: thumb_func_start s30_music_check s30_music_check: @ 809A4E0 push {lr} - ldr r1, _0809A4F0 + ldr r1, =s30_music_check_asm + 1 bl script_setup_asm_script movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_0809A4F0: .4byte s30_music_check_asm + 1 + .pool thumb_func_end s30_music_check thumb_func_start s31_fanfare_play @@ -315849,13 +305485,13 @@ s32_fanfare_wait_asm: @ 809A508 thumb_func_start s32_fanfare_wait s32_fanfare_wait: @ 809A518 push {lr} - ldr r1, _0809A528 + ldr r1, =s32_fanfare_wait_asm + 1 bl script_setup_asm_script movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_0809A528: .4byte s32_fanfare_wait_asm + 1 + .pool thumb_func_end s32_fanfare_wait thumb_func_start s33_play_music @@ -315934,7 +305570,7 @@ _0809A5AA: movs r0, 0x4 bl sub_80A31E8 _0809A5B0: - ldr r1, _0809A5C0 + ldr r1, =sub_80A3200 + 1 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -315942,7 +305578,7 @@ _0809A5B0: pop {r1} bx r1 .align 2, 0 -_0809A5C0: .4byte sub_80A3200 + 1 + .pool thumb_func_end s37_fadeout thumb_func_start s38_fadein @@ -315983,20 +305619,19 @@ s4F_execute_movement: @ 809A5E8 adds r3, r0, 0 lsls r0, r4, 24 lsrs r0, 24 - ldr r1, _0809A624 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl exec_movement - ldr r0, _0809A628 + ldr r0, =0x020375ca strh r4, [r0] movs r0, 0 pop {r4,r5} pop {r1} bx r1 .align 2, 0 -_0809A624: .4byte 0x03005d8c -_0809A628: .4byte 0x020375ca + .pool thumb_func_end s4F_execute_movement thumb_func_start s50_execute_movement_remote @@ -316023,24 +305658,24 @@ s50_execute_movement_remote: @ 809A62C lsls r0, r4, 24 lsrs r0, 24 bl exec_movement - ldr r0, _0809A66C + ldr r0, =0x020375ca strh r4, [r0] movs r0, 0 pop {r4,r5} pop {r1} bx r1 .align 2, 0 -_0809A66C: .4byte 0x020375ca + .pool thumb_func_end s50_execute_movement_remote thumb_func_start s51a_0806B288 s51a_0806B288: @ 809A670 push {lr} - ldr r0, _0809A68C + ldr r0, =0x020375ca ldrb r0, [r0] - ldr r1, _0809A690 + ldr r1, =0x020375ce ldrb r1, [r1] - ldr r2, _0809A694 + ldr r2, =0x020375cc ldrb r2, [r2] bl sub_80D3340 lsls r0, 24 @@ -316048,9 +305683,7 @@ s51a_0806B288: @ 809A670 pop {r1} bx r1 .align 2, 0 -_0809A68C: .4byte 0x020375ca -_0809A690: .4byte 0x020375ce -_0809A694: .4byte 0x020375cc + .pool thumb_func_end s51a_0806B288 thumb_func_start s51_waitmove @@ -316065,20 +305698,20 @@ s51_waitmove: @ 809A698 lsrs r1, r0, 16 cmp r1, 0 beq _0809A6B4 - ldr r0, _0809A6D8 + ldr r0, =0x020375ca strh r1, [r0] _0809A6B4: - ldr r1, _0809A6DC - ldr r0, _0809A6E0 + ldr r1, =0x020375cc + ldr r0, =0x03005d8c ldr r2, [r0] movs r0, 0x4 ldrsb r0, [r2, r0] strh r0, [r1] - ldr r1, _0809A6E4 + ldr r1, =0x020375ce movs r0, 0x5 ldrsb r0, [r2, r0] strh r0, [r1] - ldr r1, _0809A6E8 + ldr r1, =s51a_0806B288 + 1 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -316086,11 +305719,7 @@ _0809A6B4: pop {r1} bx r1 .align 2, 0 -_0809A6D8: .4byte 0x020375ca -_0809A6DC: .4byte 0x020375cc -_0809A6E0: .4byte 0x03005d8c -_0809A6E4: .4byte 0x020375ce -_0809A6E8: .4byte s51a_0806B288 + 1 + .pool thumb_func_end s51_waitmove thumb_func_start s52_waitmove_remote @@ -316105,7 +305734,7 @@ s52_waitmove_remote: @ 809A6EC lsrs r1, r0, 16 cmp r1, 0 beq _0809A708 - ldr r0, _0809A730 + ldr r0, =0x020375ca strh r1, [r0] _0809A708: ldr r0, [r4, 0x8] @@ -316115,11 +305744,11 @@ _0809A708: ldrb r1, [r0] adds r0, 0x1 str r0, [r4, 0x8] - ldr r0, _0809A734 + ldr r0, =0x020375cc strh r2, [r0] - ldr r0, _0809A738 + ldr r0, =0x020375ce strh r1, [r0] - ldr r1, _0809A73C + ldr r1, =s51a_0806B288 + 1 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -316127,10 +305756,7 @@ _0809A708: pop {r1} bx r1 .align 2, 0 -_0809A730: .4byte 0x020375ca -_0809A734: .4byte 0x020375cc -_0809A738: .4byte 0x020375ce -_0809A73C: .4byte s51a_0806B288 + 1 + .pool thumb_func_end s52_waitmove_remote thumb_func_start s53_hide_sprite @@ -316142,7 +305768,7 @@ s53_hide_sprite: @ 809A740 bl var_get lsls r0, 24 lsrs r0, 24 - ldr r1, _0809A764 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -316151,7 +305777,7 @@ s53_hide_sprite: @ 809A740 pop {r1} bx r1 .align 2, 0 -_0809A764: .4byte 0x03005d8c + .pool thumb_func_end s53_hide_sprite thumb_func_start s54_hide_sprite_set_coords @@ -316187,7 +305813,7 @@ s55_show_sprite: @ 809A798 bl var_get lsls r0, 24 lsrs r0, 24 - ldr r1, _0809A7BC + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -316196,7 +305822,7 @@ s55_show_sprite: @ 809A798 pop {r1} bx r1 .align 2, 0 -_0809A7BC: .4byte 0x03005d8c + .pool thumb_func_end s55_show_sprite thumb_func_start s56_show_sprite_set_coords @@ -316250,7 +305876,7 @@ s57_move_sprites: @ 809A7F0 bl var_get lsls r5, 24 lsrs r5, 24 - ldr r1, _0809A854 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -316268,7 +305894,7 @@ s57_move_sprites: @ 809A7F0 pop {r1} bx r1 .align 2, 0 -_0809A854: .4byte 0x03005d8c + .pool thumb_func_end s57_move_sprites thumb_func_start s63_new_sprite_location_permanent @@ -316320,7 +305946,7 @@ s64_set_sprite_top_left_corner: @ 809A8B0 bl var_get lsls r0, 24 lsrs r0, 24 - ldr r1, _0809A8D4 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -316329,7 +305955,7 @@ s64_set_sprite_top_left_corner: @ 809A8B0 pop {r1} bx r1 .align 2, 0 -_0809A8D4: .4byte 0x03005d8c + .pool thumb_func_end s64_set_sprite_top_left_corner thumb_func_start s58_npc_f1_clear_x20 @@ -316439,8 +306065,8 @@ sA9_unknown: @ 809A974 thumb_func_start s5A_face_player s5A_face_player: @ 809A9A4 push {r4,lr} - ldr r2, _0809A9D4 - ldr r0, _0809A9D8 + ldr r2, =0x02037350 + ldr r0, =0x03005df0 ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -316462,8 +306088,7 @@ _0809A9CC: pop {r1} bx r1 .align 2, 0 -_0809A9D4: .4byte 0x02037350 -_0809A9D8: .4byte 0x03005df0 + .pool thumb_func_end s5A_face_player thumb_func_start s5B_npc_set_direction @@ -316480,7 +306105,7 @@ s5B_npc_set_direction: @ 809A9DC str r1, [r4, 0x8] lsls r0, 24 lsrs r0, 24 - ldr r1, _0809AA0C + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -316490,7 +306115,7 @@ s5B_npc_set_direction: @ 809A9DC pop {r1} bx r1 .align 2, 0 -_0809AA0C: .4byte 0x03005d8c + .pool thumb_func_end s5B_npc_set_direction thumb_func_start s65_set_sprite_behaviour @@ -316594,13 +306219,13 @@ sub_809AAC4: @ 809AAC4 cmp r0, 0 bne _0809AAE4 bl sub_80983E8 - ldr r1, _0809AAE0 + ldr r1, =sub_80983C4 + 1 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 b _0809AAE6 .align 2, 0 -_0809AAE0: .4byte sub_80983C4 + 1 + .pool _0809AAE4: movs r0, 0 _0809AAE6: @@ -316619,8 +306244,8 @@ sub_809AAEC: @ 809AAEC movs r0, 0 b _0809AB3A _0809AAFC: - ldr r2, _0809AB20 - ldr r0, _0809AB24 + ldr r2, =0x02037350 + ldr r0, =0x03005df0 ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -316631,17 +306256,15 @@ _0809AAFC: cmp r0, 0 beq _0809AB2C bl sub_80984A0 - ldr r1, _0809AB28 + ldr r1, =sub_809847C + 1 adds r0, r4, 0 bl script_setup_asm_script b _0809AB38 .align 2, 0 -_0809AB20: .4byte 0x02037350 -_0809AB24: .4byte 0x03005df0 -_0809AB28: .4byte sub_809847C + 1 + .pool _0809AB2C: bl sub_80983E8 - ldr r1, _0809AB40 + ldr r1, =sub_80983C4 + 1 adds r0, r4, 0 bl script_setup_asm_script _0809AB38: @@ -316651,7 +306274,7 @@ _0809AB3A: pop {r1} bx r1 .align 2, 0 -_0809AB40: .4byte sub_80983C4 + 1 + .pool thumb_func_end sub_809AAEC thumb_func_start s6B_release @@ -316668,7 +306291,7 @@ s6B_release: @ 809AB44 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0809AB78 + ldr r1, =0x02037350 adds r0, r1 bl sub_8093284 bl sub_80D338C @@ -316677,15 +306300,15 @@ s6B_release: @ 809AB44 pop {r1} bx r1 .align 2, 0 -_0809AB78: .4byte 0x02037350 + .pool thumb_func_end s6B_release thumb_func_start s6C_release_2 s6C_release_2: @ 809AB7C push {r4,lr} bl textbox_close - ldr r4, _0809ABCC - ldr r0, _0809ABD0 + ldr r4, =0x02037350 + ldr r0, =0x03005df0 ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -316717,8 +306340,7 @@ _0809AB9E: pop {r1} bx r1 .align 2, 0 -_0809ABCC: .4byte 0x02037350 -_0809ABD0: .4byte 0x03005df0 + .pool thumb_func_end s6C_release_2 thumb_func_start s67_execute_box @@ -316763,7 +306385,7 @@ s9B_unknown: @ 809AC0C bne _0809AC1C ldr r3, [r4, 0x64] _0809AC1C: - ldr r2, _0809AC38 + ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x4 orrs r0, r1 @@ -316777,7 +306399,7 @@ _0809AC1C: pop {r1} bx r1 .align 2, 0 -_0809AC38: .4byte 0x03003014 + .pool thumb_func_end s9B_unknown thumb_func_start s78_braille_msgbox @@ -316814,13 +306436,13 @@ _0809AC4E: thumb_func_start sub_809AC78 sub_809AC78: @ 809AC78 push {lr} - ldr r1, _0809AC88 + ldr r1, =sub_809833C + 1 bl script_setup_asm_script movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_0809AC88: .4byte sub_809833C + 1 + .pool thumb_func_end sub_809AC78 thumb_func_start s68_close_box @@ -316835,7 +306457,7 @@ s68_close_box: @ 809AC8C thumb_func_start sub_809AC98 sub_809AC98: @ 809AC98 push {lr} - ldr r0, _0809ACB4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -316848,7 +306470,7 @@ sub_809AC98: @ 809AC98 movs r0, 0 b _0809ACBA .align 2, 0 -_0809ACB4: .4byte 0x030022c0 + .pool _0809ACB8: movs r0, 0x1 _0809ACBA: @@ -316859,13 +306481,13 @@ _0809ACBA: thumb_func_start sub_809ACC0 sub_809ACC0: @ 809ACC0 push {lr} - ldr r1, _0809ACD0 + ldr r1, =sub_809AC98 + 1 bl script_setup_asm_script movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_0809ACD0: .4byte sub_809AC98 + 1 + .pool thumb_func_end sub_809ACC0 thumb_func_start s6E_yes_no @@ -317110,7 +306732,7 @@ sub_809AE6C: @ 809AE6C sub sp, 0x20 bl script_read_word adds r1, r0, 0 - ldr r4, _0809AF8C + ldr r4, =0x02021fc4 adds r1, 0x6 adds r0, r4, 0 bl ExpandTextCodes @@ -317204,7 +306826,7 @@ _0809AEC6: ldr r1, [sp, 0x14] str r0, [sp, 0x18] str r1, [sp, 0x1C] - ldr r5, _0809AF90 + ldr r5, =0x03000f30 mov r0, r8 bl Window_AddFromTemplate strb r0, [r5] @@ -317222,7 +306844,7 @@ _0809AEC6: movs r1, 0x11 bl Window_FastFillPixels ldrb r0, [r5] - ldr r2, _0809AF8C + ldr r2, =0x02021fc4 str r4, [sp] movs r1, 0xFF str r1, [sp, 0x4] @@ -317242,8 +306864,7 @@ _0809AEC6: pop {r1} bx r1 .align 2, 0 -_0809AF8C: .4byte 0x02021fc4 -_0809AF90: .4byte 0x03000f30 + .pool thumb_func_end sub_809AE6C thumb_func_start sub_809AF94 @@ -317259,7 +306880,7 @@ sub_809AF94: @ 809AF94 sBD_virtual_message: @ 809AFA0 push {lr} bl script_read_word - ldr r1, _0809AFB8 + ldr r1, =0x020375c4 ldr r1, [r1] subs r0, r1 bl box_related_two__2 @@ -317267,7 +306888,7 @@ sBD_virtual_message: @ 809AFA0 pop {r1} bx r1 .align 2, 0 -_0809AFB8: .4byte 0x020375c4 + .pool thumb_func_end sBD_virtual_message thumb_func_start s7D_load_pokename @@ -317283,13 +306904,13 @@ s7D_load_pokename: @ 809AFBC bl var_get lsls r0, 16 lsrs r0, 16 - ldr r1, _0809AFF4 + ldr r1, =0x085102d4 lsls r4, 2 adds r4, r1 ldr r2, [r4] movs r1, 0xB muls r1, r0 - ldr r0, _0809AFF8 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r2, 0 bl gf_strcpy @@ -317298,8 +306919,7 @@ s7D_load_pokename: @ 809AFBC pop {r1} bx r1 .align 2, 0 -_0809AFF4: .4byte 0x085102d4 -_0809AFF8: .4byte 0x083185c8 + .pool thumb_func_end s7D_load_pokename thumb_func_start s7E_load_first_pokenames @@ -317309,7 +306929,7 @@ s7E_load_first_pokenames: @ 809AFFC ldrb r2, [r1] adds r1, 0x1 str r1, [r0, 0x8] - ldr r0, _0809B03C + ldr r0, =0x085102d4 lsls r2, 2 adds r2, r0 ldr r4, [r2] @@ -317318,14 +306938,14 @@ s7E_load_first_pokenames: @ 809AFFC lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _0809B040 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB movs r2, 0 bl pokemon_getattr movs r1, 0xB muls r1, r0 - ldr r0, _0809B044 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -317334,9 +306954,7 @@ s7E_load_first_pokenames: @ 809AFFC pop {r1} bx r1 .align 2, 0 -_0809B03C: .4byte 0x085102d4 -_0809B040: .4byte 0x020244ec -_0809B044: .4byte 0x083185c8 + .pool thumb_func_end s7E_load_first_pokenames thumb_func_start s7F_load_pokename_team @@ -317354,9 +306972,9 @@ s7F_load_pokename_team: @ 809B048 lsrs r0, 16 movs r1, 0x64 muls r0, r1 - ldr r1, _0809B088 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0809B08C + ldr r1, =0x085102d4 lsls r4, 2 adds r4, r1 ldr r4, [r4] @@ -317370,8 +306988,7 @@ s7F_load_pokename_team: @ 809B048 pop {r1} bx r1 .align 2, 0 -_0809B088: .4byte 0x020244ec -_0809B08C: .4byte 0x085102d4 + .pool thumb_func_end s7F_load_pokename_team thumb_func_start s80_load_item_name @@ -317387,7 +307004,7 @@ s80_load_item_name: @ 809B090 bl var_get lsls r0, 16 lsrs r0, 16 - ldr r1, _0809B0C0 + ldr r1, =0x085102d4 lsls r4, 2 adds r4, r1 ldr r1, [r4] @@ -317397,7 +307014,7 @@ s80_load_item_name: @ 809B090 pop {r1} bx r1 .align 2, 0 -_0809B0C0: .4byte 0x085102d4 + .pool thumb_func_end s80_load_item_name thumb_func_start sub_809B0C4 @@ -317424,7 +307041,7 @@ sub_809B0C4: @ 809B0C4 adds r2, r0, 0 lsls r2, 16 lsrs r2, 16 - ldr r0, _0809B110 + ldr r0, =0x085102d4 lsls r6, 2 adds r6, r0 ldr r1, [r6] @@ -317435,7 +307052,7 @@ sub_809B0C4: @ 809B0C4 pop {r1} bx r1 .align 2, 0 -_0809B110: .4byte 0x085102d4 + .pool thumb_func_end sub_809B0C4 thumb_func_start sub_809B114 @@ -317451,12 +307068,12 @@ sub_809B114: @ 809B114 bl var_get adds r1, r0, 0 lsls r1, 16 - ldr r0, _0809B148 + ldr r0, =0x085102d4 lsls r4, 2 adds r4, r0 ldr r0, [r4] lsrs r1, 11 - ldr r2, _0809B14C + ldr r2, =0x085a5c09 adds r1, r2 bl gf_strcpy movs r0, 0 @@ -317464,8 +307081,7 @@ sub_809B114: @ 809B114 pop {r1} bx r1 .align 2, 0 -_0809B148: .4byte 0x085102d4 -_0809B14C: .4byte 0x085a5c09 + .pool thumb_func_end sub_809B114 thumb_func_start s82_load_item_name @@ -317481,13 +307097,13 @@ s82_load_item_name: @ 809B150 bl var_get lsls r0, 16 lsrs r0, 16 - ldr r1, _0809B188 + ldr r1, =0x085102d4 lsls r4, 2 adds r4, r1 ldr r2, [r4] movs r1, 0xD muls r1, r0 - ldr r0, _0809B18C + ldr r0, =0x0831977c adds r1, r0 adds r0, r2, 0 bl gf_strcpy @@ -317496,8 +307112,7 @@ s82_load_item_name: @ 809B150 pop {r1} bx r1 .align 2, 0 -_0809B188: .4byte 0x085102d4 -_0809B18C: .4byte 0x0831977c + .pool thumb_func_end s82_load_item_name thumb_func_start s83_load_textvar_var @@ -317519,7 +307134,7 @@ s83_load_textvar_var: @ 809B190 adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r0, _0809B1D0 + ldr r0, =0x085102d4 lsls r5, 2 adds r5, r0 ldr r0, [r5] @@ -317531,7 +307146,7 @@ s83_load_textvar_var: @ 809B190 pop {r1} bx r1 .align 2, 0 -_0809B1D0: .4byte 0x085102d4 + .pool thumb_func_end s83_load_textvar_var thumb_func_start s84_load_textvar_std_expression @@ -317546,11 +307161,11 @@ s84_load_textvar_std_expression: @ 809B1D4 lsrs r0, 16 bl var_get lsls r0, 16 - ldr r1, _0809B20C + ldr r1, =0x085102d4 lsls r4, 2 adds r4, r1 ldr r2, [r4] - ldr r1, _0809B210 + ldr r1, =0x0858baf0 lsrs r0, 14 adds r0, r1 ldr r1, [r0] @@ -317561,8 +307176,7 @@ s84_load_textvar_std_expression: @ 809B1D4 pop {r1} bx r1 .align 2, 0 -_0809B20C: .4byte 0x085102d4 -_0809B210: .4byte 0x0858baf0 + .pool thumb_func_end s84_load_textvar_std_expression thumb_func_start sub_809B214 @@ -317577,7 +307191,7 @@ sub_809B214: @ 809B214 lsrs r0, 16 bl var_get adds r1, r0, 0 - ldr r0, _0809B244 + ldr r0, =0x085102d4 lsls r4, 2 adds r4, r0 ldr r0, [r4] @@ -317589,7 +307203,7 @@ sub_809B214: @ 809B214 pop {r1} bx r1 .align 2, 0 -_0809B244: .4byte 0x085102d4 + .pool thumb_func_end sub_809B214 thumb_func_start s85_load_textvar_pointer @@ -317601,7 +307215,7 @@ s85_load_textvar_pointer: @ 809B248 str r1, [r0, 0x8] bl script_read_word adds r1, r0, 0 - ldr r0, _0809B26C + ldr r0, =0x085102d4 lsls r4, 2 adds r4, r0 ldr r0, [r4] @@ -317611,7 +307225,7 @@ s85_load_textvar_pointer: @ 809B248 pop {r1} bx r1 .align 2, 0 -_0809B26C: .4byte 0x085102d4 + .pool thumb_func_end s85_load_textvar_pointer thumb_func_start sBE_virtual_load_text @@ -317619,17 +307233,16 @@ sBE_virtual_load_text: @ 809B270 push {lr} bl script_read_word adds r1, r0, 0 - ldr r0, _0809B28C + ldr r0, =0x020375c4 ldr r0, [r0] subs r1, r0 - ldr r0, _0809B290 + ldr r0, =0x02021fc4 bl ExpandTextCodes movs r0, 0 pop {r1} bx r1 .align 2, 0 -_0809B28C: .4byte 0x020375c4 -_0809B290: .4byte 0x02021fc4 + .pool thumb_func_end sBE_virtual_load_text thumb_func_start sBF_virtual_load_textbuffer @@ -317641,10 +307254,10 @@ sBF_virtual_load_textbuffer: @ 809B294 str r1, [r0, 0x8] bl script_read_word adds r1, r0, 0 - ldr r0, _0809B2C0 + ldr r0, =0x020375c4 ldr r0, [r0] subs r1, r0 - ldr r0, _0809B2C4 + ldr r0, =0x085102d4 lsls r4, 2 adds r4, r0 ldr r0, [r4] @@ -317654,8 +307267,7 @@ sBF_virtual_load_textbuffer: @ 809B294 pop {r1} bx r1 .align 2, 0 -_0809B2C0: .4byte 0x020375c4 -_0809B2C4: .4byte 0x085102d4 + .pool thumb_func_end sBF_virtual_load_textbuffer thumb_func_start sC6_load_textvar_box_label @@ -317669,7 +307281,7 @@ sC6_load_textvar_box_label: @ 809B2C8 lsls r0, 16 lsrs r0, 16 bl var_get - ldr r1, _0809B300 + ldr r1, =0x085102d4 lsls r4, 2 adds r4, r1 ldr r4, [r4] @@ -317684,7 +307296,7 @@ sC6_load_textvar_box_label: @ 809B2C8 pop {r1} bx r1 .align 2, 0 -_0809B300: .4byte 0x085102d4 + .pool thumb_func_end sC6_load_textvar_box_label thumb_func_start s79_give_pokemon @@ -317724,7 +307336,7 @@ s79_give_pokemon: @ 809B304 ldrb r2, [r1] adds r1, 0x1 str r1, [r4, 0x8] - ldr r4, _0809B380 + ldr r4, =0x020375f0 str r0, [sp] str r2, [sp, 0x4] adds r0, r6, 0 @@ -317744,7 +307356,7 @@ s79_give_pokemon: @ 809B304 pop {r1} bx r1 .align 2, 0 -_0809B380: .4byte 0x020375f0 + .pool thumb_func_end s79_give_pokemon thumb_func_start s7A_create_egg @@ -317756,7 +307368,7 @@ s7A_create_egg: @ 809B384 bl var_get lsls r0, 16 lsrs r0, 16 - ldr r4, _0809B3AC + ldr r4, =0x020375f0 bl sub_80F92C8 lsls r0, 24 lsrs r0, 24 @@ -317766,7 +307378,7 @@ s7A_create_egg: @ 809B384 pop {r1} bx r1 .align 2, 0 -_0809B3AC: .4byte 0x020375f0 + .pool thumb_func_end s7A_create_egg thumb_func_start s7B_change_pokedata_AP @@ -317798,13 +307410,13 @@ sub_809B3DC: @ 809B3DC bl script_read_halfword lsls r0, 16 lsrs r7, r0, 16 - ldr r1, _0809B3F0 + ldr r1, =0x020375f0 movs r0, 0x6 strh r0, [r1] movs r6, 0 b _0809B42A .align 2, 0 -_0809B3F0: .4byte 0x020375f0 + .pool _0809B3F4: adds r0, r4, 0 movs r1, 0x2D @@ -317818,14 +307430,13 @@ _0809B3F4: lsrs r0, 24 cmp r0, 0x1 bne _0809B424 - ldr r0, _0809B41C + ldr r0, =0x020375f0 strh r6, [r0] - ldr r0, _0809B420 + ldr r0, =0x020375e0 strh r5, [r0] b _0809B44A .align 2, 0 -_0809B41C: .4byte 0x020375f0 -_0809B420: .4byte 0x020375e0 + .pool _0809B424: adds r0, r6, 0x1 lsls r0, 24 @@ -317836,7 +307447,7 @@ _0809B42A: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _0809B454 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -317852,7 +307463,7 @@ _0809B44A: pop {r1} bx r1 .align 2, 0 -_0809B454: .4byte 0x020244ec + .pool thumb_func_end sub_809B3DC thumb_func_start s90_add_money @@ -317867,7 +307478,7 @@ s90_add_money: @ 809B458 str r0, [r4, 0x8] cmp r1, 0 bne _0809B47E - ldr r0, _0809B488 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 @@ -317880,7 +307491,7 @@ _0809B47E: pop {r1} bx r1 .align 2, 0 -_0809B488: .4byte 0x03005d8c + .pool thumb_func_end s90_add_money thumb_func_start s91_subtract_money @@ -317895,7 +307506,7 @@ s91_subtract_money: @ 809B48C str r0, [r4, 0x8] cmp r1, 0 bne _0809B4B2 - ldr r0, _0809B4BC + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 @@ -317908,7 +307519,7 @@ _0809B4B2: pop {r1} bx r1 .align 2, 0 -_0809B4BC: .4byte 0x03005d8c + .pool thumb_func_end s91_subtract_money thumb_func_start s92_check_money @@ -317923,8 +307534,8 @@ s92_check_money: @ 809B4C0 str r0, [r4, 0x8] cmp r1, 0 bne _0809B4EE - ldr r4, _0809B4F8 - ldr r0, _0809B4FC + ldr r4, =0x020375f0 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 @@ -317940,8 +307551,7 @@ _0809B4EE: pop {r1} bx r1 .align 2, 0 -_0809B4F8: .4byte 0x020375f0 -_0809B4FC: .4byte 0x03005d8c + .pool thumb_func_end s92_check_money thumb_func_start s93_display_money @@ -317959,7 +307569,7 @@ s93_display_money: @ 809B500 str r2, [r0, 0x8] cmp r1, 0 bne _0809B530 - ldr r0, _0809B538 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 @@ -317974,7 +307584,7 @@ _0809B530: pop {r1} bx r1 .align 2, 0 -_0809B538: .4byte 0x03005d8c + .pool thumb_func_end s93_display_money thumb_func_start s94_hide_money @@ -317998,7 +307608,7 @@ s95_update_money: @ 809B548 str r2, [r0, 0x8] cmp r1, 0 bne _0809B56E - ldr r0, _0809B574 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 @@ -318010,7 +307620,7 @@ _0809B56E: pop {r1} bx r1 .align 2, 0 -_0809B574: .4byte 0x03005d8c + .pool thumb_func_end s95_update_money thumb_func_start sub_809B578 @@ -318234,14 +307844,14 @@ s89_open_casino_game1: @ 809B6F4 bl var_get lsls r0, 24 lsrs r0, 24 - ldr r1, _0809B718 + ldr r1, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl sub_812A540 bl script_env_2_set_ctx_paused movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_0809B718: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end s89_open_casino_game1 thumb_func_start sub_809B71C @@ -318285,7 +307895,7 @@ sub_809B758: @ 809B758 lsls r0, 16 lsrs r0, 16 bl var_get - ldr r4, _0809B780 + ldr r4, =0x020375f0 lsls r0, 24 lsrs r0, 24 bl sub_80EF038 @@ -318297,7 +307907,7 @@ sub_809B758: @ 809B758 pop {r1} bx r1 .align 2, 0 -_0809B780: .4byte 0x020375f0 + .pool thumb_func_end sub_809B758 thumb_func_start sub_809B784 @@ -318333,7 +307943,7 @@ sub_809B7A4: @ 809B7A4 thumb_func_start sub_809B7B4 sub_809B7B4: @ 809B7B4 push {lr} - ldr r0, _0809B7C8 + ldr r0, =0x02039f2c ldrb r0, [r0] bl sub_80F84C4 bl script_env_2_set_ctx_paused @@ -318341,7 +307951,7 @@ sub_809B7B4: @ 809B7B4 pop {r1} bx r1 .align 2, 0 -_0809B7C8: .4byte 0x02039f2c + .pool thumb_func_end sub_809B7B4 thumb_func_start s9C_execute_HM @@ -318353,7 +307963,7 @@ s9C_execute_HM: @ 809B7CC bl var_get lsls r0, 16 lsrs r0, 16 - ldr r1, _0809B7F0 + ldr r1, =0x020375d0 strh r0, [r1] lsls r0, 24 lsrs r0, 24 @@ -318362,7 +307972,7 @@ s9C_execute_HM: @ 809B7CC pop {r1} bx r1 .align 2, 0 -_0809B7F0: .4byte 0x020375d0 + .pool thumb_func_end s9C_execute_HM thumb_func_start s9D_set_HM_animation_data @@ -318376,7 +307986,7 @@ s9D_set_HM_animation_data: @ 809B7F4 lsls r0, 16 lsrs r0, 16 bl var_get - ldr r1, _0809B820 + ldr r1, =0x02038c08 lsls r4, 2 adds r4, r1 lsls r0, 16 @@ -318387,13 +307997,13 @@ s9D_set_HM_animation_data: @ 809B7F4 pop {r1} bx r1 .align 2, 0 -_0809B820: .4byte 0x02038c08 + .pool thumb_func_end s9D_set_HM_animation_data thumb_func_start sub_809B824 sub_809B824: @ 809B824 push {lr} - ldr r0, _0809B838 + ldr r0, =0x020375d0 ldrb r0, [r0] bl oe_active_list_contains lsls r0, 24 @@ -318402,7 +308012,7 @@ sub_809B824: @ 809B824 movs r0, 0 b _0809B83E .align 2, 0 -_0809B838: .4byte 0x020375d0 + .pool _0809B83C: movs r0, 0x1 _0809B83E: @@ -318418,9 +308028,9 @@ s9E_checkarray_HM_animation: @ 809B844 lsls r0, 16 lsrs r0, 16 bl var_get - ldr r1, _0809B868 + ldr r1, =0x020375d0 strh r0, [r1] - ldr r1, _0809B86C + ldr r1, =sub_809B824 + 1 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 @@ -318428,8 +308038,7 @@ s9E_checkarray_HM_animation: @ 809B844 pop {r1} bx r1 .align 2, 0 -_0809B868: .4byte 0x020375d0 -_0809B86C: .4byte sub_809B824 + 1 + .pool thumb_func_end s9E_checkarray_HM_animation thumb_func_start s9F_changeposition_fly @@ -318449,16 +308058,15 @@ s9F_changeposition_fly: @ 809B870 thumb_func_start sA0_check_gender sA0_check_gender: @ 809B88C - ldr r1, _0809B89C - ldr r0, _0809B8A0 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] strh r0, [r1] movs r0, 0 bx lr .align 2, 0 -_0809B89C: .4byte 0x020375f0 -_0809B8A0: .4byte 0x03005d90 + .pool thumb_func_end sA0_check_gender thumb_func_start sA1_play_cry @@ -318491,13 +308099,13 @@ sA1_play_cry: @ 809B8A4 thumb_func_start sub_809B8DC sub_809B8DC: @ 809B8DC push {lr} - ldr r1, _0809B8EC + ldr r1, =sub_80A3678 + 1 bl script_setup_asm_script movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_0809B8EC: .4byte sub_80A3678 + 1 + .pool thumb_func_end sub_809B8DC thumb_func_start sA2_setmaptile @@ -318651,13 +308259,13 @@ _0809BA1E: thumb_func_start sub_809BA24 sub_809BA24: @ 809BA24 push {lr} - ldr r1, _0809BA34 + ldr r1, =sub_809BA0C + 1 bl script_setup_asm_script movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_0809BA34: .4byte sub_809BA0C + 1 + .pool thumb_func_end sub_809BA24 thumb_func_start sub_809BA38 @@ -318790,13 +308398,13 @@ sub_809BB20: @ 809BB20 lsrs r0, 24 cmp r0, 0x1 bne _0809BB48 - ldr r1, _0809BB44 + ldr r1, =0x020375f0 movs r0, 0 b _0809BB4C .align 2, 0 -_0809BB44: .4byte 0x020375f0 + .pool _0809BB48: - ldr r1, _0809BB54 + ldr r1, =0x020375f0 movs r0, 0x1 _0809BB4C: strh r0, [r1] @@ -318804,7 +308412,7 @@ _0809BB4C: pop {r1} bx r1 .align 2, 0 -_0809BB54: .4byte 0x020375f0 + .pool thumb_func_end sub_809BB20 thumb_func_start sub_809BB58 @@ -318821,13 +308429,13 @@ sub_809BB58: @ 809BB58 lsrs r0, 24 cmp r0, 0x1 bne _0809BB80 - ldr r1, _0809BB7C + ldr r1, =0x020375f0 movs r0, 0 b _0809BB84 .align 2, 0 -_0809BB7C: .4byte 0x020375f0 + .pool _0809BB80: - ldr r1, _0809BB8C + ldr r1, =0x020375f0 movs r0, 0x1 _0809BB84: strh r0, [r1] @@ -318835,7 +308443,7 @@ _0809BB84: pop {r1} bx r1 .align 2, 0 -_0809BB8C: .4byte 0x020375f0 + .pool thumb_func_end sub_809BB58 thumb_func_start sub_809BB90 @@ -318848,13 +308456,13 @@ sub_809BB90: @ 809BB90 lsls r0, 24 lsrs r0, 24 bl sub_81A89A0 - ldr r1, _0809BBB0 + ldr r1, =0x020375ca strh r0, [r1] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_0809BBB0: .4byte 0x020375ca + .pool thumb_func_end sub_809BB90 thumb_func_start sub_809BBB4 @@ -318894,13 +308502,13 @@ sub_809BBDC: @ 809BBDC sub_809BBE8: @ 809BBE8 push {lr} bl sub_80B47BC - ldr r1, _0809BBF8 + ldr r1, =0x03005df0 strb r0, [r1] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_0809BBF8: .4byte 0x03005df0 + .pool thumb_func_end sub_809BBE8 thumb_func_start sub_809BBFC @@ -318913,8 +308521,8 @@ sub_809BBFC: @ 809BBFC movs r0, 0 b _0809BC30 _0809BC0C: - ldr r2, _0809BC38 - ldr r0, _0809BC3C + ldr r2, =0x02037350 + ldr r0, =0x03005df0 ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -318925,7 +308533,7 @@ _0809BC0C: cmp r0, 0 beq _0809BC2E bl sub_8098630 - ldr r1, _0809BC40 + ldr r1, =sub_8098734 + 1 adds r0, r4, 0 bl script_setup_asm_script _0809BC2E: @@ -318935,9 +308543,7 @@ _0809BC30: pop {r1} bx r1 .align 2, 0 -_0809BC38: .4byte 0x02037350 -_0809BC3C: .4byte 0x03005df0 -_0809BC40: .4byte sub_8098734 + 1 + .pool thumb_func_end sub_809BBFC thumb_func_start sCD_set_obedient_bit @@ -318955,7 +308561,7 @@ sCD_set_obedient_bit: @ 809BC44 lsrs r0, 16 movs r1, 0x64 muls r0, r1 - ldr r1, _0809BC78 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x50 mov r2, sp @@ -318965,7 +308571,7 @@ sCD_set_obedient_bit: @ 809BC44 pop {r1} bx r1 .align 2, 0 -_0809BC78: .4byte 0x020244ec + .pool thumb_func_end sCD_set_obedient_bit thumb_func_start sCE_check_obedient_bit @@ -318977,10 +308583,10 @@ sCE_check_obedient_bit: @ 809BC7C bl var_get lsls r0, 16 lsrs r0, 16 - ldr r4, _0809BCAC + ldr r4, =0x020375f0 movs r1, 0x64 muls r0, r1 - ldr r1, _0809BCB0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x50 movs r2, 0 @@ -318991,8 +308597,7 @@ sCE_check_obedient_bit: @ 809BC7C pop {r1} bx r1 .align 2, 0 -_0809BCAC: .4byte 0x020375f0 -_0809BCB0: .4byte 0x020244ec + .pool thumb_func_end sCE_check_obedient_bit thumb_func_start sCF_execute_RAM_script_DMA @@ -319003,7 +308608,7 @@ sCF_execute_RAM_script_DMA: @ 809BCB4 adds r2, r0, 0 cmp r2, 0 beq _0809BCD0 - ldr r1, _0809BCD8 + ldr r1, =0x020375c0 ldr r0, [r4, 0x8] str r0, [r1] adds r0, r4, 0 @@ -319015,7 +308620,7 @@ _0809BCD0: pop {r1} bx r1 .align 2, 0 -_0809BCD8: .4byte 0x020375c0 + .pool thumb_func_end sCF_execute_RAM_script_DMA thumb_func_start sD1_warp_v5 @@ -319107,7 +308712,7 @@ sub_809BD70: @ 809BD70 bhi _0809BDA6 movs r0, 0x64 muls r0, r3 - ldr r1, _0809BDB0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 mov r2, sp @@ -319119,13 +308724,13 @@ _0809BDA6: pop {r1} bx r1 .align 2, 0 -_0809BDB0: .4byte 0x020244ec + .pool thumb_func_end sub_809BD70 thumb_func_start sub_809BDB4 sub_809BDB4: @ 809BDB4 push {r4,lr} - ldr r4, _0809BDCC + ldr r4, =0x03000f30 ldrb r0, [r4] movs r1, 0x1 bl sub_819746C @@ -319135,7 +308740,7 @@ sub_809BDB4: @ 809BDB4 pop {r0} bx r0 .align 2, 0 -_0809BDCC: .4byte 0x03000f30 + .pool thumb_func_end sub_809BDB4 thumb_func_start sub_809BDD0 @@ -319151,7 +308756,7 @@ sub_809BDD0: @ 809BDD0 bl var_get lsls r0, 16 lsrs r0, 16 - ldr r1, _0809BE08 + ldr r1, =0x085102d4 lsls r4, 2 adds r4, r1 ldr r4, [r4] @@ -319164,7 +308769,7 @@ sub_809BDD0: @ 809BDD0 pop {r1} bx r1 .align 2, 0 -_0809BE08: .4byte 0x085102d4 + .pool thumb_func_end sub_809BDD0 thumb_func_start sub_809BE0C @@ -319180,7 +308785,7 @@ sub_809BE0C: @ 809BE0C bl var_get lsls r0, 16 lsrs r0, 16 - ldr r1, _0809BE44 + ldr r1, =0x085102d4 lsls r4, 2 adds r4, r1 ldr r4, [r4] @@ -319193,16 +308798,16 @@ sub_809BE0C: @ 809BE0C pop {r1} bx r1 .align 2, 0 -_0809BE44: .4byte 0x085102d4 + .pool thumb_func_end sub_809BE0C thumb_func_start sub_809BE48 sub_809BE48: @ 809BE48 - ldr r1, _0809BE50 + ldr r1, =0x020375ca strh r0, [r1] bx lr .align 2, 0 -_0809BE50: .4byte 0x020375ca + .pool thumb_func_end sub_809BE48 thumb_func_start sub_809BE54 @@ -319307,7 +308912,7 @@ process_overworld_input: @ 809BF08 lsls r2, 16 lsrs r2, 16 mov r8, r2 - ldr r0, _0809BFD8 + ldr r0, =0x02037590 ldrb r6, [r0, 0x3] ldrb r0, [r0, 0x2] mov r9, r0 @@ -319407,7 +309012,7 @@ _0809BFC8: movs r0, 0x2 b _0809C004 .align 2, 0 -_0809BFD8: .4byte 0x02037590 + .pool _0809BFDC: movs r0, 0x80 mov r1, r8 @@ -319447,10 +309052,10 @@ sub_809C014: @ 809C014 push {r4-r6,lr} sub sp, 0x8 adds r5, r0, 0 - ldr r0, _0809C154 + ldr r0, =0x020375f2 movs r1, 0 strh r1, [r0] - ldr r0, _0809C158 + ldr r0, =0x03005df0 strb r1, [r0] bl player_get_direction__sp1AA lsls r0, 24 @@ -319594,8 +309199,7 @@ _0809C14E: movs r0, 0x1 b _0809C172 .align 2, 0 -_0809C154: .4byte 0x020375f2 -_0809C158: .4byte 0x03005df0 + .pool _0809C15C: movs r0, 0x8 ands r0, r1 @@ -319696,25 +309300,25 @@ sub_809C1FC: @ 809C1FC movs r0, 0 b _0809C24C _0809C214: - ldr r0, _0809C254 + ldr r0, =0x081f860d cmp r4, r0 beq _0809C244 - ldr r0, _0809C258 + ldr r0, =0x081f9553 cmp r4, r0 beq _0809C244 - ldr r0, _0809C25C + ldr r0, =0x0823b4bb cmp r4, r0 beq _0809C244 - ldr r0, _0809C260 + ldr r0, =0x0823b589 cmp r4, r0 beq _0809C244 - ldr r0, _0809C264 + ldr r0, =0x082766a2 cmp r4, r0 beq _0809C244 - ldr r0, _0809C268 + ldr r0, =0x082766a6 cmp r4, r0 beq _0809C244 - ldr r0, _0809C26C + ldr r0, =0x08271d92 cmp r4, r0 beq _0809C244 movs r0, 0x5 @@ -319728,13 +309332,7 @@ _0809C24C: pop {r1} bx r1 .align 2, 0 -_0809C254: .4byte 0x081f860d -_0809C258: .4byte 0x081f9553 -_0809C25C: .4byte 0x0823b4bb -_0809C260: .4byte 0x0823b589 -_0809C264: .4byte 0x082766a2 -_0809C268: .4byte 0x082766a6 -_0809C26C: .4byte 0x08271d92 + .pool thumb_func_end sub_809C1FC thumb_func_start onpress_a_get_script @@ -319802,7 +309400,7 @@ sub_809C2C8: @ 809C2C8 ldrh r1, [r4, 0x2] b _0809C30E _0809C2F0: - ldr r1, _0809C334 + ldr r1, =0x08339d64 lsls r2, r6, 3 adds r0, r2, r1 ldr r3, [r0] @@ -319824,7 +309422,7 @@ _0809C30E: lsrs r3, r0, 24 cmp r3, 0x10 beq _0809C32E - ldr r1, _0809C338 + ldr r1, =0x02037350 lsls r2, r3, 3 adds r0, r2, r3 lsls r0, 2 @@ -319837,11 +309435,10 @@ _0809C32E: movs r0, 0 b _0809C36E .align 2, 0 -_0809C334: .4byte 0x08339d64 -_0809C338: .4byte 0x02037350 + .pool _0809C33C: movs r4, 0 - ldr r1, _0809C374 + ldr r1, =0x02032308 _0809C340: ldrb r0, [r1] cmp r0, 0x1 @@ -319854,15 +309451,15 @@ _0809C34C: adds r4, 0x1 cmp r4, 0x3 ble _0809C340 - ldr r0, _0809C378 + ldr r0, =0x03005df0 strb r3, [r0] - ldr r1, _0809C37C + ldr r1, =0x020375f2 adds r0, r2, r3 lsls r0, 2 adds r0, r5 ldrb r0, [r0, 0x8] strh r0, [r1] - ldr r0, _0809C380 + ldr r0, =0x020375f4 strh r6, [r0] adds r0, r3, 0 bl npc_get_script_by_npc_id @@ -319871,10 +309468,7 @@ _0809C36E: pop {r1} bx r1 .align 2, 0 -_0809C374: .4byte 0x02032308 -_0809C378: .4byte 0x03005df0 -_0809C37C: .4byte 0x020375f2 -_0809C380: .4byte 0x020375f4 + .pool thumb_func_end sub_809C2C8 thumb_func_start sub_809C384 @@ -319893,7 +309487,7 @@ sub_809C384: @ 809C384 lsrs r4, r0, 24 cmp r4, 0x10 beq _0809C3B4 - ldr r1, _0809C404 + ldr r1, =0x02037350 lsls r2, r4, 3 adds r0, r2, r4 lsls r0, 2 @@ -319909,7 +309503,7 @@ _0809C3B4: lsrs r0, 24 cmp r0, 0x1 bne _0809C400 - ldr r1, _0809C408 + ldr r1, =0x08339d64 lsls r2, r7, 3 adds r0, r2, r1 ldr r3, [r0] @@ -319930,7 +309524,7 @@ _0809C3B4: lsrs r4, r0, 24 cmp r4, 0x10 beq _0809C400 - ldr r1, _0809C404 + ldr r1, =0x02037350 lsls r2, r4, 3 adds r0, r2, r4 lsls r0, 2 @@ -319943,18 +309537,17 @@ _0809C400: movs r0, 0 b _0809C44E .align 2, 0 -_0809C404: .4byte 0x02037350 -_0809C408: .4byte 0x08339d64 + .pool _0809C40C: - ldr r0, _0809C430 + ldr r0, =0x03005df0 strb r4, [r0] - ldr r1, _0809C434 + ldr r1, =0x020375f2 adds r0, r2, r4 lsls r0, 2 adds r0, r3 ldrb r0, [r0, 0x8] strh r0, [r1] - ldr r0, _0809C438 + ldr r0, =0x020375f4 strh r7, [r0] bl sub_81D6074 cmp r0, 0x1 @@ -319962,15 +309555,13 @@ _0809C40C: bl sub_81D62AC b _0809C442 .align 2, 0 -_0809C430: .4byte 0x03005df0 -_0809C434: .4byte 0x020375f2 -_0809C438: .4byte 0x020375f4 + .pool _0809C43C: adds r0, r4, 0 bl npc_get_script_by_npc_id _0809C442: adds r1, r0, 0 - ldr r0, _0809C454 + ldr r0, =0x020375f2 ldrb r0, [r0] bl sub_8099188 adds r1, r0, 0 @@ -319979,7 +309570,7 @@ _0809C44E: pop {r1} bx r1 .align 2, 0 -_0809C454: .4byte 0x020375f2 + .pool thumb_func_end sub_809C384 thumb_func_start sub_809C458 @@ -319987,7 +309578,7 @@ sub_809C458: @ 809C458 push {r4,r5,lr} lsls r2, 24 lsrs r5, r2, 24 - ldr r4, _0809C488 + ldr r4, =0x02037318 ldrh r1, [r0] subs r1, 0x7 lsls r1, 16 @@ -320004,22 +309595,21 @@ sub_809C458: @ 809C458 ldr r2, [r0, 0x8] cmp r2, 0 bne _0809C490 - ldr r0, _0809C48C + ldr r0, =0x082c8436 b _0809C532 .align 2, 0 -_0809C488: .4byte 0x02037318 -_0809C48C: .4byte 0x082c8436 + .pool _0809C490: ldrb r0, [r0, 0x5] cmp r0, 0x8 bhi _0809C530 lsls r0, 2 - ldr r1, _0809C4A0 + ldr r1, =_0809C4A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809C4A0: .4byte _0809C4A4 + .pool .align 2, 0 _0809C4A4: .4byte _0809C530 @@ -320050,13 +309640,13 @@ _0809C4DC: beq _0809C530 b _0809C4CC _0809C4E2: - ldr r1, _0809C504 + ldr r1, =0x020375e0 lsrs r0, r2, 16 movs r3, 0xFA lsls r3, 1 adds r0, r3 strh r0, [r1] - ldr r0, _0809C508 + ldr r0, =0x020375e2 strh r2, [r0] ldrh r0, [r1] bl flag_check @@ -320064,26 +309654,23 @@ _0809C4E2: lsrs r0, 24 cmp r0, 0x1 beq _0809C4CC - ldr r0, _0809C50C + ldr r0, =0x08271cb7 b _0809C532 .align 2, 0 -_0809C504: .4byte 0x020375e0 -_0809C508: .4byte 0x020375e2 -_0809C50C: .4byte 0x08271cb7 + .pool _0809C510: cmp r5, 0x2 bne _0809C4CC - ldr r0, _0809C528 + ldr r0, =0x020375e0 strh r2, [r0] bl sub_80E9680 lsls r0, 24 cmp r0, 0 beq _0809C4CC - ldr r0, _0809C52C + ldr r0, =0x082759f1 b _0809C532 .align 2, 0 -_0809C528: .4byte 0x020375e0 -_0809C52C: .4byte 0x082759f1 + .pool _0809C530: adds r0, r2, 0 _0809C532: @@ -320107,10 +309694,10 @@ sub_809C538: @ 809C538 lsrs r0, 24 cmp r0, 0x1 bne _0809C55C - ldr r0, _0809C558 + ldr r0, =0x0827ee0b b _0809C7E4 .align 2, 0 -_0809C558: .4byte 0x0827ee0b + .pool _0809C55C: adds r0, r5, 0 bl IsMetatileComputer @@ -320118,10 +309705,10 @@ _0809C55C: lsrs r0, 24 cmp r0, 0x1 bne _0809C574 - ldr r0, _0809C570 + ldr r0, =0x08271d92 b _0809C7E4 .align 2, 0 -_0809C570: .4byte 0x08271d92 + .pool _0809C574: adds r0, r5, 0 bl is_tile_x8B @@ -320129,10 +309716,10 @@ _0809C574: lsrs r0, 24 cmp r0, 0x1 bne _0809C58C - ldr r0, _0809C588 + ldr r0, =0x081e615d b _0809C7E4 .align 2, 0 -_0809C588: .4byte 0x081e615d + .pool _0809C58C: adds r0, r5, 0 bl is_tile_xEA @@ -320140,10 +309727,10 @@ _0809C58C: lsrs r0, 24 cmp r0, 0x1 bne _0809C5A4 - ldr r0, _0809C5A0 + ldr r0, =0x082393f9 b _0809C7E4 .align 2, 0 -_0809C5A0: .4byte 0x082393f9 + .pool _0809C5A4: adds r0, r5, 0 bl is_tile_x84 @@ -320159,10 +309746,10 @@ _0809C5B4: lsrs r0, 24 cmp r0, 0x1 bne _0809C5CC - ldr r0, _0809C5C8 + ldr r0, =0x082a4bac b _0809C7E4 .align 2, 0 -_0809C5C8: .4byte 0x082a4bac + .pool _0809C5CC: adds r0, r5, 0 bl is_tile_x8C @@ -320170,10 +309757,10 @@ _0809C5CC: lsrs r0, 24 cmp r0, 0x1 bne _0809C5E4 - ldr r0, _0809C5E0 + ldr r0, =0x0826a22a b _0809C7E4 .align 2, 0 -_0809C5E0: .4byte 0x0826a22a + .pool _0809C5E4: adds r0, r5, 0 bl is_tile_x85 @@ -320181,10 +309768,10 @@ _0809C5E4: lsrs r0, 24 cmp r0, 0x1 bne _0809C5FC - ldr r0, _0809C5F8 + ldr r0, =0x0827208f b _0809C7E4 .align 2, 0 -_0809C5F8: .4byte 0x0827208f + .pool _0809C5FC: adds r0, r5, 0 bl sub_8089A1C @@ -320192,10 +309779,10 @@ _0809C5FC: lsrs r0, 24 cmp r0, 0x1 bne _0809C614 - ldr r0, _0809C610 + ldr r0, =0x08292de5 b _0809C7E4 .align 2, 0 -_0809C610: .4byte 0x08292de5 + .pool _0809C614: adds r0, r5, 0 bl sub_8089A30 @@ -320203,10 +309790,10 @@ _0809C614: lsrs r0, 24 cmp r0, 0x1 bne _0809C62C - ldr r0, _0809C628 + ldr r0, =0x082725ce b _0809C7E4 .align 2, 0 -_0809C628: .4byte 0x082725ce + .pool _0809C62C: adds r0, r5, 0 bl sub_8089A44 @@ -320214,10 +309801,10 @@ _0809C62C: lsrs r0, 24 cmp r0, 0x1 bne _0809C644 - ldr r0, _0809C640 + ldr r0, =0x082725d7 b _0809C7E4 .align 2, 0 -_0809C640: .4byte 0x082725d7 + .pool _0809C644: adds r0, r5, 0 bl sub_8089A58 @@ -320225,10 +309812,10 @@ _0809C644: lsrs r0, 24 cmp r0, 0x1 bne _0809C65C - ldr r0, _0809C658 + ldr r0, =0x082725e0 b _0809C7E4 .align 2, 0 -_0809C658: .4byte 0x082725e0 + .pool _0809C65C: adds r0, r5, 0 bl sub_8089A6C @@ -320236,10 +309823,10 @@ _0809C65C: lsrs r0, 24 cmp r0, 0x1 bne _0809C674 - ldr r0, _0809C670 + ldr r0, =0x082725e9 b _0809C7E4 .align 2, 0 -_0809C670: .4byte 0x082725e9 + .pool _0809C674: adds r0, r5, 0 bl sub_8089A80 @@ -320247,10 +309834,10 @@ _0809C674: lsrs r0, 24 cmp r0, 0x1 bne _0809C68C - ldr r0, _0809C688 + ldr r0, =0x082725f2 b _0809C7E4 .align 2, 0 -_0809C688: .4byte 0x082725f2 + .pool _0809C68C: adds r0, r5, 0 bl sub_8089A94 @@ -320258,10 +309845,10 @@ _0809C68C: lsrs r0, 24 cmp r0, 0x1 bne _0809C6A4 - ldr r0, _0809C6A0 + ldr r0, =0x082725fb b _0809C7E4 .align 2, 0 -_0809C6A0: .4byte 0x082725fb + .pool _0809C6A4: adds r0, r5, 0 bl sub_8089AA8 @@ -320269,10 +309856,10 @@ _0809C6A4: lsrs r0, 24 cmp r0, 0x1 bne _0809C6BC - ldr r0, _0809C6B8 + ldr r0, =0x08272604 b _0809C7E4 .align 2, 0 -_0809C6B8: .4byte 0x08272604 + .pool _0809C6BC: adds r0, r5, 0 adds r1, r4, 0 @@ -320281,10 +309868,10 @@ _0809C6BC: lsrs r0, 24 cmp r0, 0x1 bne _0809C6D4 - ldr r0, _0809C6D0 + ldr r0, =0x08277b8a b _0809C7E4 .align 2, 0 -_0809C6D0: .4byte 0x08277b8a + .pool _0809C6D4: adds r0, r5, 0 adds r1, r4, 0 @@ -320294,10 +309881,10 @@ _0809C6D4: cmp r0, 0x1 bne _0809C6EC _0809C6E4: - ldr r0, _0809C6E8 + ldr r0, =0x08277365 b _0809C7E4 .align 2, 0 -_0809C6E8: .4byte 0x08277365 + .pool _0809C6EC: adds r0, r5, 0 bl is_tile_x8F @@ -320305,10 +309892,10 @@ _0809C6EC: lsrs r0, 24 cmp r0, 0x1 bne _0809C704 - ldr r0, _0809C700 + ldr r0, =0x0827381b b _0809C7E4 .align 2, 0 -_0809C700: .4byte 0x0827381b + .pool _0809C704: adds r0, r5, 0 bl sub_8089B44 @@ -320316,10 +309903,10 @@ _0809C704: lsrs r0, 24 cmp r0, 0x1 bne _0809C71C - ldr r0, _0809C718 + ldr r0, =0x082c8393 b _0809C7E4 .align 2, 0 -_0809C718: .4byte 0x082c8393 + .pool _0809C71C: movs r4, 0x4 ldrsb r4, [r6, r4] @@ -320338,10 +309925,10 @@ _0809C71C: lsrs r0, 24 cmp r0, 0x1 bne _0809C74C - ldr r0, _0809C748 + ldr r0, =0x0823b4bb b _0809C7E4 .align 2, 0 -_0809C748: .4byte 0x0823b4bb + .pool _0809C74C: adds r0, r5, 0 bl sub_808929C @@ -320349,10 +309936,10 @@ _0809C74C: lsrs r0, 24 cmp r0, 0x1 bne _0809C764 - ldr r0, _0809C760 + ldr r0, =0x0823b589 b _0809C7E4 .align 2, 0 -_0809C760: .4byte 0x0823b589 + .pool _0809C764: adds r0, r5, 0 bl sub_80893DC @@ -320360,10 +309947,10 @@ _0809C764: lsrs r0, 24 cmp r0, 0x1 bne _0809C77C - ldr r0, _0809C778 + ldr r0, =0x0823b684 b _0809C7E4 .align 2, 0 -_0809C778: .4byte 0x0823b684 + .pool _0809C77C: adds r0, r5, 0 bl sub_80893F0 @@ -320371,10 +309958,10 @@ _0809C77C: lsrs r0, 24 cmp r0, 0x1 bne _0809C794 - ldr r0, _0809C790 + ldr r0, =0x0823b68c b _0809C7E4 .align 2, 0 -_0809C790: .4byte 0x0823b68c + .pool _0809C794: adds r0, r5, 0 bl sub_80892EC @@ -320423,7 +310010,7 @@ sub_809C7EC: @ 809C7EC push {r4,lr} lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _0809C81C + ldr r0, =0x0000086b bl flag_check lsls r0, 24 lsrs r0, 24 @@ -320439,11 +310026,10 @@ sub_809C7EC: @ 809C7EC lsrs r0, 24 cmp r0, 0x1 bne _0809C824 - ldr r0, _0809C820 + ldr r0, =0x08271ea0 b _0809C862 .align 2, 0 -_0809C81C: .4byte 0x0000086b -_0809C820: .4byte 0x08271ea0 + .pool _0809C824: adds r0, r4, 0 bl is_tile_x13_waterfall @@ -320451,7 +310037,7 @@ _0809C824: lsrs r0, 24 cmp r0, 0x1 bne _0809C860 - ldr r0, _0809C850 + ldr r0, =0x0000086e bl flag_check lsls r0, 24 lsrs r0, 24 @@ -320462,16 +310048,15 @@ _0809C824: lsrs r0, 24 cmp r0, 0x1 bne _0809C858 - ldr r0, _0809C854 + ldr r0, =0x08290a49 b _0809C862 .align 2, 0 -_0809C850: .4byte 0x0000086e -_0809C854: .4byte 0x08290a49 + .pool _0809C858: - ldr r0, _0809C85C + ldr r0, =0x08290a83 b _0809C862 .align 2, 0 -_0809C85C: .4byte 0x08290a83 + .pool _0809C860: movs r0, 0 _0809C862: @@ -320483,7 +310068,7 @@ _0809C862: thumb_func_start sub_809C868 sub_809C868: @ 809C868 push {lr} - ldr r0, _0809C88C + ldr r0, =0x0000086d bl flag_check lsls r0, 24 cmp r0, 0 @@ -320493,13 +310078,12 @@ sub_809C868: @ 809C868 lsrs r0, 24 cmp r0, 0x2 bne _0809C894 - ldr r0, _0809C890 + ldr r0, =0x08290b0f bl script_env_1_execute_new_script movs r0, 0x1 b _0809C896 .align 2, 0 -_0809C88C: .4byte 0x0000086d -_0809C890: .4byte 0x08290b0f + .pool _0809C894: movs r0, 0 _0809C896: @@ -320510,12 +310094,12 @@ _0809C896: thumb_func_start sub_809C89C sub_809C89C: @ 809C89C push {lr} - ldr r0, _0809C8C8 + ldr r0, =0x0000086d bl flag_check lsls r0, 24 cmp r0, 0 beq _0809C8D4 - ldr r0, _0809C8CC + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x5 bne _0809C8D4 @@ -320524,14 +310108,12 @@ sub_809C89C: @ 809C89C lsrs r0, 24 cmp r0, 0x1 bne _0809C8D4 - ldr r0, _0809C8D0 + ldr r0, =0x08290b5a bl script_env_1_execute_new_script movs r0, 0x1 b _0809C8D6 .align 2, 0 -_0809C8C8: .4byte 0x0000086d -_0809C8CC: .4byte 0x02037318 -_0809C8D0: .4byte 0x08290b5a + .pool _0809C8D4: movs r0, 0 _0809C8D6: @@ -320588,7 +310170,7 @@ _0809C930: thumb_func_start mapheader_trigger_activate_at__run_now mapheader_trigger_activate_at__run_now: @ 809C938 push {r4,lr} - ldr r4, _0809C960 + ldr r4, =0x02037318 ldrh r1, [r0] subs r1, 0x7 lsls r1, 16 @@ -320606,7 +310188,7 @@ mapheader_trigger_activate_at__run_now: @ 809C938 movs r0, 0x1 b _0809C966 .align 2, 0 -_0809C960: .4byte 0x02037318 + .pool _0809C964: movs r0, 0 _0809C966: @@ -320626,23 +310208,23 @@ sub_809C96C: @ 809C96C lsls r0, 24 cmp r0, 0 beq _0809C988 - ldr r0, _0809C984 + ldr r0, =0x082a8337 b _0809C996 .align 2, 0 -_0809C984: .4byte 0x082a8337 + .pool _0809C988: adds r0, r4, 0 bl sub_8089ABC lsls r0, 24 cmp r0, 0 beq _0809C9A4 - ldr r0, _0809C9A0 + ldr r0, =0x08252be8 _0809C996: bl script_env_1_execute_new_script movs r0, 0x1 b _0809C9EA .align 2, 0 -_0809C9A0: .4byte 0x08252be8 + .pool _0809C9A4: adds r0, r4, 0 bl sub_80893C8 @@ -320695,7 +310277,7 @@ _0809CA04: bl sub_80B215C bl happiness_algorithm_step bl sub_81D4998 - ldr r0, _0809CA40 + ldr r0, =0x02037590 ldrb r1, [r0] movs r0, 0x40 ands r0, r1 @@ -320712,12 +310294,11 @@ _0809CA04: lsrs r0, 24 cmp r0, 0x1 bne _0809CA48 - ldr r0, _0809CA44 + ldr r0, =0x082736bc bl script_env_1_execute_new_script b _0809CB28 .align 2, 0 -_0809CA40: .4byte 0x02037590 -_0809CA44: .4byte 0x082736bc + .pool _0809CA48: bl sub_8070BD0 lsls r0, 24 @@ -320725,78 +310306,78 @@ _0809CA48: beq _0809CA64 movs r0, 0xD bl sav12_xor_increment - ldr r0, _0809CA60 + ldr r0, =0x08291fc0 bl script_env_1_execute_new_script b _0809CB28 .align 2, 0 -_0809CA60: .4byte 0x08291fc0 + .pool _0809CA64: bl sub_813B3B0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0809CA7C - ldr r0, _0809CA78 + ldr r0, =0x08273d1f bl script_env_1_execute_new_script b _0809CB28 .align 2, 0 -_0809CA78: .4byte 0x08273d1f + .pool _0809CA7C: bl sub_8179A04 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0809CA94 - ldr r0, _0809CA90 + ldr r0, =0x08238eaf bl script_env_1_execute_new_script b _0809CB28 .align 2, 0 -_0809CA90: .4byte 0x08238eaf + .pool _0809CA94: bl is_tile_that_overrides_player_control cmp r0, 0x1 bne _0809CAA8 - ldr r0, _0809CAA4 + ldr r0, =0x081df7ba bl script_env_1_execute_new_script b _0809CB28 .align 2, 0 -_0809CAA4: .4byte 0x081df7ba + .pool _0809CAA8: bl sub_8138120 cmp r0, 0x1 bne _0809CABC - ldr r0, _0809CAB8 + ldr r0, =0x081f49ec bl script_env_1_execute_new_script b _0809CB28 .align 2, 0 -_0809CAB8: .4byte 0x081f49ec + .pool _0809CABC: bl sub_8138168 cmp r0, 0x1 bne _0809CAD0 - ldr r0, _0809CACC + ldr r0, =0x081fa4d6 bl script_env_1_execute_new_script b _0809CB28 .align 2, 0 -_0809CACC: .4byte 0x081fa4d6 + .pool _0809CAD0: bl sub_81381B0 cmp r0, 0x1 bne _0809CAE4 - ldr r0, _0809CAE0 + ldr r0, =0x0821307b bl script_env_1_execute_new_script b _0809CB28 .align 2, 0 -_0809CAE0: .4byte 0x0821307b + .pool _0809CAE4: bl sub_81381F8 cmp r0, 0x1 bne _0809CAF8 - ldr r0, _0809CAF4 + ldr r0, =0x08224175 bl script_env_1_execute_new_script b _0809CB28 .align 2, 0 -_0809CAF4: .4byte 0x08224175 + .pool _0809CAF8: bl safari_step lsls r0, 24 @@ -320807,11 +310388,11 @@ _0809CAF8: bl sub_8137FC0 cmp r0, 0x1 bne _0809CB1C - ldr r0, _0809CB18 + ldr r0, =0x0823c050 bl script_env_1_execute_new_script b _0809CB28 .align 2, 0 -_0809CB18: .4byte 0x0823c050 + .pool _0809CB1C: bl sub_8196034 cmp r0, 0 @@ -320830,19 +310411,19 @@ _0809CB2A: thumb_func_start sub_809CB30 sub_809CB30: @ 809CB30 push {lr} - ldr r0, _0809CB40 + ldr r0, =0x0000402a movs r1, 0 bl var_set pop {r0} bx r0 .align 2, 0 -_0809CB40: .4byte 0x0000402a + .pool thumb_func_end sub_809CB30 thumb_func_start happiness_algorithm_step happiness_algorithm_step: @ 809CB44 push {r4,r5,lr} - ldr r0, _0809CB78 + ldr r0, =0x0000402a bl var_get_pointer ldrh r1, [r0] adds r1, 0x1 @@ -320853,7 +310434,7 @@ happiness_algorithm_step: @ 809CB44 strh r1, [r0] cmp r1, 0 bne _0809CB72 - ldr r5, _0809CB7C + ldr r5, =0x020244ec movs r4, 0x5 _0809CB62: adds r0, r5, 0 @@ -320868,30 +310449,29 @@ _0809CB72: pop {r0} bx r0 .align 2, 0 -_0809CB78: .4byte 0x0000402a -_0809CB7C: .4byte 0x020244ec + .pool thumb_func_end happiness_algorithm_step thumb_func_start overworld_poison_timer_set overworld_poison_timer_set: @ 809CB80 push {lr} - ldr r0, _0809CB90 + ldr r0, =0x0000402b movs r1, 0 bl var_set pop {r0} bx r0 .align 2, 0 -_0809CB90: .4byte 0x0000402b + .pool thumb_func_end overworld_poison_timer_set thumb_func_start overworld_poison_step overworld_poison_step: @ 809CB94 push {lr} - ldr r0, _0809CBCC + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x9 beq _0809CBD4 - ldr r0, _0809CBD0 + ldr r0, =0x0000402b bl var_get_pointer ldrh r1, [r0] adds r1, 0x1 @@ -320912,8 +310492,7 @@ overworld_poison_step: @ 809CB94 movs r0, 0x1 b _0809CBD6 .align 2, 0 -_0809CBCC: .4byte 0x02037318 -_0809CBD0: .4byte 0x0000402b + .pool _0809CBD4: movs r0, 0 _0809CBD6: @@ -320923,12 +310502,12 @@ _0809CBD6: thumb_func_start prev_quest_postbuffer_cursor_backup_reset prev_quest_postbuffer_cursor_backup_reset: @ 809CBDC - ldr r1, _0809CBE4 + ldr r1, =0x020375d4 movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_0809CBE4: .4byte 0x020375d4 + .pool thumb_func_end prev_quest_postbuffer_cursor_backup_reset thumb_func_start is_it_battle_time_3 @@ -320937,21 +310516,20 @@ is_it_battle_time_3: @ 809CBE8 lsls r0, 16 lsrs r4, r0, 16 adds r7, r4, 0 - ldr r6, _0809CC04 + ldr r6, =0x020375d4 ldrb r0, [r6] cmp r0, 0x3 bhi _0809CC0C adds r0, 0x1 strb r0, [r6] - ldr r0, _0809CC08 + ldr r0, =0x020375d6 strh r4, [r0] movs r0, 0 b _0809CC30 .align 2, 0 -_0809CC04: .4byte 0x020375d4 -_0809CC08: .4byte 0x020375d6 + .pool _0809CC0C: - ldr r5, _0809CC24 + ldr r5, =0x020375d6 ldrh r1, [r5] adds r0, r4, 0 bl is_it_battle_time_2 @@ -320963,7 +310541,7 @@ _0809CC0C: movs r0, 0 b _0809CC30 .align 2, 0 -_0809CC24: .4byte 0x020375d6 + .pool _0809CC28: movs r0, 0 strb r0, [r6] @@ -320987,7 +310565,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38 lsrs r4, 16 lsls r5, 24 lsrs r5, 24 - ldr r0, _0809CC8C + ldr r0, =0x02037318 mov r8, r0 adds r1, r7, 0 bl map_warp_check_packed @@ -321015,7 +310593,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 809CC38 movs r0, 0x1 b _0809CC92 .align 2, 0 -_0809CC8C: .4byte 0x02037318 + .pool _0809CC90: movs r0, 0 _0809CC92: @@ -321032,7 +310610,7 @@ sub_809CC9C: @ 809CC9C adds r6, r0, 0 lsls r1, 16 lsrs r5, r1, 16 - ldr r7, _0809CCF4 + ldr r7, =0x02037318 adds r0, r7, 0 adds r1, r6, 0 bl map_warp_check_packed @@ -321066,7 +310644,7 @@ sub_809CC9C: @ 809CC9C movs r0, 0x1 b _0809CD8C .align 2, 0 -_0809CCF4: .4byte 0x02037318 + .pool _0809CCF8: adds r0, r4, 0 bl sub_8089870 @@ -321114,12 +310692,12 @@ _0809CD50: lsrs r0, 24 cmp r0, 0x1 bne _0809CD6C - ldr r0, _0809CD68 + ldr r0, =0x082a8350 bl script_env_1_execute_new_script movs r0, 0x1 b _0809CD8C .align 2, 0 -_0809CD68: .4byte 0x082a8350 + .pool _0809CD6C: adds r0, r4, 0 bl sub_80898C0 @@ -321309,12 +310887,12 @@ sub_809CEB0: @ 809CEB0 adds r4, r0, 0 cmp r4, 0 bne _0809CEE8 - ldr r0, _0809CEE4 + ldr r0, =0x02037318 ldr r0, [r0, 0x4] ldr r5, [r0, 0x8] b _0809CF0E .align 2, 0 -_0809CEE4: .4byte 0x02037318 + .pool _0809CEE8: bl sub_81D6120 adds r5, r0, 0 @@ -321328,7 +310906,7 @@ _0809CEF0: adds r5, r0, 0 b _0809CF0E _0809CF00: - ldr r0, _0809CF1C + ldr r0, =0x02037318 ldr r0, [r0, 0x4] lsls r2, r4, 24 asrs r1, r2, 21 @@ -321343,7 +310921,7 @@ _0809CF0E: bl copy_saved_warp2_bank_and_enter_x_to_warp1 b _0809CF6E .align 2, 0 -_0809CF1C: .4byte 0x02037318 + .pool _0809CF20: movs r0, 0x7 ldrsb r0, [r5, r0] @@ -321372,7 +310950,7 @@ _0809CF20: lsls r0, r3, 3 adds r0, r1 ldrb r0, [r0, 0x5] - ldr r1, _0809CF74 + ldr r1, =0x03005d8c ldr r2, [r1] movs r1, 0x4 ldrsb r1, [r2, r1] @@ -321385,7 +310963,7 @@ _0809CF6E: pop {r0} bx r0 .align 2, 0 -_0809CF74: .4byte 0x03005d8c + .pool thumb_func_end sub_809CEB0 thumb_func_start map_warp_consider_2_to_inside @@ -321407,14 +310985,14 @@ map_warp_consider_2_to_inside: @ 809CF78 lsrs r0, 24 cmp r0, 0x1 bne _0809CFB0 - ldr r0, _0809CFAC + ldr r0, =0x02037318 ldr r1, [r0, 0x4] adds r0, r5, 0 bl sub_80E9668 movs r0, 0x1 b _0809CFFE .align 2, 0 -_0809CFAC: .4byte 0x02037318 + .pool _0809CFB0: adds r0, r4, 0 bl is_tile_x69_2_warp_door @@ -321422,7 +311000,7 @@ _0809CFB0: lsrs r0, 24 cmp r0, 0x1 bne _0809CFFC - ldr r6, _0809CFF8 + ldr r6, =0x02037318 adds r0, r6, 0 adds r1, r5, 0 bl map_warp_check_packed @@ -321447,7 +311025,7 @@ _0809CFB0: movs r0, 0x1 b _0809CFFE .align 2, 0 -_0809CFF8: .4byte 0x02037318 + .pool _0809CFFC: movs r0, 0 _0809CFFE: @@ -321599,7 +311177,7 @@ _0809D0E4: thumb_func_start sub_809D0F4 sub_809D0F4: @ 809D0F4 push {r4,lr} - ldr r4, _0809D118 + ldr r4, =0x02037318 ldrh r1, [r0] subs r1, 0x7 lsls r1, 16 @@ -321615,7 +311193,7 @@ sub_809D0F4: @ 809D0F4 pop {r1} bx r1 .align 2, 0 -_0809D118: .4byte 0x02037318 + .pool thumb_func_end sub_809D0F4 thumb_func_start sub_809D11C @@ -321672,7 +311250,7 @@ dive_warp: @ 809D16C adds r4, r0, 0 lsls r1, 16 lsrs r5, r1, 16 - ldr r0, _0809D1A0 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x5 bne _0809D1A4 @@ -321693,7 +311271,7 @@ dive_warp: @ 809D16C bl sub_8085058 b _0809D1C8 .align 2, 0 -_0809D1A0: .4byte 0x02037318 + .pool _0809D1A4: lsls r0, r5, 24 lsrs r0, 24 @@ -321746,7 +311324,7 @@ sub_809D1E8: @ 809D1E8 bl cur_mapdata_block_get_role_at lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0809D240 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x5 bne _0809D244 @@ -321772,7 +311350,7 @@ sub_809D1E8: @ 809D1E8 movs r0, 0x1 b _0809D276 .align 2, 0 -_0809D240: .4byte 0x02037318 + .pool _0809D244: adds r0, r5, 0 bl sub_80895B0 @@ -321848,7 +311426,7 @@ sub_809D2BC: @ 809D2BC movs r2, 0x2 ldrsh r1, [r4, r2] bl cur_mapdata_block_get_role_at - ldr r4, _0809D2FC + ldr r4, =0x02037318 adds r0, r4, 0 mov r1, sp bl map_warp_check_packed @@ -321864,28 +311442,28 @@ sub_809D2BC: @ 809D2BC pop {r1} bx r1 .align 2, 0 -_0809D2FC: .4byte 0x02037318 + .pool thumb_func_end sub_809D2BC thumb_func_start sub_809D300 sub_809D300: @ 809D300 push {r4,lr} - ldr r4, _0809D334 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _0809D338 + ldr r1, =0x00001270 adds r0, r1 movs r2, 0x96 lsls r2, 1 movs r1, 0 bl memset ldr r0, [r4] - ldr r1, _0809D33C + ldr r1, =0x0000139c adds r0, r1 movs r2, 0x80 lsls r2, 2 movs r1, 0 bl memset - ldr r0, _0809D340 + ldr r0, =0x020375fc movs r1, 0 movs r2, 0x10 bl memset @@ -321893,33 +311471,30 @@ sub_809D300: @ 809D300 pop {r0} bx r0 .align 2, 0 -_0809D334: .4byte 0x03005d8c -_0809D338: .4byte 0x00001270 -_0809D33C: .4byte 0x0000139c -_0809D340: .4byte 0x020375fc + .pool thumb_func_end sub_809D300 thumb_func_start sub_809D344 sub_809D344: @ 809D344 push {lr} - ldr r0, _0809D384 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0809D388 + ldr r1, =0x00001270 adds r2, r0, r1 movs r1, 0 str r1, [r2] - ldr r1, _0809D38C + ldr r1, =0x0000139c adds r0, r1 movs r1, 0 movs r2, 0x20 bl memset - ldr r0, _0809D390 + ldr r0, =0x000008ad bl flag_clear - ldr r0, _0809D394 + ldr r0, =0x000008ae bl flag_clear - ldr r0, _0809D398 + ldr r0, =0x00000889 bl flag_clear - ldr r0, _0809D39C + ldr r0, =0x000008c1 bl flag_clear movs r0, 0x88 lsls r0, 4 @@ -321927,21 +311502,15 @@ sub_809D344: @ 809D344 pop {r0} bx r0 .align 2, 0 -_0809D384: .4byte 0x03005d8c -_0809D388: .4byte 0x00001270 -_0809D38C: .4byte 0x0000139c -_0809D390: .4byte 0x000008ad -_0809D394: .4byte 0x000008ae -_0809D398: .4byte 0x00000889 -_0809D39C: .4byte 0x000008c1 + .pool thumb_func_end sub_809D344 thumb_func_start sub_809D3A0 sub_809D3A0: @ 809D3A0 push {lr} - ldr r0, _0809D3B8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0809D3BC + ldr r1, =0x00001394 adds r0, r1 movs r1, 0 movs r2, 0x8 @@ -321949,44 +311518,41 @@ sub_809D3A0: @ 809D3A0 pop {r0} bx r0 .align 2, 0 -_0809D3B8: .4byte 0x03005d8c -_0809D3BC: .4byte 0x00001394 + .pool thumb_func_end sub_809D3A0 thumb_func_start sub_809D3C0 sub_809D3C0: @ 809D3C0 push {lr} - ldr r0, _0809D3DC + ldr r0, =0x00004046 bl var_get_pointer - ldr r1, _0809D3E0 + ldr r1, =0x03005d90 ldr r2, [r1] movs r1, 0 strb r1, [r2, 0x1A] strh r1, [r0] - ldr r0, _0809D3E4 + ldr r0, =0x00000896 bl flag_clear pop {r0} bx r0 .align 2, 0 -_0809D3DC: .4byte 0x00004046 -_0809D3E0: .4byte 0x03005d90 -_0809D3E4: .4byte 0x00000896 + .pool thumb_func_end sub_809D3C0 thumb_func_start sub_809D3E8 sub_809D3E8: @ 809D3E8 push {r4,r5,lr} - ldr r0, _0809D41C + ldr r0, =0x00004046 bl var_get_pointer - ldr r4, _0809D420 + ldr r4, =0x03005d90 ldr r2, [r4] movs r5, 0 movs r1, 0xDA strb r1, [r2, 0x1A] - ldr r2, _0809D424 + ldr r2, =0x00000302 adds r1, r2, 0 strh r1, [r0] - ldr r0, _0809D428 + ldr r0, =0x00000896 bl flag_set ldr r1, [r4] movs r0, 0x1 @@ -321998,27 +311564,24 @@ sub_809D3E8: @ 809D3E8 pop {r0} bx r0 .align 2, 0 -_0809D41C: .4byte 0x00004046 -_0809D420: .4byte 0x03005d90 -_0809D424: .4byte 0x00000302 -_0809D428: .4byte 0x00000896 + .pool thumb_func_end sub_809D3E8 thumb_func_start sub_809D42C sub_809D42C: @ 809D42C push {lr} - ldr r0, _0809D458 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x1A] cmp r0, 0xDA bne _0809D468 - ldr r0, _0809D45C + ldr r0, =0x00004046 bl var_get lsls r0, 16 - ldr r1, _0809D460 + ldr r1, =0x03020000 cmp r0, r1 bne _0809D468 - ldr r0, _0809D464 + ldr r0, =0x00000896 bl flag_check lsls r0, 24 cmp r0, 0 @@ -322026,10 +311589,7 @@ sub_809D42C: @ 809D42C movs r0, 0x1 b _0809D46A .align 2, 0 -_0809D458: .4byte 0x03005d90 -_0809D45C: .4byte 0x00004046 -_0809D460: .4byte 0x03020000 -_0809D464: .4byte 0x00000896 + .pool _0809D468: movs r0, 0 _0809D46A: @@ -322040,71 +311600,71 @@ _0809D46A: thumb_func_start sub_809D470 sub_809D470: @ 809D470 push {lr} - ldr r0, _0809D47C + ldr r0, =0x000008ac bl flag_clear pop {r0} bx r0 .align 2, 0 -_0809D47C: .4byte 0x000008ac + .pool thumb_func_end sub_809D470 thumb_func_start sub_809D480 sub_809D480: @ 809D480 push {lr} - ldr r0, _0809D48C + ldr r0, =0x000008ac bl flag_set pop {r0} bx r0 .align 2, 0 -_0809D48C: .4byte 0x000008ac + .pool thumb_func_end sub_809D480 thumb_func_start sub_809D490 sub_809D490: @ 809D490 push {lr} - ldr r0, _0809D4A0 + ldr r0, =0x000008ac bl flag_check lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_0809D4A0: .4byte 0x000008ac + .pool thumb_func_end sub_809D490 thumb_func_start sub_809D4A4 sub_809D4A4: @ 809D4A4 push {lr} - ldr r0, _0809D4B0 + ldr r0, =0x000008db bl flag_clear pop {r0} bx r0 .align 2, 0 -_0809D4B0: .4byte 0x000008db + .pool thumb_func_end sub_809D4A4 thumb_func_start sub_809D4B4 sub_809D4B4: @ 809D4B4 push {lr} - ldr r0, _0809D4C0 + ldr r0, =0x000008db bl flag_set pop {r0} bx r0 .align 2, 0 -_0809D4C0: .4byte 0x000008db + .pool thumb_func_end sub_809D4B4 thumb_func_start sub_809D4C4 sub_809D4C4: @ 809D4C4 push {lr} - ldr r0, _0809D4D4 + ldr r0, =0x000008db bl flag_check lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_0809D4D4: .4byte 0x000008db + .pool thumb_func_end sub_809D4C4 thumb_func_start sub_809D4D8 @@ -322113,136 +311673,120 @@ sub_809D4D8: @ 809D4D8 movs r0, 0xF2 lsls r0, 1 bl flag_clear - ldr r0, _0809D550 + ldr r0, =0x000001e5 bl flag_clear movs r0, 0xF3 lsls r0, 1 bl flag_clear - ldr r0, _0809D554 + ldr r0, =0x000001e7 bl flag_clear movs r0, 0xF4 lsls r0, 1 bl flag_clear - ldr r0, _0809D558 + ldr r0, =0x000001e9 bl flag_clear movs r0, 0xF5 lsls r0, 1 bl flag_clear - ldr r0, _0809D55C + ldr r0, =0x000001eb bl flag_clear movs r0, 0xF6 lsls r0, 1 bl flag_clear - ldr r0, _0809D560 + ldr r0, =0x000001ed bl flag_clear movs r0, 0xF7 lsls r0, 1 bl flag_clear - ldr r0, _0809D564 + ldr r0, =0x000001ef bl flag_clear movs r0, 0xF8 lsls r0, 1 bl flag_clear - ldr r0, _0809D568 + ldr r0, =0x000001f1 bl flag_clear movs r0, 0xF9 lsls r0, 1 bl flag_clear - ldr r0, _0809D56C + ldr r0, =0x000001f3 bl flag_clear pop {r0} bx r0 .align 2, 0 -_0809D550: .4byte 0x000001e5 -_0809D554: .4byte 0x000001e7 -_0809D558: .4byte 0x000001e9 -_0809D55C: .4byte 0x000001eb -_0809D560: .4byte 0x000001ed -_0809D564: .4byte 0x000001ef -_0809D568: .4byte 0x000001f1 -_0809D56C: .4byte 0x000001f3 + .pool thumb_func_end sub_809D4D8 thumb_func_start sub_809D570 sub_809D570: @ 809D570 push {lr} - ldr r0, _0809D5B8 + ldr r0, =0x000040dd movs r1, 0 bl var_set - ldr r0, _0809D5BC + ldr r0, =0x000040de movs r1, 0 bl var_set - ldr r0, _0809D5C0 + ldr r0, =0x000040df movs r1, 0 bl var_set - ldr r0, _0809D5C4 + ldr r0, =0x000040e0 movs r1, 0 bl var_set - ldr r0, _0809D5C8 + ldr r0, =0x000040e1 movs r1, 0 bl var_set - ldr r0, _0809D5CC + ldr r0, =0x000040e2 movs r1, 0 bl var_set - ldr r0, _0809D5D0 + ldr r0, =0x000040e3 movs r1, 0 bl var_set - ldr r0, _0809D5D4 + ldr r0, =0x000040e4 movs r1, 0 bl var_set pop {r0} bx r0 .align 2, 0 -_0809D5B8: .4byte 0x000040dd -_0809D5BC: .4byte 0x000040de -_0809D5C0: .4byte 0x000040df -_0809D5C4: .4byte 0x000040e0 -_0809D5C8: .4byte 0x000040e1 -_0809D5CC: .4byte 0x000040e2 -_0809D5D0: .4byte 0x000040e3 -_0809D5D4: .4byte 0x000040e4 + .pool thumb_func_end sub_809D570 thumb_func_start sub_809D5D8 sub_809D5D8: @ 809D5D8 push {lr} - ldr r0, _0809D5EC + ldr r0, =0x0000402c movs r1, 0 bl var_set - ldr r0, _0809D5F0 + ldr r0, =0x000008c2 bl flag_clear pop {r0} bx r0 .align 2, 0 -_0809D5EC: .4byte 0x0000402c -_0809D5F0: .4byte 0x000008c2 + .pool thumb_func_end sub_809D5D8 thumb_func_start sub_809D5F4 sub_809D5F4: @ 809D5F4 push {lr} - ldr r0, _0809D60C + ldr r0, =0x0000402c movs r1, 0x92 lsls r1, 4 bl var_set - ldr r0, _0809D610 + ldr r0, =0x000008c2 bl flag_set pop {r0} bx r0 .align 2, 0 -_0809D60C: .4byte 0x0000402c -_0809D610: .4byte 0x000008c2 + .pool thumb_func_end sub_809D5F4 thumb_func_start sub_809D614 sub_809D614: @ 809D614 push {lr} - ldr r0, _0809D638 + ldr r0, =0x000008c2 bl flag_check lsls r0, 24 cmp r0, 0 beq _0809D640 - ldr r0, _0809D63C + ldr r0, =0x0000402c bl var_get lsls r0, 16 movs r1, 0x92 @@ -322252,8 +311796,7 @@ sub_809D614: @ 809D614 movs r0, 0x1 b _0809D642 .align 2, 0 -_0809D638: .4byte 0x000008c2 -_0809D63C: .4byte 0x0000402c + .pool _0809D640: movs r0, 0 _0809D642: @@ -322267,31 +311810,30 @@ var_get_pointer: @ 809D648 lsls r0, 16 lsrs r1, r0, 16 adds r2, r1, 0 - ldr r0, _0809D65C + ldr r0, =0x00003fff cmp r1, r0 bhi _0809D660 movs r0, 0 b _0809D688 .align 2, 0 -_0809D65C: .4byte 0x00003fff + .pool _0809D660: lsls r0, r1, 16 cmp r0, 0 bge _0809D67C - ldr r0, _0809D674 - ldr r2, _0809D678 + ldr r0, =0x081dba0c + ldr r2, =0xffff8000 adds r1, r2 lsls r1, 2 adds r1, r0 ldr r0, [r1] b _0809D688 .align 2, 0 -_0809D674: .4byte 0x081dba0c -_0809D678: .4byte 0xffff8000 + .pool _0809D67C: - ldr r0, _0809D68C + ldr r0, =0x03005d8c lsls r1, r2, 1 - ldr r2, _0809D690 + ldr r2, =0xffff939c adds r1, r2 ldr r0, [r0] adds r0, r1 @@ -322299,8 +311841,7 @@ _0809D688: pop {r1} bx r1 .align 2, 0 -_0809D68C: .4byte 0x03005d8c -_0809D690: .4byte 0xffff939c + .pool thumb_func_end var_get_pointer thumb_func_start var_get @@ -322348,7 +311889,7 @@ var_load_x4010_plus_r0: @ 809D6D0 push {lr} lsls r0, 24 lsrs r0, 8 - ldr r1, _0809D6E8 + ldr r1, =0x40100000 adds r0, r1 lsrs r0, 16 bl var_get @@ -322357,7 +311898,7 @@ var_load_x4010_plus_r0: @ 809D6D0 pop {r1} bx r1 .align 2, 0 -_0809D6E8: .4byte 0x40100000 + .pool thumb_func_end var_load_x4010_plus_r0 thumb_func_start flag_get_pointer @@ -322371,38 +311912,34 @@ flag_get_pointer: @ 809D6EC movs r0, 0 b _0809D72E _0809D6FC: - ldr r0, _0809D710 + ldr r0, =0x00003fff cmp r2, r0 bhi _0809D71C - ldr r0, _0809D714 + ldr r0, =0x03005d8c lsrs r1, 19 - ldr r2, _0809D718 + ldr r2, =0x00001270 adds r1, r2 ldr r0, [r0] b _0809D72C .align 2, 0 -_0809D710: .4byte 0x00003fff -_0809D714: .4byte 0x03005d8c -_0809D718: .4byte 0x00001270 + .pool _0809D71C: - ldr r1, _0809D734 + ldr r1, =0xffffc000 adds r0, r3, r1 cmp r0, 0 bge _0809D728 - ldr r2, _0809D738 + ldr r2, =0xffffc007 adds r0, r3, r2 _0809D728: asrs r0, 3 - ldr r1, _0809D73C + ldr r1, =0x020375fc _0809D72C: adds r0, r1 _0809D72E: pop {r1} bx r1 .align 2, 0 -_0809D734: .4byte 0xffffc000 -_0809D738: .4byte 0xffffc007 -_0809D73C: .4byte 0x020375fc + .pool thumb_func_end flag_get_pointer thumb_func_start flag_set @@ -322603,7 +312140,7 @@ trigger_activate_alternative__deprecated: @ 809D858 lsls r0, 24 lsrs r4, r0, 24 movs r2, 0 - ldr r3, _0809D878 + ldr r3, =0x085102e0 _0809D862: lsls r1, r2, 3 adds r0, r1, r3 @@ -322616,7 +312153,7 @@ _0809D862: bl _call_via_r0 b _0809D886 .align 2, 0 -_0809D878: .4byte 0x085102e0 + .pool _0809D87C: adds r0, r2, 0x1 lsls r0, 24 @@ -322634,14 +312171,14 @@ task_per_step_callback_manager: @ 809D88C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0809D8B0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 movs r2, 0x8 ldrsh r1, [r1, r2] - ldr r2, _0809D8B4 + ldr r2, =0x08510348 lsls r1, 2 adds r1, r2 ldr r1, [r1] @@ -322649,8 +312186,7 @@ task_per_step_callback_manager: @ 809D88C pop {r0} bx r0 .align 2, 0 -_0809D8B0: .4byte 0x03005e00 -_0809D8B4: .4byte 0x08510348 + .pool thumb_func_end task_per_step_callback_manager thumb_func_start sub_809D8B8 @@ -322665,7 +312201,7 @@ sub_809D8B8: @ 809D8B8 beq _0809D8E8 b _0809D8FC _0809D8CA: - ldr r0, _0809D8E4 + ldr r0, =0x030022c0 ldr r0, [r0, 0x20] movs r1, 0x80 lsls r1, 5 @@ -322677,9 +312213,9 @@ _0809D8CA: adds r0, 0x1 b _0809D8FA .align 2, 0 -_0809D8E4: .4byte 0x030022c0 + .pool _0809D8E8: - ldr r0, _0809D904 + ldr r0, =0x030022c0 ldr r0, [r0, 0x20] movs r1, 0x80 lsls r1, 5 @@ -322695,7 +312231,7 @@ _0809D8FC: pop {r0} bx r0 .align 2, 0 -_0809D904: .4byte 0x030022c0 + .pool thumb_func_end sub_809D8B8 thumb_func_start sub_809D908 @@ -322706,7 +312242,7 @@ sub_809D908: @ 809D908 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0809D938 + ldr r0, =0x03005e08 adds r4, r1, r0 bl script_env_2_is_enabled lsls r0, 24 @@ -322722,13 +312258,13 @@ _0809D930: pop {r0} bx r0 .align 2, 0 -_0809D938: .4byte 0x03005e08 + .pool thumb_func_end sub_809D908 thumb_func_start overworld_ensure_per_step_coros_running overworld_ensure_per_step_coros_running: @ 809D93C push {r4,r5,lr} - ldr r5, _0809D998 + ldr r5, =task_per_step_callback_manager + 1 adds r0, r5, 0 bl is_function_an_active_task lsls r0, 24 @@ -322740,14 +312276,14 @@ overworld_ensure_per_step_coros_running: @ 809D93C bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0809D99C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 strh r4, [r1, 0x8] _0809D966: - ldr r4, _0809D9A0 + ldr r4, =sub_809E638 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -322757,7 +312293,7 @@ _0809D966: movs r1, 0x50 bl AddTask _0809D97C: - ldr r4, _0809D9A4 + ldr r4, =sub_809D908 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -322771,10 +312307,7 @@ _0809D992: pop {r0} bx r0 .align 2, 0 -_0809D998: .4byte task_per_step_callback_manager + 1 -_0809D99C: .4byte 0x03005e00 -_0809D9A0: .4byte sub_809E638 + 1 -_0809D9A4: .4byte sub_809D908 + 1 + .pool thumb_func_end overworld_ensure_per_step_coros_running thumb_func_start activate_per_step_callback @@ -322782,7 +312315,7 @@ activate_per_step_callback: @ 809D9A8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0809D9E0 + ldr r0, =task_per_step_callback_manager + 1 bl get_task_id_by_function lsls r0, 24 lsrs r1, r0, 24 @@ -322791,7 +312324,7 @@ activate_per_step_callback: @ 809D9A8 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0809D9E4 + ldr r1, =0x03005e08 adds r1, r0, r1 movs r2, 0 adds r0, r1, 0 @@ -322807,8 +312340,7 @@ _0809D9CC: strh r0, [r1] b _0809D9EA .align 2, 0 -_0809D9E0: .4byte task_per_step_callback_manager + 1 -_0809D9E4: .4byte 0x03005e08 + .pool _0809D9E8: strh r4, [r1] _0809D9EA: @@ -322820,11 +312352,11 @@ _0809D9EA: thumb_func_start wild_encounter_reset_coro_args wild_encounter_reset_coro_args: @ 809D9F0 push {lr} - ldr r0, _0809DA20 + ldr r0, =task_per_step_callback_manager + 1 bl get_task_id_by_function lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0809DA24 + ldr r0, =sub_809D908 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r1, r0, 24 @@ -322833,7 +312365,7 @@ wild_encounter_reset_coro_args: @ 809D9F0 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0809DA28 + ldr r1, =0x03005e08 adds r0, r1 movs r1, 0 strh r1, [r0, 0x2] @@ -322842,9 +312374,7 @@ _0809DA1A: pop {r0} bx r0 .align 2, 0 -_0809DA20: .4byte task_per_step_callback_manager + 1 -_0809DA24: .4byte sub_809D908 + 1 -_0809DA28: .4byte 0x03005e08 + .pool thumb_func_end wild_encounter_reset_coro_args thumb_func_start nullsub_34 @@ -322974,7 +312504,7 @@ sub_809DB10: @ 809DB10 adds r4, r0, 0 adds r5, r1, 0 adds r3, r2, 0 - ldr r0, _0809DB30 + ldr r0, =0x08510368 lsls r4, 16 asrs r4, 16 lsls r5, 16 @@ -322986,7 +312516,7 @@ sub_809DB10: @ 809DB10 pop {r0} bx r0 .align 2, 0 -_0809DB30: .4byte 0x08510368 + .pool thumb_func_end sub_809DB10 thumb_func_start sub_809DB34 @@ -322995,7 +312525,7 @@ sub_809DB34: @ 809DB34 adds r4, r0, 0 adds r5, r1, 0 adds r3, r2, 0 - ldr r0, _0809DB54 + ldr r0, =0x08510388 lsls r4, 16 asrs r4, 16 lsls r5, 16 @@ -323007,7 +312537,7 @@ sub_809DB34: @ 809DB34 pop {r0} bx r0 .align 2, 0 -_0809DB54: .4byte 0x08510388 + .pool thumb_func_end sub_809DB34 thumb_func_start sub_809DB58 @@ -323016,7 +312546,7 @@ sub_809DB58: @ 809DB58 adds r4, r0, 0 adds r5, r1, 0 adds r3, r2, 0 - ldr r0, _0809DB78 + ldr r0, =0x085103a8 lsls r4, 16 asrs r4, 16 lsls r5, 16 @@ -323028,7 +312558,7 @@ sub_809DB58: @ 809DB58 pop {r0} bx r0 .align 2, 0 -_0809DB78: .4byte 0x085103a8 + .pool thumb_func_end sub_809DB58 thumb_func_start sub_809DB7C @@ -323204,7 +312734,7 @@ sub_809DCB4: @ 809DCB4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0809DCE8 + ldr r0, =0x03005e08 adds r4, r1, r0 mov r5, sp adds r5, 0x2 @@ -323222,7 +312752,7 @@ sub_809DCB4: @ 809DCB4 beq _0809DCF2 b _0809DE1E .align 2, 0 -_0809DCE8: .4byte 0x03005e08 + .pool _0809DCEC: cmp r0, 0x2 beq _0809DDDC @@ -323403,7 +312933,7 @@ sub_809DE28: @ 809DE28 adds r1, r5, 0 bl cur_mapdata_get_blockid_at adds r1, r0, 0 - ldr r0, _0809DE64 + ldr r0, =0x0000024e cmp r1, r0 beq _0809DE68 adds r0, 0x8 @@ -323411,17 +312941,17 @@ sub_809DE28: @ 809DE28 beq _0809DE78 b _0809DE82 .align 2, 0 -_0809DE64: .4byte 0x0000024e + .pool _0809DE68: - ldr r2, _0809DE74 + ldr r2, =0x0000024f adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 b _0809DE82 .align 2, 0 -_0809DE74: .4byte 0x0000024f + .pool _0809DE78: - ldr r2, _0809DE88 + ldr r2, =0x00000257 adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 @@ -323430,7 +312960,7 @@ _0809DE82: pop {r0} bx r0 .align 2, 0 -_0809DE88: .4byte 0x00000257 + .pool thumb_func_end sub_809DE28 thumb_func_start sub_809DE8C @@ -323455,7 +312985,7 @@ sub_809DE8C: @ 809DE8C adds r1, r5, 0 bl cur_mapdata_get_blockid_at adds r1, r0, 0 - ldr r0, _0809DEC8 + ldr r0, =0x0000024f cmp r1, r0 beq _0809DECC adds r0, 0x8 @@ -323463,17 +312993,17 @@ sub_809DE8C: @ 809DE8C beq _0809DEDC b _0809DEE6 .align 2, 0 -_0809DEC8: .4byte 0x0000024f + .pool _0809DECC: - ldr r2, _0809DED8 + ldr r2, =0x0000024e adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 b _0809DEE6 .align 2, 0 -_0809DED8: .4byte 0x0000024e + .pool _0809DEDC: - ldr r2, _0809DEEC + ldr r2, =0x00000256 adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 @@ -323482,7 +313012,7 @@ _0809DEE6: pop {r0} bx r0 .align 2, 0 -_0809DEEC: .4byte 0x00000256 + .pool thumb_func_end sub_809DE8C thumb_func_start sub_809DEF0 @@ -323498,7 +313028,7 @@ sub_809DEF0: @ 809DEF0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0809DF2C + ldr r0, =0x03005e08 adds r6, r1, r0 mov r4, sp adds r4, 0x2 @@ -323516,7 +313046,7 @@ sub_809DEF0: @ 809DEF0 beq _0809DF38 b _0809E0F6 .align 2, 0 -_0809DF2C: .4byte 0x03005e08 + .pool _0809DF30: cmp r5, 0x2 bne _0809DF36 @@ -323684,12 +313214,12 @@ _0809E064: cmp r0, 0x7 bhi _0809E0EA lsls r0, 2 - ldr r1, _0809E090 + ldr r1, =_0809E094 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809E090: .4byte _0809E094 + .pool .align 2, 0 _0809E094: .4byte _0809E0B4 @@ -323750,19 +313280,19 @@ sub_809E108: @ 809E108 lsls r1, 16 lsrs r1, 16 lsls r0, 16 - ldr r2, _0809E138 + ldr r2, =0xfffd0000 adds r0, r2 lsrs r0, 16 cmp r0, 0xA bhi _0809E144 lsls r0, r1, 16 asrs r1, r0, 16 - ldr r2, _0809E13C + ldr r2, =0xfffa0000 adds r0, r2 lsrs r0, 16 cmp r0, 0xD bhi _0809E144 - ldr r0, _0809E140 + ldr r0, =0x085103c8 lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -323771,9 +313301,7 @@ sub_809E108: @ 809E108 movs r0, 0x1 b _0809E146 .align 2, 0 -_0809E138: .4byte 0xfffd0000 -_0809E13C: .4byte 0xfffa0000 -_0809E140: .4byte 0x085103c8 + .pool _0809E144: movs r0, 0 _0809E146: @@ -323793,7 +313321,7 @@ sub_809E14C: @ 809E14C bl sub_809E108 cmp r0, 0 beq _0809E17A - ldr r1, _0809E180 + ldr r1, =0x085103c8 lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] @@ -323809,7 +313337,7 @@ _0809E17A: pop {r0} bx r0 .align 2, 0 -_0809E180: .4byte 0x085103c8 + .pool thumb_func_end sub_809E14C thumb_func_start sub_809E184 @@ -323824,7 +313352,7 @@ sub_809E184: @ 809E184 bl sub_809E108 cmp r0, 0 beq _0809E1B6 - ldr r1, _0809E1BC + ldr r1, =0x085103c8 lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] @@ -323841,7 +313369,7 @@ _0809E1B6: movs r0, 0 b _0809E1C2 .align 2, 0 -_0809E1BC: .4byte 0x085103c8 + .pool _0809E1C0: movs r0, 0x1 _0809E1C2: @@ -323856,7 +313384,7 @@ sub_809E1C8: @ 809E1C8 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0809E21C + ldr r0, =0x02037318 ldr r0, [r0] ldr r1, [r0] mov r9, r1 @@ -323880,7 +313408,7 @@ _0809E1EC: bne _0809E204 adds r1, r4, 0x7 adds r0, r5, 0x7 - ldr r2, _0809E220 + ldr r2, =0x0000020e bl setmaptile_0 _0809E204: adds r4, 0x1 @@ -323898,8 +313426,7 @@ _0809E210: pop {r0} bx r0 .align 2, 0 -_0809E21C: .4byte 0x02037318 -_0809E220: .4byte 0x0000020e + .pool thumb_func_end sub_809E1C8 thumb_func_start sub_809E224 @@ -323911,7 +313438,7 @@ sub_809E224: @ 809E224 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0809E248 + ldr r0, =0x03005e08 adds r5, r1, r0 movs r1, 0x2 ldrsh r0, [r5, r1] @@ -323923,7 +313450,7 @@ sub_809E224: @ 809E224 beq _0809E258 b _0809E3A6 .align 2, 0 -_0809E248: .4byte 0x03005e08 + .pool _0809E24C: cmp r0, 0x2 beq _0809E306 @@ -323978,7 +313505,7 @@ _0809E29A: adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _0809E2DC + ldr r0, =0x00004022 bl var_get_pointer adds r6, r0, 0 lsls r4, 24 @@ -323997,7 +313524,7 @@ _0809E29A: movs r0, 0x2 b _0809E2F8 .align 2, 0 -_0809E2DC: .4byte 0x00004022 + .pool _0809E2E0: adds r0, r4, 0 bl sub_8089618 @@ -324038,7 +313565,7 @@ _0809E306: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - ldr r2, _0809E35C + ldr r2, =0x0000020e bl setmaptile_0 mov r0, sp movs r3, 0 @@ -324058,7 +313585,7 @@ _0809E306: bl sub_809E14C b _0809E3A2 .align 2, 0 -_0809E35C: .4byte 0x0000020e + .pool _0809E360: ldrh r1, [r5, 0xC] movs r3, 0xC @@ -324084,7 +313611,7 @@ _0809E370: ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - ldr r2, _0809E3B0 + ldr r2, =0x00000206 bl setmaptile_0 mov r0, sp movs r3, 0 @@ -324101,7 +313628,7 @@ _0809E3A6: pop {r0} bx r0 .align 2, 0 -_0809E3B0: .4byte 0x00000206 + .pool thumb_func_end sub_809E224 thumb_func_start sub_809E3B4 @@ -324113,7 +313640,7 @@ sub_809E3B4: @ 809E3B4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0809E438 + ldr r0, =0x03005e08 adds r5, r1, r0 mov r4, sp adds r4, 0x2 @@ -324156,7 +313683,7 @@ _0809E3EE: movs r2, 0 ldrsh r1, [r4, r2] bl cur_mapdata_get_blockid_at - ldr r1, _0809E43C + ldr r1, =0x0000020a cmp r0, r1 bne _0809E444 mov r0, sp @@ -324164,21 +313691,19 @@ _0809E3EE: ldrsh r0, [r0, r3] movs r2, 0 ldrsh r1, [r4, r2] - ldr r2, _0809E440 + ldr r2, =0x00000212 movs r3, 0x4 bl ash b _0809E456 .align 2, 0 -_0809E438: .4byte 0x03005e08 -_0809E43C: .4byte 0x0000020a -_0809E440: .4byte 0x00000212 + .pool _0809E444: mov r0, sp movs r3, 0 ldrsh r0, [r0, r3] movs r2, 0 ldrsh r1, [r4, r2] - ldr r2, _0809E484 + ldr r2, =0x00000206 movs r3, 0x4 bl ash _0809E456: @@ -324189,11 +313714,11 @@ _0809E456: lsls r0, 24 cmp r0, 0 beq _0809E47A - ldr r0, _0809E488 + ldr r0, =0x00004048 bl var_get_pointer adds r2, r0, 0 ldrh r1, [r2] - ldr r0, _0809E48C + ldr r0, =0x0000270e cmp r1, r0 bhi _0809E47A adds r0, r1, 0x1 @@ -324204,9 +313729,7 @@ _0809E47A: pop {r0} bx r0 .align 2, 0 -_0809E484: .4byte 0x00000206 -_0809E488: .4byte 0x00004048 -_0809E48C: .4byte 0x0000270e + .pool thumb_func_end sub_809E3B4 thumb_func_start sub_809E490 @@ -324219,8 +313742,8 @@ sub_809E490: @ 809E490 adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at - ldr r1, _0809E4C4 - ldr r2, _0809E4C8 + ldr r1, =0x0000022f + ldr r2, =0x00000237 cmp r0, r1 bne _0809E4AC subs r2, 0x31 @@ -324235,8 +313758,7 @@ _0809E4AC: pop {r0} bx r0 .align 2, 0 -_0809E4C4: .4byte 0x0000022f -_0809E4C8: .4byte 0x00000237 + .pool thumb_func_end sub_809E490 thumb_func_start sub_809E4CC @@ -324248,7 +313770,7 @@ sub_809E4CC: @ 809E4CC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0809E5B4 + ldr r0, =0x03005e08 adds r5, r1, r0 mov r4, sp adds r4, 0x2 @@ -324303,7 +313825,7 @@ _0809E53E: lsls r0, 24 cmp r0, 0 beq _0809E556 - ldr r0, _0809E5B8 + ldr r0, =0x00004022 movs r1, 0 bl var_set _0809E556: @@ -324336,7 +313858,7 @@ _0809E572: asrs r0, 16 cmp r0, 0x4 beq _0809E59A - ldr r0, _0809E5B8 + ldr r0, =0x00004022 movs r1, 0 bl var_set _0809E59A: @@ -324353,8 +313875,7 @@ _0809E59A: strh r0, [r5, 0xC] b _0809E5D2 .align 2, 0 -_0809E5B4: .4byte 0x03005e08 -_0809E5B8: .4byte 0x00004022 + .pool _0809E5BC: movs r2, 0xE ldrsh r0, [r5, r2] @@ -324391,7 +313912,7 @@ sub_809E5DC: @ 809E5DC movs r2, 0xE8 b _0809E60C _0809E5F8: - ldr r1, _0809E634 + ldr r1, =0x085103fc movs r2, 0 ldrsh r0, [r3, r2] cmp r0, 0 @@ -324421,7 +313942,7 @@ _0809E60C: pop {r0} bx r0 .align 2, 0 -_0809E634: .4byte 0x085103fc + .pool thumb_func_end sub_809E5DC thumb_func_start sub_809E638 @@ -324435,14 +313956,14 @@ sub_809E638: @ 809E638 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0809E680 + ldr r0, =0x03005e08 adds r4, r1, r0 mov r5, sp adds r5, 0x2 mov r0, sp adds r1, r5, 0 bl player_get_pos_to - ldr r0, _0809E684 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -324462,8 +313983,7 @@ sub_809E638: @ 809E638 beq _0809E6B4 b _0809E708 .align 2, 0 -_0809E680: .4byte 0x03005e08 -_0809E684: .4byte 0x03005d8c + .pool _0809E688: strh r7, [r4] mov r0, sp @@ -324532,7 +314052,7 @@ _0809E6F8: cmp r6, 0xD ble _0809E6F8 _0809E708: - ldr r2, _0809E724 + ldr r2, =0x02037334 ldrb r1, [r2] movs r0, 0x1 ands r0, r1 @@ -324547,7 +314067,7 @@ _0809E708: ldrh r1, [r2, 0x8] b _0809E72C .align 2, 0 -_0809E724: .4byte 0x02037334 + .pool _0809E728: movs r0, 0 movs r1, 0 @@ -324596,33 +314116,30 @@ _0809E762: thumb_func_start sub_809E778 sub_809E778: @ 809E778 push {lr} - ldr r0, _0809E7A0 + ldr r0, =0x00000895 bl flag_set bl sub_802F588 - ldr r0, _0809E7A4 + ldr r0, =0x03005d90 ldr r2, [r0] adds r2, 0xA0 - ldr r3, _0809E7A8 + ldr r3, =0x03005cf8 ldr r0, [r3] ldr r1, [r3, 0x4] str r0, [r2] str r1, [r2, 0x4] - ldr r0, _0809E7AC + ldr r0, =0x00004040 ldrh r1, [r3] bl var_set pop {r0} bx r0 .align 2, 0 -_0809E7A0: .4byte 0x00000895 -_0809E7A4: .4byte 0x03005d90 -_0809E7A8: .4byte 0x03005cf8 -_0809E7AC: .4byte 0x00004040 + .pool thumb_func_end sub_809E778 thumb_func_start sub_809E7B0 sub_809E7B0: @ 809E7B0 push {r4,lr} - ldr r0, _0809E7E0 + ldr r0, =0x00000895 bl flag_check lsls r0, 24 cmp r0, 0 @@ -324632,7 +314149,7 @@ sub_809E7B0: @ 809E7B0 cmp r0, 0 bne _0809E7DA bl sub_802F588 - ldr r4, _0809E7E4 + ldr r4, =0x03005cf8 adds r0, r4, 0 bl sub_809E7E8 adds r0, r4, 0 @@ -324642,15 +314159,14 @@ _0809E7DA: pop {r0} bx r0 .align 2, 0 -_0809E7E0: .4byte 0x00000895 -_0809E7E4: .4byte 0x03005cf8 + .pool thumb_func_end sub_809E7B0 thumb_func_start sub_809E7E8 sub_809E7E8: @ 809E7E8 push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _0809E854 + ldr r0, =0x00004040 bl var_get_pointer adds r6, r0, 0 ldrh r0, [r6] @@ -324692,7 +314208,7 @@ _0809E84E: pop {r0} bx r0 .align 2, 0 -_0809E854: .4byte 0x00004040 + .pool thumb_func_end sub_809E7E8 thumb_func_start sub_809E858 @@ -324701,7 +314217,7 @@ sub_809E858: @ 809E858 sub sp, 0x8 adds r5, r0, 0 mov r4, sp - ldr r6, _0809E8B0 + ldr r6, =0x03005d90 ldr r1, [r6] adds r1, 0xA0 mov r0, sp @@ -324741,42 +314257,40 @@ _0809E8A8: pop {r0} bx r0 .align 2, 0 -_0809E8B0: .4byte 0x03005d90 + .pool thumb_func_end sub_809E858 thumb_func_start sub_809E8B4 sub_809E8B4: @ 809E8B4 push {lr} bl sub_809E778 - ldr r0, _0809E8C4 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0809E8C4: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_809E8B4 thumb_func_start sub_809E8C8 sub_809E8C8: @ 809E8C8 push {lr} - ldr r0, _0809E8DC + ldr r0, =sub_81349F4 + 1 bl set_callback2 - ldr r1, _0809E8E0 - ldr r0, _0809E8E4 + ldr r1, =0x030022c0 + ldr r0, =sub_809E8B4 + 1 str r0, [r1, 0x8] pop {r0} bx r0 .align 2, 0 -_0809E8DC: .4byte sub_81349F4 + 1 -_0809E8E0: .4byte 0x030022c0 -_0809E8E4: .4byte sub_809E8B4 + 1 + .pool thumb_func_end sub_809E8C8 thumb_func_start sub_809E8E8 sub_809E8E8: @ 809E8E8 push {lr} adds r3, r0, 0 - ldr r2, _0809E918 + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -324794,13 +314308,12 @@ sub_809E8E8: @ 809E8E8 cmp r0, 0x5 bhi _0809E9FE lsls r0, 2 - ldr r1, _0809E91C + ldr r1, =_0809E920 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809E918: .4byte 0x03005e00 -_0809E91C: .4byte _0809E920 + .pool .align 2, 0 _0809E920: .4byte _0809E938 @@ -324923,7 +314436,7 @@ _0809E9FE: sub_809EA04: @ 809EA04 push {lr} adds r3, r0, 0 - ldr r2, _0809EA34 + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -324941,13 +314454,12 @@ sub_809EA04: @ 809EA04 cmp r0, 0x5 bhi _0809EAFE lsls r0, 2 - ldr r1, _0809EA38 + ldr r1, =_0809EA3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809EA34: .4byte 0x03005e00 -_0809EA38: .4byte _0809EA3C + .pool .align 2, 0 _0809EA3C: .4byte _0809EA54 @@ -325060,9 +314572,9 @@ sub_809EB04: @ 809EB04 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _0809EB74 + ldr r0, =0x085104c4 bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _0809EB78 + ldr r0, =0x085104f0 mov r8, r0 movs r1, 0x35 movs r2, 0x44 @@ -325070,18 +314582,18 @@ sub_809EB04: @ 809EB04 bl obj_add_from_template_backward_search lsls r0, 24 lsrs r1, r0, 24 - ldr r6, _0809EB7C + ldr r6, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r4, r6, 0 adds r4, 0x1C adds r2, r0, r4 - ldr r1, _0809EB80 + ldr r1, =sub_809E8E8 + 1 str r1, [r2] adds r0, r6 strh r5, [r0, 0x2E] - ldr r1, _0809EB84 + ldr r1, =0x0000ffff strh r1, [r0, 0x30] mov r0, r8 movs r1, 0x35 @@ -325094,7 +314606,7 @@ sub_809EB04: @ 809EB04 adds r0, r1 lsls r0, 2 adds r4, r0, r4 - ldr r1, _0809EB88 + ldr r1, =sub_809EA04 + 1 str r1, [r4] adds r0, r6 strh r5, [r0, 0x2E] @@ -325107,24 +314619,19 @@ sub_809EB04: @ 809EB04 pop {r0} bx r0 .align 2, 0 -_0809EB74: .4byte 0x085104c4 -_0809EB78: .4byte 0x085104f0 -_0809EB7C: .4byte 0x02020630 -_0809EB80: .4byte sub_809E8E8 + 1 -_0809EB84: .4byte 0x0000ffff -_0809EB88: .4byte sub_809EA04 + 1 + .pool thumb_func_end sub_809EB04 thumb_func_start sub_809EB8C sub_809EB8C: @ 809EB8C push {lr} - ldr r0, _0809EB9C + ldr r0, =0x085104c4 ldrh r0, [r0, 0x4] bl gpu_pal_free_tag pop {r0} bx r0 .align 2, 0 -_0809EB9C: .4byte 0x085104c4 + .pool thumb_func_end sub_809EB8C thumb_func_start sub_809EBA0 @@ -325182,8 +314689,8 @@ sub_809EBC4: @ 809EBC4 lsls r2, 24 lsrs r2, 24 mov r8, r2 - ldr r7, _0809ECA4 - ldr r4, _0809ECA8 + ldr r7, =0x02021fc4 + ldr r4, =0x02021cc4 adds r0, r4, 0 movs r2, 0x1 movs r3, 0x4 @@ -325192,7 +314699,7 @@ sub_809EBC4: @ 809EBC4 adds r1, r4, 0 bl gf_strcpy adds r7, r0, 0 - ldr r1, _0809ECAC + ldr r1, =0x085ee68a bl gf_strcpy adds r7, r0, 0 adds r0, r4, 0 @@ -325204,7 +314711,7 @@ sub_809EBC4: @ 809EBC4 adds r1, r4, 0 bl gf_strcpy adds r7, r0, 0 - ldr r5, _0809ECB0 + ldr r5, =0x085ee68e adds r1, r5, 0 bl gf_strcpy adds r7, r0, 0 @@ -325228,7 +314735,7 @@ sub_809EBC4: @ 809EBC4 adds r0, r7, 0 adds r1, r4, 0 bl gf_strcpy - ldr r2, _0809ECA4 + ldr r2, =0x02021fc4 mov r0, r9 str r0, [sp] movs r0, 0xFF @@ -325248,10 +314755,7 @@ sub_809EBC4: @ 809EBC4 pop {r0} bx r0 .align 2, 0 -_0809ECA4: .4byte 0x02021fc4 -_0809ECA8: .4byte 0x02021cc4 -_0809ECAC: .4byte 0x085ee68a -_0809ECB0: .4byte 0x085ee68e + .pool thumb_func_end sub_809EBC4 thumb_func_start sub_809ECB4 @@ -325296,7 +314800,7 @@ sub_809ECB4: @ 809ECB4 movs r2, 0x1 mov r3, r9 bl sub_809EBC4 - ldr r2, _0809ED34 + ldr r2, =0x085ee690 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -325316,7 +314820,7 @@ sub_809ECB4: @ 809ECB4 pop {r0} bx r0 .align 2, 0 -_0809ED34: .4byte 0x085ee690 + .pool thumb_func_end sub_809ECB4 thumb_func_start sub_809ED38 @@ -325386,7 +314890,7 @@ _0809ED98: sub_809EDA0: @ 809EDA0 lsls r0, 24 lsrs r0, 24 - ldr r2, _0809EDB4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -325395,7 +314899,7 @@ sub_809EDA0: @ 809EDA0 strh r0, [r1, 0x8] bx lr .align 2, 0 -_0809EDB4: .4byte 0x03005e00 + .pool thumb_func_end sub_809EDA0 thumb_func_start sub_809EDB8 @@ -325406,21 +314910,20 @@ sub_809EDB8: @ 809EDB8 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _0809EDE0 + ldr r5, =0x03005e08 adds r0, r4, r5 ldrb r0, [r0, 0x10] bl sub_809EBA0 bl sub_809EB8C subs r5, 0x8 adds r4, r5 - ldr r0, _0809EDE4 + ldr r0, =sub_809EDA0 + 1 str r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0809EDE0: .4byte 0x03005e08 -_0809EDE4: .4byte sub_809EDA0 + 1 + .pool thumb_func_end sub_809EDB8 thumb_func_start sub_809EDE8 @@ -325434,16 +314937,16 @@ sub_809EDE8: @ 809EDE8 lsls r0, r6, 2 adds r0, r6 lsls r7, r0, 3 - ldr r0, _0809EE2C + ldr r0, =0x03005e08 mov r8, r0 adds r5, r7, r0 ldrb r4, [r5, 0x4] lsls r0, r4, 1 adds r0, r4 lsls r0, 2 - ldr r1, _0809EE30 + ldr r1, =0x0851041c adds r2, r0, r1 - ldr r1, _0809EE34 + ldr r1, =0x030022c0 ldrh r3, [r1, 0x2E] movs r0, 0x2 ands r0, r3 @@ -325453,17 +314956,14 @@ sub_809EDE8: @ 809EDE8 mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, _0809EE38 + ldr r1, =sub_809EDB8 + 1 str r1, [r0] movs r0, 0 strh r0, [r5, 0x2] movs r0, 0x6 b _0809EE5C .align 2, 0 -_0809EE2C: .4byte 0x03005e08 -_0809EE30: .4byte 0x0851041c -_0809EE34: .4byte 0x030022c0 -_0809EE38: .4byte sub_809EDB8 + 1 + .pool _0809EE3C: movs r0, 0x10 ands r0, r3 @@ -325497,7 +314997,7 @@ _0809EE66: ands r0, r1 cmp r0, 0 beq _0809EEF4 - ldr r1, _0809EEA8 + ldr r1, =0x03005cf8 ldrh r0, [r5, 0x6] strh r0, [r1] ldrh r0, [r5, 0x8] @@ -325508,21 +315008,19 @@ _0809EE66: strb r0, [r1, 0x4] movs r0, 0x5 bl audio_play - ldr r1, _0809EEAC + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _0809EEB0 + ldr r1, =sub_809EDB8 + 1 str r1, [r0] strh r4, [r5, 0x2] movs r0, 0x6 strh r0, [r5, 0x4] b _0809EEF4 .align 2, 0 -_0809EEA8: .4byte 0x03005cf8 -_0809EEAC: .4byte 0x03005e00 -_0809EEB0: .4byte sub_809EDB8 + 1 + .pool _0809EEB4: ldrb r0, [r2] lsls r0, 1 @@ -325575,12 +315073,12 @@ sub_809EF00: @ 809EF00 lsls r6, r0, 2 add r6, r8 lsls r6, 3 - ldr r0, _0809EF78 + ldr r0, =0x03005e08 mov r9, r0 adds r5, r6, r0 movs r0, 0 strh r0, [r5] - ldr r1, _0809EF7C + ldr r1, =0x03005cf8 ldrh r0, [r1] strh r0, [r5, 0x6] movs r0, 0x2 @@ -325592,7 +315090,7 @@ sub_809EF00: @ 809EF00 movs r0, 0x4 ldrsb r0, [r1, r0] strh r0, [r5, 0xC] - ldr r0, _0809EF80 + ldr r0, =0x08510420 bl Window_AddFromTemplate strh r0, [r5, 0x10] lsls r0, 24 @@ -325611,7 +315109,7 @@ sub_809EF00: @ 809EF00 negs r0, r0 add r9, r0 add r6, r9 - ldr r0, _0809EF84 + ldr r0, =sub_809EDE8 + 1 str r0, [r6] add sp, 0x4 pop {r3,r4} @@ -325621,10 +315119,7 @@ sub_809EF00: @ 809EF00 pop {r0} bx r0 .align 2, 0 -_0809EF78: .4byte 0x03005e08 -_0809EF7C: .4byte 0x03005cf8 -_0809EF80: .4byte 0x08510420 -_0809EF84: .4byte sub_809EDE8 + 1 + .pool thumb_func_end sub_809EF00 thumb_func_start sub_809EF88 @@ -325641,11 +315136,11 @@ sub_809EF88: @ 809EF88 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _0809F030 + ldr r1, =0x040000d4 mov r0, sp str r0, [r1] str r2, [r1, 0x4] - ldr r0, _0809F034 + ldr r0, =0x81000200 str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r2, 0xC0 @@ -325656,7 +315151,7 @@ sub_809EF88: @ 809EF88 movs r6, 0 movs r5, 0x80 lsls r5, 5 - ldr r7, _0809F038 + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -325690,11 +315185,11 @@ _0809EFCA: bl clear_tasks bl sub_80A1A74 bl sub_809F048 - ldr r0, _0809F03C + ldr r0, =sub_809F0AC + 1 bl SetVBlankCallback - ldr r0, _0809F040 + ldr r0, =sub_809F090 + 1 bl set_callback2 - ldr r0, _0809F044 + ldr r0, =sub_809F200 + 1 movs r1, 0x50 bl AddTask add sp, 0x4 @@ -325702,12 +315197,7 @@ _0809EFCA: pop {r0} bx r0 .align 2, 0 -_0809F030: .4byte 0x040000d4 -_0809F034: .4byte 0x81000200 -_0809F038: .4byte 0x81000800 -_0809F03C: .4byte sub_809F0AC + 1 -_0809F040: .4byte sub_809F090 + 1 -_0809F044: .4byte sub_809F200 + 1 + .pool thumb_func_end sub_809EF88 thumb_func_start sub_809F048 @@ -325716,7 +315206,7 @@ sub_809F048: @ 809F048 bl clear_scheduled_bg_copies_to_vram movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0809F088 + ldr r1, =0x08510404 movs r0, 0 movs r2, 0x1 bl bg_vram_setup @@ -325728,15 +315218,14 @@ sub_809F048: @ 809F048 bl lcd_io_set movs r0, 0 bl gpu_sync_bg_show - ldr r0, _0809F08C + ldr r0, =0x08510408 bl Window_InitFromTemplates bl TextBox_ResetSomeField bl sub_81973A4 pop {r0} bx r0 .align 2, 0 -_0809F088: .4byte 0x08510404 -_0809F08C: .4byte 0x08510408 + .pool thumb_func_end sub_809F048 thumb_func_start sub_809F090 @@ -325799,7 +315288,7 @@ sub_809F0F8: @ 809F0F8 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _0809F118 + ldr r1, =0x03005e08 adds r6, r0, r1 movs r0, 0 ldrsh r5, [r6, r0] @@ -325809,7 +315298,7 @@ sub_809F0F8: @ 809F0F8 beq _0809F1B2 b _0809F1F8 .align 2, 0 -_0809F118: .4byte 0x03005e08 + .pool _0809F11C: movs r2, 0x85 lsls r2, 2 @@ -325817,7 +315306,7 @@ _0809F11C: movs r1, 0 movs r3, 0xE bl SetWindowBorderStyle - ldr r2, _0809F1CC + ldr r2, =0x085eca0d movs r0, 0x1 str r0, [sp] movs r4, 0xFF @@ -325827,7 +315316,7 @@ _0809F11C: movs r1, 0x1 movs r3, 0 bl Print - ldr r1, _0809F1D0 + ldr r1, =0x03005cf8 ldrh r3, [r1] ldrb r0, [r1, 0x2] str r0, [sp] @@ -325839,7 +315328,7 @@ _0809F11C: movs r1, 0 movs r2, 0x11 bl sub_809EBC4 - ldr r2, _0809F1D4 + ldr r2, =0x085eca22 movs r0, 0x21 str r0, [sp] str r4, [sp, 0x4] @@ -325848,7 +315337,7 @@ _0809F11C: movs r1, 0x1 movs r3, 0 bl Print - ldr r0, _0809F1D8 + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r1, 0 adds r0, 0xA0 @@ -325868,7 +315357,7 @@ _0809F11C: movs r1, 0 movs r2, 0x31 bl sub_809EBC4 - ldr r0, _0809F1DC + ldr r0, =0x085ec9ec bl sub_809F0C0 movs r0, 0 movs r1, 0x2 @@ -325879,7 +315368,7 @@ _0809F11C: adds r0, 0x1 strh r0, [r6] _0809F1B2: - ldr r0, _0809F1E0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -325890,12 +315379,7 @@ _0809F1B2: bl do_reset b _0809F1F8 .align 2, 0 -_0809F1CC: .4byte 0x085eca0d -_0809F1D0: .4byte 0x03005cf8 -_0809F1D4: .4byte 0x085eca22 -_0809F1D8: .4byte 0x03005d90 -_0809F1DC: .4byte 0x085ec9ec -_0809F1E0: .4byte 0x030022c0 + .pool _0809F1E4: movs r0, 0x1 ands r0, r1 @@ -325921,7 +315405,7 @@ sub_809F200: @ 809F200 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0809F228 + ldr r1, =0x03005e08 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -325930,13 +315414,12 @@ sub_809F200: @ 809F200 b _0809F404 _0809F21C: lsls r0, 2 - ldr r1, _0809F22C + ldr r1, =_0809F230 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809F228: .4byte 0x03005e08 -_0809F22C: .4byte _0809F230 + .pool .align 2, 0 _0809F230: .4byte _0809F24C @@ -325949,7 +315432,7 @@ _0809F230: _0809F24C: movs r0, 0x1 negs r0, r0 - ldr r1, _0809F264 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0x1 movs r2, 0x10 @@ -325959,9 +315442,9 @@ _0809F24C: strh r0, [r5] b _0809F404 .align 2, 0 -_0809F264: .4byte 0x0000ffff + .pool _0809F268: - ldr r0, _0809F290 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -325969,25 +315452,23 @@ _0809F268: beq _0809F276 b _0809F404 _0809F276: - ldr r0, _0809F294 + ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0 beq _0809F282 cmp r0, 0x2 bne _0809F29C _0809F282: - ldr r0, _0809F298 + ldr r0, =0x085ecaa7 bl sub_809F0C0 movs r0, 0x5 strh r0, [r5] b _0809F404 .align 2, 0 -_0809F290: .4byte 0x02037fd4 -_0809F294: .4byte 0x03006210 -_0809F298: .4byte 0x085ecaa7 + .pool _0809F29C: bl sub_802F588 - ldr r0, _0809F2B0 + ldr r0, =sub_809F0F8 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -325995,9 +315476,9 @@ _0809F29C: strh r0, [r5, 0x2] b _0809F334 .align 2, 0 -_0809F2B0: .4byte sub_809F0F8 + 1 + .pool _0809F2B4: - ldr r2, _0809F2FC + ldr r2, =0x03005e00 movs r0, 0x2 ldrsh r1, [r5, r0] lsls r0, r1, 2 @@ -326012,17 +315493,17 @@ _0809F2CA: movs r0, 0 movs r1, 0 bl sub_8198070 - ldr r0, _0809F300 + ldr r0, =0x085eca38 bl sub_809F0C0 - ldr r2, _0809F304 - ldr r0, _0809F308 + ldr r2, =0x03005cf8 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xA0 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r2] str r1, [r2, 0x4] - ldr r0, _0809F30C + ldr r0, =sub_809EF00 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -326032,13 +315513,9 @@ _0809F2CA: strh r0, [r5] b _0809F404 .align 2, 0 -_0809F2FC: .4byte 0x03005e00 -_0809F300: .4byte 0x085eca38 -_0809F304: .4byte 0x03005cf8 -_0809F308: .4byte 0x03005d90 -_0809F30C: .4byte sub_809EF00 + 1 + .pool _0809F310: - ldr r2, _0809F33C + ldr r2, =0x03005e00 movs r0, 0x2 ldrsh r1, [r5, r0] lsls r0, r1, 2 @@ -326060,12 +315537,12 @@ _0809F334: strh r0, [r5] b _0809F404 .align 2, 0 -_0809F33C: .4byte 0x03005e00 + .pool _0809F340: ldrb r0, [r5, 0x2] bl remove_task bl sub_802F3F8 - ldr r4, _0809F388 + ldr r4, =0x03005cf8 movs r1, 0 ldrsh r0, [r4, r1] movs r1, 0x2 @@ -326075,27 +315552,24 @@ _0809F340: movs r3, 0x4 ldrsb r3, [r4, r3] bl sub_802F5C8 - ldr r0, _0809F38C + ldr r0, =0x03005d90 ldr r2, [r0] adds r2, 0xA0 ldr r0, [r4] ldr r1, [r4, 0x4] str r0, [r2] str r1, [r2, 0x4] - ldr r0, _0809F390 + ldr r0, =0x00004040 ldrh r1, [r4] bl var_set bl sub_809D5D8 - ldr r0, _0809F394 + ldr r0, =0x085eca4f bl sub_809F0C0 movs r0, 0x4 strh r0, [r5] b _0809F404 .align 2, 0 -_0809F388: .4byte 0x03005cf8 -_0809F38C: .4byte 0x03005d90 -_0809F390: .4byte 0x00004040 -_0809F394: .4byte 0x085eca4f + .pool _0809F398: movs r0, 0 bl save_game_when_memory_present @@ -326103,15 +315577,15 @@ _0809F398: lsrs r0, 24 cmp r0, 0x1 bne _0809F3B8 - ldr r0, _0809F3B4 + ldr r0, =0x085eca8a bl sub_809F0C0 movs r0, 0x49 bl audio_play b _0809F3C4 .align 2, 0 -_0809F3B4: .4byte 0x085eca8a + .pool _0809F3B8: - ldr r0, _0809F40C + ldr r0, =0x085eca9a bl sub_809F0C0 movs r0, 0x16 bl audio_play @@ -326119,7 +315593,7 @@ _0809F3C4: movs r0, 0x5 strh r0, [r5] _0809F3C8: - ldr r0, _0809F410 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -326127,7 +315601,7 @@ _0809F3C8: beq _0809F404 movs r0, 0x1 negs r0, r0 - ldr r1, _0809F414 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0x1 movs r2, 0 @@ -326136,7 +315610,7 @@ _0809F3C8: movs r0, 0x6 strh r0, [r5] _0809F3EA: - ldr r0, _0809F418 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -326152,33 +315626,29 @@ _0809F404: pop {r0} bx r0 .align 2, 0 -_0809F40C: .4byte 0x085eca9a -_0809F410: .4byte 0x030022c0 -_0809F414: .4byte 0x0000ffff -_0809F418: .4byte 0x02037fd4 + .pool thumb_func_end sub_809F200 thumb_func_start sub_809F41C sub_809F41C: @ 809F41C push {lr} - ldr r0, _0809F438 + ldr r0, =0x00000861 bl flag_set movs r0, 0x86 lsls r0, 4 bl flag_set - ldr r0, _0809F43C + ldr r0, =0x00000862 bl flag_set pop {r0} bx r0 .align 2, 0 -_0809F438: .4byte 0x00000861 -_0809F43C: .4byte 0x00000862 + .pool thumb_func_end sub_809F41C thumb_func_start start_menu_compose start_menu_compose: @ 809F440 push {lr} - ldr r0, _0809F458 + ldr r0, =0x0203760f movs r1, 0 strb r1, [r0] bl is_c1_link_related_active @@ -326187,7 +315657,7 @@ start_menu_compose: @ 809F440 bl sub_809F568 b _0809F4AC .align 2, 0 -_0809F458: .4byte 0x0203760f + .pool _0809F45C: bl in_trade_center cmp r0, 0x1 @@ -326234,20 +315704,19 @@ sub_809F4B0: @ 809F4B0 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _0809F4C4 - ldr r1, _0809F4C8 + ldr r0, =0x02037610 + ldr r1, =0x0203760f bl append_byte pop {r0} bx r0 .align 2, 0 -_0809F4C4: .4byte 0x02037610 -_0809F4C8: .4byte 0x0203760f + .pool thumb_func_end sub_809F4B0 thumb_func_start sub_809F4CC sub_809F4CC: @ 809F4CC push {lr} - ldr r0, _0809F530 + ldr r0, =0x00000861 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -326268,7 +315737,7 @@ _0809F4E2: _0809F4F8: movs r0, 0x2 bl sub_809F4B0 - ldr r0, _0809F534 + ldr r0, =0x00000862 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -326288,8 +315757,7 @@ _0809F512: pop {r0} bx r0 .align 2, 0 -_0809F530: .4byte 0x00000861 -_0809F534: .4byte 0x00000862 + .pool thumb_func_end sub_809F4CC thumb_func_start sub_809F538 @@ -326320,7 +315788,7 @@ sub_809F568: @ 809F568 bl sub_809F4B0 movs r0, 0x2 bl sub_809F4B0 - ldr r0, _0809F5A0 + ldr r0, =0x00000862 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -326338,7 +315806,7 @@ _0809F58A: pop {r0} bx r0 .align 2, 0 -_0809F5A0: .4byte 0x00000862 + .pool thumb_func_end sub_809F568 thumb_func_start sub_809F5A4 @@ -326348,7 +315816,7 @@ sub_809F5A4: @ 809F5A4 bl sub_809F4B0 movs r0, 0x2 bl sub_809F4B0 - ldr r0, _0809F5DC + ldr r0, =0x00000862 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -326366,7 +315834,7 @@ _0809F5C6: pop {r0} bx r0 .align 2, 0 -_0809F5DC: .4byte 0x00000862 + .pool thumb_func_end sub_809F5A4 thumb_func_start sub_809F5E0 @@ -326426,8 +315894,8 @@ sub_809F634: @ 809F634 sub_809F654: @ 809F654 push {r4,r5,lr} sub sp, 0xC - ldr r4, _0809F6B0 - ldr r0, _0809F6B4 + ldr r4, =0x0203760c + ldr r0, =0x08510508 bl Window_AddFromTemplate strb r0, [r4] ldrb r0, [r4] @@ -326435,14 +315903,14 @@ sub_809F654: @ 809F654 ldrb r0, [r4] movs r1, 0 bl sub_81973FC - ldr r0, _0809F6B8 - ldr r1, _0809F6BC + ldr r0, =0x02021cc4 + ldr r1, =0x0203a04c ldrb r1, [r1] movs r2, 0x1 movs r3, 0x2 bl decimal_int_to_string - ldr r5, _0809F6C0 - ldr r1, _0809F6C4 + ldr r5, =0x02021fc4 + ldr r1, =0x085ee6ff adds r0, r5, 0 bl ExpandTextCodes ldrb r0, [r4] @@ -326464,58 +315932,50 @@ sub_809F654: @ 809F654 pop {r0} bx r0 .align 2, 0 -_0809F6B0: .4byte 0x0203760c -_0809F6B4: .4byte 0x08510508 -_0809F6B8: .4byte 0x02021cc4 -_0809F6BC: .4byte 0x0203a04c -_0809F6C0: .4byte 0x02021fc4 -_0809F6C4: .4byte 0x085ee6ff + .pool thumb_func_end sub_809F654 thumb_func_start sub_809F6C8 sub_809F6C8: @ 809F6C8 push {r4,r5,lr} sub sp, 0xC - ldr r0, _0809F6E0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0809F6E4 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] cmp r0, 0x7 bne _0809F6F0 - ldr r4, _0809F6E8 - ldr r0, _0809F6EC + ldr r4, =0x0203760d + ldr r0, =0x08510538 b _0809F6F4 .align 2, 0 -_0809F6E0: .4byte 0x03005d90 -_0809F6E4: .4byte 0x00000cb2 -_0809F6E8: .4byte 0x0203760d -_0809F6EC: .4byte 0x08510538 + .pool _0809F6F0: - ldr r4, _0809F754 - ldr r0, _0809F758 + ldr r4, =0x0203760d + ldr r0, =0x08510530 _0809F6F4: bl Window_AddFromTemplate strb r0, [r4] - ldr r4, _0809F754 + ldr r4, =0x0203760d ldrb r0, [r4] bl Window_WriteStandardTileMap ldrb r0, [r4] movs r1, 0 bl sub_81973FC - ldr r0, _0809F75C - ldr r2, _0809F760 - ldr r1, _0809F764 + ldr r0, =0x02021cc4 + ldr r2, =0x08510510 + ldr r1, =0x03005d90 ldr r1, [r1] - ldr r3, _0809F768 + ldr r3, =0x00000cb2 adds r1, r3 ldrh r1, [r1] lsls r1, 2 adds r1, r2 ldr r1, [r1] bl gf_strcpy - ldr r5, _0809F76C - ldr r1, _0809F770 + ldr r5, =0x02021fc4 + ldr r1, =0x085ee716 adds r0, r5, 0 bl ExpandTextCodes ldrb r0, [r4] @@ -326537,14 +315997,7 @@ _0809F6F4: pop {r0} bx r0 .align 2, 0 -_0809F754: .4byte 0x0203760d -_0809F758: .4byte 0x08510530 -_0809F75C: .4byte 0x02021cc4 -_0809F760: .4byte 0x08510510 -_0809F764: .4byte 0x03005d90 -_0809F768: .4byte 0x00000cb2 -_0809F76C: .4byte 0x02021fc4 -_0809F770: .4byte 0x085ee716 + .pool thumb_func_end sub_809F6C8 thumb_func_start sub_809F774 @@ -326553,7 +316006,7 @@ sub_809F774: @ 809F774 bl flag_check_is_in_safari_zone cmp r0, 0 beq _0809F796 - ldr r4, _0809F7B8 + ldr r4, =0x0203760c ldrb r0, [r4] movs r1, 0 bl sub_8198070 @@ -326567,7 +316020,7 @@ _0809F796: lsls r0, 24 cmp r0, 0 beq _0809F7B0 - ldr r4, _0809F7BC + ldr r4, =0x0203760d ldrb r0, [r4] movs r1, 0 bl sub_8198070 @@ -326578,8 +316031,7 @@ _0809F7B0: pop {r0} bx r0 .align 2, 0 -_0809F7B8: .4byte 0x0203760c -_0809F7BC: .4byte 0x0203760d + .pool thumb_func_end sub_809F774 thumb_func_start sub_809F7C0 @@ -326593,12 +316045,12 @@ sub_809F7C0: @ 809F7C0 mov r8, r0 adds r6, r1, 0 ldrb r2, [r0] - ldr r0, _0809F818 + ldr r0, =0x08510540 mov r9, r0 - ldr r1, _0809F81C + ldr r1, =0x02021fc4 mov r10, r1 _0809F7DA: - ldr r0, _0809F820 + ldr r0, =0x02037610 lsls r2, 24 asrs r4, r2, 24 adds r5, r4, r0 @@ -326608,7 +316060,7 @@ _0809F7DA: adds r0, 0x4 adds r0, r3, r0 ldr r1, [r0] - ldr r0, _0809F824 + ldr r0, =sub_809FC8C + 1 adds r7, r2, 0 cmp r1, r0 bne _0809F828 @@ -326627,10 +316079,7 @@ _0809F7DA: bl sub_819A024 b _0809F858 .align 2, 0 -_0809F818: .4byte 0x08510540 -_0809F81C: .4byte 0x02021fc4 -_0809F820: .4byte 0x02037610 -_0809F824: .4byte sub_809FC8C + 1 + .pool _0809F828: mov r1, r9 adds r0, r3, r1 @@ -326659,7 +316108,7 @@ _0809F858: adds r1, r7, r0 lsrs r2, r1, 24 asrs r1, 24 - ldr r0, _0809F878 + ldr r0, =0x0203760f ldrb r0, [r0] cmp r1, r0 bge _0809F87C @@ -326671,7 +316120,7 @@ _0809F858: movs r0, 0 b _0809F882 .align 2, 0 -_0809F878: .4byte 0x0203760f + .pool _0809F87C: mov r0, r8 strb r2, [r0] @@ -326691,20 +316140,19 @@ _0809F882: sub_809F894: @ 809F894 push {r4,lr} sub sp, 0xC - ldr r0, _0809F8B0 + ldr r0, =0x02037619 movs r1, 0 ldrsb r1, [r0, r1] adds r2, r0, 0 cmp r1, 0x5 bhi _0809F98C lsls r0, r1, 2 - ldr r1, _0809F8B4 + ldr r1, =_0809F8B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0809F8B0: .4byte 0x02037619 -_0809F8B4: .4byte _0809F8B8 + .pool .align 2, 0 _0809F8B8: .4byte _0809F8D0 @@ -326720,26 +316168,25 @@ _0809F8D0: b _0809F98C _0809F8D8: bl start_menu_compose - ldr r1, _0809F8E0 + ldr r1, =0x02037619 b _0809F940 .align 2, 0 -_0809F8E0: .4byte 0x02037619 + .pool _0809F8E4: bl sub_81973A4 - ldr r0, _0809F904 + ldr r0, =0x0203760f ldrb r0, [r0] bl sub_81979C4 lsls r0, 24 lsrs r0, 24 movs r1, 0 bl sub_81973FC - ldr r1, _0809F908 + ldr r1, =0x02037619 movs r0, 0 strb r0, [r1, 0x1] b _0809F940 .align 2, 0 -_0809F904: .4byte 0x0203760f -_0809F908: .4byte 0x02037619 + .pool _0809F90C: bl flag_check_is_in_safari_zone cmp r0, 0 @@ -326752,12 +316199,12 @@ _0809F918: beq _0809F926 bl sub_809F6C8 _0809F926: - ldr r1, _0809F92C + ldr r1, =0x02037619 b _0809F940 .align 2, 0 -_0809F92C: .4byte 0x02037619 + .pool _0809F930: - ldr r4, _0809F948 + ldr r4, =0x0203761a adds r0, r4, 0 movs r1, 0x2 bl sub_809F7C0 @@ -326770,17 +316217,17 @@ _0809F940: strb r0, [r1] b _0809F98C .align 2, 0 -_0809F948: .4byte 0x0203761a + .pool _0809F94C: bl sub_8197A08 lsls r0, 24 lsrs r0, 24 movs r1, 0x10 str r1, [sp] - ldr r1, _0809F984 + ldr r1, =0x0203760f ldrb r1, [r1] str r1, [sp, 0x4] - ldr r4, _0809F988 + ldr r4, =0x0203760e ldrb r1, [r4] str r1, [sp, 0x8] movs r1, 0x1 @@ -326796,8 +316243,7 @@ _0809F94C: movs r0, 0x1 b _0809F98E .align 2, 0 -_0809F984: .4byte 0x0203760f -_0809F988: .4byte 0x0203760e + .pool _0809F98C: movs r0, 0 _0809F98E: @@ -326810,7 +316256,7 @@ _0809F98E: thumb_func_start sub_809F998 sub_809F998: @ 809F998 push {lr} - ldr r1, _0809F9B0 + ldr r1, =0x02037619 movs r0, 0 strb r0, [r1] strb r0, [r1, 0x1] @@ -326821,7 +316267,7 @@ _0809F9A2: pop {r0} bx r0 .align 2, 0 -_0809F9B0: .4byte 0x02037619 + .pool thumb_func_end sub_809F998 thumb_func_start task50_startmenu @@ -326844,11 +316290,11 @@ _0809F9C8: sub_809F9D0: @ 809F9D0 push {r4,r5,lr} adds r5, r0, 0 - ldr r1, _0809F9F8 + ldr r1, =0x02037619 movs r0, 0 strb r0, [r1] strb r0, [r1, 0x1] - ldr r4, _0809F9FC + ldr r4, =task50_startmenu + 1 adds r0, r4, 0 movs r1, 0x50 bl AddTask @@ -326861,8 +316307,7 @@ sub_809F9D0: @ 809F9D0 pop {r0} bx r0 .align 2, 0 -_0809F9F8: .4byte 0x02037619 -_0809F9FC: .4byte task50_startmenu + 1 + .pool thumb_func_end sub_809F9D0 thumb_func_start sub_809FA00 @@ -326883,18 +316328,16 @@ _0809FA14: thumb_func_start sub_809FA18 sub_809FA18: @ 809FA18 - ldr r1, _0809FA28 + ldr r1, =0x02037619 movs r0, 0 strb r0, [r1] strb r0, [r1, 0x1] - ldr r1, _0809FA2C - ldr r0, _0809FA30 + ldr r1, =0x03005db0 + ldr r0, =sub_809FA00 + 1 str r0, [r1] bx lr .align 2, 0 -_0809FA28: .4byte 0x02037619 -_0809FA2C: .4byte 0x03005db0 -_0809FA30: .4byte sub_809FA00 + 1 + .pool thumb_func_end sub_809FA18 thumb_func_start sub_809FA34 @@ -326905,7 +316348,7 @@ sub_809FA34: @ 809FA34 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0809FA54 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -326915,25 +316358,24 @@ sub_809FA34: @ 809FA34 beq _0809FA7C b _0809FA92 .align 2, 0 -_0809FA54: .4byte 0x03005e00 + .pool _0809FA58: bl in_trade_center cmp r0, 0x1 bne _0809FA64 bl var_800D_set_xB _0809FA64: - ldr r1, _0809FA74 - ldr r0, _0809FA78 + ldr r1, =0x03005df4 + ldr r0, =sub_809FAC4 + 1 str r0, [r1] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] b _0809FA92 .align 2, 0 -_0809FA74: .4byte 0x03005df4 -_0809FA78: .4byte sub_809FAC4 + 1 + .pool _0809FA7C: - ldr r0, _0809FA98 + ldr r0, =0x03005df4 ldr r0, [r0] bl _call_via_r0 lsls r0, 24 @@ -326947,7 +316389,7 @@ _0809FA92: pop {r0} bx r0 .align 2, 0 -_0809FA98: .4byte 0x03005df4 + .pool thumb_func_end sub_809FA34 thumb_func_start sub_809FA9C @@ -326960,19 +316402,19 @@ sub_809FA9C: @ 809FA9C bl sub_808B864 bl sub_808BCF4 _0809FAB2: - ldr r0, _0809FAC0 + ldr r0, =sub_809FA34 + 1 bl sub_809F9D0 bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_0809FAC0: .4byte sub_809FA34 + 1 + .pool thumb_func_end sub_809FA9C thumb_func_start sub_809FAC4 sub_809FAC4: @ 809FAC4 push {r4,lr} - ldr r4, _0809FB70 + ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r0, 0x40 ands r0, r1 @@ -326983,7 +316425,7 @@ sub_809FAC4: @ 809FAC4 movs r0, 0x1 negs r0, r0 bl MoveMenuCursor - ldr r1, _0809FB74 + ldr r1, =0x0203760e strb r0, [r1] _0809FAE4: ldrh r1, [r4, 0x2E] @@ -326995,7 +316437,7 @@ _0809FAE4: bl audio_play movs r0, 0x1 bl MoveMenuCursor - ldr r1, _0809FB74 + ldr r1, =0x0203760e strb r0, [r1] _0809FAFE: ldrh r1, [r4, 0x2E] @@ -327005,9 +316447,9 @@ _0809FAFE: beq _0809FB98 movs r0, 0x5 bl audio_play - ldr r1, _0809FB78 - ldr r2, _0809FB7C - ldr r0, _0809FB74 + ldr r1, =0x08510540 + ldr r2, =0x02037610 + ldr r0, =0x0203760e ldrb r0, [r0] adds r0, r2 ldrb r0, [r0] @@ -327015,7 +316457,7 @@ _0809FAFE: adds r1, 0x4 adds r0, r1 ldr r1, [r0] - ldr r0, _0809FB80 + ldr r0, =sm_pokedex + 1 cmp r1, r0 bne _0809FB34 movs r0, 0 @@ -327024,10 +316466,10 @@ _0809FAFE: cmp r0, 0 beq _0809FBA0 _0809FB34: - ldr r3, _0809FB84 - ldr r1, _0809FB78 - ldr r2, _0809FB7C - ldr r0, _0809FB74 + ldr r3, =0x03005df4 + ldr r1, =0x08510540 + ldr r2, =0x02037610 + ldr r0, =0x0203760e ldrb r0, [r0] adds r0, r2 ldrb r0, [r0] @@ -327036,16 +316478,16 @@ _0809FB34: adds r0, r1 ldr r1, [r0] str r1, [r3] - ldr r0, _0809FB88 + ldr r0, =sub_809FCFC + 1 cmp r1, r0 beq _0809FBA0 - ldr r0, _0809FB8C + ldr r0, =sub_809FD64 + 1 cmp r1, r0 beq _0809FBA0 - ldr r0, _0809FB90 + ldr r0, =sub_809FD74 + 1 cmp r1, r0 beq _0809FBA0 - ldr r0, _0809FB94 + ldr r0, =sub_809FDC0 + 1 cmp r1, r0 beq _0809FBA0 movs r0, 0x1 @@ -327053,16 +316495,7 @@ _0809FB34: bl fade_screen b _0809FBA0 .align 2, 0 -_0809FB70: .4byte 0x030022c0 -_0809FB74: .4byte 0x0203760e -_0809FB78: .4byte 0x08510540 -_0809FB7C: .4byte 0x02037610 -_0809FB80: .4byte sm_pokedex + 1 -_0809FB84: .4byte 0x03005df4 -_0809FB88: .4byte sub_809FCFC + 1 -_0809FB8C: .4byte sub_809FD64 + 1 -_0809FB90: .4byte sub_809FD74 + 1 -_0809FB94: .4byte sub_809FDC0 + 1 + .pool _0809FB98: movs r0, 0xA ands r0, r1 @@ -327084,7 +316517,7 @@ _0809FBAE: thumb_func_start sm_pokedex sm_pokedex: @ 809FBB4 push {lr} - ldr r0, _0809FBC8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -327093,27 +316526,27 @@ sm_pokedex: @ 809FBB4 movs r0, 0 b _0809FBE6 .align 2, 0 -_0809FBC8: .4byte 0x02037fd4 + .pool _0809FBCC: movs r0, 0x29 bl sav12_xor_increment bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, _0809FBEC + ldr r0, =sub_80BB534 + 1 bl set_callback2 movs r0, 0x1 _0809FBE6: pop {r1} bx r1 .align 2, 0 -_0809FBEC: .4byte sub_80BB534 + 1 + .pool thumb_func_end sm_pokedex thumb_func_start sub_809FBF0 sub_809FBF0: @ 809FBF0 push {lr} - ldr r0, _0809FC04 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -327122,25 +316555,25 @@ sub_809FBF0: @ 809FBF0 movs r0, 0 b _0809FC1C .align 2, 0 -_0809FC04: .4byte 0x02037fd4 + .pool _0809FC08: bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, _0809FC20 + ldr r0, =sub_81B7F34 + 1 bl set_callback2 movs r0, 0x1 _0809FC1C: pop {r1} bx r1 .align 2, 0 -_0809FC20: .4byte sub_81B7F34 + 1 + .pool thumb_func_end sub_809FBF0 thumb_func_start sub_809FC24 sub_809FC24: @ 809FC24 push {lr} - ldr r0, _0809FC38 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -327149,25 +316582,25 @@ sub_809FC24: @ 809FC24 movs r0, 0 b _0809FC50 .align 2, 0 -_0809FC38: .4byte 0x02037fd4 + .pool _0809FC3C: bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, _0809FC54 + ldr r0, =c2_bag + 1 bl set_callback2 movs r0, 0x1 _0809FC50: pop {r1} bx r1 .align 2, 0 -_0809FC54: .4byte c2_bag + 1 + .pool thumb_func_end sub_809FC24 thumb_func_start sub_809FC58 sub_809FC58: @ 809FC58 push {lr} - ldr r0, _0809FC6C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -327176,25 +316609,25 @@ sub_809FC58: @ 809FC58 movs r0, 0 b _0809FC84 .align 2, 0 -_0809FC6C: .4byte 0x02037fd4 + .pool _0809FC70: bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, _0809FC88 + ldr r0, =sub_81C7250 + 1 bl set_callback2 movs r0, 0x1 _0809FC84: pop {r1} bx r1 .align 2, 0 -_0809FC88: .4byte sub_81C7250 + 1 + .pool thumb_func_end sub_809FC58 thumb_func_start sub_809FC8C sub_809FC8C: @ 809FC8C push {lr} - ldr r0, _0809FCC0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -327210,32 +316643,30 @@ sub_809FC8C: @ 809FC8C cmp r0, 0 beq _0809FCC8 _0809FCB6: - ldr r0, _0809FCC4 + ldr r0, =sub_8086194 + 1 bl sub_80C4DDC b _0809FCEA .align 2, 0 -_0809FCC0: .4byte 0x02037fd4 -_0809FCC4: .4byte sub_8086194 + 1 + .pool _0809FCC8: - ldr r0, _0809FCDC + ldr r0, =0x000008d2 bl flag_check lsls r0, 24 cmp r0, 0 beq _0809FCE4 - ldr r0, _0809FCE0 + ldr r0, =sub_8086194 + 1 bl sub_80C51C4 b _0809FCEA .align 2, 0 -_0809FCDC: .4byte 0x000008d2 -_0809FCE0: .4byte sub_8086194 + 1 + .pool _0809FCE4: - ldr r0, _0809FCF0 + ldr r0, =sub_8086194 + 1 bl sub_80C4DDC _0809FCEA: movs r0, 0x1 b _0809FCF6 .align 2, 0 -_0809FCF0: .4byte sub_8086194 + 1 + .pool _0809FCF4: movs r0, 0 _0809FCF6: @@ -327252,21 +316683,20 @@ sub_809FCFC: @ 809FCFC beq _0809FD0C bl sub_809F774 _0809FD0C: - ldr r1, _0809FD18 - ldr r0, _0809FD1C + ldr r1, =0x03005df4 + ldr r0, =sub_809FE28 + 1 str r0, [r1] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_0809FD18: .4byte 0x03005df4 -_0809FD1C: .4byte sub_809FE28 + 1 + .pool thumb_func_end sub_809FCFC thumb_func_start sub_809FD20 sub_809FD20: @ 809FD20 push {lr} - ldr r0, _0809FD34 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -327275,24 +316705,22 @@ sub_809FD20: @ 809FD20 movs r0, 0 b _0809FD52 .align 2, 0 -_0809FD34: .4byte 0x02037fd4 + .pool _0809FD38: bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, _0809FD58 + ldr r0, =c2_options_menu + 1 bl set_callback2 - ldr r1, _0809FD5C - ldr r0, _0809FD60 + ldr r1, =0x030022c0 + ldr r0, =sub_8086194 + 1 str r0, [r1, 0x8] movs r0, 0x1 _0809FD52: pop {r1} bx r1 .align 2, 0 -_0809FD58: .4byte c2_options_menu + 1 -_0809FD5C: .4byte 0x030022c0 -_0809FD60: .4byte sub_8086194 + 1 + .pool thumb_func_end sub_809FD20 thumb_func_start sub_809FD64 @@ -327319,7 +316747,7 @@ sub_809FD74: @ 809FD74 thumb_func_start sub_809FD88 sub_809FD88: @ 809FD88 push {lr} - ldr r0, _0809FD9C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -327328,33 +316756,31 @@ sub_809FD88: @ 809FD88 movs r0, 0 b _0809FDB4 .align 2, 0 -_0809FD9C: .4byte 0x02037fd4 + .pool _0809FDA0: bl play_some_sound bl overworld_free_bg_tilemaps - ldr r0, _0809FDB8 + ldr r0, =0x03005db4 ldrb r0, [r0] - ldr r1, _0809FDBC + ldr r1, =sub_8086194 + 1 bl sub_80C4E74 movs r0, 0x1 _0809FDB4: pop {r1} bx r1 .align 2, 0 -_0809FDB8: .4byte 0x03005db4 -_0809FDBC: .4byte sub_8086194 + 1 + .pool thumb_func_end sub_809FD88 thumb_func_start sub_809FDC0 sub_809FDC0: @ 809FDC0 - ldr r1, _0809FDCC - ldr r0, _0809FDD0 + ldr r1, =0x03005df4 + ldr r0, =sub_809FE9C + 1 str r0, [r1] movs r0, 0 bx lr .align 2, 0 -_0809FDCC: .4byte 0x03005df4 -_0809FDD0: .4byte sub_809FE9C + 1 + .pool thumb_func_end sub_809FDC0 thumb_func_start atk17_seteffectuser @@ -327364,19 +316790,19 @@ atk17_seteffectuser: @ 809FDD4 movs r1, 0 bl sub_8197DF8 bl sub_80984F4 - ldr r0, _0809FDF0 + ldr r0, =sub_809FA34 + 1 bl sub_809F9D0 bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_0809FDF0: .4byte sub_809FA34 + 1 + .pool thumb_func_end atk17_seteffectuser thumb_func_start sub_809FDF4 sub_809FDF4: @ 809FDF4 push {lr} - ldr r0, _0809FE08 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -327385,34 +316811,33 @@ sub_809FDF4: @ 809FDF4 movs r0, 0 b _0809FE20 .align 2, 0 -_0809FE08: .4byte 0x02037fd4 + .pool _0809FE0C: bl play_some_sound bl sub_809F774 bl overworld_free_bg_tilemaps - ldr r0, _0809FE24 + ldr r0, =sub_81C4EFC + 1 bl set_callback2 movs r0, 0x1 _0809FE20: pop {r1} bx r1 .align 2, 0 -_0809FE24: .4byte sub_81C4EFC + 1 + .pool thumb_func_end sub_809FDF4 thumb_func_start sub_809FE28 sub_809FE28: @ 809FE28 push {lr} bl sub_809FF28 - ldr r1, _0809FE3C - ldr r0, _0809FE40 + ldr r1, =0x03005df4 + ldr r0, =sub_809FE44 + 1 str r0, [r1] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_0809FE3C: .4byte 0x03005df4 -_0809FE40: .4byte sub_809FE44 + 1 + .pool thumb_func_end sub_809FE28 thumb_func_start sub_809FE44 @@ -327435,13 +316860,12 @@ _0809FE60: movs r1, 0 bl sub_8197DF8 bl sub_809F998 - ldr r1, _0809FE74 - ldr r0, _0809FE78 + ldr r1, =0x03005df4 + ldr r0, =sub_809FAC4 + 1 str r0, [r1] b _0809FE94 .align 2, 0 -_0809FE74: .4byte 0x03005df4 -_0809FE78: .4byte sub_809FAC4 + 1 + .pool _0809FE7C: movs r0, 0 movs r1, 0x1 @@ -327462,30 +316886,28 @@ _0809FE96: sub_809FE9C: @ 809FE9C push {lr} bl sub_80A0340 - ldr r1, _0809FEB0 - ldr r0, _0809FEB4 + ldr r1, =0x03005df4 + ldr r0, =sub_809FED4 + 1 str r0, [r1] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_0809FEB0: .4byte 0x03005df4 -_0809FEB4: .4byte sub_809FED4 + 1 + .pool thumb_func_end sub_809FE9C thumb_func_start sub_809FEB8 sub_809FEB8: @ 809FEB8 push {lr} bl sub_809F998 - ldr r1, _0809FECC - ldr r0, _0809FED0 + ldr r1, =0x03005df4 + ldr r0, =sub_809FAC4 + 1 str r0, [r1] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_0809FECC: .4byte 0x03005df4 -_0809FED0: .4byte sub_809FAC4 + 1 + .pool thumb_func_end sub_809FEB8 thumb_func_start sub_809FED4 @@ -327503,25 +316925,24 @@ sub_809FED4: @ 809FED4 b _0809FF20 _0809FEEC: bl sub_809F774 - ldr r1, _0809FEF8 - ldr r0, _0809FEFC + ldr r1, =0x03005df4 + ldr r0, =sub_809FEB8 + 1 str r0, [r1] b _0809FF20 .align 2, 0 -_0809FEF8: .4byte 0x03005df4 -_0809FEFC: .4byte sub_809FEB8 + 1 + .pool _0809FF00: movs r0, 0 movs r1, 0x1 bl sub_8197DF8 bl sub_80984F4 bl script_env_2_disable - ldr r0, _0809FF1C + ldr r0, =0x08252c88 bl script_env_1_execute_new_script movs r0, 0x1 b _0809FF22 .align 2, 0 -_0809FF1C: .4byte 0x08252c88 + .pool _0809FF20: movs r0, 0 _0809FF22: @@ -327533,18 +316954,16 @@ _0809FF22: sub_809FF28: @ 809FF28 push {lr} bl save_serialize_map - ldr r1, _0809FF40 - ldr r0, _0809FF44 + ldr r1, =0x0203761c + ldr r0, =sub_80A00A0 + 1 str r0, [r1] - ldr r1, _0809FF48 + ldr r1, =0x02037621 movs r0, 0 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_0809FF40: .4byte 0x0203761c -_0809FF44: .4byte sub_80A00A0 + 1 -_0809FF48: .4byte 0x02037621 + .pool thumb_func_end sub_809FF28 thumb_func_start sub_809FF4C @@ -327555,18 +316974,17 @@ sub_809FF4C: @ 809FF4C lsrs r0, 16 cmp r0, 0x1 beq _0809FF78 - ldr r1, _0809FF70 + ldr r1, =0x02037621 movs r0, 0 strb r0, [r1] - ldr r0, _0809FF74 + ldr r0, =0x0203761c ldr r0, [r0] bl _call_via_r0 lsls r0, 24 lsrs r0, 24 b _0809FF7A .align 2, 0 -_0809FF70: .4byte 0x02037621 -_0809FF74: .4byte 0x0203761c + .pool _0809FF78: movs r0, 0 _0809FF7A: @@ -327578,13 +316996,13 @@ _0809FF7A: sub_809FF80: @ 809FF80 push {lr} bl sub_809FF28 - ldr r0, _0809FF94 + ldr r0, =task50_save_game + 1 movs r1, 0x50 bl AddTask pop {r0} bx r0 .align 2, 0 -_0809FF94: .4byte task50_save_game + 1 + .pool thumb_func_end sub_809FF80 thumb_func_start sub_809FF98 @@ -327592,7 +317010,7 @@ sub_809FF98: @ 809FF98 push {r4,lr} adds r2, r0, 0 adds r4, r1, 0 - ldr r0, _0809FFC4 + ldr r0, =0x02021fc4 adds r1, r2, 0 bl ExpandTextCodes movs r0, 0 @@ -327600,18 +317018,16 @@ sub_809FF98: @ 809FF98 bl sub_819786C movs r0, 0x1 bl sub_8197310 - ldr r1, _0809FFC8 + ldr r1, =0x02037621 movs r0, 0x1 strb r0, [r1] - ldr r0, _0809FFCC + ldr r0, =0x0203761c str r4, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0809FFC4: .4byte 0x02021fc4 -_0809FFC8: .4byte 0x02037621 -_0809FFCC: .4byte 0x0203761c + .pool thumb_func_end sub_809FF98 thumb_func_start task50_save_game @@ -327632,14 +317048,14 @@ task50_save_game: @ 809FFD0 _0809FFEC: cmp r1, 0x3 bgt _080A0000 - ldr r1, _0809FFF8 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] b _080A0000 .align 2, 0 -_0809FFF8: .4byte 0x020375f0 + .pool _0809FFFC: - ldr r0, _080A0010 + ldr r0, =0x020375f0 strh r1, [r0] _080A0000: adds r0, r4, 0 @@ -327650,7 +317066,7 @@ _080A000A: pop {r0} bx r0 .align 2, 0 -_080A0010: .4byte 0x020375f0 + .pool thumb_func_end task50_save_game thumb_func_start sub_80A0014 @@ -327673,22 +317089,22 @@ sub_80A0024: @ 80A0024 thumb_func_start sub_80A0030 sub_80A0030: @ 80A0030 - ldr r1, _080A0038 + ldr r1, =0x02037620 movs r0, 0x3C strb r0, [r1] bx lr .align 2, 0 -_080A0038: .4byte 0x02037620 + .pool thumb_func_end sub_80A0030 thumb_func_start sub_80A003C sub_80A003C: @ 80A003C push {lr} - ldr r1, _080A005C + ldr r1, =0x02037620 ldrb r0, [r1] subs r2, r0, 0x1 strb r2, [r1] - ldr r0, _080A0060 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x1 ands r0, r1 @@ -327700,8 +317116,7 @@ sub_80A003C: @ 80A003C movs r0, 0 b _080A006C .align 2, 0 -_080A005C: .4byte 0x02037620 -_080A0060: .4byte 0x030022c0 + .pool _080A0064: movs r0, 0x5 bl audio_play @@ -327715,11 +317130,11 @@ _080A006C: thumb_func_start sub_80A0070 sub_80A0070: @ 80A0070 push {lr} - ldr r1, _080A008C + ldr r1, =0x02037620 ldrb r0, [r1] cmp r0, 0 bne _080A0094 - ldr r0, _080A0090 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x1 ands r0, r1 @@ -327728,8 +317143,7 @@ sub_80A0070: @ 80A0070 movs r0, 0x1 b _080A009A .align 2, 0 -_080A008C: .4byte 0x02037620 -_080A0090: .4byte 0x030022c0 + .pool _080A0094: subs r0, 0x1 strb r0, [r1] @@ -327754,39 +317168,36 @@ sub_80A00A0: @ 80A00A0 lsls r0, 24 cmp r0, 0 beq _080A00D4 - ldr r0, _080A00CC - ldr r1, _080A00D0 + ldr r0, =0x08252ca7 + ldr r1, =sub_80A00EC + 1 bl sub_809FF98 b _080A00DC .align 2, 0 -_080A00CC: .4byte 0x08252ca7 -_080A00D0: .4byte sub_80A00EC + 1 + .pool _080A00D4: - ldr r0, _080A00E4 - ldr r1, _080A00E8 + ldr r0, =0x082c87b4 + ldr r1, =sub_80A00EC + 1 bl sub_809FF98 _080A00DC: movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080A00E4: .4byte 0x082c87b4 -_080A00E8: .4byte sub_80A00EC + 1 + .pool thumb_func_end sub_80A00A0 thumb_func_start sub_80A00EC sub_80A00EC: @ 80A00EC push {lr} bl sub_8197930 - ldr r1, _080A0100 - ldr r0, _080A0104 + ldr r1, =0x0203761c + ldr r0, =sub_80A0108 + 1 str r0, [r1] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080A0100: .4byte 0x0203761c -_080A0104: .4byte sub_80A0108 + 1 + .pool thumb_func_end sub_80A00EC thumb_func_start sub_80A0108 @@ -327809,35 +317220,31 @@ _080A0124: beq _080A0168 b _080A0174 _080A012A: - ldr r0, _080A0148 + ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0 beq _080A0136 cmp r0, 0x2 bne _080A013E _080A0136: - ldr r0, _080A014C + ldr r0, =0x020322d4 ldrb r0, [r0] cmp r0, 0 bne _080A0158 _080A013E: - ldr r1, _080A0150 - ldr r0, _080A0154 + ldr r1, =0x0203761c + ldr r0, =sub_80A017C + 1 str r0, [r1] b _080A0174 .align 2, 0 -_080A0148: .4byte 0x03006210 -_080A014C: .4byte 0x020322d4 -_080A0150: .4byte 0x0203761c -_080A0154: .4byte sub_80A017C + 1 + .pool _080A0158: - ldr r1, _080A0160 - ldr r0, _080A0164 + ldr r1, =0x0203761c + ldr r0, =sub_80A0234 + 1 str r0, [r1] b _080A0174 .align 2, 0 -_080A0160: .4byte 0x0203761c -_080A0164: .4byte sub_80A0234 + 1 + .pool _080A0168: bl sub_80A0024 bl sub_80A0014 @@ -327853,29 +317260,26 @@ _080A0176: thumb_func_start sub_80A017C sub_80A017C: @ 80A017C push {lr} - ldr r0, _080A0190 + ldr r0, =0x020322d4 ldrb r0, [r0] cmp r0, 0x1 bne _080A019C - ldr r0, _080A0194 - ldr r1, _080A0198 + ldr r0, =0x082c8845 + ldr r1, =sub_80A01B4 + 1 bl sub_809FF98 b _080A01A4 .align 2, 0 -_080A0190: .4byte 0x020322d4 -_080A0194: .4byte 0x082c8845 -_080A0198: .4byte sub_80A01B4 + 1 + .pool _080A019C: - ldr r0, _080A01AC - ldr r1, _080A01B0 + ldr r0, =0x082c87d5 + ldr r1, =sub_80A01D0 + 1 bl sub_809FF98 _080A01A4: movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080A01AC: .4byte 0x082c87d5 -_080A01B0: .4byte sub_80A01D0 + 1 + .pool thumb_func_end sub_80A017C thumb_func_start sub_80A01B4 @@ -327883,30 +317287,28 @@ sub_80A01B4: @ 80A01B4 push {lr} movs r0, 0x1 bl sub_8197948 - ldr r1, _080A01C8 - ldr r0, _080A01CC + ldr r1, =0x0203761c + ldr r0, =sub_80A01EC + 1 str r0, [r1] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080A01C8: .4byte 0x0203761c -_080A01CC: .4byte sub_80A01EC + 1 + .pool thumb_func_end sub_80A01B4 thumb_func_start sub_80A01D0 sub_80A01D0: @ 80A01D0 push {lr} bl sub_8197930 - ldr r1, _080A01E4 - ldr r0, _080A01E8 + ldr r1, =0x0203761c + ldr r0, =sub_80A01EC + 1 str r0, [r1] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080A01E4: .4byte 0x0203761c -_080A01E8: .4byte sub_80A01EC + 1 + .pool thumb_func_end sub_80A01D0 thumb_func_start sub_80A01EC @@ -327929,13 +317331,12 @@ _080A0208: beq _080A0220 b _080A022C _080A020E: - ldr r1, _080A0218 - ldr r0, _080A021C + ldr r1, =0x0203761c + ldr r0, =sub_80A0234 + 1 str r0, [r1] b _080A022C .align 2, 0 -_080A0218: .4byte 0x0203761c -_080A021C: .4byte sub_80A0234 + 1 + .pool _080A0220: bl sub_80A0024 bl sub_80A0014 @@ -327951,15 +317352,14 @@ _080A022E: thumb_func_start sub_80A0234 sub_80A0234: @ 80A0234 push {lr} - ldr r0, _080A0244 - ldr r1, _080A0248 + ldr r0, =0x082c8810 + ldr r1, =sub_80A024C + 1 bl sub_809FF98 movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080A0244: .4byte 0x082c8810 -_080A0248: .4byte sub_80A024C + 1 + .pool thumb_func_end sub_80A0234 thumb_func_start sub_80A024C @@ -327968,7 +317368,7 @@ sub_80A024C: @ 80A024C movs r0, 0 bl sav12_xor_increment bl sub_81A9E90 - ldr r4, _080A0270 + ldr r4, =0x020322d4 ldrb r0, [r4] cmp r0, 0x1 bne _080A0274 @@ -327980,7 +317380,7 @@ sub_80A024C: @ 80A024C strb r0, [r4] b _080A027E .align 2, 0 -_080A0270: .4byte 0x020322d4 + .pool _080A0274: movs r0, 0 bl save_game_when_memory_present @@ -327989,16 +317389,15 @@ _080A0274: _080A027E: cmp r1, 0x1 bne _080A0294 - ldr r0, _080A028C - ldr r1, _080A0290 + ldr r0, =0x082c8832 + ldr r1, =sub_80A02B0 + 1 bl sub_809FF98 b _080A029C .align 2, 0 -_080A028C: .4byte 0x082c8832 -_080A0290: .4byte sub_80A02B0 + 1 + .pool _080A0294: - ldr r0, _080A02A8 - ldr r1, _080A02AC + ldr r0, =0x082c892a + ldr r1, =sub_80A02FC + 1 bl sub_809FF98 _080A029C: bl sub_80A0030 @@ -328007,8 +317406,7 @@ _080A029C: pop {r1} bx r1 .align 2, 0 -_080A02A8: .4byte 0x082c892a -_080A02AC: .4byte sub_80A02FC + 1 + .pool thumb_func_end sub_80A024C thumb_func_start sub_80A02B0 @@ -328021,16 +317419,15 @@ sub_80A02B0: @ 80A02B0 bne _080A02CA movs r0, 0x37 bl audio_play - ldr r1, _080A02D0 - ldr r0, _080A02D4 + ldr r1, =0x0203761c + ldr r0, =sub_80A02D8 + 1 str r0, [r1] _080A02CA: movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080A02D0: .4byte 0x0203761c -_080A02D4: .4byte sub_80A02D8 + 1 + .pool thumb_func_end sub_80A02B0 thumb_func_start sub_80A02D8 @@ -328064,16 +317461,15 @@ sub_80A02FC: @ 80A02FC bne _080A0316 movs r0, 0x16 bl audio_play - ldr r1, _080A031C - ldr r0, _080A0320 + ldr r1, =0x0203761c + ldr r0, =sub_80A0324 + 1 str r0, [r1] _080A0316: movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080A031C: .4byte 0x0203761c -_080A0320: .4byte sub_80A0324 + 1 + .pool thumb_func_end sub_80A02FC thumb_func_start sub_80A0324 @@ -328095,17 +317491,15 @@ _080A033A: thumb_func_start sub_80A0340 sub_80A0340: @ 80A0340 - ldr r1, _080A0350 - ldr r0, _080A0354 + ldr r1, =0x0203761c + ldr r0, =sub_80A035C + 1 str r0, [r1] - ldr r1, _080A0358 + ldr r1, =0x02037621 movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_080A0350: .4byte 0x0203761c -_080A0354: .4byte sub_80A035C + 1 -_080A0358: .4byte 0x02037621 + .pool thumb_func_end sub_80A0340 thumb_func_start sub_80A035C @@ -328117,15 +317511,14 @@ sub_80A035C: @ 80A035C movs r1, 0 bl sub_819746C bl sub_8197A14 - ldr r0, _080A0380 - ldr r1, _080A0384 + ldr r0, =0x08252cfb + ldr r1, =sub_80A0388 + 1 bl sub_809FF98 movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080A0380: .4byte 0x08252cfb -_080A0384: .4byte sub_80A0388 + 1 + .pool thumb_func_end sub_80A035C thumb_func_start sub_80A0388 @@ -328133,15 +317526,14 @@ sub_80A0388: @ 80A0388 push {lr} movs r0, 0x1 bl sub_8197948 - ldr r1, _080A039C - ldr r0, _080A03A0 + ldr r1, =0x0203761c + ldr r0, =sub_80A03A4 + 1 str r0, [r1] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080A039C: .4byte 0x0203761c -_080A03A0: .4byte sub_80A03A4 + 1 + .pool thumb_func_end sub_80A0388 thumb_func_start sub_80A03A4 @@ -328198,12 +317590,12 @@ sub_80A03E4: @ 80A03E4 b _080A04FC _080A03F6: lsls r0, 2 - ldr r1, _080A0400 + ldr r1, =_080A0404 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A0400: .4byte _080A0404 + .pool .align 2, 0 _080A0404: .4byte _080A0418 @@ -328223,11 +317615,11 @@ _080A0418: mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _080A0484 + ldr r1, =0x040000d4 mov r0, sp str r0, [r1] str r2, [r1, 0x4] - ldr r0, _080A0488 + ldr r0, =0x81000200 str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r2, 0xC0 @@ -328238,7 +317630,7 @@ _080A0418: movs r6, 0 movs r5, 0x80 lsls r5, 5 - ldr r7, _080A048C + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -328264,9 +317656,7 @@ _080A045A: ldr r0, [r1, 0x8] b _080A04FC .align 2, 0 -_080A0484: .4byte 0x040000d4 -_080A0488: .4byte 0x81000200 -_080A048C: .4byte 0x81000800 + .pool _080A0490: bl reset_all_obj_data bl clear_tasks @@ -328276,11 +317666,11 @@ _080A0490: _080A04A2: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080A04CC + ldr r1, =0x085105a8 movs r0, 0 movs r2, 0x1 bl bg_vram_setup - ldr r0, _080A04D0 + ldr r0, =0x085105ac bl Window_InitFromTemplates movs r0, 0 movs r1, 0x8 @@ -328290,8 +317680,7 @@ _080A04A2: bl sub_81978B0 b _080A04FC .align 2, 0 -_080A04CC: .4byte 0x085105a8 -_080A04D0: .4byte 0x085105ac + .pool _080A04D4: movs r0, 0 bl gpu_sync_bg_show @@ -328300,13 +317689,13 @@ _080A04D4: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, _080A04F4 + ldr r0, =sub_80A03D8 + 1 bl SetVBlankCallback movs r0, 0x1 bl enable_irqs b _080A04FC .align 2, 0 -_080A04F4: .4byte sub_80A03D8 + 1 + .pool _080A04F8: movs r0, 0x1 b _080A0506 @@ -328328,22 +317717,20 @@ _080A0506: thumb_func_start sub_80A0514 sub_80A0514: @ 80A0514 push {lr} - ldr r0, _080A0534 + ldr r0, =0x030026f8 bl sub_80A03E4 cmp r0, 0 beq _080A052E - ldr r0, _080A0538 + ldr r0, =sub_80A0550 + 1 movs r1, 0x50 bl AddTask - ldr r0, _080A053C + ldr r0, =sub_80A0540 + 1 bl set_callback2 _080A052E: pop {r0} bx r0 .align 2, 0 -_080A0534: .4byte 0x030026f8 -_080A0538: .4byte sub_80A0550 + 1 -_080A053C: .4byte sub_80A0540 + 1 + .pool thumb_func_end sub_80A0514 thumb_func_start sub_80A0540 @@ -328364,9 +317751,9 @@ sub_80A0550: @ 80A0550 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080A0584 + ldr r1, =0x03005e08 adds r5, r0, r1 - ldr r0, _080A0588 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -328381,14 +317768,12 @@ _080A0570: b _080A06A8 _080A057A: lsls r0, 2 - ldr r1, _080A058C + ldr r1, =_080A0590 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A0584: .4byte 0x03005e08 -_080A0588: .4byte 0x02037fd4 -_080A058C: .4byte _080A0590 + .pool .align 2, 0 _080A0590: .4byte _080A05AC @@ -328402,7 +317787,7 @@ _080A05AC: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _080A0614 + ldr r2, =0x082c8959 movs r4, 0 str r4, [sp] movs r0, 0x2 @@ -328431,7 +317816,7 @@ _080A05AC: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _080A0618 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080A0620 @@ -328444,19 +317829,18 @@ _080A05AC: strh r6, [r5] b _080A06A8 .align 2, 0 -_080A0614: .4byte 0x082c8959 -_080A0618: .4byte 0x030030fc + .pool _080A061C: movs r0, 0x5 b _080A06A6 _080A0620: - ldr r0, _080A062C + ldr r0, =0x03002700 movs r1, 0x1 strb r1, [r0] movs r0, 0x1 b _080A06A6 .align 2, 0 -_080A062C: .4byte 0x03002700 + .pool _080A0630: bl sub_8076D5C bl sub_8153430 @@ -328470,12 +317854,12 @@ _080A063C: bl sav2_gender2_inplace_and_xFE movs r0, 0x3 strh r0, [r5] - ldr r1, _080A0658 + ldr r1, =0x03002700 movs r0, 0 strb r0, [r1] b _080A06A8 .align 2, 0 -_080A0658: .4byte 0x03002700 + .pool _080A065C: movs r0, 0x1 negs r0, r0 @@ -328488,24 +317872,24 @@ _080A065C: b _080A06A6 _080A0670: bl Window_FreeMemory - ldr r0, _080A0684 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 adds r0, r4, 0 bl remove_task b _080A06A8 .align 2, 0 -_080A0684: .4byte 0x030022c0 + .pool _080A0688: - ldr r0, _080A0694 + ldr r0, =sub_8153688 + 1 movs r1, 0x5 bl AddTask movs r0, 0x6 b _080A06A6 .align 2, 0 -_080A0694: .4byte sub_8153688 + 1 + .pool _080A0698: - ldr r0, _080A06B0 + ldr r0, =sub_8153688 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -328519,7 +317903,7 @@ _080A06A8: pop {r0} bx r0 .align 2, 0 -_080A06B0: .4byte sub_8153688 + 1 + .pool thumb_func_end sub_80A0550 thumb_func_start sub_80A06B4 @@ -328530,12 +317914,12 @@ sub_80A06B4: @ 80A06B4 mov r5, r8 push {r5-r7} sub sp, 0x14 - ldr r0, _080A0860 + ldr r0, =0x085105bc ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0xC] str r1, [sp, 0x10] - ldr r0, _080A0864 + ldr r0, =0x00000861 mov r10, r0 bl flag_check lsls r0, 24 @@ -328546,20 +317930,20 @@ sub_80A06B4: @ 80A06B4 subs r1, 0x2 lsls r1, 24 lsrs r1, 24 - ldr r2, _080A0868 + ldr r2, =0xffffff00 ldr r0, [sp, 0x10] ands r0, r2 orrs r0, r1 str r0, [sp, 0x10] _080A06EC: - ldr r6, _080A086C + ldr r6, =0x02037622 add r0, sp, 0xC bl Window_AddFromTemplate strb r0, [r6] ldrb r0, [r6] movs r1, 0 bl sub_81973FC - ldr r0, _080A0870 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] movs r1, 0x4 @@ -328570,7 +317954,7 @@ _080A06EC: mov r9, r0 _080A0710: movs r4, 0x1 - ldr r5, _080A0874 + ldr r5, =0x02021fc4 movs r0, 0x3 adds r1, r5, 0 movs r2, 0x6 @@ -328588,7 +317972,7 @@ _080A0710: bl Print movs r4, 0x11 ldrb r0, [r6] - ldr r2, _080A0878 + ldr r2, =0x085eed26 str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -328613,7 +317997,7 @@ _080A0710: bl sub_819A024 movs r4, 0x21 ldrb r0, [r6] - ldr r2, _080A087C + ldr r2, =0x085eed2d str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -328648,7 +318032,7 @@ _080A0710: bne _080A0802 movs r4, 0x31 ldrb r0, [r6] - ldr r2, _080A0880 + ldr r2, =0x085eed34 str r4, [sp] mov r1, r8 str r1, [sp, 0x4] @@ -328678,7 +318062,7 @@ _080A0710: _080A0802: adds r4, 0x10 ldrb r0, [r6] - ldr r2, _080A0884 + ldr r2, =0x085eed3c lsls r4, 24 lsrs r4, 24 str r4, [sp] @@ -328719,22 +318103,13 @@ _080A0802: pop {r0} bx r0 .align 2, 0 -_080A0860: .4byte 0x085105bc -_080A0864: .4byte 0x00000861 -_080A0868: .4byte 0xffffff00 -_080A086C: .4byte 0x02037622 -_080A0870: .4byte 0x03005d90 -_080A0874: .4byte 0x02021fc4 -_080A0878: .4byte 0x085eed26 -_080A087C: .4byte 0x085eed2d -_080A0880: .4byte 0x085eed34 -_080A0884: .4byte 0x085eed3c + .pool thumb_func_end sub_80A06B4 thumb_func_start sub_80A0888 sub_80A0888: @ 80A0888 push {r4,lr} - ldr r4, _080A08A0 + ldr r4, =0x02037622 ldrb r0, [r4] movs r1, 0 bl sub_819746C @@ -328744,7 +318119,7 @@ sub_80A0888: @ 80A0888 pop {r0} bx r0 .align 2, 0 -_080A08A0: .4byte 0x02037622 + .pool thumb_func_end sub_80A0888 thumb_func_start sub_80A08A4 @@ -328752,7 +318127,7 @@ sub_80A08A4: @ 80A08A4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A08C8 + ldr r0, =sub_8153688 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -328765,26 +318140,26 @@ _080A08C0: pop {r0} bx r0 .align 2, 0 -_080A08C8: .4byte sub_8153688 + 1 + .pool thumb_func_end sub_80A08A4 thumb_func_start sub_80A08CC sub_80A08CC: @ 80A08CC push {r4,r5,lr} - ldr r0, _080A0908 + ldr r0, =sub_8153688 + 1 movs r1, 0x5 bl AddTask adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _080A090C + ldr r5, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r5 movs r1, 0x1 strh r1, [r0, 0xC] - ldr r0, _080A0910 + ldr r0, =sub_80A08A4 + 1 movs r1, 0x6 bl AddTask lsls r0, 24 @@ -328798,9 +318173,7 @@ sub_80A08CC: @ 80A08CC pop {r0} bx r0 .align 2, 0 -_080A0908: .4byte sub_8153688 + 1 -_080A090C: .4byte 0x03005e00 -_080A0910: .4byte sub_80A08A4 + 1 + .pool thumb_func_end sub_80A08CC thumb_func_start sub_80A0914 @@ -328843,22 +318216,20 @@ append_byte: @ 80A0944 sub_80A0954: @ 80A0954 push {lr} sub sp, 0x4 - ldr r1, _080A0974 + ldr r1, =0x03000f34 movs r0, 0 strb r0, [r1] movs r0, 0 str r0, [sp] - ldr r1, _080A0978 - ldr r2, _080A097C + ldr r1, =0x02037624 + ldr r2, =0x0500003c mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_080A0974: .4byte 0x03000f34 -_080A0978: .4byte 0x02037624 -_080A097C: .4byte 0x0500003c + .pool thumb_func_end sub_80A0954 thumb_func_start sub_80A0980 @@ -328868,11 +318239,11 @@ sub_80A0980: @ 80A0980 adds r5, r1, 0 lsls r2, 16 lsrs r6, r2, 16 - ldr r3, _080A09C8 + ldr r3, =0x03000f34 ldrb r0, [r3] cmp r0, 0x13 bhi _080A09C0 - ldr r2, _080A09CC + ldr r2, =0x02037624 adds r1, r0, 0 lsls r0, r1, 1 adds r0, r1 @@ -328900,21 +318271,20 @@ _080A09C0: pop {r0} bx r0 .align 2, 0 -_080A09C8: .4byte 0x03000f34 -_080A09CC: .4byte 0x02037624 + .pool thumb_func_end sub_80A0980 thumb_func_start sub_80A09D0 sub_80A09D0: @ 80A09D0 push {r4-r6,lr} movs r3, 0 - ldr r4, _080A0A0C + ldr r4, =0x03000f34 adds r6, r4, 0 ldrb r0, [r4] cmp r3, r0 bge _080A0A02 - ldr r2, _080A0A10 - ldr r1, _080A0A14 + ldr r2, =0x040000d4 + ldr r1, =0x02037624 movs r5, 0x80 lsls r5, 24 _080A09E6: @@ -328939,9 +318309,7 @@ _080A0A02: pop {r0} bx r0 .align 2, 0 -_080A0A0C: .4byte 0x03000f34 -_080A0A10: .4byte 0x040000d4 -_080A0A14: .4byte 0x02037624 + .pool thumb_func_end sub_80A09D0 thumb_func_start cur_mapheader_run_tileset_funcs_after_some_cpuset @@ -328966,11 +318334,11 @@ sub_80A0A2C: @ 80A0A2C sub_80A0A38: @ 80A0A38 push {r4,lr} bl sub_80A0954 - ldr r2, _080A0A90 + ldr r2, =0x03000f36 ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - ldr r1, _080A0A94 + ldr r1, =0x03000f38 lsls r0, 16 lsrs r0, 16 ldrh r1, [r1] @@ -328979,11 +318347,11 @@ sub_80A0A38: @ 80A0A38 movs r0, 0 strh r0, [r2] _080A0A56: - ldr r4, _080A0A98 + ldr r4, =0x03000f3a ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - ldr r1, _080A0A9C + ldr r1, =0x03000f3c lsls r0, 16 lsrs r0, 16 ldrh r1, [r1] @@ -328992,14 +318360,14 @@ _080A0A56: movs r0, 0 strh r0, [r4] _080A0A6E: - ldr r0, _080A0AA0 + ldr r0, =0x03000f40 ldr r1, [r0] cmp r1, 0 beq _080A0A7C ldrh r0, [r2] bl _call_via_r1 _080A0A7C: - ldr r0, _080A0AA4 + ldr r0, =0x03000f44 ldr r1, [r0] cmp r1, 0 beq _080A0A8A @@ -329010,26 +318378,21 @@ _080A0A8A: pop {r0} bx r0 .align 2, 0 -_080A0A90: .4byte 0x03000f36 -_080A0A94: .4byte 0x03000f38 -_080A0A98: .4byte 0x03000f3a -_080A0A9C: .4byte 0x03000f3c -_080A0AA0: .4byte 0x03000f40 -_080A0AA4: .4byte 0x03000f44 + .pool thumb_func_end sub_80A0A38 thumb_func_start cur_mapheader_run_tileset1_func cur_mapheader_run_tileset1_func: @ 80A0AA8 push {lr} - ldr r0, _080A0AD4 + ldr r0, =0x03000f36 movs r1, 0 strh r1, [r0] - ldr r0, _080A0AD8 + ldr r0, =0x03000f38 strh r1, [r0] - ldr r1, _080A0ADC + ldr r1, =0x03000f40 movs r0, 0 str r0, [r1] - ldr r0, _080A0AE0 + ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x10] cmp r0, 0 @@ -329042,24 +318405,21 @@ _080A0ACE: pop {r0} bx r0 .align 2, 0 -_080A0AD4: .4byte 0x03000f36 -_080A0AD8: .4byte 0x03000f38 -_080A0ADC: .4byte 0x03000f40 -_080A0AE0: .4byte 0x02037318 + .pool thumb_func_end cur_mapheader_run_tileset1_func thumb_func_start cur_mapheader_run_tileset2_func cur_mapheader_run_tileset2_func: @ 80A0AE4 push {lr} - ldr r0, _080A0B10 + ldr r0, =0x03000f3a movs r1, 0 strh r1, [r0] - ldr r0, _080A0B14 + ldr r0, =0x03000f3c strh r1, [r0] - ldr r1, _080A0B18 + ldr r1, =0x03000f44 movs r0, 0 str r0, [r1] - ldr r0, _080A0B1C + ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x14] cmp r0, 0 @@ -329072,52 +318432,43 @@ _080A0B0A: pop {r0} bx r0 .align 2, 0 -_080A0B10: .4byte 0x03000f3a -_080A0B14: .4byte 0x03000f3c -_080A0B18: .4byte 0x03000f44 -_080A0B1C: .4byte 0x02037318 + .pool thumb_func_end cur_mapheader_run_tileset2_func thumb_func_start sub_80A0B20 sub_80A0B20: @ 80A0B20 - ldr r1, _080A0B38 + ldr r1, =0x03000f36 movs r0, 0 strh r0, [r1] - ldr r1, _080A0B3C + ldr r1, =0x03000f38 movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080A0B40 - ldr r0, _080A0B44 + ldr r1, =0x03000f40 + ldr r0, =sub_80A0B70 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0B38: .4byte 0x03000f36 -_080A0B3C: .4byte 0x03000f38 -_080A0B40: .4byte 0x03000f40 -_080A0B44: .4byte sub_80A0B70 + 1 + .pool thumb_func_end sub_80A0B20 thumb_func_start sub_80A0B48 sub_80A0B48: @ 80A0B48 - ldr r1, _080A0B60 + ldr r1, =0x03000f36 movs r0, 0 strh r0, [r1] - ldr r1, _080A0B64 + ldr r1, =0x03000f38 movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080A0B68 - ldr r0, _080A0B6C + ldr r1, =0x03000f40 + ldr r0, =sub_80A0BB4 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0B60: .4byte 0x03000f36 -_080A0B64: .4byte 0x03000f38 -_080A0B68: .4byte 0x03000f40 -_080A0B6C: .4byte sub_80A0BB4 + 1 + .pool thumb_func_end sub_80A0B48 thumb_func_start sub_80A0B70 @@ -329181,18 +318532,17 @@ sub_80A0BCC: @ 80A0BCC movs r1, 0xC0 lsls r1, 10 ands r1, r0 - ldr r0, _080A0BEC + ldr r0, =0x08510764 lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A0BF0 + ldr r1, =0x06003f80 movs r2, 0x80 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A0BEC: .4byte 0x08510764 -_080A0BF0: .4byte 0x06003f80 + .pool thumb_func_end sub_80A0BCC thumb_func_start sub_80A0BF4 @@ -329202,19 +318552,18 @@ sub_80A0BF4: @ 80A0BF4 lsrs r0, 16 movs r1, 0x7 ands r0, r1 - ldr r1, _080A0C14 + ldr r1, =0x08512574 lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080A0C18 + ldr r1, =0x06003600 movs r2, 0xF0 lsls r2, 2 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A0C14: .4byte 0x08512574 -_080A0C18: .4byte 0x06003600 + .pool thumb_func_end sub_80A0BF4 thumb_func_start sub_80A0C1C @@ -329224,19 +318573,18 @@ sub_80A0C1C: @ 80A0C1C movs r1, 0xE0 lsls r1, 11 ands r1, r0 - ldr r0, _080A0C3C + ldr r0, =0x08512e54 lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A0C40 + ldr r1, =0x06003a00 movs r2, 0xA0 lsls r2, 1 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A0C3C: .4byte 0x08512e54 -_080A0C40: .4byte 0x06003a00 + .pool thumb_func_end sub_80A0C1C thumb_func_start sub_80A0C44 @@ -329246,494 +318594,407 @@ sub_80A0C44: @ 80A0C44 movs r1, 0xC0 lsls r1, 10 ands r1, r0 - ldr r0, _080A0C64 + ldr r0, =0x08513174 lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A0C68 + ldr r1, =0x06003e00 movs r2, 0xC0 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A0C64: .4byte 0x08513174 -_080A0C68: .4byte 0x06003e00 + .pool thumb_func_end sub_80A0C44 thumb_func_start sub_80A0C6C sub_80A0C6C: @ 80A0C6C - ldr r1, _080A0C84 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0C88 - ldr r0, _080A0C8C + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0C90 + ldr r1, =0x03000f44 movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_080A0C84: .4byte 0x03000f3a -_080A0C88: .4byte 0x03000f3c -_080A0C8C: .4byte 0x03000f38 -_080A0C90: .4byte 0x03000f44 + .pool thumb_func_end sub_80A0C6C thumb_func_start sub_80A0C94 sub_80A0C94: @ 80A0C94 - ldr r1, _080A0CAC + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0CB0 - ldr r0, _080A0CB4 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0CB8 - ldr r0, _080A0CBC + ldr r1, =0x03000f44 + ldr r0, =sub_80A103C + 1 str r0, [r1] bx lr .align 2, 0 -_080A0CAC: .4byte 0x03000f3a -_080A0CB0: .4byte 0x03000f3c -_080A0CB4: .4byte 0x03000f38 -_080A0CB8: .4byte 0x03000f44 -_080A0CBC: .4byte sub_80A103C + 1 + .pool thumb_func_end sub_80A0C94 thumb_func_start sub_80A0CC0 sub_80A0CC0: @ 80A0CC0 - ldr r1, _080A0CD8 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0CDC - ldr r0, _080A0CE0 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0CE4 - ldr r0, _080A0CE8 + ldr r1, =0x03000f44 + ldr r0, =sub_80A10B8 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0CD8: .4byte 0x03000f3a -_080A0CDC: .4byte 0x03000f3c -_080A0CE0: .4byte 0x03000f38 -_080A0CE4: .4byte 0x03000f44 -_080A0CE8: .4byte sub_80A10B8 + 1 + .pool thumb_func_end sub_80A0CC0 thumb_func_start sub_80A0CEC sub_80A0CEC: @ 80A0CEC - ldr r1, _080A0D04 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0D08 - ldr r0, _080A0D0C + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0D10 - ldr r0, _080A0D14 + ldr r1, =0x03000f44 + ldr r0, =sub_80A10D0 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0D04: .4byte 0x03000f3a -_080A0D08: .4byte 0x03000f3c -_080A0D0C: .4byte 0x03000f38 -_080A0D10: .4byte 0x03000f44 -_080A0D14: .4byte sub_80A10D0 + 1 + .pool thumb_func_end sub_80A0CEC thumb_func_start sub_80A0D18 sub_80A0D18: @ 80A0D18 - ldr r1, _080A0D30 - ldr r0, _080A0D34 + ldr r1, =0x03000f3a + ldr r0, =0x03000f36 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0D38 - ldr r0, _080A0D3C + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0D40 - ldr r0, _080A0D44 + ldr r1, =0x03000f44 + ldr r0, =sub_80A10E8 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0D30: .4byte 0x03000f3a -_080A0D34: .4byte 0x03000f36 -_080A0D38: .4byte 0x03000f3c -_080A0D3C: .4byte 0x03000f38 -_080A0D40: .4byte 0x03000f44 -_080A0D44: .4byte sub_80A10E8 + 1 + .pool thumb_func_end sub_80A0D18 thumb_func_start sub_80A0D48 sub_80A0D48: @ 80A0D48 - ldr r1, _080A0D60 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0D64 - ldr r0, _080A0D68 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0D6C - ldr r0, _080A0D70 + ldr r1, =0x03000f44 + ldr r0, =sub_80A115C + 1 str r0, [r1] bx lr .align 2, 0 -_080A0D60: .4byte 0x03000f3a -_080A0D64: .4byte 0x03000f3c -_080A0D68: .4byte 0x03000f38 -_080A0D6C: .4byte 0x03000f44 -_080A0D70: .4byte sub_80A115C + 1 + .pool thumb_func_end sub_80A0D48 thumb_func_start sub_80A0D74 sub_80A0D74: @ 80A0D74 - ldr r1, _080A0D8C + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0D90 - ldr r0, _080A0D94 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0D98 + ldr r1, =0x03000f44 movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_080A0D8C: .4byte 0x03000f3a -_080A0D90: .4byte 0x03000f3c -_080A0D94: .4byte 0x03000f38 -_080A0D98: .4byte 0x03000f44 + .pool thumb_func_end sub_80A0D74 thumb_func_start sub_80A0D9C sub_80A0D9C: @ 80A0D9C - ldr r1, _080A0DB4 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0DB8 - ldr r0, _080A0DBC + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0DC0 + ldr r1, =0x03000f44 movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_080A0DB4: .4byte 0x03000f3a -_080A0DB8: .4byte 0x03000f3c -_080A0DBC: .4byte 0x03000f38 -_080A0DC0: .4byte 0x03000f44 + .pool thumb_func_end sub_80A0D9C thumb_func_start sub_80A0DC4 sub_80A0DC4: @ 80A0DC4 - ldr r1, _080A0DDC + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0DE0 - ldr r0, _080A0DE4 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0DE8 + ldr r1, =0x03000f44 movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_080A0DDC: .4byte 0x03000f3a -_080A0DE0: .4byte 0x03000f3c -_080A0DE4: .4byte 0x03000f38 -_080A0DE8: .4byte 0x03000f44 + .pool thumb_func_end sub_80A0DC4 thumb_func_start sub_80A0DEC sub_80A0DEC: @ 80A0DEC - ldr r1, _080A0E04 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0E08 - ldr r0, _080A0E0C + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0E10 + ldr r1, =0x03000f44 movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_080A0E04: .4byte 0x03000f3a -_080A0E08: .4byte 0x03000f3c -_080A0E0C: .4byte 0x03000f38 -_080A0E10: .4byte 0x03000f44 + .pool thumb_func_end sub_80A0DEC thumb_func_start sub_80A0E14 sub_80A0E14: @ 80A0E14 - ldr r1, _080A0E2C + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0E30 - ldr r0, _080A0E34 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0E38 - ldr r0, _080A0E3C + ldr r1, =0x03000f44 + ldr r0, =sub_80A1188 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0E2C: .4byte 0x03000f3a -_080A0E30: .4byte 0x03000f3c -_080A0E34: .4byte 0x03000f38 -_080A0E38: .4byte 0x03000f44 -_080A0E3C: .4byte sub_80A1188 + 1 + .pool thumb_func_end sub_80A0E14 thumb_func_start sub_80A0E40 sub_80A0E40: @ 80A0E40 - ldr r1, _080A0E58 - ldr r0, _080A0E5C + ldr r1, =0x03000f3a + ldr r0, =0x03000f36 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0E60 - ldr r0, _080A0E64 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0E68 - ldr r0, _080A0E6C + ldr r1, =0x03000f44 + ldr r0, =sub_80A11FC + 1 str r0, [r1] bx lr .align 2, 0 -_080A0E58: .4byte 0x03000f3a -_080A0E5C: .4byte 0x03000f36 -_080A0E60: .4byte 0x03000f3c -_080A0E64: .4byte 0x03000f38 -_080A0E68: .4byte 0x03000f44 -_080A0E6C: .4byte sub_80A11FC + 1 + .pool thumb_func_end sub_80A0E40 thumb_func_start sub_80A0E70 sub_80A0E70: @ 80A0E70 - ldr r1, _080A0E88 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0E8C - ldr r0, _080A0E90 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0E94 - ldr r0, _080A0E98 + ldr r1, =0x03000f44 + ldr r0, =sub_80A122C + 1 str r0, [r1] bx lr .align 2, 0 -_080A0E88: .4byte 0x03000f3a -_080A0E8C: .4byte 0x03000f3c -_080A0E90: .4byte 0x03000f38 -_080A0E94: .4byte 0x03000f44 -_080A0E98: .4byte sub_80A122C + 1 + .pool thumb_func_end sub_80A0E70 thumb_func_start sub_80A0E9C sub_80A0E9C: @ 80A0E9C - ldr r1, _080A0EB4 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0EB8 - ldr r0, _080A0EBC + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0EC0 - ldr r0, _080A0EC4 + ldr r1, =0x03000f44 + ldr r0, =sub_80A127C + 1 str r0, [r1] bx lr .align 2, 0 -_080A0EB4: .4byte 0x03000f3a -_080A0EB8: .4byte 0x03000f3c -_080A0EBC: .4byte 0x03000f38 -_080A0EC0: .4byte 0x03000f44 -_080A0EC4: .4byte sub_80A127C + 1 + .pool thumb_func_end sub_80A0E9C thumb_func_start sub_80A0EC8 sub_80A0EC8: @ 80A0EC8 - ldr r1, _080A0EE0 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0EE4 - ldr r0, _080A0EE8 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0EEC - ldr r0, _080A0EF0 + ldr r1, =0x03000f44 + ldr r0, =sub_80A1294 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0EE0: .4byte 0x03000f3a -_080A0EE4: .4byte 0x03000f3c -_080A0EE8: .4byte 0x03000f38 -_080A0EEC: .4byte 0x03000f44 -_080A0EF0: .4byte sub_80A1294 + 1 + .pool thumb_func_end sub_80A0EC8 thumb_func_start sub_80A0EF4 sub_80A0EF4: @ 80A0EF4 - ldr r1, _080A0F08 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0F0C + ldr r1, =0x03000f3c movs r0, 0x80 strh r0, [r1] - ldr r1, _080A0F10 - ldr r0, _080A0F14 + ldr r1, =0x03000f44 + ldr r0, =sub_80A1244 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0F08: .4byte 0x03000f3a -_080A0F0C: .4byte 0x03000f3c -_080A0F10: .4byte 0x03000f44 -_080A0F14: .4byte sub_80A1244 + 1 + .pool thumb_func_end sub_80A0EF4 thumb_func_start Tileset28AnimationHeader Tileset28AnimationHeader: @ 80A0F18 - ldr r1, _080A0F2C + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0F30 + ldr r1, =0x03000f3c movs r0, 0xF0 strh r0, [r1] - ldr r1, _080A0F34 - ldr r0, _080A0F38 + ldr r1, =0x03000f44 + ldr r0, =sub_80A15D8 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0F2C: .4byte 0x03000f3a -_080A0F30: .4byte 0x03000f3c -_080A0F34: .4byte 0x03000f44 -_080A0F38: .4byte sub_80A15D8 + 1 + .pool thumb_func_end Tileset28AnimationHeader thumb_func_start sub_80A0F3C sub_80A0F3C: @ 80A0F3C - ldr r1, _080A0F54 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0F58 - ldr r0, _080A0F5C + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0F60 - ldr r0, _080A0F64 + ldr r1, =0x03000f44 + ldr r0, =sub_80A1260 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0F54: .4byte 0x03000f3a -_080A0F58: .4byte 0x03000f3c -_080A0F5C: .4byte 0x03000f38 -_080A0F60: .4byte 0x03000f44 -_080A0F64: .4byte sub_80A1260 + 1 + .pool thumb_func_end sub_80A0F3C thumb_func_start sub_80A0F68 sub_80A0F68: @ 80A0F68 - ldr r1, _080A0F7C + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0F80 + ldr r1, =0x03000f3c movs r0, 0x80 strh r0, [r1] - ldr r1, _080A0F84 - ldr r0, _080A0F88 + ldr r1, =0x03000f44 + ldr r0, =sub_80A15F0 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0F7C: .4byte 0x03000f3a -_080A0F80: .4byte 0x03000f3c -_080A0F84: .4byte 0x03000f44 -_080A0F88: .4byte sub_80A15F0 + 1 + .pool thumb_func_end sub_80A0F68 thumb_func_start sub_80A0F8C sub_80A0F8C: @ 80A0F8C - ldr r1, _080A0FA4 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0FA8 - ldr r0, _080A0FAC + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0FB0 - ldr r0, _080A0FB4 + ldr r1, =0x03000f44 + ldr r0, =sub_80A15C0 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0FA4: .4byte 0x03000f3a -_080A0FA8: .4byte 0x03000f3c -_080A0FAC: .4byte 0x03000f38 -_080A0FB0: .4byte 0x03000f44 -_080A0FB4: .4byte sub_80A15C0 + 1 + .pool thumb_func_end sub_80A0F8C thumb_func_start sub_80A0FB8 sub_80A0FB8: @ 80A0FB8 - ldr r1, _080A0FD0 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A0FD4 - ldr r0, _080A0FD8 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A0FDC - ldr r0, _080A0FE0 + ldr r1, =0x03000f44 + ldr r0, =sub_80A161C + 1 str r0, [r1] bx lr .align 2, 0 -_080A0FD0: .4byte 0x03000f3a -_080A0FD4: .4byte 0x03000f3c -_080A0FD8: .4byte 0x03000f38 -_080A0FDC: .4byte 0x03000f44 -_080A0FE0: .4byte sub_80A161C + 1 + .pool thumb_func_end sub_80A0FB8 thumb_func_start sub_80A0FE4 sub_80A0FE4: @ 80A0FE4 - ldr r1, _080A0FFC + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A1000 - ldr r0, _080A1004 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A1008 - ldr r0, _080A100C + ldr r1, =0x03000f44 + ldr r0, =sub_80A1634 + 1 str r0, [r1] bx lr .align 2, 0 -_080A0FFC: .4byte 0x03000f3a -_080A1000: .4byte 0x03000f3c -_080A1004: .4byte 0x03000f38 -_080A1008: .4byte 0x03000f44 -_080A100C: .4byte sub_80A1634 + 1 + .pool thumb_func_end sub_80A0FE4 thumb_func_start sub_80A1010 sub_80A1010: @ 80A1010 - ldr r1, _080A1028 + ldr r1, =0x03000f3a movs r0, 0 strh r0, [r1] - ldr r1, _080A102C - ldr r0, _080A1030 + ldr r1, =0x03000f3c + ldr r0, =0x03000f38 ldrh r0, [r0] strh r0, [r1] - ldr r1, _080A1034 - ldr r0, _080A1038 + ldr r1, =0x03000f44 + ldr r0, =sub_80A1658 + 1 str r0, [r1] bx lr .align 2, 0 -_080A1028: .4byte 0x03000f3a -_080A102C: .4byte 0x03000f3c -_080A1030: .4byte 0x03000f38 -_080A1034: .4byte 0x03000f44 -_080A1038: .4byte sub_80A1658 + 1 + .pool thumb_func_end sub_80A1010 thumb_func_start sub_80A103C @@ -330096,19 +319357,18 @@ sub_80A12AC: @ 80A12AC movs r1, 0xC0 lsls r1, 10 ands r1, r0 - ldr r0, _080A12CC + ldr r0, =0x08513684 lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A12D0 + ldr r1, =0x06003c00 movs r2, 0xA0 lsls r2, 1 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A12CC: .4byte 0x08513684 -_080A12D0: .4byte 0x06003c00 + .pool thumb_func_end sub_80A12AC thumb_func_start sub_80A12D4 @@ -330118,11 +319378,11 @@ sub_80A12D4: @ 80A12D4 lsrs r4, r0, 24 movs r0, 0x3 ands r0, r4 - ldr r5, _080A1310 + ldr r5, =0x08513894 lsls r0, 2 adds r0, r5 ldr r0, [r0] - ldr r1, _080A1314 + ldr r1, =0x06006400 movs r2, 0x80 bl sub_80A0980 adds r1, r4, 0x2 @@ -330134,16 +319394,14 @@ sub_80A12D4: @ 80A12D4 lsrs r0, 22 adds r0, r5 ldr r0, [r0] - ldr r1, _080A1318 + ldr r1, =0x06006480 movs r2, 0x80 bl sub_80A0980 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080A1310: .4byte 0x08513894 -_080A1314: .4byte 0x06006400 -_080A1318: .4byte 0x06006480 + .pool thumb_func_end sub_80A12D4 thumb_func_start sub_80A131C @@ -330153,19 +319411,18 @@ sub_80A131C: @ 80A131C movs r1, 0xC0 lsls r1, 18 ands r1, r0 - ldr r0, _080A133C + ldr r0, =0x085143e4 lsrs r1, 22 adds r1, r0 ldr r0, [r1] - ldr r1, _080A1340 + ldr r1, =0x06007a00 movs r2, 0xF0 lsls r2, 2 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A133C: .4byte 0x085143e4 -_080A1340: .4byte 0x06007a00 + .pool thumb_func_end sub_80A131C thumb_func_start sub_80A1344 @@ -330175,18 +319432,17 @@ sub_80A1344: @ 80A1344 movs r1, 0xC0 lsls r1, 18 ands r1, r0 - ldr r0, _080A1364 + ldr r0, =0x085145f4 lsrs r1, 22 adds r1, r0 ldr r0, [r1] - ldr r1, _080A1368 + ldr r1, =0x06007e00 movs r2, 0x80 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A1364: .4byte 0x085145f4 -_080A1368: .4byte 0x06007e00 + .pool thumb_func_end sub_80A1344 thumb_func_start sub_80A136C @@ -330196,19 +319452,18 @@ sub_80A136C: @ 80A136C movs r1, 0xE0 lsls r1, 19 ands r1, r0 - ldr r0, _080A138C + ldr r0, =0x08514e04 lsrs r1, 22 adds r1, r0 ldr r0, [r1] - ldr r1, _080A1390 + ldr r1, =0x06007e00 movs r2, 0x80 lsls r2, 1 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A138C: .4byte 0x08514e04 -_080A1390: .4byte 0x06007e00 + .pool thumb_func_end sub_80A136C thumb_func_start sub_80A1394 @@ -330228,47 +319483,44 @@ sub_80A1394: @ 80A1394 bl __umodsi3 adds r4, r0, 0 lsls r4, 16 - ldr r0, _080A13E0 + ldr r0, =0x08515384 lsrs r4, 14 adds r0, r4, r0 ldr r0, [r0] - ldr r1, _080A13E4 + ldr r1, =0x08515344 lsls r5, r6, 2 adds r1, r5, r1 ldr r1, [r1] movs r2, 0x80 bl sub_80A0980 - ldr r0, _080A13E8 + ldr r0, =0x085153b4 adds r4, r0 ldr r0, [r4] - ldr r1, _080A13EC + ldr r1, =0x08515364 adds r5, r1 ldr r1, [r5] movs r2, 0x80 bl sub_80A0980 b _080A141C .align 2, 0 -_080A13E0: .4byte 0x08515384 -_080A13E4: .4byte 0x08515344 -_080A13E8: .4byte 0x085153b4 -_080A13EC: .4byte 0x08515364 + .pool _080A13F0: movs r0, 0x3 ands r5, r0 - ldr r0, _080A1424 + ldr r0, =0x085153e4 lsls r5, 2 adds r0, r5, r0 ldr r0, [r0] - ldr r1, _080A1428 + ldr r1, =0x08515344 lsls r4, r6, 2 adds r1, r4, r1 ldr r1, [r1] movs r2, 0x80 bl sub_80A0980 - ldr r0, _080A142C + ldr r0, =0x085153f4 adds r5, r0 ldr r0, [r5] - ldr r1, _080A1430 + ldr r1, =0x08515364 adds r4, r1 ldr r1, [r4] movs r2, 0x80 @@ -330278,10 +319530,7 @@ _080A141C: pop {r0} bx r0 .align 2, 0 -_080A1424: .4byte 0x085153e4 -_080A1428: .4byte 0x08515344 -_080A142C: .4byte 0x085153f4 -_080A1430: .4byte 0x08515364 + .pool thumb_func_end sub_80A1394 thumb_func_start sub_80A1434 @@ -330296,13 +319545,13 @@ sub_80A1434: @ 80A1434 movs r1, 0xE0 lsls r1, 11 ands r1, r0 - ldr r0, _080A1468 + ldr r0, =0x08515824 lsrs r1, 14 adds r1, r0 ldr r2, [r1] cmp r2, 0 beq _080A1464 - ldr r0, _080A146C + ldr r0, =0x08515804 lsls r1, r3, 2 adds r1, r0 ldr r1, [r1] @@ -330313,8 +319562,7 @@ _080A1464: pop {r0} bx r0 .align 2, 0 -_080A1468: .4byte 0x08515824 -_080A146C: .4byte 0x08515804 + .pool thumb_func_end sub_80A1434 thumb_func_start sub_80A1470 @@ -330324,18 +319572,17 @@ sub_80A1470: @ 80A1470 lsrs r0, 16 movs r1, 0x1 ands r0, r1 - ldr r1, _080A1490 + ldr r1, =0x08515964 lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080A1494 + ldr r1, =0x06007800 movs r2, 0x80 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A1490: .4byte 0x08515964 -_080A1494: .4byte 0x06007800 + .pool thumb_func_end sub_80A1470 thumb_func_start sub_80A1498 @@ -330345,18 +319592,17 @@ sub_80A1498: @ 80A1498 movs r1, 0xC0 lsls r1, 10 ands r1, r0 - ldr r0, _080A14B8 + ldr r0, =0x08515d8c lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A14BC + ldr r1, =0x06005400 movs r2, 0x80 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A14B8: .4byte 0x08515d8c -_080A14BC: .4byte 0x06005400 + .pool thumb_func_end sub_80A1498 thumb_func_start sub_80A14C0 @@ -330371,11 +319617,11 @@ sub_80A14C0: @ 80A14C0 movs r2, 0xE0 lsls r2, 11 ands r2, r0 - ldr r0, _080A14F0 + ldr r0, =0x085161dc lsrs r2, 14 adds r2, r0 ldr r0, [r2] - ldr r2, _080A14F4 + ldr r2, =0x085161bc lsls r1, 2 adds r1, r2 ldr r1, [r1] @@ -330384,8 +319630,7 @@ sub_80A14C0: @ 80A14C0 pop {r0} bx r0 .align 2, 0 -_080A14F0: .4byte 0x085161dc -_080A14F4: .4byte 0x085161bc + .pool thumb_func_end sub_80A14C0 thumb_func_start sub_80A14F8 @@ -330395,18 +319640,17 @@ sub_80A14F8: @ 80A14F8 movs r1, 0xC0 lsls r1, 10 ands r1, r0 - ldr r0, _080A1518 + ldr r0, =0x08515d8c lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A151C + ldr r1, =0x06007400 movs r2, 0x80 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A1518: .4byte 0x08515d8c -_080A151C: .4byte 0x06007400 + .pool thumb_func_end sub_80A14F8 thumb_func_start sub_80A1520 @@ -330416,18 +319660,17 @@ sub_80A1520: @ 80A1520 movs r1, 0xC0 lsls r1, 10 ands r1, r0 - ldr r0, _080A1540 + ldr r0, =0x085164fc lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A1544 + ldr r1, =0x06005540 movs r2, 0xC0 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A1540: .4byte 0x085164fc -_080A1544: .4byte 0x06005540 + .pool thumb_func_end sub_80A1520 thumb_func_start sub_80A1548 @@ -330437,18 +319680,17 @@ sub_80A1548: @ 80A1548 movs r1, 0xC0 lsls r1, 10 ands r1, r0 - ldr r0, _080A1568 + ldr r0, =0x0851680c lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A156C + ldr r1, =0x06005b40 movs r2, 0xC0 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A1568: .4byte 0x0851680c -_080A156C: .4byte 0x06005b40 + .pool thumb_func_end sub_80A1548 thumb_func_start sub_80A1570 @@ -330458,18 +319700,17 @@ sub_80A1570: @ 80A1570 movs r1, 0xC0 lsls r1, 10 ands r1, r0 - ldr r0, _080A1590 + ldr r0, =0x08516b1c lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A1594 + ldr r1, =0x06005b40 movs r2, 0xC0 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A1590: .4byte 0x08516b1c -_080A1594: .4byte 0x06005b40 + .pool thumb_func_end sub_80A1570 thumb_func_start sub_80A1598 @@ -330479,18 +319720,17 @@ sub_80A1598: @ 80A1598 movs r1, 0xC0 lsls r1, 10 ands r1, r0 - ldr r0, _080A15B8 + ldr r0, =0x08516d2c lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A15BC + ldr r1, =0x06005c00 movs r2, 0x80 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A15B8: .4byte 0x08516d2c -_080A15BC: .4byte 0x06005c00 + .pool thumb_func_end sub_80A1598 thumb_func_start sub_80A15C0 @@ -330625,18 +319865,17 @@ sub_80A1688: @ 80A1688 lsrs r0, 16 movs r1, 0x1 ands r0, r1 - ldr r1, _080A16A8 + ldr r1, =0x08516e3c lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080A16AC + ldr r1, =0x06003e00 movs r2, 0x80 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A16A8: .4byte 0x08516e3c -_080A16AC: .4byte 0x06003e00 + .pool thumb_func_end sub_80A1688 thumb_func_start sub_80A16B0 @@ -330648,18 +319887,18 @@ sub_80A16B0: @ 80A16B0 bl __umodsi3 adds r4, r0, 0 lsls r4, 16 - ldr r0, _080A16E8 + ldr r0, =0x08517a44 lsrs r4, 14 adds r0, r4, r0 ldr r0, [r0] - ldr r1, _080A16EC + ldr r1, =0x06007e00 movs r2, 0xC0 lsls r2, 1 bl sub_80A0980 - ldr r0, _080A16F0 + ldr r0, =0x08517a50 adds r4, r0 ldr r0, [r4] - ldr r1, _080A16F4 + ldr r1, =0x06007a00 movs r2, 0xA0 lsls r2, 2 bl sub_80A0980 @@ -330667,10 +319906,7 @@ sub_80A16B0: @ 80A16B0 pop {r0} bx r0 .align 2, 0 -_080A16E8: .4byte 0x08517a44 -_080A16EC: .4byte 0x06007e00 -_080A16F0: .4byte 0x08517a50 -_080A16F4: .4byte 0x06007a00 + .pool thumb_func_end sub_80A16B0 thumb_func_start sub_80A16F8 @@ -330680,18 +319916,17 @@ sub_80A16F8: @ 80A16F8 movs r1, 0xC0 lsls r1, 10 ands r1, r0 - ldr r0, _080A1718 + ldr r0, =0x08517bfc lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A171C + ldr r1, =0x06007f00 movs r2, 0x20 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A1718: .4byte 0x08517bfc -_080A171C: .4byte 0x06007f00 + .pool thumb_func_end sub_80A16F8 thumb_func_start sub_80A1720 @@ -330701,18 +319936,17 @@ sub_80A1720: @ 80A1720 lsrs r0, 16 movs r1, 0x1 ands r0, r1 - ldr r1, _080A1740 + ldr r1, =0x08517c0c lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080A1744 + ldr r1, =0x06007c00 movs r2, 0x80 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A1740: .4byte 0x08517c0c -_080A1744: .4byte 0x06007c00 + .pool thumb_func_end sub_80A1720 thumb_func_start sub_80A1748 @@ -330722,19 +319956,18 @@ sub_80A1748: @ 80A1748 lsrs r0, 16 movs r1, 0x1 ands r0, r1 - ldr r1, _080A1768 + ldr r1, =0x08518034 lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080A176C + ldr r1, =0x06005200 movs r2, 0x80 lsls r2, 2 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A1768: .4byte 0x08518034 -_080A176C: .4byte 0x06005200 + .pool thumb_func_end sub_80A1748 thumb_func_start sub_80A1770 @@ -330744,19 +319977,18 @@ sub_80A1770: @ 80A1770 lsrs r0, 16 movs r1, 0x1 ands r0, r1 - ldr r1, _080A1790 + ldr r1, =0x0851829c lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080A1794 + ldr r1, =0x06007e00 movs r2, 0x90 lsls r2, 1 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A1790: .4byte 0x0851829c -_080A1794: .4byte 0x06007e00 + .pool thumb_func_end sub_80A1770 thumb_func_start sub_80A1798 @@ -330766,19 +319998,18 @@ sub_80A1798: @ 80A1798 movs r1, 0xE0 lsls r1, 11 ands r1, r0 - ldr r0, _080A17B8 + ldr r0, =0x085202c4 lsrs r1, 14 adds r1, r0 ldr r0, [r1] - ldr r1, _080A17BC + ldr r1, =0x06005e00 movs r2, 0xC0 lsls r2, 4 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A17B8: .4byte 0x085202c4 -_080A17BC: .4byte 0x06005e00 + .pool thumb_func_end sub_80A1798 thumb_func_start sub_80A17C0 @@ -330789,19 +320020,18 @@ sub_80A17C0: @ 80A17C0 movs r1, 0x3 bl __umodsi3 lsls r0, 16 - ldr r1, _080A17E4 + ldr r1, =0x08524864 lsrs r0, 14 adds r0, r1 ldr r0, [r0] - ldr r1, _080A17E8 + ldr r1, =0x060052e0 movs r2, 0x80 lsls r2, 1 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A17E4: .4byte 0x08524864 -_080A17E8: .4byte 0x060052e0 + .pool thumb_func_end sub_80A17C0 thumb_func_start sub_80A17EC @@ -330812,36 +320042,35 @@ sub_80A17EC: @ 80A17EC movs r1, 0x3 bl __umodsi3 lsls r0, 16 - ldr r1, _080A1810 + ldr r1, =0x08524870 lsrs r0, 14 adds r0, r1 ldr r0, [r0] - ldr r1, _080A1814 + ldr r1, =0x060050e0 movs r2, 0x80 lsls r2, 1 bl sub_80A0980 pop {r0} bx r0 .align 2, 0 -_080A1810: .4byte 0x08524870 -_080A1814: .4byte 0x060050e0 + .pool thumb_func_end sub_80A17EC thumb_func_start sub_80A1818 sub_80A1818: @ 80A1818 push {lr} lsls r0, 16 - ldr r2, _080A1868 + ldr r2, =0x0852487c movs r1, 0xC0 lsls r1, 10 ands r1, r0 lsrs r1, 14 adds r1, r2 ldr r0, [r1] - ldr r1, _080A186C + ldr r1, =0x02037814 movs r2, 0x10 bl CpuSet - ldr r0, _080A1870 + ldr r0, =0x02037fd4 ldrh r2, [r0, 0x4] lsls r2, 21 lsrs r2, 27 @@ -330851,52 +320080,46 @@ sub_80A1818: @ 80A1818 movs r0, 0x80 movs r1, 0x10 bl pal_fade_1 - ldr r0, _080A1874 + ldr r0, =sub_8149DFC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF beq _080A1862 - ldr r1, _080A1878 - ldr r0, _080A187C + ldr r1, =0x03000f44 + ldr r0, =sub_80A1670 + 1 str r0, [r1] - ldr r1, _080A1880 + ldr r1, =0x03000f3c movs r0, 0x20 strh r0, [r1] _080A1862: pop {r0} bx r0 .align 2, 0 -_080A1868: .4byte 0x0852487c -_080A186C: .4byte 0x02037814 -_080A1870: .4byte 0x02037fd4 -_080A1874: .4byte sub_8149DFC + 1 -_080A1878: .4byte 0x03000f44 -_080A187C: .4byte sub_80A1670 + 1 -_080A1880: .4byte 0x03000f3c + .pool thumb_func_end sub_80A1818 thumb_func_start sub_80A1884 sub_80A1884: @ 80A1884 push {lr} lsls r0, 16 - ldr r2, _080A18DC + ldr r2, =0x0852487c movs r1, 0xC0 lsls r1, 10 ands r1, r0 lsrs r1, 14 adds r1, r2 ldr r0, [r1] - ldr r1, _080A18E0 + ldr r1, =0x02037814 movs r2, 0x10 bl CpuSet - ldr r0, _080A18E4 + ldr r0, =sub_8149DFC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF bne _080A18D6 - ldr r0, _080A18E8 + ldr r0, =0x02037fd4 ldrh r2, [r0, 0x4] lsls r2, 21 lsrs r2, 27 @@ -330906,7 +320129,7 @@ sub_80A1884: @ 80A1884 movs r0, 0x80 movs r1, 0x10 bl pal_fade_1 - ldr r1, _080A18EC + ldr r1, =0x03000f3c ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] @@ -330914,18 +320137,13 @@ sub_80A1884: @ 80A1884 lsrs r1, r0, 16 cmp r1, 0 bne _080A18D6 - ldr r0, _080A18F0 + ldr r0, =0x03000f44 str r1, [r0] _080A18D6: pop {r0} bx r0 .align 2, 0 -_080A18DC: .4byte 0x0852487c -_080A18E0: .4byte 0x02037814 -_080A18E4: .4byte sub_8149DFC + 1 -_080A18E8: .4byte 0x02037fd4 -_080A18EC: .4byte 0x03000f3c -_080A18F0: .4byte 0x03000f44 + .pool thumb_func_end sub_80A1884 thumb_func_start decompress_palette @@ -330936,17 +320154,17 @@ decompress_palette: @ 80A18F4 lsls r4, 16 lsrs r4, 16 lsls r5, 16 - ldr r6, _080A192C + ldr r6, =0x02037fe8 adds r1, r6, 0 bl call_LZZUnCompWram lsls r4, 1 - ldr r1, _080A1930 + ldr r1, =0x02037714 adds r1, r4, r1 lsrs r5, 17 adds r0, r6, 0 adds r2, r5, 0 bl CpuSet - ldr r0, _080A1934 + ldr r0, =0x02037b14 adds r4, r0 adds r0, r6, 0 adds r1, r4, 0 @@ -330956,9 +320174,7 @@ decompress_palette: @ 80A18F4 pop {r0} bx r0 .align 2, 0 -_080A192C: .4byte 0x02037fe8 -_080A1930: .4byte 0x02037714 -_080A1934: .4byte 0x02037b14 + .pool thumb_func_end decompress_palette thumb_func_start gpu_pal_apply @@ -330970,12 +320186,12 @@ gpu_pal_apply: @ 80A1938 lsls r4, 16 lsls r5, 16 lsrs r4, 15 - ldr r1, _080A1968 + ldr r1, =0x02037714 adds r1, r4, r1 lsrs r5, 17 adds r2, r5, 0 bl CpuSet - ldr r0, _080A196C + ldr r0, =0x02037b14 adds r4, r0 adds r0, r6, 0 adds r1, r4, 0 @@ -330985,8 +320201,7 @@ gpu_pal_apply: @ 80A1938 pop {r0} bx r0 .align 2, 0 -_080A1968: .4byte 0x02037714 -_080A196C: .4byte 0x02037b14 + .pool thumb_func_end gpu_pal_apply thumb_func_start rboxid_80040B8 @@ -331003,7 +320218,7 @@ rboxid_80040B8: @ 80A1970 mov r0, sp strh r6, [r0] lsrs r4, 15 - ldr r1, _080A19B8 + ldr r1, =0x02037714 adds r1, r4, r1 lsrs r5, 17 movs r0, 0x80 @@ -331015,7 +320230,7 @@ rboxid_80040B8: @ 80A1970 mov r0, sp adds r0, 0x2 strh r6, [r0] - ldr r1, _080A19BC + ldr r1, =0x02037b14 adds r4, r1 adds r1, r4, 0 adds r2, r5, 0 @@ -331025,14 +320240,13 @@ rboxid_80040B8: @ 80A1970 pop {r0} bx r0 .align 2, 0 -_080A19B8: .4byte 0x02037714 -_080A19BC: .4byte 0x02037b14 + .pool thumb_func_end rboxid_80040B8 thumb_func_start copy_pal_bg_faded_to_pal_ram copy_pal_bg_faded_to_pal_ram: @ 80A19C0 push {r4,r5,lr} - ldr r4, _080A1A08 + ldr r4, =0x02037fd4 ldrb r1, [r4, 0x8] movs r5, 0x80 adds r0, r5, 0 @@ -331041,16 +320255,16 @@ copy_pal_bg_faded_to_pal_ram: @ 80A19C0 lsrs r3, r0, 24 cmp r3, 0 bne _080A1A02 - ldr r1, _080A1A0C + ldr r1, =0x02037b14 movs r2, 0xA0 lsls r2, 19 - ldr r0, _080A1A10 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _080A1A14 + ldr r1, =0x80000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - ldr r0, _080A1A18 + ldr r0, =0x02037fe4 str r3, [r0] ldrb r1, [r4, 0x9] movs r0, 0x3 @@ -331068,26 +320282,22 @@ _080A1A02: pop {r0} bx r0 .align 2, 0 -_080A1A08: .4byte 0x02037fd4 -_080A1A0C: .4byte 0x02037b14 -_080A1A10: .4byte 0x040000d4 -_080A1A14: .4byte 0x80000200 -_080A1A18: .4byte 0x02037fe4 + .pool thumb_func_end copy_pal_bg_faded_to_pal_ram thumb_func_start fade_and_return_progress_probably fade_and_return_progress_probably: @ 80A1A1C push {lr} - ldr r0, _080A1A2C + ldr r0, =0x02037fe4 ldr r0, [r0] cmp r0, 0 beq _080A1A30 movs r0, 0xFF b _080A1A68 .align 2, 0 -_080A1A2C: .4byte 0x02037fe4 + .pool _080A1A30: - ldr r0, _080A1A44 + ldr r0, =0x02037fd4 ldrb r0, [r0, 0x9] movs r1, 0x3 ands r1, r0 @@ -331096,7 +320306,7 @@ _080A1A30: bl pal_fade__0 b _080A1A56 .align 2, 0 -_080A1A44: .4byte 0x02037fd4 + .pool _080A1A48: cmp r1, 0x1 bne _080A1A52 @@ -331107,8 +320317,8 @@ _080A1A52: _080A1A56: lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080A1A6C - ldr r0, _080A1A70 + ldr r2, =0x02037fe4 + ldr r0, =0x02037fd4 ldr r0, [r0] movs r1, 0 orrs r0, r1 @@ -331118,8 +320328,7 @@ _080A1A68: pop {r1} bx r1 .align 2, 0 -_080A1A6C: .4byte 0x02037fe4 -_080A1A70: .4byte 0x02037fd4 + .pool thumb_func_end fade_and_return_progress_probably thumb_func_start sub_80A1A74 @@ -331147,9 +320356,9 @@ sub_80A1A94: @ 80A1A94 lsls r0, 19 mov r12, r0 movs r4, 0 - ldr r7, _080A1AC8 - ldr r6, _080A1ACC - ldr r5, _080A1AD0 + ldr r7, =0x02037714 + ldr r6, =0x02037b14 + ldr r5, =0x000001ff _080A1AA4: lsls r1, r4, 1 adds r3, r1, r7 @@ -331169,9 +320378,7 @@ _080A1AA4: pop {r0} bx r0 .align 2, 0 -_080A1AC8: .4byte 0x02037714 -_080A1ACC: .4byte 0x02037b14 -_080A1AD0: .4byte 0x000001ff + .pool thumb_func_end sub_80A1A94 thumb_func_start sub_80A1AD4 @@ -331191,7 +320398,7 @@ sub_80A1AD4: @ 80A1AD4 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r5, _080A1B04 + ldr r5, =0x02037fd4 ldrb r1, [r5, 0x7] movs r0, 0x80 ands r0, r1 @@ -331200,7 +320407,7 @@ sub_80A1AD4: @ 80A1AD4 movs r0, 0 b _080A1C00 .align 2, 0 -_080A1B04: .4byte 0x02037fd4 + .pool _080A1B08: ldrb r0, [r5, 0xA] movs r3, 0x79 @@ -331247,7 +320454,7 @@ _080A1B36: ands r1, r0 lsls r1, 6 ldrh r2, [r5, 0x4] - ldr r0, _080A1BA4 + ldr r0, =0xfffff83f ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] @@ -331257,11 +320464,11 @@ _080A1B36: ands r0, r1 orrs r0, r2 strb r0, [r5, 0x5] - ldr r1, _080A1BA8 + ldr r1, =0x00007fff mov r0, r8 ands r1, r0 ldrh r2, [r5, 0x6] - ldr r0, _080A1BAC + ldr r0, =0xffff8000 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x6] @@ -331281,27 +320488,25 @@ _080A1B36: ands r3, r0 b _080A1BB4 .align 2, 0 -_080A1BA4: .4byte 0xfffff83f -_080A1BA8: .4byte 0x00007fff -_080A1BAC: .4byte 0xffff8000 + .pool _080A1BB0: movs r0, 0x40 orrs r3, r0 _080A1BB4: strb r3, [r5, 0x8] bl fade_and_return_progress_probably - ldr r4, _080A1C0C + ldr r4, =0x02037fd4 ldrb r1, [r4, 0x8] lsrs r5, r1, 7 movs r0, 0x7F ands r0, r1 strb r0, [r4, 0x8] - ldr r0, _080A1C10 + ldr r0, =0x02037b14 movs r1, 0xA0 lsls r1, 19 - ldr r2, _080A1C14 + ldr r2, =0x04000100 bl CpuSet - ldr r1, _080A1C18 + ldr r1, =0x02037fe4 movs r0, 0 str r0, [r1] ldrb r1, [r4, 0x9] @@ -331316,7 +320521,7 @@ _080A1BB4: beq _080A1BF0 bl sub_80A2968 _080A1BF0: - ldr r2, _080A1C0C + ldr r2, =0x02037fd4 lsls r3, r5, 7 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -331331,10 +320536,7 @@ _080A1C00: pop {r1} bx r1 .align 2, 0 -_080A1C0C: .4byte 0x02037fd4 -_080A1C10: .4byte 0x02037b14 -_080A1C14: .4byte 0x04000100 -_080A1C18: .4byte 0x02037fe4 + .pool thumb_func_end sub_80A1AD4 thumb_func_start sub_80A1C1C @@ -331386,7 +320588,7 @@ _080A1C6E: lsls r0, r5, 1 adds r0, r5 lsls r0, 2 - ldr r1, _080A1CBC + ldr r1, =0x02037f14 adds r4, r0, r1 ldrb r0, [r4, 0x4] lsls r0, 31 @@ -331421,7 +320623,7 @@ _080A1CAA: bl sub_80A1CDC b _080A1CC4 .align 2, 0 -_080A1CBC: .4byte 0x02037f14 + .pool _080A1CC0: subs r0, 0x1 strb r0, [r4, 0x8] @@ -331465,9 +320667,9 @@ sub_80A1CDC: @ 80A1CDC lsrs r0, r2, 27 cmp r6, r0 bcs _080A1DC4 - ldr r0, _080A1D68 + ldr r0, =0x02037714 mov r12, r0 - ldr r7, _080A1D6C + ldr r7, =0x02037b14 _080A1D10: ldr r0, [r4, 0x4] lsls r0, 11 @@ -331496,10 +320698,10 @@ _080A1D10: lsls r1, r2, 11 lsrs r1, 22 adds r1, 0x1 - ldr r0, _080A1D70 + ldr r0, =0x000003ff ands r1, r0 lsls r1, 11 - ldr r0, _080A1D74 + ldr r0, =0xffe007ff ands r0, r2 orrs r0, r1 str r0, [r4, 0x4] @@ -331514,15 +320716,12 @@ _080A1D10: bcc _080A1D10 b _080A1DC4 .align 2, 0 -_080A1D68: .4byte 0x02037714 -_080A1D6C: .4byte 0x02037b14 -_080A1D70: .4byte 0x000003ff -_080A1D74: .4byte 0xffe007ff + .pool _080A1D78: lsrs r0, r2, 27 cmp r6, r0 bcs _080A1DC4 - ldr r3, _080A1E30 + ldr r3, =0x02037b14 _080A1D80: ldr r1, [r4, 0x4] lsls r1, 11 @@ -331542,10 +320741,10 @@ _080A1D80: lsls r1, r2, 11 lsrs r1, 22 adds r1, 0x1 - ldr r0, _080A1E34 + ldr r0, =0x000003ff ands r1, r0 lsls r1, 11 - ldr r0, _080A1E38 + ldr r0, =0xffe007ff ands r0, r2 orrs r0, r1 str r0, [r4, 0x4] @@ -331564,7 +320763,7 @@ _080A1DC4: lsrs r0, 23 lsls r0, 11 ldr r1, [r4, 0x4] - ldr r2, _080A1E38 + ldr r2, =0xffe007ff ands r1, r2 orrs r1, r0 str r1, [r4, 0x4] @@ -331578,7 +320777,7 @@ _080A1DC4: movs r1, 0x7F ands r0, r1 lsls r0, 5 - ldr r5, _080A1E3C + ldr r5, =0xfffff01f adds r1, r5, 0 ands r1, r2 orrs r1, r0 @@ -331616,17 +320815,14 @@ _080A1E14: pop {r0} bx r0 .align 2, 0 -_080A1E30: .4byte 0x02037b14 -_080A1E34: .4byte 0x000003ff -_080A1E38: .4byte 0xffe007ff -_080A1E3C: .4byte 0xfffff01f + .pool thumb_func_end sub_80A1CDC thumb_func_start sub_80A1E40 sub_80A1E40: @ 80A1E40 push {r4-r6,lr} adds r4, r0, 0 - ldr r3, _080A1E98 + ldr r3, =0x02037fd4 ldrb r1, [r3, 0x7] movs r0, 0x80 ands r0, r1 @@ -331668,7 +320864,7 @@ sub_80A1E40: @ 80A1E40 bl pal_fade_1 b _080A1EF4 .align 2, 0 -_080A1E98: .4byte 0x02037fd4 + .pool _080A1E9C: ldrb r1, [r3, 0x4] movs r0, 0x3F @@ -331691,7 +320887,7 @@ _080A1E9C: adds r1, r2, 0 cmp r3, r1 bcs _080A1EF4 - ldr r6, _080A1EFC + ldr r6, =0x02037b14 _080A1EC8: ldrh r1, [r4, 0x4] lsls r1, 21 @@ -331720,7 +320916,7 @@ _080A1EF4: pop {r0} bx r0 .align 2, 0 -_080A1EFC: .4byte 0x02037b14 + .pool thumb_func_end sub_80A1E40 thumb_func_start sub_80A1F00 @@ -331736,7 +320932,7 @@ sub_80A1F00: @ 80A1F00 cmp r0, 0 bne _080A1F40 ldrh r1, [r3, 0x6] - ldr r0, _080A1F38 + ldr r0, =0xfffff01f ands r0, r1 strh r0, [r3, 0x6] ldrb r0, [r2, 0xA] @@ -331748,14 +320944,13 @@ sub_80A1F00: @ 80A1F00 lsrs r0, 23 lsls r0, 11 ldr r1, [r3, 0x4] - ldr r2, _080A1F3C + ldr r2, =0xffe007ff ands r1, r2 orrs r1, r0 str r1, [r3, 0x4] b _080A1F54 .align 2, 0 -_080A1F38: .4byte 0xfffff01f -_080A1F3C: .4byte 0xffe007ff + .pool _080A1F40: cmp r0, 0 blt _080A1F54 @@ -331792,12 +320987,12 @@ _080A1F6E: palslot_dead_struct_update: @ 80A1F74 lsls r0, 24 lsrs r0, 24 - ldr r2, _080A1FBC + ldr r2, =0x02037f14 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 adds r1, r2 - ldr r0, _080A1FC0 + ldr r0, =0x0852488c str r0, [r1] ldrb r2, [r1, 0x4] movs r0, 0x2 @@ -331805,15 +321000,15 @@ palslot_dead_struct_update: @ 80A1F74 ands r0, r2 strb r0, [r1, 0x4] ldrh r2, [r1, 0x4] - ldr r0, _080A1FC4 + ldr r0, =0xfffff803 ands r0, r2 strh r0, [r1, 0x4] ldr r0, [r1, 0x4] - ldr r2, _080A1FC8 + ldr r2, =0xffe007ff ands r0, r2 str r0, [r1, 0x4] ldrh r2, [r1, 0x6] - ldr r0, _080A1FCC + ldr r0, =0xfffff01f ands r0, r2 strh r0, [r1, 0x6] ldrb r2, [r1, 0x4] @@ -331826,16 +321021,12 @@ palslot_dead_struct_update: @ 80A1F74 strb r0, [r1, 0x9] bx lr .align 2, 0 -_080A1FBC: .4byte 0x02037f14 -_080A1FC0: .4byte 0x0852488c -_080A1FC4: .4byte 0xfffff803 -_080A1FC8: .4byte 0xffe007ff -_080A1FCC: .4byte 0xfffff01f + .pool thumb_func_end palslot_dead_struct_update thumb_func_start pal_fade_control_reset_maybe pal_fade_control_reset_maybe: @ 80A1FD0 - ldr r2, _080A2038 + ldr r2, =0x02037fd4 movs r0, 0 str r0, [r2] subs r0, 0x40 @@ -331843,7 +321034,7 @@ pal_fade_control_reset_maybe: @ 80A1FD0 ands r0, r1 strb r0, [r2, 0x4] ldrh r1, [r2, 0x4] - ldr r0, _080A203C + ldr r0, =0xfffff83f ands r0, r1 strh r0, [r2, 0x4] ldrb r1, [r2, 0x5] @@ -331851,7 +321042,7 @@ pal_fade_control_reset_maybe: @ 80A1FD0 ands r0, r1 strb r0, [r2, 0x5] ldrh r1, [r2, 0x6] - ldr r0, _080A2040 + ldr r0, =0xffff8000 ands r0, r1 strh r0, [r2, 0x6] ldrb r1, [r2, 0x7] @@ -331875,7 +321066,7 @@ pal_fade_control_reset_maybe: @ 80A1FD0 ands r0, r1 strb r0, [r2, 0xA] ldr r0, [r2, 0x8] - ldr r1, _080A2044 + ldr r1, =0xfffe0fff ands r0, r1 str r0, [r2, 0x8] ldrb r0, [r2, 0xA] @@ -331888,10 +321079,7 @@ pal_fade_control_reset_maybe: @ 80A1FD0 strb r3, [r2, 0xA] bx lr .align 2, 0 -_080A2038: .4byte 0x02037fd4 -_080A203C: .4byte 0xfffff83f -_080A2040: .4byte 0xffff8000 -_080A2044: .4byte 0xfffe0fff + .pool thumb_func_end pal_fade_control_reset_maybe thumb_func_start sub_80A2048 @@ -331904,7 +321092,7 @@ sub_80A2048: @ 80A2048 lsrs r2, r0, 24 cmp r2, 0x10 beq _080A206C - ldr r1, _080A2070 + ldr r1, =0x02037f14 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -331917,7 +321105,7 @@ _080A206C: pop {r0} bx r0 .align 2, 0 -_080A2070: .4byte 0x02037f14 + .pool thumb_func_end sub_80A2048 thumb_func_start sub_80A2074 @@ -331930,7 +321118,7 @@ sub_80A2074: @ 80A2074 lsrs r2, r0, 24 cmp r2, 0x10 beq _080A209A - ldr r0, _080A20A0 + ldr r0, =0x02037f14 lsls r1, r2, 1 adds r1, r2 lsls r1, 2 @@ -331944,7 +321132,7 @@ _080A209A: pop {r0} bx r0 .align 2, 0 -_080A20A0: .4byte 0x02037f14 + .pool thumb_func_end sub_80A2074 thumb_func_start sub_80A20A4 @@ -331953,7 +321141,7 @@ sub_80A20A4: @ 80A20A4 lsls r0, 16 lsrs r2, r0, 16 movs r1, 0 - ldr r3, _080A20C4 + ldr r3, =0x02037f14 _080A20AE: lsls r0, r1, 1 adds r0, r1 @@ -331966,7 +321154,7 @@ _080A20AE: adds r0, r1, 0 b _080A20D4 .align 2, 0 -_080A20C4: .4byte 0x02037f14 + .pool _080A20C8: adds r0, r1, 0x1 lsls r0, 24 @@ -331982,7 +321170,7 @@ _080A20D4: thumb_func_start pal_fade__0 pal_fade__0: @ 80A20D8 push {r4-r7,lr} - ldr r4, _080A20EC + ldr r4, =0x02037fd4 ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -331991,7 +321179,7 @@ pal_fade__0: @ 80A20D8 movs r0, 0 b _080A220C .align 2, 0 -_080A20EC: .4byte 0x02037fd4 + .pool _080A20F0: bl sub_80A29BC lsls r0, 24 @@ -332029,7 +321217,7 @@ _080A212A: strb r0, [r4, 0x4] _080A2132: movs r5, 0 - ldr r2, _080A2148 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0xA] movs r0, 0x4 ands r0, r1 @@ -332039,7 +321227,7 @@ _080A2132: ldrh r4, [r7] b _080A2152 .align 2, 0 -_080A2148: .4byte 0x02037fd4 + .pool _080A214C: ldrh r4, [r7, 0x2] movs r5, 0x80 @@ -332047,7 +321235,7 @@ _080A214C: _080A2152: cmp r4, 0 beq _080A2184 - ldr r7, _080A21C0 + ldr r7, =0x02037fd4 adds r6, r7, 0 _080A215A: movs r0, 0x1 @@ -332103,7 +321291,7 @@ _080A2184: strb r4, [r7, 0xA] b _080A2208 .align 2, 0 -_080A21C0: .4byte 0x02037fd4 + .pool _080A21C4: ldrb r1, [r7, 0x8] movs r0, 0x40 @@ -332137,7 +321325,7 @@ _080A21F6: movs r1, 0x1F ands r0, r1 lsls r0, 6 - ldr r1, _080A2214 + ldr r1, =0xfffff83f ands r1, r6 orrs r1, r0 strh r1, [r7, 0x4] @@ -332150,7 +321338,7 @@ _080A220C: pop {r1} bx r1 .align 2, 0 -_080A2214: .4byte 0xfffff83f + .pool thumb_func_end pal_fade__0 thumb_func_start sub_80A2218 @@ -332160,7 +321348,7 @@ sub_80A2218: @ 80A2218 movs r3, 0 cmp r1, 0 beq _080A2256 - ldr r7, _080A225C + ldr r7, =0x02037b14 _080A2224: movs r0, 0x1 ands r0, r1 @@ -332194,7 +321382,7 @@ _080A2256: pop {r0} bx r0 .align 2, 0 -_080A225C: .4byte 0x02037b14 + .pool thumb_func_end sub_80A2218 thumb_func_start sub_80A2260 @@ -332231,7 +321419,7 @@ _080A228A: cmp r0, 0 beq _080A230E movs r4, 0 - ldr r2, _080A232C + ldr r2, =0x02037b14 mov r8, r2 ldr r1, [sp] lsls r0, r1, 24 @@ -332267,7 +321455,7 @@ _080A22B6: ands r1, r0 lsls r1, 5 ldrh r3, [r2] - ldr r0, _080A2330 + ldr r0, =0xfffffc1f ands r0, r3 orrs r0, r1 strh r0, [r2] @@ -332306,8 +321494,7 @@ _080A231C: pop {r0} bx r0 .align 2, 0 -_080A232C: .4byte 0x02037b14 -_080A2330: .4byte 0xfffffc1f + .pool thumb_func_end sub_80A2260 thumb_func_start sub_80A2334 @@ -332319,9 +321506,9 @@ sub_80A2334: @ 80A2334 movs r3, 0 cmp r1, 0 beq _080A237E - ldr r0, _080A2388 + ldr r0, =0x02037b14 mov r8, r0 - ldr r0, _080A238C + ldr r0, =0x02037714 mov r12, r0 _080A234A: movs r0, 0x1 @@ -332359,8 +321546,7 @@ _080A237E: pop {r0} bx r0 .align 2, 0 -_080A2388: .4byte 0x02037b14 -_080A238C: .4byte 0x02037714 + .pool thumb_func_end sub_80A2334 thumb_func_start sub_80A2390 @@ -332368,7 +321554,7 @@ sub_80A2390: @ 80A2390 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _080A23B0 + ldr r3, =0x02037fd4 ldrb r2, [r3, 0xA] movs r1, 0x79 negs r1, r1 @@ -332380,7 +321566,7 @@ sub_80A2390: @ 80A2390 pop {r0} bx r0 .align 2, 0 -_080A23B0: .4byte 0x02037fd4 + .pool thumb_func_end sub_80A2390 thumb_func_start sub_80A23B4 @@ -332390,7 +321576,7 @@ sub_80A23B4: @ 80A23B4 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r2, _080A2428 + ldr r2, =0x02037fd4 ldrh r0, [r2, 0x4] movs r3, 0xF8 lsls r3, 3 @@ -332421,8 +321607,8 @@ sub_80A23B4: @ 80A23B4 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _080A242C - ldr r2, _080A2430 + ldr r1, =0x02037b14 + ldr r2, =0x01000200 mov r0, sp bl CpuSet _080A2406: @@ -332430,11 +321616,11 @@ _080A2406: bne _080A241C mov r0, sp adds r0, 0x2 - ldr r2, _080A2434 + ldr r2, =0x00007fff adds r1, r2, 0 strh r1, [r0] - ldr r1, _080A242C - ldr r2, _080A2430 + ldr r1, =0x02037b14 + ldr r2, =0x01000200 bl CpuSet _080A241C: bl fade_and_return_progress_probably @@ -332443,10 +321629,7 @@ _080A241C: pop {r0} bx r0 .align 2, 0 -_080A2428: .4byte 0x02037fd4 -_080A242C: .4byte 0x02037b14 -_080A2430: .4byte 0x01000200 -_080A2434: .4byte 0x00007fff + .pool thumb_func_end sub_80A23B4 thumb_func_start pal_fade__1 @@ -332457,7 +321640,7 @@ pal_fade__1: @ 80A2438 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r4, _080A2454 + ldr r4, =0x02037fd4 ldrb r1, [r4, 0x7] movs r0, 0x80 ands r0, r1 @@ -332466,7 +321649,7 @@ pal_fade__1: @ 80A2438 movs r0, 0 b _080A2792 .align 2, 0 -_080A2454: .4byte 0x02037fd4 + .pool _080A2458: bl sub_80A29BC lsls r0, 24 @@ -332492,7 +321675,7 @@ _080A247C: lsls r1, 1 mov r10, r1 _080A2484: - ldr r1, _080A249C + ldr r1, =0x02037fd4 ldrb r0, [r1, 0x8] lsls r0, 26 lsrs r0, 26 @@ -332504,7 +321687,7 @@ _080A2484: beq _080A24AE b _080A2694 .align 2, 0 -_080A249C: .4byte 0x02037fd4 + .pool _080A24A0: cmp r0, 0x2 bne _080A24A6 @@ -332522,7 +321705,7 @@ _080A24AE: b _080A2694 _080A24B6: lsls r2, r7, 1 - ldr r0, _080A253C + ldr r0, =0x02037714 adds r0, r2, r0 ldr r1, [r0] lsls r3, r1, 27 @@ -332532,7 +321715,7 @@ _080A24B6: lsls r1, 17 lsrs r1, 27 mov r8, r1 - ldr r0, _080A2540 + ldr r0, =0x02037b14 adds r2, r0 mov r9, r2 ldr r1, [r2] @@ -332592,8 +321775,7 @@ _080A251C: bcc _080A24B6 b _080A2694 .align 2, 0 -_080A253C: .4byte 0x02037714 -_080A2540: .4byte 0x02037b14 + .pool _080A2544: adds r7, r2, 0 cmp r7, r10 @@ -332601,7 +321783,7 @@ _080A2544: b _080A2694 _080A254C: lsls r1, r7, 1 - ldr r0, _080A25A4 + ldr r0, =0x02037b14 adds r2, r1, r0 ldr r1, [r2] lsls r0, r1, 27 @@ -332648,14 +321830,14 @@ _080A2586: bcc _080A254C b _080A2694 .align 2, 0 -_080A25A4: .4byte 0x02037b14 + .pool _080A25A8: adds r7, r2, 0 cmp r7, r10 bcs _080A2694 _080A25AE: lsls r2, r7, 1 - ldr r0, _080A2628 + ldr r0, =0x02037714 adds r0, r2, r0 ldr r1, [r0] lsls r3, r1, 27 @@ -332665,7 +321847,7 @@ _080A25AE: lsls r1, 17 lsrs r1, 27 mov r8, r1 - ldr r0, _080A262C + ldr r0, =0x02037b14 adds r2, r0 ldr r1, [r2] lsls r0, r1, 27 @@ -332718,13 +321900,12 @@ _080A2608: bcc _080A25AE b _080A2694 .align 2, 0 -_080A2628: .4byte 0x02037714 -_080A262C: .4byte 0x02037b14 + .pool _080A2630: adds r7, r2, 0 cmp r7, r10 bcs _080A2694 - ldr r4, _080A26BC + ldr r4, =0x02037b14 mov r8, r4 _080A263A: lsls r0, r7, 1 @@ -332776,7 +321957,7 @@ _080A2678: cmp r7, r10 bcc _080A263A _080A2694: - ldr r0, _080A26C0 + ldr r0, =0x02037fd4 ldrb r2, [r0, 0xA] lsls r0, r2, 29 lsrs r0, 31 @@ -332787,7 +321968,7 @@ _080A2694: negs r3, r3 ands r3, r2 orrs r3, r1 - ldr r1, _080A26C0 + ldr r1, =0x02037fd4 strb r3, [r1, 0xA] movs r0, 0x4 ands r0, r3 @@ -332796,10 +321977,9 @@ _080A2694: ldrb r0, [r1, 0x7] b _080A2790 .align 2, 0 -_080A26BC: .4byte 0x02037b14 -_080A26C0: .4byte 0x02037fd4 + .pool _080A26C4: - ldr r2, _080A26E0 + ldr r2, =0x02037fd4 ldrh r4, [r2, 0x4] lsls r5, r4, 21 lsrs r0, r5, 27 @@ -332808,14 +321988,13 @@ _080A26C4: subs r0, r1 cmp r0, 0 bge _080A26E8 - ldr r0, _080A26E4 + ldr r0, =0xfffff83f ands r0, r4 - ldr r3, _080A26E0 + ldr r3, =0x02037fd4 strh r0, [r3, 0x4] b _080A26FE .align 2, 0 -_080A26E0: .4byte 0x02037fd4 -_080A26E4: .4byte 0xfffff83f + .pool _080A26E8: lsrs r1, r5, 27 lsrs r0, r2, 28 @@ -332823,20 +322002,20 @@ _080A26E8: movs r0, 0x1F ands r1, r0 lsls r1, 6 - ldr r0, _080A2724 + ldr r0, =0xfffff83f ands r0, r4 orrs r0, r1 - ldr r4, _080A2728 + ldr r4, =0x02037fd4 strh r0, [r4, 0x4] _080A26FE: - ldr r1, _080A2728 + ldr r1, =0x02037fd4 ldrh r0, [r1, 0x4] movs r1, 0xF8 lsls r1, 3 ands r1, r0 cmp r1, 0 bne _080A278C - ldr r2, _080A2728 + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] lsls r0, 26 lsrs r0, 26 @@ -332848,8 +322027,7 @@ _080A26FE: beq _080A2736 b _080A2778 .align 2, 0 -_080A2724: .4byte 0xfffff83f -_080A2728: .4byte 0x02037fd4 + .pool _080A272C: cmp r0, 0x2 beq _080A2736 @@ -332857,35 +322035,32 @@ _080A272C: beq _080A276C b _080A2778 _080A2736: - ldr r0, _080A2744 - ldr r1, _080A2748 - ldr r2, _080A274C + ldr r0, =0x02037714 + ldr r1, =0x02037b14 + ldr r2, =0x04000100 bl CpuSet b _080A2778 .align 2, 0 -_080A2744: .4byte 0x02037714 -_080A2748: .4byte 0x02037b14 -_080A274C: .4byte 0x04000100 + .pool _080A2750: movs r0, 0x1 negs r0, r0 str r0, [sp] - ldr r1, _080A2764 - ldr r2, _080A2768 + ldr r1, =0x02037b14 + ldr r2, =0x05000100 mov r0, sp bl CpuSet b _080A2778 .align 2, 0 -_080A2764: .4byte 0x02037b14 -_080A2768: .4byte 0x05000100 + .pool _080A276C: str r1, [sp, 0x4] add r0, sp, 0x4 - ldr r1, _080A27A4 - ldr r2, _080A27A8 + ldr r1, =0x02037b14 + ldr r2, =0x05000100 bl CpuSet _080A2778: - ldr r2, _080A27AC + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x9] movs r0, 0x4 negs r0, r0 @@ -332896,7 +322071,7 @@ _080A2778: orrs r0, r1 strb r0, [r2, 0xA] _080A278C: - ldr r3, _080A27AC + ldr r3, =0x02037fd4 ldrb r0, [r3, 0x7] _080A2790: lsrs r0, 7 @@ -332910,9 +322085,7 @@ _080A2792: pop {r1} bx r1 .align 2, 0 -_080A27A4: .4byte 0x02037b14 -_080A27A8: .4byte 0x05000100 -_080A27AC: .4byte 0x02037fd4 + .pool thumb_func_end pal_fade__1 thumb_func_start sub_80A27B0 @@ -332929,7 +322102,7 @@ sub_80A27B0: @ 80A27B0 lsrs r3, 24 lsls r5, 24 lsrs r5, 24 - ldr r7, _080A2838 + ldr r7, =0x02037fd4 str r0, [r7] movs r0, 0x3F ands r1, r0 @@ -332949,7 +322122,7 @@ sub_80A27B0: @ 80A27B0 ands r1, r0 lsls r1, 6 ldrh r4, [r7, 0x4] - ldr r0, _080A283C + ldr r0, =0xfffff83f ands r0, r4 orrs r0, r1 strh r0, [r7, 0x4] @@ -332985,8 +322158,7 @@ sub_80A27B0: @ 80A27B0 ands r6, r0 b _080A2844 .align 2, 0 -_080A2838: .4byte 0x02037fd4 -_080A283C: .4byte 0xfffff83f + .pool _080A2840: movs r0, 0x40 orrs r6, r0 @@ -333000,7 +322172,7 @@ _080A2844: thumb_func_start pal_fade__2 pal_fade__2: @ 80A284C push {r4-r7,lr} - ldr r2, _080A2860 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -333010,7 +322182,7 @@ pal_fade__2: @ 80A284C movs r0, 0 b _080A295C .align 2, 0 -_080A2860: .4byte 0x02037fd4 + .pool _080A2864: ldrb r2, [r4, 0x4] lsls r1, r2, 26 @@ -333045,7 +322217,7 @@ _080A2886: movs r7, 0x1F ands r0, r7 lsls r0, 6 - ldr r6, _080A28E0 + ldr r6, =0xfffff83f adds r3, r6, 0 ands r3, r1 orrs r3, r0 @@ -333075,7 +322247,7 @@ _080A2886: ands r3, r6 b _080A292C .align 2, 0 -_080A28E0: .4byte 0xfffff83f + .pool _080A28E4: ldrh r2, [r4, 0x4] lsls r1, r2, 21 @@ -333084,7 +322256,7 @@ _080A28E4: movs r6, 0x1F ands r0, r6 lsls r0, 6 - ldr r5, _080A2964 + ldr r5, =0xfffff83f adds r3, r5, 0 ands r3, r2 orrs r3, r0 @@ -333129,7 +322301,7 @@ _080A2930: movs r0, 0 str r0, [r4] ldrh r1, [r4, 0x4] - ldr r0, _080A2964 + ldr r0, =0xfffff83f ands r0, r1 strh r0, [r4, 0x4] _080A294E: @@ -333146,13 +322318,13 @@ _080A295C: pop {r1} bx r1 .align 2, 0 -_080A2964: .4byte 0xfffff83f + .pool thumb_func_end pal_fade__2 thumb_func_start sub_80A2968 sub_80A2968: @ 80A2968 push {r4,lr} - ldr r4, _080A29B4 + ldr r4, =0x02037fd4 ldrh r1, [r4] movs r0, 0x50 bl lcd_io_set @@ -333176,7 +322348,7 @@ sub_80A2968: @ 80A2968 movs r0, 0 str r0, [r4] ldrh r1, [r4, 0x4] - ldr r0, _080A29B8 + ldr r0, =0xfffff83f ands r0, r1 strh r0, [r4, 0x4] ldrb r1, [r4, 0x7] @@ -333188,14 +322360,13 @@ _080A29AC: pop {r0} bx r0 .align 2, 0 -_080A29B4: .4byte 0x02037fd4 -_080A29B8: .4byte 0xfffff83f + .pool thumb_func_end sub_80A2968 thumb_func_start sub_80A29BC sub_80A29BC: @ 80A29BC push {r4,lr} - ldr r3, _080A29F4 + ldr r3, =0x02037fd4 ldrb r4, [r3, 0xA] movs r0, 0x2 ands r0, r4 @@ -333218,13 +322389,12 @@ sub_80A29BC: @ 80A29BC ands r0, r4 strb r0, [r3, 0xA] ldr r0, [r3, 0x8] - ldr r1, _080A29F8 + ldr r1, =0xfffe0fff ands r0, r1 str r0, [r3, 0x8] b _080A2A10 .align 2, 0 -_080A29F4: .4byte 0x02037fd4 -_080A29F8: .4byte 0xfffe0fff + .pool _080A29FC: lsls r0, r2, 15 lsrs r0, 27 @@ -333232,7 +322402,7 @@ _080A29FC: movs r1, 0x1F ands r0, r1 lsls r0, 12 - ldr r1, _080A2A14 + ldr r1, =0xfffe0fff ands r1, r2 orrs r1, r0 str r1, [r3, 0x8] @@ -333240,7 +322410,7 @@ _080A2A10: movs r0, 0x1 b _080A2A1A .align 2, 0 -_080A2A14: .4byte 0xfffe0fff + .pool _080A2A18: movs r0, 0 _080A2A1A: @@ -333291,12 +322461,12 @@ sub_80A2A5C: @ 80A2A5C lsrs r1, 24 lsls r2, 16 lsrs r2, 16 - ldr r4, _080A2A80 - ldr r5, _080A2A84 - ldr r3, _080A2A88 + ldr r4, =0x02037714 + ldr r5, =0x02037b14 + ldr r3, =0x040000d4 str r4, [r3] str r5, [r3, 0x4] - ldr r4, _080A2A8C + ldr r4, =0x84000100 str r4, [r3, 0x8] ldr r3, [r3, 0x8] bl sub_80A2A20 @@ -333304,10 +322474,7 @@ sub_80A2A5C: @ 80A2A5C pop {r0} bx r0 .align 2, 0 -_080A2A80: .4byte 0x02037714 -_080A2A84: .4byte 0x02037b14 -_080A2A88: .4byte 0x040000d4 -_080A2A8C: .4byte 0x84000100 + .pool thumb_func_end sub_80A2A5C thumb_func_start TintPalette_GrayScale @@ -333364,7 +322531,7 @@ sub_80A2AE0: @ 80A2AE0 cmp r1, 0 beq _080A2B34 movs r6, 0x1F - ldr r7, _080A2B3C + ldr r7, =0x0852489c adds r5, r1, 0 _080A2AF2: ldrh r1, [r4] @@ -333406,7 +322573,7 @@ _080A2B34: pop {r0} bx r0 .align 2, 0 -_080A2B3C: .4byte 0x0852489c + .pool thumb_func_end sub_80A2AE0 thumb_func_start TintPalette_SepiaTone @@ -333439,7 +322606,7 @@ _080A2B50: adds r0, r3 adds r1, r0 asrs r1, 8 - ldr r0, _080A2BA8 + ldr r0, =0x00000133 muls r0, r1 lsls r0, 16 lsrs r2, r0, 24 @@ -333467,7 +322634,7 @@ _080A2BA2: pop {r0} bx r0 .align 2, 0 -_080A2BA8: .4byte 0x00000133 + .pool thumb_func_end TintPalette_SepiaTone thumb_func_start sub_80A2BAC @@ -333581,11 +322748,11 @@ sub_80A2C44: @ 80A2C44 lsls r5, 24 lsrs r5, 24 mov r8, r5 - ldr r0, _080A2C9C + ldr r0, =sub_80A2D54 + 1 bl AddTask lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080A2CA0 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -333600,8 +322767,7 @@ sub_80A2C44: @ 80A2C44 movs r0, 0x1 b _080A2CAC .align 2, 0 -_080A2C9C: .4byte sub_80A2D54 + 1 -_080A2CA0: .4byte 0x03005e00 + .pool _080A2CA4: movs r0, 0 strh r0, [r1, 0xE] @@ -333612,7 +322778,7 @@ _080A2CAC: lsls r4, r5, 2 cmp r6, r7 bcs _080A2CC4 - ldr r0, _080A2CF4 + ldr r0, =0x03005e00 adds r1, r4, r5 lsls r1, 3 adds r1, r0 @@ -333625,7 +322791,7 @@ _080A2CC4: movs r1, 0x5 mov r2, r10 bl set_word_task_arg - ldr r0, _080A2CF4 + ldr r0, =0x03005e00 adds r1, r4, r5 lsls r1, 3 adds r1, r0 @@ -333644,7 +322810,7 @@ _080A2CC4: pop {r0} bx r0 .align 2, 0 -_080A2CF4: .4byte 0x03005e00 + .pool thumb_func_end sub_80A2C44 thumb_func_start sub_80A2CF8 @@ -333653,8 +322819,8 @@ sub_80A2CF8: @ 80A2CF8 lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r4, _080A2D1C - ldr r1, _080A2D20 + ldr r4, =sub_80A2D54 + 1 + ldr r1, =0x03005e00 _080A2D04: ldrb r0, [r1, 0x4] cmp r0, 0x1 @@ -333669,8 +322835,7 @@ _080A2D04: movs r0, 0x1 b _080A2D2E .align 2, 0 -_080A2D1C: .4byte sub_80A2D54 + 1 -_080A2D20: .4byte 0x03005e00 + .pool _080A2D24: adds r1, 0x28 adds r2, 0x1 @@ -333690,7 +322855,7 @@ sub_80A2D34: @ 80A2D34 _080A2D38: bl remove_task _080A2D3C: - ldr r0, _080A2D50 + ldr r0, =sub_80A2D54 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -333699,7 +322864,7 @@ _080A2D3C: pop {r0} bx r0 .align 2, 0 -_080A2D50: .4byte sub_80A2D54 + 1 + .pool thumb_func_end sub_80A2D34 thumb_func_start sub_80A2D54 @@ -333710,7 +322875,7 @@ sub_80A2D54: @ 80A2D54 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A2DA8 + ldr r1, =0x03005e08 adds r4, r0, r1 adds r0, r5, 0 movs r1, 0x5 @@ -333743,7 +322908,7 @@ sub_80A2D54: @ 80A2D54 bl remove_task b _080A2DCC .align 2, 0 -_080A2DA8: .4byte 0x03005e08 + .pool _080A2DAC: ldrh r0, [r4, 0x4] adds r1, r0 @@ -333772,32 +322937,31 @@ _080A2DCC: thumb_func_start sound_sources_off sound_sources_off: @ 80A2DD4 push {lr} - ldr r1, _080A2DE4 + ldr r1, =0x03005df8 movs r0, 0 strb r0, [r1] bl map_music_set_to_zero pop {r0} bx r0 .align 2, 0 -_080A2DE4: .4byte 0x03005df8 + .pool thumb_func_end sound_sources_off thumb_func_start sound_something sound_something: @ 80A2DE8 push {r4,r5,lr} - ldr r0, _080A2E00 + ldr r0, =0x03000f4c ldrb r1, [r0] adds r2, r0, 0 cmp r1, 0x7 bhi _080A2ECA lsls r0, r1, 2 - ldr r1, _080A2E04 + ldr r1, =_080A2E08 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A2E00: .4byte 0x03000f4c -_080A2E04: .4byte _080A2E08 + .pool .align 2, 0 _080A2E08: .4byte _080A2ECA @@ -333811,26 +322975,25 @@ _080A2E08: _080A2E28: movs r0, 0x2 strb r0, [r2] - ldr r0, _080A2E38 + ldr r0, =0x03000f48 ldrh r0, [r0] bl song_play_for_text b _080A2ECA .align 2, 0 -_080A2E38: .4byte 0x03000f48 + .pool _080A2E3C: bl sub_80A3258 lsls r0, 24 cmp r0, 0 beq _080A2ECA - ldr r0, _080A2E54 + ldr r0, =0x03000f4a movs r1, 0 strh r1, [r0] - ldr r0, _080A2E58 + ldr r0, =0x03000f4c strb r1, [r0] b _080A2ECA .align 2, 0 -_080A2E54: .4byte 0x03000f4a -_080A2E58: .4byte 0x03000f4c + .pool _080A2E5C: bl sub_80A3258 lsls r0, 24 @@ -333840,22 +323003,20 @@ _080A2E5C: lsls r0, 24 cmp r0, 0 beq _080A2ECA - ldr r2, _080A2E8C - ldr r1, _080A2E90 + ldr r2, =0x03000f48 + ldr r1, =0x03000f4a ldrh r0, [r1] strh r0, [r2] movs r0, 0 strh r0, [r1] - ldr r1, _080A2E94 + ldr r1, =0x03000f4c movs r0, 0x2 strb r0, [r1] ldrh r0, [r2] bl song_play_for_text b _080A2ECA .align 2, 0 -_080A2E8C: .4byte 0x03000f48 -_080A2E90: .4byte 0x03000f4a -_080A2E94: .4byte 0x03000f4c + .pool _080A2E98: bl sub_80A3258 lsls r0, 24 @@ -333865,17 +323026,17 @@ _080A2E98: lsls r0, 24 cmp r0, 0 beq _080A2ECA - ldr r4, _080A2ED0 + ldr r4, =0x03000f4a ldrh r0, [r4] - ldr r5, _080A2ED4 + ldr r5, =0x03000f4d ldrb r1, [r5] bl sub_80A3194 - ldr r1, _080A2ED8 + ldr r1, =0x03000f48 ldrh r0, [r4] strh r0, [r1] movs r2, 0 strh r2, [r4] - ldr r1, _080A2EDC + ldr r1, =0x03000f4c movs r0, 0x2 strb r0, [r1] strb r2, [r5] @@ -333884,72 +323045,62 @@ _080A2ECA: pop {r0} bx r0 .align 2, 0 -_080A2ED0: .4byte 0x03000f4a -_080A2ED4: .4byte 0x03000f4d -_080A2ED8: .4byte 0x03000f48 -_080A2EDC: .4byte 0x03000f4c + .pool thumb_func_end sound_something thumb_func_start map_music_set_to_zero map_music_set_to_zero: @ 80A2EE0 - ldr r0, _080A2EF4 + ldr r0, =0x03000f48 movs r1, 0 strh r1, [r0] - ldr r0, _080A2EF8 + ldr r0, =0x03000f4a strh r1, [r0] - ldr r0, _080A2EFC + ldr r0, =0x03000f4c strb r1, [r0] - ldr r0, _080A2F00 + ldr r0, =0x03000f4d strb r1, [r0] bx lr .align 2, 0 -_080A2EF4: .4byte 0x03000f48 -_080A2EF8: .4byte 0x03000f4a -_080A2EFC: .4byte 0x03000f4c -_080A2F00: .4byte 0x03000f4d + .pool thumb_func_end map_music_set_to_zero thumb_func_start current_map_music_get current_map_music_get: @ 80A2F04 - ldr r0, _080A2F0C + ldr r0, =0x03000f48 ldrh r0, [r0] bx lr .align 2, 0 -_080A2F0C: .4byte 0x03000f48 + .pool thumb_func_end current_map_music_get thumb_func_start current_map_music_set current_map_music_set: @ 80A2F10 - ldr r1, _080A2F24 + ldr r1, =0x03000f48 strh r0, [r1] - ldr r1, _080A2F28 + ldr r1, =0x03000f4a movs r0, 0 strh r0, [r1] - ldr r1, _080A2F2C + ldr r1, =0x03000f4c movs r0, 0x1 strb r0, [r1] bx lr .align 2, 0 -_080A2F24: .4byte 0x03000f48 -_080A2F28: .4byte 0x03000f4a -_080A2F2C: .4byte 0x03000f4c + .pool thumb_func_end current_map_music_set thumb_func_start sub_80A2F30 sub_80A2F30: @ 80A2F30 - ldr r0, _080A2F44 + ldr r0, =0x03000f48 movs r1, 0 strh r1, [r0] - ldr r0, _080A2F48 + ldr r0, =0x03000f4a strh r1, [r0] - ldr r1, _080A2F4C + ldr r1, =0x03000f4c movs r0, 0x1 strb r0, [r1] bx lr .align 2, 0 -_080A2F44: .4byte 0x03000f48 -_080A2F48: .4byte 0x03000f4a -_080A2F4C: .4byte 0x03000f4c + .pool thumb_func_end sub_80A2F30 thumb_func_start sub_80A2F50 @@ -333964,21 +323115,19 @@ sub_80A2F50: @ 80A2F50 adds r0, r4, 0 bl play_sound_effect _080A2F66: - ldr r0, _080A2F7C + ldr r0, =0x03000f48 movs r1, 0 strh r1, [r0] - ldr r0, _080A2F80 + ldr r0, =0x03000f4a strh r1, [r0] - ldr r1, _080A2F84 + ldr r1, =0x03000f4c movs r0, 0x5 strb r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_080A2F7C: .4byte 0x03000f48 -_080A2F80: .4byte 0x03000f4a -_080A2F84: .4byte 0x03000f4c + .pool thumb_func_end sub_80A2F50 thumb_func_start sub_80A2F88 @@ -333991,21 +323140,19 @@ sub_80A2F88: @ 80A2F88 lsls r0, 24 lsrs r0, 24 bl sub_80A2F50 - ldr r1, _080A2FB0 + ldr r1, =0x03000f48 movs r0, 0 strh r0, [r1] - ldr r0, _080A2FB4 + ldr r0, =0x03000f4a strh r4, [r0] - ldr r1, _080A2FB8 + ldr r1, =0x03000f4c movs r0, 0x6 strb r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_080A2FB0: .4byte 0x03000f48 -_080A2FB4: .4byte 0x03000f4a -_080A2FB8: .4byte 0x03000f4c + .pool thumb_func_end sub_80A2F88 thumb_func_start sub_80A2FBC @@ -334021,24 +323168,21 @@ sub_80A2FBC: @ 80A2FBC lsls r5, 24 lsrs r5, 24 bl sub_80A2F50 - ldr r1, _080A2FF0 + ldr r1, =0x03000f48 movs r0, 0 strh r0, [r1] - ldr r0, _080A2FF4 + ldr r0, =0x03000f4a strh r4, [r0] - ldr r1, _080A2FF8 + ldr r1, =0x03000f4c movs r0, 0x7 strb r0, [r1] - ldr r0, _080A2FFC + ldr r0, =0x03000f4d strb r5, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080A2FF0: .4byte 0x03000f48 -_080A2FF4: .4byte 0x03000f4a -_080A2FF8: .4byte 0x03000f4c -_080A2FFC: .4byte 0x03000f4d + .pool thumb_func_end sub_80A2FBC thumb_func_start sub_80A3000 @@ -334051,30 +323195,27 @@ sub_80A3000: @ 80A3000 lsrs r1, 24 adds r0, r4, 0 bl sub_80A3194 - ldr r0, _080A302C + ldr r0, =0x03000f48 strh r4, [r0] - ldr r0, _080A3030 + ldr r0, =0x03000f4a movs r2, 0 strh r2, [r0] - ldr r1, _080A3034 + ldr r1, =0x03000f4c movs r0, 0x2 strb r0, [r1] - ldr r0, _080A3038 + ldr r0, =0x03000f4d strb r2, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080A302C: .4byte 0x03000f48 -_080A3030: .4byte 0x03000f4a -_080A3034: .4byte 0x03000f4c -_080A3038: .4byte 0x03000f4d + .pool thumb_func_end sub_80A3000 thumb_func_start sub_80A303C sub_80A303C: @ 80A303C push {lr} - ldr r0, _080A3054 + ldr r0, =0x03000f4c ldrb r0, [r0] cmp r0, 0x6 beq _080A3058 @@ -334085,7 +323226,7 @@ sub_80A303C: @ 80A303C movs r0, 0x1 b _080A305A .align 2, 0 -_080A3054: .4byte 0x03000f4c + .pool _080A3058: movs r0, 0 _080A305A: @@ -334099,13 +323240,13 @@ pause_music_for_sound_maybe: @ 80A3060 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080A3088 + ldr r0, =0x03007420 bl MPlayStop_rev01 - ldr r0, _080A308C + ldr r0, =0x085248bc lsls r4, 2 adds r4, r0 ldrh r0, [r4] - ldr r2, _080A3090 + ldr r2, =0x03000f4e ldrh r1, [r4, 0x2] strh r1, [r2] bl m4aSongNumStart @@ -334113,9 +323254,7 @@ pause_music_for_sound_maybe: @ 80A3060 pop {r0} bx r0 .align 2, 0 -_080A3088: .4byte 0x03007420 -_080A308C: .4byte 0x085248bc -_080A3090: .4byte 0x03000f4e + .pool thumb_func_end pause_music_for_sound_maybe thumb_func_start ducking_tick @@ -334123,7 +323262,7 @@ ducking_tick: @ 80A3094 push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r2, _080A30AC + ldr r2, =0x03000f4e ldrh r0, [r2] cmp r0, 0 beq _080A30B0 @@ -334132,15 +323271,15 @@ ducking_tick: @ 80A3094 movs r0, 0 b _080A30C8 .align 2, 0 -_080A30AC: .4byte 0x03000f4e + .pool _080A30B0: cmp r1, 0 bne _080A30C0 - ldr r0, _080A30BC + ldr r0, =0x03007420 bl m4aMPlayContinue b _080A30C6 .align 2, 0 -_080A30BC: .4byte 0x03007420 + .pool _080A30C0: movs r0, 0 bl m4aSongNumStart @@ -334155,7 +323294,7 @@ _080A30C8: sub_80A30CC: @ 80A30CC push {lr} lsls r0, 24 - ldr r1, _080A30E0 + ldr r1, =0x085248bc lsrs r0, 22 adds r0, r1 ldrh r0, [r0] @@ -334163,7 +323302,7 @@ sub_80A30CC: @ 80A30CC pop {r0} bx r0 .align 2, 0 -_080A30E0: .4byte 0x085248bc + .pool thumb_func_end sub_80A30CC thumb_func_start fanfare_play @@ -334172,7 +323311,7 @@ fanfare_play: @ 80A30E4 lsls r0, 16 lsrs r3, r0, 16 movs r1, 0 - ldr r2, _080A3104 + ldr r2, =0x085248bc _080A30EE: ldrh r0, [r2] cmp r0, r3 @@ -334183,7 +323322,7 @@ _080A30EE: bl task_add_50_overworld_fanfare_if_not_running b _080A311A .align 2, 0 -_080A3104: .4byte 0x085248bc + .pool _080A3108: adds r2, 0x4 adds r1, 0x1 @@ -334200,7 +323339,7 @@ _080A311A: thumb_func_start task_is_not_running_overworld_fanfare task_is_not_running_overworld_fanfare: @ 80A3120 push {lr} - ldr r0, _080A3134 + ldr r0, =task50_overworld_fanfare + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -334209,7 +323348,7 @@ task_is_not_running_overworld_fanfare: @ 80A3120 movs r0, 0x1 b _080A313A .align 2, 0 -_080A3134: .4byte task50_overworld_fanfare + 1 + .pool _080A3138: movs r0, 0 _080A313A: @@ -334222,7 +323361,7 @@ task50_overworld_fanfare: @ 80A3140 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080A3154 + ldr r1, =0x03000f4e ldrh r0, [r1] cmp r0, 0 beq _080A3158 @@ -334230,9 +323369,9 @@ task50_overworld_fanfare: @ 80A3140 strh r0, [r1] b _080A3164 .align 2, 0 -_080A3154: .4byte 0x03000f4e + .pool _080A3158: - ldr r0, _080A316C + ldr r0, =0x03007420 bl m4aMPlayContinue adds r0, r4, 0 bl remove_task @@ -334241,13 +323380,13 @@ _080A3164: pop {r0} bx r0 .align 2, 0 -_080A316C: .4byte 0x03007420 + .pool thumb_func_end task50_overworld_fanfare thumb_func_start task_add_50_overworld_fanfare_if_not_running task_add_50_overworld_fanfare_if_not_running: @ 80A3170 push {r4,lr} - ldr r4, _080A3190 + ldr r4, =task50_overworld_fanfare + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -334262,7 +323401,7 @@ _080A318A: pop {r0} bx r0 .align 2, 0 -_080A3190: .4byte task50_overworld_fanfare + 1 + .pool thumb_func_end task_add_50_overworld_fanfare_if_not_running thumb_func_start sub_80A3194 @@ -334272,20 +323411,20 @@ sub_80A3194: @ 80A3194 lsrs r5, r0, 16 lsls r1, 24 lsrs r7, r1, 24 - ldr r0, _080A31DC + ldr r0, =0x03005df8 ldrb r0, [r0] cmp r0, 0 beq _080A31A8 movs r5, 0 _080A31A8: - ldr r6, _080A31E0 + ldr r6, =0x0000ffff cmp r5, r6 bne _080A31B0 movs r5, 0 _080A31B0: adds r0, r5, 0 bl m4aSongNumStart - ldr r4, _080A31E4 + ldr r4, =0x03007420 adds r0, r4, 0 bl m4aMPlayImmInit adds r0, r4, 0 @@ -334301,9 +323440,7 @@ _080A31B0: pop {r0} bx r0 .align 2, 0 -_080A31DC: .4byte 0x03005df8 -_080A31E0: .4byte 0x0000ffff -_080A31E4: .4byte 0x03007420 + .pool thumb_func_end sub_80A3194 thumb_func_start sub_80A31E8 @@ -334312,30 +323449,29 @@ sub_80A31E8: @ 80A31E8 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _080A31FC + ldr r0, =0x03007420 bl sub_82E0308 pop {r0} bx r0 .align 2, 0 -_080A31FC: .4byte 0x03007420 + .pool thumb_func_end sub_80A31E8 thumb_func_start sub_80A3200 sub_80A3200: @ 80A3200 push {lr} - ldr r0, _080A3218 + ldr r0, =0x03007420 ldr r1, [r0, 0x4] cmp r1, 0 blt _080A3220 - ldr r0, _080A321C + ldr r0, =0x0000ffff ands r1, r0 cmp r1, 0 beq _080A3220 movs r0, 0 b _080A3222 .align 2, 0 -_080A3218: .4byte 0x03007420 -_080A321C: .4byte 0x0000ffff + .pool _080A3220: movs r0, 0x1 _080A3222: @@ -334349,12 +323485,12 @@ sub_80A3228: @ 80A3228 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _080A323C + ldr r0, =0x03007420 bl sub_82E0328 pop {r0} bx r0 .align 2, 0 -_080A323C: .4byte 0x03007420 + .pool thumb_func_end sub_80A3228 thumb_func_start play_sound_effect @@ -334363,25 +323499,25 @@ play_sound_effect: @ 80A3240 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _080A3254 + ldr r0, =0x03007420 bl m4aMPlayFadeOut pop {r0} bx r0 .align 2, 0 -_080A3254: .4byte 0x03007420 + .pool thumb_func_end play_sound_effect thumb_func_start sub_80A3258 sub_80A3258: @ 80A3258 push {lr} - ldr r0, _080A3268 + ldr r0, =0x03007420 ldrh r0, [r0, 0x4] cmp r0, 0 beq _080A326C movs r0, 0 b _080A326E .align 2, 0 -_080A3268: .4byte 0x03007420 + .pool _080A326C: movs r0, 0x1 _080A326E: @@ -334399,8 +323535,8 @@ cry_related: @ 80A3274 lsrs r5, 16 lsls r4, 24 lsrs r4, 24 - ldr r0, _080A32B4 - ldr r1, _080A32B8 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x55 bl MPlayVolumeControl lsls r4, 24 @@ -334412,7 +323548,7 @@ cry_related: @ 80A3274 movs r2, 0x78 movs r3, 0xA bl sub_80A344C - ldr r1, _080A32BC + ldr r1, =0x020383ec movs r0, 0x2 strb r0, [r1] bl sub_80A3754 @@ -334421,9 +323557,7 @@ cry_related: @ 80A3274 pop {r0} bx r0 .align 2, 0 -_080A32B4: .4byte 0x03007420 -_080A32B8: .4byte 0x0000ffff -_080A32BC: .4byte 0x020383ec + .pool thumb_func_end cry_related thumb_func_start sub_80A32C0 @@ -334468,8 +323602,8 @@ sub_80A32E4: @ 80A32E4 bl sub_80A344C b _080A332E _080A330A: - ldr r0, _080A3338 - ldr r1, _080A333C + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x55 bl MPlayVolumeControl lsls r1, r5, 24 @@ -334479,7 +323613,7 @@ _080A330A: movs r2, 0x78 movs r3, 0xA bl sub_80A344C - ldr r1, _080A3340 + ldr r1, =0x020383ec movs r0, 0x2 strb r0, [r1] bl sub_80A3754 @@ -334489,9 +323623,7 @@ _080A332E: pop {r0} bx r0 .align 2, 0 -_080A3338: .4byte 0x03007420 -_080A333C: .4byte 0x0000ffff -_080A3340: .4byte 0x020383ec + .pool thumb_func_end sub_80A32E4 thumb_func_start sub_80A3344 @@ -334517,14 +323649,14 @@ sub_80A3344: @ 80A3344 bl sub_80A344C b _080A3394 _080A336E: - ldr r0, _080A339C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _080A3384 - ldr r0, _080A33A0 - ldr r1, _080A33A4 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x55 bl MPlayVolumeControl _080A3384: @@ -334541,9 +323673,7 @@ _080A3394: pop {r0} bx r0 .align 2, 0 -_080A339C: .4byte 0x02022fec -_080A33A0: .4byte 0x03007420 -_080A33A4: .4byte 0x0000ffff + .pool thumb_func_end sub_80A3344 thumb_func_start play_cry_maybe @@ -334567,8 +323697,8 @@ play_cry_maybe: @ 80A33A8 bl sub_80A344C b _080A33EE _080A33CE: - ldr r0, _080A33F8 - ldr r1, _080A33FC + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x55 bl MPlayVolumeControl lsls r1, r5, 24 @@ -334578,7 +323708,7 @@ _080A33CE: movs r2, 0x78 movs r3, 0xA bl sub_80A344C - ldr r1, _080A3400 + ldr r1, =0x020383ec movs r0, 0x2 strb r0, [r1] _080A33EE: @@ -334587,9 +323717,7 @@ _080A33EE: pop {r0} bx r0 .align 2, 0 -_080A33F8: .4byte 0x03007420 -_080A33FC: .4byte 0x0000ffff -_080A3400: .4byte 0x020383ec + .pool thumb_func_end play_cry_maybe thumb_func_start sub_80A3404 @@ -334602,8 +323730,8 @@ sub_80A3404: @ 80A3404 lsrs r5, 16 lsls r4, 24 lsrs r4, 24 - ldr r0, _080A3440 - ldr r1, _080A3444 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x55 bl MPlayVolumeControl str r4, [sp] @@ -334612,7 +323740,7 @@ sub_80A3404: @ 80A3404 movs r2, 0x78 movs r3, 0xA bl sub_80A344C - ldr r1, _080A3448 + ldr r1, =0x020383ec movs r0, 0x2 strb r0, [r1] bl sub_80A3754 @@ -334621,9 +323749,7 @@ sub_80A3404: @ 80A3404 pop {r0} bx r0 .align 2, 0 -_080A3440: .4byte 0x03007420 -_080A3444: .4byte 0x0000ffff -_080A3448: .4byte 0x020383ec + .pool thumb_func_end sub_80A3404 thumb_func_start sub_80A344C @@ -334646,7 +323772,7 @@ sub_80A344C: @ 80A344C str r3, [sp] lsls r4, 24 lsrs r1, r4, 24 - ldr r3, _080A3494 + ldr r3, =0xffff0000 adds r0, r3 lsrs r7, r0, 16 movs r6, 0x8C @@ -334659,13 +323785,12 @@ sub_80A344C: @ 80A344C cmp r1, 0xC bhi _080A3562 lsls r0, r1, 2 - ldr r1, _080A3498 + ldr r1, =_080A349C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A3494: .4byte 0xffff0000 -_080A3498: .4byte _080A349C + .pool .align 2, 0 _080A349C: .4byte _080A3562 @@ -334687,49 +323812,49 @@ _080A34D0: b _080A3562 _080A34D6: movs r5, 0xE1 - ldr r4, _080A34E0 + ldr r4, =0x00003cf0 movs r1, 0x14 b _080A3504 .align 2, 0 -_080A34E0: .4byte 0x00003cf0 + .pool _080A34E4: movs r6, 0x32 movs r5, 0xC8 - ldr r4, _080A34F4 + ldr r4, =0x00003db8 movs r3, 0x14 mov r8, r3 movs r2, 0x5A b _080A3562 .align 2, 0 -_080A34F4: .4byte 0x00003db8 + .pool _080A34F8: movs r6, 0x19 movs r0, 0x1 mov r9, r0 movs r5, 0x64 - ldr r4, _080A350C + ldr r4, =0x00003cf0 movs r1, 0xC0 _080A3504: mov r8, r1 movs r2, 0x5A b _080A3562 .align 2, 0 -_080A350C: .4byte 0x00003cf0 + .pool _080A3510: movs r5, 0xC8 - ldr r4, _080A3518 + ldr r4, =0x00003868 b _080A3562 .align 2, 0 -_080A3518: .4byte 0x00003868 + .pool _080A351C: movs r5, 0xDC - ldr r4, _080A3528 + ldr r4, =0x00003cc3 movs r3, 0xC0 mov r8, r3 movs r2, 0x46 b _080A3562 .align 2, 0 -_080A3528: .4byte 0x00003cc3 + .pool _080A352C: movs r6, 0xA movs r5, 0x64 @@ -334747,22 +323872,22 @@ _080A3540: movs r0, 0x1 mov r9, r0 movs r5, 0x7D - ldr r4, _080A354C + ldr r4, =0x00003b60 b _080A3562 .align 2, 0 -_080A354C: .4byte 0x00003b60 + .pool _080A3550: movs r6, 0x64 movs r5, 0xE1 - ldr r4, _080A3558 + ldr r4, =0x00003b60 b _080A3562 .align 2, 0 -_080A3558: .4byte 0x00003b60 + .pool _080A355C: movs r6, 0x14 movs r5, 0xE1 _080A3560: - ldr r4, _080A35BC + ldr r4, =0x00003a98 _080A3562: adds r0, r2, 0 bl sub_82E1744 @@ -334801,7 +323926,7 @@ _080A3562: beq _080A35CA b _080A365E .align 2, 0 -_080A35BC: .4byte 0x00003a98 + .pool _080A35C0: cmp r2, 0x2 beq _080A3614 @@ -334815,18 +323940,18 @@ _080A35CA: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _080A35DC + ldr r1, =0x0869ef24 b _080A3654 .align 2, 0 -_080A35DC: .4byte 0x0869ef24 + .pool _080A35E0: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _080A35EC + ldr r1, =0x0869dcf4 b _080A3654 .align 2, 0 -_080A35EC: .4byte 0x0869dcf4 + .pool _080A35F0: mov r3, r9 cmp r3, 0 @@ -334834,18 +323959,18 @@ _080A35F0: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _080A3600 + ldr r1, =0x0869f524 b _080A3654 .align 2, 0 -_080A3600: .4byte 0x0869f524 + .pool _080A3604: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _080A3610 + ldr r1, =0x0869e2f4 b _080A3654 .align 2, 0 -_080A3610: .4byte 0x0869e2f4 + .pool _080A3614: mov r0, r9 cmp r0, 0 @@ -334853,18 +323978,18 @@ _080A3614: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _080A3624 + ldr r1, =0x0869fb24 b _080A3654 .align 2, 0 -_080A3624: .4byte 0x0869fb24 + .pool _080A3628: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _080A3634 + ldr r1, =0x0869e8f4 b _080A3654 .align 2, 0 -_080A3634: .4byte 0x0869e8f4 + .pool _080A3638: mov r3, r9 cmp r3, 0 @@ -334872,19 +323997,19 @@ _080A3638: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _080A3648 + ldr r1, =0x086a0124 b _080A3654 .align 2, 0 -_080A3648: .4byte 0x086a0124 + .pool _080A364C: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _080A3670 + ldr r1, =0x0869eef4 _080A3654: adds r0, r1 bl sub_82E1674 - ldr r1, _080A3674 + ldr r1, =0x020383e8 str r0, [r1] _080A365E: add sp, 0x4 @@ -334896,14 +324021,13 @@ _080A365E: pop {r0} bx r0 .align 2, 0 -_080A3670: .4byte 0x0869eef4 -_080A3674: .4byte 0x020383e8 + .pool thumb_func_end sub_80A344C thumb_func_start sub_80A3678 sub_80A3678: @ 80A3678 push {lr} - ldr r0, _080A3690 + ldr r0, =sub_80A370C + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -334913,7 +324037,7 @@ sub_80A3678: @ 80A3678 movs r0, 0x1 b _080A3696 .align 2, 0 -_080A3690: .4byte sub_80A370C + 1 + .pool _080A3694: movs r0, 0 _080A3696: @@ -334924,32 +324048,32 @@ _080A3696: thumb_func_start sub_80A369C sub_80A369C: @ 80A369C push {lr} - ldr r0, _080A36B0 + ldr r0, =0x020383e8 ldr r0, [r0] bl MPlayStop_rev01 bl sub_8000964 pop {r0} bx r0 .align 2, 0 -_080A36B0: .4byte 0x020383e8 + .pool thumb_func_end sub_80A369C thumb_func_start sub_80A36B4 sub_80A36B4: @ 80A36B4 push {lr} - ldr r0, _080A36C4 + ldr r0, =0x020383e8 ldr r0, [r0] bl MPlayStop_rev01 pop {r0} bx r0 .align 2, 0 -_080A36C4: .4byte 0x020383e8 + .pool thumb_func_end sub_80A36B4 thumb_func_start sub_80A36C8 sub_80A36C8: @ 80A36C8 push {lr} - ldr r0, _080A36E0 + ldr r0, =0x020383e8 ldr r0, [r0] bl sub_82E17CC cmp r0, 0 @@ -334958,7 +324082,7 @@ sub_80A36C8: @ 80A36C8 movs r0, 0 b _080A36E6 .align 2, 0 -_080A36E0: .4byte 0x020383e8 + .pool _080A36E4: movs r0, 0x1 _080A36E6: @@ -334969,7 +324093,7 @@ _080A36E6: thumb_func_start sub_80A36EC sub_80A36EC: @ 80A36EC push {lr} - ldr r0, _080A3700 + ldr r0, =0x020383e8 ldr r0, [r0] bl sub_82E17CC cmp r0, 0 @@ -334977,7 +324101,7 @@ sub_80A36EC: @ 80A36EC movs r0, 0 b _080A3706 .align 2, 0 -_080A3700: .4byte 0x020383e8 + .pool _080A3704: movs r0, 0x1 _080A3706: @@ -334990,7 +324114,7 @@ sub_80A370C: @ 80A370C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080A3720 + ldr r1, =0x020383ec ldrb r0, [r1] cmp r0, 0 beq _080A3724 @@ -334998,15 +324122,15 @@ sub_80A370C: @ 80A370C strb r0, [r1] b _080A3742 .align 2, 0 -_080A3720: .4byte 0x020383ec + .pool _080A3724: - ldr r0, _080A3748 + ldr r0, =0x020383e8 ldr r0, [r0] bl sub_82E17CC cmp r0, 0 bne _080A3742 - ldr r0, _080A374C - ldr r1, _080A3750 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl @@ -335017,15 +324141,13 @@ _080A3742: pop {r0} bx r0 .align 2, 0 -_080A3748: .4byte 0x020383e8 -_080A374C: .4byte 0x03007420 -_080A3750: .4byte 0x0000ffff + .pool thumb_func_end sub_80A370C thumb_func_start sub_80A3754 sub_80A3754: @ 80A3754 push {r4,lr} - ldr r4, _080A3774 + ldr r4, =sub_80A370C + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -335040,7 +324162,7 @@ _080A376E: pop {r0} bx r0 .align 2, 0 -_080A3774: .4byte sub_80A370C + 1 + .pool thumb_func_end sub_80A3754 thumb_func_start song_play_for_text @@ -335048,13 +324170,13 @@ song_play_for_text: @ 80A3778 push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _080A379C + ldr r0, =0x03005df8 ldrb r0, [r0] cmp r0, 0 beq _080A3788 movs r1, 0 _080A3788: - ldr r0, _080A37A0 + ldr r0, =0x0000ffff cmp r1, r0 bne _080A3790 movs r1, 0 @@ -335064,8 +324186,7 @@ _080A3790: pop {r0} bx r0 .align 2, 0 -_080A379C: .4byte 0x03005df8 -_080A37A0: .4byte 0x0000ffff + .pool thumb_func_end song_play_for_text thumb_func_start audio_play @@ -335089,13 +324210,13 @@ audio_play_and_stuff: @ 80A37B4 lsls r4, 24 lsrs r4, 24 bl m4aSongNumStart - ldr r6, _080A37FC + ldr r6, =0x030075f0 adds r0, r6, 0 bl m4aMPlayImmInit - ldr r0, _080A3800 + ldr r0, =0x03007630 mov r8, r0 bl m4aMPlayImmInit - ldr r5, _080A3804 + ldr r5, =0x0000ffff lsls r4, 24 asrs r4, 24 adds r0, r6, 0 @@ -335112,9 +324233,7 @@ audio_play_and_stuff: @ 80A37B4 pop {r0} bx r0 .align 2, 0 -_080A37FC: .4byte 0x030075f0 -_080A3800: .4byte 0x03007630 -_080A3804: .4byte 0x0000ffff + .pool thumb_func_end audio_play_and_stuff thumb_func_start sub_80A3808 @@ -335126,10 +324245,10 @@ sub_80A3808: @ 80A3808 lsls r4, 24 lsrs r4, 24 bl m4aSongNumStart - ldr r5, _080A3834 + ldr r5, =0x030075f0 adds r0, r5, 0 bl m4aMPlayImmInit - ldr r1, _080A3838 + ldr r1, =0x0000ffff lsls r4, 24 asrs r4, 24 adds r0, r5, 0 @@ -335139,8 +324258,7 @@ sub_80A3808: @ 80A3808 pop {r0} bx r0 .align 2, 0 -_080A3834: .4byte 0x030075f0 -_080A3838: .4byte 0x0000ffff + .pool thumb_func_end sub_80A3808 thumb_func_start sub_80A383C @@ -335152,10 +324270,10 @@ sub_80A383C: @ 80A383C lsls r4, 24 lsrs r4, 24 bl m4aSongNumStart - ldr r5, _080A3868 + ldr r5, =0x03007630 adds r0, r5, 0 bl m4aMPlayImmInit - ldr r1, _080A386C + ldr r1, =0x0000ffff lsls r4, 24 asrs r4, 24 adds r0, r5, 0 @@ -335165,22 +324283,21 @@ sub_80A383C: @ 80A383C pop {r0} bx r0 .align 2, 0 -_080A3868: .4byte 0x03007630 -_080A386C: .4byte 0x0000ffff + .pool thumb_func_end sub_80A383C thumb_func_start sub_80A3870 sub_80A3870: @ 80A3870 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _080A3894 - ldr r5, _080A3898 + ldr r0, =0x030075f0 + ldr r5, =0x0000ffff lsls r4, 24 asrs r4, 24 adds r1, r5, 0 adds r2, r4, 0 bl MPlayPanpotControl - ldr r0, _080A389C + ldr r0, =0x03007630 adds r1, r5, 0 adds r2, r4, 0 bl MPlayPanpotControl @@ -335188,32 +324305,30 @@ sub_80A3870: @ 80A3870 pop {r0} bx r0 .align 2, 0 -_080A3894: .4byte 0x030075f0 -_080A3898: .4byte 0x0000ffff -_080A389C: .4byte 0x03007630 + .pool thumb_func_end sub_80A3870 thumb_func_start mplay_has_finished_maybe mplay_has_finished_maybe: @ 80A38A0 push {lr} - ldr r0, _080A38D0 + ldr r0, =0x030075f0 ldr r1, [r0, 0x4] movs r2, 0x80 lsls r2, 24 adds r3, r0, 0 cmp r1, 0 bge _080A38BA - ldr r0, _080A38D4 + ldr r0, =0x03007630 ldr r0, [r0, 0x4] ands r0, r2 cmp r0, 0 bne _080A38CC _080A38BA: - ldr r1, _080A38D8 + ldr r1, =0x0000ffff ldrh r0, [r3, 0x4] cmp r0, 0 bne _080A38DC - ldr r0, _080A38D4 + ldr r0, =0x03007630 ldr r0, [r0, 0x4] ands r0, r1 cmp r0, 0 @@ -335222,9 +324337,7 @@ _080A38CC: movs r0, 0 b _080A38DE .align 2, 0 -_080A38D0: .4byte 0x030075f0 -_080A38D4: .4byte 0x03007630 -_080A38D8: .4byte 0x0000ffff + .pool _080A38DC: movs r0, 0x1 _080A38DE: @@ -335235,19 +324348,18 @@ _080A38DE: thumb_func_start sub_80A38E4 sub_80A38E4: @ 80A38E4 push {lr} - ldr r0, _080A38FC + ldr r0, =0x03007420 ldr r1, [r0, 0x4] cmp r1, 0 blt _080A3904 - ldr r0, _080A3900 + ldr r0, =0x0000ffff ands r1, r0 cmp r1, 0 beq _080A3904 movs r0, 0x1 b _080A3906 .align 2, 0 -_080A38FC: .4byte 0x03007420 -_080A3900: .4byte 0x0000ffff + .pool _080A3904: movs r0, 0 _080A3906: @@ -335258,19 +324370,18 @@ _080A3906: thumb_func_start sub_80A390C sub_80A390C: @ 80A390C push {lr} - ldr r0, _080A3924 + ldr r0, =0x03007800 ldr r1, [r0, 0x4] cmp r1, 0 blt _080A392C - ldr r0, _080A3928 + ldr r0, =0x0000ffff ands r1, r0 cmp r1, 0 beq _080A392C movs r0, 0x1 b _080A392E .align 2, 0 -_080A3924: .4byte 0x03007800 -_080A3928: .4byte 0x0000ffff + .pool _080A392C: movs r0, 0 _080A392E: @@ -335284,38 +324395,38 @@ sub_80A3934: @ 80A3934 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _080A39C8 + ldr r0, =0x020383fc movs r1, 0 strb r1, [r0] - ldr r0, _080A39CC + ldr r0, =0x020383fd strb r1, [r0] - ldr r0, _080A39D0 + ldr r0, =0x020383fe strb r1, [r0] - ldr r0, _080A39D4 + ldr r0, =0x020383ff strb r1, [r0] - ldr r0, _080A39D8 + ldr r0, =0x02038400 movs r1, 0 str r1, [r0] - ldr r0, _080A39DC + ldr r0, =0x02038404 str r1, [r0] - ldr r0, _080A39E0 + ldr r0, =0x02038408 movs r2, 0 strh r1, [r0] - ldr r0, _080A39E4 + ldr r0, =0x0203841a strb r2, [r0] - ldr r4, _080A39E8 - ldr r5, _080A39EC - ldr r6, _080A39F0 - ldr r7, _080A39F4 - ldr r0, _080A39F8 + ldr r4, =0x02038430 + ldr r5, =0x02038432 + ldr r6, =0x02038433 + ldr r7, =0x02038434 + ldr r0, =0x02038436 mov r12, r0 - ldr r1, _080A39FC + ldr r1, =0x02038437 mov r8, r1 - ldr r0, _080A3A00 + ldr r0, =0x02038440 mov r9, r0 - ldr r1, _080A3A04 + ldr r1, =0x0000ffff adds r3, r1, 0 - ldr r1, _080A3A08 + ldr r1, =0x0203840a movs r2, 0x7 _080A397E: ldrh r0, [r1] @@ -335325,7 +324436,7 @@ _080A397E: subs r2, 0x1 cmp r2, 0 bge _080A397E - ldr r1, _080A3A0C + ldr r1, =0x0203841e movs r2, 0 adds r0, r1, 0 adds r0, 0xE @@ -335357,24 +324468,7 @@ _080A3994: pop {r0} bx r0 .align 2, 0 -_080A39C8: .4byte 0x020383fc -_080A39CC: .4byte 0x020383fd -_080A39D0: .4byte 0x020383fe -_080A39D4: .4byte 0x020383ff -_080A39D8: .4byte 0x02038400 -_080A39DC: .4byte 0x02038404 -_080A39E0: .4byte 0x02038408 -_080A39E4: .4byte 0x0203841a -_080A39E8: .4byte 0x02038430 -_080A39EC: .4byte 0x02038432 -_080A39F0: .4byte 0x02038433 -_080A39F4: .4byte 0x02038434 -_080A39F8: .4byte 0x02038436 -_080A39FC: .4byte 0x02038437 -_080A3A00: .4byte 0x02038440 -_080A3A04: .4byte 0x0000ffff -_080A3A08: .4byte 0x0203840a -_080A3A0C: .4byte 0x0203841e + .pool thumb_func_end sub_80A3934 thumb_func_start move_anim_start_t1 @@ -335383,25 +324477,21 @@ move_anim_start_t1: @ 80A3A10 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r2, _080A3A34 - ldr r0, _080A3A38 + ldr r2, =0x02038436 + ldr r0, =0x0202420b ldrb r0, [r0] strb r0, [r2] - ldr r2, _080A3A3C - ldr r0, _080A3A40 + ldr r2, =0x02038437 + ldr r0, =0x0202420c ldrb r0, [r0] strb r0, [r2] - ldr r0, _080A3A44 + ldr r0, =0x082c8d6c movs r2, 0x1 bl move_something pop {r0} bx r0 .align 2, 0 -_080A3A34: .4byte 0x02038436 -_080A3A38: .4byte 0x0202420b -_080A3A3C: .4byte 0x02038437 -_080A3A40: .4byte 0x0202420c -_080A3A44: .4byte 0x082c8d6c + .pool thumb_func_end move_anim_start_t1 thumb_func_start move_something @@ -335430,9 +324520,9 @@ move_something: @ 80A3A48 mov r0, r8 lsls r0, 2 mov r10, r0 - ldr r6, _080A3A9C + ldr r6, =0x0202406e movs r7, 0x64 - ldr r5, _080A3AA0 + ldr r5, =0x02038438 _080A3A84: lsls r0, r4, 24 lsrs r0, 24 @@ -335442,16 +324532,14 @@ _080A3A84: beq _080A3AA8 ldrh r0, [r6] muls r0, r7 - ldr r1, _080A3AA4 + ldr r1, =0x02024744 b _080A3AAE .align 2, 0 -_080A3A9C: .4byte 0x0202406e -_080A3AA0: .4byte 0x02038438 -_080A3AA4: .4byte 0x02024744 + .pool _080A3AA8: ldrh r0, [r6] muls r0, r7 - ldr r1, _080A3AD0 + ldr r1, =0x020244ec _080A3AAE: adds r0, r1 movs r1, 0xB @@ -335462,32 +324550,27 @@ _080A3AAE: adds r4, 0x1 cmp r4, 0x3 ble _080A3A84 - ldr r3, _080A3AD4 - ldr r5, _080A3AD8 - ldr r1, _080A3ADC + ldr r3, =0x02038434 + ldr r5, =0x02038430 + ldr r1, =0x020383fd mov r12, r1 - ldr r7, _080A3AE0 - ldr r6, _080A3AE4 + ldr r7, =0x020383f8 + ldr r6, =move_anim_execute + 1 b _080A3B10 .align 2, 0 -_080A3AD0: .4byte 0x020244ec -_080A3AD4: .4byte 0x02038434 -_080A3AD8: .4byte 0x02038430 -_080A3ADC: .4byte 0x020383fd -_080A3AE0: .4byte 0x020383f8 -_080A3AE4: .4byte move_anim_execute + 1 + .pool _080A3AE8: - ldr r3, _080A3B1C - ldr r5, _080A3B20 + ldr r3, =0x02038434 + ldr r5, =0x02038430 mov r0, r8 lsls r0, 2 mov r10, r0 - ldr r1, _080A3B24 + ldr r1, =0x020383fd mov r12, r1 - ldr r7, _080A3B28 - ldr r6, _080A3B2C - ldr r2, _080A3B30 - ldr r1, _080A3B34 + ldr r7, =0x020383f8 + ldr r6, =move_anim_execute + 1 + ldr r2, =0x02039f34 + ldr r1, =0x02038438 movs r4, 0x3 _080A3B00: ldr r0, [r2] @@ -335505,18 +324588,12 @@ _080A3B10: strh r0, [r3] b _080A3B3C .align 2, 0 -_080A3B1C: .4byte 0x02038434 -_080A3B20: .4byte 0x02038430 -_080A3B24: .4byte 0x020383fd -_080A3B28: .4byte 0x020383f8 -_080A3B2C: .4byte move_anim_execute + 1 -_080A3B30: .4byte 0x02039f34 -_080A3B34: .4byte 0x02038438 + .pool _080A3B38: mov r1, r8 strh r1, [r3] _080A3B3C: - ldr r1, _080A3B90 + ldr r1, =0x0203841e movs r2, 0 adds r0, r1, 0 adds r0, 0xE @@ -335533,18 +324610,18 @@ _080A3B44: ldr r0, [sp] add r0, r10 ldr r0, [r0] - ldr r1, _080A3B94 + ldr r1, =0x020383f0 str r0, [r1] movs r0, 0x1 mov r1, r12 strb r0, [r1] movs r0, 0 - ldr r1, _080A3B98 + ldr r1, =0x020383fc strb r0, [r1] str r6, [r7] - ldr r0, _080A3B9C + ldr r0, =0x0000ffff adds r2, r0, 0 - ldr r1, _080A3BA0 + ldr r1, =0x0203840a movs r4, 0x7 _080A3B76: ldrh r0, [r1] @@ -335558,38 +324635,33 @@ _080A3B76: cmp r1, 0 beq _080A3BC2 movs r4, 0 - ldr r2, _080A3BA4 + ldr r2, =0x082c8d64 b _080A3BAA .align 2, 0 -_080A3B90: .4byte 0x0203841e -_080A3B94: .4byte 0x020383f0 -_080A3B98: .4byte 0x020383fc -_080A3B9C: .4byte 0x0000ffff -_080A3BA0: .4byte 0x0203840a -_080A3BA4: .4byte 0x082c8d64 + .pool _080A3BA8: adds r4, 0x1 _080A3BAA: lsls r0, r4, 1 adds r0, r2 ldrh r0, [r0] - ldr r1, _080A3BE4 + ldr r1, =0x0000ffff cmp r0, r1 beq _080A3BC2 cmp r8, r0 bne _080A3BA8 - ldr r0, _080A3BE8 + ldr r0, =0x03007420 movs r2, 0x80 bl MPlayVolumeControl _080A3BC2: - ldr r0, _080A3BEC + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r0, _080A3BF0 + ldr r0, =0x02022e26 strh r1, [r0] - ldr r0, _080A3BF4 + ldr r0, =0x02022e28 strh r1, [r0] - ldr r0, _080A3BF8 + ldr r0, =0x02022e2a strh r1, [r0] add sp, 0x4 pop {r3-r5} @@ -335600,12 +324672,7 @@ _080A3BC2: pop {r0} bx r0 .align 2, 0 -_080A3BE4: .4byte 0x0000ffff -_080A3BE8: .4byte 0x03007420 -_080A3BEC: .4byte 0x02022e24 -_080A3BF0: .4byte 0x02022e26 -_080A3BF4: .4byte 0x02022e28 -_080A3BF8: .4byte 0x02022e2a + .pool thumb_func_end move_something thumb_func_start move_anim_8072740 @@ -335615,7 +324682,7 @@ move_anim_8072740: @ 80A3BFC bl obj_free_rotscale_entry adds r0, r4, 0 bl obj_delete_and_free_tiles - ldr r1, _080A3C18 + ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] @@ -335623,7 +324690,7 @@ move_anim_8072740: @ 80A3BFC pop {r0} bx r0 .align 2, 0 -_080A3C18: .4byte 0x020383fe + .pool thumb_func_end move_anim_8072740 thumb_func_start move_anim_task_del @@ -335632,14 +324699,14 @@ move_anim_task_del: @ 80A3C1C lsls r0, 24 lsrs r0, 24 bl remove_task - ldr r1, _080A3C34 + ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_080A3C34: .4byte 0x020383fe + .pool thumb_func_end move_anim_task_del thumb_func_start move_anim_related_task_del @@ -335648,14 +324715,14 @@ move_anim_related_task_del: @ 80A3C38 lsls r0, 24 lsrs r0, 24 bl remove_task - ldr r1, _080A3C50 + ldr r1, =0x020383ff ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_080A3C50: .4byte 0x020383ff + .pool thumb_func_end move_anim_related_task_del thumb_func_start sub_80A3C54 @@ -335664,8 +324731,8 @@ sub_80A3C54: @ 80A3C54 lsls r0, 16 lsrs r3, r0, 16 movs r2, 0 - ldr r4, _080A3C6C - ldr r1, _080A3C70 + ldr r4, =0x0000ffff + ldr r1, =0x0203840a _080A3C60: ldrh r0, [r1] cmp r0, r4 @@ -335673,8 +324740,7 @@ _080A3C60: strh r3, [r1] b _080A3C7C .align 2, 0 -_080A3C6C: .4byte 0x0000ffff -_080A3C70: .4byte 0x0203840a + .pool _080A3C74: adds r1, 0x2 adds r2, 0x1 @@ -335692,9 +324758,9 @@ sub_80A3C84: @ 80A3C84 lsls r0, 16 lsrs r3, r0, 16 movs r2, 0 - ldr r0, _080A3CA0 + ldr r0, =0x0000ffff adds r4, r0, 0 - ldr r1, _080A3CA4 + ldr r1, =0x0203840a _080A3C92: ldrh r0, [r1] cmp r0, r3 @@ -335703,8 +324769,7 @@ _080A3C92: strh r0, [r1] b _080A3CB0 .align 2, 0 -_080A3CA0: .4byte 0x0000ffff -_080A3CA4: .4byte 0x0203840a + .pool _080A3CA8: adds r1, 0x2 adds r2, 0x1 @@ -335719,21 +324784,19 @@ _080A3CB0: thumb_func_start move_anim_waiter move_anim_waiter: @ 80A3CB8 push {lr} - ldr r2, _080A3CD0 + ldr r2, =0x020383fc ldrb r1, [r2] movs r0, 0 ldrsb r0, [r2, r0] cmp r0, 0 bgt _080A3CDC - ldr r0, _080A3CD4 - ldr r1, _080A3CD8 + ldr r0, =0x020383f8 + ldr r1, =move_anim_execute + 1 str r1, [r0] movs r0, 0 b _080A3CDE .align 2, 0 -_080A3CD0: .4byte 0x020383fc -_080A3CD4: .4byte 0x020383f8 -_080A3CD8: .4byte move_anim_execute + 1 + .pool _080A3CDC: subs r0, r1, 0x1 _080A3CDE: @@ -335745,22 +324808,22 @@ _080A3CDE: thumb_func_start move_anim_execute move_anim_execute: @ 80A3CE4 push {r4,lr} - ldr r4, _080A3D14 + ldr r4, =0x08525e98 _080A3CE8: - ldr r0, _080A3D18 + ldr r0, =0x020383f0 ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 adds r0, r4 ldr r0, [r0] bl _call_via_r0 - ldr r0, _080A3D1C + ldr r0, =0x020383fc ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 bne _080A3D0C - ldr r0, _080A3D20 + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _080A3CE8 @@ -335769,16 +324832,13 @@ _080A3D0C: pop {r0} bx r0 .align 2, 0 -_080A3D14: .4byte 0x08525e98 -_080A3D18: .4byte 0x020383f0 -_080A3D1C: .4byte 0x020383fc -_080A3D20: .4byte 0x020383fd + .pool thumb_func_end move_anim_execute thumb_func_start ma00_load_graphics ma00_load_graphics: @ 80A3D24 push {r4-r6,lr} - ldr r6, _080A3D70 + ldr r6, =0x020383f0 ldr r0, [r6] adds r1, r0, 0x1 str r1, [r6] @@ -335787,45 +324847,39 @@ ma00_load_graphics: @ 80A3D24 lsls r0, 8 orrs r4, r0 lsls r5, r4, 3 - ldr r0, _080A3D74 + ldr r0, =0x085112c4 adds r0, r5, r0 bl gpu_tile_obj_decompress_and_load3 - ldr r0, _080A3D78 + ldr r0, =0x08511bcc adds r5, r0 adds r0, r5, 0 bl gpu_pal_obj_decompress_and_apply3 ldr r0, [r6] adds r0, 0x2 str r0, [r6] - ldr r0, _080A3D7C + ldr r0, =0xffffd8f0 adds r4, r0 lsls r4, 16 lsrs r4, 16 adds r0, r4, 0 bl sub_80A3C54 - ldr r1, _080A3D80 + ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] - ldr r1, _080A3D84 - ldr r0, _080A3D88 + ldr r1, =0x020383f8 + ldr r0, =move_anim_waiter + 1 str r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080A3D70: .4byte 0x020383f0 -_080A3D74: .4byte 0x085112c4 -_080A3D78: .4byte 0x08511bcc -_080A3D7C: .4byte 0xffffd8f0 -_080A3D80: .4byte 0x020383fc -_080A3D84: .4byte 0x020383f8 -_080A3D88: .4byte move_anim_waiter + 1 + .pool thumb_func_end ma00_load_graphics thumb_func_start ma01_080728D0 ma01_080728D0: @ 80A3D8C push {r4-r6,lr} - ldr r6, _080A3DCC + ldr r6, =0x020383f0 ldr r0, [r6] adds r1, r0, 0x1 str r1, [r6] @@ -335833,8 +324887,8 @@ ma01_080728D0: @ 80A3D8C ldrb r0, [r1, 0x1] lsls r0, 8 orrs r4, r0 - ldr r1, _080A3DD0 - ldr r0, _080A3DD4 + ldr r1, =0x08524b44 + ldr r0, =0xffffd8f0 adds r4, r0 lsls r0, r4, 3 adds r0, r1 @@ -335854,15 +324908,13 @@ ma01_080728D0: @ 80A3D8C pop {r0} bx r0 .align 2, 0 -_080A3DCC: .4byte 0x020383f0 -_080A3DD0: .4byte 0x08524b44 -_080A3DD4: .4byte 0xffffd8f0 + .pool thumb_func_end ma01_080728D0 thumb_func_start ma02_instanciate_template ma02_instanciate_template: @ 80A3DD8 push {r4-r7,lr} - ldr r5, _080A3E40 + ldr r5, =0x020383f0 ldr r1, [r5] adds r3, r1, 0x1 str r3, [r5] @@ -335887,7 +324939,7 @@ ma02_instanciate_template: @ 80A3DD8 cmp r0, 0 beq _080A3E28 adds r6, r5, 0 - ldr r5, _080A3E44 + ldr r5, =0x0203841e adds r3, r0, 0 _080A3E10: ldr r2, [r6] @@ -335915,17 +324967,16 @@ _080A3E28: subs r0, 0x40 b _080A3E4A .align 2, 0 -_080A3E40: .4byte 0x020383f0 -_080A3E44: .4byte 0x0203841e + .pool _080A3E48: negs r0, r4 _080A3E4A: lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A3E54 + ldr r0, =0x02038437 b _080A3E6A .align 2, 0 -_080A3E54: .4byte 0x02038437 + .pool _080A3E58: cmp r4, 0x3F bls _080A3E62 @@ -335937,7 +324988,7 @@ _080A3E62: _080A3E64: lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A3EC0 + ldr r0, =0x02038436 _080A3E6A: ldrb r0, [r0] bl sub_80A82E4 @@ -335954,7 +325005,7 @@ _080A3E6A: bgt _080A3E88 movs r6, 0x3 _080A3E88: - ldr r5, _080A3EC4 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -335972,7 +325023,7 @@ _080A3E88: adds r0, r7, 0 adds r1, r4, 0 bl obj_add_from_template_call_callback_once - ldr r1, _080A3EC8 + ldr r1, =0x020383fe ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -335980,15 +325031,13 @@ _080A3E88: pop {r0} bx r0 .align 2, 0 -_080A3EC0: .4byte 0x02038436 -_080A3EC4: .4byte 0x02038437 -_080A3EC8: .4byte 0x020383fe + .pool thumb_func_end ma02_instanciate_template thumb_func_start sub_80A3ECC sub_80A3ECC: @ 80A3ECC push {r4-r7,lr} - ldr r4, _080A3F3C + ldr r4, =0x020383f0 ldr r1, [r4] adds r3, r1, 0x1 str r3, [r4] @@ -336013,7 +325062,7 @@ sub_80A3ECC: @ 80A3ECC cmp r0, 0 beq _080A3F1C adds r5, r4, 0 - ldr r4, _080A3F40 + ldr r4, =0x0203841e adds r3, r0, 0 _080A3F04: ldr r2, [r5] @@ -336035,7 +325084,7 @@ _080A3F1C: lsls r0, 24 lsrs r0, 24 bl _call_via_r6 - ldr r1, _080A3F44 + ldr r1, =0x020383fe ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -336043,19 +325092,17 @@ _080A3F1C: pop {r0} bx r0 .align 2, 0 -_080A3F3C: .4byte 0x020383f0 -_080A3F40: .4byte 0x0203841e -_080A3F44: .4byte 0x020383fe + .pool thumb_func_end sub_80A3ECC thumb_func_start ma04_wait_countdown ma04_wait_countdown: @ 80A3F48 push {r4,lr} - ldr r1, _080A3F78 + ldr r1, =0x020383f0 ldr r0, [r1] adds r2, r0, 0x1 str r2, [r1] - ldr r3, _080A3F7C + ldr r3, =0x020383fc ldrb r0, [r0, 0x1] strb r0, [r3] lsls r0, 24 @@ -336068,46 +325115,41 @@ ma04_wait_countdown: @ 80A3F48 _080A3F66: adds r0, r2, 0x1 str r0, [r1] - ldr r1, _080A3F80 - ldr r0, _080A3F84 + ldr r1, =0x020383f8 + ldr r0, =move_anim_waiter + 1 str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_080A3F78: .4byte 0x020383f0 -_080A3F7C: .4byte 0x020383fc -_080A3F80: .4byte 0x020383f8 -_080A3F84: .4byte move_anim_waiter + 1 + .pool thumb_func_end ma04_wait_countdown thumb_func_start sub_80A3F88 sub_80A3F88: @ 80A3F88 push {lr} - ldr r0, _080A3FA0 + ldr r0, =0x020383fe ldrb r2, [r0] cmp r2, 0 bne _080A3FAC - ldr r0, _080A3FA4 + ldr r0, =0x020383f0 ldr r1, [r0] adds r1, 0x1 str r1, [r0] - ldr r0, _080A3FA8 + ldr r0, =0x020383fc strb r2, [r0] b _080A3FB2 .align 2, 0 -_080A3FA0: .4byte 0x020383fe -_080A3FA4: .4byte 0x020383f0 -_080A3FA8: .4byte 0x020383fc + .pool _080A3FAC: - ldr r1, _080A3FB8 + ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] _080A3FB2: pop {r0} bx r0 .align 2, 0 -_080A3FB8: .4byte 0x020383fc + .pool thumb_func_end sub_80A3F88 thumb_func_start nullsub_6 @@ -336127,15 +325169,15 @@ sub_80A3FC4: @ 80A3FC4 push {r7} movs r0, 0 mov r8, r0 - ldr r0, _080A3FF4 + ldr r0, =0x020383fe ldrb r0, [r0] cmp r0, 0 bne _080A3FEC - ldr r0, _080A3FF8 + ldr r0, =0x020383ff ldrb r0, [r0] cmp r0, 0 bne _080A3FEC - ldr r1, _080A3FFC + ldr r1, =0x02038430 ldrb r0, [r1] cmp r0, 0xFF bne _080A3FEC @@ -336143,21 +325185,18 @@ sub_80A3FC4: @ 80A3FC4 cmp r0, 0xFF beq _080A4004 _080A3FEC: - ldr r1, _080A4000 + ldr r1, =0x0203842e movs r0, 0 strh r0, [r1] b _080A401E .align 2, 0 -_080A3FF4: .4byte 0x020383fe -_080A3FF8: .4byte 0x020383ff -_080A3FFC: .4byte 0x02038430 -_080A4000: .4byte 0x0203842e + .pool _080A4004: bl mplay_has_finished_maybe lsls r0, 24 cmp r0, 0 beq _080A403C - ldr r1, _080A4028 + ldr r1, =0x0203842e ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] @@ -336166,26 +325205,25 @@ _080A4004: cmp r0, 0x5A bhi _080A4030 _080A401E: - ldr r1, _080A402C + ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] b _080A40A2 .align 2, 0 -_080A4028: .4byte 0x0203842e -_080A402C: .4byte 0x020383fc + .pool _080A4030: - ldr r0, _080A40AC + ldr r0, =0x030075f0 bl MPlayStop_rev01 - ldr r0, _080A40B0 + ldr r0, =0x03007630 bl MPlayStop_rev01 _080A403C: - ldr r1, _080A40B4 + ldr r1, =0x0203842e movs r0, 0 strh r0, [r1] movs r5, 0 - ldr r7, _080A40B8 - ldr r6, _080A40BC - ldr r4, _080A40C0 + ldr r7, =0x0000ffff + ldr r6, =0x08524b44 + ldr r4, =0x0203840a _080A404A: ldrh r0, [r4] cmp r0, r7 @@ -336211,8 +325249,8 @@ _080A406E: mov r1, r8 cmp r1, 0 bne _080A40A2 - ldr r0, _080A40C4 - ldr r1, _080A40B8 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl @@ -336224,7 +325262,7 @@ _080A406E: movs r0, 0x1 bl sub_8072A88 _080A409C: - ldr r0, _080A40C8 + ldr r0, =0x020383fd mov r1, r8 strb r1, [r0] _080A40A2: @@ -336234,20 +325272,13 @@ _080A40A2: pop {r0} bx r0 .align 2, 0 -_080A40AC: .4byte 0x030075f0 -_080A40B0: .4byte 0x03007630 -_080A40B4: .4byte 0x0203842e -_080A40B8: .4byte 0x0000ffff -_080A40BC: .4byte 0x08524b44 -_080A40C0: .4byte 0x0203840a -_080A40C4: .4byte 0x03007420 -_080A40C8: .4byte 0x020383fd + .pool thumb_func_end sub_80A3FC4 thumb_func_start ma09_play_sound ma09_play_sound: @ 80A40CC push {r4,lr} - ldr r4, _080A40F0 + ldr r4, =0x020383f0 ldr r0, [r4] adds r1, r0, 0x1 str r1, [r4] @@ -336263,7 +325294,7 @@ ma09_play_sound: @ 80A40CC pop {r0} bx r0 .align 2, 0 -_080A40F0: .4byte 0x020383f0 + .pool thumb_func_end ma09_play_sound thumb_func_start sub_80A40F4 @@ -336276,15 +325307,15 @@ sub_80A40F4: @ 80A40F4 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _080A413C + ldr r1, =0x03005e08 mov r8, r1 adds r6, r0, r1 - ldr r1, _080A4140 + ldr r1, =0x020241e4 movs r2, 0 ldrsh r0, [r6, r2] adds r0, r1 ldrb r5, [r0] - ldr r1, _080A4144 + ldr r1, =0x02020630 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -336303,11 +325334,9 @@ sub_80A40F4: @ 80A40F4 bl move_anim_task_del b _080A41BE .align 2, 0 -_080A413C: .4byte 0x03005e08 -_080A4140: .4byte 0x020241e4 -_080A4144: .4byte 0x02020630 + .pool _080A4148: - ldr r0, _080A4184 + ldr r0, =task_pA_ma0A_obj_to_bg_pal + 1 movs r1, 0xA bl AddTask lsls r0, 24 @@ -336331,24 +325360,22 @@ _080A4148: ldrsh r0, [r6, r3] cmp r0, 0 bne _080A4190 - ldr r0, _080A4188 + ldr r0, =0x02022e18 ldrh r0, [r0] strh r0, [r1, 0xE] - ldr r0, _080A418C + ldr r0, =0x02022e1a b _080A4198 .align 2, 0 -_080A4184: .4byte task_pA_ma0A_obj_to_bg_pal + 1 -_080A4188: .4byte 0x02022e18 -_080A418C: .4byte 0x02022e1a + .pool _080A4190: - ldr r0, _080A41C8 + ldr r0, =0x02022e1c ldrh r0, [r0] strh r0, [r1, 0xE] - ldr r0, _080A41CC + ldr r0, =0x02022e1e _080A4198: ldrh r0, [r0] strh r0, [r1, 0x10] - ldr r1, _080A41D0 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -336357,7 +325384,7 @@ _080A4198: strh r1, [r0, 0x12] ldrh r1, [r6] strh r1, [r0, 0x14] - ldr r1, _080A41D4 + ldr r1, =0x02038430 movs r3, 0x6 ldrsh r0, [r6, r3] adds r0, r1 @@ -336371,16 +325398,13 @@ _080A41BE: pop {r0} bx r0 .align 2, 0 -_080A41C8: .4byte 0x02022e1c -_080A41CC: .4byte 0x02022e1e -_080A41D0: .4byte 0x03005e00 -_080A41D4: .4byte 0x02038430 + .pool thumb_func_end sub_80A40F4 thumb_func_start sub_80A41D8 sub_80A41D8: @ 80A41D8 push {r4,r5,lr} - ldr r1, _080A41F0 + ldr r1, =0x020383f0 ldr r2, [r1] adds r0, r2, 0x1 str r0, [r1] @@ -336389,13 +325413,12 @@ sub_80A41D8: @ 80A41D8 ands r0, r1 cmp r0, 0 beq _080A41F8 - ldr r0, _080A41F4 + ldr r0, =0x02038437 b _080A41FA .align 2, 0 -_080A41F0: .4byte 0x020383f0 -_080A41F4: .4byte 0x02038437 + .pool _080A41F8: - ldr r0, _080A422C + ldr r0, =0x02038436 _080A41FA: ldrb r4, [r0] adds r0, r4, 0 @@ -336420,7 +325443,7 @@ _080A4226: movs r5, 0 b _080A4232 .align 2, 0 -_080A422C: .4byte 0x02038436 + .pool _080A4230: movs r5, 0x1 _080A4232: @@ -336428,16 +325451,16 @@ _080A4232: adds r1, r5, 0 movs r2, 0 bl sub_80A438C - ldr r0, _080A4298 + ldr r0, =sub_80A40F4 + 1 movs r1, 0xA bl AddTask lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080A429C + ldr r1, =0x020383fe ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, _080A42A0 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -336473,9 +325496,7 @@ _080A4294: movs r5, 0 b _080A42A6 .align 2, 0 -_080A4298: .4byte sub_80A40F4 + 1 -_080A429C: .4byte 0x020383fe -_080A42A0: .4byte 0x03005e00 + .pool _080A42A4: movs r5, 0x1 _080A42A6: @@ -336483,16 +325504,16 @@ _080A42A6: adds r1, r5, 0 movs r2, 0 bl sub_80A438C - ldr r0, _080A42F4 + ldr r0, =sub_80A40F4 + 1 movs r1, 0xA bl AddTask lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080A42F8 + ldr r1, =0x020383fe ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, _080A42FC + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -336503,27 +325524,21 @@ _080A42A6: strh r1, [r0, 0xC] strh r1, [r0, 0xE] _080A42D8: - ldr r1, _080A4300 + ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r1, _080A4304 + ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] - ldr r1, _080A4308 - ldr r0, _080A430C + ldr r1, =0x020383f8 + ldr r0, =move_anim_waiter + 1 str r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080A42F4: .4byte sub_80A40F4 + 1 -_080A42F8: .4byte 0x020383fe -_080A42FC: .4byte 0x03005e00 -_080A4300: .4byte 0x020383f0 -_080A4304: .4byte 0x020383fc -_080A4308: .4byte 0x020383f8 -_080A430C: .4byte move_anim_waiter + 1 + .pool thumb_func_end sub_80A41D8 thumb_func_start b_side_obj__get_some_boolean @@ -336536,13 +325551,13 @@ b_side_obj__get_some_boolean: @ 80A4310 lsls r0, 24 cmp r0, 0 beq _080A4330 - ldr r0, _080A432C + ldr r0, =0x02038436 ldrb r0, [r0] cmp r4, r0 beq _080A4374 b _080A4384 .align 2, 0 -_080A432C: .4byte 0x02038436 + .pool _080A4330: adds r0, r4, 0 bl sub_80A6A90 @@ -336553,7 +325568,7 @@ _080A4330: lsls r0, 24 cmp r0, 0 bne _080A4374 - ldr r0, _080A4378 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r5, 2 @@ -336563,8 +325578,8 @@ _080A4330: ands r0, r1 cmp r0, 0 beq _080A4374 - ldr r2, _080A437C - ldr r0, _080A4380 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r5, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -336580,9 +325595,7 @@ _080A4374: movs r0, 0x1 b _080A4386 .align 2, 0 -_080A4378: .4byte 0x020244d0 -_080A437C: .4byte 0x02020630 -_080A4380: .4byte 0x020241e4 + .pool _080A4384: movs r0, 0 _080A4386: @@ -336614,13 +325627,13 @@ _080A43AA: lsrs r0, 24 cmp r0, 0x1 bne _080A43DC - ldr r1, _080A43D4 + ldr r1, =0x06008000 movs r2, 0x80 lsls r2, 6 movs r0, 0 movs r3, 0x1 bl dma3_transfer_queue_add_fill - ldr r1, _080A43D8 + ldr r1, =0x0600f000 movs r2, 0x80 lsls r2, 5 movs r0, 0xFF @@ -336628,16 +325641,15 @@ _080A43AA: bl dma3_transfer_queue_add_fill b _080A43F8 .align 2, 0 -_080A43D4: .4byte 0x06008000 -_080A43D8: .4byte 0x0600f000 + .pool _080A43DC: - ldr r1, _080A44F8 + ldr r1, =0x06004000 movs r2, 0x80 lsls r2, 6 movs r0, 0 movs r3, 0x1 bl dma3_transfer_queue_add_fill - ldr r1, _080A44FC + ldr r1, =0x0600e000 movs r2, 0x80 lsls r2, 5 movs r0, 0xFF @@ -336650,14 +325662,14 @@ _080A43F8: movs r1, 0 strh r1, [r0] ldr r1, [sp, 0x10] - ldr r2, _080A4500 + ldr r2, =0x01000800 bl CpuSet mov r0, sp adds r0, 0x22 movs r1, 0xFF strh r1, [r0] ldr r1, [sp, 0x14] - ldr r2, _080A4504 + ldr r2, =0x01000400 bl CpuSet movs r0, 0x1 movs r1, 0x4 @@ -336671,11 +325683,11 @@ _080A43F8: movs r1, 0x1 movs r2, 0 bl lcd_bg_operations - ldr r0, _080A4508 + ldr r0, =0x020241e4 adds r0, r6, r0 ldrb r4, [r0] - ldr r5, _080A450C - ldr r0, _080A4510 + ldr r5, =0x02022e18 + ldr r0, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -336690,7 +325702,7 @@ _080A43F8: lsls r0, 24 cmp r0, 0 beq _080A447A - ldr r0, _080A4514 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r0, [r0] @@ -336702,8 +325714,8 @@ _080A43F8: subs r0, 0x1 strh r0, [r5] _080A447A: - ldr r5, _080A4518 - ldr r2, _080A4510 + ldr r5, =0x02022e1a + ldr r2, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -336717,7 +325729,7 @@ _080A447A: mov r0, r9 cmp r0, 0 beq _080A44B0 - ldr r0, _080A4508 + ldr r0, =0x020241e4 adds r0, r6, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -336730,7 +325742,7 @@ _080A447A: orrs r1, r2 strb r1, [r0] _080A44B0: - ldr r0, _080A450C + ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 bl lcd_io_set @@ -336738,7 +325750,7 @@ _080A44B0: movs r0, 0x16 bl lcd_io_set lsls r4, r6, 5 - ldr r0, _080A451C + ldr r0, =0x02037914 adds r4, r0 add r0, sp, 0x10 ldrb r1, [r0, 0x8] @@ -336752,7 +325764,7 @@ _080A44B0: movs r0, 0xA0 lsls r0, 19 adds r1, r0 - ldr r2, _080A4520 + ldr r2, =0x04000008 adds r0, r4, 0 bl CpuSet bl sub_80A4DF0 @@ -336762,17 +325774,7 @@ _080A44B0: movs r3, 0 b _080A452E .align 2, 0 -_080A44F8: .4byte 0x06004000 -_080A44FC: .4byte 0x0600e000 -_080A4500: .4byte 0x01000800 -_080A4504: .4byte 0x01000400 -_080A4508: .4byte 0x020241e4 -_080A450C: .4byte 0x02022e18 -_080A4510: .4byte 0x02020630 -_080A4514: .4byte 0x02039f34 -_080A4518: .4byte 0x02022e1a -_080A451C: .4byte 0x02037914 -_080A4520: .4byte 0x04000008 + .pool _080A4524: adds r0, r6, 0 bl battle_get_per_side_status @@ -336802,13 +325804,13 @@ _080A4558: bl sub_80A46A0 b _080A4666 _080A455E: - ldr r1, _080A4674 + ldr r1, =0x06006000 movs r2, 0x80 lsls r2, 6 movs r0, 0 movs r3, 0x1 bl dma3_transfer_queue_add_fill - ldr r1, _080A4678 + ldr r1, =0x0600f000 movs r7, 0x80 lsls r7, 5 movs r0, 0 @@ -336823,7 +325825,7 @@ _080A455E: strh r4, [r0] ldr r1, [sp, 0x10] adds r1, r7 - ldr r2, _080A467C + ldr r2, =0x01000800 bl CpuSet mov r0, sp adds r0, 0x26 @@ -336833,7 +325835,7 @@ _080A455E: lsls r2, 4 mov r8, r2 add r1, r8 - ldr r2, _080A4680 + ldr r2, =0x01000400 bl CpuSet movs r0, 0x2 movs r1, 0x4 @@ -336847,11 +325849,11 @@ _080A455E: movs r1, 0x1 movs r2, 0 bl lcd_bg_operations - ldr r0, _080A4684 + ldr r0, =0x020241e4 adds r2, r5, r0 ldrb r4, [r2] - ldr r5, _080A4688 - ldr r3, _080A468C + ldr r5, =0x02022e1c + ldr r3, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -336862,7 +325864,7 @@ _080A455E: negs r0, r0 adds r0, 0x20 strh r0, [r5] - ldr r4, _080A4690 + ldr r4, =0x02022e1e ldrh r0, [r1, 0x26] ldrh r1, [r1, 0x22] adds r0, r1 @@ -336890,14 +325892,14 @@ _080A460E: movs r0, 0x1A bl lcd_io_set lsls r4, r6, 5 - ldr r0, _080A4694 + ldr r0, =0x02037914 adds r4, r0 adds r0, r4, 0 movs r1, 0x90 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _080A4698 - ldr r2, _080A469C + ldr r1, =0x05000120 + ldr r2, =0x04000008 adds r0, r4, 0 bl CpuSet adds r0, r6, 0 @@ -336930,24 +325932,14 @@ _080A4666: pop {r0} bx r0 .align 2, 0 -_080A4674: .4byte 0x06006000 -_080A4678: .4byte 0x0600f000 -_080A467C: .4byte 0x01000800 -_080A4680: .4byte 0x01000400 -_080A4684: .4byte 0x020241e4 -_080A4688: .4byte 0x02022e1c -_080A468C: .4byte 0x02020630 -_080A4690: .4byte 0x02022e1e -_080A4694: .4byte 0x02037914 -_080A4698: .4byte 0x05000120 -_080A469C: .4byte 0x04000008 + .pool thumb_func_end sub_80A438C thumb_func_start sub_80A46A0 sub_80A46A0: @ 80A46A0 push {r4-r7,lr} sub sp, 0x10 - ldr r0, _080A471C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r0, [r0] @@ -337010,7 +326002,7 @@ _080A4712: pop {r0} bx r0 .align 2, 0 -_080A471C: .4byte 0x02039f34 + .pool thumb_func_end sub_80A46A0 thumb_func_start sub_80A4720 @@ -337035,7 +326027,7 @@ _080A473C: movs r0, 0 cmp r0, r12 bge _080A476C - ldr r7, _080A4778 + ldr r7, =0x00000fff _080A4748: adds r4, r0, 0x1 lsls r0, 6 @@ -337063,7 +326055,7 @@ _080A476C: pop {r0} bx r0 .align 2, 0 -_080A4778: .4byte 0x00000fff + .pool thumb_func_end sub_80A4720 thumb_func_start sub_80A477C @@ -337085,21 +326077,20 @@ sub_80A477C: @ 80A477C _080A479C: movs r0, 0x1 bl sub_80A6C68 - ldr r0, _080A47B0 + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r0, _080A47B4 + ldr r0, =0x02022e1a strh r1, [r0] b _080A47C6 .align 2, 0 -_080A47B0: .4byte 0x02022e18 -_080A47B4: .4byte 0x02022e1a + .pool _080A47B8: movs r0, 0x2 bl sub_80A6C68 - ldr r0, _080A47D0 + ldr r0, =0x02022e1c strh r4, [r0] - ldr r0, _080A47D4 + ldr r0, =0x02022e1e strh r4, [r0] _080A47C6: add sp, 0x10 @@ -337107,8 +326098,7 @@ _080A47C6: pop {r0} bx r0 .align 2, 0 -_080A47D0: .4byte 0x02022e1c -_080A47D4: .4byte 0x02022e1e + .pool thumb_func_end sub_80A477C thumb_func_start task_pA_ma0A_obj_to_bg_pal @@ -337117,7 +326107,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8 sub sp, 0x10 lsls r0, 24 lsrs r0, 24 - ldr r2, _080A4854 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -337126,7 +326116,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8 ldrb r6, [r5, 0x14] mov r0, sp bl sub_80A6B30 - ldr r0, _080A4858 + ldr r0, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -337149,56 +326139,50 @@ task_pA_ma0A_obj_to_bg_pal: @ 80A47D8 ldrsh r0, [r5, r1] cmp r0, 0 bne _080A4870 - ldr r1, _080A485C + ldr r1, =0x02022e18 lsls r0, r3, 16 asrs r0, 16 ldrh r3, [r5, 0xE] adds r0, r3 strh r0, [r1] - ldr r1, _080A4860 + ldr r1, =0x02022e1a lsls r0, r2, 16 asrs r0, 16 ldrh r5, [r5, 0x10] adds r0, r5 strh r0, [r1] lsls r0, r6, 5 - ldr r2, _080A4864 + ldr r2, =0x02037d14 adds r0, r2 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 5 - ldr r3, _080A4868 + ldr r3, =0xfffffe00 adds r2, r3 adds r1, r2 - ldr r2, _080A486C + ldr r2, =0x04000008 bl CpuSet b _080A4896 .align 2, 0 -_080A4854: .4byte 0x03005e00 -_080A4858: .4byte 0x02020630 -_080A485C: .4byte 0x02022e18 -_080A4860: .4byte 0x02022e1a -_080A4864: .4byte 0x02037d14 -_080A4868: .4byte 0xfffffe00 -_080A486C: .4byte 0x04000008 + .pool _080A4870: - ldr r1, _080A48A0 + ldr r1, =0x02022e1c lsls r0, r3, 16 asrs r0, 16 ldrh r3, [r5, 0xE] adds r0, r3 strh r0, [r1] - ldr r1, _080A48A4 + ldr r1, =0x02022e1e lsls r0, r2, 16 asrs r0, 16 ldrh r5, [r5, 0x10] adds r0, r5 strh r0, [r1] lsls r0, r6, 5 - ldr r1, _080A48A8 + ldr r1, =0x02037d14 adds r0, r1 subs r1, 0xE0 - ldr r2, _080A48AC + ldr r2, =0x04000008 bl CpuSet _080A4896: add sp, 0x10 @@ -337206,16 +326190,13 @@ _080A4896: pop {r0} bx r0 .align 2, 0 -_080A48A0: .4byte 0x02022e1c -_080A48A4: .4byte 0x02022e1e -_080A48A8: .4byte 0x02037d14 -_080A48AC: .4byte 0x04000008 + .pool thumb_func_end task_pA_ma0A_obj_to_bg_pal thumb_func_start ma0B_0807324C ma0B_0807324C: @ 80A48B0 push {r4,r5,lr} - ldr r0, _080A48C4 + ldr r0, =0x020383f0 ldr r2, [r0] adds r1, r2, 0x1 str r1, [r0] @@ -337225,7 +326206,7 @@ ma0B_0807324C: @ 80A48B0 movs r4, 0x2 b _080A48D2 .align 2, 0 -_080A48C4: .4byte 0x020383f0 + .pool _080A48C8: cmp r4, 0x1 bne _080A48CE @@ -337237,20 +326218,20 @@ _080A48D2: cmp r4, 0x2 bne _080A48E0 _080A48D6: - ldr r0, _080A48DC + ldr r0, =0x02038436 b _080A48E2 .align 2, 0 -_080A48DC: .4byte 0x02038436 + .pool _080A48E0: - ldr r0, _080A4938 + ldr r0, =0x02038437 _080A48E2: ldrb r5, [r0] - ldr r3, _080A493C + ldr r3, =0x02038430 ldrb r0, [r3] cmp r0, 0xFF beq _080A4908 - ldr r2, _080A4940 - ldr r0, _080A4944 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r5, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -337269,8 +326250,8 @@ _080A4908: ldrb r0, [r3, 0x1] cmp r0, 0xFF beq _080A4948 - ldr r3, _080A4940 - ldr r2, _080A4944 + ldr r3, =0x02020630 + ldr r2, =0x020241e4 movs r1, 0x2 adds r0, r5, 0 eors r0, r1 @@ -337288,26 +326269,23 @@ _080A4908: strb r1, [r0] b _080A494A .align 2, 0 -_080A4938: .4byte 0x02038437 -_080A493C: .4byte 0x02038430 -_080A4940: .4byte 0x02020630 -_080A4944: .4byte 0x020241e4 + .pool _080A4948: movs r4, 0 _080A494A: - ldr r0, _080A4974 + ldr r0, =sub_80A4980 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080A4978 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 strh r4, [r1, 0x8] strh r5, [r1, 0xC] - ldr r1, _080A497C + ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -337315,9 +326293,7 @@ _080A494A: pop {r0} bx r0 .align 2, 0 -_080A4974: .4byte sub_80A4980 + 1 -_080A4978: .4byte 0x03005e00 -_080A497C: .4byte 0x020383f0 + .pool thumb_func_end ma0B_0807324C thumb_func_start sub_80A4980 @@ -337325,7 +326301,7 @@ sub_80A4980: @ 80A4980 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080A49C0 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -337354,11 +326330,11 @@ _080A49BC: movs r4, 0 b _080A49C6 .align 2, 0 -_080A49C0: .4byte 0x03005e00 + .pool _080A49C4: movs r4, 0x1 _080A49C6: - ldr r6, _080A4A10 + ldr r6, =0x02038430 ldrb r0, [r6] cmp r0, 0xFF beq _080A49DE @@ -337369,7 +326345,7 @@ _080A49C6: movs r0, 0xFF strb r0, [r6] _080A49DE: - ldr r0, _080A4A14 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -337394,14 +326370,13 @@ _080A4A0A: pop {r0} bx r0 .align 2, 0 -_080A4A10: .4byte 0x02038430 -_080A4A14: .4byte 0x03005e00 + .pool thumb_func_end sub_80A4980 thumb_func_start sub_80A4A18 sub_80A4A18: @ 80A4A18 push {r4,r5,lr} - ldr r0, _080A4A2C + ldr r0, =0x020383f0 ldr r2, [r0] adds r1, r2, 0x1 str r1, [r0] @@ -337411,7 +326386,7 @@ sub_80A4A18: @ 80A4A18 movs r5, 0x2 b _080A4A3A .align 2, 0 -_080A4A2C: .4byte 0x020383f0 + .pool _080A4A30: cmp r5, 0x1 bne _080A4A36 @@ -337423,12 +326398,12 @@ _080A4A3A: cmp r5, 0x2 bne _080A4A48 _080A4A3E: - ldr r0, _080A4A44 + ldr r0, =0x02038436 b _080A4A4A .align 2, 0 -_080A4A44: .4byte 0x02038436 + .pool _080A4A48: - ldr r0, _080A4A7C + ldr r0, =0x02038437 _080A4A4A: ldrb r4, [r0] adds r0, r4, 0 @@ -337453,7 +326428,7 @@ _080A4A76: movs r1, 0 b _080A4A82 .align 2, 0 -_080A4A7C: .4byte 0x02038437 + .pool _080A4A80: movs r1, 0x1 _080A4A82: @@ -337493,7 +326468,7 @@ _080A4AC2: movs r2, 0 bl sub_80A438C _080A4ACA: - ldr r1, _080A4AD8 + ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -337501,13 +326476,13 @@ _080A4ACA: pop {r0} bx r0 .align 2, 0 -_080A4AD8: .4byte 0x020383f0 + .pool thumb_func_end sub_80A4A18 thumb_func_start ma23_8073484 ma23_8073484: @ 80A4ADC push {r4-r6,lr} - ldr r0, _080A4AF0 + ldr r0, =0x020383f0 ldr r2, [r0] adds r1, r2, 0x1 str r1, [r0] @@ -337517,7 +326492,7 @@ ma23_8073484: @ 80A4ADC movs r5, 0x2 b _080A4AFE .align 2, 0 -_080A4AF0: .4byte 0x020383f0 + .pool _080A4AF4: cmp r5, 0x1 bne _080A4AFA @@ -337529,12 +326504,12 @@ _080A4AFE: cmp r5, 0x2 bne _080A4B0C _080A4B02: - ldr r0, _080A4B08 + ldr r0, =0x02038436 b _080A4B0E .align 2, 0 -_080A4B08: .4byte 0x02038436 + .pool _080A4B0C: - ldr r0, _080A4B6C + ldr r0, =0x02038437 _080A4B0E: ldrb r6, [r0] adds r0, r6, 0 @@ -337542,8 +326517,8 @@ _080A4B0E: lsls r0, 24 cmp r0, 0 beq _080A4B38 - ldr r2, _080A4B70 - ldr r0, _080A4B74 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r6, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -337567,8 +326542,8 @@ _080A4B38: lsls r0, 24 cmp r0, 0 beq _080A4B78 - ldr r2, _080A4B70 - ldr r0, _080A4B74 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -337583,25 +326558,23 @@ _080A4B38: strb r1, [r0] b _080A4B7A .align 2, 0 -_080A4B6C: .4byte 0x02038437 -_080A4B70: .4byte 0x02020630 -_080A4B74: .4byte 0x020241e4 + .pool _080A4B78: movs r5, 0 _080A4B7A: - ldr r0, _080A4BA4 + ldr r0, =sub_80A4BB0 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080A4BA8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 strh r5, [r1, 0x8] strh r6, [r1, 0xC] - ldr r1, _080A4BAC + ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -337609,9 +326582,7 @@ _080A4B7A: pop {r0} bx r0 .align 2, 0 -_080A4BA4: .4byte sub_80A4BB0 + 1 -_080A4BA8: .4byte 0x03005e00 -_080A4BAC: .4byte 0x020383f0 + .pool thumb_func_end ma23_8073484 thumb_func_start sub_80A4BB0 @@ -337619,7 +326590,7 @@ sub_80A4BB0: @ 80A4BB0 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080A4BF4 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -337649,7 +326620,7 @@ _080A4BEE: movs r5, 0 b _080A4BFA .align 2, 0 -_080A4BF4: .4byte 0x03005e00 + .pool _080A4BF8: movs r5, 0x1 _080A4BFA: @@ -337661,7 +326632,7 @@ _080A4BFA: adds r0, r5, 0 bl sub_80A477C _080A4C0C: - ldr r0, _080A4C44 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -337689,13 +326660,13 @@ _080A4C3E: pop {r0} bx r0 .align 2, 0 -_080A4C44: .4byte 0x03005e00 + .pool thumb_func_end sub_80A4BB0 thumb_func_start ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument: @ 80A4C48 push {r4,r5,lr} - ldr r2, _080A4C7C + ldr r2, =0x020383f0 ldr r0, [r2] adds r1, r0, 0x1 str r1, [r2] @@ -337718,13 +326689,13 @@ ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument: @ 80A4C48 pop {r0} bx r0 .align 2, 0 -_080A4C7C: .4byte 0x020383f0 + .pool thumb_func_end ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument thumb_func_start ma1E_set_BLDCNT ma1E_set_BLDCNT: @ 80A4C80 push {lr} - ldr r3, _080A4CA4 + ldr r3, =0x020383f0 ldr r0, [r3] adds r2, r0, 0x1 str r2, [r3] @@ -337741,13 +326712,13 @@ ma1E_set_BLDCNT: @ 80A4C80 pop {r0} bx r0 .align 2, 0 -_080A4CA4: .4byte 0x020383f0 + .pool thumb_func_end ma1E_set_BLDCNT thumb_func_start ma0D_reset_BLDCNT_and_BLDALPHA ma0D_reset_BLDCNT_and_BLDALPHA: @ 80A4CA8 push {lr} - ldr r1, _080A4CC8 + ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -337760,17 +326731,17 @@ ma0D_reset_BLDCNT_and_BLDALPHA: @ 80A4CA8 pop {r0} bx r0 .align 2, 0 -_080A4CC8: .4byte 0x020383f0 + .pool thumb_func_end ma0D_reset_BLDCNT_and_BLDALPHA thumb_func_start ma0E_call ma0E_call: @ 80A4CCC push {r4,lr} - ldr r4, _080A4CF8 + ldr r4, =0x020383f0 ldr r1, [r4] adds r3, r1, 0x1 str r3, [r4] - ldr r2, _080A4CFC + ldr r2, =0x020383f4 adds r0, r1, 0x5 str r0, [r2] ldrb r1, [r1, 0x1] @@ -337788,26 +326759,24 @@ ma0E_call: @ 80A4CCC pop {r0} bx r0 .align 2, 0 -_080A4CF8: .4byte 0x020383f0 -_080A4CFC: .4byte 0x020383f4 + .pool thumb_func_end ma0E_call thumb_func_start sub_80A4D00 sub_80A4D00: @ 80A4D00 - ldr r0, _080A4D0C - ldr r1, _080A4D10 + ldr r0, =0x020383f0 + ldr r1, =0x020383f4 ldr r1, [r1] str r1, [r0] bx lr .align 2, 0 -_080A4D0C: .4byte 0x020383f0 -_080A4D10: .4byte 0x020383f4 + .pool thumb_func_end sub_80A4D00 thumb_func_start ma10_080736AC ma10_080736AC: @ 80A4D14 push {r4,r5,lr} - ldr r5, _080A4D40 + ldr r5, =0x020383f0 ldr r1, [r5] adds r0, r1, 0x1 str r0, [r5] @@ -337820,7 +326789,7 @@ ma10_080736AC: @ 80A4D14 orrs r4, r0 adds r1, 0x4 str r1, [r5] - ldr r0, _080A4D44 + ldr r0, =0x0203841e lsls r2, 1 adds r2, r0 strh r4, [r2] @@ -337828,18 +326797,17 @@ ma10_080736AC: @ 80A4D14 pop {r0} bx r0 .align 2, 0 -_080A4D40: .4byte 0x020383f0 -_080A4D44: .4byte 0x0203841e + .pool thumb_func_end ma10_080736AC thumb_func_start ma11_if_else ma11_if_else: @ 80A4D48 push {lr} - ldr r3, _080A4D80 + ldr r3, =0x020383f0 ldr r2, [r3] adds r0, r2, 0x1 str r0, [r3] - ldr r0, _080A4D84 + ldr r0, =0x02038432 ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -337863,21 +326831,20 @@ _080A4D62: pop {r0} bx r0 .align 2, 0 -_080A4D80: .4byte 0x020383f0 -_080A4D84: .4byte 0x02038432 + .pool thumb_func_end ma11_if_else thumb_func_start ma12_cond_if ma12_cond_if: @ 80A4D88 push {r4,r5,lr} - ldr r5, _080A4DB8 + ldr r5, =0x020383f0 ldr r4, [r5] adds r2, r4, 0x1 str r2, [r5] ldrb r1, [r4, 0x1] adds r3, r2, 0x1 str r3, [r5] - ldr r0, _080A4DBC + ldr r0, =0x02038432 ldrb r0, [r0] cmp r1, r0 bne _080A4DC0 @@ -337894,8 +326861,7 @@ ma12_cond_if: @ 80A4D88 str r1, [r5] b _080A4DC4 .align 2, 0 -_080A4DB8: .4byte 0x020383f0 -_080A4DBC: .4byte 0x02038432 + .pool _080A4DC0: adds r0, r4, 0x6 str r0, [r5] @@ -337907,7 +326873,7 @@ _080A4DC4: thumb_func_start ma13_goto ma13_goto: @ 80A4DCC - ldr r3, _080A4DEC + ldr r3, =0x020383f0 ldr r0, [r3] adds r2, r0, 0x1 str r2, [r3] @@ -337924,14 +326890,14 @@ ma13_goto: @ 80A4DCC str r1, [r3] bx lr .align 2, 0 -_080A4DEC: .4byte 0x020383f0 + .pool thumb_func_end ma13_goto thumb_func_start sub_80A4DF0 sub_80A4DF0: @ 80A4DF0 push {lr} - ldr r0, _080A4E08 - ldr r1, _080A4E0C + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -337941,8 +326907,7 @@ sub_80A4DF0: @ 80A4DF0 movs r0, 0 b _080A4E12 .align 2, 0 -_080A4E08: .4byte 0x030022c0 -_080A4E0C: .4byte 0x00000439 + .pool _080A4E10: movs r0, 0x1 _080A4E12: @@ -337953,35 +326918,32 @@ _080A4E12: thumb_func_start ma14_load_background ma14_load_background: @ 80A4E18 push {r4,lr} - ldr r1, _080A4E4C + ldr r1, =0x020383f0 ldr r2, [r1] adds r0, r2, 0x1 str r0, [r1] ldrb r4, [r2, 0x1] adds r0, 0x1 str r0, [r1] - ldr r0, _080A4E50 + ldr r0, =task_p5_load_battle_screen_elements + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080A4E54 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 strh r4, [r1, 0x8] - ldr r1, _080A4E58 + ldr r1, =0x02038433 movs r0, 0x1 strb r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_080A4E4C: .4byte 0x020383f0 -_080A4E50: .4byte task_p5_load_battle_screen_elements + 1 -_080A4E54: .4byte 0x03005e00 -_080A4E58: .4byte 0x02038433 + .pool thumb_func_end ma14_load_background thumb_func_start sub_80A4E5C @@ -337989,7 +326951,7 @@ sub_80A4E5C: @ 80A4E5C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r2, _080A4E9C + ldr r2, =0x020383f0 ldr r1, [r2] adds r0, r1, 0x1 str r0, [r2] @@ -337999,7 +326961,7 @@ sub_80A4E5C: @ 80A4E5C ldrb r6, [r0, 0x2] adds r1, 0x4 str r1, [r2] - ldr r0, _080A4EA0 + ldr r0, =task_p5_load_battle_screen_elements + 1 movs r1, 0x5 bl AddTask lsls r0, 24 @@ -338009,7 +326971,7 @@ sub_80A4E5C: @ 80A4E5C lsls r0, 24 cmp r0, 0 beq _080A4EA8 - ldr r1, _080A4EA4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -338017,17 +326979,15 @@ sub_80A4E5C: @ 80A4E5C strh r6, [r0, 0x8] b _080A4EDA .align 2, 0 -_080A4E9C: .4byte 0x020383f0 -_080A4EA0: .4byte task_p5_load_battle_screen_elements + 1 -_080A4EA4: .4byte 0x03005e00 + .pool _080A4EA8: - ldr r0, _080A4EC4 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _080A4ECC - ldr r1, _080A4EC8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -338035,10 +326995,9 @@ _080A4EA8: strh r7, [r0, 0x8] b _080A4EDA .align 2, 0 -_080A4EC4: .4byte 0x02038437 -_080A4EC8: .4byte 0x03005e00 + .pool _080A4ECC: - ldr r1, _080A4EEC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -338046,7 +327005,7 @@ _080A4ECC: mov r1, r8 strh r1, [r0, 0x8] _080A4EDA: - ldr r1, _080A4EF0 + ldr r1, =0x02038433 movs r0, 0x1 strb r0, [r1] pop {r3} @@ -338055,8 +327014,7 @@ _080A4EDA: pop {r0} bx r0 .align 2, 0 -_080A4EEC: .4byte 0x03005e00 -_080A4EF0: .4byte 0x02038433 + .pool thumb_func_end sub_80A4E5C thumb_func_start task_p5_load_battle_screen_elements @@ -338065,7 +327023,7 @@ task_p5_load_battle_screen_elements: @ 80A4EF4 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080A4F28 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -338087,9 +327045,9 @@ task_p5_load_battle_screen_elements: @ 80A4EF4 strh r0, [r4, 0x1C] b _080A4FBC .align 2, 0 -_080A4F28: .4byte 0x03005e00 + .pool _080A4F2C: - ldr r2, _080A4F48 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -338099,13 +327057,12 @@ _080A4F2C: bne _080A4F50 adds r0, r6, 0x1 strh r0, [r4, 0x1C] - ldr r1, _080A4F4C + ldr r1, =0x02038433 movs r0, 0x2 strb r0, [r1] b _080A4F94 .align 2, 0 -_080A4F48: .4byte 0x02037fd4 -_080A4F4C: .4byte 0x02038433 + .pool _080A4F50: cmp r3, 0x2 bne _080A4F94 @@ -338129,7 +327086,7 @@ _080A4F6E: movs r2, 0x10 movs r3, 0 bl sub_80A27B0 - ldr r1, _080A4F90 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -338139,7 +327096,7 @@ _080A4F6E: strh r1, [r0, 0x1C] b _080A4FBC .align 2, 0 -_080A4F90: .4byte 0x03005e00 + .pool _080A4F94: ldrb r1, [r2, 0x7] movs r0, 0x80 @@ -338158,7 +327115,7 @@ _080A4F94: bne _080A4FBC adds r0, r5, 0 bl remove_task - ldr r0, _080A4FC4 + ldr r0, =0x02038433 strb r4, [r0] _080A4FBC: add sp, 0x4 @@ -338166,7 +327123,7 @@ _080A4FBC: pop {r0} bx r0 .align 2, 0 -_080A4FC4: .4byte 0x02038433 + .pool thumb_func_end task_p5_load_battle_screen_elements thumb_func_start sub_80A4FC8 @@ -338178,7 +327135,7 @@ sub_80A4FC8: @ 80A4FC8 lsls r0, 24 cmp r0, 0 beq _080A5050 - ldr r6, _080A5038 + ldr r6, =0x08525d54 lsls r4, r7, 1 adds r4, r7 lsls r4, 2 @@ -338186,7 +327143,7 @@ sub_80A4FC8: @ 80A4FC8 adds r0, 0x8 adds r0, r4, r0 ldr r0, [r0] - ldr r5, _080A503C + ldr r5, =0x0201c000 adds r1, r5, 0 bl call_LZZUnCompWram bl sub_80A6D94 @@ -338197,16 +327154,16 @@ sub_80A4FC8: @ 80A4FC8 adds r1, r5, 0 movs r3, 0 bl sub_80A4720 - ldr r1, _080A5040 - ldr r0, _080A5044 + ldr r1, =0x0600d000 + ldr r0, =0x040000d4 str r5, [r0] str r1, [r0, 0x4] - ldr r1, _080A5048 + ldr r1, =0x84000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] adds r0, r4, r6 ldr r0, [r0] - ldr r1, _080A504C + ldr r1, =0x06002000 bl call_LZZUnCompVram adds r6, 0x4 adds r4, r6 @@ -338220,14 +327177,9 @@ sub_80A4FC8: @ 80A4FC8 bl decompress_palette b _080A507E .align 2, 0 -_080A5038: .4byte 0x08525d54 -_080A503C: .4byte 0x0201c000 -_080A5040: .4byte 0x0600d000 -_080A5044: .4byte 0x040000d4 -_080A5048: .4byte 0x84000200 -_080A504C: .4byte 0x06002000 + .pool _080A5050: - ldr r5, _080A5084 + ldr r5, =0x08525d54 lsls r4, r7, 1 adds r4, r7 lsls r4, 2 @@ -338235,11 +327187,11 @@ _080A5050: adds r0, 0x8 adds r0, r4, r0 ldr r0, [r0] - ldr r1, _080A5088 + ldr r1, =0x0600d000 bl call_LZZUnCompVram adds r0, r4, r5 ldr r0, [r0] - ldr r1, _080A508C + ldr r1, =0x06008000 bl call_LZZUnCompVram adds r5, 0x4 adds r4, r5 @@ -338252,9 +327204,7 @@ _080A507E: pop {r0} bx r0 .align 2, 0 -_080A5084: .4byte 0x08525d54 -_080A5088: .4byte 0x0600d000 -_080A508C: .4byte 0x06008000 + .pool thumb_func_end sub_80A4FC8 thumb_func_start dp01t_11_3_message_for_player_only @@ -338276,97 +327226,89 @@ _080A50A6: thumb_func_start ma15_load_battle_screen_elements ma15_load_battle_screen_elements: @ 80A50AC push {lr} - ldr r1, _080A50DC + ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r0, _080A50E0 + ldr r0, =task_p5_load_battle_screen_elements + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080A50E4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _080A50E8 + ldr r0, =0x0000ffff strh r0, [r1, 0x8] - ldr r1, _080A50EC + ldr r1, =0x02038433 movs r0, 0x1 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_080A50DC: .4byte 0x020383f0 -_080A50E0: .4byte task_p5_load_battle_screen_elements + 1 -_080A50E4: .4byte 0x03005e00 -_080A50E8: .4byte 0x0000ffff -_080A50EC: .4byte 0x02038433 + .pool thumb_func_end ma15_load_battle_screen_elements thumb_func_start ma16_wait_for_battle_screen_elements_s2 ma16_wait_for_battle_screen_elements_s2: @ 80A50F0 push {lr} - ldr r0, _080A5108 + ldr r0, =0x02038433 ldrb r0, [r0] cmp r0, 0x2 bne _080A5114 - ldr r1, _080A510C + ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r1, _080A5110 + ldr r1, =0x020383fc movs r0, 0 b _080A5118 .align 2, 0 -_080A5108: .4byte 0x02038433 -_080A510C: .4byte 0x020383f0 -_080A5110: .4byte 0x020383fc + .pool _080A5114: - ldr r1, _080A5120 + ldr r1, =0x020383fc movs r0, 0x1 _080A5118: strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_080A5120: .4byte 0x020383fc + .pool thumb_func_end ma16_wait_for_battle_screen_elements_s2 thumb_func_start sub_80A5124 sub_80A5124: @ 80A5124 push {lr} - ldr r0, _080A513C + ldr r0, =0x02038433 ldrb r2, [r0] cmp r2, 0 bne _080A5148 - ldr r0, _080A5140 + ldr r0, =0x020383f0 ldr r1, [r0] adds r1, 0x1 str r1, [r0] - ldr r0, _080A5144 + ldr r0, =0x020383fc strb r2, [r0] b _080A514E .align 2, 0 -_080A513C: .4byte 0x02038433 -_080A5140: .4byte 0x020383f0 -_080A5144: .4byte 0x020383fc + .pool _080A5148: - ldr r1, _080A5154 + ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] _080A514E: pop {r0} bx r0 .align 2, 0 -_080A5154: .4byte 0x020383fc + .pool thumb_func_end sub_80A5124 thumb_func_start ma18_load_background_probably ma18_load_background_probably: @ 80A5158 push {r4,lr} - ldr r4, _080A5174 + ldr r4, =0x020383f0 ldr r1, [r4] adds r0, r1, 0x1 str r0, [r4] @@ -338379,7 +327321,7 @@ ma18_load_background_probably: @ 80A5158 pop {r0} bx r0 .align 2, 0 -_080A5174: .4byte 0x020383f0 + .pool thumb_func_end ma18_load_background_probably thumb_func_start sub_80A5178 @@ -338391,9 +327333,9 @@ sub_80A5178: @ 80A5178 lsls r0, 24 cmp r0, 0 bne _080A51C0 - ldr r0, _080A51B8 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _080A51BC + ldr r0, =0x02038436 ldrb r2, [r0] ldr r1, [r1, 0x4] lsls r0, r2, 1 @@ -338414,15 +327356,14 @@ sub_80A5178: @ 80A5178 movs r4, 0x3F b _080A5252 .align 2, 0 -_080A51B8: .4byte 0x020244d0 -_080A51BC: .4byte 0x02038436 + .pool _080A51C0: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 beq _080A51E8 - ldr r0, _080A51E0 - ldr r1, _080A51E4 + ldr r0, =0x02038436 + ldr r1, =0x02038437 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 @@ -338433,16 +327374,15 @@ _080A51C0: beq _080A525E b _080A524C .align 2, 0 -_080A51E0: .4byte 0x02038436 -_080A51E4: .4byte 0x02038437 + .pool _080A51E8: - ldr r0, _080A5210 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _080A5226 - ldr r0, _080A5214 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -338455,8 +327395,7 @@ _080A51E8: movs r4, 0xC0 b _080A5252 .align 2, 0 -_080A5210: .4byte 0x02038436 -_080A5214: .4byte 0x02038437 + .pool _080A5218: movs r0, 0x40 negs r0, r0 @@ -338466,7 +327405,7 @@ _080A5218: lsls r0, 24 b _080A5250 _080A5226: - ldr r0, _080A5248 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -338482,7 +327421,7 @@ _080A5226: movs r4, 0x3F b _080A5252 .align 2, 0 -_080A5248: .4byte 0x02038437 + .pool _080A524C: lsls r0, r4, 24 negs r0, r0 @@ -338520,9 +327459,9 @@ sub_80A5278: @ 80A5278 lsls r0, 24 cmp r0, 0 bne _080A52C0 - ldr r0, _080A52B8 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _080A52BC + ldr r0, =0x02038436 ldrb r2, [r0] ldr r1, [r1, 0x4] lsls r0, r2, 1 @@ -338543,10 +327482,9 @@ sub_80A5278: @ 80A5278 movs r4, 0x3F b _080A52DE .align 2, 0 -_080A52B8: .4byte 0x020244d0 -_080A52BC: .4byte 0x02038436 + .pool _080A52C0: - ldr r0, _080A52E8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -338567,7 +327505,7 @@ _080A52DE: pop {r1} bx r1 .align 2, 0 -_080A52E8: .4byte 0x02038436 + .pool thumb_func_end sub_80A5278 thumb_func_start sub_80A52EC @@ -338585,14 +327523,14 @@ _080A52FC: negs r0, r0 cmp r2, r0 bge _080A5306 - ldr r1, _080A5310 + ldr r1, =0x0000ffc0 _080A5306: lsls r0, r1, 16 asrs r0, 16 pop {r1} bx r1 .align 2, 0 -_080A5310: .4byte 0x0000ffc0 + .pool thumb_func_end sub_80A52EC thumb_func_start sub_80A5314 @@ -338638,7 +327576,7 @@ _080A534A: thumb_func_start ma19_08073BC8 ma19_08073BC8: @ 80A5354 push {r4,r5,lr} - ldr r5, _080A5388 + ldr r5, =0x020383f0 ldr r0, [r5] adds r1, r0, 0x1 str r1, [r5] @@ -338661,13 +327599,13 @@ ma19_08073BC8: @ 80A5354 pop {r0} bx r0 .align 2, 0 -_080A5388: .4byte 0x020383f0 + .pool thumb_func_end ma19_08073BC8 thumb_func_start ma1A_8073C00 ma1A_8073C00: @ 80A538C push {r4,lr} - ldr r4, _080A53B4 + ldr r4, =0x020383f0 ldr r1, [r4] adds r0, r1, 0x1 str r0, [r4] @@ -338684,7 +327622,7 @@ ma1A_8073C00: @ 80A538C pop {r0} bx r0 .align 2, 0 -_080A53B4: .4byte 0x020383f0 + .pool thumb_func_end ma1A_8073C00 thumb_func_start ma1B_8073C2C @@ -338694,7 +327632,7 @@ ma1B_8073C2C: @ 80A53B8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _080A5468 + ldr r0, =0x020383f0 mov r10, r0 ldr r0, [r0] adds r1, r0, 0x1 @@ -338736,12 +327674,12 @@ ma1B_8073C2C: @ 80A53B8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080A546C + ldr r0, =c3_08073CEC + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080A5470 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -338757,7 +327695,7 @@ ma1B_8073C2C: @ 80A53B8 mov r0, r9 adds r1, r5, 0 bl audio_play_and_stuff - ldr r1, _080A5474 + ldr r1, =0x020383ff ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -338773,10 +327711,7 @@ ma1B_8073C2C: @ 80A53B8 pop {r0} bx r0 .align 2, 0 -_080A5468: .4byte 0x020383f0 -_080A546C: .4byte c3_08073CEC + 1 -_080A5470: .4byte 0x03005e00 -_080A5474: .4byte 0x020383ff + .pool thumb_func_end ma1B_8073C2C thumb_func_start c3_08073CEC @@ -338785,7 +327720,7 @@ c3_08073CEC: @ 80A5478 lsls r0, 24 lsrs r5, r0, 24 movs r7, 0 - ldr r1, _080A54BC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -338815,7 +327750,7 @@ c3_08073CEC: @ 80A5478 lsls r2, r3, 16 b _080A54E4 .align 2, 0 -_080A54BC: .4byte 0x03005e00 + .pool _080A54C0: lsls r1, r6, 16 lsls r0, r3, 16 @@ -338841,7 +327776,7 @@ _080A54E4: lsrs r4, r2, 16 adds r0, r5, 0 bl remove_task - ldr r1, _080A5504 + ldr r1, =0x020383ff ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] @@ -338854,7 +327789,7 @@ _080A54FC: pop {r0} bx r0 .align 2, 0 -_080A5504: .4byte 0x020383ff + .pool thumb_func_end c3_08073CEC thumb_func_start sub_80A5508 @@ -338864,7 +327799,7 @@ sub_80A5508: @ 80A5508 mov r5, r9 mov r4, r8 push {r4-r6} - ldr r0, _080A558C + ldr r0, =0x020383f0 mov r9, r0 ldr r0, [r0] adds r1, r0, 0x1 @@ -338882,12 +327817,12 @@ sub_80A5508: @ 80A5508 ldrb r6, [r1, 0x4] ldrb r1, [r1, 0x5] mov r10, r1 - ldr r0, _080A5590 + ldr r0, =c3_08073CEC + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080A5594 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -338907,7 +327842,7 @@ sub_80A5508: @ 80A5508 mov r0, r8 adds r1, r4, 0 bl audio_play_and_stuff - ldr r1, _080A5598 + ldr r1, =0x020383ff ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -338923,10 +327858,7 @@ sub_80A5508: @ 80A5508 pop {r0} bx r0 .align 2, 0 -_080A558C: .4byte 0x020383f0 -_080A5590: .4byte c3_08073CEC + 1 -_080A5594: .4byte 0x03005e00 -_080A5598: .4byte 0x020383ff + .pool thumb_func_end sub_80A5508 thumb_func_start sub_80A559C @@ -338936,7 +327868,7 @@ sub_80A559C: @ 80A559C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _080A564C + ldr r0, =0x020383f0 mov r10, r0 ldr r0, [r0] adds r1, r0, 0x1 @@ -338975,12 +327907,12 @@ sub_80A559C: @ 80A559C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080A5650 + ldr r0, =c3_08073CEC + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080A5654 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -338999,7 +327931,7 @@ sub_80A559C: @ 80A559C mov r0, r9 adds r1, r6, 0 bl audio_play_and_stuff - ldr r1, _080A5658 + ldr r1, =0x020383ff ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -339015,10 +327947,7 @@ sub_80A559C: @ 80A559C pop {r0} bx r0 .align 2, 0 -_080A564C: .4byte 0x020383f0 -_080A5650: .4byte c3_08073CEC + 1 -_080A5654: .4byte 0x03005e00 -_080A5658: .4byte 0x020383ff + .pool thumb_func_end sub_80A559C thumb_func_start ma1C_8073ED0 @@ -339027,7 +327956,7 @@ ma1C_8073ED0: @ 80A565C mov r6, r9 mov r5, r8 push {r5,r6} - ldr r6, _080A56D4 + ldr r6, =0x020383f0 ldr r0, [r6] adds r1, r0, 0x1 str r1, [r6] @@ -339045,12 +327974,12 @@ ma1C_8073ED0: @ 80A565C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080A56D8 + ldr r0, =sub_80A56E4 + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080A56DC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -339067,7 +327996,7 @@ ma1C_8073ED0: @ 80A565C strh r2, [r1, 0x18] ldr r1, [r1] bl _call_via_r1 - ldr r1, _080A56E0 + ldr r1, =0x020383ff ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -339081,10 +328010,7 @@ ma1C_8073ED0: @ 80A565C pop {r0} bx r0 .align 2, 0 -_080A56D4: .4byte 0x020383f0 -_080A56D8: .4byte sub_80A56E4 + 1 -_080A56DC: .4byte 0x03005e00 -_080A56E0: .4byte 0x020383ff + .pool thumb_func_end ma1C_8073ED0 thumb_func_start sub_80A56E4 @@ -339092,7 +328018,7 @@ sub_80A56E4: @ 80A56E4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080A5738 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -339122,7 +328048,7 @@ sub_80A56E4: @ 80A56E4 bne _080A5732 adds r0, r5, 0 bl remove_task - ldr r1, _080A573C + ldr r1, =0x020383ff ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] @@ -339131,8 +328057,7 @@ _080A5732: pop {r0} bx r0 .align 2, 0 -_080A5738: .4byte 0x03005e00 -_080A573C: .4byte 0x020383ff + .pool thumb_func_end sub_80A56E4 thumb_func_start ma1D_08073FB4 @@ -339140,7 +328065,7 @@ ma1D_08073FB4: @ 80A5740 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r6, _080A57A4 + ldr r6, =0x020383f0 ldr r0, [r6] adds r1, r0, 0x1 str r1, [r6] @@ -339156,12 +328081,12 @@ ma1D_08073FB4: @ 80A5740 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080A57A8 + ldr r0, =sub_80A57B4 + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080A57AC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -339172,7 +328097,7 @@ ma1D_08073FB4: @ 80A5740 strh r4, [r1, 0xA] mov r0, r8 strh r0, [r1, 0xC] - ldr r1, _080A57B0 + ldr r1, =0x020383ff ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -339185,10 +328110,7 @@ ma1D_08073FB4: @ 80A5740 pop {r0} bx r0 .align 2, 0 -_080A57A4: .4byte 0x020383f0 -_080A57A8: .4byte sub_80A57B4 + 1 -_080A57AC: .4byte 0x03005e00 -_080A57B0: .4byte 0x020383ff + .pool thumb_func_end ma1D_08073FB4 thumb_func_start sub_80A57B4 @@ -339196,7 +328118,7 @@ sub_80A57B4: @ 80A57B4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080A57F0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -339213,7 +328135,7 @@ sub_80A57B4: @ 80A57B4 bl audio_play_and_stuff adds r0, r4, 0 bl remove_task - ldr r1, _080A57F4 + ldr r1, =0x020383ff ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] @@ -339222,14 +328144,13 @@ _080A57E8: pop {r0} bx r0 .align 2, 0 -_080A57F0: .4byte 0x03005e00 -_080A57F4: .4byte 0x020383ff + .pool thumb_func_end sub_80A57B4 thumb_func_start sub_80A57F8 sub_80A57F8: @ 80A57F8 push {r4-r6,lr} - ldr r4, _080A5860 + ldr r4, =0x020383f0 ldr r1, [r4] adds r3, r1, 0x1 str r3, [r4] @@ -339251,7 +328172,7 @@ sub_80A57F8: @ 80A57F8 cmp r0, 0 beq _080A5842 adds r5, r4, 0 - ldr r4, _080A5864 + ldr r4, =0x0203841e adds r3, r0, 0 _080A582A: ldr r2, [r5] @@ -339273,7 +328194,7 @@ _080A5842: lsls r0, 24 lsrs r0, 24 bl _call_via_r6 - ldr r1, _080A5868 + ldr r1, =0x020383ff ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -339281,15 +328202,13 @@ _080A5842: pop {r0} bx r0 .align 2, 0 -_080A5860: .4byte 0x020383f0 -_080A5864: .4byte 0x0203841e -_080A5868: .4byte 0x020383ff + .pool thumb_func_end sub_80A57F8 thumb_func_start ma20_wait_for_something ma20_wait_for_something: @ 80A586C push {r4,r5,lr} - ldr r0, _080A58A4 + ldr r0, =0x020383ff ldrb r5, [r0] cmp r5, 0 bne _080A58B4 @@ -339298,7 +328217,7 @@ ma20_wait_for_something: @ 80A586C lsrs r1, r0, 24 cmp r1, 0 beq _080A58CC - ldr r4, _080A58A8 + ldr r4, =0x0203842e ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -339306,53 +328225,47 @@ ma20_wait_for_something: @ 80A586C lsrs r0, 16 cmp r0, 0x5A bls _080A58BA - ldr r0, _080A58AC + ldr r0, =0x030075f0 bl MPlayStop_rev01 - ldr r0, _080A58B0 + ldr r0, =0x03007630 bl MPlayStop_rev01 strh r5, [r4] b _080A58DE .align 2, 0 -_080A58A4: .4byte 0x020383ff -_080A58A8: .4byte 0x0203842e -_080A58AC: .4byte 0x030075f0 -_080A58B0: .4byte 0x03007630 + .pool _080A58B4: - ldr r1, _080A58C4 + ldr r1, =0x0203842e movs r0, 0 strh r0, [r1] _080A58BA: - ldr r1, _080A58C8 + ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] b _080A58DE .align 2, 0 -_080A58C4: .4byte 0x0203842e -_080A58C8: .4byte 0x020383fc + .pool _080A58CC: - ldr r0, _080A58E4 + ldr r0, =0x0203842e movs r2, 0 strh r1, [r0] - ldr r1, _080A58E8 + ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - ldr r0, _080A58EC + ldr r0, =0x020383fc strb r2, [r0] _080A58DE: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080A58E4: .4byte 0x0203842e -_080A58E8: .4byte 0x020383f0 -_080A58EC: .4byte 0x020383fc + .pool thumb_func_end ma20_wait_for_something thumb_func_start ma21_08074164 ma21_08074164: @ 80A58F0 push {r4-r6,lr} - ldr r5, _080A5930 + ldr r5, =0x020383f0 ldr r4, [r5] adds r3, r4, 0x1 str r3, [r5] @@ -339361,7 +328274,7 @@ ma21_08074164: @ 80A58F0 ldrb r0, [r3, 0x2] lsls r0, 8 orrs r1, r0 - ldr r0, _080A5934 + ldr r0, =0x0203841e lsls r2, 1 adds r2, r0 lsls r1, 16 @@ -339383,8 +328296,7 @@ ma21_08074164: @ 80A58F0 str r1, [r5] b _080A593E .align 2, 0 -_080A5930: .4byte 0x020383f0 -_080A5934: .4byte 0x0203841e + .pool _080A5938: adds r0, r4, 0 adds r0, 0x8 @@ -339398,7 +328310,7 @@ _080A593E: thumb_func_start sub_80A5944 sub_80A5944: @ 80A5944 push {r4,lr} - ldr r4, _080A5974 + ldr r4, =0x020383f0 ldr r0, [r4] adds r0, 0x1 str r0, [r4] @@ -339420,7 +328332,7 @@ sub_80A5944: @ 80A5944 str r1, [r4] b _080A597E .align 2, 0 -_080A5974: .4byte 0x020383f0 + .pool _080A5978: ldr r0, [r4] adds r0, 0x4 @@ -339434,20 +328346,19 @@ _080A597E: thumb_func_start sub_80A5984 sub_80A5984: @ 80A5984 push {r4,lr} - ldr r0, _080A5998 + ldr r0, =0x020383f0 ldr r1, [r0] ldrb r2, [r1, 0x1] adds r1, 0x2 str r1, [r0] cmp r2, 0 beq _080A59A0 - ldr r0, _080A599C + ldr r0, =0x02038437 b _080A59A2 .align 2, 0 -_080A5998: .4byte 0x020383f0 -_080A599C: .4byte 0x02038437 + .pool _080A59A0: - ldr r0, _080A59D8 + ldr r0, =0x02038436 _080A59A2: ldrb r0, [r0] bl battle_get_per_side_status @@ -339475,13 +328386,13 @@ _080A59D2: pop {r0} bx r0 .align 2, 0 -_080A59D8: .4byte 0x02038436 + .pool thumb_func_end sub_80A5984 thumb_func_start sub_80A59DC sub_80A59DC: @ 80A59DC push {lr} - ldr r0, _080A5A08 + ldr r0, =0x020383f0 ldr r1, [r0] adds r1, 0x1 str r1, [r0] @@ -339501,22 +328412,22 @@ _080A5A04: pop {r0} bx r0 .align 2, 0 -_080A5A08: .4byte 0x020383f0 + .pool thumb_func_end sub_80A59DC thumb_func_start sub_80A5A0C sub_80A5A0C: @ 80A5A0C push {r4-r7,lr} - ldr r1, _080A5A3C + ldr r1, =0x020383f0 ldr r0, [r1] ldrb r6, [r0, 0x1] adds r0, 0x2 str r0, [r1] - ldr r7, _080A5A40 + ldr r7, =0x02038436 ldrb r0, [r7] bl battle_side_get_owner adds r4, r0, 0 - ldr r5, _080A5A44 + ldr r5, =0x02038437 ldrb r0, [r5] bl battle_side_get_owner lsls r4, 24 @@ -339528,9 +328439,7 @@ sub_80A5A0C: @ 80A5A0C ldrb r0, [r5] b _080A5A4A .align 2, 0 -_080A5A3C: .4byte 0x020383f0 -_080A5A40: .4byte 0x02038436 -_080A5A44: .4byte 0x02038437 + .pool _080A5A48: ldrb r0, [r7] _080A5A4A: @@ -339563,7 +328472,7 @@ _080A5A78: thumb_func_start ma2B_make_side_invisible ma2B_make_side_invisible: @ 80A5A80 push {r4,lr} - ldr r4, _080A5AB4 + ldr r4, =0x020383f0 ldr r0, [r4] ldrb r0, [r0, 0x1] bl obj_id_for_side_relative_to_move @@ -339571,7 +328480,7 @@ ma2B_make_side_invisible: @ 80A5A80 lsrs r2, r0, 24 cmp r2, 0xFF beq _080A5AA8 - ldr r1, _080A5AB8 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -339589,14 +328498,13 @@ _080A5AA8: pop {r0} bx r0 .align 2, 0 -_080A5AB4: .4byte 0x020383f0 -_080A5AB8: .4byte 0x02020630 + .pool thumb_func_end ma2B_make_side_invisible thumb_func_start ma2C_make_side_visible ma2C_make_side_visible: @ 80A5ABC push {r4,lr} - ldr r4, _080A5AF4 + ldr r4, =0x020383f0 ldr r0, [r4] ldrb r0, [r0, 0x1] bl obj_id_for_side_relative_to_move @@ -339604,7 +328512,7 @@ ma2C_make_side_visible: @ 80A5ABC lsrs r2, r0, 24 cmp r2, 0xFF beq _080A5AE6 - ldr r1, _080A5AF8 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -339623,14 +328531,13 @@ _080A5AE6: pop {r0} bx r0 .align 2, 0 -_080A5AF4: .4byte 0x020383f0 -_080A5AF8: .4byte 0x02020630 + .pool thumb_func_end ma2C_make_side_visible thumb_func_start sub_80A5AFC sub_80A5AFC: @ 80A5AFC push {r4-r7,lr} - ldr r1, _080A5B48 + ldr r1, =0x020383f0 ldr r0, [r1] ldrb r7, [r0, 0x1] adds r0, 0x2 @@ -339643,11 +328550,11 @@ sub_80A5AFC: @ 80A5AFC lsls r0, 24 cmp r0, 0 beq _080A5BA6 - ldr r6, _080A5B4C + ldr r6, =0x02038436 ldrb r0, [r6] bl battle_side_get_owner adds r4, r0, 0 - ldr r5, _080A5B50 + ldr r5, =0x02038437 ldrb r0, [r5] bl battle_side_get_owner lsls r4, 24 @@ -339663,9 +328570,7 @@ sub_80A5AFC: @ 80A5AFC movs r0, 0 b _080A5B60 .align 2, 0 -_080A5B48: .4byte 0x020383f0 -_080A5B4C: .4byte 0x02038436 -_080A5B50: .4byte 0x02038437 + .pool _080A5B54: ldrb r0, [r5] bl battle_get_per_side_status_permutated @@ -339678,7 +328583,7 @@ _080A5B60: lsrs r2, r0, 24 cmp r2, 0xFF beq _080A5BA6 - ldr r1, _080A5B9C + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -339703,7 +328608,7 @@ _080A5B90: bl sub_80A477C b _080A5BA6 .align 2, 0 -_080A5B9C: .4byte 0x02020630 + .pool _080A5BA0: movs r0, 0x1 bl sub_80A477C @@ -339716,7 +328621,7 @@ _080A5BA6: thumb_func_start sub_80A5BAC sub_80A5BAC: @ 80A5BAC push {r4-r7,lr} - ldr r1, _080A5BF8 + ldr r1, =0x020383f0 ldr r0, [r1] ldrb r7, [r0, 0x1] adds r0, 0x2 @@ -339729,11 +328634,11 @@ sub_80A5BAC: @ 80A5BAC lsls r0, 24 cmp r0, 0 beq _080A5C38 - ldr r6, _080A5BFC + ldr r6, =0x02038436 ldrb r0, [r6] bl battle_side_get_owner adds r4, r0, 0 - ldr r5, _080A5C00 + ldr r5, =0x02038437 ldrb r0, [r5] bl battle_side_get_owner lsls r4, 24 @@ -339749,9 +328654,7 @@ sub_80A5BAC: @ 80A5BAC movs r0, 0 b _080A5C10 .align 2, 0 -_080A5BF8: .4byte 0x020383f0 -_080A5BFC: .4byte 0x02038436 -_080A5C00: .4byte 0x02038437 + .pool _080A5C04: ldrb r0, [r5] bl battle_get_per_side_status_permutated @@ -339766,7 +328669,7 @@ _080A5C10: beq _080A5C38 cmp r4, 0x2 bne _080A5C38 - ldr r1, _080A5C40 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -339783,26 +328686,24 @@ _080A5C38: pop {r0} bx r0 .align 2, 0 -_080A5C40: .4byte 0x02020630 + .pool thumb_func_end sub_80A5BAC thumb_func_start ma2F_stop_music ma2F_stop_music: @ 80A5C44 push {lr} - ldr r0, _080A5C60 + ldr r0, =0x030075f0 bl MPlayStop_rev01 - ldr r0, _080A5C64 + ldr r0, =0x03007630 bl MPlayStop_rev01 - ldr r1, _080A5C68 + ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080A5C60: .4byte 0x030075f0 -_080A5C64: .4byte 0x03007630 -_080A5C68: .4byte 0x020383f0 + .pool thumb_func_end ma2F_stop_music thumb_func_start sub_80A5C6C @@ -339825,12 +328726,12 @@ _080A5C8A: cmp r4, 0x4 bhi _080A5D00 lsls r0, r4, 2 - ldr r1, _080A5C98 + ldr r1, =_080A5C9C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A5C98: .4byte _080A5C9C + .pool .align 2, 0 _080A5C9C: .4byte _080A5CB0 @@ -339839,12 +328740,12 @@ _080A5C9C: .4byte _080A5D00 .4byte _080A5D00 _080A5CB0: - ldr r4, _080A5CD0 + ldr r4, =0x08525f58 adds r0, r5, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 22 - ldr r1, _080A5CD4 + ldr r1, =0x02022fec ldr r1, [r1] movs r2, 0x1 ands r1, r2 @@ -339854,15 +328755,14 @@ _080A5CB0: ldrb r0, [r0] b _080A5DB0 .align 2, 0 -_080A5CD0: .4byte 0x08525f58 -_080A5CD4: .4byte 0x02022fec + .pool _080A5CD8: - ldr r4, _080A5CF8 + ldr r4, =0x08525f58 adds r0, r5, 0 bl battle_get_per_side_status lsls r0, 24 lsrs r0, 22 - ldr r1, _080A5CFC + ldr r1, =0x02022fec ldr r1, [r1] movs r2, 0x1 ands r1, r2 @@ -339872,14 +328772,13 @@ _080A5CD8: ldrb r0, [r0, 0x1] b _080A5DB0 .align 2, 0 -_080A5CF8: .4byte 0x08525f58 -_080A5CFC: .4byte 0x02022fec + .pool _080A5D00: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 beq _080A5D28 - ldr r0, _080A5D20 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x18] ldrb r1, [r2, 0x4] @@ -339890,7 +328789,7 @@ _080A5D00: ldrh r1, [r2, 0x2] b _080A5D9A .align 2, 0 -_080A5D20: .4byte 0x02039f34 + .pool _080A5D24: ldrh r1, [r2] b _080A5D9A @@ -339900,7 +328799,7 @@ _080A5D28: lsls r0, 24 cmp r0, 0 beq _080A5D60 - ldr r0, _080A5D54 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r5, 2 @@ -339908,20 +328807,18 @@ _080A5D28: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A5D98 - ldr r1, _080A5D58 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A5D5C + ldr r1, =0x02024744 b _080A5D7E .align 2, 0 -_080A5D54: .4byte 0x020244d0 -_080A5D58: .4byte 0x0202406e -_080A5D5C: .4byte 0x02024744 + .pool _080A5D60: - ldr r0, _080A5D8C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r5, 2 @@ -339929,13 +328826,13 @@ _080A5D60: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A5D98 - ldr r1, _080A5D90 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A5D94 + ldr r1, =0x020244ec _080A5D7E: adds r0, r1 movs r1, 0xB @@ -339944,9 +328841,7 @@ _080A5D7E: lsrs r1, r0, 16 b _080A5D9A .align 2, 0 -_080A5D8C: .4byte 0x020244d0 -_080A5D90: .4byte 0x0202406e -_080A5D94: .4byte 0x020244ec + .pool _080A5D98: ldrh r1, [r1, 0x2] _080A5D9A: @@ -339992,7 +328887,7 @@ _080A5DDA: lsls r0, 24 cmp r0, 0 beq _080A5E04 - ldr r0, _080A5DFC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x18] ldrb r1, [r2, 0x4] @@ -340003,12 +328898,12 @@ _080A5DDA: ldr r2, [r2, 0x10] b _080A5E42 .align 2, 0 -_080A5DFC: .4byte 0x02039f34 + .pool _080A5E00: ldr r2, [r2, 0x8] b _080A5E42 _080A5E04: - ldr r0, _080A5E30 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] lsls r1, r4, 2 @@ -340016,24 +328911,22 @@ _080A5E04: ldrh r0, [r0, 0x2] cmp r0, 0 bne _080A5E3C - ldr r1, _080A5E34 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A5E38 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0 bl pokemon_getattr adds r2, r0, 0 b _080A5E42 .align 2, 0 -_080A5E30: .4byte 0x020244d0 -_080A5E34: .4byte 0x0202406e -_080A5E38: .4byte 0x020244ec + .pool _080A5E3C: - ldr r0, _080A5E78 + ldr r0, =0x020244bc adds r0, r1, r0 ldr r2, [r0] _080A5E42: @@ -340063,7 +328956,7 @@ _080A5E42: adds r0, r5, 0 b _080A5E86 .align 2, 0 -_080A5E78: .4byte 0x020244bc + .pool _080A5E7C: movs r1, 0xCE lsls r1, 1 @@ -340071,44 +328964,42 @@ _080A5E7C: lsls r0, 16 lsrs r0, 16 _080A5E86: - ldr r1, _080A5E8C + ldr r1, =0x083021d8 lsls r0, 2 b _080A5F90 .align 2, 0 -_080A5E8C: .4byte 0x083021d8 + .pool _080A5E90: - ldr r0, _080A5EA4 + ldr r0, =0x00000181 cmp r5, r0 bne _080A5EB0 - ldr r0, _080A5EA8 - ldr r1, _080A5EAC + ldr r0, =0x08525f8c + ldr r1, =0x020244e4 adds r1, r4, r1 ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] b _080A5F94 .align 2, 0 -_080A5EA4: .4byte 0x00000181 -_080A5EA8: .4byte 0x08525f8c -_080A5EAC: .4byte 0x020244e4 + .pool _080A5EB0: movs r0, 0xCE lsls r0, 1 cmp r5, r0 bls _080A5EC0 - ldr r0, _080A5EBC + ldr r0, =0x083021d8 b _080A5F92 .align 2, 0 -_080A5EBC: .4byte 0x083021d8 + .pool _080A5EC0: - ldr r1, _080A5EC4 + ldr r1, =0x083021d8 b _080A5F8E .align 2, 0 -_080A5EC4: .4byte 0x083021d8 + .pool _080A5EC8: cmp r5, 0xC9 bne _080A5F58 - ldr r0, _080A5EF8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] lsls r1, r4, 2 @@ -340116,24 +329007,22 @@ _080A5EC8: ldrh r0, [r0, 0x2] cmp r0, 0 bne _080A5F04 - ldr r1, _080A5EFC + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A5F00 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0 bl pokemon_getattr adds r2, r0, 0 b _080A5F0A .align 2, 0 -_080A5EF8: .4byte 0x020244d0 -_080A5EFC: .4byte 0x0202406e -_080A5F00: .4byte 0x02024744 + .pool _080A5F04: - ldr r0, _080A5F40 + ldr r0, =0x020244bc adds r0, r1, r0 ldr r2, [r0] _080A5F0A: @@ -340163,7 +329052,7 @@ _080A5F0A: adds r0, r5, 0 b _080A5F4E .align 2, 0 -_080A5F40: .4byte 0x020244bc + .pool _080A5F44: movs r1, 0xCE lsls r1, 1 @@ -340171,17 +329060,17 @@ _080A5F44: lsls r0, 16 lsrs r0, 16 _080A5F4E: - ldr r1, _080A5F54 + ldr r1, =0x08300d38 lsls r0, 2 b _080A5F90 .align 2, 0 -_080A5F54: .4byte 0x08300d38 + .pool _080A5F58: - ldr r0, _080A5F70 + ldr r0, =0x00000181 cmp r5, r0 bne _080A5F7C - ldr r0, _080A5F74 - ldr r1, _080A5F78 + ldr r0, =0x08525f78 + ldr r1, =0x020244e4 adds r1, r4, r1 ldrb r1, [r1] lsls r1, 2 @@ -340189,20 +329078,18 @@ _080A5F58: ldrb r0, [r1, 0x1] b _080A5F94 .align 2, 0 -_080A5F70: .4byte 0x00000181 -_080A5F74: .4byte 0x08525f78 -_080A5F78: .4byte 0x020244e4 + .pool _080A5F7C: movs r0, 0xCE lsls r0, 1 cmp r5, r0 bls _080A5F8C - ldr r0, _080A5F88 + ldr r0, =0x08300d38 b _080A5F92 .align 2, 0 -_080A5F88: .4byte 0x08300d38 + .pool _080A5F8C: - ldr r1, _080A5F9C + ldr r1, =0x08300d38 _080A5F8E: lsls r0, r5, 2 _080A5F90: @@ -340214,7 +329101,7 @@ _080A5F94: pop {r1} bx r1 .align 2, 0 -_080A5F9C: .4byte 0x08300d38 + .pool thumb_func_end sub_80A5DB8 thumb_func_start sub_80A5FA0 @@ -340236,31 +329123,29 @@ sub_80A5FA0: @ 80A5FA0 lsls r0, 24 cmp r0, 0 bne _080A5FFE - ldr r0, _080A5FDC + ldr r0, =0x00000181 cmp r4, r0 bne _080A5FE8 - ldr r0, _080A5FE0 - ldr r1, _080A5FE4 + ldr r0, =0x08525f88 + ldr r1, =0x020244e4 adds r1, r6, r1 ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] b _080A5FFE .align 2, 0 -_080A5FDC: .4byte 0x00000181 -_080A5FE0: .4byte 0x08525f88 -_080A5FE4: .4byte 0x020244e4 + .pool _080A5FE8: movs r0, 0xCE lsls r0, 1 cmp r4, r0 bls _080A5FF8 - ldr r0, _080A5FF4 + ldr r0, =0x08305dcc b _080A5FFC .align 2, 0 -_080A5FF4: .4byte 0x08305dcc + .pool _080A5FF8: - ldr r0, _080A6008 + ldr r0, =0x08305dcc adds r0, r7, r0 _080A5FFC: ldrb r5, [r0] @@ -340270,7 +329155,7 @@ _080A5FFE: pop {r1} bx r1 .align 2, 0 -_080A6008: .4byte 0x08305dcc + .pool thumb_func_end sub_80A5FA0 thumb_func_start sub_80A600C @@ -340315,10 +329200,10 @@ _080A603E: _080A605C: adds r0, r6, 0 bl battle_get_per_side_status - ldr r3, _080A60A4 + ldr r3, =0x08525f58 lsls r0, 24 lsrs r0, 22 - ldr r1, _080A60A8 + ldr r1, =0x02022fec ldr r1, [r1] movs r2, 0x1 ands r1, r2 @@ -340350,8 +329235,7 @@ _080A609C: pop {r1} bx r1 .align 2, 0 -_080A60A4: .4byte 0x08525f58 -_080A60A8: .4byte 0x02022fec + .pool thumb_func_end sub_80A600C thumb_func_start sub_80A60AC @@ -340371,7 +329255,7 @@ sub_80A60AC: @ 80A60AC lsls r0, 24 cmp r0, 0 beq _080A60E8 - ldr r0, _080A60E0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x18] ldrb r1, [r2, 0x4] @@ -340382,12 +329266,12 @@ sub_80A60AC: @ 80A60AC ldrh r1, [r2, 0x2] b _080A610E .align 2, 0 -_080A60E0: .4byte 0x02039f34 + .pool _080A60E4: ldrh r1, [r2] b _080A610E _080A60E8: - ldr r0, _080A6104 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r4, 2 @@ -340395,14 +329279,13 @@ _080A60E8: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A610C - ldr r1, _080A6108 + ldr r1, =0x02038438 lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] b _080A610E .align 2, 0 -_080A6104: .4byte 0x020244d0 -_080A6108: .4byte 0x02038438 + .pool _080A610C: ldrh r1, [r1, 0x2] _080A610E: @@ -340497,7 +329380,7 @@ sub_80A6190: @ 80A6190 lsls r0, 24 cmp r0, 0 beq _080A61E4 - ldr r0, _080A61D8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r5, 2 @@ -340505,20 +329388,18 @@ sub_80A6190: @ 80A6190 ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A621C - ldr r1, _080A61DC + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A61E0 + ldr r1, =0x02024744 b _080A6202 .align 2, 0 -_080A61D8: .4byte 0x020244d0 -_080A61DC: .4byte 0x0202406e -_080A61E0: .4byte 0x02024744 + .pool _080A61E4: - ldr r0, _080A6210 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r5, 2 @@ -340526,13 +329407,13 @@ _080A61E4: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A621C - ldr r1, _080A6214 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A6218 + ldr r1, =0x020244ec _080A6202: adds r0, r1 movs r1, 0xB @@ -340541,9 +329422,7 @@ _080A6202: lsrs r4, r0, 16 b _080A621E .align 2, 0 -_080A6210: .4byte 0x020244d0 -_080A6214: .4byte 0x0202406e -_080A6218: .4byte 0x020244ec + .pool _080A621C: ldrh r4, [r1, 0x2] _080A621E: @@ -340573,37 +329452,35 @@ obj_id_for_side_relative_to_move: @ 80A6240 adds r1, r0, 0 cmp r0, 0 bne _080A6268 - ldr r4, _080A6260 + ldr r4, =0x02038436 ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _080A62B6 - ldr r1, _080A6264 + ldr r1, =0x020241e4 ldrb r0, [r4] b _080A62C6 .align 2, 0 -_080A6260: .4byte 0x02038436 -_080A6264: .4byte 0x020241e4 + .pool _080A6268: cmp r0, 0x1 bne _080A6288 - ldr r4, _080A6280 + ldr r4, =0x02038437 ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _080A62B6 - ldr r1, _080A6284 + ldr r1, =0x020241e4 ldrb r0, [r4] b _080A62C6 .align 2, 0 -_080A6280: .4byte 0x02038437 -_080A6284: .4byte 0x020241e4 + .pool _080A6288: cmp r1, 0x2 bne _080A62A4 - ldr r5, _080A62A0 + ldr r5, =0x02038436 ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -340613,9 +329490,9 @@ _080A6288: beq _080A62B6 b _080A62C0 .align 2, 0 -_080A62A0: .4byte 0x02038436 + .pool _080A62A4: - ldr r5, _080A62BC + ldr r5, =0x02038437 ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -340627,9 +329504,9 @@ _080A62B6: movs r0, 0xFF b _080A62CA .align 2, 0 -_080A62BC: .4byte 0x02038437 + .pool _080A62C0: - ldr r1, _080A62D0 + ldr r1, =0x020241e4 ldrb r0, [r5] eors r0, r4 _080A62C6: @@ -340640,7 +329517,7 @@ _080A62CA: pop {r1} bx r1 .align 2, 0 -_080A62D0: .4byte 0x020241e4 + .pool thumb_func_end obj_id_for_side_relative_to_move thumb_func_start oamt_set_x3A_32 @@ -340690,10 +329567,10 @@ sub_80A62EC: @ 80A62EC asrs r0, 16 cmp r0, 0xFF ble _080A632C - ldr r2, _080A6328 + ldr r2, =0xffffff00 b _080A6334 .align 2, 0 -_080A6328: .4byte 0xffffff00 + .pool _080A632C: cmp r0, 0 bge _080A6338 @@ -340758,10 +329635,10 @@ sub_80A634C: @ 80A634C asrs r0, 16 cmp r0, 0xFF ble _080A63A8 - ldr r2, _080A63A4 + ldr r2, =0xffffff00 b _080A63B0 .align 2, 0 -_080A63A4: .4byte 0xffffff00 + .pool _080A63A8: cmp r0, 0 bge _080A63B4 @@ -340816,10 +329693,10 @@ sub_80A63C8: @ 80A63C8 asrs r0, 16 cmp r0, 0xFF ble _080A6410 - ldr r2, _080A640C + ldr r2, =0xffffff00 b _080A6418 .align 2, 0 -_080A640C: .4byte 0xffffff00 + .pool _080A6410: cmp r0, 0 bge _080A641C @@ -340834,10 +329711,10 @@ _080A641C: ldrsh r0, [r4, r2] cmp r0, 0xFF ble _080A6430 - ldr r2, _080A642C + ldr r2, =0xffffff00 b _080A6438 .align 2, 0 -_080A642C: .4byte 0xffffff00 + .pool _080A6430: cmp r0, 0 bge _080A643C @@ -340888,10 +329765,10 @@ sub_80A6450: @ 80A6450 asrs r0, 16 cmp r0, 0xFF ble _080A6490 - ldr r2, _080A648C + ldr r2, =0xffffff00 b _080A6498 .align 2, 0 -_080A648C: .4byte 0xffffff00 + .pool _080A6490: cmp r0, 0 bge _080A649C @@ -340939,7 +329816,7 @@ sub_80A64D0: @ 80A64D0 push {r4,lr} adds r4, r0, 0 bl sub_80A64EC - ldr r1, _080A64E8 + ldr r1, =sub_80A653C + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -340947,7 +329824,7 @@ sub_80A64D0: @ 80A64D0 pop {r0} bx r0 .align 2, 0 -_080A64E8: .4byte sub_80A653C + 1 + .pool thumb_func_end sub_80A64D0 thumb_func_start sub_80A64EC @@ -341104,7 +329981,7 @@ sub_80A65EC: @ 80A65EC ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x34] - ldr r5, _080A6628 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -341117,14 +329994,13 @@ sub_80A65EC: @ 80A65EC lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] - ldr r0, _080A662C + ldr r0, =sub_80A64D0 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080A6628: .4byte 0x02038437 -_080A662C: .4byte sub_80A64D0 + 1 + .pool thumb_func_end sub_80A65EC thumb_func_start sub_80A6630 @@ -341138,7 +330014,7 @@ sub_80A6630: @ 80A6630 ble _080A6674 subs r0, r1, 0x1 strh r0, [r3, 0x2E] - ldr r2, _080A6670 + ldr r2, =0x02020630 movs r4, 0x34 ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -341161,7 +330037,7 @@ sub_80A6630: @ 80A6630 strh r1, [r0, 0x26] b _080A667A .align 2, 0 -_080A6670: .4byte 0x02020630 + .pool _080A6674: adds r0, r3, 0 bl sub_80A62DC @@ -341190,7 +330066,7 @@ sub_80A6680: @ 80A6680 ldrh r2, [r4, 0x36] adds r0, r2 strh r0, [r4, 0x36] - ldr r3, _080A66CC + ldr r3, =0x02020630 movs r0, 0x38 ldrsh r2, [r4, r0] lsls r0, r2, 4 @@ -341212,7 +330088,7 @@ sub_80A6680: @ 80A6680 strh r0, [r1, 0x26] b _080A66D6 .align 2, 0 -_080A66CC: .4byte 0x02020630 + .pool _080A66D0: adds r0, r4, 0 bl sub_80A62DC @@ -341305,7 +330181,7 @@ sub_80A6760: @ 80A6760 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x34] - ldr r5, _080A679C + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -341318,14 +330194,13 @@ sub_80A6760: @ 80A6760 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] - ldr r0, _080A67A0 + ldr r0, =sub_80A64D0 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080A679C: .4byte 0x02038436 -_080A67A0: .4byte sub_80A64D0 + 1 + .pool thumb_func_end sub_80A6760 thumb_func_start sub_80A67A4 @@ -341415,7 +330290,7 @@ sub_80A6814: @ 80A6814 sub_80A6838: @ 80A6838 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _080A6860 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -341432,7 +330307,7 @@ sub_80A6838: @ 80A6838 pop {r0} bx r0 .align 2, 0 -_080A6860: .4byte 0x02038436 + .pool thumb_func_end sub_80A6838 thumb_func_start sub_80A6864 @@ -341444,13 +330319,13 @@ sub_80A6864: @ 80A6864 lsls r1, 16 lsrs r5, r1, 16 mov r8, r5 - ldr r7, _080A689C + ldr r7, =0x02038436 ldrb r0, [r7] movs r1, 0 bl sub_80A5C6C lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080A68A0 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0 bl sub_80A5C6C @@ -341463,8 +330338,7 @@ sub_80A6864: @ 80A6864 lsls r0, r5, 16 b _080A68C0 .align 2, 0 -_080A689C: .4byte 0x02038436 -_080A68A0: .4byte 0x02038437 + .pool _080A68A4: ldrb r0, [r7] bl battle_side_get_owner @@ -341600,7 +330474,7 @@ sub_80A6980: @ 80A6980 lsls r1, 24 cmp r1, 0 bne _080A69A8 - ldr r4, _080A69C4 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 bl sub_80A60AC @@ -341614,7 +330488,7 @@ sub_80A6980: @ 80A6980 lsrs r0, 24 strh r0, [r5, 0x22] _080A69A8: - ldr r4, _080A69C8 + ldr r4, =0x0203841e movs r0, 0 ldrsh r1, [r4, r0] adds r0, r5, 0 @@ -341627,8 +330501,7 @@ _080A69A8: pop {r0} bx r0 .align 2, 0 -_080A69C4: .4byte 0x02038437 -_080A69C8: .4byte 0x0203841e + .pool thumb_func_end sub_80A6980 thumb_func_start sub_80A69CC @@ -341638,7 +330511,7 @@ sub_80A69CC: @ 80A69CC lsls r1, 24 cmp r1, 0 bne _080A69F0 - ldr r4, _080A69EC + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 bl sub_80A60AC @@ -341649,9 +330522,9 @@ sub_80A69CC: @ 80A69CC movs r1, 0x1 b _080A6A04 .align 2, 0 -_080A69EC: .4byte 0x02038436 + .pool _080A69F0: - ldr r4, _080A6A28 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A60AC @@ -341665,7 +330538,7 @@ _080A6A04: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r4, _080A6A2C + ldr r4, =0x0203841e movs r0, 0 ldrsh r1, [r4, r0] adds r0, r5, 0 @@ -341678,34 +330551,33 @@ _080A6A04: pop {r0} bx r0 .align 2, 0 -_080A6A28: .4byte 0x02038436 -_080A6A2C: .4byte 0x0203841e + .pool thumb_func_end sub_80A69CC thumb_func_start battle_side_get_owner battle_side_get_owner: @ 80A6A30 lsls r0, 24 lsrs r0, 24 - ldr r1, _080A6A40 + ldr r1, =0x02024076 adds r0, r1 ldrb r1, [r0] movs r0, 0x1 ands r0, r1 bx lr .align 2, 0 -_080A6A40: .4byte 0x02024076 + .pool thumb_func_end battle_side_get_owner thumb_func_start battle_get_per_side_status battle_get_per_side_status: @ 80A6A44 lsls r0, 24 lsrs r0, 24 - ldr r1, _080A6A50 + ldr r1, =0x02024076 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080A6A50: .4byte 0x02024076 + .pool thumb_func_end battle_get_per_side_status thumb_func_start battle_get_side_with_given_state @@ -341714,11 +330586,11 @@ battle_get_side_with_given_state: @ 80A6A54 lsls r0, 24 lsrs r3, r0, 24 movs r1, 0 - ldr r0, _080A6A88 + ldr r0, =0x0202406c ldrb r2, [r0] cmp r1, r2 bcs _080A6A7E - ldr r4, _080A6A8C + ldr r4, =0x02024076 ldrb r0, [r4] cmp r0, r3 beq _080A6A7E @@ -341738,8 +330610,7 @@ _080A6A7E: pop {r1} bx r1 .align 2, 0 -_080A6A88: .4byte 0x0202406c -_080A6A8C: .4byte 0x02024076 + .pool thumb_func_end battle_get_side_with_given_state thumb_func_start sub_80A6A90 @@ -341752,20 +330623,19 @@ sub_80A6A90: @ 80A6A90 lsls r0, 24 cmp r0, 0 beq _080A6ABC - ldr r0, _080A6AB4 + ldr r0, =0x02038436 ldrb r0, [r0] cmp r0, r4 beq _080A6B0A - ldr r0, _080A6AB8 + ldr r0, =0x02038437 ldrb r0, [r0] cmp r0, r4 beq _080A6B0A b _080A6B18 .align 2, 0 -_080A6AB4: .4byte 0x02038436 -_080A6AB8: .4byte 0x02038437 + .pool _080A6ABC: - ldr r0, _080A6AE4 + ldr r0, =0x02024076 adds r0, r4, r0 ldrb r0, [r0] cmp r0, 0xFF @@ -341775,26 +330645,24 @@ _080A6ABC: lsls r0, 24 cmp r0, 0 beq _080A6AF0 - ldr r1, _080A6AE8 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A6AEC + ldr r1, =0x02024744 b _080A6AFE .align 2, 0 -_080A6AE4: .4byte 0x02024076 -_080A6AE8: .4byte 0x0202406e -_080A6AEC: .4byte 0x02024744 + .pool _080A6AF0: - ldr r1, _080A6B10 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A6B14 + ldr r1, =0x020244ec _080A6AFE: adds r0, r1 movs r1, 0x39 @@ -341805,8 +330673,7 @@ _080A6B0A: movs r0, 0x1 b _080A6B1A .align 2, 0 -_080A6B10: .4byte 0x0202406e -_080A6B14: .4byte 0x020244ec + .pool _080A6B18: movs r0, 0 _080A6B1A: @@ -341817,13 +330684,13 @@ _080A6B1A: thumb_func_start battle_type_is_double battle_type_is_double: @ 80A6B20 - ldr r0, _080A6B2C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 bx lr .align 2, 0 -_080A6B2C: .4byte 0x02022fec + .pool thumb_func_end battle_type_is_double thumb_func_start sub_80A6B30 @@ -341835,10 +330702,10 @@ sub_80A6B30: @ 80A6B30 lsrs r1, r0, 24 cmp r1, 0 beq _080A6B64 - ldr r0, _080A6B5C + ldr r0, =0x0202305c ldr r0, [r0] str r0, [r4] - ldr r0, _080A6B60 + ldr r0, =0x02023060 ldr r0, [r0] str r0, [r4, 0x4] movs r1, 0 @@ -341849,13 +330716,12 @@ sub_80A6B30: @ 80A6B30 strh r1, [r4, 0xA] b _080A6B7E .align 2, 0 -_080A6B5C: .4byte 0x0202305c -_080A6B60: .4byte 0x02023060 + .pool _080A6B64: - ldr r0, _080A6B88 + ldr r0, =0x0202305c ldr r0, [r0] str r0, [r4] - ldr r0, _080A6B8C + ldr r0, =0x02023060 ldr r0, [r0] str r0, [r4, 0x4] movs r0, 0x8 @@ -341871,8 +330737,7 @@ _080A6B7E: pop {r0} bx r0 .align 2, 0 -_080A6B88: .4byte 0x0202305c -_080A6B8C: .4byte 0x02023060 + .pool thumb_func_end sub_80A6B30 thumb_func_start sub_80A6B90 @@ -341885,10 +330750,10 @@ sub_80A6B90: @ 80A6B90 lsrs r1, r0, 24 cmp r1, 0 beq _080A6BC4 - ldr r0, _080A6BBC + ldr r0, =0x0202305c ldr r0, [r0] str r0, [r4] - ldr r0, _080A6BC0 + ldr r0, =0x02023060 ldr r0, [r0] str r0, [r4, 0x4] movs r1, 0 @@ -341899,8 +330764,7 @@ sub_80A6B90: @ 80A6B90 strh r1, [r4, 0xA] b _080A6BEA .align 2, 0 -_080A6BBC: .4byte 0x0202305c -_080A6BC0: .4byte 0x02023060 + .pool _080A6BC4: cmp r5, 0x1 bne _080A6BD0 @@ -341908,10 +330772,10 @@ _080A6BC4: bl sub_80A6B30 b _080A6BEC _080A6BD0: - ldr r0, _080A6BF4 + ldr r0, =0x0202305c ldr r0, [r0] str r0, [r4] - ldr r0, _080A6BF8 + ldr r0, =0x02023060 ldr r0, [r0] str r0, [r4, 0x4] movs r0, 0x9 @@ -341928,18 +330792,17 @@ _080A6BEC: pop {r0} bx r0 .align 2, 0 -_080A6BF4: .4byte 0x0202305c -_080A6BF8: .4byte 0x02023060 + .pool thumb_func_end sub_80A6B90 thumb_func_start sub_80A6BFC sub_80A6BFC: @ 80A6BFC push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _080A6C28 + ldr r0, =0x0202305c ldr r0, [r0] str r0, [r4] - ldr r0, _080A6C2C + ldr r0, =0x02023060 ldr r0, [r0] str r0, [r4, 0x4] bl sub_80A4DF0 @@ -341956,10 +330819,9 @@ sub_80A6BFC: @ 80A6BFC strh r0, [r4, 0xC] b _080A6C60 .align 2, 0 -_080A6C28: .4byte 0x0202305c -_080A6C2C: .4byte 0x02023060 + .pool _080A6C30: - ldr r0, _080A6C4C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -341973,7 +330835,7 @@ _080A6C30: lsls r0, 2 b _080A6C5C .align 2, 0 -_080A6C4C: .4byte 0x02038436 + .pool _080A6C50: movs r0, 0x9 strb r0, [r4, 0x8] @@ -342001,7 +330863,7 @@ sub_80A6C68: @ 80A6C68 str r0, [sp, 0x1C] add r0, sp, 0x1C ldr r1, [sp, 0xC] - ldr r2, _080A6CBC + ldr r2, =0x05000800 bl CpuSet add r0, sp, 0xC ldrb r0, [r0, 0x9] @@ -342030,7 +330892,7 @@ sub_80A6C68: @ 80A6C68 pop {r0} bx r0 .align 2, 0 -_080A6CBC: .4byte 0x05000800 + .pool thumb_func_end sub_80A6C68 thumb_func_start sub_80A6CC0 @@ -342044,9 +330906,9 @@ sub_80A6CC0: @ 80A6CC0 adds r6, r2, 0 movs r0, 0 str r0, [sp] - ldr r4, _080A6D08 + ldr r4, =0x0202305c ldr r1, [r4] - ldr r2, _080A6D0C + ldr r2, =0x05000800 mov r0, sp bl CpuSet ldr r1, [r4] @@ -342069,8 +330931,7 @@ sub_80A6CC0: @ 80A6CC0 pop {r0} bx r0 .align 2, 0 -_080A6D08: .4byte 0x0202305c -_080A6D0C: .4byte 0x05000800 + .pool thumb_func_end sub_80A6CC0 thumb_func_start sub_80A6D10 @@ -342203,7 +331064,7 @@ sub_80A6DEC: @ 80A6DEC strh r0, [r4, 0x34] adds r0, r4, 0 bl sub_80A6E14 - ldr r1, _080A6E10 + ldr r1, =sub_80A65A8 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -342211,7 +331072,7 @@ sub_80A6DEC: @ 80A6DEC pop {r0} bx r0 .align 2, 0 -_080A6E10: .4byte sub_80A65A8 + 1 + .pool thumb_func_end sub_80A6DEC thumb_func_start sub_80A6E14 @@ -342300,7 +331161,7 @@ _080A6E8C: orrs r6, r0 b _080A6EBC _080A6EB8: - ldr r0, _080A6EC8 + ldr r0, =0x0000fffe ands r6, r0 _080A6EBC: mov r3, r9 @@ -342310,9 +331171,9 @@ _080A6EBC: orrs r5, r0 b _080A6ED0 .align 2, 0 -_080A6EC8: .4byte 0x0000fffe + .pool _080A6ECC: - ldr r0, _080A6EE8 + ldr r0, =0x0000fffe ands r5, r0 _080A6ED0: movs r0, 0 @@ -342327,7 +331188,7 @@ _080A6ED0: pop {r0} bx r0 .align 2, 0 -_080A6EE8: .4byte 0x0000fffe + .pool thumb_func_end obj_translate_based_on_private_1_2_3_4 thumb_func_start sub_80A6EEC @@ -342340,7 +331201,7 @@ sub_80A6EEC: @ 80A6EEC strh r0, [r4, 0x34] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, _080A6F10 + ldr r1, =sub_80A6F98 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -342348,7 +331209,7 @@ sub_80A6EEC: @ 80A6EEC pop {r0} bx r0 .align 2, 0 -_080A6F10: .4byte sub_80A6F98 + 1 + .pool thumb_func_end sub_80A6EEC thumb_func_start sub_80A6F14 @@ -342361,7 +331222,7 @@ sub_80A6F14: @ 80A6F14 strh r0, [r4, 0x34] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, _080A6F38 + ldr r1, =sub_80A6FB4 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -342369,7 +331230,7 @@ sub_80A6F14: @ 80A6F14 pop {r0} bx r0 .align 2, 0 -_080A6F38: .4byte sub_80A6FB4 + 1 + .pool thumb_func_end sub_80A6F14 thumb_func_start sub_80A6F3C @@ -342496,7 +331357,7 @@ sub_80A7000: @ 80A7000 strh r0, [r4, 0x34] adds r0, r4, 0 bl sub_80A6FD4 - ldr r1, _080A7024 + ldr r1, =sub_80A6F98 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -342504,7 +331365,7 @@ sub_80A7000: @ 80A7000 pop {r0} bx r0 .align 2, 0 -_080A7024: .4byte sub_80A6F98 + 1 + .pool thumb_func_end sub_80A7000 thumb_func_start sub_80A7028 @@ -342560,7 +331421,7 @@ _080A7060: orrs r6, r0 b _080A7090 _080A708C: - ldr r0, _080A709C + ldr r0, =0x0000fffe ands r6, r0 _080A7090: mov r3, r9 @@ -342570,9 +331431,9 @@ _080A7090: orrs r5, r0 b _080A70A4 .align 2, 0 -_080A709C: .4byte 0x0000fffe + .pool _080A70A0: - ldr r0, _080A70BC + ldr r0, =0x0000fffe ands r5, r0 _080A70A4: movs r0, 0 @@ -342587,7 +331448,7 @@ _080A70A4: pop {r0} bx r0 .align 2, 0 -_080A70BC: .4byte 0x0000fffe + .pool thumb_func_end sub_80A7028 thumb_func_start sub_80A70C0 @@ -342600,7 +331461,7 @@ sub_80A70C0: @ 80A70C0 strh r0, [r4, 0x34] adds r0, r4, 0 bl sub_80A7028 - ldr r1, _080A70E4 + ldr r1, =sub_80A7144 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -342608,7 +331469,7 @@ sub_80A70C0: @ 80A70C0 pop {r0} bx r0 .align 2, 0 -_080A70E4: .4byte sub_80A7144 + 1 + .pool thumb_func_end sub_80A70C0 thumb_func_start sub_80A70E8 @@ -342717,7 +331578,7 @@ sub_80A718C: @ 80A718C strh r0, [r4, 0x34] adds r0, r4, 0 bl sub_80A7160 - ldr r1, _080A71B0 + ldr r1, =sub_80A7144 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -342725,7 +331586,7 @@ sub_80A718C: @ 80A718C pop {r0} bx r0 .align 2, 0 -_080A71B0: .4byte sub_80A7144 + 1 + .pool thumb_func_end sub_80A718C thumb_func_start obj_id_set_rotscale @@ -342737,7 +331598,7 @@ obj_id_set_rotscale: @ 80A71B4 lsls r1, 16 lsls r3, 16 lsrs r3, 16 - ldr r5, _080A722C + ldr r5, =0xffff0000 lsls r2, 16 lsrs r1, 16 orrs r1, r2 @@ -342760,7 +331621,7 @@ obj_id_set_rotscale: @ 80A71B4 orrs r1, r0 str r1, [sp] _080A71F0: - ldr r1, _080A7230 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -342774,7 +331635,7 @@ _080A71F0: movs r2, 0x1 movs r3, 0x2 bl _082E709C - ldr r0, _080A7234 + ldr r0, =0x02021bc0 lsls r4, 3 adds r4, r0 ldrh r0, [r5] @@ -342790,9 +331651,7 @@ _080A71F0: pop {r0} bx r0 .align 2, 0 -_080A722C: .4byte 0xffff0000 -_080A7230: .4byte 0x02020630 -_080A7234: .4byte 0x02021bc0 + .pool thumb_func_end obj_id_set_rotscale thumb_func_start sub_80A7238 @@ -342802,7 +331661,7 @@ sub_80A7238: @ 80A7238 lsls r0, 24 cmp r0, 0 beq _080A7268 - ldr r4, _080A7264 + ldr r4, =0x02020630 movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -342818,7 +331677,7 @@ sub_80A7238: @ 80A7238 movs r0, 0x1 b _080A726A .align 2, 0 -_080A7264: .4byte 0x02020630 + .pool _080A7268: movs r0, 0 _080A726A: @@ -342837,7 +331696,7 @@ sub_80A7270: @ 80A7270 lsls r1, 24 lsrs r1, 24 mov r8, r1 - ldr r1, _080A733C + ldr r1, =0x02020630 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -342863,7 +331722,7 @@ _080A72A6: ands r0, r1 strb r0, [r2] _080A72B4: - ldr r1, _080A733C + ldr r1, =0x02020630 lsls r4, r6, 4 adds r0, r4, r6 lsls r0, 2 @@ -342892,7 +331751,7 @@ _080A72B4: lsls r0, 30 cmp r0, 0 bne _080A7312 - ldr r0, _080A7340 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r7, 1 @@ -342910,7 +331769,7 @@ _080A72B4: orrs r0, r1 strb r0, [r5, 0x3] _080A7312: - ldr r1, _080A733C + ldr r1, =0x02020630 adds r0, r4, r6 lsls r0, 2 adds r0, r1 @@ -342930,8 +331789,7 @@ _080A7312: pop {r0} bx r0 .align 2, 0 -_080A733C: .4byte 0x02020630 -_080A7340: .4byte 0x020244d0 + .pool thumb_func_end sub_80A7270 thumb_func_start sub_80A7344 @@ -342946,7 +331804,7 @@ sub_80A7344: @ 80A7344 adds r1, r2, 0 movs r3, 0 bl obj_id_set_rotscale - ldr r1, _080A739C + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -342978,7 +331836,7 @@ sub_80A7344: @ 80A7344 pop {r0} bx r0 .align 2, 0 -_080A739C: .4byte 0x02020630 + .pool thumb_func_end sub_80A7344 thumb_func_start sub_80A73A0 @@ -342986,7 +331844,7 @@ sub_80A73A0: @ 80A73A0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080A73D8 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -342994,7 +331852,7 @@ sub_80A73A0: @ 80A73A0 ldrb r0, [r2, 0x3] lsls r0, 26 lsrs r0, 27 - ldr r1, _080A73DC + ldr r1, =0x02021bc0 lsls r0, 3 adds r0, r1 ldrh r1, [r0, 0x4] @@ -343012,8 +331870,7 @@ _080A73CC: pop {r0} bx r0 .align 2, 0 -_080A73D8: .4byte 0x02020630 -_080A73DC: .4byte 0x02021bc0 + .pool thumb_func_end sub_80A73A0 thumb_func_start sub_80A73E0 @@ -343057,7 +331914,7 @@ sub_80A73E0: @ 80A73E0 adds r0, r4, 0 bl oam_center _080A742E: - ldr r6, _080A7494 + ldr r6, =0xffff0000 lsls r0, r7, 16 orrs r5, r0 str r5, [sp] @@ -343089,7 +331946,7 @@ _080A745C: movs r2, 0x1 movs r3, 0x2 bl _082E709C - ldr r0, _080A7498 + ldr r0, =0x02021bc0 lsls r4, 3 adds r4, r0 ldrh r0, [r5] @@ -343108,8 +331965,7 @@ _080A7486: pop {r0} bx r0 .align 2, 0 -_080A7494: .4byte 0xffff0000 -_080A7498: .4byte 0x02021bc0 + .pool thumb_func_end sub_80A73E0 thumb_func_start sub_80A749C @@ -343182,8 +332038,8 @@ sub_80A750C: @ 80A750C lsrs r0, 16 cmp r1, 0 bne _080A7588 - ldr r2, _080A757C - ldr r1, _080A7580 + ldr r2, =0x02037714 + ldr r1, =0x02037b14 lsls r0, 1 adds r4, r0, r1 adds r5, r0, r2 @@ -343213,7 +332069,7 @@ _080A7524: strb r1, [r4] lsls r3, r0, 5 ldrh r1, [r4] - ldr r7, _080A7584 + ldr r7, =0xfffffc1f adds r2, r7, 0 ands r1, r2 orrs r1, r3 @@ -343233,25 +332089,21 @@ _080A7524: bge _080A7524 b _080A7598 .align 2, 0 -_080A757C: .4byte 0x02037714 -_080A7580: .4byte 0x02037b14 -_080A7584: .4byte 0xfffffc1f + .pool _080A7588: lsls r1, r0, 1 - ldr r0, _080A75A0 + ldr r0, =0x02037714 adds r0, r1, r0 - ldr r2, _080A75A4 + ldr r2, =0x02037b14 adds r1, r2 - ldr r2, _080A75A8 + ldr r2, =0x04000008 bl CpuSet _080A7598: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080A75A0: .4byte 0x02037714 -_080A75A4: .4byte 0x02037b14 -_080A75A8: .4byte 0x04000008 + .pool thumb_func_end sub_80A750C thumb_func_start sub_80A75AC @@ -343301,7 +332153,7 @@ _080A75F6: _080A7602: cmp r7, 0 beq _080A7614 - ldr r0, _080A768C + ldr r0, =0x02038436 ldrb r0, [r0] adds r1, r0, 0 adds r1, 0x10 @@ -343312,7 +332164,7 @@ _080A7614: mov r0, r8 cmp r0, 0 beq _080A7628 - ldr r0, _080A7690 + ldr r0, =0x02038437 ldrb r0, [r0] adds r1, r0, 0 adds r1, 0x10 @@ -343323,7 +332175,7 @@ _080A7628: mov r0, r9 cmp r0, 0 beq _080A764E - ldr r6, _080A768C + ldr r6, =0x02038436 ldrb r0, [r6] movs r5, 0x2 eors r0, r5 @@ -343342,7 +332194,7 @@ _080A764E: mov r0, r10 cmp r0, 0 beq _080A7674 - ldr r6, _080A7690 + ldr r6, =0x02038437 ldrb r0, [r6] movs r5, 0x2 eors r0, r5 @@ -343369,8 +332221,7 @@ _080A7674: lsls r0, 1 b _080A7698 .align 2, 0 -_080A768C: .4byte 0x02038436 -_080A7690: .4byte 0x02038437 + .pool _080A7694: movs r0, 0x80 lsls r0, 7 @@ -343538,7 +332389,7 @@ sub_80A77C8: @ 80A77C8 ldrsh r0, [r4, r1] cmp r0, 0 bne _080A7806 - ldr r2, _080A77F4 + ldr r2, =0x0203841e movs r3, 0x6 ldrsh r0, [r2, r3] movs r1, 0 @@ -343554,7 +332405,7 @@ _080A77E2: bl sub_80A69CC b _080A77FE .align 2, 0 -_080A77F4: .4byte 0x0203841e + .pool _080A77F8: adds r0, r4, 0 bl sub_80A6980 @@ -343583,7 +332434,7 @@ _080A781A: sub_80A7820: @ 80A7820 push {r4-r7,lr} adds r5, r0, 0 - ldr r6, _080A7898 + ldr r6, =0x0203841e movs r1, 0xA ldrsh r0, [r6, r1] movs r1, 0xFF @@ -343602,7 +332453,7 @@ _080A7838: _080A7842: adds r0, r5, 0 bl sub_80A69CC - ldr r0, _080A789C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -343614,7 +332465,7 @@ _080A7842: _080A785C: ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] - ldr r4, _080A78A0 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -343631,20 +332482,16 @@ _080A785C: ldrh r6, [r6, 0x6] adds r0, r6 strh r0, [r5, 0x36] - ldr r0, _080A78A4 + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _080A78A8 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080A7898: .4byte 0x0203841e -_080A789C: .4byte 0x02038436 -_080A78A0: .4byte 0x02038437 -_080A78A4: .4byte sub_80A6EEC + 1 -_080A78A8: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_80A7820 thumb_func_start sub_80A78AC @@ -343653,21 +332500,21 @@ sub_80A78AC: @ 80A78AC adds r6, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _080A790C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _080A78CC - ldr r1, _080A7910 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] _080A78CC: - ldr r4, _080A7910 + ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, _080A7914 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -343688,16 +332535,13 @@ _080A78CC: strh r0, [r6, 0x38] adds r0, r6, 0 bl sub_80A68D4 - ldr r0, _080A7918 + ldr r0, =sub_80A791C + 1 str r0, [r6, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080A790C: .4byte 0x02038436 -_080A7910: .4byte 0x0203841e -_080A7914: .4byte 0x02038437 -_080A7918: .4byte sub_80A791C + 1 + .pool thumb_func_end sub_80A78AC thumb_func_start sub_80A791C @@ -343720,7 +332564,7 @@ _080A7930: sub_80A7938: @ 80A7938 push {r4-r7,lr} adds r5, r0, 0 - ldr r0, _080A794C + ldr r0, =0x0203841e movs r2, 0xC ldrsh r1, [r0, r2] cmp r1, 0 @@ -343729,7 +332573,7 @@ sub_80A7938: @ 80A7938 movs r7, 0x3 b _080A7954 .align 2, 0 -_080A794C: .4byte 0x0203841e + .pool _080A7950: movs r4, 0 movs r7, 0x1 @@ -343741,24 +332585,24 @@ _080A7954: adds r0, r5, 0 adds r1, r4, 0 bl sub_80A69CC - ldr r0, _080A7968 + ldr r0, =0x02038436 b _080A7976 .align 2, 0 -_080A7968: .4byte 0x02038436 + .pool _080A796C: adds r0, r5, 0 adds r1, r4, 0 bl sub_80A6980 - ldr r0, _080A79D4 + ldr r0, =0x02038437 _080A7976: ldrb r6, [r0] - ldr r0, _080A79D8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _080A798E - ldr r1, _080A79DC + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] @@ -343766,7 +332610,7 @@ _080A798E: adds r0, r5, 0 adds r1, r4, 0 bl sub_80A6980 - ldr r4, _080A79DC + ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r5, 0x2E] adds r0, r6, 0 @@ -343785,20 +332629,16 @@ _080A798E: ldrh r4, [r4, 0x6] adds r0, r4 strh r0, [r5, 0x36] - ldr r0, _080A79E0 + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _080A79E4 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080A79D4: .4byte 0x02038437 -_080A79D8: .4byte 0x02038436 -_080A79DC: .4byte 0x0203841e -_080A79E0: .4byte sub_80A6EEC + 1 -_080A79E4: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_80A7938 thumb_func_start duplicate_obj_of_side_rel2move_in_transparent_mode @@ -343812,7 +332652,7 @@ duplicate_obj_of_side_rel2move_in_transparent_mode: @ 80A79E8 cmp r1, 0xFF beq _080A7A52 movs r6, 0 - ldr r2, _080A7A44 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r1, r0, 2 @@ -343848,7 +332688,7 @@ _080A7A04: asrs r0, 16 b _080A7A56 .align 2, 0 -_080A7A44: .4byte 0x02020630 + .pool _080A7A48: adds r0, r6, 0x1 lsls r0, 16 @@ -343885,7 +332725,7 @@ sub_80A7A74: @ 80A7A74 lsrs r5, r0, 24 movs r6, 0 movs r3, 0 - ldr r2, _080A7AEC + ldr r2, =0x0203841e movs r0, 0x4 ldrsh r1, [r2, r0] movs r4, 0 @@ -343896,7 +332736,7 @@ sub_80A7A74: @ 80A7A74 _080A7A8E: cmp r1, r0 bge _080A7A94 - ldr r3, _080A7AF0 + ldr r3, =0x0000ffff _080A7A94: movs r0, 0x6 ldrsh r1, [r2, r0] @@ -343908,9 +332748,9 @@ _080A7A94: _080A7AA2: cmp r1, r0 bge _080A7AA8 - ldr r6, _080A7AF0 + ldr r6, =0x0000ffff _080A7AA8: - ldr r0, _080A7AF4 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -343938,16 +332778,13 @@ _080A7AA8: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set - ldr r0, _080A7AF8 + ldr r0, =sub_80A7AFC + 1 str r0, [r4] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080A7AEC: .4byte 0x0203841e -_080A7AF0: .4byte 0x0000ffff -_080A7AF4: .4byte 0x03005e00 -_080A7AF8: .4byte sub_80A7AFC + 1 + .pool thumb_func_end sub_80A7A74 thumb_func_start sub_80A7AFC @@ -343958,7 +332795,7 @@ sub_80A7AFC: @ 80A7AFC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A7B48 + ldr r1, =0x03005e00 adds r4, r0, r1 ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -343990,7 +332827,7 @@ sub_80A7AFC: @ 80A7AFC strh r0, [r4, 0xE] b _080A7B60 .align 2, 0 -_080A7B48: .4byte 0x03005e00 + .pool _080A7B4C: ldrh r2, [r4, 0x10] movs r0, 0x10 @@ -344036,7 +332873,7 @@ sub_80A7B98: @ 80A7B98 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A7BB8 + ldr r0, =0x0203841e ldrb r0, [r0] bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -344047,14 +332884,14 @@ sub_80A7B98: @ 80A7B98 bl move_anim_task_del b _080A7BE2 .align 2, 0 -_080A7BB8: .4byte 0x0203841e + .pool _080A7BBC: - ldr r1, _080A7BE8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r2, _080A7BEC + ldr r2, =0x02020630 lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -344062,7 +332899,7 @@ _080A7BBC: ldrb r1, [r1, 0x5] lsrs r1, 4 lsls r1, 4 - ldr r3, _080A7BF0 + ldr r3, =0x00000101 adds r2, r3, 0 adds r1, r2 strh r1, [r0, 0x8] @@ -344072,14 +332909,12 @@ _080A7BE2: pop {r0} bx r0 .align 2, 0 -_080A7BE8: .4byte 0x03005e00 -_080A7BEC: .4byte 0x02020630 -_080A7BF0: .4byte 0x00000101 + .pool thumb_func_end sub_80A7B98 thumb_func_start sub_80A7BF4 sub_80A7BF4: @ 80A7BF4 - ldr r3, _080A7C14 + ldr r3, =0x0203841e ldrh r1, [r3, 0x2] movs r2, 0 strh r1, [r0, 0xA] @@ -344092,12 +332927,11 @@ sub_80A7BF4: @ 80A7BF4 strh r2, [r0, 0x14] ldrh r1, [r3, 0x8] strh r1, [r0, 0x16] - ldr r1, _080A7C18 + ldr r1, =sub_80A7C1C + 1 str r1, [r0] bx lr .align 2, 0 -_080A7C14: .4byte 0x0203841e -_080A7C18: .4byte sub_80A7C1C + 1 + .pool thumb_func_end sub_80A7BF4 thumb_func_start sub_80A7C1C @@ -344109,7 +332943,7 @@ sub_80A7C1C: @ 80A7C1C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A7C74 + ldr r1, =0x03005e00 adds r4, r0, r1 ldrh r0, [r4, 0x10] adds r0, 0x1 @@ -344145,7 +332979,7 @@ sub_80A7C1C: @ 80A7C1C strh r0, [r4, 0x14] b _080A7CAC .align 2, 0 -_080A7C74: .4byte 0x03005e00 + .pool _080A7C78: ldrh r2, [r4, 0xC] subs r2, 0x1 @@ -344183,7 +333017,7 @@ sub_80A7CB4: @ 80A7CB4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A7CD4 + ldr r0, =0x0203841e ldrh r0, [r0] bl gpu_pal_tags_index_of lsls r0, 24 @@ -344194,15 +333028,15 @@ sub_80A7CB4: @ 80A7CB4 bl move_anim_task_del b _080A7CEE .align 2, 0 -_080A7CD4: .4byte 0x0203841e + .pool _080A7CD8: - ldr r1, _080A7CF4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 lsls r1, r2, 4 - ldr r2, _080A7CF8 + ldr r2, =0x00000101 adds r1, r2 strh r1, [r0, 0x8] bl sub_80A7BF4 @@ -344211,8 +333045,7 @@ _080A7CEE: pop {r0} bx r0 .align 2, 0 -_080A7CF4: .4byte 0x03005e00 -_080A7CF8: .4byte 0x00000101 + .pool thumb_func_end sub_80A7CB4 thumb_func_start sub_80A7CFC @@ -344249,7 +333082,7 @@ sub_80A7CFC: @ 80A7CFC sub_80A7D34: @ 80A7D34 push {r4-r6,lr} adds r4, r0, 0 - ldr r5, _080A7DD4 + ldr r5, =0x02038444 movs r1, 0x22 ldrsh r0, [r4, r1] movs r2, 0x24 @@ -344262,7 +333095,7 @@ sub_80A7D34: @ 80A7D34 str r1, [r5] movs r6, 0 ldrsh r2, [r1, r6] - ldr r0, _080A7DD8 + ldr r0, =0x00007ffe cmp r2, r0 beq _080A7DDC cmp r2, r0 @@ -344325,8 +333158,7 @@ _080A7D82: strh r0, [r4, 0x18] b _080A7E34 .align 2, 0 -_080A7DD4: .4byte 0x02038444 -_080A7DD8: .4byte 0x00007ffe + .pool _080A7DDC: ldrh r0, [r1, 0x2] strh r0, [r4, 0x16] @@ -344355,8 +333187,8 @@ _080A7E04: ldrsh r0, [r4, r6] cmp r0, 0 beq _080A7E62 - ldr r3, _080A7E2C - ldr r5, _080A7E30 + ldr r3, =0x02038444 + ldr r5, =0x00007ffd _080A7E10: ldrh r2, [r4, 0x16] subs r1, r2, 0x1 @@ -344373,15 +333205,14 @@ _080A7E10: bne _080A7E10 b _080A7E62 .align 2, 0 -_080A7E2C: .4byte 0x02038444 -_080A7E30: .4byte 0x00007ffd + .pool _080A7E34: ldrh r0, [r4, 0x16] adds r0, 0x1 strh r0, [r4, 0x16] b _080A7E62 _080A7E3C: - ldr r2, _080A7E5C + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -344397,7 +333228,7 @@ _080A7E3C: movs r0, 0 b _080A7E64 .align 2, 0 -_080A7E5C: .4byte 0x02020630 + .pool _080A7E60: strh r2, [r4, 0x16] _080A7E62: @@ -344420,7 +333251,7 @@ sub_80A7E6C: @ 80A7E6C lsrs r0, 15 movs r1, 0x40 subs r5, r1, r0 - ldr r1, _080A7EB8 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -344429,7 +333260,7 @@ sub_80A7E6C: @ 80A7E6C lsls r1, 26 lsrs r1, 27 lsls r0, r5, 8 - ldr r2, _080A7EBC + ldr r2, =0x02021bc0 lsls r1, 3 adds r1, r2 movs r2, 0x6 @@ -344448,8 +333279,7 @@ _080A7EA8: pop {r0} bx r0 .align 2, 0 -_080A7EB8: .4byte 0x02020630 -_080A7EBC: .4byte 0x02021bc0 + .pool thumb_func_end sub_80A7E6C thumb_func_start sub_80A7EC0 @@ -344466,7 +333296,7 @@ sub_80A7EC0: @ 80A7EC0 lsrs r0, 15 movs r1, 0x40 subs r5, r1, r0 - ldr r1, _080A7F10 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -344475,7 +333305,7 @@ sub_80A7EC0: @ 80A7EC0 lsls r1, 26 lsrs r1, 27 lsls r0, r5, 8 - ldr r2, _080A7F14 + ldr r2, =0x02021bc0 lsls r1, 3 adds r1, r2 movs r2, 0x6 @@ -344494,8 +333324,7 @@ _080A7F00: pop {r0} bx r0 .align 2, 0 -_080A7F10: .4byte 0x02020630 -_080A7F14: .4byte 0x02021bc0 + .pool thumb_func_end sub_80A7EC0 thumb_func_start sub_80A7F18 @@ -344503,7 +333332,7 @@ sub_80A7F18: @ 80A7F18 push {r4-r7,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080A7F60 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -344512,9 +333341,9 @@ sub_80A7F18: @ 80A7F18 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r1, _080A7F64 - ldr r7, _080A7F68 - ldr r0, _080A7F6C + ldr r1, =0x020241e4 + ldr r7, =0x00000181 + ldr r0, =0x020244e4 adds r6, r5, r0 _080A7F38: adds r0, r4, r1 @@ -344527,22 +333356,17 @@ _080A7F42: lsls r0, 24 cmp r0, 0 beq _080A7F78 - ldr r0, _080A7F70 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r2, [r0] - ldr r1, _080A7F74 + ldr r1, =0x083021d8 lsls r0, r2, 2 adds r0, r1 ldrb r0, [r0, 0x1] b _080A8042 .align 2, 0 -_080A7F60: .4byte 0x02020630 -_080A7F64: .4byte 0x020241e4 -_080A7F68: .4byte 0x00000181 -_080A7F6C: .4byte 0x020244e4 -_080A7F70: .4byte 0x02039f34 -_080A7F74: .4byte 0x083021d8 + .pool _080A7F78: lsls r0, r4, 24 lsrs r0, 24 @@ -344550,7 +333374,7 @@ _080A7F78: lsls r0, 24 cmp r0, 0 bne _080A7FD8 - ldr r0, _080A7FB4 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r5, 2 @@ -344558,13 +333382,13 @@ _080A7F78: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A7FC0 - ldr r1, _080A7FB8 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A7FBC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -344572,25 +333396,23 @@ _080A7F78: lsrs r2, r0, 16 b _080A7FC2 .align 2, 0 -_080A7FB4: .4byte 0x020244d0 -_080A7FB8: .4byte 0x0202406e -_080A7FBC: .4byte 0x020244ec + .pool _080A7FC0: ldrh r2, [r1, 0x2] _080A7FC2: cmp r2, r7 bne _080A7FD0 - ldr r0, _080A7FCC + ldr r0, =0x08525f8c b _080A8018 .align 2, 0 -_080A7FCC: .4byte 0x08525f8c + .pool _080A7FD0: - ldr r0, _080A7FD4 + ldr r0, =0x083021d8 b _080A8026 .align 2, 0 -_080A7FD4: .4byte 0x083021d8 + .pool _080A7FD8: - ldr r0, _080A8004 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r5, 2 @@ -344598,13 +333420,13 @@ _080A7FD8: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A8010 - ldr r1, _080A8008 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A800C + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -344612,31 +333434,29 @@ _080A7FD8: lsrs r2, r0, 16 b _080A8012 .align 2, 0 -_080A8004: .4byte 0x020244d0 -_080A8008: .4byte 0x0202406e -_080A800C: .4byte 0x02024744 + .pool _080A8010: ldrh r2, [r1, 0x2] _080A8012: cmp r2, r7 bne _080A8024 - ldr r0, _080A8020 + ldr r0, =0x08525f88 _080A8018: ldrb r1, [r6] adds r1, r0 ldrb r0, [r1] b _080A8042 .align 2, 0 -_080A8020: .4byte 0x08525f88 + .pool _080A8024: - ldr r0, _080A8030 + ldr r0, =0x08300d38 _080A8026: lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] b _080A8042 .align 2, 0 -_080A8030: .4byte 0x08300d38 + .pool _080A8034: adds r0, r4, 0x1 lsls r0, 16 @@ -344774,7 +333594,7 @@ _080A80FA: bl sub_80A7E6C b _080A8134 _080A8124: - ldr r2, _080A813C + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -344789,7 +333609,7 @@ _080A8136: pop {r1} bx r1 .align 2, 0 -_080A813C: .4byte 0x02020630 + .pool thumb_func_end sub_80A80C8 thumb_func_start sub_80A8140 @@ -344797,7 +333617,7 @@ sub_80A8140: @ 80A8140 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080A816C + ldr r0, =0x0203841a ldrb r0, [r0] movs r1, 0 cmp r0, 0x1E @@ -344810,15 +333630,14 @@ sub_80A8140: @ 80A8140 bhi _080A815E movs r1, 0x2 _080A815E: - ldr r0, _080A8170 + ldr r0, =0x0203841e strh r1, [r0, 0xE] adds r0, r2, 0 bl move_anim_task_del pop {r0} bx r0 .align 2, 0 -_080A816C: .4byte 0x0203841a -_080A8170: .4byte 0x0203841e + .pool thumb_func_end sub_80A8140 thumb_func_start sub_80A8174 @@ -344829,14 +333648,14 @@ sub_80A8174: @ 80A8174 lsls r0, 24 lsrs r4, r0, 24 adds r7, r4, 0 - ldr r6, _080A8268 + ldr r6, =0x02038437 ldrb r0, [r6] bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 beq _080A81B4 - ldr r2, _080A826C - ldr r1, _080A8270 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -344855,15 +333674,15 @@ sub_80A8174: @ 80A8174 orrs r0, r2 strb r0, [r1, 0x5] _080A81B4: - ldr r0, _080A8274 + ldr r0, =0x02038436 mov r8, r0 ldrb r0, [r0] bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 beq _080A81EC - ldr r2, _080A826C - ldr r1, _080A8270 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 mov r3, r8 ldrb r0, [r3] adds r0, r1 @@ -344890,8 +333709,8 @@ _080A81EC: lsls r0, 24 cmp r0, 0 beq _080A8224 - ldr r2, _080A826C - ldr r1, _080A8270 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 ldrb r0, [r6] eors r0, r5 adds r0, r1 @@ -344918,8 +333737,8 @@ _080A8224: lsls r0, 24 cmp r0, 0 beq _080A825C - ldr r2, _080A826C - ldr r1, _080A8270 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 mov r3, r8 ldrb r0, [r3] eors r0, r5 @@ -344945,21 +333764,18 @@ _080A825C: pop {r0} bx r0 .align 2, 0 -_080A8268: .4byte 0x02038437 -_080A826C: .4byte 0x02020630 -_080A8270: .4byte 0x020241e4 -_080A8274: .4byte 0x02038436 + .pool thumb_func_end sub_80A8174 thumb_func_start sub_80A8278 sub_80A8278: @ 80A8278 push {r4-r6,lr} movs r5, 0 - ldr r0, _080A82D8 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 bge _080A82D2 - ldr r6, _080A82DC + ldr r6, =0x02020630 _080A8286: lsls r0, r5, 24 lsrs r4, r0, 24 @@ -344970,7 +333786,7 @@ _080A8286: beq _080A82C8 adds r0, r4, 0 bl sub_80A82E4 - ldr r3, _080A82E0 + ldr r3, =0x020241e4 adds r3, r5, r3 ldrb r2, [r3] lsls r1, r2, 4 @@ -344994,7 +333810,7 @@ _080A8286: strb r2, [r0, 0x5] _080A82C8: adds r5, 0x1 - ldr r0, _080A82D8 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 blt _080A8286 @@ -345003,9 +333819,7 @@ _080A82D2: pop {r0} bx r0 .align 2, 0 -_080A82D8: .4byte 0x0202406c -_080A82DC: .4byte 0x02020630 -_080A82E0: .4byte 0x020241e4 + .pool thumb_func_end sub_80A8278 thumb_func_start sub_80A82E4 @@ -345139,13 +333953,13 @@ sub_80A8394: @ 80A8394 lsrs r5, 24 str r5, [sp, 0x8] lsls r0, r7, 3 - ldr r1, _080A8474 + ldr r1, =0x08525fc0 adds r0, r1 bl gpu_tile_obj_alloc_tag_and_copy_to_vram lsls r0, 16 lsrs r0, 16 str r0, [sp, 0xC] - ldr r1, _080A8478 + ldr r1, =0x08525f90 lsls r0, r7, 1 adds r0, r7 lsls r0, 3 @@ -345154,7 +333968,7 @@ sub_80A8394: @ 80A8394 bl gpu_pal_alloc_new lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080A847C + ldr r4, =0x020244d4 ldr r0, [r4] cmp r0, 0 beq _080A8412 @@ -345199,7 +334013,7 @@ _080A8412: lsrs r0, 24 cmp r0, 0x1 beq _080A845E - ldr r0, _080A8480 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] ldr r2, [sp, 0x40] @@ -345210,9 +334024,9 @@ _080A8412: beq _080A8488 _080A845E: lsls r0, r6, 3 - ldr r1, _080A8484 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _080A847C + ldr r1, =0x020244d4 ldr r1, [r1] movs r3, 0xBE lsls r3, 1 @@ -345221,16 +334035,12 @@ _080A845E: movs r2, 0x1 b _080A850A .align 2, 0 -_080A8474: .4byte 0x08525fc0 -_080A8478: .4byte 0x08525f90 -_080A847C: .4byte 0x020244d4 -_080A8480: .4byte 0x020244d0 -_080A8484: .4byte 0x0830a18c + .pool _080A8488: lsls r0, r6, 3 - ldr r1, _080A84A8 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _080A84AC + ldr r1, =0x020244d4 ldr r1, [r1] movs r2, 0xBE lsls r2, 1 @@ -345243,8 +334053,7 @@ _080A8488: bl load_poke_gfx_probably b _080A8540 .align 2, 0 -_080A84A8: .4byte 0x0830a18c -_080A84AC: .4byte 0x020244d4 + .pool _080A84B0: adds r0, r6, 0 ldr r1, [sp, 0x3C] @@ -345269,7 +334078,7 @@ _080A84B0: lsrs r0, 24 cmp r0, 0x1 beq _080A84F6 - ldr r0, _080A8518 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] ldr r3, [sp, 0x40] @@ -345280,9 +334089,9 @@ _080A84B0: beq _080A8524 _080A84F6: lsls r0, r6, 3 - ldr r1, _080A851C + ldr r1, =0x083028b8 adds r0, r1 - ldr r1, _080A8520 + ldr r1, =0x020244d4 ldr r1, [r1] movs r2, 0xBE lsls r2, 1 @@ -345296,14 +334105,12 @@ _080A850A: bl sub_8034B7C b _080A8540 .align 2, 0 -_080A8518: .4byte 0x020244d0 -_080A851C: .4byte 0x083028b8 -_080A8520: .4byte 0x020244d4 + .pool _080A8524: lsls r0, r6, 3 - ldr r1, _080A858C + ldr r1, =0x083028b8 adds r0, r1 - ldr r1, _080A8590 + ldr r1, =0x020244d4 ldr r1, [r1] movs r3, 0xBE lsls r3, 1 @@ -345314,7 +334121,7 @@ _080A8524: mov r3, r8 bl load_poke_gfx_probably _080A8540: - ldr r5, _080A8590 + ldr r5, =0x020244d4 ldr r0, [r5] movs r4, 0xBE lsls r4, 1 @@ -345322,7 +334129,7 @@ _080A8540: ldr r0, [r0] ldr r2, [sp, 0xC] lsls r1, r2, 5 - ldr r3, _080A8594 + ldr r3, =0x06010000 adds r1, r3 movs r2, 0x80 lsls r2, 4 @@ -345342,29 +334149,25 @@ _080A8540: lsls r0, r7, 1 adds r0, r7 lsls r0, 3 - ldr r1, _080A8598 + ldr r1, =0x08525f90 adds r0, r1 mov r2, r10 lsls r1, r2, 16 asrs r1, 16 - ldr r3, _080A859C + ldr r3, =0x08300d38 b _080A85B2 .align 2, 0 -_080A858C: .4byte 0x083028b8 -_080A8590: .4byte 0x020244d4 -_080A8594: .4byte 0x06010000 -_080A8598: .4byte 0x08525f90 -_080A859C: .4byte 0x08300d38 + .pool _080A85A0: lsls r0, r7, 1 adds r0, r7 lsls r0, 3 - ldr r1, _080A8600 + ldr r1, =0x08525f90 adds r0, r1 mov r2, r10 lsls r1, r2, 16 asrs r1, 16 - ldr r3, _080A8604 + ldr r3, =0x083021d8 _080A85B2: lsls r2, r6, 2 adds r2, r3 @@ -345381,14 +334184,14 @@ _080A85B2: lsls r0, 24 cmp r0, 0 beq _080A85EE - ldr r3, _080A8608 + ldr r3, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 adds r1, r3, 0 adds r1, 0x10 adds r1, r0, r1 - ldr r2, _080A860C + ldr r2, =0x082ff6c0 str r2, [r1] adds r0, r3 movs r1, 0 @@ -345404,10 +334207,7 @@ _080A85EE: pop {r1} bx r1 .align 2, 0 -_080A8600: .4byte 0x08525f90 -_080A8604: .4byte 0x083021d8 -_080A8608: .4byte 0x02020630 -_080A860C: .4byte 0x082ff6c0 + .pool thumb_func_end sub_80A8394 thumb_func_start sub_80A8610 @@ -345434,7 +334234,7 @@ sub_80A861C: @ 80A861C lsls r0, 24 cmp r0, 0 beq _080A86C4 - ldr r0, _080A8650 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x18] ldrb r1, [r2, 0x4] @@ -345446,7 +334246,7 @@ sub_80A861C: @ 80A861C ldr r2, [r2, 0x10] b _080A8658 .align 2, 0 -_080A8650: .4byte 0x02039f34 + .pool _080A8654: ldrh r7, [r2] ldr r2, [r2, 0x8] @@ -345486,12 +334286,12 @@ _080A8690: lsrs r0, 16 _080A869A: lsls r1, r0, 2 - ldr r0, _080A86A0 + ldr r0, =0x083021d8 b _080A8864 .align 2, 0 -_080A86A0: .4byte 0x083021d8 + .pool _080A86A4: - ldr r0, _080A86BC + ldr r0, =0x00000181 cmp r7, r0 bne _080A86AC b _080A8834 @@ -345501,18 +334301,17 @@ _080A86AC: cmp r7, r0 bhi _080A877C lsls r1, r7, 2 - ldr r0, _080A86C0 + ldr r0, =0x083021d8 b _080A8864 .align 2, 0 -_080A86BC: .4byte 0x00000181 -_080A86C0: .4byte 0x083021d8 + .pool _080A86C4: mov r0, r8 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _080A8790 - ldr r0, _080A8710 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] mov r1, r8 @@ -345521,14 +334320,14 @@ _080A86C4: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A871C - ldr r0, _080A8714 + ldr r0, =0x0202406e mov r1, r8 lsls r4, r1, 1 adds r4, r0 ldrh r0, [r4] movs r6, 0x64 muls r0, r6 - ldr r5, _080A8718 + ldr r5, =0x020244ec adds r0, r5 movs r1, 0xB bl pokemon_getattr @@ -345542,12 +334341,10 @@ _080A86C4: adds r2, r0, 0 b _080A8724 .align 2, 0 -_080A8710: .4byte 0x020244d0 -_080A8714: .4byte 0x0202406e -_080A8718: .4byte 0x020244ec + .pool _080A871C: ldrh r7, [r1, 0x2] - ldr r0, _080A875C + ldr r0, =0x020244bc adds r0, r2, r0 ldr r2, [r0] _080A8724: @@ -345579,7 +334376,7 @@ _080A8724: movs r0, 0xC9 b _080A876A .align 2, 0 -_080A875C: .4byte 0x020244bc + .pool _080A8760: movs r1, 0xCE lsls r1, 1 @@ -345588,28 +334385,28 @@ _080A8760: lsrs r0, 16 _080A876A: lsls r1, r0, 2 - ldr r0, _080A8770 + ldr r0, =0x083021d8 b _080A8864 .align 2, 0 -_080A8770: .4byte 0x083021d8 + .pool _080A8774: movs r0, 0xCE lsls r0, 1 cmp r7, r0 bls _080A8784 _080A877C: - ldr r4, _080A8780 + ldr r4, =0x083021d8 b _080A8866 .align 2, 0 -_080A8780: .4byte 0x083021d8 + .pool _080A8784: lsls r1, r7, 2 - ldr r0, _080A878C + ldr r0, =0x083021d8 b _080A8864 .align 2, 0 -_080A878C: .4byte 0x083021d8 + .pool _080A8790: - ldr r0, _080A87D0 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] mov r1, r8 @@ -345618,14 +334415,14 @@ _080A8790: ldrh r0, [r1, 0x2] cmp r0, 0 bne _080A87DC - ldr r0, _080A87D4 + ldr r0, =0x0202406e mov r1, r8 lsls r4, r1, 1 adds r4, r0 ldrh r0, [r4] movs r6, 0x64 muls r0, r6 - ldr r5, _080A87D8 + ldr r5, =0x02024744 adds r0, r5 movs r1, 0xB bl pokemon_getattr @@ -345639,12 +334436,10 @@ _080A8790: adds r2, r0, 0 b _080A87E4 .align 2, 0 -_080A87D0: .4byte 0x020244d0 -_080A87D4: .4byte 0x0202406e -_080A87D8: .4byte 0x02024744 + .pool _080A87DC: ldrh r7, [r1, 0x2] - ldr r0, _080A881C + ldr r0, =0x020244bc adds r0, r2, r0 ldr r2, [r0] _080A87E4: @@ -345676,7 +334471,7 @@ _080A87E4: movs r0, 0xC9 b _080A882A .align 2, 0 -_080A881C: .4byte 0x020244bc + .pool _080A8820: movs r1, 0xCE lsls r1, 1 @@ -345687,34 +334482,32 @@ _080A882A: lsls r1, r0, 2 b _080A8862 _080A882E: - ldr r0, _080A8844 + ldr r0, =0x00000181 cmp r7, r0 bne _080A8850 _080A8834: - ldr r0, _080A8848 + ldr r0, =0x020244e4 add r0, r8 ldrb r0, [r0] lsls r0, 2 - ldr r1, _080A884C + ldr r1, =0x08525f78 adds r4, r0, r1 b _080A8866 .align 2, 0 -_080A8844: .4byte 0x00000181 -_080A8848: .4byte 0x020244e4 -_080A884C: .4byte 0x08525f78 + .pool _080A8850: movs r0, 0xCE lsls r0, 1 cmp r7, r0 bls _080A8860 - ldr r4, _080A885C + ldr r4, =0x08300d38 b _080A8866 .align 2, 0 -_080A885C: .4byte 0x08300d38 + .pool _080A8860: lsls r1, r7, 2 _080A8862: - ldr r0, _080A8878 + ldr r0, =0x08300d38 _080A8864: adds r4, r1, r0 _080A8866: @@ -345722,13 +334515,12 @@ _080A8866: cmp r0, 0x6 bhi _080A8916 lsls r0, 2 - ldr r1, _080A887C + ldr r1, =_080A8880 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A8878: .4byte 0x08300d38 -_080A887C: .4byte _080A8880 + .pool .align 2, 0 _080A8880: .4byte _080A889C @@ -345907,7 +334699,7 @@ sub_80A89C8: @ 80A89C8 sub sp, 0x4 lsls r6, r1, 24 lsrs r6, 24 - ldr r0, _080A8A60 + ldr r0, =nullsub_12 + 1 mov r10, r0 bl object_new_hidden_with_callback mov r8, r0 @@ -345915,7 +334707,7 @@ sub_80A89C8: @ 80A89C8 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _080A8A64 + ldr r0, =0x02020630 mov r9, r0 mov r0, r8 lsls r3, r0, 4 @@ -345953,7 +334745,7 @@ sub_80A89C8: @ 80A89C8 lsls r1, 22 lsrs r1, 22 ldrh r2, [r5, 0x4] - ldr r0, _080A8A68 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] @@ -345973,9 +334765,7 @@ sub_80A89C8: @ 80A89C8 pop {r1} bx r1 .align 2, 0 -_080A8A60: .4byte nullsub_12 + 1 -_080A8A64: .4byte 0x02020630 -_080A8A68: .4byte 0xfffffc00 + .pool thumb_func_end sub_80A89C8 thumb_func_start sub_80A8A6C @@ -345983,13 +334773,13 @@ sub_80A8A6C: @ 80A8A6C push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, _080A8AA4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _080A8AAC - ldr r2, _080A8AA8 + ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] subs r0, r1 @@ -346006,10 +334796,9 @@ sub_80A8A6C: @ 80A8A6C adds r1, r2, 0 b _080A8AB6 .align 2, 0 -_080A8AA4: .4byte 0x02038436 -_080A8AA8: .4byte 0x0203841e + .pool _080A8AAC: - ldr r1, _080A8AE0 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -346027,31 +334816,29 @@ _080A8AB6: strh r0, [r4, 0x34] ldrh r0, [r1, 0xA] strh r0, [r4, 0x38] - ldr r1, _080A8AE4 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _080A8AE8 + ldr r0, =sub_80A66DC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_080A8AE0: .4byte 0x0203841e -_080A8AE4: .4byte move_anim_8074EE0 + 1 -_080A8AE8: .4byte sub_80A66DC + 1 + .pool thumb_func_end sub_80A8A6C thumb_func_start sub_80A8AEC sub_80A8AEC: @ 80A8AEC push {r4,lr} adds r4, r0, 0 - ldr r0, _080A8B14 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _080A8B1C - ldr r2, _080A8B18 + ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] subs r0, r1 @@ -346063,10 +334850,9 @@ sub_80A8AEC: @ 80A8AEC adds r1, r2, 0 b _080A8B26 .align 2, 0 -_080A8B14: .4byte 0x02038436 -_080A8B18: .4byte 0x0203841e + .pool _080A8B1C: - ldr r1, _080A8B58 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -346087,18 +334873,16 @@ _080A8B26: ldrb r1, [r1, 0xC] adds r0, r4, 0 bl obj_anim_image_start - ldr r1, _080A8B5C + ldr r1, =move_anim_8074EE0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _080A8B60 + ldr r0, =sub_80A66DC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_080A8B58: .4byte 0x0203841e -_080A8B5C: .4byte move_anim_8074EE0 + 1 -_080A8B60: .4byte sub_80A66DC + 1 + .pool thumb_func_end sub_80A8AEC thumb_func_start sub_80A8B64 @@ -346106,23 +334890,22 @@ sub_80A8B64: @ 80A8B64 push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, _080A8B88 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _080A8B90 - ldr r0, _080A8B8C + ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r2, [r0] subs r1, r2 strh r1, [r4, 0x20] b _080A8B9C .align 2, 0 -_080A8B88: .4byte 0x02038436 -_080A8B8C: .4byte 0x0203841e + .pool _080A8B90: - ldr r1, _080A8BB8 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -346133,18 +334916,16 @@ _080A8B9C: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, _080A8BBC + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] - ldr r1, _080A8BC0 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_080A8BB8: .4byte 0x0203841e -_080A8BBC: .4byte sub_80A67D8 + 1 -_080A8BC0: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_80A8B64 thumb_func_start sub_80A8BC4 @@ -346155,7 +334936,7 @@ sub_80A8BC4: @ 80A8BC4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080A8C58 + ldr r0, =0x03005e00 adds r5, r1, r0 movs r0, 0 bl obj_id_for_side_relative_to_move @@ -346163,7 +334944,7 @@ sub_80A8BC4: @ 80A8BC4 lsrs r0, 24 movs r6, 0 strh r0, [r5, 0x8] - ldr r7, _080A8C5C + ldr r7, =0x02038436 ldrb r0, [r7] bl battle_side_get_owner lsls r0, 24 @@ -346177,7 +334958,7 @@ _080A8BF8: strh r1, [r5, 0xA] strh r6, [r5, 0xC] strh r6, [r5, 0xE] - ldr r4, _080A8C60 + ldr r4, =0x02020630 movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -346188,7 +334969,7 @@ _080A8BF8: ldrh r2, [r5, 0x8] subs r1, r2 strh r1, [r0, 0x24] - ldr r0, _080A8C64 + ldr r0, =0x00002771 bl gpu_pal_alloc_new lsls r0, 24 lsrs r0, 24 @@ -346222,39 +335003,32 @@ _080A8C54: movs r0, 0x2 b _080A8C6A .align 2, 0 -_080A8C58: .4byte 0x03005e00 -_080A8C5C: .4byte 0x02038436 -_080A8C60: .4byte 0x02020630 -_080A8C64: .4byte 0x00002771 + .pool _080A8C68: movs r0, 0x3 _080A8C6A: strh r0, [r5, 0x14] lsls r0, r4, 1 - ldr r1, _080A8C98 + ldr r1, =0x02037714 adds r0, r1 lsls r1, r6, 1 - ldr r2, _080A8C9C + ldr r2, =0x02037b14 adds r1, r2 - ldr r2, _080A8CA0 + ldr r2, =0x04000008 bl CpuSet - ldr r0, _080A8CA4 + ldr r0, =0x0203841e ldrb r2, [r0, 0x2] ldrh r3, [r0] adds r0, r6, 0 movs r1, 0x10 bl pal_fade_1 - ldr r0, _080A8CA8 + ldr r0, =sub_80A8CAC + 1 str r0, [r5] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080A8C98: .4byte 0x02037714 -_080A8C9C: .4byte 0x02037b14 -_080A8CA0: .4byte 0x04000008 -_080A8CA4: .4byte 0x0203841e -_080A8CA8: .4byte sub_80A8CAC + 1 + .pool thumb_func_end sub_80A8BC4 thumb_func_start sub_80A8CAC @@ -346265,7 +335039,7 @@ sub_80A8CAC: @ 80A8CAC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080A8CD0 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0xC ldrsh r0, [r4, r1] @@ -346277,7 +335051,7 @@ sub_80A8CAC: @ 80A8CAC beq _080A8CDA b _080A8D6C .align 2, 0 -_080A8CD0: .4byte 0x03005e00 + .pool _080A8CD4: cmp r0, 0x2 beq _080A8D58 @@ -346286,7 +335060,7 @@ _080A8CDA: adds r0, r4, 0 adds r1, r5, 0 bl sub_80A8D78 - ldr r2, _080A8D0C + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -346307,12 +335081,12 @@ _080A8CDA: strh r1, [r4, 0xE] b _080A8D4A .align 2, 0 -_080A8D0C: .4byte 0x02020630 + .pool _080A8D10: adds r0, r4, 0 adds r1, r5, 0 bl sub_80A8D78 - ldr r3, _080A8D54 + ldr r3, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -346343,13 +335117,13 @@ _080A8D4A: strh r0, [r4, 0xC] b _080A8D6C .align 2, 0 -_080A8D54: .4byte 0x02020630 + .pool _080A8D58: movs r2, 0x12 ldrsh r0, [r4, r2] cmp r0, 0 bne _080A8D6C - ldr r0, _080A8D74 + ldr r0, =0x00002771 bl gpu_pal_free_tag adds r0, r5, 0 bl move_anim_task_del @@ -346358,7 +335132,7 @@ _080A8D6C: pop {r0} bx r0 .align 2, 0 -_080A8D74: .4byte 0x00002771 + .pool thumb_func_end sub_80A8CAC thumb_func_start sub_80A8D78 @@ -346377,7 +335151,7 @@ sub_80A8D78: @ 80A8D78 asrs r0, 16 cmp r0, 0 blt _080A8DE8 - ldr r5, _080A8DF4 + ldr r5, =0x02020630 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -346413,7 +335187,7 @@ sub_80A8D78: @ 80A8D78 strh r0, [r3, 0x24] adds r5, 0x1C adds r4, r5 - ldr r0, _080A8DF8 + ldr r0, =sub_80A8DFC + 1 str r0, [r4] ldrh r0, [r6, 0x12] adds r0, 0x1 @@ -346425,8 +335199,7 @@ _080A8DE8: pop {r0} bx r0 .align 2, 0 -_080A8DF4: .4byte 0x02020630 -_080A8DF8: .4byte sub_80A8DFC + 1 + .pool thumb_func_end sub_80A8D78 thumb_func_start sub_80A8DFC @@ -346439,7 +335212,7 @@ sub_80A8DFC: @ 80A8DFC lsls r0, 16 cmp r0, 0 bne _080A8E26 - ldr r2, _080A8E2C + ldr r2, =0x03005e00 movs r0, 0x30 ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -346455,14 +335228,14 @@ _080A8E26: pop {r0} bx r0 .align 2, 0 -_080A8E2C: .4byte 0x03005e00 + .pool thumb_func_end sub_80A8DFC thumb_func_start sub_80A8E30 sub_80A8E30: @ 80A8E30 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _080A8E64 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -346483,22 +335256,20 @@ sub_80A8E30: @ 80A8E30 movs r0, 0x5 b _080A8E6A .align 2, 0 -_080A8E64: .4byte 0x02038436 + .pool _080A8E68: - ldr r0, _080A8E7C + ldr r0, =0x0000fff6 _080A8E6A: strh r0, [r5, 0x2E] - ldr r0, _080A8E80 + ldr r0, =0x0000ffd8 strh r0, [r5, 0x30] - ldr r0, _080A8E84 + ldr r0, =sub_80A8E88 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080A8E7C: .4byte 0x0000fff6 -_080A8E80: .4byte 0x0000ffd8 -_080A8E84: .4byte sub_80A8E88 + 1 + .pool thumb_func_end sub_80A8E30 thumb_func_start sub_80A8E88 @@ -346553,7 +335324,7 @@ _080A8EDC: sub_80A8EE4: @ 80A8EE4 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080A8F1C + ldr r5, =0x0203841e ldrh r0, [r5, 0x4] strh r0, [r4, 0x2E] ldrh r0, [r5, 0x8] @@ -346564,7 +335335,7 @@ sub_80A8EE4: @ 80A8EE4 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x36] - ldr r0, _080A8F20 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -346579,8 +335350,7 @@ sub_80A8EE4: @ 80A8EE4 subs r0, 0x14 b _080A8F32 .align 2, 0 -_080A8F1C: .4byte 0x0203841e -_080A8F20: .4byte 0x02038437 + .pool _080A8F24: ldrh r0, [r5, 0x8] subs r0, 0x1E @@ -346591,24 +335361,23 @@ _080A8F24: subs r0, 0x50 _080A8F32: strh r0, [r4, 0x22] - ldr r0, _080A8F48 + ldr r0, =sub_80A6EEC + 1 str r0, [r4, 0x1C] - ldr r1, _080A8F4C + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080A8F48: .4byte sub_80A6EEC + 1 -_080A8F4C: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_80A8EE4 thumb_func_start clear_tasks clear_tasks: @ 80A8F50 push {r4-r7,lr} movs r4, 0 - ldr r6, _080A8FA4 + ldr r6, =0x03005e00 adds r7, r6, 0 adds r7, 0x8 _080A8F5A: @@ -346618,7 +335387,7 @@ _080A8F5A: adds r2, r0, r6 movs r1, 0 strb r1, [r2, 0x4] - ldr r1, _080A8FA8 + ldr r1, =nullsub_4 + 1 str r1, [r2] strb r4, [r2, 0x5] adds r4, 0x1 @@ -346636,10 +335405,10 @@ _080A8F5A: lsrs r4, 24 cmp r4, 0xF bls _080A8F5A - ldr r0, _080A8FA4 + ldr r0, =0x03005e00 movs r1, 0xFE strb r1, [r0, 0x5] - ldr r1, _080A8FAC + ldr r1, =0x0000025e adds r0, r1 ldrb r1, [r0] orrs r1, r5 @@ -346648,9 +335417,7 @@ _080A8F5A: pop {r0} bx r0 .align 2, 0 -_080A8FA4: .4byte 0x03005e00 -_080A8FA8: .4byte nullsub_4 + 1 -_080A8FAC: .4byte 0x0000025e + .pool thumb_func_end clear_tasks thumb_func_start AddTask @@ -346660,7 +335427,7 @@ AddTask: @ 80A8FB0 lsls r1, 24 lsrs r1, 24 movs r6, 0 - ldr r7, _080A8FEC + ldr r7, =0x03005e00 _080A8FBC: lsls r0, r6, 2 adds r0, r6 @@ -346684,7 +335451,7 @@ _080A8FBC: adds r0, r6, 0 b _080A8FFC .align 2, 0 -_080A8FEC: .4byte 0x03005e00 + .pool _080A8FF0: adds r0, r6, 0x1 lsls r0, 24 @@ -346710,7 +335477,7 @@ insert_task_in_order_by_priority: @ 80A9004 lsrs r1, r0, 24 cmp r1, 0x10 bne _080A9034 - ldr r1, _080A9030 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -346721,9 +335488,9 @@ insert_task_in_order_by_priority: @ 80A9004 strb r1, [r0, 0x6] b _080A9090 .align 2, 0 -_080A9030: .4byte 0x03005e00 + .pool _080A9034: - ldr r6, _080A9070 + ldr r6, =0x03005e00 lsls r0, r4, 2 mov r12, r0 mov r8, r6 @@ -346756,7 +335523,7 @@ _080A906C: strb r4, [r3, 0x5] b _080A9090 .align 2, 0 -_080A9070: .4byte 0x03005e00 + .pool _080A9074: ldrb r0, [r3, 0x6] cmp r0, 0xFF @@ -346786,7 +335553,7 @@ remove_task: @ 80A909C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _080A90D0 + ldr r4, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -346810,7 +335577,7 @@ remove_task: @ 80A909C strb r3, [r0, 0x5] b _080A9106 .align 2, 0 -_080A90D0: .4byte 0x03005e00 + .pool _080A90D4: ldrb r3, [r2, 0x6] adds r0, r3, 0 @@ -346852,7 +335619,7 @@ run_active_tasks: @ 80A910C lsrs r0, 24 cmp r0, 0x10 beq _080A9130 - ldr r5, _080A9138 + ldr r5, =0x03005e00 _080A911C: lsls r4, r0, 2 adds r4, r0 @@ -346868,14 +335635,14 @@ _080A9130: pop {r0} bx r0 .align 2, 0 -_080A9138: .4byte 0x03005e00 + .pool thumb_func_end run_active_tasks thumb_func_start get_first_active_task get_first_active_task: @ 80A913C push {lr} movs r2, 0 - ldr r0, _080A9174 + ldr r0, =0x03005e00 ldrb r1, [r0, 0x4] adds r3, r0, 0 cmp r1, 0x1 @@ -346904,7 +335671,7 @@ _080A916E: pop {r1} bx r1 .align 2, 0 -_080A9174: .4byte 0x03005e00 + .pool thumb_func_end get_first_active_task thumb_func_start nullsub_4 @@ -346917,7 +335684,7 @@ set_task_function_and_args_14_15: @ 80A917C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _080A91AC + ldr r5, =0x03005e00 lsls r3, r0, 2 adds r3, r0 lsls r3, 3 @@ -346938,7 +335705,7 @@ set_task_function_and_args_14_15: @ 80A917C pop {r0} bx r0 .align 2, 0 -_080A91AC: .4byte 0x03005e00 + .pool thumb_func_end set_task_function_and_args_14_15 thumb_func_start set_task_function_to_args_14_15 @@ -346946,7 +335713,7 @@ set_task_function_to_args_14_15: @ 80A91B0 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _080A91E0 + ldr r3, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -346967,7 +335734,7 @@ set_task_function_to_args_14_15: @ 80A91B0 pop {r0} bx r0 .align 2, 0 -_080A91E0: .4byte 0x03005e00 + .pool thumb_func_end set_task_function_to_args_14_15 thumb_func_start is_function_an_active_task @@ -346975,7 +335742,7 @@ is_function_an_active_task: @ 80A91E4 push {r4,lr} adds r3, r0, 0 movs r2, 0 - ldr r4, _080A9204 + ldr r4, =0x03005e00 _080A91EC: lsls r0, r2, 2 adds r0, r2 @@ -346990,7 +335757,7 @@ _080A91EC: movs r0, 0x1 b _080A9214 .align 2, 0 -_080A9204: .4byte 0x03005e00 + .pool _080A9208: adds r0, r2, 0x1 lsls r0, 24 @@ -347009,7 +335776,7 @@ get_task_id_by_function: @ 80A921C push {lr} adds r3, r0, 0 movs r2, 0 - ldr r1, _080A9238 + ldr r1, =0x03005e00 _080A9224: ldrb r0, [r1, 0x4] cmp r0, 0x1 @@ -347021,7 +335788,7 @@ _080A9224: lsrs r0, 24 b _080A9246 .align 2, 0 -_080A9238: .4byte 0x03005e00 + .pool _080A923C: adds r1, 0x28 adds r2, 0x1 @@ -347038,7 +335805,7 @@ sub_80A924C: @ 80A924C push {lr} movs r2, 0 movs r1, 0 - ldr r3, _080A9278 + ldr r3, =0x03005e00 _080A9254: lsls r0, r1, 2 adds r0, r1 @@ -347060,7 +335827,7 @@ _080A9268: pop {r1} bx r1 .align 2, 0 -_080A9278: .4byte 0x03005e00 + .pool thumb_func_end sub_80A924C thumb_func_start set_word_task_arg @@ -347073,7 +335840,7 @@ set_word_task_arg: @ 80A927C lsrs r3, r1, 24 cmp r3, 0xE bhi _080A92AA - ldr r2, _080A92B0 + ldr r2, =0x03005e00 lsls r0, r3, 1 lsls r1, r4, 2 adds r1, r4 @@ -347093,7 +335860,7 @@ _080A92AA: pop {r0} bx r0 .align 2, 0 -_080A92B0: .4byte 0x03005e00 + .pool thumb_func_end set_word_task_arg thumb_func_start get_word_task_arg @@ -347108,7 +335875,7 @@ get_word_task_arg: @ 80A92B4 movs r0, 0 b _080A92E8 _080A92C6: - ldr r3, _080A92F0 + ldr r3, =0x03005e00 lsls r0, r1, 1 lsls r2, r4, 2 adds r2, r4 @@ -347130,7 +335897,7 @@ _080A92E8: pop {r1} bx r1 .align 2, 0 -_080A92F0: .4byte 0x03005e00 + .pool thumb_func_end get_word_task_arg thumb_func_start nullsub_35 @@ -347141,7 +335908,7 @@ nullsub_35: @ 80A92F4 thumb_func_start sub_80A92F8 sub_80A92F8: @ 80A92F8 push {lr} - ldr r2, _080A9330 + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -347153,28 +335920,26 @@ sub_80A92F8: @ 80A92F8 movs r0, 0x4C movs r1, 0 bl lcd_io_set - ldr r0, _080A9334 + ldr r0, =0x02024474 adds r2, r0, 0 adds r2, 0x21 movs r1, 0 strb r1, [r2] adds r0, 0x22 strb r1, [r0] - ldr r0, _080A9338 + ldr r0, =c2_80777E8 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080A9330: .4byte 0x02037fd4 -_080A9334: .4byte 0x02024474 -_080A9338: .4byte c2_80777E8 + 1 + .pool thumb_func_end sub_80A92F8 thumb_func_start c2_80777E8 c2_80777E8: @ 80A933C push {r4-r7,lr} sub sp, 0x8 - ldr r0, _080A9358 + ldr r0, =0x02024474 adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x13 @@ -347182,13 +335947,12 @@ c2_80777E8: @ 80A933C b _080A95A4 _080A934C: lsls r0, 2 - ldr r1, _080A935C + ldr r1, =_080A9360 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080A9358: .4byte 0x02024474 -_080A935C: .4byte _080A9360 + .pool .align 2, 0 _080A9360: .4byte _080A93B0 @@ -347231,44 +335995,37 @@ _080A93B0: movs r0, 0x3 bl gpu_sync_bg_show bl sub_80A1A74 - ldr r0, _080A940C + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _080A9410 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r0, _080A9414 + ldr r0, =0x02022e18 strh r1, [r0] - ldr r0, _080A9418 + ldr r0, =0x02022e1a strh r1, [r0] - ldr r0, _080A941C + ldr r0, =0x02022e1c strh r1, [r0] - ldr r0, _080A9420 + ldr r0, =0x02022e1e strh r1, [r0] - ldr r0, _080A9424 + ldr r0, =0x02022e20 strh r1, [r0] - ldr r0, _080A9428 + ldr r0, =0x02022e22 strh r1, [r0] b _080A95D2 .align 2, 0 -_080A940C: .4byte 0x02022e14 -_080A9410: .4byte 0x02022e16 -_080A9414: .4byte 0x02022e18 -_080A9418: .4byte 0x02022e1a -_080A941C: .4byte 0x02022e1c -_080A9420: .4byte 0x02022e1e -_080A9424: .4byte 0x02022e20 -_080A9428: .4byte 0x02022e22 + .pool _080A942C: movs r0, 0 str r0, [sp, 0x4] movs r1, 0xC0 lsls r1, 19 - ldr r2, _080A9440 + ldr r2, =0x01006000 add r0, sp, 0x4 bl CpuFastSet b _080A95D2 .align 2, 0 -_080A9440: .4byte 0x01006000 + .pool _080A9444: bl sub_8035AA4 b _080A95D2 @@ -347277,17 +336034,17 @@ _080A944A: b _080A95D2 _080A9450: bl gpu_pal_allocator_reset - ldr r1, _080A945C + ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] b _080A95D2 .align 2, 0 -_080A945C: .4byte 0x0300301c + .pool _080A9460: bl sub_805E350 b _080A95D2 _080A9466: - ldr r5, _080A9480 + ldr r5, =0x02024474 adds r4, r5, 0 adds r4, 0x22 ldrb r0, [r4] @@ -347299,7 +336056,7 @@ _080A9466: strb r0, [r4] b _080A95D2 .align 2, 0 -_080A9480: .4byte 0x02024474 + .pool _080A9484: ldrb r0, [r4] adds r0, 0x1 @@ -347324,7 +336081,7 @@ _080A949C: beq _080A94A8 b _080A95D2 _080A94A8: - ldr r1, _080A94B4 + ldr r1, =0x02024474 _080A94AA: adds r1, 0x21 ldrb r0, [r1] @@ -347332,7 +336089,7 @@ _080A94AA: strb r0, [r1] b _080A95D2 .align 2, 0 -_080A94B4: .4byte 0x02024474 + .pool _080A94B8: movs r0, 0 bl sub_80A9708 @@ -347372,13 +336129,13 @@ _080A94F8: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r7, _080A958C + ldr r7, =0x0202406e lsls r0, r4, 1 adds r0, r7 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _080A9590 + ldr r5, =0x02024744 adds r0, r5 movs r1, 0xB bl pokemon_getattr @@ -347409,18 +336166,18 @@ _080A94F8: adds r0, r4, 0 bl sub_805EE54 _080A955C: - ldr r1, _080A9594 - ldr r0, _080A9598 + ldr r1, =0x020244ac + ldr r0, =0x020244b8 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - ldr r0, _080A959C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080A95D2 - ldr r0, _080A95A0 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080A95D2 @@ -347430,14 +336187,9 @@ _080A955C: bl sub_800DFB4 b _080A95D2 .align 2, 0 -_080A958C: .4byte 0x0202406e -_080A9590: .4byte 0x02024744 -_080A9594: .4byte 0x020244ac -_080A9598: .4byte 0x020244b8 -_080A959C: .4byte 0x030030fc -_080A95A0: .4byte 0x03003124 + .pool _080A95A4: - ldr r0, _080A95E4 + ldr r0, =vblank_cb_08078BB4 + 1 bl SetVBlankCallback bl sub_80A95F4 movs r0, 0x1 @@ -347447,16 +336199,16 @@ _080A95A4: movs r2, 0x10 movs r3, 0 bl sub_80A27B0 - ldr r2, _080A95E8 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] - ldr r0, _080A95EC + ldr r0, =sub_8038420 + 1 bl set_callback2 bl sub_805EF14 _080A95D2: - ldr r1, _080A95F0 + ldr r1, =0x02024474 adds r1, 0x21 ldrb r0, [r1] adds r0, 0x1 @@ -347466,29 +336218,25 @@ _080A95D2: pop {r0} bx r0 .align 2, 0 -_080A95E4: .4byte vblank_cb_08078BB4 + 1 -_080A95E8: .4byte 0x02037fd4 -_080A95EC: .4byte sub_8038420 + 1 -_080A95F0: .4byte 0x02024474 + .pool thumb_func_end c2_80777E8 thumb_func_start sub_80A95F4 sub_80A95F4: @ 80A95F4 - ldr r3, _080A960C + ldr r3, =0x0400000a ldrb r2, [r3] movs r1, 0xD negs r1, r1 adds r0, r1, 0 ands r0, r2 strb r0, [r3] - ldr r2, _080A9610 + ldr r2, =0x0400000c ldrb r0, [r2] ands r1, r0 strb r1, [r2] bx lr .align 2, 0 -_080A960C: .4byte 0x0400000a -_080A9610: .4byte 0x0400000c + .pool thumb_func_end sub_80A95F4 thumb_func_start sub_80A9614 @@ -347496,7 +336244,7 @@ sub_80A9614: @ 80A9614 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A965C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 bcs _080A96FC @@ -347505,7 +336253,7 @@ sub_80A9614: @ 80A9614 lsls r0, 24 cmp r0, 0 beq _080A9676 - ldr r0, _080A9660 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r4, 2 @@ -347515,29 +336263,26 @@ sub_80A9614: @ 80A9614 ands r0, r1 cmp r0, 0 bne _080A966C - ldr r1, _080A9664 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A9668 + ldr r1, =0x02024744 adds r0, r1 adds r1, r4, 0 bl sub_805DC0C b _080A96F4 .align 2, 0 -_080A965C: .4byte 0x0202406c -_080A9660: .4byte 0x020244d0 -_080A9664: .4byte 0x0202406e -_080A9668: .4byte 0x02024744 + .pool _080A966C: adds r0, r4, 0 movs r1, 0 bl sub_805E7DC b _080A96F4 _080A9676: - ldr r0, _080A9690 + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x80 ands r1, r2 @@ -347545,13 +336290,12 @@ _080A9676: beq _080A9698 cmp r4, 0 bne _080A9698 - ldr r0, _080A9694 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] b _080A96AA .align 2, 0 -_080A9690: .4byte 0x02022fec -_080A9694: .4byte 0x03005d90 + .pool _080A9698: ldr r0, [r0] movs r1, 0x80 @@ -347567,7 +336311,7 @@ _080A96AA: bl sub_805DF84 b _080A96F4 _080A96B2: - ldr r0, _080A96E0 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r4, 2 @@ -347577,27 +336321,25 @@ _080A96B2: ands r0, r1 cmp r0, 0 bne _080A96EC - ldr r1, _080A96E4 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A96E8 + ldr r1, =0x020244ec adds r0, r1 adds r1, r4, 0 bl sub_805DD7C b _080A96F4 .align 2, 0 -_080A96E0: .4byte 0x020244d0 -_080A96E4: .4byte 0x0202406e -_080A96E8: .4byte 0x020244ec + .pool _080A96EC: adds r0, r4, 0 movs r1, 0 bl sub_805E7DC _080A96F4: - ldr r0, _080A9704 + ldr r0, =0x02024474 adds r0, 0x22 movs r1, 0 strb r1, [r0] @@ -347607,7 +336349,7 @@ _080A96FC: pop {r1} bx r1 .align 2, 0 -_080A9704: .4byte 0x02024474 + .pool thumb_func_end sub_80A9614 thumb_func_start sub_80A9708 @@ -347620,13 +336362,13 @@ sub_80A9708: @ 80A9708 sub sp, 0x4 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080A9740 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r7, r0 bcc _080A9722 b _080A9AA0 _080A9722: - ldr r0, _080A9744 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] lsls r2, r7, 2 @@ -347641,8 +336383,7 @@ _080A9722: bl sub_80A614C b _080A974E .align 2, 0 -_080A9740: .4byte 0x0202406c -_080A9744: .4byte 0x020244d0 + .pool _080A9748: adds r0, r7, 0 bl sub_80A6138 @@ -347657,7 +336398,7 @@ _080A974E: bne _080A9762 b _080A986C _080A9762: - ldr r1, _080A984C + ldr r1, =0x0202406e lsls r0, r7, 1 adds r6, r0, r1 ldrh r0, [r6] @@ -347666,7 +336407,7 @@ _080A9762: mov r2, r10 muls r2, r0 adds r0, r2, 0 - ldr r1, _080A9850 + ldr r1, =0x02024744 mov r9, r1 add r0, r9 movs r1, 0x39 @@ -347692,7 +336433,7 @@ _080A9786: lsrs r1, 24 adds r0, r4, 0 bl sub_806A068 - ldr r5, _080A9854 + ldr r5, =0x0202499c adds r0, r7, 0 movs r1, 0x2 bl sub_80A5C6C @@ -347708,10 +336449,10 @@ _080A9786: adds r1, r4, 0 mov r2, r8 bl obj_add_from_template_forward_search - ldr r1, _080A9858 + ldr r1, =0x020241e4 adds r4, r7, r1 strb r0, [r4] - ldr r5, _080A985C + ldr r5, =0x02020630 ldrb r0, [r4] lsls r1, r0, 4 adds r1, r0 @@ -347730,7 +336471,7 @@ _080A9786: adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _080A9860 + ldr r1, =nullsub_12 + 1 str r1, [r0] ldrb r1, [r4] lsls r0, r1, 4 @@ -347756,27 +336497,20 @@ _080A9786: adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _080A9864 + ldr r1, =0x020244e4 adds r1, r7, r1 ldrb r1, [r1] bl obj_anim_image_start - ldr r0, _080A9868 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] ldr r2, [sp] adds r0, r2, r0 b _080A9A50 .align 2, 0 -_080A984C: .4byte 0x0202406e -_080A9850: .4byte 0x02024744 -_080A9854: .4byte 0x0202499c -_080A9858: .4byte 0x020241e4 -_080A985C: .4byte 0x02020630 -_080A9860: .4byte nullsub_12 + 1 -_080A9864: .4byte 0x020244e4 -_080A9868: .4byte 0x020244d0 + .pool _080A986C: - ldr r0, _080A98C0 + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x80 ands r1, r2 @@ -347784,7 +336518,7 @@ _080A986C: beq _080A98D0 cmp r7, 0 bne _080A98D0 - ldr r5, _080A98C4 + ldr r5, =0x03005d90 ldr r0, [r5] ldrb r4, [r0, 0x8] movs r0, 0 @@ -347794,8 +336528,8 @@ _080A986C: lsrs r1, 24 adds r0, r4, 0 bl template_build_for_pokemon_or_trainer - ldr r6, _080A98C8 - ldr r1, _080A98CC + ldr r6, =0x0202499c + ldr r1, =0x08305d2c ldr r0, [r5] ldrb r0, [r0, 0x8] lsls r0, 2 @@ -347816,10 +336550,7 @@ _080A986C: adds r0, r6, 0 b _080A9914 .align 2, 0 -_080A98C0: .4byte 0x02022fec -_080A98C4: .4byte 0x03005d90 -_080A98C8: .4byte 0x0202499c -_080A98CC: .4byte 0x08305d2c + .pool _080A98D0: ldr r0, [r0] movs r1, 0x80 @@ -347836,8 +336567,8 @@ _080A98D0: lsrs r1, 24 movs r0, 0x6 bl template_build_for_pokemon_or_trainer - ldr r5, _080A9954 - ldr r0, _080A9958 + ldr r5, =0x0202499c + ldr r0, =0x08305d2c ldrb r0, [r0, 0x18] movs r4, 0x8 subs r4, r0 @@ -347856,9 +336587,9 @@ _080A9914: movs r1, 0x50 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r3, _080A995C + ldr r3, =0x020241e4 strb r0, [r3] - ldr r4, _080A9960 + ldr r4, =0x02020630 ldrb r0, [r3] lsls r1, r0, 4 adds r1, r0 @@ -347875,7 +336606,7 @@ _080A9914: adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _080A9964 + ldr r1, =nullsub_12 + 1 str r1, [r0] ldrb r1, [r3] lsls r0, r1, 4 @@ -347885,13 +336616,9 @@ _080A9914: strh r7, [r0, 0x2E] b _080A9A70 .align 2, 0 -_080A9954: .4byte 0x0202499c -_080A9958: .4byte 0x08305d2c -_080A995C: .4byte 0x020241e4 -_080A9960: .4byte 0x02020630 -_080A9964: .4byte nullsub_12 + 1 + .pool _080A9968: - ldr r1, _080A9AB0 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r6, r0, r1 ldrh r0, [r6] @@ -347900,7 +336627,7 @@ _080A9968: mov r1, r10 muls r1, r0 adds r0, r1, 0 - ldr r2, _080A9AB4 + ldr r2, =0x020244ec mov r9, r2 add r0, r9 movs r1, 0x39 @@ -347926,7 +336653,7 @@ _080A998C: lsrs r1, 24 adds r0, r4, 0 bl sub_806A068 - ldr r5, _080A9AB8 + ldr r5, =0x0202499c adds r0, r7, 0 movs r1, 0x2 bl sub_80A5C6C @@ -347942,10 +336669,10 @@ _080A998C: adds r1, r4, 0 mov r2, r8 bl obj_add_from_template_forward_search - ldr r1, _080A9ABC + ldr r1, =0x020241e4 adds r4, r7, r1 strb r0, [r4] - ldr r5, _080A9AC0 + ldr r5, =0x02020630 ldrb r0, [r4] lsls r1, r0, 4 adds r1, r0 @@ -347964,7 +336691,7 @@ _080A998C: adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _080A9AC4 + ldr r1, =nullsub_12 + 1 str r1, [r0] ldrb r1, [r4] lsls r0, r1, 4 @@ -347990,18 +336717,18 @@ _080A998C: adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _080A9AC8 + ldr r1, =0x020244e4 adds r1, r7, r1 ldrb r1, [r1] bl obj_anim_image_start - ldr r0, _080A9ACC + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] ldr r1, [sp] adds r0, r1, r0 _080A9A50: ldrh r1, [r0, 0x2] - ldr r0, _080A9AD0 + ldr r0, =0x00000181 cmp r1, r0 bne _080A9A70 ldrb r0, [r4] @@ -348011,21 +336738,21 @@ _080A9A50: adds r0, r5, 0 adds r0, 0x8 adds r1, r0 - ldr r0, _080A9AD4 - ldr r2, _080A9AD8 + ldr r0, =0x08309aac + ldr r2, =0x00000604 adds r0, r2 ldr r0, [r0] str r0, [r1] _080A9A70: - ldr r1, _080A9AC0 - ldr r0, _080A9ABC + ldr r1, =0x02020630 + ldr r0, =0x020241e4 adds r0, r7, r0 ldrb r0, [r0] lsls r2, r0, 4 adds r2, r0 lsls r2, 2 adds r2, r1 - ldr r0, _080A9ACC + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] ldr r1, [sp] @@ -348051,17 +336778,7 @@ _080A9AA0: pop {r0} bx r0 .align 2, 0 -_080A9AB0: .4byte 0x0202406e -_080A9AB4: .4byte 0x020244ec -_080A9AB8: .4byte 0x0202499c -_080A9ABC: .4byte 0x020241e4 -_080A9AC0: .4byte 0x02020630 -_080A9AC4: .4byte nullsub_12 + 1 -_080A9AC8: .4byte 0x020244e4 -_080A9ACC: .4byte 0x020244d0 -_080A9AD0: .4byte 0x00000181 -_080A9AD4: .4byte 0x08309aac -_080A9AD8: .4byte 0x00000604 + .pool thumb_func_end sub_80A9708 thumb_func_start sub_80A9ADC @@ -348069,13 +336786,13 @@ sub_80A9ADC: @ 80A9ADC push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080A9B04 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 bcc _080A9AEC b _080A9C5E _080A9AEC: - ldr r0, _080A9B08 + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x80 ands r1, r2 @@ -348086,8 +336803,7 @@ _080A9AEC: bl battle_make_oam_safari_battle b _080A9B24 .align 2, 0 -_080A9B04: .4byte 0x0202406c -_080A9B08: .4byte 0x02022fec + .pool _080A9B0C: ldr r0, [r0] movs r1, 0x80 @@ -348104,7 +336820,7 @@ _080A9B1E: _080A9B24: lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080A9B60 + ldr r0, =0x03005d70 adds r4, r5, r0 strb r6, [r4] adds r0, r5, 0 @@ -348117,53 +336833,49 @@ _080A9B24: cmp r0, 0 beq _080A9B6C ldrb r0, [r4] - ldr r1, _080A9B64 + ldr r1, =0x0202406e lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080A9B68 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe b _080A9BB8 .align 2, 0 -_080A9B60: .4byte 0x03005d70 -_080A9B64: .4byte 0x0202406e -_080A9B68: .4byte 0x02024744 + .pool _080A9B6C: - ldr r0, _080A9B94 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 beq _080A9BA0 ldrb r0, [r4] - ldr r1, _080A9B98 + ldr r1, =0x0202406e lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080A9B9C + ldr r2, =0x020244ec adds r1, r2 movs r2, 0xA bl healthbar_draw_field_maybe b _080A9BB8 .align 2, 0 -_080A9B94: .4byte 0x02022fec -_080A9B98: .4byte 0x0202406e -_080A9B9C: .4byte 0x020244ec + .pool _080A9BA0: ldrb r0, [r4] - ldr r1, _080A9BE4 + ldr r1, =0x0202406e lsls r4, r5, 1 adds r1, r4, r1 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _080A9BE8 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -348181,18 +336893,16 @@ _080A9BB8: cmp r0, 0x2 bne _080A9BF0 _080A9BD4: - ldr r0, _080A9BEC + ldr r0, =0x03005d70 adds r0, r5, r0 ldrb r0, [r0] movs r1, 0x1 bl nullsub_30 b _080A9BFC .align 2, 0 -_080A9BE4: .4byte 0x0202406e -_080A9BE8: .4byte 0x020244ec -_080A9BEC: .4byte 0x03005d70 + .pool _080A9BF0: - ldr r0, _080A9C28 + ldr r0, =0x03005d70 adds r0, r5, r0 ldrb r0, [r0] movs r1, 0 @@ -348203,12 +336913,12 @@ _080A9BFC: lsls r0, 24 cmp r0, 0 beq _080A9C34 - ldr r0, _080A9C2C + ldr r0, =0x0202406e adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A9C30 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 bl pokemon_getattr @@ -348218,22 +336928,20 @@ _080A9BFC: bl sub_8072984 b _080A9C5E .align 2, 0 -_080A9C28: .4byte 0x03005d70 -_080A9C2C: .4byte 0x0202406e -_080A9C30: .4byte 0x02024744 + .pool _080A9C34: - ldr r0, _080A9C64 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 ands r0, r1 cmp r0, 0 bne _080A9C5E - ldr r0, _080A9C68 + ldr r0, =0x0202406e adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080A9C6C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 bl pokemon_getattr @@ -348246,9 +336954,7 @@ _080A9C5E: pop {r0} bx r0 .align 2, 0 -_080A9C64: .4byte 0x02022fec -_080A9C68: .4byte 0x0202406e -_080A9C6C: .4byte 0x020244ec + .pool thumb_func_end sub_80A9ADC thumb_func_start sub_80A9C70 @@ -348262,20 +336968,20 @@ sub_80A9C70: @ 80A9C70 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _080A9D14 + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r6, [r0] - ldr r0, _080A9D18 + ldr r0, =sub_80A9DB4 + 1 movs r1, 0xA bl AddTask lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _080A9D1C + ldr r0, =0x08524f84 bl gpu_tile_obj_decompress_and_load3 - ldr r0, _080A9D20 + ldr r0, =0x0852588c bl gpu_pal_obj_decompress_and_apply3 - ldr r1, _080A9D24 + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -348288,7 +336994,7 @@ sub_80A9C70: @ 80A9C70 strh r0, [r1, 0xA] movs r5, 0 lsls r0, r6, 4 - ldr r7, _080A9D28 + ldr r7, =0x02020630 adds r0, r6 lsls r0, 2 adds r6, r0, r7 @@ -348299,7 +337005,7 @@ _080A9CC4: adds r2, 0x20 lsls r2, 16 asrs r2, 16 - ldr r0, _080A9D2C + ldr r0, =0x0853ef60 movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 24 @@ -348334,20 +337040,14 @@ _080A9D08: bls _080A9CC4 b _080A9D90 .align 2, 0 -_080A9D14: .4byte 0x020241e4 -_080A9D18: .4byte sub_80A9DB4 + 1 -_080A9D1C: .4byte 0x08524f84 -_080A9D20: .4byte 0x0852588c -_080A9D24: .4byte 0x03005e00 -_080A9D28: .4byte 0x02020630 -_080A9D2C: .4byte 0x0853ef60 + .pool _080A9D30: movs r0, 0xF8 lsls r0, 7 strh r0, [r1, 0xA] movs r5, 0 lsls r0, r6, 4 - ldr r7, _080A9DAC + ldr r7, =0x02020630 adds r0, r6 lsls r0, 2 adds r6, r0, r7 @@ -348358,7 +337058,7 @@ _080A9D42: subs r2, 0x20 lsls r2, 16 asrs r2, 16 - ldr r0, _080A9DB0 + ldr r0, =0x0853ef60 movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 24 @@ -348392,7 +337092,7 @@ _080A9D86: cmp r5, 0x9 bls _080A9D42 _080A9D90: - ldr r0, _080A9DAC + ldr r0, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -348406,8 +337106,7 @@ _080A9D90: pop {r1} bx r1 .align 2, 0 -_080A9DAC: .4byte 0x02020630 -_080A9DB0: .4byte 0x0853ef60 + .pool thumb_func_end sub_80A9C70 thumb_func_start sub_80A9DB4 @@ -348415,7 +337114,7 @@ sub_80A9DB4: @ 80A9DB4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080A9E0C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -348455,7 +337154,7 @@ sub_80A9DB4: @ 80A9DB4 strh r0, [r4, 0x12] b _080A9E3E .align 2, 0 -_080A9E0C: .4byte 0x03005e00 + .pool _080A9E10: ldrh r1, [r4, 0x10] subs r0, r1, 0x1 @@ -348502,13 +337201,13 @@ sub_80A9E44: @ 80A9E44 negs r1, r1 ands r1, r0 strb r1, [r3] - ldr r1, _080A9E6C + ldr r1, =sub_80A9E78 + 1 str r1, [r2, 0x1C] adds r0, r2, 0 bl _call_via_r1 b _080A9E74 .align 2, 0 -_080A9E6C: .4byte sub_80A9E78 + 1 + .pool _080A9E70: subs r0, r1, 0x1 strh r0, [r2, 0x3A] @@ -348587,13 +337286,13 @@ sub_80A9EF4: @ 80A9EF4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _080A9FA4 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 lsrs r0, 8 - ldr r1, _080A9FA8 + ldr r1, =0xffe00000 adds r0, r1 lsrs r5, r0, 16 ldrb r0, [r4] @@ -348601,7 +337300,7 @@ sub_80A9EF4: @ 80A9EF4 bl sub_80A5C6C lsls r0, 24 lsrs r0, 8 - ldr r1, _080A9FAC + ldr r1, =0xffdc0000 adds r0, r1 lsrs r4, r0, 16 bl sub_80A4DF0 @@ -348609,7 +337308,7 @@ sub_80A9EF4: @ 80A9EF4 cmp r0, 0 beq _080A9F32 lsls r0, r5, 16 - ldr r1, _080A9FB0 + ldr r1, =0xfffa0000 adds r0, r1 lsrs r5, r0, 16 _080A9F32: @@ -348621,7 +337320,7 @@ _080A9F32: lsls r1, 5 movs r0, 0x52 bl lcd_io_set - ldr r0, _080A9FB4 + ldr r0, =0x0853ef48 lsls r1, r5, 16 asrs r1, 16 lsls r2, r4, 16 @@ -348630,13 +337329,13 @@ _080A9F32: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080A9FB8 + ldr r0, =0x0000271a bl gpu_tile_obj_tag_get_range_start lsls r0, 16 - ldr r1, _080A9FBC + ldr r1, =0xffff0000 cmp r0, r1 bne _080A9F7C - ldr r1, _080A9FC0 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -348650,33 +337349,23 @@ _080A9F7C: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _080A9FC0 + ldr r1, =0x02020630 adds r0, r1 - ldr r1, _080A9FC4 + ldr r1, =0x0853ef40 bl obj_set_f18_to_r0_f42_to_40 - ldr r1, _080A9FC8 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 strh r4, [r0, 0x26] - ldr r1, _080A9FCC + ldr r1, =sub_80A9FD0 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080A9FA4: .4byte 0x02038437 -_080A9FA8: .4byte 0xffe00000 -_080A9FAC: .4byte 0xffdc0000 -_080A9FB0: .4byte 0xfffa0000 -_080A9FB4: .4byte 0x0853ef48 -_080A9FB8: .4byte 0x0000271a -_080A9FBC: .4byte 0xffff0000 -_080A9FC0: .4byte 0x02020630 -_080A9FC4: .4byte 0x0853ef40 -_080A9FC8: .4byte 0x03005e00 -_080A9FCC: .4byte sub_80A9FD0 + 1 + .pool thumb_func_end sub_80A9EF4 thumb_func_start sub_80A9FD0 @@ -348684,7 +337373,7 @@ sub_80A9FD0: @ 80A9FD0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080A9FFC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -348697,14 +337386,13 @@ sub_80A9FD0: @ 80A9FD0 asrs r0, 16 cmp r0, 0xA bne _080AA004 - ldr r0, _080AA000 + ldr r0, =sub_80AA020 + 1 str r0, [r1] movs r0, 0 strh r0, [r1, 0xA] b _080AA01A .align 2, 0 -_080A9FFC: .4byte 0x03005e00 -_080AA000: .4byte sub_80AA020 + 1 + .pool _080AA004: lsls r0, r2, 24 lsrs r0, 24 @@ -348727,11 +337415,11 @@ sub_80AA020: @ 80AA020 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080AA0B8 + ldr r0, =0x0000271a bl gpu_pal_tags_index_of lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080AA0BC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -348751,10 +337439,10 @@ sub_80AA020: @ 80AA020 asrs r0, 16 cmp r0, 0x3 bne _080AA0B0 - ldr r3, _080AA0C0 + ldr r3, =0x02037b14 lsls r2, 4 mov r12, r2 - ldr r1, _080AA0C4 + ldr r1, =0x0000010d add r1, r12 lsls r1, 1 adds r1, r3 @@ -348766,7 +337454,7 @@ sub_80AA020: @ 80AA020 adds r2, r3 ldrh r0, [r2] strh r0, [r1] - ldr r0, _080AA0C8 + ldr r0, =0x0000010f add r0, r12 lsls r0, 1 adds r0, r3 @@ -348792,19 +337480,14 @@ sub_80AA020: @ 80AA020 bne _080AA0B0 movs r0, 0x9 strh r0, [r5, 0xA] - ldr r0, _080AA0CC + ldr r0, =sub_80AA0D0 + 1 str r0, [r5] _080AA0B0: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080AA0B8: .4byte 0x0000271a -_080AA0BC: .4byte 0x03005e00 -_080AA0C0: .4byte 0x02037b14 -_080AA0C4: .4byte 0x0000010d -_080AA0C8: .4byte 0x0000010f -_080AA0CC: .4byte sub_80AA0D0 + 1 + .pool thumb_func_end sub_80AA020 thumb_func_start sub_80AA0D0 @@ -348812,7 +337495,7 @@ sub_80AA0D0: @ 80AA0D0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080AA100 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -348827,14 +337510,13 @@ sub_80AA0D0: @ 80AA0D0 negs r1, r1 cmp r0, r1 bne _080AA108 - ldr r0, _080AA104 + ldr r0, =sub_80AA124 + 1 str r0, [r2] movs r0, 0 strh r0, [r2, 0xA] b _080AA11E .align 2, 0 -_080AA100: .4byte 0x03005e00 -_080AA104: .4byte sub_80AA124 + 1 + .pool _080AA108: lsls r0, r3, 24 lsrs r0, 24 @@ -348857,7 +337539,7 @@ sub_80AA124: @ 80AA124 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r1, _080AA164 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -348875,7 +337557,7 @@ sub_80AA124: @ 80AA124 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080AA168 + ldr r0, =0x02020630 adds r4, r0 adds r0, r4, 0 bl obj_free_rotscale_entry @@ -348883,8 +337565,7 @@ sub_80AA124: @ 80AA124 bl obj_delete_and_free_tiles b _080AA186 .align 2, 0 -_080AA164: .4byte 0x03005e00 -_080AA168: .4byte 0x02020630 + .pool _080AA16C: cmp r0, 0x27 bne _080AA186 @@ -348908,7 +337589,7 @@ sub_80AA18C: @ 80AA18C lsls r0, 24 lsrs r4, r0, 24 movs r3, 0 - ldr r0, _080AA1B0 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrh r0, [r0] @@ -348918,13 +337599,12 @@ sub_80AA18C: @ 80AA18C b _080AA328 _080AA1A4: lsls r0, 2 - ldr r1, _080AA1B4 + ldr r1, =_080AA1B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AA1B0: .4byte 0x020244d0 -_080AA1B4: .4byte _080AA1B8 + .pool .align 2, 0 _080AA1B8: .4byte _080AA268 @@ -349113,19 +337793,19 @@ _080AA328: bl move_anim_task_del b _080AA352 _080AA330: - ldr r0, _080AA358 + ldr r0, =0x0203841e movs r1, 0 strh r5, [r0] strh r2, [r0, 0x2] strh r1, [r0, 0x4] strh r1, [r0, 0x6] strh r3, [r0, 0x8] - ldr r1, _080AA35C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080AA360 + ldr r1, =sub_8116EB4 + 1 str r1, [r0] adds r0, r4, 0 bl _call_via_r1 @@ -349134,9 +337814,7 @@ _080AA352: pop {r0} bx r0 .align 2, 0 -_080AA358: .4byte 0x0203841e -_080AA35C: .4byte 0x03005e00 -_080AA360: .4byte sub_8116EB4 + 1 + .pool thumb_func_end sub_80AA18C thumb_func_start move_anim_start_t2 @@ -349147,19 +337825,19 @@ move_anim_start_t2: @ 80AA364 lsrs r4, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, _080AA3A0 + ldr r0, =0x02038436 strb r4, [r0] - ldr r0, _080AA3A4 + ldr r0, =0x02038437 strb r4, [r0] - ldr r0, _080AA3A8 + ldr r0, =0x082c92fc movs r2, 0 bl move_something - ldr r0, _080AA3AC + ldr r0, =task0A_80788BC + 1 movs r1, 0xA bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080AA3B0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -349169,11 +337847,7 @@ move_anim_start_t2: @ 80AA364 pop {r0} bx r0 .align 2, 0 -_080AA3A0: .4byte 0x02038436 -_080AA3A4: .4byte 0x02038437 -_080AA3A8: .4byte 0x082c92fc -_080AA3AC: .4byte task0A_80788BC + 1 -_080AA3B0: .4byte 0x03005e00 + .pool thumb_func_end move_anim_start_t2 thumb_func_start task0A_80788BC @@ -349181,16 +337855,16 @@ task0A_80788BC: @ 80AA3B4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080AA3FC + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _080AA400 + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _080AA3F6 - ldr r0, _080AA404 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r1, _080AA408 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -349214,17 +337888,14 @@ _080AA3F6: pop {r0} bx r0 .align 2, 0 -_080AA3FC: .4byte 0x020383f8 -_080AA400: .4byte 0x020383fd -_080AA404: .4byte 0x020244d0 -_080AA408: .4byte 0x03005e00 + .pool thumb_func_end task0A_80788BC thumb_func_start sub_80AA40C sub_80AA40C: @ 80AA40C push {lr} adds r3, r0, 0 - ldr r2, _080AA438 + ldr r2, =0x03005e00 movs r0, 0x30 ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -349244,7 +337915,7 @@ sub_80AA40C: @ 80AA40C strh r0, [r3, 0x22] b _080AA46A .align 2, 0 -_080AA438: .4byte 0x03005e00 + .pool _080AA43C: ldrh r1, [r3, 0x22] movs r2, 0x22 @@ -349262,7 +337933,7 @@ _080AA44A: subs r0, r1, 0x1 strh r0, [r3, 0x2E] _080AA458: - ldr r0, _080AA470 + ldr r0, =0x0853ff70 movs r2, 0x2E ldrsh r1, [r3, r2] lsls r1, 1 @@ -349274,14 +337945,14 @@ _080AA46A: pop {r0} bx r0 .align 2, 0 -_080AA470: .4byte 0x0853ff70 + .pool thumb_func_end sub_80AA40C thumb_func_start sub_80AA474 sub_80AA474: @ 80AA474 push {lr} adds r3, r0, 0 - ldr r2, _080AA49C + ldr r2, =0x03005e00 movs r0, 0x30 ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -349300,7 +337971,7 @@ sub_80AA474: @ 80AA474 movs r0, 0x42 b _080AA4AC .align 2, 0 -_080AA49C: .4byte 0x03005e00 + .pool _080AA4A0: ldrh r1, [r3, 0x22] movs r2, 0x22 @@ -349353,7 +338024,7 @@ _080AA4E8: sub_80AA4EC: @ 80AA4EC push {r4-r7,lr} lsls r0, 16 - ldr r2, _080AA53C + ldr r2, =0xffc00000 adds r0, r2 lsrs r0, 16 movs r6, 0 @@ -349361,7 +338032,7 @@ sub_80AA4EC: @ 80AA4EC _080AA4FA: lsls r5, r0, 16 asrs r5, 16 - ldr r0, _080AA540 + ldr r0, =0x085400d8 adds r1, r5, 0 asrs r2, r7, 16 movs r3, 0 @@ -349371,7 +338042,7 @@ _080AA4FA: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080AA544 + ldr r0, =0x02020630 adds r4, r0 adds r0, r4, 0 adds r1, r6, 0 @@ -349390,16 +338061,14 @@ _080AA4FA: pop {r0} bx r0 .align 2, 0 -_080AA53C: .4byte 0xffc00000 -_080AA540: .4byte 0x085400d8 -_080AA544: .4byte 0x02020630 + .pool thumb_func_end sub_80AA4EC thumb_func_start sub_80AA548 sub_80AA548: @ 80AA548 push {r4-r6,lr} lsls r0, 16 - ldr r2, _080AA598 + ldr r2, =0xffc00000 adds r0, r2 lsrs r0, 16 movs r5, 0 @@ -349407,7 +338076,7 @@ sub_80AA548: @ 80AA548 _080AA556: lsls r4, r0, 16 asrs r4, 16 - ldr r0, _080AA59C + ldr r0, =0x085400d8 adds r1, r4, 0 asrs r2, r6, 16 movs r3, 0 @@ -349417,7 +338086,7 @@ _080AA556: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080AA5A0 + ldr r0, =0x02020630 adds r2, r0 adds r1, r5, 0x5 lsls r1, 24 @@ -349436,9 +338105,7 @@ _080AA556: pop {r0} bx r0 .align 2, 0 -_080AA598: .4byte 0xffc00000 -_080AA59C: .4byte 0x085400d8 -_080AA5A0: .4byte 0x02020630 + .pool thumb_func_end sub_80AA548 thumb_func_start title_screen_logo_shine_obj_callback_type1 @@ -349448,7 +338115,7 @@ title_screen_logo_shine_obj_callback_type1: @ 80AA5A4 ldrh r2, [r3, 0x20] movs r0, 0x20 ldrsh r1, [r3, r0] - ldr r0, _080AA5DC + ldr r0, =0x0000010f cmp r1, r0 bgt _080AA63C movs r4, 0x2E @@ -349472,7 +338139,7 @@ title_screen_logo_shine_obj_callback_type1: @ 80AA5A4 adds r0, r1, 0x1 b _080AA5F6 .align 2, 0 -_080AA5DC: .4byte 0x0000010f + .pool _080AA5E0: ldrh r1, [r3, 0x30] movs r4, 0x30 @@ -349507,24 +338174,23 @@ _080AA5F8: cmp r0, 0x90 bne _080AA62C _080AA61C: - ldr r1, _080AA624 - ldr r0, _080AA628 + ldr r1, =0x02037b14 + ldr r0, =0x000033f8 strh r0, [r1] b _080AA630 .align 2, 0 -_080AA624: .4byte 0x02037b14 -_080AA628: .4byte 0x000033f8 + .pool _080AA62C: - ldr r0, _080AA638 + ldr r0, =0x02037b14 strh r2, [r0] _080AA630: adds r0, r4, 0x4 strh r0, [r3, 0x20] b _080AA648 .align 2, 0 -_080AA638: .4byte 0x02037b14 + .pool _080AA63C: - ldr r1, _080AA650 + ldr r1, =0x02037b14 movs r0, 0 strh r0, [r1] adds r0, r3, 0 @@ -349534,7 +338200,7 @@ _080AA648: pop {r0} bx r0 .align 2, 0 -_080AA650: .4byte 0x02037b14 + .pool thumb_func_end title_screen_logo_shine_obj_callback_type1 thumb_func_start title_screen_logo_shine_obj_callback_type2 @@ -349544,7 +338210,7 @@ title_screen_logo_shine_obj_callback_type2: @ 80AA654 ldrh r3, [r2, 0x20] movs r0, 0x20 ldrsh r1, [r2, r0] - ldr r0, _080AA66C + ldr r0, =0x0000010f cmp r1, r0 bgt _080AA670 adds r0, r3, 0 @@ -349552,7 +338218,7 @@ title_screen_logo_shine_obj_callback_type2: @ 80AA654 strh r0, [r2, 0x20] b _080AA676 .align 2, 0 -_080AA66C: .4byte 0x0000010f + .pool _080AA670: adds r0, r2, 0 bl obj_delete_and_free_tiles @@ -349581,14 +338247,14 @@ _080AA698: cmp r5, 0x2 bne _080AA766 _080AA69C: - ldr r0, _080AA6C8 + ldr r0, =0x08540124 movs r1, 0 movs r2, 0x44 movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080AA6CC + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -349603,10 +338269,9 @@ _080AA69C: strh r5, [r0, 0x2E] b _080AA766 .align 2, 0 -_080AA6C8: .4byte 0x08540124 -_080AA6CC: .4byte 0x02020630 + .pool _080AA6D0: - ldr r0, _080AA774 + ldr r0, =0x08540124 mov r9, r0 movs r1, 0 movs r2, 0x44 @@ -349614,7 +338279,7 @@ _080AA6D0: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r2, r0, 24 - ldr r6, _080AA778 + ldr r6, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -349648,7 +338313,7 @@ _080AA6D0: adds r5, r6, 0 adds r5, 0x1C adds r0, r1, r5 - ldr r2, _080AA77C + ldr r2, =title_screen_logo_shine_obj_callback_type2 + 1 mov r10, r2 str r2, [r0] adds r1, r6 @@ -349687,9 +338352,7 @@ _080AA766: pop {r0} bx r0 .align 2, 0 -_080AA774: .4byte 0x08540124 -_080AA778: .4byte 0x02020630 -_080AA77C: .4byte title_screen_logo_shine_obj_callback_type2 + 1 + .pool thumb_func_end title_screen_add_logo_shine_obj thumb_func_start title_screen_vblank_callback @@ -349699,21 +338362,21 @@ title_screen_vblank_callback: @ 80AA780 bl copy_super_sprites_to_oam bl copy_queue_process bl copy_pal_bg_faded_to_pal_ram - ldr r0, _080AA7A0 + ldr r0, =0x02022e1a ldrh r1, [r0] movs r0, 0x16 bl lcd_io_set pop {r0} bx r0 .align 2, 0 -_080AA7A0: .4byte 0x02022e1a + .pool thumb_func_end title_screen_vblank_callback thumb_func_start c2_title_screen_1 c2_title_screen_1: @ 80AA7A4 push {r4,lr} sub sp, 0x14 - ldr r0, _080AA7C0 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -349721,13 +338384,12 @@ c2_title_screen_1: @ 80AA7A4 cmp r0, 0x5 bhi _080AA7E0 lsls r0, 2 - ldr r1, _080AA7C4 + ldr r1, =_080AA7C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AA7C0: .4byte 0x030022c0 -_080AA7C4: .4byte _080AA7C8 + .pool .align 2, 0 _080AA7C8: .4byte _080AA7E0 @@ -349750,7 +338412,7 @@ _080AA7E0: bl lcd_io_set movs r1, 0xA0 lsls r1, 19 - ldr r2, _080AA8A8 + ldr r2, =0x00007fff adds r0, r2, 0 strh r0, [r1] movs r0, 0 @@ -349786,13 +338448,13 @@ _080AA7E0: add r1, sp, 0xC movs r0, 0 strh r0, [r1] - ldr r1, _080AA8AC + ldr r1, =0x040000d4 add r0, sp, 0xC str r0, [r1] movs r0, 0xC0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _080AA8B0 + ldr r0, =0x8100c000 str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r2, 0 @@ -349802,19 +338464,19 @@ _080AA7E0: movs r0, 0xE0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _080AA8B4 + ldr r0, =0x85000100 str r0, [r1, 0x8] ldr r0, [r1, 0x8] add r0, sp, 0xC strh r2, [r0] str r0, [r1] - ldr r0, _080AA8B8 + ldr r0, =0x05000002 str r0, [r1, 0x4] - ldr r0, _080AA8BC + ldr r0, =0x810001ff str r0, [r1, 0x8] ldr r0, [r1, 0x8] bl sub_80A1A74 - ldr r0, _080AA8C0 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -349822,59 +338484,53 @@ _080AA7E0: strb r1, [r0] b _080AAB1E .align 2, 0 -_080AA8A8: .4byte 0x00007fff -_080AA8AC: .4byte 0x040000d4 -_080AA8B0: .4byte 0x8100c000 -_080AA8B4: .4byte 0x85000100 -_080AA8B8: .4byte 0x05000002 -_080AA8BC: .4byte 0x810001ff -_080AA8C0: .4byte 0x030022c0 + .pool _080AA8C4: - ldr r0, _080AA94C + ldr r0, =0x08dde690 movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _080AA950 - ldr r1, _080AA954 + ldr r0, =0x08de0644 + ldr r1, =0x06004800 bl LZ77UnCompVram - ldr r0, _080AA958 + ldr r0, =0x08dde258 movs r2, 0xF0 lsls r2, 1 movs r1, 0 bl gpu_pal_apply - ldr r0, _080AA95C - ldr r1, _080AA960 + ldr r0, =0x0853f058 + ldr r1, =0x06008000 bl LZ77UnCompVram - ldr r0, _080AA964 - ldr r1, _080AA968 + ldr r0, =0x0853f83c + ldr r1, =0x0600d000 bl LZ77UnCompVram - ldr r0, _080AA96C - ldr r1, _080AA970 + ldr r0, =0x0853fc8c + ldr r1, =0x0600c000 bl LZ77UnCompVram - ldr r0, _080AA974 - ldr r1, _080AA978 + ldr r0, =0x08dde458 + ldr r1, =0x0600d800 bl LZ77UnCompVram bl remove_some_task bl clear_tasks bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r1, _080AA97C + ldr r1, =0x0300301c movs r0, 0x9 strb r0, [r1] - ldr r0, _080AA980 + ldr r0, =0x08540048 bl gpu_tile_obj_decompress_and_load - ldr r0, _080AA984 + ldr r0, =0x085400f0 bl gpu_tile_obj_decompress_and_load - ldr r0, _080AA988 + ldr r0, =0x0854013c bl gpu_tile_obj_decompress_and_load - ldr r0, _080AA98C + ldr r0, =0x08dde438 movs r1, 0x80 lsls r1, 1 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _080AA990 + ldr r0, =0x08540100 bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _080AA994 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -349882,32 +338538,14 @@ _080AA8C4: strb r1, [r0] b _080AAB1E .align 2, 0 -_080AA94C: .4byte 0x08dde690 -_080AA950: .4byte 0x08de0644 -_080AA954: .4byte 0x06004800 -_080AA958: .4byte 0x08dde258 -_080AA95C: .4byte 0x0853f058 -_080AA960: .4byte 0x06008000 -_080AA964: .4byte 0x0853f83c -_080AA968: .4byte 0x0600d000 -_080AA96C: .4byte 0x0853fc8c -_080AA970: .4byte 0x0600c000 -_080AA974: .4byte 0x08dde458 -_080AA978: .4byte 0x0600d800 -_080AA97C: .4byte 0x0300301c -_080AA980: .4byte 0x08540048 -_080AA984: .4byte 0x085400f0 -_080AA988: .4byte 0x0854013c -_080AA98C: .4byte 0x08dde438 -_080AA990: .4byte 0x08540100 -_080AA994: .4byte 0x030022c0 + .pool _080AA998: - ldr r0, _080AA9D0 + ldr r0, =task_title_screen_1 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080AA9D4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -349917,11 +338555,11 @@ _080AA998: lsls r0, 1 strh r0, [r1, 0x8] strh r2, [r1, 0xA] - ldr r0, _080AA9D8 + ldr r0, =0x0000fff0 strh r0, [r1, 0xC] subs r0, 0x10 strh r0, [r1, 0xE] - ldr r0, _080AA9DC + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -349929,22 +338567,19 @@ _080AA998: strb r1, [r0] b _080AAB1E .align 2, 0 -_080AA9D0: .4byte task_title_screen_1 + 1 -_080AA9D4: .4byte 0x03005e00 -_080AA9D8: .4byte 0x0000fff0 -_080AA9DC: .4byte 0x030022c0 + .pool _080AA9E0: movs r0, 0x1 negs r0, r0 - ldr r1, _080AAA08 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0x1 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _080AAA0C + ldr r0, =title_screen_vblank_callback + 1 bl SetVBlankCallback - ldr r0, _080AAA10 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -349952,9 +338587,7 @@ _080AA9E0: strb r1, [r0] b _080AAB1E .align 2, 0 -_080AAA08: .4byte 0x0000ffff -_080AAA0C: .4byte title_screen_vblank_callback + 1 -_080AAA10: .4byte 0x030022c0 + .pool _080AAA14: movs r2, 0x80 lsls r2, 1 @@ -349966,7 +338599,7 @@ _080AAA14: lsls r1, 8 movs r0, 0x28 bl lcd_io_set - ldr r4, _080AAACC + ldr r4, =0x0000ffff movs r0, 0x2A adds r1, r4, 0 bl lcd_io_set @@ -349989,10 +338622,10 @@ _080AAA14: movs r0, 0x46 movs r1, 0 bl lcd_io_set - ldr r1, _080AAAD0 + ldr r1, =0x00001f1f movs r0, 0x48 bl lcd_io_set - ldr r1, _080AAAD4 + ldr r1, =0x00003f1f movs r0, 0x4A bl lcd_io_set movs r0, 0x50 @@ -350004,23 +338637,23 @@ _080AAA14: movs r0, 0x54 movs r1, 0xC bl lcd_io_set - ldr r1, _080AAAD8 + ldr r1, =0x00001a0b movs r0, 0x8 bl lcd_io_set - ldr r1, _080AAADC + ldr r1, =0x00001b0e movs r0, 0xA bl lcd_io_set - ldr r1, _080AAAE0 + ldr r1, =0x00004981 movs r0, 0xC bl lcd_io_set movs r0, 0x1 bl enable_irqs - ldr r1, _080AAAE4 + ldr r1, =0x0000b441 movs r0, 0 bl lcd_io_set - ldr r0, _080AAAE8 + ldr r0, =0x0000019d bl m4aSongNumStart - ldr r0, _080AAAEC + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -350028,15 +338661,7 @@ _080AAA14: strb r1, [r0] b _080AAB1E .align 2, 0 -_080AAACC: .4byte 0x0000ffff -_080AAAD0: .4byte 0x00001f1f -_080AAAD4: .4byte 0x00003f1f -_080AAAD8: .4byte 0x00001a0b -_080AAADC: .4byte 0x00001b0e -_080AAAE0: .4byte 0x00004981 -_080AAAE4: .4byte 0x0000b441 -_080AAAE8: .4byte 0x0000019d -_080AAAEC: .4byte 0x030022c0 + .pool _080AAAF0: bl fade_and_return_progress_probably lsls r0, 24 @@ -350055,7 +338680,7 @@ _080AAAF0: movs r2, 0x4 movs r3, 0x4 bl sub_80BA384 - ldr r0, _080AAB28 + ldr r0, =c2_title_screen_2 + 1 bl set_callback2 _080AAB1E: add sp, 0x14 @@ -350063,7 +338688,7 @@ _080AAB1E: pop {r0} bx r0 .align 2, 0 -_080AAB28: .4byte c2_title_screen_2 + 1 + .pool thumb_func_end c2_title_screen_1 thumb_func_start c2_title_screen_2 @@ -350082,11 +338707,11 @@ task_title_screen_1: @ 80AAB44 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080AAB98 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF ands r0, r1 - ldr r6, _080AAB9C + ldr r6, =0x03005e00 cmp r0, 0 bne _080AAB6A lsls r0, r5, 2 @@ -350123,15 +338748,14 @@ _080AAB7C: bl title_screen_add_logo_shine_obj b _080AABAA .align 2, 0 -_080AAB98: .4byte 0x030022c0 -_080AAB9C: .4byte 0x03005e00 + .pool _080AABA0: cmp r0, 0x40 bne _080AABAA movs r0, 0x2 bl title_screen_add_logo_shine_obj _080AABAA: - ldr r0, _080AABBC + ldr r0, =0x03005e00 adds r1, r4, r5 lsls r1, 3 adds r1, r0 @@ -350140,9 +338764,9 @@ _080AABAA: strh r0, [r1, 0x8] b _080AAC32 .align 2, 0 -_080AABBC: .4byte 0x03005e00 + .pool _080AABC0: - ldr r1, _080AAC38 + ldr r1, =0x00001441 movs r0, 0 bl lcd_io_set movs r0, 0x48 @@ -350151,7 +338775,7 @@ _080AABC0: movs r0, 0x4A movs r1, 0 bl lcd_io_set - ldr r1, _080AAC3C + ldr r1, =0x00003f50 movs r0, 0x50 bl lcd_io_set movs r0, 0x52 @@ -350160,14 +338784,14 @@ _080AABC0: movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r0, _080AAC40 + ldr r0, =0x08540018 movs r1, 0x62 movs r2, 0x2 movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r4, _080AAC44 + ldr r4, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -350175,7 +338799,7 @@ _080AABC0: movs r0, 0x40 strh r0, [r1, 0x2E] strh r5, [r1, 0x30] - ldr r0, _080AAC48 + ldr r0, =0x08540030 movs r1, 0xA2 movs r2, 0x2 movs r3, 0 @@ -350189,19 +338813,14 @@ _080AABC0: strh r5, [r1, 0x30] movs r0, 0x90 strh r0, [r6, 0x8] - ldr r0, _080AAC4C + ldr r0, =task_title_screen_2 + 1 str r0, [r6] _080AAC32: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080AAC38: .4byte 0x00001441 -_080AAC3C: .4byte 0x00003f50 -_080AAC40: .4byte 0x08540018 -_080AAC44: .4byte 0x02020630 -_080AAC48: .4byte 0x08540030 -_080AAC4C: .4byte task_title_screen_2 + 1 + .pool thumb_func_end task_title_screen_1 thumb_func_start task_title_screen_2 @@ -350209,11 +338828,11 @@ task_title_screen_2: @ 80AAC50 push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080AACA0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF ands r0, r1 - ldr r2, _080AACA4 + ldr r2, =0x03005e00 cmp r0, 0 bne _080AAC76 lsls r0, r4, 2 @@ -350236,7 +338855,7 @@ _080AAC76: strh r2, [r0, 0x8] adds r6, r3, 0 _080AAC88: - ldr r1, _080AACA4 + ldr r1, =0x03005e00 adds r0, r6, r4 lsls r0, 3 adds r5, r0, r1 @@ -350249,21 +338868,20 @@ _080AAC88: strh r0, [r5, 0x8] b _080AACE2 .align 2, 0 -_080AACA0: .4byte 0x030022c0 -_080AACA4: .4byte 0x03005e00 + .pool _080AACA8: movs r0, 0x1 strh r0, [r5, 0xA] - ldr r1, _080AAD50 + ldr r1, =0x00002142 movs r0, 0x50 bl lcd_io_set - ldr r1, _080AAD54 + ldr r1, =0x00000f06 movs r0, 0x52 bl lcd_io_set movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r1, _080AAD58 + ldr r1, =0x00001741 movs r0, 0 bl lcd_io_set movs r0, 0x80 @@ -350273,10 +338891,10 @@ _080AACA8: movs r1, 0x94 bl sub_80AA548 strh r7, [r5, 0x10] - ldr r0, _080AAD5C + ldr r0, =task_title_screen_3 + 1 str r0, [r5] _080AACE2: - ldr r2, _080AAD60 + ldr r2, =0x03005e00 adds r0, r6, r4 lsls r0, 3 adds r3, r0, r2 @@ -350331,11 +338949,7 @@ _080AAD20: pop {r0} bx r0 .align 2, 0 -_080AAD50: .4byte 0x00002142 -_080AAD54: .4byte 0x00000f06 -_080AAD58: .4byte 0x00001741 -_080AAD5C: .4byte task_title_screen_3 + 1 -_080AAD60: .4byte 0x03005e00 + .pool thumb_func_end task_title_screen_2 thumb_func_start task_title_screen_3 @@ -350344,7 +338958,7 @@ task_title_screen_3: @ 80AAD64 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _080AADA4 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -350361,30 +338975,28 @@ _080AAD84: bl play_sound_effect movs r0, 0x1 negs r0, r0 - ldr r1, _080AADA8 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080AADAC + ldr r0, =c2_title_menu_1 + 1 bl set_callback2 b _080AAE98 .align 2, 0 -_080AADA4: .4byte 0x030022c0 -_080AADA8: .4byte 0x0000ffff -_080AADAC: .4byte c2_title_menu_1 + 1 + .pool _080AADB0: ldrh r1, [r2, 0x2C] movs r0, 0x46 ands r0, r1 cmp r0, 0x46 bne _080AADC8 - ldr r0, _080AADC4 + ldr r0, =c2_clear_save_data_screen_1 + 1 bl set_callback2 b _080AAE98 .align 2, 0 -_080AADC4: .4byte c2_clear_save_data_screen_1 + 1 + .pool _080AADC8: movs r0, 0x26 ands r0, r1 @@ -350402,13 +339014,13 @@ _080AADC8: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080AADF8 + ldr r0, =c2_reset_rtc_screen_1 + 1 bl set_callback2 b _080AAE98 .align 2, 0 -_080AADF8: .4byte c2_reset_rtc_screen_1 + 1 + .pool _080AADFC: - ldr r0, _080AAE28 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x6 ands r0, r1 @@ -350423,12 +339035,11 @@ _080AADFC: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080AAE2C + ldr r0, =c2_berry_program_update_screen_1 + 1 bl set_callback2 b _080AAE98 .align 2, 0 -_080AAE28: .4byte 0x030022c0 -_080AAE2C: .4byte c2_berry_program_update_screen_1 + 1 + .pool _080AAE30: movs r0, 0x2C movs r1, 0 @@ -350436,7 +339047,7 @@ _080AAE30: movs r0, 0x2E movs r1, 0 bl lcd_io_set - ldr r1, _080AAEA0 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -350451,21 +339062,21 @@ _080AAE30: ldrh r0, [r3, 0x10] adds r0, 0x1 strh r0, [r3, 0x10] - ldr r2, _080AAEA4 + ldr r2, =0x02022e1a movs r1, 0x10 ldrsh r0, [r3, r1] lsrs r1, r0, 31 adds r0, r1 asrs r0, 1 strh r0, [r2] - ldr r1, _080AAEA8 + ldr r1, =0x02022e18 movs r0, 0 strh r0, [r1] _080AAE72: ldrb r0, [r3, 0x8] bl title_screen_update_rayquaza_ring_palette - ldr r0, _080AAEAC - ldr r1, _080AAEB0 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff ldrh r0, [r0, 0x4] cmp r0, 0 bne _080AAE98 @@ -350476,7 +339087,7 @@ _080AAE72: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080AAEB4 + ldr r0, =c2_show_copyright_and_intro_again_1 + 1 bl set_callback2 _080AAE98: add sp, 0x4 @@ -350484,12 +339095,7 @@ _080AAE98: pop {r0} bx r0 .align 2, 0 -_080AAEA0: .4byte 0x03005e00 -_080AAEA4: .4byte 0x02022e1a -_080AAEA8: .4byte 0x02022e18 -_080AAEAC: .4byte 0x03007420 -_080AAEB0: .4byte 0x0000ffff -_080AAEB4: .4byte c2_show_copyright_and_intro_again_1 + 1 + .pool thumb_func_end task_title_screen_3 thumb_func_start c2_title_menu_1 @@ -350499,13 +339105,13 @@ c2_title_menu_1: @ 80AAEB8 lsls r0, 24 cmp r0, 0 bne _080AAECA - ldr r0, _080AAED0 + ldr r0, =c2_title_menu_2 + 1 bl set_callback2 _080AAECA: pop {r0} bx r0 .align 2, 0 -_080AAED0: .4byte c2_title_menu_2 + 1 + .pool thumb_func_end c2_title_menu_1 thumb_func_start c2_show_copyright_and_intro_again_1 @@ -350515,13 +339121,13 @@ c2_show_copyright_and_intro_again_1: @ 80AAED4 lsls r0, 24 cmp r0, 0 bne _080AAEE6 - ldr r0, _080AAEEC + ldr r0, =c2_show_copyright_and_intro_again_2 + 1 bl set_callback2 _080AAEE6: pop {r0} bx r0 .align 2, 0 -_080AAEEC: .4byte c2_show_copyright_and_intro_again_2 + 1 + .pool thumb_func_end c2_show_copyright_and_intro_again_1 thumb_func_start c2_clear_save_data_screen_1 @@ -350531,13 +339137,13 @@ c2_clear_save_data_screen_1: @ 80AAEF0 lsls r0, 24 cmp r0, 0 bne _080AAF02 - ldr r0, _080AAF08 + ldr r0, =c2_clear_save_data_screen_2 + 1 bl set_callback2 _080AAF02: pop {r0} bx r0 .align 2, 0 -_080AAF08: .4byte c2_clear_save_data_screen_2 + 1 + .pool thumb_func_end c2_clear_save_data_screen_1 thumb_func_start c2_reset_rtc_screen_1 @@ -350547,13 +339153,13 @@ c2_reset_rtc_screen_1: @ 80AAF0C lsls r0, 24 cmp r0, 0 bne _080AAF1E - ldr r0, _080AAF24 + ldr r0, =sub_809EF88 + 1 bl set_callback2 _080AAF1E: pop {r0} bx r0 .align 2, 0 -_080AAF24: .4byte sub_809EF88 + 1 + .pool thumb_func_end c2_reset_rtc_screen_1 thumb_func_start c2_berry_program_update_screen_1 @@ -350564,13 +339170,13 @@ c2_berry_program_update_screen_1: @ 80AAF28 cmp r0, 0 bne _080AAF3E bl m4aMPlayAllStop - ldr r0, _080AAF44 + ldr r0, =sub_81BF384 + 1 bl set_callback2 _080AAF3E: pop {r0} bx r0 .align 2, 0 -_080AAF44: .4byte sub_81BF384 + 1 + .pool thumb_func_end c2_berry_program_update_screen_1 thumb_func_start title_screen_update_rayquaza_ring_palette @@ -350626,7 +339232,7 @@ _080AAF9C: thumb_func_start sub_80AAFA4 sub_80AAFA4: @ 80AAFA4 push {r4-r6,lr} - ldr r0, _080AB068 + ldr r0, =sub_80AB1B0 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r6, r0, 24 @@ -350638,23 +339244,23 @@ sub_80AAFA4: @ 80AAFA4 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _080AB06C + ldr r0, =0x0854c270 lsls r1, r5, 5 - ldr r2, _080AB070 + ldr r2, =0x02037914 adds r1, r2 - ldr r2, _080AB074 + ldr r2, =0x04000008 bl CpuSet bl sub_80AB294 - ldr r4, _080AB078 - ldr r1, _080AB07C + ldr r4, =0x02038454 + ldr r1, =0x000006d5 adds r0, r4, r1 strb r5, [r0] - ldr r0, _080AB080 + ldr r0, =0x00001201 bl gpu_pal_alloc_new - ldr r2, _080AB084 + ldr r2, =0x000006d4 adds r1, r4, r2 strb r0, [r1] - ldr r1, _080AB088 + ldr r1, =0x000006da adds r0, r4, r1 strb r6, [r0] adds r2, 0x4 @@ -350694,7 +339300,7 @@ sub_80AAFA4: @ 80AAFA4 lsls r2, 3 adds r0, r4, r2 strb r6, [r0] - ldr r0, _080AB08C + ldr r0, =0x000006c6 adds r1, r4, r0 movs r0, 0x3 strb r0, [r1] @@ -350706,10 +339312,10 @@ sub_80AAFA4: @ 80AAFA4 adds r1, r4, r2 movs r0, 0x1 strb r0, [r1] - ldr r0, _080AB090 + ldr r0, =sub_80AB160 + 1 movs r1, 0x50 bl AddTask - ldr r1, _080AB094 + ldr r1, =0x000006c9 adds r4, r1 strb r0, [r4] _080AB060: @@ -350717,18 +339323,7 @@ _080AB060: pop {r0} bx r0 .align 2, 0 -_080AB068: .4byte sub_80AB1B0 + 1 -_080AB06C: .4byte 0x0854c270 -_080AB070: .4byte 0x02037914 -_080AB074: .4byte 0x04000008 -_080AB078: .4byte 0x02038454 -_080AB07C: .4byte 0x000006d5 -_080AB080: .4byte 0x00001201 -_080AB084: .4byte 0x000006d4 -_080AB088: .4byte 0x000006da -_080AB08C: .4byte 0x000006c6 -_080AB090: .4byte sub_80AB160 + 1 -_080AB094: .4byte 0x000006c9 + .pool thumb_func_end sub_80AAFA4 thumb_func_start weather_set @@ -350744,8 +339339,8 @@ weather_set: @ 80AB098 beq _080AB0AE bl play_some_sound _080AB0AE: - ldr r1, _080AB0F0 - ldr r2, _080AB0F4 + ldr r1, =0x02038454 + ldr r2, =0x000006d1 adds r0, r1, r2 ldrb r0, [r0] cmp r0, r4 @@ -350756,32 +339351,28 @@ _080AB0AE: ldrb r0, [r0] cmp r0, r4 bne _080AB0D2 - ldr r0, _080AB0F8 + ldr r0, =0x0854c150 lsls r1, r4, 4 adds r1, r0 ldr r0, [r1] bl _call_via_r0 _080AB0D2: - ldr r1, _080AB0F0 - ldr r2, _080AB0FC + ldr r1, =0x02038454 + ldr r2, =0x000006d3 adds r0, r1, r2 movs r2, 0 strb r2, [r0] - ldr r3, _080AB0F4 + ldr r3, =0x000006d1 adds r0, r1, r3 strb r4, [r0] - ldr r0, _080AB100 + ldr r0, =0x000006ce adds r1, r0 strh r2, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_080AB0F0: .4byte 0x02038454 -_080AB0F4: .4byte 0x000006d1 -_080AB0F8: .4byte 0x0854c150 -_080AB0FC: .4byte 0x000006d3 -_080AB100: .4byte 0x000006ce + .pool thumb_func_end weather_set thumb_func_start sub_80AB104 @@ -350791,20 +339382,19 @@ sub_80AB104: @ 80AB104 lsls r4, 24 lsrs r4, 24 bl play_some_sound - ldr r0, _080AB128 + ldr r0, =0x02038454 movs r2, 0xDA lsls r2, 3 adds r1, r0, r2 strb r4, [r1] - ldr r1, _080AB12C + ldr r1, =0x000006d1 adds r0, r1 strb r4, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080AB128: .4byte 0x02038454 -_080AB12C: .4byte 0x000006d1 + .pool thumb_func_end sub_80AB104 thumb_func_start sub_80AB130 @@ -350814,7 +339404,7 @@ sub_80AB130: @ 80AB130 lsls r4, 24 lsrs r4, 24 bl play_some_sound - ldr r1, _080AB15C + ldr r1, =0x02038454 movs r2, 0xDA lsls r2, 3 adds r0, r1, r2 @@ -350831,7 +339421,7 @@ sub_80AB130: @ 80AB130 pop {r0} bx r0 .align 2, 0 -_080AB15C: .4byte 0x02038454 + .pool thumb_func_end sub_80AB130 thumb_func_start sub_80AB160 @@ -350839,14 +339429,14 @@ sub_80AB160: @ 80AB160 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _080AB1A0 + ldr r2, =0x02038454 movs r1, 0xD9 lsls r1, 3 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 beq _080AB198 - ldr r1, _080AB1A4 + ldr r1, =0x0854c150 movs r3, 0xDA lsls r3, 3 adds r0, r2, r3 @@ -350856,22 +339446,19 @@ sub_80AB160: @ 80AB160 adds r0, r1 ldr r0, [r0] bl _call_via_r0 - ldr r1, _080AB1A8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080AB1AC + ldr r1, =sub_80AB1B0 + 1 str r1, [r0] _080AB198: pop {r4} pop {r0} bx r0 .align 2, 0 -_080AB1A0: .4byte 0x02038454 -_080AB1A4: .4byte 0x0854c150 -_080AB1A8: .4byte 0x03005e00 -_080AB1AC: .4byte sub_80AB1B0 + 1 + .pool thumb_func_end sub_80AB160 thumb_func_start sub_80AB1B0 @@ -350880,17 +339467,17 @@ sub_80AB1B0: @ 80AB1B0 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r5, _080AB218 + ldr r5, =0x02038454 movs r0, 0xDA lsls r0, 3 adds r6, r5, r0 - ldr r1, _080AB21C + ldr r1, =0x000006d1 adds r7, r5, r1 ldrb r0, [r6] ldrb r2, [r7] cmp r0, r2 beq _080AB22C - ldr r0, _080AB220 + ldr r0, =0x0854c150 mov r9, r0 ldrb r0, [r6] lsls r0, 4 @@ -350903,7 +339490,7 @@ sub_80AB1B0: @ 80AB1B0 lsrs r4, r0, 24 cmp r4, 0 bne _080AB23C - ldr r1, _080AB224 + ldr r1, =0x000006c6 adds r1, r5 mov r8, r1 ldrb r0, [r1] @@ -350914,7 +339501,7 @@ sub_80AB1B0: @ 80AB1B0 add r0, r9 ldr r0, [r0] bl _call_via_r0 - ldr r2, _080AB228 + ldr r2, =0x000006c3 adds r0, r5, r2 strb r4, [r0] mov r0, r8 @@ -350927,13 +339514,9 @@ sub_80AB1B0: @ 80AB1B0 strb r0, [r1] b _080AB23C .align 2, 0 -_080AB218: .4byte 0x02038454 -_080AB21C: .4byte 0x000006d1 -_080AB220: .4byte 0x0854c150 -_080AB224: .4byte 0x000006c6 -_080AB228: .4byte 0x000006c3 + .pool _080AB22C: - ldr r0, _080AB25C + ldr r0, =0x0854c150 ldrb r1, [r6] lsls r1, 4 adds r0, 0x4 @@ -350941,9 +339524,9 @@ _080AB22C: ldr r0, [r1] bl _call_via_r0 _080AB23C: - ldr r1, _080AB260 - ldr r0, _080AB264 - ldr r2, _080AB268 + ldr r1, =0x0854c240 + ldr r0, =0x02038454 + ldr r2, =0x000006c6 adds r0, r2 ldrb r0, [r0] lsls r0, 2 @@ -350957,27 +339540,22 @@ _080AB23C: pop {r0} bx r0 .align 2, 0 -_080AB25C: .4byte 0x0854c150 -_080AB260: .4byte 0x0854c240 -_080AB264: .4byte 0x02038454 -_080AB268: .4byte 0x000006c6 + .pool thumb_func_end sub_80AB1B0 thumb_func_start sub_80AB26C sub_80AB26C: @ 80AB26C - ldr r0, _080AB280 - ldr r2, _080AB284 + ldr r0, =0x02038454 + ldr r2, =0x000006c1 adds r1, r0, r2 movs r2, 0 strb r2, [r1] - ldr r1, _080AB288 + ldr r1, =0x000006c2 adds r0, r1 strb r2, [r0] bx lr .align 2, 0 -_080AB280: .4byte 0x02038454 -_080AB284: .4byte 0x000006c1 -_080AB288: .4byte 0x000006c2 + .pool thumb_func_end sub_80AB26C thumb_func_start nullsub_36 @@ -350998,19 +339576,19 @@ sub_80AB294: @ 80AB294 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r1, _080AB2D4 - ldr r0, _080AB2D8 + ldr r1, =0x03000f50 + ldr r0, =0x0854c250 str r0, [r1] movs r0, 0 mov r12, r0 - ldr r1, _080AB2DC + ldr r1, =0x020388b4 mov r10, r1 _080AB2AC: mov r7, r10 mov r0, r12 cmp r0, 0 bne _080AB2B8 - ldr r1, _080AB2E0 + ldr r1, =0xfffffda0 adds r7, r1 _080AB2B8: movs r5, 0 @@ -351029,10 +339607,7 @@ _080AB2C0: lsrs r4, r0, 16 b _080AB2E6 .align 2, 0 -_080AB2D4: .4byte 0x03000f50 -_080AB2D8: .4byte 0x0854c250 -_080AB2DC: .4byte 0x020388b4 -_080AB2E0: .4byte 0xfffffda0 + .pool _080AB2E4: movs r4, 0 _080AB2E6: @@ -351147,8 +339722,8 @@ _080AB384: thumb_func_start sub_80AB3A8 sub_80AB3A8: @ 80AB3A8 push {r4-r7,lr} - ldr r0, _080AB3D8 - ldr r1, _080AB3DC + ldr r0, =0x02038454 + ldr r1, =0x000006c6 adds r2, r0, r1 ldrb r1, [r2] adds r3, r0, 0 @@ -351157,7 +339732,7 @@ sub_80AB3A8: @ 80AB3A8 movs r7, 0xD8 lsls r7, 3 adds r4, r3, r7 - ldr r1, _080AB3E0 + ldr r1, =0x000006c1 adds r0, r3, r1 ldrb r7, [r4] mov r12, r7 @@ -351171,16 +339746,14 @@ sub_80AB3A8: @ 80AB3A8 strb r0, [r2] b _080AB42C .align 2, 0 -_080AB3D8: .4byte 0x02038454 -_080AB3DC: .4byte 0x000006c6 -_080AB3E0: .4byte 0x000006c1 + .pool _080AB3E4: - ldr r0, _080AB40C + ldr r0, =0x000006c3 adds r2, r3, r0 ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - ldr r7, _080AB410 + ldr r7, =0x000006c2 adds r1, r3, r7 lsls r0, 24 lsrs r0, 24 @@ -351195,8 +339768,7 @@ _080AB3E4: adds r0, 0x1 b _080AB418 .align 2, 0 -_080AB40C: .4byte 0x000006c3 -_080AB410: .4byte 0x000006c2 + .pool _080AB414: mov r0, r12 subs r0, 0x1 @@ -351219,8 +339791,8 @@ _080AB42C: thumb_func_start sub_80AB434 sub_80AB434: @ 80AB434 push {lr} - ldr r2, _080AB46C - ldr r0, _080AB470 + ldr r2, =0x02038454 + ldr r0, =0x000006cb adds r1, r2, r0 ldrb r0, [r1] adds r0, 0x1 @@ -351229,7 +339801,7 @@ sub_80AB434: @ 80AB434 lsrs r0, 24 cmp r0, 0x1 bls _080AB452 - ldr r3, _080AB474 + ldr r3, =0x000006ca adds r1, r2, r3 movs r0, 0 strb r0, [r1] @@ -351242,15 +339814,12 @@ _080AB452: cmp r0, 0xA bhi _080AB51C lsls r0, 2 - ldr r1, _080AB478 + ldr r1, =_080AB47C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AB46C: .4byte 0x02038454 -_080AB470: .4byte 0x000006cb -_080AB474: .4byte 0x000006ca -_080AB478: .4byte _080AB47C + .pool .align 2, 0 _080AB47C: .4byte _080AB4A8 @@ -351269,69 +339838,66 @@ _080AB4A8: lsls r0, 24 cmp r0, 0 bne _080AB53C - ldr r0, _080AB4C8 + ldr r0, =0x02038454 movs r2, 0xD8 lsls r2, 3 adds r1, r0, r2 movs r2, 0x3 strb r2, [r1] - ldr r3, _080AB4CC + ldr r3, =0x000006c6 adds r0, r3 strb r2, [r0] b _080AB53C .align 2, 0 -_080AB4C8: .4byte 0x02038454 -_080AB4CC: .4byte 0x000006c6 + .pool _080AB4D0: bl sub_80AB5AC lsls r0, 24 cmp r0, 0 bne _080AB53C - ldr r1, _080AB4EC + ldr r1, =0x02038454 movs r0, 0xD8 lsls r0, 3 adds r2, r1, r0 movs r0, 0xFA strb r0, [r2] - ldr r2, _080AB4F0 + ldr r2, =0x000006c6 adds r1, r2 b _080AB538 .align 2, 0 -_080AB4EC: .4byte 0x02038454 -_080AB4F0: .4byte 0x000006c6 + .pool _080AB4F4: bl sub_80AB604 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 bne _080AB53C - ldr r0, _080AB514 + ldr r0, =0x02038454 movs r3, 0xD8 lsls r3, 3 adds r1, r0, r3 strb r2, [r1] - ldr r1, _080AB518 + ldr r1, =0x000006c6 adds r0, r1 movs r1, 0x3 strb r1, [r0] b _080AB53C .align 2, 0 -_080AB514: .4byte 0x02038454 -_080AB518: .4byte 0x000006c6 + .pool _080AB51C: - ldr r0, _080AB540 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080AB53C - ldr r3, _080AB544 + ldr r3, =0x000006c1 adds r0, r2, r3 ldrb r1, [r0] subs r3, 0x1 adds r0, r2, r3 strb r1, [r0] - ldr r0, _080AB548 + ldr r0, =0x000006c6 adds r1, r2, r0 _080AB538: movs r0, 0x3 @@ -351340,17 +339906,15 @@ _080AB53C: pop {r0} bx r0 .align 2, 0 -_080AB540: .4byte 0x02037fd4 -_080AB544: .4byte 0x000006c1 -_080AB548: .4byte 0x000006c6 + .pool thumb_func_end sub_80AB434 thumb_func_start sub_80AB54C sub_80AB54C: @ 80AB54C push {r4,lr} sub sp, 0x4 - ldr r2, _080AB588 - ldr r0, _080AB58C + ldr r2, =0x02038454 + ldr r0, =0x000006c7 adds r4, r2, r0 ldrb r0, [r4] cmp r0, 0x10 @@ -351365,7 +339929,7 @@ sub_80AB54C: @ 80AB54C subs r3, r1 lsls r3, 24 lsrs r3, 24 - ldr r1, _080AB590 + ldr r1, =0x000006c4 adds r0, r2, r1 ldrh r0, [r0] str r0, [sp] @@ -351376,9 +339940,7 @@ sub_80AB54C: @ 80AB54C movs r0, 0x1 b _080AB5A4 .align 2, 0 -_080AB588: .4byte 0x02038454 -_080AB58C: .4byte 0x000006c7 -_080AB590: .4byte 0x000006c4 + .pool _080AB594: movs r0, 0 movs r1, 0x20 @@ -351398,8 +339960,8 @@ _080AB5A4: thumb_func_start sub_80AB5AC sub_80AB5AC: @ 80AB5AC push {r4,lr} - ldr r2, _080AB5E0 - ldr r0, _080AB5E4 + ldr r2, =0x02038454 + ldr r0, =0x000006c7 adds r4, r2, r0 ldrb r0, [r4] cmp r0, 0x10 @@ -351416,16 +339978,14 @@ sub_80AB5AC: @ 80AB5AC subs r1, r3 lsls r1, 24 lsrs r1, 24 - ldr r3, _080AB5E8 + ldr r3, =0x000006c4 adds r2, r3 ldrh r2, [r2] bl sub_80AB990 movs r0, 0x1 b _080AB5FE .align 2, 0 -_080AB5E0: .4byte 0x02038454 -_080AB5E4: .4byte 0x000006c7 -_080AB5E8: .4byte 0x000006c4 + .pool _080AB5EC: movs r2, 0x6 negs r2, r2 @@ -351445,8 +340005,8 @@ _080AB5FE: thumb_func_start sub_80AB604 sub_80AB604: @ 80AB604 push {lr} - ldr r2, _080AB62C - ldr r1, _080AB630 + ldr r2, =0x02038454 + ldr r1, =0x000006c7 adds r0, r2, r1 ldrb r1, [r0] cmp r1, 0x10 @@ -351457,16 +340017,14 @@ sub_80AB604: @ 80AB604 subs r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r3, _080AB634 + ldr r3, =0x000006c4 adds r1, r2, r3 ldrh r1, [r1] bl sub_80ABAB0 movs r0, 0x1 b _080AB63A .align 2, 0 -_080AB62C: .4byte 0x02038454 -_080AB630: .4byte 0x000006c7 -_080AB634: .4byte 0x000006c4 + .pool _080AB638: movs r0, 0 _080AB63A: @@ -351515,16 +340073,16 @@ _080AB67C: asrs r0, 19 str r0, [sp, 0x4] _080AB684: - ldr r0, _080AB6B4 + ldr r0, =0x03000f50 ldr r0, [r0] adds r0, r4 ldrb r0, [r0] cmp r0, 0 bne _080AB6C0 lsls r1, r6, 1 - ldr r0, _080AB6B8 + ldr r0, =0x02037714 adds r0, r1, r0 - ldr r2, _080AB6BC + ldr r2, =0x02037b14 adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -351539,27 +340097,23 @@ _080AB684: mov r12, r4 b _080AB73E .align 2, 0 -_080AB6B4: .4byte 0x03000f50 -_080AB6B8: .4byte 0x02037714 -_080AB6BC: .4byte 0x02037b14 + .pool _080AB6C0: cmp r0, 0x2 beq _080AB6D4 adds r1, r4, 0 subs r1, 0x10 - ldr r2, _080AB6D8 - ldr r3, _080AB6DC + ldr r2, =0x02038454 + ldr r3, =0x000006d5 adds r0, r2, r3 ldrb r0, [r0] cmp r1, r0 bne _080AB6E4 _080AB6D4: - ldr r0, _080AB6E0 + ldr r0, =0x020388b4 b _080AB6EA .align 2, 0 -_080AB6D8: .4byte 0x02038454 -_080AB6DC: .4byte 0x000006d5 -_080AB6E0: .4byte 0x020388b4 + .pool _080AB6E4: movs r3, 0x80 lsls r3, 2 @@ -351573,12 +340127,12 @@ _080AB6EA: mov r8, r2 adds r4, 0x1 mov r12, r4 - ldr r3, _080AB74C + ldr r3, =0x02037b14 mov r10, r3 _080AB6FE: adds r2, r6, 0 lsls r0, r2, 1 - ldr r1, _080AB750 + ldr r1, =0x02037714 adds r0, r1 ldr r1, [r0] lsls r0, r1, 27 @@ -351616,8 +340170,7 @@ _080AB73E: bcc _080AB684 b _080AB82E .align 2, 0 -_080AB74C: .4byte 0x02037b14 -_080AB750: .4byte 0x02037714 + .pool _080AB754: cmp r0, 0 bge _080AB81C @@ -351634,16 +340187,16 @@ _080AB754: cmp r4, r9 bcs _080AB82E _080AB770: - ldr r0, _080AB7A0 + ldr r0, =0x03000f50 ldr r0, [r0] adds r0, r4 ldrb r0, [r0] cmp r0, 0 bne _080AB7AC lsls r1, r6, 1 - ldr r0, _080AB7A4 + ldr r0, =0x02037714 adds r0, r1, r0 - ldr r2, _080AB7A8 + ldr r2, =0x02037b14 adds r1, r2 movs r2, 0x8 bl CpuFastSet @@ -351658,9 +340211,7 @@ _080AB770: mov r12, r4 b _080AB804 .align 2, 0 -_080AB7A0: .4byte 0x03000f50 -_080AB7A4: .4byte 0x02037714 -_080AB7A8: .4byte 0x02037b14 + .pool _080AB7AC: movs r7, 0 mov r0, r9 @@ -351668,16 +340219,16 @@ _080AB7AC: mov r8, r0 adds r4, 0x1 mov r12, r4 - ldr r1, _080AB810 + ldr r1, =0x0854014c mov r10, r1 ldr r2, [sp] lsls r0, r2, 24 asrs r5, r0, 11 _080AB7C2: lsls r0, r6, 1 - ldr r3, _080AB814 + ldr r3, =0x02037b14 adds r4, r0, r3 - ldr r1, _080AB818 + ldr r1, =0x02037714 adds r0, r1 ldrh r3, [r0] lsls r3, 16 @@ -351715,14 +340266,12 @@ _080AB804: bcc _080AB770 b _080AB82E .align 2, 0 -_080AB810: .4byte 0x0854014c -_080AB814: .4byte 0x02037b14 -_080AB818: .4byte 0x02037714 + .pool _080AB81C: lsls r1, r4, 5 - ldr r0, _080AB840 + ldr r0, =0x02037714 adds r0, r1, r0 - ldr r2, _080AB844 + ldr r2, =0x02037b14 adds r1, r2 mov r3, r9 lsls r2, r3, 3 @@ -351737,8 +340286,7 @@ _080AB82E: pop {r0} bx r0 .align 2, 0 -_080AB840: .4byte 0x02037714 -_080AB844: .4byte 0x02037b14 + .pool thumb_func_end pal_fade_2 thumb_func_start sub_80AB848 @@ -351788,7 +340336,7 @@ sub_80AB848: @ 80AB848 asrs r0, 19 str r0, [sp, 0x10] _080AB8A0: - ldr r0, _080AB8D0 + ldr r0, =0x03000f50 ldr r0, [r0] adds r0, r4 ldrb r0, [r0] @@ -351811,18 +340359,18 @@ _080AB8A0: mov r12, r4 b _080AB96A .align 2, 0 -_080AB8D0: .4byte 0x03000f50 + .pool _080AB8D4: cmp r0, 0x1 bne _080AB8E4 - ldr r0, _080AB8E0 + ldr r0, =0x02038654 ldr r1, [sp, 0x10] adds r5, r1, r0 b _080AB8EA .align 2, 0 -_080AB8E0: .4byte 0x02038654 + .pool _080AB8E4: - ldr r0, _080AB984 + ldr r0, =0x020388b4 ldr r3, [sp, 0x10] adds r5, r3, r0 _080AB8EA: @@ -351835,7 +340383,7 @@ _080AB8EA: _080AB8F6: adds r4, r6, 0 lsls r0, r4, 1 - ldr r1, _080AB988 + ldr r1, =0x02037714 adds r0, r1 ldr r1, [r0] lsls r0, r1, 27 @@ -351879,7 +340427,7 @@ _080AB8F6: lsls r0, 16 lsrs r6, r0, 16 lsls r4, 1 - ldr r0, _080AB98C + ldr r0, =0x02037b14 adds r4, r0 lsrs r1, 14 lsrs r2, 19 @@ -351907,9 +340455,7 @@ _080AB974: pop {r0} bx r0 .align 2, 0 -_080AB984: .4byte 0x020388b4 -_080AB988: .4byte 0x02037714 -_080AB98C: .4byte 0x02037b14 + .pool thumb_func_end sub_80AB848 thumb_func_start sub_80AB990 @@ -351943,7 +340489,7 @@ sub_80AB990: @ 80AB990 movs r5, 0 movs r4, 0 _080AB9C8: - ldr r0, _080AB9F0 + ldr r0, =0x03000f50 ldr r0, [r0] adds r0, r4 ldrb r0, [r0] @@ -351963,7 +340509,7 @@ _080AB9C8: mov r8, r4 b _080ABA8A .align 2, 0 -_080AB9F0: .4byte 0x03000f50 + .pool _080AB9F4: movs r0, 0 mov r12, r0 @@ -351977,7 +340523,7 @@ _080AB9F4: _080ABA06: adds r4, r5, 0 lsls r0, r4, 1 - ldr r5, _080ABAA4 + ldr r5, =0x02037714 adds r0, r5 ldr r0, [r0] lsls r2, r0, 27 @@ -351995,7 +340541,7 @@ _080ABA06: lsls r0, 1 orrs r0, r2 add r0, r9 - ldr r1, _080ABAA8 + ldr r1, =0x0854014c adds r0, r1 ldr r1, [r0] lsls r3, r1, 27 @@ -352027,7 +340573,7 @@ _080ABA06: lsls r0, 16 lsrs r5, r0, 16 lsls r4, 1 - ldr r0, _080ABAAC + ldr r0, =0x02037b14 adds r4, r0 lsrs r1, 14 lsrs r2, 19 @@ -352056,9 +340602,7 @@ _080ABA8A: pop {r0} bx r0 .align 2, 0 -_080ABAA4: .4byte 0x02037714 -_080ABAA8: .4byte 0x0854014c -_080ABAAC: .4byte 0x02037b14 + .pool thumb_func_end sub_80AB990 thumb_func_start sub_80ABAB0 @@ -352112,7 +340656,7 @@ _080ABAEC: mov r8, r0 _080ABB10: lsls r5, r6, 1 - ldr r0, _080ABB94 + ldr r0, =0x02037714 adds r0, r5, r0 ldr r2, [r0] lsls r4, r2, 27 @@ -352164,7 +340708,7 @@ _080ABB10: asrs r0, 4 adds r2, r0 lsls r2, 24 - ldr r0, _080ABB98 + ldr r0, =0x02037b14 adds r5, r0 lsrs r2, 14 lsrs r3, 19 @@ -352178,8 +340722,7 @@ _080ABB10: bcc _080ABB10 b _080ABBB0 .align 2, 0 -_080ABB94: .4byte 0x02037714 -_080ABB98: .4byte 0x02037b14 + .pool _080ABB9C: lsls r0, r4, 20 lsrs r0, 16 @@ -352211,13 +340754,13 @@ sub_80ABBCC: @ 80ABBCC push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r3, _080ABBF4 - ldr r0, _080ABBF8 + ldr r3, =0x02038454 + ldr r0, =0x000006fa adds r1, r3, r0 ldrb r0, [r1] cmp r0, 0x5 bhi _080ABBEE - ldr r4, _080ABBFC + ldr r4, =0x000006f4 adds r0, r3, r4 ldrb r3, [r1] adds r0, r3 @@ -352230,9 +340773,7 @@ _080ABBEE: pop {r0} bx r0 .align 2, 0 -_080ABBF4: .4byte 0x02038454 -_080ABBF8: .4byte 0x000006fa -_080ABBFC: .4byte 0x000006f4 + .pool thumb_func_end sub_80ABBCC thumb_func_start sub_80ABC00 @@ -352241,13 +340782,13 @@ sub_80ABC00: @ 80ABC00 lsls r0, 24 lsrs r3, r0, 24 movs r1, 0 - ldr r2, _080ABC28 - ldr r4, _080ABC2C + ldr r2, =0x02038454 + ldr r4, =0x000006fa adds r0, r2, r4 ldrb r0, [r0] cmp r1, r0 bcs _080ABC3E - ldr r5, _080ABC30 + ldr r5, =0x000006f4 adds r4, r2, r5 adds r2, r0, 0 _080ABC1A: @@ -352258,9 +340799,7 @@ _080ABC1A: movs r0, 0x1 b _080ABC40 .align 2, 0 -_080ABC28: .4byte 0x02038454 -_080ABC2C: .4byte 0x000006fa -_080ABC30: .4byte 0x000006f4 + .pool _080ABC34: adds r0, r1, 0x1 lsls r0, 16 @@ -352280,8 +340819,8 @@ sub_80ABC48: @ 80ABC48 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _080ABC74 - ldr r1, _080ABC78 + ldr r5, =0x02038454 + ldr r1, =0x000006c6 adds r0, r5, r1 ldrb r0, [r0] cmp r0, 0x3 @@ -352300,8 +340839,7 @@ _080ABC6E: pop {r0} bx r0 .align 2, 0 -_080ABC74: .4byte 0x02038454 -_080ABC78: .4byte 0x000006c6 + .pool thumb_func_end sub_80ABC48 thumb_func_start sub_80ABC7C @@ -352313,8 +340851,8 @@ sub_80ABC7C: @ 80ABC7C lsrs r5, r1, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r3, _080ABCC4 - ldr r0, _080ABCC8 + ldr r3, =0x02038454 + ldr r0, =0x000006c6 adds r2, r3, r0 ldrb r0, [r2] cmp r0, 0x3 @@ -352331,7 +340869,7 @@ sub_80ABC7C: @ 80ABC7C adds r2, 0x2 adds r0, r3, r2 strb r1, [r0] - ldr r1, _080ABCCC + ldr r1, =0x000006c2 adds r0, r3, r1 strb r6, [r0] lsls r0, r4, 24 @@ -352342,9 +340880,7 @@ _080ABCBC: pop {r0} bx r0 .align 2, 0 -_080ABCC4: .4byte 0x02038454 -_080ABCC8: .4byte 0x000006c6 -_080ABCCC: .4byte 0x000006c2 + .pool thumb_func_end sub_80ABC7C thumb_func_start fade_screen @@ -352374,20 +340910,20 @@ _080ABCF6: movs r1, 0 b _080ABD10 _080ABCFC: - ldr r4, _080ABD04 + ldr r4, =0x0000ffff movs r1, 0 b _080ABD10 .align 2, 0 -_080ABD04: .4byte 0x0000ffff + .pool _080ABD08: movs r4, 0 b _080ABD0E _080ABD0C: - ldr r4, _080ABD30 + ldr r4, =0x0000ffff _080ABD0E: movs r1, 0x1 _080ABD10: - ldr r0, _080ABD34 + ldr r0, =0x02038454 movs r2, 0xDA lsls r2, 3 adds r0, r2 @@ -352404,8 +340940,7 @@ _080ABD2A: movs r2, 0x1 b _080ABD3A .align 2, 0 -_080ABD30: .4byte 0x0000ffff -_080ABD34: .4byte 0x02038454 + .pool _080ABD38: movs r2, 0 _080ABD3A: @@ -352413,8 +340948,8 @@ _080ABD3A: beq _080ABD7C cmp r2, 0 beq _080ABD4E - ldr r0, _080ABD6C - ldr r1, _080ABD70 + ldr r0, =0x02037b14 + ldr r1, =0x02037714 movs r2, 0x80 lsls r2, 1 bl CpuFastSet @@ -352427,33 +340962,28 @@ _080ABD4E: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080ABD74 - ldr r3, _080ABD78 + ldr r0, =0x02038454 + ldr r3, =0x000006c6 adds r0, r3 movs r1, 0x2 strb r1, [r0] b _080ABDE4 .align 2, 0 -_080ABD6C: .4byte 0x02037b14 -_080ABD70: .4byte 0x02037714 -_080ABD74: .4byte 0x02038454 -_080ABD78: .4byte 0x000006c6 + .pool _080ABD7C: - ldr r1, _080ABD94 - ldr r3, _080ABD98 + ldr r1, =0x02038454 + ldr r3, =0x000006c4 adds r0, r1, r3 strh r4, [r0] cmp r2, 0 beq _080ABDA0 - ldr r0, _080ABD9C + ldr r0, =0x000006c7 adds r1, r0 movs r0, 0 strb r0, [r1] b _080ABDB2 .align 2, 0 -_080ABD94: .4byte 0x02038454 -_080ABD98: .4byte 0x000006c4 -_080ABD9C: .4byte 0x000006c7 + .pool _080ABDA0: movs r0, 0x1 negs r0, r0 @@ -352464,16 +340994,16 @@ _080ABDA0: movs r3, 0 bl sub_80A1AD4 _080ABDB2: - ldr r4, _080ABDEC - ldr r1, _080ABDF0 + ldr r4, =0x02038454 + ldr r1, =0x000006c6 adds r0, r4, r1 movs r1, 0 movs r5, 0x1 strb r5, [r0] - ldr r2, _080ABDF4 + ldr r2, =0x000006ca adds r0, r4, r2 strb r5, [r0] - ldr r3, _080ABDF8 + ldr r3, =0x000006cb adds r0, r4, r3 strb r1, [r0] movs r1, 0xE6 @@ -352494,16 +341024,13 @@ _080ABDE4: pop {r0} bx r0 .align 2, 0 -_080ABDEC: .4byte 0x02038454 -_080ABDF0: .4byte 0x000006c6 -_080ABDF4: .4byte 0x000006ca -_080ABDF8: .4byte 0x000006cb + .pool thumb_func_end fade_screen thumb_func_start sub_80ABDFC sub_80ABDFC: @ 80ABDFC - ldr r0, _080ABE10 - ldr r1, _080ABE14 + ldr r0, =0x02038454 + ldr r1, =0x000006c6 adds r0, r1 ldrb r1, [r0] movs r0, 0x1 @@ -352513,8 +341040,7 @@ sub_80ABDFC: @ 80ABDFC lsrs r0, 31 bx lr .align 2, 0 -_080ABE10: .4byte 0x02038454 -_080ABE14: .4byte 0x000006c6 + .pool thumb_func_end sub_80ABDFC thumb_func_start sub_80ABE18 @@ -352526,8 +341052,8 @@ sub_80ABE18: @ 80ABE18 lsls r1, 13 adds r0, r1 lsrs r4, r0, 16 - ldr r5, _080ABE58 - ldr r2, _080ABE5C + ldr r5, =0x02038454 + ldr r2, =0x000006c6 adds r0, r5, r2 ldrb r0, [r0] adds r1, r5, 0 @@ -352550,10 +341076,9 @@ sub_80ABE18: @ 80ABE18 bl pal_fade_2 b _080ABEF4 .align 2, 0 -_080ABE58: .4byte 0x02038454 -_080ABE5C: .4byte 0x000006c6 + .pool _080ABE60: - ldr r2, _080ABEA0 + ldr r2, =0x000006ca adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -352570,8 +341095,8 @@ _080ABE7C: lsls r0, r4, 20 lsrs r4, r0, 16 movs r2, 0 - ldr r6, _080ABEA4 - ldr r0, _080ABEA8 + ldr r6, =0x02037b14 + ldr r0, =0x000006c4 adds r3, r5, r0 _080ABE88: adds r0, r4, r2 @@ -352586,20 +341111,18 @@ _080ABE88: bls _080ABE88 b _080ABEF4 .align 2, 0 -_080ABEA0: .4byte 0x000006ca -_080ABEA4: .4byte 0x02037b14 -_080ABEA8: .4byte 0x000006c4 + .pool _080ABEAC: lsls r0, r4, 20 lsrs r4, r0, 16 lsls r1, r4, 1 - ldr r0, _080ABED8 + ldr r0, =0x02037b14 adds r0, r1, r0 - ldr r2, _080ABEDC + ldr r2, =0x02037714 adds r1, r2 movs r2, 0x8 bl CpuFastSet - ldr r0, _080ABEE0 + ldr r0, =0x02037fd4 ldrh r2, [r0, 0x4] lsls r2, 21 lsrs r2, 27 @@ -352611,13 +341134,11 @@ _080ABEAC: bl pal_fade_1 b _080ABEF4 .align 2, 0 -_080ABED8: .4byte 0x02037b14 -_080ABEDC: .4byte 0x02037714 -_080ABEE0: .4byte 0x02037fd4 + .pool _080ABEE4: lsls r0, r4, 20 lsrs r4, r0, 16 - ldr r3, _080ABEFC + ldr r3, =0x000073fc adds r0, r4, 0 movs r1, 0x10 movs r2, 0xC @@ -352627,7 +341148,7 @@ _080ABEF4: pop {r0} bx r0 .align 2, 0 -_080ABEFC: .4byte 0x000073fc + .pool thumb_func_end sub_80ABE18 thumb_func_start sub_80ABF00 @@ -352635,7 +341156,7 @@ sub_80ABF00: @ 80ABF00 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080ABF1C + ldr r1, =0x02038454 movs r2, 0xD8 lsls r2, 3 adds r1, r2 @@ -352646,14 +341167,14 @@ sub_80ABF00: @ 80ABF00 pop {r0} bx r0 .align 2, 0 -_080ABF1C: .4byte 0x02038454 + .pool thumb_func_end sub_80ABF00 thumb_func_start sub_80ABF20 sub_80ABF20: @ 80ABF20 push {lr} - ldr r1, _080ABF34 - ldr r2, _080ABF38 + ldr r1, =0x02038454 + ldr r2, =0x000006c6 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 @@ -352661,24 +341182,23 @@ sub_80ABF20: @ 80ABF20 movs r0, 0 b _080ABF42 .align 2, 0 -_080ABF34: .4byte 0x02038454 -_080ABF38: .4byte 0x000006c6 + .pool _080ABF3C: - ldr r2, _080ABF48 + ldr r2, =0x000006ca adds r0, r1, r2 ldrb r0, [r0] _080ABF42: pop {r1} bx r1 .align 2, 0 -_080ABF48: .4byte 0x000006ca + .pool thumb_func_end sub_80ABF20 thumb_func_start sub_80ABF4C sub_80ABF4C: @ 80ABF4C push {r4,lr} - ldr r4, _080ABF74 - ldr r1, _080ABF78 + ldr r4, =0x02038454 + ldr r1, =0x000006d4 adds r4, r1 ldrb r1, [r4] lsls r1, 20 @@ -352694,8 +341214,7 @@ sub_80ABF4C: @ 80ABF4C pop {r0} bx r0 .align 2, 0 -_080ABF74: .4byte 0x02038454 -_080ABF78: .4byte 0x000006d4 + .pool thumb_func_end sub_80ABF4C thumb_func_start sub_80ABF7C @@ -352708,32 +341227,30 @@ sub_80ABF7C: @ 80ABF7C thumb_func_start sub_80ABF84 sub_80ABF84: @ 80ABF84 - ldr r0, _080ABF98 - ldr r2, _080ABF9C + ldr r0, =0x02038454 + ldr r2, =0x0000074d adds r1, r0, r2 movs r2, 0x1 strb r2, [r1] - ldr r1, _080ABFA0 + ldr r1, =0x0000074e adds r0, r1 strb r2, [r0] bx lr .align 2, 0 -_080ABF98: .4byte 0x02038454 -_080ABF9C: .4byte 0x0000074d -_080ABFA0: .4byte 0x0000074e + .pool thumb_func_end sub_80ABF84 thumb_func_start sub_80ABFA4 sub_80ABFA4: @ 80ABFA4 push {r4,lr} - ldr r1, _080ABFCC - ldr r0, _080ABFD0 + ldr r1, =0x02038454 + ldr r0, =0x0000074d adds r4, r1, r0 movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0x1F bgt _080ABFD8 - ldr r0, _080ABFD4 + ldr r0, =0x0000074e adds r1, r0 adds r0, r4, 0 bl sub_80ABF7C @@ -352744,9 +341261,7 @@ sub_80ABFA4: @ 80ABFA4 movs r0, 0x1 b _080ABFDA .align 2, 0 -_080ABFCC: .4byte 0x02038454 -_080ABFD0: .4byte 0x0000074d -_080ABFD4: .4byte 0x0000074e + .pool _080ABFD8: movs r0, 0 _080ABFDA: @@ -352768,8 +341283,8 @@ sub_80ABFE0: @ 80ABFE0 thumb_func_start sub_80ABFF0 sub_80ABFF0: @ 80ABFF0 - ldr r1, _080AC010 - ldr r2, _080AC014 + ldr r1, =0x02038454 + ldr r2, =0x0000073c adds r0, r1, r2 movs r2, 0 strh r2, [r0] @@ -352780,21 +341295,19 @@ sub_80ABFF0: @ 80ABFF0 adds r3, 0x2 adds r0, r1, r3 strh r2, [r0] - ldr r0, _080AC018 + ldr r0, =0x0000073e adds r1, r0 strh r2, [r1] bx lr .align 2, 0 -_080AC010: .4byte 0x02038454 -_080AC014: .4byte 0x0000073c -_080AC018: .4byte 0x0000073e + .pool thumb_func_end sub_80ABFF0 thumb_func_start sub_80AC01C sub_80AC01C: @ 80AC01C push {r4-r7,lr} - ldr r5, _080AC038 - ldr r0, _080AC03C + ldr r5, =0x02038454 + ldr r0, =0x00000742 adds r7, r5, r0 movs r2, 0 ldrsh r1, [r7, r2] @@ -352806,8 +341319,7 @@ sub_80AC01C: @ 80AC01C beq _080AC046 b _080AC118 .align 2, 0 -_080AC038: .4byte 0x02038454 -_080AC03C: .4byte 0x00000742 + .pool _080AC040: cmp r1, 0x2 beq _080AC0E4 @@ -352824,7 +341336,7 @@ _080AC046: cmp r0, 0x5 ble _080AC118 strh r1, [r6] - ldr r0, _080AC088 + ldr r0, =0x0000073c adds r4, r5, r0 ldrh r0, [r4] adds r1, r0, 0x1 @@ -352837,7 +341349,7 @@ _080AC046: ldrsh r0, [r4, r2] cmp r0, 0x5 ble _080AC118 - ldr r3, _080AC08C + ldr r3, =0x0000073e adds r0, r5, r3 strh r1, [r0] movs r0, 0x1 @@ -352846,8 +341358,7 @@ _080AC046: strh r0, [r6] b _080AC118 .align 2, 0 -_080AC088: .4byte 0x0000073c -_080AC08C: .4byte 0x0000073e + .pool _080AC090: movs r0, 0xE8 lsls r0, 3 @@ -352857,7 +341368,7 @@ _080AC090: movs r1, 0x7F ands r0, r1 strh r0, [r2] - ldr r1, _080AC0D8 + ldr r1, =0x08329f40 movs r3, 0 ldrsh r0, [r2, r3] lsls r0, 1 @@ -352867,11 +341378,11 @@ _080AC090: subs r0, 0x1 asrs r0, 6 adds r0, 0x2 - ldr r2, _080AC0DC + ldr r2, =0x0000073c adds r6, r5, r2 adds r2, r0, 0 strh r0, [r6] - ldr r3, _080AC0E0 + ldr r3, =0x0000073e adds r4, r5, r3 movs r3, 0 ldrsh r1, [r4, r3] @@ -352885,9 +341396,7 @@ _080AC0D0: strh r0, [r4] b _080AC118 .align 2, 0 -_080AC0D8: .4byte 0x08329f40 -_080AC0DC: .4byte 0x0000073c -_080AC0E0: .4byte 0x0000073e + .pool _080AC0E4: movs r0, 0xE8 lsls r0, 3 @@ -352901,7 +341410,7 @@ _080AC0E4: cmp r0, 0x5 ble _080AC118 strh r6, [r1] - ldr r1, _080AC120 + ldr r1, =0x0000073c adds r4, r5, r1 ldrh r0, [r4] subs r0, 0x1 @@ -352919,7 +341428,7 @@ _080AC118: pop {r0} bx r0 .align 2, 0 -_080AC120: .4byte 0x0000073c + .pool thumb_func_end sub_80AC01C thumb_func_start sub_80AC124 @@ -352929,7 +341438,7 @@ sub_80AC124: @ 80AC124 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r3, _080AC15C + ldr r3, =0x02038454 movs r4, 0xE6 lsls r4, 3 adds r2, r3, r4 @@ -352940,7 +341449,7 @@ sub_80AC124: @ 80AC124 adds r4, 0x2 adds r2, r3, r4 strh r0, [r2] - ldr r2, _080AC160 + ldr r2, =0x00000736 adds r3, r2 strh r1, [r3] lsls r1, 8 @@ -352951,8 +341460,7 @@ sub_80AC124: @ 80AC124 pop {r0} bx r0 .align 2, 0 -_080AC15C: .4byte 0x02038454 -_080AC160: .4byte 0x00000736 + .pool thumb_func_end sub_80AC124 thumb_func_start sub_80AC164 @@ -352962,15 +341470,15 @@ sub_80AC164: @ 80AC164 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r3, _080AC198 - ldr r5, _080AC19C + ldr r3, =0x02038454 + ldr r5, =0x00000734 adds r4, r3, r5 movs r5, 0 strh r0, [r4] - ldr r4, _080AC1A0 + ldr r4, =0x00000736 adds r0, r3, r4 strh r1, [r0] - ldr r1, _080AC1A4 + ldr r1, =0x0000073a adds r0, r3, r1 strb r2, [r0] adds r4, 0x3 @@ -352984,32 +341492,29 @@ sub_80AC164: @ 80AC164 pop {r0} bx r0 .align 2, 0 -_080AC198: .4byte 0x02038454 -_080AC19C: .4byte 0x00000734 -_080AC1A0: .4byte 0x00000736 -_080AC1A4: .4byte 0x0000073a + .pool thumb_func_end sub_80AC164 thumb_func_start sub_80AC1A8 sub_80AC1A8: @ 80AC1A8 push {r4-r6,lr} - ldr r0, _080AC200 + ldr r0, =0x02038454 movs r1, 0xE6 lsls r1, 3 adds r3, r0, r1 ldr r2, [r3] - ldr r6, _080AC204 + ldr r6, =0x00000734 adds r4, r0, r6 ldr r1, [r4] adds r5, r0, 0 cmp r2, r1 beq _080AC26C - ldr r0, _080AC208 + ldr r0, =0x00000739 adds r2, r5, r0 ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - ldr r6, _080AC20C + ldr r6, =0x0000073a adds r1, r5, r6 lsls r0, 24 lsrs r0, 24 @@ -353036,14 +341541,11 @@ sub_80AC1A8: @ 80AC1A8 adds r0, r1, 0x1 b _080AC236 .align 2, 0 -_080AC200: .4byte 0x02038454 -_080AC204: .4byte 0x00000734 -_080AC208: .4byte 0x00000739 -_080AC20C: .4byte 0x0000073a + .pool _080AC210: - ldr r1, _080AC228 + ldr r1, =0x00000732 adds r3, r5, r1 - ldr r2, _080AC22C + ldr r2, =0x00000736 adds r0, r5, r2 ldrh r1, [r3] adds r2, r1, 0 @@ -353053,8 +341555,7 @@ _080AC210: adds r0, r1, 0x1 b _080AC236 .align 2, 0 -_080AC228: .4byte 0x00000732 -_080AC22C: .4byte 0x00000736 + .pool _080AC230: cmp r2, r0 bls _080AC238 @@ -353062,7 +341563,7 @@ _080AC230: _080AC236: strh r0, [r3] _080AC238: - ldr r6, _080AC264 + ldr r6, =0x00000732 adds r0, r5, r6 ldrh r1, [r0] lsls r1, 8 @@ -353076,7 +341577,7 @@ _080AC238: movs r0, 0x52 bl lcd_io_set ldr r1, [r4] - ldr r2, _080AC268 + ldr r2, =0x00000734 adds r0, r5, r2 ldr r0, [r0] cmp r1, r0 @@ -353084,8 +341585,7 @@ _080AC238: movs r0, 0 b _080AC26E .align 2, 0 -_080AC264: .4byte 0x00000732 -_080AC268: .4byte 0x00000734 + .pool _080AC26C: movs r0, 0x1 _080AC26E: @@ -353103,12 +341603,12 @@ sub_80AC274: @ 80AC274 cmp r0, 0x9 bhi _080AC306 lsls r0, 2 - ldr r1, _080AC28C + ldr r1, =_080AC290 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AC28C: .4byte _080AC290 + .pool .align 2, 0 _080AC290: .4byte _080AC2B8 @@ -353167,14 +341667,14 @@ _080AC306: thumb_func_start weather_get_current weather_get_current: @ 80AC30C - ldr r0, _080AC318 + ldr r0, =0x02038454 movs r1, 0xDA lsls r1, 3 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080AC318: .4byte 0x02038454 + .pool thumb_func_end weather_get_current thumb_func_start sub_80AC31C @@ -353182,8 +341682,8 @@ sub_80AC31C: @ 80AC31C push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _080AC33C - ldr r3, _080AC340 + ldr r1, =0x02038454 + ldr r3, =0x000006c6 adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0x2 @@ -353196,26 +341696,25 @@ sub_80AC31C: @ 80AC31C beq _080AC360 b _080AC36E .align 2, 0 -_080AC33C: .4byte 0x02038454 -_080AC340: .4byte 0x000006c6 + .pool _080AC344: cmp r2, 0x55 bne _080AC36E - ldr r0, _080AC350 + ldr r0, =0x000006dd adds r1, r0 movs r0, 0 b _080AC366 .align 2, 0 -_080AC350: .4byte 0x000006dd + .pool _080AC354: - ldr r3, _080AC35C + ldr r3, =0x000006dd adds r1, r3 movs r0, 0x1 b _080AC366 .align 2, 0 -_080AC35C: .4byte 0x000006dd + .pool _080AC360: - ldr r0, _080AC374 + ldr r0, =0x000006dd adds r1, r0 movs r0, 0x2 _080AC366: @@ -353226,7 +341725,7 @@ _080AC36E: pop {r0} bx r0 .align 2, 0 -_080AC374: .4byte 0x000006dd + .pool thumb_func_end sub_80AC31C thumb_func_start play_some_sound @@ -353236,8 +341735,8 @@ play_some_sound: @ 80AC378 lsls r0, 24 cmp r0, 0 beq _080AC3B6 - ldr r0, _080AC3A0 - ldr r1, _080AC3A4 + ldr r0, =0x02038454 + ldr r1, =0x000006dd adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -353250,8 +341749,7 @@ play_some_sound: @ 80AC378 bl audio_play b _080AC3B6 .align 2, 0 -_080AC3A0: .4byte 0x02038454 -_080AC3A4: .4byte 0x000006dd + .pool _080AC3A8: movs r0, 0x54 bl audio_play @@ -353266,40 +341764,37 @@ _080AC3B6: thumb_func_start sub_80AC3BC sub_80AC3BC: @ 80AC3BC - ldr r0, _080AC3C8 - ldr r1, _080AC3CC + ldr r0, =0x02038454 + ldr r1, =0x000006d3 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080AC3C8: .4byte 0x02038454 -_080AC3CC: .4byte 0x000006d3 + .pool thumb_func_end sub_80AC3BC thumb_func_start sub_80AC3D0 sub_80AC3D0: @ 80AC3D0 - ldr r0, _080AC3DC - ldr r1, _080AC3E0 + ldr r0, =0x02038454 + ldr r1, =0x000006c6 adds r0, r1 movs r1, 0x2 strb r1, [r0] bx lr .align 2, 0 -_080AC3DC: .4byte 0x02038454 -_080AC3E0: .4byte 0x000006c6 + .pool thumb_func_end sub_80AC3D0 thumb_func_start sub_80AC3E4 sub_80AC3E4: @ 80AC3E4 - ldr r0, _080AC3F0 - ldr r1, _080AC3F4 + ldr r0, =0x02038454 + ldr r1, =0x000006c6 adds r0, r1 movs r1, 0x3 strb r1, [r0] bx lr .align 2, 0 -_080AC3F0: .4byte 0x02038454 -_080AC3F4: .4byte 0x000006c6 + .pool thumb_func_end sub_80AC3E4 thumb_func_start sub_80AC3F8 @@ -353308,56 +341803,53 @@ sub_80AC3F8: @ 80AC3F8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080AC41C - ldr r5, _080AC420 + ldr r0, =0x0854c250 + ldr r5, =0x02038ba4 adds r1, r5, 0 movs r2, 0x10 bl CpuSet adds r4, r5 movs r0, 0 strb r0, [r4] - ldr r0, _080AC424 + ldr r0, =0x03000f50 str r5, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080AC41C: .4byte 0x0854c250 -_080AC420: .4byte 0x02038ba4 -_080AC424: .4byte 0x03000f50 + .pool thumb_func_end sub_80AC3F8 thumb_func_start sub_80AC428 sub_80AC428: @ 80AC428 - ldr r1, _080AC430 - ldr r0, _080AC434 + ldr r1, =0x03000f50 + ldr r0, =0x0854c250 str r0, [r1] bx lr .align 2, 0 -_080AC430: .4byte 0x03000f50 -_080AC434: .4byte 0x0854c250 + .pool thumb_func_end sub_80AC428 thumb_func_start sub_80AC438 sub_80AC438: @ 80AC438 push {lr} - ldr r0, _080AC470 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r2, _080AC474 + ldr r2, =0x000006c1 adds r1, r0, r2 movs r2, 0 strb r2, [r1] - ldr r1, _080AC478 + ldr r1, =0x000006c2 adds r3, r0, r1 movs r1, 0x14 strb r1, [r3] - ldr r3, _080AC47C + ldr r3, =0x000006d2 adds r1, r0, r3 strb r2, [r1] subs r3, 0x6 adds r1, r0, r3 strh r2, [r1] - ldr r1, _080AC480 + ldr r1, =0x000006de adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -353369,20 +341861,16 @@ _080AC46C: pop {r0} bx r0 .align 2, 0 -_080AC470: .4byte 0x0854c14c -_080AC474: .4byte 0x000006c1 -_080AC478: .4byte 0x000006c2 -_080AC47C: .4byte 0x000006d2 -_080AC480: .4byte 0x000006de + .pool thumb_func_end sub_80AC438 thumb_func_start sub_80AC484 sub_80AC484: @ 80AC484 push {r4,lr} bl sub_80AC438 - ldr r0, _080AC4AC + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AC4B0 + ldr r2, =0x000006d2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -353398,16 +341886,15 @@ _080AC4A4: pop {r0} bx r0 .align 2, 0 -_080AC4AC: .4byte 0x0854c14c -_080AC4B0: .4byte 0x000006d2 + .pool thumb_func_end sub_80AC484 thumb_func_start sub_80AC4B4 sub_80AC4B4: @ 80AC4B4 push {r4,r5,lr} - ldr r0, _080AC4D0 + ldr r0, =0x0854c14c ldr r5, [r0] - ldr r0, _080AC4D4 + ldr r0, =0x000006cc adds r4, r5, r0 ldrh r0, [r4] cmp r0, 0x1 @@ -353418,8 +341905,7 @@ sub_80AC4B4: @ 80AC4B4 beq _080AC4DE b _080AC508 .align 2, 0 -_080AC4D0: .4byte 0x0854c14c -_080AC4D4: .4byte 0x000006cc + .pool _080AC4D8: cmp r0, 0x2 beq _080AC4F0 @@ -353438,7 +341924,7 @@ _080AC4F0: lsls r0, 24 cmp r0, 0 beq _080AC508 - ldr r0, _080AC510 + ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] @@ -353451,15 +341937,15 @@ _080AC508: pop {r0} bx r0 .align 2, 0 -_080AC510: .4byte 0x000006d2 + .pool thumb_func_end sub_80AC4B4 thumb_func_start sub_80AC514 sub_80AC514: @ 80AC514 push {r4,lr} - ldr r0, _080AC52C + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AC530 + ldr r1, =0x000006ce adds r4, r0, r1 ldrh r0, [r4] cmp r0, 0 @@ -353469,8 +341955,7 @@ sub_80AC514: @ 80AC514 movs r0, 0 b _080AC556 .align 2, 0 -_080AC52C: .4byte 0x0854c14c -_080AC530: .4byte 0x000006ce + .pool _080AC534: movs r0, 0 movs r1, 0x10 @@ -353497,21 +341982,19 @@ _080AC556: thumb_func_start sub_80AC55C sub_80AC55C: @ 80AC55C - ldr r0, _080AC574 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r0, _080AC578 + ldr r0, =0x000006c1 adds r2, r1, r0 movs r0, 0 strb r0, [r2] - ldr r0, _080AC57C + ldr r0, =0x000006c2 adds r1, r0 movs r0, 0x14 strb r0, [r1] bx lr .align 2, 0 -_080AC574: .4byte 0x0854c14c -_080AC578: .4byte 0x000006c1 -_080AC57C: .4byte 0x000006c2 + .pool thumb_func_end sub_80AC55C thumb_func_start sub_80AC580 @@ -353536,20 +342019,20 @@ sub_80AC590: @ 80AC590 thumb_func_start sub_80AC594 sub_80AC594: @ 80AC594 push {r4,r5,lr} - ldr r0, _080AC60C + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AC610 + ldr r1, =0x000006de adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 beq _080AC650 - ldr r0, _080AC614 + ldr r0, =0x0854fb5c bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _080AC618 + ldr r0, =0x0854c290 bl sub_80ABF4C movs r5, 0 _080AC5B2: - ldr r0, _080AC61C + ldr r0, =0x0854fb78 movs r1, 0 movs r2, 0 movs r3, 0xFF @@ -353558,7 +342041,7 @@ _080AC5B2: lsrs r3, r0, 24 cmp r3, 0x40 beq _080AC628 - ldr r0, _080AC60C + ldr r0, =0x0854c14c ldr r1, [r0] lsls r2, r5, 2 movs r0, 0xFA @@ -353568,10 +342051,10 @@ _080AC5B2: lsls r4, r3, 4 adds r4, r3 lsls r4, 2 - ldr r0, _080AC620 + ldr r0, =0x02020630 adds r4, r0 str r4, [r1] - ldr r0, _080AC624 + ldr r0, =0x0854fb50 adds r2, r0 ldrh r0, [r2] adds r0, 0x7 @@ -353593,15 +342076,9 @@ _080AC5B2: strb r0, [r4] b _080AC63A .align 2, 0 -_080AC60C: .4byte 0x0854c14c -_080AC610: .4byte 0x000006de -_080AC614: .4byte 0x0854fb5c -_080AC618: .4byte 0x0854c290 -_080AC61C: .4byte 0x0854fb78 -_080AC620: .4byte 0x02020630 -_080AC624: .4byte 0x0854fb50 + .pool _080AC628: - ldr r0, _080AC658 + ldr r0, =0x0854c14c ldr r1, [r0] lsls r0, r5, 2 movs r2, 0xFA @@ -353616,9 +342093,9 @@ _080AC63A: lsrs r5, r0, 16 cmp r5, 0x2 bls _080AC5B2 - ldr r0, _080AC658 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AC65C + ldr r1, =0x000006de adds r0, r1 movs r1, 0x1 strb r1, [r0] @@ -353627,16 +342104,15 @@ _080AC650: pop {r0} bx r0 .align 2, 0 -_080AC658: .4byte 0x0854c14c -_080AC65C: .4byte 0x000006de + .pool thumb_func_end sub_80AC594 thumb_func_start sub_80AC660 sub_80AC660: @ 80AC660 push {r4,r5,lr} - ldr r0, _080AC6AC + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AC6B0 + ldr r2, =0x000006de adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -353661,9 +342137,9 @@ _080AC686: movs r0, 0x90 lsls r0, 5 bl gpu_tile_obj_free_by_tag - ldr r0, _080AC6AC + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AC6B0 + ldr r1, =0x000006de adds r0, r1 movs r1, 0 strb r1, [r0] @@ -353672,8 +342148,7 @@ _080AC6A4: pop {r0} bx r0 .align 2, 0 -_080AC6AC: .4byte 0x0854c14c -_080AC6B0: .4byte 0x000006de + .pool thumb_func_end sub_80AC660 thumb_func_start sub_80AC6B4 @@ -353697,37 +342172,34 @@ _080AC6CC: thumb_func_start sub_80AC6D0 sub_80AC6D0: @ 80AC6D0 - ldr r0, _080AC6F4 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r0, _080AC6F8 + ldr r0, =0x000006cc adds r3, r1, r0 movs r2, 0 movs r0, 0 strh r0, [r3] - ldr r3, _080AC6FC + ldr r3, =0x000006d2 adds r0, r1, r3 strb r2, [r0] subs r3, 0x11 adds r0, r1, r3 strb r2, [r0] - ldr r0, _080AC700 + ldr r0, =0x000006c2 adds r1, r0 strb r2, [r1] bx lr .align 2, 0 -_080AC6F4: .4byte 0x0854c14c -_080AC6F8: .4byte 0x000006cc -_080AC6FC: .4byte 0x000006d2 -_080AC700: .4byte 0x000006c2 + .pool thumb_func_end sub_80AC6D0 thumb_func_start sub_80AC704 sub_80AC704: @ 80AC704 push {r4,lr} bl sub_80AC6D0 - ldr r0, _080AC72C + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AC730 + ldr r2, =0x000006d2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -353743,30 +342215,27 @@ _080AC724: pop {r0} bx r0 .align 2, 0 -_080AC72C: .4byte 0x0854c14c -_080AC730: .4byte 0x000006d2 + .pool thumb_func_end sub_80AC704 thumb_func_start sub_80AC734 sub_80AC734: @ 80AC734 push {lr} - ldr r1, _080AC750 + ldr r1, =0x0854c14c ldr r0, [r1] - ldr r2, _080AC754 + ldr r2, =0x000006cc adds r0, r2 ldrh r0, [r0] adds r2, r1, 0 cmp r0, 0x4 bhi _080AC810 lsls r0, 2 - ldr r1, _080AC758 + ldr r1, =_080AC75C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AC750: .4byte 0x0854c14c -_080AC754: .4byte 0x000006cc -_080AC758: .4byte _080AC75C + .pool .align 2, 0 _080AC75C: .4byte _080AC770 @@ -353776,65 +342245,61 @@ _080AC75C: .4byte _080AC7D8 _080AC770: ldr r1, [r2] - ldr r2, _080AC784 + ldr r2, =0x000006c6 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080AC814 - ldr r0, _080AC788 + ldr r0, =0x000006cc adds r1, r0 b _080AC7F8 .align 2, 0 -_080AC784: .4byte 0x000006c6 -_080AC788: .4byte 0x000006cc + .pool _080AC78C: bl sub_80ABF84 - ldr r0, _080AC79C + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AC7A0 + ldr r2, =0x000006cc adds r1, r2 b _080AC7F8 .align 2, 0 -_080AC79C: .4byte 0x0854c14c -_080AC7A0: .4byte 0x000006cc + .pool _080AC7A4: bl sub_80ABFA4 lsls r0, 24 cmp r0, 0 bne _080AC814 - ldr r0, _080AC7B8 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r0, _080AC7BC + ldr r0, =0x000006cc adds r1, r0 b _080AC7F8 .align 2, 0 -_080AC7B8: .4byte 0x0854c14c -_080AC7BC: .4byte 0x000006cc + .pool _080AC7C0: bl sub_80ABFF0 - ldr r0, _080AC7D0 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AC7D4 + ldr r2, =0x000006cc adds r1, r2 b _080AC7F8 .align 2, 0 -_080AC7D0: .4byte 0x0854c14c -_080AC7D4: .4byte 0x000006cc + .pool _080AC7D8: bl sub_80AC01C - ldr r0, _080AC800 + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r1, _080AC804 + ldr r1, =0x0000073c adds r0, r2, r1 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x6 bne _080AC814 - ldr r0, _080AC808 + ldr r0, =0x000006d2 adds r1, r2, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, _080AC80C + ldr r0, =0x000006cc adds r1, r2, r0 _080AC7F8: ldrh r0, [r1] @@ -353842,10 +342307,7 @@ _080AC7F8: strh r0, [r1] b _080AC814 .align 2, 0 -_080AC800: .4byte 0x0854c14c -_080AC804: .4byte 0x0000073c -_080AC808: .4byte 0x000006d2 -_080AC80C: .4byte 0x000006cc + .pool _080AC810: bl sub_80AC01C _080AC814: @@ -353862,13 +342324,13 @@ sub_80AC818: @ 80AC818 thumb_func_start sub_80AC81C sub_80AC81C: @ 80AC81C push {lr} - ldr r0, _080AC82C + ldr r0, =task50_0807B6D4 + 1 movs r1, 0x50 bl AddTask pop {r0} bx r0 .align 2, 0 -_080AC82C: .4byte task50_0807B6D4 + 1 + .pool thumb_func_end sub_80AC81C thumb_func_start task50_0807B6D4 @@ -353879,20 +342341,19 @@ task50_0807B6D4: @ 80AC830 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080AC854 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x4 bhi _080AC922 lsls r0, 2 - ldr r1, _080AC858 + ldr r1, =_080AC85C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AC854: .4byte 0x03005e00 -_080AC858: .4byte _080AC85C + .pool .align 2, 0 _080AC85C: .4byte _080AC870 @@ -353904,10 +342365,10 @@ _080AC870: movs r0, 0 strh r0, [r4, 0xA] strh r0, [r4, 0xC] - ldr r0, _080AC8C0 + ldr r0, =0x04000048 ldrh r0, [r0] strh r0, [r4, 0xE] - ldr r1, _080AC8C4 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set movs r0, 0x50 @@ -353939,8 +342400,7 @@ _080AC8AC: ble _080AC922 b _080AC910 .align 2, 0 -_080AC8C0: .4byte 0x04000048 -_080AC8C4: .4byte 0x00003f3f + .pool _080AC8C8: ldrh r0, [r4, 0xC] adds r0, 0x1 @@ -353994,35 +342454,35 @@ _080AC922: thumb_func_start sub_80AC928 sub_80AC928: @ 80AC928 push {r4,lr} - ldr r0, _080AC978 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AC97C + ldr r2, =0x000006cc adds r0, r1, r2 movs r3, 0 movs r2, 0 strh r2, [r0] - ldr r4, _080AC980 + ldr r4, =0x000006d2 adds r0, r1, r4 strb r3, [r0] adds r4, 0x4 adds r0, r1, r4 strh r2, [r0] - ldr r0, _080AC984 + ldr r0, =0x000006db adds r2, r1, r0 movs r0, 0x8 strb r0, [r2] - ldr r2, _080AC988 + ldr r2, =0x000006dc adds r0, r1, r2 strb r3, [r0] adds r4, 0x3 adds r2, r1, r4 movs r0, 0xA strb r0, [r2] - ldr r0, _080AC98C + ldr r0, =0x000006c1 adds r2, r1, r0 movs r0, 0x3 strb r0, [r2] - ldr r2, _080AC990 + ldr r2, =0x000006c2 adds r1, r2 movs r0, 0x14 strb r0, [r1] @@ -354032,22 +342492,16 @@ sub_80AC928: @ 80AC928 pop {r0} bx r0 .align 2, 0 -_080AC978: .4byte 0x0854c14c -_080AC97C: .4byte 0x000006cc -_080AC980: .4byte 0x000006d2 -_080AC984: .4byte 0x000006db -_080AC988: .4byte 0x000006dc -_080AC98C: .4byte 0x000006c1 -_080AC990: .4byte 0x000006c2 + .pool thumb_func_end sub_80AC928 thumb_func_start sub_80AC994 sub_80AC994: @ 80AC994 push {r4,lr} bl sub_80AC928 - ldr r0, _080AC9BC + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AC9C0 + ldr r2, =0x000006d2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -354063,16 +342517,15 @@ _080AC9B4: pop {r0} bx r0 .align 2, 0 -_080AC9BC: .4byte 0x0854c14c -_080AC9C0: .4byte 0x000006d2 + .pool thumb_func_end sub_80AC994 thumb_func_start sub_80AC9C4 sub_80AC9C4: @ 80AC9C4 push {r4,r5,lr} - ldr r0, _080AC9E0 + ldr r0, =0x0854c14c ldr r5, [r0] - ldr r0, _080AC9E4 + ldr r0, =0x000006cc adds r4, r5, r0 ldrh r0, [r4] cmp r0, 0x1 @@ -354083,8 +342536,7 @@ sub_80AC9C4: @ 80AC9C4 beq _080AC9EE b _080ACA18 .align 2, 0 -_080AC9E0: .4byte 0x0854c14c -_080AC9E4: .4byte 0x000006cc + .pool _080AC9E8: cmp r0, 0x2 beq _080ACA00 @@ -354103,7 +342555,7 @@ _080ACA00: lsls r0, 24 cmp r0, 0 bne _080ACA18 - ldr r0, _080ACA20 + ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] @@ -354116,15 +342568,15 @@ _080ACA18: pop {r0} bx r0 .align 2, 0 -_080ACA20: .4byte 0x000006d2 + .pool thumb_func_end sub_80AC9C4 thumb_func_start sub_80ACA24 sub_80ACA24: @ 80ACA24 push {r4,r5,lr} - ldr r0, _080ACA40 + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r1, _080ACA44 + ldr r1, =0x000006ce adds r3, r2, r1 ldrh r1, [r3] adds r4, r0, 0 @@ -354135,10 +342587,9 @@ sub_80ACA24: @ 80ACA24 movs r0, 0 b _080ACAAA .align 2, 0 -_080ACA40: .4byte 0x0854c14c -_080ACA44: .4byte 0x000006ce + .pool _080ACA48: - ldr r5, _080ACA68 + ldr r5, =0x000006d1 adds r0, r2, r5 ldrb r0, [r0] cmp r0, 0x3 @@ -354149,17 +342600,16 @@ _080ACA48: bne _080ACA70 _080ACA5A: ldr r0, [r4] - ldr r1, _080ACA6C + ldr r1, =0x000006ce adds r0, r1 movs r1, 0xFF strh r1, [r0] movs r0, 0 b _080ACAAA .align 2, 0 -_080ACA68: .4byte 0x000006d1 -_080ACA6C: .4byte 0x000006ce + .pool _080ACA70: - ldr r4, _080ACA9C + ldr r4, =0x000006d9 adds r0, r2, r4 strb r1, [r0] ldrh r0, [r3] @@ -354171,9 +342621,9 @@ _080ACA7C: cmp r0, 0 bne _080ACAA8 bl sub_80ACF38 - ldr r0, _080ACAA0 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r5, _080ACAA4 + ldr r5, =0x000006ce adds r1, r5 ldrh r0, [r1] adds r0, 0x1 @@ -354181,9 +342631,7 @@ _080ACA7C: movs r0, 0 b _080ACAAA .align 2, 0 -_080ACA9C: .4byte 0x000006d9 -_080ACAA0: .4byte 0x0854c14c -_080ACAA4: .4byte 0x000006ce + .pool _080ACAA8: movs r0, 0x1 _080ACAAA: @@ -354202,14 +342650,14 @@ sub_80ACAB0: @ 80ACAB0 ldrsh r0, [r7, r1] cmp r0, 0 bne _080ACAC4 - ldr r0, _080ACB68 + ldr r0, =0x00000169 strh r0, [r7, 0x30] _080ACAC4: movs r2, 0x30 ldrsh r1, [r7, r2] - ldr r0, _080ACB6C + ldr r0, =0x41c64e6d muls r0, r1 - ldr r3, _080ACB70 + ldr r3, =0x00003039 adds r0, r3 lsls r0, 1 lsrs r0, 17 @@ -354219,10 +342667,10 @@ _080ACAC4: movs r1, 0 mov r8, r1 strh r0, [r7, 0x30] - ldr r1, _080ACB74 - ldr r0, _080ACB78 + ldr r1, =0x0854fc4c + ldr r0, =0x0854c14c ldr r5, [r0] - ldr r2, _080ACB7C + ldr r2, =0x000006dc adds r5, r2 ldrb r0, [r5] lsls r0, 2 @@ -354246,7 +342694,7 @@ _080ACAC4: strh r4, [r7, 0x32] asrs r0, 9 strh r0, [r7, 0x34] - ldr r2, _080ACB80 + ldr r2, =0x0854fc44 ldrb r1, [r5] lsls r1, 2 adds r1, r2 @@ -354283,13 +342731,7 @@ _080ACAC4: pop {r0} bx r0 .align 2, 0 -_080ACB68: .4byte 0x00000169 -_080ACB6C: .4byte 0x41c64e6d -_080ACB70: .4byte 0x00003039 -_080ACB74: .4byte 0x0854fc4c -_080ACB78: .4byte 0x0854c14c -_080ACB7C: .4byte 0x000006dc -_080ACB80: .4byte 0x0854fc44 + .pool thumb_func_end sub_80ACAB0 thumb_func_start sub_80ACB84 @@ -354300,10 +342742,10 @@ sub_80ACB84: @ 80ACB84 ldrsh r0, [r5, r1] cmp r0, 0 bne _080ACC60 - ldr r3, _080ACBF8 - ldr r4, _080ACBFC + ldr r3, =0x0854fc44 + ldr r4, =0x0854c14c ldr r2, [r4] - ldr r0, _080ACC00 + ldr r0, =0x000006dc adds r2, r0 ldrb r0, [r2] lsls r0, 2 @@ -354353,9 +342795,7 @@ sub_80ACB84: @ 80ACB84 ands r1, r2 b _080ACC0E .align 2, 0 -_080ACBF8: .4byte 0x0854fc44 -_080ACBFC: .4byte 0x0854c14c -_080ACC00: .4byte 0x000006dc + .pool _080ACC04: adds r0, r5, 0 adds r0, 0x3E @@ -354372,7 +342812,7 @@ _080ACC0E: cmp r0, 0 bne _080ACC80 ldr r0, [r3] - ldr r1, _080ACC54 + ldr r1, =0x000006dc adds r0, r1 ldrb r1, [r0] adds r1, 0x1 @@ -354382,12 +342822,12 @@ _080ACC0E: bl obj_anim_image_start movs r0, 0x1 strh r0, [r5, 0x36] - ldr r1, _080ACC58 + ldr r1, =0x02021bbc ldrh r0, [r5, 0x20] ldrh r1, [r1] subs r0, r1 strh r0, [r5, 0x20] - ldr r1, _080ACC5C + ldr r1, =0x02021bbe ldrh r0, [r5, 0x22] ldrh r1, [r1] subs r0, r1 @@ -354398,9 +342838,7 @@ _080ACC0E: strb r0, [r4] b _080ACC80 .align 2, 0 -_080ACC54: .4byte 0x000006dc -_080ACC58: .4byte 0x02021bbc -_080ACC5C: .4byte 0x02021bbe + .pool _080ACC60: adds r0, r5, 0 adds r0, 0x3F @@ -354434,11 +342872,11 @@ sub_80ACC88: @ 80ACC88 bne _080ACCA8 adds r0, r4, 0 bl sub_80ACAB0 - ldr r0, _080ACCA4 + ldr r0, =sub_80ACB84 + 1 str r0, [r4, 0x1C] b _080ACCAC .align 2, 0 -_080ACCA4: .4byte sub_80ACB84 + 1 + .pool _080ACCA8: subs r0, r1, 0x1 strh r0, [r4, 0x2E] @@ -354456,10 +342894,10 @@ sub_80ACCB4: @ 80ACCB4 adds r7, r0, 0 lsls r5, r1, 16 lsrs r5, 16 - ldr r2, _080ACD38 - ldr r0, _080ACD3C + ldr r2, =0x0854fc4c + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080ACD40 + ldr r1, =0x000006dc adds r0, r1 ldrb r0, [r0] lsls r0, 2 @@ -354483,7 +342921,7 @@ sub_80ACCB4: @ 80ACCB4 subs r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _080ACD44 + ldr r0, =0x0000ffff cmp r6, r0 beq _080ACD12 adds r5, r0, 0 @@ -354501,7 +342939,7 @@ _080ACD12: subs r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _080ACD44 + ldr r0, =0x0000ffff cmp r4, r0 beq _080ACD34 adds r5, r0, 0 @@ -354517,10 +342955,7 @@ _080ACD34: movs r0, 0 b _080ACD5C .align 2, 0 -_080ACD38: .4byte 0x0854fc4c -_080ACD3C: .4byte 0x0854c14c -_080ACD40: .4byte 0x000006dc -_080ACD44: .4byte 0x0000ffff + .pool _080ACD48: mov r1, r8 subs r0, r4, r1 @@ -354544,12 +342979,12 @@ _080ACD5C: thumb_func_start sub_80ACD68 sub_80ACD68: @ 80ACD68 push {lr} - ldr r0, _080ACD74 + ldr r0, =0x0854fc54 bl gpu_tile_obj_alloc_tag_and_copy_to_vram pop {r0} bx r0 .align 2, 0 -_080ACD74: .4byte 0x0854fc54 + .pool thumb_func_end sub_80ACD68 thumb_func_start sub_80ACD78 @@ -354559,9 +342994,9 @@ sub_80ACD78: @ 80ACD78 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _080ACE24 + ldr r0, =0x0854c14c ldr r4, [r0] - ldr r0, _080ACE28 + ldr r0, =0x000006da adds r2, r4, r0 ldrb r0, [r2] cmp r0, 0x18 @@ -354569,8 +343004,8 @@ sub_80ACD78: @ 80ACD78 b _080ACE98 _080ACD92: ldrb r7, [r2] - ldr r0, _080ACE2C - ldr r2, _080ACE30 + ldr r0, =0x0854fc2c + ldr r2, =0x0854fb90 lsls r6, r7, 2 adds r2, r6, r2 movs r3, 0 @@ -354583,7 +343018,7 @@ _080ACD92: lsrs r5, r0, 24 cmp r5, 0x40 beq _080ACE40 - ldr r3, _080ACE34 + ldr r3, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -354597,7 +343032,7 @@ _080ACD92: strh r0, [r1, 0x30] lsls r0, 16 asrs r0, 16 - ldr r1, _080ACE38 + ldr r1, =0x00000257 mov r10, r6 mov r9, r3 mov r12, r4 @@ -354608,9 +343043,9 @@ _080ACD92: _080ACDDE: adds r0, r4, r5 lsls r0, 2 - ldr r6, _080ACE34 + ldr r6, =0x02020630 adds r0, r6 - ldr r3, _080ACE3C + ldr r3, =0xfffffda8 ldrh r6, [r0, 0x30] adds r1, r3, r6 strh r1, [r0, 0x30] @@ -354635,27 +343070,21 @@ _080ACDF6: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _080ACE24 + ldr r0, =0x0854c14c ldr r0, [r0] add r0, r10 str r4, [r0] b _080ACE46 .align 2, 0 -_080ACE24: .4byte 0x0854c14c -_080ACE28: .4byte 0x000006da -_080ACE2C: .4byte 0x0854fc2c -_080ACE30: .4byte 0x0854fb90 -_080ACE34: .4byte 0x02020630 -_080ACE38: .4byte 0x00000257 -_080ACE3C: .4byte 0xfffffda8 + .pool _080ACE40: adds r1, r4, r6 movs r0, 0 str r0, [r1] _080ACE46: - ldr r0, _080ACE7C + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r6, _080ACE80 + ldr r6, =0x000006da adds r1, r2, r6 ldrb r0, [r1] adds r0, 0x1 @@ -354666,8 +343095,8 @@ _080ACE46: bne _080ACE9C movs r3, 0 adds r1, r2, 0 - ldr r5, _080ACE84 - ldr r4, _080ACE88 + ldr r5, =sub_80ACB84 + 1 + ldr r4, =sub_80ACC88 + 1 _080ACE64: lsls r0, r3, 2 adds r0, r1, r0 @@ -354681,10 +343110,7 @@ _080ACE64: str r5, [r2, 0x1C] b _080ACE8E .align 2, 0 -_080ACE7C: .4byte 0x0854c14c -_080ACE80: .4byte 0x000006da -_080ACE84: .4byte sub_80ACB84 + 1 -_080ACE88: .4byte sub_80ACC88 + 1 + .pool _080ACE8C: str r4, [r2, 0x1C] _080ACE8E: @@ -354711,12 +343137,12 @@ _080ACE9E: thumb_func_start sub_80ACEAC sub_80ACEAC: @ 80ACEAC push {r4-r7,lr} - ldr r0, _080ACEC8 + ldr r0, =0x0854c14c ldr r3, [r0] movs r0, 0xDB lsls r0, 3 adds r4, r3, r0 - ldr r1, _080ACECC + ldr r1, =0x000006d9 adds r5, r3, r1 ldrb r0, [r4] ldrb r7, [r5] @@ -354725,16 +343151,15 @@ sub_80ACEAC: @ 80ACEAC movs r0, 0 b _080ACF32 .align 2, 0 -_080ACEC8: .4byte 0x0854c14c -_080ACECC: .4byte 0x000006d9 + .pool _080ACED0: - ldr r0, _080ACF08 + ldr r0, =0x000006d6 adds r2, r3, r0 ldrh r0, [r2] adds r0, 0x1 movs r6, 0 strh r0, [r2] - ldr r7, _080ACF0C + ldr r7, =0x000006db adds r1, r3, r7 lsls r0, 16 lsrs r0, 16 @@ -354756,8 +343181,7 @@ _080ACED0: strh r0, [r1, 0x38] b _080ACF30 .align 2, 0 -_080ACF08: .4byte 0x000006d6 -_080ACF0C: .4byte 0x000006db + .pool _080ACF10: subs r0, 0x1 strb r0, [r4] @@ -354787,9 +343211,9 @@ _080ACF32: sub_80ACF38: @ 80ACF38 push {r4-r7,lr} movs r4, 0 - ldr r0, _080ACF80 + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r3, _080ACF84 + ldr r3, =0x000006da adds r1, r2, r3 adds r7, r0, 0 ldrb r1, [r1] @@ -354813,35 +343237,33 @@ _080ACF5E: bcc _080ACF50 _080ACF6A: ldr r0, [r7] - ldr r1, _080ACF84 + ldr r1, =0x000006da adds r0, r1 movs r1, 0 strb r1, [r0] - ldr r0, _080ACF88 + ldr r0, =0x00001206 bl gpu_tile_obj_free_by_tag pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080ACF80: .4byte 0x0854c14c -_080ACF84: .4byte 0x000006da -_080ACF88: .4byte 0x00001206 + .pool thumb_func_end sub_80ACF38 thumb_func_start sub_80ACF8C sub_80ACF8C: @ 80ACF8C push {r4,lr} - ldr r0, _080ACFC8 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080ACFCC + ldr r2, =0x000006cc adds r0, r1, r2 movs r2, 0 movs r3, 0 strh r3, [r0] - ldr r4, _080ACFD0 + ldr r4, =0x000006d2 adds r0, r1, r4 strb r2, [r0] - ldr r0, _080ACFD4 + ldr r0, =0x000006c1 adds r2, r1, r0 movs r0, 0x3 strb r0, [r2] @@ -354849,7 +343271,7 @@ sub_80ACF8C: @ 80ACF8C adds r2, r1, r4 movs r0, 0x14 strb r0, [r2] - ldr r0, _080ACFD8 + ldr r0, =0x000006e5 adds r2, r1, r0 movs r0, 0x10 strb r0, [r2] @@ -354861,11 +343283,7 @@ sub_80ACF8C: @ 80ACF8C pop {r0} bx r0 .align 2, 0 -_080ACFC8: .4byte 0x0854c14c -_080ACFCC: .4byte 0x000006cc -_080ACFD0: .4byte 0x000006d2 -_080ACFD4: .4byte 0x000006c1 -_080ACFD8: .4byte 0x000006e5 + .pool thumb_func_end sub_80ACF8C thumb_func_start sub_80ACFDC @@ -354874,9 +343292,9 @@ sub_80ACFDC: @ 80ACFDC mov r7, r8 push {r7} bl sub_80ACF8C - ldr r2, _080AD03C + ldr r2, =0x0854c14c ldr r1, [r2] - ldr r3, _080AD040 + ldr r3, =0x000006d2 adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 @@ -354888,12 +343306,12 @@ _080ACFF8: movs r4, 0 mov r1, r8 ldr r0, [r1] - ldr r3, _080AD044 + ldr r3, =0x000006e4 adds r0, r3 ldrb r0, [r0] cmp r4, r0 bcs _080AD02C - ldr r0, _080AD03C + ldr r0, =0x0854c14c ldr r5, [r0] adds r6, r5, r3 _080AD012: @@ -354920,17 +343338,15 @@ _080AD032: pop {r0} bx r0 .align 2, 0 -_080AD03C: .4byte 0x0854c14c -_080AD040: .4byte 0x000006d2 -_080AD044: .4byte 0x000006e4 + .pool thumb_func_end sub_80ACFDC thumb_func_start snowflakes_progress2 snowflakes_progress2: @ 80AD048 push {r4,r5,lr} - ldr r0, _080AD078 + ldr r0, =0x0854c14c ldr r5, [r0] - ldr r0, _080AD07C + ldr r0, =0x000006cc adds r4, r5, r0 ldrh r0, [r4] cmp r0, 0 @@ -354939,7 +343355,7 @@ snowflakes_progress2: @ 80AD048 lsls r0, 24 cmp r0, 0 bne _080AD070 - ldr r0, _080AD080 + ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] @@ -354951,17 +343367,15 @@ _080AD070: pop {r0} bx r0 .align 2, 0 -_080AD078: .4byte 0x0854c14c -_080AD07C: .4byte 0x000006cc -_080AD080: .4byte 0x000006d2 + .pool thumb_func_end snowflakes_progress2 thumb_func_start sub_80AD084 sub_80AD084: @ 80AD084 push {r4,lr} - ldr r0, _080AD09C + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r0, _080AD0A0 + ldr r0, =0x000006ce adds r3, r2, r0 ldrh r1, [r3] cmp r1, 0 @@ -354971,10 +343385,9 @@ sub_80AD084: @ 80AD084 movs r0, 0 b _080AD0E2 .align 2, 0 -_080AD09C: .4byte 0x0854c14c -_080AD0A0: .4byte 0x000006ce + .pool _080AD0A4: - ldr r4, _080AD0D4 + ldr r4, =0x000006e5 adds r0, r2, r4 strb r1, [r0] subs r4, 0x5 @@ -354988,9 +343401,9 @@ _080AD0B6: lsls r0, 24 cmp r0, 0 bne _080AD0E0 - ldr r0, _080AD0D8 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r0, _080AD0DC + ldr r0, =0x000006ce adds r1, r0 ldrh r0, [r1] adds r0, 0x1 @@ -354998,9 +343411,7 @@ _080AD0B6: movs r0, 0 b _080AD0E2 .align 2, 0 -_080AD0D4: .4byte 0x000006e5 -_080AD0D8: .4byte 0x0854c14c -_080AD0DC: .4byte 0x000006ce + .pool _080AD0E0: movs r0, 0x1 _080AD0E2: @@ -355012,11 +343423,11 @@ _080AD0E2: thumb_func_start snowflakes_progress snowflakes_progress: @ 80AD0E8 push {r4,lr} - ldr r0, _080AD104 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r0, _080AD108 + ldr r0, =0x000006e4 adds r3, r1, r0 - ldr r4, _080AD10C + ldr r4, =0x000006e5 adds r2, r1, r4 ldrb r0, [r3] ldrb r4, [r2] @@ -355025,9 +343436,7 @@ snowflakes_progress: @ 80AD0E8 movs r0, 0 b _080AD152 .align 2, 0 -_080AD104: .4byte 0x0854c14c -_080AD108: .4byte 0x000006e4 -_080AD10C: .4byte 0x000006e5 + .pool _080AD110: movs r0, 0xDC lsls r0, 3 @@ -355050,11 +343459,11 @@ _080AD110: _080AD136: bl snowflake_remove _080AD13A: - ldr r0, _080AD158 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r2, _080AD15C + ldr r2, =0x000006e4 adds r1, r0, r2 - ldr r4, _080AD160 + ldr r4, =0x000006e5 adds r0, r4 ldrb r1, [r1] ldrb r0, [r0] @@ -355067,15 +343476,13 @@ _080AD152: pop {r1} bx r1 .align 2, 0 -_080AD158: .4byte 0x0854c14c -_080AD15C: .4byte 0x000006e4 -_080AD160: .4byte 0x000006e5 + .pool thumb_func_end snowflakes_progress thumb_func_start snowflake_add snowflake_add: @ 80AD164 push {r4-r6,lr} - ldr r0, _080AD1B8 + ldr r0, =0x0854fc8c movs r1, 0 movs r2, 0 movs r3, 0x4E @@ -355084,14 +343491,14 @@ snowflake_add: @ 80AD164 lsrs r1, r0, 24 cmp r1, 0x40 beq _080AD1C8 - ldr r0, _080AD1BC + ldr r0, =0x02020630 lsls r4, r1, 4 adds r4, r1 lsls r4, 2 adds r4, r0 - ldr r0, _080AD1C0 + ldr r0, =0x0854c14c ldr r5, [r0] - ldr r0, _080AD1C4 + ldr r0, =0x000006e4 adds r6, r5, r0 ldrb r0, [r6] strh r0, [r4, 0x36] @@ -355114,10 +343521,7 @@ snowflake_add: @ 80AD164 movs r0, 0x1 b _080AD1CA .align 2, 0 -_080AD1B8: .4byte 0x0854fc8c -_080AD1BC: .4byte 0x02020630 -_080AD1C0: .4byte 0x0854c14c -_080AD1C4: .4byte 0x000006e4 + .pool _080AD1C8: movs r0, 0 _080AD1CA: @@ -355129,9 +343533,9 @@ _080AD1CA: thumb_func_start snowflake_remove snowflake_remove: @ 80AD1D0 push {lr} - ldr r0, _080AD1E4 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r0, _080AD1E8 + ldr r0, =0x000006e4 adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0 @@ -355139,8 +343543,7 @@ snowflake_remove: @ 80AD1D0 movs r0, 0 b _080AD200 .align 2, 0 -_080AD1E4: .4byte 0x0854c14c -_080AD1E8: .4byte 0x000006e4 + .pool _080AD1EC: subs r0, 0x1 strb r0, [r2] @@ -355177,7 +343580,7 @@ sub_80AD204: @ 80AD204 adds r4, r0 lsls r4, 16 lsrs r4, 16 - ldr r1, _080AD2A8 + ldr r1, =0x02021bbe adds r0, r5, 0 adds r0, 0x29 ldrb r0, [r0] @@ -355191,7 +343594,7 @@ sub_80AD204: @ 80AD204 subs r1, r0 movs r7, 0 strh r1, [r5, 0x22] - ldr r1, _080AD2AC + ldr r1, =0x02021bbc adds r0, r5, 0 adds r0, 0x28 ldrb r0, [r0] @@ -355237,17 +343640,16 @@ _080AD294: pop {r0} bx r0 .align 2, 0 -_080AD2A8: .4byte 0x02021bbe -_080AD2AC: .4byte 0x02021bbc + .pool thumb_func_end sub_80AD204 thumb_func_start sub_80AD2B0 sub_80AD2B0: @ 80AD2B0 push {r4,lr} adds r3, r0, 0 - ldr r0, _080AD2FC + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AD300 + ldr r1, =0x000006e2 adds r4, r0, r1 ldrh r0, [r4] cmp r0, 0x12 @@ -355259,9 +343661,9 @@ sub_80AD2B0: @ 80AD2B0 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _080AD304 + ldr r0, =sub_80AD30C + 1 str r0, [r3, 0x1C] - ldr r1, _080AD308 + ldr r1, =0x02021bbe adds r0, r3, 0 adds r0, 0x29 ldrb r0, [r0] @@ -355283,10 +343685,7 @@ _080AD2F6: pop {r0} bx r0 .align 2, 0 -_080AD2FC: .4byte 0x0854c14c -_080AD300: .4byte 0x000006e2 -_080AD304: .4byte sub_80AD30C + 1 -_080AD308: .4byte 0x02021bbe + .pool thumb_func_end sub_80AD2B0 thumb_func_start sub_80AD30C @@ -355306,7 +343705,7 @@ sub_80AD30C: @ 80AD30C movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x34] - ldr r1, _080AD384 + ldr r1, =0x08329f40 movs r3, 0x34 ldrsh r0, [r4, r3] lsls r0, 1 @@ -355325,10 +343724,10 @@ _080AD33E: ldrsb r5, [r0, r5] ldrh r0, [r4, 0x20] adds r0, r5 - ldr r1, _080AD388 + ldr r1, =0x02021bbc ldrh r1, [r1] adds r3, r1, r0 - ldr r2, _080AD38C + ldr r2, =0x000001ff adds r0, r2, 0 ands r3, r0 adds r2, r3, 0 @@ -355337,7 +343736,7 @@ _080AD33E: ands r0, r2 cmp r0, 0 beq _080AD370 - ldr r3, _080AD390 + ldr r3, =0xffffff00 adds r0, r3, 0 orrs r2, r0 lsls r0, r2, 16 @@ -355354,10 +343753,7 @@ _080AD370: subs r0, r1 b _080AD39C .align 2, 0 -_080AD384: .4byte 0x08329f40 -_080AD388: .4byte 0x02021bbc -_080AD38C: .4byte 0x000001ff -_080AD390: .4byte 0xffffff00 + .pool _080AD394: cmp r0, 0xF2 ble _080AD39E @@ -355372,7 +343768,7 @@ _080AD39E: ldrsb r3, [r0, r3] ldrh r0, [r4, 0x22] adds r0, r3 - ldr r1, _080AD3DC + ldr r1, =0x02021bbe ldrh r1, [r1] adds r2, r1, r0 movs r0, 0xFF @@ -355397,7 +343793,7 @@ _080AD39E: strh r0, [r4, 0x3A] b _080AD40C .align 2, 0 -_080AD3DC: .4byte 0x02021bbe + .pool _080AD3E0: adds r0, r2, 0 subs r0, 0xF3 @@ -355419,7 +343815,7 @@ _080AD3E0: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _080AD440 + ldr r0, =sub_80AD2B0 + 1 str r0, [r4, 0x1C] _080AD40C: ldrh r0, [r4, 0x38] @@ -355441,44 +343837,44 @@ _080AD40C: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _080AD440 + ldr r0, =sub_80AD2B0 + 1 str r0, [r4, 0x1C] _080AD438: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080AD440: .4byte sub_80AD2B0 + 1 + .pool thumb_func_end sub_80AD30C thumb_func_start sub_80AD444 sub_80AD444: @ 80AD444 push {r4,r5,lr} - ldr r0, _080AD49C + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AD4A0 + ldr r2, =0x000006cc adds r0, r1, r2 movs r3, 0 movs r2, 0 strh r2, [r0] - ldr r5, _080AD4A4 + ldr r5, =0x000006d2 adds r4, r1, r5 strb r3, [r4] adds r5, 0x4 adds r0, r1, r5 strh r2, [r0] - ldr r0, _080AD4A8 + ldr r0, =0x000006db adds r2, r1, r0 movs r0, 0x4 strb r0, [r2] - ldr r2, _080AD4AC + ldr r2, =0x000006dc adds r0, r1, r2 strb r3, [r0] adds r5, 0x3 adds r2, r1, r5 movs r0, 0x10 strb r0, [r2] - ldr r0, _080AD4B0 + ldr r0, =0x000006c1 adds r2, r1, r0 movs r0, 0x3 strb r0, [r2] @@ -355487,7 +343883,7 @@ sub_80AD444: @ 80AD444 movs r0, 0x14 strb r0, [r2] strb r3, [r4] - ldr r0, _080AD4B4 + ldr r0, =0x000006ed adds r1, r0 strb r3, [r1] movs r0, 0x51 @@ -355496,22 +343892,16 @@ sub_80AD444: @ 80AD444 pop {r0} bx r0 .align 2, 0 -_080AD49C: .4byte 0x0854c14c -_080AD4A0: .4byte 0x000006cc -_080AD4A4: .4byte 0x000006d2 -_080AD4A8: .4byte 0x000006db -_080AD4AC: .4byte 0x000006dc -_080AD4B0: .4byte 0x000006c1 -_080AD4B4: .4byte 0x000006ed + .pool thumb_func_end sub_80AD444 thumb_func_start sub_80AD4B8 sub_80AD4B8: @ 80AD4B8 push {r4,lr} bl sub_80AD444 - ldr r0, _080AD4E0 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AD4E4 + ldr r2, =0x000006d2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -355527,27 +343917,26 @@ _080AD4D8: pop {r0} bx r0 .align 2, 0 -_080AD4E0: .4byte 0x0854c14c -_080AD4E4: .4byte 0x000006d2 + .pool thumb_func_end sub_80AD4B8 thumb_func_start sub_80AD4E8 sub_80AD4E8: @ 80AD4E8 push {r4,r5,lr} - ldr r0, _080AD53C + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AD540 + ldr r2, =0x000006cc adds r0, r1, r2 movs r4, 0 movs r2, 0 strh r2, [r0] - ldr r5, _080AD544 + ldr r5, =0x000006d2 adds r3, r1, r5 strb r4, [r3] adds r5, 0x4 adds r0, r1, r5 strh r2, [r0] - ldr r0, _080AD548 + ldr r0, =0x000006db adds r2, r1, r0 movs r0, 0x4 strb r0, [r2] @@ -355555,7 +343944,7 @@ sub_80AD4E8: @ 80AD4E8 adds r2, r1, r5 movs r0, 0x1 strb r0, [r2] - ldr r0, _080AD54C + ldr r0, =0x000006d9 adds r2, r1, r0 movs r0, 0x18 strb r0, [r2] @@ -355563,7 +343952,7 @@ sub_80AD4E8: @ 80AD4E8 adds r2, r1, r5 movs r0, 0x3 strb r0, [r2] - ldr r0, _080AD550 + ldr r0, =0x000006c2 adds r1, r0 movs r0, 0x14 strb r0, [r1] @@ -355574,21 +343963,16 @@ sub_80AD4E8: @ 80AD4E8 pop {r0} bx r0 .align 2, 0 -_080AD53C: .4byte 0x0854c14c -_080AD540: .4byte 0x000006cc -_080AD544: .4byte 0x000006d2 -_080AD548: .4byte 0x000006db -_080AD54C: .4byte 0x000006d9 -_080AD550: .4byte 0x000006c2 + .pool thumb_func_end sub_80AD4E8 thumb_func_start sub_80AD554 sub_80AD554: @ 80AD554 push {r4,lr} bl sub_80AD4E8 - ldr r0, _080AD57C + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AD580 + ldr r2, =0x000006d2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -355604,17 +343988,16 @@ _080AD574: pop {r0} bx r0 .align 2, 0 -_080AD57C: .4byte 0x0854c14c -_080AD580: .4byte 0x000006d2 + .pool thumb_func_end sub_80AD554 thumb_func_start sub_80AD584 sub_80AD584: @ 80AD584 push {r4,r5,lr} bl sub_80AD9F8 - ldr r0, _080AD5A4 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AD5A8 + ldr r1, =0x000006cc adds r0, r1 ldrh r0, [r0] cmp r0, 0xE @@ -355622,14 +344005,12 @@ sub_80AD584: @ 80AD584 b _080AD8FA _080AD59A: lsls r0, 2 - ldr r1, _080AD5AC + ldr r1, =_080AD5B0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AD5A4: .4byte 0x0854c14c -_080AD5A8: .4byte 0x000006cc -_080AD5AC: .4byte _080AD5B0 + .pool .align 2, 0 _080AD5B0: .4byte _080AD5EC @@ -355649,16 +344030,15 @@ _080AD5B0: .4byte _080AD8DC _080AD5EC: bl sub_80ACD68 - ldr r0, _080AD600 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AD604 + ldr r2, =0x000006cc adds r1, r2 ldrh r0, [r1] adds r0, 0x1 b _080AD8F8 .align 2, 0 -_080AD600: .4byte 0x0854c14c -_080AD604: .4byte 0x000006cc + .pool _080AD608: bl sub_80ACD78 lsls r0, 24 @@ -355666,16 +344046,15 @@ _080AD608: beq _080AD614 b _080AD8FA _080AD614: - ldr r0, _080AD624 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r3, _080AD628 + ldr r3, =0x000006cc adds r1, r3 ldrh r0, [r1] adds r0, 0x1 b _080AD8F8 .align 2, 0 -_080AD624: .4byte 0x0854c14c -_080AD628: .4byte 0x000006cc + .pool _080AD62C: bl sub_80ACEAC lsls r0, 24 @@ -355683,43 +344062,39 @@ _080AD62C: beq _080AD638 b _080AD8FA _080AD638: - ldr r0, _080AD650 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r0, _080AD654 + ldr r0, =0x000006d2 adds r2, r1, r0 movs r0, 0x1 strb r0, [r2] - ldr r2, _080AD658 + ldr r2, =0x000006cc adds r1, r2 ldrh r0, [r1] adds r0, 0x1 b _080AD8F8 .align 2, 0 -_080AD650: .4byte 0x0854c14c -_080AD654: .4byte 0x000006d2 -_080AD658: .4byte 0x000006cc + .pool _080AD65C: - ldr r0, _080AD674 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r3, _080AD678 + ldr r3, =0x000006c6 adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 bne _080AD66C b _080AD8FA _080AD66C: - ldr r0, _080AD67C + ldr r0, =0x000006cc adds r1, r0 movs r0, 0x6 b _080AD8F8 .align 2, 0 -_080AD674: .4byte 0x0854c14c -_080AD678: .4byte 0x000006c6 -_080AD67C: .4byte 0x000006cc + .pool _080AD680: - ldr r0, _080AD6D0 + ldr r0, =0x0854c14c ldr r4, [r0] - ldr r2, _080AD6D4 + ldr r2, =0x000006ea adds r1, r4, r2 movs r0, 0x1 strb r0, [r1] @@ -355731,18 +344106,18 @@ _080AD680: adds r1, r5, 0 bl __umodsi3 adds r0, r5 - ldr r3, _080AD6D8 + ldr r3, =0x000006e6 adds r1, r4, r3 strh r0, [r1] - ldr r0, _080AD6DC + ldr r0, =0x000006cc adds r4, r0 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] _080AD6B0: - ldr r0, _080AD6D0 + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r3, _080AD6D8 + ldr r3, =0x000006e6 adds r1, r2, r3 ldrh r0, [r1] subs r0, 0x1 @@ -355752,20 +344127,17 @@ _080AD6B0: beq _080AD6C6 b _080AD8FA _080AD6C6: - ldr r0, _080AD6DC + ldr r0, =0x000006cc adds r1, r2, r0 ldrh r0, [r1] adds r0, 0x1 b _080AD8F8 .align 2, 0 -_080AD6D0: .4byte 0x0854c14c -_080AD6D4: .4byte 0x000006ea -_080AD6D8: .4byte 0x000006e6 -_080AD6DC: .4byte 0x000006cc + .pool _080AD6E0: - ldr r0, _080AD700 + ldr r0, =0x0854c14c ldr r4, [r0] - ldr r1, _080AD704 + ldr r1, =0x000006ea adds r0, r4, r1 movs r5, 0x1 strb r5, [r0] @@ -355773,25 +344145,23 @@ _080AD6E0: lsls r0, 16 lsrs r0, 16 ands r0, r5 - ldr r2, _080AD708 + ldr r2, =0x000006eb adds r1, r4, r2 strb r0, [r1] b _080AD768 .align 2, 0 -_080AD700: .4byte 0x0854c14c -_080AD704: .4byte 0x000006ea -_080AD708: .4byte 0x000006eb + .pool _080AD70C: bl GenerateRandomNumber - ldr r1, _080AD774 + ldr r1, =0x0854c14c ldr r2, [r1] movs r1, 0x1 ands r1, r0 adds r1, 0x1 - ldr r3, _080AD778 + ldr r3, =0x000006ec adds r0, r2, r3 strb r1, [r0] - ldr r0, _080AD77C + ldr r0, =0x000006cc adds r2, r0 ldrh r0, [r2] adds r0, 0x1 @@ -355799,14 +344169,14 @@ _080AD70C: _080AD72A: movs r0, 0x13 bl sub_80ABC48 - ldr r0, _080AD774 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AD780 + ldr r2, =0x000006eb adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 bne _080AD74E - ldr r3, _080AD778 + ldr r3, =0x000006ec adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0x1 @@ -355815,33 +344185,29 @@ _080AD72A: bl sub_80AD9BC _080AD74E: bl GenerateRandomNumber - ldr r1, _080AD774 + ldr r1, =0x0854c14c ldr r4, [r1] lsls r0, 16 lsrs r0, 16 movs r1, 0x3 bl __umodsi3 adds r0, 0x6 - ldr r2, _080AD784 + ldr r2, =0x000006e6 adds r1, r4, r2 strh r0, [r1] _080AD768: - ldr r3, _080AD77C + ldr r3, =0x000006cc adds r4, r3 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] b _080AD8FA .align 2, 0 -_080AD774: .4byte 0x0854c14c -_080AD778: .4byte 0x000006ec -_080AD77C: .4byte 0x000006cc -_080AD780: .4byte 0x000006eb -_080AD784: .4byte 0x000006e6 + .pool _080AD788: - ldr r0, _080AD7D4 + ldr r0, =0x0854c14c ldr r4, [r0] - ldr r0, _080AD7D8 + ldr r0, =0x000006e6 adds r5, r4, r0 ldrh r0, [r5] subs r0, 0x1 @@ -355853,11 +344219,11 @@ _080AD788: _080AD79E: movs r0, 0x3 bl sub_80ABC48 - ldr r2, _080AD7DC + ldr r2, =0x000006ea adds r1, r4, r2 movs r0, 0x1 strb r0, [r1] - ldr r3, _080AD7E0 + ldr r3, =0x000006ec adds r1, r4, r3 ldrb r0, [r1] subs r0, 0x1 @@ -355872,39 +344238,34 @@ _080AD79E: ands r0, r1 adds r0, 0x3C strh r0, [r5] - ldr r0, _080AD7E4 + ldr r0, =0x000006cc adds r1, r4, r0 movs r0, 0xA b _080AD8F8 .align 2, 0 -_080AD7D4: .4byte 0x0854c14c -_080AD7D8: .4byte 0x000006e6 -_080AD7DC: .4byte 0x000006ea -_080AD7E0: .4byte 0x000006ec -_080AD7E4: .4byte 0x000006cc + .pool _080AD7E8: - ldr r1, _080AD7F8 + ldr r1, =0x000006eb adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 bne _080AD800 - ldr r2, _080AD7FC + ldr r2, =0x000006cc adds r1, r4, r2 b _080AD8F6 .align 2, 0 -_080AD7F8: .4byte 0x000006eb -_080AD7FC: .4byte 0x000006cc + .pool _080AD800: - ldr r3, _080AD808 + ldr r3, =0x000006cc adds r1, r4, r3 movs r0, 0xB b _080AD8F8 .align 2, 0 -_080AD808: .4byte 0x000006cc + .pool _080AD80C: - ldr r0, _080AD828 + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r0, _080AD82C + ldr r0, =0x000006e6 adds r1, r2, r0 ldrh r0, [r1] subs r0, 0x1 @@ -355912,40 +344273,36 @@ _080AD80C: lsls r0, 16 cmp r0, 0 bne _080AD8FA - ldr r3, _080AD830 + ldr r3, =0x000006cc adds r1, r2, r3 movs r0, 0x8 b _080AD8F8 .align 2, 0 -_080AD828: .4byte 0x0854c14c -_080AD82C: .4byte 0x000006e6 -_080AD830: .4byte 0x000006cc + .pool _080AD834: bl GenerateRandomNumber - ldr r1, _080AD858 + ldr r1, =0x0854c14c ldr r2, [r1] lsls r0, 16 lsrs r0, 16 movs r1, 0xF ands r0, r1 adds r0, 0x3C - ldr r3, _080AD85C + ldr r3, =0x000006e6 adds r1, r2, r3 strh r0, [r1] - ldr r0, _080AD860 + ldr r0, =0x000006cc adds r2, r0 ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] b _080AD8FA .align 2, 0 -_080AD858: .4byte 0x0854c14c -_080AD85C: .4byte 0x000006e6 -_080AD860: .4byte 0x000006cc + .pool _080AD864: - ldr r0, _080AD89C + ldr r0, =0x0854c14c ldr r5, [r0] - ldr r1, _080AD8A0 + ldr r1, =0x000006e6 adds r4, r5, r1 ldrh r0, [r4] subs r0, 0x1 @@ -355962,19 +344319,17 @@ _080AD864: ands r1, r0 adds r1, 0x1E strh r1, [r4] - ldr r2, _080AD8A4 + ldr r2, =0x000006cc adds r1, r5, r2 ldrh r0, [r1] adds r0, 0x1 b _080AD8F8 .align 2, 0 -_080AD89C: .4byte 0x0854c14c -_080AD8A0: .4byte 0x000006e6 -_080AD8A4: .4byte 0x000006cc + .pool _080AD8A8: - ldr r0, _080AD8D0 + ldr r0, =0x0854c14c ldr r4, [r0] - ldr r3, _080AD8D4 + ldr r3, =0x000006e6 adds r1, r4, r3 ldrh r0, [r1] subs r0, 0x1 @@ -355986,28 +344341,26 @@ _080AD8A8: movs r1, 0x3 movs r2, 0x5 bl sub_80ABC7C - ldr r0, _080AD8D8 + ldr r0, =0x000006cc adds r1, r4, r0 ldrh r0, [r1] adds r0, 0x1 b _080AD8F8 .align 2, 0 -_080AD8D0: .4byte 0x0854c14c -_080AD8D4: .4byte 0x000006e6 -_080AD8D8: .4byte 0x000006cc + .pool _080AD8DC: - ldr r0, _080AD900 + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r1, _080AD904 + ldr r1, =0x000006c6 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x3 bne _080AD8FA - ldr r3, _080AD908 + ldr r3, =0x000006ea adds r1, r2, r3 movs r0, 0x1 strb r0, [r1] - ldr r0, _080AD90C + ldr r0, =0x000006cc adds r1, r2, r0 _080AD8F6: movs r0, 0x4 @@ -356018,18 +344371,15 @@ _080AD8FA: pop {r0} bx r0 .align 2, 0 -_080AD900: .4byte 0x0854c14c -_080AD904: .4byte 0x000006c6 -_080AD908: .4byte 0x000006ea -_080AD90C: .4byte 0x000006cc + .pool thumb_func_end sub_80AD584 thumb_func_start sub_80AD910 sub_80AD910: @ 80AD910 push {r4-r6,lr} - ldr r0, _080AD92C + ldr r0, =0x0854c14c ldr r6, [r0] - ldr r0, _080AD930 + ldr r0, =0x000006ce adds r5, r6, r0 ldrh r1, [r5] cmp r1, 0x1 @@ -356040,14 +344390,13 @@ sub_80AD910: @ 80AD910 beq _080AD93A b _080AD9AC .align 2, 0 -_080AD92C: .4byte 0x0854c14c -_080AD930: .4byte 0x000006ce + .pool _080AD934: cmp r1, 0x2 beq _080AD990 b _080AD9AC _080AD93A: - ldr r2, _080AD980 + ldr r2, =0x000006ea adds r0, r6, r2 strb r1, [r0] ldrh r0, [r5] @@ -356055,9 +344404,9 @@ _080AD93A: strh r0, [r5] _080AD946: bl sub_80AD584 - ldr r0, _080AD984 + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r1, _080AD980 + ldr r1, =0x000006ea adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 @@ -356071,21 +344420,18 @@ _080AD946: beq _080AD9AC cmp r0, 0xD beq _080AD9AC - ldr r0, _080AD988 + ldr r0, =0x000006d9 adds r1, r2, r0 movs r0, 0 strb r0, [r1] - ldr r0, _080AD98C + ldr r0, =0x000006ce adds r1, r2, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _080AD9B4 .align 2, 0 -_080AD980: .4byte 0x000006ea -_080AD984: .4byte 0x0854c14c -_080AD988: .4byte 0x000006d9 -_080AD98C: .4byte 0x000006ce + .pool _080AD990: bl sub_80ACEAC lsls r0, 24 @@ -356093,7 +344439,7 @@ _080AD990: cmp r4, 0 bne _080AD9B4 bl sub_80ACF38 - ldr r1, _080AD9B0 + ldr r1, =0x000006ed adds r0, r6, r1 strb r4, [r0] ldrh r0, [r5] @@ -356103,7 +344449,7 @@ _080AD9AC: movs r0, 0 b _080AD9B6 .align 2, 0 -_080AD9B0: .4byte 0x000006ed + .pool _080AD9B4: movs r0, 0x1 _080AD9B6: @@ -356117,9 +344463,9 @@ sub_80AD9BC: @ 80AD9BC push {r4-r6,lr} lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _080AD9F0 + ldr r0, =0x0854c14c ldr r4, [r0] - ldr r0, _080AD9F4 + ldr r0, =0x000006ed adds r5, r4, r0 ldrb r0, [r5] cmp r0, 0 @@ -356140,16 +344486,15 @@ _080AD9EA: pop {r0} bx r0 .align 2, 0 -_080AD9F0: .4byte 0x0854c14c -_080AD9F4: .4byte 0x000006ed + .pool thumb_func_end sub_80AD9BC thumb_func_start sub_80AD9F8 sub_80AD9F8: @ 80AD9F8 push {r4,lr} - ldr r0, _080ADA30 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080ADA34 + ldr r2, =0x000006ed adds r0, r1, r2 ldrb r4, [r0] cmp r4, 0x1 @@ -356172,22 +344517,20 @@ sub_80AD9F8: @ 80AD9F8 bl audio_play b _080ADA3E .align 2, 0 -_080ADA30: .4byte 0x0854c14c -_080ADA34: .4byte 0x000006ed + .pool _080ADA38: movs r0, 0x58 bl audio_play _080ADA3E: - ldr r0, _080ADA4C + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080ADA50 + ldr r1, =0x000006ed adds r0, r1 movs r1, 0 strb r1, [r0] b _080ADA58 .align 2, 0 -_080ADA4C: .4byte 0x0854c14c -_080ADA50: .4byte 0x000006ed + .pool _080ADA54: subs r0, 0x1 strh r0, [r1] @@ -356200,24 +344543,24 @@ _080ADA58: thumb_func_start sub_80ADA60 sub_80ADA60: @ 80ADA60 push {lr} - ldr r0, _080ADAAC + ldr r0, =0x0854c14c ldr r3, [r0] - ldr r0, _080ADAB0 + ldr r0, =0x000006cc adds r1, r3, r0 movs r2, 0 movs r0, 0 strh r0, [r1] - ldr r1, _080ADAB4 + ldr r1, =0x000006d2 adds r0, r3, r1 strb r2, [r0] subs r1, 0x11 adds r0, r3, r1 strb r2, [r0] - ldr r2, _080ADAB8 + ldr r2, =0x000006c2 adds r1, r3, r2 movs r0, 0x14 strb r0, [r1] - ldr r1, _080ADABC + ldr r1, =0x000006fb adds r0, r3, r1 ldrb r1, [r0] cmp r1, 0 @@ -356238,20 +344581,16 @@ _080ADAA8: pop {r0} bx r0 .align 2, 0 -_080ADAAC: .4byte 0x0854c14c -_080ADAB0: .4byte 0x000006cc -_080ADAB4: .4byte 0x000006d2 -_080ADAB8: .4byte 0x000006c2 -_080ADABC: .4byte 0x000006fb + .pool thumb_func_end sub_80ADA60 thumb_func_start sub_80ADAC0 sub_80ADAC0: @ 80ADAC0 push {r4,lr} bl sub_80ADA60 - ldr r0, _080ADAE8 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080ADAEC + ldr r2, =0x000006d2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -356267,24 +344606,23 @@ _080ADAE0: pop {r0} bx r0 .align 2, 0 -_080ADAE8: .4byte 0x0854c14c -_080ADAEC: .4byte 0x000006d2 + .pool thumb_func_end sub_80ADAC0 thumb_func_start sub_80ADAF0 sub_80ADAF0: @ 80ADAF0 push {r4-r6,lr} - ldr r0, _080ADB3C + ldr r0, =0x0854c14c ldr r6, [r0] - ldr r0, _080ADB40 - ldr r1, _080ADB44 + ldr r0, =0x02021bbc + ldr r1, =0x000006f2 adds r2, r6, r1 ldrh r0, [r0] ldrh r1, [r2] subs r0, r1 movs r1, 0xFF ands r0, r1 - ldr r3, _080ADB48 + ldr r3, =0x000006ee adds r1, r6, r3 strh r0, [r1] movs r0, 0xDE @@ -356303,7 +344641,7 @@ sub_80ADAF0: @ 80ADAF0 adds r0, 0x1 strh r0, [r2] _080ADB2A: - ldr r1, _080ADB4C + ldr r1, =0x000006cc adds r5, r6, r1 ldrh r4, [r5] cmp r4, 0 @@ -356312,11 +344650,7 @@ _080ADB2A: beq _080ADB90 b _080ADBA6 .align 2, 0 -_080ADB3C: .4byte 0x0854c14c -_080ADB40: .4byte 0x02021bbc -_080ADB44: .4byte 0x000006f2 -_080ADB48: .4byte 0x000006ee -_080ADB4C: .4byte 0x000006cc + .pool _080ADB50: bl sub_80ADCAC movs r3, 0xDA @@ -356336,23 +344670,22 @@ _080ADB6C: movs r2, 0 bl sub_80AC164 _080ADB76: - ldr r0, _080ADB88 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r0, _080ADB8C + ldr r0, =0x000006cc adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _080ADBA6 .align 2, 0 -_080ADB88: .4byte 0x0854c14c -_080ADB8C: .4byte 0x000006cc + .pool _080ADB90: bl sub_80AC1A8 lsls r0, 24 cmp r0, 0 beq _080ADBA6 - ldr r1, _080ADBAC + ldr r1, =0x000006d2 adds r0, r6, r1 strb r4, [r0] ldrh r0, [r5] @@ -356363,23 +344696,23 @@ _080ADBA6: pop {r0} bx r0 .align 2, 0 -_080ADBAC: .4byte 0x000006d2 + .pool thumb_func_end sub_80ADAF0 thumb_func_start sub_80ADBB0 sub_80ADBB0: @ 80ADBB0 push {r4,lr} - ldr r0, _080ADC00 + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r0, _080ADC04 - ldr r1, _080ADC08 + ldr r0, =0x02021bbc + ldr r1, =0x000006f2 adds r3, r2, r1 ldrh r0, [r0] ldrh r1, [r3] subs r0, r1 movs r1, 0xFF ands r0, r1 - ldr r4, _080ADC0C + ldr r4, =0x000006ee adds r1, r2, r4 strh r0, [r1] movs r0, 0xDE @@ -356398,7 +344731,7 @@ sub_80ADBB0: @ 80ADBB0 adds r0, 0x1 strh r0, [r3] _080ADBEA: - ldr r1, _080ADC10 + ldr r1, =0x000006ce adds r4, r2, r1 ldrh r0, [r4] cmp r0, 0x1 @@ -356409,11 +344742,7 @@ _080ADBEA: beq _080ADC1A b _080ADC3E .align 2, 0 -_080ADC00: .4byte 0x0854c14c -_080ADC04: .4byte 0x02021bbc -_080ADC08: .4byte 0x000006f2 -_080ADC0C: .4byte 0x000006ee -_080ADC10: .4byte 0x000006ce + .pool _080ADC14: cmp r0, 0x2 beq _080ADC32 @@ -356452,12 +344781,12 @@ _080ADC44: sub_80ADC4C: @ 80ADC4C push {r4,lr} adds r3, r0, 0 - ldr r0, _080ADC98 + ldr r0, =0x02021bbe ldrb r0, [r0] strh r0, [r3, 0x26] - ldr r0, _080ADC9C + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080ADCA0 + ldr r1, =0x000006ee adds r2, r0, r1 ldrh r1, [r2] adds r1, 0x20 @@ -356467,7 +344796,7 @@ sub_80ADC4C: @ 80ADC4C adds r1, r0 strh r1, [r3, 0x20] lsls r1, 16 - ldr r0, _080ADCA4 + ldr r0, =0x010f0000 cmp r1, r0 ble _080ADC90 movs r0, 0xF0 @@ -356481,7 +344810,7 @@ sub_80ADC4C: @ 80ADC4C subs r0, r2 lsls r0, 6 subs r1, r0 - ldr r0, _080ADCA8 + ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] _080ADC90: @@ -356489,25 +344818,21 @@ _080ADC90: pop {r0} bx r0 .align 2, 0 -_080ADC98: .4byte 0x02021bbe -_080ADC9C: .4byte 0x0854c14c -_080ADCA0: .4byte 0x000006ee -_080ADCA4: .4byte 0x010f0000 -_080ADCA8: .4byte 0x000001ff + .pool thumb_func_end sub_80ADC4C thumb_func_start sub_80ADCAC sub_80ADCAC: @ 80ADCAC push {r4,r5,lr} sub sp, 0x8 - ldr r0, _080ADD20 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080ADD24 + ldr r1, =0x000006fb adds r0, r1 ldrb r0, [r0] cmp r0, 0 bne _080ADD56 - ldr r0, _080ADD28 + ldr r0, =0x0854fd30 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] @@ -356516,7 +344841,7 @@ sub_80ADCAC: @ 80ADCAC bl gpu_tile_obj_alloc_tag_and_copy_to_vram movs r5, 0 _080ADCD0: - ldr r0, _080ADD2C + ldr r0, =0x0854fd18 movs r1, 0 movs r2, 0 movs r3, 0xFF @@ -356528,7 +344853,7 @@ _080ADCD0: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080ADD30 + ldr r0, =0x02020630 adds r4, r0 adds r0, r5, 0 movs r1, 0x5 @@ -356545,7 +344870,7 @@ _080ADCD0: lsrs r0, 10 adds r0, 0x20 strh r0, [r4, 0x22] - ldr r2, _080ADD20 + ldr r2, =0x0854c14c ldr r0, [r2] lsls r1, r5, 2 adds r0, 0xA0 @@ -356553,13 +344878,9 @@ _080ADCD0: str r4, [r0] b _080ADD42 .align 2, 0 -_080ADD20: .4byte 0x0854c14c -_080ADD24: .4byte 0x000006fb -_080ADD28: .4byte 0x0854fd30 -_080ADD2C: .4byte 0x0854fd18 -_080ADD30: .4byte 0x02020630 + .pool _080ADD34: - ldr r2, _080ADD60 + ldr r2, =0x0854c14c ldr r1, [r2] lsls r0, r5, 2 adds r1, 0xA0 @@ -356573,7 +344894,7 @@ _080ADD42: cmp r5, 0x13 bls _080ADCD0 ldr r0, [r2] - ldr r1, _080ADD64 + ldr r1, =0x000006fb adds r0, r1 movs r1, 0x1 strb r1, [r0] @@ -356583,16 +344904,15 @@ _080ADD56: pop {r0} bx r0 .align 2, 0 -_080ADD60: .4byte 0x0854c14c -_080ADD64: .4byte 0x000006fb + .pool thumb_func_end sub_80ADCAC thumb_func_start sub_80ADD68 sub_80ADD68: @ 80ADD68 push {r4,r5,lr} - ldr r0, _080ADDB0 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080ADDB4 + ldr r2, =0x000006fb adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -356613,11 +344933,11 @@ _080ADD8C: lsrs r4, r0, 16 cmp r4, 0x13 bls _080ADD7E - ldr r0, _080ADDB8 + ldr r0, =0x00001201 bl gpu_tile_obj_free_by_tag - ldr r0, _080ADDB0 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080ADDB4 + ldr r1, =0x000006fb adds r0, r1 movs r1, 0 strb r1, [r0] @@ -356626,28 +344946,26 @@ _080ADDA8: pop {r0} bx r0 .align 2, 0 -_080ADDB0: .4byte 0x0854c14c -_080ADDB4: .4byte 0x000006fb -_080ADDB8: .4byte 0x00001201 + .pool thumb_func_end sub_80ADD68 thumb_func_start sub_80ADDBC sub_80ADDBC: @ 80ADDBC push {lr} - ldr r0, _080ADE08 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r0, _080ADE0C + ldr r0, =0x000006cc adds r2, r1, r0 movs r3, 0 movs r0, 0 strh r0, [r2] - ldr r2, _080ADE10 + ldr r2, =0x000006d2 adds r0, r1, r2 strb r3, [r0] subs r2, 0x11 adds r0, r1, r2 strb r3, [r0] - ldr r3, _080ADE14 + ldr r3, =0x000006c2 adds r0, r1, r3 movs r2, 0x14 strb r2, [r0] @@ -356671,19 +344989,16 @@ _080ADE04: pop {r0} bx r0 .align 2, 0 -_080ADE08: .4byte 0x0854c14c -_080ADE0C: .4byte 0x000006cc -_080ADE10: .4byte 0x000006d2 -_080ADE14: .4byte 0x000006c2 + .pool thumb_func_end sub_80ADDBC thumb_func_start sub_80ADE18 sub_80ADE18: @ 80ADE18 push {r4,lr} bl sub_80ADDBC - ldr r0, _080ADE40 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080ADE44 + ldr r2, =0x000006d2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -356699,20 +345014,19 @@ _080ADE38: pop {r0} bx r0 .align 2, 0 -_080ADE40: .4byte 0x0854c14c -_080ADE44: .4byte 0x000006d2 + .pool thumb_func_end sub_80ADE18 thumb_func_start sub_80ADE48 sub_80ADE48: @ 80ADE48 push {r4,r5,lr} - ldr r2, _080ADE8C + ldr r2, =0x0854c14c ldr r1, [r2] - ldr r0, _080ADE90 + ldr r0, =0x02021bbc ldrh r0, [r0] - ldr r3, _080ADE94 + ldr r3, =0x000001ff ands r3, r0 - ldr r0, _080ADE98 + ldr r0, =0x000006fc adds r1, r0 strh r3, [r1] cmp r3, 0xEF @@ -356730,7 +345044,7 @@ _080ADE64: strh r3, [r4] _080ADE74: ldr r5, [r2] - ldr r1, _080ADE9C + ldr r1, =0x000006cc adds r4, r5, r1 ldrh r0, [r4] cmp r0, 0x1 @@ -356741,11 +345055,7 @@ _080ADE74: beq _080ADEA6 b _080ADEE8 .align 2, 0 -_080ADE8C: .4byte 0x0854c14c -_080ADE90: .4byte 0x02021bbc -_080ADE94: .4byte 0x000001ff -_080ADE98: .4byte 0x000006fc -_080ADE9C: .4byte 0x000006cc + .pool _080ADEA0: cmp r0, 0x2 beq _080ADEC8 @@ -356772,7 +345082,7 @@ _080ADEC8: lsls r0, 24 cmp r0, 0 beq _080ADEEC - ldr r0, _080ADEE4 + ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] @@ -356782,7 +345092,7 @@ _080ADEDA: strh r0, [r4] b _080ADEEC .align 2, 0 -_080ADEE4: .4byte 0x000006d2 + .pool _080ADEE8: bl sub_80AC1A8 _080ADEEC: @@ -356794,9 +345104,9 @@ _080ADEEC: thumb_func_start sub_80ADEF4 sub_80ADEF4: @ 80ADEF4 push {r4,lr} - ldr r0, _080ADF10 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080ADF14 + ldr r1, =0x000006ce adds r4, r0, r1 ldrh r0, [r4] cmp r0, 0x1 @@ -356807,8 +345117,7 @@ sub_80ADEF4: @ 80ADEF4 beq _080ADF1E b _080ADF4E .align 2, 0 -_080ADF10: .4byte 0x0854c14c -_080ADF14: .4byte 0x000006ce + .pool _080ADF18: cmp r0, 0x2 beq _080ADF40 @@ -356851,18 +345160,18 @@ _080ADF54: thumb_func_start sub_80ADF5C sub_80ADF5C: @ 80ADF5C push {lr} - ldr r0, _080ADF68 + ldr r0, =0x0854fd38 bl gpu_tile_obj_alloc_tag_and_copy_to_vram pop {r0} bx r0 .align 2, 0 -_080ADF68: .4byte 0x0854fd38 + .pool thumb_func_end sub_80ADF5C thumb_func_start sub_80ADF6C sub_80ADF6C: @ 80ADF6C push {r4,r5,lr} - ldr r0, _080ADFD8 + ldr r0, =0x0854c14c ldr r0, [r0] movs r1, 0xE0 lsls r1, 3 @@ -356872,7 +345181,7 @@ sub_80ADF6C: @ 80ADF6C bne _080AE008 movs r5, 0 _080ADF80: - ldr r0, _080ADFDC + ldr r0, =0x0854fd58 movs r1, 0 movs r2, 0 movs r3, 0x4E @@ -356884,7 +345193,7 @@ _080ADF80: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080ADFE0 + ldr r0, =0x02020630 adds r4, r0 movs r0, 0 strh r0, [r4, 0x30] @@ -356905,7 +345214,7 @@ _080ADF80: lsls r0, 6 adds r0, 0x20 strh r0, [r4, 0x2E] - ldr r2, _080ADFD8 + ldr r2, =0x0854c14c ldr r0, [r2] lsls r1, r5, 2 adds r0, 0xF0 @@ -356913,11 +345222,9 @@ _080ADF80: str r4, [r0] b _080ADFF2 .align 2, 0 -_080ADFD8: .4byte 0x0854c14c -_080ADFDC: .4byte 0x0854fd58 -_080ADFE0: .4byte 0x02020630 + .pool _080ADFE4: - ldr r2, _080AE010 + ldr r2, =0x0854c14c ldr r1, [r2] lsls r0, r5, 2 adds r1, 0xF0 @@ -356941,13 +345248,13 @@ _080AE008: pop {r0} bx r0 .align 2, 0 -_080AE010: .4byte 0x0854c14c + .pool thumb_func_end sub_80ADF6C thumb_func_start sub_80AE014 sub_80AE014: @ 80AE014 push {r4,r5,lr} - ldr r0, _080AE060 + ldr r0, =0x0854c14c ldr r1, [r0] movs r2, 0xE0 lsls r2, 3 @@ -356971,9 +345278,9 @@ _080AE03A: lsrs r4, r0, 16 cmp r4, 0x13 bls _080AE02C - ldr r0, _080AE064 + ldr r0, =0x00001202 bl gpu_tile_obj_free_by_tag - ldr r0, _080AE060 + ldr r0, =0x0854c14c ldr r0, [r0] movs r1, 0xE0 lsls r1, 3 @@ -356985,8 +345292,7 @@ _080AE058: pop {r0} bx r0 .align 2, 0 -_080AE060: .4byte 0x0854c14c -_080AE064: .4byte 0x00001202 + .pool thumb_func_end sub_80AE014 thumb_func_start sub_80AE068 @@ -357006,14 +345312,14 @@ sub_80AE068: @ 80AE068 adds r0, 0x1 strh r0, [r3, 0x2E] _080AE084: - ldr r1, _080AE0D0 + ldr r1, =0x02021bbe ldrh r0, [r3, 0x2E] ldrh r1, [r1] adds r0, r1 strh r0, [r3, 0x22] - ldr r0, _080AE0D4 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AE0D8 + ldr r1, =0x000006fc adds r2, r0, r1 ldrh r1, [r2] adds r1, 0x20 @@ -357023,7 +345329,7 @@ _080AE084: adds r1, r0 strh r1, [r3, 0x20] lsls r1, 16 - ldr r0, _080AE0DC + ldr r0, =0x010f0000 cmp r1, r0 ble _080AE0C8 movs r0, 0xF0 @@ -357037,7 +345343,7 @@ _080AE084: subs r0, r2 lsls r0, 6 subs r1, r0 - ldr r0, _080AE0E0 + ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] _080AE0C8: @@ -357045,30 +345351,26 @@ _080AE0C8: pop {r0} bx r0 .align 2, 0 -_080AE0D0: .4byte 0x02021bbe -_080AE0D4: .4byte 0x0854c14c -_080AE0D8: .4byte 0x000006fc -_080AE0DC: .4byte 0x010f0000 -_080AE0E0: .4byte 0x000001ff + .pool thumb_func_end sub_80AE068 thumb_func_start sub_80AE0E4 sub_80AE0E4: @ 80AE0E4 push {r4,lr} - ldr r0, _080AE154 + ldr r0, =0x0854c14c ldr r3, [r0] - ldr r1, _080AE158 + ldr r1, =0x000006cc adds r0, r3, r1 movs r1, 0 movs r2, 0 strh r2, [r0] - ldr r4, _080AE15C + ldr r4, =0x000006d2 adds r0, r3, r4 strb r1, [r0] subs r4, 0x11 adds r0, r3, r4 strb r1, [r0] - ldr r0, _080AE160 + ldr r0, =0x000006c2 adds r1, r3, r0 movs r0, 0x14 strb r0, [r1] @@ -357080,7 +345382,7 @@ sub_80AE0E4: @ 80AE0E4 adds r1, r3, r4 movs r0, 0x1 strh r0, [r1] - ldr r1, _080AE164 + ldr r1, =0x00000724 adds r0, r3, r1 ldrb r2, [r0] cmp r2, 0 @@ -357111,20 +345413,16 @@ _080AE14E: pop {r0} bx r0 .align 2, 0 -_080AE154: .4byte 0x0854c14c -_080AE158: .4byte 0x000006cc -_080AE15C: .4byte 0x000006d2 -_080AE160: .4byte 0x000006c2 -_080AE164: .4byte 0x00000724 + .pool thumb_func_end sub_80AE0E4 thumb_func_start sub_80AE168 sub_80AE168: @ 80AE168 push {r4,lr} bl sub_80AE0E4 - ldr r0, _080AE190 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AE194 + ldr r2, =0x000006d2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -357140,17 +345438,16 @@ _080AE188: pop {r0} bx r0 .align 2, 0 -_080AE190: .4byte 0x0854c14c -_080AE194: .4byte 0x000006d2 + .pool thumb_func_end sub_80AE168 thumb_func_start sub_80AE198 sub_80AE198: @ 80AE198 push {r4,r5,lr} bl sub_80AE25C - ldr r0, _080AE1B8 + ldr r0, =0x0854c14c ldr r5, [r0] - ldr r0, _080AE1BC + ldr r0, =0x000006cc adds r4, r5, r0 ldrh r0, [r4] cmp r0, 0x1 @@ -357161,8 +345458,7 @@ sub_80AE198: @ 80AE198 beq _080AE1C6 b _080AE1F0 .align 2, 0 -_080AE1B8: .4byte 0x0854c14c -_080AE1BC: .4byte 0x000006cc + .pool _080AE1C0: cmp r0, 0x2 beq _080AE1D8 @@ -357181,7 +345477,7 @@ _080AE1D8: lsls r0, 24 cmp r0, 0 beq _080AE1F0 - ldr r0, _080AE1F8 + ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] @@ -357194,16 +345490,16 @@ _080AE1F0: pop {r0} bx r0 .align 2, 0 -_080AE1F8: .4byte 0x000006d2 + .pool thumb_func_end sub_80AE198 thumb_func_start sub_80AE1FC sub_80AE1FC: @ 80AE1FC push {r4,lr} bl sub_80AE25C - ldr r0, _080AE21C + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AE220 + ldr r1, =0x000006ce adds r4, r0, r1 ldrh r0, [r4] cmp r0, 0x1 @@ -357214,8 +345510,7 @@ sub_80AE1FC: @ 80AE1FC beq _080AE22A b _080AE24E .align 2, 0 -_080AE21C: .4byte 0x0854c14c -_080AE220: .4byte 0x000006ce + .pool _080AE224: cmp r0, 0x2 beq _080AE242 @@ -357253,15 +345548,15 @@ _080AE254: thumb_func_start sub_80AE25C sub_80AE25C: @ 80AE25C push {r4,r5,lr} - ldr r0, _080AE2D4 + ldr r0, =0x0854c14c ldr r3, [r0] - ldr r0, _080AE2D8 + ldr r0, =0x0000071c adds r2, r3, r0 ldrh r0, [r2] adds r0, 0x1 movs r5, 0 strh r0, [r2] - ldr r1, _080AE2DC + ldr r1, =0x0000ffff adds r4, r1, 0 lsls r0, 16 lsrs r0, 16 @@ -357275,7 +345570,7 @@ sub_80AE25C: @ 80AE25C strh r0, [r1] strh r5, [r2] _080AE288: - ldr r1, _080AE2E0 + ldr r1, =0x0000071e adds r2, r3, r1 ldrh r0, [r2] adds r0, 0x1 @@ -357283,14 +345578,14 @@ _080AE288: ands r0, r4 cmp r0, 0x4 bls _080AE2A4 - ldr r0, _080AE2E4 + ldr r0, =0x00000722 adds r1, r3, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] strh r5, [r2] _080AE2A4: - ldr r0, _080AE2E8 + ldr r0, =0x02021bbc movs r2, 0xE4 lsls r2, 3 adds r1, r3, r2 @@ -357302,7 +345597,7 @@ _080AE2A4: subs r2, 0x8 adds r1, r3, r2 strh r0, [r1] - ldr r1, _080AE2EC + ldr r1, =0x02021bbe adds r2, 0xA adds r0, r3, r2 ldrh r0, [r0] @@ -357315,27 +345610,21 @@ _080AE2A4: pop {r0} bx r0 .align 2, 0 -_080AE2D4: .4byte 0x0854c14c -_080AE2D8: .4byte 0x0000071c -_080AE2DC: .4byte 0x0000ffff -_080AE2E0: .4byte 0x0000071e -_080AE2E4: .4byte 0x00000722 -_080AE2E8: .4byte 0x02021bbc -_080AE2EC: .4byte 0x02021bbe + .pool thumb_func_end sub_80AE25C thumb_func_start sub_80AE2F0 sub_80AE2F0: @ 80AE2F0 push {r4-r6,lr} sub sp, 0x8 - ldr r0, _080AE35C + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AE360 + ldr r1, =0x00000724 adds r0, r1 ldrb r0, [r0] cmp r0, 0 bne _080AE396 - ldr r0, _080AE364 + ldr r0, =0x0854fd70 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] @@ -357350,7 +345639,7 @@ _080AE314: adds r5, r0, 0 lsls r2, r5, 22 asrs r2, 16 - ldr r0, _080AE368 + ldr r0, =0x0854fd8c movs r1, 0 movs r3, 0xFF bl obj_add_from_template_backward_search @@ -357361,14 +345650,14 @@ _080AE314: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080AE36C + ldr r0, =0x02020630 adds r4, r0 adds r0, r6, 0 movs r1, 0x5 bl __umodsi3 strh r0, [r4, 0x2E] strh r5, [r4, 0x30] - ldr r2, _080AE35C + ldr r2, =0x0854c14c ldr r0, [r2] lsls r1, r6, 2 movs r3, 0xA0 @@ -357378,13 +345667,9 @@ _080AE314: str r4, [r0] b _080AE382 .align 2, 0 -_080AE35C: .4byte 0x0854c14c -_080AE360: .4byte 0x00000724 -_080AE364: .4byte 0x0854fd70 -_080AE368: .4byte 0x0854fd8c -_080AE36C: .4byte 0x02020630 + .pool _080AE370: - ldr r2, _080AE3A0 + ldr r2, =0x0854c14c ldr r1, [r2] lsls r0, r6, 2 movs r3, 0xA0 @@ -357400,7 +345685,7 @@ _080AE382: cmp r6, 0x13 bls _080AE314 ldr r0, [r2] - ldr r1, _080AE3A4 + ldr r1, =0x00000724 adds r0, r1 movs r1, 0x1 strb r1, [r0] @@ -357410,16 +345695,15 @@ _080AE396: pop {r0} bx r0 .align 2, 0 -_080AE3A0: .4byte 0x0854c14c -_080AE3A4: .4byte 0x00000724 + .pool thumb_func_end sub_80AE2F0 thumb_func_start sub_80AE3A8 sub_80AE3A8: @ 80AE3A8 push {r4,r5,lr} - ldr r0, _080AE3F0 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AE3F4 + ldr r2, =0x00000724 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -357441,11 +345725,11 @@ _080AE3CE: lsrs r4, r0, 16 cmp r4, 0x13 bls _080AE3C0 - ldr r0, _080AE3F8 + ldr r0, =0x00001203 bl gpu_tile_obj_free_by_tag - ldr r0, _080AE3F0 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AE3F4 + ldr r1, =0x00000724 adds r0, r1 movs r1, 0 strb r1, [r0] @@ -357454,18 +345738,16 @@ _080AE3EA: pop {r0} bx r0 .align 2, 0 -_080AE3F0: .4byte 0x0854c14c -_080AE3F4: .4byte 0x00000724 -_080AE3F8: .4byte 0x00001203 + .pool thumb_func_end sub_80AE3A8 thumb_func_start sub_80AE3FC sub_80AE3FC: @ 80AE3FC push {r4,lr} adds r3, r0, 0 - ldr r0, _080AE44C + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AE450 + ldr r2, =0x0000071a adds r0, r1, r2 ldrh r0, [r0] strh r0, [r3, 0x26] @@ -357480,7 +345762,7 @@ sub_80AE3FC: @ 80AE3FC adds r1, r0 strh r1, [r3, 0x20] lsls r1, 16 - ldr r0, _080AE454 + ldr r0, =0x010f0000 cmp r1, r0 ble _080AE444 movs r0, 0xF0 @@ -357494,7 +345776,7 @@ sub_80AE3FC: @ 80AE3FC subs r0, r2 lsls r0, 6 subs r1, r0 - ldr r0, _080AE458 + ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] _080AE444: @@ -357502,33 +345784,30 @@ _080AE444: pop {r0} bx r0 .align 2, 0 -_080AE44C: .4byte 0x0854c14c -_080AE450: .4byte 0x0000071a -_080AE454: .4byte 0x010f0000 -_080AE458: .4byte 0x000001ff + .pool thumb_func_end sub_80AE3FC thumb_func_start sub_80AE45C sub_80AE45C: @ 80AE45C push {r4,lr} - ldr r0, _080AE4C0 + ldr r0, =0x0854c14c ldr r3, [r0] - ldr r0, _080AE4C4 + ldr r0, =0x000006cc adds r1, r3, r0 movs r2, 0 movs r0, 0 strh r0, [r1] - ldr r1, _080AE4C8 + ldr r1, =0x000006d2 adds r0, r3, r1 strb r2, [r0] - ldr r4, _080AE4CC + ldr r4, =0x000006c1 adds r0, r3, r4 strb r2, [r0] - ldr r0, _080AE4D0 + ldr r0, =0x000006c2 adds r1, r3, r0 movs r0, 0x14 strb r0, [r1] - ldr r1, _080AE4D4 + ldr r1, =0x00000716 adds r0, r3, r1 ldrb r2, [r0] cmp r2, 0 @@ -357539,7 +345818,7 @@ sub_80AE45C: @ 80AE45C adds r0, r3, r4 str r2, [r0] str r2, [r1] - ldr r0, _080AE4D8 + ldr r0, =0x00000712 adds r1, r3, r0 movs r0, 0x8 strh r0, [r1] @@ -357561,22 +345840,16 @@ _080AE4B8: pop {r0} bx r0 .align 2, 0 -_080AE4C0: .4byte 0x0854c14c -_080AE4C4: .4byte 0x000006cc -_080AE4C8: .4byte 0x000006d2 -_080AE4CC: .4byte 0x000006c1 -_080AE4D0: .4byte 0x000006c2 -_080AE4D4: .4byte 0x00000716 -_080AE4D8: .4byte 0x00000712 + .pool thumb_func_end sub_80AE45C thumb_func_start sub_80AE4DC sub_80AE4DC: @ 80AE4DC push {r4,lr} bl sub_80AE45C - ldr r0, _080AE504 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AE508 + ldr r2, =0x000006d2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -357592,8 +345865,7 @@ _080AE4FC: pop {r0} bx r0 .align 2, 0 -_080AE504: .4byte 0x0854c14c -_080AE508: .4byte 0x000006d2 + .pool thumb_func_end sub_80AE4DC thumb_func_start sub_80AE50C @@ -357601,9 +345873,9 @@ sub_80AE50C: @ 80AE50C push {r4,r5,lr} bl sub_80AE624 bl sub_80AE5EC - ldr r0, _080AE53C + ldr r0, =0x0854c14c ldr r5, [r0] - ldr r0, _080AE540 + ldr r0, =0x00000712 adds r1, r5, r0 ldrh r0, [r1] cmp r0, 0x5F @@ -357611,7 +345883,7 @@ sub_80AE50C: @ 80AE50C movs r0, 0x20 strh r0, [r1] _080AE528: - ldr r0, _080AE544 + ldr r0, =0x000006cc adds r4, r5, r0 ldrh r0, [r4] cmp r0, 0x1 @@ -357622,9 +345894,7 @@ _080AE528: beq _080AE54E b _080AE57C .align 2, 0 -_080AE53C: .4byte 0x0854c14c -_080AE540: .4byte 0x00000712 -_080AE544: .4byte 0x000006cc + .pool _080AE548: cmp r0, 0x2 beq _080AE564 @@ -357644,7 +345914,7 @@ _080AE564: lsls r0, 24 cmp r0, 0 beq _080AE57C - ldr r0, _080AE584 + ldr r0, =0x000006d2 adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] @@ -357657,7 +345927,7 @@ _080AE57C: pop {r0} bx r0 .align 2, 0 -_080AE584: .4byte 0x000006d2 + .pool thumb_func_end sub_80AE50C thumb_func_start sub_80AE588 @@ -357665,9 +345935,9 @@ sub_80AE588: @ 80AE588 push {r4,lr} bl sub_80AE624 bl sub_80AE5EC - ldr r0, _080AE5AC + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AE5B0 + ldr r1, =0x000006ce adds r4, r0, r1 ldrh r0, [r4] cmp r0, 0x1 @@ -357678,8 +345948,7 @@ sub_80AE588: @ 80AE588 beq _080AE5BA b _080AE5DE .align 2, 0 -_080AE5AC: .4byte 0x0854c14c -_080AE5B0: .4byte 0x000006ce + .pool _080AE5B4: cmp r0, 0x2 beq _080AE5D2 @@ -357717,9 +345986,9 @@ _080AE5E4: thumb_func_start sub_80AE5EC sub_80AE5EC: @ 80AE5EC push {lr} - ldr r0, _080AE618 + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r0, _080AE61C + ldr r0, =0x00000714 adds r3, r2, r0 ldrh r0, [r3] adds r1, r0, 0x1 @@ -357728,7 +345997,7 @@ sub_80AE5EC: @ 80AE5EC lsrs r0, 16 cmp r0, 0x4 bls _080AE612 - ldr r1, _080AE620 + ldr r1, =0x00000712 adds r0, r2, r1 ldrh r1, [r0] adds r1, 0x1 @@ -357739,20 +346008,18 @@ _080AE612: pop {r0} bx r0 .align 2, 0 -_080AE618: .4byte 0x0854c14c -_080AE61C: .4byte 0x00000714 -_080AE620: .4byte 0x00000712 + .pool thumb_func_end sub_80AE5EC thumb_func_start sub_80AE624 sub_80AE624: @ 80AE624 push {r4-r6,lr} - ldr r0, _080AE688 + ldr r0, =0x0854c14c ldr r2, [r0] - ldr r0, _080AE68C + ldr r0, =0x00000704 adds r4, r2, r0 - ldr r6, _080AE690 - ldr r1, _080AE694 + ldr r6, =0x08329f40 + ldr r1, =0x00000712 adds r5, r2, r1 ldrh r0, [r5] lsls r0, 1 @@ -357774,17 +346041,17 @@ sub_80AE624: @ 80AE624 ldr r0, [r3] subs r0, r1 str r0, [r3] - ldr r1, _080AE698 + ldr r1, =0x02021bbc ldr r0, [r4] lsrs r0, 8 ldrh r1, [r1] adds r0, r1 movs r1, 0xFF ands r0, r1 - ldr r4, _080AE69C + ldr r4, =0x0000070e adds r1, r2, r4 strh r0, [r1] - ldr r1, _080AE6A0 + ldr r1, =0x02021bbe ldr r0, [r3] lsrs r0, 8 ldrh r1, [r1] @@ -357797,21 +346064,15 @@ sub_80AE624: @ 80AE624 pop {r0} bx r0 .align 2, 0 -_080AE688: .4byte 0x0854c14c -_080AE68C: .4byte 0x00000704 -_080AE690: .4byte 0x08329f40 -_080AE694: .4byte 0x00000712 -_080AE698: .4byte 0x02021bbc -_080AE69C: .4byte 0x0000070e -_080AE6A0: .4byte 0x02021bbe + .pool thumb_func_end sub_80AE624 thumb_func_start sub_80AE6A4 sub_80AE6A4: @ 80AE6A4 push {r4,r5,lr} - ldr r0, _080AE728 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AE72C + ldr r2, =0x00000716 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -357833,18 +346094,18 @@ _080AE6CA: lsrs r4, r0, 16 cmp r4, 0x13 bls _080AE6BC - ldr r0, _080AE728 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AE72C + ldr r1, =0x00000716 adds r0, r1 movs r1, 0 strb r1, [r0] - ldr r0, _080AE730 + ldr r0, =0x00001204 bl gpu_tile_obj_free_by_tag _080AE6E6: - ldr r0, _080AE728 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AE734 + ldr r2, =0x00000717 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -357866,9 +346127,9 @@ _080AE70A: lsrs r4, r0, 16 cmp r4, 0x4 bls _080AE6FC - ldr r0, _080AE728 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AE734 + ldr r1, =0x00000717 adds r0, r1 movs r1, 0 strb r1, [r0] @@ -357877,26 +346138,23 @@ _080AE720: pop {r0} bx r0 .align 2, 0 -_080AE728: .4byte 0x0854c14c -_080AE72C: .4byte 0x00000716 -_080AE730: .4byte 0x00001204 -_080AE734: .4byte 0x00000717 + .pool thumb_func_end sub_80AE6A4 thumb_func_start sub_80AE738 sub_80AE738: @ 80AE738 push {r4-r7,lr} sub sp, 0x4 - ldr r0, _080AE7A8 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AE7AC + ldr r1, =0x00000716 adds r0, r1 ldrb r0, [r0] cmp r0, 0 bne _080AE7E6 - ldr r0, _080AE7B0 + ldr r0, =0x0854fddc bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _080AE7B4 + ldr r0, =0x0854c2b0 bl sub_80ABF4C movs r7, 0 _080AE758: @@ -357906,7 +346164,7 @@ _080AE758: adds r6, r0, 0 lsls r2, r6, 22 asrs r2, 16 - ldr r0, _080AE7B8 + ldr r0, =0x0854fdc4 movs r1, 0 movs r3, 0x1 bl obj_add_from_template_backward_search @@ -357914,7 +346172,7 @@ _080AE758: lsrs r1, r0, 24 cmp r1, 0x40 beq _080AE7C0 - ldr r2, _080AE7A8 + ldr r2, =0x0854c14c ldr r5, [r2] lsls r0, r7, 2 movs r3, 0xC8 @@ -357924,7 +346182,7 @@ _080AE758: lsls r4, r1, 4 adds r4, r1 lsls r4, 2 - ldr r0, _080AE7BC + ldr r0, =0x02020630 adds r4, r0 str r4, [r5] adds r0, r7, 0 @@ -357937,14 +346195,9 @@ _080AE758: ldr r2, [sp] b _080AE7D2 .align 2, 0 -_080AE7A8: .4byte 0x0854c14c -_080AE7AC: .4byte 0x00000716 -_080AE7B0: .4byte 0x0854fddc -_080AE7B4: .4byte 0x0854c2b0 -_080AE7B8: .4byte 0x0854fdc4 -_080AE7BC: .4byte 0x02020630 + .pool _080AE7C0: - ldr r2, _080AE7F0 + ldr r2, =0x0854c14c ldr r1, [r2] lsls r0, r7, 2 movs r3, 0xC8 @@ -357960,7 +346213,7 @@ _080AE7D2: cmp r7, 0x13 bls _080AE758 ldr r0, [r2] - ldr r1, _080AE7F4 + ldr r1, =0x00000716 adds r0, r1 movs r1, 0x1 strb r1, [r0] @@ -357970,8 +346223,7 @@ _080AE7E6: pop {r0} bx r0 .align 2, 0 -_080AE7F0: .4byte 0x0854c14c -_080AE7F4: .4byte 0x00000716 + .pool thumb_func_end sub_80AE738 thumb_func_start sub_80AE7F8 @@ -357981,9 +346233,9 @@ sub_80AE7F8: @ 80AE7F8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _080AE8A0 + ldr r4, =0x0854c14c ldr r0, [r4] - ldr r1, _080AE8A4 + ldr r1, =0x00000717 adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -358001,7 +346253,7 @@ _080AE818: adds r1, 0x18 lsls r1, 16 asrs r1, 16 - ldr r0, _080AE8A8 + ldr r0, =0x0854fdc4 movs r2, 0xD0 movs r3, 0x1 bl obj_add_from_template_backward_search @@ -358019,7 +346271,7 @@ _080AE818: lsls r2, r1, 4 adds r2, r1 lsls r2, 2 - ldr r0, _080AE8AC + ldr r0, =0x02020630 adds r2, r0 str r2, [r4] ldrb r1, [r2, 0x3] @@ -358038,10 +346290,10 @@ _080AE818: mov r1, r10 strh r1, [r0, 0x32] ldr r1, [r4] - ldr r0, _080AE8B0 + ldr r0, =0x00006730 strh r0, [r1, 0x36] ldr r1, [r4] - ldr r0, _080AE8B4 + ldr r0, =0x0854fde4 add r0, r8 ldrh r0, [r0] strh r0, [r1, 0x34] @@ -358054,17 +346306,11 @@ _080AE818: movs r3, 0 bl oam_center ldr r1, [r4] - ldr r0, _080AE8B8 + ldr r0, =sub_80AE958 + 1 str r0, [r1, 0x1C] b _080AE8CE .align 2, 0 -_080AE8A0: .4byte 0x0854c14c -_080AE8A4: .4byte 0x00000717 -_080AE8A8: .4byte 0x0854fdc4 -_080AE8AC: .4byte 0x02020630 -_080AE8B0: .4byte 0x00006730 -_080AE8B4: .4byte 0x0854fde4 -_080AE8B8: .4byte sub_80AE958 + 1 + .pool _080AE8BC: mov r2, r9 ldr r0, [r2] @@ -358078,7 +346324,7 @@ _080AE8BC: _080AE8CE: mov r2, r9 ldr r0, [r2] - ldr r1, _080AE8F4 + ldr r1, =0x00000717 adds r0, r1 movs r1, 0x1 strb r1, [r0] @@ -358096,21 +346342,21 @@ _080AE8E4: pop {r0} bx r0 .align 2, 0 -_080AE8F4: .4byte 0x00000717 + .pool thumb_func_end sub_80AE7F8 thumb_func_start sub_80AE8F8 sub_80AE8F8: @ 80AE8F8 push {r4,lr} adds r3, r0, 0 - ldr r0, _080AE948 + ldr r0, =0x0854c14c ldr r1, [r0] movs r2, 0xE2 lsls r2, 3 adds r0, r1, r2 ldrh r0, [r0] strh r0, [r3, 0x26] - ldr r4, _080AE94C + ldr r4, =0x0000070e adds r2, r1, r4 ldrh r1, [r2] adds r1, 0x20 @@ -358120,7 +346366,7 @@ sub_80AE8F8: @ 80AE8F8 adds r1, r0 strh r1, [r3, 0x20] lsls r1, 16 - ldr r0, _080AE950 + ldr r0, =0x010f0000 cmp r1, r0 ble _080AE940 movs r0, 0xF0 @@ -358134,7 +346380,7 @@ sub_80AE8F8: @ 80AE8F8 subs r0, r2 lsls r0, 6 subs r1, r0 - ldr r0, _080AE954 + ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] _080AE940: @@ -358142,10 +346388,7 @@ _080AE940: pop {r0} bx r0 .align 2, 0 -_080AE948: .4byte 0x0854c14c -_080AE94C: .4byte 0x0000070e -_080AE950: .4byte 0x010f0000 -_080AE954: .4byte 0x000001ff + .pool thumb_func_end sub_80AE8F8 thumb_func_start sub_80AE958 @@ -358161,13 +346404,13 @@ sub_80AE958: @ 80AE958 negs r1, r1 cmp r0, r1 bne _080AE972 - ldr r0, _080AE978 + ldr r0, =sub_80AE97C + 1 str r0, [r2, 0x1C] _080AE972: pop {r0} bx r0 .align 2, 0 -_080AE978: .4byte sub_80AE97C + 1 + .pool thumb_func_end sub_80AE958 thumb_func_start sub_80AE97C @@ -358190,7 +346433,7 @@ sub_80AE97C: @ 80AE97C _080AE99A: movs r0, 0x2E ldrsh r4, [r5, r0] - ldr r3, _080AE9EC + ldr r3, =0x08329f40 movs r2, 0x30 ldrsh r1, [r5, r2] lsls r0, r1, 1 @@ -358231,31 +346474,28 @@ _080AE9E6: pop {r0} bx r0 .align 2, 0 -_080AE9EC: .4byte 0x08329f40 + .pool thumb_func_end sub_80AE97C thumb_func_start sub_80AE9F0 sub_80AE9F0: @ 80AE9F0 - ldr r0, _080AEA10 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r0, _080AEA14 + ldr r0, =0x000006cc adds r2, r1, r0 movs r0, 0 strh r0, [r2] - ldr r0, _080AEA18 + ldr r0, =0x000006c1 adds r2, r1, r0 movs r0, 0x3 strb r0, [r2] - ldr r0, _080AEA1C + ldr r0, =0x000006c2 adds r1, r0 movs r0, 0x14 strb r0, [r1] bx lr .align 2, 0 -_080AEA10: .4byte 0x0854c14c -_080AEA14: .4byte 0x000006cc -_080AEA18: .4byte 0x000006c1 -_080AEA1C: .4byte 0x000006c2 + .pool thumb_func_end sub_80AE9F0 thumb_func_start sub_80AEA20 @@ -358281,25 +346521,25 @@ sub_80AEA30: @ 80AEA30 sub_80AEA34: @ 80AEA34 push {r4,r5,lr} bl sub_80ADA60 - ldr r0, _080AEA74 + ldr r0, =0x0854c14c ldr r4, [r0] - ldr r1, _080AEA78 + ldr r1, =0x0000072e adds r0, r4, r1 ldrb r5, [r0] cmp r5, 0 bne _080AEA6C - ldr r0, _080AEA7C + ldr r0, =0x0854fdf8 bl gpu_tile_obj_alloc_tag_and_copy_to_vram movs r2, 0xE5 lsls r2, 3 adds r0, r4, r2 strh r5, [r0] - ldr r0, _080AEA80 + ldr r0, =0x0854fdf0 ldrb r1, [r0] subs r2, 0x2 adds r0, r4, r2 strh r1, [r0] - ldr r1, _080AEA84 + ldr r1, =0x0000072a adds r0, r4, r1 strh r5, [r0] adds r2, 0x6 @@ -358310,20 +346550,16 @@ _080AEA6C: pop {r0} bx r0 .align 2, 0 -_080AEA74: .4byte 0x0854c14c -_080AEA78: .4byte 0x0000072e -_080AEA7C: .4byte 0x0854fdf8 -_080AEA80: .4byte 0x0854fdf0 -_080AEA84: .4byte 0x0000072a + .pool thumb_func_end sub_80AEA34 thumb_func_start sub_80AEA88 sub_80AEA88: @ 80AEA88 push {r4,lr} bl sub_80AEA34 - ldr r0, _080AEAB0 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r2, _080AEAB4 + ldr r2, =0x000006d2 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -358339,25 +346575,24 @@ _080AEAA8: pop {r0} bx r0 .align 2, 0 -_080AEAB0: .4byte 0x0854c14c -_080AEAB4: .4byte 0x000006d2 + .pool thumb_func_end sub_80AEA88 thumb_func_start sub_80AEAB8 sub_80AEAB8: @ 80AEAB8 push {r4-r7,lr} bl sub_80ADAF0 - ldr r0, _080AEB18 + ldr r0, =0x0854c14c ldr r5, [r0] - ldr r0, _080AEB1C + ldr r0, =0x00000726 adds r4, r5, r0 ldrh r0, [r4] adds r0, 0x1 movs r6, 0 strh r0, [r4] - ldr r1, _080AEB20 + ldr r1, =0x0000ffff adds r7, r1, 0 - ldr r2, _080AEB24 + ldr r2, =0x0854fdf0 movs r1, 0xE5 lsls r1, 3 adds r3, r5, r1 @@ -358377,7 +346612,7 @@ sub_80AEAB8: @ 80AEAB8 bls _080AEAF8 strh r6, [r3] _080AEAF8: - ldr r0, _080AEB28 + ldr r0, =0x0000072a adds r4, r5, r0 ldrh r0, [r4] bl sub_80AEB48 @@ -358393,11 +346628,7 @@ _080AEB10: pop {r0} bx r0 .align 2, 0 -_080AEB18: .4byte 0x0854c14c -_080AEB1C: .4byte 0x00000726 -_080AEB20: .4byte 0x0000ffff -_080AEB24: .4byte 0x0854fdf0 -_080AEB28: .4byte 0x0000072a + .pool thumb_func_end sub_80AEAB8 thumb_func_start sub_80AEB2C @@ -358421,16 +346652,16 @@ _080AEB42: sub_80AEB48: @ 80AEB48 push {r4,lr} lsls r0, 16 - ldr r1, _080AEBB8 + ldr r1, =0x0854fe00 lsrs r0, 14 adds r3, r0, r1 adds r1, 0x2 adds r0, r1 - ldr r1, _080AEBBC + ldr r1, =0x02021bbe ldrh r2, [r0] ldrh r0, [r1] subs r2, r0 - ldr r0, _080AEBC0 + ldr r0, =0x0854fe44 movs r4, 0 ldrsh r1, [r3, r4] lsls r2, 16 @@ -358441,7 +346672,7 @@ sub_80AEB48: @ 80AEB48 lsrs r2, r0, 24 cmp r2, 0x40 beq _080AEBB0 - ldr r0, _080AEBC4 + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -358463,9 +346694,9 @@ sub_80AEB48: @ 80AEB48 strh r0, [r1, 0x2E] strh r0, [r1, 0x30] strh r0, [r1, 0x32] - ldr r0, _080AEBC8 + ldr r0, =0x0854c14c ldr r1, [r0] - ldr r0, _080AEBCC + ldr r0, =0x0000072c adds r1, r0 ldrh r0, [r1] adds r0, 0x1 @@ -358475,26 +346706,21 @@ _080AEBB0: pop {r0} bx r0 .align 2, 0 -_080AEBB8: .4byte 0x0854fe00 -_080AEBBC: .4byte 0x02021bbe -_080AEBC0: .4byte 0x0854fe44 -_080AEBC4: .4byte 0x02020630 -_080AEBC8: .4byte 0x0854c14c -_080AEBCC: .4byte 0x0000072c + .pool thumb_func_end sub_80AEB48 thumb_func_start sub_80AEBD0 sub_80AEBD0: @ 80AEBD0 push {r4,r5,lr} - ldr r0, _080AEC20 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AEC24 + ldr r1, =0x0000072c adds r0, r1 ldrh r0, [r0] cmp r0, 0 beq _080AEC1A movs r4, 0 - ldr r5, _080AEC28 + ldr r5, =0x02020630 _080AEBE4: lsls r0, r4, 4 adds r0, r4 @@ -358503,7 +346729,7 @@ _080AEBE4: adds r0, 0x14 adds r0, r2, r0 ldr r1, [r0] - ldr r0, _080AEC2C + ldr r0, =0x0854fe44 cmp r1, r0 bne _080AEBFE adds r0, r2, r5 @@ -358514,11 +346740,11 @@ _080AEBFE: lsrs r4, r0, 16 cmp r4, 0x3F bls _080AEBE4 - ldr r0, _080AEC30 + ldr r0, =0x00001205 bl gpu_tile_obj_free_by_tag - ldr r0, _080AEC20 + ldr r0, =0x0854c14c ldr r0, [r0] - ldr r1, _080AEC24 + ldr r1, =0x0000072c adds r0, r1 movs r1, 0 strh r1, [r0] @@ -358527,11 +346753,7 @@ _080AEC1A: pop {r0} bx r0 .align 2, 0 -_080AEC20: .4byte 0x0854c14c -_080AEC24: .4byte 0x0000072c -_080AEC28: .4byte 0x02020630 -_080AEC2C: .4byte 0x0854fe44 -_080AEC30: .4byte 0x00001205 + .pool thumb_func_end sub_80AEBD0 thumb_func_start unc_0807DAB4 @@ -358589,14 +346811,13 @@ _080AEC8E: thumb_func_start sub_80AEC94 sub_80AEC94: @ 80AEC94 - ldr r2, _080AECA0 + ldr r2, =0x02038bc4 strb r0, [r2] - ldr r0, _080AECA4 + ldr r0, =0x02038bc6 strh r1, [r0] bx lr .align 2, 0 -_080AECA0: .4byte 0x02038bc4 -_080AECA4: .4byte 0x02038bc6 + .pool thumb_func_end sub_80AEC94 thumb_func_start sub_80AECA8 @@ -358607,7 +346828,7 @@ sub_80AECA8: @ 80AECA8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080AECC8 + ldr r0, =0x03005e08 adds r4, r1, r0 movs r1, 0 ldrsh r0, [r4, r1] @@ -358617,7 +346838,7 @@ sub_80AECA8: @ 80AECA8 beq _080AECF8 b _080AED1C .align 2, 0 -_080AECC8: .4byte 0x03005e08 + .pool _080AECCC: ldrh r0, [r4, 0x1E] subs r1, r0, 0x1 @@ -358627,7 +346848,7 @@ _080AECCC: bgt _080AED1C ldrb r0, [r4, 0x2] bl weather_set - ldr r1, _080AECF4 + ldr r1, =0x02038bc4 ldrh r0, [r4, 0x2] strb r0, [r1] movs r1, 0x96 @@ -358638,7 +346859,7 @@ _080AECCC: adds r0, 0x1 b _080AED1A .align 2, 0 -_080AECF4: .4byte 0x02038bc4 + .pool _080AECF8: ldrh r0, [r4, 0x1E] subs r1, r0, 0x1 @@ -358648,7 +346869,7 @@ _080AECF8: bgt _080AED1C ldrb r0, [r4, 0x4] bl weather_set - ldr r1, _080AED24 + ldr r1, =0x02038bc4 ldrh r0, [r4, 0x4] strb r0, [r1] movs r1, 0x96 @@ -358663,13 +346884,13 @@ _080AED1C: pop {r0} bx r0 .align 2, 0 -_080AED24: .4byte 0x02038bc4 + .pool thumb_func_end sub_80AECA8 thumb_func_start bag_add_task0_by_acit bag_add_task0_by_acit: @ 80AED28 push {lr} - ldr r0, _080AED54 + ldr r0, =sub_80AECA8 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -358677,22 +346898,20 @@ bag_add_task0_by_acit: @ 80AED28 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080AED58 + ldr r0, =0x03005e08 adds r1, r0 movs r2, 0x96 lsls r2, 2 adds r0, r2, 0 strh r0, [r1, 0x1E] - ldr r3, _080AED5C + ldr r3, =0x02038bc4 ldrb r2, [r3] cmp r2, 0xD bne _080AED60 movs r0, 0xC b _080AED66 .align 2, 0 -_080AED54: .4byte sub_80AECA8 + 1 -_080AED58: .4byte 0x03005e08 -_080AED5C: .4byte 0x02038bc4 + .pool _080AED60: cmp r2, 0xC bne _080AED6C @@ -358716,7 +346935,7 @@ _080AED78: thumb_func_start sub_80AED7C sub_80AED7C: @ 80AED7C push {r4,r5,lr} - ldr r4, _080AEDA8 + ldr r4, =0x03005d8c ldr r1, [r4] adds r1, 0x2E ldrb r5, [r1] @@ -358735,28 +346954,28 @@ sub_80AED7C: @ 80AED7C pop {r0} bx r0 .align 2, 0 -_080AEDA8: .4byte 0x03005d8c + .pool thumb_func_end sub_80AED7C thumb_func_start sav1_get_weather_probably sav1_get_weather_probably: @ 80AEDAC - ldr r0, _080AEDB8 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x2E ldrb r0, [r0] bx lr .align 2, 0 -_080AEDB8: .4byte 0x03005d8c + .pool thumb_func_end sav1_get_weather_probably thumb_func_start sub_80AEDBC sub_80AEDBC: @ 80AEDBC push {r4,r5,lr} - ldr r4, _080AEDE8 + ldr r4, =0x03005d8c ldr r0, [r4] adds r0, 0x2E ldrb r5, [r0] - ldr r0, _080AEDEC + ldr r0, =0x02037318 ldrb r0, [r0, 0x16] bl sub_80AEEE8 ldr r1, [r4] @@ -358771,8 +346990,7 @@ sub_80AEDBC: @ 80AEDBC pop {r0} bx r0 .align 2, 0 -_080AEDE8: .4byte 0x03005d8c -_080AEDEC: .4byte 0x02037318 + .pool thumb_func_end sub_80AEDBC thumb_func_start sub_80AEDF0 @@ -358807,21 +347025,20 @@ sub_80AEE20: @ 80AEE20 lsrs r4, r0, 24 cmp r4, 0xF bne _080AEE4C - ldr r0, _080AEE44 + ldr r0, =sub_80AECA8 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 bne _080AEE3E bl bag_add_task0_by_acit _080AEE3E: - ldr r0, _080AEE48 + ldr r0, =0x02038bc4 ldrb r4, [r0] b _080AEE6E .align 2, 0 -_080AEE44: .4byte sub_80AECA8 + 1 -_080AEE48: .4byte 0x02038bc4 + .pool _080AEE4C: - ldr r5, _080AEE7C + ldr r5, =sub_80AECA8 + 1 adds r0, r5, 0 bl is_function_an_active_task lsls r0, 24 @@ -358833,7 +347050,7 @@ _080AEE4C: lsrs r0, 24 bl remove_task _080AEE68: - ldr r1, _080AEE80 + ldr r1, =0x02038bc4 movs r0, 0xD strb r0, [r1] _080AEE6E: @@ -358843,8 +347060,7 @@ _080AEE6E: pop {r0} bx r0 .align 2, 0 -_080AEE7C: .4byte sub_80AECA8 + 1 -_080AEE80: .4byte 0x02038bc4 + .pool thumb_func_end sub_80AEE20 thumb_func_start sub_80AEE84 @@ -358855,21 +347071,20 @@ sub_80AEE84: @ 80AEE84 lsrs r4, r0, 24 cmp r4, 0xF bne _080AEEB0 - ldr r0, _080AEEA8 + ldr r0, =sub_80AECA8 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 bne _080AEEA2 bl bag_add_task0_by_acit _080AEEA2: - ldr r0, _080AEEAC + ldr r0, =0x02038bc4 ldrb r4, [r0] b _080AEED2 .align 2, 0 -_080AEEA8: .4byte sub_80AECA8 + 1 -_080AEEAC: .4byte 0x02038bc4 + .pool _080AEEB0: - ldr r5, _080AEEE0 + ldr r5, =sub_80AECA8 + 1 adds r0, r5, 0 bl is_function_an_active_task lsls r0, 24 @@ -358881,7 +347096,7 @@ _080AEEB0: lsrs r0, 24 bl remove_task _080AEECC: - ldr r1, _080AEEE4 + ldr r1, =0x02038bc4 movs r0, 0xD strb r0, [r1] _080AEED2: @@ -358891,8 +347106,7 @@ _080AEED2: pop {r0} bx r0 .align 2, 0 -_080AEEE0: .4byte sub_80AECA8 + 1 -_080AEEE4: .4byte 0x02038bc4 + .pool thumb_func_end sub_80AEE84 thumb_func_start sub_80AEEE8 @@ -358903,12 +347117,12 @@ sub_80AEEE8: @ 80AEEE8 cmp r0, 0x15 bhi _080AEFB4 lsls r0, 2 - ldr r1, _080AEEFC + ldr r1, =_080AEF00 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AEEFC: .4byte _080AEF00 + .pool .align 2, 0 _080AEF00: .4byte _080AEFB4 @@ -358979,14 +347193,14 @@ _080AEF90: movs r0, 0xF b _080AEFB6 _080AEF94: - ldr r1, _080AEF98 + ldr r1, =0x0854fe5c b _080AEF9E .align 2, 0 -_080AEF98: .4byte 0x0854fe5c + .pool _080AEF9C: - ldr r1, _080AEFAC + ldr r1, =0x0854fe60 _080AEF9E: - ldr r0, _080AEFB0 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x2F ldrb r0, [r0] @@ -358994,8 +347208,7 @@ _080AEF9E: ldrb r0, [r0] b _080AEFB6 .align 2, 0 -_080AEFAC: .4byte 0x0854fe60 -_080AEFB0: .4byte 0x03005d8c + .pool _080AEFB4: movs r0, 0 _080AEFB6: @@ -359006,7 +347219,7 @@ _080AEFB6: thumb_func_start sub_80AEFBC sub_80AEFBC: @ 80AEFBC lsls r0, 16 - ldr r1, _080AEFD8 + ldr r1, =0x03005d8c ldr r2, [r1] adds r2, 0x2F lsrs r0, 16 @@ -359020,7 +347233,7 @@ sub_80AEFBC: @ 80AEFBC strb r1, [r2] bx lr .align 2, 0 -_080AEFD8: .4byte 0x03005d8c + .pool thumb_func_end sub_80AEFBC thumb_func_start sub_80AEFDC @@ -359047,19 +347260,17 @@ _080AEFF6: palette_bg_faded_fill_white: @ 80AEFFC push {lr} sub sp, 0x4 - ldr r0, _080AF014 + ldr r0, =0x7fff7fff str r0, [sp] - ldr r1, _080AF018 - ldr r2, _080AF01C + ldr r1, =0x02037b14 + ldr r2, =0x01000100 mov r0, sp bl CpuFastSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_080AF014: .4byte 0x7fff7fff -_080AF018: .4byte 0x02037b14 -_080AF01C: .4byte 0x01000100 + .pool thumb_func_end palette_bg_faded_fill_white thumb_func_start palette_bg_faded_fill_black @@ -359068,16 +347279,15 @@ palette_bg_faded_fill_black: @ 80AF020 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r1, _080AF038 - ldr r2, _080AF03C + ldr r1, =0x02037b14 + ldr r2, =0x01000100 mov r0, sp bl CpuFastSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_080AF038: .4byte 0x02037b14 -_080AF03C: .4byte 0x01000100 + .pool thumb_func_end palette_bg_faded_fill_black thumb_func_start pal_fill_for_maplights @@ -359209,13 +347419,13 @@ sub_80AF128: @ 80AF128 bl script_env_2_enable bl sub_8085784 bl pal_fill_black - ldr r0, _080AF144 + ldr r0, =task0A_nop_for_a_while + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF144: .4byte task0A_nop_for_a_while + 1 + .pool thumb_func_end sub_80AF128 thumb_func_start task0A_asap_script_env_2_enable_and_set_ctx_running @@ -359241,13 +347451,13 @@ sub_80AF168: @ 80AF168 bl script_env_2_enable bl sub_8085784 bl pal_fill_black - ldr r0, _080AF184 + ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF184: .4byte task0A_asap_script_env_2_enable_and_set_ctx_running + 1 + .pool thumb_func_end sub_80AF168 thumb_func_start sub_80AF188 @@ -359255,13 +347465,13 @@ sub_80AF188: @ 80AF188 push {lr} bl script_env_2_enable bl pal_fill_black - ldr r0, _080AF1A0 + ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF1A0: .4byte task0A_asap_script_env_2_enable_and_set_ctx_running + 1 + .pool thumb_func_end sub_80AF188 thumb_func_start task_mpl_807DD60 @@ -359272,7 +347482,7 @@ task_mpl_807DD60: @ 80AF1A4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r2, _080AF1C8 + ldr r2, =0x03005e00 adds r4, r0, r2 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -359284,7 +347494,7 @@ task_mpl_807DD60: @ 80AF1A4 beq _080AF1D2 b _080AF20E .align 2, 0 -_080AF1C8: .4byte 0x03005e00 + .pool _080AF1CC: cmp r0, 0x2 beq _080AF1FC @@ -359330,13 +347540,13 @@ sub_80AF214: @ 80AF214 bl script_env_2_enable bl sub_8085784 bl palette_bg_faded_fill_black - ldr r0, _080AF230 + ldr r0, =task_mpl_807DD60 + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF230: .4byte task_mpl_807DD60 + 1 + .pool thumb_func_end sub_80AF214 thumb_func_start sub_80AF234 @@ -359347,7 +347557,7 @@ sub_80AF234: @ 80AF234 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080AF258 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -359359,7 +347569,7 @@ sub_80AF234: @ 80AF234 beq _080AF262 b _080AF2AE .align 2, 0 -_080AF258: .4byte 0x03005e00 + .pool _080AF25C: cmp r0, 0x2 beq _080AF298 @@ -359413,7 +347623,7 @@ sub_80AF2B4: @ 80AF2B4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080AF2D8 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -359425,7 +347635,7 @@ sub_80AF2B4: @ 80AF2B4 beq _080AF2E2 b _080AF30C .align 2, 0 -_080AF2D8: .4byte 0x03005e00 + .pool _080AF2DC: cmp r0, 0x2 beq _080AF2FA @@ -359461,13 +347671,13 @@ sub_80AF314: @ 80AF314 bl script_env_2_enable bl sub_8085784 bl palette_bg_faded_fill_black - ldr r0, _080AF330 + ldr r0, =sub_80AF234 + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF330: .4byte sub_80AF234 + 1 + .pool thumb_func_end sub_80AF314 thumb_func_start sub_80AF334 @@ -359493,19 +347703,19 @@ sub_80AF334: @ 80AF334 lsrs r0, 24 cmp r0, 0x1 bne _080AF36C - ldr r1, _080AF368 + ldr r1, =sub_80AF438 + 1 b _080AF37E .align 2, 0 -_080AF368: .4byte sub_80AF438 + 1 + .pool _080AF36C: adds r0, r4, 0 bl sub_8088F58 lsls r0, 24 lsrs r0, 24 - ldr r1, _080AF390 + ldr r1, =task_map_chg_seq_0807E2CC + 1 cmp r0, 0x1 bne _080AF37E - ldr r1, _080AF394 + ldr r1, =task_map_chg_seq_0807E20C + 1 _080AF37E: adds r0, r1, 0 movs r1, 0xA @@ -359515,8 +347725,7 @@ _080AF37E: pop {r0} bx r0 .align 2, 0 -_080AF390: .4byte task_map_chg_seq_0807E2CC + 1 -_080AF394: .4byte task_map_chg_seq_0807E20C + 1 + .pool thumb_func_end sub_80AF334 thumb_func_start mapldr_default @@ -359563,14 +347772,14 @@ sub_80AF3E8: @ 80AF3E8 bl pal_fill_for_maplights movs r0, 0x2E bl audio_play - ldr r0, _080AF408 + ldr r0, =task0A_mpl_807E31C + 1 movs r1, 0xA bl AddTask bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_080AF408: .4byte task0A_mpl_807E31C + 1 + .pool thumb_func_end sub_80AF3E8 thumb_func_start sub_80AF40C @@ -359580,7 +347789,7 @@ sub_80AF40C: @ 80AF40C bl pal_fill_for_maplights movs r0, 0x2E bl audio_play - ldr r0, _080AF434 + ldr r0, =task_map_chg_seq_0807E2CC + 1 movs r1, 0xA bl AddTask bl script_env_2_enable @@ -359589,7 +347798,7 @@ sub_80AF40C: @ 80AF40C pop {r0} bx r0 .align 2, 0 -_080AF434: .4byte task_map_chg_seq_0807E2CC + 1 + .pool thumb_func_end sub_80AF40C thumb_func_start sub_80AF438 @@ -359600,7 +347809,7 @@ sub_80AF438: @ 80AF438 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080AF464 + ldr r1, =0x03005e00 adds r5, r0, r1 adds r6, r5, 0 adds r6, 0xC @@ -359612,13 +347821,12 @@ sub_80AF438: @ 80AF438 cmp r0, 0x4 bhi _080AF54A lsls r0, 2 - ldr r1, _080AF468 + ldr r1, =_080AF46C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AF464: .4byte 0x03005e00 -_080AF468: .4byte _080AF46C + .pool .align 2, 0 _080AF46C: .4byte _080AF480 @@ -359657,7 +347865,7 @@ _080AF4A4: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080AF4D8 + ldr r1, =0x02037350 adds r0, r1 movs r1, 0x8 bl npc_set_state_2 @@ -359665,7 +347873,7 @@ _080AF4A4: strh r0, [r5, 0x8] b _080AF54A .align 2, 0 -_080AF4D8: .4byte 0x02037350 + .pool _080AF4DC: bl walkrun_is_standing_still lsls r0, 24 @@ -359689,14 +347897,14 @@ _080AF4DC: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080AF51C + ldr r1, =0x02037350 adds r0, r1 bl sub_8093284 movs r0, 0x3 strh r0, [r5, 0x8] b _080AF54A .align 2, 0 -_080AF51C: .4byte 0x02037350 + .pool _080AF520: movs r1, 0xA ldrsh r0, [r5, r1] @@ -359732,7 +347940,7 @@ task_map_chg_seq_0807E20C: @ 80AF550 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080AF57C + ldr r1, =0x03005e00 adds r5, r0, r1 adds r6, r5, 0 adds r6, 0xC @@ -359748,7 +347956,7 @@ task_map_chg_seq_0807E20C: @ 80AF550 beq _080AF58A b _080AF60A .align 2, 0 -_080AF57C: .4byte 0x03005e00 + .pool _080AF580: cmp r0, 0x2 beq _080AF5EC @@ -359780,7 +347988,7 @@ _080AF5A2: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080AF5E8 + ldr r0, =0x02037350 adds r4, r0 bl player_get_direction__sp1AA lsls r0, 24 @@ -359795,7 +348003,7 @@ _080AF5A2: strh r0, [r5, 0x8] b _080AF60A .align 2, 0 -_080AF5E8: .4byte 0x02037350 + .pool _080AF5EC: bl walkrun_is_standing_still lsls r0, 24 @@ -359820,7 +348028,7 @@ task_map_chg_seq_0807E2CC: @ 80AF610 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080AF630 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -359833,7 +348041,7 @@ task_map_chg_seq_0807E2CC: @ 80AF610 beq _080AF644 b _080AF65A .align 2, 0 -_080AF630: .4byte 0x03005e00 + .pool _080AF634: bl player_bitmagic bl script_env_2_enable @@ -359865,7 +348073,7 @@ sub_80AF660: @ 80AF660 bne _080AF67C adds r0, r4, 0 bl remove_task - ldr r0, _080AF684 + ldr r0, =sub_809FA34 + 1 movs r1, 0x50 bl AddTask _080AF67C: @@ -359873,21 +348081,21 @@ _080AF67C: pop {r0} bx r0 .align 2, 0 -_080AF684: .4byte sub_809FA34 + 1 + .pool thumb_func_end sub_80AF660 thumb_func_start sub_80AF688 sub_80AF688: @ 80AF688 push {lr} bl pal_fill_black - ldr r0, _080AF6A0 + ldr r0, =sub_80AF660 + 1 movs r1, 0x50 bl AddTask bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_080AF6A0: .4byte sub_80AF660 + 1 + .pool thumb_func_end sub_80AF688 thumb_func_start sub_80AF6A4 @@ -359922,13 +348130,13 @@ sub_80AF6D4: @ 80AF6D4 push {lr} bl script_env_2_enable bl pal_fill_black - ldr r0, _080AF6EC + ldr r0, =task_mpl_807E3C8 + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF6EC: .4byte task_mpl_807E3C8 + 1 + .pool thumb_func_end sub_80AF6D4 thumb_func_start sub_80AF6F0 @@ -359937,23 +348145,23 @@ sub_80AF6F0: @ 80AF6F0 bl script_env_2_enable bl sub_8085784 bl pal_fill_black - ldr r0, _080AF70C + ldr r0, =task_mpl_807E3C8 + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF70C: .4byte task_mpl_807E3C8 + 1 + .pool thumb_func_end sub_80AF6F0 thumb_func_start sub_80AF710 sub_80AF710: @ 80AF710 - ldr r0, _080AF718 + ldr r0, =0x02037fd4 ldrb r0, [r0, 0x7] lsrs r0, 7 bx lr .align 2, 0 -_080AF718: .4byte 0x02037fd4 + .pool thumb_func_end sub_80AF710 thumb_func_start sub_80AF71C @@ -359982,18 +348190,16 @@ sub_80AF734: @ 80AF734 bl play_some_sound movs r0, 0x9 bl audio_play - ldr r0, _080AF760 - ldr r1, _080AF764 + ldr r0, =0x03005dac + ldr r1, =mapldr_default + 1 str r1, [r0] - ldr r0, _080AF768 + ldr r0, =sub_80AFA0C + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF760: .4byte 0x03005dac -_080AF764: .4byte mapldr_default + 1 -_080AF768: .4byte sub_80AFA0C + 1 + .pool thumb_func_end sub_80AF734 thumb_func_start sp13E_warp_to_last_warp @@ -360003,18 +348209,16 @@ sp13E_warp_to_last_warp: @ 80AF76C bl music_something bl sub_80AF0B4 bl play_some_sound - ldr r0, _080AF790 - ldr r1, _080AF794 + ldr r0, =0x03005dac + ldr r1, =mapldr_default + 1 str r1, [r0] - ldr r0, _080AF798 + ldr r0, =sub_80AFA0C + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF790: .4byte 0x03005dac -_080AF794: .4byte mapldr_default + 1 -_080AF798: .4byte sub_80AFA0C + 1 + .pool thumb_func_end sp13E_warp_to_last_warp thumb_func_start sub_80AF79C @@ -360026,50 +348230,45 @@ sub_80AF79C: @ 80AF79C movs r1, 0x8 bl fade_screen bl play_some_sound - ldr r0, _080AF7C4 - ldr r1, _080AF7C8 + ldr r0, =0x03005dac + ldr r1, =sub_80AF3B0 + 1 str r1, [r0] - ldr r0, _080AF7CC + ldr r0, =sub_80AFA0C + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF7C4: .4byte 0x03005dac -_080AF7C8: .4byte sub_80AF3B0 + 1 -_080AF7CC: .4byte sub_80AFA0C + 1 + .pool thumb_func_end sub_80AF79C thumb_func_start sub_80AF7D0 sub_80AF7D0: @ 80AF7D0 push {lr} bl script_env_2_enable - ldr r0, _080AF7E8 - ldr r1, _080AF7EC + ldr r0, =0x03005dac + ldr r1, =mapldr_default + 1 str r1, [r0] - ldr r0, _080AF7F0 + ldr r0, =sub_80AFA88 + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF7E8: .4byte 0x03005dac -_080AF7EC: .4byte mapldr_default + 1 -_080AF7F0: .4byte sub_80AFA88 + 1 + .pool thumb_func_end sub_80AF7D0 thumb_func_start sp13F_fall_to_last_warp sp13F_fall_to_last_warp: @ 80AF7F4 push {lr} bl sp13E_warp_to_last_warp - ldr r1, _080AF804 - ldr r0, _080AF808 + ldr r1, =0x03005dac + ldr r0, =sub_80B6B68 + 1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080AF804: .4byte 0x03005dac -_080AF808: .4byte sub_80B6B68 + 1 + .pool thumb_func_end sp13F_fall_to_last_warp thumb_func_start sub_80AF80C @@ -360115,18 +348314,16 @@ sub_80AF848: @ 80AF848 bl sub_80AF0B4 movs r0, 0x2D bl audio_play - ldr r0, _080AF870 + ldr r0, =sub_80AFA0C + 1 movs r1, 0xA bl AddTask - ldr r1, _080AF874 - ldr r0, _080AF878 + ldr r1, =0x03005dac + ldr r0, =sub_80AF3E8 + 1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080AF870: .4byte sub_80AFA0C + 1 -_080AF874: .4byte 0x03005dac -_080AF878: .4byte sub_80AF3E8 + 1 + .pool thumb_func_end sub_80AF848 thumb_func_start sub_80AF87C @@ -360140,18 +348337,16 @@ sub_80AF87C: @ 80AF87C bl sub_80AF0B4 movs r0, 0x2D bl audio_play - ldr r0, _080AF8AC + ldr r0, =sub_80AFA0C + 1 movs r1, 0xA bl AddTask - ldr r1, _080AF8B0 - ldr r0, _080AF8B4 + ldr r1, =0x03005dac + ldr r0, =sub_80AF40C + 1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080AF8AC: .4byte sub_80AFA0C + 1 -_080AF8B0: .4byte 0x03005dac -_080AF8B4: .4byte sub_80AF40C + 1 + .pool thumb_func_end sub_80AF87C thumb_func_start sub_80AF8B8 @@ -360159,18 +348354,16 @@ sub_80AF8B8: @ 80AF8B8 push {lr} bl script_env_2_enable bl sub_80AF0B4 - ldr r0, _080AF8D4 + ldr r0, =sub_80AFA0C + 1 movs r1, 0xA bl AddTask - ldr r1, _080AF8D8 - ldr r0, _080AF8DC + ldr r1, =0x03005dac + ldr r0, =sub_80FB768 + 1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080AF8D4: .4byte sub_80AFA0C + 1 -_080AF8D8: .4byte 0x03005dac -_080AF8DC: .4byte sub_80FB768 + 1 + .pool thumb_func_end sub_80AF8B8 thumb_func_start sub_80AF8E0 @@ -360181,7 +348374,7 @@ sub_80AF8E0: @ 80AF8E0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080AF904 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -360193,7 +348386,7 @@ sub_80AF8E0: @ 80AF8E0 beq _080AF90E b _080AF93E .align 2, 0 -_080AF904: .4byte 0x03005e00 + .pool _080AF908: cmp r0, 0x2 beq _080AF92E @@ -360216,7 +348409,7 @@ _080AF926: b _080AF93E _080AF92E: bl warp_in - ldr r0, _080AF944 + ldr r0, =sub_8086074 + 1 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -360225,7 +348418,7 @@ _080AF93E: pop {r0} bx r0 .align 2, 0 -_080AF944: .4byte sub_8086074 + 1 + .pool thumb_func_end sub_80AF8E0 thumb_func_start sub_80AF948 @@ -360236,13 +348429,13 @@ sub_80AF948: @ 80AF948 bl sub_80AF0B4 movs r0, 0x9 bl audio_play - ldr r0, _080AF968 + ldr r0, =sub_80AF8E0 + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AF968: .4byte sub_80AF8E0 + 1 + .pool thumb_func_end sub_80AF948 thumb_func_start sub_80AF96C @@ -360253,7 +348446,7 @@ sub_80AF96C: @ 80AF96C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080AF990 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -360265,7 +348458,7 @@ sub_80AF96C: @ 80AF96C beq _080AF99A b _080AF9E8 .align 2, 0 -_080AF990: .4byte 0x03005e08 + .pool _080AF994: cmp r0, 0x2 beq _080AF9D0 @@ -360294,12 +348487,12 @@ _080AF9C8: strh r0, [r4] b _080AF9E8 _080AF9D0: - ldr r0, _080AF9F0 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080AF9E8 bl warp_in - ldr r0, _080AF9F4 + ldr r0, =c2_load_new_map + 1 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -360308,20 +348501,19 @@ _080AF9E8: pop {r0} bx r0 .align 2, 0 -_080AF9F0: .4byte 0x03003124 -_080AF9F4: .4byte c2_load_new_map + 1 + .pool thumb_func_end sub_80AF96C thumb_func_start sub_80AF9F8 sub_80AF9F8: @ 80AF9F8 push {lr} - ldr r0, _080AFA08 + ldr r0, =sub_80AF96C + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AFA08: .4byte sub_80AF96C + 1 + .pool thumb_func_end sub_80AF9F8 thumb_func_start sub_80AFA0C @@ -360332,7 +348524,7 @@ sub_80AFA0C: @ 80AFA0C lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080AFA30 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r5, [r4, r0] @@ -360344,7 +348536,7 @@ sub_80AFA0C: @ 80AFA0C beq _080AFA3A b _080AFA7C .align 2, 0 -_080AFA30: .4byte 0x03005e00 + .pool _080AFA34: cmp r5, 0x2 beq _080AFA6C @@ -360375,7 +348567,7 @@ _080AFA64: b _080AFA7C _080AFA6C: bl warp_in - ldr r0, _080AFA84 + ldr r0, =c2_load_new_map + 1 bl set_callback2 adds r0, r6, 0 bl remove_task @@ -360384,7 +348576,7 @@ _080AFA7C: pop {r0} bx r0 .align 2, 0 -_080AFA84: .4byte c2_load_new_map + 1 + .pool thumb_func_end sub_80AFA0C thumb_func_start sub_80AFA88 @@ -360395,7 +348587,7 @@ sub_80AFA88: @ 80AFA88 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080AFAB8 + ldr r0, =0x03005e00 adds r5, r1, r0 adds r4, r5, 0 adds r4, 0xC @@ -360409,13 +348601,12 @@ sub_80AFA88: @ 80AFA88 b _080AFBE8 _080AFAAC: lsls r0, r1, 2 - ldr r1, _080AFABC + ldr r1, =_080AFAC0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AFAB8: .4byte 0x03005e00 -_080AFABC: .4byte _080AFAC0 + .pool .align 2, 0 _080AFAC0: .4byte _080AFAD4 @@ -360472,7 +348663,7 @@ _080AFB26: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r4, _080AFB68 + ldr r4, =0x02037350 adds r0, r4 bl npc_hide_and_trainer_flag_clear_on_tile_x66_at_pos movs r0, 0xFF @@ -360492,7 +348683,7 @@ _080AFB26: strh r0, [r5, 0x8] b _080AFBE8 .align 2, 0 -_080AFB68: .4byte 0x02037350 + .pool _080AFB6C: bl walkrun_is_standing_still lsls r0, 24 @@ -360517,7 +348708,7 @@ _080AFB6C: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080AFBB4 + ldr r1, =0x02037350 adds r0, r1 bl sub_8093284 movs r0, 0 @@ -360526,7 +348717,7 @@ _080AFB6C: strh r0, [r5, 0x8] b _080AFBE8 .align 2, 0 -_080AFBB4: .4byte 0x02037350 + .pool _080AFBB8: movs r1, 0xA ldrsh r0, [r5, r1] @@ -360549,14 +348740,14 @@ _080AFBD4: bl play_some_sound movs r0, 0 strh r0, [r5, 0x8] - ldr r0, _080AFBF0 + ldr r0, =sub_80AFA0C + 1 str r0, [r5] _080AFBE8: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080AFBF0: .4byte sub_80AFA0C + 1 + .pool thumb_func_end sub_80AFA88 thumb_func_start task0A_fade_n_map_maybe @@ -360567,7 +348758,7 @@ task0A_fade_n_map_maybe: @ 80AFBF4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080AFC18 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -360579,7 +348770,7 @@ task0A_fade_n_map_maybe: @ 80AFBF4 beq _080AFC22 b _080AFC56 .align 2, 0 -_080AFC18: .4byte 0x03005e00 + .pool _080AFC1C: cmp r0, 0x2 beq _080AFC46 @@ -360603,7 +348794,7 @@ _080AFC3E: b _080AFC56 _080AFC46: bl warp_in - ldr r0, _080AFC5C + ldr r0, =sub_8086024 + 1 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -360612,7 +348803,7 @@ _080AFC56: pop {r0} bx r0 .align 2, 0 -_080AFC5C: .4byte sub_8086024 + 1 + .pool thumb_func_end task0A_fade_n_map_maybe thumb_func_start sub_80AFC60 @@ -360624,18 +348815,16 @@ sub_80AFC60: @ 80AFC60 bl play_some_sound movs r0, 0x9 bl audio_play - ldr r0, _080AFC8C - ldr r1, _080AFC90 + ldr r0, =0x03005dac + ldr r1, =sub_80AF3C8 + 1 str r1, [r0] - ldr r0, _080AFC94 + ldr r0, =task0A_fade_n_map_maybe + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080AFC8C: .4byte 0x03005dac -_080AFC90: .4byte sub_80AF3C8 + 1 -_080AFC94: .4byte task0A_fade_n_map_maybe + 1 + .pool thumb_func_end sub_80AFC60 thumb_func_start sub_80AFC98 @@ -360854,7 +349043,7 @@ sub_80AFE08: @ 80AFE08 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080AFE2C + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -360866,18 +349055,18 @@ sub_80AFE08: @ 80AFE08 beq _080AFE36 b _080AFEC6 .align 2, 0 -_080AFE2C: .4byte 0x03005e08 + .pool _080AFE30: cmp r0, 0x2 beq _080AFEBC b _080AFEC6 _080AFE36: - ldr r0, _080AFE5C + ldr r0, =0x02039b28 ldrb r1, [r0, 0x14] lsls r0, r1, 4 subs r0, r1 lsls r0, 7 - ldr r1, _080AFE60 + ldr r1, =0x02038c28 adds r0, r1 movs r2, 0x2 ldrsh r1, [r4, r2] @@ -360890,15 +349079,14 @@ _080AFE36: strh r0, [r4] b _080AFEC6 .align 2, 0 -_080AFE5C: .4byte 0x02039b28 -_080AFE60: .4byte 0x02038c28 + .pool _080AFE64: - ldr r0, _080AFEAC + ldr r0, =0x02039b28 ldrb r1, [r0, 0x14] lsls r0, r1, 4 subs r0, r1 lsls r0, 7 - ldr r1, _080AFEB0 + ldr r1, =0x02038c28 adds r0, r1 movs r6, 0x2 ldrsh r1, [r4, r6] @@ -360928,8 +349116,7 @@ _080AFE64: strh r0, [r4] b _080AFEC6 .align 2, 0 -_080AFEAC: .4byte 0x02039b28 -_080AFEB0: .4byte 0x02038c28 + .pool _080AFEB4: adds r0, r5, 0 bl remove_task @@ -360952,7 +349139,7 @@ sub_80AFECC: @ 80AFECC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080AFEF0 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -360964,18 +349151,18 @@ sub_80AFECC: @ 80AFECC beq _080AFEFA b _080AFF8A .align 2, 0 -_080AFEF0: .4byte 0x03005e08 + .pool _080AFEF4: cmp r0, 0x2 beq _080AFF80 b _080AFF8A _080AFEFA: - ldr r0, _080AFF20 + ldr r0, =0x02039b28 ldrb r1, [r0, 0x14] lsls r0, r1, 4 subs r0, r1 lsls r0, 7 - ldr r1, _080AFF24 + ldr r1, =0x02038c28 adds r0, r1 movs r2, 0x2 ldrsh r1, [r4, r2] @@ -360988,15 +349175,14 @@ _080AFEFA: strh r0, [r4] b _080AFF8A .align 2, 0 -_080AFF20: .4byte 0x02039b28 -_080AFF24: .4byte 0x02038c28 + .pool _080AFF28: - ldr r0, _080AFF70 + ldr r0, =0x02039b28 ldrb r1, [r0, 0x14] lsls r0, r1, 4 subs r0, r1 lsls r0, 7 - ldr r1, _080AFF74 + ldr r1, =0x02038c28 adds r0, r1 movs r6, 0x2 ldrsh r1, [r4, r6] @@ -361026,8 +349212,7 @@ _080AFF28: strh r0, [r4] b _080AFF8A .align 2, 0 -_080AFF70: .4byte 0x02039b28 -_080AFF74: .4byte 0x02038c28 + .pool _080AFF78: adds r0, r5, 0 bl remove_task @@ -361047,7 +349232,7 @@ sub_80AFF90: @ 80AFF90 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080AFFB4 + ldr r0, =sub_80AFE08 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -361060,13 +349245,13 @@ _080AFFAC: pop {r0} bx r0 .align 2, 0 -_080AFFB4: .4byte sub_80AFE08 + 1 + .pool thumb_func_end sub_80AFF90 thumb_func_start sub_80AFFB8 sub_80AFFB8: @ 80AFFB8 push {r4,lr} - ldr r4, _080AFFD8 + ldr r4, =sub_80AFF90 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -361080,7 +349265,7 @@ _080AFFD0: pop {r0} bx r0 .align 2, 0 -_080AFFD8: .4byte sub_80AFF90 + 1 + .pool thumb_func_end sub_80AFFB8 thumb_func_start sub_80AFFDC @@ -361097,7 +349282,7 @@ sub_80AFFDC: @ 80AFFDC ldr r0, [sp, 0x20] lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080B0020 + ldr r0, =sub_80AFE08 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -361105,7 +349290,7 @@ sub_80AFFDC: @ 80AFFDC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B0024 + ldr r1, =0x03005e08 adds r1, r0, r1 strh r5, [r1, 0x6] strh r4, [r1, 0x8] @@ -361119,8 +349304,7 @@ sub_80AFFDC: @ 80AFFDC strh r7, [r1, 0xA] b _080B002C .align 2, 0 -_080B0020: .4byte sub_80AFE08 + 1 -_080B0024: .4byte 0x03005e08 + .pool _080B0028: negs r0, r7 strh r0, [r1, 0xA] @@ -361148,7 +349332,7 @@ sub_80B003C: @ 80B003C ldr r0, [sp, 0x20] lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080B0080 + ldr r0, =sub_80AFECC + 1 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -361156,7 +349340,7 @@ sub_80B003C: @ 80B003C lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080B0084 + ldr r1, =0x03005e08 adds r1, r0, r1 strh r5, [r1, 0x6] strh r4, [r1, 0x8] @@ -361170,8 +349354,7 @@ sub_80B003C: @ 80B003C strh r7, [r1, 0xA] b _080B008C .align 2, 0 -_080B0080: .4byte sub_80AFECC + 1 -_080B0084: .4byte 0x03005e08 + .pool _080B0088: negs r0, r7 strh r0, [r1, 0xA] @@ -361200,7 +349383,7 @@ sub_80B009C: @ 80B009C bne _080B00B6 movs r5, 0x1 _080B00B6: - ldr r1, _080B00E4 + ldr r1, =0x0854fe64 lsls r0, 1 adds r0, r1 ldrh r2, [r0] @@ -361220,7 +349403,7 @@ _080B00B6: pop {r0} bx r0 .align 2, 0 -_080B00E4: .4byte 0x0854fe64 + .pool thumb_func_end sub_80B009C thumb_func_start sub_80B00E8 @@ -361230,8 +349413,8 @@ sub_80B00E8: @ 80B00E8 lsrs r0, 24 cmp r0, 0 beq _080B0116 - ldr r4, _080B011C - ldr r1, _080B0120 + ldr r4, =0x02038c28 + ldr r1, =0x0854fe64 lsls r0, 1 adds r0, r1 ldrh r3, [r0] @@ -361251,17 +349434,16 @@ _080B0116: pop {r0} bx r0 .align 2, 0 -_080B011C: .4byte 0x02038c28 -_080B0120: .4byte 0x0854fe64 + .pool thumb_func_end sub_80B00E8 thumb_func_start door_upload_tiles door_upload_tiles: @ 80B0124 push {r4,lr} - ldr r4, _080B0154 - ldr r0, _080B0158 + ldr r4, =0x02038c28 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _080B015C + ldr r1, =0x00000e68 adds r0, r1 ldrb r3, [r0] adds r0, r4, 0 @@ -361279,9 +349461,7 @@ door_upload_tiles: @ 80B0124 pop {r0} bx r0 .align 2, 0 -_080B0154: .4byte 0x02038c28 -_080B0158: .4byte 0x03005d90 -_080B015C: .4byte 0x00000e68 + .pool thumb_func_end door_upload_tiles thumb_func_start task0A_mpl_807E31C @@ -361289,7 +349469,7 @@ task0A_mpl_807E31C: @ 80B0160 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080B0180 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -361302,7 +349482,7 @@ task0A_mpl_807E31C: @ 80B0160 beq _080B0198 b _080B01B6 .align 2, 0 -_080B0180: .4byte 0x03005e00 + .pool _080B0184: bl player_bitmagic bl script_env_2_enable @@ -361336,7 +349516,7 @@ sub_80B01BC: @ 80B01BC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B01E0 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -361348,7 +349528,7 @@ sub_80B01BC: @ 80B01BC beq _080B01EE b _080B023A .align 2, 0 -_080B01E0: .4byte 0x03005e00 + .pool _080B01E4: cmp r0, 0x2 beq _080B0210 @@ -361383,7 +349563,7 @@ _080B0222: b _080B023A _080B022A: bl warp_in - ldr r0, _080B0240 + ldr r0, =c2_load_new_map + 1 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -361392,43 +349572,39 @@ _080B023A: pop {r0} bx r0 .align 2, 0 -_080B0240: .4byte c2_load_new_map + 1 + .pool thumb_func_end sub_80B01BC thumb_func_start sub_80B0244 sub_80B0244: @ 80B0244 push {lr} bl script_env_2_enable - ldr r0, _080B025C + ldr r0, =sub_80AFA0C + 1 movs r1, 0xA bl AddTask - ldr r1, _080B0260 - ldr r0, _080B0264 + ldr r1, =0x03005dac + ldr r0, =sub_80AF3E8 + 1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080B025C: .4byte sub_80AFA0C + 1 -_080B0260: .4byte 0x03005dac -_080B0264: .4byte sub_80AF3E8 + 1 + .pool thumb_func_end sub_80B0244 thumb_func_start sub_80B0268 sub_80B0268: @ 80B0268 push {lr} bl script_env_2_enable - ldr r0, _080B0280 - ldr r1, _080B0284 + ldr r0, =0x03005dac + ldr r1, =mapldr_default + 1 str r1, [r0] - ldr r0, _080B0288 + ldr r0, =sub_80B01BC + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_080B0280: .4byte 0x03005dac -_080B0284: .4byte mapldr_default + 1 -_080B0288: .4byte sub_80B01BC + 1 + .pool thumb_func_end sub_80B0268 thumb_func_start sub_80B028C @@ -361471,7 +349647,7 @@ _080B02AA: sub_80B02C8: @ 80B02C8 push {r4,r5,lr} lsls r0, 16 - ldr r2, _080B02E8 + ldr r2, =0x04000052 ldrh r1, [r2] lsls r1, 24 lsrs r5, r1, 24 @@ -361486,7 +349662,7 @@ sub_80B02C8: @ 80B02C8 lsrs r5, r0, 24 b _080B02F6 .align 2, 0 -_080B02E8: .4byte 0x04000052 + .pool _080B02EC: cmp r4, 0xF bhi _080B02F6 @@ -361523,7 +349699,7 @@ sub_80B0318: @ 80B0318 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080B0340 + ldr r1, =0x03005e08 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -361532,13 +349708,12 @@ sub_80B0318: @ 80B0318 b _080B052C _080B0334: lsls r0, 2 - ldr r1, _080B0344 + ldr r1, =_080B0348 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B0340: .4byte 0x03005e08 -_080B0344: .4byte _080B0348 + .pool .align 2, 0 _080B0348: .4byte _080B0368 @@ -361554,27 +349729,27 @@ _080B0368: lsls r0, 19 ldrh r0, [r0] strh r0, [r5, 0xC] - ldr r0, _080B0404 + ldr r0, =0x04000050 ldrh r0, [r0] strh r0, [r5, 0xE] - ldr r0, _080B0408 + ldr r0, =0x04000052 ldrh r0, [r0] strh r0, [r5, 0x10] - ldr r0, _080B040C + ldr r0, =0x04000048 ldrh r0, [r0] strh r0, [r5, 0x12] - ldr r0, _080B0410 + ldr r0, =0x0400004a ldrh r0, [r0] strh r0, [r5, 0x14] movs r1, 0x80 lsls r1, 7 movs r0, 0 bl lcd_io_clear_bits - ldr r0, _080B0414 + ldr r0, =0x082ec7cc ldrh r1, [r0] movs r0, 0x50 bl lcd_io_set_bits - ldr r1, _080B0418 + ldr r1, =0x0000070c movs r0, 0x52 bl lcd_io_set movs r0, 0x48 @@ -361594,7 +349769,7 @@ _080B0368: bl sub_8199C30 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r4, _080B041C + ldr r4, =0x02038c28 movs r2, 0x4 ldrsh r1, [r5, r2] movs r0, 0x6 @@ -361609,7 +349784,7 @@ _080B0368: lsls r2, 1 adds r0, r4, 0 bl CpuFastSet - ldr r2, _080B0420 + ldr r2, =0x0854fe7c ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] @@ -361618,14 +349793,7 @@ _080B0368: strh r0, [r5] b _080B052C .align 2, 0 -_080B0404: .4byte 0x04000050 -_080B0408: .4byte 0x04000052 -_080B040C: .4byte 0x04000048 -_080B0410: .4byte 0x0400004a -_080B0414: .4byte 0x082ec7cc -_080B0418: .4byte 0x0000070c -_080B041C: .4byte 0x02038c28 -_080B0420: .4byte 0x0854fe7c + .pool _080B0424: movs r0, 0 movs r1, 0x11 @@ -361647,7 +349815,7 @@ _080B0424: strh r4, [r5] b _080B052C _080B0450: - ldr r0, _080B0468 + ldr r0, =sub_80AFECC + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -361657,7 +349825,7 @@ _080B0450: strh r0, [r5] b _080B052C .align 2, 0 -_080B0468: .4byte sub_80AFECC + 1 + .pool _080B046C: bl sub_808A2E4 movs r0, 0 @@ -361756,7 +349924,7 @@ _080B052C: thumb_func_start sub_80B0534 sub_80B0534: @ 80B0534 push {lr} - ldr r0, _080B055C + ldr r0, =sub_80B0318 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -361764,9 +349932,9 @@ sub_80B0534: @ 80B0534 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B0560 + ldr r0, =0x03005e08 adds r1, r0 - ldr r0, _080B0564 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 bne _080B0568 @@ -361774,9 +349942,7 @@ sub_80B0534: @ 80B0534 movs r0, 0x68 b _080B0580 .align 2, 0 -_080B055C: .4byte sub_80B0318 + 1 -_080B0560: .4byte 0x03005e08 -_080B0564: .4byte 0x020375f0 + .pool _080B0568: cmp r0, 0x1 bne _080B0572 @@ -361804,11 +349970,11 @@ _080B0580: thumb_func_start sub_80B058C sub_80B058C: @ 80B058C push {lr} - ldr r0, _080B05AC + ldr r0, =sub_80B0318 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 - ldr r2, _080B05B0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -361818,21 +349984,20 @@ sub_80B058C: @ 80B058C pop {r0} bx r0 .align 2, 0 -_080B05AC: .4byte sub_80B0318 + 1 -_080B05B0: .4byte 0x03005e00 + .pool thumb_func_end sub_80B058C thumb_func_start sub_80B05B4 sub_80B05B4: @ 80B05B4 push {lr} bl sub_80859B0 - ldr r0, _080B05C8 + ldr r0, =task50_0807F0C8 + 1 movs r1, 0x50 bl AddTask pop {r0} bx r0 .align 2, 0 -_080B05C8: .4byte task50_0807F0C8 + 1 + .pool thumb_func_end sub_80B05B4 thumb_func_start task50_0807F0C8 @@ -361862,7 +350027,7 @@ task01_battle_start: @ 80B05F0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B0610 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -361872,7 +350037,7 @@ task01_battle_start: @ 80B05F0 beq _080B062E b _080B0652 .align 2, 0 -_080B0610: .4byte 0x03005e08 + .pool _080B0614: bl c3_80A0DD8_is_running cmp r0, 0 @@ -361891,7 +350056,7 @@ _080B062E: cmp r0, 0x1 bne _080B0652 bl overworld_free_bg_tilemaps - ldr r0, _080B0658 + ldr r0, =sub_8036760 + 1 bl set_callback2 bl prev_quest_postbuffer_cursor_backup_reset bl overworld_poison_timer_set @@ -361902,7 +350067,7 @@ _080B0652: pop {r0} bx r0 .align 2, 0 -_080B0658: .4byte sub_8036760 + 1 + .pool thumb_func_end task01_battle_start thumb_func_start task_add_01_battle_start @@ -361914,12 +350079,12 @@ task_add_01_battle_start: @ 80B065C lsrs r4, 24 lsls r5, 16 lsrs r5, 16 - ldr r0, _080B0690 + ldr r0, =task01_battle_start + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080B0694 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -361931,8 +350096,7 @@ task_add_01_battle_start: @ 80B065C pop {r0} bx r0 .align 2, 0 -_080B0690: .4byte task01_battle_start + 1 -_080B0694: .4byte 0x03005e00 + .pool thumb_func_end task_add_01_battle_start thumb_func_start sub_80B0698 @@ -361964,17 +350128,17 @@ sub_80B06BC: @ 80B06BC bl script_env_2_enable bl player_bitmagic bl sub_808BCF4 - ldr r1, _080B071C - ldr r0, _080B0720 + ldr r1, =0x030022c0 + ldr r0, =sub_80B0AF8 + 1 str r0, [r1, 0x8] - ldr r4, _080B0724 + ldr r4, =0x02022fec movs r0, 0 str r0, [r4] bl sub_81A9E40 lsls r0, 24 cmp r0, 0 beq _080B06F2 - ldr r0, _080B0728 + ldr r0, =0x0000400e movs r1, 0 bl var_set ldr r0, [r4] @@ -361998,10 +350162,7 @@ _080B06F2: pop {r0} bx r0 .align 2, 0 -_080B071C: .4byte 0x030022c0 -_080B0720: .4byte sub_80B0AF8 + 1 -_080B0724: .4byte 0x02022fec -_080B0728: .4byte 0x0000400e + .pool thumb_func_end sub_80B06BC thumb_func_start sub_80B072C @@ -362010,10 +350171,10 @@ sub_80B072C: @ 80B072C bl script_env_2_enable bl player_bitmagic bl sub_808BCF4 - ldr r1, _080B0770 - ldr r0, _080B0774 + ldr r1, =0x030022c0 + ldr r0, =sub_80B0AF8 + 1 str r0, [r1, 0x8] - ldr r1, _080B0778 + ldr r1, =0x02022fec movs r0, 0x80 lsls r0, 3 str r0, [r1] @@ -362031,9 +350192,7 @@ sub_80B072C: @ 80B072C pop {r0} bx r0 .align 2, 0 -_080B0770: .4byte 0x030022c0 -_080B0774: .4byte sub_80B0AF8 + 1 -_080B0778: .4byte 0x02022fec + .pool thumb_func_end sub_80B072C thumb_func_start sub_80B077C @@ -362042,10 +350201,10 @@ sub_80B077C: @ 80B077C bl script_env_2_enable bl player_bitmagic bl sub_808BCF4 - ldr r1, _080B07A8 - ldr r0, _080B07AC + ldr r1, =0x030022c0 + ldr r0, =sub_80FC190 + 1 str r0, [r1, 0x8] - ldr r1, _080B07B0 + ldr r1, =0x02022fec movs r0, 0x80 str r0, [r1] bl sub_80B0EC8 @@ -362056,9 +350215,7 @@ sub_80B077C: @ 80B077C pop {r0} bx r0 .align 2, 0 -_080B07A8: .4byte 0x030022c0 -_080B07AC: .4byte sub_80FC190 + 1 -_080B07B0: .4byte 0x02022fec + .pool thumb_func_end sub_80B077C thumb_func_start sub_80B07B4 @@ -362067,10 +350224,10 @@ sub_80B07B4: @ 80B07B4 bl script_env_2_enable bl player_bitmagic bl sub_808BCF4 - ldr r1, _080B07F8 - ldr r0, _080B07FC + ldr r1, =0x030022c0 + ldr r0, =sub_80B0AF8 + 1 str r0, [r1, 0x8] - ldr r1, _080B0800 + ldr r1, =0x02022fec movs r0, 0x80 lsls r0, 13 str r0, [r1] @@ -362088,9 +350245,7 @@ sub_80B07B4: @ 80B07B4 pop {r0} bx r0 .align 2, 0 -_080B07F8: .4byte 0x030022c0 -_080B07FC: .4byte sub_80B0AF8 + 1 -_080B0800: .4byte 0x02022fec + .pool thumb_func_end sub_80B07B4 thumb_func_start task_add_01_battle_start_with_music_and_stats @@ -362144,16 +350299,16 @@ _080B0856: thumb_func_start sub_80B086C sub_80B086C: @ 80B086C push {lr} - ldr r0, _080B0898 + ldr r0, =0x02024744 movs r1, 0xC4 lsls r1, 1 movs r2, 0x5 bl sub_8067FF8 bl script_env_2_enable - ldr r1, _080B089C - ldr r0, _080B08A0 + ldr r1, =0x030022c0 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 str r0, [r1, 0x8] - ldr r1, _080B08A4 + ldr r1, =0x02022fec movs r0, 0x80 lsls r0, 2 str r0, [r1] @@ -362163,20 +350318,17 @@ sub_80B086C: @ 80B086C pop {r0} bx r0 .align 2, 0 -_080B0898: .4byte 0x02024744 -_080B089C: .4byte 0x030022c0 -_080B08A0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 -_080B08A4: .4byte 0x02022fec + .pool thumb_func_end sub_80B086C thumb_func_start sub_80B08A8 sub_80B08A8: @ 80B08A8 push {lr} bl script_env_2_enable - ldr r1, _080B08E0 - ldr r0, _080B08E4 + ldr r1, =0x030022c0 + ldr r0, =sub_80B0B6C + 1 str r0, [r1, 0x8] - ldr r1, _080B08E8 + ldr r1, =0x02022fec movs r0, 0 str r0, [r1] bl sub_80B0EC8 @@ -362193,19 +350345,17 @@ sub_80B08A8: @ 80B08A8 pop {r0} bx r0 .align 2, 0 -_080B08E0: .4byte 0x030022c0 -_080B08E4: .4byte sub_80B0B6C + 1 -_080B08E8: .4byte 0x02022fec + .pool thumb_func_end sub_80B08A8 thumb_func_start sub_80B08EC sub_80B08EC: @ 80B08EC push {lr} bl script_env_2_enable - ldr r1, _080B0928 - ldr r0, _080B092C + ldr r1, =0x030022c0 + ldr r0, =sub_80B0B6C + 1 str r0, [r1, 0x8] - ldr r1, _080B0930 + ldr r1, =0x02022fec movs r0, 0x80 lsls r0, 6 str r0, [r1] @@ -362223,23 +350373,21 @@ sub_80B08EC: @ 80B08EC pop {r0} bx r0 .align 2, 0 -_080B0928: .4byte 0x030022c0 -_080B092C: .4byte sub_80B0B6C + 1 -_080B0930: .4byte 0x02022fec + .pool thumb_func_end sub_80B08EC thumb_func_start sub_80B0934 sub_80B0934: @ 80B0934 push {r4,lr} bl script_env_2_enable - ldr r1, _080B0974 - ldr r0, _080B0978 + ldr r1, =0x030022c0 + ldr r0, =sub_80B0B6C + 1 str r0, [r1, 0x8] - ldr r4, _080B097C + ldr r4, =0x02022fec movs r0, 0x80 lsls r0, 6 str r0, [r4] - ldr r0, _080B0980 + ldr r0, =0x02024744 movs r1, 0xB movs r2, 0 bl pokemon_getattr @@ -362258,14 +350406,10 @@ sub_80B0934: @ 80B0934 bhi _080B099A cmp r1, 0xF9 bcc _080B099A - ldr r1, _080B0984 + ldr r1, =0x00000229 b _080B09E6 .align 2, 0 -_080B0974: .4byte 0x030022c0 -_080B0978: .4byte sub_80B0B6C + 1 -_080B097C: .4byte 0x02022fec -_080B0980: .4byte 0x02024744 -_080B0984: .4byte 0x00000229 + .pool _080B0988: movs r0, 0xCB lsls r0, 1 @@ -362277,7 +350421,7 @@ _080B0988: cmp r1, r0 beq _080B09E4 _080B099A: - ldr r2, _080B09B4 + ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x80 lsls r1, 21 @@ -362289,7 +350433,7 @@ _080B099A: bl task_add_01_battle_start b _080B09FE .align 2, 0 -_080B09B4: .4byte 0x02022fec + .pool _080B09B8: ldr r0, [r4] movs r1, 0x80 @@ -362313,13 +350457,13 @@ _080B09CE: bl task_add_01_battle_start b _080B09FE _080B09E4: - ldr r1, _080B09F0 + ldr r1, =0x00000227 _080B09E6: movs r0, 0 bl task_add_01_battle_start b _080B09FE .align 2, 0 -_080B09F0: .4byte 0x00000227 + .pool _080B09F4: movs r1, 0xEC lsls r1, 1 @@ -362341,14 +350485,14 @@ _080B09FE: sub_80B0A18: @ 80B0A18 push {lr} bl script_env_2_enable - ldr r1, _080B0A40 - ldr r0, _080B0A44 + ldr r1, =0x030022c0 + ldr r0, =sub_80B0B6C + 1 str r0, [r1, 0x8] - ldr r1, _080B0A48 + ldr r1, =0x02022fec movs r0, 0xC0 lsls r0, 6 str r0, [r1] - ldr r0, _080B0A4C + ldr r0, =0x082e9530 ldrb r0, [r0] cmp r0, 0x2 bne _080B0A50 @@ -362358,10 +350502,7 @@ sub_80B0A18: @ 80B0A18 bl task_add_01_battle_start b _080B0A5A .align 2, 0 -_080B0A40: .4byte 0x030022c0 -_080B0A44: .4byte sub_80B0B6C + 1 -_080B0A48: .4byte 0x02022fec -_080B0A4C: .4byte 0x082e9530 + .pool _080B0A50: movs r1, 0xF0 lsls r1, 1 @@ -362382,14 +350523,14 @@ _080B0A5A: sub_80B0A74: @ 80B0A74 push {lr} bl script_env_2_enable - ldr r1, _080B0AAC - ldr r0, _080B0AB0 + ldr r1, =0x030022c0 + ldr r0, =sub_80B0B6C + 1 str r0, [r1, 0x8] - ldr r1, _080B0AB4 + ldr r1, =0x02022fec movs r0, 0xC0 lsls r0, 7 str r0, [r1] - ldr r0, _080B0AB8 + ldr r0, =0x02024744 movs r1, 0xB bl pokemon_getattr lsls r0, 16 @@ -362406,17 +350547,14 @@ sub_80B0A74: @ 80B0A74 beq _080B0AC8 b _080B0AD4 .align 2, 0 -_080B0AAC: .4byte 0x030022c0 -_080B0AB0: .4byte sub_80B0B6C + 1 -_080B0AB4: .4byte 0x02022fec -_080B0AB8: .4byte 0x02024744 + .pool _080B0ABC: - ldr r0, _080B0AC4 + ldr r0, =0x00000193 cmp r2, r0 beq _080B0AD0 b _080B0AD4 .align 2, 0 -_080B0AC4: .4byte 0x00000193 + .pool _080B0AC8: movs r0, 0x15 b _080B0AD6 @@ -362429,7 +350567,7 @@ _080B0AD0: _080B0AD4: movs r0, 0xA _080B0AD6: - ldr r1, _080B0AF4 + ldr r1, =0x000001df bl task_add_01_battle_start movs r0, 0x7 bl sav12_xor_increment @@ -362440,7 +350578,7 @@ _080B0AD6: pop {r0} bx r0 .align 2, 0 -_080B0AF4: .4byte 0x000001df + .pool thumb_func_end sub_80B0A74 thumb_func_start sub_80B0AF8 @@ -362452,13 +350590,13 @@ sub_80B0AF8: @ 80B0AF8 strh r0, [r1] movs r1, 0xA0 lsls r1, 19 - ldr r2, _080B0B40 + ldr r2, =0x01000100 mov r0, sp bl CpuSet movs r0, 0 movs r1, 0x80 bl reset_super_sprites - ldr r0, _080B0B44 + ldr r0, =0x0202433a ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 @@ -362471,27 +350609,23 @@ sub_80B0AF8: @ 80B0AF8 lsls r0, 24 cmp r0, 0 bne _080B0B4C - ldr r0, _080B0B48 + ldr r0, =c2_whiteout + 1 bl set_callback2 b _080B0B58 .align 2, 0 -_080B0B40: .4byte 0x01000100 -_080B0B44: .4byte 0x0202433a -_080B0B48: .4byte c2_whiteout + 1 + .pool _080B0B4C: - ldr r0, _080B0B60 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 - ldr r1, _080B0B64 - ldr r0, _080B0B68 + ldr r1, =0x03005dac + ldr r0, =sub_80AF6F0 + 1 str r0, [r1] _080B0B58: add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_080B0B60: .4byte c2_exit_to_overworld_2_switch + 1 -_080B0B64: .4byte 0x03005dac -_080B0B68: .4byte sub_80AF6F0 + 1 + .pool thumb_func_end sub_80B0AF8 thumb_func_start sub_80B0B6C @@ -362503,13 +350637,13 @@ sub_80B0B6C: @ 80B0B6C strh r0, [r1] movs r1, 0xA0 lsls r1, 19 - ldr r2, _080B0BA8 + ldr r2, =0x01000100 mov r0, sp bl CpuSet movs r0, 0 movs r1, 0x80 bl reset_super_sprites - ldr r0, _080B0BAC + ldr r0, =0x0202433a ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 @@ -362518,28 +350652,26 @@ sub_80B0B6C: @ 80B0B6C lsls r0, 24 cmp r0, 0 beq _080B0BB4 - ldr r0, _080B0BB0 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 b _080B0BC6 .align 2, 0 -_080B0BA8: .4byte 0x01000100 -_080B0BAC: .4byte 0x0202433a -_080B0BB0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool _080B0BB4: - ldr r0, _080B0BBC + ldr r0, =c2_whiteout + 1 bl set_callback2 b _080B0BC6 .align 2, 0 -_080B0BBC: .4byte c2_whiteout + 1 + .pool _080B0BC0: - ldr r0, _080B0BCC + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 _080B0BC6: add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_080B0BCC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_80B0B6C thumb_func_start sub_80B0BD0 @@ -362582,19 +350714,18 @@ _080B0C16: lsls r0, 24 cmp r0, 0 bne _080B0D18 - ldr r0, _080B0C38 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] subs r0, 0x1 cmp r0, 0x8 bhi _080B0C9C lsls r0, 2 - ldr r1, _080B0C3C + ldr r1, =_080B0C40 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B0C38: .4byte 0x02037318 -_080B0C3C: .4byte _080B0C40 + .pool .align 2, 0 _080B0C40: .4byte _080B0C9C @@ -362681,7 +350812,7 @@ _080B0CF2: movs r0, 0x4 b _080B0D1A _080B0CF6: - ldr r0, _080B0D14 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0xE0 @@ -362697,7 +350828,7 @@ _080B0D10: movs r0, 0x9 b _080B0D1A .align 2, 0 -_080B0D14: .4byte 0x03005d8c + .pool _080B0D18: movs r0, 0x2 _080B0D1A: @@ -362737,7 +350868,7 @@ _080B0D54: lsls r0, 24 cmp r0, 0 bne _080B0D7C - ldr r0, _080B0D74 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x4 beq _080B0D78 @@ -362746,7 +350877,7 @@ _080B0D54: movs r0, 0 b _080B0D7E .align 2, 0 -_080B0D74: .4byte 0x02037318 + .pool _080B0D78: movs r0, 0x1 b _080B0D7E @@ -362770,7 +350901,7 @@ _080B0D92: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _080B0DE4 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -362808,7 +350939,7 @@ _080B0DDC: pop {r1} bx r1 .align 2, 0 -_080B0DE4: .4byte 0x020244ec + .pool thumb_func_end sub_80B0D88 thumb_func_start sub_80B0DE8 @@ -362818,7 +350949,7 @@ sub_80B0DE8: @ 80B0DE8 lsrs r0, 16 lsls r1, 24 lsrs r4, r1, 24 - ldr r5, _080B0E1C + ldr r5, =0x08310030 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -362840,7 +350971,7 @@ _080B0E08: beq _080B0E2A b _080B0EC0 .align 2, 0 -_080B0E1C: .4byte 0x08310030 + .pool _080B0E20: cmp r0, 0x2 beq _080B0E76 @@ -362944,7 +351075,7 @@ sub_80B0EC8: @ 80B0EC8 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - ldr r0, _080B0F00 + ldr r0, =0x02024744 movs r1, 0x38 bl pokemon_getattr adds r4, r0, 0 @@ -362963,19 +351094,19 @@ sub_80B0EC8: @ 80B0EC8 movs r0, 0 b _080B0F2E .align 2, 0 -_080B0F00: .4byte 0x02024744 + .pool _080B0F04: - ldr r0, _080B0F0C + ldr r0, =0x0854fe88 lsls r1, r5, 1 b _080B0F20 .align 2, 0 -_080B0F0C: .4byte 0x0854fe88 + .pool _080B0F10: bl sub_81A9E40 lsls r0, 24 cmp r0, 0 bne _080B0F2C - ldr r0, _080B0F28 + ldr r0, =0x0854fe88 lsls r1, r6, 1 adds r0, 0x1 _080B0F20: @@ -362983,7 +351114,7 @@ _080B0F20: ldrb r0, [r1] b _080B0F2E .align 2, 0 -_080B0F28: .4byte 0x0854fe88 + .pool _080B0F2C: movs r0, 0xA _080B0F2E: @@ -362995,13 +351126,13 @@ _080B0F2E: thumb_func_start sub_80B0F34 sub_80B0F34: @ 80B0F34 push {r4-r6,lr} - ldr r4, _080B0F60 + ldr r4, =0x02038bca ldrh r1, [r4] movs r0, 0x80 lsls r0, 3 cmp r1, r0 beq _080B0F98 - ldr r1, _080B0F64 + ldr r1, =0x08310030 ldrh r2, [r4] lsls r0, r2, 2 adds r0, r2 @@ -363011,15 +351142,13 @@ sub_80B0F34: @ 80B0F34 cmp r1, 0x1F bne _080B0F94 adds r1, r2, 0 - ldr r0, _080B0F68 + ldr r0, =0x00000105 cmp r1, r0 bne _080B0F6C movs r0, 0xC b _080B1000 .align 2, 0 -_080B0F60: .4byte 0x02038bca -_080B0F64: .4byte 0x08310030 -_080B0F68: .4byte 0x00000105 + .pool _080B0F6C: movs r0, 0x83 lsls r0, 1 @@ -363028,13 +351157,13 @@ _080B0F6C: movs r0, 0xD b _080B1000 _080B0F78: - ldr r0, _080B0F84 + ldr r0, =0x00000107 cmp r1, r0 bne _080B0F88 movs r0, 0xE b _080B1000 .align 2, 0 -_080B0F84: .4byte 0x00000107 + .pool _080B0F88: movs r0, 0x84 lsls r0, 1 @@ -363090,14 +351219,14 @@ _080B0FC6: lsrs r0, 24 cmp r4, r0 bcc _080B0FF8 - ldr r0, _080B0FF4 + ldr r0, =0x0854fe90 lsls r1, r6, 1 adds r0, 0x1 b _080B0FFC .align 2, 0 -_080B0FF4: .4byte 0x0854fe90 + .pool _080B0FF8: - ldr r0, _080B1008 + ldr r0, =0x0854fe90 lsls r1, r6, 1 _080B0FFC: adds r1, r0 @@ -363107,14 +351236,14 @@ _080B1000: pop {r1} bx r1 .align 2, 0 -_080B1008: .4byte 0x0854fe90 + .pool thumb_func_end sub_80B0F34 thumb_func_start sub_80B100C sub_80B100C: @ 80B100C push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080B103C + ldr r0, =0x02024744 movs r1, 0x38 bl pokemon_getattr adds r4, r0, 0 @@ -363134,44 +351263,43 @@ sub_80B100C: @ 80B100C beq _080B105C b _080B106C .align 2, 0 -_080B103C: .4byte 0x02024744 + .pool _080B1040: cmp r5, 0xD bgt _080B106C movs r0, 0x4 b _080B1120 _080B1048: - ldr r4, _080B1058 + ldr r4, =0x0854fea4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x3 b _080B1114 .align 2, 0 -_080B1058: .4byte 0x0854fea4 + .pool _080B105C: - ldr r4, _080B1068 + ldr r4, =0x0854fea7 bl GenerateRandomNumber ands r5, r0 lsls r0, r5, 16 b _080B111A .align 2, 0 -_080B1068: .4byte 0x0854fea7 + .pool _080B106C: - ldr r0, _080B1088 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 beq _080B10EC - ldr r4, _080B108C + ldr r4, =0x0854fe98 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 b _080B1112 .align 2, 0 -_080B1088: .4byte 0x000040ce -_080B108C: .4byte 0x0854fe98 + .pool _080B1090: cmp r5, 0xA beq _080B10A6 @@ -363186,45 +351314,44 @@ _080B109E: movs r0, 0x3 b _080B1120 _080B10A6: - ldr r4, _080B10B4 + ldr r4, =0x0854fea4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x3 b _080B1114 .align 2, 0 -_080B10B4: .4byte 0x0854fea4 + .pool _080B10B8: - ldr r4, _080B10C4 + ldr r4, =0x0854fea7 bl GenerateRandomNumber ands r5, r0 lsls r0, r5, 16 b _080B111A .align 2, 0 -_080B10C4: .4byte 0x0854fea7 + .pool _080B10C8: - ldr r0, _080B10E4 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 beq _080B10EC - ldr r4, _080B10E8 + ldr r4, =0x0854fe98 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 b _080B1112 .align 2, 0 -_080B10E4: .4byte 0x000040ce -_080B10E8: .4byte 0x0854fe98 + .pool _080B10EC: - ldr r0, _080B1128 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r2, _080B112C + ldr r2, =0x00000cb2 adds r0, r1, r2 ldrh r0, [r0] lsls r2, r0, 2 - ldr r3, _080B1130 + ldr r3, =0x00000cb4 adds r1, r3 adds r2, r1, r2 lsls r0, 1 @@ -363236,7 +351363,7 @@ _080B10EC: adds r0, r2 lsls r0, 16 lsrs r0, 16 - ldr r4, _080B1134 + ldr r4, =0x0854fe98 _080B1112: movs r1, 0xC _080B1114: @@ -363251,35 +351378,30 @@ _080B1120: pop {r1} bx r1 .align 2, 0 -_080B1128: .4byte 0x03005d90 -_080B112C: .4byte 0x00000cb2 -_080B1130: .4byte 0x00000cb4 -_080B1134: .4byte 0x0854fe98 + .pool thumb_func_end sub_80B100C thumb_func_start sub_80B1138 sub_80B1138: @ 80B1138 push {lr} - ldr r0, _080B114C + ldr r0, =set_256color_bg_bg0 + 1 bl set_callback2 - ldr r1, _080B1150 - ldr r0, _080B1154 + ldr r1, =0x030022c0 + ldr r0, =sub_80B1158 + 1 str r0, [r1, 0x8] pop {r0} bx r0 .align 2, 0 -_080B114C: .4byte set_256color_bg_bg0 + 1 -_080B1150: .4byte 0x030022c0 -_080B1154: .4byte sub_80B1158 + 1 + .pool thumb_func_end sub_80B1138 thumb_func_start sub_80B1158 sub_80B1158: @ 80B1158 push {lr} sub sp, 0x8 - ldr r0, _080B119C + ldr r0, =0x00004023 bl var_get_pointer - ldr r2, _080B11A0 + ldr r2, =0x020375f0 ldrh r1, [r2] strh r1, [r0] ldrh r0, [r2] @@ -363295,7 +351417,7 @@ sub_80B1158: @ 80B1158 bl sub_80F9244 bl clear_tasks bl sub_806E64C - ldr r0, _080B11A4 + ldr r0, =sub_80B11A8 + 1 bl set_callback2 movs r0, 0 bl sub_8145F10 @@ -363303,9 +351425,7 @@ sub_80B1158: @ 80B1158 pop {r0} bx r0 .align 2, 0 -_080B119C: .4byte 0x00004023 -_080B11A0: .4byte 0x020375f0 -_080B11A4: .4byte sub_80B11A8 + 1 + .pool thumb_func_end sub_80B1158 thumb_func_start sub_80B11A8 @@ -363318,14 +351438,14 @@ sub_80B11A8: @ 80B11A8 lsrs r0, 24 cmp r0, 0x1 bne _080B11F0 - ldr r1, _080B11F4 + ldr r1, =0x02022fec movs r0, 0x10 str r0, [r1] - ldr r1, _080B11F8 - ldr r0, _080B11FC + ldr r1, =0x030022c0 + ldr r0, =sub_80B1204 + 1 str r0, [r1, 0x8] bl Window_FreeMemory - ldr r0, _080B1200 + ldr r0, =sub_8036760 + 1 bl set_callback2 bl prev_quest_postbuffer_cursor_backup_reset bl overworld_poison_timer_set @@ -363339,22 +351459,19 @@ _080B11F0: pop {r0} bx r0 .align 2, 0 -_080B11F4: .4byte 0x02022fec -_080B11F8: .4byte 0x030022c0 -_080B11FC: .4byte sub_80B1204 + 1 -_080B1200: .4byte sub_8036760 + 1 + .pool thumb_func_end sub_80B11A8 thumb_func_start sub_80B1204 sub_80B1204: @ 80B1204 push {lr} bl sav1_reset_x2C - ldr r0, _080B1214 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080B1214: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_80B1204 thumb_func_start sub_80B1218 @@ -363421,7 +351538,7 @@ ldrb: @ 80B1274 thumb_func_start trainerflag_opponent trainerflag_opponent: @ 80B1278 - ldr r1, _080B128C + ldr r1, =0x02038bca movs r2, 0xA0 lsls r2, 3 adds r0, r2, 0 @@ -363431,12 +351548,12 @@ trainerflag_opponent: @ 80B1278 lsrs r0, 16 bx lr .align 2, 0 -_080B128C: .4byte 0x02038bca + .pool thumb_func_end trainerflag_opponent thumb_func_start sub_80B1290 sub_80B1290: @ 80B1290 - ldr r1, _080B12A4 + ldr r1, =0x02038bcc movs r2, 0xA0 lsls r2, 3 adds r0, r2, 0 @@ -363446,7 +351563,7 @@ sub_80B1290: @ 80B1290 lsrs r0, 16 bx lr .align 2, 0 -_080B12A4: .4byte 0x02038bcc + .pool thumb_func_end sub_80B1290 thumb_func_start battle_exit_is_player_defeat @@ -363456,12 +351573,12 @@ battle_exit_is_player_defeat: @ 80B12A8 cmp r0, 0x6 bhi _080B12E0 lsls r0, 2 - ldr r1, _080B12BC + ldr r1, =_080B12C0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B12BC: .4byte _080B12C0 + .pool .align 2, 0 _080B12C0: .4byte _080B12E0 @@ -363483,68 +351600,57 @@ _080B12E2: thumb_func_start sub_80B12E8 sub_80B12E8: @ 80B12E8 - ldr r0, _080B12F4 + ldr r0, =0x02038bca movs r1, 0 strh r1, [r0] - ldr r0, _080B12F8 + ldr r0, =0x02038bcc strh r1, [r0] bx lr .align 2, 0 -_080B12F4: .4byte 0x02038bca -_080B12F8: .4byte 0x02038bcc + .pool thumb_func_end sub_80B12E8 thumb_func_start sub_80B12FC sub_80B12FC: @ 80B12FC push {lr} - ldr r0, _080B1318 + ldr r0, =0x02038bc8 movs r1, 0 strh r1, [r0] - ldr r0, _080B131C + ldr r0, =0x02038bfc ldrb r1, [r0] cmp r1, 0 bne _080B132C - ldr r0, _080B1320 + ldr r0, =0x02038bd4 str r1, [r0] - ldr r0, _080B1324 + ldr r0, =0x02038bdc str r1, [r0] - ldr r0, _080B1328 + ldr r0, =0x02038bf0 b _080B1338 .align 2, 0 -_080B1318: .4byte 0x02038bc8 -_080B131C: .4byte 0x02038bfc -_080B1320: .4byte 0x02038bd4 -_080B1324: .4byte 0x02038bdc -_080B1328: .4byte 0x02038bf0 + .pool _080B132C: - ldr r0, _080B1354 + ldr r0, =0x02038bd8 movs r1, 0 str r1, [r0] - ldr r0, _080B1358 + ldr r0, =0x02038be0 str r1, [r0] - ldr r0, _080B135C + ldr r0, =0x02038bf4 _080B1338: str r1, [r0] - ldr r1, _080B1360 + ldr r1, =0x02038bd0 movs r0, 0 strh r0, [r1] - ldr r0, _080B1364 + ldr r0, =0x02038be4 movs r1, 0 str r1, [r0] - ldr r0, _080B1368 + ldr r0, =0x02038be8 str r1, [r0] - ldr r0, _080B136C + ldr r0, =0x02038bec str r1, [r0] pop {r0} bx r0 .align 2, 0 -_080B1354: .4byte 0x02038bd8 -_080B1358: .4byte 0x02038be0 -_080B135C: .4byte 0x02038bf4 -_080B1360: .4byte 0x02038bd0 -_080B1364: .4byte 0x02038be4 -_080B1368: .4byte 0x02038be8 -_080B136C: .4byte 0x02038bec + .pool thumb_func_end sub_80B12FC thumb_func_start battle_load_arguments @@ -363557,12 +351663,12 @@ _080B1376: cmp r0, 0x6 bhi _080B13E8 lsls r0, 2 - ldr r1, _080B1388 + ldr r1, =_080B138C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B1388: .4byte _080B138C + .pool .align 2, 0 _080B138C: .4byte _080B13A8 @@ -363621,29 +351727,26 @@ _080B13EC: thumb_func_start battle_80801F0 battle_80801F0: @ 80B13F8 push {lr} - ldr r0, _080B1420 + ldr r0, =0x02038bd0 ldrh r1, [r0] cmp r1, 0 beq _080B141A - ldr r0, _080B1424 + ldr r0, =0x020375f2 strh r1, [r0] lsls r0, r1, 24 lsrs r0, 24 - ldr r1, _080B1428 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl get_npc_id_by_local_id - ldr r1, _080B142C + ldr r1, =0x03005df0 strb r0, [r1] _080B141A: pop {r0} bx r0 .align 2, 0 -_080B1420: .4byte 0x02038bd0 -_080B1424: .4byte 0x020375f2 -_080B1428: .4byte 0x03005d8c -_080B142C: .4byte 0x03005df0 + .pool thumb_func_end battle_80801F0 thumb_func_start battle_configure_by_script @@ -363651,7 +351754,7 @@ battle_configure_by_script: @ 80B1430 push {r4,r5,lr} adds r5, r0, 0 bl sub_80B12FC - ldr r4, _080B145C + ldr r4, =0x02038bc8 adds r0, r5, 0 bl ldrb lsls r0, 24 @@ -363664,13 +351767,12 @@ battle_configure_by_script: @ 80B1430 b _080B15F4 _080B1450: lsls r0, 2 - ldr r1, _080B1460 + ldr r1, =_080B1464 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B145C: .4byte 0x02038bc8 -_080B1460: .4byte _080B1464 + .pool .align 2, 0 _080B1464: .4byte _080B14CC @@ -363686,187 +351788,169 @@ _080B1464: .4byte _080B1598 .4byte _080B15A8 _080B1494: - ldr r0, _080B14A0 + ldr r0, =0x0854ff84 adds r1, r5, 0 bl battle_load_arguments - ldr r0, _080B14A4 + ldr r0, =0x082713c2 b _080B161E .align 2, 0 -_080B14A0: .4byte 0x0854ff84 -_080B14A4: .4byte 0x082713c2 + .pool _080B14A8: - ldr r0, _080B14AC + ldr r0, =0x0854ff3c b _080B14D6 .align 2, 0 -_080B14AC: .4byte 0x0854ff3c + .pool _080B14B0: - ldr r0, _080B14BC + ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 bne _080B14C4 - ldr r0, _080B14C0 + ldr r0, =0x0854fef4 b _080B15FE .align 2, 0 -_080B14BC: .4byte 0x02038bfc -_080B14C0: .4byte 0x0854fef4 + .pool _080B14C4: - ldr r0, _080B14C8 + ldr r0, =0x0855005c b _080B1616 .align 2, 0 -_080B14C8: .4byte 0x0855005c + .pool _080B14CC: - ldr r0, _080B14D0 + ldr r0, =0x0854fef4 b _080B15FE .align 2, 0 -_080B14D0: .4byte 0x0854fef4 + .pool _080B14D4: - ldr r0, _080B14E4 + ldr r0, =0x0854ffcc _080B14D6: adds r1, r5, 0 bl battle_load_arguments bl battle_80801F0 - ldr r0, _080B14E8 + ldr r0, =0x0827138a b _080B161E .align 2, 0 -_080B14E4: .4byte 0x0854ffcc -_080B14E8: .4byte 0x0827138a + .pool _080B14EC: - ldr r0, _080B1508 + ldr r0, =0x0854ff3c adds r1, r5, 0 bl battle_load_arguments bl battle_80801F0 - ldr r4, _080B150C + ldr r4, =0x02038bca ldrh r0, [r4] bl sub_80B2234 strh r0, [r4] - ldr r0, _080B1510 + ldr r0, =0x082713f8 b _080B161E .align 2, 0 -_080B1508: .4byte 0x0854ff3c -_080B150C: .4byte 0x02038bca -_080B1510: .4byte 0x082713f8 + .pool _080B1514: - ldr r0, _080B1530 + ldr r0, =0x0854feac adds r1, r5, 0 bl battle_load_arguments bl battle_80801F0 - ldr r4, _080B1534 + ldr r4, =0x02038bca ldrh r0, [r4] bl sub_80B2234 strh r0, [r4] - ldr r0, _080B1538 + ldr r0, =0x082713d1 b _080B161E .align 2, 0 -_080B1530: .4byte 0x0854feac -_080B1534: .4byte 0x02038bca -_080B1538: .4byte 0x082713d1 + .pool _080B153C: - ldr r0, _080B155C + ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 bne _080B156C - ldr r0, _080B1560 + ldr r0, =0x0854feac adds r1, r5, 0 bl battle_load_arguments bl battle_80801F0 - ldr r0, _080B1564 + ldr r0, =0x020375f2 ldrb r0, [r0] bl sub_81A9AA8 - ldr r1, _080B1568 + ldr r1, =0x02038bca b _080B157E .align 2, 0 -_080B155C: .4byte 0x02038bfc -_080B1560: .4byte 0x0854feac -_080B1564: .4byte 0x020375f2 -_080B1568: .4byte 0x02038bca + .pool _080B156C: - ldr r0, _080B1584 + ldr r0, =0x08550014 adds r1, r5, 0 bl battle_load_arguments - ldr r0, _080B1588 + ldr r0, =0x020375f2 ldrb r0, [r0] bl sub_81A9AA8 _080B157C: - ldr r1, _080B158C + ldr r1, =0x02038bcc _080B157E: strh r0, [r1] b _080B161C .align 2, 0 -_080B1584: .4byte 0x08550014 -_080B1588: .4byte 0x020375f2 -_080B158C: .4byte 0x02038bcc + .pool _080B1590: - ldr r0, _080B1594 + ldr r0, =0x0854feac b _080B159A .align 2, 0 -_080B1594: .4byte 0x0854feac + .pool _080B1598: - ldr r0, _080B15A4 + ldr r0, =0x08550014 _080B159A: adds r1, r5, 0 bl battle_load_arguments movs r0, 0 b _080B161E .align 2, 0 -_080B15A4: .4byte 0x08550014 + .pool _080B15A8: - ldr r0, _080B15C8 + ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 bne _080B15D8 - ldr r0, _080B15CC + ldr r0, =0x0854feac adds r1, r5, 0 bl battle_load_arguments bl battle_80801F0 - ldr r0, _080B15D0 + ldr r0, =0x020375f2 ldrb r0, [r0] bl battle_init - ldr r1, _080B15D4 + ldr r1, =0x02038bca b _080B157E .align 2, 0 -_080B15C8: .4byte 0x02038bfc -_080B15CC: .4byte 0x0854feac -_080B15D0: .4byte 0x020375f2 -_080B15D4: .4byte 0x02038bca + .pool _080B15D8: - ldr r0, _080B15EC + ldr r0, =0x08550014 adds r1, r5, 0 bl battle_load_arguments - ldr r0, _080B15F0 + ldr r0, =0x020375f2 ldrb r0, [r0] bl battle_init b _080B157C .align 2, 0 -_080B15EC: .4byte 0x08550014 -_080B15F0: .4byte 0x020375f2 + .pool _080B15F4: - ldr r0, _080B160C + ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 bne _080B1614 - ldr r0, _080B1610 + ldr r0, =0x0854feac _080B15FE: adds r1, r5, 0 bl battle_load_arguments bl battle_80801F0 b _080B161C .align 2, 0 -_080B160C: .4byte 0x02038bfc -_080B1610: .4byte 0x0854feac + .pool _080B1614: - ldr r0, _080B1624 + ldr r0, =0x08550014 _080B1616: adds r1, r5, 0 bl battle_load_arguments _080B161C: - ldr r0, _080B1628 + ldr r0, =0x08271362 _080B161E: pop {r4,r5} pop {r1} bx r1 .align 2, 0 -_080B1624: .4byte 0x08550014 -_080B1628: .4byte 0x08271362 + .pool thumb_func_end battle_configure_by_script thumb_func_start sub_80B162C @@ -363874,10 +351958,10 @@ sub_80B162C: @ 80B162C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080B1660 + ldr r2, =0x03005df0 strb r0, [r2] - ldr r4, _080B1664 - ldr r3, _080B1668 + ldr r4, =0x020375f2 + ldr r3, =0x02037350 lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -363887,17 +351971,14 @@ sub_80B162C: @ 80B162C adds r1, 0x1 adds r0, r1, 0 bl battle_configure_by_script - ldr r0, _080B166C + ldr r0, =0x08271354 bl script_env_1_execute_new_script bl script_env_2_enable pop {r4} pop {r0} bx r0 .align 2, 0 -_080B1660: .4byte 0x03005df0 -_080B1664: .4byte 0x020375f2 -_080B1668: .4byte 0x02037350 -_080B166C: .4byte 0x08271354 + .pool thumb_func_end sub_80B162C thumb_func_start sub_80B1670 @@ -363905,10 +351986,10 @@ sub_80B1670: @ 80B1670 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080B1698 + ldr r2, =0x03005df0 strb r0, [r2] - ldr r4, _080B169C - ldr r3, _080B16A0 + ldr r4, =0x020375f2 + ldr r3, =0x02037350 lsls r2, r0, 3 adds r2, r0 lsls r2, 2 @@ -363922,21 +352003,19 @@ sub_80B1670: @ 80B1670 pop {r0} bx r0 .align 2, 0 -_080B1698: .4byte 0x03005df0 -_080B169C: .4byte 0x020375f2 -_080B16A0: .4byte 0x02037350 + .pool thumb_func_end sub_80B1670 thumb_func_start sub_80B16A4 sub_80B16A4: @ 80B16A4 push {lr} - ldr r0, _080B16B4 + ldr r0, =0x08271354 bl script_env_1_execute_new_script bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_080B16B4: .4byte 0x08271354 + .pool thumb_func_end sub_80B16A4 thumb_func_start sub_80B16B8 @@ -363959,12 +352038,12 @@ sub_80B16B8: @ 80B16B8 thumb_func_start sub_80B16D8 sub_80B16D8: @ 80B16D8 push {r4,lr} - ldr r0, _080B1704 + ldr r0, =0x03005df0 ldrb r0, [r0] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080B1708 + ldr r0, =0x02037350 adds r4, r0 ldrb r0, [r4, 0x18] lsls r0, 28 @@ -363979,17 +352058,16 @@ sub_80B16D8: @ 80B16D8 pop {r0} bx r0 .align 2, 0 -_080B1704: .4byte 0x03005df0 -_080B1708: .4byte 0x02037350 + .pool thumb_func_end sub_80B16D8 thumb_func_start sub_80B170C sub_80B170C: @ 80B170C - ldr r0, _080B1714 + ldr r0, =0x02038bc8 ldrb r0, [r0] bx lr .align 2, 0 -_080B1714: .4byte 0x02038bc8 + .pool thumb_func_end sub_80B170C thumb_func_start sub_80B1718 @@ -363999,12 +352077,12 @@ sub_80B1718: @ 80B1718 lsls r0, 24 cmp r0, 0 beq _080B1734 - ldr r0, _080B1730 + ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_81A9AC4 b _080B1752 .align 2, 0 -_080B1730: .4byte 0x03005df0 + .pool _080B1734: bl sub_81D6074 cmp r0, 0 @@ -364015,7 +352093,7 @@ _080B1734: bl flag_check b _080B1752 _080B174A: - ldr r0, _080B175C + ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_81D619C _080B1752: @@ -364024,13 +352102,13 @@ _080B1752: pop {r1} bx r1 .align 2, 0 -_080B175C: .4byte 0x03005df0 + .pool thumb_func_end sub_80B1718 thumb_func_start rom_npc_set_flag_for_script_id rom_npc_set_flag_for_script_id: @ 80B1760 push {lr} - ldr r0, _080B1788 + ldr r0, =0x02038bcc ldrh r0, [r0] cmp r0, 0 beq _080B1776 @@ -364046,7 +352124,7 @@ _080B1776: pop {r0} bx r0 .align 2, 0 -_080B1788: .4byte 0x02038bcc + .pool thumb_func_end rom_npc_set_flag_for_script_id thumb_func_start sub_80B178C @@ -364104,19 +352182,17 @@ trainer_flag_clear: @ 80B17CC thumb_func_start sub_80B17E0 sub_80B17E0: @ 80B17E0 push {r4,lr} - ldr r0, _080B17F0 + ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x2 bne _080B17FC - ldr r1, _080B17F4 - ldr r0, _080B17F8 + ldr r1, =0x02022fec + ldr r0, =0x00008009 b _080B1800 .align 2, 0 -_080B17F0: .4byte 0x030060a8 -_080B17F4: .4byte 0x02022fec -_080B17F8: .4byte 0x00008009 + .pool _080B17FC: - ldr r1, _080B1854 + ldr r1, =0x02022fec movs r0, 0x8 _080B1800: str r0, [r1] @@ -364124,22 +352200,22 @@ _080B1800: lsls r0, 24 cmp r0, 0 beq _080B1884 - ldr r0, _080B1858 + ldr r0, =0x0000400e movs r1, 0 bl var_set - ldr r2, _080B1854 + ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x80 lsls r1, 14 orrs r0, r1 str r0, [r2] - ldr r0, _080B185C + ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x2 bne _080B1864 movs r0, 0x1 bl sub_816306C - ldr r4, _080B1860 + ldr r4, =0x020247a8 adds r0, r4, 0 bl zero_pokemon_struct adds r0, r4, 0 @@ -364155,14 +352231,11 @@ _080B1800: bl zero_pokemon_struct b _080B187A .align 2, 0 -_080B1854: .4byte 0x02022fec -_080B1858: .4byte 0x0000400e -_080B185C: .4byte 0x030060a8 -_080B1860: .4byte 0x020247a8 + .pool _080B1864: movs r0, 0x1 bl sub_8163048 - ldr r4, _080B1880 + ldr r4, =0x020247a8 adds r0, r4, 0 bl zero_pokemon_struct adds r4, 0x64 @@ -364172,45 +352245,44 @@ _080B187A: bl sub_81A9B04 b _080B18B8 .align 2, 0 -_080B1880: .4byte 0x020247a8 + .pool _080B1884: bl sub_81D5C18 lsls r0, 24 cmp r0, 0 beq _080B18B8 - ldr r2, _080B18A8 + ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x80 lsls r1, 19 orrs r0, r1 str r0, [r2] - ldr r0, _080B18AC + ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x2 bne _080B18B0 bl sub_81D639C b _080B18B4 .align 2, 0 -_080B18A8: .4byte 0x02022fec -_080B18AC: .4byte 0x030060a8 + .pool _080B18B0: bl sub_81D6384 _080B18B4: bl sub_81D61E8 _080B18B8: - ldr r1, _080B18F0 - ldr r2, _080B18F4 + ldr r1, =0x02038bf9 + ldr r2, =0x030060a8 ldrb r0, [r2] strb r0, [r1] movs r1, 0 strb r1, [r2] - ldr r0, _080B18F8 + ldr r0, =0x02038bf8 strb r1, [r0] - ldr r1, _080B18FC + ldr r1, =0x03006080 movs r0, 0 strh r0, [r1] - ldr r1, _080B1900 - ldr r0, _080B1904 + ldr r1, =0x030022c0 + ldr r0, =sub_80B1918 + 1 str r0, [r1, 0x8] bl sub_81A9E40 lsls r0, 24 @@ -364224,12 +352296,7 @@ _080B18E8: bl sub_80B0828 b _080B190C .align 2, 0 -_080B18F0: .4byte 0x02038bf9 -_080B18F4: .4byte 0x030060a8 -_080B18F8: .4byte 0x02038bf8 -_080B18FC: .4byte 0x03006080 -_080B1900: .4byte 0x030022c0 -_080B1904: .4byte sub_80B1918 + 1 + .pool _080B1908: bl task_add_01_battle_start_with_music_and_stats _080B190C: @@ -364242,13 +352309,13 @@ _080B190C: thumb_func_start sub_80B1918 sub_80B1918: @ 80B1918 push {lr} - ldr r0, _080B1950 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 cmp r1, r0 beq _080B1946 - ldr r0, _080B1954 + ldr r0, =0x0202433a ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 @@ -364262,21 +352329,19 @@ sub_80B1918: @ 80B1918 cmp r0, 0 beq _080B195C _080B1946: - ldr r0, _080B1958 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 b _080B198A .align 2, 0 -_080B1950: .4byte 0x02038bca -_080B1954: .4byte 0x0202433a -_080B1958: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool _080B195C: - ldr r0, _080B1964 + ldr r0, =c2_whiteout + 1 bl set_callback2 b _080B198A .align 2, 0 -_080B1964: .4byte c2_whiteout + 1 + .pool _080B1968: - ldr r0, _080B1990 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 bl sub_81A9E40 lsls r0, 24 @@ -364292,38 +352357,36 @@ _080B198A: pop {r0} bx r0 .align 2, 0 -_080B1990: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_80B1918 thumb_func_start sub_80B1994 sub_80B1994: @ 80B1994 push {lr} - ldr r0, _080B19AC + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 cmp r1, r0 bne _080B19B4 - ldr r0, _080B19B0 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 b _080B19E2 .align 2, 0 -_080B19AC: .4byte 0x02038bca -_080B19B0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool _080B19B4: - ldr r0, _080B19C8 + ldr r0, =0x0202433a ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 bne _080B19D0 - ldr r0, _080B19CC + ldr r0, =c2_whiteout + 1 bl set_callback2 b _080B19E2 .align 2, 0 -_080B19C8: .4byte 0x0202433a -_080B19CC: .4byte c2_whiteout + 1 + .pool _080B19D0: - ldr r0, _080B19E8 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 bl sub_80B20BC bl rom_npc_set_flag_for_script_id @@ -364332,26 +352395,24 @@ _080B19E2: pop {r0} bx r0 .align 2, 0 -_080B19E8: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_80B1994 thumb_func_start sub_80B19EC sub_80B19EC: @ 80B19EC push {lr} - ldr r1, _080B1A08 + ldr r1, =0x02022fec movs r0, 0x8 str r0, [r1] - ldr r1, _080B1A0C - ldr r0, _080B1A10 + ldr r1, =0x030022c0 + ldr r0, =sub_80B1994 + 1 str r0, [r1, 0x8] bl task_add_01_battle_start_with_music_and_stats bl script_env_2_set_ctx_paused pop {r0} bx r0 .align 2, 0 -_080B1A08: .4byte 0x02022fec -_080B1A0C: .4byte 0x030022c0 -_080B1A10: .4byte sub_80B1994 + 1 + .pool thumb_func_end sub_80B19EC thumb_func_start sub_80B1A14 @@ -364361,11 +352422,11 @@ sub_80B1A14: @ 80B1A14 lsls r0, 24 cmp r0, 0 beq _080B1A7C - ldr r0, _080B1A3C + ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x1 bhi _080B1A44 - ldr r0, _080B1A40 + ldr r0, =0x020375f2 ldrb r0, [r0] bl sub_81A9AA8 lsls r0, 16 @@ -364373,12 +352434,11 @@ sub_80B1A14: @ 80B1A14 bl sub_81A9EDC b _080B1AD8 .align 2, 0 -_080B1A3C: .4byte 0x030060a8 -_080B1A40: .4byte 0x020375f2 + .pool _080B1A44: - ldr r3, _080B1A70 - ldr r2, _080B1A74 - ldr r0, _080B1A78 + ldr r3, =0x02037350 + ldr r2, =0x03006090 + ldr r0, =0x02038bfc ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -364396,19 +352456,17 @@ _080B1A44: bl sub_81A9EDC b _080B1AD8 .align 2, 0 -_080B1A70: .4byte 0x02037350 -_080B1A74: .4byte 0x03006090 -_080B1A78: .4byte 0x02038bfc + .pool _080B1A7C: bl sub_81D5C18 lsls r0, 24 cmp r0, 0 beq _080B1AEC - ldr r0, _080B1AA4 + ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x1 bhi _080B1AAC - ldr r0, _080B1AA8 + ldr r0, =0x020375f2 ldrb r0, [r0] bl battle_init adds r1, r0, 0 @@ -364418,12 +352476,11 @@ _080B1A7C: bl sub_81D572C b _080B1AD8 .align 2, 0 -_080B1AA4: .4byte 0x030060a8 -_080B1AA8: .4byte 0x020375f2 + .pool _080B1AAC: - ldr r3, _080B1AE0 - ldr r2, _080B1AE4 - ldr r0, _080B1AE8 + ldr r3, =0x02037350 + ldr r2, =0x03006090 + ldr r0, =0x02038bfc ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -364445,9 +352502,7 @@ _080B1AD8: bl sub_80982B8 b _080B1AF4 .align 2, 0 -_080B1AE0: .4byte 0x02037350 -_080B1AE4: .4byte 0x03006090 -_080B1AE8: .4byte 0x02038bfc + .pool _080B1AEC: bl sub_80B1C7C bl box_related_two__2 @@ -364459,60 +352514,56 @@ _080B1AF4: thumb_func_start sub_80B1AF8 sub_80B1AF8: @ 80B1AF8 push {lr} - ldr r0, _080B1B08 + ldr r0, =0x02038bec ldr r0, [r0] cmp r0, 0 bne _080B1B04 - ldr r0, _080B1B0C + ldr r0, =0x082c8436 _080B1B04: pop {r1} bx r1 .align 2, 0 -_080B1B08: .4byte 0x02038bec -_080B1B0C: .4byte 0x082c8436 + .pool thumb_func_end sub_80B1AF8 thumb_func_start sub_80B1B10 sub_80B1B10: @ 80B1B10 push {lr} - ldr r1, _080B1B30 + ldr r1, =0x02038bf8 ldrb r2, [r1] cmp r2, 0 beq _080B1B3C movs r0, 0 strb r0, [r1] - ldr r0, _080B1B34 + ldr r0, =0x02038bf4 ldr r2, [r0] cmp r2, 0 beq _080B1B54 - ldr r1, _080B1B38 + ldr r1, =0x03006080 movs r0, 0x1 strh r0, [r1] adds r0, r2, 0 b _080B1B56 .align 2, 0 -_080B1B30: .4byte 0x02038bf8 -_080B1B34: .4byte 0x02038bf4 -_080B1B38: .4byte 0x03006080 + .pool _080B1B3C: - ldr r0, _080B1B4C + ldr r0, =0x02038bf0 ldr r1, [r0] cmp r1, 0 beq _080B1B54 - ldr r0, _080B1B50 + ldr r0, =0x03006080 strh r2, [r0] adds r0, r1, 0 b _080B1B56 .align 2, 0 -_080B1B4C: .4byte 0x02038bf0 -_080B1B50: .4byte 0x03006080 + .pool _080B1B54: - ldr r0, _080B1B5C + ldr r0, =0x082742e6 _080B1B56: pop {r1} bx r1 .align 2, 0 -_080B1B5C: .4byte 0x082742e6 + .pool thumb_func_end sub_80B1B10 thumb_func_start sub_80B1B60 @@ -364527,20 +352578,19 @@ sub_80B1B60: @ 80B1B60 thumb_func_start sub_80B1B70 sub_80B1B70: @ 80B1B70 push {lr} - ldr r0, _080B1B80 + ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 bne _080B1B88 - ldr r0, _080B1B84 + ldr r0, =0x02038bca b _080B1B8A .align 2, 0 -_080B1B80: .4byte 0x02038bfc -_080B1B84: .4byte 0x02038bca + .pool _080B1B88: - ldr r0, _080B1BB0 + ldr r0, =0x02038bcc _080B1B8A: ldrh r1, [r0] - ldr r0, _080B1BB4 + ldr r0, =0x02038bc8 ldrh r0, [r0] cmp r0, 0x1 beq _080B1C62 @@ -364553,14 +352603,12 @@ _080B1B8A: cmp r0, 0xD bhi _080B1C5C lsls r0, 2 - ldr r1, _080B1BB8 + ldr r1, =_080B1BBC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B1BB0: .4byte 0x02038bcc -_080B1BB4: .4byte 0x02038bc8 -_080B1BB8: .4byte _080B1BBC + .pool .align 2, 0 _080B1BBC: .4byte _080B1BF4 @@ -364582,72 +352630,72 @@ _080B1BF4: lsls r0, 1 b _080B1C5E _080B1BFA: - ldr r0, _080B1C00 + ldr r0, =0x00000197 b _080B1C5E .align 2, 0 -_080B1C00: .4byte 0x00000197 + .pool _080B1C04: - ldr r0, _080B1C08 + ldr r0, =0x0000017b b _080B1C5E .align 2, 0 -_080B1C08: .4byte 0x0000017b + .pool _080B1C0C: movs r0, 0xD0 lsls r0, 1 b _080B1C5E _080B1C12: - ldr r0, _080B1C18 + ldr r0, =0x000001a1 b _080B1C5E .align 2, 0 -_080B1C18: .4byte 0x000001a1 + .pool _080B1C1C: - ldr r0, _080B1C20 + ldr r0, =0x000001a3 b _080B1C5E .align 2, 0 -_080B1C20: .4byte 0x000001a3 + .pool _080B1C24: - ldr r0, _080B1C28 + ldr r0, =0x000001b9 b _080B1C5E .align 2, 0 -_080B1C28: .4byte 0x000001b9 + .pool _080B1C2C: - ldr r0, _080B1C30 + ldr r0, =0x00000181 b _080B1C5E .align 2, 0 -_080B1C30: .4byte 0x00000181 + .pool _080B1C34: - ldr r0, _080B1C38 + ldr r0, =0x000001c1 b _080B1C5E .align 2, 0 -_080B1C38: .4byte 0x000001c1 + .pool _080B1C3C: movs r0, 0xE1 lsls r0, 1 b _080B1C5E _080B1C42: - ldr r0, _080B1C48 + ldr r0, =0x000001c3 b _080B1C5E .align 2, 0 -_080B1C48: .4byte 0x000001c3 + .pool _080B1C4C: - ldr r0, _080B1C50 + ldr r0, =0x000001c5 b _080B1C5E .align 2, 0 -_080B1C50: .4byte 0x000001c5 + .pool _080B1C54: - ldr r0, _080B1C58 + ldr r0, =0x0000018d b _080B1C5E .align 2, 0 -_080B1C58: .4byte 0x0000018d + .pool _080B1C5C: - ldr r0, _080B1C68 + ldr r0, =0x000001a7 _080B1C5E: bl current_map_music_set _080B1C62: pop {r0} bx r0 .align 2, 0 -_080B1C68: .4byte 0x000001a7 + .pool thumb_func_end sub_80B1B70 thumb_func_start sub_80B1C6C @@ -364655,41 +352703,40 @@ sub_80B1C6C: @ 80B1C6C push {lr} cmp r0, 0 bne _080B1C74 - ldr r0, _080B1C78 + ldr r0, =0x085e8d03 _080B1C74: pop {r1} bx r1 .align 2, 0 -_080B1C78: .4byte 0x085e8d03 + .pool thumb_func_end sub_80B1C6C thumb_func_start sub_80B1C7C sub_80B1C7C: @ 80B1C7C push {lr} - ldr r0, _080B1C8C + ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 beq _080B1C94 - ldr r0, _080B1C90 + ldr r0, =0x02038bd8 b _080B1C96 .align 2, 0 -_080B1C8C: .4byte 0x02038bfc -_080B1C90: .4byte 0x02038bd8 + .pool _080B1C94: - ldr r0, _080B1CA0 + ldr r0, =0x02038bd4 _080B1C96: ldr r0, [r0] bl sub_80B1C6C pop {r1} bx r1 .align 2, 0 -_080B1CA0: .4byte 0x02038bd4 + .pool thumb_func_end sub_80B1C7C thumb_func_start sub_80B1CA4 sub_80B1CA4: @ 80B1CA4 push {r4,lr} - ldr r0, _080B1CB8 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0x80 lsls r0, 3 @@ -364698,12 +352745,12 @@ sub_80B1CA4: @ 80B1CA4 bl sub_80EA250 b _080B1CC0 .align 2, 0 -_080B1CB8: .4byte 0x02038bca + .pool _080B1CBC: - ldr r0, _080B1CD8 + ldr r0, =0x02038bdc ldr r0, [r0] _080B1CC0: - ldr r4, _080B1CDC + ldr r4, =0x02021fc4 bl sub_80B1C6C adds r1, r0, 0 adds r0, r4, 0 @@ -364713,15 +352760,14 @@ _080B1CC0: pop {r1} bx r1 .align 2, 0 -_080B1CD8: .4byte 0x02038bdc -_080B1CDC: .4byte 0x02021fc4 + .pool thumb_func_end sub_80B1CA4 thumb_func_start sub_80B1CE0 sub_80B1CE0: @ 80B1CE0 push {r4,lr} - ldr r4, _080B1CFC - ldr r0, _080B1D00 + ldr r4, =0x02021fc4 + ldr r0, =0x02038be0 ldr r0, [r0] bl sub_80B1C6C adds r1, r0, 0 @@ -364732,32 +352778,31 @@ sub_80B1CE0: @ 80B1CE0 pop {r1} bx r1 .align 2, 0 -_080B1CFC: .4byte 0x02021fc4 -_080B1D00: .4byte 0x02038be0 + .pool thumb_func_end sub_80B1CE0 thumb_func_start sub_80B1D04 sub_80B1D04: @ 80B1D04 push {lr} - ldr r0, _080B1D14 + ldr r0, =0x02038be4 ldr r0, [r0] bl sub_80B1C6C pop {r1} bx r1 .align 2, 0 -_080B1D14: .4byte 0x02038be4 + .pool thumb_func_end sub_80B1D04 thumb_func_start sub_80B1D18 sub_80B1D18: @ 80B1D18 push {lr} - ldr r0, _080B1D28 + ldr r0, =0x02038be8 ldr r0, [r0] bl sub_80B1C6C pop {r1} bx r1 .align 2, 0 -_080B1D28: .4byte 0x02038be8 + .pool thumb_func_end sub_80B1D18 thumb_func_start sub_80B1D2C @@ -364877,9 +352922,9 @@ _080B1DCE: cmp r0, 0 bne _080B1DCA _080B1DE2: - ldr r0, _080B1DF4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080B1DF8 + ldr r1, =0x000009ca adds r0, r1 adds r0, r6 strb r5, [r0] @@ -364887,8 +352932,7 @@ _080B1DE2: pop {r0} bx r0 .align 2, 0 -_080B1DF4: .4byte 0x03005d8c -_080B1DF8: .4byte 0x000009ca + .pool thumb_func_end sub_80B1DBC thumb_func_start sub_80B1DFC @@ -364919,9 +352963,9 @@ _080B1E1A: bl sub_80B1D94 cmp r0, 0 bne _080B1E74 - ldr r0, _080B1E8C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080B1E90 + ldr r1, =0x000009ca adds r0, r1 adds r0, r5 ldrb r0, [r0] @@ -364963,15 +353007,14 @@ _080B1E74: pop {r1} bx r1 .align 2, 0 -_080B1E8C: .4byte 0x03005d8c -_080B1E90: .4byte 0x000009ca + .pool thumb_func_end sub_80B1DFC thumb_func_start sub_80B1E94 sub_80B1E94: @ 80B1E94 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080B1EBC + ldr r5, =0x085500a4 lsls r0, r4, 4 adds r0, r5 ldrh r0, [r0] @@ -364988,7 +353031,7 @@ _080B1EB4: pop {r0} bx r0 .align 2, 0 -_080B1EBC: .4byte 0x085500a4 + .pool thumb_func_end sub_80B1E94 thumb_func_start sub_80B1EC0 @@ -365001,7 +353044,7 @@ sub_80B1EC0: @ 80B1EC0 movs r1, 0 adds r3, r0, 0 adds r3, 0xA - ldr r5, _080B1EF0 + ldr r5, =0x03005d8c _080B1ED2: ldrh r0, [r3] cmp r0, r4 @@ -365010,7 +353053,7 @@ _080B1ED2: cmp r0, r2 bne _080B1EF8 ldr r0, [r5] - ldr r6, _080B1EF4 + ldr r6, =0x000009ca adds r0, r6 adds r0, r1 ldrb r0, [r0] @@ -365019,8 +353062,7 @@ _080B1ED2: movs r0, 0x1 b _080B1F02 .align 2, 0 -_080B1EF0: .4byte 0x03005d8c -_080B1EF4: .4byte 0x000009ca + .pool _080B1EF8: adds r3, 0x10 adds r1, 0x1 @@ -365077,9 +353119,9 @@ sub_80B1F38: @ 80B1F38 beq _080B1F6C cmp r1, 0x63 bgt _080B1F6C - ldr r0, _080B1F64 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _080B1F68 + ldr r2, =0x000009ca adds r0, r2 adds r0, r1 ldrb r0, [r0] @@ -365088,8 +353130,7 @@ sub_80B1F38: @ 80B1F38 movs r0, 0x1 b _080B1F6E .align 2, 0 -_080B1F64: .4byte 0x03005d8c -_080B1F68: .4byte 0x000009ca + .pool _080B1F6C: movs r0, 0 _080B1F6E: @@ -365110,9 +353151,9 @@ sub_80B1F74: @ 80B1F74 beq _080B1FA8 cmp r1, 0x63 bgt _080B1FA8 - ldr r0, _080B1FA0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _080B1FA4 + ldr r2, =0x000009ca adds r0, r2 adds r0, r1 ldrb r0, [r0] @@ -365121,8 +353162,7 @@ sub_80B1F74: @ 80B1F74 movs r0, 0x1 b _080B1FAA .align 2, 0 -_080B1FA0: .4byte 0x03005d8c -_080B1FA4: .4byte 0x000009ca + .pool _080B1FA8: movs r0, 0 _080B1FAA: @@ -365240,9 +353280,9 @@ sub_80B205C: @ 80B205C negs r0, r0 cmp r1, r0 beq _080B207E - ldr r0, _080B2084 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _080B2088 + ldr r2, =0x000009ca adds r0, r2 adds r0, r1 movs r1, 0 @@ -365251,8 +353291,7 @@ _080B207E: pop {r0} bx r0 .align 2, 0 -_080B2084: .4byte 0x03005d8c -_080B2088: .4byte 0x000009ca + .pool thumb_func_end sub_80B205C thumb_func_start sub_80B208C @@ -365262,7 +353301,7 @@ sub_80B208C: @ 80B208C movs r1, 0 movs r4, 0xAE lsls r4, 1 - ldr r2, _080B20A4 + ldr r2, =0x085500a4 _080B2098: ldrh r0, [r2] cmp r0, r3 @@ -365270,34 +353309,34 @@ _080B2098: adds r0, r1, r4 b _080B20B2 .align 2, 0 -_080B20A4: .4byte 0x085500a4 + .pool _080B20A8: adds r2, 0x10 adds r1, 0x1 cmp r1, 0x4D ble _080B2098 - ldr r0, _080B20B8 + ldr r0, =0x0000ffff _080B20B2: pop {r4} pop {r1} bx r1 .align 2, 0 -_080B20B8: .4byte 0x0000ffff + .pool thumb_func_end sub_80B208C thumb_func_start sub_80B20BC sub_80B20BC: @ 80B20BC push {lr} - ldr r0, _080B20E8 + ldr r0, =0x0000012f bl flag_check lsls r0, 24 cmp r0, 0 beq _080B20E2 - ldr r0, _080B20EC + ldr r0, =0x02038bca ldrh r0, [r0] bl sub_80B208C adds r1, r0, 0 - ldr r0, _080B20F0 + ldr r0, =0x0000ffff cmp r1, r0 beq _080B20E2 lsls r0, r1, 16 @@ -365307,9 +353346,7 @@ _080B20E2: pop {r0} bx r0 .align 2, 0 -_080B20E8: .4byte 0x0000012f -_080B20EC: .4byte 0x02038bca -_080B20F0: .4byte 0x0000ffff + .pool thumb_func_end sub_80B20BC thumb_func_start sub_80B20F4 @@ -365346,7 +353383,7 @@ sub_80B2128: @ 80B2128 push {r4-r6,lr} movs r6, 0 movs r5, 0 - ldr r4, _080B2148 + ldr r4, =0x08550584 _080B2130: ldrh r0, [r4] bl flag_check @@ -365360,7 +353397,7 @@ _080B2130: movs r0, 0x1 b _080B2156 .align 2, 0 -_080B2148: .4byte 0x08550584 + .pool _080B214C: adds r4, 0x2 adds r5, 0x1 @@ -365379,9 +353416,9 @@ sub_80B215C: @ 80B215C bl sub_80B2128 cmp r0, 0 beq _080B2184 - ldr r0, _080B2178 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _080B217C + ldr r2, =0x000009c8 adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0xFE @@ -365389,8 +353426,7 @@ sub_80B215C: @ 80B215C movs r0, 0xFF b _080B2182 .align 2, 0 -_080B2178: .4byte 0x03005d8c -_080B217C: .4byte 0x000009c8 + .pool _080B2180: adds r0, 0x1 _080B2182: @@ -365406,9 +353442,9 @@ sub_80B2188: @ 80B2188 bl sub_80B2128 cmp r0, 0 beq _080B21AC - ldr r0, _080B21A4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080B21A8 + ldr r1, =0x000009c8 adds r0, r1 ldrh r0, [r0] cmp r0, 0xFE @@ -365416,8 +353452,7 @@ sub_80B2188: @ 80B2188 movs r0, 0x1 b _080B21AE .align 2, 0 -_080B21A4: .4byte 0x03005d8c -_080B21A8: .4byte 0x000009c8 + .pool _080B21AC: movs r0, 0 _080B21AE: @@ -365435,15 +353470,15 @@ sub_80B21B4: @ 80B21B4 bl sub_80B2188 cmp r0, 0 beq _080B21E0 - ldr r0, _080B21E8 + ldr r0, =0x085500a4 adds r1, r5, 0 adds r2, r4, 0 bl sub_80B1DFC cmp r0, 0x1 bne _080B21E0 - ldr r0, _080B21EC + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080B21F0 + ldr r1, =0x000009c8 adds r0, r1 movs r1, 0 strh r1, [r0] @@ -365452,9 +353487,7 @@ _080B21E0: pop {r0} bx r0 .align 2, 0 -_080B21E8: .4byte 0x085500a4 -_080B21EC: .4byte 0x03005d8c -_080B21F0: .4byte 0x000009c8 + .pool thumb_func_end sub_80B21B4 thumb_func_start sub_80B21F4 @@ -365466,13 +353499,13 @@ sub_80B21F4: @ 80B21F4 lsrs r3, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _080B2210 + ldr r0, =0x085500a4 adds r1, r3, 0 bl sub_80B1EC0 pop {r1} bx r1 .align 2, 0 -_080B2210: .4byte 0x085500a4 + .pool thumb_func_end sub_80B21F4 thumb_func_start sub_80B2214 @@ -365484,13 +353517,13 @@ sub_80B2214: @ 80B2214 lsrs r3, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _080B2230 + ldr r0, =0x085500a4 adds r1, r3, 0 bl sub_80B1F08 pop {r1} bx r1 .align 2, 0 -_080B2230: .4byte 0x085500a4 + .pool thumb_func_end sub_80B2214 thumb_func_start sub_80B2234 @@ -365499,14 +353532,14 @@ sub_80B2234: @ 80B2234 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r0, _080B224C + ldr r0, =0x085500a4 bl sub_80B1FB0 lsls r0, 16 lsrs r0, 16 pop {r1} bx r1 .align 2, 0 -_080B224C: .4byte 0x085500a4 + .pool thumb_func_end sub_80B2234 thumb_func_start sub_80B2250 @@ -365515,21 +353548,21 @@ sub_80B2250: @ 80B2250 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r0, _080B2268 + ldr r0, =0x085500a4 bl sub_80B2004 lsls r0, 16 lsrs r0, 16 pop {r1} bx r1 .align 2, 0 -_080B2268: .4byte 0x085500a4 + .pool thumb_func_end sub_80B2250 thumb_func_start sub_80B226C sub_80B226C: @ 80B226C push {r4,r5,lr} - ldr r5, _080B2290 - ldr r4, _080B2294 + ldr r5, =0x085500a4 + ldr r4, =0x02038bca ldrh r1, [r4] adds r0, r5, 0 bl sub_80B1F38 @@ -365543,8 +353576,7 @@ sub_80B226C: @ 80B226C lsrs r0, 24 b _080B229A .align 2, 0 -_080B2290: .4byte 0x085500a4 -_080B2294: .4byte 0x02038bca + .pool _080B2298: movs r0, 0x1 _080B229A: @@ -365556,8 +353588,8 @@ _080B229A: thumb_func_start sub_80B22A0 sub_80B22A0: @ 80B22A0 push {lr} - ldr r0, _080B22B4 - ldr r1, _080B22B8 + ldr r0, =0x085500a4 + ldr r1, =0x02038bca ldrh r1, [r1] bl sub_80B1F74 lsls r0, 24 @@ -365565,64 +353597,59 @@ sub_80B22A0: @ 80B22A0 pop {r1} bx r1 .align 2, 0 -_080B22B4: .4byte 0x085500a4 -_080B22B8: .4byte 0x02038bca + .pool thumb_func_end sub_80B22A0 thumb_func_start sub_80B22BC sub_80B22BC: @ 80B22BC push {lr} - ldr r0, _080B22D0 - ldr r1, _080B22D4 + ldr r0, =0x085500a4 + ldr r1, =0x02038bca ldrh r1, [r1] bl sub_80B205C bl rom_npc_set_flag_for_script_id pop {r0} bx r0 .align 2, 0 -_080B22D0: .4byte 0x085500a4 -_080B22D4: .4byte 0x02038bca + .pool thumb_func_end sub_80B22BC thumb_func_start sub_80B22D8 sub_80B22D8: @ 80B22D8 push {lr} - ldr r1, _080B22F4 + ldr r1, =0x02038bf9 ldrb r0, [r1] cmp r0, 0x1 bls _080B2300 movs r0, 0 strb r0, [r1] - ldr r1, _080B22F8 + ldr r1, =0x02038bf8 movs r0, 0x1 strb r0, [r1] - ldr r1, _080B22FC + ldr r1, =0x020375f0 movs r0, 0x1 b _080B230A .align 2, 0 -_080B22F4: .4byte 0x02038bf9 -_080B22F8: .4byte 0x02038bf8 -_080B22FC: .4byte 0x020375f0 + .pool _080B2300: - ldr r1, _080B2310 + ldr r1, =0x02038bf8 movs r0, 0 strb r0, [r1] - ldr r1, _080B2314 + ldr r1, =0x020375f0 movs r0, 0 _080B230A: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_080B2310: .4byte 0x02038bf8 -_080B2314: .4byte 0x020375f0 + .pool thumb_func_end sub_80B22D8 thumb_func_start sub_80B2318 sub_80B2318: @ 80B2318 push {r4-r7,lr} lsls r0, 16 - ldr r7, _080B2334 + ldr r7, =0x085500a4 lsrs r4, r0, 12 adds r6, r4, r7 ldrh r0, [r6] @@ -365634,7 +353661,7 @@ sub_80B2318: @ 80B2318 movs r0, 0 b _080B2364 .align 2, 0 -_080B2334: .4byte 0x085500a4 + .pool _080B2338: movs r5, 0x1 adds r0, r4, 0x2 @@ -365672,7 +353699,7 @@ sub_80B236C: @ 80B236C lsrs r6, r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r4, _080B23A8 + ldr r4, =sub_80B2634 + 1 adds r0, r4, 0 bl get_task_id_by_function lsls r0, 24 @@ -365684,7 +353711,7 @@ sub_80B236C: @ 80B236C bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080B23AC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -365696,8 +353723,7 @@ _080B23A0: pop {r0} bx r0 .align 2, 0 -_080B23A8: .4byte sub_80B2634 + 1 -_080B23AC: .4byte 0x03005e00 + .pool thumb_func_end sub_80B236C thumb_func_start sub_80B23B0 @@ -365707,7 +353733,7 @@ sub_80B23B0: @ 80B23B0 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _080B2410 + ldr r0, =0x02021cc4 movs r2, 0 movs r3, 0x1 bl decimal_int_to_string @@ -365716,8 +353742,8 @@ sub_80B23B0: @ 80B23B0 adds r0, r4, 0 movs r1, 0 bl SetStandardWindowBorderStyle - ldr r5, _080B2414 - ldr r1, _080B2418 + ldr r5, =0x02021fc4 + ldr r1, =0x085ee667 adds r0, r5, 0 bl ExpandTextCodes movs r0, 0x1 @@ -365745,9 +353771,7 @@ sub_80B23B0: @ 80B23B0 pop {r0} bx r0 .align 2, 0 -_080B2410: .4byte 0x02021cc4 -_080B2414: .4byte 0x02021fc4 -_080B2418: .4byte 0x085ee667 + .pool thumb_func_end sub_80B23B0 thumb_func_start sub_80B241C @@ -365777,7 +353801,7 @@ sub_80B243C: @ 80B243C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B2464 + ldr r0, =0x03005e08 adds r4, r1, r0 movs r1, 0x6 ldrsh r0, [r4, r1] @@ -365789,7 +353813,7 @@ sub_80B243C: @ 80B243C bl sub_80B241C b _080B2470 .align 2, 0 -_080B2464: .4byte 0x03005e08 + .pool _080B2468: ldrh r0, [r4, 0xA] adds r1, r5, 0 @@ -365816,12 +353840,12 @@ sub_80B2478: @ 80B2478 cmp r0, 0x6 bhi _080B24F0 lsls r0, 2 - ldr r1, _080B249C + ldr r1, =_080B24A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B249C: .4byte _080B24A0 + .pool .align 2, 0 _080B24A0: .4byte _080B24BC @@ -365844,7 +353868,7 @@ _080B24C8: movs r0, 0x9 b _080B24F2 _080B24CC: - ldr r4, _080B24E8 + ldr r4, =0x02021cc4 bl sub_800ABAC adds r1, r0, 0 lsls r1, 24 @@ -365856,7 +353880,7 @@ _080B24CC: movs r0, 0x4 b _080B24F2 .align 2, 0 -_080B24E8: .4byte 0x02021cc4 + .pool _080B24EC: movs r0, 0xA b _080B24F2 @@ -365881,12 +353905,12 @@ sub_80B24F8: @ 80B24F8 movs r0, 0 b _080B251E _080B250E: - ldr r0, _080B2524 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080B2528 + ldr r0, =sub_80B2D2C + 1 str r0, [r1] movs r0, 0x1 _080B251E: @@ -365894,8 +353918,7 @@ _080B251E: pop {r1} bx r1 .align 2, 0 -_080B2524: .4byte 0x03005e00 -_080B2528: .4byte sub_80B2D2C + 1 + .pool thumb_func_end sub_80B24F8 thumb_func_start sub_80B252C @@ -365903,7 +353926,7 @@ sub_80B252C: @ 80B252C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080B2560 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -365914,22 +353937,19 @@ sub_80B252C: @ 80B252C lsrs r1, r0, 24 cmp r1, 0 bne _080B2570 - ldr r0, _080B2564 + ldr r0, =0x020229c6 strh r1, [r0] - ldr r1, _080B2568 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080B256C + ldr r1, =sub_80B2CEC + 1 str r1, [r0] movs r0, 0x1 b _080B2572 .align 2, 0 -_080B2560: .4byte 0x030022c0 -_080B2564: .4byte 0x020229c6 -_080B2568: .4byte 0x03005e00 -_080B256C: .4byte sub_80B2CEC + 1 + .pool _080B2570: movs r0, 0 _080B2572: @@ -365950,7 +353970,7 @@ sub_80B2578: @ 80B2578 movs r0, 0x1 bl sub_800B330 _080B258E: - ldr r0, _080B25A0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -365959,17 +353979,17 @@ _080B258E: movs r0, 0 b _080B25BA .align 2, 0 -_080B25A0: .4byte 0x030022c0 + .pool _080B25A4: - ldr r1, _080B25C0 + ldr r1, =0x020229c6 movs r0, 0 strh r0, [r1] - ldr r1, _080B25C4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080B25C8 + ldr r1, =sub_80B2CEC + 1 str r1, [r0] movs r0, 0x1 _080B25BA: @@ -365977,9 +353997,7 @@ _080B25BA: pop {r1} bx r1 .align 2, 0 -_080B25C0: .4byte 0x020229c6 -_080B25C4: .4byte 0x03005e00 -_080B25C8: .4byte sub_80B2CEC + 1 + .pool thumb_func_end sub_80B2578 thumb_func_start sub_80B25CC @@ -365995,12 +354013,12 @@ sub_80B25CC: @ 80B25CC movs r0, 0 b _080B25F2 _080B25E2: - ldr r0, _080B25F8 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080B25FC + ldr r0, =sub_80B2D2C + 1 str r0, [r1] movs r0, 0x1 _080B25F2: @@ -366008,8 +354026,7 @@ _080B25F2: pop {r1} bx r1 .align 2, 0 -_080B25F8: .4byte 0x03005e00 -_080B25FC: .4byte sub_80B2D2C + 1 + .pool thumb_func_end sub_80B25CC thumb_func_start sub_80B2600 @@ -366017,7 +354034,7 @@ sub_80B2600: @ 80B2600 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080B2630 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -366038,7 +354055,7 @@ _080B262A: pop {r0} bx r0 .align 2, 0 -_080B2630: .4byte 0x03005e00 + .pool thumb_func_end sub_80B2600 thumb_func_start sub_80B2634 @@ -366049,7 +354066,7 @@ sub_80B2634: @ 80B2634 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B2664 + ldr r0, =0x03005e08 adds r4, r1, r0 movs r3, 0 ldrsh r2, [r4, r3] @@ -366058,19 +354075,18 @@ sub_80B2634: @ 80B2634 bl sub_800A0AC bl sub_800AB98 bl sub_800A2BC - ldr r0, _080B2668 + ldr r0, =0x08550594 bl Window_AddFromTemplate strh r0, [r4, 0xA] b _080B2678 .align 2, 0 -_080B2664: .4byte 0x03005e08 -_080B2668: .4byte 0x08550594 + .pool _080B266C: cmp r2, 0x9 ble _080B2678 subs r0, 0x8 adds r0, r1, r0 - ldr r1, _080B2684 + ldr r1, =sub_80B2688 + 1 str r1, [r0] _080B2678: ldrh r0, [r4] @@ -366080,7 +354096,7 @@ _080B2678: pop {r0} bx r0 .align 2, 0 -_080B2684: .4byte sub_80B2688 + 1 + .pool thumb_func_end sub_80B2634 thumb_func_start sub_80B2688 @@ -366103,7 +354119,7 @@ sub_80B2688: @ 80B2688 bls _080B26FC movs r0, 0x1 bl sub_800B330 - ldr r1, _080B26E0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -366117,20 +354133,18 @@ sub_80B2688: @ 80B2688 bne _080B26EC movs r0, 0x15 bl audio_play - ldr r0, _080B26E4 + ldr r0, =0x082780b3 bl box_related_two__3 - ldr r0, _080B26E8 + ldr r0, =sub_80B270C + 1 b _080B26FA .align 2, 0 -_080B26E0: .4byte 0x03005e00 -_080B26E4: .4byte 0x082780b3 -_080B26E8: .4byte sub_80B270C + 1 + .pool _080B26EC: movs r0, 0x16 bl audio_play - ldr r0, _080B2704 + ldr r0, =0x08278131 bl box_related_two__3 - ldr r0, _080B2708 + ldr r0, =sub_80B2918 + 1 _080B26FA: str r0, [r4] _080B26FC: @@ -366138,8 +354152,7 @@ _080B26FC: pop {r0} bx r0 .align 2, 0 -_080B2704: .4byte 0x08278131 -_080B2708: .4byte sub_80B2918 + 1 + .pool thumb_func_end sub_80B2688 thumb_func_start sub_80B270C @@ -366164,21 +354177,20 @@ sub_80B270C: @ 80B270C lsrs r2, r0, 24 cmp r2, 0 bne _080B274C - ldr r0, _080B2754 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 strh r2, [r1, 0xE] - ldr r0, _080B2758 + ldr r0, =sub_80B275C + 1 str r0, [r1] _080B274C: pop {r4} pop {r0} bx r0 .align 2, 0 -_080B2754: .4byte 0x03005e00 -_080B2758: .4byte sub_80B275C + 1 + .pool thumb_func_end sub_80B270C thumb_func_start sub_80B275C @@ -366193,7 +354205,7 @@ sub_80B275C: @ 80B275C adds r0, r4 lsls r0, 3 mov r8, r0 - ldr r0, _080B27F0 + ldr r0, =0x03005e08 mov r9, r0 mov r7, r8 add r7, r9 @@ -366216,7 +354228,7 @@ sub_80B275C: @ 80B275C adds r0, r4, 0 adds r1, r6, 0 bl sub_80B243C - ldr r0, _080B27F4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -366230,17 +354242,17 @@ sub_80B275C: @ 80B275C bl sub_800AA04 ldrh r0, [r7, 0xA] bl sub_80B241C - ldr r0, _080B27F8 + ldr r0, =0x02021cc4 adds r1, r5, 0 movs r2, 0 movs r3, 0x1 bl decimal_int_to_string - ldr r0, _080B27FC + ldr r0, =0x082780f2 bl box_related_two__3 mov r0, r9 subs r0, 0x8 add r0, r8 - ldr r1, _080B2800 + ldr r1, =sub_80B2804 + 1 str r1, [r0] _080B27E4: pop {r3,r4} @@ -366250,11 +354262,7 @@ _080B27E4: pop {r0} bx r0 .align 2, 0 -_080B27F0: .4byte 0x03005e08 -_080B27F4: .4byte 0x030022c0 -_080B27F8: .4byte 0x02021cc4 -_080B27FC: .4byte 0x082780f2 -_080B2800: .4byte sub_80B2804 + 1 + .pool thumb_func_end sub_80B275C thumb_func_start sub_80B2804 @@ -366286,28 +354294,25 @@ sub_80B2804: @ 80B2804 lsls r0, 24 cmp r4, r0 bne _080B2852 - ldr r0, _080B2868 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _080B2878 _080B2852: - ldr r0, _080B286C + ldr r0, =0x082780b3 bl box_related_two__3 - ldr r1, _080B2870 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _080B2874 + ldr r1, =sub_80B270C + 1 str r1, [r0] b _080B2898 .align 2, 0 -_080B2868: .4byte 0x030022c0 -_080B286C: .4byte 0x082780b3 -_080B2870: .4byte 0x03005e00 -_080B2874: .4byte sub_80B270C + 1 + .pool _080B2878: movs r0, 0x1 ands r0, r1 @@ -366316,20 +354321,19 @@ _080B2878: movs r0, 0x5 bl audio_play bl sub_800A620 - ldr r0, _080B28A0 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _080B28A4 + ldr r0, =sub_80B28A8 + 1 str r0, [r1] _080B2898: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080B28A0: .4byte 0x03005e00 -_080B28A4: .4byte sub_80B28A8 + 1 + .pool thumb_func_end sub_80B2804 thumb_func_start sub_80B28A8 @@ -366337,7 +354341,7 @@ sub_80B28A8: @ 80B28A8 push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080B28EC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -366361,13 +354365,12 @@ sub_80B28A8: @ 80B28A8 lsls r0, 24 cmp r4, r0 beq _080B28F4 - ldr r0, _080B28F0 + ldr r0, =sub_80B2D2C + 1 b _080B2908 .align 2, 0 -_080B28EC: .4byte 0x03005e00 -_080B28F0: .4byte sub_80B2D2C + 1 + .pool _080B28F4: - ldr r4, _080B2910 + ldr r4, =0x020375f0 adds r0, r7, 0 adds r1, r6, 0 bl sub_80B2478 @@ -366375,7 +354378,7 @@ _080B28F4: lsls r0, 16 cmp r0, 0 beq _080B290A - ldr r0, _080B2914 + ldr r0, =sub_80B2A08 + 1 _080B2908: str r0, [r5] _080B290A: @@ -366383,8 +354386,7 @@ _080B290A: pop {r0} bx r0 .align 2, 0 -_080B2910: .4byte 0x020375f0 -_080B2914: .4byte sub_80B2A08 + 1 + .pool thumb_func_end sub_80B28A8 thumb_func_start sub_80B2918 @@ -366394,7 +354396,7 @@ sub_80B2918: @ 80B2918 push {r7} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080B2970 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -366409,7 +354411,7 @@ sub_80B2918: @ 80B2918 bl sub_80B24F8 cmp r0, 0x1 beq _080B29E6 - ldr r4, _080B2974 + ldr r4, =0x020375f0 adds r0, r6, 0 adds r1, r5, 0 bl sub_80B2478 @@ -366426,12 +354428,10 @@ sub_80B2918: @ 80B2918 bhi _080B297C bl sub_800AC34 bl textbox_close - ldr r0, _080B2978 + ldr r0, =sub_80B2CB0 + 1 b _080B29E4 .align 2, 0 -_080B2970: .4byte 0x03005e00 -_080B2974: .4byte 0x020375f0 -_080B2978: .4byte sub_80B2CB0 + 1 + .pool _080B297C: cmp r2, 0x7 beq _080B2984 @@ -366440,28 +354440,28 @@ _080B297C: _080B2984: bl sub_80097E8 bl textbox_close - ldr r0, _080B2990 + ldr r0, =sub_80B2CB0 + 1 b _080B29E4 .align 2, 0 -_080B2990: .4byte sub_80B2CB0 + 1 + .pool _080B2994: bl sub_800ABAC - ldr r4, _080B29F0 + ldr r4, =0x03005db8 strb r0, [r4] bl link_get_multiplayer_id - ldr r1, _080B29F4 + ldr r1, =0x03005db4 strb r0, [r1] ldrb r0, [r4] bl sub_800AA04 - ldr r4, _080B29F8 + ldr r4, =0x020228c4 adds r0, r4, 0 bl sub_80C30A4 - ldr r0, _080B29FC + ldr r0, =0x0203cef8 mov r8, r0 ldrb r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _080B2A00 + ldr r5, =0x02024488 adds r0, r5 movs r1, 0xB movs r2, 0 @@ -366478,7 +354478,7 @@ _080B2994: bl pokemon_getattr adds r4, 0x56 strh r0, [r4] - ldr r0, _080B2A04 + ldr r0, =sub_80B2C30 + 1 _080B29E4: str r0, [r7] _080B29E6: @@ -366488,12 +354488,7 @@ _080B29E6: pop {r0} bx r0 .align 2, 0 -_080B29F0: .4byte 0x03005db8 -_080B29F4: .4byte 0x03005db4 -_080B29F8: .4byte 0x020228c4 -_080B29FC: .4byte 0x0203cef8 -_080B2A00: .4byte 0x02024488 -_080B2A04: .4byte sub_80B2C30 + 1 + .pool thumb_func_end sub_80B2918 thumb_func_start sub_80B2A08 @@ -366507,7 +354502,7 @@ sub_80B2A08: @ 80B2A08 bl sub_80B24F8 cmp r0, 0x1 beq _080B2ACE - ldr r0, _080B2A34 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x4 bne _080B2A38 @@ -366517,7 +354512,7 @@ sub_80B2A08: @ 80B2A08 bl sub_800AC34 b _080B2A4E .align 2, 0 -_080B2A34: .4byte 0x020375f0 + .pool _080B2A38: cmp r0, 0x3 bne _080B2A42 @@ -366532,35 +354527,34 @@ _080B2A4A: bl sub_80097E8 _080B2A4E: bl textbox_close - ldr r0, _080B2A64 + ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 lsls r1, 3 adds r1, r0 - ldr r0, _080B2A68 + ldr r0, =sub_80B2CB0 + 1 str r0, [r1] b _080B2ACE .align 2, 0 -_080B2A64: .4byte 0x03005e00 -_080B2A68: .4byte sub_80B2CB0 + 1 + .pool _080B2A6C: bl sub_800ABAC - ldr r4, _080B2AD8 + ldr r4, =0x03005db8 strb r0, [r4] bl link_get_multiplayer_id - ldr r1, _080B2ADC + ldr r1, =0x03005db4 strb r0, [r1] ldrb r0, [r4] bl sub_800AA04 - ldr r4, _080B2AE0 + ldr r4, =0x020228c4 adds r0, r4, 0 bl sub_80C30A4 - ldr r0, _080B2AE4 + ldr r0, =0x0203cef8 mov r8, r0 ldrb r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _080B2AE8 + ldr r5, =0x02024488 adds r0, r5 movs r1, 0xB movs r2, 0 @@ -366577,12 +354571,12 @@ _080B2A6C: bl pokemon_getattr adds r4, 0x56 strh r0, [r4] - ldr r1, _080B2AEC + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _080B2AF0 + ldr r1, =sub_80B2C30 + 1 str r1, [r0] movs r0, 0x2 bl sub_800A4D8 @@ -366593,13 +354587,7 @@ _080B2ACE: pop {r0} bx r0 .align 2, 0 -_080B2AD8: .4byte 0x03005db8 -_080B2ADC: .4byte 0x03005db4 -_080B2AE0: .4byte 0x020228c4 -_080B2AE4: .4byte 0x0203cef8 -_080B2AE8: .4byte 0x02024488 -_080B2AEC: .4byte 0x03005e00 -_080B2AF0: .4byte sub_80B2C30 + 1 + .pool thumb_func_end sub_80B2A08 thumb_func_start sub_80B2AF4 @@ -366614,17 +354602,17 @@ sub_80B2AF4: @ 80B2AF4 str r1, [sp, 0x4] movs r2, 0 movs r7, 0 - ldr r1, _080B2B84 + ldr r1, =0x02021cc4 movs r0, 0xFF strb r0, [r1] - ldr r1, _080B2B88 + ldr r1, =0x02021dc4 movs r0, 0x1 negs r0, r0 strb r0, [r1] movs r1, 0 movs r0, 0xB mov r10, r0 - ldr r0, _080B2B8C + ldr r0, =0x083185c8 mov r9, r0 _080B2B20: lsls r0, r1, 1 @@ -366644,7 +354632,7 @@ _080B2B2E: mov r1, r10 muls r1, r0 add r1, r9 - ldr r0, _080B2B84 + ldr r0, =0x02021cc4 bl gf_strcpy movs r2, 0x1 _080B2B48: @@ -366654,7 +354642,7 @@ _080B2B48: mov r1, r10 muls r1, r0 add r1, r9 - ldr r0, _080B2B88 + ldr r0, =0x02021dc4 bl gf_strcpy movs r2, 0x1 _080B2B5C: @@ -366667,7 +354655,7 @@ _080B2B5E: mov r1, r8 cmp r1, 0x1 ble _080B2B20 - ldr r0, _080B2B90 + ldr r0, =0x020375e2 strh r7, [r0] adds r0, r2, 0 add sp, 0x8 @@ -366679,10 +354667,7 @@ _080B2B5E: pop {r1} bx r1 .align 2, 0 -_080B2B84: .4byte 0x02021cc4 -_080B2B88: .4byte 0x02021dc4 -_080B2B8C: .4byte 0x083185c8 -_080B2B90: .4byte 0x020375e2 + .pool thumb_func_end sub_80B2AF4 thumb_func_start task_map_chg_seq_0807EC34 @@ -366690,13 +354675,13 @@ task_map_chg_seq_0807EC34: @ 80B2B94 push {r4,r5,lr} adds r5, r0, 0 adds r4, r1, 0 - ldr r1, _080B2BD8 + ldr r1, =0x02039b58 ldrh r0, [r5] cmp r0, 0x1 bne _080B2C10 - ldr r0, _080B2BDC + ldr r0, =0x020229c6 ldrh r2, [r0] - ldr r0, _080B2BE0 + ldr r0, =0x00002266 cmp r2, r0 beq _080B2BB2 adds r0, 0x11 @@ -366712,22 +354697,18 @@ _080B2BB2: movs r0, 0xB strh r0, [r5] bl sub_800AC34 - ldr r1, _080B2BE4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080B2BE8 + ldr r1, =sub_80B2CB0 + 1 str r1, [r0] b _080B2C22 .align 2, 0 -_080B2BD8: .4byte 0x02039b58 -_080B2BDC: .4byte 0x020229c6 -_080B2BE0: .4byte 0x00002266 -_080B2BE4: .4byte 0x03005e00 -_080B2BE8: .4byte sub_80B2CB0 + 1 + .pool _080B2BEC: - ldr r1, _080B2C0C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -366740,23 +354721,22 @@ _080B2BEC: bl remove_task b _080B2C22 .align 2, 0 -_080B2C0C: .4byte 0x03005e00 + .pool _080B2C10: bl sub_800AC34 - ldr r0, _080B2C28 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080B2C2C + ldr r0, =sub_80B2CB0 + 1 str r0, [r1] _080B2C22: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080B2C28: .4byte 0x03005e00 -_080B2C2C: .4byte sub_80B2CB0 + 1 + .pool thumb_func_end task_map_chg_seq_0807EC34 thumb_func_start sub_80B2C30 @@ -366776,17 +354756,17 @@ sub_80B2C30: @ 80B2C30 cmp r4, r0 bne _080B2C9C movs r4, 0 - ldr r6, _080B2C58 + ldr r6, =0x020229e8 b _080B2C7E .align 2, 0 -_080B2C58: .4byte 0x020229e8 + .pool _080B2C5C: movs r0, 0x64 muls r0, r4 - ldr r1, _080B2CA4 + ldr r1, =0x02039b58 adds r0, r1 lsls r1, r4, 8 - ldr r2, _080B2CA8 + ldr r2, =0x020223c4 adds r1, r2 lsls r2, r4, 3 subs r2, r4 @@ -366806,7 +354786,7 @@ _080B2C7E: movs r0, 0 bl sub_800B330 bl sub_800A5B4 - ldr r0, _080B2CAC + ldr r0, =0x020375f0 adds r1, r5, 0 bl task_map_chg_seq_0807EC34 _080B2C9C: @@ -366814,9 +354794,7 @@ _080B2C9C: pop {r0} bx r0 .align 2, 0 -_080B2CA4: .4byte 0x02039b58 -_080B2CA8: .4byte 0x020223c4 -_080B2CAC: .4byte 0x020375f0 + .pool thumb_func_end sub_80B2C30 thumb_func_start sub_80B2CB0 @@ -366824,11 +354802,11 @@ sub_80B2CB0: @ 80B2CB0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080B2CE4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080B2CDE - ldr r0, _080B2CE8 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -366845,8 +354823,7 @@ _080B2CDE: pop {r0} bx r0 .align 2, 0 -_080B2CE4: .4byte 0x03003124 -_080B2CE8: .4byte 0x03005e00 + .pool thumb_func_end sub_80B2CB0 thumb_func_start sub_80B2CEC @@ -366855,10 +354832,10 @@ sub_80B2CEC: @ 80B2CEC adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r1, _080B2D24 + ldr r1, =0x020375f0 movs r0, 0x5 strh r0, [r1] - ldr r0, _080B2D28 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -366875,8 +354852,7 @@ sub_80B2CEC: @ 80B2CEC pop {r0} bx r0 .align 2, 0 -_080B2D24: .4byte 0x020375f0 -_080B2D28: .4byte 0x03005e00 + .pool thumb_func_end sub_80B2CEC thumb_func_start sub_80B2D2C @@ -366885,10 +354861,10 @@ sub_80B2D2C: @ 80B2D2C adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r1, _080B2D64 + ldr r1, =0x020375f0 movs r0, 0x6 strh r0, [r1] - ldr r0, _080B2D68 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -366905,8 +354881,7 @@ sub_80B2D2C: @ 80B2D2C pop {r0} bx r0 .align 2, 0 -_080B2D64: .4byte 0x020375f0 -_080B2D68: .4byte 0x03005e00 + .pool thumb_func_end sub_80B2D2C thumb_func_start sub_80B2D6C @@ -366914,7 +354889,7 @@ sub_80B2D6C: @ 80B2D6C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080B2D90 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -366930,16 +354905,16 @@ sub_80B2D6C: @ 80B2D6C movs r0, 0 b _080B2D9A .align 2, 0 -_080B2D90: .4byte 0x03005e00 + .pool _080B2D94: - ldr r0, _080B2DA0 + ldr r0, =sub_80B2D2C + 1 str r0, [r2] movs r0, 0x1 _080B2D9A: pop {r1} bx r1 .align 2, 0 -_080B2DA0: .4byte sub_80B2D2C + 1 + .pool thumb_func_end sub_80B2D6C thumb_func_start sub_80B2DA4 @@ -366947,7 +354922,7 @@ sub_80B2DA4: @ 80B2DA4 push {r4,lr} movs r3, 0x2 movs r2, 0x2 - ldr r0, _080B2DBC + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x2 beq _080B2DDC @@ -366957,7 +354932,7 @@ sub_80B2DA4: @ 80B2DA4 beq _080B2DCA b _080B2E34 .align 2, 0 -_080B2DBC: .4byte 0x020375e0 + .pool _080B2DC0: cmp r0, 0x5 beq _080B2DEC @@ -366966,51 +354941,45 @@ _080B2DC0: b _080B2E34 _080B2DCA: movs r3, 0x2 - ldr r1, _080B2DD4 - ldr r4, _080B2DD8 + ldr r1, =0x020229c6 + ldr r4, =0x00002233 b _080B2E30 .align 2, 0 -_080B2DD4: .4byte 0x020229c6 -_080B2DD8: .4byte 0x00002233 + .pool _080B2DDC: movs r3, 0x2 - ldr r1, _080B2DE4 - ldr r4, _080B2DE8 + ldr r1, =0x020229c6 + ldr r4, =0x00002244 b _080B2E30 .align 2, 0 -_080B2DE4: .4byte 0x020229c6 -_080B2DE8: .4byte 0x00002244 + .pool _080B2DEC: movs r3, 0x4 movs r2, 0x4 - ldr r1, _080B2DF8 - ldr r4, _080B2DFC + ldr r1, =0x020229c6 + ldr r4, =0x00002255 b _080B2E30 .align 2, 0 -_080B2DF8: .4byte 0x020229c6 -_080B2DFC: .4byte 0x00002255 + .pool _080B2E00: movs r3, 0x2 - ldr r0, _080B2E1C + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _080B2E20 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r1, [r0] movs r0, 0x3 ands r0, r1 cmp r0, 0 bne _080B2E2C - ldr r1, _080B2E24 - ldr r4, _080B2E28 + ldr r1, =0x020229c6 + ldr r4, =0x00002266 b _080B2E30 .align 2, 0 -_080B2E1C: .4byte 0x03005d90 -_080B2E20: .4byte 0x00000ca9 -_080B2E24: .4byte 0x020229c6 -_080B2E28: .4byte 0x00002266 + .pool _080B2E2C: - ldr r1, _080B2E44 - ldr r4, _080B2E48 + ldr r1, =0x020229c6 + ldr r4, =0x00002277 _080B2E30: adds r0, r4, 0 strh r0, [r1] @@ -367022,18 +354991,17 @@ _080B2E34: pop {r0} bx r0 .align 2, 0 -_080B2E44: .4byte 0x020229c6 -_080B2E48: .4byte 0x00002277 + .pool thumb_func_end sub_80B2DA4 thumb_func_start sub_80B2E4C sub_80B2E4C: @ 80B2E4C push {lr} - ldr r1, _080B2E68 - ldr r2, _080B2E6C + ldr r1, =0x020229c6 + ldr r2, =0x00001133 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080B2E70 + ldr r1, =0x02022fec movs r0, 0 str r0, [r1] movs r0, 0x2 @@ -367042,22 +355010,20 @@ sub_80B2E4C: @ 80B2E4C pop {r0} bx r0 .align 2, 0 -_080B2E68: .4byte 0x020229c6 -_080B2E6C: .4byte 0x00001133 -_080B2E70: .4byte 0x02022fec + .pool thumb_func_end sub_80B2E4C thumb_func_start sub_80B2E74 sub_80B2E74: @ 80B2E74 push {lr} - ldr r1, _080B2E98 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r1, _080B2E9C - ldr r2, _080B2EA0 + ldr r1, =0x020229c6 + ldr r2, =0x00003311 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080B2EA4 + ldr r1, =0x02022fec movs r0, 0 str r0, [r1] movs r0, 0x2 @@ -367066,16 +355032,13 @@ sub_80B2E74: @ 80B2E74 pop {r0} bx r0 .align 2, 0 -_080B2E98: .4byte 0x020375f0 -_080B2E9C: .4byte 0x020229c6 -_080B2EA0: .4byte 0x00003311 -_080B2EA4: .4byte 0x02022fec + .pool thumb_func_end sub_80B2E74 thumb_func_start sub_80B2EA8 sub_80B2EA8: @ 80B2EA8 push {r4,lr} - ldr r4, _080B2EDC + ldr r4, =sub_80B2EE4 + 1 adds r0, r4, 0 bl get_task_id_by_function lsls r0, 24 @@ -367087,7 +355050,7 @@ sub_80B2EA8: @ 80B2EA8 bl AddTask lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080B2EE0 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -367099,8 +355062,7 @@ _080B2ED4: pop {r0} bx r0 .align 2, 0 -_080B2EDC: .4byte sub_80B2EE4 + 1 -_080B2EE0: .4byte 0x03005e00 + .pool thumb_func_end sub_80B2EA8 thumb_func_start sub_80B2EE4 @@ -367111,7 +355073,7 @@ sub_80B2EE4: @ 80B2EE4 push {r6,r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080B2F08 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -367124,9 +355086,9 @@ sub_80B2EE4: @ 80B2EE4 beq _080B2FB4 b _080B2FC6 .align 2, 0 -_080B2F08: .4byte 0x03005e00 + .pool _080B2F0C: - ldr r0, _080B2F3C + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 bne _080B2FA8 @@ -367140,7 +355102,7 @@ _080B2F0C: movs r4, 0 cmp r7, r5 bge _080B2F74 - ldr r0, _080B2F40 + ldr r0, =0x020229e8 ldrb r2, [r0] ldrh r3, [r0, 0x1A] subs r1, r2, 0x1 @@ -367149,8 +355111,7 @@ _080B2F0C: bhi _080B2F4A b _080B2F6E .align 2, 0 -_080B2F3C: .4byte 0x020375f0 -_080B2F40: .4byte 0x020229e8 + .pool _080B2F44: movs r1, 0x1 mov r8, r1 @@ -367190,11 +355151,11 @@ _080B2F74: _080B2F82: cmp r7, 0 beq _080B2FA8 - ldr r1, _080B2FA0 + ldr r1, =0x020375f0 movs r0, 0xC strh r0, [r1] bl sub_800AD10 - ldr r1, _080B2FA4 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -367203,15 +355164,14 @@ _080B2F82: strh r1, [r0, 0x8] b _080B2FC6 .align 2, 0 -_080B2FA0: .4byte 0x020375f0 -_080B2FA4: .4byte 0x03005e00 + .pool _080B2FA8: bl script_env_2_enable_and_set_ctx_running adds r0, r6, 0 bl remove_task b _080B2FC6 _080B2FB4: - ldr r0, _080B2FD4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080B2FC6 @@ -367226,17 +355186,17 @@ _080B2FC6: pop {r0} bx r0 .align 2, 0 -_080B2FD4: .4byte 0x03003124 + .pool thumb_func_end sub_80B2EE4 thumb_func_start sub_80B2FD8 sub_80B2FD8: @ 80B2FD8 push {lr} - ldr r1, _080B2FF4 - ldr r2, _080B2FF8 + ldr r1, =0x020229c6 + ldr r2, =0x00004411 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080B2FFC + ldr r1, =0x02022fec movs r0, 0 str r0, [r1] movs r0, 0x2 @@ -367245,19 +355205,17 @@ sub_80B2FD8: @ 80B2FD8 pop {r0} bx r0 .align 2, 0 -_080B2FF4: .4byte 0x020229c6 -_080B2FF8: .4byte 0x00004411 -_080B2FFC: .4byte 0x02022fec + .pool thumb_func_end sub_80B2FD8 thumb_func_start sub_80B3000 sub_80B3000: @ 80B3000 push {lr} - ldr r1, _080B301C - ldr r2, _080B3020 + ldr r1, =0x020229c6 + ldr r2, =0x00006601 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080B3024 + ldr r1, =0x02022fec movs r0, 0 str r0, [r1] movs r0, 0x4 @@ -367266,19 +355224,17 @@ sub_80B3000: @ 80B3000 pop {r0} bx r0 .align 2, 0 -_080B301C: .4byte 0x020229c6 -_080B3020: .4byte 0x00006601 -_080B3024: .4byte 0x02022fec + .pool thumb_func_end sub_80B3000 thumb_func_start sub_80B3028 sub_80B3028: @ 80B3028 push {lr} - ldr r1, _080B3044 - ldr r2, _080B3048 + ldr r1, =0x020229c6 + ldr r2, =0x00006602 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080B304C + ldr r1, =0x02022fec movs r0, 0 str r0, [r1] movs r0, 0x2 @@ -367287,15 +355243,13 @@ sub_80B3028: @ 80B3028 pop {r0} bx r0 .align 2, 0 -_080B3044: .4byte 0x020229c6 -_080B3048: .4byte 0x00006602 -_080B304C: .4byte 0x02022fec + .pool thumb_func_end sub_80B3028 thumb_func_start sub_80B3050 sub_80B3050: @ 80B3050 push {lr} - ldr r0, _080B3064 + ldr r0, =sub_80B3144 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -367303,21 +355257,20 @@ sub_80B3050: @ 80B3050 movs r0, 0xFF b _080B3134 .align 2, 0 -_080B3064: .4byte sub_80B3144 + 1 + .pool _080B3068: - ldr r0, _080B307C + ldr r0, =0x020375e0 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x8 bhi _080B3128 lsls r0, 2 - ldr r1, _080B3080 + ldr r1, =_080B3084 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B307C: .4byte 0x020375e0 -_080B3080: .4byte _080B3084 + .pool .align 2, 0 _080B3084: .4byte _080B30A8 @@ -367330,66 +355283,58 @@ _080B3084: .4byte _080B3128 .4byte _080B30D8 _080B30A8: - ldr r1, _080B30B0 - ldr r2, _080B30B4 + ldr r1, =0x020229c6 + ldr r2, =0x00002233 b _080B3124 .align 2, 0 -_080B30B0: .4byte 0x020229c6 -_080B30B4: .4byte 0x00002233 + .pool _080B30B8: - ldr r1, _080B30C0 - ldr r2, _080B30C4 + ldr r1, =0x020229c6 + ldr r2, =0x00002244 b _080B3124 .align 2, 0 -_080B30C0: .4byte 0x020229c6 -_080B30C4: .4byte 0x00002244 + .pool _080B30C8: - ldr r1, _080B30D0 - ldr r2, _080B30D4 + ldr r1, =0x020229c6 + ldr r2, =0x00002255 b _080B3124 .align 2, 0 -_080B30D0: .4byte 0x020229c6 -_080B30D4: .4byte 0x00002255 + .pool _080B30D8: - ldr r0, _080B30F0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _080B30F4 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r1, [r0] movs r0, 0x3 ands r0, r1 cmp r0, 0 bne _080B3100 - ldr r1, _080B30F8 - ldr r2, _080B30FC + ldr r1, =0x020229c6 + ldr r2, =0x00002266 b _080B3124 .align 2, 0 -_080B30F0: .4byte 0x03005d90 -_080B30F4: .4byte 0x00000ca9 -_080B30F8: .4byte 0x020229c6 -_080B30FC: .4byte 0x00002266 + .pool _080B3100: - ldr r1, _080B3108 - ldr r2, _080B310C + ldr r1, =0x020229c6 + ldr r2, =0x00002277 b _080B3124 .align 2, 0 -_080B3108: .4byte 0x020229c6 -_080B310C: .4byte 0x00002277 + .pool _080B3110: - ldr r1, _080B3118 - ldr r2, _080B311C + ldr r1, =0x020229c6 + ldr r2, =0x00001111 b _080B3124 .align 2, 0 -_080B3118: .4byte 0x020229c6 -_080B311C: .4byte 0x00001111 + .pool _080B3120: - ldr r1, _080B3138 - ldr r2, _080B313C + ldr r1, =0x020229c6 + ldr r2, =0x00003322 _080B3124: adds r0, r2, 0 strh r0, [r1] _080B3128: - ldr r0, _080B3140 + ldr r0, =sub_80B3144 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -367398,9 +355343,7 @@ _080B3134: pop {r1} bx r1 .align 2, 0 -_080B3138: .4byte 0x020229c6 -_080B313C: .4byte 0x00003322 -_080B3140: .4byte sub_80B3144 + 1 + .pool thumb_func_end sub_80B3050 thumb_func_start sub_80B3144 @@ -367411,7 +355354,7 @@ sub_80B3144: @ 80B3144 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B3170 + ldr r0, =0x03005e08 adds r4, r1, r0 movs r3, 0 ldrsh r2, [r4, r3] @@ -367419,19 +355362,18 @@ sub_80B3144: @ 80B3144 bne _080B3178 bl sub_8009734 bl sub_800A2BC - ldr r0, _080B3174 + ldr r0, =task00_08081A90 + 1 movs r1, 0x50 bl AddTask b _080B3184 .align 2, 0 -_080B3170: .4byte 0x03005e08 -_080B3174: .4byte task00_08081A90 + 1 + .pool _080B3178: cmp r2, 0x9 ble _080B3184 subs r0, 0x8 adds r0, r1, r0 - ldr r1, _080B3190 + ldr r1, =sub_80B3194 + 1 str r1, [r0] _080B3184: ldrh r0, [r4] @@ -367441,7 +355383,7 @@ _080B3184: pop {r0} bx r0 .align 2, 0 -_080B3190: .4byte sub_80B3194 + 1 + .pool thumb_func_end sub_80B3144 thumb_func_start sub_80B3194 @@ -367460,23 +355402,22 @@ sub_80B3194: @ 80B3194 lsrs r0, 24 cmp r0, 0x1 bne _080B31CC - ldr r0, _080B31C4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080B31C8 + ldr r0, =sub_80B31E8 + 1 b _080B31D8 .align 2, 0 -_080B31C4: .4byte 0x03005e00 -_080B31C8: .4byte sub_80B31E8 + 1 + .pool _080B31CC: - ldr r0, _080B31E0 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _080B31E4 + ldr r0, =sub_80B3220 + 1 _080B31D8: str r0, [r1] _080B31DA: @@ -367484,8 +355425,7 @@ _080B31DA: pop {r0} bx r0 .align 2, 0 -_080B31E0: .4byte 0x03005e00 -_080B31E4: .4byte sub_80B3220 + 1 + .pool thumb_func_end sub_80B3194 thumb_func_start sub_80B31E8 @@ -367501,20 +355441,19 @@ sub_80B31E8: @ 80B31E8 cmp r4, r0 bne _080B3212 bl sub_800A620 - ldr r0, _080B3218 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _080B321C + ldr r0, =sub_80B3220 + 1 str r0, [r1] _080B3212: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080B3218: .4byte 0x03005e00 -_080B321C: .4byte sub_80B3220 + 1 + .pool thumb_func_end sub_80B31E8 thumb_func_start sub_80B3220 @@ -367522,7 +355461,7 @@ sub_80B3220: @ 80B3220 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080B3250 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 bne _080B3248 @@ -367540,7 +355479,7 @@ _080B3248: pop {r0} bx r0 .align 2, 0 -_080B3250: .4byte 0x03003124 + .pool thumb_func_end sub_80B3220 thumb_func_start sub_80B3254 @@ -367568,35 +355507,34 @@ _080B3270: beq _080B32A0 b _080B32A6 _080B327A: - ldr r1, _080B3280 + ldr r1, =0x02022fec movs r0, 0xA b _080B32A4 .align 2, 0 -_080B3280: .4byte 0x02022fec + .pool _080B3284: - ldr r1, _080B328C + ldr r1, =0x02022fec movs r0, 0xB b _080B32A4 .align 2, 0 -_080B328C: .4byte 0x02022fec + .pool _080B3290: bl sub_80F94E8 - ldr r1, _080B329C + ldr r1, =0x02022fec movs r0, 0x4B b _080B32A4 .align 2, 0 -_080B329C: .4byte 0x02022fec + .pool _080B32A0: - ldr r1, _080B32AC - ldr r0, _080B32B0 + ldr r1, =0x02022fec + ldr r0, =0x0000014b _080B32A4: str r0, [r1] _080B32A6: pop {r0} bx r0 .align 2, 0 -_080B32AC: .4byte 0x02022fec -_080B32B0: .4byte 0x0000014b + .pool thumb_func_end sub_80B3260 thumb_func_start sub_80B32B4 @@ -367607,20 +355545,19 @@ sub_80B32B4: @ 80B32B4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B32D8 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x5 bhi _080B33A0 lsls r0, 2 - ldr r1, _080B32DC + ldr r1, =_080B32E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B32D8: .4byte 0x03005e00 -_080B32DC: .4byte _080B32E0 + .pool .align 2, 0 _080B32E0: .4byte _080B32F8 @@ -367633,23 +355570,22 @@ _080B32F8: movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _080B3310 - ldr r2, _080B3314 + ldr r1, =0x020229c6 + ldr r2, =0x00002211 adds r0, r2, 0 strh r0, [r1] bl sub_8009FAC b _080B3346 .align 2, 0 -_080B3310: .4byte 0x020229c6 -_080B3314: .4byte 0x00002211 + .pool _080B3318: - ldr r0, _080B3324 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 b _080B3342 .align 2, 0 -_080B3324: .4byte 0x02037fd4 + .pool _080B3328: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -367663,7 +355599,7 @@ _080B3338: bl sub_800AC34 b _080B3346 _080B333E: - ldr r0, _080B3350 + ldr r0, =0x03003124 ldrb r0, [r0] _080B3342: cmp r0, 0 @@ -367674,38 +355610,37 @@ _080B3346: strh r0, [r4, 0x8] b _080B33A0 .align 2, 0 -_080B3350: .4byte 0x03003124 + .pool _080B3354: - ldr r0, _080B3368 + ldr r0, =0x020229e8 ldr r0, [r0, 0x4] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _080B3370 - ldr r0, _080B336C + ldr r0, =0x000001dd bl current_map_music_set__default_for_battle b _080B3378 .align 2, 0 -_080B3368: .4byte 0x020229e8 -_080B336C: .4byte 0x000001dd + .pool _080B3370: movs r0, 0xEE lsls r0, 1 bl current_map_music_set__default_for_battle _080B3378: - ldr r0, _080B33A8 + ldr r0, =0x020375e0 ldrh r0, [r0] bl sub_80B3260 bl overworld_free_bg_tilemaps - ldr r1, _080B33AC + ldr r1, =0x02038bca movs r2, 0x80 lsls r2, 4 adds r0, r2, 0 strh r0, [r1] - ldr r0, _080B33B0 + ldr r0, =sub_8036760 + 1 bl set_callback2 - ldr r1, _080B33B4 - ldr r0, _080B33B8 + ldr r1, =0x030022c0 + ldr r0, =sub_80B360C + 1 str r0, [r1, 0x8] adds r0, r5, 0 bl remove_task @@ -367714,11 +355649,7 @@ _080B33A0: pop {r0} bx r0 .align 2, 0 -_080B33A8: .4byte 0x020375e0 -_080B33AC: .4byte 0x02038bca -_080B33B0: .4byte sub_8036760 + 1 -_080B33B4: .4byte 0x030022c0 -_080B33B8: .4byte sub_80B360C + 1 + .pool thumb_func_end sub_80B32B4 thumb_func_start sub_80B33BC @@ -367729,7 +355660,7 @@ sub_80B33BC: @ 80B33BC lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080B33E0 + ldr r1, =0x03005e08 adds r6, r0, r1 movs r1, 0 ldrsh r0, [r6, r1] @@ -367738,13 +355669,12 @@ sub_80B33BC: @ 80B33BC b _080B3532 _080B33D6: lsls r0, 2 - ldr r1, _080B33E4 + ldr r1, =_080B33E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B33E0: .4byte 0x03005e08 -_080B33E4: .4byte _080B33E8 + .pool .align 2, 0 _080B33E8: .4byte _080B3408 @@ -367759,8 +355689,8 @@ _080B3408: movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _080B3424 - ldr r2, _080B3428 + ldr r0, =0x020229c6 + ldr r2, =0x00002211 adds r1, r2, 0 strh r1, [r0] bl sub_8009FAC @@ -367768,10 +355698,9 @@ _080B3408: strh r0, [r6] b _080B3532 .align 2, 0 -_080B3424: .4byte 0x020229c6 -_080B3428: .4byte 0x00002211 + .pool _080B342C: - ldr r0, _080B3440 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -367783,9 +355712,9 @@ _080B343A: strh r0, [r6] b _080B3532 .align 2, 0 -_080B3440: .4byte 0x02037fd4 + .pool _080B3444: - ldr r1, _080B3454 + ldr r1, =0x020229cc movs r0, 0 movs r2, 0x1C bl link_0800A448 @@ -367793,7 +355722,7 @@ _080B3444: strh r0, [r6] b _080B3532 .align 2, 0 -_080B3454: .4byte 0x020229cc + .pool _080B3458: bl sub_800A550 adds r4, r0, 0 @@ -367803,13 +355732,13 @@ _080B3458: cmp r4, r0 bne _080B3532 movs r4, 0 - ldr r5, _080B3470 + ldr r5, =0x020229e8 b _080B349A .align 2, 0 -_080B3470: .4byte 0x020229e8 + .pool _080B3474: lsls r1, r4, 8 - ldr r2, _080B34AC + ldr r2, =0x020223c4 adds r0, r5, 0 adds r1, r2 ldm r1!, {r2,r3,r7} @@ -367835,7 +355764,7 @@ _080B349A: strh r0, [r6] b _080B3532 .align 2, 0 -_080B34AC: .4byte 0x020223c4 + .pool _080B34B0: ldrh r0, [r6, 0x2] adds r0, 0x1 @@ -367861,39 +355790,38 @@ _080B34CE: strh r0, [r6] b _080B3532 _080B34DE: - ldr r0, _080B34F4 + ldr r0, =0x020229e8 ldr r0, [r0, 0x4] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _080B34FC - ldr r0, _080B34F8 + ldr r0, =0x000001dd bl current_map_music_set__default_for_battle b _080B3504 .align 2, 0 -_080B34F4: .4byte 0x020229e8 -_080B34F8: .4byte 0x000001dd + .pool _080B34FC: movs r0, 0xEE lsls r0, 1 bl current_map_music_set__default_for_battle _080B3504: - ldr r1, _080B3538 - ldr r0, _080B353C + ldr r1, =0x020229e8 + ldr r0, =0x00002211 str r0, [r1, 0x14] - ldr r0, _080B3540 + ldr r0, =0x020375e0 ldrh r0, [r0] bl sub_80B3260 bl overworld_free_bg_tilemaps - ldr r1, _080B3544 + ldr r1, =0x02038bca movs r3, 0x80 lsls r3, 4 adds r0, r3, 0 strh r0, [r1] - ldr r0, _080B3548 + ldr r0, =sub_8036760 + 1 bl set_callback2 - ldr r1, _080B354C - ldr r0, _080B3550 + ldr r1, =0x030022c0 + ldr r0, =sub_80B360C + 1 str r0, [r1, 0x8] adds r0, r4, 0 bl remove_task @@ -367902,19 +355830,13 @@ _080B3532: pop {r0} bx r0 .align 2, 0 -_080B3538: .4byte 0x020229e8 -_080B353C: .4byte 0x00002211 -_080B3540: .4byte 0x020375e0 -_080B3544: .4byte 0x02038bca -_080B3548: .4byte sub_8036760 + 1 -_080B354C: .4byte 0x030022c0 -_080B3550: .4byte sub_80B360C + 1 + .pool thumb_func_end sub_80B33BC thumb_func_start sub_80B3554 sub_80B3554: @ 80B3554 push {r4,lr} - ldr r0, _080B3570 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -367927,7 +355849,7 @@ sub_80B3554: @ 80B3554 beq _080B357A b _080B35FE .align 2, 0 -_080B3570: .4byte 0x030022c0 + .pool _080B3574: cmp r0, 0x2 beq _080B35F8 @@ -367940,7 +355862,7 @@ _080B357A: movs r2, 0 cmp r4, r3 bge _080B35AC - ldr r1, _080B35C0 + ldr r1, =0x020229e8 ldrb r0, [r1] subs r0, 0x4 cmp r0, 0x1 @@ -367962,7 +355884,7 @@ _080B35AC: cmp r4, 0 beq _080B35C8 _080B35B0: - ldr r0, _080B35C4 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -367970,11 +355892,10 @@ _080B35B0: strb r1, [r0] b _080B35FE .align 2, 0 -_080B35C0: .4byte 0x020229e8 -_080B35C4: .4byte 0x030022c0 + .pool _080B35C8: bl sub_800AC34 - ldr r0, _080B35DC + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -367982,20 +355903,19 @@ _080B35C8: strb r1, [r0] b _080B35FE .align 2, 0 -_080B35DC: .4byte 0x030022c0 + .pool _080B35E0: - ldr r0, _080B35F0 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080B35FE - ldr r0, _080B35F4 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 b _080B35FE .align 2, 0 -_080B35F0: .4byte 0x03003124 -_080B35F4: .4byte c2_exit_to_overworld_2_switch + 1 + .pool _080B35F8: - ldr r0, _080B3608 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 _080B35FE: bl run_active_tasks @@ -368003,13 +355923,13 @@ _080B35FE: pop {r0} bx r0 .align 2, 0 -_080B3608: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_80B3554 thumb_func_start sub_80B360C sub_80B360C: @ 80B360C push {r4,r5,lr} - ldr r2, _080B365C + ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x21 negs r1, r1 @@ -368019,23 +355939,23 @@ sub_80B360C: @ 80B360C bl copy_player_party_from_sav1 bl sub_8076FE0 bl sub_813BF10 - ldr r0, _080B3660 + ldr r0, =0x020375e0 ldrh r0, [r0] subs r0, 0x1 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 bhi _080B36B2 - ldr r0, _080B3664 + ldr r0, =0x03005db4 ldrb r0, [r0] movs r5, 0x1 eors r0, r5 bl sub_813C2A0 - ldr r0, _080B3668 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080B36B2 - ldr r0, _080B366C + ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 beq _080B3670 @@ -368043,13 +355963,9 @@ sub_80B360C: @ 80B360C beq _080B3694 b _080B36B2 .align 2, 0 -_080B365C: .4byte 0x02022fec -_080B3660: .4byte 0x020375e0 -_080B3664: .4byte 0x03005db4 -_080B3668: .4byte 0x030030fc -_080B366C: .4byte 0x0202433a + .pool _080B3670: - ldr r4, _080B3690 + ldr r4, =0x020229e8 bl link_get_multiplayer_id eors r0, r5 lsls r0, 24 @@ -368064,9 +355980,9 @@ _080B3670: bl sub_801B990 b _080B36B2 .align 2, 0 -_080B3690: .4byte 0x020229e8 + .pool _080B3694: - ldr r4, _080B36C0 + ldr r4, =0x020229e8 bl link_get_multiplayer_id eors r0, r5 lsls r0, 24 @@ -368083,33 +355999,29 @@ _080B36B2: bl in_trade_center cmp r0, 0x1 bne _080B36CC - ldr r1, _080B36C4 - ldr r0, _080B36C8 + ldr r1, =0x030022c0 + ldr r0, =sub_80B3554 + 1 b _080B36D0 .align 2, 0 -_080B36C0: .4byte 0x020229e8 -_080B36C4: .4byte 0x030022c0 -_080B36C8: .4byte sub_80B3554 + 1 + .pool _080B36CC: - ldr r1, _080B36E0 - ldr r0, _080B36E4 + ldr r1, =0x030022c0 + ldr r0, =c2_8056854 + 1 _080B36D0: str r0, [r1, 0x8] - ldr r0, _080B36E8 + ldr r0, =sub_80A0514 + 1 bl set_callback2 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080B36E0: .4byte 0x030022c0 -_080B36E4: .4byte c2_8056854 + 1 -_080B36E8: .4byte sub_80A0514 + 1 + .pool thumb_func_end sub_80B360C thumb_func_start sub_80B36EC sub_80B36EC: @ 80B36EC push {lr} - ldr r0, _080B3718 + ldr r0, =0x020375e0 ldrh r1, [r0] subs r0, r1, 0x1 lsls r0, 16 @@ -368130,7 +356042,7 @@ _080B370E: pop {r0} bx r0 .align 2, 0 -_080B3718: .4byte 0x020375e0 + .pool thumb_func_end sub_80B36EC thumb_func_start sub_80B371C @@ -368149,7 +356061,7 @@ sub_80B3728: @ 80B3728 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080B374C + ldr r1, =0x03005e00 adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -368161,7 +356073,7 @@ sub_80B3728: @ 80B3728 beq _080B375A b _080B37CC .align 2, 0 -_080B374C: .4byte 0x03005e00 + .pool _080B3750: cmp r0, 0x2 beq _080B378C @@ -368169,27 +356081,27 @@ _080B3750: beq _080B37B8 b _080B37CC _080B375A: - ldr r0, _080B3768 + ldr r0, =0x08278091 bl box_related_two__2 movs r0, 0x1 strh r0, [r5, 0x8] b _080B37CC .align 2, 0 -_080B3768: .4byte 0x08278091 + .pool _080B376C: bl sub_809833C lsls r0, 24 cmp r0, 0 beq _080B37CC bl sub_8087288 - ldr r0, _080B3788 + ldr r0, =0x020375e2 ldrb r0, [r0] bl sub_8009628 movs r0, 0x2 strh r0, [r5, 0x8] b _080B37CC .align 2, 0 -_080B3788: .4byte 0x020375e2 + .pool _080B378C: bl sub_8087214 cmp r0, 0x1 @@ -368228,7 +356140,7 @@ _080B37CC: sub_80B37D4: @ 80B37D4 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _080B37F8 + ldr r4, =sub_80B3728 + 1 adds r0, r4, 0 movs r1, 0x50 bl AddTask @@ -368242,7 +356154,7 @@ sub_80B37D4: @ 80B37D4 pop {r0} bx r0 .align 2, 0 -_080B37F8: .4byte sub_80B3728 + 1 + .pool thumb_func_end sub_80B37D4 thumb_func_start sub_80B37FC @@ -368253,7 +356165,7 @@ sub_80B37FC: @ 80B37FC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B3820 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -368265,7 +356177,7 @@ sub_80B37FC: @ 80B37FC beq _080B382E b _080B3884 .align 2, 0 -_080B3820: .4byte 0x03005e00 + .pool _080B3824: cmp r0, 0x2 beq _080B3854 @@ -368280,7 +356192,7 @@ _080B382E: bl sub_8009FAC b _080B3864 _080B3840: - ldr r0, _080B3850 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -368288,9 +356200,9 @@ _080B3840: bne _080B3884 b _080B3864 .align 2, 0 -_080B3850: .4byte 0x02037fd4 + .pool _080B3854: - ldr r1, _080B386C + ldr r1, =0x02032298 movs r0, 0 strb r0, [r1] strb r0, [r1, 0x1] @@ -368302,13 +356214,13 @@ _080B3864: strh r0, [r4, 0x8] b _080B3884 .align 2, 0 -_080B386C: .4byte 0x02032298 + .pool _080B3870: - ldr r0, _080B388C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080B3884 - ldr r0, _080B3890 + ldr r0, =sub_80773AC + 1 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -368317,8 +356229,7 @@ _080B3884: pop {r0} bx r0 .align 2, 0 -_080B388C: .4byte 0x03003124 -_080B3890: .4byte sub_80773AC + 1 + .pool thumb_func_end sub_80B37FC thumb_func_start sub_80B3894 @@ -368329,7 +356240,7 @@ sub_80B3894: @ 80B3894 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B38B8 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -368341,7 +356252,7 @@ sub_80B3894: @ 80B3894 beq _080B38C6 b _080B391C .align 2, 0 -_080B38B8: .4byte 0x03005e08 + .pool _080B38BC: cmp r0, 0x2 beq _080B38EC @@ -368356,7 +356267,7 @@ _080B38C6: bl Rfu_set_zero b _080B38FC _080B38D8: - ldr r0, _080B38E8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -368364,9 +356275,9 @@ _080B38D8: bne _080B391C b _080B38FC .align 2, 0 -_080B38E8: .4byte 0x02037fd4 + .pool _080B38EC: - ldr r1, _080B3904 + ldr r1, =0x02032298 movs r0, 0 strb r0, [r1] strb r0, [r1, 0x1] @@ -368378,7 +356289,7 @@ _080B38FC: strh r0, [r4] b _080B391C .align 2, 0 -_080B3904: .4byte 0x02032298 + .pool _080B3908: bl sub_800A520 lsls r0, 24 @@ -368396,36 +356307,35 @@ _080B391C: thumb_func_start sub_80B3924 sub_80B3924: @ 80B3924 push {lr} - ldr r0, _080B3938 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080B3940 - ldr r0, _080B393C + ldr r0, =sub_80B3894 + 1 bl sub_80B37D4 b _080B3946 .align 2, 0 -_080B3938: .4byte 0x030030fc -_080B393C: .4byte sub_80B3894 + 1 + .pool _080B3940: - ldr r0, _080B394C + ldr r0, =sub_80B37FC + 1 bl sub_80B37D4 _080B3946: pop {r0} bx r0 .align 2, 0 -_080B394C: .4byte sub_80B37FC + 1 + .pool thumb_func_end sub_80B3924 thumb_func_start sub_80B3950 sub_80B3950: @ 80B3950 push {lr} - ldr r0, _080B3960 + ldr r0, =sub_80B37FC + 1 movs r1, 0x50 bl AddTask pop {r0} bx r0 .align 2, 0 -_080B3960: .4byte sub_80B37FC + 1 + .pool thumb_func_end sub_80B3950 thumb_func_start nullsub_37 @@ -368436,57 +356346,53 @@ nullsub_37: @ 80B3964 thumb_func_start sub_80B3968 sub_80B3968: @ 80B3968 push {lr} - ldr r1, _080B3984 - ldr r2, _080B3988 + ldr r1, =0x020229c6 + ldr r2, =0x00002211 adds r0, r2, 0 strh r0, [r1] - ldr r0, _080B398C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080B3994 - ldr r0, _080B3990 + ldr r0, =sub_80B33BC + 1 bl sub_80B37D4 b _080B399A .align 2, 0 -_080B3984: .4byte 0x020229c6 -_080B3988: .4byte 0x00002211 -_080B398C: .4byte 0x030030fc -_080B3990: .4byte sub_80B33BC + 1 + .pool _080B3994: - ldr r0, _080B39A0 + ldr r0, =sub_80B32B4 + 1 bl sub_80B37D4 _080B399A: pop {r0} bx r0 .align 2, 0 -_080B39A0: .4byte sub_80B32B4 + 1 + .pool thumb_func_end sub_80B3968 thumb_func_start sub_80B39A4 sub_80B39A4: @ 80B39A4 push {lr} - ldr r0, _080B39B8 + ldr r0, =sub_80B3728 + 1 movs r1, 0x50 bl AddTask bl script_env_2_set_ctx_paused pop {r0} bx r0 .align 2, 0 -_080B39B8: .4byte sub_80B3728 + 1 + .pool thumb_func_end sub_80B39A4 thumb_func_start sp02A_crash_sound sp02A_crash_sound: @ 80B39BC push {lr} - ldr r0, _080B39CC + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r1, _080B39D0 + ldr r1, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl sub_80C4E74 pop {r0} bx r0 .align 2, 0 -_080B39CC: .4byte 0x020375e4 -_080B39D0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sp02A_crash_sound thumb_func_start sub_80B39D4 @@ -368495,13 +356401,13 @@ sub_80B39D4: @ 80B39D4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080B3A14 + ldr r0, =0x020375e4 strh r4, [r0] - ldr r0, _080B3A18 + ldr r0, =0x02021cc4 lsls r1, r4, 3 subs r1, r4 lsls r1, 2 - ldr r2, _080B3A1C + ldr r2, =0x020229f0 adds r1, r2 bl gf_strcpy adds r0, r4, 0 @@ -368510,8 +356416,8 @@ sub_80B39D4: @ 80B39D4 lsrs r1, r0, 24 cmp r1, 0 beq _080B3A28 - ldr r0, _080B3A20 - ldr r2, _080B3A24 + ldr r0, =0x02021dc4 + ldr r2, =0x0855059c subs r1, 0x1 lsls r1, 2 adds r1, r2 @@ -368520,11 +356426,7 @@ sub_80B39D4: @ 80B39D4 movs r0, 0x1 b _080B3A2A .align 2, 0 -_080B3A14: .4byte 0x020375e4 -_080B3A18: .4byte 0x02021cc4 -_080B3A1C: .4byte 0x020229f0 -_080B3A20: .4byte 0x02021dc4 -_080B3A24: .4byte 0x0855059c + .pool _080B3A28: movs r0, 0 _080B3A2A: @@ -368542,7 +356444,7 @@ task00_08081A90: @ 80B3A30 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080B3A90 + ldr r1, =0x03005e00 adds r0, r1 ldrh r1, [r0, 0x8] adds r1, 0x1 @@ -368553,16 +356455,16 @@ task00_08081A90: @ 80B3A30 cmp r1, r0 ble _080B3A62 bl sub_80097E8 - ldr r0, _080B3A94 + ldr r0, =c2_800ACD4 + 1 bl set_callback2 adds r0, r4, 0 bl remove_task _080B3A62: - ldr r0, _080B3A98 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080B3AA6 - ldr r0, _080B3A9C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _080B3AA0 @@ -368571,17 +356473,14 @@ _080B3A62: cmp r0, 0 bne _080B3A86 bl sub_80097E8 - ldr r0, _080B3A94 + ldr r0, =c2_800ACD4 + 1 bl set_callback2 _080B3A86: adds r0, r4, 0 bl remove_task b _080B3AA6 .align 2, 0 -_080B3A90: .4byte 0x03005e00 -_080B3A94: .4byte c2_800ACD4 + 1 -_080B3A98: .4byte 0x03003124 -_080B3A9C: .4byte 0x030030fc + .pool _080B3AA0: adds r0, r5, 0 bl remove_task @@ -368596,7 +356495,7 @@ sub_80B3AAC: @ 80B3AAC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080B3ACC + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080B3AC4 @@ -368608,7 +356507,7 @@ _080B3AC4: pop {r0} bx r0 .align 2, 0 -_080B3ACC: .4byte 0x03003124 + .pool thumb_func_end sub_80B3AAC thumb_func_start sub_80B3AD0 @@ -368618,19 +356517,18 @@ sub_80B3AD0: @ 80B3AD0 lsls r4, 24 lsrs r4, 24 bl sub_800AC34 - ldr r1, _080B3AF0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080B3AF4 + ldr r1, =sub_80B3AAC + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080B3AF0: .4byte 0x03005e00 -_080B3AF4: .4byte sub_80B3AAC + 1 + .pool thumb_func_end sub_80B3AD0 thumb_func_start sub_80B3AF8 @@ -368641,7 +356539,7 @@ sub_80B3AF8: @ 80B3AF8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080B3B1C + ldr r1, =0x03005e08 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -368653,7 +356551,7 @@ sub_80B3AF8: @ 80B3AF8 beq _080B3B2A b _080B3BB8 .align 2, 0 -_080B3B1C: .4byte 0x03005e08 + .pool _080B3B20: cmp r0, 0x2 beq _080B3B68 @@ -368661,7 +356559,7 @@ _080B3B20: beq _080B3B9E b _080B3BB8 _080B3B2A: - ldr r0, _080B3B3C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080B3B40 @@ -368669,15 +356567,15 @@ _080B3B2A: bl remove_task b _080B3BB8 .align 2, 0 -_080B3B3C: .4byte 0x030030fc + .pool _080B3B40: bl sub_8009734 - ldr r0, _080B3B50 + ldr r0, =task00_08081A90 + 1 movs r1, 0x1 bl AddTask b _080B3B96 .align 2, 0 -_080B3B50: .4byte task00_08081A90 + 1 + .pool _080B3B54: ldrh r0, [r5, 0x2] adds r0, 0x1 @@ -368715,7 +356613,7 @@ _080B3B96: strh r0, [r5] b _080B3BB8 _080B3B9E: - ldr r0, _080B3BC0 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 bne _080B3BB8 @@ -368731,39 +356629,37 @@ _080B3BB8: pop {r0} bx r0 .align 2, 0 -_080B3BC0: .4byte 0x03003124 + .pool thumb_func_end sub_80B3AF8 thumb_func_start sub_80B3BC4 sub_80B3BC4: @ 80B3BC4 push {lr} - ldr r0, _080B3BDC + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _080B3BD6 - ldr r1, _080B3BE0 - ldr r2, _080B3BE4 + ldr r1, =0x020229c6 + ldr r2, =0x00002288 adds r0, r2, 0 strh r0, [r1] _080B3BD6: pop {r0} bx r0 .align 2, 0 -_080B3BDC: .4byte 0x030030fc -_080B3BE0: .4byte 0x020229c6 -_080B3BE4: .4byte 0x00002288 + .pool thumb_func_end sub_80B3BC4 thumb_func_start sub_80B3BE8 sub_80B3BE8: @ 80B3BE8 push {r4-r7,lr} - ldr r0, _080B3C74 + ldr r0, =0x030060a8 movs r1, 0 strb r1, [r0] - ldr r0, _080B3C78 + ldr r0, =0x02038bfc strb r1, [r0] movs r4, 0 - ldr r6, _080B3C7C + ldr r6, =0x02037350 _080B3BF8: lsls r0, r4, 3 adds r0, r4 @@ -368787,7 +356683,7 @@ _080B3C12: beq _080B3C42 cmp r0, 0 beq _080B3C38 - ldr r0, _080B3C74 + ldr r0, =0x030060a8 ldrb r1, [r0] adds r5, r0, 0 cmp r1, 0x1 @@ -368803,13 +356699,13 @@ _080B3C38: cmp r4, 0xF bls _080B3BF8 _080B3C42: - ldr r0, _080B3C74 + ldr r0, =0x030060a8 ldrb r4, [r0] adds r5, r0, 0 cmp r4, 0x1 bne _080B3C88 bl sub_80B12E8 - ldr r2, _080B3C80 + ldr r2, =0x03006090 ldrb r0, [r5] subs r0, 0x1 lsls r1, r0, 1 @@ -368821,16 +356717,12 @@ _080B3C42: adds r1, r2 ldr r1, [r1] bl sub_80B162C - ldr r0, _080B3C84 + ldr r0, =0x030060ac strb r4, [r0] movs r0, 0x1 b _080B3CF4 .align 2, 0 -_080B3C74: .4byte 0x030060a8 -_080B3C78: .4byte 0x02038bfc -_080B3C7C: .4byte 0x02037350 -_080B3C80: .4byte 0x03006090 -_080B3C84: .4byte 0x030060ac + .pool _080B3C88: ldrb r0, [r5] cmp r0, 0x2 @@ -368840,9 +356732,9 @@ _080B3C88: ldrb r5, [r5] cmp r4, r5 bcs _080B3CC6 - ldr r6, _080B3CDC + ldr r6, =0x03006090 adds r7, r6, 0x4 - ldr r5, _080B3CE0 + ldr r5, =0x02038bfc _080B3CA0: lsls r1, r4, 1 adds r1, r4 @@ -368858,27 +356750,24 @@ _080B3CA0: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - ldr r0, _080B3CE4 + ldr r0, =0x030060a8 ldrb r0, [r0] cmp r4, r0 bcc _080B3CA0 _080B3CC6: bl sub_80B16A4 - ldr r1, _080B3CE0 + ldr r1, =0x02038bfc movs r0, 0 strb r0, [r1] - ldr r1, _080B3CE8 + ldr r1, =0x030060ac movs r0, 0x1 strb r0, [r1] movs r0, 0x1 b _080B3CF4 .align 2, 0 -_080B3CDC: .4byte 0x03006090 -_080B3CE0: .4byte 0x02038bfc -_080B3CE4: .4byte 0x030060a8 -_080B3CE8: .4byte 0x030060ac + .pool _080B3CEC: - ldr r1, _080B3CFC + ldr r1, =0x030060ac movs r0, 0 strb r0, [r1] movs r0, 0 @@ -368887,7 +356776,7 @@ _080B3CF4: pop {r1} bx r1 .align 2, 0 -_080B3CFC: .4byte 0x030060ac + .pool thumb_func_end sub_80B3BE8 thumb_func_start sub_80B3D00 @@ -368937,7 +356826,7 @@ _080B3D56: lsls r4, r5, 3 adds r0, r4, r5 lsls r0, 2 - ldr r1, _080B3DD4 + ldr r1, =0x02037350 adds r0, r1 bl sub_80B3DF0 lsls r0, 24 @@ -368960,8 +356849,8 @@ _080B3D7C: movs r1, 0x2 mov r9, r1 _080B3D8A: - ldr r2, _080B3DD8 - ldr r4, _080B3DDC + ldr r2, =0x03006090 + ldr r4, =0x030060a8 ldrb r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -368984,7 +356873,7 @@ _080B3D8A: mov r1, r8 adds r0, r1, r5 lsls r0, 2 - ldr r1, _080B3DD4 + ldr r1, =0x02037350 adds r0, r1 subs r1, r6, 0x1 lsls r1, 24 @@ -368996,9 +356885,7 @@ _080B3D8A: mov r0, r9 b _080B3DE2 .align 2, 0 -_080B3DD4: .4byte 0x02037350 -_080B3DD8: .4byte 0x03006090 -_080B3DDC: .4byte 0x030060a8 + .pool _080B3DE0: movs r0, 0 _080B3DE2: @@ -369026,7 +356913,7 @@ sub_80B3DF0: @ 80B3DF0 mov r8, r4 cmp r0, 0x1 bne _080B3E50 - ldr r1, _080B3E48 + ldr r1, =0x0855072c ldrb r0, [r7, 0x18] lsls r0, 28 lsrs r0, 26 @@ -369053,14 +356940,14 @@ sub_80B3DF0: @ 80B3DF0 lsrs r0, 24 b _080B3E90 .align 2, 0 -_080B3E48: .4byte 0x0855072c + .pool _080B3E4C: adds r0, r6, 0 b _080B3E90 _080B3E50: movs r5, 0 _080B3E52: - ldr r0, _080B3E9C + ldr r0, =0x0855072c lsls r4, r5, 2 adds r4, r0 ldrb r1, [r7, 0x1D] @@ -369097,7 +356984,7 @@ _080B3E90: pop {r1} bx r1 .align 2, 0 -_080B3E9C: .4byte 0x0855072c + .pool thumb_func_end sub_80B3DF0 thumb_func_start sub_80B3EA0 @@ -369360,11 +357247,11 @@ sub_80B406C: @ 80B406C push {r4,r5,lr} lsls r5, r1, 24 lsrs r5, 24 - ldr r0, _080B40B8 + ldr r0, =c3_8081EDC + 1 movs r1, 0x50 bl AddTask - ldr r4, _080B40BC - ldr r3, _080B40C0 + ldr r4, =0x03006090 + ldr r3, =0x030060a8 ldrb r2, [r3] lsls r1, r2, 1 adds r1, r2 @@ -369380,7 +357267,7 @@ sub_80B406C: @ 80B406C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B40C4 + ldr r0, =0x03005e00 adds r1, r0 strh r5, [r1, 0xE] ldrb r2, [r3] @@ -369394,35 +357281,31 @@ sub_80B406C: @ 80B406C pop {r0} bx r0 .align 2, 0 -_080B40B8: .4byte c3_8081EDC + 1 -_080B40BC: .4byte 0x03006090 -_080B40C0: .4byte 0x030060a8 -_080B40C4: .4byte 0x03005e00 + .pool thumb_func_end sub_80B406C thumb_func_start sub_80B40C8 sub_80B40C8: @ 80B40C8 push {r4,r5,lr} adds r2, r0, 0 - ldr r0, _080B40DC + ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 bne _080B40E4 - ldr r0, _080B40E0 + ldr r0, =0x03006090 ldrb r5, [r0, 0x8] b _080B40E8 .align 2, 0 -_080B40DC: .4byte 0x02038bfc -_080B40E0: .4byte 0x03006090 + .pool _080B40E4: - ldr r0, _080B410C + ldr r0, =0x03006090 ldrb r5, [r0, 0x14] _080B40E8: - ldr r4, _080B4110 + ldr r4, =c3_8081EDC + 1 adds r0, r5, 0 adds r1, r4, 0 bl set_task_function_and_args_14_15 - ldr r1, _080B4114 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -369435,9 +357318,7 @@ _080B40E8: pop {r0} bx r0 .align 2, 0 -_080B410C: .4byte 0x03006090 -_080B4110: .4byte c3_8081EDC + 1 -_080B4114: .4byte 0x03005e00 + .pool thumb_func_end sub_80B40C8 thumb_func_start c3_8081EDC @@ -369448,14 +357329,14 @@ c3_8081EDC: @ 80B4118 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080B4148 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x16 ldrsh r1, [r4, r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B414C + ldr r1, =0x02037350 adds r5, r0, r1 ldrb r0, [r5] lsls r0, 31 @@ -369465,10 +357346,9 @@ c3_8081EDC: @ 80B4118 bl set_task_function_to_args_14_15 b _080B416C .align 2, 0 -_080B4148: .4byte 0x03005e00 -_080B414C: .4byte 0x02037350 + .pool _080B4150: - ldr r7, _080B4174 + ldr r7, =0x0855073c _080B4152: movs r1, 0x8 ldrsh r0, [r4, r1] @@ -369487,7 +357367,7 @@ _080B416C: pop {r0} bx r0 .align 2, 0 -_080B4174: .4byte 0x0855073c + .pool thumb_func_end c3_8081EDC thumb_func_start sub_80B4178 @@ -369501,7 +357381,7 @@ sub_80B417C: @ 80B417C push {r4,r5,lr} adds r5, r1, 0 adds r4, r2, 0 - ldr r1, _080B41BC + ldr r1, =0x02038c08 adds r2, r1, 0x4 adds r3, r1, 0 adds r3, 0x8 @@ -369526,7 +357406,7 @@ sub_80B417C: @ 80B417C pop {r1} bx r1 .align 2, 0 -_080B41BC: .4byte 0x02038c08 + .pool thumb_func_end sub_80B417C thumb_func_start sub_80B41C0 @@ -369650,12 +357530,12 @@ _080B427A: bl sub_808F23C adds r0, r5, 0 bl sub_808F208 - ldr r0, _080B4310 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B4314 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl npc_is_visible_or_is_x40 @@ -369669,12 +357549,12 @@ _080B427A: beq _080B4308 _080B42D2: bl sub_808BCE8 - ldr r0, _080B4310 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080B4314 + ldr r0, =0x02037350 adds r4, r0 ldrb r0, [r5, 0x18] lsls r0, 28 @@ -369697,8 +357577,7 @@ _080B4308: pop {r1} bx r1 .align 2, 0 -_080B4310: .4byte 0x02037590 -_080B4314: .4byte 0x02037350 + .pool thumb_func_end sub_80B425C thumb_func_start sub_80B4318 @@ -369706,12 +357585,12 @@ sub_80B4318: @ 80B4318 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080B4354 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B4358 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl npc_is_visible_or_is_x40 @@ -369732,8 +357611,7 @@ _080B434A: pop {r1} bx r1 .align 2, 0 -_080B4354: .4byte 0x02037590 -_080B4358: .4byte 0x02037350 + .pool thumb_func_end sub_80B4318 thumb_func_start sub_80B435C @@ -369822,14 +357700,14 @@ sub_80B43E0: @ 80B43E0 lsls r0, 24 cmp r0, 0 beq _080B4426 - ldr r2, _080B4430 + ldr r2, =0x02038c08 movs r1, 0x10 ldrsh r0, [r4, r1] str r0, [r2] movs r1, 0x12 ldrsh r0, [r4, r1] str r0, [r2, 0x4] - ldr r3, _080B4434 + ldr r3, =0x02020630 ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -369853,8 +357731,7 @@ _080B4426: pop {r1} bx r1 .align 2, 0 -_080B4430: .4byte 0x02038c08 -_080B4434: .4byte 0x02020630 + .pool thumb_func_end sub_80B43E0 thumb_func_start sub_80B4438 @@ -369862,7 +357739,7 @@ sub_80B4438: @ 80B4438 push {r4,r5,lr} adds r5, r1, 0 adds r4, r2, 0 - ldr r2, _080B44A8 + ldr r2, =0x02020630 movs r1, 0x10 ldrsh r0, [r5, r1] lsls r1, r0, 4 @@ -369914,7 +357791,7 @@ _080B44A0: pop {r1} bx r1 .align 2, 0 -_080B44A8: .4byte 0x02020630 + .pool thumb_func_end sub_80B4438 thumb_func_start sub_80B44AC @@ -369945,7 +357822,7 @@ sub_80B44C8: @ 80B44C8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B455C + ldr r1, =0x03005e00 adds r4, r0, r1 adds r0, r4, 0 adds r0, 0xA @@ -369961,7 +357838,7 @@ sub_80B44C8: @ 80B44C8 adds r0, 0x1 strh r0, [r4, 0x16] _080B44FA: - ldr r1, _080B4560 + ldr r1, =0x0855076c movs r2, 0x8 ldrsh r0, [r4, r2] lsls r0, 2 @@ -370004,8 +357881,7 @@ _080B44FA: bl remove_task b _080B456E .align 2, 0 -_080B455C: .4byte 0x03005e00 -_080B4560: .4byte 0x0855076c + .pool _080B4564: ldr r2, [sp] ldrb r1, [r2] @@ -370023,7 +357899,7 @@ _080B456E: sub_80B4578: @ 80B4578 push {r4,lr} adds r4, r0, 0 - ldr r0, _080B45A4 + ldr r0, =sub_80B44C8 + 1 movs r1, 0 bl AddTask adds r1, r0, 0 @@ -370032,7 +357908,7 @@ sub_80B4578: @ 80B4578 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _080B45A8 + ldr r1, =0x03005e08 adds r0, r1 adds r0, 0x2 adds r1, r4, 0 @@ -370041,19 +357917,18 @@ sub_80B4578: @ 80B4578 pop {r0} bx r0 .align 2, 0 -_080B45A4: .4byte sub_80B44C8 + 1 -_080B45A8: .4byte 0x03005e08 + .pool thumb_func_end sub_80B4578 thumb_func_start sub_80B45AC sub_80B45AC: @ 80B45AC push {lr} - ldr r0, _080B45B8 + ldr r0, =sub_80B45BC + 1 bl sub_80B40C8 pop {r0} bx r0 .align 2, 0 -_080B45B8: .4byte sub_80B45BC + 1 + .pool thumb_func_end sub_80B45AC thumb_func_start sub_80B45BC @@ -370070,47 +357945,44 @@ sub_80B45BC: @ 80B45BC thumb_func_start sub_80B45D0 sub_80B45D0: @ 80B45D0 push {lr} - ldr r0, _080B45FC + ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x2 bne _080B4610 - ldr r1, _080B4600 + ldr r1, =0x02038bfc ldrb r0, [r1] cmp r0, 0 bne _080B460C adds r0, 0x1 strb r0, [r1] - ldr r1, _080B4604 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] bl sub_809757C - ldr r0, _080B4608 + ldr r0, =0x03006090 ldrb r0, [r0, 0xC] bl sub_80974D0 b _080B4616 .align 2, 0 -_080B45FC: .4byte 0x030060a8 -_080B4600: .4byte 0x02038bfc -_080B4604: .4byte 0x020375f0 -_080B4608: .4byte 0x03006090 + .pool _080B460C: movs r0, 0 strb r0, [r1] _080B4610: - ldr r1, _080B461C + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] _080B4616: pop {r0} bx r0 .align 2, 0 -_080B461C: .4byte 0x020375f0 + .pool thumb_func_end sub_80B45D0 thumb_func_start oei_exclamation_mark oei_exclamation_mark: @ 80B4620 push {lr} - ldr r0, _080B4650 + ldr r0, =0x085507b4 movs r1, 0 movs r2, 0 movs r3, 0x53 @@ -370122,7 +357994,7 @@ oei_exclamation_mark: @ 80B4620 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B4654 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 movs r2, 0 @@ -370132,14 +358004,13 @@ _080B4648: pop {r1} bx r1 .align 2, 0 -_080B4650: .4byte 0x085507b4 -_080B4654: .4byte 0x02020630 + .pool thumb_func_end oei_exclamation_mark thumb_func_start sub_80B4658 sub_80B4658: @ 80B4658 push {lr} - ldr r0, _080B4688 + ldr r0, =0x085507b4 movs r1, 0 movs r2, 0 movs r3, 0x52 @@ -370151,7 +358022,7 @@ sub_80B4658: @ 80B4658 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B468C + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x21 movs r2, 0x1 @@ -370161,14 +358032,13 @@ _080B4680: pop {r1} bx r1 .align 2, 0 -_080B4688: .4byte 0x085507b4 -_080B468C: .4byte 0x02020630 + .pool thumb_func_end sub_80B4658 thumb_func_start sub_80B4690 sub_80B4690: @ 80B4690 push {r4,lr} - ldr r0, _080B46D0 + ldr r0, =0x085507cc movs r1, 0 movs r2, 0 movs r3, 0x52 @@ -370180,7 +358050,7 @@ sub_80B4690: @ 80B4690 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080B46D4 + ldr r0, =0x02020630 adds r4, r0 adds r0, r4, 0 movs r1, 0x2E @@ -370198,8 +358068,7 @@ _080B46C6: pop {r1} bx r1 .align 2, 0 -_080B46D0: .4byte 0x085507cc -_080B46D4: .4byte 0x02020630 + .pool thumb_func_end sub_80B4690 thumb_func_start sub_80B46D8 @@ -370222,14 +358091,14 @@ sub_80B46D8: @ 80B46D8 orrs r3, r4 mov r4, r12 strb r3, [r4] - ldr r4, _080B471C + ldr r4, =0x02038c08 ldr r3, [r4] strh r3, [r0, 0x2E] ldr r3, [r4, 0x4] strh r3, [r0, 0x30] ldr r3, [r4, 0x8] strh r3, [r0, 0x32] - ldr r3, _080B4720 + ldr r3, =0x0000fffb strh r3, [r0, 0x34] strh r1, [r0, 0x3C] adds r1, r2, 0 @@ -370238,8 +358107,7 @@ sub_80B46D8: @ 80B46D8 pop {r0} bx r0 .align 2, 0 -_080B471C: .4byte 0x02038c08 -_080B4720: .4byte 0x0000fffb + .pool thumb_func_end sub_80B46D8 thumb_func_start objc_exclamation_mark_probably @@ -370276,7 +358144,7 @@ _080B4756: bl oe_stop b _080B47B2 _080B4764: - ldr r2, _080B47A8 + ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -370287,7 +358155,7 @@ _080B4764: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080B47AC + ldr r0, =0x02020630 adds r1, r0 ldrh r3, [r4, 0x34] ldrh r0, [r4, 0x36] @@ -370311,8 +358179,7 @@ _080B4764: strh r0, [r4, 0x34] b _080B47B2 .align 2, 0 -_080B47A8: .4byte 0x02037350 -_080B47AC: .4byte 0x02020630 + .pool _080B47B0: strh r2, [r4, 0x34] _080B47B2: @@ -370325,24 +358192,23 @@ _080B47B2: thumb_func_start sub_80B47BC sub_80B47BC: @ 80B47BC push {lr} - ldr r0, _080B47CC + ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 beq _080B47D4 - ldr r0, _080B47D0 + ldr r0, =0x03006090 ldrb r0, [r0, 0xC] b _080B47D8 .align 2, 0 -_080B47CC: .4byte 0x02038bfc -_080B47D0: .4byte 0x03006090 + .pool _080B47D4: - ldr r0, _080B47DC + ldr r0, =0x03006090 ldrb r0, [r0] _080B47D8: pop {r1} bx r1 .align 2, 0 -_080B47DC: .4byte 0x03006090 + .pool thumb_func_end sub_80B47BC thumb_func_start sub_80B47E0 @@ -370357,30 +358223,30 @@ sub_80B47E0: @ 80B47E0 _080B47EE: cmp r0, 0 beq _080B47FC - ldr r0, _080B47F8 + ldr r0, =0x03006090 ldrb r0, [r0, 0xC] b _080B4800 .align 2, 0 -_080B47F8: .4byte 0x03006090 + .pool _080B47FC: - ldr r0, _080B4804 + ldr r0, =0x03006090 ldrb r0, [r0] _080B4800: pop {r1} bx r1 .align 2, 0 -_080B4804: .4byte 0x03006090 + .pool thumb_func_end sub_80B47E0 thumb_func_start sub_80B4808 sub_80B4808: @ 80B4808 push {lr} - ldr r0, _080B4858 + ldr r0, =0x030060ac ldrb r0, [r0] cmp r0, 0x1 bne _080B4870 - ldr r2, _080B485C - ldr r0, _080B4860 + ldr r2, =0x03006090 + ldr r0, =0x03006080 ldrh r1, [r0] lsls r0, r1, 1 adds r0, r1 @@ -370390,7 +358256,7 @@ sub_80B4808: @ 80B4808 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B4864 + ldr r1, =0x02037350 adds r0, r1 ldrb r0, [r0, 0x18] lsls r0, 28 @@ -370399,11 +358265,11 @@ sub_80B4808: @ 80B4808 lsls r0, 24 lsrs r0, 24 bl d2s_look1 - ldr r3, _080B4868 + ldr r3, =0x03006084 strb r0, [r3] movs r0, 0xFE strb r0, [r3, 0x1] - ldr r0, _080B486C + ldr r0, =0x03005d8c ldr r0, [r0] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -370411,29 +358277,24 @@ sub_80B4808: @ 80B4808 bl exec_movement b _080B489E .align 2, 0 -_080B4858: .4byte 0x030060ac -_080B485C: .4byte 0x03006090 -_080B4860: .4byte 0x03006080 -_080B4864: .4byte 0x02037350 -_080B4868: .4byte 0x03006084 -_080B486C: .4byte 0x03005d8c + .pool _080B4870: - ldr r0, _080B48A8 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B48AC + ldr r1, =0x02037350 adds r0, r1 ldrb r0, [r0, 0x18] lsls r0, 28 lsrs r0, 28 bl d2s_look1 - ldr r3, _080B48B0 + ldr r3, =0x03006084 strb r0, [r3] movs r0, 0xFE strb r0, [r3, 0x1] - ldr r0, _080B48B4 + ldr r0, =0x03005d8c ldr r0, [r0] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -370445,19 +358306,16 @@ _080B489E: pop {r0} bx r0 .align 2, 0 -_080B48A8: .4byte 0x02037590 -_080B48AC: .4byte 0x02037350 -_080B48B0: .4byte 0x03006084 -_080B48B4: .4byte 0x03005d8c + .pool thumb_func_end sub_80B4808 thumb_func_start sub_80B48B8 sub_80B48B8: @ 80B48B8 - ldr r1, _080B48C0 + ldr r1, =0x02038c00 strb r0, [r1] bx lr .align 2, 0 -_080B48C0: .4byte 0x02038c00 + .pool thumb_func_end sub_80B48B8 thumb_func_start sub_80B48C4 @@ -370476,7 +358334,7 @@ sub_80B48C4: @ 80B48C4 str r1, [sp, 0x4] lsls r2, 24 lsrs r2, 24 - ldr r3, _080B494C + ldr r3, =0x08553a7c lsls r1, r2, 1 adds r1, r2 lsls r2, r1, 1 @@ -370493,7 +358351,7 @@ sub_80B48C4: @ 80B48C4 ldrh r5, [r2] cmp r5, r9 bhi _080B496E - ldr r0, _080B4950 + ldr r0, =0x02037318 mov r10, r0 _080B4906: movs r4, 0 @@ -370530,8 +358388,7 @@ _080B4920: adds r0, r6, 0 b _080B4974 .align 2, 0 -_080B494C: .4byte 0x08553a7c -_080B4950: .4byte 0x02037318 + .pool _080B4954: adds r0, r4, 0x1 lsls r0, 16 @@ -370570,7 +358427,7 @@ sub_80B4984: @ 80B4984 push {r6,r7} sub sp, 0x10 movs r7, 0 - ldr r0, _080B49FC + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0x88 @@ -370591,7 +358448,7 @@ sub_80B4984: @ 80B4984 strh r0, [r4] movs r0, 0 ldrsh r1, [r4, r0] - ldr r0, _080B4A00 + ldr r0, =0x08553a7c mov r9, r5 mov r8, r4 ldrh r2, [r0, 0x6] @@ -370624,20 +358481,19 @@ _080B49E4: bls _080B4A08 b _080B4A7A .align 2, 0 -_080B49FC: .4byte 0x03005d8c -_080B4A00: .4byte 0x08553a7c + .pool _080B4A04: movs r0, 0x1 b _080B4A7C _080B4A08: - ldr r0, _080B4A8C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _080B4A90 + ldr r3, =0x00002e6a adds r0, r3 ldrh r0, [r0] bl sub_80B4AB8 movs r5, 0 - ldr r6, _080B4A94 + ldr r6, =0x000001bf _080B4A1A: bl sub_80B4A98 lsls r1, r5, 1 @@ -370698,37 +358554,33 @@ _080B4A7C: pop {r1} bx r1 .align 2, 0 -_080B4A8C: .4byte 0x03005d8c -_080B4A90: .4byte 0x00002e6a -_080B4A94: .4byte 0x000001bf + .pool thumb_func_end sub_80B4984 thumb_func_start sub_80B4A98 sub_80B4A98: @ 80B4A98 - ldr r2, _080B4AAC + ldr r2, =0x02038c04 ldr r1, [r2] - ldr r0, _080B4AB0 + ldr r0, =0x41c64e6d muls r0, r1 - ldr r1, _080B4AB4 + ldr r1, =0x00003039 adds r0, r1 str r0, [r2] lsrs r0, 16 bx lr .align 2, 0 -_080B4AAC: .4byte 0x02038c04 -_080B4AB0: .4byte 0x41c64e6d -_080B4AB4: .4byte 0x00003039 + .pool thumb_func_end sub_80B4A98 thumb_func_start sub_80B4AB8 sub_80B4AB8: @ 80B4AB8 lsls r0, 16 lsrs r0, 16 - ldr r1, _080B4AC4 + ldr r1, =0x02038c04 str r0, [r1] bx lr .align 2, 0 -_080B4AC4: .4byte 0x02038c04 + .pool thumb_func_end sub_80B4AB8 thumb_func_start wild_pokemon_rand_grass @@ -371004,7 +358856,7 @@ _080B4C8A: bl __modsi3 lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _080B4CDC + ldr r5, =0x020244ec adds r0, r5, 0 movs r1, 0x6 bl pokemon_getattr @@ -371031,7 +358883,7 @@ _080B4CC8: adds r0, r6, 0 b _080B4CF0 .align 2, 0 -_080B4CDC: .4byte 0x020244ec + .pool _080B4CE0: cmp r4, 0 beq _080B4CEA @@ -371052,19 +358904,19 @@ _080B4CF0: get_wild_data_index_for_map: @ 80B4CF8 push {r4-r6,lr} movs r4, 0 - ldr r0, _080B4D48 + ldr r0, =0x08552d48 ldrb r1, [r0] adds r5, r0, 0 cmp r1, 0xFF beq _080B4D6C - ldr r6, _080B4D4C + ldr r6, =0x00006a18 _080B4D08: lsls r0, r4, 2 adds r0, r4 lsls r0, 2 adds r3, r0, r5 ldrb r1, [r3] - ldr r0, _080B4D50 + ldr r0, =0x03005d8c ldr r2, [r0] movs r0, 0x4 ldrsb r0, [r2, r0] @@ -371078,7 +358930,7 @@ _080B4D08: ldrh r0, [r2, 0x4] cmp r0, r6 bne _080B4D44 - ldr r0, _080B4D54 + ldr r0, =0x0000403e bl var_get lsls r0, 16 lsrs r0, 16 @@ -371093,10 +358945,7 @@ _080B4D44: adds r0, r4, 0 b _080B4D6E .align 2, 0 -_080B4D48: .4byte 0x08552d48 -_080B4D4C: .4byte 0x00006a18 -_080B4D50: .4byte 0x03005d8c -_080B4D54: .4byte 0x0000403e + .pool _080B4D58: adds r0, r4, 0x1 lsls r0, 16 @@ -371109,13 +358958,13 @@ _080B4D58: cmp r0, 0xFF bne _080B4D08 _080B4D6C: - ldr r0, _080B4D74 + ldr r0, =0x0000ffff _080B4D6E: pop {r4-r6} pop {r1} bx r1 .align 2, 0 -_080B4D74: .4byte 0x0000ffff + .pool thumb_func_end get_wild_data_index_for_map thumb_func_start sub_80B4D78 @@ -371196,7 +359045,7 @@ _080B4DF2: cmp r5, 0x18 bls _080B4DF2 _080B4E0E: - ldr r4, _080B4E44 + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr @@ -371220,7 +359069,7 @@ _080B4E0E: bl pokemon_getattr b _080B4E54 .align 2, 0 -_080B4E44: .4byte 0x020244ec + .pool _080B4E48: ldrb r0, [r4] b _080B4E5E @@ -371250,7 +359099,7 @@ sub_80B4E68: @ 80B4E68 lsrs r7, r1, 24 bl zero_enemy_party_data movs r2, 0x1 - ldr r1, _080B4EF8 + ldr r1, =0x083203cc lsls r0, r6, 3 subs r0, r6 lsls r0, 2 @@ -371269,7 +359118,7 @@ _080B4E96: _080B4E98: cmp r2, 0 beq _080B4F28 - ldr r5, _080B4EFC + ldr r5, =0x020244ec adds r0, r5, 0 movs r1, 0x6 bl pokemon_getattr @@ -371308,15 +359157,14 @@ _080B4E98: movs r4, 0 b _080B4F02 .align 2, 0 -_080B4EF8: .4byte 0x083203cc -_080B4EFC: .4byte 0x020244ec + .pool _080B4F00: movs r4, 0xFE _080B4F02: bl sub_80B4D78 lsls r0, 24 lsrs r0, 24 - ldr r1, _080B4F24 + ldr r1, =0x02024744 str r4, [sp] str r0, [sp, 0x4] movs r0, 0 @@ -371328,12 +359176,12 @@ _080B4F02: bl sub_8067EF8 b _080B4F40 .align 2, 0 -_080B4F24: .4byte 0x02024744 + .pool _080B4F28: bl sub_80B4D78 lsls r0, 24 lsrs r0, 24 - ldr r1, _080B4F48 + ldr r1, =0x02024744 str r0, [sp] adds r0, r1, 0 adds r1, r6, 0 @@ -371346,7 +359194,7 @@ _080B4F40: pop {r0} bx r0 .align 2, 0 -_080B4F48: .4byte 0x02024744 + .pool thumb_func_end sub_80B4E68 thumb_func_start sub_80B4F4C @@ -371425,7 +359273,7 @@ _080B4FBA: cmp r0, 0 beq _080B5000 _080B4FE0: - ldr r0, _080B5004 + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] movs r0, 0xB3 lsls r0, 1 @@ -371444,7 +359292,7 @@ _080B5000: movs r0, 0 b _080B501C .align 2, 0 -_080B5004: .4byte 0x02037318 + .pool _080B5008: mov r0, sp ldrb r0, [r0] @@ -371499,9 +359347,9 @@ sub_80B505C: @ 80B505C ands r0, r1 cmp r0, 0 beq _080B508C - ldr r0, _080B5084 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080B5088 + ldr r1, =0x00002b94 adds r0, r1 ldrb r0, [r0] bl sub_80B58CC @@ -371511,12 +359359,11 @@ sub_80B505C: @ 80B505C movs r0, 0 b _080B50C6 .align 2, 0 -_080B5084: .4byte 0x03005d8c -_080B5088: .4byte 0x00002b94 + .pool _080B508C: - ldr r0, _080B50CC + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r2, _080B50D0 + ldr r2, =0x00002b90 adds r0, r1, r2 ldrh r0, [r0] adds r2, 0x4 @@ -371525,16 +359372,16 @@ _080B508C: bl sub_80B4E68 movs r4, 0 _080B50A2: - ldr r0, _080B50CC + ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _080B50D4 + ldr r2, =0x00002b98 adds r0, r2 adds r0, r1 ldrh r1, [r0] lsls r2, r4, 24 lsrs r2, 24 - ldr r0, _080B50D8 + ldr r0, =0x02024744 bl sub_80691F4 adds r0, r4, 0x1 lsls r0, 16 @@ -371547,25 +359394,22 @@ _080B50C6: pop {r1} bx r1 .align 2, 0 -_080B50CC: .4byte 0x03005d8c -_080B50D0: .4byte 0x00002b90 -_080B50D4: .4byte 0x00002b98 -_080B50D8: .4byte 0x02024744 + .pool thumb_func_end sub_80B505C thumb_func_start sub_80B50DC sub_80B50DC: @ 80B50DC push {r4,lr} - ldr r4, _080B512C + ldr r4, =0x03005d8c ldr r2, [r4] - ldr r1, _080B5130 + ldr r1, =0x00002b90 adds r0, r2, r1 ldrh r0, [r0] cmp r0, 0 beq _080B513C movs r1, 0x5 ldrsb r1, [r2, r1] - ldr r3, _080B5134 + ldr r3, =0x00002b92 adds r0, r2, r3 ldrb r0, [r0] cmp r1, r0 @@ -371583,7 +359427,7 @@ sub_80B50DC: @ 80B50DC movs r1, 0x64 bl __umodsi3 ldr r1, [r4] - ldr r2, _080B5138 + ldr r2, =0x00002ba1 adds r1, r2 lsls r0, 16 lsrs r0, 16 @@ -371593,10 +359437,7 @@ sub_80B50DC: @ 80B50DC movs r0, 0x1 b _080B513E .align 2, 0 -_080B512C: .4byte 0x03005d8c -_080B5130: .4byte 0x00002b90 -_080B5134: .4byte 0x00002b92 -_080B5138: .4byte 0x00002ba1 + .pool _080B513C: movs r0, 0 _080B513E: @@ -371659,7 +359500,7 @@ _080B519A: bl sub_80B5AF0 cmp r4, 0 bne _080B5216 - ldr r4, _080B51DC + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr @@ -371671,9 +359512,9 @@ _080B519A: lsrs r0, 24 cmp r0, 0x1 bne _080B51E8 - ldr r0, _080B51E0 + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] - ldr r0, _080B51E4 + ldr r0, =0x00000169 cmp r1, r0 bne _080B5210 ldr r1, [sp] @@ -371682,9 +359523,7 @@ _080B519A: lsrs r0, 2 b _080B5214 .align 2, 0 -_080B51DC: .4byte 0x020244ec -_080B51E0: .4byte 0x02037318 -_080B51E4: .4byte 0x00000169 + .pool _080B51E8: cmp r0, 0x23 bne _080B51F2 @@ -371702,7 +359541,7 @@ _080B51F2: _080B5200: cmp r0, 0x8 bne _080B5216 - ldr r0, _080B5238 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x2E ldrb r0, [r0] @@ -371732,7 +359571,7 @@ _080B5222: pop {r1} bx r1 .align 2, 0 -_080B5238: .4byte 0x03005d8c + .pool thumb_func_end sub_80B5170 thumb_func_start sub_80B523C @@ -371759,7 +359598,7 @@ _080B525A: thumb_func_start sub_80B5260 sub_80B5260: @ 80B5260 push {lr} - ldr r0, _080B527C + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0xE0 @@ -371772,7 +359611,7 @@ sub_80B5260: @ 80B5260 lsrs r0, 24 b _080B5282 .align 2, 0 -_080B527C: .4byte 0x03005d8c + .pool _080B5280: movs r0, 0 _080B5282: @@ -371792,7 +359631,7 @@ is_it_battle_time_2: @ 80B5288 lsls r1, 16 lsrs r7, r1, 16 mov r8, r7 - ldr r0, _080B5320 + ldr r0, =0x02038c00 ldrb r0, [r0] cmp r0, 0x1 bne _080B52A6 @@ -371801,10 +359640,10 @@ _080B52A6: bl get_wild_data_index_for_map lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _080B5324 + ldr r0, =0x0000ffff cmp r5, r0 bne _080B539C - ldr r0, _080B5328 + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] movs r0, 0xB3 lsls r0, 1 @@ -371821,7 +359660,7 @@ _080B52A6: bne _080B52D8 b _080B54FE _080B52D8: - ldr r1, _080B532C + ldr r1, =0x08553a14 lsls r0, r5, 2 adds r0, r5 lsls r0, 2 @@ -371857,19 +359696,16 @@ _080B5318: movs r0, 0x1 b _080B5500 .align 2, 0 -_080B5320: .4byte 0x02038c00 -_080B5324: .4byte 0x0000ffff -_080B5328: .4byte 0x02037318 -_080B532C: .4byte 0x08553a14 + .pool _080B5330: - ldr r0, _080B538C + ldr r0, =0x00000169 cmp r1, r0 beq _080B5338 b _080B54FE _080B5338: - ldr r0, _080B5390 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _080B5394 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r5, [r0] cmp r7, r6 @@ -371880,7 +359716,7 @@ _080B5338: bne _080B5352 b _080B54FE _080B5352: - ldr r1, _080B5398 + ldr r1, =0x08553894 lsls r0, r5, 2 adds r0, r5 lsls r0, 2 @@ -371909,10 +359745,7 @@ _080B5386: bl sub_81A9C04 b _080B54F6 .align 2, 0 -_080B538C: .4byte 0x00000169 -_080B5390: .4byte 0x03005d90 -_080B5394: .4byte 0x00000cb2 -_080B5398: .4byte 0x08553894 + .pool _080B539C: lsls r0, r6, 24 lsrs r4, r0, 24 @@ -371922,7 +359755,7 @@ _080B539C: lsrs r0, 24 cmp r0, 0x1 bne _080B543C - ldr r1, _080B5438 + ldr r1, =0x08552d48 lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 2 @@ -371942,7 +359775,7 @@ _080B53C4: bne _080B53D4 b _080B54FE _080B53D4: - ldr r1, _080B5438 + ldr r1, =0x08552d48 adds r0, r4, r5 lsls r0, 2 adds r1, 0x4 @@ -371974,7 +359807,7 @@ _080B53F2: cmp r0, 0x1 beq _080B54F6 _080B5418: - ldr r1, _080B5438 + ldr r1, =0x08552d48 adds r0, r4, r5 lsls r0, 2 adds r1, 0x4 @@ -371989,7 +359822,7 @@ _080B5418: beq _080B54F6 b _080B54FE .align 2, 0 -_080B5438: .4byte 0x08552d48 + .pool _080B543C: adds r0, r4, 0 bl sub_8089558 @@ -372014,7 +359847,7 @@ _080B5464: lsrs r0, 24 cmp r0, 0x1 beq _080B54FE - ldr r1, _080B54D8 + ldr r1, =0x08552d48 lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 2 @@ -372031,7 +359864,7 @@ _080B5464: cmp r0, 0 beq _080B54FE _080B5492: - ldr r1, _080B54D8 + ldr r1, =0x08552d48 adds r0, r4, r5 lsls r0, 2 adds r1, 0x8 @@ -372050,9 +359883,9 @@ _080B5492: cmp r0, 0x1 bne _080B54E4 _080B54BA: - ldr r0, _080B54DC + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080B54E0 + ldr r1, =0x000031dc adds r0, r1 ldrb r0, [r0, 0xC] bl sub_80B58CC @@ -372063,9 +359896,7 @@ _080B54BA: movs r0, 0x1 b _080B5500 .align 2, 0 -_080B54D8: .4byte 0x08552d48 -_080B54DC: .4byte 0x03005d8c -_080B54E0: .4byte 0x000031dc + .pool _080B54E4: ldr r0, [r4] movs r1, 0x1 @@ -372096,10 +359927,10 @@ sub_80B550C: @ 80B550C bl get_wild_data_index_for_map lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _080B555C + ldr r0, =0x0000ffff cmp r2, r0 beq _080B5568 - ldr r1, _080B5560 + ldr r1, =0x08552d48 lsls r0, r2, 2 adds r0, r2 lsls r0, 2 @@ -372125,15 +359956,13 @@ sub_80B550C: @ 80B550C bne _080B5568 bl sub_80B0698 _080B5554: - ldr r0, _080B5564 + ldr r0, =0x020375f0 strh r4, [r0] b _080B556E .align 2, 0 -_080B555C: .4byte 0x0000ffff -_080B5560: .4byte 0x08552d48 -_080B5564: .4byte 0x020375f0 + .pool _080B5568: - ldr r1, _080B5574 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] _080B556E: @@ -372141,7 +359970,7 @@ _080B556E: pop {r0} bx r0 .align 2, 0 -_080B5574: .4byte 0x020375f0 + .pool thumb_func_end sub_80B550C thumb_func_start sub_80B5578 @@ -372156,10 +359985,10 @@ sub_80B5578: @ 80B5578 bl get_wild_data_index_for_map lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _080B55D8 + ldr r0, =0x0000ffff cmp r4, r0 bne _080B562C - ldr r0, _080B55DC + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] movs r0, 0xB3 lsls r0, 1 @@ -372168,7 +359997,7 @@ sub_80B5578: @ 80B5578 bl sub_81A7D00 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080B55E0 + ldr r1, =0x08553a14 lsls r0, r4, 2 adds r0, r4 lsls r0, 2 @@ -372190,21 +360019,19 @@ _080B55CA: movs r0, 0x1 b _080B56F4 .align 2, 0 -_080B55D8: .4byte 0x0000ffff -_080B55DC: .4byte 0x02037318 -_080B55E0: .4byte 0x08553a14 + .pool _080B55E4: - ldr r0, _080B561C + ldr r0, =0x00000169 cmp r1, r0 beq _080B55EC b _080B56F2 _080B55EC: - ldr r0, _080B5620 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _080B5624 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r4, [r0] - ldr r1, _080B5628 + ldr r1, =0x08553894 lsls r0, r4, 2 adds r0, r4 lsls r0, 2 @@ -372221,10 +360048,7 @@ _080B55EC: bl sub_81A9C04 b _080B56EA .align 2, 0 -_080B561C: .4byte 0x00000169 -_080B5620: .4byte 0x03005d90 -_080B5624: .4byte 0x00000cb2 -_080B5628: .4byte 0x08553894 + .pool _080B562C: mov r0, sp movs r2, 0 @@ -372239,7 +360063,7 @@ _080B562C: lsrs r0, 24 cmp r0, 0x1 bne _080B568C - ldr r1, _080B567C + ldr r1, =0x08552d48 lsls r0, r4, 2 adds r0, r4 lsls r0, 2 @@ -372262,7 +360086,7 @@ _080B562C: bl sub_80B505C b _080B56EA .align 2, 0 -_080B567C: .4byte 0x08552d48 + .pool _080B5680: adds r0, r4, 0 movs r1, 0 @@ -372288,7 +360112,7 @@ _080B568C: lsrs r0, 24 cmp r0, 0x1 beq _080B56F2 - ldr r1, _080B56DC + ldr r1, =0x08552d48 lsls r0, r4, 2 adds r0, r4 lsls r0, 2 @@ -372307,7 +360131,7 @@ _080B56D4: movs r0, 0x1 b _080B56F4 .align 2, 0 -_080B56DC: .4byte 0x08552d48 + .pool _080B56E0: adds r0, r4, 0 movs r1, 0x1 @@ -372332,10 +360156,10 @@ sub_80B56FC: @ 80B56FC bl get_wild_data_index_for_map lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _080B5724 + ldr r0, =0x0000ffff cmp r2, r0 beq _080B572C - ldr r0, _080B5728 + ldr r0, =0x08552d48 lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -372347,8 +360171,7 @@ sub_80B56FC: @ 80B56FC movs r0, 0x1 b _080B572E .align 2, 0 -_080B5724: .4byte 0x0000ffff -_080B5728: .4byte 0x08552d48 + .pool _080B572C: movs r0, 0 _080B572E: @@ -372366,7 +360189,7 @@ sub_80B5734: @ 80B5734 lsrs r0, 24 cmp r0, 0x1 bne _080B5764 - ldr r4, _080B5760 + ldr r4, =0x08553a78 adds r0, r4, 0 bl sub_80B4C74 adds r1, r0, 0 @@ -372377,9 +360200,9 @@ sub_80B5734: @ 80B5734 bl sub_80B4E68 b _080B5784 .align 2, 0 -_080B5760: .4byte 0x08553a78 + .pool _080B5764: - ldr r4, _080B579C + ldr r4, =0x08552d48 bl get_wild_data_index_for_map lsls r0, 16 lsrs r0, 16 @@ -372403,7 +360226,7 @@ _080B5784: pop {r0} bx r0 .align 2, 0 -_080B579C: .4byte 0x08552d48 + .pool thumb_func_end sub_80B5734 thumb_func_start wild_pokemon_rand_for_map @@ -372415,10 +360238,10 @@ wild_pokemon_rand_for_map: @ 80B57A0 bl get_wild_data_index_for_map lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _080B57D8 + ldr r0, =0x0000ffff cmp r3, r0 beq _080B57D2 - ldr r2, _080B57DC + ldr r2, =0x08552d48 lsls r1, r3, 2 adds r1, r3 lsls r1, 2 @@ -372436,8 +360259,7 @@ _080B57D2: movs r0, 0 b _080B5826 .align 2, 0 -_080B57D8: .4byte 0x0000ffff -_080B57DC: .4byte 0x08552d48 + .pool _080B57E0: cmp r4, 0 bne _080B57F4 @@ -372485,10 +360307,10 @@ sub_80B582C: @ 80B582C bl get_wild_data_index_for_map lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _080B5860 + ldr r0, =0x0000ffff cmp r2, r0 beq _080B5868 - ldr r1, _080B5864 + ldr r1, =0x08552d48 lsls r0, r2, 2 adds r0, r2 lsls r0, 2 @@ -372505,8 +360327,7 @@ sub_80B582C: @ 80B582C ldrh r0, [r0, 0x2] b _080B586A .align 2, 0 -_080B5860: .4byte 0x0000ffff -_080B5864: .4byte 0x08552d48 + .pool _080B5868: movs r0, 0 _080B586A: @@ -372529,7 +360350,7 @@ sub_80B5870: @ 80B5870 bl in_trade_center cmp r0, 0x1 beq _080B58C4 - ldr r5, _080B58BC + ldr r5, =0x00004021 adds r0, r5, 0 bl var_get lsls r0, 16 @@ -372544,13 +360365,12 @@ sub_80B5870: @ 80B5870 bl var_set cmp r4, 0 bne _080B58C4 - ldr r0, _080B58C0 + ldr r0, =0x082a4b2a bl script_env_1_execute_new_script movs r0, 0x1 b _080B58C6 .align 2, 0 -_080B58BC: .4byte 0x00004021 -_080B58C0: .4byte 0x082a4b2a + .pool _080B58C4: movs r0, 0 _080B58C6: @@ -372564,7 +360384,7 @@ sub_80B58CC: @ 80B58CC push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080B5918 + ldr r0, =0x00004021 bl var_get lsls r0, 16 cmp r0, 0 @@ -372574,7 +360394,7 @@ _080B58E0: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080B591C + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x39 @@ -372597,8 +360417,7 @@ _080B5912: movs r0, 0x1 b _080B592C .align 2, 0 -_080B5918: .4byte 0x00004021 -_080B591C: .4byte 0x020244ec + .pool _080B5920: adds r0, r5, 0x1 lsls r0, 24 @@ -372618,7 +360437,7 @@ sub_80B5934: @ 80B5934 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080B5984 + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr @@ -372653,7 +360472,7 @@ _080B595A: movs r0, 0 b _080B598A .align 2, 0 -_080B5984: .4byte 0x020244ec + .pool _080B5988: movs r0, 0x1 _080B598A: @@ -372703,7 +360522,7 @@ _080B59D2: movs r3, 0 cmp r4, r2 bcs _080B5A12 - ldr r6, _080B5A20 + ldr r6, =0x083203cc mov r10, r6 _080B59DE: lsls r0, r3, 2 @@ -372743,7 +360562,7 @@ _080B5A1A: movs r0, 0 b _080B5A3C .align 2, 0 -_080B5A20: .4byte 0x083203cc + .pool _080B5A24: bl GenerateRandomNumber lsls r0, 16 @@ -372778,7 +360597,7 @@ sub_80B5A50: @ 80B5A50 lsrs r6, r1, 24 lsls r2, 24 lsrs r5, r2, 24 - ldr r4, _080B5AA0 + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr @@ -372806,7 +360625,7 @@ sub_80B5A50: @ 80B5A50 lsrs r0, 24 b _080B5AA6 .align 2, 0 -_080B5AA0: .4byte 0x020244ec + .pool _080B5AA4: movs r0, 0 _080B5AA6: @@ -372821,7 +360640,7 @@ _080B5AA6: sub_80B5AB0: @ 80B5AB0 push {r4,lr} adds r4, r0, 0 - ldr r0, _080B5ACC + ldr r0, =0x000008ad bl flag_check lsls r0, 24 lsrs r0, 24 @@ -372832,9 +360651,9 @@ sub_80B5AB0: @ 80B5AB0 adds r0, r1 b _080B5AE2 .align 2, 0 -_080B5ACC: .4byte 0x000008ad + .pool _080B5AD0: - ldr r0, _080B5AEC + ldr r0, =0x000008ae bl flag_check lsls r0, 24 lsrs r0, 24 @@ -372849,14 +360668,14 @@ _080B5AE4: pop {r0} bx r0 .align 2, 0 -_080B5AEC: .4byte 0x000008ae + .pool thumb_func_end sub_80B5AB0 thumb_func_start sub_80B5AF0 sub_80B5AF0: @ 80B5AF0 push {r4,lr} adds r4, r0, 0 - ldr r0, _080B5B14 + ldr r0, =0x020244ec movs r1, 0xC bl pokemon_getattr cmp r0, 0xBE @@ -372871,7 +360690,7 @@ _080B5B0C: pop {r0} bx r0 .align 2, 0 -_080B5B14: .4byte 0x020244ec + .pool thumb_func_end sub_80B5AF0 thumb_func_start oe_exec @@ -372883,13 +360702,13 @@ oe_exec: @ 80B5B18 lsrs r4, 24 adds r0, r4, 0 bl oe_active_list_add - ldr r0, _080B5B58 + ldr r0, =0x082db9d4 lsls r4, 2 adds r4, r0 ldr r0, [r4] str r0, [sp] add r4, sp, 0x4 - ldr r5, _080B5B5C + ldr r5, =0x0855c1f0 _080B5B36: ldr r0, [sp] ldrb r0, [r0] @@ -372908,8 +360727,7 @@ _080B5B36: pop {r1} bx r1 .align 2, 0 -_080B5B58: .4byte 0x082db9d4 -_080B5B5C: .4byte 0x0855c1f0 + .pool thumb_func_end oe_exec thumb_func_start oec00_load_gfx @@ -373050,7 +360868,7 @@ oec00_load_gfx_impl: @ 80B5C3C ldrh r0, [r5, 0x6] bl gpu_tile_obj_tag_get_range_start lsls r0, 16 - ldr r1, _080B5C68 + ldr r1, =0xffff0000 cmp r0, r1 bne _080B5C5A adds r0, r5, 0 @@ -373063,7 +360881,7 @@ _080B5C5A: pop {r0} bx r0 .align 2, 0 -_080B5C68: .4byte 0xffff0000 + .pool thumb_func_end oec00_load_gfx_impl thumb_func_start sub_80B5C6C @@ -373156,11 +360974,11 @@ gpu_tile_obj_free_by_ado_when_unused_maybe: @ 80B5D04 bl gpu_tile_obj_tag_get_by_range_start lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _080B5D60 + ldr r0, =0x0000ffff cmp r3, r0 beq _080B5D58 movs r2, 0 - ldr r5, _080B5D64 + ldr r5, =0x02020630 _080B5D1E: lsls r0, r2, 4 adds r0, r2 @@ -373196,8 +361014,7 @@ _080B5D58: pop {r0} bx r0 .align 2, 0 -_080B5D60: .4byte 0x0000ffff -_080B5D64: .4byte 0x02020630 + .pool thumb_func_end gpu_tile_obj_free_by_ado_when_unused_maybe thumb_func_start gpu_pal_free_by_index_when_unused @@ -373209,11 +361026,11 @@ gpu_pal_free_by_index_when_unused: @ 80B5D68 bl gpu_pal_tag_by_index lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _080B5DB8 + ldr r0, =0x0000ffff cmp r5, r0 beq _080B5DB0 movs r2, 0 - ldr r6, _080B5DBC + ldr r6, =0x02020630 adds r3, r4, 0 _080B5D84: lsls r0, r2, 4 @@ -373243,15 +361060,14 @@ _080B5DB0: pop {r0} bx r0 .align 2, 0 -_080B5DB8: .4byte 0x0000ffff -_080B5DBC: .4byte 0x02020630 + .pool thumb_func_end gpu_pal_free_by_index_when_unused thumb_func_start oe_active_list_clear oe_active_list_clear: @ 80B5DC0 push {r4,lr} movs r2, 0 - ldr r4, _080B5DE0 + ldr r4, =0x03000f58 movs r3, 0xFF _080B5DC8: adds r0, r2, r4 @@ -373267,7 +361083,7 @@ _080B5DC8: pop {r0} bx r0 .align 2, 0 -_080B5DE0: .4byte 0x03000f58 + .pool thumb_func_end oe_active_list_clear thumb_func_start oe_active_list_add @@ -373276,7 +361092,7 @@ oe_active_list_add: @ 80B5DE4 lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r4, _080B5DFC + ldr r4, =0x03000f58 _080B5DEE: adds r1, r2, r4 ldrb r0, [r1] @@ -373285,7 +361101,7 @@ _080B5DEE: strb r3, [r1] b _080B5E0A .align 2, 0 -_080B5DFC: .4byte 0x03000f58 + .pool _080B5E00: adds r0, r2, 0x1 lsls r0, 24 @@ -373304,7 +361120,7 @@ oe_active_list_remove: @ 80B5E10 lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r4, _080B5E2C + ldr r4, =0x03000f58 movs r5, 0xFF _080B5E1C: adds r1, r2, r4 @@ -373315,7 +361131,7 @@ _080B5E1C: strb r0, [r1] b _080B5E3A .align 2, 0 -_080B5E2C: .4byte 0x03000f58 + .pool _080B5E30: adds r0, r2, 0x1 lsls r0, 24 @@ -373334,7 +361150,7 @@ oe_active_list_contains: @ 80B5E40 lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _080B5E58 + ldr r3, =0x03000f58 _080B5E4A: adds r0, r1, r3 ldrb r0, [r0] @@ -373343,7 +361159,7 @@ _080B5E4A: movs r0, 0x1 b _080B5E68 .align 2, 0 -_080B5E58: .4byte 0x03000f58 + .pool _080B5E5C: adds r0, r1, 0x1 lsls r0, 24 @@ -373378,13 +361194,13 @@ sub_80B5E6C: @ 80B5E6C lsrs r0, 24 mov r9, r0 lsrs r4, 21 - ldr r3, _080B5EF4 + ldr r3, =0x0830593c mov r8, r3 add r8, r4 mov r0, r8 adds r1, r7, 0 bl gpu_pal_obj_decompress_and_apply2 - ldr r0, _080B5EF8 + ldr r0, =0x08305654 adds r4, r0 adds r0, r4, 0 adds r1, r7, 0 @@ -373396,14 +361212,14 @@ sub_80B5E6C: @ 80B5E6C mov r3, r8 ldrh r0, [r3, 0x4] strh r0, [r1, 0x2] - ldr r0, _080B5EFC + ldr r0, =0x0855c210 str r0, [sp, 0x4] - ldr r0, _080B5F00 + ldr r0, =0x082ec69c str r0, [sp, 0x8] str r2, [sp, 0xC] - ldr r0, _080B5F04 + ldr r0, =0x082ec6a8 str r0, [sp, 0x10] - ldr r0, _080B5F08 + ldr r0, =nullsub_12 + 1 str r0, [sp, 0x14] lsls r5, 16 asrs r5, 16 @@ -373424,12 +361240,7 @@ sub_80B5E6C: @ 80B5E6C pop {r1} bx r1 .align 2, 0 -_080B5EF4: .4byte 0x0830593c -_080B5EF8: .4byte 0x08305654 -_080B5EFC: .4byte 0x0855c210 -_080B5F00: .4byte 0x082ec69c -_080B5F04: .4byte 0x082ec6a8 -_080B5F08: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80B5E6C thumb_func_start sub_80B5F0C @@ -373441,12 +361252,12 @@ sub_80B5F0C: @ 80B5F0C lsls r4, 24 lsls r5, 16 lsrs r5, 16 - ldr r0, _080B5F3C + ldr r0, =0x08305654 lsrs r4, 21 adds r0, r4, r0 ldr r0, [r0] bl call_LZZUnCompVram - ldr r0, _080B5F40 + ldr r0, =0x0830593c adds r4, r0 ldr r0, [r4] adds r1, r5, 0 @@ -373456,8 +361267,7 @@ sub_80B5F0C: @ 80B5F0C pop {r0} bx r0 .align 2, 0 -_080B5F3C: .4byte 0x08305654 -_080B5F40: .4byte 0x0830593c + .pool thumb_func_end sub_80B5F0C thumb_func_start sub_80B5F44 @@ -373472,9 +361282,9 @@ sub_80B5F44: @ 80B5F44 lsrs r5, 16 lsls r6, 24 lsrs r6, 24 - ldr r0, _080B5F7C + ldr r0, =0x0855c230 bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _080B5F80 + ldr r0, =0x0855c244 lsls r4, 16 asrs r4, 16 lsls r5, 16 @@ -373489,8 +361299,7 @@ sub_80B5F44: @ 80B5F44 pop {r1} bx r1 .align 2, 0 -_080B5F7C: .4byte 0x0855c230 -_080B5F80: .4byte 0x0855c244 + .pool thumb_func_end sub_80B5F44 thumb_func_start sub_80B5F84 @@ -373509,7 +361318,7 @@ sub_80B5F84: @ 80B5F84 str r2, [sp, 0x4] movs r1, 0 str r1, [sp, 0x8] - ldr r1, _080B5FD4 + ldr r1, =0x08303678 lsls r4, r0, 3 adds r4, r1 ldrh r1, [r4, 0x4] @@ -373526,15 +361335,14 @@ sub_80B5F84: @ 80B5F84 lsls r0, 24 lsrs r0, 24 bl sub_80AC3F8 - ldr r0, _080B5FD8 + ldr r0, =0x0000ffff cmp r5, r0 beq _080B5FDC lsls r0, r5, 24 lsrs r0, 24 b _080B5FDE .align 2, 0 -_080B5FD4: .4byte 0x08303678 -_080B5FD8: .4byte 0x0000ffff + .pool _080B5FDC: movs r0, 0x40 _080B5FDE: @@ -373591,14 +361399,14 @@ sub_80B5FE8: @ 80B5FE8 lsls r0, 24 lsrs r0, 24 bl sub_80AC3F8 - ldr r0, _080B6058 + ldr r0, =0x0000ffff cmp r4, r0 beq _080B605C lsls r0, r4, 24 lsrs r0, 24 b _080B605E .align 2, 0 -_080B6058: .4byte 0x0000ffff + .pool _080B605C: movs r0, 0x40 _080B605E: @@ -373648,7 +361456,7 @@ sub_80B609C: @ 80B609C lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _080B6120 + ldr r4, =0x02037714 lsrs r0, 15 adds r4, r0, r4 ldrh r4, [r4] @@ -373693,7 +361501,7 @@ sub_80B609C: @ 80B609C lsls r4, 26 orrs r4, r6 lsrs r4, 16 - ldr r1, _080B6124 + ldr r1, =0x02037b14 adds r0, r1 strh r4, [r0] pop {r3,r4} @@ -373703,8 +361511,7 @@ sub_80B609C: @ 80B609C pop {r0} bx r0 .align 2, 0 -_080B6120: .4byte 0x02037714 -_080B6124: .4byte 0x02037b14 + .pool thumb_func_end sub_80B609C thumb_func_start sub_80B6128 @@ -373719,7 +361526,7 @@ sub_80B6128: @ 80B6128 lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _080B6198 + ldr r4, =0x02037714 lsrs r0, 15 adds r4, r0, r4 ldrh r4, [r4] @@ -373756,7 +361563,7 @@ sub_80B6128: @ 80B6128 lsls r4, 26 orrs r4, r5 lsrs r4, 16 - ldr r1, _080B619C + ldr r1, =0x02037b14 adds r0, r1 strh r4, [r0] pop {r3} @@ -373765,8 +361572,7 @@ sub_80B6128: @ 80B6128 pop {r0} bx r0 .align 2, 0 -_080B6198: .4byte 0x02037714 -_080B619C: .4byte 0x02037b14 + .pool thumb_func_end sub_80B6128 thumb_func_start sub_80B61A0 @@ -373776,7 +361582,7 @@ sub_80B61A0: @ 80B61A0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080B61DC + ldr r0, =sub_80B61E4 + 1 movs r1, 0xFF bl AddTask lsls r0, 24 @@ -373784,7 +361590,7 @@ sub_80B61A0: @ 80B61A0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B61E0 + ldr r0, =0x03005e00 adds r1, r0 strh r4, [r1, 0xA] movs r0, 0x5D @@ -373800,8 +361606,7 @@ sub_80B61A0: @ 80B61A0 pop {r1} bx r1 .align 2, 0 -_080B61DC: .4byte sub_80B61E4 + 1 -_080B61E0: .4byte 0x03005e00 + .pool thumb_func_end sub_80B61A0 thumb_func_start sub_80B61E4 @@ -373812,9 +361617,9 @@ sub_80B61E4: @ 80B61E4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B620C + ldr r0, =0x03005e00 adds r1, r0 - ldr r2, _080B6210 + ldr r2, =0x0855c364 movs r3, 0x8 ldrsh r0, [r1, r3] lsls r0, 2 @@ -373825,8 +361630,7 @@ sub_80B61E4: @ 80B61E4 pop {r0} bx r0 .align 2, 0 -_080B620C: .4byte 0x03005e00 -_080B6210: .4byte 0x0855c364 + .pool thumb_func_end sub_80B61E4 thumb_func_start sub_80B6214 @@ -373864,7 +361668,7 @@ sub_80B6214: @ 80B6214 sub_80B6250: @ 80B6250 push {r4,lr} adds r2, r0, 0 - ldr r3, _080B6288 + ldr r3, =0x02020630 movs r1, 0x14 ldrsh r0, [r2, r1] lsls r1, r0, 4 @@ -373892,14 +361696,14 @@ _080B6282: pop {r0} bx r0 .align 2, 0 -_080B6288: .4byte 0x02020630 + .pool thumb_func_end sub_80B6250 thumb_func_start sub_80B628C sub_80B628C: @ 80B628C push {lr} adds r3, r0, 0 - ldr r2, _080B62B0 + ldr r2, =0x02020630 movs r0, 0x14 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -373917,13 +361721,13 @@ _080B62AC: pop {r0} bx r0 .align 2, 0 -_080B62B0: .4byte 0x02020630 + .pool thumb_func_end sub_80B628C thumb_func_start sub_80B62B4 sub_80B62B4: @ 80B62B4 push {lr} - ldr r2, _080B62EC + ldr r2, =0x02020630 movs r3, 0x14 ldrsh r1, [r0, r3] lsls r0, r1, 4 @@ -373938,7 +361742,7 @@ sub_80B62B4: @ 80B62B4 bl obj_delete_and_free_tiles movs r0, 0x19 bl oe_active_list_remove - ldr r0, _080B62F0 + ldr r0, =sub_80B61E4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -373947,8 +361751,7 @@ _080B62E6: pop {r0} bx r0 .align 2, 0 -_080B62EC: .4byte 0x02020630 -_080B62F0: .4byte sub_80B61E4 + 1 + .pool thumb_func_end sub_80B62B4 thumb_func_start sub_80B62F4 @@ -373958,7 +361761,7 @@ sub_80B62F4: @ 80B62F4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080B6328 + ldr r0, =sub_80B6330 + 1 movs r1, 0xFF bl AddTask lsls r0, 24 @@ -373966,7 +361769,7 @@ sub_80B62F4: @ 80B62F4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B632C + ldr r0, =0x03005e00 adds r1, r0 strh r4, [r1, 0xA] movs r0, 0x75 @@ -373978,8 +361781,7 @@ sub_80B62F4: @ 80B62F4 pop {r1} bx r1 .align 2, 0 -_080B6328: .4byte sub_80B6330 + 1 -_080B632C: .4byte 0x03005e00 + .pool thumb_func_end sub_80B62F4 thumb_func_start sub_80B6330 @@ -373990,9 +361792,9 @@ sub_80B6330: @ 80B6330 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B6358 + ldr r0, =0x03005e00 adds r1, r0 - ldr r2, _080B635C + ldr r2, =0x0855c374 movs r3, 0x8 ldrsh r0, [r1, r3] lsls r0, 2 @@ -374003,8 +361805,7 @@ sub_80B6330: @ 80B6330 pop {r0} bx r0 .align 2, 0 -_080B6358: .4byte 0x03005e00 -_080B635C: .4byte 0x0855c374 + .pool thumb_func_end sub_80B6330 thumb_func_start sub_80B6360 @@ -374025,7 +361826,7 @@ sub_80B6360: @ 80B6360 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x14] - ldr r0, _080B63D0 + ldr r0, =sub_80B6330 + 1 bl get_task_id_by_function adds r4, r0, 0 lsls r4, 24 @@ -374059,14 +361860,14 @@ sub_80B6360: @ 80B6360 pop {r0} bx r0 .align 2, 0 -_080B63D0: .4byte sub_80B6330 + 1 + .pool thumb_func_end sub_80B6360 thumb_func_start sub_80B63D4 sub_80B63D4: @ 80B63D4 push {lr} adds r3, r0, 0 - ldr r2, _080B6400 + ldr r2, =0x02020630 movs r0, 0x14 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -374087,14 +361888,14 @@ _080B63FA: pop {r0} bx r0 .align 2, 0 -_080B6400: .4byte 0x02020630 + .pool thumb_func_end sub_80B63D4 thumb_func_start sub_80B6404 sub_80B6404: @ 80B6404 push {lr} adds r3, r0, 0 - ldr r2, _080B6428 + ldr r2, =0x02020630 movs r0, 0x14 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -374112,13 +361913,13 @@ _080B6424: pop {r0} bx r0 .align 2, 0 -_080B6428: .4byte 0x02020630 + .pool thumb_func_end sub_80B6404 thumb_func_start sub_80B642C sub_80B642C: @ 80B642C push {lr} - ldr r2, _080B6464 + ldr r2, =0x02020630 movs r3, 0x14 ldrsh r1, [r0, r3] lsls r0, r1, 4 @@ -374133,7 +361934,7 @@ sub_80B642C: @ 80B642C bl obj_delete_and_free_tiles movs r0, 0x3E bl oe_active_list_remove - ldr r0, _080B6468 + ldr r0, =sub_80B6330 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -374142,8 +361943,7 @@ _080B645E: pop {r0} bx r0 .align 2, 0 -_080B6464: .4byte 0x02020630 -_080B6468: .4byte sub_80B6330 + 1 + .pool thumb_func_end sub_80B642C thumb_func_start sub_80B646C @@ -374164,14 +361964,14 @@ sub_80B646C: @ 80B646C lsrs r5, 16 lsls r6, 16 lsrs r6, 16 - ldr r0, _080B64B8 + ldr r0, =sub_80B64C0 + 1 bl obj_add_empty_with_callback lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r2, _080B64BC + ldr r2, =0x02020630 adds r1, r2 strh r4, [r1, 0x24] strh r5, [r1, 0x26] @@ -374185,14 +361985,13 @@ sub_80B646C: @ 80B646C pop {r1} bx r1 .align 2, 0 -_080B64B8: .4byte sub_80B64C0 + 1 -_080B64BC: .4byte 0x02020630 + .pool thumb_func_end sub_80B646C thumb_func_start sub_80B64C0 sub_80B64C0: @ 80B64C0 push {lr} - ldr r2, _080B64D8 + ldr r2, =0x0855c384 movs r3, 0x2E ldrsh r1, [r0, r3] lsls r1, 2 @@ -374202,7 +362001,7 @@ sub_80B64C0: @ 80B64C0 pop {r0} bx r0 .align 2, 0 -_080B64D8: .4byte 0x0855c384 + .pool thumb_func_end sub_80B64C0 thumb_func_start sub_80B64DC @@ -374222,8 +362021,8 @@ sub_80B64DC: @ 80B64DC _080B64F4: movs r0, 0x19 strh r0, [r4, 0x30] - ldr r0, _080B6568 - ldr r1, _080B656C + ldr r0, =0x0855c304 + ldr r1, =0x0855c3a4 movs r2, 0x32 ldrsh r3, [r4, r2] lsls r3, 2 @@ -374242,7 +362041,7 @@ _080B64F4: bl obj_add_from_template_backward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _080B6570 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -374279,9 +362078,7 @@ _080B6562: pop {r0} bx r0 .align 2, 0 -_080B6568: .4byte 0x0855c304 -_080B656C: .4byte 0x0855c3a4 -_080B6570: .4byte 0x02020630 + .pool thumb_func_end sub_80B64DC thumb_func_start sub_80B6574 @@ -374347,7 +362144,7 @@ _080B65D8: mov r8, r0 mov r1, r8 ands r4, r1 - ldr r3, _080B66D0 + ldr r3, =0x00001007 mov r10, r3 mov r0, r10 bl gpu_pal_tags_index_of @@ -374357,13 +362154,13 @@ _080B65D8: lsls r1, 17 adds r0, r1 lsrs r0, 16 - ldr r6, _080B66D4 + ldr r6, =0x0855c3bc adds r1, r4, r6 ldrb r1, [r1] - ldr r5, _080B66D8 + ldr r5, =0x0855c3c0 adds r2, r4, r5 ldrb r2, [r2] - ldr r3, _080B66DC + ldr r3, =0x0855c3c4 mov r9, r3 add r4, r9 ldrb r3, [r4] @@ -374413,7 +362210,7 @@ _080B65D8: bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 4 - ldr r3, _080B66E0 + ldr r3, =0x01050000 adds r0, r3 lsrs r0, 16 adds r6, r4, r6 @@ -374430,7 +362227,7 @@ _080B65D8: bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 4 - ldr r1, _080B66E4 + ldr r1, =0x01030000 adds r0, r1 lsrs r0, 16 adds r1, r6, 0 @@ -374457,12 +362254,7 @@ _080B66C2: pop {r0} bx r0 .align 2, 0 -_080B66D0: .4byte 0x00001007 -_080B66D4: .4byte 0x0855c3bc -_080B66D8: .4byte 0x0855c3c0 -_080B66DC: .4byte 0x0855c3c4 -_080B66E0: .4byte 0x01050000 -_080B66E4: .4byte 0x01030000 + .pool thumb_func_end sub_80B65A8 thumb_func_start sub_80B66E8 @@ -374495,7 +362287,7 @@ _080B6718: ldrh r4, [r2, 0x32] lsls r4, 24 lsrs r4, 24 - ldr r0, _080B67C4 + ldr r0, =0x00001007 mov r8, r0 bl gpu_pal_tags_index_of lsls r0, 24 @@ -374504,13 +362296,13 @@ _080B6718: lsls r1, 17 adds r0, r1 lsrs r0, 16 - ldr r1, _080B67C8 + ldr r1, =0x0855c3bc adds r1, r4, r1 ldrb r6, [r1] - ldr r1, _080B67CC + ldr r1, =0x0855c3c0 adds r1, r4, r1 ldrb r5, [r1] - ldr r1, _080B67D0 + ldr r1, =0x0855c3c4 adds r4, r1 ldrb r4, [r4] adds r1, r6, 0 @@ -374545,7 +362337,7 @@ _080B6718: bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 4 - ldr r1, _080B67D4 + ldr r1, =0x01050000 adds r0, r1 lsrs r0, 16 adds r1, r6, 0 @@ -374556,7 +362348,7 @@ _080B6718: bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 4 - ldr r1, _080B67D8 + ldr r1, =0x01030000 adds r0, r1 lsrs r0, 16 adds r1, r6, 0 @@ -374569,12 +362361,7 @@ _080B6718: pop {r0} bx r0 .align 2, 0 -_080B67C4: .4byte 0x00001007 -_080B67C8: .4byte 0x0855c3bc -_080B67CC: .4byte 0x0855c3c0 -_080B67D0: .4byte 0x0855c3c4 -_080B67D4: .4byte 0x01050000 -_080B67D8: .4byte 0x01030000 + .pool thumb_func_end sub_80B66E8 thumb_func_start sub_80B67DC @@ -374634,7 +362421,7 @@ nullsub_97: @ 80B6824 sub_80B6828: @ 80B6828 push {lr} adds r3, r0, 0 - ldr r2, _080B684C + ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -374651,7 +362438,7 @@ _080B6848: pop {r0} bx r0 .align 2, 0 -_080B684C: .4byte 0x02020630 + .pool thumb_func_end sub_80B6828 thumb_func_start sub_80B6850 @@ -374659,7 +362446,7 @@ sub_80B6850: @ 80B6850 push {r4,lr} adds r3, r0, 0 adds r2, r1, 0 - ldr r0, _080B68A0 + ldr r0, =0x0855c31c lsls r3, 16 asrs r3, 16 lsls r2, 16 @@ -374673,7 +362460,7 @@ sub_80B6850: @ 80B6850 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _080B68A4 + ldr r1, =0x02020630 adds r0, r1 ldrb r2, [r0, 0x5] movs r1, 0xD @@ -374688,16 +362475,14 @@ sub_80B6850: @ 80B6850 movs r2, 0x4 orrs r1, r2 strb r1, [r3] - ldr r1, _080B68A8 + ldr r1, =0x0855c2ac bl obj_set_f18_to_r0_f42_to_40 adds r0, r4, 0 pop {r4} pop {r1} bx r1 .align 2, 0 -_080B68A0: .4byte 0x0855c31c -_080B68A4: .4byte 0x02020630 -_080B68A8: .4byte 0x0855c2ac + .pool thumb_func_end sub_80B6850 thumb_func_start sub_80B68AC @@ -374747,7 +362532,7 @@ sub_80B68EC: @ 80B68EC lsls r3, 24 cmp r3, 0 bne _080B6934 - ldr r0, _080B6928 + ldr r0, =0x0855c334 lsls r1, 16 asrs r1, 16 lsls r2, 16 @@ -374759,17 +362544,15 @@ sub_80B68EC: @ 80B68EC lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _080B692C + ldr r1, =0x02020630 adds r0, r1 - ldr r1, _080B6930 + ldr r1, =0x0855c2c4 bl obj_set_f18_to_r0_f42_to_40 b _080B6948 .align 2, 0 -_080B6928: .4byte 0x0855c334 -_080B692C: .4byte 0x02020630 -_080B6930: .4byte 0x0855c2c4 + .pool _080B6934: - ldr r0, _080B6968 + ldr r0, =0x0855c34c lsls r1, 16 asrs r1, 16 lsls r2, 16 @@ -374779,7 +362562,7 @@ _080B6934: lsls r0, 24 lsrs r4, r0, 24 _080B6948: - ldr r1, _080B696C + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -374795,15 +362578,14 @@ _080B6948: pop {r0} bx r0 .align 2, 0 -_080B6968: .4byte 0x0855c34c -_080B696C: .4byte 0x02020630 + .pool thumb_func_end sub_80B68EC thumb_func_start sub_80B6970 sub_80B6970: @ 80B6970 push {lr} adds r3, r0, 0 - ldr r2, _080B69D8 + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -374857,42 +362639,39 @@ _080B69D4: pop {r0} bx r0 .align 2, 0 -_080B69D8: .4byte 0x03005e00 + .pool thumb_func_end sub_80B6970 thumb_func_start sub_80B69DC sub_80B69DC: @ 80B69DC push {lr} - ldr r0, _080B69F0 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 - ldr r1, _080B69F4 - ldr r0, _080B69F8 + ldr r1, =0x03005dac + ldr r0, =mapldr_080842E8 + 1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080B69F0: .4byte c2_exit_to_overworld_2_switch + 1 -_080B69F4: .4byte 0x03005dac -_080B69F8: .4byte mapldr_080842E8 + 1 + .pool thumb_func_end sub_80B69DC thumb_func_start mapldr_080842E8 mapldr_080842E8: @ 80B69FC push {lr} bl pal_fill_black - ldr r0, _080B6A1C + ldr r0, =task00_8084310 + 1 movs r1, 0 bl AddTask bl script_env_2_enable bl player_bitmagic - ldr r1, _080B6A20 + ldr r1, =0x03005dac movs r0, 0 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080B6A1C: .4byte task00_8084310 + 1 -_080B6A20: .4byte 0x03005dac + .pool thumb_func_end mapldr_080842E8 thumb_func_start task00_8084310 @@ -374903,7 +362682,7 @@ task00_8084310: @ 80B6A24 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B6A90 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r6, [r4, r0] @@ -374914,7 +362693,7 @@ task00_8084310: @ 80B6A24 cmp r0, 0 beq _080B6A8A bl brm_get_pokemon_selection - ldr r1, _080B6A94 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -374935,10 +362714,10 @@ _080B6A64: bne _080B6A8A bl flag_var_implications_of_teleport_ bl warp_in - ldr r0, _080B6A98 + ldr r0, =c2_load_new_map + 1 bl set_callback2 - ldr r1, _080B6A9C - ldr r0, _080B6AA0 + ldr r1, =0x03005dac + ldr r0, =mapldr_08084390 + 1 str r0, [r1] adds r0, r5, 0 bl remove_task @@ -374947,11 +362726,7 @@ _080B6A8A: pop {r0} bx r0 .align 2, 0 -_080B6A90: .4byte 0x03005e00 -_080B6A94: .4byte 0x02038c08 -_080B6A98: .4byte c2_load_new_map + 1 -_080B6A9C: .4byte 0x03005dac -_080B6AA0: .4byte mapldr_08084390 + 1 + .pool thumb_func_end task00_8084310 thumb_func_start mapldr_08084390 @@ -374959,11 +362734,11 @@ mapldr_08084390: @ 80B6AA4 push {r4,lr} bl sub_8085784 bl pal_fill_black - ldr r0, _080B6AFC + ldr r0, =c3_080843F8 + 1 movs r1, 0 bl AddTask - ldr r4, _080B6B00 - ldr r3, _080B6B04 + ldr r4, =0x02037350 + ldr r3, =0x02037590 ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -374988,17 +362763,14 @@ mapldr_08084390: @ 80B6AA4 _080B6AE6: bl script_env_2_enable bl player_bitmagic - ldr r1, _080B6B08 + ldr r1, =0x03005dac movs r0, 0 str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_080B6AFC: .4byte c3_080843F8 + 1 -_080B6B00: .4byte 0x02037350 -_080B6B04: .4byte 0x02037590 -_080B6B08: .4byte 0x03005dac + .pool thumb_func_end mapldr_08084390 thumb_func_start c3_080843F8 @@ -375010,13 +362782,13 @@ c3_080843F8: @ 80B6B0C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B6B60 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 bne _080B6B3E - ldr r0, _080B6B64 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -375042,8 +362814,7 @@ _080B6B58: pop {r0} bx r0 .align 2, 0 -_080B6B60: .4byte 0x03005e00 -_080B6B64: .4byte 0x02037fd4 + .pool thumb_func_end c3_080843F8 thumb_func_start sub_80B6B68 @@ -375053,17 +362824,16 @@ sub_80B6B68: @ 80B6B68 bl pal_fill_for_maplights bl script_env_2_enable bl player_bitmagic - ldr r0, _080B6B8C + ldr r0, =sub_80B6B94 + 1 movs r1, 0 bl AddTask - ldr r1, _080B6B90 + ldr r1, =0x03005dac movs r0, 0 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080B6B8C: .4byte sub_80B6B94 + 1 -_080B6B90: .4byte 0x03005dac + .pool thumb_func_end sub_80B6B68 thumb_func_start sub_80B6B94 @@ -375074,9 +362844,9 @@ sub_80B6B94: @ 80B6B94 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B6BC4 + ldr r0, =0x03005e00 adds r4, r1, r0 - ldr r5, _080B6BC8 + ldr r5, =0x0855c3c8 _080B6BA6: movs r1, 0x8 ldrsh r0, [r4, r1] @@ -375092,8 +362862,7 @@ _080B6BA6: pop {r0} bx r0 .align 2, 0 -_080B6BC4: .4byte 0x03005e00 -_080B6BC8: .4byte 0x0855c3c8 + .pool thumb_func_end sub_80B6B94 thumb_func_start sub_80B6BCC @@ -375103,19 +362872,19 @@ sub_80B6BCC: @ 80B6BCC mov r5, r8 push {r5,r6} mov r9, r0 - ldr r6, _080B6C68 + ldr r6, =0x02037590 ldrb r0, [r6, 0x5] lsls r5, r0, 3 adds r5, r0 lsls r5, 2 - ldr r0, _080B6C6C + ldr r0, =0x02037350 mov r8, r0 add r5, r8 ldrb r0, [r6, 0x4] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080B6C70 + ldr r0, =0x02020630 adds r4, r0 bl sub_808EEDC ldrb r1, [r6, 0x5] @@ -375172,9 +362941,7 @@ sub_80B6BCC: @ 80B6BCC pop {r1} bx r1 .align 2, 0 -_080B6C68: .4byte 0x02037590 -_080B6C6C: .4byte 0x02037350 -_080B6C70: .4byte 0x02020630 + .pool thumb_func_end sub_80B6BCC thumb_func_start sub_80B6C74 @@ -375199,12 +362966,12 @@ _080B6C88: sub_80B6C90: @ 80B6C90 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _080B6CF4 + ldr r6, =0x02037590 ldrb r0, [r6, 0x4] lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080B6CF8 + ldr r0, =0x02020630 adds r2, r0 adds r0, r2, 0 adds r0, 0x29 @@ -375213,7 +362980,7 @@ sub_80B6C90: @ 80B6C90 lsls r0, r4, 17 negs r0, r0 ldrh r1, [r2, 0x22] - ldr r3, _080B6CFC + ldr r3, =0x02021bbe adds r1, r4 ldrh r3, [r3] adds r1, r3 @@ -375225,7 +362992,7 @@ sub_80B6C90: @ 80B6C90 movs r0, 0x1 strh r0, [r5, 0xA] strh r1, [r5, 0xC] - ldr r2, _080B6D00 + ldr r2, =0x02037350 ldrb r0, [r6, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -375246,28 +363013,25 @@ sub_80B6C90: @ 80B6C90 pop {r1} bx r1 .align 2, 0 -_080B6CF4: .4byte 0x02037590 -_080B6CF8: .4byte 0x02020630 -_080B6CFC: .4byte 0x02021bbe -_080B6D00: .4byte 0x02037350 + .pool thumb_func_end sub_80B6C90 thumb_func_start sub_80B6D04 sub_80B6D04: @ 80B6D04 push {r4-r6,lr} adds r4, r0, 0 - ldr r2, _080B6DB0 + ldr r2, =0x02037590 ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B6DB4 + ldr r1, =0x02037350 adds r6, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B6DB8 + ldr r1, =0x02020630 adds r5, r0, r1 ldrh r0, [r4, 0xA] ldrh r1, [r5, 0x26] @@ -375343,9 +363107,7 @@ _080B6DA8: pop {r1} bx r1 .align 2, 0 -_080B6DB0: .4byte 0x02037590 -_080B6DB4: .4byte 0x02037350 -_080B6DB8: .4byte 0x02020630 + .pool thumb_func_end sub_80B6D04 thumb_func_start sub_80B6DBC @@ -375404,14 +363166,14 @@ _080B6E0E: thumb_func_start sub_80B6E18 sub_80B6E18: @ 80B6E18 push {lr} - ldr r1, _080B6E44 + ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x6] bl script_env_2_disable bl sub_808EE8C bl sub_809757C bl sub_808A2E4 - ldr r0, _080B6E48 + ldr r0, =sub_80B6B94 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -375420,8 +363182,7 @@ sub_80B6E18: @ 80B6E18 pop {r1} bx r1 .align 2, 0 -_080B6E44: .4byte 0x02037590 -_080B6E48: .4byte sub_80B6B94 + 1 + .pool thumb_func_end sub_80B6E18 thumb_func_start sub_80B6E4C @@ -375432,11 +363193,11 @@ sub_80B6E4C: @ 80B6E4C lsrs r4, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, _080B6E80 + ldr r0, =sub_80B6E88 + 1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080B6E84 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -375452,8 +363213,7 @@ _080B6E78: pop {r0} bx r0 .align 2, 0 -_080B6E80: .4byte sub_80B6E88 + 1 -_080B6E84: .4byte 0x03005e00 + .pool thumb_func_end sub_80B6E4C thumb_func_start sub_80B6E88 @@ -375464,9 +363224,9 @@ sub_80B6E88: @ 80B6E88 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B6EB8 + ldr r0, =0x03005e00 adds r4, r1, r0 - ldr r5, _080B6EBC + ldr r5, =0x0855c3e4 _080B6E9A: movs r1, 0x8 ldrsh r0, [r4, r1] @@ -375482,8 +363242,7 @@ _080B6E9A: pop {r0} bx r0 .align 2, 0 -_080B6EB8: .4byte 0x03005e00 -_080B6EBC: .4byte 0x0855c3e4 + .pool thumb_func_end sub_80B6E88 thumb_func_start sub_80B6EC0 @@ -375507,12 +363266,12 @@ sub_80B6EC0: @ 80B6EC0 sub_80B6EE0: @ 80B6EE0 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080B6F48 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B6F4C + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl npc_is_visible_or_is_x40 @@ -375554,8 +363313,7 @@ _080B6F3E: pop {r1} bx r1 .align 2, 0 -_080B6F48: .4byte 0x02037590 -_080B6F4C: .4byte 0x02037350 + .pool thumb_func_end sub_80B6EE0 thumb_func_start sub_80B6F50 @@ -375622,12 +363380,12 @@ sub_80B6FA8: @ 80B6FA8 sub_80B6FB8: @ 80B6FB8 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080B6FFC + ldr r0, =0x02037590 ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080B7000 + ldr r0, =0x02020630 adds r4, r0 movs r0, 0xC ldrsh r1, [r5, r0] @@ -375654,20 +363412,19 @@ _080B6FF6: pop {r0} bx r0 .align 2, 0 -_080B6FFC: .4byte 0x02037590 -_080B7000: .4byte 0x02020630 + .pool thumb_func_end sub_80B6FB8 thumb_func_start sub_80B7004 sub_80B7004: @ 80B7004 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080B7048 + ldr r0, =0x02037590 ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080B704C + ldr r0, =0x02020630 adds r4, r0 movs r0, 0xC ldrsh r1, [r5, r0] @@ -375694,8 +363451,7 @@ _080B7042: pop {r0} bx r0 .align 2, 0 -_080B7048: .4byte 0x02037590 -_080B704C: .4byte 0x02020630 + .pool thumb_func_end sub_80B7004 thumb_func_start sub_80B7050 @@ -375710,7 +363466,7 @@ sub_80B7050: @ 80B7050 thumb_func_start sub_80B7060 sub_80B7060: @ 80B7060 push {lr} - ldr r0, _080B70A0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -375723,12 +363479,12 @@ sub_80B7060: @ 80B7060 bne _080B709C bl sub_80E1570 bl warp_in - ldr r1, _080B70A4 - ldr r0, _080B70A8 + ldr r1, =0x03005dac + ldr r0, =sub_80B70B4 + 1 str r0, [r1] - ldr r0, _080B70AC + ldr r0, =c2_load_new_map + 1 bl set_callback2 - ldr r0, _080B70B0 + ldr r0, =sub_80B6E88 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -375737,11 +363493,7 @@ _080B709C: pop {r0} bx r0 .align 2, 0 -_080B70A0: .4byte 0x02037fd4 -_080B70A4: .4byte 0x03005dac -_080B70A8: .4byte sub_80B70B4 + 1 -_080B70AC: .4byte c2_load_new_map + 1 -_080B70B0: .4byte sub_80B6E88 + 1 + .pool thumb_func_end sub_80B7060 thumb_func_start sub_80B70B4 @@ -375750,17 +363502,16 @@ sub_80B70B4: @ 80B70B4 bl sub_8085784 bl pal_fill_for_maplights bl script_env_2_enable - ldr r0, _080B70D4 + ldr r0, =sub_80B70DC + 1 movs r1, 0 bl AddTask - ldr r1, _080B70D8 + ldr r1, =0x03005dac movs r0, 0 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080B70D4: .4byte sub_80B70DC + 1 -_080B70D8: .4byte 0x03005dac + .pool thumb_func_end sub_80B70B4 thumb_func_start sub_80B70DC @@ -375771,9 +363522,9 @@ sub_80B70DC: @ 80B70DC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080B710C + ldr r0, =0x03005e00 adds r4, r1, r0 - ldr r5, _080B7110 + ldr r5, =0x0855c3fc _080B70EE: movs r1, 0x8 ldrsh r0, [r4, r1] @@ -375789,8 +363540,7 @@ _080B70EE: pop {r0} bx r0 .align 2, 0 -_080B710C: .4byte 0x03005e00 -_080B7110: .4byte 0x0855c3fc + .pool thumb_func_end sub_80B70DC thumb_func_start sub_80B7114 @@ -375799,12 +363549,12 @@ sub_80B7114: @ 80B7114 sub sp, 0x4 adds r5, r0, 0 bl sub_808EEDC - ldr r0, _080B7174 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080B7178 + ldr r0, =0x02037350 adds r4, r0 movs r0, 0x4 bl d2s_look1 @@ -375838,8 +363588,7 @@ sub_80B7114: @ 80B7114 strh r0, [r5, 0x8] b _080B717E .align 2, 0 -_080B7174: .4byte 0x02037590 -_080B7178: .4byte 0x02037350 + .pool _080B717C: movs r1, 0 _080B717E: @@ -375856,12 +363605,12 @@ _080B717E: sub_80B7190: @ 80B7190 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080B71C8 + ldr r0, =0x02037590 ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080B71CC + ldr r0, =0x02020630 adds r4, r0 movs r0, 0xA ldrsh r1, [r5, r0] @@ -375881,20 +363630,19 @@ sub_80B7190: @ 80B7190 pop {r1} bx r1 .align 2, 0 -_080B71C8: .4byte 0x02037590 -_080B71CC: .4byte 0x02020630 + .pool thumb_func_end sub_80B7190 thumb_func_start sub_80B71D0 sub_80B71D0: @ 80B71D0 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _080B7228 + ldr r0, =0x02037590 ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B722C + ldr r1, =0x02020630 adds r5, r0, r1 movs r0, 0xA ldrsh r1, [r4, r0] @@ -375931,20 +363679,19 @@ _080B721E: pop {r1} bx r1 .align 2, 0 -_080B7228: .4byte 0x02037590 -_080B722C: .4byte 0x02020630 + .pool thumb_func_end sub_80B71D0 thumb_func_start sub_80B7230 sub_80B7230: @ 80B7230 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080B7268 + ldr r0, =0x02037590 ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080B726C + ldr r0, =0x02020630 adds r4, r0 movs r0, 0xA ldrsh r1, [r5, r0] @@ -375964,20 +363711,19 @@ sub_80B7230: @ 80B7230 pop {r1} bx r1 .align 2, 0 -_080B7268: .4byte 0x02037590 -_080B726C: .4byte 0x02020630 + .pool thumb_func_end sub_80B7230 thumb_func_start sub_80B7270 sub_80B7270: @ 80B7270 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _080B72C8 + ldr r0, =0x02037590 ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B72CC + ldr r1, =0x02020630 adds r5, r0, r1 movs r0, 0xA ldrsh r1, [r4, r0] @@ -376015,8 +363761,7 @@ _080B72C0: pop {r1} bx r1 .align 2, 0 -_080B72C8: .4byte 0x02037590 -_080B72CC: .4byte 0x02020630 + .pool thumb_func_end sub_80B7270 thumb_func_start sub_80B72D0 @@ -376044,12 +363789,12 @@ _080B72EE: thumb_func_start sub_80B72F4 sub_80B72F4: @ 80B72F4 push {r4,lr} - ldr r0, _080B7340 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B7344 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl sub_8093284 @@ -376065,7 +363810,7 @@ sub_80B72F4: @ 80B72F4 lsrs r1, 24 adds r0, r4, 0 bl npc_set_state_2 - ldr r0, _080B7348 + ldr r0, =sub_80B70DC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -376076,26 +363821,24 @@ _080B7338: pop {r1} bx r1 .align 2, 0 -_080B7340: .4byte 0x02037590 -_080B7344: .4byte 0x02037350 -_080B7348: .4byte sub_80B70DC + 1 + .pool thumb_func_end sub_80B72F4 thumb_func_start oei_waterfall oei_waterfall: @ 80B734C push {r4,lr} - ldr r4, _080B7378 + ldr r4, =sub_80B7384 + 1 adds r0, r4, 0 movs r1, 0xFF bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080B737C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _080B7380 + ldr r2, =0x02038c08 ldr r2, [r2] strh r2, [r1, 0xA] bl _call_via_r4 @@ -376104,9 +363847,7 @@ oei_waterfall: @ 80B734C pop {r1} bx r1 .align 2, 0 -_080B7378: .4byte sub_80B7384 + 1 -_080B737C: .4byte 0x03005e00 -_080B7380: .4byte 0x02038c08 + .pool thumb_func_end oei_waterfall thumb_func_start sub_80B7384 @@ -376114,8 +363855,8 @@ sub_80B7384: @ 80B7384 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _080B73C0 - ldr r2, _080B73C4 + ldr r5, =0x0855c418 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -376125,12 +363866,12 @@ _080B7396: ldrsh r2, [r4, r0] lsls r2, 2 adds r2, r5 - ldr r0, _080B73C8 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080B73CC + ldr r0, =0x02037350 adds r1, r0 ldr r2, [r2] adds r0, r4, 0 @@ -376142,10 +363883,7 @@ _080B7396: pop {r0} bx r0 .align 2, 0 -_080B73C0: .4byte 0x0855c418 -_080B73C4: .4byte 0x03005e00 -_080B73C8: .4byte 0x02037590 -_080B73CC: .4byte 0x02037350 + .pool thumb_func_end sub_80B7384 thumb_func_start sub_80B73D0 @@ -376153,7 +363891,7 @@ sub_80B73D0: @ 80B73D0 push {r4,lr} adds r4, r0, 0 bl script_env_2_enable - ldr r1, _080B73EC + ldr r1, =0x02037590 movs r0, 0x1 strb r0, [r1, 0x6] ldrh r0, [r4, 0x8] @@ -376164,7 +363902,7 @@ sub_80B73D0: @ 80B73D0 pop {r1} bx r1 .align 2, 0 -_080B73EC: .4byte 0x02037590 + .pool thumb_func_end sub_80B73D0 thumb_func_start waterfall_1_do_anim_probably @@ -376180,7 +363918,7 @@ waterfall_1_do_anim_probably: @ 80B73F0 bne _080B7420 adds r0, r5, 0 bl sub_8093284 - ldr r1, _080B7428 + ldr r1, =0x02038c08 movs r2, 0xA ldrsh r0, [r4, r2] str r0, [r1] @@ -376195,7 +363933,7 @@ _080B7420: pop {r1} bx r1 .align 2, 0 -_080B7428: .4byte 0x02038c08 + .pool thumb_func_end waterfall_1_do_anim_probably thumb_func_start waterfall_2_wait_anim_finish_probably @@ -376261,9 +363999,9 @@ _080B748E: cmp r4, 0 bne _080B74C4 bl script_env_2_disable - ldr r0, _080B74BC + ldr r0, =0x02037590 strb r4, [r0, 0x6] - ldr r0, _080B74C0 + ldr r0, =sub_80B7384 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -376273,8 +364011,7 @@ _080B748E: movs r0, 0 b _080B74CA .align 2, 0 -_080B74BC: .4byte 0x02037590 -_080B74C0: .4byte sub_80B7384 + 1 + .pool _080B74C4: movs r0, 0x3 strh r0, [r5, 0x8] @@ -376288,18 +364025,18 @@ _080B74CA: thumb_func_start sub_80B74D0 sub_80B74D0: @ 80B74D0 push {r4,lr} - ldr r4, _080B7500 + ldr r4, =sub_80B750C + 1 adds r0, r4, 0 movs r1, 0xFF bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080B7504 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r3, _080B7508 + ldr r3, =0x02038c08 ldr r2, [r3] strh r2, [r1, 0x26] ldr r2, [r3, 0x4] @@ -376310,9 +364047,7 @@ sub_80B74D0: @ 80B74D0 pop {r1} bx r1 .align 2, 0 -_080B7500: .4byte sub_80B750C + 1 -_080B7504: .4byte 0x03005e00 -_080B7508: .4byte 0x02038c08 + .pool thumb_func_end sub_80B74D0 thumb_func_start sub_80B750C @@ -376320,8 +364055,8 @@ sub_80B750C: @ 80B750C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _080B753C - ldr r2, _080B7540 + ldr r5, =0x0855c42c + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -376341,13 +364076,12 @@ _080B751E: pop {r0} bx r0 .align 2, 0 -_080B753C: .4byte 0x0855c42c -_080B7540: .4byte 0x03005e00 + .pool thumb_func_end sub_80B750C thumb_func_start dive_1_lock dive_1_lock: @ 80B7544 - ldr r2, _080B7554 + ldr r2, =0x02037590 movs r1, 0x1 strb r1, [r2, 0x6] ldrh r1, [r0, 0x8] @@ -376356,7 +364090,7 @@ dive_1_lock: @ 80B7544 movs r0, 0 bx lr .align 2, 0 -_080B7554: .4byte 0x02037590 + .pool thumb_func_end dive_1_lock thumb_func_start dive_2_unknown @@ -376364,7 +364098,7 @@ dive_2_unknown: @ 80B7558 push {r4,lr} adds r4, r0, 0 bl script_env_2_enable - ldr r1, _080B757C + ldr r1, =0x02038c08 movs r2, 0x26 ldrsh r0, [r4, r2] str r0, [r1] @@ -376378,7 +364112,7 @@ dive_2_unknown: @ 80B7558 pop {r1} bx r1 .align 2, 0 -_080B757C: .4byte 0x02038c08 + .pool thumb_func_end dive_2_unknown thumb_func_start dive_3_unknown @@ -376394,8 +364128,8 @@ dive_3_unknown: @ 80B7580 lsls r0, 24 cmp r0, 0 bne _080B75C4 - ldr r2, _080B75CC - ldr r0, _080B75D0 + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -376404,7 +364138,7 @@ dive_3_unknown: @ 80B7580 ldrb r1, [r0, 0x1E] mov r0, sp bl dive_warp - ldr r0, _080B75D4 + ldr r0, =sub_80B750C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -376417,9 +364151,7 @@ _080B75C4: pop {r1} bx r1 .align 2, 0 -_080B75CC: .4byte 0x02037350 -_080B75D0: .4byte 0x02037590 -_080B75D4: .4byte sub_80B750C + 1 + .pool thumb_func_end dive_3_unknown thumb_func_start sub_80B75D8 @@ -376428,12 +364160,12 @@ sub_80B75D8: @ 80B75D8 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _080B75EC + ldr r0, =sub_80B75F0 + 1 bl AddTask pop {r0} bx r0 .align 2, 0 -_080B75EC: .4byte sub_80B75F0 + 1 + .pool thumb_func_end sub_80B75D8 thumb_func_start sub_80B75F0 @@ -376441,9 +364173,9 @@ sub_80B75F0: @ 80B75F0 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r6, _080B7638 - ldr r2, _080B763C - ldr r5, _080B7640 + ldr r6, =0x0855c438 + ldr r2, =0x03005e00 + ldr r5, =0x02037590 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -376457,13 +364189,13 @@ _080B7604: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080B7644 + ldr r0, =0x02037350 adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080B7648 + ldr r0, =0x02020630 adds r2, r0 ldr r3, [r3] adds r0, r4, 0 @@ -376475,11 +364207,7 @@ _080B7604: pop {r0} bx r0 .align 2, 0 -_080B7638: .4byte 0x0855c438 -_080B763C: .4byte 0x03005e00 -_080B7640: .4byte 0x02037590 -_080B7644: .4byte 0x02037350 -_080B7648: .4byte 0x02020630 + .pool thumb_func_end sub_80B75F0 thumb_func_start sub_80B764C @@ -376491,7 +364219,7 @@ sub_80B764C: @ 80B764C bl sub_808EEDC movs r0, 0 bl sub_808A2C0 - ldr r0, _080B7680 + ldr r0, =0x02037590 movs r2, 0x1 strb r2, [r0, 0x6] ldrb r0, [r5, 0x3] @@ -376507,7 +364235,7 @@ sub_80B764C: @ 80B764C pop {r1} bx r1 .align 2, 0 -_080B7680: .4byte 0x02037590 + .pool thumb_func_end sub_80B764C thumb_func_start sub_80B7684 @@ -376548,7 +364276,7 @@ sub_80B76B8: @ 80B76B8 strh r0, [r2, 0x26] movs r0, 0x1 strh r0, [r4, 0xE] - ldr r3, _080B7700 + ldr r3, =0x02038c08 movs r5, 0x10 ldrsh r0, [r1, r5] str r0, [r3] @@ -376576,7 +364304,7 @@ sub_80B76B8: @ 80B76B8 pop {r1} bx r1 .align 2, 0 -_080B7700: .4byte 0x02038c08 + .pool thumb_func_end sub_80B76B8 thumb_func_start sub_80B7704 @@ -376636,7 +364364,7 @@ _080B7750: movs r7, 0x22 ldrsh r0, [r5, r7] adds r0, r1 - ldr r1, _080B7794 + ldr r1, =0x02021bbe movs r7, 0 ldrsh r1, [r1, r7] adds r0, r1 @@ -376656,7 +364384,7 @@ _080B7750: strh r0, [r4, 0xE] b _080B779C .align 2, 0 -_080B7794: .4byte 0x02021bbe + .pool _080B7798: movs r0, 0x1 strh r0, [r4, 0x10] @@ -376729,7 +364457,7 @@ sub_80B77F8: @ 80B77F8 thumb_func_start sub_80B7814 sub_80B7814: @ 80B7814 push {lr} - ldr r0, _080B7854 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -376741,12 +364469,12 @@ sub_80B7814: @ 80B7814 cmp r0, 0x1 bne _080B784C bl warp_in - ldr r1, _080B7858 - ldr r0, _080B785C + ldr r1, =0x03005dac + ldr r0, =mapldr_080851BC + 1 str r0, [r1] - ldr r0, _080B7860 + ldr r0, =c2_load_new_map + 1 bl set_callback2 - ldr r0, _080B7864 + ldr r0, =sub_80B75F0 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -376756,11 +364484,7 @@ _080B784C: pop {r1} bx r1 .align 2, 0 -_080B7854: .4byte 0x02037fd4 -_080B7858: .4byte 0x03005dac -_080B785C: .4byte mapldr_080851BC + 1 -_080B7860: .4byte c2_load_new_map + 1 -_080B7864: .4byte sub_80B75F0 + 1 + .pool thumb_func_end sub_80B7814 thumb_func_start mapldr_080851BC @@ -376769,16 +364493,15 @@ mapldr_080851BC: @ 80B7868 bl sub_8085784 bl pal_fill_for_maplights bl script_env_2_enable - ldr r0, _080B7888 + ldr r0, =0x03005dac movs r1, 0 str r1, [r0] - ldr r0, _080B788C + ldr r0, =sub_80B7890 + 1 bl AddTask pop {r0} bx r0 .align 2, 0 -_080B7888: .4byte 0x03005dac -_080B788C: .4byte sub_80B7890 + 1 + .pool thumb_func_end mapldr_080851BC thumb_func_start sub_80B7890 @@ -376786,9 +364509,9 @@ sub_80B7890: @ 80B7890 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r6, _080B78D8 - ldr r2, _080B78DC - ldr r5, _080B78E0 + ldr r6, =0x0855c450 + ldr r2, =0x03005e00 + ldr r5, =0x02037590 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -376802,13 +364525,13 @@ _080B78A4: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080B78E4 + ldr r0, =0x02037350 adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080B78E8 + ldr r0, =0x02020630 adds r2, r0 ldr r3, [r3] adds r0, r4, 0 @@ -376820,11 +364543,7 @@ _080B78A4: pop {r0} bx r0 .align 2, 0 -_080B78D8: .4byte 0x0855c450 -_080B78DC: .4byte 0x03005e00 -_080B78E0: .4byte 0x02037590 -_080B78E4: .4byte 0x02037350 -_080B78E8: .4byte 0x02020630 + .pool thumb_func_end sub_80B7890 thumb_func_start sub_80B78EC @@ -376834,7 +364553,7 @@ sub_80B78EC: @ 80B78EC adds r4, r1, 0 bl sub_808EEDC bl player_bitmagic - ldr r1, _080B7918 + ldr r1, =0x02037590 movs r0, 0x1 strb r0, [r1, 0x6] ldrb r0, [r4, 0x1] @@ -376849,7 +364568,7 @@ sub_80B78EC: @ 80B78EC pop {r1} bx r1 .align 2, 0 -_080B7918: .4byte 0x02037590 + .pool thumb_func_end sub_80B78EC thumb_func_start sub_80B791C @@ -376862,7 +364581,7 @@ sub_80B791C: @ 80B791C lsls r0, 24 cmp r0, 0 beq _080B795C - ldr r1, _080B7964 + ldr r1, =0x02038c08 movs r2, 0x10 ldrsh r0, [r5, r2] str r0, [r1] @@ -376890,7 +364609,7 @@ _080B795C: pop {r1} bx r1 .align 2, 0 -_080B7964: .4byte 0x02038c08 + .pool thumb_func_end sub_80B791C thumb_func_start sub_80B7968 @@ -376903,7 +364622,7 @@ sub_80B7968: @ 80B7968 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B79B8 + ldr r1, =0x02020630 adds r0, r1 adds r0, 0x2B ldrb r0, [r0] @@ -376933,7 +364652,7 @@ _080B79B0: pop {r1} bx r1 .align 2, 0 -_080B79B8: .4byte 0x02020630 + .pool thumb_func_end sub_80B7968 thumb_func_start sub_80B79BC @@ -376944,12 +364663,12 @@ sub_80B79BC: @ 80B79BC lsls r0, 24 cmp r0, 0 beq _080B79E6 - ldr r1, _080B79EC + ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x6] bl script_env_2_disable bl sub_809757C - ldr r0, _080B79F0 + ldr r0, =sub_80B7890 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -376959,20 +364678,19 @@ _080B79E6: pop {r1} bx r1 .align 2, 0 -_080B79EC: .4byte 0x02037590 -_080B79F0: .4byte sub_80B7890 + 1 + .pool thumb_func_end sub_80B79BC thumb_func_start sub_80B79F4 sub_80B79F4: @ 80B79F4 push {r4,lr} - ldr r4, _080B7A4C + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _080B7A50 + ldr r0, =0x085059f8 adds r0, 0x84 ldr r0, [r0] movs r2, 0 @@ -376983,7 +364701,7 @@ sub_80B79F4: @ 80B79F4 bl obj_add_from_template_backward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _080B7A54 + ldr r1, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -377007,9 +364725,7 @@ sub_80B79F4: @ 80B79F4 pop {r1} bx r1 .align 2, 0 -_080B7A4C: .4byte 0x02038c08 -_080B7A50: .4byte 0x085059f8 -_080B7A54: .4byte 0x02020630 + .pool thumb_func_end sub_80B79F4 thumb_func_start sub_80B7A58 @@ -377036,12 +364752,12 @@ sub_80B7A74: @ 80B7A74 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _080B7A88 + ldr r0, =sub_80B7A8C + 1 bl AddTask pop {r0} bx r0 .align 2, 0 -_080B7A88: .4byte sub_80B7A8C + 1 + .pool thumb_func_end sub_80B7A74 thumb_func_start sub_80B7A8C @@ -377049,9 +364765,9 @@ sub_80B7A8C: @ 80B7A8C push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r6, _080B7AD4 - ldr r2, _080B7AD8 - ldr r5, _080B7ADC + ldr r6, =0x0855c460 + ldr r2, =0x03005e00 + ldr r5, =0x02037590 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -377065,13 +364781,13 @@ _080B7AA0: lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080B7AE0 + ldr r0, =0x02037350 adds r1, r0 ldrb r0, [r5, 0x4] lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080B7AE4 + ldr r0, =0x02020630 adds r2, r0 ldr r3, [r3] adds r0, r4, 0 @@ -377083,11 +364799,7 @@ _080B7AA0: pop {r0} bx r0 .align 2, 0 -_080B7AD4: .4byte 0x0855c460 -_080B7AD8: .4byte 0x03005e00 -_080B7ADC: .4byte 0x02037590 -_080B7AE0: .4byte 0x02037350 -_080B7AE4: .4byte 0x02020630 + .pool thumb_func_end sub_80B7A8C thumb_func_start sub_80B7AE8 @@ -377097,7 +364809,7 @@ sub_80B7AE8: @ 80B7AE8 adds r4, r1, 0 bl player_bitmagic bl sub_808EEDC - ldr r1, _080B7B14 + ldr r1, =0x02037590 movs r0, 0x1 strb r0, [r1, 0x6] ldrb r0, [r4, 0x3] @@ -377112,7 +364824,7 @@ sub_80B7AE8: @ 80B7AE8 pop {r1} bx r1 .align 2, 0 -_080B7B14: .4byte 0x02037590 + .pool thumb_func_end sub_80B7AE8 thumb_func_start sub_80B7B18 @@ -377131,7 +364843,7 @@ sub_80B7B18: @ 80B7B18 ldrsh r0, [r5, r2] cmp r0, 0x3 ble _080B7B6C - ldr r1, _080B7B68 + ldr r1, =0x02038c08 movs r2, 0x10 ldrsh r0, [r4, r2] str r0, [r1] @@ -377155,7 +364867,7 @@ sub_80B7B18: @ 80B7B18 strh r0, [r5, 0x8] b _080B7B8C .align 2, 0 -_080B7B68: .4byte 0x02038c08 + .pool _080B7B6C: adds r0, r1, 0x1 strh r0, [r5, 0xA] @@ -377182,7 +364894,7 @@ sub_80B7B94: @ 80B7B94 push {r4,lr} adds r3, r0, 0 adds r4, r1, 0 - ldr r2, _080B7BC8 + ldr r2, =0x02020630 movs r0, 0xA ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -377206,7 +364918,7 @@ _080B7BBE: pop {r1} bx r1 .align 2, 0 -_080B7BC8: .4byte 0x02020630 + .pool thumb_func_end sub_80B7B94 thumb_func_start sub_80B7BCC @@ -377233,7 +364945,7 @@ _080B7BEA: thumb_func_start sub_80B7BF4 sub_80B7BF4: @ 80B7BF4 push {lr} - ldr r0, _080B7C34 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -377245,12 +364957,12 @@ sub_80B7BF4: @ 80B7BF4 cmp r0, 0x1 bne _080B7C2C bl warp_in - ldr r1, _080B7C38 - ldr r0, _080B7C3C + ldr r1, =0x03005dac + ldr r0, =sub_80B6B68 + 1 str r0, [r1] - ldr r0, _080B7C40 + ldr r0, =c2_load_new_map + 1 bl set_callback2 - ldr r0, _080B7C44 + ldr r0, =sub_80B7A8C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -377260,23 +364972,19 @@ _080B7C2C: pop {r1} bx r1 .align 2, 0 -_080B7C34: .4byte 0x02037fd4 -_080B7C38: .4byte 0x03005dac -_080B7C3C: .4byte sub_80B6B68 + 1 -_080B7C40: .4byte c2_load_new_map + 1 -_080B7C44: .4byte sub_80B7A8C + 1 + .pool thumb_func_end sub_80B7BF4 thumb_func_start sub_80B7C48 sub_80B7C48: @ 80B7C48 push {r4,lr} - ldr r4, _080B7CA0 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _080B7CA4 + ldr r0, =0x085059f8 adds r0, 0x80 ldr r0, [r0] movs r2, 0 @@ -377287,7 +364995,7 @@ sub_80B7C48: @ 80B7C48 bl obj_add_from_template_backward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _080B7CA8 + ldr r1, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -377311,9 +365019,7 @@ sub_80B7C48: @ 80B7C48 pop {r1} bx r1 .align 2, 0 -_080B7CA0: .4byte 0x02038c08 -_080B7CA4: .4byte 0x085059f8 -_080B7CA8: .4byte 0x02020630 + .pool thumb_func_end sub_80B7C48 thumb_func_start sub_80B7CAC @@ -377339,13 +365045,13 @@ sub_80B7CC8: @ 80B7CC8 push {lr} bl script_env_2_enable bl player_bitmagic - ldr r0, _080B7CE0 + ldr r0, =sub_80B7CE4 + 1 movs r1, 0x50 bl AddTask pop {r0} bx r0 .align 2, 0 -_080B7CE0: .4byte sub_80B7CE4 + 1 + .pool thumb_func_end sub_80B7CC8 thumb_func_start sub_80B7CE4 @@ -377354,8 +365060,8 @@ sub_80B7CE4: @ 80B7CE4 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _080B7D0C - ldr r2, _080B7D10 + ldr r3, =0x0855c474 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -377369,8 +365075,7 @@ sub_80B7CE4: @ 80B7CE4 pop {r0} bx r0 .align 2, 0 -_080B7D0C: .4byte 0x0855c474 -_080B7D10: .4byte 0x03005e00 + .pool thumb_func_end sub_80B7CE4 thumb_func_start sub_80B7D14 @@ -377396,7 +365101,7 @@ sub_80B7D34: @ 80B7D34 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r1, _080B7DD8 + ldr r1, =0x0855c47c mov r0, sp movs r2, 0x5 bl memcpy @@ -377413,12 +365118,12 @@ sub_80B7D34: @ 80B7D34 bl music_something bl sub_80AF0B4 _080B7D60: - ldr r0, _080B7DDC + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B7DE0 + ldr r1, =0x02037350 adds r5, r0, r1 adds r0, r5, 0 bl npc_is_visible_or_is_x40 @@ -377435,7 +365140,7 @@ _080B7D86: ldrsh r0, [r4, r1] cmp r0, 0 bne _080B7DF8 - ldr r0, _080B7DE4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -377453,26 +365158,19 @@ _080B7D86: bl npc_set_direction bl sub_8084E14 bl warp_in - ldr r1, _080B7DE8 - ldr r0, _080B7DEC + ldr r1, =0x03005dac + ldr r0, =mapldr_080859D4 + 1 str r0, [r1] - ldr r0, _080B7DF0 + ldr r0, =c2_load_new_map + 1 bl set_callback2 - ldr r0, _080B7DF4 + ldr r0, =sub_80B7CE4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task b _080B7E40 .align 2, 0 -_080B7DD8: .4byte 0x0855c47c -_080B7DDC: .4byte 0x02037590 -_080B7DE0: .4byte 0x02037350 -_080B7DE4: .4byte 0x02037fd4 -_080B7DE8: .4byte 0x03005dac -_080B7DEC: .4byte mapldr_080859D4 + 1 -_080B7DF0: .4byte c2_load_new_map + 1 -_080B7DF4: .4byte sub_80B7CE4 + 1 + .pool _080B7DF8: ldrh r1, [r4, 0xA] movs r2, 0xA @@ -377524,11 +365222,11 @@ mapldr_080859D4: @ 80B7E48 bl pal_fill_for_maplights bl script_env_2_enable bl player_bitmagic - ldr r1, _080B7E84 + ldr r1, =0x03005dac movs r0, 0 str r0, [r1] - ldr r2, _080B7E88 - ldr r0, _080B7E8C + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -377538,16 +365236,13 @@ mapldr_080859D4: @ 80B7E48 movs r2, 0x20 orrs r1, r2 strb r1, [r0, 0x1] - ldr r0, _080B7E90 + ldr r0, =sub_80B7E94 + 1 movs r1, 0 bl AddTask pop {r0} bx r0 .align 2, 0 -_080B7E84: .4byte 0x03005dac -_080B7E88: .4byte 0x02037350 -_080B7E8C: .4byte 0x02037590 -_080B7E90: .4byte sub_80B7E94 + 1 + .pool thumb_func_end mapldr_080859D4 thumb_func_start sub_80B7E94 @@ -377556,8 +365251,8 @@ sub_80B7E94: @ 80B7E94 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _080B7EBC - ldr r2, _080B7EC0 + ldr r3, =0x0855c484 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -377571,8 +365266,7 @@ sub_80B7E94: @ 80B7E94 pop {r0} bx r0 .align 2, 0 -_080B7EBC: .4byte 0x0855c484 -_080B7EC0: .4byte 0x03005e00 + .pool thumb_func_end sub_80B7E94 thumb_func_start sub_80B7EC4 @@ -377601,16 +365295,16 @@ sub_80B7EE8: @ 80B7EE8 push {r4-r6,lr} sub sp, 0x8 adds r5, r0, 0 - ldr r1, _080B7F6C + ldr r1, =0x0855c47c mov r0, sp movs r2, 0x5 bl memcpy - ldr r0, _080B7F70 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B7F74 + ldr r1, =0x02037350 adds r6, r0, r1 ldrh r1, [r5, 0xA] movs r2, 0xA @@ -377652,17 +365346,14 @@ _080B7F32: strb r0, [r6, 0x1] bl script_env_2_disable bl sub_809757C - ldr r0, _080B7F78 + ldr r0, =sub_80B7E94 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task b _080B7FC0 .align 2, 0 -_080B7F6C: .4byte 0x0855c47c -_080B7F70: .4byte 0x02037590 -_080B7F74: .4byte 0x02037350 -_080B7F78: .4byte sub_80B7E94 + 1 + .pool _080B7F7C: ldrb r0, [r6, 0x18] lsls r0, 28 @@ -377708,13 +365399,13 @@ _080B7FC0: thumb_func_start sub_80B7FC8 sub_80B7FC8: @ 80B7FC8 push {lr} - ldr r0, _080B7FD8 + ldr r0, =sub_80B7FDC + 1 movs r1, 0 bl AddTask pop {r0} bx r0 .align 2, 0 -_080B7FD8: .4byte sub_80B7FDC + 1 + .pool thumb_func_end sub_80B7FC8 thumb_func_start sub_80B7FDC @@ -377723,8 +365414,8 @@ sub_80B7FDC: @ 80B7FDC adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _080B8004 - ldr r2, _080B8008 + ldr r3, =0x0855c48c + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -377738,8 +365429,7 @@ sub_80B7FDC: @ 80B7FDC pop {r0} bx r0 .align 2, 0 -_080B8004: .4byte 0x0855c48c -_080B8008: .4byte 0x03005e00 + .pool thumb_func_end sub_80B7FDC thumb_func_start sub_80B800C @@ -377766,16 +365456,16 @@ sub_80B8034: @ 80B8034 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r1, _080B80B8 + ldr r1, =0x0855c47c mov r0, sp movs r2, 0x5 bl memcpy - ldr r0, _080B80BC + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B80C0 + ldr r1, =0x02037350 adds r5, r0, r1 ldrh r1, [r4, 0xA] movs r2, 0xA @@ -377829,9 +365519,7 @@ _080B80AE: pop {r0} bx r0 .align 2, 0 -_080B80B8: .4byte 0x0855c47c -_080B80BC: .4byte 0x02037590 -_080B80C0: .4byte 0x02037350 + .pool thumb_func_end sub_80B8034 thumb_func_start sub_80B80C4 @@ -377839,22 +365527,22 @@ sub_80B80C4: @ 80B80C4 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r1, _080B8188 + ldr r1, =0x0855c47c mov r0, sp movs r2, 0x5 bl memcpy - ldr r2, _080B818C + ldr r2, =0x02037590 ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B8190 + ldr r1, =0x02037350 adds r3, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B8194 + ldr r1, =0x02020630 adds r5, r0, r1 ldrh r0, [r4, 0xA] subs r0, 0x1 @@ -377934,17 +365622,14 @@ _080B817E: pop {r0} bx r0 .align 2, 0 -_080B8188: .4byte 0x0855c47c -_080B818C: .4byte 0x02037590 -_080B8190: .4byte 0x02037350 -_080B8194: .4byte 0x02020630 + .pool thumb_func_end sub_80B80C4 thumb_func_start sub_80B8198 sub_80B8198: @ 80B8198 push {r4,lr} adds r4, r0, 0 - ldr r0, _080B81EC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -377965,12 +365650,12 @@ _080B81B8: bne _080B81E6 bl copy_saved_warp3_bank_and_enter_x_to_warp1 bl warp_in - ldr r0, _080B81F0 + ldr r0, =c2_load_new_map + 1 bl set_callback2 - ldr r1, _080B81F4 - ldr r0, _080B81F8 + ldr r1, =0x03005dac + ldr r0, =mapldr_08085D88 + 1 str r0, [r1] - ldr r0, _080B81FC + ldr r0, =sub_80B7FDC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -377980,11 +365665,7 @@ _080B81E6: pop {r0} bx r0 .align 2, 0 -_080B81EC: .4byte 0x02037fd4 -_080B81F0: .4byte c2_load_new_map + 1 -_080B81F4: .4byte 0x03005dac -_080B81F8: .4byte mapldr_08085D88 + 1 -_080B81FC: .4byte sub_80B7FDC + 1 + .pool thumb_func_end sub_80B8198 thumb_func_start mapldr_08085D88 @@ -377994,11 +365675,11 @@ mapldr_08085D88: @ 80B8200 bl pal_fill_for_maplights bl script_env_2_enable bl player_bitmagic - ldr r1, _080B8240 + ldr r1, =0x03005dac movs r0, 0 str r0, [r1] - ldr r2, _080B8244 - ldr r0, _080B8248 + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -378009,16 +365690,13 @@ mapldr_08085D88: @ 80B8200 orrs r1, r2 strb r1, [r0, 0x1] bl sub_808EEDC - ldr r0, _080B824C + ldr r0, =sub_80B8250 + 1 movs r1, 0 bl AddTask pop {r0} bx r0 .align 2, 0 -_080B8240: .4byte 0x03005dac -_080B8244: .4byte 0x02037350 -_080B8248: .4byte 0x02037590 -_080B824C: .4byte sub_80B8250 + 1 + .pool thumb_func_end mapldr_08085D88 thumb_func_start sub_80B8250 @@ -378027,8 +365705,8 @@ sub_80B8250: @ 80B8250 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _080B8278 - ldr r2, _080B827C + ldr r3, =0x0855c49c + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -378042,8 +365720,7 @@ sub_80B8250: @ 80B8250 pop {r0} bx r0 .align 2, 0 -_080B8278: .4byte 0x0855c49c -_080B827C: .4byte 0x03005e00 + .pool thumb_func_end sub_80B8250 thumb_func_start sub_80B8280 @@ -378054,12 +365731,12 @@ sub_80B8280: @ 80B8280 lsls r0, 24 cmp r0, 0 beq _080B82F6 - ldr r5, _080B82FC + ldr r5, =0x02037590 ldrb r0, [r5, 0x4] lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080B8300 + ldr r0, =0x02020630 adds r2, r0 adds r0, r2, 0 adds r0, 0x29 @@ -378068,7 +365745,7 @@ sub_80B8280: @ 80B8280 lsls r0, r4, 17 negs r0, r0 ldrh r1, [r2, 0x22] - ldr r3, _080B8304 + ldr r3, =0x02021bbe adds r1, r4 ldrh r3, [r3] adds r1, r3 @@ -378076,7 +365753,7 @@ sub_80B8280: @ 80B8280 adds r0, r1 negs r0, r0 strh r0, [r2, 0x26] - ldr r3, _080B8308 + ldr r3, =0x02037350 ldrb r0, [r5, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -378109,10 +365786,7 @@ _080B82F6: pop {r0} bx r0 .align 2, 0 -_080B82FC: .4byte 0x02037590 -_080B8300: .4byte 0x02020630 -_080B8304: .4byte 0x02021bbe -_080B8308: .4byte 0x02037350 + .pool thumb_func_end sub_80B8280 thumb_func_start sub_80B830C @@ -378120,22 +365794,22 @@ sub_80B830C: @ 80B830C push {r4-r7,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r1, _080B8374 + ldr r1, =0x0855c47c mov r0, sp movs r2, 0x5 bl memcpy - ldr r2, _080B8378 + ldr r2, =0x02037590 ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B837C + ldr r1, =0x02037350 adds r6, r0, r1 ldrb r1, [r2, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B8380 + ldr r1, =0x02020630 adds r5, r0, r1 ldrh r0, [r4, 0xA] ldrh r1, [r5, 0x26] @@ -378169,10 +365843,7 @@ sub_80B830C: @ 80B830C strb r0, [r3] b _080B83AA .align 2, 0 -_080B8374: .4byte 0x0855c47c -_080B8378: .4byte 0x02037590 -_080B837C: .4byte 0x02037350 -_080B8380: .4byte 0x02020630 + .pool _080B8384: ldrb r1, [r5, 0x5] movs r0, 0xD @@ -378253,16 +365924,16 @@ sub_80B8410: @ 80B8410 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r1, _080B848C + ldr r1, =0x0855c47c mov r0, sp movs r2, 0x5 bl memcpy - ldr r0, _080B8490 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B8494 + ldr r1, =0x02037350 adds r5, r0, r1 ldrh r0, [r4, 0xA] subs r0, 0x1 @@ -378296,7 +365967,7 @@ sub_80B8410: @ 80B8410 bl script_env_2_disable bl sub_808EE8C bl sub_809757C - ldr r0, _080B8498 + ldr r0, =sub_80B8250 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -378307,10 +365978,7 @@ _080B8484: pop {r0} bx r0 .align 2, 0 -_080B848C: .4byte 0x0855c47c -_080B8490: .4byte 0x02037590 -_080B8494: .4byte 0x02037350 -_080B8498: .4byte sub_80B8250 + 1 + .pool thumb_func_end sub_80B8410 thumb_func_start sub_80B849C @@ -378324,23 +365992,23 @@ sub_80B849C: @ 80B849C lsrs r0, 24 cmp r0, 0x1 bne _080B84BC - ldr r0, _080B84B8 + ldr r0, =sub_80B8554 + 1 b _080B84BE .align 2, 0 -_080B84B8: .4byte sub_80B8554 + 1 + .pool _080B84BC: - ldr r0, _080B84EC + ldr r0, =sub_80B88B4 + 1 _080B84BE: movs r1, 0xFF bl AddTask lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _080B84F0 + ldr r2, =0x02038c08 ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] bl sub_80B8C60 - ldr r2, _080B84F4 + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -378353,15 +366021,13 @@ _080B84BE: pop {r1} bx r1 .align 2, 0 -_080B84EC: .4byte sub_80B88B4 + 1 -_080B84F0: .4byte 0x02038c08 -_080B84F4: .4byte 0x03005e00 + .pool thumb_func_end sub_80B849C thumb_func_start sub_80B84F8 sub_80B84F8: @ 80B84F8 push {r4-r6,lr} - ldr r5, _080B854C + ldr r5, =0x02038c08 ldr r0, [r5] movs r6, 0x80 lsls r6, 24 @@ -378371,7 +366037,7 @@ sub_80B84F8: @ 80B84F8 movs r1, 0x64 adds r4, r0, 0 muls r4, r1 - ldr r0, _080B8550 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -378397,8 +366063,7 @@ sub_80B84F8: @ 80B84F8 pop {r1} bx r1 .align 2, 0 -_080B854C: .4byte 0x02038c08 -_080B8550: .4byte 0x020244ec + .pool thumb_func_end sub_80B84F8 thumb_func_start sub_80B8554 @@ -378407,8 +366072,8 @@ sub_80B8554: @ 80B8554 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _080B857C - ldr r2, _080B8580 + ldr r3, =0x0855c4a8 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -378422,28 +366087,27 @@ sub_80B8554: @ 80B8554 pop {r0} bx r0 .align 2, 0 -_080B857C: .4byte 0x0855c4a8 -_080B8580: .4byte 0x03005e00 + .pool thumb_func_end sub_80B8554 thumb_func_start sub_80B8584 sub_80B8584: @ 80B8584 push {r4,lr} adds r4, r0, 0 - ldr r0, _080B85E0 + ldr r0, =0x04000048 ldrh r0, [r0] strh r0, [r4, 0x1E] - ldr r0, _080B85E4 + ldr r0, =0x0400004a ldrh r0, [r0] strh r0, [r4, 0x20] adds r0, r4, 0 adds r0, 0x22 - ldr r1, _080B85E8 + ldr r1, =0x030022c0 ldr r1, [r1, 0xC] bl sub_806F67C - ldr r1, _080B85EC + ldr r1, =0x0000f0f1 strh r1, [r4, 0xA] - ldr r0, _080B85F0 + ldr r0, =0x00005051 strh r0, [r4, 0xC] movs r0, 0x3F strh r0, [r4, 0xE] @@ -378460,7 +366124,7 @@ sub_80B8584: @ 80B8584 ldrh r1, [r4, 0x10] movs r0, 0x4A bl lcd_io_set - ldr r0, _080B85F4 + ldr r0, =sub_80B880C + 1 bl SetVBlankCallback ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -378469,12 +366133,7 @@ sub_80B8584: @ 80B8584 pop {r0} bx r0 .align 2, 0 -_080B85E0: .4byte 0x04000048 -_080B85E4: .4byte 0x0400004a -_080B85E8: .4byte 0x030022c0 -_080B85EC: .4byte 0x0000f0f1 -_080B85F0: .4byte 0x00005051 -_080B85F4: .4byte sub_80B880C + 1 + .pool thumb_func_end sub_80B8584 thumb_func_start sub_80B85F8 @@ -378482,7 +366141,7 @@ sub_80B85F8: @ 80B85F8 push {r4-r6,lr} sub sp, 0x4 adds r6, r0, 0 - ldr r0, _080B8650 + ldr r0, =0x04000008 ldrh r1, [r0] lsrs r1, 2 lsls r1, 30 @@ -378491,7 +366150,7 @@ sub_80B85F8: @ 80B85F8 lsrs r4, 8 lsls r4, 27 lsrs r4, 16 - ldr r0, _080B8654 + ldr r0, =0x0855ae50 movs r5, 0xC0 lsls r5, 19 adds r1, r5 @@ -378501,11 +366160,11 @@ sub_80B85F8: @ 80B85F8 movs r0, 0 str r0, [sp] adds r5, r4, r5 - ldr r2, _080B8658 + ldr r2, =0x05000200 mov r0, sp adds r1, r5, 0 bl CpuSet - ldr r0, _080B865C + ldr r0, =0x0855b050 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -378519,10 +366178,7 @@ sub_80B85F8: @ 80B85F8 pop {r0} bx r0 .align 2, 0 -_080B8650: .4byte 0x04000008 -_080B8654: .4byte 0x0855ae50 -_080B8658: .4byte 0x05000200 -_080B865C: .4byte 0x0855b050 + .pool thumb_func_end sub_80B85F8 thumb_func_start sub_80B8660 @@ -378579,7 +366235,7 @@ _080B869C: bne _080B86DC cmp r1, 0x78 bne _080B86DC - ldr r2, _080B86E4 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -378587,7 +366243,7 @@ _080B869C: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _080B86E8 + ldr r1, =sub_80B8CC0 + 1 str r1, [r0] ldrh r0, [r3, 0x8] adds r0, 0x1 @@ -378597,8 +366253,7 @@ _080B86DC: pop {r0} bx r0 .align 2, 0 -_080B86E4: .4byte 0x02020630 -_080B86E8: .4byte sub_80B8CC0 + 1 + .pool thumb_func_end sub_80B8660 thumb_func_start sub_80B86EC @@ -378608,7 +366263,7 @@ sub_80B86EC: @ 80B86EC ldrh r0, [r3, 0x12] subs r0, 0x10 strh r0, [r3, 0x12] - ldr r2, _080B8718 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -378626,7 +366281,7 @@ _080B8712: pop {r0} bx r0 .align 2, 0 -_080B8718: .4byte 0x02020630 + .pool thumb_func_end sub_80B86EC thumb_func_start sub_80B871C @@ -378683,7 +366338,7 @@ sub_80B8770: @ 80B8770 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r0, _080B87B0 + ldr r0, =0x04000008 ldrh r1, [r0] lsrs r1, 8 lsls r1, 27 @@ -378693,7 +366348,7 @@ sub_80B8770: @ 80B8770 movs r0, 0xC0 lsls r0, 19 adds r1, r0 - ldr r2, _080B87B4 + ldr r2, =0x05000200 mov r0, sp bl CpuSet movs r0, 0xF1 @@ -378712,8 +366367,7 @@ sub_80B8770: @ 80B8770 pop {r0} bx r0 .align 2, 0 -_080B87B0: .4byte 0x04000008 -_080B87B4: .4byte 0x05000200 + .pool thumb_func_end sub_80B8770 thumb_func_start overworld_bg_setup_2 @@ -378732,7 +366386,7 @@ overworld_bg_setup_2: @ 80B87B8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B8804 + ldr r1, =0x02020630 adds r0, r1 ldrh r1, [r4, 0x26] lsls r1, 24 @@ -378740,7 +366394,7 @@ overworld_bg_setup_2: @ 80B87B8 bl sub_80B6070 movs r0, 0x6 bl oe_active_list_remove - ldr r0, _080B8808 + ldr r0, =sub_80B8554 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -378750,22 +366404,21 @@ overworld_bg_setup_2: @ 80B87B8 pop {r0} bx r0 .align 2, 0 -_080B8804: .4byte 0x02020630 -_080B8808: .4byte sub_80B8554 + 1 + .pool thumb_func_end overworld_bg_setup_2 thumb_func_start sub_80B880C sub_80B880C: @ 80B880C push {r4,lr} sub sp, 0x4 - ldr r0, _080B886C + ldr r0, =sub_80B8554 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080B8870 + ldr r0, =0x03005e00 adds r4, r0 adds r0, r4, 0 adds r0, 0x22 @@ -378796,8 +366449,7 @@ sub_80B880C: @ 80B880C pop {r0} bx r0 .align 2, 0 -_080B886C: .4byte sub_80B8554 + 1 -_080B8870: .4byte 0x03005e00 + .pool thumb_func_end sub_80B880C thumb_func_start sub_80B8874 @@ -378805,14 +366457,14 @@ sub_80B8874: @ 80B8874 push {r4,r5,lr} lsls r0, 16 lsrs r0, 16 - ldr r1, _080B88A8 + ldr r1, =0x06000140 adds r2, r0, r1 movs r1, 0 - ldr r5, _080B88AC + ldr r5, =0x0855b070 movs r0, 0xF0 lsls r0, 8 adds r4, r0, 0 - ldr r3, _080B88B0 + ldr r3, =0x0000013f _080B888A: lsls r0, r1, 1 adds r0, r5 @@ -378829,9 +366481,7 @@ _080B888A: pop {r0} bx r0 .align 2, 0 -_080B88A8: .4byte 0x06000140 -_080B88AC: .4byte 0x0855b070 -_080B88B0: .4byte 0x0000013f + .pool thumb_func_end sub_80B8874 thumb_func_start sub_80B88B4 @@ -378840,8 +366490,8 @@ sub_80B88B4: @ 80B88B4 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _080B88DC - ldr r2, _080B88E0 + ldr r3, =0x0855c4c4 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -378855,8 +366505,7 @@ sub_80B88B4: @ 80B88B4 pop {r0} bx r0 .align 2, 0 -_080B88DC: .4byte 0x0855c4c4 -_080B88E0: .4byte 0x03005e00 + .pool thumb_func_end sub_80B88B4 thumb_func_start sub_80B88E4 @@ -378871,10 +366520,10 @@ sub_80B88E4: @ 80B88E4 bl lcd_io_set adds r0, r4, 0 adds r0, 0x22 - ldr r1, _080B8918 + ldr r1, =0x030022c0 ldr r1, [r1, 0xC] bl sub_806F67C - ldr r0, _080B891C + ldr r0, =sub_80B8AE0 + 1 bl SetVBlankCallback ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -378883,8 +366532,7 @@ sub_80B88E4: @ 80B88E4 pop {r0} bx r0 .align 2, 0 -_080B8918: .4byte 0x030022c0 -_080B891C: .4byte sub_80B8AE0 + 1 + .pool thumb_func_end sub_80B88E4 thumb_func_start sub_80B8920 @@ -378894,7 +366542,7 @@ sub_80B8920: @ 80B8920 push {r6} sub sp, 0x4 adds r6, r0, 0 - ldr r0, _080B897C + ldr r0, =0x04000008 ldrh r1, [r0] lsrs r1, 2 lsls r1, 30 @@ -378906,7 +366554,7 @@ sub_80B8920: @ 80B8920 movs r0, 0 mov r8, r0 strh r4, [r6, 0x20] - ldr r0, _080B8980 + ldr r0, =0x0855b2f0 movs r5, 0xC0 lsls r5, 19 adds r1, r5 @@ -378915,11 +366563,11 @@ sub_80B8920: @ 80B8920 mov r0, r8 str r0, [sp] adds r4, r5 - ldr r2, _080B8984 + ldr r2, =0x05000200 mov r0, sp adds r1, r4, 0 bl CpuSet - ldr r0, _080B8988 + ldr r0, =0x0855b370 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -378933,10 +366581,7 @@ sub_80B8920: @ 80B8920 pop {r0} bx r0 .align 2, 0 -_080B897C: .4byte 0x04000008 -_080B8980: .4byte 0x0855b2f0 -_080B8984: .4byte 0x05000200 -_080B8988: .4byte 0x0855b370 + .pool thumb_func_end sub_80B8920 thumb_func_start sub_80B898C @@ -378950,10 +366595,10 @@ sub_80B898C: @ 80B898C movs r0, 0x42 movs r1, 0xF0 bl lcd_io_set - ldr r1, _080B89D0 + ldr r1, =0x00002878 movs r0, 0x46 bl lcd_io_set - ldr r2, _080B89D4 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -378961,7 +366606,7 @@ sub_80B898C: @ 80B898C lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _080B89D8 + ldr r1, =sub_80B8CC0 + 1 str r1, [r0] ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -378973,9 +366618,7 @@ _080B89C4: pop {r0} bx r0 .align 2, 0 -_080B89D0: .4byte 0x00002878 -_080B89D4: .4byte 0x02020630 -_080B89D8: .4byte sub_80B8CC0 + 1 + .pool thumb_func_end sub_80B898C thumb_func_start sub_80B89DC @@ -378983,7 +366626,7 @@ sub_80B89DC: @ 80B89DC push {r4,lr} adds r4, r0, 0 bl sub_80B8B28 - ldr r2, _080B8A08 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -379002,7 +366645,7 @@ _080B8A00: pop {r0} bx r0 .align 2, 0 -_080B8A08: .4byte 0x02020630 + .pool thumb_func_end sub_80B89DC thumb_func_start sub_80B8A0C @@ -379016,7 +366659,7 @@ sub_80B8A0C: @ 80B8A0C movs r1, 0 strh r0, [r4, 0xE] strh r1, [r4, 0x10] - ldr r5, _080B8A40 + ldr r5, =0x0000ffff movs r0, 0x42 adds r1, r5, 0 bl lcd_io_set @@ -379030,7 +366673,7 @@ sub_80B8A0C: @ 80B8A0C pop {r0} bx r0 .align 2, 0 -_080B8A40: .4byte 0x0000ffff + .pool thumb_func_end sub_80B8A0C thumb_func_start sub_80B8A44 @@ -379057,7 +366700,7 @@ sub_80B8A64: @ 80B8A64 push {r4,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r0, _080B8AD0 + ldr r0, =0x04000008 ldrh r1, [r0] lsrs r1, 8 lsls r1, 27 @@ -379067,7 +366710,7 @@ sub_80B8A64: @ 80B8A64 movs r0, 0xC0 lsls r0, 19 adds r1, r0 - ldr r2, _080B8AD4 + ldr r2, =0x05000200 mov r0, sp bl CpuSet adds r0, r4, 0 @@ -379082,7 +366725,7 @@ sub_80B8A64: @ 80B8A64 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B8AD8 + ldr r1, =0x02020630 adds r0, r1 ldrh r1, [r4, 0x26] lsls r1, 24 @@ -379090,7 +366733,7 @@ sub_80B8A64: @ 80B8A64 bl sub_80B6070 movs r0, 0x6 bl oe_active_list_remove - ldr r0, _080B8ADC + ldr r0, =sub_80B88B4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -379100,24 +366743,21 @@ sub_80B8A64: @ 80B8A64 pop {r0} bx r0 .align 2, 0 -_080B8AD0: .4byte 0x04000008 -_080B8AD4: .4byte 0x05000200 -_080B8AD8: .4byte 0x02020630 -_080B8ADC: .4byte sub_80B88B4 + 1 + .pool thumb_func_end sub_80B8A64 thumb_func_start sub_80B8AE0 sub_80B8AE0: @ 80B8AE0 push {r4,lr} sub sp, 0x4 - ldr r0, _080B8B20 + ldr r0, =sub_80B88B4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080B8B24 + ldr r0, =0x03005e00 adds r4, r0 adds r0, r4, 0 adds r0, 0x22 @@ -379136,8 +366776,7 @@ sub_80B8AE0: @ 80B8AE0 pop {r0} bx r0 .align 2, 0 -_080B8B20: .4byte sub_80B88B4 + 1 -_080B8B24: .4byte 0x03005e00 + .pool thumb_func_end sub_80B8AE0 thumb_func_start sub_80B8B28 @@ -379186,11 +366825,11 @@ _080B8B54: ands r7, r1 mov r12, r7 ldrh r0, [r5, 0x20] - ldr r1, _080B8BE8 + ldr r1, =0x06000140 adds r1, r0 mov r8, r1 movs r4, 0 - ldr r7, _080B8BEC + ldr r7, =0x0855b390 mov r10, r7 movs r0, 0xF0 lsls r0, 8 @@ -379246,8 +366885,7 @@ _080B8BD8: pop {r1} bx r1 .align 2, 0 -_080B8BE8: .4byte 0x06000140 -_080B8BEC: .4byte 0x0855b390 + .pool thumb_func_end sub_80B8B38 thumb_func_start sub_80B8BF0 @@ -379276,7 +366914,7 @@ _080B8C00: movs r0, 0x1F ands r2, r0 ldrh r0, [r5, 0x20] - ldr r1, _080B8C5C + ldr r1, =0x06000140 adds r6, r0, r1 movs r3, 0 movs r0, 0xF0 @@ -379310,7 +366948,7 @@ _080B8C54: pop {r1} bx r1 .align 2, 0 -_080B8C5C: .4byte 0x06000140 + .pool thumb_func_end sub_80B8BF0 thumb_func_start sub_80B8C60 @@ -379324,7 +366962,7 @@ sub_80B8C60: @ 80B8C60 lsrs r5, 16 lsls r5, 16 lsrs r5, 16 - ldr r0, _080B8CB4 + ldr r0, =0x7fffffff ands r6, r0 lsls r0, r6, 16 lsrs r0, 16 @@ -379340,9 +366978,9 @@ sub_80B8C60: @ 80B8C60 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r1, _080B8CB8 + ldr r1, =0x02020630 adds r2, r1 - ldr r1, _080B8CBC + ldr r1, =nullsub_12 + 1 str r1, [r2, 0x1C] ldrb r3, [r2, 0x5] movs r1, 0xD @@ -379356,9 +366994,7 @@ sub_80B8C60: @ 80B8C60 pop {r1} bx r1 .align 2, 0 -_080B8CB4: .4byte 0x7fffffff -_080B8CB8: .4byte 0x02020630 -_080B8CBC: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80B8C60 thumb_func_start sub_80B8CC0 @@ -379376,7 +367012,7 @@ sub_80B8CC0: @ 80B8CC0 strh r0, [r1, 0x20] movs r0, 0x1E strh r0, [r1, 0x30] - ldr r0, _080B8CF4 + ldr r0, =sub_80B8D04 + 1 str r0, [r1, 0x1C] movs r2, 0x3A ldrsh r0, [r1, r2] @@ -379389,7 +367025,7 @@ sub_80B8CC0: @ 80B8CC0 bl sub_80A32C0 b _080B8D00 .align 2, 0 -_080B8CF4: .4byte sub_80B8D04 + 1 + .pool _080B8CF8: ldrh r0, [r1, 0x2E] movs r1, 0 @@ -379409,13 +367045,13 @@ sub_80B8D04: @ 80B8D04 lsls r0, 16 cmp r0, 0 bne _080B8D18 - ldr r0, _080B8D1C + ldr r0, =sub_80B8D20 + 1 str r0, [r1, 0x1C] _080B8D18: pop {r0} bx r0 .align 2, 0 -_080B8D1C: .4byte sub_80B8D20 + 1 + .pool thumb_func_end sub_80B8D04 thumb_func_start sub_80B8D20 @@ -379444,30 +367080,27 @@ _080B8D3E: thumb_func_start sub_80B8D44 sub_80B8D44: @ 80B8D44 push {lr} - ldr r0, _080B8D74 + ldr r0, =sub_80B8D84 + 1 movs r1, 0xFF bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080B8D78 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _080B8D7C + ldr r0, =0x02038c08 ldr r0, [r0] strh r0, [r1, 0x26] bl sav1_reset_x2C - ldr r0, _080B8D80 + ldr r0, =0x0000016d bl sub_80858C4 movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080B8D74: .4byte sub_80B8D84 + 1 -_080B8D78: .4byte 0x03005e00 -_080B8D7C: .4byte 0x02038c08 -_080B8D80: .4byte 0x0000016d + .pool thumb_func_end sub_80B8D44 thumb_func_start sub_80B8D84 @@ -379476,8 +367109,8 @@ sub_80B8D84: @ 80B8D84 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _080B8DAC - ldr r2, _080B8DB0 + ldr r3, =0x0855c4e0 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -379491,8 +367124,7 @@ sub_80B8D84: @ 80B8D84 pop {r0} bx r0 .align 2, 0 -_080B8DAC: .4byte 0x0855c4e0 -_080B8DB0: .4byte 0x03005e00 + .pool thumb_func_end sub_80B8D84 thumb_func_start sub_80B8DB4 @@ -379503,7 +367135,7 @@ sub_80B8DB4: @ 80B8DB4 adds r4, r0, 0 bl script_env_2_enable bl player_bitmagic - ldr r5, _080B8E0C + ldr r5, =0x02037590 movs r0, 0x1 strb r0, [r5, 0x6] movs r0, 0x8 @@ -379516,7 +367148,7 @@ sub_80B8DB4: @ 80B8DB4 adds r0, r6, 0 mov r1, r8 bl player_get_pos_to - ldr r2, _080B8E10 + ldr r2, =0x02037350 ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -379536,20 +367168,19 @@ sub_80B8DB4: @ 80B8DB4 pop {r0} bx r0 .align 2, 0 -_080B8E0C: .4byte 0x02037590 -_080B8E10: .4byte 0x02037350 + .pool thumb_func_end sub_80B8DB4 thumb_func_start sub_80B8E14 sub_80B8E14: @ 80B8E14 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080B8E58 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B8E5C + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl npc_is_visible_or_is_x40 @@ -379574,26 +367205,25 @@ _080B8E50: pop {r0} bx r0 .align 2, 0 -_080B8E58: .4byte 0x02037590 -_080B8E5C: .4byte 0x02037350 + .pool thumb_func_end sub_80B8E14 thumb_func_start sub_80B8E60 sub_80B8E60: @ 80B8E60 push {r4,lr} adds r4, r0, 0 - ldr r0, _080B8E9C + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B8EA0 + ldr r1, =0x02037350 adds r0, r1 bl npc_get_bit7_or_const_x10_when_inactive lsls r0, 24 cmp r0, 0 beq _080B8E96 - ldr r2, _080B8EA4 + ldr r2, =0x02038c08 movs r1, 0x26 ldrsh r0, [r4, r1] movs r1, 0x80 @@ -379610,9 +367240,7 @@ _080B8E96: pop {r0} bx r0 .align 2, 0 -_080B8E9C: .4byte 0x02037590 -_080B8EA0: .4byte 0x02037350 -_080B8EA4: .4byte 0x02038c08 + .pool thumb_func_end sub_80B8E60 thumb_func_start sub_80B8EA8 @@ -379624,12 +367252,12 @@ sub_80B8EA8: @ 80B8EA8 lsls r0, 24 cmp r0, 0 bne _080B8F12 - ldr r5, _080B8F18 + ldr r5, =0x02037590 ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080B8F1C + ldr r0, =0x02037350 adds r4, r0 movs r0, 0x3 bl sub_808BD8C @@ -379648,7 +367276,7 @@ sub_80B8EA8: @ 80B8EA8 lsrs r1, 24 adds r0, r4, 0 bl npc_set_state_2 - ldr r1, _080B8F20 + ldr r1, =0x02038c08 movs r2, 0xA ldrsh r0, [r6, r2] str r0, [r1] @@ -379668,20 +367296,18 @@ _080B8F12: pop {r0} bx r0 .align 2, 0 -_080B8F18: .4byte 0x02037590 -_080B8F1C: .4byte 0x02037350 -_080B8F20: .4byte 0x02038c08 + .pool thumb_func_end sub_80B8EA8 thumb_func_start sub_80B8F24 sub_80B8F24: @ 80B8F24 push {r4,r5,lr} - ldr r5, _080B8F8C + ldr r5, =0x02037590 ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B8F90 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl sub_8093284 @@ -379709,7 +367335,7 @@ sub_80B8F24: @ 80B8F24 bl script_env_2_disable movs r0, 0x9 bl oe_active_list_remove - ldr r0, _080B8F94 + ldr r0, =sub_80B8D84 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -379719,9 +367345,7 @@ _080B8F84: pop {r0} bx r0 .align 2, 0 -_080B8F8C: .4byte 0x02037590 -_080B8F90: .4byte 0x02037350 -_080B8F94: .4byte sub_80B8D84 + 1 + .pool thumb_func_end sub_80B8F24 thumb_func_start sub_80B8F98 @@ -379729,7 +367353,7 @@ sub_80B8F98: @ 80B8F98 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _080B909C + ldr r0, =0x085059f8 adds r0, 0x90 ldr r0, [r0] movs r2, 0x18 @@ -379743,7 +367367,7 @@ sub_80B8F98: @ 80B8F98 lsls r1, r0, 4 add r1, r8 lsls r1, 2 - ldr r0, _080B90A0 + ldr r0, =0x02020630 adds r1, r0 ldrb r2, [r1, 0x5] movs r0, 0xD @@ -379760,21 +367384,21 @@ sub_80B8F98: @ 80B8F98 strh r2, [r1, 0x2E] strh r2, [r1, 0x30] strh r2, [r1, 0x32] - ldr r0, _080B90A4 + ldr r0, =0x0000ffff strh r0, [r1, 0x34] ldrh r0, [r1, 0x22] strh r0, [r1, 0x36] strh r2, [r1, 0x38] - ldr r1, _080B90A8 + ldr r1, =0x00003e41 movs r0, 0x50 bl lcd_io_set - ldr r1, _080B90AC + ldr r1, =0x00000e0e movs r0, 0x52 bl lcd_io_set - ldr r1, _080B90B0 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r0, _080B90B4 + ldr r0, =0x0855b610 movs r1, 0xC0 movs r2, 0x20 bl gpu_pal_apply @@ -379782,8 +367406,8 @@ sub_80B8F98: @ 80B8F98 movs r1, 0x78 bl lcd_io_set movs r4, 0x3 - ldr r7, _080B90B8 - ldr r0, _080B90BC + ldr r7, =0x0600f800 + ldr r0, =0x0000bff4 adds r6, r0, 0 _080B901A: movs r2, 0xC @@ -379810,7 +367434,7 @@ _080B9024: cmp r4, 0xE bls _080B901A movs r0, 0 - ldr r5, _080B90C0 + ldr r5, =0x0855b630 _080B904A: movs r4, 0 adds r7, r0, 0x1 @@ -379818,7 +367442,7 @@ _080B904A: _080B9050: lsls r1, r4, 2 adds r1, r6, r1 - ldr r0, _080B90C4 + ldr r0, =0x06008020 adds r3, r1, r0 adds r0, r1, 0x1 adds r0, r5 @@ -379828,7 +367452,7 @@ _080B9050: ldrb r0, [r0] adds r0, r2 strh r0, [r3] - ldr r0, _080B90C8 + ldr r0, =0x06008022 adds r3, r1, r0 adds r0, r1, 0x3 adds r0, r5 @@ -379855,24 +367479,13 @@ _080B9050: pop {r1} bx r1 .align 2, 0 -_080B909C: .4byte 0x085059f8 -_080B90A0: .4byte 0x02020630 -_080B90A4: .4byte 0x0000ffff -_080B90A8: .4byte 0x00003e41 -_080B90AC: .4byte 0x00000e0e -_080B90B0: .4byte 0x00003f3f -_080B90B4: .4byte 0x0855b610 -_080B90B8: .4byte 0x0600f800 -_080B90BC: .4byte 0x0000bff4 -_080B90C0: .4byte 0x0855b630 -_080B90C4: .4byte 0x06008020 -_080B90C8: .4byte 0x06008022 + .pool thumb_func_end sub_80B8F98 thumb_func_start sub_80B90CC sub_80B90CC: @ 80B90CC push {r4,lr} - ldr r0, _080B9118 + ldr r0, =0x085059f8 ldr r0, [r0, 0x68] movs r1, 0x78 movs r2, 0 @@ -379884,7 +367497,7 @@ sub_80B90CC: @ 80B90CC lsls r2, r4, 4 adds r2, r4 lsls r2, 2 - ldr r0, _080B911C + ldr r0, =0x02020630 adds r2, r0 ldrb r1, [r2, 0x5] movs r0, 0xF @@ -379895,9 +367508,9 @@ sub_80B90CC: @ 80B90CC movs r1, 0x4 orrs r0, r1 strb r0, [r2, 0x5] - ldr r0, _080B9120 + ldr r0, =sub_80B9128 + 1 str r0, [r2, 0x1C] - ldr r0, _080B9124 + ldr r0, =0x02038c08 ldr r0, [r0] strh r0, [r2, 0x30] movs r0, 0x9E @@ -379907,10 +367520,7 @@ sub_80B90CC: @ 80B90CC pop {r1} bx r1 .align 2, 0 -_080B9118: .4byte 0x085059f8 -_080B911C: .4byte 0x02020630 -_080B9120: .4byte sub_80B9128 + 1 -_080B9124: .4byte 0x02038c08 + .pool thumb_func_end sub_80B90CC thumb_func_start sub_80B9128 @@ -379942,7 +367552,7 @@ sub_80B9128: @ 80B9128 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080B91A0 + ldr r0, =0x02020630 adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -379975,32 +367585,30 @@ _080B919A: pop {r0} bx r0 .align 2, 0 -_080B91A0: .4byte 0x02020630 + .pool thumb_func_end sub_80B9128 thumb_func_start sub_80B91A4 sub_80B91A4: @ 80B91A4 push {lr} - ldr r0, _080B91C8 + ldr r0, =sub_80B91D4 + 1 movs r1, 0xFE bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080B91CC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _080B91D0 + ldr r0, =0x02038c08 ldr r0, [r0] strh r0, [r1, 0xA] movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080B91C8: .4byte sub_80B91D4 + 1 -_080B91CC: .4byte 0x03005e00 -_080B91D0: .4byte 0x02038c08 + .pool thumb_func_end sub_80B91A4 thumb_func_start sub_80B91D4 @@ -380009,8 +367617,8 @@ sub_80B91D4: @ 80B91D4 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _080B91FC - ldr r2, _080B9200 + ldr r3, =0x0855c4f4 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -380024,20 +367632,19 @@ sub_80B91D4: @ 80B91D4 pop {r0} bx r0 .align 2, 0 -_080B91FC: .4byte 0x0855c4f4 -_080B9200: .4byte 0x03005e00 + .pool thumb_func_end sub_80B91D4 thumb_func_start sub_80B9204 sub_80B9204: @ 80B9204 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _080B9254 + ldr r6, =0x02037590 ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B9258 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl npc_is_visible_or_is_x40 @@ -380067,20 +367674,19 @@ _080B924C: pop {r0} bx r0 .align 2, 0 -_080B9254: .4byte 0x02037590 -_080B9258: .4byte 0x02037350 + .pool thumb_func_end sub_80B9204 thumb_func_start sub_80B925C sub_80B925C: @ 80B925C push {r4,lr} adds r4, r0, 0 - ldr r0, _080B9294 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B9298 + ldr r1, =0x02037350 adds r0, r1 bl sub_8093284 lsls r0, 24 @@ -380089,7 +367695,7 @@ sub_80B925C: @ 80B925C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r1, _080B929C + ldr r1, =0x02038c08 movs r2, 0xA ldrsh r0, [r4, r2] str r0, [r1] @@ -380100,9 +367706,7 @@ _080B928C: pop {r0} bx r0 .align 2, 0 -_080B9294: .4byte 0x02037590 -_080B9298: .4byte 0x02037350 -_080B929C: .4byte 0x02038c08 + .pool thumb_func_end sub_80B925C thumb_func_start sub_80B92A0 @@ -380114,12 +367718,12 @@ sub_80B92A0: @ 80B92A0 lsls r0, 24 cmp r0, 0 bne _080B92E8 - ldr r0, _080B92F0 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B92F4 + ldr r1, =0x02037350 adds r5, r0, r1 ldrh r1, [r4, 0x26] movs r0, 0x8 @@ -380145,8 +367749,7 @@ _080B92E8: pop {r0} bx r0 .align 2, 0 -_080B92F0: .4byte 0x02037590 -_080B92F4: .4byte 0x02037350 + .pool thumb_func_end sub_80B92A0 thumb_func_start sub_80B92F8 @@ -380165,12 +367768,12 @@ sub_80B92F8: @ 80B92F8 strh r0, [r4, 0xC] movs r0, 0x1 bl walkrun_set_bike_bits - ldr r0, _080B9334 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B9338 + ldr r1, =0x02037350 adds r0, r1 movs r1, 0x2 bl npc_set_state_2 @@ -380179,20 +367782,19 @@ _080B932C: pop {r0} bx r0 .align 2, 0 -_080B9334: .4byte 0x02037590 -_080B9338: .4byte 0x02037350 + .pool thumb_func_end sub_80B92F8 thumb_func_start sub_80B933C sub_80B933C: @ 80B933C push {r4,lr} adds r4, r0, 0 - ldr r0, _080B9388 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B938C + ldr r1, =0x02037350 adds r2, r0, r1 ldrh r1, [r4, 0xC] movs r3, 0xC @@ -380222,8 +367824,7 @@ _080B9380: pop {r0} bx r0 .align 2, 0 -_080B9388: .4byte 0x02037590 -_080B938C: .4byte 0x02037350 + .pool thumb_func_end sub_80B933C thumb_func_start sub_80B9390 @@ -380237,12 +367838,12 @@ sub_80B9390: @ 80B9390 asrs r0, 16 cmp r0, 0x7 ble _080B9406 - ldr r0, _080B940C + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B9410 + ldr r1, =0x02037350 adds r4, r0, r1 movs r0, 0x3 bl sub_808BD8C @@ -380255,7 +367856,7 @@ sub_80B9390: @ 80B9390 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, _080B9414 + ldr r6, =0x02020630 adds r0, r6 movs r1, 0x16 bl obj_anim_image_start @@ -380288,9 +367889,7 @@ _080B9406: pop {r0} bx r0 .align 2, 0 -_080B940C: .4byte 0x02037590 -_080B9410: .4byte 0x02037350 -_080B9414: .4byte 0x02020630 + .pool thumb_func_end sub_80B9390 thumb_func_start sub_80B9418 @@ -380304,12 +367903,12 @@ sub_80B9418: @ 80B9418 asrs r0, 16 cmp r0, 0x9 ble _080B9464 - ldr r0, _080B946C + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080B9470 + ldr r0, =0x02037350 adds r4, r0 adds r0, r4, 0 bl npc_hide_and_trainer_flag_clear_on_tile_x66_at_pos @@ -380335,8 +367934,7 @@ _080B9464: pop {r0} bx r0 .align 2, 0 -_080B946C: .4byte 0x02037590 -_080B9470: .4byte 0x02037350 + .pool thumb_func_end sub_80B9418 thumb_func_start sub_80B9474 @@ -380361,7 +367959,7 @@ _080B948E: thumb_func_start sub_80B9494 sub_80B9494: @ 80B9494 push {lr} - ldr r0, _080B94BC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -380369,7 +367967,7 @@ sub_80B9494: @ 80B9494 bne _080B94B6 movs r0, 0x1F bl oe_active_list_remove - ldr r0, _080B94C0 + ldr r0, =sub_80B91D4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -380378,14 +367976,13 @@ _080B94B6: pop {r0} bx r0 .align 2, 0 -_080B94BC: .4byte 0x02037fd4 -_080B94C0: .4byte sub_80B91D4 + 1 + .pool thumb_func_end sub_80B9494 thumb_func_start sub_80B94C4 sub_80B94C4: @ 80B94C4 push {lr} - ldr r0, _080B94FC + ldr r0, =0x085059f8 ldr r0, [r0, 0x68] movs r1, 0xFF movs r2, 0xB4 @@ -380396,7 +367993,7 @@ sub_80B94C4: @ 80B94C4 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r1, _080B9500 + ldr r1, =0x02020630 adds r2, r1 ldrb r3, [r2, 0x5] movs r1, 0xF @@ -380407,21 +368004,19 @@ sub_80B94C4: @ 80B94C4 movs r3, 0x4 orrs r1, r3 strb r1, [r2, 0x5] - ldr r1, _080B9504 + ldr r1, =sub_80B957C + 1 str r1, [r2, 0x1C] pop {r1} bx r1 .align 2, 0 -_080B94FC: .4byte 0x085059f8 -_080B9500: .4byte 0x02020630 -_080B9504: .4byte sub_80B957C + 1 + .pool thumb_func_end sub_80B94C4 thumb_func_start sub_80B9508 sub_80B9508: @ 80B9508 lsls r0, 24 lsrs r0, 24 - ldr r2, _080B9520 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -380431,7 +368026,7 @@ sub_80B9508: @ 80B9508 lsrs r0, 24 bx lr .align 2, 0 -_080B9520: .4byte 0x02020630 + .pool thumb_func_end sub_80B9508 thumb_func_start sub_80B9524 @@ -380442,9 +368037,9 @@ sub_80B9524: @ 80B9524 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080B9558 + ldr r0, =0x02020630 adds r4, r0 - ldr r0, _080B955C + ldr r0, =sub_80B963C + 1 str r0, [r4, 0x1C] movs r1, 0 movs r0, 0x78 @@ -380462,8 +368057,7 @@ sub_80B9524: @ 80B9524 pop {r0} bx r0 .align 2, 0 -_080B9558: .4byte 0x02020630 -_080B955C: .4byte sub_80B963C + 1 + .pool thumb_func_end sub_80B9524 thumb_func_start sub_80B9560 @@ -380472,7 +368066,7 @@ sub_80B9560: @ 80B9560 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r3, _080B9578 + ldr r3, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -380480,7 +368074,7 @@ sub_80B9560: @ 80B9560 strh r1, [r2, 0x3A] bx lr .align 2, 0 -_080B9578: .4byte 0x02020630 + .pool thumb_func_end sub_80B9560 thumb_func_start sub_80B957C @@ -380499,7 +368093,7 @@ sub_80B957C: @ 80B957C movs r1, 0x3 orrs r0, r1 strb r0, [r4, 0x1] - ldr r0, _080B9630 + ldr r0, =0x0855c548 str r0, [r4, 0x10] adds r0, r4, 0 bl obj_alloc_rotscale_entry @@ -380508,7 +368102,7 @@ sub_80B957C: @ 80B957C bl sub_8008258 movs r0, 0x76 strh r0, [r4, 0x20] - ldr r0, _080B9634 + ldr r0, =0x0000ffd0 strh r0, [r4, 0x22] ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -380537,7 +368131,7 @@ _080B95C0: ldrh r2, [r4, 0x32] movs r0, 0x32 ldrsh r1, [r4, r0] - ldr r0, _080B9638 + ldr r0, =0x000007ff cmp r1, r0 bgt _080B95F6 adds r0, r2, 0 @@ -380572,9 +368166,7 @@ _080B9628: pop {r0} bx r0 .align 2, 0 -_080B9630: .4byte 0x0855c548 -_080B9634: .4byte 0x0000ffd0 -_080B9638: .4byte 0x000007ff + .pool thumb_func_end sub_80B957C thumb_func_start sub_80B963C @@ -380604,7 +368196,7 @@ sub_80B963C: @ 80B963C lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080B96AC + ldr r0, =0x02020630 adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -380636,7 +368228,7 @@ _080B96A6: pop {r0} bx r0 .align 2, 0 -_080B96AC: .4byte 0x02020630 + .pool thumb_func_end sub_80B963C thumb_func_start sub_80B96B0 @@ -380655,7 +368247,7 @@ sub_80B96B0: @ 80B96B0 movs r1, 0x3 orrs r0, r1 strb r0, [r4, 0x1] - ldr r0, _080B978C + ldr r0, =0x0855c548 str r0, [r4, 0x10] adds r0, r4, 0 bl obj_alloc_rotscale_entry @@ -380664,7 +368256,7 @@ sub_80B96B0: @ 80B96B0 bl sub_8008258 movs r0, 0x5E strh r0, [r4, 0x20] - ldr r0, _080B9790 + ldr r0, =0x0000ffe0 strh r0, [r4, 0x22] ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -380751,8 +368343,7 @@ _080B9784: pop {r0} bx r0 .align 2, 0 -_080B978C: .4byte 0x0855c548 -_080B9790: .4byte 0x0000ffe0 + .pool thumb_func_end sub_80B96B0 thumb_func_start sub_80B9794 @@ -380763,33 +368354,32 @@ sub_80B9794: @ 80B9794 lsrs r4, 24 adds r0, r4, 0 bl sub_80B9524 - ldr r1, _080B97B8 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 adds r1, 0x1C adds r0, r1 - ldr r1, _080B97BC + ldr r1, =sub_80B96B0 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080B97B8: .4byte 0x02020630 -_080B97BC: .4byte sub_80B96B0 + 1 + .pool thumb_func_end sub_80B9794 thumb_func_start sub_80B97C0 sub_80B97C0: @ 80B97C0 push {lr} - ldr r0, _080B97D0 + ldr r0, =sub_80B97D4 + 1 movs r1, 0xFE bl AddTask movs r0, 0 pop {r1} bx r1 .align 2, 0 -_080B97D0: .4byte sub_80B97D4 + 1 + .pool thumb_func_end sub_80B97C0 thumb_func_start sub_80B97D4 @@ -380798,8 +368388,8 @@ sub_80B97D4: @ 80B97D4 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _080B97FC - ldr r2, _080B9800 + ldr r3, =0x0855c550 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -380813,20 +368403,19 @@ sub_80B97D4: @ 80B97D4 pop {r0} bx r0 .align 2, 0 -_080B97FC: .4byte 0x0855c550 -_080B9800: .4byte 0x03005e00 + .pool thumb_func_end sub_80B97D4 thumb_func_start sub_80B9804 sub_80B9804: @ 80B9804 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _080B98AC + ldr r6, =0x02037590 ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B98B0 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl npc_is_visible_or_is_x40 @@ -380873,7 +368462,7 @@ _080B9856: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B98B4 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x16 bl obj_anim_image_start @@ -380895,9 +368484,7 @@ _080B98A6: pop {r0} bx r0 .align 2, 0 -_080B98AC: .4byte 0x02037590 -_080B98B0: .4byte 0x02037350 -_080B98B4: .4byte 0x02020630 + .pool thumb_func_end sub_80B9804 thumb_func_start sub_80B98B8 @@ -380915,18 +368502,18 @@ sub_80B98B8: @ 80B98B8 cmp r0, 0 bne _080B9910 _080B98D0: - ldr r0, _080B9918 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B991C + ldr r1, =0x02037350 adds r0, r1 ldrb r0, [r0, 0x4] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080B9920 + ldr r0, =0x02020630 adds r4, r0 ldrb r0, [r5, 0xA] movs r1, 0x40 @@ -380951,9 +368538,7 @@ _080B9910: pop {r0} bx r0 .align 2, 0 -_080B9918: .4byte 0x02037590 -_080B991C: .4byte 0x02037350 -_080B9920: .4byte 0x02020630 + .pool thumb_func_end sub_80B98B8 thumb_func_start sub_80B9924 @@ -380961,16 +368546,16 @@ sub_80B9924: @ 80B9924 push {r4,lr} sub sp, 0x24 adds r4, r0, 0 - ldr r1, _080B996C + ldr r1, =0x0855c56c mov r0, sp movs r2, 0x24 bl memcpy - ldr r0, _080B9970 + ldr r0, =0x02037590 ldrb r0, [r0, 0x4] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080B9974 + ldr r0, =0x02020630 adds r1, r0 movs r2, 0xC ldrsh r0, [r4, r2] @@ -380994,9 +368579,7 @@ _080B9962: pop {r0} bx r0 .align 2, 0 -_080B996C: .4byte 0x0855c56c -_080B9970: .4byte 0x02037590 -_080B9974: .4byte 0x02020630 + .pool thumb_func_end sub_80B9924 thumb_func_start sub_80B9978 @@ -381008,18 +368591,18 @@ sub_80B9978: @ 80B9978 lsls r0, 24 cmp r0, 0 beq _080B99DC - ldr r0, _080B99E4 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r5, r0, 3 adds r5, r0 lsls r5, 2 - ldr r0, _080B99E8 + ldr r0, =0x02037350 adds r5, r0 ldrb r0, [r5, 0x4] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080B99EC + ldr r0, =0x02020630 adds r4, r0 ldrb r1, [r5, 0x1] movs r0, 0x11 @@ -381052,21 +368635,19 @@ _080B99DC: pop {r0} bx r0 .align 2, 0 -_080B99E4: .4byte 0x02037590 -_080B99E8: .4byte 0x02037350 -_080B99EC: .4byte 0x02020630 + .pool thumb_func_end sub_80B9978 thumb_func_start sub_80B99F0 sub_80B99F0: @ 80B99F0 push {r4,lr} adds r4, r0, 0 - ldr r0, _080B9A20 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B9A24 + ldr r1, =0x02037350 adds r0, r1 bl sub_8093284 lsls r0, 24 @@ -381082,8 +368663,7 @@ _080B9A18: pop {r0} bx r0 .align 2, 0 -_080B9A20: .4byte 0x02037590 -_080B9A24: .4byte 0x02037350 + .pool thumb_func_end sub_80B99F0 thumb_func_start sub_80B9A28 @@ -381100,7 +368680,7 @@ sub_80B9A28: @ 80B9A28 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B9A5C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles ldrh r0, [r4, 0x8] @@ -381113,7 +368693,7 @@ _080B9A54: pop {r0} bx r0 .align 2, 0 -_080B9A5C: .4byte 0x02020630 + .pool thumb_func_end sub_80B9A28 thumb_func_start fishE @@ -381126,12 +368706,12 @@ fishE: @ 80B9A60 lsls r0, 16 cmp r0, 0 bne _080B9ACA - ldr r6, _080B9AD0 + ldr r6, =0x02037590 ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080B9AD4 + ldr r1, =0x02037350 adds r4, r0, r1 movs r7, 0 ldrh r1, [r5, 0x26] @@ -381160,7 +368740,7 @@ _080B9A94: strb r0, [r6, 0x6] movs r0, 0x20 bl oe_active_list_remove - ldr r0, _080B9AD8 + ldr r0, =sub_80B97D4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -381170,16 +368750,14 @@ _080B9ACA: pop {r0} bx r0 .align 2, 0 -_080B9AD0: .4byte 0x02037590 -_080B9AD4: .4byte 0x02037350 -_080B9AD8: .4byte sub_80B97D4 + 1 + .pool thumb_func_end fishE thumb_func_start sub_80B9ADC sub_80B9ADC: @ 80B9ADC push {r4,lr} sub sp, 0x4 - ldr r4, _080B9B20 + ldr r4, =0x02038c08 ldrb r0, [r4] ldrb r1, [r4, 0x4] ldrb r2, [r4, 0x8] @@ -381188,12 +368766,12 @@ sub_80B9ADC: @ 80B9ADC lsls r0, 24 cmp r0, 0 bne _080B9B2C - ldr r0, _080B9B24 + ldr r0, =sub_80B9BE8 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080B9B28 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -381209,9 +368787,7 @@ sub_80B9ADC: @ 80B9ADC strh r0, [r1, 0x18] b _080B9B32 .align 2, 0 -_080B9B20: .4byte 0x02038c08 -_080B9B24: .4byte sub_80B9BE8 + 1 -_080B9B28: .4byte 0x03005e00 + .pool _080B9B2C: movs r0, 0x41 bl oe_active_list_remove @@ -381231,7 +368807,7 @@ sub_80B9B3C: @ 80B9B3C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080B9B74 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0xE ldrsh r0, [r4, r1] @@ -381254,7 +368830,7 @@ sub_80B9B3C: @ 80B9B3C subs r0, r1, 0x1 b _080B9B7A .align 2, 0 -_080B9B74: .4byte 0x03005e08 + .pool _080B9B78: movs r0, 0x4 _080B9B7A: @@ -381306,7 +368882,7 @@ _080B9BC8: sub_80B9BD0: @ 80B9BD0 lsls r0, 24 lsrs r0, 24 - ldr r2, _080B9BE4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -381315,7 +368891,7 @@ sub_80B9BD0: @ 80B9BD0 strh r0, [r1, 0x16] bx lr .align 2, 0 -_080B9BE4: .4byte 0x03005e00 + .pool thumb_func_end sub_80B9BD0 thumb_func_start sub_80B9BE8 @@ -381327,12 +368903,12 @@ sub_80B9BE8: @ 80B9BE8 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _080B9C20 + ldr r0, =0x03005e08 adds r4, r0 bl sub_808A2E4 movs r0, 0 bl sub_808A2C0 - ldr r1, _080B9C24 + ldr r1, =0x0855c590 movs r2, 0x2 ldrsh r0, [r4, r2] lsls r0, 2 @@ -381345,15 +368921,14 @@ sub_80B9BE8: @ 80B9BE8 pop {r0} bx r0 .align 2, 0 -_080B9C20: .4byte 0x03005e08 -_080B9C24: .4byte 0x0855c590 + .pool thumb_func_end sub_80B9BE8 thumb_func_start sub_80B9C28 sub_80B9C28: @ 80B9C28 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080B9C50 + ldr r0, =sub_80B9B3C + 1 movs r1, 0x5A bl AddTask adds r4, r0, 0 @@ -381369,7 +368944,7 @@ sub_80B9C28: @ 80B9C28 pop {r0} bx r0 .align 2, 0 -_080B9C50: .4byte sub_80B9B3C + 1 + .pool thumb_func_end sub_80B9C28 thumb_func_start sub_80B9C54 @@ -381384,7 +368959,7 @@ sub_80B9C54: @ 80B9C54 asrs r0, 16 cmp r0, 0x78 ble _080B9CC2 - ldr r2, _080B9CCC + ldr r2, =0x02037350 movs r1, 0x4 ldrsh r0, [r7, r1] lsls r1, r0, 3 @@ -381395,14 +368970,14 @@ sub_80B9C54: @ 80B9C54 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080B9CD0 + ldr r0, =0x02020630 adds r4, r0 ldrb r0, [r1, 0x1] movs r2, 0x20 orrs r0, r2 strb r0, [r1, 0x1] - ldr r6, _080B9CD4 - ldr r5, _080B9CD8 + ldr r6, =0x0000ffff + ldr r5, =0x00007fff adds r0, r6, 0 movs r1, 0x10 adds r2, r5, 0 @@ -381430,10 +369005,7 @@ _080B9CC2: pop {r0} bx r0 .align 2, 0 -_080B9CCC: .4byte 0x02037350 -_080B9CD0: .4byte 0x02020630 -_080B9CD4: .4byte 0x0000ffff -_080B9CD8: .4byte 0x00007fff + .pool thumb_func_end sub_80B9C54 thumb_func_start sub_80B9CDC @@ -381442,13 +369014,13 @@ sub_80B9CDC: @ 80B9CDC adds r4, r0, 0 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _080B9D1C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080B9D16 - ldr r0, _080B9D20 + ldr r0, =sub_80B9B3C + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -381467,8 +369039,7 @@ _080B9D16: pop {r0} bx r0 .align 2, 0 -_080B9D1C: .4byte 0x02037fd4 -_080B9D20: .4byte sub_80B9B3C + 1 + .pool thumb_func_end sub_80B9CDC thumb_func_start sub_80B9D24 @@ -381477,7 +369048,7 @@ sub_80B9D24: @ 80B9D24 mov r7, r8 push {r7} adds r6, r0, 0 - ldr r0, _080B9DA8 + ldr r0, =0x03005dec movs r1, 0 ldrsh r2, [r0, r1] movs r3, 0x20 @@ -381486,7 +369057,7 @@ sub_80B9D24: @ 80B9D24 movs r1, 0x24 ldrsh r0, [r6, r1] adds r2, r0 - ldr r0, _080B9DAC + ldr r0, =0x03005de8 movs r3, 0 ldrsh r0, [r0, r3] movs r3, 0x22 @@ -381501,7 +369072,7 @@ sub_80B9D24: @ 80B9D24 mov r8, r2 lsls r7, r0, 16 _080B9D5A: - ldr r0, _080B9DB0 + ldr r0, =0x0855c5ec mov r2, r8 asrs r1, r2, 16 asrs r2, r7, 16 @@ -381514,7 +369085,7 @@ _080B9D5A: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080B9DB4 + ldr r0, =0x02020630 adds r4, r0 lsls r1, r5, 24 lsrs r1, 24 @@ -381539,10 +369110,7 @@ _080B9D96: pop {r0} bx r0 .align 2, 0 -_080B9DA8: .4byte 0x03005dec -_080B9DAC: .4byte 0x03005de8 -_080B9DB0: .4byte 0x0855c5ec -_080B9DB4: .4byte 0x02020630 + .pool thumb_func_end sub_80B9D24 thumb_func_start sub_80B9DB8 @@ -381618,7 +369186,7 @@ _080B9E24: sub_80B9E28: @ 80B9E28 push {r4-r7,lr} sub sp, 0x4 - ldr r7, _080B9EC8 + ldr r7, =0x02038c08 ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] @@ -381632,7 +369200,7 @@ sub_80B9E28: @ 80B9E28 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080B9ECC + ldr r0, =0x02037350 adds r4, r0 movs r0, 0x10 ldrsh r5, [r4, r0] @@ -381654,19 +369222,19 @@ sub_80B9E28: @ 80B9E28 asrs r2, 16 adds r0, r4, 0 bl npc_coords_shift - ldr r0, _080B9ED0 + ldr r0, =sub_80B9EDC + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r1, _080B9ED4 + ldr r1, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 adds r2, r1 ldrb r0, [r4, 0x4] strh r0, [r2, 0xA] - ldr r3, _080B9ED8 + ldr r3, =0x02020630 ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -381695,11 +369263,7 @@ _080B9EBE: pop {r1} bx r1 .align 2, 0 -_080B9EC8: .4byte 0x02038c08 -_080B9ECC: .4byte 0x02037350 -_080B9ED0: .4byte sub_80B9EDC + 1 -_080B9ED4: .4byte 0x03005e00 -_080B9ED8: .4byte 0x02020630 + .pool thumb_func_end sub_80B9E28 thumb_func_start sub_80B9EDC @@ -381710,14 +369274,14 @@ sub_80B9EDC: @ 80B9EDC lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _080B9F08 + ldr r1, =0x03005e08 adds r5, r0, r1 movs r0, 0x2 ldrsh r1, [r5, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B9F0C + ldr r1, =0x02020630 adds r6, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -381727,8 +369291,7 @@ sub_80B9EDC: @ 80B9EDC beq _080B9F4E b _080B9FAC .align 2, 0 -_080B9F08: .4byte 0x03005e08 -_080B9F0C: .4byte 0x02020630 + .pool _080B9F10: ldrh r0, [r6, 0x20] lsls r0, 4 @@ -381789,7 +369352,7 @@ _080B9F7C: lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _080B9FB4 + ldr r0, =0x02037350 adds r4, r0 ldrh r0, [r5, 0x4] strh r0, [r6, 0x20] @@ -381810,22 +369373,22 @@ _080B9FAC: pop {r0} bx r0 .align 2, 0 -_080B9FB4: .4byte 0x02037350 + .pool thumb_func_end sub_80B9EDC thumb_func_start remove_some_task remove_some_task: @ 80B9FB8 push {r4,lr} - ldr r4, _080B9FE8 + ldr r4, =0x02039b28 movs r0, 0 strb r0, [r4, 0x15] - ldr r1, _080B9FEC + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _080B9FF0 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _080B9FF4 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] @@ -381840,10 +369403,7 @@ _080B9FE2: pop {r0} bx r0 .align 2, 0 -_080B9FE8: .4byte 0x02039b28 -_080B9FEC: .4byte 0x040000b0 -_080B9FF0: .4byte 0x0000c5ff -_080B9FF4: .4byte 0x00007fff + .pool thumb_func_end remove_some_task thumb_func_start dp12_8087EA4 @@ -381853,10 +369413,10 @@ dp12_8087EA4: @ 80B9FF8 mov r0, sp movs r4, 0 strh r4, [r0] - ldr r1, _080BA02C - ldr r2, _080BA030 + ldr r1, =0x02038c28 + ldr r2, =0x01000780 bl CpuSet - ldr r0, _080BA034 + ldr r0, =0x02039b28 movs r1, 0 str r1, [r0] str r1, [r0, 0x4] @@ -381873,9 +369433,7 @@ dp12_8087EA4: @ 80B9FF8 pop {r0} bx r0 .align 2, 0 -_080BA02C: .4byte 0x02038c28 -_080BA030: .4byte 0x01000780 -_080BA034: .4byte 0x02039b28 + .pool thumb_func_end dp12_8087EA4 thumb_func_start sub_80BA038 @@ -381885,32 +369443,29 @@ sub_80BA038: @ 80BA038 str r0, [sp] str r1, [sp, 0x4] str r2, [sp, 0x8] - ldr r0, _080BA05C + ldr r0, =0xa2600001 cmp r1, r0 bne _080BA06C - ldr r0, _080BA060 - ldr r1, _080BA064 + ldr r0, =0x02039b28 + ldr r1, =0x02038c2a str r1, [r0] movs r2, 0xF0 lsls r2, 3 adds r1, r2 str r1, [r0, 0x4] - ldr r1, _080BA068 + ldr r1, =sub_80BA134 + 1 b _080BA07C .align 2, 0 -_080BA05C: .4byte 0xa2600001 -_080BA060: .4byte 0x02039b28 -_080BA064: .4byte 0x02038c2a -_080BA068: .4byte sub_80BA134 + 1 + .pool _080BA06C: - ldr r0, _080BA09C - ldr r1, _080BA0A0 + ldr r0, =0x02039b28 + ldr r1, =0x02038c2c str r1, [r0] movs r2, 0xF0 lsls r2, 3 adds r1, r2 str r1, [r0, 0x4] - ldr r1, _080BA0A4 + ldr r1, =sub_80BA154 + 1 _080BA07C: str r1, [r0, 0x10] adds r1, r0, 0 @@ -381929,15 +369484,13 @@ _080BA07C: pop {r0} bx r0 .align 2, 0 -_080BA09C: .4byte 0x02039b28 -_080BA0A0: .4byte 0x02038c2c -_080BA0A4: .4byte sub_80BA154 + 1 + .pool thumb_func_end sub_80BA038 thumb_func_start sub_80BA0A8 sub_80BA0A8: @ 80BA0A8 push {r4,lr} - ldr r4, _080BA0D8 + ldr r4, =0x02039b28 ldrb r0, [r4, 0x15] cmp r0, 0 beq _080BA122 @@ -381945,34 +369498,30 @@ sub_80BA0A8: @ 80BA0A8 bne _080BA0EC movs r0, 0 strb r0, [r4, 0x15] - ldr r1, _080BA0DC + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _080BA0E0 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _080BA0E4 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] - ldr r1, _080BA0E8 + ldr r1, =0x02039b44 movs r0, 0x1 strb r0, [r1] b _080BA122 .align 2, 0 -_080BA0D8: .4byte 0x02039b28 -_080BA0DC: .4byte 0x040000b0 -_080BA0E0: .4byte 0x0000c5ff -_080BA0E4: .4byte 0x00007fff -_080BA0E8: .4byte 0x02039b44 + .pool _080BA0EC: - ldr r1, _080BA128 + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _080BA12C + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _080BA130 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] @@ -381997,45 +369546,41 @@ _080BA122: pop {r0} bx r0 .align 2, 0 -_080BA128: .4byte 0x040000b0 -_080BA12C: .4byte 0x0000c5ff -_080BA130: .4byte 0x00007fff + .pool thumb_func_end sub_80BA0A8 thumb_func_start sub_80BA134 sub_80BA134: @ 80BA134 - ldr r0, _080BA14C + ldr r0, =0x02039b28 ldr r2, [r0, 0x8] ldrb r1, [r0, 0x14] lsls r0, r1, 4 subs r0, r1 lsls r0, 7 - ldr r1, _080BA150 + ldr r1, =0x02038c28 adds r0, r1 ldrh r0, [r0] strh r0, [r2] bx lr .align 2, 0 -_080BA14C: .4byte 0x02039b28 -_080BA150: .4byte 0x02038c28 + .pool thumb_func_end sub_80BA134 thumb_func_start sub_80BA154 sub_80BA154: @ 80BA154 - ldr r0, _080BA16C + ldr r0, =0x02039b28 ldr r2, [r0, 0x8] ldrb r1, [r0, 0x14] lsls r0, r1, 4 subs r0, r1 lsls r0, 7 - ldr r1, _080BA170 + ldr r1, =0x02038c28 adds r0, r1 ldr r0, [r0] str r0, [r2] bx lr .align 2, 0 -_080BA16C: .4byte 0x02039b28 -_080BA170: .4byte 0x02038c28 + .pool thumb_func_end sub_80BA154 thumb_func_start task00_for_dp12 @@ -382049,21 +369594,20 @@ task00_for_dp12: @ 80BA174 lsrs r0, 24 mov r12, r0 movs r6, 0 - ldr r0, _080BA19C + ldr r0, =0x02039b44 ldrb r0, [r0] cmp r0, 0 beq _080BA1A4 mov r0, r12 bl remove_task - ldr r1, _080BA1A0 + ldr r1, =0x02039b28 movs r0, 0xFF strb r0, [r1, 0x18] b _080BA324 .align 2, 0 -_080BA19C: .4byte 0x02039b44 -_080BA1A0: .4byte 0x02039b28 + .pool _080BA1A4: - ldr r1, _080BA1D0 + ldr r1, =0x03005e00 mov r0, r12 lsls r2, r0, 2 adds r0, r2, r0 @@ -382080,13 +369624,12 @@ _080BA1A4: cmp r0, 0xE bhi _080BA250 lsls r0, 2 - ldr r1, _080BA1D4 + ldr r1, =_080BA1D8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BA1D0: .4byte 0x03005e00 -_080BA1D4: .4byte _080BA1D8 + .pool .align 2, 0 _080BA1D8: .4byte _080BA214 @@ -382105,42 +369648,42 @@ _080BA1D8: .4byte _080BA250 .4byte _080BA24C _080BA214: - ldr r0, _080BA218 + ldr r0, =0x02022e14 b _080BA24E .align 2, 0 -_080BA218: .4byte 0x02022e14 + .pool _080BA21C: - ldr r0, _080BA220 + ldr r0, =0x02022e16 b _080BA24E .align 2, 0 -_080BA220: .4byte 0x02022e16 + .pool _080BA224: - ldr r0, _080BA228 + ldr r0, =0x02022e18 b _080BA24E .align 2, 0 -_080BA228: .4byte 0x02022e18 + .pool _080BA22C: - ldr r0, _080BA230 + ldr r0, =0x02022e1a b _080BA24E .align 2, 0 -_080BA230: .4byte 0x02022e1a + .pool _080BA234: - ldr r0, _080BA238 + ldr r0, =0x02022e1c b _080BA24E .align 2, 0 -_080BA238: .4byte 0x02022e1c + .pool _080BA23C: - ldr r0, _080BA240 + ldr r0, =0x02022e1e b _080BA24E .align 2, 0 -_080BA240: .4byte 0x02022e1e + .pool _080BA244: - ldr r0, _080BA248 + ldr r0, =0x02022e20 b _080BA24E .align 2, 0 -_080BA248: .4byte 0x02022e20 + .pool _080BA24C: - ldr r0, _080BA2B0 + ldr r0, =0x02022e22 _080BA24E: ldrh r6, [r0] _080BA250: @@ -382167,8 +369710,8 @@ _080BA250: ldrsh r0, [r1, r4] cmp r3, r0 bge _080BA324 - ldr r5, _080BA2B4 - ldr r0, _080BA2B8 + ldr r5, =0x02038c28 + ldr r0, =0x02039b28 mov r8, r0 adds r7, r1, 0 lsls r0, r2, 1 @@ -382193,9 +369736,7 @@ _080BA28A: blt _080BA28A b _080BA324 .align 2, 0 -_080BA2B0: .4byte 0x02022e22 -_080BA2B4: .4byte 0x02038c28 -_080BA2B8: .4byte 0x02039b28 + .pool _080BA2BC: ldrh r0, [r1, 0x12] strh r0, [r1, 0x10] @@ -382210,11 +369751,11 @@ _080BA2BC: ldrsh r0, [r1, r4] cmp r3, r0 bge _080BA304 - ldr r5, _080BA334 + ldr r5, =0x02038c28 adds r7, r1, 0 lsls r0, r2, 1 adds r4, r0, r5 - ldr r0, _080BA338 + ldr r0, =0x02039b28 mov r8, r0 _080BA2E2: lsls r2, r3, 1 @@ -382260,8 +369801,7 @@ _080BA324: pop {r0} bx r0 .align 2, 0 -_080BA334: .4byte 0x02038c28 -_080BA338: .4byte 0x02039b28 + .pool thumb_func_end task00_for_dp12 thumb_func_start sub_80BA33C @@ -382274,7 +369814,7 @@ sub_80BA33C: @ 80BA33C lsrs r4, r2, 24 movs r1, 0 movs r2, 0 - ldr r0, _080BA380 + ldr r0, =0x08329f40 mov r12, r0 _080BA350: lsls r0, r1, 1 @@ -382302,7 +369842,7 @@ _080BA364: pop {r0} bx r0 .align 2, 0 -_080BA380: .4byte 0x08329f40 + .pool thumb_func_end sub_80BA33C thumb_func_start sub_80BA384 @@ -382347,10 +369887,10 @@ sub_80BA384: @ 80BA384 lsrs r0, 24 mov r10, r0 bl dp12_8087EA4 - ldr r0, _080BA490 + ldr r0, =0x04000010 add r0, r9 str r0, [sp] - ldr r0, _080BA494 + ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r1, sp movs r0, 0x1 @@ -382362,12 +369902,12 @@ sub_80BA384: @ 80BA384 ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, _080BA498 + ldr r0, =task00_for_dp12 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080BA49C + ldr r0, =0x03005e00 lsls r4, r7, 2 adds r4, r7 lsls r4, 3 @@ -382390,12 +369930,12 @@ sub_80BA384: @ 80BA384 strh r3, [r4, 0x14] mov r0, r10 strh r0, [r4, 0x16] - ldr r0, _080BA4A0 + ldr r0, =0x02039b28 strb r7, [r0, 0x18] - ldr r0, _080BA4A4 + ldr r0, =0x02039b44 movs r1, 0 strb r1, [r0] - ldr r4, _080BA4A8 + ldr r4, =0x02038ea8 ldr r3, [sp, 0xC] subs r6, r3, r5 lsls r3, r6, 24 @@ -382407,7 +369947,7 @@ sub_80BA384: @ 80BA384 ldr r0, [sp, 0xC] cmp r5, r0 bge _080BA47E - ldr r1, _080BA4AC + ldr r1, =0xfffffd80 adds r2, r4, r1 lsls r1, r5, 1 movs r3, 0xF0 @@ -382439,14 +369979,7 @@ _080BA47E: pop {r1} bx r1 .align 2, 0 -_080BA490: .4byte 0x04000010 -_080BA494: .4byte 0xa2600001 -_080BA498: .4byte task00_for_dp12 + 1 -_080BA49C: .4byte 0x03005e00 -_080BA4A0: .4byte 0x02039b28 -_080BA4A4: .4byte 0x02039b44 -_080BA4A8: .4byte 0x02038ea8 -_080BA4AC: .4byte 0xfffffd80 + .pool thumb_func_end sub_80BA384 thumb_func_start sub_80BA4B0 @@ -382476,7 +370009,7 @@ c2_options_menu: @ 80BA4DC mov r7, r8 push {r7} sub sp, 0xC - ldr r1, _080BA500 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -382485,13 +370018,12 @@ c2_options_menu: @ 80BA4DC cmp r0, 0xB bhi _080BA538 lsls r0, 2 - ldr r1, _080BA504 + ldr r1, =_080BA508 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BA500: .4byte 0x030022c0 -_080BA504: .4byte _080BA508 + .pool .align 2, 0 _080BA508: .4byte _080BA538 @@ -382509,13 +370041,13 @@ _080BA508: _080BA538: movs r0, 0 bl SetVBlankCallback - ldr r1, _080BA548 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080BA7F4 .align 2, 0 -_080BA548: .4byte 0x030022c0 + .pool _080BA54C: movs r3, 0xC0 lsls r3, 19 @@ -382525,10 +370057,10 @@ _080BA54C: mov r8, r1 add r2, sp, 0x4 movs r6, 0 - ldr r1, _080BA68C + ldr r1, =0x040000d4 movs r5, 0x80 lsls r5, 5 - ldr r7, _080BA690 + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -382558,7 +370090,7 @@ _080BA56A: lsls r3, 3 movs r4, 0 str r4, [sp, 0x8] - ldr r2, _080BA68C + ldr r2, =0x040000d4 mov r1, r8 str r1, [r2] str r0, [r2, 0x4] @@ -382585,7 +370117,7 @@ _080BA56A: bl lcd_io_set movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080BA694 + ldr r1, =0x0855c698 movs r0, 0 movs r2, 0x2 bl bg_vram_setup @@ -382621,7 +370153,7 @@ _080BA56A: movs r1, 0 movs r2, 0 bl bg_change_y_offset - ldr r0, _080BA698 + ldr r0, =0x0855c680 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0x40 @@ -382655,24 +370187,21 @@ _080BA56A: bl gpu_sync_bg_show b _080BA7EC .align 2, 0 -_080BA68C: .4byte 0x040000d4 -_080BA690: .4byte 0x81000800 -_080BA694: .4byte 0x0855c698 -_080BA698: .4byte 0x0855c680 + .pool _080BA69C: bl sub_80A1A74 bl remove_some_task bl clear_tasks bl reset_all_obj_data - ldr r1, _080BA6B8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080BA7F4 .align 2, 0 -_080BA6B8: .4byte 0x030022c0 + .pool _080BA6BC: - ldr r0, _080BA6DC + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x14] lsrs r0, 3 @@ -382686,13 +370215,13 @@ _080BA6BC: bl gpu_copy_bg_tile_pattern_data_to_vram b _080BA7EC .align 2, 0 -_080BA6DC: .4byte 0x03005d90 + .pool _080BA6E0: - ldr r0, _080BA70C + ldr r0, =0x0855c6a0 movs r1, 0 movs r2, 0x2 bl gpu_pal_apply - ldr r0, _080BA710 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x14] lsrs r0, 3 @@ -382701,34 +370230,32 @@ _080BA6E0: movs r1, 0x70 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _080BA714 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080BA7F4 .align 2, 0 -_080BA70C: .4byte 0x0855c6a0 -_080BA710: .4byte 0x03005d90 -_080BA714: .4byte 0x030022c0 + .pool _080BA718: - ldr r0, _080BA724 + ldr r0, =0x0855c604 movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply b _080BA7EC .align 2, 0 -_080BA724: .4byte 0x0855c604 + .pool _080BA728: movs r0, 0 bl Window_WriteStandardTileMap bl sub_80BB0D0 - ldr r1, _080BA73C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080BA7F4 .align 2, 0 -_080BA73C: .4byte 0x030022c0 + .pool _080BA740: movs r0, 0x87 lsls r0, 3 @@ -382738,7 +370265,7 @@ _080BA748: movs r0, 0x1 bl Window_WriteStandardTileMap bl sub_80BB104 - ldr r1, _080BA770 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -382747,27 +370274,27 @@ _080BA748: strb r0, [r1] _080BA760: bl sub_80BB154 - ldr r1, _080BA770 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080BA7F4 .align 2, 0 -_080BA770: .4byte 0x030022c0 + .pool _080BA774: - ldr r0, _080BA7FC + ldr r0, =sub_80BA83C + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r1, _080BA800 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 adds r4, r1 movs r0, 0 strh r0, [r4, 0x8] - ldr r0, _080BA804 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r0, [r2, 0x14] lsls r0, 29 @@ -382807,7 +370334,7 @@ _080BA774: movs r1, 0x3 bl Window_CopyToVram _080BA7EC: - ldr r1, _080BA808 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -382817,10 +370344,7 @@ _080BA7F4: strb r0, [r1] b _080BA828 .align 2, 0 -_080BA7FC: .4byte sub_80BA83C + 1 -_080BA800: .4byte 0x03005e00 -_080BA804: .4byte 0x03005d90 -_080BA808: .4byte 0x030022c0 + .pool _080BA80C: movs r0, 0x1 negs r0, r0 @@ -382829,9 +370353,9 @@ _080BA80C: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _080BA834 + ldr r0, =sub_80BA4C8 + 1 bl SetVBlankCallback - ldr r0, _080BA838 + ldr r0, =sub_80BA4B0 + 1 bl set_callback2 _080BA828: add sp, 0xC @@ -382841,8 +370365,7 @@ _080BA828: pop {r0} bx r0 .align 2, 0 -_080BA834: .4byte sub_80BA4C8 + 1 -_080BA838: .4byte sub_80BA4B0 + 1 + .pool thumb_func_end c2_options_menu thumb_func_start sub_80BA83C @@ -382850,26 +370373,24 @@ sub_80BA83C: @ 80BA83C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BA860 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080BA85C - ldr r0, _080BA864 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _080BA868 + ldr r0, =sub_80BA86C + 1 str r0, [r1] _080BA85C: pop {r0} bx r0 .align 2, 0 -_080BA860: .4byte 0x02037fd4 -_080BA864: .4byte 0x03005e00 -_080BA868: .4byte sub_80BA86C + 1 + .pool thumb_func_end sub_80BA83C thumb_func_start sub_80BA86C @@ -382877,13 +370398,13 @@ sub_80BA86C: @ 80BA86C push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BA894 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080BA89C - ldr r0, _080BA898 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -382896,25 +370417,23 @@ sub_80BA86C: @ 80BA86C _080BA892: b _080BA8AE .align 2, 0 -_080BA894: .4byte 0x030022c0 -_080BA898: .4byte 0x03005e00 + .pool _080BA89C: movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _080BA8BC - ldr r0, _080BA8B4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 _080BA8AE: - ldr r0, _080BA8B8 + ldr r0, =sub_80BAA64 + 1 str r0, [r1] b _080BAA5A .align 2, 0 -_080BA8B4: .4byte 0x03005e00 -_080BA8B8: .4byte sub_80BAA64 + 1 + .pool _080BA8BC: movs r0, 0x40 ands r0, r1 @@ -382922,7 +370441,7 @@ _080BA8BC: lsrs r6, r0, 16 cmp r6, 0 beq _080BA8EC - ldr r1, _080BA8E4 + ldr r1, =0x03005e00 lsls r2, r4, 2 adds r0, r2, r4 lsls r0, 3 @@ -382936,7 +370455,7 @@ _080BA8BC: subs r0, r5, 0x1 b _080BA90C .align 2, 0 -_080BA8E4: .4byte 0x03005e00 + .pool _080BA8E8: movs r0, 0x6 b _080BA90C @@ -382945,7 +370464,7 @@ _080BA8EC: ands r0, r1 cmp r0, 0 beq _080BA924 - ldr r1, _080BA910 + ldr r1, =0x03005e00 lsls r2, r4, 2 adds r0, r2, r4 lsls r0, 3 @@ -382961,7 +370480,7 @@ _080BA90C: strh r0, [r3, 0x8] b _080BA916 .align 2, 0 -_080BA910: .4byte 0x03005e00 + .pool _080BA914: strh r6, [r3, 0x8] _080BA916: @@ -382972,7 +370491,7 @@ _080BA916: bl sub_80BAB38 b _080BAA5A _080BA924: - ldr r0, _080BA944 + ldr r0, =0x03005e00 lsls r2, r4, 2 adds r1, r2, r4 lsls r1, 3 @@ -382985,13 +370504,12 @@ _080BA924: b _080BAA5A _080BA93A: lsls r0, r1, 2 - ldr r1, _080BA948 + ldr r1, =_080BA94C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BA944: .4byte 0x03005e00 -_080BA948: .4byte _080BA94C + .pool .align 2, 0 _080BA94C: .4byte _080BA964 @@ -383108,7 +370626,7 @@ _080BAA22: adds r0, r1, 0 bl sub_80BAF0C _080BAA46: - ldr r1, _080BAA60 + ldr r1, =0x02039b48 ldrb r0, [r1] cmp r0, 0 beq _080BAA5A @@ -383122,7 +370640,7 @@ _080BAA5A: pop {r0} bx r0 .align 2, 0 -_080BAA60: .4byte 0x02039b48 + .pool thumb_func_end sub_80BA86C thumb_func_start sub_80BAA64 @@ -383131,9 +370649,9 @@ sub_80BAA64: @ 80BAA64 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r6, _080BAAFC + ldr r6, =0x03005d90 ldr r3, [r6] - ldr r1, _080BAB00 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -383196,16 +370714,14 @@ sub_80BAA64: @ 80BAA64 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080BAB04 + ldr r0, =sub_80BAB08 + 1 str r0, [r4] add sp, 0x4 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080BAAFC: .4byte 0x03005d90 -_080BAB00: .4byte 0x03005e00 -_080BAB04: .4byte sub_80BAB08 + 1 + .pool thumb_func_end sub_80BAA64 thumb_func_start sub_80BAB08 @@ -383213,7 +370729,7 @@ sub_80BAB08: @ 80BAB08 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BAB30 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -383222,15 +370738,14 @@ sub_80BAB08: @ 80BAB08 adds r0, r2, 0 bl remove_task bl Window_FreeMemory - ldr r0, _080BAB34 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 _080BAB2C: pop {r0} bx r0 .align 2, 0 -_080BAB30: .4byte 0x02037fd4 -_080BAB34: .4byte 0x030022c0 + .pool thumb_func_end sub_80BAB08 thumb_func_start sub_80BAB38 @@ -383327,7 +370842,7 @@ sub_80BABDC: @ 80BABDC push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080BABFC + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x10 ands r0, r1 @@ -383340,11 +370855,11 @@ sub_80BABDC: @ 80BABDC lsrs r3, r0, 24 b _080BAC02 .align 2, 0 -_080BABFC: .4byte 0x030022c0 + .pool _080BAC00: movs r3, 0 _080BAC02: - ldr r1, _080BAC20 + ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] _080BAC08: @@ -383360,11 +370875,11 @@ _080BAC08: lsrs r3, r0, 24 b _080BAC26 .align 2, 0 -_080BAC20: .4byte 0x02039b48 + .pool _080BAC24: movs r3, 0x2 _080BAC26: - ldr r1, _080BAC34 + ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] _080BAC2C: @@ -383372,7 +370887,7 @@ _080BAC2C: pop {r1} bx r1 .align 2, 0 -_080BAC34: .4byte 0x02039b48 + .pool thumb_func_end sub_80BABDC thumb_func_start sub_80BAC38 @@ -383391,7 +370906,7 @@ sub_80BAC38: @ 80BAC38 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r4, _080BACD4 + ldr r4, =0x085ee5d4 mov r0, sp ldrb r3, [r0] adds r0, r4, 0 @@ -383402,14 +370917,14 @@ sub_80BAC38: @ 80BAC38 movs r2, 0 bl font_get_width_of_string adds r4, r0, 0 - ldr r0, _080BACD8 + ldr r0, =0x085ee5df mov r8, r0 movs r0, 0x1 mov r1, r8 movs r2, 0 bl font_get_width_of_string adds r5, r0, 0 - ldr r6, _080BACDC + ldr r6, =0x085ee5e9 movs r0, 0x1 adds r1, r6, 0 movs r2, 0 @@ -383448,9 +370963,7 @@ sub_80BAC38: @ 80BAC38 pop {r0} bx r0 .align 2, 0 -_080BACD4: .4byte 0x085ee5d4 -_080BACD8: .4byte 0x085ee5df -_080BACDC: .4byte 0x085ee5e9 + .pool thumb_func_end sub_80BAC38 thumb_func_start sub_80BACE0 @@ -383458,7 +370971,7 @@ sub_80BACE0: @ 80BACE0 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BAD00 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x30 ands r0, r1 @@ -383466,15 +370979,14 @@ sub_80BACE0: @ 80BACE0 beq _080BACFA movs r1, 0x1 eors r2, r1 - ldr r0, _080BAD04 + ldr r0, =0x02039b48 strb r1, [r0] _080BACFA: adds r0, r2, 0 pop {r1} bx r1 .align 2, 0 -_080BAD00: .4byte 0x030022c0 -_080BAD04: .4byte 0x02039b48 + .pool thumb_func_end sub_80BACE0 thumb_func_start sub_80BAD08 @@ -383490,13 +371002,13 @@ sub_80BAD08: @ 80BAD08 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, _080BAD54 + ldr r0, =0x085ee5f4 mov r1, sp ldrb r3, [r1] movs r1, 0x68 movs r2, 0x10 bl sub_80BAB68 - ldr r4, _080BAD58 + ldr r4, =0x085ee5fd movs r0, 0x1 adds r1, r4, 0 movs r2, 0xC6 @@ -383514,8 +371026,7 @@ sub_80BAD08: @ 80BAD08 pop {r0} bx r0 .align 2, 0 -_080BAD54: .4byte 0x085ee5f4 -_080BAD58: .4byte 0x085ee5fd + .pool thumb_func_end sub_80BAD08 thumb_func_start sub_80BAD5C @@ -383523,7 +371034,7 @@ sub_80BAD5C: @ 80BAD5C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BAD7C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x30 ands r0, r1 @@ -383531,15 +371042,14 @@ sub_80BAD5C: @ 80BAD5C beq _080BAD76 movs r1, 0x1 eors r2, r1 - ldr r0, _080BAD80 + ldr r0, =0x02039b48 strb r1, [r0] _080BAD76: adds r0, r2, 0 pop {r1} bx r1 .align 2, 0 -_080BAD7C: .4byte 0x030022c0 -_080BAD80: .4byte 0x02039b48 + .pool thumb_func_end sub_80BAD5C thumb_func_start sub_80BAD84 @@ -383555,13 +371065,13 @@ sub_80BAD84: @ 80BAD84 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, _080BADD0 + ldr r0, =0x085ee607 mov r1, sp ldrb r3, [r1] movs r1, 0x68 movs r2, 0x20 bl sub_80BAB68 - ldr r4, _080BADD4 + ldr r4, =0x085ee613 movs r0, 0x1 adds r1, r4, 0 movs r2, 0xC6 @@ -383579,8 +371089,7 @@ sub_80BAD84: @ 80BAD84 pop {r0} bx r0 .align 2, 0 -_080BADD0: .4byte 0x085ee607 -_080BADD4: .4byte 0x085ee613 + .pool thumb_func_end sub_80BAD84 thumb_func_start sub_80BADD8 @@ -383588,7 +371097,7 @@ sub_80BADD8: @ 80BADD8 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080BAE00 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x30 ands r0, r1 @@ -383598,7 +371107,7 @@ sub_80BADD8: @ 80BADD8 eors r5, r4 adds r0, r5, 0 bl sub_82E1810 - ldr r0, _080BAE04 + ldr r0, =0x02039b48 strb r4, [r0] _080BADF8: adds r0, r5, 0 @@ -383606,8 +371115,7 @@ _080BADF8: pop {r1} bx r1 .align 2, 0 -_080BAE00: .4byte 0x030022c0 -_080BAE04: .4byte 0x02039b48 + .pool thumb_func_end sub_80BADD8 thumb_func_start sub_80BAE08 @@ -383623,13 +371131,13 @@ sub_80BAE08: @ 80BAE08 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r0, _080BAE54 + ldr r0, =0x085ee61d mov r1, sp ldrb r3, [r1] movs r1, 0x68 movs r2, 0x30 bl sub_80BAB68 - ldr r4, _080BAE58 + ldr r4, =0x085ee628 movs r0, 0x1 adds r1, r4, 0 movs r2, 0xC6 @@ -383647,8 +371155,7 @@ sub_80BAE08: @ 80BAE08 pop {r0} bx r0 .align 2, 0 -_080BAE54: .4byte 0x085ee61d -_080BAE58: .4byte 0x085ee628 + .pool thumb_func_end sub_80BAE08 thumb_func_start sub_80BAE5C @@ -383656,7 +371163,7 @@ sub_80BAE5C: @ 80BAE5C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BAE7C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x10 ands r0, r1 @@ -383669,7 +371176,7 @@ sub_80BAE5C: @ 80BAE5C lsrs r4, r0, 24 b _080BAE82 .align 2, 0 -_080BAE7C: .4byte 0x030022c0 + .pool _080BAE80: movs r4, 0 _080BAE82: @@ -383688,11 +371195,11 @@ _080BAE82: movs r1, 0x70 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _080BAEC8 + ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] _080BAEAE: - ldr r0, _080BAECC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x20 ands r0, r1 @@ -383705,8 +371212,7 @@ _080BAEAE: lsrs r4, r0, 24 b _080BAED2 .align 2, 0 -_080BAEC8: .4byte 0x02039b48 -_080BAECC: .4byte 0x030022c0 + .pool _080BAED0: movs r4, 0x13 _080BAED2: @@ -383725,7 +371231,7 @@ _080BAED2: movs r1, 0x70 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _080BAF08 + ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] _080BAEFE: @@ -383734,7 +371240,7 @@ _080BAEFE: pop {r1} bx r1 .align 2, 0 -_080BAF08: .4byte 0x02039b48 + .pool thumb_func_end sub_80BAE5C thumb_func_start sub_80BAF0C @@ -383747,9 +371253,9 @@ sub_80BAF0C: @ 80BAF0C adds r0, r1 lsrs r6, r0, 24 movs r5, 0 - ldr r1, _080BAF78 + ldr r1, =0x085ee640 ldrb r0, [r1] - ldr r7, _080BAF7C + ldr r7, =0x085ee635 cmp r0, 0xFF beq _080BAF44 adds r2, r1, 0 @@ -383793,8 +371299,7 @@ _080BAF44: strb r0, [r4] b _080BAF9E .align 2, 0 -_080BAF78: .4byte 0x085ee640 -_080BAF7C: .4byte 0x085ee635 + .pool _080BAF80: mov r0, sp adds r4, r0, r5 @@ -383839,7 +371344,7 @@ sub_80BAFCC: @ 80BAFCC push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080BAFEC + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x10 ands r0, r1 @@ -383852,11 +371357,11 @@ sub_80BAFCC: @ 80BAFCC lsrs r3, r0, 24 b _080BAFF2 .align 2, 0 -_080BAFEC: .4byte 0x030022c0 + .pool _080BAFF0: movs r3, 0 _080BAFF2: - ldr r1, _080BB010 + ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] _080BAFF8: @@ -383872,11 +371377,11 @@ _080BAFF8: lsrs r3, r0, 24 b _080BB016 .align 2, 0 -_080BB010: .4byte 0x02039b48 + .pool _080BB014: movs r3, 0x2 _080BB016: - ldr r1, _080BB024 + ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] _080BB01C: @@ -383884,7 +371389,7 @@ _080BB01C: pop {r1} bx r1 .align 2, 0 -_080BB024: .4byte 0x02039b48 + .pool thumb_func_end sub_80BAFCC thumb_func_start sub_80BB028 @@ -383903,7 +371408,7 @@ sub_80BB028: @ 80BB028 adds r1, r0 movs r0, 0x1 strb r0, [r1] - ldr r4, _080BB0C4 + ldr r4, =0x085ee647 mov r0, sp ldrb r3, [r0] adds r0, r4, 0 @@ -383915,14 +371420,14 @@ sub_80BB028: @ 80BB028 movs r2, 0 bl font_get_width_of_string adds r4, r0, 0 - ldr r0, _080BB0C8 + ldr r0, =0x085ee654 mov r8, r0 movs r0, 0x1 mov r1, r8 movs r2, 0 bl font_get_width_of_string adds r5, r0, 0 - ldr r6, _080BB0CC + ldr r6, =0x085ee65d movs r0, 0x1 adds r1, r6, 0 movs r2, 0 @@ -383961,9 +371466,7 @@ sub_80BB028: @ 80BB028 pop {r0} bx r0 .align 2, 0 -_080BB0C4: .4byte 0x085ee647 -_080BB0C8: .4byte 0x085ee654 -_080BB0CC: .4byte 0x085ee65d + .pool thumb_func_end sub_80BB028 thumb_func_start sub_80BB0D0 @@ -383973,7 +371476,7 @@ sub_80BB0D0: @ 80BB0D0 movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _080BB100 + ldr r2, =0x085ee589 movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -383990,7 +371493,7 @@ sub_80BB0D0: @ 80BB0D0 pop {r0} bx r0 .align 2, 0 -_080BB100: .4byte 0x085ee589 + .pool thumb_func_end sub_80BB0D0 thumb_func_start sub_80BB104 @@ -384001,7 +371504,7 @@ sub_80BB104: @ 80BB104 movs r1, 0x11 bl Window_FastFillPixels movs r4, 0 - ldr r5, _080BB150 + ldr r5, =0x0855c664 _080BB114: lsls r0, r4, 2 adds r0, r5 @@ -384032,7 +371535,7 @@ _080BB114: pop {r0} bx r0 .align 2, 0 -_080BB150: .4byte 0x0855c664 + .pool thumb_func_end sub_80BB104 thumb_func_start sub_80BB154 @@ -384060,7 +371563,7 @@ sub_80BB154: @ 80BB154 str r4, [sp, 0x4] str r5, [sp, 0x8] movs r0, 0x1 - ldr r1, _080BB2C0 + ldr r1, =0x000001a3 movs r2, 0x2 movs r3, 0 bl Bg_FillWramTileMapRectWithTileAndPalette @@ -384078,7 +371581,7 @@ sub_80BB154: @ 80BB154 str r6, [sp, 0x4] str r5, [sp, 0x8] movs r0, 0x1 - ldr r1, _080BB2C4 + ldr r1, =0x000001a5 movs r2, 0x1 movs r3, 0x1 bl Bg_FillWramTileMapRectWithTileAndPalette @@ -384086,7 +371589,7 @@ sub_80BB154: @ 80BB154 str r6, [sp, 0x4] str r5, [sp, 0x8] movs r0, 0x1 - ldr r1, _080BB2C8 + ldr r1, =0x000001a7 movs r2, 0x1C movs r3, 0x1 bl Bg_FillWramTileMapRectWithTileAndPalette @@ -384100,7 +371603,7 @@ sub_80BB154: @ 80BB154 movs r2, 0x1 movs r3, 0x3 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r0, _080BB2CC + ldr r0, =0x000001a9 mov r10, r0 mov r0, r8 str r0, [sp] @@ -384137,7 +371640,7 @@ sub_80BB154: @ 80BB154 str r4, [sp, 0x4] str r5, [sp, 0x8] movs r0, 0x1 - ldr r1, _080BB2C0 + ldr r1, =0x000001a3 movs r2, 0x2 movs r3, 0x4 bl Bg_FillWramTileMapRectWithTileAndPalette @@ -384155,7 +371658,7 @@ sub_80BB154: @ 80BB154 str r6, [sp, 0x4] str r5, [sp, 0x8] movs r0, 0x1 - ldr r1, _080BB2C4 + ldr r1, =0x000001a5 movs r2, 0x1 movs r3, 0x5 bl Bg_FillWramTileMapRectWithTileAndPalette @@ -384163,7 +371666,7 @@ sub_80BB154: @ 80BB154 str r6, [sp, 0x4] str r5, [sp, 0x8] movs r0, 0x1 - ldr r1, _080BB2C8 + ldr r1, =0x000001a7 movs r2, 0x1C movs r3, 0x5 bl Bg_FillWramTileMapRectWithTileAndPalette @@ -384203,24 +371706,21 @@ sub_80BB154: @ 80BB154 pop {r0} bx r0 .align 2, 0 -_080BB2C0: .4byte 0x000001a3 -_080BB2C4: .4byte 0x000001a5 -_080BB2C8: .4byte 0x000001a7 -_080BB2CC: .4byte 0x000001a9 + .pool thumb_func_end sub_80BB154 thumb_func_start sub_80BB2D0 sub_80BB2D0: @ 80BB2D0 push {r4-r6,lr} - ldr r0, _080BB33C + ldr r0, =0x02039b50 movs r2, 0 strh r2, [r0] - ldr r1, _080BB340 + ldr r1, =0x02039b52 movs r0, 0x40 strb r0, [r1] - ldr r0, _080BB344 + ldr r0, =0x030060b0 strb r2, [r0] - ldr r4, _080BB348 + ldr r4, =0x03005d90 ldr r0, [r4] movs r1, 0 strb r2, [r0, 0x19] @@ -384237,9 +371737,9 @@ sub_80BB2D0: @ 80BB2D0 bl sub_809D3C0 movs r1, 0 movs r2, 0 - ldr r3, _080BB34C - ldr r6, _080BB350 - ldr r5, _080BB354 + ldr r3, =0x03005d8c + ldr r6, =0x00000988 + ldr r5, =0x00003b24 _080BB30C: ldr r0, [r4] adds r0, 0x28 @@ -384266,27 +371766,20 @@ _080BB30C: pop {r0} bx r0 .align 2, 0 -_080BB33C: .4byte 0x02039b50 -_080BB340: .4byte 0x02039b52 -_080BB344: .4byte 0x030060b0 -_080BB348: .4byte 0x03005d90 -_080BB34C: .4byte 0x03005d8c -_080BB350: .4byte 0x00000988 -_080BB354: .4byte 0x00003b24 + .pool thumb_func_end sub_80BB2D0 thumb_func_start sub_80BB358 sub_80BB358: @ 80BB358 - ldr r1, _080BB368 + ldr r1, =0x02039b50 movs r0, 0 strh r0, [r1] - ldr r1, _080BB36C + ldr r1, =0x02039b52 movs r0, 0x40 strb r0, [r1] bx lr .align 2, 0 -_080BB368: .4byte 0x02039b50 -_080BB36C: .4byte 0x02039b52 + .pool thumb_func_end sub_80BB358 thumb_func_start sub_80BB370 @@ -384304,14 +371797,14 @@ sub_80BB384: @ 80BB384 push {r4-r7,lr} adds r4, r0, 0 movs r3, 0 - ldr r0, _080BB4F8 + ldr r0, =0x0000ffff adds r7, r0, 0 movs r1, 0x2 negs r1, r1 mov r12, r1 movs r6, 0x3 negs r6, r6 - ldr r5, _080BB4FC + ldr r5, =0x00000181 _080BB39A: lsls r1, r3, 2 adds r1, r4, r1 @@ -384333,7 +371826,7 @@ _080BB39A: adds r0, r4, r2 movs r2, 0 strh r2, [r0] - ldr r0, _080BB500 + ldr r0, =0x0000060a adds r3, r4, r0 ldrb r1, [r3] movs r0, 0x2 @@ -384343,10 +371836,10 @@ _080BB39A: negs r1, r1 ands r0, r1 strb r0, [r3] - ldr r1, _080BB504 + ldr r1, =0x0000060c adds r0, r4, r1 strh r2, [r0] - ldr r3, _080BB508 + ldr r3, =0x0000060e adds r0, r4, r3 strh r2, [r0] adds r1, 0x4 @@ -384371,9 +371864,9 @@ _080BB39A: adds r0, r4, r1 strh r2, [r0] movs r3, 0 - ldr r0, _080BB50C + ldr r0, =0x0000061e adds r2, r4, r0 - ldr r1, _080BB4F8 + ldr r1, =0x0000ffff adds r5, r1, 0 _080BB416: lsls r0, r3, 1 @@ -384392,7 +371885,7 @@ _080BB416: movs r2, 0 movs r1, 0 strh r1, [r0] - ldr r3, _080BB510 + ldr r3, =0x0000062a adds r0, r4, r3 strh r1, [r0] adds r3, 0x2 @@ -384424,7 +371917,7 @@ _080BB416: adds r0, r4, r2 strh r1, [r0] movs r3, 0 - ldr r0, _080BB514 + ldr r0, =0x0000063a adds r1, r4, r0 movs r2, 0 _080BB47C: @@ -384436,24 +371929,24 @@ _080BB47C: lsrs r3, r0, 16 cmp r3, 0x3 bls _080BB47C - ldr r1, _080BB518 + ldr r1, =0x0000064a adds r0, r4, r1 movs r1, 0 strb r1, [r0] - ldr r2, _080BB51C + ldr r2, =0x0000064b adds r0, r4, r2 strb r1, [r0] - ldr r0, _080BB520 + ldr r0, =0x0000064c adds r3, r4, r0 ldrb r2, [r3] movs r0, 0x2 negs r0, r0 ands r0, r2 strb r0, [r3] - ldr r2, _080BB524 + ldr r2, =0x0000064d adds r0, r4, r2 strb r1, [r0] - ldr r3, _080BB528 + ldr r3, =0x0000064e adds r0, r4, r3 strb r1, [r0] adds r2, 0x2 @@ -384466,7 +371959,7 @@ _080BB47C: adds r0, r4, r2 strh r1, [r0] movs r3, 0 - ldr r0, _080BB52C + ldr r0, =0x00000654 adds r1, r4, r0 movs r2, 0 _080BB4CE: @@ -384478,7 +371971,7 @@ _080BB4CE: cmp r3, 0x7 bls _080BB4CE movs r3, 0 - ldr r2, _080BB530 + ldr r2, =0x0000065c adds r1, r4, r2 movs r2, 0 _080BB4E4: @@ -384493,21 +371986,7 @@ _080BB4E4: pop {r0} bx r0 .align 2, 0 -_080BB4F8: .4byte 0x0000ffff -_080BB4FC: .4byte 0x00000181 -_080BB500: .4byte 0x0000060a -_080BB504: .4byte 0x0000060c -_080BB508: .4byte 0x0000060e -_080BB50C: .4byte 0x0000061e -_080BB510: .4byte 0x0000062a -_080BB514: .4byte 0x0000063a -_080BB518: .4byte 0x0000064a -_080BB51C: .4byte 0x0000064b -_080BB520: .4byte 0x0000064c -_080BB524: .4byte 0x0000064d -_080BB528: .4byte 0x0000064e -_080BB52C: .4byte 0x00000654 -_080BB530: .4byte 0x0000065c + .pool thumb_func_end sub_80BB384 thumb_func_start sub_80BB534 @@ -384516,7 +371995,7 @@ sub_80BB534: @ 80BB534 mov r7, r8 push {r7} sub sp, 0x8 - ldr r0, _080BB5F0 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r4, r0, r1 @@ -384543,10 +372022,10 @@ _080BB558: mov r8, r2 mov r2, sp movs r6, 0 - ldr r1, _080BB5F4 + ldr r1, =0x040000d4 movs r5, 0x80 lsls r5, 5 - ldr r7, _080BB5F8 + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -384576,7 +372055,7 @@ _080BB582: lsls r3, 3 movs r4, 0 str r4, [sp, 0x4] - ldr r2, _080BB5F4 + ldr r2, =0x040000d4 mov r1, r8 str r1, [r2] str r0, [r2, 0x4] @@ -384598,7 +372077,7 @@ _080BB582: orrs r3, r0 str r3, [r2, 0x8] ldr r0, [r2, 0x8] - ldr r0, _080BB5F0 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -384606,16 +372085,14 @@ _080BB582: strb r1, [r0] b _080BB74C .align 2, 0 -_080BB5F0: .4byte 0x030022c0 -_080BB5F4: .4byte 0x040000d4 -_080BB5F8: .4byte 0x81000800 + .pool _080BB5FC: bl remove_some_task bl clear_tasks bl reset_all_obj_data bl sub_80A1A74 bl gpu_pal_allocator_reset - ldr r1, _080BB624 + ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] bl dp13_810BB8C @@ -384624,21 +372101,21 @@ _080BB5FC: strb r0, [r4] b _080BB74C .align 2, 0 -_080BB624: .4byte 0x0300301c + .pool _080BB628: - ldr r4, _080BB6A8 - ldr r0, _080BB6AC + ldr r4, =0x02039b4c + ldr r0, =0x00000664 bl malloc_and_clear str r0, [r4] bl sub_80BB384 - ldr r0, _080BB6B0 + ldr r0, =sub_80BB78C + 1 movs r1, 0 bl AddTask ldr r1, [r4] - ldr r5, _080BB6B4 + ldr r5, =0x03005d90 ldr r0, [r5] ldrb r0, [r0, 0x19] - ldr r3, _080BB6B8 + ldr r3, =0x00000612 adds r1, r3 strh r0, [r1] bl sub_809D42C @@ -384646,24 +372123,24 @@ _080BB628: cmp r1, 0 bne _080BB65E ldr r0, [r4] - ldr r2, _080BB6B8 + ldr r2, =0x00000612 adds r0, r2 strh r1, [r0] _080BB65E: ldr r1, [r4] ldr r0, [r5] ldrb r2, [r0, 0x18] - ldr r3, _080BB6BC + ldr r3, =0x00000616 adds r0, r1, r3 strh r2, [r0] - ldr r0, _080BB6C0 + ldr r0, =0x02039b50 ldrh r2, [r0] subs r3, 0x8 adds r0, r1, r3 strh r2, [r0] - ldr r0, _080BB6C4 + ldr r0, =0x02039b52 ldrb r0, [r0] - ldr r2, _080BB6C8 + ldr r2, =0x0000062c adds r1, r2 strb r0, [r1] ldr r0, [r4] @@ -384677,44 +372154,35 @@ _080BB65E: movs r0, 0 bl sub_80C0844 ldr r1, [r4] - ldr r2, _080BB6CC + ldr r2, =0x0000061a adds r1, r2 strh r0, [r1] movs r0, 0x1 bl sub_80C0844 b _080BB6E4 .align 2, 0 -_080BB6A8: .4byte 0x02039b4c -_080BB6AC: .4byte 0x00000664 -_080BB6B0: .4byte sub_80BB78C + 1 -_080BB6B4: .4byte 0x03005d90 -_080BB6B8: .4byte 0x00000612 -_080BB6BC: .4byte 0x00000616 -_080BB6C0: .4byte 0x02039b50 -_080BB6C4: .4byte 0x02039b52 -_080BB6C8: .4byte 0x0000062c -_080BB6CC: .4byte 0x0000061a + .pool _080BB6D0: movs r0, 0 bl pokedex_count ldr r1, [r4] - ldr r2, _080BB708 + ldr r2, =0x0000061a adds r1, r2 strh r0, [r1] movs r0, 0x1 bl pokedex_count _080BB6E4: ldr r1, [r4] - ldr r3, _080BB70C + ldr r3, =0x0000061c adds r1, r3 strh r0, [r1] - ldr r0, _080BB710 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BB714 + ldr r1, =0x0000062d adds r0, r1 movs r1, 0x8 strb r1, [r0] - ldr r1, _080BB718 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -384723,29 +372191,25 @@ _080BB6E4: strb r0, [r1] b _080BB74C .align 2, 0 -_080BB708: .4byte 0x0000061a -_080BB70C: .4byte 0x0000061c -_080BB710: .4byte 0x02039b4c -_080BB714: .4byte 0x0000062d -_080BB718: .4byte 0x030022c0 + .pool _080BB71C: movs r0, 0x1 bl enable_irqs - ldr r0, _080BB758 + ldr r0, =sub_80BB370 + 1 bl SetVBlankCallback - ldr r0, _080BB75C + ldr r0, =sub_80BB774 + 1 bl set_callback2 - ldr r0, _080BB760 + ldr r0, =0x02039b4c ldr r1, [r0] - ldr r3, _080BB764 + ldr r3, =0x00000612 adds r0, r1, r3 ldrb r0, [r0] - ldr r2, _080BB768 + ldr r2, =0x00000616 adds r1, r2 ldrb r1, [r1] bl sub_80BC8D4 - ldr r0, _080BB76C - ldr r1, _080BB770 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 bl MPlayVolumeControl _080BB74C: @@ -384756,13 +372220,7 @@ _080BB74C: pop {r0} bx r0 .align 2, 0 -_080BB758: .4byte sub_80BB370 + 1 -_080BB75C: .4byte sub_80BB774 + 1 -_080BB760: .4byte 0x02039b4c -_080BB764: .4byte 0x00000612 -_080BB768: .4byte 0x00000616 -_080BB76C: .4byte 0x03007420 -_080BB770: .4byte 0x0000ffff + .pool thumb_func_end sub_80BB534 thumb_func_start sub_80BB774 @@ -384781,9 +372239,9 @@ sub_80BB78C: @ 80BB78C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BB7C4 + ldr r0, =0x02039b4c ldr r1, [r0] - ldr r0, _080BB7C8 + ldr r0, =0x0000064c adds r1, r0 ldrb r2, [r1] movs r0, 0x2 @@ -384795,22 +372253,19 @@ sub_80BB78C: @ 80BB78C lsls r0, 24 cmp r0, 0 beq _080BB7BE - ldr r0, _080BB7CC + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080BB7D0 + ldr r0, =sub_80BB7D4 + 1 str r0, [r1] _080BB7BE: pop {r4} pop {r0} bx r0 .align 2, 0 -_080BB7C4: .4byte 0x02039b4c -_080BB7C8: .4byte 0x0000064c -_080BB7CC: .4byte 0x03005e00 -_080BB7D0: .4byte sub_80BB7D4 + 1 + .pool thumb_func_end sub_80BB78C thumb_func_start sub_80BB7D4 @@ -384822,9 +372277,9 @@ sub_80BB7D4: @ 80BB7D4 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _080BB808 + ldr r7, =0x02039b4c ldr r0, [r7] - ldr r4, _080BB80C + ldr r4, =0x00000652 adds r0, r4 ldrh r1, [r0] movs r0, 0x12 @@ -384841,17 +372296,16 @@ sub_80BB7D4: @ 80BB7D4 strh r0, [r1] b _080BBA06 .align 2, 0 -_080BB808: .4byte 0x02039b4c -_080BB80C: .4byte 0x00000652 + .pool _080BB810: - ldr r2, _080BB888 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 mov r9, r0 ands r0, r1 cmp r0, 0 beq _080BB8A4 - ldr r1, _080BB88C + ldr r1, =0x0000060e adds r0, r3, r1 ldrh r0, [r0] lsls r0, 2 @@ -384861,9 +372315,9 @@ _080BB810: cmp r0, 0 beq _080BB8A4 bl sub_80BD8D0 - ldr r4, _080BB890 + ldr r4, =0x02020630 ldr r0, [r7] - ldr r5, _080BB894 + ldr r5, =0x00000626 adds r0, r5 ldrh r1, [r0] lsls r0, r1, 4 @@ -384890,25 +372344,19 @@ _080BB810: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _080BB898 + ldr r1, =sub_80BE470 + 1 str r1, [r0] - ldr r1, _080BB89C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _080BB8A0 + ldr r1, =sub_80BBBF4 + 1 str r1, [r0] movs r0, 0x15 b _080BB976 .align 2, 0 -_080BB888: .4byte 0x030022c0 -_080BB88C: .4byte 0x0000060e -_080BB890: .4byte 0x02020630 -_080BB894: .4byte 0x00000626 -_080BB898: .4byte sub_80BE470 + 1 -_080BB89C: .4byte 0x03005e00 -_080BB8A0: .4byte sub_80BBBF4 + 1 + .pool _080BB8A4: ldrh r2, [r2, 0x2E] movs r0, 0x8 @@ -384917,13 +372365,13 @@ _080BB8A4: lsrs r4, r0, 16 cmp r4, 0 beq _080BB8FC - ldr r3, _080BB8E8 + ldr r3, =0x02039b4c ldr r1, [r3] - ldr r4, _080BB8EC + ldr r4, =0x00000652 adds r0, r1, r4 movs r2, 0 strh r2, [r0] - ldr r0, _080BB8F0 + ldr r0, =0x0000064f adds r1, r0 movs r0, 0x1 strb r0, [r1] @@ -384932,22 +372380,18 @@ _080BB8A4: lsls r1, 3 adds r0, r1 strh r2, [r0] - ldr r1, _080BB8F4 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _080BB8F8 + ldr r1, =sub_80BBA78 + 1 str r1, [r0] movs r0, 0x5 bl audio_play b _080BBA06 .align 2, 0 -_080BB8E8: .4byte 0x02039b4c -_080BB8EC: .4byte 0x00000652 -_080BB8F0: .4byte 0x0000064f -_080BB8F4: .4byte 0x03005e00 -_080BB8F8: .4byte sub_80BBA78 + 1 + .pool _080BB8FC: movs r0, 0x4 ands r0, r2 @@ -384965,7 +372409,7 @@ _080BB8FC: movs r3, 0x10 bl sub_80A1AD4 bl sub_80C1258 - ldr r1, _080BB980 + ldr r1, =0x03005e00 lsls r3, r6, 2 adds r3, r6 lsls r3, 3 @@ -384974,37 +372418,37 @@ _080BB8FC: lsrs r0, 24 movs r2, 0 strh r0, [r3, 0x8] - ldr r1, _080BB984 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r4, _080BB988 + ldr r4, =0x0000064e adds r0, r4 strb r2, [r0] ldr r0, [r1] - ldr r2, _080BB98C + ldr r2, =0x0000062c adds r1, r0, r2 ldrb r2, [r1] subs r4, 0x24 adds r1, r0, r4 strh r2, [r1] - ldr r2, _080BB990 + ldr r2, =0x0000060e adds r1, r0, r2 ldrh r2, [r1] subs r4, 0x1A adds r1, r0, r4 strh r2, [r1] - ldr r2, _080BB994 + ldr r2, =0x00000612 adds r1, r0, r2 ldrh r2, [r1] adds r4, 0x4 adds r1, r0, r4 strh r2, [r1] - ldr r2, _080BB998 + ldr r2, =0x00000616 adds r1, r0, r2 ldrh r1, [r1] adds r4, 0x4 adds r0, r4 strh r1, [r0] - ldr r0, _080BB99C + ldr r0, =sub_80BBD1C + 1 str r0, [r3] movs r0, 0x2 _080BB976: @@ -385012,14 +372456,7 @@ _080BB976: bl sub_80BC890 b _080BBA06 .align 2, 0 -_080BB980: .4byte 0x03005e00 -_080BB984: .4byte 0x02039b4c -_080BB988: .4byte 0x0000064e -_080BB98C: .4byte 0x0000062c -_080BB990: .4byte 0x0000060e -_080BB994: .4byte 0x00000612 -_080BB998: .4byte 0x00000616 -_080BB99C: .4byte sub_80BBD1C + 1 + .pool _080BB9A0: movs r0, 0x2 ands r0, r2 @@ -385032,23 +372469,22 @@ _080BB9A0: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _080BB9D0 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _080BB9D4 + ldr r1, =sub_80BBDE8 + 1 str r1, [r0] movs r0, 0x3 bl audio_play b _080BBA06 .align 2, 0 -_080BB9D0: .4byte 0x03005e00 -_080BB9D4: .4byte sub_80BBDE8 + 1 + .pool _080BB9D8: - ldr r5, _080BBA14 + ldr r5, =0x02039b4c ldr r0, [r5] - ldr r4, _080BBA18 + ldr r4, =0x0000060e adds r0, r4 ldrh r0, [r0] movs r1, 0xE @@ -385056,17 +372492,17 @@ _080BB9D8: ldr r1, [r5] adds r4, r1, r4 strh r0, [r4] - ldr r0, _080BBA1C + ldr r0, =0x0000062e adds r1, r0 ldrb r0, [r1] cmp r0, 0 beq _080BBA06 - ldr r0, _080BBA20 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _080BBA24 + ldr r0, =sub_80BBA28 + 1 str r0, [r1] _080BBA06: add sp, 0x4 @@ -385077,11 +372513,7 @@ _080BBA06: pop {r0} bx r0 .align 2, 0 -_080BBA14: .4byte 0x02039b4c -_080BBA18: .4byte 0x0000060e -_080BBA1C: .4byte 0x0000062e -_080BBA20: .4byte 0x03005e00 -_080BBA24: .4byte sub_80BBA28 + 1 + .pool thumb_func_end sub_80BB7D4 thumb_func_start sub_80BBA28 @@ -385089,12 +372521,12 @@ sub_80BBA28: @ 80BBA28 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BBA64 + ldr r0, =0x02039b4c ldr r2, [r0] - ldr r1, _080BBA68 + ldr r1, =0x0000062f adds r0, r2, r1 ldrb r0, [r0] - ldr r3, _080BBA6C + ldr r3, =0x00000634 adds r1, r2, r3 ldrb r1, [r1] adds r3, 0x2 @@ -385104,23 +372536,19 @@ sub_80BBA28: @ 80BBA28 lsls r0, 24 cmp r0, 0 beq _080BBA5C - ldr r0, _080BBA70 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080BBA74 + ldr r0, =sub_80BB7D4 + 1 str r0, [r1] _080BBA5C: pop {r4} pop {r0} bx r0 .align 2, 0 -_080BBA64: .4byte 0x02039b4c -_080BBA68: .4byte 0x0000062f -_080BBA6C: .4byte 0x00000634 -_080BBA70: .4byte 0x03005e00 -_080BBA74: .4byte sub_80BB7D4 + 1 + .pool thumb_func_end sub_80BBA28 thumb_func_start sub_80BBA78 @@ -385129,9 +372557,9 @@ sub_80BBA78: @ 80BBA78 sub sp, 0x4 lsls r0, 24 lsrs r7, r0, 24 - ldr r6, _080BBAA8 + ldr r6, =0x02039b4c ldr r0, [r6] - ldr r4, _080BBAAC + ldr r4, =0x00000652 adds r0, r4 ldrh r1, [r0] movs r0, 0x12 @@ -385148,10 +372576,9 @@ sub_80BBA78: @ 80BBA78 strh r0, [r1] b _080BBBE8 .align 2, 0 -_080BBAA8: .4byte 0x02039b4c -_080BBAAC: .4byte 0x00000652 + .pool _080BBAB0: - ldr r5, _080BBAD8 + ldr r5, =0x030022c0 ldrh r1, [r5, 0x2E] movs r0, 0x1 ands r0, r1 @@ -385171,31 +372598,30 @@ _080BBAB0: beq _080BBB34 b _080BBB20 .align 2, 0 -_080BBAD8: .4byte 0x030022c0 + .pool _080BBADC: - ldr r4, _080BBAEC + ldr r4, =0x0000060e adds r1, r3, r4 movs r0, 0 strh r0, [r1] - ldr r0, _080BBAF0 + ldr r0, =0x0000062c adds r1, r3, r0 movs r0, 0x40 b _080BBB0C .align 2, 0 -_080BBAEC: .4byte 0x0000060e -_080BBAF0: .4byte 0x0000062c + .pool _080BBAF4: - ldr r1, _080BBB28 + ldr r1, =0x0000060c adds r2, r3, r1 ldrh r0, [r2] subs r0, 0x1 - ldr r4, _080BBB2C + ldr r4, =0x0000060e adds r1, r3, r4 strh r0, [r1] ldrh r0, [r2] lsls r0, 4 adds r0, 0x30 - ldr r2, _080BBB30 + ldr r2, =0x0000062c adds r1, r3, r2 _080BBB0C: strb r0, [r1] @@ -385212,9 +372638,7 @@ _080BBB20: strh r0, [r5, 0x2E] b _080BBB58 .align 2, 0 -_080BBB28: .4byte 0x0000060c -_080BBB2C: .4byte 0x0000060e -_080BBB30: .4byte 0x0000062c + .pool _080BBB34: movs r0, 0x1 negs r0, r0 @@ -385223,50 +372647,45 @@ _080BBB34: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _080BBB80 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _080BBB84 + ldr r1, =sub_80BBDE8 + 1 str r1, [r0] movs r0, 0x3 bl audio_play _080BBB58: - ldr r2, _080BBB88 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0xA ands r0, r1 cmp r0, 0 beq _080BBB98 - ldr r0, _080BBB8C + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r3, _080BBB90 + ldr r3, =0x0000064f adds r0, r3 movs r1, 0 strb r1, [r0] - ldr r1, _080BBB80 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _080BBB94 + ldr r1, =sub_80BB7D4 + 1 str r1, [r0] b _080BBBB6 .align 2, 0 -_080BBB80: .4byte 0x03005e00 -_080BBB84: .4byte sub_80BBDE8 + 1 -_080BBB88: .4byte 0x030022c0 -_080BBB8C: .4byte 0x02039b4c -_080BBB90: .4byte 0x0000064f -_080BBB94: .4byte sub_80BB7D4 + 1 + .pool _080BBB98: ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _080BBBC4 - ldr r0, _080BBBC0 + ldr r0, =0x02039b4c ldr r0, [r0] movs r4, 0xCA lsls r4, 3 @@ -385281,14 +372700,14 @@ _080BBBB6: bl audio_play b _080BBBE8 .align 2, 0 -_080BBBC0: .4byte 0x02039b4c + .pool _080BBBC4: ldrh r1, [r2, 0x30] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _080BBBE8 - ldr r0, _080BBBF0 + ldr r0, =0x02039b4c ldr r0, [r0] movs r2, 0xCA lsls r2, 3 @@ -385306,7 +372725,7 @@ _080BBBE8: pop {r0} bx r0 .align 2, 0 -_080BBBF0: .4byte 0x02039b4c + .pool thumb_func_end sub_80BBA78 thumb_func_start sub_80BBBF4 @@ -385314,10 +372733,10 @@ sub_80BBBF4: @ 80BBBF4 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _080BBC58 - ldr r5, _080BBC5C + ldr r2, =0x02020630 + ldr r5, =0x02039b4c ldr r3, [r5] - ldr r6, _080BBC60 + ldr r6, =0x00000626 adds r0, r3, r6 ldrh r1, [r0] lsls r0, r1, 4 @@ -385332,10 +372751,10 @@ sub_80BBBF4: @ 80BBBF4 ldrsh r0, [r1, r2] cmp r0, 0x38 bne _080BBC52 - ldr r1, _080BBC64 + ldr r1, =0x0000064a adds r0, r3, r1 ldrb r1, [r0] - ldr r2, _080BBC68 + ldr r2, =0x0000064b adds r0, r3, r2 strb r1, [r0] ldr r1, [r5] @@ -385347,7 +372766,7 @@ sub_80BBBF4: @ 80BBBF4 adds r1, r6 ldrb r1, [r1] bl sub_80BE91C - ldr r2, _080BBC6C + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -385355,20 +372774,14 @@ sub_80BBBF4: @ 80BBBF4 lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0x8] - ldr r0, _080BBC70 + ldr r0, =sub_80BBC74 + 1 str r0, [r1] _080BBC52: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080BBC58: .4byte 0x02020630 -_080BBC5C: .4byte 0x02039b4c -_080BBC60: .4byte 0x00000626 -_080BBC64: .4byte 0x0000064a -_080BBC68: .4byte 0x0000064b -_080BBC6C: .4byte 0x03005e00 -_080BBC70: .4byte sub_80BBC74 + 1 + .pool thumb_func_end sub_80BBBF4 thumb_func_start sub_80BBC74 @@ -385376,7 +372789,7 @@ sub_80BBC74: @ 80BBC74 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080BBCD0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -385390,9 +372803,9 @@ sub_80BBC74: @ 80BBC74 ldrb r0, [r0, 0x4] cmp r0, 0 beq _080BBCE0 - ldr r5, _080BBCD4 + ldr r5, =0x02039b4c ldr r0, [r5] - ldr r1, _080BBCD8 + ldr r1, =0x0000064a adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -385407,7 +372820,7 @@ sub_80BBC74: @ 80BBC74 cmp r0, 0 beq _080BBCFC ldr r0, [r5] - ldr r2, _080BBCDC + ldr r2, =0x0000060e adds r1, r0, r2 ldrh r1, [r1] lsls r1, 2 @@ -385416,36 +372829,28 @@ sub_80BBC74: @ 80BBC74 bl sub_80BE9F8 b _080BBCFC .align 2, 0 -_080BBCD0: .4byte 0x03005e00 -_080BBCD4: .4byte 0x02039b4c -_080BBCD8: .4byte 0x0000064a -_080BBCDC: .4byte 0x0000060e + .pool _080BBCE0: - ldr r2, _080BBD04 - ldr r0, _080BBD08 + ldr r2, =0x02039b50 + ldr r0, =0x02039b4c ldr r1, [r0] - ldr r3, _080BBD0C + ldr r3, =0x0000060e adds r0, r1, r3 ldrh r0, [r0] strh r0, [r2] - ldr r2, _080BBD10 - ldr r0, _080BBD14 + ldr r2, =0x02039b52 + ldr r0, =0x0000062c adds r1, r0 ldrb r0, [r1] strb r0, [r2] - ldr r0, _080BBD18 + ldr r0, =sub_80BB78C + 1 str r0, [r4] _080BBCFC: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080BBD04: .4byte 0x02039b50 -_080BBD08: .4byte 0x02039b4c -_080BBD0C: .4byte 0x0000060e -_080BBD10: .4byte 0x02039b52 -_080BBD14: .4byte 0x0000062c -_080BBD18: .4byte sub_80BB78C + 1 + .pool thumb_func_end sub_80BBC74 thumb_func_start sub_80BBD1C @@ -385453,7 +372858,7 @@ sub_80BBD1C: @ 80BBD1C push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080BBD64 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -385468,34 +372873,29 @@ sub_80BBD1C: @ 80BBD1C cmp r4, 0 bne _080BBDCA bl sub_80BDA40 - ldr r5, _080BBD68 + ldr r5, =0x02039b4c ldr r2, [r5] - ldr r1, _080BBD6C + ldr r1, =0x0000064e adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 beq _080BBD7C - ldr r3, _080BBD70 + ldr r3, =0x0000060e adds r0, r2, r3 strh r4, [r0] - ldr r0, _080BBD74 + ldr r0, =0x0000062c adds r1, r2, r0 movs r0, 0x40 strb r0, [r1] - ldr r0, _080BBD78 + ldr r0, =sub_80BBE70 + 1 b _080BBDC8 .align 2, 0 -_080BBD64: .4byte 0x03005e00 -_080BBD68: .4byte 0x02039b4c -_080BBD6C: .4byte 0x0000064e -_080BBD70: .4byte 0x0000060e -_080BBD74: .4byte 0x0000062c -_080BBD78: .4byte sub_80BBE70 + 1 + .pool _080BBD7C: - ldr r1, _080BBDD0 + ldr r1, =0x0000062a adds r0, r2, r1 ldrh r1, [r0] - ldr r3, _080BBDD4 + ldr r3, =0x0000062c adds r0, r2, r3 strb r1, [r0] ldr r1, [r5] @@ -385506,7 +372906,7 @@ _080BBD7C: subs r3, 0x1E adds r0, r1, r3 strh r2, [r0] - ldr r2, _080BBDD8 + ldr r2, =0x00000614 adds r0, r1, r2 ldrh r0, [r0] adds r3, 0x4 @@ -385517,7 +372917,7 @@ _080BBD7C: cmp r1, 0 bne _080BBDB6 ldr r0, [r5] - ldr r2, _080BBDDC + ldr r2, =0x00000612 adds r0, r2 strh r1, [r0] _080BBDB6: @@ -385526,10 +372926,10 @@ _080BBDB6: lsls r3, 3 adds r1, r0, r3 ldrh r1, [r1] - ldr r2, _080BBDE0 + ldr r2, =0x00000616 adds r0, r2 strh r1, [r0] - ldr r0, _080BBDE4 + ldr r0, =sub_80BB78C + 1 _080BBDC8: str r0, [r6] _080BBDCA: @@ -385537,12 +372937,7 @@ _080BBDCA: pop {r0} bx r0 .align 2, 0 -_080BBDD0: .4byte 0x0000062a -_080BBDD4: .4byte 0x0000062c -_080BBDD8: .4byte 0x00000614 -_080BBDDC: .4byte 0x00000612 -_080BBDE0: .4byte 0x00000616 -_080BBDE4: .4byte sub_80BB78C + 1 + .pool thumb_func_end sub_80BBD1C thumb_func_start sub_80BBDE8 @@ -385550,17 +372945,17 @@ sub_80BBDE8: @ 80BBDE8 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080BBE50 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080BBE4A - ldr r4, _080BBE54 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r5, _080BBE58 + ldr r5, =0x02039b4c ldr r1, [r5] - ldr r2, _080BBE5C + ldr r2, =0x00000612 adds r1, r2 ldrh r1, [r1] strb r1, [r0, 0x19] @@ -385573,7 +372968,7 @@ sub_80BBDE8: @ 80BBDE8 _080BBE18: ldr r1, [r4] ldr r0, [r5] - ldr r2, _080BBE60 + ldr r2, =0x00000616 adds r0, r2 ldrh r0, [r0] strb r0, [r1, 0x18] @@ -385581,10 +372976,10 @@ _080BBE18: bl sub_80BC890 adds r0, r6, 0 bl remove_task - ldr r0, _080BBE64 + ldr r0, =sub_8086194 + 1 bl set_callback2 - ldr r0, _080BBE68 - ldr r1, _080BBE6C + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl @@ -385595,14 +372990,7 @@ _080BBE4A: pop {r0} bx r0 .align 2, 0 -_080BBE50: .4byte 0x02037fd4 -_080BBE54: .4byte 0x03005d90 -_080BBE58: .4byte 0x02039b4c -_080BBE5C: .4byte 0x00000612 -_080BBE60: .4byte 0x00000616 -_080BBE64: .4byte sub_8086194 + 1 -_080BBE68: .4byte 0x03007420 -_080BBE6C: .4byte 0x0000ffff + .pool thumb_func_end sub_80BBDE8 thumb_func_start sub_80BBE70 @@ -385610,9 +372998,9 @@ sub_80BBE70: @ 80BBE70 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BBEA8 + ldr r0, =0x02039b4c ldr r1, [r0] - ldr r0, _080BBEAC + ldr r0, =0x0000064c adds r1, r0 ldrb r0, [r1] movs r2, 0x1 @@ -385623,22 +373011,19 @@ sub_80BBE70: @ 80BBE70 lsls r0, 24 cmp r0, 0 beq _080BBEA0 - ldr r0, _080BBEB0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080BBEB4 + ldr r0, =sub_80BBEB8 + 1 str r0, [r1] _080BBEA0: pop {r4} pop {r0} bx r0 .align 2, 0 -_080BBEA8: .4byte 0x02039b4c -_080BBEAC: .4byte 0x0000064c -_080BBEB0: .4byte 0x03005e00 -_080BBEB4: .4byte sub_80BBEB8 + 1 + .pool thumb_func_end sub_80BBE70 thumb_func_start sub_80BBEB8 @@ -385647,9 +373032,9 @@ sub_80BBEB8: @ 80BBEB8 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _080BBEE4 + ldr r5, =0x02039b4c ldr r0, [r5] - ldr r4, _080BBEE8 + ldr r4, =0x00000652 adds r0, r4 ldrh r1, [r0] movs r0, 0x12 @@ -385665,17 +373050,16 @@ sub_80BBEB8: @ 80BBEB8 strh r0, [r1] b _080BC08A .align 2, 0 -_080BBEE4: .4byte 0x02039b4c -_080BBEE8: .4byte 0x00000652 + .pool _080BBEEC: - ldr r2, _080BBF54 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r7, 0x1 adds r0, r7, 0 ands r0, r1 cmp r0, 0 beq _080BBF70 - ldr r1, _080BBF58 + ldr r1, =0x0000060e adds r0, r3, r1 ldrh r0, [r0] lsls r0, 2 @@ -385685,9 +373069,9 @@ _080BBEEC: cmp r0, 0 beq _080BBF70 bl sub_80BD8D0 - ldr r3, _080BBF5C + ldr r3, =0x02020630 ldr r0, [r5] - ldr r2, _080BBF60 + ldr r2, =0x00000626 adds r0, r2 ldrh r0, [r0] lsls r2, r0, 4 @@ -385701,7 +373085,7 @@ _080BBEEC: lsls r0, r1 adds r3, 0x1C adds r2, r3 - ldr r1, _080BBF64 + ldr r1, =sub_80BE470 + 1 str r1, [r2] mvns r0, r0 str r4, [sp] @@ -385709,23 +373093,17 @@ _080BBEEC: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _080BBF68 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _080BBF6C + ldr r1, =sub_80BC2D4 + 1 str r1, [r0] movs r0, 0x15 b _080BC00A .align 2, 0 -_080BBF54: .4byte 0x030022c0 -_080BBF58: .4byte 0x0000060e -_080BBF5C: .4byte 0x02020630 -_080BBF60: .4byte 0x00000626 -_080BBF64: .4byte sub_80BE470 + 1 -_080BBF68: .4byte 0x03005e00 -_080BBF6C: .4byte sub_80BC2D4 + 1 + .pool _080BBF70: ldrh r2, [r2, 0x2E] movs r0, 0x8 @@ -385734,13 +373112,13 @@ _080BBF70: lsrs r1, r0, 16 cmp r1, 0 beq _080BBFC8 - ldr r3, _080BBFB4 + ldr r3, =0x02039b4c ldr r1, [r3] - ldr r2, _080BBFB8 + ldr r2, =0x00000652 adds r0, r1, r2 movs r2, 0 strh r2, [r0] - ldr r0, _080BBFBC + ldr r0, =0x0000064f adds r1, r0 movs r0, 0x1 strb r0, [r1] @@ -385749,22 +373127,18 @@ _080BBF70: lsls r1, 3 adds r0, r1 strh r2, [r0] - ldr r1, _080BBFC0 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _080BBFC4 + ldr r1, =sub_80BC0F8 + 1 str r1, [r0] movs r0, 0x5 bl audio_play b _080BC08A .align 2, 0 -_080BBFB4: .4byte 0x02039b4c -_080BBFB8: .4byte 0x00000652 -_080BBFBC: .4byte 0x0000064f -_080BBFC0: .4byte 0x03005e00 -_080BBFC4: .4byte sub_80BC0F8 + 1 + .pool _080BBFC8: movs r0, 0x4 ands r0, r2 @@ -385780,7 +373154,7 @@ _080BBFC8: movs r3, 0x10 bl sub_80A1AD4 bl sub_80C1258 - ldr r2, _080BC014 + ldr r2, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -385789,12 +373163,12 @@ _080BBFC8: lsrs r0, 24 movs r2, 0 strh r0, [r1, 0x8] - ldr r0, _080BC018 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r3, _080BC01C + ldr r3, =0x0000064e adds r0, r3 strb r2, [r0] - ldr r0, _080BC020 + ldr r0, =sub_80BBD1C + 1 str r0, [r1] movs r0, 0x2 _080BC00A: @@ -385802,10 +373176,7 @@ _080BC00A: bl sub_80BC890 b _080BC08A .align 2, 0 -_080BC014: .4byte 0x03005e00 -_080BC018: .4byte 0x02039b4c -_080BC01C: .4byte 0x0000064e -_080BC020: .4byte sub_80BBD1C + 1 + .pool _080BC024: movs r0, 0x2 ands r0, r2 @@ -385818,23 +373189,22 @@ _080BC024: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _080BC054 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _080BC058 + ldr r1, =sub_80BC3DC + 1 str r1, [r0] movs r0, 0x3 bl audio_play b _080BC08A .align 2, 0 -_080BC054: .4byte 0x03005e00 -_080BC058: .4byte sub_80BC3DC + 1 + .pool _080BC05C: - ldr r5, _080BC094 + ldr r5, =0x02039b4c ldr r0, [r5] - ldr r4, _080BC098 + ldr r4, =0x0000060e adds r0, r4 ldrh r0, [r0] movs r1, 0xE @@ -385842,17 +373212,17 @@ _080BC05C: ldr r1, [r5] adds r4, r1, r4 strh r0, [r4] - ldr r0, _080BC09C + ldr r0, =0x0000062e adds r1, r0 ldrb r0, [r1] cmp r0, 0 beq _080BC08A - ldr r0, _080BC0A0 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _080BC0A4 + ldr r0, =sub_80BC0A8 + 1 str r0, [r1] _080BC08A: add sp, 0x4 @@ -385860,11 +373230,7 @@ _080BC08A: pop {r0} bx r0 .align 2, 0 -_080BC094: .4byte 0x02039b4c -_080BC098: .4byte 0x0000060e -_080BC09C: .4byte 0x0000062e -_080BC0A0: .4byte 0x03005e00 -_080BC0A4: .4byte sub_80BC0A8 + 1 + .pool thumb_func_end sub_80BBEB8 thumb_func_start sub_80BC0A8 @@ -385872,12 +373238,12 @@ sub_80BC0A8: @ 80BC0A8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BC0E4 + ldr r0, =0x02039b4c ldr r2, [r0] - ldr r1, _080BC0E8 + ldr r1, =0x0000062f adds r0, r2, r1 ldrb r0, [r0] - ldr r3, _080BC0EC + ldr r3, =0x00000634 adds r1, r2, r3 ldrb r1, [r1] adds r3, 0x2 @@ -385887,23 +373253,19 @@ sub_80BC0A8: @ 80BC0A8 lsls r0, 24 cmp r0, 0 beq _080BC0DC - ldr r0, _080BC0F0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080BC0F4 + ldr r0, =sub_80BBEB8 + 1 str r0, [r1] _080BC0DC: pop {r4} pop {r0} bx r0 .align 2, 0 -_080BC0E4: .4byte 0x02039b4c -_080BC0E8: .4byte 0x0000062f -_080BC0EC: .4byte 0x00000634 -_080BC0F0: .4byte 0x03005e00 -_080BC0F4: .4byte sub_80BBEB8 + 1 + .pool thumb_func_end sub_80BC0A8 thumb_func_start sub_80BC0F8 @@ -385912,9 +373274,9 @@ sub_80BC0F8: @ 80BC0F8 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _080BC128 + ldr r5, =0x02039b4c ldr r0, [r5] - ldr r4, _080BC12C + ldr r4, =0x00000652 adds r0, r4 ldrh r1, [r0] movs r0, 0x12 @@ -385931,10 +373293,9 @@ sub_80BC0F8: @ 80BC0F8 strh r0, [r1] b _080BC2C8 .align 2, 0 -_080BC128: .4byte 0x02039b4c -_080BC12C: .4byte 0x00000652 + .pool _080BC130: - ldr r0, _080BC154 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -385949,13 +373310,12 @@ _080BC13E: cmp r0, 0x4 bhi _080BC1C2 lsls r0, 2 - ldr r1, _080BC158 + ldr r1, =_080BC15C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BC154: .4byte 0x030022c0 -_080BC158: .4byte _080BC15C + .pool .align 2, 0 _080BC15C: .4byte _080BC1C2 @@ -385964,35 +373324,33 @@ _080BC15C: .4byte _080BC1E4 .4byte _080BC214 _080BC170: - ldr r5, _080BC188 + ldr r5, =0x02039b4c ldr r1, [r5] - ldr r4, _080BC18C + ldr r4, =0x0000060e adds r2, r1, r4 movs r0, 0 strh r0, [r2] - ldr r2, _080BC190 + ldr r2, =0x0000062c adds r1, r2 movs r0, 0x40 strb r0, [r1] b _080BC1B2 .align 2, 0 -_080BC188: .4byte 0x02039b4c -_080BC18C: .4byte 0x0000060e -_080BC190: .4byte 0x0000062c + .pool _080BC194: - ldr r5, _080BC1D0 + ldr r5, =0x02039b4c ldr r2, [r5] - ldr r0, _080BC1D4 + ldr r0, =0x0000060c adds r3, r2, r0 ldrh r0, [r3] subs r0, 0x1 - ldr r4, _080BC1D8 + ldr r4, =0x0000060e adds r1, r2, r4 strh r0, [r1] ldrh r0, [r3] lsls r0, 4 adds r0, 0x30 - ldr r1, _080BC1DC + ldr r1, =0x0000062c adds r2, r1 strb r0, [r2] _080BC1B2: @@ -386003,18 +373361,14 @@ _080BC1B2: movs r1, 0xE bl sub_80BD2B4 _080BC1C2: - ldr r2, _080BC1E0 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x8 orrs r0, r1 strh r0, [r2, 0x2E] b _080BC238 .align 2, 0 -_080BC1D0: .4byte 0x02039b4c -_080BC1D4: .4byte 0x0000060c -_080BC1D8: .4byte 0x0000060e -_080BC1DC: .4byte 0x0000062c -_080BC1E0: .4byte 0x030022c0 + .pool _080BC1E4: movs r0, 0x1 negs r0, r0 @@ -386023,19 +373377,18 @@ _080BC1E4: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _080BC20C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _080BC210 + ldr r1, =sub_80BC3DC + 1 str r1, [r0] movs r0, 0x34 bl audio_play b _080BC238 .align 2, 0 -_080BC20C: .4byte 0x03005e00 -_080BC210: .4byte sub_80BC3DC + 1 + .pool _080BC214: movs r0, 0x1 negs r0, r0 @@ -386044,50 +373397,45 @@ _080BC214: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _080BC260 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _080BC264 + ldr r1, =sub_80BC47C + 1 str r1, [r0] movs r0, 0x3 bl audio_play _080BC238: - ldr r2, _080BC268 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0xA ands r0, r1 cmp r0, 0 beq _080BC278 - ldr r0, _080BC26C + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r2, _080BC270 + ldr r2, =0x0000064f adds r0, r2 movs r1, 0 strb r1, [r0] - ldr r1, _080BC260 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _080BC274 + ldr r1, =sub_80BBEB8 + 1 str r1, [r0] b _080BC296 .align 2, 0 -_080BC260: .4byte 0x03005e00 -_080BC264: .4byte sub_80BC47C + 1 -_080BC268: .4byte 0x030022c0 -_080BC26C: .4byte 0x02039b4c -_080BC270: .4byte 0x0000064f -_080BC274: .4byte sub_80BBEB8 + 1 + .pool _080BC278: ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _080BC2A4 - ldr r0, _080BC2A0 + ldr r0, =0x02039b4c ldr r0, [r0] movs r3, 0xCA lsls r3, 3 @@ -386102,14 +373450,14 @@ _080BC296: bl audio_play b _080BC2C8 .align 2, 0 -_080BC2A0: .4byte 0x02039b4c + .pool _080BC2A4: ldrh r1, [r2, 0x30] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _080BC2C8 - ldr r0, _080BC2D0 + ldr r0, =0x02039b4c ldr r0, [r0] movs r2, 0xCA lsls r2, 3 @@ -386127,7 +373475,7 @@ _080BC2C8: pop {r0} bx r0 .align 2, 0 -_080BC2D0: .4byte 0x02039b4c + .pool thumb_func_end sub_80BC0F8 thumb_func_start sub_80BC2D4 @@ -386135,10 +373483,10 @@ sub_80BC2D4: @ 80BC2D4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _080BC340 - ldr r5, _080BC344 + ldr r2, =0x02020630 + ldr r5, =0x02039b4c ldr r3, [r5] - ldr r4, _080BC348 + ldr r4, =0x00000626 adds r0, r3, r4 ldrh r1, [r0] lsls r0, r1, 4 @@ -386153,10 +373501,10 @@ sub_80BC2D4: @ 80BC2D4 ldrsh r0, [r1, r2] cmp r0, 0x38 bne _080BC33A - ldr r1, _080BC34C + ldr r1, =0x0000064a adds r0, r3, r1 ldrb r1, [r0] - ldr r2, _080BC350 + ldr r2, =0x0000064b adds r0, r3, r2 strb r1, [r0] ldr r1, [r5] @@ -386168,7 +373516,7 @@ sub_80BC2D4: @ 80BC2D4 adds r1, r4 ldrb r1, [r1] bl sub_80BE91C - ldr r2, _080BC354 + ldr r2, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -386178,23 +373526,16 @@ sub_80BC2D4: @ 80BC2D4 strh r0, [r1, 0x8] ldr r0, [r5] adds r0, r4 - ldr r2, _080BC358 + ldr r2, =0x0000ffff strh r2, [r0] - ldr r0, _080BC35C + ldr r0, =sub_80BC360 + 1 str r0, [r1] _080BC33A: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080BC340: .4byte 0x02020630 -_080BC344: .4byte 0x02039b4c -_080BC348: .4byte 0x00000626 -_080BC34C: .4byte 0x0000064a -_080BC350: .4byte 0x0000064b -_080BC354: .4byte 0x03005e00 -_080BC358: .4byte 0x0000ffff -_080BC35C: .4byte sub_80BC360 + 1 + .pool thumb_func_end sub_80BC2D4 thumb_func_start sub_80BC360 @@ -386202,7 +373543,7 @@ sub_80BC360: @ 80BC360 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080BC3BC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -386216,9 +373557,9 @@ sub_80BC360: @ 80BC360 ldrb r0, [r0, 0x4] cmp r0, 0 beq _080BC3CC - ldr r5, _080BC3C0 + ldr r5, =0x02039b4c ldr r0, [r5] - ldr r1, _080BC3C4 + ldr r1, =0x0000064a adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -386233,7 +373574,7 @@ sub_80BC360: @ 80BC360 cmp r0, 0 beq _080BC3D0 ldr r0, [r5] - ldr r2, _080BC3C8 + ldr r2, =0x0000060e adds r1, r0, r2 ldrh r1, [r1] lsls r1, 2 @@ -386242,19 +373583,16 @@ sub_80BC360: @ 80BC360 bl sub_80BE9F8 b _080BC3D0 .align 2, 0 -_080BC3BC: .4byte 0x03005e00 -_080BC3C0: .4byte 0x02039b4c -_080BC3C4: .4byte 0x0000064a -_080BC3C8: .4byte 0x0000060e + .pool _080BC3CC: - ldr r0, _080BC3D8 + ldr r0, =sub_80BBE70 + 1 str r0, [r4] _080BC3D0: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080BC3D8: .4byte sub_80BBE70 + 1 + .pool thumb_func_end sub_80BC360 thumb_func_start sub_80BC3DC @@ -386262,18 +373600,18 @@ sub_80BC3DC: @ 80BC3DC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080BC458 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080BC450 - ldr r4, _080BC45C + ldr r4, =0x02039b4c ldr r0, [r4] - ldr r2, _080BC460 + ldr r2, =0x0000062a adds r1, r0, r2 ldrh r1, [r1] - ldr r3, _080BC464 + ldr r3, =0x0000062c adds r0, r3 strb r1, [r0] ldr r1, [r4] @@ -386283,7 +373621,7 @@ sub_80BC3DC: @ 80BC3DC subs r3, 0x1E adds r0, r1, r3 strh r2, [r0] - ldr r2, _080BC468 + ldr r2, =0x00000614 adds r0, r1, r2 ldrh r0, [r0] adds r3, 0x4 @@ -386294,7 +373632,7 @@ sub_80BC3DC: @ 80BC3DC cmp r1, 0 bne _080BC42A ldr r0, [r4] - ldr r2, _080BC46C + ldr r2, =0x00000612 adds r0, r2 strh r1, [r0] _080BC42A: @@ -386303,15 +373641,15 @@ _080BC42A: lsls r3, 3 adds r1, r0, r3 ldrh r1, [r1] - ldr r2, _080BC470 + ldr r2, =0x00000616 adds r0, r2 strh r1, [r0] - ldr r1, _080BC474 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _080BC478 + ldr r1, =sub_80BB78C + 1 str r1, [r0] bl sub_80BDA40 bl sub_80BC890 @@ -386320,15 +373658,7 @@ _080BC450: pop {r0} bx r0 .align 2, 0 -_080BC458: .4byte 0x02037fd4 -_080BC45C: .4byte 0x02039b4c -_080BC460: .4byte 0x0000062a -_080BC464: .4byte 0x0000062c -_080BC468: .4byte 0x00000614 -_080BC46C: .4byte 0x00000612 -_080BC470: .4byte 0x00000616 -_080BC474: .4byte 0x03005e00 -_080BC478: .4byte sub_80BB78C + 1 + .pool thumb_func_end sub_80BC3DC thumb_func_start sub_80BC47C @@ -386336,18 +373666,18 @@ sub_80BC47C: @ 80BC47C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080BC4F0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080BC4E8 - ldr r4, _080BC4F4 + ldr r4, =0x02039b4c ldr r0, [r4] - ldr r2, _080BC4F8 + ldr r2, =0x0000062a adds r1, r0, r2 ldrh r1, [r1] - ldr r3, _080BC4FC + ldr r3, =0x0000062c adds r0, r3 strb r1, [r0] ldr r1, [r4] @@ -386357,7 +373687,7 @@ sub_80BC47C: @ 80BC47C subs r3, 0x1E adds r0, r1, r3 strh r2, [r0] - ldr r2, _080BC500 + ldr r2, =0x00000614 adds r0, r1, r2 ldrh r0, [r0] adds r3, 0x4 @@ -386368,7 +373698,7 @@ sub_80BC47C: @ 80BC47C cmp r1, 0 bne _080BC4CA ldr r0, [r4] - ldr r2, _080BC504 + ldr r2, =0x00000612 adds r0, r2 strh r1, [r0] _080BC4CA: @@ -386377,30 +373707,22 @@ _080BC4CA: lsls r3, 3 adds r1, r0, r3 ldrh r1, [r1] - ldr r2, _080BC508 + ldr r2, =0x00000616 adds r0, r2 strh r1, [r0] - ldr r1, _080BC50C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _080BC510 + ldr r1, =sub_80BBDE8 + 1 str r1, [r0] _080BC4E8: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080BC4F0: .4byte 0x02037fd4 -_080BC4F4: .4byte 0x02039b4c -_080BC4F8: .4byte 0x0000062a -_080BC4FC: .4byte 0x0000062c -_080BC500: .4byte 0x00000614 -_080BC504: .4byte 0x00000612 -_080BC508: .4byte 0x00000616 -_080BC50C: .4byte 0x03005e00 -_080BC510: .4byte sub_80BBDE8 + 1 + .pool thumb_func_end sub_80BC47C thumb_func_start sub_80BC514 @@ -386409,7 +373731,7 @@ sub_80BC514: @ 80BC514 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080BC538 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -386418,13 +373740,12 @@ sub_80BC514: @ 80BC514 cmp r0, 0x6 bhi _080BC55C lsls r0, 2 - ldr r1, _080BC53C + ldr r1, =_080BC540 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BC538: .4byte 0x030022c0 -_080BC53C: .4byte _080BC540 + .pool .align 2, 0 _080BC540: .4byte _080BC55C @@ -386435,7 +373756,7 @@ _080BC540: .4byte _080BC790 .4byte _080BC818 _080BC55C: - ldr r0, _080BC61C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -386447,22 +373768,22 @@ _080BC55C: _080BC56E: movs r0, 0 bl SetVBlankCallback - ldr r4, _080BC620 + ldr r4, =0x02039b4c ldr r0, [r4] - ldr r1, _080BC624 + ldr r1, =0x0000064a adds r0, r1 strb r5, [r0] movs r0, 0 bl sub_80C09B0 ldr r0, [r4] - ldr r2, _080BC628 + ldr r2, =0x0000062d adds r0, r2 ldrb r1, [r0] movs r0, 0x1A bl lcd_io_set movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080BC62C + ldr r1, =0x0855d298 movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -386488,26 +373809,26 @@ _080BC56E: adds r1, r0, 0 movs r0, 0 bl bg_set_tilemap - ldr r1, _080BC630 + ldr r1, =0x08dc1934 movs r2, 0x80 lsls r2, 6 str r6, [sp] movs r0, 0x3 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _080BC634 + ldr r1, =0x08dc2c5c movs r0, 0x1 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r1, _080BC638 + ldr r1, =0x08dc2dac movs r0, 0x3 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map cmp r5, 0 bne _080BC640 - ldr r1, _080BC63C + ldr r1, =0x08dc2a08 movs r3, 0xA0 lsls r3, 2 movs r0, 0 @@ -386515,17 +373836,9 @@ _080BC56E: bl gpu_copy_to_wram_bg_tile_map b _080BC64E .align 2, 0 -_080BC61C: .4byte 0x02037fd4 -_080BC620: .4byte 0x02039b4c -_080BC624: .4byte 0x0000064a -_080BC628: .4byte 0x0000062d -_080BC62C: .4byte 0x0855d298 -_080BC630: .4byte 0x08dc1934 -_080BC634: .4byte 0x08dc2c5c -_080BC638: .4byte 0x08dc2dac -_080BC63C: .4byte 0x08dc2a08 + .pool _080BC640: - ldr r1, _080BC668 + ldr r1, =0x08dc2b1c movs r3, 0xA0 lsls r3, 2 movs r0, 0 @@ -386535,9 +373848,9 @@ _080BC64E: bl sub_80A1A74 cmp r5, 0 bne _080BC674 - ldr r3, _080BC66C + ldr r3, =0x02039b4c ldr r1, [r3] - ldr r0, _080BC670 + ldr r0, =0x0000064c adds r1, r0 ldrb r2, [r1] movs r0, 0x2 @@ -386545,13 +373858,11 @@ _080BC64E: ands r0, r2 b _080BC682 .align 2, 0 -_080BC668: .4byte 0x08dc2b1c -_080BC66C: .4byte 0x02039b4c -_080BC670: .4byte 0x0000064c + .pool _080BC674: - ldr r3, _080BC6BC + ldr r3, =0x02039b4c ldr r1, [r3] - ldr r2, _080BC6C0 + ldr r2, =0x0000064c adds r1, r2 ldrb r0, [r1] movs r2, 0x1 @@ -386559,13 +373870,13 @@ _080BC674: _080BC682: strb r0, [r1] ldr r0, [r3] - ldr r1, _080BC6C0 + ldr r1, =0x0000064c adds r0, r1 ldrb r0, [r0] lsls r0, 31 lsrs r0, 31 bl sub_80BC844 - ldr r0, _080BC6C4 + ldr r0, =0x0855d2a8 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 @@ -386573,7 +373884,7 @@ _080BC682: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _080BC6C8 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -386581,27 +373892,22 @@ _080BC682: strb r1, [r0] b _080BC838 .align 2, 0 -_080BC6BC: .4byte 0x02039b4c -_080BC6C0: .4byte 0x0000064c -_080BC6C4: .4byte 0x0855d2a8 -_080BC6C8: .4byte 0x030022c0 + .pool _080BC6CC: bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r1, _080BC6F0 + ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] - ldr r0, _080BC6F4 + ldr r0, =0x0855d26c bl gpu_tile_obj_decompress_and_load - ldr r0, _080BC6F8 + ldr r0, =0x0855d27c bl gpu_pal_obj_alloc_and_load_multiple adds r0, r5, 0 bl sub_80BDB7C b _080BC7F8 .align 2, 0 -_080BC6F0: .4byte 0x0300301c -_080BC6F4: .4byte 0x0855d26c -_080BC6F8: .4byte 0x0855d27c + .pool _080BC6FC: movs r2, 0x87 lsls r2, 3 @@ -386610,9 +373916,9 @@ _080BC6FC: _080BC704: cmp r5, 0 bne _080BC71C - ldr r0, _080BC758 + ldr r0, =0x02039b4c ldr r1, [r0] - ldr r2, _080BC75C + ldr r2, =0x00000612 adds r0, r1, r2 ldrb r0, [r0] adds r2, 0x4 @@ -386620,15 +373926,15 @@ _080BC704: ldrb r1, [r1] bl sub_80BC8D4 _080BC71C: - ldr r4, _080BC758 + ldr r4, =0x02039b4c ldr r0, [r4] - ldr r1, _080BC760 + ldr r1, =0x0000060e adds r0, r1 ldrh r0, [r0] movs r1, 0xE bl sub_80BD2B4 ldr r0, [r4] - ldr r2, _080BC764 + ldr r2, =0x0000064f adds r0, r2 movs r1, 0 strb r1, [r0] @@ -386646,10 +373952,7 @@ _080BC71C: bl gpu_copy_wram_bg_tilemap_to_vram b _080BC7F8 .align 2, 0 -_080BC758: .4byte 0x02039b4c -_080BC75C: .4byte 0x00000612 -_080BC760: .4byte 0x0000060e -_080BC764: .4byte 0x0000064f + .pool _080BC768: movs r0, 0x1 negs r0, r0 @@ -386658,21 +373961,20 @@ _080BC768: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _080BC788 + ldr r0, =sub_80BB370 + 1 bl SetVBlankCallback - ldr r1, _080BC78C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _080BC800 .align 2, 0 -_080BC788: .4byte sub_80BB370 + 1 -_080BC78C: .4byte 0x030022c0 + .pool _080BC790: - ldr r1, _080BC808 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r1, _080BC80C + ldr r1, =0x00001d3f movs r0, 0x4A bl lcd_io_set movs r0, 0x40 @@ -386696,7 +373998,7 @@ _080BC790: movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r1, _080BC810 + ldr r1, =0x00009040 movs r0, 0 bl lcd_io_set movs r0, 0 @@ -386708,7 +374010,7 @@ _080BC790: movs r0, 0x3 bl gpu_sync_bg_show _080BC7F8: - ldr r1, _080BC814 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -386718,12 +374020,9 @@ _080BC800: strb r0, [r1] b _080BC838 .align 2, 0 -_080BC808: .4byte 0x00003f3f -_080BC80C: .4byte 0x00001d3f -_080BC810: .4byte 0x00009040 -_080BC814: .4byte 0x030022c0 + .pool _080BC818: - ldr r0, _080BC834 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -386738,7 +374037,7 @@ _080BC818: movs r0, 0x1 b _080BC83A .align 2, 0 -_080BC834: .4byte 0x02037fd4 + .pool _080BC838: movs r0, 0 _080BC83A: @@ -386755,24 +374054,24 @@ sub_80BC844: @ 80BC844 lsrs r0, 24 cmp r0, 0x1 bne _080BC858 - ldr r0, _080BC854 + ldr r0, =0x08dc17b6 b _080BC862 .align 2, 0 -_080BC854: .4byte 0x08dc17b6 + .pool _080BC858: bl sub_809D42C cmp r0, 0 bne _080BC870 - ldr r0, _080BC86C + ldr r0, =0x08dc16f6 _080BC862: movs r1, 0x1 movs r2, 0xBE bl gpu_pal_apply b _080BC87A .align 2, 0 -_080BC86C: .4byte 0x08dc16f6 + .pool _080BC870: - ldr r0, _080BC88C + ldr r0, =0x08dc1876 movs r1, 0x1 movs r2, 0xBE bl gpu_pal_apply @@ -386784,7 +374083,7 @@ _080BC87A: pop {r0} bx r0 .align 2, 0 -_080BC88C: .4byte 0x08dc1876 + .pool thumb_func_end sub_80BC844 thumb_func_start sub_80BC890 @@ -386831,9 +374130,9 @@ sub_80BC8D4: @ 80BC8D4 lsrs r4, r0, 24 lsls r1, 24 lsrs r6, r1, 24 - ldr r0, _080BC908 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BC90C + ldr r1, =0x0000060c adds r0, r1 movs r5, 0 strh r5, [r0] @@ -386849,8 +374148,7 @@ _080BC8FC: strh r0, [r1, 0x2] b _080BC92C .align 2, 0 -_080BC908: .4byte 0x02039b4c -_080BC90C: .4byte 0x0000060c + .pool _080BC910: bl sub_809D42C cmp r0, 0 @@ -386872,12 +374170,12 @@ _080BC92C: b _080BCDB4 _080BC932: lsls r0, r6, 2 - ldr r1, _080BC93C + ldr r1, =_080BC940 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BC93C: .4byte _080BC940 + .pool .align 2, 0 _080BC940: .4byte _080BC958 @@ -386899,7 +374197,7 @@ _080BC958: b _080BCDB4 _080BC96C: mov r5, sp - ldr r2, _080BC9F8 + ldr r2, =0x02039b4c mov r8, r2 movs r3, 0x1 mov r9, r3 @@ -386955,7 +374253,7 @@ _080BC976: lsls r0, 31 cmp r0, 0 beq _080BC9EA - ldr r2, _080BC9FC + ldr r2, =0x0000060c adds r0, r1, r2 mov r3, r10 strh r3, [r0] @@ -386968,8 +374266,7 @@ _080BC9EA: blt _080BC976 b _080BCDB4 .align 2, 0 -_080BC9F8: .4byte 0x02039b4c -_080BC9FC: .4byte 0x0000060c + .pool _080BCA00: movs r4, 0 movs r5, 0 @@ -386981,7 +374278,7 @@ _080BCA00: b _080BCDB4 _080BCA10: mov r6, sp - ldr r0, _080BCAC4 + ldr r0, =0x02039b4c mov r8, r0 movs r1, 0x1 mov r9, r1 @@ -387054,7 +374351,7 @@ _080BCA36: cmp r0, 0 beq _080BCAAC adds r1, r5, 0x1 - ldr r4, _080BCAC8 + ldr r4, =0x0000060c adds r0, r2, r4 strh r1, [r0] _080BCAAC: @@ -387072,18 +374369,17 @@ _080BCAB2: blt _080BCA1A b _080BCDB4 .align 2, 0 -_080BCAC4: .4byte 0x02039b4c -_080BCAC8: .4byte 0x0000060c + .pool _080BCACC: movs r4, 0 mov r5, sp - ldr r3, _080BCB6C + ldr r3, =0x02039b4c mov r8, r3 - ldr r6, _080BCB70 + ldr r6, =0x0000060c movs r7, 0x1 mov r9, r7 _080BCADA: - ldr r1, _080BCB74 + ldr r1, =0x0855c6a4 lsls r4, 16 asrs r0, r4, 15 adds r0, r1 @@ -387154,17 +374450,15 @@ _080BCB58: ble _080BCADA b _080BCDB4 .align 2, 0 -_080BCB6C: .4byte 0x02039b4c -_080BCB70: .4byte 0x0000060c -_080BCB74: .4byte 0x0855c6a4 + .pool _080BCB78: - ldr r4, _080BCBF4 + ldr r4, =0x00000181 lsls r0, r4, 16 mov r5, sp - ldr r7, _080BCBF8 - ldr r6, _080BCBFC + ldr r7, =0x02039b4c + ldr r6, =0x0000060c _080BCB82: - ldr r1, _080BCC00 + ldr r1, =0x0855c9da asrs r0, 15 adds r0, r1 ldrh r0, [r0] @@ -387212,7 +374506,7 @@ _080BCB82: strh r0, [r1] _080BCBE2: lsls r0, r4, 16 - ldr r4, _080BCC04 + ldr r4, =0xffff0000 adds r0, r4 lsrs r4, r0, 16 lsls r0, r4, 16 @@ -387220,21 +374514,17 @@ _080BCBE2: bge _080BCB82 b _080BCDB4 .align 2, 0 -_080BCBF4: .4byte 0x00000181 -_080BCBF8: .4byte 0x02039b4c -_080BCBFC: .4byte 0x0000060c -_080BCC00: .4byte 0x0855c9da -_080BCC04: .4byte 0xffff0000 + .pool _080BCC08: movs r4, 0 mov r5, sp - ldr r7, _080BCC90 + ldr r7, =0x02039b4c mov r8, r7 - ldr r6, _080BCC94 - ldr r0, _080BCC98 + ldr r6, =0x0000060c + ldr r0, =0x00000181 mov r9, r0 _080BCC16: - ldr r1, _080BCC9C + ldr r1, =0x0855c9da lsls r4, 16 asrs r0, r4, 15 adds r0, r1 @@ -387294,18 +374584,15 @@ _080BCC7E: ble _080BCC16 b _080BCDB4 .align 2, 0 -_080BCC90: .4byte 0x02039b4c -_080BCC94: .4byte 0x0000060c -_080BCC98: .4byte 0x00000181 -_080BCC9C: .4byte 0x0855c9da + .pool _080BCCA0: - ldr r4, _080BCD1C + ldr r4, =0x00000181 lsls r0, r4, 16 mov r5, sp - ldr r7, _080BCD20 - ldr r6, _080BCD24 + ldr r7, =0x02039b4c + ldr r6, =0x0000060c _080BCCAA: - ldr r1, _080BCD28 + ldr r1, =0x0855ccde asrs r0, 15 adds r0, r1 ldrh r0, [r0] @@ -387353,7 +374640,7 @@ _080BCCAA: strh r0, [r1] _080BCD0A: lsls r0, r4, 16 - ldr r3, _080BCD2C + ldr r3, =0xffff0000 adds r0, r3 lsrs r4, r0, 16 lsls r0, r4, 16 @@ -387361,21 +374648,17 @@ _080BCD0A: bge _080BCCAA b _080BCDB4 .align 2, 0 -_080BCD1C: .4byte 0x00000181 -_080BCD20: .4byte 0x02039b4c -_080BCD24: .4byte 0x0000060c -_080BCD28: .4byte 0x0855ccde -_080BCD2C: .4byte 0xffff0000 + .pool _080BCD30: movs r4, 0 mov r5, sp - ldr r7, _080BCE18 + ldr r7, =0x02039b4c mov r8, r7 - ldr r6, _080BCE1C - ldr r0, _080BCE20 + ldr r6, =0x0000060c + ldr r0, =0x00000181 mov r9, r0 _080BCD3E: - ldr r1, _080BCE24 + ldr r1, =0x0855ccde lsls r4, 16 asrs r0, r4, 15 adds r0, r1 @@ -387434,14 +374717,14 @@ _080BCDA6: cmp r0, r9 ble _080BCD3E _080BCDB4: - ldr r1, _080BCE18 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080BCE1C + ldr r2, =0x0000060c adds r0, r2 ldrh r4, [r0] lsls r3, r4, 16 asrs r0, r3, 16 - ldr r2, _080BCE20 + ldr r2, =0x00000181 cmp r0, r2 bgt _080BCE08 adds r5, r1, 0 @@ -387452,7 +374735,7 @@ _080BCDB4: negs r7, r7 mov r8, r7 adds r7, r2, 0 - ldr r0, _080BCE28 + ldr r0, =0x0000ffff adds r6, r0, 0 _080BCDDC: ldr r1, [r5] @@ -387487,11 +374770,7 @@ _080BCE08: pop {r0} bx r0 .align 2, 0 -_080BCE18: .4byte 0x02039b4c -_080BCE1C: .4byte 0x0000060c -_080BCE20: .4byte 0x00000181 -_080BCE24: .4byte 0x0855ccde -_080BCE28: .4byte 0x0000ffff + .pool thumb_func_end sub_80BC8D4 thumb_func_start sub_80BCE2C @@ -387570,17 +374849,17 @@ _080BCEB2: lsls r0, r1, 16 lsrs r5, r0, 16 mov r10, r0 - ldr r1, _080BCEE4 + ldr r1, =0x00000181 cmp r5, r1 bhi _080BCED2 - ldr r2, _080BCEE8 + ldr r2, =0x02039b4c mov r8, r2 ldr r0, [r2] mov r3, r10 asrs r6, r3, 14 adds r0, r6 ldrh r0, [r0] - ldr r1, _080BCEEC + ldr r1, =0x0000ffff cmp r0, r1 bne _080BCEF0 _080BCED2: @@ -387592,9 +374871,7 @@ _080BCED2: bl sub_80BD28C b _080BCF64 .align 2, 0 -_080BCEE4: .4byte 0x00000181 -_080BCEE8: .4byte 0x02039b4c -_080BCEEC: .4byte 0x0000ffff + .pool _080BCEF0: mov r3, r9 lsls r0, r3, 25 @@ -387665,8 +374942,8 @@ _080BCF7C: subs r0, r1, 0x5 lsls r1, r0, 16 lsrs r5, r1, 16 - ldr r0, _080BCFAC - ldr r2, _080BCFB0 + ldr r0, =0x00000181 + ldr r2, =0x02039b4c cmp r5, r0 bhi _080BCF9A adds r6, r2, 0 @@ -387674,7 +374951,7 @@ _080BCF7C: asrs r4, r1, 14 adds r0, r3, r4 ldrh r1, [r0] - ldr r0, _080BCFB4 + ldr r0, =0x0000ffff cmp r1, r0 bne _080BCFB8 _080BCF9A: @@ -387687,9 +374964,7 @@ _080BCF9A: lsls r1, 25 b _080BD0B2 .align 2, 0 -_080BCFAC: .4byte 0x00000181 -_080BCFB0: .4byte 0x02039b4c -_080BCFB4: .4byte 0x0000ffff + .pool _080BCFB8: movs r1, 0xC6 lsls r1, 3 @@ -387785,7 +375060,7 @@ _080BD074: adds r0, r1, 0x5 lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _080BD0C0 + ldr r0, =0x02039b4c mov r8, r0 ldr r3, [r0] movs r2, 0xC6 @@ -387804,13 +375079,13 @@ _080BD074: _080BD09A: lsls r1, 16 lsrs r5, r1, 16 - ldr r0, _080BD0C4 + ldr r0, =0x00000181 cmp r5, r0 bhi _080BD0B0 asrs r6, r1, 14 adds r0, r3, r6 ldrh r1, [r0] - ldr r0, _080BD0C8 + ldr r0, =0x0000ffff cmp r1, r0 bne _080BD0CC _080BD0B0: @@ -387822,9 +375097,7 @@ _080BD0B2: bl sub_80BD28C b _080BD13E .align 2, 0 -_080BD0C0: .4byte 0x02039b4c -_080BD0C4: .4byte 0x00000181 -_080BD0C8: .4byte 0x0000ffff + .pool _080BD0CC: lsls r0, r2, 25 lsrs r4, r0, 24 @@ -387904,16 +375177,16 @@ sub_80BD154: @ 80BD154 mov r8, r1 lsls r2, 24 lsrs r7, r2, 24 - ldr r1, _080BD1E8 + ldr r1, =0x0855d2b8 add r0, sp, 0x4 movs r2, 0x6 bl memcpy - ldr r0, _080BD1EC + ldr r0, =0x02039b4c ldr r0, [r0] lsls r4, 2 adds r4, r0, r4 ldrh r6, [r4] - ldr r1, _080BD1F0 + ldr r1, =0x00000612 adds r0, r1 ldrh r0, [r0] cmp r0, 0 @@ -387960,9 +375233,7 @@ _080BD194: pop {r0} bx r0 .align 2, 0 -_080BD1E8: .4byte 0x0855d2b8 -_080BD1EC: .4byte 0x02039b4c -_080BD1F0: .4byte 0x00000612 + .pool thumb_func_end sub_80BD154 thumb_func_start sub_80BD1F4 @@ -387976,7 +375247,7 @@ sub_80BD1F4: @ 80BD1F4 lsrs r4, r2, 24 cmp r0, 0 beq _080BD220 - ldr r1, _080BD21C + ldr r1, =0x0855d2be lsls r2, r3, 3 lsls r3, r4, 3 movs r0, 0x8 @@ -387987,7 +375258,7 @@ sub_80BD1F4: @ 80BD1F4 bl Window_CopyWholePixelBlockToWindow b _080BD234 .align 2, 0 -_080BD21C: .4byte 0x0855d2be + .pool _080BD220: lsls r2, r3, 3 lsls r3, r4, 3 @@ -388021,13 +375292,13 @@ sub_80BD23C: @ 80BD23C beq _080BD264 movs r0, 0xB muls r1, r0 - ldr r0, _080BD260 + ldr r0, =0x083185c8 adds r4, r1, r0 b _080BD266 .align 2, 0 -_080BD260: .4byte 0x083185c8 + .pool _080BD264: - ldr r4, _080BD288 + ldr r4, =0x0855d2fe _080BD266: str r5, [sp] movs r0, 0 @@ -388044,7 +375315,7 @@ _080BD266: pop {r1} bx r1 .align 2, 0 -_080BD288: .4byte 0x0855d2fe + .pool thumb_func_end sub_80BD23C thumb_func_start sub_80BD28C @@ -388079,16 +375350,16 @@ sub_80BD2B4: @ 80BD2B4 lsls r1, 16 lsrs r1, 16 mov r8, r1 - ldr r2, _080BD3DC + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] movs r2, 0 - ldr r7, _080BD3E0 + ldr r7, =0x02039b4c adds r5, r7, 0 - ldr r4, _080BD3E4 - ldr r0, _080BD3E8 + ldr r4, =0x0000061e + ldr r0, =0x0000ffff adds r3, r0, 0 _080BD2DA: ldr r1, [r5] @@ -388104,9 +375375,9 @@ _080BD2DA: cmp r2, 0x3 bls _080BD2DA ldr r0, [r7] - ldr r1, _080BD3EC + ldr r1, =0x00000626 adds r0, r1 - ldr r1, _080BD3E8 + ldr r1, =0x0000ffff strh r1, [r0] subs r0, r6, 0x1 lsls r0, 16 @@ -388114,7 +375385,7 @@ _080BD2DA: bl sub_80BDA8C lsls r0, 16 lsrs r0, 16 - ldr r4, _080BD3E8 + ldr r4, =0x0000ffff cmp r0, r4 beq _080BD334 movs r1, 0x60 @@ -388122,17 +375393,17 @@ _080BD2DA: bl sub_80BDACC lsls r0, 24 lsrs r1, r0, 24 - ldr r3, _080BD3F0 + ldr r3, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, _080BD3F4 + ldr r2, =sub_80BE4E0 + 1 str r2, [r1] adds r0, r3 - ldr r1, _080BD3F8 + ldr r1, =0x0000ffe0 strh r1, [r0, 0x38] _080BD334: adds r0, r6, 0 @@ -388146,14 +375417,14 @@ _080BD334: bl sub_80BDACC lsls r0, 24 lsrs r1, r0, 24 - ldr r3, _080BD3F0 + ldr r3, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, _080BD3F4 + ldr r2, =sub_80BE4E0 + 1 str r2, [r1] adds r0, r3 movs r1, 0 @@ -388172,14 +375443,14 @@ _080BD366: bl sub_80BDACC lsls r0, 24 lsrs r1, r0, 24 - ldr r3, _080BD3F0 + ldr r3, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, _080BD3F4 + ldr r2, =sub_80BE4E0 + 1 str r2, [r1] adds r0, r3 movs r1, 0x20 @@ -388190,7 +375461,7 @@ _080BD39C: mov r2, r8 bl sub_80BCE84 ldr r0, [r7] - ldr r2, _080BD3FC + ldr r2, =0x0000062d adds r0, r2 ldrb r1, [r0] movs r0, 0x1A @@ -388201,10 +375472,10 @@ _080BD39C: adds r1, r0, r2 movs r2, 0 strh r2, [r1] - ldr r1, _080BD400 + ldr r1, =0x00000632 adds r0, r1 strh r2, [r0] - ldr r2, _080BD3DC + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -388215,16 +375486,7 @@ _080BD39C: pop {r0} bx r0 .align 2, 0 -_080BD3DC: .4byte 0x02037fd4 -_080BD3E0: .4byte 0x02039b4c -_080BD3E4: .4byte 0x0000061e -_080BD3E8: .4byte 0x0000ffff -_080BD3EC: .4byte 0x00000626 -_080BD3F0: .4byte 0x02020630 -_080BD3F4: .4byte sub_80BE4E0 + 1 -_080BD3F8: .4byte 0x0000ffe0 -_080BD3FC: .4byte 0x0000062d -_080BD400: .4byte 0x00000632 + .pool thumb_func_end sub_80BD2B4 thumb_func_start sub_80BD404 @@ -388238,9 +375500,9 @@ sub_80BD404: @ 80BD404 lsrs r5, r1, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, _080BD438 + ldr r0, =0x02039b4c ldr r1, [r0] - ldr r3, _080BD43C + ldr r3, =0x0000062e adds r2, r1, r3 ldrb r3, [r2] adds r7, r0, 0 @@ -388256,19 +375518,18 @@ _080BD428: beq _080BD4DC b _080BD558 .align 2, 0 -_080BD438: .4byte 0x02039b4c -_080BD43C: .4byte 0x0000062e + .pool _080BD440: movs r3, 0 - ldr r4, _080BD4C0 + ldr r4, =0x0000ffff mov r12, r4 - ldr r0, _080BD4C4 + ldr r0, =0x02020630 mov r8, r0 adds r2, r7, 0 _080BD44C: ldr r0, [r2] lsls r1, r3, 1 - ldr r4, _080BD4C8 + ldr r4, =0x0000061e adds r0, r4 adds r1, r0, r1 ldrh r0, [r1] @@ -388288,7 +375549,7 @@ _080BD46A: cmp r3, 0x3 bls _080BD44C ldr r4, [r7] - ldr r1, _080BD4CC + ldr r1, =0x0000062e adds r0, r4, r1 ldrb r0, [r0] subs r0, r6, r0 @@ -388297,9 +375558,9 @@ _080BD46A: bl __divsi3 lsls r0, 24 lsrs r2, r0, 24 - ldr r3, _080BD4D0 + ldr r3, =0x0000062d adds r0, r4, r3 - ldr r1, _080BD4D4 + ldr r1, =0x00000632 adds r4, r1 movs r3, 0 ldrsh r1, [r4, r3] @@ -388312,7 +375573,7 @@ _080BD46A: movs r0, 0x1A bl lcd_io_set ldr r0, [r7] - ldr r4, _080BD4D8 + ldr r4, =0x0000062c adds r2, r0, r4 movs r1, 0xC5 lsls r1, 3 @@ -388323,24 +375584,18 @@ _080BD46A: strb r0, [r2] b _080BD558 .align 2, 0 -_080BD4C0: .4byte 0x0000ffff -_080BD4C4: .4byte 0x02020630 -_080BD4C8: .4byte 0x0000061e -_080BD4CC: .4byte 0x0000062e -_080BD4D0: .4byte 0x0000062d -_080BD4D4: .4byte 0x00000632 -_080BD4D8: .4byte 0x0000062c + .pool _080BD4DC: movs r3, 0 - ldr r2, _080BD55C + ldr r2, =0x0000ffff mov r12, r2 - ldr r4, _080BD560 + ldr r4, =0x02020630 mov r8, r4 adds r2, r7, 0 _080BD4E8: ldr r0, [r2] lsls r1, r3, 1 - ldr r4, _080BD564 + ldr r4, =0x0000061e adds r0, r4 adds r1, r0, r1 ldrh r0, [r1] @@ -388360,7 +375615,7 @@ _080BD506: cmp r3, 0x3 bls _080BD4E8 ldr r4, [r7] - ldr r1, _080BD568 + ldr r1, =0x0000062e adds r0, r4, r1 ldrb r0, [r0] subs r0, r6, r0 @@ -388369,9 +375624,9 @@ _080BD506: bl __divsi3 lsls r0, 24 lsrs r2, r0, 24 - ldr r3, _080BD56C + ldr r3, =0x0000062d adds r0, r4, r3 - ldr r1, _080BD570 + ldr r1, =0x00000632 adds r4, r1 movs r3, 0 ldrsh r1, [r4, r3] @@ -388384,7 +375639,7 @@ _080BD506: movs r0, 0x1A bl lcd_io_set ldr r0, [r7] - ldr r4, _080BD574 + ldr r4, =0x0000062c adds r1, r0, r4 movs r2, 0xC5 lsls r2, 3 @@ -388397,15 +375652,9 @@ _080BD558: movs r0, 0 b _080BD598 .align 2, 0 -_080BD55C: .4byte 0x0000ffff -_080BD560: .4byte 0x02020630 -_080BD564: .4byte 0x0000061e -_080BD568: .4byte 0x0000062e -_080BD56C: .4byte 0x0000062d -_080BD570: .4byte 0x00000632 -_080BD574: .4byte 0x0000062c + .pool _080BD578: - ldr r4, _080BD5A4 + ldr r4, =0x0000062d adds r2, r1, r4 movs r3, 0xC6 lsls r3, 3 @@ -388427,7 +375676,7 @@ _080BD598: pop {r1} bx r1 .align 2, 0 -_080BD5A4: .4byte 0x0000062d + .pool thumb_func_end sub_80BD404 thumb_func_start sub_80BD5A8 @@ -388437,13 +375686,13 @@ sub_80BD5A8: @ 80BD5A8 lsrs r2, r0, 24 lsls r1, 16 lsrs r3, r1, 16 - ldr r4, _080BD5D0 + ldr r4, =0x02039b4c ldr r0, [r4] movs r5, 0xC6 lsls r5, 3 adds r1, r0, r5 ldrh r1, [r1] - ldr r6, _080BD5D4 + ldr r6, =0x00000632 adds r0, r6 strh r1, [r0] cmp r2, 0x1 @@ -388452,8 +375701,7 @@ sub_80BD5A8: @ 80BD5A8 beq _080BD638 b _080BD694 .align 2, 0 -_080BD5D0: .4byte 0x02039b4c -_080BD5D4: .4byte 0x00000632 + .pool _080BD5D8: subs r0, r3, 0x1 lsls r0, 16 @@ -388461,7 +375709,7 @@ _080BD5D8: bl sub_80BDA8C lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _080BD624 + ldr r0, =0x0000ffff cmp r1, r0 beq _080BD612 adds r0, r1, 0 @@ -388470,17 +375718,17 @@ _080BD5D8: bl sub_80BDACC lsls r0, 24 lsrs r1, r0, 24 - ldr r3, _080BD628 + ldr r3, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, _080BD62C + ldr r2, =sub_80BE4E0 + 1 str r2, [r1] adds r0, r3 - ldr r1, _080BD630 + ldr r1, =0x0000ffc0 strh r1, [r0, 0x38] _080BD612: ldr r0, [r4] @@ -388493,10 +375741,7 @@ _080BD612: subs r0, r2, 0x1 b _080BD692 .align 2, 0 -_080BD624: .4byte 0x0000ffff -_080BD628: .4byte 0x02020630 -_080BD62C: .4byte sub_80BE4E0 + 1 -_080BD630: .4byte 0x0000ffc0 + .pool _080BD634: movs r0, 0xF b _080BD692 @@ -388507,7 +375752,7 @@ _080BD638: bl sub_80BDA8C lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _080BD684 + ldr r0, =0x0000ffff cmp r1, r0 beq _080BD672 adds r0, r1, 0 @@ -388516,14 +375761,14 @@ _080BD638: bl sub_80BDACC lsls r0, 24 lsrs r1, r0, 24 - ldr r3, _080BD688 + ldr r3, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, _080BD68C + ldr r2, =sub_80BE4E0 + 1 str r2, [r1] adds r0, r3 movs r1, 0x40 @@ -388539,9 +375784,7 @@ _080BD672: adds r0, r2, 0x1 b _080BD692 .align 2, 0 -_080BD684: .4byte 0x0000ffff -_080BD688: .4byte 0x02020630 -_080BD68C: .4byte sub_80BE4E0 + 1 + .pool _080BD690: movs r0, 0 _080BD692: @@ -388565,7 +375808,7 @@ sub_80BD69C: @ 80BD69C lsrs r4, r1, 16 movs r0, 0 mov r10, r0 - ldr r2, _080BD6F0 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0x40 ands r0, r1 @@ -388575,9 +375818,9 @@ sub_80BD69C: @ 80BD69C beq _080BD6FC movs r1, 0x1 mov r10, r1 - ldr r0, _080BD6F4 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r2, _080BD6F8 + ldr r2, =0x0000060c adds r0, r2 ldrh r3, [r0] subs r3, 0x1 @@ -388594,18 +375837,16 @@ sub_80BD69C: @ 80BD69C movs r0, 0x1 b _080BD734 .align 2, 0 -_080BD6F0: .4byte 0x030022c0 -_080BD6F4: .4byte 0x02039b4c -_080BD6F8: .4byte 0x0000060c + .pool _080BD6FC: ldrh r1, [r2, 0x2C] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _080BD74C - ldr r0, _080BD744 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r3, _080BD748 + ldr r3, =0x0000060c adds r0, r3 ldrh r0, [r0] subs r0, 0x1 @@ -388632,8 +375873,7 @@ _080BD734: bl audio_play b _080BD81A .align 2, 0 -_080BD744: .4byte 0x02039b4c -_080BD748: .4byte 0x0000060c + .pool _080BD74C: ldrh r1, [r2, 0x2E] movs r0, 0x20 @@ -388645,9 +375885,9 @@ _080BD74C: adds r6, r7, 0 movs r4, 0 _080BD75E: - ldr r5, _080BD7A8 + ldr r5, =0x02039b4c ldr r0, [r5] - ldr r2, _080BD7AC + ldr r2, =0x0000060c adds r0, r2 ldrh r3, [r0] subs r3, 0x1 @@ -388664,7 +375904,7 @@ _080BD75E: cmp r4, 0x6 bls _080BD75E ldr r1, [r5] - ldr r3, _080BD7B0 + ldr r3, =0x0000062c adds r1, r3 subs r0, r7, r6 lsls r0, 4 @@ -388679,18 +375919,16 @@ _080BD75E: bl audio_play b _080BD81A .align 2, 0 -_080BD7A8: .4byte 0x02039b4c -_080BD7AC: .4byte 0x0000060c -_080BD7B0: .4byte 0x0000062c + .pool _080BD7B4: ldrh r1, [r2, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _080BD81A - ldr r0, _080BD830 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r3, _080BD834 + ldr r3, =0x0000060c adds r0, r3 ldrh r0, [r0] subs r0, 0x1 @@ -388699,9 +375937,9 @@ _080BD7B4: adds r6, r7, 0 movs r4, 0 _080BD7D2: - ldr r5, _080BD830 + ldr r5, =0x02039b4c ldr r0, [r5] - ldr r1, _080BD834 + ldr r1, =0x0000060c adds r0, r1 ldrh r3, [r0] subs r3, 0x1 @@ -388718,7 +375956,7 @@ _080BD7D2: cmp r4, 0x6 bls _080BD7D2 ldr r1, [r5] - ldr r2, _080BD838 + ldr r2, =0x0000062c adds r1, r2 subs r0, r7, r6 lsls r0, 4 @@ -388735,7 +375973,7 @@ _080BD81A: mov r0, r10 cmp r0, 0 bne _080BD83C - ldr r0, _080BD830 + ldr r0, =0x02039b4c ldr r0, [r0] movs r1, 0xC7 lsls r1, 3 @@ -388744,12 +375982,10 @@ _080BD81A: strh r2, [r0] b _080BD8A2 .align 2, 0 -_080BD830: .4byte 0x02039b4c -_080BD834: .4byte 0x0000060c -_080BD838: .4byte 0x0000062c + .pool _080BD83C: - ldr r1, _080BD8B4 - ldr r6, _080BD8B8 + ldr r1, =0x0855d28c + ldr r6, =0x02039b4c ldr r2, [r6] movs r3, 0xC7 lsls r3, 3 @@ -388759,21 +375995,21 @@ _080BD83C: lsrs r0, 2 adds r1, r0, r1 ldrb r5, [r1] - ldr r1, _080BD8BC + ldr r1, =0x0855d291 adds r0, r1 ldrb r3, [r0] - ldr r0, _080BD8C0 + ldr r0, =0x0000062e adds r2, r0 strb r3, [r2] ldr r1, [r6] - ldr r2, _080BD8C4 + ldr r2, =0x00000636 mov r8, r2 adds r0, r1, r2 strh r3, [r0] - ldr r4, _080BD8C8 + ldr r4, =0x00000634 adds r0, r1, r4 strh r5, [r0] - ldr r3, _080BD8CC + ldr r3, =0x0000062f adds r1, r3 mov r0, r10 strb r0, [r1] @@ -388808,28 +376044,22 @@ _080BD8A2: pop {r1} bx r1 .align 2, 0 -_080BD8B4: .4byte 0x0855d28c -_080BD8B8: .4byte 0x02039b4c -_080BD8BC: .4byte 0x0855d291 -_080BD8C0: .4byte 0x0000062e -_080BD8C4: .4byte 0x00000636 -_080BD8C8: .4byte 0x00000634 -_080BD8CC: .4byte 0x0000062f + .pool thumb_func_end sub_80BD69C thumb_func_start sub_80BD8D0 sub_80BD8D0: @ 80BD8D0 push {r4-r7,lr} movs r4, 0 - ldr r0, _080BD91C + ldr r0, =0x02039b4c mov r12, r0 - ldr r6, _080BD920 - ldr r5, _080BD924 + ldr r6, =0x02020630 + ldr r5, =0x0000ffff _080BD8DC: mov r1, r12 ldr r3, [r1] lsls r1, r4, 1 - ldr r2, _080BD928 + ldr r2, =0x0000061e adds r0, r3, r2 adds r0, r1 ldrh r2, [r0] @@ -388847,7 +376077,7 @@ _080BD8DC: bne _080BD90C cmp r2, r5 beq _080BD90C - ldr r1, _080BD92C + ldr r1, =0x00000626 adds r0, r3, r1 strh r2, [r0] _080BD90C: @@ -388860,22 +376090,18 @@ _080BD90C: pop {r0} bx r0 .align 2, 0 -_080BD91C: .4byte 0x02039b4c -_080BD920: .4byte 0x02020630 -_080BD924: .4byte 0x0000ffff -_080BD928: .4byte 0x0000061e -_080BD92C: .4byte 0x00000626 + .pool thumb_func_end sub_80BD8D0 thumb_func_start sub_80BD930 sub_80BD930: @ 80BD930 push {r4-r6,lr} - ldr r3, _080BD990 + ldr r3, =0x02039b4c ldr r0, [r3] - ldr r1, _080BD994 + ldr r1, =0x0000060e adds r0, r1 ldrh r4, [r0] - ldr r2, _080BD998 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x40 ands r0, r1 @@ -388887,7 +376113,7 @@ sub_80BD930: @ 80BD930 adds r5, r3, 0 _080BD950: ldr r0, [r5] - ldr r1, _080BD99C + ldr r1, =0x0000060c adds r0, r1 ldrh r3, [r0] subs r3, 0x1 @@ -388909,31 +376135,28 @@ _080BD950: cmp r2, 0 bne _080BD950 _080BD97E: - ldr r0, _080BD990 + ldr r0, =0x02039b4c ldr r1, [r0] - ldr r0, _080BD994 + ldr r0, =0x0000060e adds r2, r1, r0 ldrh r0, [r2] cmp r0, r4 bne _080BD9A4 b _080BDA38 .align 2, 0 -_080BD990: .4byte 0x02039b4c -_080BD994: .4byte 0x0000060e -_080BD998: .4byte 0x030022c0 -_080BD99C: .4byte 0x0000060c + .pool _080BD9A0: adds r4, r2, 0 b _080BD97E _080BD9A4: strh r4, [r2] - ldr r0, _080BD9B0 + ldr r0, =0x0000062c adds r1, r0 ldrb r0, [r1] subs r0, 0x10 b _080BDA20 .align 2, 0 -_080BD9B0: .4byte 0x0000062c + .pool _080BD9B4: adds r4, r2, 0 b _080BDA08 @@ -388944,7 +376167,7 @@ _080BD9B8: cmp r0, 0 beq _080BDA38 ldr r0, [r3] - ldr r1, _080BDA28 + ldr r1, =0x0000060c adds r0, r1 ldrh r0, [r0] subs r0, 0x1 @@ -388979,15 +376202,15 @@ _080BD9D6: cmp r2, r0 blt _080BD9D6 _080BDA08: - ldr r0, _080BDA2C + ldr r0, =0x02039b4c ldr r1, [r0] - ldr r0, _080BDA30 + ldr r0, =0x0000060e adds r2, r1, r0 ldrh r0, [r2] cmp r0, r4 beq _080BDA38 strh r4, [r2] - ldr r0, _080BDA34 + ldr r0, =0x0000062c adds r1, r0 ldrb r0, [r1] adds r0, 0x10 @@ -388996,10 +376219,7 @@ _080BDA20: movs r0, 0x1 b _080BDA3A .align 2, 0 -_080BDA28: .4byte 0x0000060c -_080BDA2C: .4byte 0x02039b4c -_080BDA30: .4byte 0x0000060e -_080BDA34: .4byte 0x0000062c + .pool _080BDA38: movs r0, 0 _080BDA3A: @@ -389012,12 +376232,12 @@ _080BDA3A: sub_80BDA40: @ 80BDA40 push {r4-r7,lr} movs r5, 0 - ldr r6, _080BDA80 - ldr r7, _080BDA84 + ldr r6, =0x02039b4c + ldr r7, =0x0000ffff _080BDA48: ldr r0, [r6] lsls r4, r5, 1 - ldr r1, _080BDA88 + ldr r1, =0x0000061e adds r0, r1 adds r1, r0, r4 ldrh r0, [r1] @@ -389025,7 +376245,7 @@ _080BDA48: beq _080BDA6C bl sub_818D820 ldr r1, [r6] - ldr r0, _080BDA88 + ldr r0, =0x0000061e adds r1, r0 adds r1, r4 ldrh r2, [r1] @@ -389043,9 +376263,7 @@ _080BDA6C: pop {r1} bx r1 .align 2, 0 -_080BDA80: .4byte 0x02039b4c -_080BDA84: .4byte 0x0000ffff -_080BDA88: .4byte 0x0000061e + .pool thumb_func_end sub_80BDA40 thumb_func_start sub_80BDA8C @@ -389053,24 +376271,22 @@ sub_80BDA8C: @ 80BDA8C push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _080BDAAC + ldr r0, =0x00000181 cmp r2, r0 bhi _080BDAA8 - ldr r0, _080BDAB0 + ldr r0, =0x02039b4c ldr r1, [r0] lsls r0, r2, 2 adds r2, r1, r0 ldrh r1, [r2] - ldr r0, _080BDAB4 + ldr r0, =0x0000ffff cmp r1, r0 bne _080BDAB8 _080BDAA8: - ldr r0, _080BDAB4 + ldr r0, =0x0000ffff b _080BDAC6 .align 2, 0 -_080BDAAC: .4byte 0x00000181 -_080BDAB0: .4byte 0x02039b4c -_080BDAB4: .4byte 0x0000ffff + .pool _080BDAB8: ldrb r0, [r2, 0x2] lsls r0, 31 @@ -389097,15 +376313,15 @@ sub_80BDACC: @ 80BDACC lsls r2, 16 lsrs r2, 16 movs r6, 0 - ldr r0, _080BDB50 + ldr r0, =0x02039b4c mov r9, r0 - ldr r3, _080BDB54 + ldr r3, =0x0000ffff lsls r1, 16 _080BDAE8: mov r4, r9 ldr r0, [r4] lsls r7, r6, 1 - ldr r4, _080BDB58 + ldr r4, =0x0000061e adds r0, r4 adds r0, r7 ldrh r0, [r0] @@ -389120,7 +376336,7 @@ _080BDAE8: adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _080BDB5C + ldr r0, =0x02020630 lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -389145,24 +376361,21 @@ _080BDAE8: strh r0, [r4, 0x32] mov r4, r9 ldr r0, [r4] - ldr r1, _080BDB58 + ldr r1, =0x0000061e adds r0, r1 adds r0, r7 strh r5, [r0] adds r0, r5, 0 b _080BDB6C .align 2, 0 -_080BDB50: .4byte 0x02039b4c -_080BDB54: .4byte 0x0000ffff -_080BDB58: .4byte 0x0000061e -_080BDB5C: .4byte 0x02020630 + .pool _080BDB60: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 bls _080BDAE8 - ldr r0, _080BDB78 + ldr r0, =0x0000ffff _080BDB6C: pop {r3,r4} mov r8, r3 @@ -389171,7 +376384,7 @@ _080BDB6C: pop {r1} bx r1 .align 2, 0 -_080BDB78: .4byte 0x0000ffff + .pool thumb_func_end sub_80BDACC thumb_func_start sub_80BDB7C @@ -389185,7 +376398,7 @@ sub_80BDB7C: @ 80BDB7C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r4, _080BDD48 + ldr r4, =0x0855d1ac adds r0, r4, 0 movs r1, 0xB8 movs r2, 0x4 @@ -389193,7 +376406,7 @@ sub_80BDB7C: @ 80BDB7C bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080BDD4C + ldr r1, =0x02020630 mov r10, r1 lsls r0, r7, 4 adds r0, r7 @@ -389219,12 +376432,12 @@ sub_80BDB7C: @ 80BDB7C movs r2, 0x2 orrs r1, r2 strb r1, [r0] - ldr r0, _080BDD50 + ldr r0, =0x0855d194 movs r1, 0xE6 movs r2, 0x14 movs r3, 0 bl obj_add_from_template_forward_search - ldr r5, _080BDD54 + ldr r5, =0x0855d1c4 adds r0, r5, 0 movs r1, 0x10 movs r2, 0x78 @@ -389274,7 +376487,7 @@ sub_80BDB7C: @ 80BDB7C add r0, r10 movs r1, 0x1 bl obj_anim_image_start - ldr r6, _080BDD58 + ldr r6, =0x0855d1dc adds r0, r6, 0 movs r1, 0 movs r2, 0x50 @@ -389338,7 +376551,7 @@ _080BDCCC: beq _080BDCD6 b _080BDF4C _080BDCD6: - ldr r4, _080BDD5C + ldr r4, =0x0855d1f4 adds r0, r4, 0 movs r1, 0x20 movs r2, 0x28 @@ -389359,16 +376572,16 @@ _080BDCD6: bl obj_anim_image_start movs r0, 0 mov r8, r0 - ldr r0, _080BDD60 + ldr r0, =0x0855d224 movs r1, 0x18 movs r2, 0x30 movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080BDD64 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BDD68 + ldr r1, =0x0000061a adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -389390,15 +376603,7 @@ _080BDCD6: mov r8, r0 b _080BDD78 .align 2, 0 -_080BDD48: .4byte 0x0855d1ac -_080BDD4C: .4byte 0x02020630 -_080BDD50: .4byte 0x0855d194 -_080BDD54: .4byte 0x0855d1c4 -_080BDD58: .4byte 0x0855d1dc -_080BDD5C: .4byte 0x0855d1f4 -_080BDD60: .4byte 0x0855d224 -_080BDD64: .4byte 0x02039b4c -_080BDD68: .4byte 0x0000061a + .pool _080BDD6C: adds r0, r4, 0 adds r0, 0x3E @@ -389407,16 +376612,16 @@ _080BDD6C: orrs r1, r2 strb r1, [r0] _080BDD78: - ldr r0, _080BDDC4 + ldr r0, =0x0855d224 movs r1, 0x20 movs r2, 0x30 movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080BDDC8 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BDDCC + ldr r1, =0x0000061a adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -389436,19 +376641,16 @@ _080BDDB0: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _080BDDD0 + ldr r1, =0x02020630 adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start b _080BDDE8 .align 2, 0 -_080BDDC4: .4byte 0x0855d224 -_080BDDC8: .4byte 0x02039b4c -_080BDDCC: .4byte 0x0000061a -_080BDDD0: .4byte 0x02020630 + .pool _080BDDD4: - ldr r1, _080BDE6C + ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -389459,7 +376661,7 @@ _080BDDD4: orrs r1, r2 strb r1, [r0] _080BDDE8: - ldr r6, _080BDE70 + ldr r6, =0x0855d224 adds r0, r6, 0 movs r1, 0x28 movs r2, 0x30 @@ -389467,9 +376669,9 @@ _080BDDE8: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r5, _080BDE74 + ldr r5, =0x02039b4c ldr r0, [r5] - ldr r1, _080BDE78 + ldr r1, =0x0000061a adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -389482,7 +376684,7 @@ _080BDDE8: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r4, _080BDE6C + ldr r4, =0x02020630 adds r0, r4 lsls r1, 24 lsrs r1, 24 @@ -389497,7 +376699,7 @@ _080BDDE8: lsls r0, 24 lsrs r7, r0, 24 ldr r0, [r5] - ldr r1, _080BDE7C + ldr r1, =0x0000061c adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -389518,11 +376720,7 @@ _080BDDE8: mov r8, r0 b _080BDE8C .align 2, 0 -_080BDE6C: .4byte 0x02020630 -_080BDE70: .4byte 0x0855d224 -_080BDE74: .4byte 0x02039b4c -_080BDE78: .4byte 0x0000061a -_080BDE7C: .4byte 0x0000061c + .pool _080BDE80: adds r0, r4, 0 adds r0, 0x3E @@ -389531,16 +376729,16 @@ _080BDE80: orrs r1, r2 strb r1, [r0] _080BDE8C: - ldr r0, _080BDED8 + ldr r0, =0x0855d224 movs r1, 0x20 movs r2, 0x50 movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080BDEDC + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BDEE0 + ldr r1, =0x0000061c adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -389560,19 +376758,16 @@ _080BDEC4: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _080BDEE4 + ldr r1, =0x02020630 adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start b _080BDEFC .align 2, 0 -_080BDED8: .4byte 0x0855d224 -_080BDEDC: .4byte 0x02039b4c -_080BDEE0: .4byte 0x0000061c -_080BDEE4: .4byte 0x02020630 + .pool _080BDEE8: - ldr r1, _080BDF3C + ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -389583,16 +376778,16 @@ _080BDEE8: orrs r1, r2 strb r1, [r0] _080BDEFC: - ldr r0, _080BDF40 + ldr r0, =0x0855d224 movs r1, 0x28 movs r2, 0x50 movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080BDF44 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BDF48 + ldr r1, =0x0000061c adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -389605,19 +376800,16 @@ _080BDEFC: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r2, _080BDF3C + ldr r2, =0x02020630 adds r0, r2 lsls r1, 24 lsrs r1, 24 bl obj_anim_image_start b _080BE3E2 .align 2, 0 -_080BDF3C: .4byte 0x02020630 -_080BDF40: .4byte 0x0855d224 -_080BDF44: .4byte 0x02039b4c -_080BDF48: .4byte 0x0000061c + .pool _080BDF4C: - ldr r4, _080BE018 + ldr r4, =0x0855d1f4 adds r0, r4, 0 movs r1, 0x20 movs r2, 0x28 @@ -389636,7 +376828,7 @@ _080BDF4C: add r0, r10 movs r1, 0x1 bl obj_anim_image_start - ldr r4, _080BE01C + ldr r4, =0x0855d20c adds r0, r4, 0 movs r1, 0x11 movs r2, 0x2D @@ -389679,7 +376871,7 @@ _080BDF4C: lsrs r6, r0, 16 movs r0, 0 mov r8, r0 - ldr r0, _080BE020 + ldr r0, =0x0855d23c movs r1, 0x28 movs r2, 0x2D movs r3, 0x1 @@ -389706,9 +376898,7 @@ _080BDF4C: mov r8, r0 b _080BE030 .align 2, 0 -_080BE018: .4byte 0x0855d1f4 -_080BE01C: .4byte 0x0855d20c -_080BE020: .4byte 0x0855d23c + .pool _080BE024: adds r0, r4, 0 adds r0, 0x3E @@ -389717,7 +376907,7 @@ _080BE024: orrs r1, r2 strb r1, [r0] _080BE030: - ldr r0, _080BE074 + ldr r0, =0x0855d23c movs r1, 0x30 movs r2, 0x2D movs r3, 0x1 @@ -389742,17 +376932,16 @@ _080BE060: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _080BE078 + ldr r1, =0x02020630 adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start b _080BE090 .align 2, 0 -_080BE074: .4byte 0x0855d23c -_080BE078: .4byte 0x02020630 + .pool _080BE07C: - ldr r1, _080BE10C + ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -389763,7 +376952,7 @@ _080BE07C: orrs r1, r2 strb r1, [r0] _080BE090: - ldr r5, _080BE110 + ldr r5, =0x0855d23c adds r0, r5, 0 movs r1, 0x38 movs r2, 0x2D @@ -389782,7 +376971,7 @@ _080BE090: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r4, _080BE10C + ldr r4, =0x02020630 adds r0, r4 lsls r1, 24 lsrs r1, 24 @@ -389796,9 +376985,9 @@ _080BE090: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080BE114 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BE118 + ldr r1, =0x0000061a adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -389819,10 +377008,7 @@ _080BE090: mov r8, r0 b _080BE128 .align 2, 0 -_080BE10C: .4byte 0x02020630 -_080BE110: .4byte 0x0855d23c -_080BE114: .4byte 0x02039b4c -_080BE118: .4byte 0x0000061a + .pool _080BE11C: adds r0, r4, 0 adds r0, 0x3E @@ -389831,16 +377017,16 @@ _080BE11C: orrs r1, r2 strb r1, [r0] _080BE128: - ldr r0, _080BE174 + ldr r0, =0x0855d23c movs r1, 0x30 movs r2, 0x37 movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080BE178 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BE17C + ldr r1, =0x0000061a adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -389860,19 +377046,16 @@ _080BE160: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _080BE180 + ldr r1, =0x02020630 adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start b _080BE198 .align 2, 0 -_080BE174: .4byte 0x0855d23c -_080BE178: .4byte 0x02039b4c -_080BE17C: .4byte 0x0000061a -_080BE180: .4byte 0x02020630 + .pool _080BE184: - ldr r1, _080BE220 + ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -389883,7 +377066,7 @@ _080BE184: orrs r1, r2 strb r1, [r0] _080BE198: - ldr r5, _080BE224 + ldr r5, =0x0855d23c adds r0, r5, 0 movs r1, 0x38 movs r2, 0x37 @@ -389891,9 +377074,9 @@ _080BE198: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080BE228 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BE22C + ldr r1, =0x0000061a adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -389906,7 +377089,7 @@ _080BE198: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r4, _080BE220 + ldr r4, =0x02020630 adds r0, r4 lsls r1, 24 lsrs r1, 24 @@ -389943,10 +377126,7 @@ _080BE198: mov r8, r1 b _080BE23C .align 2, 0 -_080BE220: .4byte 0x02020630 -_080BE224: .4byte 0x0855d23c -_080BE228: .4byte 0x02039b4c -_080BE22C: .4byte 0x0000061a + .pool _080BE230: adds r0, r4, 0 adds r0, 0x3E @@ -389955,7 +377135,7 @@ _080BE230: orrs r1, r2 strb r1, [r0] _080BE23C: - ldr r0, _080BE280 + ldr r0, =0x0855d23c movs r1, 0x30 movs r2, 0x51 movs r3, 0x1 @@ -389980,17 +377160,16 @@ _080BE26C: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _080BE284 + ldr r1, =0x02020630 adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start b _080BE29C .align 2, 0 -_080BE280: .4byte 0x0855d23c -_080BE284: .4byte 0x02020630 + .pool _080BE288: - ldr r1, _080BE318 + ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -390001,7 +377180,7 @@ _080BE288: orrs r1, r2 strb r1, [r0] _080BE29C: - ldr r5, _080BE31C + ldr r5, =0x0855d23c adds r0, r5, 0 movs r1, 0x38 movs r2, 0x51 @@ -390020,7 +377199,7 @@ _080BE29C: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r4, _080BE318 + ldr r4, =0x02020630 adds r0, r4 lsls r1, 24 lsrs r1, 24 @@ -390034,9 +377213,9 @@ _080BE29C: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080BE320 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BE324 + ldr r1, =0x0000061c adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -390057,10 +377236,7 @@ _080BE29C: mov r8, r0 b _080BE334 .align 2, 0 -_080BE318: .4byte 0x02020630 -_080BE31C: .4byte 0x0855d23c -_080BE320: .4byte 0x02039b4c -_080BE324: .4byte 0x0000061c + .pool _080BE328: adds r0, r4, 0 adds r0, 0x3E @@ -390069,16 +377245,16 @@ _080BE328: orrs r1, r2 strb r1, [r0] _080BE334: - ldr r0, _080BE380 + ldr r0, =0x0855d23c movs r1, 0x30 movs r2, 0x5B movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080BE384 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BE388 + ldr r1, =0x0000061c adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -390098,19 +377274,16 @@ _080BE36C: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _080BE38C + ldr r1, =0x02020630 adds r0, r1 lsls r1, r5, 24 lsrs r1, 24 bl obj_anim_image_start b _080BE3A4 .align 2, 0 -_080BE380: .4byte 0x0855d23c -_080BE384: .4byte 0x02039b4c -_080BE388: .4byte 0x0000061c -_080BE38C: .4byte 0x02020630 + .pool _080BE390: - ldr r1, _080BE400 + ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -390121,16 +377294,16 @@ _080BE390: orrs r1, r2 strb r1, [r0] _080BE3A4: - ldr r0, _080BE404 + ldr r0, =0x0855d23c movs r1, 0x38 movs r2, 0x5B movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080BE408 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BE40C + ldr r1, =0x0000061c adds r0, r1 ldrh r0, [r0] movs r1, 0x64 @@ -390143,33 +377316,29 @@ _080BE3A4: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r2, _080BE400 + ldr r2, =0x02020630 adds r0, r2 lsls r1, 24 lsrs r1, 24 bl obj_anim_image_start _080BE3E2: - ldr r0, _080BE410 + ldr r0, =0x0855d254 movs r1, 0x88 movs r2, 0x60 movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080BE400 + ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 lsls r0, 2 adds r0, r1 b _080BE42C .align 2, 0 -_080BE400: .4byte 0x02020630 -_080BE404: .4byte 0x0855d23c -_080BE408: .4byte 0x02039b4c -_080BE40C: .4byte 0x0000061c -_080BE410: .4byte 0x0855d254 + .pool _080BE414: - ldr r0, _080BE444 + ldr r0, =0x0855d254 movs r1, 0x88 movs r2, 0x50 movs r3, 0x1 @@ -390194,7 +377363,7 @@ _080BE42C: pop {r0} bx r0 .align 2, 0 -_080BE444: .4byte 0x0855d254 + .pool thumb_func_end sub_80BDB7C thumb_func_start nullsub_38 @@ -390206,9 +377375,9 @@ nullsub_38: @ 80BE448 sub_80BE44C: @ 80BE44C push {lr} adds r1, r0, 0 - ldr r0, _080BE468 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r2, _080BE46C + ldr r2, =0x0000064a adds r0, r2 ldrb r0, [r0] cmp r0, 0 @@ -390219,8 +377388,7 @@ _080BE464: pop {r0} bx r0 .align 2, 0 -_080BE468: .4byte 0x02039b4c -_080BE46C: .4byte 0x0000064a + .pool thumb_func_end sub_80BE44C thumb_func_start sub_80BE470 @@ -390241,7 +377409,7 @@ sub_80BE470: @ 80BE470 strh r0, [r2, 0x24] strh r0, [r2, 0x26] ldr r1, [r2, 0x20] - ldr r0, _080BE4D0 + ldr r0, =0x00380030 cmp r1, r0 beq _080BE4D4 ldrh r1, [r2, 0x20] @@ -390277,15 +377445,15 @@ _080BE4C0: strh r0, [r2, 0x22] b _080BE4D8 .align 2, 0 -_080BE4D0: .4byte 0x00380030 + .pool _080BE4D4: - ldr r0, _080BE4DC + ldr r0, =nullsub_38 + 1 str r0, [r2, 0x1C] _080BE4D8: pop {r0} bx r0 .align 2, 0 -_080BE4DC: .4byte nullsub_38 + 1 + .pool thumb_func_end sub_80BE470 thumb_func_start sub_80BE4E0 @@ -390296,9 +377464,9 @@ sub_80BE4E0: @ 80BE4E0 ldrh r0, [r4, 0x30] lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _080BE514 + ldr r7, =0x02039b4c ldr r1, [r7] - ldr r2, _080BE518 + ldr r2, =0x0000064a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -390306,7 +377474,7 @@ sub_80BE4E0: @ 80BE4E0 cmp r0, 0x3 beq _080BE520 lsls r5, r6, 1 - ldr r4, _080BE51C + ldr r4, =0x0000061e adds r0, r1, r4 adds r0, r5 ldrh r0, [r0] @@ -390316,11 +377484,9 @@ sub_80BE4E0: @ 80BE4E0 adds r0, r5 b _080BE5EC .align 2, 0 -_080BE514: .4byte 0x02039b4c -_080BE518: .4byte 0x0000064a -_080BE51C: .4byte 0x0000061e + .pool _080BE520: - ldr r2, _080BE5AC + ldr r2, =0x08329f40 ldrh r0, [r4, 0x38] lsls r0, 24 lsrs r0, 23 @@ -390346,7 +377512,7 @@ _080BE538: lsls r0, 9 bl __divsi3 adds r2, r0, 0 - ldr r0, _080BE5B0 + ldr r0, =0x0000ffff cmp r2, r0 bls _080BE55C adds r2, r0, 0 @@ -390390,8 +377556,7 @@ _080BE55C: strh r0, [r4, 0x2E] b _080BE5C0 .align 2, 0 -_080BE5AC: .4byte 0x08329f40 -_080BE5B0: .4byte 0x0000ffff + .pool _080BE5B4: adds r2, r4, 0 adds r2, 0x3E @@ -390410,10 +377575,10 @@ _080BE5C0: ldrsh r0, [r4, r3] cmp r0, 0 beq _080BE5F0 - ldr r5, _080BE5F8 + ldr r5, =0x02039b4c ldr r0, [r5] lsls r6, 1 - ldr r4, _080BE5FC + ldr r4, =0x0000061e adds r0, r4 adds r0, r6 ldrh r0, [r0] @@ -390422,7 +377587,7 @@ _080BE5C0: adds r0, r4 adds r0, r6 _080BE5EC: - ldr r1, _080BE600 + ldr r1, =0x0000ffff strh r1, [r0] _080BE5F0: add sp, 0x4 @@ -390430,18 +377595,16 @@ _080BE5F0: pop {r0} bx r0 .align 2, 0 -_080BE5F8: .4byte 0x02039b4c -_080BE5FC: .4byte 0x0000061e -_080BE600: .4byte 0x0000ffff + .pool thumb_func_end sub_80BE4E0 thumb_func_start sub_80BE604 sub_80BE604: @ 80BE604 push {r4,lr} adds r4, r0, 0 - ldr r1, _080BE624 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080BE628 + ldr r2, =0x0000064a adds r0, r2 ldrb r0, [r0] cmp r0, 0 @@ -390452,17 +377615,16 @@ sub_80BE604: @ 80BE604 bl obj_delete_and_free_tiles b _080BE648 .align 2, 0 -_080BE624: .4byte 0x02039b4c -_080BE628: .4byte 0x0000064a + .pool _080BE62C: ldr r2, [r1] - ldr r1, _080BE650 + ldr r1, =0x0000060e adds r0, r2, r1 ldrh r1, [r0] lsls r0, r1, 4 subs r0, r1 lsls r0, 3 - ldr r1, _080BE654 + ldr r1, =0x0000060c adds r2, r1 ldrh r1, [r2] subs r1, 0x1 @@ -390473,17 +377635,16 @@ _080BE648: pop {r0} bx r0 .align 2, 0 -_080BE650: .4byte 0x0000060e -_080BE654: .4byte 0x0000060c + .pool thumb_func_end sub_80BE604 thumb_func_start sub_80BE658 sub_80BE658: @ 80BE658 push {r4,r5,lr} adds r3, r0, 0 - ldr r1, _080BE678 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080BE67C + ldr r2, =0x0000064a adds r0, r2 ldrb r0, [r0] adds r5, r1, 0 @@ -390495,15 +377656,14 @@ sub_80BE658: @ 80BE658 bl obj_delete_and_free_tiles b _080BE750 .align 2, 0 -_080BE678: .4byte 0x02039b4c -_080BE67C: .4byte 0x0000064a + .pool _080BE680: movs r1, 0x30 ldrsh r0, [r3, r1] cmp r0, 0 beq _080BE6C2 ldr r0, [r5] - ldr r2, _080BE6A8 + ldr r2, =0x0000060e adds r1, r0, r2 ldrh r1, [r1] subs r2, 0x2 @@ -390519,7 +377679,7 @@ _080BE680: orrs r1, r2 b _080BE6B8 .align 2, 0 -_080BE6A8: .4byte 0x0000060e + .pool _080BE6AC: adds r0, r3, 0 adds r0, 0x3E @@ -390535,7 +377695,7 @@ _080BE6B8: b _080BE6F8 _080BE6C2: ldr r0, [r5] - ldr r1, _080BE6DC + ldr r1, =0x0000060e adds r0, r1 ldrh r0, [r0] cmp r0, 0 @@ -390547,7 +377707,7 @@ _080BE6C2: orrs r1, r2 b _080BE6EC .align 2, 0 -_080BE6DC: .4byte 0x0000060e + .pool _080BE6E0: adds r0, r3, 0 adds r0, 0x3E @@ -390565,7 +377725,7 @@ _080BE6EC: _080BE6F8: lsrs r0, 24 adds r4, r1, 0 - ldr r1, _080BE740 + ldr r1, =0x08329f40 lsls r0, 1 adds r0, r1 movs r1, 0 @@ -390580,7 +377740,7 @@ _080BE70C: adds r0, 0x8 strh r0, [r3, 0x32] ldr r1, [r5] - ldr r3, _080BE744 + ldr r3, =0x0000064f adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 @@ -390601,8 +377761,7 @@ _080BE70C: ands r0, r1 b _080BE74E .align 2, 0 -_080BE740: .4byte 0x08329f40 -_080BE744: .4byte 0x0000064f + .pool _080BE748: ldrb r0, [r2] movs r1, 0x4 @@ -390619,9 +377778,9 @@ _080BE750: sub_80BE758: @ 80BE758 push {lr} adds r1, r0, 0 - ldr r0, _080BE778 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r2, _080BE77C + ldr r2, =0x0000064a adds r0, r2 ldrb r0, [r0] cmp r0, 0 @@ -390634,8 +377793,7 @@ _080BE774: pop {r0} bx r0 .align 2, 0 -_080BE778: .4byte 0x02039b4c -_080BE77C: .4byte 0x0000064a + .pool thumb_func_end sub_80BE758 thumb_func_start sub_80BE780 @@ -390643,9 +377801,9 @@ sub_80BE780: @ 80BE780 push {r4-r7,lr} sub sp, 0x4 adds r6, r0, 0 - ldr r1, _080BE7A4 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080BE7A8 + ldr r2, =0x0000064a adds r0, r2 ldrb r0, [r0] adds r7, r1, 0 @@ -390657,18 +377815,17 @@ sub_80BE780: @ 80BE780 bl obj_delete_and_free_tiles b _080BE824 .align 2, 0 -_080BE7A4: .4byte 0x02039b4c -_080BE7A8: .4byte 0x0000064a + .pool _080BE7AC: ldr r0, [r7] - ldr r5, _080BE82C + ldr r5, =0x0000062c adds r0, r5 ldrb r1, [r0] ldrh r0, [r6, 0x30] adds r1, r0 lsls r1, 24 lsrs r1, 24 - ldr r4, _080BE830 + ldr r4, =0x08329f40 lsls r0, r1, 1 adds r0, r4 ldrh r3, [r0] @@ -390727,17 +377884,16 @@ _080BE824: pop {r0} bx r0 .align 2, 0 -_080BE82C: .4byte 0x0000062c -_080BE830: .4byte 0x08329f40 + .pool thumb_func_end sub_80BE780 thumb_func_start sub_80BE834 sub_80BE834: @ 80BE834 push {r4,lr} adds r3, r0, 0 - ldr r1, _080BE854 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080BE858 + ldr r2, =0x0000064a adds r0, r2 ldrb r2, [r0] cmp r2, 0 @@ -390748,11 +377904,10 @@ sub_80BE834: @ 80BE834 bl obj_delete_and_free_tiles b _080BE8D4 .align 2, 0 -_080BE854: .4byte 0x02039b4c -_080BE858: .4byte 0x0000064a + .pool _080BE85C: ldr r4, [r1] - ldr r1, _080BE8BC + ldr r1, =0x0000064a adds r0, r4, r1 ldrb r0, [r0] movs r1, 0x60 @@ -390760,7 +377915,7 @@ _080BE85C: bne _080BE86C movs r1, 0x50 _080BE86C: - ldr r2, _080BE8C0 + ldr r2, =0x0000064f adds r0, r4, r2 ldrb r0, [r0] cmp r0, 0 @@ -390784,7 +377939,7 @@ _080BE86C: ldrh r0, [r0] lsls r0, 4 strh r0, [r3, 0x26] - ldr r1, _080BE8C4 + ldr r1, =0x08329f40 ldrh r2, [r3, 0x32] lsls r0, r2, 24 lsrs r0, 23 @@ -390802,9 +377957,7 @@ _080BE8B0: strh r0, [r3, 0x32] b _080BE8D4 .align 2, 0 -_080BE8BC: .4byte 0x0000064a -_080BE8C0: .4byte 0x0000064f -_080BE8C4: .4byte 0x08329f40 + .pool _080BE8C8: adds r0, r3, 0 adds r0, 0x3E @@ -390857,15 +378010,15 @@ sub_80BE91C: @ 80BE91C push {r4,r5,lr} lsls r4, r1, 24 lsrs r4, 24 - ldr r1, _080BE9B0 + ldr r1, =0x02039b54 str r0, [r1] - ldr r0, _080BE9B4 + ldr r0, =sub_80BEA24 + 1 movs r1, 0 bl AddTask adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r1, _080BE9B8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -390881,7 +378034,7 @@ sub_80BE91C: @ 80BE91C strh r1, [r0, 0x12] movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080BE9BC + ldr r1, =0x0856e630 movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -390907,7 +378060,7 @@ sub_80BE91C: @ 80BE91C adds r1, r0, 0 movs r0, 0 bl bg_set_tilemap - ldr r0, _080BE9C0 + ldr r0, =0x0856e640 bl Window_InitFromTemplates bl TextBox_ResetSomeField adds r0, r5, 0 @@ -390915,11 +378068,7 @@ sub_80BE91C: @ 80BE91C pop {r1} bx r1 .align 2, 0 -_080BE9B0: .4byte 0x02039b54 -_080BE9B4: .4byte sub_80BEA24 + 1 -_080BE9B8: .4byte 0x03005e00 -_080BE9BC: .4byte 0x0856e630 -_080BE9C0: .4byte 0x0856e640 + .pool thumb_func_end sub_80BE91C thumb_func_start sub_80BE9C4 @@ -390927,7 +378076,7 @@ sub_80BE9C4: @ 80BE9C4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080BE9E8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -390937,14 +378086,13 @@ sub_80BE9C4: @ 80BE9C4 cmp r0, 0 bne _080BE9F0 ldr r1, [r1] - ldr r0, _080BE9EC + ldr r0, =sub_80BEDF4 + 1 cmp r1, r0 bne _080BE9F0 movs r0, 0 b _080BE9F2 .align 2, 0 -_080BE9E8: .4byte 0x03005e00 -_080BE9EC: .4byte sub_80BEDF4 + 1 + .pool _080BE9F0: movs r0, 0x1 _080BE9F2: @@ -390957,9 +378105,9 @@ sub_80BE9F8: @ 80BE9F8 adds r2, r0, 0 lsls r0, r1, 24 lsrs r0, 24 - ldr r1, _080BEA1C + ldr r1, =0x02039b54 str r2, [r1] - ldr r2, _080BEA20 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -390972,8 +378120,7 @@ sub_80BE9F8: @ 80BE9F8 strh r3, [r1, 0xE] bx lr .align 2, 0 -_080BEA1C: .4byte 0x02039b54 -_080BEA20: .4byte 0x03005e00 + .pool thumb_func_end sub_80BE9F8 thumb_func_start sub_80BEA24 @@ -390982,7 +378129,7 @@ sub_80BEA24: @ 80BEA24 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080BEA48 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -390991,13 +378138,12 @@ sub_80BEA24: @ 80BEA24 cmp r0, 0xA bhi _080BEA7C lsls r0, 2 - ldr r1, _080BEA4C + ldr r1, =_080BEA50 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BEA48: .4byte 0x030022c0 -_080BEA4C: .4byte _080BEA50 + .pool .align 2, 0 _080BEA50: .4byte _080BEA7C @@ -391012,7 +378158,7 @@ _080BEA50: .4byte _080BED5E .4byte _080BED7C _080BEA7C: - ldr r0, _080BEADC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -391020,19 +378166,19 @@ _080BEA7C: beq _080BEA8A b _080BEDA0 _080BEA8A: - ldr r0, _080BEAE0 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r3, _080BEAE4 + ldr r3, =0x0000064a adds r0, r3 movs r6, 0x1 strb r6, [r0] - ldr r1, _080BEAE8 + ldr r1, =0x030060b4 ldr r0, [r5, 0xC] str r0, [r1] movs r0, 0 bl SetVBlankCallback movs r2, 0 - ldr r1, _080BEAEC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -391061,13 +378207,9 @@ _080BEACA: strb r6, [r0] b _080BEDA0 .align 2, 0 -_080BEADC: .4byte 0x02037fd4 -_080BEAE0: .4byte 0x02039b4c -_080BEAE4: .4byte 0x0000064a -_080BEAE8: .4byte 0x030060b4 -_080BEAEC: .4byte 0x03005e00 + .pool _080BEAF0: - ldr r1, _080BEB40 + ldr r1, =0x08dc1934 movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -391075,7 +378217,7 @@ _080BEAF0: movs r0, 0x3 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _080BEB44 + ldr r1, =0x08dc3080 movs r0, 0x3 movs r2, 0 movs r3, 0 @@ -391087,7 +378229,7 @@ _080BEAF0: bl Window_WriteStandardTileMap movs r0, 0x1 bl Window_WriteStandardTileMap - ldr r0, _080BEB48 + ldr r0, =0x02039b54 ldr r0, [r0] ldrh r1, [r0] movs r0, 0x1 @@ -391095,55 +378237,49 @@ _080BEAF0: movs r0, 0x1 movs r1, 0x2 bl Window_CopyToVram - ldr r1, _080BEB4C + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _080BED70 .align 2, 0 -_080BEB40: .4byte 0x08dc1934 -_080BEB44: .4byte 0x08dc3080 -_080BEB48: .4byte 0x02039b54 -_080BEB4C: .4byte 0x030022c0 + .pool _080BEB50: movs r0, 0xD bl sub_80BFCDC - ldr r4, _080BEB80 + ldr r4, =0x02039b4c ldr r0, [r4] - ldr r1, _080BEB84 + ldr r1, =0x0000064d adds r0, r1 ldrb r0, [r0] movs r1, 0xD bl sub_80BFD0C ldr r0, [r4] - ldr r2, _080BEB88 + ldr r2, =0x0000064c adds r0, r2 ldrb r0, [r0] lsls r0, 31 lsrs r0, 31 bl sub_80BC844 - ldr r1, _080BEB8C + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _080BED70 .align 2, 0 -_080BEB80: .4byte 0x02039b4c -_080BEB84: .4byte 0x0000064d -_080BEB88: .4byte 0x0000064c -_080BEB8C: .4byte 0x030022c0 + .pool _080BEB90: movs r0, 0x87 lsls r0, 3 adds r1, r5, r0 b _080BED70 _080BEB98: - ldr r4, _080BEBF4 + ldr r4, =0x02039b54 ldr r3, [r4] ldrh r0, [r3] - ldr r1, _080BEBF8 + ldr r1, =0x02039b4c ldr r1, [r1] - ldr r2, _080BEBFC + ldr r2, =0x00000612 adds r1, r2 ldrh r2, [r1] negs r1, r2 @@ -391160,7 +378296,7 @@ _080BEB98: ands r0, r1 cmp r0, 0 bne _080BEBD0 - ldr r0, _080BEC00 + ldr r0, =0x02037716 movs r1, 0x31 movs r2, 0x1E bl gpu_pal_apply @@ -391174,19 +378310,15 @@ _080BEBD0: bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r1, _080BEC04 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _080BED70 .align 2, 0 -_080BEBF4: .4byte 0x02039b54 -_080BEBF8: .4byte 0x02039b4c -_080BEBFC: .4byte 0x00000612 -_080BEC00: .4byte 0x02037716 -_080BEC04: .4byte 0x030022c0 + .pool _080BEC08: - ldr r0, _080BEC50 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -391195,7 +378327,7 @@ _080BEC08: ldrsh r0, [r4, r1] cmp r0, 0 bne _080BEC44 - ldr r0, _080BEC54 + ldr r0, =0x02039b54 ldr r0, [r0] ldrh r0, [r0] movs r1, 0x30 @@ -391203,7 +378335,7 @@ _080BEC08: movs r3, 0 bl sub_80C0E9C strh r0, [r4, 0x10] - ldr r2, _080BEC58 + ldr r2, =0x02020630 movs r3, 0x10 ldrsh r0, [r4, r3] lsls r1, r0, 4 @@ -391216,19 +378348,16 @@ _080BEC08: ands r0, r2 strb r0, [r1, 0x5] _080BEC44: - ldr r1, _080BEC5C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080BED70 .align 2, 0 -_080BEC50: .4byte 0x03005e00 -_080BEC54: .4byte 0x02039b54 -_080BEC58: .4byte 0x02020630 -_080BEC5C: .4byte 0x030022c0 + .pool _080BEC60: movs r3, 0 - ldr r0, _080BECB0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -391243,7 +378372,7 @@ _080BEC76: ldrsh r0, [r1, r2] cmp r0, 0 beq _080BEC98 - ldr r2, _080BECB4 + ldr r2, =0x02020630 movs r0, 0x10 ldrsh r1, [r1, r0] lsls r0, r1, 4 @@ -391263,14 +378392,12 @@ _080BEC98: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _080BECB8 + ldr r0, =0x030060b4 ldr r0, [r0] bl SetVBlankCallback b _080BED68 .align 2, 0 -_080BECB0: .4byte 0x03005e00 -_080BECB4: .4byte 0x02020630 -_080BECB8: .4byte 0x030060b4 + .pool _080BECBC: movs r0, 0x50 movs r1, 0 @@ -391293,15 +378420,15 @@ _080BECBC: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show - ldr r1, _080BED00 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _080BED70 .align 2, 0 -_080BED00: .4byte 0x030022c0 + .pool _080BED04: - ldr r0, _080BED4C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -391313,7 +378440,7 @@ _080BED04: ldrb r0, [r2] adds r3, r0, 0x1 strb r3, [r2] - ldr r1, _080BED50 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -391323,7 +378450,7 @@ _080BED04: cmp r0, 0 bne _080BED58 bl sub_80A369C - ldr r0, _080BED54 + ldr r0, =0x02039b54 ldr r0, [r0] ldrh r0, [r0] bl poke_something_2 @@ -391335,9 +378462,7 @@ _080BED04: bl sub_80A32C0 b _080BEDA0 .align 2, 0 -_080BED4C: .4byte 0x02037fd4 -_080BED50: .4byte 0x03005e00 -_080BED54: .4byte 0x02039b54 + .pool _080BED58: adds r0, r3, 0x1 strb r0, [r2] @@ -391348,7 +378473,7 @@ _080BED5E: cmp r0, 0 bne _080BEDA0 _080BED68: - ldr r1, _080BED78 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -391358,9 +378483,9 @@ _080BED70: strb r0, [r1] b _080BEDA0 .align 2, 0 -_080BED78: .4byte 0x030022c0 + .pool _080BED7C: - ldr r1, _080BEDA8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -391372,7 +378497,7 @@ _080BED7C: movs r1, 0x1 strh r1, [r0, 0xC] strh r1, [r0, 0xE] - ldr r1, _080BEDAC + ldr r1, =sub_80BEDF4 + 1 str r1, [r0] movs r3, 0x87 lsls r3, 3 @@ -391384,8 +378509,7 @@ _080BEDA0: pop {r0} bx r0 .align 2, 0 -_080BEDA8: .4byte 0x03005e00 -_080BEDAC: .4byte sub_80BEDF4 + 1 + .pool thumb_func_end sub_80BEA24 thumb_func_start sub_80BEDB0 @@ -391426,7 +378550,7 @@ sub_80BEDF4: @ 80BEDF4 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r2, _080BEE2C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -391442,16 +378566,15 @@ sub_80BEDF4: @ 80BEDF4 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080BEE30 + ldr r0, =sub_80BF038 + 1 str r0, [r4] movs r0, 0x6C bl audio_play b _080BEFBA .align 2, 0 -_080BEE2C: .4byte 0x03005e00 -_080BEE30: .4byte sub_80BF038 + 1 + .pool _080BEE34: - ldr r1, _080BEE4C + ldr r1, =0x030022c0 ldrh r2, [r1, 0x2E] movs r0, 0x2 ands r0, r2 @@ -391464,15 +378587,15 @@ _080BEE34: str r5, [sp] b _080BEF0E .align 2, 0 -_080BEE4C: .4byte 0x030022c0 + .pool _080BEE50: movs r0, 0x1 ands r0, r2 cmp r0, 0 beq _080BEF28 - ldr r5, _080BEE70 + ldr r5, =0x02039b4c ldr r0, [r5] - ldr r1, _080BEE74 + ldr r1, =0x0000064d adds r0, r1 ldrb r1, [r0] cmp r1, 0x1 @@ -391483,8 +378606,7 @@ _080BEE50: beq _080BEE82 b _080BEFBA .align 2, 0 -_080BEE70: .4byte 0x02039b4c -_080BEE74: .4byte 0x0000064d + .pool _080BEE78: cmp r1, 0x2 beq _080BEEC0 @@ -391500,12 +378622,12 @@ _080BEE82: movs r3, 0x10 bl sub_80A1AD4 ldr r0, [r5] - ldr r3, _080BEE9C + ldr r3, =0x0000064e adds r0, r3 movs r1, 0x1 b _080BEEF0 .align 2, 0 -_080BEE9C: .4byte 0x0000064e + .pool _080BEEA0: movs r0, 0x15 negs r0, r0 @@ -391515,14 +378637,14 @@ _080BEEA0: movs r3, 0x10 bl sub_80A1AD4 ldr r0, [r5] - ldr r1, _080BEEBC + ldr r1, =0x0000064e adds r0, r1 movs r1, 0x2 b _080BEEF0 .align 2, 0 -_080BEEBC: .4byte 0x0000064e + .pool _080BEEC0: - ldr r0, _080BEED4 + ldr r0, =0x02039b54 ldr r0, [r0] ldrb r0, [r0, 0x2] ands r1, r0 @@ -391532,7 +378654,7 @@ _080BEEC0: bl audio_play b _080BEFBA .align 2, 0 -_080BEED4: .4byte 0x02039b54 + .pool _080BEED8: movs r0, 0x15 negs r0, r0 @@ -391542,19 +378664,18 @@ _080BEED8: movs r3, 0x10 bl sub_80A1AD4 ldr r0, [r5] - ldr r3, _080BEF00 + ldr r3, =0x0000064e adds r0, r3 movs r1, 0x3 _080BEEF0: strb r1, [r0] - ldr r0, _080BEF04 + ldr r0, =sub_80BEFD0 + 1 str r0, [r4] movs r0, 0x15 bl audio_play b _080BEFBA .align 2, 0 -_080BEF00: .4byte 0x0000064e -_080BEF04: .4byte sub_80BEFD0 + 1 + .pool _080BEF08: movs r0, 0x1 negs r0, r0 @@ -391564,13 +378685,13 @@ _080BEF0E: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080BEF24 + ldr r0, =sub_80BF070 + 1 str r0, [r4] movs r0, 0x3 bl audio_play b _080BEFBA .align 2, 0 -_080BEF24: .4byte sub_80BF070 + 1 + .pool _080BEF28: movs r0, 0x20 ands r0, r2 @@ -391581,15 +378702,15 @@ _080BEF28: ands r0, r2 cmp r0, 0 beq _080BEF78 - ldr r0, _080BEF6C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 bne _080BEF78 _080BEF44: - ldr r3, _080BEF70 + ldr r3, =0x02039b4c ldr r0, [r3] - ldr r4, _080BEF74 + ldr r4, =0x0000064d adds r2, r0, r4 ldrb r0, [r2] cmp r0, 0 @@ -391605,9 +378726,7 @@ _080BEF44: bl audio_play b _080BEFBA .align 2, 0 -_080BEF6C: .4byte 0x03005d90 -_080BEF70: .4byte 0x02039b4c -_080BEF74: .4byte 0x0000064d + .pool _080BEF78: ldrh r1, [r1, 0x2E] movs r0, 0x10 @@ -391619,15 +378738,15 @@ _080BEF78: ands r0, r1 cmp r0, 0 beq _080BEFBA - ldr r0, _080BEFC4 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 bne _080BEFBA _080BEF96: - ldr r2, _080BEFC8 + ldr r2, =0x02039b4c ldr r0, [r2] - ldr r3, _080BEFCC + ldr r3, =0x0000064d adds r1, r0, r3 ldrb r0, [r1] cmp r0, 0x2 @@ -391647,9 +378766,7 @@ _080BEFBA: pop {r0} bx r0 .align 2, 0 -_080BEFC4: .4byte 0x03005d90 -_080BEFC8: .4byte 0x02039b4c -_080BEFCC: .4byte 0x0000064d + .pool thumb_func_end sub_80BEDF4 thumb_func_start sub_80BEFD0 @@ -391657,22 +378774,22 @@ sub_80BEFD0: @ 80BEFD0 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BF00C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080BF02C - ldr r1, _080BF010 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r4, r0, r1 ldrh r0, [r4, 0x10] bl sub_818D820 - ldr r0, _080BF014 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BF018 + ldr r1, =0x0000064e adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 @@ -391682,21 +378799,17 @@ sub_80BEFD0: @ 80BEFD0 cmp r0, 0x3 beq _080BF028 _080BF008: - ldr r0, _080BF01C + ldr r0, =sub_80BF0AC + 1 b _080BF02A .align 2, 0 -_080BF00C: .4byte 0x02037fd4 -_080BF010: .4byte 0x03005e00 -_080BF014: .4byte 0x02039b4c -_080BF018: .4byte 0x0000064e -_080BF01C: .4byte sub_80BF0AC + 1 + .pool _080BF020: - ldr r0, _080BF024 + ldr r0, =sub_80BF250 + 1 b _080BF02A .align 2, 0 -_080BF024: .4byte sub_80BF250 + 1 + .pool _080BF028: - ldr r0, _080BF034 + ldr r0, =sub_80BF82C + 1 _080BF02A: str r0, [r4] _080BF02C: @@ -391704,7 +378817,7 @@ _080BF02C: pop {r0} bx r0 .align 2, 0 -_080BF034: .4byte sub_80BF82C + 1 + .pool thumb_func_end sub_80BEFD0 thumb_func_start sub_80BF038 @@ -391712,29 +378825,27 @@ sub_80BF038: @ 80BF038 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BF064 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080BF05E - ldr r0, _080BF068 + ldr r0, =0x03005e00 lsls r4, r2, 2 adds r4, r2 lsls r4, 3 adds r4, r0 ldrh r0, [r4, 0x10] bl sub_818D820 - ldr r0, _080BF06C + ldr r0, =sub_80BEA24 + 1 str r0, [r4] _080BF05E: pop {r4} pop {r0} bx r0 .align 2, 0 -_080BF064: .4byte 0x02037fd4 -_080BF068: .4byte 0x03005e00 -_080BF06C: .4byte sub_80BEA24 + 1 + .pool thumb_func_end sub_80BF038 thumb_func_start sub_80BF070 @@ -391742,13 +378853,13 @@ sub_80BF070: @ 80BF070 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BF0A4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080BF09C - ldr r0, _080BF0A8 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -391763,8 +378874,7 @@ _080BF09C: pop {r0} bx r0 .align 2, 0 -_080BF0A4: .4byte 0x02037fd4 -_080BF0A8: .4byte 0x03005e00 + .pool thumb_func_end sub_80BF070 thumb_func_start sub_80BF0AC @@ -391772,7 +378882,7 @@ sub_80BF0AC: @ 80BF0AC push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _080BF108 + ldr r2, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r7, r2, r0 @@ -391784,7 +378894,7 @@ sub_80BF0AC: @ 80BF0AC cmp r0, 0x2 beq _080BF15C _080BF0C8: - ldr r0, _080BF10C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -391792,13 +378902,13 @@ _080BF0C8: lsrs r5, r0, 24 cmp r5, 0 bne _080BF196 - ldr r4, _080BF110 + ldr r4, =0x02039b4c ldr r0, [r4] - ldr r1, _080BF114 + ldr r1, =0x0000064a adds r0, r1 movs r1, 0x5 strb r1, [r0] - ldr r1, _080BF118 + ldr r1, =0x030060b4 ldr r0, [r2, 0xC] str r0, [r1] movs r0, 0 @@ -391807,28 +378917,23 @@ _080BF0C8: lsls r0, 2 bl sub_80C09B0 ldr r0, [r4] - ldr r1, _080BF11C + ldr r1, =0x0000064d adds r0, r1 strb r5, [r0] movs r0, 0x1 strb r0, [r7] b _080BF196 .align 2, 0 -_080BF108: .4byte 0x030022c0 -_080BF10C: .4byte 0x02037fd4 -_080BF110: .4byte 0x02039b4c -_080BF114: .4byte 0x0000064a -_080BF118: .4byte 0x030060b4 -_080BF11C: .4byte 0x0000064d + .pool _080BF120: movs r0, 0xD bl sub_80BFCF4 movs r0, 0 movs r1, 0xD bl sub_80BFD7C - ldr r0, _080BF154 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BF158 + ldr r1, =0x0000064c adds r0, r1 ldrb r0, [r0] lsls r0, 31 @@ -391843,21 +378948,20 @@ _080BF120: strb r0, [r7] b _080BF196 .align 2, 0 -_080BF154: .4byte 0x02039b4c -_080BF158: .4byte 0x0000064c + .pool _080BF15C: - ldr r0, _080BF19C + ldr r0, =0x02039b54 ldr r0, [r0] ldrh r0, [r0] bl poke_something_2 lsls r0, 16 lsrs r0, 16 - ldr r5, _080BF1A0 + ldr r5, =0x02039b4c ldr r1, [r5] - ldr r4, _080BF1A4 + ldr r4, =0x0000064e adds r1, r4 bl sub_813D3D8 - ldr r0, _080BF1A8 + ldr r0, =0x030060b4 ldr r0, [r0] bl SetVBlankCallback ldr r0, [r5] @@ -391865,24 +378969,19 @@ _080BF15C: movs r1, 0 strb r1, [r0] strb r1, [r7] - ldr r1, _080BF1AC + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _080BF1B0 + ldr r1, =sub_80BF1B4 + 1 str r1, [r0] _080BF196: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080BF19C: .4byte 0x02039b54 -_080BF1A0: .4byte 0x02039b4c -_080BF1A4: .4byte 0x0000064e -_080BF1A8: .4byte 0x030060b4 -_080BF1AC: .4byte 0x03005e00 -_080BF1B0: .4byte sub_80BF1B4 + 1 + .pool thumb_func_end sub_80BF0AC thumb_func_start sub_80BF1B4 @@ -391890,28 +378989,25 @@ sub_80BF1B4: @ 80BF1B4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BF1DC + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BF1E0 + ldr r1, =0x0000064e adds r0, r1 ldrb r0, [r0] cmp r0, 0 beq _080BF1D6 - ldr r0, _080BF1E4 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _080BF1E8 + ldr r0, =sub_80BF1EC + 1 str r0, [r1] _080BF1D6: pop {r0} bx r0 .align 2, 0 -_080BF1DC: .4byte 0x02039b4c -_080BF1E0: .4byte 0x0000064e -_080BF1E4: .4byte 0x03005e00 -_080BF1E8: .4byte sub_80BF1EC + 1 + .pool thumb_func_end sub_80BF1B4 thumb_func_start sub_80BF1EC @@ -391919,15 +379015,15 @@ sub_80BF1EC: @ 80BF1EC push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BF220 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080BF242 - ldr r0, _080BF224 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BF228 + ldr r1, =0x0000064e adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -391935,34 +379031,29 @@ sub_80BF1EC: @ 80BF1EC cmp r0, 0x2 beq _080BF234 _080BF210: - ldr r0, _080BF22C + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _080BF230 + ldr r0, =sub_80BEA24 + 1 b _080BF240 .align 2, 0 -_080BF220: .4byte 0x02037fd4 -_080BF224: .4byte 0x02039b4c -_080BF228: .4byte 0x0000064e -_080BF22C: .4byte 0x03005e00 -_080BF230: .4byte sub_80BEA24 + 1 + .pool _080BF234: - ldr r0, _080BF248 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _080BF24C + ldr r0, =sub_80BF250 + 1 _080BF240: str r0, [r1] _080BF242: pop {r0} bx r0 .align 2, 0 -_080BF248: .4byte 0x03005e00 -_080BF24C: .4byte sub_80BF250 + 1 + .pool thumb_func_end sub_80BF1EC thumb_func_start sub_80BF250 @@ -391971,7 +379062,7 @@ sub_80BF250: @ 80BF250 sub sp, 0x14 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080BF274 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -391980,13 +379071,12 @@ sub_80BF250: @ 80BF250 cmp r0, 0xA bhi _080BF2A8 lsls r0, 2 - ldr r1, _080BF278 + ldr r1, =_080BF27C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BF274: .4byte 0x030022c0 -_080BF278: .4byte _080BF27C + .pool .align 2, 0 _080BF27C: .4byte _080BF2A8 @@ -392001,7 +379091,7 @@ _080BF27C: .4byte _080BF540 .4byte _080BF590 _080BF2A8: - ldr r0, _080BF2F4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -392009,16 +379099,16 @@ _080BF2A8: beq _080BF2B6 b _080BF5B2 _080BF2B6: - ldr r0, _080BF2F8 + ldr r0, =0x03007420 bl MPlayStop_rev01 - ldr r5, _080BF2FC + ldr r5, =0x02039b4c ldr r0, [r5] - ldr r3, _080BF300 + ldr r3, =0x0000064a adds r0, r3 movs r1, 0x6 strb r1, [r0] - ldr r1, _080BF304 - ldr r4, _080BF308 + ldr r1, =0x030060b4 + ldr r4, =0x030022c0 ldr r0, [r4, 0xC] str r0, [r1] movs r0, 0 @@ -392027,7 +379117,7 @@ _080BF2B6: lsls r0, 2 bl sub_80C09B0 ldr r0, [r5] - ldr r1, _080BF30C + ldr r1, =0x0000064d adds r0, r1 movs r1, 0x1 strb r1, [r0] @@ -392037,15 +379127,9 @@ _080BF2B6: strb r1, [r4] b _080BF5B2 .align 2, 0 -_080BF2F4: .4byte 0x02037fd4 -_080BF2F8: .4byte 0x03007420 -_080BF2FC: .4byte 0x02039b4c -_080BF300: .4byte 0x0000064a -_080BF304: .4byte 0x030060b4 -_080BF308: .4byte 0x030022c0 -_080BF30C: .4byte 0x0000064d + .pool _080BF310: - ldr r1, _080BF354 + ldr r1, =0x08dc1934 movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -392053,7 +379137,7 @@ _080BF310: movs r0, 0x3 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _080BF358 + ldr r1, =0x08dc3198 movs r0, 0x3 movs r2, 0 movs r3, 0 @@ -392067,24 +379151,22 @@ _080BF310: bl Window_WriteStandardTileMap movs r0, 0x2 bl Window_WriteStandardTileMap - ldr r1, _080BF35C + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _080BF582 .align 2, 0 -_080BF354: .4byte 0x08dc1934 -_080BF358: .4byte 0x08dc3198 -_080BF35C: .4byte 0x030022c0 + .pool _080BF360: movs r0, 0xD bl sub_80BFCF4 movs r0, 0x1 movs r1, 0xD bl sub_80BFD7C - ldr r0, _080BF384 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r4, _080BF388 + ldr r4, =0x0000064c adds r0, r4 ldrb r0, [r0] lsls r0, 31 @@ -392092,54 +379174,51 @@ _080BF360: bl sub_80BC844 b _080BF57A .align 2, 0 -_080BF384: .4byte 0x02039b4c -_080BF388: .4byte 0x0000064c + .pool _080BF38C: bl sub_80A1A74 - ldr r1, _080BF39C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _080BF582 .align 2, 0 -_080BF39C: .4byte 0x030022c0 + .pool _080BF3A0: - ldr r0, _080BF3C4 + ldr r0, =0x085e871b movs r1, 0x52 movs r2, 0x21 bl sub_80BE8DC - ldr r0, _080BF3C8 + ldr r0, =0x02039b54 ldr r0, [r0] ldrh r1, [r0] movs r0, 0 movs r2, 0x52 movs r3, 0x31 bl sub_80C0B44 - ldr r1, _080BF3CC + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _080BF582 .align 2, 0 -_080BF3C4: .4byte 0x085e871b -_080BF3C8: .4byte 0x02039b54 -_080BF3CC: .4byte 0x030022c0 + .pool _080BF3D0: - ldr r0, _080BF40C + ldr r0, =0x02039b54 ldr r0, [r0] ldrh r0, [r0] movs r1, 0x30 movs r2, 0x38 movs r3, 0 bl sub_80C0E9C - ldr r2, _080BF410 + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r2 movs r3, 0 strh r0, [r1, 0x10] - ldr r2, _080BF414 + ldr r2, =0x02020630 movs r4, 0x10 ldrsh r0, [r1, r4] lsls r1, r0, 4 @@ -392151,38 +379230,35 @@ _080BF3D0: negs r0, r0 ands r0, r2 strb r0, [r1, 0x5] - ldr r0, _080BF418 + ldr r0, =0x030061ec strb r3, [r0] b _080BF57A .align 2, 0 -_080BF40C: .4byte 0x02039b54 -_080BF410: .4byte 0x03005e00 -_080BF414: .4byte 0x02020630 -_080BF418: .4byte 0x030061ec + .pool _080BF41C: - ldr r1, _080BF478 + ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 - ldr r1, _080BF47C + ldr r1, =0x00004020 orrs r0, r1 - ldr r1, _080BF480 + ldr r1, =0xff00ffff ands r0, r1 movs r1, 0xF8 lsls r1, 13 orrs r0, r1 - ldr r1, _080BF484 + ldr r1, =0x00ffffff ands r0, r1 movs r1, 0x80 lsls r1, 20 orrs r0, r1 str r0, [sp, 0x4] - ldr r1, _080BF488 + ldr r1, =0xffff00ff ldr r0, [sp, 0x8] ands r0, r1 movs r1, 0xF0 lsls r1, 5 orrs r0, r1 - ldr r1, _080BF48C + ldr r1, =0xffffff00 ands r0, r1 movs r1, 0xC orrs r0, r1 @@ -392195,7 +379271,7 @@ _080BF41C: bne _080BF462 b _080BF5B2 _080BF462: - ldr r1, _080BF490 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -392203,33 +379279,26 @@ _080BF462: adds r0, 0x1 movs r2, 0 strb r0, [r1] - ldr r0, _080BF494 + ldr r0, =0x030061ec strb r2, [r0] b _080BF5B2 .align 2, 0 -_080BF478: .4byte 0xffff0000 -_080BF47C: .4byte 0x00004020 -_080BF480: .4byte 0xff00ffff -_080BF484: .4byte 0x00ffffff -_080BF488: .4byte 0xffff00ff -_080BF48C: .4byte 0xffffff00 -_080BF490: .4byte 0x030022c0 -_080BF494: .4byte 0x030061ec + .pool _080BF498: - ldr r1, _080BF504 + ldr r1, =0x00ffffff ldr r0, [sp, 0xC] ands r0, r1 movs r1, 0x90 lsls r1, 20 orrs r0, r1 str r0, [sp, 0xC] - ldr r2, _080BF508 + ldr r2, =0xffffff00 add r0, sp, 0xC ldr r1, [r0, 0x4] ands r1, r2 movs r2, 0x12 orrs r1, r2 - ldr r2, _080BF50C + ldr r2, =0xffff00ff ands r1, r2 movs r2, 0xC0 lsls r2, 2 @@ -392240,7 +379309,7 @@ _080BF498: lsls r0, 24 cmp r0, 0 beq _080BF4D8 - ldr r1, _080BF510 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -392264,10 +379333,7 @@ _080BF4D8: bl gpu_copy_wram_bg_tilemap_to_vram b _080BF5B2 .align 2, 0 -_080BF504: .4byte 0x00ffffff -_080BF508: .4byte 0xffffff00 -_080BF50C: .4byte 0xffff00ff -_080BF510: .4byte 0x030022c0 + .pool _080BF514: movs r0, 0x15 negs r0, r0 @@ -392276,17 +379342,16 @@ _080BF514: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _080BF538 + ldr r0, =0x030060b4 ldr r0, [r0] bl SetVBlankCallback - ldr r1, _080BF53C + ldr r1, =0x030022c0 movs r4, 0x87 lsls r4, 3 adds r1, r4 b _080BF582 .align 2, 0 -_080BF538: .4byte 0x030060b4 -_080BF53C: .4byte 0x030022c0 + .pool _080BF540: movs r0, 0x50 movs r1, 0 @@ -392310,7 +379375,7 @@ _080BF540: movs r0, 0x3 bl gpu_sync_bg_show _080BF57A: - ldr r1, _080BF58C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -392320,11 +379385,11 @@ _080BF582: strb r0, [r1] b _080BF5B2 .align 2, 0 -_080BF58C: .4byte 0x030022c0 + .pool _080BF590: - ldr r0, _080BF5BC + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BF5C0 + ldr r1, =0x0000064e adds r0, r1 movs r1, 0 strb r1, [r0] @@ -392332,12 +379397,12 @@ _080BF590: lsls r3, 3 adds r0, r2, r3 strb r1, [r0] - ldr r1, _080BF5C4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080BF5C8 + ldr r1, =sub_80BF5CC + 1 str r1, [r0] _080BF5B2: add sp, 0x14 @@ -392345,10 +379410,7 @@ _080BF5B2: pop {r0} bx r0 .align 2, 0 -_080BF5BC: .4byte 0x02039b4c -_080BF5C0: .4byte 0x0000064e -_080BF5C4: .4byte 0x03005e00 -_080BF5C8: .4byte sub_80BF5CC + 1 + .pool thumb_func_end sub_80BF250 thumb_func_start sub_80BF5CC @@ -392370,7 +379432,7 @@ _080BF5EC: movs r0, 0 bl sub_80BF7FC _080BF5F2: - ldr r1, _080BF61C + ldr r1, =0x030022c0 ldrh r2, [r1, 0x2E] movs r0, 0x1 ands r0, r2 @@ -392379,7 +379441,7 @@ _080BF5F2: beq _080BF624 movs r0, 0x1 bl sub_80BF7FC - ldr r0, _080BF620 + ldr r0, =0x02039b54 ldr r0, [r0] ldrh r0, [r0] bl poke_something_2 @@ -392388,10 +379450,9 @@ _080BF5F2: bl sub_8145534 b _080BF772 .align 2, 0 -_080BF61C: .4byte 0x030022c0 -_080BF620: .4byte 0x02039b54 + .pool _080BF624: - ldr r0, _080BF67C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -392414,31 +379475,26 @@ _080BF636: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080BF680 + ldr r0, =0x03007420 bl m4aMPlayContinue - ldr r0, _080BF684 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BF688 + ldr r1, =0x0000064e adds r0, r1 movs r1, 0x1 strb r1, [r0] - ldr r1, _080BF68C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080BF690 + ldr r1, =sub_80BF790 + 1 str r1, [r0] movs r0, 0x3 bl audio_play b _080BF772 .align 2, 0 -_080BF67C: .4byte 0x02037fd4 -_080BF680: .4byte 0x03007420 -_080BF684: .4byte 0x02039b4c -_080BF688: .4byte 0x0000064e -_080BF68C: .4byte 0x03005e00 -_080BF690: .4byte sub_80BF790 + 1 + .pool _080BF694: movs r0, 0x20 ands r0, r2 @@ -392449,7 +379505,7 @@ _080BF694: ands r0, r2 cmp r0, 0 beq _080BF700 - ldr r0, _080BF6E8 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 @@ -392462,31 +379518,26 @@ _080BF6B0: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080BF6EC + ldr r0, =0x03007420 bl m4aMPlayContinue - ldr r0, _080BF6F0 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BF6F4 + ldr r1, =0x0000064e adds r0, r1 movs r1, 0x2 strb r1, [r0] - ldr r1, _080BF6F8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080BF6FC + ldr r1, =sub_80BF790 + 1 str r1, [r0] movs r0, 0x6D bl audio_play b _080BF772 .align 2, 0 -_080BF6E8: .4byte 0x03005d90 -_080BF6EC: .4byte 0x03007420 -_080BF6F0: .4byte 0x02039b4c -_080BF6F4: .4byte 0x0000064e -_080BF6F8: .4byte 0x03005e00 -_080BF6FC: .4byte sub_80BF790 + 1 + .pool _080BF700: ldrh r1, [r5, 0x2E] movs r0, 0x10 @@ -392498,13 +379549,13 @@ _080BF700: ands r0, r1 cmp r0, 0 beq _080BF772 - ldr r0, _080BF734 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 bne _080BF772 _080BF71E: - ldr r0, _080BF738 + ldr r0, =0x02039b54 ldr r0, [r0] ldrb r1, [r0, 0x2] movs r0, 0x2 @@ -392515,8 +379566,7 @@ _080BF71E: bl audio_play b _080BF772 .align 2, 0 -_080BF734: .4byte 0x03005d90 -_080BF738: .4byte 0x02039b54 + .pool _080BF73C: movs r0, 0x15 negs r0, r0 @@ -392525,20 +379575,20 @@ _080BF73C: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080BF77C + ldr r0, =0x03007420 bl m4aMPlayContinue - ldr r0, _080BF780 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BF784 + ldr r1, =0x0000064e adds r0, r1 movs r1, 0x3 strb r1, [r0] - ldr r1, _080BF788 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080BF78C + ldr r1, =sub_80BF790 + 1 str r1, [r0] movs r0, 0x6D bl audio_play @@ -392548,11 +379598,7 @@ _080BF772: pop {r0} bx r0 .align 2, 0 -_080BF77C: .4byte 0x03007420 -_080BF780: .4byte 0x02039b4c -_080BF784: .4byte 0x0000064e -_080BF788: .4byte 0x03005e00 -_080BF78C: .4byte sub_80BF790 + 1 + .pool thumb_func_end sub_80BF5CC thumb_func_start sub_80BF790 @@ -392560,23 +379606,23 @@ sub_80BF790: @ 80BF790 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080BF7D0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080BF7F0 bl sub_8145914 - ldr r1, _080BF7D4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r4, r0, r1 ldrh r0, [r4, 0x10] bl sub_818D820 - ldr r0, _080BF7D8 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BF7DC + ldr r1, =0x0000064e adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 @@ -392586,21 +379632,17 @@ sub_80BF790: @ 80BF790 cmp r0, 0x3 beq _080BF7EC _080BF7CC: - ldr r0, _080BF7E0 + ldr r0, =sub_80BEA24 + 1 b _080BF7EE .align 2, 0 -_080BF7D0: .4byte 0x02037fd4 -_080BF7D4: .4byte 0x03005e00 -_080BF7D8: .4byte 0x02039b4c -_080BF7DC: .4byte 0x0000064e -_080BF7E0: .4byte sub_80BEA24 + 1 + .pool _080BF7E4: - ldr r0, _080BF7E8 + ldr r0, =sub_80BF0AC + 1 b _080BF7EE .align 2, 0 -_080BF7E8: .4byte sub_80BF0AC + 1 + .pool _080BF7EC: - ldr r0, _080BF7F8 + ldr r0, =sub_80BF82C + 1 _080BF7EE: str r0, [r4] _080BF7F0: @@ -392608,7 +379650,7 @@ _080BF7F0: pop {r0} bx r0 .align 2, 0 -_080BF7F8: .4byte sub_80BF82C + 1 + .pool thumb_func_end sub_80BF790 thumb_func_start sub_80BF7FC @@ -392618,12 +379660,12 @@ sub_80BF7FC: @ 80BF7FC lsls r0, 24 cmp r0, 0 beq _080BF810 - ldr r1, _080BF80C + ldr r1, =0x00000392 b _080BF812 .align 2, 0 -_080BF80C: .4byte 0x00000392 + .pool _080BF810: - ldr r1, _080BF828 + ldr r1, =0x000002af _080BF812: mov r0, sp strh r1, [r0] @@ -392635,7 +379677,7 @@ _080BF812: pop {r0} bx r0 .align 2, 0 -_080BF828: .4byte 0x000002af + .pool thumb_func_end sub_80BF7FC thumb_func_start sub_80BF82C @@ -392644,7 +379686,7 @@ sub_80BF82C: @ 80BF82C sub sp, 0x44 lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080BF850 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -392653,13 +379695,12 @@ sub_80BF82C: @ 80BF82C cmp r0, 0x9 bhi _080BF880 lsls r0, 2 - ldr r1, _080BF854 + ldr r1, =_080BF858 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BF850: .4byte 0x030022c0 -_080BF854: .4byte _080BF858 + .pool .align 2, 0 _080BF858: .4byte _080BF880 @@ -392673,7 +379714,7 @@ _080BF858: .4byte _080BFB14 .4byte _080BFB64 _080BF880: - ldr r0, _080BF8C4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -392681,13 +379722,13 @@ _080BF880: beq _080BF88E b _080BFB94 _080BF88E: - ldr r4, _080BF8C8 + ldr r4, =0x02039b4c ldr r0, [r4] - ldr r1, _080BF8CC + ldr r1, =0x0000064a adds r0, r1 movs r1, 0x7 strb r1, [r0] - ldr r1, _080BF8D0 + ldr r1, =0x030060b4 ldr r0, [r5, 0xC] str r0, [r1] movs r0, 0 @@ -392696,7 +379737,7 @@ _080BF88E: lsls r0, 2 bl sub_80C09B0 ldr r0, [r4] - ldr r2, _080BF8D4 + ldr r2, =0x0000064d adds r0, r2 movs r1, 0x2 strb r1, [r0] @@ -392707,13 +379748,9 @@ _080BF88E: strb r0, [r1] b _080BFB94 .align 2, 0 -_080BF8C4: .4byte 0x02037fd4 -_080BF8C8: .4byte 0x02039b4c -_080BF8CC: .4byte 0x0000064a -_080BF8D0: .4byte 0x030060b4 -_080BF8D4: .4byte 0x0000064d + .pool _080BF8D8: - ldr r1, _080BF908 + ldr r1, =0x08dc1934 movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -392721,7 +379758,7 @@ _080BF8D8: movs r0, 0x3 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _080BF90C + ldr r1, =0x08dc2e6c movs r0, 0x3 movs r2, 0 movs r3, 0 @@ -392733,17 +379770,16 @@ _080BF8D8: bl Window_WriteStandardTileMap b _080BFB4E .align 2, 0 -_080BF908: .4byte 0x08dc1934 -_080BF90C: .4byte 0x08dc2e6c + .pool _080BF910: movs r0, 0xD bl sub_80BFCF4 movs r0, 0x2 movs r1, 0xD bl sub_80BFD7C - ldr r0, _080BF934 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BF938 + ldr r1, =0x0000064c adds r0, r1 ldrb r0, [r0] lsls r0, 31 @@ -392751,13 +379787,12 @@ _080BF910: bl sub_80BC844 b _080BFB4E .align 2, 0 -_080BF934: .4byte 0x02039b4c -_080BF938: .4byte 0x0000064c + .pool _080BF93C: - ldr r1, _080BF970 + ldr r1, =0x085e8723 add r0, sp, 0x4 bl gf_strcpy - ldr r0, _080BF974 + ldr r0, =0x03005d90 ldr r1, [r0] add r0, sp, 0x4 bl gf_strcat @@ -392771,20 +379806,18 @@ _080BF93C: add r0, sp, 0x4 movs r2, 0x79 bl sub_80BE8DC - ldr r1, _080BF978 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080BFB56 .align 2, 0 -_080BF970: .4byte 0x085e8723 -_080BF974: .4byte 0x03005d90 -_080BF978: .4byte 0x030022c0 + .pool _080BF97C: bl sub_80A1A74 b _080BFB4E _080BF982: - ldr r0, _080BFA18 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] bl sub_806F000 @@ -392796,7 +379829,7 @@ _080BF982: bl sub_80C0EF8 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080BFA1C + ldr r0, =0x02020630 lsls r4, r6, 4 adds r4, r6 lsls r4, 2 @@ -392820,8 +379853,8 @@ _080BF982: negs r0, r0 ands r0, r1 strb r0, [r4, 0x5] - ldr r2, _080BFA20 - ldr r0, _080BFA24 + ldr r2, =0x0856b5b0 + ldr r0, =0x02039b54 ldr r1, [r0] ldrh r0, [r1] lsls r0, 5 @@ -392837,34 +379870,28 @@ _080BF982: movs r2, 0 movs r3, 0 bl rotscale_set_direct - ldr r0, _080BFA28 + ldr r0, =0x0856e610 ldrb r1, [r4, 0x5] lsrs r1, 4 adds r1, 0x10 lsls r1, 4 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _080BFA2C + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 strh r6, [r0, 0x12] - ldr r1, _080BFA30 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080BFB56 .align 2, 0 -_080BFA18: .4byte 0x03005d90 -_080BFA1C: .4byte 0x02020630 -_080BFA20: .4byte 0x0856b5b0 -_080BFA24: .4byte 0x02039b54 -_080BFA28: .4byte 0x0856e610 -_080BFA2C: .4byte 0x03005e00 -_080BFA30: .4byte 0x030022c0 + .pool _080BFA34: - ldr r5, _080BFAD4 + ldr r5, =0x02039b54 ldr r0, [r5] ldrh r0, [r0] movs r1, 0x58 @@ -392873,7 +379900,7 @@ _080BFA34: bl sub_80C0E9C lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080BFAD8 + ldr r0, =0x02020630 lsls r4, r6, 4 adds r4, r6 lsls r4, 2 @@ -392897,7 +379924,7 @@ _080BFA34: negs r0, r0 ands r0, r1 strb r0, [r4, 0x5] - ldr r2, _080BFADC + ldr r2, =0x0856b5b0 ldr r1, [r5] ldrh r0, [r1] lsls r0, 5 @@ -392913,14 +379940,14 @@ _080BFA34: movs r2, 0 movs r3, 0 bl rotscale_set_direct - ldr r0, _080BFAE0 + ldr r0, =0x0856e610 ldrb r1, [r4, 0x5] lsrs r1, 4 adds r1, 0x10 lsls r1, 4 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _080BFAE4 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -392937,11 +379964,7 @@ _080BFA34: bl gpu_copy_wram_bg_tilemap_to_vram b _080BFB4E .align 2, 0 -_080BFAD4: .4byte 0x02039b54 -_080BFAD8: .4byte 0x02020630 -_080BFADC: .4byte 0x0856b5b0 -_080BFAE0: .4byte 0x0856e610 -_080BFAE4: .4byte 0x03005e00 + .pool _080BFAE8: movs r0, 0x15 negs r0, r0 @@ -392950,17 +379973,16 @@ _080BFAE8: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _080BFB0C + ldr r0, =0x030060b4 ldr r0, [r0] bl SetVBlankCallback - ldr r1, _080BFB10 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080BFB56 .align 2, 0 -_080BFB0C: .4byte 0x030060b4 -_080BFB10: .4byte 0x030022c0 + .pool _080BFB14: movs r0, 0x50 movs r1, 0 @@ -392984,7 +380006,7 @@ _080BFB14: movs r0, 0x3 bl gpu_sync_bg_show _080BFB4E: - ldr r1, _080BFB60 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -392994,9 +380016,9 @@ _080BFB56: strb r0, [r1] b _080BFB94 .align 2, 0 -_080BFB60: .4byte 0x030022c0 + .pool _080BFB64: - ldr r0, _080BFB9C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -393004,21 +380026,21 @@ _080BFB64: lsrs r2, r0, 24 cmp r2, 0 bne _080BFB94 - ldr r0, _080BFBA0 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BFBA4 + ldr r1, =0x0000064e adds r0, r1 strb r2, [r0] movs r1, 0x87 lsls r1, 3 adds r0, r5, r1 strb r2, [r0] - ldr r1, _080BFBA8 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _080BFBAC + ldr r1, =sub_80BFBB0 + 1 str r1, [r0] _080BFB94: add sp, 0x44 @@ -393026,11 +380048,7 @@ _080BFB94: pop {r0} bx r0 .align 2, 0 -_080BFB9C: .4byte 0x02037fd4 -_080BFBA0: .4byte 0x02039b4c -_080BFBA4: .4byte 0x0000064e -_080BFBA8: .4byte 0x03005e00 -_080BFBAC: .4byte sub_80BFBB0 + 1 + .pool thumb_func_end sub_80BF82C thumb_func_start sub_80BFBB0 @@ -393040,7 +380058,7 @@ sub_80BFBB0: @ 80BFBB0 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, _080BFBFC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -393055,28 +380073,24 @@ sub_80BFBB0: @ 80BFBB0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080BFC00 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BFC04 + ldr r1, =0x0000064e adds r0, r1 movs r1, 0x1 strb r1, [r0] - ldr r1, _080BFC08 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080BFC0C + ldr r1, =sub_80BFC78 + 1 str r1, [r0] movs r0, 0x3 bl audio_play b _080BFC5C .align 2, 0 -_080BFBFC: .4byte 0x030022c0 -_080BFC00: .4byte 0x02039b4c -_080BFC04: .4byte 0x0000064e -_080BFC08: .4byte 0x03005e00 -_080BFC0C: .4byte sub_80BFC78 + 1 + .pool _080BFC10: movs r0, 0x20 ands r0, r1 @@ -393087,7 +380101,7 @@ _080BFC10: ands r0, r1 cmp r0, 0 beq _080BFC5C - ldr r0, _080BFC64 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 @@ -393100,18 +380114,18 @@ _080BFC2C: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080BFC68 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BFC6C + ldr r1, =0x0000064e adds r0, r1 movs r1, 0x2 strb r1, [r0] - ldr r1, _080BFC70 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _080BFC74 + ldr r1, =sub_80BFC78 + 1 str r1, [r0] movs r0, 0x6D bl audio_play @@ -393121,11 +380135,7 @@ _080BFC5C: pop {r0} bx r0 .align 2, 0 -_080BFC64: .4byte 0x03005d90 -_080BFC68: .4byte 0x02039b4c -_080BFC6C: .4byte 0x0000064e -_080BFC70: .4byte 0x03005e00 -_080BFC74: .4byte sub_80BFC78 + 1 + .pool thumb_func_end sub_80BFBB0 thumb_func_start sub_80BFC78 @@ -393133,13 +380143,13 @@ sub_80BFC78: @ 80BFC78 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080BFCB8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080BFCD0 - ldr r1, _080BFCBC + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -393148,9 +380158,9 @@ sub_80BFC78: @ 80BFC78 bl sub_818D820 ldrh r0, [r4, 0x12] bl sub_818D8F0 - ldr r0, _080BFCC0 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080BFCC4 + ldr r1, =0x0000064e adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -393158,16 +380168,12 @@ sub_80BFC78: @ 80BFC78 cmp r0, 0x2 beq _080BFCCC _080BFCB2: - ldr r0, _080BFCC8 + ldr r0, =sub_80BEA24 + 1 b _080BFCCE .align 2, 0 -_080BFCB8: .4byte 0x02037fd4 -_080BFCBC: .4byte 0x03005e00 -_080BFCC0: .4byte 0x02039b4c -_080BFCC4: .4byte 0x0000064e -_080BFCC8: .4byte sub_80BEA24 + 1 + .pool _080BFCCC: - ldr r0, _080BFCD8 + ldr r0, =sub_80BF250 + 1 _080BFCCE: str r0, [r4] _080BFCD0: @@ -393175,13 +380181,13 @@ _080BFCD0: pop {r0} bx r0 .align 2, 0 -_080BFCD8: .4byte sub_80BF250 + 1 + .pool thumb_func_end sub_80BFC78 thumb_func_start sub_80BFCDC sub_80BFCDC: @ 80BFCDC push {lr} - ldr r1, _080BFCF0 + ldr r1, =0x08dc2f5c movs r0, 0x1 movs r2, 0 movs r3, 0 @@ -393189,13 +380195,13 @@ sub_80BFCDC: @ 80BFCDC pop {r0} bx r0 .align 2, 0 -_080BFCF0: .4byte 0x08dc2f5c + .pool thumb_func_end sub_80BFCDC thumb_func_start sub_80BFCF4 sub_80BFCF4: @ 80BFCF4 push {lr} - ldr r1, _080BFD08 + ldr r1, =0x08dc2fec movs r0, 0x1 movs r2, 0 movs r3, 0 @@ -393203,7 +380209,7 @@ sub_80BFCF4: @ 80BFCF4 pop {r0} bx r0 .align 2, 0 -_080BFD08: .4byte 0x08dc2fec + .pool thumb_func_end sub_80BFCF4 thumb_func_start sub_80BFD0C @@ -393233,7 +380239,7 @@ _080BFD22: _080BFD38: movs r2, 0 adds r6, r1, 0x1 - ldr r4, _080BFD78 + ldr r4, =0x00000fff _080BFD3E: adds r1, r5, r2 lsls r1, 1 @@ -393264,7 +380270,7 @@ _080BFD3E: pop {r0} bx r0 .align 2, 0 -_080BFD78: .4byte 0x00000fff + .pool thumb_func_end sub_80BFD0C thumb_func_start sub_80BFD7C @@ -393299,7 +380305,7 @@ _080BFDAA: _080BFDAE: movs r2, 0 adds r5, r1, 0x1 - ldr r4, _080BFDF0 + ldr r4, =0x00000fff _080BFDB4: adds r1, r6, r2 lsls r1, 1 @@ -393330,7 +380336,7 @@ _080BFDB4: pop {r0} bx r0 .align 2, 0 -_080BFDF0: .4byte 0x00000fff + .pool thumb_func_end sub_80BFD7C thumb_func_start sub_80BFDF4 @@ -393341,12 +380347,12 @@ sub_80BFDF4: @ 80BFDF4 adds r6, r2, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _080BFE30 + ldr r0, =sub_80BFE38 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080BFE34 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -393364,8 +380370,7 @@ sub_80BFDF4: @ 80BFDF4 pop {r1} bx r1 .align 2, 0 -_080BFE30: .4byte sub_80BFE38 + 1 -_080BFE34: .4byte 0x03005e00 + .pool thumb_func_end sub_80BFDF4 thumb_func_start sub_80BFE38 @@ -393374,7 +380379,7 @@ sub_80BFE38: @ 80BFE38 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080BFE60 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -393386,13 +380391,12 @@ sub_80BFE38: @ 80BFE38 cmp r0, 0x6 bhi _080BFE84 lsls r0, 2 - ldr r1, _080BFE64 + ldr r1, =_080BFE68 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BFE60: .4byte 0x03005e00 -_080BFE64: .4byte _080BFE68 + .pool .align 2, 0 _080BFE68: .4byte _080BFE84 @@ -393403,7 +380407,7 @@ _080BFE68: .4byte _080C0000 .4byte _080C0044 _080BFE84: - ldr r0, _080BFEF4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -393411,8 +380415,8 @@ _080BFE84: beq _080BFE92 b _080C0074 _080BFE92: - ldr r1, _080BFEF8 - ldr r0, _080BFEFC + ldr r1, =0x030060b4 + ldr r0, =0x030022c0 ldr r0, [r0, 0xC] str r0, [r1] movs r0, 0 @@ -393422,7 +380426,7 @@ _080BFE92: bl sub_80C09B0 movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080BFF00 + ldr r1, =0x0856e668 movs r0, 0 movs r2, 0x2 bl bg_vram_setup @@ -393438,10 +380442,10 @@ _080BFE92: adds r1, r0, 0 movs r0, 0x2 bl bg_set_tilemap - ldr r0, _080BFF04 + ldr r0, =0x0856e670 bl Window_InitFromTemplates bl TextBox_ResetSomeField - ldr r1, _080BFF08 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -393450,14 +380454,9 @@ _080BFE92: strh r1, [r0, 0x8] b _080C0074 .align 2, 0 -_080BFEF4: .4byte 0x02037fd4 -_080BFEF8: .4byte 0x030060b4 -_080BFEFC: .4byte 0x030022c0 -_080BFF00: .4byte 0x0856e668 -_080BFF04: .4byte 0x0856e670 -_080BFF08: .4byte 0x03005e00 + .pool _080BFF0C: - ldr r1, _080BFF6C + ldr r1, =0x08dc1934 movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -393465,7 +380464,7 @@ _080BFF0C: movs r0, 0x3 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _080BFF70 + ldr r1, =0x08dc3080 movs r0, 0x3 movs r2, 0 movs r3, 0 @@ -393477,7 +380476,7 @@ _080BFF0C: bl Window_WriteStandardTileMap movs r0, 0x1 bl Window_WriteStandardTileMap - ldr r0, _080BFF74 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -393496,9 +380495,7 @@ _080BFF0C: strh r0, [r4, 0x8] b _080C0074 .align 2, 0 -_080BFF6C: .4byte 0x08dc1934 -_080BFF70: .4byte 0x08dc3080 -_080BFF74: .4byte 0x03005e00 + .pool _080BFF78: lsls r0, r5, 2 adds r0, r5 @@ -393529,7 +380526,7 @@ _080BFFA8: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080BFFF4 + ldr r0, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -393546,10 +380543,10 @@ _080BFFA8: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _080BFFF8 + ldr r0, =0x030060b4 ldr r0, [r0] bl SetVBlankCallback - ldr r1, _080BFFFC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -393557,9 +380554,7 @@ _080BFFA8: strh r4, [r0, 0xE] b _080C0038 .align 2, 0 -_080BFFF4: .4byte 0x02020630 -_080BFFF8: .4byte 0x030060b4 -_080BFFFC: .4byte 0x03005e00 + .pool _080C0000: movs r0, 0x50 movs r1, 0 @@ -393579,7 +380574,7 @@ _080C0000: movs r0, 0x3 bl gpu_sync_bg_show _080C002E: - ldr r1, _080C0040 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -393590,9 +380585,9 @@ _080C0038: strh r1, [r0, 0x8] b _080C0074 .align 2, 0 -_080C0040: .4byte 0x03005e00 + .pool _080C0044: - ldr r0, _080C007C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -393606,13 +380601,13 @@ _080C0044: lsrs r0, 16 movs r1, 0 bl cry_related - ldr r1, _080C0080 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 strh r6, [r0, 0xC] - ldr r1, _080C0084 + ldr r1, =sub_80C0088 + 1 str r1, [r0] _080C0074: add sp, 0x4 @@ -393620,9 +380615,7 @@ _080C0074: pop {r0} bx r0 .align 2, 0 -_080C007C: .4byte 0x02037fd4 -_080C0080: .4byte 0x03005e00 -_080C0084: .4byte sub_80C0088 + 1 + .pool thumb_func_end sub_80BFE38 thumb_func_start sub_80C0088 @@ -393631,20 +380624,20 @@ sub_80C0088: @ 80C0088 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080C00D0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 beq _080C00E8 - ldr r0, _080C00D4 + ldr r0, =0x0000ffff movs r1, 0 str r1, [sp] movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r3, _080C00D8 - ldr r0, _080C00DC + ldr r3, =0x02020630 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -393656,20 +380649,15 @@ sub_80C0088: @ 80C0088 lsls r0, 2 adds r3, 0x1C adds r0, r3 - ldr r2, _080C00E0 + ldr r2, =sub_80C01CC + 1 str r2, [r0] - ldr r0, _080C00E4 + ldr r0, =blockset_load_palette_to_gpu + 1 str r0, [r1] b _080C011E .align 2, 0 -_080C00D0: .4byte 0x030022c0 -_080C00D4: .4byte 0x0000ffff -_080C00D8: .4byte 0x02020630 -_080C00DC: .4byte 0x03005e00 -_080C00E0: .4byte sub_80C01CC + 1 -_080C00E4: .4byte blockset_load_palette_to_gpu + 1 + .pool _080C00E8: - ldr r1, _080C010C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -393681,16 +380669,15 @@ _080C00E8: ands r1, r0 cmp r1, 0 beq _080C0114 - ldr r0, _080C0110 + ldr r0, =0x08dc16f6 movs r1, 0x31 movs r2, 0xE bl gpu_pal_apply b _080C011E .align 2, 0 -_080C010C: .4byte 0x03005e00 -_080C0110: .4byte 0x08dc16f6 + .pool _080C0114: - ldr r0, _080C0128 + ldr r0, =0x08dc1756 movs r1, 0x31 movs r2, 0xE bl gpu_pal_apply @@ -393700,7 +380687,7 @@ _080C011E: pop {r0} bx r0 .align 2, 0 -_080C0128: .4byte 0x08dc1756 + .pool thumb_func_end sub_80C0088 thumb_func_start blockset_load_palette_to_gpu @@ -393708,7 +380695,7 @@ blockset_load_palette_to_gpu: @ 80C012C push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080C01C0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -393731,7 +380718,7 @@ _080C015A: beq _080C0168 bl free _080C0168: - ldr r0, _080C01C4 + ldr r0, =0x03005e00 lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -393748,7 +380735,7 @@ _080C0168: lsls r2, 16 ldrh r3, [r4, 0x24] orrs r2, r3 - ldr r5, _080C01C8 + ldr r5, =0x02020630 movs r3, 0xE ldrsh r4, [r4, r3] lsls r3, r4, 4 @@ -393773,9 +380760,7 @@ _080C01BA: pop {r0} bx r0 .align 2, 0 -_080C01C0: .4byte 0x02037fd4 -_080C01C4: .4byte 0x03005e00 -_080C01C8: .4byte 0x02020630 + .pool thumb_func_end blockset_load_palette_to_gpu thumb_func_start sub_80C01CC @@ -393827,7 +380812,7 @@ sub_80C020C: @ 80C020C adds r7, r2, 0 cmp r3, 0 beq _080C0234 - ldr r4, _080C0248 + ldr r4, =0x085e8735 movs r0, 0x1 adds r1, r4, 0 movs r2, 0xF0 @@ -393848,12 +380833,12 @@ _080C0234: lsrs r5, r0, 16 b _080C0250 .align 2, 0 -_080C0248: .4byte 0x085e8735 + .pool _080C024C: adds r5, r6, 0 lsls r4, r6, 16 _080C0250: - ldr r1, _080C0284 + ldr r1, =0x085e8d4f mov r0, sp bl gf_strcpy adds r1, r5, 0 @@ -393872,14 +380857,13 @@ _080C0250: beq _080C028C movs r0, 0xB muls r1, r0 - ldr r0, _080C0288 + ldr r0, =0x083185c8 adds r0, r1, r0 b _080C028E .align 2, 0 -_080C0284: .4byte 0x085e8d4f -_080C0288: .4byte 0x083185c8 + .pool _080C028C: - ldr r0, _080C02A8 + ldr r0, =0x0856e688 _080C028E: movs r1, 0x84 movs r2, 0x19 @@ -393893,24 +380877,24 @@ _080C028E: adds r0, r4, 0 b _080C02AE .align 2, 0 -_080C02A8: .4byte 0x0856e688 + .pool _080C02AC: - ldr r0, _080C02EC + ldr r0, =0x085e86b8 _080C02AE: movs r1, 0x64 movs r2, 0x29 bl sub_80BE8DC - ldr r0, _080C02F0 + ldr r0, =0x085e8755 movs r1, 0x60 movs r2, 0x39 bl sub_80BE8DC - ldr r0, _080C02F4 + ldr r0, =0x085e8758 movs r1, 0x60 movs r2, 0x49 bl sub_80BE8DC cmp r7, 0 beq _080C02FC - ldr r0, _080C02F8 + ldr r0, =0x0856b5b0 lsls r4, r6, 5 adds r4, r0 ldrh r0, [r4, 0xC] @@ -393923,34 +380907,29 @@ _080C02AE: bl sub_80C0460 b _080C0310 .align 2, 0 -_080C02EC: .4byte 0x085e86b8 -_080C02F0: .4byte 0x085e8755 -_080C02F4: .4byte 0x085e8758 -_080C02F8: .4byte 0x0856b5b0 + .pool _080C02FC: - ldr r0, _080C0320 + ldr r0, =0x085e86c6 movs r1, 0x81 movs r2, 0x39 bl sub_80BE8DC - ldr r0, _080C0324 + ldr r0, =0x085e86d0 movs r1, 0x81 movs r2, 0x49 bl sub_80BE8DC _080C0310: cmp r7, 0 beq _080C032C - ldr r0, _080C0328 + ldr r0, =0x0856b5b0 lsls r1, r6, 5 adds r0, 0x10 adds r1, r0 ldr r4, [r1] b _080C032E .align 2, 0 -_080C0320: .4byte 0x085e86c6 -_080C0324: .4byte 0x085e86d0 -_080C0328: .4byte 0x0856b5b0 + .pool _080C032C: - ldr r4, _080C0350 + ldr r4, =0x0855d30c _080C032E: movs r0, 0x1 adds r1, r4, 0 @@ -393967,7 +380946,7 @@ _080C032E: pop {r0} bx r0 .align 2, 0 -_080C0350: .4byte 0x0855d30c + .pool thumb_func_end sub_80C020C thumb_func_start sub_80C0354 @@ -393985,7 +380964,7 @@ sub_80C0354: @ 80C0354 lsls r2, 24 lsrs r2, 24 mov r8, r2 - ldr r1, _080C03D0 + ldr r1, =0x00002710 muls r0, r1 movs r1, 0xFE bl __divsi3 @@ -394030,7 +381009,7 @@ _080C0386: strb r0, [r1] b _080C03F4 .align 2, 0 -_080C03D0: .4byte 0x00002710 + .pool _080C03D4: mov r1, sp adds r1, 0x2 @@ -394117,9 +381096,9 @@ sub_80C0460: @ 80C0460 lsls r2, 24 lsrs r2, 24 str r2, [sp, 0x10] - ldr r5, _080C04B8 + ldr r5, =0x000186a0 muls r0, r5 - ldr r1, _080C04BC + ldr r1, =0x000011b8 bl __divsi3 adds r7, r0, 0 movs r1, 0xA @@ -394146,20 +381125,19 @@ _080C0494: strb r0, [r1] b _080C04C6 .align 2, 0 -_080C04B8: .4byte 0x000186a0 -_080C04BC: .4byte 0x000011b8 + .pool _080C04C0: movs r1, 0x1 mov r8, r1 movs r6, 0x1 _080C04C6: - ldr r1, _080C04FC + ldr r1, =0x000186a0 adds r0, r7, 0 bl __umodsi3 adds r7, r0, 0 mov r4, sp adds r4, 0x1 - ldr r1, _080C0500 + ldr r1, =0x00002710 bl __udivsi3 adds r0, 0xA1 strb r0, [r4] @@ -394179,8 +381157,7 @@ _080C04C6: strb r0, [r1] b _080C050E .align 2, 0 -_080C04FC: .4byte 0x000186a0 -_080C0500: .4byte 0x00002710 + .pool _080C0504: movs r3, 0x1 mov r8, r3 @@ -394188,7 +381165,7 @@ _080C0504: lsls r0, 24 lsrs r6, r0, 24 _080C050E: - ldr r1, _080C0548 + ldr r1, =0x00002710 adds r0, r7, 0 bl __umodsi3 adds r7, r0, 0 @@ -394216,7 +381193,7 @@ _080C050E: strb r0, [r1] b _080C0552 .align 2, 0 -_080C0548: .4byte 0x00002710 + .pool _080C054C: adds r0, r6, 0x1 lsls r0, 24 @@ -394325,11 +381302,11 @@ _080C0552: sub_80C0620: @ 80C0620 lsls r0, 16 lsrs r0, 11 - ldr r1, _080C062C + ldr r1, =0x0856b5b0 adds r0, r1 bx lr .align 2, 0 -_080C062C: .4byte 0x0856b5b0 + .pool thumb_func_end sub_80C0620 thumb_func_start sub_80C0630 @@ -394346,15 +381323,15 @@ sub_80C0630: @ 80C0630 movs r0, 0x1 b _080C065C _080C0646: - ldr r0, _080C0650 + ldr r0, =0x0856b5b0 lsls r1, r2, 5 adds r1, r0 ldrh r0, [r1, 0xC] b _080C065C .align 2, 0 -_080C0650: .4byte 0x0856b5b0 + .pool _080C0654: - ldr r0, _080C0660 + ldr r0, =0x0856b5b0 lsls r1, r2, 5 adds r1, r0 ldrh r0, [r1, 0xE] @@ -394362,7 +381339,7 @@ _080C065C: pop {r1} bx r1 .align 2, 0 -_080C0660: .4byte 0x0856b5b0 + .pool thumb_func_end sub_80C0630 thumb_func_start pokedex_flag_operation @@ -394372,7 +381349,7 @@ pokedex_flag_operation: @ 80C0664 lsls r1, 24 lsrs r2, r1, 24 adds r3, r2, 0 - ldr r1, _080C0698 + ldr r1, =0xffff0000 adds r0, r1 lsrs r1, r0, 16 lsrs r0, 19 @@ -394393,7 +381370,7 @@ pokedex_flag_operation: @ 80C0664 beq _080C06AA b _080C07E8 .align 2, 0 -_080C0698: .4byte 0xffff0000 + .pool _080C069C: cmp r3, 0x2 bne _080C06A2 @@ -394405,7 +381382,7 @@ _080C06A2: _080C06A8: b _080C07E8 _080C06AA: - ldr r1, _080C06EC + ldr r1, =0x03005d90 ldr r0, [r1] adds r0, 0x5C adds r0, r4 @@ -394416,9 +381393,9 @@ _080C06AA: bne _080C06BE b _080C07E8 _080C06BE: - ldr r0, _080C06F0 + ldr r0, =0x03005d8c ldr r3, [r0] - ldr r6, _080C06F4 + ldr r6, =0x00000988 adds r1, r3, r6 adds r1, r4 ldrb r1, [r1] @@ -394426,7 +381403,7 @@ _080C06BE: adds r6, r0, 0 cmp r2, r1 bne _080C06E0 - ldr r1, _080C06F8 + ldr r1, =0x00003b24 adds r0, r3, r1 adds r0, r4 ldrb r0, [r0] @@ -394440,12 +381417,9 @@ _080C06E0: mvns r3, r5 b _080C076A .align 2, 0 -_080C06EC: .4byte 0x03005d90 -_080C06F0: .4byte 0x03005d8c -_080C06F4: .4byte 0x00000988 -_080C06F8: .4byte 0x00003b24 + .pool _080C06FC: - ldr r1, _080C0744 + ldr r1, =0x03005d90 ldr r3, [r1] adds r0, r3, 0 adds r0, 0x28 @@ -394460,18 +381434,18 @@ _080C06FC: adds r0, r4 ldrb r0, [r0] ands r0, r5 - ldr r6, _080C0748 + ldr r6, =0x03005d8c cmp r2, r0 bne _080C0754 ldr r1, [r6] - ldr r3, _080C074C + ldr r3, =0x00000988 adds r0, r1, r3 adds r0, r4 ldrb r0, [r0] ands r0, r5 cmp r2, r0 bne _080C0754 - ldr r3, _080C0750 + ldr r3, =0x00003b24 adds r0, r1, r3 adds r0, r4 ldrb r0, [r0] @@ -394482,10 +381456,7 @@ _080C073E: movs r6, 0x1 b _080C07E8 .align 2, 0 -_080C0744: .4byte 0x03005d90 -_080C0748: .4byte 0x03005d8c -_080C074C: .4byte 0x00000988 -_080C0750: .4byte 0x00003b24 + .pool _080C0754: ldr r1, [r7] adds r1, 0x28 @@ -394504,7 +381475,7 @@ _080C076A: ands r0, r2 strb r0, [r1] ldr r1, [r6] - ldr r0, _080C0794 + ldr r0, =0x00000988 adds r1, r0 adds r1, r4 ldrb r2, [r1] @@ -394512,7 +381483,7 @@ _080C076A: ands r0, r2 strb r0, [r1] ldr r0, [r6] - ldr r1, _080C0798 + ldr r1, =0x00003b24 adds r0, r1 adds r0, r4 ldrb r1, [r0] @@ -394521,10 +381492,9 @@ _080C076A: movs r6, 0 b _080C07E8 .align 2, 0 -_080C0794: .4byte 0x00000988 -_080C0798: .4byte 0x00003b24 + .pool _080C079C: - ldr r0, _080C07C8 + ldr r0, =0x03005d90 ldr r1, [r0] adds r1, 0x5C adds r1, r4 @@ -394532,9 +381502,9 @@ _080C079C: adds r0, r5, 0 orrs r0, r2 strb r0, [r1] - ldr r3, _080C07CC + ldr r3, =0x03005d8c ldr r1, [r3] - ldr r0, _080C07D0 + ldr r0, =0x00000988 adds r1, r0 adds r1, r4 ldrb r2, [r1] @@ -394542,16 +381512,13 @@ _080C079C: orrs r0, r2 strb r0, [r1] ldr r1, [r3] - ldr r3, _080C07D4 + ldr r3, =0x00003b24 adds r1, r3 b _080C07DE .align 2, 0 -_080C07C8: .4byte 0x03005d90 -_080C07CC: .4byte 0x03005d8c -_080C07D0: .4byte 0x00000988 -_080C07D4: .4byte 0x00003b24 + .pool _080C07D8: - ldr r0, _080C07F0 + ldr r0, =0x03005d90 ldr r1, [r0] adds r1, 0x28 _080C07DE: @@ -394566,7 +381533,7 @@ _080C07E8: pop {r1} bx r1 .align 2, 0 -_080C07F0: .4byte 0x03005d90 + .pool thumb_func_end pokedex_flag_operation thumb_func_start pokedex_count @@ -394576,7 +381543,7 @@ pokedex_count: @ 80C07F4 lsrs r6, r0, 24 movs r5, 0 movs r0, 0 - ldr r7, _080C080C + ldr r7, =0x00000181 _080C0800: cmp r6, 0 beq _080C0810 @@ -394585,7 +381552,7 @@ _080C0800: adds r4, r0, 0x1 b _080C0832 .align 2, 0 -_080C080C: .4byte 0x00000181 + .pool _080C0810: adds r4, r0, 0x1 lsls r0, r4, 16 @@ -394799,7 +381766,7 @@ _080C0964: cmp r0, 0xF7 bls _080C0964 movs r0, 0xFB - ldr r5, _080C099C + ldr r5, =0x0000017f _080C0982: adds r0, 0x1 lsls r0, 16 @@ -394814,7 +381781,7 @@ _080C0996: movs r0, 0 b _080C09A8 .align 2, 0 -_080C099C: .4byte 0x0000017f + .pool _080C09A0: adds r0, r4, 0 cmp r0, r5 @@ -394913,7 +381880,7 @@ _080C0A60: bl lcd_io_clear_bits bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r1, _080C0A84 + ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] _080C0A7E: @@ -394921,7 +381888,7 @@ _080C0A7E: pop {r0} bx r0 .align 2, 0 -_080C0A84: .4byte 0x0300301c + .pool thumb_func_end sub_80C09B0 thumb_func_start sub_80C0A88 @@ -395053,7 +382020,7 @@ _080C0B62: cmp r5, 0 beq _080C0BC0 movs r4, 0 - ldr r2, _080C0BBC + ldr r2, =0x083185c8 movs r0, 0xB adds r1, r5, 0 muls r1, r0 @@ -395082,7 +382049,7 @@ _080C0B98: bls _080C0B98 b _080C0BD4 .align 2, 0 -_080C0BBC: .4byte 0x083185c8 + .pool _080C0BC0: movs r4, 0 movs r1, 0xAE @@ -395287,7 +382254,7 @@ sub_80C0D30: @ 80C0D30 mov r8, r0 lsls r1, 16 lsrs r1, 16 - ldr r4, _080C0DBC + ldr r4, =0x0856e694 adds r0, r1, 0 bl poke_something_2 lsls r0, 16 @@ -395349,7 +382316,7 @@ _080C0D84: pop {r0} bx r0 .align 2, 0 -_080C0DBC: .4byte 0x0856e694 + .pool thumb_func_end sub_80C0D30 thumb_func_start sub_80C0DC0 @@ -395359,23 +382326,23 @@ sub_80C0DC0: @ 80C0DC0 lsls r1, 16 lsrs r1, 16 lsrs r0, 5 - ldr r2, _080C0DFC + ldr r2, =0x06000232 adds r3, r0, r2 movs r4, 0xF0 lsls r4, 8 adds r2, r1, r4 strh r2, [r3] - ldr r2, _080C0E00 + ldr r2, =0x06000234 adds r3, r0, r2 adds r4, 0x1 adds r2, r1, r4 strh r2, [r3] - ldr r2, _080C0E04 + ldr r2, =0x06000272 adds r3, r0, r2 adds r4, 0x1 adds r2, r1, r4 strh r2, [r3] - ldr r2, _080C0E08 + ldr r2, =0x06000274 adds r0, r2 adds r4, 0x1 adds r1, r4 @@ -395384,10 +382351,7 @@ sub_80C0DC0: @ 80C0DC0 pop {r0} bx r0 .align 2, 0 -_080C0DFC: .4byte 0x06000232 -_080C0E00: .4byte 0x06000234 -_080C0E04: .4byte 0x06000272 -_080C0E08: .4byte 0x06000274 + .pool thumb_func_end sub_80C0DC0 thumb_func_start sub_80C0E0C @@ -395460,19 +382424,19 @@ sub_80C0E68: @ 80C0E68 lsls r0, 1 cmp r1, r0 bne _080C0E94 - ldr r0, _080C0E84 + ldr r0, =0x03005d90 ldr r0, [r0] ldr r0, [r0, 0x20] b _080C0E96 .align 2, 0 -_080C0E84: .4byte 0x03005d90 + .pool _080C0E88: - ldr r0, _080C0E90 + ldr r0, =0x03005d90 ldr r0, [r0] ldr r0, [r0, 0x1C] b _080C0E96 .align 2, 0 -_080C0E90: .4byte 0x03005d90 + .pool _080C0E94: movs r0, 0 _080C0E96: @@ -395510,7 +382474,7 @@ sub_80C0E9C: @ 80C0E9C lsls r6, 24 lsrs r6, 24 str r6, [sp, 0x8] - ldr r0, _080C0EF4 + ldr r0, =0x0000ffff str r0, [sp, 0xC] ldr r1, [sp, 0x10] adds r0, r1, 0 @@ -395524,7 +382488,7 @@ sub_80C0E9C: @ 80C0E9C pop {r1} bx r1 .align 2, 0 -_080C0EF4: .4byte 0x0000ffff + .pool thumb_func_end sub_80C0E9C thumb_func_start sub_80C0EF8 @@ -395542,7 +382506,7 @@ sub_80C0EF8: @ 80C0EF8 lsls r3, 24 lsrs r3, 24 str r3, [sp] - ldr r1, _080C0F2C + ldr r1, =0x0000ffff str r1, [sp, 0x4] movs r1, 0x1 adds r2, r4, 0 @@ -395555,7 +382519,7 @@ sub_80C0EF8: @ 80C0EF8 pop {r1} bx r1 .align 2, 0 -_080C0F2C: .4byte 0x0000ffff + .pool thumb_func_end sub_80C0EF8 thumb_func_start sub_80C0F30 @@ -395586,8 +382550,8 @@ sub_80C0F30: @ 80C0F30 bl sub_80BC8D4 movs r5, 0 movs r6, 0 - ldr r4, _080C1140 - ldr r3, _080C1144 + ldr r4, =0x00000181 + ldr r3, =0x02039b4c _080C0F6A: ldr r2, [r3] lsls r0, r5, 2 @@ -395609,9 +382573,9 @@ _080C0F86: lsrs r5, r0, 16 cmp r5, r4 bls _080C0F6A - ldr r1, _080C1144 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080C1148 + ldr r2, =0x0000060c adds r0, r2 adds r1, r6, 0 strh r6, [r0] @@ -395623,15 +382587,15 @@ _080C0F86: cmp r0, 0 beq _080C1032 lsls r7, 2 - ldr r0, _080C114C + ldr r0, =0x0856ed08 adds r0, 0x3 adds r0, r7, r0 str r0, [sp, 0xC] - ldr r0, _080C114C + ldr r0, =0x0856ed08 adds r0, r7 mov r9, r0 _080C0FBA: - ldr r1, _080C1144 + ldr r1, =0x02039b4c ldr r0, [r1] lsls r4, r5, 2 adds r0, r4 @@ -395639,7 +382603,7 @@ _080C0FBA: bl poke_something_2 lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _080C1150 + ldr r1, =0x083185c8 movs r0, 0xB muls r0, r2 adds r0, r1 @@ -395651,7 +382615,7 @@ _080C0FBA: bcc _080C0FF2 mov r1, r9 ldrb r0, [r1] - ldr r1, _080C114C + ldr r1, =0x0856ed08 adds r1, 0x1 adds r1, r7, r1 ldrb r1, [r1] @@ -395659,7 +382623,7 @@ _080C0FBA: cmp r2, r0 blt _080C100A _080C0FF2: - ldr r0, _080C114C + ldr r0, =0x0856ed08 adds r0, 0x2 adds r0, r7, r0 ldrb r2, [r0] @@ -395672,7 +382636,7 @@ _080C0FF2: cmp r3, r1 bge _080C101E _080C100A: - ldr r2, _080C1144 + ldr r2, =0x02039b4c ldr r0, [r2] lsls r1, r6, 2 adds r1, r0, r1 @@ -395686,17 +382650,17 @@ _080C101E: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _080C1144 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080C1148 + ldr r2, =0x0000060c adds r0, r2 ldrh r0, [r0] cmp r5, r0 bcc _080C0FBA _080C1032: - ldr r1, _080C1144 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080C1148 + ldr r2, =0x0000060c adds r0, r2 strh r6, [r0] _080C103C: @@ -395705,15 +382669,15 @@ _080C103C: beq _080C10AC movs r5, 0 movs r6, 0 - ldr r1, _080C1144 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080C1148 + ldr r2, =0x0000060c adds r0, r2 ldrh r0, [r0] cmp r6, r0 bcs _080C10A2 adds r7, r1, 0 - ldr r0, _080C1154 + ldr r0, =0x083203cc mov r8, r0 _080C105A: ldr r0, [r7] @@ -395747,15 +382711,15 @@ _080C1090: lsls r0, 16 lsrs r5, r0, 16 ldr r0, [r7] - ldr r2, _080C1148 + ldr r2, =0x0000060c adds r0, r2 ldrh r0, [r0] cmp r5, r0 bcc _080C105A _080C10A2: - ldr r1, _080C1144 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080C1148 + ldr r2, =0x0000060c adds r0, r2 strh r6, [r0] _080C10AC: @@ -395777,9 +382741,9 @@ _080C10C2: bne _080C1158 movs r5, 0 movs r6, 0 - ldr r2, _080C1144 + ldr r2, =0x02039b4c ldr r0, [r2] - ldr r1, _080C1148 + ldr r1, =0x0000060c adds r0, r1 ldrh r0, [r0] cmp r6, r0 @@ -395800,7 +382764,7 @@ _080C10E0: bl poke_something_2 lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _080C1154 + ldr r1, =0x083203cc lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -395831,25 +382795,20 @@ _080C112A: lsrs r5, r0, 16 mov r1, r8 ldr r0, [r1] - ldr r2, _080C1148 + ldr r2, =0x0000060c adds r0, r2 ldrh r0, [r0] cmp r5, r0 bcc _080C10E0 b _080C11D4 .align 2, 0 -_080C1140: .4byte 0x00000181 -_080C1144: .4byte 0x02039b4c -_080C1148: .4byte 0x0000060c -_080C114C: .4byte 0x0856ed08 -_080C1150: .4byte 0x083185c8 -_080C1154: .4byte 0x083203cc + .pool _080C1158: movs r5, 0 movs r6, 0 - ldr r1, _080C1244 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080C1248 + ldr r2, =0x0000060c adds r0, r2 ldrh r0, [r0] cmp r6, r0 @@ -395868,7 +382827,7 @@ _080C116C: bl poke_something_2 lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _080C124C + ldr r1, =0x083203cc lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -395889,7 +382848,7 @@ _080C11A2: cmp r0, r1 bne _080C11C0 _080C11AC: - ldr r2, _080C1244 + ldr r2, =0x02039b4c ldr r0, [r2] lsls r1, r6, 2 adds r1, r0, r1 @@ -395903,32 +382862,32 @@ _080C11C0: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _080C1244 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080C1248 + ldr r2, =0x0000060c adds r0, r2 ldrh r0, [r0] cmp r5, r0 bcc _080C116C _080C11D4: - ldr r1, _080C1244 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080C1248 + ldr r2, =0x0000060c adds r0, r2 strh r6, [r0] _080C11DE: - ldr r1, _080C1244 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080C1248 + ldr r2, =0x0000060c adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0 beq _080C1232 adds r5, r0, 0 - ldr r0, _080C1250 + ldr r0, =0x00000181 cmp r5, r0 bhi _080C1232 - ldr r4, _080C1244 + ldr r4, =0x02039b4c movs r1, 0x2 negs r1, r1 mov r10, r1 @@ -395936,7 +382895,7 @@ _080C11DE: negs r2, r2 mov r9, r2 mov r8, r0 - ldr r0, _080C1254 + ldr r0, =0x0000ffff adds r7, r0, 0 _080C1208: ldr r1, [r4] @@ -395971,17 +382930,13 @@ _080C1232: pop {r1} bx r1 .align 2, 0 -_080C1244: .4byte 0x02039b4c -_080C1248: .4byte 0x0000060c -_080C124C: .4byte 0x083203cc -_080C1250: .4byte 0x00000181 -_080C1254: .4byte 0x0000ffff + .pool thumb_func_end sub_80C0F30 thumb_func_start sub_80C1258 sub_80C1258: @ 80C1258 push {lr} - ldr r0, _080C126C + ldr r0, =sub_80C12E0 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -395989,7 +382944,7 @@ sub_80C1258: @ 80C1258 pop {r1} bx r1 .align 2, 0 -_080C126C: .4byte sub_80C12E0 + 1 + .pool thumb_func_end sub_80C1258 thumb_func_start sub_80C1270 @@ -396059,7 +383014,7 @@ sub_80C12E0: @ 80C12E0 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080C1304 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -396068,13 +383023,12 @@ sub_80C12E0: @ 80C12E0 cmp r0, 0x4 bhi _080C1320 lsls r0, 2 - ldr r1, _080C1308 + ldr r1, =_080C130C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C1304: .4byte 0x030022c0 -_080C1308: .4byte _080C130C + .pool .align 2, 0 _080C130C: .4byte _080C1320 @@ -396083,7 +383037,7 @@ _080C130C: .4byte _080C14A0 .4byte _080C14F0 _080C1320: - ldr r0, _080C13C8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -396093,9 +383047,9 @@ _080C1320: beq _080C1332 b _080C1516 _080C1332: - ldr r0, _080C13CC + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080C13D0 + ldr r1, =0x0000064a adds r0, r1 movs r1, 0x2 strb r1, [r0] @@ -396103,7 +383057,7 @@ _080C1332: bl sub_80C09B0 movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080C13D4 + ldr r1, =0x0856eff8 movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -396129,12 +383083,12 @@ _080C1332: adds r1, r0, 0 movs r0, 0 bl bg_set_tilemap - ldr r0, _080C13D8 + ldr r0, =0x0856f008 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 bl Window_WriteStandardTileMap - ldr r1, _080C13DC + ldr r1, =0x08dc3304 movs r2, 0x80 lsls r2, 6 str r5, [sp] @@ -396144,32 +383098,26 @@ _080C1332: bl sub_809D42C cmp r0, 0 bne _080C13E4 - ldr r1, _080C13E0 + ldr r1, =0x08dc3a0c movs r0, 0x3 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map b _080C13F0 .align 2, 0 -_080C13C8: .4byte 0x02037fd4 -_080C13CC: .4byte 0x02039b4c -_080C13D0: .4byte 0x0000064a -_080C13D4: .4byte 0x0856eff8 -_080C13D8: .4byte 0x0856f008 -_080C13DC: .4byte 0x08dc3304 -_080C13E0: .4byte 0x08dc3a0c + .pool _080C13E4: - ldr r1, _080C1408 + ldr r1, =0x08dc3870 movs r0, 0x3 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map _080C13F0: - ldr r0, _080C140C + ldr r0, =0x08dc3286 movs r1, 0x1 movs r2, 0x7E bl gpu_pal_apply - ldr r0, _080C1410 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -396177,13 +383125,11 @@ _080C13F0: strb r1, [r0] b _080C1516 .align 2, 0 -_080C1408: .4byte 0x08dc3870 -_080C140C: .4byte 0x08dc3286 -_080C1410: .4byte 0x030022c0 + .pool _080C1414: - ldr r0, _080C1474 + ldr r0, =0x0855d26c bl gpu_tile_obj_decompress_and_load - ldr r0, _080C1478 + ldr r0, =0x0855d27c bl gpu_pal_obj_alloc_and_load_multiple adds r0, r4, 0 bl sub_80C2594 @@ -396191,7 +383137,7 @@ _080C1414: lsls r0, r4, 2 adds r0, r4 lsls r2, r0, 3 - ldr r5, _080C147C + ldr r5, =0x03005e08 movs r3, 0 _080C1432: lsls r0, r1, 1 @@ -396220,9 +383166,7 @@ _080C1432: bl gpu_copy_wram_bg_tilemap_to_vram b _080C14DA .align 2, 0 -_080C1474: .4byte 0x0855d26c -_080C1478: .4byte 0x0855d27c -_080C147C: .4byte 0x03005e08 + .pool _080C1480: movs r0, 0x1 negs r0, r0 @@ -396231,13 +383175,13 @@ _080C1480: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r1, _080C149C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _080C14E2 .align 2, 0 -_080C149C: .4byte 0x030022c0 + .pool _080C14A0: movs r0, 0x50 movs r1, 0 @@ -396261,7 +383205,7 @@ _080C14A0: movs r0, 0x3 bl gpu_sync_bg_show _080C14DA: - ldr r1, _080C14EC + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -396271,9 +383215,9 @@ _080C14E2: strb r0, [r1] b _080C1516 .align 2, 0 -_080C14EC: .4byte 0x030022c0 + .pool _080C14F0: - ldr r0, _080C1520 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -396281,12 +383225,12 @@ _080C14F0: lsrs r2, r0, 24 cmp r2, 0 bne _080C1516 - ldr r1, _080C1524 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080C1528 + ldr r1, =sub_80C1570 + 1 str r1, [r0] movs r1, 0x87 lsls r1, 3 @@ -396298,9 +383242,7 @@ _080C1516: pop {r0} bx r0 .align 2, 0 -_080C1520: .4byte 0x02037fd4 -_080C1524: .4byte 0x03005e00 -_080C1528: .4byte sub_80C1570 + 1 + .pool thumb_func_end sub_80C12E0 thumb_func_start sub_80C152C @@ -396341,7 +383283,7 @@ sub_80C1570: @ 80C1570 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080C15A8 + ldr r0, =0x03005e00 lsls r5, r4, 2 adds r5, r4 lsls r5, 3 @@ -396355,14 +383297,13 @@ sub_80C1570: @ 80C1570 bl Window_CopyToVram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _080C15AC + ldr r0, =sub_80C15B0 + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080C15A8: .4byte 0x03005e00 -_080C15AC: .4byte sub_80C15B0 + 1 + .pool thumb_func_end sub_80C1570 thumb_func_start sub_80C15B0 @@ -396370,7 +383311,7 @@ sub_80C15B0: @ 80C15B0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080C15D8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -396378,24 +383319,22 @@ sub_80C15B0: @ 80C15B0 beq _080C15E4 movs r0, 0x3 bl audio_play - ldr r0, _080C15DC + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _080C15E0 + ldr r0, =sub_80C1D38 + 1 str r0, [r1] b _080C16BC .align 2, 0 -_080C15D8: .4byte 0x030022c0 -_080C15DC: .4byte 0x03005e00 -_080C15E0: .4byte sub_80C1D38 + 1 + .pool _080C15E4: movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080C1640 - ldr r1, _080C1608 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -396410,7 +383349,7 @@ _080C15E4: beq _080C1612 b _080C16BC .align 2, 0 -_080C1608: .4byte 0x03005e00 + .pool _080C160C: cmp r4, 0x2 beq _080C1630 @@ -396426,25 +383365,25 @@ _080C161C: movs r0, 0x4 strh r0, [r5, 0xA] _080C1626: - ldr r0, _080C162C + ldr r0, =sub_80C16CC + 1 str r0, [r5] b _080C16BC .align 2, 0 -_080C162C: .4byte sub_80C16CC + 1 + .pool _080C1630: movs r0, 0x3 bl audio_play - ldr r0, _080C163C + ldr r0, =sub_80C1D38 + 1 str r0, [r5] b _080C16BC .align 2, 0 -_080C163C: .4byte sub_80C1D38 + 1 + .pool _080C1640: movs r0, 0x20 ands r0, r1 cmp r0, 0 beq _080C167C - ldr r0, _080C16C4 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -396467,13 +383406,13 @@ _080C1640: movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram _080C167C: - ldr r0, _080C16C8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _080C16BC - ldr r0, _080C16C4 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -396500,8 +383439,7 @@ _080C16BC: pop {r0} bx r0 .align 2, 0 -_080C16C4: .4byte 0x03005e00 -_080C16C8: .4byte 0x030022c0 + .pool thumb_func_end sub_80C15B0 thumb_func_start sub_80C16CC @@ -396510,7 +383448,7 @@ sub_80C16CC: @ 80C16CC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080C1704 + ldr r0, =0x03005e00 lsls r5, r4, 2 adds r5, r4 lsls r5, 3 @@ -396525,14 +383463,13 @@ sub_80C16CC: @ 80C16CC bl Window_CopyToVram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _080C1708 + ldr r0, =sub_80C170C + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080C1704: .4byte 0x03005e00 -_080C1708: .4byte sub_80C170C + 1 + .pool thumb_func_end sub_80C16CC thumb_func_start sub_80C170C @@ -396540,7 +383477,7 @@ sub_80C170C: @ 80C170C push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080C1734 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -396550,23 +383487,21 @@ sub_80C170C: @ 80C170C cmp r0, 0 beq _080C1740 bl sub_809D42C - ldr r6, _080C1738 + ldr r6, =0x0856edb8 cmp r0, 0 bne _080C174C - ldr r6, _080C173C + ldr r6, =0x0856edf0 b _080C174C .align 2, 0 -_080C1734: .4byte 0x03005e00 -_080C1738: .4byte 0x0856edb8 -_080C173C: .4byte 0x0856edf0 + .pool _080C1740: bl sub_809D42C - ldr r6, _080C1778 + ldr r6, =0x0856ed9c cmp r0, 0 bne _080C174C - ldr r6, _080C177C + ldr r6, =0x0856edd4 _080C174C: - ldr r0, _080C1780 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -396578,26 +383513,22 @@ _080C174C: bl audio_play adds r0, r5, 0 bl sub_80C23B8 - ldr r0, _080C1784 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _080C1788 + ldr r0, =sub_80C1570 + 1 str r0, [r1] b _080C1994 .align 2, 0 -_080C1778: .4byte 0x0856ed9c -_080C177C: .4byte 0x0856edd4 -_080C1780: .4byte 0x030022c0 -_080C1784: .4byte 0x03005e00 -_080C1788: .4byte sub_80C1570 + 1 + .pool _080C178C: movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080C1870 - ldr r0, _080C181C + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -396610,16 +383541,16 @@ _080C178C: ldrsh r0, [r6, r1] cmp r0, 0 beq _080C183C - ldr r1, _080C1820 + ldr r1, =0x02039b52 movs r0, 0x40 strb r0, [r1] - ldr r7, _080C1824 + ldr r7, =0x02039b4c ldr r1, [r7] - ldr r0, _080C1828 + ldr r0, =0x0000062a adds r2, r1, r0 movs r0, 0x40 strh r0, [r2] - ldr r0, _080C182C + ldr r0, =0x02039b50 strh r3, [r0] movs r2, 0xC2 lsls r2, 3 @@ -396628,7 +383559,7 @@ _080C178C: adds r0, r5, 0 movs r1, 0x5 bl sub_80C2318 - ldr r4, _080C1830 + ldr r4, =0x03005d90 ldr r1, [r4] strb r0, [r1, 0x19] bl sub_809D42C @@ -396641,7 +383572,7 @@ _080C17E8: ldr r0, [r7] ldr r1, [r4] ldrb r1, [r1, 0x19] - ldr r2, _080C1834 + ldr r2, =0x00000614 adds r0, r2 strh r1, [r0] adds r0, r5, 0 @@ -396658,22 +383589,15 @@ _080C17E8: strh r1, [r0] movs r0, 0x3 bl audio_play - ldr r0, _080C1838 + ldr r0, =sub_80C1D38 + 1 str r0, [r6] b _080C1994 .align 2, 0 -_080C181C: .4byte 0x03005e00 -_080C1820: .4byte 0x02039b52 -_080C1824: .4byte 0x02039b4c -_080C1828: .4byte 0x0000062a -_080C182C: .4byte 0x02039b50 -_080C1830: .4byte 0x03005d90 -_080C1834: .4byte 0x00000614 -_080C1838: .4byte sub_80C1D38 + 1 + .pool _080C183C: - ldr r0, _080C1858 + ldr r0, =0x085e875b bl sub_80C2618 - ldr r0, _080C185C + ldr r0, =sub_80C19A4 + 1 str r0, [r6] movs r0, 0x70 bl audio_play @@ -396682,22 +383606,21 @@ _080C183C: bl Window_CopyToVram b _080C1994 .align 2, 0 -_080C1858: .4byte 0x085e875b -_080C185C: .4byte sub_80C19A4 + 1 + .pool _080C1860: movs r0, 0x15 bl audio_play - ldr r0, _080C186C + ldr r0, =sub_80C1B64 + 1 str r0, [r6] b _080C1994 .align 2, 0 -_080C186C: .4byte sub_80C1B64 + 1 + .pool _080C1870: movs r0, 0x20 ands r0, r1 cmp r0, 0 beq _080C18B6 - ldr r1, _080C199C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -396725,13 +383648,13 @@ _080C1870: movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram _080C18B6: - ldr r0, _080C19A0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _080C1900 - ldr r1, _080C199C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -396759,13 +383682,13 @@ _080C18B6: movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram _080C1900: - ldr r0, _080C19A0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _080C194A - ldr r1, _080C199C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -396793,13 +383716,13 @@ _080C1900: movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram _080C194A: - ldr r0, _080C19A0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _080C1994 - ldr r1, _080C199C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -396831,8 +383754,7 @@ _080C1994: pop {r0} bx r0 .align 2, 0 -_080C199C: .4byte 0x03005e00 -_080C19A0: .4byte 0x030022c0 + .pool thumb_func_end sub_80C170C thumb_func_start sub_80C19A4 @@ -396894,12 +383816,12 @@ sub_80C19A4: @ 80C19A4 mov r2, r8 adds r3, r6, 0 bl sub_80C0F30 - ldr r1, _080C1A44 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _080C1A48 + ldr r1, =sub_80C1A4C + 1 str r1, [r0] add sp, 0x8 pop {r3-r5} @@ -396910,8 +383832,7 @@ sub_80C19A4: @ 80C19A4 pop {r0} bx r0 .align 2, 0 -_080C1A44: .4byte 0x03005e00 -_080C1A48: .4byte sub_80C1A4C + 1 + .pool thumb_func_end sub_80C19A4 thumb_func_start sub_80C1A4C @@ -396923,34 +383844,32 @@ sub_80C1A4C: @ 80C1A4C lsls r0, 24 cmp r0, 0 bne _080C1AA6 - ldr r0, _080C1A78 + ldr r0, =0x02039b4c ldr r0, [r0] - ldr r1, _080C1A7C + ldr r1, =0x0000060c adds r0, r1 ldrh r0, [r0] cmp r0, 0 beq _080C1A84 movs r0, 0x1F bl audio_play - ldr r0, _080C1A80 + ldr r0, =0x085e8773 bl sub_80C2618 b _080C1A90 .align 2, 0 -_080C1A78: .4byte 0x02039b4c -_080C1A7C: .4byte 0x0000060c -_080C1A80: .4byte 0x085e8773 + .pool _080C1A84: movs r0, 0x20 bl audio_play - ldr r0, _080C1AAC + ldr r0, =0x085e8785 bl sub_80C2618 _080C1A90: - ldr r0, _080C1AB0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080C1AB4 + ldr r0, =sub_80C1AB8 + 1 str r0, [r1] movs r0, 0 movs r1, 0x2 @@ -396960,9 +383879,7 @@ _080C1AA6: pop {r0} bx r0 .align 2, 0 -_080C1AAC: .4byte 0x085e8785 -_080C1AB0: .4byte 0x03005e00 -_080C1AB4: .4byte sub_80C1AB8 + 1 + .pool thumb_func_end sub_80C1A4C thumb_func_start sub_80C1AB8 @@ -396971,20 +383888,20 @@ sub_80C1AB8: @ 80C1AB8 lsls r0, 24 lsrs r4, r0, 24 adds r2, r4, 0 - ldr r0, _080C1B20 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080C1B54 - ldr r5, _080C1B24 + ldr r5, =0x02039b4c ldr r1, [r5] - ldr r3, _080C1B28 + ldr r3, =0x0000060c adds r0, r1, r3 ldrh r0, [r0] cmp r0, 0 beq _080C1B40 - ldr r0, _080C1B2C + ldr r0, =0x0000064e adds r1, r0 movs r0, 0x1 strb r0, [r1] @@ -396994,7 +383911,7 @@ sub_80C1AB8: @ 80C1AB8 ldr r1, [r5] lsls r0, 24 lsrs r0, 24 - ldr r2, _080C1B30 + ldr r2, =0x00000612 adds r1, r2 strh r0, [r1] adds r0, r4, 0 @@ -397003,35 +383920,28 @@ sub_80C1AB8: @ 80C1AB8 ldr r1, [r5] lsls r0, 24 lsrs r0, 24 - ldr r3, _080C1B34 + ldr r3, =0x00000616 adds r1, r3 strh r0, [r1] - ldr r1, _080C1B38 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080C1B3C + ldr r1, =sub_80C1D38 + 1 str r1, [r0] movs r0, 0x3 bl audio_play b _080C1B54 .align 2, 0 -_080C1B20: .4byte 0x030022c0 -_080C1B24: .4byte 0x02039b4c -_080C1B28: .4byte 0x0000060c -_080C1B2C: .4byte 0x0000064e -_080C1B30: .4byte 0x00000612 -_080C1B34: .4byte 0x00000616 -_080C1B38: .4byte 0x03005e00 -_080C1B3C: .4byte sub_80C1D38 + 1 + .pool _080C1B40: - ldr r0, _080C1B5C + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _080C1B60 + ldr r0, =sub_80C16CC + 1 str r0, [r1] movs r0, 0x17 bl audio_play @@ -397040,8 +383950,7 @@ _080C1B54: pop {r0} bx r0 .align 2, 0 -_080C1B5C: .4byte 0x03005e00 -_080C1B60: .4byte sub_80C16CC + 1 + .pool thumb_func_end sub_80C1AB8 thumb_func_start sub_80C1B64 @@ -397052,7 +383961,7 @@ sub_80C1B64: @ 80C1B64 lsrs r5, 24 movs r0, 0 bl sub_80C21D4 - ldr r2, _080C1BC0 + ldr r2, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -397060,7 +383969,7 @@ sub_80C1B64: @ 80C1B64 ldrb r0, [r6, 0xA] adds r2, 0x8 adds r1, r2 - ldr r2, _080C1BC4 + ldr r2, =0x0856efc8 lsls r0, 3 adds r0, r2 ldrb r4, [r0, 0x4] @@ -397077,7 +383986,7 @@ sub_80C1B64: @ 80C1B64 bl sub_80C2294 ldrh r0, [r4] bl sub_80C2650 - ldr r0, _080C1BC8 + ldr r0, =sub_80C1BCC + 1 str r0, [r6] movs r0, 0 movs r1, 0x2 @@ -397088,9 +383997,7 @@ sub_80C1B64: @ 80C1B64 pop {r0} bx r0 .align 2, 0 -_080C1BC0: .4byte 0x03005e00 -_080C1BC4: .4byte 0x0856efc8 -_080C1BC8: .4byte sub_80C1BCC + 1 + .pool thumb_func_end sub_80C1B64 thumb_func_start sub_80C1BCC @@ -397100,13 +384007,13 @@ sub_80C1BCC: @ 80C1BCC push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r3, _080C1C24 + ldr r3, =0x03005e00 lsls r2, r7, 2 adds r2, r7 lsls r2, 3 adds r5, r2, r3 ldrb r1, [r5, 0xA] - ldr r0, _080C1C28 + ldr r0, =0x0856efc8 lsls r1, 3 adds r1, r0 ldr r0, [r1] @@ -397123,7 +384030,7 @@ sub_80C1BCC: @ 80C1BCC subs r0, 0x1 lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _080C1C2C + ldr r0, =0x030022c0 mov r12, r0 ldrh r1, [r0, 0x2E] movs r0, 0x1 @@ -397137,9 +384044,7 @@ sub_80C1BCC: @ 80C1BCC bl sub_80C21D4 b _080C1C50 .align 2, 0 -_080C1C24: .4byte 0x03005e00 -_080C1C28: .4byte 0x0856efc8 -_080C1C2C: .4byte 0x030022c0 + .pool _080C1C30: movs r0, 0x2 ands r0, r1 @@ -397155,7 +384060,7 @@ _080C1C30: ldrh r0, [r5, 0x26] strh r0, [r6] _080C1C50: - ldr r0, _080C1C64 + ldr r0, =sub_80C16CC + 1 str r0, [r5] movs r0, 0 movs r1, 0x2 @@ -397164,7 +384069,7 @@ _080C1C50: bl gpu_copy_wram_bg_tilemap_to_vram b _080C1D2E .align 2, 0 -_080C1C64: .4byte sub_80C16CC + 1 + .pool _080C1C68: movs r3, 0 mov r0, r12 @@ -397280,20 +384185,19 @@ sub_80C1D38: @ 80C1D38 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _080C1D68 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080C1D6C + ldr r1, =sub_80C1D70 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_080C1D68: .4byte 0x03005e00 -_080C1D6C: .4byte sub_80C1D70 + 1 + .pool thumb_func_end sub_80C1D38 thumb_func_start sub_80C1D70 @@ -397301,7 +384205,7 @@ sub_80C1D70: @ 80C1D70 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080C1D94 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -397315,7 +384219,7 @@ _080C1D8C: pop {r0} bx r0 .align 2, 0 -_080C1D94: .4byte 0x02037fd4 + .pool thumb_func_end sub_80C1D70 thumb_func_start sub_80C1D98 @@ -397341,7 +384245,7 @@ sub_80C1D98: @ 80C1D98 bcs _080C1DEC lsls r0, r5, 6 adds r7, r0, r2 - ldr r5, _080C1DF8 + ldr r5, =0x00000fff lsls r2, r6, 12 _080C1DC8: mov r0, r8 @@ -397369,7 +384273,7 @@ _080C1DEC: pop {r0} bx r0 .align 2, 0 -_080C1DF8: .4byte 0x00000fff + .pool thumb_func_end sub_80C1D98 thumb_func_start sub_80C1DFC @@ -397389,12 +384293,12 @@ sub_80C1DFC: @ 80C1DFC cmp r4, 0xA bhi _080C1EE8 lsls r0, r4, 2 - ldr r1, _080C1E24 + ldr r1, =_080C1E28 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C1E24: .4byte _080C1E28 + .pool .align 2, 0 _080C1E28: .4byte _080C1E54 @@ -397409,16 +384313,16 @@ _080C1E28: .4byte _080C1EA4 .4byte _080C1E94 _080C1E54: - ldr r1, _080C1E60 + ldr r1, =0x0856ed30 lsls r0, r4, 3 adds r0, r1 ldrb r1, [r0, 0x4] ldrb r2, [r0, 0x5] b _080C1EC2 .align 2, 0 -_080C1E60: .4byte 0x0856ed30 + .pool _080C1E64: - ldr r2, _080C1E90 + ldr r2, =0x0856ed48 subs r1, r4, 0x3 lsls r0, r1, 1 adds r0, r1 @@ -397430,7 +384334,7 @@ _080C1E64: adds r0, r5, 0 bl sub_80C1D98 _080C1E7C: - ldr r2, _080C1E90 + ldr r2, =0x0856ed48 subs r1, r4, 0x3 lsls r0, r1, 1 adds r0, r1 @@ -397441,20 +384345,20 @@ _080C1E7C: ldrb r3, [r0, 0x9] b _080C1EC4 .align 2, 0 -_080C1E90: .4byte 0x0856ed48 + .pool _080C1E94: - ldr r0, _080C1EA0 + ldr r0, =0x0856ed48 ldrb r1, [r0, 0x1C] ldrb r2, [r0, 0x1D] ldrb r3, [r0, 0x1E] b _080C1EC4 .align 2, 0 -_080C1EA0: .4byte 0x0856ed48 + .pool _080C1EA4: bl sub_809D42C cmp r0, 0 bne _080C1ED0 - ldr r2, _080C1ECC + ldr r2, =0x0856ed48 subs r1, r4, 0x3 lsls r0, r1, 1 adds r0, r1 @@ -397472,9 +384376,9 @@ _080C1EC4: bl sub_80C1D98 b _080C1EE8 .align 2, 0 -_080C1ECC: .4byte 0x0856ed48 + .pool _080C1ED0: - ldr r2, _080C1EF0 + ldr r2, =0x0856ed48 subs r1, r4, 0x3 lsls r0, r1, 1 adds r0, r1 @@ -397490,7 +384394,7 @@ _080C1EE8: pop {r0} bx r0 .align 2, 0 -_080C1EF0: .4byte 0x0856ed48 + .pool thumb_func_end sub_80C1DFC thumb_func_start sub_80C1EF4 @@ -397648,7 +384552,7 @@ sub_80C2040: @ 80C2040 lsrs r4, 24 adds r0, r4, 0 bl sub_80C1EF4 - ldr r0, _080C2060 + ldr r0, =0x0856ed30 lsls r4, 3 adds r4, r0 ldr r0, [r4] @@ -397657,7 +384561,7 @@ sub_80C2040: @ 80C2040 pop {r0} bx r0 .align 2, 0 -_080C2060: .4byte 0x0856ed30 + .pool thumb_func_end sub_80C2040 thumb_func_start sub_80C2064 @@ -397671,12 +384575,12 @@ sub_80C2064: @ 80C2064 cmp r4, 0x6 bhi _080C20DE lsls r0, r4, 2 - ldr r1, _080C2080 + ldr r1, =_080C2084 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C2080: .4byte _080C2084 + .pool .align 2, 0 _080C2084: .4byte _080C20A0 @@ -397722,7 +384626,7 @@ _080C20D4: movs r2, 0 bl sub_80C1DFC _080C20DE: - ldr r0, _080C20F4 + ldr r0, =0x0856ed48 lsls r1, r4, 1 adds r1, r4 lsls r1, 2 @@ -397733,7 +384637,7 @@ _080C20DE: pop {r0} bx r0 .align 2, 0 -_080C20F4: .4byte 0x0856ed48 + .pool thumb_func_end sub_80C2064 thumb_func_start sub_80C20F8 @@ -397747,7 +384651,7 @@ sub_80C20F8: @ 80C20F8 movs r2, 0x60 movs r3, 0x50 bl sub_80C12B0 - ldr r1, _080C21BC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -397756,7 +384660,7 @@ sub_80C20F8: @ 80C20F8 ldrh r1, [r5, 0x14] adds r0, r1 lsls r0, 16 - ldr r1, _080C21C0 + ldr r1, =0x0856ee5c lsrs r0, 13 adds r1, 0x4 adds r0, r1 @@ -397768,7 +384672,7 @@ sub_80C20F8: @ 80C20F8 ldrh r1, [r5, 0x18] adds r0, r1 lsls r0, 16 - ldr r1, _080C21C4 + ldr r1, =0x0856eeb4 lsrs r0, 13 adds r1, 0x4 adds r0, r1 @@ -397780,7 +384684,7 @@ sub_80C20F8: @ 80C20F8 ldrh r1, [r5, 0x1C] adds r0, r1 lsls r0, 16 - ldr r4, _080C21C8 + ldr r4, =0x0856ef14 lsrs r0, 13 adds r4, 0x4 adds r0, r4 @@ -397802,7 +384706,7 @@ sub_80C20F8: @ 80C20F8 ldrh r1, [r5, 0x10] adds r0, r1 lsls r0, 16 - ldr r1, _080C21CC + ldr r1, =0x0856ee24 lsrs r0, 13 adds r1, 0x4 adds r0, r1 @@ -397817,7 +384721,7 @@ sub_80C20F8: @ 80C20F8 ldrh r5, [r5, 0xC] adds r0, r5 lsls r0, 16 - ldr r1, _080C21D0 + ldr r1, =0x0856ee0c lsrs r0, 13 adds r1, 0x4 adds r0, r1 @@ -397830,12 +384734,7 @@ _080C21B6: pop {r0} bx r0 .align 2, 0 -_080C21BC: .4byte 0x03005e00 -_080C21C0: .4byte 0x0856ee5c -_080C21C4: .4byte 0x0856eeb4 -_080C21C8: .4byte 0x0856ef14 -_080C21CC: .4byte 0x0856ee24 -_080C21D0: .4byte 0x0856ee0c + .pool thumb_func_end sub_80C20F8 thumb_func_start sub_80C21D4 @@ -397849,11 +384748,11 @@ sub_80C21D4: @ 80C21D4 adds r5, r0, 0 cmp r4, 0 bne _080C2268 - ldr r1, _080C2258 + ldr r1, =0x00000c0b adds r0, r1, 0 strh r0, [r5, 0x22] movs r1, 0x12 - ldr r0, _080C225C + ldr r0, =0x0000080d adds r2, r0, 0 _080C21F4: lsls r0, r1, 1 @@ -397865,7 +384764,7 @@ _080C21F4: cmp r1, 0x1E bls _080C21F4 movs r2, 0x1 - ldr r1, _080C2260 + ldr r1, =0x0000040a adds r6, r1, 0 movs r4, 0x2 _080C220C: @@ -397888,7 +384787,7 @@ _080C2218: lsrs r2, r0, 16 cmp r2, 0xC bls _080C220C - ldr r2, _080C2264 + ldr r2, =0x00000362 adds r1, r5, r2 adds r2, 0xA9 adds r0, r2, 0 @@ -397909,10 +384808,7 @@ _080C2242: bls _080C2242 b _080C228C .align 2, 0 -_080C2258: .4byte 0x00000c0b -_080C225C: .4byte 0x0000080d -_080C2260: .4byte 0x0000040a -_080C2264: .4byte 0x00000362 + .pool _080C2268: movs r2, 0 movs r4, 0x4F @@ -397947,8 +384843,8 @@ sub_80C2294: @ 80C2294 push {r7} lsls r0, 24 lsrs r0, 24 - ldr r4, _080C22D0 - ldr r3, _080C22D4 + ldr r4, =0x0856efc8 + ldr r3, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -397972,8 +384868,7 @@ sub_80C2294: @ 80C2294 ldrh r4, [r7] b _080C22F2 .align 2, 0 -_080C22D0: .4byte 0x0856efc8 -_080C22D4: .4byte 0x03005e00 + .pool _080C22D8: adds r0, r1, r6 ldr r1, [r0, 0x4] @@ -398019,9 +384914,9 @@ sub_80C2318: @ 80C2318 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080C2358 + ldr r0, =0x03005e08 adds r1, r0 - ldr r2, _080C235C + ldr r2, =0x0856efc8 lsls r0, r3, 3 adds r0, r2 ldrb r2, [r0, 0x4] @@ -398038,14 +384933,12 @@ sub_80C2318: @ 80C2318 cmp r3, 0x5 bhi _080C237C lsls r0, r3, 2 - ldr r1, _080C2360 + ldr r1, =_080C2364 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C2358: .4byte 0x03005e08 -_080C235C: .4byte 0x0856efc8 -_080C2360: .4byte _080C2364 + .pool .align 2, 0 _080C2364: .4byte _080C2390 @@ -398058,15 +384951,15 @@ _080C237C: movs r0, 0 b _080C23B0 _080C2380: - ldr r0, _080C2384 + ldr r0, =0x0856efac b _080C23AC .align 2, 0 -_080C2384: .4byte 0x0856efac + .pool _080C2388: - ldr r0, _080C238C + ldr r0, =0x0856efae b _080C23AC .align 2, 0 -_080C238C: .4byte 0x0856efae + .pool _080C2390: cmp r2, 0 beq _080C239E @@ -398085,7 +384978,7 @@ _080C23A2: lsrs r0, 24 b _080C23B0 _080C23AA: - ldr r0, _080C23B4 + ldr r0, =0x0856efb4 _080C23AC: adds r0, r2, r0 ldrb r0, [r0] @@ -398093,7 +384986,7 @@ _080C23B0: pop {r1} bx r1 .align 2, 0 -_080C23B4: .4byte 0x0856efb4 + .pool thumb_func_end sub_80C2318 thumb_func_start sub_80C23B8 @@ -398101,9 +384994,9 @@ sub_80C23B8: @ 80C23B8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080C23D8 + ldr r1, =0x02039b4c ldr r0, [r1] - ldr r2, _080C23DC + ldr r2, =0x00000614 adds r0, r2 ldrh r0, [r0] adds r5, r1, 0 @@ -398115,12 +385008,11 @@ _080C23D2: movs r3, 0 b _080C23E2 .align 2, 0 -_080C23D8: .4byte 0x02039b4c -_080C23DC: .4byte 0x00000614 + .pool _080C23E0: movs r3, 0x1 _080C23E2: - ldr r1, _080C2408 + ldr r1, =0x03005e00 lsls r2, r4, 2 adds r0, r2, r4 lsls r0, 3 @@ -398135,13 +385027,12 @@ _080C23E2: cmp r0, 0x5 bhi _080C2428 lsls r0, 2 - ldr r1, _080C240C + ldr r1, =_080C2410 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C2408: .4byte 0x03005e00 -_080C240C: .4byte _080C2410 + .pool .align 2, 0 _080C2410: .4byte _080C2428 @@ -398182,7 +385073,7 @@ sub_80C244C: @ 80C244C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _080C2484 + ldr r3, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -398190,7 +385081,7 @@ sub_80C244C: @ 80C244C ldrb r2, [r0, 0xA] adds r3, 0x8 adds r1, r3 - ldr r0, _080C2488 + ldr r0, =0x0856efc8 lsls r2, 3 adds r2, r0 ldrb r0, [r2, 0x5] @@ -398208,8 +385099,7 @@ sub_80C244C: @ 80C244C movs r0, 0 b _080C248E .align 2, 0 -_080C2484: .4byte 0x03005e00 -_080C2488: .4byte 0x0856efc8 + .pool _080C248C: movs r0, 0x1 _080C248E: @@ -398222,7 +385112,7 @@ sub_80C2494: @ 80C2494 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _080C24D0 + ldr r3, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -398230,7 +385120,7 @@ sub_80C2494: @ 80C2494 ldrb r2, [r0, 0xA] adds r3, 0x8 adds r1, r3 - ldr r0, _080C24D4 + ldr r0, =0x0856efc8 lsls r2, 3 adds r2, r0 ldrb r0, [r2, 0x5] @@ -398249,8 +385139,7 @@ sub_80C2494: @ 80C2494 movs r0, 0 b _080C24DA .align 2, 0 -_080C24D0: .4byte 0x03005e00 -_080C24D4: .4byte 0x0856efc8 + .pool _080C24D8: movs r0, 0x1 _080C24DA: @@ -398262,7 +385151,7 @@ _080C24DA: sub_80C24E0: @ 80C24E0 push {r4,lr} adds r4, r0, 0 - ldr r2, _080C2520 + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -398270,7 +385159,7 @@ sub_80C24E0: @ 80C24E0 lsls r0, 3 adds r0, r2 ldr r1, [r0] - ldr r0, _080C2524 + ldr r0, =sub_80C1BCC + 1 cmp r1, r0 bne _080C2580 movs r1, 0x30 @@ -398291,8 +385180,7 @@ sub_80C24E0: @ 80C24E0 orrs r0, r1 b _080C2550 .align 2, 0 -_080C2520: .4byte 0x03005e00 -_080C2524: .4byte sub_80C1BCC + 1 + .pool _080C2528: ldrh r0, [r4, 0x2E] lsls r0, 24 @@ -398322,7 +385210,7 @@ _080C2550: lsls r0, 7 adds r0, r2, r0 lsls r0, 24 - ldr r1, _080C257C + ldr r1, =0x08329f40 lsrs r0, 23 adds r0, r1 movs r1, 0 @@ -398338,7 +385226,7 @@ _080C256E: strh r0, [r4, 0x32] b _080C258C .align 2, 0 -_080C257C: .4byte 0x08329f40 + .pool _080C2580: adds r0, r4, 0 adds r0, 0x3E @@ -398361,7 +385249,7 @@ sub_80C2594: @ 80C2594 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _080C260C + ldr r6, =0x0855d1ac adds r0, r6, 0 movs r1, 0xB8 movs r2, 0x4 @@ -398369,7 +385257,7 @@ sub_80C2594: @ 80C2594 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r4, _080C2610 + ldr r4, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -398381,7 +385269,7 @@ sub_80C2594: @ 80C2594 adds r0, r4 mov r9, r0 add r1, r9 - ldr r0, _080C2614 + ldr r0, =sub_80C24E0 + 1 mov r8, r0 str r0, [r1] adds r0, r6, 0 @@ -398413,9 +385301,7 @@ sub_80C2594: @ 80C2594 pop {r0} bx r0 .align 2, 0 -_080C260C: .4byte 0x0855d1ac -_080C2610: .4byte 0x02020630 -_080C2614: .4byte sub_80C24E0 + 1 + .pool thumb_func_end sub_80C2594 thumb_func_start sub_80C2618 @@ -398454,7 +385340,7 @@ sub_80C2638: @ 80C2638 sub_80C2650: @ 80C2650 push {lr} adds r2, r0, 0 - ldr r0, _080C2664 + ldr r0, =0x085e8b3a lsls r2, 4 adds r2, 0x9 movs r1, 0x90 @@ -398462,7 +385348,7 @@ sub_80C2650: @ 80C2650 pop {r0} bx r0 .align 2, 0 -_080C2664: .4byte 0x085e8b3a + .pool thumb_func_end sub_80C2650 thumb_func_start sub_80C2668 @@ -398497,40 +385383,37 @@ sub_80C2690: @ 80C2690 bl copy_queue_process bl copy_pal_bg_faded_to_pal_ram bl sub_80C48C8 - ldr r0, _080C26C4 + ldr r0, =0x02039ce8 ldr r0, [r0] ldrb r0, [r0, 0x9] cmp r0, 0 beq _080C26C0 - ldr r1, _080C26C8 - ldr r0, _080C26CC + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r2, 0xF0 lsls r2, 3 adds r0, r2 str r0, [r1, 0x4] - ldr r0, _080C26D0 + ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _080C26C0: pop {r0} bx r0 .align 2, 0 -_080C26C4: .4byte 0x02039ce8 -_080C26C8: .4byte 0x040000d4 -_080C26CC: .4byte 0x02038c28 -_080C26D0: .4byte 0x800000a0 + .pool thumb_func_end sub_80C2690 thumb_func_start sub_80C26D4 sub_80C26D4: @ 80C26D4 push {r4,lr} - ldr r4, _080C2700 + ldr r4, =0x04000208 ldrh r3, [r4] movs r0, 0 strh r0, [r4] - ldr r1, _080C2704 - ldr r0, _080C2708 + ldr r1, =0x02038c28 + ldr r0, =0x04000006 ldrh r2, [r0] movs r0, 0xFF ands r0, r2 @@ -398540,17 +385423,14 @@ sub_80C26D4: @ 80C26D4 adds r1, r2 adds r0, r1 ldrh r1, [r0] - ldr r0, _080C270C + ldr r0, =0x04000012 strh r1, [r0] strh r3, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_080C2700: .4byte 0x04000208 -_080C2704: .4byte 0x02038c28 -_080C2708: .4byte 0x04000006 -_080C270C: .4byte 0x04000012 + .pool thumb_func_end sub_80C26D4 thumb_func_start sub_80C2710 @@ -398570,7 +385450,7 @@ sub_80C2728: @ 80C2728 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _080C275C + ldr r5, =0x02039ce8 ldr r0, [r5] movs r1, 0xA6 lsls r1, 3 @@ -398588,7 +385468,7 @@ sub_80C2728: @ 80C2728 pop {r0} bx r0 .align 2, 0 -_080C275C: .4byte 0x02039ce8 + .pool thumb_func_end sub_80C2728 thumb_func_start sub_80C2760 @@ -398597,7 +385477,7 @@ sub_80C2760: @ 80C2760 sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080C2780 + ldr r1, =0x02039ce8 ldr r0, [r1] ldrb r0, [r0] adds r4, r1, 0 @@ -398606,13 +385486,12 @@ sub_80C2760: @ 80C2760 b _080C2ACA _080C2776: lsls r0, 2 - ldr r1, _080C2784 + ldr r1, =_080C2788 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C2780: .4byte 0x02039ce8 -_080C2784: .4byte _080C2788 + .pool .align 2, 0 _080C2788: .4byte _080C27CC @@ -398665,13 +385544,13 @@ _080C27F8: b _080C28D4 _080C280C: ldr r0, [r4] - ldr r1, _080C281C + ldr r1, =0x00000ef8 adds r0, r1 bl sub_80C4550 ldr r1, [r4] b _080C28D8 .align 2, 0 -_080C281C: .4byte 0x00000ef8 + .pool _080C2820: ldr r0, [r4] movs r2, 0xB3 @@ -398684,11 +385563,11 @@ _080C2830: bl sub_80C4630 b _080C28D4 _080C2836: - ldr r0, _080C2888 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 bne _080C2852 - ldr r0, _080C288C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 bne _080C2852 @@ -398699,9 +385578,9 @@ _080C2836: _080C2852: movs r6, 0x1 negs r6, r6 - ldr r4, _080C2890 + ldr r4, =0x02039ce8 ldr r0, [r4] - ldr r5, _080C2894 + ldr r5, =0x0000052c adds r0, r5 ldrh r2, [r0] adds r0, r6, 0 @@ -398716,16 +385595,12 @@ _080C2852: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _080C2898 + ldr r0, =sub_80C2690 + 1 bl SetVBlankCallback ldr r1, [r4] b _080C28D8 .align 2, 0 -_080C2888: .4byte 0x030030fc -_080C288C: .4byte 0x03003124 -_080C2890: .4byte 0x02039ce8 -_080C2894: .4byte 0x0000052c -_080C2898: .4byte sub_80C2690 + 1 + .pool _080C289C: bl fade_and_return_progress_probably lsls r0, 24 @@ -398741,13 +385616,13 @@ _080C28A8: _080C28B4: movs r0, 0xFB bl audio_play - ldr r0, _080C28C4 + ldr r0, =0x02039ce8 ldr r1, [r0] movs r0, 0xA strb r0, [r1] b _080C2ACA .align 2, 0 -_080C28C4: .4byte 0x02039ce8 + .pool _080C28C8: bl mplay_has_finished_maybe lsls r0, 24 @@ -398755,7 +385630,7 @@ _080C28C8: beq _080C28D4 b _080C2ACA _080C28D4: - ldr r0, _080C28E0 + ldr r0, =0x02039ce8 ldr r1, [r0] _080C28D8: ldrb r0, [r1] @@ -398763,14 +385638,14 @@ _080C28D8: strb r0, [r1] b _080C2ACA .align 2, 0 -_080C28E0: .4byte 0x02039ce8 + .pool _080C28E4: - ldr r0, _080C292C + ldr r0, =0x03003124 ldrb r5, [r0] cmp r5, 0 bne _080C290A ldr r0, [r4] - ldr r1, _080C2930 + ldr r1, =0x00000529 adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -398779,11 +385654,11 @@ _080C28E4: movs r0, 0x1 bl sub_80C438C ldr r0, [r4] - ldr r2, _080C2930 + ldr r2, =0x00000529 adds r0, r2 strb r5, [r0] _080C290A: - ldr r0, _080C2934 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -398792,16 +385667,13 @@ _080C290A: bl sub_80C4918 movs r0, 0xF9 bl audio_play - ldr r0, _080C2938 + ldr r0, =0x02039ce8 ldr r1, [r0] movs r0, 0xC strb r0, [r1] b _080C2ACA .align 2, 0 -_080C292C: .4byte 0x03003124 -_080C2930: .4byte 0x00000529 -_080C2934: .4byte 0x030022c0 -_080C2938: .4byte 0x02039ce8 + .pool _080C293C: movs r0, 0x2 ands r0, r1 @@ -398809,11 +385681,11 @@ _080C293C: bne _080C2946 b _080C2ACA _080C2946: - ldr r0, _080C2968 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080C2960 - ldr r4, _080C296C + ldr r4, =0x02039ce8 ldr r0, [r4] ldrb r0, [r0, 0x5] cmp r0, 0 @@ -398824,11 +385696,10 @@ _080C2946: _080C2960: movs r0, 0x1 negs r0, r0 - ldr r4, _080C296C + ldr r4, =0x02039ce8 b _080C2A74 .align 2, 0 -_080C2968: .4byte 0x03003124 -_080C296C: .4byte 0x02039ce8 + .pool _080C2970: bl sub_80C4940 lsls r0, 24 @@ -398843,21 +385714,21 @@ _080C297C: _080C2986: movs r0, 0xFB bl audio_play - ldr r0, _080C2998 + ldr r0, =0x02039ce8 ldr r1, [r0] movs r0, 0xB strb r0, [r1] b _080C2ACA .align 2, 0 -_080C2998: .4byte 0x02039ce8 + .pool _080C299C: - ldr r0, _080C29D0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _080C29F4 - ldr r0, _080C29D4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080C29DC @@ -398869,21 +385740,19 @@ _080C299C: cmp r0, 0x1 beq _080C2A14 _080C29C0: - ldr r0, _080C29D4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080C29DC movs r0, 0x1 negs r0, r0 - ldr r4, _080C29D8 + ldr r4, =0x02039ce8 b _080C2A74 .align 2, 0 -_080C29D0: .4byte 0x030022c0 -_080C29D4: .4byte 0x03003124 -_080C29D8: .4byte 0x02039ce8 + .pool _080C29DC: bl sub_80C4918 - ldr r0, _080C29F0 + ldr r0, =0x02039ce8 ldr r1, [r0] movs r0, 0xD strb r0, [r1] @@ -398891,13 +385760,13 @@ _080C29DC: bl audio_play b _080C2ACA .align 2, 0 -_080C29F0: .4byte 0x02039ce8 + .pool _080C29F4: movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080C2ACA - ldr r0, _080C2A1C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080C2A20 @@ -398914,20 +385783,20 @@ _080C2A14: strb r0, [r1] b _080C2ACA .align 2, 0 -_080C2A1C: .4byte 0x03003124 + .pool _080C2A20: movs r0, 0x1 negs r0, r0 - ldr r4, _080C2A28 + ldr r4, =0x02039ce8 b _080C2A74 .align 2, 0 -_080C2A28: .4byte 0x02039ce8 + .pool _080C2A2C: bl sub_800AC34 movs r0, 0 movs r1, 0x1 bl sub_81973C4 - ldr r2, _080C2A60 + ldr r2, =0x085ed042 movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -398940,16 +385809,15 @@ _080C2A2C: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _080C2A64 + ldr r0, =0x02039ce8 ldr r1, [r0] movs r0, 0x10 strb r0, [r1] b _080C2ACA .align 2, 0 -_080C2A60: .4byte 0x085ed042 -_080C2A64: .4byte 0x02039ce8 + .pool _080C2A68: - ldr r0, _080C2A90 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080C2ACA @@ -398957,7 +385825,7 @@ _080C2A68: negs r0, r0 _080C2A74: ldr r1, [r4] - ldr r2, _080C2A94 + ldr r2, =0x0000052c adds r1, r2 ldrh r1, [r1] str r1, [sp] @@ -398970,8 +385838,7 @@ _080C2A74: strb r0, [r1] b _080C2ACA .align 2, 0 -_080C2A90: .4byte 0x03003124 -_080C2A94: .4byte 0x0000052c + .pool _080C2A98: bl fade_and_return_progress_probably lsls r0, 24 @@ -398988,7 +385855,7 @@ _080C2AAA: bl sub_8087598 cmp r0, 0x1 beq _080C2ACA - ldr r0, _080C2AD4 + ldr r0, =0x02039ce8 ldr r1, [r0] movs r0, 0xA strb r0, [r1] @@ -399000,13 +385867,13 @@ _080C2ACA: pop {r0} bx r0 .align 2, 0 -_080C2AD4: .4byte 0x02039ce8 + .pool thumb_func_end sub_80C2760 thumb_func_start sub_80C2AD8 sub_80C2AD8: @ 80C2AD8 push {lr} - ldr r0, _080C2AF0 + ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x2] cmp r0, 0x5 @@ -399014,13 +385881,12 @@ sub_80C2AD8: @ 80C2AD8 b _080C2C64 _080C2AE6: lsls r0, 2 - ldr r1, _080C2AF4 + ldr r1, =_080C2AF8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C2AF0: .4byte 0x02039ce8 -_080C2AF4: .4byte _080C2AF8 + .pool .align 2, 0 _080C2AF8: .4byte _080C2B10 @@ -399030,167 +385896,145 @@ _080C2AF8: .4byte _080C2C04 .4byte _080C2C38 _080C2B10: - ldr r0, _080C2B24 + ldr r0, =0x02039ce8 ldr r1, [r0] - ldr r2, _080C2B28 + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080C2B34 - ldr r0, _080C2B2C - ldr r2, _080C2B30 + ldr r0, =0x08dd1f78 + ldr r2, =0x00000ef8 b _080C2C4A .align 2, 0 -_080C2B24: .4byte 0x02039ce8 -_080C2B28: .4byte 0x0000052a -_080C2B2C: .4byte 0x08dd1f78 -_080C2B30: .4byte 0x00000ef8 + .pool _080C2B34: - ldr r0, _080C2B3C - ldr r2, _080C2B40 + ldr r0, =0x08dd2ae0 + ldr r2, =0x00000ef8 b _080C2C4A .align 2, 0 -_080C2B3C: .4byte 0x08dd2ae0 -_080C2B40: .4byte 0x00000ef8 + .pool _080C2B44: - ldr r0, _080C2B58 + ldr r0, =0x02039ce8 ldr r1, [r0] - ldr r2, _080C2B5C + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080C2B68 - ldr r0, _080C2B60 - ldr r2, _080C2B64 + ldr r0, =0x08dd21b0 + ldr r2, =0x00000a48 b _080C2C4A .align 2, 0 -_080C2B58: .4byte 0x02039ce8 -_080C2B5C: .4byte 0x0000052a -_080C2B60: .4byte 0x08dd21b0 -_080C2B64: .4byte 0x00000a48 + .pool _080C2B68: - ldr r0, _080C2B70 - ldr r2, _080C2B74 + ldr r0, =0x08dd2d30 + ldr r2, =0x00000a48 b _080C2C4A .align 2, 0 -_080C2B70: .4byte 0x08dd2d30 -_080C2B74: .4byte 0x00000a48 + .pool _080C2B78: - ldr r0, _080C2B94 + ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x5] cmp r0, 0 bne _080C2BAC - ldr r2, _080C2B98 + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080C2BA0 - ldr r0, _080C2B9C + ldr r0, =0x08dd2010 adds r2, 0x6E b _080C2C4A .align 2, 0 -_080C2B94: .4byte 0x02039ce8 -_080C2B98: .4byte 0x0000052a -_080C2B9C: .4byte 0x08dd2010 + .pool _080C2BA0: - ldr r0, _080C2BA8 + ldr r0, =0x08dd2b78 movs r2, 0xB3 lsls r2, 3 b _080C2C4A .align 2, 0 -_080C2BA8: .4byte 0x08dd2b78 + .pool _080C2BAC: - ldr r2, _080C2BBC + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080C2BC4 - ldr r0, _080C2BC0 + ldr r0, =0x08dd228c adds r2, 0x6E b _080C2C4A .align 2, 0 -_080C2BBC: .4byte 0x0000052a -_080C2BC0: .4byte 0x08dd228c + .pool _080C2BC4: - ldr r0, _080C2BCC + ldr r0, =0x08dd2e5c movs r2, 0xB3 lsls r2, 3 b _080C2C4A .align 2, 0 -_080C2BCC: .4byte 0x08dd2e5c + .pool _080C2BD0: - ldr r0, _080C2BE4 + ldr r0, =0x02039ce8 ldr r1, [r0] - ldr r2, _080C2BE8 + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080C2BF4 - ldr r0, _080C2BEC - ldr r2, _080C2BF0 + ldr r0, =0x0856f5cc + ldr r2, =0x000013a8 b _080C2C4A .align 2, 0 -_080C2BE4: .4byte 0x02039ce8 -_080C2BE8: .4byte 0x0000052a -_080C2BEC: .4byte 0x0856f5cc -_080C2BF0: .4byte 0x000013a8 + .pool _080C2BF4: - ldr r0, _080C2BFC - ldr r2, _080C2C00 + ldr r0, =0x0856f814 + ldr r2, =0x000013a8 b _080C2C4A .align 2, 0 -_080C2BFC: .4byte 0x0856f814 -_080C2C00: .4byte 0x000013a8 + .pool _080C2C04: - ldr r0, _080C2C18 + ldr r0, =0x02039ce8 ldr r1, [r0] - ldr r2, _080C2C1C + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080C2C28 - ldr r0, _080C2C20 - ldr r2, _080C2C24 + ldr r0, =0x08dd1ab8 + ldr r2, =0x000019a8 b _080C2C4A .align 2, 0 -_080C2C18: .4byte 0x02039ce8 -_080C2C1C: .4byte 0x0000052a -_080C2C20: .4byte 0x08dd1ab8 -_080C2C24: .4byte 0x000019a8 + .pool _080C2C28: - ldr r0, _080C2C30 - ldr r2, _080C2C34 + ldr r0, =0x08dd246c + ldr r2, =0x000019a8 b _080C2C4A .align 2, 0 -_080C2C30: .4byte 0x08dd246c -_080C2C34: .4byte 0x000019a8 + .pool _080C2C38: - ldr r0, _080C2C54 + ldr r0, =0x02039ce8 ldr r1, [r0] - ldr r2, _080C2C58 + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 bne _080C2C6C - ldr r0, _080C2C5C - ldr r2, _080C2C60 + ldr r0, =0x0856f018 + ldr r2, =0x000017a8 _080C2C4A: adds r1, r2 bl LZ77UnCompWram b _080C2C6C .align 2, 0 -_080C2C54: .4byte 0x02039ce8 -_080C2C58: .4byte 0x0000052a -_080C2C5C: .4byte 0x0856f018 -_080C2C60: .4byte 0x000017a8 + .pool _080C2C64: movs r0, 0 strb r0, [r1, 0x2] movs r0, 0x1 b _080C2C78 _080C2C6C: - ldr r0, _080C2C7C + ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x2] adds r0, 0x1 @@ -399200,14 +386044,14 @@ _080C2C78: pop {r1} bx r1 .align 2, 0 -_080C2C7C: .4byte 0x02039ce8 + .pool thumb_func_end sub_80C2AD8 thumb_func_start sub_80C2C80 sub_80C2C80: @ 80C2C80 push {lr} sub sp, 0x8 - ldr r1, _080C2CA0 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -399218,13 +386062,12 @@ sub_80C2C80: @ 80C2C80 b _080C2DD8 _080C2C96: lsls r0, 2 - ldr r1, _080C2CA4 + ldr r1, =_080C2CA8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C2CA0: .4byte 0x030022c0 -_080C2CA4: .4byte _080C2CA8 + .pool .align 2, 0 _080C2CA8: .4byte _080C2CD4 @@ -399241,23 +386084,23 @@ _080C2CA8: _080C2CD4: bl sub_80C334C bl sub_80C3414 - ldr r1, _080C2CE8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080C2DCC .align 2, 0 -_080C2CE8: .4byte 0x030022c0 + .pool _080C2CEC: movs r1, 0xE0 lsls r1, 19 movs r0, 0 str r0, [sp] - ldr r0, _080C2D0C + ldr r0, =0x040000d4 mov r2, sp str r2, [r0] str r1, [r0, 0x4] - ldr r1, _080C2D10 + ldr r1, =0x85000100 str r1, [r0, 0x8] ldr r0, [r0, 0x8] movs r0, 0x87 @@ -399265,12 +386108,11 @@ _080C2CEC: adds r1, r3, r0 b _080C2DCC .align 2, 0 -_080C2D0C: .4byte 0x040000d4 -_080C2D10: .4byte 0x85000100 + .pool _080C2D14: - ldr r0, _080C2D40 + ldr r0, =0x02039ce8 ldr r0, [r0] - ldr r1, _080C2D44 + ldr r1, =0x0000052c adds r0, r1 ldrh r0, [r0] cmp r0, 0 @@ -399279,10 +386121,10 @@ _080C2D14: lsls r2, 19 add r1, sp, 0x4 strh r0, [r1] - ldr r0, _080C2D48 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _080C2D4C + ldr r1, =0x81000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] _080C2D36: @@ -399291,15 +386133,12 @@ _080C2D36: adds r1, r3, r2 b _080C2DCC .align 2, 0 -_080C2D40: .4byte 0x02039ce8 -_080C2D44: .4byte 0x0000052c -_080C2D48: .4byte 0x040000d4 -_080C2D4C: .4byte 0x81000200 + .pool _080C2D50: bl reset_all_obj_data bl gpu_pal_allocator_reset bl sub_80A1A74 - ldr r1, _080C2D70 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -399310,40 +386149,40 @@ _080C2D6A: bl sub_80C3388 b _080C2DC4 .align 2, 0 -_080C2D70: .4byte 0x030022c0 + .pool _080C2D74: bl sub_80C41D8 - ldr r1, _080C2D84 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080C2DCC .align 2, 0 -_080C2D84: .4byte 0x030022c0 + .pool _080C2D88: bl sub_80C2AD8 b _080C2DBC _080C2D8E: bl sub_80C4330 - ldr r1, _080C2D9C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080C2DCC .align 2, 0 -_080C2D9C: .4byte 0x030022c0 + .pool _080C2DA0: bl sub_80C3278 b _080C2DC4 _080C2DA6: bl sub_80C3548 - ldr r1, _080C2DB4 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _080C2DCC .align 2, 0 -_080C2DB4: .4byte 0x030022c0 + .pool _080C2DB8: bl sub_80C43A8 _080C2DBC: @@ -399352,7 +386191,7 @@ _080C2DBC: cmp r0, 0x1 bne _080C2DDC _080C2DC4: - ldr r1, _080C2DD4 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -399362,7 +386201,7 @@ _080C2DCC: strb r0, [r1] b _080C2DDC .align 2, 0 -_080C2DD4: .4byte 0x030022c0 + .pool _080C2DD8: bl sub_80C3404 _080C2DDC: @@ -399393,13 +386232,13 @@ sub_80C2DFC: @ 80C2DFC movs r5, 0 _080C2E00: lsls r4, r5, 1 - ldr r1, _080C2E24 + ldr r1, =0x000008c4 adds r0, r4, r1 bl flag_check lsls r0, 24 cmp r0, 0 beq _080C2E1E - ldr r1, _080C2E28 + ldr r1, =0x000008c5 adds r0, r4, r1 bl flag_check lsls r0, 24 @@ -399409,8 +386248,7 @@ _080C2E1E: movs r0, 0 b _080C2E38 .align 2, 0 -_080C2E24: .4byte 0x000008c4 -_080C2E28: .4byte 0x000008c5 + .pool _080C2E2C: adds r0, r5, 0x1 lsls r0, 24 @@ -399510,7 +386348,7 @@ sub_80C2EC4: @ 80C2EC4 lsls r1, 24 lsrs r1, 24 mov r8, r1 - ldr r6, _080C2FA4 + ldr r6, =0x03005d90 ldr r1, [r6] ldrb r0, [r1, 0x8] strb r0, [r5] @@ -399535,7 +386373,7 @@ _080C2EF6: strh r1, [r5, 0x8] ands r4, r2 strh r4, [r5, 0xA] - ldr r1, _080C2FA8 + ldr r1, =0x000003e7 cmp r0, r1 bls _080C2F14 strh r1, [r5, 0x6] @@ -399543,7 +386381,7 @@ _080C2EF6: strh r0, [r5, 0x8] strh r0, [r5, 0xA] _080C2F14: - ldr r0, _080C2FAC + ldr r0, =0x00000861 bl flag_check strb r0, [r5, 0x2] bl sub_80C08E4 @@ -399556,7 +386394,7 @@ _080C2F14: ldrb r0, [r0, 0xA] orrs r0, r1 strh r0, [r5, 0xE] - ldr r4, _080C2FB0 + ldr r4, =0x0000270f movs r0, 0x17 adds r1, r4, 0 bl sav12_xor_get_clamped_above @@ -399565,11 +386403,11 @@ _080C2F14: adds r1, r4, 0 bl sav12_xor_get_clamped_above strh r0, [r5, 0x16] - ldr r1, _080C2FB4 + ldr r1, =0x0000ffff movs r0, 0x15 bl sav12_xor_get_clamped_above strh r0, [r5, 0x20] - ldr r4, _080C2FB8 + ldr r4, =0x03005d8c ldr r0, [r4] movs r1, 0x92 lsls r1, 3 @@ -399582,7 +386420,7 @@ _080C2F14: adds r6, r5, 0 adds r6, 0x28 ldr r0, [r4] - ldr r1, _080C2FBC + ldr r1, =0x00002bb0 adds r3, r0, r1 _080C2F74: lsls r0, r2, 1 @@ -399595,7 +386433,7 @@ _080C2F74: lsrs r2, r0, 24 cmp r2, 0x3 bls _080C2F74 - ldr r0, _080C2FA4 + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r7, 0 bl gf_strcpy @@ -399608,13 +386446,7 @@ _080C2F74: beq _080C2FCC b _080C3014 .align 2, 0 -_080C2FA4: .4byte 0x03005d90 -_080C2FA8: .4byte 0x000003e7 -_080C2FAC: .4byte 0x00000861 -_080C2FB0: .4byte 0x0000270f -_080C2FB4: .4byte 0x0000ffff -_080C2FB8: .4byte 0x03005d8c -_080C2FBC: .4byte 0x00002bb0 + .pool _080C2FC0: mov r1, r8 cmp r1, 0x2 @@ -399623,11 +386455,11 @@ _080C2FC0: strh r0, [r5, 0x18] strh r0, [r5, 0x1A] _080C2FCC: - ldr r1, _080C2FFC + ldr r1, =0x000003e7 movs r0, 0x23 bl sav12_xor_get_clamped_above strh r0, [r5, 0x1C] - ldr r1, _080C3000 + ldr r1, =0x0000ffff movs r0, 0x22 bl sav12_xor_get_clamped_above strh r0, [r5, 0x1E] @@ -399644,8 +386476,7 @@ _080C2FF0: strb r0, [r5, 0x1] b _080C3014 .align 2, 0 -_080C2FFC: .4byte 0x000003e7 -_080C3000: .4byte 0x0000ffff + .pool _080C3004: movs r1, 0 movs r0, 0 @@ -399683,9 +386514,9 @@ sub_80C3020: @ 80C3020 adds r1, r4, 0 adds r1, 0x60 strh r0, [r1] - ldr r0, _080C3078 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _080C307C + ldr r2, =0x00000eba adds r0, r2 ldrh r0, [r0] adds r2, r4, 0 @@ -399701,18 +386532,16 @@ _080C3066: ldrb r0, [r4] cmp r0, 0x1 bne _080C3084 - ldr r2, _080C3080 + ldr r2, =0x08329d54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 adds r0, 0x8 b _080C308C .align 2, 0 -_080C3078: .4byte 0x03005d90 -_080C307C: .4byte 0x00000eba -_080C3080: .4byte 0x08329d54 + .pool _080C3084: - ldr r2, _080C30A0 + ldr r2, =0x08329d54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 @@ -399727,7 +386556,7 @@ _080C308C: pop {r0} bx r0 .align 2, 0 -_080C30A0: .4byte 0x08329d54 + .pool thumb_func_end sub_80C3020 thumb_func_start sub_80C30A4 @@ -399748,9 +386577,9 @@ sub_80C30A4: @ 80C30A4 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x3A] - ldr r1, _080C30F4 + ldr r1, =0x03005d90 ldr r1, [r1] - ldr r2, _080C30F8 + ldr r2, =0x00000eba adds r1, r2 ldrh r1, [r1] strh r1, [r4, 0x3C] @@ -399763,18 +386592,16 @@ _080C30E0: ldrb r0, [r4] cmp r0, 0x1 bne _080C3100 - ldr r2, _080C30FC + ldr r2, =0x08329d54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 adds r0, 0x8 b _080C3108 .align 2, 0 -_080C30F4: .4byte 0x03005d90 -_080C30F8: .4byte 0x00000eba -_080C30FC: .4byte 0x08329d54 + .pool _080C3100: - ldr r2, _080C311C + ldr r2, =0x08329d54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 @@ -399789,7 +386616,7 @@ _080C3108: pop {r0} bx r0 .align 2, 0 -_080C311C: .4byte 0x08329d54 + .pool thumb_func_end sub_80C30A4 thumb_func_start sub_80C3120 @@ -399855,7 +386682,7 @@ _080C318A: thumb_func_start sub_80C3190 sub_80C3190: @ 80C3190 push {r4,r5,lr} - ldr r4, _080C3258 + ldr r4, =0x02039ce8 ldr r0, [r4] movs r1, 0 strb r1, [r0, 0xA] @@ -399876,7 +386703,7 @@ sub_80C3190: @ 80C3190 movs r2, 0x8 bl memset ldr r1, [r4] - ldr r2, _080C325C + ldr r2, =0x00000536 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -399886,12 +386713,12 @@ sub_80C3190: @ 80C3190 strb r0, [r1, 0xA] _080C31CE: ldr r1, [r4] - ldr r3, _080C3260 + ldr r3, =0x0000053a adds r0, r1, r3 ldrh r0, [r0] cmp r0, 0 bne _080C31E4 - ldr r2, _080C3264 + ldr r2, =0x0000053c adds r0, r1, r2 ldr r0, [r0] cmp r0, 0 @@ -399901,7 +386728,7 @@ _080C31E4: adds r0, 0x1 strb r0, [r1, 0xB] _080C31EA: - ldr r2, _080C3258 + ldr r2, =0x02039ce8 ldr r1, [r2] movs r3, 0xA9 lsls r3, 3 @@ -399914,7 +386741,7 @@ _080C31EA: strb r0, [r1, 0xC] _080C3200: ldr r1, [r2] - ldr r3, _080C3268 + ldr r3, =0x00000554 adds r0, r1, r3 ldrh r0, [r0] cmp r0, 0 @@ -399924,7 +386751,7 @@ _080C3200: strb r0, [r1, 0x10] _080C3212: ldr r1, [r2] - ldr r2, _080C326C + ldr r2, =0x0000054c adds r0, r1, r2 ldr r0, [r0] cmp r0, 0 @@ -399934,7 +386761,7 @@ _080C3212: strb r0, [r1, 0xD] _080C3224: movs r5, 0 - ldr r4, _080C3270 + ldr r4, =0x00000867 _080C3228: lsls r0, r4, 16 lsrs r0, 16 @@ -399942,7 +386769,7 @@ _080C3228: lsls r0, 24 cmp r0, 0 beq _080C3244 - ldr r0, _080C3258 + ldr r0, =0x02039ce8 ldr r1, [r0] adds r1, 0x11 adds r1, r5 @@ -399954,21 +386781,14 @@ _080C3244: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080C3274 + ldr r0, =0x0000086e cmp r4, r0 bls _080C3228 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080C3258: .4byte 0x02039ce8 -_080C325C: .4byte 0x00000536 -_080C3260: .4byte 0x0000053a -_080C3264: .4byte 0x0000053c -_080C3268: .4byte 0x00000554 -_080C326C: .4byte 0x0000054c -_080C3270: .4byte 0x00000867 -_080C3274: .4byte 0x0000086e + .pool thumb_func_end sub_80C3190 thumb_func_start sub_80C3278 @@ -400004,7 +386824,7 @@ sub_80C3278: @ 80C3278 movs r0, 0x40 movs r1, 0xF0 bl lcd_io_set - ldr r0, _080C32DC + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080C32E0 @@ -400012,7 +386832,7 @@ sub_80C3278: @ 80C3278 bl enable_irqs b _080C32E6 .align 2, 0 -_080C32DC: .4byte 0x03003124 + .pool _080C32E0: movs r0, 0x3 bl enable_irqs @@ -400036,7 +386856,7 @@ sub_80C32EC: @ 80C32EC bgt _080C3306 movs r2, 0 _080C3306: - ldr r4, _080C3344 + ldr r4, =0x02039ce8 ldr r0, [r4] movs r1, 0xA5 lsls r1, 3 @@ -400051,7 +386871,7 @@ _080C3306: movs r0, 0x54 bl lcd_io_set ldr r0, [r4] - ldr r1, _080C3348 + ldr r1, =0x00007ca8 adds r0, r1 ldrh r2, [r0] lsls r1, r2, 8 @@ -400066,8 +386886,7 @@ _080C3306: pop {r0} bx r0 .align 2, 0 -_080C3344: .4byte 0x02039ce8 -_080C3348: .4byte 0x00007ca8 + .pool thumb_func_end sub_80C32EC thumb_func_start sub_80C334C @@ -400101,7 +386920,7 @@ sub_80C3388: @ 80C3388 push {lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080C33FC + ldr r1, =0x0856fab4 movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -400137,26 +386956,25 @@ sub_80C3388: @ 80C3388 movs r1, 0 movs r2, 0 bl bg_change_y_offset - ldr r0, _080C3400 + ldr r0, =0x0856fac4 bl Window_InitFromTemplates bl TextBox_ResetSomeField bl sub_81973A4 pop {r0} bx r0 .align 2, 0 -_080C33FC: .4byte 0x0856fab4 -_080C3400: .4byte 0x0856fac4 + .pool thumb_func_end sub_80C3388 thumb_func_start sub_80C3404 sub_80C3404: @ 80C3404 push {lr} - ldr r0, _080C3410 + ldr r0, =sub_80C2710 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080C3410: .4byte sub_80C2710 + 1 + .pool thumb_func_end sub_80C3404 thumb_func_start sub_80C3414 @@ -400164,7 +386982,7 @@ sub_80C3414: @ 80C3414 push {lr} bl clear_tasks bl remove_some_task - ldr r0, _080C3434 + ldr r0, =sub_80C2760 + 1 movs r1, 0 bl AddTask bl sub_80C4EE4 @@ -400172,25 +386990,24 @@ sub_80C3414: @ 80C3414 pop {r0} bx r0 .align 2, 0 -_080C3434: .4byte sub_80C2760 + 1 + .pool thumb_func_end sub_80C3414 thumb_func_start sub_80C3438 sub_80C3438: @ 80C3438 push {lr} - ldr r0, _080C3450 + ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x1] cmp r0, 0x5 bhi _080C3494 lsls r0, 2 - ldr r1, _080C3454 + ldr r1, =_080C3458 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C3450: .4byte 0x02039ce8 -_080C3454: .4byte _080C3458 + .pool .align 2, 0 _080C3458: .4byte _080C3470 @@ -400223,7 +387040,7 @@ _080C3494: movs r0, 0x1 b _080C34A8 _080C349C: - ldr r0, _080C34AC + ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x1] adds r0, 0x1 @@ -400233,25 +387050,24 @@ _080C34A8: pop {r1} bx r1 .align 2, 0 -_080C34AC: .4byte 0x02039ce8 + .pool thumb_func_end sub_80C3438 thumb_func_start sub_80C34B0 sub_80C34B0: @ 80C34B0 push {lr} - ldr r0, _080C34C8 + ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x1] cmp r0, 0x7 bhi _080C352C lsls r0, 2 - ldr r1, _080C34CC + ldr r1, =_080C34D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C34C8: .4byte 0x02039ce8 -_080C34CC: .4byte _080C34D0 + .pool .align 2, 0 _080C34D0: .4byte _080C34F0 @@ -400295,7 +387111,7 @@ _080C352C: movs r0, 0x1 b _080C3540 _080C3534: - ldr r0, _080C3544 + ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x1] adds r0, 0x1 @@ -400305,7 +387121,7 @@ _080C3540: pop {r1} bx r1 .align 2, 0 -_080C3544: .4byte 0x02039ce8 + .pool thumb_func_end sub_80C34B0 thumb_func_start sub_80C3548 @@ -400328,29 +387144,29 @@ sub_80C3548: @ 80C3548 sub_80C3574: @ 80C3574 push {r4,r5,lr} sub sp, 0x2C - ldr r1, _080C35C8 + ldr r1, =0x085ecf71 add r0, sp, 0xC bl gf_strcpy adds r5, r0, 0 - ldr r4, _080C35CC + ldr r4, =0x02039ce8 ldr r1, [r4] - ldr r0, _080C35D0 + ldr r0, =0x00000564 adds r1, r0 adds r0, r5, 0 bl gf_strcpy ldr r0, [r4] - ldr r1, _080C35D4 + ldr r1, =0x00007caa adds r0, r1 ldrb r1, [r0] adds r0, r5, 0 bl sub_8009308 ldr r0, [r4] - ldr r1, _080C35D8 + ldr r1, =0x0000052a adds r0, r1 ldrb r0, [r0] cmp r0, 0 bne _080C35E0 - ldr r0, _080C35DC + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -400364,14 +387180,9 @@ sub_80C3574: @ 80C3574 bl box_print b _080C35FA .align 2, 0 -_080C35C8: .4byte 0x085ecf71 -_080C35CC: .4byte 0x02039ce8 -_080C35D0: .4byte 0x00000564 -_080C35D4: .4byte 0x00007caa -_080C35D8: .4byte 0x0000052a -_080C35DC: .4byte 0x0856fb0c + .pool _080C35E0: - ldr r0, _080C3604 + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -400389,26 +387200,26 @@ _080C35FA: pop {r0} bx r0 .align 2, 0 -_080C3604: .4byte 0x0856fb0c + .pool thumb_func_end sub_80C3574 thumb_func_start sub_80C3608 sub_80C3608: @ 80C3608 push {r4,lr} sub sp, 0x2C - ldr r1, _080C3640 + ldr r1, =0x085ecf78 add r0, sp, 0xC bl gf_strcpy - ldr r4, _080C3644 + ldr r4, =0x02039ce8 ldr r1, [r4] - ldr r2, _080C3648 + ldr r2, =0x00000542 adds r1, r2 ldrh r1, [r1] movs r2, 0x2 movs r3, 0x5 bl decimal_int_to_string ldr r0, [r4] - ldr r1, _080C364C + ldr r1, =0x0000052a adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -400420,10 +387231,7 @@ sub_80C3608: @ 80C3608 adds r0, 0x84 b _080C365C .align 2, 0 -_080C3640: .4byte 0x085ecf78 -_080C3644: .4byte 0x02039ce8 -_080C3648: .4byte 0x00000542 -_080C364C: .4byte 0x0000052a + .pool _080C3650: movs r0, 0x1 add r1, sp, 0xC @@ -400434,7 +387242,7 @@ _080C365C: movs r3, 0x9 lsls r2, r0, 24 lsrs r2, 24 - ldr r0, _080C3680 + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -400449,26 +387257,26 @@ _080C365C: pop {r0} bx r0 .align 2, 0 -_080C3680: .4byte 0x0856fb0c + .pool thumb_func_end sub_80C3608 thumb_func_start sub_80C3684 sub_80C3684: @ 80C3684 push {r4,r5,lr} sub sp, 0xC - ldr r0, _080C36B4 + ldr r0, =0x02039ce8 ldr r0, [r0] - ldr r1, _080C36B8 + ldr r1, =0x0000052b adds r0, r1 ldrb r0, [r0] cmp r0, 0 bne _080C36C4 - ldr r0, _080C36BC + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, _080C36C0 + ldr r0, =0x085ecf7e str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -400477,17 +387285,14 @@ sub_80C3684: @ 80C3684 bl box_print b _080C36DE .align 2, 0 -_080C36B4: .4byte 0x02039ce8 -_080C36B8: .4byte 0x0000052b -_080C36BC: .4byte 0x0856fb0c -_080C36C0: .4byte 0x085ecf7e + .pool _080C36C4: - ldr r0, _080C3718 + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, _080C371C + ldr r0, =0x085ecf7e str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -400495,8 +387300,8 @@ _080C36C4: movs r3, 0x39 bl box_print _080C36DE: - ldr r0, _080C3720 - ldr r4, _080C3724 + ldr r0, =0x02021cc4 + ldr r4, =0x02039ce8 ldr r1, [r4] movs r2, 0xAB lsls r2, 3 @@ -400505,12 +387310,12 @@ _080C36DE: movs r2, 0 movs r3, 0x6 bl decimal_int_to_string - ldr r5, _080C3728 - ldr r1, _080C372C + ldr r5, =0x02021fc4 + ldr r1, =0x085e969c adds r0, r5, 0 bl ExpandTextCodes ldr r0, [r4] - ldr r1, _080C3730 + ldr r1, =0x0000052b adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -400522,13 +387327,7 @@ _080C36DE: movs r3, 0x38 b _080C3740 .align 2, 0 -_080C3718: .4byte 0x0856fb0c -_080C371C: .4byte 0x085ecf7e -_080C3720: .4byte 0x02021cc4 -_080C3724: .4byte 0x02039ce8 -_080C3728: .4byte 0x02021fc4 -_080C372C: .4byte 0x085e969c -_080C3730: .4byte 0x0000052b + .pool _080C3734: movs r0, 0x1 adds r1, r5, 0 @@ -400538,12 +387337,12 @@ _080C3734: _080C3740: lsls r2, r0, 24 lsrs r2, 24 - ldr r0, _080C3764 + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, _080C3768 + ldr r0, =0x02021fc4 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -400553,8 +387352,7 @@ _080C3740: pop {r0} bx r0 .align 2, 0 -_080C3764: .4byte 0x0856fb0c -_080C3768: .4byte 0x02021fc4 + .pool thumb_func_end sub_80C3684 thumb_func_start sub_80C376C @@ -400580,24 +387378,24 @@ _080C3784: sub_80C378C: @ 80C378C push {r4,r5,lr} sub sp, 0xC - ldr r0, _080C37C8 + ldr r0, =0x00000861 bl flag_check lsls r0, 24 cmp r0, 0 beq _080C386E - ldr r0, _080C37CC + ldr r0, =0x02039ce8 ldr r0, [r0] - ldr r1, _080C37D0 + ldr r1, =0x0000052b adds r0, r1 ldrb r0, [r0] cmp r0, 0 bne _080C37DC - ldr r0, _080C37D4 + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, _080C37D8 + ldr r0, =0x085ecf86 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -400606,18 +387404,14 @@ sub_80C378C: @ 80C378C bl box_print b _080C37F6 .align 2, 0 -_080C37C8: .4byte 0x00000861 -_080C37CC: .4byte 0x02039ce8 -_080C37D0: .4byte 0x0000052b -_080C37D4: .4byte 0x0856fb0c -_080C37D8: .4byte 0x085ecf86 + .pool _080C37DC: - ldr r0, _080C3830 + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, _080C3834 + ldr r0, =0x085ecf86 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -400625,8 +387419,8 @@ _080C37DC: movs r3, 0x49 bl box_print _080C37F6: - ldr r5, _080C3838 - ldr r4, _080C383C + ldr r5, =0x02021fc4 + ldr r4, =0x02039ce8 ldr r0, [r4] movs r1, 0xA8 lsls r1, 3 @@ -400636,10 +387430,10 @@ _080C37F6: movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r1, _080C3840 + ldr r1, =0x085ecf8e bl gf_strcpy ldr r0, [r4] - ldr r1, _080C3844 + ldr r1, =0x0000052b adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -400651,12 +387445,7 @@ _080C37F6: movs r3, 0x48 b _080C3854 .align 2, 0 -_080C3830: .4byte 0x0856fb0c -_080C3834: .4byte 0x085ecf86 -_080C3838: .4byte 0x02021fc4 -_080C383C: .4byte 0x02039ce8 -_080C3840: .4byte 0x085ecf8e -_080C3844: .4byte 0x0000052b + .pool _080C3848: movs r0, 0x1 adds r1, r5, 0 @@ -400666,12 +387455,12 @@ _080C3848: _080C3854: lsls r2, r0, 24 lsrs r2, 24 - ldr r0, _080C3878 + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, _080C387C + ldr r0, =0x02021fc4 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -400682,8 +387471,7 @@ _080C386E: pop {r0} bx r0 .align 2, 0 -_080C3878: .4byte 0x0856fb0c -_080C387C: .4byte 0x02021fc4 + .pool thumb_func_end sub_80C378C thumb_func_start sub_80C3880 @@ -400694,19 +387482,19 @@ sub_80C3880: @ 80C3880 mov r5, r8 push {r5-r7} sub sp, 0xC - ldr r0, _080C38B8 + ldr r0, =0x02039ce8 ldr r0, [r0] - ldr r1, _080C38BC + ldr r1, =0x0000052b adds r0, r1 ldrb r0, [r0] cmp r0, 0 bne _080C38C8 - ldr r0, _080C38C0 + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, _080C38C4 + ldr r0, =0x085ecf99 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -400715,17 +387503,14 @@ sub_80C3880: @ 80C3880 bl box_print b _080C38E2 .align 2, 0 -_080C38B8: .4byte 0x02039ce8 -_080C38BC: .4byte 0x0000052b -_080C38C0: .4byte 0x0856fb0c -_080C38C4: .4byte 0x085ecf99 + .pool _080C38C8: - ldr r0, _080C38FC + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, _080C3900 + ldr r0, =0x085ecf99 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -400733,12 +387518,12 @@ _080C38C8: movs r3, 0x59 bl box_print _080C38E2: - ldr r0, _080C3904 + ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x5] cmp r0, 0 beq _080C390C - ldr r2, _080C3908 + ldr r2, =0x00000544 adds r0, r1, r2 ldrh r5, [r0] adds r2, 0x2 @@ -400746,17 +387531,14 @@ _080C38E2: ldrh r6, [r0] b _080C3914 .align 2, 0 -_080C38FC: .4byte 0x0856fb0c -_080C3900: .4byte 0x085ecf99 -_080C3904: .4byte 0x02039ce8 -_080C3908: .4byte 0x00000544 + .pool _080C390C: - ldr r0, _080C3944 + ldr r0, =0x03005d90 ldr r0, [r0] ldrh r5, [r0, 0xE] ldrb r6, [r0, 0x10] _080C3914: - ldr r0, _080C3948 + ldr r0, =0x000003e7 cmp r5, r0 bls _080C391C adds r5, r0, 0 @@ -400765,14 +387547,14 @@ _080C391C: bls _080C3922 movs r6, 0x3B _080C3922: - ldr r1, _080C394C + ldr r1, =0x085ecf8f movs r0, 0x1 movs r2, 0 bl font_get_width_of_string mov r10, r0 - ldr r0, _080C3950 + ldr r0, =0x02039ce8 ldr r0, [r0] - ldr r1, _080C3954 + ldr r1, =0x0000052b adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -400781,11 +387563,7 @@ _080C3922: movs r4, 0x58 b _080C395C .align 2, 0 -_080C3944: .4byte 0x03005d90 -_080C3948: .4byte 0x000003e7 -_080C394C: .4byte 0x085ecf8f -_080C3950: .4byte 0x02039ce8 -_080C3954: .4byte 0x0000052b + .pool _080C3958: movs r7, 0x80 movs r4, 0x59 @@ -400804,7 +387582,7 @@ _080C395C: movs r1, 0 adds r3, r4, 0 bl Window_FillPixelRect - ldr r2, _080C3A04 + ldr r2, =0x02021fc4 mov r9, r2 mov r0, r9 adds r1, r5, 0 @@ -400813,7 +387591,7 @@ _080C395C: bl decimal_int_to_string lsls r2, r7, 24 lsrs r2, 24 - ldr r0, _080C3A08 + ldr r0, =0x0856fb0c mov r8, r0 str r0, [sp] movs r5, 0x1 @@ -400828,8 +387606,8 @@ _080C395C: adds r7, 0x12 lsls r2, r7, 24 lsrs r2, 24 - ldr r1, _080C3A0C - ldr r0, _080C3A10 + ldr r1, =0x0856fb40 + ldr r0, =0x02039ce8 ldr r0, [r0] ldrb r0, [r0, 0x7] lsls r0, 2 @@ -400837,7 +387615,7 @@ _080C395C: ldr r0, [r0] str r0, [sp] str r5, [sp, 0x4] - ldr r0, _080C3A14 + ldr r0, =0x085ecf8f str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -400869,11 +387647,7 @@ _080C395C: pop {r0} bx r0 .align 2, 0 -_080C3A04: .4byte 0x02021fc4 -_080C3A08: .4byte 0x0856fb0c -_080C3A0C: .4byte 0x0856fb40 -_080C3A10: .4byte 0x02039ce8 -_080C3A14: .4byte 0x085ecf8f + .pool thumb_func_end sub_80C3880 thumb_func_start sub_80C3A18 @@ -400882,19 +387656,19 @@ sub_80C3A18: @ 80C3A18 mov r7, r8 push {r7} sub sp, 0xC - ldr r7, _080C3ADC + ldr r7, =0x02039ce8 ldr r1, [r7] ldrb r0, [r1, 0x5] cmp r0, 0 beq _080C3ACE - ldr r0, _080C3AE0 + ldr r0, =0x0856fb48 mov r8, r0 - ldr r4, _080C3AE4 + ldr r4, =0x0000052b adds r0, r1, r4 ldrb r0, [r0] add r0, r8 ldrb r3, [r0] - ldr r6, _080C3AE8 + ldr r6, =0x0856fb0c str r6, [sp] movs r5, 0x1 negs r5, r5 @@ -400927,7 +387701,7 @@ sub_80C3A18: @ 80C3A18 movs r0, 0x1 movs r1, 0x1 bl box_print - ldr r0, _080C3AEC + ldr r0, =0x0856fb4a mov r8, r0 ldr r1, [r7] adds r0, r1, r4 @@ -400971,68 +387745,59 @@ _080C3ACE: pop {r0} bx r0 .align 2, 0 -_080C3ADC: .4byte 0x02039ce8 -_080C3AE0: .4byte 0x0856fb48 -_080C3AE4: .4byte 0x0000052b -_080C3AE8: .4byte 0x0856fb0c -_080C3AEC: .4byte 0x0856fb4a + .pool thumb_func_end sub_80C3A18 thumb_func_start sub_80C3AF0 sub_80C3AF0: @ 80C3AF0 push {r4,lr} - ldr r4, _080C3B38 + ldr r4, =0x02039ce8 ldr r1, [r4] adds r0, r1, 0 adds r0, 0x4D - ldr r2, _080C3B3C + ldr r2, =0x00000564 adds r1, r2 bl gf_strcpy ldr r1, [r4] adds r0, r1, 0 adds r0, 0x4D - ldr r2, _080C3B40 + ldr r2, =0x00007caa adds r1, r2 ldrb r1, [r1] bl sub_8009308 ldr r1, [r4] - ldr r2, _080C3B44 + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080C3B30 - ldr r0, _080C3B48 + ldr r0, =0x02021cc4 adds r1, 0x4D bl gf_strcpy ldr r0, [r4] adds r0, 0x4D - ldr r1, _080C3B4C + ldr r1, =0x085ecfa6 bl ExpandTextCodes _080C3B30: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C3B38: .4byte 0x02039ce8 -_080C3B3C: .4byte 0x00000564 -_080C3B40: .4byte 0x00007caa -_080C3B44: .4byte 0x0000052a -_080C3B48: .4byte 0x02021cc4 -_080C3B4C: .4byte 0x085ecfa6 + .pool thumb_func_end sub_80C3AF0 thumb_func_start sub_80C3B50 sub_80C3B50: @ 80C3B50 push {r4,lr} sub sp, 0xC - ldr r4, _080C3B80 + ldr r4, =0x02039ce8 ldr r1, [r4] - ldr r2, _080C3B84 + ldr r2, =0x0000052b adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 bne _080C3B8C - ldr r0, _080C3B88 + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -401047,9 +387812,7 @@ sub_80C3B50: @ 80C3B50 bl box_print b _080C3BB6 .align 2, 0 -_080C3B80: .4byte 0x02039ce8 -_080C3B84: .4byte 0x0000052b -_080C3B88: .4byte 0x0856fb0c + .pool _080C3B8C: adds r1, 0x4D movs r0, 0x1 @@ -401058,7 +387821,7 @@ _080C3B8C: adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _080C3BC0 + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -401076,35 +387839,35 @@ _080C3BB6: pop {r0} bx r0 .align 2, 0 -_080C3BC0: .4byte 0x0856fb0c + .pool thumb_func_end sub_80C3B50 thumb_func_start sub_80C3BC4 sub_80C3BC4: @ 80C3BC4 push {r4,lr} - ldr r4, _080C3C14 + ldr r4, =0x02039ce8 ldr r1, [r4] ldrb r0, [r1, 0xB] cmp r0, 0 beq _080C3C0E - ldr r0, _080C3C18 - ldr r2, _080C3C1C + ldr r0, =0x02021cc4 + ldr r2, =0x0000053a adds r1, r2 ldrh r1, [r1] movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string - ldr r0, _080C3C20 + ldr r0, =0x02021dc4 ldr r1, [r4] - ldr r2, _080C3C24 + ldr r2, =0x0000053c adds r1, r2 ldrh r1, [r1] movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r0, _080C3C28 + ldr r0, =0x02021ec4 ldr r1, [r4] - ldr r2, _080C3C2C + ldr r2, =0x0000053e adds r1, r2 ldrh r1, [r1] movs r2, 0x2 @@ -401112,21 +387875,14 @@ sub_80C3BC4: @ 80C3BC4 bl decimal_int_to_string ldr r0, [r4] adds r0, 0x93 - ldr r1, _080C3C30 + ldr r1, =0x0856fb4c bl ExpandTextCodes _080C3C0E: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C3C14: .4byte 0x02039ce8 -_080C3C18: .4byte 0x02021cc4 -_080C3C1C: .4byte 0x0000053a -_080C3C20: .4byte 0x02021dc4 -_080C3C24: .4byte 0x0000053c -_080C3C28: .4byte 0x02021ec4 -_080C3C2C: .4byte 0x0000053e -_080C3C30: .4byte 0x0856fb4c + .pool thumb_func_end sub_80C3BC4 thumb_func_start sub_80C3C34 @@ -401140,10 +387896,10 @@ sub_80C3C34: @ 80C3C34 adds r4, r0, 0 mov r9, r2 mov r10, r3 - ldr r2, _080C3CB8 - ldr r6, _080C3CBC + ldr r2, =0x0856fb55 + ldr r6, =0x02039ce8 ldr r0, [r6] - ldr r5, _080C3CC0 + ldr r5, =0x0000052b adds r0, r5 ldrb r0, [r0] adds r0, r2 @@ -401153,7 +387909,7 @@ sub_80C3C34: @ 80C3C34 lsls r0, 22 adds r4, r0 lsrs r4, 24 - ldr r0, _080C3CC4 + ldr r0, =0x0856fb0c str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -401164,7 +387920,7 @@ sub_80C3C34: @ 80C3C34 movs r1, 0x1 adds r3, r4, 0 bl box_print - ldr r1, _080C3CC8 + ldr r1, =0x0856fb57 ldr r0, [r6] adds r0, r5 ldrb r0, [r0] @@ -401195,47 +387951,41 @@ sub_80C3C34: @ 80C3C34 pop {r0} bx r0 .align 2, 0 -_080C3CB8: .4byte 0x0856fb55 -_080C3CBC: .4byte 0x02039ce8 -_080C3CC0: .4byte 0x0000052b -_080C3CC4: .4byte 0x0856fb0c -_080C3CC8: .4byte 0x0856fb57 + .pool thumb_func_end sub_80C3C34 thumb_func_start sub_80C3CCC sub_80C3CCC: @ 80C3CCC push {lr} - ldr r0, _080C3CE8 + ldr r0, =0x02039ce8 ldr r2, [r0] ldrb r0, [r2, 0xB] cmp r0, 0 beq _080C3CE4 - ldr r1, _080C3CEC + ldr r1, =0x085ecfb8 adds r2, 0x93 - ldr r3, _080C3CF0 + ldr r3, =0x0856fb0f movs r0, 0 bl sub_80C3C34 _080C3CE4: pop {r0} bx r0 .align 2, 0 -_080C3CE8: .4byte 0x02039ce8 -_080C3CEC: .4byte 0x085ecfb8 -_080C3CF0: .4byte 0x0856fb0f + .pool thumb_func_end sub_80C3CCC thumb_func_start sub_80C3CF4 sub_80C3CF4: @ 80C3CF4 push {r4,lr} - ldr r4, _080C3D48 + ldr r4, =0x02039ce8 ldr r1, [r4] ldrb r0, [r1, 0xC] cmp r0, 0 beq _080C3D40 adds r0, r1, 0 adds r0, 0xD9 - ldr r2, _080C3D4C - ldr r3, _080C3D50 + ldr r2, =0x0856fb5c + ldr r3, =0x0000052a adds r1, r3 ldrb r1, [r1] lsls r1, 2 @@ -401243,7 +387993,7 @@ sub_80C3CF4: @ 80C3CF4 ldr r1, [r1] bl gf_strcpy ldr r1, [r4] - ldr r2, _080C3D54 + ldr r2, =0x00000165 adds r0, r1, r2 movs r3, 0xA9 lsls r3, 3 @@ -401253,9 +388003,9 @@ sub_80C3CF4: @ 80C3CF4 movs r3, 0x4 bl decimal_int_to_string ldr r1, [r4] - ldr r2, _080C3D58 + ldr r2, =0x000001ab adds r0, r1, r2 - ldr r3, _080C3D5C + ldr r3, =0x0000054a adds r1, r3 ldrh r1, [r1] movs r2, 0 @@ -401266,38 +388016,33 @@ _080C3D40: pop {r0} bx r0 .align 2, 0 -_080C3D48: .4byte 0x02039ce8 -_080C3D4C: .4byte 0x0856fb5c -_080C3D50: .4byte 0x0000052a -_080C3D54: .4byte 0x00000165 -_080C3D58: .4byte 0x000001ab -_080C3D5C: .4byte 0x0000054a + .pool thumb_func_end sub_80C3CF4 thumb_func_start sub_80C3D60 sub_80C3D60: @ 80C3D60 push {r4,r5,lr} - ldr r5, _080C3DA0 + ldr r5, =0x02039ce8 ldr r1, [r5] ldrb r0, [r1, 0xC] cmp r0, 0 beq _080C3D9A - ldr r0, _080C3DA4 - ldr r2, _080C3DA8 + ldr r0, =0x02021cc4 + ldr r2, =0x00000165 adds r1, r2 bl gf_strcpy - ldr r0, _080C3DAC + ldr r0, =0x02021dc4 ldr r1, [r5] - ldr r2, _080C3DB0 + ldr r2, =0x000001ab adds r1, r2 bl gf_strcpy - ldr r4, _080C3DB4 - ldr r1, _080C3DB8 + ldr r4, =0x02021fc4 + ldr r1, =0x085ecfed adds r0, r4, 0 bl ExpandTextCodes ldr r1, [r5] adds r1, 0xD9 - ldr r3, _080C3DBC + ldr r3, =0x0856fb0c movs r0, 0x1 adds r2, r4, 0 bl sub_80C3C34 @@ -401306,27 +388051,20 @@ _080C3D9A: pop {r0} bx r0 .align 2, 0 -_080C3DA0: .4byte 0x02039ce8 -_080C3DA4: .4byte 0x02021cc4 -_080C3DA8: .4byte 0x00000165 -_080C3DAC: .4byte 0x02021dc4 -_080C3DB0: .4byte 0x000001ab -_080C3DB4: .4byte 0x02021fc4 -_080C3DB8: .4byte 0x085ecfed -_080C3DBC: .4byte 0x0856fb0c + .pool thumb_func_end sub_80C3D60 thumb_func_start sub_80C3DC0 sub_80C3DC0: @ 80C3DC0 push {lr} - ldr r0, _080C3DE4 + ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x10] cmp r0, 0 beq _080C3DDE - ldr r2, _080C3DE8 + ldr r2, =0x00000237 adds r0, r1, r2 - ldr r2, _080C3DEC + ldr r2, =0x00000554 adds r1, r2 ldrh r1, [r1] movs r2, 0x1 @@ -401336,41 +388074,36 @@ _080C3DDE: pop {r0} bx r0 .align 2, 0 -_080C3DE4: .4byte 0x02039ce8 -_080C3DE8: .4byte 0x00000237 -_080C3DEC: .4byte 0x00000554 + .pool thumb_func_end sub_80C3DC0 thumb_func_start sub_80C3DF0 sub_80C3DF0: @ 80C3DF0 push {lr} - ldr r0, _080C3E10 + ldr r0, =0x02039ce8 ldr r2, [r0] ldrb r0, [r2, 0x10] cmp r0, 0 beq _080C3E0A - ldr r1, _080C3E14 - ldr r0, _080C3E18 + ldr r1, =0x085ed010 + ldr r0, =0x00000237 adds r2, r0 - ldr r3, _080C3E1C + ldr r3, =0x0856fb0f movs r0, 0x2 bl sub_80C3C34 _080C3E0A: pop {r0} bx r0 .align 2, 0 -_080C3E10: .4byte 0x02039ce8 -_080C3E14: .4byte 0x085ed010 -_080C3E18: .4byte 0x00000237 -_080C3E1C: .4byte 0x0856fb0f + .pool thumb_func_end sub_80C3DF0 thumb_func_start sub_80C3E20 sub_80C3E20: @ 80C3E20 push {lr} - ldr r0, _080C3E4C + ldr r0, =0x02039ce8 ldr r2, [r0] - ldr r1, _080C3E50 + ldr r1, =0x0000052a adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 @@ -401381,7 +388114,7 @@ sub_80C3E20: @ 80C3E20 ldr r1, [r0] cmp r1, 0 beq _080C3E48 - ldr r3, _080C3E54 + ldr r3, =0x000002c3 adds r0, r2, r3 movs r2, 0x1 movs r3, 0x5 @@ -401390,17 +388123,15 @@ _080C3E48: pop {r0} bx r0 .align 2, 0 -_080C3E4C: .4byte 0x02039ce8 -_080C3E50: .4byte 0x0000052a -_080C3E54: .4byte 0x000002c3 + .pool thumb_func_end sub_80C3E20 thumb_func_start sub_80C3E58 sub_80C3E58: @ 80C3E58 push {lr} - ldr r0, _080C3E84 + ldr r0, =0x02039ce8 ldr r2, [r0] - ldr r1, _080C3E88 + ldr r1, =0x0000052a adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 @@ -401410,39 +388141,35 @@ sub_80C3E58: @ 80C3E58 ldr r0, [r0] cmp r0, 0 beq _080C3E80 - ldr r1, _080C3E8C - ldr r0, _080C3E90 + ldr r1, =0x085ed036 + ldr r0, =0x000002c3 adds r2, r0 - ldr r3, _080C3E94 + ldr r3, =0x0856fb0f movs r0, 0x4 bl sub_80C3C34 _080C3E80: pop {r0} bx r0 .align 2, 0 -_080C3E84: .4byte 0x02039ce8 -_080C3E88: .4byte 0x0000052a -_080C3E8C: .4byte 0x085ed036 -_080C3E90: .4byte 0x000002c3 -_080C3E94: .4byte 0x0856fb0f + .pool thumb_func_end sub_80C3E58 thumb_func_start sub_80C3E98 sub_80C3E98: @ 80C3E98 push {lr} - ldr r0, _080C3EC4 + ldr r0, =0x02039ce8 ldr r2, [r0] - ldr r1, _080C3EC8 + ldr r1, =0x0000052a adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 bne _080C3EBE - ldr r3, _080C3ECC + ldr r3, =0x00000574 adds r0, r2, r3 ldr r1, [r0] cmp r1, 0 beq _080C3EBE - ldr r3, _080C3ED0 + ldr r3, =0x0000034f adds r0, r2, r3 movs r2, 0x1 movs r3, 0x5 @@ -401451,18 +388178,15 @@ _080C3EBE: pop {r0} bx r0 .align 2, 0 -_080C3EC4: .4byte 0x02039ce8 -_080C3EC8: .4byte 0x0000052a -_080C3ECC: .4byte 0x00000574 -_080C3ED0: .4byte 0x0000034f + .pool thumb_func_end sub_80C3E98 thumb_func_start sub_80C3ED4 sub_80C3ED4: @ 80C3ED4 push {lr} - ldr r0, _080C3F00 + ldr r0, =0x02039ce8 ldr r2, [r0] - ldr r1, _080C3F04 + ldr r1, =0x0000052a adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 @@ -401472,67 +388196,58 @@ sub_80C3ED4: @ 80C3ED4 ldr r0, [r0] cmp r0, 0 beq _080C3EFC - ldr r1, _080C3F08 - ldr r0, _080C3F0C + ldr r1, =0x085ed01f + ldr r0, =0x0000034f adds r2, r0 - ldr r3, _080C3F10 + ldr r3, =0x0856fb0f movs r0, 0x3 bl sub_80C3C34 _080C3EFC: pop {r0} bx r0 .align 2, 0 -_080C3F00: .4byte 0x02039ce8 -_080C3F04: .4byte 0x0000052a -_080C3F08: .4byte 0x085ed01f -_080C3F0C: .4byte 0x0000034f -_080C3F10: .4byte 0x0856fb0f + .pool thumb_func_end sub_80C3ED4 thumb_func_start sub_80C3F14 sub_80C3F14: @ 80C3F14 push {r4,lr} - ldr r4, _080C3F4C + ldr r4, =0x02039ce8 ldr r1, [r4] - ldr r2, _080C3F50 + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080C3F46 - ldr r0, _080C3F54 + ldr r0, =0x00000552 adds r1, r0 ldrh r0, [r1] cmp r0, 0 beq _080C3F46 - ldr r0, _080C3F58 + ldr r0, =0x02021cc4 ldrh r1, [r1] movs r2, 0x1 movs r3, 0x5 bl decimal_int_to_string ldr r0, [r4] - ldr r1, _080C3F5C + ldr r1, =0x00000395 adds r0, r1 - ldr r1, _080C3F60 + ldr r1, =0x085ed096 bl ExpandTextCodes _080C3F46: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C3F4C: .4byte 0x02039ce8 -_080C3F50: .4byte 0x0000052a -_080C3F54: .4byte 0x00000552 -_080C3F58: .4byte 0x02021cc4 -_080C3F5C: .4byte 0x00000395 -_080C3F60: .4byte 0x085ed096 + .pool thumb_func_end sub_80C3F14 thumb_func_start sub_80C3F64 sub_80C3F64: @ 80C3F64 push {lr} - ldr r0, _080C3F90 + ldr r0, =0x02039ce8 ldr r2, [r0] - ldr r1, _080C3F94 + ldr r1, =0x0000052a adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 @@ -401542,29 +388257,25 @@ sub_80C3F64: @ 80C3F64 ldrh r0, [r0] cmp r0, 0 beq _080C3F8C - ldr r1, _080C3F98 - ldr r0, _080C3F9C + ldr r1, =0x085ed085 + ldr r0, =0x00000395 adds r2, r0 - ldr r3, _080C3FA0 + ldr r3, =0x0856fb0f movs r0, 0x3 bl sub_80C3C34 _080C3F8C: pop {r0} bx r0 .align 2, 0 -_080C3F90: .4byte 0x02039ce8 -_080C3F94: .4byte 0x0000052a -_080C3F98: .4byte 0x085ed085 -_080C3F9C: .4byte 0x00000395 -_080C3FA0: .4byte 0x0856fb0f + .pool thumb_func_end sub_80C3F64 thumb_func_start sub_80C3FA4 sub_80C3FA4: @ 80C3FA4 push {lr} - ldr r0, _080C3FD4 + ldr r0, =0x02039ce8 ldr r1, [r0] - ldr r2, _080C3FD8 + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -401575,7 +388286,7 @@ sub_80C3FA4: @ 80C3FA4 ldrh r0, [r2] cmp r0, 0 beq _080C3FCE - ldr r3, _080C3FDC + ldr r3, =0x000003db adds r0, r1, r3 ldrh r1, [r2] movs r2, 0x1 @@ -401585,17 +388296,15 @@ _080C3FCE: pop {r0} bx r0 .align 2, 0 -_080C3FD4: .4byte 0x02039ce8 -_080C3FD8: .4byte 0x0000052a -_080C3FDC: .4byte 0x000003db + .pool thumb_func_end sub_80C3FA4 thumb_func_start sub_80C3FE0 sub_80C3FE0: @ 80C3FE0 push {lr} - ldr r0, _080C400C + ldr r0, =0x02039ce8 ldr r2, [r0] - ldr r1, _080C4010 + ldr r1, =0x0000052a adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 @@ -401605,29 +388314,25 @@ sub_80C3FE0: @ 80C3FE0 ldrh r0, [r0] cmp r0, 0 beq _080C4008 - ldr r1, _080C4014 - ldr r0, _080C4018 + ldr r1, =0x085ed09f + ldr r0, =0x000003db adds r2, r0 - ldr r3, _080C401C + ldr r3, =0x0856fb0f movs r0, 0x4 bl sub_80C3C34 _080C4008: pop {r0} bx r0 .align 2, 0 -_080C400C: .4byte 0x02039ce8 -_080C4010: .4byte 0x0000052a -_080C4014: .4byte 0x085ed09f -_080C4018: .4byte 0x000003db -_080C401C: .4byte 0x0856fb0f + .pool thumb_func_end sub_80C3FE0 thumb_func_start sub_80C4020 sub_80C4020: @ 80C4020 push {r4,lr} - ldr r4, _080C403C + ldr r4, =0x02039ce8 ldr r1, [r4] - ldr r2, _080C4040 + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 @@ -401638,73 +388343,64 @@ sub_80C4020: @ 80C4020 beq _080C4094 b _080C40B6 .align 2, 0 -_080C403C: .4byte 0x02039ce8 -_080C4040: .4byte 0x0000052a + .pool _080C4044: ldrb r0, [r1, 0xD] cmp r0, 0 beq _080C40B6 - ldr r0, _080C407C - ldr r2, _080C4080 + ldr r0, =0x02021cc4 + ldr r2, =0x0000054c adds r1, r2 ldrh r1, [r1] movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r0, _080C4084 + ldr r0, =0x02021dc4 ldr r1, [r4] - ldr r2, _080C4088 + ldr r2, =0x0000054e adds r1, r2 ldrh r1, [r1] movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string ldr r0, [r4] - ldr r1, _080C408C + ldr r1, =0x00000421 adds r0, r1 - ldr r1, _080C4090 + ldr r1, =0x085ed0e0 bl ExpandTextCodes b _080C40B6 .align 2, 0 -_080C407C: .4byte 0x02021cc4 -_080C4080: .4byte 0x0000054c -_080C4084: .4byte 0x02021dc4 -_080C4088: .4byte 0x0000054e -_080C408C: .4byte 0x00000421 -_080C4090: .4byte 0x085ed0e0 + .pool _080C4094: - ldr r2, _080C40BC + ldr r2, =0x00000596 adds r1, r2 ldrh r0, [r1] cmp r0, 0 beq _080C40B6 - ldr r0, _080C40C0 + ldr r0, =0x02021cc4 ldrh r1, [r1] movs r2, 0x1 movs r3, 0x5 bl decimal_int_to_string ldr r0, [r4] - ldr r1, _080C40C4 + ldr r1, =0x00000421 adds r0, r1 - ldr r1, _080C40C8 + ldr r1, =0x085ed0c8 bl ExpandTextCodes _080C40B6: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C40BC: .4byte 0x00000596 -_080C40C0: .4byte 0x02021cc4 -_080C40C4: .4byte 0x00000421 -_080C40C8: .4byte 0x085ed0c8 + .pool thumb_func_end sub_80C4020 thumb_func_start sub_80C40CC sub_80C40CC: @ 80C40CC push {lr} - ldr r0, _080C40E8 + ldr r0, =0x02039ce8 ldr r2, [r0] - ldr r1, _080C40EC + ldr r1, =0x0000052a adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -401715,61 +388411,55 @@ sub_80C40CC: @ 80C40CC beq _080C4114 b _080C412C .align 2, 0 -_080C40E8: .4byte 0x02039ce8 -_080C40EC: .4byte 0x0000052a + .pool _080C40F0: ldrb r0, [r2, 0xD] cmp r0, 0 beq _080C412C - ldr r1, _080C4108 - ldr r0, _080C410C + ldr r1, =0x085ed0d3 + ldr r0, =0x00000421 adds r2, r0 - ldr r3, _080C4110 + ldr r3, =0x0856fb0c movs r0, 0x5 bl sub_80C3C34 b _080C412C .align 2, 0 -_080C4108: .4byte 0x085ed0d3 -_080C410C: .4byte 0x00000421 -_080C4110: .4byte 0x0856fb0c + .pool _080C4114: - ldr r1, _080C4130 + ldr r1, =0x00000596 adds r0, r2, r1 ldrh r0, [r0] cmp r0, 0 beq _080C412C - ldr r1, _080C4134 - ldr r0, _080C4138 + ldr r1, =0x085ed0b6 + ldr r0, =0x00000421 adds r2, r0 - ldr r3, _080C413C + ldr r3, =0x0856fb0f movs r0, 0x5 bl sub_80C3C34 _080C412C: pop {r0} bx r0 .align 2, 0 -_080C4130: .4byte 0x00000596 -_080C4134: .4byte 0x085ed0b6 -_080C4138: .4byte 0x00000421 -_080C413C: .4byte 0x0856fb0f + .pool thumb_func_end sub_80C40CC thumb_func_start sub_80C4140 sub_80C4140: @ 80C4140 push {r4,r5,lr} sub sp, 0x20 - ldr r1, _080C41C8 + ldr r1, =0x0856fb68 add r0, sp, 0x10 movs r2, 0x6 bl memcpy add r4, sp, 0x18 - ldr r1, _080C41CC + ldr r1, =0x0856fb6e adds r0, r4, 0 movs r2, 0x6 bl memcpy - ldr r0, _080C41D0 + ldr r0, =0x02039ce8 ldr r0, [r0] - ldr r1, _080C41D4 + ldr r1, =0x0000052a adds r0, r1 ldrb r0, [r0] adds r5, r4, 0 @@ -401777,7 +388467,7 @@ sub_80C4140: @ 80C4140 bne _080C41C0 movs r4, 0 _080C416C: - ldr r0, _080C41D0 + ldr r0, =0x02039ce8 ldr r0, [r0] lsls r1, r4, 1 movs r2, 0xB1 @@ -401824,18 +388514,15 @@ _080C41C0: pop {r0} bx r0 .align 2, 0 -_080C41C8: .4byte 0x0856fb68 -_080C41CC: .4byte 0x0856fb6e -_080C41D0: .4byte 0x02039ce8 -_080C41D4: .4byte 0x0000052a + .pool thumb_func_end sub_80C4140 thumb_func_start sub_80C41D8 sub_80C41D8: @ 80C41D8 push {r4,r5,lr} sub sp, 0x4 - ldr r0, _080C4208 - ldr r4, _080C420C + ldr r0, =0x08dde1f8 + ldr r4, =0x02039ce8 ldr r1, [r4] movs r5, 0x8D lsls r5, 3 @@ -401843,7 +388530,7 @@ sub_80C41D8: @ 80C41D8 movs r2, 0x60 bl CpuSet ldr r4, [r4] - ldr r1, _080C4210 + ldr r1, =0x00000582 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -401856,9 +388543,7 @@ sub_80C41D8: @ 80C41D8 beq _080C4242 b _080C424A .align 2, 0 -_080C4208: .4byte 0x08dde1f8 -_080C420C: .4byte 0x02039ce8 -_080C4210: .4byte 0x00000582 + .pool _080C4214: movs r2, 0x8D lsls r2, 3 @@ -401887,7 +388572,7 @@ _080C4242: movs r1, 0x60 bl TintPalette_SepiaTone _080C424A: - ldr r0, _080C42A0 + ldr r0, =0x02039ce8 ldr r0, [r0] movs r1, 0x8D lsls r1, 3 @@ -401897,7 +388582,7 @@ _080C424A: bl gpu_pal_apply movs r4, 0 _080C425E: - ldr r0, _080C42A0 + ldr r0, =0x02039ce8 ldr r0, [r0] lsls r1, r4, 1 movs r2, 0xB1 @@ -401930,20 +388615,20 @@ _080C428E: pop {r0} bx r0 .align 2, 0 -_080C42A0: .4byte 0x02039ce8 + .pool thumb_func_end sub_80C41D8 thumb_func_start sub_80C42A4 sub_80C42A4: @ 80C42A4 push {r4,lr} sub sp, 0x14 - ldr r1, _080C4320 + ldr r1, =0x0856fb74 add r0, sp, 0x10 movs r2, 0x4 bl memcpy - ldr r0, _080C4324 + ldr r0, =0x02039ce8 ldr r1, [r0] - ldr r2, _080C4328 + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -401955,9 +388640,9 @@ sub_80C42A4: @ 80C42A4 bne _080C4316 movs r4, 0 _080C42CC: - ldr r0, _080C4324 + ldr r0, =0x02039ce8 ldr r0, [r0] - ldr r1, _080C432C + ldr r1, =0x00000584 adds r0, r1 adds r0, r4 ldrb r3, [r0] @@ -401998,34 +388683,31 @@ _080C4316: pop {r0} bx r0 .align 2, 0 -_080C4320: .4byte 0x0856fb74 -_080C4324: .4byte 0x02039ce8 -_080C4328: .4byte 0x0000052a -_080C432C: .4byte 0x00000584 + .pool thumb_func_end sub_80C42A4 thumb_func_start sub_80C4330 sub_80C4330: @ 80C4330 push {lr} - ldr r0, _080C4374 + ldr r0, =0x0856f54c movs r1, 0xB0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _080C4378 + ldr r0, =0x0856f56c movs r1, 0xC0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _080C437C + ldr r0, =0x0856f58c movs r1, 0xD0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _080C4380 + ldr r0, =0x0856f5ac movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _080C4384 + ldr r0, =0x02039ce8 ldr r1, [r0] - ldr r0, _080C4388 + ldr r0, =0x000017a8 adds r1, r0 movs r2, 0x80 lsls r2, 3 @@ -402035,12 +388717,7 @@ sub_80C4330: @ 80C4330 pop {r0} bx r0 .align 2, 0 -_080C4374: .4byte 0x0856f54c -_080C4378: .4byte 0x0856f56c -_080C437C: .4byte 0x0856f58c -_080C4380: .4byte 0x0856f5ac -_080C4384: .4byte 0x02039ce8 -_080C4388: .4byte 0x000017a8 + .pool thumb_func_end sub_80C4330 thumb_func_start sub_80C438C @@ -402063,7 +388740,7 @@ sub_80C438C: @ 80C438C sub_80C43A8: @ 80C43A8 push {r4,lr} sub sp, 0x8 - ldr r0, _080C43C4 + ldr r0, =0x02039ce8 ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0x4 @@ -402071,13 +388748,12 @@ sub_80C43A8: @ 80C43A8 b _080C4532 _080C43B8: lsls r0, 2 - ldr r1, _080C43C8 + ldr r1, =_080C43CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C43C4: .4byte 0x02039ce8 -_080C43C8: .4byte _080C43CC + .pool .align 2, 0 _080C43CC: .4byte _080C43E0 @@ -402086,21 +388762,20 @@ _080C43CC: .4byte _080C44D8 .4byte _080C4500 _080C43E0: - ldr r0, _080C43F0 + ldr r0, =0x02039ce8 ldr r1, [r0] - ldr r0, _080C43F4 + ldr r0, =0x000013a8 adds r1, r0 movs r2, 0x80 lsls r2, 3 movs r0, 0x3 b _080C4406 .align 2, 0 -_080C43F0: .4byte 0x02039ce8 -_080C43F4: .4byte 0x000013a8 + .pool _080C43F8: - ldr r0, _080C4410 + ldr r0, =0x02039ce8 ldr r1, [r0] - ldr r3, _080C4414 + ldr r3, =0x000019a8 adds r1, r3 movs r2, 0xC0 lsls r2, 5 @@ -402110,18 +388785,17 @@ _080C4406: bl gpu_copy_bg_tile_pattern_data_to_vram b _080C4536 .align 2, 0 -_080C4410: .4byte 0x02039ce8 -_080C4414: .4byte 0x000019a8 + .pool _080C4418: - ldr r4, _080C4460 + ldr r4, =0x02039ce8 ldr r2, [r4] - ldr r1, _080C4464 + ldr r1, =0x0000052a adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 beq _080C447C - ldr r1, _080C4468 - ldr r3, _080C446C + ldr r1, =0x0856fae4 + ldr r3, =0x00000535 adds r0, r2, r3 ldrb r0, [r0] lsls r0, 2 @@ -402130,32 +388804,26 @@ _080C4418: movs r1, 0 movs r2, 0x60 bl gpu_pal_apply - ldr r0, _080C4470 + ldr r0, =0x0856f4ec movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply ldr r0, [r4] - ldr r1, _080C4474 + ldr r1, =0x00000534 adds r0, r1 ldrb r0, [r0] cmp r0, 0 beq _080C44B2 - ldr r0, _080C4478 + ldr r0, =0x0856f4ac movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply b _080C44B2 .align 2, 0 -_080C4460: .4byte 0x02039ce8 -_080C4464: .4byte 0x0000052a -_080C4468: .4byte 0x0856fae4 -_080C446C: .4byte 0x00000535 -_080C4470: .4byte 0x0856f4ec -_080C4474: .4byte 0x00000534 -_080C4478: .4byte 0x0856f4ac + .pool _080C447C: - ldr r1, _080C44C0 - ldr r3, _080C44C4 + ldr r1, =0x0856faf8 + ldr r3, =0x00000535 adds r0, r2, r3 ldrb r0, [r0] lsls r0, 2 @@ -402164,50 +388832,43 @@ _080C447C: movs r1, 0 movs r2, 0x60 bl gpu_pal_apply - ldr r0, _080C44C8 + ldr r0, =0x0856f50c movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply ldr r0, [r4] - ldr r1, _080C44CC + ldr r1, =0x00000534 adds r0, r1 ldrb r0, [r0] cmp r0, 0 beq _080C44B2 - ldr r0, _080C44D0 + ldr r0, =0x0856f4cc movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply _080C44B2: - ldr r0, _080C44D4 + ldr r0, =0x0856f52c movs r1, 0x40 movs r2, 0x20 bl gpu_pal_apply b _080C4536 .align 2, 0 -_080C44C0: .4byte 0x0856faf8 -_080C44C4: .4byte 0x00000535 -_080C44C8: .4byte 0x0856f50c -_080C44CC: .4byte 0x00000534 -_080C44D0: .4byte 0x0856f4cc -_080C44D4: .4byte 0x0856f52c + .pool _080C44D8: - ldr r4, _080C44F4 + ldr r4, =0x02039ce8 ldr r1, [r4] - ldr r3, _080C44F8 + ldr r3, =0x00003ca8 adds r1, r3 movs r0, 0 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _080C44FC + ldr r0, =0x00005ca8 adds r1, r0 movs r0, 0x2 bl bg_set_tilemap b _080C4536 .align 2, 0 -_080C44F4: .4byte 0x02039ce8 -_080C44F8: .4byte 0x00003ca8 -_080C44FC: .4byte 0x00005ca8 + .pool _080C4500: movs r4, 0x20 str r4, [sp] @@ -402235,7 +388896,7 @@ _080C4532: movs r0, 0x1 b _080C4542 _080C4536: - ldr r0, _080C454C + ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x3] adds r0, 0x1 @@ -402247,16 +388908,16 @@ _080C4542: pop {r1} bx r1 .align 2, 0 -_080C454C: .4byte 0x02039ce8 + .pool thumb_func_end sub_80C43A8 thumb_func_start sub_80C4550 sub_80C4550: @ 80C4550 push {r4-r7,lr} adds r7, r0, 0 - ldr r0, _080C4588 + ldr r0, =0x02039ce8 ldr r0, [r0] - ldr r1, _080C458C + ldr r1, =0x00005ca8 adds r6, r0, r1 movs r1, 0 _080C455E: @@ -402282,8 +388943,7 @@ _080C456C: ldrh r1, [r1] b _080C4598 .align 2, 0 -_080C4588: .4byte 0x02039ce8 -_080C458C: .4byte 0x00005ca8 + .pool _080C4590: adds r0, r3, r1 lsls r0, 1 @@ -402314,9 +388974,9 @@ _080C4598: sub_80C45C0: @ 80C45C0 push {r4-r7,lr} adds r7, r0, 0 - ldr r0, _080C45F8 + ldr r0, =0x02039ce8 ldr r0, [r0] - ldr r1, _080C45FC + ldr r1, =0x00003ca8 adds r6, r0, r1 movs r1, 0 _080C45CE: @@ -402342,8 +389002,7 @@ _080C45DC: ldrh r1, [r1] b _080C4608 .align 2, 0 -_080C45F8: .4byte 0x02039ce8 -_080C45FC: .4byte 0x00003ca8 + .pool _080C4600: adds r0, r3, r1 lsls r0, 1 @@ -402382,15 +389041,15 @@ sub_80C4630: @ 80C4630 mov r8, r0 movs r2, 0x3 mov r10, r2 - ldr r2, _080C473C - ldr r4, _080C4740 + ldr r2, =0x0856fb78 + ldr r4, =0x02039ce8 ldr r1, [r4] - ldr r3, _080C4744 + ldr r3, =0x0000052b adds r0, r1, r3 ldrb r0, [r0] adds r0, r2 ldrb r3, [r0] - ldr r0, _080C4748 + ldr r0, =0x00000535 adds r1, r0 ldrb r0, [r1] str r0, [sp] @@ -402411,7 +389070,7 @@ sub_80C4630: @ 80C4630 movs r2, 0 movs r6, 0x1 _080C467E: - ldr r0, _080C4740 + ldr r0, =0x02039ce8 ldr r1, [r0] lsls r0, r2, 16 asrs r7, r0, 16 @@ -402503,19 +389162,16 @@ _080C4724: pop {r0} bx r0 .align 2, 0 -_080C473C: .4byte 0x0856fb78 -_080C4740: .4byte 0x02039ce8 -_080C4744: .4byte 0x0000052b -_080C4748: .4byte 0x00000535 + .pool thumb_func_end sub_80C4630 thumb_func_start sub_80C474C sub_80C474C: @ 80C474C push {r4-r6,lr} sub sp, 0xC - ldr r6, _080C47F4 + ldr r6, =0x02039ce8 ldr r1, [r6] - ldr r2, _080C47F8 + ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -402567,7 +389223,7 @@ _080C478A: bl Bg_FillWramTileMapRectWithTileAndPalette _080C47BE: ldr r0, [r6] - ldr r2, _080C47FC + ldr r2, =0x00000574 adds r0, r2 ldr r0, [r0] cmp r0, 0 @@ -402591,9 +389247,7 @@ _080C47BE: bl Bg_FillWramTileMapRectWithTileAndPalette b _080C48B8 .align 2, 0 -_080C47F4: .4byte 0x02039ce8 -_080C47F8: .4byte 0x0000052a -_080C47FC: .4byte 0x00000574 + .pool _080C4800: ldrb r0, [r1, 0x10] cmp r0, 0 @@ -402693,7 +389347,7 @@ _080C48B8: thumb_func_start sub_80C48C8 sub_80C48C8: @ 80C48C8 push {lr} - ldr r3, _080C48FC + ldr r3, =0x02039ce8 ldr r1, [r3] ldrb r0, [r1, 0x6] adds r0, 0x1 @@ -402711,7 +389365,7 @@ sub_80C48C8: @ 80C48C8 eors r0, r1 strb r0, [r2, 0x7] ldr r0, [r3] - ldr r1, _080C4900 + ldr r1, =0x00000529 adds r0, r1 movs r1, 0x1 strb r1, [r0] @@ -402719,48 +389373,46 @@ _080C48F6: pop {r0} bx r0 .align 2, 0 -_080C48FC: .4byte 0x02039ce8 -_080C4900: .4byte 0x00000529 + .pool thumb_func_end sub_80C48C8 thumb_func_start sub_80C4904 sub_80C4904: @ 80C4904 lsls r0, 24 lsrs r0, 24 - ldr r2, _080C4914 + ldr r2, =0x02039b58 movs r1, 0x64 muls r0, r1 adds r0, r2 ldrb r0, [r0, 0x1] bx lr .align 2, 0 -_080C4914: .4byte 0x02039b58 + .pool thumb_func_end sub_80C4904 thumb_func_start sub_80C4918 sub_80C4918: @ 80C4918 push {r4,lr} - ldr r4, _080C4938 + ldr r4, =sub_80C4960 + 1 adds r0, r4, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 bl _call_via_r4 - ldr r0, _080C493C + ldr r0, =sub_80C26D4 + 1 bl SetHBlankCallback pop {r4} pop {r0} bx r0 .align 2, 0 -_080C4938: .4byte sub_80C4960 + 1 -_080C493C: .4byte sub_80C26D4 + 1 + .pool thumb_func_end sub_80C4918 thumb_func_start sub_80C4940 sub_80C4940: @ 80C4940 push {lr} - ldr r0, _080C4954 + ldr r0, =sub_80C4960 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -402769,7 +389421,7 @@ sub_80C4940: @ 80C4940 movs r0, 0 b _080C495A .align 2, 0 -_080C4954: .4byte sub_80C4960 + 1 + .pool _080C4958: movs r0, 0x1 _080C495A: @@ -402782,8 +389434,8 @@ sub_80C4960: @ 80C4960 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _080C4990 - ldr r2, _080C4994 + ldr r5, =0x0856fb28 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -402803,8 +389455,7 @@ _080C4972: pop {r0} bx r0 .align 2, 0 -_080C4990: .4byte 0x0856fb28 -_080C4994: .4byte 0x03005e00 + .pool thumb_func_end sub_80C4960 thumb_func_start sub_80C4998 @@ -402818,7 +389469,7 @@ sub_80C4998: @ 80C4998 bl remove_some_task bl dp12_8087EA4 movs r1, 0 - ldr r0, _080C49D4 + ldr r0, =0x02038c28 movs r2, 0 movs r3, 0xF0 lsls r3, 3 @@ -402837,7 +389488,7 @@ _080C49BC: pop {r1} bx r1 .align 2, 0 -_080C49D4: .4byte 0x02038c28 + .pool thumb_func_end sub_80C4998 thumb_func_start sub_80C49D8 @@ -402849,7 +389500,7 @@ sub_80C49D8: @ 80C49D8 push {r5-r7} sub sp, 0x4 mov r8, r0 - ldr r0, _080C4A04 + ldr r0, =0x02039ce8 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x9] @@ -402864,17 +389515,17 @@ sub_80C49D8: @ 80C49D8 strh r0, [r3, 0xA] b _080C4A0E .align 2, 0 -_080C4A04: .4byte 0x02039ce8 + .pool _080C4A08: adds r0, r1, 0x7 mov r4, r8 strh r0, [r4, 0xA] _080C4A0E: - ldr r0, _080C4AF8 + ldr r0, =0x02039ce8 ldr r0, [r0] mov r2, r8 ldrh r1, [r2, 0xA] - ldr r3, _080C4AFC + ldr r3, =0x00007ca8 adds r0, r3 strh r1, [r0] ldrh r0, [r2, 0xA] @@ -402893,7 +389544,7 @@ _080C4A0E: adds r1, r4, 0 bl __udivsi3 adds r5, r0, 0 - ldr r1, _080C4B00 + ldr r1, =0xffff0000 adds r5, r1 adds r0, r5, 0 muls r0, r4 @@ -402907,7 +389558,7 @@ _080C4A0E: movs r2, 0 cmp r2, r7 bcs _080C4A78 - ldr r3, _080C4B04 + ldr r3, =0x02038c28 _080C4A60: lsls r0, r2, 16 asrs r0, 16 @@ -402926,13 +389577,13 @@ _080C4A78: mov r3, r9 lsls r0, r3, 16 asrs r3, r0, 16 - ldr r4, _080C4AF8 + ldr r4, =0x02039ce8 mov r9, r4 ldr r4, [sp] lsrs r7, r4, 16 cmp r1, r0 bge _080C4AB0 - ldr r0, _080C4B04 + ldr r0, =0x02038c28 mov r12, r0 adds r4, r3, 0 _080C4A92: @@ -402957,7 +389608,7 @@ _080C4AB0: asrs r0, r1, 16 cmp r0, 0x9F bgt _080C4ACE - ldr r2, _080C4B04 + ldr r2, =0x02038c28 _080C4ABC: asrs r0, r1, 16 lsls r1, r0, 1 @@ -402992,10 +389643,7 @@ _080C4AE6: pop {r1} bx r1 .align 2, 0 -_080C4AF8: .4byte 0x02039ce8 -_080C4AFC: .4byte 0x00007ca8 -_080C4B00: .4byte 0xffff0000 -_080C4B04: .4byte 0x02038c28 + .pool thumb_func_end sub_80C49D8 thumb_func_start sub_80C4B08 @@ -403003,7 +389651,7 @@ sub_80C4B08: @ 80C4B08 push {r4,r5,lr} sub sp, 0x8 adds r5, r0, 0 - ldr r4, _080C4B34 + ldr r4, =0x02039ce8 ldr r1, [r4] movs r0, 0 strb r0, [r1, 0x9] @@ -403017,13 +389665,12 @@ _080C4B20: cmp r0, 0x4 bhi _080C4BE4 lsls r0, 2 - ldr r1, _080C4B38 + ldr r1, =_080C4B3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C4B34: .4byte 0x02039ce8 -_080C4B38: .4byte _080C4B3C + .pool .align 2, 0 _080C4B3C: .4byte _080C4B50 @@ -403061,24 +389708,23 @@ _080C4B80: bne _080C4BF6 b _080C4C08 _080C4B8C: - ldr r0, _080C4BA0 + ldr r0, =0x02039ce8 ldr r1, [r0] ldrb r0, [r1, 0x8] cmp r0, 0 bne _080C4BA8 - ldr r2, _080C4BA4 + ldr r2, =0x00000a48 adds r0, r1, r2 bl sub_80C45C0 b _080C4BF6 .align 2, 0 -_080C4BA0: .4byte 0x02039ce8 -_080C4BA4: .4byte 0x00000a48 + .pool _080C4BA8: movs r0, 0x1 bl sub_80C438C b _080C4BF6 _080C4BB0: - ldr r0, _080C4BC0 + ldr r0, =0x02039ce8 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 @@ -403086,14 +389732,14 @@ _080C4BB0: bl sub_80C474C b _080C4BF6 .align 2, 0 -_080C4BC0: .4byte 0x02039ce8 + .pool _080C4BC4: movs r0, 0x2 movs r1, 0 bl Window_FastFillPixels b _080C4BF6 _080C4BCE: - ldr r0, _080C4BE0 + ldr r0, =0x02039ce8 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 @@ -403101,7 +389747,7 @@ _080C4BCE: bl sub_80C4FF0 b _080C4BF6 .align 2, 0 -_080C4BE0: .4byte 0x02039ce8 + .pool _080C4BE4: ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -403113,12 +389759,12 @@ _080C4BE4: strb r1, [r0, 0x4] b _080C4C08 _080C4BF6: - ldr r2, _080C4C14 + ldr r2, =0x02039ce8 ldr r1, [r2] ldrb r0, [r1, 0x4] adds r0, 0x1 strb r0, [r1, 0x4] - ldr r0, _080C4C18 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080C4B20 @@ -403129,15 +389775,14 @@ _080C4C08: pop {r1} bx r1 .align 2, 0 -_080C4C14: .4byte 0x02039ce8 -_080C4C18: .4byte 0x03003124 + .pool thumb_func_end sub_80C4B08 thumb_func_start sub_80C4C1C sub_80C4C1C: @ 80C4C1C push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _080C4C7C + ldr r4, =0x02039ce8 ldr r1, [r4] movs r0, 0 strb r0, [r1, 0x9] @@ -403148,7 +389793,7 @@ sub_80C4C1C: @ 80C4C1C movs r0, 0x2 bl sub_80C438C ldr r0, [r4] - ldr r1, _080C4C80 + ldr r1, =0x00000ef8 adds r0, r1 bl sub_80C4550 ldr r0, [r4] @@ -403178,8 +389823,7 @@ _080C4C50: pop {r1} bx r1 .align 2, 0 -_080C4C7C: .4byte 0x02039ce8 -_080C4C80: .4byte 0x00000ef8 + .pool thumb_func_end sub_80C4C1C thumb_func_start sub_80C4C84 @@ -403191,7 +389835,7 @@ sub_80C4C84: @ 80C4C84 push {r5-r7} sub sp, 0x4 mov r8, r0 - ldr r0, _080C4CAC + ldr r0, =0x02039ce8 ldr r0, [r0] movs r2, 0 strb r2, [r0, 0x9] @@ -403205,17 +389849,17 @@ sub_80C4C84: @ 80C4C84 strh r2, [r4, 0xA] b _080C4CB6 .align 2, 0 -_080C4CAC: .4byte 0x02039ce8 + .pool _080C4CB0: subs r0, r1, 0x5 mov r1, r8 strh r0, [r1, 0xA] _080C4CB6: - ldr r0, _080C4DA0 + ldr r0, =0x02039ce8 ldr r0, [r0] mov r2, r8 ldrh r1, [r2, 0xA] - ldr r3, _080C4DA4 + ldr r3, =0x00007ca8 adds r0, r3 strh r1, [r0] ldrh r0, [r2, 0xA] @@ -403234,7 +389878,7 @@ _080C4CB6: adds r1, r4, 0 bl __udivsi3 adds r5, r0, 0 - ldr r1, _080C4DA8 + ldr r1, =0xffff0000 adds r5, r1 adds r0, r5, 0 muls r0, r4 @@ -403248,7 +389892,7 @@ _080C4CB6: movs r2, 0 cmp r2, r7 bcs _080C4D20 - ldr r3, _080C4DAC + ldr r3, =0x02038c28 _080C4D08: lsls r0, r2, 16 asrs r0, 16 @@ -403267,13 +389911,13 @@ _080C4D20: mov r3, r9 lsls r0, r3, 16 asrs r3, r0, 16 - ldr r4, _080C4DA0 + ldr r4, =0x02039ce8 mov r9, r4 ldr r4, [sp] lsrs r7, r4, 16 cmp r1, r0 bge _080C4D56 - ldr r0, _080C4DAC + ldr r0, =0x02038c28 mov r12, r0 adds r4, r3, 0 _080C4D3A: @@ -403297,7 +389941,7 @@ _080C4D56: asrs r0, r1, 16 cmp r0, 0x9F bgt _080C4D74 - ldr r2, _080C4DAC + ldr r2, =0x02038c28 _080C4D62: asrs r0, r1, 16 lsls r1, r0, 1 @@ -403332,10 +389976,7 @@ _080C4D8C: pop {r1} bx r1 .align 2, 0 -_080C4DA0: .4byte 0x02039ce8 -_080C4DA4: .4byte 0x00007ca8 -_080C4DA8: .4byte 0xffff0000 -_080C4DAC: .4byte 0x02038c28 + .pool thumb_func_end sub_80C4C84 thumb_func_start sub_80C4DB0 @@ -403347,7 +389988,7 @@ sub_80C4DB0: @ 80C4DB0 bl gpu_sync_bg_show movs r0, 0 bl SetHBlankCallback - ldr r0, _080C4DD8 + ldr r0, =sub_80C4960 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -403356,15 +389997,15 @@ sub_80C4DB0: @ 80C4DB0 pop {r1} bx r1 .align 2, 0 -_080C4DD8: .4byte sub_80C4960 + 1 + .pool thumb_func_end sub_80C4DB0 thumb_func_start sub_80C4DDC sub_80C4DDC: @ 80C4DDC push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _080C4E04 - ldr r0, _080C4E08 + ldr r4, =0x02039ce8 + ldr r0, =0x00007cac bl malloc_and_clear adds r1, r0, 0 str r1, [r4] @@ -403372,21 +390013,17 @@ sub_80C4DDC: @ 80C4DDC lsls r2, 3 adds r0, r1, r2 str r5, [r0] - ldr r0, _080C4E0C + ldr r0, =sub_80C5868 + 1 cmp r5, r0 bne _080C4E18 - ldr r0, _080C4E10 + ldr r0, =0x0000052c adds r1, r0 - ldr r0, _080C4E14 + ldr r0, =0x00007fff b _080C4E1E .align 2, 0 -_080C4E04: .4byte 0x02039ce8 -_080C4E08: .4byte 0x00007cac -_080C4E0C: .4byte sub_80C5868 + 1 -_080C4E10: .4byte 0x0000052c -_080C4E14: .4byte 0x00007fff + .pool _080C4E18: - ldr r2, _080C4E34 + ldr r2, =0x0000052c adds r1, r2 movs r0, 0 _080C4E1E: @@ -403395,39 +390032,35 @@ _080C4E1E: adds r3, r0, 0 cmp r3, 0x1 bne _080C4E3C - ldr r1, _080C4E38 + ldr r1, =0x02039ce8 ldr r0, [r1] strb r3, [r0, 0x5] adds r2, r1, 0 b _080C4E44 .align 2, 0 -_080C4E34: .4byte 0x0000052c -_080C4E38: .4byte 0x02039ce8 + .pool _080C4E3C: - ldr r2, _080C4E64 + ldr r2, =0x02039ce8 ldr r1, [r2] movs r0, 0 strb r0, [r1, 0x5] _080C4E44: ldr r0, [r2] - ldr r1, _080C4E68 + ldr r1, =0x00007caa adds r0, r1 movs r1, 0x2 strb r1, [r0] ldr r0, [r2] - ldr r2, _080C4E6C + ldr r2, =0x00000534 adds r0, r2 bl sub_80C3020 - ldr r0, _080C4E70 + ldr r0, =sub_80C2C80 + 1 bl set_callback2 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080C4E64: .4byte 0x02039ce8 -_080C4E68: .4byte 0x00007caa -_080C4E6C: .4byte 0x00000534 -_080C4E70: .4byte sub_80C2C80 + 1 + .pool thumb_func_end sub_80C4DDC thumb_func_start sub_80C4E74 @@ -403437,8 +390070,8 @@ sub_80C4E74: @ 80C4E74 adds r6, r1, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _080C4EC8 - ldr r0, _080C4ECC + ldr r5, =0x02039ce8 + ldr r0, =0x00007cac bl malloc_and_clear str r0, [r5] movs r2, 0xA6 @@ -403448,48 +390081,42 @@ sub_80C4E74: @ 80C4E74 movs r1, 0x1 strb r1, [r0, 0x5] ldr r0, [r5] - ldr r1, _080C4ED0 + ldr r1, =0x00000534 adds r0, r1 - ldr r2, _080C4ED4 + ldr r2, =0x02039b58 movs r1, 0x64 muls r1, r4 adds r1, r2 movs r2, 0x64 bl memcpy ldr r1, [r5] - ldr r2, _080C4ED8 + ldr r2, =0x020229e8 lsls r0, r4, 3 subs r0, r4 lsls r0, 2 adds r0, r2 ldrh r0, [r0, 0x1A] - ldr r2, _080C4EDC + ldr r2, =0x00007caa adds r1, r2 strb r0, [r1] - ldr r0, _080C4EE0 + ldr r0, =sub_80C2C80 + 1 bl set_callback2 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080C4EC8: .4byte 0x02039ce8 -_080C4ECC: .4byte 0x00007cac -_080C4ED0: .4byte 0x00000534 -_080C4ED4: .4byte 0x02039b58 -_080C4ED8: .4byte 0x020229e8 -_080C4EDC: .4byte 0x00007caa -_080C4EE0: .4byte sub_80C2C80 + 1 + .pool thumb_func_end sub_80C4E74 thumb_func_start sub_80C4EE4 sub_80C4EE4: @ 80C4EE4 push {r4,r5,lr} - ldr r4, _080C4F40 + ldr r4, =0x02039ce8 ldr r0, [r4] movs r1, 0 strb r1, [r0] ldr r2, [r4] - ldr r0, _080C4F44 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x12] strb r0, [r2, 0x6] @@ -403504,7 +390131,7 @@ sub_80C4EE4: @ 80C4EE4 strb r1, [r0] bl sub_80C4F50 ldr r1, [r4] - ldr r3, _080C4F48 + ldr r3, =0x0000052a adds r1, r3 strb r0, [r1] movs r5, 0 @@ -403515,7 +390142,7 @@ _080C4F18: ldr r1, [r4] adds r0, r1, r0 lsls r2, r5, 1 - ldr r3, _080C4F4C + ldr r3, =0x0000055c adds r1, r3 adds r1, r2 ldrh r1, [r1] @@ -403529,20 +390156,17 @@ _080C4F18: pop {r0} bx r0 .align 2, 0 -_080C4F40: .4byte 0x02039ce8 -_080C4F44: .4byte 0x03005d90 -_080C4F48: .4byte 0x0000052a -_080C4F4C: .4byte 0x0000055c + .pool thumb_func_end sub_80C4EE4 thumb_func_start sub_80C4F50 sub_80C4F50: @ 80C4F50 push {lr} - ldr r0, _080C4F6C + ldr r0, =0x02039ce8 ldr r1, [r0] cmp r1, 0 bne _080C4F7C - ldr r0, _080C4F70 + ldr r0, =0x082e9530 ldrb r1, [r0] subs r0, r1, 0x4 lsls r0, 24 @@ -403552,15 +390176,14 @@ sub_80C4F50: @ 80C4F50 movs r0, 0 b _080C4FC2 .align 2, 0 -_080C4F6C: .4byte 0x02039ce8 -_080C4F70: .4byte 0x082e9530 + .pool _080C4F74: cmp r1, 0x3 beq _080C4FC0 movs r0, 0x1 b _080C4FC2 _080C4F7C: - ldr r2, _080C4F98 + ldr r2, =0x0000056c adds r0, r1, r2 ldrb r2, [r0] subs r0, r2, 0x4 @@ -403568,28 +390191,27 @@ _080C4F7C: lsrs r0, 24 cmp r0, 0x1 bhi _080C4FA0 - ldr r0, _080C4F9C + ldr r0, =0x0000052b adds r1, r0 movs r0, 0 strb r0, [r1] b _080C4FC2 .align 2, 0 -_080C4F98: .4byte 0x0000056c -_080C4F9C: .4byte 0x0000052b + .pool _080C4FA0: lsls r0, r2, 24 lsrs r0, 24 cmp r0, 0x3 beq _080C4FB8 - ldr r2, _080C4FB4 + ldr r2, =0x0000052b adds r1, r2 movs r0, 0x1 strb r0, [r1] b _080C4FC2 .align 2, 0 -_080C4FB4: .4byte 0x0000052b + .pool _080C4FB8: - ldr r0, _080C4FC8 + ldr r0, =0x0000052b adds r1, r0 movs r0, 0x1 strb r0, [r1] @@ -403599,7 +390221,7 @@ _080C4FC2: pop {r1} bx r1 .align 2, 0 -_080C4FC8: .4byte 0x0000052b + .pool thumb_func_end sub_80C4F50 thumb_func_start sub_80C4FCC @@ -403634,25 +390256,25 @@ sub_80C4FF0: @ 80C4FF0 bl in_trade_center cmp r0, 0x1 bne _080C5060 - ldr r0, _080C5048 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 bne _080C5060 - ldr r5, _080C504C + ldr r5, =0x02039ce8 ldr r0, [r5] - ldr r1, _080C5050 + ldr r1, =0x00000583 adds r0, r1 ldrb r0, [r0] bl sub_806EFF0 lsls r0, 16 lsrs r0, 16 - ldr r4, _080C5054 + ldr r4, =0x0856fb18 ldr r1, [r5] - ldr r3, _080C5058 + ldr r3, =0x00000534 adds r2, r1, r3 ldrb r3, [r2] lsls r3, 1 - ldr r2, _080C505C + ldr r2, =0x0000052b adds r1, r2 ldrb r1, [r1] lsls r1, 2 @@ -403670,19 +390292,14 @@ sub_80C4FF0: @ 80C4FF0 bl sub_818D938 b _080C50AE .align 2, 0 -_080C5048: .4byte 0x03003124 -_080C504C: .4byte 0x02039ce8 -_080C5050: .4byte 0x00000583 -_080C5054: .4byte 0x0856fb18 -_080C5058: .4byte 0x00000534 -_080C505C: .4byte 0x0000052b + .pool _080C5060: - ldr r2, _080C50B8 - ldr r6, _080C50BC + ldr r2, =0x0856fb20 + ldr r6, =0x02039ce8 ldr r0, [r6] - ldr r5, _080C50C0 + ldr r5, =0x00000534 adds r1, r0, r5 - ldr r3, _080C50C4 + ldr r3, =0x0000052a adds r0, r3 ldrb r0, [r0] lsls r0, 1 @@ -403693,12 +390310,12 @@ _080C5060: bl sub_806EFF0 lsls r0, 16 lsrs r0, 16 - ldr r4, _080C50C8 + ldr r4, =0x0856fb18 ldr r1, [r6] adds r5, r1, r5 ldrb r3, [r5] lsls r3, 1 - ldr r2, _080C50CC + ldr r2, =0x0000052b adds r1, r2 ldrb r1, [r1] lsls r1, 2 @@ -403720,12 +390337,7 @@ _080C50AE: pop {r0} bx r0 .align 2, 0 -_080C50B8: .4byte 0x0856fb20 -_080C50BC: .4byte 0x02039ce8 -_080C50C0: .4byte 0x00000534 -_080C50C4: .4byte 0x0000052a -_080C50C8: .4byte 0x0856fb18 -_080C50CC: .4byte 0x0000052b + .pool thumb_func_end sub_80C4FF0 thumb_func_start sub_80C50D0 @@ -403811,7 +390423,7 @@ sub_80C50D0: @ 80C50D0 strh r0, [r1] movs r1, 0xC0 lsls r1, 19 - ldr r2, _080C51BC + ldr r2, =0x0100c000 mov r0, sp bl CpuSet movs r0, 0 @@ -403819,32 +390431,31 @@ sub_80C50D0: @ 80C50D0 add r0, sp, 0x4 movs r1, 0xE0 lsls r1, 19 - ldr r2, _080C51C0 + ldr r2, =0x05000100 bl CpuSet add sp, 0x8 pop {r0} bx r0 .align 2, 0 -_080C51BC: .4byte 0x0100c000 -_080C51C0: .4byte 0x05000100 + .pool thumb_func_end sub_80C50D0 thumb_func_start sub_80C51C4 sub_80C51C4: @ 80C51C4 push {lr} bl sub_80C51F0 - ldr r0, _080C51D4 + ldr r0, =sub_80C544C + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080C51D4: .4byte sub_80C544C + 1 + .pool thumb_func_end sub_80C51C4 thumb_func_start sub_80C51D8 sub_80C51D8: @ 80C51D8 push {lr} - ldr r0, _080C51EC + ldr r0, =0x02039cec ldr r0, [r0] ldr r0, [r0] bl set_callback2 @@ -403852,21 +390463,21 @@ sub_80C51D8: @ 80C51D8 pop {r0} bx r0 .align 2, 0 -_080C51EC: .4byte 0x02039cec + .pool thumb_func_end sub_80C51D8 thumb_func_start sub_80C51F0 sub_80C51F0: @ 80C51F0 push {r4-r6,lr} adds r4, r0, 0 - ldr r5, _080C5200 + ldr r5, =0x02039cec ldr r0, [r5] cmp r0, 0 beq _080C5204 movs r0, 0x1 b _080C52C8 .align 2, 0 -_080C5200: .4byte 0x02039cec + .pool _080C5204: movs r0, 0x18 bl malloc_and_clear @@ -403891,7 +390502,7 @@ _080C5214: strh r1, [r0, 0xA] b _080C5240 _080C5232: - ldr r2, _080C52D0 + ldr r2, =0x02039cec ldr r1, [r2] movs r0, 0xB0 strh r0, [r1, 0x8] @@ -403900,9 +390511,9 @@ _080C5232: adds r5, r2, 0 _080C5240: ldr r1, [r5] - ldr r0, _080C52D4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _080C52D8 + ldr r2, =0x00000eb8 adds r0, r2 ldrh r0, [r0] strh r0, [r1, 0x6] @@ -403934,7 +390545,7 @@ _080C5240: adds r6, r5, 0 _080C5286: lsls r5, r4, 1 - ldr r1, _080C52DC + ldr r1, =0x000008c4 adds r0, r5, r1 bl flag_check lsls r0, 24 @@ -403947,7 +390558,7 @@ _080C5286: adds r0, 0x1 strb r0, [r1] _080C52A2: - ldr r2, _080C52E0 + ldr r2, =0x000008c5 adds r0, r5, r2 bl flag_check lsls r0, 24 @@ -403971,17 +390582,13 @@ _080C52C8: pop {r1} bx r1 .align 2, 0 -_080C52D0: .4byte 0x02039cec -_080C52D4: .4byte 0x03005d90 -_080C52D8: .4byte 0x00000eb8 -_080C52DC: .4byte 0x000008c4 -_080C52E0: .4byte 0x000008c5 + .pool thumb_func_end sub_80C51F0 thumb_func_start sub_80C52E4 sub_80C52E4: @ 80C52E4 push {r4,lr} - ldr r4, _080C5304 + ldr r4, =0x02039cec ldr r0, [r4] cmp r0, 0 beq _080C5308 @@ -403994,7 +390601,7 @@ sub_80C52E4: @ 80C52E4 str r0, [r4] b _080C530A .align 2, 0 -_080C5304: .4byte 0x02039cec + .pool _080C5308: movs r0, 0x1 _080C530A: @@ -404006,16 +390613,16 @@ _080C530A: thumb_func_start sub_80C5310 sub_80C5310: @ 80C5310 push {r4,lr} - ldr r4, _080C5320 + ldr r4, =0x02039cf0 ldr r0, [r4] cmp r0, 0 beq _080C5324 movs r0, 0x1 b _080C533A .align 2, 0 -_080C5320: .4byte 0x02039cf0 + .pool _080C5324: - ldr r0, _080C5334 + ldr r0, =0x00002434 bl malloc_and_clear str r0, [r4] cmp r0, 0 @@ -404023,7 +390630,7 @@ _080C5324: movs r0, 0 b _080C533A .align 2, 0 -_080C5334: .4byte 0x00002434 + .pool _080C5338: movs r0, 0x2 _080C533A: @@ -404036,14 +390643,14 @@ _080C533A: sub_80C5340: @ 80C5340 push {r4,lr} bl Window_FreeMemory - ldr r4, _080C5354 + ldr r4, =0x02039cf0 ldr r0, [r4] cmp r0, 0 bne _080C5358 movs r0, 0x1 b _080C53A0 .align 2, 0 -_080C5354: .4byte 0x02039cf0 + .pool _080C5358: ldr r0, [r0, 0x28] cmp r0, 0 @@ -404072,7 +390679,7 @@ _080C537A: str r0, [r1, 0x20] _080C538C: ldr r0, [r4] - ldr r2, _080C53A8 + ldr r2, =0x00002434 movs r1, 0 bl memset ldr r0, [r4] @@ -404084,22 +390691,22 @@ _080C53A0: pop {r1} bx r1 .align 2, 0 -_080C53A8: .4byte 0x00002434 + .pool thumb_func_end sub_80C5340 thumb_func_start pokemon_details pokemon_details: @ 80C53AC push {r4-r7,lr} sub sp, 0x10 - ldr r0, _080C542C + ldr r0, =0x02039cf0 ldr r6, [r0] adds r0, r6, 0 adds r0, 0x2C ldrb r0, [r0] cmp r0, 0 beq _080C5416 - ldr r3, _080C5430 - ldr r0, _080C5434 + ldr r3, =0x085713e0 + ldr r0, =0x02039cec ldr r0, [r0] ldrb r4, [r0, 0xE] lsls r4, 28 @@ -404150,9 +390757,7 @@ _080C5416: pop {r0} bx r0 .align 2, 0 -_080C542C: .4byte 0x02039cf0 -_080C5430: .4byte 0x085713e0 -_080C5434: .4byte 0x02039cec + .pool thumb_func_end pokemon_details thumb_func_start sub_80C5438 @@ -404171,17 +390776,16 @@ sub_80C544C: @ 80C544C bl sub_80C5484 cmp r0, 0 beq _080C5464 - ldr r0, _080C5468 + ldr r0, =sub_80C5A48 + 1 movs r1, 0 bl AddTask - ldr r0, _080C546C + ldr r0, =sub_80C5438 + 1 bl set_callback2 _080C5464: pop {r0} bx r0 .align 2, 0 -_080C5468: .4byte sub_80C5A48 + 1 -_080C546C: .4byte sub_80C5438 + 1 + .pool thumb_func_end sub_80C544C thumb_func_start sub_80C5470 @@ -404202,7 +390806,7 @@ sub_80C5484: @ 80C5484 sub sp, 0xC movs r0, 0 str r0, [sp, 0x8] - ldr r0, _080C54A4 + ldr r0, =0x02039cec ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0xA @@ -404210,13 +390814,12 @@ sub_80C5484: @ 80C5484 b _080C56F4 _080C5498: lsls r0, 2 - ldr r1, _080C54A8 + ldr r1, =_080C54AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C54A4: .4byte 0x02039cec -_080C54A8: .4byte _080C54AC + .pool .align 2, 0 _080C54AC: .4byte _080C54D8 @@ -404254,22 +390857,22 @@ _080C550A: _080C5510: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080C5550 + ldr r1, =0x085713e8 movs r0, 0x1 movs r2, 0x3 bl bg_vram_setup - ldr r4, _080C5554 + ldr r4, =0x02039cf0 ldr r1, [r4] adds r1, 0x32 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _080C5558 + ldr r0, =0x00001032 adds r1, r0 movs r0, 0x2 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _080C555C + ldr r0, =0x00002032 adds r1, r0 movs r0, 0x3 bl bg_set_tilemap @@ -404279,42 +390882,39 @@ _080C5510: bl gpu_bg_config_set_field b _080C56F4 .align 2, 0 -_080C5550: .4byte 0x085713e8 -_080C5554: .4byte 0x02039cf0 -_080C5558: .4byte 0x00001032 -_080C555C: .4byte 0x00002032 + .pool _080C5560: - ldr r0, _080C556C + ldr r0, =0x08571400 bl Window_InitFromTemplates bl TextBox_ResetSomeField b _080C56F4 .align 2, 0 -_080C556C: .4byte 0x08571400 + .pool _080C5570: - ldr r0, _080C55B8 + ldr r0, =0x085712f8 add r1, sp, 0x8 bl malloc_and_decompress - ldr r4, _080C55BC + ldr r4, =0x02039cf0 ldr r1, [r4] str r0, [r1, 0x20] - ldr r0, _080C55C0 + ldr r0, =0x08571060 add r1, sp, 0x8 bl malloc_and_decompress ldr r1, [r4] str r0, [r1, 0x24] - ldr r0, _080C55C4 + ldr r0, =0x085712c0 add r1, sp, 0x8 bl malloc_and_decompress ldr r1, [r4] str r0, [r1, 0x28] - ldr r1, _080C55C8 + ldr r1, =0x08de08c8 movs r4, 0 str r4, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _080C55CC + ldr r1, =0x08de2084 str r4, [sp] movs r0, 0x2 movs r2, 0 @@ -404322,12 +390922,7 @@ _080C5570: bl decompress_and_copy_tile_data_to_vram b _080C56F4 .align 2, 0 -_080C55B8: .4byte 0x085712f8 -_080C55BC: .4byte 0x02039cf0 -_080C55C0: .4byte 0x08571060 -_080C55C4: .4byte 0x085712c0 -_080C55C8: .4byte 0x08de08c8 -_080C55CC: .4byte 0x08de2084 + .pool _080C55D0: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -404366,13 +390961,13 @@ _080C55DC: bl gpu_copy_wram_bg_tilemap_to_vram b _080C56F4 _080C5624: - ldr r4, _080C567C + ldr r4, =0x08de07c8 movs r2, 0xD0 lsls r2, 1 adds r0, r4, 0 movs r1, 0 bl gpu_pal_apply - ldr r5, _080C5680 + ldr r5, =0x02039cec ldr r0, [r5] ldrb r0, [r0, 0xE] lsrs r0, 4 @@ -404406,8 +391001,7 @@ _080C5674: movs r0, 0x1 b _080C5700 .align 2, 0 -_080C567C: .4byte 0x08de07c8 -_080C5680: .4byte 0x02039cec + .pool _080C5684: movs r1, 0x82 lsls r1, 5 @@ -404420,7 +391014,7 @@ _080C5684: movs r0, 0x2 bl gpu_sync_bg_show bl sub_80C62DC - ldr r0, _080C56CC + ldr r0, =pokemon_details + 1 bl SetVBlankCallback movs r4, 0x1 negs r4, r4 @@ -404437,7 +391031,7 @@ _080C5684: bl sub_80A1AD4 b _080C56F4 .align 2, 0 -_080C56CC: .4byte pokemon_details + 1 + .pool _080C56D0: bl call_obj_callbacks bl obj_sync_something @@ -404446,15 +391040,15 @@ _080C56D0: lsrs r1, r0, 24 cmp r1, 0 bne _080C56FE - ldr r0, _080C56F0 + ldr r0, =0x02039cec ldr r0, [r0] strh r1, [r0, 0x4] movs r0, 0x1 b _080C5700 .align 2, 0 -_080C56F0: .4byte 0x02039cec + .pool _080C56F4: - ldr r0, _080C5708 + ldr r0, =0x02039cec ldr r1, [r0] ldrh r0, [r1, 0x4] adds r0, 0x1 @@ -404467,27 +391061,26 @@ _080C5700: pop {r1} bx r1 .align 2, 0 -_080C5708: .4byte 0x02039cec + .pool thumb_func_end sub_80C5484 thumb_func_start sub_80C570C sub_80C570C: @ 80C570C push {lr} sub sp, 0x4 - ldr r1, _080C5728 + ldr r1, =0x02039cec ldr r0, [r1] ldrh r0, [r0, 0x4] adds r2, r1, 0 cmp r0, 0x5 bhi _080C57E4 lsls r0, 2 - ldr r1, _080C572C + ldr r1, =_080C5730 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C5728: .4byte 0x02039cec -_080C572C: .4byte _080C5730 + .pool .align 2, 0 _080C5730: .4byte _080C5748 @@ -404555,16 +391148,16 @@ _080C57BE: movs r0, 0x2 bl bg_unset_tilemap bl sub_80C5340 - ldr r0, _080C57E0 + ldr r0, =0x02039cec ldr r1, [r0] movs r0, 0 strh r0, [r1, 0x4] movs r0, 0x1 b _080C57F0 .align 2, 0 -_080C57E0: .4byte 0x02039cec + .pool _080C57E4: - ldr r0, _080C57F8 + ldr r0, =0x02039cec ldr r1, [r0] ldrh r0, [r1, 0x4] adds r0, 0x1 @@ -404577,7 +391170,7 @@ _080C57F0: pop {r1} bx r1 .align 2, 0 -_080C57F8: .4byte 0x02039cec + .pool thumb_func_end sub_80C570C thumb_func_start sub_80C57FC @@ -404586,7 +391179,7 @@ sub_80C57FC: @ 80C57FC lsls r0, 16 lsrs r6, r0, 16 movs r4, 0 - ldr r7, _080C584C + ldr r7, =0x08571454 lsls r1, 16 asrs r5, r1, 16 _080C580A: @@ -404612,7 +391205,7 @@ _080C580A: blt _080C5854 cmp r4, 0x5 bls _080C5842 - ldr r0, _080C5850 + ldr r0, =0x02039cec ldr r0, [r0] adds r0, r4 ldrb r0, [r0, 0x9] @@ -404624,8 +391217,7 @@ _080C5842: lsrs r0, 24 b _080C5860 .align 2, 0 -_080C584C: .4byte 0x08571454 -_080C5850: .4byte 0x02039cec + .pool _080C5854: adds r0, r4, 0x1 lsls r0, 24 @@ -404646,7 +391238,7 @@ sub_80C5868: @ 80C5868 bl sub_80C5484 cmp r0, 0 beq _080C58C6 - ldr r1, _080C58A0 + ldr r1, =0x02039cec ldr r0, [r1] ldrb r0, [r0, 0xE] lsls r0, 28 @@ -404655,12 +391247,12 @@ sub_80C5868: @ 80C5868 blt _080C58AC cmp r0, 0x2 bgt _080C58AC - ldr r0, _080C58A4 + ldr r0, =sub_80C5BD8 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080C58A8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -404669,9 +391261,7 @@ sub_80C5868: @ 80C5868 strh r0, [r1, 0x8] b _080C58C0 .align 2, 0 -_080C58A0: .4byte 0x02039cec -_080C58A4: .4byte sub_80C5BD8 + 1 -_080C58A8: .4byte 0x03005e00 + .pool _080C58AC: ldr r2, [r1] ldrb r1, [r2, 0xE] @@ -404679,27 +391269,26 @@ _080C58AC: negs r0, r0 ands r0, r1 strb r0, [r2, 0xE] - ldr r0, _080C58CC + ldr r0, =sub_80C5A48 + 1 movs r1, 0 bl AddTask _080C58C0: - ldr r0, _080C58D0 + ldr r0, =sub_80C5438 + 1 bl set_callback2 _080C58C6: pop {r0} bx r0 .align 2, 0 -_080C58CC: .4byte sub_80C5A48 + 1 -_080C58D0: .4byte sub_80C5438 + 1 + .pool thumb_func_end sub_80C5868 thumb_func_start sub_80C58D4 sub_80C58D4: @ 80C58D4 push {r4,lr} - ldr r4, _080C590C + ldr r4, =0x02039cf8 ldr r0, [r4] bl sub_80C51F0 - ldr r0, _080C5910 + ldr r0, =0x02039cec ldr r1, [r0] ldrh r0, [r4, 0x4] strh r0, [r1, 0x8] @@ -404719,26 +391308,25 @@ sub_80C58D4: @ 80C58D4 bl sub_8085784 b _080C5924 .align 2, 0 -_080C590C: .4byte 0x02039cf8 -_080C5910: .4byte 0x02039cec + .pool _080C5914: - ldr r0, _080C5918 + ldr r0, =0x000001cd b _080C5920 .align 2, 0 -_080C5918: .4byte 0x000001cd + .pool _080C591C: movs r0, 0xE7 lsls r0, 1 _080C5920: bl song_play_for_text _080C5924: - ldr r0, _080C5930 + ldr r0, =sub_80C5868 + 1 bl set_callback2 pop {r4} pop {r0} bx r0 .align 2, 0 -_080C5930: .4byte sub_80C5868 + 1 + .pool thumb_func_end sub_80C58D4 thumb_func_start sub_80C5934 @@ -404747,7 +391335,7 @@ sub_80C5934: @ 80C5934 bl sub_80C570C cmp r0, 0 beq _080C599A - ldr r0, _080C5958 + ldr r0, =0x02039cec ldr r2, [r0] ldrb r0, [r2, 0xE] lsls r0, 28 @@ -404760,19 +391348,19 @@ sub_80C5934: @ 80C5934 beq _080C5962 b _080C599A .align 2, 0 -_080C5958: .4byte 0x02039cec + .pool _080C595C: cmp r0, 0x3 beq _080C5970 b _080C599A _080C5962: - ldr r0, _080C596C + ldr r0, =sub_80C5868 + 1 bl sub_80C6454 b _080C599A .align 2, 0 -_080C596C: .4byte sub_80C5868 + 1 + .pool _080C5970: - ldr r1, _080C598C + ldr r1, =0x02039cf8 ldr r0, [r2] str r0, [r1] ldrh r0, [r2, 0x8] @@ -404780,20 +391368,19 @@ _080C5970: ldrh r0, [r2, 0xA] strh r0, [r1, 0x6] bl sub_80C52E4 - ldr r0, _080C5990 + ldr r0, =sub_80C58D4 + 1 bl sub_8185E24 b _080C599A .align 2, 0 -_080C598C: .4byte 0x02039cf8 -_080C5990: .4byte sub_80C58D4 + 1 + .pool _080C5994: - ldr r0, _080C59A0 + ldr r0, =sub_80C5868 + 1 bl sub_80C4DDC _080C599A: pop {r0} bx r0 .align 2, 0 -_080C59A0: .4byte sub_80C5868 + 1 + .pool thumb_func_end sub_80C5934 thumb_func_start sub_80C59A4 @@ -404811,7 +391398,7 @@ sub_80C59A4: @ 80C59A4 ble _080C59F4 cmp r1, 0x3 bne _080C59CC - ldr r0, _080C59D0 + ldr r0, =0x02039cec ldr r2, [r0] ldrb r1, [r2, 0xE] movs r0, 0x1 @@ -404822,7 +391409,7 @@ _080C59CC: movs r0, 0 b _080C5A30 .align 2, 0 -_080C59D0: .4byte 0x02039cec + .pool _080C59D4: movs r0, 0xF negs r0, r0 @@ -404832,13 +391419,13 @@ _080C59D4: strb r0, [r2, 0xE] adds r0, r3, 0 bl remove_task - ldr r0, _080C59F0 + ldr r0, =sub_80C5934 + 1 bl set_callback2 b _080C5A1A .align 2, 0 -_080C59F0: .4byte sub_80C5934 + 1 + .pool _080C59F4: - ldr r0, _080C5A38 + ldr r0, =0x02039cec ldr r3, [r0] movs r0, 0x7 ands r2, r0 @@ -404848,19 +391435,19 @@ _080C59F4: ands r0, r1 orrs r0, r2 strb r0, [r3, 0xE] - ldr r1, _080C5A3C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080C5A40 + ldr r1, =sub_80C5BD8 + 1 str r1, [r0] movs r1, 0 strh r1, [r0, 0x8] _080C5A1A: - ldr r0, _080C5A38 + ldr r0, =0x02039cec ldr r2, [r0] - ldr r0, _080C5A44 + ldr r0, =0x02039cf0 ldr r1, [r0] ldr r0, [r1] ldrh r0, [r0, 0x20] @@ -404874,10 +391461,7 @@ _080C5A30: pop {r1} bx r1 .align 2, 0 -_080C5A38: .4byte 0x02039cec -_080C5A3C: .4byte 0x03005e00 -_080C5A40: .4byte sub_80C5BD8 + 1 -_080C5A44: .4byte 0x02039cf0 + .pool thumb_func_end sub_80C59A4 thumb_func_start sub_80C5A48 @@ -404886,13 +391470,13 @@ sub_80C5A48: @ 80C5A48 lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r2, _080C5B3C + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _080C5A80 - ldr r0, _080C5B40 + ldr r0, =0x02039cf0 ldr r4, [r0] ldr r1, [r4] ldrh r3, [r1, 0x22] @@ -404917,7 +391501,7 @@ _080C5A80: ands r0, r1 cmp r0, 0 beq _080C5AAE - ldr r0, _080C5B40 + ldr r0, =0x02039cf0 ldr r4, [r0] ldr r1, [r4] ldrh r3, [r1, 0x22] @@ -404942,7 +391526,7 @@ _080C5AAE: ands r0, r1 cmp r0, 0 beq _080C5ADC - ldr r0, _080C5B40 + ldr r0, =0x02039cf0 ldr r4, [r0] ldr r1, [r4] ldrh r3, [r1, 0x20] @@ -404967,7 +391551,7 @@ _080C5ADC: ands r0, r1 cmp r0, 0 beq _080C5B0A - ldr r0, _080C5B40 + ldr r0, =0x02039cf0 ldr r4, [r0] ldr r1, [r4] ldrh r3, [r1, 0x20] @@ -404989,7 +391573,7 @@ _080C5B08: _080C5B0A: cmp r5, 0 bne _080C5B88 - ldr r4, _080C5B44 + ldr r4, =0x02039cec ldr r0, [r4] ldrb r3, [r0, 0xC] cmp r3, 0 @@ -405011,20 +391595,18 @@ _080C5B0A: bne _080C5BCA b _080C5B5E .align 2, 0 -_080C5B3C: .4byte 0x030022c0 -_080C5B40: .4byte 0x02039cf0 -_080C5B44: .4byte 0x02039cec + .pool _080C5B48: cmp r3, 0x4 bne _080C5B5E movs r0, 0x3 bl audio_play - ldr r0, _080C5B80 + ldr r0, =sub_80C5470 + 1 bl set_callback2 adds r0, r6, 0 bl remove_task _080C5B5E: - ldr r0, _080C5B84 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -405032,16 +391614,15 @@ _080C5B5E: beq _080C5BCA movs r0, 0x3 bl audio_play - ldr r0, _080C5B80 + ldr r0, =sub_80C5470 + 1 bl set_callback2 adds r0, r6, 0 bl remove_task b _080C5BCA .align 2, 0 -_080C5B80: .4byte sub_80C5470 + 1 -_080C5B84: .4byte 0x030022c0 + .pool _080C5B88: - ldr r0, _080C5BD0 + ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0] ldrh r0, [r1, 0x20] @@ -405055,7 +391636,7 @@ _080C5B88: bl sub_80C57FC lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080C5BD4 + ldr r4, =0x02039cec ldr r0, [r4] ldrb r0, [r0, 0xC] cmp r0, r5 @@ -405076,8 +391657,7 @@ _080C5BCA: pop {r0} bx r0 .align 2, 0 -_080C5BD0: .4byte 0x02039cf0 -_080C5BD4: .4byte 0x02039cec + .pool thumb_func_end sub_80C5A48 thumb_func_start sub_80C5BD8 @@ -405091,10 +391671,10 @@ sub_80C5BD8: @ 80C5BD8 lsls r0, r4, 2 adds r0, r4 lsls r5, r0, 3 - ldr r0, _080C5C04 + ldr r0, =0x03005e08 mov r8, r0 adds r6, r5, r0 - ldr r7, _080C5C08 + ldr r7, =0x02039cec ldr r0, [r7] ldrh r0, [r0, 0x4] cmp r0, 0x1 @@ -405105,8 +391685,7 @@ sub_80C5BD8: @ 80C5BD8 beq _080C5C14 b _080C5D9C .align 2, 0 -_080C5C04: .4byte 0x03005e08 -_080C5C08: .4byte 0x02039cec + .pool _080C5C0C: cmp r0, 0x2 bne _080C5C12 @@ -405131,7 +391710,7 @@ _080C5C14: strh r0, [r6, 0x8] movs r0, 0x1 negs r0, r0 - ldr r1, _080C5C48 + ldr r1, =0x00007fff str r1, [sp] movs r1, 0 movs r2, 0 @@ -405139,7 +391718,7 @@ _080C5C14: bl sub_80A1AD4 b _080C5CA4 .align 2, 0 -_080C5C48: .4byte 0x00007fff + .pool _080C5C4C: movs r1, 0xFE lsls r1, 1 @@ -405162,11 +391741,11 @@ _080C5C4C: movs r0, 0x2 bl gpu_sync_bg_show bl sub_80C62DC - ldr r0, _080C5CC8 + ldr r0, =pokemon_details + 1 bl SetVBlankCallback movs r5, 0x1 negs r5, r5 - ldr r4, _080C5CCC + ldr r4, =0x00007fff adds r0, r5, 0 movs r1, 0x10 adds r2, r4, 0 @@ -405178,7 +391757,7 @@ _080C5C4C: movs r3, 0 bl sub_80A1AD4 _080C5CA4: - ldr r4, _080C5CD0 + ldr r4, =0x02039cf0 ldr r0, [r4] adds r0, 0x2C movs r1, 0x1 @@ -405195,9 +391774,7 @@ _080C5CA4: strh r0, [r1, 0x30] b _080C5D9C .align 2, 0 -_080C5CC8: .4byte pokemon_details + 1 -_080C5CCC: .4byte 0x00007fff -_080C5CD0: .4byte 0x02039cf0 + .pool _080C5CD4: bl fade_and_return_progress_probably ldrh r0, [r6, 0x6] @@ -405211,7 +391788,7 @@ _080C5CD4: movs r1, 0x2 ldrsh r0, [r6, r1] bl sub_8151624 - ldr r4, _080C5D18 + ldr r4, =0x02039cf0 ldr r1, [r4] strh r0, [r1, 0x2E] movs r1, 0x4 @@ -405231,7 +391808,7 @@ _080C5CD4: ble _080C5DA6 b _080C5D9C .align 2, 0 -_080C5D18: .4byte 0x02039cf0 + .pool _080C5D1C: movs r0, 0x2 ldrsh r1, [r6, r0] @@ -405241,7 +391818,7 @@ _080C5D1C: bne _080C5DA6 b _080C5D9C _080C5D2A: - ldr r0, _080C5D5C + ldr r0, =0x02039cf0 ldr r0, [r0] adds r1, r0, 0 adds r1, 0x2C @@ -405261,12 +391838,11 @@ _080C5D3C: bne _080C5D64 adds r0, r4, 0 bl remove_task - ldr r0, _080C5D60 + ldr r0, =sub_80C5934 + 1 bl set_callback2 b _080C5D82 .align 2, 0 -_080C5D5C: .4byte 0x02039cf0 -_080C5D60: .4byte sub_80C5934 + 1 + .pool _080C5D64: movs r0, 0 movs r1, 0 @@ -405280,22 +391856,21 @@ _080C5D64: mov r0, r8 subs r0, 0x8 adds r0, r5, r0 - ldr r1, _080C5D94 + ldr r1, =sub_80C5A48 + 1 str r1, [r0] _080C5D82: movs r0, 0x2 movs r1, 0x6 movs r2, 0 bl gpu_bg_config_set_field - ldr r0, _080C5D98 + ldr r0, =0x02039cec ldr r1, [r0] movs r0, 0 b _080C5DA4 .align 2, 0 -_080C5D94: .4byte sub_80C5A48 + 1 -_080C5D98: .4byte 0x02039cec + .pool _080C5D9C: - ldr r0, _080C5DB4 + ldr r0, =0x02039cec ldr r1, [r0] ldrh r0, [r1, 0x4] adds r0, 0x1 @@ -405309,7 +391884,7 @@ _080C5DA6: pop {r0} bx r0 .align 2, 0 -_080C5DB4: .4byte 0x02039cec + .pool thumb_func_end sub_80C5BD8 thumb_func_start sub_80C5DB8 @@ -405330,14 +391905,14 @@ _080C5DC2: lsrs r4, r0, 24 cmp r4, 0x4 bls _080C5DC2 - ldr r4, _080C5EB8 + ldr r4, =0x085ed8ff movs r0, 0x1 adds r1, r4, 0 movs r2, 0x60 bl sub_81DB35C lsls r2, r0, 24 lsrs r2, 24 - ldr r6, _080C5EBC + ldr r6, =0x08571448 str r6, [sp] movs r0, 0 mov r8, r0 @@ -405346,7 +391921,7 @@ _080C5DC2: movs r1, 0x1 movs r3, 0x5 bl box_print - ldr r4, _080C5EC0 + ldr r4, =0x085ed90e movs r0, 0x1 adds r1, r4, 0 movs r2, 0x60 @@ -405364,15 +391939,15 @@ _080C5DC2: str r6, [sp] mov r0, r8 str r0, [sp, 0x4] - ldr r0, _080C5EC4 + ldr r0, =0x085ed91c str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0x8 movs r2, 0x5 movs r3, 0x4 bl box_print - ldr r4, _080C5EC8 - ldr r5, _080C5ECC + ldr r4, =0x02021fc4 + ldr r5, =0x02039cec ldr r0, [r5] ldrh r1, [r0, 0x6] adds r0, r4, 0 @@ -405430,12 +392005,7 @@ _080C5E92: pop {r0} bx r0 .align 2, 0 -_080C5EB8: .4byte 0x085ed8ff -_080C5EBC: .4byte 0x08571448 -_080C5EC0: .4byte 0x085ed90e -_080C5EC4: .4byte 0x085ed91c -_080C5EC8: .4byte 0x02021fc4 -_080C5ECC: .4byte 0x02039cec + .pool thumb_func_end sub_80C5DB8 thumb_func_start sub_80C5ED0 @@ -405449,17 +392019,17 @@ sub_80C5ED0: @ 80C5ED0 bl Window_FastFillPixels cmp r4, 0x3 bne _080C5F18 - ldr r0, _080C5F0C + ldr r0, =0x02039cec ldr r0, [r0] ldrb r0, [r0, 0xE] movs r1, 0x1 ands r1, r0 cmp r1, 0 bne _080C5F18 - ldr r0, _080C5F10 + ldr r0, =0x0857144b str r0, [sp] str r1, [sp, 0x4] - ldr r0, _080C5F14 + ldr r0, =0x08571614 ldr r0, [r0] str r0, [sp, 0x8] movs r0, 0x3 @@ -405469,17 +392039,15 @@ sub_80C5ED0: @ 80C5ED0 bl box_print b _080C5F3A .align 2, 0 -_080C5F0C: .4byte 0x02039cec -_080C5F10: .4byte 0x0857144b -_080C5F14: .4byte 0x08571614 + .pool _080C5F18: cmp r4, 0 beq _080C5F3A - ldr r0, _080C5F50 + ldr r0, =0x0857144b str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r1, _080C5F54 + ldr r1, =0x08571614 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] @@ -405500,8 +392068,7 @@ _080C5F3A: pop {r0} bx r0 .align 2, 0 -_080C5F50: .4byte 0x0857144b -_080C5F54: .4byte 0x08571614 + .pool thumb_func_end sub_80C5ED0 thumb_func_start sub_80C5F58 @@ -405514,7 +392081,7 @@ sub_80C5F58: @ 80C5F58 lsrs r2, r0, 24 lsls r1, 24 lsrs r7, r1, 24 - ldr r0, _080C5F7C + ldr r0, =0x02039cec ldr r0, [r0] ldrb r0, [r0, 0xE] lsls r0, 28 @@ -405525,11 +392092,11 @@ sub_80C5F58: @ 80C5F58 beq _080C5FC2 b _080C60EE .align 2, 0 -_080C5F7C: .4byte 0x02039cec + .pool _080C5F80: cmp r2, 0 beq _080C5FA8 - ldr r0, _080C5FA4 + ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x20] movs r0, 0xC @@ -405544,7 +392111,7 @@ _080C5F80: bl bg_copy_tilemap_rect_simple b _080C6004 .align 2, 0 -_080C5FA4: .4byte 0x02039cf0 + .pool _080C5FA8: movs r0, 0xC str r0, [sp] @@ -405561,7 +392128,7 @@ _080C5FA8: _080C5FC2: cmp r2, 0 beq _080C5FEC - ldr r0, _080C5FE8 + ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x20] adds r1, 0x54 @@ -405577,7 +392144,7 @@ _080C5FC2: bl bg_copy_tilemap_rect_simple b _080C6004 .align 2, 0 -_080C5FE8: .4byte 0x02039cf0 + .pool _080C5FEC: movs r0, 0xC str r0, [sp] @@ -405606,8 +392173,8 @@ _080C6004: bl sub_8151624 lsls r0, 16 asrs r0, 16 - ldr r5, _080C607C - ldr r1, _080C6080 + ldr r5, =0x085713e0 + ldr r1, =0x02039cec ldr r1, [r1] ldrb r4, [r1, 0xE] lsls r4, 28 @@ -405648,8 +392215,7 @@ _080C6004: bl call_gpu_bg_affine_set b _080C60EE .align 2, 0 -_080C607C: .4byte 0x085713e0 -_080C6080: .4byte 0x02039cec + .pool _080C6084: movs r4, 0x80 lsls r4, 1 @@ -405662,8 +392228,8 @@ _080C6084: bl sub_8151624 lsls r0, 16 asrs r0, 16 - ldr r5, _080C60FC - ldr r1, _080C6100 + ldr r5, =0x085713e0 + ldr r1, =0x02039cec ldr r1, [r1] ldrb r4, [r1, 0xE] lsls r4, 28 @@ -405709,8 +392275,7 @@ _080C60EE: pop {r0} bx r0 .align 2, 0 -_080C60FC: .4byte 0x085713e0 -_080C6100: .4byte 0x02039cec + .pool thumb_func_end sub_80C5F58 thumb_func_start sub_80C6104 @@ -405735,7 +392300,7 @@ _080C611E: beq _080C61A4 b _080C61C4 _080C6128: - ldr r0, _080C6148 + ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x24] movs r0, 0xC @@ -405750,9 +392315,9 @@ _080C6128: bl bg_copy_tilemap_rect_simple b _080C61CE .align 2, 0 -_080C6148: .4byte 0x02039cf0 + .pool _080C614C: - ldr r0, _080C616C + ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x24] movs r0, 0xA8 @@ -405768,16 +392333,16 @@ _080C614C: movs r2, 0x10 b _080C6192 .align 2, 0 -_080C616C: .4byte 0x02039cf0 + .pool _080C6170: - ldr r0, _080C619C + ldr r0, =0x02039cec ldr r0, [r0] ldrb r1, [r0, 0xE] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080C61C4 - ldr r0, _080C61A0 + ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x28] movs r0, 0xC @@ -405792,10 +392357,9 @@ _080C6192: bl bg_copy_tilemap_rect_simple b _080C61CE .align 2, 0 -_080C619C: .4byte 0x02039cec -_080C61A0: .4byte 0x02039cf0 + .pool _080C61A4: - ldr r1, _080C61C0 + ldr r1, =0x08de3350 movs r0, 0x9 str r0, [sp] movs r0, 0x2 @@ -405808,7 +392372,7 @@ _080C61A4: bl bg_copy_tilemap_rect_simple b _080C61CE .align 2, 0 -_080C61C0: .4byte 0x08de3350 + .pool _080C61C4: subs r0, r4, 0x1 lsls r0, 24 @@ -405830,7 +392394,7 @@ _080C61DC: beq _080C6264 b _080C6284 _080C61E6: - ldr r0, _080C6208 + ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x24] adds r1, 0xA8 @@ -405846,9 +392410,9 @@ _080C61E6: bl bg_copy_tilemap_rect_simple b _080C628E .align 2, 0 -_080C6208: .4byte 0x02039cf0 + .pool _080C620C: - ldr r0, _080C622C + ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x24] movs r0, 0xFC @@ -405864,16 +392428,16 @@ _080C620C: movs r2, 0x10 b _080C6254 .align 2, 0 -_080C622C: .4byte 0x02039cf0 + .pool _080C6230: - ldr r0, _080C625C + ldr r0, =0x02039cec ldr r0, [r0] ldrb r1, [r0, 0xE] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080C6294 - ldr r0, _080C6260 + ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x28] adds r1, 0x48 @@ -405889,10 +392453,9 @@ _080C6254: bl bg_copy_tilemap_rect_simple b _080C628E .align 2, 0 -_080C625C: .4byte 0x02039cec -_080C6260: .4byte 0x02039cf0 + .pool _080C6264: - ldr r1, _080C6280 + ldr r1, =0x08de3374 movs r0, 0x9 str r0, [sp] movs r0, 0x2 @@ -405905,7 +392468,7 @@ _080C6264: bl bg_copy_tilemap_rect_simple b _080C628E .align 2, 0 -_080C6280: .4byte 0x08de3374 + .pool _080C6284: subs r0, r5, 0x1 lsls r0, 24 @@ -405925,12 +392488,12 @@ _080C6294: thumb_func_start sub_80C629C sub_80C629C: @ 80C629C push {r4,lr} - ldr r1, _080C62D4 + ldr r1, =0x08de3060 movs r0, 0x1 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r4, _080C62D8 + ldr r4, =0x02039cec ldr r1, [r4] ldrb r0, [r1, 0xC] ldrb r1, [r1, 0xD] @@ -405948,8 +392511,7 @@ sub_80C629C: @ 80C629C pop {r0} bx r0 .align 2, 0 -_080C62D4: .4byte 0x08de3060 -_080C62D8: .4byte 0x02039cec + .pool thumb_func_end sub_80C629C thumb_func_start sub_80C62DC @@ -405962,16 +392524,16 @@ sub_80C62DC: @ 80C62DC movs r5, 0 bl gpu_pal_allocator_reset bl rotscale_reset_all - ldr r0, _080C63D8 + ldr r0, =0x085714e4 bl gpu_pal_obj_alloc_and_load_multiple - ldr r4, _080C63DC + ldr r4, =0x085714bc adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load adds r4, 0x10 adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load - ldr r0, _080C63E0 - ldr r1, _080C63E4 + ldr r0, =0x085715b4 + ldr r1, =0x02039cec ldr r2, [r1] movs r3, 0x8 ldrsh r1, [r2, r3] @@ -405981,12 +392543,12 @@ sub_80C62DC: @ 80C62DC bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r3, _080C63E8 + ldr r3, =0x02039cf0 ldr r2, [r3] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080C63EC + ldr r0, =0x02020630 adds r1, r0 str r1, [r2] ldrb r2, [r1, 0x5] @@ -405997,7 +392559,7 @@ sub_80C62DC: @ 80C62DC mov r8, sp mov r9, r3 _080C633C: - ldr r0, _080C63E4 + ldr r0, =0x02039cec ldr r0, [r0] adds r0, 0xF adds r2, r0, r5 @@ -406006,19 +392568,19 @@ _080C633C: cmp r0, 0 beq _080C63C2 mov r1, sp - ldr r0, _080C63F0 + ldr r0, =0x085715e4 ldm r0!, {r3,r6,r7} stm r1!, {r3,r6,r7} ldm r0!, {r3,r6,r7} stm r1!, {r3,r6,r7} mov r7, r8 ldrh r0, [r7, 0x2] - ldr r1, _080C63F4 + ldr r1, =0x0000ffff adds r0, r1 ldrb r2, [r2] adds r0, r2 strh r0, [r7, 0x2] - ldr r1, _080C63F8 + ldr r1, =0x08571454 adds r0, r5, 0x6 lsls r0, 3 adds r0, r1 @@ -406044,7 +392606,7 @@ _080C633C: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080C63EC + ldr r0, =0x02020630 adds r1, r0 str r1, [r2] ldrb r2, [r1, 0x5] @@ -406075,22 +392637,14 @@ _080C63C2: pop {r0} bx r0 .align 2, 0 -_080C63D8: .4byte 0x085714e4 -_080C63DC: .4byte 0x085714bc -_080C63E0: .4byte 0x085715b4 -_080C63E4: .4byte 0x02039cec -_080C63E8: .4byte 0x02039cf0 -_080C63EC: .4byte 0x02020630 -_080C63F0: .4byte 0x085715e4 -_080C63F4: .4byte 0x0000ffff -_080C63F8: .4byte 0x08571454 + .pool thumb_func_end sub_80C62DC thumb_func_start sub_80C63FC sub_80C63FC: @ 80C63FC push {r4-r6,lr} movs r5, 0 - ldr r4, _080C644C + ldr r4, =0x02039cf0 ldr r0, [r4] ldr r0, [r0] bl obj_delete_and_free_tiles @@ -406126,7 +392680,7 @@ _080C642C: pop {r0} bx r0 .align 2, 0 -_080C644C: .4byte 0x02039cf0 + .pool thumb_func_end sub_80C63FC thumb_func_start nullsub_39 @@ -406138,43 +392692,40 @@ nullsub_39: @ 80C6450 sub_80C6454: @ 80C6454 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080C6488 + ldr r5, =0x02039cf4 ldr r0, [r5] cmp r0, 0 beq _080C6466 adds r0, r4, 0 bl set_callback2 _080C6466: - ldr r0, _080C648C + ldr r0, =0x00003014 bl malloc_and_clear str r0, [r5] str r4, [r0] bl clear_tasks - ldr r0, _080C6490 + ldr r0, =sub_80C67BC + 1 movs r1, 0 bl AddTask - ldr r0, _080C6494 + ldr r0, =sub_80C5438 + 1 bl set_callback2 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080C6488: .4byte 0x02039cf4 -_080C648C: .4byte 0x00003014 -_080C6490: .4byte sub_80C67BC + 1 -_080C6494: .4byte sub_80C5438 + 1 + .pool thumb_func_end sub_80C6454 thumb_func_start sub_80C6498 sub_80C6498: @ 80C6498 push {r4,lr} bl clear_tasks - ldr r4, _080C64C4 + ldr r4, =0x02039cf4 ldr r0, [r4] ldr r0, [r0] bl set_callback2 ldr r0, [r4] - ldr r2, _080C64C8 + ldr r2, =0x00003014 movs r1, 0 bl memset ldr r0, [r4] @@ -406185,15 +392736,14 @@ sub_80C6498: @ 80C6498 pop {r0} bx r0 .align 2, 0 -_080C64C4: .4byte 0x02039cf4 -_080C64C8: .4byte 0x00003014 + .pool thumb_func_end sub_80C6498 thumb_func_start sub_80C64CC sub_80C64CC: @ 80C64CC push {r4,r5,lr} sub sp, 0x8 - ldr r0, _080C64E8 + ldr r0, =0x02039cec ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0x7 @@ -406201,13 +392751,12 @@ sub_80C64CC: @ 80C64CC b _080C6694 _080C64DC: lsls r0, 2 - ldr r1, _080C64EC + ldr r1, =_080C64F0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C64E8: .4byte 0x02039cec -_080C64EC: .4byte _080C64F0 + .pool .align 2, 0 _080C64F0: .4byte _080C6510 @@ -406236,22 +392785,22 @@ _080C6526: _080C6538: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080C65B0 + ldr r1, =0x085713f4 movs r0, 0 movs r2, 0x3 bl bg_vram_setup - ldr r4, _080C65B4 + ldr r4, =0x02039cf4 ldr r1, [r4] adds r1, 0x12 movs r0, 0 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _080C65B8 + ldr r0, =0x00001012 adds r1, r0 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _080C65BC + ldr r0, =0x00002012 adds r1, r0 movs r0, 0x2 bl bg_set_tilemap @@ -406284,16 +392833,13 @@ _080C6538: bl gpu_copy_wram_bg_tilemap_to_vram b _080C6618 .align 2, 0 -_080C65B0: .4byte 0x085713f4 -_080C65B4: .4byte 0x02039cf4 -_080C65B8: .4byte 0x00001012 -_080C65BC: .4byte 0x00002012 + .pool _080C65C0: - ldr r0, _080C65E0 + ldr r0, =0x08571428 bl Window_InitFromTemplates bl TextBox_ResetSomeField bl sub_80C6B94 - ldr r1, _080C65E4 + ldr r1, =0x0856fbbc movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -406302,14 +392848,13 @@ _080C65C0: bl decompress_and_copy_tile_data_to_vram b _080C6694 .align 2, 0 -_080C65E0: .4byte 0x08571428 -_080C65E4: .4byte 0x0856fbbc + .pool _080C65E8: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 bne _080C669E - ldr r0, _080C6620 + ldr r0, =0x08de07c8 movs r2, 0xD0 lsls r2, 1 movs r1, 0 @@ -406319,7 +392864,7 @@ _080C65E8: movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _080C6624 + ldr r1, =0x08570e00 movs r0, 0x2 movs r2, 0 movs r3, 0 @@ -406329,8 +392874,7 @@ _080C6618: bl gpu_copy_wram_bg_tilemap_to_vram b _080C6694 .align 2, 0 -_080C6620: .4byte 0x08de07c8 -_080C6624: .4byte 0x08570e00 + .pool _080C6628: movs r1, 0x82 lsls r1, 5 @@ -406343,11 +392887,11 @@ _080C6628: movs r0, 0x2 bl gpu_sync_bg_show bl sub_80C6974 - ldr r0, _080C6670 + ldr r0, =pokemon_details + 1 bl SetVBlankCallback movs r5, 0x1 negs r5, r5 - ldr r4, _080C6674 + ldr r4, =0x00007fff adds r0, r5, 0 movs r1, 0x10 adds r2, r4, 0 @@ -406360,23 +392904,22 @@ _080C6628: bl sub_80A1AD4 b _080C6694 .align 2, 0 -_080C6670: .4byte pokemon_details + 1 -_080C6674: .4byte 0x00007fff + .pool _080C6678: bl fade_and_return_progress_probably lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 bne _080C669E - ldr r0, _080C6690 + ldr r0, =0x02039cec ldr r0, [r0] strh r1, [r0, 0x4] movs r0, 0x1 b _080C66A0 .align 2, 0 -_080C6690: .4byte 0x02039cec + .pool _080C6694: - ldr r0, _080C66A8 + ldr r0, =0x02039cec ldr r1, [r0] ldrh r0, [r1, 0x4] adds r0, 0x1 @@ -406389,26 +392932,25 @@ _080C66A0: pop {r1} bx r1 .align 2, 0 -_080C66A8: .4byte 0x02039cec + .pool thumb_func_end sub_80C64CC thumb_func_start sub_80C66AC sub_80C66AC: @ 80C66AC push {r4,lr} sub sp, 0x4 - ldr r0, _080C66C4 + ldr r0, =0x02039cec ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0x5 bhi _080C67A4 lsls r0, 2 - ldr r1, _080C66C8 + ldr r1, =_080C66CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C66C4: .4byte 0x02039cec -_080C66C8: .4byte _080C66CC + .pool .align 2, 0 _080C66CC: .4byte _080C66E4 @@ -406420,7 +392962,7 @@ _080C66CC: _080C66E4: movs r0, 0x1 negs r0, r0 - ldr r1, _080C66F8 + ldr r1, =0x00007fff str r1, [sp] movs r1, 0 movs r2, 0 @@ -406428,7 +392970,7 @@ _080C66E4: bl sub_80A1AD4 b _080C67A4 .align 2, 0 -_080C66F8: .4byte 0x00007fff + .pool _080C66FC: bl fade_and_return_progress_probably lsls r0, 24 @@ -406451,7 +392993,7 @@ _080C6722: bl vblank_hblank_handler_set_zero b _080C67A4 _080C6732: - ldr r4, _080C6770 + ldr r4, =0x02039cf4 ldr r0, [r4] ldr r0, [r0, 0x4] cmp r0, 0 @@ -406479,7 +393021,7 @@ _080C676A: bl Window_FreeMemory b _080C67A4 .align 2, 0 -_080C6770: .4byte 0x02039cf4 + .pool _080C6774: bl sub_80C50D0 bl reset_all_obj_data @@ -406492,16 +393034,16 @@ _080C6782: bl bg_unset_tilemap movs r0, 0x2 bl bg_unset_tilemap - ldr r0, _080C67A0 + ldr r0, =0x02039cec ldr r1, [r0] movs r0, 0 strh r0, [r1, 0x4] movs r0, 0x1 b _080C67B0 .align 2, 0 -_080C67A0: .4byte 0x02039cec + .pool _080C67A4: - ldr r0, _080C67B8 + ldr r0, =0x02039cec ldr r1, [r0] ldrh r0, [r1, 0x4] adds r0, 0x1 @@ -406514,7 +393056,7 @@ _080C67B0: pop {r1} bx r1 .align 2, 0 -_080C67B8: .4byte 0x02039cec + .pool thumb_func_end sub_80C66AC thumb_func_start sub_80C67BC @@ -406525,7 +393067,7 @@ sub_80C67BC: @ 80C67BC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080C67E0 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -406534,13 +393076,12 @@ sub_80C67BC: @ 80C67BC b _080C68DA _080C67D6: lsls r0, 2 - ldr r1, _080C67E4 + ldr r1, =_080C67E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C67E0: .4byte 0x03005e08 -_080C67E4: .4byte _080C67E8 + .pool .align 2, 0 _080C67E8: .4byte _080C6800 @@ -406553,7 +393094,7 @@ _080C6800: bl sub_80C64CC b _080C68C8 _080C6806: - ldr r0, _080C6820 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r2, 0x2 adds r0, r2, 0 @@ -406565,13 +393106,13 @@ _080C6806: movs r0, 0x4 b _080C68DE .align 2, 0 -_080C6820: .4byte 0x030022c0 + .pool _080C6824: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _080C6848 - ldr r0, _080C6840 + ldr r0, =0x02039cf4 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x5 @@ -406580,7 +393121,7 @@ _080C6824: bl sub_80C6C70 b _080C68E0 .align 2, 0 -_080C6840: .4byte 0x02039cf4 + .pool _080C6844: strh r2, [r4] b _080C68E0 @@ -406589,7 +393130,7 @@ _080C6848: ands r0, r1 cmp r0, 0 beq _080C68E0 - ldr r0, _080C6864 + ldr r0, =0x02039cf4 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 @@ -406598,7 +393139,7 @@ _080C6848: bl sub_80C6C70 b _080C68E0 .align 2, 0 -_080C6864: .4byte 0x02039cf4 + .pool _080C6868: movs r0, 0x3 b _080C68DE @@ -406614,14 +393155,14 @@ _080C686C: movs r0, 0x1 b _080C68DE _080C6882: - ldr r0, _080C6890 + ldr r0, =0x02039cf4 ldr r0, [r0] ldr r1, [r0, 0x4] ldrh r0, [r1, 0x22] adds r0, 0x4 b _080C68B4 .align 2, 0 -_080C6890: .4byte 0x02039cf4 + .pool _080C6894: movs r1, 0x2 ldrsh r0, [r4, r1] @@ -406634,7 +393175,7 @@ _080C6894: movs r0, 0x1 b _080C68DE _080C68AA: - ldr r0, _080C68C0 + ldr r0, =0x02039cf4 ldr r0, [r0] ldr r1, [r0, 0x4] ldrh r0, [r1, 0x22] @@ -406646,7 +393187,7 @@ _080C68B4: strh r0, [r4, 0x2] b _080C68E0 .align 2, 0 -_080C68C0: .4byte 0x02039cf4 + .pool _080C68C4: bl sub_80C66AC _080C68C8: @@ -406674,7 +393215,7 @@ sub_80C68E8: @ 80C68E8 push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r2, _080C6908 + ldr r2, =0xfffb0000 adds r0, r2 lsrs r0, 16 cmp r0, 0x3 @@ -406689,7 +393230,7 @@ _080C6904: movs r0, 0x1 b _080C696E .align 2, 0 -_080C6908: .4byte 0xfffb0000 + .pool _080C690C: adds r0, r1, 0 subs r0, 0x12 @@ -406760,14 +393301,14 @@ sub_80C6974: @ 80C6974 sub sp, 0x18 movs r7, 0 bl gpu_pal_allocator_reset - ldr r0, _080C6A7C + ldr r0, =0x085714e4 bl gpu_pal_obj_alloc_and_load_multiple - ldr r6, _080C6A80 + ldr r6, =0x085714bc adds r0, r6, 0 bl gpu_tile_obj_decompress_and_load - ldr r0, _080C6A84 + ldr r0, =0x085715b4 mov r8, r0 - ldr r4, _080C6A88 + ldr r4, =0x02039cf4 ldr r0, [r4] ldrb r2, [r0, 0x10] lsls r2, 4 @@ -406782,7 +393323,7 @@ sub_80C6974: @ 80C6974 lsls r1, r3, 4 adds r1, r3 lsls r1, 2 - ldr r2, _080C6A8C + ldr r2, =0x02020630 mov r9, r2 add r1, r9 str r1, [r0, 0x4] @@ -406808,7 +393349,7 @@ sub_80C6974: @ 80C6974 bl gpu_tile_obj_decompress_and_load movs r3, 0x18 add r8, r3 - ldr r6, _080C6A90 + ldr r6, =0x08571650 ldr r0, [r4] ldrb r0, [r0, 0x10] lsls r0, 4 @@ -406847,7 +393388,7 @@ sub_80C6974: @ 80C6974 beq _080C6A40 b _080C6B7A _080C6A40: - ldr r4, _080C6A94 + ldr r4, =0x03005d8c ldr r2, [r4] movs r0, 0x5 ldrsb r0, [r2, r0] @@ -406881,13 +393422,7 @@ _080C6A74: movs r5, 0 b _080C6AF2 .align 2, 0 -_080C6A7C: .4byte 0x085714e4 -_080C6A80: .4byte 0x085714bc -_080C6A84: .4byte 0x085715b4 -_080C6A88: .4byte 0x02039cf4 -_080C6A8C: .4byte 0x02020630 -_080C6A90: .4byte 0x08571650 -_080C6A94: .4byte 0x03005d8c + .pool _080C6A98: lsls r0, 16 lsrs r0, 16 @@ -406919,7 +393454,7 @@ _080C6AB4: _080C6ACE: ldrh r7, [r1, 0x28] _080C6AD0: - ldr r0, _080C6B1C + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r4, [r0, 0x2A] lsls r0, r7, 16 @@ -406939,16 +393474,16 @@ _080C6AEE: lsls r0, 13 lsrs r4, r0, 16 _080C6AF2: - ldr r0, _080C6B20 + ldr r0, =0x085714d4 bl gpu_tile_obj_decompress_and_load mov r1, sp - ldr r0, _080C6B24 + ldr r0, =0x085715fc ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} mov r1, sp - ldr r0, _080C6B28 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] adds r0, 0x4 @@ -406960,10 +393495,7 @@ _080C6AF2: lsls r2, r4, 16 b _080C6B3E .align 2, 0 -_080C6B1C: .4byte 0x03005d8c -_080C6B20: .4byte 0x085714d4 -_080C6B24: .4byte 0x085715fc -_080C6B28: .4byte 0x03005d90 + .pool _080C6B2C: lsls r1, r7, 19 lsls r2, r4, 19 @@ -406981,12 +393513,12 @@ _080C6B3E: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r3, r0, 24 - ldr r4, _080C6B88 + ldr r4, =0x02039cf4 ldr r2, [r4] lsls r1, r3, 4 adds r1, r3 lsls r1, 2 - ldr r0, _080C6B8C + ldr r0, =0x02020630 adds r1, r0 str r1, [r2, 0x8] ldrb r2, [r1, 0x5] @@ -406994,7 +393526,7 @@ _080C6B3E: negs r0, r0 ands r0, r2 strb r0, [r1, 0x5] - ldr r0, _080C6B90 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 @@ -407012,9 +393544,7 @@ _080C6B7A: pop {r0} bx r0 .align 2, 0 -_080C6B88: .4byte 0x02039cf4 -_080C6B8C: .4byte 0x02020630 -_080C6B90: .4byte 0x03005d90 + .pool thumb_func_end sub_80C6974 thumb_func_start sub_80C6B94 @@ -407035,9 +393565,9 @@ _080C6B9A: bls _080C6B9A movs r4, 0 movs r6, 0 - ldr r5, _080C6BE4 + ldr r5, =0x08571650 _080C6BB8: - ldr r0, _080C6BE8 + ldr r0, =0x02039cf4 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r4, r0 @@ -407046,7 +393576,7 @@ _080C6BB8: adds r3, r1, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, _080C6BEC + ldr r0, =0x0857144e str r0, [sp] str r6, [sp, 0x4] adds r1, r5 @@ -407058,15 +393588,13 @@ _080C6BB8: bl box_print b _080C6C0E .align 2, 0 -_080C6BE4: .4byte 0x08571650 -_080C6BE8: .4byte 0x02039cf4 -_080C6BEC: .4byte 0x0857144e + .pool _080C6BF0: lsls r1, r4, 4 adds r3, r1, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, _080C6C60 + ldr r0, =0x0857144b str r0, [sp] str r6, [sp, 0x4] adds r1, r5 @@ -407082,12 +393610,12 @@ _080C6C0E: lsrs r4, r0, 24 cmp r4, 0x6 bls _080C6BB8 - ldr r0, _080C6C64 + ldr r0, =0x08571448 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r1, _080C6C68 - ldr r0, _080C6C6C + ldr r1, =0x08571650 + ldr r0, =0x02039cf4 ldr r0, [r0] ldrb r0, [r0, 0x10] lsls r0, 4 @@ -407117,10 +393645,7 @@ _080C6C40: pop {r0} bx r0 .align 2, 0 -_080C6C60: .4byte 0x0857144b -_080C6C64: .4byte 0x08571448 -_080C6C68: .4byte 0x08571650 -_080C6C6C: .4byte 0x02039cf4 + .pool thumb_func_end sub_80C6B94 thumb_func_start sub_80C6C70 @@ -407132,15 +393657,15 @@ sub_80C6C70: @ 80C6C70 lsls r0, 24 cmp r0, 0 beq _080C6C8C - ldr r0, _080C6C88 + ldr r0, =0x02039cf4 ldr r4, [r0] ldrb r5, [r4, 0x10] adds r0, r5, 0x6 b _080C6C94 .align 2, 0 -_080C6C88: .4byte 0x02039cf4 + .pool _080C6C8C: - ldr r0, _080C6D74 + ldr r0, =0x02039cf4 ldr r4, [r0] ldrb r5, [r4, 0x10] adds r0, r5, 0x1 @@ -407152,12 +393677,12 @@ _080C6C94: adds r3, r0, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r6, _080C6D78 + ldr r6, =0x0857144b str r6, [sp] movs r1, 0 mov r8, r1 str r1, [sp, 0x4] - ldr r4, _080C6D7C + ldr r4, =0x08571650 adds r0, r4 ldr r0, [r0] str r0, [sp, 0x8] @@ -407165,7 +393690,7 @@ _080C6C94: movs r1, 0x7 movs r2, 0x4 bl box_print - ldr r5, _080C6D74 + ldr r5, =0x02039cf4 ldr r1, [r5] ldrb r3, [r1, 0x10] lsls r3, 4 @@ -407250,9 +393775,7 @@ _080C6D4A: pop {r0} bx r0 .align 2, 0 -_080C6D74: .4byte 0x02039cf4 -_080C6D78: .4byte 0x0857144b -_080C6D7C: .4byte 0x08571650 + .pool thumb_func_end sub_80C6C70 thumb_func_start sub_80C6D80 @@ -407275,14 +393798,14 @@ sub_80C6D80: @ 80C6D80 movs r1, 0 str r0, [sp, 0x1C] str r1, [sp, 0x20] - ldr r1, _080C6DFC + ldr r1, =0x00ffffff ldr r0, [sp, 0x1C] ands r0, r1 movs r1, 0xC0 lsls r1, 21 orrs r0, r1 str r0, [sp, 0x1C] - ldr r1, _080C6E00 + ldr r1, =0xffffff00 add r5, sp, 0x1C ldr r0, [r5, 0x4] ands r0, r1 @@ -407317,8 +393840,7 @@ sub_80C6D80: @ 80C6D80 add r0, sp, 0x14 b _080C6E08 .align 2, 0 -_080C6DFC: .4byte 0x00ffffff -_080C6E00: .4byte 0xffffff00 + .pool _080C6E04: add r0, sp, 0x14 mov r1, r9 @@ -407383,7 +393905,7 @@ _080C6E70: orrs r1, r2 strh r1, [r0] lsls r2, r4, 7 - ldr r1, _080C6EA8 + ldr r1, =0x001fffff ands r2, r1 movs r1, 0x80 lsls r1, 17 @@ -407403,7 +393925,7 @@ _080C6E90: pop {r0} bx r0 .align 2, 0 -_080C6EA8: .4byte 0x001fffff + .pool thumb_func_end sub_80C6D80 thumb_func_start sub_80C6EAC @@ -407441,12 +393963,12 @@ sub_80C6EAC: @ 80C6EAC ldr r0, [sp, 0x20] bl sub_80091CC lsls r0, 24 - ldr r2, _080C6F98 + ldr r2, =0x00ffffff ldr r1, [sp, 0x18] ands r1, r2 orrs r1, r0 str r1, [sp, 0x18] - ldr r1, _080C6F9C + ldr r1, =0xffffff00 add r2, sp, 0x18 mov r8, r2 ldr r0, [r2, 0x4] @@ -407519,8 +394041,7 @@ sub_80C6EAC: @ 80C6EAC pop {r0} bx r0 .align 2, 0 -_080C6F98: .4byte 0x00ffffff -_080C6F9C: .4byte 0xffffff00 + .pool thumb_func_end sub_80C6EAC thumb_func_start sub_80C6FA0 @@ -407594,7 +394115,7 @@ _080C700E: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080C704C + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -407621,7 +394142,7 @@ _080C7036: pop {r1} bx r1 .align 2, 0 -_080C704C: .4byte 0x020244ec + .pool thumb_func_end sub_80C7008 thumb_func_start sub_80C7050 @@ -407637,7 +394158,7 @@ _080C705A: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080C70A8 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -407669,13 +394190,13 @@ _080C7092: pop {r1} bx r1 .align 2, 0 -_080C70A8: .4byte 0x020244ec + .pool thumb_func_end sub_80C7050 thumb_func_start sub_80C70AC sub_80C70AC: @ 80C70AC push {lr} - ldr r0, _080C70C0 + ldr r0, =0x020375e0 ldrb r0, [r0] bl sub_80C7050 lsls r0, 24 @@ -407683,7 +394204,7 @@ sub_80C70AC: @ 80C70AC pop {r1} bx r1 .align 2, 0 -_080C70C0: .4byte 0x020375e0 + .pool thumb_func_end sub_80C70AC thumb_func_start sub_80C70C4 @@ -407694,7 +394215,7 @@ sub_80C70C4: @ 80C70C4 _080C70CA: movs r0, 0x64 muls r0, r4 - ldr r1, _080C70F8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -407715,7 +394236,7 @@ _080C70E2: pop {r1} bx r1 .align 2, 0 -_080C70F8: .4byte 0x020244ec + .pool thumb_func_end sub_80C70C4 thumb_func_start sub_80C70FC @@ -407840,7 +394361,7 @@ sub_80C71A4: @ 80C71A4 movs r6, 0x80 lsls r6, 5 mov r5, sp - ldr r7, _080C7210 + ldr r7, =0x040000d4 lsrs r3, 17 mov r9, r3 mov r1, r9 @@ -407868,15 +394389,15 @@ _080C71EA: ldr r0, [r7, 0x8] b _080C7242 .align 2, 0 -_080C7210: .4byte 0x040000d4 + .pool _080C7214: movs r4, 0 strh r4, [r5] - ldr r1, _080C7260 + ldr r1, =0x040000d4 mov r0, sp str r0, [r1] str r3, [r1, 0x4] - ldr r0, _080C7264 + ldr r0, =0x81000800 str r0, [r1, 0x8] ldr r0, [r1, 0x8] adds r3, r6 @@ -407910,8 +394431,7 @@ _080C724E: pop {r0} bx r0 .align 2, 0 -_080C7260: .4byte 0x040000d4 -_080C7264: .4byte 0x81000800 + .pool thumb_func_end sub_80C71A4 thumb_func_start c3_0808C39C @@ -407923,7 +394443,7 @@ c3_0808C39C: @ 80C7268 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080C7290 + ldr r1, =0x03005e00 adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -407932,13 +394452,12 @@ c3_0808C39C: @ 80C7268 b _080C756A _080C7284: lsls r0, 2 - ldr r1, _080C7294 + ldr r1, =_080C7298 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C7290: .4byte 0x03005e00 -_080C7294: .4byte _080C7298 + .pool .align 2, 0 _080C7298: .4byte _080C72AC @@ -407958,7 +394477,7 @@ _080C72AC: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r1, _080C7308 + ldr r1, =0x085716c0 movs r2, 0xA ldrsh r0, [r5, r2] lsls r0, 3 @@ -407987,7 +394506,7 @@ _080C72AC: bl Window_CopyToVram b _080C7318 .align 2, 0 -_080C7308: .4byte 0x085716c0 + .pool _080C730C: bl sub_80ABDFC lsls r0, 24 @@ -408023,7 +394542,7 @@ _080C7342: _080C7348: ldrh r3, [r5, 0xA] strh r3, [r5, 0xE] - ldr r2, _080C73C8 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x40 ands r0, r1 @@ -408066,7 +394585,7 @@ _080C7392: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r1, _080C73CC + ldr r1, =0x085716c0 movs r2, 0xA ldrsh r0, [r5, r2] lsls r0, 3 @@ -408086,8 +394605,7 @@ _080C7392: bl text_box_related_one b _080C756A .align 2, 0 -_080C73C8: .4byte 0x030022c0 -_080C73CC: .4byte 0x085716c0 + .pool _080C73D0: ldrh r0, [r5, 0x26] lsls r0, 24 @@ -408116,7 +394634,7 @@ _080C73F6: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _080C7424 + ldr r2, =0x085ebcad str r4, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -408126,7 +394644,7 @@ _080C73F6: str r4, [sp, 0xC] b _080C7532 .align 2, 0 -_080C7424: .4byte 0x085ebcad + .pool _080C7428: movs r1, 0xC ldrsh r0, [r5, r1] @@ -408140,7 +394658,7 @@ _080C7428: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _080C7458 + ldr r2, =0x085ebc89 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -408150,7 +394668,7 @@ _080C7428: str r4, [sp, 0xC] b _080C7532 .align 2, 0 -_080C7458: .4byte 0x085ebc89 + .pool _080C745C: movs r0, 0x1 movs r1, 0 @@ -408159,7 +394677,7 @@ _080C745C: strh r0, [r5, 0x8] b _080C756A _080C746A: - ldr r0, _080C7494 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r7, 0x3 adds r4, r7, 0 @@ -408169,7 +394687,7 @@ _080C746A: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r1, _080C7498 + ldr r1, =0x085716c0 movs r2, 0xA ldrsh r0, [r5, r2] lsls r0, 3 @@ -408180,8 +394698,7 @@ _080C746A: str r0, [sp] b _080C7528 .align 2, 0 -_080C7494: .4byte 0x030022c0 -_080C7498: .4byte 0x085716c0 + .pool _080C749C: movs r0, 0x40 ands r0, r1 @@ -408208,7 +394725,7 @@ _080C74B8: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r1, _080C74E4 + ldr r1, =0x085716c0 movs r3, 0xA ldrsh r0, [r5, r3] lsls r0, 3 @@ -408218,7 +394735,7 @@ _080C74B8: str r4, [sp] b _080C7528 .align 2, 0 -_080C74E4: .4byte 0x085716c0 + .pool _080C74E8: movs r0, 0x80 ands r0, r1 @@ -408242,7 +394759,7 @@ _080C7500: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r1, _080C7540 + ldr r1, =0x085716c0 movs r2, 0xA ldrsh r0, [r5, r2] lsls r0, 3 @@ -408264,9 +394781,9 @@ _080C7532: strh r4, [r5, 0x8] b _080C756A .align 2, 0 -_080C7540: .4byte 0x085716c0 + .pool _080C7544: - ldr r0, _080C7574 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -408287,18 +394804,18 @@ _080C756A: pop {r0} bx r0 .align 2, 0 -_080C7574: .4byte 0x02037fd4 + .pool thumb_func_end c3_0808C39C thumb_func_start sub_80C7578 sub_80C7578: @ 80C7578 push {lr} - ldr r0, _080C75A0 + ldr r0, =c3_0808C39C + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080C75A4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -408310,31 +394827,30 @@ sub_80C7578: @ 80C7578 pop {r0} bx r0 .align 2, 0 -_080C75A0: .4byte c3_0808C39C + 1 -_080C75A4: .4byte 0x03005e00 + .pool thumb_func_end sub_80C7578 thumb_func_start mapldr_0808C6D8 mapldr_0808C6D8: @ 80C75A8 push {r4,r5,lr} - ldr r0, _080C75EC + ldr r0, =0x030022c0 ldr r5, [r0, 0xC] movs r0, 0 bl SetVBlankCallback - ldr r4, _080C75F0 + ldr r4, =c3_0808C39C + 1 adds r0, r4, 0 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080C75F4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 movs r2, 0 strh r2, [r1, 0x8] - ldr r2, _080C75F8 + ldr r2, =0x02039d00 ldrb r2, [r2] strh r2, [r1, 0xA] bl _call_via_r4 @@ -408345,10 +394861,7 @@ mapldr_0808C6D8: @ 80C75A8 pop {r0} bx r0 .align 2, 0 -_080C75EC: .4byte 0x030022c0 -_080C75F0: .4byte c3_0808C39C + 1 -_080C75F4: .4byte 0x03005e00 -_080C75F8: .4byte 0x02039d00 + .pool thumb_func_end mapldr_0808C6D8 thumb_func_start sub_80C75FC @@ -408362,17 +394875,17 @@ sub_80C75FC: @ 80C75FC mov r9, r1 lsls r6, 24 lsrs r6, 24 - ldr r0, _080C766C + ldr r0, =0x085716e8 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] - ldr r0, _080C7670 + ldr r0, =0x085716c0 mov r8, r0 movs r1, 0x5 bl GetMaxWidthInMenuTable lsls r0, 24 - ldr r2, _080C7674 + ldr r2, =0x00ffffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -408405,29 +394918,24 @@ sub_80C75FC: @ 80C75FC pop {r0} bx r0 .align 2, 0 -_080C766C: .4byte 0x085716e8 -_080C7670: .4byte 0x085716c0 -_080C7674: .4byte 0x00ffffff + .pool thumb_func_end sub_80C75FC thumb_func_start sub_80C7678 sub_80C7678: @ 80C7678 push {lr} bl sub_80CAEA0 - ldr r1, _080C7694 + ldr r1, =0x02039d00 strb r0, [r1] - ldr r1, _080C7698 - ldr r0, _080C769C + ldr r1, =0x03005dac + ldr r0, =mapldr_0808C6D8 + 1 str r0, [r1] - ldr r0, _080C76A0 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080C7694: .4byte 0x02039d00 -_080C7698: .4byte 0x03005dac -_080C769C: .4byte mapldr_0808C6D8 + 1 -_080C76A0: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_80C7678 thumb_func_start sub_80C76A4 @@ -408443,7 +394951,7 @@ sub_80C76A4: @ 80C76A4 lsls r3, 24 lsrs r3, 24 adds r4, r3, 0 - ldr r2, _080C7708 + ldr r2, =0x0000ffff cmp r3, 0x1 bhi _080C76C6 movs r2, 0x1 @@ -408485,7 +394993,7 @@ _080C76E2: ble _080C76E2 b _080C7760 .align 2, 0 -_080C7708: .4byte 0x0000ffff + .pool _080C770C: adds r0, r4, 0 b _080C7764 @@ -408571,7 +395079,7 @@ _080C779E: lsls r0, r5, 24 lsrs r0, 24 bl sav3_get_box_name - ldr r1, _080C77E4 + ldr r1, =0x085ebcc1 bl gf_strcpy adds r4, r5, 0x1 adds r1, r4, 0 @@ -408599,7 +395107,7 @@ _080C77C2: pop {r0} bx r0 .align 2, 0 -_080C77E4: .4byte 0x085ebcc1 + .pool thumb_func_end sub_80C7770 thumb_func_start sub_80C77E8 @@ -408618,22 +395126,22 @@ sub_80C77E8: @ 80C77E8 lsls r3, 24 lsrs r3, 24 mov r8, r3 - ldr r0, _080C787C + ldr r0, =0x0857173c str r0, [sp, 0x18] - ldr r1, _080C7880 + ldr r1, =0xffff0000 add r4, sp, 0x18 ldr r0, [r4, 0x4] ands r0, r1 orrs r0, r7 str r0, [r4, 0x4] mov r1, sp - ldr r0, _080C7884 + ldr r0, =0x0857175c str r0, [sp] movs r0, 0x80 lsls r0, 4 strh r0, [r1, 0x4] strh r6, [r1, 0x6] - ldr r0, _080C7888 + ldr r0, =0x08571f5c str r0, [sp, 0x8] movs r0, 0xC0 lsls r0, 1 @@ -408652,7 +395160,7 @@ sub_80C77E8: @ 80C77E8 _080C7846: mov r0, sp bl gpu_tile_obj_alloc_and_load_multiple - ldr r0, _080C788C + ldr r0, =0x02039d04 str r5, [r0] movs r1, 0x90 lsls r1, 2 @@ -408677,17 +395185,13 @@ _080C7846: pop {r0} bx r0 .align 2, 0 -_080C787C: .4byte 0x0857173c -_080C7880: .4byte 0xffff0000 -_080C7884: .4byte 0x0857175c -_080C7888: .4byte 0x08571f5c -_080C788C: .4byte 0x02039d04 + .pool thumb_func_end sub_80C77E8 thumb_func_start sub_80C7890 sub_80C7890: @ 80C7890 push {r4,r5,lr} - ldr r5, _080C78D0 + ldr r5, =0x02039d04 ldr r1, [r5] movs r2, 0x8F lsls r2, 2 @@ -408717,7 +395221,7 @@ _080C78AC: pop {r0} bx r0 .align 2, 0 -_080C78D0: .4byte 0x02039d04 + .pool thumb_func_end sub_80C7890 thumb_func_start sub_80C78D4 @@ -408741,7 +395245,7 @@ sub_80C78E4: @ 80C78E4 thumb_func_start sub_80C78F0 sub_80C78F0: @ 80C78F0 push {lr} - ldr r0, _080C7908 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -408752,7 +395256,7 @@ sub_80C78F0: @ 80C78F0 movs r0, 0xC9 b _080C7954 .align 2, 0 -_080C7908: .4byte 0x030022c0 + .pool _080C790C: movs r0, 0x1 ands r0, r1 @@ -408760,7 +395264,7 @@ _080C790C: beq _080C792C movs r0, 0x5 bl audio_play - ldr r0, _080C7928 + ldr r0, =0x02039d04 ldr r0, [r0] movs r1, 0x91 lsls r1, 2 @@ -408768,7 +395272,7 @@ _080C790C: ldrb r0, [r0] b _080C7954 .align 2, 0 -_080C7928: .4byte 0x02039d04 + .pool _080C792C: movs r0, 0x20 ands r0, r1 @@ -408809,7 +395313,7 @@ sub_80C7958: @ 80C7958 ldr r0, [sp, 0x34] orrs r0, r1 str r0, [sp, 0x34] - ldr r1, _080C7AEC + ldr r1, =0xffff0fff add r4, sp, 0x34 ldr r0, [r4, 0x4] ands r0, r1 @@ -408824,17 +395328,17 @@ sub_80C7958: @ 80C7958 adds r0, 0x1E strh r2, [r0] str r4, [sp, 0x20] - ldr r0, _080C7AF0 + ldr r0, =0x082ec69c str r0, [sp, 0x24] str r2, [sp, 0x28] - ldr r0, _080C7AF4 + ldr r0, =0x082ec6a8 str r0, [sp, 0x2C] - ldr r0, _080C7AF8 + ldr r0, =nullsub_12 + 1 str r0, [sp, 0x30] add r0, sp, 0x4 movs r2, 0x18 bl memcpy - ldr r6, _080C7AFC + ldr r6, =0x02039d04 ldr r0, [r6] movs r1, 0x91 lsls r1, 2 @@ -408847,7 +395351,7 @@ sub_80C7958: @ 80C7958 adds r0, r1, r5 ldrh r0, [r0] strh r0, [r2] - ldr r3, _080C7B00 + ldr r3, =0x00000242 adds r1, r3 ldrh r0, [r1] strh r0, [r2, 0x2] @@ -408862,7 +395366,7 @@ sub_80C7958: @ 80C7958 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080C7B04 + ldr r1, =0x02020630 adds r0, r1 str r0, [r3] ldrb r2, [r4, 0x1] @@ -408882,12 +395386,12 @@ sub_80C7958: @ 80C7958 ldrh r0, [r3] adds r0, 0x1 strh r0, [r1] - ldr r0, _080C7B08 + ldr r0, =0x08571710 str r0, [sp, 0xC] movs r4, 0 _080C7A10: ldr r0, [r6] - ldr r1, _080C7B0C + ldr r1, =0x00000246 adds r0, r1 ldrb r3, [r0] add r0, sp, 0x4 @@ -408903,7 +395407,7 @@ _080C7A10: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080C7B04 + ldr r1, =0x02020630 adds r1, r0, r1 str r1, [r2] movs r5, 0 @@ -408947,7 +395451,7 @@ _080C7A6E: cmp r4, 0x3 bls _080C7A10 movs r4, 0 - ldr r5, _080C7AFC + ldr r5, =0x02039d04 _080C7A8C: lsls r0, r4, 3 adds r0, r4 @@ -408959,7 +395463,7 @@ _080C7A8C: lsls r2, r4, 24 lsrs r2, 24 ldr r1, [r5] - ldr r3, _080C7B0C + ldr r3, =0x00000246 adds r1, r3 ldrb r1, [r1] str r1, [sp] @@ -408983,7 +395487,7 @@ _080C7A8C: _080C7ACC: strh r1, [r2, 0x2E] ldr r1, [r0] - ldr r0, _080C7B10 + ldr r0, =sub_80C7CF4 + 1 str r0, [r1, 0x1C] _080C7AD4: adds r0, r4, 0x1 @@ -408997,22 +395501,13 @@ _080C7AD4: pop {r0} bx r0 .align 2, 0 -_080C7AEC: .4byte 0xffff0fff -_080C7AF0: .4byte 0x082ec69c -_080C7AF4: .4byte 0x082ec6a8 -_080C7AF8: .4byte nullsub_12 + 1 -_080C7AFC: .4byte 0x02039d04 -_080C7B00: .4byte 0x00000242 -_080C7B04: .4byte 0x02020630 -_080C7B08: .4byte 0x08571710 -_080C7B0C: .4byte 0x00000246 -_080C7B10: .4byte sub_80C7CF4 + 1 + .pool thumb_func_end sub_80C7958 thumb_func_start sub_80C7B14 sub_80C7B14: @ 80C7B14 push {r4-r6,lr} - ldr r4, _080C7B7C + ldr r4, =0x02039d04 ldr r0, [r4] ldr r0, [r0] cmp r0, 0 @@ -409046,7 +395541,7 @@ _080C7B4A: bls _080C7B2E movs r5, 0 _080C7B56: - ldr r0, _080C7B7C + ldr r0, =0x02039d04 ldr r0, [r0] lsls r1, r5, 2 adds r0, 0x20 @@ -409065,13 +395560,13 @@ _080C7B6A: pop {r0} bx r0 .align 2, 0 -_080C7B7C: .4byte 0x02039d04 + .pool thumb_func_end sub_80C7B14 thumb_func_start sub_80C7B80 sub_80C7B80: @ 80C7B80 push {lr} - ldr r2, _080C7BB0 + ldr r2, =0x02039d04 ldr r1, [r2] movs r0, 0x91 lsls r0, 2 @@ -409094,13 +395589,13 @@ _080C7BA6: pop {r0} bx r0 .align 2, 0 -_080C7BB0: .4byte 0x02039d04 + .pool thumb_func_end sub_80C7B80 thumb_func_start sub_80C7BB4 sub_80C7BB4: @ 80C7BB4 push {lr} - ldr r0, _080C7BCC + ldr r0, =0x02039d04 ldr r2, [r0] movs r1, 0x91 lsls r1, 2 @@ -409111,7 +395606,7 @@ sub_80C7BB4: @ 80C7BB4 subs r1, r0, 0x1 b _080C7BD2 .align 2, 0 -_080C7BCC: .4byte 0x02039d04 + .pool _080C7BD0: movs r1, 0xD _080C7BD2: @@ -409132,7 +395627,7 @@ sub_80C7BE4: @ 80C7BE4 mov r4, r8 push {r4-r6} sub sp, 0x24 - ldr r0, _080C7CE0 + ldr r0, =0x02039d04 mov r9, r0 ldr r0, [r0] movs r4, 0x91 @@ -409172,7 +395667,7 @@ sub_80C7BE4: @ 80C7BE4 bl sub_81DB35C lsls r2, r0, 24 lsrs r2, 24 - ldr r0, _080C7CE4 + ldr r0, =0x08571734 mov r8, r0 str r0, [sp] movs r6, 0x1 @@ -409189,7 +395684,7 @@ sub_80C7BE4: @ 80C7BE4 movs r2, 0x1 movs r3, 0x2 bl decimal_int_to_string - ldr r1, _080C7CE8 + ldr r1, =0x08571737 add r0, sp, 0xC bl gf_strcat movs r0, 0x1 @@ -409221,9 +395716,9 @@ sub_80C7BE4: @ 80C7BE4 adds r1, r0, 0 lsls r1, 16 lsrs r1, 11 - ldr r0, _080C7CEC + ldr r0, =0x06010100 adds r1, r0 - ldr r2, _080C7CF0 + ldr r2, =0x04000100 adds r0, r5, 0 bl CpuSet adds r0, r4, 0 @@ -409237,11 +395732,7 @@ sub_80C7BE4: @ 80C7BE4 pop {r0} bx r0 .align 2, 0 -_080C7CE0: .4byte 0x02039d04 -_080C7CE4: .4byte 0x08571734 -_080C7CE8: .4byte 0x08571737 -_080C7CEC: .4byte 0x06010100 -_080C7CF0: .4byte 0x04000100 + .pool thumb_func_end sub_80C7BE4 thumb_func_start sub_80C7CF4 @@ -409282,7 +395773,7 @@ sub_80C7D28: @ 80C7D28 bl copy_queue_process bl sub_80D2AA4 bl copy_pal_bg_faded_to_pal_ram - ldr r0, _080C7D50 + ldr r0, =0x02039d08 ldr r0, [r0] movs r1, 0xB3 lsls r1, 2 @@ -409293,7 +395784,7 @@ sub_80C7D28: @ 80C7D28 pop {r0} bx r0 .align 2, 0 -_080C7D50: .4byte 0x02039d08 + .pool thumb_func_end sub_80C7D28 thumb_func_start c2_Box @@ -409315,73 +395806,65 @@ sub_80C7D74: @ 80C7D74 lsls r0, 24 lsrs r5, r0, 24 bl clear_tasks - ldr r0, _080C7D98 + ldr r0, =0x02039d0d strb r5, [r0] - ldr r4, _080C7D9C - ldr r0, _080C7DA0 + ldr r4, =0x02039d08 + ldr r0, =0x000062c4 bl malloc str r0, [r4] cmp r0, 0 bne _080C7DA8 - ldr r0, _080C7DA4 + ldr r0, =sub_80C7678 + 1 bl set_callback2 b _080C7DD4 .align 2, 0 -_080C7D98: .4byte 0x02039d0d -_080C7D9C: .4byte 0x02039d08 -_080C7DA0: .4byte 0x000062c4 -_080C7DA4: .4byte sub_80C7678 + 1 + .pool _080C7DA8: movs r2, 0 strb r5, [r0, 0x1] ldr r0, [r4] strb r2, [r0, 0x3] - ldr r0, _080C7DDC + ldr r0, =0x02039d12 movs r1, 0 strh r2, [r0] ldr r0, [r4] strb r1, [r0] - ldr r0, _080C7DE0 + ldr r0, =task_box_related_3 + 1 movs r1, 0x3 bl AddTask ldr r1, [r4] strb r0, [r1, 0x4] bl get_preferred_box - ldr r1, _080C7DE4 + ldr r1, =0x02039d10 strb r0, [r1] - ldr r0, _080C7DE8 + ldr r0, =c2_Box + 1 bl set_callback2 _080C7DD4: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080C7DDC: .4byte 0x02039d12 -_080C7DE0: .4byte task_box_related_3 + 1 -_080C7DE4: .4byte 0x02039d10 -_080C7DE8: .4byte c2_Box + 1 + .pool thumb_func_end sub_80C7D74 thumb_func_start c2_808CE60 c2_808CE60: @ 80C7DEC push {r4,lr} bl clear_tasks - ldr r4, _080C7E0C - ldr r0, _080C7E10 + ldr r4, =0x02039d08 + ldr r0, =0x000062c4 bl malloc adds r1, r0, 0 str r1, [r4] cmp r1, 0 bne _080C7E18 - ldr r0, _080C7E14 + ldr r0, =sub_80C7678 + 1 bl set_callback2 b _080C7E3C .align 2, 0 -_080C7E0C: .4byte 0x02039d08 -_080C7E10: .4byte 0x000062c4 -_080C7E14: .4byte sub_80C7678 + 1 + .pool _080C7E18: - ldr r0, _080C7E44 + ldr r0, =0x02039d0d ldrb r0, [r0] movs r2, 0 strb r0, [r1, 0x1] @@ -409390,21 +395873,19 @@ _080C7E18: strb r0, [r1, 0x3] ldr r0, [r4] strb r2, [r0] - ldr r0, _080C7E48 + ldr r0, =task_box_related_3 + 1 movs r1, 0x3 bl AddTask ldr r1, [r4] strb r0, [r1, 0x4] - ldr r0, _080C7E4C + ldr r0, =c2_Box + 1 bl set_callback2 _080C7E3C: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C7E44: .4byte 0x02039d0d -_080C7E48: .4byte task_box_related_3 + 1 -_080C7E4C: .4byte c2_Box + 1 + .pool thumb_func_end c2_808CE60 thumb_func_start sub_80C7E50 @@ -409447,25 +395928,25 @@ sub_80C7E98: @ 80C7E98 bl gpu_tile_obj_tags_reset bl gpu_pal_allocator_reset bl dma3_transfer_queue_clear - ldr r1, _080C7F08 + ldr r1, =0x02021b3a movs r2, 0xA0 lsls r2, 2 adds r0, r2, 0 strh r0, [r1] - ldr r4, _080C7F0C + ldr r4, =0x02039d08 ldr r1, [r4] adds r0, r1, 0 adds r0, 0x8 adds r1, 0x10 movs r2, 0x8 bl sub_80D2A90 - ldr r1, _080C7F10 + ldr r1, =0x030022b0 movs r0, 0x14 strh r0, [r1] bl clear_scheduled_bg_copies_to_vram movs r0, 0x3 bl sub_80D259C - ldr r2, _080C7F14 + ldr r2, =0x0857239c movs r0, 0x4 str r0, [sp] movs r0, 0 @@ -409477,7 +395958,7 @@ sub_80C7E98: @ 80C7E98 movs r2, 0 bl sub_80D2770 ldr r0, [r4] - ldr r1, _080C7F18 + ldr r1, =0x000002c7 adds r0, r1 movs r1, 0 strb r1, [r0] @@ -409486,20 +395967,16 @@ sub_80C7E98: @ 80C7E98 pop {r0} bx r0 .align 2, 0 -_080C7F08: .4byte 0x02021b3a -_080C7F0C: .4byte 0x02039d08 -_080C7F10: .4byte 0x030022b0 -_080C7F14: .4byte 0x0857239c -_080C7F18: .4byte 0x000002c7 + .pool thumb_func_end sub_80C7E98 thumb_func_start sub_80C7F1C sub_80C7F1C: @ 80C7F1C push {lr} bl sub_80CDC0C - ldr r2, _080C7F40 + ldr r2, =0x02039d0c movs r1, 0 - ldr r0, _080C7F44 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 @@ -409507,21 +395984,19 @@ sub_80C7F1C: @ 80C7F1C movs r1, 0x1 _080C7F32: strb r1, [r2] - ldr r1, _080C7F48 + ldr r1, =0x02039d0e movs r0, 0 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_080C7F40: .4byte 0x02039d0c -_080C7F44: .4byte 0x02039d08 -_080C7F48: .4byte 0x02039d0e + .pool thumb_func_end sub_80C7F1C thumb_func_start sub_80C7F4C sub_80C7F4C: @ 80C7F4C push {lr} - ldr r0, _080C7F78 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 @@ -409530,7 +396005,7 @@ sub_80C7F4C: @ 80C7F4C lsls r1, 6 movs r0, 0x50 bl lcd_io_set - ldr r1, _080C7F7C + ldr r1, =0x00000b07 movs r0, 0x52 bl lcd_io_set _080C7F6A: @@ -409541,15 +396016,14 @@ _080C7F6A: pop {r0} bx r0 .align 2, 0 -_080C7F78: .4byte 0x02039d08 -_080C7F7C: .4byte 0x00000b07 + .pool thumb_func_end sub_80C7F4C thumb_func_start add_to_c3_somehow add_to_c3_somehow: @ 80C7F80 push {r4,lr} - ldr r4, _080C7FA0 - ldr r1, _080C7FA4 + ldr r4, =0x03005e00 + ldr r1, =0x02039d08 ldr r3, [r1] ldrb r2, [r3, 0x4] lsls r1, r2, 2 @@ -409563,15 +396037,14 @@ add_to_c3_somehow: @ 80C7F80 pop {r0} bx r0 .align 2, 0 -_080C7FA0: .4byte 0x03005e00 -_080C7FA4: .4byte 0x02039d08 + .pool thumb_func_end add_to_c3_somehow thumb_func_start task_box_related_3 task_box_related_3: @ 80C7FA8 push {lr} sub sp, 0x4 - ldr r0, _080C7FC4 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0xA @@ -409579,13 +396052,12 @@ task_box_related_3: @ 80C7FA8 b _080C81A2 _080C7FB8: lsls r0, 2 - ldr r1, _080C7FC8 + ldr r1, =_080C7FCC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C7FC4: .4byte 0x02039d08 -_080C7FC8: .4byte _080C7FCC + .pool .align 2, 0 _080C7FCC: .4byte _080C7FF8 @@ -409606,12 +396078,12 @@ _080C7FF8: movs r1, 0 bl lcd_io_set bl sub_80C7E98 - ldr r0, _080C8028 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0 beq _080C8046 - ldr r0, _080C802C + ldr r0, =0x02039d0f ldrb r0, [r0] cmp r0, 0x1 beq _080C8036 @@ -409621,8 +396093,7 @@ _080C7FF8: beq _080C803C b _080C8046 .align 2, 0 -_080C8028: .4byte 0x02039d08 -_080C802C: .4byte 0x02039d0f + .pool _080C8030: cmp r0, 0x2 beq _080C8042 @@ -409656,7 +396127,7 @@ _080C805E: str r0, [sp] movs r1, 0xC0 lsls r1, 19 - ldr r2, _080C8088 + ldr r2, =0x05000080 mov r0, sp bl CpuSet movs r0, 0x1 @@ -409665,10 +396136,10 @@ _080C805E: bl sub_809882C b _080C8198 .align 2, 0 -_080C8088: .4byte 0x05000080 + .pool _080C808C: bl sub_80C7E50 - ldr r0, _080C80A4 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0 @@ -409678,10 +396149,10 @@ _080C809C: bl sub_80C7F1C b _080C8198 .align 2, 0 -_080C80A4: .4byte 0x02039d08 + .pool _080C80A8: bl sub_80CAF04 - ldr r0, _080C80BC + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0 @@ -409689,7 +396160,7 @@ _080C80A8: bl sub_80CD36C b _080C8198 .align 2, 0 -_080C80BC: .4byte 0x02039d08 + .pool _080C80C0: bl sub_80CD3EC b _080C8198 @@ -409699,11 +396170,11 @@ _080C80C6: cmp r0, 0 bne _080C80DC _080C80D0: - ldr r0, _080C80D8 + ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow b _080C81A2 .align 2, 0 -_080C80D8: .4byte sub_80C9E50 + 1 + .pool _080C80DC: bl sub_80C9FEC bl sub_80CAC1C @@ -409725,34 +396196,31 @@ _080C8100: lsls r0, 24 cmp r0, 0 bne _080C81A2 - ldr r0, _080C8130 + ldr r0, =0x02039d08 ldr r2, [r0] ldrb r0, [r2, 0x1] cmp r0, 0x3 beq _080C8140 - ldr r1, _080C8134 + ldr r1, =0x00000da4 adds r0, r2, r1 movs r1, 0xD strh r1, [r0] - ldr r1, _080C8138 + ldr r1, =0x00000da6 adds r2, r1 - ldr r1, _080C813C + ldr r1, =0x0000dace strh r1, [r2] bl sub_811F90C bl sub_811FA90 b _080C8198 .align 2, 0 -_080C8130: .4byte 0x02039d08 -_080C8134: .4byte 0x00000da4 -_080C8138: .4byte 0x00000da6 -_080C813C: .4byte 0x0000dace + .pool _080C8140: bl sub_80D0C60 bl sub_80CAEAC b _080C8198 _080C814A: bl sub_80C7F4C - ldr r0, _080C816C + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0 @@ -409762,29 +396230,27 @@ _080C814A: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, _080C8170 + ldr r0, =sub_80C81AC + 1 bl add_to_c3_somehow b _080C8186 .align 2, 0 -_080C816C: .4byte 0x02039d08 -_080C8170: .4byte sub_80C81AC + 1 + .pool _080C8174: movs r0, 0x1 negs r0, r0 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, _080C8190 + ldr r0, =box_related_2 + 1 bl add_to_c3_somehow _080C8186: - ldr r0, _080C8194 + ldr r0, =sub_80C7D28 + 1 bl SetVBlankCallback b _080C81A2 .align 2, 0 -_080C8190: .4byte box_related_2 + 1 -_080C8194: .4byte sub_80C7D28 + 1 + .pool _080C8198: - ldr r0, _080C81A8 + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -409794,13 +396260,13 @@ _080C81A2: pop {r0} bx r0 .align 2, 0 -_080C81A8: .4byte 0x02039d08 + .pool thumb_func_end task_box_related_3 thumb_func_start sub_80C81AC sub_80C81AC: @ 80C81AC push {r4,lr} - ldr r4, _080C81C0 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 @@ -409809,7 +396275,7 @@ sub_80C81AC: @ 80C81AC beq _080C81DE b _080C81EE .align 2, 0 -_080C81C0: .4byte 0x02039d08 + .pool _080C81C4: movs r0, 0x2 bl audio_play @@ -409827,21 +396293,21 @@ _080C81DE: lsls r0, 24 cmp r0, 0 bne _080C81EE - ldr r0, _080C81F4 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C81EE: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C81F4: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C81AC thumb_func_start box_related_2 box_related_2: @ 80C81F8 push {r4,lr} sub sp, 0x4 - ldr r4, _080C8210 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0x1 @@ -409852,7 +396318,7 @@ box_related_2: @ 80C81F8 beq _080C821E b _080C82A0 .align 2, 0 -_080C8210: .4byte 0x02039d08 + .pool _080C8214: cmp r0, 0x2 beq _080C8268 @@ -409873,11 +396339,11 @@ _080C8230: lsls r0, 24 cmp r0, 0 bne _080C82A0 - ldr r0, _080C8254 + ldr r0, =0x02039d0f ldrb r0, [r0] cmp r0, 0x2 bne _080C825C - ldr r0, _080C8258 + ldr r0, =0x0203ce7c ldrh r0, [r0] cmp r0, 0 beq _080C825C @@ -409885,20 +396351,19 @@ _080C8230: bl sub_80CAC58 b _080C8282 .align 2, 0 -_080C8254: .4byte 0x02039d0f -_080C8258: .4byte 0x0203ce7c + .pool _080C825C: - ldr r0, _080C8264 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C82A0 .align 2, 0 -_080C8264: .4byte task_pokemon_box_related + 1 + .pool _080C8268: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _080C82A0 - ldr r0, _080C828C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -409912,13 +396377,13 @@ _080C8282: strb r0, [r1] b _080C82A0 .align 2, 0 -_080C828C: .4byte 0x030022c0 + .pool _080C8290: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _080C82A0 - ldr r0, _080C82A8 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C82A0: add sp, 0x4 @@ -409926,13 +396391,13 @@ _080C82A0: pop {r0} bx r0 .align 2, 0 -_080C82A8: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end box_related_2 thumb_func_start task_pokemon_box_related task_pokemon_box_related: @ 80C82AC push {r4,r5,lr} - ldr r0, _080C82C4 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0xB @@ -409940,13 +396405,12 @@ task_pokemon_box_related: @ 80C82AC b _080C879E _080C82BA: lsls r0, 2 - ldr r1, _080C82C8 + ldr r1, =_080C82CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C82C4: .4byte 0x02039d08 -_080C82C8: .4byte _080C82CC + .pool .align 2, 0 _080C82CC: .4byte _080C82FC @@ -409971,12 +396435,12 @@ _080C82FC: b _080C879E _080C830C: lsls r0, 2 - ldr r1, _080C8318 + ldr r1, =_080C831C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C8318: .4byte _080C831C + .pool .align 2, 0 _080C831C: .4byte _080C8384 @@ -410008,15 +396472,15 @@ _080C831C: _080C8384: movs r0, 0x5 bl audio_play - ldr r0, _080C8394 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x1 strb r0, [r1] b _080C879E .align 2, 0 -_080C8394: .4byte 0x02039d08 + .pool _080C8398: - ldr r4, _080C83B8 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0, 0x1] subs r0, 0x2 @@ -410031,16 +396495,16 @@ _080C8398: strb r0, [r1] b _080C879E .align 2, 0 -_080C83B8: .4byte 0x02039d08 + .pool _080C83BC: bl sub_80CDC0C - ldr r0, _080C83C8 + ldr r0, =sub_80C87A8 + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C83C8: .4byte sub_80C87A8 + 1 + .pool _080C83CC: - ldr r4, _080C83F8 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0, 0x1] cmp r0, 0x2 @@ -410050,7 +396514,7 @@ _080C83CC: cmp r0, 0 beq _080C8406 ldr r0, [r4] - ldr r1, _080C83FC + ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] bl itemid_is_mail @@ -410061,54 +396525,53 @@ _080C83CC: _080C83F4: b _080C8406 .align 2, 0 -_080C83F8: .4byte 0x02039d08 -_080C83FC: .4byte 0x00000ce6 + .pool _080C8400: cmp r0, 0x3 beq _080C8406 b _080C879E _080C8406: - ldr r0, _080C8410 + ldr r0, =sub_80C87E8 + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C8410: .4byte sub_80C87E8 + 1 + .pool _080C8414: - ldr r0, _080C841C + ldr r0, =sub_80C9BE8 + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C841C: .4byte sub_80C9BE8 + 1 + .pool _080C8420: - ldr r0, _080C8428 + ldr r0, =sub_80C9D1C + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C8428: .4byte sub_80C9D1C + 1 + .pool _080C842C: movs r0, 0x5 bl audio_play - ldr r0, _080C843C + ldr r0, =box_related + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C843C: .4byte box_related + 1 + .pool _080C8440: - ldr r0, _080C8448 + ldr r0, =sub_80C8864 + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C8448: .4byte sub_80C8864 + 1 + .pool _080C844C: movs r0, 0x5 bl audio_play bl get_preferred_box - ldr r4, _080C847C + ldr r4, =0x02039d08 ldr r1, [r4] lsls r0, 24 lsrs r0, 24 adds r0, 0x1 - ldr r2, _080C8480 + ldr r2, =0x000002ca adds r1, r2 strh r0, [r1] cmp r0, 0xD @@ -410123,18 +396586,17 @@ _080C846E: adds r0, r1, r2 b _080C8776 .align 2, 0 -_080C847C: .4byte 0x02039d08 -_080C8480: .4byte 0x000002ca + .pool _080C8484: movs r0, 0x5 bl audio_play bl get_preferred_box - ldr r4, _080C84B4 + ldr r4, =0x02039d08 ldr r1, [r4] lsls r0, 24 lsrs r0, 24 subs r0, 0x1 - ldr r2, _080C84B8 + ldr r2, =0x000002ca adds r1, r2 strh r0, [r1] cmp r0, 0 @@ -410149,8 +396611,7 @@ _080C84A6: adds r0, r1, r2 b _080C8776 .align 2, 0 -_080C84B4: .4byte 0x02039d08 -_080C84B8: .4byte 0x000002ca + .pool _080C84BC: bl sub_80CFEA8 ldr r1, [r4] @@ -410162,9 +396623,9 @@ _080C84C8: lsls r0, 24 cmp r0, 0 bne _080C8528 - ldr r4, _080C84F0 + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r1, _080C84F4 + ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] bl itemid_is_mail @@ -410177,16 +396638,15 @@ _080C84E6: strb r0, [r1] b _080C879E .align 2, 0 -_080C84F0: .4byte 0x02039d08 -_080C84F4: .4byte 0x00000ce6 + .pool _080C84F8: movs r0, 0x5 bl audio_play - ldr r0, _080C8508 + ldr r0, =sub_80C8D78 + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C8508: .4byte sub_80C8D78 + 1 + .pool _080C850C: bl sub_80CEA30 lsls r0, 24 @@ -410201,61 +396661,61 @@ _080C851E: cmp r0, 0 bne _080C8538 _080C8528: - ldr r0, _080C8534 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x4 strb r0, [r1] b _080C879E .align 2, 0 -_080C8534: .4byte 0x02039d08 + .pool _080C8538: movs r0, 0x5 bl audio_play - ldr r0, _080C8548 + ldr r0, =c3_0808DC50 + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C8548: .4byte c3_0808DC50 + 1 + .pool _080C854C: movs r0, 0x5 bl audio_play - ldr r0, _080C855C + ldr r0, =sub_80C8C90 + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C855C: .4byte sub_80C8C90 + 1 + .pool _080C8560: movs r0, 0x5 bl audio_play - ldr r0, _080C8570 + ldr r0, =sub_80C8BEC + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C8570: .4byte sub_80C8BEC + 1 + .pool _080C8574: movs r0, 0x5 bl audio_play - ldr r0, _080C8584 + ldr r0, =sub_80C9128 + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C8584: .4byte sub_80C9128 + 1 + .pool _080C8588: movs r0, 0x5 bl audio_play - ldr r0, _080C8598 + ldr r0, =sub_80C91DC + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C8598: .4byte sub_80C91DC + 1 + .pool _080C859C: movs r0, 0x5 bl audio_play - ldr r0, _080C85AC + ldr r0, =sub_80C93B0 + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C85AC: .4byte sub_80C93B0 + 1 + .pool _080C85B0: movs r0, 0x5 bl audio_play @@ -410264,13 +396724,13 @@ _080C85B0: _080C85BA: movs r0, 0x1 bl sub_80D01D0 - ldr r0, _080C85CC + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x8 strb r0, [r1] b _080C879E .align 2, 0 -_080C85CC: .4byte 0x02039d08 + .pool _080C85D0: movs r0, 0x5 bl audio_play @@ -410285,26 +396745,26 @@ _080C85DE: movs r0, 0x4 _080C85E6: bl sub_80D01D0 - ldr r0, _080C85F4 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x9 strb r0, [r1] b _080C879E .align 2, 0 -_080C85F4: .4byte 0x02039d08 + .pool _080C85F8: movs r0, 0x5 bl audio_play movs r0, 0x5 _080C8600: bl sub_80D01D0 - ldr r0, _080C8610 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x7 strb r0, [r1] b _080C879E .align 2, 0 -_080C8610: .4byte 0x02039d08 + .pool _080C8614: movs r0, 0x20 bl audio_play @@ -410325,9 +396785,9 @@ _080C8628: _080C8638: bl sub_80CA9EC _080C863C: - ldr r4, _080C8654 + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r1, _080C8658 + ldr r1, =0x00000cea adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -410337,8 +396797,7 @@ _080C864E: ldr r1, [r4] b _080C86C8 .align 2, 0 -_080C8654: .4byte 0x02039d08 -_080C8658: .4byte 0x00000cea + .pool _080C865C: bl sub_80CC54C lsls r0, 24 @@ -410346,13 +396805,13 @@ _080C865C: beq _080C8668 b _080C879E _080C8668: - ldr r0, _080C86A8 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080C86AC + ldr r1, =0x000002ca adds r0, r1 ldrb r0, [r0] bl sub_80D1D18 - ldr r0, _080C86B0 + ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 bne _080C8690 @@ -410363,7 +396822,7 @@ _080C8668: bl sub_80CE00C bl BoxSetMosaic _080C8690: - ldr r4, _080C86A8 + ldr r4, =0x02039d08 ldr r1, [r4] ldrb r0, [r1, 0x1] cmp r0, 0x3 @@ -410374,26 +396833,23 @@ _080C8690: strb r0, [r1] b _080C879E .align 2, 0 -_080C86A8: .4byte 0x02039d08 -_080C86AC: .4byte 0x000002ca -_080C86B0: .4byte 0x02039d0c + .pool _080C86B4: - ldr r0, _080C86D0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 beq _080C879E bl sub_80CADC4 - ldr r0, _080C86D4 + ldr r0, =0x02039d08 ldr r1, [r0] _080C86C8: movs r0, 0 strb r0, [r1] b _080C879E .align 2, 0 -_080C86D0: .4byte 0x030022c0 -_080C86D4: .4byte 0x02039d08 + .pool _080C86D8: movs r0, 0x20 bl audio_play @@ -410405,27 +396861,26 @@ _080C86E2: movs r0, 0x16 _080C86EA: bl sub_80CAC58 - ldr r0, _080C86F8 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x6 strb r0, [r1] b _080C879E .align 2, 0 -_080C86F8: .4byte 0x02039d08 + .pool _080C86FC: - ldr r0, _080C8714 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 beq _080C879E bl sub_80CADC4 - ldr r0, _080C8718 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C8714: .4byte 0x030022c0 -_080C8718: .4byte task_pokemon_box_related + 1 + .pool _080C871C: bl sub_80D01E4 b _080C8790 @@ -410435,20 +396890,20 @@ _080C8722: cmp r0, 0 bne _080C879E _080C872C: - ldr r0, _080C8734 + ldr r0, =sub_80C8B90 + 1 bl add_to_c3_somehow b _080C879E .align 2, 0 -_080C8734: .4byte sub_80C8B90 + 1 + .pool _080C8738: bl sub_80D01E4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 bne _080C879E - ldr r5, _080C875C + ldr r5, =0x02039d08 ldr r0, [r5] - ldr r1, _080C8760 + ldr r1, =0x00000cea adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -410459,16 +396914,15 @@ _080C8756: strb r4, [r0] b _080C879E .align 2, 0 -_080C875C: .4byte 0x02039d08 -_080C8760: .4byte 0x00000cea + .pool _080C8764: bl sub_80D1218 lsls r0, 24 cmp r0, 0 bne _080C879E - ldr r4, _080C8784 + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r1, _080C8788 + ldr r1, =0x000002ca adds r0, r1 _080C8776: ldrb r0, [r0] @@ -410478,8 +396932,7 @@ _080C8776: strb r0, [r1] b _080C879E .align 2, 0 -_080C8784: .4byte 0x02039d08 -_080C8788: .4byte 0x000002ca + .pool _080C878C: bl sub_80D1218 _080C8790: @@ -410487,7 +396940,7 @@ _080C8790: lsrs r1, r0, 24 cmp r1, 0 bne _080C879E - ldr r0, _080C87A4 + ldr r0, =0x02039d08 ldr r0, [r0] strb r1, [r0] _080C879E: @@ -410495,13 +396948,13 @@ _080C879E: pop {r0} bx r0 .align 2, 0 -_080C87A4: .4byte 0x02039d08 + .pool thumb_func_end task_pokemon_box_related thumb_func_start sub_80C87A8 sub_80C87A8: @ 80C87A8 push {r4,lr} - ldr r4, _080C87BC + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 @@ -410510,7 +396963,7 @@ sub_80C87A8: @ 80C87A8 beq _080C87CE b _080C87DE .align 2, 0 -_080C87BC: .4byte 0x02039d08 + .pool _080C87C0: bl sub_80CAB4C ldr r1, [r4] @@ -410523,20 +396976,20 @@ _080C87CE: lsls r0, 24 cmp r0, 0 bne _080C87DE - ldr r0, _080C87E4 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C87DE: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C87E4: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C87A8 thumb_func_start sub_80C87E8 sub_80C87E8: @ 80C87E8 push {r4,lr} - ldr r4, _080C8800 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0x1 @@ -410547,7 +397000,7 @@ sub_80C87E8: @ 80C87E8 beq _080C880A b _080C8856 .align 2, 0 -_080C8800: .4byte 0x02039d08 + .pool _080C8804: cmp r0, 0x2 beq _080C8836 @@ -410578,28 +397031,27 @@ _080C8836: cmp r0, 0 bne _080C8856 ldr r0, [r4] - ldr r1, _080C885C + ldr r1, =0x00000cea adds r0, r1 ldrb r0, [r0] cmp r0, 0 beq _080C8850 bl BoxSetMosaic _080C8850: - ldr r0, _080C8860 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C8856: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C885C: .4byte 0x00000cea -_080C8860: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C87E8 thumb_func_start sub_80C8864 sub_80C8864: @ 80C8864 push {r4,lr} - ldr r0, _080C887C + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x6 @@ -410607,13 +397059,12 @@ sub_80C8864: @ 80C8864 b _080C8B82 _080C8872: lsls r0, 2 - ldr r1, _080C8880 + ldr r1, =_080C8884 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C887C: .4byte 0x02039d08 -_080C8880: .4byte _080C8884 + .pool .align 2, 0 _080C8884: .4byte _080C88A0 @@ -410632,7 +397083,7 @@ _080C88A0: _080C88AC: movs r0, 0x5 bl audio_play - ldr r4, _080C88C4 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0, 0x1] cmp r0, 0x3 @@ -410641,14 +397092,14 @@ _080C88AC: bl sub_80CAC58 b _080C88F2 .align 2, 0 -_080C88C4: .4byte 0x02039d08 + .pool _080C88C8: bl sub_80D127C lsls r0, 24 cmp r0, 0 bne _080C88DE ldr r0, [r4] - ldr r1, _080C88E8 + ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] cmp r0, 0 @@ -410658,19 +397109,19 @@ _080C88DE: bl sub_80CAC58 b _080C88F2 .align 2, 0 -_080C88E8: .4byte 0x00000ce6 + .pool _080C88EC: movs r0, 0x18 bl sub_80CAC58 _080C88F2: bl sub_80CFFD0 - ldr r0, _080C8900 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x1 strb r0, [r1] b _080C8B82 .align 2, 0 -_080C8900: .4byte 0x02039d08 + .pool _080C8904: bl sub_80D00A8 lsls r0, 24 @@ -410678,13 +397129,13 @@ _080C8904: beq _080C8910 b _080C8B82 _080C8910: - ldr r0, _080C891C + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x2 strb r0, [r1] b _080C8B82 .align 2, 0 -_080C891C: .4byte 0x02039d08 + .pool _080C8920: bl sub_80D00AC adds r0, 0x1 @@ -410695,12 +397146,12 @@ _080C8920: b _080C8B82 _080C8930: lsls r0, 2 - ldr r1, _080C893C + ldr r1, =_080C8940 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C893C: .4byte _080C8940 + .pool .align 2, 0 _080C8940: .4byte _080C898C @@ -410724,11 +397175,11 @@ _080C8940: .4byte _080C8B30 _080C898C: bl sub_80CADC4 - ldr r0, _080C8998 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8998: .4byte task_pokemon_box_related + 1 + .pool _080C899C: bl sub_80CEA30 lsls r0, 24 @@ -410737,20 +397188,20 @@ _080C899C: movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, _080C89B8 + ldr r0, =sub_80C8B90 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C89B8: .4byte sub_80C8B90 + 1 + .pool _080C89BC: movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, _080C89D0 + ldr r0, =sub_80C8BEC + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C89D0: .4byte sub_80C8BEC + 1 + .pool _080C89D4: bl sub_80CEA6C lsls r0, 24 @@ -410759,28 +397210,28 @@ _080C89D4: movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, _080C89F0 + ldr r0, =c3_0808DC50 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C89F0: .4byte c3_0808DC50 + 1 + .pool _080C89F4: movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, _080C8A08 + ldr r0, =sub_80C8C90 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8A08: .4byte sub_80C8C90 + 1 + .pool _080C8A0C: bl sub_80CEA30 lsls r0, 24 cmp r0, 0 bne _080C8A52 - ldr r4, _080C8A3C + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r2, _080C8A40 + ldr r2, =0x00000ce6 adds r0, r2 ldrh r0, [r0] bl itemid_is_mail @@ -410790,30 +397241,28 @@ _080C8A0C: movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, _080C8A44 + ldr r0, =sub_80C8D78 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8A3C: .4byte 0x02039d08 -_080C8A40: .4byte 0x00000ce6 -_080C8A44: .4byte sub_80C8D78 + 1 + .pool _080C8A48: bl sub_80CEA30 lsls r0, 24 cmp r0, 0 beq _080C8A60 _080C8A52: - ldr r0, _080C8A5C + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x3 strb r0, [r1] b _080C8B82 .align 2, 0 -_080C8A5C: .4byte 0x02039d08 + .pool _080C8A60: - ldr r4, _080C8A74 + ldr r4, =0x02039d08 ldr r1, [r4] - ldr r2, _080C8A78 + ldr r2, =0x00000ced adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -410822,10 +397271,9 @@ _080C8A60: strb r0, [r1] b _080C8B82 .align 2, 0 -_080C8A74: .4byte 0x02039d08 -_080C8A78: .4byte 0x00000ced + .pool _080C8A7C: - ldr r2, _080C8A94 + ldr r2, =0x00000ce6 adds r0, r1, r2 ldrh r0, [r0] bl itemid_is_mail @@ -410838,75 +397286,75 @@ _080C8A8C: strb r0, [r1] b _080C8B82 .align 2, 0 -_080C8A94: .4byte 0x00000ce6 + .pool _080C8A98: movs r0, 0x5 bl audio_play - ldr r0, _080C8AA8 + ldr r0, =sub_80C8EB4 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8AA8: .4byte sub_80C8EB4 + 1 + .pool _080C8AAC: movs r0, 0x5 bl audio_play - ldr r0, _080C8ABC + ldr r0, =sub_80C9B28 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8ABC: .4byte sub_80C9B28 + 1 + .pool _080C8AC0: movs r0, 0x5 bl audio_play - ldr r0, _080C8AD0 + ldr r0, =sub_80C90A4 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8AD0: .4byte sub_80C90A4 + 1 + .pool _080C8AD4: movs r0, 0x5 bl audio_play - ldr r0, _080C8AE4 + ldr r0, =sub_80C9128 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8AE4: .4byte sub_80C9128 + 1 + .pool _080C8AE8: movs r0, 0x5 bl audio_play - ldr r0, _080C8AF8 + ldr r0, =sub_80C91DC + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8AF8: .4byte sub_80C91DC + 1 + .pool _080C8AFC: - ldr r0, _080C8B04 + ldr r0, =sub_80C9298 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8B04: .4byte sub_80C9298 + 1 + .pool _080C8B08: movs r0, 0x5 bl audio_play - ldr r0, _080C8B18 + ldr r0, =sub_80C93B0 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8B18: .4byte sub_80C93B0 + 1 + .pool _080C8B1C: movs r0, 0x5 bl audio_play - ldr r0, _080C8B2C + ldr r0, =sub_80C9B88 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8B2C: .4byte sub_80C9B88 + 1 + .pool _080C8B30: - ldr r0, _080C8B38 + ldr r0, =sub_80C9498 + 1 bl add_to_c3_somehow b _080C8B82 .align 2, 0 -_080C8B38: .4byte sub_80C9498 + 1 + .pool _080C8B3C: movs r0, 0x20 bl audio_play @@ -410923,36 +397371,35 @@ _080C8B50: movs r0, 0x16 _080C8B58: bl sub_80CAC58 - ldr r0, _080C8B68 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x6 strb r0, [r1] b _080C8B82 .align 2, 0 -_080C8B68: .4byte 0x02039d08 + .pool _080C8B6C: - ldr r0, _080C8B88 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 beq _080C8B82 bl sub_80CADC4 - ldr r0, _080C8B8C + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C8B82: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C8B88: .4byte 0x030022c0 -_080C8B8C: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C8864 thumb_func_start sub_80C8B90 sub_80C8B90: @ 80C8B90 push {r4,lr} - ldr r4, _080C8BA4 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 @@ -410961,7 +397408,7 @@ sub_80C8B90: @ 80C8B90 beq _080C8BB8 b _080C8BE2 .align 2, 0 -_080C8BA4: .4byte 0x02039d08 + .pool _080C8BA8: movs r0, 0 bl sub_80CDC38 @@ -410975,31 +397422,30 @@ _080C8BB8: lsls r0, 24 cmp r0, 0 bne _080C8BE2 - ldr r0, _080C8BD4 + ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 beq _080C8BDC - ldr r0, _080C8BD8 + ldr r0, =sub_80C9670 + 1 bl add_to_c3_somehow b _080C8BE2 .align 2, 0 -_080C8BD4: .4byte 0x02039d0c -_080C8BD8: .4byte sub_80C9670 + 1 + .pool _080C8BDC: - ldr r0, _080C8BE8 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C8BE2: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C8BE8: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C8B90 thumb_func_start sub_80C8BEC sub_80C8BEC: @ 80C8BEC push {r4,lr} - ldr r4, _080C8C00 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 @@ -411008,7 +397454,7 @@ sub_80C8BEC: @ 80C8BEC beq _080C8C14 b _080C8C3E .align 2, 0 -_080C8C00: .4byte 0x02039d08 + .pool _080C8C04: movs r0, 0x1 bl sub_80CDC38 @@ -411022,31 +397468,30 @@ _080C8C14: lsls r0, 24 cmp r0, 0 bne _080C8C3E - ldr r0, _080C8C30 + ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 beq _080C8C38 - ldr r0, _080C8C34 + ldr r0, =sub_80C9670 + 1 bl add_to_c3_somehow b _080C8C3E .align 2, 0 -_080C8C30: .4byte 0x02039d0c -_080C8C34: .4byte sub_80C9670 + 1 + .pool _080C8C38: - ldr r0, _080C8C44 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C8C3E: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C8C44: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C8BEC thumb_func_start c3_0808DC50 c3_0808DC50: @ 80C8C48 push {r4,lr} - ldr r4, _080C8C5C + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 @@ -411055,7 +397500,7 @@ c3_0808DC50: @ 80C8C48 beq _080C8C70 b _080C8C84 .align 2, 0 -_080C8C5C: .4byte 0x02039d08 + .pool _080C8C60: movs r0, 0x2 bl sub_80CDC38 @@ -411070,32 +397515,31 @@ _080C8C70: cmp r0, 0 bne _080C8C84 bl BoxSetMosaic - ldr r0, _080C8C8C + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C8C84: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C8C8C: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end c3_0808DC50 thumb_func_start sub_80C8C90 sub_80C8C90: @ 80C8C90 push {lr} - ldr r0, _080C8CA8 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x5 bhi _080C8D6E lsls r0, 2 - ldr r1, _080C8CAC + ldr r1, =_080C8CB0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C8CA8: .4byte 0x02039d08 -_080C8CAC: .4byte _080C8CB0 + .pool .align 2, 0 _080C8CB0: .4byte _080C8CC8 @@ -411112,38 +397556,37 @@ _080C8CC8: bne _080C8CE8 movs r0, 0xE bl sub_80CAC58 - ldr r0, _080C8CE4 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x1 strb r0, [r1] b _080C8D6E .align 2, 0 -_080C8CE4: .4byte 0x02039d08 + .pool _080C8CE8: bl sub_80CDC18 movs r0, 0 bl sub_80CDC38 - ldr r0, _080C8CFC + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x2 strb r0, [r1] b _080C8D6E .align 2, 0 -_080C8CFC: .4byte 0x02039d08 + .pool _080C8D00: - ldr r0, _080C8D18 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 beq _080C8D6E bl sub_80CADC4 - ldr r0, _080C8D1C + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C8D6E .align 2, 0 -_080C8D18: .4byte 0x030022c0 -_080C8D1C: .4byte task_pokemon_box_related + 1 + .pool _080C8D20: bl sub_80CDCAC lsls r0, 24 @@ -411168,29 +397611,29 @@ _080C8D48: bne _080C8D6E bl sub_80CAB20 _080C8D56: - ldr r0, _080C8D64 + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _080C8D6E .align 2, 0 -_080C8D64: .4byte 0x02039d08 + .pool _080C8D68: - ldr r0, _080C8D74 + ldr r0, =sub_80C87E8 + 1 bl add_to_c3_somehow _080C8D6E: pop {r0} bx r0 .align 2, 0 -_080C8D74: .4byte sub_80C87E8 + 1 + .pool thumb_func_end sub_80C8C90 thumb_func_start sub_80C8D78 sub_80C8D78: @ 80C8D78 push {r4,lr} sub sp, 0x4 - ldr r0, _080C8D94 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x4 @@ -411198,13 +397641,12 @@ sub_80C8D78: @ 80C8D78 b _080C8EA2 _080C8D88: lsls r0, 2 - ldr r1, _080C8D98 + ldr r1, =_080C8D9C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C8D94: .4byte 0x02039d08 -_080C8D98: .4byte _080C8D9C + .pool .align 2, 0 _080C8D9C: .4byte _080C8DB0 @@ -411215,17 +397657,17 @@ _080C8D9C: _080C8DB0: movs r0, 0x6 bl sub_80CAC58 - ldr r4, _080C8DDC + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r1, _080C8DE0 + ldr r1, =0x00001e5c adds r0, r1 - ldr r2, _080C8DE4 + ldr r2, =0x0000dac7 movs r1, 0 str r1, [sp] movs r1, 0xA movs r3, 0x3 bl sub_80C77E8 - ldr r0, _080C8DE8 + ldr r0, =0x02039d0e ldrb r0, [r0] bl sub_80C78D4 ldr r1, [r4] @@ -411233,10 +397675,7 @@ _080C8DB0: adds r0, 0x1 b _080C8EA0 .align 2, 0 -_080C8DDC: .4byte 0x02039d08 -_080C8DE0: .4byte 0x00001e5c -_080C8DE4: .4byte 0x0000dac7 -_080C8DE8: .4byte 0x02039d0e + .pool _080C8DEC: bl sub_80C78F0 lsls r0, 24 @@ -411256,37 +397695,36 @@ _080C8E0C: lsls r0, 24 cmp r0, 0 beq _080C8E38 - ldr r0, _080C8E30 + ldr r0, =0x02039d0e strb r4, [r0] bl sub_80CADC4 bl sub_80C78E4 bl sub_80C7890 - ldr r0, _080C8E34 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x2 b _080C8EA0 .align 2, 0 -_080C8E30: .4byte 0x02039d0e -_080C8E34: .4byte 0x02039d08 + .pool _080C8E38: movs r0, 0x8 bl sub_80CAC58 - ldr r0, _080C8E48 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x4 b _080C8EA0 .align 2, 0 -_080C8E48: .4byte 0x02039d08 + .pool _080C8E4C: bl party_compaction bl sub_80CB950 - ldr r0, _080C8E60 + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 b _080C8EA0 .align 2, 0 -_080C8E60: .4byte 0x02039d08 + .pool _080C8E64: bl sub_80CB9BC lsls r0, 24 @@ -411296,13 +397734,13 @@ _080C8E64: bl BoxSetMosaic bl sub_80CAB20 _080C8E7A: - ldr r0, _080C8E84 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C8EA2 .align 2, 0 -_080C8E84: .4byte task_pokemon_box_related + 1 + .pool _080C8E88: - ldr r0, _080C8EAC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -411310,7 +397748,7 @@ _080C8E88: beq _080C8EA2 movs r0, 0x6 bl sub_80CAC58 - ldr r0, _080C8EB0 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x1 _080C8EA0: @@ -411321,14 +397759,13 @@ _080C8EA2: pop {r0} bx r0 .align 2, 0 -_080C8EAC: .4byte 0x030022c0 -_080C8EB0: .4byte 0x02039d08 + .pool thumb_func_end sub_80C8D78 thumb_func_start sub_80C8EB4 sub_80C8EB4: @ 80C8EB4 push {lr} - ldr r0, _080C8ECC + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0xD @@ -411336,13 +397773,12 @@ sub_80C8EB4: @ 80C8EB4 b _080C9096 _080C8EC2: lsls r0, 2 - ldr r1, _080C8ED0 + ldr r1, =_080C8ED4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C8ECC: .4byte 0x02039d08 -_080C8ED0: .4byte _080C8ED4 + .pool .align 2, 0 _080C8ED4: .4byte _080C8F0C @@ -411364,7 +397800,7 @@ _080C8F0C: bl sub_80CAC58 movs r0, 0x1 bl sub_80CAD9C - ldr r0, _080C8F3C + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -411383,7 +397819,7 @@ _080C8F22: beq _080C8F46 b _080C9096 .align 2, 0 -_080C8F3C: .4byte 0x02039d08 + .pool _080C8F40: cmp r1, 0x1 beq _080C8F46 @@ -411422,7 +397858,7 @@ _080C8F80: movs r0, 0xA b _080C9058 _080C8F8C: - ldr r0, _080C8FA0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -411433,16 +397869,16 @@ _080C8F9A: movs r0, 0xB b _080C9058 .align 2, 0 -_080C8FA0: .4byte 0x030022c0 + .pool _080C8FA4: - ldr r0, _080C8FC8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 beq _080C9096 bl sub_80CADC4 - ldr r0, _080C8FCC + ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 beq _080C8FD0 @@ -411450,16 +397886,15 @@ _080C8FA4: bl sub_80CB950 b _080C905C .align 2, 0 -_080C8FC8: .4byte 0x030022c0 -_080C8FCC: .4byte 0x02039d0c + .pool _080C8FD0: - ldr r0, _080C8FDC + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x7 strb r0, [r1] b _080C9096 .align 2, 0 -_080C8FDC: .4byte 0x02039d08 + .pool _080C8FE0: bl sub_80CB9BC lsls r0, 24 @@ -411470,16 +397905,16 @@ _080C8FE0: bl sub_80CAB20 b _080C905C _080C8FF8: - ldr r0, _080C9000 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C9096 .align 2, 0 -_080C9000: .4byte task_pokemon_box_related + 1 + .pool _080C9004: movs r0, 0xA b _080C9058 _080C9008: - ldr r0, _080C9018 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -411488,9 +397923,9 @@ _080C9008: movs r0, 0x15 b _080C9058 .align 2, 0 -_080C9018: .4byte 0x030022c0 + .pool _080C901C: - ldr r0, _080C9034 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -411500,7 +397935,7 @@ _080C901C: bl sub_80CC064 b _080C905C .align 2, 0 -_080C9034: .4byte 0x030022c0 + .pool _080C9038: bl sub_80CC0A0 lsls r0, 24 @@ -411510,7 +397945,7 @@ _080C9038: movs r0, 0x13 b _080C9058 _080C904A: - ldr r0, _080C9068 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -411520,45 +397955,43 @@ _080C904A: _080C9058: bl sub_80CAC58 _080C905C: - ldr r0, _080C906C + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _080C9096 .align 2, 0 -_080C9068: .4byte 0x030022c0 -_080C906C: .4byte 0x02039d08 + .pool _080C9070: - ldr r0, _080C907C + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x8 strb r0, [r1] b _080C9096 .align 2, 0 -_080C907C: .4byte 0x02039d08 + .pool _080C9080: - ldr r0, _080C909C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 beq _080C9096 bl sub_80CADC4 - ldr r0, _080C90A0 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C9096: pop {r0} bx r0 .align 2, 0 -_080C909C: .4byte 0x030022c0 -_080C90A0: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C8EB4 thumb_func_start sub_80C90A4 sub_80C90A4: @ 80C90A4 push {r4,lr} - ldr r4, _080C90B8 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 @@ -411567,15 +398000,15 @@ sub_80C90A4: @ 80C90A4 beq _080C90F0 b _080C9118 .align 2, 0 -_080C90B8: .4byte 0x02039d08 + .pool _080C90BC: movs r0, 0xC bl sub_80CAC58 ldr r0, [r4] - ldr r2, _080C90E8 + ldr r2, =0x00000ceb adds r1, r0, r2 ldrb r1, [r1] - ldr r3, _080C90EC + ldr r3, =0x00000da8 adds r0, r3 strb r1, [r0] ldr r0, [r4] @@ -411590,8 +398023,7 @@ _080C90BC: strb r0, [r1] b _080C9118 .align 2, 0 -_080C90E8: .4byte 0x00000ceb -_080C90EC: .4byte 0x00000da8 + .pool _080C90F0: bl sub_811FBA4 lsls r0, 24 @@ -411600,26 +398032,25 @@ _080C90F0: bl sub_811FAF8 bl sub_80CADC4 ldr r0, [r4] - ldr r1, _080C9120 + ldr r1, =0x00000da8 adds r0, r1 ldrb r0, [r0] bl sub_80CE9A8 bl sub_80CA230 - ldr r0, _080C9124 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C9118: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C9120: .4byte 0x00000da8 -_080C9124: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C90A4 thumb_func_start sub_80C9128 sub_80C9128: @ 80C9128 push {r4,r5,lr} - ldr r5, _080C9140 + ldr r5, =0x02039d08 ldr r0, [r5] ldrb r1, [r0] cmp r1, 0x1 @@ -411630,7 +398061,7 @@ sub_80C9128: @ 80C9128 beq _080C914E b _080C91D2 .align 2, 0 -_080C9140: .4byte 0x02039d08 + .pool _080C9144: cmp r1, 0x2 beq _080C919C @@ -411638,7 +398069,7 @@ _080C9144: beq _080C91C2 b _080C91D2 _080C914E: - ldr r1, _080C9164 + ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] bl itemid_is_mail @@ -411648,17 +398079,17 @@ _080C914E: bl sub_80CADC4 b _080C91B8 .align 2, 0 -_080C9164: .4byte 0x00000ce6 + .pool _080C9168: - ldr r0, _080C9170 + ldr r0, =sub_80C96B8 + 1 bl add_to_c3_somehow b _080C91D2 .align 2, 0 -_080C9170: .4byte sub_80C96B8 + 1 + .pool _080C9174: movs r0, 0x2 bl sub_80CFE54 - ldr r0, _080C9198 + ldr r0, =0x02039d0c ldrb r0, [r0] negs r4, r0 orrs r4, r0 @@ -411671,7 +398102,7 @@ _080C9174: bl sub_80D0E90 b _080C91B8 .align 2, 0 -_080C9198: .4byte 0x02039d0c + .pool _080C919C: bl sub_80D1218 lsls r0, 24 @@ -411693,32 +398124,31 @@ _080C91C2: lsls r0, 24 cmp r0, 0 bne _080C91D2 - ldr r0, _080C91D8 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C91D2: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080C91D8: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C9128 thumb_func_start sub_80C91DC sub_80C91DC: @ 80C91DC push {r4,lr} - ldr r0, _080C91F4 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x4 bhi _080C928C lsls r0, 2 - ldr r1, _080C91F8 + ldr r1, =_080C91FC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C91F4: .4byte 0x02039d08 -_080C91F8: .4byte _080C91FC + .pool .align 2, 0 _080C91FC: .4byte _080C9264 @@ -411729,7 +398159,7 @@ _080C91FC: _080C9210: movs r0, 0x2 bl sub_80CFE54 - ldr r0, _080C9234 + ldr r0, =0x02039d0c ldrb r0, [r0] negs r4, r0 orrs r4, r0 @@ -411742,7 +398172,7 @@ _080C9210: bl sub_80D1080 b _080C9268 .align 2, 0 -_080C9234: .4byte 0x02039d0c + .pool _080C9238: bl sub_80D1218 lsls r0, 24 @@ -411756,7 +398186,7 @@ _080C9238: bl sub_80CAC58 b _080C9268 _080C9258: - ldr r0, _080C9274 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -411765,34 +398195,33 @@ _080C9258: _080C9264: bl sub_80CADC4 _080C9268: - ldr r0, _080C9278 + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _080C928C .align 2, 0 -_080C9274: .4byte 0x030022c0 -_080C9278: .4byte 0x02039d08 + .pool _080C927C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _080C928C - ldr r0, _080C9294 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C928C: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C9294: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C91DC thumb_func_start sub_80C9298 sub_80C9298: @ 80C9298 push {r4,r5,lr} - ldr r1, _080C92B4 + ldr r1, =0x02039d08 ldr r0, [r1] ldrb r0, [r0] adds r5, r1, 0 @@ -411801,13 +398230,12 @@ sub_80C9298: @ 80C9298 b _080C93A2 _080C92A8: lsls r0, 2 - ldr r1, _080C92B8 + ldr r1, =_080C92BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C92B4: .4byte 0x02039d08 -_080C92B8: .4byte _080C92BC + .pool .align 2, 0 _080C92BC: .4byte _080C92D0 @@ -411817,7 +398245,7 @@ _080C92BC: .4byte _080C9374 _080C92D0: ldr r0, [r5] - ldr r1, _080C92F8 + ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] movs r1, 0x1 @@ -411834,11 +398262,11 @@ _080C92D0: strb r0, [r1] b _080C93A2 .align 2, 0 -_080C92F8: .4byte 0x00000ce6 + .pool _080C92FC: movs r0, 0x5 bl audio_play - ldr r0, _080C9324 + ldr r0, =0x02039d0c ldrb r0, [r0] negs r4, r0 orrs r4, r0 @@ -411854,7 +398282,7 @@ _080C92FC: strb r0, [r1] b _080C93A2 .align 2, 0 -_080C9324: .4byte 0x02039d0c + .pool _080C9328: bl sub_80D1218 lsls r0, 24 @@ -411862,15 +398290,15 @@ _080C9328: bne _080C93A2 movs r0, 0x19 bl sub_80CAC58 - ldr r0, _080C9344 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x2 strb r0, [r1] b _080C93A2 .align 2, 0 -_080C9344: .4byte 0x02039d08 + .pool _080C9348: - ldr r0, _080C936C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -411879,60 +398307,57 @@ _080C9348: bl sub_80CADC4 bl sub_80CE00C bl sub_80CA4FC - ldr r0, _080C9370 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x4 strb r0, [r1] b _080C93A2 .align 2, 0 -_080C936C: .4byte 0x030022c0 -_080C9370: .4byte 0x02039d08 + .pool _080C9374: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _080C93A2 - ldr r0, _080C9388 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C93A2 .align 2, 0 -_080C9388: .4byte task_pokemon_box_related + 1 + .pool _080C938C: - ldr r0, _080C93A8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 beq _080C93A2 bl sub_80CADC4 - ldr r0, _080C93AC + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C93A2: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080C93A8: .4byte 0x030022c0 -_080C93AC: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C9298 thumb_func_start sub_80C93B0 sub_80C93B0: @ 80C93B0 push {r4,lr} - ldr r1, _080C93C8 + ldr r1, =0x02039d08 ldr r0, [r1] ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0x4 bhi _080C948C lsls r0, 2 - ldr r1, _080C93CC + ldr r1, =_080C93D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C93C8: .4byte 0x02039d08 -_080C93CC: .4byte _080C93D0 + .pool .align 2, 0 _080C93D0: .4byte _080C93E4 @@ -411942,7 +398367,7 @@ _080C93D0: .4byte _080C947C _080C93E4: ldr r0, [r4] - ldr r1, _080C9400 + ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] bl itemid_is_mail @@ -411953,17 +398378,17 @@ _080C93E4: ldr r1, [r4] b _080C946C .align 2, 0 -_080C9400: .4byte 0x00000ce6 + .pool _080C9404: - ldr r0, _080C940C + ldr r0, =sub_80C96B8 + 1 bl add_to_c3_somehow b _080C948C .align 2, 0 -_080C940C: .4byte sub_80C96B8 + 1 + .pool _080C9410: movs r0, 0x2 bl sub_80CFE54 - ldr r0, _080C9434 + ldr r0, =0x02039d0c ldrb r0, [r0] negs r4, r0 orrs r4, r0 @@ -411976,7 +398401,7 @@ _080C9410: bl sub_80D0FAC b _080C9468 .align 2, 0 -_080C9434: .4byte 0x02039d0c + .pool _080C9438: bl sub_80D1218 lsls r0, 24 @@ -411990,7 +398415,7 @@ _080C9438: bl sub_80CAC58 b _080C9468 _080C9458: - ldr r0, _080C9474 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -411998,7 +398423,7 @@ _080C9458: beq _080C948C bl sub_80CADC4 _080C9468: - ldr r0, _080C9478 + ldr r0, =0x02039d08 ldr r1, [r0] _080C946C: ldrb r0, [r1] @@ -412006,39 +398431,37 @@ _080C946C: strb r0, [r1] b _080C948C .align 2, 0 -_080C9474: .4byte 0x030022c0 -_080C9478: .4byte 0x02039d08 + .pool _080C947C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _080C948C - ldr r0, _080C9494 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C948C: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C9494: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C93B0 thumb_func_start sub_80C9498 sub_80C9498: @ 80C9498 push {lr} - ldr r0, _080C94B0 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x6 bhi _080C9544 lsls r0, 2 - ldr r1, _080C94B4 + ldr r1, =_080C94B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C94B0: .4byte 0x02039d08 -_080C94B4: .4byte _080C94B8 + .pool .align 2, 0 _080C94B8: .4byte _080C94D4 @@ -412068,7 +398491,7 @@ _080C94FA: bl is_dma3_queue_busy_with_gpu_copy b _080C951C _080C9500: - ldr r0, _080C9514 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -412078,7 +398501,7 @@ _080C9500: bl audio_play b _080C9522 .align 2, 0 -_080C9514: .4byte 0x030022c0 + .pool _080C9518: bl sub_80D18E4 _080C951C: @@ -412086,32 +398509,32 @@ _080C951C: cmp r0, 0 bne _080C9544 _080C9522: - ldr r0, _080C9530 + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _080C9544 .align 2, 0 -_080C9530: .4byte 0x02039d08 + .pool _080C9534: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _080C9544 - ldr r0, _080C9548 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C9544: pop {r0} bx r0 .align 2, 0 -_080C9548: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C9498 thumb_func_start sub_80C954C sub_80C954C: @ 80C954C push {r4,lr} - ldr r0, _080C9564 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x5 @@ -412119,13 +398542,12 @@ sub_80C954C: @ 80C954C b _080C9664 _080C955A: lsls r0, 2 - ldr r1, _080C9568 + ldr r1, =_080C956C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C9564: .4byte 0x02039d08 -_080C9568: .4byte _080C956C + .pool .align 2, 0 _080C956C: .4byte _080C9584 @@ -412141,13 +398563,13 @@ _080C9584: bl sub_80CAC58 movs r0, 0 bl sub_80CAD9C - ldr r0, _080C95A0 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x1 strb r0, [r1] b _080C9664 .align 2, 0 -_080C95A0: .4byte 0x02039d08 + .pool _080C95A4: bl sub_8198C58 lsls r0, 24 @@ -412168,9 +398590,9 @@ _080C95C2: bl sub_80CADC4 b _080C9648 _080C95C8: - ldr r4, _080C95EC + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r1, _080C95F0 + ldr r1, =0x00002234 adds r0, r1 ldrh r0, [r0] movs r1, 0x1 @@ -412185,8 +398607,7 @@ _080C95C8: strb r0, [r1] b _080C9664 .align 2, 0 -_080C95EC: .4byte 0x02039d08 -_080C95F0: .4byte 0x00002234 + .pool _080C95F4: movs r0, 0x1A bl sub_80CAC58 @@ -412195,30 +398616,29 @@ _080C95F4: strb r0, [r1] b _080C9664 _080C9602: - ldr r0, _080C961C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 cmp r0, 0 beq _080C9664 bl sub_80CADC4 - ldr r0, _080C9620 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x5 strb r0, [r1] b _080C9664 .align 2, 0 -_080C961C: .4byte 0x030022c0 -_080C9620: .4byte 0x02039d08 + .pool _080C9624: bl sub_80D1194 - ldr r0, _080C9634 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x4 strb r0, [r1] b _080C9664 .align 2, 0 -_080C9634: .4byte 0x02039d08 + .pool _080C9638: bl sub_80D1218 lsls r0, 24 @@ -412227,30 +398647,30 @@ _080C9638: movs r0, 0 bl sub_80CFE54 _080C9648: - ldr r0, _080C9650 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C9664 .align 2, 0 -_080C9650: .4byte task_pokemon_box_related + 1 + .pool _080C9654: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _080C9664 - ldr r0, _080C966C + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C9664: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C966C: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C954C thumb_func_start sub_80C9670 sub_80C9670: @ 80C9670 push {r4,lr} - ldr r4, _080C9684 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 @@ -412259,7 +398679,7 @@ sub_80C9670: @ 80C9670 beq _080C969A b _080C96AE .align 2, 0 -_080C9684: .4byte 0x02039d08 + .pool _080C9688: bl party_compaction bl sub_80CB950 @@ -412274,20 +398694,20 @@ _080C969A: cmp r0, 0 bne _080C96AE bl sub_80CAB20 - ldr r0, _080C96B4 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C96AE: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C96B4: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C9670 thumb_func_start sub_80C96B8 sub_80C96B8: @ 80C96B8 push {r4,lr} - ldr r4, _080C96D0 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0x1 @@ -412298,7 +398718,7 @@ sub_80C96B8: @ 80C96B8 beq _080C96DE b _080C9720 .align 2, 0 -_080C96D0: .4byte 0x02039d08 + .pool _080C96D4: cmp r0, 0x2 beq _080C96F2 @@ -412316,7 +398736,7 @@ _080C96E6: bne _080C9720 b _080C9702 _080C96F2: - ldr r0, _080C970C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -412330,26 +398750,26 @@ _080C9702: strb r0, [r1] b _080C9720 .align 2, 0 -_080C970C: .4byte 0x030022c0 + .pool _080C9710: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _080C9720 - ldr r0, _080C9728 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C9720: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C9728: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C96B8 thumb_func_start box_related box_related: @ 80C972C push {r4,lr} - ldr r4, _080C9744 + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0x1 @@ -412360,7 +398780,7 @@ box_related: @ 80C972C beq _080C974E b _080C9818 .align 2, 0 -_080C9744: .4byte 0x02039d08 + .pool _080C9748: cmp r0, 0x2 beq _080C9774 @@ -412391,12 +398811,12 @@ _080C9774: cmp r0, 0xC bhi _080C9818 lsls r0, 2 - ldr r1, _080C978C + ldr r1, =_080C9790 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C978C: .4byte _080C9790 + .pool .align 2, 0 _080C9790: .4byte _080C97C4 @@ -412416,46 +398836,46 @@ _080C97C4: movs r0, 0x1 bl sub_80CD1A8 bl sub_80CADC4 - ldr r0, _080C97D8 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C9818 .align 2, 0 -_080C97D8: .4byte task_pokemon_box_related + 1 + .pool _080C97DC: movs r0, 0x5 bl audio_play - ldr r0, _080C97EC + ldr r0, =sub_80C9AC8 + 1 bl add_to_c3_somehow b _080C9818 .align 2, 0 -_080C97EC: .4byte sub_80C9AC8 + 1 + .pool _080C97F0: movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, _080C9804 + ldr r0, =sub_80C9824 + 1 bl add_to_c3_somehow b _080C9818 .align 2, 0 -_080C9804: .4byte sub_80C9824 + 1 + .pool _080C9808: movs r0, 0x5 bl audio_play bl sub_80CADC4 - ldr r0, _080C9820 + ldr r0, =sub_80C99D8 + 1 bl add_to_c3_somehow _080C9818: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C9820: .4byte sub_80C99D8 + 1 + .pool thumb_func_end box_related thumb_func_start sub_80C9824 sub_80C9824: @ 80C9824 push {r4,r5,lr} - ldr r0, _080C983C + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x6 @@ -412463,13 +398883,12 @@ sub_80C9824: @ 80C9824 b _080C99CC _080C9832: lsls r0, 2 - ldr r1, _080C9840 + ldr r1, =_080C9844 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C983C: .4byte 0x02039d08 -_080C9840: .4byte _080C9844 + .pool .align 2, 0 _080C9844: .4byte _080C9860 @@ -412483,13 +398902,13 @@ _080C9860: bl sub_80CADD8 movs r0, 0x2 bl sub_80CAC58 - ldr r0, _080C9874 + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 b _080C99CA .align 2, 0 -_080C9874: .4byte 0x02039d08 + .pool _080C9878: bl sub_80D00A8 lsls r0, 24 @@ -412497,18 +398916,18 @@ _080C9878: beq _080C9884 b _080C99CC _080C9884: - ldr r0, _080C9890 + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 b _080C99CA .align 2, 0 -_080C9890: .4byte 0x02039d08 + .pool _080C9894: bl sub_80D00AC - ldr r4, _080C98B8 + ldr r4, =0x02039d08 ldr r1, [r4] - ldr r5, _080C98BC + ldr r5, =0x0000078e adds r1, r5 strh r0, [r1] movs r0, 0 @@ -412523,8 +398942,7 @@ _080C9894: beq _080C98C6 b _080C99CC .align 2, 0 -_080C98B8: .4byte 0x02039d08 -_080C98BC: .4byte 0x0000078e + .pool _080C98C0: cmp r1, 0x16 beq _080C98EC @@ -412565,9 +398983,9 @@ _080C990C: lsls r0, 24 cmp r0, 0 bne _080C99CC - ldr r4, _080C9934 + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r1, _080C9938 + ldr r1, =0x0000078e adds r0, r1 ldrb r0, [r0] bl sub_80CAE0C @@ -412578,11 +398996,10 @@ _080C990C: adds r0, 0x1 b _080C99CA .align 2, 0 -_080C9934: .4byte 0x02039d08 -_080C9938: .4byte 0x0000078e + .pool _080C993C: bl sub_80D00AC - ldr r4, _080C9968 + ldr r4, =0x02039d08 ldr r1, [r4] movs r5, 0xF2 lsls r5, 3 @@ -412602,7 +399019,7 @@ _080C993C: movs r0, 0 b _080C99CA .align 2, 0 -_080C9968: .4byte 0x02039d08 + .pool _080C996C: movs r0, 0x5 bl audio_play @@ -412627,17 +399044,17 @@ _080C9990: movs r0, 0x1 bl sub_80CD1A8 _080C99A0: - ldr r0, _080C99A8 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C99CC .align 2, 0 -_080C99A8: .4byte task_pokemon_box_related + 1 + .pool _080C99AC: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _080C99CC - ldr r4, _080C99D4 + ldr r4, =0x02039d08 ldr r0, [r4] movs r1, 0xF2 lsls r1, 3 @@ -412653,14 +399070,14 @@ _080C99CC: pop {r0} bx r0 .align 2, 0 -_080C99D4: .4byte 0x02039d08 + .pool thumb_func_end sub_80C9824 thumb_func_start sub_80C99D8 sub_80C99D8: @ 80C99D8 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080C99F0 + ldr r5, =0x02039d08 ldr r0, [r5] ldrb r4, [r0] cmp r4, 0x1 @@ -412671,7 +399088,7 @@ sub_80C99D8: @ 80C99D8 beq _080C99FE b _080C9AB8 .align 2, 0 -_080C99F0: .4byte 0x02039d08 + .pool _080C99F4: cmp r4, 0x2 beq _080C9A84 @@ -412682,9 +399099,9 @@ _080C99FE: movs r0, 0x5 bl sub_80CAC58 ldr r0, [r5] - ldr r1, _080C9A24 + ldr r1, =0x00001e5c adds r0, r1 - ldr r2, _080C9A28 + ldr r2, =0x0000dac7 str r4, [sp] movs r1, 0xA movs r3, 0x3 @@ -412695,14 +399112,13 @@ _080C99FE: bl sub_80C78D4 b _080C9A8E .align 2, 0 -_080C9A24: .4byte 0x00001e5c -_080C9A28: .4byte 0x0000dac7 + .pool _080C9A2C: bl sub_80C78F0 ldr r1, [r5] lsls r0, 24 lsrs r0, 24 - ldr r2, _080C9A7C + ldr r2, =0x000002ca adds r1, r2 strh r0, [r1] movs r2, 0 @@ -412713,7 +399129,7 @@ _080C9A2C: bl sub_80C78E4 bl sub_80C7890 ldr r0, [r5] - ldr r2, _080C9A7C + ldr r2, =0x000002ca adds r1, r0, r2 movs r2, 0 ldrsh r0, [r1, r2] @@ -412728,14 +399144,13 @@ _080C9A2C: _080C9A6C: movs r0, 0x1 bl sub_80CD1A8 - ldr r0, _080C9A80 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C9AB8 .align 2, 0 -_080C9A7C: .4byte 0x000002ca -_080C9A80: .4byte task_pokemon_box_related + 1 + .pool _080C9A84: - ldr r1, _080C9A98 + ldr r1, =0x000002ca adds r0, r1 ldrb r0, [r0] bl sub_80CC464 @@ -412746,18 +399161,18 @@ _080C9A8E: strb r0, [r1] b _080C9AB8 .align 2, 0 -_080C9A98: .4byte 0x000002ca + .pool _080C9A9C: bl sub_80CC54C lsls r0, 24 cmp r0, 0 bne _080C9AB8 ldr r0, [r5] - ldr r2, _080C9AC0 + ldr r2, =0x000002ca adds r0, r2 ldrb r0, [r0] bl sub_80D1D18 - ldr r0, _080C9AC4 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow _080C9AB8: add sp, 0x4 @@ -412765,15 +399180,14 @@ _080C9AB8: pop {r0} bx r0 .align 2, 0 -_080C9AC0: .4byte 0x000002ca -_080C9AC4: .4byte task_pokemon_box_related + 1 + .pool thumb_func_end sub_80C99D8 thumb_func_start sub_80C9AC8 sub_80C9AC8: @ 80C9AC8 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080C9ADC + ldr r5, =0x02039d08 ldr r0, [r5] ldrb r4, [r0] cmp r4, 0 @@ -412782,7 +399196,7 @@ sub_80C9AC8: @ 80C9AC8 beq _080C9AFE b _080C9B18 .align 2, 0 -_080C9ADC: .4byte 0x02039d08 + .pool _080C9AE0: bl sub_80CE760 movs r0, 0x1 @@ -412802,12 +399216,12 @@ _080C9AFE: lsls r0, 24 cmp r0, 0 bne _080C9B18 - ldr r0, _080C9B20 + ldr r0, =0x02039d0f strb r4, [r0] ldr r1, [r5] movs r0, 0x2 strb r0, [r1, 0x2] - ldr r0, _080C9B24 + ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow _080C9B18: add sp, 0x4 @@ -412815,15 +399229,14 @@ _080C9B18: pop {r0} bx r0 .align 2, 0 -_080C9B20: .4byte 0x02039d0f -_080C9B24: .4byte sub_80C9E50 + 1 + .pool thumb_func_end sub_80C9AC8 thumb_func_start sub_80C9B28 sub_80C9B28: @ 80C9B28 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _080C9B3C + ldr r5, =0x02039d08 ldr r0, [r5] ldrb r4, [r0] cmp r4, 0 @@ -412832,7 +399245,7 @@ sub_80C9B28: @ 80C9B28 beq _080C9B5E b _080C9B78 .align 2, 0 -_080C9B3C: .4byte 0x02039d08 + .pool _080C9B40: bl sub_80CE7E8 movs r0, 0x1 @@ -412853,11 +399266,11 @@ _080C9B5E: lsrs r1, r0, 24 cmp r1, 0 bne _080C9B78 - ldr r0, _080C9B80 + ldr r0, =0x02039d0f strb r1, [r0] ldr r0, [r5] strb r4, [r0, 0x2] - ldr r0, _080C9B84 + ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow _080C9B78: add sp, 0x4 @@ -412865,15 +399278,14 @@ _080C9B78: pop {r0} bx r0 .align 2, 0 -_080C9B80: .4byte 0x02039d0f -_080C9B84: .4byte sub_80C9E50 + 1 + .pool thumb_func_end sub_80C9B28 thumb_func_start sub_80C9B88 sub_80C9B88: @ 80C9B88 push {r4,lr} sub sp, 0x4 - ldr r4, _080C9B9C + ldr r4, =0x02039d08 ldr r0, [r4] ldrb r1, [r0] cmp r1, 0 @@ -412882,7 +399294,7 @@ sub_80C9B88: @ 80C9B88 beq _080C9BBA b _080C9BD6 .align 2, 0 -_080C9B9C: .4byte 0x02039d08 + .pool _080C9BA0: movs r0, 0x1 negs r0, r0 @@ -412901,13 +399313,13 @@ _080C9BBA: lsls r0, 24 cmp r0, 0 bne _080C9BD6 - ldr r1, _080C9BE0 + ldr r1, =0x02039d0f movs r0, 0x2 strb r0, [r1] ldr r1, [r4] movs r0, 0x3 strb r0, [r1, 0x2] - ldr r0, _080C9BE4 + ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow _080C9BD6: add sp, 0x4 @@ -412915,14 +399327,13 @@ _080C9BD6: pop {r0} bx r0 .align 2, 0 -_080C9BE0: .4byte 0x02039d0f -_080C9BE4: .4byte sub_80C9E50 + 1 + .pool thumb_func_end sub_80C9B88 thumb_func_start sub_80C9BE8 sub_80C9BE8: @ 80C9BE8 push {r4,lr} - ldr r0, _080C9C00 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x4 @@ -412930,13 +399341,12 @@ sub_80C9BE8: @ 80C9BE8 b _080C9D08 _080C9BF6: lsls r0, 2 - ldr r1, _080C9C04 + ldr r1, =_080C9C08 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C9C00: .4byte 0x02039d08 -_080C9C04: .4byte _080C9C08 + .pool .align 2, 0 _080C9C08: .4byte _080C9C1C @@ -412953,23 +399363,23 @@ _080C9C1C: bl audio_play movs r0, 0xF bl sub_80CAC58 - ldr r0, _080C9C3C + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x1 strb r0, [r1] b _080C9D08 .align 2, 0 -_080C9C3C: .4byte 0x02039d08 + .pool _080C9C40: bl sub_80D127C lsls r0, 24 cmp r0, 0 beq _080C9C58 - ldr r0, _080C9C54 + ldr r0, =sub_80C954C + 1 bl add_to_c3_somehow b _080C9D08 .align 2, 0 -_080C9C54: .4byte sub_80C954C + 1 + .pool _080C9C58: movs r0, 0x5 bl audio_play @@ -412977,15 +399387,15 @@ _080C9C58: bl sub_80CAC58 movs r0, 0 bl sub_80CAD9C - ldr r0, _080C9C74 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x2 strb r0, [r1] b _080C9D08 .align 2, 0 -_080C9C74: .4byte 0x02039d08 + .pool _080C9C78: - ldr r0, _080C9C88 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -412993,7 +399403,7 @@ _080C9C78: beq _080C9D08 b _080C9CAA .align 2, 0 -_080C9C88: .4byte 0x030022c0 + .pool _080C9C8C: bl sub_8198C58 lsls r0, 24 @@ -413012,11 +399422,11 @@ _080C9CA6: bne _080C9D08 _080C9CAA: bl sub_80CADC4 - ldr r0, _080C9CB8 + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C9D08 .align 2, 0 -_080C9CB8: .4byte task_pokemon_box_related + 1 + .pool _080C9CBC: movs r0, 0x3 bl audio_play @@ -413028,14 +399438,14 @@ _080C9CC8: movs r2, 0x1 bl sub_80F9BF4 _080C9CD2: - ldr r0, _080C9CE0 + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _080C9D08 .align 2, 0 -_080C9CE0: .4byte 0x02039d08 + .pool _080C9CE4: bl sub_80F9C30 lsls r0, 24 @@ -413044,27 +399454,25 @@ _080C9CE4: bne _080C9D08 bl sub_80CABE0 bl calc_player_party_count - ldr r1, _080C9D10 + ldr r1, =0x020244e9 strb r0, [r1] - ldr r0, _080C9D14 + ldr r0, =0x02039d08 ldr r0, [r0] strb r4, [r0, 0x2] - ldr r0, _080C9D18 + ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow _080C9D08: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C9D10: .4byte 0x020244e9 -_080C9D14: .4byte 0x02039d08 -_080C9D18: .4byte sub_80C9E50 + 1 + .pool thumb_func_end sub_80C9BE8 thumb_func_start sub_80C9D1C sub_80C9D1C: @ 80C9D1C push {r4,lr} - ldr r0, _080C9D34 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x4 @@ -413072,13 +399480,12 @@ sub_80C9D1C: @ 80C9D1C b _080C9E3C _080C9D2A: lsls r0, 2 - ldr r1, _080C9D38 + ldr r1, =_080C9D3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080C9D34: .4byte 0x02039d08 -_080C9D38: .4byte _080C9D3C + .pool .align 2, 0 _080C9D3C: .4byte _080C9D50 @@ -413095,23 +399502,23 @@ _080C9D50: bl audio_play movs r0, 0xF bl sub_80CAC58 - ldr r0, _080C9D70 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x1 strb r0, [r1] b _080C9E3C .align 2, 0 -_080C9D70: .4byte 0x02039d08 + .pool _080C9D74: bl sub_80D127C lsls r0, 24 cmp r0, 0 beq _080C9D8C - ldr r0, _080C9D88 + ldr r0, =sub_80C954C + 1 bl add_to_c3_somehow b _080C9E3C .align 2, 0 -_080C9D88: .4byte sub_80C954C + 1 + .pool _080C9D8C: movs r0, 0x5 bl audio_play @@ -413119,15 +399526,15 @@ _080C9D8C: bl sub_80CAC58 movs r0, 0 bl sub_80CAD9C - ldr r0, _080C9DA8 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x2 strb r0, [r1] b _080C9E3C .align 2, 0 -_080C9DA8: .4byte 0x02039d08 + .pool _080C9DAC: - ldr r0, _080C9DBC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xF3 ands r0, r1 @@ -413135,7 +399542,7 @@ _080C9DAC: beq _080C9E3C b _080C9DE0 .align 2, 0 -_080C9DBC: .4byte 0x030022c0 + .pool _080C9DC0: bl sub_8198C58 lsls r0, 24 @@ -413155,11 +399562,11 @@ _080C9DDA: b _080C9E3C _080C9DE0: bl sub_80CADC4 - ldr r0, _080C9DEC + ldr r0, =task_pokemon_box_related + 1 bl add_to_c3_somehow b _080C9E3C .align 2, 0 -_080C9DEC: .4byte task_pokemon_box_related + 1 + .pool _080C9DF0: movs r0, 0x3 bl audio_play @@ -413171,14 +399578,14 @@ _080C9DFC: movs r2, 0 bl sub_80F9BF4 _080C9E06: - ldr r0, _080C9E14 + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _080C9E3C .align 2, 0 -_080C9E14: .4byte 0x02039d08 + .pool _080C9E18: bl sub_80F9C30 lsls r0, 24 @@ -413187,21 +399594,19 @@ _080C9E18: bne _080C9E3C bl sub_80CABE0 bl calc_player_party_count - ldr r1, _080C9E44 + ldr r1, =0x020244e9 strb r0, [r1] - ldr r0, _080C9E48 + ldr r0, =0x02039d08 ldr r0, [r0] strb r4, [r0, 0x2] - ldr r0, _080C9E4C + ldr r0, =sub_80C9E50 + 1 bl add_to_c3_somehow _080C9E3C: pop {r4} pop {r0} bx r0 .align 2, 0 -_080C9E44: .4byte 0x020244e9 -_080C9E48: .4byte 0x02039d08 -_080C9E4C: .4byte sub_80C9E50 + 1 + .pool thumb_func_end sub_80C9D1C thumb_func_start sub_80C9E50 @@ -413213,7 +399618,7 @@ sub_80C9E50: @ 80C9E50 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _080C9E80 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r4, [r0, 0x2] ldrb r0, [r0, 0x1] @@ -413225,13 +399630,12 @@ sub_80C9E50: @ 80C9E50 cmp r0, 0x1 bne _080C9E88 bl sub_80D12D4 - ldr r1, _080C9E84 + ldr r1, =0x02039d12 b _080C9E8C .align 2, 0 -_080C9E80: .4byte 0x02039d08 -_080C9E84: .4byte 0x02039d12 + .pool _080C9E88: - ldr r1, _080C9EAC + ldr r1, =0x02039d12 movs r0, 0 _080C9E8C: strh r0, [r1] @@ -413245,16 +399649,15 @@ _080C9E8C: beq _080C9F48 _080C9E9E: bl sub_80C9FC8 - ldr r0, _080C9EB0 + ldr r0, =sub_80C7678 + 1 bl set_callback2 b _080C9F56 .align 2, 0 -_080C9EAC: .4byte 0x02039d12 -_080C9EB0: .4byte sub_80C7678 + 1 + .pool _080C9EB4: - ldr r0, _080C9EF0 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080C9EF4 + ldr r2, =0x0000218c adds r0, r1, r2 ldr r4, [r0] subs r2, 0x5 @@ -413263,16 +399666,16 @@ _080C9EB4: subs r2, 0x1 adds r0, r1, r2 ldrb r6, [r0] - ldr r0, _080C9EF8 + ldr r0, =0x00002188 adds r1, r0 ldrb r5, [r1] bl sub_80C9FC8 cmp r5, 0 bne _080C9F04 - ldr r0, _080C9EFC + ldr r0, =0x02039d14 cmp r4, r0 bne _080C9F04 - ldr r0, _080C9F00 + ldr r0, =c2_808CE60 + 1 str r0, [sp] movs r0, 0 adds r1, r4, 0 @@ -413281,13 +399684,9 @@ _080C9EB4: bl sub_81BFA80 b _080C9F56 .align 2, 0 -_080C9EF0: .4byte 0x02039d08 -_080C9EF4: .4byte 0x0000218c -_080C9EF8: .4byte 0x00002188 -_080C9EFC: .4byte 0x02039d14 -_080C9F00: .4byte c2_808CE60 + 1 + .pool _080C9F04: - ldr r0, _080C9F18 + ldr r0, =c2_808CE60 + 1 str r0, [sp] adds r0, r5, 0 adds r1, r4, 0 @@ -413296,7 +399695,7 @@ _080C9F04: bl sub_81BF8EC b _080C9F56 .align 2, 0 -_080C9F18: .4byte c2_808CE60 + 1 + .pool _080C9F1C: bl sub_80C9FC8 bl get_preferred_box @@ -413306,7 +399705,7 @@ _080C9F1C: adds r1, r0, 0 movs r0, 0 str r0, [sp] - ldr r0, _080C9F44 + ldr r0, =c2_808CE60 + 1 str r0, [sp, 0x4] movs r0, 0x1 movs r2, 0 @@ -413314,10 +399713,10 @@ _080C9F1C: bl do_choose_name_or_words_screen b _080C9F56 .align 2, 0 -_080C9F44: .4byte c2_808CE60 + 1 + .pool _080C9F48: bl sub_80C9FC8 - ldr r2, _080C9F68 + ldr r2, =c2_808CE60 + 1 movs r0, 0xB movs r1, 0 bl sub_81AAC90 @@ -413331,14 +399730,14 @@ _080C9F56: pop {r0} bx r0 .align 2, 0 -_080C9F68: .4byte c2_808CE60 + 1 + .pool thumb_func_end sub_80C9E50 thumb_func_start sub_80C9F6C sub_80C9F6C: @ 80C9F6C push {lr} sub sp, 0x4 - ldr r0, _080C9FA0 + ldr r0, =0x0203ce7c ldrh r1, [r0] mov r0, sp strh r1, [r0] @@ -413347,22 +399746,20 @@ sub_80C9F6C: @ 80C9F6C bl sub_80CFE08 lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _080C9FA4 + ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 beq _080C9FAC movs r0, 0x64 muls r0, r1 - ldr r1, _080C9FA8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC mov r2, sp bl pokemon_setattr b _080C9FB6 .align 2, 0 -_080C9FA0: .4byte 0x0203ce7c -_080C9FA4: .4byte 0x02039d0c -_080C9FA8: .4byte 0x020244ec + .pool _080C9FAC: adds r0, r1, 0 movs r1, 0xC @@ -413384,7 +399781,7 @@ sub_80C9FC8: @ 80C9FC8 push {r4,lr} bl sub_80D25F0 bl sub_80D01B8 - ldr r4, _080C9FE8 + ldr r4, =0x02039d08 ldr r0, [r4] bl free movs r0, 0 @@ -413394,34 +399791,31 @@ sub_80C9FC8: @ 80C9FC8 pop {r0} bx r0 .align 2, 0 -_080C9FE8: .4byte 0x02039d08 + .pool thumb_func_end sub_80C9FC8 thumb_func_start sub_80C9FEC sub_80C9FEC: @ 80C9FEC push {lr} sub sp, 0x4 - ldr r1, _080CA018 + ldr r1, =0x00001f0f movs r0, 0xE bl lcd_io_set - ldr r1, _080CA01C + ldr r1, =0x085720dc movs r0, 0 str r0, [sp] movs r0, 0x3 movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r0, _080CA020 - ldr r1, _080CA024 + ldr r0, =0x08572174 + ldr r1, =0x0600f800 bl LZ77UnCompVram add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_080CA018: .4byte 0x00001f0f -_080CA01C: .4byte 0x085720dc -_080CA020: .4byte 0x08572174 -_080CA024: .4byte 0x0600f800 + .pool thumb_func_end sub_80C9FEC thumb_func_start sub_80CA028 @@ -413443,21 +399837,21 @@ sub_80CA028: @ 80CA028 sub_80CA044: @ 80CA044 push {r4,r5,lr} sub sp, 0x4 - ldr r1, _080CA090 + ldr r1, =0x08572734 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r1, _080CA094 + ldr r1, =0x08dd2fe8 movs r0, 0 str r0, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r0, _080CA098 - ldr r5, _080CA09C + ldr r0, =0x085722a0 + ldr r5, =0x02039d08 ldr r1, [r5] - ldr r4, _080CA0A0 + ldr r4, =0x00005ac4 adds r1, r4 bl LZ77UnCompWram ldr r1, [r5] @@ -413473,17 +399867,13 @@ sub_80CA044: @ 80CA044 pop {r0} bx r0 .align 2, 0 -_080CA090: .4byte 0x08572734 -_080CA094: .4byte 0x08dd2fe8 -_080CA098: .4byte 0x085722a0 -_080CA09C: .4byte 0x02039d08 -_080CA0A0: .4byte 0x00005ac4 + .pool thumb_func_end sub_80CA044 thumb_func_start sub_80CA0A4 sub_80CA0A4: @ 80CA0A4 push {lr} - ldr r0, _080CA0BC + ldr r0, =0x08572714 bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 @@ -413492,7 +399882,7 @@ sub_80CA0A4: @ 80CA0A4 movs r0, 0x1 b _080CA0C2 .align 2, 0 -_080CA0BC: .4byte 0x08572714 + .pool _080CA0C0: movs r0, 0 _080CA0C2: @@ -413503,52 +399893,48 @@ _080CA0C2: thumb_func_start sub_80CA0C8 sub_80CA0C8: @ 80CA0C8 push {lr} - ldr r0, _080CA0D4 + ldr r0, =0x08572744 bl gpu_pal_obj_alloc_tag_and_apply pop {r0} bx r0 .align 2, 0 -_080CA0D4: .4byte 0x08572744 + .pool thumb_func_end sub_80CA0C8 thumb_func_start sub_80CA0D8 sub_80CA0D8: @ 80CA0D8 push {lr} - ldr r0, _080CA110 + ldr r0, =0x085723dc movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _080CA114 + ldr r0, =0x085723fc movs r1, 0x20 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _080CA118 + ldr r0, =0x085726f4 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _080CA11C + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 beq _080CA124 - ldr r0, _080CA120 + ldr r0, =0x0857241c movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply b _080CA12E .align 2, 0 -_080CA110: .4byte 0x085723dc -_080CA114: .4byte 0x085723fc -_080CA118: .4byte 0x085726f4 -_080CA11C: .4byte 0x02039d08 -_080CA120: .4byte 0x0857241c + .pool _080CA124: - ldr r0, _080CA14C + ldr r0, =0x0857243c movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply _080CA12E: - ldr r1, _080CA150 + ldr r1, =0x00001e05 movs r0, 0xA bl lcd_io_set bl sub_80CA318 @@ -413558,20 +399944,19 @@ _080CA12E: pop {r0} bx r0 .align 2, 0 -_080CA14C: .4byte 0x0857243c -_080CA150: .4byte 0x00001e05 + .pool thumb_func_end sub_80CA0D8 thumb_func_start sub_80CA154 sub_80CA154: @ 80CA154 push {r4,lr} - ldr r1, _080CA1B4 + ldr r1, =0x0000dac8 movs r0, 0x10 movs r2, 0 bl sub_811FFB4 - ldr r4, _080CA1B8 + ldr r4, =0x02039d08 ldr r1, [r4] - ldr r3, _080CA1BC + ldr r3, =0x00000d94 adds r1, r3 str r0, [r1] ldrb r2, [r0, 0x5] @@ -413603,24 +399988,21 @@ sub_80CA154: @ 80CA154 adds r1, r2 lsls r0, 16 lsrs r0, 11 - ldr r2, _080CA1C0 + ldr r2, =0x06010000 adds r0, r2 str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_080CA1B4: .4byte 0x0000dac8 -_080CA1B8: .4byte 0x02039d08 -_080CA1BC: .4byte 0x00000d94 -_080CA1C0: .4byte 0x06010000 + .pool thumb_func_end sub_80CA154 thumb_func_start sub_80CA1C4 sub_80CA1C4: @ 80CA1C4 push {r4,lr} sub sp, 0x8 - ldr r0, _080CA21C + ldr r0, =0x0857274c ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] @@ -413634,22 +400016,22 @@ _080CA1DA: adds r1, 0x8 lsls r1, 16 asrs r1, 16 - ldr r0, _080CA220 + ldr r0, =0x085728bc movs r2, 0x9 movs r3, 0x2 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _080CA224 + ldr r1, =0x02039d08 ldr r2, [r1] lsls r1, r4, 2 - ldr r3, _080CA228 + ldr r3, =0x00000d98 adds r2, r3 adds r2, r1 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080CA22C + ldr r0, =0x02020630 adds r1, r0 str r1, [r2] adds r0, r4, 0x1 @@ -413662,19 +400044,15 @@ _080CA1DA: pop {r0} bx r0 .align 2, 0 -_080CA21C: .4byte 0x0857274c -_080CA220: .4byte 0x085728bc -_080CA224: .4byte 0x02039d08 -_080CA228: .4byte 0x00000d98 -_080CA22C: .4byte 0x02020630 + .pool thumb_func_end sub_80CA1C4 thumb_func_start sub_80CA230 sub_80CA230: @ 80CA230 push {lr} - ldr r0, _080CA258 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080CA25C + ldr r2, =0x00000ce4 adds r0, r1, r2 ldrh r0, [r0] subs r2, 0x4 @@ -413688,15 +400066,14 @@ sub_80CA230: @ 80CA230 pop {r0} bx r0 .align 2, 0 -_080CA258: .4byte 0x02039d08 -_080CA25C: .4byte 0x00000ce4 + .pool thumb_func_end sub_80CA230 thumb_func_start BoxSetMosaic BoxSetMosaic: @ 80CA260 push {lr} bl sub_80CA230 - ldr r3, _080CA2B0 + ldr r3, =0x02039d08 ldr r0, [r3] movs r1, 0x89 lsls r1, 6 @@ -413719,7 +400096,7 @@ BoxSetMosaic: @ 80CA260 movs r0, 0x1 strh r0, [r2, 0x30] ldr r2, [r1] - ldr r0, _080CA2B4 + ldr r0, =BoxSetMosaic2 + 1 str r0, [r2, 0x1C] ldr r0, [r1] ldrh r0, [r0, 0x2E] @@ -413734,13 +400111,12 @@ _080CA2AC: pop {r0} bx r0 .align 2, 0 -_080CA2B0: .4byte 0x02039d08 -_080CA2B4: .4byte BoxSetMosaic2 + 1 + .pool thumb_func_end BoxSetMosaic thumb_func_start sub_80CA2B8 sub_80CA2B8: @ 80CA2B8 - ldr r0, _080CA2CC + ldr r0, =0x02039d08 ldr r0, [r0] movs r1, 0x89 lsls r1, 6 @@ -413751,7 +400127,7 @@ sub_80CA2B8: @ 80CA2B8 lsrs r0, 31 bx lr .align 2, 0 -_080CA2CC: .4byte 0x02039d08 + .pool thumb_func_end sub_80CA2B8 thumb_func_start BoxSetMosaic2 @@ -413785,38 +400161,38 @@ _080CA2E6: negs r1, r1 ands r1, r0 strb r1, [r4, 0x1] - ldr r0, _080CA314 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _080CA30E: pop {r4} pop {r0} bx r0 .align 2, 0 -_080CA314: .4byte nullsub_12 + 1 + .pool thumb_func_end BoxSetMosaic2 thumb_func_start sub_80CA318 sub_80CA318: @ 80CA318 push {r4-r7,lr} sub sp, 0x28 - ldr r0, _080CA3AC + ldr r0, =0x02039d08 mov r12, r0 ldr r1, [r0] - ldr r4, _080CA3B0 + ldr r4, =0x000022c4 adds r0, r1, r4 str r0, [sp, 0x18] add r3, sp, 0x18 movs r0, 0x82 lsls r0, 10 str r0, [r3, 0x4] - ldr r5, _080CA3B4 + ldr r5, =0x00002244 adds r1, r5 str r1, [sp, 0x20] - ldr r0, _080CA3B8 + ldr r0, =0x0000dac6 add r2, sp, 0x20 str r0, [r2, 0x4] mov r1, sp - ldr r0, _080CA3BC + ldr r0, =0x08572754 ldm r0!, {r5-r7} stm r1!, {r5-r7} ldm r0!, {r5-r7} @@ -413825,7 +400201,7 @@ sub_80CA318: @ 80CA318 adds r7, r2, 0 mov r5, r12 movs r2, 0 - ldr r1, _080CA3C0 + ldr r1, =0x000007ff _080CA352: ldr r0, [r5] adds r0, r4 @@ -413837,8 +400213,8 @@ _080CA352: cmp r6, r1 bls _080CA352 movs r6, 0 - ldr r5, _080CA3AC - ldr r4, _080CA3B4 + ldr r5, =0x02039d08 + ldr r4, =0x00002244 movs r2, 0 _080CA36C: ldr r0, [r5] @@ -413851,7 +400227,7 @@ _080CA36C: lsrs r6, r0, 16 cmp r6, 0xF bls _080CA36C - ldr r0, _080CA3AC + ldr r0, =0x02039d08 ldr r0, [r0] movs r6, 0x89 lsls r6, 6 @@ -413872,14 +400248,9 @@ _080CA36C: beq _080CA420 b _080CA40C .align 2, 0 -_080CA3AC: .4byte 0x02039d08 -_080CA3B0: .4byte 0x000022c4 -_080CA3B4: .4byte 0x00002244 -_080CA3B8: .4byte 0x0000dac6 -_080CA3BC: .4byte 0x08572754 -_080CA3C0: .4byte 0x000007ff + .pool _080CA3C4: - ldr r0, _080CA3F8 + ldr r0, =0x02039d08 ldr r2, [r0] movs r7, 0x89 lsls r7, 6 @@ -413887,29 +400258,25 @@ _080CA3C4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080CA3FC + ldr r1, =0x02020630 adds r0, r1 str r0, [r3] lsls r0, r4, 4 movs r1, 0x80 lsls r1, 1 adds r0, r1 - ldr r3, _080CA400 + ldr r3, =0x0000223a adds r1, r2, r3 strh r0, [r1] - ldr r6, _080CA404 + ldr r6, =0x0000223c adds r2, r6 lsls r0, r5, 5 - ldr r7, _080CA408 + ldr r7, =0x06010000 adds r0, r7 str r0, [r2] b _080CA420 .align 2, 0 -_080CA3F8: .4byte 0x02039d08 -_080CA3FC: .4byte 0x02020630 -_080CA400: .4byte 0x0000223a -_080CA404: .4byte 0x0000223c -_080CA408: .4byte 0x06010000 + .pool _080CA40C: mov r0, sp movs r1, 0x28 @@ -413921,7 +400288,7 @@ _080CA40C: cmp r1, 0x40 bne _080CA3C4 _080CA420: - ldr r0, _080CA444 + ldr r0, =0x02039d08 ldr r0, [r0] movs r1, 0x89 lsls r1, 6 @@ -413931,7 +400298,7 @@ _080CA420: bne _080CA43C movs r0, 0x2 bl gpu_tile_obj_free_by_tag - ldr r0, _080CA448 + ldr r0, =0x0000dac6 bl gpu_pal_free_tag _080CA43C: add sp, 0x28 @@ -413939,8 +400306,7 @@ _080CA43C: pop {r0} bx r0 .align 2, 0 -_080CA444: .4byte 0x02039d08 -_080CA448: .4byte 0x0000dac6 + .pool thumb_func_end sub_80CA318 thumb_func_start sub_80CA44C @@ -413950,7 +400316,7 @@ sub_80CA44C: @ 80CA44C adds r3, r1, 0 lsls r0, 16 lsrs r4, r0, 16 - ldr r6, _080CA4C8 + ldr r6, =0x02039d08 ldr r2, [r6] movs r7, 0x89 lsls r7, 6 @@ -413961,32 +400327,32 @@ sub_80CA44C: @ 80CA44C cmp r4, 0 beq _080CA4E8 lsls r0, r4, 3 - ldr r1, _080CA4CC + ldr r1, =0x0830a18c adds r0, r1 - ldr r5, _080CA4D0 + ldr r5, =0x000022c4 adds r1, r2, r5 movs r2, 0x1 str r2, [sp] adds r2, r4, 0 bl sub_8034654 ldr r1, [r6] - ldr r2, _080CA4D4 + ldr r2, =0x00000cdc adds r0, r1, r2 ldr r0, [r0] - ldr r4, _080CA4D8 + ldr r4, =0x00002244 adds r1, r4 bl LZ77UnCompWram ldr r0, [r6] adds r5, r0, r5 - ldr r1, _080CA4DC + ldr r1, =0x0000223c adds r0, r1 ldr r1, [r0] - ldr r2, _080CA4E0 + ldr r2, =0x04000200 adds r0, r5, 0 bl CpuSet ldr r0, [r6] adds r4, r0, r4 - ldr r2, _080CA4E4 + ldr r2, =0x0000223a adds r0, r2 ldrh r1, [r0] adds r0, r4, 0 @@ -414003,14 +400369,7 @@ sub_80CA44C: @ 80CA44C strb r0, [r1] b _080CA4F2 .align 2, 0 -_080CA4C8: .4byte 0x02039d08 -_080CA4CC: .4byte 0x0830a18c -_080CA4D0: .4byte 0x000022c4 -_080CA4D4: .4byte 0x00000cdc -_080CA4D8: .4byte 0x00002244 -_080CA4DC: .4byte 0x0000223c -_080CA4E0: .4byte 0x04000200 -_080CA4E4: .4byte 0x0000223a + .pool _080CA4E8: adds r0, 0x3E ldrb r1, [r0] @@ -414031,12 +400390,12 @@ sub_80CA4FC: @ 80CA4FC movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r6, _080CA574 + ldr r6, =0x02039d08 ldr r2, [r6] ldrb r0, [r2, 0x1] cmp r0, 0x3 beq _080CA588 - ldr r0, _080CA578 + ldr r0, =0x00000cf9 adds r2, r0 movs r4, 0 str r4, [sp] @@ -414048,7 +400407,7 @@ sub_80CA4FC: @ 80CA4FC movs r3, 0x6 bl Print ldr r2, [r6] - ldr r1, _080CA57C + ldr r1, =0x00000d1d adds r2, r1 movs r0, 0xF str r0, [sp] @@ -414059,7 +400418,7 @@ sub_80CA4FC: @ 80CA4FC movs r3, 0x6 bl Print ldr r2, [r6] - ldr r0, _080CA580 + ldr r0, =0x00000d41 adds r2, r0 movs r0, 0x1D str r0, [sp] @@ -414070,7 +400429,7 @@ sub_80CA4FC: @ 80CA4FC movs r3, 0xA bl Print ldr r2, [r6] - ldr r1, _080CA584 + ldr r1, =0x00000d65 adds r2, r1 movs r0, 0x2B str r0, [sp] @@ -414082,13 +400441,9 @@ sub_80CA4FC: @ 80CA4FC bl Print b _080CA5E8 .align 2, 0 -_080CA574: .4byte 0x02039d08 -_080CA578: .4byte 0x00000cf9 -_080CA57C: .4byte 0x00000d1d -_080CA580: .4byte 0x00000d41 -_080CA584: .4byte 0x00000d65 + .pool _080CA588: - ldr r0, _080CA624 + ldr r0, =0x00000d65 adds r2, r0 movs r4, 0 str r4, [sp] @@ -414100,7 +400455,7 @@ _080CA588: movs r3, 0x6 bl Print ldr r2, [r6] - ldr r1, _080CA628 + ldr r1, =0x00000cf9 adds r2, r1 movs r0, 0xD str r0, [sp] @@ -414111,7 +400466,7 @@ _080CA588: movs r3, 0x6 bl Print ldr r2, [r6] - ldr r0, _080CA62C + ldr r0, =0x00000d1d adds r2, r0 movs r0, 0x1C str r0, [sp] @@ -414122,7 +400477,7 @@ _080CA588: movs r3, 0x6 bl Print ldr r2, [r6] - ldr r1, _080CA630 + ldr r1, =0x00000d41 adds r2, r1 movs r0, 0x2A str r0, [sp] @@ -414136,9 +400491,9 @@ _080CA5E8: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram - ldr r4, _080CA634 + ldr r4, =0x02039d08 ldr r1, [r4] - ldr r2, _080CA638 + ldr r2, =0x00000ce4 adds r0, r1, r2 ldrh r0, [r0] cmp r0, 0 @@ -414151,7 +400506,7 @@ _080CA5E8: ldr r1, [r1] bl sub_8120084 ldr r0, [r4] - ldr r1, _080CA63C + ldr r1, =0x00000d94 adds r0, r1 ldr r1, [r0] adds r1, 0x3E @@ -414161,15 +400516,9 @@ _080CA5E8: ands r0, r2 b _080CA64E .align 2, 0 -_080CA624: .4byte 0x00000d65 -_080CA628: .4byte 0x00000cf9 -_080CA62C: .4byte 0x00000d1d -_080CA630: .4byte 0x00000d41 -_080CA634: .4byte 0x02039d08 -_080CA638: .4byte 0x00000ce4 -_080CA63C: .4byte 0x00000d94 + .pool _080CA640: - ldr r2, _080CA658 + ldr r2, =0x00000d94 adds r0, r1, r2 ldr r1, [r0] adds r1, 0x3E @@ -414183,16 +400532,16 @@ _080CA64E: pop {r0} bx r0 .align 2, 0 -_080CA658: .4byte 0x00000d94 + .pool thumb_func_end sub_80CA4FC thumb_func_start sub_80CA65C sub_80CA65C: @ 80CA65C push {r4,lr} sub sp, 0x4 - ldr r0, _080CA6A8 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CA6AC + ldr r1, =0x00000ce4 adds r0, r1 ldrh r0, [r0] cmp r0, 0 @@ -414206,10 +400555,10 @@ sub_80CA65C: @ 80CA65C bl sub_80D27AC movs r4, 0 _080CA680: - ldr r0, _080CA6A8 + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 2 - ldr r2, _080CA6B0 + ldr r2, =0x00000d98 adds r0, r2 adds r0, r1 ldr r0, [r0] @@ -414225,9 +400574,7 @@ _080CA680: bls _080CA680 b _080CA6E6 .align 2, 0 -_080CA6A8: .4byte 0x02039d08 -_080CA6AC: .4byte 0x00000ce4 -_080CA6B0: .4byte 0x00000d98 + .pool _080CA6B4: movs r0, 0x2 str r0, [sp] @@ -414238,10 +400585,10 @@ _080CA6B4: bl sub_80D27AC movs r4, 0 _080CA6C6: - ldr r0, _080CA6FC + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 2 - ldr r2, _080CA700 + ldr r2, =0x00000d98 adds r0, r2 adds r0, r1 ldr r0, [r0] @@ -414263,20 +400610,19 @@ _080CA6E6: pop {r0} bx r0 .align 2, 0 -_080CA6FC: .4byte 0x02039d08 -_080CA700: .4byte 0x00000d98 + .pool thumb_func_end sub_80CA65C thumb_func_start sub_80CA704 sub_80CA704: @ 80CA704 push {r4,lr} sub sp, 0x4 - ldr r0, _080CA77C - ldr r4, _080CA780 + ldr r0, =0x08dd36c8 + ldr r4, =0x02039d08 ldr r1, [r4] adds r1, 0xB0 bl LZ77UnCompWram - ldr r0, _080CA784 + ldr r0, =0x08dd36a8 movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply @@ -414288,7 +400634,7 @@ sub_80CA704: @ 80CA704 movs r1, 0x1 movs r3, 0xC bl sub_80D2644 - ldr r2, _080CA788 + ldr r2, =0x0857245c movs r0, 0x4 str r0, [sp] movs r0, 0x2 @@ -414304,7 +400650,7 @@ sub_80CA704: @ 80CA704 movs r2, 0 bl sub_80D2770 bl sub_80CAA74 - ldr r0, _080CA78C + ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 beq _080CA790 @@ -414318,11 +400664,7 @@ sub_80CA704: @ 80CA704 bl sub_80D2918 b _080CA7B2 .align 2, 0 -_080CA77C: .4byte 0x08dd36c8 -_080CA780: .4byte 0x02039d08 -_080CA784: .4byte 0x08dd36a8 -_080CA788: .4byte 0x0857245c -_080CA78C: .4byte 0x02039d0c + .pool _080CA790: movs r0, 0x2 str r0, [sp] @@ -414340,9 +400682,9 @@ _080CA790: _080CA7B2: movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _080CA7CC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CA7D0 + ldr r1, =0x000002c7 adds r0, r1 movs r1, 0 strb r1, [r0] @@ -414351,14 +400693,13 @@ _080CA7B2: pop {r0} bx r0 .align 2, 0 -_080CA7CC: .4byte 0x02039d08 -_080CA7D0: .4byte 0x000002c7 + .pool thumb_func_end sub_80CA704 thumb_func_start sub_80CA7D4 sub_80CA7D4: @ 80CA7D4 push {lr} - ldr r0, _080CA800 + ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0xB0 lsls r0, 2 @@ -414366,11 +400707,11 @@ sub_80CA7D4: @ 80CA7D4 movs r3, 0 movs r0, 0x14 strh r0, [r2] - ldr r0, _080CA804 + ldr r0, =0x000002c2 adds r2, r1, r0 movs r0, 0x2 strh r0, [r2] - ldr r0, _080CA808 + ldr r0, =0x000002c5 adds r1, r0 strb r3, [r1] movs r0, 0 @@ -414378,17 +400719,15 @@ sub_80CA7D4: @ 80CA7D4 pop {r0} bx r0 .align 2, 0 -_080CA800: .4byte 0x02039d08 -_080CA804: .4byte 0x000002c2 -_080CA808: .4byte 0x000002c5 + .pool thumb_func_end sub_80CA7D4 thumb_func_start sub_80CA80C sub_80CA80C: @ 80CA80C push {r4,lr} - ldr r4, _080CA868 + ldr r4, =0x02039d08 ldr r2, [r4] - ldr r1, _080CA86C + ldr r1, =0x000002c5 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x14 @@ -414399,7 +400738,7 @@ sub_80CA80C: @ 80CA80C ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] - ldr r0, _080CA870 + ldr r0, =0x000002c2 adds r1, r2, r0 ldrh r0, [r1] adds r0, 0x1 @@ -414415,7 +400754,7 @@ sub_80CA80C: @ 80CA80C movs r0, 0x8 bl sub_80CBAF0 ldr r1, [r4] - ldr r0, _080CA86C + ldr r0, =0x000002c5 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 @@ -414427,11 +400766,9 @@ sub_80CA80C: @ 80CA80C movs r0, 0x1 b _080CA87C .align 2, 0 -_080CA868: .4byte 0x02039d08 -_080CA86C: .4byte 0x000002c5 -_080CA870: .4byte 0x000002c2 + .pool _080CA874: - ldr r1, _080CA884 + ldr r1, =0x02039d0c movs r0, 0x1 strb r0, [r1] _080CA87A: @@ -414441,13 +400778,13 @@ _080CA87C: pop {r1} bx r1 .align 2, 0 -_080CA884: .4byte 0x02039d0c + .pool thumb_func_end sub_80CA80C thumb_func_start sub_80CA888 sub_80CA888: @ 80CA888 push {r4,lr} - ldr r4, _080CA8BC + ldr r4, =0x02039d08 ldr r1, [r4] movs r0, 0xB0 lsls r0, 2 @@ -414455,11 +400792,11 @@ sub_80CA888: @ 80CA888 movs r3, 0 movs r0, 0 strh r0, [r2] - ldr r0, _080CA8C0 + ldr r0, =0x000002c2 adds r2, r1, r0 movs r0, 0x16 strh r0, [r2] - ldr r0, _080CA8C4 + ldr r0, =0x000002c5 adds r1, r0 strb r3, [r1] ldr r0, [r4] @@ -414472,18 +400809,16 @@ _080CA8B4: pop {r0} bx r0 .align 2, 0 -_080CA8BC: .4byte 0x02039d08 -_080CA8C0: .4byte 0x000002c2 -_080CA8C4: .4byte 0x000002c5 + .pool thumb_func_end sub_80CA888 thumb_func_start sub_80CA8C8 sub_80CA8C8: @ 80CA8C8 push {r4,r5,lr} sub sp, 0x8 - ldr r5, _080CA940 + ldr r5, =0x02039d08 ldr r2, [r5] - ldr r1, _080CA944 + ldr r1, =0x000002c5 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x14 @@ -414494,7 +400829,7 @@ sub_80CA8C8: @ 80CA8C8 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - ldr r4, _080CA948 + ldr r4, =0x000002c2 adds r1, r2, r4 ldrh r0, [r1] subs r0, 0x1 @@ -414521,7 +400856,7 @@ sub_80CA8C8: @ 80CA8C8 negs r0, r0 bl sub_80CBAF0 ldr r1, [r5] - ldr r0, _080CA944 + ldr r0, =0x000002c5 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 @@ -414535,11 +400870,9 @@ sub_80CA8C8: @ 80CA8C8 movs r0, 0x1 b _080CA976 .align 2, 0 -_080CA940: .4byte 0x02039d08 -_080CA944: .4byte 0x000002c5 -_080CA948: .4byte 0x000002c2 + .pool _080CA94C: - ldr r0, _080CA980 + ldr r0, =0x02039d0c movs r1, 0 strb r1, [r0] bl sub_80CBB9C @@ -414562,7 +400895,7 @@ _080CA976: pop {r1} bx r1 .align 2, 0 -_080CA980: .4byte 0x02039d0c + .pool thumb_func_end sub_80CA8C8 thumb_func_start sub_80CA984 @@ -414598,9 +400931,9 @@ _080CA9AC: thumb_func_start sub_80CA9C0 sub_80CA9C0: @ 80CA9C0 - ldr r2, _080CA9E0 + ldr r2, =0x02039d08 ldr r0, [r2] - ldr r1, _080CA9E4 + ldr r1, =0x000002c7 adds r0, r1 movs r3, 0x1 strb r3, [r0] @@ -414610,22 +400943,20 @@ sub_80CA9C0: @ 80CA9C0 movs r1, 0x1E strb r1, [r0] ldr r0, [r2] - ldr r1, _080CA9E8 + ldr r1, =0x000002c9 adds r0, r1 strb r3, [r0] bx lr .align 2, 0 -_080CA9E0: .4byte 0x02039d08 -_080CA9E4: .4byte 0x000002c7 -_080CA9E8: .4byte 0x000002c9 + .pool thumb_func_end sub_80CA9C0 thumb_func_start sub_80CA9EC sub_80CA9EC: @ 80CA9EC push {lr} - ldr r0, _080CAA0C + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r2, _080CAA10 + ldr r2, =0x000002c7 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 @@ -414638,16 +400969,15 @@ _080CAA06: pop {r0} bx r0 .align 2, 0 -_080CAA0C: .4byte 0x02039d08 -_080CAA10: .4byte 0x000002c7 + .pool thumb_func_end sub_80CA9EC thumb_func_start sub_80CAA14 sub_80CAA14: @ 80CAA14 push {r4,lr} - ldr r3, _080CAA68 + ldr r3, =0x02039d08 ldr r1, [r3] - ldr r2, _080CAA6C + ldr r2, =0x000002c7 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -414670,7 +401000,7 @@ sub_80CAA14: @ 80CAA14 strb r1, [r0] ldr r0, [r3] movs r2, 0 - ldr r4, _080CAA70 + ldr r4, =0x000002c9 adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0 @@ -414687,9 +401017,7 @@ _080CAA60: pop {r0} bx r0 .align 2, 0 -_080CAA68: .4byte 0x02039d08 -_080CAA6C: .4byte 0x000002c7 -_080CAA70: .4byte 0x000002c9 + .pool thumb_func_end sub_80CAA14 thumb_func_start sub_80CAA74 @@ -414699,7 +401027,7 @@ sub_80CAA74: @ 80CAA74 _080CAA78: movs r0, 0x64 muls r0, r4 - ldr r1, _080CAAA4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -414717,7 +401045,7 @@ _080CAA78: pop {r0} bx r0 .align 2, 0 -_080CAAA4: .4byte 0x020244ec + .pool thumb_func_end sub_80CAA74 thumb_func_start sub_80CAAA8 @@ -414726,10 +401054,10 @@ sub_80CAAA8: @ 80CAAA8 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r7, _080CAB14 + ldr r7, =0x085724bc cmp r1, 0 beq _080CAAB8 - ldr r7, _080CAB18 + ldr r7, =0x085724a4 _080CAAB8: subs r0, 0x1 lsls r1, r0, 1 @@ -414743,7 +401071,7 @@ _080CAAB8: adds r0, r1 lsrs r3, r0, 16 movs r0, 0 - ldr r1, _080CAB1C + ldr r1, =0x02039d08 mov r12, r1 _080CAAD4: movs r2, 0 @@ -414779,9 +401107,7 @@ _080CAAE0: pop {r0} bx r0 .align 2, 0 -_080CAB14: .4byte 0x085724bc -_080CAB18: .4byte 0x085724a4 -_080CAB1C: .4byte 0x02039d08 + .pool thumb_func_end sub_80CAAA8 thumb_func_start sub_80CAB20 @@ -414808,9 +401134,9 @@ sub_80CAB20: @ 80CAB20 thumb_func_start sub_80CAB4C sub_80CAB4C: @ 80CAB4C push {lr} - ldr r0, _080CAB68 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CAB6C + ldr r1, =0x000002c6 adds r0, r1 movs r1, 0 strb r1, [r0] @@ -414820,16 +401146,15 @@ sub_80CAB4C: @ 80CAB4C pop {r0} bx r0 .align 2, 0 -_080CAB68: .4byte 0x02039d08 -_080CAB6C: .4byte 0x000002c6 + .pool thumb_func_end sub_80CAB4C thumb_func_start sub_80CAB70 sub_80CAB70: @ 80CAB70 push {r4,r5,lr} - ldr r4, _080CAB8C + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r5, _080CAB90 + ldr r5, =0x000002c6 adds r0, r5 ldrb r0, [r0] cmp r0, 0x1 @@ -414840,8 +401165,7 @@ sub_80CAB70: @ 80CAB70 beq _080CAB9A b _080CABD8 .align 2, 0 -_080CAB8C: .4byte 0x02039d08 -_080CAB90: .4byte 0x000002c6 + .pool _080CAB94: cmp r0, 0x2 beq _080CABD4 @@ -414859,7 +401183,7 @@ _080CABAA: cmp r0, 0 bne _080CABD8 ldr r0, [r4] - ldr r1, _080CABD0 + ldr r1, =0x00000cea adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -414873,7 +401197,7 @@ _080CABC4: strb r0, [r1] b _080CABD8 .align 2, 0 -_080CABD0: .4byte 0x00000cea + .pool _080CABD4: movs r0, 0 b _080CABDA @@ -414888,16 +401212,16 @@ _080CABDA: thumb_func_start sub_80CABE0 sub_80CABE0: @ 80CABE0 push {r4,lr} - ldr r4, _080CAC10 + ldr r4, =0x02039d10 bl get_preferred_box ldrb r1, [r4] lsls r0, 24 lsrs r0, 24 cmp r1, r0 beq _080CAC0A - ldr r0, _080CAC14 + ldr r0, =0x000008d7 bl flag_clear - ldr r4, _080CAC18 + ldr r4, =0x00004036 bl get_preferred_box adds r1, r0, 0 lsls r1, 24 @@ -414909,9 +401233,7 @@ _080CAC0A: pop {r0} bx r0 .align 2, 0 -_080CAC10: .4byte 0x02039d10 -_080CAC14: .4byte 0x000008d7 -_080CAC18: .4byte 0x00004036 + .pool thumb_func_end sub_80CABE0 thumb_func_start sub_80CAC1C @@ -414951,20 +401273,19 @@ sub_80CAC58: @ 80CAC58 lsls r0, 24 lsrs r6, r0, 24 bl sub_81AFBF0 - ldr r1, _080CAC7C + ldr r1, =0x0857276c lsls r0, r6, 3 adds r0, r1 ldrb r0, [r0, 0x4] cmp r0, 0x7 bhi _080CAD30 lsls r0, 2 - ldr r1, _080CAC80 + ldr r1, =_080CAC84 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CAC7C: .4byte 0x0857276c -_080CAC80: .4byte _080CAC84 + .pool .align 2, 0 _080CAC84: .4byte _080CAD30 @@ -414976,57 +401297,52 @@ _080CAC84: .4byte _080CACB8 .4byte _080CACD0 _080CACA4: - ldr r0, _080CACB0 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r0, _080CACB4 + ldr r0, =0x00000cee adds r1, r0 b _080CACC0 .align 2, 0 -_080CACB0: .4byte 0x02039d08 -_080CACB4: .4byte 0x00000cee + .pool _080CACB8: - ldr r0, _080CACC8 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080CACCC + ldr r2, =0x000021e0 adds r1, r2 _080CACC0: movs r0, 0 bl sub_81AFC0C b _080CAD30 .align 2, 0 -_080CACC8: .4byte 0x02039d08 -_080CACCC: .4byte 0x000021e0 + .pool _080CACD0: bl sub_80D127C lsls r0, 24 cmp r0, 0 beq _080CACF4 - ldr r0, _080CACEC + ldr r0, =0x02039d08 ldr r4, [r0] - ldr r0, _080CACF0 + ldr r0, =0x000021eb adds r4, r0 bl sub_80D12B8 adds r1, r0, 0 adds r0, r4, 0 b _080CAD00 .align 2, 0 -_080CACEC: .4byte 0x02039d08 -_080CACF0: .4byte 0x000021eb + .pool _080CACF4: - ldr r0, _080CAD08 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080CAD0C + ldr r2, =0x000021eb adds r0, r1, r2 - ldr r2, _080CAD10 + ldr r2, =0x00000d65 adds r1, r2 _080CAD00: bl gf_strcpy adds r2, r0, 0 b _080CAD16 .align 2, 0 -_080CAD08: .4byte 0x02039d08 -_080CAD0C: .4byte 0x000021eb -_080CAD10: .4byte 0x00000d65 + .pool _080CAD14: adds r2, r1, 0 _080CAD16: @@ -415036,18 +401352,18 @@ _080CAD16: beq _080CAD14 movs r0, 0xFF strb r0, [r2] - ldr r0, _080CAD8C + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r0, _080CAD90 + ldr r0, =0x000021eb adds r1, r0 movs r0, 0 bl sub_81AFC0C _080CAD30: - ldr r5, _080CAD8C + ldr r5, =0x02039d08 ldr r0, [r5] - ldr r4, _080CAD94 + ldr r4, =0x00002190 adds r0, r4 - ldr r2, _080CAD98 + ldr r2, =0x0857276c lsls r1, r6, 3 adds r1, r2 ldr r1, [r1] @@ -415083,10 +401399,7 @@ _080CAD30: pop {r0} bx r0 .align 2, 0 -_080CAD8C: .4byte 0x02039d08 -_080CAD90: .4byte 0x000021eb -_080CAD94: .4byte 0x00002190 -_080CAD98: .4byte 0x0857276c + .pool thumb_func_end sub_80CAC58 thumb_func_start sub_80CAD9C @@ -415095,7 +401408,7 @@ sub_80CAD9C: @ 80CAD9C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080CADC0 + ldr r0, =0x08572864 movs r1, 0xB movs r2, 0xE movs r3, 0 @@ -415108,7 +401421,7 @@ sub_80CAD9C: @ 80CAD9C pop {r0} bx r0 .align 2, 0 -_080CADC0: .4byte 0x08572864 + .pool thumb_func_end sub_80CAD9C thumb_func_start sub_80CADC4 @@ -415214,11 +401527,11 @@ _080CAE96: thumb_func_start sub_80CAEA0 sub_80CAEA0: @ 80CAEA0 - ldr r0, _080CAEA8 + ldr r0, =0x02039d0d ldrb r0, [r0] bx lr .align 2, 0 -_080CAEA8: .4byte 0x02039d0d + .pool thumb_func_end sub_80CAEA0 thumb_func_start sub_80CAEAC @@ -415228,7 +401541,7 @@ sub_80CAEAC: @ 80CAEAC lsls r0, 24 cmp r0, 0 bne _080CAEE8 - ldr r0, _080CAED4 + ldr r0, =0x02039d0c ldrb r0, [r0] cmp r0, 0 beq _080CAED8 @@ -415240,7 +401553,7 @@ sub_80CAEAC: @ 80CAEAC bl sub_80D0D8C b _080CAEE8 .align 2, 0 -_080CAED4: .4byte 0x02039d0c + .pool _080CAED8: bl sub_80CFE08 adds r1, r0, 0 @@ -415249,7 +401562,7 @@ _080CAED8: movs r0, 0 bl sub_80D0D8C _080CAEE8: - ldr r1, _080CAF00 + ldr r1, =0x02039d12 ldrh r0, [r1] cmp r0, 0 beq _080CAEFA @@ -415260,7 +401573,7 @@ _080CAEFA: pop {r0} bx r0 .align 2, 0 -_080CAF00: .4byte 0x02039d12 + .pool thumb_func_end sub_80CAEAC thumb_func_start sub_80CAF04 @@ -415268,8 +401581,8 @@ sub_80CAF04: @ 80CAF04 push {r4-r6,lr} bl sub_80D2F04 movs r2, 0 - ldr r3, _080CAF94 - ldr r5, _080CAF98 + ldr r3, =0x02039d08 + ldr r5, =0x00000b08 movs r4, 0 adds r6, r3, 0 _080CAF14: @@ -415284,8 +401597,8 @@ _080CAF14: cmp r2, 0x27 bls _080CAF14 movs r2, 0 - ldr r5, _080CAF94 - ldr r4, _080CAF9C + ldr r5, =0x02039d08 + ldr r4, =0x00000b58 movs r3, 0 _080CAF30: ldr r0, [r5] @@ -415299,7 +401612,7 @@ _080CAF30: cmp r2, 0x27 bls _080CAF30 movs r2, 0 - ldr r5, _080CAF94 + ldr r5, =0x02039d08 movs r4, 0xA7 lsls r4, 4 movs r3, 0 @@ -415315,8 +401628,8 @@ _080CAF4E: cmp r2, 0x5 bls _080CAF4E movs r2, 0 - ldr r5, _080CAF94 - ldr r4, _080CAFA0 + ldr r5, =0x02039d08 + ldr r4, =0x00000a88 movs r3, 0 _080CAF6A: ldr r0, [r5] @@ -415330,23 +401643,18 @@ _080CAF6A: cmp r2, 0x1D bls _080CAF6A ldr r0, [r6] - ldr r2, _080CAFA4 + ldr r2, =0x00000a6c adds r1, r0, r2 movs r2, 0 str r2, [r1] - ldr r1, _080CAFA8 + ldr r1, =0x0000078c adds r0, r1 strh r2, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080CAF94: .4byte 0x02039d08 -_080CAF98: .4byte 0x00000b08 -_080CAF9C: .4byte 0x00000b58 -_080CAFA0: .4byte 0x00000a88 -_080CAFA4: .4byte 0x00000a6c -_080CAFA8: .4byte 0x0000078c + .pool thumb_func_end sub_80CAF04 thumb_func_start sub_80CAFAC @@ -415368,9 +401676,9 @@ _080CAFBC: sub_80CAFC4: @ 80CAFC4 push {r4-r6,lr} sub sp, 0x8 - ldr r5, _080CB018 + ldr r5, =0x02039d08 ldr r0, [r5] - ldr r4, _080CB01C + ldr r4, =0x000020a4 adds r0, r4 movs r1, 0 bl pokemon_getattr @@ -415394,20 +401702,17 @@ sub_80CAFC4: @ 80CAFC4 movs r3, 0 bl sub_80CC230 ldr r1, [r5] - ldr r2, _080CB020 + ldr r2, =0x00000a6c adds r1, r2 str r0, [r1] - ldr r1, _080CB024 + ldr r1, =sub_80CC100 + 1 str r1, [r0, 0x1C] add sp, 0x8 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080CB018: .4byte 0x02039d08 -_080CB01C: .4byte 0x000020a4 -_080CB020: .4byte 0x00000a6c -_080CB024: .4byte sub_80CC100 + 1 + .pool thumb_func_end sub_80CAFC4 thumb_func_start sub_80CB028 @@ -415466,24 +401771,23 @@ _080CB048: adds r0, r4, 0 asrs r3, 16 bl sub_80CC230 - ldr r1, _080CB0A8 + ldr r1, =0x02039d08 ldr r1, [r1] mov r3, r8 lsls r2, r3, 2 - ldr r3, _080CB0AC + ldr r3, =0x00000a88 adds r1, r3 adds r1, r2 str r0, [r1] b _080CB0C0 .align 2, 0 -_080CB0A8: .4byte 0x02039d08 -_080CB0AC: .4byte 0x00000a88 + .pool _080CB0B0: - ldr r0, _080CB138 + ldr r0, =0x02039d08 ldr r0, [r0] mov r2, r8 lsls r1, r2, 2 - ldr r3, _080CB13C + ldr r3, =0x00000a88 adds r0, r3 adds r0, r1 str r4, [r0] @@ -415506,7 +401810,7 @@ _080CB0C0: lsrs r7, r0, 16 cmp r7, 0x4 bls _080CB042 - ldr r0, _080CB138 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 @@ -415522,10 +401826,10 @@ _080CB0F6: bl get_pokemon_data_from_any_box cmp r0, 0 bne _080CB11C - ldr r0, _080CB138 + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r6, 2 - ldr r3, _080CB13C + ldr r3, =0x00000a88 adds r0, r3 adds r0, r1 ldr r2, [r0] @@ -415550,8 +401854,7 @@ _080CB126: pop {r0} bx r0 .align 2, 0 -_080CB138: .4byte 0x02039d08 -_080CB13C: .4byte 0x00000a88 + .pool thumb_func_end sub_80CB028 thumb_func_start sub_80CB140 @@ -415611,10 +401914,10 @@ sub_80CB140: @ 80CB140 adds r3, r4, 0 bl sub_80CC230 adds r3, r0, 0 - ldr r0, _080CB1E8 + ldr r0, =0x02039d08 ldr r2, [r0] lsls r1, r7, 2 - ldr r4, _080CB1EC + ldr r4, =0x00000a88 adds r0, r2, r4 adds r0, r1 str r3, [r0] @@ -415636,8 +401939,7 @@ _080CB1DA: pop {r0} bx r0 .align 2, 0 -_080CB1E8: .4byte 0x02039d08 -_080CB1EC: .4byte 0x00000a88 + .pool thumb_func_end sub_80CB140 thumb_func_start sub_80CB1F0 @@ -415646,10 +401948,10 @@ sub_80CB1F0: @ 80CB1F0 lsls r0, 16 lsrs r3, r0, 16 movs r2, 0 - ldr r7, _080CB228 - ldr r6, _080CB22C + ldr r7, =0x02039d08 + ldr r6, =0x00000a88 movs r5, 0x1 - ldr r4, _080CB230 + ldr r4, =sub_80CB278 + 1 _080CB200: ldr r0, [r7] lsls r1, r2, 2 @@ -415673,9 +401975,7 @@ _080CB218: pop {r0} bx r0 .align 2, 0 -_080CB228: .4byte 0x02039d08 -_080CB22C: .4byte 0x00000a88 -_080CB230: .4byte sub_80CB278 + 1 + .pool thumb_func_end sub_80CB1F0 thumb_func_start sub_80CB234 @@ -415695,24 +401995,22 @@ sub_80CB234: @ 80CB234 strh r0, [r2, 0x20] b _080CB266 _080CB250: - ldr r0, _080CB26C + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r3, _080CB270 + ldr r3, =0x00000c66 adds r1, r3 ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] ldrh r0, [r2, 0x34] strh r0, [r2, 0x20] - ldr r0, _080CB274 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _080CB266: pop {r0} bx r0 .align 2, 0 -_080CB26C: .4byte 0x02039d08 -_080CB270: .4byte 0x00000c66 -_080CB274: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80CB234 thumb_func_start sub_80CB278 @@ -415740,13 +402038,13 @@ _080CB28C: lsrs r0, 16 cmp r0, 0xB6 bls _080CB2A8 - ldr r0, _080CB2AC + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _080CB2A8: pop {r0} bx r0 .align 2, 0 -_080CB2AC: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80CB278 thumb_func_start sub_80CB2B0 @@ -415755,11 +402053,11 @@ sub_80CB2B0: @ 80CB2B0 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r7, _080CB2F0 + ldr r7, =0x02039d08 _080CB2BA: ldr r0, [r7] lsls r4, r5, 2 - ldr r1, _080CB2F4 + ldr r1, =0x00000a88 adds r0, r1 adds r0, r4 ldr r0, [r0] @@ -415767,7 +402065,7 @@ _080CB2BA: beq _080CB2DA bl sub_80CC314 ldr r0, [r7] - ldr r1, _080CB2F4 + ldr r1, =0x00000a88 adds r0, r1 adds r0, r4 movs r1, 0 @@ -415785,8 +402083,7 @@ _080CB2DA: pop {r0} bx r0 .align 2, 0 -_080CB2F0: .4byte 0x02039d08 -_080CB2F4: .4byte 0x00000a88 + .pool thumb_func_end sub_80CB2B0 thumb_func_start sub_80CB2F8 @@ -415831,7 +402128,7 @@ sub_80CB2F8: @ 80CB2F8 movs r3, 0 mov r9, r3 adds r5, r0, 0 - ldr r1, _080CB3DC + ldr r1, =0x02039d08 ldr r0, [r1] ldrb r0, [r0, 0x1] cmp r0, 0x3 @@ -415840,17 +402137,17 @@ sub_80CB2F8: @ 80CB2F8 lsls r2, 16 mov r10, r2 _080CB358: - ldr r6, _080CB3DC + ldr r6, =0x02039d08 ldr r2, [r6] lsls r0, r5, 1 - ldr r3, _080CB3E0 + ldr r3, =0x00000ba8 adds r1, r2, r3 adds r1, r0 ldrh r0, [r1] cmp r0, 0 beq _080CB3C2 lsls r4, r5, 2 - ldr r6, _080CB3E4 + ldr r6, =0x00000be4 adds r1, r2, r6 adds r1, r4 ldr r1, [r1] @@ -415865,9 +402162,9 @@ _080CB358: asrs r2, r6, 16 bl sub_80CC230 adds r2, r0, 0 - ldr r1, _080CB3DC + ldr r1, =0x02039d08 ldr r0, [r1] - ldr r3, _080CB3E8 + ldr r3, =0x00000a88 adds r0, r3 adds r1, r0, r4 str r2, [r1] @@ -415885,7 +402182,7 @@ _080CB358: ldrh r3, [r3, 0x10] strh r3, [r0, 0x34] ldr r1, [r1] - ldr r0, _080CB3EC + ldr r0, =sub_80CB234 + 1 str r0, [r1, 0x1C] mov r0, r9 adds r0, 0x1 @@ -415906,11 +402203,7 @@ _080CB3C2: bge _080CB358 b _080CB4A6 .align 2, 0 -_080CB3DC: .4byte 0x02039d08 -_080CB3E0: .4byte 0x00000ba8 -_080CB3E4: .4byte 0x00000be4 -_080CB3E8: .4byte 0x00000a88 -_080CB3EC: .4byte sub_80CB234 + 1 + .pool _080CB3F0: mov r10, r1 movs r7, 0x4 @@ -415920,14 +402213,14 @@ _080CB3F8: mov r6, r10 ldr r2, [r6] lsls r0, r5, 1 - ldr r3, _080CB4B8 + ldr r3, =0x00000ba8 adds r1, r2, r3 adds r1, r0 ldrh r0, [r1] cmp r0, 0 beq _080CB490 lsls r4, r5, 2 - ldr r6, _080CB4BC + ldr r6, =0x00000be4 adds r1, r2, r6 adds r1, r4 ldr r1, [r1] @@ -415944,7 +402237,7 @@ _080CB3F8: adds r2, r0, 0 mov r0, r10 ldr r3, [r0] - ldr r1, _080CB4C0 + ldr r1, =0x00000a88 adds r0, r3, r1 adds r1, r0, r4 str r2, [r1] @@ -415962,9 +402255,9 @@ _080CB3F8: ldrh r6, [r6, 0x10] strh r6, [r0, 0x34] ldr r1, [r1] - ldr r0, _080CB4C4 + ldr r0, =sub_80CB234 + 1 str r0, [r1, 0x1C] - ldr r1, _080CB4C8 + ldr r1, =0x00000c5c adds r0, r3, r1 ldrb r0, [r0] adds r1, r5, 0 @@ -415974,7 +402267,7 @@ _080CB3F8: bne _080CB486 mov r2, r10 ldr r0, [r2] - ldr r3, _080CB4C0 + ldr r3, =0x00000a88 adds r0, r3 adds r0, r4 ldr r2, [r0] @@ -416015,11 +402308,7 @@ _080CB4A6: pop {r1} bx r1 .align 2, 0 -_080CB4B8: .4byte 0x00000ba8 -_080CB4BC: .4byte 0x00000be4 -_080CB4C0: .4byte 0x00000a88 -_080CB4C4: .4byte sub_80CB234 + 1 -_080CB4C8: .4byte 0x00000c5c + .pool thumb_func_end sub_80CB2F8 thumb_func_start sub_80CB4CC @@ -416030,18 +402319,18 @@ sub_80CB4CC: @ 80CB4CC lsrs r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r6, _080CB52C + ldr r6, =0x02039d08 ldr r1, [r6] - ldr r2, _080CB530 + ldr r2, =0x00000c6a adds r1, r2 movs r5, 0 strb r5, [r1] ldr r1, [r6] - ldr r3, _080CB534 + ldr r3, =0x00000c6b adds r1, r3 strb r0, [r1] ldr r1, [r6] - ldr r7, _080CB538 + ldr r7, =0x00000c69 adds r1, r7 strb r4, [r1] ldr r3, [r6] @@ -416059,41 +402348,36 @@ sub_80CB4CC: @ 80CB4CC subs r7, 0x5 adds r2, r3, r7 strh r1, [r2] - ldr r1, _080CB53C + ldr r1, =0x00000c66 adds r3, r1 strh r5, [r3] bl sub_80CB6F0 cmp r4, 0 ble _080CB544 ldr r0, [r6] - ldr r2, _080CB540 + ldr r2, =0x00000c68 adds r0, r2 movs r1, 0 b _080CB54C .align 2, 0 -_080CB52C: .4byte 0x02039d08 -_080CB530: .4byte 0x00000c6a -_080CB534: .4byte 0x00000c6b -_080CB538: .4byte 0x00000c69 -_080CB53C: .4byte 0x00000c66 -_080CB540: .4byte 0x00000c68 + .pool _080CB544: ldr r0, [r6] - ldr r3, _080CB578 + ldr r3, =0x00000c68 adds r0, r3 movs r1, 0x5 _080CB54C: strb r1, [r0] - ldr r0, _080CB57C + ldr r0, =0x02039d08 ldr r2, [r0] - ldr r7, _080CB578 + ldr r7, =0x00000c68 adds r0, r2, r7 ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 lsls r0, 3 adds r0, 0x64 - ldr r3, _080CB580 + ldr r3, =0x00000c62 adds r1, r2, r3 strh r0, [r1] subs r7, 0x4 @@ -416105,15 +402389,13 @@ _080CB54C: pop {r0} bx r0 .align 2, 0 -_080CB578: .4byte 0x00000c68 -_080CB57C: .4byte 0x02039d08 -_080CB580: .4byte 0x00000c62 + .pool thumb_func_end sub_80CB4CC thumb_func_start sub_80CB584 sub_80CB584: @ 80CB584 push {r4-r6,lr} - ldr r5, _080CB5B0 + ldr r5, =0x02039d08 ldr r0, [r5] movs r4, 0xC6 lsls r4, 4 @@ -416125,7 +402407,7 @@ sub_80CB584: @ 80CB584 strh r0, [r1] _080CB59A: ldr r3, [r5] - ldr r6, _080CB5B4 + ldr r6, =0x00000c6a adds r0, r3, r6 ldrb r0, [r0] cmp r0, 0x1 @@ -416136,8 +402418,7 @@ _080CB59A: beq _080CB5C0 b _080CB6DE .align 2, 0 -_080CB5B0: .4byte 0x02039d08 -_080CB5B4: .4byte 0x00000c6a + .pool _080CB5B8: cmp r0, 0x2 bne _080CB5BE @@ -416145,9 +402426,9 @@ _080CB5B8: _080CB5BE: b _080CB6DE _080CB5C0: - ldr r0, _080CB60C + ldr r0, =0x00000c62 adds r1, r3, r0 - ldr r2, _080CB610 + ldr r2, =0x00000c64 adds r0, r3, r2 ldrh r0, [r0] ldrh r2, [r1] @@ -416160,14 +402441,14 @@ _080CB5C0: bhi _080CB5DC b _080CB6E8 _080CB5DC: - ldr r1, _080CB614 + ldr r1, =0x00000c68 adds r0, r3, r1 ldrb r0, [r0] bl sub_80CB2B0 ldr r2, [r5] - ldr r0, _080CB60C + ldr r0, =0x00000c62 adds r3, r2, r0 - ldr r1, _080CB618 + ldr r1, =0x00000c69 adds r0, r2, r1 movs r1, 0 ldrsb r1, [r0, r1] @@ -416183,20 +402464,17 @@ _080CB5DC: strb r0, [r2] b _080CB6E8 .align 2, 0 -_080CB60C: .4byte 0x00000c62 -_080CB610: .4byte 0x00000c64 -_080CB614: .4byte 0x00000c68 -_080CB618: .4byte 0x00000c69 + .pool _080CB61C: - ldr r2, _080CB680 + ldr r2, =0x00000c62 adds r1, r3, r2 - ldr r6, _080CB684 + ldr r6, =0x00000c64 adds r2, r3, r6 ldrh r0, [r2] ldrh r6, [r1] adds r0, r6 strh r0, [r1] - ldr r6, _080CB688 + ldr r6, =0x00000c68 adds r0, r3, r6 ldrb r0, [r0] adds r1, r3, r4 @@ -416205,14 +402483,14 @@ _080CB61C: ldrsh r2, [r2, r3] bl sub_80CB2F8 ldr r2, [r5] - ldr r3, _080CB68C + ldr r3, =0x00000c66 adds r1, r2, r3 lsls r0, 24 lsrs r0, 24 ldrh r3, [r1] adds r0, r3 strh r0, [r1] - ldr r1, _080CB690 + ldr r1, =0x00000c69 adds r0, r2, r1 movs r1, 0 ldrsb r1, [r0, r1] @@ -416230,28 +402508,22 @@ _080CB662: cmp r0, 0 bne _080CB69C _080CB66E: - ldr r0, _080CB694 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080CB698 + ldr r2, =0x00000c6a adds r1, r2 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _080CB6E8 .align 2, 0 -_080CB680: .4byte 0x00000c62 -_080CB684: .4byte 0x00000c64 -_080CB688: .4byte 0x00000c68 -_080CB68C: .4byte 0x00000c66 -_080CB690: .4byte 0x00000c69 -_080CB694: .4byte 0x02039d08 -_080CB698: .4byte 0x00000c6a + .pool _080CB69C: - ldr r3, _080CB6BC + ldr r3, =0x02039d08 ldr r0, [r3] - ldr r6, _080CB6C0 + ldr r6, =0x00000c68 adds r1, r0, r6 - ldr r2, _080CB6C4 + ldr r2, =0x00000c69 adds r0, r2 ldrb r0, [r0] ldrb r6, [r1] @@ -416259,17 +402531,14 @@ _080CB69C: movs r2, 0 strb r0, [r1] ldr r0, [r3] - ldr r1, _080CB6C8 + ldr r1, =0x00000c6a adds r0, r1 strb r2, [r0] b _080CB6E8 .align 2, 0 -_080CB6BC: .4byte 0x02039d08 -_080CB6C0: .4byte 0x00000c68 -_080CB6C4: .4byte 0x00000c69 -_080CB6C8: .4byte 0x00000c6a + .pool _080CB6CC: - ldr r2, _080CB6E4 + ldr r2, =0x00000c66 adds r0, r3, r2 ldrh r0, [r0] cmp r0, 0 @@ -416282,7 +402551,7 @@ _080CB6DE: movs r0, 0 b _080CB6EA .align 2, 0 -_080CB6E4: .4byte 0x00000c66 + .pool _080CB6E8: movs r0, 0x1 _080CB6EA: @@ -416301,7 +402570,7 @@ sub_80CB6F0: @ 80CB6F0 lsrs r6, r0, 24 movs r5, 0 movs r0, 0 - ldr r1, _080CB768 + ldr r1, =0x02039d08 mov r9, r1 _080CB704: adds r0, 0x1 @@ -416317,7 +402586,7 @@ _080CB70A: mov r2, r9 ldr r1, [r2] lsls r2, r5, 1 - ldr r3, _080CB76C + ldr r3, =0x00000ba8 adds r1, r3 adds r1, r2 strh r0, [r1] @@ -416331,7 +402600,7 @@ _080CB70A: mov r2, r9 ldr r1, [r2] lsls r2, r5, 2 - ldr r3, _080CB770 + ldr r3, =0x00000be4 adds r1, r3 adds r1, r2 str r0, [r1] @@ -416343,9 +402612,9 @@ _080CB744: mov r0, r8 cmp r0, 0x4 ble _080CB704 - ldr r0, _080CB768 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CB774 + ldr r1, =0x00000c5c adds r0, r1 strb r6, [r0] pop {r3,r4} @@ -416355,20 +402624,17 @@ _080CB744: pop {r0} bx r0 .align 2, 0 -_080CB768: .4byte 0x02039d08 -_080CB76C: .4byte 0x00000ba8 -_080CB770: .4byte 0x00000be4 -_080CB774: .4byte 0x00000c5c + .pool thumb_func_end sub_80CB6F0 thumb_func_start sub_80CB778 sub_80CB778: @ 80CB778 push {r4,r5,lr} lsls r0, 24 - ldr r5, _080CB7A4 + ldr r5, =0x02039d08 ldr r1, [r5] lsrs r4, r0, 22 - ldr r0, _080CB7A8 + ldr r0, =0x00000a88 adds r1, r0 adds r1, r4 ldr r0, [r1] @@ -416376,7 +402642,7 @@ sub_80CB778: @ 80CB778 beq _080CB79E bl sub_80CC314 ldr r0, [r5] - ldr r1, _080CB7A8 + ldr r1, =0x00000a88 adds r0, r1 adds r0, r4 movs r1, 0 @@ -416386,8 +402652,7 @@ _080CB79E: pop {r0} bx r0 .align 2, 0 -_080CB7A4: .4byte 0x02039d08 -_080CB7A8: .4byte 0x00000a88 + .pool thumb_func_end sub_80CB778 thumb_func_start sub_80CB7AC @@ -416396,10 +402661,10 @@ sub_80CB7AC: @ 80CB7AC lsls r0, 24 lsls r1, 24 lsrs r2, r1, 24 - ldr r1, _080CB7E0 + ldr r1, =0x02039d08 ldr r1, [r1] lsrs r0, 22 - ldr r3, _080CB7E4 + ldr r3, =0x00000a88 adds r1, r3 adds r1, r0 ldr r3, [r1] @@ -416419,8 +402684,7 @@ _080CB7DA: pop {r0} bx r0 .align 2, 0 -_080CB7E0: .4byte 0x02039d08 -_080CB7E4: .4byte 0x00000a88 + .pool thumb_func_end sub_80CB7AC thumb_func_start sub_80CB7E8 @@ -416432,7 +402696,7 @@ sub_80CB7E8: @ 80CB7E8 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r4, _080CB88C + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr @@ -416450,7 +402714,7 @@ sub_80CB7E8: @ 80CB7E8 movs r2, 0x68 movs r3, 0x40 bl sub_80CC230 - ldr r1, _080CB890 + ldr r1, =0x02039d08 ldr r1, [r1] movs r2, 0xA7 lsls r2, 4 @@ -416462,7 +402726,7 @@ _080CB830: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _080CB88C + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -416490,7 +402754,7 @@ _080CB830: adds r0, r5, 0 movs r2, 0x98 bl sub_80CC230 - ldr r1, _080CB890 + ldr r1, =0x02039d08 ldr r1, [r1] lsls r2, r6, 2 movs r3, 0xA7 @@ -416503,10 +402767,9 @@ _080CB830: lsrs r7, r0, 16 b _080CB8A4 .align 2, 0 -_080CB88C: .4byte 0x020244ec -_080CB890: .4byte 0x02039d08 + .pool _080CB894: - ldr r0, _080CB948 + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r6, 2 movs r2, 0xA7 @@ -416520,7 +402783,7 @@ _080CB8A4: lsrs r6, r0, 16 cmp r6, 0x5 bls _080CB830 - ldr r3, _080CB948 + ldr r3, =0x02039d08 mov r0, r8 cmp r0, 0 bne _080CB8EA @@ -416570,7 +402833,7 @@ _080CB8FA: beq _080CB932 movs r0, 0x64 muls r0, r6 - ldr r1, _080CB94C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC bl pokemon_getattr @@ -416602,17 +402865,16 @@ _080CB93C: pop {r0} bx r0 .align 2, 0 -_080CB948: .4byte 0x02039d08 -_080CB94C: .4byte 0x020244ec + .pool thumb_func_end sub_80CB7E8 thumb_func_start sub_80CB950 sub_80CB950: @ 80CB950 push {r4-r7,lr} sub sp, 0x4 - ldr r0, _080CB9B4 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080CB9B8 + ldr r2, =0x00000c5e adds r1, r2 movs r2, 0 strb r2, [r1] @@ -416640,7 +402902,7 @@ _080CB96A: adds r0, r4 movs r1, 0 str r1, [r0] - ldr r0, _080CB9B8 + ldr r0, =0x00000c5e adds r2, r0 ldrb r0, [r2] adds r0, 0x1 @@ -416660,21 +402922,19 @@ _080CB9A0: pop {r0} bx r0 .align 2, 0 -_080CB9B4: .4byte 0x02039d08 -_080CB9B8: .4byte 0x00000c5e + .pool thumb_func_end sub_80CB950 thumb_func_start sub_80CB9BC sub_80CB9BC: @ 80CB9BC - ldr r0, _080CB9C8 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CB9CC + ldr r1, =0x00000c5e adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080CB9C8: .4byte 0x02039d08 -_080CB9CC: .4byte 0x00000c5e + .pool thumb_func_end sub_80CB9BC thumb_func_start sub_80CB9D0 @@ -416729,13 +402989,13 @@ _080CBA24: strh r0, [r2, 0x38] movs r0, 0x8 strh r0, [r2, 0x3A] - ldr r0, _080CBA38 + ldr r0, =sub_80CBA3C + 1 str r0, [r2, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_080CBA38: .4byte sub_80CBA3C + 1 + .pool thumb_func_end sub_80CB9D0 thumb_func_start sub_80CBA3C @@ -416785,9 +403045,9 @@ _080CBA7C: adds r0, 0x10 _080CBA8E: strh r0, [r3, 0x22] - ldr r0, _080CBAB8 + ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] - ldr r0, _080CBABC + ldr r0, =0x02039d08 ldr r2, [r0] movs r0, 0x30 ldrsh r1, [r3, r0] @@ -416797,7 +403057,7 @@ _080CBA8E: adds r0, r2, r4 adds r0, r1 str r3, [r0] - ldr r0, _080CBAC0 + ldr r0, =0x00000c5e adds r2, r0 ldrb r0, [r2] subs r0, 0x1 @@ -416807,24 +403067,22 @@ _080CBAB2: pop {r0} bx r0 .align 2, 0 -_080CBAB8: .4byte nullsub_12 + 1 -_080CBABC: .4byte 0x02039d08 -_080CBAC0: .4byte 0x00000c5e + .pool thumb_func_end sub_80CBA3C thumb_func_start sub_80CBAC4 sub_80CBAC4: @ 80CBAC4 push {r4,lr} - ldr r4, _080CBAE8 + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r1, _080CBAEC + ldr r1, =0x00000a6c adds r0, r1 ldr r0, [r0] cmp r0, 0 beq _080CBAE2 bl sub_80CC314 ldr r0, [r4] - ldr r1, _080CBAEC + ldr r1, =0x00000a6c adds r0, r1 movs r1, 0 str r1, [r0] @@ -416833,15 +403091,14 @@ _080CBAE2: pop {r0} bx r0 .align 2, 0 -_080CBAE8: .4byte 0x02039d08 -_080CBAEC: .4byte 0x00000a6c + .pool thumb_func_end sub_80CBAC4 thumb_func_start sub_80CBAF0 sub_80CBAF0: @ 80CBAF0 push {r4-r6,lr} movs r3, 0 - ldr r6, _080CBB48 + ldr r6, =0x02039d08 lsls r0, 16 asrs r4, r0, 16 movs r5, 0x5 @@ -416884,7 +403141,7 @@ _080CBAFE: strb r1, [r0] b _080CBB56 .align 2, 0 -_080CBB48: .4byte 0x02039d08 + .pool _080CBB4C: adds r2, 0x3E ldrb r1, [r2] @@ -416906,7 +403163,7 @@ _080CBB56: sub_80CBB68: @ 80CBB68 push {r4,r5,lr} lsls r0, 24 - ldr r5, _080CBB98 + ldr r5, =0x02039d08 ldr r1, [r5] lsrs r4, r0, 22 movs r0, 0xA7 @@ -416929,14 +403186,14 @@ _080CBB92: pop {r0} bx r0 .align 2, 0 -_080CBB98: .4byte 0x02039d08 + .pool thumb_func_end sub_80CBB68 thumb_func_start sub_80CBB9C sub_80CBB9C: @ 80CBB9C push {r4-r6,lr} movs r5, 0 - ldr r6, _080CBBD8 + ldr r6, =0x02039d08 _080CBBA2: ldr r0, [r6] lsls r4, r5, 2 @@ -416965,7 +403222,7 @@ _080CBBC6: pop {r0} bx r0 .align 2, 0 -_080CBBD8: .4byte 0x02039d08 + .pool thumb_func_end sub_80CBB9C thumb_func_start sub_80CBBDC @@ -416974,7 +403231,7 @@ sub_80CBBDC: @ 80CBBDC lsls r0, 24 lsls r1, 24 lsrs r2, r1, 24 - ldr r1, _080CBC10 + ldr r1, =0x02039d08 ldr r1, [r1] lsrs r0, 22 movs r3, 0xA7 @@ -416998,7 +403255,7 @@ _080CBC0C: pop {r0} bx r0 .align 2, 0 -_080CBC10: .4byte 0x02039d08 + .pool thumb_func_end sub_80CBBDC thumb_func_start sub_80CBC14 @@ -417011,9 +403268,9 @@ sub_80CBC14: @ 80CBC14 adds r5, r1, 0 cmp r4, 0 bne _080CBC44 - ldr r3, _080CBC3C + ldr r3, =0x02039d08 ldr r0, [r3] - ldr r5, _080CBC40 + ldr r5, =0x00000a6c adds r2, r0, r5 lsls r1, 2 adds r5, 0x4 @@ -417024,17 +403281,16 @@ sub_80CBC14: @ 80CBC14 str r4, [r0] b _080CBC60 .align 2, 0 -_080CBC3C: .4byte 0x02039d08 -_080CBC40: .4byte 0x00000a6c + .pool _080CBC44: cmp r4, 0x1 bne _080CBC96 - ldr r3, _080CBC9C + ldr r3, =0x02039d08 ldr r0, [r3] - ldr r1, _080CBCA0 + ldr r1, =0x00000a6c adds r2, r0, r1 lsls r1, r5, 2 - ldr r4, _080CBCA4 + ldr r4, =0x00000a88 adds r0, r4 adds r0, r1 ldr r1, [r0] @@ -417044,10 +403300,10 @@ _080CBC44: _080CBC60: adds r5, r3, 0 ldr r0, [r5] - ldr r4, _080CBCA0 + ldr r4, =0x00000a6c adds r0, r4 ldr r1, [r0] - ldr r0, _080CBCA8 + ldr r0, =sub_80CC100 + 1 str r0, [r1, 0x1C] bl sub_80CAFAC ldr r1, [r5] @@ -417073,10 +403329,7 @@ _080CBC96: pop {r0} bx r0 .align 2, 0 -_080CBC9C: .4byte 0x02039d08 -_080CBCA0: .4byte 0x00000a6c -_080CBCA4: .4byte 0x00000a88 -_080CBCA8: .4byte sub_80CC100 + 1 + .pool thumb_func_end sub_80CBC14 thumb_func_start sub_80CBCAC @@ -417088,14 +403341,14 @@ sub_80CBCAC: @ 80CBCAC lsrs r6, r1, 24 cmp r0, 0xE bne _080CBCF8 - ldr r3, _080CBCF0 + ldr r3, =0x02039d08 ldr r1, [r3] lsls r5, r6, 2 movs r4, 0xA7 lsls r4, 4 adds r0, r1, r4 adds r0, r5 - ldr r2, _080CBCF4 + ldr r2, =0x00000a6c adds r1, r2 ldr r2, [r1] str r2, [r0] @@ -417115,16 +403368,15 @@ sub_80CBCAC: @ 80CBCAC strb r1, [r0] b _080CBD34 .align 2, 0 -_080CBCF0: .4byte 0x02039d08 -_080CBCF4: .4byte 0x00000a6c + .pool _080CBCF8: - ldr r5, _080CBD4C + ldr r5, =0x02039d08 ldr r1, [r5] lsls r4, r6, 2 - ldr r3, _080CBD50 + ldr r3, =0x00000a88 adds r0, r1, r3 adds r0, r4 - ldr r2, _080CBD54 + ldr r2, =0x00000a6c adds r1, r2 ldr r2, [r1] str r2, [r0] @@ -417149,10 +403401,10 @@ _080CBCF8: adds r3, r5, 0 _080CBD34: ldr r1, [r3] - ldr r0, _080CBD54 + ldr r0, =0x00000a6c adds r1, r0 ldr r2, [r1] - ldr r0, _080CBD58 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] movs r0, 0 str r0, [r1] @@ -417160,10 +403412,7 @@ _080CBD34: pop {r0} bx r0 .align 2, 0 -_080CBD4C: .4byte 0x02039d08 -_080CBD50: .4byte 0x00000a88 -_080CBD54: .4byte 0x00000a6c -_080CBD58: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80CBCAC thumb_func_start sub_80CBD5C @@ -417175,7 +403424,7 @@ sub_80CBD5C: @ 80CBD5C lsrs r4, r1, 24 cmp r0, 0xE bne _080CBD80 - ldr r3, _080CBD7C + ldr r3, =0x02039d08 ldr r1, [r3] movs r0, 0xB0 lsls r0, 4 @@ -417185,26 +403434,26 @@ sub_80CBD5C: @ 80CBD5C lsls r4, 4 b _080CBD8E .align 2, 0 -_080CBD7C: .4byte 0x02039d08 + .pool _080CBD80: - ldr r3, _080CBDB0 + ldr r3, =0x02039d08 ldr r1, [r3] movs r0, 0xB0 lsls r0, 4 adds r2, r1, r0 lsls r0, r4, 2 - ldr r4, _080CBDB4 + ldr r4, =0x00000a88 _080CBD8E: adds r0, r4 adds r1, r0 str r1, [r2] ldr r1, [r3] - ldr r2, _080CBDB8 + ldr r2, =0x00000a6c adds r0, r1, r2 ldr r2, [r0] - ldr r0, _080CBDBC + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] - ldr r4, _080CBDC0 + ldr r4, =0x00000c5d adds r1, r4 movs r0, 0 strb r0, [r1] @@ -417212,11 +403461,7 @@ _080CBD8E: pop {r0} bx r0 .align 2, 0 -_080CBDB0: .4byte 0x02039d08 -_080CBDB4: .4byte 0x00000a88 -_080CBDB8: .4byte 0x00000a6c -_080CBDBC: .4byte nullsub_12 + 1 -_080CBDC0: .4byte 0x00000c5d + .pool thumb_func_end sub_80CBD5C thumb_func_start sub_80CBDC4 @@ -417225,9 +403470,9 @@ sub_80CBDC4: @ 80CBDC4 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r6, _080CBDE0 + ldr r6, =0x02039d08 ldr r0, [r6] - ldr r1, _080CBDE4 + ldr r1, =0x00000c5d mov r9, r1 adds r1, r0, r1 ldrb r0, [r1] @@ -417236,13 +403481,12 @@ sub_80CBDC4: @ 80CBDC4 movs r0, 0 b _080CBEF4 .align 2, 0 -_080CBDE0: .4byte 0x02039d08 -_080CBDE4: .4byte 0x00000c5d + .pool _080CBDE8: adds r0, 0x1 strb r0, [r1] ldr r2, [r6] - ldr r5, _080CBF00 + ldr r5, =0x00000c5d adds r0, r2, r5 ldrb r1, [r0] movs r0, 0x1 @@ -417257,7 +403501,7 @@ _080CBDE8: ldrh r0, [r1, 0x22] subs r0, 0x1 strh r0, [r1, 0x22] - ldr r5, _080CBF04 + ldr r5, =0x00000a6c adds r0, r2, r5 ldr r1, [r0] ldrh r0, [r1, 0x22] @@ -417271,7 +403515,7 @@ _080CBE18: ldr r0, [r4] ldr r0, [r0] mov r8, r0 - ldr r5, _080CBF08 + ldr r5, =0x08329f40 mov r0, r9 adds r1, r3, r0 ldrb r0, [r1] @@ -417286,7 +403530,7 @@ _080CBE3C: asrs r0, 4 mov r2, r8 strh r0, [r2, 0x24] - ldr r0, _080CBF04 + ldr r0, =0x00000a6c mov r8, r0 add r3, r8 ldr r2, [r3] @@ -417368,12 +403612,12 @@ _080CBEBE: mov r2, r8 adds r0, r1, r2 ldr r2, [r0] - ldr r0, _080CBF0C + ldr r0, =sub_80CC100 + 1 str r0, [r2, 0x1C] adds r1, r7 ldr r0, [r1] ldr r1, [r0] - ldr r0, _080CBF10 + ldr r0, =nullsub_12 + 1 str r0, [r1, 0x1C] _080CBEF2: movs r0, 0x1 @@ -417385,11 +403629,7 @@ _080CBEF4: pop {r1} bx r1 .align 2, 0 -_080CBF00: .4byte 0x00000c5d -_080CBF04: .4byte 0x00000a6c -_080CBF08: .4byte 0x08329f40 -_080CBF0C: .4byte sub_80CC100 + 1 -_080CBF10: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80CBDC4 thumb_func_start sub_80CBF14 @@ -417412,24 +403652,23 @@ _080CBF2E: beq _080CBF70 b _080CBFC0 _080CBF34: - ldr r3, _080CBF44 + ldr r3, =0x02039d08 ldr r1, [r3] - ldr r0, _080CBF48 + ldr r0, =0x00000b04 adds r2, r1, r0 lsls r0, r4, 2 movs r4, 0xA7 lsls r4, 4 b _080CBF58 .align 2, 0 -_080CBF44: .4byte 0x02039d08 -_080CBF48: .4byte 0x00000b04 + .pool _080CBF4C: - ldr r3, _080CBF64 + ldr r3, =0x02039d08 ldr r1, [r3] - ldr r0, _080CBF68 + ldr r0, =0x00000b04 adds r2, r1, r0 lsls r0, r4, 2 - ldr r4, _080CBF6C + ldr r4, =0x00000a88 _080CBF58: adds r0, r4 adds r1, r0 @@ -417437,21 +403676,19 @@ _080CBF58: adds r4, r3, 0 b _080CBF80 .align 2, 0 -_080CBF64: .4byte 0x02039d08 -_080CBF68: .4byte 0x00000b04 -_080CBF6C: .4byte 0x00000a88 + .pool _080CBF70: - ldr r0, _080CBFC8 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r3, _080CBFCC + ldr r3, =0x00000b04 adds r2, r1, r3 - ldr r4, _080CBFD0 + ldr r4, =0x00000a6c adds r1, r4 str r1, [r2] adds r4, r0, 0 _080CBF80: ldr r0, [r4] - ldr r1, _080CBFCC + ldr r1, =0x00000b04 adds r0, r1 ldr r0, [r0] ldr r0, [r0] @@ -417459,7 +403696,7 @@ _080CBF80: beq _080CBFC0 bl obj_alloc_rotscale_entry ldr r0, [r4] - ldr r3, _080CBFCC + ldr r3, =0x00000b04 adds r0, r3 ldr r0, [r0] ldr r2, [r0] @@ -417474,7 +403711,7 @@ _080CBF80: adds r1, r3 ldr r0, [r1] ldr r2, [r0] - ldr r0, _080CBFD4 + ldr r0, =0x0857291c str r0, [r2, 0x10] ldr r0, [r1] ldr r0, [r0] @@ -417485,18 +403722,15 @@ _080CBFC0: pop {r0} bx r0 .align 2, 0 -_080CBFC8: .4byte 0x02039d08 -_080CBFCC: .4byte 0x00000b04 -_080CBFD0: .4byte 0x00000a6c -_080CBFD4: .4byte 0x0857291c + .pool thumb_func_end sub_80CBF14 thumb_func_start sub_80CBFD8 sub_80CBFD8: @ 80CBFD8 push {lr} - ldr r0, _080CBFFC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CC000 + ldr r1, =0x00000b04 adds r0, r1 ldr r0, [r0] ldr r1, [r0] @@ -417513,8 +403747,7 @@ _080CBFF8: movs r0, 0 b _080CC01A .align 2, 0 -_080CBFFC: .4byte 0x02039d08 -_080CC000: .4byte 0x00000b04 + .pool _080CC004: adds r0, r1, 0 adds r0, 0x3F @@ -417536,9 +403769,9 @@ _080CC01A: thumb_func_start sub_80CC020 sub_80CC020: @ 80CC020 push {r4,lr} - ldr r4, _080CC05C + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r1, _080CC060 + ldr r1, =0x00000b04 adds r0, r1 ldr r0, [r0] ldr r0, [r0] @@ -417549,13 +403782,13 @@ sub_80CC020: @ 80CC020 lsrs r0, 27 bl rotscale_free_entry ldr r0, [r4] - ldr r1, _080CC060 + ldr r1, =0x00000b04 adds r0, r1 ldr r0, [r0] ldr r0, [r0] bl sub_80CC314 ldr r0, [r4] - ldr r1, _080CC060 + ldr r1, =0x00000b04 adds r0, r1 ldr r1, [r0] movs r0, 0 @@ -417565,16 +403798,15 @@ _080CC056: pop {r0} bx r0 .align 2, 0 -_080CC05C: .4byte 0x02039d08 -_080CC060: .4byte 0x00000b04 + .pool thumb_func_end sub_80CC020 thumb_func_start sub_80CC064 sub_80CC064: @ 80CC064 push {lr} - ldr r3, _080CC098 + ldr r3, =0x02039d08 ldr r0, [r3] - ldr r1, _080CC09C + ldr r1, =0x00000b04 adds r0, r1 ldr r0, [r0] ldr r0, [r0] @@ -417588,7 +403820,7 @@ sub_80CC064: @ 80CC064 ands r0, r1 strb r0, [r2] ldr r0, [r3] - ldr r1, _080CC09C + ldr r1, =0x00000b04 adds r0, r1 ldr r0, [r0] ldr r0, [r0] @@ -417598,16 +403830,15 @@ _080CC094: pop {r0} bx r0 .align 2, 0 -_080CC098: .4byte 0x02039d08 -_080CC09C: .4byte 0x00000b04 + .pool thumb_func_end sub_80CC064 thumb_func_start sub_80CC0A0 sub_80CC0A0: @ 80CC0A0 push {lr} - ldr r0, _080CC0B4 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CC0B8 + ldr r1, =0x00000b04 adds r2, r0, r1 ldr r0, [r2] cmp r0, 0 @@ -417615,8 +403846,7 @@ sub_80CC0A0: @ 80CC0A0 movs r0, 0 b _080CC0D0 .align 2, 0 -_080CC0B4: .4byte 0x02039d08 -_080CC0B8: .4byte 0x00000b04 + .pool _080CC0BC: ldr r0, [r0] adds r0, 0x3F @@ -417638,9 +403868,9 @@ _080CC0D0: sub_80CC0D4: @ 80CC0D4 lsls r0, 24 lsrs r0, 24 - ldr r1, _080CC0F8 + ldr r1, =0x02039d08 ldr r1, [r1] - ldr r2, _080CC0FC + ldr r2, =0x00000a6c adds r1, r2 ldr r3, [r1] movs r1, 0x3 @@ -417654,15 +403884,14 @@ sub_80CC0D4: @ 80CC0D4 strb r1, [r3, 0x5] bx lr .align 2, 0 -_080CC0F8: .4byte 0x02039d08 -_080CC0FC: .4byte 0x00000a6c + .pool thumb_func_end sub_80CC0D4 thumb_func_start sub_80CC100 sub_80CC100: @ 80CC100 - ldr r1, _080CC11C + ldr r1, =0x02039d08 ldr r1, [r1] - ldr r2, _080CC120 + ldr r2, =0x00000cb4 adds r1, r2 ldr r2, [r1] ldrh r2, [r2, 0x20] @@ -417675,8 +403904,7 @@ sub_80CC100: @ 80CC100 strh r1, [r0, 0x22] bx lr .align 2, 0 -_080CC11C: .4byte 0x02039d08 -_080CC120: .4byte 0x00000cb4 + .pool thumb_func_end sub_80CC100 thumb_func_start sub_80CC124 @@ -417685,16 +403913,16 @@ sub_80CC124: @ 80CC124 lsls r0, 16 lsrs r3, r0, 16 movs r4, 0 - ldr r1, _080CC18C + ldr r1, =0x02039d08 ldr r0, [r1] - ldr r2, _080CC190 + ldr r2, =0x00000b58 adds r0, r2 ldrh r0, [r0] adds r2, r1, 0 cmp r0, r3 beq _080CC158 adds r6, r2, 0 - ldr r5, _080CC190 + ldr r5, =0x00000b58 _080CC140: adds r0, r4, 0x1 lsls r0, 16 @@ -417713,7 +403941,7 @@ _080CC158: bne _080CC198 movs r4, 0 ldr r0, [r2] - ldr r5, _080CC190 + ldr r5, =0x00000b58 adds r0, r5 ldrh r0, [r0] cmp r0, 0 @@ -417735,20 +403963,18 @@ _080CC16C: _080CC184: cmp r4, 0x28 bne _080CC198 - ldr r0, _080CC194 + ldr r0, =0x0000ffff b _080CC1CA .align 2, 0 -_080CC18C: .4byte 0x02039d08 -_080CC190: .4byte 0x00000b58 -_080CC194: .4byte 0x0000ffff + .pool _080CC198: ldr r1, [r2] lsls r2, r4, 1 - ldr r5, _080CC1D0 + ldr r5, =0x00000b58 adds r0, r1, r5 adds r0, r2 strh r3, [r0] - ldr r0, _080CC1D4 + ldr r0, =0x00000b08 adds r1, r0 adds r1, r2 ldrh r0, [r1] @@ -417760,9 +403986,9 @@ _080CC198: movs r1, 0x1 bl sub_80D3020 lsls r1, r4, 5 - ldr r2, _080CC1D8 + ldr r2, =0x06010000 adds r1, r2 - ldr r2, _080CC1DC + ldr r2, =0x04000080 bl CpuSet adds r0, r4, 0 _080CC1CA: @@ -417770,10 +403996,7 @@ _080CC1CA: pop {r1} bx r1 .align 2, 0 -_080CC1D0: .4byte 0x00000b58 -_080CC1D4: .4byte 0x00000b08 -_080CC1D8: .4byte 0x06010000 -_080CC1DC: .4byte 0x04000080 + .pool thumb_func_end sub_80CC124 thumb_func_start sub_80CC1E0 @@ -417782,17 +404005,17 @@ sub_80CC1E0: @ 80CC1E0 lsls r0, 16 lsrs r5, r0, 16 movs r3, 0 - ldr r6, _080CC214 + ldr r6, =0x02039d08 _080CC1EA: ldr r1, [r6] lsls r2, r3, 1 - ldr r4, _080CC218 + ldr r4, =0x00000b58 adds r0, r1, r4 adds r4, r0, r2 ldrh r0, [r4] cmp r0, r5 bne _080CC220 - ldr r0, _080CC21C + ldr r0, =0x00000b08 adds r1, r0 adds r1, r2 ldrh r0, [r1] @@ -417805,9 +404028,7 @@ _080CC1EA: strh r0, [r4] b _080CC22A .align 2, 0 -_080CC214: .4byte 0x02039d08 -_080CC218: .4byte 0x00000b58 -_080CC21C: .4byte 0x00000b08 + .pool _080CC220: adds r0, r3, 0x1 lsls r0, 16 @@ -417844,7 +404065,7 @@ sub_80CC230: @ 80CC230 lsrs r5, 24 mov r9, r5 mov r2, sp - ldr r0, _080CC2E0 + ldr r0, =0x085728d4 ldm r0!, {r3,r5,r7} stm r2!, {r3,r5,r7} ldm r0!, {r3,r5,r7} @@ -417854,9 +404075,9 @@ sub_80CC230: @ 80CC230 mov r10, r0 mov r6, r10 mov r2, sp - ldr r1, _080CC2E4 + ldr r1, =0x0857c388 adds r1, r6, r1 - ldr r3, _080CC2E8 + ldr r3, =0x0000dac0 adds r0, r3, 0 ldrb r1, [r1] adds r0, r1 @@ -417866,7 +404087,7 @@ sub_80CC230: @ 80CC230 lsls r0, 16 lsrs r0, 16 adds r5, r0, 0 - ldr r0, _080CC2EC + ldr r0, =0x0000ffff cmp r5, r0 beq _080CC302 ldr r7, [sp, 0x18] @@ -417882,15 +404103,15 @@ sub_80CC230: @ 80CC230 lsrs r2, r0, 24 cmp r2, 0x40 beq _080CC2FC - ldr r1, _080CC2F0 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 adds r0, r1 - ldr r2, _080CC2F4 + ldr r2, =0x000003ff ands r2, r5 ldrh r3, [r0, 0x4] - ldr r1, _080CC2F8 + ldr r1, =0xfffffc00 ands r1, r3 orrs r1, r2 strh r1, [r0, 0x4] @@ -417907,13 +404128,7 @@ sub_80CC230: @ 80CC230 strh r1, [r0, 0x2E] b _080CC304 .align 2, 0 -_080CC2E0: .4byte 0x085728d4 -_080CC2E4: .4byte 0x0857c388 -_080CC2E8: .4byte 0x0000dac0 -_080CC2EC: .4byte 0x0000ffff -_080CC2F0: .4byte 0x02020630 -_080CC2F4: .4byte 0x000003ff -_080CC2F8: .4byte 0xfffffc00 + .pool _080CC2FC: adds r0, r6, 0 bl sub_80CC1E0 @@ -417949,12 +404164,12 @@ sub_80CC32C: @ 80CC32C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080CC354 + ldr r0, =sub_80CC370 + 1 movs r1, 0x2 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080CC358 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -417964,21 +404179,20 @@ sub_80CC32C: @ 80CC32C pop {r0} bx r0 .align 2, 0 -_080CC354: .4byte sub_80CC370 + 1 -_080CC358: .4byte 0x03005e00 + .pool thumb_func_end sub_80CC32C thumb_func_start sub_80CC35C sub_80CC35C: @ 80CC35C push {lr} - ldr r0, _080CC36C + ldr r0, =sub_80CC370 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_080CC36C: .4byte sub_80CC370 + 1 + .pool thumb_func_end sub_80CC35C thumb_func_start sub_80CC370 @@ -417989,20 +404203,19 @@ sub_80CC370: @ 80CC370 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080CC394 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x4 bhi _080CC454 lsls r0, 2 - ldr r1, _080CC398 + ldr r1, =_080CC39C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CC394: .4byte 0x03005e00 -_080CC398: .4byte _080CC39C + .pool .align 2, 0 _080CC39C: .4byte _080CC3B0 @@ -418011,9 +404224,9 @@ _080CC39C: .4byte _080CC426 .4byte _080CC44C _080CC3B0: - ldr r1, _080CC3DC + ldr r1, =0x02039d08 ldr r0, [r1] - ldr r2, _080CC3E0 + ldr r2, =0x000002d2 adds r0, r2 movs r2, 0 strb r2, [r0] @@ -418022,7 +404235,7 @@ _080CC3B0: lsls r3, 2 adds r0, r1, r3 strh r2, [r0] - ldr r0, _080CC3E4 + ldr r0, =0x00004ac4 adds r1, r0 movs r2, 0x80 lsls r2, 5 @@ -418032,9 +404245,7 @@ _080CC3B0: strh r0, [r4, 0xA] b _080CC458 .align 2, 0 -_080CC3DC: .4byte 0x02039d08 -_080CC3E0: .4byte 0x000002d2 -_080CC3E4: .4byte 0x00004ac4 + .pool _080CC3E8: movs r1, 0xA ldrsh r0, [r4, r1] @@ -418045,9 +404256,9 @@ _080CC3E8: negs r1, r1 cmp r0, r1 beq _080CC45E - ldr r0, _080CC414 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080CC418 + ldr r2, =0x00004ac4 adds r1, r2 movs r0, 0x2 bl bg_set_tilemap @@ -418055,8 +404266,7 @@ _080CC3E8: bl gpu_sync_bg_show b _080CC458 .align 2, 0 -_080CC414: .4byte 0x02039d08 -_080CC418: .4byte 0x00004ac4 + .pool _080CC41C: ldrb r0, [r4, 0xC] movs r1, 0 @@ -418071,12 +404281,12 @@ _080CC426: bl sub_80CD02C ldrb r0, [r4, 0xC] bl sub_80CB028 - ldr r1, _080CC448 + ldr r1, =0x00005b0a movs r0, 0xC bl lcd_io_set b _080CC458 .align 2, 0 -_080CC448: .4byte 0x00005b0a + .pool _080CC44C: adds r0, r2, 0 bl remove_task @@ -418108,7 +404318,7 @@ sub_80CC464: @ 80CC464 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r5, _080CC528 + ldr r5, =0x02039d08 ldr r2, [r5] lsls r0, r6, 24 asrs r3, r0, 24 @@ -418119,7 +404329,7 @@ sub_80CC464: @ 80CC464 ble _080CC490 movs r1, 0x6 _080CC490: - ldr r7, _080CC52C + ldr r7, =0x000002ce adds r0, r2, r7 strh r1, [r0] movs r1, 0x2 @@ -418127,7 +404337,7 @@ _080CC490: ble _080CC49E movs r1, 0x1 _080CC49E: - ldr r7, _080CC530 + ldr r7, =0x000002d3 adds r0, r2, r7 strb r1, [r0] ldr r2, [r5] @@ -418146,7 +404356,7 @@ _080CC49E: bgt _080CC4C2 movs r1, 0x5 _080CC4C2: - ldr r4, _080CC534 + ldr r4, =0x000002d6 adds r0, r2, r4 strh r1, [r0] movs r7, 0xB6 @@ -418160,7 +404370,7 @@ _080CC4C2: lsls r0, 1 adds r1, r0, 0 _080CC4DC: - ldr r4, _080CC538 + ldr r4, =0x000002da adds r0, r2, r4 strh r1, [r0] movs r1, 0 @@ -418172,7 +404382,7 @@ _080CC4EA: lsls r7, 2 adds r0, r2, r7 strh r1, [r0] - ldr r0, _080CC53C + ldr r0, =0x000002de adds r1, r2, r0 movs r0, 0 strh r0, [r1] @@ -418181,16 +404391,16 @@ _080CC4EA: adds r1, r2, r3 movs r0, 0x2 strh r0, [r1] - ldr r4, _080CC540 + ldr r4, =0x00000a64 adds r0, r2, r4 mov r7, r8 strb r7, [r0] ldr r0, [r5] - ldr r1, _080CC544 + ldr r1, =0x00000a65 adds r0, r1 strb r6, [r0] ldr r0, [r5] - ldr r3, _080CC548 + ldr r3, =0x00000a63 adds r0, r3 movs r1, 0 strb r1, [r0] @@ -418200,23 +404410,15 @@ _080CC4EA: pop {r0} bx r0 .align 2, 0 -_080CC528: .4byte 0x02039d08 -_080CC52C: .4byte 0x000002ce -_080CC530: .4byte 0x000002d3 -_080CC534: .4byte 0x000002d6 -_080CC538: .4byte 0x000002da -_080CC53C: .4byte 0x000002de -_080CC540: .4byte 0x00000a64 -_080CC544: .4byte 0x00000a65 -_080CC548: .4byte 0x00000a63 + .pool thumb_func_end sub_80CC464 thumb_func_start sub_80CC54C sub_80CC54C: @ 80CC54C push {r4-r6,lr} - ldr r4, _080CC568 + ldr r4, =0x02039d08 ldr r1, [r4] - ldr r5, _080CC56C + ldr r5, =0x00000a63 adds r0, r1, r5 ldrb r0, [r0] cmp r0, 0x1 @@ -418227,14 +404429,13 @@ sub_80CC54C: @ 80CC54C beq _080CC576 b _080CC624 .align 2, 0 -_080CC568: .4byte 0x02039d08 -_080CC56C: .4byte 0x00000a63 + .pool _080CC570: cmp r0, 0x2 beq _080CC5E4 b _080CC624 _080CC576: - ldr r2, _080CC5D8 + ldr r2, =0x00000a64 adds r0, r1, r2 ldrb r0, [r0] adds r2, 0x1 @@ -418252,12 +404453,12 @@ _080CC594: bl sub_80CCA00 cmp r0, 0 beq _080CC632 - ldr r6, _080CC5DC + ldr r6, =0x02039d08 ldr r1, [r6] - ldr r4, _080CC5D8 + ldr r4, =0x00000a64 adds r0, r1, r4 ldrb r0, [r0] - ldr r5, _080CC5E0 + ldr r5, =0x00000a65 adds r1, r5 ldrb r1, [r1] lsls r1, 24 @@ -418279,9 +404480,7 @@ _080CC594: bl sub_80CD0B8 b _080CC624 .align 2, 0 -_080CC5D8: .4byte 0x00000a64 -_080CC5DC: .4byte 0x02039d08 -_080CC5E0: .4byte 0x00000a65 + .pool _080CC5E4: bl sub_80CB584 lsls r0, 24 @@ -418314,9 +404513,9 @@ _080CC620: adds r0, r5, 0 b _080CC634 _080CC624: - ldr r0, _080CC63C + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r4, _080CC640 + ldr r4, =0x00000a63 adds r1, r4 ldrb r0, [r1] adds r0, 0x1 @@ -418328,8 +404527,7 @@ _080CC634: pop {r1} bx r1 .align 2, 0 -_080CC63C: .4byte 0x02039d08 -_080CC640: .4byte 0x00000a63 + .pool thumb_func_end sub_80CC54C thumb_func_start sub_80CC644 @@ -418379,9 +404577,9 @@ sub_80CC680: @ 80CC680 lsrs r0, 24 adds r1, r4, 0 bl sub_80D2120 - ldr r0, _080CC6A8 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CC6AC + ldr r1, =0x00000a62 adds r0, r1 movs r1, 0 strb r1, [r0] @@ -418389,31 +404587,28 @@ sub_80CC680: @ 80CC680 pop {r0} bx r0 .align 2, 0 -_080CC6A8: .4byte 0x02039d08 -_080CC6AC: .4byte 0x00000a62 + .pool thumb_func_end sub_80CC680 thumb_func_start sub_80CC6B0 sub_80CC6B0: @ 80CC6B0 push {r4,lr} sub sp, 0x4 - ldr r1, _080CC6D0 + ldr r1, =0x02039d08 ldr r0, [r1] - ldr r2, _080CC6D4 + ldr r2, =0x00000a62 adds r0, r2 ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0x4 bhi _080CC794 lsls r0, 2 - ldr r1, _080CC6D8 + ldr r1, =_080CC6DC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CC6D0: .4byte 0x02039d08 -_080CC6D4: .4byte 0x00000a62 -_080CC6D8: .4byte _080CC6DC + .pool .align 2, 0 _080CC6DC: .4byte _080CC6F0 @@ -418427,19 +404622,18 @@ _080CC6F0: lsls r1, 3 adds r0, r1 ldr r0, [r0] - ldr r1, _080CC710 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0x1 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 ldr r1, [r4] - ldr r2, _080CC714 + ldr r2, =0x00000a62 adds r1, r2 b _080CC77E .align 2, 0 -_080CC710: .4byte 0x0000ffff -_080CC714: .4byte 0x00000a62 + .pool _080CC718: bl fade_and_return_progress_probably lsls r0, 24 @@ -418456,35 +404650,33 @@ _080CC732: cmp r0, 0x1 bne _080CC794 bl sub_80CCF9C - ldr r4, _080CC760 + ldr r4, =0x02039d08 ldr r0, [r4] movs r1, 0xE7 lsls r1, 3 adds r0, r1 ldr r0, [r0] - ldr r1, _080CC764 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0x1 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 ldr r1, [r4] - ldr r2, _080CC768 + ldr r2, =0x00000a62 adds r1, r2 b _080CC77E .align 2, 0 -_080CC760: .4byte 0x02039d08 -_080CC764: .4byte 0x0000ffff -_080CC768: .4byte 0x00000a62 + .pool _080CC76C: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 bne _080CC794 _080CC776: - ldr r0, _080CC788 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r0, _080CC78C + ldr r0, =0x00000a62 adds r1, r0 _080CC77E: ldrb r0, [r1] @@ -418492,8 +404684,7 @@ _080CC77E: strb r0, [r1] b _080CC794 .align 2, 0 -_080CC788: .4byte 0x02039d08 -_080CC78C: .4byte 0x00000a62 + .pool _080CC790: movs r0, 0 b _080CC796 @@ -418510,18 +404701,18 @@ _080CC796: sub_80CC7A0: @ 80CC7A0 push {r4-r7,lr} sub sp, 0x8 - ldr r4, _080CC854 + ldr r4, =0x02039d08 ldr r2, [r4] - ldr r3, _080CC858 + ldr r3, =0x000006f9 adds r2, r3 movs r3, 0 strb r3, [r2] ldr r2, [r4] - ldr r3, _080CC85C + ldr r3, =0x000006fa adds r2, r3 strb r0, [r2] ldr r0, [r4] - ldr r2, _080CC860 + ldr r2, =0x000006fb adds r0, r2 strb r1, [r0] ldr r1, [r4] @@ -418531,7 +404722,7 @@ sub_80CC7A0: @ 80CC7A0 cmp r0, 0 beq _080CC7E6 movs r3, 0 - ldr r0, _080CC864 + ldr r0, =0x000002d2 adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0 @@ -418540,13 +404731,13 @@ sub_80CC7A0: @ 80CC7A0 _080CC7DA: strb r3, [r2] ldr r0, [r4] - ldr r1, _080CC868 + ldr r1, =0x00004ac4 adds r0, r1 bl sub_80CCAE0 _080CC7E6: - ldr r7, _080CC854 + ldr r7, =0x02039d08 ldr r0, [r7] - ldr r2, _080CC85C + ldr r2, =0x000006fa adds r0, r2 ldrb r0, [r0] bl sub_80D20F8 @@ -418557,21 +404748,21 @@ _080CC7E6: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _080CC86C + ldr r1, =0x085775b8 adds r6, r0, r1 ldr r0, [r6, 0x4] ldr r1, [r7] - ldr r5, _080CC870 + ldr r5, =0x00000792 adds r1, r5 bl LZ77UnCompWram ldr r0, [r7] adds r5, r0, r5 - ldr r4, _080CC860 + ldr r4, =0x000006fb adds r1, r0, r4 ldrb r1, [r1] lsls r1, 24 asrs r1, 24 - ldr r3, _080CC864 + ldr r3, =0x000002d2 adds r0, r3 ldrb r2, [r0] adds r0, r5, 0 @@ -418583,7 +404774,7 @@ _080CC7E6: cmp r0, 0 beq _080CC874 ldr r0, [r6, 0x8] - ldr r2, _080CC864 + ldr r2, =0x000002d2 adds r1, r2 ldrb r1, [r1] lsls r1, 21 @@ -418595,21 +404786,14 @@ _080CC7E6: bl gpu_pal_apply b _080CC888 .align 2, 0 -_080CC854: .4byte 0x02039d08 -_080CC858: .4byte 0x000006f9 -_080CC85C: .4byte 0x000006fa -_080CC860: .4byte 0x000006fb -_080CC864: .4byte 0x000002d2 -_080CC868: .4byte 0x00004ac4 -_080CC86C: .4byte 0x085775b8 -_080CC870: .4byte 0x00000792 + .pool _080CC874: ldr r0, [r6, 0x8] - ldr r2, _080CC8B4 + ldr r2, =0x000002d2 adds r1, r2 ldrb r1, [r1] lsls r1, 6 - ldr r2, _080CC8B8 + ldr r2, =0x02037794 adds r1, r2 movs r2, 0x20 bl CpuSet @@ -418618,15 +404802,15 @@ _080CC888: mov r1, sp bl malloc_and_decompress adds r1, r0, 0 - ldr r0, _080CC8BC + ldr r0, =0x02039d08 ldr r3, [r0] - ldr r2, _080CC8C0 + ldr r2, =0x00000a68 adds r0, r3, r2 str r1, [r0] ldr r2, [sp] lsls r2, 16 lsrs r2, 16 - ldr r0, _080CC8B4 + ldr r0, =0x000002d2 adds r3, r0 ldrb r3, [r3] lsls r3, 8 @@ -418634,30 +404818,27 @@ _080CC888: bl gpu_copy_bg_tile_pattern_data_to_vram b _080CC9DA .align 2, 0 -_080CC8B4: .4byte 0x000002d2 -_080CC8B8: .4byte 0x02037794 -_080CC8BC: .4byte 0x02039d08 -_080CC8C0: .4byte 0x00000a68 + .pool _080CC8C4: bl sub_80D24A8 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 - ldr r0, _080CC948 + ldr r0, =0x0857af44 adds r6, r1, r0 ldr r0, [r6, 0x4] ldr r1, [r7] - ldr r4, _080CC94C + ldr r4, =0x00000792 adds r1, r4 bl LZ77UnCompWram ldr r2, [r7] adds r0, r2, r4 - ldr r5, _080CC950 + ldr r5, =0x000006fb adds r1, r2, r5 ldrb r1, [r1] lsls r1, 24 asrs r1, 24 - ldr r3, _080CC954 + ldr r3, =0x000002d2 adds r2, r3 ldrb r2, [r2] bl sub_80CCA3C @@ -418668,13 +404849,13 @@ _080CC8C4: bl CpuSet bl sub_80D2510 ldr r1, [r7] - ldr r2, _080CC958 + ldr r2, =0x00000794 adds r1, r2 movs r2, 0x2 bl CpuSet bl sub_80D2510 ldr r1, [r7] - ldr r3, _080CC95C + ldr r3, =0x000007b4 adds r1, r3 movs r2, 0x2 bl CpuSet @@ -418685,7 +404866,7 @@ _080CC8C4: cmp r0, 0 beq _080CC960 adds r0, r1, r4 - ldr r2, _080CC954 + ldr r2, =0x000002d2 adds r1, r2 ldrb r1, [r1] lsls r1, 21 @@ -418697,20 +404878,15 @@ _080CC8C4: bl gpu_pal_apply b _080CC976 .align 2, 0 -_080CC948: .4byte 0x0857af44 -_080CC94C: .4byte 0x00000792 -_080CC950: .4byte 0x000006fb -_080CC954: .4byte 0x000002d2 -_080CC958: .4byte 0x00000794 -_080CC95C: .4byte 0x000007b4 + .pool _080CC960: - ldr r2, _080CC9E8 + ldr r2, =0x00000792 adds r0, r1, r2 - ldr r3, _080CC9EC + ldr r3, =0x000002d2 adds r1, r3 ldrb r1, [r1] lsls r1, 6 - ldr r2, _080CC9F0 + ldr r2, =0x02037794 adds r1, r2 movs r2, 0x20 bl CpuSet @@ -418718,12 +404894,12 @@ _080CC976: ldr r0, [r6] mov r1, sp bl malloc_and_decompress - ldr r6, _080CC9F4 + ldr r6, =0x02039d08 ldr r1, [r6] - ldr r5, _080CC9F8 + ldr r5, =0x00000a68 adds r1, r5 str r0, [r1] - ldr r4, _080CC9FC + ldr r4, =0x0857b004 bl sub_80D24DC lsls r0, 2 adds r0, r4 @@ -418753,7 +404929,7 @@ _080CC976: ldr r2, [sp] lsls r2, 16 lsrs r2, 16 - ldr r3, _080CC9EC + ldr r3, =0x000002d2 adds r0, r3 ldrb r3, [r0] lsls r3, 8 @@ -418767,12 +404943,7 @@ _080CC9DA: pop {r0} bx r0 .align 2, 0 -_080CC9E8: .4byte 0x00000792 -_080CC9EC: .4byte 0x000002d2 -_080CC9F0: .4byte 0x02037794 -_080CC9F4: .4byte 0x02039d08 -_080CC9F8: .4byte 0x00000a68 -_080CC9FC: .4byte 0x0857b004 + .pool thumb_func_end sub_80CC7A0 thumb_func_start sub_80CCA00 @@ -418786,16 +404957,16 @@ sub_80CCA00: @ 80CCA00 movs r0, 0 b _080CCA2E _080CCA12: - ldr r5, _080CCA34 + ldr r5, =0x02039d08 ldr r0, [r5] - ldr r1, _080CCA38 + ldr r1, =0x00000a68 adds r0, r1 ldr r0, [r0] cmp r0, 0 beq _080CCA2C bl free ldr r0, [r5] - ldr r1, _080CCA38 + ldr r1, =0x00000a68 adds r0, r1 str r4, [r0] _080CCA2C: @@ -418805,8 +404976,7 @@ _080CCA2E: pop {r1} bx r1 .align 2, 0 -_080CCA34: .4byte 0x02039d08 -_080CCA38: .4byte 0x00000a68 + .pool thumb_func_end sub_80CCA00 thumb_func_start sub_80CCA3C @@ -418817,7 +404987,7 @@ sub_80CCA3C: @ 80CCA3C lsls r2, 24 lsrs r2, 24 lsls r4, r2, 17 - ldr r0, _080CCAAC + ldr r0, =0x02039d08 ldr r0, [r0] movs r3, 0xB3 lsls r3, 2 @@ -418867,10 +405037,10 @@ sub_80CCA3C: @ 80CCA3C adds r0, r1 b _080CCAB6 .align 2, 0 -_080CCAAC: .4byte 0x02039d08 + .pool _080CCAB0: lsls r0, r6, 16 - ldr r3, _080CCADC + ldr r3, =0xfffc0000 adds r0, r3 _080CCAB6: lsrs r6, r0, 16 @@ -418892,14 +405062,14 @@ _080CCAD2: pop {r0} bx r0 .align 2, 0 -_080CCADC: .4byte 0xfffc0000 + .pool thumb_func_end sub_80CCA3C thumb_func_start sub_80CCAE0 sub_80CCAE0: @ 80CCAE0 push {r4-r6,lr} adds r2, r0, 0 - ldr r0, _080CCB0C + ldr r0, =0x02039d08 ldr r0, [r0] movs r1, 0xB3 lsls r1, 2 @@ -418919,7 +405089,7 @@ sub_80CCAE0: @ 80CCAE0 adds r0, r6 b _080CCB18 .align 2, 0 -_080CCB0C: .4byte 0x02039d08 + .pool _080CCB10: lsls r0, 1 movs r1, 0xC8 @@ -418938,7 +405108,7 @@ _080CCB20: adds r1, r3, 0 cmp r1, 0 bne _080CCB32 - ldr r6, _080CCB4C + ldr r6, =0xfffff7c0 adds r2, r6 _080CCB32: cmp r1, 0x20 @@ -418956,7 +405126,7 @@ _080CCB3C: pop {r0} bx r0 .align 2, 0 -_080CCB4C: .4byte 0xfffff7c0 + .pool thumb_func_end sub_80CCAE0 thumb_func_start sub_80CCB50 @@ -418971,7 +405141,7 @@ sub_80CCB50: @ 80CCB50 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _080CCCD0 + ldr r1, =0x02039d08 mov r10, r1 ldr r1, [r1] movs r2, 0xBE @@ -418981,13 +405151,13 @@ sub_80CCB50: @ 80CCB50 mov r3, sp adds r3, 0x24 str r3, [sp, 0x2C] - ldr r0, _080CCCD4 + ldr r0, =0x00030200 str r0, [r3, 0x4] - ldr r4, _080CCCD8 + ldr r4, =0x000006fc adds r1, r4 str r1, [sp, 0x14] add r0, sp, 0x18 - ldr r7, _080CCCDC + ldr r7, =0x0000dac9 strh r7, [r0] add r0, sp, 0x1C movs r1, 0 @@ -419002,7 +405172,7 @@ sub_80CCB50: @ 80CCB50 lsls r0, 24 mov r5, r10 ldr r4, [r5] - ldr r2, _080CCCE0 + ldr r2, =0x08577574 lsrs r0, 22 adds r1, r0, r2 ldrh r3, [r1] @@ -419013,7 +405183,7 @@ sub_80CCB50: @ 80CCB50 adds r2, 0x2 adds r0, r2 ldrh r0, [r0] - ldr r1, _080CCCE4 + ldr r1, =0x0000071a adds r4, r1 strh r0, [r4] add r0, sp, 0x4 @@ -419037,7 +405207,7 @@ sub_80CCB50: @ 80CCB50 lsls r5, 1 mov r9, r5 add r1, r9 - ldr r4, _080CCCE8 + ldr r4, =0x0000071c adds r2, r3, r4 strh r1, [r2] adds r3, r6 @@ -419056,7 +405226,7 @@ sub_80CCB50: @ 80CCB50 ldr r4, [r1] lsls r1, r0, 4 add r1, r9 - ldr r3, _080CCCEC + ldr r3, =0x0000071e adds r2, r4, r3 strh r1, [r2] adds r6, r4, r6 @@ -419064,7 +405234,7 @@ sub_80CCB50: @ 80CCB50 ldr r0, [r6] orrs r0, r5 str r0, [r6] - ldr r5, _080CCCF0 + ldr r5, =0x000021b8 adds r4, r5 mov r0, r8 bl sav3_get_box_name @@ -419098,14 +405268,14 @@ _080CCC70: adds r1, r6, r1 lsls r1, 16 asrs r1, 16 - ldr r0, _080CCCF4 + ldr r0, =0x0857b0a8 movs r2, 0x1C movs r3, 0x18 bl obj_add_from_template_forward_search adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r5, _080CCCD0 + ldr r5, =0x02039d08 ldr r2, [r5] lsls r0, r4, 2 movs r3, 0xE4 @@ -419115,7 +405285,7 @@ _080CCC70: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080CCCF8 + ldr r1, =0x02020630 adds r0, r1 str r0, [r2] lsls r1, r4, 24 @@ -419141,17 +405311,7 @@ _080CCC70: pop {r0} bx r0 .align 2, 0 -_080CCCD0: .4byte 0x02039d08 -_080CCCD4: .4byte 0x00030200 -_080CCCD8: .4byte 0x000006fc -_080CCCDC: .4byte 0x0000dac9 -_080CCCE0: .4byte 0x08577574 -_080CCCE4: .4byte 0x0000071a -_080CCCE8: .4byte 0x0000071c -_080CCCEC: .4byte 0x0000071e -_080CCCF0: .4byte 0x000021b8 -_080CCCF4: .4byte 0x0857b0a8 -_080CCCF8: .4byte 0x02020630 + .pool thumb_func_end sub_80CCB50 thumb_func_start sub_80CCCFC @@ -419168,22 +405328,22 @@ sub_80CCCFC: @ 80CCCFC lsls r1, 24 lsrs r1, 24 mov r10, r1 - ldr r4, _080CCD78 + ldr r4, =0x02039d08 ldr r2, [r4] movs r1, 0xBE lsls r1, 2 adds r0, r2, r1 str r0, [sp, 0x1C] add r3, sp, 0x1C - ldr r5, _080CCD7C + ldr r5, =0x0000ffff mov r12, r5 movs r6, 0xC0 lsls r6, 10 mov r9, r6 - ldr r0, _080CCD80 + ldr r0, =0x00030200 str r0, [r3, 0x4] add r1, sp, 0x4 - ldr r0, _080CCD84 + ldr r0, =0x0857b0a8 ldm r0!, {r5-r7} stm r1!, {r5-r7} ldm r0!, {r5-r7} @@ -419213,17 +405373,13 @@ _080CCD50: orrs r0, r3 str r0, [r6, 0x4] ldr r0, [r7] - ldr r5, _080CCD88 + ldr r5, =0x0000071c adds r0, r5 ldrh r0, [r0] mov r9, r0 b _080CCDB0 .align 2, 0 -_080CCD78: .4byte 0x02039d08 -_080CCD7C: .4byte 0x0000ffff -_080CCD80: .4byte 0x00030200 -_080CCD84: .4byte 0x0857b0a8 -_080CCD88: .4byte 0x0000071c + .pool _080CCD8C: ldr r0, [r6, 0x4] mov r7, r12 @@ -419234,19 +405390,19 @@ _080CCD8C: str r0, [r6, 0x4] mov r1, r8 ldr r0, [r1] - ldr r3, _080CCEC4 + ldr r3, =0x0000071c adds r0, r3 ldrh r0, [r0] mov r9, r0 add r1, sp, 0x4 movs r0, 0x4 strh r0, [r1] - ldr r0, _080CCEC8 + ldr r0, =0x0000dac9 strh r0, [r1, 0x2] _080CCDB0: mov r5, r8 ldr r4, [r5] - ldr r5, _080CCECC + ldr r5, =0x000021b8 adds r4, r5 ldr r0, [sp, 0x28] bl sav3_get_box_name @@ -419273,7 +405429,7 @@ _080CCDB0: bl sub_80D20F8 lsls r0, 24 lsrs r0, 22 - ldr r1, _080CCED0 + ldr r1, =0x08577574 adds r0, r1 mov r1, r9 movs r2, 0x4 @@ -419323,7 +405479,7 @@ _080CCE2E: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080CCED4 + ldr r0, =0x02020630 adds r1, r0 str r1, [r2] mov r0, r8 @@ -419341,7 +405497,7 @@ _080CCE2E: movs r6, 0 strh r6, [r0, 0x32] ldr r0, [r2] - ldr r1, _080CCED8 + ldr r1, =sub_80CCF30 + 1 str r1, [r0, 0x1C] lsls r1, r7, 24 lsrs r1, 24 @@ -419358,7 +405514,7 @@ _080CCE2E: movs r1, 0x1 strh r1, [r2, 0x30] ldr r1, [r0] - ldr r0, _080CCEDC + ldr r0, =sub_80CCF64 + 1 str r0, [r1, 0x1C] adds r0, r7, 0x1 lsls r0, 16 @@ -419374,19 +405530,13 @@ _080CCE2E: pop {r0} bx r0 .align 2, 0 -_080CCEC4: .4byte 0x0000071c -_080CCEC8: .4byte 0x0000dac9 -_080CCECC: .4byte 0x000021b8 -_080CCED0: .4byte 0x08577574 -_080CCED4: .4byte 0x02020630 -_080CCED8: .4byte sub_80CCF30 + 1 -_080CCEDC: .4byte sub_80CCF64 + 1 + .pool thumb_func_end sub_80CCCFC thumb_func_start sub_80CCEE0 sub_80CCEE0: @ 80CCEE0 push {lr} - ldr r0, _080CCEFC + ldr r0, =0x02039d08 ldr r0, [r0] movs r1, 0xDF lsls r1, 3 @@ -419398,12 +405548,12 @@ sub_80CCEE0: @ 80CCEE0 bl gpu_tile_obj_free_by_tag b _080CCF06 .align 2, 0 -_080CCEFC: .4byte 0x02039d08 + .pool _080CCF00: movs r0, 0x3 bl gpu_tile_obj_free_by_tag _080CCF06: - ldr r0, _080CCF28 + ldr r0, =0x02039d08 ldr r0, [r0] movs r3, 0xE4 lsls r3, 3 @@ -419412,7 +405562,7 @@ _080CCF06: adds r1, r0, r3 ldr r1, [r1] str r1, [r2] - ldr r2, _080CCF2C + ldr r2, =0x00000724 adds r1, r0, r2 adds r3, 0x4 adds r0, r3 @@ -419421,8 +405571,7 @@ _080CCF06: pop {r0} bx r0 .align 2, 0 -_080CCF28: .4byte 0x02039d08 -_080CCF2C: .4byte 0x00000724 + .pool thumb_func_end sub_80CCEE0 thumb_func_start sub_80CCF30 @@ -419448,13 +405597,13 @@ _080CCF44: ldrsh r1, [r2, r3] cmp r0, r1 bne _080CCF5C - ldr r0, _080CCF60 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _080CCF5C: pop {r0} bx r0 .align 2, 0 -_080CCF60: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80CCF30 thumb_func_start sub_80CCF64 @@ -419498,7 +405647,7 @@ sub_80CCF9C: @ 80CCF9C bl sub_80D20F8 lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _080CCFD8 + ldr r0, =0x02039d08 ldr r2, [r0] movs r3, 0xDF lsls r3, 3 @@ -419507,30 +405656,28 @@ sub_80CCF9C: @ 80CCF9C cmp r0, 0 bne _080CCFE4 lsls r0, r1, 2 - ldr r1, _080CCFDC + ldr r1, =0x08577574 adds r0, r1 adds r3, 0x24 adds r1, r2, r3 ldrh r1, [r1] lsls r1, 1 - ldr r2, _080CCFE0 + ldr r2, =0x02037714 adds r1, r2 movs r2, 0x2 bl CpuSet b _080CCFFC .align 2, 0 -_080CCFD8: .4byte 0x02039d08 -_080CCFDC: .4byte 0x08577574 -_080CCFE0: .4byte 0x02037714 + .pool _080CCFE4: lsls r0, r1, 2 - ldr r1, _080CD000 + ldr r1, =0x08577574 adds r0, r1 - ldr r3, _080CD004 + ldr r3, =0x0000071e adds r1, r2, r3 ldrh r1, [r1] lsls r1, 1 - ldr r2, _080CD008 + ldr r2, =0x02037714 adds r1, r2 movs r2, 0x2 bl CpuSet @@ -419538,9 +405685,7 @@ _080CCFFC: pop {r0} bx r0 .align 2, 0 -_080CD000: .4byte 0x08577574 -_080CD004: .4byte 0x0000071e -_080CD008: .4byte 0x02037714 + .pool thumb_func_end sub_80CCF9C thumb_func_start sub_80CD00C @@ -419565,7 +405710,7 @@ sub_80CD00C: @ 80CD00C thumb_func_start sub_80CD02C sub_80CD02C: @ 80CD02C push {r4,r5,lr} - ldr r0, _080CD0A8 + ldr r0, =0x0857b080 bl gpu_tile_obj_alloc_tag_and_copy_to_vram movs r5, 0 _080CD036: @@ -419576,7 +405721,7 @@ _080CD036: lsls r0, 15 adds r1, r0 asrs r1, 16 - ldr r0, _080CD0AC + ldr r0, =0x0857b0e0 movs r2, 0x1C movs r3, 0x16 bl obj_add_from_template_forward_search @@ -419587,7 +405732,7 @@ _080CD036: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080CD0B0 + ldr r1, =0x02020630 adds r4, r0, r1 lsls r1, r5, 24 lsrs r1, 24 @@ -419601,7 +405746,7 @@ _080CD036: adds r0, r1, 0 _080CD076: strh r0, [r4, 0x34] - ldr r0, _080CD0B4 + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r5, 2 movs r2, 0xE6 @@ -419626,10 +405771,7 @@ _080CD0A2: pop {r0} bx r0 .align 2, 0 -_080CD0A8: .4byte 0x0857b080 -_080CD0AC: .4byte 0x0857b0e0 -_080CD0B0: .4byte 0x02020630 -_080CD0B4: .4byte 0x02039d08 + .pool thumb_func_end sub_80CD02C thumb_func_start sub_80CD0B8 @@ -419638,7 +405780,7 @@ sub_80CD0B8: @ 80CD0B8 lsls r0, 24 lsrs r5, r0, 24 movs r2, 0 - ldr r7, _080CD10C + ldr r7, =0x02039d08 mov r12, r7 movs r6, 0xE6 lsls r6, 3 @@ -419669,7 +405811,7 @@ _080CD0CC: ldr r2, [r3] movs r0, 0x1D strh r0, [r2, 0x30] - ldr r0, _080CD110 + ldr r0, =0x00000734 adds r1, r0 ldr r2, [r1] movs r0, 0x5 @@ -419678,8 +405820,7 @@ _080CD0CC: movs r2, 0x48 b _080CD130 .align 2, 0 -_080CD10C: .4byte 0x02039d08 -_080CD110: .4byte 0x00000734 + .pool _080CD114: ldr r1, [r7] movs r2, 0xE6 @@ -419688,7 +405829,7 @@ _080CD114: ldr r2, [r3] movs r0, 0x5 strh r0, [r2, 0x30] - ldr r0, _080CD154 + ldr r0, =0x00000734 adds r1, r0 ldr r2, [r1] movs r0, 0x1D @@ -419706,7 +405847,7 @@ _080CD130: ldr r2, [r0] movs r0, 0 strh r0, [r2, 0x3C] - ldr r0, _080CD154 + ldr r0, =0x00000734 adds r1, r0 ldr r1, [r1] movs r0, 0x1 @@ -419715,7 +405856,7 @@ _080CD130: pop {r0} bx r0 .align 2, 0 -_080CD154: .4byte 0x00000734 + .pool thumb_func_end sub_80CD0B8 thumb_func_start sub_80CD158 @@ -419725,7 +405866,7 @@ sub_80CD158: @ 80CD158 movs r5, 0 movs r6, 0x5 negs r6, r6 - ldr r4, _080CD1A4 + ldr r4, =0x02039d08 _080CD164: ldr r1, [r4] lsls r0, r3, 2 @@ -419758,7 +405899,7 @@ _080CD164: pop {r0} bx r0 .align 2, 0 -_080CD1A4: .4byte 0x02039d08 + .pool thumb_func_end sub_80CD158 thumb_func_start sub_80CD1A8 @@ -419768,7 +405909,7 @@ sub_80CD1A8: @ 80CD1A8 cmp r0, 0 beq _080CD1E4 movs r2, 0 - ldr r6, _080CD1E0 + ldr r6, =0x02039d08 movs r5, 0xE6 lsls r5, 3 movs r3, 0 @@ -419793,10 +405934,10 @@ _080CD1BC: bls _080CD1BC b _080CD204 .align 2, 0 -_080CD1E0: .4byte 0x02039d08 + .pool _080CD1E4: movs r2, 0 - ldr r5, _080CD20C + ldr r5, =0x02039d08 movs r4, 0xE6 lsls r4, 3 movs r3, 0 @@ -419817,7 +405958,7 @@ _080CD204: pop {r0} bx r0 .align 2, 0 -_080CD20C: .4byte 0x02039d08 + .pool thumb_func_end sub_80CD1A8 thumb_func_start sub_80CD210 @@ -419829,12 +405970,12 @@ sub_80CD210: @ 80CD210 cmp r0, 0x4 bhi _080CD2DC lsls r0, 2 - ldr r1, _080CD228 + ldr r1, =_080CD22C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CD228: .4byte _080CD22C + .pool .align 2, 0 _080CD22C: .4byte _080CD240 @@ -419875,9 +406016,9 @@ _080CD274: strh r0, [r2, 0x2E] b _080CD2DC _080CD27A: - ldr r0, _080CD2C4 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r0, _080CD2C8 + ldr r0, =0x000002ce adds r1, r0 ldrh r0, [r2, 0x20] ldrh r1, [r1] @@ -419914,12 +406055,11 @@ _080CD2A0: strh r0, [r2, 0x2E] b _080CD2DC .align 2, 0 -_080CD2C4: .4byte 0x02039d08 -_080CD2C8: .4byte 0x000002ce + .pool _080CD2CC: - ldr r0, _080CD2E0 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CD2E4 + ldr r1, =0x000002ce adds r0, r1 ldrh r1, [r2, 0x20] ldrh r0, [r0] @@ -419929,8 +406069,7 @@ _080CD2DC: pop {r0} bx r0 .align 2, 0 -_080CD2E0: .4byte 0x02039d08 -_080CD2E4: .4byte 0x000002ce + .pool thumb_func_end sub_80CD210 thumb_func_start sub_80CD2E8 @@ -419948,7 +406087,7 @@ sub_80CD2E8: @ 80CD2E8 mov r8, r3 lsls r4, 24 lsrs r4, 24 - ldr r0, _080CD354 + ldr r0, =0x0857b0e0 lsls r5, 16 asrs r5, 16 lsls r6, 16 @@ -419966,7 +406105,7 @@ sub_80CD2E8: @ 80CD2E8 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r5, _080CD358 + ldr r5, =0x02020630 adds r6, r4, r5 adds r0, r6, 0 bl obj_anim_image_start @@ -419982,14 +406121,12 @@ sub_80CD2E8: @ 80CD2E8 strb r0, [r6, 0x5] adds r5, 0x1C adds r4, r5 - ldr r0, _080CD35C + ldr r0, =nullsub_12 + 1 str r0, [r4] adds r0, r6, 0 b _080CD362 .align 2, 0 -_080CD354: .4byte 0x0857b0e0 -_080CD358: .4byte 0x02020630 -_080CD35C: .4byte nullsub_12 + 1 + .pool _080CD360: movs r0, 0 _080CD362: @@ -420003,59 +406140,50 @@ _080CD362: thumb_func_start sub_80CD36C sub_80CD36C: @ 80CD36C push {lr} - ldr r0, _080CD380 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r1, [r0, 0x1] cmp r1, 0x1 beq _080CD388 - ldr r1, _080CD384 + ldr r1, =0x02039d78 movs r0, 0 strb r0, [r1] b _080CD38C .align 2, 0 -_080CD380: .4byte 0x02039d08 -_080CD384: .4byte 0x02039d78 + .pool _080CD388: - ldr r0, _080CD3C8 + ldr r0, =0x02039d78 strb r1, [r0] _080CD38C: - ldr r0, _080CD3CC + ldr r0, =0x02039d79 movs r1, 0 strb r1, [r0] - ldr r0, _080CD3D0 + ldr r0, =0x02039d7a strb r1, [r0] - ldr r0, _080CD3D4 + ldr r0, =0x02039d7b strb r1, [r0] - ldr r0, _080CD3D8 + ldr r0, =0x02039d7c strb r1, [r0] - ldr r0, _080CD3DC + ldr r0, =0x02039d7d strb r1, [r0] bl sub_80CDC0C bl sub_80CFC14 - ldr r2, _080CD3E0 + ldr r2, =0x02039d08 ldr r0, [r2] - ldr r1, _080CD3E4 + ldr r1, =0x00000cd6 adds r0, r1 movs r3, 0 movs r1, 0x1 strb r1, [r0] ldr r0, [r2] - ldr r1, _080CD3E8 + ldr r1, =0x000021ff adds r0, r1 strb r3, [r0] bl sub_80CEB40 pop {r0} bx r0 .align 2, 0 -_080CD3C8: .4byte 0x02039d78 -_080CD3CC: .4byte 0x02039d79 -_080CD3D0: .4byte 0x02039d7a -_080CD3D4: .4byte 0x02039d7b -_080CD3D8: .4byte 0x02039d7c -_080CD3DC: .4byte 0x02039d7d -_080CD3E0: .4byte 0x02039d08 -_080CD3E4: .4byte 0x00000cd6 -_080CD3E8: .4byte 0x000021ff + .pool thumb_func_end sub_80CD36C thumb_func_start sub_80CD3EC @@ -420063,25 +406191,25 @@ sub_80CD3EC: @ 80CD3EC push {lr} bl sub_80CFC14 bl sub_80CEBDC - ldr r3, _080CD42C + ldr r3, =0x02039d08 ldr r0, [r3] - ldr r1, _080CD430 + ldr r1, =0x00000cd6 adds r0, r1 movs r2, 0 movs r1, 0x1 strb r1, [r0] ldr r0, [r3] - ldr r1, _080CD434 + ldr r1, =0x000021ff adds r0, r1 strb r2, [r0] - ldr r0, _080CD438 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CD426 ldr r0, [r3] - ldr r1, _080CD43C + ldr r1, =0x000020a4 adds r0, r1 - ldr r1, _080CD440 + ldr r1, =0x02039d14 movs r2, 0x64 bl memcpy bl sub_80CAFC4 @@ -420089,12 +406217,7 @@ _080CD426: pop {r0} bx r0 .align 2, 0 -_080CD42C: .4byte 0x02039d08 -_080CD430: .4byte 0x00000cd6 -_080CD434: .4byte 0x000021ff -_080CD438: .4byte 0x02039d7a -_080CD43C: .4byte 0x000020a4 -_080CD440: .4byte 0x02039d14 + .pool thumb_func_end sub_80CD3EC thumb_func_start sub_80CD444 @@ -420109,12 +406232,12 @@ sub_80CD444: @ 80CD444 cmp r0, 0x4 bhi _080CD4FC lsls r0, 2 - ldr r1, _080CD460 + ldr r1, =_080CD464 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CD460: .4byte _080CD464 + .pool .align 2, 0 _080CD464: .4byte _080CD478 @@ -420173,7 +406296,7 @@ _080CD4CE: movs r0, 0xC b _080CD4FA _080CD4D6: - ldr r0, _080CD4F0 + ldr r0, =0x02039d7a ldrb r0, [r0] movs r1, 0xE cmp r0, 0 @@ -420187,7 +406310,7 @@ _080CD4E2: strh r0, [r4] b _080CD4FC .align 2, 0 -_080CD4F0: .4byte 0x02039d7a + .pool _080CD4F4: movs r0, 0xA0 strh r0, [r4] @@ -420203,7 +406326,7 @@ _080CD4FC: thumb_func_start sub_80CD504 sub_80CD504: @ 80CD504 push {lr} - ldr r0, _080CD52C + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -420211,22 +406334,20 @@ sub_80CD504: @ 80CD504 beq _080CD538 cmp r0, 0x1 bne _080CD54C - ldr r0, _080CD530 + ldr r0, =0x02039d79 movs r1, 0 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _080CD534 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr b _080CD542 .align 2, 0 -_080CD52C: .4byte 0x02039d78 -_080CD530: .4byte 0x02039d79 -_080CD534: .4byte 0x020244ec + .pool _080CD538: - ldr r0, _080CD548 + ldr r0, =0x02039d79 ldrb r0, [r0] movs r1, 0xB bl get_pokemon_data_from_selected_box @@ -420235,7 +406356,7 @@ _080CD542: lsrs r0, 16 b _080CD54E .align 2, 0 -_080CD548: .4byte 0x02039d79 + .pool _080CD54C: movs r0, 0 _080CD54E: @@ -420246,7 +406367,7 @@ _080CD54E: thumb_func_start sub_80CD554 sub_80CD554: @ 80CD554 push {r4-r7,lr} - ldr r7, _080CD570 + ldr r7, =0x02039d08 ldr r5, [r7] movs r0, 0xCD lsls r0, 4 @@ -420260,7 +406381,7 @@ sub_80CD554: @ 80CD554 movs r0, 0 b _080CD69A .align 2, 0 -_080CD570: .4byte 0x02039d08 + .pool _080CD574: bl sub_80D1218 lsls r0, 24 @@ -420272,9 +406393,9 @@ _080CD57E: lsls r0, 16 cmp r0, 0 beq _080CD67C - ldr r1, _080CD668 + ldr r1, =0x00000cbc adds r4, r5, r1 - ldr r2, _080CD66C + ldr r2, =0x00000cc4 adds r1, r5, r2 ldr r0, [r4] ldr r1, [r1] @@ -420289,7 +406410,7 @@ _080CD57E: ldr r1, [r1] adds r0, r1 str r0, [r3] - ldr r6, _080CD670 + ldr r6, =0x00000cb4 adds r1, r5, r6 ldr r2, [r1] ldr r0, [r4] @@ -420307,7 +406428,7 @@ _080CD57E: lsls r3, 1 cmp r0, r3 ble _080CD5DA - ldr r4, _080CD674 + ldr r4, =0xffffff00 adds r0, r2, r4 lsls r0, 16 asrs r0, 16 @@ -420362,7 +406483,7 @@ _080CD612: strh r1, [r2, 0x22] _080CD632: ldr r0, [r7] - ldr r2, _080CD678 + ldr r2, =0x00000cd7 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0 @@ -420389,21 +406510,17 @@ _080CD632: strb r0, [r2] b _080CD698 .align 2, 0 -_080CD668: .4byte 0x00000cbc -_080CD66C: .4byte 0x00000cc4 -_080CD670: .4byte 0x00000cb4 -_080CD674: .4byte 0xffffff00 -_080CD678: .4byte 0x00000cd7 + .pool _080CD67C: - ldr r3, _080CD6A0 + ldr r3, =0x00000cb4 adds r2, r5, r3 ldr r1, [r2] - ldr r4, _080CD6A4 + ldr r4, =0x00000ccc adds r0, r5, r4 ldrh r0, [r0] strh r0, [r1, 0x20] ldr r1, [r2] - ldr r2, _080CD6A8 + ldr r2, =0x00000cce adds r0, r5, r2 ldrh r0, [r0] strh r0, [r1, 0x22] @@ -420415,9 +406532,7 @@ _080CD69A: pop {r1} bx r1 .align 2, 0 -_080CD6A0: .4byte 0x00000cb4 -_080CD6A4: .4byte 0x00000ccc -_080CD6A8: .4byte 0x00000cce + .pool thumb_func_end sub_80CD554 thumb_func_start sub_80CD6AC @@ -420437,13 +406552,13 @@ sub_80CD6AC: @ 80CD6AC mov r2, sp adds r3, r6, 0 bl sub_80CD444 - ldr r1, _080CD6FC + ldr r1, =0x02039d08 ldr r0, [r1] - ldr r2, _080CD700 + ldr r2, =0x00000cd4 adds r0, r2 strb r4, [r0] ldr r0, [r1] - ldr r3, _080CD704 + ldr r3, =0x00000cd5 adds r0, r3 strb r5, [r0] ldr r1, [r1] @@ -420453,7 +406568,7 @@ sub_80CD6AC: @ 80CD6AC adds r0, r1, r3 strh r2, [r0] ldrh r0, [r6] - ldr r2, _080CD708 + ldr r2, =0x00000cce adds r1, r2 strh r0, [r1] add sp, 0x4 @@ -420461,18 +406576,15 @@ sub_80CD6AC: @ 80CD6AC pop {r0} bx r0 .align 2, 0 -_080CD6FC: .4byte 0x02039d08 -_080CD700: .4byte 0x00000cd4 -_080CD704: .4byte 0x00000cd5 -_080CD708: .4byte 0x00000cce + .pool thumb_func_end sub_80CD6AC thumb_func_start sub_80CD70C sub_80CD70C: @ 80CD70C push {r4-r7,lr} - ldr r0, _080CD728 + ldr r0, =0x02039d08 ldr r2, [r0] - ldr r3, _080CD72C + ldr r3, =0x00000cd2 adds r1, r2, r3 ldrh r1, [r1] adds r4, r0, 0 @@ -420484,8 +406596,7 @@ sub_80CD70C: @ 80CD70C movs r0, 0xC b _080CD738 .align 2, 0 -_080CD728: .4byte 0x02039d08 -_080CD72C: .4byte 0x00000cd2 + .pool _080CD730: movs r3, 0xCD lsls r3, 4 @@ -420494,7 +406605,7 @@ _080CD730: _080CD738: strh r0, [r1] ldr r1, [r4] - ldr r0, _080CD77C + ldr r0, =0x00000cd7 adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0 @@ -420507,7 +406618,7 @@ _080CD738: strb r0, [r2] _080CD752: ldr r2, [r4] - ldr r1, _080CD780 + ldr r1, =0x00000cd2 adds r0, r2, r1 movs r1, 0 ldrsb r1, [r0, r1] @@ -420517,27 +406628,24 @@ _080CD752: beq _080CD78C cmp r1, 0x1 beq _080CD7AC - ldr r3, _080CD784 + ldr r3, =0x00000cce adds r0, r2, r3 movs r3, 0 ldrsh r1, [r0, r3] - ldr r3, _080CD788 + ldr r3, =0x00000cb4 adds r0, r2, r3 ldr r0, [r0] movs r2, 0x22 ldrsh r0, [r0, r2] b _080CD7C0 .align 2, 0 -_080CD77C: .4byte 0x00000cd7 -_080CD780: .4byte 0x00000cd2 -_080CD784: .4byte 0x00000cce -_080CD788: .4byte 0x00000cb4 + .pool _080CD78C: - ldr r3, _080CD7A4 + ldr r3, =0x00000cce adds r0, r2, r3 movs r3, 0 ldrsh r1, [r0, r3] - ldr r3, _080CD7A8 + ldr r3, =0x00000cb4 adds r0, r2, r3 ldr r0, [r0] movs r2, 0x22 @@ -420545,14 +406653,13 @@ _080CD78C: adds r0, 0xC0 b _080CD7C0 .align 2, 0 -_080CD7A4: .4byte 0x00000cce -_080CD7A8: .4byte 0x00000cb4 + .pool _080CD7AC: - ldr r3, _080CD7EC + ldr r3, =0x00000cce adds r0, r2, r3 movs r3, 0 ldrsh r1, [r0, r3] - ldr r3, _080CD7F0 + ldr r3, =0x00000cb4 adds r0, r2, r3 ldr r0, [r0] movs r2, 0x22 @@ -420561,7 +406668,7 @@ _080CD7AC: _080CD7C0: subs r7, r1, r0 ldr r2, [r4] - ldr r3, _080CD7F4 + ldr r3, =0x00000cd3 adds r0, r2, r3 movs r1, 0 ldrsb r1, [r0, r1] @@ -420571,27 +406678,24 @@ _080CD7C0: beq _080CD7FC cmp r1, 0x1 beq _080CD81C - ldr r1, _080CD7F8 + ldr r1, =0x00000ccc adds r0, r2, r1 movs r3, 0 ldrsh r1, [r0, r3] - ldr r3, _080CD7F0 + ldr r3, =0x00000cb4 adds r0, r2, r3 ldr r0, [r0] movs r2, 0x20 ldrsh r0, [r0, r2] b _080CD830 .align 2, 0 -_080CD7EC: .4byte 0x00000cce -_080CD7F0: .4byte 0x00000cb4 -_080CD7F4: .4byte 0x00000cd3 -_080CD7F8: .4byte 0x00000ccc + .pool _080CD7FC: - ldr r3, _080CD814 + ldr r3, =0x00000ccc adds r0, r2, r3 movs r3, 0 ldrsh r1, [r0, r3] - ldr r3, _080CD818 + ldr r3, =0x00000cb4 adds r0, r2, r3 ldr r0, [r0] movs r2, 0x20 @@ -420599,14 +406703,13 @@ _080CD7FC: adds r0, 0xC0 b _080CD830 .align 2, 0 -_080CD814: .4byte 0x00000ccc -_080CD818: .4byte 0x00000cb4 + .pool _080CD81C: - ldr r3, _080CD880 + ldr r3, =0x00000ccc adds r0, r2, r3 movs r3, 0 ldrsh r1, [r0, r3] - ldr r3, _080CD884 + ldr r3, =0x00000cb4 adds r0, r2, r3 ldr r0, [r0] movs r2, 0x20 @@ -420617,7 +406720,7 @@ _080CD830: lsls r7, 8 lsls r0, 8 ldr r4, [r4] - ldr r3, _080CD888 + ldr r3, =0x00000cc4 adds r6, r4, r3 movs r1, 0xCD lsls r1, 4 @@ -420625,15 +406728,15 @@ _080CD830: ldrh r1, [r5] bl __divsi3 str r0, [r6] - ldr r2, _080CD88C + ldr r2, =0x00000cc8 adds r6, r4, r2 ldrh r1, [r5] adds r0, r7, 0 bl __divsi3 str r0, [r6] - ldr r3, _080CD890 + ldr r3, =0x00000cbc adds r2, r4, r3 - ldr r0, _080CD884 + ldr r0, =0x00000cb4 adds r1, r4, r0 ldr r0, [r1] movs r3, 0x20 @@ -420652,11 +406755,7 @@ _080CD830: pop {r0} bx r0 .align 2, 0 -_080CD880: .4byte 0x00000ccc -_080CD884: .4byte 0x00000cb4 -_080CD888: .4byte 0x00000cc4 -_080CD88C: .4byte 0x00000cc8 -_080CD890: .4byte 0x00000cbc + .pool thumb_func_end sub_80CD70C thumb_func_start sub_80CD894 @@ -420670,68 +406769,62 @@ sub_80CD894: @ 80CD894 adds r1, r6, 0 bl sub_80CD6AC bl sub_80CD70C - ldr r5, _080CD8D4 + ldr r5, =0x02039d08 ldr r1, [r5] ldrb r0, [r1, 0x1] cmp r0, 0x3 beq _080CD8E4 - ldr r2, _080CD8D8 + ldr r2, =0x000021ff adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 bne _080CD8FC - ldr r0, _080CD8DC + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 bne _080CD8FC - ldr r2, _080CD8E0 + ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r0, [r0] movs r1, 0x1 bl obj_anim_image_start b _080CD8FC .align 2, 0 -_080CD8D4: .4byte 0x02039d08 -_080CD8D8: .4byte 0x000021ff -_080CD8DC: .4byte 0x02039d7a -_080CD8E0: .4byte 0x00000cb4 + .pool _080CD8E4: bl sub_80D127C lsls r0, 24 cmp r0, 0 bne _080CD8FC ldr r0, [r5] - ldr r1, _080CD920 + ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0x1 bl obj_anim_image_start _080CD8FC: - ldr r0, _080CD924 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 bne _080CD95C - ldr r0, _080CD928 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 bne _080CD930 - ldr r0, _080CD92C + ldr r0, =0x02039d79 ldrb r1, [r0] movs r0, 0 bl sub_80D0E50 b _080CD93E .align 2, 0 -_080CD920: .4byte 0x00000cb4 -_080CD924: .4byte 0x02039d08 -_080CD928: .4byte 0x02039d78 -_080CD92C: .4byte 0x02039d79 + .pool _080CD930: cmp r0, 0x1 bne _080CD93E - ldr r0, _080CD94C + ldr r0, =0x02039d79 ldrb r1, [r0] movs r0, 0x1 bl sub_80D0E50 @@ -420743,7 +406836,7 @@ _080CD93E: bl sub_80D0D8C b _080CD95C .align 2, 0 -_080CD94C: .4byte 0x02039d79 + .pool _080CD950: cmp r4, 0x1 bne _080CD988 @@ -420753,19 +406846,19 @@ _080CD950: _080CD95C: cmp r4, 0x1 bne _080CD988 - ldr r0, _080CD9D0 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 beq _080CD988 - ldr r1, _080CD9D4 + ldr r1, =0x02039d08 ldr r0, [r1] - ldr r2, _080CD9D8 + ldr r2, =0x00000cd6 adds r0, r2 strb r4, [r0] ldr r0, [r1] - ldr r1, _080CD9DC + ldr r1, =0x00000cb8 adds r0, r1 ldr r1, [r0] adds r1, 0x3E @@ -420780,9 +406873,9 @@ _080CD988: blt _080CDA56 cmp r4, 0x3 bgt _080CDA56 - ldr r5, _080CD9D4 + ldr r5, =0x02039d08 ldr r0, [r5] - ldr r2, _080CD9E0 + ldr r2, =0x00000cb4 adds r0, r2 ldr r4, [r0] ldrb r1, [r4, 0x5] @@ -420794,7 +406887,7 @@ _080CD988: orrs r0, r3 strb r0, [r4, 0x5] ldr r0, [r5] - ldr r4, _080CD9DC + ldr r4, =0x00000cb8 adds r0, r4 ldr r1, [r0] adds r1, 0x3E @@ -420810,20 +406903,16 @@ _080CD988: strb r2, [r1, 0x5] b _080CDA56 .align 2, 0 -_080CD9D0: .4byte 0x02039d78 -_080CD9D4: .4byte 0x02039d08 -_080CD9D8: .4byte 0x00000cd6 -_080CD9DC: .4byte 0x00000cb8 -_080CD9E0: .4byte 0x00000cb4 + .pool _080CD9E4: - ldr r3, _080CDA18 + ldr r3, =0x02039d08 ldr r1, [r3] - ldr r2, _080CDA1C + ldr r2, =0x000021ff adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080CDA28 - ldr r2, _080CDA20 + ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r2, [r0] ldrb r1, [r2, 0x5] @@ -420832,7 +406921,7 @@ _080CD9E4: ands r0, r1 strb r0, [r2, 0x5] ldr r0, [r3] - ldr r1, _080CDA24 + ldr r1, =0x00000cb8 adds r0, r1 ldr r1, [r0] adds r1, 0x3E @@ -420842,12 +406931,9 @@ _080CD9E4: strb r0, [r1] b _080CDA56 .align 2, 0 -_080CDA18: .4byte 0x02039d08 -_080CDA1C: .4byte 0x000021ff -_080CDA20: .4byte 0x00000cb4 -_080CDA24: .4byte 0x00000cb8 + .pool _080CDA28: - ldr r2, _080CDA5C + ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r2, [r0] ldrb r1, [r2, 0x5] @@ -420857,13 +406943,13 @@ _080CDA28: movs r1, 0x8 orrs r0, r1 strb r0, [r2, 0x5] - ldr r0, _080CDA60 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 bne _080CDA56 - ldr r0, _080CDA64 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CDA56 @@ -420874,22 +406960,20 @@ _080CDA56: pop {r0} bx r0 .align 2, 0 -_080CDA5C: .4byte 0x00000cb4 -_080CDA60: .4byte 0x02039d78 -_080CDA64: .4byte 0x02039d7a + .pool thumb_func_end sub_80CD894 thumb_func_start sub_80CDA68 sub_80CDA68: @ 80CDA68 push {r4,lr} - ldr r1, _080CDAA8 - ldr r4, _080CDAAC + ldr r1, =0x02039d78 + ldr r4, =0x02039d08 ldr r2, [r4] - ldr r3, _080CDAB0 + ldr r3, =0x00000cd4 adds r0, r2, r3 ldrb r0, [r0] strb r0, [r1] - ldr r1, _080CDAB4 + ldr r1, =0x02039d79 adds r3, 0x1 adds r0, r2, r3 ldrb r0, [r0] @@ -420897,12 +406981,12 @@ sub_80CDA68: @ 80CDA68 ldrb r0, [r2, 0x1] cmp r0, 0x3 beq _080CDAC0 - ldr r1, _080CDAB8 + ldr r1, =0x000021ff adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 bne _080CDAD8 - ldr r0, _080CDABC + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 bne _080CDAD8 @@ -420913,26 +406997,21 @@ sub_80CDA68: @ 80CDA68 bl obj_anim_image_start b _080CDAD8 .align 2, 0 -_080CDAA8: .4byte 0x02039d78 -_080CDAAC: .4byte 0x02039d08 -_080CDAB0: .4byte 0x00000cd4 -_080CDAB4: .4byte 0x02039d79 -_080CDAB8: .4byte 0x000021ff -_080CDABC: .4byte 0x02039d7a + .pool _080CDAC0: bl sub_80D127C lsls r0, 24 cmp r0, 0 bne _080CDAD8 ldr r0, [r4] - ldr r1, _080CDAF4 + ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0 bl obj_anim_image_start _080CDAD8: bl sub_80CEB40 - ldr r0, _080CDAF8 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -420944,8 +407023,7 @@ _080CDAD8: beq _080CDB30 b _080CDB8A .align 2, 0 -_080CDAF4: .4byte 0x00000cb4 -_080CDAF8: .4byte 0x02039d78 + .pool _080CDAFC: cmp r0, 0x2 beq _080CDB06 @@ -420957,9 +407035,9 @@ _080CDB06: bl sub_80CD1A8 b _080CDB8A _080CDB0E: - ldr r0, _080CDB28 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r2, _080CDB2C + ldr r2, =0x00000cb8 adds r0, r2 ldr r0, [r0] adds r0, 0x43 @@ -420970,17 +407048,16 @@ _080CDB1E: bl sub_80CC0D4 b _080CDB8A .align 2, 0 -_080CDB28: .4byte 0x02039d08 -_080CDB2C: .4byte 0x00000cb8 + .pool _080CDB30: - ldr r4, _080CDB90 + ldr r4, =0x02039d08 ldr r1, [r4] - ldr r3, _080CDB94 + ldr r3, =0x000021ff adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 bne _080CDB8A - ldr r2, _080CDB98 + ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r3, [r0] ldrb r1, [r3, 0x5] @@ -420992,7 +407069,7 @@ _080CDB30: orrs r0, r1 strb r0, [r3, 0x5] ldr r0, [r4] - ldr r3, _080CDB9C + ldr r3, =0x00000cb8 adds r0, r3 ldr r1, [r0] ldrb r0, [r1, 0x5] @@ -421022,23 +407099,20 @@ _080CDB8A: pop {r0} bx r0 .align 2, 0 -_080CDB90: .4byte 0x02039d08 -_080CDB94: .4byte 0x000021ff -_080CDB98: .4byte 0x00000cb4 -_080CDB9C: .4byte 0x00000cb8 + .pool thumb_func_end sub_80CDA68 thumb_func_start sub_80CDBA0 sub_80CDBA0: @ 80CDBA0 push {lr} - ldr r0, _080CDBB0 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 bne _080CDBB4 movs r3, 0 b _080CDBC2 .align 2, 0 -_080CDBB0: .4byte 0x02039d7a + .pool _080CDBB4: bl calc_player_party_count lsls r0, 24 @@ -421047,9 +407121,9 @@ _080CDBB4: bls _080CDBC2 movs r3, 0x5 _080CDBC2: - ldr r0, _080CDBEC + ldr r0, =0x02039d08 ldr r2, [r0] - ldr r1, _080CDBF0 + ldr r1, =0x00000cb4 adds r0, r2, r1 ldr r0, [r0] adds r0, 0x3F @@ -421058,7 +407132,7 @@ _080CDBC2: ands r0, r1 cmp r0, 0 beq _080CDBE0 - ldr r0, _080CDBF4 + ldr r0, =0x00000cd7 adds r1, r2, r0 movs r0, 0x1 strb r0, [r1] @@ -421069,9 +407143,7 @@ _080CDBE0: pop {r0} bx r0 .align 2, 0 -_080CDBEC: .4byte 0x02039d08 -_080CDBF0: .4byte 0x00000cb4 -_080CDBF4: .4byte 0x00000cd7 + .pool thumb_func_end sub_80CDBA0 thumb_func_start sub_80CDBF8 @@ -421088,43 +407160,42 @@ sub_80CDBF8: @ 80CDBF8 thumb_func_start sub_80CDC0C sub_80CDC0C: @ 80CDC0C - ldr r1, _080CDC14 + ldr r1, =0x02039d7e movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_080CDC14: .4byte 0x02039d7e + .pool thumb_func_end sub_80CDC0C thumb_func_start sub_80CDC18 sub_80CDC18: @ 80CDC18 - ldr r0, _080CDC24 - ldr r1, _080CDC28 + ldr r0, =0x02039d7e + ldr r1, =0x02039d79 ldrb r1, [r1] strb r1, [r0] bx lr .align 2, 0 -_080CDC24: .4byte 0x02039d7e -_080CDC28: .4byte 0x02039d79 + .pool thumb_func_end sub_80CDC18 thumb_func_start sub_80CDC2C sub_80CDC2C: @ 80CDC2C - ldr r0, _080CDC34 + ldr r0, =0x02039d7e ldrb r0, [r0] bx lr .align 2, 0 -_080CDC34: .4byte 0x02039d7e + .pool thumb_func_end sub_80CDC2C thumb_func_start sub_80CDC38 sub_80CDC38: @ 80CDC38 lsls r0, 24 - ldr r1, _080CDC58 + ldr r1, =0x02039d08 ldr r1, [r1] - ldr r2, _080CDC5C + ldr r2, =0x00000d8c adds r3, r1, r2 - ldr r2, _080CDC60 + ldr r2, =0x0857b998 lsrs r0, 22 adds r0, r2 ldr r0, [r0] @@ -421136,9 +407207,7 @@ sub_80CDC38: @ 80CDC38 strb r0, [r1] bx lr .align 2, 0 -_080CDC58: .4byte 0x02039d08 -_080CDC5C: .4byte 0x00000d8c -_080CDC60: .4byte 0x0857b998 + .pool thumb_func_end sub_80CDC38 thumb_func_start sub_80CDC64 @@ -421147,22 +407216,20 @@ sub_80CDC64: @ 80CDC64 lsls r0, 24 cmp r0, 0 bne _080CDC84 - ldr r0, _080CDC78 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080CDC7C + ldr r2, =0x00000d8c adds r1, r2 - ldr r2, _080CDC80 + ldr r2, =sub_80CDEB4 + 1 b _080CDC8E .align 2, 0 -_080CDC78: .4byte 0x02039d08 -_080CDC7C: .4byte 0x00000d8c -_080CDC80: .4byte sub_80CDEB4 + 1 + .pool _080CDC84: - ldr r0, _080CDCA0 + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080CDCA4 + ldr r2, =0x00000d8c adds r1, r2 - ldr r2, _080CDCA8 + ldr r2, =sub_80CDEC4 + 1 _080CDC8E: str r2, [r1] ldr r0, [r0] @@ -421174,17 +407241,15 @@ _080CDC8E: pop {r0} bx r0 .align 2, 0 -_080CDCA0: .4byte 0x02039d08 -_080CDCA4: .4byte 0x00000d8c -_080CDCA8: .4byte sub_80CDEC4 + 1 + .pool thumb_func_end sub_80CDC64 thumb_func_start sub_80CDCAC sub_80CDCAC: @ 80CDCAC push {lr} - ldr r0, _080CDCC4 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CDCC8 + ldr r1, =0x00000d8c adds r0, r1 ldr r0, [r0] bl _call_via_r0 @@ -421193,14 +407258,13 @@ sub_80CDCAC: @ 80CDCAC pop {r1} bx r1 .align 2, 0 -_080CDCC4: .4byte 0x02039d08 -_080CDCC8: .4byte 0x00000d8c + .pool thumb_func_end sub_80CDCAC thumb_func_start sub_80CDCCC sub_80CDCCC: @ 80CDCCC push {r4,r5,lr} - ldr r4, _080CDCE8 + ldr r4, =0x02039d08 ldr r1, [r4] movs r5, 0xD9 lsls r5, 4 @@ -421214,7 +407278,7 @@ sub_80CDCCC: @ 80CDCCC beq _080CDCF6 b _080CDD54 .align 2, 0 -_080CDCE8: .4byte 0x02039d08 + .pool _080CDCEC: cmp r0, 0x2 beq _080CDD40 @@ -421222,7 +407286,7 @@ _080CDCEC: beq _080CDCFE b _080CDD54 _080CDCF6: - ldr r0, _080CDD04 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CDD08 @@ -421230,23 +407294,23 @@ _080CDCFE: movs r0, 0 b _080CDD56 .align 2, 0 -_080CDD04: .4byte 0x02039d7a + .pool _080CDD08: - ldr r2, _080CDD18 + ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r0, [r0] movs r1, 0x2 bl obj_anim_image_start b _080CDD4A .align 2, 0 -_080CDD18: .4byte 0x00000cb4 + .pool _080CDD1C: bl sub_80CDED4 lsls r0, 24 cmp r0, 0 bne _080CDD54 ldr r0, [r4] - ldr r1, _080CDD3C + ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0x3 @@ -421254,7 +407318,7 @@ _080CDD1C: bl sub_80CDF38 b _080CDD4A .align 2, 0 -_080CDD3C: .4byte 0x00000cb4 + .pool _080CDD40: bl sub_80CDF08 lsls r0, 24 @@ -421277,7 +407341,7 @@ _080CDD56: thumb_func_start sub_80CDD5C sub_80CDD5C: @ 80CDD5C push {r4,r5,lr} - ldr r4, _080CDD78 + ldr r4, =0x02039d08 ldr r0, [r4] movs r5, 0xD9 lsls r5, 4 @@ -421291,7 +407355,7 @@ sub_80CDD5C: @ 80CDD5C beq _080CDD82 b _080CDDD0 .align 2, 0 -_080CDD78: .4byte 0x02039d08 + .pool _080CDD7C: cmp r0, 0x2 beq _080CDDCC @@ -421302,7 +407366,7 @@ _080CDD82: cmp r0, 0 bne _080CDDD0 ldr r0, [r4] - ldr r1, _080CDDA0 + ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0x2 @@ -421310,14 +407374,14 @@ _080CDD82: bl sub_80CDFAC b _080CDDBC .align 2, 0 -_080CDDA0: .4byte 0x00000cb4 + .pool _080CDDA4: bl sub_80CDF08 lsls r0, 24 cmp r0, 0 bne _080CDDD0 ldr r0, [r4] - ldr r1, _080CDDC8 + ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0 @@ -421330,7 +407394,7 @@ _080CDDBC: strb r0, [r1] b _080CDDD0 .align 2, 0 -_080CDDC8: .4byte 0x00000cb4 + .pool _080CDDCC: movs r0, 0 b _080CDDD2 @@ -421345,7 +407409,7 @@ _080CDDD2: thumb_func_start sub_80CDDD8 sub_80CDDD8: @ 80CDDD8 push {r4,r5,lr} - ldr r4, _080CDDF4 + ldr r4, =0x02039d08 ldr r1, [r4] movs r5, 0xD9 lsls r5, 4 @@ -421359,13 +407423,13 @@ sub_80CDDD8: @ 80CDDD8 beq _080CDDFE b _080CDEAC .align 2, 0 -_080CDDF4: .4byte 0x02039d08 + .pool _080CDDF8: cmp r0, 0x2 beq _080CDEA8 b _080CDEAC _080CDDFE: - ldr r0, _080CDE18 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -421373,32 +407437,31 @@ _080CDDFE: beq _080CDE20 cmp r0, 0x1 bne _080CDEA8 - ldr r0, _080CDE1C + ldr r0, =0x00000d91 adds r1, r0 movs r0, 0xE b _080CDE2A .align 2, 0 -_080CDE18: .4byte 0x02039d78 -_080CDE1C: .4byte 0x00000d91 + .pool _080CDE20: bl get_preferred_box ldr r1, [r4] - ldr r2, _080CDE58 + ldr r2, =0x00000d91 adds r1, r2 _080CDE2A: strb r0, [r1] - ldr r4, _080CDE5C + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r1, _080CDE60 + ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0x2 bl obj_anim_image_start ldr r0, [r4] - ldr r2, _080CDE58 + ldr r2, =0x00000d91 adds r0, r2 ldrb r0, [r0] - ldr r1, _080CDE64 + ldr r1, =0x02039d79 ldrb r1, [r1] bl sub_80CBD5C ldr r1, [r4] @@ -421407,26 +407470,23 @@ _080CDE2A: adds r1, r0 b _080CDE94 .align 2, 0 -_080CDE58: .4byte 0x00000d91 -_080CDE5C: .4byte 0x02039d08 -_080CDE60: .4byte 0x00000cb4 -_080CDE64: .4byte 0x02039d79 + .pool _080CDE68: bl sub_80CBDC4 lsls r0, 24 cmp r0, 0 bne _080CDEAC ldr r0, [r4] - ldr r1, _080CDE9C + ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0x3 bl obj_anim_image_start ldr r0, [r4] - ldr r2, _080CDEA0 + ldr r2, =0x00000d91 adds r0, r2 ldrb r0, [r0] - ldr r1, _080CDEA4 + ldr r1, =0x02039d79 ldrb r1, [r1] bl diegohint1 ldr r1, [r4] @@ -421437,9 +407497,7 @@ _080CDE94: strb r0, [r1] b _080CDEAC .align 2, 0 -_080CDE9C: .4byte 0x00000cb4 -_080CDEA0: .4byte 0x00000d91 -_080CDEA4: .4byte 0x02039d79 + .pool _080CDEA8: movs r0, 0 b _080CDEAE @@ -421474,9 +407532,9 @@ sub_80CDEC4: @ 80CDEC4 thumb_func_start sub_80CDED4 sub_80CDED4: @ 80CDED4 push {lr} - ldr r0, _080CDEF4 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CDEF8 + ldr r1, =0x00000cb4 adds r0, r1 ldr r1, [r0] movs r2, 0x26 @@ -421491,8 +407549,7 @@ _080CDEEC: strh r0, [r1, 0x26] b _080CDF00 .align 2, 0 -_080CDEF4: .4byte 0x02039d08 -_080CDEF8: .4byte 0x00000cb4 + .pool _080CDEFC: movs r0, 0 b _080CDF02 @@ -421506,9 +407563,9 @@ _080CDF02: thumb_func_start sub_80CDF08 sub_80CDF08: @ 80CDF08 push {lr} - ldr r0, _080CDF28 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CDF2C + ldr r1, =0x00000cb4 adds r0, r1 ldr r1, [r0] movs r2, 0x26 @@ -421521,8 +407578,7 @@ sub_80CDF08: @ 80CDF08 movs r0, 0x1 b _080CDF32 .align 2, 0 -_080CDF28: .4byte 0x02039d08 -_080CDF2C: .4byte 0x00000cb4 + .pool _080CDF30: movs r0, 0 _080CDF32: @@ -421533,7 +407589,7 @@ _080CDF32: thumb_func_start sub_80CDF38 sub_80CDF38: @ 80CDF38 push {r4,lr} - ldr r0, _080CDF60 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -421541,7 +407597,7 @@ sub_80CDF38: @ 80CDF38 beq _080CDF68 cmp r0, 0x1 bne _080CDF94 - ldr r4, _080CDF64 + ldr r4, =0x02039d79 ldrb r1, [r4] movs r0, 0xE bl sub_80CE018 @@ -421550,12 +407606,11 @@ sub_80CDF38: @ 80CDF38 bl sub_80CBC14 b _080CDF8E .align 2, 0 -_080CDF60: .4byte 0x02039d78 -_080CDF64: .4byte 0x02039d79 + .pool _080CDF68: - ldr r0, _080CDF9C + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CDFA0 + ldr r1, =0x000021ff adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -421563,14 +407618,14 @@ _080CDF68: bl get_preferred_box lsls r0, 24 lsrs r0, 24 - ldr r4, _080CDFA4 + ldr r4, =0x02039d79 ldrb r1, [r4] bl sub_80CE018 ldrb r1, [r4] movs r0, 0x1 bl sub_80CBC14 _080CDF8E: - ldr r1, _080CDFA8 + ldr r1, =0x02039d7a movs r0, 0x1 strb r0, [r1] _080CDF94: @@ -421578,16 +407633,13 @@ _080CDF94: pop {r0} bx r0 .align 2, 0 -_080CDF9C: .4byte 0x02039d08 -_080CDFA0: .4byte 0x000021ff -_080CDFA4: .4byte 0x02039d79 -_080CDFA8: .4byte 0x02039d7a + .pool thumb_func_end sub_80CDF38 thumb_func_start sub_80CDFAC sub_80CDFAC: @ 80CDFAC push {r4,r5,lr} - ldr r0, _080CDFD4 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -421595,7 +407647,7 @@ sub_80CDFAC: @ 80CDFAC beq _080CDFDC cmp r0, 0x1 bne _080CDFFE - ldr r4, _080CDFD8 + ldr r4, =0x02039d79 ldrb r1, [r4] movs r0, 0xE bl diegohint2 @@ -421604,14 +407656,13 @@ sub_80CDFAC: @ 80CDFAC bl sub_80CBCAC b _080CDFF8 .align 2, 0 -_080CDFD4: .4byte 0x02039d78 -_080CDFD8: .4byte 0x02039d79 + .pool _080CDFDC: bl get_preferred_box adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _080CE004 + ldr r5, =0x02039d79 ldrb r1, [r5] adds r0, r4, 0 bl diegohint2 @@ -421619,7 +407670,7 @@ _080CDFDC: adds r0, r4, 0 bl sub_80CBCAC _080CDFF8: - ldr r1, _080CE008 + ldr r1, =0x02039d7a movs r0, 0 strb r0, [r1] _080CDFFE: @@ -421627,8 +407678,7 @@ _080CDFFE: pop {r0} bx r0 .align 2, 0 -_080CE004: .4byte 0x02039d79 -_080CE008: .4byte 0x02039d7a + .pool thumb_func_end sub_80CDFAC thumb_func_start sub_80CE00C @@ -421648,12 +407698,12 @@ sub_80CE018: @ 80CE018 lsrs r5, r1, 24 cmp r4, 0xE bne _080CE054 - ldr r0, _080CE044 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CE048 + ldr r1, =0x000020a4 adds r0, r1 - ldr r3, _080CE04C - ldr r1, _080CE050 + ldr r3, =0x020244ec + ldr r1, =0x02039d79 movs r2, 0 ldrsb r2, [r1, r2] movs r1, 0x64 @@ -421663,14 +407713,11 @@ sub_80CE018: @ 80CE018 bl memcpy b _080CE064 .align 2, 0 -_080CE044: .4byte 0x02039d08 -_080CE048: .4byte 0x000020a4 -_080CE04C: .4byte 0x020244ec -_080CE050: .4byte 0x02039d79 + .pool _080CE054: - ldr r0, _080CE07C + ldr r0, =0x02039d08 ldr r2, [r0] - ldr r0, _080CE080 + ldr r0, =0x000020a4 adds r2, r0 adds r0, r4, 0 adds r1, r5, 0 @@ -421679,18 +407726,15 @@ _080CE064: adds r0, r4, 0 adds r1, r5, 0 bl sub_80CE0E8 - ldr r0, _080CE084 + ldr r0, =0x02039d7b strb r4, [r0] - ldr r0, _080CE088 + ldr r0, =0x02039d7c strb r5, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080CE07C: .4byte 0x02039d08 -_080CE080: .4byte 0x000020a4 -_080CE084: .4byte 0x02039d7b -_080CE088: .4byte 0x02039d7c + .pool thumb_func_end sub_80CE018 thumb_func_start diegohint2 @@ -421702,25 +407746,23 @@ diegohint2: @ 80CE08C lsrs r7, r1, 24 cmp r6, 0xE bne _080CE0C0 - ldr r1, _080CE0B4 + ldr r1, =0x020244ec movs r0, 0x64 muls r0, r7 adds r0, r1 - ldr r1, _080CE0B8 + ldr r1, =0x02039d08 ldr r1, [r1] - ldr r2, _080CE0BC + ldr r2, =0x000020a4 adds r1, r2 movs r2, 0x64 bl memcpy b _080CE0D8 .align 2, 0 -_080CE0B4: .4byte 0x020244ec -_080CE0B8: .4byte 0x02039d08 -_080CE0BC: .4byte 0x000020a4 + .pool _080CE0C0: - ldr r5, _080CE0E0 + ldr r5, =0x02039d08 ldr r0, [r5] - ldr r4, _080CE0E4 + ldr r4, =0x000020a4 adds r0, r4 bl pokemon_restore_pp ldr r2, [r5] @@ -421733,8 +407775,7 @@ _080CE0D8: pop {r0} bx r0 .align 2, 0 -_080CE0E0: .4byte 0x02039d08 -_080CE0E4: .4byte 0x000020a4 + .pool thumb_func_end diegohint2 thumb_func_start sub_80CE0E8 @@ -421748,12 +407789,12 @@ sub_80CE0E8: @ 80CE0E8 bne _080CE108 movs r0, 0x64 muls r0, r1 - ldr r1, _080CE104 + ldr r1, =0x020244ec adds r0, r1 bl zero_pokemon_struct b _080CE10C .align 2, 0 -_080CE104: .4byte 0x020244ec + .pool _080CE108: bl sub_80D2018 _080CE10C: @@ -421770,11 +407811,11 @@ diegohint1: @ 80CE110 lsrs r7, r1, 24 cmp r6, 0xE bne _080CE144 - ldr r0, _080CE138 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CE13C + ldr r1, =0x00002108 adds r0, r1 - ldr r2, _080CE140 + ldr r2, =0x020244ec movs r1, 0x64 muls r1, r7 adds r1, r2 @@ -421782,13 +407823,11 @@ diegohint1: @ 80CE110 bl memcpy b _080CE154 .align 2, 0 -_080CE138: .4byte 0x02039d08 -_080CE13C: .4byte 0x00002108 -_080CE140: .4byte 0x020244ec + .pool _080CE144: - ldr r0, _080CE188 + ldr r0, =0x02039d08 ldr r2, [r0] - ldr r0, _080CE18C + ldr r0, =0x00002108 adds r2, r0 adds r0, r6, 0 adds r1, r7, 0 @@ -421797,11 +407836,11 @@ _080CE154: adds r0, r6, 0 adds r1, r7, 0 bl diegohint2 - ldr r5, _080CE188 + ldr r5, =0x02039d08 ldr r1, [r5] - ldr r4, _080CE190 + ldr r4, =0x000020a4 adds r0, r1, r4 - ldr r2, _080CE18C + ldr r2, =0x00002108 adds r1, r2 movs r2, 0x64 bl memcpy @@ -421809,19 +407848,15 @@ _080CE154: adds r0, r4 movs r1, 0 bl sub_80CEC00 - ldr r0, _080CE194 + ldr r0, =0x02039d7b strb r6, [r0] - ldr r0, _080CE198 + ldr r0, =0x02039d7c strb r7, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080CE188: .4byte 0x02039d08 -_080CE18C: .4byte 0x00002108 -_080CE190: .4byte 0x000020a4 -_080CE194: .4byte 0x02039d7b -_080CE198: .4byte 0x02039d7c + .pool thumb_func_end diegohint1 thumb_func_start sub_80CE19C @@ -421841,7 +407876,7 @@ sub_80CE19C: @ 80CE19C movs r0, 0 b _080CE21A _080CE1BA: - ldr r5, _080CE1D8 + ldr r5, =0x02039d7a ldrb r0, [r5] cmp r0, 0 beq _080CE1DC @@ -421854,9 +407889,9 @@ _080CE1BA: strb r0, [r5] b _080CE1F6 .align 2, 0 -_080CE1D8: .4byte 0x02039d7a + .pool _080CE1DC: - ldr r5, _080CE220 + ldr r5, =0x02039d79 ldrb r1, [r5] movs r0, 0xE bl sub_80CE018 @@ -421875,9 +407910,9 @@ _080CE1F6: lsrs r0, r4, 24 bl sub_80CB140 _080CE208: - ldr r0, _080CE224 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CE228 + ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0x1 @@ -421888,17 +407923,15 @@ _080CE21A: pop {r1} bx r1 .align 2, 0 -_080CE220: .4byte 0x02039d79 -_080CE224: .4byte 0x02039d08 -_080CE228: .4byte 0x00000cb4 + .pool thumb_func_end sub_80CE19C thumb_func_start sub_80CE22C sub_80CE22C: @ 80CE22C push {lr} - ldr r0, _080CE248 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CE24C + ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0 @@ -421907,23 +407940,22 @@ sub_80CE22C: @ 80CE22C pop {r0} bx r0 .align 2, 0 -_080CE248: .4byte 0x02039d08 -_080CE24C: .4byte 0x00000cb4 + .pool thumb_func_end sub_80CE22C thumb_func_start sub_80CE250 sub_80CE250: @ 80CE250 push {lr} - ldr r0, _080CE260 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CE264 movs r2, 0x2 b _080CE274 .align 2, 0 -_080CE260: .4byte 0x02039d7a + .pool _080CE264: - ldr r0, _080CE294 + ldr r0, =0x02039d78 movs r1, 0 ldrsb r1, [r0, r1] movs r2, 0x1 @@ -421932,25 +407964,21 @@ _080CE264: orrs r0, r1 lsrs r2, r0, 31 _080CE274: - ldr r0, _080CE298 + ldr r0, =0x02039d79 ldrb r1, [r0] adds r0, r2, 0 bl sub_80CBF14 - ldr r0, _080CE29C + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080CE2A0 + ldr r2, =0x000021e0 adds r0, r1, r2 - ldr r2, _080CE2A4 + ldr r2, =0x00000cee adds r1, r2 bl gf_strcpy pop {r0} bx r0 .align 2, 0 -_080CE294: .4byte 0x02039d78 -_080CE298: .4byte 0x02039d79 -_080CE29C: .4byte 0x02039d08 -_080CE2A0: .4byte 0x000021e0 -_080CE2A4: .4byte 0x00000cee + .pool thumb_func_end sub_80CE250 thumb_func_start sub_80CE2A8 @@ -421963,9 +407991,9 @@ sub_80CE2A8: @ 80CE2A8 movs r0, 0x1 b _080CE2CA _080CE2B8: - ldr r0, _080CE2D0 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CE2D4 + ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0 @@ -421975,15 +408003,14 @@ _080CE2CA: pop {r1} bx r1 .align 2, 0 -_080CE2D0: .4byte 0x02039d08 -_080CE2D4: .4byte 0x00000cb4 + .pool thumb_func_end sub_80CE2A8 thumb_func_start sub_80CE2D8 sub_80CE2D8: @ 80CE2D8 push {lr} bl sub_80CC020 - ldr r1, _080CE2EC + ldr r1, =0x02039d7a ldrb r0, [r1] cmp r0, 0 beq _080CE2F0 @@ -421991,9 +408018,9 @@ sub_80CE2D8: @ 80CE2D8 strb r0, [r1] b _080CE316 .align 2, 0 -_080CE2EC: .4byte 0x02039d7a + .pool _080CE2F0: - ldr r0, _080CE300 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -422002,13 +408029,13 @@ _080CE2F0: movs r2, 0xE b _080CE30C .align 2, 0 -_080CE300: .4byte 0x02039d78 + .pool _080CE304: bl get_preferred_box lsls r0, 24 lsrs r2, r0, 24 _080CE30C: - ldr r0, _080CE320 + ldr r0, =0x02039d79 ldrb r1, [r0] adds r0, r2, 0 bl sub_80CE0E8 @@ -422017,19 +408044,19 @@ _080CE316: pop {r0} bx r0 .align 2, 0 -_080CE320: .4byte 0x02039d79 + .pool thumb_func_end sub_80CE2D8 thumb_func_start sub_80CE324 sub_80CE324: @ 80CE324 push {lr} - ldr r0, _080CE344 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CE33E - ldr r0, _080CE348 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CE34C + ldr r1, =0x00000cb4 adds r0, r1 ldr r0, [r0] movs r1, 0x3 @@ -422038,9 +408065,7 @@ _080CE33E: pop {r0} bx r0 .align 2, 0 -_080CE344: .4byte 0x02039d7a -_080CE348: .4byte 0x02039d08 -_080CE34C: .4byte 0x00000cb4 + .pool thumb_func_end sub_80CE324 thumb_func_start sub_80CE350 @@ -422048,13 +408073,13 @@ sub_80CE350: @ 80CE350 push {r4,r5,lr} adds r3, r0, 0 movs r5, 0 - ldr r4, _080CE394 + ldr r4, =0x0857b9a4 _080CE358: movs r1, 0 ldrsb r1, [r4, r1] cmp r1, 0x22 beq _080CE378 - ldr r0, _080CE398 + ldr r0, =0x03005d8c ldr r2, [r0] movs r0, 0x4 ldrsb r0, [r2, r0] @@ -422075,16 +408100,14 @@ _080CE37E: adds r5, 0x1 cmp r5, 0x5 bls _080CE358 - ldr r1, _080CE39C + ldr r1, =0x00000163 adds r0, r1, 0 strh r0, [r3] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080CE394: .4byte 0x0857b9a4 -_080CE398: .4byte 0x03005d8c -_080CE39C: .4byte 0x00000163 + .pool thumb_func_end sub_80CE350 thumb_func_start sub_80CE3A0 @@ -422094,65 +408117,58 @@ sub_80CE3A0: @ 80CE3A0 adds r3, r0, 0 cmp r3, 0 bne _080CE3D0 - ldr r2, _080CE3C4 + ldr r2, =0x02039d08 ldr r0, [r2] - ldr r1, _080CE3C8 + ldr r1, =0x0000216d adds r0, r1 movs r1, 0x1 strb r1, [r0] ldr r0, [r2] - ldr r2, _080CE3CC + ldr r2, =0x0000216c adds r0, r2 strb r3, [r0] b _080CE504 .align 2, 0 -_080CE3C4: .4byte 0x02039d08 -_080CE3C8: .4byte 0x0000216d -_080CE3CC: .4byte 0x0000216c + .pool _080CE3D0: - ldr r0, _080CE400 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CE418 - ldr r4, _080CE404 + ldr r4, =0x02039d08 ldr r1, [r4] - ldr r3, _080CE408 + ldr r3, =0x00002108 adds r0, r1, r3 - ldr r2, _080CE40C + ldr r2, =0x000020a4 adds r1, r2 movs r2, 0x64 bl memcpy ldr r0, [r4] - ldr r3, _080CE410 + ldr r3, =0x00002170 adds r0, r3 movs r1, 0xFF strb r1, [r0] ldr r0, [r4] - ldr r1, _080CE414 + ldr r1, =0x00002171 adds r0, r1 movs r1, 0x1 negs r1, r1 b _080CE494 .align 2, 0 -_080CE400: .4byte 0x02039d7a -_080CE404: .4byte 0x02039d08 -_080CE408: .4byte 0x00002108 -_080CE40C: .4byte 0x000020a4 -_080CE410: .4byte 0x00002170 -_080CE414: .4byte 0x00002171 + .pool _080CE418: - ldr r0, _080CE44C + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 bne _080CE464 - ldr r4, _080CE450 + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r2, _080CE454 + ldr r2, =0x00002108 adds r0, r2 - ldr r3, _080CE458 - ldr r1, _080CE45C + ldr r3, =0x020244ec + ldr r1, =0x02039d79 movs r2, 0 ldrsb r2, [r1, r2] movs r1, 0x64 @@ -422161,88 +408177,76 @@ _080CE418: movs r2, 0x64 bl memcpy ldr r0, [r4] - ldr r3, _080CE460 + ldr r3, =0x00002170 adds r0, r3 movs r1, 0xE strb r1, [r0] b _080CE488 .align 2, 0 -_080CE44C: .4byte 0x02039d78 -_080CE450: .4byte 0x02039d08 -_080CE454: .4byte 0x00002108 -_080CE458: .4byte 0x020244ec -_080CE45C: .4byte 0x02039d79 -_080CE460: .4byte 0x00002170 + .pool _080CE464: bl get_preferred_box lsls r0, 24 lsrs r0, 24 - ldr r1, _080CE4C8 + ldr r1, =0x02039d79 ldrb r1, [r1] - ldr r4, _080CE4CC + ldr r4, =0x02039d08 ldr r2, [r4] - ldr r3, _080CE4D0 + ldr r3, =0x00002108 adds r2, r3 bl sub_80D2054 bl get_preferred_box ldr r1, [r4] - ldr r2, _080CE4D4 + ldr r2, =0x00002170 adds r1, r2 strb r0, [r1] _080CE488: - ldr r0, _080CE4CC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CE4C8 + ldr r1, =0x02039d79 ldrb r1, [r1] - ldr r3, _080CE4D8 + ldr r3, =0x00002171 adds r0, r3 _080CE494: strb r1, [r0] - ldr r5, _080CE4CC + ldr r5, =0x02039d08 ldr r0, [r5] - ldr r4, _080CE4DC + ldr r4, =0x00002176 adds r0, r4 bl sub_80CE350 ldr r2, [r5] - ldr r1, _080CE4D0 + ldr r1, =0x00002108 adds r0, r2, r1 adds r2, r4 movs r1, 0x51 bl pokemon_getattr ldr r2, [r5] - ldr r3, _080CE4E0 + ldr r3, =0x00002174 adds r1, r2, r3 strh r0, [r1] lsls r0, 16 cmp r0, 0 beq _080CE4E8 - ldr r0, _080CE4E4 + ldr r0, =0x0000216d adds r1, r2, r0 movs r0, 0 strb r0, [r1] b _080CE4F8 .align 2, 0 -_080CE4C8: .4byte 0x02039d79 -_080CE4CC: .4byte 0x02039d08 -_080CE4D0: .4byte 0x00002108 -_080CE4D4: .4byte 0x00002170 -_080CE4D8: .4byte 0x00002171 -_080CE4DC: .4byte 0x00002176 -_080CE4E0: .4byte 0x00002174 -_080CE4E4: .4byte 0x0000216d + .pool _080CE4E8: - ldr r1, _080CE50C + ldr r1, =0x0000216d adds r0, r2, r1 movs r1, 0x1 strb r1, [r0] ldr r0, [r5] - ldr r2, _080CE510 + ldr r2, =0x0000216c adds r0, r2 strb r1, [r0] _080CE4F8: - ldr r0, _080CE514 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r3, _080CE518 + ldr r3, =0x00002172 adds r0, r3 movs r1, 0 strh r1, [r0] @@ -422251,16 +408255,13 @@ _080CE504: pop {r0} bx r0 .align 2, 0 -_080CE50C: .4byte 0x0000216d -_080CE510: .4byte 0x0000216c -_080CE514: .4byte 0x02039d08 -_080CE518: .4byte 0x00002172 + .pool thumb_func_end sub_80CE3A0 thumb_func_start sub_80CE51C sub_80CE51C: @ 80CE51C push {r4-r6,lr} - ldr r0, _080CE54C + ldr r0, =0x02039d7a ldrb r1, [r0] negs r0, r1 orrs r0, r1 @@ -422269,7 +408270,7 @@ sub_80CE51C: @ 80CE51C _080CE52A: movs r0, 0x64 muls r0, r4 - ldr r1, _080CE550 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x5 bl pokemon_getattr @@ -422286,8 +408287,7 @@ _080CE548: movs r0, 0x1 b _080CE578 .align 2, 0 -_080CE54C: .4byte 0x02039d7a -_080CE550: .4byte 0x020244ec + .pool _080CE554: movs r6, 0 _080CE556: @@ -422320,26 +408320,24 @@ sub_80CE580: @ 80CE580 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _080CE5A4 + ldr r0, =0x02039d08 ldr r2, [r0] - ldr r3, _080CE5A8 + ldr r3, =0x0000216d adds r1, r2, r3 ldrb r1, [r1] adds r5, r0, 0 cmp r1, 0 beq _080CE5B0 - ldr r1, _080CE5AC + ldr r1, =0x0000216c adds r0, r2, r1 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 b _080CE736 .align 2, 0 -_080CE5A4: .4byte 0x02039d08 -_080CE5A8: .4byte 0x0000216d -_080CE5AC: .4byte 0x0000216c + .pool _080CE5B0: - ldr r3, _080CE5C0 + ldr r3, =0x00002172 adds r0, r2, r3 ldrh r0, [r0] cmp r0, 0 @@ -422348,19 +408346,19 @@ _080CE5B0: beq _080CE690 b _080CE732 .align 2, 0 -_080CE5C0: .4byte 0x00002172 + .pool _080CE5C4: movs r6, 0 _080CE5C6: ldr r2, [r5] - ldr r1, _080CE630 + ldr r1, =0x00002170 adds r0, r2, r1 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0xE bne _080CE5E4 - ldr r3, _080CE634 + ldr r3, =0x00002171 adds r0, r2, r3 ldrb r0, [r0] lsls r0, 24 @@ -422370,16 +408368,16 @@ _080CE5C6: _080CE5E4: movs r0, 0x64 muls r0, r6 - ldr r1, _080CE638 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _080CE63C + ldr r1, =0x00002176 adds r2, r1 movs r1, 0x51 bl pokemon_getattr lsls r0, 16 lsrs r4, r0, 16 ldr r1, [r5] - ldr r2, _080CE640 + ldr r2, =0x00002174 adds r1, r2 ldrh r0, [r1] bics r0, r4 @@ -422390,9 +408388,9 @@ _080CE606: lsrs r6, r0, 16 cmp r6, 0x5 bls _080CE5C6 - ldr r2, _080CE644 + ldr r2, =0x02039d08 ldr r1, [r2] - ldr r3, _080CE640 + ldr r3, =0x00002174 adds r0, r1, r3 ldrh r0, [r0] cmp r0, 0 @@ -422402,20 +408400,14 @@ _080CE606: movs r1, 0x1 strb r1, [r0] ldr r0, [r2] - ldr r2, _080CE648 + ldr r2, =0x0000216c adds r0, r2 strb r1, [r0] b _080CE732 .align 2, 0 -_080CE630: .4byte 0x00002170 -_080CE634: .4byte 0x00002171 -_080CE638: .4byte 0x020244ec -_080CE63C: .4byte 0x00002176 -_080CE640: .4byte 0x00002174 -_080CE644: .4byte 0x02039d08 -_080CE648: .4byte 0x0000216c + .pool _080CE64C: - ldr r3, _080CE66C + ldr r3, =0x0000216e adds r0, r1, r3 movs r1, 0 strb r1, [r0] @@ -422424,40 +408416,38 @@ _080CE64C: adds r0, r3 strb r1, [r0] ldr r1, [r2] - ldr r0, _080CE670 + ldr r0, =0x00002172 adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _080CE732 .align 2, 0 -_080CE66C: .4byte 0x0000216e -_080CE670: .4byte 0x00002172 + .pool _080CE674: - ldr r1, _080CE688 + ldr r1, =0x0000216d adds r0, r5, r1 movs r1, 0x1 strb r1, [r0] mov r2, r8 ldr r0, [r2] - ldr r3, _080CE68C + ldr r3, =0x0000216c adds r0, r3 strb r1, [r0] b _080CE732 .align 2, 0 -_080CE688: .4byte 0x0000216d -_080CE68C: .4byte 0x0000216c + .pool _080CE690: movs r6, 0 mov r8, r5 - ldr r7, _080CE740 + ldr r7, =0x0000ffff _080CE696: mov r0, r8 ldr r3, [r0] - ldr r1, _080CE744 + ldr r1, =0x0000216e adds r0, r3, r1 ldrb r0, [r0] - ldr r2, _080CE748 + ldr r2, =0x0000216f adds r1, r3, r2 ldrb r1, [r1] adds r2, 0x7 @@ -422469,10 +408459,10 @@ _080CE696: cmp r4, 0 beq _080CE6E0 ldr r5, [r5] - ldr r3, _080CE74C + ldr r3, =0x00002170 adds r0, r5, r3 ldrh r2, [r0] - ldr r1, _080CE744 + ldr r1, =0x0000216e adds r0, r5, r1 ldrh r3, [r0] adds r1, r7, 0 @@ -422481,7 +408471,7 @@ _080CE696: ands r0, r3 cmp r1, r0 beq _080CE6E0 - ldr r2, _080CE750 + ldr r2, =0x00002174 adds r1, r5, r2 ldrh r0, [r1] bics r0, r4 @@ -422489,9 +408479,9 @@ _080CE696: cmp r0, 0 beq _080CE674 _080CE6E0: - ldr r2, _080CE754 + ldr r2, =0x02039d08 ldr r1, [r2] - ldr r3, _080CE748 + ldr r3, =0x0000216f adds r1, r3 ldrb r0, [r1] adds r0, 0x1 @@ -422503,11 +408493,11 @@ _080CE6E0: cmp r0, 0x1D ble _080CE728 ldr r0, [r2] - ldr r1, _080CE748 + ldr r1, =0x0000216f adds r0, r1 strb r3, [r0] ldr r1, [r2] - ldr r0, _080CE744 + ldr r0, =0x0000216e adds r1, r0 ldrb r0, [r1] adds r0, 0x1 @@ -422517,12 +408507,12 @@ _080CE6E0: cmp r0, 0xD ble _080CE728 ldr r0, [r2] - ldr r1, _080CE758 + ldr r1, =0x0000216d adds r0, r1 movs r1, 0x1 strb r1, [r0] ldr r0, [r2] - ldr r2, _080CE75C + ldr r2, =0x0000216c adds r0, r2 strb r3, [r0] _080CE728: @@ -422541,27 +408531,20 @@ _080CE736: pop {r1} bx r1 .align 2, 0 -_080CE740: .4byte 0x0000ffff -_080CE744: .4byte 0x0000216e -_080CE748: .4byte 0x0000216f -_080CE74C: .4byte 0x00002170 -_080CE750: .4byte 0x00002174 -_080CE754: .4byte 0x02039d08 -_080CE758: .4byte 0x0000216d -_080CE75C: .4byte 0x0000216c + .pool thumb_func_end sub_80CE580 thumb_func_start sub_80CE760 sub_80CE760: @ 80CE760 push {lr} - ldr r0, _080CE780 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CE77A - ldr r0, _080CE784 - ldr r1, _080CE788 + ldr r0, =0x02039d14 + ldr r1, =0x02039d08 ldr r1, [r1] - ldr r2, _080CE78C + ldr r2, =0x000020a4 adds r1, r2 movs r2, 0x64 bl memcpy @@ -422569,145 +408552,123 @@ _080CE77A: pop {r0} bx r0 .align 2, 0 -_080CE780: .4byte 0x02039d7a -_080CE784: .4byte 0x02039d14 -_080CE788: .4byte 0x02039d08 -_080CE78C: .4byte 0x000020a4 + .pool thumb_func_end sub_80CE760 thumb_func_start sub_80CE790 sub_80CE790: @ 80CE790 push {lr} - ldr r0, _080CE7B4 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CE7D8 - ldr r0, _080CE7B8 + ldr r0, =0x02039d7b ldrb r0, [r0] cmp r0, 0xE bne _080CE7C8 - ldr r0, _080CE7BC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CE7C0 + ldr r1, =0x000020a4 adds r0, r1 - ldr r1, _080CE7C4 + ldr r1, =0x02039d14 movs r2, 0x64 bl memcpy b _080CE7D8 .align 2, 0 -_080CE7B4: .4byte 0x02039d7a -_080CE7B8: .4byte 0x02039d7b -_080CE7BC: .4byte 0x02039d08 -_080CE7C0: .4byte 0x000020a4 -_080CE7C4: .4byte 0x02039d14 + .pool _080CE7C8: - ldr r0, _080CE7DC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CE7E0 + ldr r1, =0x000020a4 adds r0, r1 - ldr r1, _080CE7E4 + ldr r1, =0x02039d14 movs r2, 0x50 bl memcpy _080CE7D8: pop {r0} bx r0 .align 2, 0 -_080CE7DC: .4byte 0x02039d08 -_080CE7E0: .4byte 0x000020a4 -_080CE7E4: .4byte 0x02039d14 + .pool thumb_func_end sub_80CE790 thumb_func_start sub_80CE7E8 sub_80CE7E8: @ 80CE7E8 push {r4,r5,lr} - ldr r0, _080CE81C + ldr r0, =0x02039d7a ldrb r5, [r0] cmp r5, 0 beq _080CE838 bl sub_80CE760 - ldr r3, _080CE820 + ldr r3, =0x02039d08 ldr r1, [r3] - ldr r0, _080CE824 + ldr r0, =0x0000218c adds r2, r1, r0 - ldr r0, _080CE828 + ldr r0, =0x02039d14 str r0, [r2] - ldr r2, _080CE82C + ldr r2, =0x00002187 adds r1, r2 movs r2, 0 strb r2, [r1] ldr r0, [r3] - ldr r4, _080CE830 + ldr r4, =0x00002186 adds r0, r4 strb r2, [r0] ldr r0, [r3] - ldr r1, _080CE834 + ldr r1, =0x00002188 adds r0, r1 strb r2, [r0] b _080CE8CA .align 2, 0 -_080CE81C: .4byte 0x02039d7a -_080CE820: .4byte 0x02039d08 -_080CE824: .4byte 0x0000218c -_080CE828: .4byte 0x02039d14 -_080CE82C: .4byte 0x00002187 -_080CE830: .4byte 0x00002186 -_080CE834: .4byte 0x00002188 + .pool _080CE838: - ldr r0, _080CE874 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 bne _080CE894 - ldr r4, _080CE878 + ldr r4, =0x02039d08 ldr r1, [r4] - ldr r0, _080CE87C + ldr r0, =0x0000218c adds r2, r1, r0 - ldr r0, _080CE880 + ldr r0, =0x020244ec str r0, [r2] - ldr r0, _080CE884 + ldr r0, =0x02039d79 ldrb r0, [r0] - ldr r2, _080CE888 + ldr r2, =0x00002187 adds r1, r2 strb r0, [r1] bl sub_80C70C4 ldr r1, [r4] subs r0, 0x1 - ldr r2, _080CE88C + ldr r2, =0x00002186 adds r1, r2 strb r0, [r1] ldr r0, [r4] - ldr r4, _080CE890 + ldr r4, =0x00002188 adds r0, r4 strb r5, [r0] b _080CE8CA .align 2, 0 -_080CE874: .4byte 0x02039d78 -_080CE878: .4byte 0x02039d08 -_080CE87C: .4byte 0x0000218c -_080CE880: .4byte 0x020244ec -_080CE884: .4byte 0x02039d79 -_080CE888: .4byte 0x00002187 -_080CE88C: .4byte 0x00002186 -_080CE890: .4byte 0x00002188 + .pool _080CE894: bl get_preferred_box lsls r0, 24 lsrs r0, 24 movs r1, 0 bl get_pokemon_by_box_and_pos - ldr r3, _080CE8D0 + ldr r3, =0x02039d08 ldr r2, [r3] - ldr r4, _080CE8D4 + ldr r4, =0x0000218c adds r1, r2, r4 str r0, [r1] - ldr r0, _080CE8D8 + ldr r0, =0x02039d79 ldrb r0, [r0] - ldr r1, _080CE8DC + ldr r1, =0x00002187 adds r2, r1 strb r0, [r2] ldr r0, [r3] - ldr r2, _080CE8E0 + ldr r2, =0x00002186 adds r0, r2 movs r1, 0x1D strb r1, [r0] @@ -422721,35 +408682,30 @@ _080CE8CA: pop {r0} bx r0 .align 2, 0 -_080CE8D0: .4byte 0x02039d08 -_080CE8D4: .4byte 0x0000218c -_080CE8D8: .4byte 0x02039d79 -_080CE8DC: .4byte 0x00002187 -_080CE8E0: .4byte 0x00002186 + .pool thumb_func_end sub_80CE7E8 thumb_func_start sub_80CE8E4 sub_80CE8E4: @ 80CE8E4 push {lr} - ldr r0, _080CE8F4 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CE8F8 bl sub_80CE790 b _080CE900 .align 2, 0 -_080CE8F4: .4byte 0x02039d7a + .pool _080CE8F8: - ldr r0, _080CE904 - ldr r1, _080CE908 + ldr r0, =0x02039d79 + ldr r1, =0x0203cf20 ldrb r1, [r1] strb r1, [r0] _080CE900: pop {r0} bx r0 .align 2, 0 -_080CE904: .4byte 0x02039d79 -_080CE908: .4byte 0x0203cf20 + .pool thumb_func_end sub_80CE8E4 thumb_func_start party_compaction @@ -422759,12 +408715,12 @@ party_compaction: @ 80CE90C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r7, _080CE958 + ldr r7, =0x0000ffff movs r6, 0 movs r5, 0 movs r0, 0x64 mov r9, r0 - ldr r1, _080CE95C + ldr r1, =0x020244ec mov r8, r1 subs r0, 0x65 mov r10, r0 @@ -422793,8 +408749,7 @@ _080CE950: lsrs r5, r0, 16 b _080CE96A .align 2, 0 -_080CE958: .4byte 0x0000ffff -_080CE95C: .4byte 0x020244ec + .pool _080CE960: lsls r0, r7, 16 asrs r0, 16 @@ -422811,7 +408766,7 @@ _080CE96A: cmp r5, 0x5 bhi _080CE992 movs r6, 0x64 - ldr r4, _080CE9A4 + ldr r4, =0x020244ec _080CE97E: adds r0, r5, 0 muls r0, r6 @@ -422832,7 +408787,7 @@ _080CE992: pop {r1} bx r1 .align 2, 0 -_080CE9A4: .4byte 0x020244ec + .pool thumb_func_end party_compaction thumb_func_start sub_80CE9A8 @@ -422843,39 +408798,36 @@ sub_80CE9A8: @ 80CE9A8 lsrs r0, 24 mov r1, sp strb r0, [r1] - ldr r2, _080CE9D8 + ldr r2, =0x02039d08 ldr r1, [r2] - ldr r3, _080CE9DC + ldr r3, =0x00000ceb adds r1, r3 strb r0, [r1] - ldr r0, _080CE9E0 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CE9E8 ldr r0, [r2] - ldr r1, _080CE9E4 + ldr r1, =0x000020a4 adds r0, r1 movs r1, 0x8 mov r2, sp bl pokemon_setattr b _080CEA1C .align 2, 0 -_080CE9D8: .4byte 0x02039d08 -_080CE9DC: .4byte 0x00000ceb -_080CE9E0: .4byte 0x02039d7a -_080CE9E4: .4byte 0x000020a4 + .pool _080CE9E8: - ldr r4, _080CEA24 + ldr r4, =0x02039d78 movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0x1 bne _080CEA08 - ldr r0, _080CEA28 + ldr r0, =0x02039d79 movs r1, 0 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _080CEA2C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x8 mov r2, sp @@ -422885,7 +408837,7 @@ _080CEA08: ldrsb r0, [r4, r0] cmp r0, 0 bne _080CEA1C - ldr r0, _080CEA28 + ldr r0, =0x02039d79 ldrb r0, [r0] movs r1, 0x8 mov r2, sp @@ -422896,25 +408848,23 @@ _080CEA1C: pop {r0} bx r0 .align 2, 0 -_080CEA24: .4byte 0x02039d78 -_080CEA28: .4byte 0x02039d79 -_080CEA2C: .4byte 0x020244ec + .pool thumb_func_end sub_80CE9A8 thumb_func_start sub_80CEA30 sub_80CEA30: @ 80CEA30 push {lr} - ldr r0, _080CEA58 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 bne _080CEA64 - ldr r0, _080CEA5C + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 bne _080CEA64 - ldr r0, _080CEA60 + ldr r0, =0x02039d79 ldrb r0, [r0] bl sub_80C7050 lsls r0, 24 @@ -422923,9 +408873,7 @@ sub_80CEA30: @ 80CEA30 movs r0, 0x1 b _080CEA66 .align 2, 0 -_080CEA58: .4byte 0x02039d78 -_080CEA5C: .4byte 0x02039d7a -_080CEA60: .4byte 0x02039d79 + .pool _080CEA64: movs r0, 0 _080CEA66: @@ -422936,30 +408884,30 @@ _080CEA66: thumb_func_start sub_80CEA6C sub_80CEA6C: @ 80CEA6C push {lr} - ldr r0, _080CEAB0 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CEAC8 - ldr r0, _080CEAB4 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x1 bne _080CEAAC - ldr r0, _080CEAB8 + ldr r0, =0x02039d79 ldrb r0, [r0] bl sub_80C7050 lsls r0, 24 cmp r0, 0 bne _080CEAAC - ldr r0, _080CEABC + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080CEAC0 + ldr r2, =0x00000ced adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 bne _080CEAC8 - ldr r2, _080CEAC4 + ldr r2, =0x000020a4 adds r0, r1, r2 movs r1, 0x39 bl pokemon_getattr @@ -422969,12 +408917,7 @@ _080CEAAC: movs r0, 0x1 b _080CEACA .align 2, 0 -_080CEAB0: .4byte 0x02039d7a -_080CEAB4: .4byte 0x02039d78 -_080CEAB8: .4byte 0x02039d79 -_080CEABC: .4byte 0x02039d08 -_080CEAC0: .4byte 0x00000ced -_080CEAC4: .4byte 0x000020a4 + .pool _080CEAC8: movs r0, 0 _080CEACA: @@ -422984,18 +408927,18 @@ _080CEACA: thumb_func_start sub_80CEAD0 sub_80CEAD0: @ 80CEAD0 - ldr r0, _080CEAD8 + ldr r0, =0x02039d7a ldrb r0, [r0] bx lr .align 2, 0 -_080CEAD8: .4byte 0x02039d7a + .pool thumb_func_end sub_80CEAD0 thumb_func_start sub_80CEADC sub_80CEADC: @ 80CEADC push {lr} movs r1, 0 - ldr r0, _080CEAF4 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -423007,20 +408950,20 @@ _080CEAEE: pop {r1} bx r1 .align 2, 0 -_080CEAF4: .4byte 0x02039d78 + .pool thumb_func_end sub_80CEADC thumb_func_start sub_80CEAF8 sub_80CEAF8: @ 80CEAF8 push {lr} movs r1, 0 - ldr r0, _080CEB1C + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0x3 bne _080CEB16 - ldr r0, _080CEB20 + ldr r0, =0x02039d79 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -423032,15 +408975,14 @@ _080CEB16: pop {r1} bx r1 .align 2, 0 -_080CEB1C: .4byte 0x02039d78 -_080CEB20: .4byte 0x02039d79 + .pool thumb_func_end sub_80CEAF8 thumb_func_start sub_80CEB24 sub_80CEB24: @ 80CEB24 push {lr} movs r1, 0 - ldr r0, _080CEB3C + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -423052,28 +408994,28 @@ _080CEB36: pop {r1} bx r1 .align 2, 0 -_080CEB3C: .4byte 0x02039d78 + .pool thumb_func_end sub_80CEB24 thumb_func_start sub_80CEB40 sub_80CEB40: @ 80CEB40 push {r4,lr} - ldr r0, _080CEB74 + ldr r0, =0x02039d08 ldr r1, [r0] movs r2, 0 - ldr r3, _080CEB78 + ldr r3, =0x02039d7a ldrb r0, [r3] cmp r0, 0 bne _080CEB52 movs r2, 0x1 _080CEB52: - ldr r4, _080CEB7C + ldr r4, =0x00000cea adds r0, r1, r4 strb r2, [r0] ldrb r0, [r3] cmp r0, 0 bne _080CEBD0 - ldr r0, _080CEB80 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -423085,16 +409027,13 @@ _080CEB52: beq _080CEBBA b _080CEBD0 .align 2, 0 -_080CEB74: .4byte 0x02039d08 -_080CEB78: .4byte 0x02039d7a -_080CEB7C: .4byte 0x00000cea -_080CEB80: .4byte 0x02039d78 + .pool _080CEB84: cmp r0, 0x3 bgt _080CEBD0 b _080CEBB0 _080CEB8A: - ldr r1, _080CEBA8 + ldr r1, =0x02039d79 movs r0, 0 ldrsb r0, [r1, r0] cmp r0, 0x5 @@ -423102,14 +409041,13 @@ _080CEB8A: adds r1, r0, 0 movs r0, 0x64 muls r0, r1 - ldr r1, _080CEBAC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0 bl sub_80CEC00 b _080CEBD0 .align 2, 0 -_080CEBA8: .4byte 0x02039d79 -_080CEBAC: .4byte 0x020244ec + .pool _080CEBB0: movs r0, 0 movs r1, 0x2 @@ -423119,7 +409057,7 @@ _080CEBBA: bl get_preferred_box lsls r0, 24 lsrs r0, 24 - ldr r1, _080CEBD8 + ldr r1, =0x02039d79 ldrb r1, [r1] bl get_pokemon_by_box_and_pos movs r1, 0x1 @@ -423129,23 +409067,22 @@ _080CEBD0: pop {r0} bx r0 .align 2, 0 -_080CEBD8: .4byte 0x02039d79 + .pool thumb_func_end sub_80CEB40 thumb_func_start sub_80CEBDC sub_80CEBDC: @ 80CEBDC push {lr} - ldr r0, _080CEBF0 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CEBF8 - ldr r0, _080CEBF4 + ldr r0, =0x02039d14 movs r1, 0 bl sub_80CEC00 b _080CEBFC .align 2, 0 -_080CEBF0: .4byte 0x02039d7a -_080CEBF4: .4byte 0x02039d14 + .pool _080CEBF8: bl sub_80CEB40 _080CEBFC: @@ -423164,10 +409101,10 @@ sub_80CEC00: @ 80CEC00 lsls r1, 24 lsrs r1, 24 adds r5, r1, 0 - ldr r0, _080CEC64 + ldr r0, =0x02039d08 mov r8, r0 ldr r1, [r0] - ldr r3, _080CEC68 + ldr r3, =0x00000ce6 adds r2, r1, r3 movs r0, 0 strh r0, [r2] @@ -423181,7 +409118,7 @@ sub_80CEC00: @ 80CEC00 bl pokemon_getattr mov r2, r8 ldr r1, [r2] - ldr r3, _080CEC6C + ldr r3, =0x00000ce4 adds r1, r3 strh r0, [r1] lsls r0, 16 @@ -423199,29 +409136,26 @@ _080CEC44: beq _080CEC74 mov r1, r8 ldr r0, [r1] - ldr r2, _080CEC70 + ldr r2, =0x00000ced adds r0, r2 movs r1, 0x1 strb r1, [r0] b _080CEC86 .align 2, 0 -_080CEC64: .4byte 0x02039d08 -_080CEC68: .4byte 0x00000ce6 -_080CEC6C: .4byte 0x00000ce4 -_080CEC70: .4byte 0x00000ced + .pool _080CEC74: adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr mov r3, r8 ldr r1, [r3] - ldr r2, _080CECFC + ldr r2, =0x00000ced adds r1, r2 strb r0, [r1] _080CEC86: - ldr r4, _080CED00 + ldr r4, =0x02039d08 ldr r2, [r4] - ldr r5, _080CED04 + ldr r5, =0x00000cee adds r2, r5 adds r0, r6, 0 movs r1, 0x2 @@ -423233,14 +409167,14 @@ _080CEC86: movs r1, 0x38 bl pokemon_getattr ldr r1, [r4] - ldr r3, _080CED08 + ldr r3, =0x00000cec adds r1, r3 strb r0, [r1] adds r0, r6, 0 movs r1, 0x8 bl pokemon_getattr ldr r1, [r4] - ldr r2, _080CED0C + ldr r2, =0x00000ceb adds r1, r2 strb r0, [r1] adds r0, r6, 0 @@ -423254,7 +409188,7 @@ _080CEC86: adds r0, r6, 0 bl pokemon_get_pal ldr r1, [r4] - ldr r2, _080CED10 + ldr r2, =0x00000cdc adds r1, r2 str r0, [r1] adds r0, r6, 0 @@ -423266,18 +409200,12 @@ _080CEC86: movs r1, 0xC bl pokemon_getattr ldr r1, [r4] - ldr r3, _080CED14 + ldr r3, =0x00000ce6 adds r1, r3 strh r0, [r1] b _080CEE26 .align 2, 0 -_080CECFC: .4byte 0x00000ced -_080CED00: .4byte 0x02039d08 -_080CED04: .4byte 0x00000cee -_080CED08: .4byte 0x00000cec -_080CED0C: .4byte 0x00000ceb -_080CED10: .4byte 0x00000cdc -_080CED14: .4byte 0x00000ce6 + .pool _080CED18: cmp r5, 0x1 beq _080CED1E @@ -423289,7 +409217,7 @@ _080CED1E: bl pokemon_getattr_encrypted mov r2, r8 ldr r1, [r2] - ldr r3, _080CED64 + ldr r3, =0x00000ce4 adds r1, r3 strh r0, [r1] lsls r0, 16 @@ -423311,26 +409239,25 @@ _080CED3A: beq _080CED6C mov r1, r8 ldr r0, [r1] - ldr r2, _080CED68 + ldr r2, =0x00000ced adds r0, r2 strb r5, [r0] b _080CED7E .align 2, 0 -_080CED64: .4byte 0x00000ce4 -_080CED68: .4byte 0x00000ced + .pool _080CED6C: adds r0, r7, 0 movs r1, 0x2D bl pokemon_getattr_encrypted mov r3, r8 ldr r1, [r3] - ldr r2, _080CEE00 + ldr r2, =0x00000ced adds r1, r2 strb r0, [r1] _080CED7E: - ldr r5, _080CEE04 + ldr r5, =0x02039d08 ldr r2, [r5] - ldr r4, _080CEE08 + ldr r4, =0x00000cee adds r2, r4 adds r0, r7, 0 movs r1, 0x2 @@ -423341,14 +409268,14 @@ _080CED7E: adds r0, r7, 0 bl sub_80690C0 ldr r1, [r5] - ldr r3, _080CEE0C + ldr r3, =0x00000cec adds r1, r3 strb r0, [r1] adds r0, r7, 0 movs r1, 0x8 bl pokemon_getattr_encrypted ldr r1, [r5] - ldr r2, _080CEE10 + ldr r2, =0x00000ceb adds r1, r2 strb r0, [r1] adds r0, r7, 0 @@ -423366,7 +409293,7 @@ _080CED7E: mov r1, r9 bl species_and_otid_get_pal ldr r1, [r5] - ldr r3, _080CEE14 + ldr r3, =0x00000cdc adds r2, r1, r3 str r0, [r2] adds r4, r1, r4 @@ -423381,72 +409308,60 @@ _080CED7E: movs r1, 0xC bl pokemon_getattr_encrypted ldr r1, [r5] - ldr r2, _080CEE18 + ldr r2, =0x00000ce6 adds r1, r2 strh r0, [r1] b _080CEE26 .align 2, 0 -_080CEE00: .4byte 0x00000ced -_080CEE04: .4byte 0x02039d08 -_080CEE08: .4byte 0x00000cee -_080CEE0C: .4byte 0x00000cec -_080CEE10: .4byte 0x00000ceb -_080CEE14: .4byte 0x00000cdc -_080CEE18: .4byte 0x00000ce6 + .pool _080CEE1C: - ldr r3, _080CEE78 + ldr r3, =0x00000ce4 adds r0, r1, r3 mov r1, r9 strh r1, [r0] strh r1, [r2] _080CEE26: - ldr r0, _080CEE7C + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r2, _080CEE78 + ldr r2, =0x00000ce4 adds r0, r1, r2 ldrh r2, [r0] cmp r2, 0 bne _080CEE94 _080CEE34: - ldr r4, _080CEE7C + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r3, _080CEE80 + ldr r3, =0x00000cee adds r0, r3 movs r1, 0 movs r2, 0x5 bl sub_80090FC ldr r0, [r4] - ldr r1, _080CEE84 + ldr r1, =0x00000cf9 adds r0, r1 movs r1, 0 movs r2, 0x8 bl sub_80090FC ldr r0, [r4] - ldr r2, _080CEE88 + ldr r2, =0x00000d1d adds r0, r2 movs r1, 0 movs r2, 0x8 bl sub_80090FC ldr r0, [r4] - ldr r3, _080CEE8C + ldr r3, =0x00000d41 adds r0, r3 movs r1, 0 movs r2, 0x8 bl sub_80090FC ldr r0, [r4] - ldr r1, _080CEE90 + ldr r1, =0x00000d65 adds r0, r1 b _080CEEF2 .align 2, 0 -_080CEE78: .4byte 0x00000ce4 -_080CEE7C: .4byte 0x02039d08 -_080CEE80: .4byte 0x00000cee -_080CEE84: .4byte 0x00000cf9 -_080CEE88: .4byte 0x00000d1d -_080CEE8C: .4byte 0x00000d41 -_080CEE90: .4byte 0x00000d65 + .pool _080CEE94: - ldr r3, _080CEEB8 + ldr r3, =0x00000ced adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 @@ -423454,7 +409369,7 @@ _080CEE94: mov r0, r10 cmp r0, 0 beq _080CEEC0 - ldr r2, _080CEEBC + ldr r2, =0x00000cf9 adds r0, r1, r2 adds r3, 0x1 adds r1, r3 @@ -423463,31 +409378,30 @@ _080CEE94: bl sub_8009128 b _080CEECE .align 2, 0 -_080CEEB8: .4byte 0x00000ced -_080CEEBC: .4byte 0x00000cf9 + .pool _080CEEC0: - ldr r2, _080CEEFC + ldr r2, =0x00000cf9 adds r0, r1, r2 - ldr r1, _080CEF00 + ldr r1, =0x085e8264 movs r2, 0 movs r3, 0x8 bl sub_8009128 _080CEECE: - ldr r4, _080CEF04 + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r3, _080CEF08 + ldr r3, =0x00000d1d adds r0, r3 movs r1, 0 movs r2, 0x8 bl sub_80090FC ldr r0, [r4] - ldr r1, _080CEF0C + ldr r1, =0x00000d41 adds r0, r1 movs r1, 0 movs r2, 0x8 bl sub_80090FC ldr r0, [r4] - ldr r2, _080CEF10 + ldr r2, =0x00000d65 adds r0, r2 _080CEEF2: movs r1, 0 @@ -423495,12 +409409,7 @@ _080CEEF2: bl sub_80090FC b _080CF0B8 .align 2, 0 -_080CEEFC: .4byte 0x00000cf9 -_080CEF00: .4byte 0x085e8264 -_080CEF04: .4byte 0x02039d08 -_080CEF08: .4byte 0x00000d1d -_080CEF0C: .4byte 0x00000d41 -_080CEF10: .4byte 0x00000d65 + .pool _080CEF14: cmp r2, 0x1D beq _080CEF1C @@ -423510,44 +409419,44 @@ _080CEF1C: movs r3, 0xFF mov r9, r3 _080CEF20: - ldr r4, _080CEFA0 + ldr r4, =0x02039d08 ldr r1, [r4] - ldr r2, _080CEFA4 + ldr r2, =0x00000cf9 adds r0, r1, r2 - ldr r3, _080CEFA8 + ldr r3, =0x00000cee adds r1, r3 movs r2, 0 movs r3, 0x5 bl sub_8009128 ldr r1, [r4] - ldr r0, _080CEFAC + ldr r0, =0x00000d1d adds r2, r1, r0 movs r0, 0xBA strb r0, [r2] - ldr r3, _080CEFB0 + ldr r3, =0x00000d1e adds r2, r1, r3 ldr r0, [r4] - ldr r1, _080CEFB4 + ldr r1, =0x00000ce4 adds r0, r1 ldrh r1, [r0] movs r0, 0xB muls r1, r0 - ldr r0, _080CEFB8 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r2, 0 movs r2, 0 movs r3, 0x5 bl sub_8009128 ldr r4, [r4] - ldr r3, _080CEFBC + ldr r3, =0x00000d41 adds r2, r4, r3 movs r0, 0xFC strb r0, [r2] - ldr r0, _080CEFC0 + ldr r0, =0x00000d42 adds r2, r4, r0 movs r0, 0x4 strb r0, [r2] - ldr r1, _080CEFC4 + ldr r1, =0x00000d43 adds r2, r4, r1 mov r3, r9 cmp r3, 0 @@ -423556,7 +409465,7 @@ _080CEF20: beq _080CF000 movs r0, 0x2 strb r0, [r2] - ldr r0, _080CEFC8 + ldr r0, =0x00000d44 adds r2, r4, r0 movs r0, 0x1 strb r0, [r2] @@ -423564,38 +409473,26 @@ _080CEF20: adds r2, r4, r1 movs r0, 0x3 strb r0, [r2] - ldr r3, _080CEFCC + ldr r3, =0x00000d46 adds r2, r4, r3 movs r0, 0x77 strb r0, [r2] - ldr r0, _080CEFD0 + ldr r0, =0x00000d47 adds r2, r4, r0 b _080CF020 .align 2, 0 -_080CEFA0: .4byte 0x02039d08 -_080CEFA4: .4byte 0x00000cf9 -_080CEFA8: .4byte 0x00000cee -_080CEFAC: .4byte 0x00000d1d -_080CEFB0: .4byte 0x00000d1e -_080CEFB4: .4byte 0x00000ce4 -_080CEFB8: .4byte 0x083185c8 -_080CEFBC: .4byte 0x00000d41 -_080CEFC0: .4byte 0x00000d42 -_080CEFC4: .4byte 0x00000d43 -_080CEFC8: .4byte 0x00000d44 -_080CEFCC: .4byte 0x00000d46 -_080CEFD0: .4byte 0x00000d47 + .pool _080CEFD4: strb r0, [r2] - ldr r1, _080CEFF4 + ldr r1, =0x00000d44 adds r2, r4, r1 movs r0, 0x1 strb r0, [r2] - ldr r3, _080CEFF8 + ldr r3, =0x00000d45 adds r2, r4, r3 movs r0, 0x5 strb r0, [r2] - ldr r0, _080CEFFC + ldr r0, =0x00000d46 adds r2, r4, r0 movs r0, 0xB5 strb r0, [r2] @@ -423603,21 +409500,19 @@ _080CEFD4: adds r2, r4, r1 b _080CF020 .align 2, 0 -_080CEFF4: .4byte 0x00000d44 -_080CEFF8: .4byte 0x00000d45 -_080CEFFC: .4byte 0x00000d46 + .pool _080CF000: movs r0, 0x6 strb r0, [r2] - ldr r3, _080CF090 + ldr r3, =0x00000d44 adds r2, r4, r3 movs r0, 0x1 strb r0, [r2] - ldr r0, _080CF094 + ldr r0, =0x00000d45 adds r2, r4, r0 movs r0, 0x7 strb r0, [r2] - ldr r1, _080CF098 + ldr r1, =0x00000d46 adds r2, r4, r1 movs r0, 0xB6 strb r0, [r2] @@ -423648,9 +409543,9 @@ _080CF020: movs r0, 0x5 strb r0, [r2] adds r2, 0x1 - ldr r4, _080CF09C + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r1, _080CF0A0 + ldr r1, =0x00000cec adds r0, r1 ldrb r1, [r0] adds r0, r2, 0 @@ -423662,12 +409557,12 @@ _080CF020: movs r0, 0xFF strb r0, [r2, 0x1] ldr r4, [r4] - ldr r2, _080CF0A4 + ldr r2, =0x00000ce6 adds r1, r4, r2 ldrh r0, [r1] cmp r0, 0 beq _080CF0AC - ldr r3, _080CF0A8 + ldr r3, =0x00000d65 adds r4, r3 bl itemid_get_item adds r1, r0, 0 @@ -423677,15 +409572,9 @@ _080CF020: bl sub_8009128 b _080CF0B8 .align 2, 0 -_080CF090: .4byte 0x00000d44 -_080CF094: .4byte 0x00000d45 -_080CF098: .4byte 0x00000d46 -_080CF09C: .4byte 0x02039d08 -_080CF0A0: .4byte 0x00000cec -_080CF0A4: .4byte 0x00000ce6 -_080CF0A8: .4byte 0x00000d65 + .pool _080CF0AC: - ldr r1, _080CF0C8 + ldr r1, =0x00000d65 adds r0, r4, r1 movs r1, 0 movs r2, 0x8 @@ -423699,15 +409588,15 @@ _080CF0B8: pop {r0} bx r0 .align 2, 0 -_080CF0C8: .4byte 0x00000d65 + .pool thumb_func_end sub_80CEC00 thumb_func_start sub_80CF0CC sub_80CF0CC: @ 80CF0CC push {lr} - ldr r0, _080CF0EC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CF0F0 + ldr r1, =0x000021ff adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -423720,8 +409609,7 @@ _080CF0E4: bl sub_80CF108 b _080CF0FE .align 2, 0 -_080CF0EC: .4byte 0x02039d08 -_080CF0F0: .4byte 0x000021ff + .pool _080CF0F4: bl sub_80CF374 b _080CF0FE @@ -423741,28 +409629,28 @@ sub_80CF108: @ 80CF108 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _080CF18C + ldr r0, =0x02039d78 ldrb r0, [r0] mov r8, r0 - ldr r2, _080CF190 + ldr r2, =0x02039d79 ldrb r4, [r2] - ldr r5, _080CF194 + ldr r5, =0x02039d08 ldr r0, [r5] - ldr r1, _080CF198 + ldr r1, =0x00000cd2 mov r10, r1 add r0, r10 movs r1, 0 strb r1, [r0] ldr r0, [r5] - ldr r7, _080CF19C + ldr r7, =0x00000cd3 adds r0, r7 strb r1, [r0] ldr r0, [r5] - ldr r3, _080CF1A0 + ldr r3, =0x00000cd7 mov r9, r3 add r0, r9 strb r1, [r0] - ldr r6, _080CF1A4 + ldr r6, =0x030022c0 ldrh r1, [r6, 0x30] movs r0, 0x40 ands r0, r1 @@ -423803,13 +409691,7 @@ _080CF168: strb r6, [r0] b _080CF358 .align 2, 0 -_080CF18C: .4byte 0x02039d78 -_080CF190: .4byte 0x02039d79 -_080CF194: .4byte 0x02039d08 -_080CF198: .4byte 0x00000cd2 -_080CF19C: .4byte 0x00000cd3 -_080CF1A0: .4byte 0x00000cd7 -_080CF1A4: .4byte 0x030022c0 + .pool _080CF1A8: movs r0, 0x20 ands r0, r1 @@ -423883,20 +409765,20 @@ _080CF220: lsls r0, 24 cmp r0, 0 beq _080CF2E4 - ldr r0, _080CF240 + ldr r0, =0x02039d7d ldrb r0, [r0] cmp r0, 0 bne _080CF244 movs r0, 0x8 b _080CF366 .align 2, 0 -_080CF240: .4byte 0x02039d7d + .pool _080CF244: ldr r1, [r5] ldrb r0, [r1, 0x1] cmp r0, 0x2 bne _080CF254 - ldr r0, _080CF270 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0x1 bne _080CF2D4 @@ -423909,13 +409791,12 @@ _080CF254: cmp r0, 0xE bhi _080CF2E4 lsls r0, 2 - ldr r1, _080CF274 + ldr r1, =_080CF278 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CF270: .4byte 0x02039d7a -_080CF274: .4byte _080CF278 + .pool .align 2, 0 _080CF278: .4byte _080CF2B4 @@ -423958,15 +409839,15 @@ _080CF2D0: movs r0, 0x12 b _080CF366 _080CF2D4: - ldr r2, _080CF2E0 + ldr r2, =0x000021ff adds r0, r1, r2 strb r4, [r0] movs r0, 0x14 b _080CF366 .align 2, 0 -_080CF2E0: .4byte 0x000021ff + .pool _080CF2E4: - ldr r2, _080CF2F4 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 @@ -423975,9 +409856,9 @@ _080CF2E4: movs r0, 0x13 b _080CF366 .align 2, 0 -_080CF2F4: .4byte 0x030022c0 + .pool _080CF2F8: - ldr r0, _080CF314 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 @@ -423991,7 +409872,7 @@ _080CF2F8: movs r0, 0xA b _080CF366 .align 2, 0 -_080CF314: .4byte 0x03005d90 + .pool _080CF318: movs r0, 0x80 lsls r0, 1 @@ -424050,7 +409931,7 @@ _080CF366: thumb_func_start sub_80CF374 sub_80CF374: @ 80CF374 push {r4,lr} - ldr r1, _080CF3A4 + ldr r1, =0x030022c0 ldrh r0, [r1, 0x2C] movs r4, 0x1 ands r4, r0 @@ -424061,7 +409942,7 @@ sub_80CF374: @ 80CF374 ands r0, r1 cmp r0, 0 beq _080CF3AC - ldr r4, _080CF3A8 + ldr r4, =0x02039d79 movs r0, 0 ldrsb r0, [r4, r0] movs r1, 0x6 @@ -424073,14 +409954,13 @@ sub_80CF374: @ 80CF374 subs r1, 0x6 b _080CF40E .align 2, 0 -_080CF3A4: .4byte 0x030022c0 -_080CF3A8: .4byte 0x02039d79 + .pool _080CF3AC: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _080CF3CC - ldr r1, _080CF3C8 + ldr r1, =0x02039d79 movs r0, 0 ldrsb r0, [r1, r0] adds r0, 0x6 @@ -424090,13 +409970,13 @@ _080CF3AC: adds r1, 0x6 b _080CF40E .align 2, 0 -_080CF3C8: .4byte 0x02039d79 + .pool _080CF3CC: movs r0, 0x20 ands r0, r1 cmp r0, 0 beq _080CF3F0 - ldr r4, _080CF3EC + ldr r4, =0x02039d79 movs r0, 0 ldrsb r0, [r4, r0] movs r1, 0x6 @@ -424108,13 +409988,13 @@ _080CF3CC: subs r1, 0x1 b _080CF40E .align 2, 0 -_080CF3EC: .4byte 0x02039d79 + .pool _080CF3F0: movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _080CF424 - ldr r4, _080CF41C + ldr r4, =0x02039d79 movs r0, 0 ldrsb r0, [r4, r0] adds r0, 0x1 @@ -424132,7 +410012,7 @@ _080CF40E: movs r0, 0x15 b _080CF49C .align 2, 0 -_080CF41C: .4byte 0x02039d79 + .pool _080CF420: movs r0, 0x18 b _080CF49C @@ -424143,45 +410023,40 @@ _080CF428: bl sub_80D0BA4 lsls r0, 24 lsrs r0, 24 - ldr r1, _080CF464 + ldr r1, =0x02039d79 ldrb r1, [r1] lsls r1, 24 asrs r1, 24 cmp r0, r1 beq _080CF47C - ldr r2, _080CF468 - ldr r0, _080CF46C + ldr r2, =0x02039d7a + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r3, _080CF470 + ldr r3, =0x00000ce4 adds r0, r1, r3 ldrh r0, [r0] negs r0, r0 lsrs r0, 31 strb r0, [r2] - ldr r0, _080CF474 + ldr r0, =0x000021ff adds r1, r0 movs r0, 0x2 strb r0, [r1] bl get_preferred_box - ldr r1, _080CF478 + ldr r1, =0x02039d7b strb r0, [r1] movs r0, 0x17 b _080CF49C .align 2, 0 -_080CF464: .4byte 0x02039d79 -_080CF468: .4byte 0x02039d7a -_080CF46C: .4byte 0x02039d08 -_080CF470: .4byte 0x00000ce4 -_080CF474: .4byte 0x000021ff -_080CF478: .4byte 0x02039d7b + .pool _080CF47C: - ldr r1, _080CF4A4 + ldr r1, =0x02039d08 ldr r0, [r1] - ldr r2, _080CF4A8 + ldr r2, =0x000021ff adds r0, r2 strb r4, [r0] ldr r0, [r1] - ldr r3, _080CF4AC + ldr r3, =0x00000cb8 adds r0, r3 ldr r1, [r0] adds r1, 0x3E @@ -424196,15 +410071,13 @@ _080CF49C: pop {r1} bx r1 .align 2, 0 -_080CF4A4: .4byte 0x02039d08 -_080CF4A8: .4byte 0x000021ff -_080CF4AC: .4byte 0x00000cb8 + .pool thumb_func_end sub_80CF374 thumb_func_start sub_80CF4B0 sub_80CF4B0: @ 80CF4B0 push {r4,lr} - ldr r2, _080CF4D4 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 @@ -424215,13 +410088,12 @@ sub_80CF4B0: @ 80CF4B0 lsls r0, 24 cmp r0, 0 beq _080CF588 - ldr r0, _080CF4D8 + ldr r0, =0x02039d79 ldrb r1, [r0] subs r1, 0x6 b _080CF53A .align 2, 0 -_080CF4D4: .4byte 0x030022c0 -_080CF4D8: .4byte 0x02039d79 + .pool _080CF4DC: movs r0, 0x80 ands r0, r1 @@ -424232,12 +410104,12 @@ _080CF4DC: lsls r0, 24 cmp r0, 0 beq _080CF588 - ldr r0, _080CF4F8 + ldr r0, =0x02039d79 ldrb r1, [r0] adds r1, 0x6 b _080CF53A .align 2, 0 -_080CF4F8: .4byte 0x02039d79 + .pool _080CF4FC: movs r0, 0x20 ands r0, r1 @@ -424248,12 +410120,12 @@ _080CF4FC: lsls r0, 24 cmp r0, 0 beq _080CF5A2 - ldr r0, _080CF518 + ldr r0, =0x02039d79 ldrb r1, [r0] subs r1, 0x1 b _080CF53A .align 2, 0 -_080CF518: .4byte 0x02039d79 + .pool _080CF51C: movs r0, 0x10 ands r0, r1 @@ -424266,7 +410138,7 @@ _080CF51C: lsls r0, 24 cmp r0, 0 beq _080CF5B6 - ldr r0, _080CF548 + ldr r0, =0x02039d79 ldrb r1, [r0] adds r1, 0x1 _080CF53A: @@ -424277,7 +410149,7 @@ _080CF53A: movs r0, 0x19 b _080CF5BC .align 2, 0 -_080CF548: .4byte 0x02039d79 + .pool _080CF54C: ldrh r1, [r2, 0x2E] movs r0, 0x1 @@ -424288,19 +410160,17 @@ _080CF54C: lsls r0, 24 cmp r0, 0 beq _080CF588 - ldr r0, _080CF574 + ldr r0, =0x02039d7a strb r4, [r0] - ldr r0, _080CF578 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CF57C + ldr r1, =0x000021ff adds r0, r1 strb r4, [r0] movs r0, 0x1A b _080CF5BC .align 2, 0 -_080CF574: .4byte 0x02039d7a -_080CF578: .4byte 0x02039d08 -_080CF57C: .4byte 0x000021ff + .pool _080CF580: movs r0, 0x2 ands r0, r1 @@ -424310,7 +410180,7 @@ _080CF588: movs r0, 0x18 b _080CF5BC _080CF58C: - ldr r0, _080CF5A8 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 @@ -424325,7 +410195,7 @@ _080CF5A2: movs r0, 0xA b _080CF5BC .align 2, 0 -_080CF5A8: .4byte 0x03005d90 + .pool _080CF5AC: movs r0, 0x80 lsls r0, 1 @@ -424349,19 +410219,19 @@ sub_80CF5C4: @ 80CF5C4 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _080CF634 + ldr r0, =0x02039d78 ldrb r0, [r0] mov r9, r0 - ldr r6, _080CF638 + ldr r6, =0x02039d79 ldrb r4, [r6] - ldr r2, _080CF63C + ldr r2, =0x02039d08 ldr r0, [r2] - ldr r1, _080CF640 + ldr r1, =0x00000cd3 adds r0, r1 movs r1, 0 strb r1, [r0] ldr r0, [r2] - ldr r3, _080CF644 + ldr r3, =0x00000cd2 adds r0, r3 strb r1, [r0] ldr r0, [r2] @@ -424370,7 +410240,7 @@ sub_80CF5C4: @ 80CF5C4 strb r1, [r0] mov r8, r1 movs r7, 0 - ldr r1, _080CF648 + ldr r1, =0x030022c0 ldrh r3, [r1, 0x30] movs r0, 0x40 ands r0, r3 @@ -424405,12 +410275,7 @@ _080CF630: movs r7, 0x1 b _080CF7CA .align 2, 0 -_080CF634: .4byte 0x02039d78 -_080CF638: .4byte 0x02039d79 -_080CF63C: .4byte 0x02039d08 -_080CF640: .4byte 0x00000cd3 -_080CF644: .4byte 0x00000cd2 -_080CF648: .4byte 0x030022c0 + .pool _080CF64C: movs r0, 0x20 ands r0, r3 @@ -424423,13 +410288,13 @@ _080CF64C: beq _080CF670 movs r7, 0x1 ldr r0, [r2] - ldr r2, _080CF66C + ldr r2, =0x00000cd6 adds r0, r2 strb r1, [r0] movs r4, 0 b _080CF7C6 .align 2, 0 -_080CF66C: .4byte 0x00000cd6 + .pool _080CF670: mov r3, r12 ldrh r1, [r3, 0x30] @@ -424443,12 +410308,12 @@ _080CF670: bne _080CF694 movs r7, 0x1 ldr r0, [r2] - ldr r1, _080CF690 + ldr r1, =0x00000cd6 adds r0, r1 ldrb r4, [r0] b _080CF7C6 .align 2, 0 -_080CF690: .4byte 0x00000cd6 + .pool _080CF694: movs r7, 0x6 movs r2, 0 @@ -424481,14 +410346,14 @@ _080CF6C4: lsls r0, 24 cmp r0, 0 beq _080CF75C - ldr r0, _080CF6DC + ldr r0, =0x02039d7d ldrb r0, [r0] cmp r0, 0 bne _080CF6E0 movs r0, 0x8 b _080CF7D8 .align 2, 0 -_080CF6DC: .4byte 0x02039d7d + .pool _080CF6E0: movs r0, 0 bl sub_80CFF98 @@ -424498,12 +410363,12 @@ _080CF6E0: cmp r0, 0xE bhi _080CF75C lsls r0, 2 - ldr r1, _080CF6FC + ldr r1, =_080CF700 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080CF6FC: .4byte _080CF700 + .pool .align 2, 0 _080CF700: .4byte _080CF73C @@ -424546,14 +410411,14 @@ _080CF758: movs r0, 0x12 b _080CF7D8 _080CF75C: - ldr r2, _080CF778 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 mov r12, r2 cmp r0, 0 beq _080CF784 - ldr r0, _080CF77C + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 @@ -424561,8 +410426,7 @@ _080CF75C: movs r0, 0x13 b _080CF7D8 .align 2, 0 -_080CF778: .4byte 0x030022c0 -_080CF77C: .4byte 0x02039d08 + .pool _080CF780: movs r1, 0x1 mov r8, r1 @@ -424625,21 +410489,21 @@ _080CF7D8: thumb_func_start sub_80CF7E4 sub_80CF7E4: @ 80CF7E4 push {r4-r6,lr} - ldr r3, _080CF820 + ldr r3, =0x02039d08 ldr r0, [r3] - ldr r1, _080CF824 + ldr r1, =0x00000cd3 adds r0, r1 movs r1, 0 strb r1, [r0] ldr r0, [r3] - ldr r2, _080CF828 + ldr r2, =0x00000cd2 adds r0, r2 strb r1, [r0] ldr r0, [r3] - ldr r5, _080CF82C + ldr r5, =0x00000cd7 adds r0, r5 strb r1, [r0] - ldr r1, _080CF830 + ldr r1, =0x030022c0 ldrh r2, [r1, 0x30] movs r0, 0x40 ands r0, r2 @@ -424654,11 +410518,7 @@ sub_80CF7E4: @ 80CF7E4 movs r6, 0x2 b _080CF8B6 .align 2, 0 -_080CF820: .4byte 0x02039d08 -_080CF824: .4byte 0x00000cd3 -_080CF828: .4byte 0x00000cd2 -_080CF82C: .4byte 0x00000cd7 -_080CF830: .4byte 0x030022c0 + .pool _080CF834: ldrh r2, [r1, 0x2C] movs r0, 0x20 @@ -424669,7 +410529,7 @@ _080CF834: ands r0, r2 cmp r0, 0 bne _080CF86E - ldr r0, _080CF860 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 @@ -424683,7 +410543,7 @@ _080CF85A: movs r0, 0xA b _080CF8D2 .align 2, 0 -_080CF860: .4byte 0x03005d90 + .pool _080CF864: movs r0, 0x80 lsls r0, 1 @@ -424755,27 +410615,27 @@ sub_80CF8D8: @ 80CF8D8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _080CF928 + ldr r0, =0x02039d78 ldrb r0, [r0] mov r8, r0 - ldr r0, _080CF92C + ldr r0, =0x02039d79 mov r12, r0 ldrb r2, [r0] - ldr r3, _080CF930 + ldr r3, =0x02039d08 ldr r0, [r3] - ldr r1, _080CF934 + ldr r1, =0x00000cd3 adds r0, r1 movs r1, 0 strb r1, [r0] ldr r0, [r3] - ldr r6, _080CF938 + ldr r6, =0x00000cd2 adds r0, r6 strb r1, [r0] ldr r0, [r3] - ldr r5, _080CF93C + ldr r5, =0x00000cd7 adds r0, r5 strb r1, [r0] - ldr r7, _080CF940 + ldr r7, =0x030022c0 ldrh r1, [r7, 0x30] movs r0, 0x40 ands r0, r1 @@ -424793,13 +410653,7 @@ sub_80CF8D8: @ 80CF8D8 ldr r0, [r4] b _080CF9D0 .align 2, 0 -_080CF928: .4byte 0x02039d78 -_080CF92C: .4byte 0x02039d79 -_080CF930: .4byte 0x02039d08 -_080CF934: .4byte 0x00000cd3 -_080CF938: .4byte 0x00000cd2 -_080CF93C: .4byte 0x00000cd7 -_080CF940: .4byte 0x030022c0 + .pool _080CF944: movs r0, 0x20 ands r0, r1 @@ -424900,12 +410754,12 @@ _080CF9E2: sub_80CF9EC: @ 80CF9EC push {r4,r5,lr} movs r3, 0 - ldr r0, _080CFA18 + ldr r0, =0x0857b9bc ldr r1, [r0] adds r4, r0, 0 cmp r1, 0 beq _080CFA30 - ldr r5, _080CFA1C + ldr r5, =0x02039d78 _080CF9FC: lsls r0, r3, 3 adds r2, r0, r4 @@ -424921,8 +410775,7 @@ _080CF9FC: lsrs r0, 24 b _080CFA32 .align 2, 0 -_080CFA18: .4byte 0x0857b9bc -_080CFA1C: .4byte 0x02039d78 + .pool _080CFA20: adds r0, r3, 0x1 lsls r0, 16 @@ -424960,7 +410813,7 @@ sub_80CFA38: @ 80CFA38 sub_80CFA5C: @ 80CFA5C push {lr} bl sub_80CFEF0 - ldr r0, _080CFA74 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 @@ -424968,7 +410821,7 @@ sub_80CFA5C: @ 80CFA5C bl sub_80CFB44 b _080CFA7C .align 2, 0 -_080CFA74: .4byte 0x02039d08 + .pool _080CFA78: bl sub_80CFA84 _080CFA7C: @@ -424984,7 +410837,7 @@ sub_80CFA84: @ 80CFA84 bl sub_80CD504 lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _080CFAA4 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 @@ -424995,7 +410848,7 @@ sub_80CFA84: @ 80CFA84 beq _080CFABA b _080CFAF4 .align 2, 0 -_080CFAA4: .4byte 0x02039d08 + .pool _080CFAA8: cmp r0, 0x2 beq _080CFAC6 @@ -425013,7 +410866,7 @@ _080CFABA: bl sub_80CFF34 b _080CFAF8 _080CFAC6: - ldr r0, _080CFADC + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CFAE8 @@ -425023,7 +410876,7 @@ _080CFAC6: bl sub_80CFF34 b _080CFAF8 .align 2, 0 -_080CFADC: .4byte 0x02039d7a + .pool _080CFAE0: movs r0, 0x5 bl sub_80CFF34 @@ -425040,12 +410893,12 @@ _080CFAF4: _080CFAF8: movs r0, 0x6 bl sub_80CFF34 - ldr r0, _080CFB1C + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x2 bne _080CFB2A - ldr r0, _080CFB20 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -425055,8 +410908,7 @@ _080CFAF8: bl sub_80CFF34 b _080CFB2A .align 2, 0 -_080CFB1C: .4byte 0x02039d08 -_080CFB20: .4byte 0x02039d78 + .pool _080CFB24: movs r0, 0x1 bl sub_80CFF34 @@ -425076,9 +410928,9 @@ _080CFB3E: thumb_func_start sub_80CFB44 sub_80CFB44: @ 80CFB44 push {r4,r5,lr} - ldr r4, _080CFB80 + ldr r4, =0x02039d08 ldr r0, [r4] - ldr r5, _080CFB84 + ldr r5, =0x00000ce4 adds r0, r5 ldrh r1, [r0] movs r0, 0xCE @@ -425090,7 +410942,7 @@ sub_80CFB44: @ 80CFB44 cmp r0, 0 bne _080CFBAC ldr r2, [r4] - ldr r0, _080CFB88 + ldr r0, =0x00000ce6 adds r1, r2, r0 ldrh r0, [r1] cmp r0, 0 @@ -425103,9 +410955,7 @@ sub_80CFB44: @ 80CFB44 bl sub_80CFF34 b _080CFBE4 .align 2, 0 -_080CFB80: .4byte 0x02039d08 -_080CFB84: .4byte 0x00000ce4 -_080CFB88: .4byte 0x00000ce6 + .pool _080CFB8C: ldrh r0, [r1] bl itemid_is_mail @@ -425122,7 +410972,7 @@ _080CFBA4: b _080CFBE4 _080CFBAC: ldr r2, [r4] - ldr r0, _080CFBC8 + ldr r0, =0x00000ce6 adds r1, r2, r0 ldrh r0, [r1] cmp r0, 0 @@ -425135,7 +410985,7 @@ _080CFBAC: bl sub_80CFF34 b _080CFBE4 .align 2, 0 -_080CFBC8: .4byte 0x00000ce6 + .pool _080CFBCC: ldrh r0, [r1] bl itemid_is_mail @@ -425161,9 +411011,9 @@ _080CFBEC: thumb_func_start sub_80CFBF4 sub_80CFBF4: @ 80CFBF4 - ldr r1, _080CFC0C + ldr r1, =0x02039d08 ldr r1, [r1] - ldr r2, _080CFC10 + ldr r2, =0x00000cb4 adds r1, r2 ldr r2, [r1] ldrh r2, [r2, 0x20] @@ -425174,8 +411024,7 @@ sub_80CFBF4: @ 80CFBF4 strh r1, [r0, 0x22] bx lr .align 2, 0 -_080CFC0C: .4byte 0x02039d08 -_080CFC10: .4byte 0x00000cb4 + .pool thumb_func_end sub_80CFBF4 thumb_func_start sub_80CFC14 @@ -425183,14 +411032,14 @@ sub_80CFC14: @ 80CFC14 push {r4-r6,lr} sub sp, 0x2C mov r1, sp - ldr r0, _080CFCE0 + ldr r0, =0x0857b9e4 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} add r4, sp, 0x18 adds r1, r4, 0 - ldr r0, _080CFCE4 + ldr r0, =0x0857b9fc ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldr r0, [r0] @@ -425199,22 +411048,22 @@ sub_80CFC14: @ 80CFC14 bl gpu_tile_obj_alloc_and_load_multiple adds r0, r4, 0 bl gpu_pal_obj_alloc_and_load_multiple - ldr r0, _080CFCE8 + ldr r0, =0x0000daca bl gpu_pal_tags_index_of - ldr r6, _080CFCEC + ldr r6, =0x02039d08 ldr r1, [r6] - ldr r4, _080CFCF0 + ldr r4, =0x00000cd8 adds r1, r4 strb r0, [r1] - ldr r0, _080CFCF4 + ldr r0, =0x0000dac7 bl gpu_pal_tags_index_of ldr r1, [r6] - ldr r5, _080CFCF8 + ldr r5, =0x00000cd9 adds r1, r5 strb r0, [r1] - ldr r0, _080CFCFC + ldr r0, =0x02039d78 ldrb r0, [r0] - ldr r1, _080CFD00 + ldr r1, =0x02039d79 ldrb r1, [r1] add r4, sp, 0x28 mov r5, sp @@ -425222,7 +411071,7 @@ sub_80CFC14: @ 80CFC14 adds r2, r4, 0 adds r3, r5, 0 bl sub_80CD444 - ldr r0, _080CFD04 + ldr r0, =0x0857ba50 movs r2, 0 ldrsh r1, [r4, r2] movs r3, 0 @@ -425234,16 +411083,16 @@ sub_80CFC14: @ 80CFC14 cmp r0, 0x40 beq _080CFD18 ldr r2, [r6] - ldr r4, _080CFD08 + ldr r4, =0x00000cb4 adds r3, r2, r4 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080CFD0C + ldr r0, =0x02020630 adds r1, r0 str r1, [r3] - ldr r0, _080CFD10 - ldr r5, _080CFCF0 + ldr r0, =0x02039d7d + ldr r5, =0x00000cd8 adds r2, r5 ldrb r0, [r0] adds r2, r0 @@ -425264,7 +411113,7 @@ sub_80CFC14: @ 80CFC14 movs r1, 0x4 orrs r0, r1 strb r0, [r2, 0x5] - ldr r0, _080CFD14 + ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 beq _080CFD22 @@ -425275,28 +411124,15 @@ sub_80CFC14: @ 80CFC14 bl obj_anim_image_start b _080CFD22 .align 2, 0 -_080CFCE0: .4byte 0x0857b9e4 -_080CFCE4: .4byte 0x0857b9fc -_080CFCE8: .4byte 0x0000daca -_080CFCEC: .4byte 0x02039d08 -_080CFCF0: .4byte 0x00000cd8 -_080CFCF4: .4byte 0x0000dac7 -_080CFCF8: .4byte 0x00000cd9 -_080CFCFC: .4byte 0x02039d78 -_080CFD00: .4byte 0x02039d79 -_080CFD04: .4byte 0x0857ba50 -_080CFD08: .4byte 0x00000cb4 -_080CFD0C: .4byte 0x02020630 -_080CFD10: .4byte 0x02039d7d -_080CFD14: .4byte 0x02039d7a + .pool _080CFD18: ldr r0, [r6] - ldr r1, _080CFD34 + ldr r1, =0x00000cb4 adds r0, r1 movs r1, 0 str r1, [r0] _080CFD22: - ldr r0, _080CFD38 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -425306,13 +411142,12 @@ _080CFD22: movs r4, 0x1 b _080CFD40 .align 2, 0 -_080CFD34: .4byte 0x00000cb4 -_080CFD38: .4byte 0x02039d78 + .pool _080CFD3C: movs r3, 0x15 movs r4, 0x2 _080CFD40: - ldr r0, _080CFD94 + ldr r0, =0x0857ba68 movs r1, 0 movs r2, 0 bl obj_add_from_template_forward_search @@ -425320,14 +411155,14 @@ _080CFD40: lsrs r0, 24 cmp r0, 0x40 beq _080CFDA8 - ldr r5, _080CFD98 + ldr r5, =0x02039d08 ldr r2, [r5] - ldr r3, _080CFD9C + ldr r3, =0x00000cb8 adds r2, r3 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080CFDA0 + ldr r0, =0x02020630 adds r1, r0 str r1, [r2] lsls r3, r4, 2 @@ -425337,14 +411172,14 @@ _080CFD40: ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] - ldr r0, _080CFDA4 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 beq _080CFDB4 ldr r0, [r5] - ldr r4, _080CFD9C + ldr r4, =0x00000cb8 adds r0, r4 ldr r1, [r0] adds r1, 0x3E @@ -425354,15 +411189,11 @@ _080CFD40: strb r0, [r1] b _080CFDB4 .align 2, 0 -_080CFD94: .4byte 0x0857ba68 -_080CFD98: .4byte 0x02039d08 -_080CFD9C: .4byte 0x00000cb8 -_080CFDA0: .4byte 0x02020630 -_080CFDA4: .4byte 0x02039d78 + .pool _080CFDA8: - ldr r0, _080CFDBC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r5, _080CFDC0 + ldr r5, =0x00000cb8 adds r0, r5 movs r1, 0 str r1, [r0] @@ -425372,14 +411203,13 @@ _080CFDB4: pop {r0} bx r0 .align 2, 0 -_080CFDBC: .4byte 0x02039d08 -_080CFDC0: .4byte 0x00000cb8 + .pool thumb_func_end sub_80CFC14 thumb_func_start sub_80CFDC4 sub_80CFDC4: @ 80CFDC4 push {lr} - ldr r2, _080CFDF8 + ldr r2, =0x02039d7d movs r1, 0 ldrb r0, [r2] cmp r0, 0 @@ -425387,12 +411217,12 @@ sub_80CFDC4: @ 80CFDC4 movs r1, 0x1 _080CFDD2: strb r1, [r2] - ldr r0, _080CFDFC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r3, _080CFE00 + ldr r3, =0x00000cb4 adds r1, r0, r3 ldr r3, [r1] - ldr r1, _080CFE04 + ldr r1, =0x00000cd8 adds r0, r1 ldrb r2, [r2] adds r0, r2 @@ -425406,19 +411236,16 @@ _080CFDD2: pop {r0} bx r0 .align 2, 0 -_080CFDF8: .4byte 0x02039d7d -_080CFDFC: .4byte 0x02039d08 -_080CFE00: .4byte 0x00000cb4 -_080CFE04: .4byte 0x00000cd8 + .pool thumb_func_end sub_80CFDC4 thumb_func_start sub_80CFE08 sub_80CFE08: @ 80CFE08 - ldr r0, _080CFE10 + ldr r0, =0x02039d79 ldrb r0, [r0] bx lr .align 2, 0 -_080CFE10: .4byte 0x02039d79 + .pool thumb_func_end sub_80CFE08 thumb_func_start sub_80CFE14 @@ -425426,13 +411253,13 @@ sub_80CFE14: @ 80CFE14 push {r4-r6,lr} adds r5, r0, 0 adds r6, r1, 0 - ldr r0, _080CFE40 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 bne _080CFE48 - ldr r4, _080CFE44 + ldr r4, =0x02039d79 movs r0, 0 ldrsb r0, [r4, r0] movs r1, 0x6 @@ -425444,8 +411271,7 @@ sub_80CFE14: @ 80CFE14 bl __divsi3 b _080CFE4C .align 2, 0 -_080CFE40: .4byte 0x02039d78 -_080CFE44: .4byte 0x02039d79 + .pool _080CFE48: movs r0, 0 strb r0, [r5] @@ -425462,33 +411288,32 @@ sub_80CFE54: @ 80CFE54 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _080CFE70 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r2, _080CFE74 + ldr r2, =0x00000cb4 adds r0, r2 ldr r0, [r0] bl obj_anim_image_start pop {r0} bx r0 .align 2, 0 -_080CFE70: .4byte 0x02039d08 -_080CFE74: .4byte 0x00000cb4 + .pool thumb_func_end sub_80CFE54 thumb_func_start sub_80CFE78 sub_80CFE78: @ 80CFE78 - ldr r0, _080CFE80 + ldr r0, =0x02039d7b ldrb r0, [r0] bx lr .align 2, 0 -_080CFE80: .4byte 0x02039d7b + .pool thumb_func_end sub_80CFE78 thumb_func_start sub_80CFE84 sub_80CFE84: @ 80CFE84 - ldr r0, _080CFEA0 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080CFEA4 + ldr r1, =0x00000cb4 adds r0, r1 ldr r2, [r0] ldrb r1, [r2, 0x5] @@ -425500,20 +411325,19 @@ sub_80CFE84: @ 80CFE84 strb r0, [r2, 0x5] bx lr .align 2, 0 -_080CFEA0: .4byte 0x02039d08 -_080CFEA4: .4byte 0x00000cb4 + .pool thumb_func_end sub_80CFE84 thumb_func_start sub_80CFEA8 sub_80CFEA8: @ 80CFEA8 push {lr} - ldr r0, _080CFEC4 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 bne _080CFEC0 - ldr r0, _080CFEC8 + ldr r0, =0x02039d79 ldrb r1, [r0] movs r0, 0 bl sub_80D0E50 @@ -425521,20 +411345,19 @@ _080CFEC0: pop {r0} bx r0 .align 2, 0 -_080CFEC4: .4byte 0x02039d78 -_080CFEC8: .4byte 0x02039d79 + .pool thumb_func_end sub_80CFEA8 thumb_func_start sub_80CFECC sub_80CFECC: @ 80CFECC push {lr} - ldr r0, _080CFEE8 + ldr r0, =0x02039d78 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 cmp r0, 0 bne _080CFEE4 - ldr r0, _080CFEEC + ldr r0, =0x02039d79 ldrb r1, [r0] movs r0, 0 bl sub_80D0D8C @@ -425542,20 +411365,19 @@ _080CFEE4: pop {r0} bx r0 .align 2, 0 -_080CFEE8: .4byte 0x02039d78 -_080CFEEC: .4byte 0x02039d79 + .pool thumb_func_end sub_80CFECC thumb_func_start sub_80CFEF0 sub_80CFEF0: @ 80CFEF0 - ldr r2, _080CFF24 + ldr r2, =0x02039d08 ldr r0, [r2] - ldr r1, _080CFF28 + ldr r1, =0x00000cac adds r0, r1 movs r1, 0 strb r1, [r0] ldr r0, [r2] - ldr r3, _080CFF2C + ldr r3, =0x00000cad adds r0, r3 strb r1, [r0] ldr r0, [r2] @@ -425563,7 +411385,7 @@ sub_80CFEF0: @ 80CFEF0 adds r0, r3 strb r1, [r0] ldr r0, [r2] - ldr r1, _080CFF30 + ldr r1, =0x00000c71 adds r0, r1 movs r1, 0xF strb r1, [r0] @@ -425574,10 +411396,7 @@ sub_80CFEF0: @ 80CFEF0 strh r1, [r0] bx lr .align 2, 0 -_080CFF24: .4byte 0x02039d08 -_080CFF28: .4byte 0x00000cac -_080CFF2C: .4byte 0x00000cad -_080CFF30: .4byte 0x00000c71 + .pool thumb_func_end sub_80CFEF0 thumb_func_start sub_80CFF34 @@ -425585,19 +411404,19 @@ sub_80CFF34: @ 80CFF34 push {r4,r5,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r4, _080CFF84 + ldr r4, =0x02039d08 ldr r2, [r4] - ldr r5, _080CFF88 + ldr r5, =0x00000cac adds r1, r2, r5 ldrb r0, [r1] cmp r0, 0x6 bhi _080CFF7E adds r1, r0, 0 lsls r1, 3 - ldr r0, _080CFF8C + ldr r0, =0x00000c74 adds r1, r0 adds r1, r2, r1 - ldr r2, _080CFF90 + ldr r2, =0x0857ba80 lsls r0, r3, 2 adds r0, r2 ldr r0, [r0] @@ -425607,7 +411426,7 @@ sub_80CFF34: @ 80CFF34 lsls r0, 24 lsrs r1, r0, 24 ldr r0, [r4] - ldr r2, _080CFF94 + ldr r2, =0x00000cad adds r0, r2 ldrb r2, [r0] cmp r1, r2 @@ -425624,11 +411443,7 @@ _080CFF7E: pop {r0} bx r0 .align 2, 0 -_080CFF84: .4byte 0x02039d08 -_080CFF88: .4byte 0x00000cac -_080CFF8C: .4byte 0x00000c74 -_080CFF90: .4byte 0x0857ba80 -_080CFF94: .4byte 0x00000cad + .pool thumb_func_end sub_80CFF34 thumb_func_start sub_80CFF98 @@ -425636,24 +411451,22 @@ sub_80CFF98: @ 80CFF98 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080CFFBC + ldr r0, =0x02039d08 ldr r1, [r0] - ldr r3, _080CFFC0 + ldr r3, =0x00000cac adds r0, r1, r3 ldrb r0, [r0] cmp r2, r0 bcs _080CFFC8 lsls r0, r2, 3 - ldr r2, _080CFFC4 + ldr r2, =0x00000c78 adds r1, r2 adds r1, r0 movs r0, 0 ldrsb r0, [r1, r0] b _080CFFCC .align 2, 0 -_080CFFBC: .4byte 0x02039d08 -_080CFFC0: .4byte 0x00000cac -_080CFFC4: .4byte 0x00000c78 + .pool _080CFFC8: movs r0, 0x1 negs r0, r0 @@ -425667,9 +411480,9 @@ sub_80CFFD0: @ 80CFFD0 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r5, _080D0088 + ldr r5, =0x02039d08 ldr r1, [r5] - ldr r2, _080D008C + ldr r2, =0x00000cad adds r0, r1, r2 ldrb r0, [r0] adds r0, 0x2 @@ -425677,7 +411490,7 @@ sub_80CFFD0: @ 80CFFD0 adds r1, r2 strb r0, [r1] ldr r1, [r5] - ldr r6, _080D0090 + ldr r6, =0x00000cac adds r0, r1, r6 ldrb r0, [r0] lsls r0, 1 @@ -425690,7 +411503,7 @@ sub_80CFFD0: @ 80CFFD0 ldrb r2, [r2] movs r0, 0x1D subs r0, r2 - ldr r2, _080D0094 + ldr r2, =0x00000c6d adds r1, r2 strb r0, [r1] ldr r1, [r5] @@ -425698,11 +411511,11 @@ sub_80CFFD0: @ 80CFFD0 ldrb r2, [r3] movs r0, 0xF subs r0, r2 - ldr r3, _080D0098 + ldr r3, =0x00000c6e adds r1, r3 strb r0, [r1] ldr r0, [r5] - ldr r1, _080D009C + ldr r1, =0x00000c6c adds r0, r1 bl Window_AddFromTemplate ldr r1, [r5] @@ -425727,7 +411540,7 @@ sub_80CFFD0: @ 80CFFD0 ldrb r0, [r0] adds r1, r2, r6 ldrb r1, [r1] - ldr r3, _080D00A0 + ldr r3, =0x00000c74 adds r2, r3 bl PrintMenuTable ldr r1, [r5] @@ -425740,7 +411553,7 @@ sub_80CFFD0: @ 80CFFD0 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram ldr r0, [r5] - ldr r1, _080D00A4 + ldr r1, =0x00000cae adds r0, r1 mov r2, r8 strb r2, [r0] @@ -425750,14 +411563,7 @@ sub_80CFFD0: @ 80CFFD0 pop {r0} bx r0 .align 2, 0 -_080D0088: .4byte 0x02039d08 -_080D008C: .4byte 0x00000cad -_080D0090: .4byte 0x00000cac -_080D0094: .4byte 0x00000c6d -_080D0098: .4byte 0x00000c6e -_080D009C: .4byte 0x00000c6c -_080D00A0: .4byte 0x00000c74 -_080D00A4: .4byte 0x00000cae + .pool thumb_func_end sub_80CFFD0 thumb_func_start sub_80D00A8 @@ -425771,7 +411577,7 @@ sub_80D00AC: @ 80D00AC push {r4,r5,lr} movs r5, 0x2 negs r5, r5 - ldr r4, _080D00E8 + ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 @@ -425797,7 +411603,7 @@ _080D00CE: bl MoveMenuCursor b _080D010A .align 2, 0 -_080D00E8: .4byte 0x030022c0 + .pool _080D00EC: movs r0, 0x80 ands r0, r1 @@ -425821,10 +411627,10 @@ _080D010A: _080D0116: cmp r5, 0 blt _080D0128 - ldr r0, _080D0134 + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r5, 3 - ldr r2, _080D0138 + ldr r2, =0x00000c78 adds r0, r2 adds r0, r1 ldr r5, [r0] @@ -425835,14 +411641,13 @@ _080D0128: pop {r1} bx r1 .align 2, 0 -_080D0134: .4byte 0x02039d08 -_080D0138: .4byte 0x00000c78 + .pool thumb_func_end sub_80D00AC thumb_func_start sub_80D013C sub_80D013C: @ 80D013C push {r4,r5,lr} - ldr r5, _080D0160 + ldr r5, =0x02039d08 ldr r0, [r5] movs r4, 0xCB lsls r4, 4 @@ -425858,22 +411663,22 @@ sub_80D013C: @ 80D013C pop {r0} bx r0 .align 2, 0 -_080D0160: .4byte 0x02039d08 + .pool thumb_func_end sub_80D013C thumb_func_start sub_80D0164 sub_80D0164: @ 80D0164 push {r4,lr} - ldr r4, _080D01A0 - ldr r0, _080D01A4 + ldr r4, =0x02039d80 + ldr r0, =0x00000974 bl malloc str r0, [r4] cmp r0, 0 beq _080D01B0 - ldr r0, _080D01A8 + ldr r0, =0x0857bb1c bl Window_AddFromTemplate8Bpp adds r1, r0, 0 - ldr r0, _080D01AC + ldr r0, =0x02039d08 ldr r0, [r0] movs r2, 0x88 lsls r2, 6 @@ -425890,10 +411695,7 @@ sub_80D0164: @ 80D0164 movs r0, 0x1 b _080D01B2 .align 2, 0 -_080D01A0: .4byte 0x02039d80 -_080D01A4: .4byte 0x00000974 -_080D01A8: .4byte 0x0857bb1c -_080D01AC: .4byte 0x02039d08 + .pool _080D01B0: movs r0, 0 _080D01B2: @@ -425905,7 +411707,7 @@ _080D01B2: thumb_func_start sub_80D01B8 sub_80D01B8: @ 80D01B8 push {lr} - ldr r0, _080D01CC + ldr r0, =0x02039d80 ldr r0, [r0] cmp r0, 0 beq _080D01C6 @@ -425914,12 +411716,12 @@ _080D01C6: pop {r0} bx r0 .align 2, 0 -_080D01CC: .4byte 0x02039d80 + .pool thumb_func_end sub_80D01B8 thumb_func_start sub_80D01D0 sub_80D01D0: @ 80D01D0 - ldr r2, _080D01E0 + ldr r2, =0x02039d80 ldr r1, [r2] movs r3, 0 strb r0, [r1] @@ -425927,25 +411729,24 @@ sub_80D01D0: @ 80D01D0 strb r3, [r0, 0x1] bx lr .align 2, 0 -_080D01E0: .4byte 0x02039d80 + .pool thumb_func_end sub_80D01D0 thumb_func_start sub_80D01E4 sub_80D01E4: @ 80D01E4 push {lr} - ldr r0, _080D01FC + ldr r0, =0x02039d80 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x5 bhi _080D0244 lsls r0, 2 - ldr r1, _080D0200 + ldr r1, =_080D0204 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D01FC: .4byte 0x02039d80 -_080D0200: .4byte _080D0204 + .pool .align 2, 0 _080D0204: .4byte _080D021C @@ -425986,7 +411787,7 @@ _080D0246: sub_80D024C: @ 80D024C push {r4-r6,lr} sub sp, 0x8 - ldr r6, _080D0264 + ldr r6, =0x02039d80 ldr r1, [r6] ldrb r0, [r1, 0x1] cmp r0, 0x1 @@ -425997,7 +411798,7 @@ sub_80D024C: @ 80D024C beq _080D026E b _080D0338 .align 2, 0 -_080D0264: .4byte 0x02039d80 + .pool _080D0268: cmp r0, 0x2 beq _080D0324 @@ -426018,7 +411819,7 @@ _080D027C: ldr r1, [r6] ldrb r0, [r1, 0x3] strb r0, [r1, 0x5] - ldr r4, _080D0318 + ldr r4, =0xfffffc00 movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -426035,7 +411836,7 @@ _080D027C: movs r2, 0 movs r3, 0 bl bg_fill_tilemap_rect - ldr r5, _080D031C + ldr r5, =0x02039d08 ldr r0, [r5] movs r4, 0x88 lsls r4, 6 @@ -426062,7 +411863,7 @@ _080D027C: bl Window_CopyToVram8Bpp movs r0, 0xFC lsls r0, 6 - ldr r2, _080D0320 + ldr r2, =0x00007fff movs r1, 0x8 bl sub_80A2A20 movs r0, 0x2 @@ -426077,9 +411878,7 @@ _080D030E: strb r0, [r1, 0x1] b _080D0338 .align 2, 0 -_080D0318: .4byte 0xfffffc00 -_080D031C: .4byte 0x02039d08 -_080D0320: .4byte 0x00007fff + .pool _080D0324: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -426101,7 +411900,7 @@ _080D033A: thumb_func_start sub_80D0344 sub_80D0344: @ 80D0344 push {r4,lr} - ldr r4, _080D035C + ldr r4, =0x02039d80 ldr r0, [r4] ldrb r0, [r0, 0x1] cmp r0, 0x1 @@ -426112,7 +411911,7 @@ sub_80D0344: @ 80D0344 beq _080D0366 b _080D03A8 .align 2, 0 -_080D035C: .4byte 0x02039d80 + .pool _080D0360: cmp r0, 0x2 beq _080D0382 @@ -426157,7 +411956,7 @@ _080D03AA: thumb_func_start sub_80D03B0 sub_80D03B0: @ 80D03B0 push {r4,lr} - ldr r4, _080D03C4 + ldr r4, =0x02039d80 ldr r0, [r4] ldrb r0, [r0, 0x1] cmp r0, 0 @@ -426166,7 +411965,7 @@ sub_80D03B0: @ 80D03B0 beq _080D040C b _080D0416 .align 2, 0 -_080D03C4: .4byte 0x02039d80 + .pool _080D03C8: bl sub_80CD554 lsls r0, 24 @@ -426183,7 +411982,7 @@ _080D03C8: ldr r1, [r4] ldrb r0, [r1, 0x7] strb r0, [r1, 0x5] - ldr r0, _080D0408 + ldr r0, =0x02039d08 ldr r0, [r0] movs r1, 0x88 lsls r1, 6 @@ -426197,7 +411996,7 @@ _080D03C8: strb r0, [r1, 0x1] b _080D0416 .align 2, 0 -_080D0408: .4byte 0x02039d08 + .pool _080D040C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -426214,7 +412013,7 @@ _080D0418: thumb_func_start sub_80D0420 sub_80D0420: @ 80D0420 push {r4,lr} - ldr r4, _080D0438 + ldr r4, =0x02039d80 ldr r0, [r4] ldrb r0, [r0, 0x1] cmp r0, 0x1 @@ -426225,7 +412024,7 @@ sub_80D0420: @ 80D0420 beq _080D0442 b _080D0498 .align 2, 0 -_080D0438: .4byte 0x02039d80 + .pool _080D043C: cmp r0, 0x2 beq _080D047A @@ -426304,7 +412103,7 @@ _080D04C2: thumb_func_start sub_80D04C8 sub_80D04C8: @ 80D04C8 push {r4,lr} - ldr r4, _080D04E0 + ldr r4, =0x02039d80 ldr r0, [r4] ldrb r0, [r0, 0x1] cmp r0, 0x1 @@ -426315,7 +412114,7 @@ sub_80D04C8: @ 80D04C8 beq _080D04EE b _080D0576 .align 2, 0 -_080D04E0: .4byte 0x02039d80 + .pool _080D04E4: cmp r0, 0x2 beq _080D0532 @@ -426406,7 +412205,7 @@ _080D0596: beq _080D05FC b _080D0624 _080D05A0: - ldr r0, _080D05B8 + ldr r0, =0x02039d80 ldr r1, [r0] ldrb r0, [r1, 0x9] cmp r0, 0 @@ -426418,9 +412217,9 @@ _080D05A0: movs r0, 0 b _080D05F0 .align 2, 0 -_080D05B8: .4byte 0x02039d80 + .pool _080D05BC: - ldr r0, _080D05D8 + ldr r0, =0x02039d80 ldr r1, [r0] ldrb r2, [r1, 0x9] ldrb r0, [r1, 0xB] @@ -426434,9 +412233,9 @@ _080D05BC: movs r0, 0 b _080D05F0 .align 2, 0 -_080D05D8: .4byte 0x02039d80 + .pool _080D05DC: - ldr r0, _080D05F8 + ldr r0, =0x02039d80 ldr r1, [r0] ldrb r0, [r1, 0x8] cmp r0, 0 @@ -426451,9 +412250,9 @@ _080D05F0: bl sub_80D0884 b _080D0624 .align 2, 0 -_080D05F8: .4byte 0x02039d80 + .pool _080D05FC: - ldr r0, _080D0610 + ldr r0, =0x02039d80 ldr r1, [r0] ldrb r2, [r1, 0x8] ldrb r0, [r1, 0xA] @@ -426464,7 +412263,7 @@ _080D060A: movs r0, 0 b _080D0626 .align 2, 0 -_080D0610: .4byte 0x02039d80 + .pool _080D0614: adds r0, r2, 0x1 strb r0, [r1, 0x8] @@ -426483,7 +412282,7 @@ _080D0626: thumb_func_start sub_80D062C sub_80D062C: @ 80D062C push {r4-r7,lr} - ldr r6, _080D06CC + ldr r6, =0x02039d80 ldr r2, [r6] ldrb r3, [r2, 0x2] ldrb r5, [r2, 0x6] @@ -426564,7 +412363,7 @@ _080D06C4: pop {r0} bx r0 .align 2, 0 -_080D06CC: .4byte 0x02039d80 + .pool thumb_func_end sub_80D062C thumb_func_start sub_80D06D0 @@ -426729,7 +412528,7 @@ sub_80D07B0: @ 80D07B0 adds r0, 0x8 lsls r0, 24 lsrs r0, 24 - ldr r1, _080D0830 + ldr r1, =0x02039d08 ldr r1, [r1] movs r2, 0x88 lsls r2, 6 @@ -426758,7 +412557,7 @@ _080D0828: pop {r0} bx r0 .align 2, 0 -_080D0830: .4byte 0x02039d08 + .pool thumb_func_end sub_80D07B0 thumb_func_start sub_80D0834 @@ -426780,7 +412579,7 @@ sub_80D0834: @ 80D0834 lsls r0, 16 cmp r0, 0 beq _080D0878 - ldr r0, _080D0880 + ldr r0, =0x02039d08 ldr r0, [r0] movs r1, 0x88 lsls r1, 6 @@ -426801,25 +412600,25 @@ _080D0878: pop {r0} bx r0 .align 2, 0 -_080D0880: .4byte 0x02039d08 + .pool thumb_func_end sub_80D0834 thumb_func_start sub_80D0884 sub_80D0884: @ 80D0884 - ldr r3, _080D0890 + ldr r3, =0x02039d80 ldr r3, [r3] strh r0, [r3, 0xC] strh r1, [r3, 0xE] strh r2, [r3, 0x10] bx lr .align 2, 0 -_080D0890: .4byte 0x02039d80 + .pool thumb_func_end sub_80D0884 thumb_func_start sub_80D0894 sub_80D0894: @ 80D0894 push {r4,lr} - ldr r4, _080D08C8 + ldr r4, =0x02039d80 ldr r1, [r4] ldrh r0, [r1, 0x10] cmp r0, 0 @@ -426844,7 +412643,7 @@ _080D08BE: pop {r1} bx r1 .align 2, 0 -_080D08C8: .4byte 0x02039d80 + .pool thumb_func_end sub_80D0894 thumb_func_start sub_80D08CC @@ -426854,7 +412653,7 @@ sub_80D08CC: @ 80D08CC mov r6, r9 mov r5, r8 push {r5-r7} - ldr r4, _080D09A0 + ldr r4, =0x02039d80 ldr r1, [r4] ldrb r0, [r1, 0x4] ldrb r2, [r1, 0x2] @@ -426911,7 +412710,7 @@ _080D0914: _080D093C: lsls r0, r2, 1 adds r0, r2 - ldr r3, _080D09A0 + ldr r3, =0x02039d80 ldr r1, [r3] lsls r0, 1 ldrb r3, [r1, 0x8] @@ -426929,7 +412728,7 @@ _080D095A: adds r1, r5, 0 bl get_pokemon_by_box_and_pos adds r1, r0, 0 - ldr r2, _080D09A0 + ldr r2, =0x02039d80 ldr r0, [r2] lsls r2, r6, 2 adds r2, r6 @@ -426960,7 +412759,7 @@ _080D0990: pop {r0} bx r0 .align 2, 0 -_080D09A0: .4byte 0x02039d80 + .pool thumb_func_end sub_80D08CC thumb_func_start sub_80D09A4 @@ -426969,7 +412768,7 @@ sub_80D09A4: @ 80D09A4 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r4, _080D0A18 + ldr r4, =0x02039d80 ldr r0, [r4] ldrb r2, [r0, 0x8] ldrb r1, [r0, 0xA] @@ -426989,7 +412788,7 @@ sub_80D09A4: @ 80D09A4 _080D09D0: lsls r0, r2, 1 adds r0, r2 - ldr r1, _080D0A18 + ldr r1, =0x02039d80 ldr r1, [r1] lsls r0, 1 ldrb r3, [r1, 0x8] @@ -427025,7 +412824,7 @@ _080D0A0C: pop {r0} bx r0 .align 2, 0 -_080D0A18: .4byte 0x02039d80 + .pool thumb_func_end sub_80D09A4 thumb_func_start sub_80D0A1C @@ -427035,7 +412834,7 @@ sub_80D0A1C: @ 80D0A1C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _080D0AA8 + ldr r0, =0x02039d80 ldr r0, [r0] ldrb r2, [r0, 0x8] ldrb r1, [r0, 0xA] @@ -427052,7 +412851,7 @@ sub_80D0A1C: @ 80D0A1C _080D0A42: lsls r0, r2, 1 adds r0, r2 - ldr r3, _080D0AA8 + ldr r3, =0x02039d80 ldr r1, [r3] lsls r0, 1 ldrb r4, [r1, 0x8] @@ -427103,7 +412902,7 @@ _080D0A98: pop {r0} bx r0 .align 2, 0 -_080D0AA8: .4byte 0x02039d80 + .pool thumb_func_end sub_80D0A1C thumb_func_start sub_80D0AAC @@ -427114,7 +412913,7 @@ sub_80D0AAC: @ 80D0AAC mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r4, _080D0B58 + ldr r4, =0x02039d80 ldr r0, [r4] ldrb r2, [r0, 0x8] ldrb r1, [r0, 0xA] @@ -427137,7 +412936,7 @@ sub_80D0AAC: @ 80D0AAC _080D0AE2: lsls r0, r3, 1 adds r0, r3 - ldr r2, _080D0B58 + ldr r2, =0x02039d80 ldr r1, [r2] lsls r0, 1 ldrb r4, [r1, 0x8] @@ -427196,7 +412995,7 @@ _080D0B46: pop {r0} bx r0 .align 2, 0 -_080D0B58: .4byte 0x02039d80 + .pool thumb_func_end sub_80D0AAC thumb_func_start sub_80D0B5C @@ -427235,7 +413034,7 @@ sub_80D0B5C: @ 80D0B5C thumb_func_start sub_80D0BA4 sub_80D0BA4: @ 80D0BA4 - ldr r0, _080D0BBC + ldr r0, =0x02039d80 ldr r2, [r0] ldrb r1, [r2, 0x3] lsls r0, r1, 1 @@ -427247,7 +413046,7 @@ sub_80D0BA4: @ 80D0BA4 lsrs r0, 24 bx lr .align 2, 0 -_080D0BBC: .4byte 0x02039d80 + .pool thumb_func_end sub_80D0BA4 thumb_func_start sub_80D0BC0 @@ -427258,7 +413057,7 @@ sub_80D0BC0: @ 80D0BC0 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r0, _080D0C2C + ldr r0, =0x02039d80 ldr r0, [r0] ldrb r2, [r0, 0x8] ldrb r1, [r0, 0xA] @@ -427277,7 +413076,7 @@ sub_80D0BC0: @ 80D0BC0 lsls r0, 1 mov r8, r0 _080D0BF0: - ldr r2, _080D0C2C + ldr r2, =0x02039d80 ldr r1, [r2] ldrb r0, [r1, 0x8] add r0, r8 @@ -427307,7 +413106,7 @@ _080D0C04: movs r0, 0 b _080D0C50 .align 2, 0 -_080D0C2C: .4byte 0x02039d80 + .pool _080D0C30: adds r0, r7, 0x1 lsls r0, 24 @@ -427346,14 +413145,14 @@ sub_80D0C60: @ 80D0C60 mov r5, r8 push {r5-r7} sub sp, 0x20 - ldr r3, _080D0D5C + ldr r3, =0x02039d08 ldr r0, [r3] ldrb r0, [r0, 0x1] cmp r0, 0x3 bne _080D0D3E - ldr r0, _080D0D60 + ldr r0, =0x03000f78 str r0, [sp, 0x18] - ldr r1, _080D0D64 + ldr r1, =0xffff0000 add r2, sp, 0x18 ldr r0, [r2, 0x4] ands r0, r1 @@ -427362,7 +413161,7 @@ sub_80D0C60: @ 80D0C60 orrs r0, r1 str r0, [r2, 0x4] mov r1, sp - ldr r0, _080D0D68 + ldr r0, =0x0857bc70 ldm r0!, {r4-r6} stm r1!, {r4-r6} ldm r0!, {r4-r6} @@ -427387,15 +413186,15 @@ _080D0CA0: mov r5, r8 ldr r1, [r5] lsls r5, r7, 4 - ldr r2, _080D0D6C + ldr r2, =0x00002208 adds r1, r2 adds r1, r5 lsls r0, 16 lsrs r0, 11 - ldr r4, _080D0D70 + ldr r4, =0x06010000 adds r0, r4 str r0, [r1] - ldr r0, _080D0D74 + ldr r0, =0xffffdacb adds r4, r7, r0 lsls r0, r4, 16 lsrs r0, 16 @@ -427405,7 +413204,7 @@ _080D0CA0: adds r1, r5 lsls r0, 24 lsrs r0, 24 - ldr r2, _080D0D78 + ldr r2, =0x0000220c adds r1, r2 strh r0, [r1] ldrh r0, [r1] @@ -427425,13 +413224,13 @@ _080D0CA0: lsrs r0, 24 mov r4, r8 ldr r2, [r4] - ldr r6, _080D0D7C + ldr r6, =0x00002204 adds r2, r6 adds r2, r5 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080D0D80 + ldr r0, =0x02020630 adds r1, r0 str r1, [r2] adds r1, 0x3E @@ -427441,7 +413240,7 @@ _080D0CA0: strb r0, [r1] ldr r0, [r4] adds r0, r5 - ldr r1, _080D0D84 + ldr r1, =0x00002210 adds r0, r1 mov r2, r10 strb r2, [r0] @@ -427449,9 +413248,9 @@ _080D0CA0: cmp r7, 0x2 ble _080D0CA0 _080D0D3E: - ldr r0, _080D0D5C + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r4, _080D0D88 + ldr r4, =0x00002234 adds r0, r4 movs r1, 0 strh r1, [r0] @@ -427464,18 +413263,7 @@ _080D0D3E: pop {r0} bx r0 .align 2, 0 -_080D0D5C: .4byte 0x02039d08 -_080D0D60: .4byte 0x03000f78 -_080D0D64: .4byte 0xffff0000 -_080D0D68: .4byte 0x0857bc70 -_080D0D6C: .4byte 0x00002208 -_080D0D70: .4byte 0x06010000 -_080D0D74: .4byte 0xffffdacb -_080D0D78: .4byte 0x0000220c -_080D0D7C: .4byte 0x00002204 -_080D0D80: .4byte 0x02020630 -_080D0D84: .4byte 0x00002210 -_080D0D88: .4byte 0x00002234 + .pool thumb_func_end sub_80D0C60 thumb_func_start sub_80D0D8C @@ -427488,7 +413276,7 @@ sub_80D0D8C: @ 80D0D8C mov r8, r0 lsls r1, 24 lsrs r7, r1, 24 - ldr r0, _080D0DC0 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 @@ -427505,7 +413293,7 @@ sub_80D0D8C: @ 80D0D8C beq _080D0DDA b _080D0E42 .align 2, 0 -_080D0DC0: .4byte 0x02039d08 + .pool _080D0DC4: adds r0, r7, 0 movs r1, 0x5 @@ -427522,7 +413310,7 @@ _080D0DDA: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _080D0E4C + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -427568,7 +413356,7 @@ _080D0E42: pop {r0} bx r0 .align 2, 0 -_080D0E4C: .4byte 0x020244ec + .pool thumb_func_end sub_80D0D8C thumb_func_start sub_80D0E50 @@ -427578,7 +413366,7 @@ sub_80D0E50: @ 80D0E50 lsrs r6, r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _080D0E8C + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 @@ -427602,7 +413390,7 @@ _080D0E86: pop {r0} bx r0 .align 2, 0 -_080D0E8C: .4byte 0x02039d08 + .pool thumb_func_end sub_80D0E50 thumb_func_start sub_80D0E90 @@ -427614,7 +413402,7 @@ sub_80D0E90: @ 80D0E90 lsls r1, 24 lsrs r5, r1, 24 adds r7, r5, 0 - ldr r0, _080D0EF4 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 @@ -427651,11 +413439,11 @@ sub_80D0E90: @ 80D0E90 bl sub_80CB7AC b _080D0F10 .align 2, 0 -_080D0EF4: .4byte 0x02039d08 + .pool _080D0EF8: movs r0, 0x64 muls r0, r7 - ldr r1, _080D0F28 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC mov r2, sp @@ -427664,12 +413452,12 @@ _080D0EF8: movs r1, 0x1 bl sub_80CBBDC _080D0F10: - ldr r0, _080D0F2C + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r2, _080D0F30 + ldr r2, =0x00000ce6 adds r1, r0, r2 ldrh r1, [r1] - ldr r2, _080D0F34 + ldr r2, =0x00002234 adds r0, r2 strh r1, [r0] _080D0F20: @@ -427678,10 +413466,7 @@ _080D0F20: pop {r0} bx r0 .align 2, 0 -_080D0F28: .4byte 0x020244ec -_080D0F2C: .4byte 0x02039d08 -_080D0F30: .4byte 0x00000ce6 -_080D0F34: .4byte 0x00002234 + .pool thumb_func_end sub_80D0E90 thumb_func_start sub_80D0F38 @@ -427721,9 +413506,9 @@ sub_80D0F38: @ 80D0F38 adds r0, r4, 0 movs r1, 0x1 bl sub_80D1740 - ldr r0, _080D0FA4 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080D0FA8 + ldr r1, =0x00002234 adds r0, r1 strh r5, [r0] pop {r3} @@ -427732,8 +413517,7 @@ sub_80D0F38: @ 80D0F38 pop {r0} bx r0 .align 2, 0 -_080D0FA4: .4byte 0x02039d08 -_080D0FA8: .4byte 0x00002234 + .pool thumb_func_end sub_80D0F38 thumb_func_start sub_80D0FAC @@ -427747,7 +413531,7 @@ sub_80D0FAC: @ 80D0FAC mov r9, r0 lsls r1, 24 lsrs r7, r1, 24 - ldr r0, _080D1014 + ldr r0, =0x02039d08 mov r8, r0 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -427776,7 +413560,7 @@ sub_80D0FAC: @ 80D0FAC lsrs r6, r0, 16 mov r0, r8 ldr r2, [r0] - ldr r4, _080D1018 + ldr r4, =0x00002234 adds r2, r4 adds r0, r7, 0 movs r1, 0xC @@ -427786,13 +413570,12 @@ sub_80D0FAC: @ 80D0FAC adds r0, r4 b _080D1048 .align 2, 0 -_080D1014: .4byte 0x02039d08 -_080D1018: .4byte 0x00002234 + .pool _080D101C: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 - ldr r0, _080D1078 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xC @@ -427801,7 +413584,7 @@ _080D101C: lsrs r6, r0, 16 mov r0, r8 ldr r2, [r0] - ldr r5, _080D107C + ldr r5, =0x00002234 adds r2, r5 adds r0, r4, 0 movs r1, 0xC @@ -427832,8 +413615,7 @@ _080D106A: pop {r0} bx r0 .align 2, 0 -_080D1078: .4byte 0x020244ec -_080D107C: .4byte 0x00002234 + .pool thumb_func_end sub_80D0FAC thumb_func_start sub_80D1080 @@ -427846,7 +413628,7 @@ sub_80D1080: @ 80D1080 lsls r1, 24 lsrs r5, r1, 24 mov r8, r5 - ldr r6, _080D10D8 + ldr r6, =0x02039d08 ldr r0, [r6] ldrb r0, [r0, 0x1] cmp r0, 0x3 @@ -427868,7 +413650,7 @@ sub_80D1080: @ 80D1080 cmp r7, 0 bne _080D10E0 ldr r2, [r6] - ldr r0, _080D10DC + ldr r0, =0x00002234 adds r2, r0 adds r0, r5, 0 movs r1, 0xC @@ -427878,17 +413660,16 @@ sub_80D1080: @ 80D1080 bl sub_80CB7AC b _080D1100 .align 2, 0 -_080D10D8: .4byte 0x02039d08 -_080D10DC: .4byte 0x00002234 + .pool _080D10E0: movs r0, 0x64 mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r1, _080D110C + ldr r1, =0x020244ec adds r0, r1 ldr r2, [r6] - ldr r1, _080D1110 + ldr r1, =0x00002234 adds r2, r1 movs r1, 0xC bl pokemon_setattr @@ -427902,8 +413683,7 @@ _080D1100: pop {r0} bx r0 .align 2, 0 -_080D110C: .4byte 0x020244ec -_080D1110: .4byte 0x00002234 + .pool thumb_func_end sub_80D1080 thumb_func_start sub_80D1114 @@ -427915,7 +413695,7 @@ sub_80D1114: @ 80D1114 lsls r1, 24 lsrs r5, r1, 24 adds r7, r5, 0 - ldr r0, _080D116C + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 @@ -427948,11 +413728,11 @@ sub_80D1114: @ 80D1114 bl sub_80CB7AC b _080D1188 .align 2, 0 -_080D116C: .4byte 0x02039d08 + .pool _080D1170: movs r0, 0x64 muls r0, r7 - ldr r1, _080D1190 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC mov r2, sp @@ -427966,13 +413746,13 @@ _080D1188: pop {r0} bx r0 .align 2, 0 -_080D1190: .4byte 0x020244ec + .pool thumb_func_end sub_80D1114 thumb_func_start sub_80D1194 sub_80D1194: @ 80D1194 push {r4,lr} - ldr r0, _080D11C8 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 @@ -427996,24 +413776,24 @@ _080D11C2: pop {r0} bx r0 .align 2, 0 -_080D11C8: .4byte 0x02039d08 + .pool thumb_func_end sub_80D1194 thumb_func_start sub_80D11CC sub_80D11CC: @ 80D11CC push {r4,lr} - ldr r0, _080D1210 + ldr r0, =0x02039d08 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 bne _080D120A movs r4, 0 _080D11DA: - ldr r0, _080D1210 + ldr r0, =0x02039d08 ldr r1, [r0] lsls r0, r4, 4 adds r1, r0 - ldr r2, _080D1214 + ldr r2, =0x00002210 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -428038,21 +413818,20 @@ _080D120A: pop {r0} bx r0 .align 2, 0 -_080D1210: .4byte 0x02039d08 -_080D1214: .4byte 0x00002210 + .pool thumb_func_end sub_80D11CC thumb_func_start sub_80D1218 sub_80D1218: @ 80D1218 push {r4,r5,lr} movs r5, 0 - ldr r0, _080D1254 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080D1258 + ldr r1, =0x00002204 adds r4, r0, r1 adds r3, r0, 0 _080D1226: - ldr r1, _080D125C + ldr r1, =0x00002210 adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 @@ -428066,21 +413845,17 @@ _080D1226: cmp r0, 0x8 beq _080D124E ldr r1, [r2, 0x1C] - ldr r0, _080D1260 + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _080D1268 - ldr r0, _080D1264 + ldr r0, =sub_80D1AD8 + 1 cmp r1, r0 beq _080D1268 _080D124E: movs r0, 0x1 b _080D1274 .align 2, 0 -_080D1254: .4byte 0x02039d08 -_080D1258: .4byte 0x00002204 -_080D125C: .4byte 0x00002210 -_080D1260: .4byte nullsub_12 + 1 -_080D1264: .4byte sub_80D1AD8 + 1 + .pool _080D1268: adds r4, 0x10 adds r3, 0x10 @@ -428097,13 +413872,13 @@ _080D1274: thumb_func_start sub_80D127C sub_80D127C: @ 80D127C push {lr} - ldr r0, _080D12A0 + ldr r0, =0x02039d08 ldr r1, [r0] ldrb r0, [r1, 0x1] cmp r0, 0x3 bne _080D12B0 movs r2, 0 - ldr r0, _080D12A4 + ldr r0, =0x0000220e adds r1, r0 _080D128E: ldrb r0, [r1, 0x2] @@ -428115,8 +413890,7 @@ _080D128E: movs r0, 0x1 b _080D12B2 .align 2, 0 -_080D12A0: .4byte 0x02039d08 -_080D12A4: .4byte 0x0000220e + .pool _080D12A8: adds r1, 0x10 adds r2, 0x1 @@ -428132,38 +413906,36 @@ _080D12B2: thumb_func_start sub_80D12B8 sub_80D12B8: @ 80D12B8 push {lr} - ldr r0, _080D12CC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080D12D0 + ldr r1, =0x00002234 adds r0, r1 ldrh r0, [r0] bl itemid_get_item pop {r1} bx r1 .align 2, 0 -_080D12CC: .4byte 0x02039d08 -_080D12D0: .4byte 0x00002234 + .pool thumb_func_end sub_80D12B8 thumb_func_start sub_80D12D4 sub_80D12D4: @ 80D12D4 - ldr r0, _080D12E0 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080D12E4 + ldr r1, =0x00002234 adds r0, r1 ldrh r0, [r0] bx lr .align 2, 0 -_080D12E0: .4byte 0x02039d08 -_080D12E4: .4byte 0x00002234 + .pool thumb_func_end sub_80D12D4 thumb_func_start sub_80D12E8 sub_80D12E8: @ 80D12E8 push {r4,r5,lr} movs r2, 0 - ldr r5, _080D1308 - ldr r3, _080D130C + ldr r5, =0x02039d08 + ldr r3, =0x00002210 movs r4, 0x1 _080D12F2: ldr r0, [r5] @@ -428177,8 +413949,7 @@ _080D12F2: adds r0, r2, 0 b _080D131C .align 2, 0 -_080D1308: .4byte 0x02039d08 -_080D130C: .4byte 0x00002210 + .pool _080D1310: adds r0, r2, 0x1 lsls r0, 24 @@ -428200,10 +413971,10 @@ sub_80D1324: @ 80D1324 lsls r1, 24 lsrs r1, 24 movs r3, 0 - ldr r0, _080D1358 + ldr r0, =0x02039d08 ldr r2, [r0] _080D1334: - ldr r5, _080D135C + ldr r5, =0x00002210 adds r0, r2, r5 ldrb r0, [r0] cmp r0, 0 @@ -428221,8 +413992,7 @@ _080D1334: movs r0, 0x1 b _080D136A .align 2, 0 -_080D1358: .4byte 0x02039d08 -_080D135C: .4byte 0x00002210 + .pool _080D1360: adds r2, 0x10 adds r3, 0x1 @@ -428243,12 +414013,12 @@ sub_80D1370: @ 80D1370 lsls r1, 24 lsrs r4, r1, 24 movs r3, 0 - ldr r0, _080D13A8 + ldr r0, =0x02039d08 ldr r1, [r0] _080D1380: lsls r0, r3, 4 adds r2, r1, r0 - ldr r6, _080D13AC + ldr r6, =0x00002210 adds r0, r2, r6 ldrb r0, [r0] cmp r0, 0 @@ -428266,8 +414036,7 @@ _080D1380: adds r0, r3, 0 b _080D13BC .align 2, 0 -_080D13A8: .4byte 0x02039d08 -_080D13AC: .4byte 0x00002210 + .pool _080D13B0: adds r0, r3, 0x1 lsls r0, 24 @@ -428286,11 +414055,11 @@ sub_80D13C4: @ 80D13C4 push {r4-r6,lr} adds r5, r0, 0 movs r2, 0 - ldr r0, _080D13EC + ldr r0, =0x02039d08 ldr r3, [r0] - ldr r0, _080D13F0 + ldr r0, =0x00002204 adds r4, r3, r0 - ldr r6, _080D13F4 + ldr r6, =0x00002210 _080D13D4: lsls r1, r2, 4 adds r0, r3, r1 @@ -428305,9 +414074,7 @@ _080D13D4: adds r0, r2, 0 b _080D1404 .align 2, 0 -_080D13EC: .4byte 0x02039d08 -_080D13F0: .4byte 0x00002204 -_080D13F4: .4byte 0x00002210 + .pool _080D13F8: adds r0, r2, 0x1 lsls r0, 24 @@ -428339,11 +414106,11 @@ sub_80D140C: @ 80D140C beq _080D1438 cmp r1, 0x1 beq _080D1494 - ldr r4, _080D1434 + ldr r4, =0x02039d08 lsls r3, r5, 4 b _080D14F4 .align 2, 0 -_080D1434: .4byte 0x02039d08 + .pool _080D1438: adds r0, r7, 0 movs r1, 0x6 @@ -428356,10 +414123,10 @@ _080D1438: bl __udivsi3 lsls r0, 24 lsrs r0, 24 - ldr r6, _080D148C + ldr r6, =0x02039d08 ldr r2, [r6] lsls r5, 4 - ldr r1, _080D1490 + ldr r1, =0x00002204 adds r2, r1 adds r2, r5 ldr r3, [r2] @@ -428386,15 +414153,14 @@ _080D1438: adds r3, r5, 0 b _080D14F4 .align 2, 0 -_080D148C: .4byte 0x02039d08 -_080D1490: .4byte 0x00002204 + .pool _080D1494: cmp r7, 0 bne _080D14BC - ldr r4, _080D14B4 + ldr r4, =0x02039d08 ldr r0, [r4] lsls r3, r5, 4 - ldr r1, _080D14B8 + ldr r1, =0x00002204 adds r0, r1 adds r0, r3 ldr r2, [r0] @@ -428405,13 +414171,12 @@ _080D1494: strh r0, [r1, 0x22] b _080D14DC .align 2, 0 -_080D14B4: .4byte 0x02039d08 -_080D14B8: .4byte 0x00002204 + .pool _080D14BC: - ldr r4, _080D1514 + ldr r4, =0x02039d08 ldr r0, [r4] lsls r3, r5, 4 - ldr r1, _080D1518 + ldr r1, =0x00002204 adds r0, r1 adds r0, r3 ldr r2, [r0] @@ -428426,7 +414191,7 @@ _080D14BC: strh r0, [r2, 0x22] _080D14DC: ldr r0, [r4] - ldr r1, _080D1518 + ldr r1, =0x00002204 adds r0, r1 adds r0, r3 ldr r2, [r0] @@ -428440,13 +414205,13 @@ _080D14DC: _080D14F4: ldr r0, [r4] adds r0, r3 - ldr r1, _080D151C + ldr r1, =0x0000220e adds r0, r1 mov r1, r8 strb r1, [r0] ldr r0, [r4] adds r0, r3 - ldr r1, _080D1520 + ldr r1, =0x0000220f adds r0, r1 strb r7, [r0] _080D150A: @@ -428456,10 +414221,7 @@ _080D150A: pop {r0} bx r0 .align 2, 0 -_080D1514: .4byte 0x02039d08 -_080D1518: .4byte 0x00002204 -_080D151C: .4byte 0x0000220e -_080D1520: .4byte 0x0000220f + .pool thumb_func_end sub_80D140C thumb_func_start sub_80D1524 @@ -428477,15 +414239,15 @@ sub_80D1524: @ 80D1524 bhi _080D15AC movs r0, 0 str r0, [sp] - ldr r4, _080D15BC + ldr r4, =0x02039d08 ldr r1, [r4] - ldr r6, _080D15C0 + ldr r6, =0x000042c4 adds r1, r6 - ldr r2, _080D15C4 + ldr r2, =0x01000080 mov r0, sp bl CpuFastSet ldr r1, [r4] - ldr r5, _080D15C8 + ldr r5, =0x000022c4 adds r1, r5 mov r0, r8 bl LZ77UnCompWram @@ -428504,11 +414266,11 @@ _080D1562: subs r4, 0x1 cmp r4, 0 bge _080D1562 - ldr r5, _080D15BC + ldr r5, =0x02039d08 ldr r1, [r5] - ldr r4, _080D15C0 + ldr r4, =0x000042c4 adds r0, r1, r4 - ldr r2, _080D15CC + ldr r2, =0x00002208 adds r1, r2 add r1, r8 ldr r1, [r1] @@ -428521,7 +414283,7 @@ _080D1562: ldr r0, [r5] adds r4, r0, r4 add r0, r8 - ldr r1, _080D15D0 + ldr r1, =0x0000220c adds r0, r1 ldrh r1, [r0] adds r0, r4, 0 @@ -428536,12 +414298,7 @@ _080D15AC: pop {r0} bx r0 .align 2, 0 -_080D15BC: .4byte 0x02039d08 -_080D15C0: .4byte 0x000042c4 -_080D15C4: .4byte 0x01000080 -_080D15C8: .4byte 0x000022c4 -_080D15CC: .4byte 0x00002208 -_080D15D0: .4byte 0x0000220c + .pool thumb_func_end sub_80D1524 thumb_func_start sub_80D15D4 @@ -428553,10 +414310,10 @@ sub_80D15D4: @ 80D15D4 lsrs r3, r1, 24 cmp r2, 0x2 bhi _080D15F6 - ldr r0, _080D15FC + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r2, 4 - ldr r2, _080D1600 + ldr r2, =0x00002204 adds r0, r2 adds r0, r1 ldr r0, [r0] @@ -428566,8 +414323,7 @@ _080D15F6: pop {r0} bx r0 .align 2, 0 -_080D15FC: .4byte 0x02039d08 -_080D1600: .4byte 0x00002204 + .pool thumb_func_end sub_80D15D4 thumb_func_start sub_80D1604 @@ -428590,12 +414346,12 @@ _080D161C: b _080D172E _080D1622: lsls r0, 2 - ldr r1, _080D162C + ldr r1, =_080D1630 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D162C: .4byte _080D1630 + .pool .align 2, 0 _080D1630: .4byte _080D1650 @@ -428607,43 +414363,39 @@ _080D1630: .4byte _080D172E .4byte _080D171C _080D1650: - ldr r0, _080D1668 + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 - ldr r2, _080D166C + ldr r2, =0x00002204 adds r0, r2 adds r0, r1 ldr r1, [r0] strh r4, [r1, 0x2E] ldr r1, [r0] - ldr r0, _080D1670 + ldr r0, =sub_80D1A48 + 1 b _080D172C .align 2, 0 -_080D1668: .4byte 0x02039d08 -_080D166C: .4byte 0x00002204 -_080D1670: .4byte sub_80D1A48 + 1 + .pool _080D1674: - ldr r0, _080D168C + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 - ldr r2, _080D1690 + ldr r2, =0x00002204 adds r0, r2 adds r0, r1 ldr r2, [r0] movs r1, 0 strh r1, [r2, 0x2E] ldr r1, [r0] - ldr r0, _080D1694 + ldr r0, =sub_80D1A74 + 1 b _080D172C .align 2, 0 -_080D168C: .4byte 0x02039d08 -_080D1690: .4byte 0x00002204 -_080D1694: .4byte sub_80D1A74 + 1 + .pool _080D1698: - ldr r0, _080D16B8 + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 - ldr r2, _080D16BC + ldr r2, =0x00002204 adds r0, r2 adds r0, r1 ldr r2, [r0] @@ -428654,38 +414406,34 @@ _080D1698: ldr r1, [r0] strh r3, [r1, 0x3C] ldr r1, [r0] - ldr r0, _080D16C0 + ldr r0, =sub_80D1B14 + 1 b _080D172C .align 2, 0 -_080D16B8: .4byte 0x02039d08 -_080D16BC: .4byte 0x00002204 -_080D16C0: .4byte sub_80D1B14 + 1 + .pool _080D16C4: - ldr r0, _080D16E4 + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 - ldr r2, _080D16E8 + ldr r2, =0x00002204 adds r0, r2 adds r0, r1 ldr r2, [r0] movs r1, 0 strh r1, [r2, 0x2E] ldr r2, [r0] - ldr r1, _080D16EC + ldr r1, =sub_80D1B94 + 1 str r1, [r2, 0x1C] strh r5, [r2, 0x3A] ldr r0, [r0] strh r3, [r0, 0x3C] b _080D172E .align 2, 0 -_080D16E4: .4byte 0x02039d08 -_080D16E8: .4byte 0x00002204 -_080D16EC: .4byte sub_80D1B94 + 1 + .pool _080D16F0: - ldr r0, _080D1710 + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 - ldr r2, _080D1714 + ldr r2, =0x00002204 adds r0, r2 adds r0, r1 ldr r2, [r0] @@ -428696,21 +414444,19 @@ _080D16F0: ldr r1, [r0] strh r3, [r1, 0x3C] ldr r1, [r0] - ldr r0, _080D1718 + ldr r0, =sub_80D1C30 + 1 b _080D172C .align 2, 0 -_080D1710: .4byte 0x02039d08 -_080D1714: .4byte 0x00002204 -_080D1718: .4byte sub_80D1C30 + 1 + .pool _080D171C: - ldr r0, _080D1734 + ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 - ldr r2, _080D1738 + ldr r2, =0x00002204 adds r0, r2 adds r0, r1 ldr r1, [r0] - ldr r0, _080D173C + ldr r0, =sub_80D1CCC + 1 _080D172C: str r0, [r1, 0x1C] _080D172E: @@ -428718,9 +414464,7 @@ _080D172E: pop {r0} bx r0 .align 2, 0 -_080D1734: .4byte 0x02039d08 -_080D1738: .4byte 0x00002204 -_080D173C: .4byte sub_80D1CCC + 1 + .pool thumb_func_end sub_80D1604 thumb_func_start sub_80D1740 @@ -428732,15 +414476,15 @@ sub_80D1740: @ 80D1740 lsrs r4, r1, 24 cmp r2, 0x2 bhi _080D1780 - ldr r1, _080D1788 + ldr r1, =0x02039d08 ldr r0, [r1] lsls r2, 4 adds r0, r2 - ldr r3, _080D178C + ldr r3, =0x00002210 adds r0, r3 strb r4, [r0] ldr r0, [r1] - ldr r1, _080D1790 + ldr r1, =0x00002204 adds r0, r1 adds r0, r2 ldr r0, [r0] @@ -428763,9 +414507,7 @@ _080D1780: pop {r0} bx r0 .align 2, 0 -_080D1788: .4byte 0x02039d08 -_080D178C: .4byte 0x00002210 -_080D1790: .4byte 0x00002204 + .pool thumb_func_end sub_80D1740 thumb_func_start sub_80D1794 @@ -428798,17 +414540,16 @@ sub_80D17B4: @ 80D17B4 lsls r0, 24 cmp r0, 0 beq _080D17D4 - ldr r0, _080D17CC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080D17D0 + ldr r1, =0x00002234 b _080D17DA .align 2, 0 -_080D17CC: .4byte 0x02039d08 -_080D17D0: .4byte 0x00002234 + .pool _080D17D4: - ldr r0, _080D1810 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080D1814 + ldr r1, =0x00000ce6 _080D17DA: adds r0, r1 ldrh r0, [r0] @@ -428834,20 +414575,19 @@ _080D17DA: pop {r0} bx r0 .align 2, 0 -_080D1810: .4byte 0x02039d08 -_080D1814: .4byte 0x00000ce6 + .pool thumb_func_end sub_80D17B4 thumb_func_start sub_80D1818 sub_80D1818: @ 80D1818 push {lr} - ldr r0, _080D1840 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080D1844 + ldr r1, =0x00002236 adds r0, r1 movs r1, 0x15 strh r1, [r0] - ldr r1, _080D1848 + ldr r1, =0x0857bb24 movs r3, 0x9D lsls r3, 1 movs r0, 0 @@ -428858,18 +414598,16 @@ sub_80D1818: @ 80D1818 pop {r0} bx r0 .align 2, 0 -_080D1840: .4byte 0x02039d08 -_080D1844: .4byte 0x00002236 -_080D1848: .4byte 0x0857bb24 + .pool thumb_func_end sub_80D1818 thumb_func_start sub_80D184C sub_80D184C: @ 80D184C push {r4,r5,lr} sub sp, 0x10 - ldr r0, _080D1864 + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r2, _080D1868 + ldr r2, =0x00002236 adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0 @@ -428877,8 +414615,7 @@ sub_80D184C: @ 80D184C movs r0, 0 b _080D18D2 .align 2, 0 -_080D1864: .4byte 0x02039d08 -_080D1868: .4byte 0x00002236 + .pool _080D186C: subs r0, 0x1 strh r0, [r1] @@ -428893,9 +414630,9 @@ _080D187C: movs r1, 0xA bl bg_get_field adds r1, r0, 0 - ldr r0, _080D18DC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r2, _080D18E0 + ldr r2, =0x00002236 adds r0, r2 adds r1, 0x14 ldrh r0, [r0] @@ -428922,9 +414659,9 @@ _080D187C: _080D18BC: adds r0, r5, 0 bl sub_80D19B4 - ldr r0, _080D18DC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r1, _080D18E0 + ldr r1, =0x00002236 adds r0, r1 ldrh r1, [r0] negs r0, r1 @@ -428936,17 +414673,16 @@ _080D18D2: pop {r1} bx r1 .align 2, 0 -_080D18DC: .4byte 0x02039d08 -_080D18E0: .4byte 0x00002236 + .pool thumb_func_end sub_80D184C thumb_func_start sub_80D18E4 sub_80D18E4: @ 80D18E4 push {r4,r5,lr} sub sp, 0x10 - ldr r5, _080D18FC + ldr r5, =0x02039d08 ldr r0, [r5] - ldr r4, _080D1900 + ldr r4, =0x00002236 adds r0, r4 ldrh r0, [r0] cmp r0, 0x16 @@ -428954,8 +414690,7 @@ sub_80D18E4: @ 80D18E4 movs r0, 0 b _080D19A4 .align 2, 0 -_080D18FC: .4byte 0x02039d08 -_080D1900: .4byte 0x00002236 + .pool _080D1904: cmp r0, 0 bne _080D1920 @@ -428987,9 +414722,9 @@ _080D1936: movs r1, 0xA bl bg_get_field adds r1, r0, 0 - ldr r0, _080D19AC + ldr r0, =0x02039d08 ldr r0, [r0] - ldr r2, _080D19B0 + ldr r2, =0x00002236 adds r0, r2 adds r1, 0x14 ldrh r0, [r0] @@ -429041,8 +414776,7 @@ _080D19A4: pop {r1} bx r1 .align 2, 0 -_080D19AC: .4byte 0x02039d08 -_080D19B0: .4byte 0x00002236 + .pool thumb_func_end sub_80D18E4 thumb_func_start sub_80D19B4 @@ -429065,7 +414799,7 @@ sub_80D19B4: @ 80D19B4 movs r2, 0 movs r3, 0xC bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _080D1A3C + ldr r1, =0x0000093a str r4, [sp] str r6, [sp, 0x4] str r5, [sp, 0x8] @@ -429074,7 +414808,7 @@ sub_80D19B4: @ 80D19B4 movs r3, 0x14 bl Bg_FillWramTileMapRectWithTileAndPalette _080D19EC: - ldr r1, _080D1A40 + ldr r1, =0x0000013b lsls r5, r7, 24 lsrs r5, 24 movs r4, 0x1 @@ -429096,7 +414830,7 @@ _080D19EC: adds r2, r5, 0 movs r3, 0xC bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _080D1A44 + ldr r1, =0x0000013d str r4, [sp] str r4, [sp, 0x4] str r6, [sp, 0x8] @@ -429111,9 +414845,7 @@ _080D19EC: pop {r0} bx r0 .align 2, 0 -_080D1A3C: .4byte 0x0000093a -_080D1A40: .4byte 0x0000013b -_080D1A44: .4byte 0x0000013d + .pool thumb_func_end sub_80D19B4 thumb_func_start sub_80D1A48 @@ -429131,14 +414863,14 @@ sub_80D1A48: @ 80D1A48 lsrs r0, 24 movs r1, 0 bl sub_80D1740 - ldr r0, _080D1A70 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _080D1A68: pop {r4} pop {r0} bx r0 .align 2, 0 -_080D1A70: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80D1A48 thumb_func_start sub_80D1A74 @@ -429189,20 +414921,20 @@ _080D1AA2: asrs r0, 16 cmp r0, 0xB ble _080D1AD0 - ldr r0, _080D1AD4 + ldr r0, =sub_80D1AD8 + 1 str r0, [r3, 0x1C] _080D1AD0: pop {r0} bx r0 .align 2, 0 -_080D1AD4: .4byte sub_80D1AD8 + 1 + .pool thumb_func_end sub_80D1A74 thumb_func_start sub_80D1AD8 sub_80D1AD8: @ 80D1AD8 - ldr r1, _080D1B0C + ldr r1, =0x02039d08 ldr r3, [r1] - ldr r1, _080D1B10 + ldr r1, =0x00000cb4 adds r3, r1 ldr r1, [r3] ldrh r1, [r1, 0x20] @@ -429226,8 +414958,7 @@ sub_80D1AD8: @ 80D1AD8 strb r1, [r0, 0x5] bx lr .align 2, 0 -_080D1B0C: .4byte 0x02039d08 -_080D1B10: .4byte 0x00000cb4 + .pool thumb_func_end sub_80D1AD8 thumb_func_start sub_80D1B14 @@ -429289,14 +415020,14 @@ _080D1B42: lsls r2, 24 lsrs r2, 24 bl sub_80D140C - ldr r0, _080D1B90 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _080D1B8A: pop {r4} pop {r0} bx r0 .align 2, 0 -_080D1B90: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80D1B14 thumb_func_start sub_80D1B94 @@ -429340,7 +415071,7 @@ _080D1BC2: lsls r0, 16 asrs r0, 20 strh r0, [r4, 0x22] - ldr r1, _080D1C28 + ldr r1, =0x08329f40 movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 4 @@ -429369,15 +415100,14 @@ _080D1BC2: bl sub_80D140C movs r0, 0 strh r0, [r4, 0x24] - ldr r0, _080D1C2C + ldr r0, =sub_80D1AD8 + 1 str r0, [r4, 0x1C] _080D1C20: pop {r4} pop {r0} bx r0 .align 2, 0 -_080D1C28: .4byte 0x08329f40 -_080D1C2C: .4byte sub_80D1AD8 + 1 + .pool thumb_func_end sub_80D1B94 thumb_func_start sub_80D1C30 @@ -429421,7 +415151,7 @@ _080D1C5E: lsls r1, 16 asrs r1, 20 strh r1, [r4, 0x22] - ldr r1, _080D1CC4 + ldr r1, =0x08329f40 movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 4 @@ -429449,7 +415179,7 @@ _080D1C5E: lsls r2, 24 lsrs r2, 24 bl sub_80D140C - ldr r0, _080D1CC8 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] @@ -429458,8 +415188,7 @@ _080D1CBE: pop {r0} bx r0 .align 2, 0 -_080D1CC4: .4byte 0x08329f40 -_080D1CC8: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80D1C30 thumb_func_start sub_80D1CCC @@ -429478,7 +415207,7 @@ sub_80D1CCC: @ 80D1CCC negs r1, r1 cmp r0, r1 bge _080D1CFC - ldr r0, _080D1D00 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] adds r0, r2, 0 bl sub_80D13C4 @@ -429490,7 +415219,7 @@ _080D1CFC: pop {r0} bx r0 .align 2, 0 -_080D1D00: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80D1CCC thumb_func_start nullsub_40 @@ -429505,12 +415234,12 @@ nullsub_98: @ 80D1D08 thumb_func_start get_preferred_box get_preferred_box: @ 80D1D0C - ldr r0, _080D1D14 + ldr r0, =0x03005d94 ldr r0, [r0] ldrb r0, [r0] bx lr .align 2, 0 -_080D1D14: .4byte 0x03005d94 + .pool thumb_func_end get_preferred_box thumb_func_start sub_80D1D18 @@ -429520,14 +415249,14 @@ sub_80D1D18: @ 80D1D18 lsrs r1, r0, 24 cmp r1, 0xD bhi _080D1D28 - ldr r0, _080D1D2C + ldr r0, =0x03005d94 ldr r0, [r0] strb r1, [r0] _080D1D28: pop {r0} bx r0 .align 2, 0 -_080D1D2C: .4byte 0x03005d94 + .pool thumb_func_end sub_80D1D18 thumb_func_start get_pokemon_data_from_any_box @@ -429542,7 +415271,7 @@ get_pokemon_data_from_any_box: @ 80D1D30 bhi _080D1D6C cmp r4, 0x1D bhi _080D1D6C - ldr r2, _080D1D68 + ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 lsls r1, r0, 4 @@ -429559,7 +415288,7 @@ get_pokemon_data_from_any_box: @ 80D1D30 bl pokemon_getattr_encrypted b _080D1D6E .align 2, 0 -_080D1D68: .4byte 0x03005d94 + .pool _080D1D6C: movs r0, 0 _080D1D6E: @@ -429581,7 +415310,7 @@ set_pokemon_data_from_any_box: @ 80D1D74 bhi _080D1DAC cmp r4, 0x1D bhi _080D1DAC - ldr r2, _080D1DB4 + ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 lsls r1, r0, 4 @@ -429602,7 +415331,7 @@ _080D1DAC: pop {r0} bx r0 .align 2, 0 -_080D1DB4: .4byte 0x03005d94 + .pool thumb_func_end set_pokemon_data_from_any_box thumb_func_start get_pokemon_data_from_selected_box @@ -429612,7 +415341,7 @@ get_pokemon_data_from_selected_box: @ 80D1DB8 adds r2, r1, 0 lsls r3, 24 lsrs r3, 24 - ldr r0, _080D1DD4 + ldr r0, =0x03005d94 ldr r0, [r0] ldrb r0, [r0] adds r1, r3, 0 @@ -429620,7 +415349,7 @@ get_pokemon_data_from_selected_box: @ 80D1DB8 pop {r1} bx r1 .align 2, 0 -_080D1DD4: .4byte 0x03005d94 + .pool thumb_func_end get_pokemon_data_from_selected_box thumb_func_start set_pokemon_data_from_selected_box @@ -429631,7 +415360,7 @@ set_pokemon_data_from_selected_box: @ 80D1DD8 adds r3, r2, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080D1DF8 + ldr r0, =0x03005d94 ldr r0, [r0] ldrb r0, [r0] adds r1, r4, 0 @@ -429641,7 +415370,7 @@ set_pokemon_data_from_selected_box: @ 80D1DD8 pop {r0} bx r0 .align 2, 0 -_080D1DF8: .4byte 0x03005d94 + .pool thumb_func_end set_pokemon_data_from_selected_box thumb_func_start sub_80D1DFC @@ -429656,7 +415385,7 @@ sub_80D1DFC: @ 80D1DFC bhi _080D1E38 cmp r4, 0x1D bhi _080D1E38 - ldr r2, _080D1E34 + ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 lsls r1, r0, 4 @@ -429674,7 +415403,7 @@ sub_80D1DFC: @ 80D1DFC bl pokemon_getattr_encrypted b _080D1E3C .align 2, 0 -_080D1E34: .4byte 0x03005d94 + .pool _080D1E38: movs r0, 0xFF strb r0, [r5] @@ -429695,7 +415424,7 @@ sub_80D1E44: @ 80D1E44 bhi _080D1E84 cmp r2, 0x1D bhi _080D1E84 - ldr r6, _080D1E8C + ldr r6, =0x03005d94 lsls r1, r0, 2 adds r1, r0 lsls r0, r1, 4 @@ -429722,7 +415451,7 @@ _080D1E84: pop {r1} bx r1 .align 2, 0 -_080D1E8C: .4byte 0x03005d94 + .pool thumb_func_end sub_80D1E44 thumb_func_start sub_80D1E90 @@ -429737,7 +415466,7 @@ sub_80D1E90: @ 80D1E90 bhi _080D1EC6 cmp r4, 0x1D bhi _080D1EC6 - ldr r2, _080D1ECC + ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 lsls r1, r0, 4 @@ -429758,7 +415487,7 @@ _080D1EC6: pop {r0} bx r0 .align 2, 0 -_080D1ECC: .4byte 0x03005d94 + .pool thumb_func_end sub_80D1E90 thumb_func_start sub_80D1ED0 @@ -429774,7 +415503,7 @@ sub_80D1ED0: @ 80D1ED0 bhi _080D1F10 cmp r4, 0x1D bhi _080D1F10 - ldr r2, _080D1F0C + ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 lsls r1, r0, 4 @@ -429792,7 +415521,7 @@ sub_80D1ED0: @ 80D1ED0 bl pokemon_getattr_encrypted b _080D1F12 .align 2, 0 -_080D1F0C: .4byte 0x03005d94 + .pool _080D1F10: movs r0, 0 _080D1F12: @@ -429813,7 +415542,7 @@ sub_80D1F18: @ 80D1F18 bhi _080D1F4E cmp r1, 0x1D bhi _080D1F4E - ldr r0, _080D1F54 + ldr r0, =0x03005d94 ldr r0, [r0] lsls r3, r1, 2 adds r3, r1 @@ -429834,7 +415563,7 @@ _080D1F4E: pop {r0} bx r0 .align 2, 0 -_080D1F54: .4byte 0x03005d94 + .pool thumb_func_end sub_80D1F18 thumb_func_start sub_80D1F58 @@ -429849,7 +415578,7 @@ sub_80D1F58: @ 80D1F58 bhi _080D1F8E cmp r2, 0x1D bhi _080D1F8E - ldr r0, _080D1F94 + ldr r0, =0x03005d94 ldr r1, [r0] lsls r3, r2, 2 adds r3, r2 @@ -429870,7 +415599,7 @@ _080D1F8E: pop {r0} bx r0 .align 2, 0 -_080D1F94: .4byte 0x03005d94 + .pool thumb_func_end sub_80D1F58 thumb_func_start sub_80D1F98 @@ -429905,7 +415634,7 @@ sub_80D1F98: @ 80D1F98 bhi _080D2004 cmp r6, 0x1D bhi _080D2004 - ldr r2, _080D2014 + ldr r2, =0x03005d94 lsls r0, r7, 2 adds r0, r7 lsls r1, r0, 4 @@ -429937,7 +415666,7 @@ _080D2004: pop {r0} bx r0 .align 2, 0 -_080D2014: .4byte 0x03005d94 + .pool thumb_func_end sub_80D1F98 thumb_func_start sub_80D2018 @@ -429951,7 +415680,7 @@ sub_80D2018: @ 80D2018 bhi _080D2048 cmp r4, 0x1D bhi _080D2048 - ldr r2, _080D2050 + ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 lsls r1, r0, 4 @@ -429970,7 +415699,7 @@ _080D2048: pop {r0} bx r0 .align 2, 0 -_080D2050: .4byte 0x03005d94 + .pool thumb_func_end sub_80D2018 thumb_func_start sub_80D2054 @@ -429985,7 +415714,7 @@ sub_80D2054: @ 80D2054 bhi _080D2088 cmp r4, 0x1D bhi _080D2088 - ldr r2, _080D2090 + ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 lsls r1, r0, 4 @@ -430005,7 +415734,7 @@ _080D2088: pop {r0} bx r0 .align 2, 0 -_080D2090: .4byte 0x03005d94 + .pool thumb_func_end sub_80D2054 thumb_func_start get_pokemon_by_box_and_pos @@ -430019,7 +415748,7 @@ get_pokemon_by_box_and_pos: @ 80D2094 bhi _080D20C8 cmp r4, 0x1D bhi _080D20C8 - ldr r2, _080D20C4 + ldr r2, =0x03005d94 lsls r0, r3, 2 adds r0, r3 lsls r1, r0, 4 @@ -430034,7 +415763,7 @@ get_pokemon_by_box_and_pos: @ 80D2094 adds r0, r1 b _080D20CA .align 2, 0 -_080D20C4: .4byte 0x03005d94 + .pool _080D20C8: movs r0, 0 _080D20CA: @@ -430053,10 +415782,10 @@ sav3_get_box_name: @ 80D20D0 movs r0, 0 b _080D20EC _080D20DE: - ldr r0, _080D20F0 + ldr r0, =0x03005d94 lsls r1, r2, 3 adds r1, r2 - ldr r2, _080D20F4 + ldr r2, =0x00008344 adds r1, r2 ldr r0, [r0] adds r0, r1 @@ -430064,8 +415793,7 @@ _080D20EC: pop {r1} bx r1 .align 2, 0 -_080D20F0: .4byte 0x03005d94 -_080D20F4: .4byte 0x00008344 + .pool thumb_func_end sav3_get_box_name thumb_func_start sub_80D20F8 @@ -430078,9 +415806,9 @@ sub_80D20F8: @ 80D20F8 movs r0, 0 b _080D2112 _080D2106: - ldr r0, _080D2118 + ldr r0, =0x03005d94 ldr r0, [r0] - ldr r2, _080D211C + ldr r2, =0x000083c2 adds r0, r2 adds r0, r1 ldrb r0, [r0] @@ -430088,8 +415816,7 @@ _080D2112: pop {r1} bx r1 .align 2, 0 -_080D2118: .4byte 0x03005d94 -_080D211C: .4byte 0x000083c2 + .pool thumb_func_end sub_80D20F8 thumb_func_start sub_80D2120 @@ -430103,9 +415830,9 @@ sub_80D2120: @ 80D2120 bhi _080D213E cmp r1, 0x10 bhi _080D213E - ldr r0, _080D2144 + ldr r0, =0x03005d94 ldr r0, [r0] - ldr r3, _080D2148 + ldr r3, =0x000083c2 adds r0, r3 adds r0, r2 strb r1, [r0] @@ -430113,8 +415840,7 @@ _080D213E: pop {r0} bx r0 .align 2, 0 -_080D2144: .4byte 0x03005d94 -_080D2148: .4byte 0x000083c2 + .pool thumb_func_end sub_80D2120 thumb_func_start sub_80D214C @@ -430130,7 +415856,7 @@ sub_80D214C: @ 80D214C lsls r3, 24 lsrs r3, 24 adds r4, r3, 0 - ldr r2, _080D21B0 + ldr r2, =0x0000ffff cmp r3, 0x1 bhi _080D216E movs r2, 0x1 @@ -430172,7 +415898,7 @@ _080D218A: ble _080D218A b _080D2208 .align 2, 0 -_080D21B0: .4byte 0x0000ffff + .pool _080D21B4: adds r0, r4, 0 b _080D220C @@ -430236,7 +415962,7 @@ sub_80D2218: @ 80D2218 push {r7} sub sp, 0x4 movs r2, 0 - ldr r0, _080D2248 + ldr r0, =0x03005d94 mov r8, r0 movs r7, 0x4 _080D2228: @@ -430257,7 +415983,7 @@ _080D222E: movs r0, 0x1 b _080D2262 .align 2, 0 -_080D2248: .4byte 0x03005d94 + .pool _080D224C: adds r4, 0x50 adds r5, 0x1 @@ -430287,7 +416013,7 @@ sub_80D2270: @ 80D2270 bhi _080D22C8 cmp r2, 0x1D bhi _080D22C8 - ldr r6, _080D22C4 + ldr r6, =0x03005d94 lsls r1, r0, 2 adds r1, r0 lsls r0, r1, 4 @@ -430321,7 +416047,7 @@ sub_80D2270: @ 80D2270 movs r0, 0x1 b _080D22CA .align 2, 0 -_080D22C4: .4byte 0x03005d94 + .pool _080D22C8: movs r0, 0 _080D22CA: @@ -430338,7 +416064,7 @@ sub_80D22D0: @ 80D22D0 push {r6,r7} movs r7, 0 movs r0, 0 - ldr r1, _080D2338 + ldr r1, =0x03005d94 mov r9, r1 _080D22E0: lsls r1, r0, 2 @@ -430385,7 +416111,7 @@ _080D231A: pop {r1} bx r1 .align 2, 0 -_080D2338: .4byte 0x03005d94 + .pool thumb_func_end sub_80D22D0 thumb_func_start sub_80D233C @@ -430396,7 +416122,7 @@ sub_80D233C: @ 80D233C push {r6,r7} movs r7, 0 movs r0, 0 - ldr r1, _080D23A4 + ldr r1, =0x03005d94 mov r9, r1 _080D234C: lsls r1, r0, 2 @@ -430444,7 +416170,7 @@ _080D2386: pop {r1} bx r1 .align 2, 0 -_080D23A4: .4byte 0x03005d94 + .pool thumb_func_end sub_80D233C thumb_func_start sub_80D23A8 @@ -430455,11 +416181,11 @@ sub_80D23A8: @ 80D23A8 sub sp, 0x4 mov r1, sp strh r0, [r1] - ldr r0, _080D23FC + ldr r0, =0x00000163 strh r0, [r1, 0x2] movs r0, 0 mov r8, r0 - ldr r7, _080D2400 + ldr r7, =0x03005d94 movs r5, 0x4 _080D23C0: movs r6, 0 @@ -430490,8 +416216,7 @@ _080D23C4: movs r0, 0x1 b _080D241E .align 2, 0 -_080D23FC: .4byte 0x00000163 -_080D2400: .4byte 0x03005d94 + .pool _080D2404: adds r4, 0x50 adds r6, 0x1 @@ -430517,14 +416242,14 @@ _080D241E: thumb_func_start sub_80D242C sub_80D242C: @ 80D242C - ldr r2, _080D2464 + ldr r2, =0x03005d8c ldr r0, [r2] - ldr r1, _080D2468 + ldr r1, =0x00003d84 adds r0, r1 movs r1, 0 strb r1, [r0] ldr r0, [r2] - ldr r3, _080D246C + ldr r3, =0x00003d85 adds r0, r3 strb r1, [r0] ldr r0, [r2] @@ -430532,66 +416257,57 @@ sub_80D242C: @ 80D242C adds r0, r3 strb r1, [r0] ldr r1, [r2] - ldr r0, _080D2470 + ldr r0, =0x00003d70 adds r2, r1, r0 - ldr r0, _080D2474 + ldr r0, =0x00007b35 strh r0, [r2] subs r3, 0x14 adds r2, r1, r3 - ldr r0, _080D2478 + ldr r0, =0x00006186 strh r0, [r2] - ldr r0, _080D247C + ldr r0, =0x00003d74 adds r1, r0 movs r0, 0xFF strb r0, [r1] bx lr .align 2, 0 -_080D2464: .4byte 0x03005d8c -_080D2468: .4byte 0x00003d84 -_080D246C: .4byte 0x00003d85 -_080D2470: .4byte 0x00003d70 -_080D2474: .4byte 0x00007b35 -_080D2478: .4byte 0x00006186 -_080D247C: .4byte 0x00003d74 + .pool thumb_func_end sub_80D242C thumb_func_start sub_80D2480 sub_80D2480: @ 80D2480 - ldr r1, _080D248C + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r2, _080D2490 + ldr r2, =0x00003d86 adds r1, r2 strb r0, [r1] bx lr .align 2, 0 -_080D248C: .4byte 0x03005d8c -_080D2490: .4byte 0x00003d86 + .pool thumb_func_end sub_80D2480 thumb_func_start sub_80D2494 sub_80D2494: @ 80D2494 - ldr r0, _080D24A0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080D24A4 + ldr r1, =0x00003d86 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080D24A0: .4byte 0x03005d8c -_080D24A4: .4byte 0x00003d86 + .pool thumb_func_end sub_80D2494 thumb_func_start sub_80D24A8 sub_80D24A8: @ 80D24A8 - ldr r0, _080D24B4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080D24B8 + ldr r1, =0x00003d85 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080D24B4: .4byte 0x03005d8c -_080D24B8: .4byte 0x00003d85 + .pool thumb_func_end sub_80D24A8 thumb_func_start sub_80D24BC @@ -430601,30 +416317,28 @@ sub_80D24BC: @ 80D24BC lsrs r1, r0, 24 cmp r1, 0xF bhi _080D24D0 - ldr r0, _080D24D4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _080D24D8 + ldr r2, =0x00003d85 adds r0, r2 strb r1, [r0] _080D24D0: pop {r0} bx r0 .align 2, 0 -_080D24D4: .4byte 0x03005d8c -_080D24D8: .4byte 0x00003d85 + .pool thumb_func_end sub_80D24BC thumb_func_start sub_80D24DC sub_80D24DC: @ 80D24DC - ldr r0, _080D24E8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080D24EC + ldr r1, =0x00003d84 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080D24E8: .4byte 0x03005d8c -_080D24EC: .4byte 0x00003d84 + .pool thumb_func_end sub_80D24DC thumb_func_start sub_80D24F0 @@ -430634,86 +416348,80 @@ sub_80D24F0: @ 80D24F0 lsrs r1, r0, 24 cmp r1, 0x1D bhi _080D2504 - ldr r0, _080D2508 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _080D250C + ldr r2, =0x00003d84 adds r0, r2 strb r1, [r0] _080D2504: pop {r0} bx r0 .align 2, 0 -_080D2508: .4byte 0x03005d8c -_080D250C: .4byte 0x00003d84 + .pool thumb_func_end sub_80D24F0 thumb_func_start sub_80D2510 sub_80D2510: @ 80D2510 - ldr r0, _080D251C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080D2520 + ldr r1, =0x00003d70 adds r0, r1 bx lr .align 2, 0 -_080D251C: .4byte 0x03005d8c -_080D2520: .4byte 0x00003d70 + .pool thumb_func_end sub_80D2510 thumb_func_start sub_80D2524 sub_80D2524: @ 80D2524 push {r4,lr} - ldr r2, _080D253C + ldr r2, =0x03005d8c ldr r2, [r2] - ldr r4, _080D2540 + ldr r4, =0x00003d70 adds r3, r2, r4 strh r0, [r3] - ldr r0, _080D2544 + ldr r0, =0x00003d72 adds r2, r0 strh r1, [r2] pop {r4} pop {r0} bx r0 .align 2, 0 -_080D253C: .4byte 0x03005d8c -_080D2540: .4byte 0x00003d70 -_080D2544: .4byte 0x00003d72 + .pool thumb_func_end sub_80D2524 thumb_func_start sub_80D2548 sub_80D2548: @ 80D2548 - ldr r0, _080D2554 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080D2558 + ldr r1, =0x00003d74 adds r0, r1 bx lr .align 2, 0 -_080D2554: .4byte 0x03005d8c -_080D2558: .4byte 0x00003d74 + .pool thumb_func_end sub_80D2548 thumb_func_start sub_80D255C sub_80D255C: @ 80D255C push {lr} adds r1, r0, 0 - ldr r0, _080D2570 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _080D2574 + ldr r2, =0x00003d74 adds r0, r2 bl gf_strcpy pop {r0} bx r0 .align 2, 0 -_080D2570: .4byte 0x03005d8c -_080D2574: .4byte 0x00003d74 + .pool thumb_func_end sub_80D255C thumb_func_start sub_80D2578 sub_80D2578: @ 80D2578 push {lr} movs r1, 0 - ldr r0, _080D2594 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _080D2598 + ldr r2, =0x00003d74 adds r0, r2 ldrb r0, [r0] cmp r0, 0xFF @@ -430724,8 +416432,7 @@ _080D258C: pop {r1} bx r1 .align 2, 0 -_080D2594: .4byte 0x03005d8c -_080D2598: .4byte 0x00003d74 + .pool thumb_func_end sub_80D2578 thumb_func_start sub_80D259C @@ -430733,13 +416440,13 @@ sub_80D259C: @ 80D259C push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _080D25E8 + ldr r6, =0x02039d84 lsls r0, r4, 1 adds r0, r4 lsls r0, 4 bl malloc str r0, [r6] - ldr r5, _080D25EC + ldr r5, =0x02039d88 movs r1, 0 cmp r0, 0 beq _080D25BA @@ -430771,33 +416478,32 @@ _080D25E2: pop {r0} bx r0 .align 2, 0 -_080D25E8: .4byte 0x02039d84 -_080D25EC: .4byte 0x02039d88 + .pool thumb_func_end sub_80D259C thumb_func_start sub_80D25F0 sub_80D25F0: @ 80D25F0 push {lr} - ldr r0, _080D2600 + ldr r0, =0x02039d84 ldr r0, [r0] bl free pop {r0} bx r0 .align 2, 0 -_080D2600: .4byte 0x02039d84 + .pool thumb_func_end sub_80D25F0 thumb_func_start sub_80D2604 sub_80D2604: @ 80D2604 push {r4,r5,lr} movs r4, 0 - ldr r0, _080D263C + ldr r0, =0x02039d88 ldrh r0, [r0] cmp r4, r0 bge _080D2634 movs r5, 0 _080D2612: - ldr r0, _080D2640 + ldr r0, =0x02039d84 ldr r0, [r0] adds r0, r5, r0 adds r0, 0x2C @@ -430810,7 +416516,7 @@ _080D2612: _080D2628: adds r5, 0x30 adds r4, 0x1 - ldr r0, _080D263C + ldr r0, =0x02039d88 ldrh r0, [r0] cmp r4, r0 blt _080D2612 @@ -430819,8 +416525,7 @@ _080D2634: pop {r0} bx r0 .align 2, 0 -_080D263C: .4byte 0x02039d88 -_080D2640: .4byte 0x02039d84 + .pool thumb_func_end sub_80D2604 thumb_func_start sub_80D2644 @@ -430843,11 +416548,11 @@ sub_80D2644: @ 80D2644 lsls r2, 16 lsrs r2, 16 str r2, [sp] - ldr r0, _080D26DC + ldr r0, =0x02039d88 ldrh r0, [r0] cmp r6, r0 bcs _080D272C - ldr r0, _080D26E0 + ldr r0, =0x02039d84 mov r9, r0 ldr r0, [r0] lsls r1, r6, 1 @@ -430882,7 +416587,7 @@ sub_80D2644: @ 80D2644 mov r2, r9 ldr r1, [r2] adds r5, r1 - ldr r2, _080D26E4 + ldr r2, =0x0857bc88 lsls r4, 2 lsls r1, r0, 4 adds r4, r1 @@ -430899,16 +416604,14 @@ sub_80D2644: @ 80D2644 movs r0, 0x1 b _080D26EE .align 2, 0 -_080D26DC: .4byte 0x02039d88 -_080D26E0: .4byte 0x02039d84 -_080D26E4: .4byte 0x0857bc88 + .pool _080D26E8: adds r1, r5, 0 adds r1, 0x2A movs r0, 0x2 _080D26EE: strb r0, [r1] - ldr r4, _080D273C + ldr r4, =0x02039d84 ldr r1, [r4] adds r2, r6 lsls r2, 4 @@ -430948,7 +416651,7 @@ _080D272C: pop {r0} bx r0 .align 2, 0 -_080D273C: .4byte 0x02039d84 + .pool thumb_func_end sub_80D2644 thumb_func_start sub_80D2740 @@ -430957,11 +416660,11 @@ sub_80D2740: @ 80D2740 adds r3, r1, 0 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080D2768 + ldr r0, =0x02039d88 ldrh r0, [r0] cmp r2, r0 bcs _080D2764 - ldr r0, _080D276C + ldr r0, =0x02039d84 ldr r1, [r0] lsls r0, r2, 1 adds r0, r2 @@ -430975,8 +416678,7 @@ _080D2764: pop {r0} bx r0 .align 2, 0 -_080D2768: .4byte 0x02039d88 -_080D276C: .4byte 0x02039d84 + .pool thumb_func_end sub_80D2740 thumb_func_start sub_80D2770 @@ -430988,11 +416690,11 @@ sub_80D2770: @ 80D2770 lsrs r4, r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _080D27A4 + ldr r0, =0x02039d88 ldrh r0, [r0] cmp r3, r0 bcs _080D279C - ldr r0, _080D27A8 + ldr r0, =0x02039d84 ldr r1, [r0] lsls r0, r3, 1 adds r0, r3 @@ -431008,8 +416710,7 @@ _080D279C: pop {r0} bx r0 .align 2, 0 -_080D27A4: .4byte 0x02039d88 -_080D27A8: .4byte 0x02039d84 + .pool thumb_func_end sub_80D2770 thumb_func_start sub_80D27AC @@ -431026,11 +416727,11 @@ sub_80D27AC: @ 80D27AC lsrs r3, 16 lsls r4, 16 lsrs r4, 16 - ldr r0, _080D27EC + ldr r0, =0x02039d88 ldrh r0, [r0] cmp r5, r0 bcs _080D27E6 - ldr r0, _080D27F0 + ldr r0, =0x02039d84 ldr r1, [r0] lsls r0, r5, 1 adds r0, r5 @@ -431048,8 +416749,7 @@ _080D27E6: pop {r0} bx r0 .align 2, 0 -_080D27EC: .4byte 0x02039d88 -_080D27F0: .4byte 0x02039d84 + .pool thumb_func_end sub_80D27AC thumb_func_start sub_80D27F4 @@ -431061,27 +416761,25 @@ sub_80D27F4: @ 80D27F4 lsrs r1, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, _080D2820 + ldr r0, =0x02039d88 ldrh r0, [r0] cmp r5, r0 bcc _080D280C b _080D290E _080D280C: - ldr r4, _080D2824 + ldr r4, =0x02039d84 lsls r2, r5, 1 cmp r1, 0x5 bls _080D2816 b _080D2900 _080D2816: lsls r0, r1, 2 - ldr r1, _080D2828 + ldr r1, =_080D282C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D2820: .4byte 0x02039d88 -_080D2824: .4byte 0x02039d84 -_080D2828: .4byte _080D282C + .pool .align 2, 0 _080D282C: .4byte _080D2844 @@ -431091,7 +416789,7 @@ _080D282C: .4byte _080D28CC .4byte _080D28E8 _080D2844: - ldr r4, _080D2860 + ldr r4, =0x02039d84 ldr r0, [r4] lsls r3, r5, 1 adds r1, r3, r5 @@ -431106,9 +416804,9 @@ _080D2844: subs r0, r2 b _080D287E .align 2, 0 -_080D2860: .4byte 0x02039d84 + .pool _080D2864: - ldr r4, _080D2884 + ldr r4, =0x02039d84 ldr r0, [r4] lsls r3, r5, 1 adds r1, r3, r5 @@ -431126,9 +416824,9 @@ _080D287E: adds r2, r3, 0 b _080D2900 .align 2, 0 -_080D2884: .4byte 0x02039d84 + .pool _080D2888: - ldr r4, _080D28A4 + ldr r4, =0x02039d84 ldr r0, [r4] lsls r3, r5, 1 adds r1, r3, r5 @@ -431143,9 +416841,9 @@ _080D2888: subs r0, r2 b _080D28C2 .align 2, 0 -_080D28A4: .4byte 0x02039d84 + .pool _080D28A8: - ldr r4, _080D28C8 + ldr r4, =0x02039d84 ldr r0, [r4] lsls r3, r5, 1 adds r1, r3, r5 @@ -431163,9 +416861,9 @@ _080D28C2: adds r2, r3, 0 b _080D2900 .align 2, 0 -_080D28C8: .4byte 0x02039d84 + .pool _080D28CC: - ldr r3, _080D28E4 + ldr r3, =0x02039d84 ldr r0, [r3] lsls r2, r5, 1 adds r1, r2, r5 @@ -431178,9 +416876,9 @@ _080D28CC: strh r0, [r1, 0x14] b _080D28FE .align 2, 0 -_080D28E4: .4byte 0x02039d84 + .pool _080D28E8: - ldr r3, _080D2914 + ldr r3, =0x02039d84 ldr r0, [r3] lsls r2, r5, 1 adds r1, r2, r5 @@ -431206,7 +416904,7 @@ _080D290E: pop {r0} bx r0 .align 2, 0 -_080D2914: .4byte 0x02039d84 + .pool thumb_func_end sub_80D27F4 thumb_func_start sub_80D2918 @@ -431215,11 +416913,11 @@ sub_80D2918: @ 80D2918 lsls r0, 24 lsrs r2, r0, 24 adds r6, r2, 0 - ldr r0, _080D2958 + ldr r0, =0x02039d88 ldrh r0, [r0] cmp r2, r0 bcs _080D2952 - ldr r5, _080D295C + ldr r5, =0x02039d84 ldr r0, [r5] lsls r1, r2, 1 adds r1, r2 @@ -431244,8 +416942,7 @@ _080D2952: pop {r0} bx r0 .align 2, 0 -_080D2958: .4byte 0x02039d88 -_080D295C: .4byte 0x02039d84 + .pool thumb_func_end sub_80D2918 thumb_func_start sub_80D2960 @@ -431259,7 +416956,7 @@ sub_80D2960: @ 80D2960 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r4, _080D29F4 + ldr r4, =0x02039d84 ldr r1, [r4] lsls r5, r0, 1 adds r0, r5, r0 @@ -431326,7 +417023,7 @@ _080D29E4: pop {r0} bx r0 .align 2, 0 -_080D29F4: .4byte 0x02039d84 + .pool thumb_func_end sub_80D2960 thumb_func_start sub_80D29F8 @@ -431340,7 +417037,7 @@ sub_80D29F8: @ 80D29F8 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r4, _080D2A8C + ldr r4, =0x02039d84 ldr r1, [r4] lsls r5, r0, 1 adds r0, r5, r0 @@ -431407,12 +417104,12 @@ _080D2A7C: pop {r0} bx r0 .align 2, 0 -_080D2A8C: .4byte 0x02039d84 + .pool thumb_func_end sub_80D29F8 thumb_func_start sub_80D2A90 sub_80D2A90: @ 80D2A90 - ldr r3, _080D2AA0 + ldr r3, =0x02039d8c str r0, [r3] str r1, [r0] movs r1, 0 @@ -431420,13 +417117,13 @@ sub_80D2A90: @ 80D2A90 strb r1, [r0, 0x4] bx lr .align 2, 0 -_080D2AA0: .4byte 0x02039d8c + .pool thumb_func_end sub_80D2A90 thumb_func_start sub_80D2AA4 sub_80D2AA4: @ 80D2AA4 push {r4,r5,lr} - ldr r2, _080D2AE8 + ldr r2, =0x02039d8c ldr r1, [r2] ldrb r0, [r1, 0x4] cmp r0, 0 @@ -431453,7 +417150,7 @@ _080D2ABA: cmp r4, r0 bcc _080D2ABA _080D2ADA: - ldr r0, _080D2AE8 + ldr r0, =0x02039d8c ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x4] @@ -431462,7 +417159,7 @@ _080D2AE2: pop {r0} bx r0 .align 2, 0 -_080D2AE8: .4byte 0x02039d8c + .pool thumb_func_end sub_80D2AA4 thumb_func_start sub_80D2AEC @@ -431497,7 +417194,7 @@ sub_80D2AEC: @ 80D2AEC lsrs r5, 16 lsls r6, 16 lsrs r6, 16 - ldr r0, _080D2B6C + ldr r0, =0x02039d8c ldr r2, [r0] ldrb r0, [r2, 0x4] adds r1, r0, 0 @@ -431527,13 +417224,12 @@ sub_80D2AEC: @ 80D2AEC str r0, [r1] strh r5, [r1, 0xC] strh r6, [r1, 0xA] - ldr r0, _080D2B70 + ldr r0, =sub_80D2B88 + 1 str r0, [r1, 0x10] movs r0, 0x1 b _080D2B76 .align 2, 0 -_080D2B6C: .4byte 0x02039d8c -_080D2B70: .4byte sub_80D2B88 + 1 + .pool _080D2B74: movs r0, 0 _080D2B76: @@ -431592,7 +417288,7 @@ sub_80D2BC0: @ 80D2BC0 lsrs r3, 16 lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _080D2C0C + ldr r0, =0x02039d8c ldr r2, [r0] ldrb r0, [r2, 0x4] adds r1, r0, 0 @@ -431614,13 +417310,12 @@ sub_80D2BC0: @ 80D2BC0 add r0, r12 str r0, [r1, 0x4] strh r5, [r1, 0xC] - ldr r0, _080D2C10 + ldr r0, =sub_80D2C1C + 1 str r0, [r1, 0x10] movs r0, 0x1 b _080D2C16 .align 2, 0 -_080D2C0C: .4byte 0x02039d8c -_080D2C10: .4byte sub_80D2C1C + 1 + .pool _080D2C14: movs r0, 0 _080D2C16: @@ -431645,7 +417340,7 @@ sub_80D2C1C: @ 80D2C1C movs r7, 0x80 lsls r7, 5 mov r5, sp - ldr r2, _080D2C68 + ldr r2, =0x040000d4 mov r8, r2 movs r1, 0x81 lsls r1, 24 @@ -431671,15 +417366,15 @@ _080D2C42: mov r1, r8 b _080D2C94 .align 2, 0 -_080D2C68: .4byte 0x040000d4 + .pool _080D2C6C: movs r4, 0 strh r4, [r5] - ldr r1, _080D2CBC + ldr r1, =0x040000d4 mov r0, sp str r0, [r1] str r2, [r1, 0x4] - ldr r0, _080D2CC0 + ldr r0, =0x81000800 str r0, [r1, 0x8] ldr r0, [r1, 0x8] adds r2, r7 @@ -431715,8 +417410,7 @@ _080D2CAA: pop {r0} bx r0 .align 2, 0 -_080D2CBC: .4byte 0x040000d4 -_080D2CC0: .4byte 0x81000800 + .pool thumb_func_end sub_80D2C1C thumb_func_start sub_80D2CC4 @@ -431741,20 +417435,20 @@ sub_80D2CC4: @ 80D2CC4 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _080D2D60 + ldr r0, =0x0857c570 str r0, [sp, 0x18] adds r0, r4, 0 adds r2, r5, 0 bl sub_80D2EDC str r0, [sp, 0x1C] - ldr r0, _080D2D64 + ldr r0, =0x0857c5b4 str r0, [sp, 0x20] - ldr r0, _080D2D68 + ldr r0, =0x0857c5e8 str r0, [sp, 0x24] str r6, [sp, 0x28] - ldr r0, _080D2D6C + ldr r0, =0x0857c388 adds r0, r4, r0 - ldr r1, _080D2D70 + ldr r1, =0x0000dac0 adds r5, r1, 0 ldrb r0, [r0] adds r1, r5, r0 @@ -431785,7 +417479,7 @@ _080D2D2A: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _080D2D74 + ldr r1, =0x02020630 adds r0, r1 bl sub_80D30DC adds r0, r4, 0 @@ -431797,12 +417491,7 @@ _080D2D2A: pop {r1} bx r1 .align 2, 0 -_080D2D60: .4byte 0x0857c570 -_080D2D64: .4byte 0x0857c5b4 -_080D2D68: .4byte 0x0857c5e8 -_080D2D6C: .4byte 0x0857c388 -_080D2D70: .4byte 0x0000dac0 -_080D2D74: .4byte 0x02020630 + .pool thumb_func_end sub_80D2CC4 thumb_func_start sub_80D2D78 @@ -431821,18 +417510,18 @@ sub_80D2D78: @ 80D2D78 lsls r6, 24 lsrs r6, 24 mov r3, sp - ldr r2, _080D2DF0 + ldr r2, =0x0857c570 str r2, [sp] movs r2, 0 str r2, [sp, 0x4] - ldr r2, _080D2DF4 + ldr r2, =0x0857c5b4 str r2, [sp, 0x8] - ldr r2, _080D2DF8 + ldr r2, =0x0857c5e8 str r2, [sp, 0xC] str r1, [sp, 0x10] - ldr r2, _080D2DFC + ldr r2, =0x0857c388 adds r2, r0, r2 - ldr r7, _080D2E00 + ldr r7, =0x0000dac0 adds r1, r7, 0 ldrb r2, [r2] adds r1, r2 @@ -431855,7 +417544,7 @@ sub_80D2D78: @ 80D2D78 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _080D2E04 + ldr r1, =0x02020630 adds r0, r1 bl sub_80D30DC adds r0, r4, 0 @@ -431864,12 +417553,7 @@ sub_80D2D78: @ 80D2D78 pop {r1} bx r1 .align 2, 0 -_080D2DF0: .4byte 0x0857c570 -_080D2DF4: .4byte 0x0857c5b4 -_080D2DF8: .4byte 0x0857c5e8 -_080D2DFC: .4byte 0x0857c388 -_080D2E00: .4byte 0x0000dac0 -_080D2E04: .4byte 0x02020630 + .pool thumb_func_end sub_80D2D78 thumb_func_start sub_80D2E08 @@ -432023,7 +417707,7 @@ sub_80D2EF8: @ 80D2EF8 sub_80D2F04: @ 80D2F04 push {r4,r5,lr} movs r4, 0 - ldr r5, _080D2F24 + ldr r5, =0x0857c540 _080D2F0A: lsls r0, r4, 3 adds r0, r5 @@ -432037,7 +417721,7 @@ _080D2F0A: pop {r0} bx r0 .align 2, 0 -_080D2F24: .4byte 0x0857c540 + .pool thumb_func_end sub_80D2F04 thumb_func_start sub_80D2F28 @@ -432052,10 +417736,10 @@ sub_80D2F28: @ 80D2F28 movs r1, 0x82 lsls r1, 1 _080D2F3A: - ldr r0, _080D2F60 + ldr r0, =0x0857c388 adds r0, r1, r0 ldrb r0, [r0] - ldr r1, _080D2F64 + ldr r1, =0x0857c540 lsls r0, 3 adds r4, r0, r1 ldrh r0, [r4, 0x4] @@ -432071,8 +417755,7 @@ _080D2F5A: pop {r0} bx r0 .align 2, 0 -_080D2F60: .4byte 0x0857c388 -_080D2F64: .4byte 0x0857c540 + .pool thumb_func_end sub_80D2F28 thumb_func_start sub_80D2F68 @@ -432080,10 +417763,10 @@ sub_80D2F68: @ 80D2F68 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r1, _080D2F94 + ldr r1, =0x0857c388 adds r0, r1 ldrb r0, [r0] - ldr r1, _080D2F98 + ldr r1, =0x0857c540 lsls r0, 3 adds r4, r0, r1 ldrh r0, [r4, 0x4] @@ -432099,15 +417782,14 @@ _080D2F8E: pop {r0} bx r0 .align 2, 0 -_080D2F94: .4byte 0x0857c388 -_080D2F98: .4byte 0x0857c540 + .pool thumb_func_end sub_80D2F68 thumb_func_start sub_80D2F9C sub_80D2F9C: @ 80D2F9C push {r4,r5,lr} movs r4, 0 - ldr r5, _080D2FBC + ldr r5, =0x0857c540 _080D2FA2: lsls r0, r4, 3 adds r0, r5 @@ -432122,7 +417804,7 @@ _080D2FA2: pop {r0} bx r0 .align 2, 0 -_080D2FBC: .4byte 0x0857c540 + .pool thumb_func_end sub_80D2F9C thumb_func_start sub_80D2FC0 @@ -432137,10 +417819,10 @@ sub_80D2FC0: @ 80D2FC0 movs r1, 0x82 lsls r1, 1 _080D2FD2: - ldr r0, _080D2FE8 + ldr r0, =0x0857c388 adds r0, r1, r0 ldrb r0, [r0] - ldr r1, _080D2FEC + ldr r1, =0x0857c540 lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x4] @@ -432148,8 +417830,7 @@ _080D2FD2: pop {r0} bx r0 .align 2, 0 -_080D2FE8: .4byte 0x0857c388 -_080D2FEC: .4byte 0x0857c540 + .pool thumb_func_end sub_80D2FC0 thumb_func_start sub_80D2FF0 @@ -432157,10 +417838,10 @@ sub_80D2FF0: @ 80D2FF0 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r1, _080D300C + ldr r1, =0x0857c388 adds r0, r1 ldrb r0, [r0] - ldr r1, _080D3010 + ldr r1, =0x0857c540 lsls r0, 3 adds r0, r1 ldrh r0, [r0, 0x4] @@ -432168,8 +417849,7 @@ sub_80D2FF0: @ 80D2FF0 pop {r0} bx r0 .align 2, 0 -_080D300C: .4byte 0x0857c388 -_080D3010: .4byte 0x0857c540 + .pool thumb_func_end sub_80D2FF0 thumb_func_start sub_80D3014 @@ -432186,7 +417866,7 @@ sub_80D3020: @ 80D3020 adds r3, r1, 0 lsls r0, 16 lsrs r0, 16 - ldr r2, _080D3048 + ldr r2, =0x0857bca8 lsls r1, r0, 2 adds r1, r2 ldr r2, [r1] @@ -432204,7 +417884,7 @@ _080D3042: pop {r1} bx r1 .align 2, 0 -_080D3048: .4byte 0x0857bca8 + .pool thumb_func_end sub_80D3020 thumb_func_start sub_80D304C @@ -432214,7 +417894,7 @@ sub_80D304C: @ 80D304C lsrs r4, r0, 16 cmp r4, 0xA0 bhi _080D3074 - ldr r6, _080D307C + ldr r6, =0x0857c540 movs r5, 0x5 _080D305A: ldr r0, [r6] @@ -432234,7 +417914,7 @@ _080D3074: pop {r0} bx r0 .align 2, 0 -_080D307C: .4byte 0x0857c540 + .pool thumb_func_end sub_80D304C thumb_func_start sub_80D3080 @@ -432249,25 +417929,25 @@ sub_80D3080: @ 80D3080 movs r1, 0x82 lsls r1, 1 _080D3092: - ldr r0, _080D309C + ldr r0, =0x0857c388 adds r0, r1, r0 ldrb r0, [r0] pop {r1} bx r1 .align 2, 0 -_080D309C: .4byte 0x0857c388 + .pool thumb_func_end sub_80D3080 thumb_func_start sub_80D30A0 sub_80D30A0: @ 80D30A0 lsls r0, 16 lsrs r0, 16 - ldr r1, _080D30AC + ldr r1, =0x0857c388 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080D30AC: .4byte 0x0857c388 + .pool thumb_func_end sub_80D30A0 thumb_func_start sub_80D30B0 @@ -432282,8 +417962,8 @@ sub_80D30B0: @ 80D30B0 movs r2, 0x82 lsls r2, 1 _080D30C2: - ldr r1, _080D30D4 - ldr r0, _080D30D8 + ldr r1, =0x0857c540 + ldr r0, =0x0857c388 adds r0, r2, r0 ldrb r0, [r0] lsls r0, 3 @@ -432292,8 +417972,7 @@ _080D30C2: pop {r1} bx r1 .align 2, 0 -_080D30D4: .4byte 0x0857c540 -_080D30D8: .4byte 0x0857c388 + .pool thumb_func_end sub_80D30B0 thumb_func_start sub_80D30DC @@ -432339,7 +418018,7 @@ _080D3126: strb r7, [r5] b _080D31A4 _080D312A: - ldr r2, _080D3188 + ldr r2, =0x0857c5f0 ldrb r1, [r4, 0x3] lsrs r1, 6 lsls r1, 1 @@ -432356,7 +418035,7 @@ _080D312A: ldrh r1, [r4, 0x4] lsls r1, 22 lsrs r1, 17 - ldr r3, _080D318C + ldr r3, =0x06010000 adds r1, r3 bl copy_queue_add mov r0, r8 @@ -432385,8 +418064,7 @@ _080D312A: ldrb r7, [r5] b _080D31A4 .align 2, 0 -_080D3188: .4byte 0x0857c5f0 -_080D318C: .4byte 0x06010000 + .pool _080D3190: lsls r0, r2, 26 lsrs r0, 26 @@ -432429,7 +418107,7 @@ sub_80D31B4: @ 80D31B4 mov r8, r0 movs r0, 0 str r0, [sp, 0x30] - ldr r2, _080D327C + ldr r2, =0x0857c5f0 mov r0, r9 ldr r6, [r0] ldrb r1, [r6, 0x3] @@ -432441,14 +418119,14 @@ sub_80D31B4: @ 80D31B4 adds r1, r0 adds r1, r2 ldrh r2, [r1] - ldr r1, _080D3280 + ldr r1, =0xffff0000 add r3, sp, 0x30 ldr r0, [r3, 0x4] ands r0, r1 orrs r0, r2 str r0, [r3, 0x4] add r1, sp, 0x18 - ldr r0, _080D3284 + ldr r0, =0x0000ffff strh r0, [r1] mov r0, r9 ldrh r2, [r0, 0x14] @@ -432478,7 +418156,7 @@ sub_80D31B4: @ 80D31B4 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r6, _080D3288 + ldr r6, =0x02020630 lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -432508,10 +418186,7 @@ sub_80D31B4: @ 80D31B4 pop {r1} bx r1 .align 2, 0 -_080D327C: .4byte 0x0857c5f0 -_080D3280: .4byte 0xffff0000 -_080D3284: .4byte 0x0000ffff -_080D3288: .4byte 0x02020630 + .pool thumb_func_end sub_80D31B4 thumb_func_start sub_80D328C @@ -432520,7 +418195,7 @@ sub_80D328C: @ 80D328C sub sp, 0x8 movs r1, 0 str r1, [sp] - ldr r3, _080D32C0 + ldr r3, =0x0857c5f0 ldrb r2, [r0, 0x3] lsrs r2, 6 lsls r2, 1 @@ -432530,7 +418205,7 @@ sub_80D328C: @ 80D328C adds r2, r1 adds r2, r3 ldrh r3, [r2] - ldr r2, _080D32C4 + ldr r2, =0xffff0000 ldr r1, [sp, 0x4] ands r1, r2 orrs r1, r3 @@ -432542,8 +418217,7 @@ sub_80D328C: @ 80D328C pop {r0} bx r0 .align 2, 0 -_080D32C0: .4byte 0x0857c5f0 -_080D32C4: .4byte 0xffff0000 + .pool thumb_func_end sub_80D328C thumb_func_start sub_80D32C8 @@ -432584,7 +418258,7 @@ exec_movement: @ 80D32E8 movs r0, 0x1 b _080D3332 _080D330A: - ldr r0, _080D333C + ldr r0, =sub_80D3660 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -432607,7 +418281,7 @@ _080D3332: pop {r1} bx r1 .align 2, 0 -_080D333C: .4byte sub_80D3660 + 1 + .pool thumb_func_end exec_movement thumb_func_start sub_80D3340 @@ -432674,7 +418348,7 @@ sub_80D33AC: @ 80D33AC adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _080D33E8 + ldr r0, =sub_80D3660 + 1 bl AddTask lsls r0, 24 lsrs r0, 24 @@ -432682,8 +418356,8 @@ sub_80D33AC: @ 80D33AC lsls r1, r0, 2 adds r1, r0 lsls r3, r1, 3 - ldr r5, _080D33EC - ldr r0, _080D33F0 + ldr r5, =0x03005e08 + ldr r0, =0x0000ffff adds r4, r0, 0 _080D33CC: lsls r0, r2, 1 @@ -432701,22 +418375,20 @@ _080D33CC: pop {r0} bx r0 .align 2, 0 -_080D33E8: .4byte sub_80D3660 + 1 -_080D33EC: .4byte 0x03005e08 -_080D33F0: .4byte 0x0000ffff + .pool thumb_func_end sub_80D33AC thumb_func_start sub_80D33F4 sub_80D33F4: @ 80D33F4 push {lr} - ldr r0, _080D3404 + ldr r0, =sub_80D3660 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_080D3404: .4byte sub_80D3660 + 1 + .pool thumb_func_end sub_80D33F4 thumb_func_start sub_80D3408 @@ -432786,7 +418458,7 @@ sub_80D3474: @ 80D3474 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080D3498 + ldr r0, =0x03005e08 adds r1, r0 adds r1, 0x2 movs r2, 0 @@ -432797,7 +418469,7 @@ _080D348C: adds r0, r2, 0 b _080D34AA .align 2, 0 -_080D3498: .4byte 0x03005e08 + .pool _080D349C: adds r0, r2, 0x1 lsls r0, 24 @@ -432821,7 +418493,7 @@ sub_80D34B0: @ 80D34B0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080D34E0 + ldr r0, =0x03005e08 adds r1, r0 adds r1, 0x2 str r1, [r2] @@ -432840,7 +418512,7 @@ _080D34DC: pop {r0} bx r0 .align 2, 0 -_080D34E0: .4byte 0x03005e08 + .pool thumb_func_end sub_80D34B0 thumb_func_start sub_80D34E4 @@ -432889,14 +418561,14 @@ sub_80D352C: @ 80D352C lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r2, _080D3554 + ldr r2, =0x0832a328 lsrs r1, 22 adds r1, r2 ldr r2, [r1] mvns r2, r2 lsls r2, 16 lsrs r2, 16 - ldr r3, _080D3558 + ldr r3, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -432906,8 +418578,7 @@ sub_80D352C: @ 80D352C strh r2, [r1, 0x8] bx lr .align 2, 0 -_080D3554: .4byte 0x0832a328 -_080D3558: .4byte 0x03005e00 + .pool thumb_func_end sub_80D352C thumb_func_start sub_80D355C @@ -432915,12 +418586,12 @@ sub_80D355C: @ 80D355C lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, _080D357C + ldr r3, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 adds r2, r3 - ldr r0, _080D3580 + ldr r0, =0x0832a328 lsrs r1, 22 adds r1, r0 ldr r0, [r1] @@ -432929,8 +418600,7 @@ sub_80D355C: @ 80D355C strh r0, [r2, 0x8] bx lr .align 2, 0 -_080D357C: .4byte 0x03005e00 -_080D3580: .4byte 0x0832a328 + .pool thumb_func_end sub_80D355C thumb_func_start sub_80D3584 @@ -432939,12 +418609,12 @@ sub_80D3584: @ 80D3584 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, _080D35AC + ldr r3, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 adds r2, r3 - ldr r0, _080D35B0 + ldr r0, =0x0832a328 lsrs r1, 22 adds r1, r0 ldr r0, [r1] @@ -432955,8 +418625,7 @@ sub_80D3584: @ 80D3584 movs r0, 0 b _080D35B6 .align 2, 0 -_080D35AC: .4byte 0x03005e00 -_080D35B0: .4byte 0x0832a328 + .pool _080D35B4: movs r0, 0x1 _080D35B6: @@ -432967,25 +418636,25 @@ _080D35B6: thumb_func_start npc_obj_offscreen_culling_and_flag_update npc_obj_offscreen_culling_and_flag_update: @ 80D35BC lsls r0, 24 - ldr r2, _080D35C8 + ldr r2, =0x02039d90 lsrs r0, 22 adds r0, r2 str r1, [r0] bx lr .align 2, 0 -_080D35C8: .4byte 0x02039d90 + .pool thumb_func_end npc_obj_offscreen_culling_and_flag_update thumb_func_start sub_80D35CC sub_80D35CC: @ 80D35CC lsls r0, 24 - ldr r1, _080D35D8 + ldr r1, =0x02039d90 lsrs r0, 22 adds r0, r1 ldr r0, [r0] bx lr .align 2, 0 -_080D35D8: .4byte 0x02039d90 + .pool thumb_func_end sub_80D35CC thumb_func_start sub_80D35DC @@ -433028,7 +418697,7 @@ sub_80D361C: @ 80D361C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080D3658 + ldr r0, =0x03005e08 adds r1, r0 adds r4, r1, 0x2 movs r5, 0 @@ -433040,7 +418709,7 @@ _080D3630: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080D365C + ldr r1, =0x02037350 adds r0, r1 bl npc_sync_anim_pause_bits _080D3646: @@ -433054,8 +418723,7 @@ _080D3646: pop {r0} bx r0 .align 2, 0 -_080D3658: .4byte 0x03005e08 -_080D365C: .4byte 0x02037350 + .pool thumb_func_end sub_80D361C thumb_func_start sub_80D3660 @@ -433110,7 +418778,7 @@ sub_80D36A4: @ 80D36A4 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 - ldr r1, _080D36F4 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl npc_is_state_set_and_valid @@ -433133,7 +418801,7 @@ _080D36DC: bl sub_8097404 b _080D370E .align 2, 0 -_080D36F4: .4byte 0x02037350 + .pool _080D36F8: adds r0, r4, 0 bl npc_set_state_2 @@ -433166,21 +418834,18 @@ sub_80D3718: @ 80D3718 lsrs r0, 24 cmp r0, 0x1 bne _080D3754 - ldr r1, _080D3744 - ldr r0, _080D3748 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _080D374C - ldr r0, _080D3750 + ldr r1, =0x0203ceec + ldr r0, =sub_80D3A9C + 1 str r0, [r1] movs r0, 0x1 b _080D3A2C .align 2, 0 -_080D3744: .4byte 0x03005db0 -_080D3748: .4byte hm_add_c3_launch_phase_2 + 1 -_080D374C: .4byte 0x0203ceec -_080D3750: .4byte sub_80D3A9C + 1 + .pool _080D3754: - ldr r0, _080D3788 + ldr r0, =0x0203ab40 adds r1, r0, 0x2 bl player_get_pos_to bl brm_get_pokemon_selection @@ -433188,7 +418853,7 @@ _080D3754: lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _080D378C + ldr r1, =0x020244ec adds r0, r1 bl sub_806B6D8 lsls r0, 24 @@ -433196,26 +418861,23 @@ _080D3754: str r0, [sp, 0xC] cmp r0, 0x34 bne _080D3798 - ldr r1, _080D3790 + ldr r1, =0x03001100 movs r0, 0x5 strb r0, [r1] - ldr r0, _080D3794 + ldr r0, =0x03001101 movs r1, 0x2 b _080D37A2 .align 2, 0 -_080D3788: .4byte 0x0203ab40 -_080D378C: .4byte 0x020244ec -_080D3790: .4byte 0x03001100 -_080D3794: .4byte 0x03001101 + .pool _080D3798: - ldr r1, _080D3878 + ldr r1, =0x03001100 movs r0, 0x3 strb r0, [r1] - ldr r0, _080D387C + ldr r0, =0x03001101 movs r1, 0x1 _080D37A2: strb r1, [r0] - ldr r0, _080D3880 + ldr r0, =0x03001102 strb r1, [r0] movs r6, 0 movs r1, 0 @@ -433229,7 +418891,7 @@ _080D37AC: cmp r6, 0x8 bls _080D37AC movs r6, 0 - ldr r2, _080D3884 + ldr r2, =0x03001108 movs r1, 0 _080D37C2: adds r0, r6, r2 @@ -433243,9 +418905,9 @@ _080D37C2: str r3, [sp, 0x10] movs r6, 0 _080D37D6: - ldr r4, _080D3888 + ldr r4, =0x0000ffff adds r0, r6, r4 - ldr r1, _080D388C + ldr r1, =0x0203ab40 ldrh r1, [r1, 0x2] adds r0, r1 movs r5, 0 @@ -433260,9 +418922,9 @@ _080D37D6: adds r0, r6 mov r9, r0 _080D37F6: - ldr r3, _080D3888 + ldr r3, =0x0000ffff adds r0, r5, r3 - ldr r4, _080D388C + ldr r4, =0x0203ab40 ldrh r4, [r4] adds r0, r4 lsls r0, 16 @@ -433274,7 +418936,7 @@ _080D37F6: bl cur_mapdata_get_upper4bit_at lsls r0, 24 lsrs r0, 24 - ldr r2, _080D388C + ldr r2, =0x0203ab40 movs r1, 0x4 ldrsb r1, [r2, r1] cmp r0, r1 @@ -433299,7 +418961,7 @@ _080D37F6: _080D3846: adds r0, r5, 0x6 add r0, r9 - ldr r3, _080D3884 + ldr r3, =0x03001108 adds r0, r3 movs r1, 0x1 strb r1, [r0] @@ -433322,12 +418984,7 @@ _080D3856: adds r1, r3, r0 b _080D38C4 .align 2, 0 -_080D3878: .4byte 0x03001100 -_080D387C: .4byte 0x03001101 -_080D3880: .4byte 0x03001102 -_080D3884: .4byte 0x03001108 -_080D3888: .4byte 0x0000ffff -_080D388C: .4byte 0x0203ab40 + .pool _080D3890: adds r0, r7, r6 adds r0, r5 @@ -433343,12 +419000,12 @@ _080D3890: bne _080D38C8 adds r0, r5, 0x6 add r0, r9 - ldr r3, _080D38B8 + ldr r3, =0x03001108 adds r0, r3 strb r1, [r0] b _080D38C8 .align 2, 0 -_080D38B8: .4byte 0x03001108 + .pool _080D38BC: adds r0, r7, r6 adds r0, r5 @@ -433381,9 +419038,9 @@ _080D38EC: b _080D3A1E _080D38EE: movs r6, 0 - ldr r4, _080D39D4 + ldr r4, =0x0203ab40 mov r9, r4 - ldr r0, _080D39D8 + ldr r0, =0x0857c608 mov r10, r0 _080D38F8: lsls r2, r6, 2 @@ -433406,7 +419063,7 @@ _080D38F8: lsrs r4, r0, 16 movs r7, 0x1 movs r5, 0 - ldr r3, _080D39DC + ldr r3, =0x0857c60a adds r0, r2, r3 ldrb r0, [r0] adds r6, 0x1 @@ -433483,27 +419140,20 @@ _080D395A: cmp r0, 0x1 bne _080D39F8 _080D39BC: - ldr r1, _080D39E0 - ldr r0, _080D39E4 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _080D39E8 - ldr r0, _080D39EC + ldr r1, =0x0203ceec + ldr r0, =hm2_ruin_valley + 1 str r0, [r1] - ldr r0, _080D39F0 + ldr r0, =0x03001108 adds r0, r6, r0 strb r7, [r0] movs r4, 0x1 str r4, [sp, 0x10] b _080D3A0C .align 2, 0 -_080D39D4: .4byte 0x0203ab40 -_080D39D8: .4byte 0x0857c608 -_080D39DC: .4byte 0x0857c60a -_080D39E0: .4byte 0x03005db0 -_080D39E4: .4byte hm_add_c3_launch_phase_2 + 1 -_080D39E8: .4byte 0x0203ceec -_080D39EC: .4byte hm2_ruin_valley + 1 -_080D39F0: .4byte 0x03001108 + .pool _080D39F4: movs r7, 0 b _080D395A @@ -433514,7 +419164,7 @@ _080D39F8: lsrs r1, r0, 24 cmp r1, 0x1 bne _080D3A0C - ldr r0, _080D3A3C + ldr r0, =0x03001108 adds r0, r6, r0 strb r1, [r0] _080D3A0C: @@ -433529,11 +419179,11 @@ _080D3A18: cmp r2, 0x1 bne _080D3A2A _080D3A1E: - ldr r1, _080D3A40 - ldr r0, _080D3A44 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _080D3A48 - ldr r0, _080D3A4C + ldr r1, =0x0203ceec + ldr r0, =hm2_ruin_valley + 1 str r0, [r1] _080D3A2A: ldr r0, [sp, 0x10] @@ -433547,11 +419197,7 @@ _080D3A2C: pop {r1} bx r1 .align 2, 0 -_080D3A3C: .4byte 0x03001108 -_080D3A40: .4byte 0x03005db0 -_080D3A44: .4byte hm_add_c3_launch_phase_2 + 1 -_080D3A48: .4byte 0x0203ceec -_080D3A4C: .4byte hm2_ruin_valley + 1 + .pool thumb_func_end sub_80D3718 thumb_func_start hm2_ruin_valley @@ -433560,14 +419206,14 @@ hm2_ruin_valley: @ 80D3A50 movs r0, 0x1 bl oe_exec bl brm_get_pokemon_selection - ldr r1, _080D3A68 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080D3A68: .4byte 0x02038c08 + .pool thumb_func_end hm2_ruin_valley thumb_func_start sub_80D3A6C @@ -433576,12 +419222,12 @@ sub_80D3A6C: @ 80D3A6C bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _080D3A94 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _080D3A98 + ldr r2, =sub_80D3AEC + 1 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -433591,25 +419237,23 @@ sub_80D3A6C: @ 80D3A6C pop {r1} bx r1 .align 2, 0 -_080D3A94: .4byte 0x03005e00 -_080D3A98: .4byte sub_80D3AEC + 1 + .pool thumb_func_end sub_80D3A6C thumb_func_start sub_80D3A9C sub_80D3A9C: @ 80D3A9C push {lr} bl brm_get_pokemon_selection - ldr r1, _080D3AB4 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r0, _080D3AB8 + ldr r0, =0x08290705 bl script_env_1_execute_new_script pop {r0} bx r0 .align 2, 0 -_080D3AB4: .4byte 0x02038c08 -_080D3AB8: .4byte 0x08290705 + .pool thumb_func_end sub_80D3A9C thumb_func_start sub_80D3ABC @@ -433618,12 +419262,12 @@ sub_80D3ABC: @ 80D3ABC bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _080D3AE4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _080D3AE8 + ldr r2, =sub_80D4354 + 1 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -433633,8 +419277,7 @@ sub_80D3ABC: @ 80D3ABC pop {r1} bx r1 .align 2, 0 -_080D3AE4: .4byte 0x03005e00 -_080D3AE8: .4byte sub_80D4354 + 1 + .pool thumb_func_end sub_80D3ABC thumb_func_start sub_80D3AEC @@ -433654,13 +419297,13 @@ sub_80D3B00: @ 80D3B00 movs r6, 0 movs r0, 0x80 bl audio_play - ldr r4, _080D3BF0 + ldr r4, =0x0203ab40 adds r1, r4, 0x2 adds r0, r4, 0 bl player_get_pos_to adds r7, r4, 0 _080D3B16: - ldr r0, _080D3BF4 + ldr r0, =0x03001108 adds r0, r6, r0 ldrb r0, [r0] cmp r0, 0x1 @@ -433701,14 +419344,14 @@ _080D3B64: lsrs r6, r0, 24 cmp r6, 0x18 bls _080D3B16 - ldr r2, _080D3BF0 - ldr r0, _080D3BF8 + ldr r2, =0x0203ab40 + ldr r0, =0x03001101 ldrb r1, [r0] ldrh r0, [r2] subs r0, r1 lsls r0, 16 asrs r0, 16 - ldr r1, _080D3BFC + ldr r1, =0x03001102 ldrb r1, [r1] mvns r1, r1 ldrh r2, [r2, 0x2] @@ -433717,14 +419360,14 @@ _080D3B64: asrs r1, 16 bl sub_80D3D5C bl cur_mapdata_full_redraw - ldr r4, _080D3C00 + ldr r4, =0x02039dd0 movs r0, 0x8 bl malloc_and_clear str r0, [r4] movs r6, 0 - ldr r5, _080D3C04 + ldr r5, =0x02020630 _080D3BA0: - ldr r0, _080D3C08 + ldr r0, =0x02037590 ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -433739,7 +419382,7 @@ _080D3BA0: asrs r1, 16 ldrb r2, [r0] adds r2, 0x14 - ldr r0, _080D3C0C + ldr r0, =0x0857c66c movs r3, 0 bl obj_add_from_template_forward_search ldr r1, [r4] @@ -433764,14 +419407,7 @@ _080D3BA0: pop {r1} bx r1 .align 2, 0 -_080D3BF0: .4byte 0x0203ab40 -_080D3BF4: .4byte 0x03001108 -_080D3BF8: .4byte 0x03001101 -_080D3BFC: .4byte 0x03001102 -_080D3C00: .4byte 0x02039dd0 -_080D3C04: .4byte 0x02020630 -_080D3C08: .4byte 0x02037590 -_080D3C0C: .4byte 0x0857c66c + .pool thumb_func_end sub_80D3B00 thumb_func_start sub_80D3C10 @@ -433787,7 +419423,7 @@ sub_80D3C10: @ 80D3C10 adds r1, r5, 0 bl cur_mapdata_get_blockid_at adds r1, r0, 0 - ldr r0, _080D3C48 + ldr r0, =0x00000207 cmp r1, r0 bgt _080D3C5C subs r0, 0x1 @@ -433803,7 +419439,7 @@ sub_80D3C10: @ 80D3C10 beq _080D3C9C b _080D3D00 .align 2, 0 -_080D3C48: .4byte 0x00000207 + .pool _080D3C4C: movs r0, 0xE3 lsls r0, 1 @@ -433814,7 +419450,7 @@ _080D3C4C: beq _080D3CB2 b _080D3D00 _080D3C5C: - ldr r0, _080D3C74 + ldr r0, =0x00000212 cmp r1, r0 beq _080D3CE4 cmp r1, r0 @@ -433827,9 +419463,9 @@ _080D3C5C: beq _080D3CE4 b _080D3D00 .align 2, 0 -_080D3C74: .4byte 0x00000212 + .pool _080D3C78: - ldr r0, _080D3C8C + ldr r0, =0x00000282 cmp r1, r0 beq _080D3CC4 cmp r1, r0 @@ -433839,14 +419475,14 @@ _080D3C78: beq _080D3CBC b _080D3D00 .align 2, 0 -_080D3C8C: .4byte 0x00000282 + .pool _080D3C90: - ldr r0, _080D3C98 + ldr r0, =0x00000283 cmp r1, r0 beq _080D3CCC b _080D3D00 .align 2, 0 -_080D3C98: .4byte 0x00000283 + .pool _080D3C9C: lsls r0, r6, 16 asrs r0, 16 @@ -433860,34 +419496,34 @@ _080D3CAC: lsls r2, 1 b _080D3CD6 _080D3CB2: - ldr r2, _080D3CB8 + ldr r2, =0x000001cf b _080D3CD6 .align 2, 0 -_080D3CB8: .4byte 0x000001cf + .pool _080D3CBC: - ldr r2, _080D3CC0 + ldr r2, =0x00000279 b _080D3CD6 .align 2, 0 -_080D3CC0: .4byte 0x00000279 + .pool _080D3CC4: - ldr r2, _080D3CC8 + ldr r2, =0x0000027a b _080D3CD6 .align 2, 0 -_080D3CC8: .4byte 0x0000027a + .pool _080D3CCC: - ldr r2, _080D3CD0 + ldr r2, =0x0000027b b _080D3CD6 .align 2, 0 -_080D3CD0: .4byte 0x0000027b + .pool _080D3CD4: - ldr r2, _080D3CE0 + ldr r2, =0x00000271 _080D3CD6: adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 b _080D3D00 .align 2, 0 -_080D3CE0: .4byte 0x00000271 + .pool _080D3CE4: lsls r0, r6, 16 asrs r0, 16 @@ -433924,29 +419560,29 @@ sub_80D3D08: @ 80D3D08 movs r0, 0x1 b _080D3D56 _080D3D24: - ldr r0, _080D3D30 + ldr r0, =0x00000279 cmp r1, r0 bne _080D3D34 movs r0, 0x2 b _080D3D56 .align 2, 0 -_080D3D30: .4byte 0x00000279 + .pool _080D3D34: - ldr r0, _080D3D40 + ldr r0, =0x0000027a cmp r1, r0 bne _080D3D44 movs r0, 0x3 b _080D3D56 .align 2, 0 -_080D3D40: .4byte 0x0000027a + .pool _080D3D44: - ldr r0, _080D3D50 + ldr r0, =0x0000027b cmp r2, r0 beq _080D3D54 movs r0, 0 b _080D3D56 .align 2, 0 -_080D3D50: .4byte 0x0000027b + .pool _080D3D54: movs r0, 0x4 _080D3D56: @@ -433968,7 +419604,7 @@ sub_80D3D5C: @ 80D3D5C lsls r1, 16 lsrs r1, 16 mov r10, r1 - ldr r1, _080D3DCC + ldr r1, =0x03001100 ldrb r2, [r1] mov r3, r10 adds r0, r2, r3 @@ -434013,7 +419649,7 @@ _080D3D8E: beq _080D3DDA b _080D3E12 .align 2, 0 -_080D3DCC: .4byte 0x03001100 + .pool _080D3DD0: cmp r0, 0x3 beq _080D3DF8 @@ -434030,23 +419666,23 @@ _080D3DDA: _080D3DE8: adds r0, r5, 0 adds r1, r4, 0 - ldr r2, _080D3DF4 + ldr r2, =0x00000281 bl setmaptile_0 b _080D3E12 .align 2, 0 -_080D3DF4: .4byte 0x00000281 + .pool _080D3DF8: adds r0, r5, 0 adds r1, r4, 0 - ldr r2, _080D3E04 + ldr r2, =0x00000282 bl setmaptile_0 b _080D3E12 .align 2, 0 -_080D3E04: .4byte 0x00000282 + .pool _080D3E08: adds r0, r5, 0 adds r1, r4, 0 - ldr r2, _080D3ED8 + ldr r2, =0x00000283 bl setmaptile_0 _080D3E12: lsls r0, r6, 16 @@ -434075,34 +419711,34 @@ _080D3E44: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at - ldr r1, _080D3EDC + ldr r1, =0x00000281 cmp r0, r1 bne _080D3E5C adds r0, r5, 0 adds r1, r4, 0 - ldr r2, _080D3EE0 + ldr r2, =0x00000279 bl setmaptile_0 _080D3E5C: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at - ldr r1, _080D3EE4 + ldr r1, =0x00000282 cmp r0, r1 bne _080D3E74 adds r0, r5, 0 adds r1, r4, 0 - ldr r2, _080D3EE8 + ldr r2, =0x0000027a bl setmaptile_0 _080D3E74: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at - ldr r1, _080D3ED8 + ldr r1, =0x00000283 cmp r0, r1 bne _080D3E8C adds r0, r5, 0 adds r1, r4, 0 - ldr r2, _080D3EEC + ldr r2, =0x0000027b bl setmaptile_0 _080D3E8C: movs r1, 0x80 @@ -434110,13 +419746,13 @@ _080D3E8C: add r1, r8 lsrs r4, r1, 16 asrs r1, 16 - ldr r0, _080D3EF0 + ldr r0, =0x03001100 ldrb r0, [r0] cmp r1, r0 bge _080D3EA0 b _080D3D8E _080D3EA0: - ldr r1, _080D3EF0 + ldr r1, =0x03001100 ldrb r0, [r1] cmp r0, 0x5 bne _080D3EC8 @@ -434144,13 +419780,7 @@ _080D3EC8: pop {r0} bx r0 .align 2, 0 -_080D3ED8: .4byte 0x00000283 -_080D3EDC: .4byte 0x00000281 -_080D3EE0: .4byte 0x00000279 -_080D3EE4: .4byte 0x00000282 -_080D3EE8: .4byte 0x0000027a -_080D3EEC: .4byte 0x0000027b -_080D3EF0: .4byte 0x03001100 + .pool thumb_func_end sub_80D3D5C thumb_func_start sub_80D3EF4 @@ -434172,7 +419802,7 @@ sub_80D3EF4: @ 80D3EF4 cmp r0, 0 bne _080D3F2C mov r2, sp - ldr r1, _080D3F28 + ldr r1, =0x03001108 ldrb r0, [r1, 0x5] strb r0, [r2] ldrb r0, [r1, 0xA] @@ -434182,14 +419812,14 @@ sub_80D3EF4: @ 80D3EF4 mov r8, r5 b _080D3F4E .align 2, 0 -_080D3F28: .4byte 0x03001108 + .pool _080D3F2C: cmp r0, 0x1 beq _080D3F32 b _080D414A _080D3F32: mov r2, sp - ldr r1, _080D4008 + ldr r1, =0x03001108 ldrb r0, [r1, 0x9] strb r0, [r2] ldrb r0, [r1, 0xE] @@ -434229,10 +419859,10 @@ _080D3F7E: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at - ldr r1, _080D400C + ldr r1, =0x00000281 cmp r0, r1 bne _080D3F96 - ldr r2, _080D4010 + ldr r2, =0x00000279 adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 @@ -434240,10 +419870,10 @@ _080D3F96: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at - ldr r1, _080D4014 + ldr r1, =0x00000282 cmp r0, r1 bne _080D3FAE - ldr r2, _080D4018 + ldr r2, =0x0000027a adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 @@ -434251,10 +419881,10 @@ _080D3FAE: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at - ldr r1, _080D401C + ldr r1, =0x00000283 cmp r0, r1 bne _080D3FC6 - ldr r2, _080D4020 + ldr r2, =0x0000027b adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 @@ -434290,13 +419920,7 @@ _080D3FC6: beq _080D402E b _080D4056 .align 2, 0 -_080D4008: .4byte 0x03001108 -_080D400C: .4byte 0x00000281 -_080D4010: .4byte 0x00000279 -_080D4014: .4byte 0x00000282 -_080D4018: .4byte 0x0000027a -_080D401C: .4byte 0x00000283 -_080D4020: .4byte 0x0000027b + .pool _080D4024: cmp r0, 0x3 beq _080D403C @@ -434308,21 +419932,21 @@ _080D402E: lsls r2, 2 b _080D403E _080D4034: - ldr r2, _080D4038 + ldr r2, =0x00000281 b _080D403E .align 2, 0 -_080D4038: .4byte 0x00000281 + .pool _080D403C: - ldr r2, _080D4048 + ldr r2, =0x00000282 _080D403E: adds r0, r6, 0 adds r1, r4, 0 bl setmaptile_0 b _080D4056 .align 2, 0 -_080D4048: .4byte 0x00000282 + .pool _080D404C: - ldr r2, _080D4100 + ldr r2, =0x00000283 adds r0, r6, 0 adds r1, r4, 0 bl setmaptile_0 @@ -434346,10 +419970,10 @@ _080D4078: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at - ldr r1, _080D4104 + ldr r1, =0x00000281 cmp r0, r1 bne _080D4090 - ldr r2, _080D4108 + ldr r2, =0x00000279 adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 @@ -434357,10 +419981,10 @@ _080D4090: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at - ldr r1, _080D410C + ldr r1, =0x00000282 cmp r0, r1 bne _080D40A8 - ldr r2, _080D4110 + ldr r2, =0x0000027a adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 @@ -434368,10 +419992,10 @@ _080D40A8: adds r0, r5, 0 adds r1, r4, 0 bl cur_mapdata_get_blockid_at - ldr r1, _080D4100 + ldr r1, =0x00000283 cmp r0, r1 bne _080D40C0 - ldr r2, _080D4114 + ldr r2, =0x0000027b adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 @@ -434406,12 +420030,7 @@ _080D40C0: beq _080D4122 b _080D414A .align 2, 0 -_080D4100: .4byte 0x00000283 -_080D4104: .4byte 0x00000281 -_080D4108: .4byte 0x00000279 -_080D410C: .4byte 0x00000282 -_080D4110: .4byte 0x0000027a -_080D4114: .4byte 0x0000027b + .pool _080D4118: cmp r0, 0x3 beq _080D4130 @@ -434423,21 +420042,21 @@ _080D4122: lsls r2, 2 b _080D4132 _080D4128: - ldr r2, _080D412C + ldr r2, =0x00000281 b _080D4132 .align 2, 0 -_080D412C: .4byte 0x00000281 + .pool _080D4130: - ldr r2, _080D413C + ldr r2, =0x00000282 _080D4132: adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 b _080D414A .align 2, 0 -_080D413C: .4byte 0x00000282 + .pool _080D4140: - ldr r2, _080D415C + ldr r2, =0x00000283 adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 @@ -434451,7 +420070,7 @@ _080D414A: pop {r0} bx r0 .align 2, 0 -_080D415C: .4byte 0x00000283 + .pool thumb_func_end sub_80D3EF4 thumb_func_start objc_8097BA8 @@ -434461,11 +420080,11 @@ objc_8097BA8: @ 80D4160 strh r1, [r0, 0x2E] strh r2, [r0, 0x30] strh r2, [r0, 0x34] - ldr r1, _080D4170 + ldr r1, =objc_8097BBC + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_080D4170: .4byte objc_8097BBC + 1 + .pool thumb_func_end objc_8097BA8 thumb_func_start objc_8097BBC @@ -434507,14 +420126,14 @@ objc_8097BBC: @ 80D4174 strh r0, [r4, 0x30] b _080D41C4 _080D41C0: - ldr r0, _080D41CC + ldr r0, =sub_80D41D0 + 1 str r0, [r4, 0x1C] _080D41C4: pop {r4} pop {r0} bx r0 .align 2, 0 -_080D41CC: .4byte sub_80D41D0 + 1 + .pool thumb_func_end objc_8097BBC thumb_func_start sub_80D41D0 @@ -434522,14 +420141,14 @@ sub_80D41D0: @ 80D41D0 push {r4-r6,lr} movs r4, 0x1 _080D41D4: - ldr r6, _080D4230 + ldr r6, =0x02039dd0 ldr r0, [r6] adds r0, r4 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _080D4234 + ldr r5, =0x02020630 adds r0, r5 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -434556,16 +420175,14 @@ _080D41D4: lsrs r0, 24 cmp r0, 0x1 bne _080D422A - ldr r0, _080D4238 + ldr r0, =0x08267edb bl script_env_1_execute_new_script _080D422A: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080D4230: .4byte 0x02039dd0 -_080D4234: .4byte 0x02020630 -_080D4238: .4byte 0x08267edb + .pool thumb_func_end sub_80D41D0 thumb_func_start sub_80D423C @@ -434609,21 +420226,21 @@ _080D4284: lsls r2, 2 b _080D4296 _080D428A: - ldr r2, _080D4290 + ldr r2, =0x00000281 b _080D4296 .align 2, 0 -_080D4290: .4byte 0x00000281 + .pool _080D4294: - ldr r2, _080D42A0 + ldr r2, =0x00000282 _080D4296: adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 b _080D42AE .align 2, 0 -_080D42A0: .4byte 0x00000282 + .pool _080D42A4: - ldr r2, _080D42B4 + ldr r2, =0x00000283 adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 @@ -434632,7 +420249,7 @@ _080D42AE: pop {r0} bx r0 .align 2, 0 -_080D42B4: .4byte 0x00000283 + .pool thumb_func_end sub_80D423C thumb_func_start task00_bag_acit_10 @@ -434661,7 +420278,7 @@ task00_bag_acit_10: @ 80D42B8 adds r1, r5, 0 bl cur_mapdata_get_blockid_at adds r1, r0, 0 - ldr r0, _080D4304 + ldr r0, =0x00000281 cmp r1, r0 beq _080D4328 cmp r1, r0 @@ -434671,9 +420288,9 @@ task00_bag_acit_10: @ 80D42B8 beq _080D431C b _080D434A .align 2, 0 -_080D4304: .4byte 0x00000281 + .pool _080D4308: - ldr r0, _080D4318 + ldr r0, =0x00000282 cmp r1, r0 beq _080D4330 adds r0, 0x1 @@ -434681,7 +420298,7 @@ _080D4308: beq _080D4340 b _080D434A .align 2, 0 -_080D4318: .4byte 0x00000282 + .pool _080D431C: adds r0, r4, 0 adds r1, r5, 0 @@ -434689,21 +420306,21 @@ _080D431C: bl setmaptile_0 b _080D434A _080D4328: - ldr r2, _080D432C + ldr r2, =0x00000279 b _080D4332 .align 2, 0 -_080D432C: .4byte 0x00000279 + .pool _080D4330: - ldr r2, _080D433C + ldr r2, =0x0000027a _080D4332: adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 b _080D434A .align 2, 0 -_080D433C: .4byte 0x0000027a + .pool _080D4340: - ldr r2, _080D4350 + ldr r2, =0x0000027b adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 @@ -434712,7 +420329,7 @@ _080D434A: pop {r0} bx r0 .align 2, 0 -_080D4350: .4byte 0x0000027b + .pool thumb_func_end task00_bag_acit_10 thumb_func_start sub_80D4354 @@ -434731,12 +420348,12 @@ sub_80D4354: @ 80D4354 sub_80D436C: @ 80D436C push {r4,r5,lr} movs r4, 0 - ldr r5, _080D4394 + ldr r5, =0x03005d8c _080D4372: lsls r1, r4, 3 adds r1, r4 lsls r1, 2 - ldr r0, _080D4398 + ldr r0, =0x00002be0 adds r1, r0 ldr r0, [r5] adds r0, r1 @@ -434750,15 +420367,14 @@ _080D4372: pop {r0} bx r0 .align 2, 0 -_080D4394: .4byte 0x03005d8c -_080D4398: .4byte 0x00002be0 + .pool thumb_func_end sub_80D436C thumb_func_start sub_80D439C sub_80D439C: @ 80D439C push {r4-r6,lr} adds r3, r0, 0 - ldr r0, _080D43EC + ldr r0, =0x0000ffff adds r4, r0, 0 adds r1, r3, 0 movs r2, 0x8 @@ -434800,7 +420416,7 @@ _080D43D6: pop {r0} bx r0 .align 2, 0 -_080D43EC: .4byte 0x0000ffff + .pool thumb_func_end sub_80D439C thumb_func_start sub_80D43F0 @@ -434850,7 +420466,7 @@ sub_80D4420: @ 80D4420 strb r1, [r0, 0x1] add r3, sp, 0x4 strb r2, [r3] - ldr r4, _080D458C + ldr r4, =0x03005d8c mov r10, r4 mov r9, r3 adds r4, r3, 0 @@ -434871,11 +420487,11 @@ _080D444C: b _080D45A8 _080D4468: movs r4, 0 - ldr r2, _080D4590 + ldr r2, =0x03005d90 mov r12, r2 - ldr r7, _080D458C + ldr r7, =0x03005d8c add r5, sp, 0x4 - ldr r3, _080D4594 + ldr r3, =0x0000ffff adds r6, r3, 0 _080D4476: ldr r2, [r7] @@ -434885,7 +420501,7 @@ _080D4476: adds r0, r1 lsls r0, 2 adds r3, r0 - ldr r0, _080D4598 + ldr r0, =0x00002be0 adds r2, r0 adds r2, r3 ldrh r0, [r2] @@ -434897,7 +420513,7 @@ _080D4476: cmp r4, 0x8 bls _080D4476 movs r4, 0 - ldr r5, _080D458C + ldr r5, =0x03005d8c add r3, sp, 0x4 _080D44A0: ldr r2, [r5] @@ -434906,7 +420522,7 @@ _080D44A0: adds r0, r1 lsls r0, 2 adds r0, r4, r0 - ldr r1, _080D459C + ldr r1, =0x00002bf2 adds r2, r1 adds r2, r0 mov r1, r12 @@ -434927,7 +420543,7 @@ _080D44A0: adds r0, r1 lsls r0, 2 adds r0, r4, r0 - ldr r1, _080D459C + ldr r1, =0x00002bf2 adds r2, r1 adds r2, r0 movs r0, 0xFF @@ -434939,14 +420555,14 @@ _080D44A0: lsls r0, 2 ldr r1, [r3] adds r0, r1 - ldr r3, _080D459C + ldr r3, =0x00002bf2 adds r0, r3 movs r1, 0 bl sub_81DB4DC movs r4, 0 - ldr r6, _080D458C + ldr r6, =0x03005d8c add r3, sp, 0x4 - ldr r5, _080D4590 + ldr r5, =0x03005d90 _080D4500: ldr r2, [r6] ldrb r1, [r3] @@ -434954,7 +420570,7 @@ _080D4500: adds r0, r1 lsls r0, 2 adds r0, r4, r0 - ldr r1, _080D45A0 + ldr r1, =0x00002bfa adds r2, r1 adds r2, r0 ldr r0, [r5] @@ -434987,7 +420603,7 @@ _080D4500: adds r1, r2 lsls r1, 2 adds r1, r3, r1 - ldr r2, _080D45A4 + ldr r2, =0x00002bfe adds r1, r2 strh r0, [r1] ldrb r1, [r4] @@ -435013,13 +420629,7 @@ _080D4500: ldrb r0, [r1] b _080D45B6 .align 2, 0 -_080D458C: .4byte 0x03005d8c -_080D4590: .4byte 0x03005d90 -_080D4594: .4byte 0x0000ffff -_080D4598: .4byte 0x00002be0 -_080D459C: .4byte 0x00002bf2 -_080D45A0: .4byte 0x00002bfa -_080D45A4: .4byte 0x00002bfe + .pool _080D45A8: adds r0, r2, 0x1 strb r0, [r3] @@ -435050,14 +420660,14 @@ sub_80D45C8: @ 80D45C8 adds r0, r1, 0 bl sub_80D2E48 lsls r0, 16 - ldr r1, _080D45E4 + ldr r1, =0x75300000 adds r0, r1 lsrs r0, 16 _080D45E0: pop {r1} bx r1 .align 2, 0 -_080D45E4: .4byte 0x75300000 + .pool thumb_func_end sub_80D45C8 thumb_func_start sub_80D45E8 @@ -435065,7 +420675,7 @@ sub_80D45E8: @ 80D45E8 push {lr} lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _080D4600 + ldr r0, =0xffff8ad0 adds r2, r3, r0 lsls r0, r2, 16 lsrs r0, 16 @@ -435075,7 +420685,7 @@ sub_80D45E8: @ 80D45E8 strh r2, [r1] b _080D4606 .align 2, 0 -_080D4600: .4byte 0xffff8ad0 + .pool _080D4604: adds r0, r3, 0 _080D4606: @@ -435097,13 +420707,13 @@ sub_80D460C: @ 80D460C ldrb r2, [r4] cmp r2, 0xFF beq _080D4670 - ldr r0, _080D4668 + ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r2, 3 adds r0, r2 lsls r0, 2 adds r1, r0 - ldr r0, _080D466C + ldr r0, =0x00002be0 adds r1, r0 adds r0, r7, 0 ldm r0!, {r2,r3,r7} @@ -435128,8 +420738,7 @@ sub_80D460C: @ 80D460C ldrb r0, [r4] b _080D4672 .align 2, 0 -_080D4668: .4byte 0x03005d8c -_080D466C: .4byte 0x00002be0 + .pool _080D4670: movs r0, 0xFF _080D4672: @@ -435159,7 +420768,7 @@ sub_80D4680: @ 80D4680 bl pokemon_getattr add r2, sp, 0x4 strb r0, [r2] - ldr r0, _080D46DC + ldr r0, =0x03005d8c ldr r3, [r0] ldrb r1, [r2] lsls r0, r1, 3 @@ -435190,14 +420799,14 @@ _080D46D2: pop {r0} bx r0 .align 2, 0 -_080D46DC: .4byte 0x03005d8c + .pool thumb_func_end sub_80D4680 thumb_func_start sub_80D46E0 sub_80D46E0: @ 80D46E0 lsls r0, 24 lsrs r0, 24 - ldr r1, _080D46FC + ldr r1, =0x03005d8c ldr r2, [r1] lsls r1, r0, 3 adds r1, r0 @@ -435210,7 +420819,7 @@ sub_80D46E0: @ 80D46E0 strh r0, [r2] bx lr .align 2, 0 -_080D46FC: .4byte 0x03005d8c + .pool thumb_func_end sub_80D46E0 thumb_func_start sub_80D4700 @@ -435230,9 +420839,9 @@ sub_80D4700: @ 80D4700 strb r0, [r1] movs r7, 0x6 mov r9, r1 - ldr r0, _080D4798 + ldr r0, =0x03005d8c mov r8, r0 - ldr r3, _080D479C + ldr r3, =0x00002be0 _080D4724: mov r1, r8 ldr r0, [r1] @@ -435289,8 +420898,7 @@ _080D4724: adds r0, r7, 0 b _080D47AC .align 2, 0 -_080D4798: .4byte 0x03005d8c -_080D479C: .4byte 0x00002be0 + .pool _080D47A0: adds r0, r7, 0x1 lsls r0, 24 @@ -435346,7 +420954,7 @@ sub_80D47E4: @ 80D47E4 lsrs r0, 24 cmp r0, 0x1 beq _080D486C - ldr r4, _080D4838 + ldr r4, =sub_80D487C + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -435355,12 +420963,12 @@ sub_80D47E4: @ 80D47E4 adds r0, r4, 0 movs r1, 0x5A bl AddTask - ldr r4, _080D483C + ldr r4, =0x02039dd4 strb r0, [r4] movs r0, 0x12 movs r1, 0x28 bl lcd_io_set - ldr r2, _080D4840 + ldr r2, =0x03005e00 ldrb r1, [r4] lsls r0, r1, 2 adds r0, r1 @@ -435377,12 +420985,10 @@ sub_80D47E4: @ 80D47E4 strh r1, [r0, 0xC] b _080D486C .align 2, 0 -_080D4838: .4byte sub_80D487C + 1 -_080D483C: .4byte 0x02039dd4 -_080D4840: .4byte 0x03005e00 + .pool _080D4844: - ldr r3, _080D4874 - ldr r2, _080D4878 + ldr r3, =0x03005e00 + ldr r2, =0x02039dd4 ldrb r0, [r2] lsls r1, r0, 2 adds r1, r0 @@ -435407,8 +421013,7 @@ _080D486C: pop {r0} bx r0 .align 2, 0 -_080D4874: .4byte 0x03005e00 -_080D4878: .4byte 0x02039dd4 + .pool thumb_func_end sub_80D47E4 thumb_func_start sub_80D487C @@ -435419,7 +421024,7 @@ sub_80D487C: @ 80D487C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080D48A0 + ldr r0, =0x03005e00 adds r4, r1, r0 movs r2, 0x8 ldrsh r1, [r4, r2] @@ -435427,13 +421032,12 @@ sub_80D487C: @ 80D487C cmp r1, 0x6 bhi _080D4966 lsls r0, r1, 2 - ldr r1, _080D48A4 + ldr r1, =_080D48A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D48A0: .4byte 0x03005e00 -_080D48A4: .4byte _080D48A8 + .pool .align 2, 0 _080D48A8: .4byte _080D48DE @@ -435467,7 +421071,7 @@ _080D48DE: strh r2, [r4, 0xC] movs r0, 0x1 strh r0, [r4, 0x8] - ldr r0, _080D4904 + ldr r0, =0x02039dd4 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -435476,7 +421080,7 @@ _080D48DE: strh r2, [r0, 0xA] b _080D4966 .align 2, 0 -_080D4904: .4byte 0x02039dd4 + .pool _080D4908: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -435539,7 +421143,7 @@ _080D496E: thumb_func_start call_203AE8C call_203AE8C: @ 80D4974 push {lr} - ldr r0, _080D49A8 + ldr r0, =sub_80D487C + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -435553,15 +421157,14 @@ call_203AE8C: @ 80D4974 movs r0, 0x12 movs r1, 0 bl lcd_io_set_forced_blank - ldr r0, _080D49AC + ldr r0, =0x02039dd4 ldrb r0, [r0] bl remove_task _080D49A4: pop {r0} bx r0 .align 2, 0 -_080D49A8: .4byte sub_80D487C + 1 -_080D49AC: .4byte 0x02039dd4 + .pool thumb_func_end call_203AE8C thumb_func_start sub_80D49B0 @@ -435572,7 +421175,7 @@ sub_80D49B0: @ 80D49B0 lsls r0, 24 cmp r0, 0 beq _080D4A08 - ldr r0, _080D49D4 + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] movs r0, 0xBD lsls r0, 1 @@ -435580,19 +421183,18 @@ sub_80D49B0: @ 80D49B0 bne _080D49DC mov r4, sp adds r4, 0xF - ldr r0, _080D49D8 + ldr r0, =0x0857f544 ldr r1, [r0, 0x1C] b _080D49F2 .align 2, 0 -_080D49D4: .4byte 0x02037318 -_080D49D8: .4byte 0x0857f544 + .pool _080D49DC: mov r4, sp adds r4, 0xF - ldr r1, _080D49FC - ldr r0, _080D4A00 + ldr r1, =0x0857f544 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _080D4A04 + ldr r2, =0x00000cb2 adds r0, r2 ldrh r0, [r0] lsls r0, 2 @@ -435603,13 +421205,11 @@ _080D49F2: bl gf_strcpy b _080D4A18 .align 2, 0 -_080D49FC: .4byte 0x0857f544 -_080D4A00: .4byte 0x03005d90 -_080D4A04: .4byte 0x00000cb2 + .pool _080D4A08: mov r4, sp adds r4, 0xF - ldr r0, _080D4A74 + ldr r0, =0x02037318 ldrb r1, [r0, 0x14] adds r0, r4, 0 movs r2, 0 @@ -435654,7 +421254,7 @@ _080D4A18: pop {r0} bx r0 .align 2, 0 -_080D4A74: .4byte 0x02037318 + .pool thumb_func_end sub_80D49B0 thumb_func_start sub_80D4A78 @@ -435690,7 +421290,7 @@ sub_80D4A78: @ 80D4A78 str r0, [sp, 0x18] subs r4, r1, 0x1 _080D4AB4: - ldr r0, _080D4BC4 + ldr r0, =0x0000021d adds r1, r5, r0 lsls r1, 16 lsrs r1, 16 @@ -435710,7 +421310,7 @@ _080D4AB4: adds r5, 0x1 cmp r5, 0xB ble _080D4AB4 - ldr r1, _080D4BC8 + ldr r1, =0x00000229 movs r0, 0x1 negs r0, r0 add r0, r10 @@ -435726,7 +421326,7 @@ _080D4AB4: mov r2, r8 ldr r3, [sp, 0xC] bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _080D4BCC + ldr r1, =0x0000022a ldr r6, [sp, 0x10] add r6, r10 lsls r6, 24 @@ -435739,7 +421339,7 @@ _080D4AB4: adds r2, r6, 0 ldr r3, [sp, 0xC] bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _080D4BD0 + ldr r1, =0x0000022b ldr r4, [sp, 0xC] adds r4, 0x1 lsls r4, 24 @@ -435762,7 +421362,7 @@ _080D4AB4: adds r2, r6, 0 adds r3, r4, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _080D4BD4 + ldr r1, =0x0000022d ldr r4, [sp, 0xC] adds r4, 0x2 lsls r4, 24 @@ -435775,7 +421375,7 @@ _080D4AB4: mov r2, r8 adds r3, r4, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _080D4BD8 + ldr r1, =0x0000022e str r5, [sp] str r5, [sp, 0x4] mov r0, r9 @@ -435791,7 +421391,7 @@ _080D4AB4: lsls r4, r0, 24 movs r6, 0x1 _080D4B8A: - ldr r3, _080D4BDC + ldr r3, =0x0000022f adds r1, r5, r3 lsls r1, 16 lsrs r1, 16 @@ -435820,13 +421420,7 @@ _080D4B8A: pop {r0} bx r0 .align 2, 0 -_080D4BC4: .4byte 0x0000021d -_080D4BC8: .4byte 0x00000229 -_080D4BCC: .4byte 0x0000022a -_080D4BD0: .4byte 0x0000022b -_080D4BD4: .4byte 0x0000022d -_080D4BD8: .4byte 0x0000022e -_080D4BDC: .4byte 0x0000022f + .pool thumb_func_end sub_80D4A78 thumb_func_start sub_80D4BE0 @@ -435836,7 +421430,7 @@ sub_80D4BE0: @ 80D4BE0 bl rboxid_upload_textbox_1_no_pal lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080D4C04 + ldr r0, =0x02037318 ldrb r1, [r0, 0x14] cmp r1, 0x57 bls _080D4C0A @@ -435848,11 +421442,11 @@ sub_80D4BE0: @ 80D4BE0 lsrs r1, r0, 16 b _080D4C0A .align 2, 0 -_080D4C04: .4byte 0x02037318 + .pool _080D4C08: movs r1, 0 _080D4C0A: - ldr r0, _080D4C54 + ldr r0, =0x0857f464 adds r0, r1, r0 ldrb r4, [r0] adds r0, r5, 0 @@ -435863,36 +421457,31 @@ _080D4C0A: lsls r1, r4, 4 subs r1, r4 lsls r1, 6 - ldr r2, _080D4C58 + ldr r2, =0x0857dd04 adds r1, r2 movs r2, 0x80 lsls r2, 3 - ldr r3, _080D4C5C + ldr r3, =0x0000021d bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r1, _080D4C60 + ldr r1, =sub_80D4A78 + 1 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 bl Window_WriteStandardTileMap - ldr r0, _080D4C64 + ldr r0, =0x02037318 ldrb r0, [r0, 0x16] cmp r0, 0xE bne _080D4C6C - ldr r0, _080D4C68 + ldr r0, =0x0857f444 movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply b _080D4C7A .align 2, 0 -_080D4C54: .4byte 0x0857f464 -_080D4C58: .4byte 0x0857dd04 -_080D4C5C: .4byte 0x0000021d -_080D4C60: .4byte sub_80D4A78 + 1 -_080D4C64: .4byte 0x02037318 -_080D4C68: .4byte 0x0857f444 + .pool _080D4C6C: lsls r0, r4, 5 - ldr r1, _080D4CA0 + ldr r1, =0x0857f384 adds r0, r1 movs r1, 0xE0 movs r2, 0x20 @@ -435901,7 +421490,7 @@ _080D4C7A: lsls r1, r4, 4 subs r1, r4 lsls r1, 6 - ldr r0, _080D4CA4 + ldr r0, =0x0857c684 adds r1, r0 movs r0, 0x50 str r0, [sp] @@ -435916,8 +421505,7 @@ _080D4C7A: pop {r0} bx r0 .align 2, 0 -_080D4CA0: .4byte 0x0857f384 -_080D4CA4: .4byte 0x0857c684 + .pool thumb_func_end sub_80D4BE0 thumb_func_start sub_80D4CA8 @@ -435925,8 +421513,8 @@ sub_80D4CA8: @ 80D4CA8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080D4CF4 - ldr r2, _080D4CF8 + ldr r0, =0x0203ce54 + ldr r2, =0x00000804 adds r1, r4, r2 ldr r0, [r0] adds r5, r0, r1 @@ -435942,7 +421530,7 @@ sub_80D4CA8: @ 80D4CA8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080D4CFC + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r1, [r5] @@ -435958,9 +421546,7 @@ _080D4CEE: pop {r0} bx r0 .align 2, 0 -_080D4CF4: .4byte 0x0203ce54 -_080D4CF8: .4byte 0x00000804 -_080D4CFC: .4byte 0x02020630 + .pool thumb_func_end sub_80D4CA8 thumb_func_start sub_80D4D00 @@ -435969,11 +421555,11 @@ sub_80D4D00: @ 80D4D00 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _080D4D2C + ldr r0, =0x0203ce54 ldr r4, [r0] - ldr r0, _080D4D30 + ldr r0, =0x00000804 adds r4, r0 - ldr r0, _080D4D34 + ldr r0, =0x0857fb4c movs r1, 0x44 movs r2, 0x42 movs r3, 0 @@ -435986,9 +421572,7 @@ sub_80D4D00: @ 80D4D00 pop {r0} bx r0 .align 2, 0 -_080D4D2C: .4byte 0x0203ce54 -_080D4D30: .4byte 0x00000804 -_080D4D34: .4byte 0x0857fb4c + .pool thumb_func_end sub_80D4D00 thumb_func_start sub_80D4D38 @@ -435997,21 +421581,21 @@ sub_80D4D38: @ 80D4D38 lsls r0, 24 lsrs r3, r0, 24 lsls r1, 24 - ldr r0, _080D4D70 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r2, _080D4D74 + ldr r2, =0x00000804 adds r0, r2 ldrb r2, [r0] lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, _080D4D78 + ldr r2, =0x02020630 adds r2, r0, r2 cmp r1, 0 beq _080D4D84 - ldr r0, _080D4D7C + ldr r0, =0x0000fffb strh r0, [r2, 0x26] - ldr r0, _080D4D80 + ldr r0, =sub_80D4D94 + 1 str r0, [r2, 0x1C] adds r0, r3, 0x1 strh r0, [r2, 0x2E] @@ -436020,11 +421604,7 @@ sub_80D4D38: @ 80D4D38 bl obj_anim_image_start b _080D4D90 .align 2, 0 -_080D4D70: .4byte 0x0203ce54 -_080D4D74: .4byte 0x00000804 -_080D4D78: .4byte 0x02020630 -_080D4D7C: .4byte 0x0000fffb -_080D4D80: .4byte sub_80D4D94 + 1 + .pool _080D4D84: adds r1, r3, 0x1 lsls r1, 24 @@ -436054,28 +421634,28 @@ _080D4DA8: lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start - ldr r0, _080D4DC0 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _080D4DB8: pop {r4} pop {r0} bx r0 .align 2, 0 -_080D4DC0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80D4D94 thumb_func_start sub_80D4DC4 sub_80D4DC4: @ 80D4DC4 push {r4,lr} - ldr r0, _080D4DFC + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _080D4E00 + ldr r1, =0x00000804 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080D4E04 + ldr r1, =0x02020630 adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x3F @@ -436087,17 +421667,14 @@ sub_80D4DC4: @ 80D4DC4 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r0, _080D4E08 + ldr r0, =sub_80D4E0C + 1 str r0, [r4, 0x1C] _080D4DF4: pop {r4} pop {r0} bx r0 .align 2, 0 -_080D4DFC: .4byte 0x0203ce54 -_080D4E00: .4byte 0x00000804 -_080D4E04: .4byte 0x02020630 -_080D4E08: .4byte sub_80D4E0C + 1 + .pool thumb_func_end sub_80D4DC4 thumb_func_start sub_80D4E0C @@ -436113,14 +421690,14 @@ sub_80D4E0C: @ 80D4E0C adds r0, r4, 0 movs r1, 0 bl sub_8008258 - ldr r0, _080D4E30 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _080D4E28: pop {r4} pop {r0} bx r0 .align 2, 0 -_080D4E30: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80D4E0C thumb_func_start sub_80D4E34 @@ -436129,21 +421706,21 @@ sub_80D4E34: @ 80D4E34 adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 - ldr r0, _080D4E74 + ldr r0, =0x0203ce54 ldr r4, [r0] - ldr r0, _080D4E78 + ldr r0, =0x00000805 adds r4, r0 - ldr r0, _080D4E7C + ldr r0, =0x0857fba0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _080D4E80 + ldr r0, =0x0857fba8 bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _080D4E84 + ldr r0, =0x0857fbb0 movs r1, 0x10 movs r2, 0x10 movs r3, 0 bl obj_add_from_template_forward_search strb r0, [r4] - ldr r2, _080D4E88 + ldr r2, =0x02020630 ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -436154,12 +421731,7 @@ sub_80D4E34: @ 80D4E34 pop {r0} bx r0 .align 2, 0 -_080D4E74: .4byte 0x0203ce54 -_080D4E78: .4byte 0x00000805 -_080D4E7C: .4byte 0x0857fba0 -_080D4E80: .4byte 0x0857fba8 -_080D4E84: .4byte 0x0857fbb0 -_080D4E88: .4byte 0x02020630 + .pool thumb_func_end sub_80D4E34 thumb_func_start sub_80D4E8C @@ -436200,12 +421772,12 @@ sub_80D4EB0: @ 80D4EB0 negs r0, r0 cmp r1, r0 bne _080D4ED8 - ldr r0, _080D4ED4 + ldr r0, =0x0857fb98 b _080D4EDA .align 2, 0 -_080D4ED4: .4byte 0x0857fb98 + .pool _080D4ED8: - ldr r0, _080D4F0C + ldr r0, =0x0857fb9c _080D4EDA: str r0, [r4, 0x10] adds r0, r4, 0 @@ -436224,14 +421796,13 @@ _080D4EDA: strh r0, [r4, 0x30] adds r0, r4, 0 bl sub_80D4E8C - ldr r0, _080D4F10 + ldr r0, =sub_80D4F14 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_080D4F0C: .4byte 0x0857fb9c -_080D4F10: .4byte sub_80D4F14 + 1 + .pool thumb_func_end sub_80D4EB0 thumb_func_start sub_80D4F14 @@ -436262,8 +421833,8 @@ sub_80D4F38: @ 80D4F38 lsrs r6, r0, 16 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _080D4F8C - ldr r2, _080D4F90 + ldr r0, =0x0203ce54 + ldr r2, =0x00000806 adds r1, r4, r2 ldr r0, [r0] adds r5, r0, r1 @@ -436284,7 +421855,7 @@ sub_80D4F38: @ 80D4F38 cmp r2, 0x40 beq _080D4F86 strb r2, [r5] - ldr r1, _080D4F94 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -436298,9 +421869,7 @@ _080D4F86: pop {r0} bx r0 .align 2, 0 -_080D4F8C: .4byte 0x0203ce54 -_080D4F90: .4byte 0x00000806 -_080D4F94: .4byte 0x02020630 + .pool thumb_func_end sub_80D4F38 thumb_func_start sub_80D4F98 @@ -436319,17 +421888,16 @@ sub_80D4F98: @ 80D4F98 thumb_func_start sub_80D4FAC sub_80D4FAC: @ 80D4FAC push {lr} - ldr r0, _080D4FC0 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _080D4FC4 + ldr r1, =0x00000808 adds r0, r1 movs r1, 0x8 bl sub_8122344 pop {r0} bx r0 .align 2, 0 -_080D4FC0: .4byte 0x0203ce54 -_080D4FC4: .4byte 0x00000808 + .pool thumb_func_end sub_80D4FAC thumb_func_start sub_80D4FC8 @@ -436338,17 +421906,16 @@ sub_80D4FC8: @ 80D4FC8 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _080D4FE4 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _080D4FE8 + ldr r1, =0x00000808 adds r0, r1 movs r1, 0x8 bl sub_81223FC pop {r0} bx r0 .align 2, 0 -_080D4FE4: .4byte 0x0203ce54 -_080D4FE8: .4byte 0x00000808 + .pool thumb_func_end sub_80D4FC8 thumb_func_start sub_80D4FEC @@ -436356,9 +421923,9 @@ sub_80D4FEC: @ 80D4FEC push {lr} adds r3, r0, 0 lsls r3, 24 - ldr r0, _080D5010 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _080D5014 + ldr r1, =0x00000808 adds r0, r1 lsrs r3, 4 movs r1, 0x80 @@ -436371,8 +421938,7 @@ sub_80D4FEC: @ 80D4FEC pop {r0} bx r0 .align 2, 0 -_080D5010: .4byte 0x0203ce54 -_080D5014: .4byte 0x00000808 + .pool thumb_func_end sub_80D4FEC thumb_func_start sub_80D5018 @@ -436435,26 +422001,26 @@ sub_80D5070: @ 80D5070 bne _080D5082 bl sub_80E162C _080D5082: - ldr r5, _080D50C0 + ldr r5, =0x0857fc94 lsls r4, 3 adds r0, r5, 0x4 adds r0, r4, r0 ldr r0, [r0] str r0, [sp] - ldr r1, _080D50C4 + ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 - ldr r1, _080D50C8 + ldr r1, =0x00007544 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp bl gpu_pal_obj_decompress_and_apply adds r4, r5 ldr r0, [r4] - ldr r4, _080D50CC + ldr r4, =0x0201d000 adds r1, r4, 0 bl call_LZZUnCompWram - ldr r0, _080D50D0 + ldr r0, =0xfffff000 adds r1, r4, r0 adds r0, r4, 0 bl sub_80D5018 @@ -436463,11 +422029,7 @@ _080D5082: pop {r0} bx r0 .align 2, 0 -_080D50C0: .4byte 0x0857fc94 -_080D50C4: .4byte 0xffff0000 -_080D50C8: .4byte 0x00007544 -_080D50CC: .4byte 0x0201d000 -_080D50D0: .4byte 0xfffff000 + .pool thumb_func_end sub_80D5070 thumb_func_start sub_80D50D4 @@ -436482,7 +422044,7 @@ sub_80D50D4: @ 80D50D4 lsls r5, 16 lsrs r5, 16 bl sub_80D5070 - ldr r0, _080D5108 + ldr r0, =0x0857fbec lsls r4, 16 asrs r4, 16 lsls r5, 16 @@ -436497,18 +422059,18 @@ sub_80D50D4: @ 80D50D4 pop {r1} bx r1 .align 2, 0 -_080D5108: .4byte 0x0857fbec + .pool thumb_func_end sub_80D50D4 thumb_func_start sub_80D510C sub_80D510C: @ 80D510C push {lr} - ldr r0, _080D5118 + ldr r0, =0x00007544 bl gpu_pal_free_tag pop {r0} bx r0 .align 2, 0 -_080D5118: .4byte 0x00007544 + .pool thumb_func_end sub_80D510C thumb_func_start sub_80D511C @@ -436530,11 +422092,11 @@ sub_80D511C: @ 80D511C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _080D5180 + ldr r0, =0x00007544 bl gpu_pal_free_tag adds r0, r4, 0 bl sub_80D5070 - ldr r0, _080D5184 + ldr r0, =0x0857fc7c adds r1, r5, 0 adds r2, r6, 0 movs r3, 0 @@ -436548,7 +422110,7 @@ sub_80D511C: @ 80D511C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080D5188 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 bl sub_8008258 @@ -436560,16 +422122,14 @@ _080D5172: pop {r1} bx r1 .align 2, 0 -_080D5180: .4byte 0x00007544 -_080D5184: .4byte 0x0857fc7c -_080D5188: .4byte 0x02020630 + .pool thumb_func_end sub_80D511C thumb_func_start sub_80D518C sub_80D518C: @ 80D518C push {lr} adds r1, r0, 0 - ldr r0, _080D51A8 + ldr r0, =0x0857fe10 lsls r1, 16 asrs r1, 16 movs r2, 0x74 @@ -436580,7 +422140,7 @@ sub_80D518C: @ 80D518C pop {r1} bx r1 .align 2, 0 -_080D51A8: .4byte 0x0857fe10 + .pool thumb_func_end sub_80D518C thumb_func_start sub_80D51AC @@ -436588,7 +422148,7 @@ sub_80D51AC: @ 80D51AC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080D51CC + ldr r4, =0x0203841e ldrb r0, [r4] bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -436599,9 +422159,9 @@ sub_80D51AC: @ 80D51AC bl move_anim_task_del b _080D520C .align 2, 0 -_080D51CC: .4byte 0x0203841e + .pool _080D51D0: - ldr r1, _080D5214 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -436610,7 +422170,7 @@ _080D51D0: strh r1, [r0, 0x24] ldrh r1, [r4, 0x4] strh r1, [r0, 0x26] - ldr r1, _080D5218 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -436626,7 +422186,7 @@ _080D51D0: strh r1, [r0, 0x10] ldrh r1, [r4, 0x4] strh r1, [r0, 0x12] - ldr r1, _080D521C + ldr r1, =sub_80D5220 + 1 str r1, [r0] adds r0, r5, 0 bl _call_via_r1 @@ -436635,9 +422195,7 @@ _080D520C: pop {r0} bx r0 .align 2, 0 -_080D5214: .4byte 0x02020630 -_080D5218: .4byte 0x03005e00 -_080D521C: .4byte sub_80D5220 + 1 + .pool thumb_func_end sub_80D51AC thumb_func_start sub_80D5220 @@ -436645,7 +422203,7 @@ sub_80D5220: @ 80D5220 push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080D525C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -436656,7 +422214,7 @@ sub_80D5220: @ 80D5220 adds r7, r1, 0 cmp r5, 0 bne _080D52C6 - ldr r2, _080D5260 + ldr r2, =0x02020630 movs r6, 0x8 ldrsh r1, [r3, r6] lsls r0, r1, 4 @@ -436672,8 +422230,7 @@ sub_80D5220: @ 80D5220 strh r0, [r1, 0x24] b _080D5266 .align 2, 0 -_080D525C: .4byte 0x03005e00 -_080D5260: .4byte 0x02020630 + .pool _080D5264: strh r5, [r1, 0x24] _080D5266: @@ -436741,7 +422298,7 @@ sub_80D52D0: @ 80D52D0 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _080D52F8 + ldr r2, =0x0203841e ldrh r0, [r2] movs r3, 0 ldrsh r1, [r2, r3] @@ -436756,7 +422313,7 @@ sub_80D52D0: @ 80D52D0 bne _080D5352 b _080D5356 .align 2, 0 -_080D52F8: .4byte 0x0203841e + .pool _080D52FC: cmp r1, 0x8 beq _080D5348 @@ -436795,14 +422352,14 @@ _080D5326: bne _080D533C movs r6, 0x1 _080D533C: - ldr r0, _080D5344 + ldr r0, =0x020241e4 adds r0, r4, r0 b _080D5350 .align 2, 0 -_080D5344: .4byte 0x020241e4 + .pool _080D5348: - ldr r1, _080D5360 - ldr r0, _080D5364 + ldr r1, =0x020241e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 _080D5350: @@ -436815,20 +422372,19 @@ _080D5356: bl move_anim_task_del b _080D53A6 .align 2, 0 -_080D5360: .4byte 0x020241e4 -_080D5364: .4byte 0x02038436 + .pool _080D5368: - ldr r1, _080D53AC + ldr r1, =0x02020630 lsls r0, r3, 4 adds r0, r3 lsls r0, 2 adds r0, r1 - ldr r2, _080D53B0 + ldr r2, =0x0203841e ldrh r1, [r2, 0x2] strh r1, [r0, 0x24] ldrh r1, [r2, 0x4] strh r1, [r0, 0x26] - ldr r1, _080D53B4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -436844,7 +422400,7 @@ _080D5368: strh r1, [r0, 0x10] ldrh r1, [r2, 0x4] strh r1, [r0, 0x12] - ldr r1, _080D53B8 + ldr r1, =sub_80D53BC + 1 str r1, [r0] adds r0, r5, 0 bl _call_via_r1 @@ -436853,10 +422409,7 @@ _080D53A6: pop {r0} bx r0 .align 2, 0 -_080D53AC: .4byte 0x02020630 -_080D53B0: .4byte 0x0203841e -_080D53B4: .4byte 0x03005e00 -_080D53B8: .4byte sub_80D53BC + 1 + .pool thumb_func_end sub_80D52D0 thumb_func_start sub_80D53BC @@ -436866,7 +422419,7 @@ sub_80D53BC: @ 80D53BC push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080D5400 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -436877,7 +422430,7 @@ sub_80D53BC: @ 80D53BC mov r12, r1 cmp r0, 0 bne _080D5474 - ldr r2, _080D5404 + ldr r2, =0x02020630 movs r7, 0x8 ldrsh r1, [r3, r7] lsls r0, r1, 4 @@ -436896,8 +422449,7 @@ sub_80D53BC: @ 80D53BC strh r0, [r4, 0x24] b _080D540A .align 2, 0 -_080D5400: .4byte 0x03005e00 -_080D5404: .4byte 0x02020630 + .pool _080D5408: strh r5, [r4, 0x24] _080D540A: @@ -436971,7 +422523,7 @@ sub_80D5484: @ 80D5484 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080D54A4 + ldr r4, =0x0203841e ldrb r0, [r4] bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -436982,9 +422534,9 @@ sub_80D5484: @ 80D5484 bl move_anim_task_del b _080D54F6 .align 2, 0 -_080D54A4: .4byte 0x0203841e + .pool _080D54A8: - ldr r0, _080D54FC + ldr r0, =0x02020630 lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -436998,7 +422550,7 @@ _080D54A8: ldrh r6, [r1, 0x26] adds r0, r6 strh r0, [r1, 0x26] - ldr r0, _080D5500 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -437018,7 +422570,7 @@ _080D54A8: ldrsh r0, [r4, r6] lsls r0, 1 strh r0, [r1, 0x14] - ldr r2, _080D5504 + ldr r2, =sub_80D5508 + 1 str r2, [r1] adds r0, r5, 0 bl _call_via_r2 @@ -437027,9 +422579,7 @@ _080D54F6: pop {r0} bx r0 .align 2, 0 -_080D54FC: .4byte 0x02020630 -_080D5500: .4byte 0x03005e00 -_080D5504: .4byte sub_80D5508 + 1 + .pool thumb_func_end sub_80D5484 thumb_func_start sub_80D5508 @@ -437037,7 +422587,7 @@ sub_80D5508: @ 80D5508 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080D5560 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -437055,7 +422605,7 @@ _080D5526: ands r0, r1 cmp r0, 0 beq _080D5568 - ldr r2, _080D5564 + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -437079,10 +422629,9 @@ _080D5526: adds r3, r2, 0 b _080D5592 .align 2, 0 -_080D5560: .4byte 0x03005e00 -_080D5564: .4byte 0x02020630 + .pool _080D5568: - ldr r3, _080D55F4 + ldr r3, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -437153,7 +422702,7 @@ _080D5592: strh r0, [r1, 0x26] b _080D5630 .align 2, 0 -_080D55F4: .4byte 0x02020630 + .pool _080D55F8: movs r6, 0x8 ldrsh r0, [r4, r6] @@ -437202,19 +422751,19 @@ sub_80D5644: @ 80D5644 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _080D5694 + ldr r5, =0x0203841e ldrb r0, [r5] bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r2, _080D5698 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r1, r2 ldrh r2, [r5, 0x2] strh r2, [r1, 0x24] - ldr r2, _080D569C + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -437228,7 +422777,7 @@ sub_80D5644: @ 80D5644 strh r0, [r1, 0xE] ldrh r0, [r5, 0x8] strh r0, [r1, 0x10] - ldr r2, _080D56A0 + ldr r2, =sub_80D56A4 + 1 str r2, [r1] adds r0, r4, 0 bl _call_via_r2 @@ -437236,10 +422785,7 @@ sub_80D5644: @ 80D5644 pop {r0} bx r0 .align 2, 0 -_080D5694: .4byte 0x0203841e -_080D5698: .4byte 0x02020630 -_080D569C: .4byte 0x03005e00 -_080D56A0: .4byte sub_80D56A4 + 1 + .pool thumb_func_end sub_80D5644 thumb_func_start sub_80D56A4 @@ -437247,7 +422793,7 @@ sub_80D56A4: @ 80D56A4 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _080D5730 + ldr r2, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -437262,7 +422808,7 @@ sub_80D56A4: @ 80D56A4 lsls r1, 16 asrs r1, 16 mov r12, r2 - ldr r7, _080D5734 + ldr r7, =0x02020630 cmp r0, r1 bne _080D56F6 movs r0, 0 @@ -437316,8 +422862,7 @@ _080D5728: pop {r0} bx r0 .align 2, 0 -_080D5730: .4byte 0x03005e00 -_080D5734: .4byte 0x02020630 + .pool thumb_func_end sub_80D56A4 thumb_func_start sub_80D5738 @@ -437328,7 +422873,7 @@ sub_80D5738: @ 80D5738 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0x1 - ldr r4, _080D57AC + ldr r4, =0x0203841e ldrb r0, [r4] bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -437344,10 +422889,10 @@ _080D575C: movs r2, 0x8 ldrsh r0, [r4, r2] adds r3, r4, 0 - ldr r2, _080D57B0 + ldr r2, =0x03005e00 mov r12, r2 lsls r4, r5, 2 - ldr r2, _080D57B4 + ldr r2, =sub_80D57B8 + 1 mov r8, r2 cmp r1, r0 bge _080D5782 @@ -437382,9 +422927,7 @@ _080D5782: pop {r0} bx r0 .align 2, 0 -_080D57AC: .4byte 0x0203841e -_080D57B0: .4byte 0x03005e00 -_080D57B4: .4byte sub_80D57B8 + 1 + .pool thumb_func_end sub_80D5738 thumb_func_start sub_80D57B8 @@ -437393,7 +422936,7 @@ sub_80D57B8: @ 80D57B8 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _080D5828 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -437404,7 +422947,7 @@ sub_80D57B8: @ 80D57B8 movs r2, 0xA ldrsh r1, [r5, r2] bl sine - ldr r2, _080D582C + ldr r2, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -437445,8 +422988,7 @@ _080D5822: pop {r0} bx r0 .align 2, 0 -_080D5828: .4byte 0x03005e00 -_080D582C: .4byte 0x02020630 + .pool thumb_func_end sub_80D57B8 thumb_func_start sub_80D5830 @@ -437454,13 +422996,13 @@ sub_80D5830: @ 80D5830 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080D5858 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _080D584C - ldr r1, _080D585C + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 strh r0, [r1, 0x2] @@ -437471,8 +423013,7 @@ _080D584C: pop {r0} bx r0 .align 2, 0 -_080D5858: .4byte 0x02038436 -_080D585C: .4byte 0x0203841e + .pool thumb_func_end sub_80D5830 thumb_func_start sub_80D5860 @@ -437485,21 +423026,20 @@ sub_80D5860: @ 80D5860 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _080D5888 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _080D5890 - ldr r1, _080D588C + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 b _080D5894 .align 2, 0 -_080D5888: .4byte 0x02038436 -_080D588C: .4byte 0x0203841e + .pool _080D5890: - ldr r1, _080D58C0 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] _080D5894: strh r0, [r4, 0x30] @@ -437507,27 +423047,23 @@ _080D5894: movs r0, 0 strh r2, [r4, 0x2E] strh r0, [r4, 0x32] - ldr r1, _080D58C4 - ldr r0, _080D58C8 + ldr r1, =0x020241e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] strh r0, [r4, 0x34] strh r2, [r4, 0x36] - ldr r1, _080D58CC + ldr r1, =sub_80D58D4 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _080D58D0 + ldr r0, =sub_80A6630 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_080D58C0: .4byte 0x0203841e -_080D58C4: .4byte 0x020241e4 -_080D58C8: .4byte 0x02038436 -_080D58CC: .4byte sub_80D58D4 + 1 -_080D58D0: .4byte sub_80A6630 + 1 + .pool thumb_func_end sub_80D5860 thumb_func_start sub_80D58D4 @@ -437538,15 +423074,14 @@ sub_80D58D4: @ 80D58D4 ldrh r1, [r0, 0x30] negs r1, r1 strh r1, [r0, 0x30] - ldr r1, _080D58F0 + ldr r1, =sub_80A6630 + 1 str r1, [r0, 0x1C] - ldr r1, _080D58F4 + ldr r1, =move_anim_8072740 + 1 bl oamt_set_x3A_32 pop {r0} bx r0 .align 2, 0 -_080D58F0: .4byte sub_80A6630 + 1 -_080D58F4: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_80D58D4 thumb_func_start sub_80D58F8 @@ -437559,7 +423094,7 @@ sub_80D58F8: @ 80D58F8 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r5, _080D5938 + ldr r5, =0x0203841e ldrb r0, [r5, 0x4] bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -437572,18 +423107,16 @@ sub_80D58F8: @ 80D58F8 strh r1, [r4, 0x32] strh r0, [r4, 0x34] strh r2, [r4, 0x36] - ldr r1, _080D593C + ldr r1, =sub_80D5944 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _080D5940 + ldr r0, =sub_80A6630 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080D5938: .4byte 0x0203841e -_080D593C: .4byte sub_80D5944 + 1 -_080D5940: .4byte sub_80A6630 + 1 + .pool thumb_func_end sub_80D58F8 thumb_func_start sub_80D5944 @@ -437594,15 +423127,14 @@ sub_80D5944: @ 80D5944 ldrh r1, [r0, 0x32] negs r1, r1 strh r1, [r0, 0x32] - ldr r1, _080D5960 + ldr r1, =sub_80A6630 + 1 str r1, [r0, 0x1C] - ldr r1, _080D5964 + ldr r1, =move_anim_8072740 + 1 bl oamt_set_x3A_32 pop {r0} bx r0 .align 2, 0 -_080D5960: .4byte sub_80A6630 + 1 -_080D5964: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_80D5944 thumb_func_start sub_80D5968 @@ -437610,30 +423142,28 @@ sub_80D5968: @ 80D5968 push {r4-r7,lr} sub sp, 0x4 adds r6, r0, 0 - ldr r0, _080D5980 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D598C - ldr r1, _080D5984 - ldr r0, _080D5988 + ldr r1, =0x020241e4 + ldr r0, =0x02038436 b _080D5990 .align 2, 0 -_080D5980: .4byte 0x0203841e -_080D5984: .4byte 0x020241e4 -_080D5988: .4byte 0x02038436 + .pool _080D598C: - ldr r1, _080D59F0 - ldr r0, _080D59F4 + ldr r1, =0x020241e4 + ldr r0, =0x02038437 _080D5990: ldrb r0, [r0] adds r0, r1 ldrb r7, [r0] - ldr r5, _080D59F8 + ldr r5, =0x0203841e ldrh r0, [r5, 0x4] movs r3, 0 strh r0, [r6, 0x2E] - ldr r0, _080D59FC + ldr r0, =0x02020630 lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -437673,29 +423203,25 @@ _080D5990: strh r3, [r6, 0x32] b _080D5A06 .align 2, 0 -_080D59F0: .4byte 0x020241e4 -_080D59F4: .4byte 0x02038437 -_080D59F8: .4byte 0x0203841e -_080D59FC: .4byte 0x02020630 + .pool _080D5A00: cmp r0, 0x2 bne _080D5A06 strh r3, [r6, 0x30] _080D5A06: - ldr r0, _080D5A1C + ldr r0, =0x0203841e ldrh r1, [r0, 0x2] lsls r0, r7, 8 orrs r0, r1 strh r0, [r6, 0x3C] - ldr r0, _080D5A20 + ldr r0, =sub_80D5A24 + 1 str r0, [r6, 0x1C] add sp, 0x4 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080D5A1C: .4byte 0x0203841e -_080D5A20: .4byte sub_80D5A24 + 1 + .pool thumb_func_end sub_80D5968 thumb_func_start sub_80D5A24 @@ -437711,7 +423237,7 @@ sub_80D5A24: @ 80D5A24 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080D5A60 + ldr r0, =0x02020630 adds r3, r1, r0 ldrh r0, [r2, 0x2E] movs r6, 0x2E @@ -437733,7 +423259,7 @@ _080D5A58: bl move_anim_8072740 b _080D5A8E .align 2, 0 -_080D5A60: .4byte 0x02020630 + .pool _080D5A64: subs r0, 0x1 strh r0, [r2, 0x2E] @@ -437766,21 +423292,20 @@ _080D5A8E: sub_80D5A94: @ 80D5A94 push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _080D5AA8 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D5AB0 - ldr r0, _080D5AAC + ldr r0, =0x02038436 b _080D5AB2 .align 2, 0 -_080D5AA8: .4byte 0x0203841e -_080D5AAC: .4byte 0x02038436 + .pool _080D5AB0: - ldr r0, _080D5B30 + ldr r0, =0x02038437 _080D5AB2: ldrb r2, [r0] - ldr r0, _080D5B34 + ldr r0, =0x020241e4 adds r0, r2, r0 ldrb r6, [r0] adds r0, r2, 0 @@ -437788,7 +423313,7 @@ _080D5AB2: lsls r0, 24 cmp r0, 0 beq _080D5ADC - ldr r1, _080D5B38 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 strh r0, [r1, 0x2] @@ -437800,11 +423325,11 @@ _080D5AB2: negs r0, r0 strh r0, [r1, 0x4] _080D5ADC: - ldr r2, _080D5B38 + ldr r2, =0x0203841e ldrh r0, [r2, 0x8] movs r4, 0 strh r0, [r5, 0x2E] - ldr r0, _080D5B3C + ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -437832,21 +423357,16 @@ _080D5ADC: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r1, _080D5B40 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _080D5B44 + ldr r0, =sub_80A6680 + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080D5B30: .4byte 0x02038437 -_080D5B34: .4byte 0x020241e4 -_080D5B38: .4byte 0x0203841e -_080D5B3C: .4byte 0x02020630 -_080D5B40: .4byte move_anim_8072740 + 1 -_080D5B44: .4byte sub_80A6680 + 1 + .pool thumb_func_end sub_80D5A94 thumb_func_start sub_80D5B48 @@ -437859,21 +423379,20 @@ sub_80D5B48: @ 80D5B48 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _080D5B68 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _080D5B70 - ldr r0, _080D5B6C + ldr r0, =0x02038436 b _080D5B72 .align 2, 0 -_080D5B68: .4byte 0x0203841e -_080D5B6C: .4byte 0x02038436 + .pool _080D5B70: - ldr r0, _080D5BF0 + ldr r0, =0x02038437 _080D5B72: ldrb r1, [r0] - ldr r0, _080D5BF4 + ldr r0, =0x020241e4 adds r0, r1, r0 ldrb r7, [r0] adds r0, r1, 0 @@ -437881,7 +423400,7 @@ _080D5B72: lsls r0, 24 cmp r0, 0 beq _080D5B9C - ldr r1, _080D5BF8 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 strh r0, [r1, 0x2] @@ -437893,10 +423412,10 @@ _080D5B72: negs r0, r0 strh r0, [r1, 0x4] _080D5B9C: - ldr r5, _080D5BF8 + ldr r5, =0x0203841e ldrh r0, [r5, 0x8] strh r0, [r6, 0x2E] - ldr r0, _080D5BFC + ldr r0, =0x02020630 lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -437929,35 +423448,30 @@ _080D5B9C: lsls r0, 16 cmp r0, 0 bne _080D5C04 - ldr r1, _080D5C00 + ldr r1, =move_anim_8072740 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 b _080D5C0C .align 2, 0 -_080D5BF0: .4byte 0x02038437 -_080D5BF4: .4byte 0x020241e4 -_080D5BF8: .4byte 0x0203841e -_080D5BFC: .4byte 0x02020630 -_080D5C00: .4byte move_anim_8072740 + 1 + .pool _080D5C04: - ldr r1, _080D5C18 + ldr r1, =sub_80D5C20 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 _080D5C0C: - ldr r0, _080D5C1C + ldr r0, =sub_80A6680 + 1 str r0, [r6, 0x1C] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080D5C18: .4byte sub_80D5C20 + 1 -_080D5C1C: .4byte sub_80A6680 + 1 + .pool thumb_func_end sub_80D5B48 thumb_func_start sub_80D5C20 sub_80D5C20: @ 80D5C20 push {r4,lr} - ldr r4, _080D5C4C + ldr r4, =0x02020630 movs r1, 0x38 ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -437978,7 +423492,7 @@ sub_80D5C20: @ 80D5C20 pop {r0} bx r0 .align 2, 0 -_080D5C4C: .4byte 0x02020630 + .pool thumb_func_end sub_80D5C20 thumb_func_start sub_80D5C50 @@ -437986,7 +423500,7 @@ sub_80D5C50: @ 80D5C50 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _080D5CD4 + ldr r5, =0x0203841e movs r0, 0x6 ldrsh r1, [r5, r0] movs r0, 0x80 @@ -437994,7 +423508,7 @@ sub_80D5C50: @ 80D5C50 bl __divsi3 lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _080D5CD8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -438009,7 +423523,7 @@ sub_80D5C50: @ 80D5C50 _080D5C82: ldrb r0, [r5] bl obj_id_for_side_relative_to_move - ldr r1, _080D5CDC + ldr r1, =0x03005e00 lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -438040,16 +423554,13 @@ _080D5C82: ldrh r0, [r5, 0xC] strh r0, [r4, 0x14] strh r7, [r4, 0x16] - ldr r0, _080D5CE0 + ldr r0, =sub_80D5CE4 + 1 str r0, [r4] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080D5CD4: .4byte 0x0203841e -_080D5CD8: .4byte 0x02038436 -_080D5CDC: .4byte 0x03005e00 -_080D5CE0: .4byte sub_80D5CE4 + 1 + .pool thumb_func_end sub_80D5C50 thumb_func_start sub_80D5CE4 @@ -438057,7 +423568,7 @@ sub_80D5CE4: @ 80D5CE4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080D5D3C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -438067,7 +423578,7 @@ sub_80D5CE4: @ 80D5CE4 ldrh r2, [r5, 0x1E] adds r0, r2 strh r0, [r5, 0x1E] - ldr r2, _080D5D40 + ldr r2, =0x02020630 lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -438091,16 +423602,14 @@ sub_80D5CE4: @ 80D5CE4 lsls r0, 16 cmp r0, 0 bne _080D5D34 - ldr r0, _080D5D44 + ldr r0, =sub_80D5D48 + 1 str r0, [r5] _080D5D34: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080D5D3C: .4byte 0x03005e00 -_080D5D40: .4byte 0x02020630 -_080D5D44: .4byte sub_80D5D48 + 1 + .pool thumb_func_end sub_80D5CE4 thumb_func_start sub_80D5D48 @@ -438109,7 +423618,7 @@ sub_80D5D48: @ 80D5D48 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080D5D6C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -438123,14 +423632,14 @@ sub_80D5D48: @ 80D5D48 strh r0, [r4, 0x10] b _080D5DA4 .align 2, 0 -_080D5D6C: .4byte 0x03005e00 + .pool _080D5D70: ldrb r0, [r4, 0x8] ldrh r2, [r4, 0x12] ldrh r1, [r4, 0x20] adds r2, r1 strh r2, [r4, 0x20] - ldr r3, _080D5DAC + ldr r3, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -438155,7 +423664,7 @@ _080D5DA4: pop {r0} bx r0 .align 2, 0 -_080D5DAC: .4byte 0x02020630 + .pool thumb_func_end sub_80D5D48 thumb_func_start sub_80D5DB0 @@ -438163,7 +423672,7 @@ sub_80D5DB0: @ 80D5DB0 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080D5DD4 + ldr r1, =0x0203841e movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0x2 @@ -438178,18 +423687,18 @@ sub_80D5DB0: @ 80D5DB0 lsrs r2, r0, 24 b _080D5E18 .align 2, 0 -_080D5DD4: .4byte 0x0203841e + .pool _080D5DD8: cmp r0, 0x3 beq _080D5DE8 b _080D5E10 _080D5DDE: - ldr r5, _080D5DE4 + ldr r5, =0x02038436 b _080D5DEA .align 2, 0 -_080D5DE4: .4byte 0x02038436 + .pool _080D5DE8: - ldr r5, _080D5E08 + ldr r5, =0x02038437 _080D5DEA: ldrb r0, [r5] movs r4, 0x2 @@ -438198,59 +423707,54 @@ _080D5DEA: lsls r0, 24 cmp r0, 0 beq _080D5E10 - ldr r1, _080D5E0C + ldr r1, =0x020241e4 ldrb r0, [r5] eors r0, r4 adds r0, r1 ldrb r2, [r0] b _080D5E18 .align 2, 0 -_080D5E08: .4byte 0x02038437 -_080D5E0C: .4byte 0x020241e4 + .pool _080D5E10: adds r0, r6, 0 bl move_anim_task_del b _080D5E58 _080D5E18: - ldr r1, _080D5E38 + ldr r1, =0x03005e00 lsls r4, r6, 2 adds r0, r4, r6 lsls r0, 3 adds r5, r0, r1 strh r2, [r5, 0x8] - ldr r0, _080D5E3C + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _080D5E44 - ldr r0, _080D5E40 + ldr r0, =0x0203841e ldrh r0, [r0, 0x2] b _080D5E4A .align 2, 0 -_080D5E38: .4byte 0x03005e00 -_080D5E3C: .4byte 0x02038437 -_080D5E40: .4byte 0x0203841e + .pool _080D5E44: - ldr r0, _080D5E60 + ldr r0, =0x0203841e ldrh r0, [r0, 0x2] negs r0, r0 _080D5E4A: strh r0, [r5, 0xA] - ldr r0, _080D5E64 + ldr r0, =0x03005e00 adds r1, r4, r6 lsls r1, 3 adds r1, r0 - ldr r0, _080D5E68 + ldr r0, =sub_80D5E6C + 1 str r0, [r1] _080D5E58: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080D5E60: .4byte 0x0203841e -_080D5E64: .4byte 0x03005e00 -_080D5E68: .4byte sub_80D5E6C + 1 + .pool thumb_func_end sub_80D5DB0 thumb_func_start sub_80D5E6C @@ -438258,13 +423762,13 @@ sub_80D5E6C: @ 80D5E6C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080D5EB0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 ldrb r2, [r1, 0x8] - ldr r3, _080D5EB4 + ldr r3, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -438290,8 +423794,7 @@ _080D5EAA: pop {r0} bx r0 .align 2, 0 -_080D5EB0: .4byte 0x03005e00 -_080D5EB4: .4byte 0x02020630 + .pool thumb_func_end sub_80D5E6C thumb_func_start sub_80D5EB8 @@ -438299,23 +423802,23 @@ sub_80D5EB8: @ 80D5EB8 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _080D5F08 + ldr r6, =0x02038436 ldrb r0, [r6] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _080D5ED4 - ldr r1, _080D5F0C + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 strh r0, [r1, 0x2] _080D5ED4: - ldr r4, _080D5F0C + ldr r4, =0x0203841e ldrb r0, [r4, 0x8] bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r2, _080D5F10 + ldr r2, =0x03005e00 lsls r3, r5, 2 adds r1, r3, r5 lsls r1, 3 @@ -438336,29 +423839,25 @@ _080D5ED4: ldrb r0, [r6] b _080D5F18 .align 2, 0 -_080D5F08: .4byte 0x02038436 -_080D5F0C: .4byte 0x0203841e -_080D5F10: .4byte 0x03005e00 + .pool _080D5F14: - ldr r0, _080D5F30 + ldr r0, =0x02038437 ldrb r0, [r0] _080D5F18: strh r0, [r2, 0x12] - ldr r1, _080D5F34 + ldr r1, =0x03005e00 adds r0, r3, r5 lsls r0, 3 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x20] - ldr r1, _080D5F38 + ldr r1, =sub_80D5F3C + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080D5F30: .4byte 0x02038437 -_080D5F34: .4byte 0x03005e00 -_080D5F38: .4byte sub_80D5F3C + 1 + .pool thumb_func_end sub_80D5EB8 thumb_func_start sub_80D5F3C @@ -438369,7 +423868,7 @@ sub_80D5F3C: @ 80D5F3C push {r6,r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080D5F8C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -438393,7 +423892,7 @@ sub_80D5F3C: @ 80D5F3C ldrsh r0, [r4, r1] cmp r0, 0 bne _080D5F94 - ldr r0, _080D5F90 + ldr r0, =0x02020630 lsls r2, r7, 4 adds r1, r2, r7 lsls r1, 2 @@ -438403,15 +423902,14 @@ sub_80D5F3C: @ 80D5F3C adds r4, r2, 0 b _080D5FDA .align 2, 0 -_080D5F8C: .4byte 0x03005e00 -_080D5F90: .4byte 0x02020630 + .pool _080D5F94: ldrb r0, [r4, 0x12] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _080D5FBC - ldr r1, _080D5FB8 + ldr r1, =0x02020630 lsls r2, r7, 4 adds r0, r2, r7 lsls r0, 2 @@ -438424,9 +423922,9 @@ _080D5F94: bge _080D5FD8 b _080D5FD6 .align 2, 0 -_080D5FB8: .4byte 0x02020630 + .pool _080D5FBC: - ldr r1, _080D605C + ldr r1, =0x02020630 lsls r2, r7, 4 adds r0, r2, r7 lsls r0, 2 @@ -438447,7 +423945,7 @@ _080D5FDA: mov r5, r8 cmp r5, 0x7F bls _080D5FFC - ldr r1, _080D6060 + ldr r1, =0x03005e00 lsls r2, r6, 2 adds r0, r2, r6 lsls r0, 3 @@ -438465,7 +423963,7 @@ _080D5FFC: mov r2, r8 cmp r2, 0x7E bhi _080D6050 - ldr r1, _080D6060 + ldr r1, =0x03005e00 lsls r2, r6, 2 adds r0, r2, r6 lsls r0, 3 @@ -438512,8 +424010,7 @@ _080D6050: pop {r0} bx r0 .align 2, 0 -_080D605C: .4byte 0x02020630 -_080D6060: .4byte 0x03005e00 + .pool thumb_func_end sub_80D5F3C thumb_func_start sub_80D6064 @@ -438522,7 +424019,7 @@ sub_80D6064: @ 80D6064 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r6, _080D60B0 + ldr r6, =0x0203841e ldrb r0, [r6, 0x6] bl obj_id_for_side_relative_to_move adds r5, r0, 0 @@ -438531,7 +424028,7 @@ sub_80D6064: @ 80D6064 ldrb r1, [r6, 0x8] adds r0, r5, 0 bl sub_80A7270 - ldr r1, _080D60B4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -438549,15 +424046,13 @@ sub_80D6064: @ 80D6064 lsls r1, 1 strh r1, [r0, 0x1C] strh r1, [r0, 0x1E] - ldr r1, _080D60B8 + ldr r1, =sub_80D60BC + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080D60B0: .4byte 0x0203841e -_080D60B4: .4byte 0x03005e00 -_080D60B8: .4byte sub_80D60BC + 1 + .pool thumb_func_end sub_80D6064 thumb_func_start sub_80D60BC @@ -438566,7 +424061,7 @@ sub_80D60BC: @ 80D60BC lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _080D611C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -438610,7 +424105,7 @@ sub_80D60BC: @ 80D60BC strh r1, [r4, 0xE] b _080D612C .align 2, 0 -_080D611C: .4byte 0x03005e00 + .pool _080D6120: adds r0, r6, 0 bl sub_80A7344 @@ -438629,7 +424124,7 @@ sub_80D6134: @ 80D6134 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _080D6170 + ldr r4, =0x0203841e ldrb r0, [r4, 0x4] bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -438637,7 +424132,7 @@ sub_80D6134: @ 80D6134 mov r8, r0 movs r1, 0 bl sub_80A7270 - ldr r1, _080D6174 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -438653,8 +424148,7 @@ sub_80D6134: @ 80D6134 strh r1, [r2, 0xE] b _080D6184 .align 2, 0 -_080D6170: .4byte 0x0203841e -_080D6174: .4byte 0x03005e00 + .pool _080D6178: ldrh r0, [r4] ldrh r1, [r4, 0x2] @@ -438663,12 +424157,12 @@ _080D6178: adds r0, r3, 0 strh r0, [r2, 0xE] _080D6184: - ldr r1, _080D61B0 + ldr r1, =0x03005e00 lsls r4, r7, 2 adds r0, r4, r7 lsls r0, 3 adds r5, r0, r1 - ldr r6, _080D61B4 + ldr r6, =0x0203841e ldrh r0, [r6, 0x2] strh r0, [r5, 0x10] mov r0, r8 @@ -438684,19 +424178,18 @@ _080D6184: strh r0, [r5, 0x16] b _080D61DC .align 2, 0 -_080D61B0: .4byte 0x03005e00 -_080D61B4: .4byte 0x0203841e + .pool _080D61B8: movs r1, 0x4 ldrsh r0, [r6, r1] cmp r0, 0 bne _080D61C8 - ldr r0, _080D61C4 + ldr r0, =0x02038436 b _080D61CA .align 2, 0 -_080D61C4: .4byte 0x02038436 + .pool _080D61C8: - ldr r0, _080D6220 + ldr r0, =0x02038437 _080D61CA: ldrb r0, [r0] bl battle_side_get_owner @@ -438708,7 +424201,7 @@ _080D61CA: _080D61DA: strh r1, [r5, 0x16] _080D61DC: - ldr r0, _080D6224 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -438730,12 +424223,12 @@ _080D61DC: negs r0, r0 strh r0, [r4, 0x10] _080D6208: - ldr r0, _080D6224 + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 adds r1, r0 - ldr r0, _080D6228 + ldr r0, =sub_80D6308 + 1 str r0, [r1] pop {r3} mov r8, r3 @@ -438743,9 +424236,7 @@ _080D6208: pop {r0} bx r0 .align 2, 0 -_080D6220: .4byte 0x02038437 -_080D6224: .4byte 0x03005e00 -_080D6228: .4byte sub_80D6308 + 1 + .pool thumb_func_end sub_80D6134 thumb_func_start sub_80D622C @@ -438755,7 +424246,7 @@ sub_80D622C: @ 80D622C push {r7} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080D6268 + ldr r4, =0x0203841e ldrb r0, [r4, 0x4] bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -438763,7 +424254,7 @@ sub_80D622C: @ 80D622C mov r8, r0 movs r1, 0 bl sub_80A7270 - ldr r1, _080D626C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -438776,14 +424267,12 @@ sub_80D622C: @ 80D622C ldrsh r0, [r4, r1] cmp r0, 0 bne _080D6274 - ldr r0, _080D6270 + ldr r0, =0x02038436 b _080D6276 .align 2, 0 -_080D6268: .4byte 0x0203841e -_080D626C: .4byte 0x03005e00 -_080D6270: .4byte 0x02038436 + .pool _080D6274: - ldr r0, _080D62A4 + ldr r0, =0x02038437 _080D6276: ldrb r0, [r0] bl battle_side_get_owner @@ -438794,13 +424283,13 @@ _080D6276: negs r0, r0 strh r0, [r4, 0x2] _080D6288: - ldr r0, _080D62A8 + ldr r0, =0x0203841e movs r2, 0x6 ldrsh r1, [r0, r2] adds r6, r0, 0 cmp r1, 0x1 beq _080D62B0 - ldr r2, _080D62AC + ldr r2, =0x03005e00 lsls r3, r5, 2 adds r0, r3, r5 lsls r0, 3 @@ -438809,11 +424298,9 @@ _080D6288: strh r1, [r0, 0xE] b _080D62CA .align 2, 0 -_080D62A4: .4byte 0x02038437 -_080D62A8: .4byte 0x0203841e -_080D62AC: .4byte 0x03005e00 + .pool _080D62B0: - ldr r3, _080D6300 + ldr r3, =0x03005e00 lsls r4, r5, 2 adds r0, r4, r5 lsls r0, 3 @@ -438846,7 +424333,7 @@ _080D62CA: ldrsh r0, [r1, r7] negs r0, r0 strh r0, [r1, 0x10] - ldr r0, _080D6304 + ldr r0, =sub_80D6308 + 1 str r0, [r1] pop {r3} mov r8, r3 @@ -438854,8 +424341,7 @@ _080D62CA: pop {r0} bx r0 .align 2, 0 -_080D6300: .4byte 0x03005e00 -_080D6304: .4byte sub_80D6308 + 1 + .pool thumb_func_end sub_80D622C thumb_func_start sub_80D6308 @@ -438863,7 +424349,7 @@ sub_80D6308: @ 80D6308 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080D6360 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -438904,7 +424390,7 @@ _080D633C: beq _080D6372 b _080D636A .align 2, 0 -_080D6360: .4byte 0x03005e00 + .pool _080D6364: ldrb r0, [r4, 0x12] bl sub_80A7344 @@ -438934,33 +424420,31 @@ sub_80D6388: @ 80D6388 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080D63B4 + ldr r0, =0x0203841e movs r2, 0 ldrsh r1, [r0, r2] mov r8, r0 cmp r1, 0 bne _080D63C0 - ldr r4, _080D63B8 + ldr r4, =0x03005e00 lsls r5, r7, 2 adds r0, r5, r7 lsls r0, 3 adds r6, r0, r4 - ldr r0, _080D63BC + ldr r0, =0x02038408 ldrh r0, [r0] movs r1, 0xC bl __udivsi3 b _080D63D4 .align 2, 0 -_080D63B4: .4byte 0x0203841e -_080D63B8: .4byte 0x03005e00 -_080D63BC: .4byte 0x02038408 + .pool _080D63C0: - ldr r4, _080D645C + ldr r4, =0x03005e00 lsls r5, r7, 2 adds r0, r5, r7 lsls r0, 3 adds r6, r0, r4 - ldr r0, _080D6460 + ldr r0, =0x02038404 ldr r0, [r0] movs r1, 0xC bl __divsi3 @@ -439006,7 +424490,7 @@ _080D63EE: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x16] - ldr r2, _080D6464 + ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -439027,7 +424511,7 @@ _080D63EE: strh r0, [r4, 0xA] ldrh r0, [r1, 0x4] strh r0, [r4, 0xC] - ldr r0, _080D6468 + ldr r0, =sub_80D646C + 1 str r0, [r4] pop {r3} mov r8, r3 @@ -439035,10 +424519,7 @@ _080D63EE: pop {r0} bx r0 .align 2, 0 -_080D645C: .4byte 0x03005e00 -_080D6460: .4byte 0x02038404 -_080D6464: .4byte 0x02020630 -_080D6468: .4byte sub_80D646C + 1 + .pool thumb_func_end sub_80D6388 thumb_func_start sub_80D646C @@ -439049,7 +424530,7 @@ sub_80D646C: @ 80D646C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080D64C0 + ldr r1, =0x03005e00 adds r3, r0, r1 ldrh r0, [r3, 0x8] adds r0, 0x1 @@ -439073,7 +424554,7 @@ sub_80D646C: @ 80D646C beq _080D64DE cmp r1, 0 beq _080D64C8 - ldr r2, _080D64C4 + ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -439085,10 +424566,9 @@ sub_80D646C: @ 80D646C adds r1, r2 b _080D64DC .align 2, 0 -_080D64C0: .4byte 0x03005e00 -_080D64C4: .4byte 0x02020630 + .pool _080D64C8: - ldr r2, _080D6504 + ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -439109,7 +424589,7 @@ _080D64DE: ldrsh r4, [r3, r2] cmp r4, 0 beq _080D6508 - ldr r2, _080D6504 + ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -439120,9 +424600,9 @@ _080D64DE: strh r1, [r0, 0x26] b _080D6518 .align 2, 0 -_080D6504: .4byte 0x02020630 + .pool _080D6508: - ldr r2, _080D6550 + ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -439138,7 +424618,7 @@ _080D6518: asrs r4, r0, 16 cmp r4, 0 bne _080D654A - ldr r2, _080D6550 + ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -439160,13 +424640,13 @@ _080D654A: pop {r0} bx r0 .align 2, 0 -_080D6550: .4byte 0x02020630 + .pool thumb_func_end sub_80D646C thumb_func_start decrypt_bag_item_quantity decrypt_bag_item_quantity: @ 80D6554 adds r1, r0, 0 - ldr r0, _080D6568 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xAC ldr r0, [r0] @@ -439176,14 +424656,14 @@ decrypt_bag_item_quantity: @ 80D6554 lsrs r0, 16 bx lr .align 2, 0 -_080D6568: .4byte 0x03005d90 + .pool thumb_func_end decrypt_bag_item_quantity thumb_func_start encrypt_bag_item_quantity encrypt_bag_item_quantity: @ 80D656C lsls r1, 16 lsrs r1, 16 - ldr r2, _080D6580 + ldr r2, =0x03005d90 ldr r2, [r2] adds r2, 0xAC ldr r2, [r2] @@ -439191,7 +424671,7 @@ encrypt_bag_item_quantity: @ 80D656C strh r1, [r0] bx lr .align 2, 0 -_080D6580: .4byte 0x03005d90 + .pool thumb_func_end encrypt_bag_item_quantity thumb_func_start sub_80D6584 @@ -439215,7 +424695,7 @@ encrypt_decrypt_all_item_quantities: @ 80D658C sub sp, 0x4 mov r8, r0 movs r1, 0 - ldr r0, _080D65E0 + ldr r0, =0x02039dd8 mov r9, r0 _080D659E: movs r6, 0 @@ -439226,7 +424706,7 @@ _080D659E: ldrb r0, [r0, 0x4] cmp r6, r0 bcs _080D65CC - ldr r2, _080D65E0 + ldr r2, =0x02039dd8 _080D65B0: adds r4, r5, r2 lsls r1, r6, 2 @@ -439253,7 +424733,7 @@ _080D65CC: pop {r0} bx r0 .align 2, 0 -_080D65E0: .4byte 0x02039dd8 + .pool thumb_func_end encrypt_decrypt_all_item_quantities thumb_func_start call_encrypt_decrypt_all_item_quantities @@ -439267,8 +424747,8 @@ call_encrypt_decrypt_all_item_quantities: @ 80D65E4 thumb_func_start init_bag_pockets init_bag_pockets: @ 80D65F0 push {r4,lr} - ldr r1, _080D663C - ldr r0, _080D6640 + ldr r1, =0x02039dd8 + ldr r0, =0x03005d8c ldr r2, [r0] movs r3, 0xAC lsls r3, 3 @@ -439304,8 +424784,7 @@ init_bag_pockets: @ 80D65F0 pop {r0} bx r0 .align 2, 0 -_080D663C: .4byte 0x02039dd8 -_080D6640: .4byte 0x03005d8c + .pool thumb_func_end init_bag_pockets thumb_func_start itemid_get_name @@ -439339,13 +424818,13 @@ sub_80D6660: @ 80D6660 adds r1, r0, 0 b _080D667E _080D667C: - ldr r1, _080D6688 + ldr r1, =0x085efcd4 _080D667E: adds r0, r4, 0 bl gf_strcpy b _080D66BE .align 2, 0 -_080D6688: .4byte 0x085efcd4 + .pool _080D668C: adds r0, r3, 0 subs r0, 0x85 @@ -439356,13 +424835,13 @@ _080D668C: lsls r1, r3, 3 subs r1, r3 lsls r1, 2 - ldr r0, _080D66AC + ldr r0, =0x085897e4 adds r1, r0 adds r0, r4, 0 bl sub_80D66C4 b _080D66BE .align 2, 0 -_080D66AC: .4byte 0x085897e4 + .pool _080D66B0: adds r0, r1, 0 bl itemid_get_item @@ -439378,10 +424857,10 @@ _080D66BE: thumb_func_start sub_80D66C4 sub_80D66C4: @ 80D66C4 push {r4,lr} - ldr r4, _080D66E4 + ldr r4, =0x085efce5 cmp r2, 0x1 bhi _080D66CE - ldr r4, _080D66E8 + ldr r4, =0x085efcdf _080D66CE: bl gf_strcpy movs r1, 0 @@ -439393,8 +424872,7 @@ _080D66CE: pop {r0} bx r0 .align 2, 0 -_080D66E4: .4byte 0x085efce5 -_080D66E8: .4byte 0x085efcdf + .pool thumb_func_end sub_80D66C4 thumb_func_start sub_80D66EC @@ -439402,7 +424880,7 @@ sub_80D66EC: @ 80D66EC push {lr} lsls r0, 24 movs r2, 0 - ldr r1, _080D6710 + ldr r1, =0x02039dd8 lsrs r0, 21 subs r0, 0x8 adds r0, r1 @@ -439419,7 +424897,7 @@ _080D6702: movs r0, 0x1 b _080D6720 .align 2, 0 -_080D6710: .4byte 0x02039dd8 + .pool _080D6714: adds r0, r2, 0x1 lsls r0, 24 @@ -439449,7 +424927,7 @@ sub_80D6724: @ 80D6724 lsls r0, 24 cmp r0, 0 bne _080D6752 - ldr r0, _080D6760 + ldr r0, =0x00004004 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -439463,7 +424941,7 @@ _080D6752: lsrs r0, 24 b _080D67B8 .align 2, 0 -_080D6760: .4byte 0x00004004 + .pool _080D6764: movs r0, 0x1 b _080D67B8 @@ -439473,11 +424951,11 @@ _080D6768: subs r0, 0x1 lsls r0, 24 movs r6, 0 - ldr r1, _080D677C + ldr r1, =0x02039dd8 lsrs r4, r0, 21 b _080D67AE .align 2, 0 -_080D677C: .4byte 0x02039dd8 + .pool _080D6780: adds r0, r4, r1 ldr r1, [r0] @@ -439501,7 +424979,7 @@ _080D67A6: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080D67C0 + ldr r1, =0x02039dd8 _080D67AE: adds r0, r4, r1 ldrb r0, [r0, 0x4] @@ -439514,7 +424992,7 @@ _080D67B8: pop {r1} bx r1 .align 2, 0 -_080D67C0: .4byte 0x02039dd8 + .pool thumb_func_end sub_80D6724 thumb_func_start sub_80D67C4 @@ -439529,19 +425007,19 @@ _080D67C8: lsrs r1, r0, 24 cmp r1, 0x1 bne _080D67E4 - ldr r0, _080D67E0 + ldr r0, =0x020375f0 strh r1, [r0] movs r0, 0x1 b _080D67F6 .align 2, 0 -_080D67E0: .4byte 0x020375f0 + .pool _080D67E4: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xB2 bls _080D67C8 - ldr r1, _080D67FC + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] movs r0, 0 @@ -439550,7 +425028,7 @@ _080D67F6: pop {r1} bx r1 .align 2, 0 -_080D67FC: .4byte 0x020375f0 + .pool thumb_func_end sub_80D67C4 thumb_func_start sub_80D6800 @@ -439574,7 +425052,7 @@ sub_80D6800: @ 80D6800 lsls r0, 24 cmp r0, 0 bne _080D6838 - ldr r0, _080D6848 + ldr r0, =0x00004004 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -439588,20 +425066,20 @@ _080D6838: lsrs r0, 24 b _080D6916 .align 2, 0 -_080D6848: .4byte 0x00004004 + .pool _080D684C: mov r0, r8 bl itemid_get_pocket_number subs r0, 0x1 lsls r0, 24 lsrs r2, r0, 24 - ldr r7, _080D690C + ldr r7, =0x000003e7 cmp r2, 0x3 beq _080D6860 movs r7, 0x63 _080D6860: movs r6, 0 - ldr r1, _080D6910 + ldr r1, =0x02039dd8 lsls r4, r2, 3 adds r0, r4, r1 mov r9, r4 @@ -439642,7 +425120,7 @@ _080D68AC: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _080D6910 + ldr r1, =0x02039dd8 adds r0, r4, r1 ldrb r0, [r0, 0x4] cmp r6, r0 @@ -439651,7 +425129,7 @@ _080D68BC: cmp r5, 0 beq _080D6914 movs r6, 0 - ldr r3, _080D6910 + ldr r3, =0x02039dd8 mov r1, r9 adds r0, r1, r3 ldrb r0, [r0, 0x4] @@ -439692,8 +425170,7 @@ _080D6906: movs r0, 0 b _080D6916 .align 2, 0 -_080D690C: .4byte 0x000003e7 -_080D6910: .4byte 0x02039dd8 + .pool _080D6914: movs r0, 0x1 _080D6916: @@ -439731,7 +425208,7 @@ _080D694C: lsls r0, 24 cmp r0, 0 bne _080D6964 - ldr r0, _080D6974 + ldr r0, =0x00004004 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -439745,7 +425222,7 @@ _080D6964: lsrs r0, 24 b _080D6A92 .align 2, 0 -_080D6974: .4byte 0x00004004 + .pool _080D6978: mov r0, r9 bl itemid_get_pocket_number @@ -439754,7 +425231,7 @@ _080D6978: lsrs r0, 24 mov r10, r0 lsls r1, r0, 3 - ldr r0, _080D6A38 + ldr r0, =0x02039dd8 adds r7, r1, r0 ldrb r0, [r7, 0x4] lsls r0, 2 @@ -439764,7 +425241,7 @@ _080D6978: ldrb r2, [r7, 0x4] lsls r2, 2 bl memcpy - ldr r2, _080D6A3C + ldr r2, =0x000003e7 mov r0, r10 cmp r0, 0x3 beq _080D69AA @@ -439842,8 +425319,7 @@ _080D6A18: bl encrypt_bag_item_quantity b _080D6A7E .align 2, 0 -_080D6A38: .4byte 0x02039dd8 -_080D6A3C: .4byte 0x000003e7 + .pool _080D6A40: cmp r4, 0x1 bls _080D6A74 @@ -439920,7 +425396,7 @@ sub_80D6AA4: @ 80D6AA4 lsls r0, 24 cmp r0, 0 bne _080D6AE0 - ldr r0, _080D6AF0 + ldr r0, =0x00004004 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -439934,7 +425410,7 @@ _080D6AE0: lsrs r0, 24 b _080D6C5A .align 2, 0 -_080D6AF0: .4byte 0x00004004 + .pool _080D6AF4: mov r0, r8 bl itemid_get_pocket_number @@ -439943,7 +425419,7 @@ _080D6AF4: lsrs r0, 24 mov r9, r0 lsls r1, r0, 3 - ldr r0, _080D6B3C + ldr r0, =0x02039dd8 adds r5, r1, r0 movs r6, 0 ldrb r2, [r5, 0x4] @@ -439975,14 +425451,14 @@ _080D6B38: movs r0, 0 b _080D6C5A .align 2, 0 -_080D6B3C: .4byte 0x02039dd8 + .pool _080D6B40: bl sub_80E9214 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080D6B70 - ldr r4, _080D6BB0 + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -439994,7 +425470,7 @@ _080D6B40: lsrs r1, 16 adds r0, r4, 0 bl var_set - ldr r0, _080D6BB4 + ldr r0, =0x000040ed mov r1, r8 bl var_set _080D6B70: @@ -440028,8 +425504,7 @@ _080D6B70: movs r7, 0 b _080D6BCA .align 2, 0 -_080D6BB0: .4byte 0x000040ee -_080D6BB4: .4byte 0x000040ed + .pool _080D6BB8: subs r0, r7, r1 lsls r0, 16 @@ -440169,7 +425644,7 @@ _080D6CA6: sub_80D6CAC: @ 80D6CAC push {lr} movs r1, 0 - ldr r0, _080D6CCC + ldr r0, =0x03005d8c ldr r2, [r0] movs r3, 0x93 lsls r3, 3 @@ -440185,7 +425660,7 @@ _080D6CB8: adds r0, r1, 0 b _080D6CE0 .align 2, 0 -_080D6CCC: .4byte 0x03005d8c + .pool _080D6CD0: adds r0, r1, 0x1 lsls r0, 24 @@ -440205,7 +425680,7 @@ sub_80D6CE4: @ 80D6CE4 push {r4,lr} movs r2, 0 movs r1, 0 - ldr r0, _080D6D18 + ldr r0, =0x03005d8c ldr r3, [r0] movs r4, 0x93 lsls r4, 3 @@ -440230,7 +425705,7 @@ _080D6D04: pop {r1} bx r1 .align 2, 0 -_080D6D18: .4byte 0x03005d8c + .pool thumb_func_end sub_80D6CE4 thumb_func_start sub_80D6D1C @@ -440242,7 +425717,7 @@ sub_80D6D1C: @ 80D6D1C lsrs r5, r1, 16 movs r4, 0 _080D6D28: - ldr r0, _080D6D54 + ldr r0, =0x03005d8c ldr r2, [r0] lsls r1, r4, 2 adds r0, r2, r1 @@ -440253,7 +425728,7 @@ _080D6D28: cmp r0, r6 bne _080D6D5C adds r0, r1, r2 - ldr r1, _080D6D58 + ldr r1, =0x0000049a adds r0, r1 bl sub_80D6584 lsls r0, 16 @@ -440263,8 +425738,7 @@ _080D6D28: movs r0, 0x1 b _080D6D68 .align 2, 0 -_080D6D54: .4byte 0x03005d8c -_080D6D58: .4byte 0x0000049a + .pool _080D6D5C: adds r0, r4, 0x1 lsls r0, 24 @@ -440291,7 +425765,7 @@ sub_80D6D70: @ 80D6D70 movs r0, 0xC8 bl malloc_and_clear adds r7, r0, 0 - ldr r0, _080D6DF8 + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x93 lsls r0, 3 @@ -440312,10 +425786,10 @@ _080D6D9C: lsls r0, 16 lsrs r2, r0, 16 adds r1, r2, r5 - ldr r3, _080D6DFC + ldr r3, =0x000003e7 cmp r1, r3 ble _080D6E04 - ldr r1, _080D6E00 + ldr r1, =0x0000fc19 adds r0, r5, r1 adds r0, r2, r0 lsls r0, 16 @@ -440345,9 +425819,7 @@ _080D6DD0: movs r0, 0 b _080D6E3A .align 2, 0 -_080D6DF8: .4byte 0x03005d8c -_080D6DFC: .4byte 0x000003e7 -_080D6E00: .4byte 0x0000fc19 + .pool _080D6E04: lsls r1, 16 lsrs r1, 16 @@ -440363,7 +425835,7 @@ _080D6E10: adds r1, r5, 0 bl sub_80D6588 _080D6E20: - ldr r0, _080D6E44 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x93 lsls r1, 3 @@ -440381,7 +425853,7 @@ _080D6E3A: pop {r1} bx r1 .align 2, 0 -_080D6E44: .4byte 0x03005d8c + .pool thumb_func_end sub_80D6D70 thumb_func_start sub_80D6E48 @@ -440390,11 +425862,11 @@ sub_80D6E48: @ 80D6E48 lsls r0, 24 lsls r1, 16 lsrs r1, 16 - ldr r2, _080D6E7C + ldr r2, =0x03005d8c ldr r2, [r2] lsrs r0, 22 adds r3, r2, r0 - ldr r0, _080D6E80 + ldr r0, =0x0000049a adds r2, r3, r0 ldrh r0, [r2] subs r0, r1 @@ -440412,8 +425884,7 @@ _080D6E76: pop {r0} bx r0 .align 2, 0 -_080D6E7C: .4byte 0x03005d8c -_080D6E80: .4byte 0x0000049a + .pool thumb_func_end sub_80D6E48 thumb_func_start sub_80D6E84 @@ -440427,7 +425898,7 @@ _080D6E88: adds r6, r1, 0 cmp r4, 0x31 bhi _080D6ECA - ldr r0, _080D6ED8 + ldr r0, =0x03005d8c mov r12, r0 lsls r5, r2, 2 movs r7, 0x93 @@ -440465,18 +425936,18 @@ _080D6ECA: pop {r0} bx r0 .align 2, 0 -_080D6ED8: .4byte 0x03005d8c + .pool thumb_func_end sub_80D6E84 thumb_func_start sub_80D6EDC sub_80D6EDC: @ 80D6EDC push {lr} - ldr r0, _080D6EF8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _080D6EFC + ldr r2, =0x00000496 adds r1, r0, r2 ldrh r2, [r1] - ldr r3, _080D6F00 + ldr r3, =0x00000103 cmp r2, r3 beq _080D6F04 movs r0, 0x88 @@ -440485,9 +425956,7 @@ sub_80D6EDC: @ 80D6EDC beq _080D6F0C b _080D6F0E .align 2, 0 -_080D6EF8: .4byte 0x03005d8c -_080D6EFC: .4byte 0x00000496 -_080D6F00: .4byte 0x00000103 + .pool _080D6F04: movs r0, 0x88 lsls r0, 1 @@ -440504,7 +425973,7 @@ _080D6F0E: bag_pocket_get_itemid: @ 80D6F14 lsls r0, 24 lsls r1, 16 - ldr r2, _080D6F2C + ldr r2, =0x02039dd8 lsrs r0, 21 subs r0, 0x8 adds r0, r2 @@ -440514,7 +425983,7 @@ bag_pocket_get_itemid: @ 80D6F14 ldrh r0, [r1] bx lr .align 2, 0 -_080D6F2C: .4byte 0x02039dd8 + .pool thumb_func_end bag_pocket_get_itemid thumb_func_start bag_pocket_get_item_quantity @@ -440522,7 +425991,7 @@ bag_pocket_get_item_quantity: @ 80D6F30 push {lr} lsls r0, 24 lsls r1, 16 - ldr r2, _080D6F54 + ldr r2, =0x02039dd8 lsrs r0, 21 subs r0, 0x8 adds r0, r2 @@ -440536,7 +426005,7 @@ bag_pocket_get_item_quantity: @ 80D6F30 pop {r1} bx r1 .align 2, 0 -_080D6F54: .4byte 0x02039dd8 + .pool thumb_func_end bag_pocket_get_item_quantity thumb_func_start swap32 @@ -440726,7 +426195,7 @@ _080D708C: sub_80D7094: @ 80D7094 push {r4,r5,lr} movs r4, 0 - ldr r5, _080D70B8 + ldr r5, =0x02039dd8 _080D709A: lsls r1, r4, 3 adds r1, r5 @@ -440742,7 +426211,7 @@ _080D709A: pop {r0} bx r0 .align 2, 0 -_080D70B8: .4byte 0x02039dd8 + .pool thumb_func_end sub_80D7094 thumb_func_start sub_80D70BC @@ -440755,7 +426224,7 @@ sub_80D70BC: @ 80D70BC bl itemid_get_pocket_number lsls r0, 24 lsrs r0, 21 - ldr r1, _080D7108 + ldr r1, =0x02039dd0 adds r5, r0, r1 movs r4, 0 ldrb r0, [r5, 0x4] @@ -440786,7 +426255,7 @@ _080D70FE: pop {r1} bx r1 .align 2, 0 -_080D7108: .4byte 0x02039dd0 + .pool thumb_func_end sub_80D70BC thumb_func_start sub_80D710C @@ -440796,9 +426265,9 @@ sub_80D710C: @ 80D710C lsrs r5, r0, 16 lsls r1, 16 lsrs r4, r1, 16 - ldr r0, _080D7160 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r1, _080D7164 + ldr r1, =0x00000ca9 adds r0, r3, r1 ldrb r1, [r0] lsls r1, 30 @@ -440806,14 +426275,14 @@ sub_80D710C: @ 80D710C lsls r0, r2, 2 adds r0, r2 lsls r0, 2 - ldr r2, _080D7168 + ldr r2, =0x00000e2c adds r0, r2 adds r2, r3, r0 lsrs r1, 30 lsls r0, r1, 2 adds r0, r1 lsls r0, 1 - ldr r1, _080D716C + ldr r1, =0x00000e54 adds r0, r1 adds r3, r0 movs r1, 0 @@ -440836,10 +426305,7 @@ _080D715C: movs r0, 0x1 b _080D717C .align 2, 0 -_080D7160: .4byte 0x03005d90 -_080D7164: .4byte 0x00000ca9 -_080D7168: .4byte 0x00000e2c -_080D716C: .4byte 0x00000e54 + .pool _080D7170: adds r0, r1, 0x1 lsls r0, 24 @@ -440860,9 +426326,9 @@ sub_80D7184: @ 80D7184 lsrs r5, r0, 16 lsls r1, 16 lsrs r4, r1, 16 - ldr r0, _080D71E0 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r1, _080D71E4 + ldr r1, =0x00000ca9 adds r0, r3, r1 ldrb r1, [r0] lsls r1, 30 @@ -440870,14 +426336,14 @@ sub_80D7184: @ 80D7184 lsls r0, r2, 2 adds r0, r2 lsls r0, 2 - ldr r2, _080D71E8 + ldr r2, =0x00000e2c adds r0, r2 adds r2, r3, r0 lsrs r1, 30 lsls r0, r1, 2 adds r0, r1 lsls r0, 1 - ldr r1, _080D71EC + ldr r1, =0x00000e54 adds r0, r1 adds r3, r0 movs r1, 0 @@ -440904,10 +426370,7 @@ _080D71DA: movs r0, 0x1 b _080D71FC .align 2, 0 -_080D71E0: .4byte 0x03005d90 -_080D71E4: .4byte 0x00000ca9 -_080D71E8: .4byte 0x00000e2c -_080D71EC: .4byte 0x00000e54 + .pool _080D71F0: adds r0, r1, 0x1 lsls r0, 24 @@ -440931,9 +426394,9 @@ sub_80D7204: @ 80D7204 lsrs r7, r0, 16 lsls r1, 16 lsrs r4, r1, 16 - ldr r0, _080D7294 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r1, _080D7298 + ldr r1, =0x00000ca9 adds r0, r3, r1 ldrb r1, [r0] lsls r1, 30 @@ -440941,7 +426404,7 @@ sub_80D7204: @ 80D7204 lsls r0, r2, 2 adds r0, r2 lsls r0, 2 - ldr r2, _080D729C + ldr r2, =0x00000e2c adds r0, r2 adds r0, r3 mov r9, r0 @@ -440949,7 +426412,7 @@ sub_80D7204: @ 80D7204 lsls r0, r1, 2 adds r0, r1 lsls r0, 1 - ldr r1, _080D72A0 + ldr r1, =0x00000e54 adds r0, r1 adds r3, r0 mov r8, r3 @@ -440992,10 +426455,7 @@ _080D7266: strb r0, [r1] b _080D72A6 .align 2, 0 -_080D7294: .4byte 0x03005d90 -_080D7298: .4byte 0x00000ca9 -_080D729C: .4byte 0x00000e2c -_080D72A0: .4byte 0x00000e54 + .pool _080D72A4: movs r4, 0 _080D72A6: @@ -441083,9 +426543,9 @@ sub_80D7334: @ 80D7334 mov r9, r0 lsls r1, 16 lsrs r4, r1, 16 - ldr r0, _080D73A0 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r1, _080D73A4 + ldr r1, =0x00000ca9 adds r0, r3, r1 ldrb r1, [r0] lsls r1, 30 @@ -441093,7 +426553,7 @@ sub_80D7334: @ 80D7334 lsls r0, r2, 2 adds r0, r2 lsls r0, 2 - ldr r2, _080D73A8 + ldr r2, =0x00000e2c adds r0, r2 adds r0, r3 mov r8, r0 @@ -441101,10 +426561,10 @@ sub_80D7334: @ 80D7334 lsls r0, r1, 2 adds r0, r1 lsls r0, 1 - ldr r1, _080D73AC + ldr r1, =0x00000e54 adds r0, r1 adds r7, r3, r0 - ldr r1, _080D73B0 + ldr r1, =0x0203cf30 ldrh r0, [r1, 0x8] ldrh r1, [r1, 0x6] adds r0, r1 @@ -441129,11 +426589,7 @@ sub_80D7334: @ 80D7334 strh r0, [r3] b _080D744C .align 2, 0 -_080D73A0: .4byte 0x03005d90 -_080D73A4: .4byte 0x00000ca9 -_080D73A8: .4byte 0x00000e2c -_080D73AC: .4byte 0x00000e54 -_080D73B0: .4byte 0x0203cf30 + .pool _080D73B4: movs r0, 0x14 bl malloc @@ -441245,12 +426701,12 @@ itemid_get_item: @ 80D7474 lsrs r0, 16 movs r1, 0x2C muls r0, r1 - ldr r1, _080D7490 + ldr r1, =0x085839a0 adds r0, r1 pop {r1} bx r1 .align 2, 0 -_080D7490: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_item thumb_func_start itemid_get_number @@ -441258,7 +426714,7 @@ itemid_get_number: @ 80D7494 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D74B4 + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441270,7 +426726,7 @@ itemid_get_number: @ 80D7494 pop {r1} bx r1 .align 2, 0 -_080D74B4: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_number thumb_func_start itemid_get_market_price @@ -441278,7 +426734,7 @@ itemid_get_market_price: @ 80D74B8 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D74D8 + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441290,7 +426746,7 @@ itemid_get_market_price: @ 80D74B8 pop {r1} bx r1 .align 2, 0 -_080D74D8: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_market_price thumb_func_start itemid_get_x12 @@ -441298,7 +426754,7 @@ itemid_get_x12: @ 80D74DC push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D74FC + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441310,7 +426766,7 @@ itemid_get_x12: @ 80D74DC pop {r1} bx r1 .align 2, 0 -_080D74FC: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_x12 thumb_func_start itemid_get_quality @@ -441318,7 +426774,7 @@ itemid_get_quality: @ 80D7500 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D7520 + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441330,7 +426786,7 @@ itemid_get_quality: @ 80D7500 pop {r1} bx r1 .align 2, 0 -_080D7520: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_quality thumb_func_start itemid_get_description @@ -441338,7 +426794,7 @@ itemid_get_description: @ 80D7524 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D7544 + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441351,7 +426807,7 @@ itemid_get_description: @ 80D7524 pop {r1} bx r1 .align 2, 0 -_080D7544: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_description thumb_func_start itemid_is_unique @@ -441359,7 +426815,7 @@ itemid_is_unique: @ 80D7548 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D7568 + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441371,7 +426827,7 @@ itemid_is_unique: @ 80D7548 pop {r1} bx r1 .align 2, 0 -_080D7568: .4byte 0x085839a0 + .pool thumb_func_end itemid_is_unique thumb_func_start itemid_get_x19 @@ -441379,7 +426835,7 @@ itemid_get_x19: @ 80D756C push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D758C + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441391,7 +426847,7 @@ itemid_get_x19: @ 80D756C pop {r1} bx r1 .align 2, 0 -_080D758C: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_x19 thumb_func_start itemid_get_pocket_number @@ -441399,7 +426855,7 @@ itemid_get_pocket_number: @ 80D7590 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D75B0 + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441411,7 +426867,7 @@ itemid_get_pocket_number: @ 80D7590 pop {r1} bx r1 .align 2, 0 -_080D75B0: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_pocket_number thumb_func_start itemid_get_type @@ -441419,7 +426875,7 @@ itemid_get_type: @ 80D75B4 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D75D4 + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441431,7 +426887,7 @@ itemid_get_type: @ 80D75B4 pop {r1} bx r1 .align 2, 0 -_080D75D4: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_type thumb_func_start itemid_get_overworld_function @@ -441439,7 +426895,7 @@ itemid_get_overworld_function: @ 80D75D8 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D75F8 + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441452,7 +426908,7 @@ itemid_get_overworld_function: @ 80D75D8 pop {r1} bx r1 .align 2, 0 -_080D75F8: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_overworld_function thumb_func_start itemid_get_usage @@ -441460,7 +426916,7 @@ itemid_get_usage: @ 80D75FC push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D761C + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441473,7 +426929,7 @@ itemid_get_usage: @ 80D75FC pop {r1} bx r1 .align 2, 0 -_080D761C: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_usage thumb_func_start itemid_get_battle_function @@ -441481,7 +426937,7 @@ itemid_get_battle_function: @ 80D7620 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D7640 + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441494,7 +426950,7 @@ itemid_get_battle_function: @ 80D7620 pop {r1} bx r1 .align 2, 0 -_080D7640: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_battle_function thumb_func_start itemid_get_x28 @@ -441502,7 +426958,7 @@ itemid_get_x28: @ 80D7644 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _080D7664 + ldr r4, =0x085839a0 bl itemid_sanitize lsls r0, 16 lsrs r0, 16 @@ -441515,7 +426971,7 @@ itemid_get_x28: @ 80D7644 pop {r1} bx r1 .align 2, 0 -_080D7664: .4byte 0x085839a0 + .pool thumb_func_end itemid_get_x28 thumb_func_start nullsub_41 @@ -441525,12 +426981,12 @@ nullsub_41: @ 80D7668 thumb_func_start sub_80D766C sub_80D766C: @ 80D766C - ldr r1, _080D7674 + ldr r1, =0x02039f2a movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_080D7674: .4byte 0x02039f2a + .pool thumb_func_end sub_80D766C thumb_func_start sub_80D7678 @@ -441548,7 +427004,7 @@ sub_80D7678: @ 80D7678 movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r4, _080D76F0 + ldr r4, =0x00003f3f movs r0, 0x48 adds r1, r4, 0 bl lcd_io_set @@ -441559,68 +427015,56 @@ sub_80D7678: @ 80D7678 lsls r1, 7 movs r0, 0 bl lcd_io_set_bits - ldr r0, _080D76F4 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _080D76F8 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r0, _080D76FC + ldr r0, =0x02022e18 strh r1, [r0] - ldr r0, _080D7700 + ldr r0, =0x02022e1a strh r1, [r0] - ldr r0, _080D7704 + ldr r0, =0x02022e1c strh r1, [r0] - ldr r0, _080D7708 + ldr r0, =0x02022e1e strh r1, [r0] - ldr r0, _080D770C + ldr r0, =0x02022e20 strh r1, [r0] - ldr r0, _080D7710 + ldr r0, =0x02022e22 strh r1, [r0] - ldr r0, _080D7714 + ldr r0, =0x02022e24 strh r1, [r0] - ldr r0, _080D7718 + ldr r0, =0x02022e26 strh r1, [r0] - ldr r0, _080D771C + ldr r0, =0x02022e28 strh r1, [r0] - ldr r0, _080D7720 + ldr r0, =0x02022e2a strh r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080D76F0: .4byte 0x00003f3f -_080D76F4: .4byte 0x02022e14 -_080D76F8: .4byte 0x02022e16 -_080D76FC: .4byte 0x02022e18 -_080D7700: .4byte 0x02022e1a -_080D7704: .4byte 0x02022e1c -_080D7708: .4byte 0x02022e1e -_080D770C: .4byte 0x02022e20 -_080D7710: .4byte 0x02022e22 -_080D7714: .4byte 0x02022e24 -_080D7718: .4byte 0x02022e26 -_080D771C: .4byte 0x02022e28 -_080D7720: .4byte 0x02022e2a + .pool thumb_func_end sub_80D7678 thumb_func_start sub_80D7724 sub_80D7724: @ 80D7724 push {r4,r5,lr} - ldr r0, _080D7780 + ldr r0, =0x08c17ab0 movs r1, 0xC0 lsls r1, 19 bl call_LZZUnCompVram - ldr r0, _080D7784 - ldr r1, _080D7788 + ldr r0, =0x08c1850c + ldr r1, =0x06002000 bl call_LZZUnCompVram - ldr r1, _080D778C + ldr r1, =0x08c16fa8 movs r0, 0x3 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _080D7790 + ldr r0, =0x08c16e90 movs r2, 0x80 lsls r2, 2 movs r1, 0 @@ -441629,9 +427073,9 @@ sub_80D7724: @ 80D7724 movs r4, 0 movs r5, 0xA0 _080D775E: - ldr r0, _080D7794 + ldr r0, =0x0201a004 adds r0, r5, r0 - ldr r1, _080D7798 + ldr r1, =0x02039f26 adds r1, r4, r1 ldrb r1, [r1] adds r1, 0x5 @@ -441646,13 +427090,7 @@ _080D775E: pop {r0} bx r0 .align 2, 0 -_080D7780: .4byte 0x08c17ab0 -_080D7784: .4byte 0x08c1850c -_080D7788: .4byte 0x06002000 -_080D778C: .4byte 0x08c16fa8 -_080D7790: .4byte 0x08c16e90 -_080D7794: .4byte 0x0201a004 -_080D7798: .4byte 0x02039f26 + .pool thumb_func_end sub_80D7724 thumb_func_start sub_80D779C @@ -441660,7 +427098,7 @@ sub_80D779C: @ 80D779C push {r4,lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080D77DC + ldr r1, =0x08587f34 movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -441672,7 +427110,7 @@ sub_80D779C: @ 80D779C _080D77BA: lsls r0, r4, 24 lsrs r0, 24 - ldr r1, _080D77E0 + ldr r1, =0x02039f34 ldr r1, [r1] lsls r2, r4, 2 adds r1, 0x24 @@ -441686,23 +427124,22 @@ _080D77BA: pop {r0} bx r0 .align 2, 0 -_080D77DC: .4byte 0x08587f34 -_080D77E0: .4byte 0x02039f34 + .pool thumb_func_end sub_80D779C thumb_func_start sub_80D77E4 sub_80D77E4: @ 80D77E4 push {lr} - ldr r0, _080D780C + ldr r0, =0x08587f44 bl Window_InitFromTemplates bl TextBox_ResetSomeField - ldr r0, _080D7810 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080D7818 - ldr r2, _080D7814 + ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 @@ -441710,11 +427147,9 @@ sub_80D77E4: @ 80D77E4 strb r0, [r2] b _080D7822 .align 2, 0 -_080D780C: .4byte 0x08587f44 -_080D7810: .4byte 0x02039f2a -_080D7814: .4byte 0x03003014 + .pool _080D7818: - ldr r0, _080D7828 + ldr r0, =0x03003014 ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 @@ -441723,13 +427158,13 @@ _080D7822: pop {r0} bx r0 .align 2, 0 -_080D7828: .4byte 0x03003014 + .pool thumb_func_end sub_80D77E4 thumb_func_start sub_80D782C sub_80D782C: @ 80D782C push {r4,r5,lr} - ldr r0, _080D7870 + ldr r0, =0x08587c30 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -441742,7 +427177,7 @@ sub_80D782C: @ 80D782C lsls r4, 16 _080D7848: lsrs r1, r4, 16 - ldr r0, _080D7874 + ldr r0, =0x020378f6 movs r2, 0x2 bl gpu_pal_apply movs r0, 0x80 @@ -441751,7 +427186,7 @@ _080D7848: adds r5, 0x1 cmp r5, 0xD ble _080D7848 - ldr r0, _080D7878 + ldr r0, =0x00007e3f movs r1, 0xF3 movs r2, 0x2 bl rboxid_80040B8 @@ -441759,15 +427194,13 @@ _080D7848: pop {r0} bx r0 .align 2, 0 -_080D7870: .4byte 0x08587c30 -_080D7874: .4byte 0x020378f6 -_080D7878: .4byte 0x00007e3f + .pool thumb_func_end sub_80D782C thumb_func_start sub_80D787C sub_80D787C: @ 80D787C push {r4-r7,lr} - ldr r4, _080D797C + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] movs r1, 0 @@ -441787,7 +427220,7 @@ _080D7890: cmp r5, 0x3 ble _080D7890 movs r4, 0 - ldr r6, _080D797C + ldr r6, =0x02039f34 movs r5, 0x3 _080D78AA: ldr r0, [r6] @@ -441800,7 +427233,7 @@ _080D78AA: subs r5, 0x1 cmp r5, 0 bge _080D78AA - ldr r4, _080D797C + ldr r4, =0x02039f34 movs r7, 0x4 negs r7, r7 movs r6, 0xFF @@ -441830,7 +427263,7 @@ _080D78CC: subs r5, 0x1 cmp r5, 0 bge _080D78CC - ldr r4, _080D797C + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x8] movs r1, 0 @@ -441849,7 +427282,7 @@ _080D78CC: movs r1, 0 movs r2, 0x10 bl memset - ldr r0, _080D7980 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -441862,7 +427295,7 @@ _080D7938: adds r2, r4, 0 movs r6, 0xFF movs r3, 0 - ldr r4, _080D7984 + ldr r4, =0x02039f26 _080D7942: ldr r0, [r2] ldr r1, [r0, 0x4] @@ -441882,7 +427315,7 @@ _080D7942: cmp r5, 0x3 ble _080D7942 bl sub_80DD590 - ldr r0, _080D797C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x1C] movs r1, 0 @@ -441892,15 +427325,13 @@ _080D7942: pop {r0} bx r0 .align 2, 0 -_080D797C: .4byte 0x02039f34 -_080D7980: .4byte 0x02039f2a -_080D7984: .4byte 0x02039f26 + .pool thumb_func_end sub_80D787C thumb_func_start sub_80D7988 sub_80D7988: @ 80D7988 push {r4,r5,lr} - ldr r4, _080D7A50 + ldr r4, =0x02039f34 movs r0, 0x40 bl malloc_and_clear str r0, [r4] @@ -441973,24 +427404,22 @@ sub_80D7988: @ 80D7988 bl malloc_and_clear ldr r2, [r4] str r0, [r2, 0x3C] - ldr r1, _080D7A54 + ldr r1, =0x0202305c str r0, [r1] - ldr r1, _080D7A58 + ldr r1, =0x02023060 ldr r0, [r2, 0x28] str r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080D7A50: .4byte 0x02039f34 -_080D7A54: .4byte 0x0202305c -_080D7A58: .4byte 0x02023060 + .pool thumb_func_end sub_80D7988 thumb_func_start sub_80D7A5C sub_80D7A5C: @ 80D7A5C push {r4,r5,lr} - ldr r5, _080D7B18 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r0, [r0] bl free @@ -442059,23 +427488,21 @@ sub_80D7A5C: @ 80D7A5C str r4, [r0, 0x3C] bl free str r4, [r5] - ldr r0, _080D7B1C + ldr r0, =0x0202305c str r4, [r0] - ldr r0, _080D7B20 + ldr r0, =0x02023060 str r4, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080D7B18: .4byte 0x02039f34 -_080D7B1C: .4byte 0x0202305c -_080D7B20: .4byte 0x02023060 + .pool thumb_func_end sub_80D7A5C thumb_func_start sub_80D7B24 sub_80D7B24: @ 80D7B24 push {r4-r6,lr} - ldr r0, _080D7B40 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r6, r0, r1 @@ -442088,7 +427515,7 @@ sub_80D7B24: @ 80D7B24 beq _080D7B4E b _080D7C56 .align 2, 0 -_080D7B40: .4byte 0x030022c0 + .pool _080D7B44: cmp r5, 0x2 beq _080D7BDA @@ -442096,11 +427523,11 @@ _080D7B44: beq _080D7C04 b _080D7C56 _080D7B4E: - ldr r0, _080D7BC0 + ldr r0, =0x02039f38 strb r5, [r0] bl sub_80D7988 bl init_uns_table_pokemon_copy - ldr r4, _080D7BC4 + ldr r4, =0x020244d4 ldr r0, [r4] ldr r0, [r0] bl free @@ -442118,7 +427545,7 @@ _080D7B4E: bl sub_80D7678 bl dp12_8087EA4 bl sub_80A1A74 - ldr r2, _080D7BC8 + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -442126,10 +427553,10 @@ _080D7B4E: bl reset_all_obj_data bl clear_tasks bl gpu_pal_allocator_reset - ldr r1, _080D7BCC + ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - ldr r0, _080D7BD0 + ldr r0, =0x02000000 movs r1, 0xD0 lsls r1, 9 adds r0, r1 @@ -442138,17 +427565,13 @@ _080D7B4E: bl sub_80D787C b _080D7BF6 .align 2, 0 -_080D7BC0: .4byte 0x02039f38 -_080D7BC4: .4byte 0x020244d4 -_080D7BC8: .4byte 0x02037fd4 -_080D7BCC: .4byte 0x0300301c -_080D7BD0: .4byte 0x02000000 + .pool _080D7BD4: movs r0, 0x2 strb r0, [r6] b _080D7C56 _080D7BDA: - ldr r4, _080D7C00 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] adds r0, 0x59 @@ -442167,33 +427590,33 @@ _080D7BF6: strb r0, [r6] b _080D7C56 .align 2, 0 -_080D7C00: .4byte 0x02039f34 + .pool _080D7C04: bl sub_80DE224 - ldr r0, _080D7C5C + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r0, _080D7C60 + ldr r0, =0x02022e1a strh r1, [r0] movs r0, 0x2 bl sub_80A2390 - ldr r2, _080D7C64 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] - ldr r0, _080D7C68 + ldr r0, =vblank_cb_battle + 1 bl SetVBlankCallback - ldr r0, _080D7C6C + ldr r0, =sub_80D7C7C + 1 movs r1, 0xA bl AddTask - ldr r1, _080D7C70 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r1, [r1] strb r0, [r1, 0x8] - ldr r0, _080D7C74 + ldr r0, =sub_80D823C + 1 bl set_callback2 - ldr r0, _080D7C78 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x2 ands r0, r1 @@ -442208,14 +427631,7 @@ _080D7C56: pop {r0} bx r0 .align 2, 0 -_080D7C5C: .4byte 0x02022e18 -_080D7C60: .4byte 0x02022e1a -_080D7C64: .4byte 0x02037fd4 -_080D7C68: .4byte vblank_cb_battle + 1 -_080D7C6C: .4byte sub_80D7C7C + 1 -_080D7C70: .4byte 0x02039f34 -_080D7C74: .4byte sub_80D823C + 1 -_080D7C78: .4byte 0x02039f2a + .pool thumb_func_end sub_80D7B24 thumb_func_start sub_80D7C7C @@ -442223,7 +427639,7 @@ sub_80D7C7C: @ 80D7C7C push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _080D7CA8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -442231,21 +427647,19 @@ sub_80D7C7C: @ 80D7C7C lsrs r2, r0, 24 cmp r2, 0 bne _080D7CA2 - ldr r0, _080D7CAC + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 adds r1, r0 strh r2, [r1, 0x8] - ldr r0, _080D7CB0 + ldr r0, =sub_80D7CB4 + 1 str r0, [r1] _080D7CA2: pop {r0} bx r0 .align 2, 0 -_080D7CA8: .4byte 0x02037fd4 -_080D7CAC: .4byte 0x03005e00 -_080D7CB0: .4byte sub_80D7CB4 + 1 + .pool thumb_func_end sub_80D7C7C thumb_func_start sub_80D7CB4 @@ -442253,7 +427667,7 @@ sub_80D7CB4: @ 80D7CB4 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080D7CEC + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -442263,7 +427677,7 @@ sub_80D7CB4: @ 80D7CB4 ands r0, r1 cmp r0, 0 beq _080D7D3A - ldr r2, _080D7CF0 + ldr r2, =0x03005e00 lsls r1, r5, 2 adds r0, r1, r5 lsls r0, 3 @@ -442279,8 +427693,7 @@ sub_80D7CB4: @ 80D7CB4 beq _080D7CFA b _080D7D3A .align 2, 0 -_080D7CEC: .4byte 0x02039f2a -_080D7CF0: .4byte 0x03005e00 + .pool _080D7CF4: cmp r0, 0x2 beq _080D7D28 @@ -442296,7 +427709,7 @@ _080D7D04: cmp r0, 0 beq _080D7D9E bl sub_800ADF8 - ldr r0, _080D7D24 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -442305,7 +427718,7 @@ _080D7D04: strh r0, [r1, 0x8] b _080D7D9E .align 2, 0 -_080D7D24: .4byte 0x03005e00 + .pool _080D7D28: bl sub_800A520 lsls r0, 24 @@ -442316,7 +427729,7 @@ _080D7D28: adds r0, 0x1 strh r0, [r4, 0x8] _080D7D3A: - ldr r2, _080D7D7C + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x7] movs r0, 0x80 ands r0, r1 @@ -442328,7 +427741,7 @@ _080D7D3A: movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] - ldr r0, _080D7D80 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x2 ands r0, r1 @@ -442336,39 +427749,34 @@ _080D7D3A: bne _080D7D62 bl sub_80DBF68 _080D7D62: - ldr r0, _080D7D84 + ldr r0, =sub_80D7DAC + 1 movs r1, 0 bl AddTask - ldr r1, _080D7D88 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 strh r4, [r0, 0x8] - ldr r1, _080D7D8C + ldr r1, =nullsub_41 + 1 str r1, [r0] b _080D7D9E .align 2, 0 -_080D7D7C: .4byte 0x02037fd4 -_080D7D80: .4byte 0x02039f2a -_080D7D84: .4byte sub_80D7DAC + 1 -_080D7D88: .4byte 0x03005e00 -_080D7D8C: .4byte nullsub_41 + 1 + .pool _080D7D90: - ldr r0, _080D7DA4 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _080D7DA8 + ldr r0, =sub_80D80C8 + 1 str r0, [r1] _080D7D9E: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080D7DA4: .4byte 0x03005e00 -_080D7DA8: .4byte sub_80D80C8 + 1 + .pool thumb_func_end sub_80D7CB4 thumb_func_start sub_80D7DAC @@ -442376,33 +427784,31 @@ sub_80D7DAC: @ 80D7DAC push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080D7DC0 - ldr r2, _080D7DC4 + ldr r1, =sub_80FC998 + 1 + ldr r2, =sub_80D7DC8 + 1 bl set_task_function_and_args_14_15 pop {r0} bx r0 .align 2, 0 -_080D7DC0: .4byte sub_80FC998 + 1 -_080D7DC4: .4byte sub_80D7DC8 + 1 + .pool thumb_func_end sub_80D7DAC thumb_func_start sub_80D7DC8 sub_80D7DC8: @ 80D7DC8 lsls r0, 24 lsrs r0, 24 - ldr r2, _080D7DE0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 movs r0, 0x1 strh r0, [r1, 0x8] - ldr r0, _080D7DE4 + ldr r0, =sub_80D7DE8 + 1 str r0, [r1] bx lr .align 2, 0 -_080D7DE0: .4byte 0x03005e00 -_080D7DE4: .4byte sub_80D7DE8 + 1 + .pool thumb_func_end sub_80D7DC8 thumb_func_start sub_80D7DE8 @@ -442410,7 +427816,7 @@ sub_80D7DE8: @ 80D7DE8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _080D7E30 + ldr r5, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -442424,7 +427830,7 @@ sub_80D7DE8: @ 80D7DE8 bl link_get_multiplayer_id adds r0, r4, 0 bl remove_task - ldr r0, _080D7E34 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x8] @@ -442432,10 +427838,10 @@ sub_80D7DE8: @ 80D7DE8 adds r0, r1 lsls r0, 3 adds r0, r5 - ldr r1, _080D7E38 + ldr r1, =sub_80D80C8 + 1 str r1, [r0] - ldr r1, _080D7E3C - ldr r0, _080D7E40 + ldr r1, =0x03005d80 + ldr r0, =0x030060b8 ldr r0, [r0] str r0, [r1] _080D7E2A: @@ -442443,11 +427849,7 @@ _080D7E2A: pop {r0} bx r0 .align 2, 0 -_080D7E30: .4byte 0x03005e00 -_080D7E34: .4byte 0x02039f34 -_080D7E38: .4byte sub_80D80C8 + 1 -_080D7E3C: .4byte 0x03005d80 -_080D7E40: .4byte 0x030060b8 + .pool thumb_func_end sub_80D7DE8 thumb_func_start sub_80D7E44 @@ -442465,12 +427867,12 @@ sub_80D7E44: @ 80D7E44 b _080D80A4 _080D7E5A: lsls r0, 2 - ldr r1, _080D7E64 + ldr r1, =_080D7E68 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D7E64: .4byte _080D7E68 + .pool .align 2, 0 _080D7E68: .4byte _080D7E84 @@ -442481,7 +427883,7 @@ _080D7E68: .4byte _080D7F7C .4byte _080D8004 _080D7E84: - ldr r2, _080D7EBC + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 @@ -442494,39 +427896,37 @@ _080D7E84: adds r2, r4, 0 movs r3, 0x1 bl dma3_transfer_queue_add_fill - ldr r1, _080D7EC0 + ldr r1, =0x06008000 movs r0, 0 adds r2, r4, 0 movs r3, 0x1 bl dma3_transfer_queue_add_fill - ldr r1, _080D7EC4 + ldr r1, =0x06010000 movs r0, 0 adds r2, r4, 0 movs r3, 0x1 bl dma3_transfer_queue_add_fill b _080D80AE .align 2, 0 -_080D7EBC: .4byte 0x02037fd4 -_080D7EC0: .4byte 0x06008000 -_080D7EC4: .4byte 0x06010000 + .pool _080D7EC8: - ldr r0, _080D7ED4 + ldr r0, =0x08c17ab0 movs r1, 0xC0 lsls r1, 19 bl call_LZZUnCompVram b _080D80AE .align 2, 0 -_080D7ED4: .4byte 0x08c17ab0 + .pool _080D7ED8: - ldr r0, _080D7F14 - ldr r4, _080D7F18 + ldr r0, =0x08c1850c + ldr r4, =0x06002000 adds r1, r4, 0 bl call_LZZUnCompVram - ldr r3, _080D7F1C + ldr r3, =0x02018000 movs r5, 0x80 lsls r5, 6 - ldr r1, _080D7F20 - ldr r6, _080D7F24 + ldr r1, =0x040000d4 + ldr r6, =0x84000400 movs r2, 0x80 lsls r2, 5 movs r7, 0x84 @@ -442549,13 +427949,9 @@ _080D7EF4: ldr r0, [r1, 0x8] b _080D80AE .align 2, 0 -_080D7F14: .4byte 0x08c1850c -_080D7F18: .4byte 0x06002000 -_080D7F1C: .4byte 0x02018000 -_080D7F20: .4byte 0x040000d4 -_080D7F24: .4byte 0x84000400 + .pool _080D7F28: - ldr r1, _080D7F3C + ldr r1, =0x08c16fa8 movs r0, 0x3 movs r2, 0 movs r3, 0 @@ -442564,50 +427960,46 @@ _080D7F28: bl gpu_copy_wram_bg_tilemap_to_vram b _080D80AE .align 2, 0 -_080D7F3C: .4byte 0x08c16fa8 + .pool _080D7F40: - ldr r1, _080D7F68 + ldr r1, =0x08c17170 movs r0, 0x2 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _080D7F6C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x2C] - ldr r2, _080D7F70 - ldr r0, _080D7F74 + ldr r2, =0x0201aa04 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _080D7F78 + ldr r1, =0x84000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] b _080D80AE .align 2, 0 -_080D7F68: .4byte 0x08c17170 -_080D7F6C: .4byte 0x02039f34 -_080D7F70: .4byte 0x0201aa04 -_080D7F74: .4byte 0x040000d4 -_080D7F78: .4byte 0x84000200 + .pool _080D7F7C: - ldr r0, _080D7FE4 + ldr r0, =0x08c16e90 movs r2, 0x80 lsls r2, 2 movs r1, 0 bl decompress_palette - ldr r5, _080D7FE8 - ldr r6, _080D7FEC + ldr r5, =0x02037814 + ldr r6, =0x04000008 adds r0, r5, 0 mov r1, sp adds r2, r6, 0 bl CpuSet - ldr r0, _080D7FF0 + ldr r0, =0x02039f25 mov r9, r0 ldrb r0, [r0] adds r0, 0x5 lsls r0, 5 - ldr r1, _080D7FF4 + ldr r1, =0xffffff00 adds r1, r5 mov r8, r1 add r0, r8 @@ -442627,31 +428019,24 @@ _080D7F7C: mov r0, sp adds r2, r6, 0 bl CpuSet - ldr r1, _080D7FF8 - ldr r0, _080D7FFC + ldr r1, =0x0201a004 + ldr r0, =0x040000d4 mov r2, r8 str r2, [r0] str r1, [r0, 0x4] - ldr r1, _080D8000 + ldr r1, =0x84000080 str r1, [r0, 0x8] ldr r0, [r0, 0x8] bl sub_80D782C b _080D80AE .align 2, 0 -_080D7FE4: .4byte 0x08c16e90 -_080D7FE8: .4byte 0x02037814 -_080D7FEC: .4byte 0x04000008 -_080D7FF0: .4byte 0x02039f25 -_080D7FF4: .4byte 0xffffff00 -_080D7FF8: .4byte 0x0201a004 -_080D7FFC: .4byte 0x040000d4 -_080D8000: .4byte 0x84000080 + .pool _080D8004: bl sub_80DD04C bl sub_80DBF90 bl sub_80DB2BC bl sub_80DB120 - ldr r1, _080D808C + ldr r1, =0x02039f34 ldr r1, [r1] ldr r1, [r1] movs r4, 0 @@ -442661,7 +428046,7 @@ _080D8004: bl sub_80DC594 bl sub_80DC5E8 bl sub_80DC7EC - ldr r1, _080D8090 + ldr r1, =0x02024076 strb r4, [r1] movs r0, 0x1 strb r0, [r1, 0x1] @@ -442669,14 +428054,14 @@ _080D8004: strb r3, [r1, 0x2] movs r2, 0x2 strb r2, [r1, 0x3] - ldr r0, _080D8094 + ldr r0, =0x02022fec str r4, [r0] - ldr r4, _080D8098 + ldr r4, =0x0202420b strb r2, [r4] - ldr r0, _080D809C + ldr r0, =0x0202420c strb r3, [r0] bl sub_80DB0C4 - ldr r2, _080D80A0 + ldr r2, =0x020241e4 ldrb r1, [r4] adds r1, r2 strb r0, [r1] @@ -442697,12 +428082,7 @@ _080D8004: bl gpu_sync_bg_show b _080D80AE .align 2, 0 -_080D808C: .4byte 0x02039f34 -_080D8090: .4byte 0x02024076 -_080D8094: .4byte 0x02022fec -_080D8098: .4byte 0x0202420b -_080D809C: .4byte 0x0202420c -_080D80A0: .4byte 0x020241e4 + .pool _080D80A4: movs r0, 0 mov r1, r10 @@ -442731,7 +428111,7 @@ sub_80D80C8: @ 80D80C8 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _080D80FC + ldr r1, =0x02037fd4 ldrb r2, [r1, 0x8] movs r0, 0x7F ands r0, r2 @@ -442743,22 +428123,20 @@ sub_80D80C8: @ 80D80C8 lsrs r2, r0, 24 cmp r2, 0 bne _080D80F8 - ldr r0, _080D8100 + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 adds r1, r0 strh r2, [r1, 0x8] strh r2, [r1, 0xA] - ldr r0, _080D8104 + ldr r0, =sub_80D8108 + 1 str r0, [r1] _080D80F8: pop {r0} bx r0 .align 2, 0 -_080D80FC: .4byte 0x02037fd4 -_080D8100: .4byte 0x03005e00 -_080D8104: .4byte sub_80D8108 + 1 + .pool thumb_func_end sub_80D80C8 thumb_func_start sub_80D8108 @@ -442767,7 +428145,7 @@ sub_80D8108: @ 80D8108 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080D8130 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -442778,13 +428156,12 @@ sub_80D8108: @ 80D8108 cmp r0, 0x4 bhi _080D8208 lsls r0, 2 - ldr r1, _080D8134 + ldr r1, =_080D8138 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D8130: .4byte 0x03005e00 -_080D8134: .4byte _080D8138 + .pool .align 2, 0 _080D8138: .4byte _080D814C @@ -442814,7 +428191,7 @@ _080D814C: strh r0, [r4, 0x8] b _080D822C _080D8176: - ldr r1, _080D8190 + ldr r1, =0x02022e1a ldrh r0, [r1] adds r0, 0x7 strh r0, [r1] @@ -442828,10 +428205,10 @@ _080D8176: adds r0, r2 b _080D81FA .align 2, 0 -_080D8190: .4byte 0x02022e1a + .pool _080D8194: bl sub_80DE350 - ldr r0, _080D81AC + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -442841,7 +428218,7 @@ _080D8194: strh r0, [r1, 0x8] b _080D822C .align 2, 0 -_080D81AC: .4byte 0x03005e00 + .pool _080D81B0: movs r0, 0x8 bl lcd_io_get @@ -442870,7 +428247,7 @@ _080D81B0: movs r0, 0xC bl lcd_io_set bl sub_80DDB0C - ldr r1, _080D8204 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -442881,9 +428258,9 @@ _080D81FA: strh r1, [r0, 0x8] b _080D822C .align 2, 0 -_080D8204: .4byte 0x03005e00 + .pool _080D8208: - ldr r0, _080D8234 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x6] @@ -442899,7 +428276,7 @@ _080D8208: adds r0, r2 strh r1, [r0, 0x8] strh r1, [r0, 0xA] - ldr r1, _080D8238 + ldr r1, =sub_80D833C + 1 str r1, [r0] _080D822C: add sp, 0x4 @@ -442907,8 +428284,7 @@ _080D822C: pop {r0} bx r0 .align 2, 0 -_080D8234: .4byte 0x02039f34 -_080D8238: .4byte sub_80D833C + 1 + .pool thumb_func_end sub_80D8108 thumb_func_start sub_80D823C @@ -442920,7 +428296,7 @@ sub_80D823C: @ 80D823C bl fade_and_return_progress_probably movs r4, 0 _080D8250: - ldr r5, _080D8278 + ldr r5, =0x02039f38 ldrb r0, [r5] asrs r0, r4 movs r1, 0x1 @@ -442940,57 +428316,57 @@ _080D8266: pop {r0} bx r0 .align 2, 0 -_080D8278: .4byte 0x02039f38 + .pool thumb_func_end sub_80D823C thumb_func_start vblank_cb_battle vblank_cb_battle: @ 80D827C push {lr} - ldr r0, _080D830C + ldr r0, =0x02022e14 ldrh r1, [r0] movs r0, 0x10 bl lcd_io_set - ldr r0, _080D8310 + ldr r0, =0x02022e16 ldrh r1, [r0] movs r0, 0x12 bl lcd_io_set - ldr r0, _080D8314 + ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 bl lcd_io_set - ldr r0, _080D8318 + ldr r0, =0x02022e1a ldrh r1, [r0] movs r0, 0x16 bl lcd_io_set - ldr r0, _080D831C + ldr r0, =0x02022e1c ldrh r1, [r0] movs r0, 0x18 bl lcd_io_set - ldr r0, _080D8320 + ldr r0, =0x02022e1e ldrh r1, [r0] movs r0, 0x1A bl lcd_io_set - ldr r0, _080D8324 + ldr r0, =0x02022e20 ldrh r1, [r0] movs r0, 0x1C bl lcd_io_set - ldr r0, _080D8328 + ldr r0, =0x02022e22 ldrh r1, [r0] movs r0, 0x1E bl lcd_io_set - ldr r0, _080D832C + ldr r0, =0x02022e24 ldrh r1, [r0] movs r0, 0x40 bl lcd_io_set - ldr r0, _080D8330 + ldr r0, =0x02022e26 ldrh r1, [r0] movs r0, 0x44 bl lcd_io_set - ldr r0, _080D8334 + ldr r0, =0x02022e28 ldrh r1, [r0] movs r0, 0x42 bl lcd_io_set - ldr r0, _080D8338 + ldr r0, =0x02022e2a ldrh r1, [r0] movs r0, 0x46 bl lcd_io_set @@ -443001,18 +428377,7 @@ vblank_cb_battle: @ 80D827C pop {r0} bx r0 .align 2, 0 -_080D830C: .4byte 0x02022e14 -_080D8310: .4byte 0x02022e16 -_080D8314: .4byte 0x02022e18 -_080D8318: .4byte 0x02022e1a -_080D831C: .4byte 0x02022e1c -_080D8320: .4byte 0x02022e1e -_080D8324: .4byte 0x02022e20 -_080D8328: .4byte 0x02022e22 -_080D832C: .4byte 0x02022e24 -_080D8330: .4byte 0x02022e26 -_080D8334: .4byte 0x02022e28 -_080D8338: .4byte 0x02022e2a + .pool thumb_func_end vblank_cb_battle thumb_func_start sub_80D833C @@ -443020,7 +428385,7 @@ sub_80D833C: @ 80D833C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080D839C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -443029,21 +428394,21 @@ sub_80D833C: @ 80D833C ldrsh r1, [r4, r0] cmp r1, 0 bne _080D840C - ldr r0, _080D83A0 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r0, _080D83A4 + ldr r0, =0x02022e1e strh r1, [r0] bl sub_80DCD48 - ldr r1, _080D83A8 - ldr r2, _080D83AC - ldr r0, _080D83B0 + ldr r1, =0x02037714 + ldr r2, =0x0201a204 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _080D83B4 + ldr r1, =0x84000100 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - ldr r0, _080D83B8 - ldr r1, _080D83BC + ldr r0, =0x02021cc4 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r1, [r1] ldrb r1, [r1, 0x1] @@ -443051,43 +428416,32 @@ sub_80D833C: @ 80D833C movs r2, 0 movs r3, 0x1 bl decimal_int_to_string - ldr r0, _080D83C0 + ldr r0, =0x02039f25 ldrb r0, [r0] bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 bne _080D83CC - ldr r0, _080D83C4 - ldr r1, _080D83C8 + ldr r0, =0x02022e2c + ldr r1, =0x0827d507 bl gf_strcpy b _080D83D4 .align 2, 0 -_080D839C: .4byte 0x03005e00 -_080D83A0: .4byte 0x02022e16 -_080D83A4: .4byte 0x02022e1e -_080D83A8: .4byte 0x02037714 -_080D83AC: .4byte 0x0201a204 -_080D83B0: .4byte 0x040000d4 -_080D83B4: .4byte 0x84000100 -_080D83B8: .4byte 0x02021cc4 -_080D83BC: .4byte 0x02039f34 -_080D83C0: .4byte 0x02039f25 -_080D83C4: .4byte 0x02022e2c -_080D83C8: .4byte 0x0827d507 + .pool _080D83CC: - ldr r0, _080D83FC - ldr r1, _080D8400 + ldr r0, =0x02022e2c + ldr r1, =0x0827d531 bl gf_strcpy _080D83D4: bl sub_80DB89C - ldr r4, _080D8404 - ldr r1, _080D83FC + ldr r4, =0x02021fc4 + ldr r1, =0x02022e2c adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_80DEC30 - ldr r1, _080D8408 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -443097,23 +428451,20 @@ _080D83D4: strh r1, [r0, 0x8] b _080D841A .align 2, 0 -_080D83FC: .4byte 0x02022e2c -_080D8400: .4byte 0x0827d531 -_080D8404: .4byte 0x02021fc4 -_080D8408: .4byte 0x03005e00 + .pool _080D840C: bl sub_80DED4C cmp r0, 0 bne _080D841A strh r0, [r4, 0x8] - ldr r0, _080D8420 + ldr r0, =sub_80D8424 + 1 str r0, [r4] _080D841A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080D8420: .4byte sub_80D8424 + 1 + .pool thumb_func_end sub_80D833C thumb_func_start sub_80D8424 @@ -443122,7 +428473,7 @@ sub_80D8424: @ 80D8424 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, _080D8464 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -443133,7 +428484,7 @@ sub_80D8424: @ 80D8424 _080D843C: movs r0, 0x5 bl audio_play - ldr r0, _080D8468 + ldr r0, =0x02039f25 ldrb r0, [r0] bl sub_80DBCA8 lsls r0, 24 @@ -443141,25 +428492,22 @@ _080D843C: bne _080D8474 movs r0, 0x1 bl sub_80DC490 - ldr r0, _080D846C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080D8470 + ldr r0, =sub_80D8490 + 1 b _080D8480 .align 2, 0 -_080D8464: .4byte 0x030022c0 -_080D8468: .4byte 0x02039f25 -_080D846C: .4byte 0x03005e00 -_080D8470: .4byte sub_80D8490 + 1 + .pool _080D8474: - ldr r0, _080D8488 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _080D848C + ldr r0, =sub_80D8894 + 1 _080D8480: str r0, [r1] _080D8482: @@ -443167,8 +428515,7 @@ _080D8482: pop {r0} bx r0 .align 2, 0 -_080D8488: .4byte 0x03005e00 -_080D848C: .4byte sub_80D8894 + 1 + .pool thumb_func_end sub_80D8424 thumb_func_start sub_80D8490 @@ -443182,17 +428529,17 @@ sub_80D8490: @ 80D8490 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _080D8524 + ldr r0, =0x02022e16 movs r1, 0xA0 strh r1, [r0] - ldr r0, _080D8528 + ldr r0, =0x02022e1e strh r1, [r0] movs r6, 0 - ldr r0, _080D852C + ldr r0, =0x02039f25 mov r8, r0 - ldr r2, _080D8530 + ldr r2, =0x02039e1e mov r10, r2 - ldr r7, _080D8534 + ldr r7, =0x02039f34 _080D84B8: lsls r1, r6, 1 mov r0, r8 @@ -443244,15 +428591,10 @@ _080D84B8: cmp r0, 0 beq _080D853C add r0, sp, 0x4 - ldr r1, _080D8538 + ldr r1, =0x085ed1a0 b _080D8566 .align 2, 0 -_080D8524: .4byte 0x02022e16 -_080D8528: .4byte 0x02022e1e -_080D852C: .4byte 0x02039f25 -_080D8530: .4byte 0x02039e1e -_080D8534: .4byte 0x02039f34 -_080D8538: .4byte 0x085ed1a0 + .pool _080D853C: cmp r4, 0 beq _080D856C @@ -443267,14 +428609,14 @@ _080D853C: ldrh r0, [r0, 0x8] cmp r0, r4 bne _080D856C - ldr r0, _080D85F0 + ldr r0, =0x0858c2b4 lsls r1, r4, 3 adds r1, r0 ldrb r0, [r1] cmp r0, 0x3 beq _080D856C add r0, sp, 0x4 - ldr r1, _080D85F4 + ldr r1, =0x085ed1a7 _080D8566: bl gf_strcpy adds r5, r0, 0 @@ -443282,7 +428624,7 @@ _080D856C: movs r0, 0xD adds r1, r4, 0 muls r1, r0 - ldr r0, _080D85F8 + ldr r0, =0x0831977c adds r1, r0 adds r0, r5, 0 bl gf_strcpy @@ -443303,19 +428645,19 @@ _080D856C: lsrs r6, r0, 24 cmp r6, 0x3 bls _080D84B8 - ldr r4, _080D85FC + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0] lsls r0, 24 asrs r0, 24 bl sub_80D880C - ldr r2, _080D8600 + ldr r2, =0x02039e00 ldr r0, [r4] ldr r0, [r0] ldrb r1, [r0] lsls r1, 1 - ldr r0, _080D8604 + ldr r0, =0x02039f25 ldrb r0, [r0] lsls r0, 6 adds r1, r0 @@ -443323,13 +428665,13 @@ _080D856C: adds r1, r2 ldrh r0, [r1] bl prints_contest_move_description - ldr r1, _080D8608 + ldr r1, =0x03005e00 mov r2, r9 lsls r0, r2, 2 add r0, r9 lsls r0, 3 adds r0, r1 - ldr r1, _080D860C + ldr r1, =sub_80D8610 + 1 str r1, [r0] add sp, 0x24 pop {r3-r5} @@ -443340,14 +428682,7 @@ _080D856C: pop {r0} bx r0 .align 2, 0 -_080D85F0: .4byte 0x0858c2b4 -_080D85F4: .4byte 0x085ed1a7 -_080D85F8: .4byte 0x0831977c -_080D85FC: .4byte 0x02039f34 -_080D8600: .4byte 0x02039e00 -_080D8604: .4byte 0x02039f25 -_080D8608: .4byte 0x03005e00 -_080D860C: .4byte sub_80D8610 + 1 + .pool thumb_func_end sub_80D8490 thumb_func_start sub_80D8610 @@ -443356,9 +428691,9 @@ sub_80D8610: @ 80D8610 lsls r0, 24 lsrs r7, r0, 24 movs r6, 0 - ldr r3, _080D865C - ldr r1, _080D8660 - ldr r0, _080D8664 + ldr r3, =0x030022c0 + ldr r1, =0x02039e00 + ldr r0, =0x02039f25 ldrb r0, [r0] lsls r0, 6 adds r1, 0x1E @@ -443383,20 +428718,16 @@ _080D8634: beq _080D8670 movs r0, 0x5 bl audio_play - ldr r0, _080D8668 + ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 lsls r1, 3 adds r1, r0 - ldr r0, _080D866C + ldr r0, =sub_80D8894 + 1 str r0, [r1] b _080D87FA .align 2, 0 -_080D865C: .4byte 0x030022c0 -_080D8660: .4byte 0x02039e00 -_080D8664: .4byte 0x02039f25 -_080D8668: .4byte 0x03005e00 -_080D866C: .4byte sub_80D8894 + 1 + .pool _080D8670: ldrh r0, [r3, 0x30] cmp r0, 0x20 @@ -443421,8 +428752,8 @@ _080D868E: bl audio_play movs r0, 0 bl sub_80DC490 - ldr r0, _080D86C8 - ldr r1, _080D86CC + ldr r0, =0x02021cc4 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r1, [r1] ldrb r1, [r1, 0x1] @@ -443430,58 +428761,48 @@ _080D868E: movs r2, 0 movs r3, 0x1 bl decimal_int_to_string - ldr r0, _080D86D0 + ldr r0, =0x02039f25 ldrb r0, [r0] bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 bne _080D86DC - ldr r0, _080D86D4 - ldr r1, _080D86D8 + ldr r0, =0x02022e2c + ldr r1, =0x0827d507 bl gf_strcpy b _080D86E4 .align 2, 0 -_080D86C8: .4byte 0x02021cc4 -_080D86CC: .4byte 0x02039f34 -_080D86D0: .4byte 0x02039f25 -_080D86D4: .4byte 0x02022e2c -_080D86D8: .4byte 0x0827d507 + .pool _080D86DC: - ldr r0, _080D8714 - ldr r1, _080D8718 + ldr r0, =0x02022e2c + ldr r1, =0x0827d531 bl gf_strcpy _080D86E4: bl sub_80DB89C - ldr r4, _080D871C - ldr r1, _080D8714 + ldr r4, =0x02021fc4 + ldr r1, =0x02022e2c adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0 bl sub_80DEC30 - ldr r0, _080D8720 + ldr r0, =0x02022e16 movs r1, 0 strh r1, [r0] - ldr r0, _080D8724 + ldr r0, =0x02022e1e strh r1, [r0] - ldr r1, _080D8728 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _080D872C + ldr r1, =sub_80D8424 + 1 str r1, [r0] b _080D87FA .align 2, 0 -_080D8714: .4byte 0x02022e2c -_080D8718: .4byte 0x0827d531 -_080D871C: .4byte 0x02021fc4 -_080D8720: .4byte 0x02022e16 -_080D8724: .4byte 0x02022e1e -_080D8728: .4byte 0x03005e00 -_080D872C: .4byte sub_80D8424 + 1 + .pool _080D8730: - ldr r4, _080D8750 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0] @@ -443496,24 +428817,24 @@ _080D8730: subs r0, r6, 0x1 b _080D8756 .align 2, 0 -_080D8750: .4byte 0x02039f34 + .pool _080D8754: subs r0, 0x1 _080D8756: strb r0, [r1] - ldr r4, _080D8790 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0] lsls r0, 24 asrs r0, 24 bl sub_80D880C - ldr r2, _080D8794 + ldr r2, =0x02039e00 ldr r0, [r4] ldr r0, [r0] ldrb r1, [r0] lsls r1, 1 - ldr r0, _080D8798 + ldr r0, =0x02039f25 ldrb r0, [r0] lsls r0, 6 adds r1, r0 @@ -443527,11 +428848,9 @@ _080D8756: bl audio_play b _080D87FA .align 2, 0 -_080D8790: .4byte 0x02039f34 -_080D8794: .4byte 0x02039e00 -_080D8798: .4byte 0x02039f25 + .pool _080D879C: - ldr r4, _080D87BC + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0] @@ -443547,24 +428866,24 @@ _080D879C: strb r5, [r1] b _080D87C4 .align 2, 0 -_080D87BC: .4byte 0x02039f34 + .pool _080D87C0: adds r0, r2, 0x1 strb r0, [r1] _080D87C4: - ldr r4, _080D8800 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] ldrb r0, [r0] lsls r0, 24 asrs r0, 24 bl sub_80D880C - ldr r2, _080D8804 + ldr r2, =0x02039e00 ldr r0, [r4] ldr r0, [r0] ldrb r1, [r0] lsls r1, 1 - ldr r0, _080D8808 + ldr r0, =0x02039f25 ldrb r0, [r0] lsls r0, 6 adds r1, r0 @@ -443581,9 +428900,7 @@ _080D87FA: pop {r0} bx r0 .align 2, 0 -_080D8800: .4byte 0x02039f34 -_080D8804: .4byte 0x02039e00 -_080D8808: .4byte 0x02039f25 + .pool thumb_func_end sub_80D8610 thumb_func_start sub_80D880C @@ -443662,16 +428979,16 @@ sub_80D8894: @ 80D8894 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080D88F0 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080D890C - ldr r4, _080D88F4 + ldr r4, =0x02039f25 ldrb r0, [r4] bl sub_80DB8B8 - ldr r1, _080D88F8 + ldr r1, =0x02039f34 ldr r1, [r1] ldrb r2, [r4] ldr r3, [r1, 0x4] @@ -443680,50 +428997,43 @@ sub_80D8894: @ 80D8894 lsls r1, 2 adds r1, r3 strh r0, [r1, 0x6] - ldr r4, _080D88FC + ldr r4, =sub_80FC9F8 + 1 adds r0, r4, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080D8900 + ldr r2, =sub_80D892C + 1 adds r1, r4, 0 bl set_task_function_and_args_14_15 - ldr r1, _080D8904 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _080D8908 + ldr r1, =nullsub_41 + 1 str r1, [r0] bl sub_80DBF68 movs r0, 0 bl sub_80DC490 b _080D891E .align 2, 0 -_080D88F0: .4byte 0x02039f2a -_080D88F4: .4byte 0x02039f25 -_080D88F8: .4byte 0x02039f34 -_080D88FC: .4byte sub_80FC9F8 + 1 -_080D8900: .4byte sub_80D892C + 1 -_080D8904: .4byte 0x03005e00 -_080D8908: .4byte nullsub_41 + 1 + .pool _080D890C: bl sub_80DB918 - ldr r0, _080D8924 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _080D8928 + ldr r0, =sub_80D895C + 1 str r0, [r1] _080D891E: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080D8924: .4byte 0x03005e00 -_080D8928: .4byte sub_80D895C + 1 + .pool thumb_func_end sub_80D8894 thumb_func_start sub_80D892C @@ -443732,8 +429042,8 @@ sub_80D892C: @ 80D892C lsls r0, 24 lsrs r0, 24 bl remove_task - ldr r2, _080D8950 - ldr r0, _080D8954 + ldr r2, =0x03005e00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x8] @@ -443741,14 +429051,12 @@ sub_80D892C: @ 80D892C adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _080D8958 + ldr r1, =sub_80D895C + 1 str r1, [r0] pop {r0} bx r0 .align 2, 0 -_080D8950: .4byte 0x03005e00 -_080D8954: .4byte 0x02039f34 -_080D8958: .4byte sub_80D895C + 1 + .pool thumb_func_end sub_80D892C thumb_func_start sub_80D895C @@ -443757,10 +429065,10 @@ sub_80D895C: @ 80D895C lsls r0, 24 lsrs r7, r0, 24 bl sub_80DB89C - ldr r0, _080D89E4 + ldr r0, =0x02022e16 movs r1, 0 strh r1, [r0] - ldr r0, _080D89E8 + ldr r0, =0x02022e1e strh r1, [r0] movs r0, 0 bl sub_80DC490 @@ -443785,11 +429093,11 @@ _080D897C: ble _080D897C movs r0, 0 bl sub_80DED60 - ldr r1, _080D89EC - ldr r0, _080D89F0 + ldr r1, =0x02037b14 + ldr r0, =0x0201a604 movs r2, 0x80 lsls r2, 3 - ldr r4, _080D89F4 + ldr r4, =0x040000d4 str r1, [r4] str r0, [r4, 0x4] lsrs r1, r2, 2 @@ -443798,11 +429106,11 @@ _080D897C: orrs r1, r3 str r1, [r4, 0x8] ldr r1, [r4, 0x8] - ldr r1, _080D89F8 + ldr r1, =0xfffffc00 adds r0, r1 movs r1, 0 bl gpu_pal_apply - ldr r1, _080D89FC + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -443810,20 +429118,13 @@ _080D897C: movs r1, 0 strh r1, [r0, 0x8] strh r1, [r0, 0xA] - ldr r1, _080D8A00 + ldr r1, =sub_80D8A04 + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080D89E4: .4byte 0x02022e16 -_080D89E8: .4byte 0x02022e1e -_080D89EC: .4byte 0x02037b14 -_080D89F0: .4byte 0x0201a604 -_080D89F4: .4byte 0x040000d4 -_080D89F8: .4byte 0xfffffc00 -_080D89FC: .4byte 0x03005e00 -_080D8A00: .4byte sub_80D8A04 + 1 + .pool thumb_func_end sub_80D895C thumb_func_start sub_80D8A04 @@ -443831,7 +429132,7 @@ sub_80D8A04: @ 80D8A04 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080D8A48 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -443855,15 +429156,14 @@ sub_80D8A04: @ 80D8A04 bl sub_80DDBE8 movs r0, 0x1 bl sub_80DE69C - ldr r0, _080D8A4C + ldr r0, =sub_80D8A50 + 1 str r0, [r4] _080D8A42: pop {r4} pop {r0} bx r0 .align 2, 0 -_080D8A48: .4byte 0x03005e00 -_080D8A4C: .4byte sub_80D8A50 + 1 + .pool thumb_func_end sub_80D8A04 thumb_func_start sub_80D8A50 @@ -443871,7 +429171,7 @@ sub_80D8A50: @ 80D8A50 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080D8A7C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrh r1, [r0, 0x6] @@ -443880,20 +429180,18 @@ sub_80D8A50: @ 80D8A50 ands r0, r1 cmp r0, 0 bne _080D8A76 - ldr r0, _080D8A80 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _080D8A84 + ldr r0, =sub_80D8A88 + 1 str r0, [r1] _080D8A76: pop {r0} bx r0 .align 2, 0 -_080D8A7C: .4byte 0x02039f34 -_080D8A80: .4byte 0x03005e00 -_080D8A84: .4byte sub_80D8A88 + 1 + .pool thumb_func_end sub_80D8A50 thumb_func_start sub_80D8A88 @@ -443901,7 +429199,7 @@ sub_80D8A88: @ 80D8A88 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080D8B20 + ldr r0, =0x03005e00 lsls r3, r6, 2 adds r1, r3, r6 lsls r1, 3 @@ -443913,17 +429211,17 @@ sub_80D8A88: @ 80D8A88 asrs r0, 16 cmp r0, 0x13 ble _080D8B18 - ldr r2, _080D8B24 + ldr r2, =0x02039f34 ldr r0, [r2] ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x10] ldr r0, [r2] ldr r1, [r0] - ldr r0, _080D8B28 + ldr r0, =0x03005d80 ldr r0, [r0] str r0, [r1, 0x18] - ldr r0, _080D8B2C + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -443935,7 +429233,7 @@ sub_80D8A88: @ 80D8A88 cmp r0, 0 beq _080D8B08 movs r4, 0 - ldr r1, _080D8B30 + ldr r1, =0x02039f30 ldrb r0, [r1] cmp r0, 0x3 bgt _080D8B08 @@ -443946,7 +429244,7 @@ _080D8ADE: lsls r0, 24 lsrs r0, 24 bl sub_80DB8B8 - ldr r1, _080D8B24 + ldr r1, =0x02039f34 ldr r1, [r1] ldrb r2, [r5] adds r2, r4 @@ -443962,25 +429260,20 @@ _080D8ADE: cmp r0, 0x3 ble _080D8ADE _080D8B08: - ldr r1, _080D8B20 + ldr r1, =0x03005e00 adds r0, r7, r6 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0x8] - ldr r1, _080D8B34 + ldr r1, =sub_80D8B38 + 1 str r1, [r0] _080D8B18: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080D8B20: .4byte 0x03005e00 -_080D8B24: .4byte 0x02039f34 -_080D8B28: .4byte 0x03005d80 -_080D8B2C: .4byte 0x02039f2a -_080D8B30: .4byte 0x02039f30 -_080D8B34: .4byte sub_80D8B38 + 1 + .pool thumb_func_end sub_80D8A88 thumb_func_start sub_80D8B38 @@ -443994,11 +429287,11 @@ sub_80D8B38: @ 80D8B38 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r2, _080D8B78 + ldr r2, =0x02039f34 ldr r0, [r2] ldr r0, [r0] ldrb r6, [r0, 0x11] - ldr r1, _080D8B7C + ldr r1, =0x03005e00 mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -444013,14 +429306,12 @@ sub_80D8B38: @ 80D8B38 bl _080DA100 _080D8B6E: lsls r0, 2 - ldr r1, _080D8B80 + ldr r1, =_080D8B84 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D8B78: .4byte 0x02039f34 -_080D8B7C: .4byte 0x03005e00 -_080D8B80: .4byte _080D8B84 + .pool .align 2, 0 _080D8B84: .4byte _080D8C74 @@ -444086,7 +429377,7 @@ _080D8B84: _080D8C74: bl sub_80DCD48 movs r7, 0 - ldr r0, _080D8D00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0] ldr r0, [r0, 0x8] @@ -444105,14 +429396,14 @@ _080D8C92: cmp r1, r0 bne _080D8C92 _080D8C9C: - ldr r4, _080D8D00 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] strb r7, [r0, 0x11] ldr r0, [r4] ldr r2, [r0] ldrb r6, [r2, 0x11] - ldr r0, _080D8D04 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r5, 0x1 adds r0, r5, 0 @@ -444132,17 +429423,17 @@ _080D8C9C: ldrb r0, [r0, 0x11] bl sub_80DD080 _080D8CD4: - ldr r4, _080D8D08 + ldr r4, =sub_80FCC88 + 1 adds r0, r4, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080D8D0C + ldr r2, =sub_80DA110 + 1 adds r1, r4, 0 bl set_task_function_and_args_14_15 bl sub_80DBF68 - ldr r1, _080D8D10 + ldr r1, =0x03005e00 mov r0, r10 add r0, r8 lsls r0, 3 @@ -444150,15 +429441,11 @@ _080D8CD4: strh r5, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D8D00: .4byte 0x02039f34 -_080D8D04: .4byte 0x02039f2a -_080D8D08: .4byte sub_80FCC88 + 1 -_080D8D0C: .4byte sub_80DA110 + 1 -_080D8D10: .4byte 0x03005e00 + .pool _080D8D14: adds r0, r6, 0 bl sub_80DD080 - ldr r0, _080D8D2C + ldr r0, =0x03005e00 mov r1, r10 add r1, r8 lsls r1, 3 @@ -444167,7 +429454,7 @@ _080D8D14: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D8D2C: .4byte 0x03005e00 + .pool _080D8D30: mov r3, r9 ldr r0, [r3] @@ -444191,7 +429478,7 @@ _080D8D56: adds r0, r6, 0 bl sub_80DF080 bl sub_80DF750 - ldr r0, _080D8D9C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r6, 3 @@ -444211,7 +429498,7 @@ _080D8D56: cmp r6, 0 beq _080D8DA4 _080D8D86: - ldr r0, _080D8DA0 + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 add r1, r8 @@ -444221,11 +429508,10 @@ _080D8D86: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D8D9C: .4byte 0x02039f34 -_080D8DA0: .4byte 0x03005e00 + .pool _080D8DA4: bl sub_80DB89C - ldr r0, _080D8DC0 + ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -444236,12 +429522,12 @@ _080D8DA4: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D8DC0: .4byte 0x03005e00 + .pool _080D8DC4: mov r4, r8 lsls r4, 2 mov r10, r4 - ldr r1, _080D8E60 + ldr r1, =0x020244e4 movs r2, 0 adds r0, r1, 0x3 _080D8DD0: @@ -444260,7 +429546,7 @@ _080D8DD0: ldr r0, [r0] ldrb r0, [r0, 0x11] bl sub_80DE9DC - ldr r4, _080D8E64 + ldr r4, =0x02039e00 ldr r0, [r5] ldr r0, [r0] ldrb r3, [r0, 0x11] @@ -444277,7 +429563,7 @@ _080D8DD0: bl sub_80DB174 lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _080D8E68 + ldr r2, =0x02020630 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -444286,16 +429572,16 @@ _080D8DD0: strh r1, [r3, 0x24] adds r2, 0x1C adds r0, r2 - ldr r1, _080D8E6C + ldr r1, =sub_80DA134 + 1 str r1, [r0] - ldr r0, _080D8E70 + ldr r0, =0x03005e00 mov r4, r10 add r4, r8 lsls r4, 3 adds r4, r0 strh r5, [r4, 0xC] - ldr r1, _080D8E74 - ldr r0, _080D8E78 + ldr r1, =0x020241e4 + ldr r0, =0x0202420b ldrb r0, [r0] adds r0, r1 strb r5, [r0] @@ -444311,13 +429597,7 @@ _080D8DD0: strh r7, [r4, 0x8] bl _080DA100 .align 2, 0 -_080D8E60: .4byte 0x020244e4 -_080D8E64: .4byte 0x02039e00 -_080D8E68: .4byte 0x02020630 -_080D8E6C: .4byte sub_80DA134 + 1 -_080D8E70: .4byte 0x03005e00 -_080D8E74: .4byte 0x020241e4 -_080D8E78: .4byte 0x0202420b + .pool _080D8E7C: mov r2, r8 lsls r0, r2, 2 @@ -444325,14 +429605,14 @@ _080D8E7C: lsls r0, 3 adds r2, r0, r4 ldrb r5, [r2, 0xC] - ldr r1, _080D8EC0 + ldr r1, =0x02020630 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _080D8EC4 + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _080D8EA0 bl _080DA100 @@ -444353,8 +429633,7 @@ _080D8EB8: strh r0, [r2, 0x8] bl _080DA100 .align 2, 0 -_080D8EC0: .4byte 0x02020630 -_080D8EC4: .4byte nullsub_12 + 1 + .pool _080D8EC8: mov r5, r9 ldr r0, [r5] @@ -444378,9 +429657,9 @@ _080D8EC8: bl _080DA100 _080D8EF2: bl sub_80DB89C - ldr r0, _080D8F28 + ldr r0, =0x02021cc4 lsls r1, r6, 6 - ldr r2, _080D8F2C + ldr r2, =0x02039e02 adds r1, r2 bl gf_strcpy mov r2, r9 @@ -444392,36 +429671,33 @@ _080D8EF2: lsls r0, 1 cmp r1, r0 bhi _080D8F38 - ldr r0, _080D8F30 + ldr r0, =0x02021dc4 adds r2, r1, 0 movs r1, 0xD muls r1, r2 - ldr r2, _080D8F34 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy b _080D8F48 .align 2, 0 -_080D8F28: .4byte 0x02021cc4 -_080D8F2C: .4byte 0x02039e02 -_080D8F30: .4byte 0x02021dc4 -_080D8F34: .4byte 0x0831977c + .pool _080D8F38: - ldr r0, _080D8F70 - ldr r2, _080D8F74 + ldr r0, =0x02021dc4 + ldr r2, =0x08587f1c ldrb r1, [r3, 0xA] lsls r1, 2 adds r1, r2 ldr r1, [r1] bl gf_strcpy _080D8F48: - ldr r4, _080D8F78 - ldr r1, _080D8F7C + ldr r4, =0x02021fc4 + ldr r1, =0x0827d55a adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_80DEC30 - ldr r1, _080D8F80 + ldr r1, =0x03005e00 mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -444431,11 +429707,7 @@ _080D8F48: strh r1, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D8F70: .4byte 0x02021dc4 -_080D8F74: .4byte 0x08587f1c -_080D8F78: .4byte 0x02021fc4 -_080D8F7C: .4byte 0x0827d55a -_080D8F80: .4byte 0x03005e00 + .pool _080D8F84: bl sub_80DED4C adds r1, r0, 0 @@ -444443,12 +429715,12 @@ _080D8F84: beq _080D8F92 bl _080DA100 _080D8F92: - ldr r0, _080D8FB0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] adds r0, 0x5A strb r1, [r0] - ldr r1, _080D8FB4 + ldr r1, =0x03005e00 mov r4, r8 lsls r0, r4, 2 add r0, r8 @@ -444458,8 +429730,7 @@ _080D8F92: strh r1, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D8FB0: .4byte 0x02039f34 -_080D8FB4: .4byte 0x03005e00 + .pool _080D8FB8: mov r5, r9 ldr r1, [r5] @@ -444487,7 +429758,7 @@ _080D8FB8: bl sub_80DEAA8 adds r0, r4, 0 bl move_anim_start_t1 - ldr r1, _080D900C + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -444497,12 +429768,12 @@ _080D8FB8: strh r1, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D900C: .4byte 0x03005e00 + .pool _080D9010: - ldr r0, _080D9050 + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _080D9054 + ldr r0, =0x020383fd ldrb r4, [r0] cmp r4, 0 beq _080D9024 @@ -444510,14 +429781,14 @@ _080D9010: _080D9024: adds r0, r6, 0 bl sub_80DE9B0 - ldr r0, _080D9058 + ldr r0, =0x02039f34 ldr r1, [r0] ldr r0, [r1] adds r0, 0x5A ldrb r0, [r0] cmp r0, 0 beq _080D9060 - ldr r0, _080D905C + ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -444528,10 +429799,7 @@ _080D9024: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D9050: .4byte 0x020383f8 -_080D9054: .4byte 0x020383fd -_080D9058: .4byte 0x02039f34 -_080D905C: .4byte 0x03005e00 + .pool _080D9060: ldr r1, [r1, 0x4] lsls r0, r6, 3 @@ -444547,12 +429815,12 @@ _080D9060: bl sub_80DC674 _080D907A: bl sub_80DE12C - ldr r0, _080D9088 + ldr r0, =0x03005e00 mov r4, r8 lsls r1, r4, 2 b _080D9192 .align 2, 0 -_080D9088: .4byte 0x03005e00 + .pool _080D908C: mov r5, r8 lsls r0, r5, 2 @@ -444653,7 +429921,7 @@ _080D912C: adds r4, r0 movs r0, 0xFF strb r0, [r4, 0x14] - ldr r1, _080D9164 + ldr r1, =0x03005e00 mov r0, r10 add r0, r8 lsls r0, 3 @@ -444662,7 +429930,7 @@ _080D912C: strh r1, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D9164: .4byte 0x03005e00 + .pool _080D9168: mov r0, r10 add r0, r8 @@ -444681,7 +429949,7 @@ _080D9180: beq _080D918C bl _080DA100 _080D918C: - ldr r0, _080D91A0 + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 _080D9192: @@ -444692,7 +429960,7 @@ _080D9192: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D91A0: .4byte 0x03005e00 + .pool _080D91A4: mov r3, r9 ldr r0, [r3] @@ -444721,7 +429989,7 @@ _080D91D0: movs r0, 0x7 bl sub_80DD720 _080D91DA: - ldr r0, _080D91F0 + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 add r1, r8 @@ -444731,7 +429999,7 @@ _080D91DA: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D91F0: .4byte 0x03005e00 + .pool _080D91F4: mov r3, r9 ldr r0, [r3] @@ -444754,7 +430022,7 @@ _080D9208: _080D921A: movs r0, 0x1 bl sub_80DE008 - ldr r0, _080D9234 + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 add r1, r8 @@ -444764,7 +430032,7 @@ _080D921A: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D9234: .4byte 0x03005e00 + .pool _080D9238: mov r3, r9 ldr r0, [r3] @@ -444778,7 +430046,7 @@ _080D9238: movs r0, 0 adds r2, r6, 0 bl sub_80DC028 - ldr r1, _080D9268 + ldr r1, =0x03005e00 mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -444788,7 +430056,7 @@ _080D9238: strh r1, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D9268: .4byte 0x03005e00 + .pool _080D926C: mov r0, r9 ldr r1, [r0] @@ -444828,7 +430096,7 @@ _080D929A: movs r0, 0x8 bl sub_80DD720 _080D92B8: - ldr r0, _080D92CC + ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -444838,7 +430106,7 @@ _080D92B8: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D92CC: .4byte 0x03005e00 + .pool _080D92D0: mov r5, r9 ldr r0, [r5] @@ -444865,7 +430133,7 @@ _080D92F6: lsls r0, 24 cmp r0, 0 beq _080D9320 - ldr r1, _080D931C + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -444877,9 +430145,9 @@ _080D92F6: strh r1, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D931C: .4byte 0x03005e00 + .pool _080D9320: - ldr r0, _080D9330 + ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -444887,7 +430155,7 @@ _080D9320: adds r1, r0 b _080D9354 .align 2, 0 -_080D9330: .4byte 0x03005e00 + .pool _080D9334: mov r5, r8 lsls r0, r5, 2 @@ -444918,7 +430186,7 @@ _080D935C: movs r0, 0x63 bl audio_play _080D936E: - ldr r0, _080D9384 + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 add r1, r8 @@ -444928,7 +430196,7 @@ _080D936E: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D9384: .4byte 0x03005e00 + .pool _080D9388: mov r3, r8 lsls r0, r3, 2 @@ -444954,8 +430222,8 @@ _080D939E: mov r10, r1 cmp r7, 0x3 bgt _080D9418 - ldr r5, _080D93DC - ldr r2, _080D93E0 + ldr r5, =0x02039f26 + ldr r2, =0x02039f34 _080D93BC: movs r3, 0 str r3, [sp] @@ -444974,8 +430242,7 @@ _080D93BC: str r1, [sp] b _080D940C .align 2, 0 -_080D93DC: .4byte 0x02039f26 -_080D93E0: .4byte 0x02039f34 + .pool _080D93E4: adds r3, 0x1 cmp r3, 0x3 @@ -445015,7 +430282,7 @@ _080D9422: add r5, r8 lsls r5, 3 adds r5, r4 - ldr r0, _080D9460 + ldr r0, =0x02039f26 adds r0, r3, r0 ldrb r0, [r0] strh r0, [r5, 0xA] @@ -445040,7 +430307,7 @@ _080D9422: strh r0, [r5, 0x8] bl _080DA100 .align 2, 0 -_080D9460: .4byte 0x02039f26 + .pool _080D9464: mov r0, r10 add r0, r8 @@ -445058,7 +430325,7 @@ _080D947C: beq _080D9488 bl _080DA100 _080D9488: - ldr r0, _080D949C + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 add r1, r8 @@ -445068,7 +430335,7 @@ _080D9488: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D949C: .4byte 0x03005e00 + .pool _080D94A0: movs r7, 0 mov r3, r8 @@ -445078,7 +430345,7 @@ _080D94A0: adds r1, r4 movs r4, 0xA ldrsh r2, [r1, r4] - ldr r1, _080D9500 + ldr r1, =0x02039f26 mov r10, r0 adds r5, r1, 0 ldrb r0, [r5] @@ -445109,7 +430376,7 @@ _080D94CA: lsls r2, r7, 24 lsrs r2, 24 bl sub_80DC028 - ldr r1, _080D9504 + ldr r1, =0x03005e00 mov r0, r10 add r0, r8 lsls r0, 3 @@ -445118,8 +430385,7 @@ _080D94CA: strh r1, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D9500: .4byte 0x02039f26 -_080D9504: .4byte 0x03005e00 + .pool _080D9508: movs r7, 0 mov r2, r8 @@ -445129,7 +430395,7 @@ _080D9508: adds r1, r4 movs r5, 0xA ldrsh r3, [r1, r5] - ldr r1, _080D9558 + ldr r1, =0x02039f26 mov r10, r0 adds r5, r1, 0 ldrb r0, [r5] @@ -445162,7 +430428,7 @@ _080D9546: strh r1, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D9558: .4byte 0x02039f26 + .pool _080D955C: movs r7, 0 mov r2, r8 @@ -445172,7 +430438,7 @@ _080D955C: adds r1, r4 movs r3, 0xA ldrsh r2, [r1, r3] - ldr r1, _080D95AC + ldr r1, =0x02039f26 mov r10, r0 adds r5, r1, 0 ldrb r4, [r5] @@ -445194,7 +430460,7 @@ _080D9586: lsls r0, 24 cmp r0, 0 beq _080D95B4 - ldr r1, _080D95B0 + ldr r1, =0x03005e00 mov r0, r10 add r0, r8 lsls r0, 3 @@ -445205,17 +430471,16 @@ _080D9586: strh r1, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D95AC: .4byte 0x02039f26 -_080D95B0: .4byte 0x03005e00 + .pool _080D95B4: - ldr r0, _080D95C0 + ldr r0, =0x03005e00 mov r1, r10 add r1, r8 lsls r1, 3 adds r1, r0 b _080D95E4 .align 2, 0 -_080D95C0: .4byte 0x03005e00 + .pool _080D95C4: mov r5, r8 lsls r0, r5, 2 @@ -445239,7 +430504,7 @@ _080D95E4: bl _080DA100 _080D95EC: movs r7, 0 - ldr r2, _080D9638 + ldr r2, =0x02039f26 ldrb r3, [r2] mov r0, r8 lsls r1, r0, 2 @@ -445276,12 +430541,12 @@ _080D961E: bl audio_play b _080D9642 .align 2, 0 -_080D9638: .4byte 0x02039f26 + .pool _080D963C: movs r0, 0x64 bl audio_play _080D9642: - ldr r5, _080D9688 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] lsls r0, r7, 3 @@ -445304,7 +430569,7 @@ _080D9642: ands r0, r2 strb r0, [r1, 0x15] _080D9670: - ldr r0, _080D968C + ldr r0, =0x03005e00 mov r1, r10 add r1, r8 lsls r1, 3 @@ -445316,8 +430581,7 @@ _080D9670: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D9688: .4byte 0x02039f34 -_080D968C: .4byte 0x03005e00 + .pool _080D9690: mov r5, r8 lsls r2, r5, 2 @@ -445355,20 +430619,20 @@ _080D96AE: beq _080D96F6 _080D96D4: bl sub_80DB89C - ldr r0, _080D9708 + ldr r0, =0x02021cc4 lsls r1, r6, 6 - ldr r2, _080D970C + ldr r2, =0x02039e02 adds r1, r2 bl gf_strcpy - ldr r4, _080D9710 - ldr r1, _080D9714 + ldr r4, =0x02021fc4 + ldr r1, =0x0827e793 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_80DEC30 _080D96F6: - ldr r0, _080D9718 + ldr r0, =0x03005e00 mov r1, r10 add r1, r8 lsls r1, 3 @@ -445377,18 +430641,14 @@ _080D96F6: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D9708: .4byte 0x02021cc4 -_080D970C: .4byte 0x02039e02 -_080D9710: .4byte 0x02021fc4 -_080D9714: .4byte 0x0827e793 -_080D9718: .4byte 0x03005e00 + .pool _080D971C: bl sub_80DED4C cmp r0, 0 beq _080D9728 bl _080DA100 _080D9728: - ldr r0, _080D9754 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r6, 3 @@ -445400,7 +430660,7 @@ _080D9728: ands r0, r1 cmp r0, 0 bne _080D975C - ldr r0, _080D9758 + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 add r1, r8 @@ -445410,10 +430670,9 @@ _080D9728: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D9754: .4byte 0x02039f34 -_080D9758: .4byte 0x03005e00 + .pool _080D975C: - ldr r0, _080D9770 + ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -445423,7 +430682,7 @@ _080D975C: strh r0, [r1, 0x8] bl _080DA100 .align 2, 0 -_080D9770: .4byte 0x03005e00 + .pool _080D9774: mov r4, r9 ldr r0, [r4] @@ -445441,28 +430700,28 @@ _080D9774: asrs r0, r4, 24 cmp r0, 0x1 bne _080D97A0 - ldr r0, _080D979C + ldr r0, =0x0827e32e b _080D97A6 .align 2, 0 -_080D979C: .4byte 0x0827e32e + .pool _080D97A0: cmp r0, 0x2 bne _080D97B4 - ldr r0, _080D97B0 + ldr r0, =0x0827e35b _080D97A6: movs r1, 0x1 bl sub_80DEC30 b _080D97BC .align 2, 0 -_080D97B0: .4byte 0x0827e35b + .pool _080D97B4: - ldr r0, _080D97D4 + ldr r0, =0x0827e38d movs r1, 0x1 bl sub_80DEC30 _080D97BC: movs r0, 0x3 bl sub_80DD720 - ldr r1, _080D97D8 + ldr r1, =0x03005e00 mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -445472,17 +430731,16 @@ _080D97BC: strh r1, [r0, 0x1C] b _080D9812 .align 2, 0 -_080D97D4: .4byte 0x0827e38d -_080D97D8: .4byte 0x03005e00 + .pool _080D97DC: bl sub_80DB89C - ldr r0, _080D981C + ldr r0, =0x02021cc4 lsls r1, r6, 6 - ldr r2, _080D9820 + ldr r2, =0x02039e02 adds r1, r2 bl gf_strcpy - ldr r4, _080D9824 - ldr r1, _080D9828 + ldr r4, =0x02021fc4 + ldr r1, =0x0827e2fe adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -445490,7 +430748,7 @@ _080D97DC: bl sub_80DEC30 movs r0, 0x2 bl sub_80DD720 - ldr r1, _080D982C + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -445502,11 +430760,7 @@ _080D9812: strh r1, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D981C: .4byte 0x02021cc4 -_080D9820: .4byte 0x02039e02 -_080D9824: .4byte 0x02021fc4 -_080D9828: .4byte 0x0827e2fe -_080D982C: .4byte 0x03005e00 + .pool _080D9830: mov r3, r9 ldr r0, [r3] @@ -445520,7 +430774,7 @@ _080D9830: _080D9844: ldrb r0, [r2, 0x11] bl sub_80DC9B4 - ldr r1, _080D9860 + ldr r1, =0x03005e00 mov r4, r8 lsls r0, r4, 2 add r0, r8 @@ -445530,14 +430784,14 @@ _080D9844: strh r1, [r0, 0x8] bl _080DA100 .align 2, 0 -_080D9860: .4byte 0x03005e00 + .pool _080D9864: bl sub_80DED4C cmp r0, 0 beq _080D9870 bl _080DA100 _080D9870: - ldr r1, _080D98CC + ldr r1, =0x03005e00 mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -445552,7 +430806,7 @@ _080D9870: bgt _080D988E bl _080DA100 _080D988E: - ldr r7, _080D98D0 + ldr r7, =0x02039f34 ldr r0, [r7] ldr r1, [r0, 0x4] lsls r0, r6, 3 @@ -445582,8 +430836,7 @@ _080D98C2: strh r3, [r4, 0x8] bl _080DA100 .align 2, 0 -_080D98CC: .4byte 0x03005e00 -_080D98D0: .4byte 0x02039f34 + .pool _080D98D4: mov r5, r9 ldr r0, [r5] @@ -445622,19 +430875,19 @@ _080D9904: cmp r0, 0 beq _080D996C bl sub_80DB89C - ldr r0, _080D9958 + ldr r0, =0x02021cc4 lsls r1, r6, 6 - ldr r2, _080D995C + ldr r2, =0x02039e02 adds r1, r2 bl gf_strcpy - ldr r4, _080D9960 - ldr r1, _080D9964 + ldr r4, =0x02021fc4 + ldr r1, =0x0827e6e3 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_80DEC30 - ldr r0, _080D9968 + ldr r0, =0x03005e00 mov r5, r8 lsls r4, r5, 2 add r4, r8 @@ -445647,11 +430900,7 @@ _080D9904: strh r0, [r4, 0x8] b _080DA100 .align 2, 0 -_080D9958: .4byte 0x02021cc4 -_080D995C: .4byte 0x02039e02 -_080D9960: .4byte 0x02021fc4 -_080D9964: .4byte 0x0827e6e3 -_080D9968: .4byte 0x03005e00 + .pool _080D996C: mov r1, r8 lsls r0, r1, 2 @@ -445686,7 +430935,7 @@ _080D999E: beq _080D99A8 b _080DA100 _080D99A8: - ldr r5, _080D99E4 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] lsls r4, r6, 3 @@ -445706,7 +430955,7 @@ _080D99A8: ldrh r0, [r4, 0x2] subs r0, r1 strh r0, [r4, 0x2] - ldr r1, _080D99E8 + ldr r1, =0x03005e00 mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -445716,11 +430965,10 @@ _080D99A8: strh r1, [r0, 0x8] b _080DA100 .align 2, 0 -_080D99E4: .4byte 0x02039f34 -_080D99E8: .4byte 0x03005e00 + .pool _080D99EC: bl sub_80DCD48 - ldr r0, _080D9A24 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x14] lsls r0, r6, 2 @@ -445734,7 +430982,7 @@ _080D99EC: beq _080D9A0A b _080DA100 _080D9A0A: - ldr r0, _080D9A28 + ldr r0, =0x03005e00 mov r5, r8 lsls r4, r5, 2 add r4, r8 @@ -445746,8 +430994,7 @@ _080D9A0A: strh r0, [r4, 0x8] b _080DA100 .align 2, 0 -_080D9A24: .4byte 0x02039f34 -_080D9A28: .4byte 0x03005e00 + .pool _080D9A2C: mov r1, r9 ldr r0, [r1] @@ -445789,21 +431036,20 @@ _080D9A56: beq _080D9A94 movs r4, 0x1 str r4, [sp] - ldr r0, _080D9A8C + ldr r0, =0x02021ec4 ldrh r2, [r5, 0x6] movs r1, 0xD muls r1, r2 - ldr r2, _080D9A90 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy b _080D9AAE .align 2, 0 -_080D9A8C: .4byte 0x02021ec4 -_080D9A90: .4byte 0x0831977c + .pool _080D9A94: - ldr r0, _080D9B14 - ldr r3, _080D9B18 - ldr r2, _080D9B1C + ldr r0, =0x02021ec4 + ldr r3, =0x08587f08 + ldr r2, =0x0858c2b4 ldrh r1, [r5, 0x6] lsls r1, 3 adds r1, r2 @@ -445818,7 +431064,7 @@ _080D9AAE: lsls r0, r5, 24 cmp r0, 0 ble _080D9AD2 - ldr r0, _080D9B20 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] ldr r2, [sp, 0x4] @@ -445834,12 +431080,12 @@ _080D9AAE: str r3, [sp] _080D9AD2: bl sub_80DB89C - ldr r0, _080D9B24 + ldr r0, =0x02021cc4 lsls r1, r6, 6 - ldr r2, _080D9B28 + ldr r2, =0x02039e02 adds r1, r2 bl gf_strcpy - ldr r4, _080D9B20 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r1, [r0] ldrb r0, [r1, 0x13] @@ -445860,28 +431106,21 @@ _080D9AD2: _080D9B06: cmp r3, 0 bne _080D9B30 - ldr r0, _080D9B2C + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 b _080D9F58 .align 2, 0 -_080D9B14: .4byte 0x02021ec4 -_080D9B18: .4byte 0x08587f08 -_080D9B1C: .4byte 0x0858c2b4 -_080D9B20: .4byte 0x02039f34 -_080D9B24: .4byte 0x02021cc4 -_080D9B28: .4byte 0x02039e02 -_080D9B2C: .4byte 0x03005e00 + .pool _080D9B30: cmp r3, 0 bge _080D9B48 - ldr r0, _080D9B40 - ldr r1, _080D9B44 + ldr r0, =0x02021fc4 + ldr r1, =0x0827e73c bl ExpandTextCodes b _080D9B74 .align 2, 0 -_080D9B40: .4byte 0x02021fc4 -_080D9B44: .4byte 0x0827e73c + .pool _080D9B48: cmp r3, 0 ble _080D9B6C @@ -445892,22 +431131,21 @@ _080D9B48: asrs r0, 24 cmp r0, 0x4 bgt _080D9B6C - ldr r0, _080D9B64 - ldr r1, _080D9B68 + ldr r0, =0x02021fc4 + ldr r1, =0x0827e717 bl ExpandTextCodes b _080D9B74 .align 2, 0 -_080D9B64: .4byte 0x02021fc4 -_080D9B68: .4byte 0x0827e717 + .pool _080D9B6C: - ldr r0, _080D9B98 - ldr r1, _080D9B9C + ldr r0, =0x02021fc4 + ldr r1, =0x0827e76a bl ExpandTextCodes _080D9B74: - ldr r0, _080D9B98 + ldr r0, =0x02021fc4 movs r1, 0x1 bl sub_80DEC30 - ldr r1, _080D9BA0 + ldr r1, =0x03005e00 mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -445922,9 +431160,7 @@ _080D9B74: strh r0, [r1, 0x8] b _080DA100 .align 2, 0 -_080D9B98: .4byte 0x02021fc4 -_080D9B9C: .4byte 0x0827e76a -_080D9BA0: .4byte 0x03005e00 + .pool _080D9BA4: movs r0, 0x36 strh r0, [r1, 0x8] @@ -445955,11 +431191,11 @@ _080D9BD0: negs r0, r0 movs r1, 0x1 bl sub_80DDED0 - ldr r0, _080D9BE4 + ldr r0, =0x00000187 bl fanfare_play b _080D9C3E .align 2, 0 -_080D9BE4: .4byte 0x00000187 + .pool _080D9BE8: mov r1, r9 ldr r0, [r1] @@ -446012,7 +431248,7 @@ _080D9C3E: strh r0, [r4, 0x1C] b _080DA100 _080D9C46: - ldr r0, _080D9C64 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -446028,7 +431264,7 @@ _080D9C58: strh r0, [r4, 0x8] b _080DA100 .align 2, 0 -_080D9C64: .4byte 0x02037fd4 + .pool _080D9C68: mov r3, r8 lsls r1, r3, 2 @@ -446043,12 +431279,12 @@ _080D9C68: b _080DA100 _080D9C7E: lsls r0, 2 - ldr r1, _080D9C88 + ldr r1, =_080D9C8C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080D9C88: .4byte _080D9C8C + .pool .align 2, 0 _080D9C8C: .4byte _080D9CA0 @@ -446164,7 +431400,7 @@ _080D9D62: _080D9D68: bl sub_80DDED0 _080D9D6C: - ldr r0, _080D9D80 + ldr r0, =0x03005e00 mov r1, r10 add r1, r8 lsls r1, 3 @@ -446174,9 +431410,9 @@ _080D9D6C: strh r0, [r1, 0x1C] b _080DA100 .align 2, 0 -_080D9D80: .4byte 0x03005e00 + .pool _080D9D84: - ldr r0, _080D9DA8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -446196,7 +431432,7 @@ _080D9D96: strh r1, [r0, 0x8] b _080DA100 .align 2, 0 -_080D9DA8: .4byte 0x02037fd4 + .pool _080D9DAC: mov r5, r9 ldr r0, [r5] @@ -446211,30 +431447,30 @@ _080D9DAC: b _080DA100 _080D9DC2: bl sub_80DB89C - ldr r0, _080D9DD0 + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 b _080D9F58 .align 2, 0 -_080D9DD0: .4byte 0x03005e00 + .pool _080D9DD4: bl sub_80DB89C - ldr r0, _080D9E3C - ldr r5, _080D9E40 + ldr r0, =0x02021ec4 + ldr r5, =0x02039f34 ldr r1, [r5] ldr r1, [r1, 0x10] ldr r1, [r1] lsls r1, 20 lsrs r1, 29 lsls r1, 6 - ldr r4, _080D9E44 + ldr r4, =0x02039e02 adds r1, r4 bl gf_strcpy - ldr r0, _080D9E48 + ldr r0, =0x02021cc4 lsls r1, r6, 6 adds r1, r4 bl gf_strcpy - ldr r0, _080D9E4C + ldr r0, =0x02021dc4 ldr r1, [r5] ldr r2, [r1, 0x4] lsls r1, r6, 3 @@ -446244,17 +431480,17 @@ _080D9DD4: ldrh r2, [r1, 0x6] movs r1, 0xD muls r1, r2 - ldr r2, _080D9E50 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r4, _080D9E54 - ldr r1, _080D9E58 + ldr r4, =0x02021fc4 + ldr r1, =0x0827e7ea adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_80DEC30 - ldr r1, _080D9E5C + ldr r1, =0x03005e00 mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -446264,15 +431500,7 @@ _080D9DD4: strh r1, [r0, 0x8] b _080DA100 .align 2, 0 -_080D9E3C: .4byte 0x02021ec4 -_080D9E40: .4byte 0x02039f34 -_080D9E44: .4byte 0x02039e02 -_080D9E48: .4byte 0x02021cc4 -_080D9E4C: .4byte 0x02021dc4 -_080D9E50: .4byte 0x0831977c -_080D9E54: .4byte 0x02021fc4 -_080D9E58: .4byte 0x0827e7ea -_080D9E5C: .4byte 0x03005e00 + .pool _080D9E60: bl sub_80DED4C cmp r0, 0 @@ -446280,14 +431508,14 @@ _080D9E60: b _080DA100 _080D9E6A: bl sub_80DB89C - ldr r4, _080D9E94 - ldr r1, _080D9E98 + ldr r4, =0x02021fc4 + ldr r1, =0x0827e817 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_80DEC30 - ldr r1, _080D9E9C + ldr r1, =0x03005e00 mov r4, r8 lsls r0, r4, 2 add r0, r8 @@ -446297,9 +431525,7 @@ _080D9E6A: strh r1, [r0, 0x8] b _080DA100 .align 2, 0 -_080D9E94: .4byte 0x02021fc4 -_080D9E98: .4byte 0x0827e817 -_080D9E9C: .4byte 0x03005e00 + .pool _080D9EA0: bl sub_80DED4C cmp r0, 0 @@ -446307,12 +431533,12 @@ _080D9EA0: b _080DA100 _080D9EAA: bl sub_80DB89C - ldr r0, _080D9EB8 + ldr r0, =0x03005e00 mov r5, r8 lsls r1, r5, 2 b _080D9F58 .align 2, 0 -_080D9EB8: .4byte 0x03005e00 + .pool _080D9EBC: mov r1, r9 ldr r0, [r1] @@ -446333,12 +431559,12 @@ _080D9EBC: _080D9EDC: adds r0, r6, 0 bl sub_80DC9B4 - ldr r0, _080D9F2C + ldr r0, =0x02021cc4 lsls r1, r6, 6 - ldr r2, _080D9F30 + ldr r2, =0x02039e02 adds r1, r2 bl gf_strcpy - ldr r0, _080D9F34 + ldr r0, =0x02021dc4 mov r2, r9 ldr r1, [r2] ldr r1, [r1, 0x4] @@ -446346,17 +431572,17 @@ _080D9EDC: ldrh r2, [r1, 0x6] movs r1, 0xD muls r1, r2 - ldr r2, _080D9F38 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r4, _080D9F3C - ldr r1, _080D9F40 + ldr r4, =0x02021fc4 + ldr r1, =0x0827e58a adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_80DEC30 - ldr r1, _080D9F44 + ldr r1, =0x03005e00 mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -446366,20 +431592,14 @@ _080D9EDC: strh r1, [r0, 0x8] b _080DA100 .align 2, 0 -_080D9F2C: .4byte 0x02021cc4 -_080D9F30: .4byte 0x02039e02 -_080D9F34: .4byte 0x02021dc4 -_080D9F38: .4byte 0x0831977c -_080D9F3C: .4byte 0x02021fc4 -_080D9F40: .4byte 0x0827e58a -_080D9F44: .4byte 0x03005e00 + .pool _080D9F48: bl sub_80DED4C cmp r0, 0 beq _080D9F52 b _080DA100 _080D9F52: - ldr r0, _080D9F64 + ldr r0, =0x03005e00 mov r4, r8 lsls r1, r4, 2 _080D9F58: @@ -446390,10 +431610,10 @@ _080D9F58: strh r0, [r1, 0x8] b _080DA100 .align 2, 0 -_080D9F64: .4byte 0x03005e00 + .pool _080D9F68: bl sub_80DDBE8 - ldr r0, _080D9F80 + ldr r0, =0x03005e00 mov r5, r8 lsls r1, r5, 2 add r1, r8 @@ -446403,7 +431623,7 @@ _080D9F68: strh r0, [r1, 0x8] b _080DA100 .align 2, 0 -_080D9F80: .4byte 0x03005e00 + .pool _080D9F84: mov r1, r9 ldr r0, [r1] @@ -446424,7 +431644,7 @@ _080D9F9A: strb r1, [r2, 0x13] bl sub_80DD940 _080D9FA8: - ldr r0, _080D9FBC + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 add r1, r8 @@ -446434,7 +431654,7 @@ _080D9FA8: strh r0, [r1, 0x8] b _080DA100 .align 2, 0 -_080D9FBC: .4byte 0x03005e00 + .pool _080D9FC0: mov r3, r8 lsls r2, r3, 2 @@ -446442,20 +431662,19 @@ _080D9FC0: lsls r2, 3 adds r2, r4 ldrb r5, [r2, 0xC] - ldr r1, _080D9FE4 + ldr r1, =0x02020630 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 adds r1, 0x1C adds r0, r1 - ldr r1, _080D9FE8 + ldr r1, =sub_80DA164 + 1 str r1, [r0] movs r0, 0xB strh r0, [r2, 0x8] b _080DA100 .align 2, 0 -_080D9FE4: .4byte 0x02020630 -_080D9FE8: .4byte sub_80DA164 + 1 + .pool _080D9FEC: mov r5, r8 lsls r0, r5, 2 @@ -446463,7 +431682,7 @@ _080D9FEC: lsls r0, 3 adds r4, r0, r4 ldrb r5, [r4, 0xC] - ldr r1, _080DA020 + ldr r1, =0x02020630 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -446482,7 +431701,7 @@ _080D9FEC: strh r0, [r4, 0x8] b _080DA100 .align 2, 0 -_080DA020: .4byte 0x02020630 + .pool _080DA024: mov r1, r8 lsls r0, r1, 2 @@ -446496,19 +431715,19 @@ _080DA024: b _080DA100 _080DA038: bl sub_80DB89C - ldr r0, _080DA06C + ldr r0, =0x02021cc4 lsls r1, r6, 6 - ldr r2, _080DA070 + ldr r2, =0x02039e02 adds r1, r2 bl gf_strcpy - ldr r4, _080DA074 - ldr r1, _080DA078 + ldr r4, =0x02021fc4 + ldr r1, =0x0827d56f adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_80DEC30 - ldr r1, _080DA07C + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -446518,16 +431737,12 @@ _080DA038: strh r1, [r0, 0x8] b _080DA100 .align 2, 0 -_080DA06C: .4byte 0x02021cc4 -_080DA070: .4byte 0x02039e02 -_080DA074: .4byte 0x02021fc4 -_080DA078: .4byte 0x0827d56f -_080DA07C: .4byte 0x03005e00 + .pool _080DA080: bl sub_80DED4C cmp r0, 0 bne _080DA100 - ldr r0, _080DA09C + ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -446537,7 +431752,7 @@ _080DA080: strh r0, [r1, 0x8] b _080DA100 .align 2, 0 -_080DA09C: .4byte 0x03005e00 + .pool _080DA0A0: mov r5, r8 lsls r0, r5, 2 @@ -446576,11 +431791,11 @@ _080DA0C2: strh r2, [r0, 0x8] strh r2, [r0, 0xA] strh r2, [r0, 0xC] - ldr r1, _080DA0F0 + ldr r1, =sub_80DA198 + 1 str r1, [r0] b _080DA100 .align 2, 0 -_080DA0F0: .4byte sub_80DA198 + 1 + .pool _080DA0F4: mov r5, r8 lsls r0, r5, 2 @@ -446604,7 +431819,7 @@ sub_80DA110: @ 80DA110 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080DA130 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r3, [r1] ldrb r2, [r3, 0x7] @@ -446616,7 +431831,7 @@ sub_80DA110: @ 80DA110 pop {r0} bx r0 .align 2, 0 -_080DA130: .4byte 0x02039f34 + .pool thumb_func_end sub_80DA110 thumb_func_start sub_80DA134 @@ -446640,13 +431855,13 @@ _080DA148: cmp r0, 0x1F bne _080DA15C strh r2, [r1, 0x2E] - ldr r0, _080DA160 + ldr r0, =nullsub_12 + 1 str r0, [r1, 0x1C] _080DA15C: pop {r0} bx r0 .align 2, 0 -_080DA160: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80DA134 thumb_func_start sub_80DA164 @@ -446665,7 +431880,7 @@ sub_80DA164: @ 80DA164 negs r1, r1 cmp r0, r1 bge _080DA18E - ldr r0, _080DA194 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] adds r2, 0x3E ldrb r0, [r2] @@ -446676,7 +431891,7 @@ _080DA18E: pop {r0} bx r0 .align 2, 0 -_080DA194: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80DA164 thumb_func_start sub_80DA198 @@ -446684,7 +431899,7 @@ sub_80DA198: @ 80DA198 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080DA1BC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -446699,20 +431914,20 @@ sub_80DA198: @ 80DA198 beq _080DA1C6 b _080DA250 .align 2, 0 -_080DA1BC: .4byte 0x03005e00 + .pool _080DA1C0: cmp r0, 0x2 beq _080DA248 b _080DA250 _080DA1C6: - ldr r0, _080DA214 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r6, 0x1 adds r0, r6, 0 ands r0, r1 cmp r0, 0 beq _080DA224 - ldr r0, _080DA218 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x7] @@ -446726,29 +431941,26 @@ _080DA1C6: bl sub_80DB944 bl sub_80DBA18 _080DA1F4: - ldr r4, _080DA21C + ldr r4, =sub_80FCC88 + 1 adds r0, r4, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080DA220 + ldr r2, =sub_80DA110 + 1 adds r1, r4, 0 bl set_task_function_and_args_14_15 bl sub_80DBF68 strh r6, [r5, 0x8] b _080DA250 .align 2, 0 -_080DA214: .4byte 0x02039f2a -_080DA218: .4byte 0x02039f34 -_080DA21C: .4byte sub_80FCC88 + 1 -_080DA220: .4byte sub_80DA110 + 1 + .pool _080DA224: bl sub_80DB944 bl sub_80DBA18 b _080DA23E _080DA22E: - ldr r0, _080DA244 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x7] @@ -446761,18 +431973,18 @@ _080DA23E: strh r0, [r5, 0x8] b _080DA250 .align 2, 0 -_080DA244: .4byte 0x02039f34 + .pool _080DA248: movs r0, 0 strh r0, [r5, 0x8] - ldr r0, _080DA258 + ldr r0, =sub_80DA25C + 1 str r0, [r5] _080DA250: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080DA258: .4byte sub_80DA25C + 1 + .pool thumb_func_end sub_80DA198 thumb_func_start sub_80DA25C @@ -446783,7 +431995,7 @@ sub_80DA25C: @ 80DA25C lsrs r4, 24 movs r0, 0 bl sub_80DE008 - ldr r1, _080DA284 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -446791,14 +432003,13 @@ sub_80DA25C: @ 80DA25C movs r1, 0 strh r1, [r0, 0x8] strh r1, [r0, 0xA] - ldr r1, _080DA288 + ldr r1, =sub_80DA28C + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080DA284: .4byte 0x03005e00 -_080DA288: .4byte sub_80DA28C + 1 + .pool thumb_func_end sub_80DA25C thumb_func_start sub_80DA28C @@ -446806,7 +432017,7 @@ sub_80DA28C: @ 80DA28C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080DA2B0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -446821,7 +432032,7 @@ sub_80DA28C: @ 80DA28C beq _080DA2BA b _080DA312 .align 2, 0 -_080DA2B0: .4byte 0x03005e00 + .pool _080DA2B4: cmp r5, 0x2 beq _080DA304 @@ -446839,7 +432050,7 @@ _080DA2BA: strh r5, [r4, 0xA] b _080DA2F6 _080DA2D2: - ldr r0, _080DA300 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x7] @@ -446863,20 +432074,20 @@ _080DA2F6: strh r0, [r4, 0x8] b _080DA312 .align 2, 0 -_080DA300: .4byte 0x02039f34 + .pool _080DA304: bl sub_80DC3AC movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0xA] - ldr r0, _080DA318 + ldr r0, =sub_80DA31C + 1 str r0, [r4] _080DA312: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080DA318: .4byte sub_80DA31C + 1 + .pool thumb_func_end sub_80DA28C thumb_func_start sub_80DA31C @@ -446888,35 +432099,34 @@ sub_80DA31C: @ 80DA31C lsls r0, 24 cmp r0, 0 beq _080DA33A - ldr r0, _080DA340 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080DA344 + ldr r0, =sub_80DA348 + 1 str r0, [r1] _080DA33A: pop {r4} pop {r0} bx r0 .align 2, 0 -_080DA340: .4byte 0x03005e00 -_080DA344: .4byte sub_80DA348 + 1 + .pool thumb_func_end sub_80DA31C thumb_func_start sub_80DA348 sub_80DA348: @ 80DA348 lsls r0, 24 lsrs r0, 24 - ldr r2, _080DA374 - ldr r3, _080DA378 - ldr r1, _080DA37C + ldr r2, =0x0201a204 + ldr r3, =0x02037714 + ldr r1, =0x040000d4 str r2, [r1] str r3, [r1, 0x4] - ldr r2, _080DA380 + ldr r2, =0x84000100 str r2, [r1, 0x8] ldr r1, [r1, 0x8] - ldr r2, _080DA384 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -446925,16 +432135,11 @@ sub_80DA348: @ 80DA348 strh r0, [r1, 0x8] movs r0, 0x2 strh r0, [r1, 0xA] - ldr r0, _080DA388 + ldr r0, =sub_80DA38C + 1 str r0, [r1] bx lr .align 2, 0 -_080DA374: .4byte 0x0201a204 -_080DA378: .4byte 0x02037714 -_080DA37C: .4byte 0x040000d4 -_080DA380: .4byte 0x84000100 -_080DA384: .4byte 0x03005e00 -_080DA388: .4byte sub_80DA38C + 1 + .pool thumb_func_end sub_80DA348 thumb_func_start sub_80DA38C @@ -446942,7 +432147,7 @@ sub_80DA38C: @ 80DA38C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080DA3C4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -446962,14 +432167,13 @@ sub_80DA38C: @ 80DA38C lsls r0, 16 cmp r0, 0 bne _080DA3BE - ldr r0, _080DA3C8 + ldr r0, =sub_80DA3CC + 1 str r0, [r1] _080DA3BE: pop {r0} bx r0 .align 2, 0 -_080DA3C4: .4byte 0x03005e00 -_080DA3C8: .4byte sub_80DA3CC + 1 + .pool thumb_func_end sub_80DA38C thumb_func_start sub_80DA3CC @@ -446977,7 +432181,7 @@ sub_80DA3CC: @ 80DA3CC push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080DA42C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -446986,9 +432190,9 @@ sub_80DA3CC: @ 80DA3CC ldrsh r0, [r6, r1] cmp r0, 0 bne _080DA448 - ldr r0, _080DA430 + ldr r0, =0x02039f34 ldr r0, [r0] - ldr r5, _080DA434 + ldr r5, =0x02039f25 ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 3 @@ -446997,14 +432201,14 @@ sub_80DA3CC: @ 80DA3CC adds r0, r2 ldrb r4, [r0, 0x1A] bl sub_80DB89C - ldr r0, _080DA438 + ldr r0, =0x02021cc4 ldrb r1, [r5] lsls r1, 6 - ldr r2, _080DA43C + ldr r2, =0x02039e02 adds r1, r2 bl gf_strcpy - ldr r5, _080DA440 - ldr r0, _080DA444 + ldr r5, =0x02021fc4 + ldr r0, =0x08587d90 lsls r4, 2 adds r4, r0 ldr r1, [r4] @@ -447018,19 +432222,13 @@ sub_80DA3CC: @ 80DA3CC strh r0, [r6, 0x8] b _080DA45A .align 2, 0 -_080DA42C: .4byte 0x03005e00 -_080DA430: .4byte 0x02039f34 -_080DA434: .4byte 0x02039f25 -_080DA438: .4byte 0x02021cc4 -_080DA43C: .4byte 0x02039e02 -_080DA440: .4byte 0x02021fc4 -_080DA444: .4byte 0x08587d90 + .pool _080DA448: bl sub_80DED4C cmp r0, 0 bne _080DA45A strh r0, [r6, 0x8] - ldr r0, _080DA460 + ldr r0, =sub_80DA464 + 1 str r0, [r6] bl sub_80DCD48 _080DA45A: @@ -447038,7 +432236,7 @@ _080DA45A: pop {r0} bx r0 .align 2, 0 -_080DA460: .4byte sub_80DA464 + 1 + .pool thumb_func_end sub_80DA3CC thumb_func_start sub_80DA464 @@ -447046,7 +432244,7 @@ sub_80DA464: @ 80DA464 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080DA494 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -447061,15 +432259,14 @@ sub_80DA464: @ 80DA464 movs r0, 0 strh r0, [r4, 0x8] bl sub_80DC3AC - ldr r0, _080DA498 + ldr r0, =sub_80DA49C + 1 str r0, [r4] _080DA48E: pop {r4} pop {r0} bx r0 .align 2, 0 -_080DA494: .4byte 0x03005e00 -_080DA498: .4byte sub_80DA49C + 1 + .pool thumb_func_end sub_80DA464 thumb_func_start sub_80DA49C @@ -447081,22 +432278,21 @@ sub_80DA49C: @ 80DA49C lsls r0, 24 cmp r0, 0 beq _080DA4BE - ldr r1, _080DA4C4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0x8] - ldr r1, _080DA4C8 + ldr r1, =sub_80DA4CC + 1 str r1, [r0] _080DA4BE: pop {r4} pop {r0} bx r0 .align 2, 0 -_080DA4C4: .4byte 0x03005e00 -_080DA4C8: .4byte sub_80DA4CC + 1 + .pool thumb_func_end sub_80DA49C thumb_func_start sub_80DA4CC @@ -447106,19 +432302,18 @@ sub_80DA4CC: @ 80DA4CC lsls r4, 24 lsrs r4, 24 bl sub_80DE224 - ldr r1, _080DA4EC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080DA4F0 + ldr r1, =sub_80DE424 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080DA4EC: .4byte 0x03005e00 -_080DA4F0: .4byte sub_80DE424 + 1 + .pool thumb_func_end sub_80DA4CC thumb_func_start sub_80DA4F4 @@ -447128,19 +432323,18 @@ sub_80DA4F4: @ 80DA4F4 lsls r4, 24 lsrs r4, 24 bl sub_80DE350 - ldr r1, _080DA514 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080DA518 + ldr r1, =sub_80DA51C + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080DA514: .4byte 0x03005e00 -_080DA518: .4byte sub_80DA51C + 1 + .pool thumb_func_end sub_80DA4F4 thumb_func_start sub_80DA51C @@ -447175,7 +432369,7 @@ sub_80DA51C: @ 80DA51C ldrh r1, [r4] movs r0, 0xC bl lcd_io_set - ldr r2, _080DA584 + ldr r2, =0x02039f34 ldr r0, [r2] ldr r1, [r0] ldrb r0, [r1, 0x1] @@ -447186,25 +432380,23 @@ sub_80DA51C: @ 80DA51C ldrb r0, [r0, 0x1] cmp r0, 0x5 bne _080DA590 - ldr r0, _080DA588 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _080DA58C + ldr r0, =sub_80DA5E8 + 1 b _080DA5A0 .align 2, 0 -_080DA584: .4byte 0x02039f34 -_080DA588: .4byte 0x03005e00 -_080DA58C: .4byte sub_80DA5E8 + 1 + .pool _080DA590: bl sub_80DDB0C - ldr r0, _080DA5AC + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _080DA5B0 + ldr r0, =sub_80DA5B4 + 1 _080DA5A0: str r0, [r1] add sp, 0x4 @@ -447212,8 +432404,7 @@ _080DA5A0: pop {r0} bx r0 .align 2, 0 -_080DA5AC: .4byte 0x03005e00 -_080DA5B0: .4byte sub_80DA5B4 + 1 + .pool thumb_func_end sub_80DA51C thumb_func_start sub_80DA5B4 @@ -447221,7 +432412,7 @@ sub_80DA5B4: @ 80DA5B4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080DA5DC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x6] @@ -447229,20 +432420,18 @@ sub_80DA5B4: @ 80DA5B4 ands r0, r1 cmp r0, 0 bne _080DA5D8 - ldr r0, _080DA5E0 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _080DA5E4 + ldr r0, =sub_80D833C + 1 str r0, [r1] _080DA5D8: pop {r0} bx r0 .align 2, 0 -_080DA5DC: .4byte 0x02039f34 -_080DA5E0: .4byte 0x03005e00 -_080DA5E4: .4byte sub_80D833C + 1 + .pool thumb_func_end sub_80DA5B4 thumb_func_start sub_80DA5E8 @@ -447250,14 +432439,14 @@ sub_80DA5E8: @ 80DA5E8 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080DA644 + ldr r0, =0x02022e16 movs r1, 0 strh r1, [r0] - ldr r0, _080DA648 + ldr r0, =0x02022e1e strh r1, [r0] - ldr r4, _080DA64C + ldr r4, =0x02039f34 movs r3, 0 - ldr r2, _080DA650 + ldr r2, =0x02039f10 movs r1, 0x3 _080DA600: ldr r0, [r4] @@ -447272,15 +432461,15 @@ _080DA600: bge _080DA600 bl sub_80DBD18 bl sub_80DB89C - ldr r0, _080DA654 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 bne _080DA65C - ldr r0, _080DA64C + ldr r0, =0x02039f34 ldr r2, [r0] - ldr r0, _080DA658 + ldr r0, =0x02039f25 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 3 @@ -447291,47 +432480,37 @@ _080DA600: bl sub_80ED03C b _080DA668 .align 2, 0 -_080DA644: .4byte 0x02022e16 -_080DA648: .4byte 0x02022e1e -_080DA64C: .4byte 0x02039f34 -_080DA650: .4byte 0x02039f10 -_080DA654: .4byte 0x02039f2a -_080DA658: .4byte 0x02039f25 + .pool _080DA65C: bl sub_80DF250 bl sub_80DF4F8 bl sub_80DF750 _080DA668: - ldr r1, _080DA69C - ldr r0, _080DA6A0 + ldr r1, =0x030060b8 + ldr r0, =0x03005d80 ldr r0, [r0] str r0, [r1] - ldr r4, _080DA6A4 - ldr r1, _080DA6A8 + ldr r4, =0x02021fc4 + ldr r1, =0x0827d597 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_80DEC30 - ldr r1, _080DA6AC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, _080DA6B0 + ldr r1, =sub_80DA6B4 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080DA69C: .4byte 0x030060b8 -_080DA6A0: .4byte 0x03005d80 -_080DA6A4: .4byte 0x02021fc4 -_080DA6A8: .4byte 0x0827d597 -_080DA6AC: .4byte 0x03005e00 -_080DA6B0: .4byte sub_80DA6B4 + 1 + .pool thumb_func_end sub_80DA5E8 thumb_func_start sub_80DA6B4 @@ -447344,31 +432523,28 @@ sub_80DA6B4: @ 80DA6B4 cmp r4, 0 bne _080DA6EA bl sub_80DE224 - ldr r0, _080DA6F0 + ldr r0, =0x02022e18 strh r4, [r0] - ldr r1, _080DA6F4 + ldr r1, =0x02022e1a movs r0, 0xA0 strh r0, [r1] movs r0, 0x62 movs r1, 0 bl audio_play_and_stuff - ldr r1, _080DA6F8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 strh r4, [r0, 0x8] - ldr r1, _080DA6FC + ldr r1, =sub_80DA700 + 1 str r1, [r0] _080DA6EA: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080DA6F0: .4byte 0x02022e18 -_080DA6F4: .4byte 0x02022e1a -_080DA6F8: .4byte 0x03005e00 -_080DA6FC: .4byte sub_80DA700 + 1 + .pool thumb_func_end sub_80DA6B4 thumb_func_start sub_80DA700 @@ -447376,7 +432552,7 @@ sub_80DA700: @ 80DA700 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _080DA734 + ldr r1, =0x02022e1a ldrh r0, [r1] subs r0, 0x7 strh r0, [r1] @@ -447389,21 +432565,19 @@ _080DA718: ldrh r2, [r1] cmp r2, 0 bne _080DA72E - ldr r0, _080DA738 + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 adds r1, r0 - ldr r0, _080DA73C + ldr r0, =sub_80DA740 + 1 str r0, [r1] strh r2, [r1, 0x8] _080DA72E: pop {r0} bx r0 .align 2, 0 -_080DA734: .4byte 0x02022e1a -_080DA738: .4byte 0x03005e00 -_080DA73C: .4byte sub_80DA740 + 1 + .pool thumb_func_end sub_80DA700 thumb_func_start sub_80DA740 @@ -447412,7 +432586,7 @@ sub_80DA740: @ 80DA740 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r2, _080DA774 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -447426,18 +432600,16 @@ sub_80DA740: @ 80DA740 ble _080DA794 movs r0, 0 strh r0, [r4, 0x8] - ldr r0, _080DA778 + ldr r0, =0x02039f2a ldrb r0, [r0] movs r1, 0x1 ands r1, r0 cmp r1, 0 beq _080DA780 - ldr r0, _080DA77C + ldr r0, =sub_80DA7A0 + 1 b _080DA792 .align 2, 0 -_080DA774: .4byte 0x03005e00 -_080DA778: .4byte 0x02039f2a -_080DA77C: .4byte sub_80DA7A0 + 1 + .pool _080DA780: movs r0, 0x1 negs r0, r0 @@ -447446,7 +432618,7 @@ _080DA780: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080DA79C + ldr r0, =sub_80DA830 + 1 _080DA792: str r0, [r4] _080DA794: @@ -447455,7 +432627,7 @@ _080DA794: pop {r0} bx r0 .align 2, 0 -_080DA79C: .4byte sub_80DA830 + 1 + .pool thumb_func_end sub_80DA740 thumb_func_start sub_80DA7A0 @@ -447464,21 +432636,21 @@ sub_80DA7A0: @ 80DA7A0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _080DA7DC + ldr r5, =sub_80FCACC + 1 adds r0, r5, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080DA7E0 + ldr r2, =sub_80DA7EC + 1 adds r1, r5, 0 bl set_task_function_and_args_14_15 - ldr r1, _080DA7E4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080DA7E8 + ldr r1, =nullsub_41 + 1 str r1, [r0] bl sub_80DBF68 movs r0, 0 @@ -447487,10 +432659,7 @@ sub_80DA7A0: @ 80DA7A0 pop {r0} bx r0 .align 2, 0 -_080DA7DC: .4byte sub_80FCACC + 1 -_080DA7E0: .4byte sub_80DA7EC + 1 -_080DA7E4: .4byte 0x03005e00 -_080DA7E8: .4byte nullsub_41 + 1 + .pool thumb_func_end sub_80DA7A0 thumb_func_start sub_80DA7EC @@ -447507,8 +432676,8 @@ sub_80DA7EC: @ 80DA7EC movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r2, _080DA824 - ldr r0, _080DA828 + ldr r2, =0x03005e00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x8] @@ -447516,15 +432685,13 @@ sub_80DA7EC: @ 80DA7EC adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _080DA82C + ldr r1, =sub_80DA830 + 1 str r1, [r0] add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_080DA824: .4byte 0x03005e00 -_080DA828: .4byte 0x02039f34 -_080DA82C: .4byte sub_80DA830 + 1 + .pool thumb_func_end sub_80DA7EC thumb_func_start sub_80DA830 @@ -447532,7 +432699,7 @@ sub_80DA830: @ 80DA830 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080DA864 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -447540,22 +432707,19 @@ sub_80DA830: @ 80DA830 bne _080DA860 adds r0, r2, 0 bl remove_task - ldr r0, _080DA868 - ldr r1, _080DA86C + ldr r0, =0x03005dac + ldr r1, =sub_80DA874 + 1 str r1, [r0] bl Window_FreeMemory bl sub_80D7A5C bl sub_805F094 - ldr r0, _080DA870 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 _080DA860: pop {r0} bx r0 .align 2, 0 -_080DA864: .4byte 0x02037fd4 -_080DA868: .4byte 0x03005dac -_080DA86C: .4byte sub_80DA874 + 1 -_080DA870: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_80DA830 thumb_func_start sub_80DA874 @@ -447570,28 +432734,27 @@ sub_80DA874: @ 80DA874 thumb_func_start sub_80DA884 sub_80DA884: @ 80DA884 push {lr} - ldr r0, _080DA89C + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 bne _080DA898 - ldr r1, _080DA8A0 + ldr r1, =0x02039f25 movs r0, 0x3 strb r0, [r1] _080DA898: pop {r0} bx r0 .align 2, 0 -_080DA89C: .4byte 0x02039f2a -_080DA8A0: .4byte 0x02039f25 + .pool thumb_func_end sub_80DA884 thumb_func_start sub_80DA8A4 sub_80DA8A4: @ 80DA8A4 push {lr} - ldr r0, _080DA8B8 - ldr r1, _080DA8BC + ldr r0, =0x02039f25 + ldr r1, =0x02039f2b ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 @@ -447599,8 +432762,7 @@ sub_80DA8A4: @ 80DA8A4 movs r0, 0 b _080DA8C2 .align 2, 0 -_080DA8B8: .4byte 0x02039f25 -_080DA8BC: .4byte 0x02039f2b + .pool _080DA8C0: movs r0, 0x1 _080DA8C2: @@ -447617,11 +432779,11 @@ sub_80DA8C8: @ 80DA8C8 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r6, _080DA918 + ldr r6, =0x03005d90 ldr r1, [r6] mov r0, sp bl gf_strcpy - ldr r0, _080DA91C + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -447630,10 +432792,10 @@ sub_80DA8C8: @ 80DA8C8 mov r0, sp bl sub_80DF9D4 _080DA8F2: - ldr r5, _080DA920 + ldr r5, =0x02039f25 ldrb r0, [r5] lsls r0, 6 - ldr r4, _080DA924 + ldr r4, =0x02039e0d adds r0, r4 mov r1, sp movs r2, 0x8 @@ -447648,10 +432810,7 @@ _080DA8F2: movs r1, 0xD8 b _080DA930 .align 2, 0 -_080DA918: .4byte 0x03005d90 -_080DA91C: .4byte 0x02039f2a -_080DA920: .4byte 0x02039f25 -_080DA924: .4byte 0x02039e0d + .pool _080DA928: ldrb r0, [r5] lsls r0, 6 @@ -447659,8 +432818,8 @@ _080DA928: movs r1, 0xD9 _080DA930: strb r1, [r0, 0x8] - ldr r7, _080DAAB4 - ldr r6, _080DAAB8 + ldr r7, =0x02039e00 + ldr r6, =0x02039f25 ldrb r0, [r6] lsls r0, 6 adds r1, r7, 0 @@ -447676,7 +432835,7 @@ _080DA930: movs r0, 0x64 mov r1, r8 muls r1, r0 - ldr r0, _080DAABC + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0xB @@ -447691,7 +432850,7 @@ _080DA930: bl pokemon_getattr mov r0, sp bl get_end_of_string_ptr_limit_10_chars - ldr r0, _080DAAC0 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -447834,10 +432993,7 @@ _080DA994: adds r3, 0x14 b _080DAB12 .align 2, 0 -_080DAAB4: .4byte 0x02039e00 -_080DAAB8: .4byte 0x02039f25 -_080DAABC: .4byte 0x020244ec -_080DAAC0: .4byte 0x02039f2a + .pool _080DAAC4: cmp r2, 0xFF bne _080DAAD4 @@ -447859,7 +433015,7 @@ _080DAAD4: lsrs r6, r0, 16 b _080DAB12 _080DAAE8: - ldr r0, _080DAAFC + ldr r0, =0x00000101 cmp r2, r0 bne _080DAB00 lsls r0, r7, 16 @@ -447869,7 +433025,7 @@ _080DAAE8: lsrs r7, r0, 16 b _080DAB12 .align 2, 0 -_080DAAFC: .4byte 0x00000101 + .pool _080DAB00: movs r0, 0x81 lsls r0, 1 @@ -447909,8 +433065,8 @@ _080DAB36: ble _080DAB40 movs r4, 0xFF _080DAB40: - ldr r2, _080DAB84 - ldr r1, _080DAB88 + ldr r2, =0x02039e00 + ldr r1, =0x02039f25 ldrb r0, [r1] lsls r0, 6 adds r0, r2 @@ -447943,8 +433099,7 @@ _080DAB40: pop {r0} bx r0 .align 2, 0 -_080DAB84: .4byte 0x02039e00 -_080DAB88: .4byte 0x02039f25 + .pool thumb_func_end sub_80DA8C8 thumb_func_start sub_80DAB8C @@ -447961,12 +433116,12 @@ sub_80DAB8C: @ 80DAB8C movs r6, 0 movs r7, 0 bl sub_80DA884 - ldr r0, _080DABDC + ldr r0, =0x00000864 bl flag_check lsls r0, 24 cmp r0, 0 beq _080DABC0 - ldr r0, _080DABE0 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -447975,8 +433130,8 @@ sub_80DAB8C: @ 80DAB8C movs r7, 0x1 _080DABC0: movs r5, 0 - ldr r2, _080DABE4 - ldr r3, _080DABE8 + ldr r2, =0x085880a4 + ldr r3, =0x085898a4 _080DABC6: ldrb r0, [r2, 0x1C] lsls r0, 30 @@ -447990,10 +433145,7 @@ _080DABC6: beq _080DAC3A b _080DABF2 .align 2, 0 -_080DABDC: .4byte 0x00000864 -_080DABE0: .4byte 0x02039f2a -_080DABE4: .4byte 0x085880a4 -_080DABE8: .4byte 0x085898a4 + .pool _080DABEC: ldrb r0, [r3] cmp r0, 0x2 @@ -448051,7 +433203,7 @@ _080DAC3A: movs r0, 0xFF strb r0, [r1] movs r5, 0 - ldr r7, _080DACB0 + ldr r7, =0x085880a4 _080DAC50: bl GenerateRandomNumber lsls r0, 16 @@ -448060,7 +433212,7 @@ _080DAC50: bl __modsi3 lsls r0, 16 lsrs r0, 16 - ldr r1, _080DACB4 + ldr r1, =0x02039e00 lsls r2, r5, 6 adds r2, r1 mov r1, sp @@ -448090,7 +433242,7 @@ _080DAC92: adds r5, r2, 0 cmp r5, 0x2 ble _080DAC50 - ldr r0, _080DACB8 + ldr r0, =0x02039f24 ldrb r0, [r0] bl sub_80DA8C8 add sp, 0x64 @@ -448100,9 +433252,7 @@ _080DAC92: pop {r0} bx r0 .align 2, 0 -_080DACB0: .4byte 0x085880a4 -_080DACB4: .4byte 0x02039e00 -_080DACB8: .4byte 0x02039f24 + .pool thumb_func_end sub_80DAB8C thumb_func_start sub_80DACBC @@ -448118,7 +433268,7 @@ sub_80DACBC: @ 80DACBC lsls r1, 24 lsrs r2, r1, 24 movs r7, 0 - ldr r0, _080DACFC + ldr r0, =0x02039f30 ldrb r1, [r0] mov r9, r0 cmp r1, 0x4 @@ -448126,8 +433276,8 @@ sub_80DACBC: @ 80DACBC b _080DADF6 _080DACDE: movs r5, 0 - ldr r3, _080DAD00 - ldr r6, _080DAD04 + ldr r3, =0x085880a4 + ldr r6, =0x085898a4 _080DACE4: ldrb r0, [r3, 0x1C] lsls r0, 30 @@ -448142,9 +433292,7 @@ _080DACE4: beq _080DAD56 b _080DAD0E .align 2, 0 -_080DACFC: .4byte 0x02039f30 -_080DAD00: .4byte 0x085880a4 -_080DAD04: .4byte 0x085898a4 + .pool _080DAD08: ldrb r0, [r6] cmp r0, 0x2 @@ -448208,7 +433356,7 @@ _080DAD56: subs r0, r1 cmp r5, r0 bge _080DADF6 - ldr r3, _080DAE04 + ldr r3, =0x02039e00 mov r8, r3 mov r6, r9 movs r0, 0x2 @@ -448227,7 +433375,7 @@ _080DAD82: adds r0, r5 lsls r0, 6 add r0, r8 - ldr r2, _080DAE08 + ldr r2, =0x085880a4 mov r3, sp adds r4, r3, r1 ldrb r1, [r4] @@ -448279,8 +433427,7 @@ _080DADF6: pop {r0} bx r0 .align 2, 0 -_080DAE04: .4byte 0x02039e00 -_080DAE08: .4byte 0x085880a4 + .pool thumb_func_end sub_80DACBC thumb_func_start sub_80DAE0C @@ -448302,18 +433449,17 @@ _080DAE1E: movs r0, 0x4 b _080DAE9A _080DAE2E: - ldr r0, _080DAE40 + ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0x4 bhi _080DAE82 lsls r0, 2 - ldr r1, _080DAE44 + ldr r1, =_080DAE48 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DAE40: .4byte 0x02039f2c -_080DAE44: .4byte _080DAE48 + .pool .align 2, 0 _080DAE48: .4byte _080DAE5C @@ -448349,7 +433495,7 @@ _080DAE82: movs r0, 0 b _080DAE9A _080DAE86: - ldr r0, _080DAEA0 + ldr r0, =0x02039f2e adds r2, r1, 0 ldrh r1, [r0] movs r0, 0x2 @@ -448364,7 +433510,7 @@ _080DAE9A: pop {r1} bx r1 .align 2, 0 -_080DAEA0: .4byte 0x02039f2e + .pool thumb_func_end sub_80DAE0C thumb_func_start sub_80DAEA4 @@ -448372,7 +433518,7 @@ sub_80DAEA4: @ 80DAEA4 push {r4,r5,lr} movs r5, 0 _080DAEA8: - ldr r0, _080DAED0 + ldr r0, =0x02039f26 adds r0, r5, r0 ldrb r0, [r0] movs r1, 0 @@ -448390,7 +433536,7 @@ _080DAEA8: pop {r0} bx r0 .align 2, 0 -_080DAED0: .4byte 0x02039f26 + .pool thumb_func_end sub_80DAEA4 thumb_func_start sub_80DAED4 @@ -448399,8 +433545,8 @@ sub_80DAED4: @ 80DAED4 adds r5, r0, 0 lsls r4, r1, 24 lsrs r4, 24 - ldr r0, _080DAEFC - ldr r1, _080DAF00 + ldr r0, =0x02022e2c + ldr r1, =0x085ed1ab bl gf_strcpy adds r1, r0, 0 subs r0, r1, 0x1 @@ -448413,8 +433559,7 @@ sub_80DAED4: @ 80DAED4 pop {r1} bx r1 .align 2, 0 -_080DAEFC: .4byte 0x02022e2c -_080DAF00: .4byte 0x085ed1ab + .pool thumb_func_end sub_80DAED4 thumb_func_start sub_80DAF04 @@ -448442,18 +433587,18 @@ sub_80DAF1C: @ 80DAF1C adds r5, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _080DAF78 + ldr r1, =0x085e8d3e add r0, sp, 0x4 bl gf_strcpy lsls r1, r5, 6 - ldr r0, _080DAF7C + ldr r0, =0x02039e0d adds r1, r0 add r0, sp, 0x4 bl gf_strcat add r0, sp, 0x4 adds r1, r4, 0 bl sub_80DAED4 - ldr r4, _080DAF80 + ldr r4, =0x02022e2c movs r0, 0x7 adds r1, r4, 0 movs r2, 0x60 @@ -448463,7 +433608,7 @@ sub_80DAF1C: @ 80DAF1C ble _080DAF5C movs r2, 0x37 _080DAF5C: - ldr r0, _080DAF84 + ldr r0, =0x02039f26 adds r0, r5, r0 ldrb r0, [r0] movs r1, 0x7 @@ -448476,10 +433621,7 @@ _080DAF5C: pop {r0} bx r0 .align 2, 0 -_080DAF78: .4byte 0x085e8d3e -_080DAF7C: .4byte 0x02039e0d -_080DAF80: .4byte 0x02022e2c -_080DAF84: .4byte 0x02039f26 + .pool thumb_func_end sub_80DAF1C thumb_func_start sub_80DAF88 @@ -448507,13 +433649,13 @@ sub_80DAFA0: @ 80DAFA0 lsls r1, 24 lsrs r1, 24 lsls r0, r4, 6 - ldr r2, _080DAFD4 + ldr r2, =0x02039e02 adds r0, r2 bl sub_80DAED4 - ldr r0, _080DAFD8 + ldr r0, =0x02039f26 adds r4, r0 ldrb r0, [r4] - ldr r1, _080DAFDC + ldr r1, =0x02022e2c movs r2, 0x7 str r2, [sp] movs r2, 0x5 @@ -448524,9 +433666,7 @@ sub_80DAFA0: @ 80DAFA0 pop {r0} bx r0 .align 2, 0 -_080DAFD4: .4byte 0x02039e02 -_080DAFD8: .4byte 0x02039f26 -_080DAFDC: .4byte 0x02022e2c + .pool thumb_func_end sub_80DAFA0 thumb_func_start sub_80DAFE0 @@ -448539,12 +433679,12 @@ sub_80DAFE0: @ 80DAFE0 cmp r0, 0x4 bhi _080DB06C lsls r0, 2 - ldr r1, _080DAFF8 + ldr r1, =_080DAFFC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DAFF8: .4byte _080DAFFC + .pool .align 2, 0 _080DAFFC: .4byte _080DB010 @@ -448553,7 +433693,7 @@ _080DAFFC: .4byte _080DB050 .4byte _080DB06C _080DB010: - ldr r0, _080DB024 + ldr r0, =0x02039e00 lsls r2, 6 adds r1, r2, r0 adds r3, r1, 0 @@ -448564,9 +433704,9 @@ _080DB010: adds r1, 0x27 b _080DB07E .align 2, 0 -_080DB024: .4byte 0x02039e00 + .pool _080DB028: - ldr r0, _080DB03C + ldr r0, =0x02039e00 lsls r2, 6 adds r1, r2, r0 adds r3, r1, 0 @@ -448577,18 +433717,18 @@ _080DB028: adds r1, 0x28 b _080DB07E .align 2, 0 -_080DB03C: .4byte 0x02039e00 + .pool _080DB040: - ldr r1, _080DB04C + ldr r1, =0x02039e00 lsls r2, 6 adds r3, r2, r1 adds r0, r3, 0 adds r0, 0x28 b _080DB05A .align 2, 0 -_080DB04C: .4byte 0x02039e00 + .pool _080DB050: - ldr r1, _080DB068 + ldr r1, =0x02039e00 lsls r2, 6 adds r3, r2, r1 adds r0, r3, 0 @@ -448602,9 +433742,9 @@ _080DB05A: adds r0, r1, 0 b _080DB080 .align 2, 0 -_080DB068: .4byte 0x02039e00 + .pool _080DB06C: - ldr r0, _080DB098 + ldr r0, =0x02039e00 lsls r2, 6 adds r1, r2, r0 adds r3, r1, 0 @@ -448629,7 +433769,7 @@ _080DB080: pop {r1} bx r1 .align 2, 0 -_080DB098: .4byte 0x02039e00 + .pool thumb_func_end sub_80DAFE0 thumb_func_start sub_80DB09C @@ -448638,7 +433778,7 @@ sub_80DB09C: @ 80DB09C lsls r0, 24 lsrs r6, r0, 24 movs r4, 0 - ldr r5, _080DB0C0 + ldr r5, =0x02039f00 _080DB0A6: lsls r0, r4, 24 lsrs r0, 24 @@ -448653,27 +433793,27 @@ _080DB0A6: pop {r0} bx r0 .align 2, 0 -_080DB0C0: .4byte 0x02039f00 + .pool thumb_func_end sub_80DB09C thumb_func_start sub_80DB0C4 sub_80DB0C4: @ 80DB0C4 push {r4,r5,lr} - ldr r0, _080DB10C + ldr r0, =0x08587c00 bl gpu_tile_obj_decompress_and_load - ldr r0, _080DB110 + ldr r0, =0x08c1c6b8 movs r1, 0x88 lsls r1, 1 movs r2, 0x20 bl decompress_palette - ldr r0, _080DB114 + ldr r0, =0x08587be8 movs r1, 0x70 movs r2, 0x24 movs r3, 0x1E bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r4, _080DB118 + ldr r4, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -448686,34 +433826,30 @@ sub_80DB0C4: @ 80DB0C4 strb r1, [r5, 0x5] adds r4, 0x1C adds r2, r4 - ldr r1, _080DB11C + ldr r1, =nullsub_12 + 1 str r1, [r2] pop {r4,r5} pop {r1} bx r1 .align 2, 0 -_080DB10C: .4byte 0x08587c00 -_080DB110: .4byte 0x08c1c6b8 -_080DB114: .4byte 0x08587be8 -_080DB118: .4byte 0x02020630 -_080DB11C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80DB0C4 thumb_func_start sub_80DB120 sub_80DB120: @ 80DB120 push {lr} - ldr r0, _080DB164 + ldr r0, =0x08587c08 bl gpu_tile_obj_decompress_and_load - ldr r0, _080DB168 + ldr r0, =0x08587c10 bl gpu_pal_obj_decompress_and_apply - ldr r0, _080DB16C + ldr r0, =0x08587c18 movs r1, 0x60 movs r2, 0xA movs r3, 0x1D bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _080DB170 + ldr r1, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -448733,10 +433869,7 @@ sub_80DB120: @ 80DB120 pop {r1} bx r1 .align 2, 0 -_080DB164: .4byte 0x08587c08 -_080DB168: .4byte 0x08587c10 -_080DB16C: .4byte 0x08587c18 -_080DB170: .4byte 0x02020630 + .pool thumb_func_end sub_80DB120 thumb_func_start sub_80DB174 @@ -448752,14 +433885,14 @@ sub_80DB174: @ 80DB174 adds r0, r5, 0 bl sub_80DE84C adds r5, r0, 0 - ldr r0, _080DB1AC + ldr r0, =0x02039f25 ldrb r0, [r0] cmp r4, r0 bne _080DB1B8 lsls r0, r5, 3 - ldr r1, _080DB1B0 + ldr r1, =0x083028b8 adds r0, r1 - ldr r1, _080DB1B4 + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x4] adds r2, r5, 0 @@ -448767,14 +433900,12 @@ sub_80DB174: @ 80DB174 bl help_system_enable_unless_flashback__sp199 b _080DB1CC .align 2, 0 -_080DB1AC: .4byte 0x02039f25 -_080DB1B0: .4byte 0x083028b8 -_080DB1B4: .4byte 0x020244d4 + .pool _080DB1B8: lsls r0, r5, 3 - ldr r1, _080DB260 + ldr r1, =0x083028b8 adds r0, r1 - ldr r1, _080DB264 + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x4] adds r2, r5, 0 @@ -448792,7 +433923,7 @@ _080DB1CC: adds r0, r5, 0 movs r1, 0 bl sub_806A068 - ldr r4, _080DB268 + ldr r4, =0x0202499c movs r0, 0x2 adds r1, r5, 0 movs r2, 0 @@ -448806,7 +433937,7 @@ _080DB1CC: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080DB26C + ldr r0, =0x02020630 mov r8, r0 lsls r0, r7, 4 adds r0, r7 @@ -448832,7 +433963,7 @@ _080DB1CC: mov r0, r8 adds r0, 0x1C adds r0, r6, r0 - ldr r1, _080DB270 + ldr r1, =nullsub_12 + 1 str r1, [r0] ldrb r0, [r4, 0x5] lsrs r0, 4 @@ -448846,26 +433977,21 @@ _080DB1CC: mov r0, r8 adds r0, 0x10 adds r0, r6, r0 - ldr r1, _080DB274 + ldr r1, =0x082ff6c0 b _080DB280 .align 2, 0 -_080DB260: .4byte 0x083028b8 -_080DB264: .4byte 0x020244d4 -_080DB268: .4byte 0x0202499c -_080DB26C: .4byte 0x02020630 -_080DB270: .4byte nullsub_12 + 1 -_080DB274: .4byte 0x082ff6c0 + .pool _080DB278: mov r0, r8 adds r0, 0x10 adds r0, r6, r0 - ldr r1, _080DB2A0 + ldr r1, =0x082ff694 _080DB280: str r1, [r0] lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _080DB2A4 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 bl sub_8008258 @@ -448876,8 +434002,7 @@ _080DB280: pop {r1} bx r1 .align 2, 0 -_080DB2A0: .4byte 0x082ff694 -_080DB2A4: .4byte 0x02020630 + .pool thumb_func_end sub_80DB174 thumb_func_start sub_80DB2A8 @@ -448899,7 +434024,7 @@ _080DB2B8: thumb_func_start sub_80DB2BC sub_80DB2BC: @ 80DB2BC push {r4-r6,lr} - ldr r5, _080DB2E8 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r0, [r0, 0x24] movs r4, 0xA0 @@ -448919,7 +434044,7 @@ sub_80DB2BC: @ 80DB2BC pop {r0} bx r0 .align 2, 0 -_080DB2E8: .4byte 0x02039f34 + .pool thumb_func_end sub_80DB2BC thumb_func_start sub_80DB2EC @@ -448928,8 +434053,8 @@ sub_80DB2EC: @ 80DB2EC lsls r0, 16 lsls r1, 24 lsrs r3, r1, 24 - ldr r2, _080DB314 - ldr r1, _080DB318 + ldr r2, =0x0858cdcc + ldr r1, =0x0858c2b4 lsrs r0, 13 adds r0, r1 ldrb r0, [r0] @@ -448939,14 +434064,12 @@ sub_80DB2EC: @ 80DB2EC cmp r0, 0x8 bhi _080DB354 lsls r0, 2 - ldr r1, _080DB31C + ldr r1, =_080DB320 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DB314: .4byte 0x0858cdcc -_080DB318: .4byte 0x0858c2b4 -_080DB31C: .4byte _080DB320 + .pool .align 2, 0 _080DB320: .4byte _080DB344 @@ -448959,17 +434082,17 @@ _080DB320: .4byte _080DB354 .4byte _080DB344 _080DB344: - ldr r0, _080DB348 + ldr r0, =0x00009082 b _080DB356 .align 2, 0 -_080DB348: .4byte 0x00009082 + .pool _080DB34C: - ldr r0, _080DB350 + ldr r0, =0x00009088 b _080DB356 .align 2, 0 -_080DB350: .4byte 0x00009088 + .pool _080DB354: - ldr r0, _080DB36C + ldr r0, =0x00009086 _080DB356: lsls r1, r3, 12 movs r2, 0x90 @@ -448983,7 +434106,7 @@ _080DB356: pop {r1} bx r1 .align 2, 0 -_080DB36C: .4byte 0x00009086 + .pool thumb_func_end sub_80DB2EC thumb_func_start prints_contest_move_description @@ -448995,13 +434118,13 @@ prints_contest_move_description: @ 80DB370 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r1, _080DB3F0 + ldr r1, =0x0858c2b4 lsls r0, 3 adds r0, r1 ldrb r0, [r0, 0x1] lsls r0, 29 lsrs r0, 29 - ldr r7, _080DB3F4 + ldr r7, =0x00004040 cmp r0, 0 beq _080DB3A4 adds r7, 0x5 @@ -449037,8 +434160,8 @@ _080DB3A4: movs r2, 0xB movs r3, 0x20 bl sub_80DECB8 - ldr r2, _080DB3F8 - ldr r0, _080DB3F0 + ldr r2, =0x0858cdcc + ldr r0, =0x0858c2b4 mov r3, r8 lsls r1, r3, 3 adds r0, r1, r0 @@ -449052,9 +434175,7 @@ _080DB3A4: movs r6, 0 b _080DB408 .align 2, 0 -_080DB3F0: .4byte 0x0858c2b4 -_080DB3F4: .4byte 0x00004040 -_080DB3F8: .4byte 0x0858cdcc + .pool _080DB3FC: ldrb r0, [r2, 0x1] movs r1, 0xA @@ -449066,7 +434187,7 @@ _080DB408: bls _080DB40E movs r6, 0x8 _080DB40E: - ldr r1, _080DB450 + ldr r1, =0x00005035 movs r0, 0x8 str r0, [sp] movs r5, 0x1 @@ -449077,7 +434198,7 @@ _080DB40E: movs r2, 0x15 movs r3, 0x1F bl sub_80DED10 - ldr r1, _080DB454 + ldr r1, =0x00005012 str r6, [sp] str r5, [sp, 0x4] str r4, [sp, 0x8] @@ -449085,8 +434206,8 @@ _080DB40E: movs r2, 0x15 movs r3, 0x1F bl sub_80DED10 - ldr r1, _080DB458 - ldr r0, _080DB45C + ldr r1, =0x0858cdcc + ldr r0, =0x0858c2b4 adds r0, r7, r0 ldrb r0, [r0] lsls r0, 2 @@ -449097,10 +434218,7 @@ _080DB40E: movs r6, 0 b _080DB46C .align 2, 0 -_080DB450: .4byte 0x00005035 -_080DB454: .4byte 0x00005012 -_080DB458: .4byte 0x0858cdcc -_080DB45C: .4byte 0x0858c2b4 + .pool _080DB460: ldrb r0, [r1, 0x2] movs r1, 0xA @@ -449112,7 +434230,7 @@ _080DB46C: bls _080DB472 movs r6, 0x8 _080DB472: - ldr r1, _080DB4CC + ldr r1, =0x00005036 movs r0, 0x8 str r0, [sp] movs r5, 0x1 @@ -449123,7 +434241,7 @@ _080DB472: movs r2, 0x15 movs r3, 0x20 bl sub_80DED10 - ldr r1, _080DB4D0 + ldr r1, =0x00005014 str r6, [sp] str r5, [sp, 0x4] str r4, [sp, 0x8] @@ -449134,8 +434252,8 @@ _080DB472: movs r0, 0xA movs r1, 0 bl Window_FastFillPixels - ldr r1, _080DB4D4 - ldr r0, _080DB4D8 + ldr r1, =0x08587c50 + ldr r0, =0x0858c2b4 adds r0, r7, r0 ldrb r0, [r0] lsls r0, 2 @@ -449143,7 +434261,7 @@ _080DB472: ldr r1, [r0] movs r0, 0xA bl sub_80DEB70 - ldr r1, _080DB4DC + ldr r1, =0x085e8d3e movs r0, 0x9 bl sub_80DEB70 add sp, 0x10 @@ -449153,11 +434271,7 @@ _080DB472: pop {r0} bx r0 .align 2, 0 -_080DB4CC: .4byte 0x00005036 -_080DB4D0: .4byte 0x00005014 -_080DB4D4: .4byte 0x08587c50 -_080DB4D8: .4byte 0x0858c2b4 -_080DB4DC: .4byte 0x085e8d3e + .pool thumb_func_end prints_contest_move_description thumb_func_start sub_80DB4E0 @@ -449170,7 +434284,7 @@ sub_80DB4E0: @ 80DB4E0 lsrs r5, r0, 16 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _080DB55C + ldr r0, =0x02039f26 adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 2 @@ -449221,7 +434335,7 @@ sub_80DB4E0: @ 80DB4E0 bl sub_80DECB8 b _080DB576 .align 2, 0 -_080DB55C: .4byte 0x02039f26 + .pool _080DB560: movs r0, 0x2 str r0, [sp] @@ -449248,7 +434362,7 @@ sub_80DB584: @ 80DB584 movs r4, 0 movs r5, 0 _080DB58A: - ldr r0, _080DB5AC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x4] adds r0, r5, r0 @@ -449264,15 +434378,15 @@ _080DB58A: pop {r0} bx r0 .align 2, 0 -_080DB5AC: .4byte 0x02039f34 + .pool thumb_func_end sub_80DB584 thumb_func_start sub_80DB5B0 sub_80DB5B0: @ 80DB5B0 - ldr r0, _080DB5B4 + ldr r0, =0x00002034 bx lr .align 2, 0 -_080DB5B4: .4byte 0x00002034 + .pool thumb_func_end sub_80DB5B0 thumb_func_start sub_80DB5B8 @@ -449289,7 +434403,7 @@ sub_80DB5B8: @ 80DB5B8 lsrs r1, 24 mov r8, r1 mov r10, r8 - ldr r0, _080DB5F0 + ldr r0, =0x02039f34 mov r9, r0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -449305,9 +434419,9 @@ sub_80DB5B8: @ 80DB5B8 movs r0, 0 b _080DB68A .align 2, 0 -_080DB5F0: .4byte 0x02039f34 + .pool _080DB5F4: - ldr r0, _080DB644 + ldr r0, =0x02039f26 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 2 @@ -449344,7 +434458,7 @@ _080DB5F4: movs r0, 0x5B b _080DB672 .align 2, 0 -_080DB644: .4byte 0x02039f26 + .pool _080DB648: adds r3, r6, r4 lsls r3, 24 @@ -449406,7 +434520,7 @@ sub_80DB69C: @ 80DB69C movs r0, 0 mov r8, r0 _080DB6B6: - ldr r0, _080DB740 + ldr r0, =0x02039f26 adds r0, r7, r0 ldrb r0, [r0] lsls r4, r0, 2 @@ -449418,7 +434532,7 @@ _080DB6B6: adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 - ldr r0, _080DB744 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x4] add r0, r8 @@ -449471,8 +434585,7 @@ _080DB6B6: pop {r0} bx r0 .align 2, 0 -_080DB740: .4byte 0x02039f26 -_080DB744: .4byte 0x02039f34 + .pool thumb_func_end sub_80DB69C thumb_func_start sub_80DB748 @@ -449484,12 +434597,12 @@ sub_80DB748: @ 80DB748 cmp r1, 0x4 bhi _080DB78A lsls r0, r1, 2 - ldr r1, _080DB760 + ldr r1, =_080DB764 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DB760: .4byte _080DB764 + .pool .align 2, 0 _080DB764: .4byte _080DB778 @@ -449534,7 +434647,7 @@ sub_80DB798: @ 80DB798 mov r9, r1 movs r1, 0 mov r8, r1 - ldr r1, _080DB7E0 + ldr r1, =0x02039f26 adds r1, r0, r1 ldrb r2, [r1] lsls r1, r2, 2 @@ -449542,7 +434655,7 @@ sub_80DB798: @ 80DB798 adds r1, 0x2 lsls r1, 24 lsrs r7, r1, 24 - ldr r1, _080DB7E4 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r2, [r1, 0x4] lsls r1, r0, 3 @@ -449550,7 +434663,7 @@ sub_80DB798: @ 80DB798 lsls r1, 2 adds r2, r1, r2 ldr r0, [r2, 0x10] - ldr r1, _080DB7E8 + ldr r1, =0x00ff0003 ands r0, r1 cmp r0, 0 bne _080DB7DC @@ -449561,9 +434674,7 @@ _080DB7DC: movs r0, 0 b _080DB80E .align 2, 0 -_080DB7E0: .4byte 0x02039f26 -_080DB7E4: .4byte 0x02039f34 -_080DB7E8: .4byte 0x00ff0003 + .pool _080DB7EC: ldrb r1, [r2, 0xC] mov r0, r9 @@ -449691,7 +434802,7 @@ sub_80DB8B8: @ 80DB8B8 movs r0, 0 b _080DB90A _080DB8D0: - ldr r0, _080DB8EC + ldr r0, =0x02039f25 ldrb r0, [r0] cmp r4, r0 beq _080DB8F4 @@ -449699,16 +434810,15 @@ _080DB8D0: bl sub_81562C4 bl sub_8156324 lsls r0, 24 - ldr r2, _080DB8F0 + ldr r2, =0x02039e00 lsrs r0, 23 lsls r1, r4, 6 b _080DB902 .align 2, 0 -_080DB8EC: .4byte 0x02039f25 -_080DB8F0: .4byte 0x02039e00 + .pool _080DB8F4: - ldr r2, _080DB910 - ldr r0, _080DB914 + ldr r2, =0x02039e00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0] @@ -449724,8 +434834,7 @@ _080DB90A: pop {r1} bx r1 .align 2, 0 -_080DB910: .4byte 0x02039e00 -_080DB914: .4byte 0x02039f34 + .pool thumb_func_end sub_80DB8B8 thumb_func_start sub_80DB918 @@ -449737,7 +434846,7 @@ _080DB91E: lsls r0, r4, 24 lsrs r0, 24 bl sub_80DB8B8 - ldr r1, _080DB940 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r1, [r1, 0x4] adds r1, r5, r1 @@ -449750,7 +434859,7 @@ _080DB91E: pop {r0} bx r0 .align 2, 0 -_080DB940: .4byte 0x02039f34 + .pool thumb_func_end sub_80DB918 thumb_func_start sub_80DB944 @@ -449760,7 +434869,7 @@ sub_80DB944: @ 80DB944 mov r6, r8 push {r6,r7} sub sp, 0x8 - ldr r5, _080DB9EC + ldr r5, =0x02039f34 mov r4, sp movs r3, 0 movs r6, 0x3 @@ -449815,7 +434924,7 @@ _080DB9A4: movs r0, 0x4 negs r0, r0 mov r9, r0 - ldr r1, _080DB9EC + ldr r1, =0x02039f34 mov r8, r1 movs r7, 0x3 mov r12, r7 @@ -449846,7 +434955,7 @@ _080DB9C6: strb r0, [r2, 0xB] b _080DB9F8 .align 2, 0 -_080DB9EC: .4byte 0x02039f34 + .pool _080DB9F0: adds r3, 0x2 adds r4, 0x1 @@ -449871,7 +434980,7 @@ _080DB9F8: thumb_func_start sub_80DBA18 sub_80DBA18: @ 80DBA18 push {r4,r5,lr} - ldr r4, _080DBA30 + ldr r4, =0x02039f34 movs r2, 0 movs r3, 0x3 _080DBA20: @@ -449884,7 +434993,7 @@ _080DBA20: movs r1, 0x5 b _080DBA52 .align 2, 0 -_080DBA30: .4byte 0x02039f34 + .pool _080DBA34: movs r5, 0x2 ldrsh r0, [r1, r5] @@ -449920,7 +435029,7 @@ sub_80DBA68: @ 80DBA68 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080DBA94 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r2, [r1, 0x4] lsls r1, r0, 3 @@ -449941,7 +435050,7 @@ _080DBA90: movs r0, 0 b _080DBA9A .align 2, 0 -_080DBA94: .4byte 0x02039f34 + .pool _080DBA98: movs r0, 0x1 _080DBA9A: @@ -449956,7 +435065,7 @@ sub_80DBAA0: @ 80DBAA0 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r5, _080DBCA4 + ldr r5, =0x02039f34 movs r0, 0 mov r8, r0 movs r1, 0x7 @@ -450159,7 +435268,7 @@ _080DBC1A: b _080DBAC0 _080DBC34: movs r6, 0 - ldr r5, _080DBCA4 + ldr r5, =0x02039f34 movs r7, 0 movs r4, 0 _080DBC3C: @@ -450199,7 +435308,7 @@ _080DBC3C: adds r6, 0x1 cmp r6, 0x3 ble _080DBC3C - ldr r0, _080DBCA4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x10] ldrb r1, [r2, 0x1] @@ -450215,7 +435324,7 @@ _080DBC3C: pop {r0} bx r0 .align 2, 0 -_080DBCA4: .4byte 0x02039f34 + .pool thumb_func_end sub_80DBAA0 thumb_func_start sub_80DBCA8 @@ -450223,7 +435332,7 @@ sub_80DBCA8: @ 80DBCA8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080DBCD4 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r2, [r1, 0x4] lsls r1, r0, 3 @@ -450244,7 +435353,7 @@ _080DBCD0: movs r0, 0x1 b _080DBCDA .align 2, 0 -_080DBCD4: .4byte 0x02039f34 + .pool _080DBCD8: movs r0, 0 _080DBCDA: @@ -450260,13 +435369,13 @@ sub_80DBCE0: @ 80DBCE0 lsrs r4, 24 adds r0, r4, 0 bl sub_80DBD34 - ldr r1, _080DBD0C + ldr r1, =0x02039f18 lsls r4, 1 adds r1, r4, r1 strh r0, [r1] - ldr r2, _080DBD10 + ldr r2, =0x02039f08 adds r2, r4, r2 - ldr r1, _080DBD14 + ldr r1, =0x02039f00 adds r4, r1 ldrh r4, [r4] adds r0, r4 @@ -450275,9 +435384,7 @@ sub_80DBCE0: @ 80DBCE0 pop {r0} bx r0 .align 2, 0 -_080DBD0C: .4byte 0x02039f18 -_080DBD10: .4byte 0x02039f08 -_080DBD14: .4byte 0x02039f00 + .pool thumb_func_end sub_80DBCE0 thumb_func_start sub_80DBD18 @@ -450300,7 +435407,7 @@ _080DBD1C: thumb_func_start sub_80DBD34 sub_80DBD34: @ 80DBD34 lsls r0, 24 - ldr r1, _080DBD48 + ldr r1, =0x02039f10 lsrs r0, 23 adds r0, r1 movs r1, 0 @@ -450309,7 +435416,7 @@ sub_80DBD34: @ 80DBD34 asrs r0, 16 bx lr .align 2, 0 -_080DBD48: .4byte 0x02039f10 + .pool thumb_func_end sub_80DBD34 thumb_func_start sub_80DBD4C @@ -450378,9 +435485,9 @@ _080DBDB8: movs r1, 0 mov r9, r1 mov r4, sp - ldr r6, _080DBEC8 + ldr r6, =0x02039f08 ldr r2, [sp, 0x64] - ldr r5, _080DBECC + ldr r5, =0x02039f00 ldr r3, [sp, 0x68] _080DBDD2: mov r7, r9 @@ -450488,7 +435595,7 @@ _080DBE90: ble _080DBE06 movs r6, 0 mov r9, r6 - ldr r2, _080DBED0 + ldr r2, =0x02039f20 ldr r1, [sp, 0x6C] _080DBEA2: ldr r0, [r1] @@ -450510,38 +435617,36 @@ _080DBEA2: pop {r0} bx r0 .align 2, 0 -_080DBEC8: .4byte 0x02039f08 -_080DBECC: .4byte 0x02039f00 -_080DBED0: .4byte 0x02039f20 + .pool thumb_func_end sub_80DBD4C thumb_func_start sub_80DBED4 sub_80DBED4: @ 80DBED4 push {lr} - ldr r0, _080DBF14 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080DBF0E - ldr r0, _080DBF18 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r1, _080DBF1C - ldr r0, _080DBF20 + ldr r1, =0x02039f20 + ldr r0, =0x02039f25 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] lsls r1, 1 - ldr r0, _080DBF24 + ldr r0, =0x02039f2c ldrh r0, [r0] lsls r0, 3 adds r1, r0 - ldr r0, _080DBF28 + ldr r0, =0x00000624 adds r2, r0 adds r2, r1 ldrh r0, [r2] adds r0, 0x1 - ldr r1, _080DBF2C + ldr r1, =0x0000270f cmp r0, r1 ble _080DBF0C adds r0, r1, 0 @@ -450551,13 +435656,7 @@ _080DBF0E: pop {r0} bx r0 .align 2, 0 -_080DBF14: .4byte 0x02039f2a -_080DBF18: .4byte 0x03005d90 -_080DBF1C: .4byte 0x02039f20 -_080DBF20: .4byte 0x02039f25 -_080DBF24: .4byte 0x02039f2c -_080DBF28: .4byte 0x00000624 -_080DBF2C: .4byte 0x0000270f + .pool thumb_func_end sub_80DBED4 thumb_func_start sub_80DBF30 @@ -450599,21 +435698,19 @@ _080DBF62: thumb_func_start sub_80DBF68 sub_80DBF68: @ 80DBF68 push {lr} - ldr r0, _080DBF84 + ldr r0, =0x02022e16 movs r1, 0 strh r1, [r0] - ldr r0, _080DBF88 + ldr r0, =0x02022e1e strh r1, [r0] bl sub_80DB89C - ldr r0, _080DBF8C + ldr r0, =0x0827e8da movs r1, 0 bl sub_80DEC30 pop {r0} bx r0 .align 2, 0 -_080DBF84: .4byte 0x02022e16 -_080DBF88: .4byte 0x02022e1e -_080DBF8C: .4byte 0x0827e8da + .pool thumb_func_end sub_80DBF68 thumb_func_start sub_80DBF90 @@ -450652,16 +435749,16 @@ sub_80DBFC8: @ 80DBFC8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080DBFEC + ldr r1, =0x00005011 cmp r0, 0 beq _080DBFE2 - ldr r1, _080DBFF0 + ldr r1, =0x00006011 cmp r0, 0x1 beq _080DBFE2 - ldr r1, _080DBFF4 + ldr r1, =0x00008011 cmp r0, 0x2 bne _080DBFE2 - ldr r1, _080DBFF8 + ldr r1, =0x00007011 _080DBFE2: adds r0, r1, 0x1 lsls r0, 16 @@ -450669,10 +435766,7 @@ _080DBFE2: pop {r1} bx r1 .align 2, 0 -_080DBFEC: .4byte 0x00005011 -_080DBFF0: .4byte 0x00006011 -_080DBFF4: .4byte 0x00008011 -_080DBFF8: .4byte 0x00007011 + .pool thumb_func_end sub_80DBFC8 thumb_func_start sub_80DBFFC @@ -450716,7 +435810,7 @@ sub_80DC028: @ 80DC028 lsls r2, 24 lsrs r2, 24 mov r8, r2 - ldr r0, _080DC0BC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x14] lsls r1, r2, 2 @@ -450725,7 +435819,7 @@ sub_80DC028: @ 80DC028 movs r2, 0x4 orrs r0, r2 strb r0, [r1, 0x2] - ldr r0, _080DC0C0 + ldr r0, =sub_80DC0F4 + 1 movs r1, 0x14 bl AddTask lsls r0, 24 @@ -450751,7 +435845,7 @@ sub_80DC028: @ 80DC028 lsrs r5, r0, 24 mov r0, r8 bl sub_80DBFC8 - ldr r2, _080DC0C4 + ldr r2, =0x03005e00 lsls r3, r7, 2 adds r0, r3, r7 lsls r0, 3 @@ -450776,16 +435870,14 @@ _080DC0B4: strh r0, [r1, 0xC] b _080DC0D6 .align 2, 0 -_080DC0BC: .4byte 0x02039f34 -_080DC0C0: .4byte sub_80DC0F4 + 1 -_080DC0C4: .4byte 0x03005e00 + .pool _080DC0C8: - ldr r2, _080DC0EC + ldr r2, =0x03005e00 lsls r3, r7, 2 adds r0, r3, r7 lsls r0, 3 adds r0, r2 - ldr r1, _080DC0F0 + ldr r1, =0x0000ffff strh r1, [r0, 0xC] _080DC0D6: adds r0, r3, r7 @@ -450800,8 +435892,7 @@ _080DC0D6: pop {r1} bx r1 .align 2, 0 -_080DC0EC: .4byte 0x03005e00 -_080DC0F0: .4byte 0x0000ffff + .pool thumb_func_end sub_80DC028 thumb_func_start sub_80DC0F4 @@ -450814,7 +435905,7 @@ sub_80DC0F4: @ 80DC0F4 sub sp, 0x10 lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080DC154 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -450841,7 +435932,7 @@ _080DC126: bne _080DC15C adds r0, r7, 0 bl remove_task - ldr r0, _080DC158 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x14] mov r2, r9 @@ -450854,8 +435945,7 @@ _080DC126: strb r0, [r1, 0x2] b _080DC2A8 .align 2, 0 -_080DC154: .4byte 0x03005e00 -_080DC158: .4byte 0x02039f34 + .pool _080DC15C: cmp r3, 0 bne _080DC1A4 @@ -450880,7 +435970,7 @@ _080DC17A: subs r0, 0x1 _080DC188: strh r0, [r4, 0xA] - ldr r1, _080DC1A0 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -450892,7 +435982,7 @@ _080DC188: lsrs r5, r1, 24 b _080DC210 .align 2, 0 -_080DC1A0: .4byte 0x03005e00 + .pool _080DC1A4: movs r3, 0xC ldrsh r0, [r4, r3] @@ -450967,7 +436057,7 @@ _080DC226: adds r2, 0x16 lsls r2, 24 lsrs r2, 24 - ldr r0, _080DC278 + ldr r0, =0x02039f26 add r0, r9 ldrb r0, [r0] lsls r3, r0, 2 @@ -450989,10 +436079,10 @@ _080DC226: ble _080DC284 movs r0, 0x60 bl audio_play - ldr r4, _080DC27C + ldr r4, =0x030075f0 adds r0, r4, 0 bl m4aMPlayImmInit - ldr r1, _080DC280 + ldr r1, =0x0000ffff ldr r0, [sp, 0xC] lsls r2, r0, 24 asrs r2, 16 @@ -451000,9 +436090,7 @@ _080DC226: bl MPlayPitchControl b _080DC28A .align 2, 0 -_080DC278: .4byte 0x02039f26 -_080DC27C: .4byte 0x030075f0 -_080DC280: .4byte 0x0000ffff + .pool _080DC284: movs r0, 0x16 bl audio_play @@ -451014,7 +436102,7 @@ _080DC28A: bne _080DC2A8 cmp r6, 0 bne _080DC2A8 - ldr r0, _080DC2B8 + ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -451032,27 +436120,27 @@ _080DC2A8: pop {r0} bx r0 .align 2, 0 -_080DC2B8: .4byte 0x03005e00 + .pool thumb_func_end sub_80DC0F4 thumb_func_start sub_80DC2BC sub_80DC2BC: @ 80DC2BC push {r4,r5,lr} - ldr r0, _080DC2F4 + ldr r0, =0x08587a74 bl gpu_tile_obj_alloc_tag_and_copy_to_vram movs r4, 0 - ldr r5, _080DC2F8 + ldr r5, =0x08587a6c _080DC2C8: - ldr r0, _080DC2FC + ldr r0, =0x02039f26 adds r0, r4, r0 ldrb r0, [r0] adds r0, r5 ldrb r2, [r0] - ldr r0, _080DC300 + ldr r0, =0x08587ad0 movs r1, 0xB4 movs r3, 0x1 bl obj_add_from_template_forward_search - ldr r1, _080DC304 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r2, [r1, 0x14] lsls r1, r4, 2 @@ -451065,11 +436153,7 @@ _080DC2C8: pop {r0} bx r0 .align 2, 0 -_080DC2F4: .4byte 0x08587a74 -_080DC2F8: .4byte 0x08587a6c -_080DC2FC: .4byte 0x02039f26 -_080DC300: .4byte 0x08587ad0 -_080DC304: .4byte 0x02039f34 + .pool thumb_func_end sub_80DC2BC thumb_func_start sub_80DC308 @@ -451077,7 +436161,7 @@ sub_80DC308: @ 80DC308 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _080DC34C + ldr r4, =0x02039f34 ldr r0, [r4] ldr r2, [r0, 0x14] lsls r3, r6, 2 @@ -451107,13 +436191,13 @@ sub_80DC308: @ 80DC308 movs r5, 0x38 b _080DC356 .align 2, 0 -_080DC34C: .4byte 0x02039f34 + .pool _080DC350: cmp r0, 0 bge _080DC356 movs r5, 0 _080DC356: - ldr r2, _080DC388 + ldr r2, =0x02020630 lsls r3, r7, 4 adds r0, r3, r7 lsls r0, 2 @@ -451138,9 +436222,9 @@ _080DC356: movs r0, 0x1 b _080DC38E .align 2, 0 -_080DC388: .4byte 0x02020630 + .pool _080DC38C: - ldr r0, _080DC3A4 + ldr r0, =0x0000ffff _080DC38E: strh r0, [r4, 0x32] adds r0, r3, r7 @@ -451148,14 +436232,13 @@ _080DC38E: adds r1, r2, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _080DC3A8 + ldr r1, =sub_80DC408 + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080DC3A4: .4byte 0x0000ffff -_080DC3A8: .4byte sub_80DC408 + 1 + .pool thumb_func_end sub_80DC308 thumb_func_start sub_80DC3AC @@ -451178,7 +436261,7 @@ _080DC3B0: sub_80DC3C4: @ 80DC3C4 push {r4,lr} movs r2, 0 - ldr r3, _080DC3FC + ldr r3, =0x02039f34 ldr r0, [r3] ldr r0, [r0, 0x14] ldrb r1, [r0, 0x2] @@ -451206,7 +436289,7 @@ _080DC3F2: movs r0, 0 b _080DC402 .align 2, 0 -_080DC3FC: .4byte 0x02039f34 + .pool _080DC400: movs r0, 0x1 _080DC402: @@ -451226,7 +436309,7 @@ sub_80DC408: @ 80DC408 ldrsh r0, [r3, r4] cmp r1, r0 bne _080DC440 - ldr r0, _080DC438 + ldr r0, =0x02039f34 ldr r0, [r0] movs r2, 0x2E ldrsh r1, [r3, r2] @@ -451238,12 +436321,11 @@ sub_80DC408: @ 80DC408 negs r0, r0 ands r0, r2 strb r0, [r1, 0x2] - ldr r0, _080DC43C + ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] b _080DC446 .align 2, 0 -_080DC438: .4byte 0x02039f34 -_080DC43C: .4byte nullsub_12 + 1 + .pool _080DC440: ldrh r0, [r3, 0x32] adds r0, r2, r0 @@ -451258,10 +436340,10 @@ _080DC446: sub_80DC44C: @ 80DC44C push {r4-r6,lr} movs r2, 0 - ldr r6, _080DC480 - ldr r5, _080DC484 - ldr r4, _080DC488 - ldr r3, _080DC48C + ldr r6, =0x02020630 + ldr r5, =0x02039f34 + ldr r4, =0x08587a6c + ldr r3, =0x02039f26 _080DC458: ldr r0, [r5] ldr r1, [r0, 0x14] @@ -451284,10 +436366,7 @@ _080DC458: pop {r0} bx r0 .align 2, 0 -_080DC480: .4byte 0x02020630 -_080DC484: .4byte 0x02039f34 -_080DC488: .4byte 0x08587a6c -_080DC48C: .4byte 0x02039f26 + .pool thumb_func_end sub_80DC44C thumb_func_start sub_80DC490 @@ -451296,9 +436375,9 @@ sub_80DC490: @ 80DC490 lsls r0, 24 lsrs r6, r0, 24 movs r3, 0 - ldr r7, _080DC4C0 - ldr r5, _080DC4C4 - ldr r4, _080DC4C8 + ldr r7, =0x02039f26 + ldr r5, =0x02020630 + ldr r4, =0x02039f34 movs r2, 0 _080DC4A0: adds r0, r3, r7 @@ -451318,9 +436397,7 @@ _080DC4A0: movs r1, 0xB4 b _080DC4E0 .align 2, 0 -_080DC4C0: .4byte 0x02039f26 -_080DC4C4: .4byte 0x02020630 -_080DC4C8: .4byte 0x02039f34 + .pool _080DC4CC: ldr r0, [r4] ldr r0, [r0, 0x14] @@ -451349,22 +436426,22 @@ sub_80DC4F0: @ 80DC4F0 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _080DC574 + ldr r0, =0x08587b08 bl gpu_pal_obj_alloc_tag_and_apply movs r5, 0 - ldr r7, _080DC578 - ldr r0, _080DC57C + ldr r7, =0x02039f34 + ldr r0, =0x02020630 mov r8, r0 movs r6, 0 _080DC506: lsls r0, r5, 3 - ldr r1, _080DC580 + ldr r1, =0x08587ae8 adds r0, r1 bl gpu_tile_obj_decompress_and_load - ldr r0, _080DC584 + ldr r0, =0x08587b18 adds r0, r6, r0 - ldr r2, _080DC588 - ldr r1, _080DC58C + ldr r2, =0x08587a70 + ldr r1, =0x02039f26 adds r1, r5, r1 ldrb r1, [r1] adds r1, r2 @@ -451385,7 +436462,7 @@ _080DC506: adds r0, r1 lsls r0, 2 add r0, r8 - ldr r1, _080DC590 + ldr r1, =0x08587b80 bl obj_set_f18_to_r0_f42_to_40 ldr r0, [r7] ldr r0, [r0, 0x14] @@ -451410,31 +436487,24 @@ _080DC506: pop {r0} bx r0 .align 2, 0 -_080DC574: .4byte 0x08587b08 -_080DC578: .4byte 0x02039f34 -_080DC57C: .4byte 0x02020630 -_080DC580: .4byte 0x08587ae8 -_080DC584: .4byte 0x08587b18 -_080DC588: .4byte 0x08587a70 -_080DC58C: .4byte 0x02039f26 -_080DC590: .4byte 0x08587b80 + .pool thumb_func_end sub_80DC4F0 thumb_func_start sub_80DC594 sub_80DC594: @ 80DC594 push {lr} - ldr r0, _080DC5D4 + ldr r0, =0x08587bb0 bl gpu_tile_obj_decompress_and_load - ldr r0, _080DC5D8 + ldr r0, =0x08587bb8 bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _080DC5DC + ldr r0, =0x08587bc8 movs r1, 0x1E movs r2, 0x2C movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _080DC5E0 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -451444,7 +436514,7 @@ sub_80DC594: @ 80DC594 movs r3, 0x4 orrs r2, r3 strb r2, [r1] - ldr r1, _080DC5E4 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r1, [r1] adds r1, 0x58 @@ -451452,22 +436522,18 @@ sub_80DC594: @ 80DC594 pop {r0} bx r0 .align 2, 0 -_080DC5D4: .4byte 0x08587bb0 -_080DC5D8: .4byte 0x08587bb8 -_080DC5DC: .4byte 0x08587bc8 -_080DC5E0: .4byte 0x02020630 -_080DC5E4: .4byte 0x02039f34 + .pool thumb_func_end sub_80DC594 thumb_func_start sub_80DC5E8 sub_80DC5E8: @ 80DC5E8 push {r4,lr} - ldr r0, _080DC624 + ldr r0, =sub_80DC728 + 1 movs r1, 0x1E bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r1, _080DC628 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r1, [r1] strb r0, [r1, 0xD] @@ -451475,7 +436541,7 @@ sub_80DC5E8: @ 80DC5E8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r4, _080DC62C + ldr r4, =0x03005e08 movs r3, 0xFF _080DC60A: lsls r0, r2, 3 @@ -451491,9 +436557,7 @@ _080DC60A: pop {r0} bx r0 .align 2, 0 -_080DC624: .4byte sub_80DC728 + 1 -_080DC628: .4byte 0x02039f34 -_080DC62C: .4byte 0x03005e08 + .pool thumb_func_end sub_80DC5E8 thumb_func_start sub_80DC630 @@ -451501,8 +436565,8 @@ sub_80DC630: @ 80DC630 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _080DC66C - ldr r1, _080DC670 + ldr r3, =0x03005e00 + ldr r1, =0x02039f34 ldr r5, [r1] ldr r1, [r5] ldrb r2, [r1, 0xD] @@ -451529,8 +436593,7 @@ sub_80DC630: @ 80DC630 pop {r0} bx r0 .align 2, 0 -_080DC66C: .4byte 0x03005e00 -_080DC670: .4byte 0x02039f34 + .pool thumb_func_end sub_80DC630 thumb_func_start sub_80DC674 @@ -451539,12 +436602,12 @@ sub_80DC674: @ 80DC674 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080DC69C + ldr r0, =sub_80DC6A4 + 1 movs r1, 0x1F bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080DC6A0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -451554,8 +436617,7 @@ sub_80DC674: @ 80DC674 pop {r0} bx r0 .align 2, 0 -_080DC69C: .4byte sub_80DC6A4 + 1 -_080DC6A0: .4byte 0x03005e00 + .pool thumb_func_end sub_80DC674 thumb_func_start sub_80DC6A4 @@ -451564,14 +436626,14 @@ sub_80DC6A4: @ 80DC6A4 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r2, _080DC71C + ldr r2, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r2 ldrb r0, [r0, 0x8] adds r5, r0, 0 - ldr r0, _080DC720 + ldr r0, =0x02039f34 ldr r4, [r0] ldr r0, [r4] ldrb r1, [r0, 0xD] @@ -451610,7 +436672,7 @@ _080DC6DC: adds r0, 0x5 lsls r0, 4 adds r0, 0x6 - ldr r3, _080DC724 + ldr r3, =0x00004bff movs r1, 0x2 movs r2, 0 bl pal_fade_1 @@ -451621,9 +436683,7 @@ _080DC716: pop {r0} bx r0 .align 2, 0 -_080DC71C: .4byte 0x03005e00 -_080DC720: .4byte 0x02039f34 -_080DC724: .4byte 0x00004bff + .pool thumb_func_end sub_80DC6A4 thumb_func_start sub_80DC728 @@ -451640,7 +436700,7 @@ sub_80DC728: @ 80DC728 adds r1, r0 mov r9, r1 lsls r7, r1, 3 - ldr r0, _080DC778 + ldr r0, =0x03005e08 mov r8, r0 movs r1, 0x8 negs r1, r1 @@ -451670,7 +436730,7 @@ _080DC74C: adds r0, r4, 0x1 b _080DC77E .align 2, 0 -_080DC778: .4byte 0x03005e08 + .pool _080DC77C: subs r0, r4, 0x1 _080DC77E: @@ -451698,7 +436758,7 @@ _080DC79C: eors r1, r2 strh r1, [r0] _080DC7AA: - ldr r0, _080DC7E4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] adds r0, 0x14 @@ -451711,7 +436771,7 @@ _080DC7AA: add r1, r8 ldrb r2, [r1] movs r1, 0x2 - ldr r3, _080DC7E8 + ldr r3, =0x00004bff bl pal_fade_1 _080DC7CA: adds r0, r6, 0x1 @@ -451727,17 +436787,16 @@ _080DC7CA: pop {r0} bx r0 .align 2, 0 -_080DC7E4: .4byte 0x02039f34 -_080DC7E8: .4byte 0x00004bff + .pool thumb_func_end sub_80DC728 thumb_func_start sub_80DC7EC sub_80DC7EC: @ 80DC7EC push {r4,lr} - ldr r0, _080DC814 + ldr r0, =sub_80DC8D0 + 1 movs r1, 0x1E bl AddTask - ldr r1, _080DC818 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r1, [r1] strb r0, [r1, 0xE] @@ -451753,8 +436812,7 @@ _080DC800: pop {r0} bx r0 .align 2, 0 -_080DC814: .4byte sub_80DC8D0 + 1 -_080DC818: .4byte 0x02039f34 + .pool thumb_func_end sub_80DC7EC thumb_func_start sub_80DC81C @@ -451762,8 +436820,8 @@ sub_80DC81C: @ 80DC81C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _080DC85C - ldr r1, _080DC860 + ldr r3, =0x03005e00 + ldr r1, =0x02039f34 ldr r4, [r1] ldr r1, [r4] ldrb r2, [r1, 0xE] @@ -451791,8 +436849,7 @@ sub_80DC81C: @ 80DC81C pop {r0} bx r0 .align 2, 0 -_080DC85C: .4byte 0x03005e00 -_080DC860: .4byte 0x02039f34 + .pool thumb_func_end sub_80DC81C thumb_func_start sub_80DC864 @@ -451821,14 +436878,14 @@ sub_80DC87C: @ 80DC87C bl sub_80DC81C adds r0, r4, 0x5 lsls r2, r0, 5 - ldr r3, _080DC8C0 + ldr r3, =0x02037728 adds r6, r2, r3 - ldr r5, _080DC8C4 + ldr r5, =0x02037b28 adds r2, r5 - ldr r1, _080DC8C8 + ldr r1, =0x040000d4 str r6, [r1] str r2, [r1, 0x4] - ldr r2, _080DC8CC + ldr r2, =0x80000001 str r2, [r1, 0x8] ldr r6, [r1, 0x8] lsls r0, 4 @@ -451847,10 +436904,7 @@ sub_80DC87C: @ 80DC87C pop {r0} bx r0 .align 2, 0 -_080DC8C0: .4byte 0x02037728 -_080DC8C4: .4byte 0x02037b28 -_080DC8C8: .4byte 0x040000d4 -_080DC8CC: .4byte 0x80000001 + .pool thumb_func_end sub_80DC87C thumb_func_start sub_80DC8D0 @@ -451867,9 +436921,9 @@ sub_80DC8D0: @ 80DC8D0 adds r1, r0 mov r9, r1 lsls r6, r1, 3 - ldr r0, _080DC938 + ldr r0, =0x03005e08 mov r8, r0 - ldr r1, _080DC93C + ldr r1, =0x00004bff mov r10, r1 _080DC8F0: lsls r0, r7, 26 @@ -451908,8 +436962,7 @@ _080DC8F0: adds r0, 0x1 b _080DC944 .align 2, 0 -_080DC938: .4byte 0x03005e08 -_080DC93C: .4byte 0x00004bff + .pool _080DC940: ldrh r0, [r2] subs r0, 0x1 @@ -451919,7 +436972,7 @@ _080DC944: mov r5, r9 lsls r2, r5, 3 adds r0, r1, r2 - ldr r3, _080DC9B0 + ldr r3, =0x03005e00 adds r3, 0x8 adds r0, r3 movs r5, 0 @@ -451969,7 +437022,7 @@ _080DC996: pop {r0} bx r0 .align 2, 0 -_080DC9B0: .4byte 0x03005e00 + .pool thumb_func_end sub_80DC8D0 thumb_func_start sub_80DC9B4 @@ -451977,7 +437030,7 @@ sub_80DC9B4: @ 80DC9B4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080DC9DC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r2, 3 @@ -451993,7 +437046,7 @@ sub_80DC9B4: @ 80DC9B4 bl sub_80DC630 b _080DC9E6 .align 2, 0 -_080DC9DC: .4byte 0x02039f34 + .pool _080DC9E0: adds r0, r2, 0 bl sub_80DC674 @@ -452013,7 +437066,7 @@ sub_80DC9EC: @ 80DC9EC lsls r0, 24 lsrs r0, 24 str r0, [sp, 0xC] - ldr r6, _080DCB48 + ldr r6, =0x02039f26 adds r6, r0, r6 ldrb r0, [r6] lsls r5, r0, 2 @@ -452025,10 +437078,10 @@ sub_80DC9EC: @ 80DC9EC lsrs r5, 24 ldr r1, [sp, 0xC] lsls r4, r1, 3 - ldr r0, _080DCB4C + ldr r0, =0x08589904 adds r0, r4, r0 bl gpu_tile_obj_decompress_and_load - ldr r0, _080DCB50 + ldr r0, =0x08589924 adds r4, r0 adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply @@ -452036,7 +437089,7 @@ sub_80DC9EC: @ 80DC9EC lsls r4, r2, 1 adds r4, r2 lsls r4, 3 - ldr r0, _080DCB54 + ldr r0, =0x0858998c adds r4, r0 adds r0, r4, 0 movs r1, 0xB8 @@ -452061,16 +437114,16 @@ sub_80DC9EC: @ 80DC9EC lsls r5, r0, 4 add r5, r8 lsls r5, 2 - ldr r1, _080DCB58 + ldr r1, =0x02020630 adds r5, r1 ldrh r2, [r5, 0x4] lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x40 - ldr r3, _080DCB5C + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _080DCB60 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] @@ -452080,9 +437133,9 @@ sub_80DC9EC: @ 80DC9EC lsls r3, r0, 2 adds r3, r0 lsls r3, 6 - ldr r0, _080DCB64 + ldr r0, =0x0600e026 adds r3, r0 - ldr r7, _080DCB68 + ldr r7, =0x02039f34 ldr r0, [r7] ldr r0, [r0, 0x34] str r0, [sp] @@ -452094,7 +437147,7 @@ sub_80DC9EC: @ 80DC9EC lsls r3, r0, 2 adds r3, r0 lsls r3, 6 - ldr r1, _080DCB6C + ldr r1, =0x0600e036 adds r3, r1 ldr r0, [r7] ldr r0, [r0, 0x38] @@ -452110,7 +437163,7 @@ sub_80DC9EC: @ 80DC9EC movs r6, 0xA0 lsls r6, 3 adds r1, r6 - ldr r2, _080DCB70 + ldr r2, =0x050000c0 mov r10, r2 add r0, sp, 0x4 bl CpuSet @@ -452127,12 +437180,12 @@ sub_80DC9EC: @ 80DC9EC lsls r4, r3, 4 add r4, r9 lsls r4, 2 - ldr r1, _080DCB58 + ldr r1, =0x02020630 adds r4, r1 ldrh r1, [r4, 0x4] lsls r1, 22 lsrs r1, 17 - ldr r6, _080DCB74 + ldr r6, =0x06010000 adds r1, r6 movs r2, 0x80 lsls r2, 4 @@ -452168,18 +437221,7 @@ sub_80DC9EC: @ 80DC9EC pop {r1} bx r1 .align 2, 0 -_080DCB48: .4byte 0x02039f26 -_080DCB4C: .4byte 0x08589904 -_080DCB50: .4byte 0x08589924 -_080DCB54: .4byte 0x0858998c -_080DCB58: .4byte 0x02020630 -_080DCB5C: .4byte 0x000003ff -_080DCB60: .4byte 0xfffffc00 -_080DCB64: .4byte 0x0600e026 -_080DCB68: .4byte 0x02039f34 -_080DCB6C: .4byte 0x0600e036 -_080DCB70: .4byte 0x050000c0 -_080DCB74: .4byte 0x06010000 + .pool thumb_func_end sub_80DC9EC thumb_func_start sub_80DCB78 @@ -452187,7 +437229,7 @@ sub_80DCB78: @ 80DCB78 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080DCBB0 + ldr r1, =0x02020630 lsls r5, r0, 4 adds r5, r0 lsls r5, 2 @@ -452209,7 +437251,7 @@ sub_80DCB78: @ 80DCB78 pop {r0} bx r0 .align 2, 0 -_080DCBB0: .4byte 0x02020630 + .pool thumb_func_end sub_80DCB78 thumb_func_start sub_80DCBB4 @@ -452219,13 +437261,13 @@ sub_80DCBB4: @ 80DCBB4 lsls r1, 6 movs r0, 0x50 bl lcd_io_set - ldr r1, _080DCBCC + ldr r1, =0x00000907 movs r0, 0x52 bl lcd_io_set pop {r0} bx r0 .align 2, 0 -_080DCBCC: .4byte 0x00000907 + .pool thumb_func_end sub_80DCBB4 thumb_func_start sub_80DCBD0 @@ -452256,9 +437298,9 @@ sub_80DCBE8: @ 80DCBE8 lsrs r0, 24 mov r9, r0 bl sub_80DCBB4 - ldr r0, _080DCC60 + ldr r0, =0x02039f34 ldr r1, [r0] - ldr r2, _080DCC64 + ldr r2, =0x02020630 mov r8, r2 lsls r6, r4, 4 adds r6, r4 @@ -452288,10 +437330,10 @@ sub_80DCBE8: @ 80DCBE8 movs r2, 0x1C add r8, r2 add r6, r8 - ldr r0, _080DCC68 + ldr r0, =sub_80DCC84 + 1 str r0, [r6] add r4, r8 - ldr r0, _080DCC6C + ldr r0, =nullsub_12 + 1 str r0, [r4] mov r3, r9 cmp r3, 0 @@ -452300,10 +437342,7 @@ sub_80DCBE8: @ 80DCBE8 bl audio_play b _080DCC76 .align 2, 0 -_080DCC60: .4byte 0x02039f34 -_080DCC64: .4byte 0x02020630 -_080DCC68: .4byte sub_80DCC84 + 1 -_080DCC6C: .4byte nullsub_12 + 1 + .pool _080DCC70: movs r0, 0x2 bl audio_play @@ -452330,7 +437369,7 @@ sub_80DCC84: @ 80DCC84 ldrh r1, [r0, 0x2E] lsls r1, 24 lsrs r1, 24 - ldr r2, _080DCCD0 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -452351,21 +437390,20 @@ sub_80DCC84: @ 80DCC84 ldrb r0, [r1] orrs r0, r2 strb r0, [r1] - ldr r0, _080DCCD4 + ldr r0, =sub_80DCCD8 + 1 mov r1, r12 str r0, [r1, 0x1C] _080DCCCC: pop {r0} bx r0 .align 2, 0 -_080DCCD0: .4byte 0x02020630 -_080DCCD4: .4byte sub_80DCCD8 + 1 + .pool thumb_func_end sub_80DCC84 thumb_func_start sub_80DCCD8 sub_80DCCD8: @ 80DCCD8 push {lr} - ldr r1, _080DCD04 + ldr r1, =0x02039f34 ldr r1, [r1] movs r3, 0x30 ldrsh r2, [r0, r3] @@ -452385,13 +437423,13 @@ sub_80DCCD8: @ 80DCCD8 pop {r0} bx r0 .align 2, 0 -_080DCD04: .4byte 0x02039f34 + .pool thumb_func_end sub_80DCCD8 thumb_func_start sub_80DCD08 sub_80DCD08: @ 80DCD08 push {lr} - ldr r0, _080DCD20 + ldr r0, =0x02000000 movs r1, 0xD0 lsls r1, 9 adds r2, r0, r1 @@ -452402,7 +437440,7 @@ sub_80DCD08: @ 80DCD08 movs r0, 0 b _080DCD26 .align 2, 0 -_080DCD20: .4byte 0x02000000 + .pool _080DCD24: movs r0, 0x1 _080DCD26: @@ -452427,11 +437465,11 @@ _080DCD42: sub_80DCD48: @ 80DCD48 push {r4,r5,lr} sub sp, 0xC - ldr r0, _080DCD74 + ldr r0, =0x020322d5 ldrb r0, [r0] cmp r0, 0 beq _080DCE44 - ldr r0, _080DCD78 + ldr r0, =0x02000000 movs r1, 0xD0 lsls r1, 9 adds r0, r1 @@ -452447,8 +437485,7 @@ sub_80DCD48: @ 80DCD48 bl sub_80DF750 b _080DCE44 .align 2, 0 -_080DCD74: .4byte 0x020322d5 -_080DCD78: .4byte 0x02000000 + .pool _080DCD7C: movs r5, 0 _080DCD7E: @@ -452462,7 +437499,7 @@ _080DCD7E: bls _080DCD7E movs r5, 0 _080DCD92: - ldr r0, _080DCE4C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r5, 3 @@ -452479,7 +437516,7 @@ _080DCD92: lsls r0, 16 lsrs r4, r0, 16 adds r0, r2, 0 - ldr r1, _080DCE50 + ldr r1, =0x085e8d40 bl gf_strcpy adds r2, r0, 0 _080DCDBC: @@ -452489,7 +437526,7 @@ _080DCDBC: movs r2, 0 movs r3, 0x4 bl decimal_int_to_string - ldr r0, _080DCE54 + ldr r0, =0x02039f26 adds r0, r5, r0 ldrb r0, [r0] movs r1, 0x7 @@ -452505,7 +437542,7 @@ _080DCDBC: bls _080DCD92 movs r5, 0 _080DCDEA: - ldr r0, _080DCE4C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r5, 3 @@ -452522,7 +437559,7 @@ _080DCDEA: lsls r0, 16 lsrs r4, r0, 16 adds r0, r2, 0 - ldr r1, _080DCE50 + ldr r1, =0x085e8d40 bl gf_strcpy adds r2, r0, 0 _080DCE14: @@ -452532,7 +437569,7 @@ _080DCE14: movs r2, 0 movs r3, 0x4 bl decimal_int_to_string - ldr r0, _080DCE54 + ldr r0, =0x02039f26 adds r0, r5, r0 ldrb r0, [r0] movs r1, 0x7 @@ -452553,9 +437590,7 @@ _080DCE44: pop {r0} bx r0 .align 2, 0 -_080DCE4C: .4byte 0x02039f34 -_080DCE50: .4byte 0x085e8d40 -_080DCE54: .4byte 0x02039f26 + .pool thumb_func_end sub_80DCD48 thumb_func_start sub_80DCE58 @@ -452618,7 +437653,7 @@ _080DCEB6: cmp r2, 0 bne _080DCF80 movs r5, 0 - ldr r3, _080DCF38 + ldr r3, =0x02039f26 mov r8, r3 _080DCECC: mov r6, r8 @@ -452626,7 +437661,7 @@ _080DCECC: movs r4, 0 cmp r4, r5 bge _080DCF48 - ldr r7, _080DCF3C + ldr r7, =0x02039f00 mov r9, r7 lsls r0, r5, 1 adds r1, r0, 0 @@ -452638,7 +437673,7 @@ _080DCECC: add r0, sp adds r0, 0x4 str r0, [sp, 0x10] - ldr r3, _080DCF38 + ldr r3, =0x02039f26 adds r6, r3, 0 mov r10, r6 _080DCEF4: @@ -452680,8 +437715,7 @@ _080DCF34: strb r5, [r3] b _080DCF48 .align 2, 0 -_080DCF38: .4byte 0x02039f26 -_080DCF3C: .4byte 0x02039f00 + .pool _080DCF40: adds r3, 0x1 adds r4, 0x1 @@ -452698,7 +437732,7 @@ _080DCF50: adds r5, 0x1 cmp r5, 0x3 ble _080DCECC - ldr r4, _080DCF7C + ldr r4, =0x02039f26 mov r0, sp adds r1, r4, 0 movs r2, 0x4 @@ -452715,17 +437749,17 @@ _080DCF68: ble _080DCF68 b _080DD034 .align 2, 0 -_080DCF7C: .4byte 0x02039f26 + .pool _080DCF80: mov r0, sp movs r1, 0xFF movs r2, 0x4 bl memset movs r5, 0 - ldr r3, _080DCFA4 + ldr r3, =0x02039f26 movs r6, 0 _080DCF90: - ldr r0, _080DCFA8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x4] adds r0, r6, r0 @@ -452736,8 +437770,7 @@ _080DCF90: adds r1, r7, r2 b _080DCFB6 .align 2, 0 -_080DCFA4: .4byte 0x02039f26 -_080DCFA8: .4byte 0x02039f34 + .pool _080DCFAC: adds r0, r2, 0x1 lsls r0, 24 @@ -452763,12 +437796,12 @@ _080DCFCC: cmp r4, r5 ble _080DD02E mov r9, r4 - ldr r2, _080DD044 + ldr r2, =0x02039f26 mov r8, r2 add r3, sp, 0x4 mov r12, r3 _080DCFE0: - ldr r6, _080DD048 + ldr r6, =0x02039f34 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r4, 3 @@ -452822,8 +437855,7 @@ _080DD034: pop {r0} bx r0 .align 2, 0 -_080DD044: .4byte 0x02039f26 -_080DD048: .4byte 0x02039f34 + .pool thumb_func_end sub_80DCE58 thumb_func_start sub_80DD04C @@ -452832,9 +437864,9 @@ sub_80DD04C: @ 80DD04C movs r4, 0 movs r5, 0xA0 _080DD052: - ldr r0, _080DD078 + ldr r0, =0x0201a004 adds r0, r5, r0 - ldr r1, _080DD07C + ldr r1, =0x02039f26 adds r1, r4, r1 ldrb r1, [r1] adds r1, 0x5 @@ -452850,8 +437882,7 @@ _080DD052: pop {r0} bx r0 .align 2, 0 -_080DD078: .4byte 0x0201a004 -_080DD07C: .4byte 0x02039f26 + .pool thumb_func_end sub_80DD04C thumb_func_start sub_80DD080 @@ -452862,7 +437893,7 @@ sub_80DD080: @ 80DD080 push {r6,r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _080DD108 + ldr r4, =0x02039f34 ldr r3, [r4] ldr r1, [r3, 0x4] lsls r7, r6, 3 @@ -452886,7 +437917,7 @@ _080DD0B4: ldr r1, [r0, 0x4] adds r1, r5, r1 ldrh r0, [r1, 0x6] - ldr r2, _080DD10C + ldr r2, =0x0858c2b4 lsls r0, 3 adds r0, r2 ldrb r2, [r0] @@ -452925,10 +437956,9 @@ _080DD0B4: strb r0, [r2, 0xB] b _080DD12C .align 2, 0 -_080DD108: .4byte 0x02039f34 -_080DD10C: .4byte 0x0858c2b4 + .pool _080DD110: - ldr r4, _080DD1E0 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x4] lsls r3, r6, 3 @@ -452949,7 +437979,7 @@ _080DD12C: subs r0, r7, r6 lsls r0, 2 adds r2, r0, r2 - ldr r3, _080DD1E4 + ldr r3, =0x0858cdcc mov r1, r9 lsls r5, r1, 2 adds r3, r5, r3 @@ -452986,7 +438016,7 @@ _080DD166: adds r2, 0x1 cmp r2, 0x3 ble _080DD166 - ldr r5, _080DD1E0 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -453012,11 +438042,11 @@ _080DD166: ands r0, r2 strb r0, [r1, 0x15] _080DD1B4: - ldr r0, _080DD1E8 + ldr r0, =0x0858cecc add r0, r9 ldr r0, [r0] bl _call_via_r0 - ldr r0, _080DD1E0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -453033,9 +438063,7 @@ _080DD1B4: ldrsb r0, [r2, r0] b _080DD206 .align 2, 0 -_080DD1E0: .4byte 0x02039f34 -_080DD1E4: .4byte 0x0858cdcc -_080DD1E8: .4byte 0x0858cecc + .pool _080DD1EC: ldrb r1, [r2, 0x11] movs r0, 0x20 @@ -453055,7 +438083,7 @@ _080DD204: _080DD206: adds r0, r1 strh r0, [r2, 0x2] - ldr r5, _080DD298 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -453125,10 +438153,10 @@ _080DD206: movs r2, 0x8 b _080DD2C8 .align 2, 0 -_080DD298: .4byte 0x02039f34 + .pool _080DD29C: - ldr r2, _080DD2D0 - ldr r5, _080DD2D4 + ldr r2, =0x0858c2b4 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -453154,8 +438182,7 @@ _080DD2C8: strb r0, [r1, 0x15] b _080DD2E2 .align 2, 0 -_080DD2D0: .4byte 0x0858c2b4 -_080DD2D4: .4byte 0x02039f34 + .pool _080DD2D8: ldrb r1, [r3, 0x15] movs r0, 0x11 @@ -453163,7 +438190,7 @@ _080DD2D8: ands r0, r1 strb r0, [r3, 0x15] _080DD2E2: - ldr r5, _080DD380 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -453244,7 +438271,7 @@ _080DD35C: movs r0, 0x3C b _080DD38A .align 2, 0 -_080DD380: .4byte 0x02039f34 + .pool _080DD384: movs r0, 0xA b _080DD38A @@ -453275,7 +438302,7 @@ _080DD3AE: cmp r0, 0 bne _080DD3A2 _080DD3B6: - ldr r0, _080DD3D0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] subs r0, r7, r6 @@ -453290,14 +438317,14 @@ _080DD3C4: pop {r0} bx r0 .align 2, 0 -_080DD3D0: .4byte 0x02039f34 + .pool thumb_func_end sub_80DD080 thumb_func_start sub_80DD3D4 sub_80DD3D4: @ 80DD3D4 lsls r0, 24 lsrs r0, 24 - ldr r2, _080DD3EC + ldr r2, =0x02039f34 ldr r2, [r2] ldr r3, [r2, 0x4] lsls r2, r0, 3 @@ -453307,14 +438334,14 @@ sub_80DD3D4: @ 80DD3D4 strb r1, [r2, 0x13] bx lr .align 2, 0 -_080DD3EC: .4byte 0x02039f34 + .pool thumb_func_end sub_80DD3D4 thumb_func_start sub_80DD3F0 sub_80DD3F0: @ 80DD3F0 lsls r0, 24 lsrs r0, 24 - ldr r2, _080DD408 + ldr r2, =0x02039f34 ldr r2, [r2] ldr r3, [r2, 0x4] lsls r2, r0, 3 @@ -453324,7 +438351,7 @@ sub_80DD3F0: @ 80DD3F0 strb r1, [r2, 0x14] bx lr .align 2, 0 -_080DD408: .4byte 0x02039f34 + .pool thumb_func_end sub_80DD3F0 thumb_func_start sub_80DD40C @@ -453378,13 +438405,13 @@ sub_80DD45C: @ 80DD45C lsrs r4, 24 lsls r1, 24 lsrs r6, r1, 24 - ldr r0, _080DD4BC + ldr r0, =0x02021cc4 lsls r1, r4, 6 - ldr r2, _080DD4C0 + ldr r2, =0x02039e02 adds r1, r2 bl gf_strcpy - ldr r0, _080DD4C4 - ldr r5, _080DD4C8 + ldr r0, =0x02021dc4 + ldr r5, =0x02039f34 ldr r1, [r5] ldr r2, [r1, 0x4] lsls r1, r4, 3 @@ -453394,10 +438421,10 @@ sub_80DD45C: @ 80DD45C ldrh r2, [r1, 0x6] movs r1, 0xD muls r1, r2 - ldr r2, _080DD4CC + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r3, _080DD4D0 + ldr r3, =0x0858c2b4 ldr r1, [r5] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -453413,59 +438440,49 @@ sub_80DD45C: @ 80DD45C lsls r1, r0, 29 cmp r1, 0 bne _080DD4DC - ldr r0, _080DD4D4 - ldr r1, _080DD4D8 + ldr r0, =0x02021ec4 + ldr r1, =0x0827e837 bl gf_strcpy b _080DD52C .align 2, 0 -_080DD4BC: .4byte 0x02021cc4 -_080DD4C0: .4byte 0x02039e02 -_080DD4C4: .4byte 0x02021dc4 -_080DD4C8: .4byte 0x02039f34 -_080DD4CC: .4byte 0x0831977c -_080DD4D0: .4byte 0x0858c2b4 -_080DD4D4: .4byte 0x02021ec4 -_080DD4D8: .4byte 0x0827e837 + .pool _080DD4DC: lsrs r0, r1, 29 cmp r0, 0x1 bne _080DD4F4 - ldr r0, _080DD4EC - ldr r1, _080DD4F0 + ldr r0, =0x02021ec4 + ldr r1, =0x0827e83f bl gf_strcpy b _080DD52C .align 2, 0 -_080DD4EC: .4byte 0x02021ec4 -_080DD4F0: .4byte 0x0827e83f + .pool _080DD4F4: lsrs r0, r1, 29 cmp r0, 0x2 bne _080DD50C - ldr r0, _080DD504 - ldr r1, _080DD508 + ldr r0, =0x02021ec4 + ldr r1, =0x0827e847 bl gf_strcpy b _080DD52C .align 2, 0 -_080DD504: .4byte 0x02021ec4 -_080DD508: .4byte 0x0827e847 + .pool _080DD50C: lsrs r0, r1, 29 cmp r0, 0x3 bne _080DD524 - ldr r0, _080DD51C - ldr r1, _080DD520 + ldr r0, =0x02021ec4 + ldr r1, =0x0827e850 bl gf_strcpy b _080DD52C .align 2, 0 -_080DD51C: .4byte 0x02021ec4 -_080DD520: .4byte 0x0827e850 + .pool _080DD524: - ldr r0, _080DD550 - ldr r1, _080DD554 + ldr r0, =0x02021ec4 + ldr r1, =0x0827e85a bl gf_strcpy _080DD52C: - ldr r4, _080DD558 - ldr r1, _080DD55C + ldr r4, =0x02021fc4 + ldr r1, =0x08587e10 lsls r0, r6, 2 adds r0, r1 ldr r1, [r0] @@ -453479,10 +438496,7 @@ _080DD52C: pop {r0} bx r0 .align 2, 0 -_080DD550: .4byte 0x02021ec4 -_080DD554: .4byte 0x0827e85a -_080DD558: .4byte 0x02021fc4 -_080DD55C: .4byte 0x08587e10 + .pool thumb_func_end sub_80DD45C thumb_func_start sub_80DD560 @@ -453490,7 +438504,7 @@ sub_80DD560: @ 80DD560 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _080DD58C + ldr r4, =0x02039f34 ldr r1, [r4] ldr r3, [r1, 0x4] lsls r1, r0, 3 @@ -453510,7 +438524,7 @@ sub_80DD560: @ 80DD560 pop {r0} bx r0 .align 2, 0 -_080DD58C: .4byte 0x02039f34 + .pool thumb_func_end sub_80DD560 thumb_func_start sub_80DD590 @@ -453523,7 +438537,7 @@ sub_80DD590: @ 80DD590 movs r0, 0 mov r12, r0 movs r4, 0 - ldr r1, _080DD5FC + ldr r1, =0x02039f26 mov r9, r1 add r2, sp, 0x4 mov r6, r9 @@ -453541,7 +438555,7 @@ _080DD5AC: cmp r4, 0x3 ble _080DD5AC movs r4, 0 - ldr r7, _080DD600 + ldr r7, =0x02039f34 ldr r1, [r7] mov r8, r1 adds r5, r2, 0 @@ -453573,8 +438587,7 @@ _080DD5DE: movs r2, 0x1 b _080DD63A .align 2, 0 -_080DD5FC: .4byte 0x02039f26 -_080DD600: .4byte 0x02039f34 + .pool _080DD604: mov r1, sp adds r0, r1, r2 @@ -453607,7 +438620,7 @@ _080DD612: _080DD63A: cmp r2, 0x3 bgt _080DD676 - ldr r6, _080DD6D4 + ldr r6, =0x02039f26 lsls r0, r2, 3 subs r0, r2 lsls r3, r0, 2 @@ -453650,7 +438663,7 @@ _080DD684: cmp r4, 0x3 ble _080DD5CA movs r4, 0 - ldr r6, _080DD6D8 + ldr r6, =0x02039f34 movs r5, 0 _080DD690: ldr r0, [r6] @@ -453688,8 +438701,7 @@ _080DD690: pop {r0} bx r0 .align 2, 0 -_080DD6D4: .4byte 0x02039f26 -_080DD6D8: .4byte 0x02039f34 + .pool thumb_func_end sub_80DD590 thumb_func_start sub_80DD6DC @@ -453711,9 +438723,9 @@ sub_80DD6DC: @ 80DD6DC movs r1, 0x4 orrs r0, r1 strb r0, [r3] - ldr r0, _080DD718 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] - ldr r0, _080DD71C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] ldrb r1, [r2, 0x6] @@ -453725,8 +438737,7 @@ _080DD712: pop {r0} bx r0 .align 2, 0 -_080DD718: .4byte nullsub_12 + 1 -_080DD71C: .4byte 0x02039f34 + .pool thumb_func_end sub_80DD6DC thumb_func_start sub_80DD720 @@ -453734,7 +438745,7 @@ sub_80DD720: @ 80DD720 push {r4,r5,lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _080DD740 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r5, [r0, 0x12] @@ -453743,13 +438754,12 @@ sub_80DD720: @ 80DD720 b _080DD8D4 _080DD734: lsls r0, r1, 2 - ldr r1, _080DD744 + ldr r1, =_080DD748 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DD740: .4byte 0x02039f34 -_080DD744: .4byte _080DD748 + .pool .align 2, 0 _080DD748: .4byte _080DD76C @@ -453762,16 +438772,16 @@ _080DD748: .4byte _080DD8D4 .4byte _080DD8A0 _080DD76C: - ldr r0, _080DD790 + ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 adds r1, r0 ldrh r0, [r1, 0x2E] - ldr r2, _080DD794 + ldr r2, =0x000003ff ands r2, r0 ldrh r3, [r1, 0x4] - ldr r0, _080DD798 + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r2 strh r0, [r1, 0x4] @@ -453779,22 +438789,20 @@ _080DD76C: bl audio_play b _080DD8F8 .align 2, 0 -_080DD790: .4byte 0x02020630 -_080DD794: .4byte 0x000003ff -_080DD798: .4byte 0xfffffc00 + .pool _080DD79C: - ldr r0, _080DD7C4 + ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 adds r1, r0 ldrh r2, [r1, 0x2E] adds r2, 0x4 - ldr r3, _080DD7C8 + ldr r3, =0x000003ff adds r0, r3, 0 ands r2, r0 ldrh r3, [r1, 0x4] - ldr r0, _080DD7CC + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r2 strh r0, [r1, 0x4] @@ -453802,22 +438810,20 @@ _080DD79C: bl audio_play b _080DD8F8 .align 2, 0 -_080DD7C4: .4byte 0x02020630 -_080DD7C8: .4byte 0x000003ff -_080DD7CC: .4byte 0xfffffc00 + .pool _080DD7D0: - ldr r0, _080DD7F8 + ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 adds r1, r0 ldrh r2, [r1, 0x2E] adds r2, 0x8 - ldr r3, _080DD7FC + ldr r3, =0x000003ff adds r0, r3, 0 ands r2, r0 ldrh r3, [r1, 0x4] - ldr r0, _080DD800 + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r2 strh r0, [r1, 0x4] @@ -453825,22 +438831,20 @@ _080DD7D0: bl audio_play b _080DD8F8 .align 2, 0 -_080DD7F8: .4byte 0x02020630 -_080DD7FC: .4byte 0x000003ff -_080DD800: .4byte 0xfffffc00 + .pool _080DD804: - ldr r0, _080DD82C + ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 adds r1, r0 ldrh r2, [r1, 0x2E] adds r2, 0xC - ldr r3, _080DD830 + ldr r3, =0x000003ff adds r0, r3, 0 ands r2, r0 ldrh r3, [r1, 0x4] - ldr r0, _080DD834 + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r2 strh r0, [r1, 0x4] @@ -453848,22 +438852,20 @@ _080DD804: bl audio_play b _080DD8F8 .align 2, 0 -_080DD82C: .4byte 0x02020630 -_080DD830: .4byte 0x000003ff -_080DD834: .4byte 0xfffffc00 + .pool _080DD838: - ldr r0, _080DD860 + ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 adds r1, r0 ldrh r2, [r1, 0x2E] adds r2, 0xC - ldr r3, _080DD864 + ldr r3, =0x000003ff adds r0, r3, 0 ands r2, r0 ldrh r3, [r1, 0x4] - ldr r0, _080DD868 + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r2 strh r0, [r1, 0x4] @@ -453871,22 +438873,20 @@ _080DD838: bl audio_play b _080DD8F8 .align 2, 0 -_080DD860: .4byte 0x02020630 -_080DD864: .4byte 0x000003ff -_080DD868: .4byte 0xfffffc00 + .pool _080DD86C: - ldr r0, _080DD894 + ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 adds r1, r0 ldrh r2, [r1, 0x2E] adds r2, 0x10 - ldr r3, _080DD898 + ldr r3, =0x000003ff adds r0, r3, 0 ands r2, r0 ldrh r3, [r1, 0x4] - ldr r0, _080DD89C + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r2 strh r0, [r1, 0x4] @@ -453894,22 +438894,20 @@ _080DD86C: bl audio_play b _080DD8F8 .align 2, 0 -_080DD894: .4byte 0x02020630 -_080DD898: .4byte 0x000003ff -_080DD89C: .4byte 0xfffffc00 + .pool _080DD8A0: - ldr r0, _080DD8C8 + ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 adds r1, r0 ldrh r2, [r1, 0x2E] adds r2, 0x18 - ldr r3, _080DD8CC + ldr r3, =0x000003ff adds r0, r3, 0 ands r2, r0 ldrh r3, [r1, 0x4] - ldr r0, _080DD8D0 + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r2 strh r0, [r1, 0x4] @@ -453917,22 +438915,20 @@ _080DD8A0: bl audio_play b _080DD8F8 .align 2, 0 -_080DD8C8: .4byte 0x02020630 -_080DD8CC: .4byte 0x000003ff -_080DD8D0: .4byte 0xfffffc00 + .pool _080DD8D4: - ldr r0, _080DD92C + ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 adds r1, r0 ldrh r2, [r1, 0x2E] adds r2, 0x14 - ldr r3, _080DD930 + ldr r3, =0x000003ff adds r0, r3, 0 ands r2, r0 ldrh r3, [r1, 0x4] - ldr r0, _080DD934 + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r2 strh r0, [r1, 0x4] @@ -453940,7 +438936,7 @@ _080DD8D4: bl audio_play _080DD8F8: adds r2, r4, 0 - ldr r4, _080DD92C + ldr r4, =0x02020630 adds r2, r5 lsls r2, 2 adds r1, r2, r4 @@ -453953,9 +438949,9 @@ _080DD8F8: strb r0, [r1] adds r4, 0x1C adds r2, r4 - ldr r0, _080DD938 + ldr r0, =sub_80DD6DC + 1 str r0, [r2] - ldr r0, _080DD93C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x6] @@ -453966,11 +438962,7 @@ _080DD8F8: pop {r0} bx r0 .align 2, 0 -_080DD92C: .4byte 0x02020630 -_080DD930: .4byte 0x000003ff -_080DD934: .4byte 0xfffffc00 -_080DD938: .4byte sub_80DD6DC + 1 -_080DD93C: .4byte 0x02039f34 + .pool thumb_func_end sub_80DD720 thumb_func_start sub_80DD940 @@ -453980,18 +438972,18 @@ sub_80DD940: @ 80DD940 mov r6, r8 push {r6,r7} movs r5, 0 - ldr r6, _080DD9DC - ldr r0, _080DD9E0 + ldr r6, =0x02039f34 + ldr r0, =0x02020630 mov r9, r0 - ldr r0, _080DD9E4 + ldr r0, =0x06010000 mov r8, r0 - ldr r7, _080DD9E8 + ldr r7, =0x04000008 _080DD956: ldr r0, [r6] ldr r1, [r0] movs r0, 0x13 ldrsb r0, [r1, r0] - ldr r4, _080DD9EC + ldr r4, =0x08d8ec24 cmp r5, r0 bge _080DD966 adds r4, 0x40 @@ -454053,24 +439045,20 @@ _080DD9C8: pop {r0} bx r0 .align 2, 0 -_080DD9DC: .4byte 0x02039f34 -_080DD9E0: .4byte 0x02020630 -_080DD9E4: .4byte 0x06010000 -_080DD9E8: .4byte 0x04000008 -_080DD9EC: .4byte 0x08d8ec24 + .pool thumb_func_end sub_80DD940 thumb_func_start sub_80DD9F0 sub_80DD9F0: @ 80DD9F0 lsls r0, 16 - ldr r3, _080DDA14 - ldr r1, _080DDA18 + ldr r3, =0x085899ec + ldr r1, =0x0858c2b4 lsrs r0, 13 adds r0, r1 ldrb r1, [r0, 0x1] lsls r1, 29 lsrs r1, 29 - ldr r0, _080DDA1C + ldr r0, =0x02039f2c ldrh r2, [r0] lsls r0, r2, 2 adds r0, r2 @@ -454080,28 +439068,26 @@ sub_80DD9F0: @ 80DD9F0 ldrsb r0, [r1, r0] bx lr .align 2, 0 -_080DDA14: .4byte 0x085899ec -_080DDA18: .4byte 0x0858c2b4 -_080DDA1C: .4byte 0x02039f2c + .pool thumb_func_end sub_80DD9F0 thumb_func_start sub_80DDA20 sub_80DDA20: @ 80DDA20 push {r4,r5,lr} - ldr r0, _080DDA54 + ldr r0, =c3_08130B10 + 1 movs r1, 0xA bl AddTask adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _080DDA58 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 adds r4, r0 movs r0, 0x1 strh r0, [r4, 0xA] - ldr r0, _080DDA5C + ldr r0, =0x0000abe2 bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 24 @@ -454111,9 +439097,7 @@ sub_80DDA20: @ 80DDA20 pop {r1} bx r1 .align 2, 0 -_080DDA54: .4byte c3_08130B10 + 1 -_080DDA58: .4byte 0x03005e00 -_080DDA5C: .4byte 0x0000abe2 + .pool thumb_func_end sub_80DDA20 thumb_func_start c3_08130B10 @@ -454121,7 +439105,7 @@ c3_08130B10: @ 80DDA60 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080DDA90 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -454143,7 +439127,7 @@ c3_08130B10: @ 80DDA60 adds r0, 0x1 b _080DDA98 .align 2, 0 -_080DDA90: .4byte 0x03005e00 + .pool _080DDA94: ldrh r0, [r2, 0x10] subs r0, 0x1 @@ -454163,7 +439147,7 @@ _080DDA98: lsls r0, 16 lsrs r0, 16 ldrb r2, [r4, 0x10] - ldr r3, _080DDB04 + ldr r3, =0x00007fff movs r1, 0x1 bl pal_fade_1 movs r1, 0x10 @@ -454177,7 +439161,7 @@ _080DDACA: movs r1, 0x1 eors r0, r1 strh r0, [r4, 0xE] - ldr r0, _080DDB08 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x13] @@ -454202,18 +439186,17 @@ _080DDAFE: pop {r0} bx r0 .align 2, 0 -_080DDB04: .4byte 0x00007fff -_080DDB08: .4byte 0x02039f34 + .pool thumb_func_end c3_08130B10 thumb_func_start sub_80DDB0C sub_80DDB0C: @ 80DDB0C push {r4,lr} - ldr r0, _080DDB5C + ldr r0, =sub_80DDB6C + 1 movs r1, 0xA bl AddTask - ldr r3, _080DDB60 - ldr r4, _080DDB64 + ldr r3, =0x02020630 + ldr r4, =0x02039f34 ldr r2, [r4] ldr r0, [r2] adds r0, 0x58 @@ -454222,7 +439205,7 @@ sub_80DDB0C: @ 80DDB0C adds r0, r1 lsls r0, 2 adds r0, r3 - ldr r1, _080DDB68 + ldr r1, =0x0000ffba strh r1, [r0, 0x24] ldr r0, [r2] adds r0, 0x58 @@ -454247,10 +439230,7 @@ sub_80DDB0C: @ 80DDB0C pop {r0} bx r0 .align 2, 0 -_080DDB5C: .4byte sub_80DDB6C + 1 -_080DDB60: .4byte 0x02020630 -_080DDB64: .4byte 0x02039f34 -_080DDB68: .4byte 0x0000ffba + .pool thumb_func_end sub_80DDB0C thumb_func_start sub_80DDB6C @@ -454259,7 +439239,7 @@ sub_80DDB6C: @ 80DDB6C lsls r0, 24 lsrs r0, 24 adds r3, r0, 0 - ldr r4, _080DDBDC + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] adds r0, 0x58 @@ -454267,9 +439247,9 @@ sub_80DDB6C: @ 80DDB6C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DDBE0 + ldr r1, =0x02020630 adds r2, r0, r1 - ldr r0, _080DDBE4 + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 @@ -454312,16 +439292,14 @@ _080DDBD4: pop {r0} bx r0 .align 2, 0 -_080DDBDC: .4byte 0x02039f34 -_080DDBE0: .4byte 0x02020630 -_080DDBE4: .4byte 0x03005e00 + .pool thumb_func_end sub_80DDB6C thumb_func_start sub_80DDBE8 sub_80DDBE8: @ 80DDBE8 push {r4,r5,lr} - ldr r5, _080DDC14 - ldr r4, _080DDC18 + ldr r5, =0x02020630 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r2, [r0] adds r0, r2, 0 @@ -454342,10 +439320,9 @@ sub_80DDBE8: @ 80DDBE8 ands r0, r1 b _080DDC40 .align 2, 0 -_080DDC14: .4byte 0x02020630 -_080DDC18: .4byte 0x02039f34 + .pool _080DDC1C: - ldr r0, _080DDC48 + ldr r0, =task08_080CD1CC + 1 movs r1, 0xA bl AddTask ldr r2, [r4] @@ -454368,7 +439345,7 @@ _080DDC40: pop {r0} bx r0 .align 2, 0 -_080DDC48: .4byte task08_080CD1CC + 1 + .pool thumb_func_end sub_80DDBE8 thumb_func_start task08_080CD1CC @@ -454377,7 +439354,7 @@ task08_080CD1CC: @ 80DDC4C lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r5, _080DDCCC + ldr r5, =0x02039f34 ldr r0, [r5] ldr r0, [r0] adds r0, 0x58 @@ -454385,9 +439362,9 @@ task08_080CD1CC: @ 80DDC4C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DDCD0 + ldr r1, =0x02020630 adds r3, r0, r1 - ldr r0, _080DDCD4 + ldr r0, =0x03005e00 lsls r2, r4, 2 adds r2, r4 lsls r2, 3 @@ -454411,7 +439388,7 @@ task08_080CD1CC: @ 80DDC4C negs r1, r1 cmp r0, r1 bge _080DDC9C - ldr r0, _080DDCD8 + ldr r0, =0x0000ffba strh r0, [r3, 0x24] _080DDC9C: movs r2, 0x24 @@ -454438,10 +439415,7 @@ _080DDCC4: pop {r0} bx r0 .align 2, 0 -_080DDCCC: .4byte 0x02039f34 -_080DDCD0: .4byte 0x02020630 -_080DDCD4: .4byte 0x03005e00 -_080DDCD8: .4byte 0x0000ffba + .pool thumb_func_end task08_080CD1CC thumb_func_start sub_80DDCDC @@ -454450,12 +439424,12 @@ sub_80DDCDC: @ 80DDCDC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080DDD14 + ldr r0, =sub_80DDD20 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080DDD18 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -454463,7 +439437,7 @@ sub_80DDCDC: @ 80DDCDC lsls r4, 24 asrs r4, 24 strh r4, [r1, 0x8] - ldr r0, _080DDD1C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x6] @@ -454474,9 +439448,7 @@ sub_80DDCDC: @ 80DDCDC pop {r0} bx r0 .align 2, 0 -_080DDD14: .4byte sub_80DDD20 + 1 -_080DDD18: .4byte 0x03005e00 -_080DDD1C: .4byte 0x02039f34 + .pool thumb_func_end sub_80DDCDC thumb_func_start sub_80DDD20 @@ -454484,7 +439456,7 @@ sub_80DDD20: @ 80DDD20 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080DDD44 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -454499,7 +439471,7 @@ sub_80DDD20: @ 80DDD20 beq _080DDD4E b _080DDD9C .align 2, 0 -_080DDD44: .4byte 0x03005e00 + .pool _080DDD48: cmp r0, 0x2 beq _080DDD70 @@ -454508,7 +439480,7 @@ _080DDD4E: bl sub_80DDB0C b _080DDD64 _080DDD54: - ldr r0, _080DDD6C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x6] @@ -454522,7 +439494,7 @@ _080DDD64: strh r0, [r4, 0x1C] b _080DDD9C .align 2, 0 -_080DDD6C: .4byte 0x02039f34 + .pool _080DDD70: ldrh r0, [r4, 0x1E] adds r1, r0, 0x1 @@ -454534,7 +439506,7 @@ _080DDD70: movs r0, 0 strh r0, [r4, 0x1E] bl sub_80DD940 - ldr r0, _080DDDA4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] ldrb r1, [r2, 0x6] @@ -454549,13 +439521,13 @@ _080DDD9C: pop {r0} bx r0 .align 2, 0 -_080DDDA4: .4byte 0x02039f34 + .pool thumb_func_end sub_80DDD20 thumb_func_start sub_80DDDA8 sub_80DDDA8: @ 80DDDA8 - ldr r3, _080DDDDC - ldr r0, _080DDDE0 + ldr r3, =0x02020630 + ldr r0, =0x02039f34 ldr r2, [r0] ldr r0, [r2] adds r0, 0x58 @@ -454581,14 +439553,13 @@ sub_80DDDA8: @ 80DDDA8 strb r1, [r0] bx lr .align 2, 0 -_080DDDDC: .4byte 0x02020630 -_080DDDE0: .4byte 0x02039f34 + .pool thumb_func_end sub_80DDDA8 thumb_func_start sub_80DDDE4 sub_80DDDE4: @ 80DDDE4 - ldr r2, _080DDE04 - ldr r0, _080DDE08 + ldr r2, =0x02020630 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] adds r0, 0x58 @@ -454604,17 +439575,16 @@ sub_80DDDE4: @ 80DDDE4 strb r1, [r0] bx lr .align 2, 0 -_080DDE04: .4byte 0x02020630 -_080DDE08: .4byte 0x02039f34 + .pool thumb_func_end sub_80DDDE4 thumb_func_start sub_80DDE0C sub_80DDE0C: @ 80DDE0C push {lr} - ldr r0, _080DDE28 + ldr r0, =sub_80DDE30 + 1 movs r1, 0xF bl AddTask - ldr r0, _080DDE2C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x6] @@ -454624,8 +439594,7 @@ sub_80DDE0C: @ 80DDE0C pop {r0} bx r0 .align 2, 0 -_080DDE28: .4byte sub_80DDE30 + 1 -_080DDE2C: .4byte 0x02039f34 + .pool thumb_func_end sub_80DDE0C thumb_func_start sub_80DDE30 @@ -454633,7 +439602,7 @@ sub_80DDE30: @ 80DDE30 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080DDE6C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -454651,20 +439620,18 @@ sub_80DDE30: @ 80DDE30 ldrsh r0, [r4, r1] cmp r0, 0 bne _080DDE78 - ldr r0, _080DDE70 - ldr r1, _080DDE74 + ldr r0, =0x02019000 + ldr r1, =0x06002000 movs r2, 0x80 lsls r2, 5 movs r3, 0x1 bl dma3_transfer_queue_add_copy b _080DDE8C .align 2, 0 -_080DDE6C: .4byte 0x03005e00 -_080DDE70: .4byte 0x02019000 -_080DDE74: .4byte 0x06002000 + .pool _080DDE78: - ldr r0, _080DDEC0 - ldr r1, _080DDEC4 + ldr r0, =0x02018000 + ldr r1, =0x06002000 movs r2, 0x80 lsls r2, 5 movs r3, 0x1 @@ -454673,7 +439640,7 @@ _080DDE78: adds r0, 0x1 strh r0, [r4, 0x20] _080DDE8C: - ldr r1, _080DDEC8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -454686,7 +439653,7 @@ _080DDE8C: ldrsh r0, [r0, r1] cmp r0, 0x9 bne _080DDEBA - ldr r0, _080DDECC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] ldrb r1, [r2, 0x6] @@ -454700,10 +439667,7 @@ _080DDEBA: pop {r0} bx r0 .align 2, 0 -_080DDEC0: .4byte 0x02018000 -_080DDEC4: .4byte 0x06002000 -_080DDEC8: .4byte 0x03005e00 -_080DDECC: .4byte 0x02039f34 + .pool thumb_func_end sub_80DDE30 thumb_func_start sub_80DDED0 @@ -454714,7 +439678,7 @@ sub_80DDED0: @ 80DDED0 lsrs r4, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _080DDF10 + ldr r0, =sub_80DDF80 + 1 movs r1, 0xA bl AddTask lsls r0, 24 @@ -454722,13 +439686,13 @@ sub_80DDED0: @ 80DDED0 lsls r4, 24 cmp r4, 0 ble _080DDF38 - ldr r7, _080DDF14 + ldr r7, =0x0000237e lsls r0, r5, 24 adds r4, r0, 0 cmp r4, 0 ble _080DDF1C movs r5, 0 - ldr r2, _080DDF18 + ldr r2, =0x02039f34 ldr r0, [r2] ldr r0, [r0] movs r1, 0x13 @@ -454739,11 +439703,9 @@ sub_80DDED0: @ 80DDED0 lsrs r3, r0, 24 b _080DDF4E .align 2, 0 -_080DDF10: .4byte sub_80DDF80 + 1 -_080DDF14: .4byte 0x0000237e -_080DDF18: .4byte 0x02039f34 + .pool _080DDF1C: - ldr r2, _080DDF34 + ldr r2, =0x02039f34 ldr r0, [r2] ldr r0, [r0] movs r1, 0x13 @@ -454755,7 +439717,7 @@ _080DDF1C: movs r3, 0 b _080DDF4E .align 2, 0 -_080DDF34: .4byte 0x02039f34 + .pool _080DDF38: movs r7, 0 lsls r0, r5, 24 @@ -454769,9 +439731,9 @@ _080DDF48: movs r5, 0xC movs r3, 0 _080DDF4C: - ldr r2, _080DDF78 + ldr r2, =0x02039f34 _080DDF4E: - ldr r1, _080DDF7C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -454792,8 +439754,7 @@ _080DDF4E: pop {r0} bx r0 .align 2, 0 -_080DDF78: .4byte 0x02039f34 -_080DDF7C: .4byte 0x03005e00 + .pool thumb_func_end sub_80DDED0 thumb_func_start sub_80DDF80 @@ -454801,7 +439762,7 @@ sub_80DDF80: @ 80DDF80 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _080DDFB0 + ldr r2, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -454822,7 +439783,7 @@ sub_80DDF80: @ 80DDF80 adds r0, 0x1 b _080DDFB8 .align 2, 0 -_080DDFB0: .4byte 0x03005e00 + .pool _080DDFB4: ldrh r0, [r3, 0xA] subs r0, 0x1 @@ -454850,7 +439811,7 @@ _080DDFB8: bne _080DDFFC adds r0, r5, 0 bl remove_task - ldr r0, _080DE004 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] ldrb r1, [r2, 0x7] @@ -454863,7 +439824,7 @@ _080DDFFC: pop {r0} bx r0 .align 2, 0 -_080DE004: .4byte 0x02039f34 + .pool thumb_func_end sub_80DDF80 thumb_func_start sub_80DE008 @@ -454877,10 +439838,10 @@ sub_80DE008: @ 80DE008 lsrs r0, 24 mov r10, r0 movs r5, 0 - ldr r0, _080DE0A4 + ldr r0, =0x02039f34 mov r9, r0 mov r8, r9 - ldr r6, _080DE0A8 + ldr r6, =0x02020630 movs r4, 0 movs r7, 0 _080DE026: @@ -454911,9 +439872,9 @@ _080DE026: ldrh r1, [r1, 0x4] lsls r1, 22 lsrs r1, 17 - ldr r2, _080DE0AC + ldr r2, =0x060100c0 adds r1, r2 - ldr r2, _080DE0B0 + ldr r2, =0x04000008 bl CpuSet mov r0, r8 ldr r3, [r0] @@ -454924,8 +439885,8 @@ _080DE026: adds r1, r0 lsls r1, 2 adds r1, r6 - ldr r2, _080DE0B4 - ldr r0, _080DE0B8 + ldr r2, =0x08587a70 + ldr r0, =0x02039f26 adds r0, r5, r0 ldrb r0, [r0] adds r0, r2 @@ -454946,12 +439907,7 @@ _080DE026: ands r1, r2 b _080DE0D6 .align 2, 0 -_080DE0A4: .4byte 0x02039f34 -_080DE0A8: .4byte 0x02020630 -_080DE0AC: .4byte 0x060100c0 -_080DE0B0: .4byte 0x04000008 -_080DE0B4: .4byte 0x08587a70 -_080DE0B8: .4byte 0x02039f26 + .pool _080DE0BC: mov r1, r9 ldr r0, [r1] @@ -454987,7 +439943,7 @@ sub_80DE0F0: @ 80DE0F0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080DE118 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r2, [r1, 0x4] lsls r1, r0, 3 @@ -455001,19 +439957,18 @@ sub_80DE0F0: @ 80DE0F0 bne _080DE120 ldrb r0, [r2, 0x19] lsls r0, 5 - ldr r1, _080DE11C + ldr r1, =0x08d8e9b4 adds r0, r1 b _080DE122 .align 2, 0 -_080DE118: .4byte 0x02039f34 -_080DE11C: .4byte 0x08d8e9b4 + .pool _080DE120: - ldr r0, _080DE128 + ldr r0, =0x08d8ea34 _080DE122: pop {r1} bx r1 .align 2, 0 -_080DE128: .4byte 0x08d8ea34 + .pool thumb_func_end sub_80DE0F0 thumb_func_start sub_80DE12C @@ -455032,7 +439987,7 @@ sub_80DE12C: @ 80DE12C movs r0, 0x11 mov r9, r0 _080DE146: - ldr r0, _080DE1E0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0xD @@ -455046,7 +440001,7 @@ _080DE146: lsls r0, 24 cmp r0, 0 bne _080DE1CA - ldr r0, _080DE1E4 + ldr r0, =0x02039f26 adds r0, r7, r0 ldrb r0, [r0] lsls r5, r0, 2 @@ -455106,8 +440061,7 @@ _080DE1CA: pop {r0} bx r0 .align 2, 0 -_080DE1E0: .4byte 0x02039f34 -_080DE1E4: .4byte 0x02039f26 + .pool thumb_func_end sub_80DE12C thumb_func_start sub_80DE1E8 @@ -455115,7 +440069,7 @@ sub_80DE1E8: @ 80DE1E8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080DE218 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r2, [r1, 0x4] lsls r1, r0, 3 @@ -455137,7 +440091,7 @@ _080DE212: movs r0, 0 b _080DE21E .align 2, 0 -_080DE218: .4byte 0x02039f34 + .pool _080DE21C: movs r0, 0x1 _080DE21E: @@ -455208,10 +440162,10 @@ sub_80DE224: @ 80DE224 ldrh r1, [r5] movs r0, 0xC bl lcd_io_set - ldr r1, _080DE338 + ldr r1, =0x02022e18 movs r0, 0xF0 strh r0, [r1] - ldr r4, _080DE33C + ldr r4, =0x02022e1a movs r0, 0xA0 strh r0, [r4] movs r0, 0x14 @@ -455223,12 +440177,12 @@ sub_80DE224: @ 80DE224 movs r0, 0 str r0, [sp, 0x8] add r0, sp, 0x8 - ldr r4, _080DE340 + ldr r4, =0x02039f34 ldr r1, [r4] ldr r1, [r1, 0x28] - ldr r2, _080DE344 + ldr r2, =0x05000400 bl CpuSet - ldr r1, _080DE348 + ldr r1, =0x08c17980 movs r0, 0x1 movs r2, 0 movs r3, 0 @@ -455236,7 +440190,7 @@ sub_80DE224: @ 80DE224 movs r0, 0x1 bl sub_80DED60 movs r5, 0 - ldr r7, _080DE34C + ldr r7, =0x02020630 movs r6, 0x4 _080DE2F0: ldr r0, [r4] @@ -455276,19 +440230,14 @@ _080DE2F0: pop {r0} bx r0 .align 2, 0 -_080DE338: .4byte 0x02022e18 -_080DE33C: .4byte 0x02022e1a -_080DE340: .4byte 0x02039f34 -_080DE344: .4byte 0x05000400 -_080DE348: .4byte 0x08c17980 -_080DE34C: .4byte 0x02020630 + .pool thumb_func_end sub_80DE224 thumb_func_start sub_80DE350 sub_80DE350: @ 80DE350 push {r4-r7,lr} sub sp, 0x8 - ldr r1, _080DE40C + ldr r1, =0x06008000 movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -455296,10 +440245,10 @@ sub_80DE350: @ 80DE350 bl dma3_transfer_queue_add_fill movs r5, 0 str r5, [sp] - ldr r6, _080DE410 + ldr r6, =0x02039f34 ldr r0, [r6] ldr r1, [r0, 0x28] - ldr r2, _080DE414 + ldr r2, =0x05000400 mov r0, sp bl CpuSet movs r0, 0x1 @@ -455337,11 +440286,11 @@ sub_80DE350: @ 80DE350 ldrh r1, [r3] movs r0, 0xA bl lcd_io_set - ldr r0, _080DE418 + ldr r0, =0x02022e18 strh r5, [r0] - ldr r0, _080DE41C + ldr r0, =0x02022e1a strh r5, [r0] - ldr r7, _080DE420 + ldr r7, =0x02020630 _080DE3CA: ldr r0, [r6] ldr r0, [r0, 0x14] @@ -455376,12 +440325,7 @@ _080DE3CA: pop {r0} bx r0 .align 2, 0 -_080DE40C: .4byte 0x06008000 -_080DE410: .4byte 0x02039f34 -_080DE414: .4byte 0x05000400 -_080DE418: .4byte 0x02022e18 -_080DE41C: .4byte 0x02022e1a -_080DE420: .4byte 0x02020630 + .pool thumb_func_end sub_80DE350 thumb_func_start sub_80DE424 @@ -455390,30 +440334,27 @@ sub_80DE424: @ 80DE424 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _080DE454 + ldr r1, =0x02022e18 movs r0, 0 strh r0, [r1] - ldr r1, _080DE458 + ldr r1, =0x02022e1a movs r0, 0xA0 strh r0, [r1] movs r0, 0x62 movs r1, 0 bl audio_play_and_stuff - ldr r1, _080DE45C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080DE460 + ldr r1, =sub_80DE464 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080DE454: .4byte 0x02022e18 -_080DE458: .4byte 0x02022e1a -_080DE45C: .4byte 0x03005e00 -_080DE460: .4byte sub_80DE464 + 1 + .pool thumb_func_end sub_80DE424 thumb_func_start sub_80DE464 @@ -455421,7 +440362,7 @@ sub_80DE464: @ 80DE464 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _080DE49C + ldr r1, =0x02022e1a ldrh r0, [r1] subs r0, 0x7 strh r0, [r1] @@ -455434,7 +440375,7 @@ _080DE47C: ldrh r2, [r1] cmp r2, 0 bne _080DE496 - ldr r0, _080DE4A0 + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 @@ -455442,15 +440383,13 @@ _080DE47C: strh r2, [r1, 0x8] strh r2, [r1, 0xA] strh r2, [r1, 0xC] - ldr r0, _080DE4A4 + ldr r0, =sub_80DE4A8 + 1 str r0, [r1] _080DE496: pop {r0} bx r0 .align 2, 0 -_080DE49C: .4byte 0x02022e1a -_080DE4A0: .4byte 0x03005e00 -_080DE4A4: .4byte sub_80DE4A8 + 1 + .pool thumb_func_end sub_80DE464 thumb_func_start sub_80DE4A8 @@ -455458,7 +440397,7 @@ sub_80DE4A8: @ 80DE4A8 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080DE4CC + ldr r1, =0x03005e00 lsls r3, r4, 2 adds r0, r3, r4 lsls r0, 3 @@ -455473,7 +440412,7 @@ sub_80DE4A8: @ 80DE4A8 beq _080DE4DA b _080DE5B4 .align 2, 0 -_080DE4CC: .4byte 0x03005e00 + .pool _080DE4D0: cmp r1, 0x2 beq _080DE58A @@ -455483,8 +440422,8 @@ _080DE4D0: _080DE4DA: movs r2, 0 adds r6, r3, 0 - ldr r5, _080DE520 - ldr r3, _080DE524 + ldr r5, =0x02039f34 + ldr r3, =0x02039f26 _080DE4E2: ldr r0, [r5] ldr r1, [r0] @@ -455503,7 +440442,7 @@ _080DE4E2: movs r0, 0x1 bl sub_80DE008 bl sub_80DC44C - ldr r0, _080DE528 + ldr r0, =0x03005e00 adds r1, r6, r4 lsls r1, 3 adds r1, r0 @@ -455511,16 +440450,14 @@ _080DE4E2: strh r0, [r1, 0x8] b _080DE5B4 .align 2, 0 -_080DE520: .4byte 0x02039f34 -_080DE524: .4byte 0x02039f26 -_080DE528: .4byte 0x03005e00 + .pool _080DE52C: - ldr r0, _080DE574 + ldr r0, =0x02039f2a ldrb r0, [r0] ands r1, r0 cmp r1, 0 beq _080DE584 - ldr r0, _080DE578 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x7] @@ -455533,13 +440470,13 @@ _080DE52C: beq _080DE552 bl sub_80DBAA0 _080DE552: - ldr r4, _080DE57C + ldr r4, =sub_80FCC88 + 1 adds r0, r4, 0 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080DE580 + ldr r2, =sub_80DA110 + 1 adds r1, r4, 0 bl set_task_function_and_args_14_15 bl sub_80DBF68 @@ -455547,15 +440484,12 @@ _080DE552: strh r0, [r5, 0x8] b _080DE5B4 .align 2, 0 -_080DE574: .4byte 0x02039f2a -_080DE578: .4byte 0x02039f34 -_080DE57C: .4byte sub_80FCC88 + 1 -_080DE580: .4byte sub_80DA110 + 1 + .pool _080DE584: bl sub_80DBAA0 b _080DE59A _080DE58A: - ldr r0, _080DE5A0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x7] @@ -455568,20 +440502,20 @@ _080DE59A: strh r0, [r5, 0x8] b _080DE5B4 .align 2, 0 -_080DE5A0: .4byte 0x02039f34 + .pool _080DE5A4: bl sub_80DB884 bl sub_80DB2BC movs r0, 0 strh r0, [r5, 0x8] - ldr r0, _080DE5BC + ldr r0, =sub_80DE5F4 + 1 str r0, [r5] _080DE5B4: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080DE5BC: .4byte sub_80DE5F4 + 1 + .pool thumb_func_end sub_80DE4A8 thumb_func_start sub_80DE5C0 @@ -455589,7 +440523,7 @@ sub_80DE5C0: @ 80DE5C0 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080DE5E8 + ldr r1, =0x02022e1a ldrh r0, [r1] adds r0, 0x7 strh r0, [r1] @@ -455597,20 +440531,18 @@ sub_80DE5C0: @ 80DE5C0 asrs r0, 16 cmp r0, 0xA0 ble _080DE5E4 - ldr r0, _080DE5EC + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _080DE5F0 + ldr r0, =sub_80DA4F4 + 1 str r0, [r1] _080DE5E4: pop {r0} bx r0 .align 2, 0 -_080DE5E8: .4byte 0x02022e1a -_080DE5EC: .4byte 0x03005e00 -_080DE5F0: .4byte sub_80DA4F4 + 1 + .pool thumb_func_end sub_80DE5C0 thumb_func_start sub_80DE5F4 @@ -455618,7 +440550,7 @@ sub_80DE5F4: @ 80DE5F4 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080DE614 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -455632,7 +440564,7 @@ sub_80DE5F4: @ 80DE5F4 strh r0, [r1, 0xC] b _080DE654 .align 2, 0 -_080DE614: .4byte 0x03005e00 + .pool _080DE618: ldrh r3, [r1, 0xA] movs r4, 0xA @@ -455658,11 +440590,11 @@ _080DE636: bne _080DE650 strh r2, [r1, 0xA] strh r2, [r1, 0xC] - ldr r0, _080DE64C + ldr r0, =sub_80DE65C + 1 str r0, [r1] b _080DE654 .align 2, 0 -_080DE64C: .4byte sub_80DE65C + 1 + .pool _080DE650: subs r0, 0x1 _080DE652: @@ -455678,7 +440610,7 @@ sub_80DE65C: @ 80DE65C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080DE67C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -455692,21 +440624,21 @@ sub_80DE65C: @ 80DE65C strh r0, [r4, 0xC] b _080DE690 .align 2, 0 -_080DE67C: .4byte 0x03005e00 + .pool _080DE680: movs r0, 0 strh r0, [r4, 0xC] movs r0, 0x61 movs r1, 0 bl audio_play_and_stuff - ldr r0, _080DE698 + ldr r0, =sub_80DE5C0 + 1 str r0, [r4] _080DE690: pop {r4} pop {r0} bx r0 .align 2, 0 -_080DE698: .4byte sub_80DE5C0 + 1 + .pool thumb_func_end sub_80DE65C thumb_func_start sub_80DE69C @@ -455718,8 +440650,8 @@ sub_80DE69C: @ 80DE69C lsrs r0, 24 mov r8, r0 movs r7, 0 - ldr r6, _080DE784 - ldr r5, _080DE788 + ldr r6, =0x02020630 + ldr r5, =0x02039f34 _080DE6AE: bl rotscale_alloc_entry ldr r1, [r5] @@ -455801,19 +440733,19 @@ _080DE74C: adds r7, 0x1 cmp r7, 0x3 ble _080DE6AE - ldr r0, _080DE78C + ldr r0, =sub_80DE794 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080DE790 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 mov r0, r8 strh r0, [r1, 0x8] - ldr r0, _080DE788 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x7] @@ -455826,10 +440758,7 @@ _080DE74C: pop {r0} bx r0 .align 2, 0 -_080DE784: .4byte 0x02020630 -_080DE788: .4byte 0x02039f34 -_080DE78C: .4byte sub_80DE794 + 1 -_080DE790: .4byte 0x03005e00 + .pool thumb_func_end sub_80DE69C thumb_func_start sub_80DE794 @@ -455837,8 +440766,8 @@ sub_80DE794: @ 80DE794 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _080DE828 - ldr r3, _080DE82C + ldr r2, =0x02020630 + ldr r3, =0x02039f34 ldr r0, [r3] ldr r0, [r0, 0x14] ldrb r1, [r0] @@ -455851,7 +440780,7 @@ sub_80DE794: @ 80DE794 lsls r0, 26 cmp r0, 0 bge _080DE822 - ldr r0, _080DE830 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -455882,7 +440811,7 @@ _080DE7CC: _080DE7EC: movs r4, 0 _080DE7EE: - ldr r5, _080DE82C + ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x14] lsls r0, r4, 2 @@ -455891,7 +440820,7 @@ _080DE7EE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DE828 + ldr r1, =0x02020630 adds r0, r1 bl obj_free_rotscale_entry adds r4, 0x1 @@ -455911,9 +440840,7 @@ _080DE822: pop {r0} bx r0 .align 2, 0 -_080DE828: .4byte 0x02020630 -_080DE82C: .4byte 0x02039f34 -_080DE830: .4byte 0x03005e00 + .pool thumb_func_end sub_80DE794 thumb_func_start sub_80DE834 @@ -455937,7 +440864,7 @@ sub_80DE84C: @ 80DE84C push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _080DE860 + ldr r0, =0x0000019b cmp r1, r0 bls _080DE85A movs r1, 0 @@ -455946,7 +440873,7 @@ _080DE85A: pop {r1} bx r1 .align 2, 0 -_080DE860: .4byte 0x0000019b + .pool thumb_func_end sub_80DE84C thumb_func_start sub_80DE864 @@ -455954,7 +440881,7 @@ sub_80DE864: @ 80DE864 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _080DE8C8 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r1, [r0, 0x4] lsls r0, r7, 3 @@ -455965,7 +440892,7 @@ sub_80DE864: @ 80DE864 bl sub_80DE834 lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _080DE8CC + ldr r1, =0x02039e00 lsls r0, r7, 6 adds r0, r1 ldrh r0, [r0] @@ -455978,7 +440905,7 @@ sub_80DE864: @ 80DE864 movs r2, 0x14 bl memset bl sub_80A3934 - ldr r1, _080DE8D0 + ldr r1, =0x020244e4 movs r2, 0 adds r0, r1, 0x3 _080DE8A8: @@ -455998,9 +440925,7 @@ _080DE8A8: beq _080DE978 b _080DE9A2 .align 2, 0 -_080DE8C8: .4byte 0x02039f34 -_080DE8CC: .4byte 0x02039e00 -_080DE8D0: .4byte 0x020244e4 + .pool _080DE8D4: cmp r5, 0x82 beq _080DE978 @@ -456024,7 +440949,7 @@ _080DE8EC: beq _080DE920 b _080DE9A2 _080DE8FA: - ldr r0, _080DE918 + ldr r0, =0x083203cc lsls r1, r6, 3 subs r1, r6 lsls r1, 2 @@ -456036,14 +440961,13 @@ _080DE8FA: cmp r0, 0x7 bne _080DE99C _080DE910: - ldr r1, _080DE91C + ldr r1, =0x02038432 movs r0, 0 b _080DE9A0 .align 2, 0 -_080DE918: .4byte 0x083203cc -_080DE91C: .4byte 0x02038432 + .pool _080DE920: - ldr r6, _080DE958 + ldr r6, =0x02039f34 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r7, 3 @@ -456051,7 +440975,7 @@ _080DE920: lsls r0, 2 adds r0, r1 ldrb r4, [r0, 0x1B] - ldr r5, _080DE95C + ldr r5, =0x02039e00 lsls r4, 6 adds r0, r4, r5 ldrh r0, [r0] @@ -456070,22 +440994,21 @@ _080DE920: strb r0, [r2, 0x4] b _080DE9A2 .align 2, 0 -_080DE958: .4byte 0x02039f34 -_080DE95C: .4byte 0x02039e00 + .pool _080DE960: - ldr r1, _080DE968 + ldr r1, =0x0203841a movs r0, 0xFF b _080DE9A0 .align 2, 0 -_080DE968: .4byte 0x0203841a + .pool _080DE96C: - ldr r1, _080DE974 + ldr r1, =0x0203841a movs r0, 0 b _080DE9A0 .align 2, 0 -_080DE974: .4byte 0x0203841a + .pool _080DE978: - ldr r0, _080DE994 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] adds r2, r0, 0 @@ -456095,14 +441018,13 @@ _080DE978: bne _080DE99C movs r0, 0x2 strb r0, [r2] - ldr r0, _080DE998 + ldr r0, =0x02038432 strb r1, [r0] b _080DE9A2 .align 2, 0 -_080DE994: .4byte 0x02039f34 -_080DE998: .4byte 0x02038432 + .pool _080DE99C: - ldr r1, _080DE9AC + ldr r1, =0x02038432 movs r0, 0x1 _080DE9A0: strb r0, [r1] @@ -456112,13 +441034,13 @@ _080DE9A2: pop {r0} bx r0 .align 2, 0 -_080DE9AC: .4byte 0x02038432 + .pool thumb_func_end sub_80DE864 thumb_func_start sub_80DE9B0 sub_80DE9B0: @ 80DE9B0 push {r4,lr} - ldr r4, _080DE9D8 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x18] movs r1, 0 @@ -456138,7 +441060,7 @@ _080DE9D2: pop {r0} bx r0 .align 2, 0 -_080DE9D8: .4byte 0x02039f34 + .pool thumb_func_end sub_80DE9B0 thumb_func_start sub_80DE9DC @@ -456147,11 +441069,11 @@ sub_80DE9DC: @ 80DE9DC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r6, _080DEA18 + ldr r6, =0x02039f34 ldr r0, [r6] ldr r0, [r0, 0x18] strb r4, [r0, 0x5] - ldr r5, _080DEA1C + ldr r5, =0x02039e00 lsls r4, 6 adds r0, r4, r5 ldrh r0, [r0] @@ -456173,46 +441095,42 @@ sub_80DE9DC: @ 80DE9DC pop {r0} bx r0 .align 2, 0 -_080DEA18: .4byte 0x02039f34 -_080DEA1C: .4byte 0x02039e00 + .pool thumb_func_end sub_80DE9DC thumb_func_start sub_80DEA20 sub_80DEA20: @ 80DEA20 push {lr} - ldr r0, _080DEA4C + ldr r0, =nullsub_12 + 1 bl object_new_hidden_with_callback - ldr r1, _080DEA50 + ldr r1, =0x020241e4 strb r0, [r1, 0x3] - ldr r0, _080DEA54 + ldr r0, =0x0202420c ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DEA58 + ldr r1, =0x02020630 adds r0, r1 bl obj_alloc_rotscale_entry bl sub_80DEA5C pop {r0} bx r0 .align 2, 0 -_080DEA4C: .4byte nullsub_12 + 1 -_080DEA50: .4byte 0x020241e4 -_080DEA54: .4byte 0x0202420c -_080DEA58: .4byte 0x02020630 + .pool thumb_func_end sub_80DEA20 thumb_func_start sub_80DEA5C sub_80DEA5C: @ 80DEA5C push {r4,lr} - ldr r0, _080DEAA0 + ldr r0, =0x020241e4 ldrb r0, [r0, 0x3] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080DEAA4 + ldr r0, =0x02020630 adds r4, r0 movs r0, 0 strh r0, [r4, 0x24] @@ -456238,8 +441156,7 @@ sub_80DEA5C: @ 80DEA5C pop {r0} bx r0 .align 2, 0 -_080DEAA0: .4byte 0x020241e4 -_080DEAA4: .4byte 0x02020630 + .pool thumb_func_end sub_80DEA5C thumb_func_start sub_80DEAA8 @@ -456247,7 +441164,7 @@ sub_80DEAA8: @ 80DEAA8 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r2, _080DEAC8 + ldr r2, =0x0831c898 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -456256,13 +441173,12 @@ sub_80DEAA8: @ 80DEAA8 cmp r0, 0x20 bhi _080DEB60 lsls r0, 2 - ldr r1, _080DEACC + ldr r1, =_080DEAD0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DEAC8: .4byte 0x0831c898 -_080DEACC: .4byte _080DEAD0 + .pool .align 2, 0 _080DEAD0: .4byte _080DEB60 @@ -456299,20 +441215,20 @@ _080DEAD0: .4byte _080DEB60 .4byte _080DEB60 _080DEB54: - ldr r1, _080DEB5C + ldr r1, =0x0202420c movs r0, 0x2 b _080DEB64 .align 2, 0 -_080DEB5C: .4byte 0x0202420c + .pool _080DEB60: - ldr r1, _080DEB6C + ldr r1, =0x0202420c movs r0, 0x3 _080DEB64: strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_080DEB6C: .4byte 0x0202420c + .pool thumb_func_end sub_80DEAA8 thumb_func_start sub_80DEB70 @@ -456453,7 +441369,7 @@ sub_80DEC30: @ 80DEC30 bl remo_copy b _080DECA4 _080DEC80: - ldr r0, _080DEC90 + ldr r0, =0x02039f2a ldrb r1, [r0] adds r0, r5, 0 ands r0, r1 @@ -456462,7 +441378,7 @@ _080DEC80: movs r1, 0x4 b _080DEC9C .align 2, 0 -_080DEC90: .4byte 0x02039f2a + .pool _080DEC94: bl sav2_get_text_speed lsls r0, 24 @@ -456574,7 +441490,7 @@ sub_80DED4C: @ 80DED4C thumb_func_start sub_80DED60 sub_80DED60: @ 80DED60 - ldr r2, _080DED70 + ldr r2, =0x02039f38 movs r1, 0x1 lsls r1, r0 ldrb r0, [r2] @@ -456582,15 +441498,15 @@ sub_80DED60: @ 80DED60 strb r1, [r2] bx lr .align 2, 0 -_080DED70: .4byte 0x02039f38 + .pool thumb_func_end sub_80DED60 thumb_func_start sub_80DED74 sub_80DED74: @ 80DED74 push {r4-r6,lr} movs r0, 0 - ldr r6, _080DEDA0 - ldr r5, _080DEDA4 + ldr r6, =0x03005d90 + ldr r5, =0x00000624 movs r4, 0 _080DED7E: adds r3, r0, 0x1 @@ -456612,8 +441528,7 @@ _080DED84: pop {r0} bx r0 .align 2, 0 -_080DEDA0: .4byte 0x03005d90 -_080DEDA4: .4byte 0x00000624 + .pool thumb_func_end sub_80DED74 thumb_func_start sub_80DEDA8 @@ -456636,7 +441551,7 @@ sub_80DEDA8: @ 80DEDA8 lsrs r0, 24 mov r8, r0 movs r5, 0 - ldr r1, _080DEDF8 + ldr r1, =0x02039f20 ldrb r0, [r1] cmp r0, 0 beq _080DEDE6 @@ -456652,28 +441567,26 @@ _080DEDE6: ldr r0, [sp] cmp r0, 0xFF bne _080DEE00 - ldr r0, _080DEDFC + ldr r0, =0x02039f25 ldrb r0, [r0] cmp r5, r0 beq _080DEE00 movs r0, 0 b _080DEF90 .align 2, 0 -_080DEDF8: .4byte 0x02039f20 -_080DEDFC: .4byte 0x02039f25 + .pool _080DEE00: - ldr r0, _080DEE14 + ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0x4 bhi _080DEE4C lsls r0, 2 - ldr r1, _080DEE18 + ldr r1, =_080DEE1C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DEE14: .4byte 0x02039f2c -_080DEE18: .4byte _080DEE1C + .pool .align 2, 0 _080DEE1C: .4byte _080DEE4C @@ -456712,15 +441625,15 @@ _080DEE54: lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r2, _080DEED8 + ldr r2, =0x03005d8c mov r10, r2 ldr r0, [r2] mov r3, r9 lsls r7, r3, 5 - ldr r6, _080DEEDC + ldr r6, =0x00002e90 adds r2, r0, r6 adds r2, r7 - ldr r4, _080DEEE0 + ldr r4, =0x02039e00 lsls r5, 6 adds r1, r4, 0 adds r1, 0x38 @@ -456730,10 +441643,10 @@ _080DEE54: adds r1, r0, r7 adds r2, r5, r4 ldrh r2, [r2] - ldr r3, _080DEEE4 + ldr r3, =0x00002e98 adds r1, r3 strh r2, [r1] - ldr r1, _080DEEE8 + ldr r1, =0x00002e94 adds r2, r0, r1 adds r2, r7 adds r1, r4, 0 @@ -456755,7 +441668,7 @@ _080DEE54: adds r5, r4 adds r1, r5, 0 bl gf_strcpy - ldr r0, _080DEEEC + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -456764,65 +441677,54 @@ _080DEE54: mov r3, r10 ldr r0, [r3] adds r0, r7 - ldr r1, _080DEEF0 + ldr r1, =0x00002eae adds r0, r1 movs r1, 0x4 b _080DEF02 .align 2, 0 -_080DEED8: .4byte 0x03005d8c -_080DEEDC: .4byte 0x00002e90 -_080DEEE0: .4byte 0x02039e00 -_080DEEE4: .4byte 0x00002e98 -_080DEEE8: .4byte 0x00002e94 -_080DEEEC: .4byte 0x02039f2a -_080DEEF0: .4byte 0x00002eae + .pool _080DEEF4: mov r2, r10 ldr r0, [r2] adds r0, r7 - ldr r1, _080DEF20 + ldr r1, =0x02039f2e ldrh r1, [r1] - ldr r3, _080DEF24 + ldr r3, =0x00002eae adds r0, r3 _080DEF02: strb r1, [r0] ldr r0, [sp] cmp r0, 0xFF beq _080DEF34 - ldr r0, _080DEF28 + ldr r0, =0x03005d8c ldr r0, [r0] mov r2, r9 lsls r1, r2, 5 adds r0, r1 - ldr r1, _080DEF2C + ldr r1, =0x02039f2c ldrh r1, [r1] - ldr r3, _080DEF30 + ldr r3, =0x00002e9a adds r0, r3 strb r1, [r0] b _080DEF8E .align 2, 0 -_080DEF20: .4byte 0x02039f2e -_080DEF24: .4byte 0x00002eae -_080DEF28: .4byte 0x03005d8c -_080DEF2C: .4byte 0x02039f2c -_080DEF30: .4byte 0x00002e9a + .pool _080DEF34: - ldr r0, _080DEF48 + ldr r0, =0x03005d8c ldr r0, [r0] mov r2, r9 lsls r1, r2, 5 adds r0, r1 - ldr r3, _080DEF4C + ldr r3, =0x00002e9a adds r0, r3 mov r1, r8 strb r1, [r0] b _080DEF8E .align 2, 0 -_080DEF48: .4byte 0x03005d8c -_080DEF4C: .4byte 0x00002e9a + .pool _080DEF50: - ldr r6, _080DEFA0 - ldr r4, _080DEFA4 + ldr r6, =0x02039f3c + ldr r4, =0x02039e00 lsls r5, 6 adds r0, r4, 0 adds r0, 0x38 @@ -456862,8 +441764,7 @@ _080DEF90: pop {r1} bx r1 .align 2, 0 -_080DEFA0: .4byte 0x02039f3c -_080DEFA4: .4byte 0x02039e00 + .pool thumb_func_end sub_80DEDA8 thumb_func_start sub_80DEFA8 @@ -456880,10 +441781,10 @@ sub_80DEFA8: @ 80DEFA8 cmp r1, 0 beq _080DEFE6 movs r2, 0x5 - ldr r0, _080DEFEC + ldr r0, =0x03005d8c mov r12, r0 - ldr r4, _080DEFF0 - ldr r3, _080DEFF4 + ldr r4, =0x00002e90 + ldr r3, =0x00002e70 _080DEFC8: mov r1, r12 ldr r0, [r1] @@ -456904,22 +441805,19 @@ _080DEFE6: movs r0, 0 b _080DF03A .align 2, 0 -_080DEFEC: .4byte 0x03005d8c -_080DEFF0: .4byte 0x00002e90 -_080DEFF4: .4byte 0x00002e70 + .pool _080DEFF8: - ldr r0, _080DF00C + ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0x4 bhi _080DF038 lsls r0, 2 - ldr r1, _080DF010 + ldr r1, =_080DF014 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080DF00C: .4byte 0x02039f2c -_080DF010: .4byte _080DF014 + .pool .align 2, 0 _080DF014: .4byte _080DF028 @@ -456951,10 +441849,10 @@ _080DF03A: sub_80DF040: @ 80DF040 push {r4-r7,lr} movs r2, 0 - ldr r0, _080DF074 + ldr r0, =0x03005d8c mov r12, r0 - ldr r4, _080DF078 - ldr r3, _080DF07C + ldr r4, =0x00002e90 + ldr r3, =0x08587fa4 _080DF04C: mov r1, r12 ldr r0, [r1] @@ -456976,9 +441874,7 @@ _080DF04C: pop {r0} bx r0 .align 2, 0 -_080DF074: .4byte 0x03005d8c -_080DF078: .4byte 0x00002e90 -_080DF07C: .4byte 0x08587fa4 + .pool thumb_func_end sub_80DF040 thumb_func_start sub_80DF080 @@ -456986,7 +441882,7 @@ sub_80DF080: @ 80DF080 push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _080DF1B8 + ldr r2, =0x02039f34 ldr r3, [r2] ldr r5, [r3, 0x10] ldrb r1, [r5, 0x1] @@ -457146,7 +442042,7 @@ _080DF1A6: strb r0, [r1, 0xC] b _080DF1F6 .align 2, 0 -_080DF1B8: .4byte 0x02039f34 + .pool _080DF1BC: movs r0, 0x1 ands r0, r3 @@ -457239,7 +442135,7 @@ sub_80DF250: @ 80DF250 movs r0, 0 str r0, [sp, 0x20] movs r4, 0 - ldr r6, _080DF290 + ldr r6, =0x02039f34 mov r2, sp adds r2, 0xC str r2, [sp, 0x28] @@ -457249,7 +442145,7 @@ sub_80DF250: @ 80DF250 mov r7, sp adds r7, 0x2 str r7, [sp, 0x24] - ldr r5, _080DF294 + ldr r5, =0x02039f20 movs r2, 0 movs r3, 0x80 lsls r3, 17 @@ -457262,8 +442158,7 @@ _080DF280: str r0, [sp, 0x20] b _080DF29E .align 2, 0 -_080DF290: .4byte 0x02039f34 -_080DF294: .4byte 0x02039f20 + .pool _080DF298: cmp r0, 0x3 bne _080DF29E @@ -457291,7 +442186,7 @@ _080DF2C2: ldr r2, [sp, 0x20] cmp r4, r2 beq _080DF2EE - ldr r1, _080DF48C + ldr r1, =0x02039f08 lsls r0, r2, 1 adds r0, r1 movs r3, 0 @@ -457302,7 +442197,7 @@ _080DF2C2: subs r2, r0 cmp r2, 0x32 bgt _080DF2EE - ldr r7, _080DF490 + ldr r7, =0x02039f34 ldr r0, [r7] ldr r2, [r0, 0x1C] add r2, r9 @@ -457311,7 +442206,7 @@ _080DF2C2: orrs r0, r1 strb r0, [r2, 0xD] _080DF2EE: - ldr r1, _080DF490 + ldr r1, =0x02039f34 ldr r0, [r1] ldr r0, [r0, 0x1C] mov r3, r9 @@ -457327,11 +442222,11 @@ _080DF2EE: strb r0, [r2, 0xD] _080DF30A: movs r5, 0 - ldr r2, _080DF494 + ldr r2, =0x02039f00 add r2, r10 movs r6, 0 ldrsh r1, [r2, r6] - ldr r7, _080DF494 + ldr r7, =0x02039f00 movs r3, 0 ldrsh r0, [r7, r3] cmp r1, r0 @@ -457352,12 +442247,12 @@ _080DF322: _080DF336: cmp r5, 0x4 bne _080DF354 - ldr r1, _080DF498 + ldr r1, =0x02039f20 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0 beq _080DF354 - ldr r2, _080DF490 + ldr r2, =0x02039f34 ldr r0, [r2] ldr r2, [r0, 0x1C] add r2, r9 @@ -457370,13 +442265,13 @@ _080DF354: mov r12, r3 mov r8, r3 movs r5, 0 - ldr r0, _080DF494 + ldr r0, =0x02039f00 add r0, r10 movs r7, 0 ldrsh r6, [r0, r7] str r6, [sp, 0x34] - ldr r2, _080DF494 - ldr r0, _080DF49C + ldr r2, =0x02039f00 + ldr r0, =0x02039f18 mov r1, r10 adds r6, r1, r0 adds r3, r0, 0 @@ -457409,7 +442304,7 @@ _080DF38E: mov r2, r8 cmp r2, 0 bne _080DF3B4 - ldr r3, _080DF490 + ldr r3, =0x02039f34 ldr r0, [r3] ldr r2, [r0, 0x1C] add r2, r9 @@ -457418,7 +442313,7 @@ _080DF38E: orrs r0, r1 strb r0, [r2, 0xD] _080DF3B4: - ldr r6, _080DF490 + ldr r6, =0x02039f34 ldr r0, [r6] ldr r0, [r0, 0x1C] mov r7, r9 @@ -457456,13 +442351,13 @@ _080DF3EA: cmp r4, 0x4 ble _080DF3EA mov r1, sp - ldr r0, _080DF4A0 + ldr r0, =0x0000ffff strh r0, [r1, 0xA] movs r0, 0 ldr r2, [sp, 0x28] strb r0, [r2, 0x5] movs r4, 0 - ldr r0, _080DF490 + ldr r0, =0x02039f34 ldr r0, [r0] mov r8, r0 ldr r7, [sp, 0x30] @@ -457477,7 +442372,7 @@ _080DF40E: mov r12, r4 cmp r0, 0 beq _080DF450 - ldr r0, _080DF490 + ldr r0, =0x02039f34 ldr r6, [r0] ldr r3, [sp, 0x28] mov r4, sp @@ -457517,7 +442412,7 @@ _080DF450: movs r4, 0x1 ldr r1, [sp, 0x24] ldrh r0, [r1] - ldr r1, _080DF4A0 + ldr r1, =0x0000ffff cmp r0, r1 beq _080DF4C0 ldr r5, [sp, 0x2C] @@ -457536,12 +442431,7 @@ _080DF478: movs r6, 0x1 b _080DF4B6 .align 2, 0 -_080DF48C: .4byte 0x02039f08 -_080DF490: .4byte 0x02039f34 -_080DF494: .4byte 0x02039f00 -_080DF498: .4byte 0x02039f20 -_080DF49C: .4byte 0x02039f18 -_080DF4A0: .4byte 0x0000ffff + .pool _080DF4A4: cmp r3, r0 bne _080DF4B6 @@ -457560,7 +442450,7 @@ _080DF4B6: bne _080DF478 _080DF4C0: bl GenerateRandomNumber - ldr r1, _080DF4F4 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r4, [r1, 0x1C] ldr r1, [sp, 0x30] @@ -457583,7 +442473,7 @@ _080DF4C0: pop {r0} bx r0 .align 2, 0 -_080DF4F4: .4byte 0x02039f34 + .pool thumb_func_end sub_80DF250 thumb_func_start sub_80DF4F8 @@ -457594,8 +442484,8 @@ sub_80DF4F8: @ 80DF4F8 mov r5, r8 push {r5-r7} sub sp, 0xC - ldr r1, _080DF614 - ldr r0, _080DF618 + ldr r1, =0x02039f20 + ldr r0, =0x02039f25 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -457605,7 +442495,7 @@ sub_80DF4F8: @ 80DF4F8 _080DF514: movs r7, 0 movs r3, 0 - ldr r0, _080DF61C + ldr r0, =0x02039f34 mov r12, r0 _080DF51C: adds r0, r3, r1 @@ -457625,13 +442515,13 @@ _080DF528: lsls r2, r7, 1 lsls r4, r7, 4 mov r8, r4 - ldr r1, _080DF620 + ldr r1, =0x02039f00 adds r0, r2, r1 movs r6, 0 ldrsh r5, [r0, r6] str r5, [sp, 0x8] adds r5, r1, 0 - ldr r0, _080DF624 + ldr r0, =0x02039f18 adds r2, r0 adds r4, r0, 0 _080DF54E: @@ -457691,7 +442581,7 @@ _080DF5A0: bl __modsi3 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080DF61C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x1C] add r0, r8 @@ -457733,23 +442623,19 @@ _080DF5F6: bne _080DF628 mov r0, sp strb r1, [r0] - ldr r1, _080DF61C + ldr r1, =0x02039f34 ldr r0, [r1] ldr r0, [r0, 0x1C] ldrb r4, [r0, 0x1D] movs r3, 0x2 b _080DF638 .align 2, 0 -_080DF614: .4byte 0x02039f20 -_080DF618: .4byte 0x02039f25 -_080DF61C: .4byte 0x02039f34 -_080DF620: .4byte 0x02039f00 -_080DF624: .4byte 0x02039f18 + .pool _080DF628: mov r1, sp movs r0, 0 strb r0, [r1] - ldr r1, _080DF668 + ldr r1, =0x02039f34 ldr r0, [r1] ldr r0, [r0, 0x1C] ldrb r4, [r0, 0xD] @@ -457780,7 +442666,7 @@ _080DF644: movs r5, 0x1 b _080DF67C .align 2, 0 -_080DF668: .4byte 0x02039f34 + .pool _080DF66C: cmp r4, r0 bne _080DF67C @@ -457804,7 +442690,7 @@ _080DF682: ldrb r6, [r0] movs r2, 0x80 movs r3, 0 - ldr r5, _080DF700 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r0, [r0, 0x1C] lsls r1, r6, 4 @@ -457835,7 +442721,7 @@ _080DF6C4: ldr r5, [sp, 0x4] lsrs r0, r5, 24 bl sub_80ECE34 - ldr r0, _080DF700 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x1C] add r0, r8 @@ -457854,7 +442740,7 @@ _080DF6EE: pop {r0} bx r0 .align 2, 0 -_080DF700: .4byte 0x02039f34 + .pool thumb_func_end sub_80DF4F8 thumb_func_start sub_80DF704 @@ -457862,7 +442748,7 @@ sub_80DF704: @ 80DF704 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _080DF724 + ldr r0, =0x02000000 movs r1, 0xD0 lsls r1, 9 adds r2, r0, r1 @@ -457875,7 +442761,7 @@ sub_80DF704: @ 80DF704 movs r0, 0x2 b _080DF72E .align 2, 0 -_080DF724: .4byte 0x02000000 + .pool _080DF728: movs r0, 0x3 b _080DF72E @@ -457908,13 +442794,13 @@ sub_80DF750: @ 80DF750 mov r5, r8 push {r5-r7} sub sp, 0x34 - ldr r0, _080DF860 + ldr r0, =0x020322d5 ldrb r0, [r0] cmp r0, 0 bne _080DF766 b _080DF924 _080DF766: - ldr r0, _080DF864 + ldr r0, =0x02000000 movs r1, 0xD0 lsls r1, 9 adds r0, r1 @@ -457939,7 +442825,7 @@ _080DF784: lsrs r7, r0, 24 cmp r7, 0x3 bls _080DF784 - ldr r0, _080DF864 + ldr r0, =0x02000000 movs r1, 0xD0 lsls r1, 9 adds r0, r1 @@ -457953,10 +442839,10 @@ _080DF784: mov r9, r0 _080DF7AE: add r0, sp, 0x4 - ldr r1, _080DF868 + ldr r1, =0x085ed1b2 bl gf_strcpy adds r5, r0, 0 - ldr r0, _080DF86C + ldr r0, =0x02039f26 adds r0, r7, r0 ldrb r0, [r0] mov r1, r10 @@ -457965,7 +442851,7 @@ _080DF7AE: movs r2, 0x5 movs r3, 0x1 bl sub_80DEBD0 - ldr r0, _080DF870 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x1C] lsls r0, r7, 4 @@ -457994,7 +442880,7 @@ _080DF7DE: cmp r0, r2 bgt _080DF7DE movs r6, 0 - ldr r4, _080DF86C + ldr r4, =0x02039f26 ldr r3, [sp, 0x30] _080DF80A: lsls r0, r6, 24 @@ -458039,11 +442925,7 @@ _080DF80A: bls _080DF7AE b _080DF920 .align 2, 0 -_080DF860: .4byte 0x020322d5 -_080DF864: .4byte 0x02000000 -_080DF868: .4byte 0x085ed1b2 -_080DF86C: .4byte 0x02039f26 -_080DF870: .4byte 0x02039f34 + .pool _080DF874: movs r7, 0 mov r2, sp @@ -458055,9 +442937,9 @@ _080DF874: mov r10, r1 _080DF884: add r0, sp, 0x4 - ldr r1, _080DF934 + ldr r1, =0x085ed1b5 bl gf_strcpy - ldr r0, _080DF938 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x1C] lsls r0, r7, 4 @@ -458087,7 +442969,7 @@ _080DF8A0: cmp r0, r2 bgt _080DF8A0 movs r6, 0 - ldr r4, _080DF93C + ldr r4, =0x02039f26 ldr r3, [sp, 0x30] _080DF8CC: lsls r0, r6, 24 @@ -458142,9 +443024,7 @@ _080DF924: pop {r0} bx r0 .align 2, 0 -_080DF934: .4byte 0x085ed1b5 -_080DF938: .4byte 0x02039f34 -_080DF93C: .4byte 0x02039f26 + .pool thumb_func_end sub_80DF750 thumb_func_start sub_80DF940 @@ -458331,21 +443211,21 @@ CreateShopMainMenu: @ 80DFA78 lsls r4, 24 lsrs r4, 24 bl script_env_2_enable - ldr r5, _080DFABC + ldr r5, =0x02039f60 strb r4, [r5, 0xF] cmp r4, 0 bne _080DFACC - ldr r0, _080DFAC0 + ldr r0, =0x08589a38 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] - ldr r4, _080DFAC4 + ldr r4, =0x08589a10 adds r0, r4, 0 movs r1, 0x3 bl GetMaxWidthInMenuTable lsls r0, 24 - ldr r2, _080DFAC8 + ldr r2, =0x00ffffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -458357,22 +443237,19 @@ CreateShopMainMenu: @ 80DFA78 movs r5, 0x3 b _080DFAF8 .align 2, 0 -_080DFABC: .4byte 0x02039f60 -_080DFAC0: .4byte 0x08589a38 -_080DFAC4: .4byte 0x08589a10 -_080DFAC8: .4byte 0x00ffffff + .pool _080DFACC: - ldr r0, _080DFB38 + ldr r0, =0x08589a38 ldr r1, [r0, 0xC] ldr r0, [r0, 0x8] str r0, [sp, 0x8] str r1, [sp, 0xC] - ldr r4, _080DFB3C + ldr r4, =0x08589a28 adds r0, r4, 0 movs r1, 0x2 bl GetMaxWidthInMenuTable lsls r0, 24 - ldr r2, _080DFB40 + ldr r2, =0x00ffffff ldr r1, [sp, 0x8] ands r1, r2 orrs r1, r0 @@ -458383,7 +443260,7 @@ _080DFACC: str r4, [r5, 0x4] movs r5, 0x2 _080DFAF8: - ldr r4, _080DFB44 + ldr r4, =0x02039f60 ldrb r0, [r4, 0xE] movs r1, 0 bl SetStandardWindowBorderStyle @@ -458400,7 +443277,7 @@ _080DFAF8: ldrb r0, [r4, 0xE] movs r1, 0x1 bl Window_CopyToVram - ldr r0, _080DFB48 + ldr r0, =Task_ShopMenu + 1 movs r1, 0x8 bl AddTask lsls r0, 24 @@ -458410,20 +443287,16 @@ _080DFAF8: pop {r1} bx r1 .align 2, 0 -_080DFB38: .4byte 0x08589a38 -_080DFB3C: .4byte 0x08589a28 -_080DFB40: .4byte 0x00ffffff -_080DFB44: .4byte 0x02039f60 -_080DFB48: .4byte Task_ShopMenu + 1 + .pool thumb_func_end CreateShopMainMenu thumb_func_start SetShopMenuCallback SetShopMenuCallback: @ 80DFB4C - ldr r1, _080DFB54 + ldr r1, =0x02039f60 str r0, [r1] bx lr .align 2, 0 -_080DFB54: .4byte 0x02039f60 + .pool thumb_func_end SetShopMenuCallback thumb_func_start SetShopItemsForSale @@ -458431,7 +443304,7 @@ SetShopItemsForSale: @ 80DFB58 push {lr} adds r1, r0, 0 movs r2, 0 - ldr r3, _080DFB84 + ldr r3, =0x02039f60 str r1, [r3, 0x8] strh r2, [r3, 0xC] ldrh r0, [r1] @@ -458453,7 +443326,7 @@ _080DFB80: pop {r0} bx r0 .align 2, 0 -_080DFB84: .4byte 0x02039f60 + .pool thumb_func_end SetShopItemsForSale thumb_func_start Task_ShopMenu @@ -458478,7 +443351,7 @@ Task_ShopMenu: @ 80DFB88 bl HandleShopQuit b _080DFBC4 _080DFBB4: - ldr r0, _080DFBCC + ldr r0, =0x02039f60 ldr r1, [r0, 0x4] lsls r0, r2, 3 adds r0, r1 @@ -458490,7 +443363,7 @@ _080DFBC4: pop {r0} bx r0 .align 2, 0 -_080DFBCC: .4byte 0x02039f60 + .pool thumb_func_end Task_ShopMenu thumb_func_start HandleShopBuy @@ -458501,15 +443374,15 @@ HandleShopBuy: @ 80DFBD0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _080DFC00 + ldr r2, =0x03005e08 adds r4, r1, r2 - ldr r3, _080DFC04 + ldr r3, =sub_80DFD94 + 1 lsrs r0, r3, 16 strh r0, [r4, 0x10] strh r3, [r4, 0x12] subs r2, 0x8 adds r1, r2 - ldr r0, _080DFC08 + ldr r0, =sub_80DFCA4 + 1 str r0, [r1] movs r0, 0x1 movs r1, 0 @@ -458518,9 +443391,7 @@ HandleShopBuy: @ 80DFBD0 pop {r0} bx r0 .align 2, 0 -_080DFC00: .4byte 0x03005e08 -_080DFC04: .4byte sub_80DFD94 + 1 -_080DFC08: .4byte sub_80DFCA4 + 1 + .pool thumb_func_end HandleShopBuy thumb_func_start HandleShopSell @@ -458531,15 +443402,15 @@ HandleShopSell: @ 80DFC0C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _080DFC3C + ldr r2, =0x03005e08 adds r4, r1, r2 - ldr r3, _080DFC40 + ldr r3, =sub_81AAC00 + 1 lsrs r0, r3, 16 strh r0, [r4, 0x10] strh r3, [r4, 0x12] subs r2, 0x8 adds r1, r2 - ldr r0, _080DFC44 + ldr r0, =sub_80DFCA4 + 1 str r0, [r1] movs r0, 0x1 movs r1, 0 @@ -458548,25 +443419,21 @@ HandleShopSell: @ 80DFC0C pop {r0} bx r0 .align 2, 0 -_080DFC3C: .4byte 0x03005e08 -_080DFC40: .4byte sub_81AAC00 + 1 -_080DFC44: .4byte sub_80DFCA4 + 1 + .pool thumb_func_end HandleShopSell thumb_func_start sub_80DFC48 sub_80DFC48: @ 80DFC48 push {lr} - ldr r0, _080DFC5C - ldr r1, _080DFC60 + ldr r0, =0x03005dac + ldr r1, =sub_80DFCE0 + 1 str r1, [r0] - ldr r0, _080DFC64 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080DFC5C: .4byte 0x03005dac -_080DFC60: .4byte sub_80DFCE0 + 1 -_080DFC64: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_80DFC48 thumb_func_start HandleShopQuit @@ -458575,7 +443442,7 @@ HandleShopQuit: @ 80DFC68 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _080DFCA0 + ldr r5, =0x02039f60 ldrb r0, [r5, 0xE] movs r1, 0x2 bl sub_8198070 @@ -458594,7 +443461,7 @@ _080DFC98: pop {r0} bx r0 .align 2, 0 -_080DFCA0: .4byte 0x02039f60 + .pool thumb_func_end HandleShopQuit thumb_func_start sub_80DFCA4 @@ -458605,9 +443472,9 @@ sub_80DFCA4: @ 80DFCA4 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080DFCD8 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r0, _080DFCDC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -458625,21 +443492,20 @@ _080DFCD2: pop {r0} bx r0 .align 2, 0 -_080DFCD8: .4byte 0x03005e08 -_080DFCDC: .4byte 0x02037fd4 + .pool thumb_func_end sub_80DFCA4 thumb_func_start sub_80DFCE0 sub_80DFCE0: @ 80DFCE0 push {lr} bl pal_fill_black - ldr r0, _080DFCF4 + ldr r0, =sub_80DFCF8 + 1 movs r1, 0x8 bl AddTask pop {r0} bx r0 .align 2, 0 -_080DFCF4: .4byte sub_80DFCF8 + 1 + .pool thumb_func_end sub_80DFCE0 thumb_func_start sub_80DFCF8 @@ -458653,22 +443519,20 @@ sub_80DFCF8: @ 80DFCF8 lsrs r0, 24 cmp r0, 0x1 bne _080DFD36 - ldr r0, _080DFD20 + ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0x2 bne _080DFD2C - ldr r1, _080DFD24 - ldr r2, _080DFD28 + ldr r1, =0x085e95c7 + ldr r2, =sub_80DFD44 + 1 adds r0, r4, 0 bl sub_81978EC b _080DFD36 .align 2, 0 -_080DFD20: .4byte 0x02039f60 -_080DFD24: .4byte 0x085e95c7 -_080DFD28: .4byte sub_80DFD44 + 1 + .pool _080DFD2C: - ldr r1, _080DFD3C - ldr r2, _080DFD40 + ldr r1, =0x085e959b + ldr r2, =sub_80DFD44 + 1 adds r0, r5, 0 bl sub_81978EC _080DFD36: @@ -458676,8 +443540,7 @@ _080DFD36: pop {r0} bx r0 .align 2, 0 -_080DFD3C: .4byte 0x085e959b -_080DFD40: .4byte sub_80DFD44 + 1 + .pool thumb_func_end sub_80DFCF8 thumb_func_start sub_80DFD44 @@ -458686,7 +443549,7 @@ sub_80DFD44: @ 80DFD44 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080DFD60 + ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] bl CreateShopMainMenu adds r0, r4, 0 @@ -458695,7 +443558,7 @@ sub_80DFD44: @ 80DFD44 pop {r0} bx r0 .align 2, 0 -_080DFD60: .4byte 0x02039f60 + .pool thumb_func_end sub_80DFD44 thumb_func_start sub_80DFD64 @@ -458724,7 +443587,7 @@ sub_80DFD80: @ 80DFD80 sub_80DFD94: @ 80DFD94 push {r4,r5,lr} sub sp, 0xC - ldr r0, _080DFE08 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r5, r0, r1 @@ -458737,17 +443600,17 @@ sub_80DFD94: @ 80DFD94 _080DFDAC: bl CreateShopMoneyBox bl sub_80E01C8 - ldr r0, _080DFE0C + ldr r0, =sub_80E0AC8 + 1 movs r1, 0x8 bl AddTask adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080DFE10 + ldr r0, =0x03006310 movs r1, 0 movs r2, 0 bl calls_per_item_funcs_in_list_outer - ldr r2, _080DFE14 + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -458768,24 +443631,19 @@ _080DFDAC: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _080DFE18 + ldr r0, =sub_80DFD80 + 1 bl SetVBlankCallback - ldr r0, _080DFE1C + ldr r0, =sub_80DFD64 + 1 bl set_callback2 b _080DFEF4 .align 2, 0 -_080DFE08: .4byte 0x030022c0 -_080DFE0C: .4byte sub_80E0AC8 + 1 -_080DFE10: .4byte 0x03006310 -_080DFE14: .4byte 0x03005e00 -_080DFE18: .4byte sub_80DFD80 + 1 -_080DFE1C: .4byte sub_80DFD64 + 1 + .pool _080DFE20: bl vblank_hblank_handler_set_zero str r4, [sp, 0x8] movs r1, 0xE0 lsls r1, 19 - ldr r2, _080DFECC + ldr r2, =0x01000100 add r0, sp, 0x8 bl CpuFastSet bl remove_some_task @@ -458795,22 +443653,22 @@ _080DFE20: bl reset_all_obj_data bl clear_tasks bl clear_scheduled_bg_copies_to_vram - ldr r4, _080DFED0 - ldr r0, _080DFED4 + ldr r4, =0x02039f70 + ldr r0, =0x000020b0 bl malloc_and_clear str r0, [r4] - ldr r1, _080DFED8 + ldr r1, =0x0000200b adds r0, r1 movs r1, 0xFF strb r1, [r0] ldr r0, [r4] - ldr r1, _080DFEDC + ldr r1, =0x0000200d adds r0, r1 movs r1, 0x1 negs r1, r1 strb r1, [r0] ldr r0, [r4] - ldr r1, _080DFEE0 + ldr r1, =0x0000200e adds r0, r1 movs r1, 0x1 negs r1, r1 @@ -458850,12 +443708,7 @@ _080DFE20: bl sub_80E0424 b _080DFEEE .align 2, 0 -_080DFECC: .4byte 0x01000100 -_080DFED0: .4byte 0x02039f70 -_080DFED4: .4byte 0x000020b0 -_080DFED8: .4byte 0x0000200b -_080DFEDC: .4byte 0x0000200d -_080DFEE0: .4byte 0x0000200e + .pool _080DFEE4: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -458875,35 +443728,33 @@ _080DFEF4: thumb_func_start FreeShopItemNames FreeShopItemNames: @ 80DFEFC push {lr} - ldr r0, _080DFF20 + ldr r0, =0x02039f70 ldr r0, [r0] bl free - ldr r0, _080DFF24 + ldr r0, =0x02039f74 ldr r0, [r0] bl free - ldr r0, _080DFF28 + ldr r0, =0x02039f78 ldr r0, [r0] bl free bl Window_FreeMemory pop {r0} bx r0 .align 2, 0 -_080DFF20: .4byte 0x02039f70 -_080DFF24: .4byte 0x02039f74 -_080DFF28: .4byte 0x02039f78 + .pool thumb_func_end FreeShopItemNames thumb_func_start GetShopItemNames GetShopItemNames: @ 80DFF2C push {r4-r7,lr} - ldr r7, _080DFFC4 - ldr r4, _080DFFC8 + ldr r7, =0x02039f74 + ldr r4, =0x02039f60 ldrh r0, [r4, 0xC] adds r0, 0x1 lsls r0, 3 bl malloc str r0, [r7] - ldr r5, _080DFFCC + ldr r5, =0x02039f78 ldrh r0, [r4, 0xC] adds r0, 0x1 lsls r0, 4 @@ -458932,13 +443783,13 @@ _080DFF54: cmp r6, r2 bcc _080DFF54 _080DFF78: - ldr r4, _080DFFCC + ldr r4, =0x02039f78 lsls r5, r6, 4 ldr r0, [r4] adds r0, r5 - ldr r1, _080DFFD0 + ldr r1, =0x085e8cf7 bl gf_strcpy - ldr r2, _080DFFC4 + ldr r2, =0x02039f74 ldr r0, [r2] lsls r1, r6, 3 adds r1, r0 @@ -458948,16 +443799,16 @@ _080DFF78: movs r0, 0x2 negs r0, r0 str r0, [r1, 0x4] - ldr r3, _080DFFD4 + ldr r3, =0x03006310 adds r1, r3, 0 - ldr r0, _080DFFD8 + ldr r0, =0x08589a48 ldm r0!, {r4-r6} stm r1!, {r4-r6} ldm r0!, {r4-r6} stm r1!, {r4-r6} ldr r0, [r2] str r0, [r3] - ldr r0, _080DFFC8 + ldr r0, =0x02039f60 ldrh r0, [r0, 0xC] adds r1, r0, 0x1 strh r1, [r3, 0xC] @@ -458969,29 +443820,22 @@ _080DFF78: strh r0, [r3, 0xE] b _080DFFDE .align 2, 0 -_080DFFC4: .4byte 0x02039f74 -_080DFFC8: .4byte 0x02039f60 -_080DFFCC: .4byte 0x02039f78 -_080DFFD0: .4byte 0x085e8cf7 -_080DFFD4: .4byte 0x03006310 -_080DFFD8: .4byte 0x08589a48 + .pool _080DFFDC: strh r1, [r3, 0xE] _080DFFDE: - ldr r0, _080DFFF4 + ldr r0, =0x02039f70 ldr r0, [r0] - ldr r1, _080DFFF8 + ldr r1, =0x03006310 ldrh r1, [r1, 0xE] - ldr r2, _080DFFFC + ldr r2, =0x00002004 adds r0, r2 strh r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080DFFF4: .4byte 0x02039f70 -_080DFFF8: .4byte 0x03006310 -_080DFFFC: .4byte 0x00002004 + .pool thumb_func_end GetShopItemNames thumb_func_start GetShopItemName @@ -459001,7 +443845,7 @@ GetShopItemName: @ 80E0000 adds r5, r2, 0 lsls r1, 16 lsrs r4, r1, 16 - ldr r0, _080E001C + ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 bne _080E0020 @@ -459010,10 +443854,10 @@ GetShopItemName: @ 80E0000 bl itemid_get_name b _080E002C .align 2, 0 -_080E001C: .4byte 0x02039f60 + .pool _080E0020: lsls r1, r4, 5 - ldr r0, _080E0038 + ldr r0, =0x085a5c09 adds r1, r0 adds r0, r5, 0 bl gf_strcpy @@ -459024,7 +443868,7 @@ _080E002C: pop {r0} bx r0 .align 2, 0 -_080E0038: .4byte 0x085a5c09 + .pool thumb_func_end GetShopItemName thumb_func_start PrintShopItemDescription @@ -459047,21 +443891,20 @@ _080E0054: beq _080E0078 lsls r4, r7, 16 lsrs r0, r4, 16 - ldr r1, _080E0070 + ldr r1, =0x02039f70 ldr r1, [r1] - ldr r2, _080E0074 + ldr r2, =0x0000200c adds r1, r2 ldrb r1, [r1] bl AddItemIconObjectInShop b _080E008A .align 2, 0 -_080E0070: .4byte 0x02039f70 -_080E0074: .4byte 0x0000200c + .pool _080E0078: - ldr r0, _080E00C8 - ldr r1, _080E00CC + ldr r0, =0x0000ffff + ldr r1, =0x02039f70 ldr r1, [r1] - ldr r2, _080E00D0 + ldr r2, =0x0000200c adds r1, r2 ldrb r1, [r1] bl AddItemIconObjectInShop @@ -459069,9 +443912,9 @@ _080E0078: _080E008A: lsrs r4, 16 mov r8, r4 - ldr r6, _080E00CC + ldr r6, =0x02039f70 ldr r0, [r6] - ldr r5, _080E00D0 + ldr r5, =0x0000200c adds r0, r5 ldrb r0, [r0] movs r4, 0x1 @@ -459088,7 +443931,7 @@ _080E008A: negs r0, r0 cmp r7, r0 beq _080E00E8 - ldr r0, _080E00D4 + ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 bne _080E00D8 @@ -459097,21 +443940,18 @@ _080E008A: adds r4, r0, 0 b _080E00EA .align 2, 0 -_080E00C8: .4byte 0x0000ffff -_080E00CC: .4byte 0x02039f70 -_080E00D0: .4byte 0x0000200c -_080E00D4: .4byte 0x02039f60 + .pool _080E00D8: - ldr r0, _080E00E4 + ldr r0, =0x085a5c08 lsls r1, r7, 5 adds r0, 0x18 adds r1, r0 ldr r4, [r1] b _080E00EA .align 2, 0 -_080E00E4: .4byte 0x085a5c08 + .pool _080E00E8: - ldr r4, _080E0110 + ldr r4, =0x085e93e0 _080E00EA: movs r0, 0x2 movs r1, 0 @@ -459131,7 +443971,7 @@ _080E00EA: pop {r0} bx r0 .align 2, 0 -_080E0110: .4byte 0x085e93e0 + .pool thumb_func_end PrintShopItemDescription thumb_func_start PrintShopBuyPrice @@ -459146,11 +443986,11 @@ PrintShopBuyPrice: @ 80E0114 negs r0, r0 cmp r1, r0 beq _080E01AC - ldr r0, _080E015C + ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 bne _080E0164 - ldr r5, _080E0160 + ldr r5, =0x02021cc4 lsls r0, r1, 16 lsrs r0, 16 bl itemid_get_market_price @@ -459169,11 +444009,10 @@ PrintShopBuyPrice: @ 80E0114 bl decimal_int_to_string b _080E0176 .align 2, 0 -_080E015C: .4byte 0x02039f60 -_080E0160: .4byte 0x02021cc4 + .pool _080E0164: - ldr r0, _080E01B4 - ldr r2, _080E01B8 + ldr r0, =0x02021cc4 + ldr r2, =0x085a5c08 lsls r1, 5 adds r1, r2 ldrh r1, [r1, 0x14] @@ -459181,8 +444020,8 @@ _080E0164: movs r3, 0x5 bl decimal_int_to_string _080E0176: - ldr r4, _080E01BC - ldr r1, _080E01C0 + ldr r4, =0x02021fc4 + ldr r1, =0x085e969c adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x7 @@ -459195,7 +444034,7 @@ _080E0176: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] - ldr r0, _080E01C4 + ldr r0, =0x08589ab3 str r0, [sp, 0x8] movs r0, 0x1 negs r0, r0 @@ -459211,35 +444050,31 @@ _080E01AC: pop {r0} bx r0 .align 2, 0 -_080E01B4: .4byte 0x02021cc4 -_080E01B8: .4byte 0x085a5c08 -_080E01BC: .4byte 0x02021fc4 -_080E01C0: .4byte 0x085e969c -_080E01C4: .4byte 0x08589ab3 + .pool thumb_func_end PrintShopBuyPrice thumb_func_start sub_80E01C8 sub_80E01C8: @ 80E01C8 push {r4,r5,lr} sub sp, 0x10 - ldr r5, _080E0210 + ldr r5, =0x02039f70 ldr r2, [r5] - ldr r4, _080E0214 + ldr r4, =0x0000200b adds r0, r2, r4 ldrb r0, [r0] cmp r0, 0xFF bne _080E0206 - ldr r0, _080E0218 + ldr r0, =0x02039f60 ldrh r1, [r0, 0xC] adds r0, r1, 0x1 cmp r0, 0x8 ble _080E0206 subs r0, r1, 0x7 str r0, [sp] - ldr r0, _080E021C + ldr r0, =0x00000834 str r0, [sp, 0x4] str r0, [sp, 0x8] - ldr r1, _080E0220 + ldr r1, =0x00002008 adds r0, r2, r1 str r0, [sp, 0xC] movs r0, 0x2 @@ -459256,26 +444091,22 @@ _080E0206: pop {r0} bx r0 .align 2, 0 -_080E0210: .4byte 0x02039f70 -_080E0214: .4byte 0x0000200b -_080E0218: .4byte 0x02039f60 -_080E021C: .4byte 0x00000834 -_080E0220: .4byte 0x00002008 + .pool thumb_func_end sub_80E01C8 thumb_func_start sub_80E0224 sub_80E0224: @ 80E0224 push {r4,lr} - ldr r4, _080E0248 + ldr r4, =0x02039f70 ldr r0, [r4] - ldr r2, _080E024C + ldr r2, =0x0000200b adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF beq _080E0242 bl sub_81AF620 ldr r0, [r4] - ldr r1, _080E024C + ldr r1, =0x0000200b adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -459284,8 +444115,7 @@ _080E0242: pop {r0} bx r0 .align 2, 0 -_080E0248: .4byte 0x02039f70 -_080E024C: .4byte 0x0000200b + .pool thumb_func_end sub_80E0224 thumb_func_start sub_80E0250 @@ -459301,7 +444131,7 @@ sub_80E0250: @ 80E0250 adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r1, _080E0280 + ldr r1, =0x085e8d60 movs r0, 0 str r0, [sp] str r4, [sp, 0x4] @@ -459313,7 +444143,7 @@ sub_80E0250: @ 80E0250 pop {r0} bx r0 .align 2, 0 -_080E0280: .4byte 0x085e8d60 + .pool thumb_func_end sub_80E0250 thumb_func_start AddItemIconObjectInShop @@ -459324,23 +444154,23 @@ AddItemIconObjectInShop: @ 80E0284 lsrs r2, r0, 16 lsls r1, 24 lsrs r3, r1, 24 - ldr r0, _080E02D8 - ldr r4, _080E02DC + ldr r0, =0x02039f70 + ldr r4, =0x0000200d adds r1, r3, r4 ldr r0, [r0] adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF bne _080E0310 - ldr r0, _080E02E0 + ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 beq _080E02AE - ldr r0, _080E02E4 + ldr r0, =0x0000ffff cmp r2, r0 bne _080E02F0 _080E02AE: - ldr r0, _080E02E8 + ldr r0, =0x0000083e adds r1, r3, r0 adds r0, r1, 0 bl AddItemIconObject @@ -459349,7 +444179,7 @@ _080E02AE: cmp r2, 0x40 beq _080E0310 strb r2, [r4] - ldr r1, _080E02EC + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -459360,16 +444190,11 @@ _080E02AE: strh r1, [r0, 0x26] b _080E0310 .align 2, 0 -_080E02D8: .4byte 0x02039f70 -_080E02DC: .4byte 0x0000200d -_080E02E0: .4byte 0x02039f60 -_080E02E4: .4byte 0x0000ffff -_080E02E8: .4byte 0x0000083e -_080E02EC: .4byte 0x02020630 + .pool _080E02F0: lsls r0, r2, 24 lsrs r0, 24 - ldr r2, _080E0318 + ldr r2, =0x0000083e adds r1, r3, r2 str r1, [sp] str r1, [sp, 0x4] @@ -459388,7 +444213,7 @@ _080E0310: pop {r0} bx r0 .align 2, 0 -_080E0318: .4byte 0x0000083e + .pool thumb_func_end AddItemIconObjectInShop thumb_func_start sub_80E031C @@ -459396,15 +444221,15 @@ sub_80E031C: @ 80E031C push {r4,r5,lr} lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _080E035C - ldr r2, _080E0360 + ldr r0, =0x02039f70 + ldr r2, =0x0000200d adds r1, r4, r2 ldr r0, [r0] adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF beq _080E0356 - ldr r0, _080E0364 + ldr r0, =0x0000083e adds r4, r0 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag @@ -459414,7 +444239,7 @@ sub_80E031C: @ 80E031C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080E0368 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles movs r0, 0xFF @@ -459424,10 +444249,7 @@ _080E0356: pop {r0} bx r0 .align 2, 0 -_080E035C: .4byte 0x02039f70 -_080E0360: .4byte 0x0000200d -_080E0364: .4byte 0x0000083e -_080E0368: .4byte 0x02020630 + .pool thumb_func_end sub_80E031C thumb_func_start sub_80E036C @@ -459435,11 +444257,11 @@ sub_80E036C: @ 80E036C push {r4,lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080E041C + ldr r1, =0x08589a60 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r4, _080E0420 + ldr r4, =0x02039f70 ldr r1, [r4] movs r0, 0x80 lsls r0, 4 @@ -459501,27 +444323,26 @@ sub_80E036C: @ 80E036C pop {r0} bx r0 .align 2, 0 -_080E041C: .4byte 0x08589a60 -_080E0420: .4byte 0x02039f70 + .pool thumb_func_end sub_80E036C thumb_func_start sub_80E0424 sub_80E0424: @ 80E0424 push {lr} sub sp, 0x4 - ldr r1, _080E0454 + ldr r1, =0x08d9afbc movs r2, 0xE8 lsls r2, 2 - ldr r3, _080E0458 + ldr r3, =0x000003e3 movs r0, 0 str r0, [sp] movs r0, 0x1 bl decompress_and_copy_tile_data_to_vram - ldr r0, _080E045C - ldr r1, _080E0460 + ldr r0, =0x08d9b0f0 + ldr r1, =0x02039f70 ldr r1, [r1] bl call_LZZUnCompWram - ldr r0, _080E0464 + ldr r0, =0x08d9b0c8 movs r1, 0xC0 movs r2, 0x20 bl decompress_palette @@ -459529,17 +444350,13 @@ sub_80E0424: @ 80E0424 pop {r0} bx r0 .align 2, 0 -_080E0454: .4byte 0x08d9afbc -_080E0458: .4byte 0x000003e3 -_080E045C: .4byte 0x08d9b0f0 -_080E0460: .4byte 0x02039f70 -_080E0464: .4byte 0x08d9b0c8 + .pool thumb_func_end sub_80E0424 thumb_func_start sub_80E0468 sub_80E0468: @ 80E0468 push {lr} - ldr r0, _080E04A0 + ldr r0, =0x08589a70 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 @@ -459559,7 +444376,7 @@ sub_80E0468: @ 80E0468 pop {r0} bx r0 .align 2, 0 -_080E04A0: .4byte 0x08589a70 + .pool thumb_func_end sub_80E0468 thumb_func_start sub_80E04A4 @@ -459581,7 +444398,7 @@ sub_80E04A4: @ 80E04A4 str r4, [sp, 0x4] lsls r4, r5, 1 adds r4, r5 - ldr r5, _080E04E4 + ldr r5, =0x08589ab0 adds r4, r5 str r4, [sp, 0x8] lsls r6, 24 @@ -459595,7 +444412,7 @@ sub_80E04A4: @ 80E04A4 pop {r0} bx r0 .align 2, 0 -_080E04E4: .4byte 0x08589ab0 + .pool thumb_func_end sub_80E04A4 thumb_func_start sub_80E04E8 @@ -459636,7 +444453,7 @@ CreateShopMoneyBox: @ 80E0524 movs r0, 0x13 movs r1, 0xB bl AddMoneyTextObject - ldr r0, _080E056C + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 @@ -459658,7 +444475,7 @@ CreateShopMoneyBox: @ 80E0524 pop {r0} bx r0 .align 2, 0 -_080E056C: .4byte 0x03005d8c + .pool thumb_func_end CreateShopMoneyBox thumb_func_start sub_80E0570 @@ -459679,7 +444496,7 @@ sub_80E0584: @ 80E0584 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r0, _080E0604 + ldr r0, =0x02037318 ldr r0, [r0] mov r9, r0 mov r4, sp @@ -459736,11 +444553,11 @@ _080E05BE: lsrs r5, r0, 24 b _080E060A .align 2, 0 -_080E0604: .4byte 0x02037318 + .pool _080E0608: movs r5, 0x1 _080E060A: - ldr r0, _080E0628 + ldr r0, =0x000001ff cmp r6, r0 bhi _080E062C asrs r0, r4, 16 @@ -459754,12 +444571,12 @@ _080E060A: bl sub_80E0670 b _080E0644 .align 2, 0 -_080E0628: .4byte 0x000001ff + .pool _080E062C: asrs r0, r4, 16 mov r3, r9 ldr r2, [r3, 0x14] - ldr r3, _080E066C + ldr r3, =0xfffffe00 adds r1, r6, r3 lsls r1, 4 ldr r2, [r2, 0xC] @@ -459789,7 +444606,7 @@ _080E0644: pop {r0} bx r0 .align 2, 0 -_080E066C: .4byte 0xfffffe00 + .pool thumb_func_end sub_80E0584 thumb_func_start sub_80E0670 @@ -459815,7 +444632,7 @@ _080E0690: beq _080E06F8 b _080E0728 _080E0696: - ldr r6, _080E06BC + ldr r6, =0x02039f70 ldr r0, [r6] movs r2, 0xC0 lsls r2, 5 @@ -459833,9 +444650,9 @@ _080E0696: lsls r1, 4 b _080E06E2 .align 2, 0 -_080E06BC: .4byte 0x02039f70 + .pool _080E06C0: - ldr r6, _080E06F4 + ldr r6, =0x02039f70 ldr r0, [r6] movs r2, 0x80 lsls r2, 5 @@ -459860,9 +444677,9 @@ _080E06E2: bl sub_80E0734 b _080E0728 .align 2, 0 -_080E06F4: .4byte 0x02039f70 + .pool _080E06F8: - ldr r6, _080E0730 + ldr r6, =0x02039f70 ldr r0, [r6] movs r2, 0x80 lsls r2, 5 @@ -459889,7 +444706,7 @@ _080E0728: pop {r0} bx r0 .align 2, 0 -_080E0730: .4byte 0x02039f70 + .pool thumb_func_end sub_80E0670 thumb_func_start sub_80E0734 @@ -459931,8 +444748,8 @@ sub_80E075C: @ 80E075C adds r1, r4, 0 bl player_get_pos_to_plus_one_step_in_direction_player_is_facing movs r7, 0 - ldr r5, _080E0850 - ldr r3, _080E0854 + ldr r5, =0x02039f70 + ldr r3, =0x00002010 movs r2, 0x10 _080E0780: ldr r1, [r5] @@ -459949,7 +444766,7 @@ _080E0780: bls _080E0780 movs r7, 0 str r4, [sp, 0x8] - ldr r1, _080E0850 + ldr r1, =0x02039f70 mov r9, r1 mov r2, sp str r2, [sp, 0x4] @@ -459958,14 +444775,14 @@ _080E07A4: adds r4, r7, 0x1 str r4, [sp, 0xC] _080E07AA: - ldr r1, _080E0858 + ldr r1, =0x0000fffc adds r0, r3, r1 ldr r2, [sp, 0x4] ldrh r2, [r2] adds r0, r2 lsls r0, 16 asrs r0, 16 - ldr r4, _080E085C + ldr r4, =0x0000fffe adds r1, r7, r4 ldr r2, [sp, 0x8] ldrh r2, [r2] @@ -459985,17 +444802,17 @@ _080E07AA: lsls r4, r0, 2 adds r0, r4, r0 lsls r5, r0, 1 - ldr r2, _080E0854 + ldr r2, =0x00002010 adds r0, r1, r2 adds r0, r5 movs r2, 0 mov r10, r2 strh r6, [r0] - ldr r2, _080E0860 + ldr r2, =0x00002012 adds r0, r1, r2 adds r0, r5 strh r3, [r0] - ldr r0, _080E0864 + ldr r0, =0x00002014 adds r1, r0 adds r1, r5 strh r7, [r1] @@ -460014,7 +444831,7 @@ _080E07AA: bl cur_mapdata_block_get_bgs_at mov r1, r9 ldr r2, [r1] - ldr r1, _080E0868 + ldr r1, =0x00002018 adds r1, r2 mov r12, r1 add r12, r5 @@ -460022,7 +444839,7 @@ _080E07AA: lsrs r0, 24 mov r1, r12 strh r0, [r1] - ldr r1, _080E086C + ldr r1, =0x02037350 lsls r0, r6, 3 adds r0, r6 lsls r0, 2 @@ -460039,49 +444856,42 @@ _080E07AA: beq _080E0876 b _080E08A4 .align 2, 0 -_080E0850: .4byte 0x02039f70 -_080E0854: .4byte 0x00002010 -_080E0858: .4byte 0x0000fffc -_080E085C: .4byte 0x0000fffe -_080E0860: .4byte 0x00002012 -_080E0864: .4byte 0x00002014 -_080E0868: .4byte 0x00002018 -_080E086C: .4byte 0x02037350 + .pool _080E0870: cmp r0, 0x3 beq _080E0894 b _080E08A4 _080E0876: - ldr r4, _080E0880 + ldr r4, =0x00002016 adds r0, r2, r4 adds r0, r5 mov r1, r10 b _080E08B6 .align 2, 0 -_080E0880: .4byte 0x00002016 + .pool _080E0884: - ldr r4, _080E0890 + ldr r4, =0x00002016 adds r0, r2, r4 adds r0, r5 movs r1, 0x1 b _080E08B6 .align 2, 0 -_080E0890: .4byte 0x00002016 + .pool _080E0894: - ldr r1, _080E08A0 + ldr r1, =0x00002016 adds r0, r2, r1 adds r0, r5 movs r1, 0x2 b _080E08B6 .align 2, 0 -_080E08A0: .4byte 0x00002016 + .pool _080E08A4: mov r2, r9 ldr r0, [r2] mov r2, r8 adds r1, r4, r2 lsls r1, 1 - ldr r4, _080E08EC + ldr r4, =0x00002016 adds r0, r4 adds r0, r1 movs r1, 0x3 @@ -460116,7 +444926,7 @@ _080E08DA: pop {r0} bx r0 .align 2, 0 -_080E08EC: .4byte 0x00002016 + .pool thumb_func_end sub_80E075C thumb_func_start sub_80E08F0 @@ -460128,11 +444938,11 @@ sub_80E08F0: @ 80E08F0 push {r5-r7} sub sp, 0x4 movs r7, 0 - ldr r0, _080E09F4 + ldr r0, =0x02039f70 mov r8, r0 - ldr r1, _080E09F8 + ldr r1, =0x02037350 mov r10, r1 - ldr r2, _080E09FC + ldr r2, =0x02020630 mov r9, r2 _080E090A: mov r3, r8 @@ -460140,7 +444950,7 @@ _080E090A: lsls r1, r7, 2 adds r1, r7 lsls r5, r1, 1 - ldr r4, _080E0A00 + ldr r4, =0x00002010 adds r0, r4 adds r1, r0, r5 movs r2, 0 @@ -460156,7 +444966,7 @@ _080E090A: bl npc_get_type mov r4, r8 ldr r3, [r4] - ldr r2, _080E0A00 + ldr r2, =0x00002010 adds r1, r3, r2 adds r1, r5 movs r4, 0 @@ -460166,7 +444976,7 @@ _080E090A: lsls r1, 2 add r1, r10 ldrb r4, [r1, 0x5] - ldr r2, _080E0A04 + ldr r2, =0x00002012 adds r1, r3, r2 adds r1, r5 ldrh r2, [r1] @@ -460174,7 +444984,7 @@ _080E090A: adds r2, 0x8 lsls r2, 16 asrs r2, 16 - ldr r1, _080E0A08 + ldr r1, =0x00002014 adds r3, r1 adds r3, r5 ldrh r3, [r3] @@ -460191,12 +445001,12 @@ _080E090A: movs r0, 0x2 str r0, [sp] adds r0, r4, 0 - ldr r1, _080E0A0C + ldr r1, =nullsub_12 + 1 bl sub_808DD68 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r2, _080E0A00 + ldr r2, =0x00002010 adds r1, r5, r2 mov r3, r8 ldr r0, [r3] @@ -460230,7 +445040,7 @@ _080E09C0: add r0, r9 mov r2, r8 ldr r1, [r2] - ldr r3, _080E0A10 + ldr r3, =0x00002016 adds r1, r3 adds r1, r5 ldrb r1, [r1] @@ -460250,14 +445060,7 @@ _080E09D8: pop {r0} bx r0 .align 2, 0 -_080E09F4: .4byte 0x02039f70 -_080E09F8: .4byte 0x02037350 -_080E09FC: .4byte 0x02020630 -_080E0A00: .4byte 0x00002010 -_080E0A04: .4byte 0x00002012 -_080E0A08: .4byte 0x00002014 -_080E0A0C: .4byte nullsub_12 + 1 -_080E0A10: .4byte 0x00002016 + .pool thumb_func_end sub_80E08F0 thumb_func_start sub_80E0A14 @@ -460290,16 +445093,16 @@ _080E0A3A: thumb_func_start sub_80E0A40 sub_80E0A40: @ 80E0A40 push {r4-r6,lr} - ldr r0, _080E0A7C + ldr r0, =0x02039f70 ldr r0, [r0] movs r1, 0x80 lsls r1, 4 adds r4, r0, r1 adds r3, r0, 0 movs r1, 0 - ldr r0, _080E0A80 + ldr r0, =0x0000c3e3 adds r6, r0, 0 - ldr r5, _080E0A84 + ldr r5, =0x000003ff _080E0A56: lsls r0, r1, 16 asrs r2, r0, 16 @@ -460322,15 +445125,13 @@ _080E0A6A: pop {r0} bx r0 .align 2, 0 -_080E0A7C: .4byte 0x02039f70 -_080E0A80: .4byte 0x0000c3e3 -_080E0A84: .4byte 0x000003ff + .pool thumb_func_end sub_80E0A40 thumb_func_start sub_80E0A88 sub_80E0A88: @ 80E0A88 push {lr} - ldr r2, _080E0ABC + ldr r2, =0x02039f70 ldr r2, [r2] lsls r0, 1 lsls r1, 6 @@ -460356,7 +445157,7 @@ sub_80E0A88: @ 80E0A88 movs r0, 0x1 b _080E0AC2 .align 2, 0 -_080E0ABC: .4byte 0x02039f70 + .pool _080E0AC0: movs r0, 0 _080E0AC2: @@ -460374,9 +445175,9 @@ sub_80E0AC8: @ 80E0AC8 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080E0B14 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r0, _080E0B18 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -460388,9 +445189,9 @@ _080E0AEA: bl sub_81AE604 adds r5, r0, 0 ldrb r0, [r4, 0xE] - ldr r7, _080E0B1C + ldr r7, =0x02039f70 ldr r2, [r7] - ldr r3, _080E0B20 + ldr r3, =0x00002008 adds r1, r2, r3 subs r3, 0x2 adds r2, r3 @@ -460404,10 +445205,7 @@ _080E0AEA: bne _080E0B32 b _080E0C8E .align 2, 0 -_080E0B14: .4byte 0x03005e08 -_080E0B18: .4byte 0x02037fd4 -_080E0B1C: .4byte 0x02039f70 -_080E0B20: .4byte 0x00002008 + .pool _080E0B24: movs r0, 0x5 bl audio_play @@ -460424,7 +445222,7 @@ _080E0B32: ldrb r0, [r4, 0xE] movs r1, 0x2 bl sub_80E0250 - ldr r0, _080E0B7C + ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 bne _080E0B80 @@ -460446,24 +445244,24 @@ _080E0B32: str r4, [r1] b _080E0B92 .align 2, 0 -_080E0B7C: .4byte 0x02039f60 + .pool _080E0B80: ldr r1, [r7] movs r3, 0x80 lsls r3, 6 adds r1, r3 - ldr r2, _080E0BBC + ldr r2, =0x085a5c08 lsls r0, r5, 5 adds r0, r2 ldrh r0, [r0, 0x14] str r0, [r1] _080E0B92: - ldr r0, _080E0BC0 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 adds r0, r1 - ldr r2, _080E0BC4 + ldr r2, =0x02039f70 mov r8, r2 ldr r1, [r2] movs r7, 0x80 @@ -460474,23 +445272,19 @@ _080E0B92: lsls r0, 24 cmp r0, 0 bne _080E0BD0 - ldr r1, _080E0BC8 - ldr r2, _080E0BCC + ldr r1, =0x085e9539 + ldr r2, =sub_80E10A0 + 1 b _080E0C28 .align 2, 0 -_080E0BBC: .4byte 0x085a5c08 -_080E0BC0: .4byte 0x03005d8c -_080E0BC4: .4byte 0x02039f70 -_080E0BC8: .4byte 0x085e9539 -_080E0BCC: .4byte sub_80E10A0 + 1 + .pool _080E0BD0: - ldr r4, _080E0C10 + ldr r4, =0x02039f60 ldrb r0, [r4, 0xF] cmp r0, 0 bne _080E0C38 lsls r0, r5, 16 lsrs r5, r0, 16 - ldr r1, _080E0C14 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl itemid_get_name adds r0, r5, 0 @@ -460499,43 +445293,38 @@ _080E0BD0: lsrs r0, 24 cmp r0, 0x3 bne _080E0C24 - ldr r4, _080E0C18 + ldr r4, =0x02021dc4 adds r0, r5, 0 bl sub_81B6CFC lsls r0, 16 lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _080E0C1C + ldr r0, =0x0831977c adds r1, r0 adds r0, r4, 0 bl gf_strcpy - ldr r1, _080E0C20 + ldr r1, =0x085e9417 b _080E0C26 .align 2, 0 -_080E0C10: .4byte 0x02039f60 -_080E0C14: .4byte 0x02021cc4 -_080E0C18: .4byte 0x02021dc4 -_080E0C1C: .4byte 0x0831977c -_080E0C20: .4byte 0x085e9417 + .pool _080E0C24: - ldr r1, _080E0C30 + ldr r1, =0x085e93ef _080E0C26: - ldr r2, _080E0C34 + ldr r2, =sub_80E0CA4 + 1 _080E0C28: adds r0, r6, 0 bl sub_80E04E8 b _080E0C8E .align 2, 0 -_080E0C30: .4byte 0x085e93ef -_080E0C34: .4byte sub_80E0CA4 + 1 + .pool _080E0C38: - ldr r0, _080E0C68 + ldr r0, =0x02021cc4 lsls r1, r5, 5 - ldr r2, _080E0C6C + ldr r2, =0x085a5c09 adds r1, r2 bl gf_strcpy - ldr r0, _080E0C70 + ldr r0, =0x02021dc4 mov r3, r8 ldr r1, [r3] adds r1, r7 @@ -460546,23 +445335,19 @@ _080E0C38: ldrb r0, [r4, 0xF] cmp r0, 0x1 bne _080E0C7C - ldr r0, _080E0C74 - ldr r1, _080E0C78 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9468 bl ExpandTextCodes b _080E0C84 .align 2, 0 -_080E0C68: .4byte 0x02021cc4 -_080E0C6C: .4byte 0x085a5c09 -_080E0C70: .4byte 0x02021dc4 -_080E0C74: .4byte 0x02021fc4 -_080E0C78: .4byte 0x085e9468 + .pool _080E0C7C: - ldr r0, _080E0C98 - ldr r1, _080E0C9C + ldr r0, =0x02021fc4 + ldr r1, =0x085e9493 bl ExpandTextCodes _080E0C84: - ldr r1, _080E0C98 - ldr r2, _080E0CA0 + ldr r1, =0x02021fc4 + ldr r2, =sub_80E0EAC + 1 adds r0, r6, 0 bl sub_80E04E8 _080E0C8E: @@ -460572,9 +445357,7 @@ _080E0C8E: pop {r0} bx r0 .align 2, 0 -_080E0C98: .4byte 0x02021fc4 -_080E0C9C: .4byte 0x085e9493 -_080E0CA0: .4byte sub_80E0EAC + 1 + .pool thumb_func_end sub_80E0AC8 thumb_func_start sub_80E0CA4 @@ -460586,7 +445369,7 @@ sub_80E0CA4: @ 80E0CA4 lsls r5, r6, 2 adds r5, r6 lsls r5, 3 - ldr r0, _080E0D44 + ldr r0, =0x03005e08 adds r5, r0 ldrh r0, [r5, 0xA] bl sub_80D70BC @@ -460598,13 +445381,13 @@ sub_80E0CA4: @ 80E0CA4 movs r2, 0x1 movs r3, 0xD bl SetWindowBorderStyle - ldr r0, _080E0D48 + ldr r0, =0x02021cc4 adds r1, r4, 0 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _080E0D4C - ldr r1, _080E0D50 + ldr r4, =0x02021fc4 + ldr r1, =0x085e93d5 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -460626,13 +445409,13 @@ sub_80E0CA4: @ 80E0CA4 bl sub_80E10EC movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _080E0D54 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 adds r0, r1 bl decrypt_money - ldr r1, _080E0D58 + ldr r1, =0x02039f70 ldr r4, [r1] movs r2, 0x80 lsls r2, 6 @@ -460643,39 +445426,31 @@ sub_80E0CA4: @ 80E0CA4 lsrs r1, r0, 16 cmp r1, 0x63 bls _080E0D60 - ldr r0, _080E0D5C + ldr r0, =0x0000200a adds r1, r4, r0 movs r0, 0x63 strb r0, [r1] b _080E0D66 .align 2, 0 -_080E0D44: .4byte 0x03005e08 -_080E0D48: .4byte 0x02021cc4 -_080E0D4C: .4byte 0x02021fc4 -_080E0D50: .4byte 0x085e93d5 -_080E0D54: .4byte 0x03005d8c -_080E0D58: .4byte 0x02039f70 -_080E0D5C: .4byte 0x0000200a + .pool _080E0D60: - ldr r2, _080E0D7C + ldr r2, =0x0000200a adds r0, r4, r2 strb r1, [r0] _080E0D66: - ldr r0, _080E0D80 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _080E0D84 + ldr r0, =sub_80E0D88 + 1 str r0, [r1] add sp, 0x8 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080E0D7C: .4byte 0x0000200a -_080E0D80: .4byte 0x03005e00 -_080E0D84: .4byte sub_80E0D88 + 1 + .pool thumb_func_end sub_80E0CA4 thumb_func_start sub_80E0D88 @@ -460687,12 +445462,12 @@ sub_80E0D88: @ 80E0D88 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080E0DE4 + ldr r1, =0x03005e08 adds r5, r0, r1 adds r0, r5, 0x2 - ldr r7, _080E0DE8 + ldr r7, =0x02039f70 ldr r1, [r7] - ldr r2, _080E0DEC + ldr r2, =0x0000200a adds r1, r2 ldrb r1, [r1] bl sub_8122034 @@ -460722,11 +445497,9 @@ sub_80E0D88: @ 80E0D88 bl sub_80E10EC b _080E0EA4 .align 2, 0 -_080E0DE4: .4byte 0x03005e08 -_080E0DE8: .4byte 0x02039f70 -_080E0DEC: .4byte 0x0000200a + .pool _080E0DF0: - ldr r0, _080E0E5C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -460747,15 +445520,15 @@ _080E0DF0: movs r0, 0x1 bl Window_WriteStandardTileMap ldrh r0, [r5, 0xA] - ldr r1, _080E0E60 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _080E0E64 + ldr r0, =0x02021dc4 movs r2, 0x2 ldrsh r1, [r5, r2] movs r2, 0 movs r3, 0x2 bl decimal_int_to_string - ldr r0, _080E0E68 + ldr r0, =0x02021ec4 ldr r1, [r7] movs r2, 0x80 lsls r2, 6 @@ -460764,18 +445537,13 @@ _080E0DF0: movs r2, 0 movs r3, 0x6 bl decimal_int_to_string - ldr r1, _080E0E6C - ldr r2, _080E0E70 + ldr r1, =0x085e943f + ldr r2, =sub_80E0EAC + 1 adds r0, r6, 0 bl sub_80E04E8 b _080E0EA4 .align 2, 0 -_080E0E5C: .4byte 0x030022c0 -_080E0E60: .4byte 0x02021cc4 -_080E0E64: .4byte 0x02021dc4 -_080E0E68: .4byte 0x02021ec4 -_080E0E6C: .4byte 0x085e943f -_080E0E70: .4byte sub_80E0EAC + 1 + .pool _080E0E74: movs r0, 0x2 ands r0, r1 @@ -460807,14 +445575,14 @@ sub_80E0EAC: @ 80E0EAC sub sp, 0x10 lsls r0, 24 lsrs r0, 24 - ldr r1, _080E0ED4 + ldr r1, =0x08589aa8 movs r2, 0 str r2, [sp] movs r2, 0x1 str r2, [sp, 0x4] movs r2, 0xD str r2, [sp, 0x8] - ldr r2, _080E0ED8 + ldr r2, =0x08589a08 str r2, [sp, 0xC] movs r2, 0x1 movs r3, 0 @@ -460823,8 +445591,7 @@ sub_80E0EAC: @ 80E0EAC pop {r0} bx r0 .align 2, 0 -_080E0ED4: .4byte 0x08589aa8 -_080E0ED8: .4byte 0x08589a08 + .pool thumb_func_end sub_80E0EAC thumb_func_start sub_80E0EDC @@ -460836,11 +445603,11 @@ sub_80E0EDC: @ 80E0EDC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080E0F20 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r0, 0x1 bl Window_WriteStandardTileMap - ldr r6, _080E0F24 + ldr r6, =0x02039f60 ldrb r0, [r6, 0xF] cmp r0, 0 bne _080E0F40 @@ -460851,25 +445618,21 @@ sub_80E0EDC: @ 80E0EDC lsrs r0, 24 cmp r0, 0x1 bne _080E0F30 - ldr r1, _080E0F28 - ldr r2, _080E0F2C + ldr r1, =0x085e94c5 + ldr r2, =sub_80E0F88 + 1 adds r0, r5, 0 bl sub_80E04E8 adds r0, r5, 0 bl sub_80E1204 b _080E0F7A .align 2, 0 -_080E0F20: .4byte 0x03005e08 -_080E0F24: .4byte 0x02039f60 -_080E0F28: .4byte 0x085e94c5 -_080E0F2C: .4byte sub_80E0F88 + 1 + .pool _080E0F30: - ldr r1, _080E0F38 - ldr r2, _080E0F3C + ldr r1, =0x085e9558 + ldr r2, =sub_80E10A0 + 1 b _080E0F60 .align 2, 0 -_080E0F38: .4byte 0x085e9558 -_080E0F3C: .4byte sub_80E10A0 + 1 + .pool _080E0F40: ldrb r0, [r4, 0xA] bl sub_8161960 @@ -460879,24 +445642,23 @@ _080E0F40: ldrb r0, [r6, 0xF] cmp r0, 0x1 bne _080E0F5C - ldr r1, _080E0F58 + ldr r1, =0x085e94e7 b _080E0F5E .align 2, 0 -_080E0F58: .4byte 0x085e94e7 + .pool _080E0F5C: - ldr r1, _080E0F68 + ldr r1, =0x085e9510 _080E0F5E: - ldr r2, _080E0F6C + ldr r2, =sub_80E0F88 + 1 _080E0F60: adds r0, r5, 0 bl sub_80E04E8 b _080E0F7A .align 2, 0 -_080E0F68: .4byte 0x085e9510 -_080E0F6C: .4byte sub_80E0F88 + 1 + .pool _080E0F70: - ldr r1, _080E0F80 - ldr r2, _080E0F84 + ldr r1, =0x085e957f + ldr r2, =sub_80E10A0 + 1 adds r0, r7, 0 bl sub_80E04E8 _080E0F7A: @@ -460904,8 +445666,7 @@ _080E0F7A: pop {r0} bx r0 .align 2, 0 -_080E0F80: .4byte 0x085e957f -_080E0F84: .4byte sub_80E10A0 + 1 + .pool thumb_func_end sub_80E0EDC thumb_func_start sub_80E0F88 @@ -460915,12 +445676,12 @@ sub_80E0F88: @ 80E0F88 lsrs r6, r0, 24 movs r0, 0x26 bl sav12_xor_increment - ldr r5, _080E0FDC + ldr r5, =0x03005d8c ldr r0, [r5] movs r4, 0x92 lsls r4, 3 adds r0, r4 - ldr r1, _080E0FE0 + ldr r1, =0x02039f70 ldr r1, [r1] movs r2, 0x80 lsls r2, 6 @@ -460936,38 +445697,33 @@ sub_80E0F88: @ 80E0F88 movs r0, 0 movs r2, 0 bl PrintMoneyAmountInMoneyBox - ldr r0, _080E0FE4 + ldr r0, =0x02039f60 ldrb r0, [r0, 0xF] cmp r0, 0 bne _080E0FF0 - ldr r0, _080E0FE8 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _080E0FEC + ldr r0, =sub_80E100C + 1 b _080E0FFC .align 2, 0 -_080E0FDC: .4byte 0x03005d8c -_080E0FE0: .4byte 0x02039f70 -_080E0FE4: .4byte 0x02039f60 -_080E0FE8: .4byte 0x03005e00 -_080E0FEC: .4byte sub_80E100C + 1 + .pool _080E0FF0: - ldr r0, _080E1004 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _080E1008 + ldr r0, =sub_80E1078 + 1 _080E0FFC: str r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080E1004: .4byte 0x03005e00 -_080E1008: .4byte sub_80E1078 + 1 + .pool thumb_func_end sub_80E0F88 thumb_func_start sub_80E100C @@ -460978,9 +445734,9 @@ sub_80E100C: @ 80E100C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080E105C + ldr r1, =0x03005e08 adds r5, r0, r1 - ldr r0, _080E1060 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -461003,16 +445759,13 @@ sub_80E100C: @ 80E100C lsrs r0, 24 cmp r0, 0x1 bne _080E106C - ldr r1, _080E1064 - ldr r2, _080E1068 + ldr r1, =0x085e95ea + ldr r2, =sub_80E10A0 + 1 adds r0, r4, 0 bl sub_80E04E8 b _080E1072 .align 2, 0 -_080E105C: .4byte 0x03005e08 -_080E1060: .4byte 0x030022c0 -_080E1064: .4byte 0x085e95ea -_080E1068: .4byte sub_80E10A0 + 1 + .pool _080E106C: adds r0, r4, 0 bl sub_80E10A0 @@ -461027,7 +445780,7 @@ sub_80E1078: @ 80E1078 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080E109C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -461042,7 +445795,7 @@ _080E1096: pop {r0} bx r0 .align 2, 0 -_080E109C: .4byte 0x030022c0 + .pool thumb_func_end sub_80E1078 thumb_func_start sub_80E10A0 @@ -461053,7 +445806,7 @@ sub_80E10A0: @ 80E10A0 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _080E10E4 + ldr r5, =0x03005e08 adds r6, r4, r5 movs r0, 0x5 movs r1, 0 @@ -461070,14 +445823,13 @@ sub_80E10A0: @ 80E10A0 bl sub_80E01C8 subs r5, 0x8 adds r4, r5 - ldr r0, _080E10E8 + ldr r0, =sub_80E0AC8 + 1 str r0, [r4] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080E10E4: .4byte 0x03005e08 -_080E10E8: .4byte sub_80E0AC8 + 1 + .pool thumb_func_end sub_80E10A0 thumb_func_start sub_80E10EC @@ -461089,12 +445841,12 @@ sub_80E10EC: @ 80E10EC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080E1154 + ldr r0, =0x03005e08 adds r4, r0 movs r0, 0x4 movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _080E1158 + ldr r0, =0x02039f70 ldr r0, [r0] movs r1, 0x80 lsls r1, 6 @@ -461106,14 +445858,14 @@ sub_80E10EC: @ 80E10EC movs r1, 0x26 movs r2, 0x1 bl PrintMoneyAmount - ldr r0, _080E115C + ldr r0, =0x02021cc4 movs r2, 0x2 ldrsh r1, [r4, r2] movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r4, _080E1160 - ldr r1, _080E1164 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8da0 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -461129,11 +445881,7 @@ sub_80E10EC: @ 80E10EC pop {r0} bx r0 .align 2, 0 -_080E1154: .4byte 0x03005e08 -_080E1158: .4byte 0x02039f70 -_080E115C: .4byte 0x02021cc4 -_080E1160: .4byte 0x02021fc4 -_080E1164: .4byte 0x085e8da0 + .pool thumb_func_end sub_80E10EC thumb_func_start sub_80E1168 @@ -461143,8 +445891,8 @@ sub_80E1168: @ 80E1168 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _080E11A0 - ldr r0, _080E11A4 + ldr r1, =0x03005dac + ldr r0, =sub_80DFCE0 + 1 str r0, [r1] movs r0, 0x1 negs r0, r0 @@ -461153,22 +445901,19 @@ sub_80E1168: @ 80E1168 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _080E11A8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080E11AC + ldr r1, =sub_80E11B0 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_080E11A0: .4byte 0x03005dac -_080E11A4: .4byte sub_80DFCE0 + 1 -_080E11A8: .4byte 0x03005e00 -_080E11AC: .4byte sub_80E11B0 + 1 + .pool thumb_func_end sub_80E1168 thumb_func_start sub_80E11B0 @@ -461176,7 +445921,7 @@ sub_80E11B0: @ 80E11B0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080E11DC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -461184,7 +445929,7 @@ sub_80E11B0: @ 80E11B0 bne _080E11D6 bl sub_80E53F4 bl FreeShopItemNames - ldr r0, _080E11E0 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -461193,25 +445938,23 @@ _080E11D6: pop {r0} bx r0 .align 2, 0 -_080E11DC: .4byte 0x02037fd4 -_080E11E0: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_80E11B0 thumb_func_start sub_80E11E4 sub_80E11E4: @ 80E11E4 push {lr} - ldr r0, _080E11FC + ldr r0, =0x02039f7c movs r1, 0 strb r1, [r0] - ldr r0, _080E1200 + ldr r0, =0x02039f80 movs r1, 0 movs r2, 0xC bl memset pop {r0} bx r0 .align 2, 0 -_080E11FC: .4byte 0x02039f7c -_080E1200: .4byte 0x02039f80 + .pool thumb_func_end sub_80E11E4 thumb_func_start sub_80E1204 @@ -461222,10 +445965,10 @@ sub_80E1204: @ 80E1204 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080E1240 + ldr r0, =0x03005e08 adds r4, r1, r0 movs r3, 0 - ldr r5, _080E1244 + ldr r5, =0x02039f80 adds r6, r5, 0 _080E121A: lsls r0, r3, 2 @@ -461248,8 +445991,7 @@ _080E121A: strh r0, [r2, 0x2] b _080E127A .align 2, 0 -_080E1240: .4byte 0x03005e08 -_080E1244: .4byte 0x02039f80 + .pool _080E1248: ldrh r0, [r4, 0x2] adds r0, r1, r0 @@ -461261,7 +446003,7 @@ _080E1250: lsrs r3, r0, 16 cmp r3, 0x2 bls _080E121A - ldr r2, _080E1280 + ldr r2, =0x02039f7c ldrb r0, [r2] cmp r0, 0x2 bhi _080E127A @@ -461282,7 +446024,7 @@ _080E127A: pop {r0} bx r0 .align 2, 0 -_080E1280: .4byte 0x02039f7c + .pool thumb_func_end sub_80E1204 thumb_func_start sub_80E1284 @@ -461294,13 +446036,13 @@ sub_80E1284: @ 80E1284 adds r0, r4, 0 bl SetShopItemsForSale bl sub_80E11E4 - ldr r0, _080E12A4 + ldr r0, =script_env_2_enable_and_set_ctx_running + 1 bl SetShopMenuCallback pop {r4} pop {r0} bx r0 .align 2, 0 -_080E12A4: .4byte script_env_2_enable_and_set_ctx_running + 1 + .pool thumb_func_end sub_80E1284 thumb_func_start sub_80E12A8 @@ -461311,13 +446053,13 @@ sub_80E12A8: @ 80E12A8 bl CreateShopMainMenu adds r0, r4, 0 bl SetShopItemsForSale - ldr r0, _080E12C4 + ldr r0, =script_env_2_enable_and_set_ctx_running + 1 bl SetShopMenuCallback pop {r4} pop {r0} bx r0 .align 2, 0 -_080E12C4: .4byte script_env_2_enable_and_set_ctx_running + 1 + .pool thumb_func_end sub_80E12A8 thumb_func_start sub_80E12C8 @@ -461328,13 +446070,13 @@ sub_80E12C8: @ 80E12C8 bl CreateShopMainMenu adds r0, r4, 0 bl SetShopItemsForSale - ldr r0, _080E12E4 + ldr r0, =script_env_2_enable_and_set_ctx_running + 1 bl SetShopMenuCallback pop {r4} pop {r0} bx r0 .align 2, 0 -_080E12E4: .4byte script_env_2_enable_and_set_ctx_running + 1 + .pool thumb_func_end sub_80E12C8 thumb_func_start sub_80E12E8 @@ -461351,7 +446093,7 @@ sub_80E12E8: @ 80E12E8 lsls r2, 16 lsrs r2, 16 mov r10, r2 - ldr r2, _080E137C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -461414,7 +446156,7 @@ _080E1348: bl setmaptile_0 b _080E1390 .align 2, 0 -_080E137C: .4byte 0x03005e00 + .pool _080E1380: mov r1, r9 ldrh r0, [r1] @@ -461527,7 +446269,7 @@ sub_80E1444: @ 80E1444 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _080E146C + ldr r1, =0x03005e08 adds r4, r0, r1 movs r0, 0x1 strh r0, [r4, 0x6] @@ -461536,13 +446278,12 @@ sub_80E1444: @ 80E1444 cmp r0, 0x6 bhi _080E14DE lsls r0, 2 - ldr r1, _080E1470 + ldr r1, =_080E1474 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E146C: .4byte 0x03005e08 -_080E1470: .4byte _080E1474 + .pool .align 2, 0 _080E1474: .4byte _080E1490 @@ -461553,27 +446294,27 @@ _080E1474: .4byte _080E14C4 .4byte _080E14D4 _080E1490: - ldr r1, _080E1494 + ldr r1, =0x08589aba b _080E14C6 .align 2, 0 -_080E1494: .4byte 0x08589aba + .pool _080E1498: - ldr r1, _080E149C + ldr r1, =0x08589ac0 b _080E14C6 .align 2, 0 -_080E149C: .4byte 0x08589ac0 + .pool _080E14A0: - ldr r1, _080E14A4 + ldr r1, =0x08589ac6 b _080E14B2 .align 2, 0 -_080E14A4: .4byte 0x08589ac6 + .pool _080E14A8: - ldr r1, _080E14AC + ldr r1, =0x08589acc b _080E14C6 .align 2, 0 -_080E14AC: .4byte 0x08589acc + .pool _080E14B0: - ldr r1, _080E14C0 + ldr r1, =0x08589ad2 _080E14B2: movs r2, 0xC0 lsls r2, 4 @@ -461581,18 +446322,18 @@ _080E14B2: bl sub_80E12E8 b _080E14DE .align 2, 0 -_080E14C0: .4byte 0x08589ad2 + .pool _080E14C4: - ldr r1, _080E14D0 + ldr r1, =0x08589ad8 _080E14C6: adds r0, r3, 0 movs r2, 0 bl sub_80E12E8 b _080E14DE .align 2, 0 -_080E14D0: .4byte 0x08589ad8 + .pool _080E14D4: - ldr r1, _080E1508 + ldr r1, =0x08589ade adds r0, r3, 0 movs r2, 0 bl sub_80E12E8 @@ -461618,7 +446359,7 @@ _080E1502: pop {r0} bx r0 .align 2, 0 -_080E1508: .4byte 0x08589ade + .pool thumb_func_end sub_80E1444 thumb_func_start sub_80E150C @@ -461627,7 +446368,7 @@ sub_80E150C: @ 80E150C adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 - ldr r6, _080E1550 + ldr r6, =sub_80E1444 + 1 adds r0, r6, 0 movs r1, 0 bl AddTask @@ -461637,7 +446378,7 @@ sub_80E150C: @ 80E150C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080E1554 + ldr r1, =0x03005e08 adds r7, r0, r1 adds r0, r7, 0 adds r0, 0x8 @@ -461655,8 +446396,7 @@ sub_80E150C: @ 80E150C pop {r1} bx r1 .align 2, 0 -_080E1550: .4byte sub_80E1444 + 1 -_080E1554: .4byte 0x03005e08 + .pool thumb_func_end sub_80E150C thumb_func_start sub_80E1558 @@ -461665,31 +446405,31 @@ sub_80E1558: @ 80E1558 lsls r0, 24 lsrs r0, 24 bl sub_80E150C - ldr r1, _080E156C + ldr r1, =0x02039f8c strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_080E156C: .4byte 0x02039f8c + .pool thumb_func_end sub_80E1558 thumb_func_start sub_80E1570 sub_80E1570: @ 80E1570 push {lr} - ldr r0, _080E1580 + ldr r0, =0x02039f8c ldrb r0, [r0] bl remove_task pop {r0} bx r0 .align 2, 0 -_080E1580: .4byte 0x02039f8c + .pool thumb_func_end sub_80E1570 thumb_func_start sub_80E1584 sub_80E1584: @ 80E1584 push {lr} - ldr r2, _080E15A8 - ldr r0, _080E15AC + ldr r2, =0x03005e00 + ldr r0, =0x02039f8c ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -461706,8 +446446,7 @@ sub_80E1584: @ 80E1584 movs r0, 0 b _080E15B2 .align 2, 0 -_080E15A8: .4byte 0x03005e00 -_080E15AC: .4byte 0x02039f8c + .pool _080E15B0: movs r0, 0x1 _080E15B2: @@ -461722,29 +446461,27 @@ sub_80E15B8: @ 80E15B8 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r0, _080E15D8 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _080E15DC + ldr r0, =0x000031f8 adds r1, r0 - ldr r2, _080E15E0 + ldr r2, =0x0100001a mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_080E15D8: .4byte 0x03005d8c -_080E15DC: .4byte 0x000031f8 -_080E15E0: .4byte 0x0100001a + .pool thumb_func_end sub_80E15B8 thumb_func_start sub_80E15E4 sub_80E15E4: @ 80E15E4 push {r4,lr} adds r4, r0, 0 - ldr r0, _080E1608 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080E160C + ldr r1, =0x000031f8 adds r3, r0, r1 movs r2, 0 _080E15F2: @@ -461759,8 +446496,7 @@ _080E15F2: pop {r0} bx r0 .align 2, 0 -_080E1608: .4byte 0x03005d8c -_080E160C: .4byte 0x000031f8 + .pool thumb_func_end sub_80E15E4 thumb_func_start sub_80E1610 @@ -461784,23 +446520,23 @@ _080E1618: thumb_func_start sub_80E162C sub_80E162C: @ 80E162C push {r4,lr} - ldr r4, _080E1660 + ldr r4, =0x03005d8c ldr r1, [r4] - ldr r2, _080E1664 + ldr r2, =0x0000320c adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080E1674 - ldr r2, _080E1668 + ldr r2, =0x00003202 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080E1674 - ldr r2, _080E166C + ldr r2, =0x000031f8 adds r0, r1, r2 bl sub_80E1610 ldr r1, [r4] - ldr r2, _080E1670 + ldr r2, =0x00003228 adds r1, r2 ldr r1, [r1] cmp r0, r1 @@ -461808,11 +446544,7 @@ sub_80E162C: @ 80E162C movs r0, 0x1 b _080E1676 .align 2, 0 -_080E1660: .4byte 0x03005d8c -_080E1664: .4byte 0x0000320c -_080E1668: .4byte 0x00003202 -_080E166C: .4byte 0x000031f8 -_080E1670: .4byte 0x00003228 + .pool _080E1674: movs r0, 0 _080E1676: @@ -461831,13 +446563,12 @@ sub_80E167C: @ 80E167C bl sub_80E162C cmp r0, 0 beq _080E16A0 - ldr r0, _080E1698 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080E169C + ldr r1, =0x000031f8 b _080E16B4 .align 2, 0 -_080E1698: .4byte 0x03005d8c -_080E169C: .4byte 0x000031f8 + .pool _080E16A0: subs r0, r4, 0x1 lsls r0, 24 @@ -461849,36 +446580,35 @@ _080E16AC: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, _080E16BC + ldr r1, =0x0858a654 _080E16B4: adds r0, r1 pop {r4} pop {r1} bx r1 .align 2, 0 -_080E16BC: .4byte 0x0858a654 + .pool thumb_func_end sub_80E167C thumb_func_start sub_80E16C0 sub_80E16C0: @ 80E16C0 lsls r0, 24 - ldr r1, _080E16D4 + ldr r1, =0x03005d8c lsrs r0, 21 - ldr r2, _080E16D8 + ldr r2, =0x0000169c adds r0, r2 ldr r1, [r1] adds r1, r0 adds r0, r1, 0 bx lr .align 2, 0 -_080E16D4: .4byte 0x03005d8c -_080E16D8: .4byte 0x0000169c + .pool thumb_func_end sub_80E16C0 thumb_func_start sub_80E16DC sub_80E16DC: @ 80E16DC push {lr} - ldr r0, _080E1704 + ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_808F110 lsls r0, 24 @@ -461896,7 +446626,7 @@ sub_80E16DC: @ 80E16DC beq _080E1712 b _080E172E .align 2, 0 -_080E1704: .4byte 0x03005df0 + .pool _080E1708: cmp r0, 0x3 beq _080E171E @@ -461936,10 +446666,10 @@ _080E1734: sub_80E1738: @ 80E1738 push {lr} bl sub_809D280 - ldr r1, _080E1760 + ldr r1, =0x082742f9 cmp r0, r1 bne _080E1768 - ldr r0, _080E1764 + ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_808F110 lsls r0, 24 @@ -461951,8 +446681,7 @@ sub_80E1738: @ 80E1738 movs r0, 0x1 b _080E176A .align 2, 0 -_080E1760: .4byte 0x082742f9 -_080E1764: .4byte 0x03005df0 + .pool _080E1768: movs r0, 0 _080E176A: @@ -461964,7 +446693,7 @@ _080E176A: sub_80E1770: @ 80E1770 push {lr} bl sub_809D280 - ldr r1, _080E1788 + ldr r1, =0x082742f9 cmp r0, r1 bne _080E178C bl sub_80E16DC @@ -461972,7 +446701,7 @@ sub_80E1770: @ 80E1770 lsrs r0, 24 b _080E178E .align 2, 0 -_080E1788: .4byte 0x082742f9 + .pool _080E178C: movs r0, 0 _080E178E: @@ -461984,9 +446713,9 @@ _080E178E: sub_80E1794: @ 80E1794 push {r4-r6,lr} movs r2, 0 - ldr r6, _080E17BC - ldr r5, _080E17C0 - ldr r0, _080E17C4 + ldr r6, =0x03005d8c + ldr r5, =0x0000169c + ldr r0, =0x0858abd0 ldr r3, [r0] ldr r4, [r0, 0x4] _080E17A2: @@ -462003,9 +446732,7 @@ _080E17A2: pop {r0} bx r0 .align 2, 0 -_080E17BC: .4byte 0x03005d8c -_080E17C0: .4byte 0x0000169c -_080E17C4: .4byte 0x0858abd0 + .pool thumb_func_end sub_80E1794 thumb_func_start sub_80E17C8 @@ -462026,12 +446753,12 @@ _080E17DA: cmp r0, 0x5 bhi _080E1864 lsls r0, 2 - ldr r1, _080E17EC + ldr r1, =_080E17F0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E17EC: .4byte _080E17F0 + .pool .align 2, 0 _080E17F0: .4byte _080E17D6 @@ -462083,7 +446810,7 @@ _080E1828: strb r1, [r4, 0x5] cmp r1, 0xA bne _080E1864 - ldr r0, _080E186C + ldr r0, =0x0858abd0 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r4] @@ -462095,7 +446822,7 @@ _080E1866: pop {r1} bx r1 .align 2, 0 -_080E186C: .4byte 0x0858abd0 + .pool thumb_func_end sub_80E17C8 thumb_func_start sub_80E1870 @@ -462104,9 +446831,9 @@ sub_80E1870: @ 80E1870 adds r6, r0, 0 movs r2, 0 _080E1876: - ldr r1, _080E18C0 + ldr r1, =0x03005d8c lsls r0, r2, 3 - ldr r3, _080E18C4 + ldr r3, =0x0000169c adds r0, r3 ldr r1, [r1] adds r4, r1, r0 @@ -462133,16 +446860,14 @@ _080E1876: subs r1, r0 cmp r6, r1 blt _080E18CC - ldr r0, _080E18C8 + ldr r0, =0x0858abd0 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r4] str r1, [r4, 0x4] b _080E1910 .align 2, 0 -_080E18C0: .4byte 0x03005d8c -_080E18C4: .4byte 0x0000169c -_080E18C8: .4byte 0x0858abd0 + .pool _080E18CC: adds r5, r6, 0 cmp r5, 0 @@ -462203,7 +446928,7 @@ sub_80E191C: @ 80E191C lsrs r7, r3, 24 bl sub_80E16C0 adds r6, r0, 0 - ldr r0, _080E1980 + ldr r0, =0x0858abd0 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r6] @@ -462240,62 +446965,58 @@ _080E197A: pop {r0} bx r0 .align 2, 0 -_080E1980: .4byte 0x0858abd0 + .pool thumb_func_end sub_80E191C thumb_func_start sub_80E1984 sub_80E1984: @ 80E1984 lsls r0, 24 - ldr r1, _080E19A0 + ldr r1, =0x03005d8c ldr r2, [r1] lsrs r0, 21 adds r2, r0 - ldr r0, _080E19A4 + ldr r0, =0x0000169c adds r2, r0 - ldr r0, _080E19A8 + ldr r0, =0x0858abd0 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r2] str r1, [r2, 0x4] bx lr .align 2, 0 -_080E19A0: .4byte 0x03005d8c -_080E19A4: .4byte 0x0000169c -_080E19A8: .4byte 0x0858abd0 + .pool thumb_func_end sub_80E1984 thumb_func_start sub_80E19AC sub_80E19AC: @ 80E19AC lsls r0, 24 - ldr r1, _080E19C0 + ldr r1, =0x03005d8c ldr r1, [r1] lsrs r0, 21 adds r1, r0 - ldr r0, _080E19C4 + ldr r0, =0x0000169c adds r1, r0 ldrb r0, [r1] bx lr .align 2, 0 -_080E19C0: .4byte 0x03005d8c -_080E19C4: .4byte 0x0000169c + .pool thumb_func_end sub_80E19AC thumb_func_start sub_80E19C8 sub_80E19C8: @ 80E19C8 lsls r0, 24 - ldr r1, _080E19E0 + ldr r1, =0x03005d8c ldr r1, [r1] lsrs r0, 21 adds r1, r0 - ldr r0, _080E19E4 + ldr r0, =0x0000169d adds r1, r0 ldrb r0, [r1] lsls r0, 25 lsrs r0, 25 bx lr .align 2, 0 -_080E19E0: .4byte 0x03005d8c -_080E19E4: .4byte 0x0000169d + .pool thumb_func_end sub_80E19C8 thumb_func_start berryid_from_itemid @@ -462303,7 +447024,7 @@ berryid_from_itemid: @ 80E19E8 push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r2, _080E1A04 + ldr r2, =0xff7b0000 adds r0, r2 lsrs r0, 16 cmp r0, 0x2A @@ -462314,7 +447035,7 @@ berryid_from_itemid: @ 80E19E8 lsrs r0, 24 b _080E1A0A .align 2, 0 -_080E1A04: .4byte 0xff7b0000 + .pool _080E1A08: movs r0, 0x1 _080E1A0A: @@ -462327,7 +447048,7 @@ sub_80E1A10: @ 80E1A10 push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r2, _080E1A2C + ldr r2, =0xffff0000 adds r0, r2 lsrs r0, 16 cmp r0, 0x2A @@ -462338,7 +447059,7 @@ sub_80E1A10: @ 80E1A10 lsrs r0, 16 b _080E1A32 .align 2, 0 -_080E1A2C: .4byte 0xffff0000 + .pool _080E1A30: movs r0, 0x85 _080E1A32: @@ -462518,7 +447239,7 @@ sub_80E1B38: @ 80E1B38 thumb_func_start sub_80E1B64 sub_80E1B64: @ 80E1B64 lsls r0, 24 - ldr r1, _080E1B78 + ldr r1, =0x03005d8c ldr r1, [r1] lsrs r0, 21 adds r1, r0 @@ -462528,7 +447249,7 @@ sub_80E1B64: @ 80E1B64 ldrb r0, [r1] bx lr .align 2, 0 -_080E1B78: .4byte 0x03005d8c + .pool thumb_func_end sub_80E1B64 thumb_func_start sub_80E1B7C @@ -462549,7 +447270,7 @@ sub_80E1B7C: @ 80E1B7C thumb_func_start sub_80E1B94 sub_80E1B94: @ 80E1B94 push {r4-r6,lr} - ldr r0, _080E1BD0 + ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_808F110 lsls r0, 24 @@ -462560,9 +447281,9 @@ sub_80E1B94: @ 80E1B94 lsrs r6, r0, 24 adds r0, r5, 0 bl sub_80E1A78 - ldr r0, _080E1BD4 + ldr r0, =0x020375f2 ldrb r0, [r0] - ldr r1, _080E1BD8 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -462570,36 +447291,33 @@ sub_80E1B94: @ 80E1B94 lsls r0, 24 cmp r0, 0 beq _080E1BE0 - ldr r1, _080E1BDC + ldr r1, =0x020375e0 movs r0, 0xFF strh r0, [r1] b _080E1BEE .align 2, 0 -_080E1BD0: .4byte 0x03005df0 -_080E1BD4: .4byte 0x020375f2 -_080E1BD8: .4byte 0x03005d8c -_080E1BDC: .4byte 0x020375e0 + .pool _080E1BE0: - ldr r4, _080E1C1C + ldr r4, =0x020375e0 adds r0, r5, 0 bl sub_80E19C8 lsls r0, 24 lsrs r0, 24 strh r0, [r4] _080E1BEE: - ldr r4, _080E1C20 + ldr r4, =0x020375e2 adds r0, r5, 0 bl sub_80E1ACC lsls r0, 24 lsrs r0, 24 strh r0, [r4] - ldr r4, _080E1C24 + ldr r4, =0x020375e4 adds r0, r5, 0 bl sub_80E1B64 lsls r0, 24 lsrs r0, 24 strh r0, [r4] - ldr r1, _080E1C28 + ldr r1, =0x02021cc4 ldrh r2, [r4] adds r0, r6, 0 bl sub_80E1A58 @@ -462607,16 +447325,13 @@ _080E1BEE: pop {r0} bx r0 .align 2, 0 -_080E1C1C: .4byte 0x020375e0 -_080E1C20: .4byte 0x020375e2 -_080E1C24: .4byte 0x020375e4 -_080E1C28: .4byte 0x02021cc4 + .pool thumb_func_end sub_80E1B94 thumb_func_start sub_80E1C2C sub_80E1C2C: @ 80E1C2C push {lr} - ldr r0, _080E1C4C + ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_808F110 lsls r0, 24 @@ -462624,19 +447339,18 @@ sub_80E1C2C: @ 80E1C2C bl sub_80E19AC lsls r0, 24 lsrs r0, 24 - ldr r1, _080E1C50 + ldr r1, =0x02021cc4 bl sub_80E1A38 pop {r0} bx r0 .align 2, 0 -_080E1C4C: .4byte 0x03005df0 -_080E1C50: .4byte 0x02021cc4 + .pool thumb_func_end sub_80E1C2C thumb_func_start sub_80E1C54 sub_80E1C54: @ 80E1C54 push {r4,r5,lr} - ldr r0, _080E1C8C + ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_808F110 adds r4, r0, 0 @@ -462652,38 +447366,37 @@ sub_80E1C54: @ 80E1C54 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r1, _080E1C90 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_80E1A58 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080E1C8C: .4byte 0x03005df0 -_080E1C90: .4byte 0x02021cc4 + .pool thumb_func_end sub_80E1C54 thumb_func_start sub_80E1C94 sub_80E1C94: @ 80E1C94 push {lr} - ldr r0, _080E1CA0 + ldr r0, =c2_810A554 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080E1CA0: .4byte c2_810A554 + 1 + .pool thumb_func_end sub_80E1C94 thumb_func_start sub_80E1CA4 sub_80E1CA4: @ 80E1CA4 push {r4,lr} - ldr r0, _080E1CD4 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl berryid_from_itemid adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080E1CD8 + ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_808F110 lsls r0, 24 @@ -462697,14 +447410,13 @@ sub_80E1CA4: @ 80E1CA4 pop {r0} bx r0 .align 2, 0 -_080E1CD4: .4byte 0x0203ce7c -_080E1CD8: .4byte 0x03005df0 + .pool thumb_func_end sub_80E1CA4 thumb_func_start sub_80E1CDC sub_80E1CDC: @ 80E1CDC push {r4-r6,lr} - ldr r0, _080E1D20 + ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_808F110 adds r5, r0, 0 @@ -462714,7 +447426,7 @@ sub_80E1CDC: @ 80E1CDC bl sub_80E19AC lsls r0, 24 lsrs r0, 24 - ldr r6, _080E1D24 + ldr r6, =0x020375e0 bl sub_80E1A10 adds r4, r0, 0 lsls r4, 16 @@ -462733,22 +447445,21 @@ sub_80E1CDC: @ 80E1CDC pop {r0} bx r0 .align 2, 0 -_080E1D20: .4byte 0x03005df0 -_080E1D24: .4byte 0x020375e0 + .pool thumb_func_end sub_80E1CDC thumb_func_start sub_80E1D28 sub_80E1D28: @ 80E1D28 push {lr} - ldr r0, _080E1D50 + ldr r0, =0x03005df0 ldrb r0, [r0] bl sub_808F110 lsls r0, 24 lsrs r0, 24 bl sub_80E1984 - ldr r0, _080E1D54 + ldr r0, =0x020375f2 ldrb r0, [r0] - ldr r1, _080E1D58 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -462756,9 +447467,7 @@ sub_80E1D28: @ 80E1D28 pop {r0} bx r0 .align 2, 0 -_080E1D50: .4byte 0x03005df0 -_080E1D54: .4byte 0x020375f2 -_080E1D58: .4byte 0x03005d8c + .pool thumb_func_end sub_80E1D28 thumb_func_start sub_80E1D5C @@ -462801,7 +447510,7 @@ sub_80E1D6C: @ 80E1D6C lsls r2, 16 asrs r2, 16 mov r9, r2 - ldr r4, _080E1E04 + ldr r4, =0x02037350 lsls r3, 16 asrs r3, 16 mov r8, r3 @@ -462851,7 +447560,7 @@ _080E1DEC: pop {r0} bx r0 .align 2, 0 -_080E1E04: .4byte 0x02037350 + .pool thumb_func_end sub_80E1D6C thumb_func_start sub_80E1E08 @@ -462866,13 +447575,13 @@ sub_80E1E08: @ 80E1E08 lsrs r5, r2, 24 lsls r3, 24 lsrs r4, r3, 24 - ldr r0, _080E1E44 + ldr r0, =sub_80E2058 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080E1E4C - ldr r0, _080E1E48 + ldr r0, =0x020375f0 movs r1, 0xFF strh r1, [r0] movs r0, 0 @@ -462885,8 +447594,7 @@ sub_80E1E08: @ 80E1E08 movs r0, 0x1 b _080E1E4E .align 2, 0 -_080E1E44: .4byte sub_80E2058 + 1 -_080E1E48: .4byte 0x020375f0 + .pool _080E1E4C: movs r0, 0 _080E1E4E: @@ -462914,13 +447622,13 @@ sub_80E1E58: @ 80E1E58 lsrs r5, r3, 24 lsls r4, 24 lsrs r4, 24 - ldr r0, _080E1EA0 + ldr r0, =sub_80E2058 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080E1EA8 - ldr r1, _080E1EA4 + ldr r1, =0x020375f0 movs r0, 0xFF strh r0, [r1] str r4, [sp] @@ -462932,8 +447640,7 @@ sub_80E1E58: @ 80E1E58 movs r0, 0x1 b _080E1EAA .align 2, 0 -_080E1EA0: .4byte sub_80E2058 + 1 -_080E1EA4: .4byte 0x020375f0 + .pool _080E1EA8: movs r0, 0 _080E1EAA: @@ -462958,7 +447665,7 @@ _080E1EC0: ldrb r0, [r4] cmp r0, 0x1 bne _080E1EEC - ldr r0, _080E1EE0 + ldr r0, =0x03005d90 ldr r0, [r0] bl sub_8008C24 adds r0, r5, r0 @@ -462967,7 +447674,7 @@ _080E1EC0: adds r4, 0x1 b _080E1EEC .align 2, 0 -_080E1EE0: .4byte 0x03005d90 + .pool _080E1EE4: adds r4, 0x1 adds r0, r5, 0x1 @@ -463007,7 +447714,7 @@ sub_80E1EFC: @ 80E1EFC lsls r4, 24 lsrs r4, 24 str r4, [sp, 0x4] - ldr r1, _080E1FB8 + ldr r1, =0x0858b760 lsls r0, r2, 3 adds r0, r1 ldrb r6, [r0, 0x4] @@ -463073,7 +447780,7 @@ _080E1F4C: pop {r0} bx r0 .align 2, 0 -_080E1FB8: .4byte 0x0858b760 + .pool thumb_func_end sub_80E1EFC thumb_func_start sub_80E1FBC @@ -463092,12 +447799,12 @@ sub_80E1FBC: @ 80E1FBC mov r9, r2 lsls r3, 24 lsrs r4, r3, 24 - ldr r1, _080E201C + ldr r1, =0x02039f90 movs r0, 0x2 strb r0, [r1] movs r2, 0 - ldr r6, _080E2020 - ldr r5, _080E2024 + ldr r6, =sub_80E2058 + 1 + ldr r5, =0x0858bb68 movs r3, 0xC _080E1FE6: adds r0, r2, r5 @@ -463116,7 +447823,7 @@ _080E1FF0: bl AddTask lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080E2028 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -463128,15 +447835,12 @@ _080E1FF0: movs r0, 0x1 b _080E202E .align 2, 0 -_080E201C: .4byte 0x02039f90 -_080E2020: .4byte sub_80E2058 + 1 -_080E2024: .4byte 0x0858bb68 -_080E2028: .4byte 0x03005e00 + .pool _080E202C: movs r0, 0 _080E202E: strh r0, [r1, 0x12] - ldr r1, _080E2054 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -463153,7 +447857,7 @@ _080E202E: pop {r0} bx r0 .align 2, 0 -_080E2054: .4byte 0x03005e00 + .pool thumb_func_end sub_80E1FBC thumb_func_start sub_80E2058 @@ -463164,15 +447868,15 @@ sub_80E2058: @ 80E2058 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080E2084 + ldr r1, =0x03005e08 adds r5, r0, r1 - ldr r0, _080E2088 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080E20FC - ldr r1, _080E208C + ldr r1, =0x02039f90 ldrb r0, [r1] cmp r0, 0 beq _080E2090 @@ -463180,9 +447884,7 @@ sub_80E2058: @ 80E2058 strb r0, [r1] b _080E20FC .align 2, 0 -_080E2084: .4byte 0x03005e08 -_080E2088: .4byte 0x02037fd4 -_080E208C: .4byte 0x02039f90 + .pool _080E2090: movs r1, 0xA ldrsh r0, [r5, r1] @@ -463195,7 +447897,7 @@ _080E209E: _080E20A2: lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080E20E0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0xC0 ands r0, r1 @@ -463219,15 +447921,14 @@ _080E20B8: bne _080E20FC movs r0, 0x5 bl audio_play - ldr r1, _080E20E4 + ldr r1, =0x020375f0 movs r0, 0x7F strh r0, [r1] b _080E20EC .align 2, 0 -_080E20E0: .4byte 0x030022c0 -_080E20E4: .4byte 0x020375f0 + .pool _080E20E8: - ldr r0, _080E2104 + ldr r0, =0x020375f0 strh r1, [r0] _080E20EC: ldrb r0, [r5, 0xC] @@ -463240,20 +447941,20 @@ _080E20FC: pop {r0} bx r0 .align 2, 0 -_080E2104: .4byte 0x020375f0 + .pool thumb_func_end sub_80E2058 thumb_func_start yes_no_box yes_no_box: @ 80E2108 push {r4,lr} - ldr r4, _080E2130 + ldr r4, =task_yes_no_maybe + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080E2138 - ldr r1, _080E2134 + ldr r1, =0x020375f0 movs r0, 0xFF strh r0, [r1] bl sub_8197930 @@ -463263,8 +447964,7 @@ yes_no_box: @ 80E2108 movs r0, 0x1 b _080E213A .align 2, 0 -_080E2130: .4byte task_yes_no_maybe + 1 -_080E2134: .4byte 0x020375f0 + .pool _080E2138: movs r0, 0 _080E213A: @@ -463276,14 +447976,14 @@ _080E213A: thumb_func_start sub_80E2140 sub_80E2140: @ 80E2140 push {lr} - ldr r0, _080E2150 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0xFF beq _080E2154 movs r0, 0x1 b _080E2156 .align 2, 0 -_080E2150: .4byte 0x020375f0 + .pool _080E2154: movs r0, 0 _080E2156: @@ -463296,7 +447996,7 @@ task_yes_no_maybe: @ 80E215C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080E217C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -463310,7 +448010,7 @@ task_yes_no_maybe: @ 80E215C strh r0, [r1, 0xC] b _080E21C4 .align 2, 0 -_080E217C: .4byte 0x03005e00 + .pool _080E2180: bl sub_8198C58 lsls r0, 24 @@ -463333,13 +448033,13 @@ _080E219C: _080E21A4: movs r0, 0x5 bl audio_play - ldr r1, _080E21B0 + ldr r1, =0x020375f0 movs r0, 0 b _080E21B8 .align 2, 0 -_080E21B0: .4byte 0x020375f0 + .pool _080E21B4: - ldr r1, _080E21CC + ldr r1, =0x020375f0 movs r0, 0x1 _080E21B8: strh r0, [r1] @@ -463352,7 +448052,7 @@ _080E21C4: pop {r0} bx r0 .align 2, 0 -_080E21CC: .4byte 0x020375f0 + .pool thumb_func_end task_yes_no_maybe thumb_func_start sub_80E21D0 @@ -463377,7 +448077,7 @@ sub_80E21D0: @ 80E21D0 lsls r4, 24 lsrs r4, 24 mov r10, r4 - ldr r0, _080E220C + ldr r0, =sub_80E2308 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -463386,14 +448086,14 @@ sub_80E21D0: @ 80E21D0 movs r0, 0 b _080E22E8 .align 2, 0 -_080E220C: .4byte sub_80E2308 + 1 + .pool _080E2210: - ldr r0, _080E22F8 + ldr r0, =0x020375f0 movs r1, 0xFF strh r1, [r0] movs r2, 0 movs r6, 0 - ldr r1, _080E22FC + ldr r1, =0x0858b760 lsls r5, 3 adds r0, r5, r1 str r5, [sp, 0xC] @@ -463428,7 +448128,7 @@ _080E2246: bl sub_80E2D5C lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _080E22FC + ldr r2, =0x0858b760 mov r9, r2 ldr r0, [sp, 0xC] add r9, r0 @@ -463439,12 +448139,12 @@ _080E2246: adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _080E2300 + ldr r0, =sub_80E2308 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r1, _080E2304 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -463498,10 +448198,7 @@ _080E22E8: pop {r1} bx r1 .align 2, 0 -_080E22F8: .4byte 0x020375f0 -_080E22FC: .4byte 0x0858b760 -_080E2300: .4byte sub_80E2308 + 1 -_080E2304: .4byte 0x03005e00 + .pool thumb_func_end sub_80E21D0 thumb_func_start sub_80E2308 @@ -463512,7 +448209,7 @@ sub_80E2308: @ 80E2308 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080E2344 + ldr r1, =0x03005e08 adds r5, r0, r1 bl sub_8199334 lsls r0, 24 @@ -463530,15 +448227,14 @@ sub_80E2308: @ 80E2308 bne _080E2360 movs r0, 0x5 bl audio_play - ldr r1, _080E2348 + ldr r1, =0x020375f0 movs r0, 0x7F strh r0, [r1] b _080E2350 .align 2, 0 -_080E2344: .4byte 0x03005e08 -_080E2348: .4byte 0x020375f0 + .pool _080E234C: - ldr r0, _080E2368 + ldr r0, =0x020375f0 strh r1, [r0] _080E2350: ldrb r0, [r5, 0xC] @@ -463551,27 +448247,26 @@ _080E2360: pop {r0} bx r0 .align 2, 0 -_080E2368: .4byte 0x020375f0 + .pool thumb_func_end sub_80E2308 thumb_func_start sp109_CreatePCMenu sp109_CreatePCMenu: @ 80E236C push {lr} - ldr r0, _080E238C + ldr r0, =sub_80E2058 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080E2394 - ldr r1, _080E2390 + ldr r1, =0x020375f0 movs r0, 0xFF strh r0, [r1] bl CreatePCMenu movs r0, 0x1 b _080E2396 .align 2, 0 -_080E238C: .4byte sub_80E2058 + 1 -_080E2390: .4byte 0x020375f0 + .pool _080E2394: movs r0, 0 _080E2396: @@ -463588,7 +448283,7 @@ CreatePCMenu: @ 80E239C movs r7, 0x8 movs r5, 0 movs r4, 0 - ldr r6, _080E2438 + ldr r6, =0x0858bb70 _080E23AC: ldm r6!, {r0} adds r1, r5, 0 @@ -463597,13 +448292,13 @@ _080E23AC: adds r4, 0x1 cmp r4, 0x3 bls _080E23AC - ldr r6, _080E243C + ldr r6, =0x00000864 adds r0, r6, 0 bl flag_check lsls r0, 24 cmp r0, 0 beq _080E23D4 - ldr r0, _080E2440 + ldr r0, =0x085eb18b adds r1, r5, 0 bl display_text_and_get_width adds r5, r0, 0 @@ -463630,7 +448325,7 @@ _080E23D4: adds r0, r6, 0 movs r1, 0 bl SetStandardWindowBorderStyle - ldr r2, _080E2440 + ldr r2, =0x085eb18b movs r0, 0x21 str r0, [sp] movs r5, 0xFF @@ -463641,7 +448336,7 @@ _080E23D4: movs r1, 0x1 adds r3, r7, 0 bl Print - ldr r2, _080E2444 + ldr r2, =0x085eb198 movs r0, 0x31 str r0, [sp] str r5, [sp, 0x4] @@ -463652,10 +448347,7 @@ _080E23D4: bl Print b _080E247A .align 2, 0 -_080E2438: .4byte 0x0858bb70 -_080E243C: .4byte 0x00000864 -_080E2440: .4byte 0x085eb18b -_080E2444: .4byte 0x085eb198 + .pool _080E2448: movs r0, 0x3 mov r8, r0 @@ -463669,7 +448361,7 @@ _080E2448: adds r0, r6, 0 movs r1, 0 bl SetStandardWindowBorderStyle - ldr r2, _080E24A4 + ldr r2, =0x085eb198 movs r0, 0x21 str r0, [sp] movs r0, 0xFF @@ -463680,13 +448372,13 @@ _080E2448: adds r3, r7, 0 bl Print _080E247A: - ldr r0, _080E24A8 + ldr r0, =0x000008ab bl flag_check lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 beq _080E24B0 - ldr r2, _080E24AC + ldr r2, =0x085eb176 movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -463699,11 +448391,9 @@ _080E247A: bl Print b _080E24C6 .align 2, 0 -_080E24A4: .4byte 0x085eb198 -_080E24A8: .4byte 0x000008ab -_080E24AC: .4byte 0x085eb176 + .pool _080E24B0: - ldr r2, _080E2508 + ldr r2, =0x085eb169 movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -463714,8 +448404,8 @@ _080E24B0: adds r3, r7, 0 bl Print _080E24C6: - ldr r4, _080E250C - ldr r1, _080E2510 + ldr r4, =0x02021fc4 + ldr r1, =0x085eb183 adds r0, r4, 0 bl ExpandTextCodes adds r0, r6, 0 @@ -463742,9 +448432,7 @@ _080E24C6: pop {r0} bx r0 .align 2, 0 -_080E2508: .4byte 0x085eb169 -_080E250C: .4byte 0x02021fc4 -_080E2510: .4byte 0x085eb183 + .pool thumb_func_end CreatePCMenu thumb_func_start sub_80E2514 @@ -463754,7 +448442,7 @@ sub_80E2514: @ 80E2514 movs r0, 0 movs r1, 0x1 bl sub_819786C - ldr r2, _080E2544 + ldr r2, =0x0827266f movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -463771,27 +448459,26 @@ sub_80E2514: @ 80E2514 pop {r0} bx r0 .align 2, 0 -_080E2544: .4byte 0x0827266f + .pool thumb_func_end sub_80E2514 thumb_func_start sub_80E2548 sub_80E2548: @ 80E2548 push {lr} - ldr r0, _080E2568 + ldr r0, =sub_80E2058 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080E2570 - ldr r1, _080E256C + ldr r1, =0x020375f0 movs r0, 0xFF strh r0, [r1] bl sub_80E2578 movs r0, 0x1 b _080E2572 .align 2, 0 -_080E2568: .4byte sub_80E2058 + 1 -_080E256C: .4byte 0x020375f0 + .pool _080E2570: movs r0, 0 _080E2572: @@ -463808,7 +448495,7 @@ sub_80E2578: @ 80E2578 sub sp, 0xC movs r5, 0 movs r4, 0 - ldr r3, _080E2780 + ldr r3, =0x03001124 movs r2, 0xFF _080E258A: adds r0, r4, r3 @@ -463823,11 +448510,11 @@ _080E258A: movs r0, 0x1 movs r1, 0 bl fbox_get_field - ldr r0, _080E2784 + ldr r0, =0x020375e0 ldrh r1, [r0] cmp r1, 0 bne _080E25D2 - ldr r4, _080E2780 + ldr r4, =0x03001124 adds r0, r5, r4 strb r1, [r0] adds r0, r5, 0x1 @@ -463846,24 +448533,24 @@ _080E258A: lsls r0, 24 lsrs r5, r0, 24 _080E25D2: - ldr r0, _080E2788 + ldr r0, =0x00000113 movs r1, 0x1 bl sub_80D6724 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080E2630 - ldr r0, _080E278C + ldr r0, =0x000008b3 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080E2630 - ldr r2, _080E2784 + ldr r2, =0x020375e0 ldrh r0, [r2] cmp r0, 0 bne _080E2606 - ldr r0, _080E2780 + ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x2 strb r1, [r0] @@ -463881,7 +448568,7 @@ _080E2606: lsls r0, 24 cmp r0, 0 bne _080E2630 - ldr r0, _080E2780 + ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x2 strb r1, [r0] @@ -463906,11 +448593,11 @@ _080E2630: lsrs r0, 24 cmp r0, 0x1 bne _080E2690 - ldr r2, _080E2784 + ldr r2, =0x020375e0 ldrh r0, [r2] cmp r0, 0 bne _080E2668 - ldr r0, _080E2780 + ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x3 strb r1, [r0] @@ -463921,13 +448608,13 @@ _080E2668: ldrh r0, [r2] cmp r0, 0x1 bne _080E2690 - ldr r4, _080E2790 + ldr r4, =0x000001db adds r0, r4, 0 bl flag_check lsls r0, 24 cmp r0, 0 bne _080E2690 - ldr r0, _080E2780 + ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x3 strb r1, [r0] @@ -463937,24 +448624,24 @@ _080E2668: adds r0, r4, 0 bl flag_set _080E2690: - ldr r0, _080E2794 + ldr r0, =0x00000173 movs r1, 0x1 bl sub_80D6724 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080E26EC - ldr r0, _080E2798 + ldr r0, =0x000008d5 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080E26EC - ldr r2, _080E2784 + ldr r2, =0x020375e0 ldrh r0, [r2] cmp r0, 0 bne _080E26C4 - ldr r0, _080E2780 + ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x4 strb r1, [r0] @@ -463965,13 +448652,13 @@ _080E26C4: ldrh r0, [r2] cmp r0, 0x1 bne _080E26EC - ldr r4, _080E279C + ldr r4, =0x000001af adds r0, r4, 0 bl flag_check lsls r0, 24 cmp r0, 0 bne _080E26EC - ldr r0, _080E2780 + ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x4 strb r1, [r0] @@ -463989,17 +448676,17 @@ _080E26EC: lsrs r0, 24 cmp r0, 0x1 bne _080E274C - ldr r0, _080E27A0 + ldr r0, =0x000008d6 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080E274C - ldr r2, _080E2784 + ldr r2, =0x020375e0 ldrh r0, [r2] cmp r0, 0 bne _080E2722 - ldr r0, _080E2780 + ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x5 strb r1, [r0] @@ -464017,7 +448704,7 @@ _080E2722: lsls r0, 24 cmp r0, 0 bne _080E274C - ldr r0, _080E2780 + ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x5 strb r1, [r0] @@ -464027,14 +448714,14 @@ _080E2722: adds r0, r4, 0 bl flag_set _080E274C: - ldr r0, _080E2780 + ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x6 strb r1, [r0] adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080E2784 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne _080E276E @@ -464047,30 +448734,22 @@ _080E276E: adds r7, r5, 0 cmp r7, 0x7 bne _080E27A4 - ldr r1, _080E2784 + ldr r1, =0x020375e0 movs r0, 0xB strh r0, [r1] bl sub_813A128 b _080E2860 .align 2, 0 -_080E2780: .4byte 0x03001124 -_080E2784: .4byte 0x020375e0 -_080E2788: .4byte 0x00000113 -_080E278C: .4byte 0x000008b3 -_080E2790: .4byte 0x000001db -_080E2794: .4byte 0x00000173 -_080E2798: .4byte 0x000008d5 -_080E279C: .4byte 0x000001af -_080E27A0: .4byte 0x000008d6 + .pool _080E27A4: movs r1, 0 movs r4, 0 lsls r6, r7, 25 subs r0, r7, 0x1 mov r9, r0 - ldr r5, _080E2870 + ldr r5, =0x0858bb80 _080E27B0: - ldr r0, _080E2874 + ldr r0, =0x03001124 adds r0, r4, r0 ldrb r0, [r0] cmp r0, 0xFF @@ -464106,10 +448785,10 @@ _080E27C6: bl SetStandardWindowBorderStyle movs r5, 0 movs r4, 0 - ldr r0, _080E2870 + ldr r0, =0x0858bb80 mov r8, r0 _080E2802: - ldr r0, _080E2874 + ldr r0, =0x03001124 adds r1, r4, r0 ldrb r0, [r1] cmp r0, 0xFF @@ -464162,18 +448841,17 @@ _080E2860: pop {r0} bx r0 .align 2, 0 -_080E2870: .4byte 0x0858bb80 -_080E2874: .4byte 0x03001124 + .pool thumb_func_end sub_80E2578 thumb_func_start sub_80E2878 sub_80E2878: @ 80E2878 push {lr} - ldr r2, _080E2890 + ldr r2, =0x020375f0 ldrh r0, [r2] cmp r0, 0x7F beq _080E288C - ldr r0, _080E2894 + ldr r0, =0x03001124 ldrh r1, [r2] adds r1, r0 ldrb r0, [r1] @@ -464182,8 +448860,7 @@ _080E288C: pop {r0} bx r0 .align 2, 0 -_080E2890: .4byte 0x020375f0 -_080E2894: .4byte 0x03001124 + .pool thumb_func_end sub_80E2878 thumb_func_start task_picbox @@ -464194,7 +448871,7 @@ task_picbox: @ 80E2898 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080E28BC + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -464206,7 +448883,7 @@ task_picbox: @ 80E2898 beq _080E28DE b _080E28F8 .align 2, 0 -_080E28BC: .4byte 0x03005e00 + .pool _080E28C0: cmp r0, 0x2 beq _080E28CA @@ -464219,7 +448896,7 @@ _080E28CA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080E28E8 + ldr r1, =0x02020630 adds r0, r1 ldrb r1, [r4, 0xC] bl sub_80B6070 @@ -464229,7 +448906,7 @@ _080E28DE: strh r0, [r4, 0x8] b _080E28F8 .align 2, 0 -_080E28E8: .4byte 0x02020630 + .pool _080E28EC: ldrb r0, [r4, 0x12] bl sub_80E2A78 @@ -464253,7 +448930,7 @@ sub_80E2900: @ 80E2900 lsrs r7, r1, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r4, _080E29A8 + ldr r4, =task_picbox + 1 adds r0, r4, 0 bl get_task_id_by_function lsls r0, 24 @@ -464285,7 +448962,7 @@ sub_80E2900: @ 80E2900 movs r2, 0x8 movs r3, 0x8 bl CreateWindowFromRect - ldr r1, _080E29AC + ldr r1, =0x03005e00 lsls r3, r4, 2 adds r3, r4 lsls r3, 3 @@ -464298,14 +448975,14 @@ sub_80E2900: @ 80E2900 mov r0, r8 strh r0, [r3, 0xA] strh r5, [r3, 0xC] - ldr r4, _080E29B0 + ldr r4, =0x02020630 lsls r1, r5, 4 adds r1, r5 lsls r1, 2 adds r0, r4, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, _080E29B4 + ldr r2, =nullsub_12 + 1 str r2, [r0] adds r1, r4 ldrb r2, [r1, 0x5] @@ -464321,10 +448998,7 @@ sub_80E2900: @ 80E2900 movs r0, 0x1 b _080E29BA .align 2, 0 -_080E29A8: .4byte task_picbox + 1 -_080E29AC: .4byte 0x03005e00 -_080E29B0: .4byte 0x02020630 -_080E29B4: .4byte nullsub_12 + 1 + .pool _080E29B8: movs r0, 0 _080E29BA: @@ -464338,13 +449012,13 @@ _080E29BA: thumb_func_start picbox_close picbox_close: @ 80E29C4 push {lr} - ldr r0, _080E29E8 + ldr r0, =task_picbox + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF beq _080E29F4 - ldr r0, _080E29EC + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -464352,12 +449026,10 @@ picbox_close: @ 80E29C4 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - ldr r0, _080E29F0 + ldr r0, =sub_80E29FC + 1 b _080E29F6 .align 2, 0 -_080E29E8: .4byte task_picbox + 1 -_080E29EC: .4byte 0x03005e00 -_080E29F0: .4byte sub_80E29FC + 1 + .pool _080E29F4: movs r0, 0 _080E29F6: @@ -464368,7 +449040,7 @@ _080E29F6: thumb_func_start sub_80E29FC sub_80E29FC: @ 80E29FC push {lr} - ldr r0, _080E2A10 + ldr r0, =task_picbox + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -464377,7 +449049,7 @@ sub_80E29FC: @ 80E29FC movs r0, 0 b _080E2A16 .align 2, 0 -_080E2A10: .4byte task_picbox + 1 + .pool _080E2A14: movs r0, 0x1 _080E2A16: @@ -464458,12 +449130,12 @@ sub_80E2A94: @ 80E2A94 cmp r0, 0x5 bhi _080E2B70 lsls r0, 2 - ldr r1, _080E2AAC + ldr r1, =_080E2AB0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E2AAC: .4byte _080E2AB0 + .pool .align 2, 0 _080E2AB0: .4byte _080E2B40 @@ -464476,39 +449148,39 @@ _080E2AC8: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r4, _080E2AD4 + ldr r4, =0x0858bbac b _080E2B12 .align 2, 0 -_080E2AD4: .4byte 0x0858bbac + .pool _080E2AD8: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r4, _080E2AE4 + ldr r4, =0x0858bb9c b _080E2B12 .align 2, 0 -_080E2AE4: .4byte 0x0858bb9c + .pool _080E2AE8: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r4, _080E2AF4 + ldr r4, =0x0858bbbc b _080E2B12 .align 2, 0 -_080E2AF4: .4byte 0x0858bbbc + .pool _080E2AF8: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r4, _080E2B04 + ldr r4, =0x0858bbcc b _080E2B12 .align 2, 0 -_080E2B04: .4byte 0x0858bbcc + .pool _080E2B08: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r4, _080E2B3C + ldr r4, =0x0858bbec _080E2B12: bl GetMenuCursorPos lsls r0, 24 @@ -464529,12 +449201,12 @@ _080E2B12: bl text_box_related_one b _080E2B70 .align 2, 0 -_080E2B3C: .4byte 0x0858bbec + .pool _080E2B40: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r4, _080E2B78 + ldr r4, =0x0858bbe0 bl GetMenuCursorPos lsls r0, 24 lsrs r0, 22 @@ -464558,27 +449230,26 @@ _080E2B70: pop {r0} bx r0 .align 2, 0 -_080E2B78: .4byte 0x0858bbe0 + .pool thumb_func_end sub_80E2A94 thumb_func_start sp106_CreateStartMenu sp106_CreateStartMenu: @ 80E2B7C push {lr} - ldr r0, _080E2B9C + ldr r0, =sub_80E2058 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080E2BA4 - ldr r1, _080E2BA0 + ldr r1, =0x020375f0 movs r0, 0xFF strh r0, [r1] bl CreateStartMenu movs r0, 0x1 b _080E2BA6 .align 2, 0 -_080E2B9C: .4byte sub_80E2058 + 1 -_080E2BA0: .4byte 0x020375f0 + .pool _080E2BA4: movs r0, 0 _080E2BA6: @@ -464601,7 +449272,7 @@ CreateStartMenu: @ 80E2BAC adds r0, r4, 0 movs r1, 0 bl SetStandardWindowBorderStyle - ldr r2, _080E2CA4 + ldr r2, =0x085eb25c movs r0, 0x9 str r0, [sp] movs r5, 0xFF @@ -464612,7 +449283,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl Print - ldr r2, _080E2CA8 + ldr r2, =0x085eb264 movs r0, 0x19 str r0, [sp] str r5, [sp, 0x4] @@ -464621,7 +449292,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl Print - ldr r2, _080E2CAC + ldr r2, =0x085eb26c movs r0, 0x29 str r0, [sp] str r5, [sp, 0x4] @@ -464630,7 +449301,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl Print - ldr r2, _080E2CB0 + ldr r2, =0x085eb270 movs r0, 0x39 str r0, [sp] str r5, [sp, 0x4] @@ -464639,7 +449310,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl Print - ldr r0, _080E2CB4 + ldr r0, =0x03005d90 ldr r2, [r0] movs r0, 0x49 str r0, [sp] @@ -464649,7 +449320,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl Print - ldr r2, _080E2CB8 + ldr r2, =0x085eb279 movs r0, 0x59 str r0, [sp] str r5, [sp, 0x4] @@ -464658,7 +449329,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl Print - ldr r2, _080E2CBC + ldr r2, =0x085eb27e movs r0, 0x69 str r0, [sp] str r5, [sp, 0x4] @@ -464667,7 +449338,7 @@ CreateStartMenu: @ 80E2BAC movs r1, 0x1 movs r3, 0x8 bl Print - ldr r2, _080E2CC0 + ldr r2, =0x085eb285 movs r0, 0x79 str r0, [sp] str r5, [sp, 0x4] @@ -464699,14 +449370,7 @@ CreateStartMenu: @ 80E2BAC pop {r0} bx r0 .align 2, 0 -_080E2CA4: .4byte 0x085eb25c -_080E2CA8: .4byte 0x085eb264 -_080E2CAC: .4byte 0x085eb26c -_080E2CB0: .4byte 0x085eb270 -_080E2CB4: .4byte 0x03005d90 -_080E2CB8: .4byte 0x085eb279 -_080E2CBC: .4byte 0x085eb27e -_080E2CC0: .4byte 0x085eb285 + .pool thumb_func_end CreateStartMenu thumb_func_start sub_80E2CC4 @@ -464721,15 +449385,15 @@ sub_80E2CC4: @ 80E2CC4 lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r1, _080E2D04 + ldr r1, =0x02039f90 movs r0, 0x2 strb r0, [r1] - ldr r0, _080E2D08 + ldr r0, =sub_80E2058 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080E2D0C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -464743,9 +449407,7 @@ sub_80E2CC4: @ 80E2CC4 pop {r0} bx r0 .align 2, 0 -_080E2D04: .4byte 0x02039f90 -_080E2D08: .4byte sub_80E2058 + 1 -_080E2D0C: .4byte 0x03005e00 + .pool thumb_func_end sub_80E2CC4 thumb_func_start display_text_and_get_width_internal @@ -464827,7 +449489,7 @@ do_choose_name_or_words_screen: @ 80E2D78 lsrs r5, r2, 16 lsls r3, 16 lsrs r6, r3, 16 - ldr r4, _080E2DA4 + ldr r4, =0x02039f94 movs r0, 0xF2 lsls r0, 5 bl malloc @@ -464838,27 +449500,27 @@ do_choose_name_or_words_screen: @ 80E2D78 bl set_callback2 b _080E2DE2 .align 2, 0 -_080E2DA4: .4byte 0x02039f94 + .pool _080E2DA8: - ldr r1, _080E2DEC + ldr r1, =0x00001e2c adds r0, r1 strb r7, [r0] ldr r0, [r4] - ldr r2, _080E2DF0 + ldr r2, =0x00001e34 adds r1, r0, r2 strh r5, [r1] adds r2, 0x2 adds r1, r0, r2 strh r6, [r1] - ldr r1, _080E2DF4 + ldr r1, =0x00001e38 adds r2, r0, r1 ldr r1, [sp, 0x18] str r1, [r2] - ldr r2, _080E2DF8 + ldr r2, =0x00001e30 adds r1, r0, r2 mov r2, r8 str r2, [r1] - ldr r1, _080E2DFC + ldr r1, =0x00001e3c adds r0, r1 ldr r2, [sp, 0x1C] str r2, [r0] @@ -464866,7 +449528,7 @@ _080E2DA8: bne _080E2DDC bl start_timer1 _080E2DDC: - ldr r0, _080E2E00 + ldr r0, =c2_choose_name_or_words_screen + 1 bl set_callback2 _080E2DE2: pop {r3} @@ -464875,18 +449537,13 @@ _080E2DE2: pop {r0} bx r0 .align 2, 0 -_080E2DEC: .4byte 0x00001e2c -_080E2DF0: .4byte 0x00001e34 -_080E2DF4: .4byte 0x00001e38 -_080E2DF8: .4byte 0x00001e30 -_080E2DFC: .4byte 0x00001e3c -_080E2E00: .4byte c2_choose_name_or_words_screen + 1 + .pool thumb_func_end do_choose_name_or_words_screen thumb_func_start c2_choose_name_or_words_screen c2_choose_name_or_words_screen: @ 80E2E04 push {lr} - ldr r0, _080E2E20 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -464894,13 +449551,12 @@ c2_choose_name_or_words_screen: @ 80E2E04 cmp r0, 0x7 bhi _080E2E9C lsls r0, 2 - ldr r1, _080E2E24 + ldr r1, =_080E2E28 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E2E20: .4byte 0x030022c0 -_080E2E24: .4byte _080E2E28 + .pool .align 2, 0 _080E2E28: .4byte _080E2E48 @@ -464939,7 +449595,7 @@ _080E2E7A: bl fade_and_return_progress_probably bl sub_80E501C _080E2E86: - ldr r1, _080E2E98 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -464948,7 +449604,7 @@ _080E2E86: strb r0, [r1] b _080E2EA4 .align 2, 0 -_080E2E98: .4byte 0x030022c0 + .pool _080E2E9C: bl sub_80E4CB8 bl sub_80E3194 @@ -464960,21 +449616,21 @@ _080E2EA4: thumb_func_start choose_name_or_words_screen_setup choose_name_or_words_screen_setup: @ 80E2EA8 push {r4-r7,lr} - ldr r5, _080E2F70 + ldr r5, =0x02039f94 ldr r0, [r5] - ldr r1, _080E2F74 + ldr r1, =0x00001e10 adds r0, r1 movs r2, 0 strb r2, [r0] ldr r1, [r5] - ldr r3, _080E2F78 + ldr r3, =0x00001e18 adds r0, r1, r3 movs r4, 0 strh r2, [r0] - ldr r7, _080E2F7C + ldr r7, =0x00001e1a adds r0, r1, r7 strh r2, [r0] - ldr r0, _080E2F80 + ldr r0, =0x00001e1c adds r2, r1, r0 movs r3, 0x1 movs r0, 0x1 @@ -464988,14 +449644,14 @@ choose_name_or_words_screen_setup: @ 80E2EA8 adds r1, r0 strb r4, [r1] ldr r0, [r5] - ldr r1, _080E2F84 + ldr r1, =0x00001e21 adds r0, r1 strb r3, [r0] ldr r1, [r5] - ldr r6, _080E2F88 + ldr r6, =0x00001e28 adds r3, r1, r6 - ldr r2, _080E2F8C - ldr r4, _080E2F90 + ldr r2, =0x0858bfd8 + ldr r4, =0x00001e2c adds r0, r1, r4 ldrb r0, [r0] lsls r0, 2 @@ -465003,7 +449659,7 @@ choose_name_or_words_screen_setup: @ 80E2EA8 ldr r0, [r0] str r0, [r3] ldrb r0, [r0, 0x4] - ldr r2, _080E2F94 + ldr r2, =0x00001e22 adds r1, r2 strb r0, [r1] ldr r2, [r5] @@ -465027,9 +449683,9 @@ choose_name_or_words_screen_setup: @ 80E2EA8 strh r0, [r1] _080E2F2C: ldr r0, [r5] - ldr r4, _080E2F98 + ldr r4, =0x030022b0 ldrh r1, [r4] - ldr r2, _080E2F9C + ldr r2, =0x00001e25 adds r0, r2 strb r1, [r0] ldr r0, [r5] @@ -465048,7 +449704,7 @@ _080E2F2C: movs r7, 0xC0 lsls r7, 5 adds r0, r1, r7 - ldr r2, _080E2FA0 + ldr r2, =0x00001e30 adds r1, r2 ldr r1, [r1] bl gf_strcpy @@ -465059,26 +449715,14 @@ _080E2F64: pop {r0} bx r0 .align 2, 0 -_080E2F70: .4byte 0x02039f94 -_080E2F74: .4byte 0x00001e10 -_080E2F78: .4byte 0x00001e18 -_080E2F7C: .4byte 0x00001e1a -_080E2F80: .4byte 0x00001e1c -_080E2F84: .4byte 0x00001e21 -_080E2F88: .4byte 0x00001e28 -_080E2F8C: .4byte 0x0858bfd8 -_080E2F90: .4byte 0x00001e2c -_080E2F94: .4byte 0x00001e22 -_080E2F98: .4byte 0x030022b0 -_080E2F9C: .4byte 0x00001e25 -_080E2FA0: .4byte 0x00001e30 + .pool thumb_func_end choose_name_or_words_screen_setup thumb_func_start sub_80E2FA4 sub_80E2FA4: @ 80E2FA4 push {r4,r5,lr} movs r3, 0 - ldr r4, _080E2FE0 + ldr r4, =0x02020630 movs r5, 0x5 negs r5, r5 _080E2FAE: @@ -465107,7 +449751,7 @@ _080E2FC8: pop {r0} bx r0 .align 2, 0 -_080E2FE0: .4byte 0x02020630 + .pool thumb_func_end sub_80E2FA4 thumb_func_start choose_name_or_words_screen_init_bgs @@ -465124,10 +449768,10 @@ choose_name_or_words_screen_init_bgs: @ 80E2FE4 mov r8, r0 add r2, sp, 0x8 movs r6, 0 - ldr r1, _080E3178 + ldr r1, =0x040000d4 movs r5, 0x80 lsls r5, 5 - ldr r7, _080E317C + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -465157,7 +449801,7 @@ _080E300A: lsls r3, 3 movs r4, 0 str r4, [sp, 0xC] - ldr r2, _080E3178 + ldr r2, =0x040000d4 mov r1, r8 str r1, [r2] str r0, [r2, 0x4] @@ -465184,7 +449828,7 @@ _080E300A: bl lcd_io_set movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080E3180 + ldr r1, =0x0858be00 movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -465224,12 +449868,12 @@ _080E300A: bl sub_8197200 _080E30D8: lsls r0, r4, 3 - ldr r1, _080E3184 + ldr r1, =0x0858be10 adds r0, r1 bl Window_AddFromTemplate - ldr r5, _080E3188 + ldr r5, =0x02039f94 ldr r1, [r5] - ldr r2, _080E318C + ldr r2, =0x00001e11 adds r1, r2 adds r1, r4 strb r0, [r1] @@ -465246,7 +449890,7 @@ _080E30D8: lsls r1, 3 movs r0, 0x50 bl lcd_io_set - ldr r1, _080E3190 + ldr r1, =0x0000080c movs r0, 0x52 bl lcd_io_set ldr r1, [r5] @@ -465293,49 +449937,40 @@ _080E30D8: pop {r0} bx r0 .align 2, 0 -_080E3178: .4byte 0x040000d4 -_080E317C: .4byte 0x81000800 -_080E3180: .4byte 0x0858be00 -_080E3184: .4byte 0x0858be10 -_080E3188: .4byte 0x02039f94 -_080E318C: .4byte 0x00001e11 -_080E3190: .4byte 0x0000080c + .pool thumb_func_end choose_name_or_words_screen_init_bgs thumb_func_start sub_80E3194 sub_80E3194: @ 80E3194 push {lr} - ldr r0, _080E31A8 + ldr r0, =sub_80E31B0 + 1 movs r1, 0x2 bl AddTask - ldr r0, _080E31AC + ldr r0, =sub_80E4F58 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080E31A8: .4byte sub_80E31B0 + 1 -_080E31AC: .4byte sub_80E4F58 + 1 + .pool thumb_func_end sub_80E3194 thumb_func_start sub_80E31B0 sub_80E31B0: @ 80E31B0 push {lr} - ldr r0, _080E31CC + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E31D0 + ldr r1, =0x00001e10 adds r0, r1 ldrb r0, [r0] cmp r0, 0x9 bhi _080E3240 lsls r0, 2 - ldr r1, _080E31D4 + ldr r1, =_080E31D8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E31CC: .4byte 0x02039f94 -_080E31D0: .4byte 0x00001e10 -_080E31D4: .4byte _080E31D8 + .pool .align 2, 0 _080E31D8: .4byte _080E3200 @@ -465387,76 +450022,72 @@ _080E3240: sub_80E3244: @ 80E3244 lsls r0, 24 lsrs r0, 24 - ldr r1, _080E3250 + ldr r1, =0x0858bebb adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080E3250: .4byte 0x0858bebb + .pool thumb_func_end sub_80E3244 thumb_func_start sub_80E3254 sub_80E3254: @ 80E3254 - ldr r1, _080E3268 - ldr r0, _080E326C + ldr r1, =0x0858bebe + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r2, _080E3270 + ldr r2, =0x00001e22 adds r0, r2 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080E3268: .4byte 0x0858bebe -_080E326C: .4byte 0x02039f94 -_080E3270: .4byte 0x00001e22 + .pool thumb_func_end sub_80E3254 thumb_func_start sub_80E3274 sub_80E3274: @ 80E3274 - ldr r1, _080E3288 - ldr r0, _080E328C + ldr r1, =0x0858bec1 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r2, _080E3290 + ldr r2, =0x00001e22 adds r0, r2 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_080E3288: .4byte 0x0858bec1 -_080E328C: .4byte 0x02039f94 -_080E3290: .4byte 0x00001e22 + .pool thumb_func_end sub_80E3274 thumb_func_start sub_80E3294 sub_80E3294: @ 80E3294 push {r4-r6,lr} sub sp, 0x4 - ldr r1, _080E333C + ldr r1, =0x08dd4544 movs r0, 0x3 bl sub_80E4CF8 - ldr r5, _080E3340 + ldr r5, =0x02039f94 ldr r0, [r5] - ldr r1, _080E3344 + ldr r1, =0x00001e22 adds r0, r1 movs r6, 0 movs r1, 0x1 strb r1, [r0] - ldr r1, _080E3348 + ldr r1, =0x08dd46e0 movs r0, 0x2 bl sub_80E4CF8 - ldr r1, _080E334C + ldr r1, =0x08dd4620 movs r0, 0x1 bl sub_80E4CF8 ldr r0, [r5] - ldr r1, _080E3350 + ldr r1, =0x00001e12 adds r0, r1 ldrb r0, [r0] movs r1, 0 bl sub_80E4DE4 ldr r0, [r5] - ldr r1, _080E3354 + ldr r1, =0x00001e11 adds r0, r1 ldrb r0, [r0] movs r1, 0x1 @@ -465489,7 +450120,7 @@ sub_80E3294: @ 80E3294 movs r3, 0 bl sub_80A1AD4 ldr r1, [r5] - ldr r0, _080E3358 + ldr r0, =0x00001e10 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 @@ -465500,20 +450131,13 @@ sub_80E3294: @ 80E3294 pop {r1} bx r1 .align 2, 0 -_080E333C: .4byte 0x08dd4544 -_080E3340: .4byte 0x02039f94 -_080E3344: .4byte 0x00001e22 -_080E3348: .4byte 0x08dd46e0 -_080E334C: .4byte 0x08dd4620 -_080E3350: .4byte 0x00001e12 -_080E3354: .4byte 0x00001e11 -_080E3358: .4byte 0x00001e10 + .pool thumb_func_end sub_80E3294 thumb_func_start sub_80E335C sub_80E335C: @ 80E335C push {lr} - ldr r0, _080E338C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -465523,9 +450147,9 @@ sub_80E335C: @ 80E335C bl sub_80E4630 movs r0, 0x1 bl sub_80E3E94 - ldr r0, _080E3390 + ldr r0, =0x02039f94 ldr r1, [r0] - ldr r0, _080E3394 + ldr r0, =0x00001e10 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 @@ -465535,9 +450159,7 @@ _080E3384: pop {r1} bx r1 .align 2, 0 -_080E338C: .4byte 0x02037fd4 -_080E3390: .4byte 0x02039f94 -_080E3394: .4byte 0x00001e10 + .pool thumb_func_end sub_80E335C thumb_func_start sub_80E3398 @@ -465560,9 +450182,9 @@ sub_80E33A8: @ 80E33A8 movs r0, 0x1 bl sub_80E4630 bl sub_80E3E28 - ldr r0, _080E33D0 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E33D4 + ldr r1, =0x00001e10 adds r0, r1 movs r1, 0x2 strb r1, [r0] @@ -465571,8 +450193,7 @@ _080E33CA: pop {r1} bx r1 .align 2, 0 -_080E33D0: .4byte 0x02039f94 -_080E33D4: .4byte 0x00001e10 + .pool thumb_func_end sub_80E33A8 thumb_func_start pokemon_store @@ -465587,9 +450208,9 @@ pokemon_store: @ 80E33D8 movs r1, 0 movs r2, 0x1 bl sub_80E3948 - ldr r4, _080E3420 + ldr r4, =0x02039f94 ldr r0, [r4] - ldr r1, _080E3424 + ldr r1, =0x00001e2c adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 @@ -465601,20 +450222,18 @@ pokemon_store: @ 80E33D8 bls _080E342C bl pokemon_transfer_to_pc_with_message ldr r0, [r4] - ldr r1, _080E3428 + ldr r1, =0x00001e10 adds r0, r1 movs r1, 0x7 strb r1, [r0] movs r0, 0 b _080E343A .align 2, 0 -_080E3420: .4byte 0x02039f94 -_080E3424: .4byte 0x00001e2c -_080E3428: .4byte 0x00001e10 + .pool _080E342C: - ldr r0, _080E3440 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E3444 + ldr r1, =0x00001e10 adds r0, r1 movs r1, 0x8 strb r1, [r0] @@ -465624,8 +450243,7 @@ _080E343A: pop {r1} bx r1 .align 2, 0 -_080E3440: .4byte 0x02039f94 -_080E3444: .4byte 0x00001e10 + .pool thumb_func_end pokemon_store thumb_func_start sub_80E3448 @@ -465639,9 +450257,9 @@ sub_80E3448: @ 80E3448 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _080E3474 + ldr r0, =0x02039f94 ldr r1, [r0] - ldr r0, _080E3478 + ldr r0, =0x00001e10 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 @@ -465651,14 +450269,13 @@ sub_80E3448: @ 80E3448 pop {r1} bx r1 .align 2, 0 -_080E3474: .4byte 0x02039f94 -_080E3478: .4byte 0x00001e10 + .pool thumb_func_end sub_80E3448 thumb_func_start sub_80E347C sub_80E347C: @ 80E347C push {r4,r5,lr} - ldr r0, _080E34D0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -465666,9 +450283,9 @@ sub_80E347C: @ 80E347C lsrs r5, r0, 24 cmp r5, 0 bne _080E34C6 - ldr r4, _080E34D4 + ldr r4, =0x02039f94 ldr r0, [r4] - ldr r1, _080E34D8 + ldr r1, =0x00001e2c adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -465676,11 +450293,11 @@ sub_80E347C: @ 80E347C bl set_rand_seed_and_trainer_id_hi _080E34A0: ldr r0, [r4] - ldr r1, _080E34DC + ldr r1, =0x00001e3c adds r0, r1 ldr r0, [r0] bl set_callback2 - ldr r0, _080E34E0 + ldr r0, =sub_80E31B0 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -465695,11 +450312,7 @@ _080E34C6: pop {r1} bx r1 .align 2, 0 -_080E34D0: .4byte 0x02037fd4 -_080E34D4: .4byte 0x02039f94 -_080E34D8: .4byte 0x00001e2c -_080E34DC: .4byte 0x00001e3c -_080E34E0: .4byte sub_80E31B0 + 1 + .pool thumb_func_end sub_80E347C thumb_func_start pokemon_transfer_to_pc_with_message @@ -465711,8 +450324,8 @@ pokemon_transfer_to_pc_with_message: @ 80E34E4 lsls r0, 24 cmp r0, 0 bne _080E3534 - ldr r4, _080E3520 - ldr r0, _080E3524 + ldr r4, =0x02021cc4 + ldr r0, =0x00004036 bl var_get lsls r0, 24 lsrs r0, 24 @@ -465720,23 +450333,19 @@ pokemon_transfer_to_pc_with_message: @ 80E34E4 adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy - ldr r0, _080E3528 - ldr r1, _080E352C + ldr r0, =0x02021dc4 + ldr r1, =0x02039f94 ldr r1, [r1] - ldr r2, _080E3530 + ldr r2, =0x00001e30 adds r1, r2 ldr r1, [r1] bl gf_strcpy b _080E3574 .align 2, 0 -_080E3520: .4byte 0x02021cc4 -_080E3524: .4byte 0x00004036 -_080E3528: .4byte 0x02021dc4 -_080E352C: .4byte 0x02039f94 -_080E3530: .4byte 0x00001e30 + .pool _080E3534: - ldr r4, _080E35DC - ldr r0, _080E35E0 + ldr r4, =0x02021cc4 + ldr r0, =0x00004036 bl var_get lsls r0, 24 lsrs r0, 24 @@ -465744,14 +450353,14 @@ _080E3534: adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy - ldr r0, _080E35E4 - ldr r1, _080E35E8 + ldr r0, =0x02021dc4 + ldr r1, =0x02039f94 ldr r1, [r1] - ldr r2, _080E35EC + ldr r2, =0x00001e30 adds r1, r2 ldr r1, [r1] bl gf_strcpy - ldr r4, _080E35F0 + ldr r4, =0x02021ec4 bl get_unknown_box_id lsls r0, 24 lsrs r0, 24 @@ -465761,7 +450370,7 @@ _080E3534: bl gf_strcpy movs r5, 0x2 _080E3574: - ldr r0, _080E35F4 + ldr r0, =0x000008ab bl flag_check lsls r0, 24 cmp r0, 0 @@ -465770,8 +450379,8 @@ _080E3574: lsls r0, 24 lsrs r5, r0, 24 _080E3586: - ldr r4, _080E35F8 - ldr r1, _080E35FC + ldr r4, =0x02021fc4 + ldr r1, =0x0858bdb8 lsls r0, r5, 2 adds r0, r1 ldr r1, [r0] @@ -465780,7 +450389,7 @@ _080E3586: movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, _080E3600 + ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -465809,16 +450418,7 @@ _080E3586: pop {r0} bx r0 .align 2, 0 -_080E35DC: .4byte 0x02021cc4 -_080E35E0: .4byte 0x00004036 -_080E35E4: .4byte 0x02021dc4 -_080E35E8: .4byte 0x02039f94 -_080E35EC: .4byte 0x00001e30 -_080E35F0: .4byte 0x02021ec4 -_080E35F4: .4byte 0x000008ab -_080E35F8: .4byte 0x02021fc4 -_080E35FC: .4byte 0x0858bdb8 -_080E3600: .4byte 0x03003014 + .pool thumb_func_end pokemon_transfer_to_pc_with_message thumb_func_start sub_80E3604 @@ -465830,15 +450430,15 @@ sub_80E3604: @ 80E3604 lsls r0, 16 cmp r0, 0 bne _080E362E - ldr r0, _080E3634 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080E362E - ldr r0, _080E3638 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E363C + ldr r1, =0x00001e10 adds r0, r1 movs r1, 0x8 strb r1, [r0] @@ -465847,9 +450447,7 @@ _080E362E: pop {r1} bx r1 .align 2, 0 -_080E3634: .4byte 0x030022c0 -_080E3638: .4byte 0x02039f94 -_080E363C: .4byte 0x00001e10 + .pool thumb_func_end sub_80E3604 thumb_func_start sub_80E3640 @@ -465867,9 +450465,9 @@ sub_80E3640: @ 80E3640 bl sub_80E3948 movs r0, 0x6 bl audio_play - ldr r0, _080E3678 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E367C + ldr r1, =0x00001e10 adds r0, r1 movs r1, 0x5 strb r1, [r0] @@ -465877,8 +450475,7 @@ sub_80E3640: @ 80E3640 pop {r1} bx r1 .align 2, 0 -_080E3678: .4byte 0x02039f94 -_080E367C: .4byte 0x00001e10 + .pool thumb_func_end sub_80E3640 thumb_func_start sub_80E3680 @@ -465906,14 +450503,14 @@ sub_80E3680: @ 80E3680 bne _080E36B2 movs r5, 0x1 _080E36B2: - ldr r2, _080E36E8 + ldr r2, =0x02039f94 ldr r0, [r2] - ldr r1, _080E36EC + ldr r1, =0x00001e10 adds r0, r1 movs r1, 0x2 strb r1, [r0] ldr r1, [r2] - ldr r3, _080E36F0 + ldr r3, =0x00001e22 adds r1, r3 ldrb r0, [r1] adds r0, 0x1 @@ -465932,9 +450529,7 @@ _080E36B2: lsrs r0, 24 b _080E3712 .align 2, 0 -_080E36E8: .4byte 0x02039f94 -_080E36EC: .4byte 0x00001e10 -_080E36F0: .4byte 0x00001e22 + .pool _080E36F4: mov r0, sp movs r2, 0 @@ -465974,7 +450569,7 @@ _080E3732: thumb_func_start sub_80E373C sub_80E373C: @ 80E373C push {r4,lr} - ldr r4, _080E3758 + ldr r4, =sub_80E375C + 1 adds r0, r4, 0 movs r1, 0 bl AddTask @@ -465985,7 +450580,7 @@ sub_80E373C: @ 80E373C pop {r0} bx r0 .align 2, 0 -_080E3758: .4byte sub_80E375C + 1 + .pool thumb_func_end sub_80E373C thumb_func_start sub_80E375C @@ -465993,8 +450588,8 @@ sub_80E375C: @ 80E375C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _080E378C - ldr r2, _080E3790 + ldr r5, =0x0858bec4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -466014,14 +450609,13 @@ _080E376E: pop {r0} bx r0 .align 2, 0 -_080E378C: .4byte 0x0858bec4 -_080E3790: .4byte 0x03005e00 + .pool thumb_func_end sub_80E375C thumb_func_start sub_80E3794 sub_80E3794: @ 80E3794 push {lr} - ldr r0, _080E37A8 + ldr r0, =sub_80E375C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -466030,7 +450624,7 @@ sub_80E3794: @ 80E3794 movs r0, 0 b _080E37AE .align 2, 0 -_080E37A8: .4byte sub_80E375C + 1 + .pool _080E37AC: movs r0, 0x1 _080E37AE: @@ -466040,13 +450634,13 @@ _080E37AE: thumb_func_start sub_80E37B4 sub_80E37B4: @ 80E37B4 - ldr r1, _080E37D0 + ldr r1, =0x02039f94 ldr r1, [r1] - ldr r3, _080E37D4 + ldr r3, =0x00001e18 adds r2, r1, r3 movs r3, 0 strh r3, [r2] - ldr r2, _080E37D8 + ldr r2, =0x00001e1a adds r1, r2 strh r3, [r1] ldrh r1, [r0, 0x8] @@ -466055,9 +450649,7 @@ sub_80E37B4: @ 80E37B4 movs r0, 0 bx lr .align 2, 0 -_080E37D0: .4byte 0x02039f94 -_080E37D4: .4byte 0x00001e18 -_080E37D8: .4byte 0x00001e1a + .pool thumb_func_end sub_80E37B4 thumb_func_start sub_80E37DC @@ -466065,12 +450657,12 @@ sub_80E37DC: @ 80E37DC push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r5, _080E385C + ldr r5, =0x02039f94 ldr r0, [r5] - ldr r2, _080E3860 + ldr r2, =0x00001e1a adds r1, r0, r2 str r1, [sp] - ldr r1, _080E3864 + ldr r1, =0x00001e18 adds r0, r1 str r0, [sp, 0x4] ldrh r0, [r4, 0xA] @@ -466096,7 +450688,7 @@ sub_80E37DC: @ 80E37DC movs r1, 0x28 bl sine ldr r1, [r5] - ldr r2, _080E3868 + ldr r2, =0x00001e21 adds r1, r2 ldrb r1, [r1] lsls r1, 2 @@ -466108,7 +450700,7 @@ sub_80E37DC: @ 80E37DC cmp r0, 0x3F ble _080E3852 ldr r0, [r5] - ldr r1, _080E386C + ldr r1, =0x00001e1c adds r2, r0, r1 ldrb r3, [r2] adds r1, 0x2 @@ -466126,11 +450718,7 @@ _080E3852: pop {r1} bx r1 .align 2, 0 -_080E385C: .4byte 0x02039f94 -_080E3860: .4byte 0x00001e1a -_080E3864: .4byte 0x00001e18 -_080E3868: .4byte 0x00001e21 -_080E386C: .4byte 0x00001e1c + .pool thumb_func_end sub_80E37DC thumb_func_start sub_80E3870 @@ -466138,12 +450726,12 @@ sub_80E3870: @ 80E3870 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r5, _080E38F4 + ldr r5, =0x02039f94 ldr r0, [r5] - ldr r2, _080E38F8 + ldr r2, =0x00001e1a adds r1, r0, r2 str r1, [sp] - ldr r3, _080E38FC + ldr r3, =0x00001e18 adds r0, r3 str r0, [sp, 0x4] ldrh r0, [r4, 0xA] @@ -466169,7 +450757,7 @@ sub_80E3870: @ 80E3870 movs r1, 0x28 bl sine ldr r1, [r5] - ldr r3, _080E3900 + ldr r3, =0x00001e21 adds r1, r3 ldrb r1, [r1] lsls r1, 2 @@ -466201,16 +450789,13 @@ _080E38EA: pop {r1} bx r1 .align 2, 0 -_080E38F4: .4byte 0x02039f94 -_080E38F8: .4byte 0x00001e1a -_080E38FC: .4byte 0x00001e18 -_080E3900: .4byte 0x00001e21 + .pool thumb_func_end sub_80E3870 thumb_func_start sub_80E3904 sub_80E3904: @ 80E3904 push {lr} - ldr r0, _080E391C + ldr r0, =sub_80E375C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -466219,18 +450804,18 @@ sub_80E3904: @ 80E3904 pop {r1} bx r1 .align 2, 0 -_080E391C: .4byte sub_80E375C + 1 + .pool thumb_func_end sub_80E3904 thumb_func_start sub_80E3920 sub_80E3920: @ 80E3920 push {lr} - ldr r0, _080E3940 + ldr r0, =c3_0809E58C + 1 movs r1, 0x3 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080E3944 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -466240,8 +450825,7 @@ sub_80E3920: @ 80E3920 pop {r0} bx r0 .align 2, 0 -_080E3940: .4byte c3_0809E58C + 1 -_080E3944: .4byte 0x03005e00 + .pool thumb_func_end sub_80E3920 thumb_func_start sub_80E3948 @@ -466253,14 +450837,14 @@ sub_80E3948: @ 80E3948 lsrs r7, r1, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, _080E3980 + ldr r0, =c3_0809E58C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080E3984 + ldr r0, =0x03005e00 adds r4, r1, r0 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -466273,8 +450857,7 @@ sub_80E3948: @ 80E3948 strh r0, [r4, 0xC] b _080E39B4 .align 2, 0 -_080E3980: .4byte c3_0809E58C + 1 -_080E3984: .4byte 0x03005e00 + .pool _080E3988: cmp r5, 0x3 bne _080E3998 @@ -466312,7 +450895,7 @@ c3_0809E58C: @ 80E39BC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080E3A24 + ldr r0, =0x03005e00 adds r4, r1, r0 ldrh r1, [r4, 0x8] movs r2, 0x8 @@ -466358,7 +450941,7 @@ _080E3A08: adds r0, r2, r1 b _080E3A36 .align 2, 0 -_080E3A24: .4byte 0x03005e00 + .pool _080E3A28: movs r0, 0x10 strh r0, [r4, 0xE] @@ -466383,11 +450966,11 @@ _080E3A3C: ldrsh r0, [r4, r2] cmp r0, 0x16 bne _080E3A5C - ldr r0, _080E3A58 + ldr r0, =0x0000fffc strh r0, [r4, 0x10] b _080E3A6E .align 2, 0 -_080E3A58: .4byte 0x0000fffc + .pool _080E3A5C: lsls r0, r1, 16 asrs r1, r0, 16 @@ -466440,7 +451023,7 @@ sub_80E3A74: @ 80E3A74 bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 20 - ldr r1, _080E3AE4 + ldr r1, =0x00000101 adds r0, r1 mov r1, sp adds r1, 0xE @@ -466458,7 +451041,7 @@ sub_80E3A74: @ 80E3A74 pop {r1} bx r1 .align 2, 0 -_080E3AE4: .4byte 0x00000101 + .pool thumb_func_end sub_80E3A74 thumb_func_start sub_80E3AE8 @@ -466468,18 +451051,17 @@ sub_80E3AE8: @ 80E3AE8 lsrs r0, 24 bl sub_80E3A74 lsls r0, 16 - ldr r2, _080E3B08 + ldr r2, =0x02037b14 lsrs r0, 15 adds r2, r0, r2 - ldr r1, _080E3B0C + ldr r1, =0x02037714 adds r0, r1 ldrh r0, [r0] strh r0, [r2] pop {r0} bx r0 .align 2, 0 -_080E3B08: .4byte 0x02037b14 -_080E3B0C: .4byte 0x02037714 + .pool thumb_func_end sub_80E3AE8 thumb_func_start sub_80E3B10 @@ -466614,7 +451196,7 @@ _080E3BDE: bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 4 - ldr r2, _080E3C1C + ldr r2, =0x01010000 adds r0, r2 lsrs r0, 16 adds r1, r4, 0 @@ -466626,7 +451208,7 @@ _080E3C14: pop {r0} bx r0 .align 2, 0 -_080E3C1C: .4byte 0x01010000 + .pool thumb_func_end sub_80E3B30 thumb_func_start sub_80E3C20 @@ -466634,7 +451216,7 @@ sub_80E3C20: @ 80E3C20 push {r4,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r1, _080E3C68 + ldr r1, =0x0858bed4 mov r0, sp movs r2, 0x8 bl memcpy @@ -466668,7 +451250,7 @@ _080E3C52: pop {r0} bx r0 .align 2, 0 -_080E3C68: .4byte 0x0858bed4 + .pool thumb_func_end sub_80E3C20 thumb_func_start sub_80E3C6C @@ -466676,7 +451258,7 @@ sub_80E3C6C: @ 80E3C6C push {r4,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r1, _080E3C94 + ldr r1, =0x0858bedc mov r0, sp movs r2, 0x8 bl memcpy @@ -466691,7 +451273,7 @@ sub_80E3C6C: @ 80E3C6C strh r0, [r4, 0x30] b _080E3CBE .align 2, 0 -_080E3C94: .4byte 0x0858bedc + .pool _080E3C98: movs r1, 0x30 ldrsh r0, [r4, r1] @@ -466736,19 +451318,19 @@ sub_80E3CC8: @ 80E3CC8 thumb_func_start sub_80E3CE4 sub_80E3CE4: @ 80E3CE4 push {r4-r6,lr} - ldr r0, _080E3D68 + ldr r0, =0x0858c138 movs r1, 0x26 movs r2, 0x58 movs r3, 0x1 bl obj_add_from_template_forward_search - ldr r5, _080E3D6C + ldr r5, =0x02039f94 ldr r1, [r5] - ldr r4, _080E3D70 + ldr r4, =0x00001e23 adds r1, r4 strb r0, [r1] movs r0, 0x1 bl sub_80E3E3C - ldr r6, _080E3D74 + ldr r6, =0x02020630 ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -466798,10 +451380,7 @@ sub_80E3CE4: @ 80E3CE4 pop {r0} bx r0 .align 2, 0 -_080E3D68: .4byte 0x0858c138 -_080E3D6C: .4byte 0x02039f94 -_080E3D70: .4byte 0x00001e23 -_080E3D74: .4byte 0x02020630 + .pool thumb_func_end sub_80E3CE4 thumb_func_start sub_80E3D78 @@ -466812,20 +451391,20 @@ sub_80E3D78: @ 80E3D78 lsls r0, 16 lsls r1, 16 lsrs r7, r1, 16 - ldr r1, _080E3DC4 + ldr r1, =0x02039f94 ldr r1, [r1] - ldr r2, _080E3DC8 + ldr r2, =0x00001e23 adds r1, r2 ldrb r2, [r1] lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, _080E3DCC + ldr r2, =0x02020630 adds r5, r1, r2 lsrs r1, r0, 16 mov r8, r1 asrs r6, r0, 16 - ldr r4, _080E3DD0 + ldr r4, =0x0858bea0 bl sub_80E3274 lsls r0, 24 lsrs r0, 24 @@ -466834,7 +451413,7 @@ sub_80E3D78: @ 80E3D78 cmp r6, r0 bge _080E3DD8 bl sub_80E3274 - ldr r1, _080E3DD4 + ldr r1, =0x0858bea3 lsls r0, 24 lsrs r0, 21 adds r0, r6, r0 @@ -466843,11 +451422,7 @@ sub_80E3D78: @ 80E3D78 adds r0, 0x26 b _080E3DDA .align 2, 0 -_080E3DC4: .4byte 0x02039f94 -_080E3DC8: .4byte 0x00001e23 -_080E3DCC: .4byte 0x02020630 -_080E3DD0: .4byte 0x0858bea0 -_080E3DD4: .4byte 0x0858bea3 + .pool _080E3DD8: movs r0, 0 _080E3DDA: @@ -466872,15 +451447,15 @@ _080E3DDA: thumb_func_start sub_80E3DFC sub_80E3DFC: @ 80E3DFC - ldr r2, _080E3E1C + ldr r2, =0x02039f94 ldr r2, [r2] - ldr r3, _080E3E20 + ldr r3, =0x00001e23 adds r2, r3 ldrb r3, [r2] lsls r2, r3, 4 adds r2, r3 lsls r2, 2 - ldr r3, _080E3E24 + ldr r3, =0x02020630 adds r2, r3 ldrh r3, [r2, 0x2E] strh r3, [r0] @@ -466888,9 +451463,7 @@ sub_80E3DFC: @ 80E3DFC strh r0, [r1] bx lr .align 2, 0 -_080E3E1C: .4byte 0x02039f94 -_080E3E20: .4byte 0x00001e23 -_080E3E24: .4byte 0x02020630 + .pool thumb_func_end sub_80E3DFC thumb_func_start sub_80E3E28 @@ -466910,10 +451483,10 @@ sub_80E3E3C: @ 80E3E3C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _080E3E84 - ldr r1, _080E3E88 + ldr r5, =0x02020630 + ldr r1, =0x02039f94 ldr r4, [r1] - ldr r1, _080E3E8C + ldr r1, =0x00001e23 adds r4, r1 ldrb r1, [r4] lsls r2, r1, 4 @@ -466921,7 +451494,7 @@ sub_80E3E3C: @ 80E3E3C lsls r2, 2 adds r2, r5 ldrh r3, [r2, 0x36] - ldr r1, _080E3E90 + ldr r1, =0xffffff00 ands r1, r3 strh r1, [r2, 0x36] ldrb r2, [r4] @@ -466943,20 +451516,17 @@ sub_80E3E3C: @ 80E3E3C pop {r0} bx r0 .align 2, 0 -_080E3E84: .4byte 0x02020630 -_080E3E88: .4byte 0x02039f94 -_080E3E8C: .4byte 0x00001e23 -_080E3E90: .4byte 0xffffff00 + .pool thumb_func_end sub_80E3E3C thumb_func_start sub_80E3E94 sub_80E3E94: @ 80E3E94 push {r4,r5,lr} lsls r0, 24 - ldr r5, _080E3ECC - ldr r1, _080E3ED0 + ldr r5, =0x02020630 + ldr r1, =0x02039f94 ldr r4, [r1] - ldr r1, _080E3ED4 + ldr r1, =0x00001e23 adds r4, r1 ldrb r1, [r4] lsls r2, r1, 4 @@ -466980,40 +451550,36 @@ sub_80E3E94: @ 80E3E94 pop {r0} bx r0 .align 2, 0 -_080E3ECC: .4byte 0x02020630 -_080E3ED0: .4byte 0x02039f94 -_080E3ED4: .4byte 0x00001e23 + .pool thumb_func_end sub_80E3E94 thumb_func_start sub_80E3ED8 sub_80E3ED8: @ 80E3ED8 push {lr} - ldr r0, _080E3EF8 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E3EFC + ldr r1, =0x00001e23 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080E3F00 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 bl obj_anim_image_start pop {r0} bx r0 .align 2, 0 -_080E3EF8: .4byte 0x02039f94 -_080E3EFC: .4byte 0x00001e23 -_080E3F00: .4byte 0x02020630 + .pool thumb_func_end sub_80E3ED8 thumb_func_start sub_80E3F04 sub_80E3F04: @ 80E3F04 - ldr r2, _080E3F24 - ldr r0, _080E3F28 + ldr r2, =0x02020630 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E3F2C + ldr r1, =0x00001e23 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -467026,9 +451592,7 @@ sub_80E3F04: @ 80E3F04 lsrs r0, 31 bx lr .align 2, 0 -_080E3F24: .4byte 0x02020630 -_080E3F28: .4byte 0x02039f94 -_080E3F2C: .4byte 0x00001e23 + .pool thumb_func_end sub_80E3F04 thumb_func_start sub_80E3F30 @@ -467048,14 +451612,14 @@ sub_80E3F30: @ 80E3F30 lsrs r0, 24 cmp r4, r0 blt _080E3F64 - ldr r0, _080E3F60 + ldr r0, =0x0858bee4 movs r2, 0 ldrsh r1, [r5, r2] adds r1, r0 ldrb r0, [r1] b _080E3F66 .align 2, 0 -_080E3F60: .4byte 0x0858bee4 + .pool _080E3F64: movs r0, 0 _080E3F66: @@ -467068,7 +451632,7 @@ _080E3F66: thumb_func_start sub_80E3F70 sub_80E3F70: @ 80E3F70 push {r4,lr} - ldr r4, _080E3F88 + ldr r4, =0x0858bea0 bl sub_80E3274 lsls r0, 24 lsrs r0, 24 @@ -467078,7 +451642,7 @@ sub_80E3F70: @ 80E3F70 pop {r1} bx r1 .align 2, 0 -_080E3F88: .4byte 0x0858bea0 + .pool thumb_func_end sub_80E3F70 thumb_func_start sub_80E3F8C @@ -467086,25 +451650,25 @@ sub_80E3F8C: @ 80E3F8C push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _080E4030 + ldr r0, =0x0858c0c0 movs r1, 0xCC movs r2, 0x58 movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _080E4034 + ldr r1, =0x02039f94 ldr r1, [r1] - ldr r2, _080E4038 + ldr r2, =0x00001e24 adds r1, r2 strb r0, [r1] lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, _080E403C + ldr r0, =0x02020630 mov r8, r0 add r5, r8 - ldr r1, _080E4040 + ldr r1, =0x0858c050 adds r0, r5, 0 bl obj_set_f18_to_r0_f42_to_40 adds r1, r5, 0 @@ -467113,7 +451677,7 @@ sub_80E3F8C: @ 80E3F8C movs r6, 0x4 orrs r0, r6 strb r0, [r1] - ldr r0, _080E4044 + ldr r0, =0x0858c0f0 movs r1, 0xCC movs r2, 0x54 movs r3, 0x1 @@ -467125,14 +451689,14 @@ sub_80E3F8C: @ 80E3F8C adds r4, r0 lsls r4, 2 add r4, r8 - ldr r1, _080E4048 + ldr r1, =0x0858c058 adds r0, r4, 0 bl obj_set_f18_to_r0_f42_to_40 adds r4, 0x3E ldrb r0, [r4] orrs r0, r6 strb r0, [r4] - ldr r0, _080E404C + ldr r0, =0x0858c0d8 movs r1, 0xCC movs r2, 0x53 movs r3, 0x2 @@ -467160,47 +451724,37 @@ sub_80E3F8C: @ 80E3F8C pop {r0} bx r0 .align 2, 0 -_080E4030: .4byte 0x0858c0c0 -_080E4034: .4byte 0x02039f94 -_080E4038: .4byte 0x00001e24 -_080E403C: .4byte 0x02020630 -_080E4040: .4byte 0x0858c050 -_080E4044: .4byte 0x0858c0f0 -_080E4048: .4byte 0x0858c058 -_080E404C: .4byte 0x0858c0d8 + .pool thumb_func_end sub_80E3F8C thumb_func_start sub_80E4050 sub_80E4050: @ 80E4050 - ldr r0, _080E4074 + ldr r0, =0x02039f94 ldr r2, [r0] - ldr r1, _080E4078 + ldr r1, =0x00001e24 adds r0, r2, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080E407C + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x2 strh r1, [r0, 0x2E] - ldr r1, _080E4080 + ldr r1, =0x00001e22 adds r2, r1 ldrb r1, [r2] strh r1, [r0, 0x30] bx lr .align 2, 0 -_080E4074: .4byte 0x02039f94 -_080E4078: .4byte 0x00001e24 -_080E407C: .4byte 0x02020630 -_080E4080: .4byte 0x00001e22 + .pool thumb_func_end sub_80E4050 thumb_func_start sub_80E4084 sub_80E4084: @ 80E4084 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080E40A8 + ldr r5, =0x0858bee8 _080E408A: movs r1, 0x2E ldrsh r0, [r4, r1] @@ -467216,7 +451770,7 @@ _080E408A: pop {r0} bx r0 .align 2, 0 -_080E40A8: .4byte 0x0858bee8 + .pool thumb_func_end sub_80E4084 thumb_func_start sub_80E40AC @@ -467228,7 +451782,7 @@ sub_80E40AC: @ 80E40AC lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r1, _080E40F4 + ldr r1, =0x02020630 adds r5, r1 movs r2, 0x3C ldrsh r0, [r6, r2] @@ -467236,9 +451790,9 @@ sub_80E40AC: @ 80E40AC adds r4, r0 lsls r4, 2 adds r4, r1 - ldr r0, _080E40F8 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E40FC + ldr r1, =0x00001e22 adds r0, r1 ldrb r0, [r0] bl sub_80E3244 @@ -467255,9 +451809,7 @@ sub_80E40AC: @ 80E40AC pop {r1} bx r1 .align 2, 0 -_080E40F4: .4byte 0x02020630 -_080E40F8: .4byte 0x02039f94 -_080E40FC: .4byte 0x00001e22 + .pool thumb_func_end sub_80E40AC thumb_func_start sub_80E4100 @@ -467275,7 +451827,7 @@ sub_80E4104: @ 80E4104 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r2, _080E4170 + ldr r2, =0x02020630 adds r4, r0, r2 movs r0, 0x3C ldrsh r1, [r3, r0] @@ -467293,7 +451845,7 @@ sub_80E4104: @ 80E4104 ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] - ldr r0, _080E4174 + ldr r0, =0x0000fffc strh r0, [r4, 0x26] adds r2, r4, 0 adds r2, 0x3E @@ -467321,8 +451873,7 @@ _080E4168: pop {r1} bx r1 .align 2, 0 -_080E4170: .4byte 0x02020630 -_080E4174: .4byte 0x0000fffc + .pool thumb_func_end sub_80E4104 thumb_func_start sub_80E4178 @@ -467334,7 +451885,7 @@ sub_80E4178: @ 80E4178 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080E41B4 + ldr r1, =0x02020630 adds r2, r0, r1 adds r3, r2, 0 adds r3, 0x3E @@ -467359,7 +451910,7 @@ _080E41AC: pop {r1} bx r1 .align 2, 0 -_080E41B4: .4byte 0x02020630 + .pool thumb_func_end sub_80E4178 thumb_func_start sub_80E41B8 @@ -467372,7 +451923,7 @@ sub_80E41B8: @ 80E41B8 mov r8, r2 lsls r5, 24 lsrs r5, 24 - ldr r0, _080E4210 + ldr r0, =0x0858bef8 lsls r4, r5, 1 adds r0, r4, r0 ldrh r0, [r0] @@ -467385,7 +451936,7 @@ sub_80E41B8: @ 80E41B8 orrs r1, r0 mov r0, r8 strb r1, [r0, 0x5] - ldr r0, _080E4214 + ldr r0, =0x0858befe adds r4, r0 ldrh r0, [r4] bl gpu_tile_obj_tag_get_range_start @@ -467407,8 +451958,7 @@ sub_80E41B8: @ 80E41B8 pop {r0} bx r0 .align 2, 0 -_080E4210: .4byte 0x0858bef8 -_080E4214: .4byte 0x0858befe + .pool thumb_func_end sub_80E41B8 thumb_func_start sub_80E4218 @@ -467416,7 +451966,7 @@ sub_80E4218: @ 80E4218 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _080E4280 + ldr r0, =0x0858c108 movs r1, 0xCC movs r2, 0x74 movs r3, 0 @@ -467426,9 +451976,9 @@ sub_80E4218: @ 80E4218 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r6, _080E4284 + ldr r6, =0x02020630 adds r4, r6 - ldr r0, _080E4288 + ldr r0, =0x0858c070 mov r8, r0 adds r0, r4, 0 mov r1, r8 @@ -467438,7 +451988,7 @@ sub_80E4218: @ 80E4218 movs r5, 0x4 orrs r0, r5 strb r0, [r4] - ldr r0, _080E428C + ldr r0, =0x0858c120 movs r1, 0xCC movs r2, 0x8C movs r3, 0 @@ -467462,22 +452012,19 @@ sub_80E4218: @ 80E4218 pop {r0} bx r0 .align 2, 0 -_080E4280: .4byte 0x0858c108 -_080E4284: .4byte 0x02020630 -_080E4288: .4byte 0x0858c070 -_080E428C: .4byte 0x0858c120 + .pool thumb_func_end sub_80E4218 thumb_func_start sub_80E4290 sub_80E4290: @ 80E4290 push {r4-r6,lr} - ldr r5, _080E433C + ldr r5, =0x02039f94 ldr r0, [r5] - ldr r4, _080E4340 + ldr r4, =0x00001e16 adds r0, r4 ldrh r1, [r0] subs r1, 0x5 - ldr r0, _080E4344 + ldr r0, =0x0858c150 lsls r1, 16 asrs r1, 16 movs r2, 0x38 @@ -467485,7 +452032,7 @@ sub_80E4290: @ 80E4290 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r1, r0, 24 - ldr r3, _080E4348 + ldr r3, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -467503,7 +452050,7 @@ sub_80E4290: @ 80E4290 adds r4, r0, r4 ldrh r1, [r4] movs r5, 0 - ldr r2, _080E434C + ldr r2, =0x00001e28 adds r0, r2 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -467517,7 +452064,7 @@ _080E42E2: lsls r0, 10 adds r1, r0 asrs r1, 16 - ldr r0, _080E4350 + ldr r0, =0x0858c168 movs r2, 0x3C movs r3, 0 bl obj_add_from_template_forward_search @@ -467543,9 +452090,9 @@ _080E42E2: adds r4, 0x8 lsls r4, 16 lsrs r1, r4, 16 - ldr r0, _080E433C + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r2, _080E434C + ldr r2, =0x00001e28 adds r0, r2 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -467556,21 +452103,16 @@ _080E4334: pop {r0} bx r0 .align 2, 0 -_080E433C: .4byte 0x02039f94 -_080E4340: .4byte 0x00001e16 -_080E4344: .4byte 0x0858c150 -_080E4348: .4byte 0x02020630 -_080E434C: .4byte 0x00001e28 -_080E4350: .4byte 0x0858c168 + .pool thumb_func_end sub_80E4290 thumb_func_start sub_80E4354 sub_80E4354: @ 80E4354 push {lr} - ldr r1, _080E4374 - ldr r0, _080E4378 + ldr r1, =0x0858bf04 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r2, _080E437C + ldr r2, =0x00001e28 adds r0, r2 ldr r0, [r0] ldrb r0, [r0, 0x2] @@ -467581,9 +452123,7 @@ sub_80E4354: @ 80E4354 pop {r0} bx r0 .align 2, 0 -_080E4374: .4byte 0x0858bf04 -_080E4378: .4byte 0x02039f94 -_080E437C: .4byte 0x00001e28 + .pool thumb_func_end sub_80E4354 thumb_func_start nullsub_42 @@ -467595,16 +452135,16 @@ nullsub_42: @ 80E4380 sub_80E4384: @ 80E4384 push {lr} sub sp, 0x4 - ldr r0, _080E43D0 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E43D4 + ldr r1, =0x00001e34 adds r0, r1 ldrb r1, [r0] movs r0, 0 bl sub_808BD3C lsls r0, 24 lsrs r0, 24 - ldr r1, _080E43D8 + ldr r1, =nullsub_12 + 1 movs r2, 0 str r2, [sp] movs r2, 0x38 @@ -467613,7 +452153,7 @@ sub_80E4384: @ 80E4384 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _080E43DC + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -467628,16 +452168,13 @@ sub_80E4384: @ 80E4384 pop {r0} bx r0 .align 2, 0 -_080E43D0: .4byte 0x02039f94 -_080E43D4: .4byte 0x00001e34 -_080E43D8: .4byte nullsub_12 + 1 -_080E43DC: .4byte 0x02020630 + .pool thumb_func_end sub_80E4384 thumb_func_start sub_80E43E0 sub_80E43E0: @ 80E43E0 push {r4,lr} - ldr r0, _080E4414 + ldr r0, =0x0858c180 movs r1, 0x38 movs r2, 0x29 movs r3, 0 @@ -467647,9 +452184,9 @@ sub_80E43E0: @ 80E43E0 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080E4418 + ldr r0, =0x02020630 adds r4, r0 - ldr r1, _080E441C + ldr r1, =0x0858c078 adds r0, r4, 0 bl obj_set_f18_to_r0_f42_to_40 ldrb r0, [r4, 0x5] @@ -467660,9 +452197,7 @@ sub_80E43E0: @ 80E43E0 pop {r0} bx r0 .align 2, 0 -_080E4414: .4byte 0x0858c180 -_080E4418: .4byte 0x02020630 -_080E441C: .4byte 0x0858c078 + .pool thumb_func_end sub_80E43E0 thumb_func_start sub_80E4420 @@ -467670,15 +452205,15 @@ sub_80E4420: @ 80E4420 push {lr} sub sp, 0xC bl sub_80D2F04 - ldr r0, _080E4468 + ldr r0, =0x02039f94 ldr r3, [r0] - ldr r1, _080E446C + ldr r1, =0x00001e34 adds r0, r3, r1 ldrh r0, [r0] - ldr r1, _080E4470 + ldr r1, =nullsub_12 + 1 movs r2, 0 str r2, [sp] - ldr r2, _080E4474 + ldr r2, =0x00001e38 adds r3, r2 ldr r2, [r3] str r2, [sp, 0x4] @@ -467689,7 +452224,7 @@ sub_80E4420: @ 80E4420 bl sub_80D2CC4 lsls r0, 24 lsrs r0, 24 - ldr r2, _080E4478 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -467702,18 +452237,14 @@ sub_80E4420: @ 80E4420 pop {r0} bx r0 .align 2, 0 -_080E4468: .4byte 0x02039f94 -_080E446C: .4byte 0x00001e34 -_080E4470: .4byte nullsub_12 + 1 -_080E4474: .4byte 0x00001e38 -_080E4478: .4byte 0x02020630 + .pool thumb_func_end sub_80E4420 thumb_func_start sub_80E447C sub_80E447C: @ 80E447C push {lr} sub sp, 0x4 - ldr r1, _080E44B4 + ldr r1, =nullsub_12 + 1 movs r0, 0 str r0, [sp] movs r0, 0x13 @@ -467723,7 +452254,7 @@ sub_80E447C: @ 80E447C adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _080E44B8 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -467738,8 +452269,7 @@ sub_80E447C: @ 80E447C pop {r0} bx r0 .align 2, 0 -_080E44B4: .4byte nullsub_12 + 1 -_080E44B8: .4byte 0x02020630 + .pool thumb_func_end sub_80E447C thumb_func_start sub_80E44BC @@ -467764,7 +452294,7 @@ _080E44DA: _080E44E4: cmp r5, 0x9 beq _080E4500 - ldr r1, _080E44FC + ldr r1, =0x0858bf18 lsls r0, 2 adds r0, r1 ldr r1, [r0] @@ -467775,7 +452305,7 @@ _080E44F6: lsrs r0, 24 b _080E4506 .align 2, 0 -_080E44FC: .4byte 0x0858bf18 + .pool _080E4500: bl sub_80E3E28 _080E4504: @@ -467807,9 +452337,9 @@ sub_80E450C: @ 80E450C beq _080E4546 movs r0, 0x2 bl sub_80E4630 - ldr r0, _080E4550 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E4554 + ldr r1, =0x00001e10 adds r0, r1 movs r1, 0x3 strb r1, [r0] @@ -467819,8 +452349,7 @@ _080E4546: pop {r1} bx r1 .align 2, 0 -_080E4550: .4byte 0x02039f94 -_080E4554: .4byte 0x00001e10 + .pool thumb_func_end sub_80E450C thumb_func_start sub_80E4558 @@ -467884,9 +452413,9 @@ sub_80E45A4: @ 80E45A4 _080E45BE: movs r0, 0x5 bl audio_play - ldr r0, _080E45D8 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E45DC + ldr r1, =0x00001e10 adds r0, r1 movs r1, 0x6 strb r1, [r0] @@ -467896,45 +452425,43 @@ _080E45D2: pop {r1} bx r1 .align 2, 0 -_080E45D8: .4byte 0x02039f94 -_080E45DC: .4byte 0x00001e10 + .pool thumb_func_end sub_80E45A4 thumb_func_start sub_80E45E0 sub_80E45E0: @ 80E45E0 - ldr r0, _080E45F0 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r1, _080E45F4 + ldr r1, =0x00001e10 adds r0, r1 movs r1, 0x4 strb r1, [r0] movs r0, 0x1 bx lr .align 2, 0 -_080E45F0: .4byte 0x02039f94 -_080E45F4: .4byte 0x00001e10 + .pool thumb_func_end sub_80E45E0 thumb_func_start sub_80E45F8 sub_80E45F8: @ 80E45F8 push {lr} - ldr r0, _080E4608 + ldr r0, =sub_80E465C + 1 movs r1, 0x1 bl AddTask pop {r0} bx r0 .align 2, 0 -_080E4608: .4byte sub_80E465C + 1 + .pool thumb_func_end sub_80E45F8 thumb_func_start sub_80E460C sub_80E460C: @ 80E460C push {lr} - ldr r0, _080E4628 + ldr r0, =sub_80E465C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 - ldr r2, _080E462C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -467943,8 +452470,7 @@ sub_80E460C: @ 80E460C pop {r1} bx r1 .align 2, 0 -_080E4628: .4byte sub_80E465C + 1 -_080E462C: .4byte 0x03005e00 + .pool thumb_func_end sub_80E460C thumb_func_start sub_80E4630 @@ -467953,11 +452479,11 @@ sub_80E4630: @ 80E4630 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080E4654 + ldr r0, =sub_80E465C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 - ldr r2, _080E4658 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -467967,8 +452493,7 @@ sub_80E4630: @ 80E4630 pop {r0} bx r0 .align 2, 0 -_080E4654: .4byte sub_80E465C + 1 -_080E4658: .4byte 0x03005e00 + .pool thumb_func_end sub_80E4630 thumb_func_start sub_80E465C @@ -467977,8 +452502,8 @@ sub_80E465C: @ 80E465C adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _080E4684 - ldr r2, _080E4688 + ldr r3, =0x0858bf28 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -467992,8 +452517,7 @@ sub_80E465C: @ 80E465C pop {r0} bx r0 .align 2, 0 -_080E4684: .4byte 0x0858bf28 -_080E4688: .4byte 0x03005e00 + .pool thumb_func_end sub_80E465C thumb_func_start sub_80E468C @@ -468009,7 +452533,7 @@ sub_80E4692: @ 80E4692 adds r2, r0, 0 movs r0, 0 strh r0, [r2, 0xA] - ldr r0, _080E46B0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -468019,7 +452543,7 @@ sub_80E4692: @ 80E4692 strh r0, [r2, 0xA] b _080E46E4 .align 2, 0 -_080E46B0: .4byte 0x030022c0 + .pool _080E46B4: movs r0, 0x2 ands r0, r1 @@ -468068,26 +452592,26 @@ sub_80E46F0: @ 80E46F0 push {r5-r7} sub sp, 0x34 mov r9, r0 - ldr r1, _080E47DC + ldr r1, =0x0858bf34 mov r0, sp movs r2, 0xA bl memcpy add r0, sp, 0xC mov r10, r0 - ldr r1, _080E47E0 + ldr r1, =0x0858bf3e movs r2, 0xA bl memcpy mov r1, sp adds r1, 0x18 str r1, [sp, 0x2C] - ldr r1, _080E47E4 + ldr r1, =0x0858bf48 ldr r0, [sp, 0x2C] movs r2, 0x8 bl memcpy mov r2, sp adds r2, 0x20 str r2, [sp, 0x30] - ldr r1, _080E47E8 + ldr r1, =0x0858bf50 adds r0, r2, 0 movs r2, 0x6 bl memcpy @@ -468097,7 +452621,7 @@ sub_80E46F0: @ 80E46F0 adds r0, r4, 0 adds r1, r5, 0 bl sub_80E3DFC - ldr r0, _080E47EC + ldr r0, =0x030022c0 ldrh r2, [r0, 0x30] movs r0, 0x40 ands r0, r2 @@ -468177,11 +452701,7 @@ _080E47B2: adds r0, r1, r0 b _080E481A .align 2, 0 -_080E47DC: .4byte 0x0858bf34 -_080E47E0: .4byte 0x0858bf3e -_080E47E4: .4byte 0x0858bf48 -_080E47E8: .4byte 0x0858bf50 -_080E47EC: .4byte 0x030022c0 + .pool _080E47F0: mov r2, r8 lsls r4, r2, 16 @@ -468278,9 +452798,9 @@ _080E4878: sub_80E4894: @ 80E4894 push {r4,r5,lr} sub sp, 0xC - ldr r5, _080E48DC + ldr r5, =0x02039f94 ldr r0, [r5] - ldr r4, _080E48E0 + ldr r4, =0x00001e14 adds r0, r4 ldrb r0, [r0] movs r1, 0x11 @@ -468288,7 +452808,7 @@ sub_80E4894: @ 80E4894 ldr r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _080E48E4 + ldr r2, =0x00001e28 adds r1, r2 ldr r1, [r1] ldr r2, [r1, 0x8] @@ -468309,28 +452829,26 @@ sub_80E4894: @ 80E4894 pop {r0} bx r0 .align 2, 0 -_080E48DC: .4byte 0x02039f94 -_080E48E0: .4byte 0x00001e14 -_080E48E4: .4byte 0x00001e28 + .pool thumb_func_end sub_80E4894 thumb_func_start sub_80E48E8 sub_80E48E8: @ 80E48E8 push {r4,r5,lr} sub sp, 0x2C - ldr r5, _080E4950 + ldr r5, =0x02039f94 ldr r0, [r5] - ldr r1, _080E4954 + ldr r1, =0x00001e34 adds r0, r1 ldrh r1, [r0] movs r0, 0xB muls r1, r0 - ldr r0, _080E4958 + ldr r0, =0x083185c8 adds r1, r0 add r0, sp, 0xC bl gf_strcpy ldr r0, [r5] - ldr r1, _080E495C + ldr r1, =0x00001e28 adds r0, r1 ldr r0, [r0] ldr r1, [r0, 0x8] @@ -468338,7 +452856,7 @@ sub_80E48E8: @ 80E48E8 movs r2, 0xF bl sub_8008C08 ldr r0, [r5] - ldr r4, _080E4960 + ldr r4, =0x00001e14 adds r0, r4 ldrb r0, [r0] movs r1, 0x11 @@ -468364,20 +452882,16 @@ sub_80E48E8: @ 80E48E8 pop {r0} bx r0 .align 2, 0 -_080E4950: .4byte 0x02039f94 -_080E4954: .4byte 0x00001e34 -_080E4958: .4byte 0x083185c8 -_080E495C: .4byte 0x00001e28 -_080E4960: .4byte 0x00001e14 + .pool thumb_func_end sub_80E48E8 thumb_func_start sub_80E4964 sub_80E4964: @ 80E4964 push {lr} - ldr r1, _080E4980 - ldr r0, _080E4984 + ldr r1, =0x0858bf58 + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r2, _080E4988 + ldr r2, =0x00001e2c adds r0, r2 ldrb r0, [r0] lsls r0, 2 @@ -468387,18 +452901,16 @@ sub_80E4964: @ 80E4964 pop {r0} bx r0 .align 2, 0 -_080E4980: .4byte 0x0858bf58 -_080E4984: .4byte 0x02039f94 -_080E4988: .4byte 0x00001e2c + .pool thumb_func_end sub_80E4964 thumb_func_start sub_80E498C sub_80E498C: @ 80E498C push {lr} - ldr r1, _080E49AC - ldr r0, _080E49B0 + ldr r1, =0x0858bf6c + ldr r0, =0x02039f94 ldr r0, [r0] - ldr r2, _080E49B4 + ldr r2, =0x00001e28 adds r0, r2 ldr r0, [r0] ldrb r0, [r0, 0x3] @@ -468409,9 +452921,7 @@ sub_80E498C: @ 80E498C pop {r0} bx r0 .align 2, 0 -_080E49AC: .4byte 0x0858bf6c -_080E49B0: .4byte 0x02039f94 -_080E49B4: .4byte 0x00001e28 + .pool thumb_func_end sub_80E498C thumb_func_start nullsub_43 @@ -468424,30 +452934,30 @@ sub_80E49BC: @ 80E49BC push {r4,r5,lr} sub sp, 0x10 movs r4, 0 - ldr r1, _080E4A14 + ldr r1, =0x085e8d49 add r0, sp, 0xC bl gf_strcpy - ldr r5, _080E4A18 + ldr r5, =0x02039f94 ldr r0, [r5] - ldr r1, _080E4A1C + ldr r1, =0x00001e36 adds r0, r1 ldrh r0, [r0] cmp r0, 0xFF beq _080E4A0C cmp r0, 0xFE bne _080E49E6 - ldr r1, _080E4A20 + ldr r1, =0x085e8d4b add r0, sp, 0xC bl gf_strcpy movs r4, 0x1 _080E49E6: ldr r0, [r5] - ldr r1, _080E4A24 + ldr r1, =0x00001e13 adds r0, r1 ldrb r0, [r0] lsls r1, r4, 1 adds r1, r4 - ldr r2, _080E4A28 + ldr r2, =0x0858bf74 adds r1, r2 str r1, [sp] movs r1, 0x1 @@ -468465,12 +452975,7 @@ _080E4A0C: pop {r0} bx r0 .align 2, 0 -_080E4A14: .4byte 0x085e8d49 -_080E4A18: .4byte 0x02039f94 -_080E4A1C: .4byte 0x00001e36 -_080E4A20: .4byte 0x085e8d4b -_080E4A24: .4byte 0x00001e13 -_080E4A28: .4byte 0x0858bf74 + .pool thumb_func_end sub_80E49BC thumb_func_start sub_80E4A2C @@ -468482,7 +452987,7 @@ sub_80E4A2C: @ 80E4A2C lsrs r4, 16 lsls r5, 16 lsrs r5, 16 - ldr r6, _080E4A5C + ldr r6, =0x0858be40 bl sub_80E3274 lsls r4, 16 asrs r4, 16 @@ -468498,16 +453003,16 @@ sub_80E4A2C: @ 80E4A2C pop {r1} bx r1 .align 2, 0 -_080E4A5C: .4byte 0x0858be40 + .pool thumb_func_end sub_80E4A2C thumb_func_start sub_80E4A60 sub_80E4A60: @ 80E4A60 push {r4,r5,lr} movs r2, 0 - ldr r0, _080E4A88 + ldr r0, =0x02039f94 ldr r4, [r0] - ldr r3, _080E4A8C + ldr r3, =0x00001e28 adds r1, r4, r3 ldr r1, [r1] ldrb r3, [r1, 0x1] @@ -468525,8 +453030,7 @@ _080E4A7C: adds r0, r2, 0 b _080E4AAA .align 2, 0 -_080E4A88: .4byte 0x02039f94 -_080E4A8C: .4byte 0x00001e28 + .pool _080E4A90: adds r0, r2, 0x1 lsls r0, 24 @@ -468535,7 +453039,7 @@ _080E4A90: bcc _080E4A7C _080E4A9A: ldr r0, [r5] - ldr r1, _080E4AB0 + ldr r1, =0x00001e28 adds r0, r1 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -468547,15 +453051,15 @@ _080E4AAA: pop {r1} bx r1 .align 2, 0 -_080E4AB0: .4byte 0x00001e28 + .pool thumb_func_end sub_80E4A60 thumb_func_start sub_80E4AB4 sub_80E4AB4: @ 80E4AB4 push {lr} - ldr r0, _080E4AE0 + ldr r0, =0x02039f94 ldr r2, [r0] - ldr r1, _080E4AE4 + ldr r1, =0x00001e28 adds r0, r2, r1 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -468575,8 +453079,7 @@ _080E4AD0: lsrs r0, r1, 24 b _080E4AF2 .align 2, 0 -_080E4AE0: .4byte 0x02039f94 -_080E4AE4: .4byte 0x00001e28 + .pool _080E4AE8: subs r0, r2, 0x1 lsls r1, r0, 24 @@ -468596,7 +453099,7 @@ sub_80E4AF8: @ 80E4AF8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r6, _080E4B50 + ldr r6, =0x02039f94 ldr r0, [r6] movs r5, 0xC0 lsls r5, 5 @@ -468631,7 +453134,7 @@ _080E4B42: pop {r0} bx r0 .align 2, 0 -_080E4B50: .4byte 0x02039f94 + .pool thumb_func_end sub_80E4AF8 thumb_func_start sub_80E4B54 @@ -468660,9 +453163,9 @@ sub_80E4B54: @ 80E4B54 bl sub_80E4AB4 lsls r0, 24 lsrs r0, 24 - ldr r1, _080E4BA8 + ldr r1, =0x02039f94 ldr r1, [r1] - ldr r2, _080E4BAC + ldr r2, =0x00001e28 adds r1, r2 ldr r1, [r1] ldrb r1, [r1, 0x1] @@ -468672,8 +453175,7 @@ sub_80E4B54: @ 80E4B54 movs r0, 0x1 b _080E4BB2 .align 2, 0 -_080E4BA8: .4byte 0x02039f94 -_080E4BAC: .4byte 0x00001e28 + .pool _080E4BB0: movs r0, 0 _080E4BB2: @@ -468692,7 +453194,7 @@ sub_80E4BBC: @ 80E4BBC bl sub_80E4A60 lsls r0, 24 lsrs r0, 24 - ldr r1, _080E4BE0 + ldr r1, =0x02039f94 ldr r1, [r1] movs r2, 0xC0 lsls r2, 5 @@ -468703,23 +453205,22 @@ sub_80E4BBC: @ 80E4BBC pop {r0} bx r0 .align 2, 0 -_080E4BE0: .4byte 0x02039f94 + .pool thumb_func_end sub_80E4BBC thumb_func_start sub_80E4BE4 sub_80E4BE4: @ 80E4BE4 push {r4,r5,lr} movs r2, 0 - ldr r1, _080E4BF8 + ldr r1, =0x02039f94 ldr r0, [r1] - ldr r4, _080E4BFC + ldr r4, =0x00001e28 adds r0, r4 ldr r0, [r0] adds r5, r1, 0 b _080E4C44 .align 2, 0 -_080E4BF8: .4byte 0x02039f94 -_080E4BFC: .4byte 0x00001e28 + .pool _080E4C00: ldr r1, [r1] movs r0, 0xC0 @@ -468731,7 +453232,7 @@ _080E4C00: beq _080E4C34 cmp r0, 0xFF beq _080E4C34 - ldr r2, _080E4C30 + ldr r2, =0x00001e30 adds r0, r1, r2 ldr r0, [r0] adds r1, r4 @@ -468744,14 +453245,14 @@ _080E4C00: bl gf_strncpy b _080E4C4A .align 2, 0 -_080E4C30: .4byte 0x00001e30 + .pool _080E4C34: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 adds r1, r5, 0 ldr r0, [r1] - ldr r4, _080E4C50 + ldr r4, =0x00001e28 adds r0, r4 ldr r0, [r0] _080E4C44: @@ -468763,16 +453264,16 @@ _080E4C4A: pop {r0} bx r0 .align 2, 0 -_080E4C50: .4byte 0x00001e28 + .pool thumb_func_end sub_80E4BE4 thumb_func_start choose_name_or_words_screen_load_bg_tile_patterns choose_name_or_words_screen_load_bg_tile_patterns: @ 80E4C54 push {r4-r6,lr} - ldr r0, _080E4CA4 - ldr r6, _080E4CA8 + ldr r0, =0x08dd3838 + ldr r6, =0x02039f94 ldr r1, [r6] - ldr r4, _080E4CAC + ldr r4, =0x00001810 adds r1, r4 bl LZ77UnCompWram ldr r1, [r6] @@ -468795,19 +453296,15 @@ choose_name_or_words_screen_load_bg_tile_patterns: @ 80E4C54 adds r2, r5, 0 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r0, _080E4CB0 + ldr r0, =0x0858c1c8 bl gpu_tile_obj_alloc_and_load_multiple - ldr r0, _080E4CB4 + ldr r0, =0x0858c230 bl gpu_pal_obj_alloc_and_load_multiple pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080E4CA4: .4byte 0x08dd3838 -_080E4CA8: .4byte 0x02039f94 -_080E4CAC: .4byte 0x00001810 -_080E4CB0: .4byte 0x0858c1c8 -_080E4CB4: .4byte 0x0858c230 + .pool thumb_func_end choose_name_or_words_screen_load_bg_tile_patterns thumb_func_start sub_80E4CB8 @@ -468822,11 +453319,11 @@ sub_80E4CB8: @ 80E4CB8 thumb_func_start choose_name_or_words_screen_apply_bg_pals choose_name_or_words_screen_apply_bg_pals: @ 80E4CC8 push {lr} - ldr r0, _080E4CF0 + ldr r0, =0x08dd3778 movs r1, 0 movs r2, 0xC0 bl gpu_pal_apply - ldr r0, _080E4CF4 + ldr r0, =0x0858bd78 movs r1, 0xA0 movs r2, 0x20 bl gpu_pal_apply @@ -468838,8 +453335,7 @@ choose_name_or_words_screen_apply_bg_pals: @ 80E4CC8 pop {r0} bx r0 .align 2, 0 -_080E4CF0: .4byte 0x08dd3778 -_080E4CF4: .4byte 0x0858bd78 + .pool thumb_func_end choose_name_or_words_screen_apply_bg_pals thumb_func_start sub_80E4CF8 @@ -468867,9 +453363,9 @@ sub_80E4D10: @ 80E4D10 mov r5, r8 push {r5-r7} sub sp, 0x10 - ldr r7, _080E4DD4 + ldr r7, =0x02039f94 ldr r1, [r7] - ldr r2, _080E4DD8 + ldr r2, =0x00001e28 adds r0, r1, r2 ldr r0, [r0] ldrb r6, [r0, 0x1] @@ -468880,7 +453376,7 @@ sub_80E4D10: @ 80E4D10 lsls r0, 16 lsrs r0, 16 mov r9, r0 - ldr r0, _080E4DDC + ldr r0, =0x00001e13 adds r1, r0 ldrb r0, [r1] movs r1, 0x11 @@ -468890,7 +453386,7 @@ sub_80E4D10: @ 80E4D10 bcs _080E4DA6 add r5, sp, 0xC mov r10, r4 - ldr r0, _080E4DE0 + ldr r0, =0x085e8218 ldrb r0, [r0] mov r8, r0 _080E4D52: @@ -468913,7 +453409,7 @@ _080E4D52: movs r1, 0x2 _080E4D76: ldr r0, [r7] - ldr r2, _080E4DDC + ldr r2, =0x00001e13 adds r0, r2 ldrb r0, [r0] lsls r3, r4, 3 @@ -468937,9 +453433,9 @@ _080E4D76: bcc _080E4D52 _080E4DA6: bl sub_80E498C - ldr r5, _080E4DD4 + ldr r5, =0x02039f94 ldr r0, [r5] - ldr r4, _080E4DDC + ldr r4, =0x00001e13 adds r0, r4 ldrb r0, [r0] movs r1, 0x2 @@ -468957,10 +453453,7 @@ _080E4DA6: pop {r0} bx r0 .align 2, 0 -_080E4DD4: .4byte 0x02039f94 -_080E4DD8: .4byte 0x00001e28 -_080E4DDC: .4byte 0x00001e13 -_080E4DE0: .4byte 0x085e8218 + .pool thumb_func_end sub_80E4D10 thumb_func_start sub_80E4DE4 @@ -468973,17 +453466,17 @@ sub_80E4DE4: @ 80E4DE4 lsrs r6, r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _080E4E50 + ldr r0, =0x0858bf88 adds r0, r5, r0 ldrb r1, [r0] adds r0, r6, 0 bl Window_FastFillPixels movs r4, 0 - ldr r1, _080E4E54 + ldr r1, =0x0858bf8c lsls r0, r5, 2 adds r0, r1 ldr r7, [r0] - ldr r0, _080E4E58 + ldr r0, =0x0858c198 mov r8, r0 _080E4E0E: lsls r3, r4, 4 @@ -469017,9 +453510,7 @@ _080E4E0E: pop {r0} bx r0 .align 2, 0 -_080E4E50: .4byte 0x0858bf88 -_080E4E54: .4byte 0x0858bf8c -_080E4E58: .4byte 0x0858c198 + .pool thumb_func_end sub_80E4DE4 thumb_func_start sub_80E4E5C @@ -469037,26 +453528,25 @@ sub_80E4E5C: @ 80E4E5C bls _080E4E8C movs r5, 0x1 movs r6, 0x1 - ldr r1, _080E4E84 + ldr r1, =0x02039f94 ldr r0, [r1] - ldr r2, _080E4E88 + ldr r2, =0x00001e11 b _080E4E96 .align 2, 0 -_080E4E84: .4byte 0x02039f94 -_080E4E88: .4byte 0x00001e11 + .pool _080E4E8C: movs r5, 0x2 movs r6, 0x2 - ldr r1, _080E4EE0 + ldr r1, =0x02039f94 ldr r0, [r1] - ldr r2, _080E4EE4 + ldr r2, =0x00001e12 _080E4E96: adds r0, r2 ldrb r4, [r0] adds r0, r1, 0 - ldr r1, _080E4EE8 + ldr r1, =0x0858bf98 ldr r0, [r0] - ldr r2, _080E4EEC + ldr r2, =0x00001e22 adds r0, r2 ldrb r0, [r0] lsls r0, 2 @@ -469082,23 +453572,20 @@ _080E4E96: pop {r0} bx r0 .align 2, 0 -_080E4EE0: .4byte 0x02039f94 -_080E4EE4: .4byte 0x00001e12 -_080E4EE8: .4byte 0x0858bf98 -_080E4EEC: .4byte 0x00001e22 + .pool thumb_func_end sub_80E4E5C thumb_func_start sub_80E4EF0 sub_80E4EF0: @ 80E4EF0 push {r4,r5,lr} sub sp, 0x10 - ldr r1, _080E4F48 + ldr r1, =0x0858bfa4 add r0, sp, 0xC movs r2, 0x3 bl memcpy - ldr r5, _080E4F4C + ldr r5, =0x02039f94 ldr r0, [r5] - ldr r4, _080E4F50 + ldr r4, =0x00001e15 adds r0, r4 ldrb r0, [r0] movs r1, 0xFF @@ -469110,7 +453597,7 @@ sub_80E4EF0: @ 80E4EF0 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, _080E4F54 + ldr r1, =0x085eeaf6 str r1, [sp, 0x8] movs r1, 0 movs r2, 0x2 @@ -469130,10 +453617,7 @@ sub_80E4EF0: @ 80E4EF0 pop {r0} bx r0 .align 2, 0 -_080E4F48: .4byte 0x0858bfa4 -_080E4F4C: .4byte 0x02039f94 -_080E4F50: .4byte 0x00001e15 -_080E4F54: .4byte 0x085eeaf6 + .pool thumb_func_end sub_80E4EF0 thumb_func_start sub_80E4F58 @@ -469161,12 +453645,12 @@ sub_80E4F70: @ 80E4F70 thumb_func_start sub_80E4F84 sub_80E4F84: @ 80E4F84 push {lr} - ldr r0, _080E4F90 + ldr r0, =sub_80E4F94 + 1 bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 -_080E4F90: .4byte sub_80E4F94 + 1 + .pool thumb_func_end sub_80E4F84 thumb_func_start sub_80E4F94 @@ -469175,28 +453659,28 @@ sub_80E4F94: @ 80E4F94 bl copy_super_sprites_to_oam bl copy_queue_process bl copy_pal_bg_faded_to_pal_ram - ldr r5, _080E5004 + ldr r5, =0x02039f94 ldr r0, [r5] - ldr r1, _080E5008 + ldr r1, =0x00001e18 adds r0, r1 ldrh r1, [r0] movs r0, 0x16 bl lcd_io_set ldr r0, [r5] - ldr r1, _080E500C + ldr r1, =0x00001e1a adds r0, r1 ldrh r1, [r0] movs r0, 0x1A bl lcd_io_set movs r0, 0xA bl lcd_io_get - ldr r4, _080E5010 + ldr r4, =0x0000fffc adds r1, r4, 0 ands r1, r0 movs r0, 0xA bl lcd_io_set ldr r0, [r5] - ldr r1, _080E5014 + ldr r1, =0x00001e1c adds r0, r1 ldrh r1, [r0] movs r0, 0xA @@ -469208,7 +453692,7 @@ sub_80E4F94: @ 80E4F94 adds r1, r4, 0 bl lcd_io_set ldr r0, [r5] - ldr r1, _080E5018 + ldr r1, =0x00001e1e adds r0, r1 ldrh r1, [r0] movs r0, 0xC @@ -469217,12 +453701,7 @@ sub_80E4F94: @ 80E4F94 pop {r0} bx r0 .align 2, 0 -_080E5004: .4byte 0x02039f94 -_080E5008: .4byte 0x00001e18 -_080E500C: .4byte 0x00001e1a -_080E5010: .4byte 0x0000fffc -_080E5014: .4byte 0x00001e1c -_080E5018: .4byte 0x00001e1e + .pool thumb_func_end sub_80E4F94 thumb_func_start sub_80E501C @@ -469246,7 +453725,7 @@ sub_80E503C: @ 80E503C lsls r0, 24 lsrs r4, r0, 24 movs r2, 0 - ldr r0, _080E5070 + ldr r0, =0x0858bdc8 ldrb r1, [r0] adds r3, r0, 0 cmp r1, 0xFF @@ -469270,19 +453749,19 @@ _080E5066: pop {r1} bx r1 .align 2, 0 -_080E5070: .4byte 0x0858bdc8 + .pool thumb_func_end sub_80E503C thumb_func_start sub_80E5074 sub_80E5074: @ 80E5074 push {lr} sub sp, 0x8 - ldr r0, _080E5094 + ldr r0, =0x03005d90 ldr r1, [r0] ldrb r2, [r1, 0x8] movs r0, 0 str r0, [sp] - ldr r0, _080E5098 + ldr r0, =sub_8086194 + 1 str r0, [sp, 0x4] movs r0, 0 movs r3, 0 @@ -469291,20 +453770,19 @@ sub_80E5074: @ 80E5074 pop {r0} bx r0 .align 2, 0 -_080E5094: .4byte 0x03005d90 -_080E5098: .4byte sub_8086194 + 1 + .pool thumb_func_end sub_80E5074 thumb_func_start sub_80E509C sub_80E509C: @ 80E509C push {lr} sub sp, 0x8 - ldr r0, _080E50BC + ldr r0, =0x03005d90 ldr r1, [r0] ldrb r2, [r1, 0x8] movs r0, 0 str r0, [sp] - ldr r0, _080E50C0 + ldr r0, =sub_8086194 + 1 str r0, [sp, 0x4] movs r0, 0x1 movs r3, 0 @@ -469313,20 +453791,19 @@ sub_80E509C: @ 80E509C pop {r0} bx r0 .align 2, 0 -_080E50BC: .4byte 0x03005d90 -_080E50C0: .4byte sub_8086194 + 1 + .pool thumb_func_end sub_80E509C thumb_func_start sub_80E50C4 sub_80E50C4: @ 80E50C4 push {lr} sub sp, 0x8 - ldr r0, _080E50E4 + ldr r0, =0x03005d90 ldr r1, [r0] ldrb r2, [r1, 0x8] movs r0, 0 str r0, [sp] - ldr r0, _080E50E8 + ldr r0, =sub_8086194 + 1 str r0, [sp, 0x4] movs r0, 0x2 movs r3, 0 @@ -469335,20 +453812,19 @@ sub_80E50C4: @ 80E50C4 pop {r0} bx r0 .align 2, 0 -_080E50E4: .4byte 0x03005d90 -_080E50E8: .4byte sub_8086194 + 1 + .pool thumb_func_end sub_80E50C4 thumb_func_start sub_80E50EC sub_80E50EC: @ 80E50EC push {lr} sub sp, 0x8 - ldr r0, _080E510C + ldr r0, =0x03005d90 ldr r1, [r0] ldrb r2, [r1, 0x8] movs r0, 0 str r0, [sp] - ldr r0, _080E5110 + ldr r0, =sub_8086194 + 1 str r0, [sp, 0x4] movs r0, 0x3 movs r3, 0 @@ -469357,13 +453833,12 @@ sub_80E50EC: @ 80E50EC pop {r0} bx r0 .align 2, 0 -_080E510C: .4byte 0x03005d90 -_080E5110: .4byte sub_8086194 + 1 + .pool thumb_func_end sub_80E50EC thumb_func_start decrypt_money decrypt_money: @ 80E5114 - ldr r1, _080E5124 + ldr r1, =0x03005d90 ldr r1, [r1] adds r1, 0xAC ldr r0, [r0] @@ -469371,12 +453846,12 @@ decrypt_money: @ 80E5114 eors r0, r1 bx lr .align 2, 0 -_080E5124: .4byte 0x03005d90 + .pool thumb_func_end decrypt_money thumb_func_start encrypt_money encrypt_money: @ 80E5128 - ldr r2, _080E5138 + ldr r2, =0x03005d90 ldr r2, [r2] adds r2, 0xAC ldr r2, [r2] @@ -469384,7 +453859,7 @@ encrypt_money: @ 80E5128 str r2, [r0] bx lr .align 2, 0 -_080E5138: .4byte 0x03005d90 + .pool thumb_func_end encrypt_money thumb_func_start is_money_greater_than @@ -469412,7 +453887,7 @@ add_money: @ 80E5154 bl decrypt_money adds r5, r0, 0 adds r0, r5, r4 - ldr r5, _080E5188 + ldr r5, =0x000f423f adds r4, r5, 0 cmp r0, r5 bhi _080E5178 @@ -469430,7 +453905,7 @@ _080E5178: pop {r0} bx r0 .align 2, 0 -_080E5188: .4byte 0x000f423f + .pool thumb_func_end add_money thumb_func_start subtract_money @@ -469457,12 +453932,12 @@ _080E51A2: thumb_func_start sub_80E51B0 sub_80E51B0: @ 80E51B0 push {lr} - ldr r0, _080E51CC + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 adds r0, r1 - ldr r1, _080E51D0 + ldr r1, =0x020375e2 ldrh r1, [r1] bl is_money_greater_than lsls r0, 24 @@ -469470,26 +453945,24 @@ sub_80E51B0: @ 80E51B0 pop {r1} bx r1 .align 2, 0 -_080E51CC: .4byte 0x03005d8c -_080E51D0: .4byte 0x020375e2 + .pool thumb_func_end sub_80E51B0 thumb_func_start sub_80E51D4 sub_80E51D4: @ 80E51D4 push {lr} - ldr r0, _080E51EC + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 adds r0, r1 - ldr r1, _080E51F0 + ldr r1, =0x020375e2 ldrh r1, [r1] bl subtract_money pop {r0} bx r0 .align 2, 0 -_080E51EC: .4byte 0x03005d8c -_080E51F0: .4byte 0x020375e2 + .pool thumb_func_end sub_80E51D4 thumb_func_start PrintMoneyAmountInMoneyBox @@ -469526,7 +453999,7 @@ PrintMoneyAmount: @ 80E5214 lsrs r6, r2, 24 lsls r4, 24 lsrs r5, r4, 24 - ldr r4, _080E528C + ldr r4, =0x02021cc4 adds r0, r4, 0 adds r1, r3, 0 movs r2, 0 @@ -469538,7 +454011,7 @@ PrintMoneyAmount: @ 80E5214 lsrs r0, 16 movs r1, 0x6 subs r1, r0 - ldr r2, _080E5290 + ldr r2, =0x02021fc4 adds r0, r1, 0 subs r1, 0x1 cmp r0, 0 @@ -469552,10 +454025,10 @@ _080E5258: cmp r0, 0 bgt _080E5258 _080E5264: - ldr r1, _080E5294 + ldr r1, =0x085e969c adds r0, r2, 0 bl ExpandTextCodes - ldr r2, _080E5290 + ldr r2, =0x02021fc4 str r6, [sp] str r5, [sp, 0x4] movs r0, 0 @@ -469571,9 +454044,7 @@ _080E5264: pop {r0} bx r0 .align 2, 0 -_080E528C: .4byte 0x02021cc4 -_080E5290: .4byte 0x02021fc4 -_080E5294: .4byte 0x085e969c + .pool thumb_func_end PrintMoneyAmount thumb_func_start set_window_border_style_and_print_money_box @@ -469611,14 +454082,14 @@ set_window_border_style_and_print_money_box: @ 80E5298 sub_80E52D4: @ 80E52D4 push {lr} adds r1, r0, 0 - ldr r0, _080E52E8 + ldr r0, =0x02039f98 ldrb r0, [r0] movs r2, 0 bl PrintMoneyAmountInMoneyBox pop {r0} bx r0 .align 2, 0 -_080E52E8: .4byte 0x02039f98 + .pool thumb_func_end sub_80E52D4 thumb_func_start sub_80E52EC @@ -469652,7 +454123,7 @@ sub_80E52EC: @ 80E52EC movs r1, 0 adds r2, r4, 0 bl rbox_template_set - ldr r4, _080E5380 + ldr r4, =0x02039f98 add r0, sp, 0x10 bl Window_AddFromTemplate strb r0, [r4] @@ -469690,14 +454161,14 @@ sub_80E52EC: @ 80E52EC pop {r0} bx r0 .align 2, 0 -_080E5380: .4byte 0x02039f98 + .pool thumb_func_end sub_80E52EC thumb_func_start sub_80E5384 sub_80E5384: @ 80E5384 push {r4,lr} bl sub_80E53F4 - ldr r4, _080E53A8 + ldr r4, =0x02039f98 ldrb r0, [r4] movs r1, 0 bl sub_8198070 @@ -469710,7 +454181,7 @@ sub_80E5384: @ 80E5384 pop {r0} bx r0 .align 2, 0 -_080E53A8: .4byte 0x02039f98 + .pool thumb_func_end sub_80E5384 thumb_func_start AddMoneyTextObject @@ -469722,11 +454193,11 @@ AddMoneyTextObject: @ 80E53AC lsrs r4, 16 lsls r5, 16 lsrs r5, 16 - ldr r0, _080E53E4 + ldr r0, =0x0858c2a4 bl gpu_tile_obj_decompress_and_load - ldr r0, _080E53E8 + ldr r0, =0x0858c2ac bl gpu_pal_obj_decompress_and_apply - ldr r0, _080E53EC + ldr r0, =0x0858c28c lsls r4, 16 asrs r4, 16 lsls r5, 16 @@ -469735,34 +454206,30 @@ AddMoneyTextObject: @ 80E53AC adds r2, r5, 0 movs r3, 0 bl obj_add_from_template_forward_search - ldr r1, _080E53F0 + ldr r1, =0x02039f99 strb r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080E53E4: .4byte 0x0858c2a4 -_080E53E8: .4byte 0x0858c2ac -_080E53EC: .4byte 0x0858c28c -_080E53F0: .4byte 0x02039f99 + .pool thumb_func_end AddMoneyTextObject thumb_func_start sub_80E53F4 sub_80E53F4: @ 80E53F4 push {lr} - ldr r0, _080E540C + ldr r0, =0x02039f99 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080E5410 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_resources pop {r0} bx r0 .align 2, 0 -_080E540C: .4byte 0x02039f99 -_080E5410: .4byte 0x02020630 + .pool thumb_func_end sub_80E53F4 thumb_func_start sub_80E5414 @@ -469771,7 +454238,7 @@ sub_80E5414: @ 80E5414 sub sp, 0x4 lsls r0, 16 lsls r1, 16 - ldr r2, _080E5468 + ldr r2, =0x0858c2b4 lsrs r0, 13 adds r0, r2 ldrb r4, [r0, 0x2] @@ -469805,13 +454272,12 @@ sub_80E5414: @ 80E5414 cmp r4, r1 bne _080E5470 _080E545E: - ldr r0, _080E546C + ldr r0, =0x0858ce8c adds r0, r4, r0 ldrb r0, [r0] b _080E5472 .align 2, 0 -_080E5468: .4byte 0x0858c2b4 -_080E546C: .4byte 0x0858ce8c + .pool _080E5470: movs r0, 0 _080E5472: @@ -469829,7 +454295,7 @@ nullsub_99: @ 80E547C thumb_func_start sub_80E5480 sub_80E5480: @ 80E5480 push {lr} - ldr r3, _080E54AC + ldr r3, =0x02039f34 ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -469850,13 +454316,13 @@ sub_80E5480: @ 80E5480 pop {r0} bx r0 .align 2, 0 -_080E54AC: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5480 thumb_func_start sub_80E54B0 sub_80E54B0: @ 80E54B0 push {lr} - ldr r3, _080E54DC + ldr r3, =0x02039f34 ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -469877,12 +454343,12 @@ sub_80E54B0: @ 80E54B0 pop {r0} bx r0 .align 2, 0 -_080E54DC: .4byte 0x02039f34 + .pool thumb_func_end sub_80E54B0 thumb_func_start sub_80E54E0 sub_80E54E0: @ 80E54E0 - ldr r3, _080E5530 + ldr r3, =0x02039f34 ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -469923,13 +454389,13 @@ sub_80E54E0: @ 80E54E0 strb r0, [r1, 0xB] bx lr .align 2, 0 -_080E5530: .4byte 0x02039f34 + .pool thumb_func_end sub_80E54E0 thumb_func_start sub_80E5534 sub_80E5534: @ 80E5534 push {lr} - ldr r3, _080E555C + ldr r3, =0x02039f34 ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -469948,13 +454414,13 @@ sub_80E5534: @ 80E5534 pop {r0} bx r0 .align 2, 0 -_080E555C: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5534 thumb_func_start sub_80E5560 sub_80E5560: @ 80E5560 push {lr} - ldr r3, _080E558C + ldr r3, =0x02039f34 ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -469975,13 +454441,13 @@ sub_80E5560: @ 80E5560 pop {r0} bx r0 .align 2, 0 -_080E558C: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5560 thumb_func_start sub_80E5590 sub_80E5590: @ 80E5590 push {lr} - ldr r3, _080E55B8 + ldr r3, =0x02039f34 ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -470000,13 +454466,13 @@ sub_80E5590: @ 80E5590 pop {r0} bx r0 .align 2, 0 -_080E55B8: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5590 thumb_func_start sub_80E55BC sub_80E55BC: @ 80E55BC push {lr} - ldr r3, _080E55E8 + ldr r3, =0x02039f34 ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -470027,14 +454493,14 @@ sub_80E55BC: @ 80E55BC pop {r0} bx r0 .align 2, 0 -_080E55E8: .4byte 0x02039f34 + .pool thumb_func_end sub_80E55BC thumb_func_start sub_80E55EC sub_80E55EC: @ 80E55EC push {r4,r5,lr} movs r2, 0 - ldr r5, _080E5660 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x8] ldrb r4, [r1, 0x11] @@ -470061,7 +454527,7 @@ _080E560A: cmp r0, r1 bne _080E560A _080E5622: - ldr r1, _080E5660 + ldr r1, =0x02039f34 ldr r0, [r1] ldr r0, [r0, 0x8] strb r2, [r0, 0x8] @@ -470075,14 +454541,14 @@ _080E5622: _080E563A: cmp r2, 0 bne _080E564C - ldr r0, _080E5660 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 _080E564C: - ldr r0, _080E5660 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -470092,14 +454558,14 @@ _080E564C: pop {r0} bx r0 .align 2, 0 -_080E5660: .4byte 0x02039f34 + .pool thumb_func_end sub_80E55EC thumb_func_start c3_080493E4 c3_080493E4: @ 80E5664 push {r4-r6,lr} movs r1, 0 - ldr r2, _080E56DC + ldr r2, =0x02039f34 ldr r0, [r2] ldr r0, [r0, 0x8] ldrb r5, [r0, 0x11] @@ -470128,7 +454594,7 @@ _080E5698: adds r3, 0x1 cmp r3, 0x3 ble _080E567E - ldr r0, _080E56DC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0x8 @@ -470141,14 +454607,14 @@ _080E5698: _080E56B4: cmp r1, 0 bne _080E56C6 - ldr r0, _080E56DC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 _080E56C6: - ldr r0, _080E56DC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -470158,7 +454624,7 @@ _080E56C6: pop {r0} bx r0 .align 2, 0 -_080E56DC: .4byte 0x02039f34 + .pool thumb_func_end c3_080493E4 thumb_func_start sub_80E56E0 @@ -470179,7 +454645,7 @@ sub_80E56E0: @ 80E56E0 bhi _080E5702 movs r1, 0x28 _080E5702: - ldr r0, _080E5714 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] strh r1, [r0, 0x4] @@ -470187,7 +454653,7 @@ _080E5702: pop {r0} bx r0 .align 2, 0 -_080E5714: .4byte 0x02039f34 + .pool thumb_func_end sub_80E56E0 thumb_func_start sub_80E5718 @@ -470196,7 +454662,7 @@ sub_80E5718: @ 80E5718 mov r7, r8 push {r7} movs r7, 0 - ldr r1, _080E57C8 + ldr r1, =0x02039f34 ldr r0, [r1] ldr r0, [r0, 0x8] ldrb r5, [r0, 0x11] @@ -470281,7 +454747,7 @@ _080E57BE: pop {r0} bx r0 .align 2, 0 -_080E57C8: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5718 thumb_func_start sub_80E57CC @@ -470293,7 +454759,7 @@ sub_80E57CC: @ 80E57CC push {r5-r7} movs r0, 0 mov r9, r0 - ldr r1, _080E5888 + ldr r1, =0x02039f34 ldr r0, [r1] ldr r0, [r0, 0x8] ldrb r2, [r0, 0x11] @@ -470381,7 +454847,7 @@ _080E587A: pop {r0} bx r0 .align 2, 0 -_080E5888: .4byte 0x02039f34 + .pool thumb_func_end sub_80E57CC thumb_func_start sub_80E588C @@ -470392,7 +454858,7 @@ sub_80E588C: @ 80E588C push {r6,r7} movs r0, 0 mov r9, r0 - ldr r1, _080E58D4 + ldr r1, =0x02039f34 ldr r0, [r1] ldr r0, [r0, 0x8] ldrb r7, [r0, 0x11] @@ -470423,7 +454889,7 @@ _080E58B0: movs r0, 0x32 b _080E58DA .align 2, 0 -_080E58D4: .4byte 0x02039f34 + .pool _080E58D8: movs r0, 0xA _080E58DA: @@ -470448,7 +454914,7 @@ _080E58DA: _080E5900: adds r6, 0x1C adds r5, 0x1 - ldr r4, _080E5934 + ldr r4, =0x02039f34 cmp r5, 0x3 ble _080E58B0 _080E590A: @@ -470473,13 +454939,13 @@ _080E5928: pop {r0} bx r0 .align 2, 0 -_080E5934: .4byte 0x02039f34 + .pool thumb_func_end sub_80E588C thumb_func_start sub_80E5938 sub_80E5938: @ 80E5938 push {r4,lr} - ldr r4, _080E596C + ldr r4, =0x02039f34 ldr r1, [r4] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -470502,13 +454968,13 @@ sub_80E5938: @ 80E5938 pop {r0} bx r0 .align 2, 0 -_080E596C: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5938 thumb_func_start sub_80E5970 sub_80E5970: @ 80E5970 push {r4,lr} - ldr r4, _080E59A8 + ldr r4, =0x02039f34 ldr r1, [r4] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -470518,7 +454984,7 @@ sub_80E5970: @ 80E5970 lsls r0, 2 adds r0, r1 ldrh r0, [r0, 0x6] - ldr r1, _080E59AC + ldr r1, =0x0858c2b4 lsls r0, 3 adds r0, r1 ldrb r0, [r0, 0x1] @@ -470534,8 +455000,7 @@ sub_80E5970: @ 80E5970 pop {r0} bx r0 .align 2, 0 -_080E59A8: .4byte 0x02039f34 -_080E59AC: .4byte 0x0858c2b4 + .pool thumb_func_end sub_80E5970 thumb_func_start sub_80E59B0 @@ -470543,7 +455008,7 @@ sub_80E59B0: @ 80E59B0 push {lr} movs r0, 0 bl sub_80E6934 - ldr r0, _080E59CC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -470552,7 +455017,7 @@ sub_80E59B0: @ 80E59B0 pop {r0} bx r0 .align 2, 0 -_080E59CC: .4byte 0x02039f34 + .pool thumb_func_end sub_80E59B0 thumb_func_start sub_80E59D0 @@ -470560,7 +455025,7 @@ sub_80E59D0: @ 80E59D0 push {lr} movs r0, 0x1 bl sub_80E6934 - ldr r0, _080E59EC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -470569,7 +455034,7 @@ sub_80E59D0: @ 80E59D0 pop {r0} bx r0 .align 2, 0 -_080E59EC: .4byte 0x02039f34 + .pool thumb_func_end sub_80E59D0 thumb_func_start sub_80E59F0 @@ -470577,7 +455042,7 @@ sub_80E59F0: @ 80E59F0 push {lr} movs r0, 0x2 bl sub_80E6934 - ldr r0, _080E5A0C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -470586,7 +455051,7 @@ sub_80E59F0: @ 80E59F0 pop {r0} bx r0 .align 2, 0 -_080E5A0C: .4byte 0x02039f34 + .pool thumb_func_end sub_80E59F0 thumb_func_start sub_80E5A10 @@ -470594,7 +455059,7 @@ sub_80E5A10: @ 80E5A10 push {lr} movs r0, 0x3 bl sub_80E6934 - ldr r0, _080E5A2C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -470603,7 +455068,7 @@ sub_80E5A10: @ 80E5A10 pop {r0} bx r0 .align 2, 0 -_080E5A2C: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5A10 thumb_func_start sub_80E5A30 @@ -470611,7 +455076,7 @@ sub_80E5A30: @ 80E5A30 push {lr} movs r0, 0x4 bl sub_80E6934 - ldr r0, _080E5A4C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -470620,14 +455085,14 @@ sub_80E5A30: @ 80E5A30 pop {r0} bx r0 .align 2, 0 -_080E5A4C: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5A30 thumb_func_start sub_80E5A50 sub_80E5A50: @ 80E5A50 push {r4-r6,lr} movs r4, 0 - ldr r2, _080E5A9C + ldr r2, =0x02039f34 ldr r0, [r2] ldr r0, [r0, 0x8] ldrb r1, [r0, 0x11] @@ -470638,7 +455103,7 @@ sub_80E5A50: @ 80E5A50 beq _080E5AB0 movs r5, 0 _080E5A68: - ldr r0, _080E5A9C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x8] ldrb r0, [r1, 0x11] @@ -470662,7 +455127,7 @@ _080E5A68: movs r1, 0xA b _080E5AA4 .align 2, 0 -_080E5A9C: .4byte 0x02039f34 + .pool _080E5AA0: adds r0, r4, 0 movs r1, 0x3C @@ -470716,7 +455181,7 @@ sub_80E5AD4: @ 80E5AD4 mov r10, r3 movs r6, 0 _080E5B00: - ldr r0, _080E5B4C + ldr r0, =0x02039f34 ldr r2, [r0] ldr r1, [r2, 0x8] ldrb r0, [r1, 0x11] @@ -470755,7 +455220,7 @@ _080E5B38: strh r0, [r2] b _080E5B7E .align 2, 0 -_080E5B4C: .4byte 0x02039f34 + .pool _080E5B50: cmp r4, 0x2 bne _080E5B5E @@ -470785,7 +455250,7 @@ _080E5B76: bge _080E5B76 _080E5B7E: movs r5, 0 - ldr r7, _080E5BC4 + ldr r7, =0x02039f34 movs r6, 0 mov r4, r10 _080E5B86: @@ -470808,10 +455273,10 @@ _080E5B86: adds r0, r6, r0 ldrh r0, [r0, 0x8] lsls r0, 3 - ldr r1, _080E5BC8 + ldr r1, =0x0858c2b4 adds r0, r1 ldrb r0, [r0, 0x2] - ldr r2, _080E5BCC + ldr r2, =0x0858ce8c adds r0, r2 ldrb r1, [r0] lsls r0, r1, 2 @@ -470819,9 +455284,7 @@ _080E5B86: lsls r0, 1 b _080E5BD2 .align 2, 0 -_080E5BC4: .4byte 0x02039f34 -_080E5BC8: .4byte 0x0858c2b4 -_080E5BCC: .4byte 0x0858ce8c + .pool _080E5BD0: movs r0, 0 _080E5BD2: @@ -470913,7 +455376,7 @@ _080E5C70: lsrs r0, 24 mov r9, r0 _080E5C86: - ldr r0, _080E5CD0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] adds r0, 0xD @@ -470927,7 +455390,7 @@ _080E5C86: cmp r0, 0xFF bne _080E5C16 _080E5CA0: - ldr r6, _080E5CD0 + ldr r6, =0x02039f34 ldr r0, [r6] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -470951,7 +455414,7 @@ _080E5CC0: pop {r0} bx r0 .align 2, 0 -_080E5CD0: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5AD4 thumb_func_start sub_80E5CD4 @@ -470962,7 +455425,7 @@ sub_80E5CD4: @ 80E5CD4 movs r0, 0 mov r8, r0 movs r6, 0 - ldr r7, _080E5D78 + ldr r7, =0x02039f34 movs r5, 0 _080E5CE4: ldr r2, [r7] @@ -471017,7 +455480,7 @@ _080E5D46: adds r6, 0x1 cmp r6, 0x3 ble _080E5CE4 - ldr r4, _080E5D78 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -471038,7 +455501,7 @@ _080E5D6E: pop {r0} bx r0 .align 2, 0 -_080E5D78: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5CD4 thumb_func_start sub_80E5D7C @@ -471046,7 +455509,7 @@ sub_80E5D7C: @ 80E5D7C push {r4-r7,lr} movs r7, 0 movs r4, 0 - ldr r5, _080E5DAC + ldr r5, =0x02039f34 movs r6, 0 _080E5D86: ldr r3, [r5] @@ -471068,7 +455531,7 @@ _080E5D86: movs r0, 0x28 b _080E5DB2 .align 2, 0 -_080E5DAC: .4byte 0x02039f34 + .pool _080E5DB0: movs r0, 0xA _080E5DB2: @@ -471092,7 +455555,7 @@ _080E5DD2: adds r4, 0x1 cmp r4, 0x3 ble _080E5D86 - ldr r4, _080E5E00 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -471110,14 +455573,14 @@ _080E5DF8: pop {r0} bx r0 .align 2, 0 -_080E5E00: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5D7C thumb_func_start sub_80E5E04 sub_80E5E04: @ 80E5E04 push {r4,lr} - ldr r1, _080E5E4C - ldr r0, _080E5E50 + ldr r1, =0x02039f26 + ldr r0, =0x02039f34 ldr r4, [r0] ldr r0, [r4, 0x8] ldrb r2, [r0, 0x11] @@ -471131,8 +455594,8 @@ sub_80E5E04: @ 80E5E04 lsls r1, 2 adds r1, r0 ldrh r0, [r1, 0x6] - ldr r3, _080E5E54 - ldr r2, _080E5E58 + ldr r3, =0x0858cdcc + ldr r2, =0x0858c2b4 lsls r0, 3 adds r0, r2 ldrb r0, [r0] @@ -471152,17 +455615,14 @@ _080E5E46: pop {r0} bx r0 .align 2, 0 -_080E5E4C: .4byte 0x02039f26 -_080E5E50: .4byte 0x02039f34 -_080E5E54: .4byte 0x0858cdcc -_080E5E58: .4byte 0x0858c2b4 + .pool thumb_func_end sub_80E5E04 thumb_func_start sub_80E5E5C sub_80E5E5C: @ 80E5E5C push {r4,lr} - ldr r1, _080E5EA4 - ldr r0, _080E5EA8 + ldr r1, =0x02039f26 + ldr r0, =0x02039f34 ldr r4, [r0] ldr r0, [r4, 0x8] ldrb r2, [r0, 0x11] @@ -471176,8 +455636,8 @@ sub_80E5E5C: @ 80E5E5C lsls r1, 2 adds r1, r0 ldrh r0, [r1, 0x6] - ldr r3, _080E5EAC - ldr r2, _080E5EB0 + ldr r3, =0x0858cdcc + ldr r2, =0x0858c2b4 lsls r0, 3 adds r0, r2 ldrb r0, [r0] @@ -471197,10 +455657,7 @@ _080E5E9E: pop {r0} bx r0 .align 2, 0 -_080E5EA4: .4byte 0x02039f26 -_080E5EA8: .4byte 0x02039f34 -_080E5EAC: .4byte 0x0858cdcc -_080E5EB0: .4byte 0x0858c2b4 + .pool thumb_func_end sub_80E5E5C thumb_func_start sub_80E5EB4 @@ -471208,7 +455665,7 @@ sub_80E5EB4: @ 80E5EB4 push {r4-r7,lr} movs r1, 0 movs r5, 0 - ldr r0, _080E5F08 + ldr r0, =0x02039f34 ldr r4, [r0] ldr r2, [r4, 0x8] ldrb r0, [r2, 0x11] @@ -471234,7 +455691,7 @@ _080E5EDA: bge _080E5EE8 movs r5, 0 _080E5EE8: - ldr r0, _080E5F08 + ldr r0, =0x02039f34 ldr r3, [r0] ldr r0, [r3, 0x8] ldrb r2, [r0, 0x11] @@ -471250,7 +455707,7 @@ _080E5EFC: bl sub_80DD3D4 b _080E5F2C .align 2, 0 -_080E5F08: .4byte 0x02039f34 + .pool _080E5F0C: ldr r0, [r3, 0x4] lsls r1, r2, 3 @@ -471268,7 +455725,7 @@ _080E5F0C: movs r1, 0x11 bl sub_80DD3D4 _080E5F2C: - ldr r4, _080E5F60 + ldr r4, =0x02039f34 ldr r1, [r4] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -471293,14 +455750,14 @@ _080E5F2C: pop {r0} bx r0 .align 2, 0 -_080E5F60: .4byte 0x02039f34 + .pool thumb_func_end sub_80E5EB4 thumb_func_start sub_80E5F64 sub_80E5F64: @ 80E5F64 push {r4-r7,lr} movs r6, 0 - ldr r0, _080E5FC0 + ldr r0, =0x02039f34 ldr r4, [r0] ldr r2, [r4, 0x8] ldrb r1, [r2, 0x11] @@ -471347,7 +455804,7 @@ _080E5FB2: bl sub_80DD3D4 b _080E5FDE .align 2, 0 -_080E5FC0: .4byte 0x02039f34 + .pool _080E5FC4: ldr r1, [r3, 0x4] lsls r0, r2, 3 @@ -471370,7 +455827,7 @@ _080E5FDE: thumb_func_start sub_80E5FE4 sub_80E5FE4: @ 80E5FE4 push {r4,r5,lr} - ldr r1, _080E6008 + ldr r1, =0x02039f34 ldr r3, [r1] ldr r0, [r3, 0x8] ldrb r2, [r0, 0x11] @@ -471387,7 +455844,7 @@ sub_80E5FE4: @ 80E5FE4 movs r0, 0xA b _080E601C .align 2, 0 -_080E6008: .4byte 0x02039f34 + .pool _080E600C: ldr r0, [r3, 0x4] lsls r1, r2, 3 @@ -471451,7 +455908,7 @@ sub_80E6068: @ 80E6068 cmp r0, 0x2 bhi _080E6098 movs r4, 0xA - ldr r0, _080E6094 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -471459,12 +455916,12 @@ sub_80E6068: @ 80E6068 bl sub_80DD3D4 b _080E60FC .align 2, 0 -_080E6094: .4byte 0x02039f34 + .pool _080E6098: cmp r0, 0x5 bhi _080E60B4 movs r4, 0x14 - ldr r0, _080E60B0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -471472,12 +455929,12 @@ _080E6098: bl sub_80DD3D4 b _080E60FC .align 2, 0 -_080E60B0: .4byte 0x02039f34 + .pool _080E60B4: cmp r0, 0x7 bhi _080E60D0 movs r4, 0x28 - ldr r0, _080E60CC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -471485,12 +455942,12 @@ _080E60B4: bl sub_80DD3D4 b _080E60FC .align 2, 0 -_080E60CC: .4byte 0x02039f34 + .pool _080E60D0: cmp r1, 0x8 bhi _080E60EC movs r4, 0x3C - ldr r0, _080E60E8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -471498,17 +455955,17 @@ _080E60D0: bl sub_80DD3D4 b _080E60FC .align 2, 0 -_080E60E8: .4byte 0x02039f34 + .pool _080E60EC: movs r4, 0x50 - ldr r0, _080E6118 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x1E bl sub_80DD3D4 _080E60FC: - ldr r0, _080E6118 + ldr r0, =0x02039f34 ldr r1, [r0] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -471522,7 +455979,7 @@ _080E60FC: pop {r0} bx r0 .align 2, 0 -_080E6118: .4byte 0x02039f34 + .pool thumb_func_end sub_80E6068 thumb_func_start sub_80E611C @@ -471530,7 +455987,7 @@ sub_80E611C: @ 80E611C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r2, _080E61A0 + ldr r2, =0x02039f34 ldr r0, [r2] ldr r3, [r0, 0x8] ldrb r0, [r3, 0x11] @@ -471552,7 +456009,7 @@ _080E6140: adds r5, r0, 0 cmp r6, r1 beq _080E616A - ldr r4, _080E61A0 + ldr r4, =0x02039f34 _080E614E: lsls r0, r2, 24 movs r2, 0x80 @@ -471597,7 +456054,7 @@ _080E6190: blt _080E61F8 b _080E6140 .align 2, 0 -_080E61A0: .4byte 0x02039f34 + .pool _080E61A4: mov r2, r8 ldr r6, [r2] @@ -471609,7 +456066,7 @@ _080E61A4: lsls r0, 2 adds r5, r0, r4 ldrh r0, [r5, 0x6] - ldr r3, _080E6204 + ldr r3, =0x0858c2b4 lsls r0, 3 adds r7, r0, r3 ldrb r2, [r7, 0x1] @@ -471627,7 +456084,7 @@ _080E61A4: lsls r0, 29 cmp r2, r0 bne _080E61F8 - ldr r1, _080E6208 + ldr r1, =0x0858cdcc ldrb r0, [r7] lsls r0, 2 adds r0, r1 @@ -471647,8 +456104,7 @@ _080E61F8: pop {r0} bx r0 .align 2, 0 -_080E6204: .4byte 0x0858c2b4 -_080E6208: .4byte 0x0858cdcc + .pool thumb_func_end sub_80E611C thumb_func_start sub_80E620C @@ -471657,7 +456113,7 @@ sub_80E620C: @ 80E620C mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _080E6298 + ldr r0, =0x02039f34 ldr r3, [r0] ldr r1, [r3, 0x8] ldrb r2, [r1, 0x11] @@ -471674,7 +456130,7 @@ sub_80E620C: @ 80E620C ldrh r0, [r0, 0x6] mov r8, r0 movs r6, 0 - ldr r0, _080E629C + ldr r0, =0x0858c2b4 mov r12, r0 movs r7, 0 _080E623C: @@ -471708,7 +456164,7 @@ _080E623C: subs r1, r2 lsls r1, 2 adds r1, r3 - ldr r2, _080E62A0 + ldr r2, =0x0858cdcc ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -471723,9 +456179,7 @@ _080E623C: bl sub_80DD3D4 b _080E62AC .align 2, 0 -_080E6298: .4byte 0x02039f34 -_080E629C: .4byte 0x0858c2b4 -_080E62A0: .4byte 0x0858cdcc + .pool _080E62A4: adds r7, 0x1C adds r6, 0x1 @@ -471743,7 +456197,7 @@ _080E62AC: thumb_func_start sub_80E62B8 sub_80E62B8: @ 80E62B8 push {r4-r7,lr} - ldr r0, _080E6310 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r1, [r0, 0x11] @@ -471754,7 +456208,7 @@ sub_80E62B8: @ 80E62B8 movs r5, 0 movs r6, 0 _080E62CE: - ldr r0, _080E6310 + ldr r0, =0x02039f34 ldr r4, [r0] ldr r1, [r4, 0x8] ldrb r2, [r1, 0x11] @@ -471786,7 +456240,7 @@ _080E62CE: bl sub_80DD3D4 b _080E6326 .align 2, 0 -_080E6310: .4byte 0x02039f34 + .pool _080E6314: cmp r2, r0 bge _080E6326 @@ -471810,7 +456264,7 @@ _080E632E: thumb_func_start sub_80E6334 sub_80E6334: @ 80E6334 push {r4,lr} - ldr r4, _080E6384 + ldr r4, =0x02039f34 ldr r1, [r4] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -471849,7 +456303,7 @@ sub_80E6334: @ 80E6334 bl sub_80DD3D4 b _080E6390 .align 2, 0 -_080E6384: .4byte 0x02039f34 + .pool _080E6388: adds r0, r2, 0 movs r1, 0x3A @@ -471863,7 +456317,7 @@ _080E6390: thumb_func_start sub_80E6398 sub_80E6398: @ 80E6398 push {lr} - ldr r3, _080E63D8 + ldr r3, =0x02039f34 ldr r1, [r3] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -471894,7 +456348,7 @@ sub_80E6398: @ 80E6398 bl sub_80DD3D4 b _080E63E4 .align 2, 0 -_080E63D8: .4byte 0x02039f34 + .pool _080E63DC: adds r0, r2, 0 movs r1, 0x3B @@ -471908,7 +456362,7 @@ _080E63E4: sub_80E63E8: @ 80E63E8 push {r4-r7,lr} sub sp, 0x4 - ldr r0, _080E6470 + ldr r0, =0x02039f34 ldr r2, [r0] ldr r1, [r2] ldrb r1, [r1, 0x1] @@ -471978,7 +456432,7 @@ _080E643A: strb r0, [r4] b _080E6484 .align 2, 0 -_080E6470: .4byte 0x02039f34 + .pool _080E6474: lsls r0, r5, 24 movs r2, 0x80 @@ -472077,7 +456531,7 @@ sub_80E6520: @ 80E6520 mov r7, r8 push {r7} sub sp, 0x4 - ldr r0, _080E65B0 + ldr r0, =0x02039f34 ldr r2, [r0] ldr r1, [r2] ldrb r1, [r1, 0x1] @@ -472150,7 +456604,7 @@ _080E657C: strb r0, [r4] b _080E65C4 .align 2, 0 -_080E65B0: .4byte 0x02039f34 + .pool _080E65B4: lsls r0, r5, 24 movs r2, 0x80 @@ -472254,7 +456708,7 @@ nullsub_100: @ 80E6664 sub_80E6668: @ 80E6668 push {r4-r7,lr} sub sp, 0x8 - ldr r0, _080E66E4 + ldr r0, =0x02039f34 ldr r1, [r0] ldr r0, [r1] ldrb r0, [r0, 0x1] @@ -472315,7 +456769,7 @@ _080E66C4: strb r0, [r3] b _080E66FC .align 2, 0 -_080E66E4: .4byte 0x02039f34 + .pool _080E66E8: subs r0, r4, 0x1 lsls r0, 24 @@ -472338,7 +456792,7 @@ _080E66FC: cmp r0, 0x3 ble _080E66AA movs r6, 0 - ldr r5, _080E6774 + ldr r5, =0x02039f34 adds r4, r5, 0 _080E6712: ldr r0, [r4] @@ -472391,14 +456845,14 @@ _080E676C: pop {r0} bx r0 .align 2, 0 -_080E6774: .4byte 0x02039f34 + .pool thumb_func_end sub_80E6668 thumb_func_start sub_80E6778 sub_80E6778: @ 80E6778 push {lr} - ldr r3, _080E67B0 - ldr r0, _080E67B4 + ldr r3, =0x0858c2b4 + ldr r0, =0x02039f34 ldr r1, [r0] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -472412,7 +456866,7 @@ sub_80E6778: @ 80E6778 adds r0, r3 ldrb r0, [r0, 0x1] lsls r0, 29 - ldr r1, _080E67B8 + ldr r1, =0x02039f2c lsrs r0, 29 ldrh r1, [r1] cmp r0, r1 @@ -472425,9 +456879,7 @@ _080E67AA: pop {r0} bx r0 .align 2, 0 -_080E67B0: .4byte 0x0858c2b4 -_080E67B4: .4byte 0x02039f34 -_080E67B8: .4byte 0x02039f2c + .pool thumb_func_end sub_80E6778 thumb_func_start sub_80E67BC @@ -472438,7 +456890,7 @@ sub_80E67BC: @ 80E67BC movs r0, 0 mov r8, r0 movs r4, 0 - ldr r5, _080E6804 + ldr r5, =0x02039f34 movs r6, 0 _080E67CC: ldr r3, [r5] @@ -472469,7 +456921,7 @@ _080E67CC: strh r0, [r1, 0x4] b _080E680C .align 2, 0 -_080E6804: .4byte 0x02039f34 + .pool _080E6808: movs r0, 0xA strh r0, [r2, 0x4] @@ -472498,14 +456950,14 @@ _080E682E: mov r7, r8 cmp r7, 0 bne _080E684A - ldr r0, _080E6864 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] movs r1, 0x36 bl sub_80DD3F0 _080E684A: - ldr r0, _080E6864 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -472517,13 +456969,13 @@ _080E684A: pop {r0} bx r0 .align 2, 0 -_080E6864: .4byte 0x02039f34 + .pool thumb_func_end sub_80E67BC thumb_func_start sub_80E6868 sub_80E6868: @ 80E6868 push {r4,lr} - ldr r0, _080E6888 + ldr r0, =0x02039f34 ldr r1, [r0] ldr r0, [r1] ldrb r0, [r0, 0x13] @@ -472538,7 +456990,7 @@ sub_80E6868: @ 80E6868 bl sub_80DD3D4 b _080E68CE .align 2, 0 -_080E6888: .4byte 0x02039f34 + .pool _080E688C: cmp r0, 0x1 bne _080E689E @@ -472573,7 +457025,7 @@ _080E68C2: movs r1, 0x1E bl sub_80DD3D4 _080E68CE: - ldr r0, _080E68E8 + ldr r0, =0x02039f34 ldr r1, [r0] ldr r0, [r1, 0x8] ldrb r2, [r0, 0x11] @@ -472587,13 +457039,13 @@ _080E68CE: pop {r0} bx r0 .align 2, 0 -_080E68E8: .4byte 0x02039f34 + .pool thumb_func_end sub_80E6868 thumb_func_start sub_80E68EC sub_80E68EC: @ 80E68EC push {r4,lr} - ldr r4, _080E6930 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r2, [r0, 0x10] ldrb r1, [r2, 0x1] @@ -472627,7 +457079,7 @@ _080E692A: pop {r0} bx r0 .align 2, 0 -_080E6930: .4byte 0x02039f34 + .pool thumb_func_end sub_80E68EC thumb_func_start sub_80E6934 @@ -472641,8 +457093,8 @@ sub_80E6934: @ 80E6934 mov r8, r0 movs r7, 0 movs r4, 0 - ldr r6, _080E6978 - ldr r0, _080E697C + ldr r6, =0x02039f34 + ldr r0, =0x0858c2b4 mov r9, r0 movs r5, 0 _080E694E: @@ -472668,8 +457120,7 @@ _080E694E: movs r0, 0x28 b _080E6982 .align 2, 0 -_080E6978: .4byte 0x02039f34 -_080E697C: .4byte 0x0858c2b4 + .pool _080E6980: movs r0, 0xA _080E6982: @@ -472693,7 +457144,7 @@ _080E699E: ble _080E694E cmp r7, 0 bne _080E69B8 - ldr r0, _080E69C4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x11] @@ -472707,7 +457158,7 @@ _080E69B8: pop {r0} bx r0 .align 2, 0 -_080E69C4: .4byte 0x02039f34 + .pool thumb_func_end sub_80E6934 thumb_func_start sub_80E69C8 @@ -472715,7 +457166,7 @@ sub_80E69C8: @ 80E69C8 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _080E69F8 + ldr r2, =0x02039f34 ldr r0, [r2] ldr r0, [r0, 0x8] adds r0, 0xD @@ -472737,7 +457188,7 @@ sub_80E69C8: @ 80E69C8 movs r1, 0x2D b _080E6A22 .align 2, 0 -_080E69F8: .4byte 0x02039f34 + .pool _080E69FC: ldrb r0, [r2, 0x12] cmp r0, 0 @@ -472779,7 +457230,7 @@ sub_80E6A2C: @ 80E6A2C movs r2, 0x8 bl memset movs r7, 0 - ldr r4, _080E6AB0 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] @@ -472836,7 +457287,7 @@ _080E6A8E: bl sub_80DD3D4 b _080E6AFE .align 2, 0 -_080E6AB0: .4byte 0x02039f34 + .pool _080E6AB4: ldr r2, [r3, 0x8] ldrb r1, [r1, 0xF] @@ -472875,7 +457326,7 @@ _080E6AD6: strh r0, [r1] _080E6AFE: adds r7, 0x1 - ldr r4, _080E6B20 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x8] adds r0, 0x8 @@ -472894,7 +457345,7 @@ _080E6B14: movs r0, 0x1 b _080E6B2E .align 2, 0 -_080E6B20: .4byte 0x02039f34 + .pool _080E6B24: adds r1, 0x2 adds r7, 0x1 @@ -472917,7 +457368,7 @@ sub_80E6B3C: @ 80E6B3C lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _080E6B6C + ldr r2, =0x02039f34 ldr r4, [r2] ldr r3, [r4, 0x4] lsls r2, r0, 3 @@ -472936,7 +457387,7 @@ sub_80E6B3C: @ 80E6B3C pop {r0} bx r0 .align 2, 0 -_080E6B6C: .4byte 0x02039f34 + .pool thumb_func_end sub_80E6B3C thumb_func_start sub_80E6B70 @@ -473012,88 +457463,69 @@ _080E6BDC: thumb_func_start sub_80E6BE8 sub_80E6BE8: @ 80E6BE8 push {lr} - ldr r0, _080E6BF4 + ldr r0, =sub_80E715C + 1 bl sub_80B37D4 pop {r0} bx r0 .align 2, 0 -_080E6BF4: .4byte sub_80E715C + 1 + .pool thumb_func_end sub_80E6BE8 thumb_func_start sub_80E6BF8 sub_80E6BF8: @ 80E6BF8 push {r4,lr} - ldr r2, _080E6C50 - ldr r0, _080E6C54 + ldr r2, =0x03001134 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r3, _080E6C58 + ldr r3, =0x00001a9c adds r0, r1, r3 str r0, [r2] - ldr r2, _080E6C5C - ldr r4, _080E6C60 + ldr r2, =0x03001138 + ldr r4, =0x000027cc adds r0, r1, r4 str r0, [r2] - ldr r2, _080E6C64 - ldr r3, _080E6C68 + ldr r2, =0x0300113c + ldr r3, =0x00002b50 adds r0, r1, r3 str r0, [r2] - ldr r2, _080E6C6C - ldr r4, _080E6C70 + ldr r2, =0x03001140 + ldr r4, =0x00002e28 adds r0, r1, r4 str r0, [r2] - ldr r2, _080E6C74 - ldr r3, _080E6C78 + ldr r2, =0x03001144 + ldr r3, =0x00002e68 adds r0, r1, r3 str r0, [r2] - ldr r2, _080E6C7C - ldr r0, _080E6C80 + ldr r2, =0x03001148 + ldr r0, =0x02039f9c str r0, [r2] - ldr r2, _080E6C84 - ldr r0, _080E6C88 + ldr r2, =0x0300114c + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r4, _080E6C8C + ldr r4, =0x0000064c adds r3, r0, r4 str r3, [r2] - ldr r2, _080E6C90 - ldr r4, _080E6C94 + ldr r2, =0x03001150 + ldr r4, =0x00003b58 adds r1, r4 str r1, [r2] - ldr r1, _080E6C98 + ldr r1, =0x03001154 adds r0, 0xDC str r0, [r1] - ldr r0, _080E6C9C + ldr r0, =0x03001158 str r3, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080E6C50: .4byte 0x03001134 -_080E6C54: .4byte 0x03005d8c -_080E6C58: .4byte 0x00001a9c -_080E6C5C: .4byte 0x03001138 -_080E6C60: .4byte 0x000027cc -_080E6C64: .4byte 0x0300113c -_080E6C68: .4byte 0x00002b50 -_080E6C6C: .4byte 0x03001140 -_080E6C70: .4byte 0x00002e28 -_080E6C74: .4byte 0x03001144 -_080E6C78: .4byte 0x00002e68 -_080E6C7C: .4byte 0x03001148 -_080E6C80: .4byte 0x02039f9c -_080E6C84: .4byte 0x0300114c -_080E6C88: .4byte 0x03005d90 -_080E6C8C: .4byte 0x0000064c -_080E6C90: .4byte 0x03001150 -_080E6C94: .4byte 0x00003b58 -_080E6C98: .4byte 0x03001154 -_080E6C9C: .4byte 0x03001158 + .pool thumb_func_end sub_80E6BF8 thumb_func_start sub_80E6CA0 sub_80E6CA0: @ 80E6CA0 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080E6D24 + ldr r0, =0x03001134 ldr r1, [r0] movs r4, 0xC8 lsls r4, 4 @@ -473101,7 +457533,7 @@ sub_80E6CA0: @ 80E6CA0 adds r2, r4, 0 bl memcpy adds r4, r5, r4 - ldr r0, _080E6D28 + ldr r0, =0x03001138 ldr r1, [r0] movs r2, 0xE1 lsls r2, 2 @@ -473109,30 +457541,30 @@ sub_80E6CA0: @ 80E6CA0 bl memcpy adds r0, r4, 0 bl sub_80F14F8 - ldr r1, _080E6D2C + ldr r1, =0x00001004 adds r0, r5, r1 - ldr r1, _080E6D30 + ldr r1, =0x0300113c ldr r1, [r1] movs r2, 0x40 bl memcpy - ldr r2, _080E6D34 + ldr r2, =0x00001044 adds r0, r5, r2 - ldr r1, _080E6D38 + ldr r1, =0x03001140 ldr r1, [r1] movs r2, 0x40 bl memcpy - ldr r1, _080E6D3C + ldr r1, =0x00001084 adds r0, r5, r1 - ldr r1, _080E6D40 + ldr r1, =0x03001144 ldr r1, [r1] movs r2, 0x28 bl memcpy - ldr r2, _080E6D44 + ldr r2, =0x000010ac adds r0, r5, r2 bl sub_80E89F8 - ldr r0, _080E6D48 + ldr r0, =0x0300114c ldr r0, [r0] - ldr r2, _080E6D4C + ldr r2, =0x00001124 adds r1, r5, r2 bl sub_81659DC bl link_get_multiplayer_id @@ -473140,7 +457572,7 @@ sub_80E6CA0: @ 80E6CA0 cmp r0, 0 bne _080E6D1C bl sub_81539D4 - ldr r2, _080E6D50 + ldr r2, =0x000011c8 adds r1, r5, r2 strh r0, [r1] _080E6D1C: @@ -473148,25 +457580,14 @@ _080E6D1C: pop {r0} bx r0 .align 2, 0 -_080E6D24: .4byte 0x03001134 -_080E6D28: .4byte 0x03001138 -_080E6D2C: .4byte 0x00001004 -_080E6D30: .4byte 0x0300113c -_080E6D34: .4byte 0x00001044 -_080E6D38: .4byte 0x03001140 -_080E6D3C: .4byte 0x00001084 -_080E6D40: .4byte 0x03001144 -_080E6D44: .4byte 0x000010ac -_080E6D48: .4byte 0x0300114c -_080E6D4C: .4byte 0x00001124 -_080E6D50: .4byte 0x000011c8 + .pool thumb_func_end sub_80E6CA0 thumb_func_start sub_80E6D54 sub_80E6D54: @ 80E6D54 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _080E6DF4 + ldr r0, =0x03001134 ldr r1, [r0] movs r4, 0xC8 lsls r4, 4 @@ -473176,7 +457597,7 @@ sub_80E6D54: @ 80E6D54 adds r0, r5, 0 bl sub_80EB18C adds r4, r5, r4 - ldr r0, _080E6DF8 + ldr r0, =0x03001138 ldr r1, [r0] movs r2, 0xE1 lsls r2, 2 @@ -473184,36 +457605,36 @@ sub_80E6D54: @ 80E6D54 bl memcpy adds r0, r4, 0 bl sub_80F1208 - ldr r1, _080E6DFC + ldr r1, =0x00001004 adds r0, r5, r1 - ldr r1, _080E6E00 + ldr r1, =0x0300113c ldr r1, [r1] movs r2, 0x40 bl memcpy - ldr r2, _080E6E04 + ldr r2, =0x00001044 adds r4, r5, r2 - ldr r0, _080E6E08 + ldr r0, =0x03001140 ldr r1, [r0] adds r0, r4, 0 movs r2, 0x40 bl memcpy adds r0, r4, 0 bl sub_8120B70 - ldr r1, _080E6E0C + ldr r1, =0x00001084 adds r0, r5, r1 - ldr r1, _080E6E10 + ldr r1, =0x03001144 ldr r1, [r1] movs r2, 0x28 bl memcpy - ldr r2, _080E6E14 + ldr r2, =0x000010ac adds r4, r5, r2 adds r0, r4, 0 bl sub_80E89F8 adds r0, r4, 0 bl sub_80E8A54 - ldr r0, _080E6E18 + ldr r0, =0x0300114c ldr r0, [r0] - ldr r1, _080E6E1C + ldr r1, =0x00001124 adds r4, r5, r1 adds r1, r4, 0 bl sub_81659DC @@ -473224,7 +457645,7 @@ sub_80E6D54: @ 80E6D54 cmp r0, 0 bne _080E6DEE bl sub_81539D4 - ldr r2, _080E6E20 + ldr r2, =0x000011c8 adds r1, r5, r2 strh r0, [r1] _080E6DEE: @@ -473232,18 +457653,7 @@ _080E6DEE: pop {r0} bx r0 .align 2, 0 -_080E6DF4: .4byte 0x03001134 -_080E6DF8: .4byte 0x03001138 -_080E6DFC: .4byte 0x00001004 -_080E6E00: .4byte 0x0300113c -_080E6E04: .4byte 0x00001044 -_080E6E08: .4byte 0x03001140 -_080E6E0C: .4byte 0x00001084 -_080E6E10: .4byte 0x03001144 -_080E6E14: .4byte 0x000010ac -_080E6E18: .4byte 0x0300114c -_080E6E1C: .4byte 0x00001124 -_080E6E20: .4byte 0x000011c8 + .pool thumb_func_end sub_80E6D54 thumb_func_start sub_80E6E24 @@ -473258,23 +457668,23 @@ sub_80E6E24: @ 80E6E24 bl sub_800A03C cmp r0, 0 bne _080E6E50 - ldr r0, _080E6E4C + ldr r0, =0x0203a018 ldr r0, [r0] bl sub_80E6CA0 b _080E6F12 .align 2, 0 -_080E6E4C: .4byte 0x0203a018 + .pool _080E6E50: - ldr r0, _080E6E5C + ldr r0, =0x0203a018 ldr r0, [r0] bl sub_80E6D54 b _080E6F12 .align 2, 0 -_080E6E5C: .4byte 0x0203a018 + .pool _080E6E60: - ldr r5, _080E6F18 + ldr r5, =0x0203a018 ldr r0, [r5] - ldr r1, _080E6F1C + ldr r1, =0x03001134 ldr r1, [r1] movs r4, 0xC8 lsls r4, 4 @@ -473282,47 +457692,47 @@ _080E6E60: bl memcpy ldr r0, [r5] adds r0, r4 - ldr r1, _080E6F20 + ldr r1, =0x03001138 ldr r1, [r1] movs r2, 0xE1 lsls r2, 2 bl memcpy ldr r0, [r5] - ldr r1, _080E6F24 + ldr r1, =0x00001004 adds r0, r1 - ldr r1, _080E6F28 + ldr r1, =0x0300113c ldr r1, [r1] movs r2, 0x40 bl memcpy ldr r0, [r5] - ldr r2, _080E6F2C + ldr r2, =0x00001044 adds r0, r2 - ldr r1, _080E6F30 + ldr r1, =0x03001140 ldr r1, [r1] movs r2, 0x40 bl memcpy ldr r0, [r5] - ldr r1, _080E6F34 + ldr r1, =0x00001214 adds r0, r1 - ldr r1, _080E6F38 + ldr r1, =0x03001150 ldr r1, [r1] movs r2, 0x40 bl memcpy ldr r0, [r5] - ldr r2, _080E6F3C + ldr r2, =0x00001084 adds r0, r2 - ldr r1, _080E6F40 + ldr r1, =0x03001144 ldr r1, [r1] movs r2, 0x28 bl memcpy ldr r0, [r5] - ldr r1, _080E6F44 + ldr r1, =0x000010ac adds r0, r1 bl sub_80E89F8 ldr r0, [r5] - ldr r4, _080E6F48 + ldr r4, =0x00001124 adds r0, r4 - ldr r1, _080E6F4C + ldr r1, =0x0300114c ldr r1, [r1] movs r2, 0xEC bl memcpy @@ -473335,18 +457745,18 @@ _080E6E60: bne _080E6EFA bl sub_81539D4 ldr r1, [r5] - ldr r2, _080E6F50 + ldr r2, =0x00001210 adds r1, r2 strh r0, [r1] _080E6EFA: ldr r0, [r5] - ldr r1, _080E6F54 + ldr r1, =0x00001254 adds r0, r1 - ldr r1, _080E6F58 + ldr r1, =0x03001154 ldr r1, [r1] bl sub_80E8110 ldr r0, [r5] - ldr r2, _080E6F5C + ldr r2, =0x000012dc adds r0, r2 bl sub_80E8260 _080E6F12: @@ -473354,24 +457764,7 @@ _080E6F12: pop {r0} bx r0 .align 2, 0 -_080E6F18: .4byte 0x0203a018 -_080E6F1C: .4byte 0x03001134 -_080E6F20: .4byte 0x03001138 -_080E6F24: .4byte 0x00001004 -_080E6F28: .4byte 0x0300113c -_080E6F2C: .4byte 0x00001044 -_080E6F30: .4byte 0x03001140 -_080E6F34: .4byte 0x00001214 -_080E6F38: .4byte 0x03001150 -_080E6F3C: .4byte 0x00001084 -_080E6F40: .4byte 0x03001144 -_080E6F44: .4byte 0x000010ac -_080E6F48: .4byte 0x00001124 -_080E6F4C: .4byte 0x0300114c -_080E6F50: .4byte 0x00001210 -_080E6F54: .4byte 0x00001254 -_080E6F58: .4byte 0x03001154 -_080E6F5C: .4byte 0x000012dc + .pool thumb_func_end sub_80E6E24 thumb_func_start sub_80E6F60 @@ -473383,7 +457776,7 @@ sub_80E6F60: @ 80E6F60 bl sub_800A064 cmp r0, 0 beq _080E7014 - ldr r5, _080E6FF4 + ldr r5, =0x0203a014 ldr r0, [r5] movs r1, 0xC8 lsls r1, 4 @@ -473391,21 +457784,21 @@ sub_80E6F60: @ 80E6F60 add r0, r8 bl sub_80E7B2C ldr r0, [r5] - ldr r6, _080E6FF8 + ldr r6, =0x00001230 lsls r4, 24 lsrs r4, 24 adds r1, r6, 0 adds r2, r4, 0 bl sub_80EAF80 ldr r3, [r5] - ldr r1, _080E6FFC + ldr r1, =0x000010ac adds r0, r3, r1 add r3, r8 adds r1, r6, 0 adds r2, r4, 0 bl sub_80E7B60 ldr r0, [r5] - ldr r1, _080E7000 + ldr r1, =0x00001124 adds r0, r1 adds r1, r6, 0 adds r2, r4, 0 @@ -473416,40 +457809,33 @@ sub_80E6F60: @ 80E6F60 adds r2, r4, 0 bl sub_80F01E8 ldr r0, [r5] - ldr r1, _080E7004 + ldr r1, =0x00001004 adds r0, r1 adds r1, r6, 0 adds r2, r4, 0 bl sub_80F0C7C ldr r0, [r5] - ldr r1, _080E7008 + ldr r1, =0x00001044 adds r0, r1 adds r1, r6, 0 adds r2, r4, 0 bl sub_80E78C4 ldr r0, [r5] - ldr r1, _080E700C + ldr r1, =0x00001084 adds r0, r1 adds r1, r6, 0 adds r2, r4, 0 bl sub_812287C ldr r0, [r5] - ldr r1, _080E7010 + ldr r1, =0x000011c8 adds r0, r1 adds r1, r4, 0 bl sub_80E7F68 b _080E70BE .align 2, 0 -_080E6FF4: .4byte 0x0203a014 -_080E6FF8: .4byte 0x00001230 -_080E6FFC: .4byte 0x000010ac -_080E7000: .4byte 0x00001124 -_080E7004: .4byte 0x00001004 -_080E7008: .4byte 0x00001044 -_080E700C: .4byte 0x00001084 -_080E7010: .4byte 0x000011c8 + .pool _080E7014: - ldr r5, _080E70C8 + ldr r5, =0x0203a014 ldr r0, [r5] movs r1, 0xC8 lsls r1, 4 @@ -473457,7 +457843,7 @@ _080E7014: add r0, r8 bl sub_80E7B2C ldr r0, [r5] - ldr r6, _080E70CC + ldr r6, =0x00001444 lsls r4, 24 lsrs r4, 24 adds r1, r6, 0 @@ -473469,55 +457855,55 @@ _080E7014: adds r2, r4, 0 bl sub_80F01E8 ldr r0, [r5] - ldr r1, _080E70D0 + ldr r1, =0x00001004 adds r0, r1 adds r1, r6, 0 adds r2, r4, 0 bl sub_80F0C7C ldr r0, [r5] - ldr r1, _080E70D4 + ldr r1, =0x00001044 adds r0, r1 adds r1, r6, 0 adds r2, r4, 0 bl sub_80E78C4 ldr r0, [r5] - ldr r1, _080E70D8 + ldr r1, =0x00001084 adds r0, r1 adds r1, r6, 0 adds r2, r4, 0 bl sub_812287C ldr r3, [r5] - ldr r1, _080E70DC + ldr r1, =0x000010ac adds r0, r3, r1 add r3, r8 adds r1, r6, 0 adds r2, r4, 0 bl sub_80E7B60 ldr r0, [r5] - ldr r1, _080E70E0 + ldr r1, =0x00001124 adds r0, r1 adds r1, r6, 0 adds r2, r4, 0 bl sub_80E7948 ldr r0, [r5] - ldr r1, _080E70E4 + ldr r1, =0x00001210 adds r0, r1 adds r1, r4, 0 bl sub_80E7F68 ldr r0, [r5] - ldr r1, _080E70E8 + ldr r1, =0x00001214 adds r0, r1 adds r1, r6, 0 adds r2, r4, 0 bl sub_80E7A14 ldr r0, [r5] - ldr r1, _080E70EC + ldr r1, =0x00001254 adds r0, r1 adds r1, r6, 0 adds r2, r4, 0 bl sub_80E8468 ldr r0, [r5] - ldr r1, _080E70F0 + ldr r1, =0x000012dc adds r0, r1 adds r1, r6, 0 adds r2, r4, 0 @@ -473529,17 +457915,7 @@ _080E70BE: pop {r0} bx r0 .align 2, 0 -_080E70C8: .4byte 0x0203a014 -_080E70CC: .4byte 0x00001444 -_080E70D0: .4byte 0x00001004 -_080E70D4: .4byte 0x00001044 -_080E70D8: .4byte 0x00001084 -_080E70DC: .4byte 0x000010ac -_080E70E0: .4byte 0x00001124 -_080E70E4: .4byte 0x00001210 -_080E70E8: .4byte 0x00001214 -_080E70EC: .4byte 0x00001254 -_080E70F0: .4byte 0x000012dc + .pool thumb_func_end sub_80E6F60 thumb_func_start sub_80E70F4 @@ -473573,7 +457949,7 @@ sub_80E7128: @ 80E7128 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080E7158 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -473594,7 +457970,7 @@ _080E7150: pop {r0} bx r0 .align 2, 0 -_080E7158: .4byte 0x03005e00 + .pool thumb_func_end sub_80E7128 thumb_func_start sub_80E715C @@ -473605,7 +457981,7 @@ sub_80E715C: @ 80E715C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080E7180 + ldr r1, =0x03005e08 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -473614,13 +457990,12 @@ sub_80E715C: @ 80E715C b _080E730A _080E7176: lsls r0, 2 - ldr r1, _080E7184 + ldr r1, =_080E7188 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E7180: .4byte 0x03005e08 -_080E7184: .4byte _080E7188 + .pool .align 2, 0 _080E7188: .4byte _080E71A0 @@ -473630,35 +458005,35 @@ _080E7188: .4byte _080E72AC .4byte _080E72C0 _080E71A0: - ldr r4, _080E71F8 - ldr r0, _080E71FC + ldr r4, =0x0203a018 + ldr r0, =0x00001444 bl malloc str r0, [r4] - ldr r4, _080E7200 - ldr r0, _080E7204 + ldr r4, =0x0203a014 + ldr r0, =0x00005110 bl malloc str r0, [r4] - ldr r0, _080E7208 + ldr r0, =0x020375e2 ldrb r0, [r0] bl sub_8009628 movs r0, 0x80 lsls r0, 7 movs r1, 0x1 bl var_set - ldr r1, _080E720C + ldr r1, =0x03001130 movs r0, 0 strb r0, [r1] bl sub_80E6E24 bl sub_80FB00C movs r0, 0x1 strh r0, [r5] - ldr r0, _080E7210 + ldr r0, =sub_80E7324 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x14] - ldr r0, _080E7214 + ldr r0, =sub_80E7128 + 1 movs r1, 0x51 bl AddTask lsls r0, 24 @@ -473666,16 +458041,9 @@ _080E71A0: strh r0, [r5, 0x1E] b _080E730A .align 2, 0 -_080E71F8: .4byte 0x0203a018 -_080E71FC: .4byte 0x00001444 -_080E7200: .4byte 0x0203a014 -_080E7204: .4byte 0x00005110 -_080E7208: .4byte 0x020375e2 -_080E720C: .4byte 0x03001130 -_080E7210: .4byte sub_80E7324 + 1 -_080E7214: .4byte sub_80E7128 + 1 + .pool _080E7218: - ldr r2, _080E7244 + ldr r2, =0x03005e00 movs r0, 0x14 ldrsh r1, [r5, r0] lsls r0, r1, 2 @@ -473687,17 +458055,16 @@ _080E7218: bne _080E730A movs r0, 0x2 strh r0, [r5] - ldr r0, _080E7248 + ldr r0, =0x00000894 bl flag_set bl sub_80FB074 ldrb r0, [r5, 0x1E] bl remove_task b _080E730A .align 2, 0 -_080E7244: .4byte 0x03005e00 -_080E7248: .4byte 0x00000894 + .pool _080E724C: - ldr r0, _080E7268 + ldr r0, =sub_80E7FF8 + 1 movs r1, 0xA bl AddTask lsls r0, 24 @@ -473709,9 +458076,9 @@ _080E724C: bl audio_play b _080E730A .align 2, 0 -_080E7268: .4byte sub_80E7FF8 + 1 + .pool _080E726C: - ldr r2, _080E72A0 + ldr r2, =0x03005e00 movs r0, 0x14 ldrsh r1, [r5, r0] lsls r0, r1, 2 @@ -473723,7 +458090,7 @@ _080E726C: bne _080E730A movs r0, 0x4 strh r0, [r5] - ldr r0, _080E72A4 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _080E7296 @@ -473732,14 +458099,12 @@ _080E726C: lsrs r0, 24 strh r0, [r5, 0x14] _080E7296: - ldr r0, _080E72A8 + ldr r0, =0x085eea8e bl sub_80E70F4 strh r4, [r5, 0x10] b _080E730A .align 2, 0 -_080E72A0: .4byte 0x03005e00 -_080E72A4: .4byte 0x030030fc -_080E72A8: .4byte 0x085eea8e + .pool _080E72AC: ldrh r0, [r5, 0x10] adds r0, 0x1 @@ -473752,7 +458117,7 @@ _080E72AC: strh r0, [r5] b _080E730A _080E72C0: - ldr r2, _080E7310 + ldr r2, =0x03005e00 movs r0, 0x14 ldrsh r1, [r5, r0] lsls r0, r1, 2 @@ -473762,18 +458127,18 @@ _080E72C0: ldrb r0, [r0, 0x4] cmp r0, 0 bne _080E730A - ldr r0, _080E7314 + ldr r0, =0x0203a014 ldr r0, [r0] bl free - ldr r0, _080E7318 + ldr r0, =0x0203a018 ldr r0, [r0] bl free bl sub_808729C - ldr r0, _080E731C + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080E72F8 - ldr r0, _080E7320 + ldr r0, =sub_80AF2B4 + 1 movs r1, 0xA bl AddTask _080E72F8: @@ -473788,11 +458153,7 @@ _080E730A: pop {r0} bx r0 .align 2, 0 -_080E7310: .4byte 0x03005e00 -_080E7314: .4byte 0x0203a014 -_080E7318: .4byte 0x0203a018 -_080E731C: .4byte 0x030030fc -_080E7320: .4byte sub_80AF2B4 + 1 + .pool thumb_func_end sub_80E715C thumb_func_start sub_80E7324 @@ -473803,7 +458164,7 @@ sub_80E7324: @ 80E7324 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r6, _080E7350 + ldr r6, =0x03005e00 adds r5, r0, r6 movs r0, 0x8 ldrsh r1, [r5, r0] @@ -473821,7 +458182,7 @@ _080E7346: beq _080E7384 b _080E7566 .align 2, 0 -_080E7350: .4byte 0x03005e00 + .pool _080E7354: cmp r1, 0x2 bne _080E735A @@ -473841,7 +458202,7 @@ _080E7362: beq _080E73B8 b _080E7566 _080E7370: - ldr r0, _080E7380 + ldr r0, =0x0000012d cmp r1, r0 beq _080E7432 adds r0, 0x63 @@ -473849,9 +458210,9 @@ _080E7370: beq _080E744A b _080E7566 .align 2, 0 -_080E7380: .4byte 0x0000012d + .pool _080E7384: - ldr r0, _080E739C + ldr r0, =0x085eea7e bl sub_80E70F4 movs r0, 0xE1 lsls r0, 3 @@ -473862,7 +458223,7 @@ _080E7384: bl sub_8009FAC b _080E7566 .align 2, 0 -_080E739C: .4byte 0x085eea7e + .pool _080E73A0: ldrh r0, [r5, 0x20] adds r0, 0x1 @@ -473903,10 +458264,10 @@ _080E73DA: _080E73EA: movs r0, 0x16 bl audio_play - ldr r0, _080E73F4 + ldr r0, =0x0000012d b _080E7564 .align 2, 0 -_080E73F4: .4byte 0x0000012d + .pool _080E73F8: bl sub_800AA48 adds r4, r0, 0 @@ -473963,13 +458324,13 @@ _080E745A: strh r0, [r5, 0x20] b _080E7566 _080E7464: - ldr r0, _080E7488 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080E746E b _080E7566 _080E746E: - ldr r4, _080E748C + ldr r4, =0x02021cc4 bl sub_80E7810 adds r1, r0, 0 lsls r1, 24 @@ -473981,8 +458342,7 @@ _080E746E: movs r0, 0x5 b _080E7564 .align 2, 0 -_080E7488: .4byte 0x03003124 -_080E748C: .4byte 0x02021cc4 + .pool _080E7490: bl sub_800ABAC lsls r0, 24 @@ -473994,17 +458354,17 @@ _080E7490: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x12] - ldr r0, _080E74EC + ldr r0, =sub_80E756C + 1 str r0, [r5] bl sub_800A064 cmp r0, 0 beq _080E7504 - ldr r0, _080E74F0 + ldr r0, =0x0203a018 ldr r0, [r0] adds r1, r5, 0 adds r1, 0xC bl sub_80E7808 - ldr r0, _080E74F4 + ldr r0, =sub_80E7630 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -474015,29 +458375,24 @@ _080E7490: lsls r1, 3 adds r0, r1, r6 strh r4, [r0, 0x8] - ldr r0, _080E74F8 + ldr r0, =0x0203a014 ldr r0, [r0] adds r1, r6, r1 adds r1, 0x12 bl sub_80E7808 - ldr r1, _080E74FC - ldr r0, _080E7500 + ldr r1, =0x0300115c + ldr r0, =0x00001230 str r0, [r1] b _080E7566 .align 2, 0 -_080E74EC: .4byte sub_80E756C + 1 -_080E74F0: .4byte 0x0203a018 -_080E74F4: .4byte sub_80E7630 + 1 -_080E74F8: .4byte 0x0203a014 -_080E74FC: .4byte 0x0300115c -_080E7500: .4byte 0x00001230 + .pool _080E7504: - ldr r0, _080E753C + ldr r0, =0x0203a018 ldr r0, [r0] adds r1, r5, 0 adds r1, 0xC bl sub_80E7808 - ldr r0, _080E7540 + ldr r0, =sub_80E7630 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 @@ -474048,21 +458403,17 @@ _080E7504: lsls r1, 3 adds r0, r1, r6 strh r4, [r0, 0x8] - ldr r0, _080E7544 + ldr r0, =0x0203a014 ldr r0, [r0] adds r1, r6, r1 adds r1, 0x12 bl sub_80E7808 - ldr r1, _080E7548 - ldr r0, _080E754C + ldr r1, =0x0300115c + ldr r0, =0x00001444 str r0, [r1] b _080E7566 .align 2, 0 -_080E753C: .4byte 0x0203a018 -_080E7540: .4byte sub_80E7630 + 1 -_080E7544: .4byte 0x0203a014 -_080E7548: .4byte 0x0300115c -_080E754C: .4byte 0x00001444 + .pool _080E7550: ldrh r0, [r5, 0x1C] adds r0, 0x1 @@ -474090,7 +458441,7 @@ sub_80E756C: @ 80E756C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080E7590 + ldr r0, =0x03005e00 adds r5, r1, r0 movs r2, 0x8 ldrsh r1, [r5, r2] @@ -474098,13 +458449,12 @@ sub_80E756C: @ 80E756C cmp r1, 0x4 bhi _080E7624 lsls r0, r1, 2 - ldr r1, _080E7594 + ldr r1, =_080E7598 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E7590: .4byte 0x03005e00 -_080E7594: .4byte _080E7598 + .pool .align 2, 0 _080E7598: .4byte _080E75AC @@ -474122,12 +458472,12 @@ _080E75AC: movs r0, 0xC8 muls r0, r2 adds r1, r0 - ldr r0, _080E75CC + ldr r0, =0x020228c4 movs r2, 0xC8 bl memcpy b _080E75FC .align 2, 0 -_080E75CC: .4byte 0x020228c4 + .pool _080E75D0: bl link_get_multiplayer_id lsls r0, 24 @@ -474142,7 +458492,7 @@ _080E75E2: strh r0, [r5, 0x10] movs r1, 0x10 ldrsh r4, [r5, r1] - ldr r0, _080E7604 + ldr r0, =0x0300115c ldr r0, [r0] movs r1, 0xC8 bl __udivsi3 @@ -474155,7 +458505,7 @@ _080E75FC: strh r0, [r5, 0x8] b _080E7624 .align 2, 0 -_080E7604: .4byte 0x0300115c + .pool _080E7608: movs r0, 0 strh r0, [r5, 0x8] @@ -474170,14 +458520,14 @@ _080E760E: ldrb r0, [r1, 0x4] cmp r0, 0 bne _080E7624 - ldr r0, _080E762C + ldr r0, =sub_80E77D4 + 1 str r0, [r5] _080E7624: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080E762C: .4byte sub_80E77D4 + 1 + .pool thumb_func_end sub_80E756C thumb_func_start sub_80E7630 @@ -474195,7 +458545,7 @@ sub_80E7630: @ 80E7630 ldr r1, [sp] adds r0, r1 lsls r0, 3 - ldr r1, _080E7674 + ldr r1, =0x03005e00 adds r0, r1 mov r10, r0 bl sub_800A550 @@ -474214,7 +458564,7 @@ sub_80E7630: @ 80E7630 mov r8, r4 b _080E771C .align 2, 0 -_080E7674: .4byte 0x03005e00 + .pool _080E7678: ldr r1, [sp, 0x4] mov r0, r8 @@ -474239,7 +458589,7 @@ _080E7678: movs r7, 0xC8 muls r1, r7 adds r0, r1 - ldr r3, _080E76D8 + ldr r3, =0x0300115c ldr r1, [r3] mov r2, r8 muls r2, r1 @@ -474252,7 +458602,7 @@ _080E7678: ldrsh r2, [r4, r3] adds r0, r2, 0x1 muls r0, r7 - ldr r4, _080E76D8 + ldr r4, =0x0300115c ldr r3, [r4] cmp r0, r3 bls _080E76DC @@ -474262,7 +458612,7 @@ _080E7678: bl memcpy b _080E76E4 .align 2, 0 -_080E76D8: .4byte 0x0300115c + .pool _080E76DC: adds r0, r6, 0 movs r2, 0xC8 @@ -474278,7 +458628,7 @@ _080E76E4: strh r0, [r1] movs r2, 0 ldrsh r4, [r1, r2] - ldr r3, _080E7764 + ldr r3, =0x0300115c ldr r0, [r3] movs r1, 0xC8 bl __udivsi3 @@ -474301,7 +458651,7 @@ _080E771C: lsrs r0, 24 cmp r8, r0 bcc _080E7678 - ldr r2, _080E7768 + ldr r2, =0x03005e00 mov r0, r10 movs r3, 0x8 ldrsh r1, [r0, r3] @@ -474331,8 +458681,7 @@ _080E7752: pop {r0} bx r0 .align 2, 0 -_080E7764: .4byte 0x0300115c -_080E7768: .4byte 0x03005e00 + .pool thumb_func_end sub_80E7630 thumb_func_start sub_80E776C @@ -474343,7 +458692,7 @@ sub_80E776C: @ 80E776C lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r2, _080E779C + ldr r2, =0x03005e00 adds r0, r2 movs r4, 0x1C ldrsh r1, [r0, r4] @@ -474361,7 +458710,7 @@ _080E7794: pop {r0} bx r0 .align 2, 0 -_080E779C: .4byte 0x03005e00 + .pool thumb_func_end sub_80E776C thumb_func_start sub_80E77A0 @@ -474372,11 +458721,11 @@ sub_80E77A0: @ 80E77A0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080E77C8 + ldr r0, =0x03005e00 adds r1, r0 - ldr r0, _080E77CC + ldr r0, =sub_80E776C + 1 str r0, [r1] - ldr r0, _080E77D0 + ldr r0, =0x03001130 ldrb r0, [r0] cmp r0, 0x1 bne _080E77C4 @@ -474387,30 +458736,26 @@ _080E77C4: pop {r0} bx r0 .align 2, 0 -_080E77C8: .4byte 0x03005e00 -_080E77CC: .4byte sub_80E776C + 1 -_080E77D0: .4byte 0x03001130 + .pool thumb_func_end sub_80E77A0 thumb_func_start sub_80E77D4 sub_80E77D4: @ 80E77D4 lsls r0, 24 lsrs r0, 24 - ldr r2, _080E77F0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _080E77F4 + ldr r0, =sub_80E77A0 + 1 str r0, [r1] - ldr r1, _080E77F8 + ldr r1, =0x03001130 movs r0, 0x1 strb r0, [r1] bx lr .align 2, 0 -_080E77F0: .4byte 0x03005e00 -_080E77F4: .4byte sub_80E77A0 + 1 -_080E77F8: .4byte 0x03001130 + .pool thumb_func_end sub_80E77D4 thumb_func_start sub_80E77FC @@ -474445,11 +458790,11 @@ sub_80E7810: @ 80E7810 sub_80E7820: @ 80E7820 lsls r0, 24 lsrs r0, 16 - ldr r1, _080E782C + ldr r1, =0x020223c4 adds r0, r1 bx lr .align 2, 0 -_080E782C: .4byte 0x020223c4 + .pool thumb_func_end sub_80E7820 thumb_func_start sub_80E7830 @@ -474472,7 +458817,7 @@ _080E784A: b _080E78B8 _080E7850: movs r3, 0 - ldr r2, _080E7864 + ldr r2, =0x0858cf8c adds r1, r4, 0 _080E7856: adds r0, r3, r2 @@ -474483,7 +458828,7 @@ _080E7856: bls _080E7856 b _080E78B8 .align 2, 0 -_080E7864: .4byte 0x0858cf8c + .pool _080E7868: movs r0, 0 bl sub_800A2A4 @@ -474491,7 +458836,7 @@ _080E7868: movs r0, 0x1 ands r2, r0 movs r3, 0 - ldr r1, _080E7890 + ldr r1, =0x0858cf8e lsls r0, r2, 1 adds r0, r2 adds r1, r0, r1 @@ -474505,7 +458850,7 @@ _080E7880: bls _080E7880 b _080E78B8 .align 2, 0 -_080E7890: .4byte 0x0858cf8e + .pool _080E7894: movs r0, 0 bl sub_800A2A4 @@ -474513,7 +458858,7 @@ _080E7894: bl __umodsi3 adds r2, r0, 0 movs r3, 0 - ldr r1, _080E78C0 + ldr r1, =0x0858cf94 lsls r0, r2, 2 adds r1, r0, r1 adds r2, r4, 0 @@ -474529,7 +458874,7 @@ _080E78B8: pop {r0} bx r0 .align 2, 0 -_080E78C0: .4byte 0x0858cf94 + .pool thumb_func_end sub_80E7830 thumb_func_start sub_80E78C4 @@ -474552,7 +458897,7 @@ sub_80E78C4: @ 80E78C4 muls r0, r1 mov r2, r9 adds r6, r2, r0 - ldr r2, _080E790C + ldr r2, =0x020229e8 lsls r0, r1, 3 subs r0, r1 lsls r0, 2 @@ -474568,14 +458913,14 @@ sub_80E78C4: @ 80E78C4 bl sub_8120D34 b _080E791A .align 2, 0 -_080E790C: .4byte 0x020229e8 + .pool _080E7910: adds r0, r6, 0 adds r1, r4, 0 adds r2, r5, 0 bl sub_8120CD0 _080E791A: - ldr r0, _080E7944 + ldr r0, =0x03001140 ldr r0, [r0] lsls r1, r7, 2 add r1, sp @@ -474595,7 +458940,7 @@ _080E791A: pop {r0} bx r0 .align 2, 0 -_080E7944: .4byte 0x03001140 + .pool thumb_func_end sub_80E78C4 thumb_func_start sub_80E7948 @@ -474630,7 +458975,7 @@ sub_80E7948: @ 80E7948 cmp r0, 0x1 bne _080E79FE adds r7, r6, 0 - ldr r2, _080E79A8 + ldr r2, =0x020229e8 ldr r1, [r5] lsls r0, r1, 3 subs r0, r1 @@ -474644,7 +458989,7 @@ sub_80E7948: @ 80E7948 bl sub_8164F70 b _080E79FE .align 2, 0 -_080E79A8: .4byte 0x020229e8 + .pool _080E79AC: adds r5, r7, 0 muls r5, r6 @@ -474713,7 +459058,7 @@ sub_80E7A14: @ 80E7A14 adds r0, r7, 0 muls r0, r5 add r0, r8 - ldr r6, _080E7A5C + ldr r6, =0x03001150 ldr r1, [r6] movs r2, 0x40 bl memcpy @@ -474731,11 +459076,11 @@ sub_80E7A14: @ 80E7A14 bl memcpy b _080E7A62 .align 2, 0 -_080E7A5C: .4byte 0x03001150 + .pool _080E7A60: movs r4, 0 _080E7A62: - ldr r0, _080E7A98 + ldr r0, =0x03001150 ldr r0, [r0] lsls r1, r5, 2 add r1, sp @@ -474759,7 +459104,7 @@ _080E7A8A: pop {r0} bx r0 .align 2, 0 -_080E7A98: .4byte 0x03001150 + .pool thumb_func_end sub_80E7A14 thumb_func_start sub_80E7A9C @@ -474845,7 +459190,7 @@ sub_80E7B2C: @ 80E7B2C adds r3, r0, 0 movs r2, 0 movs r1, 0 - ldr r4, _080E7B50 + ldr r4, =0x03001160 _080E7B36: adds r0, r3, r1 ldrb r0, [r0] @@ -474860,16 +459205,16 @@ _080E7B36: pop {r0} bx r0 .align 2, 0 -_080E7B50: .4byte 0x03001160 + .pool thumb_func_end sub_80E7B2C thumb_func_start sub_80E7B54 sub_80E7B54: @ 80E7B54 - ldr r0, _080E7B5C + ldr r0, =0x03001160 ldrb r0, [r0] bx lr .align 2, 0 -_080E7B5C: .4byte 0x03001160 + .pool thumb_func_end sub_80E7B54 thumb_func_start sub_80E7B60 @@ -474889,7 +459234,7 @@ sub_80E7B60: @ 80E7B60 lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x38] - ldr r0, _080E7BF4 + ldr r0, =0x020229e8 ldrh r0, [r0, 0x4] bl SeedRng2 bl sub_8009FCC @@ -474945,14 +459290,14 @@ _080E7BB0: str r3, [sp, 0x44] b _080E7D04 .align 2, 0 -_080E7BF4: .4byte 0x020229e8 + .pool _080E7BF8: ldr r1, [sp, 0x30] mov r0, r8 muls r0, r1 ldr r2, [sp, 0x2C] adds r7, r2, r0 - ldr r1, _080E7C50 + ldr r1, =0x020229e8 mov r3, r8 lsls r0, r3, 3 subs r0, r3 @@ -474991,14 +459336,14 @@ _080E7C24: movs r4, 0x1 b _080E7C5C .align 2, 0 -_080E7C50: .4byte 0x020229e8 + .pool _080E7C54: adds r0, r4, 0 bl sub_8009370 mov r4, r9 _080E7C5C: ldrh r1, [r5, 0x2C] - ldr r0, _080E7C70 + ldr r0, =0x000015fc cmp r1, r0 bne _080E7C74 adds r0, r5, 0 @@ -475007,7 +459352,7 @@ _080E7C5C: movs r1, 0x1 b _080E7C76 .align 2, 0 -_080E7C70: .4byte 0x000015fc + .pool _080E7C74: mov r1, r9 _080E7C76: @@ -475329,7 +459674,7 @@ _080E7EB6: bl sub_80E7AA4 b _080E7F1C _080E7EC8: - ldr r0, _080E7EE4 + ldr r0, =0x0858cfb8 lsls r1, 1 adds r2, r1, r0 ldrb r3, [r2] @@ -475343,10 +459688,10 @@ _080E7EC8: bl sub_80E7AA4 b _080E7F1C .align 2, 0 -_080E7EE4: .4byte 0x0858cfb8 + .pool _080E7EE8: add r6, sp, 0x24 - ldr r4, _080E7F5C + ldr r4, =0x0858cfbe lsls r5, r1, 2 adds r0, r5, r4 ldrb r3, [r0] @@ -475373,7 +459718,7 @@ _080E7F1C: ldr r1, [sp, 0x2C] ldr r2, [sp, 0x44] adds r7, r1, r2 - ldr r4, _080E7F60 + ldr r4, =0x03005d8c ldr r0, [r4] movs r3, 0xC2 lsls r3, 6 @@ -475382,7 +459727,7 @@ _080E7F1C: movs r2, 0x38 bl memcpy ldr r0, [r4] - ldr r1, _080E7F64 + ldr r1, =0x0000310c adds r0, r1 adds r1, r7, 0 adds r1, 0x38 @@ -475399,9 +459744,7 @@ _080E7F1C: pop {r0} bx r0 .align 2, 0 -_080E7F5C: .4byte 0x0858cfbe -_080E7F60: .4byte 0x03005d8c -_080E7F64: .4byte 0x0000310c + .pool thumb_func_end sub_80E7B60 thumb_func_start sub_80E7F68 @@ -475437,27 +459780,23 @@ sub_80E7F68: @ 80E7F68 lsls r0, 24 cmp r0, 0 beq _080E7FE4 - ldr r0, _080E7FD0 + ldr r0, =0x00004001 ldrh r1, [r4] bl var_set - ldr r0, _080E7FD4 - ldr r1, _080E7FD8 + ldr r0, =0x02021cc4 + ldr r1, =0x020229f0 bl gf_strcpy ldrh r1, [r4] - ldr r0, _080E7FDC + ldr r0, =0x00000113 cmp r1, r0 bne _080E7FEC - ldr r0, _080E7FE0 + ldr r0, =0x000008b3 bl flag_set b _080E7FEC .align 2, 0 -_080E7FD0: .4byte 0x00004001 -_080E7FD4: .4byte 0x02021cc4 -_080E7FD8: .4byte 0x020229f0 -_080E7FDC: .4byte 0x00000113 -_080E7FE0: .4byte 0x000008b3 + .pool _080E7FE4: - ldr r0, _080E7FF4 + ldr r0, =0x00004001 movs r1, 0 bl var_set _080E7FEC: @@ -475465,7 +459804,7 @@ _080E7FEC: pop {r0} bx r0 .align 2, 0 -_080E7FF4: .4byte 0x00004001 + .pool thumb_func_end sub_80E7F68 thumb_func_start sub_80E7FF8 @@ -475476,7 +459815,7 @@ sub_80E7FF8: @ 80E7FF8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080E801C + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -475485,13 +459824,12 @@ sub_80E7FF8: @ 80E7FF8 b _080E810A _080E8012: lsls r0, 2 - ldr r1, _080E8020 + ldr r1, =_080E8024 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080E801C: .4byte 0x03005e00 -_080E8020: .4byte _080E8024 + .pool .align 2, 0 _080E8024: .4byte _080E80F2 @@ -475537,7 +459875,7 @@ _080E807C: bl sub_800AC34 b _080E80F2 _080E8090: - ldr r0, _080E80A0 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080E810A @@ -475545,26 +459883,26 @@ _080E8090: bl remove_task b _080E810A .align 2, 0 -_080E80A0: .4byte 0x03003124 + .pool _080E80A4: movs r0, 0 bl sub_801048C lsls r0, 24 cmp r0, 0 bne _080E810A - ldr r0, _080E80BC + ldr r0, =sub_8153688 + 1 movs r1, 0x5 bl AddTask b _080E80F2 .align 2, 0 -_080E80BC: .4byte sub_8153688 + 1 + .pool _080E80C0: - ldr r0, _080E80E0 + ldr r0, =sub_8153688 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 bne _080E810A - ldr r0, _080E80E4 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _080E80E8 @@ -475574,8 +459912,7 @@ _080E80C0: strh r0, [r4, 0x8] b _080E810A .align 2, 0 -_080E80E0: .4byte sub_8153688 + 1 -_080E80E4: .4byte 0x030030fc + .pool _080E80E8: movs r0, 0x4 strh r0, [r4, 0x8] @@ -475631,7 +459968,7 @@ sub_80E8110: @ 80E8110 str r2, [sp, 0x4] mov r8, r2 movs r7, 0 - ldr r0, _080E81DC + ldr r0, =0x03005d90 mov r9, r0 _080E8150: mov r1, r9 @@ -475703,7 +460040,7 @@ _080E81D0: beq _080E81EC b _080E824C .align 2, 0 -_080E81DC: .4byte 0x03005d90 + .pool _080E81E0: ldr r2, [sp, 0x4] lsls r1, r2, 4 @@ -475714,10 +460051,10 @@ _080E81E0: _080E81EC: bl GenerateRandomNumber2 lsls r0, 16 - ldr r1, _080E821C + ldr r1, =0x33330000 cmp r0, r1 bls _080E8224 - ldr r0, _080E8220 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB2 ldrb r0, [r0] @@ -475735,10 +460072,9 @@ _080E820E: bl memcpy b _080E824C .align 2, 0 -_080E821C: .4byte 0x33330000 -_080E8220: .4byte 0x03005d90 + .pool _080E8224: - ldr r0, _080E825C + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB2 ldrb r0, [r0] @@ -475766,7 +460102,7 @@ _080E824C: pop {r0} bx r0 .align 2, 0 -_080E825C: .4byte 0x03005d90 + .pool thumb_func_end sub_80E8110 thumb_func_start sub_80E8260 @@ -475779,7 +460115,7 @@ sub_80E8260: @ 80E8260 sub sp, 0xC mov r8, r0 movs r6, 0 - ldr r0, _080E83F4 + ldr r0, =0x03005d90 mov r10, r0 _080E8274: movs r7, 0 @@ -475812,9 +460148,9 @@ _080E8286: mov r6, r9 cmp r6, 0x8 ble _080E8274 - ldr r1, _080E83F4 + ldr r1, =0x03005d90 mov r10, r1 - ldr r2, _080E83F8 + ldr r2, =0x00000ee1 str r2, [sp, 0x4] movs r4, 0x99 lsls r4, 1 @@ -475823,7 +460159,7 @@ _080E8286: lsls r0, 1 add r0, r8 mov r9, r0 - ldr r1, _080E83FC + ldr r1, =0x00000ef1 str r1, [sp, 0x8] movs r6, 0x92 lsls r6, 1 @@ -475871,7 +460207,7 @@ _080E82DA: cmp r7, 0 bge _080E82DA movs r6, 0 - ldr r0, _080E83F4 + ldr r0, =0x03005d90 ldr r3, [r0] mov r4, r8 movs r1, 0xC4 @@ -475889,7 +460225,7 @@ _080E82DA: adds r1, r3, r1 str r1, [sp] mov r10, r4 - ldr r2, _080E8400 + ldr r2, =0x00000cf4 adds r5, r3, r2 _080E8356: lsls r2, r6, 1 @@ -475901,7 +460237,7 @@ _080E8356: ldrh r0, [r5, 0x4] mov r1, r12 strh r0, [r1] - ldr r1, _080E8404 + ldr r1, =0x00000d14 adds r0, r3, r1 adds r0, r2 ldrh r0, [r0] @@ -475914,25 +460250,25 @@ _080E8356: ldrh r0, [r0] mov r1, r8 strh r0, [r1] - ldr r1, _080E8408 + ldr r1, =0x00000dde adds r0, r3, r1 adds r0, r2 ldrh r0, [r0] mov r1, r8 strh r0, [r1, 0x20] - ldr r1, _080E840C + ldr r1, =0x00000dea adds r0, r3, r1 adds r0, r2 ldrh r0, [r0] mov r1, r9 strh r0, [r1] - ldr r1, _080E8410 + ldr r1, =0x00000e08 adds r0, r3, r1 adds r0, r2 ldrh r0, [r0] mov r1, r9 strh r0, [r1, 0x20] - ldr r1, _080E8414 + ldr r1, =0x00000e1e adds r0, r3, r1 adds r0, r2 ldrh r1, [r0] @@ -475940,7 +460276,7 @@ _080E8356: lsls r0, 1 add r0, r10 strh r1, [r0] - ldr r1, _080E8418 + ldr r1, =0x00000cfc adds r0, r3, r1 adds r0, r2 ldrh r1, [r0] @@ -475971,16 +460307,7 @@ _080E8356: pop {r0} bx r0 .align 2, 0 -_080E83F4: .4byte 0x03005d90 -_080E83F8: .4byte 0x00000ee1 -_080E83FC: .4byte 0x00000ef1 -_080E8400: .4byte 0x00000cf4 -_080E8404: .4byte 0x00000d14 -_080E8408: .4byte 0x00000dde -_080E840C: .4byte 0x00000dea -_080E8410: .4byte 0x00000e08 -_080E8414: .4byte 0x00000e1e -_080E8418: .4byte 0x00000cfc + .pool thumb_func_end sub_80E8260 thumb_func_start sub_80E841C @@ -476054,7 +460381,7 @@ _080E8496: ldrb r0, [r6] cmp r0, 0xFF beq _080E84B4 - ldr r0, _080E84C8 + ldr r0, =0x03005d90 ldr r1, [r0] adds r1, 0xDC adds r0, r4, 0 @@ -476077,9 +460404,9 @@ _080E84B4: beq _080E8508 b _080E8566 .align 2, 0 -_080E84C8: .4byte 0x03005d90 + .pool _080E84CC: - ldr r4, _080E8504 + ldr r4, =0x03005d90 ldr r0, [r4] adds r1, r0, 0 adds r1, 0xB2 @@ -476107,14 +460434,14 @@ _080E84CC: adds r0, 0x1 b _080E8550 .align 2, 0 -_080E8504: .4byte 0x03005d90 + .pool _080E8508: movs r5, 0 adds r6, r3, 0 _080E850C: movs r0, 0x1 eors r0, r5 - ldr r7, _080E8574 + ldr r7, =0x03005d90 ldr r4, [r7] adds r1, r4, 0 adds r1, 0xB2 @@ -476163,7 +460490,7 @@ _080E8566: pop {r0} bx r0 .align 2, 0 -_080E8574: .4byte 0x03005d90 + .pool thumb_func_end sub_80E8468 thumb_func_start sub_80E8578 @@ -476180,10 +460507,10 @@ sub_80E8578: @ 80E8578 mov r8, r4 movs r5, 0 str r5, [sp, 0x4] - ldr r4, _080E8594 + ldr r4, =0x03001168 b _080E85A0 .align 2, 0 -_080E8594: .4byte 0x03001168 + .pool _080E8598: adds r1, r2 ldr r6, [sp, 0x4] @@ -476226,7 +460553,7 @@ _080E85BE: _080E85DC: movs r6, 0 mov r8, r6 - ldr r0, _080E8874 + ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, [sp, 0x10] lsls r0, r2, 5 @@ -476292,7 +460619,7 @@ _080E864A: adds r0, r1, r2 ldr r4, [sp] adds r5, r0, r4 - ldr r0, _080E8878 + ldr r0, =0x03001168 adds r0, r6, r0 str r0, [sp, 0x50] _080E8666: @@ -476335,7 +460662,7 @@ _080E86A8: ldr r3, [sp, 0xC] cmp r3, 0 bne _080E86CE - ldr r0, _080E8878 + ldr r0, =0x03001168 ldr r4, [sp, 0x38] adds r0, r4, r0 ldr r0, [r0] @@ -476381,7 +460708,7 @@ _080E8702: ldr r5, [sp, 0x8] adds r5, 0x1 str r5, [sp, 0x2C] - ldr r0, _080E8874 + ldr r0, =0x03005d90 ldr r1, [r0] movs r0, 0x54 ldr r6, [sp, 0x8] @@ -476397,7 +460724,7 @@ _080E8720: movs r5, 0xD8 lsls r5, 3 adds r0, r2, r5 - ldr r6, _080E887C + ldr r6, =0x0000057c adds r1, r3, r6 ldm r1!, {r4-r6} stm r0!, {r4-r6} @@ -476439,7 +460766,7 @@ _080E8766: mov r1, r8 adds r1, 0x1 str r1, [sp, 0x30] - ldr r0, _080E8878 + ldr r0, =0x03001168 ldr r2, [sp, 0x38] adds r2, r0 mov r9, r2 @@ -476529,7 +460856,7 @@ _080E8808: adds r1, r2 ldr r3, [sp] adds r1, r3, r1 - ldr r0, _080E8878 + ldr r0, =0x03001168 ldr r4, [sp, 0x38] adds r0, r4, r0 ldr r0, [r0] @@ -476568,9 +460895,7 @@ _080E8864: pop {r0} bx r0 .align 2, 0 -_080E8874: .4byte 0x03005d90 -_080E8878: .4byte 0x03001168 -_080E887C: .4byte 0x0000057c + .pool thumb_func_end sub_80E8578 thumb_func_start sub_80E8880 @@ -476680,7 +461005,7 @@ sub_80E8924: @ 80E8924 push {r5-r7} mov r9, r0 movs r0, 0 - ldr r1, _080E89A4 + ldr r1, =0x03005d90 mov r10, r1 _080E8936: lsls r1, r0, 1 @@ -476712,12 +461037,12 @@ _080E8950: cmp r0, 0x8 ble _080E8936 movs r5, 0 - ldr r4, _080E89A4 + ldr r4, =0x03005d90 _080E8972: movs r0, 0x54 adds r1, r5, 0 muls r1, r0 - ldr r2, _080E89A8 + ldr r2, =0x0000057c adds r1, r2 ldr r0, [r4] adds r0, r1 @@ -476739,8 +461064,7 @@ _080E8972: pop {r0} bx r0 .align 2, 0 -_080E89A4: .4byte 0x03005d90 -_080E89A8: .4byte 0x0000057c + .pool thumb_func_end sub_80E8924 thumb_func_start sub_80E89AC @@ -476783,8 +461107,8 @@ sub_80E89AC: @ 80E89AC sub_80E89F8: @ 80E89F8 push {r4-r6,lr} adds r6, r0, 0 - ldr r5, _080E8A40 - ldr r4, _080E8A44 + ldr r5, =0x02039f9c + ldr r4, =0x03005d8c ldr r1, [r4] movs r0, 0xC2 lsls r0, 6 @@ -476793,18 +461117,18 @@ sub_80E89F8: @ 80E89F8 movs r2, 0x38 bl memcpy ldr r1, [r4] - ldr r0, _080E8A48 + ldr r0, =0x0000310c adds r1, r0 adds r0, r5, 0 adds r0, 0x38 movs r2, 0x38 bl memcpy ldr r0, [r4] - ldr r1, _080E8A4C + ldr r1, =0x00003030 adds r0, r1 adds r1, r5, 0 bl sub_806FA9C - ldr r0, _080E8A50 + ldr r0, =0x03001148 ldr r1, [r0] adds r0, r6, 0 movs r2, 0x78 @@ -476813,11 +461137,7 @@ sub_80E89F8: @ 80E89F8 pop {r0} bx r0 .align 2, 0 -_080E8A40: .4byte 0x02039f9c -_080E8A44: .4byte 0x03005d8c -_080E8A48: .4byte 0x0000310c -_080E8A4C: .4byte 0x00003030 -_080E8A50: .4byte 0x03001148 + .pool thumb_func_end sub_80E89F8 thumb_func_start sub_80E8A54 @@ -476916,7 +461236,7 @@ sub_80E8AF0: @ 80E8AF0 adds r4, r0, 0 movs r0, 0 str r0, [sp] - ldr r2, _080E8B24 + ldr r2, =0x01000028 mov r0, sp adds r1, r4, 0 bl CpuFastSet @@ -476938,19 +461258,19 @@ _080E8B0A: pop {r0} bx r0 .align 2, 0 -_080E8B24: .4byte 0x01000028 + .pool thumb_func_end sub_80E8AF0 thumb_func_start sub_80E8B28 sub_80E8B28: @ 80E8B28 push {r4,r5,lr} movs r4, 0 - ldr r5, _080E8B50 + ldr r5, =0x03005d8c _080E8B2E: lsls r1, r4, 2 adds r1, r4 lsls r1, 5 - ldr r0, _080E8B54 + ldr r0, =0x00001a9c adds r1, r0 ldr r0, [r5] adds r0, r1 @@ -476964,33 +461284,31 @@ _080E8B2E: pop {r0} bx r0 .align 2, 0 -_080E8B50: .4byte 0x03005d8c -_080E8B54: .4byte 0x00001a9c + .pool thumb_func_end sub_80E8B28 thumb_func_start sub_80E8B58 sub_80E8B58: @ 80E8B58 - ldr r0, _080E8B64 - ldr r1, _080E8B68 + ldr r0, =0x0203a01c + ldr r1, =0x020375e0 ldrh r1, [r1] strb r1, [r0] bx lr .align 2, 0 -_080E8B64: .4byte 0x0203a01c -_080E8B68: .4byte 0x020375e0 + .pool thumb_func_end sub_80E8B58 thumb_func_start sub_80E8B6C sub_80E8B6C: @ 80E8B6C push {r4,lr} - ldr r0, _080E8B7C + ldr r0, =0x020375f0 movs r1, 0 strh r1, [r0] movs r3, 0 adds r4, r0, 0 b _080E8B86 .align 2, 0 -_080E8B7C: .4byte 0x020375f0 + .pool _080E8B80: adds r0, r3, 0x1 lsls r0, 16 @@ -476998,14 +461316,14 @@ _080E8B80: _080E8B86: cmp r3, 0x13 bhi _080E8BB0 - ldr r2, _080E8BB8 - ldr r0, _080E8BBC + ldr r2, =0x0203a01c + ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r3, 2 adds r0, r3 lsls r0, 5 adds r1, r0 - ldr r0, _080E8BC0 + ldr r0, =0x00001a9c adds r1, r0 ldrb r0, [r2] ldrb r1, [r1] @@ -477013,7 +461331,7 @@ _080E8B86: bne _080E8B80 movs r0, 0x1 strh r0, [r4] - ldr r0, _080E8BC4 + ldr r0, =0x00004054 adds r1, r3, 0 bl var_set _080E8BB0: @@ -477021,38 +461339,33 @@ _080E8BB0: pop {r0} bx r0 .align 2, 0 -_080E8BB8: .4byte 0x0203a01c -_080E8BBC: .4byte 0x03005d8c -_080E8BC0: .4byte 0x00001a9c -_080E8BC4: .4byte 0x00004054 + .pool thumb_func_end sub_80E8B6C thumb_func_start sub_80E8BC8 sub_80E8BC8: @ 80E8BC8 push {lr} - ldr r0, _080E8BE0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080E8BE4 + ldr r1, =0x00001a9c adds r0, r1 ldrb r1, [r0] cmp r1, 0 beq _080E8BEC - ldr r1, _080E8BE8 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] b _080E8BF0 .align 2, 0 -_080E8BE0: .4byte 0x03005d8c -_080E8BE4: .4byte 0x00001a9c -_080E8BE8: .4byte 0x020375f0 + .pool _080E8BEC: - ldr r0, _080E8BF4 + ldr r0, =0x020375f0 strh r1, [r0] _080E8BF0: pop {r0} bx r0 .align 2, 0 -_080E8BF4: .4byte 0x020375f0 + .pool thumb_func_end sub_80E8BC8 thumb_func_start sub_80E8BF8 @@ -477071,7 +461384,7 @@ sub_80E8BF8: @ 80E8BF8 ldrsh r1, [r4, r2] bl cur_mapdata_block_get_role_at adds r1, r0, 0 - ldr r2, _080E8C30 + ldr r2, =0x00000fff adds r0, r2, 0 ands r1, r0 adds r0, r1, 0 @@ -477083,7 +461396,7 @@ sub_80E8BF8: @ 80E8BF8 movs r0, 0x1 b _080E8C8E .align 2, 0 -_080E8C30: .4byte 0x00000fff + .pool _080E8C34: adds r0, r1, 0 subs r0, 0x92 @@ -477146,7 +461459,7 @@ _080E8C8E: thumb_func_start sub_80E8C98 sub_80E8C98: @ 80E8C98 push {r4,lr} - ldr r4, _080E8CAC + ldr r4, =0x020375e6 bl sub_80E8BF8 lsls r0, 24 lsrs r0, 24 @@ -477155,7 +461468,7 @@ sub_80E8C98: @ 80E8C98 pop {r0} bx r0 .align 2, 0 -_080E8CAC: .4byte 0x020375e6 + .pool thumb_func_end sub_80E8C98 thumb_func_start sub_80E8CB0 @@ -477171,7 +461484,7 @@ sub_80E8CB0: @ 80E8CB0 lsls r2, 16 lsrs r2, 16 mov r10, r2 - ldr r0, _080E8D14 + ldr r0, =0x02037318 ldr r0, [r0] mov r8, r0 movs r0, 0 @@ -477192,7 +461505,7 @@ _080E8CDA: muls r6, r4 mov r1, r8 ldr r5, [r1, 0xC] - ldr r0, _080E8D18 + ldr r0, =0x000003ff mov r9, r0 _080E8CF2: lsls r0, r2, 16 @@ -477212,8 +461525,7 @@ _080E8CF2: strh r0, [r2] b _080E8D3C .align 2, 0 -_080E8D14: .4byte 0x02037318 -_080E8D18: .4byte 0x000003ff + .pool _080E8D1C: adds r0, r3, 0x1 lsls r0, 16 @@ -477264,13 +461576,13 @@ sub_80E8D4C: @ 80E8D4C mov r12, r4 lsls r0, 16 asrs r3, r0, 16 - ldr r1, _080E8D98 + ldr r1, =0x0858cfcc mov r8, r1 adds r7, r0, 0 mov r4, sp mov r6, r12 _080E8D80: - ldr r0, _080E8D98 + ldr r0, =0x0858cfcc lsls r1, r5, 2 adds r2, r1, r0 ldrh r0, [r2] @@ -477283,7 +461595,7 @@ _080E8D80: ldrh r3, [r2, 0x2] b _080E8DC4 .align 2, 0 -_080E8D98: .4byte 0x0858cfcc + .pool _080E8D9C: adds r0, r5, 0x1 lsls r0, 16 @@ -477362,16 +461674,16 @@ sub_80E8E18: @ 80E8E18 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r2, _080E8EB4 + ldr r2, =0x03005d8c ldr r0, [r2] - ldr r1, _080E8EB8 + ldr r1, =0x0203a01c ldrb r1, [r1] - ldr r3, _080E8EBC + ldr r3, =0x00001a9c adds r0, r3 strb r1, [r0] movs r3, 0 - ldr r5, _080E8EC0 - ldr r4, _080E8EC4 + ldr r5, =0x00001aa5 + ldr r4, =0x03005d90 _080E8E32: ldr r1, [r2] adds r1, r5 @@ -477386,14 +461698,14 @@ _080E8E32: lsrs r3, r0, 16 cmp r3, 0x3 bls _080E8E32 - ldr r0, _080E8EC8 + ldr r0, =0x00004054 movs r1, 0 bl var_set - ldr r6, _080E8EB4 + ldr r6, =0x03005d8c ldr r4, [r6] - ldr r0, _080E8ECC + ldr r0, =0x00001a9e adds r4, r0 - ldr r1, _080E8EC4 + ldr r1, =0x03005d90 mov r8, r1 ldr r5, [r1] adds r0, r5, 0 @@ -477408,7 +461720,7 @@ _080E8E32: mov r1, r8 ldr r0, [r1] ldrb r0, [r0, 0x8] - ldr r1, _080E8ED0 + ldr r1, =0x00001a9d adds r3, r1 movs r1, 0x1 ands r1, r0 @@ -477420,12 +461732,12 @@ _080E8E32: orrs r0, r1 strb r0, [r3] ldr r0, [r6] - ldr r3, _080E8ED4 + ldr r3, =0x00001aa9 adds r0, r3 movs r1, 0x2 strb r1, [r0] - ldr r0, _080E8ED8 - ldr r1, _080E8EDC + ldr r0, =0x00004026 + ldr r1, =0x02037318 ldrb r1, [r1, 0x14] bl var_set pop {r3} @@ -477434,17 +461746,7 @@ _080E8E32: pop {r0} bx r0 .align 2, 0 -_080E8EB4: .4byte 0x03005d8c -_080E8EB8: .4byte 0x0203a01c -_080E8EBC: .4byte 0x00001a9c -_080E8EC0: .4byte 0x00001aa5 -_080E8EC4: .4byte 0x03005d90 -_080E8EC8: .4byte 0x00004054 -_080E8ECC: .4byte 0x00001a9e -_080E8ED0: .4byte 0x00001a9d -_080E8ED4: .4byte 0x00001aa9 -_080E8ED8: .4byte 0x00004026 -_080E8EDC: .4byte 0x02037318 + .pool thumb_func_end sub_80E8E18 thumb_func_start sub_80E8EE0 @@ -477470,14 +461772,14 @@ _080E8EEE: cmp r0, 0x8 bne _080E8F82 movs r4, 0 - ldr r7, _080E8F60 + ldr r7, =0x03005d8c _080E8F0A: ldr r1, [r7] lsls r0, r4, 2 adds r0, r4 lsls r0, 5 adds r1, r0 - ldr r0, _080E8F64 + ldr r0, =0x00001a9c adds r1, r0 ldrb r1, [r1] adds r0, r2, r5 @@ -477498,7 +461800,7 @@ _080E8F0A: movs r3, 0 lsls r0, 16 asrs r1, r0, 16 - ldr r6, _080E8F68 + ldr r6, =0x0858cfcc _080E8F42: lsls r0, r3, 2 adds r2, r0, r6 @@ -477515,9 +461817,7 @@ _080E8F42: bl setmaptile_0 b _080E8F82 .align 2, 0 -_080E8F60: .4byte 0x03005d8c -_080E8F64: .4byte 0x00001a9c -_080E8F68: .4byte 0x0858cfcc + .pool _080E8F6C: adds r0, r3, 0x1 lsls r0, 16 @@ -477551,11 +461851,11 @@ _080E8F8A: thumb_func_start sub_80E8F9C sub_80E8F9C: @ 80E8F9C push {lr} - ldr r0, _080E8FC8 + ldr r0, =0x0203a01c ldrb r0, [r0] movs r1, 0xA bl __udivsi3 - ldr r2, _080E8FCC + ldr r2, =0x0858cfe8 lsls r0, 26 asrs r0, 24 adds r1, r0, r2 @@ -477571,8 +461871,7 @@ sub_80E8F9C: @ 80E8F9C pop {r0} bx r0 .align 2, 0 -_080E8FC8: .4byte 0x0203a01c -_080E8FCC: .4byte 0x0858cfe8 + .pool thumb_func_end sub_80E8F9C thumb_func_start sub_80E8FD0 @@ -477580,7 +461879,7 @@ sub_80E8FD0: @ 80E8FD0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080E8FF0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -477593,9 +461892,9 @@ sub_80E8FD0: @ 80E8FD0 beq _080E900C b _080E904A .align 2, 0 -_080E8FF0: .4byte 0x03005e00 + .pool _080E8FF4: - ldr r0, _080E9008 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -477605,19 +461904,19 @@ _080E8FF4: strh r0, [r2, 0x8] b _080E904A .align 2, 0 -_080E9008: .4byte 0x02037fd4 + .pool _080E900C: - ldr r0, _080E9050 + ldr r0, =0x00004054 bl var_get lsls r0, 16 lsrs r0, 16 - ldr r1, _080E9054 + ldr r1, =0x03005d8c ldr r2, [r1] lsls r1, r0, 2 adds r1, r0 lsls r1, 5 adds r2, r1 - ldr r0, _080E9058 + ldr r0, =0x00001aac adds r2, r0 ldrb r0, [r2] cmp r0, 0xFE @@ -477627,10 +461926,10 @@ _080E900C: _080E9030: bl sub_80E8F9C bl warp_in - ldr r0, _080E905C - ldr r1, _080E9060 + ldr r0, =0x03005dac + ldr r1, =sub_80AF168 + 1 str r1, [r0] - ldr r0, _080E9064 + ldr r0, =c2_load_new_map + 1 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -477639,24 +461938,19 @@ _080E904A: pop {r0} bx r0 .align 2, 0 -_080E9050: .4byte 0x00004054 -_080E9054: .4byte 0x03005d8c -_080E9058: .4byte 0x00001aac -_080E905C: .4byte 0x03005dac -_080E9060: .4byte sub_80AF168 + 1 -_080E9064: .4byte c2_load_new_map + 1 + .pool thumb_func_end sub_80E8FD0 thumb_func_start sub_80E9068 sub_80E9068: @ 80E9068 push {lr} - ldr r0, _080E9094 + ldr r0, =sub_80E8FD0 + 1 movs r1, 0 bl AddTask movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _080E9098 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -477669,18 +461963,17 @@ sub_80E9068: @ 80E9068 pop {r0} bx r0 .align 2, 0 -_080E9094: .4byte sub_80E8FD0 + 1 -_080E9098: .4byte 0x03005d8c + .pool thumb_func_end sub_80E9068 thumb_func_start sub_80E909C sub_80E909C: @ 80E909C push {lr} - ldr r0, _080E90B8 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x9 bne _080E90C0 - ldr r0, _080E90BC + ldr r0, =0x00004097 bl var_get lsls r0, 16 cmp r0, 0 @@ -477688,8 +461981,7 @@ sub_80E909C: @ 80E909C movs r0, 0 b _080E90C2 .align 2, 0 -_080E90B8: .4byte 0x02037318 -_080E90BC: .4byte 0x00004097 + .pool _080E90C0: movs r0, 0x1 _080E90C2: @@ -477702,12 +461994,12 @@ sub_80E90C8: @ 80E90C8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080E9100 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080E9104 + ldr r1, =0x02037350 adds r0, r1 movs r1, 0x2 bl npc_turn @@ -477724,8 +462016,7 @@ _080E90F8: pop {r0} bx r0 .align 2, 0 -_080E9100: .4byte 0x02037590 -_080E9104: .4byte 0x02037350 + .pool thumb_func_end sub_80E90C8 thumb_func_start sub_80E9108 @@ -477764,7 +462055,7 @@ sub_80E9108: @ 80E9108 ldrsh r1, [r4, r2] bl cur_mapdata_draw_block_at bl pal_fill_black - ldr r0, _080E9168 + ldr r0, =sub_80E90C8 + 1 movs r1, 0 bl AddTask add sp, 0x4 @@ -477772,7 +462063,7 @@ sub_80E9108: @ 80E9108 pop {r0} bx r0 .align 2, 0 -_080E9168: .4byte sub_80E90C8 + 1 + .pool thumb_func_end sub_80E9108 thumb_func_start sub_80E916C @@ -477781,17 +462072,17 @@ sub_80E916C: @ 80E916C sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080E91DC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080E91D4 - ldr r0, _080E91E0 + ldr r0, =0x0203a01c ldrb r0, [r0] movs r1, 0xA bl __udivsi3 - ldr r1, _080E91E4 + ldr r1, =0x03005d8c ldr r1, [r1] movs r5, 0x4 ldrsb r5, [r1, r5] @@ -477800,7 +462091,7 @@ sub_80E916C: @ 80E916C asrs r1, 24 movs r2, 0x1 negs r2, r2 - ldr r4, _080E91E8 + ldr r4, =0x0858cfe8 lsls r0, 26 asrs r0, 24 adds r3, r0, 0x2 @@ -477817,10 +462108,10 @@ sub_80E916C: @ 80E916C adds r0, r5, 0 bl warp1_set bl warp_in - ldr r1, _080E91EC - ldr r0, _080E91F0 + ldr r1, =0x03005dac + ldr r0, =sub_80E9108 + 1 str r0, [r1] - ldr r0, _080E91F4 + ldr r0, =c2_load_new_map + 1 bl set_callback2 adds r0, r6, 0 bl remove_task @@ -477830,19 +462121,13 @@ _080E91D4: pop {r0} bx r0 .align 2, 0 -_080E91DC: .4byte 0x02037fd4 -_080E91E0: .4byte 0x0203a01c -_080E91E4: .4byte 0x03005d8c -_080E91E8: .4byte 0x0858cfe8 -_080E91EC: .4byte 0x03005dac -_080E91F0: .4byte sub_80E9108 + 1 -_080E91F4: .4byte c2_load_new_map + 1 + .pool thumb_func_end sub_80E916C thumb_func_start sub_80E91F8 sub_80E91F8: @ 80E91F8 push {lr} - ldr r0, _080E9210 + ldr r0, =sub_80E916C + 1 movs r1, 0 bl AddTask movs r0, 0x1 @@ -477851,13 +462136,13 @@ sub_80E91F8: @ 80E91F8 pop {r0} bx r0 .align 2, 0 -_080E9210: .4byte sub_80E916C + 1 + .pool thumb_func_end sub_80E91F8 thumb_func_start sub_80E9214 sub_80E9214: @ 80E9214 push {lr} - ldr r0, _080E922C + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -477869,7 +462154,7 @@ sub_80E9214: @ 80E9214 movs r0, 0x1 b _080E9232 .align 2, 0 -_080E922C: .4byte 0x03005d8c + .pool _080E9230: movs r0, 0 _080E9232: @@ -477890,15 +462175,15 @@ sub_80E9238: @ 80E9238 lsls r0, 24 cmp r0, 0 beq _080E9328 - ldr r0, _080E92E0 + ldr r0, =0x00004054 bl var_get lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _080E92E4 + ldr r1, =0x03005d8c lsls r0, r5, 2 adds r0, r5 lsls r0, 5 - ldr r2, _080E92E8 + ldr r2, =0x00001a9c adds r0, r2 ldr r1, [r1] adds r1, r0 @@ -477919,7 +462204,7 @@ _080E927A: lsrs r0, 24 cmp r0, 0x77 bhi _080E92AC - ldr r0, _080E92EC + ldr r0, =0x085a5c08 ldrb r3, [r1] lsls r1, r3, 5 adds r1, r0 @@ -477957,20 +462242,16 @@ _080E92AC: adds r0, 0x7 ldrh r1, [r4] adds r1, 0x7 - ldr r2, _080E92F0 + ldr r2, =0x00000e21 bl setmaptile_0 b _080E9328 .align 2, 0 -_080E92E0: .4byte 0x00004054 -_080E92E4: .4byte 0x03005d8c -_080E92E8: .4byte 0x00001a9c -_080E92EC: .4byte 0x085a5c08 -_080E92F0: .4byte 0x00000e21 + .pool _080E92F4: mov r0, r8 cmp r0, 0x1 bne _080E9328 - ldr r0, _080E9334 + ldr r0, =0x00004089 bl var_get lsls r0, 16 lsrs r0, 16 @@ -477988,7 +462269,7 @@ _080E92F4: adds r0, 0x7 ldrh r1, [r4] adds r1, 0x7 - ldr r2, _080E9338 + ldr r2, =0x00000e0a bl setmaptile_0 _080E9328: add sp, 0x4 @@ -477998,8 +462279,7 @@ _080E9328: pop {r0} bx r0 .align 2, 0 -_080E9334: .4byte 0x00004089 -_080E9338: .4byte 0x00000e0a + .pool thumb_func_end sub_80E9238 thumb_func_start sub_80E933C @@ -478014,31 +462294,29 @@ sub_80E933C: @ 80E933C lsls r0, 24 cmp r0, 0 bne _080E9374 - ldr r0, _080E9368 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080E936C + ldr r1, =0x0000271c adds r1, r0, r1 str r1, [sp, 0x4] - ldr r2, _080E9370 + ldr r2, =0x00002728 adds r2, r0, r2 str r2, [sp, 0x8] movs r3, 0xC str r3, [sp, 0x10] b _080E939C .align 2, 0 -_080E9368: .4byte 0x03005d8c -_080E936C: .4byte 0x0000271c -_080E9370: .4byte 0x00002728 + .pool _080E9374: - ldr r0, _080E93A0 + ldr r0, =0x00004054 bl var_get lsls r0, 16 lsrs r0, 16 - ldr r2, _080E93A4 + ldr r2, =0x03005d8c lsls r1, r0, 2 adds r1, r0 lsls r1, 5 - ldr r4, _080E93A8 + ldr r4, =0x00001a9c adds r1, r4 ldr r0, [r2] adds r0, r1 @@ -478053,9 +462331,7 @@ _080E939C: movs r6, 0 b _080E955A .align 2, 0 -_080E93A0: .4byte 0x00004054 -_080E93A4: .4byte 0x03005d8c -_080E93A8: .4byte 0x00001a9c + .pool _080E93AC: ldr r4, [sp, 0x4] adds r0, r4, r6 @@ -478070,7 +462346,7 @@ _080E93BE: mov r1, r10 ldrb r0, [r1] lsls r0, 5 - ldr r2, _080E9510 + ldr r2, =0x085a5c08 adds r0, r2 ldrb r1, [r0, 0x11] ldrb r0, [r0, 0x13] @@ -478080,7 +462356,7 @@ _080E93BE: b _080E9554 _080E93D4: movs r5, 0 - ldr r0, _080E9514 + ldr r0, =0x02037318 ldr r3, [r0, 0x4] ldrb r4, [r3] mov r9, r0 @@ -478088,7 +462364,7 @@ _080E93D4: bcs _080E9412 ldr r0, [r3, 0x4] ldrh r2, [r0, 0x14] - ldr r1, _080E9518 + ldr r1, =0x020375e0 ldrh r0, [r1] adds r0, 0xAE adds r7, r1, 0 @@ -478119,14 +462395,14 @@ _080E9412: bne _080E941E b _080E9554 _080E941E: - ldr r4, _080E951C + ldr r4, =0x020375e4 mov r8, r4 ldr r0, [sp, 0x8] adds r1, r0, r6 ldrb r0, [r1] lsrs r0, 4 strh r0, [r4] - ldr r7, _080E9520 + ldr r7, =0x020375e6 ldrb r1, [r1] movs r0, 0xF ands r0, r1 @@ -478151,7 +462427,7 @@ _080E941E: cmp r0, 0x1 bne _080E9554 _080E9462: - ldr r6, _080E9524 + ldr r6, =0x020375f0 mov r1, r9 ldr r0, [r1, 0x4] ldr r1, [r0, 0x4] @@ -478159,7 +462435,7 @@ _080E9462: adds r4, r5 lsls r4, 3 adds r1, r4, r1 - ldr r2, _080E9528 + ldr r2, =0x00003f20 adds r0, r2, 0 ldrb r1, [r1, 0x1] adds r0, r1 @@ -478168,7 +462444,7 @@ _080E9462: mov r3, r10 ldrb r1, [r3] lsls r1, 5 - ldr r2, _080E952C + ldr r2, =0x085a5c24 adds r1, r2 ldr r1, [r1] ldrh r1, [r1] @@ -478179,14 +462455,14 @@ _080E9462: adds r4, r0 ldrb r0, [r4] strh r0, [r6] - ldr r0, _080E9518 + ldr r0, =0x020375e0 ldrh r0, [r0] adds r0, 0xAE lsls r0, 16 lsrs r0, 16 bl flag_clear ldrb r0, [r6] - ldr r5, _080E9530 + ldr r5, =0x03005d8c ldr r2, [r5] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -478214,7 +462490,7 @@ _080E9462: lsrs r0, 24 cmp r0, 0x1 bne _080E954C - ldr r0, _080E9534 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 @@ -478230,16 +462506,7 @@ _080E9462: bl sub_808F28C b _080E954C .align 2, 0 -_080E9510: .4byte 0x085a5c08 -_080E9514: .4byte 0x02037318 -_080E9518: .4byte 0x020375e0 -_080E951C: .4byte 0x020375e4 -_080E9520: .4byte 0x020375e6 -_080E9524: .4byte 0x020375f0 -_080E9528: .4byte 0x00003f20 -_080E952C: .4byte 0x085a5c24 -_080E9530: .4byte 0x03005d8c -_080E9534: .4byte 0x00004054 + .pool _080E9538: ldr r1, [sp, 0xC] cmp r1, 0x7 @@ -478251,7 +462518,7 @@ _080E9538: movs r3, 0x7 bl sub_808F28C _080E954C: - ldr r1, _080E9574 + ldr r1, =0x020375e0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] @@ -478274,14 +462541,14 @@ _080E9562: pop {r0} bx r0 .align 2, 0 -_080E9574: .4byte 0x020375e0 + .pool thumb_func_end sub_80E933C thumb_func_start sub_80E9578 sub_80E9578: @ 80E9578 push {r4-r6,lr} movs r5, 0 - ldr r1, _080E95CC + ldr r1, =0x02037318 ldr r0, [r1, 0x4] ldrb r0, [r0] cmp r5, r0 @@ -478302,7 +462569,7 @@ _080E9588: cmp r0, 0xD bhi _080E95B6 ldrb r0, [r1] - ldr r1, _080E95D0 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -478322,16 +462589,15 @@ _080E95C4: pop {r0} bx r0 .align 2, 0 -_080E95CC: .4byte 0x02037318 -_080E95D0: .4byte 0x03005d8c + .pool thumb_func_end sub_80E9578 thumb_func_start sub_80E95D4 sub_80E95D4: @ 80E95D4 push {r4,r5,lr} - ldr r5, _080E95FC - ldr r4, _080E9600 - ldr r0, _080E9604 + ldr r5, =0x0000401f + ldr r4, =0x0858d060 + ldr r0, =0x00004054 bl var_get lsls r0, 24 lsrs r0, 24 @@ -478346,9 +462612,7 @@ sub_80E95D4: @ 80E95D4 pop {r0} bx r0 .align 2, 0 -_080E95FC: .4byte 0x0000401f -_080E9600: .4byte 0x0858d060 -_080E9604: .4byte 0x00004054 + .pool thumb_func_end sub_80E95D4 thumb_func_start sub_80E9608 @@ -478360,7 +462624,7 @@ sub_80E9608: @ 80E9608 ldrb r0, [r4, 0x3] cmp r3, r0 bge _080E9660 - ldr r6, _080E964C + ldr r6, =0x0203a01c _080E9618: lsls r3, 16 asrs r1, r3, 16 @@ -478388,7 +462652,7 @@ _080E9618: strb r0, [r6] b _080E9660 .align 2, 0 -_080E964C: .4byte 0x0203a01c + .pool _080E9650: movs r1, 0x80 lsls r1, 9 @@ -478409,12 +462673,12 @@ sub_80E9668: @ 80E9668 push {lr} bl sub_80E9608 bl sub_80E8B6C - ldr r0, _080E967C + ldr r0, =0x08275bb7 bl script_env_1_execute_new_script pop {r0} bx r0 .align 2, 0 -_080E967C: .4byte 0x08275bb7 + .pool thumb_func_end sub_80E9668 thumb_func_start sub_80E9680 @@ -478422,14 +462686,14 @@ sub_80E9680: @ 80E9680 push {lr} bl sub_80E8B58 bl sub_80E8B6C - ldr r0, _080E9698 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 beq _080E969C movs r0, 0x1 b _080E969E .align 2, 0 -_080E9698: .4byte 0x020375f0 + .pool _080E969C: movs r0, 0 _080E969E: @@ -478442,7 +462706,7 @@ sub_80E96A4: @ 80E96A4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080E96C8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -478457,7 +462721,7 @@ sub_80E96A4: @ 80E96A4 beq _080E96D2 b _080E9714 .align 2, 0 -_080E96C8: .4byte 0x03005e00 + .pool _080E96CC: cmp r0, 0x2 beq _080E96F4 @@ -478468,7 +462732,7 @@ _080E96D2: strh r0, [r4, 0x8] b _080E9714 _080E96DC: - ldr r0, _080E96F0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -478478,15 +462742,15 @@ _080E96DC: strh r0, [r4, 0x8] b _080E9714 .align 2, 0 -_080E96F0: .4byte 0x02037fd4 + .pool _080E96F4: movs r0, 0x7E bl copy_saved_warp2_bank_and_enter_x_to_warp1 bl warp_in - ldr r0, _080E971C - ldr r1, _080E9720 + ldr r0, =0x03005dac + ldr r1, =mapldr_default + 1 str r1, [r0] - ldr r0, _080E9724 + ldr r0, =c2_load_new_map + 1 bl set_callback2 bl script_env_2_disable adds r0, r5, 0 @@ -478496,15 +462760,13 @@ _080E9714: pop {r0} bx r0 .align 2, 0 -_080E971C: .4byte 0x03005dac -_080E9720: .4byte mapldr_default + 1 -_080E9724: .4byte c2_load_new_map + 1 + .pool thumb_func_end sub_80E96A4 thumb_func_start sub_80E9728 sub_80E9728: @ 80E9728 push {lr} - ldr r0, _080E9740 + ldr r0, =sub_80E96A4 + 1 movs r1, 0 bl AddTask movs r0, 0x1 @@ -478513,38 +462775,35 @@ sub_80E9728: @ 80E9728 pop {r0} bx r0 .align 2, 0 -_080E9740: .4byte sub_80E96A4 + 1 + .pool thumb_func_end sub_80E9728 thumb_func_start sub_80E9744 sub_80E9744: @ 80E9744 push {lr} - ldr r0, _080E9760 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080E9764 + ldr r1, =0x00001a9c adds r0, r1 - ldr r1, _080E9768 + ldr r1, =0x0203a01c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 beq _080E9770 - ldr r1, _080E976C + ldr r1, =0x020375f0 movs r0, 0x1 b _080E9774 .align 2, 0 -_080E9760: .4byte 0x03005d8c -_080E9764: .4byte 0x00001a9c -_080E9768: .4byte 0x0203a01c -_080E976C: .4byte 0x020375f0 + .pool _080E9770: - ldr r1, _080E977C + ldr r1, =0x020375f0 movs r0, 0 _080E9774: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_080E977C: .4byte 0x020375f0 + .pool thumb_func_end sub_80E9744 thumb_func_start sub_80E9780 @@ -478555,14 +462814,14 @@ sub_80E9780: @ 80E9780 adds r6, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r0, _080E97DC + ldr r0, =0x03005d8c mov r8, r0 lsls r5, r1, 2 adds r5, r1 lsls r5, 5 ldr r4, [r0] adds r4, r5, r4 - ldr r1, _080E97E0 + ldr r1, =0x00001a9e adds r4, r1 adds r0, r4, 0 bl sub_80E8DF4 @@ -478577,12 +462836,12 @@ sub_80E9780: @ 80E9780 mov r1, r8 ldr r0, [r1] adds r0, r5 - ldr r1, _080E97E4 + ldr r1, =0x00001aa9 adds r0, r1 ldrb r1, [r0] adds r0, r6, 0 bl sub_8009308 - ldr r1, _080E97E8 + ldr r1, =0x085ea72f adds r0, r6, 0 bl gf_strcat pop {r3} @@ -478591,17 +462850,14 @@ sub_80E9780: @ 80E9780 pop {r1} bx r1 .align 2, 0 -_080E97DC: .4byte 0x03005d8c -_080E97E0: .4byte 0x00001a9e -_080E97E4: .4byte 0x00001aa9 -_080E97E8: .4byte 0x085ea72f + .pool thumb_func_end sub_80E9780 thumb_func_start sub_80E97EC sub_80E97EC: @ 80E97EC push {r4,lr} adds r4, r0, 0 - ldr r0, _080E9808 + ldr r0, =0x00004054 bl var_get adds r1, r0, 0 lsls r1, 24 @@ -478612,7 +462868,7 @@ sub_80E97EC: @ 80E97EC pop {r1} bx r1 .align 2, 0 -_080E9808: .4byte 0x00004054 + .pool thumb_func_end sub_80E97EC thumb_func_start sub_80E980C @@ -478620,20 +462876,20 @@ sub_80E980C: @ 80E980C push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _080E9864 + ldr r0, =0x00004054 bl var_get lsls r0, 24 lsrs r0, 24 - ldr r1, _080E9868 + ldr r1, =0x03005d8c mov r8, r1 lsls r5, r0, 2 adds r5, r0 lsls r5, 5 ldr r4, [r1] adds r4, r5, r4 - ldr r0, _080E986C + ldr r0, =0x00001a9e adds r4, r0 - ldr r6, _080E9870 + ldr r6, =0x02021cc4 adds r0, r4, 0 bl sub_80E8DF4 adds r2, r0, 0 @@ -478647,7 +462903,7 @@ sub_80E980C: @ 80E980C mov r1, r8 ldr r0, [r1] adds r0, r5 - ldr r1, _080E9874 + ldr r1, =0x00001aa9 adds r0, r1 ldrb r1, [r0] adds r0, r6, 0 @@ -478658,11 +462914,7 @@ sub_80E980C: @ 80E980C pop {r0} bx r0 .align 2, 0 -_080E9864: .4byte 0x00004054 -_080E9868: .4byte 0x03005d8c -_080E986C: .4byte 0x00001a9e -_080E9870: .4byte 0x02021cc4 -_080E9874: .4byte 0x00001aa9 + .pool thumb_func_end sub_80E980C thumb_func_start sub_80E9878 @@ -478670,13 +462922,13 @@ sub_80E9878: @ 80E9878 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080E989C + ldr r1, =0x03005d8c ldr r2, [r1] lsls r1, r0, 2 adds r1, r0 lsls r1, 5 adds r2, r1 - ldr r0, _080E98A0 + ldr r0, =0x00001a9d adds r2, r0 ldrb r0, [r2] lsrs r0, 6 @@ -478685,8 +462937,7 @@ sub_80E9878: @ 80E9878 movs r0, 0 b _080E98A6 .align 2, 0 -_080E989C: .4byte 0x03005d8c -_080E98A0: .4byte 0x00001a9d + .pool _080E98A4: movs r0, 0x1 _080E98A6: @@ -478753,12 +463004,12 @@ sub_80E9914: @ 80E9914 sub sp, 0x24 movs r0, 0 mov r10, r0 - ldr r0, _080E9A70 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r2, _080E9A74 + ldr r2, =0x00001ad0 adds r2, r1, r2 str r2, [sp] - ldr r3, _080E9A78 + ldr r3, =0x00001a9c adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 @@ -478766,19 +463017,19 @@ sub_80E9914: @ 80E9914 b _080E9A60 _080E993A: movs r6, 0 - ldr r7, _080E9A7C + ldr r7, =0x00001ae8 adds r7, r1, r7 str r7, [sp, 0x14] - ldr r0, _080E9A80 + ldr r0, =0x00001b18 adds r0, r1, r0 str r0, [sp, 0xC] - ldr r2, _080E9A84 + ldr r2, =0x00001b24 adds r2, r1, r2 str r2, [sp, 0x10] adds r3, 0x94 adds r3, r1, r3 str r3, [sp, 0x18] - ldr r7, _080E9A88 + ldr r7, =0x00001b36 adds r7, r1, r7 str r7, [sp, 0x1C] mov r9, r6 @@ -478786,7 +463037,7 @@ _080E995C: movs r4, 0 lsls r5, r6, 2 lsls r3, r6, 1 - ldr r0, _080E9A8C + ldr r0, =0x020244ec mov r8, r0 adds r1, r6, 0x1 str r1, [sp, 0x4] @@ -478844,7 +463095,7 @@ _080E996E: lsls r7, r0, 1 adds r0, 0x1 str r0, [sp, 0x8] - ldr r2, _080E9A8C + ldr r2, =0x020244ec _080E99DA: adds r1, r4, 0 adds r1, 0xD @@ -478866,7 +463117,7 @@ _080E99DA: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _080E9A8C + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -478918,25 +463169,18 @@ _080E9A60: pop {r0} bx r0 .align 2, 0 -_080E9A70: .4byte 0x03005d8c -_080E9A74: .4byte 0x00001ad0 -_080E9A78: .4byte 0x00001a9c -_080E9A7C: .4byte 0x00001ae8 -_080E9A80: .4byte 0x00001b18 -_080E9A84: .4byte 0x00001b24 -_080E9A88: .4byte 0x00001b36 -_080E9A8C: .4byte 0x020244ec + .pool thumb_func_end sub_80E9914 thumb_func_start sub_80E9A90 sub_80E9A90: @ 80E9A90 push {r4-r6,lr} - ldr r5, _080E9AB4 + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r4, _080E9AB8 + ldr r4, =0x00001aaa adds r1, r0, r4 ldrh r6, [r1] - ldr r1, _080E9ABC + ldr r1, =0x00001a9c adds r0, r1 bl sub_80E8AF0 ldr r0, [r5] @@ -478947,9 +463191,7 @@ sub_80E9A90: @ 80E9A90 pop {r0} bx r0 .align 2, 0 -_080E9AB4: .4byte 0x03005d8c -_080E9AB8: .4byte 0x00001aaa -_080E9ABC: .4byte 0x00001a9c + .pool thumb_func_end sub_80E9A90 thumb_func_start sub_80E9AC0 @@ -478965,12 +463207,12 @@ sub_80E9AC0: @ 80E9AC0 thumb_func_start sub_80E9AD0 sub_80E9AD0: @ 80E9AD0 push {r4-r7,lr} - ldr r0, _080E9ADC + ldr r0, =0x02037318 ldr r4, [r0, 0x4] movs r6, 0 b _080E9B62 .align 2, 0 -_080E9ADC: .4byte 0x02037318 + .pool _080E9AE0: ldr r2, [r4, 0x10] lsls r1, r6, 1 @@ -478981,9 +463223,9 @@ _080E9AE0: adds r7, r1, 0 cmp r0, 0x8 bne _080E9B5C - ldr r0, _080E9B30 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080E9B34 + ldr r1, =0x00001a9c adds r0, r1 ldrb r1, [r0] ldr r0, [r2, 0x8] @@ -478995,7 +463237,7 @@ _080E9AE0: adds r1, 0x7 bl cur_mapdata_get_blockid_at movs r1, 0 - ldr r5, _080E9B38 + ldr r5, =0x0858cfcc lsls r0, 16 asrs r2, r0, 16 _080E9B16: @@ -479013,9 +463255,7 @@ _080E9B2A: bl cur_mapdata_full_redraw b _080E9B68 .align 2, 0 -_080E9B30: .4byte 0x03005d8c -_080E9B34: .4byte 0x00001a9c -_080E9B38: .4byte 0x0858cfcc + .pool _080E9B3C: ldr r0, [r4, 0x10] adds r1, r7, r6 @@ -479052,12 +463292,12 @@ sub_80E9B70: @ 80E9B70 bl sub_80E9AD0 movs r0, 0x14 bl sav12_xor_increment - ldr r5, _080E9B9C + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r4, _080E9BA0 + ldr r4, =0x00001aaa adds r1, r0, r4 ldrh r6, [r1] - ldr r1, _080E9BA4 + ldr r1, =0x00001a9c adds r0, r1 bl sub_80E8AF0 ldr r0, [r5] @@ -479067,9 +463307,7 @@ sub_80E9B70: @ 80E9B70 pop {r0} bx r0 .align 2, 0 -_080E9B9C: .4byte 0x03005d8c -_080E9BA0: .4byte 0x00001aaa -_080E9BA4: .4byte 0x00001a9c + .pool thumb_func_end sub_80E9B70 thumb_func_start sub_80E9BA8 @@ -479106,7 +463344,7 @@ _080E9BC4: thumb_func_start sub_80E9BDC sub_80E9BDC: @ 80E9BDC push {lr} - ldr r0, _080E9BFC + ldr r0, =0x00004054 bl var_get lsls r0, 24 lsrs r0, 24 @@ -479115,25 +463353,24 @@ sub_80E9BDC: @ 80E9BDC lsrs r1, r0, 24 cmp r1, 0x1 bne _080E9C04 - ldr r0, _080E9C00 + ldr r0, =0x020375f0 strh r1, [r0] b _080E9C22 .align 2, 0 -_080E9BFC: .4byte 0x00004054 -_080E9C00: .4byte 0x020375f0 + .pool _080E9C04: bl sub_80E9BA8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 bls _080E9C1C - ldr r1, _080E9C18 + ldr r1, =0x020375f0 movs r0, 0x2 b _080E9C20 .align 2, 0 -_080E9C18: .4byte 0x020375f0 + .pool _080E9C1C: - ldr r1, _080E9C28 + ldr r1, =0x020375f0 movs r0, 0 _080E9C20: strh r0, [r1] @@ -479141,15 +463378,15 @@ _080E9C22: pop {r0} bx r0 .align 2, 0 -_080E9C28: .4byte 0x020375f0 + .pool thumb_func_end sub_80E9BDC thumb_func_start sub_80E9C2C sub_80E9C2C: @ 80E9C2C push {lr} - ldr r0, _080E9C68 + ldr r0, =0x00004054 bl var_get - ldr r1, _080E9C6C + ldr r1, =0x03005d8c ldr r2, [r1] lsls r0, 16 lsrs r0, 16 @@ -479157,7 +463394,7 @@ sub_80E9C2C: @ 80E9C2C adds r1, r0 lsls r1, 5 adds r2, r1 - ldr r0, _080E9C70 + ldr r0, =0x00001a9d adds r2, r0 ldrb r3, [r2] lsrs r1, r3, 6 @@ -479174,33 +463411,31 @@ sub_80E9C2C: @ 80E9C2C pop {r0} bx r0 .align 2, 0 -_080E9C68: .4byte 0x00004054 -_080E9C6C: .4byte 0x03005d8c -_080E9C70: .4byte 0x00001a9d + .pool thumb_func_end sub_80E9C2C thumb_func_start sub_80E9C74 sub_80E9C74: @ 80E9C74 push {lr} - ldr r0, _080E9C84 + ldr r0, =sub_8126AD8 + 1 movs r1, 0 bl AddTask pop {r0} bx r0 .align 2, 0 -_080E9C84: .4byte sub_8126AD8 + 1 + .pool thumb_func_end sub_80E9C74 thumb_func_start sub_80E9C88 sub_80E9C88: @ 80E9C88 push {lr} - ldr r0, _080E9C98 + ldr r0, =sub_80E9C9C + 1 movs r1, 0 bl AddTask pop {r0} bx r0 .align 2, 0 -_080E9C98: .4byte sub_80E9C9C + 1 + .pool thumb_func_end sub_80E9C88 thumb_func_start sub_80E9C9C @@ -479213,7 +463448,7 @@ sub_80E9C9C: @ 80E9C9C lsls r0, r6, 2 adds r0, r6 lsls r7, r0, 3 - ldr r0, _080E9D00 + ldr r0, =0x03005e08 mov r8, r0 adds r5, r7, r0 bl script_env_2_enable @@ -479229,12 +463464,12 @@ sub_80E9C9C: @ 80E9C9C movs r0, 0 movs r1, 0 bl sub_8197434 - ldr r4, _080E9D04 + ldr r4, =0x0203a020 movs r0, 0xDC lsls r0, 1 bl malloc_and_clear str r0, [r4] - ldr r0, _080E9D08 + ldr r0, =0x0858d06c bl Window_AddFromTemplate strh r0, [r5, 0xC] adds r0, r6, 0 @@ -479244,17 +463479,14 @@ sub_80E9C9C: @ 80E9C9C mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, _080E9D0C + ldr r1, =sub_80E9E90 + 1 str r1, [r0] b _080E9D1A .align 2, 0 -_080E9D00: .4byte 0x03005e08 -_080E9D04: .4byte 0x0203a020 -_080E9D08: .4byte 0x0858d06c -_080E9D0C: .4byte sub_80E9E90 + 1 + .pool _080E9D10: - ldr r1, _080E9D24 - ldr r2, _080E9D28 + ldr r1, =0x085ea785 + ldr r2, =task_pc_turn_off + 1 adds r0, r6, 0 bl sub_81978EC _080E9D1A: @@ -479264,8 +463496,7 @@ _080E9D1A: pop {r0} bx r0 .align 2, 0 -_080E9D24: .4byte 0x085ea785 -_080E9D28: .4byte task_pc_turn_off + 1 + .pool thumb_func_end sub_80E9C9C thumb_func_start game_continue @@ -479278,11 +463509,11 @@ game_continue: @ 80E9D2C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080E9DAC + ldr r0, =0x03005e08 adds r7, r1, r0 movs r6, 0 movs r5, 0x1 - ldr r0, _080E9DB0 + ldr r0, =0x0203a020 mov r8, r0 _080E9D48: adds r0, r5, 0 @@ -479315,11 +463546,11 @@ _080E9D7C: lsrs r5, r0, 24 cmp r5, 0x13 bls _080E9D48 - ldr r4, _080E9DB0 + ldr r4, =0x0203a020 ldr r1, [r4] lsls r3, r6, 3 adds r2, r1, r3 - ldr r0, _080E9DB4 + ldr r0, =0x085e8cf0 str r0, [r2] adds r1, 0x4 adds r1, r3 @@ -479335,16 +463566,14 @@ _080E9D7C: strh r2, [r7, 0x6] b _080E9DBC .align 2, 0 -_080E9DAC: .4byte 0x03005e08 -_080E9DB0: .4byte 0x0203a020 -_080E9DB4: .4byte 0x085e8cf0 + .pool _080E9DB8: movs r0, 0x8 strh r0, [r7, 0x6] _080E9DBC: - ldr r2, _080E9DE4 + ldr r2, =0x03006310 adds r1, r2, 0 - ldr r0, _080E9DE8 + ldr r0, =0x0858d07c ldm r0!, {r3,r5,r6} stm r1!, {r3,r5,r6} ldm r0!, {r3,r5,r6} @@ -479363,8 +463592,7 @@ _080E9DBC: pop {r0} bx r0 .align 2, 0 -_080E9DE4: .4byte 0x03006310 -_080E9DE8: .4byte 0x0858d07c + .pool thumb_func_end game_continue thumb_func_start sub_80E9DEC @@ -479390,12 +463618,12 @@ sub_80E9E00: @ 80E9E00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _080E9E3C + ldr r0, =0x03005e08 adds r4, r0 ldrb r0, [r4, 0xC] movs r1, 0 bl SetStandardWindowBorderStyle - ldr r0, _080E9E40 + ldr r0, =0x03006310 ldrh r1, [r4, 0x4] ldrh r2, [r4, 0x2] bl calls_per_item_funcs_in_list_outer @@ -479410,8 +463638,7 @@ sub_80E9E00: @ 80E9E00 pop {r0} bx r0 .align 2, 0 -_080E9E3C: .4byte 0x03005e08 -_080E9E40: .4byte 0x03006310 + .pool thumb_func_end sub_80E9E00 thumb_func_start sub_80E9E44 @@ -479423,7 +463650,7 @@ sub_80E9E44: @ 80E9E44 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _080E9E88 + ldr r0, =0x03005e08 adds r4, r0 movs r1, 0 ldrsh r0, [r4, r1] @@ -479431,7 +463658,7 @@ sub_80E9E44: @ 80E9E44 ldrsh r1, [r4, r2] subs r0, r1 str r0, [sp] - ldr r0, _080E9E8C + ldr r0, =0x000013f8 str r0, [sp, 0x4] str r0, [sp, 0x8] adds r0, r4, 0x4 @@ -479449,8 +463676,7 @@ sub_80E9E44: @ 80E9E44 pop {r0} bx r0 .align 2, 0 -_080E9E88: .4byte 0x03005e08 -_080E9E8C: .4byte 0x000013f8 + .pool thumb_func_end sub_80E9E44 thumb_func_start sub_80E9E90 @@ -479461,7 +463687,7 @@ sub_80E9E90: @ 80E9E90 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080E9EC4 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrb r0, [r4, 0xA] bl sub_81AE604 @@ -479479,7 +463705,7 @@ sub_80E9E90: @ 80E9E90 bne _080E9F0C b _080E9F1A .align 2, 0 -_080E9EC4: .4byte 0x03005e08 + .pool _080E9EC8: movs r0, 0x5 bl audio_play @@ -479498,14 +463724,14 @@ _080E9EC8: bl Window_Remove movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _080E9F08 + ldr r0, =0x0203a020 ldr r0, [r0] bl free adds r0, r6, 0 bl task_pc_turn_off b _080E9F1A .align 2, 0 -_080E9F08: .4byte 0x0203a020 + .pool _080E9F0C: movs r0, 0x5 bl audio_play @@ -479529,21 +463755,21 @@ sub_80E9F20: @ 80E9F20 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r6, _080E9F9C + ldr r6, =0x03005e08 adds r5, r4, r6 ldrb r0, [r5, 0x10] bl sub_81AF620 - ldr r0, _080E9FA0 + ldr r0, =0x0858d06c ldr r1, [r0, 0xC] ldr r0, [r0, 0x8] str r0, [sp] str r1, [sp, 0x4] - ldr r0, _080E9FA4 + ldr r0, =0x0858d048 mov r8, r0 movs r1, 0x2 bl GetMaxWidthInMenuTable lsls r0, 24 - ldr r2, _080E9FA8 + ldr r2, =0x00ffffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -479567,7 +463793,7 @@ sub_80E9F20: @ 80E9F20 bl schedule_bg_copy_tilemap_to_vram subs r6, 0x8 adds r4, r6 - ldr r0, _080E9FAC + ldr r0, =sub_80E9FB0 + 1 str r0, [r4] add sp, 0x8 pop {r3} @@ -479576,11 +463802,7 @@ sub_80E9F20: @ 80E9F20 pop {r0} bx r0 .align 2, 0 -_080E9F9C: .4byte 0x03005e08 -_080E9FA0: .4byte 0x0858d06c -_080E9FA4: .4byte 0x0858d048 -_080E9FA8: .4byte 0x00ffffff -_080E9FAC: .4byte sub_80E9FB0 + 1 + .pool thumb_func_end sub_80E9F20 thumb_func_start sub_80E9FB0 @@ -479607,7 +463829,7 @@ sub_80E9FB0: @ 80E9FB0 _080E9FDC: movs r0, 0x5 bl audio_play - ldr r0, _080E9FF8 + ldr r0, =0x0858d048 lsls r1, r4, 3 adds r0, 0x4 adds r1, r0 @@ -479619,7 +463841,7 @@ _080E9FF2: pop {r0} bx r0 .align 2, 0 -_080E9FF8: .4byte 0x0858d048 + .pool thumb_func_end sub_80E9FB0 thumb_func_start sub_80E9FFC @@ -479631,7 +463853,7 @@ sub_80E9FFC: @ 80E9FFC lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _080EA058 + ldr r0, =0x03005e08 adds r4, r0 ldrb r0, [r4, 0xC] movs r1, 0 @@ -479647,14 +463869,14 @@ sub_80E9FFC: @ 80E9FFC bl Window_Remove movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _080EA05C + ldr r0, =0x02021cc4 ldrb r1, [r4, 0x8] bl sub_80E9780 - ldr r4, _080EA060 - ldr r1, _080EA064 + ldr r4, =0x02021fc4 + ldr r1, =0x085ea737 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _080EA068 + ldr r2, =sub_80EA06C + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -479662,11 +463884,7 @@ sub_80E9FFC: @ 80E9FFC pop {r0} bx r0 .align 2, 0 -_080EA058: .4byte 0x03005e08 -_080EA05C: .4byte 0x02021cc4 -_080EA060: .4byte 0x02021fc4 -_080EA064: .4byte 0x085ea737 -_080EA068: .4byte sub_80EA06C + 1 + .pool thumb_func_end sub_80E9FFC thumb_func_start sub_80EA06C @@ -479676,14 +463894,14 @@ sub_80EA06C: @ 80EA06C lsls r4, 24 lsrs r4, 24 bl sub_8197930 - ldr r1, _080EA088 + ldr r1, =0x0858d058 adds r0, r4, 0 bl sub_8121F68 pop {r4} pop {r0} bx r0 .align 2, 0 -_080EA088: .4byte 0x0858d058 + .pool thumb_func_end sub_80EA06C thumb_func_start sub_80EA08C @@ -479699,7 +463917,7 @@ sub_80EA08C: @ 80EA08C lsls r5, r4, 2 adds r5, r4 lsls r5, 3 - ldr r0, _080EA110 + ldr r0, =0x03005e08 mov r8, r0 adds r6, r5, r0 movs r0, 0 @@ -479713,7 +463931,7 @@ sub_80EA08C: @ 80EA08C mov r1, r9 mov r2, r10 bl sub_81AE6C8 - ldr r0, _080EA114 + ldr r0, =0x03005d8c ldr r2, [r0] movs r0, 0x8 ldrsh r1, [r6, r0] @@ -479721,7 +463939,7 @@ sub_80EA08C: @ 80EA08C adds r0, r1 lsls r0, 5 adds r2, r0 - ldr r1, _080EA118 + ldr r1, =0x00001a9d adds r2, r1 ldrb r1, [r2] movs r0, 0x3F @@ -479740,7 +463958,7 @@ sub_80EA08C: @ 80EA08C negs r0, r0 add r8, r0 add r5, r8 - ldr r0, _080EA11C + ldr r0, =sub_80E9E90 + 1 str r0, [r5] pop {r3-r5} mov r8, r3 @@ -479750,10 +463968,7 @@ sub_80EA08C: @ 80EA08C pop {r0} bx r0 .align 2, 0 -_080EA110: .4byte 0x03005e08 -_080EA114: .4byte 0x03005d8c -_080EA118: .4byte 0x00001a9d -_080EA11C: .4byte sub_80E9E90 + 1 + .pool thumb_func_end sub_80EA08C thumb_func_start sub_80EA120 @@ -479761,14 +463976,13 @@ sub_80EA120: @ 80EA120 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080EA134 - ldr r2, _080EA138 + ldr r1, =0x085ea762 + ldr r2, =sub_80EA08C + 1 bl sub_81978EC pop {r0} bx r0 .align 2, 0 -_080EA134: .4byte 0x085ea762 -_080EA138: .4byte sub_80EA08C + 1 + .pool thumb_func_end sub_80EA120 thumb_func_start sub_80EA13C @@ -479782,7 +463996,7 @@ sub_80EA13C: @ 80EA13C lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _080EA184 + ldr r0, =0x03005e08 mov r8, r0 adds r6, r4, r0 movs r0, 0 @@ -479799,7 +464013,7 @@ sub_80EA13C: @ 80EA13C negs r0, r0 add r8, r0 add r4, r8 - ldr r0, _080EA188 + ldr r0, =sub_80E9E90 + 1 str r0, [r4] pop {r3} mov r8, r3 @@ -479807,8 +464021,7 @@ sub_80EA13C: @ 80EA13C pop {r0} bx r0 .align 2, 0 -_080EA184: .4byte 0x03005e08 -_080EA188: .4byte sub_80E9E90 + 1 + .pool thumb_func_end sub_80EA13C thumb_func_start sub_80EA18C @@ -479819,7 +464032,7 @@ sub_80EA18C: @ 80EA18C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r6, _080EA1C8 + ldr r6, =0x03005e08 adds r5, r4, r6 bl sub_80E9E44 ldrb r0, [r5, 0xE] @@ -479833,14 +464046,13 @@ sub_80EA18C: @ 80EA18C bl schedule_bg_copy_tilemap_to_vram subs r6, 0x8 adds r4, r6 - ldr r0, _080EA1CC + ldr r0, =sub_80E9E90 + 1 str r0, [r4] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080EA1C8: .4byte 0x03005e08 -_080EA1CC: .4byte sub_80E9E90 + 1 + .pool thumb_func_end sub_80EA18C thumb_func_start task_pc_turn_off @@ -479848,19 +464060,18 @@ task_pc_turn_off: @ 80EA1D0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080EA1EC + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 bne _080EA1F4 - ldr r0, _080EA1F0 + ldr r0, =0x0823b4e8 bl script_env_1_execute_new_script b _080EA1FA .align 2, 0 -_080EA1EC: .4byte 0x00004054 -_080EA1F0: .4byte 0x0823b4e8 + .pool _080EA1F4: - ldr r0, _080EA208 + ldr r0, =0x0823b5e9 bl script_env_1_execute_new_script _080EA1FA: adds r0, r4, 0 @@ -479869,7 +464080,7 @@ _080EA1FA: pop {r0} bx r0 .align 2, 0 -_080EA208: .4byte 0x0823b5e9 + .pool thumb_func_end task_pc_turn_off thumb_func_start sub_80EA20C @@ -479877,18 +464088,18 @@ sub_80EA20C: @ 80EA20C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080EA244 + ldr r1, =0x03005d8c ldr r4, [r1] lsls r1, r0, 2 adds r1, r0 lsls r1, 5 adds r4, r1 - ldr r1, _080EA248 + ldr r1, =0x00001aa5 adds r0, r4, r1 ldrb r0, [r0] movs r1, 0x5 bl __umodsi3 - ldr r1, _080EA24C + ldr r1, =0x00001a9d adds r4, r1 ldrb r2, [r4] lsls r2, 27 @@ -479902,15 +464113,13 @@ sub_80EA20C: @ 80EA20C pop {r1} bx r1 .align 2, 0 -_080EA244: .4byte 0x03005d8c -_080EA248: .4byte 0x00001aa5 -_080EA24C: .4byte 0x00001a9d + .pool thumb_func_end sub_80EA20C thumb_func_start sub_80EA250 sub_80EA250: @ 80EA250 push {lr} - ldr r0, _080EA270 + ldr r0, =0x00004054 bl var_get lsls r0, 24 lsrs r0, 24 @@ -479920,74 +464129,73 @@ sub_80EA250: @ 80EA250 adds r1, r0, 0 cmp r0, 0 bne _080EA278 - ldr r0, _080EA274 + ldr r0, =0x08274966 b _080EA2DA .align 2, 0 -_080EA270: .4byte 0x00004054 -_080EA274: .4byte 0x08274966 + .pool _080EA278: cmp r0, 0x1 bne _080EA284 - ldr r0, _080EA280 + ldr r0, =0x08274d13 b _080EA2DA .align 2, 0 -_080EA280: .4byte 0x08274d13 + .pool _080EA284: cmp r0, 0x2 bne _080EA290 - ldr r0, _080EA28C + ldr r0, =0x08274ffe b _080EA2DA .align 2, 0 -_080EA28C: .4byte 0x08274ffe + .pool _080EA290: cmp r0, 0x3 bne _080EA29C - ldr r0, _080EA298 + ldr r0, =0x08275367 b _080EA2DA .align 2, 0 -_080EA298: .4byte 0x08275367 + .pool _080EA29C: cmp r0, 0x4 bne _080EA2A8 - ldr r0, _080EA2A4 + ldr r0, =0x082756c7 b _080EA2DA .align 2, 0 -_080EA2A4: .4byte 0x082756c7 + .pool _080EA2A8: cmp r0, 0x5 bne _080EA2B4 - ldr r0, _080EA2B0 + ldr r0, =0x08274b24 b _080EA2DA .align 2, 0 -_080EA2B0: .4byte 0x08274b24 + .pool _080EA2B4: cmp r0, 0x6 bne _080EA2C0 - ldr r0, _080EA2BC + ldr r0, =0x08274e75 b _080EA2DA .align 2, 0 -_080EA2BC: .4byte 0x08274e75 + .pool _080EA2C0: cmp r0, 0x7 bne _080EA2CC - ldr r0, _080EA2C8 + ldr r0, =0x082751e1 b _080EA2DA .align 2, 0 -_080EA2C8: .4byte 0x082751e1 + .pool _080EA2CC: cmp r1, 0x8 beq _080EA2D8 - ldr r0, _080EA2D4 + ldr r0, =0x082758cc b _080EA2DA .align 2, 0 -_080EA2D4: .4byte 0x082758cc + .pool _080EA2D8: - ldr r0, _080EA2E0 + ldr r0, =0x082754f6 _080EA2DA: pop {r1} bx r1 .align 2, 0 -_080EA2E0: .4byte 0x082754f6 + .pool thumb_func_end sub_80EA250 thumb_func_start sub_80EA2E4 @@ -479995,28 +464203,26 @@ sub_80EA2E4: @ 80EA2E4 push {lr} movs r0, 0x1 bl sub_813BADC - ldr r1, _080EA300 + ldr r1, =0x02038bca movs r2, 0x80 lsls r2, 3 adds r0, r2, 0 strh r0, [r1] - ldr r1, _080EA304 - ldr r0, _080EA308 + ldr r1, =0x02022fec + ldr r0, =0x08000008 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_080EA300: .4byte 0x02038bca -_080EA304: .4byte 0x02022fec -_080EA308: .4byte 0x08000008 + .pool thumb_func_end sub_80EA2E4 thumb_func_start sub_80EA30C sub_80EA30C: @ 80EA30C push {lr} - ldr r0, _080EA344 + ldr r0, =0x00004054 bl var_get - ldr r1, _080EA348 + ldr r1, =0x03005d8c ldr r3, [r1] lsls r0, 16 lsrs r0, 16 @@ -480024,9 +464230,9 @@ sub_80EA30C: @ 80EA30C adds r1, r0 lsls r1, 5 adds r3, r1 - ldr r0, _080EA34C + ldr r0, =0x020375f0 ldrb r0, [r0] - ldr r1, _080EA350 + ldr r1, =0x00001a9d adds r3, r1 movs r1, 0x1 ands r1, r0 @@ -480040,27 +464246,24 @@ sub_80EA30C: @ 80EA30C pop {r0} bx r0 .align 2, 0 -_080EA344: .4byte 0x00004054 -_080EA348: .4byte 0x03005d8c -_080EA34C: .4byte 0x020375f0 -_080EA350: .4byte 0x00001a9d + .pool thumb_func_end sub_80EA30C thumb_func_start sub_80EA354 sub_80EA354: @ 80EA354 push {r4-r7,lr} - ldr r0, _080EA3CC + ldr r0, =0x00004054 bl var_get lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _080EA3D0 + ldr r0, =0x00000922 bl flag_check lsls r0, 24 cmp r0, 0 bne _080EA39A movs r3, 0 - ldr r7, _080EA3D4 - ldr r4, _080EA3D8 + ldr r7, =0x03005d8c + ldr r4, =0x00001a9d movs r6, 0x21 negs r6, r6 _080EA376: @@ -480079,24 +464282,24 @@ _080EA376: lsrs r3, r0, 24 cmp r3, 0x13 bls _080EA376 - ldr r0, _080EA3D0 + ldr r0, =0x00000922 bl flag_set _080EA39A: - ldr r4, _080EA3DC + ldr r4, =0x020375e0 lsls r0, r5, 24 lsrs r0, 24 bl sub_80EA20C lsls r0, 24 lsrs r0, 24 strh r0, [r4] - ldr r2, _080EA3E0 - ldr r0, _080EA3D4 + ldr r2, =0x020375f0 + ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r5, 2 adds r0, r5 lsls r0, 5 adds r1, r0 - ldr r0, _080EA3D8 + ldr r0, =0x00001a9d adds r1, r0 ldrb r0, [r1] lsls r0, 26 @@ -480106,12 +464309,7 @@ _080EA39A: pop {r0} bx r0 .align 2, 0 -_080EA3CC: .4byte 0x00004054 -_080EA3D0: .4byte 0x00000922 -_080EA3D4: .4byte 0x03005d8c -_080EA3D8: .4byte 0x00001a9d -_080EA3DC: .4byte 0x020375e0 -_080EA3E0: .4byte 0x020375f0 + .pool thumb_func_end sub_80EA354 thumb_func_start sub_80EA3E4 @@ -480123,7 +464321,7 @@ sub_80EA3E4: @ 80EA3E4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080EA408 + ldr r0, =0x03005e08 adds r5, r1, r0 movs r1, 0x2 ldrsh r0, [r5, r1] @@ -480135,7 +464333,7 @@ sub_80EA3E4: @ 80EA3E4 beq _080EA414 b _080EA820 .align 2, 0 -_080EA408: .4byte 0x03005e08 + .pool _080EA40C: cmp r0, 0x2 bne _080EA412 @@ -480143,21 +464341,20 @@ _080EA40C: _080EA412: b _080EA820 _080EA414: - ldr r0, _080EA42C + ldr r0, =0x00004054 bl var_get lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 beq _080EA434 - ldr r1, _080EA430 + ldr r1, =0x0203a01d movs r0, 0x1 strb r0, [r1] b _080EA438 .align 2, 0 -_080EA42C: .4byte 0x00004054 -_080EA430: .4byte 0x0203a01d + .pool _080EA434: - ldr r0, _080EA444 + ldr r0, =0x0203a01d strb r1, [r0] _080EA438: adds r0, r5, 0x4 @@ -480165,7 +464362,7 @@ _080EA438: bl player_get_pos_to b _080EA81C .align 2, 0 -_080EA444: .4byte 0x0203a01d + .pool _080EA448: mov r4, sp adds r4, 0x2 @@ -480192,7 +464389,7 @@ _080EA474: strh r2, [r5, 0x4] ldrh r0, [r6] strh r0, [r5, 0x6] - ldr r4, _080EA4DC + ldr r4, =0x000040ec adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -480225,24 +464422,22 @@ _080EA474: cmp r4, r0 bne _080EA4E8 _080EA4C2: - ldr r0, _080EA4E0 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 beq _080EA4CC b _080EA820 _080EA4CC: - ldr r4, _080EA4E4 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x20 b _080EA7FA .align 2, 0 -_080EA4DC: .4byte 0x000040ec -_080EA4E0: .4byte 0x0203a01d -_080EA4E4: .4byte 0x000040ef + .pool _080EA4E8: - ldr r3, _080EA534 + ldr r3, =0xfffffd48 adds r0, r4, r3 lsls r0, 16 lsrs r0, 16 @@ -480268,24 +464463,22 @@ _080EA4E8: cmp r4, r0 bne _080EA540 _080EA51A: - ldr r0, _080EA538 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 beq _080EA524 b _080EA820 _080EA524: - ldr r4, _080EA53C + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x1 b _080EA7FA .align 2, 0 -_080EA534: .4byte 0xfffffd48 -_080EA538: .4byte 0x0203a01d -_080EA53C: .4byte 0x000040ee + .pool _080EA540: - ldr r0, _080EA570 + ldr r0, =0x00000239 cmp r4, r0 beq _080EA558 adds r0, 0x8 @@ -480298,26 +464491,24 @@ _080EA540: cmp r4, r0 bne _080EA57C _080EA558: - ldr r0, _080EA574 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 beq _080EA562 b _080EA820 _080EA562: - ldr r4, _080EA578 + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x4 b _080EA7FA .align 2, 0 -_080EA570: .4byte 0x00000239 -_080EA574: .4byte 0x0203a01d -_080EA578: .4byte 0x000040ee + .pool _080EA57C: cmp r5, 0x34 bne _080EA586 - ldr r0, _080EA5BC + ldr r0, =0x0000026d cmp r4, r0 beq _080EA59E _080EA586: @@ -480329,17 +464520,17 @@ _080EA586: movs r2, 0 ldrsh r1, [r6, r2] bl cur_mapdata_get_blockid_at - ldr r1, _080EA5C0 + ldr r1, =0x0000026a cmp r0, r1 bne _080EA5CC _080EA59E: - ldr r0, _080EA5C4 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 beq _080EA5A8 b _080EA820 _080EA5A8: - ldr r4, _080EA5C8 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -480348,23 +464539,20 @@ _080EA5A8: adds r0, r3, 0 b _080EA7FA .align 2, 0 -_080EA5BC: .4byte 0x0000026d -_080EA5C0: .4byte 0x0000026a -_080EA5C4: .4byte 0x0203a01d -_080EA5C8: .4byte 0x000040ef + .pool _080EA5CC: cmp r5, 0xC1 bne _080EA618 - ldr r0, _080EA60C + ldr r0, =0x0000023d cmp r4, r0 bne _080EA618 - ldr r0, _080EA610 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 beq _080EA5E0 b _080EA820 _080EA5E0: - ldr r4, _080EA614 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -480384,22 +464572,20 @@ _080EA5E0: adds r0, r3, 0 b _080EA7FA .align 2, 0 -_080EA60C: .4byte 0x0000023d -_080EA610: .4byte 0x0203a01d -_080EA614: .4byte 0x000040ef + .pool _080EA618: cmp r5, 0x47 bne _080EA668 - ldr r0, _080EA65C + ldr r0, =0x0000023e cmp r4, r0 bne _080EA668 - ldr r0, _080EA660 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 beq _080EA62C b _080EA820 _080EA62C: - ldr r4, _080EA664 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -480420,9 +464606,7 @@ _080EA62C: eors r1, r0 b _080EA7FC .align 2, 0 -_080EA65C: .4byte 0x0000023e -_080EA660: .4byte 0x0203a01d -_080EA664: .4byte 0x000040ef + .pool _080EA668: adds r0, r5, 0 bl sub_80893C8 @@ -480430,21 +464614,20 @@ _080EA668: lsrs r0, 24 cmp r0, 0x1 bne _080EA698 - ldr r0, _080EA690 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 beq _080EA680 b _080EA820 _080EA680: - ldr r4, _080EA694 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x80 b _080EA7FA .align 2, 0 -_080EA690: .4byte 0x0203a01d -_080EA694: .4byte 0x000040ef + .pool _080EA698: adds r0, r5, 0 bl sub_808938C @@ -480466,7 +464649,7 @@ _080EA698: movs r3, 0 ldrsh r2, [r6, r3] bl sub_80FA5E4 - ldr r0, _080EA6F8 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 beq _080EA6D0 @@ -480491,7 +464674,7 @@ _080EA6D0: beq _080EA714 b _080EA820 .align 2, 0 -_080EA6F8: .4byte 0x0203a01d + .pool _080EA6FC: movs r0, 0xCF lsls r0, 2 @@ -480502,12 +464685,12 @@ _080EA6FC: beq _080EA70C b _080EA820 _080EA70C: - ldr r4, _080EA710 + ldr r4, =0x000040ee b _080EA7F0 .align 2, 0 -_080EA710: .4byte 0x000040ee + .pool _080EA714: - ldr r4, _080EA728 + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -480516,7 +464699,7 @@ _080EA714: adds r0, r3, 0 b _080EA7FA .align 2, 0 -_080EA728: .4byte 0x000040ee + .pool _080EA72C: adds r0, r5, 0 bl sub_80893A0 @@ -480524,11 +464707,11 @@ _080EA72C: lsrs r0, 24 cmp r0, 0x1 bne _080EA778 - ldr r0, _080EA770 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 bne _080EA75E - ldr r4, _080EA774 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -480549,8 +464732,7 @@ _080EA75E: bl sub_80FA794 b _080EA820 .align 2, 0 -_080EA770: .4byte 0x0203a01d -_080EA774: .4byte 0x000040ef + .pool _080EA778: adds r0, r5, 0 bl sub_80893B4 @@ -480558,11 +464740,11 @@ _080EA778: lsrs r0, 24 cmp r0, 0x1 bne _080EA7A8 - ldr r0, _080EA7A0 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 bne _080EA820 - ldr r4, _080EA7A4 + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -480571,8 +464753,7 @@ _080EA778: adds r0, r3, 0 b _080EA7FA .align 2, 0 -_080EA7A0: .4byte 0x0203a01d -_080EA7A4: .4byte 0x000040ee + .pool _080EA7A8: adds r0, r5, 0 bl sub_8089848 @@ -480580,11 +464761,11 @@ _080EA7A8: lsrs r0, 24 cmp r0, 0x1 bne _080EA7D8 - ldr r0, _080EA7D0 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 bne _080EA820 - ldr r4, _080EA7D4 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -480593,8 +464774,7 @@ _080EA7A8: adds r0, r2, 0 b _080EA7FA .align 2, 0 -_080EA7D0: .4byte 0x0203a01d -_080EA7D4: .4byte 0x000040ef + .pool _080EA7D8: adds r0, r5, 0 bl sub_808985C @@ -480602,11 +464782,11 @@ _080EA7D8: lsrs r0, 24 cmp r0, 0x1 bne _080EA820 - ldr r0, _080EA808 + ldr r0, =0x0203a01d ldrb r0, [r0] cmp r0, 0x1 bne _080EA820 - ldr r4, _080EA80C + ldr r4, =0x000040ef _080EA7F0: adds r0, r4, 0 bl var_get @@ -480621,8 +464801,7 @@ _080EA7FC: bl var_set b _080EA820 .align 2, 0 -_080EA808: .4byte 0x0203a01d -_080EA80C: .4byte 0x000040ef + .pool _080EA810: ldrb r0, [r5, 0x8] bl oe_active_list_contains @@ -480649,20 +464828,20 @@ sub_80EA828: @ 80EA828 mov r8, r3 lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _080EA8C4 + ldr r6, =0x03005d8c ldr r0, [r6] lsls r2, r5, 2 adds r2, r5 lsls r4, r2, 5 adds r0, r4 - ldr r2, _080EA8C8 + ldr r2, =0x00001a9c mov r9, r2 add r0, r9 movs r2, 0xA0 bl memcpy ldr r2, [r6] adds r2, r4 - ldr r0, _080EA8CC + ldr r0, =0x00001a9d adds r2, r0 ldrb r1, [r2] movs r0, 0x3F @@ -480675,7 +464854,7 @@ sub_80EA828: @ 80EA828 bhi _080EA876 ldr r0, [r6] adds r0, r4 - ldr r1, _080EA8D0 + ldr r1, =0x00001aa9 adds r0, r1 movs r1, 0x2 strb r1, [r0] @@ -480705,13 +464884,13 @@ _080EA892: _080EA8A0: cmp r3, 0x5 ble _080EA8B8 - ldr r0, _080EA8C4 + ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r5, 2 adds r0, r5 lsls r0, 5 adds r1, r0 - ldr r2, _080EA8D0 + ldr r2, =0x00001aa9 adds r1, r2 movs r0, 0x2 strb r0, [r1] @@ -480723,10 +464902,7 @@ _080EA8B8: pop {r0} bx r0 .align 2, 0 -_080EA8C4: .4byte 0x03005d8c -_080EA8C8: .4byte 0x00001a9c -_080EA8CC: .4byte 0x00001a9d -_080EA8D0: .4byte 0x00001aa9 + .pool thumb_func_end sub_80EA828 thumb_func_start sub_80EA8D4 @@ -480845,9 +465021,9 @@ sub_80EA990: @ 80EA990 lsls r0, 24 lsrs r3, r0, 24 movs r1, 0 - ldr r0, _080EA9B8 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r4, _080EA9BC + ldr r4, =0x00001a9c _080EA99E: lsls r0, r1, 16 asrs r1, r0, 16 @@ -480862,8 +465038,7 @@ _080EA99E: adds r0, r1, 0 b _080EA9D0 .align 2, 0 -_080EA9B8: .4byte 0x03005d8c -_080EA9BC: .4byte 0x00001a9c + .pool _080EA9C0: adds r0, r1, 0x1 lsls r0, 16 @@ -480883,9 +465058,9 @@ _080EA9D0: sub_80EA9D8: @ 80EA9D8 push {r4,lr} movs r2, 0x1 - ldr r0, _080EA9FC + ldr r0, =0x03005d8c ldr r3, [r0] - ldr r4, _080EAA00 + ldr r4, =0x00001a9c _080EA9E2: lsls r0, r2, 16 asrs r1, r0, 16 @@ -480901,8 +465076,7 @@ _080EA9E2: lsrs r0, 24 b _080EAA12 .align 2, 0 -_080EA9FC: .4byte 0x03005d8c -_080EAA00: .4byte 0x00001a9c + .pool _080EAA04: adds r0, r1, 0x1 lsls r0, 16 @@ -480921,7 +465095,7 @@ _080EAA12: sub_80EAA18: @ 80EAA18 push {r4,lr} movs r3, 0x1 - ldr r0, _080EAA44 + ldr r0, =0x03005d8c ldr r4, [r0] _080EAA20: lsls r2, r3, 16 @@ -480930,7 +465104,7 @@ _080EAA20: adds r0, r1 lsls r0, 5 adds r0, r4, r0 - ldr r1, _080EAA48 + ldr r1, =0x00001a9d adds r0, r1 ldrb r1, [r0] lsrs r0, r1, 6 @@ -480943,8 +465117,7 @@ _080EAA20: lsrs r0, 24 b _080EAA5C .align 2, 0 -_080EAA44: .4byte 0x03005d8c -_080EAA48: .4byte 0x00001a9d + .pool _080EAA4C: movs r1, 0x80 lsls r1, 9 @@ -480980,13 +465153,13 @@ sub_80EAA64: @ 80EAA64 negs r0, r0 cmp r2, r0 beq _080EAAC4 - ldr r0, _080EAABC + ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r2, 2 adds r0, r2 lsls r0, 5 adds r1, r0 - ldr r0, _080EAAC0 + ldr r0, =0x00001a9d adds r1, r0 ldrb r1, [r1] lsls r0, r1, 28 @@ -481006,8 +465179,7 @@ _080EAAB4: lsrs r4, 24 b _080EAADC .align 2, 0 -_080EAABC: .4byte 0x03005d8c -_080EAAC0: .4byte 0x00001a9d + .pool _080EAAC4: bl sub_80EA9D8 lsls r0, 24 @@ -481042,9 +465214,9 @@ sub_80EAAF4: @ 80EAAF4 mov r6, r8 push {r6,r7} sub sp, 0xA0 - ldr r0, _080EAB9C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080EABA0 + ldr r1, =0x00001a9c adds r7, r0, r1 movs r2, 0x1 _080EAB08: @@ -481125,8 +465297,7 @@ _080EAB84: pop {r0} bx r0 .align 2, 0 -_080EAB9C: .4byte 0x03005d8c -_080EABA0: .4byte 0x00001a9c + .pool thumb_func_end sub_80EAAF4 thumb_func_start sub_80EABA4 @@ -481170,7 +465341,7 @@ sub_80EABDC: @ 80EABDC beq _080EABF8 ldrb r0, [r5, 0x1] lsls r0, 27 - ldr r1, _080EABFC + ldr r1, =0x03005d90 ldr r3, [r1] lsrs r0, 31 adds r6, r1, 0 @@ -481181,7 +465352,7 @@ _080EABF8: movs r0, 0 b _080EAC56 .align 2, 0 -_080EABFC: .4byte 0x03005d90 + .pool _080EAC00: movs r2, 0 adds r4, r5, 0 @@ -481594,9 +465765,9 @@ sub_80EAEF4: @ 80EAEF4 ldr r1, [r4, 0xC] ldr r2, [r4, 0x18] bl sub_80EAC5C - ldr r0, _080EAF78 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080EAF7C + ldr r1, =0x00001a9c adds r0, r1 ldr r1, [r4] ldr r2, [r4, 0xC] @@ -481642,8 +465813,7 @@ sub_80EAEF4: @ 80EAEF4 pop {r0} bx r0 .align 2, 0 -_080EAF78: .4byte 0x03005d8c -_080EAF7C: .4byte 0x00001a9c + .pool thumb_func_end sub_80EAEF4 thumb_func_start sub_80EAF80 @@ -481706,7 +465876,7 @@ _080EAFE4: _080EAFEE: adds r0, r6, r5 str r0, [sp] - ldr r4, _080EB02C + ldr r4, =0x020229e8 movs r3, 0xFF ldrb r0, [r4, 0x1C] str r0, [sp, 0x4] @@ -481736,12 +465906,12 @@ _080EAFEE: ldrh r0, [r0] b _080EB0D2 .align 2, 0 -_080EB02C: .4byte 0x020229e8 + .pool _080EB030: lsls r2, r5, 1 adds r0, r6, r2 str r0, [sp] - ldr r4, _080EB070 + ldr r4, =0x020229e8 ldrh r3, [r4, 0x38] movs r1, 0xFF adds r0, r1, 0 @@ -481771,13 +465941,13 @@ _080EB030: ldrh r0, [r4, 0x1A] b _080EB0D2 .align 2, 0 -_080EB070: .4byte 0x020229e8 + .pool _080EB074: lsls r0, r5, 1 adds r0, r5 adds r0, r6, r0 str r0, [sp] - ldr r1, _080EB0A4 + ldr r1, =0x020229e8 adds r0, r1, 0 adds r0, 0x54 ldrb r0, [r0] @@ -481798,10 +465968,10 @@ _080EB074: ldrh r0, [r1, 0x36] b _080EB0D2 .align 2, 0 -_080EB0A4: .4byte 0x020229e8 + .pool _080EB0A8: str r6, [sp] - ldr r1, _080EB174 + ldr r1, =0x020229e8 ldrb r0, [r1] str r0, [sp, 0x4] ldrh r0, [r1, 0x1A] @@ -481827,7 +465997,7 @@ _080EB0D4: mov r0, sp bl sub_80EAEF4 movs r3, 0x1 - ldr r6, _080EB178 + ldr r6, =0x03005d8c movs r7, 0x10 negs r7, r7 _080EB0E2: @@ -481836,7 +466006,7 @@ _080EB0E2: adds r1, r3 lsls r4, r1, 5 adds r0, r4 - ldr r5, _080EB17C + ldr r5, =0x00001a9d adds r2, r0, r5 ldrb r1, [r2] lsls r0, r1, 28 @@ -481863,7 +466033,7 @@ _080EB112: bls _080EB0E2 bl sub_80EAAF4 movs r3, 0x1 - ldr r7, _080EB178 + ldr r7, =0x03005d8c adds r6, r7, 0 adds r4, r5, 0 movs r5, 0x3F @@ -481888,15 +466058,15 @@ _080EB144: cmp r3, 0x13 bls _080EB12A ldr r1, [r7] - ldr r2, _080EB180 + ldr r2, =0x00001a9c adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 beq _080EB16A - ldr r0, _080EB184 + ldr r0, =0x00001aaa adds r2, r1, r0 ldrh r1, [r2] - ldr r0, _080EB188 + ldr r0, =0x0000ffff cmp r1, r0 beq _080EB16A adds r0, r1, 0x1 @@ -481907,12 +466077,7 @@ _080EB16A: pop {r0} bx r0 .align 2, 0 -_080EB174: .4byte 0x020229e8 -_080EB178: .4byte 0x03005d8c -_080EB17C: .4byte 0x00001a9d -_080EB180: .4byte 0x00001a9c -_080EB184: .4byte 0x00001aaa -_080EB188: .4byte 0x0000ffff + .pool thumb_func_end sub_80EAF80 thumb_func_start sub_80EB18C @@ -481939,59 +466104,53 @@ _080EB19E: thumb_func_start sub_80EB1AC sub_80EB1AC: @ 80EB1AC push {lr} - ldr r0, _080EB1E4 + ldr r0, =0x000040ec movs r1, 0 bl var_set - ldr r0, _080EB1E8 + ldr r0, =0x000040ed movs r1, 0 bl var_set - ldr r0, _080EB1EC + ldr r0, =0x000040ee movs r1, 0 bl var_set - ldr r0, _080EB1F0 + ldr r0, =0x000040ef movs r1, 0 bl var_set - ldr r0, _080EB1F4 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB1FC - ldr r0, _080EB1F8 + ldr r0, =0x000040f0 movs r1, 0x1 bl var_set b _080EB204 .align 2, 0 -_080EB1E4: .4byte 0x000040ec -_080EB1E8: .4byte 0x000040ed -_080EB1EC: .4byte 0x000040ee -_080EB1F0: .4byte 0x000040ef -_080EB1F4: .4byte 0x00004054 -_080EB1F8: .4byte 0x000040f0 + .pool _080EB1FC: - ldr r0, _080EB210 + ldr r0, =0x000040f0 movs r1, 0 bl var_set _080EB204: - ldr r1, _080EB214 + ldr r1, =0x0203a01d movs r0, 0 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_080EB210: .4byte 0x000040f0 -_080EB214: .4byte 0x0203a01d + .pool thumb_func_end sub_80EB1AC thumb_func_start sub_80EB218 sub_80EB218: @ 80EB218 push {r4-r6,lr} - ldr r5, _080EB278 + ldr r5, =0x000040f0 adds r0, r5, 0 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB272 - ldr r6, _080EB27C + ldr r6, =0x0203a01d ldrb r0, [r6] cmp r0, 0x1 bne _080EB272 @@ -482005,16 +466164,16 @@ sub_80EB218: @ 80EB218 bl var_set strb r4, [r6] bl sub_80EEA70 - ldr r0, _080EB280 + ldr r0, =0x000040ec movs r1, 0 bl var_set - ldr r0, _080EB284 + ldr r0, =0x000040ed movs r1, 0 bl var_set - ldr r0, _080EB288 + ldr r0, =0x000040ee movs r1, 0 bl var_set - ldr r0, _080EB28C + ldr r0, =0x000040ef movs r1, 0 bl var_set adds r0, r5, 0 @@ -482025,23 +466184,18 @@ _080EB272: pop {r0} bx r0 .align 2, 0 -_080EB278: .4byte 0x000040f0 -_080EB27C: .4byte 0x0203a01d -_080EB280: .4byte 0x000040ec -_080EB284: .4byte 0x000040ed -_080EB288: .4byte 0x000040ee -_080EB28C: .4byte 0x000040ef + .pool thumb_func_end sub_80EB218 thumb_func_start sub_80EB290 sub_80EB290: @ 80EB290 push {r4,lr} - ldr r0, _080EB2C0 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB2BA - ldr r4, _080EB2C4 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -482058,19 +466212,18 @@ _080EB2BA: pop {r0} bx r0 .align 2, 0 -_080EB2C0: .4byte 0x00004054 -_080EB2C4: .4byte 0x000040ef + .pool thumb_func_end sub_80EB290 thumb_func_start sub_80EB2C8 sub_80EB2C8: @ 80EB2C8 push {r4,lr} - ldr r0, _080EB2F8 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB2F2 - ldr r4, _080EB2FC + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -482087,29 +466240,28 @@ _080EB2F2: pop {r0} bx r0 .align 2, 0 -_080EB2F8: .4byte 0x00004054 -_080EB2FC: .4byte 0x000040ee + .pool thumb_func_end sub_80EB2C8 thumb_func_start sub_80EB300 sub_80EB300: @ 80EB300 push {r4,r5,lr} - ldr r0, _080EB354 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB34C - ldr r5, _080EB358 + ldr r5, =0x000040ee adds r0, r5, 0 bl var_get - ldr r1, _080EB35C + ldr r1, =0x0000c7ff ands r1, r0 adds r0, r5, 0 bl var_set - ldr r4, _080EB360 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get - ldr r1, _080EB364 + ldr r1, =0x0000fffe ands r1, r0 adds r0, r4, 0 bl var_set @@ -482129,32 +466281,28 @@ _080EB34C: pop {r0} bx r0 .align 2, 0 -_080EB354: .4byte 0x00004054 -_080EB358: .4byte 0x000040ee -_080EB35C: .4byte 0x0000c7ff -_080EB360: .4byte 0x000040ef -_080EB364: .4byte 0x0000fffe + .pool thumb_func_end sub_80EB300 thumb_func_start sub_80EB368 sub_80EB368: @ 80EB368 push {r4,r5,lr} - ldr r0, _080EB3BC + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB3B4 - ldr r5, _080EB3C0 + ldr r5, =0x000040ee adds r0, r5, 0 bl var_get - ldr r1, _080EB3C4 + ldr r1, =0x0000c7ff ands r1, r0 adds r0, r5, 0 bl var_set - ldr r4, _080EB3C8 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get - ldr r1, _080EB3CC + ldr r1, =0x0000fffe ands r1, r0 adds r0, r4, 0 bl var_set @@ -482174,32 +466322,28 @@ _080EB3B4: pop {r0} bx r0 .align 2, 0 -_080EB3BC: .4byte 0x00004054 -_080EB3C0: .4byte 0x000040ee -_080EB3C4: .4byte 0x0000c7ff -_080EB3C8: .4byte 0x000040ef -_080EB3CC: .4byte 0x0000fffe + .pool thumb_func_end sub_80EB368 thumb_func_start sub_80EB3D0 sub_80EB3D0: @ 80EB3D0 push {r4,r5,lr} - ldr r0, _080EB424 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB41C - ldr r5, _080EB428 + ldr r5, =0x000040ee adds r0, r5, 0 bl var_get - ldr r1, _080EB42C + ldr r1, =0x0000c7ff ands r1, r0 adds r0, r5, 0 bl var_set - ldr r4, _080EB430 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get - ldr r1, _080EB434 + ldr r1, =0x0000fffe ands r1, r0 adds r0, r4, 0 bl var_set @@ -482219,32 +466363,28 @@ _080EB41C: pop {r0} bx r0 .align 2, 0 -_080EB424: .4byte 0x00004054 -_080EB428: .4byte 0x000040ee -_080EB42C: .4byte 0x0000c7ff -_080EB430: .4byte 0x000040ef -_080EB434: .4byte 0x0000fffe + .pool thumb_func_end sub_80EB3D0 thumb_func_start sub_80EB438 sub_80EB438: @ 80EB438 push {r4,lr} - ldr r0, _080EB488 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB480 - ldr r4, _080EB48C + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get - ldr r1, _080EB490 + ldr r1, =0x0000c7ff ands r1, r0 adds r0, r4, 0 bl var_set adds r4, 0x1 adds r0, r4, 0 bl var_get - ldr r1, _080EB494 + ldr r1, =0x0000fffe ands r1, r0 adds r0, r4, 0 bl var_set @@ -482262,10 +466402,7 @@ _080EB480: pop {r0} bx r0 .align 2, 0 -_080EB488: .4byte 0x00004054 -_080EB48C: .4byte 0x000040ee -_080EB490: .4byte 0x0000c7ff -_080EB494: .4byte 0x0000fffe + .pool thumb_func_end sub_80EB438 thumb_func_start sub_80EB498 @@ -482283,18 +466420,17 @@ sub_80EB498: @ 80EB498 movs r2, 0 ldrsh r1, [r4, r2] bl cur_mapdata_get_blockid_at - ldr r1, _080EB4C8 + ldr r1, =0xfffffce4 adds r0, r1 cmp r0, 0x18 bhi _080EB55C lsls r0, 2 - ldr r1, _080EB4CC + ldr r1, =_080EB4D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EB4C8: .4byte 0xfffffce4 -_080EB4CC: .4byte _080EB4D0 + .pool .align 2, 0 _080EB4D0: .4byte _080EB534 @@ -482323,12 +466459,12 @@ _080EB4D0: .4byte _080EB534 .4byte _080EB534 _080EB534: - ldr r0, _080EB564 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB55C - ldr r4, _080EB568 + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -482346,8 +466482,7 @@ _080EB55C: pop {r0} bx r0 .align 2, 0 -_080EB564: .4byte 0x00004054 -_080EB568: .4byte 0x000040ee + .pool thumb_func_end sub_80EB498 thumb_func_start sub_80EB56C @@ -482365,20 +466500,19 @@ sub_80EB56C: @ 80EB56C movs r2, 0 ldrsh r1, [r4, r2] bl cur_mapdata_get_blockid_at - ldr r1, _080EB5A0 + ldr r1, =0xfffffdd4 adds r0, r1 cmp r0, 0xCF bls _080EB594 b _080EB9D0 _080EB594: lsls r0, 2 - ldr r1, _080EB5A4 + ldr r1, =_080EB5A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EB5A0: .4byte 0xfffffdd4 -_080EB5A4: .4byte _080EB5A8 + .pool .align 2, 0 _080EB5A8: .4byte _080EB930 @@ -482590,57 +466724,54 @@ _080EB5A8: .4byte _080EB90C .4byte _080EB90C _080EB8E8: - ldr r0, _080EB904 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB9D0 - ldr r4, _080EB908 + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x40 b _080EB994 .align 2, 0 -_080EB904: .4byte 0x00004054 -_080EB908: .4byte 0x000040ee + .pool _080EB90C: - ldr r0, _080EB928 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB9D0 - ldr r4, _080EB92C + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x8 b _080EB994 .align 2, 0 -_080EB928: .4byte 0x00004054 -_080EB92C: .4byte 0x000040ee + .pool _080EB930: - ldr r0, _080EB94C + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB9D0 - ldr r4, _080EB950 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x40 b _080EB994 .align 2, 0 -_080EB94C: .4byte 0x00004054 -_080EB950: .4byte 0x000040ef + .pool _080EB954: - ldr r0, _080EB974 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB9D0 - ldr r4, _080EB978 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -482649,15 +466780,14 @@ _080EB954: adds r0, r2, 0 b _080EB994 .align 2, 0 -_080EB974: .4byte 0x00004054 -_080EB978: .4byte 0x000040ef + .pool _080EB97C: - ldr r0, _080EB9A4 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB9D0 - ldr r4, _080EB9A8 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -482670,15 +466800,14 @@ _080EB994: bl var_set b _080EB9D0 .align 2, 0 -_080EB9A4: .4byte 0x00004054 -_080EB9A8: .4byte 0x000040ef + .pool _080EB9AC: - ldr r0, _080EB9D8 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EB9D0 - ldr r4, _080EB9DC + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -482694,8 +466823,7 @@ _080EB9D0: pop {r0} bx r0 .align 2, 0 -_080EB9D8: .4byte 0x00004054 -_080EB9DC: .4byte 0x000040ef + .pool thumb_func_end sub_80EB56C thumb_func_start sub_80EB9E0 @@ -482713,20 +466841,19 @@ sub_80EB9E0: @ 80EB9E0 movs r2, 0 ldrsh r1, [r4, r2] bl cur_mapdata_get_blockid_at - ldr r1, _080EBA14 + ldr r1, =0xfffffd6f adds r0, r1 cmp r0, 0x35 bls _080EBA08 b _080EBB18 _080EBA08: lsls r0, 2 - ldr r1, _080EBA18 + ldr r1, =_080EBA1C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EBA14: .4byte 0xfffffd6f -_080EBA18: .4byte _080EBA1C + .pool .align 2, 0 _080EBA1C: .4byte _080EBAF4 @@ -482784,12 +466911,12 @@ _080EBA1C: .4byte _080EBB18 .4byte _080EBAF4 _080EBAF4: - ldr r0, _080EBB20 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EBB18 - ldr r4, _080EBB24 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -482805,8 +466932,7 @@ _080EBB18: pop {r0} bx r0 .align 2, 0 -_080EBB20: .4byte 0x00004054 -_080EBB24: .4byte 0x000040ef + .pool thumb_func_end sub_80EB9E0 thumb_func_start sub_80EBB28 @@ -482824,20 +466950,19 @@ sub_80EBB28: @ 80EBB28 movs r2, 0 ldrsh r1, [r4, r2] bl cur_mapdata_get_blockid_at - ldr r1, _080EBB5C + ldr r1, =0xfffffddb adds r0, r1 cmp r0, 0xA2 bls _080EBB50 b _080EBE6C _080EBB50: lsls r0, 2 - ldr r1, _080EBB60 + ldr r1, =_080EBB64 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EBB5C: .4byte 0xfffffddb -_080EBB60: .4byte _080EBB64 + .pool .align 2, 0 _080EBB64: .4byte _080EBE48 @@ -483004,27 +467129,26 @@ _080EBB64: .4byte _080EBE6C .4byte _080EBDF0 _080EBDF0: - ldr r0, _080EBE0C + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EBE6C - ldr r4, _080EBE10 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x8 b _080EBE30 .align 2, 0 -_080EBE0C: .4byte 0x00004054 -_080EBE10: .4byte 0x000040ef + .pool _080EBE14: - ldr r0, _080EBE40 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EBE6C - ldr r4, _080EBE44 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -483039,15 +467163,14 @@ _080EBE30: bl var_set b _080EBE6C .align 2, 0 -_080EBE40: .4byte 0x00004054 -_080EBE44: .4byte 0x000040ef + .pool _080EBE48: - ldr r0, _080EBE74 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EBE6C - ldr r4, _080EBE78 + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -483063,8 +467186,7 @@ _080EBE6C: pop {r0} bx r0 .align 2, 0 -_080EBE74: .4byte 0x00004054 -_080EBE78: .4byte 0x000040ef + .pool thumb_func_end sub_80EBB28 thumb_func_start sub_80EBE7C @@ -483083,18 +467205,18 @@ sub_80EBE7C: @ 80EBE7C ldrsh r1, [r4, r2] bl cur_mapdata_get_blockid_at adds r1, r0, 0 - ldr r0, _080EBED4 + ldr r0, =0x0000028e cmp r1, r0 bgt _080EBECC subs r0, 0x1 cmp r1, r0 blt _080EBECC - ldr r0, _080EBED8 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080EBECC - ldr r4, _080EBEDC + ldr r4, =0x000040ef adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -483110,25 +467232,23 @@ _080EBECC: pop {r0} bx r0 .align 2, 0 -_080EBED4: .4byte 0x0000028e -_080EBED8: .4byte 0x00004054 -_080EBEDC: .4byte 0x000040ef + .pool thumb_func_end sub_80EBE7C thumb_func_start sub_80EBEE0 sub_80EBEE0: @ 80EBEE0 push {r4-r7,lr} movs r3, 0 - ldr r6, _080EBF30 + ldr r6, =0x03005d8c movs r5, 0 - ldr r7, _080EBF34 + ldr r7, =0x000027ce _080EBEEA: ldr r0, [r6] lsls r1, r3, 3 adds r1, r3 lsls r1, 2 adds r0, r1 - ldr r2, _080EBF38 + ldr r2, =0x000027cc adds r0, r2 strb r5, [r0] ldr r0, [r6] @@ -483159,16 +467279,14 @@ _080EBF0A: pop {r0} bx r0 .align 2, 0 -_080EBF30: .4byte 0x03005d8c -_080EBF34: .4byte 0x000027ce -_080EBF38: .4byte 0x000027cc + .pool thumb_func_end sub_80EBEE0 thumb_func_start sub_80EBF3C sub_80EBF3C: @ 80EBF3C push {r4-r7,lr} movs r4, 0x5 - ldr r1, _080EBFB0 + ldr r1, =0x03005d8c ldr r0, [r1] movs r2, 0xA2 lsls r2, 6 @@ -483202,14 +467320,14 @@ _080EBF70: lsls r0, 24 lsrs r5, r0, 24 adds r7, r5, 0 - ldr r6, _080EBFB0 + ldr r6, =0x03005d8c _080EBF86: ldr r1, [r6] lsls r0, r5, 3 adds r0, r5 lsls r4, r0, 2 adds r1, r4 - ldr r0, _080EBFB4 + ldr r0, =0x000027cc adds r1, r0 ldrb r0, [r1] bl sub_80EFFE0 @@ -483219,16 +467337,14 @@ _080EBF86: beq _080EBFBC ldr r0, [r6] adds r0, r4 - ldr r1, _080EBFB8 + ldr r1, =0x000027cd adds r0, r1 ldrb r0, [r0] b _080EBFCC .align 2, 0 -_080EBFB0: .4byte 0x03005d8c -_080EBFB4: .4byte 0x000027cc -_080EBFB8: .4byte 0x000027cd + .pool _080EBFBC: - ldr r2, _080EBFD4 + ldr r2, =0x000027cc adds r0, r4, r2 ldr r1, [r6] adds r1, r0 @@ -483242,7 +467358,7 @@ _080EBFCC: adds r0, r5, 0 b _080EBFEC .align 2, 0 -_080EBFD4: .4byte 0x000027cc + .pool _080EBFD8: cmp r5, 0 bne _080EBFE0 @@ -483273,9 +467389,9 @@ sub_80EBFF4: @ 80EBFF4 movs r0, 0xFF b _080EC03E _080EC006: - ldr r0, _080EC030 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r3, _080EC034 + ldr r3, =0x00002b90 adds r0, r2, r3 ldrh r0, [r0] cmp r0, 0 @@ -483284,7 +467400,7 @@ _080EC006: adds r0, r1 lsls r0, 2 adds r0, r2, r0 - ldr r2, _080EC038 + ldr r2, =0x000027cc adds r0, r2 ldrb r0, [r0] cmp r0, 0x29 @@ -483294,9 +467410,7 @@ _080EC006: lsrs r0, 24 b _080EC03E .align 2, 0 -_080EC030: .4byte 0x03005d8c -_080EC034: .4byte 0x00002b90 -_080EC038: .4byte 0x000027cc + .pool _080EC03C: adds r0, r1, 0 _080EC03E: @@ -483309,7 +467423,7 @@ per_step_2: @ 80EC044 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _080EC078 + ldr r0, =0x00000891 bl flag_set bl sub_80F0040 lsls r0, 24 @@ -483318,7 +467432,7 @@ per_step_2: @ 80EC044 beq _080EC06A cmp r0, 0x2 beq _080EC0BE - ldr r0, _080EC07C + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0xD @@ -483330,10 +467444,9 @@ _080EC06A: bl sub_80EC0CC b _080EC0BE .align 2, 0 -_080EC078: .4byte 0x00000891 -_080EC07C: .4byte 0x03005d8c + .pool _080EC080: - ldr r0, _080EC0C4 + ldr r0, =0x00000892 bl flag_check lsls r0, 24 cmp r0, 0 @@ -483353,7 +467466,7 @@ _080EC080: cmp r0, 0 beq _080EC0BE _080EC0AE: - ldr r0, _080EC0C8 + ldr r0, =0x00000891 bl flag_clear adds r0, r4, 0 adds r1, r5, 0 @@ -483364,8 +467477,7 @@ _080EC0BE: pop {r0} bx r0 .align 2, 0 -_080EC0C4: .4byte 0x00000892 -_080EC0C8: .4byte 0x00000891 + .pool thumb_func_end per_step_2 thumb_func_start sub_80EC0CC @@ -483427,7 +467539,7 @@ _080EC120: thumb_func_start sub_80EC130 sub_80EC130: @ 80EC130 push {lr} - ldr r1, _080EC148 + ldr r1, =0x03005dc0 ldr r0, [r1] ldr r1, [r1, 0x4] movs r2, 0x2 @@ -483436,13 +467548,13 @@ sub_80EC130: @ 80EC130 pop {r0} bx r0 .align 2, 0 -_080EC148: .4byte 0x03005dc0 + .pool thumb_func_end sub_80EC130 thumb_func_start cut cut: @ 80EC14C push {lr} - ldr r1, _080EC164 + ldr r1, =0x03005dc0 ldr r0, [r1] ldr r1, [r1, 0x4] movs r2, 0x3 @@ -483451,41 +467563,39 @@ cut: @ 80EC14C pop {r0} bx r0 .align 2, 0 -_080EC164: .4byte 0x03005dc0 + .pool thumb_func_end cut thumb_func_start sub_80EC168 sub_80EC168: @ 80EC168 - ldr r0, _080EC180 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _080EC184 + ldr r0, =0x020375e0 ldrh r2, [r0] lsls r0, r2, 3 adds r0, r2 lsls r0, 2 adds r1, r0 - ldr r0, _080EC188 + ldr r0, =0x000027cc adds r1, r0 ldrb r0, [r1] bx lr .align 2, 0 -_080EC180: .4byte 0x03005d8c -_080EC184: .4byte 0x020375e0 -_080EC188: .4byte 0x000027cc + .pool thumb_func_end sub_80EC168 thumb_func_start sub_80EC18C sub_80EC18C: @ 80EC18C push {r4,lr} movs r2, 0 - ldr r0, _080EC1B8 + ldr r0, =0x03005d8c ldr r3, [r0] _080EC194: lsls r0, r2, 3 adds r0, r2 lsls r0, 2 adds r1, r3, r0 - ldr r4, _080EC1BC + ldr r4, =0x000027cc adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0 @@ -483500,8 +467610,7 @@ _080EC194: adds r0, r2, 0 b _080EC1CC .align 2, 0 -_080EC1B8: .4byte 0x03005d8c -_080EC1BC: .4byte 0x000027cc + .pool _080EC1C0: adds r0, r2, 0x1 lsls r0, 24 @@ -483518,20 +467627,20 @@ _080EC1CC: thumb_func_start sub_80EC1D4 sub_80EC1D4: @ 80EC1D4 push {lr} - ldr r3, _080EC204 - ldr r2, _080EC208 + ldr r3, =0x03005d8c + ldr r2, =0x020375e0 ldrh r1, [r2] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080EC20C + ldr r1, =0x000027cc adds r0, r1 ldr r3, [r3] adds r0, r3, r0 ldrb r0, [r0] cmp r0, 0x29 bne _080EC214 - ldr r1, _080EC210 + ldr r1, =0x00002b90 adds r0, r3, r1 ldrh r0, [r0] cmp r0, 0 @@ -483541,10 +467650,7 @@ sub_80EC1D4: @ 80EC1D4 lsrs r0, 24 b _080EC216 .align 2, 0 -_080EC204: .4byte 0x03005d8c -_080EC208: .4byte 0x020375e0 -_080EC20C: .4byte 0x000027cc -_080EC210: .4byte 0x00002b90 + .pool _080EC214: ldrb r0, [r2] _080EC216: @@ -483559,23 +467665,23 @@ sub_80EC21C: @ 80EC21C mov r5, r9 mov r4, r8 push {r4-r6} - ldr r3, _080EC300 + ldr r3, =0x03005d8c ldr r2, [r3] - ldr r1, _080EC304 + ldr r1, =0x00002ba4 adds r0, r2, r1 movs r4, 0 mov r10, r4 movs r1, 0 strh r1, [r0] - ldr r4, _080EC308 + ldr r4, =0x00002ba6 adds r0, r2, r4 strh r1, [r0] adds r4, 0x2 adds r0, r2, r4 strh r1, [r0] - ldr r0, _080EC30C + ldr r0, =0x00002baa adds r1, r2, r0 - ldr r0, _080EC310 + ldr r0, =0x0000ffff strh r0, [r1] adds r4, 0x6 adds r2, r4 @@ -483623,7 +467729,7 @@ sub_80EC21C: @ 80EC21C ands r0, r2 strb r0, [r1] ldr r0, [r3] - ldr r2, _080EC314 + ldr r2, =0x00002baf adds r0, r2 ldrb r1, [r0] mov r4, r9 @@ -483652,7 +467758,7 @@ sub_80EC21C: @ 80EC21C ands r0, r2 strb r0, [r1] ldr r0, [r3] - ldr r1, _080EC318 + ldr r1, =0x00002bac adds r0, r1 mov r4, r10 strb r4, [r0] @@ -483668,24 +467774,18 @@ sub_80EC21C: @ 80EC21C pop {r0} bx r0 .align 2, 0 -_080EC300: .4byte 0x03005d8c -_080EC304: .4byte 0x00002ba4 -_080EC308: .4byte 0x00002ba6 -_080EC30C: .4byte 0x00002baa -_080EC310: .4byte 0x0000ffff -_080EC314: .4byte 0x00002baf -_080EC318: .4byte 0x00002bac + .pool thumb_func_end sub_80EC21C thumb_func_start sub_80EC31C sub_80EC31C: @ 80EC31C push {r4,lr} - ldr r3, _080EC384 + ldr r3, =0x03005d8c ldr r2, [r3] - ldr r0, _080EC388 + ldr r0, =0x03005d10 mov r12, r0 ldrh r1, [r0, 0x6] - ldr r4, _080EC38C + ldr r4, =0x00002ba4 adds r0, r2, r4 strh r1, [r0] mov r0, r12 @@ -483698,7 +467798,7 @@ sub_80EC31C: @ 80EC31C adds r4, 0x2 adds r0, r2, r4 strh r1, [r0] - ldr r0, _080EC390 + ldr r0, =0x00002bad adds r2, r0 ldrb r1, [r2] adds r0, r1, 0 @@ -483712,7 +467812,7 @@ _080EC354: mov r0, r12 ldrb r1, [r0, 0x5] lsls r1, 31 - ldr r0, _080EC394 + ldr r0, =0x00002bae adds r2, r0 lsrs r1, 31 ldrb r3, [r2] @@ -483726,21 +467826,17 @@ _080EC354: cmp r0, 0 beq _080EC398 ldr r0, [r4] - ldr r1, _080EC394 + ldr r1, =0x00002bae adds r0, r1 ldrb r1, [r0] movs r2, 0x2 orrs r1, r2 b _080EC3A6 .align 2, 0 -_080EC384: .4byte 0x03005d8c -_080EC388: .4byte 0x03005d10 -_080EC38C: .4byte 0x00002ba4 -_080EC390: .4byte 0x00002bad -_080EC394: .4byte 0x00002bae + .pool _080EC398: ldr r0, [r4] - ldr r1, _080EC3C0 + ldr r1, =0x00002bae adds r0, r1 ldrb r2, [r0] movs r1, 0x3 @@ -483753,17 +467849,17 @@ _080EC3A6: cmp r0, 0 beq _080EC3C4 ldr r0, [r4] - ldr r1, _080EC3C0 + ldr r1, =0x00002bae adds r0, r1 ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 b _080EC3D2 .align 2, 0 -_080EC3C0: .4byte 0x00002bae + .pool _080EC3C4: ldr r0, [r4] - ldr r1, _080EC40C + ldr r1, =0x00002bae adds r0, r1 ldrb r2, [r0] movs r1, 0x5 @@ -483796,14 +467892,14 @@ _080EC3EC: cmp r0, 0 beq _080EC3EC ldr r0, [r4] - ldr r4, _080EC40C + ldr r4, =0x00002bae adds r0, r4 b _080EC416 .align 2, 0 -_080EC40C: .4byte 0x00002bae + .pool _080EC410: ldr r0, [r4] - ldr r1, _080EC43C + ldr r1, =0x00002bae adds r0, r1 _080EC416: ldrb r1, [r0] @@ -483812,9 +467908,9 @@ _080EC416: strb r1, [r0] _080EC41E: bl sub_80EC4E8 - ldr r0, _080EC440 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r4, _080EC444 + ldr r4, =0x00002ba8 adds r0, r4 ldrh r0, [r0] cmp r0, 0 @@ -483826,21 +467922,19 @@ _080EC436: pop {r0} bx r0 .align 2, 0 -_080EC43C: .4byte 0x00002bae -_080EC440: .4byte 0x03005d8c -_080EC444: .4byte 0x00002ba8 + .pool thumb_func_end sub_80EC31C thumb_func_start sub_80EC448 sub_80EC448: @ 80EC448 push {r4-r6,lr} - ldr r5, _080EC4D4 + ldr r5, =0x03005d8c ldr r2, [r5] - ldr r6, _080EC4D8 + ldr r6, =0x00002bae adds r0, r2, r6 ldrb r1, [r0] lsls r1, 31 - ldr r4, _080EC4DC + ldr r4, =0x00002baf adds r2, r4 lsrs r1, 31 ldrb r3, [r2] @@ -483892,9 +467986,9 @@ sub_80EC448: @ 80EC448 orrs r0, r2 strb r0, [r1] ldr r0, [r5] - ldr r1, _080EC4E0 + ldr r1, =0x02037318 ldrb r1, [r1, 0x14] - ldr r2, _080EC4E4 + ldr r2, =0x00002bac adds r0, r2 strb r1, [r0] movs r0, 0x6 @@ -483903,18 +467997,14 @@ sub_80EC448: @ 80EC448 pop {r0} bx r0 .align 2, 0 -_080EC4D4: .4byte 0x03005d8c -_080EC4D8: .4byte 0x00002bae -_080EC4DC: .4byte 0x00002baf -_080EC4E0: .4byte 0x02037318 -_080EC4E4: .4byte 0x00002bac + .pool thumb_func_end sub_80EC448 thumb_func_start sub_80EC4E8 sub_80EC4E8: @ 80EC4E8 - ldr r0, _080EC4FC + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _080EC500 + ldr r0, =0x00002bae adds r1, r0 ldrb r2, [r1] movs r0, 0x11 @@ -483923,16 +468013,15 @@ sub_80EC4E8: @ 80EC4E8 strb r0, [r1] bx lr .align 2, 0 -_080EC4FC: .4byte 0x03005d8c -_080EC500: .4byte 0x00002bae + .pool thumb_func_end sub_80EC4E8 thumb_func_start sub_80EC504 sub_80EC504: @ 80EC504 push {lr} - ldr r0, _080EC528 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _080EC52C + ldr r2, =0x00002bad adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x5 @@ -483947,41 +468036,39 @@ _080EC522: pop {r1} bx r1 .align 2, 0 -_080EC528: .4byte 0x03005d8c -_080EC52C: .4byte 0x00002bad + .pool thumb_func_end sub_80EC504 thumb_func_start is_tile_XX_prevent_per_step_scripts is_tile_XX_prevent_per_step_scripts: @ 80EC530 - ldr r0, _080EC540 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080EC544 + ldr r1, =0x00002bae adds r0, r1 ldrb r0, [r0] lsls r0, 27 lsrs r0, 31 bx lr .align 2, 0 -_080EC540: .4byte 0x03005d8c -_080EC544: .4byte 0x00002bae + .pool thumb_func_end is_tile_XX_prevent_per_step_scripts thumb_func_start sub_80EC548 sub_80EC548: @ 80EC548 push {r4,r5,lr} - ldr r5, _080EC574 + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r2, _080EC578 + ldr r2, =0x00002baa adds r1, r0, r2 ldrh r0, [r1] - ldr r4, _080EC57C + ldr r4, =0x0000ffff cmp r0, r4 beq _080EC584 - ldr r0, _080EC580 + ldr r0, =0x02021cc4 ldrh r1, [r1] bl sub_811EBBC ldr r1, [r5] - ldr r0, _080EC578 + ldr r0, =0x00002baa adds r1, r0 ldrh r2, [r1] adds r0, r4, 0 @@ -483990,10 +468077,7 @@ sub_80EC548: @ 80EC548 movs r0, 0x1 b _080EC586 .align 2, 0 -_080EC574: .4byte 0x03005d8c -_080EC578: .4byte 0x00002baa -_080EC57C: .4byte 0x0000ffff -_080EC580: .4byte 0x02021cc4 + .pool _080EC584: movs r0, 0 _080EC586: @@ -484005,9 +468089,9 @@ _080EC586: thumb_func_start sub_80EC58C sub_80EC58C: @ 80EC58C push {lr} - ldr r0, _080EC5A4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080EC5A8 + ldr r1, =0x00002baf adds r0, r1 ldrb r1, [r0] movs r0, 0x1 @@ -484017,8 +468101,7 @@ sub_80EC58C: @ 80EC58C movs r0, 0x1 b _080EC5D2 .align 2, 0 -_080EC5A4: .4byte 0x03005d8c -_080EC5A8: .4byte 0x00002baf + .pool _080EC5AC: movs r0, 0x8 ands r0, r1 @@ -484057,12 +468140,12 @@ sub_80EC5D8: @ 80EC5D8 cmp r0, 0x7 bhi _080EC6B0 lsls r0, 2 - ldr r1, _080EC5F4 + ldr r1, =_080EC5F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EC5F4: .4byte _080EC5F8 + .pool .align 2, 0 _080EC5F8: .4byte _080EC618 @@ -484074,80 +468157,73 @@ _080EC5F8: .4byte _080EC690 .4byte _080EC6A4 _080EC618: - ldr r1, _080EC624 + ldr r1, =0x020375e0 movs r0, 0xE strh r0, [r1] - ldr r1, _080EC628 + ldr r1, =0x020375e2 movs r0, 0xD b _080EC6AE .align 2, 0 -_080EC624: .4byte 0x020375e0 -_080EC628: .4byte 0x020375e2 + .pool _080EC62C: - ldr r1, _080EC638 + ldr r1, =0x020375e0 movs r0, 0x5 strh r0, [r1] - ldr r1, _080EC63C + ldr r1, =0x020375e2 movs r0, 0x6 b _080EC6AE .align 2, 0 -_080EC638: .4byte 0x020375e0 -_080EC63C: .4byte 0x020375e2 + .pool _080EC640: - ldr r1, _080EC64C + ldr r1, =0x020375e0 movs r0, 0x12 strh r0, [r1] - ldr r1, _080EC650 + ldr r1, =0x020375e2 movs r0, 0x11 b _080EC6AE .align 2, 0 -_080EC64C: .4byte 0x020375e0 -_080EC650: .4byte 0x020375e2 + .pool _080EC654: - ldr r1, _080EC660 + ldr r1, =0x020375e0 movs r0, 0x15 strh r0, [r1] - ldr r1, _080EC664 + ldr r1, =0x020375e2 movs r0, 0x16 b _080EC6AE .align 2, 0 -_080EC660: .4byte 0x020375e0 -_080EC664: .4byte 0x020375e2 + .pool _080EC668: - ldr r1, _080EC674 + ldr r1, =0x020375e0 movs r0, 0x8 strh r0, [r1] - ldr r1, _080EC678 + ldr r1, =0x020375e2 movs r0, 0x9 b _080EC6AE .align 2, 0 -_080EC674: .4byte 0x020375e0 -_080EC678: .4byte 0x020375e2 + .pool _080EC67C: - ldr r1, _080EC688 + ldr r1, =0x020375e0 movs r0, 0x13 strh r0, [r1] - ldr r1, _080EC68C + ldr r1, =0x020375e2 movs r0, 0x14 b _080EC6AE .align 2, 0 -_080EC688: .4byte 0x020375e0 -_080EC68C: .4byte 0x020375e2 + .pool _080EC690: - ldr r1, _080EC69C + ldr r1, =0x020375e0 movs r0, 0x17 strh r0, [r1] - ldr r1, _080EC6A0 + ldr r1, =0x020375e2 movs r0, 0x18 b _080EC6AE .align 2, 0 -_080EC69C: .4byte 0x020375e0 -_080EC6A0: .4byte 0x020375e2 + .pool _080EC6A4: - ldr r1, _080EC6B4 + ldr r1, =0x020375e0 movs r0, 0xA strh r0, [r1] - ldr r1, _080EC6B8 + ldr r1, =0x020375e2 movs r0, 0xB _080EC6AE: strh r0, [r1] @@ -484155,26 +468231,24 @@ _080EC6B0: pop {r0} bx r0 .align 2, 0 -_080EC6B4: .4byte 0x020375e0 -_080EC6B8: .4byte 0x020375e2 + .pool thumb_func_end sub_80EC5D8 thumb_func_start sub_80EC6BC sub_80EC6BC: @ 80EC6BC push {lr} - ldr r0, _080EC6D4 + ldr r0, =0x020375e2 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x7 bhi _080EC724 lsls r0, 2 - ldr r1, _080EC6D8 + ldr r1, =_080EC6DC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EC6D4: .4byte 0x020375e2 -_080EC6D8: .4byte _080EC6DC + .pool .align 2, 0 _080EC6DC: .4byte _080EC6FC @@ -484218,17 +468292,17 @@ sub_80EC728: @ 80EC728 movs r4, 0 bl sub_80EED88 bl sub_80ED718 - ldr r5, _080EC748 + ldr r5, =0x03005d10 ldrh r0, [r5, 0x28] cmp r0, 0 bne _080EC74C bl sub_80EC8FC b _080EC888 .align 2, 0 -_080EC748: .4byte 0x03005d10 + .pool _080EC74C: bl sub_80EC8A4 - ldr r0, _080EC804 + ldr r0, =0x0000ffff bl sub_80EFB38 lsls r0, 24 cmp r0, 0 @@ -484238,7 +468312,7 @@ _080EC75E: ldrh r1, [r5, 0x28] movs r0, 0xB muls r0, r1 - ldr r1, _080EC808 + ldr r1, =0x083185c8 adds r0, r1 adds r1, r5, 0 adds r1, 0x2A @@ -484247,12 +468321,12 @@ _080EC75E: bne _080EC776 b _080EC888 _080EC776: - ldr r0, _080EC80C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080EC810 + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFB08 - ldr r1, _080EC814 + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -484290,14 +468364,14 @@ _080EC7A8: beq _080EC888 _080EC7CA: movs r4, 0 - ldr r2, _080EC80C - ldr r0, _080EC814 + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080EC810 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r6, r1, r0 @@ -484313,24 +468387,19 @@ _080EC7CA: movs r0, 0x1 adds r3, r6, 0 adds r3, 0x13 - ldr r1, _080EC818 + ldr r1, =0x03005d90 mov r8, r1 adds r7, r6, 0x4 b _080EC84E .align 2, 0 -_080EC804: .4byte 0x0000ffff -_080EC808: .4byte 0x083185c8 -_080EC80C: .4byte 0x03005d8c -_080EC810: .4byte 0x000027cc -_080EC814: .4byte 0x030060bc -_080EC818: .4byte 0x03005d90 + .pool _080EC81C: movs r2, 0 - ldr r0, _080EC894 + ldr r0, =0x02024208 mov r12, r0 adds r3, r6, 0 adds r3, 0x13 - ldr r1, _080EC898 + ldr r1, =0x03005d90 mov r8, r1 adds r7, r6, 0x4 adds r1, r5, 0 @@ -484359,7 +468428,7 @@ _080EC84E: ldr r1, [r0] adds r0, r3, 0 bl gf_strcpy - ldr r4, _080EC89C + ldr r4, =0x03005d3a adds r0, r7, 0 adds r1, r4, 0 bl gf_strcpy @@ -484373,7 +468442,7 @@ _080EC84E: strh r0, [r6, 0x10] adds r0, r6, 0 bl sub_80EC9E8 - ldr r0, _080EC8A0 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r6, 0x2] strb r5, [r6, 0x3] @@ -484384,23 +468453,20 @@ _080EC888: pop {r0} bx r0 .align 2, 0 -_080EC894: .4byte 0x02024208 -_080EC898: .4byte 0x03005d90 -_080EC89C: .4byte 0x03005d3a -_080EC8A0: .4byte 0x082e9531 + .pool thumb_func_end sub_80EC728 thumb_func_start sub_80EC8A4 sub_80EC8A4: @ 80EC8A4 push {r4,lr} - ldr r0, _080EC8E8 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _080EC8EC + ldr r0, =0x00002b2c adds r4, r1, r0 ldrb r0, [r4] cmp r0, 0x19 beq _080EC8CA - ldr r2, _080EC8F0 + ldr r2, =0x000027cc adds r0, r1, r2 movs r1, 0x18 bl sub_80EF910 @@ -484413,23 +468479,19 @@ _080EC8CA: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] - ldr r1, _080EC8F4 + ldr r1, =0x03005d10 ldrh r0, [r1, 0x28] strh r0, [r4, 0x4] ldrh r0, [r1, 0x6] strh r0, [r4, 0x8] - ldr r0, _080EC8F8 + ldr r0, =0x02037318 ldrb r0, [r0, 0x14] strb r0, [r4, 0xA] pop {r4} pop {r0} bx r0 .align 2, 0 -_080EC8E8: .4byte 0x03005d8c -_080EC8EC: .4byte 0x00002b2c -_080EC8F0: .4byte 0x000027cc -_080EC8F4: .4byte 0x03005d10 -_080EC8F8: .4byte 0x02037318 + .pool thumb_func_end sub_80EC8A4 thumb_func_start sub_80EC8FC @@ -484437,14 +468499,14 @@ sub_80EC8FC: @ 80EC8FC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _080EC9C0 + ldr r0, =0x0000ffff bl sub_80EFB38 lsls r0, 24 cmp r0, 0 bne _080EC9B4 movs r1, 0 movs r5, 0 - ldr r2, _080EC9C4 + ldr r2, =0x03005d46 _080EC914: adds r0, r1, r2 ldrb r0, [r0] @@ -484462,7 +468524,7 @@ _080EC914: _080EC92E: cmp r5, 0x2 bls _080EC9B4 - ldr r0, _080EC9C8 + ldr r0, =0x0202433a mov r8, r0 ldrb r0, [r0] cmp r0, 0x6 @@ -484470,12 +468532,12 @@ _080EC92E: cmp r0, 0x1 bne _080EC9B4 _080EC940: - ldr r7, _080EC9CC + ldr r7, =0x03005d8c ldr r0, [r7] - ldr r6, _080EC9D0 + ldr r6, =0x000027cc adds r0, r6 bl sub_80EFB08 - ldr r4, _080EC9D4 + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -484502,7 +468564,7 @@ _080EC940: movs r0, 0x17 strb r0, [r4] strb r1, [r4, 0x1] - ldr r1, _080EC9D8 + ldr r1, =0x03005d10 ldrh r0, [r1, 0x6] strh r0, [r4, 0xC] ldrh r0, [r1, 0x20] @@ -484511,17 +468573,17 @@ _080EC940: mov r1, r8 ldrb r0, [r1] strb r0, [r4, 0x11] - ldr r0, _080EC9DC + ldr r0, =0x02037318 ldrb r0, [r0, 0x14] strb r0, [r4, 0x12] adds r0, r4, 0 adds r0, 0x13 - ldr r1, _080EC9E0 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EC9E4 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x2] _080EC9B4: @@ -484531,16 +468593,7 @@ _080EC9B4: pop {r0} bx r0 .align 2, 0 -_080EC9C0: .4byte 0x0000ffff -_080EC9C4: .4byte 0x03005d46 -_080EC9C8: .4byte 0x0202433a -_080EC9CC: .4byte 0x03005d8c -_080EC9D0: .4byte 0x000027cc -_080EC9D4: .4byte 0x030060bc -_080EC9D8: .4byte 0x03005d10 -_080EC9DC: .4byte 0x02037318 -_080EC9E0: .4byte 0x03005d90 -_080EC9E4: .4byte 0x082e9531 + .pool thumb_func_end sub_80EC8FC thumb_func_start sub_80EC9E8 @@ -484593,22 +468646,22 @@ sub_80ECA38: @ 80ECA38 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _080ECAD8 + ldr r0, =0x03005d8c mov r8, r0 ldr r7, [r0] - ldr r1, _080ECADC + ldr r1, =0x00002b2c adds r6, r7, r1 ldrb r1, [r6] cmp r1, 0x8 bne _080ECACE - ldr r0, _080ECAE0 + ldr r0, =0x030060bc ldrb r0, [r0] lsls r0, 24 asrs r0, 24 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r5, _080ECAE4 + ldr r5, =0x000027cc adds r4, r5 adds r4, r7, r4 strb r1, [r4] @@ -484616,17 +468669,17 @@ sub_80ECA38: @ 80ECA38 strb r0, [r4, 0x1] adds r0, r4, 0 adds r0, 0x14 - ldr r1, _080ECAE8 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy - ldr r0, _080ECAEC + ldr r0, =0x02039f2c ldrh r0, [r0] strb r0, [r4, 0x1C] - ldr r0, _080ECAF0 + ldr r0, =0x02039f24 ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080ECAF4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB movs r2, 0 @@ -484645,12 +468698,12 @@ sub_80ECA38: @ 80ECA38 ldrb r0, [r6, 0xF] strb r0, [r4, 0xF] adds r0, r4, 0x4 - ldr r2, _080ECAF8 + ldr r2, =0x00002b30 adds r1, r7, r2 bl gf_strcpy adds r0, r4, 0 bl sub_80ECA10 - ldr r0, _080ECAFC + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x1D] ldrb r0, [r6, 0x1E] @@ -484667,16 +468720,7 @@ _080ECACE: pop {r0} bx r0 .align 2, 0 -_080ECAD8: .4byte 0x03005d8c -_080ECADC: .4byte 0x00002b2c -_080ECAE0: .4byte 0x030060bc -_080ECAE4: .4byte 0x000027cc -_080ECAE8: .4byte 0x03005d90 -_080ECAEC: .4byte 0x02039f2c -_080ECAF0: .4byte 0x02039f24 -_080ECAF4: .4byte 0x020244ec -_080ECAF8: .4byte 0x00002b30 -_080ECAFC: .4byte 0x082e9531 + .pool thumb_func_end sub_80ECA38 thumb_func_start sub_80ECB00 @@ -484698,12 +468742,12 @@ sub_80ECB00: @ 80ECB00 lsls r3, 16 lsrs r3, 16 mov r8, r3 - ldr r6, _080ECB88 + ldr r6, =0x03005d8c ldr r0, [r6] - ldr r5, _080ECB8C + ldr r5, =0x000027cc adds r0, r5 bl sub_80EFADC - ldr r4, _080ECB90 + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -484713,7 +468757,7 @@ sub_80ECB00: @ 80ECB00 beq _080ECBEC movs r0, 0xA bl sub_80EF550 - ldr r0, _080ECB94 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 beq _080ECBEC @@ -484730,10 +468774,10 @@ sub_80ECB00: @ 80ECB00 movs r5, 0x1 strb r5, [r4, 0x1] adds r0, r4, 0x4 - ldr r1, _080ECB98 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy - ldr r0, _080ECB9C + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x40 ands r0, r1 @@ -484746,12 +468790,7 @@ sub_80ECB00: @ 80ECB00 strb r5, [r4, 0x18] b _080ECBA4 .align 2, 0 -_080ECB88: .4byte 0x03005d8c -_080ECB8C: .4byte 0x000027cc -_080ECB90: .4byte 0x030060bc -_080ECB94: .4byte 0x020375f0 -_080ECB98: .4byte 0x03005d90 -_080ECB9C: .4byte 0x02022fec + .pool _080ECBA0: movs r0, 0x2 _080ECBA2: @@ -484766,7 +468805,7 @@ _080ECBA4: lsls r0, r7, 3 subs r0, r7 lsls r5, r0, 2 - ldr r6, _080ECBFC + ldr r6, =0x020229f0 adds r1, r5, r6 mov r0, sp bl gf_strcpy @@ -484778,7 +468817,7 @@ _080ECBA4: bl gf_strcpy adds r0, r4, 0 bl sub_80ECA10 - ldr r0, _080ECC00 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x19] cmp r0, 0x1 @@ -484801,8 +468840,7 @@ _080ECBEC: pop {r0} bx r0 .align 2, 0 -_080ECBFC: .4byte 0x020229f0 -_080ECC00: .4byte 0x082e9531 + .pool thumb_func_end sub_80ECB00 thumb_func_start sub_80ECC04 @@ -484825,13 +468863,13 @@ sub_80ECC04: @ 80ECC04 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _080ECC58 + ldr r0, =0x03005d8c mov r8, r0 ldr r0, [r0] - ldr r7, _080ECC5C + ldr r7, =0x000027cc adds r0, r7 bl sub_80EFADC - ldr r4, _080ECC60 + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -484841,7 +468879,7 @@ sub_80ECC04: @ 80ECC04 beq _080ECC54 movs r0, 0x9 bl sub_80EF550 - ldr r0, _080ECC64 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 bne _080ECC68 @@ -484849,10 +468887,7 @@ _080ECC54: movs r0, 0 b _080ECCEE .align 2, 0 -_080ECC58: .4byte 0x03005d8c -_080ECC5C: .4byte 0x000027cc -_080ECC60: .4byte 0x030060bc -_080ECC64: .4byte 0x020375f0 + .pool _080ECC68: movs r1, 0 ldrsb r1, [r4, r1] @@ -484869,7 +468904,7 @@ _080ECC68: strb r7, [r4, 0x1] adds r0, r4, 0 adds r0, 0xC - ldr r1, _080ECCE0 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy mov r0, sp @@ -484898,7 +468933,7 @@ _080ECC68: strb r0, [r4, 0x2] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, _080ECCE4 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x14] cmp r0, 0x1 @@ -484910,8 +468945,7 @@ _080ECCDA: strb r7, [r4, 0x15] b _080ECCEC .align 2, 0 -_080ECCE0: .4byte 0x03005d90 -_080ECCE4: .4byte 0x082e9531 + .pool _080ECCE8: mov r2, r9 strb r2, [r4, 0x15] @@ -484932,24 +468966,24 @@ _080ECCEE: sub_80ECD00: @ 80ECD00 push {r4-r6,lr} sub sp, 0x20 - ldr r6, _080ECD78 - ldr r0, _080ECD7C + ldr r6, =0x03005d8c + ldr r0, =0x020375e4 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080ECD80 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r6] adds r4, r1, r0 - ldr r0, _080ECD84 + ldr r0, =0x020375e2 ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 1 strb r0, [r4, 0x16] adds r0, r4, 0x2 - ldr r1, _080ECD88 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy movs r0, 0xB @@ -484960,7 +468994,7 @@ sub_80ECD00: @ 80ECD00 strb r0, [r4, 0xA] lsrs r0, 8 strb r0, [r4, 0xB] - ldr r1, _080ECD8C + ldr r1, =0x02021cc4 mov r0, sp bl gf_strcpy mov r0, sp @@ -484971,13 +469005,13 @@ sub_80ECD00: @ 80ECD00 bl gf_strcpy adds r0, r4, 0 bl sub_80ECA10 - ldr r0, _080ECD90 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x17] cmp r0, 0x1 beq _080ECD74 ldr r0, [r6] - ldr r1, _080ECD94 + ldr r1, =0x000031a0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -484986,14 +469020,7 @@ _080ECD74: strb r5, [r4, 0x18] b _080ECD9A .align 2, 0 -_080ECD78: .4byte 0x03005d8c -_080ECD7C: .4byte 0x020375e4 -_080ECD80: .4byte 0x000027cc -_080ECD84: .4byte 0x020375e2 -_080ECD88: .4byte 0x03005d90 -_080ECD8C: .4byte 0x02021cc4 -_080ECD90: .4byte 0x082e9531 -_080ECD94: .4byte 0x000031a0 + .pool _080ECD98: strb r0, [r4, 0x18] _080ECD9A: @@ -485008,16 +469035,16 @@ sub_80ECDA4: @ 80ECDA4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _080ECDE4 + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r4, _080ECDE8 + ldr r4, =0x000027cc adds r0, r4 movs r1, 0x18 bl sub_80EF910 ldr r0, [r5] adds r0, r4 bl sub_80EFADC - ldr r1, _080ECDEC + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -485026,7 +469053,7 @@ sub_80ECDA4: @ 80ECDA4 cmp r0, r1 beq _080ECDDC ldr r0, [r5] - ldr r1, _080ECDF0 + ldr r1, =0x00002b2c adds r0, r1 strb r6, [r0, 0xD] movs r1, 0x8 @@ -485036,10 +469063,7 @@ _080ECDDC: pop {r0} bx r0 .align 2, 0 -_080ECDE4: .4byte 0x03005d8c -_080ECDE8: .4byte 0x000027cc -_080ECDEC: .4byte 0x030060bc -_080ECDF0: .4byte 0x00002b2c + .pool thumb_func_end sub_80ECDA4 thumb_func_start sub_80ECDF4 @@ -485047,14 +469071,14 @@ sub_80ECDF4: @ 80ECDF4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080ECE24 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080ECE28 + ldr r1, =0x00002b2c adds r4, r0, r1 - ldr r1, _080ECE2C + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFADC - ldr r1, _080ECE30 + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -485068,10 +469092,7 @@ _080ECE1C: pop {r0} bx r0 .align 2, 0 -_080ECE24: .4byte 0x03005d8c -_080ECE28: .4byte 0x00002b2c -_080ECE2C: .4byte 0x000027cc -_080ECE30: .4byte 0x030060bc + .pool thumb_func_end sub_80ECDF4 thumb_func_start sub_80ECE34 @@ -485079,14 +469100,14 @@ sub_80ECE34: @ 80ECE34 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080ECE64 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080ECE68 + ldr r1, =0x00002b2c adds r4, r0, r1 - ldr r1, _080ECE6C + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFADC - ldr r1, _080ECE70 + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -485100,10 +469121,7 @@ _080ECE5C: pop {r0} bx r0 .align 2, 0 -_080ECE64: .4byte 0x03005d8c -_080ECE68: .4byte 0x00002b2c -_080ECE6C: .4byte 0x000027cc -_080ECE70: .4byte 0x030060bc + .pool thumb_func_end sub_80ECE34 thumb_func_start sub_80ECE74 @@ -485111,14 +469129,14 @@ sub_80ECE74: @ 80ECE74 push {r4,r5,lr} lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _080ECEA4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080ECEA8 + ldr r1, =0x00002b2c adds r4, r0, r1 - ldr r1, _080ECEAC + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFADC - ldr r1, _080ECEB0 + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -485132,10 +469150,7 @@ _080ECE9C: pop {r0} bx r0 .align 2, 0 -_080ECEA4: .4byte 0x03005d8c -_080ECEA8: .4byte 0x00002b2c -_080ECEAC: .4byte 0x000027cc -_080ECEB0: .4byte 0x030060bc + .pool thumb_func_end sub_80ECE74 thumb_func_start sub_80ECEB4 @@ -485145,14 +469160,14 @@ sub_80ECEB4: @ 80ECEB4 lsrs r7, r0, 24 lsls r1, 24 lsrs r6, r1, 24 - ldr r0, _080ECF10 + ldr r0, =0x03005d8c ldr r4, [r0] - ldr r0, _080ECF14 + ldr r0, =0x00002b2c adds r5, r4, r0 - ldr r1, _080ECF18 + ldr r1, =0x000027cc adds r0, r4, r1 bl sub_80EFADC - ldr r1, _080ECF1C + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -485160,12 +469175,12 @@ sub_80ECEB4: @ 80ECEB4 negs r1, r1 cmp r0, r1 beq _080ECF4C - ldr r2, _080ECF20 + ldr r2, =0x02039e00 lsls r1, r6, 6 adds r0, r1, r2 ldrh r0, [r0] strh r0, [r5, 0x2] - ldr r0, _080ECF24 + ldr r0, =0x00002b30 adds r4, r0 adds r2, 0xD adds r1, r2 @@ -485175,28 +469190,21 @@ sub_80ECEB4: @ 80ECEB4 bl sub_8009370 strb r7, [r5, 0xC] adds r1, r6, 0x1 - ldr r0, _080ECF28 + ldr r0, =0x02039f30 ldrb r0, [r0] cmp r1, r0 ble _080ECF30 - ldr r0, _080ECF2C + ldr r0, =0x020229e8 ldrh r0, [r0, 0x1A] b _080ECF4A .align 2, 0 -_080ECF10: .4byte 0x03005d8c -_080ECF14: .4byte 0x00002b2c -_080ECF18: .4byte 0x000027cc -_080ECF1C: .4byte 0x030060bc -_080ECF20: .4byte 0x02039e00 -_080ECF24: .4byte 0x00002b30 -_080ECF28: .4byte 0x02039f30 -_080ECF2C: .4byte 0x020229e8 + .pool _080ECF30: - ldr r0, _080ECF54 + ldr r0, =0x082e9531 ldrb r0, [r0] cmp r0, 0x1 beq _080ECF48 - ldr r1, _080ECF58 + ldr r1, =0x020229e8 lsls r0, r6, 3 subs r0, r6 lsls r0, 2 @@ -485213,27 +469221,26 @@ _080ECF4C: pop {r0} bx r0 .align 2, 0 -_080ECF54: .4byte 0x082e9531 -_080ECF58: .4byte 0x020229e8 + .pool thumb_func_end sub_80ECEB4 thumb_func_start sub_80ECF5C sub_80ECF5C: @ 80ECF5C push {r4-r7,lr} - ldr r0, _080ED000 + ldr r0, =0x03005d8c ldr r6, [r0] - ldr r0, _080ED004 + ldr r0, =0x00002b2c adds r5, r6, r0 ldrb r2, [r5] cmp r2, 0x6 bne _080ED02C - ldr r0, _080ED008 + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080ED00C + ldr r1, =0x000027cc adds r0, r1 adds r4, r6, r0 strb r2, [r4] @@ -485243,12 +469250,12 @@ sub_80ECF5C: @ 80ECF5C strh r0, [r4, 0x2] adds r0, r4, 0 adds r0, 0x16 - ldr r1, _080ED010 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy adds r0, r4, 0 adds r0, 0x8 - ldr r2, _080ED014 + ldr r2, =0x00002b34 adds r1, r6, r2 bl gf_strcpy ldrb r0, [r5, 0x13] @@ -485287,7 +469294,7 @@ sub_80ECF5C: @ 80ECF5C strb r0, [r4, 0x13] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, _080ED018 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x1E] cmp r0, 0x1 @@ -485299,19 +469306,13 @@ _080ECFFA: strb r7, [r4, 0x1F] b _080ED01E .align 2, 0 -_080ED000: .4byte 0x03005d8c -_080ED004: .4byte 0x00002b2c -_080ED008: .4byte 0x030060bc -_080ED00C: .4byte 0x000027cc -_080ED010: .4byte 0x03005d90 -_080ED014: .4byte 0x00002b34 -_080ED018: .4byte 0x082e9531 + .pool _080ED01C: strb r0, [r4, 0x1F] _080ED01E: - ldr r0, _080ED034 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080ED038 + ldr r1, =0x000027cc adds r0, r1 movs r1, 0x18 bl sub_80EF910 @@ -485320,8 +469321,7 @@ _080ED02C: pop {r0} bx r0 .align 2, 0 -_080ED034: .4byte 0x03005d8c -_080ED038: .4byte 0x000027cc + .pool thumb_func_end sub_80ECF5C thumb_func_start sub_80ED03C @@ -485329,16 +469329,16 @@ sub_80ED03C: @ 80ED03C push {r4-r6,lr} lsls r0, 16 lsrs r6, r0, 16 - ldr r4, _080ED080 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _080ED084 + ldr r1, =0x00002b2c adds r5, r0, r1 bl sub_80EF7B4 ldr r0, [r4] - ldr r1, _080ED088 + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFADC - ldr r1, _080ED08C + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -485347,7 +469347,7 @@ sub_80ED03C: @ 80ED03C cmp r0, r1 beq _080ED07A ldr r0, [r4] - ldr r1, _080ED088 + ldr r1, =0x000027cc adds r0, r1 movs r1, 0x18 bl sub_80EF910 @@ -485359,10 +469359,7 @@ _080ED07A: pop {r0} bx r0 .align 2, 0 -_080ED080: .4byte 0x03005d8c -_080ED084: .4byte 0x00002b2c -_080ED088: .4byte 0x000027cc -_080ED08C: .4byte 0x030060bc + .pool thumb_func_end sub_80ED03C thumb_func_start sub_80ED090 @@ -485372,14 +469369,14 @@ sub_80ED090: @ 80ED090 push {r7} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080ED140 + ldr r0, =0x03005d8c ldr r4, [r0] - ldr r0, _080ED144 + ldr r0, =0x00002b2c adds r7, r4, r0 - ldr r1, _080ED148 + ldr r1, =0x000027cc adds r0, r4, r1 bl sub_80EFADC - ldr r1, _080ED14C + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -485397,7 +469394,7 @@ sub_80ED090: @ 80ED090 ands r2, r1 orrs r2, r0 strb r2, [r7, 0x13] - ldr r0, _080ED150 + ldr r0, =0x02039f2c ldrb r0, [r0] movs r1, 0x7 ands r1, r0 @@ -485406,7 +469403,7 @@ sub_80ED090: @ 80ED090 ands r0, r2 orrs r0, r1 strb r0, [r7, 0x13] - ldr r1, _080ED154 + ldr r1, =0x02039f2e ldrb r1, [r1] ands r3, r1 lsls r3, 3 @@ -485415,12 +469412,12 @@ sub_80ED090: @ 80ED090 ands r0, r1 orrs r0, r3 strb r0, [r7, 0x13] - ldr r0, _080ED158 + ldr r0, =0x02039f24 mov r8, r0 ldrb r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _080ED15C + ldr r5, =0x020244ec adds r0, r5 movs r1, 0xB movs r2, 0 @@ -485430,7 +469427,7 @@ sub_80ED090: @ 80ED090 ldrb r0, [r1] muls r0, r6 adds r0, r5 - ldr r1, _080ED160 + ldr r1, =0x00002b34 adds r4, r1 movs r1, 0x2 adds r2, r4, 0 @@ -485451,28 +469448,20 @@ _080ED134: pop {r0} bx r0 .align 2, 0 -_080ED140: .4byte 0x03005d8c -_080ED144: .4byte 0x00002b2c -_080ED148: .4byte 0x000027cc -_080ED14C: .4byte 0x030060bc -_080ED150: .4byte 0x02039f2c -_080ED154: .4byte 0x02039f2e -_080ED158: .4byte 0x02039f24 -_080ED15C: .4byte 0x020244ec -_080ED160: .4byte 0x00002b34 + .pool thumb_func_end sub_80ED090 thumb_func_start sub_80ED164 sub_80ED164: @ 80ED164 push {r4-r6,lr} - ldr r2, _080ED1D4 - ldr r0, _080ED1D8 + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080ED1DC + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r6, r1, r0 @@ -485481,17 +469470,17 @@ sub_80ED164: @ 80ED164 movs r0, 0x1 strb r0, [r6, 0x1] adds r0, r6, 0x2 - ldr r4, _080ED1E0 + ldr r4, =0x03005d90 ldr r1, [r4] bl gf_strcpy adds r0, r6, 0 adds r0, 0xC ldr r1, [r4] - ldr r2, _080ED1E4 + ldr r2, =0x00000bd8 adds r1, r2 bl gf_strcpy ldr r1, [r4] - ldr r2, _080ED1E8 + ldr r2, =0x00000bd4 adds r0, r1, r2 ldrh r0, [r0] strh r0, [r6, 0xA] @@ -485499,14 +469488,14 @@ sub_80ED164: @ 80ED164 adds r0, r1, r2 ldrh r0, [r0] strh r0, [r6, 0x14] - ldr r5, _080ED1EC + ldr r5, =0x00000d07 adds r1, r5 ldrb r0, [r1] movs r1, 0 bl sub_8164FCC strh r0, [r6, 0x16] ldr r0, [r4] - ldr r1, _080ED1F0 + ldr r1, =0x00000d06 adds r0, r1 ldrb r0, [r0] strb r0, [r6, 0x1C] @@ -485518,31 +469507,24 @@ sub_80ED164: @ 80ED164 movs r0, 0x32 b _080ED1F6 .align 2, 0 -_080ED1D4: .4byte 0x03005d8c -_080ED1D8: .4byte 0x030060bc -_080ED1DC: .4byte 0x000027cc -_080ED1E0: .4byte 0x03005d90 -_080ED1E4: .4byte 0x00000bd8 -_080ED1E8: .4byte 0x00000bd4 -_080ED1EC: .4byte 0x00000d07 -_080ED1F0: .4byte 0x00000d06 + .pool _080ED1F4: movs r0, 0x64 _080ED1F6: strb r0, [r6, 0x1A] - ldr r0, _080ED228 + ldr r0, =0x020375e0 ldrh r0, [r0] strb r0, [r6, 0x1B] adds r0, r6, 0 bl sub_80ECA10 - ldr r0, _080ED22C + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r6, 0x1D] cmp r0, 0x1 beq _080ED21C - ldr r0, _080ED230 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _080ED234 + ldr r2, =0x00000beb adds r0, r2 ldrb r0, [r0] cmp r0, 0x1 @@ -485555,35 +469537,32 @@ _080ED21E: pop {r0} bx r0 .align 2, 0 -_080ED228: .4byte 0x020375e0 -_080ED22C: .4byte 0x082e9531 -_080ED230: .4byte 0x03005d90 -_080ED234: .4byte 0x00000beb + .pool thumb_func_end sub_80ED164 thumb_func_start sub_80ED238 sub_80ED238: @ 80ED238 push {r4-r7,lr} - ldr r5, _080ED2F8 + ldr r5, =0x03005d8c ldr r0, [r5] ldrh r1, [r0, 0x4] - ldr r0, _080ED2FC + ldr r0, =0x00003c1a cmp r1, r0 beq _080ED2F2 - ldr r0, _080ED300 + ldr r0, =0x0000371a cmp r1, r0 beq _080ED2F2 - ldr r0, _080ED304 + ldr r0, =0x00005555 bl sub_80EFB38 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 bne _080ED2F2 ldr r0, [r5] - ldr r7, _080ED308 + ldr r7, =0x000027cc adds r0, r7 bl sub_80EFB08 - ldr r6, _080ED30C + ldr r6, =0x030060bc strb r0, [r6] lsls r0, 24 asrs r0, 24 @@ -485599,7 +469578,7 @@ sub_80ED238: @ 80ED238 cmp r0, 0x1 beq _080ED2F2 bl sub_80EF500 - ldr r2, _080ED310 + ldr r2, =0x02039f80 ldrh r0, [r2, 0x2] cmp r0, 0x13 bls _080ED2F2 @@ -485614,7 +469593,7 @@ sub_80ED238: @ 80ED238 movs r0, 0x16 strb r0, [r5] strb r4, [r5, 0x1] - ldr r0, _080ED314 + ldr r0, =0x02037318 ldrb r0, [r0, 0x14] strb r0, [r5, 0x12] movs r4, 0 @@ -485642,12 +469621,12 @@ _080ED2B6: strb r0, [r5, 0x2] adds r0, r5, 0 adds r0, 0x13 - ldr r1, _080ED318 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy adds r0, r5, 0 bl sub_80EC9E8 - ldr r0, _080ED31C + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r5, 0x3] _080ED2F2: @@ -485655,16 +469634,7 @@ _080ED2F2: pop {r0} bx r0 .align 2, 0 -_080ED2F8: .4byte 0x03005d8c -_080ED2FC: .4byte 0x00003c1a -_080ED300: .4byte 0x0000371a -_080ED304: .4byte 0x00005555 -_080ED308: .4byte 0x000027cc -_080ED30C: .4byte 0x030060bc -_080ED310: .4byte 0x02039f80 -_080ED314: .4byte 0x02037318 -_080ED318: .4byte 0x03005d90 -_080ED31C: .4byte 0x082e9531 + .pool thumb_func_end sub_80ED238 thumb_func_start sub_80ED320 @@ -485674,22 +469644,22 @@ sub_80ED320: @ 80ED320 mov r6, r8 push {r6,r7} bl sub_80EF7A8 - ldr r0, _080ED40C + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 beq _080ED400 - ldr r0, _080ED410 + ldr r0, =0x020375e0 mov r8, r0 ldrh r0, [r0] movs r7, 0x64 muls r0, r7 - ldr r6, _080ED414 + ldr r6, =0x020244ec adds r0, r6 - ldr r4, _080ED418 + ldr r4, =0x02021cc4 movs r1, 0x2 adds r2, r4, 0 bl pokemon_getattr - ldr r1, _080ED41C + ldr r1, =0x03005d90 mov r9, r1 ldr r0, [r1] bl sub_8008C24 @@ -485703,14 +469673,14 @@ sub_80ED320: @ 80ED320 lsrs r0, 16 cmp r0, 0x1 bls _080ED400 - ldr r2, _080ED420 - ldr r0, _080ED424 + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080ED428 + ldr r1, =0x000027cc adds r0, r1 ldr r4, [r2] adds r4, r0 @@ -485757,7 +469727,7 @@ sub_80ED320: @ 80ED320 bl sub_8009370 adds r0, r4, 0 bl sub_80ECA10 - ldr r0, _080ED42C + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x1E] mov r2, r8 @@ -485775,36 +469745,28 @@ _080ED400: pop {r0} bx r0 .align 2, 0 -_080ED40C: .4byte 0x020375f0 -_080ED410: .4byte 0x020375e0 -_080ED414: .4byte 0x020244ec -_080ED418: .4byte 0x02021cc4 -_080ED41C: .4byte 0x03005d90 -_080ED420: .4byte 0x03005d8c -_080ED424: .4byte 0x030060bc -_080ED428: .4byte 0x000027cc -_080ED42C: .4byte 0x082e9531 + .pool thumb_func_end sub_80ED320 thumb_func_start sub_80ED430 sub_80ED430: @ 80ED430 push {r4,r5,lr} - ldr r4, _080ED4C0 - ldr r0, _080ED4C4 + ldr r4, =0x03005d8c + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _080ED4C8 + ldr r0, =0x000027cc adds r1, r0 ldr r2, [r4] adds r1, r2, r1 ldrh r3, [r1, 0xC] - ldr r5, _080ED4CC + ldr r5, =0x00002b90 adds r0, r2, r5 strh r3, [r0] ldrb r0, [r1, 0x10] - ldr r3, _080ED4D0 + ldr r3, =0x00002b92 adds r2, r3 strb r0, [r2] ldr r0, [r4] @@ -485844,7 +469806,7 @@ sub_80ED430: @ 80ED430 adds r0, r2, r5 strh r3, [r0] ldrb r0, [r1, 0x3] - ldr r3, _080ED4D4 + ldr r3, =0x00002ba0 adds r2, r3 strb r0, [r2] ldr r0, [r4] @@ -485853,7 +469815,7 @@ sub_80ED430: @ 80ED430 adds r0, r5 strb r1, [r0] ldr r0, [r4] - ldr r1, _080ED4D8 + ldr r1, =0x00002ba2 adds r0, r1 movs r1, 0x2 strh r1, [r0] @@ -485861,31 +469823,25 @@ sub_80ED430: @ 80ED430 pop {r0} bx r0 .align 2, 0 -_080ED4C0: .4byte 0x03005d8c -_080ED4C4: .4byte 0x020375e0 -_080ED4C8: .4byte 0x000027cc -_080ED4CC: .4byte 0x00002b90 -_080ED4D0: .4byte 0x00002b92 -_080ED4D4: .4byte 0x00002ba0 -_080ED4D8: .4byte 0x00002ba2 + .pool thumb_func_end sub_80ED430 thumb_func_start sub_80ED4DC sub_80ED4DC: @ 80ED4DC push {r4,lr} bl sub_80EFA88 - ldr r0, _080ED538 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 beq _080ED532 - ldr r2, _080ED53C - ldr r0, _080ED540 + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080ED544 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 @@ -485914,23 +469870,20 @@ _080ED532: pop {r0} bx r0 .align 2, 0 -_080ED538: .4byte 0x020375f0 -_080ED53C: .4byte 0x03005d8c -_080ED540: .4byte 0x030060bc -_080ED544: .4byte 0x000027cc + .pool thumb_func_end sub_80ED4DC thumb_func_start sub_80ED548 sub_80ED548: @ 80ED548 push {r4,lr} - ldr r2, _080ED5A0 - ldr r0, _080ED5A4 + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080ED5A8 + ldr r1, =0x000027cc adds r0, r1 ldr r4, [r2] adds r4, r0 @@ -485939,7 +469892,7 @@ sub_80ED548: @ 80ED548 strb r0, [r4, 0x1] adds r0, r4, 0 adds r0, 0x10 - ldr r1, _080ED5AC + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy bl sub_8139688 @@ -485947,7 +469900,7 @@ sub_80ED548: @ 80ED548 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _080ED5B0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB movs r2, 0 @@ -485955,32 +469908,27 @@ sub_80ED548: @ 80ED548 strh r0, [r4, 0x2] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, _080ED5B4 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x18] pop {r4} pop {r0} bx r0 .align 2, 0 -_080ED5A0: .4byte 0x03005d8c -_080ED5A4: .4byte 0x030060bc -_080ED5A8: .4byte 0x000027cc -_080ED5AC: .4byte 0x03005d90 -_080ED5B0: .4byte 0x020244ec -_080ED5B4: .4byte 0x082e9531 + .pool thumb_func_end sub_80ED548 thumb_func_start sub_80ED5B8 sub_80ED5B8: @ 80ED5B8 push {r4,r5,lr} - ldr r2, _080ED5FC - ldr r0, _080ED600 + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080ED604 + ldr r1, =0x000027cc adds r0, r1 ldr r4, [r2] adds r4, r0 @@ -485991,24 +469939,20 @@ sub_80ED5B8: @ 80ED5B8 strb r0, [r4, 0x1] adds r0, r4, 0 adds r0, 0x10 - ldr r1, _080ED608 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy strh r5, [r4, 0x2] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, _080ED60C + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x18] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080ED5FC: .4byte 0x03005d8c -_080ED600: .4byte 0x030060bc -_080ED604: .4byte 0x000027cc -_080ED608: .4byte 0x03005d90 -_080ED60C: .4byte 0x082e9531 + .pool thumb_func_end sub_80ED5B8 thumb_func_start sub_80ED610 @@ -486016,14 +469960,14 @@ sub_80ED610: @ 80ED610 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r2, _080ED6D8 - ldr r0, _080ED6DC + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080ED6E0 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r5, r1, r0 @@ -486038,7 +469982,7 @@ sub_80ED610: @ 80ED610 lsrs r0, 24 movs r7, 0x64 muls r0, r7 - ldr r6, _080ED6E4 + ldr r6, =0x020244ec adds r0, r6 movs r1, 0x20 movs r2, 0 @@ -486052,7 +469996,7 @@ sub_80ED610: @ 80ED610 ands r1, r2 orrs r1, r0 strb r1, [r5, 0x4] - ldr r0, _080ED6E8 + ldr r0, =0x020375e6 ldrb r0, [r0] lsls r0, 4 movs r2, 0xF @@ -486060,7 +470004,7 @@ sub_80ED610: @ 80ED610 orrs r1, r0 strb r1, [r5, 0x4] adds r0, r5, 0x5 - ldr r1, _080ED6EC + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy bl sub_8139688 @@ -486086,7 +470030,7 @@ sub_80ED610: @ 80ED610 strh r0, [r5, 0x2] adds r0, r5, 0 bl sub_80ECA10 - ldr r0, _080ED6F0 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r5, 0xD] cmp r0, 0x1 @@ -486104,13 +470048,7 @@ _080ED6D4: mov r0, r8 b _080ED706 .align 2, 0 -_080ED6D8: .4byte 0x03005d8c -_080ED6DC: .4byte 0x030060bc -_080ED6E0: .4byte 0x000027cc -_080ED6E4: .4byte 0x020244ec -_080ED6E8: .4byte 0x020375e6 -_080ED6EC: .4byte 0x03005d90 -_080ED6F0: .4byte 0x082e9531 + .pool _080ED6F4: bl sub_8139688 lsls r0, 24 @@ -486136,15 +470074,15 @@ nullsub_45: @ 80ED714 thumb_func_start sub_80ED718 sub_80ED718: @ 80ED718 push {r4-r6,lr} - ldr r0, _080ED7EC + ldr r0, =0x00000864 bl flag_check lsls r0, 24 cmp r0, 0 beq _080ED7E4 movs r1, 0 - ldr r0, _080ED7F0 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r3, _080ED7F4 + ldr r3, =0x000027cc _080ED72E: lsls r0, r1, 3 adds r0, r1 @@ -486159,18 +470097,18 @@ _080ED72E: lsrs r1, r0, 24 cmp r1, 0x17 bls _080ED72E - ldr r0, _080ED7F8 + ldr r0, =0x00000147 bl sub_80EFB38 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 bne _080ED7E4 - ldr r6, _080ED7F0 + ldr r6, =0x03005d8c ldr r0, [r6] - ldr r1, _080ED7F4 + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFADC - ldr r4, _080ED7FC + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -486190,7 +470128,7 @@ _080ED72E: lsls r1, r2, 3 adds r1, r2 lsls r1, 2 - ldr r2, _080ED7F4 + ldr r2, =0x000027cc adds r1, r2 ldr r4, [r6] adds r4, r1 @@ -486198,7 +470136,7 @@ _080ED72E: strb r1, [r4] movs r3, 0x1 strb r3, [r4, 0x1] - ldr r2, _080ED800 + ldr r2, =0x0858d094 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -486229,7 +470167,7 @@ _080ED72E: strh r3, [r4, 0x16] adds r0, r4, 0 bl sub_80ECA10 - ldr r0, _080ED804 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x18] _080ED7E4: @@ -486237,30 +470175,24 @@ _080ED7E4: pop {r0} bx r0 .align 2, 0 -_080ED7EC: .4byte 0x00000864 -_080ED7F0: .4byte 0x03005d8c -_080ED7F4: .4byte 0x000027cc -_080ED7F8: .4byte 0x00000147 -_080ED7FC: .4byte 0x030060bc -_080ED800: .4byte 0x0858d094 -_080ED804: .4byte 0x082e9531 + .pool thumb_func_end sub_80ED718 thumb_func_start sub_80ED808 sub_80ED808: @ 80ED808 push {r4,r5,lr} - ldr r3, _080ED874 + ldr r3, =0x03005d8c ldr r0, [r3] - ldr r2, _080ED878 + ldr r2, =0x00002b90 adds r1, r0, r2 movs r4, 0 movs r2, 0 strh r2, [r1] - ldr r5, _080ED87C + ldr r5, =0x00002b92 adds r0, r5 strb r4, [r0] ldr r0, [r3] - ldr r1, _080ED880 + ldr r1, =0x00002b93 adds r0, r1 strb r4, [r0] ldr r0, [r3] @@ -486287,7 +470219,7 @@ sub_80ED808: @ 80ED808 adds r5, 0x2 adds r1, r0, r5 strh r2, [r1] - ldr r1, _080ED884 + ldr r1, =0x00002ba0 adds r0, r1 strb r4, [r0] ldr r0, [r3] @@ -486302,11 +470234,7 @@ sub_80ED808: @ 80ED808 pop {r0} bx r0 .align 2, 0 -_080ED874: .4byte 0x03005d8c -_080ED878: .4byte 0x00002b90 -_080ED87C: .4byte 0x00002b92 -_080ED880: .4byte 0x00002b93 -_080ED884: .4byte 0x00002ba0 + .pool thumb_func_end sub_80ED808 thumb_func_start sub_80ED888 @@ -486335,16 +470263,16 @@ sub_80ED8B4: @ 80ED8B4 push {r4-r7,lr} lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _080ED8FC + ldr r1, =0x03005d8c ldr r0, [r1] - ldr r2, _080ED900 + ldr r2, =0x00002b90 adds r0, r2 ldrh r0, [r0] mov r12, r1 cmp r0, 0 bne _080ED91C movs r1, 0 - ldr r6, _080ED904 + ldr r6, =0x000027cc _080ED8CE: mov r7, r12 ldr r4, [r7] @@ -486356,7 +470284,7 @@ _080ED8CE: ldrb r0, [r0] cmp r0, 0x29 bne _080ED912 - ldr r7, _080ED908 + ldr r7, =0x000027cd adds r0, r2, r7 ldrb r0, [r0] cmp r0, 0x1 @@ -486370,10 +470298,7 @@ _080ED8CE: strh r0, [r1, 0x16] b _080ED91C .align 2, 0 -_080ED8FC: .4byte 0x03005d8c -_080ED900: .4byte 0x00002b90 -_080ED904: .4byte 0x000027cc -_080ED908: .4byte 0x000027cd + .pool _080ED90C: subs r0, r5 strh r0, [r1, 0x16] @@ -486395,9 +470320,9 @@ sub_80ED924: @ 80ED924 push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _080ED940 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _080ED944 + ldr r3, =0x00002ba2 adds r1, r0, r3 ldrh r0, [r1] cmp r0, r2 @@ -486405,8 +470330,7 @@ sub_80ED924: @ 80ED924 bl sub_80ED808 b _080ED94C .align 2, 0 -_080ED940: .4byte 0x03005d8c -_080ED944: .4byte 0x00002ba2 + .pool _080ED948: subs r0, r2 strh r0, [r1] @@ -486421,7 +470345,7 @@ sub_80ED950: @ 80ED950 lsls r0, 24 cmp r0, 0 beq _080ED978 - ldr r4, _080ED974 + ldr r4, =0x0203a026 ldrh r0, [r4] lsrs r0, 8 cmp r0, 0x4 @@ -486435,9 +470359,9 @@ _080ED966: adds r0, 0x1 b _080ED99A .align 2, 0 -_080ED974: .4byte 0x0203a026 + .pool _080ED978: - ldr r4, _080ED9A4 + ldr r4, =0x0203a026 ldrb r0, [r4] cmp r0, 0x4 bls _080ED984 @@ -486461,18 +470385,18 @@ _080ED99C: pop {r0} bx r0 .align 2, 0 -_080ED9A4: .4byte 0x0203a026 + .pool thumb_func_end sub_80ED950 thumb_func_start sub_80ED9A8 sub_80ED9A8: @ 80ED9A8 push {r4-r6,lr} - ldr r6, _080EDA20 + ldr r6, =0x03005d8c ldr r0, [r6] - ldr r5, _080EDA24 + ldr r5, =0x000027cc adds r0, r5 bl sub_80EFB08 - ldr r4, _080EDA28 + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -486499,23 +470423,23 @@ sub_80ED9A8: @ 80ED9A8 movs r0, 0x18 strb r0, [r4] strb r1, [r4, 0x1] - ldr r1, _080EDA2C + ldr r1, =0x0203a026 ldrh r0, [r1] strb r0, [r4, 0x2] ldrh r0, [r1] lsrs r0, 8 strb r0, [r4, 0x3] - ldr r0, _080EDA30 + ldr r0, =0x0203a024 ldrh r0, [r0] strh r0, [r4, 0x4] adds r0, r4, 0 adds r0, 0x13 - ldr r1, _080EDA34 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EDA38 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x6] _080EDA18: @@ -486523,30 +470447,24 @@ _080EDA18: pop {r0} bx r0 .align 2, 0 -_080EDA20: .4byte 0x03005d8c -_080EDA24: .4byte 0x000027cc -_080EDA28: .4byte 0x030060bc -_080EDA2C: .4byte 0x0203a026 -_080EDA30: .4byte 0x0203a024 -_080EDA34: .4byte 0x03005d90 -_080EDA38: .4byte 0x082e9531 + .pool thumb_func_end sub_80ED9A8 thumb_func_start sub_80EDA3C sub_80EDA3C: @ 80EDA3C - ldr r1, _080EDA44 + ldr r1, =0x0203a024 strh r0, [r1] bx lr .align 2, 0 -_080EDA44: .4byte 0x0203a024 + .pool thumb_func_end sub_80EDA3C thumb_func_start sub_80EDA48 sub_80EDA48: @ 80EDA48 push {r4,lr} - ldr r4, _080EDA74 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r2, _080EDA78 + ldr r2, =0x00002b2c adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x19 @@ -486557,7 +470475,7 @@ sub_80EDA48: @ 80EDA48 bl sub_80EDA80 _080EDA62: ldr r0, [r4] - ldr r1, _080EDA7C + ldr r1, =0x000027cc adds r0, r1 movs r1, 0x18 bl sub_80EF910 @@ -486566,9 +470484,7 @@ _080EDA6E: pop {r0} bx r0 .align 2, 0 -_080EDA74: .4byte 0x03005d8c -_080EDA78: .4byte 0x00002b2c -_080EDA7C: .4byte 0x000027cc + .pool thumb_func_end sub_80EDA48 thumb_func_start sub_80EDA80 @@ -486576,22 +470492,22 @@ sub_80EDA80: @ 80EDA80 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _080EDB28 + ldr r7, =0x03005d8c ldr r0, [r7] - ldr r1, _080EDB2C + ldr r1, =0x00002b2c adds r5, r0, r1 - ldr r0, _080EDB30 + ldr r0, =0x0000ffff bl sub_80EFB38 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 bne _080EDB1C ldr r0, [r7] - ldr r1, _080EDB34 + ldr r1, =0x000027cc mov r8, r1 add r0, r8 bl sub_80EFB08 - ldr r4, _080EDB38 + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -486632,12 +470548,12 @@ sub_80EDA80: @ 80EDA80 strb r0, [r4, 0xA] adds r0, r4, 0 adds r0, 0x13 - ldr r1, _080EDB3C + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EDB40 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0xB] ldr r0, [r7] @@ -486651,13 +470567,7 @@ _080EDB1C: pop {r0} bx r0 .align 2, 0 -_080EDB28: .4byte 0x03005d8c -_080EDB2C: .4byte 0x00002b2c -_080EDB30: .4byte 0x0000ffff -_080EDB34: .4byte 0x000027cc -_080EDB38: .4byte 0x030060bc -_080EDB3C: .4byte 0x03005d90 -_080EDB40: .4byte 0x082e9531 + .pool thumb_func_end sub_80EDA80 thumb_func_start sub_80EDB44 @@ -486666,12 +470576,12 @@ sub_80EDB44: @ 80EDB44 movs r0, 0x1A movs r1, 0x1 bl sub_80EF46C - ldr r4, _080EDBB8 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _080EDBBC + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFB08 - ldr r2, _080EDBC0 + ldr r2, =0x030060bc strb r0, [r2] lsls r0, 24 asrs r0, 24 @@ -486684,7 +470594,7 @@ sub_80EDB44: @ 80EDB44 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r2, _080EDBBC + ldr r2, =0x000027cc adds r0, r2 ldr r1, [r4] adds r4, r1, r0 @@ -486692,7 +470602,7 @@ sub_80EDB44: @ 80EDB44 movs r0, 0x1A strb r0, [r4] strb r1, [r4, 0x1] - ldr r6, _080EDBC4 + ldr r6, =0x00000867 movs r5, 0 _080EDB88: lsls r0, r6, 16 @@ -486706,7 +470616,7 @@ _080EDB88: lsrs r5, r0, 24 _080EDB9C: adds r6, 0x1 - ldr r0, _080EDBC8 + ldr r0, =0x0000086e cmp r6, r0 bls _080EDB88 strb r5, [r4, 0x4] @@ -486717,17 +470627,13 @@ _080EDB9C: bl pokedex_count b _080EDBD2 .align 2, 0 -_080EDBB8: .4byte 0x03005d8c -_080EDBBC: .4byte 0x000027cc -_080EDBC0: .4byte 0x030060bc -_080EDBC4: .4byte 0x00000867 -_080EDBC8: .4byte 0x0000086e + .pool _080EDBCC: movs r0, 0x1 bl sub_80C0844 _080EDBD2: strh r0, [r4, 0x2] - ldr r1, _080EDC48 + ldr r1, =0x02037318 ldrb r0, [r1, 0x14] strb r0, [r4, 0x7] ldrh r0, [r1, 0x12] @@ -486739,7 +470645,7 @@ _080EDBD2: adds r7, r4, 0 adds r7, 0x13 _080EDBEA: - ldr r0, _080EDC4C + ldr r0, =0x0858d0de lsls r5, r6, 1 adds r0, r5, r0 ldrh r0, [r0] @@ -486752,7 +470658,7 @@ _080EDBEA: adds r0, 0x1 strb r0, [r4, 0x5] _080EDC04: - ldr r0, _080EDC50 + ldr r0, =0x0858d0d0 adds r0, r5, r0 ldrh r0, [r0] bl flag_check @@ -486767,9 +470673,9 @@ _080EDC1C: adds r6, 0x1 cmp r6, 0x6 bls _080EDBEA - ldr r0, _080EDC54 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r2, _080EDC58 + ldr r2, =0x00000eb8 adds r0, r1, r2 ldrh r0, [r0] strh r0, [r4, 0x8] @@ -486777,7 +470683,7 @@ _080EDC1C: bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EDC5C + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0xC] _080EDC40: @@ -486785,24 +470691,19 @@ _080EDC40: pop {r0} bx r0 .align 2, 0 -_080EDC48: .4byte 0x02037318 -_080EDC4C: .4byte 0x0858d0de -_080EDC50: .4byte 0x0858d0d0 -_080EDC54: .4byte 0x03005d90 -_080EDC58: .4byte 0x00000eb8 -_080EDC5C: .4byte 0x082e9531 + .pool thumb_func_end sub_80EDB44 thumb_func_start sub_80EDC60 sub_80EDC60: @ 80EDC60 push {r4-r7,lr} adds r5, r0, 0 - ldr r7, _080EDCD4 + ldr r7, =0x03005d8c ldr r0, [r7] - ldr r6, _080EDCD8 + ldr r6, =0x000027cc adds r0, r6 bl sub_80EFB08 - ldr r4, _080EDCDC + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -486829,7 +470730,7 @@ sub_80EDC60: @ 80EDC60 movs r0, 0x1B strb r0, [r4] strb r1, [r4, 0x1] - ldr r1, _080EDCE0 + ldr r1, =0x03005d90 ldr r0, [r1] ldrb r0, [r0, 0x8] strb r0, [r4, 0x8] @@ -486843,7 +470744,7 @@ sub_80EDC60: @ 80EDC60 bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EDCE4 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x9] _080EDCCE: @@ -486851,22 +470752,18 @@ _080EDCCE: pop {r0} bx r0 .align 2, 0 -_080EDCD4: .4byte 0x03005d8c -_080EDCD8: .4byte 0x000027cc -_080EDCDC: .4byte 0x030060bc -_080EDCE0: .4byte 0x03005d90 -_080EDCE4: .4byte 0x082e9531 + .pool thumb_func_end sub_80EDC60 thumb_func_start sub_80EDCE8 sub_80EDCE8: @ 80EDCE8 push {r4-r6,lr} - ldr r6, _080EDD5C + ldr r6, =0x03005d8c ldr r0, [r6] - ldr r5, _080EDD60 + ldr r5, =0x000027cc adds r0, r5 bl sub_80EFB08 - ldr r4, _080EDD64 + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -486893,22 +470790,22 @@ sub_80EDCE8: @ 80EDCE8 movs r0, 0x1C strb r0, [r4] strb r1, [r4, 0x1] - ldr r0, _080EDD68 + ldr r0, =0x020375e2 ldrh r0, [r0] strh r0, [r4, 0x2] - ldr r1, _080EDD6C + ldr r1, =0x02037318 ldrb r0, [r1, 0x14] strb r0, [r4, 0x4] ldrh r0, [r1, 0x12] strh r0, [r4, 0x6] adds r0, r4, 0 adds r0, 0x13 - ldr r1, _080EDD70 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EDD74 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x5] _080EDD56: @@ -486916,13 +470813,7 @@ _080EDD56: pop {r0} bx r0 .align 2, 0 -_080EDD5C: .4byte 0x03005d8c -_080EDD60: .4byte 0x000027cc -_080EDD64: .4byte 0x030060bc -_080EDD68: .4byte 0x020375e2 -_080EDD6C: .4byte 0x02037318 -_080EDD70: .4byte 0x03005d90 -_080EDD74: .4byte 0x082e9531 + .pool thumb_func_end sub_80EDCE8 thumb_func_start sub_80EDD78 @@ -486930,12 +470821,12 @@ sub_80EDD78: @ 80EDD78 push {r4-r6,lr} lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _080EDDBC + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080EDDC0 + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFB08 - ldr r1, _080EDDC4 + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -486951,7 +470842,7 @@ sub_80EDD78: @ 80EDD78 cmp r0, 0x1 beq _080EDE54 movs r5, 0 - ldr r0, _080EDDC8 + ldr r0, =0x0203a02a ldrb r1, [r0] adds r6, r0, 0 cmp r1, 0 @@ -486960,12 +470851,9 @@ sub_80EDD78: @ 80EDD78 beq _080EDDEE b _080EDE54 .align 2, 0 -_080EDDBC: .4byte 0x03005d8c -_080EDDC0: .4byte 0x000027cc -_080EDDC4: .4byte 0x030060bc -_080EDDC8: .4byte 0x0203a02a + .pool _080EDDCC: - ldr r0, _080EDDE0 + ldr r0, =0x0203a028 ldrh r1, [r0] adds r0, r1, 0 adds r0, 0xC8 @@ -486975,7 +470863,7 @@ _080EDDCC: subs r0, r4, r1 b _080EDE12 .align 2, 0 -_080EDDE0: .4byte 0x0203a028 + .pool _080EDDE4: cmp r1, 0x63 bls _080EDE54 @@ -486983,7 +470871,7 @@ _080EDDE4: subs r0, 0x64 b _080EDE0C _080EDDEE: - ldr r0, _080EDE00 + ldr r0, =0x0203a028 ldrh r1, [r0] adds r0, r1, 0 adds r0, 0x32 @@ -486993,7 +470881,7 @@ _080EDDEE: subs r0, r4, r1 b _080EDE12 .align 2, 0 -_080EDE00: .4byte 0x0203a028 + .pool _080EDE04: cmp r1, 0x31 bls _080EDE54 @@ -487006,14 +470894,14 @@ _080EDE0C: _080EDE12: lsls r0, 16 lsrs r3, r0, 16 - ldr r2, _080EDE5C - ldr r0, _080EDE60 + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080EDE64 + ldr r1, =0x000027cc adds r0, r1 ldr r4, [r2] adds r4, r0 @@ -487027,12 +470915,12 @@ _080EDE12: strb r5, [r4, 0x2] adds r0, r4, 0 adds r0, 0x13 - ldr r1, _080EDE68 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EDE6C + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x8] _080EDE54: @@ -487040,37 +470928,31 @@ _080EDE54: pop {r0} bx r0 .align 2, 0 -_080EDE5C: .4byte 0x03005d8c -_080EDE60: .4byte 0x030060bc -_080EDE64: .4byte 0x000027cc -_080EDE68: .4byte 0x03005d90 -_080EDE6C: .4byte 0x082e9531 + .pool thumb_func_end sub_80EDD78 thumb_func_start sub_80EDE70 sub_80EDE70: @ 80EDE70 - ldr r2, _080EDE7C + ldr r2, =0x0203a02a movs r1, 0 strb r1, [r2] - ldr r1, _080EDE80 + ldr r1, =0x0203a028 strh r0, [r1] bx lr .align 2, 0 -_080EDE7C: .4byte 0x0203a02a -_080EDE80: .4byte 0x0203a028 + .pool thumb_func_end sub_80EDE70 thumb_func_start sub_80EDE84 sub_80EDE84: @ 80EDE84 - ldr r2, _080EDE90 + ldr r2, =0x0203a02a movs r1, 0x1 strb r1, [r2] - ldr r1, _080EDE94 + ldr r1, =0x0203a028 strh r0, [r1] bx lr .align 2, 0 -_080EDE90: .4byte 0x0203a02a -_080EDE94: .4byte 0x0203a028 + .pool thumb_func_end sub_80EDE84 thumb_func_start sub_80EDE98 @@ -487081,8 +470963,8 @@ sub_80EDE98: @ 80EDE98 push {r6,r7} mov r8, r0 movs r3, 0 - ldr r6, _080EDEDC - ldr r7, _080EDEE0 + ldr r6, =0x030060d0 + ldr r7, =0x03005d8c adds r2, r6, 0 movs r1, 0 _080EDEAC: @@ -487097,7 +470979,7 @@ _080EDEAC: movs r5, 0 _080EDEBE: ldr r0, [r7] - ldr r1, _080EDEE4 + ldr r1, =0x00001aae adds r0, r1 adds r0, r3 ldrb r4, [r0] @@ -487111,9 +470993,7 @@ _080EDEBE: strb r4, [r6] b _080EDF04 .align 2, 0 -_080EDEDC: .4byte 0x030060d0 -_080EDEE0: .4byte 0x03005d8c -_080EDEE4: .4byte 0x00001aae + .pool _080EDEE8: adds r0, r1, r6 ldrb r0, [r0] @@ -487163,7 +471043,7 @@ _080EDF34: muls r7, r5 cmp r6, r7 bge _080EDF7E - ldr r0, _080EDFB0 + ldr r0, =0x030060d0 mov r9, r0 _080EDF42: bl GenerateRandomNumber @@ -487200,7 +471080,7 @@ _080EDF7E: bcs _080EDFA4 mov r2, r8 adds r2, 0x4 - ldr r4, _080EDFB0 + ldr r4, =0x030060d0 _080EDF8E: adds r1, r2, r3 adds r0, r3, r4 @@ -487221,7 +471101,7 @@ _080EDFA4: pop {r0} bx r0 .align 2, 0 -_080EDFB0: .4byte 0x030060d0 + .pool thumb_func_end sub_80EDE98 thumb_func_start sub_80EDFB4 @@ -487235,13 +471115,13 @@ sub_80EDFB4: @ 80EDFB4 movs r7, 0 movs r0, 0 mov r9, r0 - ldr r1, _080EE0F8 + ldr r1, =0x030060c0 mov r8, r1 _080EDFCA: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _080EE0FC + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -487256,7 +471136,7 @@ _080EDFCA: adds r0, r4, 0 movs r1, 0x38 bl pokemon_getattr - ldr r2, _080EE100 + ldr r2, =0x030060e0 mov r3, r9 lsls r1, r3, 3 adds r6, r1, r2 @@ -487343,7 +471223,7 @@ _080EE094: movs r1, 0 cmp r1, r9 bcs _080EE0BE - ldr r2, _080EE100 + ldr r2, =0x030060e0 _080EE0A8: lsls r0, r7, 3 adds r0, r2 @@ -487368,7 +471248,7 @@ _080EE0BE: mov r1, r9 bl __modsi3 lsls r0, 16 - ldr r1, _080EE100 + ldr r1, =0x030060e0 lsrs r0, 13 adds r0, r1 ldrh r1, [r0, 0x2] @@ -487384,9 +471264,7 @@ _080EE0BE: pop {r0} bx r0 .align 2, 0 -_080EE0F8: .4byte 0x030060c0 -_080EE0FC: .4byte 0x020244ec -_080EE100: .4byte 0x030060e0 + .pool thumb_func_end sub_80EDFB4 thumb_func_start sub_80EE104 @@ -487395,12 +471273,12 @@ sub_80EE104: @ 80EE104 movs r0, 0x1F movs r1, 0x1 bl sub_80EF46C - ldr r4, _080EE170 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _080EE174 + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFB08 - ldr r2, _080EE178 + ldr r2, =0x030060bc strb r0, [r2] lsls r0, 24 asrs r0, 24 @@ -487413,7 +471291,7 @@ sub_80EE104: @ 80EE104 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080EE174 + ldr r1, =0x000027cc adds r0, r1 ldr r4, [r4] adds r4, r0 @@ -487423,7 +471301,7 @@ sub_80EE104: @ 80EE104 strb r1, [r4, 0x1] adds r0, r4, 0 adds r0, 0x13 - ldr r1, _080EE17C + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy adds r0, r4, 0 @@ -487432,7 +471310,7 @@ sub_80EE104: @ 80EE104 bl sub_80EDFB4 adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EE180 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0xC] _080EE168: @@ -487440,22 +471318,18 @@ _080EE168: pop {r0} bx r0 .align 2, 0 -_080EE170: .4byte 0x03005d8c -_080EE174: .4byte 0x000027cc -_080EE178: .4byte 0x030060bc -_080EE17C: .4byte 0x03005d90 -_080EE180: .4byte 0x082e9531 + .pool thumb_func_end sub_80EE104 thumb_func_start sub_80EE184 sub_80EE184: @ 80EE184 push {r4-r7,lr} - ldr r6, _080EE224 + ldr r6, =0x03005d8c ldr r0, [r6] - ldr r5, _080EE228 + ldr r5, =0x000027cc adds r0, r5 bl sub_80EFB08 - ldr r4, _080EE22C + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -487487,9 +471361,9 @@ _080EE1B6: strb r0, [r4] strb r1, [r4, 0x1] movs r5, 0 - ldr r6, _080EE230 - ldr r3, _080EE234 - ldr r7, _080EE238 + ldr r6, =0x03005d10 + ldr r3, =0x02037318 + ldr r7, =0x03005d90 adds r2, r6, 0 adds r2, 0x36 _080EE1DA: @@ -487520,25 +471394,18 @@ _080EE1FE: bl gf_strcpy ldrh r0, [r6, 0x6] strh r0, [r4, 0xA] - ldr r0, _080EE23C + ldr r0, =0x0202433a ldrb r0, [r0] subs r0, 0x1 cmp r0, 0x9 bhi _080EE282 lsls r0, 2 - ldr r1, _080EE240 + ldr r1, =_080EE244 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EE224: .4byte 0x03005d8c -_080EE228: .4byte 0x000027cc -_080EE22C: .4byte 0x030060bc -_080EE230: .4byte 0x03005d10 -_080EE234: .4byte 0x02037318 -_080EE238: .4byte 0x03005d90 -_080EE23C: .4byte 0x0202433a -_080EE240: .4byte _080EE244 + .pool .align 2, 0 _080EE244: .4byte _080EE276 @@ -487569,7 +471436,7 @@ _080EE27E: _080EE280: strb r0, [r4, 0x5] _080EE282: - ldr r1, _080EE2A4 + ldr r1, =0x03005d10 ldrh r0, [r1, 0x20] strh r0, [r4, 0x2] ldrb r0, [r4, 0x5] @@ -487587,7 +471454,7 @@ _080EE282: movs r0, 0x1 b _080EE2AC .align 2, 0 -_080EE2A4: .4byte 0x03005d10 + .pool _080EE2A8: lsls r0, r1, 26 lsrs r0, 28 @@ -487601,7 +471468,7 @@ _080EE2B2: _080EE2B6: adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EE2C8 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0xE] _080EE2C2: @@ -487609,18 +471476,18 @@ _080EE2C2: pop {r0} bx r0 .align 2, 0 -_080EE2C8: .4byte 0x082e9531 + .pool thumb_func_end sub_80EE184 thumb_func_start sub_80EE2CC sub_80EE2CC: @ 80EE2CC push {r4-r6,lr} - ldr r6, _080EE340 + ldr r6, =0x03005d8c ldr r0, [r6] - ldr r5, _080EE344 + ldr r5, =0x000027cc adds r0, r5 bl sub_80EFB08 - ldr r4, _080EE348 + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -487649,20 +471516,20 @@ sub_80EE2CC: @ 80EE2CC strb r1, [r4, 0x1] adds r0, r4, 0 adds r0, 0x13 - ldr r1, _080EE34C + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy - ldr r0, _080EE350 + ldr r0, =0x020375e0 ldrb r1, [r0] movs r0, 0x4 subs r0, r1 strb r0, [r4, 0x4] - ldr r0, _080EE354 + ldr r0, =0x020375e2 ldrh r0, [r0] strh r0, [r4, 0x2] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EE358 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x5] _080EE33A: @@ -487670,13 +471537,7 @@ _080EE33A: pop {r0} bx r0 .align 2, 0 -_080EE340: .4byte 0x03005d8c -_080EE344: .4byte 0x000027cc -_080EE348: .4byte 0x030060bc -_080EE34C: .4byte 0x03005d90 -_080EE350: .4byte 0x020375e0 -_080EE354: .4byte 0x020375e2 -_080EE358: .4byte 0x082e9531 + .pool thumb_func_end sub_80EE2CC thumb_func_start sub_80EE35C @@ -487700,13 +471561,13 @@ sub_80EE35C: @ 80EE35C lsls r3, 16 lsrs r3, 16 str r3, [sp] - ldr r0, _080EE438 + ldr r0, =0x03005d8c mov r8, r0 ldr r0, [r0] - ldr r5, _080EE43C + ldr r5, =0x000027cc adds r0, r5 bl sub_80EFB08 - ldr r4, _080EE440 + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -487736,7 +471597,7 @@ sub_80EE35C: @ 80EE35C strb r1, [r4, 0x1] adds r0, r4, 0 adds r0, 0x13 - ldr r1, _080EE444 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy mov r0, r10 @@ -487777,7 +471638,7 @@ _080EE408: strh r2, [r4, 0xE] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EE448 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x11] _080EE426: @@ -487790,11 +471651,7 @@ _080EE426: pop {r0} bx r0 .align 2, 0 -_080EE438: .4byte 0x03005d8c -_080EE43C: .4byte 0x000027cc -_080EE440: .4byte 0x030060bc -_080EE444: .4byte 0x03005d90 -_080EE448: .4byte 0x082e9531 + .pool thumb_func_end sub_80EE35C thumb_func_start sub_80EE44C @@ -487807,12 +471664,12 @@ sub_80EE44C: @ 80EE44C mov r8, r0 lsls r1, 24 lsrs r7, r1, 24 - ldr r6, _080EE4C8 + ldr r6, =0x03005d8c ldr r0, [r6] - ldr r5, _080EE4CC + ldr r5, =0x000027cc adds r0, r5 bl sub_80EFB08 - ldr r4, _080EE4D0 + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -487841,7 +471698,7 @@ sub_80EE44C: @ 80EE44C strb r1, [r4, 0x1] adds r0, r4, 0 adds r0, 0x13 - ldr r1, _080EE4D4 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy mov r0, r8 @@ -487849,7 +471706,7 @@ sub_80EE44C: @ 80EE44C strb r7, [r4, 0x3] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EE4D8 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x4] _080EE4BE: @@ -487859,11 +471716,7 @@ _080EE4BE: pop {r0} bx r0 .align 2, 0 -_080EE4C8: .4byte 0x03005d8c -_080EE4CC: .4byte 0x000027cc -_080EE4D0: .4byte 0x030060bc -_080EE4D4: .4byte 0x03005d90 -_080EE4D8: .4byte 0x082e9531 + .pool thumb_func_end sub_80EE44C thumb_func_start sub_80EE4DC @@ -487875,12 +471728,12 @@ sub_80EE4DC: @ 80EE4DC lsls r1, 24 lsrs r1, 24 mov r8, r1 - ldr r7, _080EE57C + ldr r7, =0x03005d8c ldr r0, [r7] - ldr r5, _080EE580 + ldr r5, =0x000027cc adds r0, r5 bl sub_80EFB08 - ldr r4, _080EE584 + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -487909,7 +471762,7 @@ sub_80EE4DC: @ 80EE4DC strb r1, [r5, 0x1] adds r0, r5, 0 adds r0, 0x13 - ldr r1, _080EE588 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy adds r4, r5, 0x4 @@ -487927,7 +471780,7 @@ sub_80EE4DC: @ 80EE4DC strb r0, [r5, 0x3] adds r0, r5, 0 bl sub_80EC9E8 - ldr r0, _080EE58C + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r5, 0xF] cmp r0, 0x1 @@ -487941,11 +471794,7 @@ _080EE578: movs r0, 0x1 b _080EE598 .align 2, 0 -_080EE57C: .4byte 0x03005d8c -_080EE580: .4byte 0x000027cc -_080EE584: .4byte 0x030060bc -_080EE588: .4byte 0x03005d90 -_080EE58C: .4byte 0x082e9531 + .pool _080EE590: adds r0, r6, 0 movs r1, 0x3 @@ -488168,12 +472017,12 @@ _080EE728: thumb_func_start sub_80EE72C sub_80EE72C: @ 80EE72C push {r4-r6,lr} - ldr r5, _080EE7A4 + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r6, _080EE7A8 + ldr r6, =0x000027cc adds r0, r6 bl sub_80EFB08 - ldr r4, _080EE7AC + ldr r4, =0x030060bc strb r0, [r4] lsls r0, 24 asrs r0, 24 @@ -488202,21 +472051,21 @@ sub_80EE72C: @ 80EE72C strb r1, [r4, 0x1] adds r0, r4, 0 adds r0, 0x13 - ldr r1, _080EE7B0 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy ldr r0, [r5] - ldr r2, _080EE7B4 + ldr r2, =0x00002bb0 adds r1, r0, r2 ldrh r1, [r1] strh r1, [r4, 0x4] - ldr r1, _080EE7B8 + ldr r1, =0x00002bb2 adds r0, r1 ldrh r0, [r0] strh r0, [r4, 0x6] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EE7BC + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x8] _080EE79C: @@ -488224,24 +472073,18 @@ _080EE79C: pop {r0} bx r0 .align 2, 0 -_080EE7A4: .4byte 0x03005d8c -_080EE7A8: .4byte 0x000027cc -_080EE7AC: .4byte 0x030060bc -_080EE7B0: .4byte 0x03005d90 -_080EE7B4: .4byte 0x00002bb0 -_080EE7B8: .4byte 0x00002bb2 -_080EE7BC: .4byte 0x082e9531 + .pool thumb_func_end sub_80EE72C thumb_func_start sub_80EE7C0 sub_80EE7C0: @ 80EE7C0 push {r4,lr} - ldr r4, _080EE7FC + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _080EE800 + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFADC - ldr r1, _080EE804 + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -488251,12 +472094,12 @@ sub_80EE7C0: @ 80EE7C0 beq _080EE810 movs r0, 0xB bl sub_80EF550 - ldr r0, _080EE808 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 beq _080EE810 ldr r0, [r4] - ldr r1, _080EE80C + ldr r1, =0x00003150 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF @@ -488264,11 +472107,7 @@ sub_80EE7C0: @ 80EE7C0 movs r0, 0 b _080EE812 .align 2, 0 -_080EE7FC: .4byte 0x03005d8c -_080EE800: .4byte 0x000027cc -_080EE804: .4byte 0x030060bc -_080EE808: .4byte 0x020375f0 -_080EE80C: .4byte 0x00003150 + .pool _080EE810: movs r0, 0x1 _080EE812: @@ -488287,9 +472126,9 @@ sub_80EE818: @ 80EE818 lsrs r0, 24 cmp r0, 0x1 bne _080EE870 - ldr r0, _080EE890 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080EE894 + ldr r1, =0x000027cc adds r7, r0, r1 bl sub_80F0020 adds r4, r0, 0 @@ -488324,12 +472163,12 @@ _080EE866: cmp r6, 0x17 bls _080EE83C _080EE870: - ldr r0, _080EE890 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080EE894 + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFB08 - ldr r1, _080EE898 + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -488340,13 +472179,11 @@ _080EE870: movs r0, 0x1 b _080EE8C2 .align 2, 0 -_080EE890: .4byte 0x03005d8c -_080EE894: .4byte 0x000027cc -_080EE898: .4byte 0x030060bc + .pool _080EE89C: - ldr r5, _080EE8B8 + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r4, _080EE8BC + ldr r4, =0x000027cc adds r0, r4 adds r1, r6, 0 bl sub_80EF910 @@ -488356,8 +472193,7 @@ _080EE89C: movs r0, 0x1 b _080EE8C2 .align 2, 0 -_080EE8B8: .4byte 0x03005d8c -_080EE8BC: .4byte 0x000027cc + .pool _080EE8C0: movs r0, 0 _080EE8C2: @@ -488375,12 +472211,12 @@ sub_80EE8C8: @ 80EE8C8 lsrs r6, r0, 16 lsls r1, 24 lsrs r4, r1, 24 - ldr r5, _080EE930 + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r1, _080EE934 + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFB08 - ldr r2, _080EE938 + ldr r2, =0x030060bc strb r0, [r2] lsls r0, 24 asrs r0, 24 @@ -488395,7 +472231,7 @@ _080EE8F4: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r2, _080EE934 + ldr r2, =0x000027cc adds r0, r2 ldr r1, [r5] adds r7, r1, r0 @@ -488405,7 +472241,7 @@ _080EE8F4: strb r1, [r7, 0x1] adds r0, r7, 0 adds r0, 0x13 - ldr r1, _080EE93C + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy strh r6, [r7, 0x2] @@ -488416,16 +472252,12 @@ _080EE8F4: b _080EEA46 _080EE926: lsls r0, 2 - ldr r1, _080EE940 + ldr r1, =_080EE944 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EE930: .4byte 0x03005d8c -_080EE934: .4byte 0x000027cc -_080EE938: .4byte 0x030060bc -_080EE93C: .4byte 0x03005d90 -_080EE940: .4byte _080EE944 + .pool .align 2, 0 _080EE944: .4byte _080EE978 @@ -488442,7 +472274,7 @@ _080EE944: .4byte _080EE978 .4byte _080EE978 _080EE978: - ldr r4, _080EE9A4 + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0xB movs r2, 0 @@ -488462,9 +472294,9 @@ _080EE978: strh r0, [r7, 0x8] b _080EEA46 .align 2, 0 -_080EE9A4: .4byte 0x020244ec + .pool _080EE9A8: - ldr r4, _080EE9E4 + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0xB movs r2, 0 @@ -488491,9 +472323,9 @@ _080EE9A8: strh r0, [r7, 0xA] b _080EEA46 .align 2, 0 -_080EE9E4: .4byte 0x020244ec + .pool _080EE9E8: - ldr r4, _080EE9FC + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0xB movs r2, 0 @@ -488503,13 +472335,13 @@ _080EE9E8: adds r0, r4, 0 b _080EEA3C .align 2, 0 -_080EE9FC: .4byte 0x020244ec + .pool _080EEA00: - ldr r2, _080EEA5C + ldr r2, =0x03005d8c mov r8, r2 - ldr r6, _080EEA60 + ldr r6, =0x03005d90 ldr r0, [r6] - ldr r1, _080EEA64 + ldr r1, =0x00000caa adds r0, r1 ldrh r0, [r0] movs r5, 0x64 @@ -488525,7 +472357,7 @@ _080EEA00: bl pokemon_getattr strh r0, [r7, 0x4] ldr r0, [r6] - ldr r2, _080EEA68 + ldr r2, =0x00000cac adds r0, r2 ldrh r0, [r0] adds r1, r0, 0 @@ -488542,7 +472374,7 @@ _080EEA3C: _080EEA46: adds r0, r7, 0 bl sub_80EC9E8 - ldr r0, _080EEA6C + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r7, 0xC] _080EEA52: @@ -488552,11 +472384,7 @@ _080EEA52: pop {r0} bx r0 .align 2, 0 -_080EEA5C: .4byte 0x03005d8c -_080EEA60: .4byte 0x03005d90 -_080EEA64: .4byte 0x00000caa -_080EEA68: .4byte 0x00000cac -_080EEA6C: .4byte 0x082e9531 + .pool thumb_func_end sub_80EE8C8 thumb_func_start sub_80EEA70 @@ -488572,12 +472400,12 @@ sub_80EEA70: @ 80EEA70 bne _080EEA86 b _080EEB8C _080EEA86: - ldr r7, _080EEB40 + ldr r7, =0x03005d8c ldr r0, [r7] - ldr r1, _080EEB44 + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFB08 - ldr r2, _080EEB48 + ldr r2, =0x030060bc strb r0, [r2] lsls r0, 24 asrs r0, 24 @@ -488590,7 +472418,7 @@ _080EEA86: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080EEB44 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r7] adds r5, r1, r0 @@ -488600,14 +472428,14 @@ _080EEA86: strb r1, [r5, 0x1] adds r0, r5, 0 adds r0, 0x13 - ldr r1, _080EEB4C + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy - ldr r0, _080EEB50 + ldr r0, =0x000040ec bl var_get strh r0, [r5, 0x2] bl sub_80E980C - ldr r1, _080EEB54 + ldr r1, =0x02021cc4 mov r0, sp bl gf_strcpy mov r0, sp @@ -488615,13 +472443,13 @@ _080EEA86: adds r0, r5, 0x4 mov r1, sp bl gf_strcpy - ldr r0, _080EEB58 + ldr r0, =0x000040ed bl var_get strh r0, [r5, 0x10] - ldr r0, _080EEB5C + ldr r0, =0x000040ee bl var_get adds r4, r0, 0 - ldr r0, _080EEB60 + ldr r0, =0x000040ef bl var_get lsls r4, 16 lsrs r4, 16 @@ -488630,13 +472458,13 @@ _080EEA86: str r4, [r5, 0xC] adds r0, r5, 0 bl sub_80EC9E8 - ldr r0, _080EEB64 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r5, 0x1B] cmp r0, 0x1 beq _080EEB3A ldr r4, [r7] - ldr r6, _080EEB68 + ldr r6, =0x00004054 adds r0, r6, 0 bl var_get lsls r0, 16 @@ -488645,7 +472473,7 @@ _080EEA86: adds r1, r0 lsls r1, 5 adds r4, r1 - ldr r0, _080EEB6C + ldr r0, =0x00001aa9 adds r4, r0 ldrb r0, [r4] cmp r0, 0x1 @@ -488654,18 +472482,7 @@ _080EEB3A: movs r0, 0x1 b _080EEB8A .align 2, 0 -_080EEB40: .4byte 0x03005d8c -_080EEB44: .4byte 0x000027cc -_080EEB48: .4byte 0x030060bc -_080EEB4C: .4byte 0x03005d90 -_080EEB50: .4byte 0x000040ec -_080EEB54: .4byte 0x02021cc4 -_080EEB58: .4byte 0x000040ed -_080EEB5C: .4byte 0x000040ee -_080EEB60: .4byte 0x000040ef -_080EEB64: .4byte 0x082e9531 -_080EEB68: .4byte 0x00004054 -_080EEB6C: .4byte 0x00001aa9 + .pool _080EEB70: adds r0, r6, 0 bl var_get @@ -488676,7 +472493,7 @@ _080EEB70: adds r1, r0 lsls r1, 5 adds r2, r1 - ldr r1, _080EEB94 + ldr r1, =0x00001aa9 adds r2, r1 ldrb r0, [r2] _080EEB8A: @@ -488687,18 +472504,18 @@ _080EEB8C: pop {r0} bx r0 .align 2, 0 -_080EEB94: .4byte 0x00001aa9 + .pool thumb_func_end sub_80EEA70 thumb_func_start sub_80EEB98 sub_80EEB98: @ 80EEB98 push {r4-r7,lr} movs r5, 0 - ldr r6, _080EEBA4 + ldr r6, =0x0858d0ec adds r7, r6, 0x2 b _080EEBAE .align 2, 0 -_080EEBA4: .4byte 0x0858d0ec + .pool _080EEBA8: adds r0, r5, 0x1 lsls r0, 24 @@ -488720,7 +472537,7 @@ _080EEBAE: bl sub_80EEBF4 _080EEBCE: movs r5, 0 - ldr r4, _080EEBF0 + ldr r4, =0x0858d0ec _080EEBD2: lsls r0, r5, 2 adds r0, r4 @@ -488736,7 +472553,7 @@ _080EEBD2: pop {r0} bx r0 .align 2, 0 -_080EEBF0: .4byte 0x0858d0ec + .pool thumb_func_end sub_80EEB98 thumb_func_start sub_80EEBF4 @@ -488747,12 +472564,12 @@ sub_80EEBF4: @ 80EEBF4 movs r0, 0x25 movs r1, 0x1 bl sub_80EF46C - ldr r4, _080EEC68 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _080EEC6C + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFB08 - ldr r2, _080EEC70 + ldr r2, =0x030060bc strb r0, [r2] lsls r0, 24 asrs r0, 24 @@ -488765,7 +472582,7 @@ sub_80EEBF4: @ 80EEBF4 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080EEC6C + ldr r1, =0x000027cc adds r0, r1 ldr r4, [r4] adds r4, r0 @@ -488775,11 +472592,11 @@ sub_80EEBF4: @ 80EEBF4 strb r1, [r4, 0x1] adds r0, r4, 0 adds r0, 0x13 - ldr r1, _080EEC74 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy strb r5, [r4, 0x4] - ldr r1, _080EEC78 + ldr r1, =0x0858d0ec lsls r0, r5, 2 adds r0, r1 ldrh r0, [r0] @@ -488787,7 +472604,7 @@ sub_80EEBF4: @ 80EEBF4 strh r0, [r4, 0x2] adds r0, r4, 0 bl sub_80EC9E8 - ldr r0, _080EEC7C + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r4, 0x5] _080EEC60: @@ -488795,18 +472612,13 @@ _080EEC60: pop {r0} bx r0 .align 2, 0 -_080EEC68: .4byte 0x03005d8c -_080EEC6C: .4byte 0x000027cc -_080EEC70: .4byte 0x030060bc -_080EEC74: .4byte 0x03005d90 -_080EEC78: .4byte 0x0858d0ec -_080EEC7C: .4byte 0x082e9531 + .pool thumb_func_end sub_80EEBF4 thumb_func_start sub_80EEC80 sub_80EEC80: @ 80EEC80 push {r4,lr} - ldr r4, _080EECA0 + ldr r4, =0x000040e6 adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -488819,13 +472631,13 @@ sub_80EEC80: @ 80EEC80 pop {r0} bx r0 .align 2, 0 -_080EECA0: .4byte 0x000040e6 + .pool thumb_func_end sub_80EEC80 thumb_func_start sub_80EECA4 sub_80EECA4: @ 80EECA4 push {r4,lr} - ldr r4, _080EECC4 + ldr r4, =0x000040eb adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -488838,13 +472650,13 @@ sub_80EECA4: @ 80EECA4 pop {r0} bx r0 .align 2, 0 -_080EECC4: .4byte 0x000040eb + .pool thumb_func_end sub_80EECA4 thumb_func_start sub_80EECC8 sub_80EECC8: @ 80EECC8 push {r4,lr} - ldr r4, _080EECE8 + ldr r4, =0x000040e7 adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -488857,13 +472669,13 @@ sub_80EECC8: @ 80EECC8 pop {r0} bx r0 .align 2, 0 -_080EECE8: .4byte 0x000040e7 + .pool thumb_func_end sub_80EECC8 thumb_func_start sub_80EECEC sub_80EECEC: @ 80EECEC push {r4,lr} - ldr r4, _080EED0C + ldr r4, =0x000040e8 adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -488876,13 +472688,13 @@ sub_80EECEC: @ 80EECEC pop {r0} bx r0 .align 2, 0 -_080EED0C: .4byte 0x000040e8 + .pool thumb_func_end sub_80EECEC thumb_func_start sub_80EED10 sub_80EED10: @ 80EED10 push {r4,lr} - ldr r4, _080EED30 + ldr r4, =0x000040e9 adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -488895,17 +472707,17 @@ sub_80EED10: @ 80EED10 pop {r0} bx r0 .align 2, 0 -_080EED30: .4byte 0x000040e9 + .pool thumb_func_end sub_80EED10 thumb_func_start sub_80EED34 sub_80EED34: @ 80EED34 push {r4,lr} - ldr r4, _080EED58 + ldr r4, =0x000040ea adds r0, r4, 0 bl var_get adds r1, r0, 0 - ldr r0, _080EED5C + ldr r0, =0x020375e4 ldrh r0, [r0] adds r1, r0 lsls r1, 16 @@ -488916,8 +472728,7 @@ sub_80EED34: @ 80EED34 pop {r0} bx r0 .align 2, 0 -_080EED58: .4byte 0x000040ea -_080EED5C: .4byte 0x020375e4 + .pool thumb_func_end sub_80EED34 thumb_func_start sub_80EED60 @@ -488926,7 +472737,7 @@ sub_80EED60: @ 80EED60 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r5, _080EED84 + ldr r5, =0x000040f1 adds r0, r5, 0 bl var_get adds r4, r0 @@ -488939,23 +472750,23 @@ sub_80EED60: @ 80EED60 pop {r0} bx r0 .align 2, 0 -_080EED84: .4byte 0x000040f1 + .pool thumb_func_end sub_80EED60 thumb_func_start sub_80EED88 sub_80EED88: @ 80EED88 push {r4-r7,lr} - ldr r0, _080EEE14 + ldr r0, =0x00000864 bl flag_check lsls r0, 24 cmp r0, 0 beq _080EEE0C - ldr r6, _080EEE18 + ldr r6, =0x03005d8c ldr r0, [r6] - ldr r7, _080EEE1C + ldr r7, =0x00002b50 adds r0, r7 bl sub_80EEE30 - ldr r5, _080EEE20 + ldr r5, =0x030060bc strb r0, [r5] lsls r0, 24 asrs r0, 24 @@ -488963,7 +472774,7 @@ sub_80EED88: @ 80EED88 negs r1, r1 cmp r0, r1 beq _080EEE0C - ldr r0, _080EEE24 + ldr r0, =0x0000028f bl sub_80EFB38 lsls r0, 24 lsrs r0, 24 @@ -488993,7 +472804,7 @@ sub_80EED88: @ 80EED88 ldrsb r0, [r5, r0] lsls r0, 2 adds r0, r2, r0 - ldr r1, _080EEE28 + ldr r1, =0x00002b52 adds r0, r1 movs r1, 0x4 strh r1, [r0] @@ -489001,7 +472812,7 @@ sub_80EED88: @ 80EED88 ldrsb r0, [r5, r0] lsls r0, 2 adds r2, r0 - ldr r0, _080EEE2C + ldr r0, =0x00002b51 adds r2, r0 movs r0, 0x1 strb r0, [r2] @@ -489010,13 +472821,7 @@ _080EEE0C: pop {r0} bx r0 .align 2, 0 -_080EEE14: .4byte 0x00000864 -_080EEE18: .4byte 0x03005d8c -_080EEE1C: .4byte 0x00002b50 -_080EEE20: .4byte 0x030060bc -_080EEE24: .4byte 0x0000028f -_080EEE28: .4byte 0x00002b52 -_080EEE2C: .4byte 0x00002b51 + .pool thumb_func_end sub_80EED88 thumb_func_start sub_80EEE30 @@ -489069,45 +472874,42 @@ _080EEE60: sub_80EEE78: @ 80EEE78 push {r4,lr} lsls r0, 24 - ldr r3, _080EEEA8 + ldr r3, =0x03005d8c ldr r1, [r3] lsrs r0, 22 adds r1, r0 - ldr r2, _080EEEAC + ldr r2, =0x00002b50 adds r1, r2 movs r2, 0 strb r2, [r1] ldr r1, [r3] adds r1, r0 - ldr r4, _080EEEB0 + ldr r4, =0x00002b51 adds r1, r4 strb r2, [r1] ldr r1, [r3] adds r1, r0 - ldr r0, _080EEEB4 + ldr r0, =0x00002b52 adds r1, r0 strh r2, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_080EEEA8: .4byte 0x03005d8c -_080EEEAC: .4byte 0x00002b50 -_080EEEB0: .4byte 0x00002b51 -_080EEEB4: .4byte 0x00002b52 + .pool thumb_func_end sub_80EEE78 thumb_func_start sub_80EEEB8 sub_80EEEB8: @ 80EEEB8 push {r4-r7,lr} movs r2, 0 - ldr r6, _080EEED8 + ldr r6, =0x03005d8c _080EEEBE: - ldr r0, _080EEED8 + ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r2, 2 adds r0, r1 - ldr r3, _080EEEDC + ldr r3, =0x00002b50 adds r0, r3 ldrb r0, [r0] adds r5, r2, 0x1 @@ -489116,13 +472918,12 @@ _080EEEBE: lsls r0, r5, 24 b _080EEF0C .align 2, 0 -_080EEED8: .4byte 0x03005d8c -_080EEEDC: .4byte 0x00002b50 + .pool _080EEEE0: ldr r3, [r6] lsls r4, r2, 2 adds r0, r3, r4 - ldr r7, _080EEF04 + ldr r7, =0x00002b50 adds r0, r7 ldrb r0, [r0] cmp r0, 0 @@ -489136,7 +472937,7 @@ _080EEEE0: bl sub_80EEE78 b _080EEF12 .align 2, 0 -_080EEF04: .4byte 0x00002b50 + .pool _080EEF08: adds r0, r2, 0x1 lsls r0, 24 @@ -489158,12 +472959,12 @@ _080EEF12: sub_80EEF20: @ 80EEF20 push {r4,lr} movs r2, 0 - ldr r0, _080EEF50 + ldr r0, =0x03005d8c ldr r3, [r0] _080EEF28: lsls r0, r2, 2 adds r1, r3, r0 - ldr r4, _080EEF54 + ldr r4, =0x00002b50 adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0 @@ -489181,8 +472982,7 @@ _080EEF28: adds r0, r2, 0 b _080EEF64 .align 2, 0 -_080EEF50: .4byte 0x03005d8c -_080EEF54: .4byte 0x00002b50 + .pool _080EEF58: adds r0, r2, 0x1 lsls r0, 24 @@ -489204,47 +473004,43 @@ sub_80EEF6C: @ 80EEF6C lsrs r2, r0, 24 cmp r2, 0xFF bne _080EEF84 - ldr r1, _080EEF80 + ldr r1, =0x020375f0 movs r0, 0 b _080EF01A .align 2, 0 -_080EEF80: .4byte 0x020375f0 + .pool _080EEF84: - ldr r5, _080EEFB4 + ldr r5, =0x03005d8c ldr r0, [r5] lsls r4, r2, 2 adds r1, r0, r4 - ldr r0, _080EEFB8 + ldr r0, =0x00002b52 adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0 bne _080EEFE8 - ldr r2, _080EEFBC + ldr r2, =0x00002b51 adds r1, r2 movs r0, 0x2 strb r0, [r1] - ldr r0, _080EEFC0 + ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 cmp r0, 0x13 bgt _080EEFC8 - ldr r1, _080EEFC4 + ldr r1, =0x0858d11c ldr r0, [r5] adds r0, r4 subs r2, 0x1 b _080EEFD0 .align 2, 0 -_080EEFB4: .4byte 0x03005d8c -_080EEFB8: .4byte 0x00002b52 -_080EEFBC: .4byte 0x00002b51 -_080EEFC0: .4byte 0x03005cf8 -_080EEFC4: .4byte 0x0858d11c + .pool _080EEFC8: - ldr r1, _080EEFE0 + ldr r1, =0x0858d130 ldr r0, [r5] adds r0, r4 - ldr r2, _080EEFE4 + ldr r2, =0x00002b50 _080EEFD0: adds r0, r2 ldrb r0, [r0] @@ -489254,24 +473050,23 @@ _080EEFD0: bl box_related_two__2 b _080EF016 .align 2, 0 -_080EEFE0: .4byte 0x0858d130 -_080EEFE4: .4byte 0x00002b50 + .pool _080EEFE8: ldrh r1, [r2] - ldr r0, _080EF024 + ldr r0, =0x02021cc4 movs r2, 0 movs r3, 0x1 bl decimal_int_to_string ldr r0, [r5] adds r0, r4 - ldr r1, _080EF028 + ldr r1, =0x00002b51 adds r0, r1 movs r1, 0 strb r1, [r0] - ldr r1, _080EF02C + ldr r1, =0x0858d108 ldr r0, [r5] adds r0, r4 - ldr r2, _080EF030 + ldr r2, =0x00002b50 adds r0, r2 ldrb r0, [r0] lsls r0, 2 @@ -489279,7 +473074,7 @@ _080EEFE8: ldr r0, [r0] bl box_related_two__2 _080EF016: - ldr r1, _080EF034 + ldr r1, =0x020375f0 movs r0, 0x1 _080EF01A: strh r0, [r1] @@ -489287,11 +473082,7 @@ _080EF01A: pop {r0} bx r0 .align 2, 0 -_080EF024: .4byte 0x02021cc4 -_080EF028: .4byte 0x00002b51 -_080EF02C: .4byte 0x0858d108 -_080EF030: .4byte 0x00002b50 -_080EF034: .4byte 0x020375f0 + .pool thumb_func_end sub_80EEF6C thumb_func_start sub_80EF038 @@ -489307,17 +473098,17 @@ _080EF044: b _080EF08C _080EF048: movs r2, 0 - ldr r4, _080EF074 + ldr r4, =0x03005d8c _080EF04C: ldr r1, [r4] lsls r0, r2, 2 adds r1, r0 - ldr r5, _080EF078 + ldr r5, =0x00002b50 adds r0, r1, r5 ldrb r0, [r0] cmp r0, r3 bne _080EF080 - ldr r2, _080EF07C + ldr r2, =0x00002b51 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x2 @@ -489329,9 +473120,7 @@ _080EF04C: bne _080EF044 b _080EF08A .align 2, 0 -_080EF074: .4byte 0x03005d8c -_080EF078: .4byte 0x00002b50 -_080EF07C: .4byte 0x00002b51 + .pool _080EF080: adds r0, r2, 0x1 lsls r0, 24 @@ -489359,26 +473148,25 @@ _080EF0A2: movs r0, 0x1 b _080EF0D6 _080EF0A6: - ldr r0, _080EF0C0 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0x80 lsls r0, 1 cmp r1, r0 bne _080EF0D4 - ldr r0, _080EF0C4 + ldr r0, =0x020375f2 ldrh r0, [r0] cmp r0, 0x19 beq _080EF0A2 b _080EF0D4 .align 2, 0 -_080EF0C0: .4byte 0x03005d8c -_080EF0C4: .4byte 0x020375f2 + .pool _080EF0C8: - ldr r0, _080EF0DC + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _080EF0E0 + ldr r0, =0x0000150d cmp r1, r0 beq _080EF0A2 _080EF0D4: @@ -489387,8 +473175,7 @@ _080EF0D6: pop {r1} bx r1 .align 2, 0 -_080EF0DC: .4byte 0x03005d8c -_080EF0E0: .4byte 0x0000150d + .pool thumb_func_end sub_80EF094 thumb_func_start sub_80EF0E4 @@ -489403,9 +473190,9 @@ _080EF0EE: b _080EF112 _080EF0F2: movs r1, 0 - ldr r0, _080EF118 + ldr r0, =0x03005d8c ldr r3, [r0] - ldr r4, _080EF11C + ldr r4, =0x00002b50 _080EF0FA: lsls r0, r1, 2 adds r0, r3, r0 @@ -489424,8 +473211,7 @@ _080EF112: pop {r1} bx r1 .align 2, 0 -_080EF118: .4byte 0x03005d8c -_080EF11C: .4byte 0x00002b50 + .pool thumb_func_end sub_80EF0E4 thumb_func_start sub_80EF120 @@ -489436,20 +473222,20 @@ sub_80EF120: @ 80EF120 lsls r0, 16 lsrs r7, r0, 16 movs r6, 0 - ldr r0, _080EF158 + ldr r0, =0x03005d8c mov r8, r0 _080EF130: mov r1, r8 ldr r0, [r1] lsls r1, r6, 2 adds r2, r0, r1 - ldr r3, _080EF15C + ldr r3, =0x00002b50 adds r0, r2, r3 ldrb r0, [r0] adds r4, r1, 0 cmp r0, 0 beq _080EF196 - ldr r1, _080EF160 + ldr r1, =0x00002b52 adds r0, r2, r1 ldrh r0, [r0] cmp r0, r7 @@ -489458,16 +473244,14 @@ _080EF130: bl sub_80EEE78 b _080EF196 .align 2, 0 -_080EF158: .4byte 0x03005d8c -_080EF15C: .4byte 0x00002b50 -_080EF160: .4byte 0x00002b52 + .pool _080EF164: - ldr r5, _080EF1B0 + ldr r5, =0x00002b51 adds r0, r2, r5 ldrb r0, [r0] cmp r0, 0 bne _080EF186 - ldr r0, _080EF1B4 + ldr r0, =0x00000864 bl flag_check lsls r0, 24 lsrs r1, r0, 24 @@ -489482,7 +473266,7 @@ _080EF186: mov r3, r8 ldr r1, [r3] adds r1, r4 - ldr r0, _080EF1B8 + ldr r0, =0x00002b52 adds r1, r0 ldrh r0, [r1] subs r0, r7 @@ -489500,9 +473284,7 @@ _080EF196: pop {r0} bx r0 .align 2, 0 -_080EF1B0: .4byte 0x00002b51 -_080EF1B4: .4byte 0x00000864 -_080EF1B8: .4byte 0x00002b52 + .pool thumb_func_end sub_80EF120 thumb_func_start sub_80EF1BC @@ -489527,55 +473309,51 @@ _080EF1D6: beq _080EF234 b _080EF244 _080EF1E0: - ldr r1, _080EF1F4 + ldr r1, =0x0858d144 lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080EF1F8 + ldr r1, =0x0858baf0 ldr r1, [r1, 0x14] bl gf_strcpy b _080EF244 .align 2, 0 -_080EF1F4: .4byte 0x0858d144 -_080EF1F8: .4byte 0x0858baf0 + .pool _080EF1FC: - ldr r1, _080EF210 + ldr r1, =0x0858d144 lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080EF214 + ldr r1, =0x0858baf0 ldr r1, [r1, 0x18] bl gf_strcpy b _080EF244 .align 2, 0 -_080EF210: .4byte 0x0858d144 -_080EF214: .4byte 0x0858baf0 + .pool _080EF218: - ldr r1, _080EF22C + ldr r1, =0x0858d144 lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080EF230 + ldr r1, =0x0858baf0 ldr r1, [r1, 0x1C] bl gf_strcpy b _080EF244 .align 2, 0 -_080EF22C: .4byte 0x0858d144 -_080EF230: .4byte 0x0858baf0 + .pool _080EF234: - ldr r1, _080EF248 + ldr r1, =0x0858d144 lsls r0, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080EF24C + ldr r1, =0x0858baf0 ldr r1, [r1, 0x20] bl gf_strcpy _080EF244: pop {r0} bx r0 .align 2, 0 -_080EF248: .4byte 0x0858d144 -_080EF24C: .4byte 0x0858baf0 + .pool thumb_func_end sub_80EF1BC thumb_func_start sub_80EF250 @@ -489588,12 +473366,12 @@ sub_80EF250: @ 80EF250 cmp r0, 0x4 bhi _080EF300 lsls r0, 2 - ldr r1, _080EF268 + ldr r1, =_080EF26C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EF268: .4byte _080EF26C + .pool .align 2, 0 _080EF26C: .4byte _080EF280 @@ -489602,79 +473380,74 @@ _080EF26C: .4byte _080EF2D4 .4byte _080EF2F0 _080EF280: - ldr r1, _080EF294 + ldr r1, =0x0858d144 lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080EF298 + ldr r1, =0x0858baf0 ldr r1, [r1] bl gf_strcpy b _080EF300 .align 2, 0 -_080EF294: .4byte 0x0858d144 -_080EF298: .4byte 0x0858baf0 + .pool _080EF29C: - ldr r1, _080EF2B0 + ldr r1, =0x0858d144 lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080EF2B4 + ldr r1, =0x0858baf0 ldr r1, [r1, 0x4] bl gf_strcpy b _080EF300 .align 2, 0 -_080EF2B0: .4byte 0x0858d144 -_080EF2B4: .4byte 0x0858baf0 + .pool _080EF2B8: - ldr r1, _080EF2CC + ldr r1, =0x0858d144 lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080EF2D0 + ldr r1, =0x0858baf0 ldr r1, [r1, 0x8] bl gf_strcpy b _080EF300 .align 2, 0 -_080EF2CC: .4byte 0x0858d144 -_080EF2D0: .4byte 0x0858baf0 + .pool _080EF2D4: - ldr r1, _080EF2E8 + ldr r1, =0x0858d144 lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080EF2EC + ldr r1, =0x0858baf0 ldr r1, [r1, 0xC] bl gf_strcpy b _080EF300 .align 2, 0 -_080EF2E8: .4byte 0x0858d144 -_080EF2EC: .4byte 0x0858baf0 + .pool _080EF2F0: - ldr r1, _080EF304 + ldr r1, =0x0858d144 lsls r0, r2, 2 adds r0, r1 ldr r0, [r0] - ldr r1, _080EF308 + ldr r1, =0x0858baf0 ldr r1, [r1, 0x10] bl gf_strcpy _080EF300: pop {r0} bx r0 .align 2, 0 -_080EF304: .4byte 0x0858d144 -_080EF308: .4byte 0x0858baf0 + .pool thumb_func_end sub_80EF250 thumb_func_start sub_80EF30C sub_80EF30C: @ 80EF30C push {lr} - ldr r2, _080EF334 - ldr r0, _080EF338 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080EF33C + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r1, r0 @@ -489686,9 +473459,7 @@ sub_80EF30C: @ 80EF30C pop {r0} bx r0 .align 2, 0 -_080EF334: .4byte 0x03005d8c -_080EF338: .4byte 0x020375e0 -_080EF33C: .4byte 0x000027cc + .pool thumb_func_end sub_80EF30C thumb_func_start sub_80EF340 @@ -489701,7 +473472,7 @@ sub_80EF340: @ 80EF340 adds r0, r5, 0 bl sub_80EF370 adds r3, r0, 0 - ldr r0, _080EF36C + ldr r0, =0x0858d144 lsls r4, 2 adds r4, r0 ldr r0, [r4] @@ -489714,7 +473485,7 @@ sub_80EF340: @ 80EF340 pop {r0} bx r0 .align 2, 0 -_080EF36C: .4byte 0x0858d144 + .pool thumb_func_end sub_80EF340 thumb_func_start sub_80EF370 @@ -489742,7 +473513,7 @@ _080EF38E: movs r0, 0x3 b _080EF406 _080EF3A0: - ldr r1, _080EF3B0 + ldr r1, =0x00002710 adds r0, r4, 0 bl __divsi3 cmp r0, 0 @@ -489750,9 +473521,9 @@ _080EF3A0: movs r0, 0x4 b _080EF406 .align 2, 0 -_080EF3B0: .4byte 0x00002710 + .pool _080EF3B4: - ldr r1, _080EF3C4 + ldr r1, =0x000186a0 adds r0, r4, 0 bl __divsi3 cmp r0, 0 @@ -489760,9 +473531,9 @@ _080EF3B4: movs r0, 0x5 b _080EF406 .align 2, 0 -_080EF3C4: .4byte 0x000186a0 + .pool _080EF3C8: - ldr r1, _080EF3D8 + ldr r1, =0x000f4240 adds r0, r4, 0 bl __divsi3 cmp r0, 0 @@ -489770,9 +473541,9 @@ _080EF3C8: movs r0, 0x6 b _080EF406 .align 2, 0 -_080EF3D8: .4byte 0x000f4240 + .pool _080EF3DC: - ldr r1, _080EF3EC + ldr r1, =0x00989680 adds r0, r4, 0 bl __divsi3 cmp r0, 0 @@ -489780,9 +473551,9 @@ _080EF3DC: movs r0, 0x7 b _080EF406 .align 2, 0 -_080EF3EC: .4byte 0x00989680 + .pool _080EF3F0: - ldr r1, _080EF400 + ldr r1, =0x05f5e100 adds r0, r4, 0 bl __divsi3 cmp r0, 0 @@ -489791,7 +473562,7 @@ _080EF3FC: movs r0, 0x1 b _080EF406 .align 2, 0 -_080EF400: .4byte 0x05f5e100 + .pool _080EF404: movs r0, 0x8 _080EF406: @@ -489865,9 +473636,9 @@ sub_80EF46C: @ 80EF46C lsls r1, 24 lsrs r1, 24 mov r9, r1 - ldr r5, _080EF4DC + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r4, _080EF4E0 + ldr r4, =0x000027cc adds r0, r4 mov r8, r0 bl sub_80F0020 @@ -489910,8 +473681,7 @@ _080EF4D8: movs r0, 0x1 b _080EF4F0 .align 2, 0 -_080EF4DC: .4byte 0x03005d8c -_080EF4E0: .4byte 0x000027cc + .pool _080EF4E4: adds r0, r6, 0x1 lsls r0, 24 @@ -489940,7 +473710,7 @@ _080EF504: adds r7, r1, 0 cmp r5, 0x2 bhi _080EF53C - ldr r6, _080EF54C + ldr r6, =0x02039f80 lsls r0, r2, 2 adds r4, r0, r6 _080EF516: @@ -489973,7 +473743,7 @@ _080EF53C: pop {r0} bx r0 .align 2, 0 -_080EF54C: .4byte 0x02039f80 + .pool thumb_func_end sub_80EF500 thumb_func_start sub_80EF550 @@ -489982,8 +473752,8 @@ sub_80EF550: @ 80EF550 lsls r0, 24 lsrs r6, r0, 24 movs r1, 0 - ldr r5, _080EF580 - ldr r4, _080EF584 + ldr r5, =0x03005d8c + ldr r4, =0x000027cc _080EF55C: ldr r3, [r5] lsls r0, r1, 3 @@ -489994,19 +473764,16 @@ _080EF55C: ldrb r0, [r0] cmp r0, r6 bne _080EF5A4 - ldr r6, _080EF588 + ldr r6, =0x000027cd adds r0, r2, r6 ldrb r2, [r0] cmp r2, 0x1 bne _080EF590 - ldr r0, _080EF58C + ldr r0, =0x020375f0 strh r2, [r0] b _080EF5B2 .align 2, 0 -_080EF580: .4byte 0x03005d8c -_080EF584: .4byte 0x000027cc -_080EF588: .4byte 0x000027cd -_080EF58C: .4byte 0x020375f0 + .pool _080EF590: adds r0, r3, r4 bl sub_80EF910 @@ -490031,23 +473798,21 @@ _080EF5B2: thumb_func_start sub_80EF5B8 sub_80EF5B8: @ 80EF5B8 push {lr} - ldr r1, _080EF5D4 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080EF5D8 + ldr r0, =0x020375e2 ldrh r0, [r0] subs r0, 0x1 cmp r0, 0xA bhi _080EF646 lsls r0, 2 - ldr r1, _080EF5DC + ldr r1, =_080EF5E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080EF5D4: .4byte 0x020375f0 -_080EF5D8: .4byte 0x020375e2 -_080EF5DC: .4byte _080EF5E0 + .pool .align 2, 0 _080EF5E0: .4byte _080EF60C @@ -490100,29 +473865,29 @@ sub_80EF64C: @ 80EF64C push {r4,lr} movs r0, 0x1 bl sub_80EF550 - ldr r0, _080EF6A8 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 bne _080EF6A0 - ldr r4, _080EF6AC + ldr r4, =0x02021cc4 bl sub_8139688 lsls r0, 24 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _080EF6B0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB movs r2, 0 bl pokemon_getattr movs r1, 0xB muls r1, r0 - ldr r0, _080EF6B4 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r4, 0 bl gf_strcpy - ldr r2, _080EF6B8 - ldr r0, _080EF6BC + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 @@ -490130,7 +473895,7 @@ sub_80EF64C: @ 80EF64C lsls r0, 2 ldr r1, [r2] adds r0, r1 - ldr r1, _080EF6C0 + ldr r1, =0x000027d0 adds r0, r1 movs r1, 0x6 bl sub_811F88C @@ -490139,13 +473904,7 @@ _080EF6A0: pop {r0} bx r0 .align 2, 0 -_080EF6A8: .4byte 0x020375f0 -_080EF6AC: .4byte 0x02021cc4 -_080EF6B0: .4byte 0x020244ec -_080EF6B4: .4byte 0x083185c8 -_080EF6B8: .4byte 0x03005d8c -_080EF6BC: .4byte 0x030060bc -_080EF6C0: .4byte 0x000027d0 + .pool thumb_func_end sub_80EF64C thumb_func_start sub_80EF6C4 @@ -490153,12 +473912,12 @@ sub_80EF6C4: @ 80EF6C4 push {lr} movs r0, 0x2 bl sub_80EF550 - ldr r0, _080EF6F4 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 bne _080EF6F0 - ldr r2, _080EF6F8 - ldr r0, _080EF6FC + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 @@ -490166,7 +473925,7 @@ sub_80EF6C4: @ 80EF6C4 lsls r0, 2 ldr r1, [r2] adds r0, r1 - ldr r1, _080EF700 + ldr r1, =0x000027d0 adds r0, r1 movs r1, 0x6 bl sub_811F88C @@ -490174,10 +473933,7 @@ _080EF6F0: pop {r0} bx r0 .align 2, 0 -_080EF6F4: .4byte 0x020375f0 -_080EF6F8: .4byte 0x03005d8c -_080EF6FC: .4byte 0x030060bc -_080EF700: .4byte 0x000027d0 + .pool thumb_func_end sub_80EF6C4 thumb_func_start sub_80EF704 @@ -490185,24 +473941,24 @@ sub_80EF704: @ 80EF704 push {r4-r6,lr} movs r0, 0x3 bl sub_80EF550 - ldr r0, _080EF77C + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 bne _080EF774 - ldr r6, _080EF780 + ldr r6, =0x02021cc4 bl sub_8139688 lsls r0, 24 lsrs r0, 24 movs r5, 0x64 muls r0, r5 - ldr r4, _080EF784 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0xB movs r2, 0 bl pokemon_getattr movs r1, 0xB muls r1, r0 - ldr r0, _080EF788 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r6, 0 bl gf_strcpy @@ -490211,14 +473967,14 @@ sub_80EF704: @ 80EF704 lsrs r0, 24 muls r0, r5 adds r0, r4 - ldr r4, _080EF78C + ldr r4, =0x02021dc4 movs r1, 0x2 adds r2, r4, 0 bl pokemon_getattr adds r0, r4, 0 bl get_end_of_string_ptr_limit_10_chars - ldr r2, _080EF790 - ldr r0, _080EF794 + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 @@ -490226,7 +473982,7 @@ sub_80EF704: @ 80EF704 lsls r0, 2 ldr r1, [r2] adds r0, r1 - ldr r1, _080EF798 + ldr r1, =0x000027e8 adds r0, r1 movs r1, 0x2 bl sub_811F88C @@ -490235,24 +473991,17 @@ _080EF774: pop {r0} bx r0 .align 2, 0 -_080EF77C: .4byte 0x020375f0 -_080EF780: .4byte 0x02021cc4 -_080EF784: .4byte 0x020244ec -_080EF788: .4byte 0x083185c8 -_080EF78C: .4byte 0x02021dc4 -_080EF790: .4byte 0x03005d8c -_080EF794: .4byte 0x030060bc -_080EF798: .4byte 0x000027e8 + .pool thumb_func_end sub_80EF704 thumb_func_start sub_80EF79C sub_80EF79C: @ 80EF79C - ldr r1, _080EF7A4 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] bx lr .align 2, 0 -_080EF7A4: .4byte 0x020375f0 + .pool thumb_func_end sub_80EF79C thumb_func_start sub_80EF7A8 @@ -490269,12 +474018,12 @@ sub_80EF7B4: @ 80EF7B4 push {lr} movs r0, 0x6 bl sub_80EF550 - ldr r0, _080EF7E4 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 bne _080EF7E0 - ldr r2, _080EF7E8 - ldr r0, _080EF7EC + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 @@ -490282,7 +474031,7 @@ sub_80EF7B4: @ 80EF7B4 lsls r0, 2 ldr r1, [r2] adds r0, r1 - ldr r1, _080EF7F0 + ldr r1, =0x000027d0 adds r0, r1 movs r1, 0x2 bl sub_811F88C @@ -490290,10 +474039,7 @@ _080EF7E0: pop {r0} bx r0 .align 2, 0 -_080EF7E4: .4byte 0x020375f0 -_080EF7E8: .4byte 0x03005d8c -_080EF7EC: .4byte 0x030060bc -_080EF7F0: .4byte 0x000027d0 + .pool thumb_func_end sub_80EF7B4 thumb_func_start sub_80EF7F4 @@ -490319,12 +474065,12 @@ sub_80EF80C: @ 80EF80C push {lr} movs r0, 0x7 bl sub_80EF550 - ldr r0, _080EF83C + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 bne _080EF838 - ldr r2, _080EF840 - ldr r0, _080EF844 + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 @@ -490332,7 +474078,7 @@ sub_80EF80C: @ 80EF80C lsls r0, 2 ldr r1, [r2] adds r0, r1 - ldr r1, _080EF848 + ldr r1, =0x000027e4 adds r0, r1 movs r1, 0x1 bl sub_811F88C @@ -490340,10 +474086,7 @@ _080EF838: pop {r0} bx r0 .align 2, 0 -_080EF83C: .4byte 0x020375f0 -_080EF840: .4byte 0x03005d8c -_080EF844: .4byte 0x030060bc -_080EF848: .4byte 0x000027e4 + .pool thumb_func_end sub_80EF80C thumb_func_start sub_80EF84C @@ -490351,12 +474094,12 @@ sub_80EF84C: @ 80EF84C push {lr} movs r0, 0xB bl sub_80EF550 - ldr r0, _080EF87C + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 bne _080EF878 - ldr r2, _080EF880 - ldr r0, _080EF884 + ldr r2, =0x03005d8c + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 @@ -490364,7 +474107,7 @@ sub_80EF84C: @ 80EF84C lsls r0, 2 ldr r1, [r2] adds r0, r1 - ldr r1, _080EF888 + ldr r1, =0x000027e0 adds r0, r1 movs r1, 0x1 bl sub_811F88C @@ -490372,10 +474115,7 @@ _080EF878: pop {r0} bx r0 .align 2, 0 -_080EF87C: .4byte 0x020375f0 -_080EF880: .4byte 0x03005d8c -_080EF884: .4byte 0x030060bc -_080EF888: .4byte 0x000027e0 + .pool thumb_func_end sub_80EF84C thumb_func_start sub_80EF88C @@ -490386,9 +474126,9 @@ sub_80EF88C: @ 80EF88C lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _080EF8E0 + ldr r0, =0x020244ec adds r5, r1, r0 - ldr r6, _080EF8E4 + ldr r6, =0x02021cc4 adds r0, r5, 0 movs r1, 0x2 adds r2, r6, 0 @@ -490409,7 +474149,7 @@ sub_80EF88C: @ 80EF88C bl pokemon_getattr movs r1, 0xB muls r0, r1 - ldr r1, _080EF8E8 + ldr r1, =0x083185c8 adds r0, r1 adds r1, r6, 0 bl sub_8008C44 @@ -490418,9 +474158,7 @@ sub_80EF88C: @ 80EF88C movs r0, 0 b _080EF8EE .align 2, 0 -_080EF8E0: .4byte 0x020244ec -_080EF8E4: .4byte 0x02021cc4 -_080EF8E8: .4byte 0x083185c8 + .pool _080EF8EC: movs r0, 0x1 _080EF8EE: @@ -490580,13 +474318,13 @@ sub_80EF9E8: @ 80EF9E8 adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 - ldr r0, _080EFA1C + ldr r0, =0x0858d144 lsls r4, 2 adds r4, r0 ldr r0, [r4] movs r1, 0xB muls r1, r5 - ldr r2, _080EFA20 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy adds r0, r5, 0 @@ -490594,8 +474332,7 @@ sub_80EF9E8: @ 80EF9E8 pop {r1} bx r1 .align 2, 0 -_080EFA1C: .4byte 0x0858d144 -_080EFA20: .4byte 0x083185c8 + .pool thumb_func_end sub_80EF9E8 thumb_func_start sub_80EFA24 @@ -490606,7 +474343,7 @@ sub_80EFA24: @ 80EFA24 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 - ldr r1, _080EFA44 + ldr r1, =0x0000019b bl __umodsi3 adds r0, 0x1 lsls r0, 16 @@ -490614,14 +474351,14 @@ sub_80EFA24: @ 80EFA24 adds r6, r4, 0 b _080EFA62 .align 2, 0 -_080EFA44: .4byte 0x0000019b + .pool _080EFA48: cmp r4, 0x1 bne _080EFA54 - ldr r4, _080EFA50 + ldr r4, =0x0000019b b _080EFA5A .align 2, 0 -_080EFA50: .4byte 0x0000019b + .pool _080EFA54: subs r0, r4, 0x1 lsls r0, 16 @@ -490654,14 +474391,14 @@ _080EFA7E: thumb_func_start sub_80EFA88 sub_80EFA88: @ 80EFA88 push {lr} - ldr r0, _080EFAB8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080EFABC + ldr r1, =0x000027cc adds r0, r1 bl sub_80EFADC - ldr r1, _080EFAC0 + ldr r1, =0x030060bc strb r0, [r1] - ldr r2, _080EFAC4 + ldr r2, =0x020375e4 ldrb r1, [r1] lsls r1, 24 asrs r1, 24 @@ -490672,24 +474409,20 @@ sub_80EFA88: @ 80EFA88 negs r1, r1 cmp r0, r1 bne _080EFACC - ldr r1, _080EFAC8 + ldr r1, =0x020375f0 movs r0, 0x1 b _080EFAD0 .align 2, 0 -_080EFAB8: .4byte 0x03005d8c -_080EFABC: .4byte 0x000027cc -_080EFAC0: .4byte 0x030060bc -_080EFAC4: .4byte 0x020375e4 -_080EFAC8: .4byte 0x020375f0 + .pool _080EFACC: - ldr r1, _080EFAD8 + ldr r1, =0x020375f0 movs r0, 0 _080EFAD0: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_080EFAD8: .4byte 0x020375f0 + .pool thumb_func_end sub_80EFA88 thumb_func_start sub_80EFADC @@ -490785,10 +474518,10 @@ sub_80EFB58: @ 80EFB58 lsls r0, 24 lsrs r2, r0, 24 adds r5, r4, 0x4 - ldr r6, _080EFB74 + ldr r6, =0x0000ffff b _080EFB7E .align 2, 0 -_080EFB74: .4byte 0x0000ffff + .pool _080EFB78: adds r0, r2, 0x1 lsls r0, 24 @@ -490804,7 +474537,7 @@ _080EFB84: adds r3, r4, 0x4 cmp r0, r6 beq _080EFB78 - ldr r0, _080EFBA0 + ldr r0, =0x02021ec4 adds r1, r3, r1 ldrh r1, [r1] bl sub_811EBBC @@ -490812,7 +474545,7 @@ _080EFB84: pop {r0} bx r0 .align 2, 0 -_080EFBA0: .4byte 0x02021ec4 + .pool thumb_func_end sub_80EFB58 thumb_func_start sub_80EFBA4 @@ -490987,7 +474720,7 @@ _080EFCC8: _080EFCD0: movs r0, 0xB muls r4, r0 - ldr r7, _080EFCEC + ldr r7, =0x083185c8 adds r0, r4, r7 bl sub_8008C24 lsls r0, 16 @@ -490998,7 +474731,7 @@ _080EFCD0: adds r1, r5, r4 b _080EFCFA .align 2, 0 -_080EFCEC: .4byte 0x083185c8 + .pool _080EFCF0: cmp r6, 0x1 bne _080EFD02 @@ -491037,7 +474770,7 @@ _080EFD2A: ldrb r0, [r0] strb r0, [r1, 0x1] _080EFD30: - ldr r0, _080EFD50 + ldr r0, =0x0858d144 mov r2, r9 lsls r1, r2, 2 adds r1, r0 @@ -491052,18 +474785,18 @@ _080EFD30: pop {r0} bx r0 .align 2, 0 -_080EFD50: .4byte 0x0858d144 + .pool thumb_func_end sub_80EFBDC thumb_func_start sub_80EFD54 sub_80EFD54: @ 80EFD54 push {r4,lr} movs r1, 0 - ldr r0, _080EFD78 + ldr r0, =0x03005d8c ldr r3, [r0] - ldr r0, _080EFD7C + ldr r0, =0x020375e0 ldrh r2, [r0] - ldr r4, _080EFD80 + ldr r4, =0x000027cc _080EFD62: lsls r0, r1, 3 adds r0, r1 @@ -491076,9 +474809,7 @@ _080EFD62: movs r0, 0x1 b _080EFD90 .align 2, 0 -_080EFD78: .4byte 0x03005d8c -_080EFD7C: .4byte 0x020375e0 -_080EFD80: .4byte 0x000027cc + .pool _080EFD84: adds r0, r1, 0x1 lsls r0, 24 @@ -491095,17 +474826,17 @@ _080EFD90: thumb_func_start sub_80EFD98 sub_80EFD98: @ 80EFD98 push {r4,lr} - ldr r0, _080EFDC4 + ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080EFDC8 + ldr r1, =0x020244ec adds r0, r1 - ldr r4, _080EFDCC + ldr r4, =0x02021cc4 movs r1, 0x2 adds r2, r4, 0 bl pokemon_getattr - ldr r0, _080EFDD0 + ldr r0, =0x02021ec4 adds r1, r4, 0 bl sub_8008C44 cmp r0, 0 @@ -491114,10 +474845,7 @@ sub_80EFD98: @ 80EFD98 movs r0, 0x1 b _080EFDD6 .align 2, 0 -_080EFDC4: .4byte 0x020375e0 -_080EFDC8: .4byte 0x020244ec -_080EFDCC: .4byte 0x02021cc4 -_080EFDD0: .4byte 0x02021ec4 + .pool _080EFDD4: movs r0, 0 _080EFDD6: @@ -491134,7 +474862,7 @@ sub_80EFDDC: @ 80EFDDC mov r4, r8 push {r4-r6} sub sp, 0x8 - ldr r0, _080EFE84 + ldr r0, =0x020375e0 mov r9, r0 ldrh r0, [r0] movs r1, 0x64 @@ -491142,9 +474870,9 @@ sub_80EFDDC: @ 80EFDDC mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r6, _080EFE88 + ldr r6, =0x020244ec adds r0, r6 - ldr r2, _080EFE8C + ldr r2, =0x02021ec4 movs r1, 0x2 bl pokemon_getattr mov r1, r9 @@ -491153,7 +474881,7 @@ sub_80EFDDC: @ 80EFDDC muls r1, r0 adds r0, r1, 0 adds r0, r6 - ldr r1, _080EFE90 + ldr r1, =0x02021dc4 mov r10, r1 movs r1, 0x2 mov r2, r10 @@ -491190,7 +474918,7 @@ sub_80EFDDC: @ 80EFDDC movs r2, 0 bl pokemon_getattr str r0, [sp] - ldr r0, _080EFE94 + ldr r0, =c2_080CC144 + 1 str r0, [sp, 0x4] movs r0, 0x3 mov r1, r10 @@ -491206,32 +474934,26 @@ sub_80EFDDC: @ 80EFDDC pop {r0} bx r0 .align 2, 0 -_080EFE84: .4byte 0x020375e0 -_080EFE88: .4byte 0x020244ec -_080EFE8C: .4byte 0x02021ec4 -_080EFE90: .4byte 0x02021dc4 -_080EFE94: .4byte c2_080CC144 + 1 + .pool thumb_func_end sub_80EFDDC thumb_func_start c2_080CC144 c2_080CC144: @ 80EFE98 push {lr} - ldr r0, _080EFEB8 + ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080EFEBC + ldr r1, =0x020244ec adds r0, r1 - ldr r2, _080EFEC0 + ldr r2, =0x02021dc4 movs r1, 0x2 bl pokemon_setattr bl c2_exit_to_overworld_1_continue_scripts_restart_music pop {r0} bx r0 .align 2, 0 -_080EFEB8: .4byte 0x020375e0 -_080EFEBC: .4byte 0x020244ec -_080EFEC0: .4byte 0x02021dc4 + .pool thumb_func_end c2_080CC144 thumb_func_start sub_80EFEC4 @@ -491240,16 +474962,16 @@ sub_80EFEC4: @ 80EFEC4 mov r6, r8 push {r6} sub sp, 0x8 - ldr r0, _080EFF34 + ldr r0, =0x020375f6 ldrb r0, [r0] - ldr r1, _080EFF38 + ldr r1, =0x020375f8 ldrb r1, [r1] bl get_pokemon_by_box_and_pos adds r6, r0, 0 - ldr r2, _080EFF3C + ldr r2, =0x02021ec4 movs r1, 0x2 bl pokemon_getattr_encrypted - ldr r0, _080EFF40 + ldr r0, =0x02021dc4 mov r8, r0 adds r0, r6, 0 movs r1, 0x2 @@ -491272,7 +474994,7 @@ sub_80EFEC4: @ 80EFEC4 movs r2, 0 bl pokemon_getattr_encrypted str r0, [sp] - ldr r0, _080EFF44 + ldr r0, =sub_80EFF48 + 1 str r0, [sp, 0x4] movs r0, 0x3 mov r1, r8 @@ -491286,41 +475008,35 @@ sub_80EFEC4: @ 80EFEC4 pop {r0} bx r0 .align 2, 0 -_080EFF34: .4byte 0x020375f6 -_080EFF38: .4byte 0x020375f8 -_080EFF3C: .4byte 0x02021ec4 -_080EFF40: .4byte 0x02021dc4 -_080EFF44: .4byte sub_80EFF48 + 1 + .pool thumb_func_end sub_80EFEC4 thumb_func_start sub_80EFF48 sub_80EFF48: @ 80EFF48 push {lr} - ldr r0, _080EFF60 + ldr r0, =0x020375f6 ldrb r0, [r0] - ldr r1, _080EFF64 + ldr r1, =0x020375f8 ldrb r1, [r1] - ldr r2, _080EFF68 + ldr r2, =0x02021dc4 bl sub_80D1E90 bl c2_exit_to_overworld_1_continue_scripts_restart_music pop {r0} bx r0 .align 2, 0 -_080EFF60: .4byte 0x020375f6 -_080EFF64: .4byte 0x020375f8 -_080EFF68: .4byte 0x02021dc4 + .pool thumb_func_end sub_80EFF48 thumb_func_start sub_80EFF6C sub_80EFF6C: @ 80EFF6C push {r4,lr} - ldr r0, _080EFF90 + ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080EFF94 + ldr r1, =0x020244ec adds r0, r1 - ldr r4, _080EFF98 + ldr r4, =0x02021cc4 movs r1, 0x2 adds r2, r4, 0 bl pokemon_getattr @@ -491330,9 +475046,7 @@ sub_80EFF6C: @ 80EFF6C pop {r0} bx r0 .align 2, 0 -_080EFF90: .4byte 0x020375e0 -_080EFF94: .4byte 0x020244ec -_080EFF98: .4byte 0x02021cc4 + .pool thumb_func_end sub_80EFF6C thumb_func_start sub_80EFF9C @@ -491340,26 +475054,24 @@ sub_80EFF9C: @ 80EFF9C push {r4,lr} bl sub_80F0020 adds r4, r0, 0 - ldr r0, _080EFFC4 + ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080EFFC8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 movs r2, 0 bl pokemon_getattr cmp r4, r0 bne _080EFFD0 - ldr r1, _080EFFCC + ldr r1, =0x020375f0 movs r0, 0 b _080EFFD4 .align 2, 0 -_080EFFC4: .4byte 0x020375e0 -_080EFFC8: .4byte 0x020244ec -_080EFFCC: .4byte 0x020375f0 + .pool _080EFFD0: - ldr r1, _080EFFDC + ldr r1, =0x020375f0 movs r0, 0x1 _080EFFD4: strh r0, [r1] @@ -491367,7 +475079,7 @@ _080EFFD4: pop {r0} bx r0 .align 2, 0 -_080EFFDC: .4byte 0x020375f0 + .pool thumb_func_end sub_80EFF9C thumb_func_start sub_80EFFE0 @@ -491413,7 +475125,7 @@ _080F001C: thumb_func_start sub_80F0020 sub_80F0020: @ 80F0020 - ldr r0, _080F003C + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r0, [r2, 0xD] lsls r0, 24 @@ -491427,19 +475139,19 @@ sub_80F0020: @ 80F0020 orrs r0, r1 bx lr .align 2, 0 -_080F003C: .4byte 0x03005d90 + .pool thumb_func_end sub_80F0020 thumb_func_start sub_80F0040 sub_80F0040: @ 80F0040 push {lr} - ldr r0, _080F0064 + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] cmp r0, 0x1 bne _080F0060 - ldr r0, _080F0068 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 @@ -491452,15 +475164,14 @@ _080F0060: movs r0, 0 b _080F009E .align 2, 0 -_080F0064: .4byte 0x03005d8c -_080F0068: .4byte 0x03005d90 + .pool _080F006C: movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, 0x2 bne _080F0060 _080F0074: - ldr r0, _080F0098 + ldr r0, =0x000008bd bl flag_check lsls r0, 24 lsrs r0, 24 @@ -491477,7 +475188,7 @@ _080F0092: movs r0, 0x1 b _080F009E .align 2, 0 -_080F0098: .4byte 0x000008bd + .pool _080F009C: movs r0, 0x2 _080F009E: @@ -491488,13 +475199,13 @@ _080F009E: thumb_func_start sub_80F00A4 sub_80F00A4: @ 80F00A4 push {r4,lr} - ldr r0, _080F00D8 + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] cmp r0, 0x1 bne _080F0104 - ldr r0, _080F00DC + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 @@ -491503,32 +475214,28 @@ sub_80F00A4: @ 80F00A4 ldrsb r0, [r1, r0] cmp r0, 0 bne _080F0104 - ldr r0, _080F00E0 - ldr r1, _080F00E4 + ldr r0, =0x02021cc4 + ldr r1, =0x085ead08 bl gf_strcpy - ldr r0, _080F00E8 + ldr r0, =0x00004003 movs r1, 0x1 bl var_set b _080F0104 .align 2, 0 -_080F00D8: .4byte 0x03005d8c -_080F00DC: .4byte 0x03005d90 -_080F00E0: .4byte 0x02021cc4 -_080F00E4: .4byte 0x085ead08 -_080F00E8: .4byte 0x00004003 + .pool _080F00EC: movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, 0x2 bne _080F0104 - ldr r0, _080F014C - ldr r1, _080F0150 + ldr r0, =0x02021cc4 + ldr r1, =0x085ead08 bl gf_strcpy - ldr r0, _080F0154 + ldr r0, =0x00004003 movs r1, 0x1 bl var_set _080F0104: - ldr r4, _080F0154 + ldr r4, =0x00004003 adds r0, r4, 0 bl var_get lsls r0, 16 @@ -491556,22 +475263,19 @@ _080F0104: cmp r0, 0 bne _080F0158 _080F0142: - ldr r0, _080F014C - ldr r1, _080F0150 + ldr r0, =0x02021cc4 + ldr r1, =0x085ead08 bl gf_strcpy b _080F01A8 .align 2, 0 -_080F014C: .4byte 0x02021cc4 -_080F0150: .4byte 0x085ead08 -_080F0154: .4byte 0x00004003 + .pool _080F0158: - ldr r0, _080F0164 - ldr r1, _080F0168 + ldr r0, =0x02021cc4 + ldr r1, =0x085ead04 bl gf_strcpy b _080F01A8 .align 2, 0 -_080F0164: .4byte 0x02021cc4 -_080F0168: .4byte 0x085ead04 + .pool _080F016C: bl GenerateRandomNumber lsls r0, 16 @@ -491580,19 +475284,18 @@ _080F016C: ands r0, r1 cmp r0, 0 beq _080F0198 - ldr r0, _080F0190 - ldr r1, _080F0194 + ldr r0, =0x02021cc4 + ldr r1, =0x085ead08 bl gf_strcpy adds r0, r4, 0 movs r1, 0x1 bl var_set b _080F01A8 .align 2, 0 -_080F0190: .4byte 0x02021cc4 -_080F0194: .4byte 0x085ead08 + .pool _080F0198: - ldr r0, _080F01B0 - ldr r1, _080F01B4 + ldr r0, =0x02021cc4 + ldr r1, =0x085ead04 bl gf_strcpy adds r0, r4, 0 movs r1, 0x2 @@ -491602,30 +475305,27 @@ _080F01A8: pop {r0} bx r0 .align 2, 0 -_080F01B0: .4byte 0x02021cc4 -_080F01B4: .4byte 0x085ead04 + .pool thumb_func_end sub_80F00A4 thumb_func_start start_menu_append_item start_menu_append_item: @ 80F01B8 push {lr} - ldr r0, _080F01DC + ldr r0, =0x000040bc movs r1, 0 bl var_set - ldr r0, _080F01E0 + ldr r0, =0x03005d8c ldr r0, [r0] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] movs r0, 0x5 bl npc_hide_by_local_id_and_map - ldr r0, _080F01E4 + ldr r0, =0x00000396 bl flag_set pop {r0} bx r0 .align 2, 0 -_080F01DC: .4byte 0x000040bc -_080F01E0: .4byte 0x03005d8c -_080F01E4: .4byte 0x00000396 + .pool thumb_func_end start_menu_append_item thumb_func_start sub_80F01E8 @@ -491666,10 +475366,10 @@ _080F0208: bls _080F0208 mov r5, r8 movs r4, 0 - ldr r7, _080F0234 + ldr r7, =0x020229e8 b _080F0276 .align 2, 0 -_080F0234: .4byte 0x020229e8 + .pool _080F0238: lsls r0, r4, 3 subs r2, r0, r4 @@ -491722,9 +475422,9 @@ _080F0290: beq _080F0304 b _080F031E _080F029A: - ldr r0, _080F02B8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080F02BC + ldr r1, =0x000027cc adds r0, r1 movs r2, 0xE1 lsls r2, 2 @@ -491732,44 +475432,39 @@ _080F029A: movs r3, 0xE1 lsls r3, 3 adds r2, r5, r3 - ldr r4, _080F02C0 + ldr r4, =0x00000a8c adds r3, r5, r4 bl sub_80F0358 b _080F031E .align 2, 0 -_080F02B8: .4byte 0x03005d8c -_080F02BC: .4byte 0x000027cc -_080F02C0: .4byte 0x00000a8c + .pool _080F02C4: - ldr r0, _080F02D4 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _080F02D8 + ldr r0, =0x000027cc adds r1, r0 movs r3, 0xE1 lsls r3, 3 adds r2, r5, r3 b _080F02EA .align 2, 0 -_080F02D4: .4byte 0x03005d8c -_080F02D8: .4byte 0x000027cc + .pool _080F02DC: movs r0, 0xE1 lsls r0, 2 adds r1, r5, r0 - ldr r0, _080F02F8 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r3, _080F02FC + ldr r3, =0x000027cc adds r2, r3 _080F02EA: - ldr r4, _080F0300 + ldr r4, =0x00000a8c adds r3, r5, r4 adds r0, r5, 0 bl sub_80F0358 b _080F031E .align 2, 0 -_080F02F8: .4byte 0x03005d8c -_080F02FC: .4byte 0x000027cc -_080F0300: .4byte 0x00000a8c + .pool _080F0304: movs r0, 0xE1 lsls r0, 2 @@ -491777,16 +475472,16 @@ _080F0304: movs r3, 0xE1 lsls r3, 3 adds r2, r5, r3 - ldr r0, _080F0350 + ldr r0, =0x03005d8c ldr r3, [r0] - ldr r4, _080F0354 + ldr r4, =0x000027cc adds r3, r4 adds r0, r5, 0 bl sub_80F0358 _080F031E: - ldr r5, _080F0350 + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r4, _080F0354 + ldr r4, =0x000027cc adds r0, r4 bl sub_80EF93C bl sub_80F0C04 @@ -491804,8 +475499,7 @@ _080F0344: pop {r0} bx r0 .align 2, 0 -_080F0350: .4byte 0x03005d8c -_080F0354: .4byte 0x000027cc + .pool thumb_func_end sub_80F01E8 thumb_func_start sub_80F0358 @@ -491829,11 +475523,11 @@ sub_80F0358: @ 80F0358 add r0, sp, 0x1C str r0, [sp, 0xC] bl sub_8009FCC - ldr r1, _080F03D4 + ldr r1, =0x03001174 strb r0, [r1] _080F0384: movs r6, 0 - ldr r0, _080F03D4 + ldr r0, =0x03001174 ldrb r1, [r0] cmp r6, r1 bcs _080F0384 @@ -491841,7 +475535,7 @@ _080F0384: _080F0390: cmp r6, 0 bne _080F0398 - ldr r2, _080F03D8 + ldr r2, =0x0203a02c strb r6, [r2] _080F0398: lsls r4, r6, 2 @@ -491850,7 +475544,7 @@ _080F0398: ldr r0, [r0] ldr r0, [r0] bl sub_80F06D0 - ldr r1, _080F03DC + ldr r1, =0x03001176 strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -491859,7 +475553,7 @@ _080F0398: adds r7, r4, 0 cmp r0, r1 bne _080F03E0 - ldr r1, _080F03D8 + ldr r1, =0x0203a02c ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -491873,9 +475567,7 @@ _080F0398: mov r9, r6 b _080F0470 .align 2, 0 -_080F03D4: .4byte 0x03001174 -_080F03D8: .4byte 0x0203a02c -_080F03DC: .4byte 0x03001176 + .pool _080F03E0: movs r5, 0 mov r3, r10 @@ -491885,7 +475577,7 @@ _080F03E0: mov r9, r2 cmp r5, r0 bge _080F0456 - ldr r3, _080F0480 + ldr r3, =0x03001174 mov r8, r3 _080F03F4: adds r0, r6, r5 @@ -491899,7 +475591,7 @@ _080F03F4: ldr r0, [r0] ldr r0, [r0] bl sub_80EFB08 - ldr r1, _080F0484 + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -491944,7 +475636,7 @@ _080F0456: adds r0, r3, r7 ldr r0, [r0] ldr r0, [r0] - ldr r1, _080F0488 + ldr r1, =0x03001176 ldrb r1, [r1] bl sub_80EF910 _080F0470: @@ -491957,9 +475649,7 @@ _080F0470: bcc _080F0390 b _080F0384 .align 2, 0 -_080F0480: .4byte 0x03001174 -_080F0484: .4byte 0x030060bc -_080F0488: .4byte 0x03001176 + .pool _080F048C: add sp, 0x20 pop {r3-r5} @@ -491980,7 +475670,7 @@ sub_80F049C: @ 80F049C ldr r4, [r0] ldr r6, [r1] movs r5, 0 - ldr r2, _080F04D8 + ldr r2, =0x03001176 movs r1, 0 ldrsb r1, [r2, r1] lsls r0, r1, 3 @@ -492002,13 +475692,13 @@ sub_80F049C: @ 80F049C beq _080F04E2 b _080F055A .align 2, 0 -_080F04D8: .4byte 0x03001176 + .pool _080F04DC: cmp r1, 0x4 beq _080F0534 b _080F055A _080F04E2: - ldr r0, _080F0508 + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 @@ -492026,9 +475716,9 @@ _080F04E2: bl sub_80F0580 b _080F0556 .align 2, 0 -_080F0508: .4byte 0x030060bc + .pool _080F050C: - ldr r0, _080F0530 + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 @@ -492046,9 +475736,9 @@ _080F050C: bl sub_80F05E8 b _080F0556 .align 2, 0 -_080F0530: .4byte 0x030060bc + .pool _080F0534: - ldr r0, _080F0564 + ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] lsls r0, r1, 3 @@ -492073,9 +475763,9 @@ _080F055A: movs r0, 0 b _080F0574 .align 2, 0 -_080F0564: .4byte 0x030060bc + .pool _080F0568: - ldr r0, _080F057C + ldr r0, =0x03001176 ldrb r1, [r0] adds r0, r6, 0 bl sub_80EF910 @@ -492086,7 +475776,7 @@ _080F0574: pop {r1} bx r1 .align 2, 0 -_080F057C: .4byte 0x03001176 + .pool thumb_func_end sub_80F049C thumb_func_start sub_80F0580 @@ -492317,14 +476007,14 @@ sub_80F0708: @ 80F0708 movs r0, 0 mov r9, r0 _080F0716: - ldr r3, _080F073C + ldr r3, =0x03005d8c ldr r1, [r3] mov r4, r9 lsls r2, r4, 3 adds r0, r2, r4 lsls r0, 2 adds r1, r0 - ldr r0, _080F0740 + ldr r0, =0x000027cc adds r1, r0 ldrb r0, [r1] adds r7, r2, 0 @@ -492333,14 +476023,12 @@ _080F0716: b _080F0AD8 _080F0732: lsls r0, 2 - ldr r1, _080F0744 + ldr r1, =_080F0748 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F073C: .4byte 0x03005d8c -_080F0740: .4byte 0x000027cc -_080F0744: .4byte _080F0748 + .pool .align 2, 0 _080F0748: .4byte _080F0AE2 @@ -492391,7 +476079,7 @@ _080F07F0: adds r4, r7, r1 lsls r4, 2 adds r0, r4, r0 - ldr r6, _080F0818 + ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0x12] lsls r5, r1, 24 @@ -492406,14 +476094,14 @@ _080F07F0: ldrh r0, [r4, 0x2] b _080F09E6 .align 2, 0 -_080F0818: .4byte 0x000027cc + .pool _080F081C: ldr r0, [r3] mov r2, r9 adds r4, r7, r2 lsls r4, 2 adds r0, r4, r0 - ldr r6, _080F0844 + ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0x16] lsls r5, r2, 24 @@ -492428,52 +476116,52 @@ _080F081C: ldrh r0, [r4, 0x2] b _080F09E6 .align 2, 0 -_080F0844: .4byte 0x000027cc + .pool _080F0848: ldr r0, [r3] mov r4, r9 adds r1, r7, r4 lsls r1, 2 adds r1, r0 - ldr r0, _080F085C + ldr r0, =0x000027cc adds r1, r0 ldrh r0, [r1, 0x2] b _080F09B0 .align 2, 0 -_080F085C: .4byte 0x000027cc + .pool _080F0860: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 lsls r1, 2 adds r1, r0 - ldr r4, _080F0874 + ldr r4, =0x000027cc adds r1, r4 ldrh r0, [r1, 0x2] lsls r1, r2, 24 b _080F09B2 .align 2, 0 -_080F0874: .4byte 0x000027cc + .pool _080F0878: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 lsls r1, 2 adds r1, r0 - ldr r4, _080F088C + ldr r4, =0x000027cc adds r1, r4 ldrh r0, [r1, 0x6] lsls r1, r2, 24 b _080F09B2 .align 2, 0 -_080F088C: .4byte 0x000027cc + .pool _080F0890: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 lsls r4, 2 adds r0, r4, r0 - ldr r6, _080F08B8 + ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0x2] lsls r5, r1, 24 @@ -492488,27 +476176,27 @@ _080F0890: ldrh r0, [r4, 0x1C] b _080F09E6 .align 2, 0 -_080F08B8: .4byte 0x000027cc + .pool _080F08BC: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 lsls r1, 2 adds r1, r0 - ldr r4, _080F08D0 + ldr r4, =0x000027cc adds r1, r4 ldrh r0, [r1, 0x2] lsls r1, r2, 24 b _080F09B2 .align 2, 0 -_080F08D0: .4byte 0x000027cc + .pool _080F08D4: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 lsls r4, 2 adds r0, r4, r0 - ldr r6, _080F08FC + ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0xA] lsls r5, r1, 24 @@ -492523,27 +476211,27 @@ _080F08D4: ldrh r0, [r4, 0x14] b _080F09E6 .align 2, 0 -_080F08FC: .4byte 0x000027cc + .pool _080F0900: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 lsls r1, 2 adds r1, r0 - ldr r4, _080F0914 + ldr r4, =0x000027cc adds r1, r4 ldrh r0, [r1, 0x10] lsls r1, r2, 24 b _080F09B2 .align 2, 0 -_080F0914: .4byte 0x000027cc + .pool _080F0918: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 lsls r4, 2 adds r0, r4, r0 - ldr r6, _080F0940 + ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0xC] lsls r5, r1, 24 @@ -492558,39 +476246,39 @@ _080F0918: ldrh r0, [r4, 0xE] b _080F09E6 .align 2, 0 -_080F0940: .4byte 0x000027cc + .pool _080F0944: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 lsls r1, 2 adds r1, r0 - ldr r4, _080F0958 + ldr r4, =0x000027cc adds r1, r4 ldrh r0, [r1, 0x4] lsls r1, r2, 24 b _080F09B2 .align 2, 0 -_080F0958: .4byte 0x000027cc + .pool _080F095C: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 lsls r4, 2 adds r0, r4, r0 - ldr r6, _080F0970 + ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0x8] b _080F09D0 .align 2, 0 -_080F0970: .4byte 0x000027cc + .pool _080F0974: ldr r0, [r3] mov r2, r9 adds r4, r7, r2 lsls r4, 2 adds r0, r4, r0 - ldr r6, _080F099C + ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0x2] lsls r5, r2, 24 @@ -492605,14 +476293,14 @@ _080F0974: ldrh r0, [r4, 0xA] b _080F09E6 .align 2, 0 -_080F099C: .4byte 0x000027cc + .pool _080F09A0: ldr r0, [r3] mov r4, r9 adds r1, r7, r4 lsls r1, 2 adds r1, r0 - ldr r0, _080F09BC + ldr r0, =0x000027cc adds r1, r0 ldrh r0, [r1, 0x8] _080F09B0: @@ -492622,14 +476310,14 @@ _080F09B2: bl sub_80F0B24 b _080F0AE2 .align 2, 0 -_080F09BC: .4byte 0x000027cc + .pool _080F09C0: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 lsls r4, 2 adds r0, r4, r0 - ldr r6, _080F09F0 + ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0x6] _080F09D0: @@ -492648,14 +476336,14 @@ _080F09E6: bl sub_80F0B24 b _080F0AE2 .align 2, 0 -_080F09F0: .4byte 0x000027cc + .pool _080F09F4: ldr r0, [r3] mov r2, r9 adds r4, r7, r2 lsls r4, 2 adds r0, r4, r0 - ldr r5, _080F0A40 + ldr r5, =0x000027cc adds r0, r5 ldrh r0, [r0, 0x4] lsls r2, 24 @@ -492681,13 +476369,12 @@ _080F09F4: cmp r0, 0xC bhi _080F0AE2 lsls r0, 2 - ldr r1, _080F0A44 + ldr r1, =_080F0A48 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F0A40: .4byte 0x000027cc -_080F0A44: .4byte _080F0A48 + .pool .align 2, 0 _080F0A48: .4byte _080F0A7C @@ -492704,29 +476391,28 @@ _080F0A48: .4byte _080F0A7C .4byte _080F0A7C _080F0A7C: - ldr r0, _080F0A98 + ldr r0, =0x03005d8c ldr r1, [r0] mov r4, r9 adds r0, r7, r4 lsls r0, 2 adds r0, r1 - ldr r1, _080F0A9C + ldr r1, =0x000027cc adds r0, r1 ldrh r0, [r0, 0x8] lsrs r1, r6, 24 bl sub_80F0B24 b _080F0AE2 .align 2, 0 -_080F0A98: .4byte 0x03005d8c -_080F0A9C: .4byte 0x000027cc + .pool _080F0AA0: - ldr r2, _080F0AD0 + ldr r2, =0x03005d8c ldr r0, [r2] mov r1, r9 adds r4, r7, r1 lsls r4, 2 adds r0, r4, r0 - ldr r5, _080F0AD4 + ldr r5, =0x000027cc adds r0, r5 ldrh r0, [r0, 0x8] lsrs r6, 24 @@ -492742,8 +476428,7 @@ _080F0AA0: bl sub_80F0B24 b _080F0AE2 .align 2, 0 -_080F0AD0: .4byte 0x03005d8c -_080F0AD4: .4byte 0x000027cc + .pool _080F0AD8: mov r2, r9 lsls r0, r2, 24 @@ -492772,20 +476457,19 @@ _080F0AF2: sub_80F0B00: @ 80F0B00 lsls r0, 24 lsrs r0, 24 - ldr r1, _080F0B1C + ldr r1, =0x03005d8c ldr r2, [r1] lsls r1, r0, 3 adds r1, r0 lsls r1, 2 adds r2, r1 - ldr r0, _080F0B20 + ldr r0, =0x000027cd adds r2, r0 movs r0, 0 strb r0, [r2] bx lr .align 2, 0 -_080F0B1C: .4byte 0x03005d8c -_080F0B20: .4byte 0x000027cd + .pool thumb_func_end sub_80F0B00 thumb_func_start sub_80F0B24 @@ -492804,13 +476488,13 @@ sub_80F0B24: @ 80F0B24 asrs r2, r0, 24 cmp r2, 0 bne _080F0B56 - ldr r0, _080F0B5C + ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r4, 3 adds r0, r4 lsls r0, 2 adds r1, r0 - ldr r0, _080F0B60 + ldr r0, =0x000027cd adds r1, r0 strb r2, [r1] _080F0B56: @@ -492818,30 +476502,29 @@ _080F0B56: pop {r0} bx r0 .align 2, 0 -_080F0B5C: .4byte 0x03005d8c -_080F0B60: .4byte 0x000027cd + .pool thumb_func_end sub_80F0B24 thumb_func_start sub_80F0B64 sub_80F0B64: @ 80F0B64 push {r4-r6,lr} - ldr r0, _080F0BA8 + ldr r0, =0x00000864 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080F0BA2 movs r2, 0 - ldr r4, _080F0BAC + ldr r4, =0x000027cd movs r3, 0 - ldr r5, _080F0BB0 + ldr r5, =0x03005d8c _080F0B7C: ldr r0, [r5] lsls r1, r2, 3 adds r1, r2 lsls r1, 2 adds r1, r0, r1 - ldr r6, _080F0BB4 + ldr r6, =0x000027cc adds r0, r1, r6 ldrb r0, [r0] cmp r0, 0x7 @@ -492862,24 +476545,21 @@ _080F0BA2: pop {r0} bx r0 .align 2, 0 -_080F0BA8: .4byte 0x00000864 -_080F0BAC: .4byte 0x000027cd -_080F0BB0: .4byte 0x03005d8c -_080F0BB4: .4byte 0x000027cc + .pool thumb_func_end sub_80F0B64 thumb_func_start sub_80F0BB8 sub_80F0BB8: @ 80F0BB8 push {r4-r6,lr} movs r5, 0 - ldr r6, _080F0BF8 + ldr r6, =0x03005d8c _080F0BBE: ldr r1, [r6] lsls r0, r5, 3 adds r0, r5 lsls r4, r0, 2 adds r1, r4 - ldr r0, _080F0BFC + ldr r0, =0x000027cc adds r1, r0 ldrb r0, [r1] bl sub_80EFFE0 @@ -492889,7 +476569,7 @@ _080F0BBE: bne _080F0BE6 ldr r0, [r6] adds r0, r4 - ldr r1, _080F0C00 + ldr r1, =0x000027cd adds r0, r1 movs r1, 0 strb r1, [r0] @@ -492903,9 +476583,7 @@ _080F0BE6: pop {r0} bx r0 .align 2, 0 -_080F0BF8: .4byte 0x03005d8c -_080F0BFC: .4byte 0x000027cc -_080F0C00: .4byte 0x000027cd + .pool thumb_func_end sub_80F0BB8 thumb_func_start sub_80F0C04 @@ -492913,9 +476591,9 @@ sub_80F0C04: @ 80F0C04 push {r4,r5,lr} movs r3, 0 movs r2, 0x5 - ldr r0, _080F0C74 + ldr r0, =0x03005d8c ldr r4, [r0] - ldr r5, _080F0C78 + ldr r5, =0x000027cc _080F0C10: lsls r0, r2, 24 asrs r1, r0, 24 @@ -492948,9 +476626,9 @@ _080F0C2E: bge _080F0C6E adds r5, r0, 0 _080F0C4A: - ldr r0, _080F0C74 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080F0C78 + ldr r1, =0x000027cc adds r0, r1 lsls r1, r2, 24 asrs r4, r1, 24 @@ -492970,8 +476648,7 @@ _080F0C6E: pop {r0} bx r0 .align 2, 0 -_080F0C74: .4byte 0x03005d8c -_080F0C78: .4byte 0x000027cc + .pool thumb_func_end sub_80F0C04 thumb_func_start sub_80F0C7C @@ -493017,9 +476694,9 @@ _080F0CC2: beq _080F0D28 b _080F0D3E _080F0CCC: - ldr r0, _080F0CE8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080F0CEC + ldr r1, =0x00002b50 adds r0, r1 adds r1, r5, 0 adds r1, 0x40 @@ -493030,25 +476707,23 @@ _080F0CCC: bl sub_80F0D60 b _080F0D3E .align 2, 0 -_080F0CE8: .4byte 0x03005d8c -_080F0CEC: .4byte 0x00002b50 + .pool _080F0CF0: - ldr r0, _080F0D00 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _080F0D04 + ldr r0, =0x00002b50 adds r1, r0 adds r2, r5, 0 adds r2, 0x80 b _080F0D14 .align 2, 0 -_080F0D00: .4byte 0x03005d8c -_080F0D04: .4byte 0x00002b50 + .pool _080F0D08: adds r1, r5, 0 adds r1, 0x40 - ldr r0, _080F0D20 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r0, _080F0D24 + ldr r0, =0x00002b50 adds r2, r0 _080F0D14: adds r3, r5, 0 @@ -493057,16 +476732,15 @@ _080F0D14: bl sub_80F0D60 b _080F0D3E .align 2, 0 -_080F0D20: .4byte 0x03005d8c -_080F0D24: .4byte 0x00002b50 + .pool _080F0D28: adds r1, r5, 0 adds r1, 0x40 adds r2, r5, 0 adds r2, 0x80 - ldr r0, _080F0D58 + ldr r0, =0x03005d8c ldr r3, [r0] - ldr r0, _080F0D5C + ldr r0, =0x00002b50 adds r3, r0 adds r0, r5, 0 bl sub_80F0D60 @@ -493082,8 +476756,7 @@ _080F0D4C: pop {r0} bx r0 .align 2, 0 -_080F0D58: .4byte 0x03005d8c -_080F0D5C: .4byte 0x00002b50 + .pool thumb_func_end sub_80F0C7C thumb_func_start sub_80F0D60 @@ -493107,7 +476780,7 @@ sub_80F0D60: @ 80F0D60 add r0, sp, 0x1C str r0, [sp, 0xC] bl sub_8009FCC - ldr r1, _080F0D9C + ldr r1, =0x03001175 strb r0, [r1] movs r0, 0 mov r10, r0 @@ -493118,7 +476791,7 @@ _080F0D90: str r1, [sp, 0x20] b _080F0E28 .align 2, 0 -_080F0D9C: .4byte 0x03001175 + .pool _080F0DA0: lsls r4, r7, 2 mov r1, sp @@ -493127,7 +476800,7 @@ _080F0DA0: ldr r0, [r0] mov r1, r10 bl sub_80F0ECC - ldr r1, _080F0E4C + ldr r1, =0x03001176 strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -493139,7 +476812,7 @@ _080F0DA0: cmp r0, r1 beq _080F0E22 movs r5, 0 - ldr r1, _080F0E50 + ldr r1, =0x03001175 ldrb r0, [r1] subs r0, 0x1 cmp r5, r0 @@ -493156,7 +476829,7 @@ _080F0DD4: ldr r0, [r0] ldr r0, [r0] bl sub_80EEE30 - ldr r1, _080F0E54 + ldr r1, =0x030060bc strb r0, [r1] lsls r0, 24 asrs r0, 24 @@ -493187,7 +476860,7 @@ _080F0E22: lsls r0, r1, 24 lsrs r7, r0, 24 _080F0E28: - ldr r0, _080F0E50 + ldr r0, =0x03001175 ldrb r0, [r0] cmp r7, r0 bcc _080F0DA0 @@ -493206,9 +476879,7 @@ _080F0E28: pop {r0} bx r0 .align 2, 0 -_080F0E4C: .4byte 0x03001176 -_080F0E50: .4byte 0x03001175 -_080F0E54: .4byte 0x030060bc + .pool thumb_func_end sub_80F0D60 thumb_func_start sub_80F0E58 @@ -493216,13 +476887,13 @@ sub_80F0E58: @ 80F0E58 push {lr} ldr r0, [r0] ldr r1, [r1] - ldr r2, _080F0E7C + ldr r2, =0x03001176 ldrb r2, [r2] lsls r2, 24 asrs r2, 24 lsls r2, 2 adds r1, r2 - ldr r2, _080F0E80 + ldr r2, =0x030060bc ldrb r2, [r2] lsls r2, 24 asrs r2, 24 @@ -493230,8 +476901,7 @@ sub_80F0E58: @ 80F0E58 pop {r0} bx r0 .align 2, 0 -_080F0E7C: .4byte 0x03001176 -_080F0E80: .4byte 0x030060bc + .pool thumb_func_end sub_80F0E58 thumb_func_start sub_80F0E84 @@ -493304,11 +476974,11 @@ sub_80F0EEC: @ 80F0EEC push {r4,lr} movs r4, 0 _080F0EF0: - ldr r0, _080F0F1C + ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r4, 2 adds r0, r1 - ldr r1, _080F0F20 + ldr r1, =0x00002b50 adds r0, r1 ldrb r0, [r0] cmp r0, 0x4 @@ -493326,22 +476996,21 @@ _080F0F08: pop {r0} bx r0 .align 2, 0 -_080F0F1C: .4byte 0x03005d8c -_080F0F20: .4byte 0x00002b50 + .pool thumb_func_end sub_80F0EEC thumb_func_start sub_80F0F24 sub_80F0F24: @ 80F0F24 push {r4,r5,lr} - ldr r0, _080F0F58 + ldr r0, =0x00000864 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _080F0F50 movs r2, 0 - ldr r5, _080F0F5C - ldr r4, _080F0F60 + ldr r5, =0x03005d8c + ldr r4, =0x00002b51 movs r3, 0 _080F0F3C: ldr r0, [r5] @@ -493359,9 +477028,7 @@ _080F0F50: pop {r0} bx r0 .align 2, 0 -_080F0F58: .4byte 0x00000864 -_080F0F5C: .4byte 0x03005d8c -_080F0F60: .4byte 0x00002b51 + .pool thumb_func_end sub_80F0F24 thumb_func_start sub_80F0F64 @@ -493386,12 +477053,12 @@ _080F0F74: b _080F11F4 _080F0F88: lsls r0, r1, 2 - ldr r1, _080F0F94 + ldr r1, =_080F0F98 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F0F94: .4byte _080F0F98 + .pool .align 2, 0 _080F0F98: .4byte _080F103C @@ -493802,12 +477469,12 @@ _080F12B6: b _080F14E2 _080F12C0: lsls r0, 2 - ldr r1, _080F12CC + ldr r1, =_080F12D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F12CC: .4byte _080F12D0 + .pool .align 2, 0 _080F12D0: .4byte _080F1374 @@ -494090,15 +477757,15 @@ _080F152C: thumb_func_start sub_80F153C sub_80F153C: @ 80F153C push {lr} - ldr r0, _080F1574 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r0, _080F1578 + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 adds r2, r0 - ldr r1, _080F157C + ldr r1, =0x000027cd adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 @@ -494114,15 +477781,12 @@ _080F155A: b _080F16E6 _080F1568: lsls r0, 2 - ldr r1, _080F1580 + ldr r1, =_080F1584 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F1574: .4byte 0x03005d8c -_080F1578: .4byte 0x020375e0 -_080F157C: .4byte 0x000027cd -_080F1580: .4byte _080F1584 + .pool .align 2, 0 _080F1584: .4byte _080F1628 @@ -494269,37 +477933,32 @@ _080F16E6: thumb_func_start sub_80F16EC sub_80F16EC: @ 80F16EC push {r4,r5,lr} - ldr r2, _080F171C - ldr r0, _080F1720 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F1724 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F1728 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F172C + ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x8 bls _080F1712 b _080F1952 _080F1712: lsls r0, r5, 2 - ldr r1, _080F1730 + ldr r1, =_080F1734 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F171C: .4byte 0x03005d8c -_080F1720: .4byte 0x020375e0 -_080F1724: .4byte 0x000027cc -_080F1728: .4byte 0x020375f0 -_080F172C: .4byte 0x0203a030 -_080F1730: .4byte _080F1734 + .pool .align 2, 0 _080F1734: .4byte _080F1758 @@ -494312,7 +477971,7 @@ _080F1734: .4byte _080F190C .4byte _080F193C _080F1758: - ldr r0, _080F1798 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] @@ -494330,35 +477989,33 @@ _080F1758: ldrh r1, [r4, 0x2] movs r0, 0xB muls r0, r1 - ldr r1, _080F179C + ldr r1, =0x083185c8 adds r0, r1 adds r1, r4, 0 adds r1, 0x8 bl sub_8008C44 cmp r0, 0 bne _080F17A4 - ldr r1, _080F17A0 + ldr r1, =0x0203a030 movs r0, 0x8 b _080F1950 .align 2, 0 -_080F1798: .4byte 0x02021cc4 -_080F179C: .4byte 0x083185c8 -_080F17A0: .4byte 0x0203a030 + .pool _080F17A4: - ldr r1, _080F17AC + ldr r1, =0x0203a030 movs r0, 0x1 b _080F1950 .align 2, 0 -_080F17AC: .4byte 0x0203a030 + .pool _080F17B0: - ldr r0, _080F17DC + ldr r0, =0x02021cc4 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F17E0 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F17E4 + ldr r0, =0x02021dc4 adds r1, r4, 0 adds r1, 0x8 ldrb r2, [r4, 0x1F] @@ -494370,11 +478027,9 @@ _080F17B0: bl sub_80EF250 b _080F194C .align 2, 0 -_080F17DC: .4byte 0x02021cc4 -_080F17E0: .4byte 0x083185c8 -_080F17E4: .4byte 0x02021dc4 + .pool _080F17E8: - ldr r0, _080F1804 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] @@ -494384,25 +478039,24 @@ _080F17E8: ands r0, r1 cmp r0, 0 bne _080F180C - ldr r1, _080F1808 + ldr r1, =0x0203a030 movs r0, 0x3 b _080F1950 .align 2, 0 -_080F1804: .4byte 0x02021cc4 -_080F1808: .4byte 0x0203a030 + .pool _080F180C: - ldr r1, _080F1814 + ldr r1, =0x0203a030 movs r0, 0x4 b _080F1950 .align 2, 0 -_080F1814: .4byte 0x0203a030 + .pool _080F1818: - ldr r0, _080F1840 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] bl sub_81DB5E8 - ldr r0, _080F1844 + ldr r0, =0x02021dc4 ldrh r1, [r4, 0x4] bl sub_811EBBC ldrb r1, [r4, 0x13] @@ -494411,20 +478065,18 @@ _080F1818: adds r1, 0x1 movs r0, 0x2 bl sub_80EF340 - ldr r1, _080F1848 + ldr r1, =0x0203a030 movs r0, 0x5 b _080F1950 .align 2, 0 -_080F1840: .4byte 0x02021cc4 -_080F1844: .4byte 0x02021dc4 -_080F1848: .4byte 0x0203a030 + .pool _080F184C: - ldr r0, _080F1874 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] bl sub_81DB5E8 - ldr r0, _080F1878 + ldr r0, =0x02021dc4 ldrh r1, [r4, 0x4] bl sub_811EBBC ldrb r1, [r4, 0x13] @@ -494433,15 +478085,13 @@ _080F184C: adds r1, 0x1 movs r0, 0x2 bl sub_80EF340 - ldr r1, _080F187C + ldr r1, =0x0203a030 movs r0, 0x5 b _080F1950 .align 2, 0 -_080F1874: .4byte 0x02021cc4 -_080F1878: .4byte 0x02021dc4 -_080F187C: .4byte 0x0203a030 + .pool _080F1880: - ldr r0, _080F18AC + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] @@ -494451,87 +478101,78 @@ _080F1880: lsrs r1, 29 movs r0, 0x1 bl sub_80EF250 - ldr r0, _080F18B0 + ldr r0, =0x02021ec4 ldrh r1, [r4, 0x6] bl sub_811EBBC ldrh r0, [r4, 0x14] cmp r0, 0 beq _080F18B8 - ldr r1, _080F18B4 + ldr r1, =0x0203a030 movs r0, 0x6 b _080F1950 .align 2, 0 -_080F18AC: .4byte 0x02021cc4 -_080F18B0: .4byte 0x02021ec4 -_080F18B4: .4byte 0x0203a030 + .pool _080F18B8: - ldr r1, _080F18C0 + ldr r1, =0x0203a030 movs r0, 0x7 b _080F1950 .align 2, 0 -_080F18C0: .4byte 0x0203a030 + .pool _080F18C4: - ldr r0, _080F18F4 + ldr r0, =0x02021cc4 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F18F8 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F18FC + ldr r0, =0x02021dc4 ldrh r2, [r4, 0x14] movs r1, 0xD muls r1, r2 - ldr r2, _080F1900 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r0, _080F1904 + ldr r0, =0x02021ec4 ldrh r1, [r4, 0x6] bl sub_811EBBC - ldr r1, _080F1908 + ldr r1, =0x0203a030 movs r0, 0x7 b _080F1950 .align 2, 0 -_080F18F4: .4byte 0x02021cc4 -_080F18F8: .4byte 0x083185c8 -_080F18FC: .4byte 0x02021dc4 -_080F1900: .4byte 0x0831977c -_080F1904: .4byte 0x02021ec4 -_080F1908: .4byte 0x0203a030 + .pool _080F190C: - ldr r0, _080F1930 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 ldrb r2, [r4, 0x1E] bl sub_81DB5E8 - ldr r0, _080F1934 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F1938 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy bl sub_80F577C b _080F1952 .align 2, 0 -_080F1930: .4byte 0x02021cc4 -_080F1934: .4byte 0x02021dc4 -_080F1938: .4byte 0x083185c8 + .pool _080F193C: - ldr r0, _080F1964 + ldr r0, =0x02021cc4 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F1968 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy _080F194C: - ldr r1, _080F196C + ldr r1, =0x0203a030 movs r0, 0x2 _080F1950: strb r0, [r1] _080F1952: - ldr r0, _080F1970 + ldr r0, =0x0858d204 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -494540,29 +478181,26 @@ _080F1952: pop {r0} bx r0 .align 2, 0 -_080F1964: .4byte 0x02021cc4 -_080F1968: .4byte 0x083185c8 -_080F196C: .4byte 0x0203a030 -_080F1970: .4byte 0x0858d204 + .pool thumb_func_end sub_80F16EC thumb_func_start sub_80F1974 sub_80F1974: @ 80F1974 push {r4,r5,lr} - ldr r2, _080F19A8 - ldr r0, _080F19AC + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F19B0 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F19B4 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F19B8 + ldr r0, =0x0203a030 ldrb r5, [r0] adds r2, r0, 0 cmp r5, 0xE @@ -494570,17 +478208,12 @@ sub_80F1974: @ 80F1974 b _080F1BEA _080F199C: lsls r0, r5, 2 - ldr r1, _080F19BC + ldr r1, =_080F19C0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F19A8: .4byte 0x03005d8c -_080F19AC: .4byte 0x020375e0 -_080F19B0: .4byte 0x000027cc -_080F19B4: .4byte 0x020375f0 -_080F19B8: .4byte 0x0203a030 -_080F19BC: .4byte _080F19C0 + .pool .align 2, 0 _080F19C0: .4byte _080F19FC @@ -494599,50 +478232,46 @@ _080F19C0: .4byte _080F1B94 .4byte _080F1BCC _080F19FC: - ldr r0, _080F1A24 + ldr r0, =0x02021cc4 adds r1, r4, 0x2 ldrb r2, [r4, 0x1D] bl sub_81DB5E8 - ldr r0, _080F1A28 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0xA] movs r1, 0xB muls r1, r2 - ldr r2, _080F1A2C + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrh r0, [r4, 0x16] cmp r0, 0x6 bls _080F1A34 - ldr r1, _080F1A30 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F1BEA .align 2, 0 -_080F1A24: .4byte 0x02021cc4 -_080F1A28: .4byte 0x02021dc4 -_080F1A2C: .4byte 0x083185c8 -_080F1A30: .4byte 0x0203a030 + .pool _080F1A34: - ldr r1, _080F1A3C + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F1BEA .align 2, 0 -_080F1A3C: .4byte 0x0203a030 + .pool _080F1A40: ldrb r0, [r4, 0x1A] cmp r0, 0x32 bne _080F1A58 - ldr r0, _080F1A50 - ldr r1, _080F1A54 + ldr r0, =0x02021cc4 + ldr r1, =0x085eaeb1 bl gf_strcpy b _080F1A60 .align 2, 0 -_080F1A50: .4byte 0x02021cc4 -_080F1A54: .4byte 0x085eaeb1 + .pool _080F1A58: - ldr r0, _080F1A78 - ldr r1, _080F1A7C + ldr r0, =0x02021cc4 + ldr r1, =0x085eaeb8 bl gf_strcpy _080F1A60: ldrh r1, [r4, 0x16] @@ -494651,23 +478280,21 @@ _080F1A60: ldrb r0, [r4, 0x1C] cmp r0, 0x1 bne _080F1A84 - ldr r1, _080F1A80 + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F1BEA .align 2, 0 -_080F1A78: .4byte 0x02021cc4 -_080F1A7C: .4byte 0x085eaeb8 -_080F1A80: .4byte 0x0203a030 + .pool _080F1A84: - ldr r1, _080F1A8C + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F1BEA .align 2, 0 -_080F1A8C: .4byte 0x0203a030 + .pool _080F1A90: - ldr r0, _080F1AB0 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1E] @@ -494682,149 +478309,139 @@ _080F1AA6: beq _080F1B02 b _080F1B1C .align 2, 0 -_080F1AB0: .4byte 0x02021cc4 + .pool _080F1AB4: - ldr r0, _080F1AD4 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1E] bl sub_81DB5E8 - ldr r0, _080F1AD8 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0x14] movs r1, 0xB muls r1, r2 - ldr r2, _080F1ADC + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy b _080F1AA6 .align 2, 0 -_080F1AD4: .4byte 0x02021cc4 -_080F1AD8: .4byte 0x02021dc4 -_080F1ADC: .4byte 0x083185c8 + .pool _080F1AE0: - ldr r0, _080F1B0C + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1E] bl sub_81DB5E8 - ldr r0, _080F1B10 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0x14] movs r1, 0xB muls r1, r2 - ldr r2, _080F1B14 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrb r0, [r4, 0x1B] cmp r0, 0 bne _080F1B1C _080F1B02: - ldr r1, _080F1B18 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F1BEA .align 2, 0 -_080F1B0C: .4byte 0x02021cc4 -_080F1B10: .4byte 0x02021dc4 -_080F1B14: .4byte 0x083185c8 -_080F1B18: .4byte 0x0203a030 + .pool _080F1B1C: - ldr r1, _080F1B24 + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F1BEA .align 2, 0 -_080F1B24: .4byte 0x0203a030 + .pool _080F1B28: - ldr r0, _080F1B34 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1E] b _080F1B54 .align 2, 0 -_080F1B34: .4byte 0x02021cc4 + .pool _080F1B38: - ldr r0, _080F1B44 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1E] b _080F1B54 .align 2, 0 -_080F1B44: .4byte 0x02021cc4 + .pool _080F1B48: movs r0, 0xB strb r0, [r2] b _080F1BEA _080F1B4E: - ldr r0, _080F1B60 + ldr r0, =0x02021cc4 adds r1, r4, 0x2 ldrb r2, [r4, 0x1D] _080F1B54: bl sub_81DB5E8 - ldr r1, _080F1B64 + ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] b _080F1BEA .align 2, 0 -_080F1B60: .4byte 0x02021cc4 -_080F1B64: .4byte 0x0203a030 + .pool _080F1B68: - ldr r0, _080F1B80 + ldr r0, =0x02021cc4 ldrh r1, [r4, 0x18] bl sub_811EBBC ldrb r0, [r4, 0x1B] cmp r0, 0 bne _080F1B88 - ldr r1, _080F1B84 + ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] b _080F1BEA .align 2, 0 -_080F1B80: .4byte 0x02021cc4 -_080F1B84: .4byte 0x0203a030 + .pool _080F1B88: - ldr r1, _080F1B90 + ldr r1, =0x0203a030 movs r0, 0xD strb r0, [r1] b _080F1BEA .align 2, 0 -_080F1B90: .4byte 0x0203a030 + .pool _080F1B94: - ldr r0, _080F1BBC + ldr r0, =0x02021cc4 ldrh r1, [r4, 0x18] bl sub_811EBBC - ldr r0, _080F1BC0 + ldr r0, =0x02021dc4 adds r1, r4, 0x2 ldrb r2, [r4, 0x1D] bl sub_81DB5E8 - ldr r0, _080F1BC4 + ldr r0, =0x02021ec4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1E] bl sub_81DB5E8 - ldr r1, _080F1BC8 + ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] b _080F1BEA .align 2, 0 -_080F1BBC: .4byte 0x02021cc4 -_080F1BC0: .4byte 0x02021dc4 -_080F1BC4: .4byte 0x02021ec4 -_080F1BC8: .4byte 0x0203a030 + .pool _080F1BCC: - ldr r0, _080F1BFC + ldr r0, =0x02021cc4 adds r1, r4, 0x2 ldrb r2, [r4, 0x1D] bl sub_81DB5E8 - ldr r0, _080F1C00 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0xA] movs r1, 0xB muls r1, r2 - ldr r2, _080F1C04 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy bl sub_80F577C _080F1BEA: - ldr r0, _080F1C08 + ldr r0, =0x0858d240 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -494833,29 +478450,26 @@ _080F1BEA: pop {r0} bx r0 .align 2, 0 -_080F1BFC: .4byte 0x02021cc4 -_080F1C00: .4byte 0x02021dc4 -_080F1C04: .4byte 0x083185c8 -_080F1C08: .4byte 0x0858d240 + .pool thumb_func_end sub_80F1974 thumb_func_start sub_80F1C0C sub_80F1C0C: @ 80F1C0C push {r4-r6,lr} - ldr r2, _080F1C40 - ldr r0, _080F1C44 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F1C48 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r5, r1, r0 - ldr r1, _080F1C4C + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F1C50 + ldr r0, =0x0203a030 ldrb r6, [r0] adds r2, r0, 0 cmp r6, 0xC @@ -494863,17 +478477,12 @@ sub_80F1C0C: @ 80F1C0C b _080F1E2C _080F1C34: lsls r0, r6, 2 - ldr r1, _080F1C54 + ldr r1, =_080F1C58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F1C40: .4byte 0x03005d8c -_080F1C44: .4byte 0x020375e0 -_080F1C48: .4byte 0x000027cc -_080F1C4C: .4byte 0x020375f0 -_080F1C50: .4byte 0x0203a030 -_080F1C54: .4byte _080F1C58 + .pool .align 2, 0 _080F1C58: .4byte _080F1C8C @@ -494890,40 +478499,38 @@ _080F1C58: .4byte _080F1DD8 .4byte _080F1E1C _080F1C8C: - ldr r0, _080F1CB0 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x3] bl sub_81DB5E8 - ldr r0, _080F1CB4 + ldr r0, =0x02021dc4 ldrb r1, [r5, 0x12] movs r2, 0 bl GetMapName ldrh r0, [r5, 0xC] cmp r0, 0xFE bls _080F1CBC - ldr r1, _080F1CB8 + ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] b _080F1E2C .align 2, 0 -_080F1CB0: .4byte 0x02021cc4 -_080F1CB4: .4byte 0x02021dc4 -_080F1CB8: .4byte 0x0203a030 + .pool _080F1CBC: - ldr r1, _080F1CC4 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F1E2C .align 2, 0 -_080F1CC4: .4byte 0x0203a030 + .pool _080F1CC8: - ldr r0, _080F1D04 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x3] bl sub_81DB5E8 - ldr r4, _080F1D08 + ldr r4, =0x02021dc4 ldrh r0, [r5, 0x6] bl itemid_get_item adds r1, r0, 0 @@ -494932,7 +478539,7 @@ _080F1CC8: ldrh r1, [r5, 0xC] movs r0, 0x2 bl sub_80EF340 - ldr r4, _080F1D0C + ldr r4, =0x0203a030 bl GenerateRandomNumber ldrb r2, [r4] adds r2, 0x1 @@ -494944,9 +478551,7 @@ _080F1CC8: strb r0, [r4] b _080F1E2C .align 2, 0 -_080F1D04: .4byte 0x02021cc4 -_080F1D08: .4byte 0x02021dc4 -_080F1D0C: .4byte 0x0203a030 + .pool _080F1D10: ldrh r0, [r5, 0x8] cmp r0, 0 @@ -494966,21 +478571,21 @@ _080F1D22: ldrh r0, [r5, 0x8] cmp r0, 0 beq _080F1D40 - ldr r1, _080F1D3C + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F1E2C .align 2, 0 -_080F1D3C: .4byte 0x0203a030 + .pool _080F1D40: - ldr r1, _080F1D48 + ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] b _080F1E2C .align 2, 0 -_080F1D48: .4byte 0x0203a030 + .pool _080F1D4C: - ldr r4, _080F1D74 + ldr r4, =0x02021dc4 ldrh r0, [r5, 0x8] bl itemid_get_item adds r1, r0, 0 @@ -494992,15 +478597,14 @@ _080F1D4C: ldrh r0, [r5, 0xA] cmp r0, 0 beq _080F1D94 - ldr r1, _080F1D78 + ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] b _080F1E2C .align 2, 0 -_080F1D74: .4byte 0x02021dc4 -_080F1D78: .4byte 0x0203a030 + .pool _080F1D7C: - ldr r4, _080F1DA4 + ldr r4, =0x02021dc4 ldrh r0, [r5, 0xA] bl itemid_get_item adds r1, r0, 0 @@ -495013,13 +478617,12 @@ _080F1D94: ldrb r0, [r5, 0x2] cmp r0, 0x1 beq _080F1DFA - ldr r1, _080F1DA8 + ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] b _080F1E2C .align 2, 0 -_080F1DA4: .4byte 0x02021dc4 -_080F1DA8: .4byte 0x0203a030 + .pool _080F1DAC: ldrh r0, [r5, 0xC] cmp r0, 0xFE @@ -495045,12 +478648,12 @@ _080F1DD2: strb r0, [r2] b _080F1E2C _080F1DD8: - ldr r0, _080F1E04 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x3] bl sub_81DB5E8 - ldr r4, _080F1E08 + ldr r4, =0x02021dc4 ldrh r0, [r5, 0x6] bl itemid_get_item adds r1, r0, 0 @@ -495060,30 +478663,28 @@ _080F1DD8: cmp r0, 0x1 bne _080F1E10 _080F1DFA: - ldr r1, _080F1E0C + ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] b _080F1E2C .align 2, 0 -_080F1E04: .4byte 0x02021cc4 -_080F1E08: .4byte 0x02021dc4 -_080F1E0C: .4byte 0x0203a030 + .pool _080F1E10: - ldr r1, _080F1E18 + ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] b _080F1E2C .align 2, 0 -_080F1E18: .4byte 0x0203a030 + .pool _080F1E1C: - ldr r0, _080F1E40 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x3] bl sub_81DB5E8 bl sub_80F577C _080F1E2C: - ldr r0, _080F1E44 + ldr r0, =0x0858d1d0 lsls r1, r6, 2 adds r1, r0 ldr r0, [r1] @@ -495092,28 +478693,27 @@ _080F1E2C: pop {r0} bx r0 .align 2, 0 -_080F1E40: .4byte 0x02021cc4 -_080F1E44: .4byte 0x0858d1d0 + .pool thumb_func_end sub_80F1C0C thumb_func_start sub_80F1E48 sub_80F1E48: @ 80F1E48 push {r4-r6,lr} sub sp, 0x8 - ldr r2, _080F1E7C - ldr r0, _080F1E80 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F1E84 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r5, r1, r0 - ldr r1, _080F1E88 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F1E8C + ldr r0, =0x0203a030 ldrb r6, [r0] adds r2, r0, 0 cmp r6, 0x12 @@ -495121,17 +478721,12 @@ sub_80F1E48: @ 80F1E48 b _080F20FE _080F1E72: lsls r0, r6, 2 - ldr r1, _080F1E90 + ldr r1, =_080F1E94 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F1E7C: .4byte 0x03005d8c -_080F1E80: .4byte 0x020375e0 -_080F1E84: .4byte 0x000027cc -_080F1E88: .4byte 0x020375f0 -_080F1E8C: .4byte 0x0203a030 -_080F1E90: .4byte _080F1E94 + .pool .align 2, 0 _080F1E94: .4byte _080F1EE0 @@ -495154,34 +478749,30 @@ _080F1E94: .4byte _080F20A4 .4byte _080F20F0 _080F1EE0: - ldr r0, _080F1F14 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0xF ldrb r2, [r5, 0x1E] bl sub_81DB5E8 - ldr r0, _080F1F18 + ldr r0, =0x02021dc4 ldrh r2, [r5, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F1F1C + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F1F20 + ldr r0, =0x02021ec4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1F] bl sub_81DB5E8 - ldr r4, _080F1F24 + ldr r4, =0x0203a030 adds r0, r5, 0 bl sub_80EFBA4 adds r0, 0x1 strb r0, [r4] b _080F20FE .align 2, 0 -_080F1F14: .4byte 0x02021cc4 -_080F1F18: .4byte 0x02021dc4 -_080F1F1C: .4byte 0x083185c8 -_080F1F20: .4byte 0x02021ec4 -_080F1F24: .4byte 0x0203a030 + .pool _080F1F28: ldrb r0, [r5, 0x1A] cmp r0, 0 @@ -495204,7 +478795,7 @@ _080F1F44: strb r0, [r2] b _080F20FE _080F1F4A: - ldr r0, _080F1F64 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0xF ldrb r2, [r5, 0x1E] @@ -495212,35 +478803,34 @@ _080F1F4A: ldrb r0, [r5, 0x1A] cmp r0, 0 bne _080F1F6C - ldr r1, _080F1F68 + ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] b _080F20FE .align 2, 0 -_080F1F64: .4byte 0x02021cc4 -_080F1F68: .4byte 0x0203a030 + .pool _080F1F6C: cmp r0, 0x1 bne _080F1F7C - ldr r1, _080F1F78 + ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] b _080F20FE .align 2, 0 -_080F1F78: .4byte 0x0203a030 + .pool _080F1F7C: cmp r0, 0x2 beq _080F1F82 b _080F20FE _080F1F82: - ldr r1, _080F1F8C + ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] b _080F20FE .align 2, 0 -_080F1F8C: .4byte 0x0203a030 + .pool _080F1F90: - ldr r0, _080F1FC4 + ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1F] bl sub_81DB5E8 @@ -495259,15 +478849,14 @@ _080F1F90: movs r2, 0 movs r3, 0x1 bl sub_80EFBDC - ldr r1, _080F1FC8 + ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] b _080F20FE .align 2, 0 -_080F1FC4: .4byte 0x02021cc4 -_080F1FC8: .4byte 0x0203a030 + .pool _080F1FCC: - ldr r0, _080F2004 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0xF ldrb r2, [r5, 0x1E] @@ -495287,13 +478876,12 @@ _080F1FCC: movs r2, 0x3 movs r3, 0x1 bl sub_80EFBDC - ldr r1, _080F2008 + ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] b _080F20FE .align 2, 0 -_080F2004: .4byte 0x02021cc4 -_080F2008: .4byte 0x0203a030 + .pool _080F200C: movs r4, 0 str r4, [sp] @@ -495318,11 +478906,11 @@ _080F202C: movs r2, 0x2 movs r3, 0x1 bl sub_80EFBDC - ldr r0, _080F2068 + ldr r0, =0x02021dc4 ldrh r2, [r5, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F206C + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrh r0, [r5, 0x2] @@ -495333,14 +478921,12 @@ _080F202C: movs r2, 0x3 movs r3, 0x2 bl sub_80EFBDC - ldr r1, _080F2070 + ldr r1, =0x0203a030 movs r0, 0x10 strb r0, [r1] b _080F20FE .align 2, 0 -_080F2068: .4byte 0x02021dc4 -_080F206C: .4byte 0x083185c8 -_080F2070: .4byte 0x0203a030 + .pool _080F2074: ldrh r0, [r5, 0x2] str r0, [sp] @@ -495358,12 +478944,12 @@ _080F2074: movs r2, 0x3 movs r3, 0x1 bl sub_80EFBDC - ldr r1, _080F20A0 + ldr r1, =0x0203a030 movs r0, 0x11 strb r0, [r1] b _080F20FE .align 2, 0 -_080F20A0: .4byte 0x0203a030 + .pool _080F20A4: movs r0, 0 str r0, [sp] @@ -495372,11 +478958,11 @@ _080F20A4: movs r2, 0x2 movs r3, 0x1 bl sub_80EFBDC - ldr r0, _080F20E0 + ldr r0, =0x02021dc4 ldrh r2, [r5, 0x1C] movs r1, 0xB muls r1, r2 - ldr r2, _080F20E4 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrh r0, [r5, 0x1C] @@ -495388,25 +478974,23 @@ _080F20A4: movs r3, 0x2 _080F20D2: bl sub_80EFBDC - ldr r1, _080F20E8 + ldr r1, =0x0203a030 movs r0, 0x12 strb r0, [r1] b _080F20FE .align 2, 0 -_080F20E0: .4byte 0x02021dc4 -_080F20E4: .4byte 0x083185c8 -_080F20E8: .4byte 0x0203a030 + .pool _080F20EC: movs r6, 0x12 strb r6, [r2] _080F20F0: - ldr r0, _080F2114 + ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1F] bl sub_81DB5E8 bl sub_80F577C _080F20FE: - ldr r0, _080F2118 + ldr r0, =0x0858d338 lsls r1, r6, 2 adds r1, r0 ldr r0, [r1] @@ -495416,27 +479000,26 @@ _080F20FE: pop {r0} bx r0 .align 2, 0 -_080F2114: .4byte 0x02021cc4 -_080F2118: .4byte 0x0858d338 + .pool thumb_func_end sub_80F1E48 thumb_func_start sub_80F211C sub_80F211C: @ 80F211C push {r4-r6,lr} - ldr r2, _080F2150 - ldr r0, _080F2154 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F2158 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r5, r1, r0 - ldr r1, _080F215C + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F2160 + ldr r0, =0x0203a030 ldrb r6, [r0] adds r2, r0, 0 cmp r6, 0xB @@ -495444,17 +479027,12 @@ sub_80F211C: @ 80F211C b _080F2358 _080F2144: lsls r0, r6, 2 - ldr r1, _080F2164 + ldr r1, =_080F2168 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F2150: .4byte 0x03005d8c -_080F2154: .4byte 0x020375e0 -_080F2158: .4byte 0x000027cc -_080F215C: .4byte 0x020375f0 -_080F2160: .4byte 0x0203a030 -_080F2164: .4byte _080F2168 + .pool .align 2, 0 _080F2168: .4byte _080F2198 @@ -495470,48 +479048,44 @@ _080F2168: .4byte _080F2324 .4byte _080F2354 _080F2198: - ldr r0, _080F21CC + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x2] bl sub_81DB5E8 - ldr r0, _080F21D0 + ldr r0, =0x02021dc4 ldrh r2, [r5, 0x10] movs r1, 0xB muls r1, r2 - ldr r2, _080F21D4 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F21D8 + ldr r0, =0x02021ec4 adds r1, r5, 0x4 ldrb r2, [r5, 0x3] bl sub_81DB5E8 ldrb r0, [r5, 0xF] cmp r0, 0x1 bne _080F21E0 - ldr r1, _080F21DC + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F2358 .align 2, 0 -_080F21CC: .4byte 0x02021cc4 -_080F21D0: .4byte 0x02021dc4 -_080F21D4: .4byte 0x083185c8 -_080F21D8: .4byte 0x02021ec4 -_080F21DC: .4byte 0x0203a030 + .pool _080F21E0: - ldr r1, _080F21E8 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F2358 .align 2, 0 -_080F21E8: .4byte 0x0203a030 + .pool _080F21EC: movs r0, 0x2 strb r0, [r2] b _080F2358 _080F21F2: - ldr r4, _080F2218 + ldr r4, =0x02021dc4 ldrb r0, [r5, 0xF] bl itemid_get_item adds r1, r0, 0 @@ -495523,88 +479097,81 @@ _080F21F2: ldrb r0, [r5, 0x12] cmp r0, 0x3 bhi _080F2220 - ldr r1, _080F221C + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F2358 .align 2, 0 -_080F2218: .4byte 0x02021dc4 -_080F221C: .4byte 0x0203a030 + .pool _080F2220: - ldr r1, _080F2228 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F2358 .align 2, 0 -_080F2228: .4byte 0x0203a030 + .pool _080F222C: - ldr r0, _080F2254 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x2] bl sub_81DB5E8 - ldr r0, _080F2258 + ldr r0, =0x02021dc4 ldrh r2, [r5, 0x10] movs r1, 0xB muls r1, r2 - ldr r2, _080F225C + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F2260 + ldr r0, =0x02021ec4 adds r1, r5, 0x4 ldrb r2, [r5, 0x3] bl sub_81DB5E8 b _080F2286 .align 2, 0 -_080F2254: .4byte 0x02021cc4 -_080F2258: .4byte 0x02021dc4 -_080F225C: .4byte 0x083185c8 -_080F2260: .4byte 0x02021ec4 + .pool _080F2264: movs r0, 0x6 strb r0, [r2] b _080F2358 _080F226A: - ldr r0, _080F2290 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x2] bl sub_81DB5E8 - ldr r0, _080F2294 + ldr r0, =0x02021dc4 ldrh r2, [r5, 0x10] movs r1, 0xB muls r1, r2 - ldr r2, _080F2298 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy _080F2286: - ldr r1, _080F229C + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F2358 .align 2, 0 -_080F2290: .4byte 0x02021cc4 -_080F2294: .4byte 0x02021dc4 -_080F2298: .4byte 0x083185c8 -_080F229C: .4byte 0x0203a030 + .pool _080F22A0: - ldr r0, _080F22E0 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x2] bl sub_81DB5E8 - ldr r0, _080F22E4 + ldr r0, =0x02021dc4 ldrh r2, [r5, 0x10] movs r1, 0xB muls r1, r2 - ldr r2, _080F22E8 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F22EC + ldr r0, =0x02021ec4 adds r1, r5, 0x4 ldrb r2, [r5, 0x3] bl sub_81DB5E8 - ldr r4, _080F22F0 + ldr r4, =0x0203a030 bl GenerateRandomNumber ldrb r2, [r4] adds r2, 0x1 @@ -495616,20 +479183,16 @@ _080F22A0: strb r0, [r4] b _080F2358 .align 2, 0 -_080F22E0: .4byte 0x02021cc4 -_080F22E4: .4byte 0x02021dc4 -_080F22E8: .4byte 0x083185c8 -_080F22EC: .4byte 0x02021ec4 -_080F22F0: .4byte 0x0203a030 + .pool _080F22F4: - ldr r0, _080F2318 + ldr r0, =0x02021cc4 ldrh r1, [r5, 0x10] movs r4, 0xB muls r1, r4 - ldr r2, _080F231C + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F2320 + ldr r0, =0x02021dc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x3] bl sub_81DB5E8 @@ -495638,34 +479201,29 @@ _080F22F4: bl sub_80EF9E8 b _080F233E .align 2, 0 -_080F2318: .4byte 0x02021cc4 -_080F231C: .4byte 0x083185c8 -_080F2320: .4byte 0x02021dc4 + .pool _080F2324: - ldr r0, _080F2344 + ldr r0, =0x02021cc4 ldrh r1, [r5, 0x10] movs r4, 0xB muls r1, r4 - ldr r2, _080F2348 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F234C + ldr r0, =0x02021dc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x3] bl sub_81DB5E8 _080F233E: - ldr r0, _080F2350 + ldr r0, =0x0203a030 strb r4, [r0] b _080F2358 .align 2, 0 -_080F2344: .4byte 0x02021cc4 -_080F2348: .4byte 0x083185c8 -_080F234C: .4byte 0x02021dc4 -_080F2350: .4byte 0x0203a030 + .pool _080F2354: bl sub_80F577C _080F2358: - ldr r0, _080F236C + ldr r0, =0x0858d1a0 lsls r1, r6, 2 adds r1, r0 ldr r0, [r1] @@ -495674,43 +479232,38 @@ _080F2358: pop {r0} bx r0 .align 2, 0 -_080F236C: .4byte 0x0858d1a0 + .pool thumb_func_end sub_80F211C thumb_func_start sub_80F2370 sub_80F2370: @ 80F2370 push {r4,r5,lr} - ldr r2, _080F23A0 - ldr r0, _080F23A4 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F23A8 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F23AC + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F23B0 + ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x6 bls _080F2396 b _080F24C0 _080F2396: lsls r0, r5, 2 - ldr r1, _080F23B4 + ldr r1, =_080F23B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F23A0: .4byte 0x03005d8c -_080F23A4: .4byte 0x020375e0 -_080F23A8: .4byte 0x000027cc -_080F23AC: .4byte 0x020375f0 -_080F23B0: .4byte 0x0203a030 -_080F23B4: .4byte _080F23B8 + .pool .align 2, 0 _080F23B8: .4byte _080F23D4 @@ -495721,66 +479274,59 @@ _080F23B8: .4byte _080F24A0 .4byte _080F24BC _080F23D4: - ldr r0, _080F23F8 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x2] bl sub_81DB5E8 - ldr r0, _080F23FC + ldr r0, =0x02021dc4 ldrh r2, [r4, 0xC] movs r1, 0xB muls r1, r2 - ldr r2, _080F2400 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r1, _080F2404 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F24C0 .align 2, 0 -_080F23F8: .4byte 0x02021cc4 -_080F23FC: .4byte 0x02021dc4 -_080F2400: .4byte 0x083185c8 -_080F2404: .4byte 0x0203a030 + .pool _080F2408: - ldr r0, _080F243C + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x2] bl sub_81DB5E8 - ldr r0, _080F2440 + ldr r0, =0x02021dc4 ldrb r1, [r4, 0x12] movs r2, 0 bl GetMapName - ldr r0, _080F2444 + ldr r0, =0x02021ec4 ldrh r2, [r4, 0xE] movs r1, 0xB muls r1, r2 - ldr r2, _080F2448 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrb r0, [r4, 0x11] cmp r0, 0x1 bne _080F2450 - ldr r1, _080F244C + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F24C0 .align 2, 0 -_080F243C: .4byte 0x02021cc4 -_080F2440: .4byte 0x02021dc4 -_080F2444: .4byte 0x02021ec4 -_080F2448: .4byte 0x083185c8 -_080F244C: .4byte 0x0203a030 + .pool _080F2450: - ldr r1, _080F2458 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F24C0 .align 2, 0 -_080F2458: .4byte 0x0203a030 + .pool _080F245C: - ldr r0, _080F248C + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x2] @@ -495796,37 +479342,35 @@ _080F245C: lsls r0, 16 cmp r0, 0 bne _080F2494 - ldr r1, _080F2490 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F24C0 .align 2, 0 -_080F248C: .4byte 0x02021cc4 -_080F2490: .4byte 0x0203a030 + .pool _080F2494: - ldr r1, _080F249C + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F24C0 .align 2, 0 -_080F249C: .4byte 0x0203a030 + .pool _080F24A0: - ldr r0, _080F24B4 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x2] bl sub_81DB5E8 - ldr r1, _080F24B8 + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F24C0 .align 2, 0 -_080F24B4: .4byte 0x02021cc4 -_080F24B8: .4byte 0x0203a030 + .pool _080F24BC: bl sub_80F577C _080F24C0: - ldr r0, _080F24D4 + ldr r0, =0x0858d394 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -495835,26 +479379,26 @@ _080F24C0: pop {r0} bx r0 .align 2, 0 -_080F24D4: .4byte 0x0858d394 + .pool thumb_func_end sub_80F2370 thumb_func_start sub_80F24D8 sub_80F24D8: @ 80F24D8 push {r4-r7,lr} - ldr r2, _080F250C - ldr r0, _080F2510 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F2514 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r5, r1, r0 - ldr r1, _080F2518 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F251C + ldr r0, =0x0203a030 ldrb r7, [r0] adds r6, r0, 0 cmp r7, 0x33 @@ -495862,17 +479406,12 @@ sub_80F24D8: @ 80F24D8 b _080F26F0 _080F2500: lsls r0, r7, 2 - ldr r1, _080F2520 + ldr r1, =_080F2524 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F250C: .4byte 0x03005d8c -_080F2510: .4byte 0x020375e0 -_080F2514: .4byte 0x000027cc -_080F2518: .4byte 0x020375f0 -_080F251C: .4byte 0x0203a030 -_080F2520: .4byte _080F2524 + .pool .align 2, 0 _080F2524: .4byte _080F25F4 @@ -495928,27 +479467,24 @@ _080F2524: .4byte _080F26A6 .4byte _080F26CC _080F25F4: - ldr r0, _080F2618 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x10 ldrb r2, [r5, 0x18] bl sub_81DB5E8 - ldr r0, _080F261C + ldr r0, =0x02021dc4 ldrh r2, [r5, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F2620 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r1, _080F2624 + ldr r1, =0x0203a030 movs r0, 0x32 strb r0, [r1] b _080F26F0 .align 2, 0 -_080F2618: .4byte 0x02021cc4 -_080F261C: .4byte 0x02021dc4 -_080F2620: .4byte 0x083185c8 -_080F2624: .4byte 0x0203a030 + .pool _080F2628: bl GenerateRandomNumber lsls r0, 16 @@ -495958,19 +479494,19 @@ _080F2628: adds r2, r0, 0x1 cmp r2, 0x1 bne _080F2648 - ldr r1, _080F2644 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F26F0 .align 2, 0 -_080F2644: .4byte 0x0203a030 + .pool _080F2648: - ldr r1, _080F2650 + ldr r1, =0x0203a030 adds r0, r2, 0x2 strb r0, [r1] b _080F26F0 .align 2, 0 -_080F2650: .4byte 0x0203a030 + .pool _080F2654: movs r0, 0x33 strb r0, [r6] @@ -495989,12 +479525,12 @@ _080F265A: _080F2672: adds r0, r5, 0 bl sub_80EFB58 - ldr r1, _080F2680 + ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] b _080F26F0 .align 2, 0 -_080F2680: .4byte 0x0203a030 + .pool _080F2684: bl GenerateRandomNumber lsls r0, 16 @@ -496010,7 +479546,7 @@ _080F2684: bl sub_80F577C b _080F26F0 _080F26A6: - ldr r4, _080F26C4 + ldr r4, =0x02021fc4 adds r1, r5, 0x4 adds r0, r4, 0 movs r2, 0x2 @@ -496018,15 +479554,14 @@ _080F26A6: bl sub_811EC08 adds r0, r4, 0 bl box_related_two__2 - ldr r1, _080F26C8 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F26FC .align 2, 0 -_080F26C4: .4byte 0x02021fc4 -_080F26C8: .4byte 0x0203a030 + .pool _080F26CC: - ldr r4, _080F26E8 + ldr r4, =0x02021fc4 adds r1, r5, 0x4 adds r0, r4, 0 movs r2, 0x2 @@ -496034,15 +479569,14 @@ _080F26CC: bl sub_811EC08 adds r0, r4, 0 bl box_related_two__2 - ldr r1, _080F26EC + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F26FC .align 2, 0 -_080F26E8: .4byte 0x02021fc4 -_080F26EC: .4byte 0x0203a030 + .pool _080F26F0: - ldr r0, _080F2704 + ldr r0, =0x0858d150 lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] @@ -496052,26 +479586,26 @@ _080F26FC: pop {r0} bx r0 .align 2, 0 -_080F2704: .4byte 0x0858d150 + .pool thumb_func_end sub_80F24D8 thumb_func_start sub_80F2708 sub_80F2708: @ 80F2708 push {r4-r7,lr} - ldr r2, _080F273C - ldr r0, _080F2740 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F2744 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r5, r1, r0 - ldr r1, _080F2748 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F274C + ldr r0, =0x0203a030 ldrb r6, [r0] adds r7, r0, 0 cmp r6, 0x32 @@ -496079,17 +479613,12 @@ sub_80F2708: @ 80F2708 b _080F288C _080F2730: lsls r0, r6, 2 - ldr r1, _080F2750 + ldr r1, =_080F2754 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F273C: .4byte 0x03005d8c -_080F2740: .4byte 0x020375e0 -_080F2744: .4byte 0x000027cc -_080F2748: .4byte 0x020375f0 -_080F274C: .4byte 0x0203a030 -_080F2750: .4byte _080F2754 + .pool .align 2, 0 _080F2754: .4byte _080F2820 @@ -496144,20 +479673,19 @@ _080F2754: .4byte _080F288C .4byte _080F2868 _080F2820: - ldr r0, _080F283C + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x10 ldrb r2, [r5, 0x18] bl sub_81DB5E8 adds r0, r5, 0 bl sub_80EFB58 - ldr r1, _080F2840 + ldr r1, =0x0203a030 movs r0, 0x32 strb r0, [r1] b _080F288C .align 2, 0 -_080F283C: .4byte 0x02021cc4 -_080F2840: .4byte 0x0203a030 + .pool _080F2844: bl GenerateRandomNumber ldrb r4, [r7] @@ -496177,7 +479705,7 @@ _080F2862: bl sub_80F577C b _080F288C _080F2868: - ldr r4, _080F2884 + ldr r4, =0x02021fc4 adds r1, r5, 0x4 adds r0, r4, 0 movs r2, 0x2 @@ -496185,15 +479713,14 @@ _080F2868: bl sub_811EC08 adds r0, r4, 0 bl box_related_two__2 - ldr r1, _080F2888 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F2898 .align 2, 0 -_080F2884: .4byte 0x02021fc4 -_080F2888: .4byte 0x0203a030 + .pool _080F288C: - ldr r0, _080F28A0 + ldr r0, =0x0858d170 lsls r1, r6, 2 adds r1, r0 ldr r0, [r1] @@ -496203,26 +479730,26 @@ _080F2898: pop {r0} bx r0 .align 2, 0 -_080F28A0: .4byte 0x0858d170 + .pool thumb_func_end sub_80F2708 thumb_func_start sub_80F28A4 sub_80F28A4: @ 80F28A4 push {r4-r6,lr} - ldr r2, _080F28D4 - ldr r0, _080F28D8 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F28DC + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F28E0 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r6, _080F28E4 + ldr r6, =0x0203a030 ldrb r5, [r6] cmp r5, 0x3 bgt _080F28E8 @@ -496232,28 +479759,24 @@ sub_80F28A4: @ 80F28A4 beq _080F28EE b _080F297E .align 2, 0 -_080F28D4: .4byte 0x03005d8c -_080F28D8: .4byte 0x020375e0 -_080F28DC: .4byte 0x000027cc -_080F28E0: .4byte 0x020375f0 -_080F28E4: .4byte 0x0203a030 + .pool _080F28E8: cmp r5, 0x4 beq _080F2968 b _080F297E _080F28EE: - ldr r0, _080F2920 + ldr r0, =0x02021cc4 adds r1, r4, 0x5 ldrb r2, [r4, 0xD] bl sub_81DB5E8 - ldr r0, _080F2924 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F2928 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F292C + ldr r0, =0x02021ec4 adds r1, r4, 0 adds r1, 0x10 ldrb r2, [r4, 0xE] @@ -496264,44 +479787,38 @@ _080F28EE: strb r0, [r6] b _080F297E .align 2, 0 -_080F2920: .4byte 0x02021cc4 -_080F2924: .4byte 0x02021dc4 -_080F2928: .4byte 0x083185c8 -_080F292C: .4byte 0x02021ec4 + .pool _080F2930: - ldr r0, _080F2958 + ldr r0, =0x02021cc4 adds r1, r4, 0x5 ldrb r2, [r4, 0xD] bl sub_81DB5E8 - ldr r0, _080F295C + ldr r0, =0x02021dc4 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F2960 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F2964 + ldr r0, =0x02021ec4 ldrh r1, [r4, 0x1C] bl sub_811EBBC movs r0, 0x4 strb r0, [r6] b _080F297E .align 2, 0 -_080F2958: .4byte 0x02021cc4 -_080F295C: .4byte 0x02021dc4 -_080F2960: .4byte 0x083185c8 -_080F2964: .4byte 0x02021ec4 + .pool _080F2968: - ldr r0, _080F2990 + ldr r0, =0x02021cc4 adds r1, r4, 0x5 ldrb r2, [r4, 0xD] bl sub_81DB5E8 - ldr r0, _080F2994 + ldr r0, =0x02021ec4 ldrh r1, [r4, 0x1E] bl sub_811EBBC bl sub_80F577C _080F297E: - ldr r0, _080F2998 + ldr r0, =0x0858d188 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -496310,9 +479827,7 @@ _080F297E: pop {r0} bx r0 .align 2, 0 -_080F2990: .4byte 0x02021cc4 -_080F2994: .4byte 0x02021ec4 -_080F2998: .4byte 0x0858d188 + .pool thumb_func_end sub_80F28A4 thumb_func_start nullsub_46 @@ -496323,31 +479838,31 @@ nullsub_46: @ 80F299C thumb_func_start sub_80F29A0 sub_80F29A0: @ 80F29A0 push {r4,lr} - ldr r2, _080F29F0 - ldr r0, _080F29F4 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F29F8 + ldr r1, =0x000027cc adds r0, r1 ldr r4, [r2] adds r4, r0 - ldr r0, _080F29FC + ldr r0, =0x02021cc4 ldrb r1, [r4, 0x10] movs r2, 0 bl GetMapName - ldr r0, _080F2A00 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0xC] movs r1, 0xB muls r1, r2 - ldr r2, _080F2A04 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy bl sub_80F577C bl sub_80ED430 - ldr r1, _080F2A08 - ldr r0, _080F2A0C + ldr r1, =0x0858d19c + ldr r0, =0x0203a030 ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -496357,33 +479872,26 @@ sub_80F29A0: @ 80F29A0 pop {r0} bx r0 .align 2, 0 -_080F29F0: .4byte 0x03005d8c -_080F29F4: .4byte 0x020375e0 -_080F29F8: .4byte 0x000027cc -_080F29FC: .4byte 0x02021cc4 -_080F2A00: .4byte 0x02021dc4 -_080F2A04: .4byte 0x083185c8 -_080F2A08: .4byte 0x0858d19c -_080F2A0C: .4byte 0x0203a030 + .pool thumb_func_end sub_80F29A0 thumb_func_start sub_80F2A10 sub_80F2A10: @ 80F2A10 push {r4-r7,lr} - ldr r2, _080F2A44 - ldr r0, _080F2A48 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F2A4C + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r6, r1, r0 - ldr r1, _080F2A50 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F2A54 + ldr r0, =0x0203a030 ldrb r7, [r0] adds r2, r0, 0 cmp r7, 0x20 @@ -496391,17 +479899,12 @@ sub_80F2A10: @ 80F2A10 b _080F311C _080F2A38: lsls r0, r7, 2 - ldr r1, _080F2A58 + ldr r1, =_080F2A5C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F2A44: .4byte 0x03005d8c -_080F2A48: .4byte 0x020375e0 -_080F2A4C: .4byte 0x000027cc -_080F2A50: .4byte 0x020375f0 -_080F2A54: .4byte 0x0203a030 -_080F2A58: .4byte _080F2A5C + .pool .align 2, 0 _080F2A5C: .4byte _080F2AE0 @@ -496438,17 +479941,17 @@ _080F2A5C: .4byte _080F30E0 .4byte _080F30FC _080F2AE0: - ldr r0, _080F2B18 + ldr r0, =0x02021cc4 ldrb r1, [r6, 0x1C] bl sub_818E868 - ldr r0, _080F2B1C + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2B20 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F2B24 + ldr r0, =0x02021ec4 adds r1, r6, 0 adds r1, 0x14 ldrb r2, [r6, 0x1D] @@ -496459,45 +479962,41 @@ _080F2AE0: bne _080F2B38 cmp r0, 0 bne _080F2B2C - ldr r1, _080F2B28 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F311C .align 2, 0 -_080F2B18: .4byte 0x02021cc4 -_080F2B1C: .4byte 0x02021dc4 -_080F2B20: .4byte 0x083185c8 -_080F2B24: .4byte 0x02021ec4 -_080F2B28: .4byte 0x0203a030 + .pool _080F2B2C: - ldr r1, _080F2B34 + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F311C .align 2, 0 -_080F2B34: .4byte 0x0203a030 + .pool _080F2B38: cmp r0, r1 bls _080F2B48 - ldr r1, _080F2B44 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F311C .align 2, 0 -_080F2B44: .4byte 0x0203a030 + .pool _080F2B48: - ldr r1, _080F2B50 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F311C .align 2, 0 -_080F2B50: .4byte 0x0203a030 + .pool _080F2B54: - ldr r0, _080F2B80 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2B84 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrb r1, [r6, 0xF] @@ -496518,8 +480017,7 @@ _080F2B76: _080F2B7C: b _080F2CAC .align 2, 0 -_080F2B80: .4byte 0x02021dc4 -_080F2B84: .4byte 0x083185c8 + .pool _080F2B88: cmp r1, 0x20 bne _080F2B8E @@ -496539,11 +480037,11 @@ _080F2B9A: _080F2BA0: b _080F2D20 _080F2BA2: - ldr r0, _080F2BC0 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2BC4 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy _080F2BB2: @@ -496556,37 +480054,34 @@ _080F2BBA: ble _080F2B70 b _080F2B88 .align 2, 0 -_080F2BC0: .4byte 0x02021dc4 -_080F2BC4: .4byte 0x083185c8 + .pool _080F2BC8: - ldr r0, _080F2BE8 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2BEC + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F2BF0 + ldr r0, =0x02021ec4 adds r1, r6, 0 adds r1, 0x14 ldrb r2, [r6, 0x1D] bl sub_81DB5E8 b _080F2BB2 .align 2, 0 -_080F2BE8: .4byte 0x02021dc4 -_080F2BEC: .4byte 0x083185c8 -_080F2BF0: .4byte 0x02021ec4 + .pool _080F2BF4: ldrb r0, [r6, 0x1C] cmp r0, 0x4 bhi _080F2C74 lsls r0, 2 - ldr r1, _080F2C04 + ldr r1, =_080F2C08 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F2C04: .4byte _080F2C08 + .pool .align 2, 0 _080F2C08: .4byte _080F2C1C @@ -496595,47 +480090,43 @@ _080F2C08: .4byte _080F2C58 .4byte _080F2C6C _080F2C1C: - ldr r0, _080F2C28 - ldr r1, _080F2C2C + ldr r0, =0x02021cc4 + ldr r1, =0x085eb0e8 bl gf_strcpy b _080F2C74 .align 2, 0 -_080F2C28: .4byte 0x02021cc4 -_080F2C2C: .4byte 0x085eb0e8 + .pool _080F2C30: - ldr r0, _080F2C3C - ldr r1, _080F2C40 + ldr r0, =0x02021cc4 + ldr r1, =0x085eb0ed bl gf_strcpy b _080F2C74 .align 2, 0 -_080F2C3C: .4byte 0x02021cc4 -_080F2C40: .4byte 0x085eb0ed + .pool _080F2C44: - ldr r0, _080F2C50 - ldr r1, _080F2C54 + ldr r0, =0x02021cc4 + ldr r1, =0x085eb0f4 bl gf_strcpy b _080F2C74 .align 2, 0 -_080F2C50: .4byte 0x02021cc4 -_080F2C54: .4byte 0x085eb0f4 + .pool _080F2C58: - ldr r0, _080F2C64 - ldr r1, _080F2C68 + ldr r0, =0x02021cc4 + ldr r1, =0x085eb0f9 bl gf_strcpy b _080F2C74 .align 2, 0 -_080F2C64: .4byte 0x02021cc4 -_080F2C68: .4byte 0x085eb0f9 + .pool _080F2C6C: - ldr r0, _080F2C9C - ldr r1, _080F2CA0 + ldr r0, =0x02021cc4 + ldr r1, =0x085eb0ff bl gf_strcpy _080F2C74: - ldr r0, _080F2CA4 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2CA8 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrb r1, [r6, 0xF] @@ -496652,10 +480143,7 @@ _080F2C96: beq _080F2CCA b _080F311C .align 2, 0 -_080F2C9C: .4byte 0x02021cc4 -_080F2CA0: .4byte 0x085eb0ff -_080F2CA4: .4byte 0x02021dc4 -_080F2CA8: .4byte 0x083185c8 + .pool _080F2CAC: cmp r1, 0x4 beq _080F2CE4 @@ -496676,97 +480164,94 @@ _080F2CC0: beq _080F2D20 b _080F311C _080F2CCA: - ldr r1, _080F2CD4 + ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] b _080F311C .align 2, 0 -_080F2CD4: .4byte 0x0203a030 + .pool _080F2CD8: - ldr r1, _080F2CE0 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F311C .align 2, 0 -_080F2CE0: .4byte 0x0203a030 + .pool _080F2CE4: - ldr r1, _080F2CEC + ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] b _080F311C .align 2, 0 -_080F2CEC: .4byte 0x0203a030 + .pool _080F2CF0: - ldr r1, _080F2CF8 + ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] b _080F311C .align 2, 0 -_080F2CF8: .4byte 0x0203a030 + .pool _080F2CFC: - ldr r1, _080F2D04 + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F311C .align 2, 0 -_080F2D04: .4byte 0x0203a030 + .pool _080F2D08: - ldr r1, _080F2D10 + ldr r1, =0x0203a030 movs r0, 0x14 strb r0, [r1] b _080F311C .align 2, 0 -_080F2D10: .4byte 0x0203a030 + .pool _080F2D14: - ldr r1, _080F2D1C + ldr r1, =0x0203a030 movs r0, 0x15 strb r0, [r1] b _080F311C .align 2, 0 -_080F2D1C: .4byte 0x0203a030 + .pool _080F2D20: - ldr r1, _080F2D28 + ldr r1, =0x0203a030 movs r0, 0x16 strb r0, [r1] b _080F311C .align 2, 0 -_080F2D28: .4byte 0x0203a030 + .pool _080F2D2C: - ldr r0, _080F2D38 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2D3C + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2D38: .4byte 0x02021dc4 -_080F2D3C: .4byte 0x083185c8 + .pool _080F2D40: - ldr r0, _080F2D4C + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2D50 + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2D4C: .4byte 0x02021dc4 -_080F2D50: .4byte 0x083185c8 + .pool _080F2D54: - ldr r0, _080F2D60 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2D64 + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2D60: .4byte 0x02021dc4 -_080F2D64: .4byte 0x083185c8 + .pool _080F2D68: - ldr r0, _080F2D8C + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2D90 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrb r0, [r6, 0x1C] @@ -496775,14 +480260,12 @@ _080F2D68: b _080F311C _080F2D80: lsls r0, 2 - ldr r1, _080F2D94 + ldr r1, =_080F2D98 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F2D8C: .4byte 0x02021dc4 -_080F2D90: .4byte 0x083185c8 -_080F2D94: .4byte _080F2D98 + .pool .align 2, 0 _080F2D98: .4byte _080F2DAC @@ -496791,96 +480274,91 @@ _080F2D98: .4byte _080F2DD0 .4byte _080F2DDC _080F2DAC: - ldr r1, _080F2DB4 + ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] b _080F311C .align 2, 0 -_080F2DB4: .4byte 0x0203a030 + .pool _080F2DB8: - ldr r1, _080F2DC0 + ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] b _080F311C .align 2, 0 -_080F2DC0: .4byte 0x0203a030 + .pool _080F2DC4: - ldr r1, _080F2DCC + ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] b _080F311C .align 2, 0 -_080F2DCC: .4byte 0x0203a030 + .pool _080F2DD0: - ldr r1, _080F2DD8 + ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] b _080F311C .align 2, 0 -_080F2DD8: .4byte 0x0203a030 + .pool _080F2DDC: - ldr r1, _080F2DE4 + ldr r1, =0x0203a030 movs r0, 0xD strb r0, [r1] b _080F311C .align 2, 0 -_080F2DE4: .4byte 0x0203a030 + .pool _080F2DE8: - ldr r0, _080F2DF4 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2DF8 + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2DF4: .4byte 0x02021dc4 -_080F2DF8: .4byte 0x083185c8 + .pool _080F2DFC: - ldr r0, _080F2E08 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2E0C + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2E08: .4byte 0x02021dc4 -_080F2E0C: .4byte 0x083185c8 + .pool _080F2E10: - ldr r0, _080F2E1C + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2E20 + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2E1C: .4byte 0x02021dc4 -_080F2E20: .4byte 0x083185c8 + .pool _080F2E24: - ldr r0, _080F2E30 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2E34 + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2E30: .4byte 0x02021dc4 -_080F2E34: .4byte 0x083185c8 + .pool _080F2E38: - ldr r0, _080F2E44 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2E48 + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2E44: .4byte 0x02021dc4 -_080F2E48: .4byte 0x083185c8 + .pool _080F2E4C: - ldr r0, _080F2E70 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2E74 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrb r0, [r6, 0x1C] @@ -496889,14 +480367,12 @@ _080F2E4C: b _080F311C _080F2E64: lsls r0, 2 - ldr r1, _080F2E78 + ldr r1, =_080F2E7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F2E70: .4byte 0x02021dc4 -_080F2E74: .4byte 0x083185c8 -_080F2E78: .4byte _080F2E7C + .pool .align 2, 0 _080F2E7C: .4byte _080F2E90 @@ -496905,149 +480381,138 @@ _080F2E7C: .4byte _080F2EB4 .4byte _080F2EC0 _080F2E90: - ldr r1, _080F2E98 + ldr r1, =0x0203a030 movs r0, 0xF strb r0, [r1] b _080F311C .align 2, 0 -_080F2E98: .4byte 0x0203a030 + .pool _080F2E9C: - ldr r1, _080F2EA4 + ldr r1, =0x0203a030 movs r0, 0x10 strb r0, [r1] b _080F311C .align 2, 0 -_080F2EA4: .4byte 0x0203a030 + .pool _080F2EA8: - ldr r1, _080F2EB0 + ldr r1, =0x0203a030 movs r0, 0x11 strb r0, [r1] b _080F311C .align 2, 0 -_080F2EB0: .4byte 0x0203a030 + .pool _080F2EB4: - ldr r1, _080F2EBC + ldr r1, =0x0203a030 movs r0, 0x12 strb r0, [r1] b _080F311C .align 2, 0 -_080F2EBC: .4byte 0x0203a030 + .pool _080F2EC0: - ldr r1, _080F2EC8 + ldr r1, =0x0203a030 movs r0, 0x13 strb r0, [r1] b _080F311C .align 2, 0 -_080F2EC8: .4byte 0x0203a030 + .pool _080F2ECC: - ldr r0, _080F2ED8 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2EDC + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2ED8: .4byte 0x02021dc4 -_080F2EDC: .4byte 0x083185c8 + .pool _080F2EE0: - ldr r0, _080F2EEC + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2EF0 + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2EEC: .4byte 0x02021dc4 -_080F2EF0: .4byte 0x083185c8 + .pool _080F2EF4: - ldr r0, _080F2F00 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2F04 + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2F00: .4byte 0x02021dc4 -_080F2F04: .4byte 0x083185c8 + .pool _080F2F08: - ldr r0, _080F2F14 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2F18 + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2F14: .4byte 0x02021dc4 -_080F2F18: .4byte 0x083185c8 + .pool _080F2F1C: - ldr r0, _080F2F28 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2F2C + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2F28: .4byte 0x02021dc4 -_080F2F2C: .4byte 0x083185c8 + .pool _080F2F30: - ldr r0, _080F2F3C + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2F40 + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2F3C: .4byte 0x02021dc4 -_080F2F40: .4byte 0x083185c8 + .pool _080F2F44: - ldr r0, _080F2F50 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2F54 + ldr r2, =0x083185c8 b _080F2F72 .align 2, 0 -_080F2F50: .4byte 0x02021dc4 -_080F2F54: .4byte 0x083185c8 + .pool _080F2F58: - ldr r0, _080F2F80 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F2F84 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F2F88 + ldr r0, =0x02021ec4 ldrh r2, [r6, 0x10] movs r1, 0xD muls r1, r2 - ldr r2, _080F2F8C + ldr r2, =0x0831977c _080F2F72: adds r1, r2 bl gf_strcpy - ldr r1, _080F2F90 + ldr r1, =0x0203a030 movs r0, 0x17 strb r0, [r1] b _080F311C .align 2, 0 -_080F2F80: .4byte 0x02021dc4 -_080F2F84: .4byte 0x083185c8 -_080F2F88: .4byte 0x02021ec4 -_080F2F8C: .4byte 0x0831977c -_080F2F90: .4byte 0x0203a030 + .pool _080F2F94: - ldr r0, _080F2FD4 + ldr r0, =0x02021cc4 ldrh r1, [r6, 0x12] movs r5, 0xB muls r1, r5 - ldr r4, _080F2FD8 + ldr r4, =0x083185c8 adds r1, r4 bl gf_strcpy - ldr r0, _080F2FDC + ldr r0, =0x02021dc4 adds r1, r6, 0x4 ldrb r2, [r6, 0x1E] bl sub_81DB5E8 - ldr r0, _080F2FE0 + ldr r0, =0x02021ec4 ldrh r1, [r6, 0x2] muls r1, r5 adds r1, r4 @@ -497065,10 +480530,7 @@ _080F2F94: beq _080F3002 b _080F311C .align 2, 0 -_080F2FD4: .4byte 0x02021cc4 -_080F2FD8: .4byte 0x083185c8 -_080F2FDC: .4byte 0x02021dc4 -_080F2FE0: .4byte 0x02021ec4 + .pool _080F2FE4: cmp r0, 0x4 beq _080F301C @@ -497088,144 +480550,137 @@ _080F2FF8: beq _080F3058 b _080F311C _080F3002: - ldr r1, _080F300C + ldr r1, =0x0203a030 movs r0, 0x1F strb r0, [r1] b _080F311C .align 2, 0 -_080F300C: .4byte 0x0203a030 + .pool _080F3010: - ldr r1, _080F3018 + ldr r1, =0x0203a030 movs r0, 0x1E strb r0, [r1] b _080F311C .align 2, 0 -_080F3018: .4byte 0x0203a030 + .pool _080F301C: - ldr r1, _080F3024 + ldr r1, =0x0203a030 movs r0, 0x1D strb r0, [r1] b _080F311C .align 2, 0 -_080F3024: .4byte 0x0203a030 + .pool _080F3028: - ldr r1, _080F3030 + ldr r1, =0x0203a030 movs r0, 0x1C strb r0, [r1] b _080F311C .align 2, 0 -_080F3030: .4byte 0x0203a030 + .pool _080F3034: - ldr r1, _080F303C + ldr r1, =0x0203a030 movs r0, 0x1B strb r0, [r1] b _080F311C .align 2, 0 -_080F303C: .4byte 0x0203a030 + .pool _080F3040: - ldr r1, _080F3048 + ldr r1, =0x0203a030 movs r0, 0x1A strb r0, [r1] b _080F311C .align 2, 0 -_080F3048: .4byte 0x0203a030 + .pool _080F304C: - ldr r1, _080F3054 + ldr r1, =0x0203a030 movs r0, 0x19 strb r0, [r1] b _080F311C .align 2, 0 -_080F3054: .4byte 0x0203a030 + .pool _080F3058: - ldr r1, _080F3060 + ldr r1, =0x0203a030 movs r0, 0x18 strb r0, [r1] b _080F311C .align 2, 0 -_080F3060: .4byte 0x0203a030 + .pool _080F3064: - ldr r0, _080F3078 + ldr r0, =0x02021cc4 ldrh r2, [r6, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F307C + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy b _080F30EA .align 2, 0 -_080F3078: .4byte 0x02021cc4 -_080F307C: .4byte 0x083185c8 + .pool _080F3080: - ldr r0, _080F309C + ldr r0, =0x02021cc4 adds r1, r6, 0x4 ldrb r2, [r6, 0x1E] bl sub_81DB5E8 - ldr r0, _080F30A0 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F30A4 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy b _080F30EA .align 2, 0 -_080F309C: .4byte 0x02021cc4 -_080F30A0: .4byte 0x02021dc4 -_080F30A4: .4byte 0x083185c8 + .pool _080F30A8: movs r0, 0x20 strb r0, [r2] b _080F311C _080F30AE: - ldr r0, _080F30D0 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x14 ldrb r2, [r6, 0x1D] bl sub_81DB5E8 - ldr r0, _080F30D4 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F30D8 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F30DC + ldr r0, =0x02021ec4 b _080F30E2 .align 2, 0 -_080F30D0: .4byte 0x02021cc4 -_080F30D4: .4byte 0x02021dc4 -_080F30D8: .4byte 0x083185c8 -_080F30DC: .4byte 0x02021ec4 + .pool _080F30E0: - ldr r0, _080F30F4 + ldr r0, =0x02021cc4 _080F30E2: adds r1, r6, 0x4 ldrb r2, [r6, 0x1E] bl sub_81DB5E8 _080F30EA: - ldr r1, _080F30F8 + ldr r1, =0x0203a030 movs r0, 0x20 strb r0, [r1] b _080F311C .align 2, 0 -_080F30F4: .4byte 0x02021cc4 -_080F30F8: .4byte 0x0203a030 + .pool _080F30FC: - ldr r0, _080F3130 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x14 ldrb r2, [r6, 0x1D] bl sub_81DB5E8 - ldr r0, _080F3134 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 - ldr r2, _080F3138 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy bl sub_80F577C _080F311C: - ldr r0, _080F313C + ldr r0, =0x0858d27c lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] @@ -497234,29 +480689,26 @@ _080F311C: pop {r0} bx r0 .align 2, 0 -_080F3130: .4byte 0x02021cc4 -_080F3134: .4byte 0x02021dc4 -_080F3138: .4byte 0x083185c8 -_080F313C: .4byte 0x0858d27c + .pool thumb_func_end sub_80F2A10 thumb_func_start sub_80F3140 sub_80F3140: @ 80F3140 push {r4,r5,lr} - ldr r2, _080F3174 - ldr r0, _080F3178 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F317C + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F3180 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F3184 + ldr r0, =0x0203a030 ldrb r5, [r0] adds r2, r0, 0 cmp r5, 0x7 @@ -497264,17 +480716,12 @@ sub_80F3140: @ 80F3140 b _080F3362 _080F3168: lsls r0, r5, 2 - ldr r1, _080F3188 + ldr r1, =_080F318C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F3174: .4byte 0x03005d8c -_080F3178: .4byte 0x020375e0 -_080F317C: .4byte 0x000027cc -_080F3180: .4byte 0x020375f0 -_080F3184: .4byte 0x0203a030 -_080F3188: .4byte _080F318C + .pool .align 2, 0 _080F318C: .4byte _080F31AC @@ -497305,11 +480752,11 @@ _080F31C4: strb r0, [r2] b _080F3362 _080F31CA: - ldr r0, _080F31F0 + ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] bl sub_81DB5E8 - ldr r0, _080F31F4 + ldr r0, =0x02021dc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1A] @@ -497317,86 +480764,73 @@ _080F31CA: ldrb r0, [r4, 0x18] cmp r0, 0 bne _080F3200 - ldr r0, _080F31F8 - ldr r1, _080F31FC + ldr r0, =0x02021ec4 + ldr r1, =0x085ecb64 bl gf_strcpy b _080F3208 .align 2, 0 -_080F31F0: .4byte 0x02021cc4 -_080F31F4: .4byte 0x02021dc4 -_080F31F8: .4byte 0x02021ec4 -_080F31FC: .4byte 0x085ecb64 + .pool _080F3200: - ldr r0, _080F3210 - ldr r1, _080F3214 + ldr r0, =0x02021ec4 + ldr r1, =0x085ecb6b bl gf_strcpy _080F3208: - ldr r1, _080F3218 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F3362 .align 2, 0 -_080F3210: .4byte 0x02021ec4 -_080F3214: .4byte 0x085ecb6b -_080F3218: .4byte 0x0203a030 + .pool _080F321C: - ldr r0, _080F3250 + ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] bl sub_81DB5E8 - ldr r0, _080F3254 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0x16] movs r1, 0xB muls r1, r2 - ldr r2, _080F3258 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F325C + ldr r0, =0x02021ec4 ldrh r2, [r4, 0x14] movs r1, 0xD muls r1, r2 - ldr r2, _080F3260 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r1, _080F3264 + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F3362 .align 2, 0 -_080F3250: .4byte 0x02021cc4 -_080F3254: .4byte 0x02021dc4 -_080F3258: .4byte 0x083185c8 -_080F325C: .4byte 0x02021ec4 -_080F3260: .4byte 0x0831977c -_080F3264: .4byte 0x0203a030 + .pool _080F3268: - ldr r0, _080F328C + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1A] bl sub_81DB5E8 - ldr r0, _080F3290 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F3294 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r1, _080F3298 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F3362 .align 2, 0 -_080F328C: .4byte 0x02021cc4 -_080F3290: .4byte 0x02021dc4 -_080F3294: .4byte 0x083185c8 -_080F3298: .4byte 0x0203a030 + .pool _080F329C: - ldr r0, _080F32B8 + ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] bl sub_81DB5E8 - ldr r0, _080F32BC + ldr r0, =0x02021dc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1A] @@ -497404,76 +480838,68 @@ _080F329C: bl sub_80F577C b _080F3362 .align 2, 0 -_080F32B8: .4byte 0x02021cc4 -_080F32BC: .4byte 0x02021dc4 + .pool _080F32C0: - ldr r0, _080F32E0 + ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] bl sub_81DB5E8 - ldr r0, _080F32E4 + ldr r0, =0x02021dc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1A] bl sub_81DB5E8 - ldr r1, _080F32E8 + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F3362 .align 2, 0 -_080F32E0: .4byte 0x02021cc4 -_080F32E4: .4byte 0x02021dc4 -_080F32E8: .4byte 0x0203a030 + .pool _080F32EC: - ldr r0, _080F3320 + ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] bl sub_81DB5E8 - ldr r0, _080F3324 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0x16] movs r1, 0xB muls r1, r2 - ldr r2, _080F3328 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F332C + ldr r0, =0x02021ec4 ldrh r2, [r4, 0x14] movs r1, 0xD muls r1, r2 - ldr r2, _080F3330 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r1, _080F3334 + ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] b _080F3362 .align 2, 0 -_080F3320: .4byte 0x02021cc4 -_080F3324: .4byte 0x02021dc4 -_080F3328: .4byte 0x083185c8 -_080F332C: .4byte 0x02021ec4 -_080F3330: .4byte 0x0831977c -_080F3334: .4byte 0x0203a030 + .pool _080F3338: - ldr r0, _080F3374 + ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] bl sub_81DB5E8 - ldr r0, _080F3378 + ldr r0, =0x02021dc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1A] bl sub_81DB5E8 - ldr r0, _080F337C + ldr r0, =0x02021ec4 ldrh r2, [r4, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F3380 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy bl sub_80F577C _080F3362: - ldr r0, _080F3384 + ldr r0, =0x0858d300 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -497482,47 +480908,38 @@ _080F3362: pop {r0} bx r0 .align 2, 0 -_080F3374: .4byte 0x02021cc4 -_080F3378: .4byte 0x02021dc4 -_080F337C: .4byte 0x02021ec4 -_080F3380: .4byte 0x083185c8 -_080F3384: .4byte 0x0858d300 + .pool thumb_func_end sub_80F3140 thumb_func_start sub_80F3388 sub_80F3388: @ 80F3388 push {r4,r5,lr} - ldr r2, _080F33B8 - ldr r0, _080F33BC + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F33C0 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F33C4 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F33C8 + ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x5 bls _080F33AE b _080F3624 _080F33AE: lsls r0, r5, 2 - ldr r1, _080F33CC + ldr r1, =_080F33D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F33B8: .4byte 0x03005d8c -_080F33BC: .4byte 0x020375e0 -_080F33C0: .4byte 0x000027cc -_080F33C4: .4byte 0x020375f0 -_080F33C8: .4byte 0x0203a030 -_080F33CC: .4byte _080F33D0 + .pool .align 2, 0 _080F33D0: .4byte _080F33E8 @@ -497532,7 +480949,7 @@ _080F33D0: .4byte _080F35F4 .4byte _080F3620 _080F33E8: - ldr r0, _080F3404 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x14] @@ -497540,20 +480957,19 @@ _080F33E8: ldrb r0, [r4, 0x2] cmp r0, 0x14 bls _080F340C - ldr r1, _080F3408 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F3624 .align 2, 0 -_080F3404: .4byte 0x02021cc4 -_080F3408: .4byte 0x0203a030 + .pool _080F340C: - ldr r1, _080F3414 + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F3624 .align 2, 0 -_080F3414: .4byte 0x0203a030 + .pool _080F3418: ldrb r0, [r4, 0x3] lsls r0, 29 @@ -497561,12 +480977,12 @@ _080F3418: cmp r0, 0x4 bhi _080F349C lsls r0, 2 - ldr r1, _080F342C + ldr r1, =_080F3430 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F342C: .4byte _080F3430 + .pool .align 2, 0 _080F3430: .4byte _080F3444 @@ -497575,90 +480991,79 @@ _080F3430: .4byte _080F3480 .4byte _080F3494 _080F3444: - ldr r0, _080F3450 - ldr r1, _080F3454 + ldr r0, =0x02021cc4 + ldr r1, =0x085ecb48 bl gf_strcpy b _080F349C .align 2, 0 -_080F3450: .4byte 0x02021cc4 -_080F3454: .4byte 0x085ecb48 + .pool _080F3458: - ldr r0, _080F3464 - ldr r1, _080F3468 + ldr r0, =0x02021cc4 + ldr r1, =0x085ecb4e bl gf_strcpy b _080F349C .align 2, 0 -_080F3464: .4byte 0x02021cc4 -_080F3468: .4byte 0x085ecb4e + .pool _080F346C: - ldr r0, _080F3478 - ldr r1, _080F347C + ldr r0, =0x02021cc4 + ldr r1, =0x085ecb52 bl gf_strcpy b _080F349C .align 2, 0 -_080F3478: .4byte 0x02021cc4 -_080F347C: .4byte 0x085ecb52 + .pool _080F3480: - ldr r0, _080F348C - ldr r1, _080F3490 + ldr r0, =0x02021cc4 + ldr r1, =0x085ecb58 bl gf_strcpy b _080F349C .align 2, 0 -_080F348C: .4byte 0x02021cc4 -_080F3490: .4byte 0x085ecb58 + .pool _080F3494: - ldr r0, _080F34AC - ldr r1, _080F34B0 + ldr r0, =0x02021cc4 + ldr r1, =0x085ecb5f bl gf_strcpy _080F349C: ldrb r0, [r4, 0x2] cmp r0, 0x18 bls _080F34BC - ldr r0, _080F34B4 - ldr r1, _080F34B8 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb2a bl gf_strcpy b _080F34DC .align 2, 0 -_080F34AC: .4byte 0x02021cc4 -_080F34B0: .4byte 0x085ecb5f -_080F34B4: .4byte 0x02021dc4 -_080F34B8: .4byte 0x085ecb2a + .pool _080F34BC: cmp r0, 0x16 bls _080F34D4 - ldr r0, _080F34CC - ldr r1, _080F34D0 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb20 bl gf_strcpy b _080F34DC .align 2, 0 -_080F34CC: .4byte 0x02021dc4 -_080F34D0: .4byte 0x085ecb20 + .pool _080F34D4: - ldr r0, _080F34F0 - ldr r1, _080F34F4 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb1b bl gf_strcpy _080F34DC: - ldr r0, _080F34F8 + ldr r0, =0x02021ec4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x14] bl sub_81DB5E8 - ldr r1, _080F34FC + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F3624 .align 2, 0 -_080F34F0: .4byte 0x02021dc4 -_080F34F4: .4byte 0x085ecb1b -_080F34F8: .4byte 0x02021ec4 -_080F34FC: .4byte 0x0203a030 + .pool _080F3500: - ldr r0, _080F3508 + ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x15] b _080F3606 .align 2, 0 -_080F3508: .4byte 0x02021cc4 + .pool _080F350C: ldrb r0, [r4, 0x3] lsls r0, 29 @@ -497666,12 +481071,12 @@ _080F350C: cmp r0, 0x4 bhi _080F3590 lsls r0, 2 - ldr r1, _080F3520 + ldr r1, =_080F3524 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F3520: .4byte _080F3524 + .pool .align 2, 0 _080F3524: .4byte _080F3538 @@ -497680,106 +481085,93 @@ _080F3524: .4byte _080F3574 .4byte _080F3588 _080F3538: - ldr r0, _080F3544 - ldr r1, _080F3548 + ldr r0, =0x02021cc4 + ldr r1, =0x085ecb48 bl gf_strcpy b _080F3590 .align 2, 0 -_080F3544: .4byte 0x02021cc4 -_080F3548: .4byte 0x085ecb48 + .pool _080F354C: - ldr r0, _080F3558 - ldr r1, _080F355C + ldr r0, =0x02021cc4 + ldr r1, =0x085ecb4e bl gf_strcpy b _080F3590 .align 2, 0 -_080F3558: .4byte 0x02021cc4 -_080F355C: .4byte 0x085ecb4e + .pool _080F3560: - ldr r0, _080F356C - ldr r1, _080F3570 + ldr r0, =0x02021cc4 + ldr r1, =0x085ecb52 bl gf_strcpy b _080F3590 .align 2, 0 -_080F356C: .4byte 0x02021cc4 -_080F3570: .4byte 0x085ecb52 + .pool _080F3574: - ldr r0, _080F3580 - ldr r1, _080F3584 + ldr r0, =0x02021cc4 + ldr r1, =0x085ecb58 bl gf_strcpy b _080F3590 .align 2, 0 -_080F3580: .4byte 0x02021cc4 -_080F3584: .4byte 0x085ecb58 + .pool _080F3588: - ldr r0, _080F35A0 - ldr r1, _080F35A4 + ldr r0, =0x02021cc4 + ldr r1, =0x085ecb5f bl gf_strcpy _080F3590: ldrb r0, [r4, 0x2] cmp r0, 0x10 bls _080F35B0 - ldr r0, _080F35A8 - ldr r1, _080F35AC + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb34 bl gf_strcpy b _080F35D0 .align 2, 0 -_080F35A0: .4byte 0x02021cc4 -_080F35A4: .4byte 0x085ecb5f -_080F35A8: .4byte 0x02021dc4 -_080F35AC: .4byte 0x085ecb34 + .pool _080F35B0: cmp r0, 0xD bls _080F35C8 - ldr r0, _080F35C0 - ldr r1, _080F35C4 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb3a bl gf_strcpy b _080F35D0 .align 2, 0 -_080F35C0: .4byte 0x02021dc4 -_080F35C4: .4byte 0x085ecb3a + .pool _080F35C8: - ldr r0, _080F35E4 - ldr r1, _080F35E8 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb3e bl gf_strcpy _080F35D0: - ldr r0, _080F35EC + ldr r0, =0x02021ec4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x14] bl sub_81DB5E8 - ldr r1, _080F35F0 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F3624 .align 2, 0 -_080F35E4: .4byte 0x02021dc4 -_080F35E8: .4byte 0x085ecb3e -_080F35EC: .4byte 0x02021ec4 -_080F35F0: .4byte 0x0203a030 + .pool _080F35F4: - ldr r0, _080F3614 + ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x15] bl sub_81DB5E8 - ldr r0, _080F3618 + ldr r0, =0x02021dc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x14] _080F3606: bl sub_81DB5E8 - ldr r1, _080F361C + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F3624 .align 2, 0 -_080F3614: .4byte 0x02021cc4 -_080F3618: .4byte 0x02021dc4 -_080F361C: .4byte 0x0203a030 + .pool _080F3620: bl sub_80F577C _080F3624: - ldr r0, _080F3638 + ldr r0, =0x0858d228 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -497788,16 +481180,16 @@ _080F3624: pop {r0} bx r0 .align 2, 0 -_080F3638: .4byte 0x0858d228 + .pool thumb_func_end sub_80F3388 thumb_func_start sub_80F363C sub_80F363C: @ 80F363C push {r4-r7,lr} - ldr r0, _080F365C + ldr r0, =0x020375f0 movs r1, 0 strh r1, [r0] - ldr r0, _080F3660 + ldr r0, =0x0203a030 ldrb r7, [r0] adds r2, r0, 0 cmp r7, 0x8 @@ -497805,14 +481197,12 @@ sub_80F363C: @ 80F363C b _080F37EA _080F3650: lsls r0, r7, 2 - ldr r1, _080F3664 + ldr r1, =_080F3668 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F365C: .4byte 0x020375f0 -_080F3660: .4byte 0x0203a030 -_080F3664: .4byte _080F3668 + .pool .align 2, 0 _080F3668: .4byte _080F368C @@ -497825,45 +481215,41 @@ _080F3668: .4byte _080F379C .4byte _080F37A2 _080F368C: - ldr r0, _080F36B4 - ldr r4, _080F36B8 + ldr r0, =0x02021cc4 + ldr r4, =0x03005d8c ldr r1, [r4] - ldr r2, _080F36BC + ldr r2, =0x00002bac adds r1, r2 ldrb r1, [r1] movs r2, 0 bl GetMapName ldr r0, [r4] - ldr r1, _080F36C0 + ldr r1, =0x00002bad adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 bls _080F36C8 - ldr r1, _080F36C4 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F37EA .align 2, 0 -_080F36B4: .4byte 0x02021cc4 -_080F36B8: .4byte 0x03005d8c -_080F36BC: .4byte 0x00002bac -_080F36C0: .4byte 0x00002bad -_080F36C4: .4byte 0x0203a030 + .pool _080F36C8: - ldr r1, _080F36D0 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F37EA .align 2, 0 -_080F36D0: .4byte 0x0203a030 + .pool _080F36D4: movs r0, 0x2 strb r0, [r2] b _080F37EA _080F36DA: - ldr r0, _080F36F4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080F36F8 + ldr r1, =0x00002bae adds r0, r1 ldrb r1, [r0] movs r0, 0x1 @@ -497874,8 +481260,7 @@ _080F36DA: strb r0, [r2] b _080F37EA .align 2, 0 -_080F36F4: .4byte 0x03005d8c -_080F36F8: .4byte 0x00002bae + .pool _080F36FC: movs r0, 0x8 ands r0, r1 @@ -497905,89 +481290,80 @@ _080F3726: strb r0, [r2] b _080F37EA _080F372C: - ldr r0, _080F3774 - ldr r4, _080F3778 + ldr r0, =0x02021cc4 + ldr r4, =0x03005d8c ldr r1, [r4] - ldr r2, _080F377C + ldr r2, =0x00002ba4 adds r1, r2 ldrh r1, [r1] movs r6, 0xB muls r1, r6 - ldr r5, _080F3780 + ldr r5, =0x083185c8 adds r1, r5 bl gf_strcpy - ldr r0, _080F3784 + ldr r0, =0x02021dc4 ldr r1, [r4] - ldr r2, _080F3788 + ldr r2, =0x00002ba8 adds r1, r2 ldrh r2, [r1] movs r1, 0xD muls r1, r2 - ldr r2, _080F378C + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r0, _080F3790 + ldr r0, =0x02021ec4 ldr r1, [r4] - ldr r2, _080F3794 + ldr r2, =0x00002ba6 adds r1, r2 ldrh r1, [r1] muls r1, r6 adds r1, r5 bl gf_strcpy - ldr r1, _080F3798 + ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] b _080F37EA .align 2, 0 -_080F3774: .4byte 0x02021cc4 -_080F3778: .4byte 0x03005d8c -_080F377C: .4byte 0x00002ba4 -_080F3780: .4byte 0x083185c8 -_080F3784: .4byte 0x02021dc4 -_080F3788: .4byte 0x00002ba8 -_080F378C: .4byte 0x0831977c -_080F3790: .4byte 0x02021ec4 -_080F3794: .4byte 0x00002ba6 -_080F3798: .4byte 0x0203a030 + .pool _080F379C: movs r0, 0x8 strb r0, [r2] b _080F37EA _080F37A2: - ldr r0, _080F37FC - ldr r4, _080F3800 + ldr r0, =0x02021cc4 + ldr r4, =0x03005d8c ldr r1, [r4] - ldr r2, _080F3804 + ldr r2, =0x00002baa adds r1, r2 ldrh r1, [r1] bl sub_811EBBC - ldr r0, _080F3808 + ldr r0, =0x02021dc4 ldr r1, [r4] - ldr r2, _080F380C + ldr r2, =0x00002ba4 adds r1, r2 ldrh r1, [r1] movs r6, 0xB muls r1, r6 - ldr r5, _080F3810 + ldr r5, =0x083185c8 adds r1, r5 bl gf_strcpy - ldr r0, _080F3814 + ldr r0, =0x02021ec4 ldr r1, [r4] - ldr r2, _080F3818 + ldr r2, =0x00002ba6 adds r1, r2 ldrh r1, [r1] muls r1, r6 adds r1, r5 bl gf_strcpy - ldr r1, _080F381C + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - ldr r1, _080F3820 + ldr r1, =0x0203a030 movs r0, 0 strb r0, [r1] bl sub_80EC4E8 _080F37EA: - ldr r0, _080F3824 + ldr r0, =0x0858d66c lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] @@ -497996,50 +481372,36 @@ _080F37EA: pop {r0} bx r0 .align 2, 0 -_080F37FC: .4byte 0x02021cc4 -_080F3800: .4byte 0x03005d8c -_080F3804: .4byte 0x00002baa -_080F3808: .4byte 0x02021dc4 -_080F380C: .4byte 0x00002ba4 -_080F3810: .4byte 0x083185c8 -_080F3814: .4byte 0x02021ec4 -_080F3818: .4byte 0x00002ba6 -_080F381C: .4byte 0x020375f0 -_080F3820: .4byte 0x0203a030 -_080F3824: .4byte 0x0858d66c + .pool thumb_func_end sub_80F363C thumb_func_start sub_80F3828 sub_80F3828: @ 80F3828 push {r4,r5,lr} - ldr r2, _080F3854 - ldr r0, _080F3858 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F385C + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r0, _080F3860 + ldr r0, =0x020375f0 movs r1, 0 strh r1, [r0] ldrb r0, [r4, 0x2] ldrb r2, [r4, 0x3] cmp r0, r2 bcs _080F3868 - ldr r0, _080F3864 + ldr r0, =0x0203a030 strb r1, [r0] b _080F3870 .align 2, 0 -_080F3854: .4byte 0x03005d8c -_080F3858: .4byte 0x020375e0 -_080F385C: .4byte 0x000027cc -_080F3860: .4byte 0x020375f0 -_080F3864: .4byte 0x0203a030 + .pool _080F3868: - ldr r1, _080F387C + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] adds r0, r1, 0 @@ -498051,18 +481413,18 @@ _080F3870: beq _080F38B8 b _080F38E0 .align 2, 0 -_080F387C: .4byte 0x0203a030 + .pool _080F3880: - ldr r0, _080F38AC + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x6] bl sub_81DB5E8 - ldr r0, _080F38B0 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0x4] movs r1, 0xB muls r1, r2 - ldr r2, _080F38B4 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrb r1, [r4, 0x3] @@ -498071,20 +481433,18 @@ _080F3880: bl sub_80F577C b _080F38E0 .align 2, 0 -_080F38AC: .4byte 0x02021cc4 -_080F38B0: .4byte 0x02021dc4 -_080F38B4: .4byte 0x083185c8 + .pool _080F38B8: - ldr r0, _080F38F4 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x6] bl sub_81DB5E8 - ldr r0, _080F38F8 + ldr r0, =0x02021dc4 ldrh r2, [r4, 0x4] movs r1, 0xB muls r1, r2 - ldr r2, _080F38FC + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrb r1, [r4, 0x2] @@ -498092,7 +481452,7 @@ _080F38B8: bl sub_80EF340 bl sub_80F577C _080F38E0: - ldr r0, _080F3900 + ldr r0, =0x0858d3b0 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -498101,29 +481461,26 @@ _080F38E0: pop {r0} bx r0 .align 2, 0 -_080F38F4: .4byte 0x02021cc4 -_080F38F8: .4byte 0x02021dc4 -_080F38FC: .4byte 0x083185c8 -_080F3900: .4byte 0x0858d3b0 + .pool thumb_func_end sub_80F3828 thumb_func_start sub_80F3904 sub_80F3904: @ 80F3904 push {r4-r6,lr} - ldr r2, _080F3934 - ldr r0, _080F3938 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F393C + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F3940 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r6, _080F3944 + ldr r6, =0x0203a030 ldrb r5, [r6] cmp r5, 0x1 beq _080F3974 @@ -498133,17 +481490,13 @@ sub_80F3904: @ 80F3904 beq _080F394E b _080F39BE .align 2, 0 -_080F3934: .4byte 0x03005d8c -_080F3938: .4byte 0x020375e0 -_080F393C: .4byte 0x000027cc -_080F3940: .4byte 0x020375f0 -_080F3944: .4byte 0x0203a030 + .pool _080F3948: cmp r5, 0x2 beq _080F3994 b _080F39BE _080F394E: - ldr r0, _080F3970 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xB] @@ -498158,41 +481511,40 @@ _080F394E: strb r0, [r6] b _080F39BE .align 2, 0 -_080F3970: .4byte 0x02021cc4 + .pool _080F3974: - ldr r0, _080F398C + ldr r0, =0x02021cc4 ldrh r2, [r4, 0x8] movs r1, 0xB muls r1, r2 - ldr r2, _080F3990 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy movs r0, 0x2 strb r0, [r6] b _080F39BE .align 2, 0 -_080F398C: .4byte 0x02021cc4 -_080F3990: .4byte 0x083185c8 + .pool _080F3994: - ldr r0, _080F39D0 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xB] bl sub_81DB5E8 - ldr r0, _080F39D4 + ldr r0, =0x02021dc4 ldrb r1, [r4, 0xA] movs r2, 0 bl GetMapName - ldr r0, _080F39D8 + ldr r0, =0x02021ec4 ldrh r2, [r4, 0x4] movs r1, 0xB muls r1, r2 - ldr r2, _080F39DC + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy bl sub_80F577C _080F39BE: - ldr r0, _080F39E0 + ldr r0, =0x0858d3b8 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -498201,30 +481553,26 @@ _080F39BE: pop {r0} bx r0 .align 2, 0 -_080F39D0: .4byte 0x02021cc4 -_080F39D4: .4byte 0x02021dc4 -_080F39D8: .4byte 0x02021ec4 -_080F39DC: .4byte 0x083185c8 -_080F39E0: .4byte 0x0858d3b8 + .pool thumb_func_end sub_80F3904 thumb_func_start sub_80F39E4 sub_80F39E4: @ 80F39E4 push {r4,r5,lr} - ldr r2, _080F3A18 - ldr r0, _080F3A1C + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F3A20 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F3A24 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F3A28 + ldr r0, =0x0203a030 ldrb r5, [r0] adds r2, r0, 0 cmp r5, 0xA @@ -498232,17 +481580,12 @@ sub_80F39E4: @ 80F39E4 b _080F3BE8 _080F3A0C: lsls r0, r5, 2 - ldr r1, _080F3A2C + ldr r1, =_080F3A30 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F3A18: .4byte 0x03005d8c -_080F3A1C: .4byte 0x020375e0 -_080F3A20: .4byte 0x000027cc -_080F3A24: .4byte 0x020375f0 -_080F3A28: .4byte 0x0203a030 -_080F3A2C: .4byte _080F3A30 + .pool .align 2, 0 _080F3A30: .4byte _080F3A5C @@ -498271,7 +481614,7 @@ _080F3A6C: b _080F3BE8 _080F3A72: ldrh r1, [r4, 0xA] - ldr r0, _080F3A88 + ldr r0, =0x00000117 cmp r1, r0 bgt _080F3A8C subs r0, 0x2 @@ -498281,13 +481624,13 @@ _080F3A72: strb r0, [r2] b _080F3BE8 .align 2, 0 -_080F3A88: .4byte 0x00000117 + .pool _080F3A8C: movs r0, 0x9 strb r0, [r2] b _080F3BE8 _080F3A92: - ldr r0, _080F3AB8 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xC] @@ -498295,7 +481638,7 @@ _080F3A92: ldrh r1, [r4, 0x2] movs r0, 0x1 bl sub_80EF340 - ldr r0, _080F3ABC + ldr r0, =0x02021ec4 ldrb r1, [r4, 0x7] movs r2, 0 bl GetMapName @@ -498305,10 +481648,9 @@ _080F3AB0: bne _080F3B12 b _080F3B24 .align 2, 0 -_080F3AB8: .4byte 0x02021cc4 -_080F3ABC: .4byte 0x02021ec4 + .pool _080F3AC0: - ldr r0, _080F3AD8 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xC] @@ -498318,9 +481660,9 @@ _080F3AC0: bl sub_80EF340 b _080F3AB0 .align 2, 0 -_080F3AD8: .4byte 0x02021cc4 + .pool _080F3ADC: - ldr r0, _080F3AF4 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xC] @@ -498330,9 +481672,9 @@ _080F3ADC: bl sub_80EF340 b _080F3AB0 .align 2, 0 -_080F3AF4: .4byte 0x02021cc4 + .pool _080F3AF8: - ldr r0, _080F3B1C + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xC] @@ -498344,65 +481686,61 @@ _080F3AF8: cmp r0, 0 beq _080F3B24 _080F3B12: - ldr r1, _080F3B20 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F3BE8 .align 2, 0 -_080F3B1C: .4byte 0x02021cc4 -_080F3B20: .4byte 0x0203a030 + .pool _080F3B24: - ldr r1, _080F3B2C + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F3BE8 .align 2, 0 -_080F3B2C: .4byte 0x0203a030 + .pool _080F3B30: ldrb r1, [r4, 0x4] movs r0, 0 bl sub_80EF340 - ldr r0, _080F3B50 + ldr r0, =0x000008a8 bl flag_check lsls r0, 24 cmp r0, 0 beq _080F3BCC ldr r0, [r4, 0x4] - ldr r1, _080F3B54 + ldr r1, =0x00ffff00 ands r0, r1 cmp r0, 0 bne _080F3B6E b _080F3B84 .align 2, 0 -_080F3B50: .4byte 0x000008a8 -_080F3B54: .4byte 0x00ffff00 + .pool _080F3B58: - ldr r0, _080F3B78 + ldr r0, =0x000008a8 bl flag_check lsls r0, 24 cmp r0, 0 beq _080F3BCC ldr r0, [r4, 0x4] - ldr r1, _080F3B7C + ldr r1, =0x00ffff00 ands r0, r1 cmp r0, 0 beq _080F3B84 _080F3B6E: - ldr r1, _080F3B80 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F3BE8 .align 2, 0 -_080F3B78: .4byte 0x000008a8 -_080F3B7C: .4byte 0x00ffff00 -_080F3B80: .4byte 0x0203a030 + .pool _080F3B84: - ldr r1, _080F3B8C + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F3BE8 .align 2, 0 -_080F3B8C: .4byte 0x0203a030 + .pool _080F3B90: ldrh r0, [r4, 0x8] cmp r0, 0 @@ -498424,32 +481762,32 @@ _080F3BA2: ldrh r0, [r4, 0x8] cmp r0, 0 beq _080F3BCC - ldr r1, _080F3BC0 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F3BE8 .align 2, 0 -_080F3BC0: .4byte 0x0203a030 + .pool _080F3BC4: ldrh r1, [r4, 0x8] movs r0, 0 bl sub_80EF340 _080F3BCC: - ldr r1, _080F3BD4 + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F3BE8 .align 2, 0 -_080F3BD4: .4byte 0x0203a030 + .pool _080F3BD8: - ldr r0, _080F3BFC + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xC] bl sub_81DB5E8 bl sub_80F577C _080F3BE8: - ldr r0, _080F3C00 + ldr r0, =0x0858d3c4 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -498458,44 +481796,38 @@ _080F3BE8: pop {r0} bx r0 .align 2, 0 -_080F3BFC: .4byte 0x02021cc4 -_080F3C00: .4byte 0x0858d3c4 + .pool thumb_func_end sub_80F39E4 thumb_func_start sub_80F3C04 sub_80F3C04: @ 80F3C04 push {r4,r5,lr} - ldr r2, _080F3C34 - ldr r0, _080F3C38 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F3C3C + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F3C40 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F3C44 + ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x6 bls _080F3C2A b _080F3D54 _080F3C2A: lsls r0, r5, 2 - ldr r1, _080F3C48 + ldr r1, =_080F3C4C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F3C34: .4byte 0x03005d8c -_080F3C38: .4byte 0x020375e0 -_080F3C3C: .4byte 0x000027cc -_080F3C40: .4byte 0x020375f0 -_080F3C44: .4byte 0x0203a030 -_080F3C48: .4byte _080F3C4C + .pool .align 2, 0 _080F3C4C: .4byte _080F3C68 @@ -498506,107 +481838,97 @@ _080F3C4C: .4byte _080F3D0C .4byte _080F3D40 _080F3C68: - ldr r0, _080F3C88 + ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl sub_811EBBC - ldr r0, _080F3C8C + ldr r0, =0x02021dc4 ldrh r1, [r4, 0x6] bl sub_811EBBC ldrb r0, [r4, 0x8] cmp r0, 0 bne _080F3C94 - ldr r1, _080F3C90 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F3D54 .align 2, 0 -_080F3C88: .4byte 0x02021cc4 -_080F3C8C: .4byte 0x02021dc4 -_080F3C90: .4byte 0x0203a030 + .pool _080F3C94: - ldr r1, _080F3C9C + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F3D54 .align 2, 0 -_080F3C9C: .4byte 0x0203a030 + .pool _080F3CA0: - ldr r0, _080F3CC4 + ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl sub_811EBBC - ldr r0, _080F3CC8 + ldr r0, =0x02021dc4 ldrh r1, [r4, 0x6] bl sub_811EBBC - ldr r0, _080F3CCC + ldr r0, =0x02021ec4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x9] bl sub_81DB5E8 - ldr r1, _080F3CD0 + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F3D54 .align 2, 0 -_080F3CC4: .4byte 0x02021cc4 -_080F3CC8: .4byte 0x02021dc4 -_080F3CCC: .4byte 0x02021ec4 -_080F3CD0: .4byte 0x0203a030 + .pool _080F3CD4: - ldr r0, _080F3CF4 + ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl sub_811EBBC - ldr r0, _080F3CF8 + ldr r0, =0x02021dc4 ldrh r1, [r4, 0x6] bl sub_811EBBC ldrb r0, [r4, 0x8] cmp r0, 0 bne _080F3D00 - ldr r1, _080F3CFC + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F3D54 .align 2, 0 -_080F3CF4: .4byte 0x02021cc4 -_080F3CF8: .4byte 0x02021dc4 -_080F3CFC: .4byte 0x0203a030 + .pool _080F3D00: - ldr r1, _080F3D08 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F3D54 .align 2, 0 -_080F3D08: .4byte 0x0203a030 + .pool _080F3D0C: - ldr r0, _080F3D30 + ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl sub_811EBBC - ldr r0, _080F3D34 + ldr r0, =0x02021dc4 ldrh r1, [r4, 0x6] bl sub_811EBBC - ldr r0, _080F3D38 + ldr r0, =0x02021ec4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x9] bl sub_81DB5E8 - ldr r1, _080F3D3C + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F3D54 .align 2, 0 -_080F3D30: .4byte 0x02021cc4 -_080F3D34: .4byte 0x02021dc4 -_080F3D38: .4byte 0x02021ec4 -_080F3D3C: .4byte 0x0203a030 + .pool _080F3D40: - ldr r0, _080F3D68 + ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl sub_811EBBC - ldr r0, _080F3D6C + ldr r0, =0x02021dc4 ldrh r1, [r4, 0x6] bl sub_811EBBC bl sub_80F577C _080F3D54: - ldr r0, _080F3D70 + ldr r0, =0x0858d3f0 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -498615,28 +481937,26 @@ _080F3D54: pop {r0} bx r0 .align 2, 0 -_080F3D68: .4byte 0x02021cc4 -_080F3D6C: .4byte 0x02021dc4 -_080F3D70: .4byte 0x0858d3f0 + .pool thumb_func_end sub_80F3C04 thumb_func_start sub_80F3D74 sub_80F3D74: @ 80F3D74 push {r4-r7,lr} - ldr r2, _080F3DA4 - ldr r0, _080F3DA8 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F3DAC + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r5, r1, r0 - ldr r1, _080F3DB0 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r7, _080F3DB4 + ldr r7, =0x0203a030 ldrb r6, [r7] cmp r6, 0x1 beq _080F3E02 @@ -498646,17 +481966,13 @@ sub_80F3D74: @ 80F3D74 beq _080F3DBE b _080F3E5C .align 2, 0 -_080F3DA4: .4byte 0x03005d8c -_080F3DA8: .4byte 0x020375e0 -_080F3DAC: .4byte 0x000027cc -_080F3DB0: .4byte 0x020375f0 -_080F3DB4: .4byte 0x0203a030 + .pool _080F3DB8: cmp r6, 0x2 beq _080F3E3C b _080F3E5C _080F3DBE: - ldr r4, _080F3DE8 + ldr r4, =0x02021cc4 ldrh r0, [r5, 0x2] bl itemid_get_item adds r1, r0, 0 @@ -498666,7 +481982,7 @@ _080F3DBE: cmp r0, 0x57 bne _080F3DFC ldrh r1, [r5, 0x6] - ldr r0, _080F3DEC + ldr r0, =0x00000117 cmp r1, r0 bgt _080F3DF0 subs r0, 0x2 @@ -498676,56 +481992,53 @@ _080F3DBE: strb r0, [r7] b _080F3E5C .align 2, 0 -_080F3DE8: .4byte 0x02021cc4 -_080F3DEC: .4byte 0x00000117 + .pool _080F3DF0: - ldr r1, _080F3DF8 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F3E5C .align 2, 0 -_080F3DF8: .4byte 0x0203a030 + .pool _080F3DFC: movs r0, 0x1 strb r0, [r7] b _080F3E5C _080F3E02: - ldr r4, _080F3E30 + ldr r4, =0x02021cc4 ldrh r0, [r5, 0x2] bl itemid_get_item adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy - ldr r0, _080F3E34 + ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x5] bl sub_81DB5E8 - ldr r0, _080F3E38 + ldr r0, =0x02021ec4 ldrb r1, [r5, 0x4] movs r2, 0 bl GetMapName bl sub_80F577C b _080F3E5C .align 2, 0 -_080F3E30: .4byte 0x02021cc4 -_080F3E34: .4byte 0x02021dc4 -_080F3E38: .4byte 0x02021ec4 + .pool _080F3E3C: - ldr r4, _080F3E70 + ldr r4, =0x02021cc4 ldrh r0, [r5, 0x2] bl itemid_get_item adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy - ldr r0, _080F3E74 + ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x5] bl sub_81DB5E8 bl sub_80F577C _080F3E5C: - ldr r0, _080F3E78 + ldr r0, =0x0858d40c lsls r1, r6, 2 adds r1, r0 ldr r0, [r1] @@ -498734,28 +482047,26 @@ _080F3E5C: pop {r0} bx r0 .align 2, 0 -_080F3E70: .4byte 0x02021cc4 -_080F3E74: .4byte 0x02021dc4 -_080F3E78: .4byte 0x0858d40c + .pool thumb_func_end sub_80F3D74 thumb_func_start sub_80F3E7C sub_80F3E7C: @ 80F3E7C push {r4,r5,lr} - ldr r2, _080F3EAC - ldr r0, _080F3EB0 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F3EB4 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F3EB8 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F3EBC + ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x1 beq _080F3F28 @@ -498765,11 +482076,7 @@ sub_80F3E7C: @ 80F3E7C beq _080F3ECC b _080F4008 .align 2, 0 -_080F3EAC: .4byte 0x03005d8c -_080F3EB0: .4byte 0x020375e0 -_080F3EB4: .4byte 0x000027cc -_080F3EB8: .4byte 0x020375f0 -_080F3EBC: .4byte 0x0203a030 + .pool _080F3EC0: cmp r5, 0x2 beq _080F3F78 @@ -498779,7 +482086,7 @@ _080F3EC0: _080F3ECA: b _080F4008 _080F3ECC: - ldr r0, _080F3EE4 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x8] @@ -498791,39 +482098,36 @@ _080F3ECC: beq _080F3EFC b _080F3F04 .align 2, 0 -_080F3EE4: .4byte 0x02021cc4 + .pool _080F3EE8: - ldr r0, _080F3EF4 - ldr r1, _080F3EF8 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb0c bl gf_strcpy b _080F3F04 .align 2, 0 -_080F3EF4: .4byte 0x02021dc4 -_080F3EF8: .4byte 0x085ecb0c + .pool _080F3EFC: - ldr r0, _080F3F10 - ldr r1, _080F3F14 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb12 bl gf_strcpy _080F3F04: ldrb r1, [r4, 0x2] cmp r1, 0x1 bne _080F3F1C - ldr r0, _080F3F18 + ldr r0, =0x0203a030 strb r1, [r0] b _080F4008 .align 2, 0 -_080F3F10: .4byte 0x02021dc4 -_080F3F14: .4byte 0x085ecb12 -_080F3F18: .4byte 0x0203a030 + .pool _080F3F1C: - ldr r1, _080F3F24 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F4008 .align 2, 0 -_080F3F24: .4byte 0x0203a030 + .pool _080F3F28: - ldr r0, _080F3F40 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x8] @@ -498835,18 +482139,17 @@ _080F3F28: beq _080F3F58 b _080F3F60 .align 2, 0 -_080F3F40: .4byte 0x02021cc4 + .pool _080F3F44: - ldr r0, _080F3F50 - ldr r1, _080F3F54 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb0c bl gf_strcpy b _080F3F60 .align 2, 0 -_080F3F50: .4byte 0x02021dc4 -_080F3F54: .4byte 0x085ecb0c + .pool _080F3F58: - ldr r0, _080F3F70 - ldr r1, _080F3F74 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb12 bl gf_strcpy _080F3F60: ldrh r1, [r4, 0x4] @@ -498855,10 +482158,9 @@ _080F3F60: bl sub_80F577C b _080F4008 .align 2, 0 -_080F3F70: .4byte 0x02021dc4 -_080F3F74: .4byte 0x085ecb12 + .pool _080F3F78: - ldr r0, _080F3F90 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x8] @@ -498870,33 +482172,30 @@ _080F3F78: beq _080F3FA8 b _080F3FB0 .align 2, 0 -_080F3F90: .4byte 0x02021cc4 + .pool _080F3F94: - ldr r0, _080F3FA0 - ldr r1, _080F3FA4 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb0c bl gf_strcpy b _080F3FB0 .align 2, 0 -_080F3FA0: .4byte 0x02021dc4 -_080F3FA4: .4byte 0x085ecb0c + .pool _080F3FA8: - ldr r0, _080F3FC0 - ldr r1, _080F3FC4 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb12 bl gf_strcpy _080F3FB0: ldrh r1, [r4, 0x4] movs r0, 0x2 bl sub_80EF340 - ldr r1, _080F3FC8 + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F4008 .align 2, 0 -_080F3FC0: .4byte 0x02021dc4 -_080F3FC4: .4byte 0x085ecb12 -_080F3FC8: .4byte 0x0203a030 + .pool _080F3FCC: - ldr r0, _080F3FE4 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x8] @@ -498908,23 +482207,22 @@ _080F3FCC: beq _080F3FFC b _080F4004 .align 2, 0 -_080F3FE4: .4byte 0x02021cc4 + .pool _080F3FE8: - ldr r0, _080F3FF4 - ldr r1, _080F3FF8 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb12 bl gf_strcpy b _080F4004 .align 2, 0 -_080F3FF4: .4byte 0x02021dc4 -_080F3FF8: .4byte 0x085ecb12 + .pool _080F3FFC: - ldr r0, _080F401C - ldr r1, _080F4020 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb0c bl gf_strcpy _080F4004: bl sub_80F577C _080F4008: - ldr r0, _080F4024 + ldr r0, =0x0858d418 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -498933,28 +482231,26 @@ _080F4008: pop {r0} bx r0 .align 2, 0 -_080F401C: .4byte 0x02021dc4 -_080F4020: .4byte 0x085ecb0c -_080F4024: .4byte 0x0858d418 + .pool thumb_func_end sub_80F3E7C thumb_func_start sub_80F4028 sub_80F4028: @ 80F4028 push {r4-r7,lr} - ldr r2, _080F405C - ldr r0, _080F4060 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F4064 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r6, r1, r0 - ldr r1, _080F4068 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F406C + ldr r0, =0x0203a030 ldrb r7, [r0] adds r2, r0, 0 cmp r7, 0xC @@ -498962,17 +482258,12 @@ sub_80F4028: @ 80F4028 b _080F4344 _080F4050: lsls r0, r7, 2 - ldr r1, _080F4070 + ldr r1, =_080F4074 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F405C: .4byte 0x03005d8c -_080F4060: .4byte 0x020375e0 -_080F4064: .4byte 0x000027cc -_080F4068: .4byte 0x020375f0 -_080F406C: .4byte 0x0203a030 -_080F4070: .4byte _080F4074 + .pool .align 2, 0 _080F4074: .4byte _080F40A8 @@ -499000,133 +482291,119 @@ _080F40B4: strb r0, [r2] b _080F4344 _080F40BA: - ldr r0, _080F40E8 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xE] bl sub_81DB5E8 - ldr r0, _080F40EC + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F40F0 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F40F4 + ldr r0, =0x02021ec4 ldrb r1, [r6, 0x4] movs r2, 0 bl GetMapName - ldr r1, _080F40F8 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F4344 .align 2, 0 -_080F40E8: .4byte 0x02021cc4 -_080F40EC: .4byte 0x02021dc4 -_080F40F0: .4byte 0x083185c8 -_080F40F4: .4byte 0x02021ec4 -_080F40F8: .4byte 0x0203a030 + .pool _080F40FC: - ldr r0, _080F412C + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xE] bl sub_81DB5E8 - ldr r0, _080F4130 + ldr r0, =0x02021dc4 ldrh r1, [r6, 0x2] movs r5, 0xB muls r1, r5 - ldr r4, _080F4134 + ldr r4, =0x083185c8 adds r1, r4 bl gf_strcpy - ldr r0, _080F4138 + ldr r0, =0x02021ec4 ldrh r1, [r6, 0xA] muls r1, r5 adds r1, r4 bl gf_strcpy - ldr r1, _080F413C + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F4344 .align 2, 0 -_080F412C: .4byte 0x02021cc4 -_080F4130: .4byte 0x02021dc4 -_080F4134: .4byte 0x083185c8 -_080F4138: .4byte 0x02021ec4 -_080F413C: .4byte 0x0203a030 + .pool _080F4140: ldrh r1, [r6, 0x8] movs r0, 0 bl sub_80EF340 - ldr r4, _080F4160 + ldr r4, =0x02021dc4 ldrh r0, [r6, 0x6] bl itemid_get_item adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy - ldr r1, _080F4164 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F4344 .align 2, 0 -_080F4160: .4byte 0x02021dc4 -_080F4164: .4byte 0x0203a030 + .pool _080F4168: - ldr r0, _080F4184 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xE] bl sub_81DB5E8 - ldr r0, _080F4188 + ldr r0, =0x02021dc4 ldrb r1, [r6, 0x4] movs r2, 0 bl GetMapName bl sub_80F577C b _080F4344 .align 2, 0 -_080F4184: .4byte 0x02021cc4 -_080F4188: .4byte 0x02021dc4 + .pool _080F418C: - ldr r0, _080F41BC + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xE] bl sub_81DB5E8 - ldr r0, _080F41C0 + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _080F41C4 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F41C8 + ldr r0, =0x02021ec4 ldrb r1, [r6, 0x4] movs r2, 0 bl GetMapName - ldr r1, _080F41CC + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F4344 .align 2, 0 -_080F41BC: .4byte 0x02021cc4 -_080F41C0: .4byte 0x02021dc4 -_080F41C4: .4byte 0x083185c8 -_080F41C8: .4byte 0x02021ec4 -_080F41CC: .4byte 0x0203a030 + .pool _080F41D0: - ldr r0, _080F4208 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xE] bl sub_81DB5E8 - ldr r0, _080F420C + ldr r0, =0x02021dc4 ldrh r1, [r6, 0x2] movs r5, 0xB muls r1, r5 - ldr r4, _080F4210 + ldr r4, =0x083185c8 adds r1, r4 bl gf_strcpy - ldr r0, _080F4214 + ldr r0, =0x02021ec4 ldrh r1, [r6, 0xA] muls r1, r5 adds r1, r4 @@ -499140,10 +482417,7 @@ _080F41D0: beq _080F421E b _080F4344 .align 2, 0 -_080F4208: .4byte 0x02021cc4 -_080F420C: .4byte 0x02021dc4 -_080F4210: .4byte 0x083185c8 -_080F4214: .4byte 0x02021ec4 + .pool _080F4218: cmp r0, 0x3 beq _080F4248 @@ -499152,135 +482426,122 @@ _080F421E: ldrh r0, [r6, 0xC] cmp r0, 0 bne _080F4230 - ldr r1, _080F422C + ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] b _080F4344 .align 2, 0 -_080F422C: .4byte 0x0203a030 + .pool _080F4230: - ldr r1, _080F4238 + ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] b _080F4344 .align 2, 0 -_080F4238: .4byte 0x0203a030 + .pool _080F423C: - ldr r1, _080F4244 + ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] b _080F4344 .align 2, 0 -_080F4244: .4byte 0x0203a030 + .pool _080F4248: - ldr r1, _080F4250 + ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] b _080F4344 .align 2, 0 -_080F4250: .4byte 0x0203a030 + .pool _080F4254: - ldr r0, _080F4274 + ldr r0, =0x02021cc4 ldrh r2, [r6, 0xC] movs r1, 0xD muls r1, r2 - ldr r2, _080F4278 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r0, _080F427C + ldr r0, =0x02021dc4 ldrh r2, [r6, 0xA] movs r1, 0xB muls r1, r2 - ldr r2, _080F4280 + ldr r2, =0x083185c8 adds r1, r2 b _080F42A8 .align 2, 0 -_080F4274: .4byte 0x02021cc4 -_080F4278: .4byte 0x0831977c -_080F427C: .4byte 0x02021dc4 -_080F4280: .4byte 0x083185c8 + .pool _080F4284: - ldr r0, _080F42B4 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xE] bl sub_81DB5E8 - ldr r0, _080F42B8 + ldr r0, =0x02021dc4 ldrh r1, [r6, 0x2] movs r5, 0xB muls r1, r5 - ldr r4, _080F42BC + ldr r4, =0x083185c8 adds r1, r4 bl gf_strcpy - ldr r0, _080F42C0 + ldr r0, =0x02021ec4 ldrh r1, [r6, 0xA] muls r1, r5 adds r1, r4 _080F42A8: bl gf_strcpy - ldr r1, _080F42C4 + ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] b _080F4344 .align 2, 0 -_080F42B4: .4byte 0x02021cc4 -_080F42B8: .4byte 0x02021dc4 -_080F42BC: .4byte 0x083185c8 -_080F42C0: .4byte 0x02021ec4 -_080F42C4: .4byte 0x0203a030 + .pool _080F42C8: - ldr r0, _080F42E8 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xE] bl sub_81DB5E8 - ldr r0, _080F42EC + ldr r0, =0x02021dc4 ldrb r1, [r6, 0x4] movs r2, 0 bl GetMapName - ldr r1, _080F42F0 + ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] b _080F4344 .align 2, 0 -_080F42E8: .4byte 0x02021cc4 -_080F42EC: .4byte 0x02021dc4 -_080F42F0: .4byte 0x0203a030 + .pool _080F42F4: - ldr r0, _080F4320 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xE] bl sub_81DB5E8 - ldr r0, _080F4324 + ldr r0, =0x02021dc4 ldrh r1, [r6, 0x2] movs r4, 0xB muls r1, r4 - ldr r2, _080F4328 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F432C + ldr r0, =0x02021ec4 ldrb r1, [r6, 0x4] movs r2, 0 bl GetMapName - ldr r0, _080F4330 + ldr r0, =0x0203a030 strb r4, [r0] b _080F4344 .align 2, 0 -_080F4320: .4byte 0x02021cc4 -_080F4324: .4byte 0x02021dc4 -_080F4328: .4byte 0x083185c8 -_080F432C: .4byte 0x02021ec4 -_080F4330: .4byte 0x0203a030 + .pool _080F4334: - ldr r0, _080F4358 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xE] bl sub_81DB5E8 bl sub_80F577C _080F4344: - ldr r0, _080F435C + ldr r0, =0x0858d428 lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] @@ -499289,27 +482550,26 @@ _080F4344: pop {r0} bx r0 .align 2, 0 -_080F4358: .4byte 0x02021cc4 -_080F435C: .4byte 0x0858d428 + .pool thumb_func_end sub_80F4028 thumb_func_start sub_80F4360 sub_80F4360: @ 80F4360 push {r4-r6,lr} - ldr r2, _080F4394 - ldr r0, _080F4398 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F439C + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r5, r1, r0 - ldr r1, _080F43A0 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F43A4 + ldr r0, =0x0203a030 ldrb r6, [r0] adds r2, r0, 0 cmp r6, 0xD @@ -499317,17 +482577,12 @@ sub_80F4360: @ 80F4360 b _080F4588 _080F4388: lsls r0, r6, 2 - ldr r1, _080F43A8 + ldr r1, =_080F43AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F4394: .4byte 0x03005d8c -_080F4398: .4byte 0x020375e0 -_080F439C: .4byte 0x000027cc -_080F43A0: .4byte 0x020375f0 -_080F43A4: .4byte 0x0203a030 -_080F43A8: .4byte _080F43AC + .pool .align 2, 0 _080F43AC: .4byte _080F43E4 @@ -499345,7 +482600,7 @@ _080F43AC: .4byte _080F4538 .4byte _080F4584 _080F43E4: - ldr r0, _080F4400 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0xC] @@ -499353,50 +482608,47 @@ _080F43E4: ldrb r0, [r5, 0x3] cmp r0, 0 bne _080F4408 - ldr r1, _080F4404 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F4588 .align 2, 0 -_080F4400: .4byte 0x02021cc4 -_080F4404: .4byte 0x0203a030 + .pool _080F4408: - ldr r1, _080F4410 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F4588 .align 2, 0 -_080F4410: .4byte 0x0203a030 + .pool _080F4414: - ldr r0, _080F4430 + ldr r0, =0x02021dc4 ldrb r1, [r5, 0x4] lsls r1, 5 - ldr r2, _080F4434 + ldr r2, =0x085a5c09 adds r1, r2 bl gf_strcpy ldrb r0, [r5, 0x3] cmp r0, 0x1 bne _080F443C - ldr r1, _080F4438 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F4588 .align 2, 0 -_080F4430: .4byte 0x02021dc4 -_080F4434: .4byte 0x085a5c09 -_080F4438: .4byte 0x0203a030 + .pool _080F443C: - ldr r1, _080F4444 + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F4588 .align 2, 0 -_080F4444: .4byte 0x0203a030 + .pool _080F4448: - ldr r0, _080F4468 + ldr r0, =0x02021dc4 ldrb r1, [r5, 0x5] lsls r1, 5 - ldr r2, _080F446C + ldr r2, =0x085a5c09 adds r1, r2 bl gf_strcpy ldrb r1, [r5, 0x3] @@ -499408,71 +482660,66 @@ _080F4448: beq _080F4476 b _080F4588 .align 2, 0 -_080F4468: .4byte 0x02021dc4 -_080F446C: .4byte 0x085a5c09 + .pool _080F4470: cmp r1, 0x4 beq _080F4490 b _080F4588 _080F4476: - ldr r1, _080F4480 + ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] b _080F4588 .align 2, 0 -_080F4480: .4byte 0x0203a030 + .pool _080F4484: - ldr r1, _080F448C + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F4588 .align 2, 0 -_080F448C: .4byte 0x0203a030 + .pool _080F4490: - ldr r1, _080F4498 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F4588 .align 2, 0 -_080F4498: .4byte 0x0203a030 + .pool _080F449C: - ldr r0, _080F44B4 + ldr r0, =0x02021dc4 ldrb r1, [r5, 0x6] lsls r1, 5 - ldr r4, _080F44B8 + ldr r4, =0x085a5c09 adds r1, r4 bl gf_strcpy - ldr r0, _080F44BC + ldr r0, =0x02021ec4 ldrb r1, [r5, 0x7] lsls r1, 5 adds r1, r4 b _080F44CA .align 2, 0 -_080F44B4: .4byte 0x02021dc4 -_080F44B8: .4byte 0x085a5c09 -_080F44BC: .4byte 0x02021ec4 + .pool _080F44C0: - ldr r0, _080F44D8 + ldr r0, =0x02021dc4 ldrb r1, [r5, 0x6] lsls r1, 5 - ldr r2, _080F44DC + ldr r2, =0x085a5c09 adds r1, r2 _080F44CA: bl gf_strcpy - ldr r1, _080F44E0 + ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] b _080F4588 .align 2, 0 -_080F44D8: .4byte 0x02021dc4 -_080F44DC: .4byte 0x085a5c09 -_080F44E0: .4byte 0x0203a030 + .pool _080F44E4: movs r0, 0x8 strb r0, [r2] b _080F4588 _080F44EA: - ldr r0, _080F4504 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0xC] @@ -499480,72 +482727,66 @@ _080F44EA: ldrb r1, [r5, 0x2] cmp r1, 0x18 bhi _080F450C - ldr r1, _080F4508 + ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] b _080F4588 .align 2, 0 -_080F4504: .4byte 0x02021cc4 -_080F4508: .4byte 0x0203a030 + .pool _080F450C: cmp r1, 0x31 bhi _080F451C - ldr r1, _080F4518 + ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] b _080F4588 .align 2, 0 -_080F4518: .4byte 0x0203a030 + .pool _080F451C: cmp r1, 0x45 bhi _080F452C - ldr r1, _080F4528 + ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] b _080F4588 .align 2, 0 -_080F4528: .4byte 0x0203a030 + .pool _080F452C: - ldr r1, _080F4534 + ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] b _080F4588 .align 2, 0 -_080F4534: .4byte 0x0203a030 + .pool _080F4538: - ldr r0, _080F456C + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0xC] bl sub_81DB5E8 - ldr r0, _080F4570 + ldr r0, =0x02021dc4 ldrh r2, [r5, 0x8] movs r1, 0xB muls r1, r2 - ldr r2, _080F4574 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F4578 + ldr r0, =0x02021ec4 ldrh r1, [r5, 0xA] movs r4, 0xD muls r1, r4 - ldr r2, _080F457C + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r0, _080F4580 + ldr r0, =0x0203a030 strb r4, [r0] b _080F4588 .align 2, 0 -_080F456C: .4byte 0x02021cc4 -_080F4570: .4byte 0x02021dc4 -_080F4574: .4byte 0x083185c8 -_080F4578: .4byte 0x02021ec4 -_080F457C: .4byte 0x0831977c -_080F4580: .4byte 0x0203a030 + .pool _080F4584: bl sub_80F577C _080F4588: - ldr r0, _080F459C + ldr r0, =0x0858d45c lsls r1, r6, 2 adds r1, r0 ldr r0, [r1] @@ -499554,28 +482795,28 @@ _080F4588: pop {r0} bx r0 .align 2, 0 -_080F459C: .4byte 0x0858d45c + .pool thumb_func_end sub_80F4360 thumb_func_start sub_80F45A0 sub_80F45A0: @ 80F45A0 push {r4-r6,lr} - ldr r2, _080F45DC - ldr r0, _080F45E0 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F45E4 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r5, r1, r0 - ldr r1, _080F45E8 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F45EC + ldr r0, =0x0203a030 ldrb r6, [r0] - ldr r0, _080F45F0 + ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x5] @@ -499583,52 +482824,43 @@ sub_80F45A0: @ 80F45A0 ldrb r0, [r5, 0x4] cmp r0, 0 bne _080F45FC - ldr r0, _080F45F4 - ldr r1, _080F45F8 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb72 bl gf_strcpy b _080F4634 .align 2, 0 -_080F45DC: .4byte 0x03005d8c -_080F45E0: .4byte 0x020375e0 -_080F45E4: .4byte 0x000027cc -_080F45E8: .4byte 0x020375f0 -_080F45EC: .4byte 0x0203a030 -_080F45F0: .4byte 0x02021cc4 -_080F45F4: .4byte 0x02021dc4 -_080F45F8: .4byte 0x085ecb72 + .pool _080F45FC: cmp r0, 0x1 bne _080F4614 - ldr r0, _080F460C - ldr r1, _080F4610 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb7a bl gf_strcpy b _080F4634 .align 2, 0 -_080F460C: .4byte 0x02021dc4 -_080F4610: .4byte 0x085ecb7a + .pool _080F4614: cmp r0, 0x2 bne _080F462C - ldr r0, _080F4624 - ldr r1, _080F4628 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb80 bl gf_strcpy b _080F4634 .align 2, 0 -_080F4624: .4byte 0x02021dc4 -_080F4628: .4byte 0x085ecb80 + .pool _080F462C: - ldr r0, _080F465C - ldr r1, _080F4660 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecb87 bl gf_strcpy _080F4634: - ldr r4, _080F4664 + ldr r4, =0x02021ec4 ldrh r0, [r5, 0x2] bl itemid_get_item adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy bl sub_80F577C - ldr r1, _080F4668 + ldr r1, =0x0858d494 lsls r0, r6, 2 adds r0, r1 ldr r0, [r0] @@ -499637,46 +482869,38 @@ _080F4634: pop {r0} bx r0 .align 2, 0 -_080F465C: .4byte 0x02021dc4 -_080F4660: .4byte 0x085ecb87 -_080F4664: .4byte 0x02021ec4 -_080F4668: .4byte 0x0858d494 + .pool thumb_func_end sub_80F45A0 thumb_func_start sub_80F466C sub_80F466C: @ 80F466C push {r4-r7,lr} - ldr r2, _080F469C - ldr r0, _080F46A0 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F46A4 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r6, r1, r0 - ldr r1, _080F46A8 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F46AC + ldr r0, =0x0203a030 ldrb r7, [r0] cmp r7, 0x6 bls _080F4692 b _080F4858 _080F4692: lsls r0, r7, 2 - ldr r1, _080F46B0 + ldr r1, =_080F46B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F469C: .4byte 0x03005d8c -_080F46A0: .4byte 0x020375e0 -_080F46A4: .4byte 0x000027cc -_080F46A8: .4byte 0x020375f0 -_080F46AC: .4byte 0x0203a030 -_080F46B0: .4byte _080F46B4 + .pool .align 2, 0 _080F46B4: .4byte _080F46D0 @@ -499687,70 +482911,61 @@ _080F46B4: .4byte _080F4814 .4byte _080F4838 _080F46D0: - ldr r0, _080F4700 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0x11] bl sub_81DB5E8 - ldr r0, _080F4704 + ldr r0, =0x02021dc4 ldrh r1, [r6, 0x6] movs r5, 0xB muls r1, r5 - ldr r4, _080F4708 + ldr r4, =0x083185c8 adds r1, r4 bl gf_strcpy - ldr r0, _080F470C + ldr r0, =0x02021ec4 ldrh r1, [r6, 0x4] muls r1, r5 adds r1, r4 bl gf_strcpy - ldr r1, _080F4710 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F4858 .align 2, 0 -_080F4700: .4byte 0x02021cc4 -_080F4704: .4byte 0x02021dc4 -_080F4708: .4byte 0x083185c8 -_080F470C: .4byte 0x02021ec4 -_080F4710: .4byte 0x0203a030 + .pool _080F4714: - ldr r0, _080F4748 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0x11] bl sub_81DB5E8 - ldr r0, _080F474C + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x4] movs r1, 0xB muls r1, r2 - ldr r2, _080F4750 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r0, _080F4754 + ldr r0, =0x02021ec4 ldrh r2, [r6, 0x2] movs r1, 0xD muls r1, r2 - ldr r2, _080F4758 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r1, _080F475C + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F4858 .align 2, 0 -_080F4748: .4byte 0x02021cc4 -_080F474C: .4byte 0x02021dc4 -_080F4750: .4byte 0x083185c8 -_080F4754: .4byte 0x02021ec4 -_080F4758: .4byte 0x0831977c -_080F475C: .4byte 0x0203a030 + .pool _080F4760: - ldr r0, _080F4780 + ldr r0, =0x02021cc4 ldrh r2, [r6, 0x6] movs r1, 0xB muls r1, r2 - ldr r2, _080F4784 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrb r1, [r6, 0x10] @@ -499762,106 +482977,98 @@ _080F4760: beq _080F478E b _080F4824 .align 2, 0 -_080F4780: .4byte 0x02021cc4 -_080F4784: .4byte 0x083185c8 + .pool _080F4788: cmp r1, 0x3 beq _080F47A8 b _080F4824 _080F478E: - ldr r1, _080F4798 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F4858 .align 2, 0 -_080F4798: .4byte 0x0203a030 + .pool _080F479C: - ldr r1, _080F47A4 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F4858 .align 2, 0 -_080F47A4: .4byte 0x0203a030 + .pool _080F47A8: - ldr r0, _080F47B0 + ldr r0, =0x0203a030 strb r1, [r0] b _080F4858 .align 2, 0 -_080F47B0: .4byte 0x0203a030 + .pool _080F47B4: - ldr r0, _080F47DC + ldr r0, =0x02021cc4 ldrh r1, [r6, 0x8] movs r5, 0xD muls r1, r5 - ldr r4, _080F47E0 + ldr r4, =0x0831977c adds r1, r4 bl gf_strcpy - ldr r0, _080F47E4 + ldr r0, =0x02021dc4 ldrh r1, [r6, 0xA] muls r1, r5 adds r1, r4 bl gf_strcpy - ldr r0, _080F47E8 + ldr r0, =0x02021ec4 ldrh r1, [r6, 0xC] muls r1, r5 adds r1, r4 b _080F4820 .align 2, 0 -_080F47DC: .4byte 0x02021cc4 -_080F47E0: .4byte 0x0831977c -_080F47E4: .4byte 0x02021dc4 -_080F47E8: .4byte 0x02021ec4 + .pool _080F47EC: - ldr r0, _080F4808 + ldr r0, =0x02021cc4 ldrh r1, [r6, 0x8] movs r5, 0xD muls r1, r5 - ldr r4, _080F480C + ldr r4, =0x0831977c adds r1, r4 bl gf_strcpy - ldr r0, _080F4810 + ldr r0, =0x02021dc4 ldrh r1, [r6, 0xA] muls r1, r5 adds r1, r4 b _080F4820 .align 2, 0 -_080F4808: .4byte 0x02021cc4 -_080F480C: .4byte 0x0831977c -_080F4810: .4byte 0x02021dc4 + .pool _080F4814: - ldr r0, _080F482C + ldr r0, =0x02021dc4 ldrh r2, [r6, 0x8] movs r1, 0xD muls r1, r2 - ldr r2, _080F4830 + ldr r2, =0x0831977c adds r1, r2 _080F4820: bl gf_strcpy _080F4824: - ldr r1, _080F4834 + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F4858 .align 2, 0 -_080F482C: .4byte 0x02021dc4 -_080F4830: .4byte 0x0831977c -_080F4834: .4byte 0x0203a030 + .pool _080F4838: - ldr r0, _080F486C + ldr r0, =0x02021cc4 ldrh r1, [r6, 0xE] movs r5, 0xD muls r1, r5 - ldr r4, _080F4870 + ldr r4, =0x0831977c adds r1, r4 bl gf_strcpy - ldr r0, _080F4874 + ldr r0, =0x02021dc4 ldrh r1, [r6, 0x2] muls r1, r5 adds r1, r4 bl gf_strcpy bl sub_80F577C _080F4858: - ldr r0, _080F4878 + ldr r0, =0x0858d498 lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] @@ -499870,46 +483077,38 @@ _080F4858: pop {r0} bx r0 .align 2, 0 -_080F486C: .4byte 0x02021cc4 -_080F4870: .4byte 0x0831977c -_080F4874: .4byte 0x02021dc4 -_080F4878: .4byte 0x0858d498 + .pool thumb_func_end sub_80F466C thumb_func_start sub_80F487C sub_80F487C: @ 80F487C push {r4,r5,lr} - ldr r2, _080F48AC - ldr r0, _080F48B0 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F48B4 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F48B8 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F48BC + ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x5 bls _080F48A2 b _080F499A _080F48A2: lsls r0, r5, 2 - ldr r1, _080F48C0 + ldr r1, =_080F48C4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F48AC: .4byte 0x03005d8c -_080F48B0: .4byte 0x020375e0 -_080F48B4: .4byte 0x000027cc -_080F48B8: .4byte 0x020375f0 -_080F48BC: .4byte 0x0203a030 -_080F48C0: .4byte _080F48C4 + .pool .align 2, 0 _080F48C4: .4byte _080F48DC @@ -499919,92 +483118,87 @@ _080F48C4: .4byte _080F4944 .4byte _080F4978 _080F48DC: - ldr r0, _080F4908 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x18] bl sub_81DB5E8 - ldr r0, _080F490C + ldr r0, =0x02021dc4 adds r1, r4, 0x2 ldrb r2, [r4, 0x17] bl sub_81DB5E8 - ldr r0, _080F4910 + ldr r0, =0x02021ec4 ldrh r1, [r4, 0x14] bl sub_811EBBC ldrb r1, [r4, 0x16] cmp r1, 0x59 bls _080F4918 - ldr r1, _080F4914 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F499A .align 2, 0 -_080F4908: .4byte 0x02021cc4 -_080F490C: .4byte 0x02021dc4 -_080F4910: .4byte 0x02021ec4 -_080F4914: .4byte 0x0203a030 + .pool _080F4918: cmp r1, 0x45 bls _080F4928 - ldr r1, _080F4924 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F499A .align 2, 0 -_080F4924: .4byte 0x0203a030 + .pool _080F4928: cmp r1, 0x1D bls _080F4938 - ldr r1, _080F4934 + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F499A .align 2, 0 -_080F4934: .4byte 0x0203a030 + .pool _080F4938: - ldr r1, _080F4940 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F499A .align 2, 0 -_080F4940: .4byte 0x0203a030 + .pool _080F4944: - ldr r0, _080F496C + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x18] bl sub_81DB5E8 - ldr r0, _080F4970 + ldr r0, =0x02021dc4 adds r1, r4, 0x2 ldrb r2, [r4, 0x17] bl sub_81DB5E8 ldrb r1, [r4, 0x16] movs r0, 0x2 bl sub_80EF340 - ldr r1, _080F4974 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F499A .align 2, 0 -_080F496C: .4byte 0x02021cc4 -_080F4970: .4byte 0x02021dc4 -_080F4974: .4byte 0x0203a030 + .pool _080F4978: - ldr r0, _080F49AC + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x18] bl sub_81DB5E8 - ldr r0, _080F49B0 + ldr r0, =0x02021dc4 adds r1, r4, 0x2 ldrb r2, [r4, 0x17] bl sub_81DB5E8 - ldr r0, _080F49B4 + ldr r0, =0x02021ec4 ldrh r1, [r4, 0x14] bl sub_811EBBC bl sub_80F577C _080F499A: - ldr r0, _080F49B8 + ldr r0, =0x0858d320 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -500013,29 +483207,26 @@ _080F499A: pop {r0} bx r0 .align 2, 0 -_080F49AC: .4byte 0x02021cc4 -_080F49B0: .4byte 0x02021dc4 -_080F49B4: .4byte 0x02021ec4 -_080F49B8: .4byte 0x0858d320 + .pool thumb_func_end sub_80F487C thumb_func_start sub_80F49BC sub_80F49BC: @ 80F49BC push {r4,r5,lr} - ldr r2, _080F49F0 - ldr r0, _080F49F4 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F49F8 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F49FC + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F4A00 + ldr r0, =0x0203a030 ldrb r5, [r0] adds r2, r0, 0 cmp r5, 0xB @@ -500043,17 +483234,12 @@ sub_80F49BC: @ 80F49BC b _080F4B3A _080F49E4: lsls r0, r5, 2 - ldr r1, _080F4A04 + ldr r1, =_080F4A08 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F49F0: .4byte 0x03005d8c -_080F49F4: .4byte 0x020375e0 -_080F49F8: .4byte 0x000027cc -_080F49FC: .4byte 0x020375f0 -_080F4A00: .4byte 0x0203a030 -_080F4A04: .4byte _080F4A08 + .pool .align 2, 0 _080F4A08: .4byte _080F4A38 @@ -500069,7 +483255,7 @@ _080F4A08: .4byte _080F4B14 .4byte _080F4B1A _080F4A38: - ldr r0, _080F4A6C + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x8] @@ -500089,13 +483275,12 @@ _080F4A38: b _080F4B3A _080F4A60: lsls r0, 2 - ldr r1, _080F4A70 + ldr r1, =_080F4A74 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F4A6C: .4byte 0x02021cc4 -_080F4A70: .4byte _080F4A74 + .pool .align 2, 0 _080F4A74: .4byte _080F4A9C @@ -500109,94 +483294,94 @@ _080F4A74: .4byte _080F4AFC .4byte _080F4B08 _080F4A9C: - ldr r1, _080F4AA4 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F4B3A .align 2, 0 -_080F4AA4: .4byte 0x0203a030 + .pool _080F4AA8: - ldr r1, _080F4AB0 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F4B3A .align 2, 0 -_080F4AB0: .4byte 0x0203a030 + .pool _080F4AB4: - ldr r1, _080F4ABC + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F4B3A .align 2, 0 -_080F4ABC: .4byte 0x0203a030 + .pool _080F4AC0: - ldr r1, _080F4AC8 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F4B3A .align 2, 0 -_080F4AC8: .4byte 0x0203a030 + .pool _080F4ACC: - ldr r1, _080F4AD4 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F4B3A .align 2, 0 -_080F4AD4: .4byte 0x0203a030 + .pool _080F4AD8: - ldr r1, _080F4AE0 + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F4B3A .align 2, 0 -_080F4AE0: .4byte 0x0203a030 + .pool _080F4AE4: - ldr r1, _080F4AEC + ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] b _080F4B3A .align 2, 0 -_080F4AEC: .4byte 0x0203a030 + .pool _080F4AF0: - ldr r1, _080F4AF8 + ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] b _080F4B3A .align 2, 0 -_080F4AF8: .4byte 0x0203a030 + .pool _080F4AFC: - ldr r1, _080F4B04 + ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] b _080F4B3A .align 2, 0 -_080F4B04: .4byte 0x0203a030 + .pool _080F4B08: - ldr r1, _080F4B10 + ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] b _080F4B3A .align 2, 0 -_080F4B10: .4byte 0x0203a030 + .pool _080F4B14: movs r0, 0xB strb r0, [r2] b _080F4B3A _080F4B1A: - ldr r0, _080F4B4C + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x8] bl sub_81DB5E8 - ldr r0, _080F4B50 + ldr r0, =0x02021dc4 ldrh r1, [r4, 0x4] bl sub_811EBBC - ldr r0, _080F4B54 + ldr r0, =0x02021ec4 ldrh r1, [r4, 0x6] bl sub_811EBBC bl sub_80F577C _080F4B3A: - ldr r0, _080F4B58 + ldr r0, =0x0858d4b4 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -500205,46 +483390,38 @@ _080F4B3A: pop {r0} bx r0 .align 2, 0 -_080F4B4C: .4byte 0x02021cc4 -_080F4B50: .4byte 0x02021dc4 -_080F4B54: .4byte 0x02021ec4 -_080F4B58: .4byte 0x0858d4b4 + .pool thumb_func_end sub_80F49BC thumb_func_start sub_80F4B5C sub_80F4B5C: @ 80F4B5C push {r4,r5,lr} - ldr r2, _080F4B8C - ldr r0, _080F4B90 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F4B94 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F4B98 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F4B9C + ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0xF bls _080F4B82 b _080F4D84 _080F4B82: lsls r0, r5, 2 - ldr r1, _080F4BA0 + ldr r1, =_080F4BA4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F4B8C: .4byte 0x03005d8c -_080F4B90: .4byte 0x020375e0 -_080F4B94: .4byte 0x000027cc -_080F4B98: .4byte 0x020375f0 -_080F4B9C: .4byte 0x0203a030 -_080F4BA0: .4byte _080F4BA4 + .pool .align 2, 0 _080F4BA4: .4byte _080F4BE4 @@ -500264,65 +483441,61 @@ _080F4BA4: .4byte _080F4D64 .4byte _080F4D80 _080F4BE4: - ldr r0, _080F4C08 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xF] bl sub_81DB5E8 - ldr r0, _080F4C0C + ldr r0, =0x02021dc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x10] bl sub_81DB5E8 ldrb r1, [r4, 0x2] cmp r1, 0x9 bhi _080F4C14 - ldr r1, _080F4C10 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4C08: .4byte 0x02021cc4 -_080F4C0C: .4byte 0x02021dc4 -_080F4C10: .4byte 0x0203a030 + .pool _080F4C14: cmp r1, 0x13 bhi _080F4C24 - ldr r1, _080F4C20 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4C20: .4byte 0x0203a030 + .pool _080F4C24: - ldr r1, _080F4C2C + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4C2C: .4byte 0x0203a030 + .pool _080F4C30: - ldr r0, _080F4C58 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0xF] bl sub_81DB5E8 - ldr r0, _080F4C5C + ldr r0, =0x02021dc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x10] bl sub_81DB5E8 ldrb r1, [r4, 0x2] movs r0, 0x2 bl sub_80EF340 - ldr r1, _080F4C60 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4C58: .4byte 0x02021cc4 -_080F4C5C: .4byte 0x02021dc4 -_080F4C60: .4byte 0x0203a030 + .pool _080F4C64: - ldr r0, _080F4C80 + ldr r0, =0x02021dc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x10] bl sub_81DB5E8 @@ -500332,13 +483505,12 @@ _080F4C64: b _080F4D84 _080F4C76: lsls r0, 2 - ldr r1, _080F4C84 + ldr r1, =_080F4C88 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F4C80: .4byte 0x02021dc4 -_080F4C84: .4byte _080F4C88 + .pool .align 2, 0 _080F4C88: .4byte _080F4CEC @@ -500367,91 +483539,90 @@ _080F4C88: .4byte _080F4D4C .4byte _080F4D58 _080F4CEC: - ldr r1, _080F4CF4 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4CF4: .4byte 0x0203a030 + .pool _080F4CF8: - ldr r1, _080F4D00 + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4D00: .4byte 0x0203a030 + .pool _080F4D04: - ldr r1, _080F4D0C + ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4D0C: .4byte 0x0203a030 + .pool _080F4D10: - ldr r1, _080F4D18 + ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4D18: .4byte 0x0203a030 + .pool _080F4D1C: - ldr r1, _080F4D24 + ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4D24: .4byte 0x0203a030 + .pool _080F4D28: - ldr r1, _080F4D30 + ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4D30: .4byte 0x0203a030 + .pool _080F4D34: - ldr r1, _080F4D3C + ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4D3C: .4byte 0x0203a030 + .pool _080F4D40: - ldr r1, _080F4D48 + ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4D48: .4byte 0x0203a030 + .pool _080F4D4C: - ldr r1, _080F4D54 + ldr r1, =0x0203a030 movs r0, 0xD strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4D54: .4byte 0x0203a030 + .pool _080F4D58: - ldr r1, _080F4D60 + ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4D60: .4byte 0x0203a030 + .pool _080F4D64: - ldr r0, _080F4D78 + ldr r0, =0x02021dc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x10] bl sub_81DB5E8 - ldr r1, _080F4D7C + ldr r1, =0x0203a030 movs r0, 0xF strb r0, [r1] b _080F4D84 .align 2, 0 -_080F4D78: .4byte 0x02021dc4 -_080F4D7C: .4byte 0x0203a030 + .pool _080F4D80: bl sub_80F577C _080F4D84: - ldr r0, _080F4D98 + ldr r0, =0x0858d4e4 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -500460,26 +483631,26 @@ _080F4D84: pop {r0} bx r0 .align 2, 0 -_080F4D98: .4byte 0x0858d4e4 + .pool thumb_func_end sub_80F4B5C thumb_func_start sub_80F4D9C sub_80F4D9C: @ 80F4D9C push {r4-r7,lr} - ldr r2, _080F4DD0 - ldr r0, _080F4DD4 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F4DD8 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r6, r1, r0 - ldr r1, _080F4DDC + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F4DE0 + ldr r0, =0x0203a030 ldrb r7, [r0] adds r2, r0, 0 cmp r7, 0x12 @@ -500487,17 +483658,12 @@ sub_80F4D9C: @ 80F4D9C b _080F5014 _080F4DC4: lsls r0, r7, 2 - ldr r1, _080F4DE4 + ldr r1, =_080F4DE8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F4DD0: .4byte 0x03005d8c -_080F4DD4: .4byte 0x020375e0 -_080F4DD8: .4byte 0x000027cc -_080F4DDC: .4byte 0x020375f0 -_080F4DE0: .4byte 0x0203a030 -_080F4DE4: .4byte _080F4DE8 + .pool .align 2, 0 _080F4DE8: .4byte _080F4E34 @@ -500527,12 +483693,12 @@ _080F4E34: b _080F5014 _080F4E3E: lsls r0, 2 - ldr r1, _080F4E48 + ldr r1, =_080F4E4C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F4E48: .4byte _080F4E4C + .pool .align 2, 0 _080F4E4C: .4byte _080F4E80 @@ -500601,7 +483767,7 @@ _080F4EC8: strb r0, [r2] b _080F5014 _080F4ECE: - ldr r0, _080F4EEC + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xC] @@ -500609,15 +483775,14 @@ _080F4ECE: ldrh r1, [r6, 0x2] movs r0, 0x1 bl sub_80EF340 - ldr r1, _080F4EF0 + ldr r1, =0x0203a030 movs r0, 0x10 strb r0, [r1] b _080F5014 .align 2, 0 -_080F4EEC: .4byte 0x02021cc4 -_080F4EF0: .4byte 0x0203a030 + .pool _080F4EF4: - ldr r0, _080F4F10 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xC] @@ -500625,15 +483790,14 @@ _080F4EF4: ldrh r1, [r6, 0x2] movs r0, 0x1 bl sub_80EF340 - ldr r1, _080F4F14 + ldr r1, =0x0203a030 movs r0, 0xF strb r0, [r1] b _080F5014 .align 2, 0 -_080F4F10: .4byte 0x02021cc4 -_080F4F14: .4byte 0x0203a030 + .pool _080F4F18: - ldr r0, _080F4F34 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xC] @@ -500641,107 +483805,95 @@ _080F4F18: ldrh r1, [r6, 0x2] movs r0, 0x1 bl sub_80EF340 - ldr r1, _080F4F38 + ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] b _080F5014 .align 2, 0 -_080F4F34: .4byte 0x02021cc4 -_080F4F38: .4byte 0x0203a030 + .pool _080F4F3C: - ldr r0, _080F4F64 + ldr r0, =0x02021cc4 ldrh r1, [r6, 0x4] movs r5, 0xB muls r1, r5 - ldr r4, _080F4F68 + ldr r4, =0x083185c8 adds r1, r4 bl gf_strcpy - ldr r0, _080F4F6C + ldr r0, =0x02021dc4 ldrh r1, [r6, 0x6] muls r1, r5 adds r1, r4 bl gf_strcpy - ldr r0, _080F4F70 + ldr r0, =0x02021ec4 ldrh r1, [r6, 0x8] muls r1, r5 adds r1, r4 b _080F4FEC .align 2, 0 -_080F4F64: .4byte 0x02021cc4 -_080F4F68: .4byte 0x083185c8 -_080F4F6C: .4byte 0x02021dc4 -_080F4F70: .4byte 0x02021ec4 + .pool _080F4F74: - ldr r0, _080F4F90 + ldr r0, =0x02021cc4 ldrh r1, [r6, 0x4] movs r5, 0xB muls r1, r5 - ldr r4, _080F4F94 + ldr r4, =0x083185c8 adds r1, r4 bl gf_strcpy - ldr r0, _080F4F98 + ldr r0, =0x02021dc4 ldrh r1, [r6, 0x6] muls r1, r5 adds r1, r4 b _080F4FEC .align 2, 0 -_080F4F90: .4byte 0x02021cc4 -_080F4F94: .4byte 0x083185c8 -_080F4F98: .4byte 0x02021dc4 + .pool _080F4F9C: - ldr r0, _080F4FCC + ldr r0, =0x02021cc4 ldrh r1, [r6, 0x4] movs r5, 0xB muls r1, r5 - ldr r4, _080F4FD0 + ldr r4, =0x083185c8 adds r1, r4 bl gf_strcpy - ldr r0, _080F4FD4 + ldr r0, =0x02021dc4 ldrh r1, [r6, 0x6] muls r1, r5 adds r1, r4 bl gf_strcpy - ldr r0, _080F4FD8 + ldr r0, =0x02021ec4 ldrh r1, [r6, 0x8] muls r1, r5 adds r1, r4 bl gf_strcpy - ldr r1, _080F4FDC + ldr r1, =0x0203a030 movs r0, 0x11 strb r0, [r1] b _080F5014 .align 2, 0 -_080F4FCC: .4byte 0x02021cc4 -_080F4FD0: .4byte 0x083185c8 -_080F4FD4: .4byte 0x02021dc4 -_080F4FD8: .4byte 0x02021ec4 -_080F4FDC: .4byte 0x0203a030 + .pool _080F4FE0: - ldr r0, _080F4FF8 + ldr r0, =0x02021cc4 ldrh r2, [r6, 0xA] movs r1, 0xB muls r1, r2 - ldr r2, _080F4FFC + ldr r2, =0x083185c8 adds r1, r2 _080F4FEC: bl gf_strcpy - ldr r1, _080F5000 + ldr r1, =0x0203a030 movs r0, 0x12 strb r0, [r1] b _080F5014 .align 2, 0 -_080F4FF8: .4byte 0x02021cc4 -_080F4FFC: .4byte 0x083185c8 -_080F5000: .4byte 0x0203a030 + .pool _080F5004: - ldr r0, _080F5028 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 ldrb r2, [r6, 0xC] bl sub_81DB5E8 bl sub_80F577C _080F5014: - ldr r0, _080F502C + ldr r0, =0x0858d524 lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] @@ -500750,44 +483902,38 @@ _080F5014: pop {r0} bx r0 .align 2, 0 -_080F5028: .4byte 0x02021cc4 -_080F502C: .4byte 0x0858d524 + .pool thumb_func_end sub_80F4D9C thumb_func_start sub_80F5030 sub_80F5030: @ 80F5030 push {r4,r5,lr} - ldr r2, _080F5060 - ldr r0, _080F5064 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F5068 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F506C + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F5070 + ldr r0, =0x0203a030 ldrb r5, [r0] cmp r5, 0x8 bls _080F5056 b _080F5164 _080F5056: lsls r0, r5, 2 - ldr r1, _080F5074 + ldr r1, =_080F5078 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F5060: .4byte 0x03005d8c -_080F5064: .4byte 0x020375e0 -_080F5068: .4byte 0x000027cc -_080F506C: .4byte 0x020375f0 -_080F5070: .4byte 0x0203a030 -_080F5074: .4byte _080F5078 + .pool .align 2, 0 _080F5078: .4byte _080F509C @@ -500800,7 +483946,7 @@ _080F5078: .4byte _080F5130 .4byte _080F5154 _080F509C: - ldr r0, _080F50B8 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x5] @@ -500809,13 +483955,12 @@ _080F509C: cmp r0, 0x6 bhi _080F5164 lsls r0, 2 - ldr r1, _080F50BC + ldr r1, =_080F50C0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F50B8: .4byte 0x02021cc4 -_080F50BC: .4byte _080F50C0 + .pool .align 2, 0 _080F50C0: .4byte _080F50DC @@ -500826,56 +483971,56 @@ _080F50C0: .4byte _080F5118 .4byte _080F5124 _080F50DC: - ldr r1, _080F50E4 + ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] b _080F5164 .align 2, 0 -_080F50E4: .4byte 0x0203a030 + .pool _080F50E8: - ldr r1, _080F50F0 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F5164 .align 2, 0 -_080F50F0: .4byte 0x0203a030 + .pool _080F50F4: - ldr r1, _080F50FC + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F5164 .align 2, 0 -_080F50FC: .4byte 0x0203a030 + .pool _080F5100: - ldr r1, _080F5108 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F5164 .align 2, 0 -_080F5108: .4byte 0x0203a030 + .pool _080F510C: - ldr r1, _080F5114 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F5164 .align 2, 0 -_080F5114: .4byte 0x0203a030 + .pool _080F5118: - ldr r1, _080F5120 + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F5164 .align 2, 0 -_080F5120: .4byte 0x0203a030 + .pool _080F5124: - ldr r1, _080F512C + ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] b _080F5164 .align 2, 0 -_080F512C: .4byte 0x0203a030 + .pool _080F5130: - ldr r0, _080F514C + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x5] @@ -500883,22 +484028,21 @@ _080F5130: ldrh r1, [r4, 0x2] movs r0, 0x1 bl sub_80EF340 - ldr r1, _080F5150 + ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] b _080F5164 .align 2, 0 -_080F514C: .4byte 0x02021cc4 -_080F5150: .4byte 0x0203a030 + .pool _080F5154: - ldr r0, _080F5178 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x5] bl sub_81DB5E8 bl sub_80F577C _080F5164: - ldr r0, _080F517C + ldr r0, =0x0858d570 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -500907,8 +484051,7 @@ _080F5164: pop {r0} bx r0 .align 2, 0 -_080F5178: .4byte 0x02021cc4 -_080F517C: .4byte 0x0858d570 + .pool thumb_func_end sub_80F5030 thumb_func_start sub_80F5180 @@ -500948,7 +484091,7 @@ sub_80F51AC: @ 80F51AC movs r3, 0 ldr r1, [r0, 0xC] movs r5, 0x1 - ldr r6, _080F51D0 + ldr r6, =0x0858d690 _080F51BC: adds r0, r1, 0 lsrs r0, r2 @@ -500961,7 +484104,7 @@ _080F51BC: ldrb r0, [r0] b _080F51E6 .align 2, 0 -_080F51D0: .4byte 0x0858d690 + .pool _080F51D4: adds r0, r3, 0x1 lsls r0, 24 @@ -500985,20 +484128,20 @@ sub_80F51EC: @ 80F51EC mov r7, r9 mov r6, r8 push {r6,r7} - ldr r2, _080F5228 - ldr r0, _080F522C + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F5230 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r5, r1, r0 - ldr r1, _080F5234 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F5238 + ldr r0, =0x0203a030 ldrb r2, [r0] mov r9, r2 adds r2, r0, 0 @@ -501008,17 +484151,12 @@ sub_80F51EC: @ 80F51EC b _080F552A _080F521E: lsls r0, 2 - ldr r1, _080F523C + ldr r1, =_080F5240 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F5228: .4byte 0x03005d8c -_080F522C: .4byte 0x020375e0 -_080F5230: .4byte 0x000027cc -_080F5234: .4byte 0x020375f0 -_080F5238: .4byte 0x0203a030 -_080F523C: .4byte _080F5240 + .pool .align 2, 0 _080F5240: .4byte _080F52F0 @@ -501066,11 +484204,11 @@ _080F5240: .4byte _080F5526 .4byte _080F5526 _080F52F0: - ldr r0, _080F531C + ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1C] bl sub_81DB5E8 - ldr r0, _080F5320 + ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x1B] @@ -501081,19 +484219,17 @@ _080F52F0: lsrs r6, r0, 24 cmp r6, 0 bne _080F5328 - ldr r1, _080F5324 + ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] b _080F552A .align 2, 0 -_080F531C: .4byte 0x02021cc4 -_080F5320: .4byte 0x02021dc4 -_080F5324: .4byte 0x0203a030 + .pool _080F5328: movs r0, 0x1 strb r0, [r5, 0x12] bl GenerateRandomNumber - ldr r4, _080F5344 + ldr r4, =0x0203a031 lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 @@ -501102,9 +484238,9 @@ _080F5328: ldrb r1, [r4] b _080F542A .align 2, 0 -_080F5344: .4byte 0x0203a031 + .pool _080F5348: - ldr r0, _080F536C + ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x1B] @@ -501120,10 +484256,10 @@ _080F5348: movs r4, 0 b _080F538A .align 2, 0 -_080F536C: .4byte 0x02021dc4 + .pool _080F5370: strb r6, [r5, 0x12] - ldr r0, _080F5380 + ldr r0, =0x0203a031 ldrb r0, [r0] cmp r0, 0 bne _080F5384 @@ -501131,14 +484267,14 @@ _080F5370: movs r1, 0x1 b _080F542C .align 2, 0 -_080F5380: .4byte 0x0203a031 + .pool _080F5384: adds r0, r5, 0 movs r1, 0 b _080F542C _080F538A: bl GenerateRandomNumber - ldr r7, _080F53BC + ldr r7, =0x0203a031 lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 @@ -501152,7 +484288,7 @@ _080F538A: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _080F53C0 + ldr r0, =0x0000fffe cmp r4, r0 bls _080F538A _080F53B2: @@ -501161,10 +484297,9 @@ _080F53B2: ldrb r1, [r7, 0x1] b _080F542A .align 2, 0 -_080F53BC: .4byte 0x0203a031 -_080F53C0: .4byte 0x0000fffe + .pool _080F53C4: - ldr r0, _080F53E8 + ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x1B] @@ -501176,17 +484311,16 @@ _080F53C4: cmp r6, 0x2 bne _080F53F0 _080F53DE: - ldr r1, _080F53EC + ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] b _080F552A .align 2, 0 -_080F53E8: .4byte 0x02021dc4 -_080F53EC: .4byte 0x0203a030 + .pool _080F53F0: movs r4, 0 - ldr r7, _080F5438 - ldr r2, _080F543C + ldr r7, =0x0203a031 + ldr r2, =0x0000fffe mov r8, r2 _080F53F8: bl GenerateRandomNumber @@ -501212,25 +484346,23 @@ _080F5418: _080F5422: movs r0, 0x3 strb r0, [r5, 0x12] - ldr r0, _080F5438 + ldr r0, =0x0203a031 ldrb r1, [r0, 0x2] _080F542A: adds r0, r5, 0 _080F542C: bl sub_80F51AC - ldr r1, _080F5440 + ldr r1, =0x0203a030 strb r0, [r1] b _080F552A .align 2, 0 -_080F5438: .4byte 0x0203a031 -_080F543C: .4byte 0x0000fffe -_080F5440: .4byte 0x0203a030 + .pool _080F5444: - ldr r0, _080F5470 + ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1C] bl sub_81DB5E8 - ldr r0, _080F5474 + ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x1B] @@ -501241,54 +484373,50 @@ _080F5444: ldrh r0, [r5, 0x2] cmp r0, 0x1E bhi _080F547C - ldr r1, _080F5478 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F552A .align 2, 0 -_080F5470: .4byte 0x02021cc4 -_080F5474: .4byte 0x02021dc4 -_080F5478: .4byte 0x0203a030 + .pool _080F547C: cmp r0, 0x64 bhi _080F548C - ldr r1, _080F5488 + ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] b _080F552A .align 2, 0 -_080F5488: .4byte 0x0203a030 + .pool _080F548C: - ldr r1, _080F5494 + ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] b _080F552A .align 2, 0 -_080F5494: .4byte 0x0203a030 + .pool _080F5498: - ldr r0, _080F54B8 + ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1C] bl sub_81DB5E8 - ldr r0, _080F54BC + ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x1B] bl sub_81DB5E8 - ldr r1, _080F54C0 + ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] b _080F552A .align 2, 0 -_080F54B8: .4byte 0x02021cc4 -_080F54BC: .4byte 0x02021dc4 -_080F54C0: .4byte 0x0203a030 + .pool _080F54C4: - ldr r0, _080F54E0 + ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1C] bl sub_81DB5E8 - ldr r0, _080F54E4 + ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 ldrb r2, [r5, 0x1B] @@ -501296,8 +484424,7 @@ _080F54C4: bl sub_80F577C b _080F552A .align 2, 0 -_080F54E0: .4byte 0x02021cc4 -_080F54E4: .4byte 0x02021dc4 + .pool _080F54E8: movs r0, 0x3 b _080F5528 @@ -501305,19 +484432,18 @@ _080F54EC: movs r0, 0x3 b _080F5528 _080F54F0: - ldr r4, _080F5508 + ldr r4, =0x02021dc4 ldrh r0, [r5, 0x10] bl itemid_get_item adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy - ldr r1, _080F550C + ldr r1, =0x0203a030 ldrb r0, [r5, 0x12] strb r0, [r1] b _080F552A .align 2, 0 -_080F5508: .4byte 0x02021dc4 -_080F550C: .4byte 0x0203a030 + .pool _080F5510: adds r0, r5, 0 adds r0, 0x22 @@ -501336,7 +484462,7 @@ _080F5526: _080F5528: strb r0, [r2] _080F552A: - ldr r0, _080F5544 + ldr r0, =0x0858d594 mov r2, r9 lsls r1, r2, 2 adds r1, r0 @@ -501349,26 +484475,26 @@ _080F552A: pop {r0} bx r0 .align 2, 0 -_080F5544: .4byte 0x0858d594 + .pool thumb_func_end sub_80F51EC thumb_func_start sub_80F5548 sub_80F5548: @ 80F5548 push {r4,r5,lr} - ldr r2, _080F557C - ldr r0, _080F5580 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F5584 + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F5588 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080F558C + ldr r0, =0x0203a030 ldrb r5, [r0] adds r2, r0, 0 cmp r5, 0xA @@ -501376,17 +484502,12 @@ sub_80F5548: @ 80F5548 b _080F56BC _080F5570: lsls r0, r5, 2 - ldr r1, _080F5590 + ldr r1, =_080F5594 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F557C: .4byte 0x03005d8c -_080F5580: .4byte 0x020375e0 -_080F5584: .4byte 0x000027cc -_080F5588: .4byte 0x020375f0 -_080F558C: .4byte 0x0203a030 -_080F5590: .4byte _080F5594 + .pool .align 2, 0 _080F5594: .4byte _080F55C0 @@ -501418,7 +484539,7 @@ _080F55D6: strb r0, [r2] b _080F56BC _080F55DC: - ldr r0, _080F5600 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x4] @@ -501429,36 +484550,35 @@ _080F55DC: ldrb r0, [r4, 0x3] cmp r0, 0 bne _080F5608 - ldr r1, _080F5604 + ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] b _080F56BC .align 2, 0 -_080F5600: .4byte 0x02021cc4 -_080F5604: .4byte 0x0203a030 + .pool _080F5608: - ldr r1, _080F5610 + ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] b _080F56BC .align 2, 0 -_080F5610: .4byte 0x0203a030 + .pool _080F5614: ldrb r1, [r4, 0x3] movs r0, 0x1 bl sub_80EF340 - ldr r1, _080F5624 + ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] b _080F56BC .align 2, 0 -_080F5624: .4byte 0x0203a030 + .pool _080F5628: movs r0, 0x4 strb r0, [r2] b _080F56BC _080F562E: - ldr r0, _080F564C + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x4] @@ -501471,9 +484591,9 @@ _080F562E: beq _080F5662 b _080F5674 .align 2, 0 -_080F564C: .4byte 0x02021cc4 + .pool _080F5650: - ldr r0, _080F566C + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x4] @@ -501482,51 +484602,49 @@ _080F5650: cmp r0, 0 bne _080F5674 _080F5662: - ldr r1, _080F5670 + ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] b _080F56BC .align 2, 0 -_080F566C: .4byte 0x02021cc4 -_080F5670: .4byte 0x0203a030 + .pool _080F5674: - ldr r1, _080F567C + ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] b _080F56BC .align 2, 0 -_080F567C: .4byte 0x0203a030 + .pool _080F5680: ldrb r1, [r4, 0x3] movs r0, 0x1 bl sub_80EF340 - ldr r1, _080F5690 + ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] b _080F56BC .align 2, 0 -_080F5690: .4byte 0x0203a030 + .pool _080F5694: movs r0, 0x9 strb r0, [r2] b _080F56BC _080F569A: - ldr r0, _080F56B0 + ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 ldrb r2, [r4, 0x4] bl sub_81DB5E8 - ldr r1, _080F56B4 + ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] b _080F56BC .align 2, 0 -_080F56B0: .4byte 0x02021cc4 -_080F56B4: .4byte 0x0203a030 + .pool _080F56B8: bl sub_80F577C _080F56BC: - ldr r0, _080F56D0 + ldr r0, =0x0858d640 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -501535,26 +484653,26 @@ _080F56BC: pop {r0} bx r0 .align 2, 0 -_080F56D0: .4byte 0x0858d640 + .pool thumb_func_end sub_80F5548 thumb_func_start sub_80F56D4 sub_80F56D4: @ 80F56D4 push {r4-r6,lr} - ldr r2, _080F5704 - ldr r0, _080F5708 + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080F570C + ldr r1, =0x000027cc adds r0, r1 ldr r1, [r2] adds r4, r1, r0 - ldr r1, _080F5710 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r6, _080F5714 + ldr r6, =0x0203a030 ldrb r5, [r6] cmp r5, 0x2 bgt _080F5718 @@ -501564,17 +484682,13 @@ sub_80F56D4: @ 80F56D4 beq _080F571E b _080F575E .align 2, 0 -_080F5704: .4byte 0x03005d8c -_080F5708: .4byte 0x020375e0 -_080F570C: .4byte 0x000027cc -_080F5710: .4byte 0x020375f0 -_080F5714: .4byte 0x0203a030 + .pool _080F5718: cmp r5, 0x3 beq _080F574E b _080F575E _080F571E: - ldr r0, _080F5730 + ldr r0, =0x02021cc4 ldrb r1, [r4, 0xA] bl sub_818E868 ldrb r1, [r4, 0x16] @@ -501583,7 +484697,7 @@ _080F571E: strb r1, [r6] b _080F575E .align 2, 0 -_080F5730: .4byte 0x02021cc4 + .pool _080F5734: cmp r1, 0 bne _080F573E @@ -501595,19 +484709,19 @@ _080F573E: strb r0, [r6] b _080F575E _080F5744: - ldr r0, _080F5770 + ldr r0, =0x02021ec4 adds r1, r4, 0x2 ldrb r2, [r4, 0x17] bl sub_81DB5E8 _080F574E: - ldr r0, _080F5774 + ldr r0, =0x02021dc4 adds r1, r4, 0 adds r1, 0xB ldrb r2, [r4, 0x18] bl sub_81DB5E8 bl sub_80F577C _080F575E: - ldr r0, _080F5778 + ldr r0, =0x0858d384 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -501616,48 +484730,42 @@ _080F575E: pop {r0} bx r0 .align 2, 0 -_080F5770: .4byte 0x02021ec4 -_080F5774: .4byte 0x02021dc4 -_080F5778: .4byte 0x0858d384 + .pool thumb_func_end sub_80F56D4 thumb_func_start sub_80F577C sub_80F577C: @ 80F577C - ldr r1, _080F57A4 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - ldr r1, _080F57A8 + ldr r1, =0x0203a030 movs r0, 0 strb r0, [r1] - ldr r0, _080F57AC + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r0, _080F57B0 + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 adds r2, r0 - ldr r0, _080F57B4 + ldr r0, =0x000027cd adds r2, r0 movs r0, 0 strb r0, [r2] bx lr .align 2, 0 -_080F57A4: .4byte 0x020375f0 -_080F57A8: .4byte 0x0203a030 -_080F57AC: .4byte 0x03005d8c -_080F57B0: .4byte 0x020375e0 -_080F57B4: .4byte 0x000027cd + .pool thumb_func_end sub_80F577C thumb_func_start sub_80F57B8 sub_80F57B8: @ 80F57B8 - ldr r1, _080F57C0 + ldr r1, =0x0203a030 movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_080F57C0: .4byte 0x0203a030 + .pool thumb_func_end sub_80F57B8 thumb_func_start sub_80F57C4 @@ -501668,7 +484776,7 @@ sub_80F57C4: @ 80F57C4 bl lcd_io_set movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _080F58D8 + ldr r1, =0x0858d888 movs r0, 0 movs r2, 0x4 bl bg_vram_setup @@ -501676,7 +484784,7 @@ sub_80F57C4: @ 80F57C4 _080F57E0: lsls r0, r4, 24 lsrs r0, 24 - ldr r1, _080F58DC + ldr r1, =0x0203a034 ldr r1, [r1] lsls r2, r4, 2 adds r1, 0xC @@ -501686,16 +484794,16 @@ _080F57E0: adds r4, 0x1 cmp r4, 0x3 ble _080F57E0 - ldr r0, _080F58E0 + ldr r0, =0x0858d898 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0x4C movs r1, 0 bl lcd_io_set - ldr r1, _080F58E4 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r1, _080F58E8 + ldr r1, =0x00003f2e movs r0, 0x4A bl lcd_io_set movs r0, 0x40 @@ -501747,52 +484855,36 @@ _080F57E0: lsls r1, 8 movs r0, 0 bl lcd_io_set_bits - ldr r0, _080F58EC + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _080F58F0 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r0, _080F58F4 + ldr r0, =0x02022e18 strh r1, [r0] - ldr r0, _080F58F8 + ldr r0, =0x02022e1a strh r1, [r0] - ldr r0, _080F58FC + ldr r0, =0x02022e1c strh r1, [r0] - ldr r0, _080F5900 + ldr r0, =0x02022e1e strh r1, [r0] - ldr r0, _080F5904 + ldr r0, =0x02022e20 strh r1, [r0] - ldr r0, _080F5908 + ldr r0, =0x02022e22 strh r1, [r0] - ldr r0, _080F590C + ldr r0, =0x02022e24 strh r1, [r0] - ldr r0, _080F5910 + ldr r0, =0x02022e26 strh r1, [r0] - ldr r0, _080F5914 + ldr r0, =0x02022e28 strh r1, [r0] - ldr r0, _080F5918 + ldr r0, =0x02022e2a strh r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080F58D8: .4byte 0x0858d888 -_080F58DC: .4byte 0x0203a034 -_080F58E0: .4byte 0x0858d898 -_080F58E4: .4byte 0x00003f3f -_080F58E8: .4byte 0x00003f2e -_080F58EC: .4byte 0x02022e14 -_080F58F0: .4byte 0x02022e16 -_080F58F4: .4byte 0x02022e18 -_080F58F8: .4byte 0x02022e1a -_080F58FC: .4byte 0x02022e1c -_080F5900: .4byte 0x02022e1e -_080F5904: .4byte 0x02022e20 -_080F5908: .4byte 0x02022e22 -_080F590C: .4byte 0x02022e24 -_080F5910: .4byte 0x02022e26 -_080F5914: .4byte 0x02022e28 -_080F5918: .4byte 0x02022e2a + .pool thumb_func_end sub_80F57C4 thumb_func_start sub_80F591C @@ -501803,32 +484895,32 @@ sub_80F591C: @ 80F591C mov r5, r8 push {r5-r7} sub sp, 0x10 - ldr r0, _080F59D4 + ldr r0, =0x08c19588 movs r1, 0xC0 lsls r1, 19 bl call_LZZUnCompVram - ldr r1, _080F59D8 + ldr r1, =0x08c1a12c movs r0, 0x3 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r1, _080F59DC + ldr r1, =0x08c1a000 movs r0, 0x2 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r1, _080F59E0 + ldr r1, =0x08c19eec movs r0, 0 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map bl sub_80F71C8 - ldr r0, _080F59E4 + ldr r0, =0x08c1a2b4 movs r2, 0x80 lsls r2, 2 movs r1, 0 bl decompress_palette - ldr r0, _080F59E8 + ldr r0, =0x0858d6b0 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -501864,7 +484956,7 @@ _080F5976: adds r1, 0x5 lsls r7, r1, 24 _080F59B0: - ldr r1, _080F59EC + ldr r1, =0x000060b2 cmp r6, r10 bge _080F59B8 adds r1, 0x2 @@ -501879,22 +484971,15 @@ _080F59B8: _080F59C6: cmp r6, r2 bge _080F59F4 - ldr r5, _080F59F0 + ldr r5, =0x000060a4 cmp r0, 0 bge _080F59F6 adds r5, 0x2 b _080F59F6 .align 2, 0 -_080F59D4: .4byte 0x08c19588 -_080F59D8: .4byte 0x08c1a12c -_080F59DC: .4byte 0x08c1a000 -_080F59E0: .4byte 0x08c19eec -_080F59E4: .4byte 0x08c1a2b4 -_080F59E8: .4byte 0x0858d6b0 -_080F59EC: .4byte 0x000060b2 -_080F59F0: .4byte 0x000060a4 + .pool _080F59F4: - ldr r5, _080F5A70 + ldr r5, =0x000060a2 _080F59F6: adds r4, r6, 0 adds r4, 0x13 @@ -501947,7 +485032,7 @@ _080F59F6: pop {r0} bx r0 .align 2, 0 -_080F5A70: .4byte 0x000060a2 + .pool thumb_func_end sub_80F591C thumb_func_start sub_80F5A74 @@ -501957,14 +485042,14 @@ sub_80F5A74: @ 80F5A74 lsrs r0, 24 adds r5, r0, 0 lsls r1, r5, 6 - ldr r0, _080F5ACC + ldr r0, =0x02039e00 adds r7, r1, r0 - ldr r6, _080F5AD0 - ldr r0, _080F5AD4 + ldr r6, =0x02022e2c + ldr r0, =0x02039f25 ldrb r0, [r0] cmp r5, r0 bne _080F5A96 - ldr r1, _080F5AD8 + ldr r1, =0x085ed21e adds r0, r6, 0 bl gf_strcpy adds r6, r0, 0 @@ -501972,12 +485057,12 @@ _080F5A96: adds r1, r7, 0x2 adds r0, r6, 0 bl gf_strcpy - ldr r4, _080F5AD0 + ldr r4, =0x02022e2c adds r0, r5, 0 adds r1, r4, 0 movs r2, 0 bl sub_80F7ED0 - ldr r1, _080F5ADC + ldr r1, =0x085e8d3e adds r0, r6, 0 bl gf_strcpy adds r1, r7, 0 @@ -501992,11 +485077,7 @@ _080F5A96: pop {r0} bx r0 .align 2, 0 -_080F5ACC: .4byte 0x02039e00 -_080F5AD0: .4byte 0x02022e2c -_080F5AD4: .4byte 0x02039f25 -_080F5AD8: .4byte 0x085ed21e -_080F5ADC: .4byte 0x085e8d3e + .pool thumb_func_end sub_80F5A74 thumb_func_start sub_80F5AE0 @@ -502021,7 +485102,7 @@ _080F5AE4: sub_80F5B00: @ 80F5B00 push {r4-r6,lr} sub sp, 0x4 - ldr r5, _080F5BC0 + ldr r5, =0x02037fd4 ldrb r0, [r5, 0x8] movs r6, 0x80 orrs r0, r6 @@ -502041,7 +485122,7 @@ sub_80F5B00: @ 80F5B00 movs r1, 0x1 bl sub_80F6A64 bl sub_80F5AE0 - ldr r4, _080F5BC4 + ldr r4, =0x0203a034 ldr r0, [r4] ldr r0, [r0] movs r1, 0 @@ -502065,26 +485146,26 @@ sub_80F5B00: @ 80F5B00 movs r0, 0x7F ands r0, r1 strb r0, [r5, 0x8] - ldr r0, _080F5BC8 + ldr r0, =sub_80F5CE4 + 1 movs r1, 0x5 bl AddTask ldr r1, [r4] ldr r1, [r1] strb r0, [r1, 0x2] - ldr r0, _080F5BCC + ldr r0, =sub_80F5C00 + 1 bl set_callback2 - ldr r1, _080F5BD0 + ldr r1, =0x02022e28 movs r0, 0xF0 strh r0, [r1] - ldr r1, _080F5BD4 - ldr r2, _080F5BD8 + ldr r1, =0x02022e2a + ldr r2, =0x000080a0 adds r0, r2, 0 strh r0, [r1] - ldr r0, _080F5BDC + ldr r0, =sub_80F68B4 + 1 movs r1, 0x14 bl AddTask bl sub_80F7880 - ldr r0, _080F5BE0 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x2 ands r0, r1 @@ -502095,28 +485176,20 @@ sub_80F5B00: @ 80F5B00 strb r0, [r5, 0x8] b _080F5BEC .align 2, 0 -_080F5BC0: .4byte 0x02037fd4 -_080F5BC4: .4byte 0x0203a034 -_080F5BC8: .4byte sub_80F5CE4 + 1 -_080F5BCC: .4byte sub_80F5C00 + 1 -_080F5BD0: .4byte 0x02022e28 -_080F5BD4: .4byte 0x02022e2a -_080F5BD8: .4byte 0x000080a0 -_080F5BDC: .4byte sub_80F68B4 + 1 -_080F5BE0: .4byte 0x02039f2a + .pool _080F5BE4: movs r0, 0xDF lsls r0, 1 bl song_play_for_text _080F5BEC: - ldr r0, _080F5BFC + ldr r0, =sub_80F5C24 + 1 bl SetVBlankCallback add sp, 0x4 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080F5BFC: .4byte sub_80F5C24 + 1 + .pool thumb_func_end sub_80F5B00 thumb_func_start sub_80F5C00 @@ -502137,51 +485210,51 @@ sub_80F5C00: @ 80F5C00 thumb_func_start sub_80F5C24 sub_80F5C24: @ 80F5C24 push {lr} - ldr r0, _080F5CB4 + ldr r0, =0x02022e14 ldrh r1, [r0] movs r0, 0x10 bl lcd_io_set - ldr r0, _080F5CB8 + ldr r0, =0x02022e16 ldrh r1, [r0] movs r0, 0x12 bl lcd_io_set - ldr r0, _080F5CBC + ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 bl lcd_io_set - ldr r0, _080F5CC0 + ldr r0, =0x02022e1a ldrh r1, [r0] movs r0, 0x16 bl lcd_io_set - ldr r0, _080F5CC4 + ldr r0, =0x02022e1c ldrh r1, [r0] movs r0, 0x18 bl lcd_io_set - ldr r0, _080F5CC8 + ldr r0, =0x02022e1e ldrh r1, [r0] movs r0, 0x1A bl lcd_io_set - ldr r0, _080F5CCC + ldr r0, =0x02022e20 ldrh r1, [r0] movs r0, 0x1C bl lcd_io_set - ldr r0, _080F5CD0 + ldr r0, =0x02022e22 ldrh r1, [r0] movs r0, 0x1E bl lcd_io_set - ldr r0, _080F5CD4 + ldr r0, =0x02022e24 ldrh r1, [r0] movs r0, 0x40 bl lcd_io_set - ldr r0, _080F5CD8 + ldr r0, =0x02022e26 ldrh r1, [r0] movs r0, 0x44 bl lcd_io_set - ldr r0, _080F5CDC + ldr r0, =0x02022e28 ldrh r1, [r0] movs r0, 0x42 bl lcd_io_set - ldr r0, _080F5CE0 + ldr r0, =0x02022e2a ldrh r1, [r0] movs r0, 0x46 bl lcd_io_set @@ -502192,18 +485265,7 @@ sub_80F5C24: @ 80F5C24 pop {r0} bx r0 .align 2, 0 -_080F5CB4: .4byte 0x02022e14 -_080F5CB8: .4byte 0x02022e16 -_080F5CBC: .4byte 0x02022e18 -_080F5CC0: .4byte 0x02022e1a -_080F5CC4: .4byte 0x02022e1c -_080F5CC8: .4byte 0x02022e1e -_080F5CCC: .4byte 0x02022e20 -_080F5CD0: .4byte 0x02022e22 -_080F5CD4: .4byte 0x02022e24 -_080F5CD8: .4byte 0x02022e26 -_080F5CDC: .4byte 0x02022e28 -_080F5CE0: .4byte 0x02022e2a + .pool thumb_func_end sub_80F5C24 thumb_func_start sub_80F5CE4 @@ -502211,7 +485273,7 @@ sub_80F5CE4: @ 80F5CE4 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r3, _080F5D18 + ldr r3, =0x02039f2a ldrb r1, [r3] movs r0, 0x1 ands r0, r1 @@ -502219,7 +485281,7 @@ sub_80F5CE4: @ 80F5CE4 bne _080F5CF8 b _080F5E2E _080F5CF8: - ldr r2, _080F5D1C + ldr r2, =0x03005e00 lsls r1, r6, 2 adds r0, r1, r6 lsls r0, 3 @@ -502235,8 +485297,7 @@ _080F5CF8: beq _080F5D2A b _080F5E2E .align 2, 0 -_080F5D18: .4byte 0x02039f2a -_080F5D1C: .4byte 0x03005e00 + .pool _080F5D20: cmp r0, 0x2 beq _080F5DF4 @@ -502245,8 +485306,8 @@ _080F5D20: b _080F5E2E _080F5D2A: bl sub_80DBED4 - ldr r1, _080F5DBC - ldr r0, _080F5DC0 + ldr r1, =0x02039f20 + ldr r0, =0x02039f25 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -502254,11 +485315,11 @@ _080F5D2A: bne _080F5D58 movs r0, 0x23 bl sav12_xor_increment - ldr r1, _080F5DC4 + ldr r1, =0x020375e2 movs r0, 0x8 strh r0, [r1] bl sub_80EF5B8 - ldr r0, _080F5DC8 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 beq _080F5D58 @@ -502266,20 +485327,20 @@ _080F5D2A: _080F5D58: movs r0, 0x2 bl sub_813BADC - ldr r0, _080F5DCC + ldr r0, =0x02039f2e ldrb r0, [r0] bl sub_80DEDA8 movs r0, 0xFE bl sub_80DEDA8 - ldr r1, _080F5DD0 + ldr r1, =0x02039f5c movs r0, 0x1 strb r0, [r1] movs r0, 0xFE movs r1, 0 bl sub_80DEFA8 - ldr r1, _080F5DD4 + ldr r1, =0x02039f5d strb r0, [r1] - ldr r5, _080F5DD8 + ldr r5, =0x00004086 adds r0, r5, 0 bl var_get adds r4, r0, 0 @@ -502295,7 +485356,7 @@ _080F5D58: adds r0, r5, 0 adds r1, r4, 0 bl var_set - ldr r0, _080F5DDC + ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 @@ -502304,15 +485365,7 @@ _080F5D58: strh r0, [r1, 0x8] b _080F5E2E .align 2, 0 -_080F5DBC: .4byte 0x02039f20 -_080F5DC0: .4byte 0x02039f25 -_080F5DC4: .4byte 0x020375e2 -_080F5DC8: .4byte 0x020375f0 -_080F5DCC: .4byte 0x02039f2e -_080F5DD0: .4byte 0x02039f5c -_080F5DD4: .4byte 0x02039f5d -_080F5DD8: .4byte 0x00004086 -_080F5DDC: .4byte 0x03005e00 + .pool _080F5DE0: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -502343,7 +485396,7 @@ _080F5E0A: movs r0, 0xDF lsls r0, 1 bl song_play_for_text - ldr r2, _080F5E64 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -502353,7 +485406,7 @@ _080F5E0A: _080F5E2C: strh r0, [r4, 0x8] _080F5E2E: - ldr r0, _080F5E64 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -502361,34 +485414,30 @@ _080F5E2E: lsrs r2, r0, 24 cmp r2, 0 bne _080F5EBA - ldr r1, _080F5E68 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r4, r0, r1 strh r2, [r4, 0x8] - ldr r0, _080F5E6C + ldr r0, =0x02039f2a ldrb r1, [r0] movs r5, 0x1 adds r0, r5, 0 ands r0, r1 cmp r0, 0 beq _080F5E78 - ldr r0, _080F5E70 + ldr r0, =0x085ed207 bl sub_80F707C - ldr r0, _080F5E74 + ldr r0, =sub_80F5ED8 + 1 b _080F5EB8 .align 2, 0 -_080F5E64: .4byte 0x02037fd4 -_080F5E68: .4byte 0x03005e00 -_080F5E6C: .4byte 0x02039f2a -_080F5E70: .4byte 0x085ed207 -_080F5E74: .4byte sub_80F5ED8 + 1 + .pool _080F5E78: movs r0, 0x24 bl sav12_xor_increment - ldr r1, _080F5EC0 - ldr r0, _080F5EC4 + ldr r1, =0x02039f20 + ldr r0, =0x02039f25 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -502397,21 +485446,21 @@ _080F5E78: movs r0, 0x25 bl sav12_xor_increment _080F5E92: - ldr r0, _080F5EC8 + ldr r0, =0x02039f2e ldrb r0, [r0] bl sub_80DEDA8 movs r0, 0xFE bl sub_80DEDA8 - ldr r0, _080F5ECC + ldr r0, =0x02039f5c strb r5, [r0] movs r0, 0xFE movs r1, 0 bl sub_80DEFA8 - ldr r1, _080F5ED0 + ldr r1, =0x02039f5d strb r0, [r1] movs r0, 0x2 bl sub_813BADC - ldr r0, _080F5ED4 + ldr r0, =sub_80F5F74 + 1 _080F5EB8: str r0, [r4] _080F5EBA: @@ -502419,12 +485468,7 @@ _080F5EBA: pop {r0} bx r0 .align 2, 0 -_080F5EC0: .4byte 0x02039f20 -_080F5EC4: .4byte 0x02039f25 -_080F5EC8: .4byte 0x02039f2e -_080F5ECC: .4byte 0x02039f5c -_080F5ED0: .4byte 0x02039f5d -_080F5ED4: .4byte sub_80F5F74 + 1 + .pool thumb_func_end sub_80F5CE4 thumb_func_start sub_80F5ED8 @@ -502432,29 +485476,26 @@ sub_80F5ED8: @ 80F5ED8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080F5F04 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080F5EFC - ldr r0, _080F5F08 + ldr r0, =sub_80F5F14 + 1 movs r1, 0 bl AddTask - ldr r1, _080F5F0C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080F5F10 + ldr r1, =nullsub_4 + 1 str r1, [r0] _080F5EFC: pop {r4} pop {r0} bx r0 .align 2, 0 -_080F5F04: .4byte 0x03003124 -_080F5F08: .4byte sub_80F5F14 + 1 -_080F5F0C: .4byte 0x03005e00 -_080F5F10: .4byte nullsub_4 + 1 + .pool thumb_func_end sub_80F5ED8 thumb_func_start sub_80F5F14 @@ -502462,14 +485503,13 @@ sub_80F5F14: @ 80F5F14 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080F5F28 - ldr r2, _080F5F2C + ldr r1, =sub_80FC998 + 1 + ldr r2, =sub_80F5F30 + 1 bl set_task_function_and_args_14_15 pop {r0} bx r0 .align 2, 0 -_080F5F28: .4byte sub_80FC998 + 1 -_080F5F2C: .4byte sub_80F5F30 + 1 + .pool thumb_func_end sub_80F5F14 thumb_func_start sub_80F5F30 @@ -502483,8 +485523,8 @@ sub_80F5F30: @ 80F5F30 beq _080F5F60 adds r0, r4, 0 bl remove_task - ldr r2, _080F5F68 - ldr r0, _080F5F6C + ldr r2, =0x03005e00 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x2] @@ -502492,7 +485532,7 @@ sub_80F5F30: @ 80F5F30 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _080F5F70 + ldr r1, =sub_80F5F74 + 1 str r1, [r0] bl sub_80F7144 _080F5F60: @@ -502500,9 +485540,7 @@ _080F5F60: pop {r0} bx r0 .align 2, 0 -_080F5F68: .4byte 0x03005e00 -_080F5F6C: .4byte 0x0203a034 -_080F5F70: .4byte sub_80F5F74 + 1 + .pool thumb_func_end sub_80F5F30 thumb_func_start sub_80F5F74 @@ -502510,7 +485548,7 @@ sub_80F5F74: @ 80F5F74 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080F5FB4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -502520,11 +485558,11 @@ sub_80F5F74: @ 80F5F74 ldrsh r0, [r4, r2] cmp r0, 0 bne _080F5FC4 - ldr r0, _080F5FB8 + ldr r0, =sub_80F68F0 + 1 movs r1, 0x14 bl AddTask - ldr r0, _080F5FBC - ldr r1, _080F5FC0 + ldr r0, =0x085ed1b8 + ldr r1, =0x0203a034 ldr r1, [r1] ldr r1, [r1] ldrb r1, [r1] @@ -502537,14 +485575,11 @@ sub_80F5F74: @ 80F5F74 movs r2, 0x78 b _080F6016 .align 2, 0 -_080F5FB4: .4byte 0x03005e00 -_080F5FB8: .4byte sub_80F68F0 + 1 -_080F5FBC: .4byte 0x085ed1b8 -_080F5FC0: .4byte 0x0203a034 + .pool _080F5FC4: cmp r0, 0x1 bne _080F5FDC - ldr r0, _080F5FD8 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x4] @@ -502552,7 +485587,7 @@ _080F5FC4: bne _080F6048 b _080F5FF0 .align 2, 0 -_080F5FD8: .4byte 0x0203a034 + .pool _080F5FDC: cmp r0, 0x2 bne _080F5FF8 @@ -502572,15 +485607,15 @@ _080F5FF0: _080F5FF8: cmp r0, 0x3 bne _080F6030 - ldr r0, _080F6024 - ldr r1, _080F6028 + ldr r0, =0x085ed1d0 + ldr r1, =0x0203a034 ldr r1, [r1] ldr r1, [r1] ldrb r1, [r1] bl sub_80F6B78 lsls r0, 16 asrs r0, 16 - ldr r2, _080F602C + ldr r2, =0x0000ffff movs r3, 0x88 lsls r3, 3 movs r1, 0x90 @@ -502591,13 +485626,11 @@ _080F6016: strh r0, [r4, 0x8] b _080F6048 .align 2, 0 -_080F6024: .4byte 0x085ed1d0 -_080F6028: .4byte 0x0203a034 -_080F602C: .4byte 0x0000ffff + .pool _080F6030: cmp r0, 0x4 bne _080F6048 - ldr r0, _080F6050 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x4] @@ -502605,15 +485638,14 @@ _080F6030: bne _080F6048 movs r0, 0 strh r0, [r4, 0x8] - ldr r0, _080F6054 + ldr r0, =sub_80F6058 + 1 str r0, [r4] _080F6048: pop {r4} pop {r0} bx r0 .align 2, 0 -_080F6050: .4byte 0x0203a034 -_080F6054: .4byte sub_80F6058 + 1 + .pool thumb_func_end sub_80F5F74 thumb_func_start sub_80F6058 @@ -502621,7 +485653,7 @@ sub_80F6058: @ 80F6058 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080F607C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -502636,13 +485668,13 @@ sub_80F6058: @ 80F6058 beq _080F6086 b _080F60E6 .align 2, 0 -_080F607C: .4byte 0x03005e00 + .pool _080F6080: cmp r0, 0x2 beq _080F60D4 b _080F60E6 _080F6086: - ldr r5, _080F60B4 + ldr r5, =0x0203a034 ldr r0, [r5] ldr r0, [r0] ldrb r0, [r0, 0xA] @@ -502664,14 +485696,14 @@ _080F6086: strh r0, [r4, 0x8] b _080F60E6 .align 2, 0 -_080F60B4: .4byte 0x0203a034 + .pool _080F60B8: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] b _080F60E6 _080F60C0: - ldr r0, _080F60D0 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x14] @@ -502680,7 +485712,7 @@ _080F60C0: strh r0, [r4, 0x8] b _080F60E6 .align 2, 0 -_080F60D0: .4byte 0x0203a034 + .pool _080F60D4: movs r0, 0x88 lsls r0, 3 @@ -502688,14 +485720,14 @@ _080F60D4: movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0xC] - ldr r0, _080F60EC + ldr r0, =sub_80F60F0 + 1 str r0, [r4] _080F60E6: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080F60EC: .4byte sub_80F60F0 + 1 + .pool thumb_func_end sub_80F6058 thumb_func_start sub_80F60F0 @@ -502704,13 +485736,13 @@ sub_80F60F0: @ 80F60F0 lsls r0, 24 lsrs r2, r0, 24 adds r4, r2, 0 - ldr r0, _080F613C + ldr r0, =0x0203a034 ldr r5, [r0] ldr r0, [r5] ldrb r3, [r0, 0x4] cmp r3, 0 bne _080F614C - ldr r1, _080F6140 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -502723,40 +485755,36 @@ sub_80F60F0: @ 80F60F0 cmp r0, 0x15 bne _080F615E strh r3, [r1, 0xA] - ldr r0, _080F6144 + ldr r0, =0x085ed1e9 ldr r1, [r5] ldrb r1, [r1] bl sub_80F6B78 lsls r0, 16 asrs r0, 16 - ldr r2, _080F6148 + ldr r2, =0x0000ffff movs r3, 0x88 lsls r3, 3 movs r1, 0x90 bl sub_80F6E9C b _080F615E .align 2, 0 -_080F613C: .4byte 0x0203a034 -_080F6140: .4byte 0x03005e00 -_080F6144: .4byte 0x085ed1e9 -_080F6148: .4byte 0x0000ffff + .pool _080F614C: cmp r3, 0x2 bne _080F615E - ldr r0, _080F6164 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080F6168 + ldr r0, =sub_80F616C + 1 str r0, [r1] _080F615E: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080F6164: .4byte 0x03005e00 -_080F6168: .4byte sub_80F616C + 1 + .pool thumb_func_end sub_80F60F0 thumb_func_start sub_80F616C @@ -502764,7 +485792,7 @@ sub_80F616C: @ 80F616C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080F6190 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -502779,13 +485807,13 @@ sub_80F616C: @ 80F616C beq _080F619A b _080F61F8 .align 2, 0 -_080F6190: .4byte 0x03005e00 + .pool _080F6194: cmp r0, 0x2 beq _080F61E8 b _080F61F8 _080F619A: - ldr r5, _080F61C8 + ldr r5, =0x0203a034 ldr r0, [r5] ldr r0, [r0] ldrb r0, [r0, 0xA] @@ -502807,14 +485835,14 @@ _080F619A: strh r0, [r4, 0x8] b _080F61F8 .align 2, 0 -_080F61C8: .4byte 0x0203a034 + .pool _080F61CC: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] b _080F61F8 _080F61D4: - ldr r0, _080F61E4 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x14] @@ -502823,21 +485851,21 @@ _080F61D4: strh r0, [r4, 0x8] b _080F61F8 .align 2, 0 -_080F61E4: .4byte 0x0203a034 + .pool _080F61E8: movs r0, 0x88 lsls r0, 3 bl sub_80F6EF4 movs r0, 0 strh r0, [r4, 0x8] - ldr r0, _080F6200 + ldr r0, =sub_80F6204 + 1 str r0, [r4] _080F61F8: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080F6200: .4byte sub_80F6204 + 1 + .pool thumb_func_end sub_80F616C thumb_func_start sub_80F6204 @@ -502848,7 +485876,7 @@ sub_80F6204: @ 80F6204 sub sp, 0x64 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080F6230 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -502861,13 +485889,12 @@ sub_80F6204: @ 80F6204 b _080F63F4 _080F6226: lsls r0, 2 - ldr r1, _080F6234 + ldr r1, =_080F6238 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F6230: .4byte 0x03005e00 -_080F6234: .4byte _080F6238 + .pool .align 2, 0 _080F6238: .4byte _080F6250 @@ -502877,7 +485904,7 @@ _080F6238: .4byte _080F6334 .4byte _080F63E4 _080F6250: - ldr r0, _080F6270 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x4] @@ -502894,7 +485921,7 @@ _080F625E: strh r1, [r0, 0x8] b _080F63F4 .align 2, 0 -_080F6270: .4byte 0x0203a034 + .pool _080F6274: lsls r0, r5, 2 adds r0, r5 @@ -502915,9 +485942,9 @@ _080F628C: _080F6292: movs r4, 0 lsls r6, r5, 2 - ldr r7, _080F62C0 + ldr r7, =0x03005e00 _080F6298: - ldr r0, _080F62C4 + ldr r0, =sub_80F73DC + 1 movs r1, 0xA bl AddTask lsls r0, 24 @@ -502926,7 +485953,7 @@ _080F6298: adds r1, r0 lsls r1, 3 adds r1, r7 - ldr r0, _080F62C8 + ldr r0, =0x02039f20 adds r0, r4, r0 ldrb r0, [r0] strh r0, [r1, 0x8] @@ -502936,11 +485963,9 @@ _080F6298: ble _080F6298 b _080F63B4 .align 2, 0 -_080F62C0: .4byte 0x03005e00 -_080F62C4: .4byte sub_80F73DC + 1 -_080F62C8: .4byte 0x02039f20 + .pool _080F62CC: - ldr r0, _080F6328 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x5] @@ -502963,14 +485988,14 @@ _080F62DA: _080F62F2: movs r0, 0 strh r0, [r4, 0xA] - ldr r0, _080F632C + ldr r0, =sub_80F74BC + 1 movs r1, 0xA bl AddTask ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] movs r4, 0 - ldr r1, _080F6330 + ldr r1, =0x02039f20 ldrb r0, [r1] cmp r0, 0 beq _080F631C @@ -502989,9 +486014,7 @@ _080F631C: bl sub_80F77E0 b _080F63F4 .align 2, 0 -_080F6328: .4byte 0x0203a034 -_080F632C: .4byte sub_80F74BC + 1 -_080F6330: .4byte 0x02039f20 + .pool _080F6334: lsls r1, r5, 2 adds r0, r1, r5 @@ -503008,10 +486031,10 @@ _080F6334: movs r0, 0 strh r0, [r2, 0xA] movs r4, 0 - ldr r1, _080F63C4 + ldr r1, =0x02039f20 ldrb r0, [r1] - ldr r7, _080F63C8 - ldr r2, _080F63CC + ldr r7, =0x02021cc4 + ldr r2, =0x02039e0d mov r8, r2 cmp r0, 0 beq _080F636E @@ -503031,16 +486054,16 @@ _080F636E: bl gf_strcpy adds r0, r7, 0 bl sub_81DB5AC - ldr r0, _080F63D0 + ldr r0, =0x02021dc4 mov r1, r8 subs r1, 0xB adds r4, r1 adds r1, r4, 0 bl gf_strcpy - ldr r1, _080F63D4 + ldr r1, =0x085ed1fa mov r0, sp bl ExpandTextCodes - ldr r0, _080F63D8 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0] @@ -503048,13 +486071,13 @@ _080F636E: bl sub_80F6B78 lsls r0, 16 asrs r0, 16 - ldr r2, _080F63DC + ldr r2, =0x0000ffff movs r3, 0x88 lsls r3, 3 movs r1, 0x90 bl sub_80F6E9C _080F63B4: - ldr r0, _080F63E0 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -503064,14 +486087,7 @@ _080F63BC: strh r0, [r1, 0x8] b _080F63F4 .align 2, 0 -_080F63C4: .4byte 0x02039f20 -_080F63C8: .4byte 0x02021cc4 -_080F63CC: .4byte 0x02039e0d -_080F63D0: .4byte 0x02021dc4 -_080F63D4: .4byte 0x085ed1fa -_080F63D8: .4byte 0x0203a034 -_080F63DC: .4byte 0x0000ffff -_080F63E0: .4byte 0x03005e00 + .pool _080F63E4: lsls r0, r5, 2 adds r0, r5 @@ -503079,7 +486095,7 @@ _080F63E4: adds r0, r2 movs r1, 0 strh r1, [r0, 0x8] - ldr r1, _080F6400 + ldr r1, =sub_80F6404 + 1 str r1, [r0] _080F63F4: add sp, 0x64 @@ -503089,7 +486105,7 @@ _080F63F4: pop {r0} bx r0 .align 2, 0 -_080F6400: .4byte sub_80F6404 + 1 + .pool thumb_func_end sub_80F6204 thumb_func_start sub_80F6404 @@ -503101,7 +486117,7 @@ sub_80F6404: @ 80F6404 push {r5-r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080F6434 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -503114,13 +486130,12 @@ sub_80F6404: @ 80F6404 b _080F669C _080F6428: lsls r0, 2 - ldr r1, _080F6438 + ldr r1, =_080F643C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F6434: .4byte 0x03005e00 -_080F6438: .4byte _080F643C + .pool .align 2, 0 _080F643C: .4byte _080F6454 @@ -503130,24 +486145,24 @@ _080F643C: .4byte _080F6638 .4byte _080F667C _080F6454: - ldr r1, _080F64C0 + ldr r1, =0x02022e24 movs r0, 0xF0 strh r0, [r1] - ldr r1, _080F64C4 - ldr r3, _080F64C8 + ldr r1, =0x02022e26 + ldr r3, =0x00005050 adds r0, r3, 0 strh r0, [r1] movs r2, 0 - ldr r1, _080F64CC + ldr r1, =0x02039f20 ldrb r0, [r1] lsls r4, r7, 2 mov r10, r4 - ldr r3, _080F64D0 - ldr r4, _080F64D4 + ldr r3, =0x02039e00 + ldr r4, =0x02039f25 mov r9, r4 - ldr r4, _080F64D8 + ldr r4, =0x0830a18c mov r12, r4 - ldr r4, _080F64DC + ldr r4, =0x020244d4 mov r8, r4 cmp r0, 0 beq _080F648C @@ -503185,14 +486200,7 @@ _080F648C: bl help_system_enable_unless_flashback__sp199 b _080F64F2 .align 2, 0 -_080F64C0: .4byte 0x02022e24 -_080F64C4: .4byte 0x02022e26 -_080F64C8: .4byte 0x00005050 -_080F64CC: .4byte 0x02039f20 -_080F64D0: .4byte 0x02039e00 -_080F64D4: .4byte 0x02039f25 -_080F64D8: .4byte 0x0830a18c -_080F64DC: .4byte 0x020244d4 + .pool _080F64E0: lsls r0, r6, 3 add r0, r12 @@ -503212,7 +486220,7 @@ _080F64F2: adds r0, r6, 0 movs r1, 0x1 bl sub_806A068 - ldr r0, _080F656C + ldr r0, =0x0202499c ldrh r1, [r4, 0x4] strh r1, [r0, 0x2] movs r1, 0x88 @@ -503222,7 +486230,7 @@ _080F64F2: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r5, _080F6570 + ldr r5, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -503235,20 +486243,20 @@ _080F64F2: strb r1, [r3, 0x5] adds r5, 0x1C adds r2, r5 - ldr r1, _080F6574 + ldr r1, =sub_80F75A8 + 1 str r1, [r2] - ldr r1, _080F6578 + ldr r1, =0x0203a034 ldr r1, [r1] ldr r1, [r1] strb r0, [r1, 0x8] - ldr r0, _080F657C + ldr r0, =0x0858d878 bl gpu_tile_obj_decompress_and_load - ldr r0, _080F6580 + ldr r0, =0x0858d880 bl gpu_pal_obj_decompress_and_apply - ldr r0, _080F6584 + ldr r0, =sub_80F7670 + 1 movs r1, 0xA bl AddTask - ldr r0, _080F6588 + ldr r0, =0x03005e00 mov r4, r10 adds r1, r4, r7 lsls r1, 3 @@ -503258,14 +486266,7 @@ _080F64F2: strh r0, [r1, 0x8] b _080F669C .align 2, 0 -_080F656C: .4byte 0x0202499c -_080F6570: .4byte 0x02020630 -_080F6574: .4byte sub_80F75A8 + 1 -_080F6578: .4byte 0x0203a034 -_080F657C: .4byte 0x0858d878 -_080F6580: .4byte 0x0858d880 -_080F6584: .4byte sub_80F7670 + 1 -_080F6588: .4byte 0x03005e00 + .pool _080F658C: lsls r0, r7, 2 adds r0, r7 @@ -503293,7 +486294,7 @@ _080F65A4: strh r0, [r4, 0xC] _080F65BA: ldrb r2, [r4, 0xC] - ldr r3, _080F65D8 + ldr r3, =0x02022e26 movs r0, 0x50 subs r0, r2 lsls r0, 8 @@ -503308,9 +486309,9 @@ _080F65BA: strh r0, [r4, 0x8] b _080F669C .align 2, 0 -_080F65D8: .4byte 0x02022e26 + .pool _080F65DC: - ldr r0, _080F65EC + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x6] @@ -503318,7 +486319,7 @@ _080F65DC: bne _080F669C b _080F6664 .align 2, 0 -_080F65EC: .4byte 0x0203a034 + .pool _080F65F0: lsls r0, r7, 2 adds r0, r7 @@ -503333,8 +486334,8 @@ _080F65F0: bne _080F669C movs r0, 0 strh r0, [r3, 0xA] - ldr r2, _080F662C - ldr r0, _080F6630 + ldr r2, =0x02020630 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r1, [r0, 0x8] @@ -503343,24 +486344,22 @@ _080F65F0: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _080F6634 + ldr r1, =sub_80F7620 + 1 str r1, [r0] ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] b _080F669C .align 2, 0 -_080F662C: .4byte 0x02020630 -_080F6630: .4byte 0x0203a034 -_080F6634: .4byte sub_80F7620 + 1 + .pool _080F6638: - ldr r0, _080F6674 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0x2 bne _080F669C - ldr r3, _080F6678 + ldr r3, =0x02022e26 ldrh r0, [r3] lsrs r2, r0, 8 adds r0, r2, 0x2 @@ -503387,10 +486386,9 @@ _080F6664: strh r1, [r0, 0x8] b _080F669C .align 2, 0 -_080F6674: .4byte 0x0203a034 -_080F6678: .4byte 0x02022e26 + .pool _080F667C: - ldr r0, _080F66AC + ldr r0, =0x0203a034 ldr r0, [r0] ldr r2, [r0] ldrb r0, [r2, 0x6] @@ -503404,7 +486402,7 @@ _080F667C: lsls r0, 3 adds r0, r4 strh r1, [r0, 0x8] - ldr r1, _080F66B0 + ldr r1, =sub_80F66B4 + 1 str r1, [r0] _080F669C: pop {r3-r5} @@ -503415,8 +486413,7 @@ _080F669C: pop {r0} bx r0 .align 2, 0 -_080F66AC: .4byte 0x0203a034 -_080F66B0: .4byte sub_80F66B4 + 1 + .pool thumb_func_end sub_80F6404 thumb_func_start sub_80F66B4 @@ -503424,21 +486421,21 @@ sub_80F66B4: @ 80F66B4 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080F6708 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 ands r0, r1 cmp r0, 0 beq _080F6702 - ldr r0, _080F670C + ldr r0, =0x02039f2a ldrb r1, [r0] adds r0, r2, 0 ands r0, r1 lsls r6, r7, 2 cmp r0, 0 bne _080F66F2 - ldr r5, _080F6710 + ldr r5, =0x02039e00 movs r4, 0x3 _080F66DA: ldrh r0, [r5] @@ -503452,24 +486449,20 @@ _080F66DA: cmp r4, 0 bge _080F66DA _080F66F2: - ldr r1, _080F6714 + ldr r1, =0x03005e00 adds r0, r6, r7 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0x1C] - ldr r1, _080F6718 + ldr r1, =sub_80F671C + 1 str r1, [r0] _080F6702: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080F6708: .4byte 0x030022c0 -_080F670C: .4byte 0x02039f2a -_080F6710: .4byte 0x02039e00 -_080F6714: .4byte 0x03005e00 -_080F6718: .4byte sub_80F671C + 1 + .pool thumb_func_end sub_80F66B4 thumb_func_start sub_80F671C @@ -503477,13 +486470,13 @@ sub_80F671C: @ 80F671C push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F6750 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080F6760 - ldr r0, _080F6754 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -503492,32 +486485,28 @@ sub_80F671C: @ 80F671C ldrsh r0, [r4, r1] cmp r0, 0 bne _080F676E - ldr r0, _080F6758 + ldr r0, =0x085ed207 bl sub_80F707C bl sub_800AC34 - ldr r0, _080F675C + ldr r0, =sub_80F677C + 1 str r0, [r4] b _080F676E .align 2, 0 -_080F6750: .4byte 0x02039f2a -_080F6754: .4byte 0x03005e00 -_080F6758: .4byte 0x085ed207 -_080F675C: .4byte sub_80F677C + 1 + .pool _080F6760: - ldr r0, _080F6774 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _080F6778 + ldr r0, =task_repel + 1 str r0, [r1] _080F676E: pop {r4} pop {r0} bx r0 .align 2, 0 -_080F6774: .4byte 0x03005e00 -_080F6778: .4byte task_repel + 1 + .pool thumb_func_end sub_80F671C thumb_func_start sub_80F677C @@ -503525,11 +486514,11 @@ sub_80F677C: @ 80F677C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080F67B4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080F67AC - ldr r0, _080F67B8 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x2 ands r0, r1 @@ -503538,22 +486527,19 @@ sub_80F677C: @ 80F677C bl sub_800E084 _080F679A: bl sub_80F7144 - ldr r0, _080F67BC + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080F67C0 + ldr r0, =task_repel + 1 str r0, [r1] _080F67AC: pop {r4} pop {r0} bx r0 .align 2, 0 -_080F67B4: .4byte 0x03003124 -_080F67B8: .4byte 0x02039f2a -_080F67BC: .4byte 0x03005e00 -_080F67C0: .4byte task_repel + 1 + .pool thumb_func_end sub_80F677C thumb_func_start task_repel @@ -503562,14 +486548,14 @@ task_repel: @ 80F67C4 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080F680C + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 bne _080F67E6 - ldr r1, _080F6810 - ldr r0, _080F6814 + ldr r1, =0x02039f20 + ldr r0, =0x02039f25 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -503582,23 +486568,19 @@ _080F67E6: movs r2, 0 movs r3, 0x10 bl sub_80A27B0 - ldr r1, _080F6818 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080F681C + ldr r1, =sub_80F6820 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_080F680C: .4byte 0x02039f2a -_080F6810: .4byte 0x02039f20 -_080F6814: .4byte 0x02039f25 -_080F6818: .4byte 0x03005e00 -_080F681C: .4byte sub_80F6820 + 1 + .pool thumb_func_end task_repel thumb_func_start sub_80F6820 @@ -503607,13 +486589,13 @@ sub_80F6820: @ 80F6820 lsls r0, 24 lsrs r2, r0, 24 adds r5, r2, 0 - ldr r0, _080F6858 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080F68A8 - ldr r1, _080F685C + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -503622,22 +486604,19 @@ sub_80F6820: @ 80F6820 ldrsh r0, [r4, r1] cmp r0, 0 bne _080F6868 - ldr r0, _080F6860 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x3] bl remove_task - ldr r0, _080F6864 + ldr r0, =0x0000ffff b _080F686E .align 2, 0 -_080F6858: .4byte 0x02037fd4 -_080F685C: .4byte 0x03005e00 -_080F6860: .4byte 0x0203a034 -_080F6864: .4byte 0x0000ffff + .pool _080F6868: cmp r0, 0x1 bne _080F6884 - ldr r0, _080F6880 + ldr r0, =0xffff0000 _080F686E: movs r1, 0x10 movs r2, 0 @@ -503647,7 +486626,7 @@ _080F686E: strh r0, [r4, 0xA] b _080F68A8 .align 2, 0 -_080F6880: .4byte 0xffff0000 + .pool _080F6884: movs r0, 0x50 movs r1, 0 @@ -503658,7 +486637,7 @@ _080F6884: adds r0, r5, 0 bl remove_task bl Window_FreeMemory - ldr r0, _080F68B0 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 bl sub_80F7E64 _080F68A8: @@ -503666,17 +486645,17 @@ _080F68A8: pop {r0} bx r0 .align 2, 0 -_080F68B0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_80F6820 thumb_func_start sub_80F68B4 sub_80F68B4: @ 80F68B4 push {r4,r5,lr} - ldr r2, _080F68E8 + ldr r2, =0x02022e20 ldrh r3, [r2] adds r0, r3, 0x2 strh r0, [r2] - ldr r4, _080F68EC + ldr r4, =0x02022e22 ldrh r5, [r4] adds r1, r5, 0x1 strh r1, [r4] @@ -503700,8 +486679,7 @@ _080F68E2: pop {r0} bx r0 .align 2, 0 -_080F68E8: .4byte 0x02022e20 -_080F68EC: .4byte 0x02022e22 + .pool thumb_func_end sub_80F68B4 thumb_func_start sub_80F68F0 @@ -503709,7 +486687,7 @@ sub_80F68F0: @ 80F68F0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080F6920 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -503731,7 +486709,7 @@ sub_80F68F0: @ 80F68F0 adds r0, 0x1 b _080F6928 .align 2, 0 -_080F6920: .4byte 0x03005e00 + .pool _080F6924: ldrh r0, [r2, 0xA] subs r0, 0x1 @@ -503753,28 +486731,28 @@ _080F693E: _080F6942: strh r0, [r1, 0xC] _080F6944: - ldr r0, _080F6990 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 adds r4, r0 ldrb r2, [r4, 0xA] - ldr r3, _080F6994 + ldr r3, =0x00002ede movs r0, 0x6B movs r1, 0x1 bl pal_fade_1 ldrb r2, [r4, 0xA] - ldr r3, _080F6998 + ldr r3, =0x00007fff movs r0, 0x68 movs r1, 0x1 bl pal_fade_1 ldrb r2, [r4, 0xA] - ldr r3, _080F699C + ldr r3, =0x000077be movs r0, 0x6E movs r1, 0x1 bl pal_fade_1 _080F6972: - ldr r1, _080F6990 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -503783,19 +486761,15 @@ _080F6972: ldrsh r4, [r0, r3] cmp r4, 0 bne _080F69A4 - ldr r0, _080F69A0 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] strb r4, [r0, 0xA] b _080F69AE .align 2, 0 -_080F6990: .4byte 0x03005e00 -_080F6994: .4byte 0x00002ede -_080F6998: .4byte 0x00007fff -_080F699C: .4byte 0x000077be -_080F69A0: .4byte 0x0203a034 + .pool _080F69A4: - ldr r0, _080F69B4 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r1, [r0] movs r0, 0x1 @@ -503805,7 +486779,7 @@ _080F69AE: pop {r0} bx r0 .align 2, 0 -_080F69B4: .4byte 0x0203a034 + .pool thumb_func_end sub_80F68F0 thumb_func_start sub_80F69B8 @@ -503823,7 +486797,7 @@ sub_80F69B8: @ 80F69B8 lsrs r5, r2, 24 lsls r3, 24 lsrs r6, r3, 24 - ldr r0, _080F6A38 + ldr r0, =0x02039f25 movs r2, 0 ldrb r0, [r0] cmp r4, r0 @@ -503840,7 +486814,7 @@ _080F69DE: cmp r6, 0 beq _080F6A40 lsls r1, r4, 9 - ldr r0, _080F6A3C + ldr r0, =0x06004000 adds r1, r0 movs r2, 0xC0 lsls r2, 1 @@ -503873,12 +486847,11 @@ _080F69DE: bl bg_write_sequence_to_wram_tile_map_rect b _080F6A54 .align 2, 0 -_080F6A38: .4byte 0x02039f25 -_080F6A3C: .4byte 0x06004000 + .pool _080F6A40: mov r0, r8 lsls r1, r0, 9 - ldr r2, _080F6A60 + ldr r2, =0x06004000 adds r1, r2 movs r2, 0xC0 lsls r2, 1 @@ -503893,7 +486866,7 @@ _080F6A54: pop {r0} bx r0 .align 2, 0 -_080F6A60: .4byte 0x06004000 + .pool thumb_func_end sub_80F69B8 thumb_func_start sub_80F6A64 @@ -503905,7 +486878,7 @@ sub_80F6A64: @ 80F6A64 lsls r1, 24 lsrs r6, r1, 24 movs r5, 0 - ldr r4, _080F6A98 + ldr r4, =0x02039e00 _080F6A74: ldrh r0, [r4] lsls r1, r5, 24 @@ -503924,18 +486897,18 @@ _080F6A74: pop {r0} bx r0 .align 2, 0 -_080F6A98: .4byte 0x02039e00 + .pool thumb_func_end sub_80F6A64 thumb_func_start sub_80F6A9C sub_80F6A9C: @ 80F6A9C push {r4-r6,lr} movs r4, 0 - ldr r6, _080F6ADC + ldr r6, =0x0857c388 movs r5, 0xA0 lsls r5, 16 _080F6AA6: - ldr r1, _080F6AE0 + ldr r1, =0x02039e00 lsls r0, r4, 6 adds r0, r1 ldrh r0, [r0] @@ -503946,7 +486919,7 @@ _080F6AA6: adds r0, r6 ldrb r0, [r0] lsls r0, 5 - ldr r1, _080F6AE4 + ldr r1, =0x08dde1f8 adds r0, r1 lsrs r1, r5, 16 movs r2, 0x20 @@ -503961,15 +486934,13 @@ _080F6AA6: pop {r0} bx r0 .align 2, 0 -_080F6ADC: .4byte 0x0857c388 -_080F6AE0: .4byte 0x02039e00 -_080F6AE4: .4byte 0x08dde1f8 + .pool thumb_func_end sub_80F6A9C thumb_func_start sub_80F6AE8 sub_80F6AE8: @ 80F6AE8 push {r4,lr} - ldr r0, _080F6B60 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x2 ands r0, r1 @@ -503979,8 +486950,8 @@ sub_80F6AE8: @ 80F6AE8 movs r0, 0x8 movs r1, 0x8 bl sub_800DFB4 - ldr r4, _080F6B64 - ldr r0, _080F6B68 + ldr r4, =0x02020630 + ldr r0, =0x02022b10 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -503989,19 +486960,19 @@ sub_80F6AE8: @ 80F6AE8 adds r0, 0x43 movs r1, 0x1 strb r1, [r0] - ldr r0, _080F6B6C + ldr r0, =0x0858d8e0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram adds r1, r0, 0 lsls r1, 16 movs r0, 0x1 negs r0, r0 lsrs r1, 11 - ldr r2, _080F6B70 + ldr r2, =0x06010000 adds r1, r2 movs r2, 0x80 movs r3, 0x1 bl dma3_transfer_queue_add_fill - ldr r0, _080F6B74 + ldr r0, =0x0858d8c8 movs r1, 0x8 movs r2, 0x8 movs r3, 0 @@ -504024,12 +486995,7 @@ _080F6B58: pop {r0} bx r0 .align 2, 0 -_080F6B60: .4byte 0x02039f2a -_080F6B64: .4byte 0x02020630 -_080F6B68: .4byte 0x02022b10 -_080F6B6C: .4byte 0x0858d8e0 -_080F6B70: .4byte 0x06010000 -_080F6B74: .4byte 0x0858d8c8 + .pool thumb_func_end sub_80F6AE8 thumb_func_start sub_80F6B78 @@ -504084,7 +487050,7 @@ _080F6BD0: asrs r2, 1 lsls r2, 24 lsrs r2, 24 - ldr r0, _080F6DA8 + ldr r0, =0x0858d8e8 str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -504098,17 +487064,17 @@ _080F6BD0: movs r1, 0x7 bl Window_GetField mov r9, r0 - ldr r2, _080F6DAC + ldr r2, =0x0858d6d0 mov r8, r2 lsls r1, r7, 4 adds r1, r7 lsls r1, 2 - ldr r3, _080F6DB0 + ldr r3, =0x02020630 adds r1, r3 ldrh r0, [r1, 0x4] lsls r0, 22 lsrs r0, 17 - ldr r2, _080F6DB4 + ldr r2, =0x06010000 adds r0, r2 str r0, [sp, 0xC] str r6, [sp, 0x38] @@ -504165,13 +487131,13 @@ _080F6C7C: str r6, [sp, 0x1C] ldm r5!, {r1} ldr r0, [sp, 0x2C] - ldr r2, _080F6DB8 + ldr r2, =0x05000100 bl CpuSet subs r4, 0x1 cmp r4, 0 bge _080F6C7C ldr r5, [sp, 0xC] - ldr r6, _080F6DBC + ldr r6, =0x04000008 mov r0, r8 adds r1, r5, 0 adds r2, r6, 0 @@ -504263,7 +487229,7 @@ _080F6D3E: lsls r0, 5 ldr r1, [r1] adds r5, r1, r0 - ldr r4, _080F6DBC + ldr r4, =0x04000008 ldr r0, [sp, 0x3C] adds r1, r5, 0 adds r2, r4, 0 @@ -504303,12 +487269,7 @@ _080F6D3E: pop {r1} bx r1 .align 2, 0 -_080F6DA8: .4byte 0x0858d8e8 -_080F6DAC: .4byte 0x0858d6d0 -_080F6DB0: .4byte 0x02020630 -_080F6DB4: .4byte 0x06010000 -_080F6DB8: .4byte 0x05000100 -_080F6DBC: .4byte 0x04000008 + .pool thumb_func_end sub_80F6B78 thumb_func_start sub_80F6DC0 @@ -504316,13 +487277,13 @@ sub_80F6DC0: @ 80F6DC0 push {r4-r6,lr} sub sp, 0x20 mov r1, sp - ldr r0, _080F6E88 + ldr r0, =0x0858d7f8 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2-r4} stm r1!, {r2-r4} add r5, sp, 0x18 - ldr r6, _080F6E8C + ldr r6, =0x0858d810 movs r4, 0x7 _080F6DD6: adds r0, r6, 0 @@ -504331,7 +487292,7 @@ _080F6DD6: subs r4, 0x1 cmp r4, 0 bge _080F6DD6 - ldr r0, _080F6E90 + ldr r0, =0x0858d850 bl gpu_pal_obj_alloc_tag_and_apply movs r4, 0 mov r6, sp @@ -504350,7 +487311,7 @@ _080F6DEE: adds r4, 0x1 cmp r4, 0x7 ble _080F6DEE - ldr r2, _080F6E94 + ldr r2, =0x02020630 ldrb r1, [r5] lsls r0, r1, 4 adds r0, r1 @@ -504394,7 +487355,7 @@ _080F6DEE: adds r0, r2 ldrb r1, [r5, 0x7] strh r1, [r0, 0x32] - ldr r1, _080F6E98 + ldr r1, =0x0203a034 ldr r0, [r1] ldr r2, [r0] ldrb r0, [r5] @@ -504412,11 +487373,7 @@ _080F6DEE: pop {r0} bx r0 .align 2, 0 -_080F6E88: .4byte 0x0858d7f8 -_080F6E8C: .4byte 0x0858d810 -_080F6E90: .4byte 0x0858d850 -_080F6E94: .4byte 0x02020630 -_080F6E98: .4byte 0x0203a034 + .pool thumb_func_end sub_80F6DC0 thumb_func_start sub_80F6E9C @@ -504424,7 +487381,7 @@ sub_80F6E9C: @ 80F6E9C push {r4-r6,lr} mov r6, r8 push {r6} - ldr r4, _080F6EE8 + ldr r4, =0x0203a034 ldr r4, [r4] mov r8, r4 ldr r4, [r4] @@ -504432,7 +487389,7 @@ sub_80F6E9C: @ 80F6E9C lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r5, _080F6EEC + ldr r5, =0x02020630 adds r4, r5 movs r6, 0 movs r5, 0x88 @@ -504448,7 +487405,7 @@ sub_80F6E9C: @ 80F6E9C strh r2, [r4, 0x38] strh r3, [r4, 0x3A] strh r6, [r4, 0x3C] - ldr r0, _080F6EF0 + ldr r0, =sub_80F6F68 + 1 str r0, [r4, 0x1C] mov r0, r8 ldr r1, [r0] @@ -504460,22 +487417,20 @@ sub_80F6E9C: @ 80F6E9C pop {r0} bx r0 .align 2, 0 -_080F6EE8: .4byte 0x0203a034 -_080F6EEC: .4byte 0x02020630 -_080F6EF0: .4byte sub_80F6F68 + 1 + .pool thumb_func_end sub_80F6E9C thumb_func_start sub_80F6EF4 sub_80F6EF4: @ 80F6EF4 push {r4,r5,lr} - ldr r1, _080F6F34 + ldr r1, =0x0203a034 ldr r4, [r1] ldr r1, [r4] ldrb r2, [r1] lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, _080F6F38 + ldr r2, =0x02020630 adds r1, r2 ldrh r2, [r1, 0x24] ldrh r3, [r1, 0x20] @@ -504490,7 +487445,7 @@ sub_80F6EF4: @ 80F6EF4 strh r3, [r1, 0x24] strh r0, [r1, 0x3A] strh r3, [r1, 0x3C] - ldr r0, _080F6F3C + ldr r0, =sub_80F7014 + 1 str r0, [r1, 0x1C] ldr r1, [r4] movs r0, 0x3 @@ -504499,9 +487454,7 @@ sub_80F6EF4: @ 80F6EF4 pop {r0} bx r0 .align 2, 0 -_080F6F34: .4byte 0x0203a034 -_080F6F38: .4byte 0x02020630 -_080F6F3C: .4byte sub_80F7014 + 1 + .pool thumb_func_end sub_80F6EF4 thumb_func_start sub_80F6F40 @@ -504515,16 +487468,15 @@ sub_80F6F40: @ 80F6F40 strh r1, [r0, 0x22] strh r2, [r0, 0x26] strh r2, [r0, 0x24] - ldr r1, _080F6F60 + ldr r1, =nullsub_12 + 1 str r1, [r0, 0x1C] - ldr r0, _080F6F64 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] strb r3, [r0, 0x4] bx lr .align 2, 0 -_080F6F60: .4byte nullsub_12 + 1 -_080F6F64: .4byte 0x0203a034 + .pool thumb_func_end sub_80F6F40 thumb_func_start sub_80F6F68 @@ -504552,7 +487504,7 @@ sub_80F6F68: @ 80F6F68 strh r2, [r3, 0x20] _080F6F92: movs r4, 0 - ldr r6, _080F6FD4 + ldr r6, =0x02020630 movs r5, 0x40 adds r2, r3, 0 adds r2, 0x2E @@ -504579,28 +487531,27 @@ _080F6F9C: ldrsh r0, [r3, r2] cmp r1, r0 bne _080F6FCC - ldr r0, _080F6FD8 + ldr r0, =sub_80F6FDC + 1 str r0, [r3, 0x1C] _080F6FCC: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080F6FD4: .4byte 0x02020630 -_080F6FD8: .4byte sub_80F6FDC + 1 + .pool thumb_func_end sub_80F6F68 thumb_func_start sub_80F6FDC sub_80F6FDC: @ 80F6FDC push {lr} adds r2, r0, 0 - ldr r0, _080F700C + ldr r0, =0x0203a034 ldr r0, [r0] ldr r1, [r0] movs r0, 0x2 strb r0, [r1, 0x4] ldrh r3, [r2, 0x38] - ldr r1, _080F7010 + ldr r1, =0xffff0000 lsrs r0, r1, 16 cmp r3, r0 beq _080F7008 @@ -504617,8 +487568,7 @@ _080F7008: pop {r0} bx r0 .align 2, 0 -_080F700C: .4byte 0x0203a034 -_080F7010: .4byte 0xffff0000 + .pool thumb_func_end sub_80F6FDC thumb_func_start sub_80F7014 @@ -504637,7 +487587,7 @@ sub_80F7014: @ 80F7014 ands r2, r0 strh r2, [r3, 0x3C] movs r4, 0 - ldr r6, _080F7078 + ldr r6, =0x02020630 movs r5, 0x40 adds r2, r3, 0 adds r2, 0x2E @@ -504674,13 +487624,13 @@ _080F7070: pop {r0} bx r0 .align 2, 0 -_080F7078: .4byte 0x02020630 + .pool thumb_func_end sub_80F7014 thumb_func_start sub_80F707C sub_80F707C: @ 80F707C push {r4-r7,lr} - ldr r4, _080F7130 + ldr r4, =0x0203a034 ldr r1, [r4] ldr r1, [r1] ldrb r1, [r1, 0x1] @@ -504693,7 +487643,7 @@ sub_80F707C: @ 80F707C lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r3, _080F7134 + ldr r3, =0x02020630 adds r4, r1, r3 adds r0, 0x20 strh r0, [r4, 0x20] @@ -504750,10 +487700,10 @@ _080F70BE: adds r5, 0x1 cmp r5, 0x2 ble _080F70BE - ldr r1, _080F7138 + ldr r1, =0x02022e24 movs r0, 0xF0 strh r0, [r1] - ldr r2, _080F713C + ldr r2, =0x02022e26 ldrh r1, [r4, 0x22] adds r0, r1, 0 subs r0, 0x10 @@ -504761,31 +487711,27 @@ _080F70BE: adds r1, 0x10 orrs r0, r1 strh r0, [r2] - ldr r1, _080F7140 + ldr r1, =0x00003f3e movs r0, 0x48 bl lcd_io_set pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080F7130: .4byte 0x0203a034 -_080F7134: .4byte 0x02020630 -_080F7138: .4byte 0x02022e24 -_080F713C: .4byte 0x02022e26 -_080F7140: .4byte 0x00003f3e + .pool thumb_func_end sub_80F707C thumb_func_start sub_80F7144 sub_80F7144: @ 80F7144 push {r4-r7,lr} - ldr r0, _080F71B4 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x1] lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r3, _080F71B8 + ldr r3, =0x02020630 adds r2, r3 movs r0, 0x3E adds r0, r2 @@ -504795,8 +487741,8 @@ sub_80F7144: @ 80F7144 orrs r0, r1 mov r1, r12 strb r0, [r1] - ldr r7, _080F71BC - ldr r6, _080F71C0 + ldr r7, =0x02022e24 + ldr r6, =0x02022e26 adds r5, r3, 0 movs r4, 0x4 adds r2, 0x2E @@ -504825,18 +487771,14 @@ _080F7174: ldrh r1, [r6] movs r0, 0x44 bl lcd_io_set - ldr r1, _080F71C4 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_080F71B4: .4byte 0x0203a034 -_080F71B8: .4byte 0x02020630 -_080F71BC: .4byte 0x02022e24 -_080F71C0: .4byte 0x02022e26 -_080F71C4: .4byte 0x00003f3f + .pool thumb_func_end sub_80F7144 thumb_func_start sub_80F71C8 @@ -504845,13 +487787,13 @@ sub_80F71C8: @ 80F71C8 sub sp, 0xC movs r5, 0x5 movs r4, 0x1 - ldr r0, _080F71F0 + ldr r0, =0x02039f2a ldrb r1, [r0] adds r0, r4, 0 ands r0, r1 cmp r0, 0 beq _080F71F8 - ldr r1, _080F71F4 + ldr r1, =0x08dc6498 str r5, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -504861,38 +487803,36 @@ sub_80F71C8: @ 80F71C8 movs r5, 0xA b _080F7240 .align 2, 0 -_080F71F0: .4byte 0x02039f2a -_080F71F4: .4byte 0x08dc6498 + .pool _080F71F8: - ldr r0, _080F7204 + ldr r0, =0x02039f2e ldrh r2, [r0] cmp r2, 0 bne _080F720C - ldr r1, _080F7208 + ldr r1, =0x08dc63f8 b _080F722E .align 2, 0 -_080F7204: .4byte 0x02039f2e -_080F7208: .4byte 0x08dc63f8 + .pool _080F720C: cmp r2, 0x1 bne _080F7218 - ldr r1, _080F7214 + ldr r1, =0x08dc6420 b _080F722E .align 2, 0 -_080F7214: .4byte 0x08dc6420 + .pool _080F7218: cmp r2, 0x2 bne _080F722C - ldr r1, _080F7228 + ldr r1, =0x08dc6448 movs r0, 0xA str r0, [sp] str r2, [sp, 0x4] movs r0, 0x2 b _080F7236 .align 2, 0 -_080F7228: .4byte 0x08dc6448 + .pool _080F722C: - ldr r1, _080F7250 + ldr r1, =0x08dc6470 _080F722E: movs r0, 0xA str r0, [sp] @@ -504904,30 +487844,28 @@ _080F7236: bl gpu_copy_to_iwram_tile_map_rect movs r5, 0xF _080F7240: - ldr r0, _080F7254 + ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0 bne _080F725C movs r6, 0 - ldr r1, _080F7258 + ldr r1, =0x08dc64ac b _080F7298 .align 2, 0 -_080F7250: .4byte 0x08dc6470 -_080F7254: .4byte 0x02039f2c -_080F7258: .4byte 0x08dc64ac + .pool _080F725C: cmp r0, 0x1 bne _080F726C movs r6, 0x1 - ldr r1, _080F7268 + ldr r1, =0x08dc64c0 b _080F7298 .align 2, 0 -_080F7268: .4byte 0x08dc64c0 + .pool _080F726C: cmp r0, 0x2 bne _080F7290 movs r6, 0x2 - ldr r1, _080F728C + ldr r1, =0x08dc64d4 lsls r2, r5, 24 lsrs r2, 24 lsls r4, 24 @@ -504939,12 +487877,12 @@ _080F726C: bl gpu_copy_to_iwram_tile_map_rect b _080F72CC .align 2, 0 -_080F728C: .4byte 0x08dc64d4 + .pool _080F7290: cmp r0, 0x3 bne _080F72B4 movs r6, 0x3 - ldr r1, _080F72B0 + ldr r1, =0x08dc64e8 _080F7298: lsls r2, r5, 24 lsrs r2, 24 @@ -504957,10 +487895,10 @@ _080F7298: bl gpu_copy_to_iwram_tile_map_rect b _080F72CC .align 2, 0 -_080F72B0: .4byte 0x08dc64e8 + .pool _080F72B4: movs r6, 0x4 - ldr r1, _080F7304 + ldr r1, =0x08dc64fc lsls r2, r5, 24 lsrs r2, 24 lsls r4, 24 @@ -504972,7 +487910,7 @@ _080F72B4: bl gpu_copy_to_iwram_tile_map_rect _080F72CC: adds r5, 0x5 - ldr r1, _080F7308 + ldr r1, =0x08dc6510 lsls r2, r5, 24 lsrs r2, 24 lsrs r3, r4, 24 @@ -504981,7 +487919,7 @@ _080F72CC: movs r0, 0x2 str r0, [sp, 0x4] bl gpu_copy_to_iwram_tile_map_rect - ldr r0, _080F730C + ldr r0, =0x0203a034 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x20 @@ -504998,9 +487936,7 @@ _080F72CC: pop {r0} bx r0 .align 2, 0 -_080F7304: .4byte 0x08dc64fc -_080F7308: .4byte 0x08dc6510 -_080F730C: .4byte 0x0203a034 + .pool thumb_func_end sub_80F71C8 thumb_func_start sub_80F7310 @@ -505009,7 +487945,7 @@ sub_80F7310: @ 80F7310 lsls r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r1, _080F735C + ldr r1, =0x02039f00 lsrs r0, 23 adds r0, r1 movs r1, 0 @@ -505019,7 +487955,7 @@ sub_80F7310: @ 80F7310 movs r1, 0x3F bl __udivsi3 adds r1, r0, 0 - ldr r0, _080F7360 + ldr r0, =0x0000ffff ands r0, r1 cmp r0, 0 beq _080F733C @@ -505046,8 +487982,7 @@ _080F7352: pop {r1} bx r1 .align 2, 0 -_080F735C: .4byte 0x02039f00 -_080F7360: .4byte 0x0000ffff + .pool thumb_func_end sub_80F7310 thumb_func_start sub_80F7364 @@ -505057,7 +487992,7 @@ sub_80F7364: @ 80F7364 lsrs r5, r0, 24 lsls r1, 24 lsrs r6, r1, 24 - ldr r1, _080F73C4 + ldr r1, =0x02039f18 lsls r0, r5, 1 adds r0, r1 movs r2, 0 @@ -505072,7 +488007,7 @@ _080F7380: movs r1, 0x50 bl __udivsi3 adds r2, r0, 0 - ldr r0, _080F73C8 + ldr r0, =0x0000ffff ands r0, r2 cmp r0, 0 beq _080F739A @@ -505103,8 +488038,7 @@ _080F73B0: lsls r0, 24 b _080F73CE .align 2, 0 -_080F73C4: .4byte 0x02039f18 -_080F73C8: .4byte 0x0000ffff + .pool _080F73CC: lsls r0, r2, 24 _080F73CE: @@ -505126,7 +488060,7 @@ sub_80F73DC: @ 80F73DC lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _080F7418 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -505148,7 +488082,7 @@ sub_80F73DC: @ 80F73DC strh r0, [r7, 0x1C] b _080F74A4 .align 2, 0 -_080F7418: .4byte 0x03005e00 + .pool _080F741C: cmp r6, 0x1 bne _080F74A4 @@ -505164,7 +488098,7 @@ _080F741C: movs r2, 0x8 ldrsh r4, [r7, r2] lsls r4, 17 - ldr r0, _080F74B4 + ldr r0, =0x50430000 adds r4, r0 lsrs r4, 16 movs r1, 0xA @@ -505204,7 +488138,7 @@ _080F741C: adds r1, r4, 0 movs r2, 0x1 bl bg_write_sequence_to_wram_tile_map_rect - ldr r0, _080F74B8 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r1, [r0] ldrb r0, [r1, 0x5] @@ -505223,8 +488157,7 @@ _080F74A4: pop {r0} bx r0 .align 2, 0 -_080F74B4: .4byte 0x50430000 -_080F74B8: .4byte 0x0203a034 + .pool thumb_func_end sub_80F73DC thumb_func_start sub_80F74BC @@ -505234,9 +488167,9 @@ sub_80F74BC: @ 80F74BC lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r1, _080F752C + ldr r1, =0x02039f20 ldrb r0, [r1] - ldr r6, _080F7530 + ldr r6, =0x0203a034 cmp r0, 0 beq _080F74DE _080F74D0: @@ -505269,7 +488202,7 @@ _080F74DE: movs r0, 0x2 movs r2, 0 bl bg_copy_tilemap_rect_simple - ldr r1, _080F7534 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -505277,7 +488210,7 @@ _080F74DE: strh r4, [r0, 0x1C] movs r1, 0x1 strh r1, [r0, 0x20] - ldr r1, _080F7538 + ldr r1, =sub_80F753C + 1 str r1, [r0] ldr r0, [r6] ldr r0, [r0] @@ -505287,10 +488220,7 @@ _080F74DE: pop {r0} bx r0 .align 2, 0 -_080F752C: .4byte 0x02039f20 -_080F7530: .4byte 0x0203a034 -_080F7534: .4byte 0x03005e00 -_080F7538: .4byte sub_80F753C + 1 + .pool thumb_func_end sub_80F74BC thumb_func_start sub_80F753C @@ -505298,7 +488228,7 @@ sub_80F753C: @ 80F753C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080F7588 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -505315,7 +488245,7 @@ sub_80F753C: @ 80F753C ldrh r2, [r4, 0x20] lsls r2, 24 lsrs r2, 24 - ldr r3, _080F758C + ldr r3, =0x00006f8d movs r0, 0x91 movs r1, 0x1 bl pal_fade_1 @@ -505333,8 +488263,7 @@ sub_80F753C: @ 80F753C strh r5, [r4, 0x22] b _080F75A0 .align 2, 0 -_080F7588: .4byte 0x03005e00 -_080F758C: .4byte 0x00006f8d + .pool _080F7590: ldrh r0, [r4, 0x20] subs r0, 0x1 @@ -505396,11 +488325,11 @@ _080F75F6: ldrsh r0, [r4, r2] cmp r0, 0x78 bne _080F7610 - ldr r0, _080F7618 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x30] - ldr r0, _080F761C + ldr r0, =0x0203a034 ldr r0, [r0] ldr r1, [r0] movs r0, 0x1 @@ -505410,8 +488339,7 @@ _080F7610: pop {r0} bx r0 .align 2, 0 -_080F7618: .4byte nullsub_12 + 1 -_080F761C: .4byte 0x0203a034 + .pool thumb_func_end sub_80F75A8 thumb_func_start sub_80F7620 @@ -505437,7 +488365,7 @@ sub_80F7620: @ 80F7620 negs r1, r1 cmp r0, r1 bge _080F7664 - ldr r0, _080F7668 + ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] adds r2, r3, 0 adds r2, 0x3E @@ -505445,7 +488373,7 @@ sub_80F7620: @ 80F7620 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _080F766C + ldr r0, =0x0203a034 ldr r0, [r0] ldr r1, [r0] movs r0, 0x2 @@ -505454,8 +488382,7 @@ _080F7664: pop {r0} bx r0 .align 2, 0 -_080F7668: .4byte nullsub_12 + 1 -_080F766C: .4byte 0x0203a034 + .pool thumb_func_end sub_80F7620 thumb_func_start sub_80F7670 @@ -505465,7 +488392,7 @@ sub_80F7670: @ 80F7670 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080F7750 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -505479,14 +488406,14 @@ sub_80F7670: @ 80F7670 bne _080F7732 movs r0, 0 strh r0, [r1, 0x8] - ldr r0, _080F7754 + ldr r0, =0x0203a034 mov r8, r0 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x7] cmp r0, 0x27 bhi _080F7732 - ldr r4, _080F7758 + ldr r4, =0x0858d860 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -505504,7 +488431,7 @@ sub_80F7670: @ 80F7670 lsls r4, 24 lsrs r4, 24 bl GenerateRandomNumber - ldr r1, _080F775C + ldr r1, =0x02020630 lsls r5, r4, 4 adds r5, r4 lsls r5, 2 @@ -505535,10 +488462,10 @@ sub_80F7670: @ 80F7670 movs r1, 0x11 bl __umodsi3 adds r4, r0 - ldr r1, _080F7760 + ldr r1, =0x000003ff adds r0, r1, 0 ands r4, r0 - ldr r0, _080F7764 + ldr r0, =0xfffffc00 ands r0, r6 orrs r0, r4 strh r0, [r5, 0x4] @@ -505549,7 +488476,7 @@ sub_80F7670: @ 80F7670 adds r0, 0x1 strb r0, [r1, 0x7] _080F7732: - ldr r0, _080F7754 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] ldrb r0, [r0, 0x9] @@ -505564,12 +488491,7 @@ _080F7744: pop {r0} bx r0 .align 2, 0 -_080F7750: .4byte 0x03005e00 -_080F7754: .4byte 0x0203a034 -_080F7758: .4byte 0x0858d860 -_080F775C: .4byte 0x02020630 -_080F7760: .4byte 0x000003ff -_080F7764: .4byte 0xfffffc00 + .pool thumb_func_end sub_80F7670 thumb_func_start sub_80F7768 @@ -505600,7 +488522,7 @@ sub_80F7768: @ 80F7768 ldrh r0, [r4, 0x22] adds r0, 0x1 strh r0, [r4, 0x22] - ldr r5, _080F77DC + ldr r5, =0x0203a034 ldr r0, [r5] ldr r0, [r0] ldrb r0, [r0, 0x9] @@ -505634,7 +488556,7 @@ _080F77D6: pop {r0} bx r0 .align 2, 0 -_080F77DC: .4byte 0x0203a034 + .pool thumb_func_end sub_80F7768 thumb_func_start sub_80F77E0 @@ -505646,19 +488568,19 @@ sub_80F77E0: @ 80F77E0 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _080F7818 + ldr r0, =sub_80F7824 + 1 movs r1, 0x8 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080F781C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 strh r4, [r1, 0x8] strh r5, [r1, 0xA] - ldr r0, _080F7820 + ldr r0, =0x02039e00 lsls r4, 6 adds r4, r0 ldrh r0, [r4] @@ -505667,9 +488589,7 @@ sub_80F77E0: @ 80F77E0 pop {r0} bx r0 .align 2, 0 -_080F7818: .4byte sub_80F7824 + 1 -_080F781C: .4byte 0x03005e00 -_080F7820: .4byte 0x02039e00 + .pool thumb_func_end sub_80F77E0 thumb_func_start sub_80F7824 @@ -505678,7 +488598,7 @@ sub_80F7824: @ 80F7824 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r2, _080F7878 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -505697,7 +488617,7 @@ sub_80F7824: @ 80F7824 strh r0, [r4, 0x1C] ldrh r0, [r4, 0xC] ldrb r2, [r4, 0x1E] - ldr r1, _080F787C + ldr r1, =0x02039e00 lsls r3, r5, 6 adds r1, 0x38 adds r3, r1 @@ -505716,8 +488636,7 @@ _080F786E: pop {r0} bx r0 .align 2, 0 -_080F7878: .4byte 0x03005e00 -_080F787C: .4byte 0x02039e00 + .pool thumb_func_end sub_80F7824 thumb_func_start sub_80F7880 @@ -505728,7 +488647,7 @@ sub_80F7880: @ 80F7880 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r0, _080F7A44 + ldr r0, =0x02039f08 ldrh r2, [r0] adds r4, r0, 0 adds r3, r4, 0x2 @@ -505781,7 +488700,7 @@ _080F78E4: mov r8, r5 mov r10, r5 _080F78EA: - ldr r0, _080F7A48 + ldr r0, =0x02039f00 mov r1, r8 lsls r7, r1, 1 adds r0, r7, r0 @@ -505807,7 +488726,7 @@ _080F790C: ble _080F791E adds r4, 0xA _080F791E: - ldr r0, _080F7A4C + ldr r0, =0x0203a034 mov r9, r0 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -505817,7 +488736,7 @@ _080F791E: movs r1, 0xA bl __divsi3 str r0, [r6] - ldr r0, _080F7A50 + ldr r0, =0x02039f18 adds r7, r0 movs r2, 0 ldrsh r1, [r7, r2] @@ -505921,7 +488840,7 @@ _080F79CC: negs r0, r0 _080F7A02: strb r0, [r1, 0x12] - ldr r0, _080F7A54 + ldr r0, =0x02039f20 add r0, r8 ldrb r0, [r0] cmp r0, 0 @@ -505955,11 +488874,7 @@ _080F7A2C: str r0, [r1, 0xC] b _080F7A60 .align 2, 0 -_080F7A44: .4byte 0x02039f08 -_080F7A48: .4byte 0x02039f00 -_080F7A4C: .4byte 0x0203a034 -_080F7A50: .4byte 0x02039f18 -_080F7A54: .4byte 0x02039f20 + .pool _080F7A58: cmp r3, 0 ble _080F7A60 @@ -506004,7 +488919,7 @@ sub_80F7A80: @ 80F7A80 cmp r0, 0 bne _080F7B5C mov r9, r3 - ldr r4, _080F7B44 + ldr r4, =0x0203a034 mov r10, r4 movs r7, 0xA0 lsls r7, 19 @@ -506027,9 +488942,9 @@ _080F7AAC: movs r0, 0x1 str r0, [sp] str r0, [sp, 0x4] - ldr r1, _080F7B48 + ldr r1, =0x000060b3 bl bg_fill_tilemap_rect - ldr r0, _080F7B4C + ldr r0, =sub_80F7CA8 + 1 movs r1, 0xA bl AddTask lsls r0, 24 @@ -506046,16 +488961,16 @@ _080F7AAC: adds r1, 0x1 adds r3, r0, 0 muls r3, r1 - ldr r0, _080F7B50 + ldr r0, =0x0000ffff ands r0, r3 - ldr r1, _080F7B54 + ldr r1, =0x00007fff cmp r0, r1 bls _080F7B0A movs r1, 0x80 lsls r1, 9 adds r3, r1 _080F7B0A: - ldr r1, _080F7B58 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -506085,12 +489000,7 @@ _080F7B2E: ble _080F7AAC b _080F7C7E .align 2, 0 -_080F7B44: .4byte 0x0203a034 -_080F7B48: .4byte 0x000060b3 -_080F7B4C: .4byte sub_80F7CA8 + 1 -_080F7B50: .4byte 0x0000ffff -_080F7B54: .4byte 0x00007fff -_080F7B58: .4byte 0x03005e00 + .pool _080F7B5C: movs r1, 0 mov r9, r1 @@ -506099,13 +489009,13 @@ _080F7B5C: lsls r3, 19 str r3, [sp, 0x10] _080F7B68: - ldr r4, _080F7C04 + ldr r4, =0x0203a034 ldr r0, [r4] ldr r0, [r0, 0x4] add r0, r10 ldrb r2, [r0, 0x12] ldrb r0, [r0, 0x10] - ldr r1, _080F7C08 + ldr r1, =0x000060a3 cmp r0, 0 beq _080F7B7C adds r1, 0x2 @@ -506129,12 +489039,12 @@ _080F7B7C: str r7, [sp, 0x4] movs r0, 0x1 bl bg_fill_tilemap_rect - ldr r0, _080F7C0C + ldr r0, =sub_80F7CA8 + 1 movs r1, 0xA bl AddTask lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080F7C04 + ldr r0, =0x0203a034 ldr r6, [r0] ldr r1, [r6, 0x4] add r1, r10 @@ -506146,16 +489056,16 @@ _080F7B7C: adds r1, 0x1 adds r3, r0, 0 muls r3, r1 - ldr r0, _080F7C10 + ldr r0, =0x0000ffff ands r0, r3 - ldr r1, _080F7C14 + ldr r1, =0x00007fff cmp r0, r1 bls _080F7BDA movs r1, 0x80 lsls r1, 9 adds r3, r1 _080F7BDA: - ldr r1, _080F7C18 + ldr r1, =0x03005e00 lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 @@ -506176,12 +489086,7 @@ _080F7BDA: str r0, [sp, 0xC] b _080F7C26 .align 2, 0 -_080F7C04: .4byte 0x0203a034 -_080F7C08: .4byte 0x000060a3 -_080F7C0C: .4byte sub_80F7CA8 + 1 -_080F7C10: .4byte 0x0000ffff -_080F7C14: .4byte 0x00007fff -_080F7C18: .4byte 0x03005e00 + .pool _080F7C1C: ldr r0, [sp, 0x8] adds r0, 0x1 @@ -506189,13 +489094,13 @@ _080F7C1C: lsrs r0, 24 str r0, [sp, 0x8] _080F7C26: - ldr r1, _080F7C48 + ldr r1, =0x0203a034 ldr r0, [r1] ldr r0, [r0, 0x4] mov r4, r10 adds r1, r4, r0 ldrb r0, [r1, 0x10] - ldr r4, _080F7C48 + ldr r4, =0x0203a034 cmp r0, 0 beq _080F7C4C adds r0, r2, r5 @@ -506206,7 +489111,7 @@ _080F7C26: subs r1, r2 b _080F7C58 .align 2, 0 -_080F7C48: .4byte 0x0203a034 + .pool _080F7C4C: adds r0, r2, r5 lsls r0, 3 @@ -506270,7 +489175,7 @@ sub_80F7CA8: @ 80F7CA8 mov r8, r0 movs r4, 0 mov r9, r4 - ldr r1, _080F7CF0 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -506283,7 +489188,7 @@ sub_80F7CA8: @ 80F7CA8 ldrsh r0, [r0, r2] cmp r0, 0 beq _080F7CF8 - ldr r2, _080F7CF4 + ldr r2, =0x0203a034 ldr r0, [r2] ldr r0, [r0] lsls r1, r6, 1 @@ -506296,10 +489201,9 @@ sub_80F7CA8: @ 80F7CA8 bgt _080F7D10 b _080F7D0E .align 2, 0 -_080F7CF0: .4byte 0x03005e00 -_080F7CF4: .4byte 0x0203a034 + .pool _080F7CF8: - ldr r2, _080F7D38 + ldr r2, =0x0203a034 ldr r0, [r2] ldr r0, [r0] lsls r1, r6, 1 @@ -506335,7 +489239,7 @@ _080F7D2A: strh r7, [r2] b _080F7D4A .align 2, 0 -_080F7D38: .4byte 0x0203a034 + .pool _080F7D3C: mov r1, r12 cmp r1, 0 @@ -506354,7 +489258,7 @@ _080F7D4A: bne _080F7DCA movs r2, 0 _080F7D56: - ldr r0, _080F7D74 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r0, [r0] adds r0, 0xC @@ -506369,7 +489273,7 @@ _080F7D56: movs r0, 0x8 b _080F7D94 .align 2, 0 -_080F7D74: .4byte 0x0203a034 + .pool _080F7D78: lsls r0, r2, 3 cmp r3, r0 @@ -506390,12 +489294,12 @@ _080F7D92: _080F7D94: cmp r0, 0x3 bhi _080F7DA0 - ldr r3, _080F7D9C + ldr r3, =0x0000504c b _080F7DA2 .align 2, 0 -_080F7D9C: .4byte 0x0000504c + .pool _080F7DA0: - ldr r3, _080F7DEC + ldr r3, =0x00005057 _080F7DA2: adds r1, r0, r3 adds r2, 0x7 @@ -506418,7 +489322,7 @@ _080F7DC4: cmp r0, 0 beq _080F7DDC _080F7DCA: - ldr r0, _080F7DF0 + ldr r0, =0x0203a034 ldr r0, [r0] ldr r1, [r0] ldrb r0, [r1, 0x14] @@ -506435,14 +489339,13 @@ _080F7DDC: pop {r0} bx r0 .align 2, 0 -_080F7DEC: .4byte 0x00005057 -_080F7DF0: .4byte 0x0203a034 + .pool thumb_func_end sub_80F7CA8 thumb_func_start sub_80F7DF4 sub_80F7DF4: @ 80F7DF4 push {r4,r5,lr} - ldr r4, _080F7E60 + ldr r4, =0x0203a034 movs r0, 0x20 bl malloc_and_clear str r0, [r4] @@ -506486,13 +489389,13 @@ sub_80F7DF4: @ 80F7DF4 pop {r0} bx r0 .align 2, 0 -_080F7E60: .4byte 0x0203a034 + .pool thumb_func_end sub_80F7DF4 thumb_func_start sub_80F7E64 sub_80F7E64: @ 80F7E64 push {r4,r5,lr} - ldr r5, _080F7ECC + ldr r5, =0x0203a034 ldr r0, [r5] ldr r0, [r0] bl free @@ -506534,7 +489437,7 @@ sub_80F7E64: @ 80F7E64 pop {r0} bx r0 .align 2, 0 -_080F7ECC: .4byte 0x0203a034 + .pool thumb_func_end sub_80F7E64 thumb_func_start sub_80F7ED0 @@ -506589,11 +489492,11 @@ sub_80F7ED0: @ 80F7ED0 thumb_func_start sub_80F7F30 sub_80F7F30: @ 80F7F30 push {r4,r5,lr} - ldr r0, _080F7F68 + ldr r0, =0x02039f24 ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080F7F6C + ldr r1, =0x020244ec adds r0, r1 bl sub_80DAE0C lsls r0, 24 @@ -506601,51 +489504,44 @@ sub_80F7F30: @ 80F7F30 adds r5, r0, 0 cmp r5, 0 beq _080F7F5E - ldr r4, _080F7F70 + ldr r4, =0x02039f2c ldrb r0, [r4] - ldr r1, _080F7F74 + ldr r1, =0x02039f2e ldrb r1, [r1] bl sub_80DAB8C ldrb r0, [r4] bl sub_80DB09C _080F7F5E: - ldr r0, _080F7F78 + ldr r0, =0x020375f0 strh r5, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080F7F68: .4byte 0x02039f24 -_080F7F6C: .4byte 0x020244ec -_080F7F70: .4byte 0x02039f2c -_080F7F74: .4byte 0x02039f2e -_080F7F78: .4byte 0x020375f0 + .pool thumb_func_end sub_80F7F30 thumb_func_start sub_80F7F7C sub_80F7F7C: @ 80F7F7C push {r4,lr} movs r4, 0 - ldr r0, _080F7FA0 + ldr r0, =0x02039f24 ldrb r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _080F7FA4 + ldr r0, =0x020244ec adds r2, r1, r0 - ldr r0, _080F7FA8 + ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0x4 bhi _080F7FEE lsls r0, 2 - ldr r1, _080F7FAC + ldr r1, =_080F7FB0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F7FA0: .4byte 0x02039f24 -_080F7FA4: .4byte 0x020244ec -_080F7FA8: .4byte 0x02039f2c -_080F7FAC: .4byte _080F7FB0 + .pool .align 2, 0 _080F7FB0: .4byte _080F7FC4 @@ -506674,7 +489570,7 @@ _080F7FDC: movs r1, 0x36 _080F7FE0: bl pokemon_getattr - ldr r1, _080F7FF8 + ldr r1, =0x02039f2e ldrh r1, [r1] cmp r0, r1 bls _080F7FEE @@ -506685,15 +489581,15 @@ _080F7FEE: pop {r1} bx r1 .align 2, 0 -_080F7FF8: .4byte 0x02039f2e + .pool thumb_func_end sub_80F7F7C thumb_func_start sub_80F7FFC sub_80F7FFC: @ 80F7FFC push {r4-r7,lr} sub sp, 0x4 - ldr r1, _080F8024 - ldr r0, _080F8028 + ldr r1, =0x02039f20 + ldr r0, =0x02039f25 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -506701,22 +489597,19 @@ sub_80F7FFC: @ 80F7FFC beq _080F8010 b _080F8250 _080F8010: - ldr r0, _080F802C + ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0x4 bls _080F801A b _080F8250 _080F801A: lsls r0, 2 - ldr r1, _080F8030 + ldr r1, =_080F8034 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F8024: .4byte 0x02039f20 -_080F8028: .4byte 0x02039f25 -_080F802C: .4byte 0x02039f2c -_080F8030: .4byte _080F8034 + .pool .align 2, 0 _080F8034: .4byte _080F8048 @@ -506725,11 +489618,11 @@ _080F8034: .4byte _080F8190 .4byte _080F81F8 _080F8048: - ldr r6, _080F80AC + ldr r6, =0x02039f24 ldrb r0, [r6] movs r5, 0x64 muls r0, r5 - ldr r4, _080F80B0 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x32 bl pokemon_getattr @@ -506737,7 +489630,7 @@ _080F8048: lsrs r1, r0, 24 mov r0, sp strb r1, [r0] - ldr r0, _080F80B4 + ldr r0, =0x02039f2e ldrh r0, [r0] cmp r1, r0 bls _080F806C @@ -506774,23 +489667,21 @@ _080F809C: bl sub_80EE4DC b _080F8250 .align 2, 0 -_080F80AC: .4byte 0x02039f24 -_080F80B0: .4byte 0x020244ec -_080F80B4: .4byte 0x02039f2e + .pool _080F80B8: mov r4, sp - ldr r7, _080F8118 + ldr r7, =0x02039f24 ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _080F811C + ldr r5, =0x020244ec adds r0, r5 movs r1, 0x33 bl pokemon_getattr strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080F8120 + ldr r0, =0x02039f2e ldrh r0, [r0] cmp r2, r0 bls _080F80DC @@ -506826,23 +489717,21 @@ _080F810A: bl sub_80EE4DC b _080F8250 .align 2, 0 -_080F8118: .4byte 0x02039f24 -_080F811C: .4byte 0x020244ec -_080F8120: .4byte 0x02039f2e + .pool _080F8124: mov r4, sp - ldr r7, _080F8184 + ldr r7, =0x02039f24 ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _080F8188 + ldr r5, =0x020244ec adds r0, r5 movs r1, 0x34 bl pokemon_getattr strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080F818C + ldr r0, =0x02039f2e ldrh r0, [r0] cmp r2, r0 bls _080F8148 @@ -506876,23 +489765,21 @@ _080F814E: bl sub_80EE4DC b _080F8250 .align 2, 0 -_080F8184: .4byte 0x02039f24 -_080F8188: .4byte 0x020244ec -_080F818C: .4byte 0x02039f2e + .pool _080F8190: mov r4, sp - ldr r7, _080F81EC + ldr r7, =0x02039f24 ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _080F81F0 + ldr r5, =0x020244ec adds r0, r5 movs r1, 0x35 bl pokemon_getattr strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080F81F4 + ldr r0, =0x02039f2e ldrh r0, [r0] cmp r2, r0 bhi _080F8250 @@ -506922,23 +489809,21 @@ _080F8190: bl sub_80EE4DC b _080F8250 .align 2, 0 -_080F81EC: .4byte 0x02039f24 -_080F81F0: .4byte 0x020244ec -_080F81F4: .4byte 0x02039f2e + .pool _080F81F8: mov r4, sp - ldr r7, _080F8258 + ldr r7, =0x02039f24 ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _080F825C + ldr r5, =0x020244ec adds r0, r5 movs r1, 0x36 bl pokemon_getattr strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080F8260 + ldr r0, =0x02039f2e ldrh r0, [r0] cmp r2, r0 bhi _080F8250 @@ -506972,19 +489857,17 @@ _080F8250: pop {r0} bx r0 .align 2, 0 -_080F8258: .4byte 0x02039f24 -_080F825C: .4byte 0x020244ec -_080F8260: .4byte 0x02039f2e + .pool thumb_func_end sub_80F7FFC thumb_func_start sub_80F8264 sub_80F8264: @ 80F8264 push {r4,lr} - ldr r4, _080F8284 - ldr r0, _080F8288 + ldr r4, =0x02021cc4 + ldr r0, =0x020375e4 ldrh r1, [r0] lsls r1, 6 - ldr r0, _080F828C + ldr r0, =0x02039e0d adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -506994,27 +489877,23 @@ sub_80F8264: @ 80F8264 pop {r0} bx r0 .align 2, 0 -_080F8284: .4byte 0x02021cc4 -_080F8288: .4byte 0x020375e4 -_080F828C: .4byte 0x02039e0d + .pool thumb_func_end sub_80F8264 thumb_func_start sub_80F8290 sub_80F8290: @ 80F8290 push {lr} - ldr r0, _080F82A8 - ldr r1, _080F82AC + ldr r0, =0x02021ec4 + ldr r1, =0x020375e4 ldrh r1, [r1] lsls r1, 6 - ldr r2, _080F82B0 + ldr r2, =0x02039e02 adds r1, r2 bl gf_strcpy pop {r0} bx r0 .align 2, 0 -_080F82A8: .4byte 0x02021ec4 -_080F82AC: .4byte 0x020375e4 -_080F82B0: .4byte 0x02039e02 + .pool thumb_func_end sub_80F8290 thumb_func_start sub_80F82B4 @@ -507022,9 +489901,9 @@ sub_80F82B4: @ 80F82B4 push {r4-r6,lr} movs r1, 0 movs r2, 0 - ldr r5, _080F82F0 - ldr r4, _080F82F4 - ldr r0, _080F82F8 + ldr r5, =0x020375e0 + ldr r4, =0x02039f00 + ldr r0, =0x020375e4 ldrh r0, [r0] lsls r0, 1 adds r0, r4 @@ -507051,16 +489930,14 @@ _080F82DC: pop {r0} bx r0 .align 2, 0 -_080F82F0: .4byte 0x020375e0 -_080F82F4: .4byte 0x02039f00 -_080F82F8: .4byte 0x020375e4 + .pool thumb_func_end sub_80F82B4 thumb_func_start sub_80F82FC sub_80F82FC: @ 80F82FC - ldr r2, _080F8310 - ldr r1, _080F8314 - ldr r0, _080F8318 + ldr r2, =0x020375e0 + ldr r1, =0x02039f00 + ldr r0, =0x020375e4 ldrh r0, [r0] lsls r0, 1 adds r0, r1 @@ -507068,18 +489945,16 @@ sub_80F82FC: @ 80F82FC strh r0, [r2] bx lr .align 2, 0 -_080F8310: .4byte 0x020375e0 -_080F8314: .4byte 0x02039f00 -_080F8318: .4byte 0x020375e4 + .pool thumb_func_end sub_80F82FC thumb_func_start sub_80F831C sub_80F831C: @ 80F831C push {lr} movs r1, 0 - ldr r2, _080F8344 + ldr r2, =0x02039f20 ldrb r0, [r2] - ldr r3, _080F8348 + ldr r3, =0x020375e2 cmp r0, 0 beq _080F833C _080F832A: @@ -507097,18 +489972,17 @@ _080F833C: pop {r0} bx r0 .align 2, 0 -_080F8344: .4byte 0x02039f20 -_080F8348: .4byte 0x020375e2 + .pool thumb_func_end sub_80F831C thumb_func_start sub_80F834C sub_80F834C: @ 80F834C push {r4,lr} movs r1, 0 - ldr r2, _080F8384 + ldr r2, =0x02039f20 ldrb r0, [r2] - ldr r4, _080F8388 - ldr r3, _080F838C + ldr r4, =0x02021ec4 + ldr r3, =0x02039e0d cmp r0, 0 beq _080F836E _080F835C: @@ -507132,19 +490006,17 @@ _080F836E: pop {r0} bx r0 .align 2, 0 -_080F8384: .4byte 0x02039f20 -_080F8388: .4byte 0x02021ec4 -_080F838C: .4byte 0x02039e0d + .pool thumb_func_end sub_80F834C thumb_func_start sub_80F8390 sub_80F8390: @ 80F8390 push {r4,lr} movs r1, 0 - ldr r2, _080F83C4 + ldr r2, =0x02039f20 ldrb r0, [r2] - ldr r4, _080F83C8 - ldr r3, _080F83CC + ldr r4, =0x02021cc4 + ldr r3, =0x02039e02 cmp r0, 0 beq _080F83B2 _080F83A0: @@ -507166,20 +490038,18 @@ _080F83B2: pop {r0} bx r0 .align 2, 0 -_080F83C4: .4byte 0x02039f20 -_080F83C8: .4byte 0x02021cc4 -_080F83CC: .4byte 0x02039e02 + .pool thumb_func_end sub_80F8390 thumb_func_start sub_80F83D0 sub_80F83D0: @ 80F83D0 push {lr} - ldr r0, _080F83DC + ldr r0, =sub_80D7B24 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080F83DC: .4byte sub_80D7B24 + 1 + .pool thumb_func_end sub_80F83D0 thumb_func_start sub_80F83E0 @@ -507187,7 +490057,7 @@ sub_80F83E0: @ 80F83E0 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F8404 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -507195,14 +490065,13 @@ sub_80F83E0: @ 80F83E0 bne _080F83FE adds r0, r2, 0 bl remove_task - ldr r0, _080F8408 + ldr r0, =sub_80F83D0 + 1 bl set_callback2 _080F83FE: pop {r0} bx r0 .align 2, 0 -_080F8404: .4byte 0x02037fd4 -_080F8408: .4byte sub_80F83D0 + 1 + .pool thumb_func_end sub_80F83E0 thumb_func_start sub_80F840C @@ -507210,7 +490079,7 @@ sub_80F840C: @ 80F840C push {lr} sub sp, 0x4 bl script_env_2_enable - ldr r0, _080F8434 + ldr r0, =sub_80F83E0 + 1 movs r1, 0xA bl AddTask movs r0, 0x1 @@ -507224,14 +490093,14 @@ sub_80F840C: @ 80F840C pop {r0} bx r0 .align 2, 0 -_080F8434: .4byte sub_80F83E0 + 1 + .pool thumb_func_end sub_80F840C thumb_func_start sub_80F8438 sub_80F8438: @ 80F8438 - ldr r2, _080F844C - ldr r1, _080F8450 - ldr r0, _080F8454 + ldr r2, =0x020375e0 + ldr r1, =0x02039e00 + ldr r0, =0x020375e4 ldrh r0, [r0] lsls r0, 6 adds r0, r1 @@ -507239,9 +490108,7 @@ sub_80F8438: @ 80F8438 strh r0, [r2] bx lr .align 2, 0 -_080F844C: .4byte 0x020375e0 -_080F8450: .4byte 0x02039e00 -_080F8454: .4byte 0x020375e4 + .pool thumb_func_end sub_80F8438 thumb_func_start sub_80F8458 @@ -507249,7 +490116,7 @@ sub_80F8458: @ 80F8458 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080F847C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -507257,14 +490124,13 @@ sub_80F8458: @ 80F8458 bne _080F8476 adds r0, r2, 0 bl remove_task - ldr r0, _080F8480 + ldr r0, =sub_80F5B00 + 1 bl set_callback2 _080F8476: pop {r0} bx r0 .align 2, 0 -_080F847C: .4byte 0x02037fd4 -_080F8480: .4byte sub_80F5B00 + 1 + .pool thumb_func_end sub_80F8458 thumb_func_start sub_80F8484 @@ -507272,7 +490138,7 @@ sub_80F8484: @ 80F8484 push {lr} sub sp, 0x4 bl script_env_2_enable - ldr r0, _080F84AC + ldr r0, =sub_80F8458 + 1 movs r1, 0xA bl AddTask movs r0, 0x1 @@ -507286,19 +490152,18 @@ sub_80F8484: @ 80F8484 pop {r0} bx r0 .align 2, 0 -_080F84AC: .4byte sub_80F8458 + 1 + .pool thumb_func_end sub_80F8484 thumb_func_start sub_80F84B0 sub_80F84B0: @ 80F84B0 - ldr r0, _080F84BC - ldr r1, _080F84C0 + ldr r0, =0x020375e0 + ldr r1, =0x02039f25 ldrb r1, [r1] strh r1, [r0] bx lr .align 2, 0 -_080F84BC: .4byte 0x020375e0 -_080F84C0: .4byte 0x02039f25 + .pool thumb_func_end sub_80F84B0 thumb_func_start sub_80F84C4 @@ -507308,18 +490173,18 @@ sub_80F84C4: @ 80F84C4 lsls r5, 24 lsrs r5, 24 bl script_env_2_enable - ldr r6, _080F84FC + ldr r6, =sub_80FC580 + 1 adds r0, r6, 0 movs r1, 0 bl AddTask adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r2, _080F8500 + ldr r2, =sub_80F8508 + 1 adds r0, r4, 0 adds r1, r6, 0 bl set_task_function_and_args_14_15 - ldr r1, _080F8504 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -507329,9 +490194,7 @@ sub_80F84C4: @ 80F84C4 pop {r0} bx r0 .align 2, 0 -_080F84FC: .4byte sub_80FC580 + 1 -_080F8500: .4byte sub_80F8508 + 1 -_080F8504: .4byte 0x03005e00 + .pool thumb_func_end sub_80F84C4 thumb_func_start sub_80F8508 @@ -507339,44 +490202,39 @@ sub_80F8508: @ 80F8508 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080F8530 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x4 ands r0, r1 cmp r0, 0 beq _080F8540 - ldr r0, _080F8534 + ldr r0, =0x02039f24 ldrb r0, [r0] bl sub_80DA8C8 - ldr r1, _080F8538 - ldr r2, _080F853C + ldr r1, =sub_80FC6BC + 1 + ldr r2, =sub_80F8568 + 1 adds r0, r4, 0 bl set_task_function_and_args_14_15 b _080F8556 .align 2, 0 -_080F8530: .4byte 0x02039f2a -_080F8534: .4byte 0x02039f24 -_080F8538: .4byte sub_80FC6BC + 1 -_080F853C: .4byte sub_80F8568 + 1 + .pool _080F8540: - ldr r0, _080F855C + ldr r0, =0x02039f24 ldrb r0, [r0] bl sub_80DA8C8 - ldr r1, _080F8560 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080F8564 + ldr r1, =sub_81D9DE4 + 1 str r1, [r0] _080F8556: pop {r4} pop {r0} bx r0 .align 2, 0 -_080F855C: .4byte 0x02039f24 -_080F8560: .4byte 0x03005e00 -_080F8564: .4byte sub_81D9DE4 + 1 + .pool thumb_func_end sub_80F8508 thumb_func_start sub_80F8568 @@ -507384,14 +490242,13 @@ sub_80F8568: @ 80F8568 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080F857C - ldr r2, _080F8580 + ldr r1, =sub_80FC804 + 1 + ldr r2, =sub_80F8584 + 1 bl set_task_function_and_args_14_15 pop {r0} bx r0 .align 2, 0 -_080F857C: .4byte sub_80FC804 + 1 -_080F8580: .4byte sub_80F8584 + 1 + .pool thumb_func_end sub_80F8568 thumb_func_start sub_80F8584 @@ -507399,14 +490256,13 @@ sub_80F8584: @ 80F8584 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080F8598 - ldr r2, _080F859C + ldr r1, =sub_80FCE48 + 1 + ldr r2, =sub_80F85A0 + 1 bl set_task_function_and_args_14_15 pop {r0} bx r0 .align 2, 0 -_080F8598: .4byte sub_80FCE48 + 1 -_080F859C: .4byte sub_80F85A0 + 1 + .pool thumb_func_end sub_80F8584 thumb_func_start sub_80F85A0 @@ -507414,14 +490270,13 @@ sub_80F85A0: @ 80F85A0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080F85B4 - ldr r2, _080F85B8 + ldr r1, =sub_80FC894 + 1 + ldr r2, =sub_80F85BC + 1 bl set_task_function_and_args_14_15 pop {r0} bx r0 .align 2, 0 -_080F85B4: .4byte sub_80FC894 + 1 -_080F85B8: .4byte sub_80F85BC + 1 + .pool thumb_func_end sub_80F85A0 thumb_func_start sub_80F85BC @@ -507437,9 +490292,9 @@ sub_80F85BC: @ 80F85BC str r0, [sp] str r0, [sp, 0x4] movs r3, 0 - ldr r5, _080F8638 + ldr r5, =0x02039f30 mov r12, r5 - ldr r0, _080F863C + ldr r0, =0x020375e0 mov r9, r0 add r1, sp, 0x4 mov r8, r1 @@ -507449,7 +490304,7 @@ sub_80F85BC: @ 80F85BC lsls r0, r6, 2 adds r0, r6 lsls r4, r0, 3 - ldr r7, _080F8640 + ldr r7, =0x03005e08 _080F85EC: mov r1, sp adds r2, r1, r3 @@ -507492,9 +490347,7 @@ _080F862A: movs r0, 0 b _080F8646 .align 2, 0 -_080F8638: .4byte 0x02039f30 -_080F863C: .4byte 0x020375e0 -_080F8640: .4byte 0x03005e08 + .pool _080F8644: movs r0, 0x1 _080F8646: @@ -507509,7 +490362,7 @@ _080F8646: lsls r0, r6, 2 adds r0, r6 lsls r2, r0, 3 - ldr r7, _080F86A4 + ldr r7, =0x03005e08 _080F865E: adds r1, r5, r3 adds r0, r3, 0x5 @@ -507527,13 +490380,13 @@ _080F865E: _080F8678: mov r0, r8 bl sub_80F86E0 - ldr r1, _080F86A8 + ldr r1, =0x02039f2b strb r0, [r1] - ldr r0, _080F86AC + ldr r0, =0x02039f2c ldrb r0, [r0] bl sub_80DB09C - ldr r1, _080F86B0 - ldr r2, _080F86B4 + ldr r1, =sub_80FCF40 + 1 + ldr r2, =sub_80F86B8 + 1 adds r0, r6, 0 bl set_task_function_and_args_14_15 add sp, 0x8 @@ -507544,11 +490397,7 @@ _080F8678: pop {r0} bx r0 .align 2, 0 -_080F86A4: .4byte 0x03005e08 -_080F86A8: .4byte 0x02039f2b -_080F86AC: .4byte 0x02039f2c -_080F86B0: .4byte sub_80FCF40 + 1 -_080F86B4: .4byte sub_80F86B8 + 1 + .pool thumb_func_end sub_80F85BC thumb_func_start sub_80F86B8 @@ -507559,16 +490408,15 @@ sub_80F86B8: @ 80F86B8 lsrs r4, 24 movs r0, 0 bl sub_80DCE58 - ldr r1, _080F86D8 - ldr r2, _080F86DC + ldr r1, =sub_80FCFD0 + 1 + ldr r2, =sub_80F8714 + 1 adds r0, r4, 0 bl set_task_function_and_args_14_15 pop {r4} pop {r0} bx r0 .align 2, 0 -_080F86D8: .4byte sub_80FCFD0 + 1 -_080F86DC: .4byte sub_80F8714 + 1 + .pool thumb_func_end sub_80F86B8 thumb_func_start sub_80F86E0 @@ -507577,7 +490425,7 @@ sub_80F86E0: @ 80F86E0 adds r3, r0, 0 movs r4, 0 movs r2, 0x1 - ldr r0, _080F8710 + ldr r0, =0x02039f30 ldrb r0, [r0] cmp r2, r0 bge _080F8708 @@ -507601,7 +490449,7 @@ _080F8708: pop {r1} bx r1 .align 2, 0 -_080F8710: .4byte 0x02039f30 + .pool thumb_func_end sub_80F86E0 thumb_func_start sub_80F8714 @@ -507609,7 +490457,7 @@ sub_80F8714: @ 80F8714 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _080F873C + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x1 bne _080F8748 @@ -507617,20 +490465,18 @@ sub_80F8714: @ 80F8714 lsls r0, 24 cmp r0, 0 beq _080F877E - ldr r0, _080F8740 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _080F8744 + ldr r0, =sub_80F878C + 1 str r0, [r1] b _080F877E .align 2, 0 -_080F873C: .4byte 0x020375e0 -_080F8740: .4byte 0x03005e00 -_080F8744: .4byte sub_80F878C + 1 + .pool _080F8748: - ldr r5, _080F8784 + ldr r5, =0x02039e02 movs r4, 0x3 _080F874C: adds r0, r5, 0 @@ -507641,7 +490487,7 @@ _080F874C: bge _080F874C adds r0, r6, 0 bl remove_task - ldr r0, _080F8788 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -507658,8 +490504,7 @@ _080F877E: pop {r0} bx r0 .align 2, 0 -_080F8784: .4byte 0x02039e02 -_080F8788: .4byte 0x03005d8c + .pool thumb_func_end sub_80F8714 thumb_func_start sub_80F878C @@ -507669,19 +490514,18 @@ sub_80F878C: @ 80F878C lsls r4, 24 lsrs r4, 24 bl sub_800AC34 - ldr r1, _080F87AC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080F87B0 + ldr r1, =sub_80F87B4 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080F87AC: .4byte 0x03005e00 -_080F87B0: .4byte sub_80F87B4 + 1 + .pool thumb_func_end sub_80F878C thumb_func_start sub_80F87B4 @@ -507689,7 +490533,7 @@ sub_80F87B4: @ 80F87B4 push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _080F87D4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _080F87D0 @@ -507701,17 +490545,17 @@ _080F87D0: pop {r0} bx r0 .align 2, 0 -_080F87D4: .4byte 0x03003124 + .pool thumb_func_end sub_80F87B4 thumb_func_start sub_80F87D8 sub_80F87D8: @ 80F87D8 push {r4,lr} - ldr r0, _080F8808 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r1, _080F880C + ldr r1, =0x02039e00 ldrb r3, [r1, 0x15] - ldr r4, _080F8810 + ldr r4, =0x000013bc adds r0, r2, r4 strh r3, [r0] adds r0, r1, 0 @@ -507730,15 +490574,13 @@ sub_80F87D8: @ 80F87D8 pop {r0} bx r0 .align 2, 0 -_080F8808: .4byte 0x03005d8c -_080F880C: .4byte 0x02039e00 -_080F8810: .4byte 0x000013bc + .pool thumb_func_end sub_80F87D8 thumb_func_start sub_80F8814 sub_80F8814: @ 80F8814 push {lr} - ldr r0, _080F882C + ldr r0, =0x020375e2 ldrb r0, [r0] adds r1, r0, 0 cmp r0, 0x1 @@ -507749,7 +490591,7 @@ sub_80F8814: @ 80F8814 beq _080F8836 b _080F8842 .align 2, 0 -_080F882C: .4byte 0x020375e2 + .pool _080F8830: cmp r1, 0x2 beq _080F883E @@ -507766,12 +490608,12 @@ _080F883E: _080F8842: movs r1, 0x64 _080F8844: - ldr r0, _080F884C + ldr r0, =0x020375e0 strh r1, [r0] pop {r0} bx r0 .align 2, 0 -_080F884C: .4byte 0x020375e0 + .pool thumb_func_end sub_80F8814 thumb_func_start sub_80F8850 @@ -507787,18 +490629,17 @@ sub_80F8850: @ 80F8850 thumb_func_start sub_80F8864 sub_80F8864: @ 80F8864 push {lr} - ldr r0, _080F8878 + ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0x4 bhi _080F88A4 lsls r0, 2 - ldr r1, _080F887C + ldr r1, =_080F8880 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F8878: .4byte 0x02039f2c -_080F887C: .4byte _080F8880 + .pool .align 2, 0 _080F8880: .4byte _080F8894 @@ -507821,31 +490662,29 @@ _080F88A0: _080F88A4: movs r1, 0xC _080F88A6: - ldr r0, _080F88C0 + ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, 5 adds r0, r1 - ldr r1, _080F88C4 + ldr r1, =0x00002e98 adds r0, r1 ldrh r1, [r0] cmp r1, 0 bne _080F88CC - ldr r0, _080F88C8 + ldr r0, =0x020375e0 strh r1, [r0] b _080F88D2 .align 2, 0 -_080F88C0: .4byte 0x03005d8c -_080F88C4: .4byte 0x00002e98 -_080F88C8: .4byte 0x020375e0 + .pool _080F88CC: - ldr r1, _080F88D8 + ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] _080F88D2: pop {r0} bx r0 .align 2, 0 -_080F88D8: .4byte 0x020375e0 + .pool thumb_func_end sub_80F8864 thumb_func_start sub_80F88DC @@ -507860,53 +490699,48 @@ sub_80F88DC: @ 80F88DC thumb_func_start sub_80F88E8 sub_80F88E8: @ 80F88E8 push {lr} - ldr r0, _080F8918 - ldr r1, _080F891C + ldr r0, =0x02039f20 + ldr r1, =0x02039f25 ldrb r2, [r1] adds r0, r2, r0 ldrb r0, [r0] cmp r0, 0 bne _080F8930 - ldr r0, _080F8920 + ldr r0, =0x02039f2e ldrh r0, [r0] cmp r0, 0x3 bne _080F8930 - ldr r1, _080F8924 + ldr r1, =0x02039f08 lsls r0, r2, 1 adds r0, r1 movs r2, 0 ldrsh r1, [r0, r2] - ldr r0, _080F8928 + ldr r0, =0x0000031f cmp r1, r0 ble _080F8930 - ldr r1, _080F892C + ldr r1, =0x020375e0 movs r0, 0x1 b _080F8934 .align 2, 0 -_080F8918: .4byte 0x02039f20 -_080F891C: .4byte 0x02039f25 -_080F8920: .4byte 0x02039f2e -_080F8924: .4byte 0x02039f08 -_080F8928: .4byte 0x0000031f -_080F892C: .4byte 0x020375e0 + .pool _080F8930: - ldr r1, _080F893C + ldr r1, =0x020375e0 movs r0, 0 _080F8934: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_080F893C: .4byte 0x020375e0 + .pool thumb_func_end sub_80F88E8 thumb_func_start sub_80F8940 sub_80F8940: @ 80F8940 push {lr} movs r3, 0 - ldr r0, _080F8968 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _080F896C + ldr r2, =0x00002f98 adds r1, r0, r2 movs r2, 0x4 _080F894E: @@ -507925,8 +490759,7 @@ _080F895A: pop {r1} bx r1 .align 2, 0 -_080F8968: .4byte 0x03005d8c -_080F896C: .4byte 0x00002f98 + .pool thumb_func_end sub_80F8940 thumb_func_start sub_80F8970 @@ -507937,11 +490770,11 @@ sub_80F8970: @ 80F8970 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _080F8A44 + ldr r0, =0x02039f00 mov r12, r0 - ldr r1, _080F8A48 + ldr r1, =0x020375e4 mov r9, r1 - ldr r2, _080F8A4C + ldr r2, =0x02039e02 mov r10, r2 mov r2, r12 mov r1, sp @@ -508046,9 +490879,7 @@ _080F8A30: ldrsh r0, [r5, r4] b _080F8A66 .align 2, 0 -_080F8A44: .4byte 0x02039f00 -_080F8A48: .4byte 0x020375e4 -_080F8A4C: .4byte 0x02039e02 + .pool _080F8A50: subs r0, r2, 0x1 lsls r0, 24 @@ -508071,9 +490902,9 @@ _080F8A6E: lsls r4, r6, 6 mov r0, r10 adds r1, r4, r0 - ldr r0, _080F8AA4 + ldr r0, =0x02021cc4 bl gf_strcpy - ldr r5, _080F8AA8 + ldr r5, =0x02021dc4 mov r0, r10 adds r0, 0xB adds r4, r0 @@ -508089,15 +490920,13 @@ _080F8A6E: cmp r8, r0 bne _080F8AB0 _080F8A9C: - ldr r0, _080F8AAC + ldr r0, =0x020375e4 strh r7, [r0] b _080F8AB6 .align 2, 0 -_080F8AA4: .4byte 0x02021cc4 -_080F8AA8: .4byte 0x02021dc4 -_080F8AAC: .4byte 0x020375e4 + .pool _080F8AB0: - ldr r1, _080F8AC8 + ldr r1, =0x020375e4 adds r0, r7, 0x4 strh r0, [r1] _080F8AB6: @@ -508110,54 +490939,52 @@ _080F8AB6: pop {r0} bx r0 .align 2, 0 -_080F8AC8: .4byte 0x020375e4 + .pool thumb_func_end sub_80F8970 thumb_func_start sub_80F8ACC sub_80F8ACC: @ 80F8ACC push {lr} - ldr r0, _080F8AD8 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080F8AD8: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_80F8ACC thumb_func_start sub_80F8ADC sub_80F8ADC: @ 80F8ADC push {lr} - ldr r0, _080F8AF0 + ldr r0, =sub_812FDEC + 1 bl set_callback2 - ldr r1, _080F8AF4 - ldr r0, _080F8AF8 + ldr r1, =0x030022c0 + ldr r0, =sub_80F8ACC + 1 str r0, [r1, 0x8] pop {r0} bx r0 .align 2, 0 -_080F8AF0: .4byte sub_812FDEC + 1 -_080F8AF4: .4byte 0x030022c0 -_080F8AF8: .4byte sub_80F8ACC + 1 + .pool thumb_func_end sub_80F8ADC thumb_func_start sub_80F8AFC sub_80F8AFC: @ 80F8AFC push {r4,r5,lr} - ldr r0, _080F8B30 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080F8B7C movs r3, 0 - ldr r0, _080F8B34 + ldr r0, =0x02039f30 adds r4, r0, 0 - ldr r5, _080F8B38 + ldr r5, =0x02039e00 ldrb r0, [r4] cmp r3, r0 bge _080F8B50 adds r2, r5, 0 - ldr r1, _080F8B3C + ldr r1, =0x020229e8 _080F8B1C: ldrb r0, [r1] subs r0, 0x1 @@ -508169,10 +490996,7 @@ _080F8B1C: movs r0, 0xEB b _080F8B42 .align 2, 0 -_080F8B30: .4byte 0x02039f2a -_080F8B34: .4byte 0x02039f30 -_080F8B38: .4byte 0x02039e00 -_080F8B3C: .4byte 0x020229e8 + .pool _080F8B40: movs r0, 0xEC _080F8B42: @@ -508185,20 +491009,20 @@ _080F8B44: cmp r3, r0 blt _080F8B1C _080F8B50: - ldr r0, _080F8B84 + ldr r0, =0x00004010 ldrb r1, [r5, 0x15] bl var_set - ldr r0, _080F8B88 + ldr r0, =0x00004011 adds r1, r5, 0 adds r1, 0x55 ldrb r1, [r1] bl var_set - ldr r0, _080F8B8C + ldr r0, =0x00004012 adds r1, r5, 0 adds r1, 0x95 ldrb r1, [r1] bl var_set - ldr r0, _080F8B90 + ldr r0, =0x00004013 adds r1, r5, 0 adds r1, 0xD5 ldrb r1, [r1] @@ -508208,26 +491032,23 @@ _080F8B7C: pop {r0} bx r0 .align 2, 0 -_080F8B84: .4byte 0x00004010 -_080F8B88: .4byte 0x00004011 -_080F8B8C: .4byte 0x00004012 -_080F8B90: .4byte 0x00004013 + .pool thumb_func_end sub_80F8AFC thumb_func_start sub_80F8B94 sub_80F8B94: @ 80F8B94 push {r4-r7,lr} - ldr r1, _080F8C08 + ldr r1, =0x0300301c movs r0, 0xC strb r0, [r1] - ldr r0, _080F8C0C + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080F8C6E movs r5, 0 - ldr r0, _080F8C10 + ldr r0, =0x02039f30 ldrb r0, [r0] cmp r5, r0 bge _080F8C6E @@ -508236,17 +491057,17 @@ sub_80F8B94: @ 80F8B94 movs r4, 0xB0 lsls r4, 17 _080F8BBA: - ldr r0, _080F8C14 + ldr r0, =0x0858d8ec adds r0, r5, r0 ldrb r0, [r0] - ldr r1, _080F8C18 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl get_npc_id_by_local_id lsls r0, 24 lsrs r0, 24 - ldr r2, _080F8C1C + ldr r2, =0x02037350 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -508255,14 +491076,14 @@ _080F8BBA: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080F8C20 + ldr r0, =0x02020630 adds r1, r0 ldrb r2, [r1, 0x5] movs r0, 0xF ands r0, r2 orrs r0, r6 strb r0, [r1, 0x5] - ldr r0, _080F8C24 + ldr r0, =0x020229e8 adds r1, r7, r0 ldrb r0, [r1] subs r0, 0x1 @@ -508272,39 +491093,31 @@ _080F8BBA: cmp r0, 0 bne _080F8C2C lsrs r1, r4, 16 - ldr r0, _080F8C28 + ldr r0, =0x08499a18 b _080F8C42 .align 2, 0 -_080F8C08: .4byte 0x0300301c -_080F8C0C: .4byte 0x02039f2a -_080F8C10: .4byte 0x02039f30 -_080F8C14: .4byte 0x0858d8ec -_080F8C18: .4byte 0x03005d8c -_080F8C1C: .4byte 0x02037350 -_080F8C20: .4byte 0x02020630 -_080F8C24: .4byte 0x020229e8 -_080F8C28: .4byte 0x08499a18 + .pool _080F8C2C: lsrs r1, r4, 16 - ldr r0, _080F8C34 + ldr r0, =0x084a54b8 b _080F8C42 .align 2, 0 -_080F8C34: .4byte 0x084a54b8 + .pool _080F8C38: ldrb r0, [r1, 0x13] cmp r0, 0 bne _080F8C50 lsrs r1, r4, 16 - ldr r0, _080F8C4C + ldr r0, =0x084987f8 _080F8C42: movs r2, 0x20 bl gpu_pal_apply b _080F8C5A .align 2, 0 -_080F8C4C: .4byte 0x084987f8 + .pool _080F8C50: lsrs r1, r4, 16 - ldr r0, _080F8C74 + ldr r0, =0x084a4278 movs r2, 0x20 bl gpu_pal_apply _080F8C5A: @@ -508314,7 +491127,7 @@ _080F8C5A: adds r7, 0x1C adds r6, 0x10 adds r5, 0x1 - ldr r0, _080F8C78 + ldr r0, =0x02039f30 ldrb r0, [r0] cmp r5, r0 blt _080F8BBA @@ -508323,19 +491136,18 @@ _080F8C6E: pop {r0} bx r0 .align 2, 0 -_080F8C74: .4byte 0x084a4278 -_080F8C78: .4byte 0x02039f30 + .pool thumb_func_end sub_80F8B94 thumb_func_start sub_80F8C7C sub_80F8C7C: @ 80F8C7C push {r4-r6,lr} sub sp, 0x4 - ldr r6, _080F8CFC + ldr r6, =0x02039f24 ldrb r0, [r6] movs r5, 0x64 muls r0, r5 - ldr r4, _080F8D00 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x46 bl pokemon_getattr @@ -508345,23 +491157,23 @@ sub_80F8C7C: @ 80F8C7C strb r0, [r1] cmp r0, 0 bne _080F8D18 - ldr r0, _080F8D04 - ldr r1, _080F8D08 + ldr r0, =0x02039f20 + ldr r1, =0x02039f25 ldrb r2, [r1] adds r0, r2, r0 ldrb r0, [r0] cmp r0, 0 bne _080F8D18 - ldr r0, _080F8D0C + ldr r0, =0x02039f2e ldrh r0, [r0] cmp r0, 0x3 bne _080F8D18 - ldr r1, _080F8D10 + ldr r1, =0x02039f08 lsls r0, r2, 1 adds r0, r1 movs r2, 0 ldrsh r1, [r0, r2] - ldr r0, _080F8D14 + ldr r0, =0x0000031f cmp r1, r0 ble _080F8D18 movs r1, 0x1 @@ -508390,13 +491202,7 @@ _080F8CF6: movs r0, 0x1 b _080F8D1A .align 2, 0 -_080F8CFC: .4byte 0x02039f24 -_080F8D00: .4byte 0x020244ec -_080F8D04: .4byte 0x02039f20 -_080F8D08: .4byte 0x02039f25 -_080F8D0C: .4byte 0x02039f2e -_080F8D10: .4byte 0x02039f08 -_080F8D14: .4byte 0x0000031f + .pool _080F8D18: movs r0, 0 _080F8D1A: @@ -508419,7 +491225,7 @@ sub_80F8D28: @ 80F8D28 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r7, _080F8DA8 + ldr r7, =sub_80F8EE8 + 1 adds r0, r7, 0 bl get_task_id_by_function lsls r0, 24 @@ -508433,8 +491239,8 @@ _080F8D44: mov r9, r0 movs r1, 0x3 mov r10, r1 - ldr r2, _080F8DAC - ldr r4, _080F8DB0 + ldr r2, =0x02039e00 + ldr r4, =0x020375e4 ldrh r1, [r4] lsls r1, 6 adds r0, r1, r2 @@ -508452,7 +491258,7 @@ _080F8D44: bl AddTask lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _080F8DB4 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -508460,15 +491266,15 @@ _080F8D44: movs r1, 0 strh r1, [r0, 0x8] strh r6, [r0, 0xA] - ldr r1, _080F8DB8 + ldr r1, =0x02039f25 ldrh r0, [r4] ldrb r1, [r1] cmp r0, r1 bne _080F8DC4 lsls r0, r6, 3 - ldr r1, _080F8DBC + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _080F8DC0 + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x8] adds r2, r6, 0 @@ -508476,18 +491282,12 @@ _080F8D44: bl help_system_enable_unless_flashback__sp199 b _080F8DD8 .align 2, 0 -_080F8DA8: .4byte sub_80F8EE8 + 1 -_080F8DAC: .4byte 0x02039e00 -_080F8DB0: .4byte 0x020375e4 -_080F8DB4: .4byte 0x03005e00 -_080F8DB8: .4byte 0x02039f25 -_080F8DBC: .4byte 0x0830a18c -_080F8DC0: .4byte 0x020244d4 + .pool _080F8DC4: lsls r0, r6, 3 - ldr r1, _080F8E44 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _080F8E48 + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x8] adds r2, r6, 0 @@ -508503,7 +491303,7 @@ _080F8DD8: adds r0, r6, 0 movs r1, 0x1 bl sub_806A068 - ldr r0, _080F8E4C + ldr r0, =0x0202499c ldrh r1, [r4, 0x4] strh r1, [r0, 0x2] mov r1, r9 @@ -508523,7 +491323,7 @@ _080F8DD8: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080F8E50 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -508536,7 +491336,7 @@ _080F8DD8: bne _080F8E6C adds r0, r4, r5 lsls r0, 2 - ldr r1, _080F8E54 + ldr r1, =0x02020630 adds r0, r1 adds r1, r6, 0 movs r2, 0 @@ -508544,23 +491344,19 @@ _080F8DD8: bl sub_806ED40 b _080F8E6C .align 2, 0 -_080F8E44: .4byte 0x0830a18c -_080F8E48: .4byte 0x020244d4 -_080F8E4C: .4byte 0x0202499c -_080F8E50: .4byte 0x02039f2a -_080F8E54: .4byte 0x02020630 + .pool _080F8E58: lsls r4, r5, 4 adds r0, r4, r5 lsls r0, 2 - ldr r1, _080F8EAC + ldr r1, =0x02020630 adds r0, r1 adds r1, r6, 0 movs r2, 0 movs r3, 0 bl sub_806ED40 _080F8E6C: - ldr r1, _080F8EB0 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -508570,13 +491366,13 @@ _080F8E6C: strh r1, [r0, 0xE] mov r2, r10 strh r2, [r0, 0x10] - ldr r3, _080F8EAC + ldr r3, =0x02020630 adds r1, r4, r5 lsls r1, 2 adds r0, r3, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, _080F8EB4 + ldr r2, =nullsub_12 + 1 str r2, [r0] adds r1, r3 ldrb r2, [r1, 0x5] @@ -508593,21 +491389,19 @@ _080F8E9C: pop {r0} bx r0 .align 2, 0 -_080F8EAC: .4byte 0x02020630 -_080F8EB0: .4byte 0x03005e00 -_080F8EB4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_80F8D28 thumb_func_start sub_80F8EB8 sub_80F8EB8: @ 80F8EB8 push {lr} - ldr r0, _080F8EE0 + ldr r0, =sub_80F8EE8 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF beq _080F8EDC - ldr r0, _080F8EE4 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -508620,8 +491414,7 @@ _080F8EDC: pop {r0} bx r0 .align 2, 0 -_080F8EE0: .4byte sub_80F8EE8 + 1 -_080F8EE4: .4byte 0x03005e00 + .pool thumb_func_end sub_80F8EB8 thumb_func_start sub_80F8EE8 @@ -508632,7 +491425,7 @@ sub_80F8EE8: @ 80F8EE8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _080F8F0C + ldr r1, =0x03005e00 adds r5, r0, r1 movs r2, 0x8 ldrsh r0, [r5, r2] @@ -508640,13 +491433,12 @@ sub_80F8EE8: @ 80F8EE8 cmp r0, 0x4 bhi _080F8F98 lsls r0, 2 - ldr r1, _080F8F10 + ldr r1, =_080F8F14 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080F8F0C: .4byte 0x03005e00 -_080F8F10: .4byte _080F8F14 + .pool .align 2, 0 _080F8F14: .4byte _080F8F78 @@ -508672,7 +491464,7 @@ _080F8F42: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080F8F80 + ldr r1, =0x02020630 adds r4, r0, r1 ldrb r0, [r4, 0x5] lsrs r0, 4 @@ -508697,7 +491489,7 @@ _080F8F78: strh r0, [r5, 0x8] b _080F8F98 .align 2, 0 -_080F8F80: .4byte 0x02020630 + .pool _080F8F84: lsls r0, r4, 2 adds r0, r4 @@ -508716,13 +491508,13 @@ _080F8F98: thumb_func_start sub_80F8FA0 sub_80F8FA0: @ 80F8FA0 push {r4,lr} - ldr r0, _080F8FCC + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080F8FD8 - ldr r0, _080F8FD0 + ldr r0, =0x02039f30 ldrb r0, [r0] cmp r0, 0x4 bne _080F8FD8 @@ -508730,18 +491522,16 @@ sub_80F8FA0: @ 80F8FA0 ands r0, r1 cmp r0, 0 bne _080F8FD8 - ldr r4, _080F8FD4 + ldr r4, =0x020375f0 bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 strh r0, [r4] b _080F8FDE .align 2, 0 -_080F8FCC: .4byte 0x02039f2a -_080F8FD0: .4byte 0x02039f30 -_080F8FD4: .4byte 0x020375f0 + .pool _080F8FD8: - ldr r1, _080F8FE4 + ldr r1, =0x020375f0 movs r0, 0x4 strh r0, [r1] _080F8FDE: @@ -508749,36 +491539,32 @@ _080F8FDE: pop {r0} bx r0 .align 2, 0 -_080F8FE4: .4byte 0x020375f0 + .pool thumb_func_end sub_80F8FA0 thumb_func_start sub_80F8FE8 sub_80F8FE8: @ 80F8FE8 push {r4,lr} - ldr r0, _080F900C + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _080F9020 - ldr r2, _080F9010 + ldr r2, =0x030060b8 ldr r1, [r2] - ldr r0, _080F9014 + ldr r0, =0x41c64e6d muls r0, r1 - ldr r1, _080F9018 + ldr r1, =0x00006073 adds r0, r1 str r0, [r2] lsrs r0, 16 - ldr r4, _080F901C + ldr r4, =0x020375f0 b _080F902A .align 2, 0 -_080F900C: .4byte 0x02039f2a -_080F9010: .4byte 0x030060b8 -_080F9014: .4byte 0x41c64e6d -_080F9018: .4byte 0x00006073 -_080F901C: .4byte 0x020375f0 + .pool _080F9020: - ldr r4, _080F9038 + ldr r4, =0x020375f0 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -508790,30 +491576,28 @@ _080F902A: pop {r0} bx r0 .align 2, 0 -_080F9038: .4byte 0x020375f0 + .pool thumb_func_end sub_80F8FE8 thumb_func_start sub_80F903C sub_80F903C: @ 80F903C - ldr r2, _080F9050 + ldr r2, =0x030060b8 ldr r1, [r2] - ldr r0, _080F9054 + ldr r0, =0x41c64e6d muls r0, r1 - ldr r1, _080F9058 + ldr r1, =0x00006073 adds r0, r1 str r0, [r2] lsrs r0, 16 bx lr .align 2, 0 -_080F9050: .4byte 0x030060b8 -_080F9054: .4byte 0x41c64e6d -_080F9058: .4byte 0x00006073 + .pool thumb_func_end sub_80F903C thumb_func_start sub_80F905C sub_80F905C: @ 80F905C push {lr} - ldr r0, _080F9070 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x2 ands r0, r1 @@ -508822,9 +491606,9 @@ sub_80F905C: @ 80F905C movs r0, 0 b _080F907E .align 2, 0 -_080F9070: .4byte 0x02039f2a + .pool _080F9074: - ldr r0, _080F9084 + ldr r0, =sub_80F9088 + 1 movs r1, 0x5 bl AddTask movs r0, 0x1 @@ -508832,7 +491616,7 @@ _080F907E: pop {r1} bx r1 .align 2, 0 -_080F9084: .4byte sub_80F9088 + 1 + .pool thumb_func_end sub_80F905C thumb_func_start sub_80F9088 @@ -508840,7 +491624,7 @@ sub_80F9088: @ 80F9088 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080F90BC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -508861,7 +491645,7 @@ sub_80F9088: @ 80F9088 bl remove_task b _080F90D4 .align 2, 0 -_080F90BC: .4byte 0x03005e00 + .pool _080F90C0: bl sub_800A520 lsls r0, 24 @@ -508881,13 +491665,13 @@ _080F90D4: thumb_func_start sub_80F90DC sub_80F90DC: @ 80F90DC push {lr} - ldr r0, _080F9104 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _080F90FE - ldr r0, _080F9108 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080F90FE @@ -508899,20 +491683,19 @@ _080F90FE: pop {r0} bx r0 .align 2, 0 -_080F9104: .4byte 0x02039f2a -_080F9108: .4byte 0x03003124 + .pool thumb_func_end sub_80F90DC thumb_func_start sub_80F910C sub_80F910C: @ 80F910C push {lr} - ldr r0, _080F912C + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _080F9126 - ldr r0, _080F9130 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080F9126 @@ -508921,14 +491704,13 @@ _080F9126: pop {r0} bx r0 .align 2, 0 -_080F912C: .4byte 0x02039f2a -_080F9130: .4byte 0x03003124 + .pool thumb_func_end sub_80F910C thumb_func_start sub_80F9134 sub_80F9134: @ 80F9134 push {lr} - ldr r0, _080F9148 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x4 ands r0, r1 @@ -508937,7 +491719,7 @@ sub_80F9134: @ 80F9134 movs r0, 0 b _080F914E .align 2, 0 -_080F9148: .4byte 0x02039f2a + .pool _080F914C: movs r0, 0x1 _080F914E: @@ -508947,18 +491729,18 @@ _080F914E: thumb_func_start sub_80F9154 sub_80F9154: @ 80F9154 - ldr r1, _080F915C + ldr r1, =0x02039f2a movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_080F915C: .4byte 0x02039f2a + .pool thumb_func_end sub_80F9154 thumb_func_start sub_80F9160 sub_80F9160: @ 80F9160 push {lr} - ldr r0, _080F9174 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x2 ands r0, r1 @@ -508967,7 +491749,7 @@ sub_80F9160: @ 80F9160 movs r0, 0 b _080F917A .align 2, 0 -_080F9174: .4byte 0x02039f2a + .pool _080F9178: movs r0, 0x1 _080F917A: @@ -508985,11 +491767,11 @@ sp000_heal_pokemon: @ 80F9180 sub sp, 0x4 movs r0, 0 mov r8, r0 - ldr r0, _080F923C + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r8, r0 bcs _080F922C - ldr r1, _080F9240 + ldr r1, =0x020244ec mov r10, r1 mov r6, sp _080F919E: @@ -509054,7 +491836,7 @@ _080F91D4: lsls r0, r1, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _080F923C + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r8, r0 bcc _080F919E @@ -509068,8 +491850,7 @@ _080F922C: pop {r0} bx r0 .align 2, 0 -_080F923C: .4byte 0x020244e9 -_080F9240: .4byte 0x020244ec + .pool thumb_func_end sp000_heal_pokemon thumb_func_start sub_80F9244 @@ -509178,13 +491959,13 @@ _080F9310: cmp r1, 0x2 bne _080F9318 _080F9314: - ldr r0, _080F931C + ldr r0, =0x020375f0 strh r1, [r0] _080F9318: pop {r0} bx r0 .align 2, 0 -_080F931C: .4byte 0x020375f0 + .pool thumb_func_end sub_80F92F8 thumb_func_start sub_80F9320 @@ -509199,7 +491980,7 @@ _080F932C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080F935C + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -509218,7 +491999,7 @@ _080F932C: movs r0, 0x1 b _080F9368 .align 2, 0 -_080F935C: .4byte 0x020244ec + .pool _080F9360: adds r5, 0x1 cmp r5, 0x5 @@ -509244,7 +492025,7 @@ sub_80F9370: @ 80F9370 bl berryid_from_itemid lsls r0, 24 lsrs r0, 24 - ldr r1, _080F939C + ldr r1, =0x02021cc4 bl sub_80E1A38 _080F9392: adds r0, r4, 0 @@ -509252,7 +492033,7 @@ _080F9392: pop {r1} bx r1 .align 2, 0 -_080F939C: .4byte 0x02021cc4 + .pool thumb_func_end sub_80F9370 thumb_func_start sub_80F93A0 @@ -509270,7 +492051,7 @@ sub_80F93A0: @ 80F93A0 lsls r7, r2, 16 lsrs r6, r7, 16 bl zero_enemy_party_data - ldr r0, _080F93FC + ldr r0, =0x02024744 mov r8, r0 movs r0, 0 str r0, [sp] @@ -509301,7 +492082,7 @@ _080F93EE: pop {r0} bx r0 .align 2, 0 -_080F93FC: .4byte 0x02024744 + .pool thumb_func_end sub_80F93A0 thumb_func_start sub_80F9400 @@ -509315,7 +492096,7 @@ sub_80F9400: @ 80F9400 lsrs r2, 24 cmp r3, 0x6 bls _080F941C - ldr r0, _080F9430 + ldr r0, =0x020244e9 ldrb r0, [r0] subs r0, 0x1 lsls r0, 24 @@ -509323,7 +492104,7 @@ sub_80F9400: @ 80F9400 _080F941C: movs r0, 0x64 muls r0, r3 - ldr r1, _080F9434 + ldr r1, =0x020244ec adds r0, r1 adds r1, r4, 0 bl sub_80691F4 @@ -509331,17 +492112,16 @@ _080F941C: pop {r0} bx r0 .align 2, 0 -_080F9430: .4byte 0x020244e9 -_080F9434: .4byte 0x020244ec + .pool thumb_func_end sub_80F9400 thumb_func_start sub_80F9438 sub_80F9438: @ 80F9438 push {lr} - ldr r0, _080F9454 - ldr r1, _080F9458 + ldr r0, =0x030022c0 + ldr r1, =sub_80F9460 + 1 str r1, [r0, 0x8] - ldr r0, _080F945C + ldr r0, =0x000040cf movs r1, 0x9 bl var_set movs r0, 0 @@ -509349,45 +492129,41 @@ sub_80F9438: @ 80F9438 pop {r0} bx r0 .align 2, 0 -_080F9454: .4byte 0x030022c0 -_080F9458: .4byte sub_80F9460 + 1 -_080F945C: .4byte 0x000040cf + .pool thumb_func_end sub_80F9438 thumb_func_start sub_80F9460 sub_80F9460: @ 80F9460 push {lr} - ldr r0, _080F9470 + ldr r0, =0x0203cef8 ldrb r1, [r0] cmp r1, 0 bne _080F9478 - ldr r0, _080F9474 + ldr r0, =0x020375f0 strh r1, [r0] b _080F947E .align 2, 0 -_080F9470: .4byte 0x0203cef8 -_080F9474: .4byte 0x020375f0 + .pool _080F9478: - ldr r1, _080F9488 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] _080F947E: - ldr r0, _080F948C + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080F9488: .4byte 0x020375f0 -_080F948C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_80F9460 thumb_func_start sub_80F9490 sub_80F9490: @ 80F9490 push {lr} - ldr r1, _080F94AC - ldr r0, _080F94B0 + ldr r1, =0x030022c0 + ldr r0, =sub_80F94B8 + 1 str r0, [r1, 0x8] - ldr r0, _080F94B4 + ldr r0, =0x020375e0 ldrb r0, [r0] adds r0, 0x1 lsls r0, 24 @@ -509396,36 +492172,32 @@ sub_80F9490: @ 80F9490 pop {r0} bx r0 .align 2, 0 -_080F94AC: .4byte 0x030022c0 -_080F94B0: .4byte sub_80F94B8 + 1 -_080F94B4: .4byte 0x020375e0 + .pool thumb_func_end sub_80F9490 thumb_func_start sub_80F94B8 sub_80F94B8: @ 80F94B8 push {lr} - ldr r0, _080F94C8 + ldr r0, =0x0203cef8 ldrb r1, [r0] cmp r1, 0 bne _080F94D0 - ldr r0, _080F94CC + ldr r0, =0x020375f0 strh r1, [r0] b _080F94D6 .align 2, 0 -_080F94C8: .4byte 0x0203cef8 -_080F94CC: .4byte 0x020375f0 + .pool _080F94D0: - ldr r1, _080F94E0 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] _080F94D6: - ldr r0, _080F94E4 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_080F94E0: .4byte 0x020375f0 -_080F94E4: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_80F94B8 thumb_func_start sub_80F94E8 @@ -509435,15 +492207,15 @@ sub_80F94E8: @ 80F94E8 add r0, sp, 0x190 movs r1, 0 str r1, [r0] - ldr r2, _080F9558 + ldr r2, =0x05000064 mov r1, sp bl CpuSet movs r5, 0 movs r7, 0x64 - ldr r6, _080F955C + ldr r6, =0x020244ec mov r4, sp _080F9502: - ldr r0, _080F9560 + ldr r0, =0x0203cef8 adds r1, r5, r0 ldrb r0, [r1] cmp r0, 0 @@ -509463,8 +492235,8 @@ _080F951C: add r0, sp, 0x194 movs r1, 0 str r1, [r0] - ldr r4, _080F955C - ldr r2, _080F9564 + ldr r4, =0x020244ec + ldr r2, =0x05000096 adds r1, r4, 0 bl CpuSet mov r5, sp @@ -509484,10 +492256,7 @@ _080F9538: pop {r0} bx r0 .align 2, 0 -_080F9558: .4byte 0x05000064 -_080F955C: .4byte 0x020244ec -_080F9560: .4byte 0x0203cef8 -_080F9564: .4byte 0x05000096 + .pool thumb_func_end sub_80F94E8 thumb_func_start sub_80F9568 @@ -509516,7 +492285,7 @@ _080F9586: thumb_func_start sub_80F958C sub_80F958C: @ 80F958C push {r4,r5,lr} - ldr r4, _080F95AC + ldr r4, =0x020244ec movs r5, 0 _080F9592: adds r0, r4, 0 @@ -509531,7 +492300,7 @@ _080F9592: movs r0, 0 b _080F95BA .align 2, 0 -_080F95AC: .4byte 0x020244ec + .pool _080F95B0: adds r5, 0x1 adds r4, 0x64 @@ -509553,7 +492322,7 @@ sub_80F95C0: @ 80F95C0 movs r1, 0x64 adds r4, r0, 0 muls r4, r1 - ldr r0, _080F9604 + ldr r0, =0x020244ec adds r4, r0 movs r0, 0 str r0, [sp] @@ -509564,7 +492333,7 @@ sub_80F95C0: @ 80F95C0 movs r1, 0x37 mov r2, sp bl pokemon_setattr - ldr r5, _080F9608 + ldr r5, =0x02021cc4 adds r0, r4, 0 movs r1, 0x2 adds r2, r5, 0 @@ -509576,8 +492345,7 @@ sub_80F95C0: @ 80F95C0 pop {r0} bx r0 .align 2, 0 -_080F9604: .4byte 0x020244ec -_080F9608: .4byte 0x02021cc4 + .pool thumb_func_end sub_80F95C0 thumb_func_start sub_80F960C @@ -509587,7 +492355,7 @@ sub_80F960C: @ 80F960C lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _080F9648 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 bl sub_80F9568 @@ -509609,7 +492377,7 @@ sub_80F960C: @ 80F960C movs r0, 0x1 b _080F964E .align 2, 0 -_080F9648: .4byte 0x020244ec + .pool _080F964C: movs r0, 0 _080F964E: @@ -509626,7 +492394,7 @@ sub_80F9654: @ 80F9654 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _080F9678 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r0, 0 ldrsh r5, [r4, r0] @@ -509638,7 +492406,7 @@ sub_80F9654: @ 80F9654 beq _080F9682 b _080F9722 .align 2, 0 -_080F9678: .4byte 0x03005e08 + .pool _080F967C: cmp r5, 0x2 beq _080F96C0 @@ -509693,31 +492461,31 @@ _080F96C0: cmp r0, 0 beq _080F96F0 _080F96E6: - ldr r0, _080F96EC + ldr r0, =0x020375f0 strh r5, [r0] b _080F9718 .align 2, 0 -_080F96EC: .4byte 0x020375f0 + .pool _080F96F0: - ldr r1, _080F96F8 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] b _080F9718 .align 2, 0 -_080F96F8: .4byte 0x020375f0 + .pool _080F96FC: ldrb r0, [r4, 0x2] bl sub_80F95C0 - ldr r0, _080F9710 + ldr r0, =0x085ecf5d bl box_related_two__2 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] b _080F9722 .align 2, 0 -_080F9710: .4byte 0x085ecf5d + .pool _080F9714: - ldr r0, _080F9728 + ldr r0, =0x020375f0 strh r1, [r0] _080F9718: bl script_env_2_enable_and_set_ctx_running @@ -509728,27 +492496,27 @@ _080F9722: pop {r0} bx r0 .align 2, 0 -_080F9728: .4byte 0x020375f0 + .pool thumb_func_end sub_80F9654 thumb_func_start sub_80F972C sub_80F972C: @ 80F972C push {lr} - ldr r0, _080F9740 + ldr r0, =sub_80F9654 + 1 movs r1, 0x50 bl AddTask bl script_env_2_set_ctx_paused pop {r0} bx r0 .align 2, 0 -_080F9740: .4byte sub_80F9654 + 1 + .pool thumb_func_end sub_80F972C thumb_func_start overworld_poison overworld_poison: @ 80F9744 push {r4-r7,lr} sub sp, 0x4 - ldr r4, _080F97B0 + ldr r4, =0x020244ec movs r7, 0 movs r6, 0 movs r5, 0x5 @@ -509801,7 +492569,7 @@ _080F97A8: movs r0, 0x2 b _080F97BE .align 2, 0 -_080F97B0: .4byte 0x020244ec + .pool _080F97B4: cmp r7, 0 bne _080F97BC @@ -509901,7 +492669,7 @@ sub_80F986C: @ 80F986C lsls r0, 16 lsrs r2, r0, 16 movs r1, 0x1 - ldr r3, _080F9888 + ldr r3, =0x0858d8f0 _080F9876: lsls r0, r1, 3 adds r0, r3 @@ -509913,7 +492681,7 @@ _080F9876: lsrs r0, 24 b _080F9898 .align 2, 0 -_080F9888: .4byte 0x0858d8f0 + .pool _080F988C: adds r0, r1, 0x1 lsls r0, 24 @@ -509945,7 +492713,7 @@ sub_80F989C: @ 80F989C adds r0, r6, 0 bl sub_80F986C lsls r0, 24 - ldr r1, _080F990C + ldr r1, =0x0858d8f0 lsrs r0, 21 adds r0, r1 ldrh r1, [r0] @@ -509978,7 +492746,7 @@ sub_80F989C: @ 80F989C pop {r1} bx r1 .align 2, 0 -_080F990C: .4byte 0x0858d8f0 + .pool thumb_func_end sub_80F989C thumb_func_start sub_80F9910 @@ -510038,19 +492806,19 @@ sub_80F9984: @ 80F9984 adds r7, r1, 0 lsls r0, 16 lsrs r6, r0, 16 - ldr r1, _080F999C + ldr r1, =0x020375f0 ldrh r0, [r1] cmp r0, 0xFF bne _080F99A0 movs r0, 0 b _080F9A0A .align 2, 0 -_080F999C: .4byte 0x020375f0 + .pool _080F99A0: ldrh r1, [r1] movs r0, 0x64 muls r1, r0 - ldr r0, _080F99C8 + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x2D @@ -510066,7 +492834,7 @@ _080F99C2: movs r0, 0x1 b _080F9A0A .align 2, 0 -_080F99C8: .4byte 0x020244ec + .pool _080F99CC: mov r4, sp adds r0, r5, 0 @@ -510081,7 +492849,7 @@ _080F99CC: adds r0, r6, 0 bl sub_80F989C adds r4, r0, 0 - ldr r0, _080F9A04 + ldr r0, =0x02021dc4 adds r1, r5, 0 bl sub_80F9910 cmp r5, r4 @@ -510092,7 +492860,7 @@ _080F99CC: movs r0, 0x3 b _080F9A0A .align 2, 0 -_080F9A04: .4byte 0x02021dc4 + .pool _080F9A08: movs r0, 0x2 _080F9A0A: @@ -510113,12 +492881,12 @@ sub_80F9A14: @ 80F9A14 adds r0, r4, 0 bl sub_80F989C adds r1, r0, 0 - ldr r0, _080F9A50 + ldr r0, =0x02021ec4 bl sub_80F9910 - ldr r0, _080F9A54 + ldr r0, =0x02021cc4 movs r1, 0xB muls r1, r4 - ldr r2, _080F9A58 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy ldrh r1, [r5] @@ -510126,19 +492894,15 @@ sub_80F9A14: @ 80F9A14 lsls r0, 8 cmp r1, r0 bne _080F9A64 - ldr r0, _080F9A5C - ldr r1, _080F9A60 + ldr r0, =0x02021dc4 + ldr r1, =0x085ecf6b bl gf_strcpy b _080F9A6E .align 2, 0 -_080F9A50: .4byte 0x02021ec4 -_080F9A54: .4byte 0x02021cc4 -_080F9A58: .4byte 0x083185c8 -_080F9A5C: .4byte 0x02021dc4 -_080F9A60: .4byte 0x085ecf6b + .pool _080F9A64: - ldr r0, _080F9A74 - ldr r1, _080F9A78 + ldr r0, =0x02021dc4 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy _080F9A6E: @@ -510146,27 +492910,26 @@ _080F9A6E: pop {r0} bx r0 .align 2, 0 -_080F9A74: .4byte 0x02021dc4 -_080F9A78: .4byte 0x03005d90 + .pool thumb_func_end sub_80F9A14 thumb_func_start sub_80F9A7C sub_80F9A7C: @ 80F9A7C push {lr} - ldr r0, _080F9A8C + ldr r0, =0x00004047 movs r1, 0x80 lsls r1, 8 bl var_set pop {r0} bx r0 .align 2, 0 -_080F9A8C: .4byte 0x00004047 + .pool thumb_func_end sub_80F9A7C thumb_func_start sub_80F9A90 sub_80F9A90: @ 80F9A90 push {lr} - ldr r0, _080F9AA8 + ldr r0, =0x00004047 bl var_get_pointer adds r1, r0, 0 movs r0, 0x95 @@ -510175,16 +492938,16 @@ sub_80F9A90: @ 80F9A90 pop {r0} bx r0 .align 2, 0 -_080F9AA8: .4byte 0x00004047 + .pool thumb_func_end sub_80F9A90 thumb_func_start sub_80F9AAC sub_80F9AAC: @ 80F9AAC push {r4,lr} - ldr r0, _080F9ACC + ldr r0, =0x00004047 bl var_get_pointer adds r1, r0, 0 - ldr r4, _080F9AD0 + ldr r4, =0x020375f0 movs r0, 0x95 lsls r0, 1 bl sub_80F9984 @@ -510195,46 +492958,44 @@ sub_80F9AAC: @ 80F9AAC pop {r0} bx r0 .align 2, 0 -_080F9ACC: .4byte 0x00004047 -_080F9AD0: .4byte 0x020375f0 + .pool thumb_func_end sub_80F9AAC thumb_func_start sub_80F9AD4 sub_80F9AD4: @ 80F9AD4 push {lr} - ldr r0, _080F9AE4 + ldr r0, =0x0000404f movs r1, 0x80 lsls r1, 8 bl var_set pop {r0} bx r0 .align 2, 0 -_080F9AE4: .4byte 0x0000404f + .pool thumb_func_end sub_80F9AD4 thumb_func_start sub_80F9AE8 sub_80F9AE8: @ 80F9AE8 push {lr} - ldr r0, _080F9AFC + ldr r0, =0x0000404f bl var_get_pointer adds r1, r0, 0 - ldr r0, _080F9B00 + ldr r0, =0x00000127 bl sub_80F9A14 pop {r0} bx r0 .align 2, 0 -_080F9AFC: .4byte 0x0000404f -_080F9B00: .4byte 0x00000127 + .pool thumb_func_end sub_80F9AE8 thumb_func_start sub_80F9B04 sub_80F9B04: @ 80F9B04 push {r4,lr} - ldr r0, _080F9B24 + ldr r0, =0x0000404f bl var_get_pointer adds r1, r0, 0 - ldr r4, _080F9B28 - ldr r0, _080F9B2C + ldr r4, =0x020375f0 + ldr r0, =0x00000127 bl sub_80F9984 lsls r0, 24 lsrs r0, 24 @@ -510243,9 +493004,7 @@ sub_80F9B04: @ 80F9B04 pop {r0} bx r0 .align 2, 0 -_080F9B24: .4byte 0x0000404f -_080F9B28: .4byte 0x020375f0 -_080F9B2C: .4byte 0x00000127 + .pool thumb_func_end sub_80F9B04 thumb_func_start sub_80F9B30 @@ -510262,7 +493021,7 @@ sub_80F9B30: @ 80F9B30 add r4, sp, 0x8 movs r0, 0x1 strb r0, [r4] - ldr r1, _080F9BB8 + ldr r1, =0x0858d970 mov r0, sp movs r2, 0x7 bl memcpy @@ -510271,9 +493030,9 @@ sub_80F9B30: @ 80F9B30 bhi _080F9BAC cmp r5, 0x40 bhi _080F9BAC - ldr r0, _080F9BBC + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _080F9BC0 + ldr r1, =0x000031a8 adds r0, r1 adds r0, r6 strb r5, [r0] @@ -510282,7 +493041,7 @@ _080F9B6A: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _080F9BC4 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -510307,7 +493066,7 @@ _080F9B9C: ble _080F9B6A cmp r7, 0 beq _080F9BAC - ldr r0, _080F9BC8 + ldr r0, =0x0000089b bl flag_set _080F9BAC: add sp, 0xC @@ -510317,11 +493076,7 @@ _080F9BAC: pop {r0} bx r0 .align 2, 0 -_080F9BB8: .4byte 0x0858d970 -_080F9BBC: .4byte 0x03005d8c -_080F9BC0: .4byte 0x000031a8 -_080F9BC4: .4byte 0x020244ec -_080F9BC8: .4byte 0x0000089b + .pool thumb_func_end sub_80F9B30 thumb_func_start sub_80F9BCC @@ -510336,7 +493091,7 @@ sub_80F9BCC: @ 80F9BCC lsrs r5, 16 lsls r3, 24 lsrs r3, 24 - ldr r0, _080F9BF0 + ldr r0, =sub_80F9C90 + 1 adds r1, r4, 0 adds r2, r5, 0 bl sub_80F9C44 @@ -510344,7 +493099,7 @@ sub_80F9BCC: @ 80F9BCC pop {r0} bx r0 .align 2, 0 -_080F9BF0: .4byte sub_80F9C90 + 1 + .pool thumb_func_end sub_80F9BCC thumb_func_start sub_80F9BF4 @@ -510359,7 +493114,7 @@ sub_80F9BF4: @ 80F9BF4 lsrs r5, 16 lsls r3, 24 lsrs r3, 24 - ldr r0, _080F9C18 + ldr r0, =sub_80F9DFC + 1 adds r1, r4, 0 adds r2, r5, 0 bl sub_80F9C44 @@ -510367,33 +493122,33 @@ sub_80F9BF4: @ 80F9BF4 pop {r0} bx r0 .align 2, 0 -_080F9C18: .4byte sub_80F9DFC + 1 + .pool thumb_func_end sub_80F9BF4 thumb_func_start sub_80F9C1C sub_80F9C1C: @ 80F9C1C push {lr} - ldr r0, _080F9C2C + ldr r0, =sub_80F9C90 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_080F9C2C: .4byte sub_80F9C90 + 1 + .pool thumb_func_end sub_80F9C1C thumb_func_start sub_80F9C30 sub_80F9C30: @ 80F9C30 push {lr} - ldr r0, _080F9C40 + ldr r0, =sub_80F9DFC + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_080F9C40: .4byte sub_80F9DFC + 1 + .pool thumb_func_end sub_80F9C30 thumb_func_start sub_80F9C44 @@ -510409,7 +493164,7 @@ sub_80F9C44: @ 80F9C44 lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 - ldr r1, _080F9C8C + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -510435,7 +493190,7 @@ _080F9C7C: pop {r0} bx r0 .align 2, 0 -_080F9C8C: .4byte 0x03005e00 + .pool thumb_func_end sub_80F9C44 thumb_func_start sub_80F9C90 @@ -510446,7 +493201,7 @@ sub_80F9C90: @ 80F9C90 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080F9CB4 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -510458,7 +493213,7 @@ sub_80F9C90: @ 80F9C90 beq _080F9CC2 b _080F9DDE .align 2, 0 -_080F9CB4: .4byte 0x03005e00 + .pool _080F9CB8: cmp r0, 0x2 beq _080F9D32 @@ -510545,7 +493300,7 @@ _080F9D50: movs r1, 0 movs r2, 0 bl sub_80A2A20 - ldr r0, _080F9D90 + ldr r0, =0x02037b14 strh r5, [r0] _080F9D76: ldrh r1, [r4, 0xE] @@ -510560,7 +493315,7 @@ _080F9D76: ldrsh r0, [r4, r1] b _080F9DD8 .align 2, 0 -_080F9D90: .4byte 0x02037b14 + .pool _080F9D94: ldrh r0, [r4, 0x12] ldrh r1, [r4, 0xC] @@ -510625,7 +493380,7 @@ sub_80F9DFC: @ 80F9DFC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080F9E20 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -510637,7 +493392,7 @@ sub_80F9DFC: @ 80F9DFC beq _080F9E2E b _080F9F2C .align 2, 0 -_080F9E20: .4byte 0x03005e00 + .pool _080F9E24: cmp r1, 0x2 beq _080F9E86 @@ -510645,11 +493400,11 @@ _080F9E24: beq _080F9ED8 b _080F9F2C _080F9E2E: - ldr r0, _080F9E34 + ldr r0, =0x02037b14 strh r1, [r0] b _080F9F4E .align 2, 0 -_080F9E34: .4byte 0x02037b14 + .pool _080F9E38: movs r1, 0 strh r1, [r4, 0xE] @@ -510750,7 +493505,7 @@ _080F9EF6: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r1, _080F9F28 + ldr r1, =0x02037b14 movs r0, 0 strh r0, [r1] _080F9F0C: @@ -510768,7 +493523,7 @@ _080F9F0C: bne _080F9F54 b _080F9F4E .align 2, 0 -_080F9F28: .4byte 0x02037b14 + .pool _080F9F2C: movs r1, 0x80 lsls r1, 6 @@ -510796,28 +493551,27 @@ _080F9F54: thumb_func_start sub_80F9F5C sub_80F9F5C: @ 80F9F5C push {lr} - ldr r0, _080F9F70 - ldr r1, _080F9F74 + ldr r0, =0x0203ab40 + ldr r1, =0x02037318 ldr r1, [r1, 0x4] bl sub_80E9608 bl sub_80E8B6C pop {r0} bx r0 .align 2, 0 -_080F9F70: .4byte 0x0203ab40 -_080F9F74: .4byte 0x02037318 + .pool thumb_func_end sub_80F9F5C thumb_func_start sub_80F9F78 sub_80F9F78: @ 80F9F78 push {lr} - ldr r0, _080F9F98 + ldr r0, =0x02037590 ldrb r1, [r0] movs r0, 0x6 ands r0, r1 cmp r0, 0 beq _080F9FC0 - ldr r1, _080F9F9C + ldr r1, =0x02038c08 ldr r0, [r1, 0x4] cmp r0, 0x2 beq _080F9FAE @@ -510827,8 +493581,7 @@ sub_80F9F78: @ 80F9F78 beq _080F9FA6 b _080F9FFE .align 2, 0 -_080F9F98: .4byte 0x02037590 -_080F9F9C: .4byte 0x02038c08 + .pool _080F9FA0: cmp r0, 0x3 beq _080F9FB6 @@ -510850,7 +493603,7 @@ _080F9FB6: movs r0, 0x18 b _080F9FFC _080F9FC0: - ldr r1, _080F9FD4 + ldr r1, =0x02038c08 ldr r0, [r1, 0x4] cmp r0, 0x2 beq _080F9FEA @@ -510860,7 +493613,7 @@ _080F9FC0: beq _080F9FE2 b _080F9FFE .align 2, 0 -_080F9FD4: .4byte 0x02038c08 + .pool _080F9FD8: cmp r0, 0x3 beq _080F9FEE @@ -510897,7 +493650,7 @@ _080F9FFE: sub_80FA004: @ 80FA004 push {r4,lr} bl sub_80E8BC8 - ldr r0, _080FA058 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 beq _080FA0AE @@ -510906,7 +493659,7 @@ sub_80FA004: @ 80FA004 lsrs r0, 24 cmp r0, 0x2 bne _080FA0AE - ldr r4, _080FA05C + ldr r4, =0x0203ab40 adds r1, r4, 0x2 adds r0, r4, 0 bl player_get_pos_to_plus_one_step_in_direction_player_is_facing @@ -510924,19 +493677,14 @@ sub_80FA004: @ 80FA004 cmp r0, 0x1 bne _080FA070 bl sub_80F9F5C - ldr r1, _080FA060 - ldr r0, _080FA064 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _080FA068 - ldr r0, _080FA06C + ldr r1, =0x0203ceec + ldr r0, =sub_80FA0DC + 1 b _080FA0C0 .align 2, 0 -_080FA058: .4byte 0x020375f0 -_080FA05C: .4byte 0x0203ab40 -_080FA060: .4byte 0x03005db0 -_080FA064: .4byte hm_add_c3_launch_phase_2 + 1 -_080FA068: .4byte 0x0203ceec -_080FA06C: .4byte sub_80FA0DC + 1 + .pool _080FA070: adds r0, r4, 0 bl sub_808925C @@ -510945,17 +493693,14 @@ _080FA070: cmp r0, 0x1 bne _080FA0A0 bl sub_80F9F5C - ldr r1, _080FA090 - ldr r0, _080FA094 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _080FA098 - ldr r0, _080FA09C + ldr r1, =0x0203ceec + ldr r0, =sub_80FA1E8 + 1 b _080FA0C0 .align 2, 0 -_080FA090: .4byte 0x03005db0 -_080FA094: .4byte hm_add_c3_launch_phase_2 + 1 -_080FA098: .4byte 0x0203ceec -_080FA09C: .4byte sub_80FA1E8 + 1 + .pool _080FA0A0: adds r0, r4, 0 bl is_tile_x98 @@ -510968,11 +493713,11 @@ _080FA0AE: b _080FA0C4 _080FA0B2: bl sub_80F9F5C - ldr r1, _080FA0CC - ldr r0, _080FA0D0 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _080FA0D4 - ldr r0, _080FA0D8 + ldr r1, =0x0203ceec + ldr r0, =sub_80FA34C + 1 _080FA0C0: str r0, [r1] movs r0, 0x1 @@ -510981,27 +493726,23 @@ _080FA0C4: pop {r1} bx r1 .align 2, 0 -_080FA0CC: .4byte 0x03005db0 -_080FA0D0: .4byte hm_add_c3_launch_phase_2 + 1 -_080FA0D4: .4byte 0x0203ceec -_080FA0D8: .4byte sub_80FA34C + 1 + .pool thumb_func_end sub_80FA004 thumb_func_start sub_80FA0DC sub_80FA0DC: @ 80FA0DC push {lr} bl brm_get_pokemon_selection - ldr r1, _080FA0F4 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r0, _080FA0F8 + ldr r0, =0x08275a86 bl script_env_1_execute_new_script pop {r0} bx r0 .align 2, 0 -_080FA0F4: .4byte 0x02038c08 -_080FA0F8: .4byte 0x08275a86 + .pool thumb_func_end sub_80FA0DC thumb_func_start oei_sweet_scent @@ -511010,12 +493751,12 @@ oei_sweet_scent: @ 80FA0FC bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _080FA120 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _080FA124 + ldr r2, =sub_80FA128 + 1 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -511023,8 +493764,7 @@ oei_sweet_scent: @ 80FA0FC pop {r1} bx r1 .align 2, 0 -_080FA120: .4byte 0x03005e00 -_080FA124: .4byte sub_80FA128 + 1 + .pool thumb_func_end oei_sweet_scent thumb_func_start sub_80FA128 @@ -511042,9 +493782,9 @@ sub_80FA128: @ 80FA128 sub_80FA13C: @ 80FA13C push {r4,lr} bl sub_80F9F78 - ldr r0, _080FA17C - ldr r3, _080FA180 - ldr r1, _080FA184 + ldr r0, =0x0858e600 + ldr r3, =0x02020630 + ldr r1, =0x02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 adds r2, r1 @@ -511053,7 +493793,7 @@ sub_80FA13C: @ 80FA13C ldrh r1, [r2, 0x2] lsls r1, 23 lsrs r1, 23 - ldr r4, _080FA188 + ldr r4, =0x02038c08 ldr r3, [r4, 0x14] adds r1, r3 lsls r1, 16 @@ -511070,10 +493810,7 @@ sub_80FA13C: @ 80FA13C pop {r1} bx r1 .align 2, 0 -_080FA17C: .4byte 0x0858e600 -_080FA180: .4byte 0x02020630 -_080FA184: .4byte 0x02037590 -_080FA188: .4byte 0x02038c08 + .pool thumb_func_end sub_80FA13C thumb_func_start sub_80FA18C @@ -511084,13 +493821,13 @@ sub_80FA18C: @ 80FA18C bl audio_play movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, _080FA1A4 + ldr r0, =sub_80FA1A8 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_080FA1A4: .4byte sub_80FA1A8 + 1 + .pool thumb_func_end sub_80FA18C thumb_func_start sub_80FA1A8 @@ -511113,13 +493850,13 @@ sub_80FA1A8: @ 80FA1A8 _080FA1C8: movs r0, 0 strh r0, [r1, 0x2E] - ldr r0, _080FA1D4 + ldr r0, =sub_80FA1D8 + 1 str r0, [r1, 0x1C] _080FA1D0: pop {r0} bx r0 .align 2, 0 -_080FA1D4: .4byte sub_80FA1D8 + 1 + .pool thumb_func_end sub_80FA1A8 thumb_func_start sub_80FA1D8 @@ -511136,17 +493873,16 @@ sub_80FA1D8: @ 80FA1D8 sub_80FA1E8: @ 80FA1E8 push {lr} bl brm_get_pokemon_selection - ldr r1, _080FA200 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r0, _080FA204 + ldr r0, =0x08275adf bl script_env_1_execute_new_script pop {r0} bx r0 .align 2, 0 -_080FA200: .4byte 0x02038c08 -_080FA204: .4byte 0x08275adf + .pool thumb_func_end sub_80FA1E8 thumb_func_start sub_80FA208 @@ -511155,12 +493891,12 @@ sub_80FA208: @ 80FA208 bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _080FA22C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _080FA230 + ldr r2, =sub_80FA234 + 1 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -511168,8 +493904,7 @@ sub_80FA208: @ 80FA208 pop {r1} bx r1 .align 2, 0 -_080FA22C: .4byte 0x03005e00 -_080FA230: .4byte sub_80FA234 + 1 + .pool thumb_func_end sub_80FA208 thumb_func_start sub_80FA234 @@ -511186,32 +493921,32 @@ sub_80FA234: @ 80FA234 thumb_func_start sub_80FA248 sub_80FA248: @ 80FA248 push {r4,lr} - ldr r1, _080FA2C0 + ldr r1, =0x0203ab40 movs r2, 0 ldrsh r0, [r1, r2] movs r2, 0x2 ldrsh r1, [r1, r2] bl cur_mapdata_block_get_role_at adds r2, r0, 0 - ldr r1, _080FA2C4 + ldr r1, =0x00000fff adds r0, r1, 0 ands r2, r0 cmp r2, 0x96 bne _080FA26A - ldr r1, _080FA2C8 + ldr r1, =0x02038c08 movs r0, 0 str r0, [r1, 0x1C] _080FA26A: cmp r2, 0x9C bne _080FA274 - ldr r1, _080FA2C8 + ldr r1, =0x02038c08 movs r0, 0x2 str r0, [r1, 0x1C] _080FA274: bl sub_80F9F78 - ldr r0, _080FA2CC - ldr r3, _080FA2D0 - ldr r1, _080FA2D4 + ldr r0, =0x0858e618 + ldr r3, =0x02020630 + ldr r1, =0x02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 adds r2, r1 @@ -511220,7 +493955,7 @@ _080FA274: ldrh r1, [r2, 0x2] lsls r1, 23 lsrs r1, 23 - ldr r4, _080FA2C8 + ldr r4, =0x02038c08 ldr r3, [r4, 0x14] adds r1, r3 lsls r1, 16 @@ -511245,12 +493980,7 @@ _080FA2B6: pop {r1} bx r1 .align 2, 0 -_080FA2C0: .4byte 0x0203ab40 -_080FA2C4: .4byte 0x00000fff -_080FA2C8: .4byte 0x02038c08 -_080FA2CC: .4byte 0x0858e618 -_080FA2D0: .4byte 0x02020630 -_080FA2D4: .4byte 0x02037590 + .pool thumb_func_end sub_80FA248 thumb_func_start sub_80FA2D8 @@ -511259,21 +493989,20 @@ sub_80FA2D8: @ 80FA2D8 adds r4, r0, 0 movs r0, 0x9B bl audio_play - ldr r0, _080FA2FC + ldr r0, =0x02038c08 ldr r1, [r0, 0x1C] adds r2, r4, 0 adds r2, 0x2A movs r0, 0 strb r1, [r2] strh r0, [r4, 0x2E] - ldr r0, _080FA300 + ldr r0, =sub_80FA304 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_080FA2FC: .4byte 0x02038c08 -_080FA300: .4byte sub_80FA304 + 1 + .pool thumb_func_end sub_80FA2D8 thumb_func_start sub_80FA304 @@ -511287,7 +494016,7 @@ sub_80FA304: @ 80FA304 asrs r0, 16 cmp r0, 0x27 ble _080FA32E - ldr r0, _080FA334 + ldr r0, =0x02038c08 ldr r0, [r0, 0x1C] cmp r0, 0 beq _080FA322 @@ -511298,15 +494027,14 @@ _080FA322: _080FA326: movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, _080FA338 + ldr r0, =sub_80FA33C + 1 str r0, [r4, 0x1C] _080FA32E: pop {r4} pop {r0} bx r0 .align 2, 0 -_080FA334: .4byte 0x02038c08 -_080FA338: .4byte sub_80FA33C + 1 + .pool thumb_func_end sub_80FA304 thumb_func_start sub_80FA33C @@ -511323,17 +494051,16 @@ sub_80FA33C: @ 80FA33C sub_80FA34C: @ 80FA34C push {lr} bl brm_get_pokemon_selection - ldr r1, _080FA364 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r0, _080FA368 + ldr r0, =0x08275b38 bl script_env_1_execute_new_script pop {r0} bx r0 .align 2, 0 -_080FA364: .4byte 0x02038c08 -_080FA368: .4byte 0x08275b38 + .pool thumb_func_end sub_80FA34C thumb_func_start sub_80FA36C @@ -511342,12 +494069,12 @@ sub_80FA36C: @ 80FA36C bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _080FA390 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _080FA394 + ldr r2, =sub_80FA398 + 1 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -511355,8 +494082,7 @@ sub_80FA36C: @ 80FA36C pop {r1} bx r1 .align 2, 0 -_080FA390: .4byte 0x03005e00 -_080FA394: .4byte sub_80FA398 + 1 + .pool thumb_func_end sub_80FA36C thumb_func_start sub_80FA398 @@ -511374,9 +494100,9 @@ sub_80FA398: @ 80FA398 sub_80FA3AC: @ 80FA3AC push {r4,lr} bl sub_80F9F78 - ldr r0, _080FA3EC - ldr r3, _080FA3F0 - ldr r1, _080FA3F4 + ldr r0, =0x0858e630 + ldr r3, =0x02020630 + ldr r1, =0x02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 adds r2, r1 @@ -511385,7 +494111,7 @@ sub_80FA3AC: @ 80FA3AC ldrh r1, [r2, 0x2] lsls r1, 23 lsrs r1, 23 - ldr r4, _080FA3F8 + ldr r4, =0x02038c08 ldr r3, [r4, 0x14] adds r1, r3 lsls r1, 16 @@ -511402,10 +494128,7 @@ sub_80FA3AC: @ 80FA3AC pop {r1} bx r1 .align 2, 0 -_080FA3EC: .4byte 0x0858e630 -_080FA3F0: .4byte 0x02020630 -_080FA3F4: .4byte 0x02037590 -_080FA3F8: .4byte 0x02038c08 + .pool thumb_func_end sub_80FA3AC thumb_func_start sub_80FA3FC @@ -511416,13 +494139,13 @@ sub_80FA3FC: @ 80FA3FC bl audio_play movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, _080FA414 + ldr r0, =sub_80FA418 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_080FA414: .4byte sub_80FA418 + 1 + .pool thumb_func_end sub_80FA3FC thumb_func_start sub_80FA418 @@ -511445,13 +494168,13 @@ sub_80FA418: @ 80FA418 _080FA438: movs r0, 0 strh r0, [r1, 0x2E] - ldr r0, _080FA444 + ldr r0, =sub_80FA448 + 1 str r0, [r1, 0x1C] _080FA440: pop {r0} bx r0 .align 2, 0 -_080FA444: .4byte sub_80FA448 + 1 + .pool thumb_func_end sub_80FA418 thumb_func_start sub_80FA448 @@ -511473,12 +494196,12 @@ sub_80FA458: @ 80FA458 mov r0, sp adds r1, r4, 0 bl player_get_pos_to_plus_one_step_in_direction_player_is_facing - ldr r0, _080FA498 + ldr r0, =sub_80FA4A0 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080FA49C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -511496,8 +494219,7 @@ sub_80FA458: @ 80FA458 pop {r1} bx r1 .align 2, 0 -_080FA498: .4byte sub_80FA4A0 + 1 -_080FA49C: .4byte 0x03005e00 + .pool thumb_func_end sub_80FA458 thumb_func_start sub_80FA4A0 @@ -511508,7 +494230,7 @@ sub_80FA4A0: @ 80FA4A0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080FA4C8 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4, 0x4] subs r0, 0x4 @@ -511517,13 +494239,12 @@ sub_80FA4A0: @ 80FA4A0 cmp r0, 0x10 bhi _080FA56E lsls r0, 2 - ldr r1, _080FA4CC + ldr r1, =_080FA4D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FA4C8: .4byte 0x03005e08 -_080FA4CC: .4byte _080FA4D0 + .pool .align 2, 0 _080FA4D0: .4byte _080FA514 @@ -511606,7 +494327,7 @@ sub_80FA57C: @ 80FA57C bl player_get_pos_to_plus_one_step_in_direction_player_is_facing movs r0, 0x3 bl audio_play - ldr r0, _080FA5B4 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 @@ -511621,14 +494342,14 @@ sub_80FA57C: @ 80FA57C bl setmaptile_0 b _080FA5C8 .align 2, 0 -_080FA5B4: .4byte 0x00004054 + .pool _080FA5B8: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] movs r2, 0 ldrsh r1, [r4, r2] - ldr r2, _080FA5E0 + ldr r2, =0x00000e21 bl setmaptile_0 _080FA5C8: mov r0, sp @@ -511642,7 +494363,7 @@ _080FA5C8: pop {r0} bx r0 .align 2, 0 -_080FA5E0: .4byte 0x00000e21 + .pool thumb_func_end sub_80FA57C thumb_func_start sub_80FA5E4 @@ -511657,12 +494378,12 @@ sub_80FA5E4: @ 80FA5E4 lsrs r5, 16 lsls r6, 16 lsrs r6, 16 - ldr r0, _080FA624 + ldr r0, =sub_80FA62C + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080FA628 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -511678,8 +494399,7 @@ sub_80FA5E4: @ 80FA5E4 pop {r0} bx r0 .align 2, 0 -_080FA624: .4byte sub_80FA62C + 1 -_080FA628: .4byte 0x03005e00 + .pool thumb_func_end sub_80FA5E4 thumb_func_start sub_80FA62C @@ -511690,7 +494410,7 @@ sub_80FA62C: @ 80FA62C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080FA64C + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r1, [r4, 0x6] movs r2, 0x6 @@ -511700,7 +494420,7 @@ sub_80FA62C: @ 80FA62C movs r0, 0 b _080FA652 .align 2, 0 -_080FA64C: .4byte 0x03005e08 + .pool _080FA650: adds r0, r1, 0x1 _080FA652: @@ -511821,12 +494541,12 @@ sub_80FA704: @ 80FA704 asrs r5, 16 lsls r4, 16 asrs r4, 16 - ldr r2, _080FA74C + ldr r2, =0x00000276 adds r0, r5, 0 adds r1, r4, 0 bl setmaptile_0 subs r6, r4, 0x1 - ldr r2, _080FA750 + ldr r2, =0x0000026e adds r0, r5, 0 adds r1, r6, 0 bl setmaptile_0 @@ -511840,8 +494560,7 @@ sub_80FA704: @ 80FA704 pop {r0} bx r0 .align 2, 0 -_080FA74C: .4byte 0x00000276 -_080FA750: .4byte 0x0000026e + .pool thumb_func_end sub_80FA704 thumb_func_start sub_80FA754 @@ -511849,7 +494568,7 @@ sub_80FA754: @ 80FA754 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080FA784 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -511868,7 +494587,7 @@ sub_80FA754: @ 80FA754 bl remove_task b _080FA78C .align 2, 0 -_080FA784: .4byte 0x03005e00 + .pool _080FA788: adds r0, r2, 0x1 strh r0, [r1, 0x8] @@ -511901,12 +494620,12 @@ sub_80FA794: @ 80FA794 _080FA7BC: cmp r0, 0x2 bne _080FA7DE - ldr r0, _080FA7E4 + ldr r0, =sub_80FA754 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080FA7E8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -511920,8 +494639,7 @@ _080FA7DE: pop {r0} bx r0 .align 2, 0 -_080FA7E4: .4byte sub_80FA754 + 1 -_080FA7E8: .4byte 0x03005e00 + .pool thumb_func_end sub_80FA794 thumb_func_start sub_80FA7EC @@ -511929,7 +494647,7 @@ sub_80FA7EC: @ 80FA7EC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080FA824 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -511941,7 +494659,7 @@ sub_80FA7EC: @ 80FA7EC beq _080FA808 b _080FA966 _080FA808: - ldr r2, _080FA828 + ldr r2, =0xfffffd88 adds r0, r2, 0 ldrh r1, [r1, 0x8] adds r0, r1 @@ -511952,14 +494670,12 @@ _080FA808: b _080FA95E _080FA81A: lsls r0, 2 - ldr r1, _080FA82C + ldr r1, =_080FA830 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FA824: .4byte 0x03005e00 -_080FA828: .4byte 0xfffffd88 -_080FA82C: .4byte _080FA830 + .pool .align 2, 0 _080FA830: .4byte _080FA920 @@ -512072,12 +494788,12 @@ sub_80FA970: @ 80FA970 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _080FA99C + ldr r0, =sub_80FA7EC + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _080FA9A0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -512089,8 +494805,7 @@ sub_80FA970: @ 80FA970 pop {r0} bx r0 .align 2, 0 -_080FA99C: .4byte sub_80FA7EC + 1 -_080FA9A0: .4byte 0x03005e00 + .pool thumb_func_end sub_80FA970 thumb_func_start sub_80FA9A4 @@ -512123,8 +494838,8 @@ _080FA9CA: sub_80FA9D0: @ 80FA9D0 push {r4,lr} sub sp, 0x4 - ldr r3, _080FAA68 - ldr r2, _080FAA6C + ldr r3, =0x02037350 + ldr r2, =0x02037590 ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -512147,7 +494862,7 @@ sub_80FA9D0: @ 80FA9D0 movs r2, 0x8 movs r3, 0x4 bl sub_80930E0 - ldr r0, _080FAA70 + ldr r0, =0x085059f8 ldr r0, [r0, 0x58] mov r1, sp movs r2, 0 @@ -512160,7 +494875,7 @@ sub_80FA9D0: @ 80FA9D0 lsrs r0, 24 cmp r0, 0x40 beq _080FAA5E - ldr r3, _080FAA74 + ldr r3, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -512186,7 +494901,7 @@ sub_80FA9D0: @ 80FA9D0 strb r0, [r4, 0x5] adds r3, 0x1C adds r2, r3 - ldr r0, _080FAA78 + ldr r0, =sub_80FA9A4 + 1 str r0, [r2] movs r0, 0 strh r0, [r4, 0x2E] @@ -512196,11 +494911,7 @@ _080FAA5E: pop {r0} bx r0 .align 2, 0 -_080FAA68: .4byte 0x02037350 -_080FAA6C: .4byte 0x02037590 -_080FAA70: .4byte 0x085059f8 -_080FAA74: .4byte 0x02020630 -_080FAA78: .4byte sub_80FA9A4 + 1 + .pool thumb_func_end sub_80FA9D0 thumb_func_start sub_80FAA7C @@ -512213,7 +494924,7 @@ sub_80FAA7C: @ 80FAA7C mov r0, sp adds r1, r4, 0 bl player_get_pos_to_plus_one_step_in_direction_player_is_facing - ldr r1, _080FAAB8 + ldr r1, =0x02038c08 mov r0, sp movs r2, 0 ldrsh r0, [r0, r2] @@ -512232,7 +494943,7 @@ sub_80FAA7C: @ 80FAA7C beq _080FAAC6 b _080FAB8C .align 2, 0 -_080FAAB8: .4byte 0x02038c08 + .pool _080FAABC: cmp r0, 0x3 beq _080FAB2C @@ -512240,9 +494951,9 @@ _080FAABC: beq _080FAB64 b _080FAB8C _080FAAC6: - ldr r0, _080FAAF0 - ldr r3, _080FAAF4 - ldr r1, _080FAAF8 + ldr r0, =0x0858e68c + ldr r3, =0x02020630 + ldr r1, =0x02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 adds r2, r1 @@ -512261,13 +494972,11 @@ _080FAAC6: bl obj_add_from_template_forward_search b _080FAB8C .align 2, 0 -_080FAAF0: .4byte 0x0858e68c -_080FAAF4: .4byte 0x02020630 -_080FAAF8: .4byte 0x02037590 + .pool _080FAAFC: - ldr r0, _080FAB20 - ldr r3, _080FAB24 - ldr r1, _080FAB28 + ldr r0, =0x0858e68c + ldr r3, =0x02020630 + ldr r1, =0x02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 adds r2, r1 @@ -512283,13 +494992,11 @@ _080FAAFC: ldrb r2, [r2] b _080FAB4C .align 2, 0 -_080FAB20: .4byte 0x0858e68c -_080FAB24: .4byte 0x02020630 -_080FAB28: .4byte 0x02037590 + .pool _080FAB2C: - ldr r0, _080FAB54 - ldr r3, _080FAB58 - ldr r1, _080FAB5C + ldr r0, =0x0858e68c + ldr r3, =0x02020630 + ldr r1, =0x02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 adds r2, r1 @@ -512298,7 +495005,7 @@ _080FAB2C: ldrh r1, [r2, 0x2] lsls r1, 23 lsrs r1, 7 - ldr r3, _080FAB60 + ldr r3, =0xfff80000 adds r1, r3 asrs r1, 16 ldrb r2, [r2] @@ -512308,14 +495015,11 @@ _080FAB4C: bl obj_add_from_template_forward_search b _080FAB8C .align 2, 0 -_080FAB54: .4byte 0x0858e68c -_080FAB58: .4byte 0x02020630 -_080FAB5C: .4byte 0x02037590 -_080FAB60: .4byte 0xfff80000 + .pool _080FAB64: - ldr r0, _080FAB98 - ldr r3, _080FAB9C - ldr r1, _080FABA0 + ldr r0, =0x0858e68c + ldr r3, =0x02020630 + ldr r1, =0x02037590 ldrb r1, [r1, 0x4] lsls r2, r1, 4 adds r2, r1 @@ -512339,9 +495043,7 @@ _080FAB8C: pop {r1} bx r1 .align 2, 0 -_080FAB98: .4byte 0x0858e68c -_080FAB9C: .4byte 0x02020630 -_080FABA0: .4byte 0x02037590 + .pool thumb_func_end sub_80FAA7C thumb_func_start door_restore_tilemap @@ -512350,24 +495052,22 @@ door_restore_tilemap: @ 80FABA4 adds r5, r0, 0 movs r0, 0x83 bl audio_play - ldr r4, _080FABD0 + ldr r4, =0x02038c08 ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] subs r1, 0x1 bl cur_mapdata_get_blockid_at - ldr r1, _080FABD4 + ldr r1, =0x00000286 cmp r0, r1 bne _080FABDC ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] subs r1, 0x1 - ldr r2, _080FABD8 + ldr r2, =0x00000e02 bl setmaptile_0 b _080FABEA .align 2, 0 -_080FABD0: .4byte 0x02038c08 -_080FABD4: .4byte 0x00000286 -_080FABD8: .4byte 0x00000e02 + .pool _080FABDC: ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] @@ -512376,10 +495076,10 @@ _080FABDC: lsls r2, 2 bl setmaptile_0 _080FABEA: - ldr r4, _080FAC18 + ldr r4, =0x02038c08 ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] - ldr r2, _080FAC1C + ldr r2, =0x0000020a bl setmaptile_0 ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] @@ -512390,15 +495090,13 @@ _080FABEA: bl cur_mapdata_draw_block_at movs r0, 0 strh r0, [r5, 0x2E] - ldr r0, _080FAC20 + ldr r0, =sub_80FAC24 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FAC18: .4byte 0x02038c08 -_080FAC1C: .4byte 0x0000020a -_080FAC20: .4byte sub_80FAC24 + 1 + .pool thumb_func_end door_restore_tilemap thumb_func_start sub_80FAC24 @@ -512414,26 +495112,24 @@ sub_80FAC24: @ 80FAC24 strh r0, [r5, 0x2E] b _080FAC54 _080FAC38: - ldr r4, _080FAC5C + ldr r4, =0x02038c08 ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] - ldr r2, _080FAC60 + ldr r2, =0x00000e8c bl setmaptile_0 ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] bl cur_mapdata_draw_block_at movs r0, 0 strh r0, [r5, 0x2E] - ldr r0, _080FAC64 + ldr r0, =sub_80FAC68 + 1 str r0, [r5, 0x1C] _080FAC54: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FAC5C: .4byte 0x02038c08 -_080FAC60: .4byte 0x00000e8c -_080FAC64: .4byte sub_80FAC68 + 1 + .pool thumb_func_end sub_80FAC24 thumb_func_start sub_80FAC68 @@ -512462,7 +495158,7 @@ sub_80FAC78: @ 80FAC78 ldrsh r1, [r4, r2] bl cur_mapdata_get_blockid_at adds r1, r0, 0 - ldr r0, _080FACB0 + ldr r0, =0x000002f5 cmp r1, r0 beq _080FAD6C cmp r1, r0 @@ -512475,9 +495171,9 @@ sub_80FAC78: @ 80FAC78 beq _080FAD60 b _080FADCE .align 2, 0 -_080FACB0: .4byte 0x000002f5 + .pool _080FACB4: - ldr r0, _080FACF8 + ldr r0, =0x000002f6 cmp r1, r0 beq _080FADA4 adds r0, 0x40 @@ -512485,83 +495181,72 @@ _080FACB4: beq _080FACC2 b _080FADCE _080FACC2: - ldr r0, _080FACFC + ldr r0, =0x02021cc4 movs r1, 0x64 movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r0, _080FAD00 - ldr r1, _080FAD04 + ldr r0, =0x02021dc4 + ldr r1, =0x085ea88b bl gf_strcpy - ldr r1, _080FAD08 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080FAD0C + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080FADCE - ldr r4, _080FAD10 + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x10 b _080FAD8A .align 2, 0 -_080FACF8: .4byte 0x000002f6 -_080FACFC: .4byte 0x02021cc4 -_080FAD00: .4byte 0x02021dc4 -_080FAD04: .4byte 0x085ea88b -_080FAD08: .4byte 0x020375f0 -_080FAD0C: .4byte 0x00004054 -_080FAD10: .4byte 0x000040ee + .pool _080FAD14: - ldr r0, _080FAD48 + ldr r0, =0x02021cc4 movs r1, 0x32 movs r2, 0 movs r3, 0x2 bl decimal_int_to_string - ldr r0, _080FAD4C - ldr r1, _080FAD50 + ldr r0, =0x02021dc4 + ldr r1, =0x085ea890 bl gf_strcpy - ldr r1, _080FAD54 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _080FAD58 + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080FADCE - ldr r4, _080FAD5C + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 movs r0, 0x20 b _080FAD8A .align 2, 0 -_080FAD48: .4byte 0x02021cc4 -_080FAD4C: .4byte 0x02021dc4 -_080FAD50: .4byte 0x085ea890 -_080FAD54: .4byte 0x020375f0 -_080FAD58: .4byte 0x00004054 -_080FAD5C: .4byte 0x000040ee + .pool _080FAD60: - ldr r1, _080FAD68 + ldr r1, =0x020375f0 movs r0, 0x1 b _080FAD70 .align 2, 0 -_080FAD68: .4byte 0x020375f0 + .pool _080FAD6C: - ldr r1, _080FAD98 + ldr r1, =0x020375f0 movs r0, 0x2 _080FAD70: strh r0, [r1] - ldr r0, _080FAD9C + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080FADCE - ldr r4, _080FADA0 + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -512574,19 +495259,17 @@ _080FAD8A: bl var_set b _080FADCE .align 2, 0 -_080FAD98: .4byte 0x020375f0 -_080FAD9C: .4byte 0x00004054 -_080FADA0: .4byte 0x000040ee + .pool _080FADA4: - ldr r1, _080FADD8 + ldr r1, =0x020375f0 movs r0, 0x3 strh r0, [r1] - ldr r0, _080FADDC + ldr r0, =0x00004054 bl var_get lsls r0, 16 cmp r0, 0 beq _080FADCE - ldr r4, _080FADE0 + ldr r4, =0x000040ee adds r0, r4, 0 bl var_get adds r1, r0, 0 @@ -512602,9 +495285,7 @@ _080FADCE: pop {r0} bx r0 .align 2, 0 -_080FADD8: .4byte 0x020375f0 -_080FADDC: .4byte 0x00004054 -_080FADE0: .4byte 0x000040ee + .pool thumb_func_end sub_80FAC78 thumb_func_start sub_80FADE4 @@ -512621,26 +495302,25 @@ sub_80FADE4: @ 80FADE4 beq _080FAE28 cmp r5, 0 bne _080FAE1C - ldr r1, _080FAE14 + ldr r1, =0xfffffd7b adds r0, r4, r1 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 bls _080FAE10 - ldr r0, _080FAE18 + ldr r0, =0x00000237 cmp r4, r0 bne _080FAE28 _080FAE10: movs r0, 0x1 b _080FAE2A .align 2, 0 -_080FAE14: .4byte 0xfffffd7b -_080FAE18: .4byte 0x00000237 + .pool _080FAE1C: - ldr r0, _080FAE30 + ldr r0, =0x0000028d cmp r4, r0 beq _080FAE10 - ldr r0, _080FAE34 + ldr r0, =0x0000023f cmp r6, r0 beq _080FAE10 _080FAE28: @@ -512650,8 +495330,7 @@ _080FAE2A: pop {r1} bx r1 .align 2, 0 -_080FAE30: .4byte 0x0000028d -_080FAE34: .4byte 0x0000023f + .pool thumb_func_end sub_80FADE4 thumb_func_start task50_overworld_posion_effect @@ -512662,7 +495341,7 @@ task50_overworld_posion_effect: @ 80FAE38 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _080FAE5C + ldr r1, =0x03005e08 adds r1, r0, r1 movs r3, 0 ldrsh r0, [r1, r3] @@ -512674,7 +495353,7 @@ task50_overworld_posion_effect: @ 80FAE38 beq _080FAE66 b _080FAE92 .align 2, 0 -_080FAE5C: .4byte 0x03005e08 + .pool _080FAE60: cmp r0, 0x2 beq _080FAE8A @@ -512722,43 +495401,42 @@ overworld_posion_effect: @ 80FAEA8 push {lr} movs r0, 0x4F bl audio_play - ldr r0, _080FAEBC + ldr r0, =task50_overworld_posion_effect + 1 movs r1, 0x50 bl AddTask pop {r0} bx r0 .align 2, 0 -_080FAEBC: .4byte task50_overworld_posion_effect + 1 + .pool thumb_func_end overworld_posion_effect thumb_func_start c3_80A0DD8_is_running c3_80A0DD8_is_running: @ 80FAEC0 push {lr} - ldr r0, _080FAED0 + ldr r0, =task50_overworld_posion_effect + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_080FAED0: .4byte task50_overworld_posion_effect + 1 + .pool thumb_func_end c3_80A0DD8_is_running thumb_func_start sub_80FAED4 sub_80FAED4: @ 80FAED4 lsls r0, 24 lsrs r0, 24 - ldr r2, _080FAEE8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _080FAEEC + ldr r0, =sub_80FAEF0 + 1 str r0, [r1] bx lr .align 2, 0 -_080FAEE8: .4byte 0x03005e00 -_080FAEEC: .4byte sub_80FAEF0 + 1 + .pool thumb_func_end sub_80FAED4 thumb_func_start sub_80FAEF0 @@ -512766,12 +495444,12 @@ sub_80FAEF0: @ 80FAEF0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080FAF54 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080FAF58 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl npc_is_visible_or_is_x40 @@ -512797,22 +495475,19 @@ _080FAF1C: lsrs r1, 24 adds r0, r4, 0 bl npc_set_state_2 - ldr r1, _080FAF5C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _080FAF60 + ldr r1, =sub_80FAF64 + 1 str r1, [r0] _080FAF4E: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FAF54: .4byte 0x02037590 -_080FAF58: .4byte 0x02037350 -_080FAF5C: .4byte 0x03005e00 -_080FAF60: .4byte sub_80FAF64 + 1 + .pool thumb_func_end sub_80FAEF0 thumb_func_start sub_80FAF64 @@ -512820,19 +495495,19 @@ sub_80FAF64: @ 80FAF64 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080FAFB8 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080FAFBC + ldr r1, =0x02037350 adds r5, r0, r1 adds r0, r5, 0 bl sub_8093284 lsls r0, 24 cmp r0, 0 beq _080FAFC8 - ldr r1, _080FAFC0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -512855,18 +495530,16 @@ sub_80FAF64: @ 80FAF64 bl npc_set_state_2 b _080FAFC8 .align 2, 0 -_080FAFB8: .4byte 0x02037590 -_080FAFBC: .4byte 0x02037350 -_080FAFC0: .4byte 0x03005e00 + .pool _080FAFC4: - ldr r0, _080FAFD0 + ldr r0, =sub_80FAFD4 + 1 str r0, [r2] _080FAFC8: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FAFD0: .4byte sub_80FAFD4 + 1 + .pool thumb_func_end sub_80FAF64 thumb_func_start sub_80FAFD4 @@ -512890,21 +495563,21 @@ sub_80FAFD4: @ 80FAFD4 thumb_func_start sub_80FAFF8 sub_80FAFF8: @ 80FAFF8 push {lr} - ldr r0, _080FB008 + ldr r0, =sub_80FAED4 + 1 movs r1, 0x50 bl AddTask pop {r0} bx r0 .align 2, 0 -_080FB008: .4byte sub_80FAED4 + 1 + .pool thumb_func_end sub_80FAFF8 thumb_func_start sub_80FB00C sub_80FB00C: @ 80FB00C push {r4,r5,lr} - ldr r0, _080FB060 + ldr r0, =0x0858e864 bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _080FB064 + ldr r0, =0x0858e880 movs r1, 0 movs r2, 0 movs r3, 0x52 @@ -512916,7 +495589,7 @@ sub_80FB00C: @ 80FB00C lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r1, _080FB068 + ldr r1, =0x02020630 adds r4, r0, r1 adds r2, r4, 0 adds r2, 0x20 @@ -512940,9 +495613,7 @@ sub_80FB00C: @ 80FB00C adds r0, r5, 0 b _080FB06E .align 2, 0 -_080FB060: .4byte 0x0858e864 -_080FB064: .4byte 0x0858e880 -_080FB068: .4byte 0x02020630 + .pool _080FB06C: movs r0, 0x40 _080FB06E: @@ -512954,7 +495625,7 @@ _080FB06E: thumb_func_start sub_80FB074 sub_80FB074: @ 80FB074 push {r4-r7,lr} - ldr r4, _080FB0A8 + ldr r4, =0x02020630 adds r7, r4, 0 movs r6, 0 movs r5, 0x3F @@ -512963,7 +495634,7 @@ _080FB07E: adds r0, 0x14 adds r0, r6, r0 ldr r1, [r0] - ldr r0, _080FB0AC + ldr r0, =0x0858e880 cmp r1, r0 bne _080FB098 adds r0, r4, 0 @@ -512980,8 +495651,7 @@ _080FB098: pop {r0} bx r0 .align 2, 0 -_080FB0A8: .4byte 0x02020630 -_080FB0AC: .4byte 0x0858e880 + .pool thumb_func_end sub_80FB074 thumb_func_start sub_80FB0B0 @@ -513038,13 +495708,13 @@ sub_80FB0F8: @ 80FB0F8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080FB19C + ldr r0, =0x03005e08 adds r5, r1, r0 movs r1, 0 ldrsh r0, [r5, r1] adds r0, 0x1E bl sub_80FB0DC - ldr r4, _080FB1A0 + ldr r4, =0x03005d8c ldr r2, [r4] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -513064,7 +495734,7 @@ sub_80FB0F8: @ 80FB0F8 ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] lsls r0, 17 - ldr r3, _080FB1A4 + ldr r3, =0xfffd0000 adds r0, r3 asrs r0, 16 str r0, [sp] @@ -513089,7 +495759,7 @@ sub_80FB0F8: @ 80FB0F8 adds r0, 0x1 strh r0, [r5] lsls r0, 16 - ldr r1, _080FB1A8 + ldr r1, =0x75300000 cmp r0, r1 bne _080FB180 strh r4, [r5] @@ -513107,10 +495777,7 @@ _080FB180: pop {r0} bx r0 .align 2, 0 -_080FB19C: .4byte 0x03005e08 -_080FB1A0: .4byte 0x03005d8c -_080FB1A4: .4byte 0xfffd0000 -_080FB1A8: .4byte 0x75300000 + .pool thumb_func_end sub_80FB0F8 thumb_func_start sub_80FB1AC @@ -513122,7 +495789,7 @@ sub_80FB1AC: @ 80FB1AC lsls r0, r2, 2 adds r0, r2 lsls r3, r0, 3 - ldr r4, _080FB1EC + ldr r4, =0x03005e08 adds r7, r3, r4 ldrh r1, [r7] adds r1, 0x1 @@ -513147,9 +495814,9 @@ _080FB1DC: bl remove_task b _080FB2A8 .align 2, 0 -_080FB1EC: .4byte 0x03005e08 + .pool _080FB1F0: - ldr r2, _080FB2B0 + ldr r2, =0x0858e898 movs r1, 0x2 ldrsh r0, [r7, r1] adds r0, r2 @@ -513161,7 +495828,7 @@ _080FB1F0: adds r0, r4, 0 subs r0, 0x8 adds r0, r3, r0 - ldr r1, _080FB2B4 + ldr r1, =sub_80FB2C0 + 1 str r1, [r0] _080FB20C: movs r4, 0x2 @@ -513185,7 +495852,7 @@ _080FB20C: ldrsh r0, [r7, r4] adds r0, 0x1E bl sub_80FB0DC - ldr r6, _080FB2B8 + ldr r6, =0x03005d8c ldr r2, [r6] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -513211,7 +495878,7 @@ _080FB20C: lsls r3, 16 asrs r3, 16 lsls r0, 17 - ldr r4, _080FB2BC + ldr r4, =0xfffd0000 adds r0, r4 asrs r0, 16 str r0, [sp] @@ -513240,10 +495907,7 @@ _080FB2A8: pop {r0} bx r0 .align 2, 0 -_080FB2B0: .4byte 0x0858e898 -_080FB2B4: .4byte sub_80FB2C0 + 1 -_080FB2B8: .4byte 0x03005d8c -_080FB2BC: .4byte 0xfffd0000 + .pool thumb_func_end sub_80FB1AC thumb_func_start sub_80FB2C0 @@ -513258,7 +495922,7 @@ sub_80FB2C0: @ 80FB2C0 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _080FB300 + ldr r1, =0x03005e08 adds r2, r0, r1 ldrh r0, [r2] adds r0, 0x1 @@ -513280,9 +495944,9 @@ _080FB2F0: bl remove_task b _080FB358 .align 2, 0 -_080FB300: .4byte 0x03005e08 + .pool _080FB304: - ldr r1, _080FB364 + ldr r1, =0x0858e898 movs r3, 0x2 ldrsh r0, [r2, r3] adds r0, r1 @@ -513292,7 +495956,7 @@ _080FB304: ldrsb r6, [r0, r6] adds r0, r6, 0 bl sub_808A2CC - ldr r5, _080FB368 + ldr r5, =0x03005d8c ldr r0, [r5] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -513328,8 +495992,7 @@ _080FB358: pop {r0} bx r0 .align 2, 0 -_080FB364: .4byte 0x0858e898 -_080FB368: .4byte 0x03005d8c + .pool thumb_func_end sub_80FB2C0 thumb_func_start sub_80FB36C @@ -513340,7 +496003,7 @@ sub_80FB36C: @ 80FB36C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080FB390 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -513349,13 +496012,12 @@ sub_80FB36C: @ 80FB36C b _080FB4D8 _080FB386: lsls r0, 2 - ldr r1, _080FB394 + ldr r1, =_080FB398 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FB390: .4byte 0x03005e08 -_080FB394: .4byte _080FB398 + .pool .align 2, 0 _080FB398: .4byte _080FB3B0 @@ -513378,7 +496040,7 @@ _080FB3C0: bl sub_808A2C0 movs r0, 0 strh r0, [r4, 0x2] - ldr r0, _080FB3E4 + ldr r0, =sub_80FB0F8 + 1 movs r1, 0xA bl AddTask lsls r0, 24 @@ -513390,7 +496052,7 @@ _080FB3C0: bl audio_play b _080FB4D8 .align 2, 0 -_080FB3E4: .4byte sub_80FB0F8 + 1 + .pool _080FB3E8: ldrh r0, [r4, 0x2] adds r0, 0x1 @@ -513409,7 +496071,7 @@ _080FB404: ldrh r0, [r4, 0x2] adds r3, r0, 0x1 strh r3, [r4, 0x2] - ldr r0, _080FB448 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -513425,7 +496087,7 @@ _080FB404: strh r2, [r4, 0x2] ldrb r0, [r4, 0x4] bl remove_task - ldr r0, _080FB44C + ldr r0, =sub_80FB1AC + 1 movs r1, 0xA bl AddTask lsls r0, 24 @@ -513437,10 +496099,9 @@ _080FB404: bl audio_play b _080FB4D8 .align 2, 0 -_080FB448: .4byte 0x02037fd4 -_080FB44C: .4byte sub_80FB1AC + 1 + .pool _080FB450: - ldr r2, _080FB470 + ldr r2, =0x03005e00 movs r0, 0x6 ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -513456,7 +496117,7 @@ _080FB450: strh r0, [r4] b _080FB4D8 .align 2, 0 -_080FB470: .4byte 0x03005e00 + .pool _080FB474: ldrh r0, [r4, 0x2] adds r0, 0x1 @@ -513511,15 +496172,15 @@ _080FB4D8: sub_80FB4E0: @ 80FB4E0 push {lr} sub sp, 0x4 - ldr r2, _080FB528 + ldr r2, =0x0000020d movs r0, 0xB movs r1, 0x8 bl setmaptile_0 - ldr r2, _080FB52C + ldr r2, =0x00000215 movs r0, 0xB movs r1, 0x9 bl setmaptile_0 - ldr r2, _080FB530 + ldr r2, =0x0000021d movs r0, 0xB movs r1, 0xA bl setmaptile_0 @@ -513527,36 +496188,31 @@ sub_80FB4E0: @ 80FB4E0 bl script_env_2_enable movs r0, 0 str r0, [sp] - ldr r1, _080FB534 - ldr r2, _080FB538 + ldr r1, =0x02037b14 + ldr r2, =0x01000100 mov r0, sp bl CpuFastSet - ldr r0, _080FB53C + ldr r0, =sub_80FB36C + 1 movs r1, 0xA bl AddTask add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_080FB528: .4byte 0x0000020d -_080FB52C: .4byte 0x00000215 -_080FB530: .4byte 0x0000021d -_080FB534: .4byte 0x02037b14 -_080FB538: .4byte 0x01000100 -_080FB53C: .4byte sub_80FB36C + 1 + .pool thumb_func_end sub_80FB4E0 thumb_func_start sub_80FB540 sub_80FB540: @ 80FB540 push {r4-r6,lr} sub sp, 0x4 - ldr r0, _080FB594 + ldr r0, =sub_80FB36C + 1 bl is_function_an_active_task lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 bne _080FB58A - ldr r4, _080FB598 + ldr r4, =0x03005d8c ldr r0, [r4] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -513587,8 +496243,7 @@ _080FB58A: pop {r0} bx r0 .align 2, 0 -_080FB594: .4byte sub_80FB36C + 1 -_080FB598: .4byte 0x03005d8c + .pool thumb_func_end sub_80FB540 thumb_func_start sub_80FB59C @@ -513641,12 +496296,12 @@ sub_80FB5E8: @ 80FB5E8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080FB618 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r0, _080FB61C + ldr r0, =0x000040b4 bl var_get_pointer adds r7, r0, 0 - ldr r0, _080FB620 + ldr r0, =0x03005d8c ldr r3, [r0] adds r6, r3, 0x4 movs r0, 0 @@ -513659,9 +496314,7 @@ sub_80FB5E8: @ 80FB5E8 beq _080FB62E b _080FB6E2 .align 2, 0 -_080FB618: .4byte 0x03005e08 -_080FB61C: .4byte 0x000040b4 -_080FB620: .4byte 0x03005d8c + .pool _080FB624: cmp r2, 0x2 beq _080FB68A @@ -513669,7 +496322,7 @@ _080FB624: beq _080FB6C4 b _080FB6E2 _080FB62E: - ldr r0, _080FB644 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -513680,9 +496333,9 @@ _080FB62E: strh r0, [r4] b _080FB6E2 .align 2, 0 -_080FB644: .4byte 0x02037fd4 + .pool _080FB648: - ldr r0, _080FB67C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] adds r0, r2, 0 ands r0, r1 @@ -513707,7 +496360,7 @@ _080FB656: movs r0, 0x9 b _080FB682 .align 2, 0 -_080FB67C: .4byte 0x030022c0 + .pool _080FB680: movs r0, 0xA _080FB682: @@ -513731,14 +496384,14 @@ _080FB698: bne _080FB6AC ldrb r1, [r6, 0x1] ldrb r2, [r6] - ldr r3, _080FB6A8 + ldr r3, =0x0858e8ab b _080FB6B2 .align 2, 0 -_080FB6A8: .4byte 0x0858e8ab + .pool _080FB6AC: ldrb r1, [r6, 0x1] ldrb r2, [r6] - ldr r3, _080FB6C0 + ldr r3, =0x0858e8ad _080FB6B2: movs r0, 0xFF bl exec_movement @@ -513746,9 +496399,9 @@ _080FB6B2: strh r0, [r4] b _080FB6E2 .align 2, 0 -_080FB6C0: .4byte 0x0858e8ad + .pool _080FB6C4: - ldr r0, _080FB6E8 + ldr r0, =0x00004001 bl flag_clear movs r0, 0x80 lsls r0, 7 @@ -513763,14 +496416,14 @@ _080FB6E2: pop {r0} bx r0 .align 2, 0 -_080FB6E8: .4byte 0x00004001 + .pool thumb_func_end sub_80FB5E8 thumb_func_start sub_80FB6EC sub_80FB6EC: @ 80FB6EC push {r4,lr} sub sp, 0x4 - ldr r1, _080FB740 + ldr r1, =nullsub_12 + 1 movs r0, 0 str r0, [sp] movs r0, 0x8C @@ -513779,7 +496432,7 @@ sub_80FB6EC: @ 80FB6EC bl sub_808DD68 lsls r0, 24 lsrs r0, 24 - ldr r2, _080FB744 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -513791,7 +496444,7 @@ sub_80FB6EC: @ 80FB6EC negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _080FB748 + ldr r0, =0x000040b4 bl var_get lsls r0, 16 lsrs r0, 16 @@ -513806,9 +496459,7 @@ sub_80FB6EC: @ 80FB6EC bl obj_anim_image_start b _080FB75E .align 2, 0 -_080FB740: .4byte nullsub_12 + 1 -_080FB744: .4byte 0x02020630 -_080FB748: .4byte 0x000040b4 + .pool _080FB74C: movs r0, 0x3 bl npc_direction_to_obj_anim_image_number @@ -513828,8 +496479,8 @@ _080FB75E: sub_80FB768: @ 80FB768 push {lr} bl sub_80FB6EC - ldr r2, _080FB798 - ldr r0, _080FB79C + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -513840,29 +496491,27 @@ sub_80FB768: @ 80FB768 orrs r1, r2 strb r1, [r0, 0x1] bl pal_fill_black - ldr r0, _080FB7A0 + ldr r0, =sub_80FB5E8 + 1 movs r1, 0x50 bl AddTask bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_080FB798: .4byte 0x02037350 -_080FB79C: .4byte 0x02037590 -_080FB7A0: .4byte sub_80FB5E8 + 1 + .pool thumb_func_end sub_80FB768 thumb_func_start sub_80FB7A4 sub_80FB7A4: @ 80FB7A4 push {lr} - ldr r0, _080FB7DC + ldr r0, =0x0000088d bl flag_set - ldr r0, _080FB7E0 + ldr r0, =0x00004001 bl flag_set movs r0, 0x80 lsls r0, 7 bl flag_set - ldr r0, _080FB7E4 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -513877,15 +496526,13 @@ sub_80FB7A4: @ 80FB7A4 pop {r0} bx r0 .align 2, 0 -_080FB7DC: .4byte 0x0000088d -_080FB7E0: .4byte 0x00004001 -_080FB7E4: .4byte 0x03005d8c + .pool thumb_func_end sub_80FB7A4 thumb_func_start sub_80FB7E8 sub_80FB7E8: @ 80FB7E8 push {lr} - ldr r0, _080FB7FC + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0x86 @@ -513895,15 +496542,15 @@ sub_80FB7E8: @ 80FB7E8 movs r0, 0x1 b _080FB812 .align 2, 0 -_080FB7FC: .4byte 0x03005d8c + .pool _080FB800: - ldr r0, _080FB80C + ldr r0, =0x0000081d cmp r1, r0 beq _080FB810 movs r0, 0 b _080FB812 .align 2, 0 -_080FB80C: .4byte 0x0000081d + .pool _080FB810: movs r0, 0x2 _080FB812: @@ -513919,11 +496566,11 @@ sub_80FB818: @ 80FB818 bl var_get_pointer adds r5, r0, 0 movs r3, 0 - ldr r4, _080FB84C + ldr r4, =0x0203a048 ldrb r0, [r4] cmp r3, r0 bge _080FB844 - ldr r6, _080FB850 + ldr r6, =0x0203a044 _080FB830: adds r2, r5, r3 ldr r1, [r6] @@ -513940,8 +496587,7 @@ _080FB844: pop {r0} bx r0 .align 2, 0 -_080FB84C: .4byte 0x0203a048 -_080FB850: .4byte 0x0203a044 + .pool thumb_func_end sub_80FB818 thumb_func_start sub_80FB854 @@ -514027,26 +496673,24 @@ sub_80FB8CC: @ 80FB8CC beq _080FB8F8 b _080FB914 _080FB8E0: - ldr r1, _080FB8EC - ldr r0, _080FB8F0 + ldr r1, =0x0203a044 + ldr r0, =0x0858e8b0 str r0, [r1] - ldr r1, _080FB8F4 + ldr r1, =0x0203a048 movs r0, 0x8 b _080FB902 .align 2, 0 -_080FB8EC: .4byte 0x0203a044 -_080FB8F0: .4byte 0x0858e8b0 -_080FB8F4: .4byte 0x0203a048 + .pool _080FB8F8: - ldr r1, _080FB918 - ldr r0, _080FB91C + ldr r1, =0x0203a044 + ldr r0, =0x0858e8f0 str r0, [r1] - ldr r1, _080FB920 + ldr r1, =0x0203a048 movs r0, 0xB _080FB902: strb r0, [r1] movs r1, 0 - ldr r3, _080FB924 + ldr r3, =0x0203a038 movs r2, 0x40 _080FB90A: adds r0, r1, r3 @@ -514058,10 +496702,7 @@ _080FB914: pop {r0} bx r0 .align 2, 0 -_080FB918: .4byte 0x0203a044 -_080FB91C: .4byte 0x0858e8f0 -_080FB920: .4byte 0x0203a048 -_080FB924: .4byte 0x0203a038 + .pool thumb_func_end sub_80FB8CC thumb_func_start sub_80FB928 @@ -514078,7 +496719,7 @@ sub_80FB928: @ 80FB928 lsls r1, 16 lsrs r1, 16 mov r10, r1 - ldr r0, _080FB9EC + ldr r0, =0x03005d8c ldr r2, [r0] ldrh r1, [r2] subs r0, r1, 0x2 @@ -514097,7 +496738,7 @@ sub_80FB928: @ 80FB928 lsrs r1, 16 mov r8, r1 movs r5, 0 - ldr r0, _080FB9F0 + ldr r0, =0x0203a048 ldrb r0, [r0] cmp r5, r0 bcs _080FB9DA @@ -514106,7 +496747,7 @@ sub_80FB928: @ 80FB928 lsls r0, r3, 16 asrs r6, r0, 16 _080FB976: - ldr r0, _080FB9F4 + ldr r0, =0x0203a044 ldr r0, [r0] lsls r1, r5, 3 adds r1, r0 @@ -514134,7 +496775,7 @@ _080FB976: asrs r0, 16 cmp r0, r1 blt _080FB9CC - ldr r0, _080FB9F8 + ldr r0, =0x0203a038 adds r4, r5, r0 ldrb r0, [r4] cmp r0, 0x40 @@ -514152,7 +496793,7 @@ _080FB9CC: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080FB9F0 + ldr r0, =0x0203a048 ldrb r0, [r0] cmp r5, r0 bcc _080FB976 @@ -514166,10 +496807,7 @@ _080FB9DA: pop {r0} bx r0 .align 2, 0 -_080FB9EC: .4byte 0x03005d8c -_080FB9F0: .4byte 0x0203a048 -_080FB9F4: .4byte 0x0203a044 -_080FB9F8: .4byte 0x0203a038 + .pool thumb_func_end sub_80FB928 thumb_func_start sub_80FB9FC @@ -514185,7 +496823,7 @@ sub_80FB9FC: @ 80FB9FC lsls r2, 16 lsrs r2, 16 mov r8, r2 - ldr r0, _080FBA2C + ldr r0, =0x0203a044 lsls r1, r6, 3 ldr r0, [r0] adds r4, r0, r1 @@ -514196,14 +496834,13 @@ sub_80FB9FC: @ 80FB9FC bne _080FBA34 _080FBA24: mov r1, sp - ldr r0, _080FBA30 + ldr r0, =0x08591fe0 b _080FBA38 .align 2, 0 -_080FBA2C: .4byte 0x0203a044 -_080FBA30: .4byte 0x08591fe0 + .pool _080FBA34: mov r1, sp - ldr r0, _080FBACC + ldr r0, =0x08591fc8 _080FBA38: ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} @@ -514232,7 +496869,7 @@ _080FBA38: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r2, _080FBAD0 + ldr r2, =0x02020630 adds r4, r2 strh r6, [r4, 0x2E] movs r2, 0x3E @@ -514275,8 +496912,7 @@ _080FBA38: adds r0, r5, 0 b _080FBAD6 .align 2, 0 -_080FBACC: .4byte 0x08591fc8 -_080FBAD0: .4byte 0x02020630 + .pool _080FBAD4: movs r0, 0x40 _080FBAD6: @@ -514370,7 +497006,7 @@ sub_80FBB64: @ 80FBB64 adds r0, 0x28 movs r2, 0 ldrsb r2, [r0, r2] - ldr r0, _080FBBF8 + ldr r0, =0x02021bbc adds r2, r1 ldrh r0, [r0] adds r2, r0 @@ -514384,7 +497020,7 @@ sub_80FBB64: @ 80FBB64 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 - ldr r3, _080FBBFC + ldr r3, =0x02021bbe adds r0, r1 ldrh r3, [r3] adds r0, r3 @@ -514433,19 +497069,18 @@ _080FBBF2: pop {r0} bx r0 .align 2, 0 -_080FBBF8: .4byte 0x02021bbc -_080FBBFC: .4byte 0x02021bbe + .pool thumb_func_end sub_80FBB64 thumb_func_start overworld_free_bgmaps overworld_free_bgmaps: @ 80FBC00 push {lr} - ldr r0, _080FBC0C + ldr r0, =0x08591d58 bl gpu_tile_obj_alloc_and_load_multiple pop {r0} bx r0 .align 2, 0 -_080FBC0C: .4byte 0x08591d58 + .pool thumb_func_end overworld_free_bgmaps thumb_func_start sub_80FBC10 @@ -514455,7 +497090,7 @@ sub_80FBC10: @ 80FBC10 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _080FBC44 + ldr r0, =0x03005d8c ldr r2, [r0] ldrh r1, [r2] subs r0, r1, 0x2 @@ -514477,9 +497112,9 @@ sub_80FBC10: @ 80FBC10 movs r6, 0 b _080FBCB6 .align 2, 0 -_080FBC44: .4byte 0x03005d8c + .pool _080FBC48: - ldr r0, _080FBCCC + ldr r0, =0x0203a044 ldr r0, [r0] lsls r1, r6, 3 adds r1, r0 @@ -514491,7 +497126,7 @@ _080FBC48: adds r0, 0x7 lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _080FBCD0 + ldr r0, =0x0203a038 adds r0, r6, r0 ldrb r0, [r0] cmp r0, 0x40 @@ -514518,13 +497153,13 @@ _080FBC48: cmp r2, r0 ble _080FBCB4 _080FBC94: - ldr r0, _080FBCD0 + ldr r0, =0x0203a038 adds r5, r6, r0 ldrb r0, [r5] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080FBCD4 + ldr r0, =0x02020630 adds r4, r0 adds r0, r4, 0 bl obj_free_rotscale_entry @@ -514535,7 +497170,7 @@ _080FBC94: _080FBCB4: adds r6, 0x1 _080FBCB6: - ldr r0, _080FBCD8 + ldr r0, =0x0203a048 ldrb r0, [r0] cmp r6, r0 blt _080FBC48 @@ -514547,10 +497182,7 @@ _080FBCB6: pop {r0} bx r0 .align 2, 0 -_080FBCCC: .4byte 0x0203a044 -_080FBCD0: .4byte 0x0203a038 -_080FBCD4: .4byte 0x02020630 -_080FBCD8: .4byte 0x0203a048 + .pool thumb_func_end sub_80FBC10 thumb_func_start sub_80FBCDC @@ -514565,11 +497197,11 @@ sub_80FBCDC: @ 80FBCDC lsrs r4, r0, 24 cmp r1, 0x1 bne _080FBCFC - ldr r0, _080FBCF8 + ldr r0, =0x08592058 mov r10, r0 b _080FBD08 .align 2, 0 -_080FBCF8: .4byte 0x08592058 + .pool _080FBCFC: cmp r1, 0x2 beq _080FBD04 @@ -514577,7 +497209,7 @@ _080FBD00: movs r0, 0 b _080FBD98 _080FBD04: - ldr r1, _080FBDA8 + ldr r1, =0x08592038 mov r10, r1 _080FBD08: adds r0, r4, 0 @@ -514585,7 +497217,7 @@ _080FBD08: lsls r0, 24 lsrs r0, 24 str r0, [sp] - ldr r0, _080FBDAC + ldr r0, =0x0203a044 ldr r1, [r0] lsls r0, r4, 3 adds r0, r1 @@ -514611,7 +497243,7 @@ _080FBD38: adds r5, r7, 0 ldr r1, [sp, 0x4] adds r0, r1 - ldr r2, _080FBDB0 + ldr r2, =0x08592078 adds r4, r0, r2 _080FBD4A: adds r0, r5, 0 @@ -514664,9 +497296,7 @@ _080FBD98: pop {r1} bx r1 .align 2, 0 -_080FBDA8: .4byte 0x08592038 -_080FBDAC: .4byte 0x0203a044 -_080FBDB0: .4byte 0x08592078 + .pool thumb_func_end sub_80FBCDC thumb_func_start sub_80FBDB4 @@ -514693,12 +497323,12 @@ _080FBDDA: asrs r0, 2 lsls r0, 2 subs r0, r1, r0 - ldr r1, _080FBE00 + ldr r1, =0x0203a044 ldr r2, [r1] lsls r1, r6, 3 adds r1, r2 ldrb r1, [r1, 0x4] - ldr r2, _080FBE04 + ldr r2, =0x08592078 lsls r0, 24 asrs r0, 23 adds r0, r5 @@ -514710,8 +497340,7 @@ _080FBDDA: pop {r1} bx r1 .align 2, 0 -_080FBE00: .4byte 0x0203a044 -_080FBE04: .4byte 0x08592078 + .pool thumb_func_end sub_80FBDB4 thumb_func_start sub_80FBE08 @@ -514719,7 +497348,7 @@ sub_80FBE08: @ 80FBE08 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _080FBE34 + ldr r0, =0x0203a038 adds r2, r3, r0 ldrb r0, [r2] cmp r0, 0x40 @@ -514727,7 +497356,7 @@ sub_80FBE08: @ 80FBE08 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080FBE38 + ldr r0, =0x02020630 adds r4, r0 strh r1, [r4, 0x30] adds r0, r3, 0 @@ -514738,8 +497367,7 @@ _080FBE2C: pop {r0} bx r0 .align 2, 0 -_080FBE34: .4byte 0x0203a038 -_080FBE38: .4byte 0x02020630 + .pool thumb_func_end sub_80FBE08 thumb_func_start sub_80FBE3C @@ -514754,31 +497382,31 @@ sub_80FBE3C: @ 80FBE3C lsrs r2, 16 cmp r0, 0x2 bne _080FBE58 - ldr r3, _080FBE54 + ldr r3, =0x08591ff8 b _080FBE7A .align 2, 0 -_080FBE54: .4byte 0x08591ff8 + .pool _080FBE58: cmp r0, 0x1 bne _080FBE64 - ldr r3, _080FBE60 + ldr r3, =0x08592008 b _080FBE7A .align 2, 0 -_080FBE60: .4byte 0x08592008 + .pool _080FBE64: cmp r0, 0x3 bne _080FBE70 - ldr r3, _080FBE6C + ldr r3, =0x08592018 b _080FBE7A .align 2, 0 -_080FBE6C: .4byte 0x08592018 + .pool _080FBE70: cmp r3, 0x4 beq _080FBE78 movs r0, 0xFF b _080FBE88 _080FBE78: - ldr r3, _080FBE8C + ldr r3, =0x08592028 _080FBE7A: lsls r0, r2, 16 lsls r1, 16 @@ -514791,7 +497419,7 @@ _080FBE88: pop {r1} bx r1 .align 2, 0 -_080FBE8C: .4byte 0x08592028 + .pool thumb_func_end sub_80FBE3C thumb_func_start sub_80FBE90 @@ -514873,14 +497501,14 @@ _080FBF12: b _080FBFC2 _080FBF24: movs r6, 0 - ldr r0, _080FBFB0 + ldr r0, =0x0203a048 ldrb r0, [r0] cmp r6, r0 bge _080FBFC2 lsls r0, r4, 16 asrs r7, r0, 16 _080FBF32: - ldr r0, _080FBFB4 + ldr r0, =0x0203a044 ldr r1, [r0] lsls r0, r6, 3 adds r0, r1 @@ -514940,11 +497568,10 @@ _080FBF32: movs r0, 0x1 b _080FBFC4 .align 2, 0 -_080FBFB0: .4byte 0x0203a048 -_080FBFB4: .4byte 0x0203a044 + .pool _080FBFB8: adds r6, 0x1 - ldr r0, _080FBFD0 + ldr r0, =0x0203a048 ldrb r0, [r0] cmp r6, r0 blt _080FBF32 @@ -514958,7 +497585,7 @@ _080FBFC4: pop {r1} bx r1 .align 2, 0 -_080FBFD0: .4byte 0x0203a048 + .pool thumb_func_end sub_80FBEF0 thumb_func_start sub_80FBFD4 @@ -514984,14 +497611,14 @@ _080FBFF6: b _080FC08C _080FBFFA: movs r6, 0 - ldr r0, _080FC098 + ldr r0, =0x0203a048 ldrb r0, [r0] cmp r6, r0 bge _080FC08A lsls r0, r4, 16 asrs r7, r0, 16 _080FC008: - ldr r0, _080FC09C + ldr r0, =0x0203a044 ldr r1, [r0] lsls r0, r6, 3 adds r0, r1 @@ -515050,7 +497677,7 @@ _080FC008: beq _080FBFF6 _080FC080: adds r6, 0x1 - ldr r0, _080FC098 + ldr r0, =0x0203a048 ldrb r0, [r0] cmp r6, r0 blt _080FC008 @@ -515064,43 +497691,42 @@ _080FC08C: pop {r1} bx r1 .align 2, 0 -_080FC098: .4byte 0x0203a048 -_080FC09C: .4byte 0x0203a044 + .pool thumb_func_end sub_80FBFD4 thumb_func_start flag_check_is_in_safari_zone flag_check_is_in_safari_zone: @ 80FC0A0 push {lr} - ldr r0, _080FC0B0 + ldr r0, =0x0000088c bl flag_check lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_080FC0B0: .4byte 0x0000088c + .pool thumb_func_end flag_check_is_in_safari_zone thumb_func_start sub_80FC0B4 sub_80FC0B4: @ 80FC0B4 push {lr} - ldr r0, _080FC0C0 + ldr r0, =0x0000088c bl flag_set pop {r0} bx r0 .align 2, 0 -_080FC0C0: .4byte 0x0000088c + .pool thumb_func_end sub_80FC0B4 thumb_func_start flag_clear_is_in_safari_zone flag_clear_is_in_safari_zone: @ 80FC0C4 push {lr} - ldr r0, _080FC0D0 + ldr r0, =0x0000088c bl flag_clear pop {r0} bx r0 .align 2, 0 -_080FC0D0: .4byte 0x0000088c + .pool thumb_func_end flag_clear_is_in_safari_zone thumb_func_start sub_80FC0D4 @@ -515110,51 +497736,45 @@ sub_80FC0D4: @ 80FC0D4 bl sav12_xor_increment bl sub_80FC0B4 bl sub_80FC244 - ldr r1, _080FC104 + ldr r1, =0x0203a04c movs r0, 0x1E strb r0, [r1] - ldr r1, _080FC108 + ldr r1, =0x0203a04e movs r2, 0xFA lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - ldr r0, _080FC10C + ldr r0, =0x0203a050 movs r1, 0 strb r1, [r0] - ldr r0, _080FC110 + ldr r0, =0x0203a051 strb r1, [r0] pop {r0} bx r0 .align 2, 0 -_080FC104: .4byte 0x0203a04c -_080FC108: .4byte 0x0203a04e -_080FC10C: .4byte 0x0203a050 -_080FC110: .4byte 0x0203a051 + .pool thumb_func_end sub_80FC0D4 thumb_func_start sub_80FC114 sub_80FC114: @ 80FC114 push {lr} - ldr r0, _080FC13C + ldr r0, =0x0203a050 ldrb r0, [r0] - ldr r1, _080FC140 + ldr r1, =0x0203a051 ldrb r1, [r1] bl sub_80EE44C bl flag_clear_is_in_safari_zone bl sub_80FC244 - ldr r1, _080FC144 + ldr r1, =0x0203a04c movs r0, 0 strb r0, [r1] - ldr r1, _080FC148 + ldr r1, =0x0203a04e movs r0, 0 strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_080FC13C: .4byte 0x0203a050 -_080FC140: .4byte 0x0203a051 -_080FC144: .4byte 0x0203a04c -_080FC148: .4byte 0x0203a04e + .pool thumb_func_end sub_80FC114 thumb_func_start safari_step @@ -515164,7 +497784,7 @@ safari_step: @ 80FC14C cmp r0, 0 beq _080FC168 bl sub_80FC480 - ldr r1, _080FC16C + ldr r1, =0x0203a04e ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] @@ -515175,93 +497795,84 @@ _080FC168: movs r0, 0 b _080FC178 .align 2, 0 -_080FC16C: .4byte 0x0203a04e + .pool _080FC170: - ldr r0, _080FC17C + ldr r0, =0x082a4b8a bl script_env_1_execute_new_script movs r0, 0x1 _080FC178: pop {r1} bx r1 .align 2, 0 -_080FC17C: .4byte 0x082a4b8a + .pool thumb_func_end safari_step thumb_func_start sub_80FC180 sub_80FC180: @ 80FC180 push {lr} - ldr r0, _080FC18C + ldr r0, =0x082a4b6f bl script_env_1_execute_new_script pop {r0} bx r0 .align 2, 0 -_080FC18C: .4byte 0x082a4b6f + .pool thumb_func_end sub_80FC180 thumb_func_start sub_80FC190 sub_80FC190: @ 80FC190 push {lr} - ldr r1, _080FC1C0 - ldr r0, _080FC1C4 + ldr r1, =0x0203a051 + ldr r0, =0x03005d10 ldrb r0, [r0, 0x1F] ldrb r2, [r1] adds r0, r2 strb r0, [r1] - ldr r2, _080FC1C8 + ldr r2, =0x0202433a ldrb r0, [r2] cmp r0, 0x7 bne _080FC1AE - ldr r1, _080FC1CC + ldr r1, =0x0203a050 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] _080FC1AE: - ldr r0, _080FC1D0 + ldr r0, =0x0203a04c ldrb r0, [r0] cmp r0, 0 beq _080FC1D8 - ldr r0, _080FC1D4 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 b _080FC21C .align 2, 0 -_080FC1C0: .4byte 0x0203a051 -_080FC1C4: .4byte 0x03005d10 -_080FC1C8: .4byte 0x0202433a -_080FC1CC: .4byte 0x0203a050 -_080FC1D0: .4byte 0x0203a04c -_080FC1D4: .4byte c2_exit_to_overworld_2_switch + 1 + .pool _080FC1D8: ldrb r0, [r2] cmp r0, 0x8 bne _080FC208 - ldr r0, _080FC1F8 + ldr r0, =0x082a4b4c bl script_env_2_execute_new_script bl warp_in - ldr r1, _080FC1FC - ldr r0, _080FC200 + ldr r1, =0x03005dac + ldr r0, =sub_80AF6F0 + 1 str r0, [r1] - ldr r0, _080FC204 + ldr r0, =c2_load_new_map + 1 bl set_callback2 b _080FC21C .align 2, 0 -_080FC1F8: .4byte 0x082a4b4c -_080FC1FC: .4byte 0x03005dac -_080FC200: .4byte sub_80AF6F0 + 1 -_080FC204: .4byte c2_load_new_map + 1 + .pool _080FC208: cmp r0, 0x7 bne _080FC21C - ldr r0, _080FC220 + ldr r0, =0x082a4b9b bl script_env_1_execute_new_script bl script_env_2_set_ctx_paused - ldr r0, _080FC224 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 _080FC21C: pop {r0} bx r0 .align 2, 0 -_080FC220: .4byte 0x082a4b9b -_080FC224: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_80FC190 thumb_func_start sub_80FC228 @@ -515269,7 +497880,7 @@ sub_80FC228: @ 80FC228 push {lr} lsls r0, 24 lsrs r0, 20 - ldr r1, _080FC240 + ldr r1, =0x0203a054 adds r0, r1 movs r1, 0 movs r2, 0x10 @@ -515277,20 +497888,20 @@ sub_80FC228: @ 80FC228 pop {r0} bx r0 .align 2, 0 -_080FC240: .4byte 0x0203a054 + .pool thumb_func_end sub_80FC228 thumb_func_start sub_80FC244 sub_80FC244: @ 80FC244 push {lr} - ldr r0, _080FC254 + ldr r0, =0x0203a054 movs r1, 0 movs r2, 0xA0 bl memset pop {r0} bx r0 .align 2, 0 -_080FC254: .4byte 0x0203a054 + .pool thumb_func_end sub_80FC244 thumb_func_start sub_80FC258 @@ -515304,9 +497915,9 @@ sub_80FC258: @ 80FC258 bl player_get_pos_to_plus_one_step_in_direction_player_is_facing movs r5, 0 _080FC26A: - ldr r0, _080FC2B0 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r1, _080FC2B4 + ldr r1, =0x0203a054 lsls r0, r5, 4 adds r3, r0, r1 movs r1, 0x5 @@ -515328,30 +497939,26 @@ _080FC26A: ldrsh r0, [r4, r2] cmp r1, r0 bne _080FC2C4 - ldr r0, _080FC2B8 + ldr r0, =0x020375f0 strh r5, [r0] - ldr r1, _080FC2BC + ldr r1, =0x085b262c ldrb r0, [r3, 0x8] lsls r0, 2 adds r0, r1 ldr r1, [r0] - ldr r0, _080FC2C0 + ldr r0, =0x02021cc4 bl gf_strcpy b _080FC2D6 .align 2, 0 -_080FC2B0: .4byte 0x03005d8c -_080FC2B4: .4byte 0x0203a054 -_080FC2B8: .4byte 0x020375f0 -_080FC2BC: .4byte 0x085b262c -_080FC2C0: .4byte 0x02021cc4 + .pool _080FC2C4: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x9 bls _080FC26A - ldr r1, _080FC2E0 - ldr r2, _080FC2E4 + ldr r1, =0x020375f0 + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] _080FC2D6: @@ -515360,8 +497967,7 @@ _080FC2D6: pop {r0} bx r0 .align 2, 0 -_080FC2E0: .4byte 0x020375f0 -_080FC2E4: .4byte 0x0000ffff + .pool thumb_func_end sub_80FC258 thumb_func_start sub_80FC2E8 @@ -515375,10 +497981,10 @@ sub_80FC2E8: @ 80FC2E8 bl player_get_pos_to movs r5, 0 adds r6, r4, 0 - ldr r0, _080FC358 + ldr r0, =0x03005d8c ldr r7, [r0] mov r4, sp - ldr r0, _080FC35C + ldr r0, =0x0203a054 mov r12, r0 _080FC306: lsls r0, r5, 4 @@ -515420,21 +498026,19 @@ _080FC342: adds r0, r1 cmp r0, 0x5 bgt _080FC364 - ldr r0, _080FC360 + ldr r0, =0x020375f0 strh r5, [r0] b _080FC376 .align 2, 0 -_080FC358: .4byte 0x03005d8c -_080FC35C: .4byte 0x0203a054 -_080FC360: .4byte 0x020375f0 + .pool _080FC364: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x9 bls _080FC306 - ldr r1, _080FC380 - ldr r2, _080FC384 + ldr r1, =0x020375f0 + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] _080FC376: @@ -515443,28 +498047,25 @@ _080FC376: pop {r0} bx r0 .align 2, 0 -_080FC380: .4byte 0x020375f0 -_080FC384: .4byte 0x0000ffff + .pool thumb_func_end sub_80FC2E8 thumb_func_start sub_80FC388 sub_80FC388: @ 80FC388 push {lr} bl sub_80FC258 - ldr r2, _080FC3A4 + ldr r2, =0x020375f0 ldrh r1, [r2] - ldr r0, _080FC3A8 + ldr r0, =0x0000ffff cmp r1, r0 beq _080FC3B0 adds r0, r1, 0 lsls r0, 4 - ldr r1, _080FC3AC + ldr r1, =0x0203a05c adds r0, r1 b _080FC3B2 .align 2, 0 -_080FC3A4: .4byte 0x020375f0 -_080FC3A8: .4byte 0x0000ffff -_080FC3AC: .4byte 0x0203a05c + .pool _080FC3B0: movs r0, 0 _080FC3B2: @@ -515476,20 +498077,18 @@ _080FC3B2: sub_80FC3B8: @ 80FC3B8 push {lr} bl sub_80FC2E8 - ldr r2, _080FC3D4 + ldr r2, =0x020375f0 ldrh r1, [r2] - ldr r0, _080FC3D8 + ldr r0, =0x0000ffff cmp r1, r0 beq _080FC3E0 adds r0, r1, 0 lsls r0, 4 - ldr r1, _080FC3DC + ldr r1, =0x0203a05c adds r0, r1 b _080FC3E2 .align 2, 0 -_080FC3D4: .4byte 0x020375f0 -_080FC3D8: .4byte 0x0000ffff -_080FC3DC: .4byte 0x0203a05c + .pool _080FC3E0: movs r0, 0 _080FC3E2: @@ -515508,13 +498107,13 @@ sub_80FC3E8: @ 80FC3E8 lsrs r0, 24 mov r8, r0 movs r1, 0 - ldr r2, _080FC45C + ldr r2, =0x0203a054 mov r6, sp adds r6, 0x2 movs r0, 0x8 adds r0, r2 mov r9, r0 - ldr r7, _080FC460 + ldr r7, =0x03005d8c _080FC408: lsls r5, r1, 4 adds r4, r5, r2 @@ -515541,7 +498140,7 @@ _080FC408: ldr r0, [r7] mov r3, r8 lsls r1, r3, 3 - ldr r3, _080FC464 + ldr r3, =0x00000848 adds r0, r3 adds r0, r1 ldr r1, [r0, 0x4] @@ -515557,9 +498156,7 @@ _080FC408: strh r0, [r4, 0x2] b _080FC472 .align 2, 0 -_080FC45C: .4byte 0x0203a054 -_080FC460: .4byte 0x03005d8c -_080FC464: .4byte 0x00000848 + .pool _080FC468: adds r0, r1, 0x1 lsls r0, 24 @@ -515580,7 +498177,7 @@ _080FC472: sub_80FC480: @ 80FC480 push {r4,r5,lr} movs r4, 0 - ldr r5, _080FC4B0 + ldr r5, =0x0203a054 _080FC486: lsls r0, r4, 4 adds r1, r0, r5 @@ -515604,20 +498201,20 @@ _080FC4A0: pop {r0} bx r0 .align 2, 0 -_080FC4B0: .4byte 0x0203a054 + .pool thumb_func_end sub_80FC480 thumb_func_start sub_80FC4B4 sub_80FC4B4: @ 80FC4B4 push {lr} bl sub_80FC258 - ldr r3, _080FC4DC + ldr r3, =0x020375f0 ldrh r1, [r3] - ldr r0, _080FC4E0 + ldr r0, =0x0000ffff cmp r1, r0 beq _080FC4EC - ldr r0, _080FC4E4 - ldr r2, _080FC4E8 + ldr r0, =0x02021dc4 + ldr r2, =0x0203a054 lsls r1, 4 adds r1, r2 ldrb r1, [r1, 0x5] @@ -515627,10 +498224,7 @@ sub_80FC4B4: @ 80FC4B4 movs r0, 0x1 b _080FC4EE .align 2, 0 -_080FC4DC: .4byte 0x020375f0 -_080FC4E0: .4byte 0x0000ffff -_080FC4E4: .4byte 0x02021dc4 -_080FC4E8: .4byte 0x0203a054 + .pool _080FC4EC: movs r0, 0 _080FC4EE: @@ -515644,7 +498238,7 @@ sub_80FC4F4: @ 80FC4F4 adds r2, r0, 0 lsls r4, r1, 16 lsrs r4, 16 - ldr r5, _080FC524 + ldr r5, =0x0201c000 adds r0, r5, 0 adds r1, r2, 0 adds r2, r4, 0 @@ -515661,7 +498255,7 @@ sub_80FC4F4: @ 80FC4F4 movs r0, 0 b _080FC52A .align 2, 0 -_080FC524: .4byte 0x0201c000 + .pool _080FC528: movs r0, 0x1 _080FC52A: @@ -515722,9 +498316,9 @@ sub_80FC580: @ 80FC580 lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r5, _080FC5B4 - ldr r6, _080FC5B8 - ldr r4, _080FC5BC + ldr r5, =0x03005e00 + ldr r6, =sub_80FC5C0 + 1 + ldr r4, =0x020223c4 movs r3, 0xFF _080FC590: lsls r0, r1, 8 @@ -515746,26 +498340,23 @@ _080FC590: pop {r0} bx r0 .align 2, 0 -_080FC5B4: .4byte 0x03005e00 -_080FC5B8: .4byte sub_80FC5C0 + 1 -_080FC5BC: .4byte 0x020223c4 + .pool thumb_func_end sub_80FC580 thumb_func_start sub_80FC5C0 sub_80FC5C0: @ 80FC5C0 lsls r0, 24 lsrs r0, 24 - ldr r2, _080FC5D4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _080FC5D8 + ldr r0, =sub_80FC5DC + 1 str r0, [r1] bx lr .align 2, 0 -_080FC5D4: .4byte 0x03005e00 -_080FC5D8: .4byte sub_80FC5DC + 1 + .pool thumb_func_end sub_80FC5C0 thumb_func_start sub_80FC5DC @@ -515773,20 +498364,20 @@ sub_80FC5DC: @ 80FC5DC push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _080FC658 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _080FC650 bl link_get_multiplayer_id - ldr r1, _080FC65C + ldr r1, =0x02039f25 strb r0, [r1] bl sub_8009FCC - ldr r4, _080FC660 + ldr r4, =0x02039f30 strb r0, [r4] - ldr r1, _080FC664 + ldr r1, =0x02039f2a movs r0, 0x1 strb r0, [r1] - ldr r0, _080FC668 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 bne _080FC60C @@ -515797,7 +498388,7 @@ _080FC60C: ldrb r2, [r4] cmp r3, r2 bge _080FC64A - ldr r1, _080FC66C + ldr r1, =0x020229e8 ldrb r0, [r1] subs r0, 0x1 adds r6, r4, 0 @@ -515821,7 +498412,7 @@ _080FC63A: ldrb r6, [r6] cmp r3, r6 bge _080FC64A - ldr r0, _080FC664 + ldr r0, =0x02039f2a ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 @@ -515834,19 +498425,14 @@ _080FC650: pop {r0} bx r0 .align 2, 0 -_080FC658: .4byte 0x03003124 -_080FC65C: .4byte 0x02039f25 -_080FC660: .4byte 0x02039f30 -_080FC664: .4byte 0x02039f2a -_080FC668: .4byte 0x030030fc -_080FC66C: .4byte 0x020229e8 + .pool thumb_func_end sub_80FC5DC thumb_func_start sub_80FC670 sub_80FC670: @ 80FC670 push {r4,lr} adds r4, r0, 0 - ldr r0, _080FC69C + ldr r0, =0x02039f2a ldrb r1, [r0] movs r0, 0x4 ands r0, r1 @@ -515867,7 +498453,7 @@ _080FC698: movs r0, 0x1 b _080FC6B6 .align 2, 0 -_080FC69C: .4byte 0x02039f2a + .pool _080FC6A0: bl sub_800A520 lsls r0, 24 @@ -515896,7 +498482,7 @@ sub_80FC6BC: @ 80FC6BC lsls r6, r7, 2 adds r0, r6, r7 lsls r4, r0, 3 - ldr r5, _080FC6F4 + ldr r5, =0x03005e08 adds r0, r4, r5 adds r0, 0x18 bl sub_80FC670 @@ -515917,7 +498503,7 @@ _080FC6DC: beq _080FC6FE b _080FC7DC .align 2, 0 -_080FC6F4: .4byte 0x03005e08 + .pool _080FC6F8: cmp r0, 0xA beq _080FC7C0 @@ -515931,11 +498517,11 @@ _080FC6FE: lsls r0, 24 cmp r0, 0 beq _080FC7F4 - ldr r0, _080FC72C - ldr r1, _080FC730 + ldr r0, =0x020228c4 + ldr r1, =0x02039f25 ldrb r1, [r1] lsls r1, 6 - ldr r2, _080FC734 + ldr r2, =0x02039e00 adds r1, r2 movs r2, 0x40 bl memcpy @@ -515943,41 +498529,37 @@ _080FC6FE: strh r0, [r4, 0x8] b _080FC7F4 .align 2, 0 -_080FC72C: .4byte 0x020228c4 -_080FC730: .4byte 0x02039f25 -_080FC734: .4byte 0x02039e00 + .pool _080FC738: - ldr r0, _080FC74C - ldr r1, _080FC750 + ldr r0, =0x020228c4 + ldr r1, =0x02039f25 ldrb r1, [r1] lsls r1, 6 - ldr r2, _080FC754 + ldr r2, =0x02039e00 adds r1, r2 movs r2, 0x40 bl memcpy b _080FC7D6 .align 2, 0 -_080FC74C: .4byte 0x020228c4 -_080FC750: .4byte 0x02039f25 -_080FC754: .4byte 0x02039e00 + .pool _080FC758: bl sub_80FC55C lsls r0, 24 cmp r0, 0 beq _080FC7F4 movs r5, 0 - ldr r0, _080FC7AC + ldr r0, =0x02039f30 mov r8, r6 ldrb r0, [r0] cmp r5, r0 bge _080FC798 - ldr r6, _080FC7B0 + ldr r6, =0x020229e8 _080FC770: lsls r4, r5, 6 - ldr r0, _080FC7B4 + ldr r0, =0x02039e00 adds r4, r0 lsls r1, r5, 8 - ldr r0, _080FC7B8 + ldr r0, =0x020223c4 adds r1, r0 adds r0, r4, 0 movs r2, 0x40 @@ -515987,12 +498569,12 @@ _080FC770: bl sub_80DFA08 adds r6, 0x1C adds r5, 0x1 - ldr r0, _080FC7AC + ldr r0, =0x02039f30 ldrb r0, [r0] cmp r5, r0 blt _080FC770 _080FC798: - ldr r0, _080FC7BC + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -516002,11 +498584,7 @@ _080FC798: strh r0, [r1, 0x8] b _080FC7F4 .align 2, 0 -_080FC7AC: .4byte 0x02039f30 -_080FC7B0: .4byte 0x020229e8 -_080FC7B4: .4byte 0x02039e00 -_080FC7B8: .4byte 0x020223c4 -_080FC7BC: .4byte 0x03005e00 + .pool _080FC7C0: ldrh r0, [r4, 0x1E] adds r0, 0x1 @@ -516023,7 +498601,7 @@ _080FC7D6: strh r0, [r4, 0x8] b _080FC7F4 _080FC7DC: - ldr r0, _080FC800 + ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -516041,7 +498619,7 @@ _080FC7F4: pop {r0} bx r0 .align 2, 0 -_080FC800: .4byte 0x03005e00 + .pool thumb_func_end sub_80FC6BC thumb_func_start sub_80FC804 @@ -516049,7 +498627,7 @@ sub_80FC804: @ 80FC804 push {r4,r5,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080FC82C + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -516066,7 +498644,7 @@ sub_80FC804: @ 80FC804 bl set_task_function_to_args_14_15 b _080FC880 .align 2, 0 -_080FC82C: .4byte 0x03005e00 + .pool _080FC830: bl link_get_multiplayer_id lsls r0, 24 @@ -516076,26 +498654,26 @@ _080FC830: lsls r0, 24 cmp r0, 0 beq _080FC880 - ldr r0, _080FC854 + ldr r0, =0x03005d80 movs r1, 0x4 bl sub_80FC4F4 cmp r0, 0x1 bne _080FC880 b _080FC87A .align 2, 0 -_080FC854: .4byte 0x03005d80 + .pool _080FC858: movs r0, 0 bl sub_80FC530 lsls r0, 24 cmp r0, 0 beq _080FC880 - ldr r0, _080FC888 - ldr r4, _080FC88C + ldr r0, =0x03005d80 + ldr r4, =0x020223c4 adds r1, r4, 0 movs r2, 0x4 bl memcpy - ldr r0, _080FC890 + ldr r0, =0x030060b8 adds r1, r4, 0 movs r2, 0x4 bl memcpy @@ -516108,9 +498686,7 @@ _080FC880: pop {r0} bx r0 .align 2, 0 -_080FC888: .4byte 0x03005d80 -_080FC88C: .4byte 0x020223c4 -_080FC890: .4byte 0x030060b8 + .pool thumb_func_end sub_80FC804 thumb_func_start sub_80FC894 @@ -516125,7 +498701,7 @@ sub_80FC894: @ 80FC894 mov r8, r0 adds r0, r6 lsls r5, r0, 3 - ldr r7, _080FC8D4 + ldr r7, =0x03005e08 adds r0, r5, r7 adds r0, 0x18 bl sub_80FC670 @@ -516146,13 +498722,13 @@ sub_80FC894: @ 80FC894 beq _080FC8DE b _080FC96E .align 2, 0 -_080FC8D4: .4byte 0x03005e08 + .pool _080FC8D8: cmp r0, 0xA beq _080FC954 b _080FC96E _080FC8DE: - ldr r1, _080FC900 + ldr r1, =0x020228c4 ldrh r0, [r4, 0x1A] strb r0, [r1] bl link_get_multiplayer_id @@ -516167,7 +498743,7 @@ _080FC8DE: strh r0, [r4, 0x8] b _080FC986 .align 2, 0 -_080FC900: .4byte 0x020228c4 + .pool _080FC904: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -516179,11 +498755,11 @@ _080FC90C: cmp r0, 0 beq _080FC986 movs r3, 0 - ldr r1, _080FC94C + ldr r1, =0x02039f30 ldrb r0, [r1] cmp r3, r0 bge _080FC93A - ldr r4, _080FC950 + ldr r4, =0x020223c4 adds r0, r7, 0x2 adds r2, r5, r0 movs r5, 0x80 @@ -516207,8 +498783,7 @@ _080FC93A: strh r0, [r1, 0x8] b _080FC986 .align 2, 0 -_080FC94C: .4byte 0x02039f30 -_080FC950: .4byte 0x020223c4 + .pool _080FC954: ldrh r0, [r4, 0x1E] adds r0, 0x1 @@ -516223,7 +498798,7 @@ _080FC954: strh r0, [r4, 0x8] b _080FC986 _080FC96E: - ldr r0, _080FC994 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -516242,7 +498817,7 @@ _080FC986: pop {r0} bx r0 .align 2, 0 -_080FC994: .4byte 0x03005e00 + .pool thumb_func_end sub_80FC894 thumb_func_start sub_80FC998 @@ -516250,7 +498825,7 @@ sub_80FC998: @ 80FC998 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080FC9C0 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -516267,20 +498842,20 @@ sub_80FC998: @ 80FC998 bl set_task_function_to_args_14_15 b _080FC9F0 .align 2, 0 -_080FC9C0: .4byte 0x03005e00 + .pool _080FC9C4: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _080FC9F0 - ldr r0, _080FC9DC + ldr r0, =0x02039f25 movs r1, 0x1 bl sub_80FC4F4 cmp r0, 0x1 bne _080FC9F0 b _080FC9EA .align 2, 0 -_080FC9DC: .4byte 0x02039f25 + .pool _080FC9E0: bl sub_80FC55C lsls r0, 24 @@ -516304,7 +498879,7 @@ sub_80FC9F8: @ 80FC9F8 push {r6,r7} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080FCA2C + ldr r0, =0x03005e00 mov r8, r0 lsls r7, r5, 2 adds r0, r7, r5 @@ -516323,15 +498898,15 @@ sub_80FC9F8: @ 80FC9F8 bl set_task_function_to_args_14_15 b _080FCAB2 .align 2, 0 -_080FCA2C: .4byte 0x03005e00 + .pool _080FCA30: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _080FCAB2 - ldr r0, _080FCA60 + ldr r0, =0x02039f34 ldr r2, [r0] - ldr r0, _080FCA64 + ldr r0, =0x02039f25 ldrb r0, [r0] lsls r1, r0, 3 subs r1, r0 @@ -516348,23 +498923,22 @@ _080FCA30: strh r0, [r4, 0x8] b _080FCAB2 .align 2, 0 -_080FCA60: .4byte 0x02039f34 -_080FCA64: .4byte 0x02039f25 + .pool _080FCA68: bl sub_80FC55C lsls r0, 24 cmp r0, 0 beq _080FCAB2 movs r2, 0 - ldr r6, _080FCAC0 + ldr r6, =0x02039f30 mov r9, r8 mov r12, r7 ldrb r0, [r6] cmp r2, r0 bge _080FCAA4 - ldr r1, _080FCAC4 + ldr r1, =0x02039f34 mov r8, r1 - ldr r4, _080FCAC8 + ldr r4, =0x020223c4 movs r3, 0 movs r7, 0x80 lsls r7, 1 @@ -516397,9 +498971,7 @@ _080FCAB2: pop {r0} bx r0 .align 2, 0 -_080FCAC0: .4byte 0x02039f30 -_080FCAC4: .4byte 0x02039f34 -_080FCAC8: .4byte 0x020223c4 + .pool thumb_func_end sub_80FC9F8 thumb_func_start sub_80FCACC @@ -516407,7 +498979,7 @@ sub_80FCACC: @ 80FCACC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080FCAF4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -516420,13 +498992,12 @@ sub_80FCACC: @ 80FCACC b _080FCC78 _080FCAE8: lsls r0, 2 - ldr r1, _080FCAF8 + ldr r1, =_080FCAFC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FCAF4: .4byte 0x03005e00 -_080FCAF8: .4byte _080FCAFC + .pool .align 2, 0 _080FCAFC: .4byte _080FCB2C @@ -516448,11 +499019,11 @@ _080FCB2C: bne _080FCB38 b _080FCC82 _080FCB38: - ldr r0, _080FCB40 + ldr r0, =0x02039f08 movs r1, 0x8 b _080FCC16 .align 2, 0 -_080FCB40: .4byte 0x02039f08 + .pool _080FCB44: bl sub_80FC55C lsls r0, 24 @@ -516460,18 +499031,16 @@ _080FCB44: bne _080FCB50 b _080FCC82 _080FCB50: - ldr r0, _080FCB60 - ldr r1, _080FCB64 + ldr r0, =0x02039f08 + ldr r1, =0x02039f2b ldrb r1, [r1] lsls r1, 8 - ldr r2, _080FCB68 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x8 b _080FCC50 .align 2, 0 -_080FCB60: .4byte 0x02039f08 -_080FCB64: .4byte 0x02039f2b -_080FCB68: .4byte 0x020223c4 + .pool _080FCB6C: lsls r0, r4, 2 adds r0, r4 @@ -516497,67 +499066,63 @@ _080FCB90: lsls r0, 24 cmp r0, 0 beq _080FCC82 - ldr r0, _080FCBA0 + ldr r0, =0x02039f10 movs r1, 0x8 b _080FCC16 .align 2, 0 -_080FCBA0: .4byte 0x02039f10 + .pool _080FCBA4: bl sub_80FC55C lsls r0, 24 cmp r0, 0 beq _080FCC82 - ldr r0, _080FCBC0 - ldr r1, _080FCBC4 + ldr r0, =0x02039f10 + ldr r1, =0x02039f2b ldrb r1, [r1] lsls r1, 8 - ldr r2, _080FCBC8 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x8 b _080FCC50 .align 2, 0 -_080FCBC0: .4byte 0x02039f10 -_080FCBC4: .4byte 0x02039f2b -_080FCBC8: .4byte 0x020223c4 + .pool _080FCBCC: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _080FCC82 - ldr r0, _080FCBDC + ldr r0, =0x02039f18 movs r1, 0x8 b _080FCC16 .align 2, 0 -_080FCBDC: .4byte 0x02039f18 + .pool _080FCBE0: bl sub_80FC55C lsls r0, 24 cmp r0, 0 beq _080FCC82 - ldr r0, _080FCBFC - ldr r1, _080FCC00 + ldr r0, =0x02039f18 + ldr r1, =0x02039f2b ldrb r1, [r1] lsls r1, 8 - ldr r2, _080FCC04 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x8 b _080FCC50 .align 2, 0 -_080FCBFC: .4byte 0x02039f18 -_080FCC00: .4byte 0x02039f2b -_080FCC04: .4byte 0x020223c4 + .pool _080FCC08: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _080FCC82 - ldr r0, _080FCC30 + ldr r0, =0x02039f20 movs r1, 0x4 _080FCC16: bl sub_80FC4F4 cmp r0, 0x1 bne _080FCC82 - ldr r0, _080FCC34 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -516567,23 +499132,22 @@ _080FCC16: strh r0, [r1, 0x8] b _080FCC82 .align 2, 0 -_080FCC30: .4byte 0x02039f20 -_080FCC34: .4byte 0x03005e00 + .pool _080FCC38: bl sub_80FC55C lsls r0, 24 cmp r0, 0 beq _080FCC82 - ldr r0, _080FCC68 - ldr r1, _080FCC6C + ldr r0, =0x02039f20 + ldr r1, =0x02039f2b ldrb r1, [r1] lsls r1, 8 - ldr r2, _080FCC70 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x4 _080FCC50: bl memcpy - ldr r1, _080FCC74 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -516593,10 +499157,7 @@ _080FCC50: strh r1, [r0, 0x8] b _080FCC82 .align 2, 0 -_080FCC68: .4byte 0x02039f20 -_080FCC6C: .4byte 0x02039f2b -_080FCC70: .4byte 0x020223c4 -_080FCC74: .4byte 0x03005e00 + .pool _080FCC78: movs r0, 0 strh r0, [r2, 0x8] @@ -516613,7 +499174,7 @@ sub_80FCC88: @ 80FCC88 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080FCCB0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -516626,13 +499187,12 @@ sub_80FCC88: @ 80FCC88 b _080FCE38 _080FCCA4: lsls r0, 2 - ldr r1, _080FCCB4 + ldr r1, =_080FCCB8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FCCB0: .4byte 0x03005e00 -_080FCCB4: .4byte _080FCCB8 + .pool .align 2, 0 _080FCCB8: .4byte _080FCCE8 @@ -516654,13 +499214,13 @@ _080FCCE8: bne _080FCCF4 b _080FCE42 _080FCCF4: - ldr r0, _080FCD00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x4] movs r1, 0x70 b _080FCDD6 .align 2, 0 -_080FCD00: .4byte 0x02039f34 + .pool _080FCD04: bl sub_80FC55C lsls r0, 24 @@ -516668,20 +499228,18 @@ _080FCD04: bne _080FCD10 b _080FCE42 _080FCD10: - ldr r0, _080FCD24 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x4] - ldr r1, _080FCD28 + ldr r1, =0x02039f2b ldrb r1, [r1] lsls r1, 8 - ldr r2, _080FCD2C + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x70 b _080FCE10 .align 2, 0 -_080FCD24: .4byte 0x02039f34 -_080FCD28: .4byte 0x02039f2b -_080FCD2C: .4byte 0x020223c4 + .pool _080FCD30: lsls r0, r4, 2 adds r0, r4 @@ -516707,67 +499265,65 @@ _080FCD54: lsls r0, 24 cmp r0, 0 beq _080FCE42 - ldr r0, _080FCD68 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] movs r1, 0x14 b _080FCDD6 .align 2, 0 -_080FCD68: .4byte 0x02039f34 + .pool _080FCD6C: bl sub_80FC55C lsls r0, 24 cmp r0, 0 beq _080FCE42 - ldr r0, _080FCD8C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] - ldr r1, _080FCD90 + ldr r1, =0x02039f2b ldrb r1, [r1] lsls r1, 8 - ldr r2, _080FCD94 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x14 b _080FCE10 .align 2, 0 -_080FCD8C: .4byte 0x02039f34 -_080FCD90: .4byte 0x02039f2b -_080FCD94: .4byte 0x020223c4 + .pool _080FCD98: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _080FCE42 - ldr r0, _080FCDAC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x10] b _080FCDD4 .align 2, 0 -_080FCDAC: .4byte 0x02039f34 + .pool _080FCDB0: bl sub_80FC55C lsls r0, 24 cmp r0, 0 beq _080FCE42 - ldr r0, _080FCDC4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x10] b _080FCE04 .align 2, 0 -_080FCDC4: .4byte 0x02039f34 + .pool _080FCDC8: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _080FCE42 - ldr r0, _080FCDF0 + ldr r0, =0x02039f26 _080FCDD4: movs r1, 0x4 _080FCDD6: bl sub_80FC4F4 cmp r0, 0x1 bne _080FCE42 - ldr r0, _080FCDF4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -516777,24 +499333,23 @@ _080FCDD6: strh r0, [r1, 0x8] b _080FCE42 .align 2, 0 -_080FCDF0: .4byte 0x02039f26 -_080FCDF4: .4byte 0x03005e00 + .pool _080FCDF8: bl sub_80FC55C lsls r0, 24 cmp r0, 0 beq _080FCE42 - ldr r0, _080FCE28 + ldr r0, =0x02039f26 _080FCE04: - ldr r1, _080FCE2C + ldr r1, =0x02039f2b ldrb r1, [r1] lsls r1, 8 - ldr r2, _080FCE30 + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x4 _080FCE10: bl memcpy - ldr r1, _080FCE34 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -516804,10 +499359,7 @@ _080FCE10: strh r1, [r0, 0x8] b _080FCE42 .align 2, 0 -_080FCE28: .4byte 0x02039f26 -_080FCE2C: .4byte 0x02039f2b -_080FCE30: .4byte 0x020223c4 -_080FCE34: .4byte 0x03005e00 + .pool _080FCE38: movs r0, 0 strh r0, [r2, 0x8] @@ -516831,7 +499383,7 @@ sub_80FCE48: @ 80FCE48 mov r8, r0 adds r0, r6 lsls r5, r0, 3 - ldr r7, _080FCE88 + ldr r7, =0x03005e08 adds r0, r5, r7 adds r0, 0x18 bl sub_80FC670 @@ -516852,13 +499404,13 @@ sub_80FCE48: @ 80FCE48 beq _080FCE92 b _080FCF16 .align 2, 0 -_080FCE88: .4byte 0x03005e08 + .pool _080FCE8C: cmp r0, 0xA beq _080FCEFC b _080FCF16 _080FCE92: - ldr r1, _080FCEB4 + ldr r1, =0x020228c4 movs r0, 0x6E strb r0, [r1] bl link_get_multiplayer_id @@ -516873,7 +499425,7 @@ _080FCE92: strh r0, [r4, 0x8] b _080FCF2E .align 2, 0 -_080FCEB4: .4byte 0x020228c4 + .pool _080FCEB8: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -516886,7 +499438,7 @@ _080FCEC0: beq _080FCF2E mov r1, r8 mov r8, r9 - ldr r4, _080FCEF8 + ldr r4, =0x020223c4 adds r0, r7, 0 adds r0, 0xA adds r2, r5, r0 @@ -516909,7 +499461,7 @@ _080FCEDC: strh r0, [r1, 0x8] b _080FCF2E .align 2, 0 -_080FCEF8: .4byte 0x020223c4 + .pool _080FCEFC: ldrh r0, [r4, 0x1E] adds r0, 0x1 @@ -516924,7 +499476,7 @@ _080FCEFC: strh r0, [r4, 0x8] b _080FCF2E _080FCF16: - ldr r0, _080FCF3C + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -516943,7 +499495,7 @@ _080FCF2E: pop {r0} bx r0 .align 2, 0 -_080FCF3C: .4byte 0x03005e00 + .pool thumb_func_end sub_80FCE48 thumb_func_start sub_80FCF40 @@ -516954,7 +499506,7 @@ sub_80FCF40: @ 80FCF40 lsls r0, r5, 2 adds r0, r5 lsls r4, r0, 3 - ldr r6, _080FCF7C + ldr r6, =0x03005e08 adds r0, r4, r6 adds r0, 0x18 bl sub_80FC670 @@ -516976,30 +499528,30 @@ sub_80FCF40: @ 80FCF40 bl set_task_function_to_args_14_15 b _080FCFBE .align 2, 0 -_080FCF7C: .4byte 0x03005e08 + .pool _080FCF80: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _080FCFBE - ldr r0, _080FCF98 + ldr r0, =0x02039f00 movs r1, 0x8 bl sub_80FC4F4 cmp r0, 0x1 bne _080FCFBE b _080FCFB8 .align 2, 0 -_080FCF98: .4byte 0x02039f00 + .pool _080FCF9C: bl sub_80FC55C lsls r0, 24 cmp r0, 0 beq _080FCFBE - ldr r0, _080FCFC4 - ldr r1, _080FCFC8 + ldr r0, =0x02039f00 + ldr r1, =0x02039f2b ldrb r1, [r1] lsls r1, 8 - ldr r2, _080FCFCC + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x8 bl memcpy @@ -517012,9 +499564,7 @@ _080FCFBE: pop {r0} bx r0 .align 2, 0 -_080FCFC4: .4byte 0x02039f00 -_080FCFC8: .4byte 0x02039f2b -_080FCFCC: .4byte 0x020223c4 + .pool thumb_func_end sub_80FCF40 thumb_func_start sub_80FCFD0 @@ -517025,7 +499575,7 @@ sub_80FCFD0: @ 80FCFD0 lsls r0, r5, 2 adds r0, r5 lsls r4, r0, 3 - ldr r6, _080FD00C + ldr r6, =0x03005e08 adds r0, r4, r6 adds r0, 0x18 bl sub_80FC670 @@ -517047,30 +499597,30 @@ sub_80FCFD0: @ 80FCFD0 bl set_task_function_to_args_14_15 b _080FD04E .align 2, 0 -_080FD00C: .4byte 0x03005e08 + .pool _080FD010: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _080FD04E - ldr r0, _080FD028 + ldr r0, =0x02039f26 movs r1, 0x4 bl sub_80FC4F4 cmp r0, 0x1 bne _080FD04E b _080FD048 .align 2, 0 -_080FD028: .4byte 0x02039f26 + .pool _080FD02C: bl sub_80FC55C lsls r0, 24 cmp r0, 0 beq _080FD04E - ldr r0, _080FD054 - ldr r1, _080FD058 + ldr r0, =0x02039f26 + ldr r1, =0x02039f2b ldrb r1, [r1] lsls r1, 8 - ldr r2, _080FD05C + ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x4 bl memcpy @@ -517083,9 +499633,7 @@ _080FD04E: pop {r0} bx r0 .align 2, 0 -_080FD054: .4byte 0x02039f26 -_080FD058: .4byte 0x02039f2b -_080FD05C: .4byte 0x020223c4 + .pool thumb_func_end sub_80FCFD0 thumb_func_start sub_80FD060 @@ -517093,11 +499641,11 @@ sub_80FD060: @ 80FD060 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _080FD07C + ldr r1, =0x0203ce7c ldrh r0, [r1] cmp r0, 0xAF bne _080FD084 - ldr r0, _080FD080 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -517105,8 +499653,7 @@ sub_80FD060: @ 80FD060 ldrb r0, [r1, 0x10] b _080FD08A .align 2, 0 -_080FD07C: .4byte 0x0203ce7c -_080FD080: .4byte 0x03005e00 + .pool _080FD084: ldrh r0, [r1] bl itemid_get_type @@ -517118,9 +499665,9 @@ _080FD08A: lsls r0, 24 cmp r0, 0 bne _080FD0B8 - ldr r0, _080FD0B0 + ldr r0, =0x0203ce54 ldr r2, [r0] - ldr r1, _080FD0B4 + ldr r1, =0x085920d8 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] @@ -517129,12 +499676,11 @@ _080FD08A: bl task_close_bag_menu_1 b _080FD0CC .align 2, 0 -_080FD0B0: .4byte 0x0203ce54 -_080FD0B4: .4byte 0x085920d8 + .pool _080FD0B8: - ldr r0, _080FD0D4 + ldr r0, =0x0203cf2c ldr r2, [r0] - ldr r1, _080FD0D8 + ldr r1, =0x085920d8 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] @@ -517146,8 +499692,7 @@ _080FD0CC: pop {r0} bx r0 .align 2, 0 -_080FD0D4: .4byte 0x0203cf2c -_080FD0D8: .4byte 0x085920d8 + .pool thumb_func_end sub_80FD060 thumb_func_start run_eventually_start @@ -517155,7 +499700,7 @@ run_eventually_start: @ 80FD0DC push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080FD104 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -517164,18 +499709,16 @@ run_eventually_start: @ 80FD0DC ldrsh r0, [r0, r1] cmp r0, 0x1 beq _080FD110 - ldr r1, _080FD108 - ldr r0, _080FD10C + ldr r1, =0x03005dac + ldr r0, =sub_80FD124 + 1 str r0, [r1] adds r0, r2, 0 bl sub_80FD060 b _080FD11A .align 2, 0 -_080FD104: .4byte 0x03005e00 -_080FD108: .4byte 0x03005dac -_080FD10C: .4byte sub_80FD124 + 1 + .pool _080FD110: - ldr r0, _080FD120 + ldr r0, =0x0203a0f4 ldr r1, [r0] adds r0, r2, 0 bl _call_via_r1 @@ -517183,20 +499726,20 @@ _080FD11A: pop {r0} bx r0 .align 2, 0 -_080FD120: .4byte 0x0203a0f4 + .pool thumb_func_end run_eventually_start thumb_func_start sub_80FD124 sub_80FD124: @ 80FD124 push {lr} bl pal_fill_black - ldr r0, _080FD138 + ldr r0, =sub_80FD13C + 1 movs r1, 0x8 bl AddTask pop {r0} bx r0 .align 2, 0 -_080FD138: .4byte sub_80FD13C + 1 + .pool thumb_func_end sub_80FD124 thumb_func_start sub_80FD13C @@ -517209,7 +499752,7 @@ sub_80FD13C: @ 80FD13C lsrs r0, 24 cmp r0, 0x1 bne _080FD158 - ldr r0, _080FD160 + ldr r0, =0x0203a0f4 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 @@ -517218,7 +499761,7 @@ _080FD158: pop {r0} bx r0 .align 2, 0 -_080FD160: .4byte 0x0203a0f4 + .pool thumb_func_end sub_80FD13C thumb_func_start sub_80FD164 @@ -517230,7 +499773,7 @@ sub_80FD164: @ 80FD164 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r6, _080FD198 + ldr r6, =0x02021fc4 adds r0, r6, 0 bl ExpandTextCodes cmp r4, 0 @@ -517239,26 +499782,24 @@ sub_80FD164: @ 80FD164 lsls r0, 24 cmp r0, 0 bne _080FD1A0 - ldr r3, _080FD19C + ldr r3, =sub_81ABBBC + 1 adds r0, r5, 0 movs r1, 0x1 adds r2, r6, 0 bl sub_81ABB4C b _080FD1BE .align 2, 0 -_080FD198: .4byte 0x02021fc4 -_080FD19C: .4byte sub_81ABBBC + 1 + .pool _080FD1A0: - ldr r1, _080FD1AC - ldr r2, _080FD1B0 + ldr r1, =0x085e8f31 + ldr r2, =sub_81C6714 + 1 adds r0, r5, 0 bl sub_81C6DD8 b _080FD1BE .align 2, 0 -_080FD1AC: .4byte 0x085e8f31 -_080FD1B0: .4byte sub_81C6714 + 1 + .pool _080FD1B4: - ldr r2, _080FD1C4 + ldr r2, =sub_80FD1F8 + 1 adds r0, r5, 0 adds r1, r6, 0 bl sub_81978EC @@ -517267,7 +499808,7 @@ _080FD1BE: pop {r0} bx r0 .align 2, 0 -_080FD1C4: .4byte sub_80FD1F8 + 1 + .pool thumb_func_end sub_80FD164 thumb_func_start display_dads_advice_cannot_use_item_str @@ -517277,12 +499818,12 @@ display_dads_advice_cannot_use_item_str: @ 80FD1C8 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _080FD1DC + ldr r2, =0x085e8f31 bl sub_80FD164 pop {r0} bx r0 .align 2, 0 -_080FD1DC: .4byte 0x085e8f31 + .pool thumb_func_end display_dads_advice_cannot_use_item_str thumb_func_start display_cannot_dismount_bike_here_str @@ -517292,12 +499833,12 @@ display_cannot_dismount_bike_here_str: @ 80FD1E0 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _080FD1F4 + ldr r2, =0x085e8f6e bl sub_80FD164 pop {r0} bx r0 .align 2, 0 -_080FD1F4: .4byte 0x085e8f6e + .pool thumb_func_end display_cannot_dismount_bike_here_str thumb_func_start sub_80FD1F8 @@ -517325,23 +499866,23 @@ sub_80FD21C: @ 80FD21C lsrs r4, r0, 16 adds r0, r4, 0 bl itemid_get_overworld_function - ldr r1, _080FD234 + ldr r1, =sub_80FDF48 + 1 cmp r0, r1 bne _080FD238 movs r0, 0x1 b _080FD24E .align 2, 0 -_080FD234: .4byte sub_80FDF48 + 1 + .pool _080FD238: adds r0, r4, 0 bl itemid_get_overworld_function - ldr r1, _080FD248 + ldr r1, =sub_80FE378 + 1 cmp r0, r1 beq _080FD24C movs r0, 0 b _080FD24E .align 2, 0 -_080FD248: .4byte sub_80FE378 + 1 + .pool _080FD24C: movs r0, 0x2 _080FD24E: @@ -517355,10 +499896,10 @@ sub_80FD254: @ 80FD254 push {lr} sub sp, 0x24 mov r1, sp - ldr r0, _080FD270 + ldr r0, =0x0203ce7c ldrh r0, [r0] strh r0, [r1, 0x20] - ldr r1, _080FD274 + ldr r1, =sub_81AD40C + 1 mov r0, sp movs r2, 0 bl sub_8121478 @@ -517366,8 +499907,7 @@ sub_80FD254: @ 80FD254 pop {r0} bx r0 .align 2, 0 -_080FD270: .4byte 0x0203ce7c -_080FD274: .4byte sub_81AD40C + 1 + .pool thumb_func_end sub_80FD254 thumb_func_start sub_80FD278 @@ -517375,16 +499915,15 @@ sub_80FD278: @ 80FD278 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _080FD290 + ldr r1, =0x0203ce54 ldr r2, [r1] - ldr r1, _080FD294 + ldr r1, =sub_80FD254 + 1 str r1, [r2] bl task_close_bag_menu_1 pop {r0} bx r0 .align 2, 0 -_080FD290: .4byte 0x0203ce54 -_080FD294: .4byte sub_80FD254 + 1 + .pool thumb_func_end sub_80FD278 thumb_func_start item_field_func_bike @@ -517396,7 +499935,7 @@ item_field_func_bike: @ 80FD298 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080FD318 + ldr r1, =0x03005e08 adds r6, r0, r1 mov r4, sp adds r4, 0x2 @@ -517411,7 +499950,7 @@ item_field_func_bike: @ 80FD298 bl cur_mapdata_block_get_role_at lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080FD31C + ldr r0, =0x0000088b bl flag_check lsls r0, 24 lsrs r0, 24 @@ -517447,8 +499986,7 @@ _080FD30E: bl display_cannot_dismount_bike_here_str b _080FD350 .align 2, 0 -_080FD318: .4byte 0x03005e08 -_080FD31C: .4byte 0x0000088b + .pool _080FD320: bl sav1_map_is_biking_allowed cmp r0, 0x1 @@ -517457,15 +499995,14 @@ _080FD320: lsls r0, 24 cmp r0, 0 bne _080FD348 - ldr r1, _080FD340 - ldr r0, _080FD344 + ldr r1, =0x0203a0f4 + ldr r0, =sub_80FD358 + 1 str r0, [r1] adds r0, r5, 0 bl run_eventually_start b _080FD350 .align 2, 0 -_080FD340: .4byte 0x0203a0f4 -_080FD344: .4byte sub_80FD358 + 1 + .pool _080FD348: ldrb r1, [r6, 0x6] adds r0, r5, 0 @@ -517482,7 +500019,7 @@ sub_80FD358: @ 80FD358 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080FD374 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_x28 lsls r0, 24 @@ -517492,7 +500029,7 @@ sub_80FD358: @ 80FD358 bl sub_811A080 b _080FD37E .align 2, 0 -_080FD374: .4byte 0x0203ce7c + .pool _080FD378: movs r0, 0x4 bl sub_811A080 @@ -517587,17 +500124,16 @@ rod: @ 80FD428 bl sub_80FD394 cmp r0, 0x1 bne _080FD44C - ldr r1, _080FD444 - ldr r0, _080FD448 + ldr r1, =0x0203a0f4 + ldr r0, =sub_80FD468 + 1 str r0, [r1] adds r0, r4, 0 bl run_eventually_start b _080FD45E .align 2, 0 -_080FD444: .4byte 0x0203a0f4 -_080FD448: .4byte sub_80FD468 + 1 + .pool _080FD44C: - ldr r0, _080FD464 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -517610,7 +500146,7 @@ _080FD45E: pop {r0} bx r0 .align 2, 0 -_080FD464: .4byte 0x03005e00 + .pool thumb_func_end rod thumb_func_start sub_80FD468 @@ -517619,7 +500155,7 @@ sub_80FD468: @ 80FD468 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080FD48C + ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_x28 lsls r0, 24 @@ -517631,7 +500167,7 @@ sub_80FD468: @ 80FD468 pop {r0} bx r0 .align 2, 0 -_080FD48C: .4byte 0x0203ce7c + .pool thumb_func_end sub_80FD468 thumb_func_start it_itemfinder @@ -517642,8 +500178,8 @@ it_itemfinder: @ 80FD490 lsrs r4, 24 movs r0, 0x27 bl sav12_xor_increment - ldr r1, _080FD4B0 - ldr r0, _080FD4B4 + ldr r1, =0x0203a0f4 + ldr r0, =sub_80FD4B8 + 1 str r0, [r1] adds r0, r4, 0 bl run_eventually_start @@ -517651,8 +500187,7 @@ it_itemfinder: @ 80FD490 pop {r0} bx r0 .align 2, 0 -_080FD4B0: .4byte 0x0203a0f4 -_080FD4B4: .4byte sub_80FD4B8 + 1 + .pool thumb_func_end it_itemfinder thumb_func_start sub_80FD4B8 @@ -517660,7 +500195,7 @@ sub_80FD4B8: @ 80FD4B8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080FD4E0 + ldr r0, =0x02037318 ldr r0, [r0, 0x4] adds r1, r4, 0 bl sub_80FD5F0 @@ -517668,21 +500203,19 @@ sub_80FD4B8: @ 80FD4B8 lsrs r0, 24 cmp r0, 0x1 bne _080FD4EC - ldr r0, _080FD4E4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080FD4E8 + ldr r0, =sub_80FD504 + 1 str r0, [r1] b _080FD4F6 .align 2, 0 -_080FD4E0: .4byte 0x02037318 -_080FD4E4: .4byte 0x03005e00 -_080FD4E8: .4byte sub_80FD504 + 1 + .pool _080FD4EC: - ldr r1, _080FD4FC - ldr r2, _080FD500 + ldr r1, =0x085e9002 + ldr r2, =sub_80FD5CC + 1 adds r0, r4, 0 bl sub_81978EC _080FD4F6: @@ -517690,8 +500223,7 @@ _080FD4F6: pop {r0} bx r0 .align 2, 0 -_080FD4FC: .4byte 0x085e9002 -_080FD500: .4byte sub_80FD5CC + 1 + .pool thumb_func_end sub_80FD4B8 thumb_func_start sub_80FD504 @@ -517704,7 +500236,7 @@ sub_80FD504: @ 80FD504 lsls r6, r5, 2 adds r0, r6, r5 lsls r7, r0, 3 - ldr r0, _080FD558 + ldr r0, =0x03005e08 mov r8, r0 adds r4, r7, r0 movs r1, 0x6 @@ -517724,7 +500256,7 @@ sub_80FD504: @ 80FD504 lsrs r0, 24 cmp r0, 0 beq _080FD564 - ldr r1, _080FD55C + ldr r1, =0x085920e4 subs r0, 0x1 adds r0, r1 ldrb r0, [r0] @@ -517732,20 +500264,18 @@ sub_80FD504: @ 80FD504 mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, _080FD560 + ldr r1, =sub_80FDA94 + 1 str r1, [r0] b _080FD5C2 .align 2, 0 -_080FD558: .4byte 0x03005e08 -_080FD55C: .4byte 0x085920e4 -_080FD560: .4byte sub_80FDA94 + 1 + .pool _080FD564: bl player_get_direction__sp1AA lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 adds r3, r6, 0 - ldr r7, _080FD5A0 + ldr r7, =0x085920e4 movs r6, 0x3 _080FD574: adds r0, r1, r7 @@ -517761,20 +500291,18 @@ _080FD584: lsrs r1, r0, 24 cmp r1, 0x3 bls _080FD574 - ldr r1, _080FD5A4 + ldr r1, =0x03005e00 adds r0, r3, r5 lsls r0, 3 adds r0, r1 - ldr r1, _080FD5A8 + ldr r1, =sub_80FDADC + 1 str r1, [r0] movs r0, 0 strh r0, [r4, 0x6] strh r0, [r4, 0x4] b _080FD5C2 .align 2, 0 -_080FD5A0: .4byte 0x085920e4 -_080FD5A4: .4byte 0x03005e00 -_080FD5A8: .4byte sub_80FDADC + 1 + .pool _080FD5AC: movs r0, 0x48 bl audio_play @@ -517828,7 +500356,7 @@ sub_80FD5F0: @ 80FD5F0 mov r0, sp adds r1, r4, 0 bl player_get_pos_to - ldr r1, _080FD6C0 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -517907,7 +500435,7 @@ _080FD694: _080FD6A4: adds r0, r6, 0 bl sub_80FD7C8 - ldr r0, _080FD6C0 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -517919,7 +500447,7 @@ _080FD6A4: movs r0, 0 b _080FD6C6 .align 2, 0 -_080FD6C0: .4byte 0x03005e00 + .pool _080FD6C4: movs r0, 0x1 _080FD6C6: @@ -518024,12 +500552,12 @@ _080FD76C: subs r0, r5, r0 lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _080FD780 + ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x4] b _080FD79E .align 2, 0 -_080FD780: .4byte 0x02037318 + .pool _080FD784: ldr r0, [r3] ldr r0, [r0] @@ -518037,7 +500565,7 @@ _080FD784: adds r0, r5 b _080FD798 _080FD78E: - ldr r0, _080FD7A8 + ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0] adds r0, 0x7 @@ -518054,7 +500582,7 @@ _080FD7A2: lsrs r2, r0, 16 b _080FD7B0 .align 2, 0 -_080FD7A8: .4byte 0x02037318 + .pool _080FD7AC: movs r0, 0 b _080FD7C2 @@ -518084,7 +500612,7 @@ sub_80FD7C8: @ 80FD7C8 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] - ldr r0, _080FD8DC + ldr r0, =0x02037318 ldr r1, [r0] ldr r0, [r1] adds r0, 0x7 @@ -518216,7 +500744,7 @@ _080FD8CC: pop {r0} bx r0 .align 2, 0 -_080FD8DC: .4byte 0x02037318 + .pool thumb_func_end sub_80FD7C8 thumb_func_start sub_80FD8E0 @@ -518235,7 +500763,7 @@ sub_80FD8E0: @ 80FD8E0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _080FD914 + ldr r0, =0x03005e08 adds r3, r1, r0 movs r1, 0x4 ldrsh r0, [r3, r1] @@ -518248,7 +500776,7 @@ sub_80FD8E0: @ 80FD8E0 strh r0, [r3, 0x4] b _080FD9A2 .align 2, 0 -_080FD914: .4byte 0x03005e08 + .pool _080FD918: movs r1, 0 ldrsh r0, [r3, r1] @@ -518428,7 +500956,7 @@ sub_80FDA24: @ 80FDA24 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r4, _080FDA90 + ldr r4, =0x02037350 adds r0, r4 bl sub_8093284 movs r0, 0xFF @@ -518461,7 +500989,7 @@ sub_80FDA24: @ 80FDA24 pop {r0} bx r0 .align 2, 0 -_080FDA90: .4byte 0x02037350 + .pool thumb_func_end sub_80FDA24 thumb_func_start sub_80FDA94 @@ -518479,15 +501007,15 @@ sub_80FDA94: @ 80FDA94 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080FDAD0 + ldr r1, =0x02037350 adds r0, r1 bl npc_get_bit7_or_const_x10_when_inactive lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080FDACA - ldr r1, _080FDAD4 - ldr r2, _080FDAD8 + ldr r1, =0x085e8f93 + ldr r2, =sub_80FD5CC + 1 adds r0, r4, 0 bl sub_81978EC _080FDACA: @@ -518495,9 +501023,7 @@ _080FDACA: pop {r0} bx r0 .align 2, 0 -_080FDAD0: .4byte 0x02037350 -_080FDAD4: .4byte 0x085e8f93 -_080FDAD8: .4byte sub_80FD5CC + 1 + .pool thumb_func_end sub_80FDA94 thumb_func_start sub_80FDADC @@ -518509,7 +501035,7 @@ sub_80FDADC: @ 80FDADC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _080FDB58 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r0, 0xFF movs r1, 0 @@ -518521,7 +501047,7 @@ sub_80FDADC: @ 80FDADC lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _080FDB5C + ldr r1, =0x02037350 adds r0, r1 bl npc_get_bit7_or_const_x10_when_inactive lsls r0, 24 @@ -518533,7 +501059,7 @@ sub_80FDADC: @ 80FDADC cmp r0, 0 bne _080FDB50 _080FDB1C: - ldr r1, _080FDB60 + ldr r1, =0x085920e4 movs r2, 0xA ldrsh r0, [r4, r2] adds r0, r1 @@ -518553,8 +501079,8 @@ _080FDB1C: asrs r0, 16 cmp r0, 0x4 bne _080FDB50 - ldr r1, _080FDB64 - ldr r2, _080FDB68 + ldr r1, =0x085e8fdb + ldr r2, =sub_80FD5CC + 1 adds r0, r5, 0 bl sub_81978EC _080FDB50: @@ -518562,11 +501088,7 @@ _080FDB50: pop {r0} bx r0 .align 2, 0 -_080FDB58: .4byte 0x03005e08 -_080FDB5C: .4byte 0x02037350 -_080FDB60: .4byte 0x085920e4 -_080FDB64: .4byte 0x085e8fdb -_080FDB68: .4byte sub_80FD5CC + 1 + .pool thumb_func_end sub_80FDADC thumb_func_start sub_80FDB6C @@ -518579,7 +501101,7 @@ sub_80FDB6C: @ 80FDB6C lsrs r0, 24 cmp r0, 0x1 bne _080FDB98 - ldr r0, _080FDB94 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -518589,9 +501111,9 @@ sub_80FDB6C: @ 80FDB6C bl display_dads_advice_cannot_use_item_str b _080FDBDA .align 2, 0 -_080FDB94: .4byte 0x03005e00 + .pool _080FDB98: - ldr r0, _080FDBBC + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -518600,46 +501122,42 @@ _080FDB98: ldrsh r0, [r5, r1] cmp r0, 0x1 beq _080FDBC8 - ldr r0, _080FDBC0 + ldr r0, =0x0203ce54 ldr r1, [r0] - ldr r0, _080FDBC4 + ldr r0, =sub_80FDBEC + 1 str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 b _080FDBDA .align 2, 0 -_080FDBBC: .4byte 0x03005e00 -_080FDBC0: .4byte 0x0203ce54 -_080FDBC4: .4byte sub_80FDBEC + 1 + .pool _080FDBC8: - ldr r0, _080FDBE0 - ldr r1, _080FDBE4 + ldr r0, =0x03005dac + ldr r1, =sub_80AF6D4 + 1 str r1, [r0] movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _080FDBE8 + ldr r0, =sub_80FDC00 + 1 str r0, [r5] _080FDBDA: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FDBE0: .4byte 0x03005dac -_080FDBE4: .4byte sub_80AF6D4 + 1 -_080FDBE8: .4byte sub_80FDC00 + 1 + .pool thumb_func_end sub_80FDB6C thumb_func_start sub_80FDBEC sub_80FDBEC: @ 80FDBEC push {lr} - ldr r1, _080FDBFC + ldr r1, =sub_81AD40C + 1 movs r0, 0 bl sub_81357FC pop {r0} bx r0 .align 2, 0 -_080FDBFC: .4byte sub_81AD40C + 1 + .pool thumb_func_end sub_80FDBEC thumb_func_start sub_80FDC00 @@ -518647,14 +501165,14 @@ sub_80FDC00: @ 80FDC00 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080FDC2C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _080FDC24 bl overworld_free_bg_tilemaps - ldr r1, _080FDC30 + ldr r1, =c2_exit_to_overworld_2_switch + 1 movs r0, 0 bl sub_81357FC adds r0, r4, 0 @@ -518664,8 +501182,7 @@ _080FDC24: pop {r0} bx r0 .align 2, 0 -_080FDC2C: .4byte 0x02037fd4 -_080FDC30: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_80FDC00 thumb_func_start sub_80FDC34 @@ -518673,7 +501190,7 @@ sub_80FDC34: @ 80FDC34 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080FDC7C + ldr r4, =0x02021cc4 bl sub_8145C30 adds r1, r0, 0 lsls r1, 16 @@ -518682,11 +501199,11 @@ sub_80FDC34: @ 80FDC34 movs r2, 0 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _080FDC80 - ldr r1, _080FDC84 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9026 adds r0, r4, 0 bl ExpandTextCodes - ldr r1, _080FDC88 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -518695,20 +501212,16 @@ sub_80FDC34: @ 80FDC34 ldrsh r0, [r0, r1] cmp r0, 0 bne _080FDC90 - ldr r3, _080FDC8C + ldr r3, =sub_81ABBBC + 1 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 bl sub_81ABB4C b _080FDC9A .align 2, 0 -_080FDC7C: .4byte 0x02021cc4 -_080FDC80: .4byte 0x02021fc4 -_080FDC84: .4byte 0x085e9026 -_080FDC88: .4byte 0x03005e00 -_080FDC8C: .4byte sub_81ABBBC + 1 + .pool _080FDC90: - ldr r2, _080FDCA0 + ldr r2, =sub_80FD1F8 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -518717,7 +501230,7 @@ _080FDC9A: pop {r0} bx r0 .align 2, 0 -_080FDCA0: .4byte sub_80FD1F8 + 1 + .pool thumb_func_end sub_80FDC34 thumb_func_start sub_80FDCA4 @@ -518725,18 +501238,18 @@ sub_80FDCA4: @ 80FDCA4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080FDCE8 + ldr r4, =0x02021cc4 bl sub_80247BC adds r1, r0, 0 adds r0, r4, 0 movs r2, 0 movs r3, 0x5 bl decimal_int_to_string - ldr r4, _080FDCEC - ldr r1, _080FDCF0 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9138 adds r0, r4, 0 bl ExpandTextCodes - ldr r1, _080FDCF4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -518745,20 +501258,16 @@ sub_80FDCA4: @ 80FDCA4 ldrsh r0, [r0, r1] cmp r0, 0 bne _080FDCFC - ldr r3, _080FDCF8 + ldr r3, =sub_81ABBBC + 1 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 bl sub_81ABB4C b _080FDD06 .align 2, 0 -_080FDCE8: .4byte 0x02021cc4 -_080FDCEC: .4byte 0x02021fc4 -_080FDCF0: .4byte 0x085e9138 -_080FDCF4: .4byte 0x03005e00 -_080FDCF8: .4byte sub_81ABBBC + 1 + .pool _080FDCFC: - ldr r2, _080FDD0C + ldr r2, =sub_80FD1F8 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -518767,7 +501276,7 @@ _080FDD06: pop {r0} bx r0 .align 2, 0 -_080FDD0C: .4byte sub_80FD1F8 + 1 + .pool thumb_func_end sub_80FDCA4 thumb_func_start sub_80FDD10 @@ -518780,28 +501289,23 @@ sub_80FDD10: @ 80FDD10 lsrs r0, 24 cmp r0, 0x1 bne _080FDD58 - ldr r1, _080FDD40 - ldr r0, _080FDD44 + ldr r1, =0x0203a0f4 + ldr r0, =sub_80FDD74 + 1 str r0, [r1] - ldr r1, _080FDD48 - ldr r0, _080FDD4C + ldr r1, =0x03005dac + ldr r0, =sub_80FD124 + 1 str r0, [r1] - ldr r0, _080FDD50 + ldr r0, =0x0203ce54 ldr r1, [r0] - ldr r0, _080FDD54 + ldr r0, =c2_exit_to_overworld_2_switch + 1 str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 b _080FDD68 .align 2, 0 -_080FDD40: .4byte 0x0203a0f4 -_080FDD44: .4byte sub_80FDD74 + 1 -_080FDD48: .4byte 0x03005dac -_080FDD4C: .4byte sub_80FD124 + 1 -_080FDD50: .4byte 0x0203ce54 -_080FDD54: .4byte c2_exit_to_overworld_2_switch + 1 + .pool _080FDD58: - ldr r0, _080FDD70 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_overworld_function adds r1, r0, 0 @@ -518812,7 +501316,7 @@ _080FDD68: pop {r0} bx r0 .align 2, 0 -_080FDD70: .4byte 0x0203ce7c + .pool thumb_func_end sub_80FDD10 thumb_func_start sub_80FDD74 @@ -518821,12 +501325,12 @@ sub_80FDD74: @ 80FDD74 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080FDD9C + ldr r0, =0x0203ce7c ldrh r0, [r0] movs r1, 0x1 bl sub_80D6AA4 bl script_env_2_enable - ldr r0, _080FDDA0 + ldr r0, =0x08274482 bl script_env_1_execute_new_script adds r0, r4, 0 bl remove_task @@ -518834,8 +501338,7 @@ sub_80FDD74: @ 80FDD74 pop {r0} bx r0 .align 2, 0 -_080FDD9C: .4byte 0x0203ce7c -_080FDDA0: .4byte 0x08274482 + .pool thumb_func_end sub_80FDD74 thumb_func_start sub_80FDDA4 @@ -518849,30 +501352,28 @@ sub_80FDDA4: @ 80FDDA4 lsrs r0, 24 cmp r0, 0x1 bne _080FDDC8 - ldr r1, _080FDDC0 - ldr r0, _080FDDC4 + ldr r1, =0x0203a0f4 + ldr r0, =sub_80FDE7C + 1 b _080FDDD8 .align 2, 0 -_080FDDC0: .4byte 0x0203a0f4 -_080FDDC4: .4byte sub_80FDE7C + 1 + .pool _080FDDC8: bl sub_80E1770 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _080FDDEC - ldr r1, _080FDDE4 - ldr r0, _080FDDE8 + ldr r1, =0x0203a0f4 + ldr r0, =sub_80FDE08 + 1 _080FDDD8: str r0, [r1] adds r0, r4, 0 bl run_eventually_start b _080FDDFE .align 2, 0 -_080FDDE4: .4byte 0x0203a0f4 -_080FDDE8: .4byte sub_80FDE08 + 1 + .pool _080FDDEC: - ldr r0, _080FDE04 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -518885,7 +501386,7 @@ _080FDDFE: pop {r0} bx r0 .align 2, 0 -_080FDE04: .4byte 0x03005e00 + .pool thumb_func_end sub_80FDDA4 thumb_func_start sub_80FDE08 @@ -518895,7 +501396,7 @@ sub_80FDE08: @ 80FDE08 lsls r4, 24 lsrs r4, 24 bl script_env_2_enable - ldr r0, _080FDE28 + ldr r0, =0x082744c0 bl script_env_1_execute_new_script adds r0, r4, 0 bl remove_task @@ -518903,7 +501404,7 @@ sub_80FDE08: @ 80FDE08 pop {r0} bx r0 .align 2, 0 -_080FDE28: .4byte 0x082744c0 + .pool thumb_func_end sub_80FDE08 thumb_func_start sub_80FDE2C @@ -518927,7 +501428,7 @@ sub_80FDE2C: @ 80FDE2C lsrs r2, r0, 24 cmp r2, 0x10 beq _080FDE68 - ldr r0, _080FDE6C + ldr r0, =0x02037350 lsls r1, r2, 3 adds r1, r2 lsls r1, 2 @@ -518939,7 +501440,7 @@ _080FDE68: movs r0, 0 b _080FDE72 .align 2, 0 -_080FDE6C: .4byte 0x02037350 + .pool _080FDE70: movs r0, 0x1 _080FDE72: @@ -518956,7 +501457,7 @@ sub_80FDE7C: @ 80FDE7C lsls r4, 24 lsrs r4, 24 bl script_env_2_enable - ldr r0, _080FDE9C + ldr r0, =0x08242cfc bl script_env_1_execute_new_script adds r0, r4, 0 bl remove_task @@ -518964,7 +501465,7 @@ sub_80FDE7C: @ 80FDE7C pop {r0} bx r0 .align 2, 0 -_080FDE9C: .4byte 0x08242cfc + .pool thumb_func_end sub_80FDE7C thumb_func_start item_field_func_recovery_item @@ -518972,15 +501473,14 @@ item_field_func_recovery_item: @ 80FDEA0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FDEB4 - ldr r1, _080FDEB8 + ldr r2, =0x03006328 + ldr r1, =sub_81B6588 + 1 str r1, [r2] bl sub_80FD060 pop {r0} bx r0 .align 2, 0 -_080FDEB4: .4byte 0x03006328 -_080FDEB8: .4byte sub_81B6588 + 1 + .pool thumb_func_end item_field_func_recovery_item thumb_func_start sub_80FDEBC @@ -518988,15 +501488,14 @@ sub_80FDEBC: @ 80FDEBC push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FDED0 - ldr r1, _080FDED4 + ldr r2, =0x03006328 + ldr r1, =sub_81B67C8 + 1 str r1, [r2] bl sub_80FD060 pop {r0} bx r0 .align 2, 0 -_080FDED0: .4byte 0x03006328 -_080FDED4: .4byte sub_81B67C8 + 1 + .pool thumb_func_end sub_80FDEBC thumb_func_start item_in_battle_func_sacred_ash @@ -519004,15 +501503,14 @@ item_in_battle_func_sacred_ash: @ 80FDED8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FDEEC - ldr r1, _080FDEF0 + ldr r2, =0x03006328 + ldr r1, =sub_81B79E8 + 1 str r1, [r2] bl sub_80FD060 pop {r0} bx r0 .align 2, 0 -_080FDEEC: .4byte 0x03006328 -_080FDEF0: .4byte sub_81B79E8 + 1 + .pool thumb_func_end item_in_battle_func_sacred_ash thumb_func_start item_field_func_pp_recovery_item @@ -519020,15 +501518,14 @@ item_field_func_pp_recovery_item: @ 80FDEF4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FDF08 - ldr r1, _080FDF0C + ldr r2, =0x03006328 + ldr r1, =dp05_ether + 1 str r1, [r2] bl sub_80FD060 pop {r0} bx r0 .align 2, 0 -_080FDF08: .4byte 0x03006328 -_080FDF0C: .4byte dp05_ether + 1 + .pool thumb_func_end item_field_func_pp_recovery_item thumb_func_start sub_80FDF10 @@ -519036,15 +501533,14 @@ sub_80FDF10: @ 80FDF10 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FDF24 - ldr r1, _080FDF28 + ldr r2, =0x03006328 + ldr r1, =dp05_pp_up + 1 str r1, [r2] bl sub_80FD060 pop {r0} bx r0 .align 2, 0 -_080FDF24: .4byte 0x03006328 -_080FDF28: .4byte dp05_pp_up + 1 + .pool thumb_func_end sub_80FDF10 thumb_func_start sub_80FDF2C @@ -519052,15 +501548,14 @@ sub_80FDF2C: @ 80FDF2C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FDF40 - ldr r1, _080FDF44 + ldr r2, =0x03006328 + ldr r1, =dp05_rare_candy + 1 str r1, [r2] bl sub_80FD060 pop {r0} bx r0 .align 2, 0 -_080FDF40: .4byte 0x03006328 -_080FDF44: .4byte dp05_rare_candy + 1 + .pool thumb_func_end sub_80FDF2C thumb_func_start sub_80FDF48 @@ -519068,25 +501563,23 @@ sub_80FDF48: @ 80FDF48 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080FDF68 + ldr r0, =0x0203ce7c ldrh r1, [r0] movs r0, 0xA9 lsls r0, 1 cmp r1, r0 bls _080FDF74 - ldr r2, _080FDF6C - ldr r3, _080FDF70 + ldr r2, =0x085e9047 + ldr r3, =sub_80FDF90 + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C b _080FDF80 .align 2, 0 -_080FDF68: .4byte 0x0203ce7c -_080FDF6C: .4byte 0x085e9047 -_080FDF70: .4byte sub_80FDF90 + 1 + .pool _080FDF74: - ldr r2, _080FDF88 - ldr r3, _080FDF8C + ldr r2, =0x085e9037 + ldr r3, =sub_80FDF90 + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C @@ -519095,8 +501588,7 @@ _080FDF80: pop {r0} bx r0 .align 2, 0 -_080FDF88: .4byte 0x085e9037 -_080FDF8C: .4byte sub_80FDF90 + 1 + .pool thumb_func_end sub_80FDF48 thumb_func_start sub_80FDF90 @@ -519107,19 +501599,18 @@ sub_80FDF90: @ 80FDF90 lsrs r4, 24 movs r0, 0x2 bl audio_play - ldr r1, _080FDFB4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _080FDFB8 + ldr r1, =task08_0809AD8C + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_080FDFB4: .4byte 0x03005e00 -_080FDFB8: .4byte task08_0809AD8C + 1 + .pool thumb_func_end sub_80FDF90 thumb_func_start task08_0809AD8C @@ -519127,29 +501618,29 @@ task08_0809AD8C: @ 80FDFBC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080FE008 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 beq _080FE000 - ldr r4, _080FE00C - ldr r0, _080FE010 + ldr r4, =0x02021cc4 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl sub_81B6CFC lsls r0, 16 lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _080FE014 + ldr r0, =0x0831977c adds r1, r0 adds r0, r4, 0 bl gf_strcpy - ldr r4, _080FE018 - ldr r1, _080FE01C + ldr r4, =0x02021fc4 + ldr r1, =0x085e9058 adds r0, r4, 0 bl ExpandTextCodes - ldr r3, _080FE020 + ldr r3, =sub_80FE024 + 1 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 @@ -519159,13 +501650,7 @@ _080FE000: pop {r0} bx r0 .align 2, 0 -_080FE008: .4byte 0x030022c0 -_080FE00C: .4byte 0x02021cc4 -_080FE010: .4byte 0x0203ce7c -_080FE014: .4byte 0x0831977c -_080FE018: .4byte 0x02021fc4 -_080FE01C: .4byte 0x085e9058 -_080FE020: .4byte sub_80FE024 + 1 + .pool thumb_func_end task08_0809AD8C thumb_func_start sub_80FE024 @@ -519173,13 +501658,13 @@ sub_80FE024: @ 80FE024 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FE038 + ldr r2, =0x085920e8 movs r1, 0x6 bl sub_81AE238 pop {r0} bx r0 .align 2, 0 -_080FE038: .4byte 0x085920e8 + .pool thumb_func_end sub_80FE024 thumb_func_start sub_80FE03C @@ -519187,29 +501672,28 @@ sub_80FE03C: @ 80FE03C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FE050 - ldr r1, _080FE054 + ldr r2, =0x03006328 + ldr r1, =sub_81B6DC4 + 1 str r1, [r2] bl sub_80FD060 pop {r0} bx r0 .align 2, 0 -_080FE050: .4byte 0x03006328 -_080FE054: .4byte sub_81B6DC4 + 1 + .pool thumb_func_end sub_80FE03C thumb_func_start sub_80FE058 sub_80FE058: @ 80FE058 push {r4,lr} - ldr r4, _080FE09C + ldr r4, =0x0203ce7c ldrh r0, [r4] movs r1, 0x1 bl sub_80D6AA4 ldrh r0, [r4] - ldr r1, _080FE0A0 + ldr r1, =0x02021dc4 bl itemid_get_name - ldr r0, _080FE0A4 - ldr r1, _080FE0A8 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9080 bl ExpandTextCodes bl sub_81A9E40 lsls r0, 24 @@ -519227,10 +501711,7 @@ sub_80FE058: @ 80FE058 bl sub_81ABA88 b _080FE0B4 .align 2, 0 -_080FE09C: .4byte 0x0203ce7c -_080FE0A0: .4byte 0x02021dc4 -_080FE0A4: .4byte 0x02021fc4 -_080FE0A8: .4byte 0x085e9080 + .pool _080FE0AC: bl sub_81C5924 bl sub_81C59BC @@ -519246,40 +501727,37 @@ sub_80FE0BC: @ 80FE0BC lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, _080FE0E0 + ldr r0, =0x00004021 bl var_get lsls r0, 16 cmp r0, 0 bne _080FE0EC - ldr r0, _080FE0E4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080FE0E8 + ldr r0, =sub_80FE124 + 1 str r0, [r1] b _080FE116 .align 2, 0 -_080FE0E0: .4byte 0x00004021 -_080FE0E4: .4byte 0x03005e00 -_080FE0E8: .4byte sub_80FE124 + 1 + .pool _080FE0EC: bl sub_81A9E40 lsls r0, 24 cmp r0, 0 bne _080FE10C - ldr r2, _080FE104 - ldr r3, _080FE108 + ldr r2, =0x085e9092 + ldr r3, =sub_81ABBBC + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C b _080FE116 .align 2, 0 -_080FE104: .4byte 0x085e9092 -_080FE108: .4byte sub_81ABBBC + 1 + .pool _080FE10C: - ldr r1, _080FE11C - ldr r2, _080FE120 + ldr r1, =0x085e9092 + ldr r2, =sub_81C6714 + 1 adds r0, r5, 0 bl sub_81C6DD8 _080FE116: @@ -519287,8 +501765,7 @@ _080FE116: pop {r0} bx r0 .align 2, 0 -_080FE11C: .4byte 0x085e9092 -_080FE120: .4byte sub_81C6714 + 1 + .pool thumb_func_end sub_80FE0BC thumb_func_start sub_80FE124 @@ -519299,7 +501776,7 @@ sub_80FE124: @ 80FE124 lsls r1, r0, 2 adds r1, r0 lsls r4, r1, 3 - ldr r5, _080FE15C + ldr r5, =0x03005e08 adds r1, r4, r5 ldrh r0, [r1, 0x10] adds r0, 0x1 @@ -519315,15 +501792,14 @@ sub_80FE124: @ 80FE124 adds r0, r5, 0 subs r0, 0x8 adds r0, r4, r0 - ldr r1, _080FE160 + ldr r1, =sub_80FE164 + 1 str r1, [r0] _080FE156: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FE15C: .4byte 0x03005e08 -_080FE160: .4byte sub_80FE164 + 1 + .pool thumb_func_end sub_80FE124 thumb_func_start sub_80FE164 @@ -519336,8 +501812,8 @@ sub_80FE164: @ 80FE164 lsls r0, 24 cmp r0, 0 bne _080FE1C2 - ldr r4, _080FE1A8 - ldr r0, _080FE1AC + ldr r4, =0x00004021 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_quality adds r1, r0, 0 @@ -519350,20 +501826,17 @@ sub_80FE164: @ 80FE164 lsls r0, 24 cmp r0, 0 bne _080FE1B8 - ldr r2, _080FE1B0 - ldr r3, _080FE1B4 + ldr r2, =0x02021fc4 + ldr r3, =sub_81ABBBC + 1 adds r0, r5, 0 movs r1, 0x1 bl sub_81ABB4C b _080FE1C2 .align 2, 0 -_080FE1A8: .4byte 0x00004021 -_080FE1AC: .4byte 0x0203ce7c -_080FE1B0: .4byte 0x02021fc4 -_080FE1B4: .4byte sub_81ABBBC + 1 + .pool _080FE1B8: - ldr r1, _080FE1C8 - ldr r2, _080FE1CC + ldr r1, =0x02021fc4 + ldr r2, =sub_81C6714 + 1 adds r0, r6, 0 bl sub_81C6DD8 _080FE1C2: @@ -519371,8 +501844,7 @@ _080FE1C2: pop {r0} bx r0 .align 2, 0 -_080FE1C8: .4byte 0x02021fc4 -_080FE1CC: .4byte sub_81C6714 + 1 + .pool thumb_func_end sub_80FE164 thumb_func_start sub_80FE1D0 @@ -519381,7 +501853,7 @@ sub_80FE1D0: @ 80FE1D0 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, _080FE210 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -519399,19 +501871,17 @@ sub_80FE1D0: @ 80FE1D0 lsls r0, 24 cmp r0, 0 bne _080FE21C - ldr r2, _080FE214 - ldr r3, _080FE218 + ldr r2, =0x02021fc4 + ldr r3, =sub_81ABBBC + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C b _080FE226 .align 2, 0 -_080FE210: .4byte 0x03005e00 -_080FE214: .4byte 0x02021fc4 -_080FE218: .4byte sub_81ABBBC + 1 + .pool _080FE21C: - ldr r1, _080FE22C - ldr r2, _080FE230 + ldr r1, =0x02021fc4 + ldr r2, =sub_81C6714 + 1 adds r0, r5, 0 bl sub_81C6DD8 _080FE226: @@ -519419,8 +501889,7 @@ _080FE226: pop {r0} bx r0 .align 2, 0 -_080FE22C: .4byte 0x02021fc4 -_080FE230: .4byte sub_81C6714 + 1 + .pool thumb_func_end sub_80FE1D0 thumb_func_start item_field_func_black_white_flutes @@ -519428,56 +501897,46 @@ item_field_func_black_white_flutes: @ 80FE234 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _080FE260 + ldr r4, =0x0203ce7c ldrh r0, [r4] - ldr r1, _080FE264 + ldr r1, =0x02021dc4 bl itemid_get_name ldrh r0, [r4] cmp r0, 0x2B bne _080FE278 - ldr r0, _080FE268 + ldr r0, =0x000008ad bl flag_set - ldr r0, _080FE26C + ldr r0, =0x000008ae bl flag_clear - ldr r0, _080FE270 - ldr r1, _080FE274 + ldr r0, =0x02021fc4 + ldr r1, =0x085e90c6 bl ExpandTextCodes b _080FE28C .align 2, 0 -_080FE260: .4byte 0x0203ce7c -_080FE264: .4byte 0x02021dc4 -_080FE268: .4byte 0x000008ad -_080FE26C: .4byte 0x000008ae -_080FE270: .4byte 0x02021fc4 -_080FE274: .4byte 0x085e90c6 + .pool _080FE278: - ldr r0, _080FE2A4 + ldr r0, =0x000008ae bl flag_set - ldr r0, _080FE2A8 + ldr r0, =0x000008ad bl flag_clear - ldr r0, _080FE2AC - ldr r1, _080FE2B0 + ldr r0, =0x02021fc4 + ldr r1, =0x085e90f4 bl ExpandTextCodes _080FE28C: - ldr r1, _080FE2B4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0x18] - ldr r1, _080FE2B8 + ldr r1, =sub_80FE1D0 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FE2A4: .4byte 0x000008ae -_080FE2A8: .4byte 0x000008ad -_080FE2AC: .4byte 0x02021fc4 -_080FE2B0: .4byte 0x085e90f4 -_080FE2B4: .4byte 0x03005e00 -_080FE2B8: .4byte sub_80FE1D0 + 1 + .pool thumb_func_end item_field_func_black_white_flutes thumb_func_start task08_080A1C44 @@ -519503,30 +501962,28 @@ re_escape_rope: @ 80FE2D8 lsrs r4, 24 bl flagmods_08054D70 bl sub_80FE058 - ldr r1, _080FE308 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0x8] - ldr r1, _080FE30C - ldr r2, _080FE310 + ldr r1, =0x02021fc4 + ldr r2, =task08_080A1C44 + 1 adds r0, r4, 0 bl sub_81978EC pop {r4} pop {r0} bx r0 .align 2, 0 -_080FE308: .4byte 0x03005e00 -_080FE30C: .4byte 0x02021fc4 -_080FE310: .4byte task08_080A1C44 + 1 + .pool thumb_func_end re_escape_rope thumb_func_start sub_80FE314 sub_80FE314: @ 80FE314 push {lr} - ldr r0, _080FE328 + ldr r0, =0x02037318 ldrb r1, [r0, 0x1A] movs r0, 0x2 ands r0, r1 @@ -519535,7 +501992,7 @@ sub_80FE314: @ 80FE314 movs r0, 0 b _080FE32E .align 2, 0 -_080FE328: .4byte 0x02037318 + .pool _080FE32C: movs r0, 0x1 _080FE32E: @@ -519553,17 +502010,16 @@ sub_80FE334: @ 80FE334 lsrs r0, 24 cmp r0, 0x1 bne _080FE35C - ldr r1, _080FE354 - ldr r0, _080FE358 + ldr r1, =0x0203a0f4 + ldr r0, =re_escape_rope + 1 str r0, [r1] adds r0, r4, 0 bl run_eventually_start b _080FE36E .align 2, 0 -_080FE354: .4byte 0x0203a0f4 -_080FE358: .4byte re_escape_rope + 1 + .pool _080FE35C: - ldr r0, _080FE374 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -519576,7 +502032,7 @@ _080FE36E: pop {r0} bx r0 .align 2, 0 -_080FE374: .4byte 0x03005e00 + .pool thumb_func_end sub_80FE334 thumb_func_start sub_80FE378 @@ -519584,15 +502040,14 @@ sub_80FE378: @ 80FE378 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FE38C - ldr r1, _080FE390 + ldr r2, =0x03006328 + ldr r1, =sub_81B7C74 + 1 str r1, [r2] bl sub_80FD060 pop {r0} bx r0 .align 2, 0 -_080FE38C: .4byte 0x03006328 -_080FE390: .4byte sub_81B7C74 + 1 + .pool thumb_func_end sub_80FE378 thumb_func_start item_in_battle_func_pokeball @@ -519605,7 +502060,7 @@ item_in_battle_func_pokeball: @ 80FE394 lsls r0, 24 cmp r0, 0 bne _080FE3D0 - ldr r0, _080FE3C4 + ldr r0, =0x0203ce7c ldrh r0, [r0] movs r1, 0x1 bl sub_80D6AA4 @@ -519617,7 +502072,7 @@ item_in_battle_func_pokeball: @ 80FE394 bl task_close_bag_menu_1 b _080FE3FA .align 2, 0 -_080FE3C4: .4byte 0x0203ce7c + .pool _080FE3C8: adds r0, r4, 0 bl sub_81C5B14 @@ -519627,18 +502082,17 @@ _080FE3D0: lsls r0, 24 cmp r0, 0 bne _080FE3F0 - ldr r2, _080FE3E8 - ldr r3, _080FE3EC + ldr r2, =0x085e9125 + ldr r3, =sub_81ABBBC + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C b _080FE3FA .align 2, 0 -_080FE3E8: .4byte 0x085e9125 -_080FE3EC: .4byte sub_81ABBBC + 1 + .pool _080FE3F0: - ldr r1, _080FE400 - ldr r2, _080FE404 + ldr r1, =0x085e9125 + ldr r2, =sub_81C6714 + 1 adds r0, r5, 0 bl sub_81C6DD8 _080FE3FA: @@ -519646,8 +502100,7 @@ _080FE3FA: pop {r0} bx r0 .align 2, 0 -_080FE400: .4byte 0x085e9125 -_080FE404: .4byte sub_81C6714 + 1 + .pool thumb_func_end item_in_battle_func_pokeball thumb_func_start sub_80FE408 @@ -519656,7 +502109,7 @@ sub_80FE408: @ 80FE408 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, _080FE430 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -519670,7 +502123,7 @@ sub_80FE408: @ 80FE408 bl task_close_bag_menu_1 b _080FE43A .align 2, 0 -_080FE430: .4byte 0x030022c0 + .pool _080FE434: adds r0, r5, 0 bl sub_81C5B14 @@ -519686,7 +502139,7 @@ sub_80FE440: @ 80FE440 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - ldr r0, _080FE490 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -519700,7 +502153,7 @@ sub_80FE440: @ 80FE440 ble _080FE4AC movs r0, 0x1 bl audio_play - ldr r4, _080FE494 + ldr r4, =0x0203ce7c ldrh r0, [r4] movs r1, 0x1 bl sub_80D6AA4 @@ -519711,20 +502164,18 @@ sub_80FE440: @ 80FE440 ldrh r0, [r4] bl sub_806CF78 adds r2, r0, 0 - ldr r3, _080FE498 + ldr r3, =sub_80FE408 + 1 adds r0, r5, 0 movs r1, 0x1 bl sub_81ABB4C b _080FE4AC .align 2, 0 -_080FE490: .4byte 0x03005e00 -_080FE494: .4byte 0x0203ce7c -_080FE498: .4byte sub_80FE408 + 1 + .pool _080FE49C: ldrh r0, [r4] bl sub_806CF78 adds r1, r0, 0 - ldr r2, _080FE4B4 + ldr r2, =sub_80FE408 + 1 adds r0, r6, 0 bl sub_81C6DD8 _080FE4AC: @@ -519732,7 +502183,7 @@ _080FE4AC: pop {r0} bx r0 .align 2, 0 -_080FE4B4: .4byte sub_80FE408 + 1 + .pool thumb_func_end sub_80FE440 thumb_func_start status_incr_battle @@ -519740,17 +502191,17 @@ status_incr_battle: @ 80FE4B8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _080FE500 - ldr r0, _080FE504 + ldr r1, =0x0202406e + ldr r0, =0x020244b8 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r1, _080FE508 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _080FE50C + ldr r1, =0x0203ce7c ldrh r1, [r1] lsls r2, 24 lsrs r2, 24 @@ -519764,35 +502215,29 @@ status_incr_battle: @ 80FE4B8 lsls r0, 24 cmp r0, 0 bne _080FE518 - ldr r2, _080FE510 - ldr r3, _080FE514 + ldr r2, =0x085e96f6 + ldr r3, =sub_81ABBBC + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C b _080FE53C .align 2, 0 -_080FE500: .4byte 0x0202406e -_080FE504: .4byte 0x020244b8 -_080FE508: .4byte 0x020244ec -_080FE50C: .4byte 0x0203ce7c -_080FE510: .4byte 0x085e96f6 -_080FE514: .4byte sub_81ABBBC + 1 + .pool _080FE518: - ldr r1, _080FE524 - ldr r2, _080FE528 + ldr r1, =0x085e96f6 + ldr r2, =sub_81C6714 + 1 adds r0, r4, 0 bl sub_81C6DD8 b _080FE53C .align 2, 0 -_080FE524: .4byte 0x085e96f6 -_080FE528: .4byte sub_81C6714 + 1 + .pool _080FE52C: - ldr r0, _080FE544 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _080FE548 + ldr r0, =sub_80FE440 + 1 str r0, [r1] strh r2, [r1, 0x18] _080FE53C: @@ -519800,8 +502245,7 @@ _080FE53C: pop {r0} bx r0 .align 2, 0 -_080FE544: .4byte 0x03005e00 -_080FE548: .4byte sub_80FE440 + 1 + .pool thumb_func_end status_incr_battle thumb_func_start sub_80FE54C @@ -519813,20 +502257,19 @@ sub_80FE54C: @ 80FE54C lsls r0, 24 cmp r0, 0 bne _080FE574 - ldr r0, _080FE56C + ldr r0, =0x0203ce54 ldr r1, [r0] - ldr r0, _080FE570 + ldr r0, =sub_81B89F0 + 1 str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 b _080FE582 .align 2, 0 -_080FE56C: .4byte 0x0203ce54 -_080FE570: .4byte sub_81B89F0 + 1 + .pool _080FE574: - ldr r0, _080FE588 + ldr r0, =0x0203cf2c ldr r1, [r0] - ldr r0, _080FE58C + ldr r0, =sub_81B89F0 + 1 str r0, [r1] adds r0, r4, 0 bl sub_81C5B14 @@ -519835,8 +502278,7 @@ _080FE582: pop {r0} bx r0 .align 2, 0 -_080FE588: .4byte 0x0203cf2c -_080FE58C: .4byte sub_81B89F0 + 1 + .pool thumb_func_end sub_80FE54C thumb_func_start item_in_battle_func_recovery_item @@ -519844,15 +502286,14 @@ item_in_battle_func_recovery_item: @ 80FE590 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FE5A4 - ldr r1, _080FE5A8 + ldr r2, =0x03006328 + ldr r1, =sub_81B6588 + 1 str r1, [r2] bl sub_80FE54C pop {r0} bx r0 .align 2, 0 -_080FE5A4: .4byte 0x03006328 -_080FE5A8: .4byte sub_81B6588 + 1 + .pool thumb_func_end item_in_battle_func_recovery_item thumb_func_start sub_80FE5AC @@ -519860,15 +502301,14 @@ sub_80FE5AC: @ 80FE5AC push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FE5C0 - ldr r1, _080FE5C4 + ldr r2, =0x03006328 + ldr r1, =sub_81B79E8 + 1 str r1, [r2] bl sub_80FE54C pop {r0} bx r0 .align 2, 0 -_080FE5C0: .4byte 0x03006328 -_080FE5C4: .4byte sub_81B79E8 + 1 + .pool thumb_func_end sub_80FE5AC thumb_func_start item_in_battle_func_pp_recovery_item @@ -519876,15 +502316,14 @@ item_in_battle_func_pp_recovery_item: @ 80FE5C8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FE5DC - ldr r1, _080FE5E0 + ldr r2, =0x03006328 + ldr r1, =dp05_ether + 1 str r1, [r2] bl sub_80FE54C pop {r0} bx r0 .align 2, 0 -_080FE5DC: .4byte 0x03006328 -_080FE5E0: .4byte dp05_ether + 1 + .pool thumb_func_end item_in_battle_func_pp_recovery_item thumb_func_start sub_80FE5E4 @@ -519892,7 +502331,7 @@ sub_80FE5E4: @ 80FE5E4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080FE614 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 @@ -519903,27 +502342,24 @@ sub_80FE5E4: @ 80FE5E4 lsls r0, 24 cmp r0, 0 bne _080FE620 - ldr r2, _080FE618 - ldr r3, _080FE61C + ldr r2, =0x02021fc4 + ldr r3, =task_close_bag_menu_1 + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C b _080FE646 .align 2, 0 -_080FE614: .4byte 0x02022fec -_080FE618: .4byte 0x02021fc4 -_080FE61C: .4byte task_close_bag_menu_1 + 1 + .pool _080FE620: - ldr r1, _080FE62C - ldr r2, _080FE630 + ldr r1, =0x02021fc4 + ldr r2, =sub_81C5B14 + 1 adds r0, r4, 0 bl sub_81C6DD8 b _080FE646 .align 2, 0 -_080FE62C: .4byte 0x02021fc4 -_080FE630: .4byte sub_81C5B14 + 1 + .pool _080FE634: - ldr r0, _080FE64C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -519936,7 +502372,7 @@ _080FE646: pop {r0} bx r0 .align 2, 0 -_080FE64C: .4byte 0x03005e00 + .pool thumb_func_end sub_80FE5E4 thumb_func_start sub_80FE650 @@ -519944,7 +502380,7 @@ sub_80FE650: @ 80FE650 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080FE674 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl sub_81B7CEC lsls r0, 24 @@ -519955,13 +502391,12 @@ sub_80FE650: @ 80FE650 b _080FE75C _080FE66A: lsls r0, 2 - ldr r1, _080FE678 + ldr r1, =_080FE67C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FE674: .4byte 0x0203ce7c -_080FE678: .4byte _080FE67C + .pool .align 2, 0 _080FE67C: .4byte _080FE708 @@ -519986,7 +502421,7 @@ _080FE67C: .4byte _080FE724 .4byte _080FE740 _080FE6D0: - ldr r0, _080FE6E8 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -519997,9 +502432,9 @@ _080FE6D0: bl item_field_func_recovery_item b _080FE770 .align 2, 0 -_080FE6E8: .4byte 0x03005e00 + .pool _080FE6EC: - ldr r0, _080FE704 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -520010,9 +502445,9 @@ _080FE6EC: bl item_in_battle_func_sacred_ash b _080FE770 .align 2, 0 -_080FE704: .4byte 0x03005e00 + .pool _080FE708: - ldr r0, _080FE720 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -520023,9 +502458,9 @@ _080FE708: bl sub_80FDF2C b _080FE770 .align 2, 0 -_080FE720: .4byte 0x03005e00 + .pool _080FE724: - ldr r0, _080FE73C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -520036,9 +502471,9 @@ _080FE724: bl sub_80FDF10 b _080FE770 .align 2, 0 -_080FE73C: .4byte 0x03005e00 + .pool _080FE740: - ldr r0, _080FE758 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -520049,9 +502484,9 @@ _080FE740: bl item_field_func_pp_recovery_item b _080FE770 .align 2, 0 -_080FE758: .4byte 0x03005e00 + .pool _080FE75C: - ldr r0, _080FE778 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -520065,7 +502500,7 @@ _080FE770: pop {r0} bx r0 .align 2, 0 -_080FE778: .4byte 0x03005e00 + .pool thumb_func_end sub_80FE650 thumb_func_start sub_80FE77C @@ -520073,7 +502508,7 @@ sub_80FE77C: @ 80FE77C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080FE79C + ldr r0, =0x0203ce7c ldrh r0, [r0] bl sub_81B7CEC lsls r0, 24 @@ -520081,13 +502516,12 @@ sub_80FE77C: @ 80FE77C cmp r0, 0x15 bhi _080FE814 lsls r0, 2 - ldr r1, _080FE7A0 + ldr r1, =_080FE7A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_080FE79C: .4byte 0x0203ce7c -_080FE7A0: .4byte _080FE7A4 + .pool .align 2, 0 _080FE7A4: .4byte _080FE7FC @@ -520138,7 +502572,7 @@ item_field_func_cannot_use: @ 80FE820 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080FE83C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -520148,14 +502582,14 @@ item_field_func_cannot_use: @ 80FE820 pop {r0} bx r0 .align 2, 0 -_080FE83C: .4byte 0x03005e00 + .pool thumb_func_end item_field_func_cannot_use thumb_func_start sub_80FE840 sub_80FE840: @ 80FE840 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080FE874 + ldr r5, =0x0203841e ldrh r0, [r5] ldrh r1, [r4, 0x20] adds r0, r1 @@ -520168,7 +502602,7 @@ sub_80FE840: @ 80FE840 strh r0, [r4, 0x2E] ldrh r0, [r5, 0x6] strh r0, [r4, 0x30] - ldr r0, _080FE878 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -520178,23 +502612,21 @@ sub_80FE840: @ 80FE840 negs r0, r0 b _080FE87E .align 2, 0 -_080FE874: .4byte 0x0203841e -_080FE878: .4byte 0x02038436 + .pool _080FE87C: ldrh r0, [r5, 0x8] _080FE87E: strh r0, [r4, 0x34] - ldr r0, _080FE890 + ldr r0, =0x0203841e ldrh r0, [r0, 0xA] strh r0, [r4, 0x36] - ldr r0, _080FE894 + ldr r0, =sub_80FE898 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FE890: .4byte 0x0203841e -_080FE894: .4byte sub_80FE898 + 1 + .pool thumb_func_end sub_80FE840 thumb_func_start sub_80FE898 @@ -520243,10 +502675,10 @@ sub_80FE8E0: @ 80FE8E0 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _080FE920 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] - ldr r5, _080FE924 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -520259,19 +502691,16 @@ sub_80FE8E0: @ 80FE8E0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] - ldr r0, _080FE928 + ldr r0, =sub_80A6EEC + 1 str r0, [r4, 0x1C] - ldr r1, _080FE92C + ldr r1, =move_anim_8074EE0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FE920: .4byte 0x0203841e -_080FE924: .4byte 0x02038436 -_080FE928: .4byte sub_80A6EEC + 1 -_080FE92C: .4byte move_anim_8074EE0 + 1 + .pool thumb_func_end sub_80FE8E0 thumb_func_start sub_80FE930 @@ -520280,13 +502709,13 @@ sub_80FE930: @ 80FE930 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r5, _080FE978 + ldr r5, =0x0203841e ldrb r1, [r5, 0x6] adds r0, r4, 0 bl obj_anim_image_start ldrh r0, [r5, 0x4] strh r0, [r4, 0x2E] - ldr r5, _080FE97C + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -520299,19 +502728,16 @@ sub_80FE930: @ 80FE930 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] - ldr r0, _080FE980 + ldr r0, =sub_80A6EEC + 1 str r0, [r4, 0x1C] - ldr r1, _080FE984 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FE978: .4byte 0x0203841e -_080FE97C: .4byte 0x02038437 -_080FE980: .4byte sub_80A6EEC + 1 -_080FE984: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_80FE930 thumb_func_start sub_80FE988 @@ -520320,12 +502746,12 @@ sub_80FE988: @ 80FE988 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r6, _080FE9D8 + ldr r6, =0x0203841e ldrh r0, [r6, 0x4] strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r5, _080FE9DC + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -520344,7 +502770,7 @@ sub_80FE988: @ 80FE988 bl obj_translate_based_on_private_1_2_3_4 ldrh r0, [r6, 0x6] strh r0, [r4, 0x38] - ldr r1, _080FE9E0 + ldr r1, =sub_80FE9E4 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -520352,9 +502778,7 @@ sub_80FE988: @ 80FE988 pop {r0} bx r0 .align 2, 0 -_080FE9D8: .4byte 0x0203841e -_080FE9DC: .4byte 0x02038437 -_080FE9E0: .4byte sub_80FE9E4 + 1 + .pool thumb_func_end sub_80FE988 thumb_func_start sub_80FE9E4 @@ -520373,15 +502797,15 @@ _080FE9FA: ldrsh r0, [r4, r1] cmp r0, 0x7F ble _080FEA14 - ldr r0, _080FEA10 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x1 b _080FEA1E .align 2, 0 -_080FEA10: .4byte 0x02038437 + .pool _080FEA14: - ldr r0, _080FEA54 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x6 @@ -520413,7 +502837,7 @@ _080FEA4E: pop {r0} bx r0 .align 2, 0 -_080FEA54: .4byte 0x02038437 + .pool thumb_func_end sub_80FE9E4 thumb_func_start sub_80FEA58 @@ -520422,7 +502846,7 @@ sub_80FEA58: @ 80FEA58 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _080FEAC8 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -520442,15 +502866,15 @@ sub_80FEA58: @ 80FEA58 strh r0, [r5, 0xA] movs r0, 0x6 strh r0, [r5, 0x8] - ldr r1, _080FEACC + ldr r1, =0x0203841e movs r0, 0xF strh r0, [r1] strh r2, [r1, 0x2] movs r0, 0x50 strh r0, [r1, 0x4] strh r2, [r1, 0x6] - ldr r4, _080FEAD0 - ldr r0, _080FEAD4 + ldr r4, =0x08592210 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 adds r3, r0, 0 @@ -520473,10 +502897,7 @@ _080FEAC0: pop {r0} bx r0 .align 2, 0 -_080FEAC8: .4byte 0x03005e00 -_080FEACC: .4byte 0x0203841e -_080FEAD0: .4byte 0x08592210 -_080FEAD4: .4byte 0x02038437 + .pool thumb_func_end sub_80FEA58 thumb_func_start sub_80FEAD8 @@ -520485,10 +502906,10 @@ sub_80FEAD8: @ 80FEAD8 adds r4, r0, 0 movs r1, 0x1 bl sub_80A6980 - ldr r6, _080FEB1C + ldr r6, =0x0203841e ldrh r0, [r6, 0x6] strh r0, [r4, 0x2E] - ldr r5, _080FEB20 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -520505,15 +502926,13 @@ sub_80FEAD8: @ 80FEAD8 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, _080FEB24 + ldr r0, =sub_80FEB28 + 1 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080FEB1C: .4byte 0x0203841e -_080FEB20: .4byte 0x02038436 -_080FEB24: .4byte sub_80FEB28 + 1 + .pool thumb_func_end sub_80FEAD8 thumb_func_start sub_80FEB28 @@ -520544,7 +502963,7 @@ sub_80FEB44: @ 80FEB44 ands r1, r0 adds r0, r5, 0 bl obj_anim_image_start - ldr r4, _080FEB8C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -520566,7 +502985,7 @@ sub_80FEB44: @ 80FEB44 subs r0, 0x14 b _080FEB94 .align 2, 0 -_080FEB8C: .4byte 0x02038436 + .pool _080FEB90: ldrh r0, [r5, 0x20] adds r0, 0x14 @@ -520581,7 +503000,7 @@ _080FEB94: strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, _080FEBF4 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -520606,7 +503025,7 @@ _080FEB94: adds r0, 0x43 ldrb r0, [r0] strh r0, [r5, 0x3A] - ldr r1, _080FEBF8 + ldr r1, =sub_80FEBFC + 1 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -520614,8 +503033,7 @@ _080FEB94: pop {r0} bx r0 .align 2, 0 -_080FEBF4: .4byte 0x02038437 -_080FEBF8: .4byte sub_80FEBFC + 1 + .pool thumb_func_end sub_80FEB44 thumb_func_start sub_80FEBFC @@ -520667,21 +503085,21 @@ sub_80FEC48: @ 80FEC48 adds r6, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _080FECA8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _080FEC68 - ldr r1, _080FECAC + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] _080FEC68: - ldr r4, _080FECAC + ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, _080FECB0 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -520702,16 +503120,13 @@ _080FEC68: strh r0, [r6, 0x38] adds r0, r6, 0 bl sub_80A68D4 - ldr r0, _080FECB4 + ldr r0, =sub_80FECB8 + 1 str r0, [r6, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080FECA8: .4byte 0x02038436 -_080FECAC: .4byte 0x0203841e -_080FECB0: .4byte 0x02038437 -_080FECB4: .4byte sub_80FECB8 + 1 + .pool thumb_func_end sub_80FEC48 thumb_func_start sub_80FECB8 @@ -520730,9 +503145,9 @@ sub_80FECB8: @ 80FECB8 strb r0, [r2] movs r0, 0xA strh r0, [r4, 0x2E] - ldr r0, _080FECE8 + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] - ldr r1, _080FECEC + ldr r1, =sub_80FECF0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 _080FECE2: @@ -520740,8 +503155,7 @@ _080FECE2: pop {r0} bx r0 .align 2, 0 -_080FECE8: .4byte sub_80A64B0 + 1 -_080FECEC: .4byte sub_80FECF0 + 1 + .pool thumb_func_end sub_80FECB8 thumb_func_start sub_80FECF0 @@ -520760,17 +503174,16 @@ sub_80FECF0: @ 80FECF0 bl obj_anim_image_start movs r0, 0x3C strh r0, [r4, 0x2E] - ldr r0, _080FED20 + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] - ldr r1, _080FED24 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_080FED20: .4byte sub_80A64B0 + 1 -_080FED24: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_80FECF0 thumb_func_start sub_80FED28 @@ -520779,7 +503192,7 @@ sub_80FED28: @ 80FED28 adds r4, r0, 0 movs r1, 0x1 bl sub_80A6980 - ldr r5, _080FED6C + ldr r5, =0x0203841e ldrb r1, [r5, 0x8] adds r0, r4, 0 bl obj_anim_image_start @@ -520799,7 +503212,7 @@ _080FED52: strh r0, [r4, 0x2E] ldrh r0, [r5, 0x4] strh r0, [r4, 0x30] - ldr r1, _080FED70 + ldr r1, =sub_80FED74 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -520807,8 +503220,7 @@ _080FED52: pop {r0} bx r0 .align 2, 0 -_080FED6C: .4byte 0x0203841e -_080FED70: .4byte sub_80FED74 + 1 + .pool thumb_func_end sub_80FED28 thumb_func_start sub_80FED74 @@ -520838,7 +503250,7 @@ sub_80FED74: @ 80FED74 lsrs r0, 16 cmp r0, 0x7F bhi _080FEDC8 - ldr r0, _080FEDC4 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -520851,9 +503263,9 @@ sub_80FED74: @ 80FED74 orrs r0, r1 b _080FEDEC .align 2, 0 -_080FEDC4: .4byte 0x02038437 + .pool _080FEDC8: - ldr r0, _080FEE18 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 adds r0, 0x1 @@ -520894,7 +503306,7 @@ _080FEE10: pop {r0} bx r0 .align 2, 0 -_080FEE18: .4byte 0x02038437 + .pool thumb_func_end sub_80FED74 thumb_func_start sub_80FEE1C @@ -520915,7 +503327,7 @@ _080FEE36: bl move_anim_task_del b _080FEE70 _080FEE3E: - ldr r0, _080FEE5C + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -520928,7 +503340,7 @@ _080FEE3E: bl lcd_bg_operations b _080FEE6A .align 2, 0 -_080FEE5C: .4byte 0x02038437 + .pool _080FEE60: movs r0, 0x1 movs r1, 0x4 @@ -520949,7 +503361,7 @@ sub_80FEE78: @ 80FEE78 adds r4, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r5, _080FEEC0 + ldr r5, =0x0203841e ldrh r0, [r5, 0x6] strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] @@ -520957,7 +503369,7 @@ sub_80FEE78: @ 80FEE78 strh r0, [r4, 0x32] ldrh r0, [r4, 0x22] strh r0, [r4, 0x34] - ldr r0, _080FEEC4 + ldr r0, =0x02038436 ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -520970,7 +503382,7 @@ sub_80FEE78: @ 80FEE78 bl obj_translate_based_on_private_1_2_3_4 movs r0, 0x40 strh r0, [r4, 0x38] - ldr r1, _080FEEC8 + ldr r1, =sub_80FEECC + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -520978,9 +503390,7 @@ sub_80FEE78: @ 80FEE78 pop {r0} bx r0 .align 2, 0 -_080FEEC0: .4byte 0x0203841e -_080FEEC4: .4byte 0x02038436 -_080FEEC8: .4byte sub_80FEECC + 1 + .pool thumb_func_end sub_80FEE78 thumb_func_start sub_80FEECC @@ -521012,15 +503422,15 @@ sub_80FEECC: @ 80FEECC lsrs r0, 16 cmp r0, 0x7F bhi _080FEF18 - ldr r0, _080FEF14 + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 b _080FEF22 .align 2, 0 -_080FEF14: .4byte 0x02038436 + .pool _080FEF18: - ldr r0, _080FEF34 + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x1 @@ -521035,7 +503445,7 @@ _080FEF22: strh r0, [r4, 0x38] b _080FEF3E .align 2, 0 -_080FEF34: .4byte 0x02038436 + .pool _080FEF38: adds r0, r4, 0 bl move_anim_8072740 @@ -521051,7 +503461,7 @@ sub_80FEF44: @ 80FEF44 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r5, _080FEF8C + ldr r5, =0x0203841e ldrh r0, [r5, 0x6] strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] @@ -521059,7 +503469,7 @@ sub_80FEF44: @ 80FEF44 strh r0, [r4, 0x32] ldrh r0, [r4, 0x22] strh r0, [r4, 0x34] - ldr r0, _080FEF90 + ldr r0, =0x02038436 ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -521072,7 +503482,7 @@ sub_80FEF44: @ 80FEF44 bl obj_translate_based_on_private_1_2_3_4 movs r0, 0x40 strh r0, [r4, 0x38] - ldr r1, _080FEF94 + ldr r1, =sub_80FEF98 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -521080,9 +503490,7 @@ sub_80FEF44: @ 80FEF44 pop {r0} bx r0 .align 2, 0 -_080FEF8C: .4byte 0x0203841e -_080FEF90: .4byte 0x02038436 -_080FEF94: .4byte sub_80FEF98 + 1 + .pool thumb_func_end sub_80FEF44 thumb_func_start sub_80FEF98 @@ -521144,7 +503552,7 @@ _080FEFF6: sub_80FEFFC: @ 80FEFFC push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080FF038 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -521157,22 +503565,20 @@ sub_80FEFFC: @ 80FEFFC lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r1, _080FF03C + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0x2E] ldrh r0, [r1, 0x2] strh r0, [r4, 0x30] ldrh r0, [r1, 0x4] strh r0, [r4, 0x32] - ldr r0, _080FF040 + ldr r0, =sub_80FF044 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FF038: .4byte 0x02038436 -_080FF03C: .4byte 0x0203841e -_080FF040: .4byte sub_80FF044 + 1 + .pool thumb_func_end sub_80FEFFC thumb_func_start sub_80FF044 @@ -521199,11 +503605,11 @@ _080FF066: strh r2, [r1, 0x30] strh r2, [r1, 0x32] _080FF06C: - ldr r0, _080FF074 + ldr r0, =sub_80FF090 + 1 str r0, [r1, 0x1C] b _080FF08C .align 2, 0 -_080FF074: .4byte sub_80FF090 + 1 + .pool _080FF078: subs r0, 0x1 strh r0, [r1, 0x32] @@ -521224,7 +503630,7 @@ _080FF08C: sub_80FF090: @ 80FF090 push {r4,lr} adds r4, r0, 0 - ldr r0, _080FF0B0 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -521237,7 +503643,7 @@ sub_80FF090: @ 80FF090 negs r0, r0 b _080FF0BE .align 2, 0 -_080FF0B0: .4byte 0x02038436 + .pool _080FF0B4: movs r1, 0x2E ldrsh r0, [r4, r1] @@ -521279,25 +503685,25 @@ sub_80FF0F4: @ 80FF0F4 adds r5, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _080FF148 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _080FF114 - ldr r1, _080FF14C + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] _080FF114: - ldr r6, _080FF14C + ldr r6, =0x0203841e ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] movs r1, 0xC ldrsh r0, [r6, r1] cmp r0, 0 bne _080FF154 - ldr r4, _080FF150 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -521315,11 +503721,9 @@ _080FF114: adds r0, r6 b _080FF174 .align 2, 0 -_080FF148: .4byte 0x02038436 -_080FF14C: .4byte 0x0203841e -_080FF150: .4byte 0x02038437 + .pool _080FF154: - ldr r0, _080FF1A0 + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -521336,16 +503740,16 @@ _080FF154: adds r0, r1 _080FF174: strh r0, [r5, 0x36] - ldr r0, _080FF1A4 + ldr r0, =0x0203841e ldrh r0, [r0, 0xA] strh r0, [r5, 0x38] adds r0, r5, 0 bl sub_80A68D4 - ldr r0, _080FF1A8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner adds r4, r0, 0 - ldr r0, _080FF1A0 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r4, 24 @@ -521355,20 +503759,18 @@ _080FF174: movs r0, 0x1 b _080FF1AE .align 2, 0 -_080FF1A0: .4byte 0x02038437 -_080FF1A4: .4byte 0x0203841e -_080FF1A8: .4byte 0x02038436 + .pool _080FF1AC: movs r0, 0 _080FF1AE: strh r0, [r5, 0x2E] - ldr r0, _080FF1BC + ldr r0, =sub_80FF1C0 + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080FF1BC: .4byte sub_80FF1C0 + 1 + .pool thumb_func_end sub_80FF0F4 thumb_func_start sub_80FF1C0 @@ -521471,7 +503873,7 @@ sub_80FF268: @ 80FF268 lsrs r0, 24 cmp r0, 0x1 bne _080FF28A - ldr r0, _080FF2B0 + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -521483,7 +503885,7 @@ _080FF28A: ldrh r0, [r4, 0x22] adds r0, 0x20 strh r0, [r4, 0x22] - ldr r1, _080FF2B4 + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0x2E] ldrh r0, [r1, 0x2] @@ -521494,15 +503896,13 @@ _080FF28A: strh r0, [r4, 0x34] ldrh r0, [r1, 0x8] strh r0, [r4, 0x36] - ldr r0, _080FF2B8 + ldr r0, =sub_80FF2BC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_080FF2B0: .4byte 0x02038437 -_080FF2B4: .4byte 0x0203841e -_080FF2B8: .4byte sub_80FF2BC + 1 + .pool thumb_func_end sub_80FF268 thumb_func_start sub_80FF2BC @@ -521559,7 +503959,7 @@ _080FF2F8: ldrsh r0, [r4, r1] cmp r0, 0x7F bgt _080FF338 - ldr r0, _080FF334 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 lsls r0, 24 @@ -521567,9 +503967,9 @@ _080FF2F8: subs r0, 0x1 b _080FF346 .align 2, 0 -_080FF334: .4byte 0x02038437 + .pool _080FF338: - ldr r0, _080FF370 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 lsls r0, 24 @@ -521598,7 +503998,7 @@ _080FF36A: pop {r0} bx r0 .align 2, 0 -_080FF370: .4byte 0x02038437 + .pool thumb_func_end sub_80FF2BC thumb_func_start sub_80FF374 @@ -521613,7 +504013,7 @@ sub_80FF374: @ 80FF374 movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r4, _080FF3A8 + ldr r4, =0x0203841e ldrb r1, [r4, 0x4] adds r0, r5, 0 bl sub_8008258 @@ -521621,23 +504021,22 @@ sub_80FF374: @ 80FF374 strh r0, [r5, 0x3A] ldrh r0, [r4, 0x6] strh r0, [r5, 0x3C] - ldr r0, _080FF3AC + ldr r0, =sub_80FF3B0 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FF3A8: .4byte 0x0203841e -_080FF3AC: .4byte sub_80FF3B0 + 1 + .pool thumb_func_end sub_80FF374 thumb_func_start sub_80FF3B0 sub_80FF3B0: @ 80FF3B0 push {r4,lr} adds r4, r0, 0 - ldr r0, _080FF3E0 + ldr r0, =0x0203841e ldrh r1, [r0, 0xE] - ldr r0, _080FF3E4 + ldr r0, =0x0000ffff cmp r1, r0 bne _080FF3DA adds r2, r4, 0 @@ -521651,16 +504050,14 @@ sub_80FF3B0: @ 80FF3B0 movs r0, 0x80 lsls r0, 1 strh r0, [r4, 0x2E] - ldr r0, _080FF3E8 + ldr r0, =sub_80FF3EC + 1 str r0, [r4, 0x1C] _080FF3DA: pop {r4} pop {r0} bx r0 .align 2, 0 -_080FF3E0: .4byte 0x0203841e -_080FF3E4: .4byte 0x0000ffff -_080FF3E8: .4byte sub_80FF3EC + 1 + .pool thumb_func_end sub_80FF3B0 thumb_func_start sub_80FF3EC @@ -521736,7 +504133,7 @@ sub_80FF458: @ 80FF458 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _080FF494 + ldr r0, =0x02020630 mov r10, r0 lsls r0, r1, 4 adds r0, r1 @@ -521753,12 +504150,12 @@ sub_80FF458: @ 80FF458 bl move_anim_task_del b _080FF51C .align 2, 0 -_080FF494: .4byte 0x02020630 + .pool _080FF498: adds r0, r1, 0 movs r1, 0x1 bl sub_80A7270 - ldr r0, _080FF52C + ldr r0, =0x03005e00 lsls r6, r4, 2 adds r6, r4 lsls r6, 3 @@ -521767,7 +504164,7 @@ _080FF498: lsls r0, 28 lsrs r0, 30 strh r0, [r6, 0x24] - ldr r0, _080FF530 + ldr r0, =0x02038437 mov r9, r0 ldrb r0, [r0] bl sub_80A8328 @@ -521807,7 +504204,7 @@ _080FF498: ands r5, r0 orrs r5, r1 strb r5, [r4, 0x5] - ldr r1, _080FF534 + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r6, 0x8] ldrh r0, [r1, 0x2] @@ -521815,7 +504212,7 @@ _080FF498: movs r0, 0x80 lsls r0, 1 strh r0, [r6, 0x1E] - ldr r0, _080FF538 + ldr r0, =sub_80FF53C + 1 str r0, [r6] _080FF51C: pop {r3-r5} @@ -521826,10 +504223,7 @@ _080FF51C: pop {r0} bx r0 .align 2, 0 -_080FF52C: .4byte 0x03005e00 -_080FF530: .4byte 0x02038437 -_080FF534: .4byte 0x0203841e -_080FF538: .4byte sub_80FF53C + 1 + .pool thumb_func_end sub_80FF458 thumb_func_start sub_80FF53C @@ -521843,7 +504237,7 @@ sub_80FF53C: @ 80FF53C lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _080FF5BC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -521852,7 +504246,7 @@ sub_80FF53C: @ 80FF53C ldrh r0, [r4, 0x1C] adds r1, r0 strh r1, [r4, 0x1C] - ldr r2, _080FF5C0 + ldr r2, =0x02020630 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -521860,7 +504254,7 @@ sub_80FF53C: @ 80FF53C lsls r1, 16 asrs r1, 24 strh r1, [r5, 0x24] - ldr r0, _080FF5C4 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -521889,17 +504283,14 @@ _080FF586: cmp r0, 0 bne _080FF5B4 strh r0, [r4, 0x8] - ldr r0, _080FF5C8 + ldr r0, =sub_80FF5CC + 1 str r0, [r4] _080FF5B4: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080FF5BC: .4byte 0x03005e00 -_080FF5C0: .4byte 0x02020630 -_080FF5C4: .4byte 0x02038437 -_080FF5C8: .4byte sub_80FF5CC + 1 + .pool thumb_func_end sub_80FF53C thumb_func_start sub_80FF5CC @@ -521907,12 +504298,12 @@ sub_80FF5CC: @ 80FF5CC push {r4-r7,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _080FF650 + ldr r0, =0x0203841e ldrh r1, [r0, 0xE] - ldr r0, _080FF654 + ldr r0, =0x0000ffff cmp r1, r0 bne _080FF660 - ldr r0, _080FF658 + ldr r0, =0x03005e00 lsls r2, r3, 2 adds r1, r2, r3 lsls r1, 3 @@ -521929,7 +504320,7 @@ sub_80FF5CC: @ 80FF5CC lsrs r4, 24 adds r0, r4, 0 bl sub_80A7344 - ldr r6, _080FF65C + ldr r6, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -521967,12 +504358,9 @@ sub_80FF5CC: @ 80FF5CC strh r0, [r7, 0x8] b _080FF68E .align 2, 0 -_080FF650: .4byte 0x0203841e -_080FF654: .4byte 0x0000ffff -_080FF658: .4byte 0x03005e00 -_080FF65C: .4byte 0x02020630 + .pool _080FF660: - ldr r1, _080FF694 + ldr r1, =0x03005e00 lsls r2, r3, 2 adds r0, r2, r3 lsls r0, 3 @@ -522000,7 +504388,7 @@ _080FF68E: pop {r0} bx r0 .align 2, 0 -_080FF694: .4byte 0x03005e00 + .pool thumb_func_end sub_80FF5CC thumb_func_start sub_80FF698 @@ -522015,13 +504403,13 @@ sub_80FF698: @ 80FF698 beq _080FF704 b _080FF756 _080FF6AA: - ldr r6, _080FF6FC + ldr r6, =0x02038437 ldrb r0, [r6] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _080FF6C2 - ldr r1, _080FF700 + ldr r1, =0x0203841e movs r2, 0 ldrsh r0, [r1, r2] negs r0, r0 @@ -522031,7 +504419,7 @@ _080FF6C2: movs r1, 0 bl sub_80A5C6C lsls r0, 24 - ldr r4, _080FF700 + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4] adds r0, r1 @@ -522055,8 +504443,7 @@ _080FF6C2: strh r0, [r5, 0x2E] b _080FF756 .align 2, 0 -_080FF6FC: .4byte 0x02038437 -_080FF700: .4byte 0x0203841e + .pool _080FF704: adds r2, r5, 0 adds r2, 0x3E @@ -522077,7 +504464,7 @@ _080FF704: bl sub_80082B8 movs r0, 0x19 strh r0, [r5, 0x2E] - ldr r4, _080FF75C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -522090,9 +504477,9 @@ _080FF704: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, _080FF760 + ldr r0, =sub_80A70C0 + 1 str r0, [r5, 0x1C] - ldr r1, _080FF764 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 _080FF756: @@ -522100,9 +504487,7 @@ _080FF756: pop {r0} bx r0 .align 2, 0 -_080FF75C: .4byte 0x02038436 -_080FF760: .4byte sub_80A70C0 + 1 -_080FF764: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_80FF698 thumb_func_start sub_80FF768 @@ -522113,7 +504498,7 @@ sub_80FF768: @ 80FF768 ldrsh r0, [r5, r1] cmp r0, 0 bne _080FF7D4 - ldr r4, _080FF7E0 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -522126,7 +504511,7 @@ sub_80FF768: @ 80FF768 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r4, _080FF7E4 + ldr r4, =0x0203841e ldrh r0, [r4] strh r0, [r5, 0x24] ldrh r0, [r4, 0x2] @@ -522159,15 +504544,13 @@ sub_80FF768: @ 80FF768 adds r1, r0 strh r1, [r5, 0x22] _080FF7D4: - ldr r0, _080FF7E8 + ldr r0, =sub_80FF8DC + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FF7E0: .4byte 0x02038436 -_080FF7E4: .4byte 0x0203841e -_080FF7E8: .4byte sub_80FF8DC + 1 + .pool thumb_func_end sub_80FF768 thumb_func_start sub_80FF7EC @@ -522179,7 +504562,7 @@ sub_80FF7EC: @ 80FF7EC push {r4-r6} sub sp, 0x4 mov r9, r0 - ldr r4, _080FF8C8 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -522194,7 +504577,7 @@ sub_80FF7EC: @ 80FF7EC lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r6, _080FF8CC + ldr r6, =0x02038437 ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -522216,7 +504599,7 @@ sub_80FF7EC: @ 80FF7EC lsrs r3, r4, 16 mov r10, r3 asrs r4, 16 - ldr r6, _080FF8D0 + ldr r6, =0x0203841e movs r1, 0 ldrsh r0, [r6, r1] muls r0, r4 @@ -522254,9 +504637,9 @@ sub_80FF7EC: @ 80FF7EC ldrh r0, [r6, 0xA] mov r1, r9 strh r0, [r1, 0x32] - ldr r0, _080FF8D4 + ldr r0, =sub_80FF8DC + 1 str r0, [r1, 0x1C] - ldr r1, _080FF8D8 + ldr r1, =0x0203a0f8 mov r3, r9 ldrh r0, [r3, 0x20] strh r0, [r1] @@ -522275,11 +504658,7 @@ sub_80FF7EC: @ 80FF7EC pop {r0} bx r0 .align 2, 0 -_080FF8C8: .4byte 0x02038436 -_080FF8CC: .4byte 0x02038437 -_080FF8D0: .4byte 0x0203841e -_080FF8D4: .4byte sub_80FF8DC + 1 -_080FF8D8: .4byte 0x0203a0f8 + .pool thumb_func_end sub_80FF7EC thumb_func_start sub_80FF8DC @@ -522338,12 +504717,12 @@ sub_80FF934: @ 80FF934 ldrsh r0, [r6, r1] cmp r0, 0 bne _080FF974 - ldr r5, _080FF9B0 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 - ldr r4, _080FF9B4 + ldr r4, =0x0203841e lsrs r0, 24 ldrh r2, [r4] adds r0, r2 @@ -522393,8 +504772,7 @@ _080FF9AA: pop {r0} bx r0 .align 2, 0 -_080FF9B0: .4byte 0x02038436 -_080FF9B4: .4byte 0x0203841e + .pool thumb_func_end sub_80FF934 thumb_func_start sub_80FF9B8 @@ -522579,14 +504957,14 @@ _080FFADE: beq _080FFB0E strh r5, [r4, 0x26] strh r5, [r4, 0x2E] - ldr r0, _080FFB14 + ldr r0, =sub_80FFA84 + 1 str r0, [r4, 0x1C] _080FFB0E: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FFB14: .4byte sub_80FFA84 + 1 + .pool thumb_func_end sub_80FFAB4 thumb_func_start sub_80FFB18 @@ -522595,7 +504973,7 @@ sub_80FFB18: @ 80FFB18 adds r5, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r4, _080FFB60 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -522606,7 +504984,7 @@ sub_80FFB18: @ 80FFB18 bl sub_80A5C6C lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080FFB64 + ldr r0, =0x02038436 ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -522623,8 +505001,7 @@ sub_80FFB18: @ 80FFB18 movs r0, 0x1 b _080FFB7A .align 2, 0 -_080FFB60: .4byte 0x02038437 -_080FFB64: .4byte 0x02038436 + .pool _080FFB68: strh r6, [r5, 0x3A] adds r0, r2, 0 @@ -522638,13 +505015,13 @@ _080FFB7A: strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] - ldr r0, _080FFB8C + ldr r0, =sub_80FFAB4 + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080FFB8C: .4byte sub_80FFAB4 + 1 + .pool thumb_func_end sub_80FFB18 thumb_func_start sub_80FFB90 @@ -522702,7 +505079,7 @@ _080FFBEC: sub_80FFBF4: @ 80FFBF4 push {r4-r6,lr} adds r5, r0, 0 - ldr r4, _080FFC30 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x1 bl sub_80A5C6C @@ -522725,11 +505102,10 @@ sub_80FFBF4: @ 80FFBF4 strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] - ldr r0, _080FFC34 + ldr r0, =sub_80FFAB4 + 1 b _080FFC62 .align 2, 0 -_080FFC30: .4byte 0x02038437 -_080FFC34: .4byte sub_80FFAB4 + 1 + .pool _080FFC38: movs r0, 0xFF strh r0, [r5, 0x3A] @@ -522750,14 +505126,14 @@ _080FFC50: strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] - ldr r0, _080FFC6C + ldr r0, =sub_80FFB90 + 1 _080FFC62: str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080FFC6C: .4byte sub_80FFB90 + 1 + .pool thumb_func_end sub_80FFBF4 thumb_func_start sub_80FFC70 @@ -522771,7 +505147,7 @@ sub_80FFC70: @ 80FFC70 adds r0, r4, 0 movs r1, 0 bl sub_80A6980 - ldr r0, _080FFCB0 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x30] _080FFC8A: @@ -522795,7 +505171,7 @@ _080FFCAA: pop {r0} bx r0 .align 2, 0 -_080FFCB0: .4byte 0x0203841e + .pool thumb_func_end sub_80FFC70 thumb_func_start sub_80FFCB4 @@ -522804,7 +505180,7 @@ sub_80FFCB4: @ 80FFCB4 adds r5, r0, 0 movs r1, 0 bl sub_80A6980 - ldr r4, _080FFCFC + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -522815,7 +505191,7 @@ sub_80FFCB4: @ 80FFCB4 bl sub_80A5C6C lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _080FFD00 + ldr r0, =0x02038437 ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -522832,8 +505208,7 @@ sub_80FFCB4: @ 80FFCB4 movs r0, 0x1 b _080FFD16 .align 2, 0 -_080FFCFC: .4byte 0x02038436 -_080FFD00: .4byte 0x02038437 + .pool _080FFD04: strh r6, [r5, 0x3A] adds r0, r2, 0 @@ -522847,13 +505222,13 @@ _080FFD16: strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] - ldr r0, _080FFD28 + ldr r0, =sub_80FFD2C + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_080FFD28: .4byte sub_80FFD2C + 1 + .pool thumb_func_end sub_80FFCB4 thumb_func_start sub_80FFD2C @@ -522910,7 +505285,7 @@ _080FFD8A: beq _080FFDB2 strh r5, [r4, 0x26] strh r5, [r4, 0x2E] - ldr r0, _080FFDB8 + ldr r0, =sub_80FFA84 + 1 str r0, [r4, 0x1C] movs r0, 0x40 negs r0, r0 @@ -522925,7 +505300,7 @@ _080FFDB2: pop {r0} bx r0 .align 2, 0 -_080FFDB8: .4byte sub_80FFA84 + 1 + .pool thumb_func_end sub_80FFD2C thumb_func_start sub_80FFDBC @@ -522940,7 +505315,7 @@ sub_80FFDBC: @ 80FFDBC lsls r0, 24 cmp r0, 0 bne _080FFDE4 - ldr r0, _080FFDE0 + ldr r0, =0x0203841e ldrh r1, [r0, 0x2] strh r1, [r4, 0x30] movs r1, 0x78 @@ -522948,9 +505323,9 @@ sub_80FFDBC: @ 80FFDBC adds r5, r0, 0 b _080FFE06 .align 2, 0 -_080FFDE0: .4byte 0x0203841e + .pool _080FFDE4: - ldr r0, _080FFE40 + ldr r0, =0x0203841e movs r1, 0x2 ldrsh r3, [r0, r1] adds r1, r3, 0 @@ -522984,7 +505359,7 @@ _080FFE06: movs r1, 0x14 bl sine strh r0, [r4, 0x26] - ldr r0, _080FFE44 + ldr r0, =sub_80FFE58 + 1 str r0, [r4, 0x1C] ldrh r0, [r4, 0x30] subs r0, 0x1 @@ -522997,8 +505372,7 @@ _080FFE06: movs r0, 0x1F b _080FFE4E .align 2, 0 -_080FFE40: .4byte 0x0203841e -_080FFE44: .4byte sub_80FFE58 + 1 + .pool _080FFE48: adds r1, r4, 0 adds r1, 0x43 @@ -523061,21 +505435,21 @@ _080FFE9A: movs r0, 0 strh r0, [r4, 0x2E] strh r0, [r4, 0x32] - ldr r0, _080FFEC0 + ldr r0, =sub_80FFEC4 + 1 str r0, [r4, 0x1C] _080FFEBA: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080FFEC0: .4byte sub_80FFEC4 + 1 + .pool thumb_func_end sub_80FFE58 thumb_func_start sub_80FFEC4 sub_80FFEC4: @ 80FFEC4 push {r4-r6,lr} adds r4, r0, 0 - ldr r5, _080FFF08 + ldr r5, =0x08592700 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -523099,7 +505473,7 @@ sub_80FFEC4: @ 80FFEC4 bne _080FFEFC movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, _080FFF0C + ldr r0, =sub_80FFF7C + 1 str r0, [r4, 0x1C] _080FFEFC: movs r0, 0 @@ -523109,8 +505483,7 @@ _080FFEFC: strh r0, [r4, 0x2E] b _080FFF76 .align 2, 0 -_080FFF08: .4byte 0x08592700 -_080FFF0C: .4byte sub_80FFF7C + 1 + .pool _080FFF10: adds r0, r2, 0x1 strh r0, [r4, 0x32] @@ -523215,9 +505588,9 @@ sub_80FFFC0: @ 80FFFC0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08100114 + ldr r1, =0x03005e00 adds r5, r0, r1 - ldr r4, _08100118 + ldr r4, =0x02038437 ldrb r0, [r4] bl sub_80A82E4 lsls r0, 24 @@ -523267,7 +505640,7 @@ _08100028: ldrh r1, [r5, 0x14] adds r0, r1 strh r0, [r5, 0x18] - ldr r0, _0810011C + ldr r0, =0x08592778 movs r2, 0x18 ldrsh r1, [r5, r2] movs r3, 0x1A @@ -523282,7 +505655,7 @@ _08100028: adds r0, r6, 0 bl move_anim_task_del _08100060: - ldr r4, _08100120 + ldr r4, =0x02020630 movs r0, 0xC ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -523364,17 +505737,13 @@ _08100060: lsls r0, 2 adds r0, r4 bl sub_80A68D4 - ldr r0, _08100124 + ldr r0, =sub_8100128 + 1 str r0, [r5] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08100114: .4byte 0x03005e00 -_08100118: .4byte 0x02038437 -_0810011C: .4byte 0x08592778 -_08100120: .4byte 0x02020630 -_08100124: .4byte sub_8100128 + 1 + .pool thumb_func_end sub_80FFFC0 thumb_func_start sub_8100128 @@ -523385,14 +505754,14 @@ sub_8100128: @ 8100128 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0810016C + ldr r1, =0x03005e00 adds r6, r0, r1 movs r0, 0xC ldrsh r1, [r6, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08100170 + ldr r1, =0x02020630 adds r4, r0, r1 movs r1, 0x8 ldrsh r5, [r6, r1] @@ -523416,8 +505785,7 @@ _0810015A: beq _081001E6 b _081004FC .align 2, 0 -_0810016C: .4byte 0x03005e00 -_08100170: .4byte 0x02020630 + .pool _08100174: cmp r5, 0x5 bne _0810017A @@ -523908,7 +506276,7 @@ sub_8100524: @ 8100524 ble _081005BA movs r0, 0 strh r0, [r6, 0x24] - ldr r0, _081005C4 + ldr r0, =0x02020630 mov r8, r0 movs r2, 0xC ldrsh r1, [r6, r2] @@ -523922,7 +506290,7 @@ sub_8100524: @ 8100524 ldrh r2, [r0, 0x26] ldrh r0, [r0, 0x22] adds r2, r0 - ldr r0, _081005C8 + ldr r0, =0x08592778 lsls r1, 16 asrs r1, 16 lsls r2, 16 @@ -523941,7 +506309,7 @@ sub_8100524: @ 8100524 strh r7, [r4, 0x3A] movs r0, 0xC strh r0, [r4, 0x3C] - ldr r0, _081005CC + ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -523965,7 +506333,7 @@ sub_8100524: @ 8100524 mov r0, r8 adds r0, 0x1C adds r5, r0 - ldr r0, _081005D0 + ldr r0, =sub_81005D4 + 1 str r0, [r5] _081005BA: pop {r3} @@ -523974,10 +506342,7 @@ _081005BA: pop {r0} bx r0 .align 2, 0 -_081005C4: .4byte 0x02020630 -_081005C8: .4byte 0x08592778 -_081005CC: .4byte 0x03005e00 -_081005D0: .4byte sub_81005D4 + 1 + .pool thumb_func_end sub_8100524 thumb_func_start sub_81005D4 @@ -524013,7 +506378,7 @@ sub_81005D4: @ 81005D4 asrs r0, 16 cmp r0, 0x8 ble _08100636 - ldr r3, _0810063C + ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -524035,25 +506400,24 @@ _08100636: pop {r0} bx r0 .align 2, 0 -_0810063C: .4byte 0x03005e00 + .pool thumb_func_end sub_81005D4 thumb_func_start sub_8100640 sub_8100640: @ 8100640 push {r4-r7,lr} adds r4, r0, 0 - ldr r0, _08100654 + ldr r0, =0x0203841e movs r1, 0xC ldrsh r0, [r0, r1] cmp r0, 0 bne _0810065C - ldr r0, _08100658 + ldr r0, =0x02038436 b _0810065E .align 2, 0 -_08100654: .4byte 0x0203841e -_08100658: .4byte 0x02038436 + .pool _0810065C: - ldr r0, _0810067C + ldr r0, =0x02038437 _0810065E: ldrb r6, [r0] adds r0, r6, 0 @@ -524063,19 +506427,17 @@ _0810065E: beq _08100688 movs r0, 0 strh r0, [r4, 0x36] - ldr r1, _08100680 + ldr r1, =0x0203841e ldrh r0, [r1, 0x6] strh r0, [r4, 0x32] - ldr r0, _08100684 + ldr r0, =0x0000fff0 b _08100698 .align 2, 0 -_0810067C: .4byte 0x02038437 -_08100680: .4byte 0x0203841e -_08100684: .4byte 0x0000fff0 + .pool _08100688: movs r0, 0x1 strh r0, [r4, 0x36] - ldr r1, _081006BC + ldr r1, =0x0203841e ldrh r0, [r1, 0x6] negs r0, r0 strh r0, [r4, 0x32] @@ -524101,7 +506463,7 @@ _08100698: beq _081006CA b _08100738 .align 2, 0 -_081006BC: .4byte 0x0203841e + .pool _081006C0: cmp r0, 0x2 beq _081006D4 @@ -524138,7 +506500,7 @@ _081006E4: strb r0, [r4, 0x5] b _08100738 _08100700: - ldr r0, _08100744 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -524165,14 +506527,13 @@ _0810071A: orrs r1, r0 strb r1, [r4, 0x5] _08100738: - ldr r0, _08100748 + ldr r0, =sub_810074C + 1 str r0, [r4, 0x1C] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08100744: .4byte 0x02038437 -_08100748: .4byte sub_810074C + 1 + .pool thumb_func_end sub_8100640 thumb_func_start sub_810074C @@ -524186,7 +506547,7 @@ sub_810074C: @ 810074C strh r0, [r4, 0x3C] movs r1, 0x30 ldrsh r2, [r4, r1] - ldr r1, _081007A0 + ldr r1, =0x08329f40 movs r5, 0x2E ldrsh r0, [r4, r5] lsls r0, 1 @@ -524219,7 +506580,7 @@ sub_810074C: @ 810074C ble _081007BC b _081007B6 .align 2, 0 -_081007A0: .4byte 0x08329f40 + .pool _081007A4: movs r1, 0x24 ldrsh r0, [r4, r1] @@ -524247,7 +506608,7 @@ sub_81007C4: @ 81007C4 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081007E4 + ldr r1, =0x03005e00 adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -524257,9 +506618,9 @@ sub_81007C4: @ 81007C4 beq _0810081C b _08100876 .align 2, 0 -_081007E4: .4byte 0x03005e00 + .pool _081007E8: - ldr r0, _08100814 + ldr r0, =0x0000274f bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 20 @@ -524268,7 +506629,7 @@ _081007E8: adds r4, r2, 0 adds r0, r4 strh r0, [r5, 0x18] - ldr r0, _08100818 + ldr r0, =0x000027b0 bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 20 @@ -524279,8 +506640,7 @@ _081007E8: strh r0, [r5, 0x8] b _08100876 .align 2, 0 -_08100814: .4byte 0x0000274f -_08100818: .4byte 0x000027b0 + .pool _0810081C: ldrh r0, [r5, 0x1A] adds r0, 0x1 @@ -524292,7 +506652,7 @@ _0810081C: strh r7, [r5, 0x1A] ldrh r0, [r5, 0x18] ldrb r2, [r5, 0x1C] - ldr r4, _08100890 + ldr r4, =0x08592878 movs r3, 0x1E ldrsh r1, [r5, r3] lsls r1, 1 @@ -524326,7 +506686,7 @@ _0810081C: bne _08100876 strh r7, [r5, 0x1E] _08100876: - ldr r0, _08100894 + ldr r0, =0x0203841e movs r2, 0xE ldrsh r1, [r0, r2] movs r0, 0x1 @@ -524340,8 +506700,7 @@ _0810088A: pop {r0} bx r0 .align 2, 0 -_08100890: .4byte 0x08592878 -_08100894: .4byte 0x0203841e + .pool thumb_func_end sub_81007C4 thumb_func_start sub_8100898 @@ -524349,7 +506708,7 @@ sub_8100898: @ 8100898 push {r4-r7,lr} sub sp, 0x4 adds r6, r0, 0 - ldr r1, _081008B0 + ldr r1, =0x0203841e movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 @@ -524358,18 +506717,18 @@ sub_8100898: @ 8100898 bl move_anim_8072740 b _0810098E .align 2, 0 -_081008B0: .4byte 0x0203841e + .pool _081008B4: movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0 bne _081008C4 - ldr r4, _081008C0 + ldr r4, =0x02038436 b _081008C6 .align 2, 0 -_081008C0: .4byte 0x02038436 + .pool _081008C4: - ldr r4, _08100900 + ldr r4, =0x02038437 _081008C6: ldrb r0, [r4] movs r1, 0x2 @@ -524381,7 +506740,7 @@ _081008C6: bl sub_80A5C6C lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08100904 + ldr r0, =0x0203841e ldrh r1, [r0, 0x8] strh r1, [r6, 0x2E] movs r3, 0x2 @@ -524399,8 +506758,7 @@ _081008C6: strh r2, [r6, 0x3A] b _08100918 .align 2, 0 -_08100900: .4byte 0x02038437 -_08100904: .4byte 0x0203841e + .pool _08100908: strh r5, [r6, 0x20] strh r2, [r6, 0x22] @@ -524452,7 +506810,7 @@ _08100918: lsls r0, 24 cmp r0, 0 beq _0810097A - ldr r1, _08100998 + ldr r1, =0xffff8000 adds r0, r4, r1 lsls r0, 16 lsrs r4, r0, 16 @@ -524464,7 +506822,7 @@ _0810097A: movs r1, 0 adds r2, r3, 0 bl sub_80A73E0 - ldr r0, _0810099C + ldr r0, =sub_81009A0 + 1 str r0, [r6, 0x1C] _0810098E: add sp, 0x4 @@ -524472,8 +506830,7 @@ _0810098E: pop {r0} bx r0 .align 2, 0 -_08100998: .4byte 0xffff8000 -_0810099C: .4byte sub_81009A0 + 1 + .pool thumb_func_end sub_8100898 thumb_func_start sub_81009A0 @@ -524532,13 +506889,13 @@ _081009F2: sub_81009F8: @ 81009F8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08100A18 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08100A20 - ldr r2, _08100A1C + ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] subs r0, r1 @@ -524546,10 +506903,9 @@ sub_81009F8: @ 81009F8 ldrh r0, [r2, 0x2] b _08100A2C .align 2, 0 -_08100A18: .4byte 0x02038436 -_08100A1C: .4byte 0x0203841e + .pool _08100A20: - ldr r0, _08100A44 + ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r4, 0x20] adds r1, r2 @@ -524559,25 +506915,23 @@ _08100A2C: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, _08100A48 + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] - ldr r1, _08100A4C + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_08100A44: .4byte 0x0203841e -_08100A48: .4byte sub_80A67D8 + 1 -_08100A4C: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_81009F8 thumb_func_start sub_8100A50 sub_8100A50: @ 8100A50 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08100A88 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -524587,9 +506941,9 @@ sub_8100A50: @ 8100A50 movs r1, 0x1 bl obj_anim_image_start _08100A6A: - ldr r0, _08100A8C + ldr r0, =sub_81009DC + 1 str r0, [r5, 0x1C] - ldr r4, _08100A90 + ldr r4, =0x0203841e movs r0, 0 ldrsh r1, [r4, r0] adds r0, r5, 0 @@ -524602,16 +506956,14 @@ _08100A6A: pop {r0} bx r0 .align 2, 0 -_08100A88: .4byte 0x02038436 -_08100A8C: .4byte sub_81009DC + 1 -_08100A90: .4byte 0x0203841e + .pool thumb_func_end sub_8100A50 thumb_func_start sub_8100A94 sub_8100A94: @ 8100A94 push {r4,lr} adds r4, r0, 0 - ldr r1, _08100AD4 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -524631,25 +506983,23 @@ sub_8100A94: @ 8100A94 ldrb r1, [r1, 0xC] adds r0, r4, 0 bl sub_8008258 - ldr r1, _08100AD8 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _08100ADC + ldr r0, =sub_80A66DC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08100AD4: .4byte 0x0203841e -_08100AD8: .4byte move_anim_8074EE0 + 1 -_08100ADC: .4byte sub_80A66DC + 1 + .pool thumb_func_end sub_8100A94 thumb_func_start sub_8100AE0 sub_8100AE0: @ 8100AE0 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08100B30 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -524671,9 +507021,9 @@ sub_8100AE0: @ 8100AE0 adds r0, 0x8 strh r0, [r5, 0x22] _08100B14: - ldr r0, _08100B34 + ldr r0, =sub_8100CCC + 1 str r0, [r5, 0x1C] - ldr r0, _08100B38 + ldr r0, =0x0203841e movs r2, 0x4 ldrsh r1, [r0, r2] adds r3, r0, 0 @@ -524685,9 +507035,7 @@ _08100B14: strh r0, [r5, 0x20] b _08100B50 .align 2, 0 -_08100B30: .4byte 0x02038437 -_08100B34: .4byte sub_8100CCC + 1 -_08100B38: .4byte 0x0203841e + .pool _08100B3C: ldrh r0, [r5, 0x20] ldrh r1, [r3] @@ -524704,7 +507052,7 @@ _08100B50: ldrh r2, [r5, 0x22] adds r0, r2 strh r0, [r5, 0x22] - ldr r1, _08100B84 + ldr r1, =0xfffffc00 adds r0, r1, 0 ldrh r2, [r5, 0x30] adds r1, r0, r2 @@ -524728,7 +507076,7 @@ _08100B7E: pop {r0} bx r0 .align 2, 0 -_08100B84: .4byte 0xfffffc00 + .pool thumb_func_end sub_8100AE0 thumb_func_start sub_8100B88 @@ -524737,7 +507085,7 @@ sub_8100B88: @ 8100B88 mov r7, r8 push {r7} adds r6, r0, 0 - ldr r0, _08100BA4 + ldr r0, =0x0203841e movs r1, 0x6 ldrsh r0, [r0, r1] cmp r0, 0x1 @@ -524748,9 +507096,9 @@ sub_8100B88: @ 8100B88 beq _08100BC8 b _08100C24 .align 2, 0 -_08100BA4: .4byte 0x0203841e + .pool _08100BA8: - ldr r5, _08100BC4 + ldr r5, =0x02038437 ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -524763,9 +507111,9 @@ _08100BA8: adds r0, r4, 0 b _08100C34 .align 2, 0 -_08100BC4: .4byte 0x02038437 + .pool _08100BC8: - ldr r5, _08100C20 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -524805,9 +507153,9 @@ _08100BC8: lsrs r4, r0, 1 b _08100C3E .align 2, 0 -_08100C20: .4byte 0x02038437 + .pool _08100C24: - ldr r4, _08100C70 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -524822,7 +507170,7 @@ _08100C34: _08100C3E: strh r7, [r6, 0x20] strh r4, [r6, 0x22] - ldr r0, _08100C70 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -524832,9 +507180,9 @@ _08100C3E: adds r0, 0x8 strh r0, [r6, 0x22] _08100C56: - ldr r0, _08100C74 + ldr r0, =sub_8100CCC + 1 str r0, [r6, 0x1C] - ldr r0, _08100C78 + ldr r0, =0x0203841e movs r2, 0x4 ldrsh r1, [r0, r2] adds r3, r0, 0 @@ -524846,9 +507194,7 @@ _08100C56: strh r0, [r6, 0x20] b _08100C90 .align 2, 0 -_08100C70: .4byte 0x02038437 -_08100C74: .4byte sub_8100CCC + 1 -_08100C78: .4byte 0x0203841e + .pool _08100C7C: ldrh r0, [r6, 0x20] ldrh r1, [r3] @@ -524865,7 +507211,7 @@ _08100C90: ldrh r2, [r6, 0x22] adds r0, r2 strh r0, [r6, 0x22] - ldr r1, _08100CC8 + ldr r1, =0xfffffc00 adds r0, r1, 0 ldrh r2, [r6, 0x30] adds r1, r0, r2 @@ -524891,7 +507237,7 @@ _08100CBE: pop {r0} bx r0 .align 2, 0 -_08100CC8: .4byte 0xfffffc00 + .pool thumb_func_end sub_8100B88 thumb_func_start sub_8100CCC @@ -524936,20 +507282,19 @@ _08100CF2: asrs r0, 16 cmp r0, 0x14 bne _08100D28 - ldr r1, _08100D30 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 movs r0, 0x3 strh r0, [r4, 0x2E] - ldr r0, _08100D34 + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] _08100D28: pop {r4} pop {r0} bx r0 .align 2, 0 -_08100D30: .4byte move_anim_8072740 + 1 -_08100D34: .4byte sub_80A64B0 + 1 + .pool thumb_func_end sub_8100CCC thumb_func_start sub_8100D38 @@ -524974,7 +507319,7 @@ sub_8100D38: @ 8100D38 adds r0, r2, 0 ands r0, r1 strb r0, [r3] - ldr r4, _08100D90 + ldr r4, =0x02020630 movs r0, 0x2E ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -524998,7 +507343,7 @@ sub_8100D38: @ 8100D38 strb r2, [r0] b _08100DCA .align 2, 0 -_08100D90: .4byte 0x02020630 + .pool _08100D94: adds r1, r5, 0 adds r1, 0x3E @@ -525006,7 +507351,7 @@ _08100D94: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r3, _08100DD8 + ldr r3, =0x02020630 movs r0, 0x2E ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -525035,7 +507380,7 @@ _08100DCA: strh r0, [r5, 0x34] b _08100DE0 .align 2, 0 -_08100DD8: .4byte 0x02020630 + .pool _08100DDC: adds r0, r1, 0x1 strh r0, [r5, 0x32] @@ -525049,7 +507394,7 @@ _08100DE0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08100E18 + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles movs r0, 0x30 @@ -525066,17 +507411,17 @@ _08100E10: pop {r0} bx r0 .align 2, 0 -_08100E18: .4byte 0x02020630 + .pool thumb_func_end sub_8100D38 thumb_func_start sub_8100E1C sub_8100E1C: @ 8100E1C push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08100E3C + ldr r4, =0x0203841e ldrh r0, [r4, 0x4] strh r0, [r5, 0x2E] - ldr r0, _08100E40 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -525087,15 +507432,14 @@ sub_8100E1C: @ 8100E1C subs r0, r1 b _08100E4A .align 2, 0 -_08100E3C: .4byte 0x0203841e -_08100E40: .4byte 0x02038436 + .pool _08100E44: ldrh r0, [r4] ldrh r1, [r5, 0x20] adds r0, r1 _08100E4A: strh r0, [r5, 0x20] - ldr r4, _08100E78 + ldr r4, =0x0203841e ldrb r1, [r4, 0xA] adds r0, r5, 0 bl obj_anim_image_start @@ -525108,7 +507452,7 @@ _08100E4A: strh r0, [r5, 0x22] ldrh r0, [r4, 0x8] strh r0, [r5, 0x34] - ldr r1, _08100E7C + ldr r1, =sub_8100E80 + 1 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -525116,8 +507460,7 @@ _08100E4A: pop {r0} bx r0 .align 2, 0 -_08100E78: .4byte 0x0203841e -_08100E7C: .4byte sub_8100E80 + 1 + .pool thumb_func_end sub_8100E1C thumb_func_start sub_8100E80 @@ -525187,17 +507530,17 @@ sub_8100EF0: @ 8100EF0 lsls r0, 24 cmp r0, 0 beq _08100F06 - ldr r1, _08100F64 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] adds r0, 0x8 strh r0, [r1, 0x2] _08100F06: - ldr r6, _08100F68 + ldr r6, =0x02038436 ldrb r0, [r6] movs r1, 0 bl sub_80A60AC lsls r0, 24 - ldr r4, _08100F64 + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4] adds r0, r1 @@ -525236,8 +507579,7 @@ _08100F44: strb r1, [r5, 0x5] b _08100F84 .align 2, 0 -_08100F64: .4byte 0x0203841e -_08100F68: .4byte 0x02038436 + .pool _08100F6C: ldrb r0, [r6] bl sub_80A8328 @@ -525251,10 +507593,10 @@ _08100F6C: orrs r0, r1 strb r0, [r5, 0x5] _08100F84: - ldr r0, _08100FC8 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r5, 0x2E] - ldr r0, _08100FCC + ldr r0, =0x00002828 bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 20 @@ -525277,15 +507619,13 @@ _08100F84: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set - ldr r0, _08100FD0 + ldr r0, =sub_8100FD4 + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08100FC8: .4byte 0x0203841e -_08100FCC: .4byte 0x00002828 -_08100FD0: .4byte sub_8100FD4 + 1 + .pool thumb_func_end sub_8100EF0 thumb_func_start sub_8100FD4 @@ -525308,7 +507648,7 @@ sub_8100FD4: @ 8100FD4 ble _08101032 movs r0, 0 strh r0, [r4, 0x30] - ldr r1, _0810107C + ldr r1, =0x02037b14 movs r2, 0x32 ldrsh r0, [r4, r2] adds r0, 0x1 @@ -525377,7 +507717,7 @@ _0810106C: strh r0, [r4, 0x2E] b _081010C2 .align 2, 0 -_0810107C: .4byte 0x02037b14 + .pool _08101080: ldrh r0, [r4, 0x3A] adds r0, 0x1 @@ -525409,21 +507749,21 @@ _08101080: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _081010C8 + ldr r0, =sub_80A67F4 + 1 str r0, [r4, 0x1C] _081010C2: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081010C8: .4byte sub_80A67F4 + 1 + .pool thumb_func_end sub_8100FD4 thumb_func_start sub_81010CC sub_81010CC: @ 81010CC push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _0810112C + ldr r6, =0x02038437 ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -525436,7 +507776,7 @@ sub_81010CC: @ 81010CC bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 - ldr r1, _08101130 + ldr r1, =0x0000ffe8 adds r0, r1 strh r0, [r4, 0x22] strh r5, [r4, 0x2E] @@ -525459,15 +507799,13 @@ sub_81010CC: @ 81010CC lsrs r1, 16 movs r0, 0x52 bl lcd_io_set - ldr r0, _08101134 + ldr r0, =sub_8101138 + 1 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810112C: .4byte 0x02038437 -_08101130: .4byte 0x0000ffe8 -_08101134: .4byte sub_8101138 + 1 + .pool thumb_func_end sub_81010CC thumb_func_start sub_8101138 @@ -525481,12 +507819,12 @@ sub_8101138: @ 8101138 b _08101290 _08101146: lsls r0, 2 - ldr r1, _08101150 + ldr r1, =_08101154 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08101150: .4byte _08101154 + .pool .align 2, 0 _08101154: .4byte _08101168 @@ -525721,7 +508059,7 @@ _08101304: sub_810130C: @ 810130C push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08101350 + ldr r5, =0x0203841e movs r1, 0x4 ldrsh r0, [r5, r1] cmp r0, 0 @@ -525743,36 +508081,33 @@ _08101320: strh r0, [r4, 0x30] ldrh r0, [r5, 0x8] strh r0, [r4, 0x32] - ldr r1, _08101354 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _08101358 + ldr r0, =sub_80A656C + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08101350: .4byte 0x0203841e -_08101354: .4byte move_anim_8072740 + 1 -_08101358: .4byte sub_80A656C + 1 + .pool thumb_func_end sub_810130C thumb_func_start sub_810135C sub_810135C: @ 810135C push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _08101370 + ldr r0, =0x0203841e movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 bne _08101378 - ldr r0, _08101374 + ldr r0, =0x02038436 b _0810137A .align 2, 0 -_08101370: .4byte 0x0203841e -_08101374: .4byte 0x02038436 + .pool _08101378: - ldr r0, _081013BC + ldr r0, =0x02038437 _0810137A: ldrb r6, [r0] bl battle_type_is_double @@ -525786,7 +508121,7 @@ _0810137A: lsls r0, 24 cmp r0, 0 beq _081013C4 - ldr r4, _081013C0 + ldr r4, =0x0203841e ldrb r1, [r4, 0xC] adds r2, r5, 0 adds r2, 0x20 @@ -525804,10 +508139,9 @@ _0810137A: strh r0, [r5, 0x22] b _08101414 .align 2, 0 -_081013BC: .4byte 0x02038437 -_081013C0: .4byte 0x0203841e + .pool _081013C4: - ldr r4, _081013E4 + ldr r4, =0x0203841e movs r2, 0xC ldrsh r0, [r4, r2] cmp r0, 0 @@ -525822,7 +508156,7 @@ _081013C4: movs r1, 0x1 b _081013FA .align 2, 0 -_081013E4: .4byte 0x0203841e + .pool _081013E8: adds r0, r6, 0 movs r1, 0x2 @@ -525839,31 +508173,29 @@ _081013FA: ldrh r4, [r4, 0x2] adds r0, r4 strh r0, [r5, 0x22] - ldr r0, _08101434 + ldr r0, =0x0203841e movs r2, 0 ldrsh r1, [r0, r2] adds r0, r5, 0 bl sub_80A6864 _08101414: - ldr r1, _08101434 + ldr r1, =0x0203841e ldrh r0, [r1, 0xA] strh r0, [r5, 0x2E] ldrh r0, [r1, 0x6] strh r0, [r5, 0x30] ldrh r0, [r1, 0x8] strh r0, [r5, 0x32] - ldr r1, _08101438 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _0810143C + ldr r0, =sub_80A656C + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08101434: .4byte 0x0203841e -_08101438: .4byte move_anim_8072740 + 1 -_0810143C: .4byte sub_80A656C + 1 + .pool thumb_func_end sub_810135C thumb_func_start sub_8101440 @@ -525871,13 +508203,13 @@ sub_8101440: @ 8101440 push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, _0810146C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _08101474 - ldr r0, _08101470 + ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r4, 0x20] adds r1, r2 @@ -525888,10 +508220,9 @@ sub_8101440: @ 8101440 strh r0, [r4, 0x22] b _0810148E .align 2, 0 -_0810146C: .4byte 0x02038436 -_08101470: .4byte 0x0203841e + .pool _08101474: - ldr r2, _08101498 + ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] subs r0, r1 @@ -525904,14 +508235,13 @@ _08101474: movs r1, 0x1 bl obj_anim_image_start _0810148E: - ldr r0, _0810149C + ldr r0, =sub_81014A0 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08101498: .4byte 0x0203841e -_0810149C: .4byte sub_81014A0 + 1 + .pool thumb_func_end sub_8101440 thumb_func_start sub_81014A0 @@ -525963,13 +508293,13 @@ sub_81014F4: @ 81014F4 push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, _08101524 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0810152C - ldr r1, _08101528 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -525982,10 +508312,9 @@ sub_81014F4: @ 81014F4 strh r0, [r4, 0x34] b _0810154A .align 2, 0 -_08101524: .4byte 0x02038436 -_08101528: .4byte 0x0203841e + .pool _0810152C: - ldr r2, _08101554 + ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] subs r0, r1 @@ -525994,21 +508323,19 @@ _0810152C: ldrh r2, [r4, 0x22] adds r0, r2 strh r0, [r4, 0x22] - ldr r0, _08101558 + ldr r0, =0x0000ffff strh r0, [r4, 0x34] adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 _0810154A: - ldr r0, _0810155C + ldr r0, =sub_8101560 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08101554: .4byte 0x0203841e -_08101558: .4byte 0x0000ffff -_0810155C: .4byte sub_8101560 + 1 + .pool thumb_func_end sub_81014F4 thumb_func_start sub_8101560 @@ -526061,15 +508388,14 @@ sub_81015AC: @ 81015AC strh r1, [r0, 0x22] movs r1, 0x14 strh r1, [r0, 0x2E] - ldr r1, _081015CC + ldr r1, =sub_80A64B0 + 1 str r1, [r0, 0x1C] - ldr r1, _081015D0 + ldr r1, =sub_81015D4 + 1 bl oamt_set_x3A_32 pop {r0} bx r0 .align 2, 0 -_081015CC: .4byte sub_80A64B0 + 1 -_081015D0: .4byte sub_81015D4 + 1 + .pool thumb_func_end sub_81015AC thumb_func_start sub_81015D4 @@ -526087,15 +508413,14 @@ sub_81015D4: @ 81015D4 b _0810166A _081015EA: strh r1, [r5, 0x2E] - ldr r0, _081015FC + ldr r0, =sub_80A64B0 + 1 str r0, [r5, 0x1C] - ldr r1, _08101600 + ldr r1, =sub_81015D4 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 b _0810166A .align 2, 0 -_081015FC: .4byte sub_80A64B0 + 1 -_08101600: .4byte sub_81015D4 + 1 + .pool _08101604: ldrh r3, [r5, 0x24] ldrh r0, [r5, 0x20] @@ -526110,7 +508435,7 @@ _08101604: strh r0, [r5, 0x24] movs r0, 0x8 strh r0, [r5, 0x2E] - ldr r2, _08101678 + ldr r2, =0x08592cd0 lsls r0, r6, 16 asrs r0, 24 lsls r0, 1 @@ -526127,9 +508452,9 @@ _08101604: asrs r0, 24 adds r4, r0 strh r4, [r5, 0x36] - ldr r0, _0810167C + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _08101680 + ldr r1, =sub_8101684 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 movs r1, 0x80 @@ -526154,9 +508479,7 @@ _0810166A: pop {r0} bx r0 .align 2, 0 -_08101678: .4byte 0x08592cd0 -_0810167C: .4byte sub_80A6EEC + 1 -_08101680: .4byte sub_8101684 + 1 + .pool thumb_func_end sub_81015D4 thumb_func_start sub_8101684 @@ -526170,23 +508493,22 @@ sub_8101684: @ 8101684 bne _081016AC movs r0, 0xA strh r0, [r2, 0x2E] - ldr r0, _081016A4 + ldr r0, =sub_80A64B0 + 1 str r0, [r2, 0x1C] - ldr r1, _081016A8 + ldr r1, =sub_81016B8 + 1 adds r0, r2, 0 bl oamt_set_x3A_32 b _081016B0 .align 2, 0 -_081016A4: .4byte sub_80A64B0 + 1 -_081016A8: .4byte sub_81016B8 + 1 + .pool _081016AC: - ldr r0, _081016B4 + ldr r0, =sub_81015D4 + 1 str r0, [r2, 0x1C] _081016B0: pop {r0} bx r0 .align 2, 0 -_081016B4: .4byte sub_81015D4 + 1 + .pool thumb_func_end sub_8101684 thumb_func_start sub_81016B8 @@ -526200,15 +508522,14 @@ sub_81016B8: @ 81016B8 strh r0, [r5, 0x2E] strh r1, [r5, 0x30] strh r1, [r5, 0x32] - ldr r0, _081016D8 + ldr r0, =sub_80A64B0 + 1 str r0, [r5, 0x1C] - ldr r1, _081016DC + ldr r1, =sub_8101774 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 b _08101760 .align 2, 0 -_081016D8: .4byte sub_80A64B0 + 1 -_081016DC: .4byte sub_8101774 + 1 + .pool _081016E0: ldrh r0, [r5, 0x6] cmp r0, 0x2 @@ -526223,22 +508544,22 @@ _081016F0: beq _08101708 b _08101714 _081016F6: - ldr r6, _081016FC + ldr r6, =0x0000fff8 adds r7, r6, 0 b _08101718 .align 2, 0 -_081016FC: .4byte 0x0000fff8 + .pool _08101700: - ldr r7, _08101704 + ldr r7, =0x0000fff8 b _08101716 .align 2, 0 -_08101704: .4byte 0x0000fff8 + .pool _08101708: movs r7, 0x8 - ldr r6, _08101710 + ldr r6, =0x0000fff8 b _08101718 .align 2, 0 -_08101710: .4byte 0x0000fff8 + .pool _08101714: movs r7, 0x8 _08101716: @@ -526257,7 +508578,7 @@ _08101718: strh r1, [r5, 0x24] movs r0, 0x6 strh r0, [r5, 0x2E] - ldr r4, _08101768 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -526272,9 +508593,9 @@ _08101718: lsrs r0, 24 adds r0, r6 strh r0, [r5, 0x36] - ldr r0, _0810176C + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _08101770 + ldr r1, =sub_8101820 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 _08101760: @@ -526282,9 +508603,7 @@ _08101760: pop {r0} bx r0 .align 2, 0 -_08101768: .4byte 0x02038437 -_0810176C: .4byte sub_80A6EEC + 1 -_08101770: .4byte sub_8101820 + 1 + .pool thumb_func_end sub_81016B8 thumb_func_start sub_8101774 @@ -526329,7 +508648,7 @@ _081017A4: ldrh r1, [r4, 0x30] lsls r1, 24 lsrs r1, 24 - ldr r2, _08101800 + ldr r2, =0x00007fff bl sub_80A2A20 movs r3, 0x30 ldrsh r0, [r4, r3] @@ -526341,10 +508660,10 @@ _081017A4: ldrb r1, [r4, 0x5] lsrs r1, 4 lsls r0, r1, 5 - ldr r2, _08101804 + ldr r2, =0x02037924 adds r0, r2 lsls r1, 4 - ldr r3, _08101808 + ldr r3, =0x00000101 adds r2, r3, 0 orrs r1, r2 movs r2, 0x4 @@ -526358,13 +508677,11 @@ _081017A4: bl audio_play_and_stuff b _08101814 .align 2, 0 -_08101800: .4byte 0x00007fff -_08101804: .4byte 0x02037924 -_08101808: .4byte 0x00000101 + .pool _0810180C: cmp r0, 0 bne _08101814 - ldr r0, _0810181C + ldr r0, =sub_8101820 + 1 str r0, [r4, 0x1C] _08101814: add sp, 0xC @@ -526372,30 +508689,28 @@ _08101814: pop {r0} bx r0 .align 2, 0 -_0810181C: .4byte sub_8101820 + 1 + .pool thumb_func_end sub_8101774 thumb_func_start sub_8101820 sub_8101820: @ 8101820 push {lr} adds r2, r0, 0 - ldr r0, _0810183C + ldr r0, =0x0203841e ldrh r1, [r0, 0xE] - ldr r0, _08101840 + ldr r0, =0x0000ffff cmp r1, r0 bne _08101838 movs r0, 0 strh r0, [r2, 0x30] strh r0, [r2, 0x2E] - ldr r0, _08101844 + ldr r0, =sub_8101848 + 1 str r0, [r2, 0x1C] _08101838: pop {r0} bx r0 .align 2, 0 -_0810183C: .4byte 0x0203841e -_08101840: .4byte 0x0000ffff -_08101844: .4byte sub_8101848 + 1 + .pool thumb_func_end sub_8101820 thumb_func_start sub_8101848 @@ -526445,7 +508760,7 @@ _08101890: sub_8101898: @ 8101898 push {r4,lr} adds r3, r0, 0 - ldr r0, _081018B8 + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r3, 0x6] lsls r0, 16 @@ -526460,7 +508775,7 @@ sub_8101898: @ 8101898 strh r0, [r3, 0x22] b _0810190E .align 2, 0 -_081018B8: .4byte 0x0203841e + .pool _081018BC: cmp r0, 0x2 bne _081018D8 @@ -526511,14 +508826,14 @@ _0810190E: lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x10 - ldr r4, _08101934 + ldr r4, =0x000003ff adds r0, r4, 0 ands r1, r0 - ldr r0, _08101938 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] - ldr r1, _0810193C + ldr r1, =sub_81015AC + 1 str r1, [r3, 0x1C] adds r0, r3, 0 bl _call_via_r1 @@ -526526,9 +508841,7 @@ _0810190E: pop {r0} bx r0 .align 2, 0 -_08101934: .4byte 0x000003ff -_08101938: .4byte 0xfffffc00 -_0810193C: .4byte sub_81015AC + 1 + .pool thumb_func_end sub_8101898 thumb_func_start sub_8101940 @@ -526543,7 +508856,7 @@ sub_8101940: @ 8101940 strb r0, [r2] movs r0, 0 strh r0, [r3, 0x2E] - ldr r0, _08101968 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x1 @@ -526554,34 +508867,34 @@ sub_8101940: @ 8101940 beq _08101972 b _0810198C .align 2, 0 -_08101968: .4byte 0x0203841e + .pool _0810196C: cmp r0, 0x2 beq _08101984 b _0810198C _08101972: - ldr r0, _08101978 + ldr r0, =sub_8101998 + 1 b _0810198E .align 2, 0 -_08101978: .4byte sub_8101998 + 1 + .pool _0810197C: - ldr r0, _08101980 + ldr r0, =sub_8101A74 + 1 b _0810198E .align 2, 0 -_08101980: .4byte sub_8101A74 + 1 + .pool _08101984: - ldr r0, _08101988 + ldr r0, =sub_8101AC4 + 1 b _0810198E .align 2, 0 -_08101988: .4byte sub_8101AC4 + 1 + .pool _0810198C: - ldr r0, _08101994 + ldr r0, =sub_8101B84 + 1 _0810198E: str r0, [r3, 0x1C] pop {r0} bx r0 .align 2, 0 -_08101994: .4byte sub_8101B84 + 1 + .pool thumb_func_end sub_8101940 thumb_func_start sub_8101998 @@ -526590,7 +508903,7 @@ sub_8101998: @ 8101998 adds r4, r0, 0 movs r0, 0x6 strh r0, [r4, 0x2E] - ldr r5, _081019D8 + ldr r5, =0x02038436 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 @@ -526604,24 +508917,21 @@ _081019B6: strh r1, [r4, 0x30] movs r0, 0 strh r0, [r4, 0x32] - ldr r1, _081019DC + ldr r1, =0x020241e4 ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] strh r0, [r4, 0x34] - ldr r1, _081019E0 + ldr r1, =sub_81019E8 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _081019E4 + ldr r0, =sub_80A6630 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081019D8: .4byte 0x02038436 -_081019DC: .4byte 0x020241e4 -_081019E0: .4byte sub_81019E8 + 1 -_081019E4: .4byte sub_80A6630 + 1 + .pool thumb_func_end sub_8101998 thumb_func_start sub_81019E8 @@ -526632,8 +508942,8 @@ sub_81019E8: @ 81019E8 ldrsh r6, [r5, r0] cmp r6, 0 bne _08101A24 - ldr r1, _08101A64 - ldr r4, _08101A68 + ldr r1, =0x020241e4 + ldr r4, =0x02038436 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -526645,7 +508955,7 @@ sub_81019E8: @ 81019E8 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x3A] - ldr r2, _08101A6C + ldr r2, =0xfffffd00 adds r1, r2, 0 cmp r0, 0 beq _08101A20 @@ -526681,17 +508991,14 @@ _08101A24: ble _08101A5E movs r0, 0 strh r0, [r5, 0x2E] - ldr r0, _08101A70 + ldr r0, =sub_8101B84 + 1 str r0, [r5, 0x1C] _08101A5E: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08101A64: .4byte 0x020241e4 -_08101A68: .4byte 0x02038436 -_08101A6C: .4byte 0xfffffd00 -_08101A70: .4byte sub_8101B84 + 1 + .pool thumb_func_end sub_81019E8 thumb_func_start sub_8101A74 @@ -526700,7 +509007,7 @@ sub_8101A74: @ 8101A74 adds r4, r0, 0 movs r0, 0x4 strh r0, [r4, 0x2E] - ldr r5, _08101AB4 + ldr r5, =0x02038436 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 @@ -526714,24 +509021,21 @@ _08101A92: strh r1, [r4, 0x30] movs r0, 0 strh r0, [r4, 0x32] - ldr r1, _08101AB8 + ldr r1, =0x020241e4 ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] strh r0, [r4, 0x34] - ldr r1, _08101ABC + ldr r1, =sub_8101B84 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _08101AC0 + ldr r0, =sub_80A6630 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08101AB4: .4byte 0x02038436 -_08101AB8: .4byte 0x020241e4 -_08101ABC: .4byte sub_8101B84 + 1 -_08101AC0: .4byte sub_80A6630 + 1 + .pool thumb_func_end sub_8101A74 thumb_func_start sub_8101AC4 @@ -526747,13 +509051,13 @@ sub_8101AC4: @ 8101AC4 ble _08101ADE movs r0, 0 strh r0, [r1, 0x2E] - ldr r0, _08101AE4 + ldr r0, =sub_8101AE8 + 1 str r0, [r1, 0x1C] _08101ADE: pop {r0} bx r0 .align 2, 0 -_08101AE4: .4byte sub_8101AE8 + 1 + .pool thumb_func_end sub_8101AC4 thumb_func_start sub_8101AE8 @@ -526764,8 +509068,8 @@ sub_8101AE8: @ 8101AE8 ldrsh r0, [r5, r1] cmp r0, 0 bne _08101B38 - ldr r1, _08101B24 - ldr r4, _08101B28 + ldr r1, =0x020241e4 + ldr r4, =0x02038436 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -526787,8 +509091,7 @@ sub_8101AE8: @ 8101AE8 lsls r0, 4 b _08101B36 .align 2, 0 -_08101B24: .4byte 0x020241e4 -_08101B28: .4byte 0x02038436 + .pool _08101B2C: movs r0, 0x80 lsls r0, 3 @@ -526825,14 +509128,14 @@ _08101B38: lsls r0, 24 lsrs r0, 24 bl sub_80A7344 - ldr r0, _08101B80 + ldr r0, =sub_8101B84 + 1 str r0, [r5, 0x1C] _08101B78: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08101B80: .4byte sub_8101B84 + 1 + .pool thumb_func_end sub_8101AE8 thumb_func_start sub_8101B84 @@ -526847,11 +509150,11 @@ sub_8101B84: @ 8101B84 sub_8101B90: @ 8101B90 movs r1, 0 strh r1, [r0, 0x2E] - ldr r1, _08101B9C + ldr r1, =sub_8101BA0 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_08101B9C: .4byte sub_8101BA0 + 1 + .pool thumb_func_end sub_8101B90 thumb_func_start sub_8101BA0 @@ -526873,8 +509176,8 @@ _08101BB6: b _08101C8E _08101BBC: strh r5, [r4, 0x30] - ldr r1, _08101C40 - ldr r2, _08101C44 + ldr r1, =0x020241e4 + ldr r2, =0x02038436 ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] @@ -526884,7 +509187,7 @@ _08101BBC: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x34] - ldr r2, _08101C48 + ldr r2, =0xfffffe00 adds r1, r2, 0 cmp r0, 0 beq _08101BE4 @@ -526937,9 +509240,7 @@ _08101BFA: strh r0, [r4, 0x2E] b _08101C8E .align 2, 0 -_08101C40: .4byte 0x020241e4 -_08101C44: .4byte 0x02038436 -_08101C48: .4byte 0xfffffe00 + .pool _08101C4C: ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x38] @@ -526981,13 +509282,13 @@ sub_8101C94: @ 8101C94 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08101CD8 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r5, r0, r1 - ldr r1, _08101CDC - ldr r2, _08101CE0 + ldr r1, =0x020241e4 + ldr r2, =0x02038436 ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] @@ -526999,7 +509300,7 @@ sub_8101C94: @ 8101C94 lsrs r2, r0, 24 strh r2, [r5, 0xA] strh r4, [r5, 0xC] - ldr r0, _08101CE4 + ldr r0, =0x0203841e movs r3, 0 ldrsh r1, [r0, r3] cmp r1, 0 @@ -527010,10 +509311,7 @@ sub_8101C94: @ 8101C94 bl move_anim_task_del b _08101D22 .align 2, 0 -_08101CD8: .4byte 0x03005e00 -_08101CDC: .4byte 0x020241e4 -_08101CE0: .4byte 0x02038436 -_08101CE4: .4byte 0x0203841e + .pool _08101CE8: strh r1, [r5, 0xC] movs r0, 0x8 @@ -527026,10 +509324,10 @@ _08101CE8: negs r0, r0 strh r0, [r5, 0x12] _08101CFC: - ldr r0, _08101D00 + ldr r0, =sub_8101D2C + 1 b _08101D20 .align 2, 0 -_08101D00: .4byte sub_8101D2C + 1 + .pool _08101D04: movs r0, 0x8 strh r0, [r5, 0xE] @@ -527045,7 +509343,7 @@ _08101D04: negs r0, r1 strh r0, [r5, 0x12] _08101D1E: - ldr r0, _08101D28 + ldr r0, =sub_8101EEC + 1 _08101D20: str r0, [r5] _08101D22: @@ -527053,7 +509351,7 @@ _08101D22: pop {r0} bx r0 .align 2, 0 -_08101D28: .4byte sub_8101EEC + 1 + .pool thumb_func_end sub_8101C94 thumb_func_start sub_8101D2C @@ -527064,7 +509362,7 @@ sub_8101D2C: @ 8101D2C lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08101D50 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0xC ldrsh r0, [r4, r1] @@ -527073,13 +509371,12 @@ sub_8101D2C: @ 8101D2C b _08101EE6 _08101D46: lsls r0, 2 - ldr r1, _08101D54 + ldr r1, =_08101D58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08101D50: .4byte 0x03005e00 -_08101D54: .4byte _08101D58 + .pool .align 2, 0 _08101D58: .4byte _08101D6C @@ -527135,7 +509432,7 @@ _08101D9E: _08101DC4: movs r0, 0x8 strh r0, [r4, 0xE] - ldr r2, _08101DF4 + ldr r2, =0x02020630 movs r3, 0x8 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -527158,7 +509455,7 @@ _08101DEA: strh r0, [r4, 0x14] b _08101EA8 .align 2, 0 -_08101DF4: .4byte 0x02020630 + .pool _08101DF8: ldrh r2, [r4, 0xE] movs r3, 0xE @@ -527178,7 +509475,7 @@ _08101E12: ands r0, r2 cmp r0, 0 beq _08101E34 - ldr r2, _08101E30 + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -527190,9 +509487,9 @@ _08101E12: adds r1, r2 b _08101E48 .align 2, 0 -_08101E30: .4byte 0x02020630 + .pool _08101E34: - ldr r2, _08101E50 + ldr r2, =0x02020630 movs r3, 0x8 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -527208,9 +509505,9 @@ _08101E48: strh r0, [r4, 0x14] b _08101ED4 .align 2, 0 -_08101E50: .4byte 0x02020630 + .pool _08101E54: - ldr r2, _08101E6C + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -527223,7 +509520,7 @@ _08101E54: strh r0, [r4, 0xE] b _08101EA8 .align 2, 0 -_08101E6C: .4byte 0x02020630 + .pool _08101E70: ldrh r1, [r4, 0xE] movs r2, 0xE @@ -527236,7 +509533,7 @@ _08101E70: _08101E80: movs r0, 0x3 strh r0, [r4, 0xE] - ldr r2, _08101EB0 + ldr r2, =0x02020630 movs r3, 0x8 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -527261,7 +509558,7 @@ _08101EA8: strh r0, [r4, 0xC] b _08101EE6 .align 2, 0 -_08101EB0: .4byte 0x02020630 + .pool _08101EB4: movs r3, 0xE ldrsh r0, [r4, r3] @@ -527272,7 +509569,7 @@ _08101EB4: adds r2, r0 _08101EC2: strh r2, [r4, 0x10] - ldr r3, _08101EDC + ldr r3, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -527286,7 +509583,7 @@ _08101ED4: strh r0, [r4, 0xE] b _08101EE6 .align 2, 0 -_08101EDC: .4byte 0x02020630 + .pool _08101EE0: adds r0, r2, 0 bl move_anim_task_del @@ -527304,7 +509601,7 @@ sub_8101EEC: @ 8101EEC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08101F28 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0xE ldrsh r0, [r4, r1] @@ -527327,7 +509624,7 @@ sub_8101EEC: @ 8101EEC strh r0, [r4, 0xE] b _08101F38 .align 2, 0 -_08101F28: .4byte 0x03005e00 + .pool _08101F2C: ldrb r0, [r4, 0x8] bl sub_80A7344 @@ -527343,18 +509640,17 @@ _08101F38: sub_8101F40: @ 8101F40 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _08101F54 + ldr r6, =0x0203841e movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 bne _08101F5C - ldr r4, _08101F58 + ldr r4, =0x02038436 b _08101F5E .align 2, 0 -_08101F54: .4byte 0x0203841e -_08101F58: .4byte 0x02038436 + .pool _08101F5C: - ldr r4, _08101F9C + ldr r4, =0x02038437 _08101F5E: ldrb r0, [r4] movs r1, 0x2 @@ -527375,31 +509671,29 @@ _08101F5E: movs r0, 0 strh r0, [r5, 0x2E] strh r0, [r5, 0x30] - ldr r1, _08101FA0 + ldr r1, =sub_810208C + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _08101FA4 + ldr r0, =sub_80A67D8 + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08101F9C: .4byte 0x02038437 -_08101FA0: .4byte sub_810208C + 1 -_08101FA4: .4byte sub_80A67D8 + 1 + .pool thumb_func_end sub_8101F40 thumb_func_start sub_8101FA8 sub_8101FA8: @ 8101FA8 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08101FE0 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 - ldr r1, _08101FE4 + ldr r1, =0x0000ffd0 adds r0, r1 strh r0, [r4, 0x20] ldrb r0, [r5] @@ -527408,33 +509702,30 @@ sub_8101FA8: @ 8101FA8 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r1, _08101FE8 + ldr r1, =sub_8102044 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _08101FEC + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08101FE0: .4byte 0x02038437 -_08101FE4: .4byte 0x0000ffd0 -_08101FE8: .4byte sub_8102044 + 1 -_08101FEC: .4byte sub_80A67D8 + 1 + .pool thumb_func_end sub_8101FA8 thumb_func_start sub_8101FF0 sub_8101FF0: @ 8101FF0 push {r4-r6,lr} adds r4, r0, 0 - ldr r5, _08102034 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 - ldr r1, _08102038 - ldr r2, _0810203C + ldr r1, =0x0203841e + ldr r2, =0x0000ffd0 adds r0, r2 ldrh r1, [r1] adds r0, r1 @@ -527451,16 +509742,13 @@ sub_8101FF0: @ 8101FF0 bl obj_anim_image_start strh r6, [r4, 0x2E] strh r6, [r4, 0x30] - ldr r0, _08102040 + ldr r0, =sub_810208C + 1 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08102034: .4byte 0x02038437 -_08102038: .4byte 0x0203841e -_0810203C: .4byte 0x0000ffd0 -_08102040: .4byte sub_810208C + 1 + .pool thumb_func_end sub_8101FF0 thumb_func_start sub_8102044 @@ -527480,18 +509768,17 @@ sub_8102044: @ 8102044 strh r0, [r4, 0x30] movs r0, 0 strh r0, [r4, 0x32] - ldr r1, _08102074 + ldr r1, =sub_810207C + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _08102078 + ldr r0, =sub_80A653C + 1 str r0, [r4, 0x1C] _0810206E: pop {r4} pop {r0} bx r0 .align 2, 0 -_08102074: .4byte sub_810207C + 1 -_08102078: .4byte sub_80A653C + 1 + .pool thumb_func_end sub_8102044 thumb_func_start sub_810207C @@ -527499,11 +509786,11 @@ sub_810207C: @ 810207C movs r1, 0 strh r1, [r0, 0x2E] strh r1, [r0, 0x30] - ldr r1, _08102088 + ldr r1, =sub_810208C + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_08102088: .4byte sub_810208C + 1 + .pool thumb_func_end sub_810207C thumb_func_start sub_810208C @@ -527552,18 +509839,17 @@ _081020D4: sub_81020D8: @ 81020D8 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _081020EC + ldr r6, =0x0203841e movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 bne _081020F4 - ldr r4, _081020F0 + ldr r4, =0x02038436 b _081020F6 .align 2, 0 -_081020EC: .4byte 0x0203841e -_081020F0: .4byte 0x02038436 + .pool _081020F4: - ldr r4, _08102130 + ldr r4, =0x02038437 _081020F6: ldrb r0, [r4] movs r1, 0 @@ -527583,18 +509869,16 @@ _081020F6: strh r0, [r5, 0x22] movs r0, 0 strh r0, [r5, 0x2E] - ldr r0, _08102134 + ldr r0, =0x0203841e ldrh r0, [r0, 0x6] strh r0, [r5, 0x30] - ldr r0, _08102138 + ldr r0, =sub_810213C + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08102130: .4byte 0x02038437 -_08102134: .4byte 0x0203841e -_08102138: .4byte sub_810213C + 1 + .pool thumb_func_end sub_81020D8 thumb_func_start sub_810213C @@ -527638,7 +509922,7 @@ _08102178: sub_810217C: @ 810217C push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _081021C4 + ldr r6, =0x02038436 ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -527664,14 +509948,13 @@ sub_810217C: @ 810217C lsls r0, 24 asrs r0, 24 strh r0, [r4, 0x38] - ldr r0, _081021C8 + ldr r0, =sub_81021CC + 1 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081021C4: .4byte 0x02038436 -_081021C8: .4byte sub_81021CC + 1 + .pool thumb_func_end sub_810217C thumb_func_start sub_81021CC @@ -527765,12 +510048,12 @@ sub_8102268: @ 8102268 ldrsh r0, [r6, r1] cmp r0, 0 bne _081022B2 - ldr r4, _081022C8 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C lsls r0, 24 - ldr r5, _081022CC + ldr r5, =0x0203841e lsrs r0, 24 ldrh r1, [r5] adds r0, r1 @@ -527795,9 +510078,9 @@ _081022AC: adds r0, 0x1 strh r0, [r6, 0x2E] _081022B2: - ldr r0, _081022CC + ldr r0, =0x0203841e ldrh r1, [r0, 0xE] - ldr r0, _081022D0 + ldr r0, =0x0000ffff cmp r1, r0 bne _081022C2 adds r0, r6, 0 @@ -527807,9 +510090,7 @@ _081022C2: pop {r0} bx r0 .align 2, 0 -_081022C8: .4byte 0x02038436 -_081022CC: .4byte 0x0203841e -_081022D0: .4byte 0x0000ffff + .pool thumb_func_end sub_8102268 thumb_func_start sub_81022D4 @@ -527817,7 +510098,7 @@ sub_81022D4: @ 81022D4 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _081022F4 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -527826,14 +510107,12 @@ sub_81022D4: @ 81022D4 ldrsh r0, [r4, r1] cmp r0, 0x1 bne _08102300 - ldr r1, _081022F8 - ldr r0, _081022FC + ldr r1, =0x0203841e + ldr r0, =0x0000ffff strh r0, [r1, 0xE] b _0810233E .align 2, 0 -_081022F4: .4byte 0x03005e00 -_081022F8: .4byte 0x0203841e -_081022FC: .4byte 0x0000ffff + .pool _08102300: cmp r0, 0x2 bne _0810230C @@ -527887,17 +510166,16 @@ sub_810234C: @ 810234C movs r1, 0x40 orrs r0, r1 strb r0, [r2] - ldr r0, _08102374 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] - ldr r0, _08102378 + ldr r0, =sub_810237C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08102374: .4byte 0x0203841e -_08102378: .4byte sub_810237C + 1 + .pool thumb_func_end sub_810234C thumb_func_start sub_810237C @@ -527922,7 +510200,7 @@ _08102390: strb r0, [r2] movs r0, 0x1E strh r0, [r5, 0x2E] - ldr r4, _081023D4 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -527935,9 +510213,9 @@ _08102390: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, _081023D8 + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _081023DC + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 _081023CC: @@ -527945,9 +510223,7 @@ _081023CC: pop {r0} bx r0 .align 2, 0 -_081023D4: .4byte 0x02038436 -_081023D8: .4byte sub_80A6EEC + 1 -_081023DC: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810237C thumb_func_start sub_81023E0 @@ -527955,7 +510231,7 @@ sub_81023E0: @ 81023E0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08102430 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -527991,7 +510267,7 @@ _08102428: pop {r0} bx r0 .align 2, 0 -_08102430: .4byte 0x03005e00 + .pool thumb_func_end sub_81023E0 thumb_func_start sub_8102434 @@ -528000,12 +510276,12 @@ sub_8102434: @ 8102434 lsls r0, 24 lsrs r7, r0, 24 movs r4, 0 - ldr r0, _0810249C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 bcs _08102490 - ldr r6, _081024A0 - ldr r5, _081024A4 + ldr r6, =0x0203841e + ldr r5, =0x03005d70 _08102448: movs r1, 0 ldrsh r0, [r6, r1] @@ -528037,7 +510313,7 @@ _08102482: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0810249C + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 bcc _08102448 @@ -528048,9 +510324,7 @@ _08102490: pop {r0} bx r0 .align 2, 0 -_0810249C: .4byte 0x0202406c -_081024A0: .4byte 0x0203841e -_081024A4: .4byte 0x03005d70 + .pool thumb_func_end sub_8102434 thumb_func_start sub_81024A8 @@ -528061,7 +510335,7 @@ sub_81024A8: @ 81024A8 movs r4, 0 b _081024C2 _081024B2: - ldr r0, _081024D8 + ldr r0, =0x03005d70 adds r0, r4, r0 ldrb r0, [r0] bl sub_80729D0 @@ -528069,7 +510343,7 @@ _081024B2: lsls r0, 24 lsrs r4, r0, 24 _081024C2: - ldr r0, _081024DC + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 bcc _081024B2 @@ -528079,8 +510353,7 @@ _081024C2: pop {r0} bx r0 .align 2, 0 -_081024D8: .4byte 0x03005d70 -_081024DC: .4byte 0x0202406c + .pool thumb_func_end sub_81024A8 thumb_func_start sub_81024E0 @@ -528096,7 +510369,7 @@ sub_81024E0: @ 81024E0 movs r0, 0x28 b _081024FE _081024F6: - ldr r0, _08102520 + ldr r0, =0x0203841e ldrh r1, [r0] strh r1, [r4, 0x20] ldrh r0, [r0, 0x2] @@ -528112,14 +510385,13 @@ _081024FE: strb r0, [r4, 0x3] movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, _08102524 + ldr r0, =sub_8102528 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08102520: .4byte 0x0203841e -_08102524: .4byte sub_8102528 + 1 + .pool thumb_func_end sub_81024E0 thumb_func_start sub_8102528 @@ -528141,12 +510413,12 @@ _0810253A: sub_8102540: @ 8102540 push {r4,lr} adds r4, r0, 0 - ldr r0, _08102578 + ldr r0, =0x02038436 ldrb r0, [r0] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 - ldr r2, _0810257C + ldr r2, =0x0203841e lsrs r0, 24 ldrh r1, [r2] adds r0, r1 @@ -528160,15 +510432,13 @@ sub_8102540: @ 8102540 strh r1, [r4, 0x34] movs r0, 0x1 strh r0, [r4, 0x36] - ldr r0, _08102580 + ldr r0, =sub_8102584 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08102578: .4byte 0x02038436 -_0810257C: .4byte 0x0203841e -_08102580: .4byte sub_8102584 + 1 + .pool thumb_func_end sub_8102540 thumb_func_start sub_8102584 @@ -528226,11 +510496,11 @@ sub_81025C0: @ 81025C0 movs r3, 0 bl sub_80A75AC mov r8, r0 - ldr r0, _08102690 + ldr r0, =0x0000ffff mov r1, r8 ands r1, r0 mov r8, r1 - ldr r0, _08102694 + ldr r0, =0x03005e00 mov r9, r0 lsls r5, r7, 2 adds r5, r7 @@ -528267,7 +510537,7 @@ sub_81025C0: @ 81025C0 adds r1, r5, 0 mov r2, r8 bl sub_80A8048 - ldr r0, _08102698 + ldr r0, =0x000027d2 bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 24 @@ -528278,21 +510548,21 @@ sub_81025C0: @ 81025C0 mov r0, r10 orrs r0, r1 mov r10, r0 - ldr r0, _0810269C + ldr r0, =0x000027d3 bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 24 lsls r4, r0 mov r1, r10 orrs r4, r1 - ldr r0, _081026A0 + ldr r0, =0x00007fbb str r0, [sp] adds r0, r4, 0 movs r1, 0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _081026A4 + ldr r1, =sub_81026A8 + 1 str r1, [r6] adds r0, r7, 0 bl _call_via_r1 @@ -528305,12 +510575,7 @@ sub_81025C0: @ 81025C0 pop {r0} bx r0 .align 2, 0 -_08102690: .4byte 0x0000ffff -_08102694: .4byte 0x03005e00 -_08102698: .4byte 0x000027d2 -_0810269C: .4byte 0x000027d3 -_081026A0: .4byte 0x00007fbb -_081026A4: .4byte sub_81026A8 + 1 + .pool thumb_func_end sub_81025C0 thumb_func_start sub_81026A8 @@ -528324,7 +510589,7 @@ sub_81026A8: @ 81026A8 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _081026D0 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -528336,7 +510601,7 @@ sub_81026A8: @ 81026A8 beq _081026E2 b _08102832 .align 2, 0 -_081026D0: .4byte 0x03005e00 + .pool _081026D4: cmp r1, 0x2 bne _081026DA @@ -528395,7 +510660,7 @@ _081026F0: mov r12, r0 b _08102746 _0810273C: - ldr r7, _0810278C + ldr r7, =0x00007fbb mov r12, r7 ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -528416,7 +510681,7 @@ _0810274C: cmp r0, 0 beq _08102778 movs r1, 0x1 - ldr r2, _08102790 + ldr r2, =0x02037b14 _08102764: adds r0, r3, r1 lsls r0, 1 @@ -528439,23 +510704,22 @@ _08102778: bls _0810274C b _08102832 .align 2, 0 -_0810278C: .4byte 0x00007fbb -_08102790: .4byte 0x02037b14 + .pool _08102794: - ldr r0, _081027DC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08102832 movs r2, 0 - ldr r3, _081027E0 + ldr r3, =0x02020630 movs r5, 0x14 adds r5, r3 mov r12, r5 - ldr r7, _081027E4 + ldr r7, =0x08592ebc mov r8, r7 - ldr r6, _081027E8 + ldr r6, =0x08592eec movs r5, 0x1 _081027B2: lsls r0, r2, 4 @@ -528481,10 +510745,7 @@ _081027CA: strh r0, [r4, 0xA] b _08102814 .align 2, 0 -_081027DC: .4byte 0x02037fd4 -_081027E0: .4byte 0x02020630 -_081027E4: .4byte 0x08592ebc -_081027E8: .4byte 0x08592eec + .pool _081027EC: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -528498,7 +510759,7 @@ _081027EC: movs r2, 0x26 ldrsh r1, [r4, r2] bl sub_80A8050 - ldr r1, _0810281C + ldr r1, =0x00007fbb str r1, [sp] movs r1, 0 movs r2, 0x10 @@ -528510,9 +510771,9 @@ _08102814: strh r0, [r4, 0x8] b _08102832 .align 2, 0 -_0810281C: .4byte 0x00007fbb + .pool _08102820: - ldr r0, _08102840 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -528528,14 +510789,14 @@ _08102832: pop {r0} bx r0 .align 2, 0 -_08102840: .4byte 0x02037fd4 + .pool thumb_func_end sub_81026A8 thumb_func_start sub_8102844 sub_8102844: @ 8102844 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _081028C8 + ldr r6, =0x0203841e movs r1, 0x4 ldrsh r0, [r6, r1] cmp r0, 0x1 @@ -528554,7 +510815,7 @@ _08102862: strh r0, [r5, 0x2E] ldrh r0, [r6, 0x4] strh r0, [r5, 0x30] - ldr r4, _081028CC + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -528595,14 +510856,12 @@ _08102862: strh r0, [r5, 0x32] movs r0, 0x30 ldrsh r1, [r5, r0] - ldr r0, _081028D0 + ldr r0, =0xffffec00 b _081028FA .align 2, 0 -_081028C8: .4byte 0x0203841e -_081028CC: .4byte 0x02038437 -_081028D0: .4byte 0xffffec00 + .pool _081028D4: - ldr r0, _08102914 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -528627,13 +510886,12 @@ _081028FA: strh r4, [r5, 0x36] movs r0, 0x30 ldrsh r1, [r5, r0] - ldr r0, _08102918 + ldr r0, =0xfffff600 bl __divsi3 strh r0, [r5, 0x38] b _08102958 .align 2, 0 -_08102914: .4byte 0x02038436 -_08102918: .4byte 0xfffff600 + .pool _0810291C: ldrh r0, [r5, 0x20] adds r0, 0x28 @@ -528645,7 +510903,7 @@ _0810291C: strh r0, [r5, 0x32] movs r0, 0x30 ldrsh r1, [r5, r0] - ldr r0, _08102964 + ldr r0, =0xffffec00 bl __divsi3 strh r0, [r5, 0x34] lsls r4, 7 @@ -528664,14 +510922,13 @@ _0810291C: orrs r0, r1 strb r0, [r5, 0x3] _08102958: - ldr r0, _08102968 + ldr r0, =sub_810296C + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08102964: .4byte 0xffffec00 -_08102968: .4byte sub_810296C + 1 + .pool thumb_func_end sub_8102844 thumb_func_start sub_810296C @@ -528727,14 +510984,14 @@ sub_81029B4: @ 81029B4 lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _08102A44 + ldr r1, =0x03005e00 adds r6, r0, r1 movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x8] - ldr r0, _08102A48 + ldr r0, =0x00002771 bl gpu_pal_alloc_new lsls r0, 24 lsrs r0, 24 @@ -528746,7 +511003,7 @@ sub_81029B4: @ 81029B4 lsls r1, 17 adds r0, r1 lsrs r3, r0, 16 - ldr r2, _08102A4C + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r6, r0] lsls r0, r1, 4 @@ -528758,7 +511015,7 @@ sub_81029B4: @ 81029B4 adds r0, 0x10 lsls r4, r0, 4 movs r5, 0x1 - ldr r2, _08102A50 + ldr r2, =0x02037714 _08102A0C: adds r1, r3, r5 lsls r1, 1 @@ -528781,16 +511038,13 @@ _08102A0C: movs r0, 0 strh r0, [r6, 0xE] movs r5, 0 - ldr r7, _08102A4C + ldr r7, =0x02020630 movs r1, 0x1C adds r1, r7 mov r9, r1 b _08102A88 .align 2, 0 -_08102A44: .4byte 0x03005e00 -_08102A48: .4byte 0x00002771 -_08102A4C: .4byte 0x02020630 -_08102A50: .4byte 0x02037714 + .pool _08102A54: lsls r2, r0, 4 adds r2, r0 @@ -528810,7 +511064,7 @@ _08102A54: mov r0, r8 strh r0, [r4, 0x32] add r2, r9 - ldr r0, _08102ABC + ldr r0, =sub_8102B3C + 1 str r0, [r2] ldrh r0, [r6, 0xE] adds r0, 0x1 @@ -528828,9 +511082,9 @@ _08102A88: cmp r0, 0 bge _08102A54 _08102A9A: - ldr r0, _08102AC0 + ldr r0, =sub_8102AE0 + 1 str r0, [r6] - ldr r0, _08102AC4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -528843,9 +511097,7 @@ _08102A9A: bl lcd_io_clear_bits b _08102AD2 .align 2, 0 -_08102ABC: .4byte sub_8102B3C + 1 -_08102AC0: .4byte sub_8102AE0 + 1 -_08102AC4: .4byte 0x02038436 + .pool _08102AC8: movs r1, 0x80 lsls r1, 3 @@ -528868,13 +511120,13 @@ sub_8102AE0: @ 8102AE0 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08102B14 + ldr r1, =0x03005e00 adds r0, r1 movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 bne _08102B32 - ldr r0, _08102B18 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -528887,15 +511139,14 @@ sub_8102AE0: @ 8102AE0 bl lcd_io_set_bits b _08102B26 .align 2, 0 -_08102B14: .4byte 0x03005e00 -_08102B18: .4byte 0x02038436 + .pool _08102B1C: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl lcd_io_set_bits _08102B26: - ldr r0, _08102B38 + ldr r0, =0x00002771 bl gpu_pal_free_tag adds r0, r4, 0 bl move_anim_task_del @@ -528904,7 +511155,7 @@ _08102B32: pop {r0} bx r0 .align 2, 0 -_08102B38: .4byte 0x00002771 + .pool thumb_func_end sub_8102AE0 thumb_func_start sub_8102B3C @@ -528928,7 +511179,7 @@ _08102B58: ldrsh r0, [r5, r1] cmp r0, 0x40 ble _08102B80 - ldr r2, _08102B7C + ldr r2, =0x03005e00 movs r0, 0x32 ldrsh r1, [r5, r0] lsls r0, r1, 2 @@ -528942,9 +511193,9 @@ _08102B58: bl obj_delete_but_dont_free_vram b _08102BC2 .align 2, 0 -_08102B7C: .4byte 0x03005e00 + .pool _08102B80: - ldr r4, _08102BC8 + ldr r4, =0x08329f40 movs r1, 0x2E ldrsh r0, [r5, r1] lsls r0, 1 @@ -528979,23 +511230,22 @@ _08102BC2: pop {r0} bx r0 .align 2, 0 -_08102BC8: .4byte 0x08329f40 + .pool thumb_func_end sub_8102B3C thumb_func_start sub_8102BCC sub_8102BCC: @ 8102BCC push {r4,lr} adds r4, r0, 0 - ldr r1, _08102BE0 + ldr r1, =move_anim_8072740 + 1 bl oamt_set_x3A_32 - ldr r0, _08102BE4 + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08102BE0: .4byte move_anim_8072740 + 1 -_08102BE4: .4byte sub_80A67D8 + 1 + .pool thumb_func_end sub_8102BCC thumb_func_start sub_8102BE8 @@ -529007,7 +511257,7 @@ sub_8102BE8: @ 8102BE8 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r4, _08102C98 + ldr r4, =0x08593020 ldrh r0, [r4] bl gpu_pal_tags_index_of lsls r0, 24 @@ -529020,7 +511270,7 @@ sub_8102BE8: @ 8102BE8 adds r0, r1 lsrs r3, r0, 16 movs r2, 0x1 - ldr r5, _08102C9C + ldr r5, =0x02037b14 _08102C14: adds r1, r3, r2 lsls r1, 1 @@ -529036,7 +511286,7 @@ _08102C14: bls _08102C14 _08102C2C: movs r4, 0x1 - ldr r0, _08102C98 + ldr r0, =0x08593020 mov r8, r0 _08102C32: lsls r0, r4, 1 @@ -529058,8 +511308,8 @@ _08102C32: adds r0, r1 lsrs r3, r0, 16 movs r2, 0x1 - ldr r7, _08102C9C - ldr r6, _08102C98 + ldr r7, =0x02037b14 + ldr r6, =0x08593020 adds r4, r5, 0 _08102C60: adds r1, r3, r2 @@ -529090,8 +511340,7 @@ _08102C7A: pop {r0} bx r0 .align 2, 0 -_08102C98: .4byte 0x08593020 -_08102C9C: .4byte 0x02037b14 + .pool thumb_func_end sub_8102BE8 thumb_func_start sub_8102CA0 @@ -529100,7 +511349,7 @@ sub_8102CA0: @ 8102CA0 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0x1 - ldr r6, _08102CD0 + ldr r6, =0x08593020 _08102CAA: lsls r0, r4, 1 adds r0, r4 @@ -529119,7 +511368,7 @@ _08102CAA: pop {r0} bx r0 .align 2, 0 -_08102CD0: .4byte 0x08593020 + .pool thumb_func_end sub_8102CA0 thumb_func_start sub_8102CD4 @@ -529128,11 +511377,11 @@ sub_8102CD4: @ 8102CD4 sub sp, 0x4 adds r5, r0, 0 bl sub_80A6838 - ldr r4, _08102D2C + ldr r4, =0x0203841e ldrb r1, [r4] adds r0, r5, 0 bl obj_anim_image_start - ldr r2, _08102D30 + ldr r2, =0x08593020 movs r0, 0x2 ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -529166,10 +511415,9 @@ _08102D10: movs r3, 0x28 b _08102D4E .align 2, 0 -_08102D2C: .4byte 0x0203841e -_08102D30: .4byte 0x08593020 + .pool _08102D34: - ldr r4, _08102D84 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -529200,15 +511448,14 @@ _08102D4E: movs r4, 0x28 str r4, [sp] bl sub_8102D8C - ldr r0, _08102D88 + ldr r0, =sub_8102DE4 + 1 str r0, [r5, 0x1C] add sp, 0x4 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08102D84: .4byte 0x02038437 -_08102D88: .4byte sub_8102DE4 + 1 + .pool thumb_func_end sub_8102CD4 thumb_func_start sub_8102D8C @@ -529339,7 +511586,7 @@ _08102E56: ble _08102E7E strh r5, [r4, 0x30] _08102E7E: - ldr r2, _08102EAC + ldr r2, =0x08593020 movs r3, 0x30 ldrsh r1, [r4, r3] lsls r0, r1, 1 @@ -529363,21 +511610,21 @@ _08102EA6: pop {r0} bx r0 .align 2, 0 -_08102EAC: .4byte 0x08593020 + .pool thumb_func_end sub_8102DE4 thumb_func_start sub_8102EB0 sub_8102EB0: @ 8102EB0 push {r4-r7,lr} adds r6, r0, 0 - ldr r7, _08102F34 + ldr r7, =0x02038436 ldrb r0, [r7] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _08102ECE - ldr r1, _08102F38 + ldr r1, =0x0203841e movs r2, 0x2 ldrsh r0, [r1, r2] negs r0, r0 @@ -529387,7 +511634,7 @@ _08102ECE: movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 - ldr r4, _08102F38 + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4, 0x2] adds r0, r1 @@ -529424,15 +511671,13 @@ _08102ECE: movs r1, 0x5 bl __divsi3 strh r0, [r6, 0x3C] - ldr r0, _08102F3C + ldr r0, =sub_8102F40 + 1 str r0, [r6, 0x1C] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08102F34: .4byte 0x02038436 -_08102F38: .4byte 0x0203841e -_08102F3C: .4byte sub_8102F40 + 1 + .pool thumb_func_end sub_8102EB0 thumb_func_start sub_8102F40 @@ -529502,7 +511747,7 @@ _08102FB2: sub_8102FB8: @ 8102FB8 push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _08102FD8 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x1 @@ -529517,11 +511762,11 @@ sub_8102FB8: @ 8102FB8 movs r6, 0x10 b _08102FDE .align 2, 0 -_08102FD8: .4byte 0x0203841e + .pool _08102FDC: - ldr r6, _08103018 + ldr r6, =0x0000fff0 _08102FDE: - ldr r4, _0810301C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -529538,19 +511783,16 @@ _08102FDE: strh r0, [r5, 0x22] movs r0, 0x8 strh r0, [r5, 0x2E] - ldr r0, _08103020 + ldr r0, =sub_80A64B0 + 1 str r0, [r5, 0x1C] - ldr r1, _08103024 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08103018: .4byte 0x0000fff0 -_0810301C: .4byte 0x02038436 -_08103020: .4byte sub_80A64B0 + 1 -_08103024: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8102FB8 thumb_func_start sub_8103028 @@ -529561,11 +511803,11 @@ sub_8103028: @ 8103028 ldrh r0, [r4, 0x22] adds r0, 0x8 strh r0, [r4, 0x22] - ldr r5, _081030A0 + ldr r5, =0x0203841e ldrb r1, [r5, 0x2] adds r0, r4, 0 bl obj_anim_image_start - ldr r2, _081030A4 + ldr r2, =0x08593020 movs r0, 0x4 ldrsh r1, [r5, r0] lsls r0, r1, 1 @@ -529590,7 +511832,7 @@ _08103068: movs r2, 0x20 cmp r0, 0 bne _08103074 - ldr r2, _081030A8 + ldr r2, =0x0000ffe0 _08103074: movs r0, 0x28 strh r0, [r4, 0x2E] @@ -529608,16 +511850,13 @@ _08103074: bl obj_translate_based_on_private_1_2_3_4 ldrh r0, [r5, 0x6] strh r0, [r4, 0x38] - ldr r0, _081030AC + ldr r0, =sub_81030B0 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081030A0: .4byte 0x0203841e -_081030A4: .4byte 0x08593020 -_081030A8: .4byte 0x0000ffe0 -_081030AC: .4byte sub_81030B0 + 1 + .pool thumb_func_end sub_8103028 thumb_func_start sub_81030B0 @@ -529719,18 +511958,17 @@ _08103158: sub_8103164: @ 8103164 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08103178 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _08103180 - ldr r0, _0810317C + ldr r0, =0x02038436 b _08103182 .align 2, 0 -_08103178: .4byte 0x0203841e -_0810317C: .4byte 0x02038436 + .pool _08103180: - ldr r0, _081031C0 + ldr r0, =0x02038437 _08103182: ldrb r4, [r0] adds r0, r4, 0 @@ -529743,26 +511981,23 @@ _08103182: negs r1, r0 orrs r1, r0 lsrs r1, 31 - ldr r0, _081031C4 + ldr r0, =0x0203841e ldrh r0, [r0, 0x2] strh r0, [r5, 0x2E] adds r0, r1, 0x2 strh r0, [r5, 0x30] adds r0, r5, 0 bl obj_anim_image_start - ldr r1, _081031C8 + ldr r1, =sub_81031D0 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _081031CC + ldr r0, =sub_80A67D8 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081031C0: .4byte 0x02038437 -_081031C4: .4byte 0x0203841e -_081031C8: .4byte sub_81031D0 + 1 -_081031CC: .4byte sub_80A67D8 + 1 + .pool thumb_func_end sub_8103164 thumb_func_start sub_81031D0 @@ -529775,7 +512010,7 @@ sub_81031D0: @ 81031D0 lsls r0, 16 cmp r0, 0 bne _081031F8 - ldr r1, _08103200 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 ldrh r1, [r4, 0x30] @@ -529783,51 +512018,47 @@ sub_81031D0: @ 81031D0 lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start - ldr r0, _08103204 + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] _081031F8: pop {r4} pop {r0} bx r0 .align 2, 0 -_08103200: .4byte move_anim_8072740 + 1 -_08103204: .4byte sub_80A67D8 + 1 + .pool thumb_func_end sub_81031D0 thumb_func_start sub_8103208 sub_8103208: @ 8103208 push {r4,lr} adds r4, r0, 0 - ldr r0, _0810321C + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _08103224 - ldr r0, _08103220 + ldr r0, =0x02038436 b _08103226 .align 2, 0 -_0810321C: .4byte 0x0203841e -_08103220: .4byte 0x02038436 + .pool _08103224: - ldr r0, _08103244 + ldr r0, =0x02038437 _08103226: ldrb r0, [r0] adds r1, r4, 0 bl sub_810310C movs r0, 0 strh r0, [r4, 0x2E] - ldr r1, _08103248 + ldr r1, =sub_8103250 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _0810324C + ldr r0, =sub_80A67BC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08103244: .4byte 0x02038437 -_08103248: .4byte sub_8103250 + 1 -_0810324C: .4byte sub_80A67BC + 1 + .pool thumb_func_end sub_8103208 thumb_func_start sub_8103250 @@ -529844,36 +512075,34 @@ sub_8103250: @ 8103250 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r1, _0810327C + ldr r1, =move_anim_8074EE0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _08103280 + ldr r0, =sub_80A67BC + 1 str r0, [r4, 0x1C] _08103276: pop {r4} pop {r0} bx r0 .align 2, 0 -_0810327C: .4byte move_anim_8074EE0 + 1 -_08103280: .4byte sub_80A67BC + 1 + .pool thumb_func_end sub_8103250 thumb_func_start sub_8103284 sub_8103284: @ 8103284 push {r4-r6,lr} adds r4, r0, 0 - ldr r0, _08103298 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _081032A0 - ldr r0, _0810329C + ldr r0, =0x02038436 b _081032A2 .align 2, 0 -_08103298: .4byte 0x0203841e -_0810329C: .4byte 0x02038436 + .pool _081032A0: - ldr r0, _081032F4 + ldr r0, =0x02038437 _081032A2: ldrb r5, [r0] adds r0, r5, 0 @@ -529905,18 +512134,16 @@ _081032CA: adds r0, 0x4 strh r0, [r4, 0x34] strh r6, [r4, 0x36] - ldr r1, _081032F8 + ldr r1, =sub_8103300 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _081032FC + ldr r0, =sub_80A67BC + 1 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081032F4: .4byte 0x02038437 -_081032F8: .4byte sub_8103300 + 1 -_081032FC: .4byte sub_80A67BC + 1 + .pool thumb_func_end sub_8103284 thumb_func_start sub_8103300 @@ -529930,13 +512157,13 @@ sub_8103300: @ 8103300 asrs r0, 16 cmp r0, 0xC ble _08103316 - ldr r0, _0810331C + ldr r0, =sub_8103320 + 1 str r0, [r1, 0x1C] _08103316: pop {r0} bx r0 .align 2, 0 -_0810331C: .4byte sub_8103320 + 1 + .pool thumb_func_end sub_8103300 thumb_func_start sub_8103320 @@ -529958,11 +512185,11 @@ sub_8103320: @ 8103320 cmp r0, 0 bne _0810334C strh r0, [r2, 0x24] - ldr r0, _08103348 + ldr r0, =sub_8103250 + 1 str r0, [r2, 0x1C] b _08103388 .align 2, 0 -_08103348: .4byte sub_8103250 + 1 + .pool _0810334C: movs r0, 0xFF ands r1, r0 @@ -529986,7 +512213,7 @@ _08103362: adds r1, 0x43 strb r0, [r1] _08103372: - ldr r1, _0810338C + ldr r1, =0x08329f40 movs r3, 0x30 ldrsh r0, [r2, r3] lsls r0, 1 @@ -530001,25 +512228,24 @@ _08103388: pop {r0} bx r0 .align 2, 0 -_0810338C: .4byte 0x08329f40 + .pool thumb_func_end sub_8103320 thumb_func_start sub_8103390 sub_8103390: @ 8103390 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _081033A4 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _081033AC - ldr r0, _081033A8 + ldr r0, =0x02038436 b _081033AE .align 2, 0 -_081033A4: .4byte 0x0203841e -_081033A8: .4byte 0x02038436 + .pool _081033AC: - ldr r0, _081033D0 + ldr r0, =0x02038437 _081033AE: ldrb r4, [r0] adds r0, r4, 0 @@ -530036,7 +512262,7 @@ _081033AE: movs r0, 0x2 b _081033DE .align 2, 0 -_081033D0: .4byte 0x02038437 + .pool _081033D4: adds r0, r5, 0 movs r1, 0x1 @@ -530044,13 +512270,13 @@ _081033D4: movs r0, 0x3 _081033DE: strh r0, [r5, 0x2E] - ldr r0, _081033EC + ldr r0, =sub_81033F0 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081033EC: .4byte sub_81033F0 + 1 + .pool thumb_func_end sub_8103390 thumb_func_start sub_81033F0 @@ -530071,18 +512297,17 @@ sub_81033F0: @ 81033F0 lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start - ldr r1, _08103424 + ldr r1, =sub_810342C + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _08103428 + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] _0810341E: pop {r4} pop {r0} bx r0 .align 2, 0 -_08103424: .4byte sub_810342C + 1 -_08103428: .4byte sub_80A67D8 + 1 + .pool thumb_func_end sub_81033F0 thumb_func_start sub_810342C @@ -530108,7 +512333,7 @@ sub_8103448: @ 8103448 push {r4,r5,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r5, _0810348C + ldr r5, =0x0203841e movs r0, 0 ldrsh r1, [r5, r0] adds r0, r4, 0 @@ -530125,10 +512350,10 @@ sub_8103448: @ 8103448 strh r0, [r4, 0x34] ldrh r0, [r5, 0x6] strh r0, [r4, 0x36] - ldr r1, _08103490 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r1, _08103494 + ldr r1, =sub_80A6450 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -530136,27 +512361,24 @@ sub_8103448: @ 8103448 pop {r0} bx r0 .align 2, 0 -_0810348C: .4byte 0x0203841e -_08103490: .4byte move_anim_8074EE0 + 1 -_08103494: .4byte sub_80A6450 + 1 + .pool thumb_func_end sub_8103448 thumb_func_start sub_8103498 sub_8103498: @ 8103498 push {r4,lr} adds r4, r0, 0 - ldr r0, _081034AC + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _081034B4 - ldr r0, _081034B0 + ldr r0, =0x02038436 b _081034B6 .align 2, 0 -_081034AC: .4byte 0x0203841e -_081034B0: .4byte 0x02038436 + .pool _081034B4: - ldr r0, _081034D0 + ldr r0, =0x02038437 _081034B6: ldrb r0, [r0] adds r1, r4, 0 @@ -530164,14 +512386,13 @@ _081034B6: movs r0, 0 strh r0, [r4, 0x2E] strh r0, [r4, 0x30] - ldr r0, _081034D4 + ldr r0, =sub_81034D8 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081034D0: .4byte 0x02038437 -_081034D4: .4byte sub_81034D8 + 1 + .pool thumb_func_end sub_8103498 thumb_func_start sub_81034D8 @@ -530237,7 +512458,7 @@ _08103538: sub_810353C: @ 810353C push {r4,lr} adds r4, r0, 0 - ldr r3, _08103588 + ldr r3, =0x02020630 movs r0, 0x32 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -530273,14 +512494,14 @@ _0810357A: pop {r0} bx r0 .align 2, 0 -_08103588: .4byte 0x02020630 + .pool thumb_func_end sub_810353C thumb_func_start sub_810358C sub_810358C: @ 810358C push {r4-r6,lr} adds r5, r0, 0 - ldr r4, _081035D4 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -530293,8 +512514,8 @@ sub_810358C: @ 810358C lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r1, _081035D8 - ldr r0, _081035DC + ldr r1, =0x020241e4 + ldr r0, =0x02038437 ldrb r0, [r0] adds r0, r1 ldrb r6, [r0] @@ -530303,7 +512524,7 @@ sub_810358C: @ 810358C lsls r0, 24 cmp r0, 0 beq _081035E4 - ldr r0, _081035E0 + ldr r0, =0x0203841e ldrh r1, [r5, 0x20] ldrh r2, [r0] subs r1, r2 @@ -530311,12 +512532,9 @@ sub_810358C: @ 810358C adds r1, r0, 0 b _081035EE .align 2, 0 -_081035D4: .4byte 0x02038436 -_081035D8: .4byte 0x020241e4 -_081035DC: .4byte 0x02038437 -_081035E0: .4byte 0x0203841e + .pool _081035E4: - ldr r1, _08103618 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r5, 0x20] adds r0, r2 @@ -530331,7 +512549,7 @@ _081035EE: ldrh r0, [r1, 0x6] strh r0, [r5, 0x30] strh r6, [r5, 0x32] - ldr r0, _0810361C + ldr r0, =sub_810353C + 1 str r0, [r5, 0x1C] adds r2, r5, 0 adds r2, 0x3E @@ -530343,8 +512561,7 @@ _081035EE: pop {r0} bx r0 .align 2, 0 -_08103618: .4byte 0x0203841e -_0810361C: .4byte sub_810353C + 1 + .pool thumb_func_end sub_810358C thumb_func_start sub_8103620 @@ -530353,25 +512570,23 @@ sub_8103620: @ 8103620 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r1, _0810364C + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] strh r0, [r4, 0x2E] ldrh r0, [r1, 0x6] strh r0, [r4, 0x30] ldrh r0, [r1, 0x8] strh r0, [r4, 0x38] - ldr r0, _08103650 + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] - ldr r1, _08103654 + ldr r1, =sub_8103658 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_0810364C: .4byte 0x0203841e -_08103650: .4byte sub_80A64B0 + 1 -_08103654: .4byte sub_8103658 + 1 + .pool thumb_func_end sub_8103620 thumb_func_start sub_8103658 @@ -530384,15 +512599,14 @@ sub_8103658: @ 8103658 ldrh r1, [r0, 0x22] adds r1, 0xF strh r1, [r0, 0x36] - ldr r1, _08103678 + ldr r1, =sub_80A6EEC + 1 str r1, [r0, 0x1C] - ldr r1, _0810367C + ldr r1, =sub_8103680 + 1 bl oamt_set_x3A_32 pop {r0} bx r0 .align 2, 0 -_08103678: .4byte sub_80A6EEC + 1 -_0810367C: .4byte sub_8103680 + 1 + .pool thumb_func_end sub_8103658 thumb_func_start sub_8103680 @@ -530421,28 +512635,25 @@ sub_81036A0: @ 81036A0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _081036CC - ldr r0, _081036D0 + ldr r1, =0x020241e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] movs r1, 0 bl sub_80A7270 - ldr r1, _081036D4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081036D8 + ldr r1, =sub_81036DC + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081036CC: .4byte 0x020241e4 -_081036D0: .4byte 0x02038436 -_081036D4: .4byte 0x03005e00 -_081036D8: .4byte sub_81036DC + 1 + .pool thumb_func_end sub_81036A0 thumb_func_start sub_81036DC @@ -530450,8 +512661,8 @@ sub_81036DC: @ 81036DC push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0810370C - ldr r0, _08103710 + ldr r1, =0x020241e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r1, r0, r1 ldrb r4, [r1] @@ -530459,7 +512670,7 @@ sub_81036DC: @ 81036DC lsls r0, 24 cmp r0, 0 bne _08103718 - ldr r1, _08103714 + ldr r1, =0x03005e00 lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 @@ -530471,11 +512682,9 @@ sub_81036DC: @ 81036DC adds r6, r2, 0 b _08103726 .align 2, 0 -_0810370C: .4byte 0x020241e4 -_08103710: .4byte 0x02038436 -_08103714: .4byte 0x03005e00 + .pool _08103718: - ldr r2, _08103758 + ldr r2, =0x03005e00 lsls r1, r5, 2 adds r0, r1, r5 lsls r0, 3 @@ -530488,7 +512697,7 @@ _08103726: adds r0, r4, 0 adds r1, r2, 0 bl obj_id_set_rotscale - ldr r1, _08103758 + ldr r1, =0x03005e00 adds r0, r6, r5 lsls r0, 3 adds r1, r0, r1 @@ -530499,7 +512708,7 @@ _08103726: ldrh r0, [r1, 0x8] adds r0, 0xB0 strh r0, [r1, 0x8] - ldr r1, _0810375C + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -530508,8 +512717,7 @@ _08103726: adds r1, 0x1 b _0810378A .align 2, 0 -_08103758: .4byte 0x03005e00 -_0810375C: .4byte 0x02020630 + .pool _08103760: cmp r0, 0x1 bne _08103776 @@ -530526,7 +512734,7 @@ _08103776: ldrh r0, [r1, 0x8] subs r0, 0xB0 strh r0, [r1, 0x8] - ldr r1, _081037C4 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -530537,7 +512745,7 @@ _0810378A: strh r1, [r0, 0x26] adds r0, r4, 0 bl sub_80A73A0 - ldr r0, _081037C8 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -530561,8 +512769,7 @@ _081037AA: bl move_anim_task_del b _081037D0 .align 2, 0 -_081037C4: .4byte 0x02020630 -_081037C8: .4byte 0x03005e00 + .pool _081037CC: adds r0, r2, 0x1 _081037CE: @@ -530578,13 +512785,13 @@ sub_81037D8: @ 81037D8 push {r4,r5,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, _081037FC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08103804 - ldr r0, _08103800 + ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r2, [r0] subs r1, r2 @@ -530592,10 +512799,9 @@ sub_81037D8: @ 81037D8 adds r5, r0, 0 b _08103810 .align 2, 0 -_081037FC: .4byte 0x02038436 -_08103800: .4byte 0x0203841e + .pool _08103804: - ldr r1, _08103844 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -530606,7 +512812,7 @@ _08103810: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, _08103848 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -530628,8 +512834,7 @@ _08103810: strb r2, [r3] b _08103860 .align 2, 0 -_08103844: .4byte 0x0203841e -_08103848: .4byte 0x02038436 + .pool _0810384C: movs r2, 0x4 ldrsh r0, [r5, r2] @@ -530642,17 +512847,16 @@ _0810384C: orrs r0, r1 strb r0, [r2] _08103860: - ldr r0, _08103874 + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] - ldr r1, _08103878 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08103874: .4byte sub_80A67D8 + 1 -_08103878: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_81037D8 thumb_func_start sub_810387C @@ -530661,17 +512865,16 @@ sub_810387C: @ 810387C adds r4, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r0, _08103898 + ldr r0, =sub_80A67BC + 1 str r0, [r4, 0x1C] - ldr r1, _0810389C + ldr r1, =sub_81038A0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_08103898: .4byte sub_80A67BC + 1 -_0810389C: .4byte sub_81038A0 + 1 + .pool thumb_func_end sub_810387C thumb_func_start sub_81038A0 @@ -530684,15 +512887,14 @@ sub_81038A0: @ 81038A0 ldrh r1, [r0, 0x22] subs r1, 0x20 strh r1, [r0, 0x36] - ldr r1, _081038C0 + ldr r1, =sub_80A6EEC + 1 str r1, [r0, 0x1C] - ldr r1, _081038C4 + ldr r1, =move_anim_8072740 + 1 bl oamt_set_x3A_32 pop {r0} bx r0 .align 2, 0 -_081038C0: .4byte sub_80A6EEC + 1 -_081038C4: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_81038A0 thumb_func_start sub_81038C8 @@ -530706,21 +512908,21 @@ sub_81038C8: @ 81038C8 lsls r0, 24 cmp r0, 0 beq _081038EC - ldr r1, _081038E8 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] b _0810390E .align 2, 0 -_081038E8: .4byte 0x0203841e + .pool _081038EC: - ldr r0, _081039B4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810390E - ldr r1, _081039B8 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] @@ -530734,12 +512936,12 @@ _0810390E: adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC - ldr r4, _081039BC + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 - ldr r6, _081039B8 + ldr r6, =0x0203841e lsrs r0, 24 ldrh r1, [r6, 0x4] adds r0, r1 @@ -530779,7 +512981,7 @@ _0810390E: lsls r0, 24 cmp r0, 0 beq _08103980 - ldr r2, _081039C0 + ldr r2, =0xffffa000 adds r0, r4, r2 lsls r0, 16 lsrs r4, r0, 16 @@ -530796,9 +512998,9 @@ _08103980: mov r0, r8 strh r0, [r5, 0x32] strh r7, [r5, 0x36] - ldr r0, _081039C4 + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _081039C8 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 add sp, 0x4 @@ -530808,12 +513010,7 @@ _08103980: pop {r0} bx r0 .align 2, 0 -_081039B4: .4byte 0x02038436 -_081039B8: .4byte 0x0203841e -_081039BC: .4byte 0x02038437 -_081039C0: .4byte 0xffffa000 -_081039C4: .4byte sub_80A6EEC + 1 -_081039C8: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_81038C8 thumb_func_start sub_81039CC @@ -530826,7 +513023,7 @@ sub_81039CC: @ 81039CC lsls r0, 16 cmp r0, 0 bgt _081039F6 - ldr r2, _081039FC + ldr r2, =0x03005e00 movs r0, 0x3C ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -530842,7 +513039,7 @@ _081039F6: pop {r0} bx r0 .align 2, 0 -_081039FC: .4byte 0x03005e00 + .pool thumb_func_end sub_81039CC thumb_func_start sub_8103A00 @@ -530854,7 +513051,7 @@ sub_8103A00: @ 8103A00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _08103A30 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r3, 0x2E ldrsh r1, [r2, r3] @@ -530871,7 +513068,7 @@ sub_8103A00: @ 8103A00 adds r0, r3 b _08103A42 .align 2, 0 -_08103A30: .4byte 0x03005e00 + .pool _08103A34: ldrh r0, [r2, 0x38] ldrh r1, [r2, 0x34] @@ -530926,14 +513123,14 @@ _08103A82: bgt _08103A98 movs r0, 0x1E strh r0, [r2, 0x2E] - ldr r0, _08103AA0 + ldr r0, =sub_81039CC + 1 str r0, [r2, 0x1C] _08103A98: pop {r4} pop {r0} bx r0 .align 2, 0 -_08103AA0: .4byte sub_81039CC + 1 + .pool thumb_func_end sub_8103A00 thumb_func_start sub_8103AA4 @@ -530947,7 +513144,7 @@ sub_8103AA4: @ 8103AA4 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _08103AE8 + ldr r1, =0x03005e00 adds r6, r0, r1 ldrh r2, [r6, 0x16] movs r1, 0x2 @@ -530972,7 +513169,7 @@ sub_8103AA4: @ 8103AA4 negs r0, r0 b _08103AF0 .align 2, 0 -_08103AE8: .4byte 0x03005e00 + .pool _08103AEC: lsls r0, r2, 16 lsrs r0, 24 @@ -531088,7 +513285,7 @@ _08103B6E: adds r0, r4, 0 bl sub_8151534 strh r0, [r7, 0x36] - ldr r0, _08103BE0 + ldr r0, =sub_8103A00 + 1 str r0, [r7, 0x1C] _08103BD4: pop {r3} @@ -531097,7 +513294,7 @@ _08103BD4: pop {r0} bx r0 .align 2, 0 -_08103BE0: .4byte sub_8103A00 + 1 + .pool thumb_func_end sub_8103AA4 thumb_func_start sub_8103BE4 @@ -531105,7 +513302,7 @@ sub_8103BE4: @ 8103BE4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08103C08 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -531120,7 +513317,7 @@ _08103C02: pop {r0} bx r0 .align 2, 0 -_08103C08: .4byte 0x03005e00 + .pool thumb_func_end sub_8103BE4 thumb_func_start sub_8103C0C @@ -531128,7 +513325,7 @@ sub_8103C0C: @ 8103C0C push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _08103C60 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -531139,7 +513336,7 @@ sub_8103C0C: @ 8103C0C lsls r0, 16 cmp r0, 0 bgt _08103CE0 - ldr r0, _08103C64 + ldr r0, =0x085933b0 movs r2, 0x1A ldrsh r1, [r5, r2] movs r3, 0x1C @@ -531156,7 +513353,7 @@ sub_8103C0C: @ 8103C0C lsls r0, 4 add r0, r12 lsls r0, 2 - ldr r1, _08103C68 + ldr r1, =0x02020630 adds r6, r0, r1 movs r1, 0x10 ldrsh r0, [r5, r1] @@ -531166,9 +513363,7 @@ sub_8103C0C: @ 8103C0C beq _08103C82 b _08103C90 .align 2, 0 -_08103C60: .4byte 0x03005e00 -_08103C64: .4byte 0x085933b0 -_08103C68: .4byte 0x02020630 + .pool _08103C6C: ldrb r2, [r6, 0x3] lsls r1, r2, 26 @@ -531190,7 +513385,7 @@ _08103C82: orrs r1, r0 strb r1, [r6, 0x3] _08103C90: - ldr r3, _08103CE8 + ldr r3, =0x03005e00 lsls r2, r7, 2 adds r2, r7 lsls r2, 3 @@ -531226,15 +513421,14 @@ _08103C90: ldrsh r0, [r4, r3] cmp r0, 0x2 ble _08103CE0 - ldr r0, _08103CEC + ldr r0, =sub_8103BE4 + 1 str r0, [r4] _08103CE0: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08103CE8: .4byte 0x03005e00 -_08103CEC: .4byte sub_8103BE4 + 1 + .pool thumb_func_end sub_8103C0C thumb_func_start sub_8103CF0 @@ -531261,14 +513455,14 @@ sub_8103CF0: @ 8103CF0 mov r10, r4 cmp r0, 0 beq _08103D5C - ldr r1, _08103D4C + ldr r1, =0x03005e00 lsls r2, r7, 2 adds r0, r2, r7 lsls r0, 3 adds r0, r1 movs r1, 0x2 strh r1, [r0, 0x10] - ldr r3, _08103D50 + ldr r3, =0x0203841e ldrh r0, [r3] negs r0, r0 strh r0, [r3] @@ -531284,16 +513478,15 @@ sub_8103CF0: @ 8103CF0 strh r0, [r3, 0x4] b _08103DB6 .align 2, 0 -_08103D4C: .4byte 0x03005e00 -_08103D50: .4byte 0x0203841e + .pool _08103D54: movs r0, 0x1 orrs r0, r1 strh r0, [r3, 0x4] b _08103DB6 _08103D5C: - ldr r1, _08103DA0 - ldr r0, _08103DA4 + ldr r1, =0x02024076 + ldr r0, =0x02038437 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -531304,12 +513497,12 @@ _08103D5C: mov r8, r2 cmp r0, 0 bne _08103DB6 - ldr r1, _08103DA8 + ldr r1, =0x03005e00 adds r0, r2, r7 lsls r0, 3 adds r0, r1 strh r3, [r0, 0x10] - ldr r2, _08103DAC + ldr r2, =0x0203841e ldrh r0, [r2] negs r0, r0 strh r0, [r2] @@ -531326,21 +513519,18 @@ _08103D5C: ands r0, r1 b _08103DB4 .align 2, 0 -_08103DA0: .4byte 0x02024076 -_08103DA4: .4byte 0x02038437 -_08103DA8: .4byte 0x03005e00 -_08103DAC: .4byte 0x0203841e + .pool _08103DB0: movs r0, 0x1 orrs r0, r1 _08103DB4: strh r0, [r2, 0x4] _08103DB6: - ldr r5, _08103E10 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C - ldr r1, _08103E14 + ldr r1, =0x03005e00 mov r3, r8 adds r4, r3, r7 lsls r4, 3 @@ -531356,13 +513546,13 @@ _08103DB6: lsrs r0, 24 strh r0, [r4, 0x1C] mov r9, r0 - ldr r0, _08103E18 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _08103E20 - ldr r4, _08103E1C + ldr r4, =0x02038437 ldrb r1, [r4] movs r0, 0x2 eors r0, r1 @@ -531377,13 +513567,10 @@ _08103DB6: bl sub_80A8924 b _08103E42 .align 2, 0 -_08103E10: .4byte 0x02038436 -_08103E14: .4byte 0x03005e00 -_08103E18: .4byte 0x02022fec -_08103E1C: .4byte 0x02038437 + .pool _08103E20: mov r5, sp - ldr r4, _08103E7C + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -531399,13 +513586,13 @@ _08103E20: strh r0, [r1] _08103E42: mov r4, sp - ldr r0, _08103E80 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r0 mov r2, sp - ldr r3, _08103E84 + ldr r3, =0x0203841e ldrh r0, [r3] ldrh r2, [r2] adds r0, r2 @@ -531428,9 +513615,7 @@ _08103E42: subs r0, r2, r1 b _08103E8A .align 2, 0 -_08103E7C: .4byte 0x02038437 -_08103E80: .4byte 0x03005e00 -_08103E84: .4byte 0x0203841e + .pool _08103E88: subs r0, r1, r2 _08103E8A: @@ -531438,7 +513623,7 @@ _08103E8A: lsrs r0, 16 lsls r4, r0, 16 asrs r4, 16 - ldr r5, _08103F00 + ldr r5, =0x0203841e ldrh r1, [r5, 0x4] movs r0, 0x2 negs r0, r0 @@ -531451,7 +513636,7 @@ _08103E8A: asrs r1, 16 adds r0, r4, 0 bl sub_8151534 - ldr r2, _08103F04 + ldr r2, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -531488,8 +513673,7 @@ _08103E8A: strh r1, [r6, 0x18] b _08103F28 .align 2, 0 -_08103F00: .4byte 0x0203841e -_08103F04: .4byte 0x03005e00 + .pool _08103F08: subs r4, r1 lsls r4, 16 @@ -531506,12 +513690,12 @@ _08103F08: orrs r0, r1 strh r0, [r6, 0x18] _08103F28: - ldr r1, _08103F68 + ldr r1, =0x03005e00 mov r3, r8 adds r0, r3, r7 lsls r0, 3 adds r5, r0, r1 - ldr r4, _08103F6C + ldr r4, =0x0203841e ldrh r0, [r4, 0x6] strh r0, [r5, 0xE] ldrh r1, [r4, 0x8] @@ -531526,43 +513710,39 @@ _08103F28: asrs r0, 16 cmp r0, 0x3F ble _08103FA0 - ldr r0, _08103F70 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 lsls r0, 24 lsrs r0, 24 - ldr r2, _08103F74 + ldr r2, =0x0000ffc0 adds r1, r2, 0 ldrh r4, [r4, 0x8] adds r1, r4 adds r0, r1 b _08103FB0 .align 2, 0 -_08103F68: .4byte 0x03005e00 -_08103F6C: .4byte 0x0203841e -_08103F70: .4byte 0x02038437 -_08103F74: .4byte 0x0000ffc0 + .pool _08103F78: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0x3F ble _08103FA0 - ldr r0, _08103F98 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 lsls r0, 24 lsrs r0, 24 - ldr r3, _08103F9C + ldr r3, =0x0000ffc0 adds r1, r3, 0 ldrh r4, [r4, 0x8] adds r1, r4 adds r0, r1 b _08103FB0 .align 2, 0 -_08103F98: .4byte 0x02038437 -_08103F9C: .4byte 0x0000ffc0 + .pool _08103FA0: - ldr r0, _08103FDC + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 lsls r0, 24 @@ -531571,7 +513751,7 @@ _08103FA0: subs r0, r1 _08103FB0: strh r0, [r5, 0xC] - ldr r0, _08103FE0 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -531583,7 +513763,7 @@ _08103FB0: movs r0, 0x3 strh r0, [r1, 0xC] _08103FC8: - ldr r0, _08103FE4 + ldr r0, =sub_8103C0C + 1 str r0, [r1] add sp, 0x4 pop {r3-r5} @@ -531594,9 +513774,7 @@ _08103FC8: pop {r0} bx r0 .align 2, 0 -_08103FDC: .4byte 0x02038437 -_08103FE0: .4byte 0x03005e00 -_08103FE4: .4byte sub_8103C0C + 1 + .pool thumb_func_end sub_8103CF0 thumb_func_start sub_8103FE8 @@ -531605,7 +513783,7 @@ sub_8103FE8: @ 8103FE8 adds r4, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r0, _08104010 + ldr r0, =0x085934a0 ldrh r0, [r0, 0x2] bl gpu_pal_tags_index_of lsls r0, 24 @@ -531614,14 +513792,13 @@ sub_8103FE8: @ 8103FE8 lsls r1, 1 adds r0, r1 strh r0, [r4, 0x2E] - ldr r0, _08104014 + ldr r0, =sub_8104018 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08104010: .4byte 0x085934a0 -_08104014: .4byte sub_8104018 + 1 + .pool thumb_func_end sub_8103FE8 thumb_func_start sub_8104018 @@ -531638,7 +513815,7 @@ sub_8104018: @ 8104018 movs r0, 0 strh r0, [r4, 0x30] ldrh r5, [r4, 0x2E] - ldr r1, _08104084 + ldr r1, =0x02037b14 adds r0, r5, 0 adds r0, 0x8 lsls r0, 1 @@ -531681,7 +513858,7 @@ _0810407C: pop {r0} bx r0 .align 2, 0 -_08104084: .4byte 0x02037b14 + .pool thumb_func_end sub_8104018 thumb_func_start sub_8104088 @@ -531691,7 +513868,7 @@ sub_8104088: @ 8104088 adds r5, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r4, _08104128 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -531701,13 +513878,13 @@ sub_8104088: @ 8104088 movs r1, 0x3 bl sub_80A5C6C lsls r0, 24 - ldr r4, _0810412C + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4, 0x6] adds r0, r1 lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _08104130 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -531751,9 +513928,9 @@ _081040CC: strh r0, [r5, 0x2E] strh r6, [r5, 0x32] strh r7, [r5, 0x36] - ldr r0, _08104134 + ldr r0, =sub_80A7000 + 1 str r0, [r5, 0x1C] - ldr r1, _08104138 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 add sp, 0x4 @@ -531761,26 +513938,21 @@ _081040CC: pop {r0} bx r0 .align 2, 0 -_08104128: .4byte 0x02038437 -_0810412C: .4byte 0x0203841e -_08104130: .4byte 0x02038436 -_08104134: .4byte sub_80A7000 + 1 -_08104138: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8104088 thumb_func_start sub_810413C sub_810413C: @ 810413C - ldr r1, _0810414C + ldr r1, =0x0000fff0 strh r1, [r0, 0x32] ldrh r1, [r0, 0x22] adds r1, 0x8 strh r1, [r0, 0x22] - ldr r1, _08104150 + ldr r1, =sub_8104154 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_0810414C: .4byte 0x0000fff0 -_08104150: .4byte sub_8104154 + 1 + .pool thumb_func_end sub_810413C thumb_func_start sub_8104154 @@ -531793,7 +513965,7 @@ sub_8104154: @ 8104154 lsls r0, 16 asrs r0, 24 strh r0, [r4, 0x24] - ldr r0, _081041C0 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -531838,7 +514010,7 @@ _081041B8: pop {r0} bx r0 .align 2, 0 -_081041C0: .4byte 0x02038436 + .pool thumb_func_end sub_8104154 thumb_func_start sub_81041C4 @@ -531849,7 +514021,7 @@ sub_81041C4: @ 81041C4 bl sub_80A69CC movs r0, 0x14 strh r0, [r4, 0x2E] - ldr r5, _08104210 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -531862,7 +514034,7 @@ sub_81041C4: @ 81041C4 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] - ldr r0, _08104214 + ldr r0, =sub_80A6EEC + 1 str r0, [r4, 0x1C] adds r2, r4, 0 adds r2, 0x2C @@ -531870,16 +514042,14 @@ sub_81041C4: @ 81041C4 movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _08104218 + ldr r1, =sub_810421C + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08104210: .4byte 0x02038437 -_08104214: .4byte sub_80A6EEC + 1 -_08104218: .4byte sub_810421C + 1 + .pool thumb_func_end sub_81041C4 thumb_func_start sub_810421C @@ -531919,7 +514089,7 @@ _08104250: lsrs r0, 16 movs r1, 0x7 ands r0, r1 - ldr r2, _08104298 + ldr r2, =0x0000fff4 adds r1, r2, 0 subs r1, r0 strh r1, [r4, 0x3A] @@ -531930,7 +514100,7 @@ _08104250: bl __umodsi3 adds r0, 0xA0 strh r0, [r4, 0x3C] - ldr r0, _0810429C + ldr r0, =sub_81042A0 + 1 str r0, [r4, 0x1C] adds r2, r4, 0 adds r2, 0x2C @@ -531942,8 +514112,7 @@ _08104250: pop {r0} bx r0 .align 2, 0 -_08104298: .4byte 0x0000fff4 -_0810429C: .4byte sub_81042A0 + 1 + .pool thumb_func_end sub_810421C thumb_func_start sub_81042A0 @@ -532006,7 +514175,7 @@ sub_8104304: @ 8104304 adds r4, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r0, _08104354 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -532016,7 +514185,7 @@ sub_8104304: @ 8104304 adds r0, 0x10 strh r0, [r4, 0x22] _08104322: - ldr r1, _08104358 + ldr r1, =0x0203841e ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] ldrh r0, [r1, 0x4] @@ -532027,9 +514196,9 @@ _08104322: strh r0, [r4, 0x34] ldrh r0, [r1, 0x6] strh r0, [r4, 0x36] - ldr r0, _0810435C + ldr r0, =sub_80A62EC + 1 str r0, [r4, 0x1C] - ldr r1, _08104360 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 ldr r1, [r4, 0x1C] @@ -532039,10 +514208,7 @@ _08104322: pop {r0} bx r0 .align 2, 0 -_08104354: .4byte 0x02038436 -_08104358: .4byte 0x0203841e -_0810435C: .4byte sub_80A62EC + 1 -_08104360: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8104304 thumb_func_start sub_8104364 @@ -532052,11 +514218,11 @@ sub_8104364: @ 8104364 push {r7} adds r5, r0, 0 movs r7, 0x20 - ldr r4, _081043E0 + ldr r4, =0x0000ffe0 movs r0, 0x10 mov r8, r0 - ldr r6, _081043E4 - ldr r0, _081043E8 + ldr r6, =0x0000fff0 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -532081,7 +514247,7 @@ _08104390: strh r0, [r5, 0x22] movs r0, 0x6 strh r0, [r5, 0x2E] - ldr r4, _081043EC + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -532096,9 +514262,9 @@ _08104390: lsrs r0, 24 adds r0, r6 strh r0, [r5, 0x36] - ldr r0, _081043F0 + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _081043F4 + ldr r1, =sub_81043F8 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r3} @@ -532107,12 +514273,7 @@ _08104390: pop {r0} bx r0 .align 2, 0 -_081043E0: .4byte 0x0000ffe0 -_081043E4: .4byte 0x0000fff0 -_081043E8: .4byte 0x0203841e -_081043EC: .4byte 0x02038437 -_081043F0: .4byte sub_80A6EEC + 1 -_081043F4: .4byte sub_81043F8 + 1 + .pool thumb_func_end sub_8104364 thumb_func_start sub_81043F8 @@ -532141,11 +514302,11 @@ sub_8104414: @ 8104414 adds r5, r0, 0 movs r0, 0x20 mov r8, r0 - ldr r4, _081044A8 + ldr r4, =0x0000ffe0 movs r2, 0x10 mov r9, r2 - ldr r6, _081044AC - ldr r7, _081044B0 + ldr r6, =0x0000fff0 + ldr r7, =0x0203841e ldrh r1, [r7] movs r2, 0 ldrsh r0, [r7, r2] @@ -532174,7 +514335,7 @@ _08104448: movs r0, 0x6 strh r0, [r5, 0x2E] strh r1, [r5, 0x30] - ldr r4, _081044B4 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -532197,7 +514358,7 @@ _08104448: strh r0, [r5, 0x38] ldrh r0, [r5, 0x2E] strh r0, [r5, 0x3A] - ldr r0, _081044B8 + ldr r0, =sub_81044BC + 1 str r0, [r5, 0x1C] pop {r3,r4} mov r8, r3 @@ -532206,11 +514367,7 @@ _08104448: pop {r0} bx r0 .align 2, 0 -_081044A8: .4byte 0x0000ffe0 -_081044AC: .4byte 0x0000fff0 -_081044B0: .4byte 0x0203841e -_081044B4: .4byte 0x02038437 -_081044B8: .4byte sub_81044BC + 1 + .pool thumb_func_end sub_8104414 thumb_func_start sub_81044BC @@ -532248,7 +514405,7 @@ sub_81044BC: @ 81044BC strh r0, [r4, 0x22] movs r0, 0x2 strh r0, [r4, 0x24] - ldr r0, _08104528 + ldr r0, =0x0000fffe strh r0, [r4, 0x26] ldrh r0, [r4, 0x3A] strh r0, [r4, 0x2E] @@ -532261,15 +514418,14 @@ sub_81044BC: @ 81044BC strh r0, [r4, 0x32] strh r2, [r4, 0x36] strh r2, [r4, 0x34] - ldr r0, _0810452C + ldr r0, =sub_8104530 + 1 str r0, [r4, 0x1C] _08104520: pop {r4} pop {r0} bx r0 .align 2, 0 -_08104528: .4byte 0x0000fffe -_0810452C: .4byte sub_8104530 + 1 + .pool thumb_func_end sub_81044BC thumb_func_start sub_8104530 @@ -532317,14 +514473,14 @@ _08104548: lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start - ldr r0, _08104590 + ldr r0, =sub_8104594 + 1 str r0, [r4, 0x1C] _0810458A: pop {r4} pop {r0} bx r0 .align 2, 0 -_08104590: .4byte sub_8104594 + 1 + .pool thumb_func_end sub_8104530 thumb_func_start sub_8104594 @@ -532362,7 +514518,7 @@ sub_81045B0: @ 81045B0 movs r2, 0xD0 movs r3, 0 bl obj_id_set_rotscale - ldr r1, _08104608 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -532372,22 +514528,20 @@ sub_81045B0: @ 81045B0 adds r0, 0x10 movs r1, 0 bl sub_80A750C - ldr r1, _0810460C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0x50 strh r1, [r0, 0x8] - ldr r1, _08104610 + ldr r1, =sub_8104614 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08104608: .4byte 0x02020630 -_0810460C: .4byte 0x03005e00 -_08104610: .4byte sub_8104614 + 1 + .pool thumb_func_end sub_81045B0 thumb_func_start sub_8104614 @@ -532395,7 +514549,7 @@ sub_8104614: @ 8104614 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0810466C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -532416,7 +514570,7 @@ sub_8104614: @ 8104614 lsrs r4, 24 adds r0, r4, 0 bl sub_80A7344 - ldr r1, _08104670 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -532433,8 +514587,7 @@ _08104664: pop {r0} bx r0 .align 2, 0 -_0810466C: .4byte 0x03005e00 -_08104670: .4byte 0x02020630 + .pool thumb_func_end sub_8104614 thumb_func_start sub_8104674 @@ -532445,7 +514598,7 @@ sub_8104674: @ 8104674 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081046C0 + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 bl obj_id_for_side_relative_to_move @@ -532463,21 +514616,19 @@ sub_8104674: @ 8104674 strh r0, [r4, 0x10] strh r5, [r4, 0x12] strh r5, [r4, 0x14] - ldr r0, _081046C4 + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x16] - ldr r0, _081046C8 + ldr r0, =sub_81046CC + 1 str r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081046C0: .4byte 0x03005e00 -_081046C4: .4byte 0x02038436 -_081046C8: .4byte sub_81046CC + 1 + .pool thumb_func_end sub_8104674 thumb_func_start sub_81046CC @@ -532488,7 +514639,7 @@ sub_81046CC: @ 81046CC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081046F0 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0xA ldrsh r0, [r4, r1] @@ -532497,13 +514648,12 @@ sub_81046CC: @ 81046CC b _081047F6 _081046E6: lsls r0, 2 - ldr r1, _081046F4 + ldr r1, =_081046F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081046F0: .4byte 0x03005e00 -_081046F4: .4byte _081046F8 + .pool .align 2, 0 _081046F8: .4byte _08104710 @@ -532618,7 +514768,7 @@ _081047D0: _081047D8: ldrb r0, [r4, 0x8] bl sub_80A7344 - ldr r2, _081047FC + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -532634,7 +514784,7 @@ _081047F6: pop {r0} bx r0 .align 2, 0 -_081047FC: .4byte 0x02020630 + .pool thumb_func_end sub_81046CC thumb_func_start sub_8104800 @@ -532664,14 +514814,14 @@ sub_8104800: @ 8104800 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _08104840 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_but_dont_free_vram b _081048DA .align 2, 0 -_08104840: .4byte 0x02020630 + .pool _08104844: - ldr r5, _081048E8 + ldr r5, =0x02020630 lsls r3, r4, 4 adds r3, r4 lsls r3, 2 @@ -532720,7 +514870,7 @@ _08104844: strh r0, [r4, 0x32] adds r5, 0x1C adds r3, r5 - ldr r0, _081048EC + ldr r0, =sub_81048F0 + 1 str r0, [r3] mov r1, r8 lsls r0, r1, 24 @@ -532752,8 +514902,7 @@ _081048DA: pop {r0} bx r0 .align 2, 0 -_081048E8: .4byte 0x02020630 -_081048EC: .4byte sub_81048F0 + 1 + .pool thumb_func_end sub_8104800 thumb_func_start sub_81048F0 @@ -532766,7 +514915,7 @@ sub_81048F0: @ 81048F0 lsls r0, 16 cmp r0, 0 bne _0810492E - ldr r3, _08104934 + ldr r3, =0x03005e00 movs r0, 0x32 ldrsh r1, [r4, r0] lsls r1, 1 @@ -532792,7 +514941,7 @@ _0810492E: pop {r0} bx r0 .align 2, 0 -_08104934: .4byte 0x03005e00 + .pool thumb_func_end sub_81048F0 thumb_func_start sub_8104938 @@ -532803,9 +514952,9 @@ sub_8104938: @ 8104938 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0810495C + ldr r1, =0x03005e00 adds r4, r0, r1 - ldr r5, _08104960 + ldr r5, =0x0203841e movs r1, 0x2 ldrsh r0, [r5, r1] cmp r0, 0 @@ -532814,8 +514963,7 @@ sub_8104938: @ 8104938 bl move_anim_task_del b _0810498A .align 2, 0 -_0810495C: .4byte 0x03005e00 -_08104960: .4byte 0x0203841e + .pool _08104964: ldrb r0, [r5] bl obj_id_for_side_relative_to_move @@ -532829,18 +514977,17 @@ _08104964: strh r0, [r4, 0xC] strh r2, [r4, 0xE] strh r2, [r4, 0x10] - ldr r2, _08104990 + ldr r2, =0x085935e8 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, _08104994 + ldr r0, =sub_8104998 + 1 str r0, [r4] _0810498A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08104990: .4byte 0x085935e8 -_08104994: .4byte sub_8104998 + 1 + .pool thumb_func_end sub_8104938 thumb_func_start sub_8104998 @@ -532851,7 +514998,7 @@ sub_8104998: @ 8104998 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081049BC + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0xA ldrsh r5, [r4, r0] @@ -532863,7 +515010,7 @@ sub_8104998: @ 8104998 beq _081049CA b _08104AA8 .align 2, 0 -_081049BC: .4byte 0x03005e00 + .pool _081049C0: cmp r5, 0x2 beq _08104A34 @@ -532876,7 +515023,7 @@ _081049CA: ldrh r2, [r4, 0x10] adds r2, 0x3 strh r2, [r4, 0x10] - ldr r3, _081049FC + ldr r3, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -532896,11 +515043,11 @@ _081049CA: strh r5, [r4, 0xE] b _08104A5C .align 2, 0 -_081049FC: .4byte 0x02020630 + .pool _08104A00: adds r0, r4, 0 bl sub_80A7D34 - ldr r2, _08104A30 + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -532922,13 +515069,13 @@ _08104A00: strh r0, [r4, 0xE] b _08104A5C .align 2, 0 -_08104A30: .4byte 0x02020630 + .pool _08104A34: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0 beq _08104A5C - ldr r2, _08104A58 + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -532943,7 +515090,7 @@ _08104A34: strh r0, [r4, 0x10] b _08104AA8 .align 2, 0 -_08104A58: .4byte 0x02020630 + .pool _08104A5C: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -532962,7 +515109,7 @@ _08104A64: lsls r0, 16 cmp r0, 0 bne _08104A9C - ldr r2, _08104A98 + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -532974,10 +515121,10 @@ _08104A64: bl move_anim_task_del b _08104AA8 .align 2, 0 -_08104A98: .4byte 0x02020630 + .pool _08104A9C: ldrb r1, [r4, 0x8] - ldr r2, _08104AB0 + ldr r2, =0x085935e8 adds r0, r4, 0 bl sub_80A7CFC strh r5, [r4, 0xA] @@ -532986,7 +515133,7 @@ _08104AA8: pop {r0} bx r0 .align 2, 0 -_08104AB0: .4byte 0x085935e8 + .pool thumb_func_end sub_8104998 thumb_func_start sub_8104AB4 @@ -532997,25 +515144,23 @@ sub_8104AB4: @ 8104AB4 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08104AE4 + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 bl obj_id_for_side_relative_to_move adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _08104AE8 + ldr r2, =0x08593608 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, _08104AEC + ldr r0, =sub_8104AF0 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_08104AE4: .4byte 0x03005e00 -_08104AE8: .4byte 0x08593608 -_08104AEC: .4byte sub_8104AF0 + 1 + .pool thumb_func_end sub_8104AB4 thumb_func_start sub_8104AF0 @@ -533026,7 +515171,7 @@ sub_8104AF0: @ 8104AF0 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08104B18 + ldr r1, =0x03005e00 adds r0, r1 bl sub_80A7D34 lsls r0, 24 @@ -533039,14 +515184,14 @@ _08104B10: pop {r0} bx r0 .align 2, 0 -_08104B18: .4byte 0x03005e00 + .pool thumb_func_end sub_8104AF0 thumb_func_start sub_8104B1C sub_8104B1C: @ 8104B1C push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08104B4C + ldr r5, =0x02038436 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 @@ -533065,7 +515210,7 @@ sub_8104B1C: @ 8104B1C movs r0, 0x40 b _08104B6A .align 2, 0 -_08104B4C: .4byte 0x02038436 + .pool _08104B50: adds r0, r4, 0 movs r1, 0x1 @@ -533077,10 +515222,10 @@ _08104B50: lsrs r0, 24 subs r0, 0x20 strh r0, [r4, 0x20] - ldr r0, _08104B9C + ldr r0, =0x0000ffc0 _08104B6A: strh r0, [r4, 0x30] - ldr r0, _08104BA0 + ldr r0, =0x02038436 ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -533093,37 +515238,33 @@ _08104B6A: strh r1, [r4, 0x32] strh r1, [r4, 0x34] strh r1, [r4, 0x36] - ldr r1, _08104BA4 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _08104BA8 + ldr r0, =sub_80A656C + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08104B9C: .4byte 0x0000ffc0 -_08104BA0: .4byte 0x02038436 -_08104BA4: .4byte move_anim_8072740 + 1 -_08104BA8: .4byte sub_80A656C + 1 + .pool thumb_func_end sub_8104B1C thumb_func_start sub_8104BAC sub_8104BAC: @ 8104BAC push {r4-r6,lr} adds r6, r0, 0 - ldr r0, _08104BC0 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _08104BC8 - ldr r0, _08104BC4 + ldr r0, =0x02038436 b _08104BCA .align 2, 0 -_08104BC0: .4byte 0x0203841e -_08104BC4: .4byte 0x02038436 + .pool _08104BC8: - ldr r0, _08104C28 + ldr r0, =0x02038437 _08104BCA: ldrb r5, [r0] adds r0, r5, 0 @@ -533132,7 +515273,7 @@ _08104BCA: lsrs r0, 24 cmp r0, 0x1 bne _08104BE4 - ldr r1, _08104C2C + ldr r1, =0x0203841e movs r2, 0x2 ldrsh r0, [r1, r2] negs r0, r0 @@ -533142,7 +515283,7 @@ _08104BE4: movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 - ldr r4, _08104C2C + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4, 0x2] adds r0, r1 @@ -533162,19 +515303,16 @@ _08104BE4: movs r0, 0x8 strh r0, [r6, 0x22] _08104C16: - ldr r1, _08104C30 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 - ldr r0, _08104C34 + ldr r0, =sub_80A67BC + 1 str r0, [r6, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08104C28: .4byte 0x02038437 -_08104C2C: .4byte 0x0203841e -_08104C30: .4byte move_anim_8074EE0 + 1 -_08104C34: .4byte sub_80A67BC + 1 + .pool thumb_func_end sub_8104BAC thumb_func_start sub_8104C38 @@ -533185,7 +515323,7 @@ sub_8104C38: @ 8104C38 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08104C6C + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 bl obj_id_for_side_relative_to_move @@ -533195,18 +515333,16 @@ sub_8104C38: @ 8104C38 movs r0, 0 strh r1, [r4, 0x8] strh r0, [r4, 0xA] - ldr r2, _08104C70 + ldr r2, =0x085936a4 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, _08104C74 + ldr r0, =sub_8104C78 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_08104C6C: .4byte 0x03005e00 -_08104C70: .4byte 0x085936a4 -_08104C74: .4byte sub_8104C78 + 1 + .pool thumb_func_end sub_8104C38 thumb_func_start sub_8104C78 @@ -533217,7 +515353,7 @@ sub_8104C78: @ 8104C78 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08104CA0 + ldr r1, =0x03005e00 adds r0, r1 bl sub_80A7D34 lsls r0, 24 @@ -533230,7 +515366,7 @@ _08104C98: pop {r0} bx r0 .align 2, 0 -_08104CA0: .4byte 0x03005e00 + .pool thumb_func_end sub_8104C78 thumb_func_start sub_8104CA4 @@ -533241,7 +515377,7 @@ sub_8104CA4: @ 8104CA4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08104D18 + ldr r0, =0x03005e00 adds r4, r1, r0 movs r0, 0 bl obj_id_for_side_relative_to_move @@ -533256,7 +515392,7 @@ sub_8104CA4: @ 8104CA4 strh r0, [r4, 0xE] movs r0, 0x3 strh r0, [r4, 0x10] - ldr r3, _08104D1C + ldr r3, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -533275,7 +515411,7 @@ sub_8104CA4: @ 8104CA4 strh r2, [r4, 0x18] movs r0, 0x2 strh r0, [r4, 0x1A] - ldr r0, _08104D20 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -533287,16 +515423,13 @@ sub_8104CA4: @ 8104CA4 negs r0, r0 strh r0, [r4, 0xC] _08104D0E: - ldr r0, _08104D24 + ldr r0, =sub_8104D28 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_08104D18: .4byte 0x03005e00 -_08104D1C: .4byte 0x02020630 -_08104D20: .4byte 0x02038436 -_08104D24: .4byte sub_8104D28 + 1 + .pool thumb_func_end sub_8104CA4 thumb_func_start sub_8104D28 @@ -533307,7 +515440,7 @@ sub_8104D28: @ 8104D28 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08104D70 + ldr r1, =0x03005e00 adds r3, r0, r1 ldrh r0, [r3, 0x16] adds r0, 0x1 @@ -533325,7 +515458,7 @@ sub_8104D28: @ 8104D28 ands r0, r1 cmp r0, 0 beq _08104D78 - ldr r2, _08104D74 + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -533337,10 +515470,9 @@ sub_8104D28: @ 8104D28 adds r1, r2 b _08104D8C .align 2, 0 -_08104D70: .4byte 0x03005e00 -_08104D74: .4byte 0x02020630 + .pool _08104D78: - ldr r2, _08104DA0 + ldr r2, =0x02020630 movs r5, 0x8 ldrsh r1, [r3, r5] lsls r0, r1, 4 @@ -533363,13 +515495,13 @@ _08104D8E: beq _08104DAA b _08104E6C .align 2, 0 -_08104DA0: .4byte 0x02020630 + .pool _08104DA4: cmp r0, 0x2 beq _08104E0C b _08104E6C _08104DAA: - ldr r2, _08104DD8 + ldr r2, =0x02020630 movs r5, 0x8 ldrsh r1, [r3, r5] lsls r0, r1, 4 @@ -533392,9 +515524,9 @@ _08104DAA: strh r0, [r3, 0xA] b _08104E6C .align 2, 0 -_08104DD8: .4byte 0x02020630 + .pool _08104DDC: - ldr r2, _08104E08 + ldr r2, =0x02020630 movs r5, 0x8 ldrsh r1, [r3, r5] lsls r0, r1, 4 @@ -533417,9 +515549,9 @@ _08104DDC: strh r0, [r3, 0xA] b _08104E6C .align 2, 0 -_08104E08: .4byte 0x02020630 + .pool _08104E0C: - ldr r2, _08104E44 + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -533448,7 +515580,7 @@ _08104E0C: strh r1, [r3, 0xA] b _08104E6C .align 2, 0 -_08104E44: .4byte 0x02020630 + .pool _08104E48: ldrh r1, [r3, 0x18] movs r0, 0x1 @@ -533483,9 +515615,9 @@ sub_8104E74: @ 8104E74 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08104EC4 + ldr r0, =0x03005e00 adds r5, r1, r0 - ldr r4, _08104EC8 + ldr r4, =0x02038437 ldrb r0, [r4] bl sub_80A6190 lsls r0, 24 @@ -533508,21 +515640,18 @@ sub_8104E74: @ 8104E74 lsrs r0, 24 cmp r0, 0x1 bne _08104ED4 - ldr r0, _08104ECC + ldr r0, =0x02022e18 ldrh r0, [r0] strh r0, [r5, 0x14] - ldr r0, _08104ED0 + ldr r0, =0x04000014 b _08104EDC .align 2, 0 -_08104EC4: .4byte 0x03005e00 -_08104EC8: .4byte 0x02038437 -_08104ECC: .4byte 0x02022e18 -_08104ED0: .4byte 0x04000014 + .pool _08104ED4: - ldr r0, _08104F40 + ldr r0, =0x02022e1c ldrh r0, [r0] strh r0, [r5, 0x14] - ldr r0, _08104F44 + ldr r0, =0x04000018 _08104EDC: str r0, [sp] ldrh r0, [r5, 0x8] @@ -533532,7 +515661,7 @@ _08104EDC: lsls r0, 16 cmp r2, r0 bgt _08104F1A - ldr r4, _08104F48 + ldr r4, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r4, r0 @@ -533558,7 +515687,7 @@ _08104F0C: cmp r1, r0 ble _08104EF4 _08104F1A: - ldr r0, _08104F4C + ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r1, sp movs r2, 0 @@ -533570,18 +515699,14 @@ _08104F1A: ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, _08104F50 + ldr r0, =sub_8104F54 + 1 str r0, [r5] add sp, 0xC pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08104F40: .4byte 0x02022e1c -_08104F44: .4byte 0x04000018 -_08104F48: .4byte 0x02038c28 -_08104F4C: .4byte 0xa2600001 -_08104F50: .4byte sub_8104F54 + 1 + .pool thumb_func_end sub_8104E74 thumb_func_start sub_8104F54 @@ -533592,7 +515717,7 @@ sub_8104F54: @ 8104F54 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08104F74 + ldr r1, =0x03005e00 adds r3, r0, r1 movs r1, 0x10 ldrsh r0, [r3, r1] @@ -533602,7 +515727,7 @@ sub_8104F54: @ 8104F54 beq _08104F8E b _0810500E .align 2, 0 -_08104F74: .4byte 0x03005e00 + .pool _08104F78: ldrh r0, [r3, 0x12] adds r0, 0x1 @@ -533655,7 +515780,7 @@ _08104FCC: ldrsh r0, [r3, r1] cmp r0, 0 blt _08104FF0 - ldr r2, _08105014 + ldr r2, =0x02038c28 lsls r0, 1 adds r0, r2 ldrh r1, [r3, 0x14] @@ -533679,7 +515804,7 @@ _08104FF0: ldrsh r1, [r3, r2] cmp r0, r1 blt _0810500E - ldr r1, _08105018 + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] adds r0, r4, 0 @@ -533689,15 +515814,14 @@ _0810500E: pop {r0} bx r0 .align 2, 0 -_08105014: .4byte 0x02038c28 -_08105018: .4byte 0x02039b28 + .pool thumb_func_end sub_8104F54 thumb_func_start sub_810501C sub_810501C: @ 810501C push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _08105070 + ldr r6, =0x02038437 ldrb r0, [r6] movs r1, 0 bl sub_80A5C6C @@ -533728,14 +515852,13 @@ sub_810501C: @ 810501C lsls r0, 24 asrs r0, 24 strh r0, [r4, 0x3A] - ldr r0, _08105074 + ldr r0, =sub_8105078 + 1 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08105070: .4byte 0x02038437 -_08105074: .4byte sub_8105078 + 1 + .pool thumb_func_end sub_810501C thumb_func_start sub_8105078 @@ -533927,20 +516050,19 @@ sub_81051C4: @ 81051C4 mov r1, sp adds r1, 0x2 strh r5, [r1] - ldr r0, _081051E8 + ldr r0, =0x0203841e movs r3, 0x4 ldrsh r2, [r0, r3] adds r7, r1, 0 adds r1, r0, 0 cmp r2, 0 bne _081051F0 - ldr r0, _081051EC + ldr r0, =0x02038436 b _081051F2 .align 2, 0 -_081051E8: .4byte 0x0203841e -_081051EC: .4byte 0x02038436 + .pool _081051F0: - ldr r0, _0810522C + ldr r0, =0x02038437 _081051F2: ldrb r5, [r0] ldrb r1, [r1, 0x6] @@ -533969,7 +516091,7 @@ _081051F2: movs r1, 0 b _08105234 .align 2, 0 -_0810522C: .4byte 0x02038437 + .pool _08105230: adds r0, r5, 0 movs r1, 0x2 @@ -533982,7 +516104,7 @@ _08105234: lsls r0, 24 cmp r0, 0 beq _08105260 - ldr r2, _0810525C + ldr r2, =0x0203841e mov r0, sp ldrh r1, [r0] subs r1, r4 @@ -533992,15 +516114,15 @@ _08105234: strh r0, [r2] b _0810526A .align 2, 0 -_0810525C: .4byte 0x0203841e + .pool _08105260: - ldr r1, _0810527C + ldr r1, =0x0203841e mov r0, sp ldrh r0, [r0] subs r0, r4 strh r0, [r1] _0810526A: - ldr r1, _08105280 + ldr r1, =sub_80A77C8 + 1 str r1, [r6, 0x1C] adds r0, r6, 0 bl _call_via_r1 @@ -534009,8 +516131,7 @@ _0810526A: pop {r0} bx r0 .align 2, 0 -_0810527C: .4byte 0x0203841e -_08105280: .4byte sub_80A77C8 + 1 + .pool thumb_func_end sub_81051C4 thumb_func_start sub_8105284 @@ -534046,27 +516167,25 @@ sub_81052A4: @ 81052A4 mov r1, sp adds r1, 0x2 strh r6, [r1] - ldr r0, _081052D0 + ldr r0, =0x0203841e movs r2, 0xA ldrsh r0, [r0, r2] cmp r0, 0 bne _081052DC - ldr r0, _081052D4 + ldr r0, =0x02038436 ldrb r7, [r0] - ldr r0, _081052D8 + ldr r0, =0x02038437 b _081052E2 .align 2, 0 -_081052D0: .4byte 0x0203841e -_081052D4: .4byte 0x02038436 -_081052D8: .4byte 0x02038437 + .pool _081052DC: - ldr r0, _081052FC + ldr r0, =0x02038437 ldrb r7, [r0] - ldr r0, _08105300 + ldr r0, =0x02038436 _081052E2: ldrb r0, [r0] mov r8, r0 - ldr r0, _08105304 + ldr r0, =0x0203841e movs r3, 0xC ldrsh r0, [r0, r3] cmp r0, 0 @@ -534077,9 +516196,7 @@ _081052E2: str r1, [sp, 0x4] b _08105310 .align 2, 0 -_081052FC: .4byte 0x02038437 -_08105300: .4byte 0x02038436 -_08105304: .4byte 0x0203841e + .pool _08105308: movs r2, 0x2 mov r10, r2 @@ -534095,7 +516212,7 @@ _08105310: mov r1, r10 bl sub_80A5C6C lsls r0, 24 - ldr r1, _08105350 + ldr r1, =0x0203841e lsrs r0, 24 ldrh r1, [r1] adds r0, r1 @@ -534110,29 +516227,26 @@ _08105310: lsls r0, 24 cmp r0, 0 beq _0810535C - ldr r2, _08105354 - ldr r0, _08105358 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r4, r0 b _081053EA .align 2, 0 -_08105350: .4byte 0x0203841e -_08105354: .4byte 0x02020630 -_08105358: .4byte 0x020241e4 + .pool _0810535C: - ldr r2, _08105364 - ldr r0, _08105368 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 add r0, r8 b _081053EA .align 2, 0 -_08105364: .4byte 0x02020630 -_08105368: .4byte 0x020241e4 + .pool _0810536C: adds r0, r7, 0 mov r1, r10 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 - ldr r1, _081053D4 + ldr r1, =0x0203841e ldrh r1, [r1] subs r0, r1 lsls r0, 16 @@ -534150,8 +516264,8 @@ _0810536C: lsls r0, 24 cmp r0, 0 beq _081053E4 - ldr r3, _081053D8 - ldr r2, _081053DC + ldr r3, =0x02020630 + ldr r2, =0x020241e4 adds r0, r7, r2 ldrb r1, [r0] lsls r0, r1, 4 @@ -534176,15 +516290,13 @@ _0810536C: adds r0, 0x1 b _081053FA .align 2, 0 -_081053D4: .4byte 0x0203841e -_081053D8: .4byte 0x02020630 -_081053DC: .4byte 0x020241e4 + .pool _081053E0: adds r0, r6, 0 b _081053F4 _081053E4: - ldr r2, _08105440 - ldr r0, _08105444 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r7, r0 _081053EA: ldrb r1, [r0] @@ -534204,7 +516316,7 @@ _081053FA: ldr r1, [sp, 0x4] bl sub_80A5C6C lsls r0, 24 - ldr r4, _08105448 + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4, 0x2] adds r0, r1 @@ -534229,9 +516341,7 @@ _081053FA: bl sub_80A8924 b _0810546C .align 2, 0 -_08105440: .4byte 0x02020630 -_08105444: .4byte 0x020241e4 -_08105448: .4byte 0x0203841e + .pool _0810544C: mov r4, sp mov r0, r8 @@ -534255,7 +516365,7 @@ _0810546C: beq _08105490 mov r3, sp mov r2, sp - ldr r1, _0810548C + ldr r1, =0x0203841e ldrh r0, [r1, 0x6] ldrh r2, [r2] adds r0, r2 @@ -534263,11 +516373,11 @@ _0810546C: adds r2, r1, 0 b _0810549E .align 2, 0 -_0810548C: .4byte 0x0203841e + .pool _08105490: mov r3, sp mov r0, sp - ldr r2, _081054E0 + ldr r2, =0x0203841e ldrh r0, [r0] ldrh r1, [r2, 0x6] subs r0, r1 @@ -534291,7 +516401,7 @@ _0810549E: strh r0, [r5, 0x2E] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, _081054E4 + ldr r1, =sub_8105284 + 1 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -534304,25 +516414,24 @@ _0810549E: pop {r0} bx r0 .align 2, 0 -_081054E0: .4byte 0x0203841e -_081054E4: .4byte sub_8105284 + 1 + .pool thumb_func_end sub_81052A4 thumb_func_start sub_81054E8 sub_81054E8: @ 81054E8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08105528 + ldr r0, =0x000027db bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF beq _0810550E lsls r0, 20 - ldr r1, _0810552C + ldr r1, =0x01010000 adds r0, r1 lsrs r0, 16 - ldr r1, _08105530 + ldr r1, =0x0203841e ldrb r2, [r1, 0xA] ldrh r3, [r1, 0x8] movs r1, 0xF @@ -534331,7 +516440,7 @@ _0810550E: adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r1, _08105534 + ldr r1, =sub_80A77C8 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -534339,10 +516448,7 @@ _0810550E: pop {r0} bx r0 .align 2, 0 -_08105528: .4byte 0x000027db -_0810552C: .4byte 0x01010000 -_08105530: .4byte 0x0203841e -_08105534: .4byte sub_80A77C8 + 1 + .pool thumb_func_end sub_81054E8 thumb_func_start sub_8105538 @@ -534351,32 +516457,29 @@ sub_8105538: @ 8105538 adds r4, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r0, _0810556C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 movs r1, 0xA0 cmp r0, 0 beq _08105554 - ldr r1, _08105570 + ldr r1, =0x0000ff60 _08105554: movs r0, 0xE0 lsls r0, 2 strh r0, [r4, 0x2E] strh r1, [r4, 0x30] - ldr r0, _08105574 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x3C] - ldr r0, _08105578 + ldr r0, =sub_810557C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810556C: .4byte 0x02038436 -_08105570: .4byte 0x0000ff60 -_08105574: .4byte 0x0203841e -_08105578: .4byte sub_810557C + 1 + .pool thumb_func_end sub_8105538 thumb_func_start sub_810557C @@ -534396,14 +516499,14 @@ sub_810557C: @ 810557C strh r0, [r4, 0x24] subs r2, 0x20 strh r2, [r4, 0x2E] - ldr r0, _081055E8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 movs r1, 0xA0 cmp r0, 0 beq _081055AC - ldr r1, _081055EC + ldr r1, =0x0000ff60 _081055AC: lsls r0, r1, 16 asrs r0, 16 @@ -534428,16 +516531,14 @@ _081055AC: adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r0, _081055F0 + ldr r0, =sub_81055F4 + 1 str r0, [r4, 0x1C] _081055E0: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081055E8: .4byte 0x02038436 -_081055EC: .4byte 0x0000ff60 -_081055F0: .4byte sub_81055F4 + 1 + .pool thumb_func_end sub_810557C thumb_func_start sub_81055F4 @@ -534454,14 +516555,14 @@ sub_81055F4: @ 81055F4 adds r0, r4, 0 movs r1, 0x2 bl sub_8008258 - ldr r0, _08105618 + ldr r0, =sub_810561C + 1 str r0, [r4, 0x1C] _08105612: pop {r4} pop {r0} bx r0 .align 2, 0 -_08105618: .4byte sub_810561C + 1 + .pool thumb_func_end sub_81055F4 thumb_func_start sub_810561C @@ -534487,32 +516588,30 @@ sub_810561C: @ 810561C lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x10 - ldr r3, _0810565C + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _08105660 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - ldr r0, _08105664 + ldr r0, =sub_8105694 + 1 b _08105680 .align 2, 0 -_0810565C: .4byte 0x000003ff -_08105660: .4byte 0xfffffc00 -_08105664: .4byte sub_8105694 + 1 + .pool _08105668: ldrh r2, [r4, 0x4] lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x20 - ldr r3, _08105688 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _0810568C + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - ldr r0, _08105690 + ldr r0, =sub_810571C + 1 _08105680: str r0, [r4, 0x1C] _08105682: @@ -534520,9 +516619,7 @@ _08105682: pop {r0} bx r0 .align 2, 0 -_08105688: .4byte 0x000003ff -_0810568C: .4byte 0xfffffc00 -_08105690: .4byte sub_810571C + 1 + .pool thumb_func_end sub_810561C thumb_func_start sub_8105694 @@ -534550,14 +516647,14 @@ sub_8105694: @ 8105694 ldrh r1, [r4, 0x2E] movs r0, 0x52 bl lcd_io_set - ldr r0, _081056D0 + ldr r0, =sub_81056D4 + 1 str r0, [r4, 0x1C] _081056CA: pop {r4} pop {r0} bx r0 .align 2, 0 -_081056D0: .4byte sub_81056D4 + 1 + .pool thumb_func_end sub_8105694 thumb_func_start sub_81056D4 @@ -534589,23 +516686,23 @@ sub_81056D4: @ 81056D4 ldrsh r0, [r4, r1] cmp r0, 0 bne _08105712 - ldr r0, _08105718 + ldr r0, =sub_810571C + 1 str r0, [r4, 0x1C] _08105712: pop {r4} pop {r0} bx r0 .align 2, 0 -_08105718: .4byte sub_810571C + 1 + .pool thumb_func_end sub_81056D4 thumb_func_start sub_810571C sub_810571C: @ 810571C push {lr} adds r3, r0, 0 - ldr r0, _08105744 + ldr r0, =0x0203841e ldrh r1, [r0, 0xE] - ldr r0, _08105748 + ldr r0, =0x0000ffff cmp r1, r0 bne _08105754 adds r2, r3, 0 @@ -534618,21 +516715,19 @@ sub_810571C: @ 810571C ldrsh r0, [r3, r1] cmp r0, 0 bne _08105750 - ldr r0, _0810574C + ldr r0, =sub_810575C + 1 b _08105752 .align 2, 0 -_08105744: .4byte 0x0203841e -_08105748: .4byte 0x0000ffff -_0810574C: .4byte sub_810575C + 1 + .pool _08105750: - ldr r0, _08105758 + ldr r0, =move_anim_8072740 + 1 _08105752: str r0, [r3, 0x1C] _08105754: pop {r0} bx r0 .align 2, 0 -_08105758: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810571C thumb_func_start sub_810575C @@ -534660,7 +516755,7 @@ sub_810577C: @ 810577C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081057AC + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 bl obj_id_for_side_relative_to_move @@ -534668,18 +516763,16 @@ sub_810577C: @ 810577C lsls r1, 24 lsrs r1, 24 strh r1, [r4, 0x8] - ldr r2, _081057B0 + ldr r2, =0x085938b0 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, _081057B4 + ldr r0, =sub_81057B8 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_081057AC: .4byte 0x03005e00 -_081057B0: .4byte 0x085938b0 -_081057B4: .4byte sub_81057B8 + 1 + .pool thumb_func_end sub_810577C thumb_func_start sub_81057B8 @@ -534690,7 +516783,7 @@ sub_81057B8: @ 81057B8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08105808 + ldr r1, =0x03005e00 adds r4, r0, r1 adds r0, r4, 0 bl sub_80A7D34 @@ -534698,7 +516791,7 @@ sub_81057B8: @ 81057B8 lsrs r3, r0, 24 cmp r3, 0 bne _08105802 - ldr r2, _0810580C + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -534724,8 +516817,7 @@ _08105802: pop {r0} bx r0 .align 2, 0 -_08105808: .4byte 0x03005e00 -_0810580C: .4byte 0x02020630 + .pool thumb_func_end sub_81057B8 thumb_func_start sub_8105810 @@ -534736,7 +516828,7 @@ sub_8105810: @ 8105810 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08105844 + ldr r0, =0x03005e00 adds r4, r1, r0 movs r0, 0 strh r0, [r4, 0x8] @@ -534745,24 +516837,22 @@ sub_8105810: @ 8105810 strh r0, [r4, 0xE] movs r0, 0x3 strh r0, [r4, 0x20] - ldr r0, _08105848 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _08105850 - ldr r0, _0810584C + ldr r0, =0x0000ffff strh r0, [r4, 0x22] movs r0, 0x8 b _08105856 .align 2, 0 -_08105844: .4byte 0x03005e00 -_08105848: .4byte 0x02038437 -_0810584C: .4byte 0x0000ffff + .pool _08105850: movs r0, 0x1 strh r0, [r4, 0x22] - ldr r0, _08105870 + ldr r0, =0x0000fff8 _08105856: strh r0, [r4, 0x24] movs r0, 0x1 @@ -534770,14 +516860,13 @@ _08105856: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r0, _08105874 + ldr r0, =sub_8105878 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_08105870: .4byte 0x0000fff8 -_08105874: .4byte sub_8105878 + 1 + .pool thumb_func_end sub_8105810 thumb_func_start sub_8105878 @@ -534788,7 +516877,7 @@ sub_8105878: @ 8105878 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0810589C + ldr r1, =0x03005e00 adds r3, r0, r1 movs r0, 0x8 ldrsh r4, [r3, r0] @@ -534800,7 +516889,7 @@ sub_8105878: @ 8105878 beq _081058AA b _08105992 .align 2, 0 -_0810589C: .4byte 0x03005e00 + .pool _081058A0: cmp r4, 0x2 beq _08105948 @@ -534808,7 +516897,7 @@ _081058A0: beq _08105962 b _08105992 _081058AA: - ldr r2, _081058C8 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -534824,7 +516913,7 @@ _081058AA: strh r4, [r3, 0xE] b _0810595A .align 2, 0 -_081058C8: .4byte 0x02020630 + .pool _081058CC: ldrh r0, [r3, 0xA] adds r0, 0x1 @@ -534842,7 +516931,7 @@ _081058CC: lsls r0, 16 cmp r0, 0 beq _08105904 - ldr r2, _08105900 + ldr r2, =0x02020630 movs r4, 0x26 ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -534853,9 +516942,9 @@ _081058CC: adds r1, 0x6 b _08105916 .align 2, 0 -_08105900: .4byte 0x02020630 + .pool _08105904: - ldr r2, _08105944 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -534889,7 +516978,7 @@ _08105916: strh r0, [r1, 0x24] b _0810595A .align 2, 0 -_08105944: .4byte 0x02020630 + .pool _08105948: ldrh r0, [r3, 0x20] subs r0, 0x1 @@ -534906,7 +516995,7 @@ _0810595A: strh r0, [r3, 0x8] b _08105992 _08105962: - ldr r2, _08105998 + ldr r2, =0x02020630 movs r4, 0x26 ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -534934,7 +517023,7 @@ _08105992: pop {r0} bx r0 .align 2, 0 -_08105998: .4byte 0x02020630 + .pool thumb_func_end sub_8105878 thumb_func_start sub_810599C @@ -534945,7 +517034,7 @@ sub_810599C: @ 810599C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081059D8 + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 strh r0, [r4, 0x8] @@ -534963,14 +517052,13 @@ sub_810599C: @ 810599C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r0, _081059DC + ldr r0, =sub_81059E0 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_081059D8: .4byte 0x03005e00 -_081059DC: .4byte sub_81059E0 + 1 + .pool thumb_func_end sub_810599C thumb_func_start sub_81059E0 @@ -534981,7 +517069,7 @@ sub_81059E0: @ 81059E0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08105A34 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r2, [r4, r0] @@ -535004,7 +517092,7 @@ sub_81059E0: @ 81059E0 ands r0, r1 cmp r0, 0 beq _08105A3C - ldr r3, _08105A38 + ldr r3, =0x02020630 movs r6, 0x26 ldrsh r1, [r4, r6] lsls r0, r1, 4 @@ -535018,10 +517106,9 @@ sub_81059E0: @ 81059E0 ands r1, r2 b _08105A52 .align 2, 0 -_08105A34: .4byte 0x03005e00 -_08105A38: .4byte 0x02020630 + .pool _08105A3C: - ldr r3, _08105A84 + ldr r3, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -535058,7 +517145,7 @@ _08105A52: strh r2, [r4, 0xE] b _08105AA6 .align 2, 0 -_08105A84: .4byte 0x02020630 + .pool _08105A88: movs r0, 0x26 ldrsh r1, [r4, r0] @@ -535088,7 +517175,7 @@ sub_8105AAC: @ 8105AAC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08105AFC + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 strh r0, [r4, 0x8] @@ -535102,7 +517189,7 @@ sub_8105AAC: @ 8105AAC strh r0, [r4, 0x16] strh r0, [r4, 0x18] strh r0, [r4, 0x22] - ldr r5, _08105B00 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -535115,15 +517202,13 @@ sub_8105AAC: @ 8105AAC lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r0, _08105B04 + ldr r0, =sub_8105B08 + 1 str r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08105AFC: .4byte 0x03005e00 -_08105B00: .4byte 0x02038436 -_08105B04: .4byte sub_8105B08 + 1 + .pool thumb_func_end sub_8105AAC thumb_func_start sub_8105B08 @@ -535134,7 +517219,7 @@ sub_8105B08: @ 8105B08 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08105B2C + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x18 ldrsh r2, [r4, r0] @@ -535146,7 +517231,7 @@ sub_8105B08: @ 8105B08 beq _08105B36 b _08105B90 .align 2, 0 -_08105B2C: .4byte 0x03005e00 + .pool _08105B30: cmp r2, 0x2 beq _08105B8C @@ -535217,7 +517302,7 @@ _08105B9E: cmp r0, 0x4 ble _08105C42 strh r5, [r4, 0xA] - ldr r0, _08105C28 + ldr r0, =0x085938dc movs r3, 0x24 ldrsh r1, [r4, r3] movs r3, 0x26 @@ -535228,7 +517313,7 @@ _08105B9E: lsrs r2, r0, 24 cmp r2, 0x40 beq _08105C42 - ldr r0, _08105C2C + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -535236,7 +517321,7 @@ _08105B9E: strh r6, [r1, 0x2E] movs r0, 0xD strh r0, [r1, 0x30] - ldr r2, _08105C30 + ldr r2, =0x085938f4 movs r3, 0xC ldrsh r0, [r4, r3] lsls r0, 1 @@ -535277,9 +517362,7 @@ _08105B9E: strh r0, [r4, 0x8] b _08105C42 .align 2, 0 -_08105C28: .4byte 0x085938dc -_08105C2C: .4byte 0x02020630 -_08105C30: .4byte 0x085938f4 + .pool _08105C34: movs r1, 0x22 ldrsh r0, [r4, r1] @@ -535297,7 +517380,7 @@ _08105C42: sub_8105C48: @ 8105C48 push {r4,lr} adds r3, r0, 0 - ldr r4, _08105CB0 + ldr r4, =0x03005e00 movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -535348,7 +517431,7 @@ _08105CAA: pop {r0} bx r0 .align 2, 0 -_08105CB0: .4byte 0x03005e00 + .pool thumb_func_end sub_8105C48 thumb_func_start sub_8105CB4 @@ -535357,12 +517440,12 @@ sub_8105CB4: @ 8105CB4 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08105D50 + ldr r0, =0x000027de bl gpu_pal_tags_index_of mov r1, sp strb r0, [r1] movs r4, 0x1 - ldr r0, _08105D54 + ldr r0, =0x00002710 adds r5, r0, 0 _08105CCC: subs r0, r5, r4 @@ -535379,17 +517462,17 @@ _08105CCC: lsls r0, 6 bl malloc_and_clear adds r1, r0, 0 - ldr r0, _08105D58 + ldr r0, =0x020244d4 ldr r0, [r0] movs r2, 0xBE lsls r2, 1 adds r0, r2 str r1, [r0] - ldr r0, _08105D5C + ldr r0, =0x08c22610 bl call_LZZUnCompWram movs r4, 0 _08105D00: - ldr r5, _08105D58 + ldr r5, =0x020244d4 ldr r0, [r5] movs r1, 0xBE lsls r1, 1 @@ -535427,10 +517510,7 @@ _08105D00: pop {r0} bx r0 .align 2, 0 -_08105D50: .4byte 0x000027de -_08105D54: .4byte 0x00002710 -_08105D58: .4byte 0x020244d4 -_08105D5C: .4byte 0x08c22610 + .pool thumb_func_end sub_8105CB4 thumb_func_start sub_8105D60 @@ -535438,7 +517518,7 @@ sub_8105D60: @ 8105D60 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _08105D84 + ldr r5, =0x08593950 movs r4, 0x2 _08105D6A: ldrh r0, [r5] @@ -535453,7 +517533,7 @@ _08105D6A: pop {r0} bx r0 .align 2, 0 -_08105D84: .4byte 0x08593950 + .pool thumb_func_end sub_8105D60 thumb_func_start sub_8105D88 @@ -535476,14 +517556,14 @@ sub_8105D88: @ 8105D88 lsrs r1, 22 adds r0, r1 adds r3, r0 - ldr r1, _08105DDC + ldr r1, =0x000003ff adds r0, r1, 0 ands r3, r0 - ldr r0, _08105DE0 + ldr r0, =0xfffffc00 ands r0, r4 orrs r0, r3 strh r0, [r5, 0x4] - ldr r0, _08105DE4 + ldr r0, =0x08593950 lsrs r2, 25 lsls r2, 1 adds r2, r0 @@ -535499,9 +517579,7 @@ sub_8105D88: @ 8105D88 pop {r0} bx r0 .align 2, 0 -_08105DDC: .4byte 0x000003ff -_08105DE0: .4byte 0xfffffc00 -_08105DE4: .4byte 0x08593950 + .pool thumb_func_end sub_8105D88 thumb_func_start sub_8105DE8 @@ -535510,18 +517588,18 @@ sub_8105DE8: @ 8105DE8 adds r5, r0, 0 movs r1, 0 bl sub_80A69CC - ldr r6, _08105E50 + ldr r6, =0x02038436 ldrb r0, [r6] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08105E08 - ldr r1, _08105E54 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] _08105E08: - ldr r4, _08105E54 + ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r5, 0x2E] ldrb r0, [r6] @@ -535540,9 +517618,9 @@ _08105E08: ldrh r1, [r4, 0x6] adds r0, r1 strh r0, [r5, 0x36] - ldr r0, _08105E58 + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _08105E5C + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 ldrb r1, [r4, 0xA] @@ -535553,10 +517631,7 @@ _08105E08: pop {r0} bx r0 .align 2, 0 -_08105E50: .4byte 0x02038436 -_08105E54: .4byte 0x0203841e -_08105E58: .4byte sub_80A6EEC + 1 -_08105E5C: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8105DE8 thumb_func_start sub_8105E60 @@ -535615,9 +517690,9 @@ sub_8105EB0: @ 8105EB0 movs r6, 0x98 _08105EC4: movs r5, 0 - ldr r1, _08105F18 + ldr r1, =0x02022e24 strh r6, [r1] - ldr r4, _08105F1C + ldr r4, =0x02022e26 movs r0, 0xA0 strh r0, [r4] ldrh r1, [r1] @@ -535626,10 +517701,10 @@ _08105EC4: ldrh r1, [r4] movs r0, 0x44 bl lcd_io_set - ldr r1, _08105F20 + ldr r1, =0x00003f1f movs r0, 0x48 bl lcd_io_set - ldr r1, _08105F24 + ldr r1, =0x00003f3f movs r0, 0x4A bl lcd_io_set movs r0, 0x50 @@ -535638,25 +517713,20 @@ _08105EC4: movs r0, 0x54 movs r1, 0x10 bl lcd_io_set - ldr r1, _08105F28 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 strh r5, [r0, 0x8] strh r6, [r0, 0xA] - ldr r1, _08105F2C + ldr r1, =sub_8105F30 + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08105F18: .4byte 0x02022e24 -_08105F1C: .4byte 0x02022e26 -_08105F20: .4byte 0x00003f1f -_08105F24: .4byte 0x00003f3f -_08105F28: .4byte 0x03005e00 -_08105F2C: .4byte sub_8105F30 + 1 + .pool thumb_func_end sub_8105EB0 thumb_func_start sub_8105F30 @@ -535664,7 +517734,7 @@ sub_8105F30: @ 8105F30 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08105F64 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -535681,18 +517751,16 @@ sub_8105F30: @ 8105F30 lsls r0, r2, 16 cmp r1, r0 blt _08105F70 - ldr r0, _08105F68 + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r0, _08105F6C + ldr r0, =sub_8105F84 + 1 str r0, [r3] b _08105F78 .align 2, 0 -_08105F64: .4byte 0x03005e00 -_08105F68: .4byte 0x02022e24 -_08105F6C: .4byte sub_8105F84 + 1 + .pool _08105F70: - ldr r1, _08105F80 + ldr r1, =0x02022e24 lsls r0, r4, 8 orrs r2, r0 strh r2, [r1] @@ -535701,7 +517769,7 @@ _08105F78: pop {r0} bx r0 .align 2, 0 -_08105F80: .4byte 0x02022e24 + .pool thumb_func_end sub_8105F30 thumb_func_start sub_8105F84 @@ -535711,7 +517779,7 @@ sub_8105F84: @ 8105F84 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _08105FD0 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -535737,21 +517805,20 @@ sub_8105F84: @ 8105F84 movs r2, 0 movs r3, 0 bl sub_80A75AC - ldr r2, _08105FD4 + ldr r2, =0x00007fff movs r1, 0x10 bl sub_80A2A20 b _0810600C .align 2, 0 -_08105FD0: .4byte 0x03005e00 -_08105FD4: .4byte 0x00007fff + .pool _08105FD8: cmp r0, 0x4 ble _0810600C - ldr r0, _08106014 + ldr r0, =0x02022e24 strh r4, [r0] - ldr r0, _08106018 + ldr r0, =0x02022e26 strh r4, [r0] - ldr r4, _0810601C + ldr r4, =0x00003f3f movs r0, 0x48 adds r1, r4, 0 bl lcd_io_set @@ -535772,9 +517839,7 @@ _0810600C: pop {r0} bx r0 .align 2, 0 -_08106014: .4byte 0x02022e24 -_08106018: .4byte 0x02022e26 -_0810601C: .4byte 0x00003f3f + .pool thumb_func_end sub_8105F84 thumb_func_start sub_8106020 @@ -535787,7 +517852,7 @@ sub_8106020: @ 8106020 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08106070 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -535804,10 +517869,10 @@ sub_8106020: @ 8106020 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _08106074 + ldr r2, =0x08593988 adds r0, r5, 0 bl sub_80A7CFC - ldr r1, _08106078 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -535816,11 +517881,9 @@ sub_8106020: @ 8106020 strh r1, [r0, 0x24] b _081060A4 .align 2, 0 -_08106070: .4byte 0x03005e00 -_08106074: .4byte 0x08593988 -_08106078: .4byte 0x02020630 + .pool _0810607C: - ldr r1, _081060AC + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -535843,7 +517906,7 @@ _081060A4: pop {r0} bx r0 .align 2, 0 -_081060AC: .4byte 0x02020630 + .pool thumb_func_end sub_8106020 thumb_func_start sub_81060B0 @@ -535856,7 +517919,7 @@ sub_81060B0: @ 81060B0 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08106100 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -535873,10 +517936,10 @@ sub_81060B0: @ 81060B0 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _08106104 + ldr r2, =0x08593988 adds r0, r5, 0 bl sub_80A7CFC - ldr r1, _08106108 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -535885,11 +517948,9 @@ sub_81060B0: @ 81060B0 strh r1, [r0, 0x24] b _08106134 .align 2, 0 -_08106100: .4byte 0x03005e00 -_08106104: .4byte 0x08593988 -_08106108: .4byte 0x02020630 + .pool _0810610C: - ldr r1, _0810613C + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -535912,7 +517973,7 @@ _08106134: pop {r0} bx r0 .align 2, 0 -_0810613C: .4byte 0x02020630 + .pool thumb_func_end sub_81060B0 thumb_func_start sub_8106140 @@ -535925,7 +517986,7 @@ sub_8106140: @ 8106140 strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r5, _08106184 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -535942,14 +518003,13 @@ sub_8106140: @ 8106140 strh r0, [r4, 0x36] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, _08106188 + ldr r0, =sub_810618C + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08106184: .4byte 0x02038437 -_08106188: .4byte sub_810618C + 1 + .pool thumb_func_end sub_8106140 thumb_func_start sub_810618C @@ -535991,7 +518051,7 @@ sub_81061C4: @ 81061C4 ldrsh r0, [r4, r1] cmp r0, 0 bne _081061E8 - ldr r1, _081061E4 + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0x30] ldrh r0, [r1, 0x2] @@ -536000,7 +518060,7 @@ sub_81061C4: @ 81061C4 strh r0, [r4, 0x2E] b _08106244 .align 2, 0 -_081061E4: .4byte 0x0203841e + .pool _081061E8: ldrh r0, [r4, 0x30] ldrh r2, [r4, 0x36] @@ -536056,7 +518116,7 @@ _08106244: thumb_func_start sub_810624C sub_810624C: @ 810624C push {lr} - ldr r2, _08106270 + ldr r2, =0x0203841e ldrh r1, [r2] strh r1, [r0, 0x20] movs r1, 0xA0 @@ -536065,16 +518125,14 @@ sub_810624C: @ 810624C strh r1, [r0, 0x2E] ldrh r1, [r2, 0x2] strh r1, [r0, 0x30] - ldr r1, _08106274 + ldr r1, =sub_80A64B0 + 1 str r1, [r0, 0x1C] - ldr r1, _08106278 + ldr r1, =sub_810627C + 1 bl oamt_set_x3A_32 pop {r0} bx r0 .align 2, 0 -_08106270: .4byte 0x0203841e -_08106274: .4byte sub_80A64B0 + 1 -_08106278: .4byte sub_810627C + 1 + .pool thumb_func_end sub_810624C thumb_func_start sub_810627C @@ -536140,7 +518198,7 @@ sub_81062E8: @ 81062E8 sub sp, 0x10 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08106388 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -536164,10 +518222,10 @@ sub_81062E8: @ 81062E8 movs r2, 0x1 bl lcd_bg_operations _0810632A: - ldr r0, _0810638C + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r4, _08106390 + ldr r4, =0x02022e1a strh r1, [r4] movs r0, 0x14 movs r1, 0 @@ -536179,40 +518237,33 @@ _0810632A: bl sub_80A6B30 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _08106394 + ldr r1, =0x08c232e0 mov r2, sp ldrh r2, [r2, 0xA] bl sub_80A6CC0 - ldr r1, _08106398 + ldr r1, =0x08c23d78 mov r0, sp movs r2, 0 bl sub_80A6D60 - ldr r0, _0810639C + ldr r0, =0x08c23d50 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette - ldr r1, _081063A0 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081063A4 + ldr r1, =sub_81063A8 + 1 str r1, [r0] add sp, 0x10 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08106388: .4byte 0x00003f42 -_0810638C: .4byte 0x02022e18 -_08106390: .4byte 0x02022e1a -_08106394: .4byte 0x08c232e0 -_08106398: .4byte 0x08c23d78 -_0810639C: .4byte 0x08c23d50 -_081063A0: .4byte 0x03005e00 -_081063A4: .4byte sub_81063A8 + 1 + .pool thumb_func_end sub_81062E8 thumb_func_start sub_81063A8 @@ -536221,7 +518272,7 @@ sub_81063A8: @ 81063A8 sub sp, 0x10 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _081063D0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -536234,13 +518285,12 @@ sub_81063A8: @ 81063A8 b _081064F0 _081063C6: lsls r0, 2 - ldr r1, _081063D4 + ldr r1, =_081063D8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081063D0: .4byte 0x03005e00 -_081063D4: .4byte _081063D8 + .pool .align 2, 0 _081063D8: .4byte _081063EC @@ -536340,7 +518390,7 @@ _08106496: mov r0, sp ldrb r0, [r0, 0x9] bl sub_80A6C68 - ldr r1, _081064B8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -536350,7 +518400,7 @@ _08106496: strh r1, [r0, 0x20] b _081064F0 .align 2, 0 -_081064B8: .4byte 0x03005e00 + .pool _081064BC: bl sub_80A4DF0 lsls r0, 24 @@ -536386,7 +518436,7 @@ sub_81064F8: @ 81064F8 sub sp, 0x10 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08106568 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -536410,10 +518460,10 @@ sub_81064F8: @ 81064F8 movs r2, 0x1 bl lcd_bg_operations _0810653A: - ldr r0, _0810656C + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r4, _08106570 + ldr r4, =0x02022e1a strh r1, [r4] movs r0, 0x14 movs r1, 0 @@ -536427,65 +518477,57 @@ _0810653A: lsls r0, 24 cmp r0, 0 beq _08106578 - ldr r1, _08106574 + ldr r1, =0x08d93960 b _0810658A .align 2, 0 -_08106568: .4byte 0x00003f42 -_0810656C: .4byte 0x02022e18 -_08106570: .4byte 0x02022e1a -_08106574: .4byte 0x08d93960 + .pool _08106578: - ldr r0, _08106594 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0810659C - ldr r1, _08106598 + ldr r1, =0x08d93598 _0810658A: mov r0, sp movs r2, 0 bl sub_80A6D60 b _081065A6 .align 2, 0 -_08106594: .4byte 0x02038437 -_08106598: .4byte 0x08d93598 + .pool _0810659C: - ldr r1, _081065D8 + ldr r1, =0x08d9377c mov r0, sp movs r2, 0 bl sub_80A6D60 _081065A6: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _081065DC + ldr r1, =0x08c249f8 mov r2, sp ldrh r2, [r2, 0xA] bl sub_80A6CC0 - ldr r0, _081065E0 + ldr r0, =0x08c249d0 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette - ldr r1, _081065E4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081065E8 + ldr r1, =sub_81065EC + 1 str r1, [r0] add sp, 0x10 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081065D8: .4byte 0x08d9377c -_081065DC: .4byte 0x08c249f8 -_081065E0: .4byte 0x08c249d0 -_081065E4: .4byte 0x03005e00 -_081065E8: .4byte sub_81065EC + 1 + .pool thumb_func_end sub_81064F8 thumb_func_start sub_81065EC @@ -536494,7 +518536,7 @@ sub_81065EC: @ 81065EC sub sp, 0x10 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08106614 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -536507,13 +518549,12 @@ sub_81065EC: @ 81065EC b _08106730 _0810660A: lsls r0, 2 - ldr r1, _08106618 + ldr r1, =_0810661C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08106614: .4byte 0x03005e00 -_08106618: .4byte _0810661C + .pool .align 2, 0 _0810661C: .4byte _08106630 @@ -536614,7 +518655,7 @@ _081066DA: bl sub_80A6C68 movs r0, 0x2 bl sub_80A6C68 - ldr r0, _08106738 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -536650,14 +518691,14 @@ _08106730: pop {r0} bx r0 .align 2, 0 -_08106738: .4byte 0x03005e00 + .pool thumb_func_end sub_81065EC thumb_func_start sub_810673C sub_810673C: @ 810673C push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08106790 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -536676,7 +518717,7 @@ sub_810673C: @ 810673C movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r1, _08106794 + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0x2E] ldrh r0, [r1, 0x2] @@ -536686,7 +518727,7 @@ sub_810673C: @ 810673C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x3C] - ldr r1, _08106798 + ldr r1, =sub_810679C + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -536694,9 +518735,7 @@ sub_810673C: @ 810673C pop {r0} bx r0 .align 2, 0 -_08106790: .4byte 0x02038436 -_08106794: .4byte 0x0203841e -_08106798: .4byte sub_810679C + 1 + .pool thumb_func_end sub_810673C thumb_func_start sub_810679C @@ -536744,12 +518783,12 @@ _081067B6: beq _08106828 cmp r2, 0x1 bne _08106858 - ldr r1, _08106820 + ldr r1, =0xfffffc00 adds r0, r1, 0 ldrh r2, [r4, 0x32] adds r0, r2 strh r0, [r4, 0x32] - ldr r3, _08106824 + ldr r3, =0xffffff00 adds r0, r3, 0 ldrh r1, [r4, 0x34] adds r0, r1 @@ -536767,8 +518806,7 @@ _081067B6: strh r0, [r4, 0x38] b _08106868 .align 2, 0 -_08106820: .4byte 0xfffffc00 -_08106824: .4byte 0xffffff00 + .pool _08106828: movs r3, 0x80 lsls r3, 3 @@ -536795,9 +518833,9 @@ _08106828: movs r0, 0x1 strh r0, [r4, 0x38] _08106858: - ldr r0, _08106870 + ldr r0, =0x0203841e ldrh r1, [r0, 0xE] - ldr r0, _08106874 + ldr r0, =0x0000ffff cmp r1, r0 bne _08106868 adds r0, r4, 0 @@ -536807,15 +518845,14 @@ _08106868: pop {r0} bx r0 .align 2, 0 -_08106870: .4byte 0x0203841e -_08106874: .4byte 0x0000ffff + .pool thumb_func_end sub_810679C thumb_func_start sub_8106878 sub_8106878: @ 8106878 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _081068C0 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -536828,7 +518865,7 @@ sub_8106878: @ 8106878 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r4, _081068C4 + ldr r4, =0x0203841e movs r1, 0 ldrsh r0, [r4, r1] movs r1, 0xA @@ -536839,15 +518876,13 @@ sub_8106878: @ 8106878 movs r1, 0x7 bl cosine strh r0, [r5, 0x30] - ldr r0, _081068C8 + ldr r0, =sub_81068CC + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081068C0: .4byte 0x02038436 -_081068C4: .4byte 0x0203841e -_081068C8: .4byte sub_81068CC + 1 + .pool thumb_func_end sub_8106878 thumb_func_start sub_81068CC @@ -536923,7 +518958,7 @@ _08106940: sub_8106944: @ 8106944 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08106990 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -536936,7 +518971,7 @@ sub_8106944: @ 8106944 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r4, _08106994 + ldr r4, =0x0203841e movs r1, 0 ldrsh r0, [r4, r1] movs r1, 0xA @@ -536949,15 +518984,13 @@ sub_8106944: @ 8106944 strh r0, [r5, 0x30] ldrh r0, [r4, 0x2] strh r0, [r5, 0x32] - ldr r0, _08106998 + ldr r0, =sub_8106914 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08106990: .4byte 0x02038436 -_08106994: .4byte 0x0203841e -_08106998: .4byte sub_8106914 + 1 + .pool thumb_func_end sub_8106944 thumb_func_start sub_810699C @@ -536983,13 +519016,13 @@ sub_81069B8: @ 81069B8 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _081069CC + ldr r0, =sub_810699C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081069CC: .4byte sub_810699C + 1 + .pool thumb_func_end sub_81069B8 thumb_func_start sub_81069D0 @@ -537000,7 +519033,7 @@ sub_81069D0: @ 81069D0 ldrsh r0, [r4, r1] cmp r0, 0 bne _081069EE - ldr r0, _08106A60 + ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r4, 0x20] adds r1, r2 @@ -537068,7 +519101,7 @@ _08106A5A: pop {r0} bx r0 .align 2, 0 -_08106A60: .4byte 0x0203841e + .pool thumb_func_end sub_81069D0 thumb_func_start sub_8106A64 @@ -537137,7 +519170,7 @@ sub_8106AD0: @ 8106AD0 ldrsh r0, [r4, r1] cmp r0, 0 bne _08106AF4 - ldr r1, _08106AF0 + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0x30] ldrh r0, [r1, 0x2] @@ -537146,7 +519179,7 @@ sub_8106AD0: @ 8106AD0 strh r0, [r4, 0x2E] b _08106B48 .align 2, 0 -_08106AF0: .4byte 0x0203841e + .pool _08106AF4: ldrh r0, [r4, 0x30] ldrh r2, [r4, 0x36] @@ -537170,7 +519203,7 @@ _08106AF4: strh r0, [r4, 0x34] cmp r0, 0x46 ble _08106B48 - ldr r0, _08106B50 + ldr r0, =sub_8106A64 + 1 str r0, [r4, 0x1C] ldrh r0, [r4, 0x24] ldrh r1, [r4, 0x20] @@ -537192,7 +519225,7 @@ _08106B48: pop {r0} bx r0 .align 2, 0 -_08106B50: .4byte sub_8106A64 + 1 + .pool thumb_func_end sub_8106AD0 thumb_func_start sub_8106B54 @@ -537203,7 +519236,7 @@ sub_8106B54: @ 8106B54 ldrsh r0, [r4, r1] cmp r0, 0 bne _08106B8E - ldr r1, _08106C50 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -537215,7 +519248,7 @@ sub_8106B54: @ 8106B54 adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start - ldr r0, _08106C54 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 @@ -537284,7 +519317,7 @@ _08106BE0: ldrsh r0, [r4, r2] cmp r0, 0 ble _08106C04 - ldr r0, _08106C58 + ldr r0, =0x0000ffff strh r0, [r4, 0x32] _08106C04: movs r1, 0x30 @@ -537326,9 +519359,7 @@ _08106C18: strb r0, [r3] b _08106C6A .align 2, 0 -_08106C50: .4byte 0x0203841e -_08106C54: .4byte 0x02038437 -_08106C58: .4byte 0x0000ffff + .pool _08106C5C: adds r2, r4, 0 adds r2, 0x3E @@ -537358,7 +519389,7 @@ sub_8106C80: @ 8106C80 ldrsh r0, [r4, r1] cmp r0, 0 bne _08106CB4 - ldr r1, _08106CB0 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -537375,7 +519406,7 @@ sub_8106C80: @ 8106C80 strh r0, [r4, 0x2E] b _08106CC8 .align 2, 0 -_08106CB0: .4byte 0x0203841e + .pool _08106CB4: adds r0, r4, 0 adds r0, 0x3F @@ -537396,7 +519427,7 @@ _08106CC8: sub_8106CD0: @ 8106CD0 push {r4,r5,lr} adds r5, r0, 0 - ldr r1, _08106CE8 + ldr r1, =0x0203841e movs r2, 0x4 ldrsh r0, [r1, r2] cmp r0, 0 @@ -537405,18 +519436,18 @@ sub_8106CD0: @ 8106CD0 bl move_anim_8072740 b _08106D50 .align 2, 0 -_08106CE8: .4byte 0x0203841e + .pool _08106CEC: movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0 bne _08106CFC - ldr r4, _08106CF8 + ldr r4, =0x02038436 b _08106CFE .align 2, 0 -_08106CF8: .4byte 0x02038436 + .pool _08106CFC: - ldr r4, _08106D2C + ldr r4, =0x02038437 _08106CFE: ldrb r0, [r4] movs r1, 0x2 @@ -537430,7 +519461,7 @@ _08106CFE: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r0, _08106D30 + ldr r0, =0x0203841e movs r2, 0x2 ldrsh r1, [r0, r2] adds r2, r0, 0 @@ -537440,8 +519471,7 @@ _08106CFE: adds r0, 0x20 b _08106D38 .align 2, 0 -_08106D2C: .4byte 0x02038437 -_08106D30: .4byte 0x0203841e + .pool _08106D34: ldrh r0, [r5, 0x20] subs r0, 0x20 @@ -537455,14 +519485,14 @@ _08106D38: lsrs r1, 24 adds r0, r5, 0 bl obj_anim_image_start - ldr r0, _08106D58 + ldr r0, =sub_8106D5C + 1 str r0, [r5, 0x1C] _08106D50: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08106D58: .4byte sub_8106D5C + 1 + .pool thumb_func_end sub_8106CD0 thumb_func_start sub_8106D5C @@ -537501,7 +519531,7 @@ sub_8106D90: @ 8106D90 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _08106DC4 + ldr r0, =0x0203841e ldrb r0, [r0] bl obj_id_for_side_relative_to_move adds r1, r0, 0 @@ -537510,21 +519540,18 @@ sub_8106D90: @ 8106D90 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _08106DC8 + ldr r0, =0x03005e00 adds r4, r0 - ldr r2, _08106DCC + ldr r2, =0x08593b98 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, _08106DD0 + ldr r0, =sub_8106DD4 + 1 str r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08106DC4: .4byte 0x0203841e -_08106DC8: .4byte 0x03005e00 -_08106DCC: .4byte 0x08593b98 -_08106DD0: .4byte sub_8106DD4 + 1 + .pool thumb_func_end sub_8106D90 thumb_func_start sub_8106DD4 @@ -537535,7 +519562,7 @@ sub_8106DD4: @ 8106DD4 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08106DFC + ldr r1, =0x03005e00 adds r0, r1 bl sub_80A7D34 lsls r0, 24 @@ -537548,25 +519575,24 @@ _08106DF4: pop {r0} bx r0 .align 2, 0 -_08106DFC: .4byte 0x03005e00 + .pool thumb_func_end sub_8106DD4 thumb_func_start sub_8106E00 sub_8106E00: @ 8106E00 push {r4-r7,lr} adds r5, r0, 0 - ldr r0, _08106E14 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _08106E1C - ldr r0, _08106E18 + ldr r0, =0x02038436 b _08106E1E .align 2, 0 -_08106E14: .4byte 0x0203841e -_08106E18: .4byte 0x02038436 + .pool _08106E1C: - ldr r0, _08106EB4 + ldr r0, =0x02038437 _08106E1E: ldrb r6, [r0] adds r0, r6, 0 @@ -537575,7 +519601,7 @@ _08106E1E: lsrs r0, 24 cmp r0, 0x1 bne _08106E38 - ldr r1, _08106EB8 + ldr r1, =0x0203841e movs r2, 0x2 ldrsh r0, [r1, r2] negs r0, r0 @@ -537585,7 +519611,7 @@ _08106E38: movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 - ldr r7, _08106EB8 + ldr r7, =0x0203841e lsrs r0, 24 ldrh r3, [r7, 0x2] adds r0, r3 @@ -537630,24 +519656,20 @@ _08106E88: ldrsh r0, [r7, r3] lsls r0, 4 adds r1, r0 - ldr r3, _08106EBC + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _08106EC0 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - ldr r0, _08106EC4 + ldr r0, =sub_8106EC8 + 1 str r0, [r5, 0x1C] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08106EB4: .4byte 0x02038437 -_08106EB8: .4byte 0x0203841e -_08106EBC: .4byte 0x000003ff -_08106EC0: .4byte 0xfffffc00 -_08106EC4: .4byte sub_8106EC8 + 1 + .pool thumb_func_end sub_8106E00 thumb_func_start sub_8106EC8 @@ -537690,7 +519712,7 @@ sub_8106F00: @ 8106F00 ldrsh r0, [r4, r1] cmp r0, 0 bne _08106F22 - ldr r0, _08106F5C + ldr r0, =0x0203841e ldrh r1, [r0] movs r0, 0x78 subs r0, r1 @@ -537731,7 +519753,7 @@ _08106F54: pop {r0} bx r0 .align 2, 0 -_08106F5C: .4byte 0x0203841e + .pool thumb_func_end sub_8106F00 thumb_func_start sub_8106F60 @@ -537744,7 +519766,7 @@ sub_8106F60: @ 8106F60 bne _08106F8E movs r5, 0x78 strh r5, [r6, 0x20] - ldr r4, _08107010 + ldr r4, =0x0203841e movs r2, 0 ldrsh r0, [r4, r2] lsrs r1, r0, 31 @@ -537804,7 +519826,7 @@ _08106F8E: ldrsh r0, [r6, r2] cmp r1, r0 ble _0810700A - ldr r0, _08107014 + ldr r0, =sub_8107018 + 1 str r0, [r6, 0x1C] strh r5, [r6, 0x2E] adds r0, r6, 0 @@ -537821,8 +519843,7 @@ _0810700A: pop {r0} bx r0 .align 2, 0 -_08107010: .4byte 0x0203841e -_08107014: .4byte sub_8107018 + 1 + .pool thumb_func_end sub_8106F60 thumb_func_start sub_8107018 @@ -537838,13 +519859,13 @@ sub_8107018: @ 8107018 ble _08107032 movs r0, 0 strh r0, [r1, 0x2E] - ldr r0, _08107038 + ldr r0, =sub_810703C + 1 str r0, [r1, 0x1C] _08107032: pop {r0} bx r0 .align 2, 0 -_08107038: .4byte sub_810703C + 1 + .pool thumb_func_end sub_8107018 thumb_func_start sub_810703C @@ -537912,13 +519933,13 @@ _081070A6: sub_81070AC: @ 81070AC push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _081070F0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _081070F8 - ldr r4, _081070F4 + ldr r4, =0x02038436 ldrb r1, [r4] movs r0, 0x2 eors r0, r1 @@ -537941,10 +519962,9 @@ sub_81070AC: @ 81070AC bl sub_8008258 b _08107118 .align 2, 0 -_081070F0: .4byte 0x02022fec -_081070F4: .4byte 0x02038436 + .pool _081070F8: - ldr r4, _08107138 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -537966,18 +519986,16 @@ _08107118: ldrh r0, [r5, 0x22] subs r0, 0x48 strh r0, [r5, 0x36] - ldr r0, _0810713C + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _08107140 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08107138: .4byte 0x02038436 -_0810713C: .4byte sub_80A6EEC + 1 -_08107140: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_81070AC thumb_func_start sub_8107144 @@ -537985,8 +520003,8 @@ sub_8107144: @ 8107144 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _08107160 - ldr r1, _08107164 + ldr r3, =0x0203841e + ldr r1, =0x02038400 ldr r1, [r1] ldrb r2, [r1, 0x10] movs r1, 0x1 @@ -537996,8 +520014,7 @@ sub_8107144: @ 8107144 pop {r0} bx r0 .align 2, 0 -_08107160: .4byte 0x0203841e -_08107164: .4byte 0x02038400 + .pool thumb_func_end sub_8107144 thumb_func_start update_fury_cutter_counter_copy @@ -538005,8 +520022,8 @@ update_fury_cutter_counter_copy: @ 8107168 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08107180 - ldr r1, _08107184 + ldr r2, =0x0203841e + ldr r1, =0x02038400 ldr r1, [r1] ldrb r1, [r1, 0x10] strh r1, [r2, 0xE] @@ -538014,8 +520031,7 @@ update_fury_cutter_counter_copy: @ 8107168 pop {r0} bx r0 .align 2, 0 -_08107180: .4byte 0x0203841e -_08107184: .4byte 0x02038400 + .pool thumb_func_end update_fury_cutter_counter_copy thumb_func_start sub_8107188 @@ -538024,7 +520040,7 @@ sub_8107188: @ 8107188 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _08107210 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -538033,7 +520049,7 @@ sub_8107188: @ 8107188 ldrsh r0, [r5, r1] cmp r0, 0 bne _081071B0 - ldr r1, _08107214 + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r5, 0xA] ldrh r0, [r1, 0x2] @@ -538067,7 +520083,7 @@ _081071B0: adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _08107218 + ldr r0, =0x08595020 adds r1, r4, 0 movs r3, 0x4 bl obj_add_from_template_forward_search @@ -538085,18 +520101,16 @@ _0810720A: pop {r0} bx r0 .align 2, 0 -_08107210: .4byte 0x03005e00 -_08107214: .4byte 0x0203841e -_08107218: .4byte 0x08595020 + .pool thumb_func_end sub_8107188 thumb_func_start sub_810721C sub_810721C: @ 810721C - ldr r1, _08107224 + ldr r1, =sub_8107228 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_08107224: .4byte sub_8107228 + 1 + .pool thumb_func_end sub_810721C thumb_func_start sub_8107228 @@ -538135,7 +520149,7 @@ _0810725A: sub_8107260: @ 8107260 push {r4-r6,lr} adds r6, r0, 0 - ldr r5, _08107288 + ldr r5, =0x02038436 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 @@ -538146,19 +520160,18 @@ sub_8107260: @ 8107260 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 - ldr r4, _0810728C + ldr r4, =0x0203841e ldrh r1, [r4] subs r0, r1 b _081072A2 .align 2, 0 -_08107288: .4byte 0x02038436 -_0810728C: .4byte 0x0203841e + .pool _08107290: ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 - ldr r4, _08107368 + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4] adds r0, r1 @@ -538178,23 +520191,23 @@ _081072A2: movs r1, 0x40 orrs r0, r1 strb r0, [r2] - ldr r0, _0810736C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _081072D8 - ldr r1, _08107368 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] _081072D8: - ldr r5, _08107368 + ldr r5, =0x0203841e ldrh r0, [r5, 0xC] strh r0, [r6, 0x2E] ldrh r0, [r6, 0x20] strh r0, [r6, 0x30] - ldr r4, _08107370 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -538211,7 +520224,7 @@ _081072D8: strh r0, [r6, 0x36] adds r0, r6, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, _08107374 + ldr r0, =nullsub_12 + 1 bl object_new_hidden_with_callback adds r4, r0, 0 lsls r4, 24 @@ -538231,7 +520244,7 @@ _081072D8: ldrh r1, [r6, 0x22] subs r1, r0 strh r1, [r6, 0x22] - ldr r0, _08107378 + ldr r0, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -538247,7 +520260,7 @@ _081072D8: strh r0, [r1, 0x34] ldrh r0, [r5, 0xC] strh r0, [r1, 0x36] - ldr r1, _0810737C + ldr r1, =sub_8107380 + 1 str r1, [r6, 0x1C] adds r0, r6, 0 bl _call_via_r1 @@ -538255,12 +520268,7 @@ _081072D8: pop {r0} bx r0 .align 2, 0 -_08107368: .4byte 0x0203841e -_0810736C: .4byte 0x02038436 -_08107370: .4byte 0x02038437 -_08107374: .4byte nullsub_12 + 1 -_08107378: .4byte 0x02020630 -_0810737C: .4byte sub_8107380 + 1 + .pool thumb_func_end sub_8107260 thumb_func_start sub_8107380 @@ -538273,7 +520281,7 @@ sub_8107380: @ 8107380 ldrh r1, [r5, 0x38] lsls r1, 24 lsrs r1, 24 - ldr r2, _081073E8 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -538315,9 +520323,9 @@ sub_8107380: @ 8107380 strh r4, [r7, 0x36] b _081073F6 .align 2, 0 -_081073E8: .4byte 0x02020630 + .pool _081073EC: - ldr r0, _08107404 + ldr r0, =sub_8107408 + 1 str r0, [r5, 0x1C] adds r0, r7, 0 bl obj_delete_and_free_tiles @@ -538329,7 +520337,7 @@ _081073F6: pop {r0} bx r0 .align 2, 0 -_08107404: .4byte sub_8107408 + 1 + .pool thumb_func_end sub_8107380 thumb_func_start sub_8107408 @@ -538342,15 +520350,14 @@ sub_8107408: @ 8107408 negs r1, r1 ands r1, r2 strb r1, [r3] - ldr r1, _08107428 + ldr r1, =sub_80A67D8 + 1 str r1, [r0, 0x1C] - ldr r1, _0810742C + ldr r1, =sub_8107430 + 1 bl oamt_set_x3A_32 pop {r0} bx r0 .align 2, 0 -_08107428: .4byte sub_80A67D8 + 1 -_0810742C: .4byte sub_8107430 + 1 + .pool thumb_func_end sub_8107408 thumb_func_start sub_8107430 @@ -538358,15 +520365,14 @@ sub_8107430: @ 8107430 push {lr} movs r1, 0xA strh r1, [r0, 0x2E] - ldr r1, _08107444 + ldr r1, =sub_80A64B0 + 1 str r1, [r0, 0x1C] - ldr r1, _08107448 + ldr r1, =move_anim_8074EE0 + 1 bl oamt_set_x3A_32 pop {r0} bx r0 .align 2, 0 -_08107444: .4byte sub_80A64B0 + 1 -_08107448: .4byte move_anim_8074EE0 + 1 + .pool thumb_func_end sub_8107430 thumb_func_start sub_810744C @@ -538375,13 +520381,13 @@ sub_810744C: @ 810744C adds r5, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _08107474 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810747C - ldr r1, _08107478 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 lsls r0, 16 @@ -538389,10 +520395,9 @@ sub_810744C: @ 810744C adds r7, r1, 0 b _08107482 .align 2, 0 -_08107474: .4byte 0x02038436 -_08107478: .4byte 0x0203841e + .pool _0810747C: - ldr r0, _081074D8 + ldr r0, =0x0203841e ldrh r6, [r0, 0x4] adds r7, r0, 0 _08107482: @@ -538400,7 +520405,7 @@ _08107482: strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, _081074DC + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -538420,7 +520425,7 @@ _08107482: strh r0, [r5, 0x36] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, _081074E0 + ldr r0, =sub_81074E4 + 1 str r0, [r5, 0x1C] adds r2, r5, 0 adds r2, 0x2C @@ -538435,18 +520440,16 @@ _08107482: pop {r0} bx r0 .align 2, 0 -_081074D8: .4byte 0x0203841e -_081074DC: .4byte 0x02038437 -_081074E0: .4byte sub_81074E4 + 1 + .pool thumb_func_end sub_810744C thumb_func_start sub_81074E4 sub_81074E4: @ 81074E4 push {r4,lr} adds r4, r0, 0 - ldr r0, _08107520 + ldr r0, =0x0203841e ldrh r1, [r0, 0xE] - ldr r0, _08107524 + ldr r0, =0x0000ffff cmp r1, r0 bne _08107506 adds r0, r4, 0 @@ -538471,8 +520474,7 @@ _08107518: pop {r0} bx r0 .align 2, 0 -_08107520: .4byte 0x0203841e -_08107524: .4byte 0x0000ffff + .pool thumb_func_end sub_81074E4 thumb_func_start sub_8107528 @@ -538480,15 +520482,15 @@ sub_8107528: @ 8107528 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0810755C + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 adds r4, r1 - ldr r0, _08107560 + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r4, 0x8] - ldr r0, _08107564 + ldr r0, =0x0000279c bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 20 @@ -538496,16 +520498,13 @@ sub_8107528: @ 8107528 lsls r1, 1 adds r0, r1 strh r0, [r4, 0xC] - ldr r0, _08107568 + ldr r0, =sub_810756C + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810755C: .4byte 0x03005e00 -_08107560: .4byte 0x0203841e -_08107564: .4byte 0x0000279c -_08107568: .4byte sub_810756C + 1 + .pool thumb_func_end sub_8107528 thumb_func_start sub_810756C @@ -538513,7 +520512,7 @@ sub_810756C: @ 810756C push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _081075E4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -538532,7 +520531,7 @@ sub_810756C: @ 810756C adds r0, 0x1 lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _081075E8 + ldr r1, =0x02037b14 lsls r0, r5, 1 adds r0, r1 ldrh r6, [r0] @@ -538573,8 +520572,7 @@ _081075DE: pop {r0} bx r0 .align 2, 0 -_081075E4: .4byte 0x03005e00 -_081075E8: .4byte 0x02037b14 + .pool thumb_func_end sub_810756C thumb_func_start sub_81075EC @@ -538587,7 +520585,7 @@ sub_81075EC: @ 81075EC strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, _08107654 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -538610,7 +520608,7 @@ sub_81075EC: @ 81075EC lsls r0, 8 bl __divsi3 strh r0, [r5, 0x38] - ldr r0, _08107658 + ldr r0, =0x0203841e ldrh r2, [r0, 0x6] strh r2, [r5, 0x3C] ldrh r1, [r0, 0xE] @@ -538626,13 +520624,12 @@ sub_81075EC: @ 81075EC strh r0, [r5, 0x3C] b _08107660 .align 2, 0 -_08107654: .4byte 0x02038437 -_08107658: .4byte 0x0203841e + .pool _0810765C: lsls r0, r1, 8 strh r0, [r5, 0x3A] _08107660: - ldr r1, _08107670 + ldr r1, =sub_8107674 + 1 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -538640,7 +520637,7 @@ _08107660: pop {r0} bx r0 .align 2, 0 -_08107670: .4byte sub_8107674 + 1 + .pool thumb_func_end sub_81075EC thumb_func_start sub_8107674 @@ -538692,23 +520689,21 @@ _081076C0: sub_81076C8: @ 81076C8 lsls r0, 24 lsrs r0, 24 - ldr r2, _081076E8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r3, _081076EC + ldr r3, =0x0203841e ldrh r0, [r3] movs r2, 0 strh r0, [r1, 0x8] strh r2, [r3, 0xE] - ldr r0, _081076F0 + ldr r0, =sub_81076F4 + 1 str r0, [r1] bx lr .align 2, 0 -_081076E8: .4byte 0x03005e00 -_081076EC: .4byte 0x0203841e -_081076F0: .4byte sub_81076F4 + 1 + .pool thumb_func_end sub_81076C8 thumb_func_start sub_81076F4 @@ -538716,13 +520711,13 @@ sub_81076F4: @ 81076F4 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _08107728 + ldr r2, =0x0203841e ldrh r0, [r2, 0xE] adds r0, 0x3 movs r1, 0xFF ands r0, r1 strh r0, [r2, 0xE] - ldr r1, _0810772C + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -538739,15 +520734,14 @@ _08107722: pop {r0} bx r0 .align 2, 0 -_08107728: .4byte 0x0203841e -_0810772C: .4byte 0x03005e00 + .pool thumb_func_end sub_81076F4 thumb_func_start sub_8107730 sub_8107730: @ 8107730 push {r4-r7,lr} adds r4, r0, 0 - ldr r7, _0810777C + ldr r7, =0x02038436 ldrb r0, [r7] movs r1, 0 bl sub_80A5C6C @@ -538760,7 +520754,7 @@ sub_8107730: @ 8107730 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r6, _08107780 + ldr r6, =0x0000fff6 strh r6, [r4, 0x26] ldrb r0, [r7] bl sub_80A82E4 @@ -538779,8 +520773,7 @@ sub_8107730: @ 8107730 strh r0, [r4, 0x24] b _0810778C .align 2, 0 -_0810777C: .4byte 0x02038436 -_08107780: .4byte 0x0000fff6 + .pool _08107784: strh r6, [r4, 0x24] subs r0, r5, 0x2 @@ -538793,13 +520786,13 @@ _0810778E: adds r1, r4, 0 adds r1, 0x43 strb r0, [r1] - ldr r0, _081077A0 + ldr r0, =sub_81077A4 + 1 str r0, [r4, 0x1C] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081077A0: .4byte sub_81077A4 + 1 + .pool thumb_func_end sub_8107730 thumb_func_start sub_81077A4 @@ -538823,18 +520816,18 @@ _081077BA: sub_81077C0: @ 81077C0 push {r4-r7,lr} adds r6, r0, 0 - ldr r5, _08107880 + ldr r5, =0x02038436 ldrb r0, [r5] bl battle_side_get_owner adds r4, r0, 0 - ldr r0, _08107884 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _0810780A - ldr r4, _08107888 + ldr r4, =0x0203841e movs r1, 0 ldrsh r0, [r4, r1] negs r0, r0 @@ -538856,7 +520849,7 @@ _08107802: negs r0, r0 strh r0, [r4] _0810780A: - ldr r5, _08107888 + ldr r5, =0x0203841e movs r1, 0xA ldrsh r0, [r5, r1] movs r1, 0xFF @@ -538875,7 +520868,7 @@ _0810781E: _08107828: adds r0, r6, 0 bl sub_80A69CC - ldr r0, _08107880 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -538887,7 +520880,7 @@ _08107828: _08107842: ldrh r0, [r5, 0x8] strh r0, [r6, 0x2E] - ldr r4, _08107884 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -538904,20 +520897,16 @@ _08107842: ldrh r5, [r5, 0x6] adds r0, r5 strh r0, [r6, 0x36] - ldr r0, _0810788C + ldr r0, =sub_80A6EEC + 1 str r0, [r6, 0x1C] - ldr r1, _08107890 + ldr r1, =move_anim_8072740 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08107880: .4byte 0x02038436 -_08107884: .4byte 0x02038437 -_08107888: .4byte 0x0203841e -_0810788C: .4byte sub_80A6EEC + 1 -_08107890: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_81077C0 thumb_func_start sub_8107894 @@ -538926,7 +520915,7 @@ sub_8107894: @ 8107894 adds r4, r0, 0 movs r1, 0x1 bl sub_80A6980 - ldr r0, _081078C4 + ldr r0, =0x0203841e ldrh r1, [r0, 0x8] strh r1, [r4, 0x2E] ldrh r0, [r0, 0x4] @@ -538936,25 +520925,23 @@ sub_8107894: @ 8107894 ldrh r0, [r4, 0x22] adds r1, r0 strh r1, [r4, 0x36] - ldr r0, _081078C8 + ldr r0, =sub_80A6EEC + 1 str r0, [r4, 0x1C] - ldr r1, _081078CC + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_081078C4: .4byte 0x0203841e -_081078C8: .4byte sub_80A6EEC + 1 -_081078CC: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8107894 thumb_func_start sub_81078D0 sub_81078D0: @ 81078D0 push {r4,lr} adds r4, r0, 0 - ldr r0, _081078E8 + ldr r0, =0x0203841e movs r1, 0x6 ldrsh r0, [r0, r1] cmp r0, 0 @@ -538964,23 +520951,22 @@ sub_81078D0: @ 81078D0 bl sub_80A6980 b _081078F4 .align 2, 0 -_081078E8: .4byte 0x0203841e + .pool _081078EC: adds r0, r4, 0 movs r1, 0x1 bl sub_80A69CC _081078F4: - ldr r0, _08107904 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x3C] - ldr r0, _08107908 + ldr r0, =sub_810790C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08107904: .4byte 0x0203841e -_08107908: .4byte sub_810790C + 1 + .pool thumb_func_end sub_81078D0 thumb_func_start sub_810790C @@ -539032,7 +521018,7 @@ sub_8107954: @ 8107954 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r1, _081079C4 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -539057,7 +521043,7 @@ sub_8107954: @ 8107954 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations - ldr r0, _081079C8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -539066,39 +521052,37 @@ sub_8107954: @ 8107954 bne _081079D0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _081079CC + ldr r1, =0x08d95e00 bl sub_80A6D48 b _081079EA .align 2, 0 -_081079C4: .4byte 0x00003f42 -_081079C8: .4byte 0x02038436 -_081079CC: .4byte 0x08d95e00 + .pool _081079D0: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _081079DC + ldr r1, =0x08d960d0 bl sub_80A6D48 b _081079EA .align 2, 0 -_081079DC: .4byte 0x08d960d0 + .pool _081079E0: - ldr r1, _08107A14 + ldr r1, =0x08d963a4 mov r0, sp movs r2, 0x1 bl sub_80A6D60 _081079EA: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _08107A18 + ldr r1, =0x08d94ab8 mov r2, sp ldrh r2, [r2, 0xA] bl sub_80A6CC0 - ldr r0, _08107A1C + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _08107A24 - ldr r0, _08107A20 + ldr r0, =0x08d95dd8 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -539106,20 +521090,17 @@ _081079EA: bl decompress_palette b _08107A32 .align 2, 0 -_08107A14: .4byte 0x08d963a4 -_08107A18: .4byte 0x08d94ab8 -_08107A1C: .4byte 0x0203841e -_08107A20: .4byte 0x08d95dd8 + .pool _08107A24: - ldr r0, _08107A9C + ldr r0, =0x08d8fb9c mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette _08107A32: - ldr r0, _08107AA0 - ldr r4, _08107AA4 + ldr r0, =sub_8107D58 + 1 + ldr r4, =0x03005e00 mov r2, r10 lsls r5, r2, 2 adds r1, r5, r2 @@ -539153,13 +521134,13 @@ _08107A32: lsrs r4, r0, 24 cmp r4, 0 beq _08107AB4 - ldr r1, _08107AA8 + ldr r1, =0x0000ffb0 adds r0, r1, 0 - ldr r2, _08107AAC + ldr r2, =0x02022e18 strh r0, [r2] adds r1, 0x20 adds r0, r1, 0 - ldr r2, _08107AB0 + ldr r2, =0x02022e1a strh r0, [r2] movs r0, 0x2 strh r0, [r6, 0x8] @@ -539169,63 +521150,54 @@ _08107A32: strh r0, [r7, 0xE] b _08107B0E .align 2, 0 -_08107A9C: .4byte 0x08d8fb9c -_08107AA0: .4byte sub_8107D58 + 1 -_08107AA4: .4byte 0x03005e00 -_08107AA8: .4byte 0x0000ffb0 -_08107AAC: .4byte 0x02022e18 -_08107AB0: .4byte 0x02022e1a + .pool _08107AB4: - ldr r0, _08107AE4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 bne _08107AF8 - ldr r2, _08107AE8 + ldr r2, =0x0000ff20 adds r0, r2, 0 - ldr r2, _08107AEC + ldr r2, =0x02022e18 strh r0, [r2] movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 - ldr r2, _08107AF0 + ldr r2, =0x02022e1a strh r0, [r2] movs r0, 0x2 strh r0, [r6, 0x8] - ldr r0, _08107AF4 + ldr r0, =0x0000ffff strh r0, [r6, 0xA] strh r1, [r7, 0xE] b _08107B0E .align 2, 0 -_08107AE4: .4byte 0x02038436 -_08107AE8: .4byte 0x0000ff20 -_08107AEC: .4byte 0x02022e18 -_08107AF0: .4byte 0x02022e1a -_08107AF4: .4byte 0x0000ffff + .pool _08107AF8: - ldr r0, _08107B40 + ldr r0, =0x02022e18 strh r4, [r0] - ldr r1, _08107B44 + ldr r1, =0x0000ffd0 adds r0, r1, 0 - ldr r2, _08107B48 + ldr r2, =0x02022e1a strh r0, [r2] - ldr r0, _08107B4C + ldr r0, =0x0000fffe strh r0, [r6, 0x8] movs r0, 0x1 strh r0, [r6, 0xA] strh r4, [r7, 0xE] _08107B0E: - ldr r0, _08107B40 + ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 bl lcd_io_set - ldr r2, _08107B48 + ldr r2, =0x02022e1a ldrh r1, [r2] movs r0, 0x16 bl lcd_io_set - ldr r1, _08107B50 + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -539240,24 +521212,20 @@ _08107B0E: movs r0, 0x70 b _08107B58 .align 2, 0 -_08107B40: .4byte 0x02022e18 -_08107B44: .4byte 0x0000ffd0 -_08107B48: .4byte 0x02022e1a -_08107B4C: .4byte 0x0000fffe -_08107B50: .4byte 0x03005e00 + .pool _08107B54: movs r0, 0 strh r0, [r1, 0x10] _08107B58: strh r0, [r1, 0x12] - ldr r1, _08107B7C + ldr r1, =0x03005e00 mov r2, r10 adds r0, r5, r2 lsls r0, 3 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x14] - ldr r1, _08107B80 + ldr r1, =sub_8107B84 + 1 str r1, [r0] add sp, 0x10 pop {r3-r5} @@ -539268,8 +521236,7 @@ _08107B58: pop {r0} bx r0 .align 2, 0 -_08107B7C: .4byte 0x03005e00 -_08107B80: .4byte sub_8107B84 + 1 + .pool thumb_func_end sub_8107954 thumb_func_start sub_8107B84 @@ -539278,9 +521245,9 @@ sub_8107B84: @ 8107B84 sub sp, 0x10 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08107CB0 - ldr r2, _08107CB4 - ldr r0, _08107CB8 + ldr r1, =0x02022e18 + ldr r2, =0x02022e1a + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -539306,7 +521273,7 @@ sub_8107B84: @ 8107B84 asrs r0, 16 cmp r0, 0x4 bne _08107C18 - ldr r1, _08107CBC + ldr r1, =0x02037b14 mov r0, sp ldrb r0, [r0, 0x8] lsls r0, 4 @@ -539342,14 +521309,14 @@ _08107BDE: lsls r0, 1 adds r0, r7 strh r6, [r0] - ldr r1, _08107CB8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 strh r2, [r0, 0x12] _08107C18: - ldr r1, _08107CB8 + ldr r1, =0x03005e00 lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 @@ -539421,7 +521388,7 @@ _08107C86: cmp r3, 0 bne _08107CA8 strh r3, [r2, 0x8] - ldr r0, _08107CC0 + ldr r0, =sub_8107CC4 + 1 str r0, [r2] _08107CA8: add sp, 0x10 @@ -539429,11 +521396,7 @@ _08107CA8: pop {r0} bx r0 .align 2, 0 -_08107CB0: .4byte 0x02022e18 -_08107CB4: .4byte 0x02022e1a -_08107CB8: .4byte 0x03005e00 -_08107CBC: .4byte 0x02037b14 -_08107CC0: .4byte sub_8107CC4 + 1 + .pool thumb_func_end sub_8107B84 thumb_func_start sub_8107CC4 @@ -539444,10 +521407,10 @@ sub_8107CC4: @ 8107CC4 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r7, _08107CFC - ldr r0, _08107D00 + ldr r7, =0x02022e18 + ldr r0, =0x02022e1a mov r8, r0 - ldr r6, _08107D04 + ldr r6, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -539465,9 +521428,7 @@ sub_8107CC4: @ 8107CC4 strh r0, [r4, 0x8] b _08107D4A .align 2, 0 -_08107CFC: .4byte 0x02022e18 -_08107D00: .4byte 0x02022e1a -_08107D04: .4byte 0x03005e00 + .pool _08107D08: bl sub_80A4DF0 lsls r0, 24 @@ -539494,7 +521455,7 @@ _08107D1C: adds r0, r1 lsls r0, 3 adds r0, r6 - ldr r1, _08107D54 + ldr r1, =0x0000ffff strh r1, [r0, 0x26] adds r0, r5, 0 bl move_anim_task_del @@ -539505,7 +521466,7 @@ _08107D4A: pop {r0} bx r0 .align 2, 0 -_08107D54: .4byte 0x0000ffff + .pool thumb_func_end sub_8107CC4 thumb_func_start sub_8107D58 @@ -539517,7 +521478,7 @@ sub_8107D58: @ 8107D58 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08107D80 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -539531,7 +521492,7 @@ _08107D74: beq _08107D8C b _08108022 .align 2, 0 -_08107D80: .4byte 0x03005e00 + .pool _08107D84: cmp r0, 0x2 bne _08107D8A @@ -539542,7 +521503,7 @@ _08107D8C: movs r3, 0 movs r2, 0x10 ldrsh r0, [r4, r2] - ldr r1, _08107E5C + ldr r1, =0x02038c28 mov r12, r1 cmp r3, r0 bge _08107DCA @@ -539550,7 +521511,7 @@ _08107D8C: movs r5, 0xF0 lsls r5, 3 add r5, r12 - ldr r6, _08107E60 + ldr r6, =0x0000ffff _08107DA4: lsls r2, r3, 16 asrs r2, 16 @@ -539579,11 +521540,11 @@ _08107DCA: ldrsh r0, [r4, r3] cmp r1, r0 bge _08107E04 - ldr r5, _08107E5C + ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 - ldr r7, _08107E60 + ldr r7, =0x0000ffff _08107DE2: asrs r2, 16 lsls r1, r2, 1 @@ -539608,11 +521569,11 @@ _08107E04: asrs r0, r2, 16 cmp r0, 0x9F bgt _08107E3A - ldr r5, _08107E5C + ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 - ldr r7, _08107E60 + ldr r7, =0x0000ffff _08107E18: asrs r2, 16 lsls r1, r2, 1 @@ -539649,8 +521610,7 @@ _08107E3A: ldrh r0, [r4, 0xA] b _08107E7A .align 2, 0 -_08107E5C: .4byte 0x02038c28 -_08107E60: .4byte 0x0000ffff + .pool _08107E64: lsls r0, r3, 16 asrs r0, 15 @@ -539665,9 +521625,9 @@ _08107E64: ldrh r0, [r4, 0xC] _08107E7A: strh r0, [r2] - ldr r0, _08107EA4 + ldr r0, =0x04000052 str r0, [sp] - ldr r0, _08107EA8 + ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r1, sp movs r2, 0 @@ -539684,8 +521644,7 @@ _08107E7A: strh r0, [r4, 0x8] b _08108022 .align 2, 0 -_08107EA4: .4byte 0x04000052 -_08107EA8: .4byte 0xa2600001 + .pool _08107EAC: movs r2, 0xE ldrsh r1, [r4, r2] @@ -539717,8 +521676,8 @@ _08107ED8: ldrsh r0, [r4, r1] cmp r3, r0 bge _08107F0C - ldr r6, _08107F70 - ldr r5, _08107F74 + ldr r6, =0x02038c28 + ldr r5, =0x02039b28 _08107EE6: lsls r1, r3, 16 asrs r1, 16 @@ -539747,8 +521706,8 @@ _08107F0C: ldrsh r0, [r4, r3] cmp r1, r0 bge _08107F40 - ldr r6, _08107F70 - ldr r5, _08107F74 + ldr r6, =0x02038c28 + ldr r5, =0x02039b28 _08107F1E: asrs r3, r2, 16 lsls r2, r3, 1 @@ -539773,8 +521732,8 @@ _08107F40: asrs r0, r1, 16 cmp r0, 0x9F bgt _08108022 - ldr r6, _08107F70 - ldr r5, _08107F74 + ldr r6, =0x02038c28 + ldr r5, =0x02039b28 _08107F4E: asrs r3, r1, 16 lsls r2, r3, 1 @@ -539793,16 +521752,15 @@ _08107F4E: ble _08107F4E b _08108022 .align 2, 0 -_08107F70: .4byte 0x02038c28 -_08107F74: .4byte 0x02039b28 + .pool _08107F78: movs r3, 0 movs r1, 0x10 ldrsh r0, [r4, r1] cmp r3, r0 bge _08107FAC - ldr r6, _0810802C - ldr r5, _08108030 + ldr r6, =0x02038c28 + ldr r5, =0x02039b28 _08107F86: lsls r1, r3, 16 asrs r1, 16 @@ -539831,8 +521789,8 @@ _08107FAC: ldrsh r0, [r4, r3] cmp r1, r0 bge _08107FE0 - ldr r6, _0810802C - ldr r5, _08108030 + ldr r6, =0x02038c28 + ldr r5, =0x02039b28 _08107FBE: asrs r3, r2, 16 lsls r2, r3, 1 @@ -539857,8 +521815,8 @@ _08107FE0: asrs r0, r1, 16 cmp r0, 0x9F bgt _0810800C - ldr r6, _0810802C - ldr r5, _08108030 + ldr r6, =0x02038c28 + ldr r5, =0x02039b28 _08107FEE: asrs r3, r1, 16 lsls r2, r3, 1 @@ -539891,8 +521849,7 @@ _08108022: pop {r0} bx r0 .align 2, 0 -_0810802C: .4byte 0x02038c28 -_08108030: .4byte 0x02039b28 + .pool thumb_func_end sub_8107D58 thumb_func_start sub_8108034 @@ -539903,10 +521860,10 @@ sub_8108034: @ 8108034 lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x8 - ldr r3, _08108088 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _0810808C + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] @@ -539921,7 +521878,7 @@ sub_8108034: @ 8108034 adds r6, r0, 0 orrs r5, r6 bl GenerateRandomNumber2 - ldr r1, _08108090 + ldr r1, =0x000001ff ands r1, r0 adds r0, r1, 0 cmp r0, 0xFF @@ -539932,16 +521889,13 @@ sub_8108034: @ 8108034 _0810807A: strh r5, [r4, 0x30] strh r1, [r4, 0x32] - ldr r0, _08108094 + ldr r0, =sub_8108098 + 1 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08108088: .4byte 0x000003ff -_0810808C: .4byte 0xfffffc00 -_08108090: .4byte 0x000001ff -_08108094: .4byte sub_8108098 + 1 + .pool thumb_func_end sub_8108034 thumb_func_start sub_8108098 @@ -539996,14 +521950,14 @@ sub_81080E4: @ 81080E4 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08108134 + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r2, _08108138 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -540021,15 +521975,13 @@ sub_81080E4: @ 81080E4 lsrs r0, 24 movs r1, 0 bl sub_80A7270 - ldr r0, _0810813C + ldr r0, =sub_8108140 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_08108134: .4byte 0x03005e00 -_08108138: .4byte 0x02020630 -_0810813C: .4byte sub_8108140 + 1 + .pool thumb_func_end sub_81080E4 thumb_func_start sub_8108140 @@ -540041,7 +521993,7 @@ sub_8108140: @ 8108140 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08108168 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -540050,13 +522002,12 @@ sub_8108140: @ 8108140 b _0810837A _0810815C: lsls r0, 2 - ldr r1, _0810816C + ldr r1, =_08108170 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08108168: .4byte 0x03005e00 -_0810816C: .4byte _08108170 + .pool .align 2, 0 _08108170: .4byte _08108190 @@ -540103,7 +522054,7 @@ _081081B6: ands r0, r1 cmp r0, 0 beq _08108200 - ldr r2, _081081FC + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -540123,16 +522074,16 @@ _081081B6: strh r1, [r0, 0x22] b _08108212 .align 2, 0 -_081081FC: .4byte 0x02020630 + .pool _08108200: - ldr r2, _08108240 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _08108244 + ldr r1, =0x0000fffd strh r1, [r0, 0x24] _08108212: adds r0, r4, 0 @@ -540147,7 +522098,7 @@ _08108222: lsls r0, 24 lsrs r0, 24 bl sub_80A7E6C - ldr r2, _08108240 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -540158,8 +522109,7 @@ _08108222: strh r5, [r4, 0xE] b _0810835C .align 2, 0 -_08108240: .4byte 0x02020630 -_08108244: .4byte 0x0000fffd + .pool _08108248: ldrh r0, [r4, 0xE] adds r0, 0x1 @@ -540222,7 +522172,7 @@ _081082A0: ands r0, r1 cmp r0, 0 beq _081082D8 - ldr r2, _081082D4 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -540233,9 +522183,9 @@ _081082A0: adds r1, 0x2 b _081082EA .align 2, 0 -_081082D4: .4byte 0x02020630 + .pool _081082D8: - ldr r2, _0810831C + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -540269,9 +522219,9 @@ _081082EA: strh r0, [r4, 0x10] b _0810835E .align 2, 0 -_0810831C: .4byte 0x02020630 + .pool _08108320: - ldr r6, _08108368 + ldr r6, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -540307,7 +522257,7 @@ _0810835E: strh r0, [r4, 0x8] b _0810837A .align 2, 0 -_08108368: .4byte 0x02020630 + .pool _0810836C: movs r1, 0xC ldrsh r0, [r4, r1] @@ -540325,37 +522275,35 @@ _0810837A: thumb_func_start sub_8108384 sub_8108384: @ 8108384 push {r4,r5,lr} - ldr r4, _081083A8 + ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _081083B8 - ldr r1, _081083AC + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _081083B0 + ldr r0, =0x020244ec b _081083C8 .align 2, 0 -_081083A8: .4byte 0x02038436 -_081083AC: .4byte 0x0202406e -_081083B0: .4byte 0x020244ec + .pool _081083B4: adds r0, r2, 0 b _081083FA _081083B8: - ldr r1, _08108400 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08108404 + ldr r0, =0x02024744 _081083C8: adds r5, r1, r0 adds r0, r5, 0 @@ -540386,8 +522334,7 @@ _081083FA: pop {r1} bx r1 .align 2, 0 -_08108400: .4byte 0x0202406e -_08108404: .4byte 0x02024744 + .pool thumb_func_end sub_8108384 thumb_func_start sub_8108408 @@ -540402,7 +522349,7 @@ sub_8108408: @ 8108408 lsls r1, 24 lsrs r1, 24 str r1, [sp] - ldr r4, _08108510 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -540444,7 +522391,7 @@ _08108458: asrs r0, 16 mov r8, r0 _08108472: - ldr r0, _08108514 + ldr r0, =0x08595268 mov r1, r10 mov r2, r9 ldr r3, [sp, 0x8] @@ -540454,7 +522401,7 @@ _08108472: lsls r6, r5, 16 cmp r2, 0x40 beq _081084DA - ldr r1, _08108518 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -540522,9 +522469,7 @@ _081084DA: pop {r0} bx r0 .align 2, 0 -_08108510: .4byte 0x02038436 -_08108514: .4byte 0x08595268 -_08108518: .4byte 0x02020630 + .pool thumb_func_end sub_8108408 thumb_func_start sub_810851C @@ -540593,7 +522538,7 @@ _08108564: cmp r1, 0x78 ble _081085BE _0810859A: - ldr r3, _081085C4 + ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -540615,7 +522560,7 @@ _081085BE: pop {r0} bx r0 .align 2, 0 -_081085C4: .4byte 0x03005e00 + .pool thumb_func_end sub_810851C thumb_func_start sub_81085C8 @@ -540626,13 +522571,13 @@ sub_81085C8: @ 81085C8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081085F8 + ldr r0, =0x03005e00 adds r4, r1, r0 bl sub_8108384 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xA] - ldr r0, _081085FC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -540643,8 +522588,7 @@ sub_81085C8: @ 81085C8 movs r0, 0x28 b _08108606 .align 2, 0 -_081085F8: .4byte 0x03005e00 -_081085FC: .4byte 0x02038436 + .pool _08108600: movs r0, 0x10 strh r0, [r4, 0x10] @@ -540662,13 +522606,13 @@ _08108606: adds r0, r1 adds r0, 0x5 strh r0, [r4, 0x20] - ldr r0, _08108628 + ldr r0, =sub_810862C + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_08108628: .4byte sub_810862C + 1 + .pool thumb_func_end sub_81085C8 thumb_func_start sub_810862C @@ -540681,7 +522625,7 @@ sub_810862C: @ 810862C lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r7, _08108650 + ldr r7, =0x03005e00 adds r4, r0, r7 movs r0, 0x8 ldrsh r2, [r4, r0] @@ -540691,7 +522635,7 @@ sub_810862C: @ 810862C beq _08108704 b _08108712 .align 2, 0 -_08108650: .4byte 0x03005e00 + .pool _08108654: ldrh r0, [r4, 0xC] adds r0, 0x1 @@ -540712,7 +522656,7 @@ _0810866A: ldrsh r0, [r4, r2] cmp r0, 0 bne _081086E4 - ldr r5, _081086F8 + ldr r5, =0x0203841e movs r1, 0x1 mov r8, r1 mov r2, r8 @@ -540720,7 +522664,7 @@ _0810866A: strh r0, [r5, 0x2] movs r0, 0xC strh r0, [r5, 0x4] - ldr r6, _081086FC + ldr r6, =sub_81152DC + 1 adds r0, r6, 0 movs r1, 0x50 bl AddTask @@ -540735,7 +522679,7 @@ _0810866A: ldr r1, [r0] adds r0, r2, 0 bl _call_via_r1 - ldr r1, _08108700 + ldr r1, =0x020383fe ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -540756,7 +522700,7 @@ _081086B4: ldr r1, [r0] adds r0, r2, 0 bl _call_via_r1 - ldr r1, _08108700 + ldr r1, =0x020383fe ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -540775,9 +522719,7 @@ _081086E4: strh r0, [r4, 0x8] b _08108712 .align 2, 0 -_081086F8: .4byte 0x0203841e -_081086FC: .4byte sub_81152DC + 1 -_08108700: .4byte 0x020383fe + .pool _08108704: movs r2, 0x1A ldrsh r0, [r4, r2] @@ -540799,7 +522741,7 @@ sub_810871C: @ 810871C adds r4, r0, 0 lsls r1, 24 lsrs r6, r1, 24 - ldr r1, _081087A8 + ldr r1, =0x08329f40 movs r2, 0x18 ldrsh r0, [r4, r2] lsls r0, 1 @@ -540812,7 +522754,7 @@ sub_810871C: @ 810871C adds r0, r2 lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _081087AC + ldr r0, =0x08595268 movs r2, 0x16 ldrsh r1, [r4, r2] movs r2, 0 @@ -540822,14 +522764,14 @@ sub_810871C: @ 810871C lsrs r1, r0, 24 cmp r1, 0x40 beq _08108776 - ldr r3, _081087B0 + ldr r3, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, _081087B4 + ldr r2, =sub_81087C0 + 1 str r2, [r1] adds r0, r3 strh r5, [r0, 0x38] @@ -540850,9 +522792,9 @@ _08108776: strh r0, [r4, 0x18] movs r0, 0x16 ldrsh r1, [r4, r0] - ldr r0, _081087B8 + ldr r0, =0x41c64e6d muls r0, r1 - ldr r1, _081087BC + ldr r1, =0x00003039 adds r0, r1 movs r2, 0x12 ldrsh r1, [r4, r2] @@ -540864,12 +522806,7 @@ _08108776: pop {r0} bx r0 .align 2, 0 -_081087A8: .4byte 0x08329f40 -_081087AC: .4byte 0x08595268 -_081087B0: .4byte 0x02020630 -_081087B4: .4byte sub_81087C0 + 1 -_081087B8: .4byte 0x41c64e6d -_081087BC: .4byte 0x00003039 + .pool thumb_func_end sub_810871C thumb_func_start sub_81087C0 @@ -540889,7 +522826,7 @@ sub_81087C0: @ 81087C0 ldrsh r1, [r5, r2] cmp r0, r1 blt _08108856 - ldr r2, _0810885C + ldr r2, =0x03005e00 movs r3, 0x3A ldrsh r1, [r5, r3] lsls r0, r1, 2 @@ -540898,7 +522835,7 @@ sub_81087C0: @ 81087C0 adds r0, r2 movs r1, 0x1 strh r1, [r0, 0x1C] - ldr r0, _08108860 + ldr r0, =0x08597388 movs r2, 0x20 ldrsh r1, [r5, r2] movs r3, 0x22 @@ -540915,7 +522852,7 @@ sub_81087C0: @ 81087C0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08108864 + ldr r4, =0x02020630 adds r0, r4 movs r1, 0x3 bl sub_8008258 @@ -540942,7 +522879,7 @@ sub_81087C0: @ 81087C0 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _08108868 + ldr r1, =sub_810886C + 1 str r1, [r0] _08108850: adds r0, r5, 0 @@ -540952,10 +522889,7 @@ _08108856: pop {r0} bx r0 .align 2, 0 -_0810885C: .4byte 0x03005e00 -_08108860: .4byte 0x08597388 -_08108864: .4byte 0x02020630 -_08108868: .4byte sub_810886C + 1 + .pool thumb_func_end sub_81087C0 thumb_func_start sub_810886C @@ -540991,7 +522925,7 @@ sub_810886C: @ 810886C asrs r0, 16 cmp r0, 0xC bne _081088D8 - ldr r3, _081088E0 + ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -541017,7 +522951,7 @@ _081088D8: pop {r0} bx r0 .align 2, 0 -_081088E0: .4byte 0x03005e00 + .pool thumb_func_end sub_810886C thumb_func_start sub_81088E4 @@ -541028,9 +522962,9 @@ sub_81088E4: @ 81088E4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08108968 + ldr r0, =0x03005e00 adds r5, r1, r0 - ldr r4, _0810896C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -541076,20 +523010,17 @@ _0810893C: ldrh r0, [r5, 0x10] subs r0, r1 strh r0, [r5, 0x14] - ldr r0, _08108970 + ldr r0, =0x0000ffe0 strh r0, [r5, 0x1A] strh r6, [r5, 0xA] strh r6, [r5, 0x8] - ldr r0, _08108974 + ldr r0, =sub_8108978 + 1 str r0, [r5] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08108968: .4byte 0x03005e00 -_0810896C: .4byte 0x02038436 -_08108970: .4byte 0x0000ffe0 -_08108974: .4byte sub_8108978 + 1 + .pool thumb_func_end sub_81088E4 thumb_func_start sub_8108978 @@ -541100,7 +523031,7 @@ sub_8108978: @ 8108978 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0810899C + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -541109,13 +523040,12 @@ sub_8108978: @ 8108978 b _08108AB2 _08108992: lsls r0, 2 - ldr r1, _081089A0 + ldr r1, =_081089A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0810899C: .4byte 0x03005e00 -_081089A0: .4byte _081089A4 + .pool .align 2, 0 _081089A4: .4byte _081089C0 @@ -541271,7 +523201,7 @@ sub_8108AC0: @ 8108AC0 ble _08108B1A movs r0, 0 strh r0, [r6, 0xC] - ldr r0, _08108B20 + ldr r0, =0x08595268 movs r2, 0xE ldrsh r1, [r6, r2] movs r3, 0x10 @@ -541282,7 +523212,7 @@ sub_8108AC0: @ 8108AC0 lsrs r0, 24 cmp r0, 0x40 beq _08108B1A - ldr r5, _08108B24 + ldr r5, =0x02020630 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -541298,7 +523228,7 @@ sub_8108AC0: @ 8108AC0 bl sub_80A68D4 adds r5, 0x1C adds r4, r5 - ldr r0, _08108B28 + ldr r0, =sub_8108B2C + 1 str r0, [r4] ldrh r0, [r6, 0x18] adds r0, 0x1 @@ -541308,9 +523238,7 @@ _08108B1A: pop {r0} bx r0 .align 2, 0 -_08108B20: .4byte 0x08595268 -_08108B24: .4byte 0x02020630 -_08108B28: .4byte sub_8108B2C + 1 + .pool thumb_func_end sub_8108AC0 thumb_func_start sub_8108B2C @@ -541335,7 +523263,7 @@ sub_8108B2C: @ 8108B2C movs r4, 0x1F adds r1, r4, 0 ands r1, r0 - ldr r5, _08108B8C + ldr r5, =0x0000fff0 adds r1, r5 ldrh r0, [r6, 0x20] adds r1, r0 @@ -541353,15 +523281,14 @@ sub_8108B2C: @ 8108B2C strh r1, [r6, 0x38] adds r0, r6, 0 bl sub_80A68D4 - ldr r0, _08108B90 + ldr r0, =sub_8108B94 + 1 str r0, [r6, 0x1C] _08108B86: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08108B8C: .4byte 0x0000fff0 -_08108B90: .4byte sub_8108B94 + 1 + .pool thumb_func_end sub_8108B2C thumb_func_start sub_8108B94 @@ -541373,14 +523300,14 @@ sub_8108B94: @ 8108B94 cmp r0, 0 beq _08108BD0 movs r4, 0 - ldr r6, _08108BD8 + ldr r6, =0x03005e00 _08108BA6: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r2, r0, r6 ldr r1, [r2] - ldr r0, _08108BDC + ldr r0, =sub_8108978 + 1 cmp r1, r0 bne _08108BC6 movs r0, 0x1 @@ -541401,13 +523328,12 @@ _08108BD0: pop {r0} bx r0 .align 2, 0 -_08108BD8: .4byte 0x03005e00 -_08108BDC: .4byte sub_8108978 + 1 + .pool thumb_func_end sub_8108B94 thumb_func_start sub_8108BE0 sub_8108BE0: @ 8108BE0 - ldr r2, _08108C00 + ldr r2, =0x0203841e ldrh r1, [r2] strh r1, [r0, 0x20] ldrh r1, [r2, 0x2] @@ -541420,12 +523346,11 @@ sub_8108BE0: @ 8108BE0 strh r1, [r0, 0x32] ldrh r1, [r2, 0xA] strh r1, [r0, 0x34] - ldr r1, _08108C04 + ldr r1, =sub_8108C08 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_08108C00: .4byte 0x0203841e -_08108C04: .4byte sub_8108C08 + 1 + .pool thumb_func_end sub_8108BE0 thumb_func_start sub_8108C08 @@ -541507,7 +523432,7 @@ sub_8108C94: @ 8108C94 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r5, _08108CD0 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -541520,20 +523445,18 @@ sub_8108C94: @ 8108C94 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] - ldr r1, _08108CD4 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] strh r0, [r4, 0x34] ldrh r0, [r1, 0x6] strh r0, [r4, 0x36] - ldr r0, _08108CD8 + ldr r0, =sub_8108CDC + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08108CD0: .4byte 0x02038437 -_08108CD4: .4byte 0x0203841e -_08108CD8: .4byte sub_8108CDC + 1 + .pool thumb_func_end sub_8108C94 thumb_func_start sub_8108CDC @@ -541667,7 +523590,7 @@ sub_8108D54: @ 8108D54 lsls r1, 16 mov r10, r1 _08108DE2: - ldr r0, _08108E24 + ldr r0, =0x08595310 mov r2, r8 asrs r1, r2, 16 mov r3, r10 @@ -541676,7 +523599,7 @@ _08108DE2: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08108E28 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -541685,7 +523608,7 @@ _08108DE2: strh r0, [r4, 0x2E] mov r0, r9 strh r0, [r4, 0x30] - ldr r0, _08108E2C + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 @@ -541699,9 +523622,7 @@ _08108DE2: strh r1, [r4, 0x32] b _08108E32 .align 2, 0 -_08108E24: .4byte 0x08595310 -_08108E28: .4byte 0x02020630 -_08108E2C: .4byte 0x02038436 + .pool _08108E30: strh r7, [r4, 0x32] _08108E32: @@ -541725,7 +523646,7 @@ _08108E32: lsls r1, 16 mov r10, r1 _08108E58: - ldr r0, _08108E9C + ldr r0, =0x08595310 mov r2, r8 asrs r1, r2, 16 mov r3, r10 @@ -541734,7 +523655,7 @@ _08108E58: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08108EA0 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -541743,7 +523664,7 @@ _08108E58: strh r0, [r4, 0x2E] mov r0, r9 strh r0, [r4, 0x30] - ldr r0, _08108EA4 + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 @@ -541757,9 +523678,7 @@ _08108E58: strh r1, [r4, 0x32] b _08108EAA .align 2, 0 -_08108E9C: .4byte 0x08595310 -_08108EA0: .4byte 0x02020630 -_08108EA4: .4byte 0x02038436 + .pool _08108EA8: strh r7, [r4, 0x32] _08108EAA: @@ -541784,7 +523703,7 @@ _08108EAA: sub_8108EC8: @ 8108EC8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08108EFC + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r4, 0x2E] movs r0, 0x3C @@ -541796,10 +523715,10 @@ sub_8108EC8: @ 8108EC8 movs r0, 0xFE lsls r0, 8 strh r0, [r4, 0x36] - ldr r1, _08108F00 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r1, _08108F04 + ldr r1, =sub_80A634C + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -541807,16 +523726,14 @@ sub_8108EC8: @ 8108EC8 pop {r0} bx r0 .align 2, 0 -_08108EFC: .4byte 0x0203841e -_08108F00: .4byte move_anim_8072740 + 1 -_08108F04: .4byte sub_80A634C + 1 + .pool thumb_func_end sub_8108EC8 thumb_func_start sub_8108F08 sub_8108F08: @ 8108F08 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08108F40 + ldr r5, =0x0203841e movs r0, 0 ldrsh r1, [r5, r0] adds r0, r4, 0 @@ -541831,18 +523748,16 @@ sub_8108F08: @ 8108F08 strh r0, [r4, 0x30] ldrh r0, [r5, 0x6] strh r0, [r4, 0x32] - ldr r0, _08108F44 + ldr r0, =sub_80A656C + 1 str r0, [r4, 0x1C] - ldr r1, _08108F48 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08108F40: .4byte 0x0203841e -_08108F44: .4byte sub_80A656C + 1 -_08108F48: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8108F08 thumb_func_start sub_8108F4C @@ -541850,13 +523765,13 @@ sub_8108F4C: @ 8108F4C push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, _08108F80 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08108F88 - ldr r2, _08108F84 + ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] subs r0, r1 @@ -541871,10 +523786,9 @@ sub_8108F4C: @ 8108F4C adds r1, r2, 0 b _08108F9E .align 2, 0 -_08108F80: .4byte 0x02038436 -_08108F84: .4byte 0x0203841e + .pool _08108F88: - ldr r1, _08108FB4 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -541892,27 +523806,26 @@ _08108F9E: strh r0, [r4, 0x36] ldrh r0, [r1, 0xA] strh r0, [r4, 0x34] - ldr r0, _08108FB8 + ldr r0, =sub_8109028 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08108FB4: .4byte 0x0203841e -_08108FB8: .4byte sub_8109028 + 1 + .pool thumb_func_end sub_8108F4C thumb_func_start sub_8108FBC sub_8108FBC: @ 8108FBC push {r4,lr} adds r4, r0, 0 - ldr r0, _08108FE8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08108FF0 - ldr r2, _08108FEC + ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] subs r0, r1 @@ -541926,10 +523839,9 @@ sub_8108FBC: @ 8108FBC adds r1, r2, 0 b _08109008 .align 2, 0 -_08108FE8: .4byte 0x02038436 -_08108FEC: .4byte 0x0203841e + .pool _08108FF0: - ldr r1, _08109020 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -541948,14 +523860,13 @@ _08109008: strh r0, [r4, 0x36] ldrh r0, [r1, 0xA] strh r0, [r4, 0x34] - ldr r0, _08109024 + ldr r0, =sub_8109028 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08109020: .4byte 0x0203841e -_08109024: .4byte sub_8109028 + 1 + .pool thumb_func_end sub_8108FBC thumb_func_start sub_8109028 @@ -541998,23 +523909,22 @@ sub_8109064: @ 8109064 push {r4,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r0, _08109088 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08109090 - ldr r0, _0810908C + ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r2, [r0] subs r1, r2 strh r1, [r4, 0x20] b _081090A2 .align 2, 0 -_08109088: .4byte 0x02038436 -_0810908C: .4byte 0x0203841e + .pool _08109090: - ldr r0, _081090D0 + ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r4, 0x20] adds r1, r2 @@ -542041,14 +523951,13 @@ _081090A2: ldrh r0, [r2, 0xC] strh r0, [r4, 0x36] strh r1, [r4, 0x38] - ldr r0, _081090D4 + ldr r0, =sub_81090D8 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081090D0: .4byte 0x0203841e -_081090D4: .4byte sub_81090D8 + 1 + .pool thumb_func_end sub_8109064 thumb_func_start sub_81090D8 @@ -542061,7 +523970,7 @@ sub_81090D8: @ 81090D8 beq _08109160 movs r2, 0x38 ldrsh r1, [r4, r2] - ldr r0, _08109144 + ldr r0, =0x00002710 cmp r1, r0 ble _081090F6 adds r1, r4, 0 @@ -542103,11 +524012,10 @@ _081090F6: asrs r0, 16 cmp r0, 0xFF ble _0810914C - ldr r2, _08109148 + ldr r2, =0xffffff00 b _08109154 .align 2, 0 -_08109144: .4byte 0x00002710 -_08109148: .4byte 0xffffff00 + .pool _0810914C: cmp r0, 0 bge _08109158 @@ -542142,26 +524050,25 @@ sub_810916C: @ 810916C strh r1, [r0, 0x32] movs r1, 0x50 strh r1, [r0, 0x36] - ldr r1, _08109190 + ldr r1, =sub_80A6EEC + 1 str r1, [r0, 0x1C] - ldr r1, _08109194 + ldr r1, =move_anim_8072740 + 1 bl oamt_set_x3A_32 pop {r0} bx r0 .align 2, 0 -_08109190: .4byte sub_80A6EEC + 1 -_08109194: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810916C thumb_func_start sub_8109198 sub_8109198: @ 8109198 push {r4-r6,lr} adds r6, r0, 0 - ldr r5, _081091F0 + ldr r5, =0x02038436 ldrb r0, [r5] bl battle_side_get_owner adds r4, r0, 0 - ldr r0, _081091F4 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r4, 24 @@ -542183,12 +524090,12 @@ sub_8109198: @ 8109198 cmp r1, r0 bne _081091DE _081091D6: - ldr r1, _081091F8 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] _081091DE: - ldr r1, _081091FC + ldr r1, =sub_80A7938 + 1 str r1, [r6, 0x1C] adds r0, r6, 0 bl _call_via_r1 @@ -542196,27 +524103,23 @@ _081091DE: pop {r0} bx r0 .align 2, 0 -_081091F0: .4byte 0x02038436 -_081091F4: .4byte 0x02038437 -_081091F8: .4byte 0x0203841e -_081091FC: .4byte sub_80A7938 + 1 + .pool thumb_func_end sub_8109198 thumb_func_start sub_8109200 sub_8109200: @ 8109200 - ldr r2, _08109214 + ldr r2, =0x0203841e ldrh r1, [r2] negs r1, r1 strh r1, [r2] ldrh r1, [r2, 0x4] negs r1, r1 strh r1, [r2, 0x4] - ldr r1, _08109218 + ldr r1, =sub_80A7938 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_08109214: .4byte 0x0203841e -_08109218: .4byte sub_80A7938 + 1 + .pool thumb_func_end sub_8109200 thumb_func_start sub_810921C @@ -542225,19 +524128,18 @@ sub_810921C: @ 810921C adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _0810923C + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] movs r1, 0 strh r0, [r4, 0x3C] strh r1, [r4, 0x2E] - ldr r0, _08109240 + ldr r0, =sub_8109244 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810923C: .4byte 0x0203841e -_08109240: .4byte sub_8109244 + 1 + .pool thumb_func_end sub_810921C thumb_func_start sub_8109244 @@ -542256,7 +524158,7 @@ sub_8109244: @ 8109244 strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, _08109294 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -542273,15 +524175,14 @@ sub_8109244: @ 8109244 strh r0, [r5, 0x36] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, _08109298 + ldr r0, =sub_810929C + 1 str r0, [r5, 0x1C] _0810928E: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08109294: .4byte 0x02038437 -_08109298: .4byte sub_810929C + 1 + .pool thumb_func_end sub_8109244 thumb_func_start sub_810929C @@ -542294,7 +524195,7 @@ sub_810929C: @ 810929C beq _081092E4 movs r4, 0 strh r4, [r6, 0x2E] - ldr r5, _081092DC + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -542309,14 +524210,13 @@ sub_810929C: @ 810929C strh r0, [r6, 0x22] strh r4, [r6, 0x26] strh r4, [r6, 0x24] - ldr r1, _081092E0 + ldr r1, =sub_8109314 + 1 str r1, [r6, 0x1C] adds r0, r6, 0 bl _call_via_r1 b _0810930E .align 2, 0 -_081092DC: .4byte 0x02038437 -_081092E0: .4byte sub_8109314 + 1 + .pool _081092E4: movs r1, 0x3C ldrsh r0, [r6, r1] @@ -542391,7 +524291,7 @@ sub_8109338: @ 8109338 sub_8109364: @ 8109364 push {r4,lr} adds r4, r0, 0 - ldr r1, _08109398 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -542406,18 +524306,16 @@ sub_8109364: @ 8109364 strh r0, [r4, 0x30] ldrh r0, [r1, 0x8] strh r0, [r4, 0x32] - ldr r1, _0810939C + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _081093A0 + ldr r0, =sub_80A653C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08109398: .4byte 0x0203841e -_0810939C: .4byte move_anim_8072740 + 1 -_081093A0: .4byte sub_80A653C + 1 + .pool thumb_func_end sub_8109364 thumb_func_start sub_81093A4 @@ -542426,7 +524324,7 @@ sub_81093A4: @ 81093A4 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r1, _081093D8 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] strh r0, [r4, 0x30] ldrh r0, [r1, 0x6] @@ -542437,18 +524335,16 @@ sub_81093A4: @ 81093A4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _081093DC + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] - ldr r1, _081093E0 + ldr r1, =sub_81093E4 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_081093D8: .4byte 0x0203841e -_081093DC: .4byte sub_80A64B0 + 1 -_081093E0: .4byte sub_81093E4 + 1 + .pool thumb_func_end sub_81093A4 thumb_func_start sub_81093E4 @@ -542465,13 +524361,13 @@ sub_81093E4: @ 81093E4 movs r2, 0 strh r1, [r0, 0x2E] strh r2, [r0, 0x30] - ldr r1, _08109408 + ldr r1, =sub_810940C + 1 str r1, [r0, 0x1C] bl _call_via_r1 pop {r0} bx r0 .align 2, 0 -_08109408: .4byte sub_810940C + 1 + .pool thumb_func_end sub_81093E4 thumb_func_start sub_810940C @@ -542525,7 +524421,7 @@ sub_8109460: @ 8109460 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081094C0 + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 bl obj_id_for_side_relative_to_move @@ -542537,7 +524433,7 @@ sub_8109460: @ 8109460 strh r5, [r4, 0xA] strh r5, [r4, 0xC] strh r5, [r4, 0xE] - ldr r2, _081094C4 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -542546,7 +524442,7 @@ sub_8109460: @ 8109460 adds r0, r2 ldrh r0, [r0, 0x22] strh r0, [r4, 0x10] - ldr r0, _081094C8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -542558,16 +524454,13 @@ sub_8109460: @ 8109460 lsrs r0, 24 movs r1, 0 bl sub_80A7270 - ldr r0, _081094CC + ldr r0, =sub_81094D0 + 1 str r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081094C0: .4byte 0x03005e00 -_081094C4: .4byte 0x02020630 -_081094C8: .4byte 0x02038436 -_081094CC: .4byte sub_81094D0 + 1 + .pool thumb_func_end sub_8109460 thumb_func_start sub_81094D0 @@ -542579,7 +524472,7 @@ sub_81094D0: @ 81094D0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081094F8 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -542588,13 +524481,12 @@ sub_81094D0: @ 81094D0 b _081097AA _081094EC: lsls r0, 2 - ldr r1, _081094FC + ldr r1, =_08109500 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081094F8: .4byte 0x03005e00 -_081094FC: .4byte _08109500 + .pool .align 2, 0 _08109500: .4byte _0810951C @@ -542640,7 +524532,7 @@ _08109542: ands r0, r1 cmp r0, 0 beq _08109578 - ldr r2, _08109574 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -542650,16 +524542,16 @@ _08109542: movs r1, 0x3 b _08109588 .align 2, 0 -_08109574: .4byte 0x02020630 + .pool _08109578: - ldr r2, _081095EC + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081095F0 + ldr r1, =0x0000fffd _08109588: strh r1, [r0, 0x24] _0810958A: @@ -542676,7 +524568,7 @@ _0810958A: ble _081095B8 movs r0, 0 strh r0, [r4, 0xE] - ldr r2, _081095EC + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -542699,7 +524591,7 @@ _081095C8: lsls r0, 24 lsrs r0, 24 bl sub_80A7E6C - ldr r2, _081095EC + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -542712,8 +524604,7 @@ _081095C8: strh r5, [r4, 0xE] b _08109790 .align 2, 0 -_081095EC: .4byte 0x02020630 -_081095F0: .4byte 0x0000fffd + .pool _081095F4: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -542796,7 +524687,7 @@ _08109672: ands r0, r1 cmp r0, 0 beq _081096AC - ldr r2, _081096A8 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -542807,9 +524698,9 @@ _08109672: adds r1, 0x3 b _081096BE .align 2, 0 -_081096A8: .4byte 0x02020630 + .pool _081096AC: - ldr r2, _081096F8 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -542848,7 +524739,7 @@ _081096C0: bl sub_80A805C b _0810971A .align 2, 0 -_081096F8: .4byte 0x02020630 + .pool _081096FC: ldrh r1, [r4, 0x26] lsls r1, 24 @@ -542870,7 +524761,7 @@ _0810971A: ands r0, r1 cmp r0, 0 beq _08109738 - ldr r2, _08109744 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -542887,13 +524778,13 @@ _08109738: strh r0, [r4, 0xE] b _08109790 .align 2, 0 -_08109744: .4byte 0x02020630 + .pool _08109748: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 beq _08109764 - ldr r2, _08109798 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -542910,7 +524801,7 @@ _08109764: lsrs r5, r0, 24 cmp r5, 0 bne _081097AA - ldr r2, _08109798 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -542930,7 +524821,7 @@ _08109790: strh r0, [r4, 0x8] b _081097AA .align 2, 0 -_08109798: .4byte 0x02020630 + .pool _0810979C: movs r1, 0x14 ldrsh r0, [r4, r1] @@ -542966,13 +524857,13 @@ sub_81097B4: @ 81097B4 lsls r0, 16 lsrs r0, 16 mov r9, r0 - ldr r1, _08109804 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 adds r0, r1 ldrh r4, [r0, 0x20] - ldr r0, _08109808 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -542985,8 +524876,7 @@ sub_81097B4: @ 81097B4 movs r0, 0x1 b _08109816 .align 2, 0 -_08109804: .4byte 0x02020630 -_08109808: .4byte 0x02038436 + .pool _0810980C: adds r0, r4, 0 adds r0, 0x10 @@ -543001,7 +524891,7 @@ _08109816: mov r1, r9 lsls r1, 16 str r1, [sp, 0x4] - ldr r2, _081098D0 + ldr r2, =0x085955cc mov r9, r2 lsls r0, 24 asrs r0, 24 @@ -543010,7 +524900,7 @@ _08109816: lsls r3, 1 mov r10, r3 _08109834: - ldr r0, _081098D4 + ldr r0, =0x085955b4 ldr r2, [sp, 0x8] asrs r1, r2, 16 ldr r3, [sp, 0x4] @@ -543021,7 +524911,7 @@ _08109834: lsrs r2, r0, 24 cmp r2, 0x40 beq _081098B6 - ldr r1, _081098D8 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -543032,10 +524922,10 @@ _08109834: lsls r0, r5, 2 adds r0, 0x40 adds r1, r0 - ldr r3, _081098DC + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r3, _081098E0 + ldr r3, =0xfffffc00 adds r0, r3, 0 ands r2, r0 orrs r2, r1 @@ -543056,7 +524946,7 @@ _0810987E: muls r1, r3 lsls r1, 16 asrs r1, 16 - ldr r0, _081098E4 + ldr r0, =0x085955ce adds r2, r0 movs r3, 0 ldrsh r2, [r2, r3] @@ -543069,7 +524959,7 @@ _0810987E: adds r0, r7 lsls r0, 3 add r0, r10 - ldr r1, _081098E8 + ldr r1, =0x03005e08 adds r0, r1 ldrh r1, [r0] adds r1, 0x1 @@ -543089,13 +524979,7 @@ _081098B6: pop {r0} bx r0 .align 2, 0 -_081098D0: .4byte 0x085955cc -_081098D4: .4byte 0x085955b4 -_081098D8: .4byte 0x02020630 -_081098DC: .4byte 0x000003ff -_081098E0: .4byte 0xfffffc00 -_081098E4: .4byte 0x085955ce -_081098E8: .4byte 0x03005e08 + .pool thumb_func_end sub_81097B4 thumb_func_start sub_81098EC @@ -543110,7 +524994,7 @@ sub_81098EC: @ 81098EC ands r0, r1 cmp r0, 0 beq _08109926 - ldr r3, _0810992C + ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -543132,7 +525016,7 @@ _08109926: pop {r0} bx r0 .align 2, 0 -_0810992C: .4byte 0x03005e00 + .pool thumb_func_end sub_81098EC thumb_func_start sub_8109930 @@ -543140,7 +525024,7 @@ sub_8109930: @ 8109930 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08109968 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -543154,7 +525038,7 @@ sub_8109930: @ 8109930 adds r0, r2 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _0810996C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -543165,8 +525049,7 @@ sub_8109930: @ 8109930 lsls r1, 15 b _08109976 .align 2, 0 -_08109968: .4byte 0x02020630 -_0810996C: .4byte 0x02038436 + .pool _08109970: lsls r0, r4, 16 movs r1, 0xB0 @@ -543264,7 +525147,7 @@ _08109A0C: thumb_func_start sub_8109A10 sub_8109A10: @ 8109A10 push {r4,r5,lr} - ldr r3, _08109A54 + ldr r3, =0x0203841e ldrh r1, [r3] movs r2, 0 strh r1, [r0, 0x20] @@ -543284,23 +525167,20 @@ sub_8109A10: @ 8109A10 ldrsh r1, [r3, r5] lsls r1, 4 adds r2, r1 - ldr r3, _08109A58 + ldr r3, =0x000003ff adds r1, r3, 0 ands r2, r1 - ldr r1, _08109A5C + ldr r1, =0xfffffc00 ands r1, r4 orrs r1, r2 strh r1, [r0, 0x4] - ldr r1, _08109A60 + ldr r1, =sub_8109A64 + 1 str r1, [r0, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08109A54: .4byte 0x0203841e -_08109A58: .4byte 0x000003ff -_08109A5C: .4byte 0xfffffc00 -_08109A60: .4byte sub_8109A64 + 1 + .pool thumb_func_end sub_8109A10 thumb_func_start sub_8109A64 @@ -543366,10 +525246,10 @@ _08109AB4: ands r0, r1 cmp r0, 0 beq _08109ADC - ldr r0, _08109AD8 + ldr r0, =0x0000fffd b _08109ADE .align 2, 0 -_08109AD8: .4byte 0x0000fffd + .pool _08109ADC: movs r0, 0x3 _08109ADE: @@ -543411,13 +525291,13 @@ _08109B18: adds r0, r5, 0 movs r1, 0 bl sub_80A69CC - ldr r4, _08109B40 + ldr r4, =0x0203841e ldrb r1, [r4, 0x4] adds r0, r5, 0 bl obj_anim_image_start ldrh r0, [r4, 0x4] strh r0, [r5, 0x3C] - ldr r0, _08109B44 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -543426,13 +525306,12 @@ _08109B18: movs r0, 0x4 b _08109B4A .align 2, 0 -_08109B40: .4byte 0x0203841e -_08109B44: .4byte 0x02038436 + .pool _08109B48: - ldr r0, _08109B68 + ldr r0, =0x0000fffc _08109B4A: strh r0, [r5, 0x36] - ldr r0, _08109B6C + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -543446,13 +525325,12 @@ _08109B4A: strb r0, [r5, 0x5] b _08109BC6 .align 2, 0 -_08109B68: .4byte 0x0000fffc -_08109B6C: .4byte 0x02038437 + .pool _08109B70: ldrh r0, [r5, 0x30] adds r0, 0xC0 strh r0, [r5, 0x30] - ldr r0, _08109B90 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -543464,7 +525342,7 @@ _08109B70: negs r0, r0 b _08109B9A .align 2, 0 -_08109B90: .4byte 0x02038436 + .pool _08109B94: ldrh r0, [r5, 0x30] lsls r0, 16 @@ -543530,7 +525408,7 @@ _08109BCE: lsls r0, 1 strh r0, [r5, 0x2E] strh r1, [r5, 0x30] - ldr r4, _08109C44 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -543547,15 +525425,14 @@ _08109BCE: strh r0, [r5, 0x36] adds r0, r5, 0 bl sub_80A6FD4 - ldr r0, _08109C48 + ldr r0, =sub_8109C4C + 1 str r0, [r5, 0x1C] _08109C3E: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08109C44: .4byte 0x02038437 -_08109C48: .4byte sub_8109C4C + 1 + .pool thumb_func_end sub_8109AFC thumb_func_start sub_8109C4C @@ -543593,14 +525470,14 @@ _08109C82: ldrsh r0, [r4, r1] cmp r0, 0 bne _08109CAA - ldr r0, _08109CA0 + ldr r0, =0x02038440 movs r1, 0 ldrsb r1, [r0, r1] movs r0, 0x90 bl audio_play_and_stuff b _08109CAA .align 2, 0 -_08109CA0: .4byte 0x02038440 + .pool _08109CA4: adds r0, r4, 0 bl move_anim_8072740 @@ -543619,7 +525496,7 @@ sub_8109CB0: @ 8109CB0 ldrsh r0, [r4, r2] cmp r0, 0 bne _08109CC8 - ldr r0, _08109D34 + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r4, 0x30] adds r0, r1, 0x1 @@ -543662,7 +525539,7 @@ _08109CC8: lsrs r0, 16 cmp r0, 0x83 bls _08109D3C - ldr r0, _08109D38 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -543676,10 +525553,9 @@ _08109CC8: strb r0, [r4, 0x5] b _08109D80 .align 2, 0 -_08109D34: .4byte 0x0203841e -_08109D38: .4byte 0x02038437 + .pool _08109D3C: - ldr r0, _08109D60 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 lsls r0, 24 @@ -543696,7 +525572,7 @@ _08109D3C: strb r1, [r4, 0x5] b _08109D80 .align 2, 0 -_08109D60: .4byte 0x02038437 + .pool _08109D64: ldrh r0, [r4, 0x30] subs r0, 0x40 @@ -543756,9 +525632,9 @@ sub_8109DBC: @ 8109DBC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08109E1C + ldr r0, =0x03005e00 adds r4, r1, r0 - ldr r0, _08109E20 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -543770,7 +525646,7 @@ sub_8109DBC: @ 8109DBC movs r1, 0x1 _08109DE2: strh r1, [r4, 0x20] - ldr r0, _08109E24 + ldr r0, =0x02038437 ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -543789,16 +525665,13 @@ _08109DE2: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r0, _08109E28 + ldr r0, =sub_8109E2C + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_08109E1C: .4byte 0x03005e00 -_08109E20: .4byte 0x02038436 -_08109E24: .4byte 0x02038437 -_08109E28: .4byte sub_8109E2C + 1 + .pool thumb_func_end sub_8109DBC thumb_func_start sub_8109E2C @@ -543809,7 +525682,7 @@ sub_8109E2C: @ 8109E2C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08109E50 + ldr r1, =0x03005e00 adds r2, r0, r1 movs r0, 0x8 ldrsh r3, [r2, r0] @@ -543821,7 +525694,7 @@ sub_8109E2C: @ 8109E2C beq _08109E62 b _0810A054 .align 2, 0 -_08109E50: .4byte 0x03005e00 + .pool _08109E54: cmp r3, 0x2 bne _08109E5A @@ -543857,7 +525730,7 @@ _08109E62: movs r0, 0x2 b _08109E92 _08109E90: - ldr r0, _08109EEC + ldr r0, =0x0000fffe _08109E92: strh r0, [r2, 0x1E] _08109E94: @@ -543867,7 +525740,7 @@ _08109E94: ldrsh r0, [r2, r7] cmp r1, r0 bge _08109ED6 - ldr r4, _08109EF0 + ldr r4, =0x02020630 adds r3, r2, 0 adds r3, 0x8 _08109EA6: @@ -543909,8 +525782,7 @@ _08109EE6: strh r0, [r2, 0x1A] b _0810A000 .align 2, 0 -_08109EEC: .4byte 0x0000fffe -_08109EF0: .4byte 0x02020630 + .pool _08109EF4: ldrh r0, [r2, 0xA] adds r0, 0x1 @@ -543931,7 +525803,7 @@ _08109EF4: movs r0, 0x2 b _08109F1A _08109F18: - ldr r0, _08109F74 + ldr r0, =0x0000fffe _08109F1A: strh r0, [r2, 0x1E] _08109F1C: @@ -543941,7 +525813,7 @@ _08109F1C: ldrsh r0, [r2, r7] cmp r1, r0 bge _08109F5E - ldr r4, _08109F78 + ldr r4, =0x02020630 adds r3, r2, 0 adds r3, 0x8 _08109F2E: @@ -543981,8 +525853,7 @@ _08109F5E: strh r0, [r2, 0x1A] b _0810A000 .align 2, 0 -_08109F74: .4byte 0x0000fffe -_08109F78: .4byte 0x02020630 + .pool _08109F7C: movs r7, 0x20 ldrsh r1, [r2, r7] @@ -544009,7 +525880,7 @@ _08109F7C: strh r3, [r2, 0x1E] b _08109FB0 _08109FAC: - ldr r0, _0810A008 + ldr r0, =0x0000fffe strh r0, [r2, 0x1E] _08109FB0: movs r1, 0 @@ -544018,7 +525889,7 @@ _08109FB0: ldrsh r0, [r2, r3] cmp r1, r0 bge _08109FF2 - ldr r4, _0810A00C + ldr r4, =0x02020630 adds r3, r2, 0 adds r3, 0x8 _08109FC2: @@ -544060,8 +525931,7 @@ _0810A000: strh r0, [r2, 0x8] b _0810A054 .align 2, 0 -_0810A008: .4byte 0x0000fffe -_0810A00C: .4byte 0x02020630 + .pool _0810A010: movs r1, 0 strh r1, [r2, 0xE] @@ -544069,7 +525939,7 @@ _0810A010: ldrsh r0, [r2, r3] cmp r1, r0 bge _0810A04E - ldr r6, _0810A05C + ldr r6, =0x02020630 adds r3, r2, 0 adds r3, 0x8 movs r5, 0 @@ -544103,7 +525973,7 @@ _0810A054: pop {r0} bx r0 .align 2, 0 -_0810A05C: .4byte 0x02020630 + .pool thumb_func_end sub_8109E2C thumb_func_start sub_810A060 @@ -544118,7 +525988,7 @@ sub_810A060: @ 810A060 mov r0, sp ldrb r0, [r0, 0x8] lsls r0, 4 - ldr r1, _0810A090 + ldr r1, =0x0203841e ldrb r2, [r1] ldrh r3, [r1, 0x2] movs r1, 0x10 @@ -544130,7 +526000,7 @@ sub_810A060: @ 810A060 pop {r0} bx r0 .align 2, 0 -_0810A090: .4byte 0x0203841e + .pool thumb_func_end sub_810A060 thumb_func_start sub_810A094 @@ -544142,7 +526012,7 @@ sub_810A094: @ 810A094 push {r5-r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _0810A0EC + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -544150,7 +526020,7 @@ sub_810A094: @ 810A094 movs r3, 0x8 ldrsh r0, [r2, r3] mov r9, r1 - ldr r4, _0810A0F0 + ldr r4, =0x0203841e mov r8, r4 cmp r0, 0 bne _0810A0CA @@ -544166,8 +526036,8 @@ _0810A0CA: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - ldr r1, _0810A0F4 - ldr r0, _0810A0F8 + ldr r1, =0x020241e4 + ldr r0, =0x02038437 ldrb r0, [r0] adds r0, r1 ldrb r6, [r0] @@ -544175,18 +526045,14 @@ _0810A0CA: ldrsh r0, [r2, r5] cmp r0, 0 bne _0810A100 - ldr r4, _0810A0FC + ldr r4, =0x08595684 movs r1, 0x8 ldrsh r0, [r2, r1] b _0810A106 .align 2, 0 -_0810A0EC: .4byte 0x03005e00 -_0810A0F0: .4byte 0x0203841e -_0810A0F4: .4byte 0x020241e4 -_0810A0F8: .4byte 0x02038437 -_0810A0FC: .4byte 0x08595684 + .pool _0810A100: - ldr r4, _0810A14C + ldr r4, =0x08595694 movs r3, 0x8 ldrsh r0, [r2, r3] _0810A106: @@ -544205,7 +526071,7 @@ _0810A106: mov r12, r0 cmp r1, 0x1 bne _0810A154 - ldr r2, _0810A150 + ldr r2, =0x02020630 lsls r3, r6, 4 adds r0, r3, r6 lsls r0, 2 @@ -544225,10 +526091,9 @@ _0810A144: strh r0, [r5, 0x26] b _0810A16E .align 2, 0 -_0810A14C: .4byte 0x08595694 -_0810A150: .4byte 0x02020630 + .pool _0810A154: - ldr r3, _0810A1A4 + ldr r3, =0x02020630 lsls r4, r6, 4 adds r2, r4, r6 lsls r2, 2 @@ -544269,30 +526134,29 @@ _0810A194: pop {r0} bx r0 .align 2, 0 -_0810A1A4: .4byte 0x02020630 + .pool thumb_func_end sub_810A094 thumb_func_start sub_810A1A8 sub_810A1A8: @ 810A1A8 push {r4,lr} adds r4, r0, 0 - ldr r0, _0810A1C8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810A1D0 - ldr r0, _0810A1CC + ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r2, [r0] subs r1, r2 strh r1, [r4, 0x20] b _0810A1DC .align 2, 0 -_0810A1C8: .4byte 0x02038436 -_0810A1CC: .4byte 0x0203841e + .pool _0810A1D0: - ldr r1, _0810A1F0 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -544303,14 +526167,13 @@ _0810A1DC: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, _0810A1F4 + ldr r0, =sub_810A1F8 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810A1F0: .4byte 0x0203841e -_0810A1F4: .4byte sub_810A1F8 + 1 + .pool thumb_func_end sub_810A1A8 thumb_func_start sub_810A1F8 @@ -544334,36 +526197,34 @@ _0810A20E: sub_810A214: @ 810A214 push {r4,lr} adds r4, r0, 0 - ldr r0, _0810A234 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810A23C - ldr r0, _0810A238 + ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r0, [r0] subs r1, r0 strh r1, [r4, 0x20] b _0810A246 .align 2, 0 -_0810A234: .4byte 0x02038436 -_0810A238: .4byte 0x0203841e + .pool _0810A23C: - ldr r0, _0810A250 + ldr r0, =0x0203841e ldrh r0, [r0] ldrh r1, [r4, 0x20] adds r0, r1 strh r0, [r4, 0x20] _0810A246: - ldr r0, _0810A254 + ldr r0, =sub_810A258 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810A250: .4byte 0x0203841e -_0810A254: .4byte sub_810A258 + 1 + .pool thumb_func_end sub_810A214 thumb_func_start sub_810A258 @@ -544387,7 +526248,7 @@ _0810A26E: sub_810A274: @ 810A274 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _0810A2B8 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -544400,13 +526261,13 @@ sub_810A274: @ 810A274 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r0, _0810A2BC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810A2C4 - ldr r2, _0810A2C0 + ldr r2, =0x0203841e ldrh r0, [r5, 0x20] ldrh r1, [r2] subs r0, r1 @@ -544417,11 +526278,9 @@ sub_810A274: @ 810A274 strh r0, [r5, 0x22] b _0810A2D8 .align 2, 0 -_0810A2B8: .4byte 0x02038437 -_0810A2BC: .4byte 0x02038436 -_0810A2C0: .4byte 0x0203841e + .pool _0810A2C4: - ldr r0, _0810A2FC + ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r5, 0x20] adds r1, r2 @@ -544440,25 +526299,23 @@ _0810A2D8: strh r0, [r5, 0x32] ldrh r0, [r2, 0x8] strh r0, [r5, 0x34] - ldr r1, _0810A300 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _0810A304 + ldr r0, =sub_80A62EC + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810A2FC: .4byte 0x0203841e -_0810A300: .4byte move_anim_8074EE0 + 1 -_0810A304: .4byte sub_80A62EC + 1 + .pool thumb_func_end sub_810A274 thumb_func_start sub_810A308 sub_810A308: @ 810A308 push {r4-r7,lr} adds r5, r0, 0 - ldr r0, _0810A320 + ldr r0, =0x0203841e movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0x1 @@ -544469,7 +526326,7 @@ sub_810A308: @ 810A308 beq _0810A32E b _0810A380 .align 2, 0 -_0810A320: .4byte 0x0203841e + .pool _0810A324: cmp r0, 0x2 beq _0810A338 @@ -544477,12 +526334,12 @@ _0810A324: beq _0810A35C b _0810A380 _0810A32E: - ldr r0, _0810A334 + ldr r0, =0x02038436 b _0810A382 .align 2, 0 -_0810A334: .4byte 0x02038436 + .pool _0810A338: - ldr r4, _0810A350 + ldr r4, =0x02038436 ldrb r0, [r4] movs r6, 0x2 eors r0, r6 @@ -544493,14 +526350,14 @@ _0810A338: ldrb r4, [r4] b _0810A384 .align 2, 0 -_0810A350: .4byte 0x02038436 + .pool _0810A354: ldrb r0, [r4] adds r4, r6, 0 eors r4, r0 b _0810A384 _0810A35C: - ldr r0, _0810A378 + ldr r0, =0x02038436 ldrb r0, [r0] movs r4, 0x2 eors r0, r4 @@ -544508,19 +526365,18 @@ _0810A35C: lsls r0, 24 cmp r0, 0 beq _0810A380 - ldr r0, _0810A37C + ldr r0, =0x02038437 ldrb r0, [r0] eors r4, r0 b _0810A384 .align 2, 0 -_0810A378: .4byte 0x02038436 -_0810A37C: .4byte 0x02038437 + .pool _0810A380: - ldr r0, _0810A3A4 + ldr r0, =0x02038437 _0810A382: ldrb r4, [r0] _0810A384: - ldr r0, _0810A3A8 + ldr r0, =0x0203841e movs r2, 0xA ldrsh r0, [r0, r2] cmp r0, 0 @@ -544535,8 +526391,7 @@ _0810A384: movs r1, 0x1 b _0810A3BE .align 2, 0 -_0810A3A4: .4byte 0x02038437 -_0810A3A8: .4byte 0x0203841e + .pool _0810A3AC: adds r0, r4, 0 movs r1, 0x2 @@ -544551,8 +526406,8 @@ _0810A3BE: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r7, _0810A45C - ldr r6, _0810A460 + ldr r7, =0x08329f40 + ldr r6, =0x0203841e movs r1, 0 ldrsh r0, [r6, r1] lsls r0, 1 @@ -544604,7 +526459,7 @@ _0810A422: lsls r0, r1, 1 adds r0, r7 ldrh r0, [r0] - ldr r3, _0810A464 + ldr r3, =0x02021bc0 lsls r2, 3 adds r2, r3 adds r1, 0x40 @@ -544620,16 +526475,13 @@ _0810A422: strh r0, [r2, 0x4] ldrh r0, [r6, 0x6] strh r0, [r5, 0x2E] - ldr r0, _0810A468 + ldr r0, =sub_810E2C8 + 1 str r0, [r5, 0x1C] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0810A45C: .4byte 0x08329f40 -_0810A460: .4byte 0x0203841e -_0810A464: .4byte 0x02021bc0 -_0810A468: .4byte sub_810E2C8 + 1 + .pool thumb_func_end sub_810A308 thumb_func_start sub_810A46C @@ -544638,12 +526490,12 @@ sub_810A46C: @ 810A46C adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r5, _0810A4E0 + ldr r5, =0x0203841e ldrh r0, [r5, 0x6] strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r6, _0810A4E4 + ldr r6, =0x02038437 ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -544673,14 +526525,14 @@ sub_810A46C: @ 810A46C ldrsh r0, [r5, r3] lsls r0, 2 adds r1, r0 - ldr r3, _0810A4E8 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _0810A4EC + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - ldr r1, _0810A4F0 + ldr r1, =sub_810A4F4 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -544688,11 +526540,7 @@ sub_810A46C: @ 810A46C pop {r0} bx r0 .align 2, 0 -_0810A4E0: .4byte 0x0203841e -_0810A4E4: .4byte 0x02038437 -_0810A4E8: .4byte 0x000003ff -_0810A4EC: .4byte 0xfffffc00 -_0810A4F0: .4byte sub_810A4F4 + 1 + .pool thumb_func_end sub_810A46C thumb_func_start sub_810A4F4 @@ -544807,24 +526655,24 @@ sub_810A5BC: @ 810A5BC lsls r0, 24 cmp r0, 0 bne _0810A5D8 - ldr r0, _0810A61C + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0810A5E0 _0810A5D8: - ldr r1, _0810A620 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 strh r0, [r1, 0x2] _0810A5E0: - ldr r5, _0810A61C + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 - ldr r4, _0810A620 + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4, 0x2] adds r0, r1 @@ -544842,22 +526690,20 @@ _0810A5E0: ldrh r0, [r4, 0x6] strh r0, [r6, 0x36] strh r0, [r6, 0x38] - ldr r0, _0810A624 + ldr r0, =sub_810A56C + 1 str r0, [r6, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810A61C: .4byte 0x02038437 -_0810A620: .4byte 0x0203841e -_0810A624: .4byte sub_810A56C + 1 + .pool thumb_func_end sub_810A5BC thumb_func_start sub_810A628 sub_810A628: @ 810A628 push {r4-r6,lr} adds r5, r0, 0 - ldr r1, _0810A644 + ldr r1, =0x0203841e ldrh r0, [r1, 0x6] strh r0, [r5, 0x2E] movs r2, 0xE @@ -544867,13 +526713,12 @@ sub_810A628: @ 810A628 ands r0, r1 cmp r0, 0 beq _0810A64C - ldr r0, _0810A648 + ldr r0, =0x02038437 b _0810A64E .align 2, 0 -_0810A644: .4byte 0x0203841e -_0810A648: .4byte 0x02038437 + .pool _0810A64C: - ldr r0, _0810A6D4 + ldr r0, =0x02038436 _0810A64E: ldrb r6, [r0] bl sub_80A4DF0 @@ -544886,7 +526731,7 @@ _0810A64E: cmp r0, 0 bne _0810A66E _0810A666: - ldr r1, _0810A6D8 + ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] @@ -544895,7 +526740,7 @@ _0810A66E: movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 - ldr r4, _0810A6D8 + ldr r4, =0x0203841e lsrs r0, 24 ldrh r3, [r4] adds r0, r3 @@ -544909,7 +526754,7 @@ _0810A66E: adds r0, r1 strh r0, [r5, 0x22] ldrh r1, [r4, 0xE] - ldr r0, _0810A6DC + ldr r0, =0x00007fff ands r0, r1 strh r0, [r5, 0x36] ldrh r0, [r4, 0x4] @@ -544925,14 +526770,14 @@ _0810A66E: ldrsh r0, [r4, r3] lsls r0, 2 adds r1, r0 - ldr r3, _0810A6E0 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _0810A6E4 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - ldr r1, _0810A6E8 + ldr r1, =sub_810A6EC + 1 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -544940,12 +526785,7 @@ _0810A66E: pop {r0} bx r0 .align 2, 0 -_0810A6D4: .4byte 0x02038436 -_0810A6D8: .4byte 0x0203841e -_0810A6DC: .4byte 0x00007fff -_0810A6E0: .4byte 0x000003ff -_0810A6E4: .4byte 0xfffffc00 -_0810A6E8: .4byte sub_810A6EC + 1 + .pool thumb_func_end sub_810A628 thumb_func_start sub_810A6EC @@ -545014,15 +526854,15 @@ sub_810A75C: @ 810A75C ldrh r2, [r4, 0x4] lsls r1, r2, 22 lsrs r1, 22 - ldr r3, _0810A798 + ldr r3, =0x0203841e movs r5, 0x6 ldrsh r0, [r3, r5] lsls r0, 2 adds r1, r0 - ldr r5, _0810A79C + ldr r5, =0x000003ff adds r0, r5, 0 ands r1, r0 - ldr r0, _0810A7A0 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] @@ -545037,9 +526877,7 @@ sub_810A75C: @ 810A75C movs r0, 0x10 b _0810A7B2 .align 2, 0 -_0810A798: .4byte 0x0203841e -_0810A79C: .4byte 0x000003ff -_0810A7A0: .4byte 0xfffffc00 + .pool _0810A7A4: cmp r0, 0x2 bne _0810A7B6 @@ -545052,21 +526890,19 @@ _0810A7B2: orrs r1, r0 strb r1, [r4, 0x3] _0810A7B6: - ldr r0, _0810A7D0 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] - ldr r0, _0810A7D4 + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] - ldr r1, _0810A7D8 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810A7D0: .4byte 0x0203841e -_0810A7D4: .4byte sub_80A64B0 + 1 -_0810A7D8: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810A75C thumb_func_start sub_810A7DC @@ -545075,17 +526911,17 @@ sub_810A7DC: @ 810A7DC adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _0810A824 + ldr r6, =0x02038437 ldrb r0, [r6] movs r1, 0 bl sub_80A5C6C - ldr r1, _0810A828 + ldr r1, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 adds r4, r1 lsls r0, 24 - ldr r5, _0810A82C + ldr r5, =0x0203841e lsrs r0, 24 ldrh r1, [r5] adds r0, r1 @@ -545100,16 +526936,13 @@ sub_810A7DC: @ 810A7DC strh r0, [r4, 0xA] ldrh r0, [r5, 0x4] strh r0, [r4, 0xC] - ldr r0, _0810A830 + ldr r0, =sub_810A834 + 1 str r0, [r4] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810A824: .4byte 0x02038437 -_0810A828: .4byte 0x03005e00 -_0810A82C: .4byte 0x0203841e -_0810A830: .4byte sub_810A834 + 1 + .pool thumb_func_end sub_810A7DC thumb_func_start sub_810A834 @@ -545125,7 +526958,7 @@ sub_810A834: @ 810A834 mov r9, r0 movs r5, 0 movs r7, 0 - ldr r1, _0810A874 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r9 lsls r0, 3 @@ -545146,7 +526979,7 @@ sub_810A834: @ 810A834 mov r12, r1 b _0810A882 .align 2, 0 -_0810A874: .4byte 0x03005e00 + .pool _0810A878: movs r2, 0x10 mov r12, r2 @@ -545165,12 +526998,12 @@ _0810A882: cmp r0, 0xA bhi _0810A978 lsls r0, 2 - ldr r1, _0810A8A0 + ldr r1, =_0810A8A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0810A8A0: .4byte _0810A8A4 + .pool .align 2, 0 _0810A8A4: .4byte _0810A8D0 @@ -545185,7 +527018,7 @@ _0810A8A4: .4byte _0810A978 .4byte _0810A970 _0810A8D0: - ldr r0, _0810A8E0 + ldr r0, =0x08595828 lsls r1, r4, 16 asrs r1, 16 lsls r2, r6, 16 @@ -545194,7 +527027,7 @@ _0810A8D0: lsls r3, r4, 16 b _0810A952 .align 2, 0 -_0810A8E0: .4byte 0x08595828 + .pool _0810A8E4: mov r0, r12 lsls r3, r0, 17 @@ -545203,14 +527036,14 @@ _0810A8E4: lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _0810A900 + ldr r0, =0x08595828 lsls r1, r4, 16 asrs r1, 16 lsls r2, r6, 16 asrs r2, 16 b _0810A952 .align 2, 0 -_0810A900: .4byte 0x08595828 + .pool _0810A904: mov r3, r12 lsls r0, r3, 16 @@ -545232,14 +527065,14 @@ _0810A91A: lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _0810A938 + ldr r0, =0x08595828 lsls r1, r4, 16 asrs r1, 16 lsls r2, r6, 16 asrs r2, 16 b _0810A952 .align 2, 0 -_0810A938: .4byte 0x08595828 + .pool _0810A93C: mov r1, r12 lsls r0, r1, 16 @@ -545247,7 +527080,7 @@ _0810A93C: lsls r3, r0, 2 adds r3, r0 _0810A946: - ldr r0, _0810A96C + ldr r0, =0x08595828 lsls r1, r4, 16 asrs r1, 16 lsls r2, r6, 16 @@ -545267,7 +527100,7 @@ _0810A952: lsrs r7, r0, 24 b _0810A978 .align 2, 0 -_0810A96C: .4byte 0x08595828 + .pool _0810A970: mov r0, r9 bl move_anim_task_del @@ -545275,7 +527108,7 @@ _0810A970: _0810A978: cmp r7, 0 beq _0810A9AC - ldr r4, _0810A9CC + ldr r4, =0x02020630 lsls r3, r5, 4 adds r3, r5 lsls r3, 2 @@ -545284,10 +527117,10 @@ _0810A978: lsls r2, r5, 22 lsrs r2, 22 add r2, r8 - ldr r6, _0810A9D0 + ldr r6, =0x000003ff adds r1, r6, 0 ands r2, r1 - ldr r1, _0810A9D4 + ldr r1, =0xfffffc00 ands r1, r5 orrs r1, r2 strh r1, [r0, 0x4] @@ -545299,7 +527132,7 @@ _0810A978: ldr r1, [r3] bl _call_via_r1 _0810A9AC: - ldr r0, _0810A9D8 + ldr r0, =0x03005e00 mov r1, r10 add r1, r9 lsls r1, 3 @@ -545317,10 +527150,7 @@ _0810A9BC: pop {r0} bx r0 .align 2, 0 -_0810A9CC: .4byte 0x02020630 -_0810A9D0: .4byte 0x000003ff -_0810A9D4: .4byte 0xfffffc00 -_0810A9D8: .4byte 0x03005e00 + .pool thumb_func_end sub_810A834 thumb_func_start sub_810A9DC @@ -545372,7 +527202,7 @@ _0810AA26: sub_810AA2C: @ 810AA2C push {r4-r7,lr} adds r4, r0, 0 - ldr r0, _0810AA94 + ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r4, 0x20] adds r1, r2 @@ -545381,7 +527211,7 @@ sub_810AA2C: @ 810AA2C ldrh r3, [r4, 0x22] adds r0, r3 strh r0, [r4, 0x22] - ldr r0, _0810AA98 + ldr r0, =0x08595840 adds r1, 0x20 lsls r1, 16 asrs r1, 16 @@ -545393,7 +527223,7 @@ sub_810AA2C: @ 810AA2C bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r3, _0810AA9C + ldr r3, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -545402,33 +527232,27 @@ sub_810AA2C: @ 810AA2C lsls r1, r5, 22 lsrs r1, 22 adds r1, 0x8 - ldr r7, _0810AAA0 + ldr r7, =0x000003ff adds r0, r7, 0 ands r1, r0 - ldr r0, _0810AAA4 + ldr r0, =0xfffffc00 ands r0, r5 orrs r0, r1 strh r0, [r6, 0x4] - ldr r1, _0810AAA8 + ldr r1, =0x020383fe ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] adds r3, 0x1C adds r2, r3 - ldr r0, _0810AAAC + ldr r0, =sub_810AAB0 + 1 str r0, [r2] str r0, [r4, 0x1C] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0810AA94: .4byte 0x0203841e -_0810AA98: .4byte 0x08595840 -_0810AA9C: .4byte 0x02020630 -_0810AAA0: .4byte 0x000003ff -_0810AAA4: .4byte 0xfffffc00 -_0810AAA8: .4byte 0x020383fe -_0810AAAC: .4byte sub_810AAB0 + 1 + .pool thumb_func_end sub_810AA2C thumb_func_start sub_810AAB0 @@ -545482,21 +527306,19 @@ sub_810AAFC: @ 810AAFC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0810AB1C + ldr r0, =0x03005e00 adds r5, r1, r0 - ldr r0, _0810AB20 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _0810AB28 - ldr r4, _0810AB24 + ldr r4, =0x02038436 b _0810AB2A .align 2, 0 -_0810AB1C: .4byte 0x03005e00 -_0810AB20: .4byte 0x0203841e -_0810AB24: .4byte 0x02038436 + .pool _0810AB28: - ldr r4, _0810AB6C + ldr r4, =0x02038437 _0810AB2A: ldrb r0, [r4] movs r1, 0x2 @@ -545510,7 +527332,7 @@ _0810AB2A: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x26] - ldr r2, _0810AB70 + ldr r2, =0x0203841e ldrh r0, [r2, 0x2] movs r1, 0 strh r0, [r5, 0x14] @@ -545523,15 +527345,13 @@ _0810AB2A: strh r1, [r5, 0x20] ldrh r0, [r2, 0x4] strh r0, [r5, 0x22] - ldr r0, _0810AB74 + ldr r0, =sub_810AB78 + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810AB6C: .4byte 0x02038437 -_0810AB70: .4byte 0x0203841e -_0810AB74: .4byte sub_810AB78 + 1 + .pool thumb_func_end sub_810AAFC thumb_func_start sub_810AB78 @@ -545543,7 +527363,7 @@ sub_810AB78: @ 810AB78 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0810AC60 + ldr r1, =0x03005e00 adds r5, r0, r1 movs r1, 0x14 ldrsh r0, [r5, r1] @@ -545560,7 +527380,7 @@ sub_810AB78: @ 810AB78 cmp r0, r1 ble _0810AC86 strh r7, [r5, 0x20] - ldr r0, _0810AC64 + ldr r0, =0x085958a8 movs r3, 0x24 ldrsh r1, [r5, r3] movs r3, 0x26 @@ -545574,9 +527394,9 @@ sub_810AB78: @ 810AB78 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0810AC68 + ldr r0, =0x02020630 adds r4, r0 - ldr r1, _0810AC6C + ldr r1, =0x08595858 movs r2, 0x1A ldrsh r0, [r5, r2] lsls r0, 1 @@ -545612,10 +527432,10 @@ sub_810AB78: @ 810AB78 strh r6, [r4, 0x38] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, _0810AC70 + ldr r1, =sub_810ACC0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _0810AC74 + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] ldrh r0, [r5, 0x1A] adds r0, 0x1 @@ -545652,12 +527472,7 @@ _0810AC52: strh r0, [r5, 0x14] b _0810AC86 .align 2, 0 -_0810AC60: .4byte 0x03005e00 -_0810AC64: .4byte 0x085958a8 -_0810AC68: .4byte 0x02020630 -_0810AC6C: .4byte 0x08595858 -_0810AC70: .4byte sub_810ACC0 + 1 -_0810AC74: .4byte sub_80A67D8 + 1 + .pool _0810AC78: movs r1, 0x16 ldrsh r0, [r5, r1] @@ -545679,7 +527494,7 @@ sub_810AC8C: @ 810AC8C lsls r0, 24 cmp r0, 0 beq _0810ACB4 - ldr r2, _0810ACBC + ldr r2, =0x03005e00 movs r0, 0x38 ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -545696,7 +527511,7 @@ _0810ACB4: pop {r0} bx r0 .align 2, 0 -_0810ACBC: .4byte 0x03005e00 + .pool thumb_func_end sub_810AC8C thumb_func_start sub_810ACC0 @@ -545705,31 +527520,30 @@ sub_810ACC0: @ 810ACC0 adds r4, r0, 0 movs r1, 0x1 bl obj_anim_image_start - ldr r0, _0810ACD4 + ldr r0, =sub_810AC8C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810ACD4: .4byte sub_810AC8C + 1 + .pool thumb_func_end sub_810ACC0 thumb_func_start sub_810ACD8 sub_810ACD8: @ 810ACD8 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0810ACEC + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _0810ACF4 - ldr r4, _0810ACF0 + ldr r4, =0x02038436 b _0810ACF6 .align 2, 0 -_0810ACEC: .4byte 0x0203841e -_0810ACF0: .4byte 0x02038436 + .pool _0810ACF4: - ldr r4, _0810AD24 + ldr r4, =0x02038437 _0810ACF6: ldrb r0, [r4] movs r1, 0x2 @@ -545743,36 +527557,33 @@ _0810ACF6: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r1, _0810AD28 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _0810AD2C + ldr r0, =sub_80A67BC + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810AD24: .4byte 0x02038437 -_0810AD28: .4byte move_anim_8074EE0 + 1 -_0810AD2C: .4byte sub_80A67BC + 1 + .pool thumb_func_end sub_810ACD8 thumb_func_start sub_810AD30 sub_810AD30: @ 810AD30 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0810AD44 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _0810AD4C - ldr r4, _0810AD48 + ldr r4, =0x02038436 b _0810AD4E .align 2, 0 -_0810AD44: .4byte 0x0203841e -_0810AD48: .4byte 0x02038436 + .pool _0810AD4C: - ldr r4, _0810AD88 + ldr r4, =0x02038437 _0810AD4E: ldrb r0, [r4] movs r1, 0x2 @@ -545786,24 +527597,21 @@ _0810AD4E: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r1, _0810AD8C + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] strh r0, [r5, 0x24] ldrh r0, [r1, 0x4] strh r0, [r5, 0x26] - ldr r1, _0810AD90 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _0810AD94 + ldr r0, =sub_80A67D8 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810AD88: .4byte 0x02038437 -_0810AD8C: .4byte 0x0203841e -_0810AD90: .4byte move_anim_8072740 + 1 -_0810AD94: .4byte sub_80A67D8 + 1 + .pool thumb_func_end sub_810AD30 thumb_func_start sub_810AD98 @@ -545812,7 +527620,7 @@ sub_810AD98: @ 810AD98 adds r5, r0, 0 movs r1, 0x1 bl sub_8008258 - ldr r4, _0810ADF0 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -545843,14 +527651,13 @@ sub_810AD98: @ 810AD98 negs r0, r0 strh r0, [r5, 0x3C] _0810ADE6: - ldr r0, _0810ADF4 + ldr r0, =sub_810ADF8 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810ADF0: .4byte 0x02038436 -_0810ADF4: .4byte sub_810ADF8 + 1 + .pool thumb_func_end sub_810AD98 thumb_func_start sub_810ADF8 @@ -545881,7 +527688,7 @@ _0810AE20: ldrh r1, [r4, 0x20] adds r0, r2, r1 strh r0, [r4, 0x20] - ldr r3, _0810AE58 + ldr r3, =0x02020630 movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -545905,7 +527712,7 @@ _0810AE50: pop {r0} bx r0 .align 2, 0 -_0810AE58: .4byte 0x02020630 + .pool thumb_func_end sub_810ADF8 thumb_func_start sub_810AE5C @@ -545916,7 +527723,7 @@ sub_810AE5C: @ 810AE5C lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _0810AE80 + ldr r1, =0x03005e00 adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -545928,7 +527735,7 @@ sub_810AE5C: @ 810AE5C beq _0810AE90 b _0810AFC0 .align 2, 0 -_0810AE80: .4byte 0x03005e00 + .pool _0810AE84: cmp r0, 0x2 beq _0810AF4C @@ -545944,7 +527751,7 @@ _0810AE90: lsrs r0, 24 movs r6, 0 strh r0, [r5, 0x26] - ldr r4, _0810AEC4 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -545956,20 +527763,19 @@ _0810AE90: lsls r0, 24 cmp r0, 0 bne _0810AECC - ldr r0, _0810AEC8 + ldr r0, =0x0000ffe0 strh r0, [r5, 0x24] movs r0, 0x2 b _0810AED2 .align 2, 0 -_0810AEC4: .4byte 0x02038436 -_0810AEC8: .4byte 0x0000ffe0 + .pool _0810AECC: movs r0, 0x20 strh r0, [r5, 0x24] - ldr r0, _0810AEE8 + ldr r0, =0x0000fffe _0810AED2: strh r0, [r5, 0x22] - ldr r2, _0810AEEC + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -545980,8 +527786,7 @@ _0810AED2: strh r1, [r0, 0x24] b _0810AF92 .align 2, 0 -_0810AEE8: .4byte 0x0000fffe -_0810AEEC: .4byte 0x02020630 + .pool _0810AEF0: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -545992,7 +527797,7 @@ _0810AEF0: ble _0810AFC0 movs r0, 0 strh r0, [r5, 0xA] - ldr r4, _0810AF48 + ldr r4, =0x02020630 movs r1, 0x26 ldrsh r0, [r5, r1] lsls r2, r0, 4 @@ -546028,7 +527833,7 @@ _0810AEF0: strh r2, [r0, 0x24] b _0810AFC0 .align 2, 0 -_0810AF48: .4byte 0x02020630 + .pool _0810AF4C: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -546039,7 +527844,7 @@ _0810AF4C: ble _0810AFC0 movs r0, 0 strh r0, [r5, 0xA] - ldr r1, _0810AF9C + ldr r1, =0x02020630 movs r2, 0x26 ldrsh r0, [r5, r2] lsls r2, r0, 4 @@ -546071,9 +527876,9 @@ _0810AF92: strh r0, [r5, 0x8] b _0810AFC0 .align 2, 0 -_0810AF9C: .4byte 0x02020630 + .pool _0810AFA0: - ldr r2, _0810AFC8 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -546093,7 +527898,7 @@ _0810AFC0: pop {r0} bx r0 .align 2, 0 -_0810AFC8: .4byte 0x02020630 + .pool thumb_func_end sub_810AE5C thumb_func_start sub_810AFCC @@ -546104,7 +527909,7 @@ sub_810AFCC: @ 810AFCC lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0810AFF0 + ldr r1, =0x03005e00 adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -546118,7 +527923,7 @@ _0810AFE6: beq _0810AFFC b _0810B14E .align 2, 0 -_0810AFF0: .4byte 0x03005e00 + .pool _0810AFF4: cmp r0, 0x2 bne _0810AFFA @@ -546126,7 +527931,7 @@ _0810AFF4: _0810AFFA: b _0810B14E _0810AFFC: - ldr r4, _0810B03C + ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -546139,7 +527944,7 @@ _0810AFFC: _0810B012: movs r6, 0 strh r1, [r5, 0xA] - ldr r0, _0810B040 + ldr r0, =0x0203841e movs r1, 0 ldrsh r2, [r0, r1] adds r3, r0, 0 @@ -546155,12 +527960,10 @@ _0810B012: movs r0, 0x80 lsls r0, 1 strh r0, [r5, 0xE] - ldr r0, _0810B044 + ldr r0, =0x0000fff0 b _0810B0B0 .align 2, 0 -_0810B03C: .4byte 0x02038436 -_0810B040: .4byte 0x0203841e -_0810B044: .4byte 0x0000fff0 + .pool _0810B048: ldrb r0, [r4] movs r1, 0x2 @@ -546187,7 +527990,7 @@ _0810B070: movs r0, 0x78 subs r0, r1 strh r0, [r5, 0xE] - ldr r4, _0810B0A4 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x3 bl sub_80A5C6C @@ -546206,9 +528009,9 @@ _0810B070: strh r0, [r5, 0x10] b _0810B0E6 .align 2, 0 -_0810B0A4: .4byte 0x02038437 + .pool _0810B0A8: - ldr r0, _0810B0CC + ldr r0, =0x0000fff0 strh r0, [r5, 0xE] movs r0, 0x80 lsls r0, 1 @@ -546228,7 +528031,7 @@ _0810B0B0: strh r0, [r5, 0x12] b _0810B0E6 .align 2, 0 -_0810B0CC: .4byte 0x0000fff0 + .pool _0810B0D0: movs r0, 0 ldrsh r1, [r3, r0] @@ -546254,13 +528057,13 @@ _0810B0E6: strh r1, [r5, 0x14] b _0810B138 _0810B0FC: - ldr r0, _0810B108 + ldr r0, =0x0000ffff strh r0, [r5, 0xA] movs r0, 0x3 strh r0, [r5, 0x14] b _0810B138 .align 2, 0 -_0810B108: .4byte 0x0000ffff + .pool _0810B10C: ldrh r0, [r5, 0xC] adds r0, 0x1 @@ -546306,7 +528109,7 @@ sub_810B154: @ 810B154 adds r4, r0, 0 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _0810B1E0 + ldr r0, =0x08595a00 movs r2, 0xE ldrsh r1, [r4, r2] movs r3, 0x12 @@ -546317,7 +528120,7 @@ sub_810B154: @ 810B154 lsrs r2, r0, 24 cmp r2, 0x40 beq _0810B18A - ldr r1, _0810B1E4 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -546377,8 +528180,7 @@ _0810B1DC: movs r0, 0x1 b _0810B1EA .align 2, 0 -_0810B1E0: .4byte 0x08595a00 -_0810B1E4: .4byte 0x02020630 + .pool _0810B1E8: movs r0, 0 _0810B1EA: @@ -546398,7 +528200,7 @@ sub_810B1F0: @ 810B1F0 asrs r0, 16 cmp r0, 0xC ble _0810B230 - ldr r3, _0810B238 + ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -546424,7 +528226,7 @@ _0810B230: pop {r0} bx r0 .align 2, 0 -_0810B238: .4byte 0x03005e00 + .pool thumb_func_end sub_810B1F0 thumb_func_start sub_810B23C @@ -546439,7 +528241,7 @@ sub_810B23C: @ 810B23C beq _0810B280 b _0810B294 _0810B24E: - ldr r4, _0810B27C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -546460,7 +528262,7 @@ _0810B24E: strh r0, [r5, 0x2E] b _0810B294 .align 2, 0 -_0810B27C: .4byte 0x02038436 + .pool _0810B280: adds r0, r5, 0 adds r0, 0x3F @@ -546485,7 +528287,7 @@ sub_810B29C: @ 810B29C lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0810B2C0 + ldr r1, =0x03005e00 adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -546494,13 +528296,12 @@ sub_810B29C: @ 810B29C b _0810B428 _0810B2B6: lsls r0, 2 - ldr r1, _0810B2C4 + ldr r1, =_0810B2C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0810B2C0: .4byte 0x03005e00 -_0810B2C4: .4byte _0810B2C8 + .pool .align 2, 0 _0810B2C8: .4byte _0810B2DC @@ -546509,7 +528310,7 @@ _0810B2C8: .4byte _0810B404 .4byte _0810B414 _0810B2DC: - ldr r4, _0810B360 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -546524,7 +528325,7 @@ _0810B2DC: strh r0, [r5, 0x16] movs r0, 0x4 strh r0, [r5, 0x18] - ldr r0, _0810B364 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x2 bl sub_80A5C6C @@ -546541,7 +528342,7 @@ _0810B2DC: strh r0, [r5, 0x1A] movs r0, 0x7 strh r0, [r5, 0x10] - ldr r0, _0810B368 + ldr r0, =0x0000ffff strh r0, [r5, 0x12] movs r0, 0xC strh r0, [r5, 0x1E] @@ -546569,9 +528370,7 @@ _0810B2DC: adds r0, 0x1 b _0810B426 .align 2, 0 -_0810B360: .4byte 0x02038436 -_0810B364: .4byte 0x02038437 -_0810B368: .4byte 0x0000ffff + .pool _0810B36C: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -546643,7 +528442,7 @@ _0810B3E2: strh r0, [r5, 0x18] movs r0, 0x7 strh r0, [r5, 0x10] - ldr r0, _0810B400 + ldr r0, =0x0000ffff strh r0, [r5, 0x12] _0810B3F2: movs r1, 0x1E @@ -546653,7 +528452,7 @@ _0810B3F2: movs r0, 0x4 b _0810B426 .align 2, 0 -_0810B400: .4byte 0x0000ffff + .pool _0810B404: movs r1, 0xE ldrsh r0, [r5, r1] @@ -546688,7 +528487,7 @@ sub_810B430: @ 810B430 adds r4, r0, 0 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _0810B4F8 + ldr r0, =0x08595a30 movs r2, 0x14 ldrsh r1, [r4, r2] movs r3, 0x16 @@ -546699,7 +528498,7 @@ sub_810B430: @ 810B430 lsrs r2, r0, 24 cmp r2, 0x40 beq _0810B49C - ldr r1, _0810B4FC + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -546709,10 +528508,10 @@ sub_810B430: @ 810B430 lsrs r1, 22 ldrh r6, [r4, 0x10] adds r1, r6 - ldr r6, _0810B500 + ldr r6, =0x000003ff adds r0, r6, 0 ands r1, r0 - ldr r0, _0810B504 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] @@ -546788,10 +528587,7 @@ _0810B4E4: movs r0, 0x1 b _0810B514 .align 2, 0 -_0810B4F8: .4byte 0x08595a30 -_0810B4FC: .4byte 0x02020630 -_0810B500: .4byte 0x000003ff -_0810B504: .4byte 0xfffffc00 + .pool _0810B508: movs r3, 0x12 ldrsh r0, [r4, r3] @@ -546816,7 +528612,7 @@ sub_810B51C: @ 810B51C asrs r0, 16 cmp r0, 0xC ble _0810B552 - ldr r3, _0810B558 + ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -546838,7 +528634,7 @@ _0810B552: pop {r0} bx r0 .align 2, 0 -_0810B558: .4byte 0x03005e00 + .pool thumb_func_end sub_810B51C thumb_func_start sub_810B55C @@ -546849,7 +528645,7 @@ sub_810B55C: @ 810B55C lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0810B580 + ldr r1, =0x03005e00 adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -546861,13 +528657,13 @@ sub_810B55C: @ 810B55C beq _0810B58A b _0810B60E .align 2, 0 -_0810B580: .4byte 0x03005e00 + .pool _0810B584: cmp r0, 0x2 beq _0810B600 b _0810B60E _0810B58A: - ldr r0, _0810B5D4 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x1 bl sub_80A5C6C @@ -546889,7 +528685,7 @@ _0810B5A4: bgt _0810B5A4 strh r1, [r5, 0x24] _0810B5B4: - ldr r4, _0810B5D4 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -546904,7 +528700,7 @@ _0810B5B4: strh r0, [r5, 0x20] b _0810B5F8 .align 2, 0 -_0810B5D4: .4byte 0x02038437 + .pool _0810B5D8: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -546945,7 +528741,7 @@ sub_810B614: @ 810B614 adds r4, r0, 0 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _0810B670 + ldr r0, =0x085956c0 movs r2, 0x22 ldrsh r1, [r4, r2] movs r3, 0x24 @@ -546958,14 +528754,14 @@ sub_810B614: @ 810B614 lsrs r1, r0, 24 cmp r1, 0x40 beq _0810B658 - ldr r3, _0810B674 + ldr r3, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r1, r3, 0 adds r1, 0x1C adds r1, r0, r1 - ldr r2, _0810B678 + ldr r2, =sub_810B684 + 1 str r2, [r1] adds r0, r3 strh r5, [r0, 0x3A] @@ -546988,9 +528784,7 @@ _0810B658: movs r0, 0 b _0810B67E .align 2, 0 -_0810B670: .4byte 0x085956c0 -_0810B674: .4byte 0x02020630 -_0810B678: .4byte sub_810B684 + 1 + .pool _0810B67C: movs r0, 0x1 _0810B67E: @@ -547009,7 +528803,7 @@ sub_810B684: @ 810B684 ands r0, r1 cmp r0, 0 beq _0810B6B8 - ldr r3, _0810B6C0 + ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -547031,7 +528825,7 @@ _0810B6B8: pop {r0} bx r0 .align 2, 0 -_0810B6C0: .4byte 0x03005e00 + .pool thumb_func_end sub_810B684 thumb_func_start sub_810B6C4 @@ -547047,14 +528841,14 @@ sub_810B6C4: @ 810B6C4 lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x7 - ldr r3, _0810B7CC + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _0810B7D0 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - ldr r4, _0810B7D4 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -547067,7 +528861,7 @@ sub_810B6C4: @ 810B6C4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r4, _0810B7D8 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -547079,7 +528873,7 @@ sub_810B6C4: @ 810B6C4 bl sub_80A5C6C lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0810B7DC + ldr r1, =0x0203841e ldrh r0, [r1, 0x8] strh r0, [r5, 0x2E] ldrh r0, [r1] @@ -547156,7 +528950,7 @@ _0810B79E: movs r2, 0x98 lsls r2, 1 mov r12, r2 - ldr r1, _0810B7DC + ldr r1, =0x0203841e mov r10, r1 cmp r0, r12 bhi _0810B80A @@ -547166,11 +528960,7 @@ _0810B79E: adds r0, r1, r2 b _0810B802 .align 2, 0 -_0810B7CC: .4byte 0x000003ff -_0810B7D0: .4byte 0xfffffc00 -_0810B7D4: .4byte 0x02038437 -_0810B7D8: .4byte 0x02038436 -_0810B7DC: .4byte 0x0203841e + .pool _0810B7E0: lsls r1, r3, 16 asrs r1, 16 @@ -547213,7 +529003,7 @@ _0810B80A: strh r0, [r5, 0x34] ldrh r0, [r7, 0xC] strh r0, [r5, 0x36] - ldr r0, _0810B844 + ldr r0, =sub_810B848 + 1 str r0, [r5, 0x1C] add sp, 0x4 pop {r3-r5} @@ -547224,7 +529014,7 @@ _0810B80A: pop {r0} bx r0 .align 2, 0 -_0810B844: .4byte sub_810B848 + 1 + .pool thumb_func_end sub_810B6C4 thumb_func_start sub_810B848 @@ -547284,7 +529074,7 @@ _0810B8A6: sub_810B8AC: @ 810B8AC push {r4,lr} adds r4, r0, 0 - ldr r0, _0810B8E0 + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r4, 0x2E] movs r0, 0x3C @@ -547296,10 +529086,10 @@ sub_810B8AC: @ 810B8AC movs r0, 0xFE lsls r0, 8 strh r0, [r4, 0x36] - ldr r1, _0810B8E4 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r1, _0810B8E8 + ldr r1, =sub_80A634C + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -547307,9 +529097,7 @@ sub_810B8AC: @ 810B8AC pop {r0} bx r0 .align 2, 0 -_0810B8E0: .4byte 0x0203841e -_0810B8E4: .4byte move_anim_8072740 + 1 -_0810B8E8: .4byte sub_80A634C + 1 + .pool thumb_func_end sub_810B8AC thumb_func_start sub_810B8EC @@ -547318,68 +529106,63 @@ sub_810B8EC: @ 810B8EC adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _0810B920 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] - ldr r0, _0810B924 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810B92C - ldr r0, _0810B928 + ldr r0, =0x0203841e ldrh r1, [r4, 0x32] ldrh r0, [r0, 0x4] subs r1, r0 strh r1, [r4, 0x32] b _0810B936 .align 2, 0 -_0810B920: .4byte 0x02038437 -_0810B924: .4byte 0x02038436 -_0810B928: .4byte 0x0203841e + .pool _0810B92C: - ldr r0, _0810B964 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] ldrh r1, [r4, 0x32] adds r0, r1 strh r0, [r4, 0x32] _0810B936: - ldr r0, _0810B968 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C lsls r0, 24 - ldr r1, _0810B964 + ldr r1, =0x0203841e lsrs r0, 24 ldrh r2, [r1, 0x6] adds r0, r2 strh r0, [r4, 0x36] ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] - ldr r1, _0810B96C + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _0810B970 + ldr r0, =sub_80A6EEC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810B964: .4byte 0x0203841e -_0810B968: .4byte 0x02038437 -_0810B96C: .4byte move_anim_8072740 + 1 -_0810B970: .4byte sub_80A6EEC + 1 + .pool thumb_func_end sub_810B8EC thumb_func_start sub_810B974 sub_810B974: @ 810B974 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _0810B98C + ldr r5, =0x0203841e movs r1, 0x4 ldrsh r0, [r5, r1] cmp r0, 0 @@ -547389,9 +529172,9 @@ sub_810B974: @ 810B974 bl sub_80A6980 b _0810B9C6 .align 2, 0 -_0810B98C: .4byte 0x0203841e + .pool _0810B990: - ldr r0, _0810B9D8 + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -547399,7 +529182,7 @@ _0810B990: adds r3, 0x22 movs r1, 0x1 bl sub_80A8924 - ldr r0, _0810B9DC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -547418,19 +529201,16 @@ _0810B9B6: adds r0, r1 strh r0, [r4, 0x22] _0810B9C6: - ldr r1, _0810B9E0 + ldr r1, =sub_810B9E8 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _0810B9E4 + ldr r0, =sub_80A67BC + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810B9D8: .4byte 0x02038437 -_0810B9DC: .4byte 0x02038436 -_0810B9E0: .4byte sub_810B9E8 + 1 -_0810B9E4: .4byte sub_80A67BC + 1 + .pool thumb_func_end sub_810B974 thumb_func_start sub_810B9E8 @@ -547473,7 +529253,7 @@ sub_810BA24: @ 810BA24 adds r5, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r6, _0810BA6C + ldr r6, =0x0203841e ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] @@ -547484,7 +529264,7 @@ sub_810BA24: @ 810BA24 ldrsh r0, [r6, r1] cmp r0, 0 bne _0810BA74 - ldr r4, _0810BA70 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -547501,10 +529281,9 @@ sub_810BA24: @ 810BA24 strh r0, [r5, 0x36] b _0810BA86 .align 2, 0 -_0810BA6C: .4byte 0x0203841e -_0810BA70: .4byte 0x02038437 + .pool _0810BA74: - ldr r0, _0810BAA0 + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -547513,24 +529292,22 @@ _0810BA74: movs r1, 0x1 bl sub_80A8924 _0810BA86: - ldr r0, _0810BAA4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810BAAC - ldr r0, _0810BAA8 + ldr r0, =0x0203841e ldrh r1, [r5, 0x32] ldrh r0, [r0, 0x4] subs r1, r0 strh r1, [r5, 0x32] b _0810BAB6 .align 2, 0 -_0810BAA0: .4byte 0x02038437 -_0810BAA4: .4byte 0x02038436 -_0810BAA8: .4byte 0x0203841e + .pool _0810BAAC: - ldr r0, _0810BB54 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] ldrh r2, [r5, 0x32] adds r0, r2 @@ -547596,8 +529373,8 @@ _0810BB16: strh r0, [r5, 0x22] strh r1, [r5, 0x26] strh r1, [r5, 0x24] - ldr r6, _0810BB58 - ldr r1, _0810BB5C + ldr r6, =sub_80A718C + 1 + ldr r1, =sub_810BB60 + 1 mov r3, sp adds r2, r7, 0 movs r4, 0x7 @@ -547617,9 +529394,7 @@ _0810BB36: pop {r0} bx r0 .align 2, 0 -_0810BB54: .4byte 0x0203841e -_0810BB58: .4byte sub_80A718C + 1 -_0810BB5C: .4byte sub_810BB60 + 1 + .pool thumb_func_end sub_810BA24 thumb_func_start sub_810BB60 @@ -547639,11 +529414,11 @@ sub_810BB60: @ 810BB60 strh r5, [r4, 0x24] movs r0, 0x80 strh r0, [r4, 0x2E] - ldr r0, _0810BBBC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 - ldr r1, _0810BBC0 + ldr r1, =0x0000ffec cmp r0, 0 beq _0810BB90 movs r1, 0x14 @@ -547660,7 +529435,7 @@ _0810BB90: bl cosine strh r0, [r4, 0x36] strh r5, [r4, 0x38] - ldr r1, _0810BBC4 + ldr r1, =sub_810BBC8 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -547668,20 +529443,18 @@ _0810BB90: pop {r0} bx r0 .align 2, 0 -_0810BBBC: .4byte 0x02038436 -_0810BBC0: .4byte 0x0000ffec -_0810BBC4: .4byte sub_810BBC8 + 1 + .pool thumb_func_end sub_810BB60 thumb_func_start sub_810BBC8 sub_810BBC8: @ 810BBC8 push {r4,lr} adds r4, r0, 0 - ldr r0, _0810BC1C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 - ldr r1, _0810BC20 + ldr r1, =0x0000ffec cmp r0, 0 beq _0810BBDE movs r1, 0x14 @@ -547715,8 +529488,7 @@ _0810BBDE: strh r0, [r4, 0x38] b _0810BC42 .align 2, 0 -_0810BC1C: .4byte 0x02038436 -_0810BC20: .4byte 0x0000ffec + .pool _0810BC24: ldrh r0, [r4, 0x24] ldrh r2, [r4, 0x20] @@ -547731,14 +529503,14 @@ _0810BC24: strh r1, [r4, 0x24] strh r1, [r4, 0x36] strh r1, [r4, 0x34] - ldr r0, _0810BC48 + ldr r0, =sub_810BC4C + 1 str r0, [r4, 0x1C] _0810BC42: pop {r4} pop {r0} bx r0 .align 2, 0 -_0810BC48: .4byte sub_810BC4C + 1 + .pool thumb_func_end sub_810BBC8 thumb_func_start sub_810BC4C @@ -547788,7 +529560,7 @@ sub_810BC94: @ 810BC94 adds r5, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r1, _0810BCD8 + ldr r1, =0x0203841e ldrh r0, [r1, 0x8] strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] @@ -547799,7 +529571,7 @@ sub_810BC94: @ 810BC94 ldrsh r0, [r1, r2] cmp r0, 0 bne _0810BCE0 - ldr r4, _0810BCDC + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -547814,10 +529586,9 @@ sub_810BC94: @ 810BC94 strh r0, [r5, 0x36] b _0810BCF2 .align 2, 0 -_0810BCD8: .4byte 0x0203841e -_0810BCDC: .4byte 0x02038437 + .pool _0810BCE0: - ldr r0, _0810BD10 + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -547826,13 +529597,13 @@ _0810BCE0: movs r1, 0x1 bl sub_80A8924 _0810BCF2: - ldr r0, _0810BD14 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810BD1C - ldr r0, _0810BD18 + ldr r0, =0x0203841e ldrh r1, [r5, 0x32] ldrh r2, [r0, 0x4] subs r1, r2 @@ -547840,11 +529611,9 @@ _0810BCF2: adds r1, r0, 0 b _0810BD26 .align 2, 0 -_0810BD10: .4byte 0x02038437 -_0810BD14: .4byte 0x02038436 -_0810BD18: .4byte 0x0203841e + .pool _0810BD1C: - ldr r1, _0810BDD0 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] ldrh r2, [r5, 0x32] adds r0, r2 @@ -547914,8 +529683,8 @@ _0810BD8E: strh r0, [r5, 0x22] strh r1, [r5, 0x26] strh r1, [r5, 0x24] - ldr r1, _0810BDD0 - ldr r6, _0810BDD4 + ldr r1, =0x0203841e + ldr r6, =sub_810BDD8 + 1 mov r3, sp adds r2, r7, 0 movs r4, 0x7 @@ -547937,8 +529706,7 @@ _0810BDAE: pop {r0} bx r0 .align 2, 0 -_0810BDD0: .4byte 0x0203841e -_0810BDD4: .4byte sub_810BDD8 + 1 + .pool thumb_func_end sub_810BC94 thumb_func_start sub_810BDD8 @@ -548009,7 +529777,7 @@ sub_810BE48: @ 810BE48 ldrsh r0, [r4, r1] cmp r0, 0 bne _0810BEB4 - ldr r5, _0810BE68 + ldr r5, =0x0203841e movs r1, 0x4 ldrsh r0, [r5, r1] cmp r0, 0 @@ -548019,9 +529787,9 @@ sub_810BE48: @ 810BE48 bl sub_80A6980 b _0810BEA2 .align 2, 0 -_0810BE68: .4byte 0x0203841e + .pool _0810BE6C: - ldr r0, _0810BEAC + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -548029,7 +529797,7 @@ _0810BE6C: adds r3, 0x22 movs r1, 0 bl sub_80A8924 - ldr r0, _0810BEB0 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -548053,8 +529821,7 @@ _0810BEA2: strh r0, [r4, 0x2E] b _0810BEC8 .align 2, 0 -_0810BEAC: .4byte 0x02038437 -_0810BEB0: .4byte 0x02038436 + .pool _0810BEB4: adds r0, r4, 0 adds r0, 0x3F @@ -548075,7 +529842,7 @@ _0810BEC8: sub_810BED0: @ 810BED0 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _0810BEF0 + ldr r6, =0x0203841e movs r1, 0x8 ldrsh r0, [r6, r1] cmp r0, 0 @@ -548089,9 +529856,9 @@ sub_810BED0: @ 810BED0 bl sub_80A69CC b _0810BF32 .align 2, 0 -_0810BEF0: .4byte 0x0203841e + .pool _0810BEF4: - ldr r4, _0810BF1C + ldr r4, =0x02038436 ldrb r0, [r4] adds r2, r5, 0 adds r2, 0x20 @@ -548109,24 +529876,23 @@ _0810BEF4: subs r0, r1 b _0810BF26 .align 2, 0 -_0810BF1C: .4byte 0x02038436 + .pool _0810BF20: ldrh r0, [r6] ldrh r1, [r5, 0x20] adds r0, r1 _0810BF26: strh r0, [r5, 0x20] - ldr r0, _0810BF38 + ldr r0, =0x0203841e ldrh r0, [r0, 0x2] ldrh r1, [r5, 0x22] adds r0, r1 strh r0, [r5, 0x22] _0810BF32: - ldr r0, _0810BF3C + ldr r0, =0x02038436 b _0810BF90 .align 2, 0 -_0810BF38: .4byte 0x0203841e -_0810BF3C: .4byte 0x02038436 + .pool _0810BF40: movs r1, 0xA ldrsh r0, [r6, r1] @@ -548137,7 +529903,7 @@ _0810BF40: bl sub_80A6980 b _0810BF8E _0810BF52: - ldr r4, _0810BF78 + ldr r4, =0x02038437 ldrb r0, [r4] adds r2, r5, 0 adds r2, 0x20 @@ -548155,24 +529921,24 @@ _0810BF52: subs r0, r1 b _0810BF82 .align 2, 0 -_0810BF78: .4byte 0x02038437 + .pool _0810BF7C: ldrh r0, [r6] ldrh r1, [r5, 0x20] adds r0, r1 _0810BF82: strh r0, [r5, 0x20] - ldr r0, _0810BFAC + ldr r0, =0x0203841e ldrh r0, [r0, 0x2] ldrh r1, [r5, 0x22] adds r0, r1 strh r0, [r5, 0x22] _0810BF8E: - ldr r0, _0810BFB0 + ldr r0, =0x02038437 _0810BF90: ldrb r0, [r0] strh r0, [r5, 0x3C] - ldr r0, _0810BFAC + ldr r0, =0x0203841e movs r1, 0xA ldrsh r0, [r0, r1] cmp r0, 0 @@ -548185,13 +529951,12 @@ _0810BFA8: movs r0, 0x20 b _0810BFB6 .align 2, 0 -_0810BFAC: .4byte 0x0203841e -_0810BFB0: .4byte 0x02038437 + .pool _0810BFB4: movs r0, 0x40 _0810BFB6: strh r0, [r5, 0x3A] - ldr r0, _0810BFFC + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -548201,7 +529966,7 @@ _0810BFB6: adds r0, 0x8 strh r0, [r5, 0x22] _0810BFCC: - ldr r1, _0810C000 + ldr r1, =0x0203841e ldrh r0, [r1, 0x6] strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] @@ -548216,7 +529981,7 @@ _0810BFCC: bl obj_translate_based_on_private_1_2_3_4 movs r0, 0x40 strh r0, [r5, 0x38] - ldr r1, _0810C004 + ldr r1, =sub_810C008 + 1 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -548224,9 +529989,7 @@ _0810BFCC: pop {r0} bx r0 .align 2, 0 -_0810BFFC: .4byte 0x02038437 -_0810C000: .4byte 0x0203841e -_0810C004: .4byte sub_810C008 + 1 + .pool thumb_func_end sub_810BED0 thumb_func_start sub_810C008 @@ -548312,7 +530075,7 @@ sub_810C0A0: @ 810C0A0 sub sp, 0x10 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0810C144 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -548336,10 +530099,10 @@ sub_810C0A0: @ 810C0A0 movs r2, 0x1 bl lcd_bg_operations _0810C0E2: - ldr r0, _0810C148 + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r4, _0810C14C + ldr r4, =0x02022e1a strh r1, [r4] movs r0, 0x14 movs r1, 0 @@ -548351,42 +530114,35 @@ _0810C0E2: bl sub_80A6B30 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _0810C150 + ldr r1, =0x0854cad0 movs r2, 0x80 lsls r2, 4 mov r3, sp ldrh r3, [r3, 0xA] bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r1, _0810C154 + ldr r1, =0x08d932e0 mov r0, sp movs r2, 0 bl sub_80A6D60 - ldr r0, _0810C158 + ldr r0, =0x0854c270 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _0810C15C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0810C160 + ldr r1, =sub_810C164 + 1 str r1, [r0] add sp, 0x10 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810C144: .4byte 0x00003f42 -_0810C148: .4byte 0x02022e18 -_0810C14C: .4byte 0x02022e1a -_0810C150: .4byte 0x0854cad0 -_0810C154: .4byte 0x08d932e0 -_0810C158: .4byte 0x0854c270 -_0810C15C: .4byte 0x03005e00 -_0810C160: .4byte sub_810C164 + 1 + .pool thumb_func_end sub_810C0A0 thumb_func_start sub_810C164 @@ -548395,13 +530151,13 @@ sub_810C164: @ 810C164 sub sp, 0x10 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0810C198 - ldr r2, _0810C19C + ldr r1, =0x02022e18 + ldr r2, =0x0000ffff adds r0, r2, 0 ldrh r2, [r1] adds r0, r2 strh r0, [r1] - ldr r1, _0810C1A0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -548414,15 +530170,12 @@ sub_810C164: @ 810C164 b _0810C2DA _0810C18E: lsls r0, 2 - ldr r1, _0810C1A4 + ldr r1, =_0810C1A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0810C198: .4byte 0x02022e18 -_0810C19C: .4byte 0x0000ffff -_0810C1A0: .4byte 0x03005e00 -_0810C1A4: .4byte _0810C1A8 + .pool .align 2, 0 _0810C1A8: .4byte _0810C1BC @@ -548449,7 +530202,7 @@ _0810C1D6: ldrh r0, [r4, 0x1A] adds r0, 0x1 strh r0, [r4, 0x1A] - ldr r1, _0810C210 + ldr r1, =0x08595c5c movs r2, 0x1A ldrsh r0, [r4, r2] adds r0, r1 @@ -548473,7 +530226,7 @@ _0810C1D6: strh r5, [r4, 0x1E] b _0810C2DA .align 2, 0 -_0810C210: .4byte 0x08595c5c + .pool _0810C214: lsls r0, r4, 2 adds r0, r4 @@ -548533,7 +530286,7 @@ _0810C27A: bl sub_80A6C68 movs r0, 0x2 bl sub_80A6C68 - ldr r0, _0810C2E4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -548551,10 +530304,10 @@ _0810C29C: movs r2, 0 bl lcd_bg_operations _0810C2B0: - ldr r0, _0810C2E8 + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r0, _0810C2EC + ldr r0, =0x02022e1a strh r1, [r0] movs r0, 0x50 movs r1, 0 @@ -548574,16 +530327,14 @@ _0810C2DA: pop {r0} bx r0 .align 2, 0 -_0810C2E4: .4byte 0x03005e00 -_0810C2E8: .4byte 0x02022e18 -_0810C2EC: .4byte 0x02022e1a + .pool thumb_func_end sub_810C164 thumb_func_start sub_810C2F0 sub_810C2F0: @ 810C2F0 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _0810C31C + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -548596,14 +530347,13 @@ sub_810C2F0: @ 810C2F0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r0, _0810C320 + ldr r0, =sub_80A7820 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810C31C: .4byte 0x02038436 -_0810C320: .4byte sub_80A7820 + 1 + .pool thumb_func_end sub_810C2F0 thumb_func_start sub_810C324 @@ -548612,7 +530362,7 @@ sub_810C324: @ 810C324 sub sp, 0x10 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0810C3CC + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -548636,10 +530386,10 @@ sub_810C324: @ 810C324 movs r2, 0x1 bl lcd_bg_operations _0810C366: - ldr r0, _0810C3D0 + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r4, _0810C3D4 + ldr r4, =0x02022e1a strh r1, [r4] movs r0, 0x14 movs r1, 0 @@ -548651,45 +530401,37 @@ _0810C366: bl sub_80A6B30 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _0810C3D8 + ldr r1, =0x0854cad0 movs r2, 0x80 lsls r2, 4 mov r3, sp ldrh r3, [r3, 0xA] bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r1, _0810C3DC + ldr r1, =0x08d932e0 mov r0, sp movs r2, 0 bl sub_80A6D60 - ldr r0, _0810C3E0 + ldr r0, =0x0854c270 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _0810C3E4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0810C3E8 + ldr r1, =0x0000ffff strh r1, [r0, 0x26] - ldr r1, _0810C3EC + ldr r1, =sub_810C3F0 + 1 str r1, [r0] add sp, 0x10 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810C3CC: .4byte 0x00003f42 -_0810C3D0: .4byte 0x02022e18 -_0810C3D4: .4byte 0x02022e1a -_0810C3D8: .4byte 0x0854cad0 -_0810C3DC: .4byte 0x08d932e0 -_0810C3E0: .4byte 0x0854c270 -_0810C3E4: .4byte 0x03005e00 -_0810C3E8: .4byte 0x0000ffff -_0810C3EC: .4byte sub_810C3F0 + 1 + .pool thumb_func_end sub_810C324 thumb_func_start sub_810C3F0 @@ -548698,8 +530440,8 @@ sub_810C3F0: @ 810C3F0 sub sp, 0x10 lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _0810C420 - ldr r3, _0810C424 + ldr r2, =0x02022e18 + ldr r3, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -548715,14 +530457,12 @@ sub_810C3F0: @ 810C3F0 b _0810C54A _0810C416: lsls r0, 2 - ldr r1, _0810C428 + ldr r1, =_0810C42C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0810C420: .4byte 0x02022e18 -_0810C424: .4byte 0x03005e00 -_0810C428: .4byte _0810C42C + .pool .align 2, 0 _0810C42C: .4byte _0810C440 @@ -548738,7 +530478,7 @@ _0810C440: ldrh r0, [r4, 0x1A] adds r0, 0x1 strh r0, [r4, 0x1A] - ldr r1, _0810C480 + ldr r1, =0x08595c88 movs r5, 0x1A ldrsh r0, [r4, r5] adds r0, r1 @@ -548763,7 +530503,7 @@ _0810C440: strh r0, [r4, 0x1E] b _0810C54A .align 2, 0 -_0810C480: .4byte 0x08595c88 + .pool _0810C484: lsls r0, r4, 2 adds r0, r4 @@ -548823,7 +530563,7 @@ _0810C4EA: bl sub_80A6C68 movs r0, 0x2 bl sub_80A6C68 - ldr r0, _0810C554 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -548841,10 +530581,10 @@ _0810C50C: movs r2, 0 bl lcd_bg_operations _0810C520: - ldr r0, _0810C558 + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r0, _0810C55C + ldr r0, =0x02022e1a strh r1, [r0] movs r0, 0x50 movs r1, 0 @@ -548864,9 +530604,7 @@ _0810C54A: pop {r0} bx r0 .align 2, 0 -_0810C554: .4byte 0x03005e00 -_0810C558: .4byte 0x02022e18 -_0810C55C: .4byte 0x02022e1a + .pool thumb_func_end sub_810C3F0 thumb_func_start sub_810C560 @@ -548875,16 +530613,16 @@ sub_810C560: @ 810C560 mov r7, r8 push {r7} adds r5, r0, 0 - ldr r6, _0810C648 + ldr r6, =0x0203841e ldrh r0, [r6] strh r0, [r5, 0x2E] - ldr r0, _0810C64C + ldr r0, =0x02038436 mov r8, r0 ldrb r0, [r0] movs r1, 0x2 bl sub_80A5C6C adds r4, r0, 0 - ldr r7, _0810C650 + ldr r7, =0x02038437 ldrb r0, [r7] movs r1, 0x2 bl sub_80A5C6C @@ -548896,7 +530634,7 @@ sub_810C560: @ 810C560 lsls r0, 8 strh r0, [r5, 0x3C] _0810C594: - ldr r3, _0810C654 + ldr r3, =0x02024076 ldrb r0, [r7] adds r0, r3 ldrb r1, [r0] @@ -548928,7 +530666,7 @@ _0810C594: bne _0810C5F0 movs r0, 0x1 bl obj_id_for_side_relative_to_move - ldr r2, _0810C658 + ldr r2, =0x02020630 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -548945,7 +530683,7 @@ _0810C5F0: movs r0, 0x1 strh r0, [r5, 0x3A] _0810C5F4: - ldr r4, _0810C64C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -548958,7 +530696,7 @@ _0810C5F4: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r6, _0810C648 + ldr r6, =0x0203841e movs r1, 0xE ldrsh r0, [r6, r1] cmp r0, 0 @@ -548967,7 +530705,7 @@ _0810C5F4: ldrh r1, [r5, 0x20] adds r0, r1 strh r0, [r5, 0x30] - ldr r4, _0810C650 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -548984,17 +530722,13 @@ _0810C5F4: movs r1, 0x3 b _0810C684 .align 2, 0 -_0810C648: .4byte 0x0203841e -_0810C64C: .4byte 0x02038436 -_0810C650: .4byte 0x02038437 -_0810C654: .4byte 0x02024076 -_0810C658: .4byte 0x02020630 + .pool _0810C65C: ldrh r0, [r6, 0x2] ldrh r1, [r5, 0x20] adds r0, r1 strh r0, [r5, 0x30] - ldr r4, _0810C6CC + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -549036,7 +530770,7 @@ _0810C684: _0810C6B8: adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, _0810C6D0 + ldr r0, =sub_810C6D4 + 1 str r0, [r5, 0x1C] pop {r3} mov r8, r3 @@ -549044,8 +530778,7 @@ _0810C6B8: pop {r0} bx r0 .align 2, 0 -_0810C6CC: .4byte 0x02038437 -_0810C6D0: .4byte sub_810C6D4 + 1 + .pool thumb_func_end sub_810C560 thumb_func_start sub_810C6D4 @@ -549072,7 +530805,7 @@ _0810C6F4: _0810C6F6: adds r0, r4, 0 bl sub_80A6F3C - ldr r1, _0810C720 + ldr r1, =0x08329f40 movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 1 @@ -549091,7 +530824,7 @@ _0810C6F6: subs r0, 0x8 b _0810C728 .align 2, 0 -_0810C720: .4byte 0x08329f40 + .pool _0810C724: ldrh r0, [r4, 0x38] adds r0, 0x8 @@ -549106,7 +530839,7 @@ _0810C728: _0810C736: movs r5, 0x50 strh r5, [r4, 0x2E] - ldr r6, _0810C784 + ldr r6, =0x02038437 ldrb r0, [r6] movs r1, 0 bl sub_80A5C6C @@ -549129,7 +530862,7 @@ _0810C736: lsls r0, 24 cmp r0, 0 bne _0810C78C - ldr r1, _0810C788 + ldr r1, =0x02024076 ldrb r0, [r6] adds r0, r1 ldrb r1, [r0] @@ -549141,14 +530874,13 @@ _0810C736: strh r0, [r4, 0x38] b _0810C78E .align 2, 0 -_0810C784: .4byte 0x02038437 -_0810C788: .4byte 0x02024076 + .pool _0810C78C: strh r5, [r4, 0x38] _0810C78E: movs r0, 0 strh r0, [r4, 0x26] - ldr r1, _0810C7B8 + ldr r1, =0x08329f40 movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 1 @@ -549166,11 +530898,11 @@ _0810C78E: bl obj_translate_based_on_private_1_2_3_4 b _0810C90C .align 2, 0 -_0810C7B8: .4byte 0x08329f40 + .pool _0810C7BC: adds r0, r4, 0 bl sub_80A6F3C - ldr r1, _0810C818 + ldr r1, =0x08329f40 movs r2, 0x38 ldrsh r0, [r4, r2] lsls r0, 1 @@ -549212,7 +530944,7 @@ _0810C7BC: asrs r1, 24 b _0810C824 .align 2, 0 -_0810C818: .4byte 0x08329f40 + .pool _0810C81C: ldrh r1, [r4, 0x3C] lsls r1, 16 @@ -549277,8 +531009,8 @@ _0810C85A: lsls r0, 24 cmp r0, 0 bne _0810C8B4 - ldr r1, _0810C8AC - ldr r0, _0810C8B0 + ldr r1, =0x02024076 + ldr r0, =0x02038437 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -549290,10 +531022,9 @@ _0810C85A: lsls r0, 1 b _0810C8B6 .align 2, 0 -_0810C8AC: .4byte 0x02024076 -_0810C8B0: .4byte 0x02038437 + .pool _0810C8B4: - ldr r0, _0810C8CC + ldr r0, =0x0000fff0 _0810C8B6: strh r0, [r4, 0x32] ldrh r0, [r4, 0x3C] @@ -549306,7 +531037,7 @@ _0810C8B6: bl sub_80A6FD4 b _0810C90C .align 2, 0 -_0810C8CC: .4byte 0x0000fff0 + .pool _0810C8D0: adds r0, r4, 0 bl sub_80A6F3C @@ -549332,7 +531063,7 @@ _0810C8D0: _0810C8FE: adds r0, r4, 0 bl obj_delete_and_free_tiles - ldr r1, _0810C914 + ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] @@ -549341,7 +531072,7 @@ _0810C90C: pop {r0} bx r0 .align 2, 0 -_0810C914: .4byte 0x020383fe + .pool thumb_func_end sub_810C6D4 thumb_func_start sub_810C918 @@ -549351,14 +531082,13 @@ sub_810C918: @ 810C918 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0810C92C + ldr r0, =0x03005e00 adds r1, r0 - ldr r0, _0810C930 + ldr r0, =sub_810C934 + 1 str r0, [r1] bx lr .align 2, 0 -_0810C92C: .4byte 0x03005e00 -_0810C930: .4byte sub_810C934 + 1 + .pool thumb_func_end sub_810C918 thumb_func_start sub_810C934 @@ -549369,7 +531099,7 @@ sub_810C934: @ 810C934 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0810C958 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r5, [r4, r0] @@ -549381,7 +531111,7 @@ sub_810C934: @ 810C934 beq _0810C962 b _0810C9DC .align 2, 0 -_0810C958: .4byte 0x03005e00 + .pool _0810C95C: cmp r5, 0x2 beq _0810C9CE @@ -549479,7 +531209,7 @@ sub_810C9E4: @ 810C9E4 mov r10, r3 movs r1, 0 str r1, [sp, 0x4] - ldr r1, _0810CA5C + ldr r1, =0x08595cb4 lsrs r0, 22 adds r4, r0, r1 ldrb r0, [r4, 0x3] @@ -549518,7 +531248,7 @@ sub_810C9E4: @ 810C9E4 beq _0810CA96 b _0810CAE2 .align 2, 0 -_0810CA5C: .4byte 0x08595cb4 + .pool _0810CA60: adds r0, r5, 0 movs r1, 0x1 @@ -549590,7 +531320,7 @@ _0810CAE2: lsls r1, r7, 16 asrs r1, 16 subs r1, r0 - ldr r0, _0810CB3C + ldr r0, =0x08595d2c lsls r1, 16 asrs r1, 16 movs r2, 0x8 @@ -549604,7 +531334,7 @@ _0810CAE2: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r0, _0810CB40 + ldr r0, =0x02020630 adds r4, r0 adds r0, r4, 0 mov r1, r9 @@ -549624,8 +531354,7 @@ _0810CAE2: movs r0, 0x1 b _0810CB46 .align 2, 0 -_0810CB3C: .4byte 0x08595d2c -_0810CB40: .4byte 0x02020630 + .pool _0810CB44: movs r0, 0 _0810CB46: @@ -549671,7 +531400,7 @@ _0810CB82: ldrsh r0, [r4, r1] cmp r0, 0 bne _0810CC04 - ldr r0, _0810CBF8 + ldr r0, =0x08595b68 movs r2, 0x34 ldrsh r1, [r4, r2] movs r3, 0x36 @@ -549685,7 +531414,7 @@ _0810CB82: strh r0, [r4, 0x2E] cmp r0, 0x40 beq _0810CBE6 - ldr r2, _0810CBFC + ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -549694,7 +531423,7 @@ _0810CB82: adds r1, r2, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0810CC00 + ldr r1, =sub_810CC3C + 1 str r1, [r0] movs r3, 0x2E ldrsh r1, [r4, r3] @@ -549721,11 +531450,9 @@ _0810CBE6: bl obj_delete_and_free_tiles b _0810CC32 .align 2, 0 -_0810CBF8: .4byte 0x08595b68 -_0810CBFC: .4byte 0x02020630 -_0810CC00: .4byte sub_810CC3C + 1 + .pool _0810CC04: - ldr r3, _0810CC38 + ldr r3, =0x03005e00 movs r2, 0x3C ldrsh r1, [r4, r2] lsls r1, 1 @@ -549751,7 +531478,7 @@ _0810CC32: pop {r0} bx r0 .align 2, 0 -_0810CC38: .4byte 0x03005e00 + .pool thumb_func_end sub_810CB58 thumb_func_start sub_810CC3C @@ -549765,7 +531492,7 @@ sub_810CC3C: @ 810CC3C asrs r0, 16 cmp r0, 0x14 bne _0810CC7C - ldr r3, _0810CC84 + ldr r3, =0x03005e00 movs r0, 0x3C ldrsh r1, [r4, r0] lsls r1, 1 @@ -549791,14 +531518,14 @@ _0810CC7C: pop {r0} bx r0 .align 2, 0 -_0810CC84: .4byte 0x03005e00 + .pool thumb_func_end sub_810CC3C thumb_func_start unc_080B06FC unc_080B06FC: @ 810CC88 push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _0810CD08 + ldr r0, =0x02038400 ldr r0, [r0] ldrb r1, [r0, 0x11] lsrs r0, r1, 4 @@ -549817,10 +531544,10 @@ _0810CCA6: adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC - ldr r6, _0810CD0C + ldr r6, =0x0203841e ldrh r0, [r6, 0x8] strh r0, [r5, 0x2E] - ldr r0, _0810CD10 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -549830,7 +531557,7 @@ _0810CCA6: negs r0, r0 strh r0, [r6, 0x4] _0810CCCE: - ldr r4, _0810CD14 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -549851,17 +531578,13 @@ _0810CCCE: strh r0, [r5, 0x38] adds r0, r5, 0 bl sub_80A68D4 - ldr r0, _0810CD18 + ldr r0, =sub_810CD1C + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810CD08: .4byte 0x02038400 -_0810CD0C: .4byte 0x0203841e -_0810CD10: .4byte 0x02038436 -_0810CD14: .4byte 0x02038437 -_0810CD18: .4byte sub_810CD1C + 1 + .pool thumb_func_end unc_080B06FC thumb_func_start sub_810CD1C @@ -549875,9 +531598,9 @@ sub_810CD1C: @ 810CD1C adds r0, r4, 0 movs r1, 0x1 bl obj_anim_image_start - ldr r0, _0810CD44 + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] - ldr r1, _0810CD48 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 _0810CD3E: @@ -549885,8 +531608,7 @@ _0810CD3E: pop {r0} bx r0 .align 2, 0 -_0810CD44: .4byte sub_80A67D8 + 1 -_0810CD48: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810CD1C thumb_func_start sub_810CD4C @@ -549897,10 +531619,10 @@ sub_810CD4C: @ 810CD4C lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x8 - ldr r3, _0810CDA0 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _0810CDA4 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] @@ -549915,7 +531637,7 @@ sub_810CD4C: @ 810CD4C adds r6, r0, 0 orrs r5, r6 bl GenerateRandomNumber2 - ldr r1, _0810CDA8 + ldr r1, =0x000001ff ands r1, r0 adds r0, r1, 0 cmp r0, 0xFF @@ -549926,16 +531648,13 @@ sub_810CD4C: @ 810CD4C _0810CD92: strh r5, [r4, 0x30] strh r1, [r4, 0x32] - ldr r0, _0810CDAC + ldr r0, =sub_810CDB0 + 1 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810CDA0: .4byte 0x000003ff -_0810CDA4: .4byte 0xfffffc00 -_0810CDA8: .4byte 0x000001ff -_0810CDAC: .4byte sub_810CDB0 + 1 + .pool thumb_func_end sub_810CD4C thumb_func_start sub_810CDB0 @@ -549987,11 +531706,11 @@ sub_810CDFC: @ 810CDFC push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0810CE24 + ldr r1, =0x0203841e ldrb r3, [r1] lsls r3, 1 adds r3, r1 - ldr r1, _0810CE28 + ldr r1, =0x02038400 ldr r1, [r1] ldrb r1, [r1, 0x11] lsrs r2, r1, 4 @@ -550004,15 +531723,14 @@ sub_810CDFC: @ 810CDFC pop {r0} bx r0 .align 2, 0 -_0810CE24: .4byte 0x0203841e -_0810CE28: .4byte 0x02038400 + .pool thumb_func_end sub_810CDFC thumb_func_start unc_080B08A0 unc_080B08A0: @ 810CE2C push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _0810CE5C + ldr r5, =0x0203841e movs r0, 0 ldrsh r1, [r5, r0] adds r0, r4, 0 @@ -550023,30 +531741,28 @@ unc_080B08A0: @ 810CE2C strh r0, [r4, 0x22] movs r0, 0xF strh r0, [r4, 0x2E] - ldr r0, _0810CE60 + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] - ldr r1, _0810CE64 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810CE5C: .4byte 0x0203841e -_0810CE60: .4byte sub_80A64B0 + 1 -_0810CE64: .4byte move_anim_8072740 + 1 + .pool thumb_func_end unc_080B08A0 thumb_func_start sub_810CE68 sub_810CE68: @ 810CE68 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _0810CEAC + ldr r4, =0x0203841e movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0x1 bne _0810CE90 - ldr r0, _0810CEB0 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -550059,7 +531775,7 @@ sub_810CE68: @ 810CE68 negs r0, r0 strh r0, [r4, 0x6] _0810CE90: - ldr r4, _0810CEAC + ldr r4, =0x0203841e ldrb r1, [r4, 0xC] adds r0, r5, 0 bl obj_anim_image_start @@ -550071,8 +531787,7 @@ _0810CE90: pop {r0} bx r0 .align 2, 0 -_0810CEAC: .4byte 0x0203841e -_0810CEB0: .4byte 0x02038436 + .pool thumb_func_end sub_810CE68 thumb_func_start sub_810CEB4 @@ -550083,7 +531798,7 @@ sub_810CEB4: @ 810CEB4 lsls r0, 24 cmp r0, 0 beq _0810CED0 - ldr r0, _0810CEDC + ldr r0, =0x0203841e ldrh r1, [r0, 0x2] negs r1, r1 strh r1, [r0, 0x2] @@ -550097,14 +531812,14 @@ _0810CED0: pop {r0} bx r0 .align 2, 0 -_0810CEDC: .4byte 0x0203841e + .pool thumb_func_end sub_810CEB4 thumb_func_start sub_810CEE0 sub_810CEE0: @ 810CEE0 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _0810CF00 + ldr r4, =0x0203841e ldrb r1, [r4, 0x8] bl obj_anim_image_start movs r1, 0x6 @@ -550116,27 +531831,25 @@ sub_810CEE0: @ 810CEE0 bl sub_80A69CC b _0810CF0C .align 2, 0 -_0810CF00: .4byte 0x0203841e + .pool _0810CF04: adds r0, r5, 0 movs r1, 0x1 bl sub_80A6980 _0810CF0C: - ldr r0, _0810CF24 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r5, 0x2E] - ldr r0, _0810CF28 + ldr r0, =sub_80A64B0 + 1 str r0, [r5, 0x1C] - ldr r1, _0810CF2C + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810CF24: .4byte 0x0203841e -_0810CF28: .4byte sub_80A64B0 + 1 -_0810CF2C: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810CEE0 thumb_func_start sub_810CF30 @@ -550146,19 +531859,18 @@ sub_810CF30: @ 810CF30 mov r6, r8 push {r6,r7} adds r5, r0, 0 - ldr r0, _0810CF4C + ldr r0, =0x0203841e movs r2, 0 ldrsh r1, [r0, r2] mov r9, r0 cmp r1, 0 bne _0810CF54 - ldr r0, _0810CF50 + ldr r0, =0x02038436 b _0810CF56 .align 2, 0 -_0810CF4C: .4byte 0x0203841e -_0810CF50: .4byte 0x02038436 + .pool _0810CF54: - ldr r0, _0810D09C + ldr r0, =0x02038437 _0810CF56: ldrb r0, [r0] mov r8, r0 @@ -550245,7 +531957,7 @@ _0810D000: negs r0, r0 lsrs r4, r0, 16 _0810D012: - ldr r0, _0810D0A0 + ldr r0, =0x02024076 add r0, r8 ldrb r1, [r0] adds r0, r7, 0 @@ -550253,7 +531965,7 @@ _0810D012: cmp r0, 0 bne _0810D028 lsls r0, r4, 16 - ldr r1, _0810D0A4 + ldr r1, =0xfff00000 adds r0, r1 lsrs r4, r0, 16 _0810D028: @@ -550270,7 +531982,7 @@ _0810D028: mov r1, r9 ldrh r0, [r1, 0x2] strh r0, [r5, 0x2E] - ldr r0, _0810D0A8 + ldr r0, =0x08597358 movs r2, 0x20 ldrsh r1, [r5, r2] movs r3, 0x22 @@ -550292,7 +532004,7 @@ _0810D028: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0810D0AC + ldr r4, =0x02020630 adds r0, r4 movs r1, 0 bl sub_8008258 @@ -550303,10 +532015,10 @@ _0810D028: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _0810D0B0 + ldr r1, =nullsub_12 + 1 str r1, [r0] _0810D08C: - ldr r0, _0810D0B4 + ldr r0, =sub_810D0B8 + 1 str r0, [r5, 0x1C] pop {r3,r4} mov r8, r3 @@ -550315,13 +532027,7 @@ _0810D08C: pop {r0} bx r0 .align 2, 0 -_0810D09C: .4byte 0x02038437 -_0810D0A0: .4byte 0x02024076 -_0810D0A4: .4byte 0xfff00000 -_0810D0A8: .4byte 0x08597358 -_0810D0AC: .4byte 0x02020630 -_0810D0B0: .4byte nullsub_12 + 1 -_0810D0B4: .4byte sub_810D0B8 + 1 + .pool thumb_func_end sub_810CF30 thumb_func_start sub_810D0B8 @@ -550337,7 +532043,7 @@ sub_810D0B8: @ 810D0B8 ldrsh r0, [r5, r1] cmp r0, 0x40 beq _0810D0F4 - ldr r4, _0810D0FC + ldr r4, =0x02020630 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -550359,7 +532065,7 @@ _0810D0F4: bl move_anim_8072740 b _0810D104 .align 2, 0 -_0810D0FC: .4byte 0x02020630 + .pool _0810D100: subs r0, r1, 0x1 strh r0, [r5, 0x2E] @@ -550377,7 +532083,7 @@ sub_810D10C: @ 810D10C bl sub_80A6980 movs r0, 0x1E strh r0, [r4, 0x2E] - ldr r0, _0810D12C + ldr r0, =0x0203841e movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 @@ -550387,7 +532093,7 @@ sub_810D10C: @ 810D10C strh r0, [r4, 0x32] b _0810D142 .align 2, 0 -_0810D12C: .4byte 0x0203841e + .pool _0810D130: ldrh r0, [r4, 0x20] adds r0, 0x14 @@ -550402,17 +532108,16 @@ _0810D142: ldrh r0, [r4, 0x22] subs r0, 0x14 strh r0, [r4, 0x36] - ldr r0, _0810D15C + ldr r0, =sub_80A6EEC + 1 str r0, [r4, 0x1C] - ldr r1, _0810D160 + ldr r1, =sub_810D164 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_0810D15C: .4byte sub_80A6EEC + 1 -_0810D160: .4byte sub_810D164 + 1 + .pool thumb_func_end sub_810D10C thumb_func_start sub_810D164 @@ -550443,9 +532148,9 @@ sub_810D164: @ 810D164 strh r1, [r5, 0x22] strh r6, [r5, 0x26] strh r6, [r5, 0x24] - ldr r0, _0810D1AC + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _0810D1B0 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 _0810D1A4: @@ -550453,18 +532158,17 @@ _0810D1A4: pop {r0} bx r0 .align 2, 0 -_0810D1AC: .4byte sub_80A6EEC + 1 -_0810D1B0: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810D164 thumb_func_start sub_810D1B4 sub_810D1B4: @ 810D1B4 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, _0810D230 + ldr r0, =0x02038436 ldrb r1, [r0] movs r0, 0x2 - ldr r2, _0810D234 + ldr r2, =0x02038437 eors r0, r1 ldrb r1, [r2] cmp r0, r1 @@ -550475,7 +532179,7 @@ sub_810D1B4: @ 810D1B4 lsrs r0, 24 cmp r0, 0x1 bhi _0810D1E0 - ldr r1, _0810D238 + ldr r1, =0x0203841e movs r2, 0 ldrsh r0, [r1, r2] negs r0, r0 @@ -550484,18 +532188,18 @@ _0810D1E0: adds r0, r6, 0 movs r1, 0x1 bl sub_80A6980 - ldr r0, _0810D230 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810D1FE - ldr r1, _0810D238 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] _0810D1FE: - ldr r4, _0810D238 + ldr r4, =0x0203841e ldrh r0, [r4, 0x6] movs r5, 0 strh r0, [r6, 0x2E] @@ -550514,16 +532218,13 @@ _0810D1FE: ldrh r0, [r4, 0x8] strh r0, [r6, 0x3A] strh r5, [r6, 0x3C] - ldr r0, _0810D23C + ldr r0, =sub_810D240 + 1 str r0, [r6, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810D230: .4byte 0x02038436 -_0810D234: .4byte 0x02038437 -_0810D238: .4byte 0x0203841e -_0810D23C: .4byte sub_810D240 + 1 + .pool thumb_func_end sub_810D1B4 thumb_func_start sub_810D240 @@ -550563,24 +532264,22 @@ sub_810D278: @ 810D278 adds r4, r0, 0 movs r1, 0x1 bl sub_80A6980 - ldr r5, _0810D2A4 + ldr r5, =0x0203841e ldrb r1, [r5, 0x4] adds r0, r4, 0 bl obj_anim_image_start ldrh r0, [r5, 0x6] strh r0, [r4, 0x2E] - ldr r0, _0810D2A8 + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] - ldr r1, _0810D2AC + ldr r1, =sub_810D2B0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810D2A4: .4byte 0x0203841e -_0810D2A8: .4byte sub_80A64B0 + 1 -_0810D2AC: .4byte sub_810D2B0 + 1 + .pool thumb_func_end sub_810D278 thumb_func_start sub_810D2B0 @@ -550597,17 +532296,16 @@ sub_810D2B0: @ 810D2B0 strb r0, [r2] movs r0, 0x14 strh r0, [r4, 0x2E] - ldr r0, _0810D2DC + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] - ldr r1, _0810D2E0 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_0810D2DC: .4byte sub_80A64B0 + 1 -_0810D2E0: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810D2B0 thumb_func_start sub_810D2E4 @@ -550616,17 +532314,16 @@ sub_810D2E4: @ 810D2E4 adds r4, r0, 0 movs r1, 0x1 bl sub_80A6980 - ldr r0, _0810D300 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] - ldr r0, _0810D304 + ldr r0, =sub_810D308 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810D300: .4byte 0x0203841e -_0810D304: .4byte sub_810D308 + 1 + .pool thumb_func_end sub_810D2E4 thumb_func_start sub_810D308 @@ -550644,7 +532341,7 @@ sub_810D308: @ 810D308 bne _0810D34C movs r0, 0x6 strh r0, [r5, 0x2E] - ldr r4, _0810D354 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -550657,9 +532354,9 @@ sub_810D308: @ 810D308 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, _0810D358 + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _0810D35C + ldr r1, =sub_810D360 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 _0810D34C: @@ -550667,9 +532364,7 @@ _0810D34C: pop {r0} bx r0 .align 2, 0 -_0810D354: .4byte 0x02038437 -_0810D358: .4byte sub_80A6EEC + 1 -_0810D35C: .4byte sub_810D360 + 1 + .pool thumb_func_end sub_810D308 thumb_func_start sub_810D360 @@ -550677,15 +532372,14 @@ sub_810D360: @ 810D360 push {lr} movs r1, 0xF strh r1, [r0, 0x2E] - ldr r1, _0810D374 + ldr r1, =sub_80A64B0 + 1 str r1, [r0, 0x1C] - ldr r1, _0810D378 + ldr r1, =move_anim_8072740 + 1 bl oamt_set_x3A_32 pop {r0} bx r0 .align 2, 0 -_0810D374: .4byte sub_80A64B0 + 1 -_0810D378: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810D360 thumb_func_start sub_810D37C @@ -550699,7 +532393,7 @@ sub_810D37C: @ 810D37C adds r0, r4, 0 movs r1, 0x1 bl sub_80A6980 - ldr r1, _0810D3A4 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] strh r0, [r4, 0x30] ldrh r0, [r1, 0x6] @@ -550709,7 +532403,7 @@ sub_810D37C: @ 810D37C strh r0, [r4, 0x2E] b _0810D404 .align 2, 0 -_0810D3A4: .4byte 0x0203841e + .pool _0810D3A8: ldrh r0, [r4, 0x30] ldrh r2, [r4, 0x36] @@ -550766,18 +532460,17 @@ _0810D404: sub_810D40C: @ 810D40C push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0810D420 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _0810D428 - ldr r4, _0810D424 + ldr r4, =0x02038436 b _0810D42A .align 2, 0 -_0810D420: .4byte 0x0203841e -_0810D424: .4byte 0x02038436 + .pool _0810D428: - ldr r4, _0810D470 + ldr r4, =0x02038437 _0810D42A: ldrb r0, [r4] movs r1, 0 @@ -550791,7 +532484,7 @@ _0810D42A: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r1, _0810D474 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] ldrh r2, [r5, 0x20] adds r0, r2 @@ -550807,15 +532500,13 @@ _0810D42A: ldrh r0, [r1, 0x8] strh r0, [r5, 0x32] strh r2, [r5, 0x34] - ldr r0, _0810D478 + ldr r0, =sub_810D47C + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810D470: .4byte 0x02038437 -_0810D474: .4byte 0x0203841e -_0810D478: .4byte sub_810D47C + 1 + .pool thumb_func_end sub_810D40C thumb_func_start sub_810D47C @@ -550868,7 +532559,7 @@ _0810D4B2: movs r0, 0x2 b _0810D4D8 _0810D4D6: - ldr r0, _0810D4F0 + ldr r0, =0x0000fffe _0810D4D8: strh r0, [r1, 0x24] _0810D4DA: @@ -550884,19 +532575,19 @@ _0810D4EC: pop {r0} bx r0 .align 2, 0 -_0810D4F0: .4byte 0x0000fffe + .pool thumb_func_end sub_810D47C thumb_func_start sub_810D4F4 sub_810D4F4: @ 810D4F4 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _0810D518 + ldr r6, =0x0203841e movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 bne _0810D520 - ldr r4, _0810D51C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -550906,10 +532597,9 @@ sub_810D4F4: @ 810D4F4 adds r0, r2 b _0810D532 .align 2, 0 -_0810D518: .4byte 0x0203841e -_0810D51C: .4byte 0x02038436 + .pool _0810D520: - ldr r4, _0810D57C + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -550930,15 +532620,15 @@ _0810D532: ldrh r2, [r5, 0x4] lsls r1, r2, 22 lsrs r1, 22 - ldr r3, _0810D580 + ldr r3, =0x0203841e movs r4, 0x2 ldrsh r0, [r3, r4] lsls r0, 4 adds r1, r0 - ldr r4, _0810D584 + ldr r4, =0x000003ff adds r0, r4, 0 ands r1, r0 - ldr r0, _0810D588 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] @@ -550955,10 +532645,7 @@ _0810D532: beq _0810D596 b _0810D5C6 .align 2, 0 -_0810D57C: .4byte 0x02038437 -_0810D580: .4byte 0x0203841e -_0810D584: .4byte 0x000003ff -_0810D588: .4byte 0xfffffc00 + .pool _0810D58C: cmp r0, 0x2 beq _0810D5B0 @@ -550966,26 +532653,26 @@ _0810D58C: beq _0810D5C0 b _0810D5C6 _0810D596: - ldr r0, _0810D59C + ldr r0, =0x0000fffd b _0810D5C0 .align 2, 0 -_0810D59C: .4byte 0x0000fffd + .pool _0810D5A0: movs r0, 0x3 strh r0, [r5, 0x3A] - ldr r0, _0810D5AC + ldr r0, =0x0000fffd strh r0, [r5, 0x3C] b _0810D5CE .align 2, 0 -_0810D5AC: .4byte 0x0000fffd + .pool _0810D5B0: - ldr r0, _0810D5BC + ldr r0, =0x0000fffd strh r0, [r5, 0x3A] movs r0, 0x3 strh r0, [r5, 0x3C] b _0810D5CE .align 2, 0 -_0810D5BC: .4byte 0x0000fffd + .pool _0810D5C0: strh r0, [r5, 0x3A] strh r0, [r5, 0x3C] @@ -550995,14 +532682,14 @@ _0810D5C6: bl move_anim_8072740 b _0810D5D2 _0810D5CE: - ldr r0, _0810D5D8 + ldr r0, =sub_810D5DC + 1 str r0, [r5, 0x1C] _0810D5D2: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810D5D8: .4byte sub_810D5DC + 1 + .pool thumb_func_end sub_810D4F4 thumb_func_start sub_810D5DC @@ -551035,12 +532722,12 @@ _0810D604: sub_810D608: @ 810D608 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0810D654 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _0810D664 - ldr r4, _0810D658 + ldr r4, =0x0202420b ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -551053,7 +532740,7 @@ sub_810D608: @ 810D608 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r0, _0810D65C + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -551065,15 +532752,12 @@ sub_810D608: @ 810D608 ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - ldr r0, _0810D660 + ldr r0, =0x02038437 b _0810D680 .align 2, 0 -_0810D654: .4byte 0x0203841e -_0810D658: .4byte 0x0202420b -_0810D65C: .4byte 0x02038436 -_0810D660: .4byte 0x02038437 + .pool _0810D664: - ldr r0, _0810D69C + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -551085,7 +532769,7 @@ _0810D664: ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - ldr r0, _0810D6A0 + ldr r0, =0x02038436 _0810D680: ldrb r0, [r0] strh r0, [r5, 0x3C] @@ -551095,15 +532779,13 @@ _0810D680: strh r0, [r5, 0x30] movs r0, 0x8 strh r0, [r5, 0x32] - ldr r0, _0810D6A4 + ldr r0, =sub_810D6A8 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810D69C: .4byte 0x02038437 -_0810D6A0: .4byte 0x02038436 -_0810D6A4: .4byte sub_810D6A8 + 1 + .pool thumb_func_end sub_810D608 thumb_func_start sub_810D6A8 @@ -551144,25 +532826,24 @@ sub_810D6A8: @ 810D6A8 strh r0, [r4, 0x36] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, _0810D70C + ldr r1, =move_anim_8074EE0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _0810D710 + ldr r0, =sub_80A6F98 + 1 str r0, [r4, 0x1C] _0810D704: pop {r4} pop {r0} bx r0 .align 2, 0 -_0810D70C: .4byte move_anim_8074EE0 + 1 -_0810D710: .4byte sub_80A6F98 + 1 + .pool thumb_func_end sub_810D6A8 thumb_func_start sub_810D714 sub_810D714: @ 810D714 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _0810D760 + ldr r4, =0x0203841e ldrh r0, [r4] strh r0, [r5, 0x20] movs r2, 0x78 @@ -551184,23 +532865,20 @@ sub_810D714: @ 810D714 ldrsh r0, [r4, r3] lsls r0, 2 adds r1, r0 - ldr r3, _0810D764 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _0810D768 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - ldr r0, _0810D76C + ldr r0, =sub_810D770 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810D760: .4byte 0x0203841e -_0810D764: .4byte 0x000003ff -_0810D768: .4byte 0xfffffc00 -_0810D76C: .4byte sub_810D770 + 1 + .pool thumb_func_end sub_810D714 thumb_func_start sub_810D770 @@ -551245,7 +532923,7 @@ _0810D7BA: strh r0, [r7, 0x2E] b _0810D818 _0810D7C2: - ldr r4, _0810D824 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -551258,7 +532936,7 @@ _0810D7C2: adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r2, _0810D828 + ldr r2, =0x02038437 mov r8, r2 ldrb r0, [r2] movs r1, 0x2 @@ -551282,7 +532960,7 @@ _0810D7C2: ldrh r0, [r7, 0x22] lsls r0, 4 strh r0, [r7, 0x34] - ldr r0, _0810D82C + ldr r0, =sub_810D830 + 1 str r0, [r7, 0x1C] _0810D818: pop {r3} @@ -551291,9 +532969,7 @@ _0810D818: pop {r0} bx r0 .align 2, 0 -_0810D824: .4byte 0x02038436 -_0810D828: .4byte 0x02038437 -_0810D82C: .4byte sub_810D830 + 1 + .pool thumb_func_end sub_810D770 thumb_func_start sub_810D830 @@ -551339,12 +533015,12 @@ _0810D870: sub_810D874: @ 810D874 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0810D8A8 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _0810D8B8 - ldr r4, _0810D8AC + ldr r4, =0x0202420b ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -551357,19 +533033,16 @@ sub_810D874: @ 810D874 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r0, _0810D8B0 + ldr r0, =0x02038437 ldrb r4, [r0] - ldr r0, _0810D8B4 + ldr r0, =0x02038436 b _0810D8BE .align 2, 0 -_0810D8A8: .4byte 0x0203841e -_0810D8AC: .4byte 0x0202420b -_0810D8B0: .4byte 0x02038437 -_0810D8B4: .4byte 0x02038436 + .pool _0810D8B8: - ldr r0, _0810D8F0 + ldr r0, =0x02038436 ldrb r4, [r0] - ldr r0, _0810D8F4 + ldr r0, =0x02038437 _0810D8BE: ldrb r0, [r0] bl sub_80A8328 @@ -551395,8 +533068,7 @@ _0810D8BE: subs r0, 0x47 b _0810D912 .align 2, 0 -_0810D8F0: .4byte 0x02038436 -_0810D8F4: .4byte 0x02038437 + .pool _0810D8F8: adds r0, r4, 0 bl battle_side_get_owner @@ -551435,17 +533107,16 @@ _0810D918: strh r0, [r5, 0x36] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r1, _0810D958 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _0810D95C + ldr r0, =sub_80A6F98 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810D958: .4byte move_anim_8072740 + 1 -_0810D95C: .4byte sub_80A6F98 + 1 + .pool thumb_func_end sub_810D874 thumb_func_start sub_810D960 @@ -551473,7 +533144,7 @@ _0810D976: sub_810D984: @ 810D984 push {r4-r6,lr} adds r5, r0, 0 - ldr r4, _0810DA00 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -551486,7 +533157,7 @@ sub_810D984: @ 810D984 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r1, _0810DA04 + ldr r1, =0x0203841e ldrh r0, [r1, 0x6] strh r0, [r5, 0x30] ldrh r0, [r1] @@ -551495,7 +533166,7 @@ sub_810D984: @ 810D984 strh r0, [r5, 0x34] ldrh r0, [r1, 0x4] strh r0, [r5, 0x36] - ldr r0, _0810DA08 + ldr r0, =0x02038432 ldrb r6, [r0] ldrb r0, [r4] bl battle_side_get_owner @@ -551526,23 +533197,20 @@ _0810D9E2: strh r0, [r5, 0x24] ldrh r0, [r5, 0x34] strh r0, [r5, 0x26] - ldr r0, _0810DA0C + ldr r0, =sub_810D960 + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810DA00: .4byte 0x02038437 -_0810DA04: .4byte 0x0203841e -_0810DA08: .4byte 0x02038432 -_0810DA0C: .4byte sub_810D960 + 1 + .pool thumb_func_end sub_810D984 thumb_func_start sub_810DA10 sub_810DA10: @ 810DA10 push {r4,lr} adds r4, r0, 0 - ldr r0, _0810DA28 + ldr r0, =0x0203841e movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 @@ -551552,7 +533220,7 @@ sub_810DA10: @ 810DA10 bl sub_80A69CC b _0810DA34 .align 2, 0 -_0810DA28: .4byte 0x0203841e + .pool _0810DA2C: adds r0, r4, 0 movs r1, 0 @@ -551567,7 +533235,7 @@ _0810DA34: bl obj_anim_image_start b _0810DA5E _0810DA48: - ldr r0, _0810DA70 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -551577,18 +533245,16 @@ _0810DA48: movs r1, 0x1 bl obj_anim_image_start _0810DA5E: - ldr r0, _0810DA74 + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] - ldr r1, _0810DA78 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_0810DA70: .4byte 0x02038436 -_0810DA74: .4byte sub_80A67D8 + 1 -_0810DA78: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810DA10 thumb_func_start sub_810DA7C @@ -551634,7 +533300,7 @@ sub_810DABC: @ 810DABC lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0810DAEC + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -551646,13 +533312,12 @@ sub_810DABC: @ 810DABC bne _0810DB0E movs r0, 0 bl sub_80A6DAC - ldr r0, _0810DAF0 + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r4, 0x18] b _0810DB06 .align 2, 0 -_0810DAEC: .4byte 0x03005e00 -_0810DAF0: .4byte 0x0203841e + .pool _0810DAF4: ldrh r0, [r4, 0x18] subs r0, 0x1 @@ -551682,13 +533347,13 @@ _0810DB1A: ldrh r1, [r4, 0x1C] adds r0, r1 strh r0, [r4, 0x1C] - ldr r0, _0810DB48 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0810DB50 - ldr r1, _0810DB4C + ldr r1, =0x02022e20 ldrh r0, [r4, 0x1A] lsls r0, 16 asrs r0, 24 @@ -551698,10 +533363,9 @@ _0810DB1A: adds r7, r1, 0 b _0810DB60 .align 2, 0 -_0810DB48: .4byte 0x02038437 -_0810DB4C: .4byte 0x02022e20 + .pool _0810DB50: - ldr r2, _0810DBA0 + ldr r2, =0x02022e20 ldrh r1, [r4, 0x1A] lsls r1, 16 asrs r1, 24 @@ -551710,7 +533374,7 @@ _0810DB50: strh r0, [r2] adds r7, r2, 0 _0810DB60: - ldr r3, _0810DBA4 + ldr r3, =0x02022e22 ldrh r2, [r4, 0x1C] lsls r0, r2, 16 asrs r0, 24 @@ -551723,7 +533387,7 @@ _0810DB60: strh r1, [r4, 0x1A] ands r0, r2 strh r0, [r4, 0x1C] - ldr r0, _0810DBA8 + ldr r0, =0x0203841e movs r2, 0xE ldrsh r1, [r0, r2] movs r0, 0x1 @@ -551741,16 +533405,14 @@ _0810DB98: pop {r0} bx r0 .align 2, 0 -_0810DBA0: .4byte 0x02022e20 -_0810DBA4: .4byte 0x02022e22 -_0810DBA8: .4byte 0x0203841e + .pool thumb_func_end sub_810DABC thumb_func_start sub_810DBAC sub_810DBAC: @ 810DBAC push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _0810DC00 + ldr r4, =0x0203841e movs r1, 0x6 ldrsh r0, [r4, r1] cmp r0, 0 @@ -551764,7 +533426,7 @@ _0810DBC2: bl sub_80A69CC ldrh r0, [r4, 0x4] strh r0, [r5, 0x2E] - ldr r4, _0810DC04 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -551777,20 +533439,17 @@ _0810DBC2: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, _0810DC08 + ldr r0, =0x0000ffe2 strh r0, [r5, 0x38] adds r0, r5, 0 bl sub_80A68D4 - ldr r0, _0810DC0C + ldr r0, =sub_810DC10 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810DC00: .4byte 0x0203841e -_0810DC04: .4byte 0x02038437 -_0810DC08: .4byte 0x0000ffe2 -_0810DC0C: .4byte sub_810DC10 + 1 + .pool thumb_func_end sub_810DBAC thumb_func_start sub_810DC10 @@ -551814,7 +533473,7 @@ sub_810DC2C: @ 810DC2C push {r4-r6,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r5, _0810DCA0 + ldr r5, =0x0203841e movs r1, 0x6 ldrsh r0, [r5, r1] cmp r0, 0 @@ -551826,7 +533485,7 @@ _0810DC44: adds r0, r4, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _0810DCA4 + ldr r0, =0x02038437 ldrb r0, [r0] mov r6, sp adds r6, 0x2 @@ -551834,7 +533493,7 @@ _0810DC44: mov r2, sp adds r3, r6, 0 bl sub_80A8924 - ldr r0, _0810DCA8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -551855,22 +533514,18 @@ _0810DC72: ldrh r6, [r6] adds r0, r6 strh r0, [r4, 0x36] - ldr r0, _0810DCAC + ldr r0, =0x0000ffe2 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, _0810DCB0 + ldr r0, =sub_810DCB4 + 1 str r0, [r4, 0x1C] add sp, 0x4 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810DCA0: .4byte 0x0203841e -_0810DCA4: .4byte 0x02038437 -_0810DCA8: .4byte 0x02038436 -_0810DCAC: .4byte 0x0000ffe2 -_0810DCB0: .4byte sub_810DCB4 + 1 + .pool thumb_func_end sub_810DC2C thumb_func_start sub_810DCB4 @@ -551893,7 +533548,7 @@ _0810DCC8: sub_810DCD0: @ 810DCD0 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _0810DD1C + ldr r5, =0x0203841e ldrh r0, [r5, 0x4] strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] @@ -551920,14 +533575,13 @@ sub_810DCD0: @ 810DCD0 ldrsh r1, [r5, r2] bl __divsi3 strh r0, [r4, 0x3A] - ldr r0, _0810DD20 + ldr r0, =sub_810DD24 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810DD1C: .4byte 0x0203841e -_0810DD20: .4byte sub_810DD24 + 1 + .pool thumb_func_end sub_810DCD0 thumb_func_start sub_810DD24 @@ -551959,7 +533613,7 @@ _0810DD4A: sub_810DD50: @ 810DD50 push {r4,lr} adds r4, r0, 0 - ldr r0, _0810DDB0 + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -551967,18 +533621,18 @@ sub_810DD50: @ 810DD50 adds r3, 0x22 movs r1, 0x1 bl sub_80A8924 - ldr r0, _0810DDB4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810DD7C - ldr r1, _0810DDB8 + ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] _0810DD7C: - ldr r0, _0810DDB8 + ldr r0, =0x0203841e ldrh r2, [r0] ldrh r1, [r4, 0x20] adds r2, r1 @@ -551994,27 +533648,23 @@ _0810DD7C: strh r2, [r4, 0x32] adds r1, r3 strh r1, [r4, 0x36] - ldr r0, _0810DDBC + ldr r0, =sub_80A6EEC + 1 str r0, [r4, 0x1C] - ldr r1, _0810DDC0 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_0810DDB0: .4byte 0x02038437 -_0810DDB4: .4byte 0x02038436 -_0810DDB8: .4byte 0x0203841e -_0810DDBC: .4byte sub_80A6EEC + 1 -_0810DDC0: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810DD50 thumb_func_start sub_810DDC4 sub_810DDC4: @ 810DDC4 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _0810DDDC + ldr r5, =0x0203841e movs r1, 0x4 ldrsh r0, [r5, r1] cmp r0, 0 @@ -552024,9 +533674,9 @@ sub_810DDC4: @ 810DDC4 bl sub_80A6980 b _0810DE16 .align 2, 0 -_0810DDDC: .4byte 0x0203841e + .pool _0810DDE0: - ldr r0, _0810DE20 + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -552034,7 +533684,7 @@ _0810DDE0: adds r3, 0x22 movs r1, 0x1 bl sub_80A8924 - ldr r0, _0810DE24 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -552053,15 +533703,13 @@ _0810DE06: adds r0, r1 strh r0, [r4, 0x22] _0810DE16: - ldr r0, _0810DE28 + ldr r0, =sub_810DE2C + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810DE20: .4byte 0x02038437 -_0810DE24: .4byte 0x02038436 -_0810DE28: .4byte sub_810DE2C + 1 + .pool thumb_func_end sub_810DDC4 thumb_func_start sub_810DE2C @@ -552111,7 +533759,7 @@ sub_810DE70: @ 810DE70 strh r0, [r4, 0x22] movs r0, 0xBF strh r0, [r4, 0x30] - ldr r1, _0810DE94 + ldr r1, =sub_810DE98 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -552119,7 +533767,7 @@ sub_810DE70: @ 810DE70 pop {r0} bx r0 .align 2, 0 -_0810DE94: .4byte sub_810DE98 + 1 + .pool thumb_func_end sub_810DE70 thumb_func_start sub_810DE98 @@ -552161,31 +533809,28 @@ sub_810DED8: @ 810DED8 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0810DF08 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 adds r4, r1 - ldr r1, _0810DF0C + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] strh r0, [r4, 0x8] ldrh r0, [r1] strh r0, [r4, 0xA] - ldr r0, _0810DF10 + ldr r0, =0x00002719 bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xC] - ldr r0, _0810DF14 + ldr r0, =sub_810DF18 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810DF08: .4byte 0x03005e00 -_0810DF0C: .4byte 0x0203841e -_0810DF10: .4byte 0x00002719 -_0810DF14: .4byte sub_810DF18 + 1 + .pool thumb_func_end sub_810DED8 thumb_func_start sub_810DF18 @@ -552193,7 +533838,7 @@ sub_810DF18: @ 810DF18 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _0810DF98 + ldr r2, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -552211,7 +533856,7 @@ sub_810DF18: @ 810DF18 movs r0, 0 strh r0, [r3, 0x1C] ldrb r0, [r3, 0xC] - ldr r2, _0810DF9C + ldr r2, =0x02037b14 lsls r0, 4 movs r3, 0x84 lsls r3, 1 @@ -552221,7 +533866,7 @@ sub_810DF18: @ 810DF18 ldrh r6, [r1] movs r4, 0x7 mov r12, r0 - ldr r0, _0810DFA0 + ldr r0, =0x00000107 add r0, r12 lsls r0, 1 adds r3, r0, r2 @@ -552233,7 +533878,7 @@ _0810DF5E: subs r4, 0x1 cmp r4, 0 bgt _0810DF5E - ldr r0, _0810DFA4 + ldr r0, =0x00000101 add r0, r12 lsls r0, 1 adds r0, r2 @@ -552256,10 +533901,7 @@ _0810DF90: pop {r0} bx r0 .align 2, 0 -_0810DF98: .4byte 0x03005e00 -_0810DF9C: .4byte 0x02037b14 -_0810DFA0: .4byte 0x00000107 -_0810DFA4: .4byte 0x00000101 + .pool thumb_func_end sub_810DF18 thumb_func_start sub_810DFA8 @@ -552268,23 +533910,23 @@ sub_810DFA8: @ 810DFA8 adds r6, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _0810E014 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810DFC8 - ldr r1, _0810E018 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] _0810DFC8: - ldr r4, _0810E018 + ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] ldrh r0, [r6, 0x20] strh r0, [r6, 0x30] - ldr r5, _0810E01C + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -552305,20 +533947,16 @@ _0810DFC8: strh r0, [r6, 0x36] adds r0, r6, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, _0810E020 + ldr r0, =sub_80A67BC + 1 str r0, [r6, 0x1C] - ldr r1, _0810E024 + ldr r1, =sub_810E028 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810E014: .4byte 0x02038436 -_0810E018: .4byte 0x0203841e -_0810E01C: .4byte 0x02038437 -_0810E020: .4byte sub_80A67BC + 1 -_0810E024: .4byte sub_810E028 + 1 + .pool thumb_func_end sub_810DFA8 thumb_func_start sub_810E028 @@ -552341,13 +533979,13 @@ _0810E03C: sub_810E044: @ 810E044 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _0810E0E0 + ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810E070 - ldr r1, _0810E0E4 + ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] @@ -552365,7 +534003,7 @@ _0810E070: lsls r0, 24 cmp r0, 0 beq _0810E088 - ldr r0, _0810E0E4 + ldr r0, =0x0203841e ldrh r1, [r0, 0x2] negs r1, r1 strh r1, [r0, 0x2] @@ -552383,7 +534021,7 @@ _0810E088: movs r1, 0x3 bl sub_80A5C6C lsls r0, 24 - ldr r2, _0810E0E4 + ldr r2, =0x0203841e ldrh r1, [r2] ldrh r3, [r5, 0x20] adds r1, r3 @@ -552398,7 +534036,7 @@ _0810E088: ldrsh r0, [r2, r3] cmp r0, 0 bne _0810E0EC - ldr r4, _0810E0E8 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -552413,11 +534051,9 @@ _0810E088: strh r0, [r5, 0x36] b _0810E0FE .align 2, 0 -_0810E0E0: .4byte 0x02038436 -_0810E0E4: .4byte 0x0203841e -_0810E0E8: .4byte 0x02038437 + .pool _0810E0EC: - ldr r0, _0810E12C + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -552426,7 +534062,7 @@ _0810E0EC: movs r1, 0x1 bl sub_80A8924 _0810E0FE: - ldr r4, _0810E130 + ldr r4, =0x0203841e ldrh r0, [r4, 0x4] ldrh r1, [r5, 0x32] adds r0, r1 @@ -552435,9 +534071,9 @@ _0810E0FE: ldrh r3, [r5, 0x36] adds r0, r3 strh r0, [r5, 0x36] - ldr r0, _0810E134 + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _0810E138 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 ldrb r1, [r4, 0xA] @@ -552447,10 +534083,7 @@ _0810E0FE: pop {r0} bx r0 .align 2, 0 -_0810E12C: .4byte 0x02038437 -_0810E130: .4byte 0x0203841e -_0810E134: .4byte sub_80A6EEC + 1 -_0810E138: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810E044 thumb_func_start sub_810E13C @@ -552459,16 +534092,16 @@ sub_810E13C: @ 810E13C adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r1, _0810E178 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] strh r0, [r4, 0x2E] ldrh r0, [r1, 0x6] strh r0, [r4, 0x30] - ldr r0, _0810E17C + ldr r0, =sub_810E184 + 1 str r0, [r4, 0x1C] movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r2, _0810E180 + ldr r2, =0x02020630 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -552484,9 +534117,7 @@ sub_810E13C: @ 810E13C pop {r0} bx r0 .align 2, 0 -_0810E178: .4byte 0x0203841e -_0810E17C: .4byte sub_810E184 + 1 -_0810E180: .4byte 0x02020630 + .pool thumb_func_end sub_810E13C thumb_func_start sub_810E184 @@ -552532,7 +534163,7 @@ _0810E1C2: sub_810E1C8: @ 810E1C8 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0810E1F0 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -552541,26 +534172,25 @@ sub_810E1C8: @ 810E1C8 movs r0, 0x88 lsls r0, 1 strh r0, [r5, 0x20] - ldr r0, _0810E1F4 + ldr r0, =0x0000ffe0 strh r0, [r5, 0x22] adds r0, r5, 0 movs r1, 0x1 bl sub_8008258 b _0810E1FE .align 2, 0 -_0810E1F0: .4byte 0x02038436 -_0810E1F4: .4byte 0x0000ffe0 + .pool _0810E1F8: - ldr r0, _0810E23C + ldr r0, =0x0000ffe0 strh r0, [r5, 0x20] strh r0, [r5, 0x22] _0810E1FE: - ldr r0, _0810E240 + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] strh r0, [r5, 0x30] - ldr r4, _0810E244 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -552577,16 +534207,13 @@ _0810E1FE: strh r0, [r5, 0x36] adds r0, r5, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, _0810E248 + ldr r0, =sub_810E24C + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810E23C: .4byte 0x0000ffe0 -_0810E240: .4byte 0x0203841e -_0810E244: .4byte 0x02038437 -_0810E248: .4byte sub_810E24C + 1 + .pool thumb_func_end sub_810E1C8 thumb_func_start sub_810E24C @@ -552631,7 +534258,7 @@ _0810E274: _0810E296: movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r2, _0810E2C4 + ldr r2, =0x02020630 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -552651,7 +534278,7 @@ _0810E2BC: pop {r0} bx r0 .align 2, 0 -_0810E2C4: .4byte 0x02020630 + .pool thumb_func_end sub_810E24C thumb_func_start sub_810E2C8 @@ -552683,7 +534310,7 @@ sub_810E2C8: @ 810E2C8 _0810E2FA: adds r0, r4, 0 bl obj_delete_and_free_tiles - ldr r1, _0810E310 + ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] @@ -552692,7 +534319,7 @@ _0810E308: pop {r0} bx r0 .align 2, 0 -_0810E310: .4byte 0x020383fe + .pool thumb_func_end sub_810E2C8 thumb_func_start sub_810E314 @@ -552703,20 +534330,19 @@ sub_810E314: @ 810E314 adds r7, r0, 0 adds r5, r7, 0 adds r5, 0x2E - ldr r0, _0810E334 + ldr r0, =0x0203841e ldrh r1, [r0, 0xE] movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 beq _0810E33C - ldr r0, _0810E338 + ldr r0, =0x02038436 b _0810E33E .align 2, 0 -_0810E334: .4byte 0x0203841e -_0810E338: .4byte 0x02038436 + .pool _0810E33C: - ldr r0, _0810E3E8 + ldr r0, =0x02038437 _0810E33E: ldrb r6, [r0] adds r0, r6, 0 @@ -552724,7 +534350,7 @@ _0810E33E: lsls r0, 24 cmp r0, 0 bne _0810E354 - ldr r1, _0810E3EC + ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] @@ -552733,7 +534359,7 @@ _0810E354: movs r1, 0 bl sub_80A5C6C lsls r0, 24 - ldr r4, _0810E3EC + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4] adds r0, r1 @@ -552799,8 +534425,7 @@ _0810E354: strb r1, [r7, 0x5] b _0810E408 .align 2, 0 -_0810E3E8: .4byte 0x02038437 -_0810E3EC: .4byte 0x0203841e + .pool _0810E3F0: adds r0, r6, 0 bl sub_80A8328 @@ -552905,7 +534530,7 @@ _0810E4AA: ands r0, r2 orrs r0, r1 strb r0, [r5] - ldr r3, _0810E514 + ldr r3, =0x08329f40 ldrh r0, [r5, 0x2] lsls r0, 1 adds r0, r3 @@ -552929,7 +534554,7 @@ _0810E4AA: lsls r1, r0, 1 adds r1, r3 ldrh r4, [r1] - ldr r1, _0810E518 + ldr r1, =0x02021bc0 lsls r2, 3 adds r2, r1 adds r0, 0x40 @@ -552943,7 +534568,7 @@ _0810E4AA: asrs r0, 16 negs r0, r0 strh r0, [r2, 0x4] - ldr r0, _0810E51C + ldr r0, =sub_810E520 + 1 str r0, [r7, 0x1C] pop {r3} mov r8, r3 @@ -552951,9 +534576,7 @@ _0810E4AA: pop {r0} bx r0 .align 2, 0 -_0810E514: .4byte 0x08329f40 -_0810E518: .4byte 0x02021bc0 -_0810E51C: .4byte sub_810E520 + 1 + .pool thumb_func_end sub_810E314 thumb_func_start sub_810E520 @@ -553569,7 +535192,7 @@ _0810E97C: adds r0, 0xC adds r0, r1 ldrb r1, [r0] - ldr r3, _0810EA04 + ldr r3, =0x08329f40 mov r2, r12 lsls r0, r2, 1 adds r0, r3 @@ -553592,7 +535215,7 @@ _0810E97C: lsls r1, r0, 1 adds r1, r3 ldrh r6, [r1] - ldr r1, _0810EA08 + ldr r1, =0x02021bc0 lsls r2, 3 adds r2, r1 adds r0, 0x40 @@ -553630,11 +535253,10 @@ _0810E97C: strh r0, [r4, 0x2] b _0810EA1C .align 2, 0 -_0810EA04: .4byte 0x08329f40 -_0810EA08: .4byte 0x02021bc0 + .pool _0810EA0C: ldrh r0, [r4, 0x4] - ldr r1, _0810EA44 + ldr r1, =0x00007fff ands r1, r0 ldrh r2, [r4, 0x2] adds r1, r2 @@ -553653,7 +535275,7 @@ _0810EA1C: blt _0810EA36 movs r0, 0 strh r0, [r5, 0x2E] - ldr r0, _0810EA48 + ldr r0, =sub_810E2C8 + 1 str r0, [r5, 0x1C] _0810EA36: pop {r3,r4} @@ -553663,15 +535285,14 @@ _0810EA36: pop {r0} bx r0 .align 2, 0 -_0810EA44: .4byte 0x00007fff -_0810EA48: .4byte sub_810E2C8 + 1 + .pool thumb_func_end sub_810E520 thumb_func_start sub_810EA4C sub_810EA4C: @ 810EA4C push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _0810EA94 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -553683,7 +535304,7 @@ sub_810EA4C: @ 810EA4C ands r0, r2 orrs r0, r1 strb r0, [r4, 0x5] - ldr r5, _0810EA98 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -553696,22 +535317,20 @@ sub_810EA4C: @ 810EA4C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r0, _0810EA9C + ldr r0, =sub_80A7820 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810EA94: .4byte 0x02038437 -_0810EA98: .4byte 0x02038436 -_0810EA9C: .4byte sub_80A7820 + 1 + .pool thumb_func_end sub_810EA4C thumb_func_start sub_810EAA0 sub_810EAA0: @ 810EAA0 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0810EAB8 + ldr r0, =0x0203841e movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 @@ -553721,18 +535340,18 @@ sub_810EAA0: @ 810EAA0 bl sub_80A69CC b _0810EAC4 .align 2, 0 -_0810EAB8: .4byte 0x0203841e + .pool _0810EABC: adds r0, r5, 0 movs r1, 0 bl sub_80A6980 _0810EAC4: - ldr r4, _0810EB2C + ldr r4, =0x0203841e movs r2, 0x4 ldrsh r0, [r4, r2] cmp r0, 0 bne _0810EADC - ldr r0, _0810EB30 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -553743,7 +535362,7 @@ _0810EADC: ldrsh r0, [r4, r1] cmp r0, 0x1 bne _0810EAF8 - ldr r0, _0810EB34 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -553754,14 +535373,14 @@ _0810EAF2: adds r0, 0x8 strh r0, [r5, 0x20] _0810EAF8: - ldr r4, _0810EB2C + ldr r4, =0x0203841e ldrb r1, [r4, 0x8] adds r0, r5, 0 bl obj_anim_image_seek ldrh r0, [r5, 0x20] subs r0, 0x20 strh r0, [r5, 0x20] - ldr r0, _0810EB38 + ldr r0, =0x00000ccc strh r0, [r5, 0x30] ldrh r1, [r4, 0x8] movs r0, 0xC @@ -553774,17 +535393,13 @@ _0810EAF8: strh r1, [r5, 0x2E] ldrh r0, [r4, 0x6] strh r0, [r5, 0x3C] - ldr r0, _0810EB3C + ldr r0, =sub_810EB40 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810EB2C: .4byte 0x0203841e -_0810EB30: .4byte 0x02038436 -_0810EB34: .4byte 0x02038437 -_0810EB38: .4byte 0x00000ccc -_0810EB3C: .4byte sub_810EB40 + 1 + .pool thumb_func_end sub_810EAA0 thumb_func_start sub_810EB40 @@ -553835,7 +535450,7 @@ sub_810EB88: @ 810EB88 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _0810EC20 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -553845,7 +535460,7 @@ sub_810EB88: @ 810EB88 ands r0, r1 cmp r0, 0 bne _0810EC02 - ldr r1, _0810EC24 + ldr r1, =0x020383fe ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] @@ -553855,7 +535470,7 @@ sub_810EB88: @ 810EB88 negs r5, r5 adds r1, r5, 0 bl sine - ldr r4, _0810EC28 + ldr r4, =0x0203841e strh r0, [r4] movs r1, 0x8 ldrsh r0, [r7, r1] @@ -553866,9 +535481,9 @@ sub_810EB88: @ 810EB88 strh r0, [r4, 0x4] movs r0, 0x3 strh r0, [r4, 0x6] - ldr r0, _0810EC2C + ldr r0, =0x085973e8 mov r8, r0 - ldr r5, _0810EC30 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -553902,11 +535517,7 @@ _0810EC16: pop {r0} bx r0 .align 2, 0 -_0810EC20: .4byte 0x03005e00 -_0810EC24: .4byte 0x020383fe -_0810EC28: .4byte 0x0203841e -_0810EC2C: .4byte 0x085973e8 -_0810EC30: .4byte 0x02038437 + .pool thumb_func_end sub_810EB88 thumb_func_start sub_810EC34 @@ -553926,7 +535537,7 @@ _0810EC46: bl sub_80A69CC movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r2, _0810EC74 + ldr r2, =0x02020630 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -553943,7 +535554,7 @@ _0810EC46: strh r0, [r4, 0x2E] b _0810EC8C .align 2, 0 -_0810EC74: .4byte 0x02020630 + .pool _0810EC78: adds r0, r4, 0 adds r0, 0x3F @@ -553978,7 +535589,7 @@ _0810ECAA: beq _0810ECE0 b _0810ED1E _0810ECB0: - ldr r0, _0810ECC8 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x1 bl sub_80A5C6C @@ -553990,7 +535601,7 @@ _0810ECB0: strh r0, [r4, 0x26] b _0810ECD8 .align 2, 0 -_0810ECC8: .4byte 0x02038437 + .pool _0810ECCC: ldrh r0, [r4, 0x26] adds r0, 0xA @@ -554018,7 +535629,7 @@ _0810ECE0: bge _0810ED1E movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r2, _0810ED24 + ldr r2, =0x02020630 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -554038,7 +535649,7 @@ _0810ED1E: pop {r0} bx r0 .align 2, 0 -_0810ED24: .4byte 0x02020630 + .pool thumb_func_end sub_810EC94 thumb_func_start sub_810ED28 @@ -554047,16 +535658,16 @@ sub_810ED28: @ 810ED28 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r1, _0810ED64 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] strh r0, [r4, 0x2E] ldrh r0, [r1, 0x6] strh r0, [r4, 0x30] - ldr r0, _0810ED68 + ldr r0, =sub_810ED70 + 1 str r0, [r4, 0x1C] movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r2, _0810ED6C + ldr r2, =0x02020630 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -554072,9 +535683,7 @@ sub_810ED28: @ 810ED28 pop {r0} bx r0 .align 2, 0 -_0810ED64: .4byte 0x0203841e -_0810ED68: .4byte sub_810ED70 + 1 -_0810ED6C: .4byte 0x02020630 + .pool thumb_func_end sub_810ED28 thumb_func_start sub_810ED70 @@ -554123,13 +535732,13 @@ _0810EDAA: asrs r0, 16 cmp r0, 0x14 ble _0810EDC8 - ldr r0, _0810EDCC + ldr r0, =sub_810EDD0 + 1 str r0, [r2, 0x1C] _0810EDC8: pop {r0} bx r0 .align 2, 0 -_0810EDCC: .4byte sub_810EDD0 + 1 + .pool thumb_func_end sub_810ED70 thumb_func_start sub_810EDD0 @@ -554183,18 +535792,17 @@ sub_810EE14: @ 810EE14 beq _0810EE80 b _0810EEEC _0810EE28: - ldr r0, _0810EE38 + ldr r0, =0x0203841e movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 bne _0810EE40 - ldr r4, _0810EE3C + ldr r4, =0x02038436 b _0810EE42 .align 2, 0 -_0810EE38: .4byte 0x0203841e -_0810EE3C: .4byte 0x02038436 + .pool _0810EE40: - ldr r4, _0810EE7C + ldr r4, =0x02038437 _0810EE42: ldrb r0, [r4] movs r1, 0 @@ -554223,7 +535831,7 @@ _0810EE42: strh r0, [r5, 0x2E] b _0810EEEC .align 2, 0 -_0810EE7C: .4byte 0x02038437 + .pool _0810EE80: movs r1, 0x32 ldrsh r0, [r5, r1] @@ -554253,7 +535861,7 @@ _0810EE92: lsrs r1, 27 movs r0, 0xF4 lsls r0, 6 - ldr r2, _0810EEF4 + ldr r2, =0x02021bc0 lsls r1, 3 adds r1, r2 movs r2, 0x6 @@ -554284,7 +535892,7 @@ _0810EEEC: pop {r0} bx r0 .align 2, 0 -_0810EEF4: .4byte 0x02021bc0 + .pool thumb_func_end sub_810EE14 thumb_func_start sub_810EEF8 @@ -554292,7 +535900,7 @@ sub_810EEF8: @ 810EEF8 push {r4,r5,lr} adds r5, r0, 0 bl GenerateRandomNumber2 - ldr r4, _0810EF1C + ldr r4, =0x000001ff ands r4, r0 bl GenerateRandomNumber2 movs r1, 0x7F @@ -554306,7 +535914,7 @@ sub_810EEF8: @ 810EEF8 adds r0, r4, r2 b _0810EF28 .align 2, 0 -_0810EF1C: .4byte 0x000001ff + .pool _0810EF20: movs r2, 0xB8 lsls r2, 2 @@ -554330,7 +535938,7 @@ _0810EF3C: subs r0, r1 _0810EF44: strh r0, [r5, 0x30] - ldr r2, _0810EF6C + ldr r2, =0x0203841e ldrh r0, [r2] strh r0, [r5, 0x32] lsls r0, 16 @@ -554348,13 +535956,12 @@ _0810EF60: ldrsh r0, [r2, r1] cmp r0, 0 bne _0810EF74 - ldr r4, _0810EF70 + ldr r4, =0x02038436 b _0810EF76 .align 2, 0 -_0810EF6C: .4byte 0x0203841e -_0810EF70: .4byte 0x02038436 + .pool _0810EF74: - ldr r4, _0810EFA0 + ldr r4, =0x02038437 _0810EF76: ldrb r0, [r4] movs r1, 0 @@ -554369,14 +535976,13 @@ _0810EF76: lsrs r0, 24 adds r0, 0x20 strh r0, [r5, 0x22] - ldr r0, _0810EFA4 + ldr r0, =sub_810EFA8 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810EFA0: .4byte 0x02038437 -_0810EFA4: .4byte sub_810EFA8 + 1 + .pool thumb_func_end sub_810EEF8 thumb_func_start sub_810EFA8 @@ -554438,11 +536044,11 @@ sub_810F004: @ 810F004 strh r1, [r0, 0x3A] movs r1, 0x40 strh r1, [r0, 0x3C] - ldr r1, _0810F014 + ldr r1, =sub_810F018 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_0810F014: .4byte sub_810F018 + 1 + .pool thumb_func_end sub_810F004 thumb_func_start sub_810F018 @@ -554514,7 +536120,7 @@ sub_810F084: @ 810F084 mov r8, r0 ldrh r4, [r0, 0x20] ldrh r5, [r0, 0x22] - ldr r6, _0810F138 + ldr r6, =0x02038436 ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -554579,7 +536185,7 @@ sub_810F084: @ 810F084 movs r1, 0x1 adds r2, r3, 0 bl sub_80A73E0 - ldr r0, _0810F13C + ldr r0, =sub_810F140 + 1 mov r2, r8 str r0, [r2, 0x1C] add sp, 0x4 @@ -554590,8 +536196,7 @@ sub_810F084: @ 810F084 pop {r0} bx r0 .align 2, 0 -_0810F138: .4byte 0x02038436 -_0810F13C: .4byte sub_810F140 + 1 + .pool thumb_func_end sub_810F084 thumb_func_start sub_810F140 @@ -554638,7 +536243,7 @@ sub_810F184: @ 810F184 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0810F1B4 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -554647,7 +536252,7 @@ sub_810F184: @ 810F184 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r2, _0810F1B8 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -554658,14 +536263,13 @@ sub_810F184: @ 810F184 orrs r0, r2 b _0810F1DA .align 2, 0 -_0810F1B4: .4byte 0x0203841e -_0810F1B8: .4byte 0x02020630 + .pool _0810F1BC: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r2, _0810F1E8 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -554683,7 +536287,7 @@ _0810F1DA: pop {r0} bx r0 .align 2, 0 -_0810F1E8: .4byte 0x02020630 + .pool thumb_func_end sub_810F184 thumb_func_start sub_810F1EC @@ -554696,7 +536300,7 @@ sub_810F1EC: @ 810F1EC lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0810F2AC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -554767,7 +536371,7 @@ _0810F284: lsls r0, 24 cmp r0, 0 beq _0810F2B8 - ldr r0, _0810F2AC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -554778,20 +536382,20 @@ _0810F284: movs r0, 0x50 b _0810F2F2 .align 2, 0 -_0810F2AC: .4byte 0x02038436 + .pool _0810F2B0: movs r0, 0xB0 strh r0, [r5, 0x20] movs r0, 0x28 b _0810F2F2 _0810F2B8: - ldr r6, _0810F320 + ldr r6, =0x02038436 ldrb r0, [r6] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0810F2CE - ldr r1, _0810F324 + ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] @@ -554800,7 +536404,7 @@ _0810F2CE: movs r1, 0 bl sub_80A5C6C lsls r0, 24 - ldr r4, _0810F324 + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4] adds r0, r1 @@ -554814,7 +536418,7 @@ _0810F2CE: adds r0, r4 _0810F2F2: strh r0, [r5, 0x22] - ldr r0, _0810F324 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] bl gpu_pal_tags_index_of lsls r0, 24 @@ -554829,17 +536433,15 @@ _0810F2F2: ldrh r0, [r5, 0x22] adds r0, 0x9 strh r0, [r5, 0x22] - ldr r1, _0810F328 + ldr r1, =sub_810F3C8 + 1 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 b _0810F330 .align 2, 0 -_0810F320: .4byte 0x02038436 -_0810F324: .4byte 0x0203841e -_0810F328: .4byte sub_810F3C8 + 1 + .pool _0810F32C: - ldr r0, _0810F33C + ldr r0, =sub_810F340 + 1 str r0, [r5, 0x1C] _0810F330: pop {r3} @@ -554848,7 +536450,7 @@ _0810F330: pop {r0} bx r0 .align 2, 0 -_0810F33C: .4byte sub_810F340 + 1 + .pool thumb_func_end sub_810F1EC thumb_func_start sub_810F340 @@ -554872,8 +536474,8 @@ _0810F35C: lsls r0, 24 cmp r0, 0 beq _0810F382 - ldr r2, _0810F3BC - ldr r0, _0810F3C0 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -554893,8 +536495,8 @@ _0810F382: lsls r0, 24 cmp r0, 0 beq _0810F3AC - ldr r2, _0810F3BC - ldr r0, _0810F3C0 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -554907,7 +536509,7 @@ _0810F382: orrs r1, r2 strb r1, [r0] _0810F3AC: - ldr r1, _0810F3C4 + ldr r1, =sub_810F3C8 + 1 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -554916,9 +536518,7 @@ _0810F3B6: pop {r0} bx r0 .align 2, 0 -_0810F3BC: .4byte 0x02020630 -_0810F3C0: .4byte 0x020241e4 -_0810F3C4: .4byte sub_810F3C8 + 1 + .pool thumb_func_end sub_810F340 thumb_func_start sub_810F3C8 @@ -554939,11 +536539,11 @@ sub_810F3C8: @ 810F3C8 ldrsh r0, [r4, r2] cmp r0, 0xD bne _0810F3F4 - ldr r0, _0810F3F0 + ldr r0, =sub_810F400 + 1 str r0, [r4, 0x1C] b _0810F3F8 .align 2, 0 -_0810F3F0: .4byte sub_810F400 + 1 + .pool _0810F3F4: adds r0, r1, 0x1 strh r0, [r4, 0x34] @@ -554967,7 +536567,7 @@ sub_810F400: @ 810F400 movs r0, 0 strh r0, [r3, 0x30] ldrh r4, [r3, 0x2E] - ldr r1, _0810F464 + ldr r1, =0x02037b14 adds r0, r4, 0 adds r0, 0x8 lsls r0, 1 @@ -555001,15 +536601,14 @@ _0810F436: asrs r0, 16 cmp r0, 0x10 bne _0810F45E - ldr r0, _0810F468 + ldr r0, =sub_810F46C + 1 str r0, [r3, 0x1C] _0810F45E: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0810F464: .4byte 0x02037b14 -_0810F468: .4byte sub_810F46C + 1 + .pool thumb_func_end sub_810F400 thumb_func_start sub_810F46C @@ -555048,8 +536647,8 @@ sub_810F46C: @ 810F46C lsls r0, 24 cmp r0, 0 beq _0810F4D4 - ldr r2, _0810F518 - ldr r0, _0810F51C + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -555071,8 +536670,8 @@ _0810F4D4: lsls r0, 24 cmp r0, 0 beq _0810F502 - ldr r2, _0810F518 - ldr r0, _0810F51C + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -555092,16 +536691,14 @@ _0810F502: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _0810F520 + ldr r0, =sub_810F524 + 1 str r0, [r5, 0x1C] _0810F512: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810F518: .4byte 0x02020630 -_0810F51C: .4byte 0x020241e4 -_0810F520: .4byte sub_810F524 + 1 + .pool thumb_func_end sub_810F46C thumb_func_start sub_810F524 @@ -555145,13 +536742,13 @@ _0810F562: adds r0, r5, 0 bl sub_80A477C _0810F57C: - ldr r0, _0810F588 + ldr r0, =move_anim_8072740 + 1 str r0, [r6, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810F588: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_810F524 thumb_func_start sub_810F58C @@ -555162,7 +536759,7 @@ sub_810F58C: @ 810F58C ldrsh r0, [r4, r1] cmp r0, 0 bne _0810F618 - ldr r5, _0810F5D8 + ldr r5, =0x0203841e movs r1, 0x6 ldrsh r0, [r5, r1] movs r6, 0 @@ -555178,7 +536775,7 @@ _0810F5A6: lsls r0, 24 cmp r0, 0 beq _0810F5EE - ldr r0, _0810F5DC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -555193,8 +536790,7 @@ _0810F5A6: strh r0, [r4, 0x22] b _0810F610 .align 2, 0 -_0810F5D8: .4byte 0x0203841e -_0810F5DC: .4byte 0x02038436 + .pool _0810F5E0: ldrh r0, [r5] adds r0, 0xB0 @@ -555204,7 +536800,7 @@ _0810F5E0: strh r0, [r4, 0x22] b _0810F610 _0810F5EE: - ldr r0, _0810F604 + ldr r0, =0x0203841e movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 @@ -555214,7 +536810,7 @@ _0810F5EE: bl sub_80A69CC b _0810F610 .align 2, 0 -_0810F604: .4byte 0x0203841e + .pool _0810F608: adds r0, r4, 0 adds r1, r6, 0 @@ -555244,7 +536840,7 @@ _0810F62C: sub_810F634: @ 810F634 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _0810F67C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -555271,11 +536867,10 @@ sub_810F634: @ 810F634 ldrh r0, [r5, 0x22] adds r0, 0xA strh r0, [r5, 0x22] - ldr r0, _0810F680 + ldr r0, =0x0000ffff b _0810F692 .align 2, 0 -_0810F67C: .4byte 0x02038436 -_0810F680: .4byte 0x0000ffff + .pool _0810F684: ldrh r0, [r5, 0x20] adds r0, 0x28 @@ -555286,24 +536881,23 @@ _0810F684: movs r0, 0x1 _0810F692: strh r0, [r5, 0x30] - ldr r1, _0810F6A8 + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _0810F6AC + ldr r0, =sub_80A67D8 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810F6A8: .4byte move_anim_8072740 + 1 -_0810F6AC: .4byte sub_80A67D8 + 1 + .pool thumb_func_end sub_810F634 thumb_func_start sub_810F6B0 sub_810F6B0: @ 810F6B0 push {r4-r7,lr} adds r5, r0, 0 - ldr r6, _0810F734 + ldr r6, =0x02038436 ldrb r0, [r6] movs r1, 0x1 bl sub_80A861C @@ -555355,18 +536949,16 @@ _0810F6F6: movs r0, 0x10 strh r0, [r5, 0x22] _0810F722: - ldr r1, _0810F738 + ldr r1, =sub_810F740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _0810F73C + ldr r0, =sub_80A67D8 + 1 str r0, [r5, 0x1C] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0810F734: .4byte 0x02038436 -_0810F738: .4byte sub_810F740 + 1 -_0810F73C: .4byte sub_80A67D8 + 1 + .pool thumb_func_end sub_810F6B0 thumb_func_start sub_810F740 @@ -555380,20 +536972,19 @@ sub_810F740: @ 810F740 movs r1, 0x1 orrs r0, r1 strb r0, [r4, 0x1] - ldr r0, _0810F76C + ldr r0, =0x08596740 str r0, [r4, 0x10] movs r0, 0 strh r0, [r4, 0x2E] adds r0, r4, 0 bl obj_alloc_rotscale_entry - ldr r0, _0810F770 + ldr r0, =sub_810F774 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810F76C: .4byte 0x08596740 -_0810F770: .4byte sub_810F774 + 1 + .pool thumb_func_end sub_810F740 thumb_func_start sub_810F774 @@ -555456,7 +537047,7 @@ sub_810F7D4: @ 810F7D4 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0810F804 + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 bl obj_id_for_side_relative_to_move @@ -555464,18 +537055,16 @@ sub_810F7D4: @ 810F7D4 lsls r1, 24 lsrs r1, 24 strh r1, [r4, 0x8] - ldr r2, _0810F808 + ldr r2, =0x0859675c adds r0, r4, 0 bl sub_80A7CFC - ldr r0, _0810F80C + ldr r0, =sub_810F810 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810F804: .4byte 0x03005e00 -_0810F808: .4byte 0x0859675c -_0810F80C: .4byte sub_810F810 + 1 + .pool thumb_func_end sub_810F7D4 thumb_func_start sub_810F810 @@ -555486,7 +537075,7 @@ sub_810F810: @ 810F810 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0810F838 + ldr r1, =0x03005e00 adds r0, r1 bl sub_80A7D34 lsls r0, 24 @@ -555499,7 +537088,7 @@ _0810F830: pop {r0} bx r0 .align 2, 0 -_0810F838: .4byte 0x03005e00 + .pool thumb_func_end sub_810F810 thumb_func_start sub_810F83C @@ -555510,7 +537099,7 @@ sub_810F83C: @ 810F83C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0810F888 + ldr r0, =0x03005e00 adds r4, r1, r0 movs r0, 0 bl obj_id_for_side_relative_to_move @@ -555520,7 +537109,7 @@ sub_810F83C: @ 810F83C strh r0, [r4, 0x8] strh r1, [r4, 0xA] strh r1, [r4, 0xC] - ldr r0, _0810F88C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -555531,19 +537120,16 @@ sub_810F83C: @ 810F83C _0810F870: strh r1, [r4, 0xE] ldrb r1, [r4, 0x8] - ldr r2, _0810F890 + ldr r2, =0x0859677c adds r0, r4, 0 bl sub_80A7CFC - ldr r0, _0810F894 + ldr r0, =sub_810F898 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_0810F888: .4byte 0x03005e00 -_0810F88C: .4byte 0x02038436 -_0810F890: .4byte 0x0859677c -_0810F894: .4byte sub_810F898 + 1 + .pool thumb_func_end sub_810F83C thumb_func_start sub_810F898 @@ -555554,7 +537140,7 @@ sub_810F898: @ 810F898 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0810F8B8 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0xA ldrsh r0, [r4, r1] @@ -555564,7 +537150,7 @@ sub_810F898: @ 810F898 beq _0810F8D8 b _0810F936 .align 2, 0 -_0810F8B8: .4byte 0x03005e00 + .pool _0810F8BC: adds r0, r4, 0 bl sub_80A7D34 @@ -555584,7 +537170,7 @@ _0810F8D8: ldrsh r0, [r4, r1] cmp r0, 0 beq _0810F900 - ldr r2, _0810F8FC + ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -555599,9 +537185,9 @@ _0810F8D8: strh r0, [r4, 0xE] b _0810F936 .align 2, 0 -_0810F8FC: .4byte 0x02020630 + .pool _0810F900: - ldr r3, _0810F93C + ldr r3, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -555631,7 +537217,7 @@ _0810F936: pop {r0} bx r0 .align 2, 0 -_0810F93C: .4byte 0x02020630 + .pool thumb_func_end sub_810F898 thumb_func_start sub_810F940 @@ -555642,13 +537228,13 @@ sub_810F940: @ 810F940 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0810F9C8 + ldr r0, =0x03005e00 adds r5, r1, r0 movs r1, 0 movs r0, 0x10 strh r0, [r5, 0xE] strh r1, [r5, 0x10] - ldr r4, _0810F9CC + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -555692,15 +537278,13 @@ _0810F9AA: movs r0, 0x52 movs r1, 0x10 bl lcd_io_set - ldr r0, _0810F9D0 + ldr r0, =sub_810F9D4 + 1 str r0, [r5] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810F9C8: .4byte 0x03005e00 -_0810F9CC: .4byte 0x02038436 -_0810F9D0: .4byte sub_810F9D4 + 1 + .pool thumb_func_end sub_810F940 thumb_func_start sub_810F9D4 @@ -555711,7 +537295,7 @@ sub_810F9D4: @ 810F9D4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0810F9F8 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -555723,7 +537307,7 @@ sub_810F9D4: @ 810F9D4 beq _0810FA0A b _0810FB5A .align 2, 0 -_0810F9F8: .4byte 0x03005e00 + .pool _0810F9FC: cmp r1, 0x2 bne _0810FA02 @@ -555745,7 +537329,7 @@ _0810FA0A: b _0810FB5A _0810FA1A: strh r1, [r4, 0xA] - ldr r0, _0810FA58 + ldr r0, =0x08596794 movs r2, 0x22 ldrsh r1, [r4, r2] movs r3, 0x24 @@ -555774,7 +537358,7 @@ _0810FA1A: beq _0810FA66 b _0810FABE .align 2, 0 -_0810FA58: .4byte 0x08596794 + .pool _0810FA5C: cmp r0, 0x2 beq _0810FA90 @@ -555782,7 +537366,7 @@ _0810FA5C: beq _0810FAA8 b _0810FABE _0810FA66: - ldr r0, _0810FA74 + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -555790,9 +537374,9 @@ _0810FA66: ldrh r0, [r4, 0x20] b _0810FAB6 .align 2, 0 -_0810FA74: .4byte 0x02020630 + .pool _0810FA78: - ldr r0, _0810FA8C + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -555803,9 +537387,9 @@ _0810FA78: ldrh r0, [r4, 0x20] b _0810FABC .align 2, 0 -_0810FA8C: .4byte 0x02020630 + .pool _0810FA90: - ldr r1, _0810FAA4 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -555816,9 +537400,9 @@ _0810FA90: strh r1, [r0, 0x26] b _0810FABE .align 2, 0 -_0810FAA4: .4byte 0x02020630 + .pool _0810FAA8: - ldr r0, _0810FAD0 + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -555841,7 +537425,7 @@ _0810FABE: bne _0810FB5A b _0810FB36 .align 2, 0 -_0810FAD0: .4byte 0x02020630 + .pool _0810FAD4: ldrh r0, [r4, 0xA] ands r1, r0 @@ -555885,7 +537469,7 @@ _0810FB10: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0810FB40 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles _0810FB2C: @@ -555900,7 +537484,7 @@ _0810FB36: strh r0, [r4, 0x8] b _0810FB5A .align 2, 0 -_0810FB40: .4byte 0x02020630 + .pool _0810FB44: movs r0, 0x52 movs r1, 0 @@ -555961,12 +537545,12 @@ _0810FB9C: sub_810FBA8: @ 810FBA8 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _0810FBE4 + ldr r6, =0x0203841e movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 bne _0810FBD4 - ldr r4, _0810FBE8 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -555982,15 +537566,13 @@ sub_810FBA8: @ 810FBA8 _0810FBD4: ldrh r0, [r6, 0x2] strh r0, [r5, 0x2E] - ldr r0, _0810FBEC + ldr r0, =sub_810FB60 + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810FBE4: .4byte 0x0203841e -_0810FBE8: .4byte 0x02038436 -_0810FBEC: .4byte sub_810FB60 + 1 + .pool thumb_func_end sub_810FBA8 thumb_func_start sub_810FBF0 @@ -556001,20 +537583,20 @@ sub_810FBF0: @ 810FBF0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0810FC4C + ldr r0, =0x03005e00 adds r5, r1, r0 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 beq _0810FC94 - ldr r0, _0810FC50 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x1 bne _0810FC60 - ldr r0, _0810FC54 + ldr r0, =0x0000fff6 strh r0, [r5, 0x1C] - ldr r4, _0810FC58 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x5 bl sub_80A861C @@ -556025,7 +537607,7 @@ sub_810FBF0: @ 810FBF0 bl sub_80A861C adds r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _0810FC5C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x5 bl sub_80A861C @@ -556037,15 +537619,11 @@ sub_810FBF0: @ 810FBF0 adds r0, 0x8 b _0810FD1E .align 2, 0 -_0810FC4C: .4byte 0x03005e00 -_0810FC50: .4byte 0x0203841e -_0810FC54: .4byte 0x0000fff6 -_0810FC58: .4byte 0x02038437 -_0810FC5C: .4byte 0x02038436 + .pool _0810FC60: movs r0, 0xA strh r0, [r5, 0x1C] - ldr r4, _0810FC8C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x4 bl sub_80A861C @@ -556056,24 +537634,23 @@ _0810FC60: bl sub_80A861C subs r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _0810FC90 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x4 bl sub_80A861C adds r0, 0x8 b _0810FD12 .align 2, 0 -_0810FC8C: .4byte 0x02038436 -_0810FC90: .4byte 0x02038437 + .pool _0810FC94: - ldr r0, _0810FCD8 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x1 bne _0810FCE8 - ldr r0, _0810FCDC + ldr r0, =0x0000fff6 strh r0, [r5, 0x1C] - ldr r4, _0810FCE0 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x4 bl sub_80A861C @@ -556084,7 +537661,7 @@ _0810FC94: bl sub_80A861C adds r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _0810FCE4 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x4 bl sub_80A861C @@ -556096,14 +537673,11 @@ _0810FC94: adds r0, 0x8 b _0810FD1E .align 2, 0 -_0810FCD8: .4byte 0x0203841e -_0810FCDC: .4byte 0x0000fff6 -_0810FCE0: .4byte 0x02038437 -_0810FCE4: .4byte 0x02038436 + .pool _0810FCE8: movs r0, 0xA strh r0, [r5, 0x1C] - ldr r4, _0810FD30 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x5 bl sub_80A861C @@ -556114,7 +537688,7 @@ _0810FCE8: bl sub_80A861C subs r0, 0x8 strh r0, [r5, 0x20] - ldr r4, _0810FD34 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x5 bl sub_80A861C @@ -556129,15 +537703,13 @@ _0810FD1E: strh r0, [r5, 0x24] movs r0, 0x6 strh r0, [r5, 0xA] - ldr r0, _0810FD38 + ldr r0, =sub_810FD3C + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0810FD30: .4byte 0x02038436 -_0810FD34: .4byte 0x02038437 -_0810FD38: .4byte sub_810FD3C + 1 + .pool thumb_func_end sub_810FBF0 thumb_func_start sub_810FD3C @@ -556148,7 +537720,7 @@ sub_810FD3C: @ 810FD3C lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0810FD5C + ldr r1, =0x03005e00 adds r5, r0, r1 movs r0, 0x8 ldrsh r1, [r5, r0] @@ -556158,7 +537730,7 @@ sub_810FD3C: @ 810FD3C beq _0810FDD4 b _0810FDE8 .align 2, 0 -_0810FD5C: .4byte 0x03005e00 + .pool _0810FD60: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -556168,7 +537740,7 @@ _0810FD60: cmp r0, 0x6 ble _0810FDE8 strh r1, [r5, 0xA] - ldr r0, _0810FDCC + ldr r0, =0x08596864 movs r2, 0x1E ldrsh r1, [r5, r2] movs r3, 0x20 @@ -556179,7 +537751,7 @@ _0810FD60: lsrs r1, r0, 24 cmp r1, 0x40 beq _0810FDB4 - ldr r0, _0810FDD0 + ldr r0, =0x02020630 lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -556212,8 +537784,7 @@ _0810FDB4: strh r0, [r5, 0x8] b _0810FDE8 .align 2, 0 -_0810FDCC: .4byte 0x08596864 -_0810FDD0: .4byte 0x02020630 + .pool _0810FDD4: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -556259,9 +537830,9 @@ sub_810FE14: @ 810FE14 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0810FE4C + ldr r0, =0x03005e00 adds r4, r1, r0 - ldr r0, _0810FE50 + ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A6190 lsls r0, 24 @@ -556269,7 +537840,7 @@ sub_810FE14: @ 810FE14 adds r0, r1, 0 subs r0, 0x20 strh r0, [r4, 0x24] - ldr r0, _0810FE54 + ldr r0, =0x0203841e movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0x1 @@ -556280,9 +537851,7 @@ sub_810FE14: @ 810FE14 beq _0810FE5E b _0810FE86 .align 2, 0 -_0810FE4C: .4byte 0x03005e00 -_0810FE50: .4byte 0x02038437 -_0810FE54: .4byte 0x0203841e + .pool _0810FE58: cmp r0, 0x2 beq _0810FE76 @@ -556319,27 +537888,25 @@ _0810FE86: movs r0, 0 strh r0, [r4, 0x24] _0810FE92: - ldr r0, _0810FEAC + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0810FEB8 - ldr r0, _0810FEB0 + ldr r0, =0x02022e18 ldrh r0, [r0] strh r0, [r4, 0x1C] - ldr r0, _0810FEB4 + ldr r0, =0x04000014 b _0810FEC0 .align 2, 0 -_0810FEAC: .4byte 0x02038437 -_0810FEB0: .4byte 0x02022e18 -_0810FEB4: .4byte 0x04000014 + .pool _0810FEB8: - ldr r0, _0810FF20 + ldr r0, =0x02022e1c ldrh r0, [r0] strh r0, [r4, 0x1C] - ldr r0, _0810FF24 + ldr r0, =0x04000018 _0810FEC0: str r0, [sp] ldrh r1, [r4, 0x24] @@ -556350,7 +537917,7 @@ _0810FEC0: adds r0, 0x40 cmp r1, r0 bgt _0810FEFA - ldr r5, _0810FF28 + ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -556372,7 +537939,7 @@ _0810FEDA: cmp r1, r0 ble _0810FEDA _0810FEFA: - ldr r0, _0810FF2C + ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r1, sp movs r2, 0 @@ -556384,18 +537951,14 @@ _0810FEFA: ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, _0810FF30 + ldr r0, =sub_810FF34 + 1 str r0, [r4] add sp, 0xC pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0810FF20: .4byte 0x02022e1c -_0810FF24: .4byte 0x04000018 -_0810FF28: .4byte 0x02038c28 -_0810FF2C: .4byte 0xa2600001 -_0810FF30: .4byte sub_810FF34 + 1 + .pool thumb_func_end sub_810FE14 thumb_func_start sub_810FF34 @@ -556409,7 +537972,7 @@ sub_810FF34: @ 810FF34 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0810FF5C + ldr r1, =0x03005e00 adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -556421,7 +537984,7 @@ sub_810FF34: @ 810FF34 beq _0810FF66 b _08110026 .align 2, 0 -_0810FF5C: .4byte 0x03005e00 + .pool _0810FF60: cmp r0, 0x2 beq _08110020 @@ -556435,10 +537998,10 @@ _0810FF66: ldrsh r0, [r5, r2] cmp r1, r0 bgt _0810FFFE - ldr r0, _0810FFB0 + ldr r0, =0x08329f40 mov r9, r0 movs r7, 0x3 - ldr r1, _0810FFB4 + ldr r1, =0x02038c28 mov r12, r1 movs r2, 0xF0 lsls r2, 3 @@ -556465,8 +538028,7 @@ _0810FF88: adds r0, r3, r0 b _0810FFC4 .align 2, 0 -_0810FFB0: .4byte 0x08329f40 -_0810FFB4: .4byte 0x02038c28 + .pool _0810FFB8: cmp r3, 0 bge _0810FFC8 @@ -556515,7 +538077,7 @@ _0810FFFE: ble _08110026 b _08110014 _0811000E: - ldr r1, _0811001C + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] _08110014: @@ -556524,7 +538086,7 @@ _08110014: strh r0, [r5, 0x8] b _08110026 .align 2, 0 -_0811001C: .4byte 0x02039b28 + .pool _08110020: adds r0, r2, 0 bl move_anim_task_del @@ -556550,7 +538112,7 @@ sub_8110034: @ 8110034 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08110068 + ldr r1, =0x03005e00 adds r7, r0, r1 bl rotscale_alloc_entry lsls r0, 24 @@ -556563,9 +538125,9 @@ sub_8110034: @ 8110034 bl move_anim_task_del b _08110116 .align 2, 0 -_08110068: .4byte 0x03005e00 + .pool _0811006C: - ldr r1, _08110090 + ldr r1, =0x0203841e ldrb r0, [r1] bl duplicate_obj_of_side_rel2move_in_transparent_mode lsls r0, 16 @@ -556580,16 +538142,16 @@ _0811006C: bl move_anim_task_del b _08110116 .align 2, 0 -_08110090: .4byte 0x0203841e + .pool _08110094: - ldr r2, _08110124 + ldr r2, =0x02020630 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 adds r0, r2, 0 adds r0, 0x1C adds r0, r4, r0 - ldr r1, _08110128 + ldr r1, =nullsub_12 + 1 str r1, [r0] adds r4, r2 ldrb r0, [r4, 0x1] @@ -556632,7 +538194,7 @@ _08110094: lsrs r3, 30 adds r0, r4, 0 bl oam_center - ldr r1, _0811012C + ldr r1, =0x0203841e ldrb r0, [r1] bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -556642,7 +538204,7 @@ _08110094: strh r0, [r7, 0x24] mov r1, r9 strh r1, [r7, 0x26] - ldr r0, _08110130 + ldr r0, =sub_8110134 + 1 str r0, [r7] _08110116: pop {r3-r5} @@ -556653,10 +538215,7 @@ _08110116: pop {r0} bx r0 .align 2, 0 -_08110124: .4byte 0x02020630 -_08110128: .4byte nullsub_12 + 1 -_0811012C: .4byte 0x0203841e -_08110130: .4byte sub_8110134 + 1 + .pool thumb_func_end sub_8110034 thumb_func_start sub_8110134 @@ -556667,7 +538226,7 @@ sub_8110134: @ 8110134 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08110158 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -556679,7 +538238,7 @@ sub_8110134: @ 8110134 beq _08110166 b _08110238 .align 2, 0 -_08110158: .4byte 0x03005e00 + .pool _0811015C: cmp r0, 0x2 beq _08110208 @@ -556690,7 +538249,7 @@ _08110166: ldrh r0, [r4, 0xA] adds r0, 0x4 strh r0, [r4, 0xA] - ldr r1, _081101B4 + ldr r1, =0x08329f40 movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 1 @@ -556724,12 +538283,12 @@ _08110166: bne _08110238 b _0811021A .align 2, 0 -_081101B4: .4byte 0x08329f40 + .pool _081101B8: ldrh r0, [r4, 0xA] subs r0, 0x4 strh r0, [r4, 0xA] - ldr r1, _08110204 + ldr r1, =0x08329f40 movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 1 @@ -556763,14 +538322,14 @@ _081101B8: bne _08110238 b _0811021A .align 2, 0 -_08110204: .4byte 0x08329f40 + .pool _08110208: movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08110224 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_but_dont_free_vram _0811021A: @@ -556779,7 +538338,7 @@ _0811021A: strh r0, [r4, 0x8] b _08110238 .align 2, 0 -_08110224: .4byte 0x02020630 + .pool _08110228: ldrh r0, [r4, 0x24] lsls r0, 24 @@ -556813,7 +538372,7 @@ _08110256: beq _0811034A b _08110360 _08110260: - ldr r4, _081102B4 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -556851,7 +538410,7 @@ _0811028E: bl lcd_io_set b _081102E2 .align 2, 0 -_081102B4: .4byte 0x02038436 + .pool _081102B8: adds r0, r5, 0 adds r0, 0x3F @@ -556951,7 +538510,7 @@ sub_8110368: @ 8110368 adds r0, r6, 0 movs r1, 0x2 bl sub_8008258 - ldr r0, _08110390 + ldr r0, =0x0203841e ldrh r1, [r0, 0x4] negs r1, r1 strh r1, [r0, 0x4] @@ -556960,9 +538519,9 @@ sub_8110368: @ 8110368 strh r1, [r0] b _081103C4 .align 2, 0 -_08110390: .4byte 0x0203841e + .pool _08110394: - ldr r0, _08110428 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -556971,7 +538530,7 @@ _08110394: adds r0, r6, 0 movs r1, 0x1 bl sub_8008258 - ldr r1, _0811042C + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 strh r0, [r1, 0x2] @@ -556985,12 +538544,12 @@ _08110394: negs r0, r0 strh r0, [r1] _081103C4: - ldr r5, _08110428 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A60AC lsls r0, 24 - ldr r4, _0811042C + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4] adds r0, r1 @@ -557021,19 +538580,16 @@ _081103C4: ldrh r4, [r4, 0x6] adds r0, r4 strh r0, [r6, 0x36] - ldr r0, _08110430 + ldr r0, =sub_80A6EEC + 1 str r0, [r6, 0x1C] - ldr r1, _08110434 + ldr r1, =move_anim_8072740 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08110428: .4byte 0x02038437 -_0811042C: .4byte 0x0203841e -_08110430: .4byte sub_80A6EEC + 1 -_08110434: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8110368 thumb_func_start sub_8110438 @@ -557044,7 +538600,7 @@ sub_8110438: @ 8110438 lsls r0, 24 cmp r0, 0 beq _0811045C - ldr r1, _08110458 + ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] @@ -557053,15 +538609,15 @@ sub_8110438: @ 8110438 bl sub_8008258 b _08110478 .align 2, 0 -_08110458: .4byte 0x0203841e + .pool _0811045C: - ldr r0, _081104D4 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _08110478 - ldr r0, _081104D8 + ldr r0, =0x0203841e ldrh r1, [r0, 0x2] negs r1, r1 strh r1, [r0, 0x2] @@ -557069,12 +538625,12 @@ _0811045C: negs r1, r1 strh r1, [r0] _08110478: - ldr r5, _081104D4 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A60AC lsls r0, 24 - ldr r4, _081104D8 + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4] adds r0, r1 @@ -557101,19 +538657,16 @@ _08110478: lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x36] - ldr r0, _081104DC + ldr r0, =sub_80A6EEC + 1 str r0, [r6, 0x1C] - ldr r1, _081104E0 + ldr r1, =move_anim_8072740 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081104D4: .4byte 0x02038437 -_081104D8: .4byte 0x0203841e -_081104DC: .4byte sub_80A6EEC + 1 -_081104E0: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8110438 thumb_func_start sub_81104E4 @@ -557124,7 +538677,7 @@ sub_81104E4: @ 81104E4 lsls r0, 24 cmp r0, 0 beq _08110500 - ldr r0, _08110540 + ldr r0, =0x0203841e movs r2, 0x4 ldrsh r1, [r0, r2] lsrs r2, r1, 31 @@ -557135,7 +538688,7 @@ _08110500: adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC - ldr r1, _08110540 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] @@ -557146,7 +538699,7 @@ _08110500: ldrsh r0, [r1, r2] cmp r0, 0 bne _08110548 - ldr r4, _08110544 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -557161,10 +538714,9 @@ _08110500: strh r0, [r5, 0x36] b _0811055A .align 2, 0 -_08110540: .4byte 0x0203841e -_08110544: .4byte 0x02038437 + .pool _08110548: - ldr r0, _08110570 + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x32 @@ -557175,18 +538727,16 @@ _08110548: _0811055A: adds r0, r5, 0 bl sub_80A6FD4 - ldr r0, _08110574 + ldr r0, =0x0203841e ldrh r0, [r0, 0x6] strh r0, [r5, 0x38] - ldr r0, _08110578 + ldr r0, =sub_811057C + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08110570: .4byte 0x02038437 -_08110574: .4byte 0x0203841e -_08110578: .4byte sub_811057C + 1 + .pool thumb_func_end sub_81104E4 thumb_func_start sub_811057C @@ -557224,7 +538774,7 @@ _081105AE: sub_81105B4: @ 81105B4 push {r4,lr} adds r4, r0, 0 - ldr r0, _081105E4 + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 adds r2, 0x20 @@ -557232,24 +538782,22 @@ sub_81105B4: @ 81105B4 adds r3, 0x22 movs r1, 0 bl sub_80A8924 - ldr r0, _081105E8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _081105F0 - ldr r0, _081105EC + ldr r0, =0x0203841e ldrh r1, [r4, 0x20] ldrh r2, [r0] subs r1, r2 strh r1, [r4, 0x20] b _081105FC .align 2, 0 -_081105E4: .4byte 0x02038437 -_081105E8: .4byte 0x02038436 -_081105EC: .4byte 0x0203841e + .pool _081105F0: - ldr r1, _08110624 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -557260,7 +538808,7 @@ _081105FC: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, _08110628 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -557270,15 +538818,13 @@ _081105FC: adds r0, 0x8 strh r0, [r4, 0x22] _08110618: - ldr r0, _0811062C + ldr r0, =sub_8110630 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08110624: .4byte 0x0203841e -_08110628: .4byte 0x02038437 -_0811062C: .4byte sub_8110630 + 1 + .pool thumb_func_end sub_81105B4 thumb_func_start sub_8110630 @@ -557337,13 +538883,13 @@ sub_811067C: @ 811067C bl lcd_io_set movs r0, 0x10 strh r0, [r4, 0x2E] - ldr r0, _081106A0 + ldr r0, =sub_81106A4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081106A0: .4byte sub_81106A4 + 1 + .pool thumb_func_end sub_811067C thumb_func_start sub_81106A4 @@ -557387,14 +538933,14 @@ _081106B8: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _081106FC + ldr r0, =sub_8110700 + 1 str r0, [r4, 0x1C] _081106F6: pop {r4} pop {r0} bx r0 .align 2, 0 -_081106FC: .4byte sub_8110700 + 1 + .pool thumb_func_end sub_81106A4 thumb_func_start sub_8110700 @@ -557423,21 +538969,21 @@ sub_8110720: @ 8110720 lsls r0, 24 cmp r0, 0 beq _08110740 - ldr r1, _0811073C + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] b _08110762 .align 2, 0 -_0811073C: .4byte 0x0203841e + .pool _08110740: - ldr r0, _0811083C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08110762 - ldr r1, _08110840 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] @@ -557452,11 +538998,11 @@ _08110762: lsls r0, 24 cmp r0, 0 bne _081107B2 - ldr r0, _0811083C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner adds r4, r0, 0 - ldr r5, _08110844 + ldr r5, =0x02038437 ldrb r0, [r5] bl battle_side_get_owner lsls r4, 24 @@ -557475,7 +539021,7 @@ _08110762: cmp r0, 0x1 bne _081107B2 _081107A0: - ldr r0, _08110840 + ldr r0, =0x0203841e movs r2, 0x4 ldrsh r1, [r0, r2] negs r1, r1 @@ -557488,13 +539034,13 @@ _081107B2: adds r0, r7, 0 movs r1, 0x1 bl sub_80A69CC - ldr r5, _08110844 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C adds r4, r0, 0 lsls r4, 24 - ldr r6, _08110840 + ldr r6, =0x0203841e lsrs r4, 24 ldrh r0, [r6, 0x4] adds r4, r0 @@ -557538,9 +539084,9 @@ _081107B2: strh r0, [r7, 0x2E] strh r4, [r7, 0x32] strh r5, [r7, 0x36] - ldr r0, _08110848 + ldr r0, =sub_80A6EEC + 1 str r0, [r7, 0x1C] - ldr r1, _0811084C + ldr r1, =move_anim_8072740 + 1 adds r0, r7, 0 bl oamt_set_x3A_32 add sp, 0x4 @@ -557548,11 +539094,7 @@ _081107B2: pop {r0} bx r0 .align 2, 0 -_0811083C: .4byte 0x02038436 -_08110840: .4byte 0x0203841e -_08110844: .4byte 0x02038437 -_08110848: .4byte sub_80A6EEC + 1 -_0811084C: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8110720 thumb_func_start sub_8110850 @@ -557561,21 +539103,21 @@ sub_8110850: @ 8110850 adds r6, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _081108BC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08110870 - ldr r1, _081108C0 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] _08110870: - ldr r4, _081108C0 + ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, _081108C4 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -557596,7 +539138,7 @@ _08110870: strh r0, [r6, 0x38] adds r0, r6, 0 bl sub_80A68D4 - ldr r0, _081108C8 + ldr r0, =sub_81108CC + 1 str r0, [r6, 0x1C] adds r2, r6, 0 adds r2, 0x3E @@ -557608,10 +539150,7 @@ _08110870: pop {r0} bx r0 .align 2, 0 -_081108BC: .4byte 0x02038436 -_081108C0: .4byte 0x0203841e -_081108C4: .4byte 0x02038437 -_081108C8: .4byte sub_81108CC + 1 + .pool thumb_func_end sub_8110850 thumb_func_start sub_81108CC @@ -557721,18 +539260,17 @@ _08110988: sub_8110994: @ 8110994 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _081109A8 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _081109B0 - ldr r4, _081109AC + ldr r4, =0x02038436 b _081109B2 .align 2, 0 -_081109A8: .4byte 0x0203841e -_081109AC: .4byte 0x02038436 + .pool _081109B0: - ldr r4, _081109E4 + ldr r4, =0x02038437 _081109B2: ldrb r0, [r4] movs r1, 0x2 @@ -557747,30 +539285,28 @@ _081109B2: lsrs r0, 24 adds r0, 0x12 strh r0, [r5, 0x22] - ldr r1, _081109E8 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _081109EC + ldr r0, =sub_80A67BC + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081109E4: .4byte 0x02038437 -_081109E8: .4byte move_anim_8074EE0 + 1 -_081109EC: .4byte sub_80A67BC + 1 + .pool thumb_func_end sub_8110994 thumb_func_start sub_81109F0 sub_81109F0: @ 81109F0 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _08110A5C + ldr r6, =0x0203841e movs r1, 0x6 ldrsh r0, [r6, r1] cmp r0, 0 beq _08110A10 - ldr r0, _08110A60 + ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 adds r2, 0x20 @@ -557798,14 +539334,14 @@ _08110A10: strh r0, [r5, 0x32] movs r0, 0x10 strh r0, [r5, 0x34] - ldr r0, _08110A64 + ldr r0, =0x0000ffba strh r0, [r5, 0x36] ldrh r0, [r6, 0x4] strh r0, [r5, 0x38] - ldr r1, _08110A68 + ldr r1, =sub_8110A70 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r1, _08110A6C + ldr r1, =sub_80A6450 + 1 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 @@ -557813,11 +539349,7 @@ _08110A10: pop {r0} bx r0 .align 2, 0 -_08110A5C: .4byte 0x0203841e -_08110A60: .4byte 0x02038437 -_08110A64: .4byte 0x0000ffba -_08110A68: .4byte sub_8110A70 + 1 -_08110A6C: .4byte sub_80A6450 + 1 + .pool thumb_func_end sub_81109F0 thumb_func_start sub_8110A70 @@ -557835,12 +539367,12 @@ sub_8110A70: @ 8110A70 strh r0, [r4, 0x32] movs r0, 0x20 strh r0, [r4, 0x34] - ldr r0, _08110AA8 + ldr r0, =0x0000ffe8 strh r0, [r4, 0x36] - ldr r1, _08110AAC + ldr r1, =move_anim_8074EE0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r1, _08110AB0 + ldr r1, =sub_80A6450 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -557848,21 +539380,19 @@ sub_8110A70: @ 8110A70 pop {r0} bx r0 .align 2, 0 -_08110AA8: .4byte 0x0000ffe8 -_08110AAC: .4byte move_anim_8074EE0 + 1 -_08110AB0: .4byte sub_80A6450 + 1 + .pool thumb_func_end sub_8110A70 thumb_func_start sub_8110AB4 sub_8110AB4: @ 8110AB4 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08110ADC + ldr r4, =0x0203841e ldrb r1, [r4, 0xA] bl obj_anim_image_start adds r0, r5, 0 bl obj_anim_step - ldr r0, _08110AE0 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -557873,15 +539403,14 @@ sub_8110AB4: @ 8110AB4 subs r0, r1 b _08110AEA .align 2, 0 -_08110ADC: .4byte 0x0203841e -_08110AE0: .4byte 0x02038436 + .pool _08110AE4: ldrh r0, [r4] ldrh r1, [r5, 0x20] adds r0, r1 _08110AEA: strh r0, [r5, 0x20] - ldr r3, _08110B2C + ldr r3, =0x0203841e ldrh r2, [r3, 0x2] ldrh r0, [r5, 0x22] adds r2, r0 @@ -557902,25 +539431,23 @@ _08110AEA: bl sub_80A6E14 strh r4, [r5, 0x34] strh r4, [r5, 0x36] - ldr r0, _08110B30 + ldr r0, =sub_80A656C + 1 str r0, [r5, 0x1C] - ldr r1, _08110B34 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08110B2C: .4byte 0x0203841e -_08110B30: .4byte sub_80A656C + 1 -_08110B34: .4byte move_anim_8074EE0 + 1 + .pool thumb_func_end sub_8110AB4 thumb_func_start sub_8110B38 sub_8110B38: @ 8110B38 push {r4,lr} adds r4, r0, 0 - ldr r0, _08110B50 + ldr r0, =0x0203841e movs r1, 0xC ldrsh r0, [r0, r1] cmp r0, 0 @@ -557930,13 +539457,13 @@ sub_8110B38: @ 8110B38 bl sub_80A69CC b _08110B5C .align 2, 0 -_08110B50: .4byte 0x0203841e + .pool _08110B54: adds r0, r4, 0 movs r1, 0 bl sub_80A6980 _08110B5C: - ldr r1, _08110B78 + ldr r1, =0x0203841e ldrh r0, [r1, 0x6] strh r0, [r4, 0x2E] ldrh r0, [r1, 0x4] @@ -557945,14 +539472,13 @@ _08110B5C: strh r0, [r4, 0x32] ldrh r0, [r1, 0xA] strh r0, [r4, 0x34] - ldr r0, _08110B7C + ldr r0, =sub_8110B80 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08110B78: .4byte 0x0203841e -_08110B7C: .4byte sub_8110B80 + 1 + .pool thumb_func_end sub_8110B38 thumb_func_start sub_8110B80 @@ -558003,7 +539529,7 @@ sub_8110BCC: @ 8110BCC lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r1, _08110C88 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -558027,9 +539553,9 @@ sub_8110BCC: @ 8110BCC movs r2, 0x1 bl lcd_bg_operations _08110C10: - ldr r0, _08110C8C + ldr r0, =0x02022e18 strh r5, [r0] - ldr r4, _08110C90 + ldr r4, =0x02022e1a strh r5, [r4] movs r0, 0x14 movs r1, 0 @@ -558041,26 +539567,26 @@ _08110C10: bl sub_80A6B30 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _08110C94 + ldr r1, =0x08d8d58c mov r2, sp ldrh r2, [r2, 0xA] bl sub_80A6CC0 - ldr r1, _08110C98 + ldr r1, =0x08d8d410 mov r0, sp movs r2, 0 bl sub_80A6D60 - ldr r0, _08110C9C + ldr r0, =0x08d8dab8 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette - ldr r0, _08110CA0 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 beq _08110C6E - ldr r0, _08110CA4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -558068,29 +539594,20 @@ _08110C10: beq _08110C6E movs r5, 0x1 _08110C6E: - ldr r0, _08110CA8 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 strh r5, [r1, 0x8] - ldr r0, _08110CAC + ldr r0, =sub_8110CB0 + 1 str r0, [r1] add sp, 0x10 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08110C88: .4byte 0x00003f42 -_08110C8C: .4byte 0x02022e18 -_08110C90: .4byte 0x02022e1a -_08110C94: .4byte 0x08d8d58c -_08110C98: .4byte 0x08d8d410 -_08110C9C: .4byte 0x08d8dab8 -_08110CA0: .4byte 0x0203841e -_08110CA4: .4byte 0x02038436 -_08110CA8: .4byte 0x03005e00 -_08110CAC: .4byte sub_8110CB0 + 1 + .pool thumb_func_end sub_8110BCC thumb_func_start sub_8110CB0 @@ -558099,7 +539616,7 @@ sub_8110CB0: @ 8110CB0 sub sp, 0x10 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08110CD8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -558109,24 +539626,22 @@ sub_8110CB0: @ 8110CB0 adds r2, r1, 0 cmp r0, 0 bne _08110CE4 - ldr r1, _08110CDC - ldr r3, _08110CE0 + ldr r1, =0x02022e18 + ldr r3, =0x0000fffa adds r0, r3, 0 ldrh r3, [r1] adds r0, r3 b _08110CEA .align 2, 0 -_08110CD8: .4byte 0x03005e00 -_08110CDC: .4byte 0x02022e18 -_08110CE0: .4byte 0x0000fffa + .pool _08110CE4: - ldr r1, _08110D18 + ldr r1, =0x02022e18 ldrh r0, [r1] adds r0, 0x6 _08110CEA: strh r0, [r1] - ldr r1, _08110D1C - ldr r3, _08110D20 + ldr r1, =0x02022e1a + ldr r3, =0x0000ffff adds r0, r3, 0 ldrh r3, [r1] adds r0, r3 @@ -558143,15 +539658,12 @@ _08110CEA: b _08110E3A _08110D0C: lsls r0, 2 - ldr r1, _08110D24 + ldr r1, =_08110D28 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08110D18: .4byte 0x02022e18 -_08110D1C: .4byte 0x02022e1a -_08110D20: .4byte 0x0000ffff -_08110D24: .4byte _08110D28 + .pool .align 2, 0 _08110D28: .4byte _08110D3C @@ -558245,7 +539757,7 @@ _08110DDA: mov r0, sp ldrb r0, [r0, 0x9] bl sub_80A6C68 - ldr r0, _08110DF8 + ldr r0, =0x03005e00 adds r1, r4, r5 lsls r1, 3 adds r1, r0 @@ -558255,7 +539767,7 @@ _08110DF0: strh r0, [r1, 0x20] b _08110E3A .align 2, 0 -_08110DF8: .4byte 0x03005e00 + .pool _08110DFC: bl sub_80A4DF0 lsls r0, 24 @@ -558266,10 +539778,10 @@ _08110DFC: movs r2, 0 bl lcd_bg_operations _08110E10: - ldr r0, _08110E44 + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r0, _08110E48 + ldr r0, =0x02022e1a strh r1, [r0] movs r0, 0x50 movs r1, 0 @@ -558289,8 +539801,7 @@ _08110E3A: pop {r0} bx r0 .align 2, 0 -_08110E44: .4byte 0x02022e18 -_08110E48: .4byte 0x02022e1a + .pool thumb_func_end sub_8110CB0 thumb_func_start sub_8110E4C @@ -558301,12 +539812,12 @@ sub_8110E4C: @ 8110E4C ldrsh r0, [r5, r1] cmp r0, 0 bne _08110EC8 - ldr r4, _08110E90 + ldr r4, =0x0203841e movs r2, 0x6 ldrsh r0, [r4, r2] cmp r0, 0 beq _08110E98 - ldr r0, _08110E94 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -558328,16 +539839,15 @@ sub_8110E4C: @ 8110E4C strb r0, [r5, 0x3] b _08110E9C .align 2, 0 -_08110E90: .4byte 0x0203841e -_08110E94: .4byte 0x02038436 + .pool _08110E98: - ldr r0, _08110EBC + ldr r0, =0x0000ffc0 strh r0, [r5, 0x20] _08110E9C: - ldr r4, _08110EC0 + ldr r4, =0x0203841e ldrh r0, [r4] strh r0, [r5, 0x22] - ldr r1, _08110EC4 + ldr r1, =0x08596bc0 adds r0, r5, 0 bl obj_set_f18_to_r0_f42_to_40 ldrh r0, [r4, 0x2] @@ -558349,9 +539859,7 @@ _08110E9C: strh r0, [r5, 0x2E] b _08110F24 .align 2, 0 -_08110EBC: .4byte 0x0000ffc0 -_08110EC0: .4byte 0x0203841e -_08110EC4: .4byte 0x08596bc0 + .pool _08110EC8: ldrh r1, [r5, 0x30] ldrh r3, [r5, 0x34] @@ -558399,21 +539907,21 @@ _08110F0E: cmp r0, r1 bge _08110F24 _08110F20: - ldr r0, _08110F2C + ldr r0, =move_anim_8072740 + 1 str r0, [r5, 0x1C] _08110F24: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08110F2C: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8110E4C thumb_func_start sub_8110F30 sub_8110F30: @ 8110F30 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08110F68 + ldr r5, =0x0203841e ldrb r1, [r5, 0x8] bl obj_anim_image_start adds r0, r4, 0 @@ -558427,18 +539935,16 @@ sub_8110F30: @ 8110F30 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x36] - ldr r0, _08110F6C + ldr r0, =sub_80A6EEC + 1 str r0, [r4, 0x1C] - ldr r1, _08110F70 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08110F68: .4byte 0x0203841e -_08110F6C: .4byte sub_80A6EEC + 1 -_08110F70: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8110F30 thumb_func_start sub_8110F74 @@ -558453,9 +539959,9 @@ sub_8110F74: @ 8110F74 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08110FF4 + ldr r0, =0x03005e00 adds r6, r1, r0 - ldr r5, _08110FF8 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -558471,7 +539977,7 @@ sub_8110F74: @ 8110F74 lsls r1, 13 adds r0, r1 lsrs r7, r0, 16 - ldr r4, _08110FFC + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -558504,9 +540010,7 @@ _08110FE4: movs r0, 0x20 b _08111006 .align 2, 0 -_08110FF4: .4byte 0x03005e00 -_08110FF8: .4byte 0x02038436 -_08110FFC: .4byte 0x02038437 + .pool _08111000: lsls r1, r5, 3 movs r0, 0x30 @@ -558574,7 +540078,7 @@ _0811101E: lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x26] - ldr r0, _081110A0 + ldr r0, =sub_81110A4 + 1 str r0, [r6] pop {r3-r5} mov r8, r3 @@ -558584,7 +540088,7 @@ _0811101E: pop {r0} bx r0 .align 2, 0 -_081110A0: .4byte sub_81110A4 + 1 + .pool thumb_func_end sub_8110F74 thumb_func_start sub_81110A4 @@ -558595,7 +540099,7 @@ sub_81110A4: @ 81110A4 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _081110C8 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -558604,13 +540108,12 @@ sub_81110A4: @ 81110A4 b _0811120C _081110BE: lsls r0, 2 - ldr r1, _081110CC + ldr r1, =_081110D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081110C8: .4byte 0x03005e00 -_081110CC: .4byte _081110D0 + .pool .align 2, 0 _081110D0: .4byte _081110E4 @@ -558627,7 +540130,7 @@ _081110E4: ldrh r1, [r4, 0x12] subs r0, r1 strh r0, [r4, 0x16] - ldr r3, _08111144 + ldr r3, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -558667,7 +540170,7 @@ _08111134: bl audio_play_and_stuff b _0811120C .align 2, 0 -_08111144: .4byte 0x02020630 + .pool _08111148: ldrh r0, [r4, 0x1E] subs r0, 0x1 @@ -558697,7 +540200,7 @@ _08111170: adds r0, 0x1 strh r0, [r4, 0x8] _0811117A: - ldr r2, _081111A8 + ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -558720,7 +540223,7 @@ _0811117A: strh r0, [r1, 0x26] b _0811120C .align 2, 0 -_081111A8: .4byte 0x02020630 + .pool _081111AC: ldrh r0, [r4, 0x10] ldrh r2, [r4, 0xC] @@ -558787,12 +540290,12 @@ sub_8111214: @ 8111214 cmp r0, 0x4 bhi _08111304 lsls r0, 2 - ldr r1, _08111230 + ldr r1, =_08111234 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08111230: .4byte _08111234 + .pool .align 2, 0 _08111234: .4byte _08111248 @@ -558801,25 +540304,25 @@ _08111234: .4byte _08111260 .4byte _0811126C _08111248: - ldr r3, _08111250 + ldr r3, =0x08596c28 movs r5, 0 b _08111270 .align 2, 0 -_08111250: .4byte 0x08596c28 + .pool _08111254: - ldr r3, _0811125C + ldr r3, =0x08596c40 movs r5, 0x50 b _08111270 .align 2, 0 -_0811125C: .4byte 0x08596c40 + .pool _08111260: - ldr r3, _08111268 + ldr r3, =0x08596c40 movs r5, 0x40 b _08111270 .align 2, 0 -_08111268: .4byte 0x08596c40 + .pool _0811126C: - ldr r3, _0811130C + ldr r3, =0x08596c40 movs r5, 0x30 _08111270: ldrh r1, [r4, 0xC] @@ -558847,7 +540350,7 @@ _08111270: lsrs r2, r0, 24 cmp r2, 0x40 beq _081112FC - ldr r1, _08111310 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -558879,10 +540382,10 @@ _08111270: lsls r2, r3, 22 lsrs r2, 22 adds r2, r5 - ldr r5, _08111314 + ldr r5, =0x000003ff adds r1, r5, 0 ands r2, r1 - ldr r1, _08111318 + ldr r1, =0xfffffc00 ands r1, r3 orrs r1, r2 strh r1, [r0, 0x4] @@ -558900,10 +540403,7 @@ _08111304: pop {r0} bx r0 .align 2, 0 -_0811130C: .4byte 0x08596c40 -_08111310: .4byte 0x02020630 -_08111314: .4byte 0x000003ff -_08111318: .4byte 0xfffffc00 + .pool thumb_func_end sub_8111214 thumb_func_start sub_811131C @@ -558914,13 +540414,13 @@ sub_811131C: @ 811131C lsls r0, 24 cmp r0, 0 beq _0811134E - ldr r0, _08111354 + ldr r0, =sub_81110A4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF beq _08111348 - ldr r0, _08111358 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -558936,14 +540436,13 @@ _0811134E: pop {r0} bx r0 .align 2, 0 -_08111354: .4byte sub_81110A4 + 1 -_08111358: .4byte 0x03005e00 + .pool thumb_func_end sub_811131C thumb_func_start sub_811135C sub_811135C: @ 811135C push {lr} - ldr r0, _08111384 + ldr r0, =0x02038400 ldr r0, [r0] ldrb r1, [r0, 0x11] lsrs r0, r1, 4 @@ -558964,14 +540463,14 @@ _0811137E: pop {r1} bx r1 .align 2, 0 -_08111384: .4byte 0x02038400 + .pool thumb_func_end sub_811135C thumb_func_start sub_8111388 sub_8111388: @ 8111388 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _081113C0 + ldr r5, =0x0203841e ldrb r1, [r5, 0x8] bl obj_anim_image_start ldrh r0, [r5] @@ -558986,7 +540485,7 @@ sub_8111388: @ 8111388 strh r0, [r4, 0x2E] ldrh r0, [r5, 0x6] strh r0, [r4, 0x30] - ldr r0, _081113C4 + ldr r0, =sub_81113C8 + 1 str r0, [r4, 0x1C] adds r4, 0x3E ldrb r0, [r4] @@ -558997,8 +540496,7 @@ sub_8111388: @ 8111388 pop {r0} bx r0 .align 2, 0 -_081113C0: .4byte 0x0203841e -_081113C4: .4byte sub_81113C8 + 1 + .pool thumb_func_end sub_8111388 thumb_func_start sub_81113C8 @@ -559049,7 +540547,7 @@ _08111412: sub_8111418: @ 8111418 push {r4,lr} adds r4, r0, 0 - ldr r0, _08111440 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -559066,14 +540564,14 @@ _08111434: pop {r0} bx r0 .align 2, 0 -_08111440: .4byte 0x02038436 + .pool thumb_func_end sub_8111418 thumb_func_start sub_8111444 sub_8111444: @ 8111444 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08111490 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -559085,7 +540583,7 @@ sub_8111444: @ 8111444 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 - ldr r2, _08111494 + ldr r2, =0x0203841e ldrh r3, [r2] ldrh r5, [r4, 0x20] adds r1, r3, r5 @@ -559100,15 +540598,13 @@ sub_8111444: @ 8111444 ldrb r1, [r2, 0x6] adds r0, r4, 0 bl obj_anim_image_start - ldr r0, _08111498 + ldr r0, =sub_811149C + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08111490: .4byte 0x02038437 -_08111494: .4byte 0x0203841e -_08111498: .4byte sub_811149C + 1 + .pool thumb_func_end sub_8111444 thumb_func_start sub_811149C @@ -559158,11 +540654,11 @@ sub_81114EC: @ 81114EC push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _08111524 + ldr r2, =0x02038404 ldr r0, [r2] cmp r0, 0x20 bgt _08111500 - ldr r1, _08111528 + ldr r1, =0x0203841e movs r0, 0 strh r0, [r1, 0xE] _08111500: @@ -559171,13 +540667,13 @@ _08111500: subs r0, 0x21 cmp r0, 0x20 bhi _08111510 - ldr r1, _08111528 + ldr r1, =0x0203841e movs r0, 0x1 strh r0, [r1, 0xE] _08111510: cmp r2, 0x41 ble _0811151A - ldr r1, _08111528 + ldr r1, =0x0203841e movs r0, 0x2 strh r0, [r1, 0xE] _0811151A: @@ -559186,8 +540682,7 @@ _0811151A: pop {r0} bx r0 .align 2, 0 -_08111524: .4byte 0x02038404 -_08111528: .4byte 0x0203841e + .pool thumb_func_end sub_81114EC thumb_func_start sub_811152C @@ -559195,7 +540690,7 @@ sub_811152C: @ 811152C push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08111588 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -559209,7 +540704,7 @@ sub_811152C: @ 811152C movs r0, 0xC8 strh r0, [r5, 0xA] _0811154E: - ldr r4, _0811158C + ldr r4, =0x02022e22 movs r1, 0xA ldrsh r0, [r5, r1] movs r1, 0xA @@ -559236,8 +540731,7 @@ _0811157A: pop {r0} bx r0 .align 2, 0 -_08111588: .4byte 0x03005e00 -_0811158C: .4byte 0x02022e22 + .pool thumb_func_end sub_811152C thumb_func_start sub_8111590 @@ -559246,7 +540740,7 @@ sub_8111590: @ 8111590 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _081115FC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -559260,7 +540754,7 @@ sub_8111590: @ 8111590 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r0, _08111600 + ldr r0, =0x02022e22 ldrh r0, [r0] strh r0, [r4, 0xC] _081115BC: @@ -559269,7 +540763,7 @@ _081115BC: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0xA] - ldr r6, _08111600 + ldr r6, =0x02022e22 movs r2, 0xA ldrsh r1, [r4, r2] movs r0, 0x4 @@ -559277,10 +540771,10 @@ _081115BC: ldrh r4, [r4, 0xC] adds r0, r4 strh r0, [r6] - ldr r0, _08111604 + ldr r0, =0x0203841e movs r2, 0xE ldrsh r1, [r0, r2] - ldr r0, _08111608 + ldr r0, =0x00000fff cmp r1, r0 bne _081115F4 movs r0, 0 @@ -559294,10 +540788,7 @@ _081115F4: pop {r0} bx r0 .align 2, 0 -_081115FC: .4byte 0x03005e00 -_08111600: .4byte 0x02022e22 -_08111604: .4byte 0x0203841e -_08111608: .4byte 0x00000fff + .pool thumb_func_end sub_8111590 thumb_func_start sub_811160C @@ -559306,12 +540797,12 @@ sub_811160C: @ 811160C adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _08111668 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r4, 0x2E] ldrh r0, [r4, 0x20] strh r0, [r4, 0x30] - ldr r5, _0811166C + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -559328,7 +540819,7 @@ sub_811160C: @ 811160C strh r0, [r4, 0x36] adds r0, r4, 0 bl sub_80A6FD4 - ldr r0, _08111670 + ldr r0, =sub_8111674 + 1 str r0, [r4, 0x1C] movs r0, 0x10 strh r0, [r4, 0x3A] @@ -559343,9 +540834,7 @@ sub_811160C: @ 811160C pop {r0} bx r0 .align 2, 0 -_08111668: .4byte 0x0203841e -_0811166C: .4byte 0x02038437 -_08111670: .4byte sub_8111674 + 1 + .pool thumb_func_end sub_811160C thumb_func_start sub_8111674 @@ -559358,11 +540847,11 @@ sub_8111674: @ 8111674 lsls r0, 24 cmp r0, 0 beq _08111694 - ldr r0, _08111690 + ldr r0, =sub_81116E8 + 1 str r0, [r4, 0x1C] b _081116DE .align 2, 0 -_08111690: .4byte sub_81116E8 + 1 + .pool _08111694: movs r1, 0x38 ldrsh r0, [r4, r1] @@ -559394,7 +540883,7 @@ _081116CC: lsls r0, 16 cmp r0, 0 ble _081116DE - ldr r0, _081116E4 + ldr r0, =0x02038440 movs r1, 0 ldrsb r1, [r0, r1] movs r0, 0xC4 @@ -559404,7 +540893,7 @@ _081116DE: pop {r0} bx r0 .align 2, 0 -_081116E4: .4byte 0x02038440 + .pool thumb_func_end sub_8111674 thumb_func_start sub_81116E8 @@ -559458,11 +540947,11 @@ _0811173A: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _08111754 + ldr r0, =sub_80A67F4 + 1 str r0, [r4, 0x1C] b _0811175E .align 2, 0 -_08111754: .4byte sub_80A67F4 + 1 + .pool _08111758: adds r0, r4, 0 bl sub_8111764 @@ -559484,13 +540973,13 @@ sub_8111764: @ 8111764 adds r0, r2, 0x1 strh r0, [r4, 0x3A] lsls r0, 16 - ldr r1, _08111784 + ldr r1, =0x010d0000 cmp r0, r1 bne _081117EE movs r0, 0 b _081117EC .align 2, 0 -_08111784: .4byte 0x010d0000 + .pool _08111788: ldrh r1, [r4, 0x3C] adds r3, r1, 0x1 @@ -559499,7 +540988,7 @@ _08111788: ands r0, r1 cmp r0, 0 bne _081117EE - ldr r1, _081117AC + ldr r1, =0xffffff00 ands r1, r3 strh r1, [r4, 0x3C] movs r0, 0x80 @@ -559510,7 +540999,7 @@ _08111788: adds r0, r2, 0x1 b _081117B2 .align 2, 0 -_081117AC: .4byte 0xffffff00 + .pool _081117B0: subs r0, r2, 0x1 _081117B2: @@ -559558,7 +541047,7 @@ sub_81117F4: @ 81117F4 adds r4, r0, 0 movs r1, 0x1 bl sub_80A6980 - ldr r1, _08111810 + ldr r1, =sub_8111814 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -559566,7 +541055,7 @@ sub_81117F4: @ 81117F4 pop {r0} bx r0 .align 2, 0 -_08111810: .4byte sub_8111814 + 1 + .pool thumb_func_end sub_81117F4 thumb_func_start sub_8111814 @@ -559659,7 +541148,7 @@ sub_811188C: @ 811188C movs r2, 0x80 movs r3, 0 bl obj_id_set_rotscale - ldr r1, _08111904 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -559670,7 +541159,7 @@ sub_811188C: @ 811188C negs r1, r1 ands r1, r2 strb r1, [r0] - ldr r1, _08111908 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -559678,22 +541167,19 @@ sub_811188C: @ 811188C movs r2, 0 movs r1, 0x80 strh r1, [r0, 0x8] - ldr r1, _0811190C + ldr r1, =0x0203841e ldrh r1, [r1] strh r1, [r0, 0xA] strh r2, [r0, 0xC] movs r1, 0x10 strh r1, [r0, 0xE] - ldr r1, _08111910 + ldr r1, =sub_8111914 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08111904: .4byte 0x02020630 -_08111908: .4byte 0x03005e00 -_0811190C: .4byte 0x0203841e -_08111910: .4byte sub_8111914 + 1 + .pool thumb_func_end sub_811188C thumb_func_start sub_8111914 @@ -559701,7 +541187,7 @@ sub_8111914: @ 8111914 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08111964 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -559731,15 +541217,14 @@ sub_8111914: @ 8111914 ldrsh r0, [r4, r1] cmp r0, 0x9 bne _0811195C - ldr r0, _08111968 + ldr r0, =sub_811196C + 1 str r0, [r4] _0811195C: pop {r4} pop {r0} bx r0 .align 2, 0 -_08111964: .4byte 0x03005e00 -_08111968: .4byte sub_811196C + 1 + .pool thumb_func_end sub_8111914 thumb_func_start sub_811196C @@ -559748,7 +541233,7 @@ sub_811196C: @ 811196C lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _08111990 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -559762,7 +541247,7 @@ sub_811196C: @ 811196C strh r0, [r4, 0xA] b _081119D8 .align 2, 0 -_08111990: .4byte 0x03005e00 + .pool _08111994: movs r0, 0 bl obj_id_for_side_relative_to_move @@ -559809,7 +541294,7 @@ sub_81119E0: @ 81119E0 adds r4, r0, 0 ldrh r5, [r4, 0x20] ldrh r6, [r4, 0x22] - ldr r0, _08111A7C + ldr r0, =0x02038436 mov r8, r0 ldrb r0, [r0] movs r1, 0x2 @@ -559828,7 +541313,7 @@ sub_81119E0: @ 81119E0 strh r0, [r4, 0x22] mov r1, r9 strh r1, [r4, 0x2E] - ldr r2, _08111A80 + ldr r2, =0x0203841e ldrh r1, [r2] strh r1, [r4, 0x30] ldrh r1, [r2, 0x2] @@ -559866,7 +541351,7 @@ sub_81119E0: @ 81119E0 adds r0, r6, 0 bl __divsi3 strh r0, [r4, 0x3C] - ldr r0, _08111A84 + ldr r0, =sub_8111A88 + 1 str r0, [r4, 0x1C] add sp, 0x4 pop {r3,r4} @@ -559876,9 +541361,7 @@ sub_81119E0: @ 81119E0 pop {r0} bx r0 .align 2, 0 -_08111A7C: .4byte 0x02038436 -_08111A80: .4byte 0x0203841e -_08111A84: .4byte sub_8111A88 + 1 + .pool thumb_func_end sub_81119E0 thumb_func_start sub_8111A88 @@ -559929,7 +541412,7 @@ _08111AD2: lsls r0, 16 cmp r0, 0 bgt _08111B96 - ldr r4, _08111B38 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -559970,7 +541453,7 @@ _08111AD2: strh r0, [r5, 0x3C] b _08111B82 .align 2, 0 -_08111B38: .4byte 0x02038437 + .pool _08111B3C: ldrh r0, [r5, 0x3A] ldrh r1, [r5, 0x36] @@ -559992,7 +541475,7 @@ _08111B3C: lsls r0, 16 cmp r0, 0 bgt _08111B96 - ldr r4, _08111B8C + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -560011,7 +541494,7 @@ _08111B82: strh r0, [r5, 0x2E] b _08111B96 .align 2, 0 -_08111B8C: .4byte 0x02038437 + .pool _08111B90: adds r0, r5, 0 bl move_anim_8074EE0 @@ -560027,13 +541510,13 @@ sub_8111B9C: @ 8111B9C adds r4, r0, 0 movs r1, 0x1 bl sub_80A6980 - ldr r0, _08111BB0 + ldr r0, =sub_8111BB4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08111BB0: .4byte sub_8111BB4 + 1 + .pool thumb_func_end sub_8111B9C thumb_func_start sub_8111BB4 @@ -560133,7 +541616,7 @@ sub_8111C50: @ 8111C50 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08111C7C + ldr r1, =0x03005e00 adds r5, r0, r1 movs r0, 0x1 bl duplicate_obj_of_side_rel2move_in_transparent_mode @@ -560147,7 +541630,7 @@ sub_8111C50: @ 8111C50 bl move_anim_task_del b _08111D5C .align 2, 0 -_08111C7C: .4byte 0x03005e00 + .pool _08111C80: strh r1, [r5, 0xA] movs r0, 0xF @@ -560167,7 +541650,7 @@ _08111C80: lsrs r1, 16 movs r0, 0x52 bl lcd_io_set - ldr r4, _08111CE8 + ldr r4, =0x02020630 movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -560176,7 +541659,7 @@ _08111C80: adds r0, r4 movs r1, 0x50 strh r1, [r0, 0x2E] - ldr r0, _08111CEC + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -560188,7 +541671,7 @@ _08111C80: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08111CF0 + ldr r1, =0x0000ff70 strh r1, [r0, 0x30] movs r0, 0x8 ldrsh r1, [r5, r0] @@ -560199,9 +541682,7 @@ _08111C80: movs r1, 0x70 b _08111D12 .align 2, 0 -_08111CE8: .4byte 0x02020630 -_08111CEC: .4byte 0x02038437 -_08111CF0: .4byte 0x0000ff70 + .pool _08111CF4: movs r0, 0x8 ldrsh r1, [r5, r0] @@ -560217,10 +541698,10 @@ _08111CF4: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08111D64 + ldr r1, =0x0000ff90 _08111D12: strh r1, [r0, 0x32] - ldr r4, _08111D68 + ldr r4, =0x02020630 movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -560242,7 +541723,7 @@ _08111D12: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08111D6C + ldr r1, =nullsub_12 + 1 bl oamt_set_x3A_32 movs r0, 0x8 ldrsh r1, [r5, r0] @@ -560251,20 +541732,16 @@ _08111D12: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _08111D70 + ldr r1, =sub_80A656C + 1 str r1, [r0] - ldr r0, _08111D74 + ldr r0, =sub_8111D78 + 1 str r0, [r5] _08111D5C: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08111D64: .4byte 0x0000ff90 -_08111D68: .4byte 0x02020630 -_08111D6C: .4byte nullsub_12 + 1 -_08111D70: .4byte sub_80A656C + 1 -_08111D74: .4byte sub_8111D78 + 1 + .pool thumb_func_end sub_8111C50 thumb_func_start sub_8111D78 @@ -560275,7 +541752,7 @@ sub_8111D78: @ 8111D78 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08111D9C + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x10 ldrsh r0, [r4, r1] @@ -560287,7 +541764,7 @@ sub_8111D78: @ 8111D78 beq _08111DA6 b _08111E48 .align 2, 0 -_08111D9C: .4byte 0x03005e00 + .pool _08111DA0: cmp r0, 0x2 beq _08111E42 @@ -560343,14 +541820,14 @@ _08111DDA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08111E18 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_but_dont_free_vram movs r0, 0x1 strh r0, [r4, 0x10] b _08111E48 .align 2, 0 -_08111E18: .4byte 0x02020630 + .pool _08111E1C: ldrh r0, [r4, 0x14] adds r0, 0x1 @@ -560386,18 +541863,17 @@ sub_8111E50: @ 8111E50 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _08111E70 + ldr r2, =0x03005e00 adds r1, r2 movs r2, 0 strh r2, [r1, 0x26] - ldr r2, _08111E74 + ldr r2, =sub_8111E78 + 1 str r2, [r1] bl _call_via_r2 pop {r0} bx r0 .align 2, 0 -_08111E70: .4byte 0x03005e00 -_08111E74: .4byte sub_8111E78 + 1 + .pool thumb_func_end sub_8111E50 thumb_func_start sub_8111E78 @@ -560411,9 +541887,9 @@ sub_8111E78: @ 8111E78 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08111EB0 + ldr r1, =0x03005e00 adds r5, r0, r1 - ldr r0, _08111EB4 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -560425,14 +541901,12 @@ sub_8111E78: @ 8111E78 b _081120C6 _08111EA4: lsls r0, 2 - ldr r1, _08111EB8 + ldr r1, =_08111EBC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08111EB0: .4byte 0x03005e00 -_08111EB4: .4byte 0x02038437 -_08111EB8: .4byte _08111EBC + .pool .align 2, 0 _08111EBC: .4byte _08111ED0 @@ -560441,7 +541915,7 @@ _08111EBC: .4byte _0811207C .4byte _081120A8 _08111ED0: - ldr r7, _08111F08 + ldr r7, =0x00002771 adds r0, r7, 0 bl gpu_pal_alloc_new lsls r0, 24 @@ -560466,9 +541940,9 @@ _08111EFE: bl move_anim_task_del b _081120CC .align 2, 0 -_08111F08: .4byte 0x00002771 + .pool _08111F0C: - ldr r4, _08111FB8 + ldr r4, =0x02020630 movs r1, 0x8 ldrsh r0, [r5, r1] lsls r1, r0, 4 @@ -560509,9 +541983,9 @@ _08111F0C: adds r2, r0 lsls r2, 2 adds r2, r4 - ldr r0, _08111FBC + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _08111FC0 + ldr r0, =0x02038437 ldrb r0, [r0] ldr r1, [r1] lsls r0, 2 @@ -560554,9 +542028,7 @@ _08111F0C: lsls r1, 2 b _08111FC8 .align 2, 0 -_08111FB8: .4byte 0x02020630 -_08111FBC: .4byte 0x020244d0 -_08111FC0: .4byte 0x02038437 + .pool _08111FC4: movs r1, 0x80 lsls r1, 3 @@ -560573,28 +542045,25 @@ _08111FD0: movs r2, 0x10 ldrsh r0, [r5, r2] lsls r0, 1 - ldr r1, _08112004 + ldr r1, =0x02037714 adds r0, r1 movs r2, 0x24 ldrsh r1, [r5, r2] lsls r1, 1 - ldr r2, _08112008 + ldr r2, =0x02037b14 adds r1, r2 - ldr r2, _0811200C + ldr r2, =0x04000008 bl CpuSet ldrh r0, [r5, 0x10] - ldr r3, _08112010 + ldr r3, =0x00003c0d movs r1, 0x10 movs r2, 0xA bl pal_fade_1 b _081120C6 .align 2, 0 -_08112004: .4byte 0x02037714 -_08112008: .4byte 0x02037b14 -_0811200C: .4byte 0x04000008 -_08112010: .4byte 0x00003c0d + .pool _08112014: - ldr r2, _08112050 + ldr r2, =0x02020630 movs r0, 0x22 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -560626,7 +542095,7 @@ _08112034: str r6, [sp, 0x8] b _0811206C .align 2, 0 -_08112050: .4byte 0x02020630 + .pool _08112054: lsls r0, r2, 24 lsrs r0, 24 @@ -560651,14 +542120,14 @@ _0811206C: _0811207C: cmp r6, 0x1 bne _08112090 - ldr r1, _0811208C + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set b _08112098 .align 2, 0 -_0811208C: .4byte 0x00003f42 + .pool _08112090: - ldr r1, _081120A4 + ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set _08112098: @@ -560668,7 +542137,7 @@ _08112098: bl lcd_io_set b _081120C6 .align 2, 0 -_081120A4: .4byte 0x00003f44 + .pool _081120A8: cmp r6, 0x1 bne _081120B8 @@ -560683,7 +542152,7 @@ _081120B8: movs r0, 0 bl lcd_io_set_bits _081120C2: - ldr r0, _081120D8 + ldr r0, =sub_81120DC + 1 str r0, [r5] _081120C6: ldrh r0, [r5, 0x26] @@ -560697,7 +542166,7 @@ _081120CC: pop {r0} bx r0 .align 2, 0 -_081120D8: .4byte sub_81120DC + 1 + .pool thumb_func_end sub_8111E78 thumb_func_start sub_81120DC @@ -560709,7 +542178,7 @@ sub_81120DC: @ 81120DC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08112164 + ldr r1, =0x03005e00 adds r4, r0, r1 ldrh r1, [r4, 0xA] adds r1, 0x1 @@ -560719,7 +542188,7 @@ sub_81120DC: @ 81120DC strh r0, [r4, 0x12] cmp r0, 0 bne _08112114 - ldr r1, _08112168 + ldr r1, =0x08329f40 movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 1 @@ -560734,7 +542203,7 @@ _08112114: ldrsh r0, [r4, r2] cmp r0, 0x1 bne _08112136 - ldr r1, _08112168 + ldr r1, =0x08329f40 movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 1 @@ -560761,7 +542230,7 @@ _08112136: bne _0811215E movs r0, 0 strh r0, [r4, 0x26] - ldr r1, _0811216C + ldr r1, =sub_8112170 + 1 str r1, [r4] adds r0, r5, 0 bl _call_via_r1 @@ -560770,9 +542239,7 @@ _0811215E: pop {r0} bx r0 .align 2, 0 -_08112164: .4byte 0x03005e00 -_08112168: .4byte 0x08329f40 -_0811216C: .4byte sub_8112170 + 1 + .pool thumb_func_end sub_81120DC thumb_func_start sub_8112170 @@ -560783,9 +542250,9 @@ sub_8112170: @ 8112170 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081121A0 + ldr r1, =0x03005e00 adds r4, r0, r1 - ldr r0, _081121A4 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -560800,14 +542267,13 @@ sub_8112170: @ 8112170 beq _081121AE b _08112258 .align 2, 0 -_081121A0: .4byte 0x03005e00 -_081121A4: .4byte 0x02038437 + .pool _081121A8: cmp r0, 0x2 beq _081121F0 b _08112258 _081121AE: - ldr r1, _081121CC + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] movs r0, 0x1 @@ -560821,7 +542287,7 @@ _081121AE: lsls r1, 2 b _081121D4 .align 2, 0 -_081121CC: .4byte 0x02039b28 + .pool _081121D0: movs r1, 0x80 lsls r1, 3 @@ -560831,15 +542297,15 @@ _081121D4: b _08112258 _081121DC: ldrh r0, [r4, 0x10] - ldr r3, _081121EC + ldr r3, =0x00003c0d movs r1, 0x10 movs r2, 0 bl pal_fade_1 b _08112258 .align 2, 0 -_081121EC: .4byte 0x00003c0d + .pool _081121F0: - ldr r3, _08112240 + ldr r3, =0x02020630 movs r0, 0x24 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -560858,7 +542324,7 @@ _081121F0: lsls r0, 2 adds r0, r3 bl obj_delete_but_dont_free_vram - ldr r0, _08112244 + ldr r0, =0x00002771 bl gpu_pal_free_tag movs r0, 0x50 movs r1, 0 @@ -560874,8 +542340,7 @@ _081121F0: bl lcd_io_set_bits b _08112252 .align 2, 0 -_08112240: .4byte 0x02020630 -_08112244: .4byte 0x00002771 + .pool _08112248: movs r1, 0x80 lsls r1, 3 @@ -560901,12 +542366,12 @@ sub_8112264: @ 8112264 mov r5, r8 push {r5-r7} adds r7, r0, 0 - ldr r0, _081122A0 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _081122AC - ldr r4, _081122A4 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -560921,14 +542386,12 @@ sub_8112264: @ 8112264 lsls r2, 13 adds r0, r2 lsrs r5, r0, 16 - ldr r4, _081122A8 + ldr r4, =0x02038437 b _081122D0 .align 2, 0 -_081122A0: .4byte 0x0203841e -_081122A4: .4byte 0x02038436 -_081122A8: .4byte 0x02038437 + .pool _081122AC: - ldr r4, _08112374 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -560943,7 +542406,7 @@ _081122AC: lsls r2, 13 adds r0, r2 lsrs r5, r0, 16 - ldr r4, _08112378 + ldr r4, =0x02038436 _081122D0: ldrb r0, [r4] movs r1, 0 @@ -560973,7 +542436,7 @@ _081122D0: mov r1, r10 subs r0, r1, r6 lsls r0, 4 - ldr r5, _0811237C + ldr r5, =0x0203841e movs r2, 0x2 ldrsh r1, [r5, r2] bl __divsi3 @@ -561007,7 +542470,7 @@ _081122D0: strh r6, [r7, 0x20] mov r2, r8 strh r2, [r7, 0x22] - ldr r0, _08112380 + ldr r0, =sub_8112384 + 1 str r0, [r7, 0x1C] adds r2, r7, 0 adds r2, 0x3E @@ -561023,10 +542486,7 @@ _081122D0: pop {r0} bx r0 .align 2, 0 -_08112374: .4byte 0x02038437 -_08112378: .4byte 0x02038436 -_0811237C: .4byte 0x0203841e -_08112380: .4byte sub_8112384 + 1 + .pool thumb_func_end sub_8112264 thumb_func_start sub_8112384 @@ -561078,7 +542538,7 @@ sub_81123C4: @ 81123C4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08112514 + ldr r0, =0x03005e00 adds r1, r0 str r1, [sp] movs r1, 0xFD @@ -561097,10 +542557,10 @@ sub_81123C4: @ 81123C4 strh r0, [r1, 0x18] movs r0, 0x10 strh r0, [r1, 0x1A] - ldr r2, _08112518 + ldr r2, =0x0203841e ldrh r0, [r2] strh r0, [r1, 0x1C] - ldr r4, _0811251C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -561123,7 +542583,7 @@ _08112434: _08112436: lsls r1, r4, 16 asrs r3, r1, 16 - ldr r0, _0811251C + ldr r0, =0x02038436 ldrb r2, [r0] str r1, [sp, 0x10] cmp r3, r2 @@ -561143,7 +542603,7 @@ _08112436: ldr r3, [sp, 0x8] lsls r0, r3, 16 asrs r7, r0, 16 - ldr r0, _08112520 + ldr r0, =0x08596db8 adds r1, r6, 0 adds r2, r7, 0 movs r3, 0x37 @@ -561169,7 +542629,7 @@ _08112436: lsls r5, r0, 4 add r5, r8 lsls r5, 2 - ldr r1, _08112524 + ldr r1, =0x02020630 adds r4, r5, r1 lsls r0, r6, 4 strh r0, [r4, 0x2E] @@ -561178,7 +542638,7 @@ _08112436: mov r2, r10 subs r0, r2, r6 lsls r0, 4 - ldr r3, _08112518 + ldr r3, =0x0203841e movs r2, 0x2 ldrsh r1, [r3, r2] bl __divsi3 @@ -561188,21 +542648,21 @@ _08112436: asrs r0, 16 subs r0, r7 lsls r0, 4 - ldr r2, _08112518 + ldr r2, =0x0203841e movs r3, 0x2 ldrsh r1, [r2, r3] bl __divsi3 strh r0, [r4, 0x34] - ldr r1, _08112518 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] strh r0, [r4, 0x36] mov r2, r10 strh r2, [r4, 0x38] mov r3, r9 strh r3, [r4, 0x3A] - ldr r0, _08112528 + ldr r0, =0x0202064c adds r5, r0 - ldr r0, _0811252C + ldr r0, =sub_8112384 + 1 str r0, [r5] ldr r2, [sp] movs r3, 0x20 @@ -561228,15 +542688,9 @@ _08112502: ble _08112436 b _081125B4 .align 2, 0 -_08112514: .4byte 0x03005e00 -_08112518: .4byte 0x0203841e -_0811251C: .4byte 0x02038436 -_08112520: .4byte 0x08596db8 -_08112524: .4byte 0x02020630 -_08112528: .4byte 0x0202064c -_0811252C: .4byte sub_8112384 + 1 + .pool _08112530: - ldr r0, _081125CC + ldr r0, =0x08596db8 ldr r7, [sp, 0x4] ldr r2, [sp, 0x8] lsls r1, r2, 16 @@ -561255,7 +542709,7 @@ _08112530: mov r10, r3 movs r0, 0x28 mov r9, r0 - ldr r6, _081125D0 + ldr r6, =0x02020630 mov r1, r8 lsls r5, r1, 4 add r5, r8 @@ -561268,7 +542722,7 @@ _08112530: strh r0, [r4, 0x30] subs r0, r3, r7 lsls r0, 4 - ldr r3, _081125D4 + ldr r3, =0x0203841e movs r2, 0x2 ldrsh r1, [r3, r2] bl __divsi3 @@ -561277,12 +542731,12 @@ _08112530: ldr r1, [sp, 0xC] subs r0, r3, r1 lsls r0, 4 - ldr r2, _081125D4 + ldr r2, =0x0203841e movs r3, 0x2 ldrsh r1, [r2, r3] bl __divsi3 strh r0, [r4, 0x34] - ldr r1, _081125D4 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] strh r0, [r4, 0x36] mov r2, r10 @@ -561291,7 +542745,7 @@ _08112530: strh r3, [r4, 0x3A] adds r6, 0x1C adds r5, r6 - ldr r0, _081125D8 + ldr r0, =sub_8112384 + 1 str r0, [r5] mov r1, r8 ldr r0, [sp] @@ -561300,7 +542754,7 @@ _08112530: ldr r2, [sp] strh r0, [r2, 0x20] _081125B4: - ldr r0, _081125DC + ldr r0, =sub_81125E0 + 1 ldr r3, [sp] str r0, [r3] add sp, 0x14 @@ -561312,11 +542766,7 @@ _081125B4: pop {r0} bx r0 .align 2, 0 -_081125CC: .4byte 0x08596db8 -_081125D0: .4byte 0x02020630 -_081125D4: .4byte 0x0203841e -_081125D8: .4byte sub_8112384 + 1 -_081125DC: .4byte sub_81125E0 + 1 + .pool thumb_func_end sub_81123C4 thumb_func_start sub_81125E0 @@ -561327,7 +542777,7 @@ sub_81125E0: @ 81125E0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08112604 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -561339,7 +542789,7 @@ sub_81125E0: @ 81125E0 beq _08112616 b _08112752 .align 2, 0 -_08112604: .4byte 0x03005e00 + .pool _08112608: cmp r1, 0x2 bne _0811260E @@ -561479,7 +542929,7 @@ _081126F4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08112724 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r5, 0x1 @@ -561492,7 +542942,7 @@ _08112718: blt _081126F4 b _08112734 .align 2, 0 -_08112724: .4byte 0x02020630 + .pool _08112728: ldrh r0, [r4, 0x12] adds r0, 0x1 @@ -561525,15 +542975,15 @@ sub_8112758: @ 8112758 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _081127A4 + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r0, _081127A8 + ldr r0, =0x02022e26 strh r1, [r0] - ldr r1, _081127AC + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r1, _081127B0 + ldr r1, =0x00003f1f movs r0, 0x4A bl lcd_io_set movs r0, 0x50 @@ -561542,7 +542992,7 @@ sub_8112758: @ 8112758 movs r0, 0x54 movs r1, 0x10 bl lcd_io_set - ldr r0, _081127B4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -561556,29 +543006,25 @@ _081127A0: movs r6, 0x28 b _081127BA .align 2, 0 -_081127A4: .4byte 0x02022e24 -_081127A8: .4byte 0x02022e26 -_081127AC: .4byte 0x00003f3f -_081127B0: .4byte 0x00003f1f -_081127B4: .4byte 0x02038436 + .pool _081127B8: movs r6, 0xC8 _081127BA: - ldr r1, _081127F8 + ldr r1, =0x02022e24 lsls r3, r6, 16 asrs r2, r3, 16 lsls r0, r2, 8 orrs r0, r2 strh r0, [r1] - ldr r1, _081127FC + ldr r1, =0x02022e26 movs r5, 0x28 - ldr r0, _08112800 + ldr r0, =0x00002828 strh r0, [r1] lsrs r3, 16 movs r1, 0xF0 subs r1, r2 movs r4, 0x48 - ldr r2, _08112804 + ldr r2, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -561589,17 +543035,13 @@ _081127BA: strh r4, [r0, 0x10] strh r6, [r0, 0x12] strh r5, [r0, 0x14] - ldr r1, _08112808 + ldr r1, =sub_811280C + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081127F8: .4byte 0x02022e24 -_081127FC: .4byte 0x02022e26 -_08112800: .4byte 0x00002828 -_08112804: .4byte 0x03005e00 -_08112808: .4byte sub_811280C + 1 + .pool thumb_func_end sub_8112758 thumb_func_start sub_811280C @@ -561612,7 +543054,7 @@ sub_811280C: @ 811280C sub sp, 0x20 lsls r0, 24 lsrs r0, 24 - ldr r2, _0811292C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -561643,8 +543085,8 @@ _08112848: lsls r0, r5, 16 asrs r0, 16 bl __floatsidf - ldr r2, _08112930 - ldr r3, _08112934 + ldr r2, =0x3fb00000 + ldr r3, =0x00000000 bl __muldf3 adds r5, r1, 0 adds r4, r0, 0 @@ -561669,8 +543111,8 @@ _08112848: lsls r0, r7, 16 asrs r0, 16 bl __floatsidf - ldr r2, _08112930 - ldr r3, _08112934 + ldr r2, =0x3fb00000 + ldr r3, =0x00000000 bl __muldf3 ldr r2, [sp, 0x18] ldr r3, [sp, 0x1C] @@ -561693,8 +543135,8 @@ _08112848: lsls r0, r2, 16 asrs r0, 16 bl __floatsidf - ldr r2, _08112930 - ldr r3, _08112934 + ldr r2, =0x3fb00000 + ldr r3, =0x00000000 bl __muldf3 ldr r2, [sp, 0x18] ldr r3, [sp, 0x1C] @@ -561711,8 +543153,8 @@ _08112848: lsls r0, r1, 16 asrs r0, 16 bl __floatsidf - ldr r2, _08112930 - ldr r3, _08112934 + ldr r2, =0x3fb00000 + ldr r3, =0x00000000 bl __muldf3 ldr r2, [sp, 0x18] ldr r3, [sp, 0x1C] @@ -561727,9 +543169,7 @@ _08112848: lsrs r5, r0, 16 b _08112966 .align 2, 0 -_0811292C: .4byte 0x03005e00 -_08112930: .4byte 0x3fb00000 -_08112934: .4byte 0x00000000 + .pool _08112938: movs r2, 0 mov r9, r2 @@ -561750,15 +543190,15 @@ _08112938: movs r2, 0x10 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08112988 + ldr r0, =sub_8112994 + 1 str r0, [r4] _08112966: - ldr r1, _0811298C + ldr r1, =0x02022e24 mov r2, r9 lsls r0, r2, 8 orrs r7, r0 strh r7, [r1] - ldr r1, _08112990 + ldr r1, =0x02022e26 lsls r0, r6, 8 orrs r5, r0 strh r5, [r1] @@ -561771,9 +543211,7 @@ _08112966: pop {r0} bx r0 .align 2, 0 -_08112988: .4byte sub_8112994 + 1 -_0811298C: .4byte 0x02022e24 -_08112990: .4byte 0x02022e26 + .pool thumb_func_end sub_811280C thumb_func_start sub_8112994 @@ -561781,7 +543219,7 @@ sub_8112994: @ 8112994 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081129E0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -561789,11 +543227,11 @@ sub_8112994: @ 8112994 lsrs r1, r0, 24 cmp r1, 0 bne _081129DA - ldr r0, _081129E4 + ldr r0, =0x02022e24 strh r1, [r0] - ldr r0, _081129E8 + ldr r0, =0x02022e26 strh r1, [r0] - ldr r4, _081129EC + ldr r4, =0x00003f3f movs r0, 0x48 adds r1, r4, 0 bl lcd_io_set @@ -561813,10 +543251,7 @@ _081129DA: pop {r0} bx r0 .align 2, 0 -_081129E0: .4byte 0x02037fd4 -_081129E4: .4byte 0x02022e24 -_081129E8: .4byte 0x02022e26 -_081129EC: .4byte 0x00003f3f + .pool thumb_func_end sub_8112994 thumb_func_start sub_81129F0 @@ -561825,14 +543260,14 @@ sub_81129F0: @ 81129F0 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _08112A1C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _08112A24 movs r2, 0x18 - ldr r3, _08112A20 + ldr r3, =0x0000fffe ldrb r0, [r4, 0x3] movs r1, 0x3F negs r1, r1 @@ -561842,10 +543277,9 @@ sub_81129F0: @ 81129F0 strb r1, [r4, 0x3] b _08112A28 .align 2, 0 -_08112A1C: .4byte 0x02038436 -_08112A20: .4byte 0x0000fffe + .pool _08112A24: - ldr r2, _08112A44 + ldr r2, =0x0000ffe8 movs r3, 0x2 _08112A28: lsls r0, r2, 16 @@ -561856,14 +543290,13 @@ _08112A28: strh r3, [r4, 0x30] movs r0, 0x3C strh r0, [r4, 0x2E] - ldr r0, _08112A48 + ldr r0, =sub_8112A4C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08112A44: .4byte 0x0000ffe8 -_08112A48: .4byte sub_8112A4C + 1 + .pool thumb_func_end sub_81129F0 thumb_func_start sub_8112A4C @@ -561896,10 +543329,10 @@ _08112A5E: lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x8 - ldr r4, _08112AB0 + ldr r4, =0x000003ff adds r0, r4, 0 ands r1, r0 - ldr r0, _08112AB4 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] @@ -561912,17 +543345,14 @@ _08112A5E: bne _08112AC0 movs r0, 0x1E strh r0, [r3, 0x2E] - ldr r0, _08112AB8 + ldr r0, =sub_80A64B0 + 1 str r0, [r3, 0x1C] - ldr r1, _08112ABC + ldr r1, =sub_8112ACC + 1 adds r0, r3, 0 bl oamt_set_x3A_32 b _08112AC4 .align 2, 0 -_08112AB0: .4byte 0x000003ff -_08112AB4: .4byte 0xfffffc00 -_08112AB8: .4byte sub_80A64B0 + 1 -_08112ABC: .4byte sub_8112ACC + 1 + .pool _08112AC0: movs r0, 0x28 _08112AC2: @@ -561987,14 +543417,14 @@ _08112B06: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _08112B40 + ldr r0, =sub_8112B44 + 1 str r0, [r4, 0x1C] _08112B3A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08112B40: .4byte sub_8112B44 + 1 + .pool thumb_func_end sub_8112ACC thumb_func_start sub_8112B44 @@ -562007,10 +543437,10 @@ sub_8112B44: @ 8112B44 movs r0, 0x52 movs r1, 0 bl lcd_io_set - ldr r0, _08112B70 + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r0, _08112B74 + ldr r0, =0x02022e26 strh r1, [r0] adds r0, r4, 0 bl move_anim_8072740 @@ -562018,8 +543448,7 @@ sub_8112B44: @ 8112B44 pop {r0} bx r0 .align 2, 0 -_08112B70: .4byte 0x02022e24 -_08112B74: .4byte 0x02022e26 + .pool thumb_func_end sub_8112B44 thumb_func_start sub_8112B78 @@ -562031,7 +543460,7 @@ sub_8112B78: @ 8112B78 movs r1, 0xC bl sine strh r0, [r5, 0x24] - ldr r0, _08112BE0 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -562063,7 +543492,7 @@ _08112B9C: asrs r0, 16 cmp r0, 0x1 bne _08112BE8 - ldr r0, _08112BE4 + ldr r0, =0x0000050b strh r0, [r5, 0x3A] movs r1, 0xFD lsls r1, 6 @@ -562074,8 +543503,7 @@ _08112B9C: bl lcd_io_set b _08112C40 .align 2, 0 -_08112BE0: .4byte 0x02038436 -_08112BE4: .4byte 0x0000050b + .pool _08112BE8: cmp r0, 0x1E ble _08112C40 @@ -562120,14 +543548,14 @@ _08112C18: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _08112C48 + ldr r0, =sub_8112C4C + 1 str r0, [r5, 0x1C] _08112C40: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08112C48: .4byte sub_8112C4C + 1 + .pool thumb_func_end sub_8112B78 thumb_func_start sub_8112C4C @@ -562157,7 +543585,7 @@ sub_8112C6C: @ 8112C6C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _08112D04 + ldr r0, =0x03005e00 adds r4, r0 movs r6, 0 strh r6, [r4, 0x8] @@ -562165,7 +543593,7 @@ sub_8112C6C: @ 8112C6C mov r8, r0 mov r0, r8 strh r0, [r4, 0xA] - ldr r5, _08112D08 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -562211,7 +543639,7 @@ sub_8112C6C: @ 8112C6C movs r0, 0x52 bl lcd_io_set strh r6, [r4, 0x18] - ldr r0, _08112D0C + ldr r0, =sub_8112D10 + 1 str r0, [r4] pop {r3} mov r8, r3 @@ -562219,9 +543647,7 @@ sub_8112C6C: @ 8112C6C pop {r0} bx r0 .align 2, 0 -_08112D04: .4byte 0x03005e00 -_08112D08: .4byte 0x02038436 -_08112D0C: .4byte sub_8112D10 + 1 + .pool thumb_func_end sub_8112C6C thumb_func_start sub_8112D10 @@ -562232,7 +543658,7 @@ sub_8112D10: @ 8112D10 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08112D34 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -562241,13 +543667,12 @@ sub_8112D10: @ 8112D10 b _08112E96 _08112D2A: lsls r0, 2 - ldr r1, _08112D38 + ldr r1, =_08112D3C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08112D34: .4byte 0x03005e00 -_08112D38: .4byte _08112D3C + .pool .align 2, 0 _08112D3C: .4byte _08112D54 @@ -562264,19 +543689,19 @@ _08112D56: movs r0, 0x1C ldrsh r2, [r4, r0] ldrb r3, [r4, 0x14] - ldr r0, _08112DB8 + ldr r0, =0x08596e30 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 beq _08112DAA - ldr r1, _08112DBC + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 adds r5, r0, r1 strh r7, [r5, 0x2E] - ldr r0, _08112DC0 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner movs r1, 0 @@ -562308,9 +543733,7 @@ _08112DAA: bls _08112D56 b _08112E78 .align 2, 0 -_08112DB8: .4byte 0x08596e30 -_08112DBC: .4byte 0x02020630 -_08112DC0: .4byte 0x02038436 + .pool _08112DC4: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -562462,7 +543885,7 @@ _08112EB2: lsrs r0, 16 cmp r0, 0x7E bhi _08112EF4 - ldr r2, _08112EF0 + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -562475,9 +543898,9 @@ _08112EB2: ands r1, r0 b _08112F08 .align 2, 0 -_08112EF0: .4byte 0x03005e00 + .pool _08112EF4: - ldr r2, _08112F5C + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -562509,7 +543932,7 @@ _08112F08: movs r1, 0x7 bl sine strh r0, [r4, 0x26] - ldr r2, _08112F5C + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -562530,7 +543953,7 @@ _08112F56: pop {r0} bx r0 .align 2, 0 -_08112F5C: .4byte 0x03005e00 + .pool thumb_func_end sub_8112E9C thumb_func_start sub_8112F60 @@ -562541,8 +543964,8 @@ sub_8112F60: @ 8112F60 movs r2, 0x4 orrs r1, r2 strb r1, [r3] - ldr r2, _08112FA4 - ldr r1, _08112FA8 + ldr r2, =0x020241e4 + ldr r1, =0x02038436 ldrb r1, [r1] adds r1, r2 ldrb r1, [r1] @@ -562551,14 +543974,14 @@ sub_8112F60: @ 8112F60 strh r1, [r0, 0x2E] movs r1, 0xA strh r1, [r0, 0x30] - ldr r2, _08112FAC + ldr r2, =0x0203841e ldrh r1, [r2] strh r1, [r0, 0x32] ldrh r1, [r2, 0x2] strh r1, [r0, 0x34] - ldr r1, _08112FB0 + ldr r1, =sub_8112FB8 + 1 str r1, [r0, 0x1C] - ldr r2, _08112FB4 + ldr r2, =0x02020630 movs r3, 0x38 ldrsh r1, [r0, r3] lsls r0, r1, 4 @@ -562570,11 +543993,7 @@ sub_8112F60: @ 8112F60 strh r1, [r0, 0x22] bx lr .align 2, 0 -_08112FA4: .4byte 0x020241e4 -_08112FA8: .4byte 0x02038436 -_08112FAC: .4byte 0x0203841e -_08112FB0: .4byte sub_8112FB8 + 1 -_08112FB4: .4byte 0x02020630 + .pool thumb_func_end sub_8112F60 thumb_func_start sub_8112FB8 @@ -562593,7 +544012,7 @@ sub_8112FB8: @ 8112FB8 movs r2, 0x30 ldrsh r1, [r5, r2] bl sine - ldr r4, _08113018 + ldr r4, =0x02020630 movs r1, 0x38 ldrsh r2, [r5, r1] lsls r1, r2, 4 @@ -562621,15 +544040,14 @@ sub_8112FB8: @ 8112FB8 asrs r0, 16 cmp r0, 0xFF ble _08113054 - ldr r2, _0811301C + ldr r2, =0xffffff00 adds r0, r1, r2 strh r0, [r5, 0x2E] b _08113054 .align 2, 0 -_08113018: .4byte 0x02020630 -_0811301C: .4byte 0xffffff00 + .pool _08113020: - ldr r2, _0811305C + ldr r2, =0x02020630 movs r0, 0x38 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -562653,22 +544071,21 @@ _08113020: ldrh r1, [r0, 0x22] subs r1, 0x8 strh r1, [r0, 0x22] - ldr r0, _08113060 + ldr r0, =move_anim_8074EE0 + 1 str r0, [r5, 0x1C] _08113054: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0811305C: .4byte 0x02020630 -_08113060: .4byte move_anim_8074EE0 + 1 + .pool thumb_func_end sub_8112FB8 thumb_func_start sub_8113064 sub_8113064: @ 8113064 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _081130AC + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -562686,7 +544103,7 @@ sub_8113064: @ 8113064 lsls r0, 24 cmp r0, 0 beq _081130B4 - ldr r2, _081130B0 + ldr r2, =0x0203841e ldrh r0, [r5, 0x20] ldrh r1, [r2] subs r0, r1 @@ -562700,10 +544117,9 @@ sub_8113064: @ 8113064 adds r1, r2, 0 b _081130BE .align 2, 0 -_081130AC: .4byte 0x02038436 -_081130B0: .4byte 0x0203841e + .pool _081130B4: - ldr r1, _081130F4 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r5, 0x20] adds r0, r2 @@ -562727,18 +544143,16 @@ _081130BE: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r1, _081130F8 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 - ldr r0, _081130FC + ldr r0, =sub_80A66DC + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081130F4: .4byte 0x0203841e -_081130F8: .4byte move_anim_8074EE0 + 1 -_081130FC: .4byte sub_80A66DC + 1 + .pool thumb_func_end sub_8113064 thumb_func_start sub_8113100 @@ -562746,7 +544160,7 @@ sub_8113100: @ 8113100 push {r4,r5,lr} adds r5, r0, 0 bl sub_80A6838 - ldr r4, _08113158 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -562759,13 +544173,13 @@ sub_8113100: @ 8113100 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, _0811315C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08113164 - ldr r2, _08113160 + ldr r2, =0x0203841e ldrh r0, [r5, 0x20] ldrh r1, [r2, 0x2] subs r0, r1 @@ -562783,11 +544197,9 @@ sub_8113100: @ 8113100 strh r0, [r5, 0x36] b _0811318E .align 2, 0 -_08113158: .4byte 0x02038437 -_0811315C: .4byte 0x02038436 -_08113160: .4byte 0x0203841e + .pool _08113164: - ldr r1, _081131A8 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r5, 0x20] adds r0, r2 @@ -562808,39 +544220,36 @@ _08113164: movs r1, 0x1 bl obj_anim_image_start _0811318E: - ldr r0, _081131A8 + ldr r0, =0x0203841e ldrh r0, [r0, 0x8] strh r0, [r5, 0x2E] - ldr r0, _081131AC + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _081131B0 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081131A8: .4byte 0x0203841e -_081131AC: .4byte sub_80A6EEC + 1 -_081131B0: .4byte move_anim_8074EE0 + 1 + .pool thumb_func_end sub_8113100 thumb_func_start sub_81131B4 sub_81131B4: @ 81131B4 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _081131C8 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _081131D0 - ldr r4, _081131CC + ldr r4, =0x02038436 b _081131D2 .align 2, 0 -_081131C8: .4byte 0x0203841e -_081131CC: .4byte 0x02038436 + .pool _081131D0: - ldr r4, _08113214 + ldr r4, =0x02038437 _081131D2: ldrb r0, [r4] movs r1, 0 @@ -562854,7 +544263,7 @@ _081131D2: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r4, _08113218 + ldr r4, =0x0203841e movs r0, 0x2 ldrsh r1, [r4, r0] adds r0, r5, 0 @@ -562863,26 +544272,23 @@ _081131D2: ldrh r1, [r5, 0x22] adds r0, r1 strh r0, [r5, 0x22] - ldr r0, _0811321C + ldr r0, =sub_80A67D8 + 1 str r0, [r5, 0x1C] - ldr r1, _08113220 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08113214: .4byte 0x02038437 -_08113218: .4byte 0x0203841e -_0811321C: .4byte sub_80A67D8 + 1 -_08113220: .4byte move_anim_8074EE0 + 1 + .pool thumb_func_end sub_81131B4 thumb_func_start sub_8113224 sub_8113224: @ 8113224 push {r4,lr} adds r4, r0, 0 - ldr r0, _0811324C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -562898,14 +544304,14 @@ _0811323E: pop {r0} bx r0 .align 2, 0 -_0811324C: .4byte 0x02038436 + .pool thumb_func_end sub_8113224 thumb_func_start sub_8113250 sub_8113250: @ 8113250 push {r4-r7,lr} adds r6, r0, 0 - ldr r4, _081132A4 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -562922,10 +544328,10 @@ sub_8113250: @ 8113250 strh r5, [r6, 0x36] movs r0, 0x1 strh r0, [r6, 0x38] - ldr r0, _081132A8 + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r6, 0x3A] - ldr r4, _081132AC + ldr r4, =0x0202420b ldrb r0, [r4] movs r1, 0 bl sub_80A861C @@ -562941,9 +544347,7 @@ sub_8113250: @ 8113250 lsrs r0, r7, 17 b _081132B2 .align 2, 0 -_081132A4: .4byte 0x02038436 -_081132A8: .4byte 0x0203841e -_081132AC: .4byte 0x0202420b + .pool _081132B0: lsrs r0, r1, 17 _081132B2: @@ -562960,13 +544364,13 @@ _081132B2: ldrsh r1, [r6, r2] bl sine strh r0, [r6, 0x26] - ldr r0, _081132DC + ldr r0, =sub_81132E0 + 1 str r0, [r6, 0x1C] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081132DC: .4byte sub_81132E0 + 1 + .pool thumb_func_end sub_8113250 thumb_func_start sub_81132E0 @@ -563115,32 +544519,29 @@ sub_81133E8: @ 81133E8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08113414 + ldr r0, =0x03005e00 adds r4, r1, r0 - ldr r0, _08113418 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _08113424 - ldr r0, _0811341C + ldr r0, =0x04000014 str r0, [sp] - ldr r0, _08113420 + ldr r0, =0x02022e18 b _0811342A .align 2, 0 -_08113414: .4byte 0x03005e00 -_08113418: .4byte 0x02038436 -_0811341C: .4byte 0x04000014 -_08113420: .4byte 0x02022e18 + .pool _08113424: - ldr r0, _081134A0 + ldr r0, =0x04000018 str r0, [sp] - ldr r0, _081134A4 + ldr r0, =0x02022e1c _0811342A: ldrh r0, [r0] strh r0, [r4, 0xC] - ldr r0, _081134A8 + ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r1, sp movs r5, 0 @@ -563148,7 +544549,7 @@ _0811342A: strb r0, [r1, 0x8] mov r0, sp strb r5, [r0, 0x9] - ldr r0, _081134AC + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A6190 lsls r0, 24 @@ -563167,7 +544568,7 @@ _0811345A: ldrsh r0, [r4, r1] cmp r3, r0 bgt _08113488 - ldr r5, _081134B0 + ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -563191,19 +544592,14 @@ _08113488: ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, _081134B4 + ldr r0, =sub_81134B8 + 1 str r0, [r4] add sp, 0xC pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081134A0: .4byte 0x04000018 -_081134A4: .4byte 0x02022e1c -_081134A8: .4byte 0xa2600001 -_081134AC: .4byte 0x02038436 -_081134B0: .4byte 0x02038c28 -_081134B4: .4byte sub_81134B8 + 1 + .pool thumb_func_end sub_81133E8 thumb_func_start sub_81134B8 @@ -563214,20 +544610,19 @@ sub_81134B8: @ 81134B8 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _081134DC + ldr r1, =0x03005e00 adds r2, r0, r1 movs r1, 0x8 ldrsh r0, [r2, r1] cmp r0, 0x4 bhi _0811356E lsls r0, 2 - ldr r1, _081134E0 + ldr r1, =_081134E4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081134DC: .4byte 0x03005e00 -_081134E0: .4byte _081134E4 + .pool .align 2, 0 _081134E4: .4byte _081134F8 @@ -563287,7 +544682,7 @@ _0811354E: bl sub_8113574 b _0811356E _08113556: - ldr r1, _08113564 + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] ldrh r0, [r2, 0x8] @@ -563295,7 +544690,7 @@ _08113556: strh r0, [r2, 0x8] b _0811356E .align 2, 0 -_08113564: .4byte 0x02039b28 + .pool _08113568: adds r0, r3, 0 bl move_anim_task_del @@ -563316,11 +544711,11 @@ sub_8113574: @ 8113574 ldrsh r0, [r5, r1] cmp r4, r0 bgt _081135CA - ldr r7, _081135E0 + ldr r7, =0x02038c28 mov r12, r7 - ldr r0, _081135E4 + ldr r0, =0x08329f40 mov r8, r0 - ldr r6, _081135E8 + ldr r6, =0x02039b28 _08113592: lsls r2, r4, 1 ldrb r1, [r6, 0x14] @@ -563362,9 +544757,7 @@ _081135CA: pop {r0} bx r0 .align 2, 0 -_081135E0: .4byte 0x02038c28 -_081135E4: .4byte 0x08329f40 -_081135E8: .4byte 0x02039b28 + .pool thumb_func_end sub_8113574 thumb_func_start sub_81135EC @@ -563373,7 +544766,7 @@ sub_81135EC: @ 81135EC mov r6, r8 push {r6} adds r4, r0, 0 - ldr r5, _0811368C + ldr r5, =0x0203841e movs r0, 0x4 ldrsh r1, [r5, r0] lsls r0, r1, 1 @@ -563381,7 +544774,7 @@ sub_81135EC: @ 81135EC movs r1, 0x5 bl __divsi3 adds r6, r0, 0 - ldr r1, _08113690 + ldr r1, =0x02038436 mov r8, r1 ldrb r0, [r1] movs r1, 0x2 @@ -563427,10 +544820,10 @@ sub_81135EC: @ 81135EC strh r0, [r4, 0x22] ldrh r0, [r5, 0x6] strh r0, [r4, 0x34] - ldr r0, _08113694 + ldr r0, =sub_811369C + 1 str r0, [r4, 0x1C] adds r4, 0x2E - ldr r2, _08113698 + ldr r2, =0x0203a100 movs r1, 0x6 _08113674: ldrh r0, [r4] @@ -563446,10 +544839,7 @@ _08113674: pop {r0} bx r0 .align 2, 0 -_0811368C: .4byte 0x0203841e -_08113690: .4byte 0x02038436 -_08113694: .4byte sub_811369C + 1 -_08113698: .4byte 0x0203a100 + .pool thumb_func_end sub_81135EC thumb_func_start sub_811369C @@ -563496,15 +544886,15 @@ sub_81136E8: @ 81136E8 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08113724 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08113728 + ldr r1, =0x0203841e ldrh r1, [r1] strh r1, [r0, 0x8] - ldr r1, _0811372C + ldr r1, =0x02038436 ldrb r4, [r1] movs r1, 0x10 strh r1, [r0, 0xA] @@ -563516,34 +544906,29 @@ sub_81136E8: @ 81136E8 lsrs r0, 24 cmp r0, 0x1 bne _08113734 - ldr r1, _08113730 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set b _0811373C .align 2, 0 -_08113724: .4byte 0x03005e00 -_08113728: .4byte 0x0203841e -_0811372C: .4byte 0x02038436 -_08113730: .4byte 0x00003f42 + .pool _08113734: - ldr r1, _08113750 + ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set _0811373C: - ldr r0, _08113754 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _08113758 + ldr r0, =sub_811375C + 1 str r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08113750: .4byte 0x00003f44 -_08113754: .4byte 0x03005e00 -_08113758: .4byte sub_811375C + 1 + .pool thumb_func_end sub_81136E8 thumb_func_start sub_811375C @@ -563551,7 +544936,7 @@ sub_811375C: @ 811375C push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _081137C8 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -563581,9 +544966,9 @@ sub_811375C: @ 811375C strh r5, [r6, 0xC] cmp r4, 0x10 bne _081137DE - ldr r2, _081137CC - ldr r1, _081137D0 - ldr r0, _081137D4 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -563600,10 +544985,7 @@ sub_811375C: @ 811375C bl move_anim_task_del b _081137DE .align 2, 0 -_081137C8: .4byte 0x03005e00 -_081137CC: .4byte 0x02020630 -_081137D0: .4byte 0x020241e4 -_081137D4: .4byte 0x02038436 + .pool _081137D8: ldrh r0, [r6, 0xC] adds r0, 0x1 @@ -563619,27 +545001,25 @@ sub_81137E4: @ 81137E4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08113810 + ldr r1, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 adds r2, r1 - ldr r0, _08113814 + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r2, 0x8] movs r1, 0x80 lsls r1, 5 strh r1, [r2, 0xA] - ldr r0, _08113818 + ldr r0, =sub_811381C + 1 str r0, [r2] movs r0, 0x52 bl lcd_io_set pop {r0} bx r0 .align 2, 0 -_08113810: .4byte 0x03005e00 -_08113814: .4byte 0x0203841e -_08113818: .4byte sub_811381C + 1 + .pool thumb_func_end sub_81137E4 thumb_func_start sub_811381C @@ -563647,7 +545027,7 @@ sub_811381C: @ 811381C push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _08113878 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -563687,7 +545067,7 @@ sub_811381C: @ 811381C bl move_anim_task_del b _08113882 .align 2, 0 -_08113878: .4byte 0x03005e00 + .pool _0811387C: ldrh r0, [r6, 0xC] adds r0, 0x1 @@ -563707,22 +545087,21 @@ sub_8113888: @ 8113888 lsls r1, 5 movs r0, 0x52 bl lcd_io_set - ldr r0, _081138B4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _081138BC - ldr r1, _081138B8 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set b _081138C4 .align 2, 0 -_081138B4: .4byte 0x02038436 -_081138B8: .4byte 0x00003f42 + .pool _081138BC: - ldr r1, _081138D0 + ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set _081138C4: @@ -563732,21 +545111,21 @@ _081138C4: pop {r0} bx r0 .align 2, 0 -_081138D0: .4byte 0x00003f44 + .pool thumb_func_end sub_8113888 thumb_func_start sub_81138D4 sub_81138D4: @ 81138D4 push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _08113940 + ldr r6, =0x02038437 ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x30] - ldr r5, _08113944 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -563775,9 +545154,9 @@ sub_81138D4: @ 81138D4 ldrh r0, [r4, 0x32] negs r0, r0 strh r0, [r4, 0x36] - ldr r0, _08113948 + ldr r0, =0x0000ffd8 strh r0, [r4, 0x3A] - ldr r1, _0811394C + ldr r1, =sub_8113950 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -563785,10 +545164,7 @@ sub_81138D4: @ 81138D4 pop {r0} bx r0 .align 2, 0 -_08113940: .4byte 0x02038437 -_08113944: .4byte 0x02038436 -_08113948: .4byte 0x0000ffd8 -_0811394C: .4byte sub_8113950 + 1 + .pool thumb_func_end sub_81138D4 thumb_func_start sub_8113950 @@ -563869,7 +545245,7 @@ _081139D4: sub_81139DC: @ 81139DC push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08113A10 + ldr r5, =0x0203841e ldrh r0, [r5] ldrh r1, [r4, 0x20] adds r0, r1 @@ -563887,14 +545263,13 @@ sub_81139DC: @ 81139DC strh r0, [r4, 0x30] ldrh r0, [r5, 0xA] strh r0, [r4, 0x32] - ldr r0, _08113A14 + ldr r0, =sub_8113A18 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08113A10: .4byte 0x0203841e -_08113A14: .4byte sub_8113A18 + 1 + .pool thumb_func_end sub_81139DC thumb_func_start sub_8113A18 @@ -563924,13 +545299,13 @@ sub_8113A18: @ 8113A18 ldrsh r1, [r2, r3] cmp r0, r1 bne _08113A4E - ldr r0, _08113A54 + ldr r0, =sub_8113A58 + 1 str r0, [r2, 0x1C] _08113A4E: pop {r0} bx r0 .align 2, 0 -_08113A54: .4byte sub_8113A58 + 1 + .pool thumb_func_end sub_8113A18 thumb_func_start sub_8113A58 @@ -563968,19 +545343,18 @@ _08113A8A: sub_8113A90: @ 8113A90 push {r4-r7,lr} adds r4, r0, 0 - ldr r0, _08113AA4 + ldr r0, =0x0203841e movs r2, 0 ldrsh r1, [r0, r2] adds r3, r0, 0 cmp r1, 0 bne _08113AAC - ldr r0, _08113AA8 + ldr r0, =0x02038436 b _08113AAE .align 2, 0 -_08113AA4: .4byte 0x0203841e -_08113AA8: .4byte 0x02038436 + .pool _08113AAC: - ldr r0, _08113ADC + ldr r0, =0x02038437 _08113AAE: ldrb r5, [r0] movs r6, 0x14 @@ -563988,10 +545362,10 @@ _08113AAE: lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x4 - ldr r7, _08113AE0 + ldr r7, =0x000003ff adds r0, r7, 0 ands r1, r0 - ldr r0, _08113AE4 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] @@ -564005,9 +545379,7 @@ _08113AAE: beq _08113AF2 b _08113B60 .align 2, 0 -_08113ADC: .4byte 0x02038437 -_08113AE0: .4byte 0x000003ff -_08113AE4: .4byte 0xfffffc00 + .pool _08113AE8: cmp r0, 0x2 beq _08113B26 @@ -564076,18 +545448,17 @@ _08113B60: ldrh r0, [r4, 0x22] adds r0, 0xC strh r0, [r4, 0x36] - ldr r0, _08113B88 + ldr r0, =0x0000fff4 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, _08113B8C + ldr r0, =sub_8113B90 + 1 str r0, [r4, 0x1C] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08113B88: .4byte 0x0000fff4 -_08113B8C: .4byte sub_8113B90 + 1 + .pool thumb_func_end sub_8113A90 thumb_func_start sub_8113B90 @@ -564115,9 +545486,9 @@ sub_8113BAC: @ 8113BAC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08113C10 + ldr r0, =0x03005e00 adds r5, r1, r0 - ldr r4, _08113C14 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x1 bl sub_80A5C6C @@ -564152,17 +545523,15 @@ sub_8113BAC: @ 8113BAC lsls r0, 24 cmp r0, 0 bne _08113C1C - ldr r0, _08113C18 + ldr r0, =0x0000fff4 b _08113C1E .align 2, 0 -_08113C10: .4byte 0x03005e00 -_08113C14: .4byte 0x02038436 -_08113C18: .4byte 0x0000fff4 + .pool _08113C1C: - ldr r0, _08113C68 + ldr r0, =0x0000ffc0 _08113C1E: strh r0, [r5, 0x18] - ldr r0, _08113C6C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -564173,10 +545542,10 @@ _08113C1E: add r4, sp, 0xC adds r0, r4, 0 bl sub_80A6B30 - ldr r0, _08113C70 + ldr r0, =0x02022e1a ldrh r0, [r0] strh r0, [r5, 0x1C] - ldr r1, _08113C74 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set ldrb r1, [r4, 0x8] @@ -564184,47 +545553,42 @@ _08113C1E: movs r0, 0 movs r2, 0x20 bl rboxid_80040B8 - ldr r0, _08113C78 + ldr r0, =0x04000016 str r0, [sp] movs r7, 0x2 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 bne _08113CB0 - ldr r1, _08113C7C + ldr r1, =0x02022e1c b _08113CAA .align 2, 0 -_08113C68: .4byte 0x0000ffc0 -_08113C6C: .4byte 0x02038436 -_08113C70: .4byte 0x02022e1a -_08113C74: .4byte 0x00003f42 -_08113C78: .4byte 0x04000016 -_08113C7C: .4byte 0x02022e1c + .pool _08113C80: - ldr r0, _08113D38 + ldr r0, =0x02022e1e ldrh r0, [r0] strh r0, [r5, 0x1C] - ldr r1, _08113D3C + ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set movs r0, 0 movs r1, 0x90 movs r2, 0x20 bl rboxid_80040B8 - ldr r0, _08113D40 + ldr r0, =0x0400001a str r0, [sp] movs r7, 0x4 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 bne _08113CB0 - ldr r1, _08113D44 + ldr r1, =0x02022e18 _08113CAA: ldrh r0, [r1] adds r0, 0xF0 strh r0, [r1] _08113CB0: - ldr r0, _08113D48 + ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r2, sp movs r1, 0 @@ -564241,7 +545605,7 @@ _08113CB0: movs r0, 0x3 bl sub_8114374 movs r3, 0 - ldr r4, _08113D4C + ldr r4, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r4, r0 @@ -564271,35 +545635,26 @@ _08113CDC: movs r0, 0x4A adds r1, r7, 0 bl lcd_io_set - ldr r1, _08113D50 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r2, _08113D54 + ldr r2, =0x02022e24 ldrh r0, [r5, 0x24] lsls r0, 8 ldrh r1, [r5, 0x26] orrs r0, r1 strh r0, [r2] - ldr r1, _08113D58 + ldr r1, =0x02022e26 movs r0, 0xA0 strh r0, [r1] - ldr r0, _08113D5C + ldr r0, =sub_8113D60 + 1 str r0, [r5] add sp, 0x1C pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08113D38: .4byte 0x02022e1e -_08113D3C: .4byte 0x00003f44 -_08113D40: .4byte 0x0400001a -_08113D44: .4byte 0x02022e18 -_08113D48: .4byte 0xa2600001 -_08113D4C: .4byte 0x02038c28 -_08113D50: .4byte 0x00003f3f -_08113D54: .4byte 0x02022e24 -_08113D58: .4byte 0x02022e26 -_08113D5C: .4byte sub_8113D60 + 1 + .pool thumb_func_end sub_8113BAC thumb_func_start sub_8113D60 @@ -564310,7 +545665,7 @@ sub_8113D60: @ 8113D60 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08113D84 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -564319,13 +545674,12 @@ sub_8113D60: @ 8113D60 b _08113E72 _08113D7A: lsls r0, 2 - ldr r1, _08113D88 + ldr r1, =_08113D8C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08113D84: .4byte 0x03005e00 -_08113D88: .4byte _08113D8C + .pool .align 2, 0 _08113D8C: .4byte _08113DA0 @@ -564415,7 +545769,7 @@ _08113E1C: blt _08113E3E strh r2, [r4, 0x24] _08113E3E: - ldr r3, _08113E54 + ldr r3, =0x02022e24 ldrh r2, [r4, 0x24] lsls r0, r2, 8 ldrh r1, [r4, 0x26] @@ -564427,9 +545781,9 @@ _08113E3E: bne _08113E72 b _08113E5E .align 2, 0 -_08113E54: .4byte 0x02022e24 + .pool _08113E58: - ldr r1, _08113E68 + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] _08113E5E: @@ -564438,7 +545792,7 @@ _08113E5E: strh r0, [r4, 0x8] b _08113E72 .align 2, 0 -_08113E68: .4byte 0x02039b28 + .pool _08113E6C: adds r0, r2, 0 bl move_anim_task_del @@ -564457,7 +545811,7 @@ sub_8113E78: @ 8113E78 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08113EA0 + ldr r1, =0x03005e00 adds r5, r0, r1 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -564466,13 +545820,12 @@ sub_8113E78: @ 8113E78 b _081140A6 _08113E94: lsls r0, 2 - ldr r1, _08113EA4 + ldr r1, =_08113EA8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08113EA0: .4byte 0x03005e00 -_08113EA4: .4byte _08113EA8 + .pool .align 2, 0 _08113EA8: .4byte _08113EBC @@ -564486,12 +545839,12 @@ _08113EBC: lsrs r0, 24 cmp r0, 0x1 bne _08113EF8 - ldr r0, _08113EEC + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r0, _08113EF0 + ldr r0, =0x02022e26 strh r1, [r0] - ldr r4, _08113EF4 + ldr r4, =0x00003f3f movs r0, 0x48 adds r1, r4, 0 bl lcd_io_set @@ -564502,11 +545855,9 @@ _08113EBC: bl move_anim_task_del b _081140A6 .align 2, 0 -_08113EEC: .4byte 0x02022e24 -_08113EF0: .4byte 0x02022e26 -_08113EF4: .4byte 0x00003f3f + .pool _08113EF8: - ldr r0, _08113F18 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -564514,28 +545865,25 @@ _08113EF8: strh r0, [r5, 0xE] cmp r0, 0x1 bne _08113F24 - ldr r1, _08113F1C + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set - ldr r1, _08113F20 + ldr r1, =0x02022e1c b _08113F2E .align 2, 0 -_08113F18: .4byte 0x02038437 -_08113F1C: .4byte 0x00003f42 -_08113F20: .4byte 0x02022e1c + .pool _08113F24: - ldr r1, _08113F38 + ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set - ldr r1, _08113F3C + ldr r1, =0x02022e18 _08113F2E: ldrh r0, [r1] adds r0, 0xF0 strh r0, [r1] b _08114044 .align 2, 0 -_08113F38: .4byte 0x00003f44 -_08113F3C: .4byte 0x02022e18 + .pool _08113F40: movs r1, 0xE ldrsh r0, [r5, r1] @@ -564543,7 +545891,7 @@ _08113F40: bne _08113F68 mov r0, sp bl sub_80A6B30 - ldr r0, _08113F64 + ldr r0, =0x02022e1a ldrh r0, [r0] strh r0, [r5, 0x1C] mov r0, sp @@ -564554,9 +545902,9 @@ _08113F40: bl rboxid_80040B8 b _08113F78 .align 2, 0 -_08113F64: .4byte 0x02022e1a + .pool _08113F68: - ldr r0, _08113F80 + ldr r0, =0x02022e1e ldrh r0, [r0] strh r0, [r5, 0x1C] movs r0, 0 @@ -564568,9 +545916,9 @@ _08113F78: bl sub_8114374 b _08114044 .align 2, 0 -_08113F80: .4byte 0x02022e1e + .pool _08113F84: - ldr r4, _08113FD0 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x1 bl sub_80A5C6C @@ -564602,13 +545950,12 @@ _08113F84: lsls r0, 24 cmp r0, 0 bne _08113FD8 - ldr r0, _08113FD4 + ldr r0, =0x0000fff4 b _08113FDA .align 2, 0 -_08113FD0: .4byte 0x02038437 -_08113FD4: .4byte 0x0000fff4 + .pool _08113FD8: - ldr r0, _08113FEC + ldr r0, =0x0000ffc0 _08113FDA: strh r0, [r5, 0x18] ldrh r0, [r5, 0x18] @@ -564620,23 +545967,23 @@ _08113FDA: strh r0, [r5, 0x20] b _08114044 .align 2, 0 -_08113FEC: .4byte 0x0000ffc0 + .pool _08113FF0: movs r1, 0xE ldrsh r0, [r5, r1] cmp r0, 0x1 bne _08114000 - ldr r0, _08113FFC + ldr r0, =0x04000016 b _08114002 .align 2, 0 -_08113FFC: .4byte 0x04000016 + .pool _08114000: - ldr r0, _0811404C + ldr r0, =0x0400001a _08114002: str r0, [sp, 0x10] movs r3, 0 add r4, sp, 0x10 - ldr r6, _08114050 + ldr r6, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r7, r6, r0 @@ -564657,7 +546004,7 @@ _08114010: lsrs r3, r0, 16 cmp r3, 0x6F bls _08114010 - ldr r1, _08114054 + ldr r1, =0xa2600001 str r1, [r4, 0x4] movs r2, 0 movs r0, 0x1 @@ -564672,45 +546019,43 @@ _08114044: strh r0, [r5, 0x8] b _081140A6 .align 2, 0 -_0811404C: .4byte 0x0400001a -_08114050: .4byte 0x02038c28 -_08114054: .4byte 0xa2600001 + .pool _08114058: movs r1, 0xE ldrsh r0, [r5, r1] cmp r0, 0x1 bne _08114070 - ldr r1, _0811406C + ldr r1, =0x00003f3d movs r0, 0x4A bl lcd_io_set b _08114078 .align 2, 0 -_0811406C: .4byte 0x00003f3d + .pool _08114070: - ldr r1, _081140B0 + ldr r1, =0x00003f3b movs r0, 0x4A bl lcd_io_set _08114078: - ldr r1, _081140B4 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r2, _081140B8 + ldr r2, =0x02022e24 ldrh r0, [r5, 0x24] lsls r0, 8 ldrh r1, [r5, 0x26] orrs r0, r1 strh r0, [r2] - ldr r1, _081140BC + ldr r1, =0x02022e26 movs r0, 0xA0 strh r0, [r1] movs r0, 0 strh r0, [r5, 0x8] strh r0, [r5, 0xA] strh r0, [r5, 0xC] - ldr r1, _081140C0 + ldr r1, =0x0000080c movs r0, 0x52 bl lcd_io_set - ldr r0, _081140C4 + ldr r0, =sub_81140C8 + 1 str r0, [r5] _081140A6: add sp, 0x1C @@ -564718,12 +546063,7 @@ _081140A6: pop {r0} bx r0 .align 2, 0 -_081140B0: .4byte 0x00003f3b -_081140B4: .4byte 0x00003f3f -_081140B8: .4byte 0x02022e24 -_081140BC: .4byte 0x02022e26 -_081140C0: .4byte 0x0000080c -_081140C4: .4byte sub_81140C8 + 1 + .pool thumb_func_end sub_8113E78 thumb_func_start sub_81140C8 @@ -564734,7 +546074,7 @@ sub_81140C8: @ 81140C8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081140EC + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -564743,13 +546083,12 @@ sub_81140C8: @ 81140C8 b _08114232 _081140E2: lsls r0, 2 - ldr r1, _081140F0 + ldr r1, =_081140F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081140EC: .4byte 0x03005e00 -_081140F0: .4byte _081140F4 + .pool .align 2, 0 _081140F4: .4byte _08114108 @@ -564800,7 +546139,7 @@ _08114150: movs r0, 0x1 strh r0, [r4, 0xA] _08114154: - ldr r2, _08114198 + ldr r2, =0x02022e24 ldrh r0, [r4, 0x24] lsls r0, 8 ldrh r1, [r4, 0x26] @@ -564834,7 +546173,7 @@ _08114176: strh r0, [r4, 0xA] b _08114204 .align 2, 0 -_08114198: .4byte 0x02022e24 + .pool _0811419C: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -564887,7 +546226,7 @@ _081141DA: bne _08114232 b _08114204 _081141FE: - ldr r1, _0811420C + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] _08114204: @@ -564896,14 +546235,14 @@ _08114204: strh r0, [r4, 0x8] b _08114232 .align 2, 0 -_0811420C: .4byte 0x02039b28 + .pool _08114210: - ldr r0, _08114238 + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r0, _0811423C + ldr r0, =0x02022e26 strh r1, [r0] - ldr r4, _08114240 + ldr r4, =0x00003f3f movs r0, 0x48 adds r1, r4, 0 bl lcd_io_set @@ -564917,9 +546256,7 @@ _08114232: pop {r0} bx r0 .align 2, 0 -_08114238: .4byte 0x02022e24 -_0811423C: .4byte 0x02022e26 -_08114240: .4byte 0x00003f3f + .pool thumb_func_end sub_81140C8 thumb_func_start sub_8114244 @@ -564946,9 +546283,9 @@ sub_8114244: @ 8114244 movs r4, 0 cmp r0, 0 ble _081142A4 - ldr r0, _08114330 + ldr r0, =0x02038c28 mov r12, r0 - ldr r7, _08114334 + ldr r7, =0x02039b28 _08114278: lsls r2, r4, 16 asrs r2, 16 @@ -564980,9 +546317,9 @@ _081142A4: ldrsh r0, [r6, r2] cmp r1, r0 bgt _081142EE - ldr r0, _08114330 + ldr r0, =0x02038c28 mov r12, r0 - ldr r7, _08114334 + ldr r7, =0x02039b28 _081142B8: asrs r4, r3, 16 cmp r4, 0 @@ -565023,8 +546360,8 @@ _081142EE: ldrsh r0, [r6, r3] cmp r1, r0 bge _08114366 - ldr r7, _08114330 - ldr r4, _08114334 + ldr r7, =0x02038c28 + ldr r4, =0x02039b28 _08114306: asrs r3, r2, 16 cmp r3, 0 @@ -565048,15 +546385,14 @@ _0811431E: blt _08114306 b _08114366 .align 2, 0 -_08114330: .4byte 0x02038c28 -_08114334: .4byte 0x02039b28 + .pool _08114338: movs r1, 0x1C ldrsh r0, [r6, r1] adds r5, r0, 0 adds r5, 0x9F movs r4, 0 - ldr r3, _08114370 + ldr r3, =0x02038c28 movs r2, 0xF0 lsls r2, 3 adds r6, r3, r2 @@ -565082,7 +546418,7 @@ _08114366: pop {r0} bx r0 .align 2, 0 -_08114370: .4byte 0x02038c28 + .pool thumb_func_end sub_8114244 thumb_func_start sub_8114374 @@ -565091,7 +546427,7 @@ sub_8114374: @ 8114374 lsls r0, 24 lsrs r0, 24 movs r4, 0 - ldr r7, _081143BC + ldr r7, =0x02020630 movs r1, 0x3 ands r0, r1 lsls r5, r0, 2 @@ -565124,7 +546460,7 @@ _081143AA: pop {r0} bx r0 .align 2, 0 -_081143BC: .4byte 0x02020630 + .pool thumb_func_end sub_8114374 thumb_func_start sub_81143C0 @@ -565137,7 +546473,7 @@ sub_81143C0: @ 81143C0 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r6, _08114464 + ldr r6, =0x02038436 ldrb r0, [r6] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -565151,9 +546487,9 @@ sub_81143C0: @ 81143C0 adds r1, r4, 0 movs r2, 0x1 bl sub_80A438C - ldr r0, _08114468 + ldr r0, =0x02020630 mov r9, r0 - ldr r0, _0811446C + ldr r0, =0x020241e4 mov r8, r0 ldrb r0, [r6] add r0, r8 @@ -565207,9 +546543,7 @@ _0811444E: pop {r0} bx r0 .align 2, 0 -_08114464: .4byte 0x02038436 -_08114468: .4byte 0x02020630 -_0811446C: .4byte 0x020241e4 + .pool thumb_func_end sub_81143C0 thumb_func_start sub_8114470 @@ -565217,7 +546551,7 @@ sub_8114470: @ 8114470 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _081144B8 + ldr r4, =0x02038436 ldrb r0, [r4] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -565247,14 +546581,14 @@ _081144AC: pop {r0} bx r0 .align 2, 0 -_081144B8: .4byte 0x02038436 + .pool thumb_func_end sub_8114470 thumb_func_start sub_81144BC sub_81144BC: @ 81144BC push {r4,lr} adds r4, r0, 0 - ldr r1, _081144EC + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -565266,18 +546600,16 @@ sub_81144BC: @ 81144BC ldrb r1, [r1, 0x4] adds r0, r4, 0 bl obj_anim_image_start - ldr r0, _081144F0 + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] - ldr r1, _081144F4 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4} pop {r0} bx r0 .align 2, 0 -_081144EC: .4byte 0x0203841e -_081144F0: .4byte sub_80A67D8 + 1 -_081144F4: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_81144BC thumb_func_start sub_81144F8 @@ -565287,24 +546619,24 @@ sub_81144F8: @ 81144F8 lsls r0, 24 lsrs r7, r0, 24 movs r6, 0 - ldr r0, _081145EC + ldr r0, =0x02022e24 strh r6, [r0] - ldr r0, _081145F0 + ldr r0, =0x02022e26 strh r6, [r0] - ldr r1, _081145F4 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r1, _081145F8 + ldr r1, =0x00003f3d movs r0, 0x4A bl lcd_io_set movs r1, 0x80 lsls r1, 8 movs r0, 0 bl lcd_io_set_bits - ldr r1, _081145FC + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set - ldr r1, _08114600 + ldr r1, =0x00000c08 movs r0, 0x52 bl lcd_io_set movs r0, 0x1 @@ -565332,7 +546664,7 @@ _0811455C: lsls r0, 24 cmp r0, 0 bne _081145D6 - ldr r4, _08114604 + ldr r4, =0x02038436 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 @@ -565353,8 +546685,8 @@ _0811458C: lsrs r0, 24 cmp r0, 0x1 bne _081145D6 - ldr r3, _08114608 - ldr r1, _0811460C + ldr r3, =0x02020630 + ldr r1, =0x020241e4 ldrb r0, [r4] eors r0, r5 adds r0, r1 @@ -565385,51 +546717,40 @@ _081145D6: lsls r0, 24 cmp r0, 0 beq _08114614 - ldr r0, _08114610 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r5, [r0] b _0811465C .align 2, 0 -_081145EC: .4byte 0x02022e24 -_081145F0: .4byte 0x02022e26 -_081145F4: .4byte 0x00003f3f -_081145F8: .4byte 0x00003f3d -_081145FC: .4byte 0x00003f42 -_08114600: .4byte 0x00000c08 -_08114604: .4byte 0x02038436 -_08114608: .4byte 0x02020630 -_0811460C: .4byte 0x020241e4 -_08114610: .4byte 0x02039f34 + .pool _08114614: - ldr r4, _08114634 + ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08114640 - ldr r1, _08114638 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0811463C + ldr r1, =0x02024744 b _08114650 .align 2, 0 -_08114634: .4byte 0x02038436 -_08114638: .4byte 0x0202406e -_0811463C: .4byte 0x02024744 + .pool _08114640: - ldr r1, _081146E0 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081146E4 + ldr r1, =0x020244ec _08114650: adds r0, r1 movs r1, 0xB @@ -565442,7 +546763,7 @@ _0811465C: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081146E8 + ldr r0, =0x02038436 ldrb r0, [r0] adds r1, r4, 0 adds r2, r5, 0 @@ -565453,22 +546774,22 @@ _0811465C: bl sub_80A6B30 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _081146EC + ldr r1, =0x08c1d210 bl sub_80A6D48 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _081146F0 + ldr r1, =0x08c1d0ac mov r2, sp ldrh r2, [r2, 0xA] bl sub_80A6CC0 - ldr r0, _081146F4 + ldr r0, =0x08c1d1e8 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette - ldr r2, _081146F8 - ldr r0, _081146FC + ldr r2, =0x02022e18 + ldr r0, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -565477,7 +546798,7 @@ _0811465C: negs r0, r0 adds r0, 0x60 strh r0, [r2] - ldr r2, _08114700 + ldr r2, =0x02022e1a ldrh r0, [r1, 0x22] negs r0, r0 adds r0, 0x20 @@ -565486,7 +546807,7 @@ _0811465C: lsrs r0, 4 adds r0, 0x10 adds r1, r0, 0 - ldr r2, _08114704 + ldr r2, =0x0203841e movs r3, 0x2 ldrsh r0, [r2, r3] cmp r0, 0 @@ -565496,16 +546817,7 @@ _0811465C: bl sub_80A750C b _08114714 .align 2, 0 -_081146E0: .4byte 0x0202406e -_081146E4: .4byte 0x020244ec -_081146E8: .4byte 0x02038436 -_081146EC: .4byte 0x08c1d210 -_081146F0: .4byte 0x08c1d0ac -_081146F4: .4byte 0x08c1d1e8 -_081146F8: .4byte 0x02022e18 -_081146FC: .4byte 0x02020630 -_08114700: .4byte 0x02022e1a -_08114704: .4byte 0x0203841e + .pool _08114708: lsls r0, r1, 4 ldrh r3, [r2, 0x4] @@ -565513,13 +546825,13 @@ _08114708: movs r2, 0xB bl pal_fade_1 _08114714: - ldr r1, _0811473C + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 strh r5, [r0, 0x8] - ldr r2, _08114740 + ldr r2, =0x0203841e ldrh r1, [r2] strh r1, [r0, 0xA] ldrh r1, [r2, 0x2] @@ -565527,16 +546839,14 @@ _08114714: ldrh r1, [r2, 0x4] strh r1, [r0, 0xE] strh r6, [r0, 0x14] - ldr r1, _08114744 + ldr r1, =sub_8114748 + 1 str r1, [r0] add sp, 0x10 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0811473C: .4byte 0x03005e00 -_08114740: .4byte 0x0203841e -_08114744: .4byte sub_8114748 + 1 + .pool thumb_func_end sub_81144F8 thumb_func_start sub_8114748 @@ -565546,7 +546856,7 @@ sub_8114748: @ 8114748 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _08114810 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -565555,7 +546865,7 @@ sub_8114748: @ 8114748 adds r0, 0x4 movs r5, 0 strh r0, [r4, 0x1C] - ldr r2, _08114814 + ldr r2, =0x02022e18 ldrh r3, [r2] subs r1, r3, 0x4 strh r1, [r2] @@ -565580,7 +546890,7 @@ _08114776: bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r5, _08114818 + ldr r5, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -565613,8 +546923,8 @@ _081147B8: ldrsh r0, [r4, r1] cmp r0, 0x1 bne _08114886 - ldr r2, _0811481C - ldr r0, _08114820 + ldr r2, =0x020241e4 + ldr r0, =0x02038436 ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -565638,19 +546948,15 @@ _081147B8: strb r0, [r2, 0x5] b _08114886 .align 2, 0 -_08114810: .4byte 0x03005e00 -_08114814: .4byte 0x02022e18 -_08114818: .4byte 0x02020630 -_0811481C: .4byte 0x020241e4 -_08114820: .4byte 0x02038436 + .pool _08114824: cmp r0, 0x3 bne _08114886 - ldr r0, _08114890 + ldr r0, =0x02022e24 strh r5, [r0] - ldr r0, _08114894 + ldr r0, =0x02022e26 strh r5, [r0] - ldr r4, _08114898 + ldr r4, =0x00003f3f movs r0, 0x48 adds r1, r4, 0 bl lcd_io_set @@ -565691,9 +546997,7 @@ _08114886: pop {r0} bx r0 .align 2, 0 -_08114890: .4byte 0x02022e24 -_08114894: .4byte 0x02022e26 -_08114898: .4byte 0x00003f3f + .pool thumb_func_end sub_8114748 thumb_func_start sub_811489C @@ -565702,20 +547006,19 @@ sub_811489C: @ 811489C lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _081148BC + ldr r0, =0x0203841e movs r2, 0 ldrsh r1, [r0, r2] adds r2, r0, 0 cmp r1, 0x7 bhi _08114900 lsls r0, r1, 2 - ldr r1, _081148C0 + ldr r1, =_081148C4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081148BC: .4byte 0x0203841e -_081148C0: .4byte _081148C4 + .pool .align 2, 0 _081148C4: .4byte _081148E4 @@ -565760,18 +547063,18 @@ _08114908: lsls r0, 24 cmp r0, 0 beq _0811492C - ldr r0, _08114928 + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r2, [r0] b _0811492E .align 2, 0 -_08114928: .4byte 0x020241e4 + .pool _0811492C: movs r2, 0xFF _0811492E: cmp r2, 0xFF beq _0811494A - ldr r1, _08114958 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -565779,7 +547082,7 @@ _0811492E: ldrb r0, [r0, 0x5] lsrs r0, 4 adds r0, 0x10 - ldr r1, _0811495C + ldr r1, =0x0203841e ldrb r1, [r1, 0x2] bl sub_80A750C _0811494A: @@ -565789,8 +547092,7 @@ _0811494A: pop {r0} bx r0 .align 2, 0 -_08114958: .4byte 0x02020630 -_0811495C: .4byte 0x0203841e + .pool thumb_func_end sub_811489C thumb_func_start sub_8114960 @@ -565798,18 +547100,18 @@ sub_8114960: @ 8114960 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _0811498C + ldr r2, =0x02038432 ldrb r0, [r2] cmp r0, 0x1 bhi _08114974 - ldr r1, _08114990 + ldr r1, =0x0203841e movs r0, 0 strh r0, [r1, 0xE] _08114974: ldrb r0, [r2] cmp r0, 0x2 bne _08114980 - ldr r1, _08114990 + ldr r1, =0x0203841e movs r0, 0x1 strh r0, [r1, 0xE] _08114980: @@ -565818,15 +547120,14 @@ _08114980: pop {r0} bx r0 .align 2, 0 -_0811498C: .4byte 0x02038432 -_08114990: .4byte 0x0203841e + .pool thumb_func_end sub_8114960 thumb_func_start sub_8114994 sub_8114994: @ 8114994 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _081149EC + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -565841,7 +547142,7 @@ sub_8114994: @ 8114994 strh r0, [r4, 0x22] movs r0, 0x14 strh r0, [r4, 0x2E] - ldr r5, _081149F0 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -565854,20 +547155,17 @@ sub_8114994: @ 8114994 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] - ldr r0, _081149F4 + ldr r0, =0x0000ffd8 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, _081149F8 + ldr r0, =sub_81149FC + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081149EC: .4byte 0x02038436 -_081149F0: .4byte 0x02038437 -_081149F4: .4byte 0x0000ffd8 -_081149F8: .4byte sub_81149FC + 1 + .pool thumb_func_end sub_8114994 thumb_func_start sub_81149FC @@ -565891,7 +547189,7 @@ sub_81149FC: @ 81149FC strh r1, [r5, 0x24] movs r0, 0x14 strh r0, [r5, 0x2E] - ldr r4, _08114A58 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -565908,15 +547206,14 @@ sub_81149FC: @ 81149FC strh r0, [r5, 0x38] adds r0, r5, 0 bl sub_80A68D4 - ldr r0, _08114A5C + ldr r0, =sub_8114A60 + 1 str r0, [r5, 0x1C] _08114A50: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08114A58: .4byte 0x02038436 -_08114A5C: .4byte sub_8114A60 + 1 + .pool thumb_func_end sub_81149FC thumb_func_start sub_8114A60 @@ -565941,21 +547238,21 @@ sub_8114A7C: @ 8114A7C adds r6, r0, 0 movs r1, 0x1 bl sub_80A6980 - ldr r0, _08114ADC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08114A9C - ldr r1, _08114AE0 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] _08114A9C: - ldr r4, _08114AE0 + ldr r4, =0x0203841e ldrh r0, [r4, 0x8] strh r0, [r6, 0x2E] - ldr r5, _08114AE4 + ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -565972,20 +547269,16 @@ _08114A9C: ldrh r4, [r4, 0x6] adds r0, r4 strh r0, [r6, 0x36] - ldr r0, _08114AE8 + ldr r0, =sub_80A6EEC + 1 str r0, [r6, 0x1C] - ldr r1, _08114AEC + ldr r1, =move_anim_8072740 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08114ADC: .4byte 0x02038436 -_08114AE0: .4byte 0x0203841e -_08114AE4: .4byte 0x02038437 -_08114AE8: .4byte sub_80A6EEC + 1 -_08114AEC: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8114A7C thumb_func_start sub_8114AF0 @@ -565996,7 +547289,7 @@ sub_8114AF0: @ 8114AF0 adds r6, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r4, _08114B70 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A60AC @@ -566031,7 +547324,7 @@ _08114B38: lsls r0, 16 lsrs r4, r0, 16 _08114B48: - ldr r0, _08114B74 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r6, 0x2E] mov r1, r8 @@ -566039,9 +547332,9 @@ _08114B48: strh r0, [r6, 0x32] adds r0, r7, r4 strh r0, [r6, 0x36] - ldr r0, _08114B78 + ldr r0, =sub_80A6EEC + 1 str r0, [r6, 0x1C] - ldr r1, _08114B7C + ldr r1, =move_anim_8074EE0 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 pop {r3} @@ -566050,10 +547343,7 @@ _08114B48: pop {r0} bx r0 .align 2, 0 -_08114B70: .4byte 0x02038437 -_08114B74: .4byte 0x0203841e -_08114B78: .4byte sub_80A6EEC + 1 -_08114B7C: .4byte move_anim_8074EE0 + 1 + .pool thumb_func_end sub_8114AF0 thumb_func_start sub_8114B80 @@ -566064,19 +547354,19 @@ sub_8114B80: @ 8114B80 lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x1 - ldr r3, _08114BE0 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _08114BE4 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - ldr r6, _08114BE8 + ldr r6, =0x0203841e movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 bne _08114BF4 - ldr r4, _08114BEC + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -566103,14 +547393,10 @@ sub_8114B80: @ 8114B80 movs r1, 0x1 _08114BDA: strh r1, [r5, 0x2E] - ldr r0, _08114BF0 + ldr r0, =sub_8114C10 + 1 b _08114C02 .align 2, 0 -_08114BE0: .4byte 0x000003ff -_08114BE4: .4byte 0xfffffc00 -_08114BE8: .4byte 0x0203841e -_08114BEC: .4byte 0x02038436 -_08114BF0: .4byte sub_8114C10 + 1 + .pool _08114BF4: ldrh r0, [r6, 0x2] strh r0, [r5, 0x20] @@ -566118,14 +547404,14 @@ _08114BF4: strh r0, [r5, 0x22] negs r0, r0 strh r0, [r5, 0x26] - ldr r0, _08114C0C + ldr r0, =sub_8114C4C + 1 _08114C02: str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08114C0C: .4byte sub_8114C4C + 1 + .pool thumb_func_end sub_8114B80 thumb_func_start sub_8114C10 @@ -566231,21 +547517,19 @@ sub_8114CBC: @ 8114CBC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08114CDC + ldr r1, =0x03005e00 adds r1, r0, r1 - ldr r0, _08114CE0 + ldr r0, =0x0203841e movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0 bne _08114CE8 - ldr r0, _08114CE4 + ldr r0, =sub_8114CFC + 1 b _08114CEA .align 2, 0 -_08114CDC: .4byte 0x03005e00 -_08114CE0: .4byte 0x0203841e -_08114CE4: .4byte sub_8114CFC + 1 + .pool _08114CE8: - ldr r0, _08114CF8 + ldr r0, =sub_8114EB4 + 1 _08114CEA: str r0, [r1] ldr r1, [r1] @@ -566254,7 +547538,7 @@ _08114CEA: pop {r0} bx r0 .align 2, 0 -_08114CF8: .4byte sub_8114EB4 + 1 + .pool thumb_func_end sub_8114CBC thumb_func_start sub_8114CFC @@ -566265,7 +547549,7 @@ sub_8114CFC: @ 8114CFC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08114D20 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -566274,13 +547558,12 @@ sub_8114CFC: @ 8114CFC b _08114EAA _08114D16: lsls r0, 2 - ldr r1, _08114D24 + ldr r1, =_08114D28 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08114D20: .4byte 0x03005e00 -_08114D24: .4byte _08114D28 + .pool .align 2, 0 _08114D28: .4byte _08114D3C @@ -566294,7 +547577,7 @@ _08114D3C: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] - ldr r0, _08114D64 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -566302,24 +547585,22 @@ _08114D3C: strh r0, [r4, 0x1E] cmp r0, 0x1 bne _08114D70 - ldr r0, _08114D68 + ldr r0, =0x02022e18 ldrh r0, [r0] strh r0, [r4, 0x20] - ldr r0, _08114D6C + ldr r0, =0x02022e1a b _08114D78 .align 2, 0 -_08114D64: .4byte 0x02038436 -_08114D68: .4byte 0x02022e18 -_08114D6C: .4byte 0x02022e1a + .pool _08114D70: - ldr r0, _08114DB4 + ldr r0, =0x02022e1c ldrh r0, [r0] strh r0, [r4, 0x20] - ldr r0, _08114DB8 + ldr r0, =0x02022e1e _08114D78: ldrh r0, [r0] strh r0, [r4, 0x22] - ldr r0, _08114DBC + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A6190 lsls r0, 24 @@ -566334,7 +547615,7 @@ _08114D78: movs r0, 0 strh r0, [r4, 0x24] _08114D9A: - ldr r2, _08114DC0 + ldr r2, =0x02020630 movs r3, 0x1C ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -566348,10 +547629,7 @@ _08114D9A: strb r1, [r0] b _08114E7E .align 2, 0 -_08114DB4: .4byte 0x02022e1c -_08114DB8: .4byte 0x02022e1e -_08114DBC: .4byte 0x02038436 -_08114DC0: .4byte 0x02020630 + .pool _08114DC4: ldrb r0, [r4, 0x1E] movs r2, 0x24 @@ -566379,7 +547657,7 @@ _08114DD4: adds r0, 0x1 strh r0, [r4, 0xE] _08114DF6: - ldr r1, _08114E18 + ldr r1, =0x08329f40 movs r2, 0xC ldrsh r0, [r4, r2] lsls r0, 1 @@ -566394,13 +547672,12 @@ _08114DF6: ldrsh r0, [r4, r1] cmp r0, 0x1 bne _08114E20 - ldr r1, _08114E1C + ldr r1, =0x02022e1a b _08114E22 .align 2, 0 -_08114E18: .4byte 0x08329f40 -_08114E1C: .4byte 0x02022e1a + .pool _08114E20: - ldr r1, _08114E44 + ldr r1, =0x02022e1e _08114E22: ldrh r0, [r4, 0x22] subs r0, r2 @@ -566417,18 +547694,17 @@ _08114E22: ldrsh r0, [r4, r3] cmp r0, 0x1 bne _08114E4C - ldr r1, _08114E48 + ldr r1, =0x02022e1a b _08114E4E .align 2, 0 -_08114E44: .4byte 0x02022e1e -_08114E48: .4byte 0x02022e1a + .pool _08114E4C: - ldr r1, _08114E70 + ldr r1, =0x02022e1e _08114E4E: ldrh r0, [r4, 0x22] subs r0, r2 strh r0, [r1] - ldr r2, _08114E74 + ldr r2, =0x02020630 movs r1, 0x1C ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -566443,10 +547719,9 @@ _08114E4E: strh r0, [r1, 0x24] b _08114E7E .align 2, 0 -_08114E70: .4byte 0x02022e1e -_08114E74: .4byte 0x02020630 + .pool _08114E78: - ldr r1, _08114E88 + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] _08114E7E: @@ -566455,11 +547730,11 @@ _08114E7E: strh r0, [r4, 0x8] b _08114EAA .align 2, 0 -_08114E88: .4byte 0x02039b28 + .pool _08114E8C: adds r0, r2, 0 bl move_anim_task_del - ldr r2, _08114EB0 + ldr r2, =0x02020630 movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -566476,7 +547751,7 @@ _08114EAA: pop {r0} bx r0 .align 2, 0 -_08114EB0: .4byte 0x02020630 + .pool thumb_func_end sub_8114CFC thumb_func_start sub_8114EB4 @@ -566488,7 +547763,7 @@ sub_8114EB4: @ 8114EB4 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r2, _08114EF4 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -566502,21 +547777,19 @@ sub_8114EB4: @ 8114EB4 movs r4, 0 strh r4, [r1, 0x24] strh r4, [r1, 0x26] - ldr r0, _08114EF8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _08114F00 - ldr r0, _08114EFC + ldr r0, =0x02022e1a b _08114F02 .align 2, 0 -_08114EF4: .4byte 0x02020630 -_08114EF8: .4byte 0x02038436 -_08114EFC: .4byte 0x02022e1a + .pool _08114F00: - ldr r0, _08114F10 + ldr r0, =0x02022e1e _08114F02: strh r4, [r0] adds r0, r5, 0 @@ -566525,7 +547798,7 @@ _08114F02: pop {r0} bx r0 .align 2, 0 -_08114F10: .4byte 0x02022e1e + .pool thumb_func_end sub_8114EB4 thumb_func_start sub_8114F14 @@ -566536,21 +547809,19 @@ sub_8114F14: @ 8114F14 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08114F34 + ldr r1, =0x03005e00 adds r1, r0, r1 - ldr r0, _08114F38 + ldr r0, =0x0203841e movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0 bne _08114F40 - ldr r0, _08114F3C + ldr r0, =sub_8114F54 + 1 b _08114F42 .align 2, 0 -_08114F34: .4byte 0x03005e00 -_08114F38: .4byte 0x0203841e -_08114F3C: .4byte sub_8114F54 + 1 + .pool _08114F40: - ldr r0, _08114F50 + ldr r0, =sub_8114FD8 + 1 _08114F42: str r0, [r1] ldr r1, [r1] @@ -566559,7 +547830,7 @@ _08114F42: pop {r0} bx r0 .align 2, 0 -_08114F50: .4byte sub_8114FD8 + 1 + .pool thumb_func_end sub_8114F14 thumb_func_start sub_8114F54 @@ -566570,7 +547841,7 @@ sub_8114F54: @ 8114F54 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08114F74 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r5, [r4, r0] @@ -566580,14 +547851,14 @@ sub_8114F54: @ 8114F54 beq _08114FCC b _08114FD2 .align 2, 0 -_08114F74: .4byte 0x03005e00 + .pool _08114F78: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] - ldr r3, _08114FC8 + ldr r3, =0x02020630 movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -566622,7 +547893,7 @@ _08114F78: strh r0, [r4, 0x8] b _08114FD2 .align 2, 0 -_08114FC8: .4byte 0x02020630 + .pool _08114FCC: adds r0, r2, 0 bl move_anim_task_del @@ -566640,20 +547911,19 @@ sub_8114FD8: @ 8114FD8 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08114FFC + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x4 bhi _081150DA lsls r0, 2 - ldr r1, _08115000 + ldr r1, =_08115004 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08114FFC: .4byte 0x03005e00 -_08115000: .4byte _08115004 + .pool .align 2, 0 _08115004: .4byte _08115018 @@ -566667,7 +547937,7 @@ _08115018: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] - ldr r0, _0811503C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -566675,17 +547945,16 @@ _08115018: strh r0, [r4, 0x1E] cmp r0, 0x1 bne _08115044 - ldr r0, _08115040 + ldr r0, =0x02022e18 b _08115046 .align 2, 0 -_0811503C: .4byte 0x02038436 -_08115040: .4byte 0x02022e18 + .pool _08115044: - ldr r0, _08115064 + ldr r0, =0x02022e1c _08115046: ldrh r0, [r0] strh r0, [r4, 0x20] - ldr r0, _08115068 + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A6190 lsls r0, 24 @@ -566697,8 +547966,7 @@ _08115046: strh r0, [r4, 0x26] b _081150C2 .align 2, 0 -_08115064: .4byte 0x02022e1c -_08115068: .4byte 0x02038436 + .pool _0811506C: ldrb r0, [r4, 0x1E] movs r1, 0x26 @@ -566707,7 +547975,7 @@ _0811506C: bl sub_81150E0 b _081150C2 _0811507A: - ldr r2, _08115090 + ldr r2, =0x02020630 movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -566718,9 +547986,9 @@ _0811507A: strh r1, [r0, 0x26] b _081150C2 .align 2, 0 -_08115090: .4byte 0x02020630 + .pool _08115094: - ldr r2, _081150CC + ldr r2, =0x02020630 movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -566740,7 +548008,7 @@ _08115094: ldrsh r0, [r0, r1] cmp r0, 0 bne _081150DA - ldr r1, _081150D0 + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] _081150C2: @@ -566749,8 +548017,7 @@ _081150C2: strh r0, [r4, 0x8] b _081150DA .align 2, 0 -_081150CC: .4byte 0x02020630 -_081150D0: .4byte 0x02039b28 + .pool _081150D4: adds r0, r2, 0 bl move_anim_task_del @@ -566772,17 +548039,16 @@ sub_81150E0: @ 81150E0 lsrs r4, r2, 16 cmp r0, 0x1 bne _08115104 - ldr r0, _081150FC + ldr r0, =0x02022e18 ldrh r3, [r0] - ldr r0, _08115100 + ldr r0, =0x04000014 b _0811510A .align 2, 0 -_081150FC: .4byte 0x02022e18 -_08115100: .4byte 0x04000014 + .pool _08115104: - ldr r0, _08115190 + ldr r0, =0x02022e1c ldrh r3, [r0] - ldr r0, _08115194 + ldr r0, =0x04000018 _0811510A: str r0, [sp] lsls r0, r1, 16 @@ -566795,7 +548061,7 @@ _08115114: asrs r4, r0, 16 cmp r2, r0 bge _08115140 - ldr r5, _08115198 + ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -566818,7 +548084,7 @@ _08115140: asrs r0, r1, 16 cmp r0, 0x9F bgt _0811516E - ldr r4, _08115198 + ldr r4, =0x02038c28 lsls r0, r3, 16 asrs r0, 16 adds r3, r0, 0 @@ -566839,7 +548105,7 @@ _08115158: cmp r0, 0x9F ble _08115158 _0811516E: - ldr r0, _0811519C + ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r1, sp movs r2, 0 @@ -566856,29 +548122,25 @@ _0811516E: pop {r0} bx r0 .align 2, 0 -_08115190: .4byte 0x02022e1c -_08115194: .4byte 0x04000018 -_08115198: .4byte 0x02038c28 -_0811519C: .4byte 0xa2600001 + .pool thumb_func_end sub_81150E0 thumb_func_start sub_81151A0 sub_81151A0: @ 81151A0 push {r4-r7,lr} adds r5, r0, 0 - ldr r0, _081151B4 + ldr r0, =0x0203841e movs r2, 0 ldrsh r1, [r0, r2] adds r7, r0, 0 cmp r1, 0 bne _081151BC - ldr r0, _081151B8 + ldr r0, =0x02038436 b _081151BE .align 2, 0 -_081151B4: .4byte 0x0203841e -_081151B8: .4byte 0x02038436 + .pool _081151BC: - ldr r0, _08115220 + ldr r0, =0x02038437 _081151BE: ldrb r4, [r0] movs r6, 0x18 @@ -566921,14 +548183,13 @@ _081151DA: strh r0, [r5, 0x38] adds r0, r5, 0 bl sub_80A68D4 - ldr r0, _08115224 + ldr r0, =sub_8115228 + 1 str r0, [r5, 0x1C] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08115220: .4byte 0x02038437 -_08115224: .4byte sub_8115228 + 1 + .pool thumb_func_end sub_81151A0 thumb_func_start sub_8115228 @@ -566951,18 +548212,17 @@ _0811523C: sub_8115244: @ 8115244 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, _08115258 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _08115260 - ldr r0, _0811525C + ldr r0, =0x02038436 b _08115262 .align 2, 0 -_08115258: .4byte 0x0203841e -_0811525C: .4byte 0x02038436 + .pool _08115260: - ldr r0, _081152C0 + ldr r0, =0x02038437 _08115262: ldrb r5, [r0] adds r0, r5, 0 @@ -566970,9 +548230,9 @@ _08115262: bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 - ldr r2, _081152C4 + ldr r2, =0x0000fff0 adds r0, r2 - ldr r4, _081152C8 + ldr r4, =0x0203841e movs r3, 0x2 ldrsh r1, [r4, r3] lsls r1, 5 @@ -566991,31 +548251,25 @@ _08115262: ldrsh r0, [r4, r3] lsls r0, 3 adds r1, r0 - ldr r3, _081152CC + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _081152D0 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r6, 0x4] - ldr r1, _081152D4 + ldr r1, =move_anim_8072740 + 1 adds r0, r6, 0 bl oamt_set_x3A_32 ldrh r0, [r4, 0x4] strh r0, [r6, 0x2E] - ldr r0, _081152D8 + ldr r0, =sub_80A64B0 + 1 str r0, [r6, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081152C0: .4byte 0x02038437 -_081152C4: .4byte 0x0000fff0 -_081152C8: .4byte 0x0203841e -_081152CC: .4byte 0x000003ff -_081152D0: .4byte 0xfffffc00 -_081152D4: .4byte move_anim_8072740 + 1 -_081152D8: .4byte sub_80A64B0 + 1 + .pool thumb_func_end sub_8115244 thumb_func_start sub_81152DC @@ -567026,9 +548280,9 @@ sub_81152DC: @ 81152DC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08115300 + ldr r1, =0x03005e00 adds r4, r0, r1 - ldr r0, _08115304 + ldr r0, =0x0203841e ldrh r2, [r0, 0x2] movs r3, 0x2 ldrsh r1, [r0, r3] @@ -567038,10 +548292,9 @@ sub_81152DC: @ 81152DC adds r0, r2, 0x3 b _08115314 .align 2, 0 -_08115300: .4byte 0x03005e00 -_08115304: .4byte 0x0203841e + .pool _08115308: - ldr r0, _08115334 + ldr r0, =0x02038408 ldrh r0, [r0] movs r1, 0xA bl __udivsi3 @@ -567058,15 +548311,13 @@ _08115314: beq _08115340 cmp r0, 0x5 bne _08115380 - ldr r0, _08115338 + ldr r0, =0x02022e20 ldrh r0, [r0] strh r0, [r4, 0x22] - ldr r0, _0811533C + ldr r0, =sub_81153AC + 1 b _0811539E .align 2, 0 -_08115334: .4byte 0x02038408 -_08115338: .4byte 0x02022e20 -_0811533C: .4byte sub_81153AC + 1 + .pool _08115340: movs r0, 0 strh r0, [r4, 0x22] @@ -567085,7 +548336,7 @@ _08115346: adds r1, r4, 0 adds r1, 0x8 adds r1, r0 - ldr r0, _0811537C + ldr r0, =0x020241e4 adds r0, r5, r0 ldrb r0, [r0] strh r0, [r1] @@ -567100,7 +548351,7 @@ _08115370: bls _08115346 b _0811539C .align 2, 0 -_0811537C: .4byte 0x020241e4 + .pool _08115380: ldrb r0, [r6] bl obj_id_for_side_relative_to_move @@ -567116,7 +548367,7 @@ _08115398: movs r0, 0x1 strh r0, [r4, 0x22] _0811539C: - ldr r0, _081153A8 + ldr r0, =sub_81154A4 + 1 _0811539E: str r0, [r4] _081153A0: @@ -567124,7 +548375,7 @@ _081153A0: pop {r0} bx r0 .align 2, 0 -_081153A8: .4byte sub_81154A4 + 1 + .pool thumb_func_end sub_81152DC thumb_func_start sub_81153AC @@ -567135,7 +548386,7 @@ sub_81153AC: @ 81153AC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _081153D0 + ldr r1, =0x03005e00 adds r3, r0, r1 movs r0, 0x8 ldrsh r1, [r3, r0] @@ -567147,7 +548398,7 @@ sub_81153AC: @ 81153AC beq _081153DA b _0811549C .align 2, 0 -_081153D0: .4byte 0x03005e00 + .pool _081153D4: cmp r1, 0x2 beq _08115490 @@ -567166,16 +548417,16 @@ _081153DA: ands r0, r1 cmp r0, 0 bne _08115404 - ldr r1, _08115400 + ldr r1, =0x02022e20 ldrh r0, [r3, 0x26] ldrh r2, [r3, 0x22] adds r0, r2 strh r0, [r1] b _0811540E .align 2, 0 -_08115400: .4byte 0x02022e20 + .pool _08115404: - ldr r0, _0811542C + ldr r0, =0x02022e20 ldrh r1, [r3, 0x22] ldrh r2, [r3, 0x26] subs r1, r2 @@ -567197,7 +548448,7 @@ _0811540E: strh r0, [r3, 0x24] b _08115484 .align 2, 0 -_0811542C: .4byte 0x02022e20 + .pool _08115430: ldrh r0, [r3, 0xA] adds r0, 0x1 @@ -567212,16 +548463,16 @@ _08115430: ands r1, r0 cmp r1, 0 bne _0811545C - ldr r1, _08115458 + ldr r1, =0x02022e20 ldrh r0, [r3, 0x24] ldrh r2, [r3, 0x22] adds r0, r2 strh r0, [r1] b _08115466 .align 2, 0 -_08115458: .4byte 0x02022e20 + .pool _0811545C: - ldr r0, _0811548C + ldr r0, =0x02022e20 ldrh r1, [r3, 0x22] ldrh r2, [r3, 0x24] subs r1, r2 @@ -567248,9 +548499,9 @@ _08115484: strh r0, [r3, 0x8] b _0811549C .align 2, 0 -_0811548C: .4byte 0x02022e20 + .pool _08115490: - ldr r1, _081154A0 + ldr r1, =0x02022e20 ldrh r0, [r3, 0x22] strh r0, [r1] adds r0, r2, 0 @@ -567259,7 +548510,7 @@ _0811549C: pop {r0} bx r0 .align 2, 0 -_081154A0: .4byte 0x02022e20 + .pool thumb_func_end sub_81153AC thumb_func_start sub_81154A4 @@ -567270,7 +548521,7 @@ sub_81154A4: @ 81154A4 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _081154C8 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r5, [r4, r0] @@ -567282,7 +548533,7 @@ sub_81154A4: @ 81154A4 beq _081154D2 b _0811557E .align 2, 0 -_081154C8: .4byte 0x03005e00 + .pool _081154CC: cmp r5, 0x2 beq _08115540 @@ -567349,7 +548600,7 @@ _08115540: ldrsh r0, [r4, r7] cmp r2, r0 bge _08115578 - ldr r0, _08115584 + ldr r0, =0x02020630 mov r12, r0 adds r5, r4, 0 adds r5, 0x8 @@ -567381,7 +548632,7 @@ _0811557E: pop {r0} bx r0 .align 2, 0 -_08115584: .4byte 0x02020630 + .pool thumb_func_end sub_81154A4 thumb_func_start sub_8115588 @@ -567421,7 +548672,7 @@ _081155C0: ldrsh r0, [r3, r7] cmp r2, r0 bge _081155F4 - ldr r6, _081155FC + ldr r6, =0x02020630 adds r5, r3, 0 adds r5, 0x8 _081155D0: @@ -567448,7 +548699,7 @@ _081155F4: pop {r0} bx r0 .align 2, 0 -_081155FC: .4byte 0x02020630 + .pool thumb_func_end sub_8115588 thumb_func_start sub_8115600 @@ -567456,9 +548707,9 @@ sub_8115600: @ 8115600 push {lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r3, _08115620 + ldr r3, =0x0203841e movs r2, 0 - ldr r0, _08115624 + ldr r0, =0x02038408 ldrh r0, [r0] cmp r0, 0x63 bls _08115614 @@ -567470,8 +548721,7 @@ _08115614: pop {r0} bx r0 .align 2, 0 -_08115620: .4byte 0x0203841e -_08115624: .4byte 0x02038408 + .pool thumb_func_end sub_8115600 thumb_func_start sub_8115628 @@ -567479,20 +548729,19 @@ sub_8115628: @ 8115628 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _08115640 + ldr r2, =0x0203841e ldrh r1, [r2] movs r0, 0x1 ands r0, r1 adds r6, r2, 0 cmp r0, 0 beq _08115648 - ldr r0, _08115644 + ldr r0, =0x02038437 b _0811564A .align 2, 0 -_08115640: .4byte 0x0203841e -_08115644: .4byte 0x02038437 + .pool _08115648: - ldr r0, _081156B8 + ldr r0, =0x02038436 _0811564A: ldrb r0, [r0] adds r5, r0, 0 @@ -567503,7 +548752,7 @@ _0811564A: movs r0, 0x2 eors r5, r0 _0811565A: - ldr r0, _081156BC + ldr r0, =sub_81156D0 + 1 ldrb r1, [r6, 0x2] bl AddTask lsls r0, 24 @@ -567511,7 +548760,7 @@ _0811565A: lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081156C0 + ldr r0, =0x03005e00 adds r4, r0 adds r0, r5, 0 movs r1, 0x2 @@ -567520,7 +548769,7 @@ _0811565A: lsrs r0, 24 movs r1, 0x20 subs r1, r0 - ldr r2, _081156C4 + ldr r2, =0x000001ff adds r0, r2, 0 ands r1, r0 strh r1, [r4, 0xA] @@ -567534,10 +548783,10 @@ _0811565A: movs r0, 0xFF ands r1, r0 strh r1, [r4, 0xC] - ldr r2, _081156C8 + ldr r2, =0x02022e20 ldrh r0, [r4, 0xA] strh r0, [r2] - ldr r0, _081156CC + ldr r0, =0x02022e22 strh r1, [r0] ldrh r0, [r6, 0x4] strh r0, [r4, 0xE] @@ -567547,12 +548796,7 @@ _0811565A: pop {r0} bx r0 .align 2, 0 -_081156B8: .4byte 0x02038436 -_081156BC: .4byte sub_81156D0 + 1 -_081156C0: .4byte 0x03005e00 -_081156C4: .4byte 0x000001ff -_081156C8: .4byte 0x02022e20 -_081156CC: .4byte 0x02022e22 + .pool thumb_func_end sub_8115628 thumb_func_start sub_81156D0 @@ -567563,33 +548807,30 @@ sub_81156D0: @ 81156D0 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 - ldr r1, _08115700 + ldr r1, =0x03005e00 adds r2, r0, r1 - ldr r0, _08115704 + ldr r0, =0x0203841e movs r4, 0xE ldrsh r1, [r0, r4] movs r4, 0xE ldrsh r0, [r2, r4] cmp r1, r0 bne _08115710 - ldr r0, _08115708 + ldr r0, =0x02022e20 movs r1, 0 strh r1, [r0] - ldr r0, _0811570C + ldr r0, =0x02022e22 strh r1, [r0] adds r0, r3, 0 bl remove_task b _0811571C .align 2, 0 -_08115700: .4byte 0x03005e00 -_08115704: .4byte 0x0203841e -_08115708: .4byte 0x02022e20 -_0811570C: .4byte 0x02022e22 + .pool _08115710: - ldr r1, _08115724 + ldr r1, =0x02022e20 ldrh r0, [r2, 0xA] strh r0, [r1] - ldr r1, _08115728 + ldr r1, =0x02022e22 ldrh r0, [r2, 0xC] strh r0, [r1] _0811571C: @@ -567597,15 +548838,14 @@ _0811571C: pop {r0} bx r0 .align 2, 0 -_08115724: .4byte 0x02022e20 -_08115728: .4byte 0x02022e22 + .pool thumb_func_end sub_81156D0 thumb_func_start sub_811572C sub_811572C: @ 811572C push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08115764 + ldr r5, =0x0203841e ldrh r0, [r5] ldrh r1, [r4, 0x20] adds r0, r1 @@ -567616,7 +548856,7 @@ sub_811572C: @ 811572C strh r0, [r4, 0x22] ldrh r0, [r5, 0x4] strh r0, [r4, 0x2E] - ldr r0, _08115768 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -567630,8 +548870,7 @@ sub_811572C: @ 811572C strh r0, [r4, 0x36] b _0811577A .align 2, 0 -_08115764: .4byte 0x0203841e -_08115768: .4byte 0x02038436 + .pool _0811576C: ldrh r0, [r5, 0x6] strh r0, [r4, 0x30] @@ -567640,10 +548879,10 @@ _0811576C: movs r1, 0x1 bl obj_anim_image_start _0811577A: - ldr r0, _08115790 + ldr r0, =0x0203841e ldrh r0, [r0, 0x8] strh r0, [r4, 0x34] - ldr r1, _08115794 + ldr r1, =sub_8115798 + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -567651,8 +548890,7 @@ _0811577A: pop {r0} bx r0 .align 2, 0 -_08115790: .4byte 0x0203841e -_08115794: .4byte sub_8115798 + 1 + .pool thumb_func_end sub_811572C thumb_func_start sub_8115798 @@ -567714,7 +548952,7 @@ sub_81157FC: @ 81157FC push {r4,r5,lr} sub sp, 0x4 adds r5, r0, 0 - ldr r4, _08115834 + ldr r4, =0x0203841e movs r1, 0 ldrsh r0, [r4, r1] bl sub_811583C @@ -567731,15 +548969,14 @@ sub_81157FC: @ 81157FC movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _08115838 + ldr r0, =sub_8115884 + 1 str r0, [r5, 0x1C] add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08115834: .4byte 0x0203841e -_08115838: .4byte sub_8115884 + 1 + .pool thumb_func_end sub_81157FC thumb_func_start sub_811583C @@ -567785,7 +549022,7 @@ sub_811583C: @ 811583C sub_8115884: @ 8115884 push {lr} adds r2, r0, 0 - ldr r0, _081158A0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -567797,14 +549034,14 @@ _0811589A: pop {r0} bx r0 .align 2, 0 -_081158A0: .4byte 0x02037fd4 + .pool thumb_func_end sub_8115884 thumb_func_start sub_81158A4 sub_81158A4: @ 81158A4 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _081158F0 + ldr r4, =0x0203841e ldrh r0, [r4, 0x2] strh r0, [r5, 0x2E] strh r0, [r5, 0x30] @@ -567832,14 +549069,13 @@ sub_81158A4: @ 81158A4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _081158F4 + ldr r0, =sub_81158F8 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081158F0: .4byte 0x0203841e -_081158F4: .4byte sub_81158F8 + 1 + .pool thumb_func_end sub_81158A4 thumb_func_start sub_81158F8 @@ -567855,7 +549091,7 @@ sub_81158F8: @ 81158F8 strh r0, [r4, 0x2E] b _0811597C _0811590C: - ldr r0, _08115928 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -567865,12 +549101,11 @@ _0811590C: ldrsh r0, [r4, r1] cmp r0, 0 bne _08115930 - ldr r0, _0811592C + ldr r0, =sub_8115984 + 1 str r0, [r4, 0x1C] b _0811597C .align 2, 0 -_08115928: .4byte 0x02037fd4 -_0811592C: .4byte sub_8115984 + 1 + .pool _08115930: movs r2, 0x3C ldrsh r0, [r4, r2] @@ -567919,7 +549154,7 @@ _0811597C: sub_8115984: @ 8115984 push {r4,lr} adds r4, r0, 0 - ldr r0, _081159B0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -567938,14 +549173,14 @@ _081159AA: pop {r0} bx r0 .align 2, 0 -_081159B0: .4byte 0x02037fd4 + .pool thumb_func_end sub_8115984 thumb_func_start sub_81159B4 sub_81159B4: @ 81159B4 push {r4,lr} adds r4, r0, 0 - ldr r1, _081159F8 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -567965,10 +549200,10 @@ sub_81159B4: @ 81159B4 movs r0, 0x70 strh r0, [r4, 0x36] strh r2, [r4, 0x38] - ldr r1, _081159FC + ldr r1, =move_anim_8074EE0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r1, _08115A00 + ldr r1, =sub_80A634C + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -567976,9 +549211,7 @@ sub_81159B4: @ 81159B4 pop {r0} bx r0 .align 2, 0 -_081159F8: .4byte 0x0203841e -_081159FC: .4byte move_anim_8074EE0 + 1 -_08115A00: .4byte sub_80A634C + 1 + .pool thumb_func_end sub_81159B4 thumb_func_start sub_8115A04 @@ -567986,12 +549219,12 @@ sub_8115A04: @ 8115A04 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08115A48 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 adds r4, r1 - ldr r3, _08115A4C + ldr r3, =0x0203841e ldrh r1, [r3] movs r5, 0 strh r1, [r4, 0x8] @@ -568010,15 +549243,13 @@ sub_8115A04: @ 8115A04 lsrs r2, 24 movs r1, 0 bl sub_8115A54 - ldr r0, _08115A50 + ldr r0, =sub_8115AA4 + 1 str r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08115A48: .4byte 0x03005e00 -_08115A4C: .4byte 0x0203841e -_08115A50: .4byte sub_8115AA4 + 1 + .pool thumb_func_end sub_8115A04 thumb_func_start sub_8115A54 @@ -568033,7 +549264,7 @@ sub_8115A54: @ 8115A54 lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r1, _08115AA0 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -568060,7 +549291,7 @@ sub_8115A54: @ 8115A54 pop {r0} bx r0 .align 2, 0 -_08115AA0: .4byte 0x03005e00 + .pool thumb_func_end sub_8115A54 thumb_func_start sub_8115AA4 @@ -568069,13 +549300,13 @@ sub_8115AA4: @ 8115AA4 lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _08115ADC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08115B06 - ldr r1, _08115AE0 + ldr r1, =0x03005e00 lsls r2, r3, 2 adds r0, r2, r3 lsls r0, 3 @@ -568094,8 +549325,7 @@ sub_8115AA4: @ 8115AA4 ldrb r2, [r3, 0x10] b _08115AE8 .align 2, 0 -_08115ADC: .4byte 0x02037fd4 -_08115AE0: .4byte 0x03005e00 + .pool _08115AE4: ldrb r1, [r3, 0x10] ldrb r2, [r3, 0xE] @@ -568130,12 +549360,12 @@ sub_8115B0C: @ 8115B0C lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r3, _08115BB0 + ldr r3, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r3 - ldr r2, _08115BB4 + ldr r2, =0x0203841e ldrh r1, [r2] strh r1, [r0, 0x8] ldrh r1, [r2, 0x2] @@ -568150,15 +549380,15 @@ sub_8115B0C: @ 8115B0C strh r1, [r0, 0x12] strh r5, [r0, 0x18] movs r4, 0 - ldr r0, _08115BB8 + ldr r0, =0x0202406c ldrb r1, [r0] mov r9, r3 mov r8, r2 cmp r5, r1 bge _08115B74 - ldr r0, _08115BBC + ldr r0, =0x02038436 ldrb r3, [r0] - ldr r7, _08115BC0 + ldr r7, =0x02038437 movs r0, 0x1 mov r12, r0 adds r2, r1, 0 @@ -568199,7 +549429,7 @@ _08115B82: adds r0, r6, 0 movs r1, 0 bl sub_8115BC8 - ldr r0, _08115BC4 + ldr r0, =sub_8115C18 + 1 str r0, [r4] pop {r3,r4} mov r8, r3 @@ -568208,12 +549438,7 @@ _08115B82: pop {r0} bx r0 .align 2, 0 -_08115BB0: .4byte 0x03005e00 -_08115BB4: .4byte 0x0203841e -_08115BB8: .4byte 0x0202406c -_08115BBC: .4byte 0x02038436 -_08115BC0: .4byte 0x02038437 -_08115BC4: .4byte sub_8115C18 + 1 + .pool thumb_func_end sub_8115B0C thumb_func_start sub_8115BC8 @@ -568228,7 +549453,7 @@ sub_8115BC8: @ 8115BC8 lsrs r5, 24 lsls r3, 24 lsrs r3, 24 - ldr r1, _08115C14 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -568255,7 +549480,7 @@ sub_8115BC8: @ 8115BC8 pop {r0} bx r0 .align 2, 0 -_08115C14: .4byte 0x03005e00 + .pool thumb_func_end sub_8115BC8 thumb_func_start sub_8115C18 @@ -568264,13 +549489,13 @@ sub_8115C18: @ 8115C18 lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _08115C50 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08115C7A - ldr r1, _08115C54 + ldr r1, =0x03005e00 lsls r2, r3, 2 adds r0, r2, r3 lsls r0, 3 @@ -568289,8 +549514,7 @@ sub_8115C18: @ 8115C18 ldrb r2, [r3, 0x10] b _08115C5C .align 2, 0 -_08115C50: .4byte 0x02037fd4 -_08115C54: .4byte 0x03005e00 + .pool _08115C58: ldrb r1, [r3, 0x10] ldrb r2, [r3, 0xE] @@ -568321,12 +549545,12 @@ sub_8115C80: @ 8115C80 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08115CC4 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 adds r4, r1 - ldr r3, _08115CC8 + ldr r3, =0x0203841e ldrh r1, [r3] movs r5, 0 strh r1, [r4, 0x8] @@ -568345,15 +549569,13 @@ sub_8115C80: @ 8115C80 lsrs r2, 24 movs r1, 0 bl sub_8115CD0 - ldr r0, _08115CCC + ldr r0, =sub_8115D2C + 1 str r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08115CC4: .4byte 0x03005e00 -_08115CC8: .4byte 0x0203841e -_08115CCC: .4byte sub_8115D2C + 1 + .pool thumb_func_end sub_8115C80 thumb_func_start sub_8115CD0 @@ -568368,7 +549590,7 @@ sub_8115CD0: @ 8115CD0 lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r1, _08115D28 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -568400,7 +549622,7 @@ sub_8115CD0: @ 8115CD0 pop {r0} bx r0 .align 2, 0 -_08115D28: .4byte 0x03005e00 + .pool thumb_func_end sub_8115CD0 thumb_func_start sub_8115D2C @@ -568409,13 +549631,13 @@ sub_8115D2C: @ 8115D2C lsls r0, 24 lsrs r3, r0, 24 adds r4, r3, 0 - ldr r0, _08115D64 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08115D8E - ldr r1, _08115D68 + ldr r1, =0x03005e00 lsls r2, r3, 2 adds r0, r2, r3 lsls r0, 3 @@ -568434,8 +549656,7 @@ sub_8115D2C: @ 8115D2C ldrb r2, [r3, 0x10] b _08115D70 .align 2, 0 -_08115D64: .4byte 0x02037fd4 -_08115D68: .4byte 0x03005e00 + .pool _08115D6C: ldrb r1, [r3, 0x10] ldrb r2, [r3, 0xE] @@ -568467,12 +549688,12 @@ sub_8115D94: @ 8115D94 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r1, _08115DF4 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 adds r4, r1 - ldr r5, _08115DF8 + ldr r5, =0x0203841e ldrh r0, [r5, 0x2] strh r0, [r4, 0x8] ldrh r0, [r5, 0x2] @@ -568503,16 +549724,14 @@ sub_8115D94: @ 8115D94 movs r1, 0 adds r2, r3, 0 bl sub_80A1AD4 - ldr r0, _08115DFC + ldr r0, =sub_8115E00 + 1 str r0, [r4] add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08115DF4: .4byte 0x03005e00 -_08115DF8: .4byte 0x0203841e -_08115DFC: .4byte sub_8115E00 + 1 + .pool thumb_func_end sub_8115D94 thumb_func_start sub_8115E00 @@ -568521,7 +549740,7 @@ sub_8115E00: @ 8115E00 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08115E24 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -568535,9 +549754,9 @@ sub_8115E00: @ 8115E00 strh r0, [r4, 0x8] b _08115EAC .align 2, 0 -_08115E24: .4byte 0x03005e00 + .pool _08115E28: - ldr r0, _08115E44 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -568547,12 +549766,11 @@ _08115E28: ldrsh r0, [r4, r3] cmp r0, 0 bne _08115E4C - ldr r0, _08115E48 + ldr r0, =sub_8115EB8 + 1 str r0, [r4] b _08115EAC .align 2, 0 -_08115E44: .4byte 0x02037fd4 -_08115E48: .4byte sub_8115EB8 + 1 + .pool _08115E4C: ldrh r0, [r4, 0x16] bl gpu_pal_tags_index_of @@ -568584,7 +549802,7 @@ _08115E7A: adds r2, r3, 0 bl sub_80A1AD4 _08115E8A: - ldr r0, _08115EB4 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -568607,7 +549825,7 @@ _08115EAC: pop {r0} bx r0 .align 2, 0 -_08115EB4: .4byte 0x03005e00 + .pool thumb_func_end sub_8115E00 thumb_func_start sub_8115EB8 @@ -568616,7 +549834,7 @@ sub_8115EB8: @ 8115EB8 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08115F08 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -568624,7 +549842,7 @@ sub_8115EB8: @ 8115EB8 lsrs r5, r0, 24 cmp r5, 0 bne _08115EFE - ldr r1, _08115F0C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -568650,8 +549868,7 @@ _08115EFE: pop {r0} bx r0 .align 2, 0 -_08115F08: .4byte 0x02037fd4 -_08115F0C: .4byte 0x03005e00 + .pool thumb_func_end sub_8115EB8 thumb_func_start sub_8115F10 @@ -568664,11 +549881,11 @@ sub_8115F10: @ 8115F10 lsrs r0, 24 mov r8, r0 movs r2, 0 - ldr r0, _08115F88 + ldr r0, =0x02038436 ldrb r6, [r0] - ldr r0, _08115F8C + ldr r0, =0x02038437 ldrb r7, [r0] - ldr r4, _08115F90 + ldr r4, =0x0203841e ldrh r1, [r4] movs r5, 0x80 lsls r5, 1 @@ -568716,9 +549933,7 @@ _08115F6E: pop {r0} bx r0 .align 2, 0 -_08115F88: .4byte 0x02038436 -_08115F8C: .4byte 0x02038437 -_08115F90: .4byte 0x0203841e + .pool thumb_func_end sub_8115F10 thumb_func_start sub_8115F94 @@ -568732,7 +549947,7 @@ sub_8115F94: @ 8115F94 lsrs r0, 24 mov r8, r0 movs r5, 0 - ldr r1, _08116088 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -568741,7 +549956,7 @@ sub_8115F94: @ 8115F94 ldrsh r0, [r4, r1] cmp r0, 0 bne _08115FD6 - ldr r1, _0811608C + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0xC] ldrh r0, [r1, 0x2] @@ -568760,10 +549975,10 @@ _08115FD6: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r0, _08116090 + ldr r0, =0x02038436 ldrb r0, [r0] mov r9, r0 - ldr r0, _08116094 + ldr r0, =0x02038437 ldrb r0, [r0] mov r10, r0 ldrh r1, [r4, 0xC] @@ -568773,15 +549988,15 @@ _08115FD6: ands r0, r1 cmp r0, 0 beq _08115FF8 - ldr r5, _08116098 + ldr r5, =0x0000ffff _08115FF8: movs r6, 0x1 adds r0, r6, 0 ands r0, r1 cmp r0, 0 beq _08116028 - ldr r2, _0811609C - ldr r0, _081160A0 + ldr r2, =0x02020630 + ldr r0, =0x03005d70 add r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -568848,13 +550063,7 @@ _0811607A: pop {r0} bx r0 .align 2, 0 -_08116088: .4byte 0x03005e00 -_0811608C: .4byte 0x0203841e -_08116090: .4byte 0x02038436 -_08116094: .4byte 0x02038437 -_08116098: .4byte 0x0000ffff -_0811609C: .4byte 0x02020630 -_081160A0: .4byte 0x03005d70 + .pool thumb_func_end sub_8115F94 thumb_func_start sub_81160A4 @@ -568867,7 +550076,7 @@ sub_81160A4: @ 81160A4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r1, _081160D8 + ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r4, 0x2E] @@ -568886,31 +550095,31 @@ sub_81160A4: @ 81160A4 beq _081160E2 b _08116104 .align 2, 0 -_081160D8: .4byte 0x0203841e + .pool _081160DC: cmp r0, 0x2 beq _081160F4 b _08116104 _081160E2: - ldr r1, _081160E8 + ldr r1, =0x02022e20 b _081160F6 .align 2, 0 -_081160E8: .4byte 0x02022e20 + .pool _081160EC: - ldr r1, _081160F0 + ldr r1, =0x02022e22 b _081160F6 .align 2, 0 -_081160F0: .4byte 0x02022e22 + .pool _081160F4: - ldr r1, _08116100 + ldr r1, =0x02021bbc _081160F6: adds r0, r4, 0 bl oamt_set_x3A_32 b _0811610C .align 2, 0 -_08116100: .4byte 0x02021bbc + .pool _08116104: - ldr r1, _0811613C + ldr r1, =0x02021bbe adds r0, r4, 0 bl oamt_set_x3A_32 _0811610C: @@ -568922,7 +550131,7 @@ _0811610C: orrs r1, r0 ldrh r0, [r1] strh r0, [r4, 0x36] - ldr r0, _08116140 + ldr r0, =0x0203841e ldrh r0, [r0, 0x6] strh r0, [r4, 0x38] subs r0, 0x2 @@ -568932,15 +550141,13 @@ _0811610C: bhi _08116130 bl sub_81161F4 _08116130: - ldr r0, _08116144 + ldr r0, =sub_8116148 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0811613C: .4byte 0x02021bbe -_08116140: .4byte 0x0203841e -_08116144: .4byte sub_8116148 + 1 + .pool thumb_func_end sub_81160A4 thumb_func_start sub_8116148 @@ -568995,13 +550202,13 @@ _0811618A: cmp r0, 0x1 bhi _081161DC movs r4, 0 - ldr r5, _081161E8 + ldr r5, =0x0202406c ldrb r0, [r5] cmp r4, r0 bcs _081161DC - ldr r2, _081161EC + ldr r2, =0x02020630 mov r12, r2 - ldr r6, _081161F0 + ldr r6, =0x020241e4 movs r7, 0x3 negs r7, r7 _081161BA: @@ -569030,17 +550237,15 @@ _081161E2: pop {r0} bx r0 .align 2, 0 -_081161E8: .4byte 0x0202406c -_081161EC: .4byte 0x02020630 -_081161F0: .4byte 0x020241e4 + .pool thumb_func_end sub_8116148 thumb_func_start sub_81161F4 sub_81161F4: @ 81161F4 push {r4-r6,lr} - ldr r6, _08116268 - ldr r4, _0811626C - ldr r5, _08116270 + ldr r6, =0x02020630 + ldr r4, =0x020241e4 + ldr r5, =0x02038436 ldrb r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -569055,7 +550260,7 @@ sub_81161F4: @ 81161F4 adds r0, r2, 0 ands r0, r3 strb r0, [r1] - ldr r3, _08116274 + ldr r3, =0x02038437 ldrb r0, [r3] adds r0, r4 ldrb r1, [r0] @@ -569067,7 +550272,7 @@ sub_81161F4: @ 81161F4 ldrb r1, [r0] ands r2, r1 strb r2, [r0] - ldr r0, _08116278 + ldr r0, =0x0203841e movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0x2 @@ -569095,11 +550300,7 @@ sub_81161F4: @ 81161F4 ldrb r1, [r0] b _08116298 .align 2, 0 -_08116268: .4byte 0x02020630 -_0811626C: .4byte 0x020241e4 -_08116270: .4byte 0x02038436 -_08116274: .4byte 0x02038437 -_08116278: .4byte 0x0203841e + .pool _0811627C: cmp r0, 0 bne _08116284 @@ -569130,12 +550331,12 @@ sub_81162A4: @ 81162A4 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081162E4 + ldr r1, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 adds r2, r1 - ldr r3, _081162E8 + ldr r3, =0x0203841e ldrh r1, [r3] strh r1, [r2, 0x8] ldrh r1, [r3, 0x2] @@ -569146,24 +550347,20 @@ sub_81162A4: @ 81162A4 strh r1, [r2, 0xE] ldrh r1, [r3, 0x6] strh r1, [r2, 0x18] - ldr r4, _081162EC + ldr r4, =0x02022e20 ldrh r1, [r3] strh r1, [r4] - ldr r4, _081162F0 + ldr r4, =0x02022e22 ldrh r1, [r3, 0x2] strh r1, [r4] - ldr r1, _081162F4 + ldr r1, =sub_81162F8 + 1 str r1, [r2] bl _call_via_r1 pop {r4} pop {r0} bx r0 .align 2, 0 -_081162E4: .4byte 0x03005e00 -_081162E8: .4byte 0x0203841e -_081162EC: .4byte 0x02022e20 -_081162F0: .4byte 0x02022e22 -_081162F4: .4byte sub_81162F8 + 1 + .pool thumb_func_end sub_81162A4 thumb_func_start sub_81162F8 @@ -569171,7 +550368,7 @@ sub_81162F8: @ 81162F8 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08116328 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -569182,7 +550379,7 @@ sub_81162F8: @ 81162F8 mov r12, r1 cmp r0, 0 bne _0811637E - ldr r0, _0811632C + ldr r0, =0x02022e20 ldrh r2, [r0] movs r7, 0x8 ldrsh r1, [r3, r7] @@ -569193,13 +550390,12 @@ sub_81162F8: @ 81162F8 negs r0, r0 b _08116332 .align 2, 0 -_08116328: .4byte 0x03005e00 -_0811632C: .4byte 0x02022e20 + .pool _08116330: ldrh r0, [r3, 0x8] _08116332: strh r0, [r6] - ldr r2, _08116350 + ldr r2, =0x02022e22 ldrh r3, [r2] lsls r1, r5, 2 adds r0, r1, r5 @@ -569213,7 +550409,7 @@ _08116332: movs r0, 0 b _08116358 .align 2, 0 -_08116350: .4byte 0x02022e22 + .pool _08116354: ldrh r0, [r4, 0xA] negs r0, r0 @@ -569249,7 +550445,7 @@ _08116382: sub_8116388: @ 8116388 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _081163A8 + ldr r4, =0x0203841e ldrb r1, [r4, 0x6] bl sub_8008258 movs r1, 0x4 @@ -569261,30 +550457,29 @@ sub_8116388: @ 8116388 bl sub_80A69CC b _081163B4 .align 2, 0 -_081163A8: .4byte 0x0203841e + .pool _081163AC: adds r0, r5, 0 movs r1, 0x1 bl sub_80A6980 _081163B4: - ldr r0, _081163C8 + ldr r0, =sub_80A67BC + 1 str r0, [r5, 0x1C] - ldr r1, _081163CC + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081163C8: .4byte sub_80A67BC + 1 -_081163CC: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_8116388 thumb_func_start sub_81163D0 sub_81163D0: @ 81163D0 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _081163F0 + ldr r4, =0x0203841e ldrb r1, [r4, 0x6] bl sub_8008258 movs r1, 0x4 @@ -569296,34 +550491,32 @@ sub_81163D0: @ 81163D0 bl sub_80A69CC b _081163FC .align 2, 0 -_081163F0: .4byte 0x0203841e + .pool _081163F4: adds r0, r5, 0 movs r1, 0x1 bl sub_80A6980 _081163FC: - ldr r0, _08116414 + ldr r0, =0x0203841e ldrh r0, [r0, 0x8] strh r0, [r5, 0x2E] - ldr r0, _08116418 + ldr r0, =sub_80A67BC + 1 str r0, [r5, 0x1C] - ldr r1, _0811641C + ldr r1, =sub_810E2C8 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08116414: .4byte 0x0203841e -_08116418: .4byte sub_80A67BC + 1 -_0811641C: .4byte sub_810E2C8 + 1 + .pool thumb_func_end sub_81163D0 thumb_func_start sub_8116420 sub_8116420: @ 8116420 push {r4,lr} adds r4, r0, 0 - ldr r0, _08116450 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -569333,7 +550526,7 @@ sub_8116420: @ 8116420 lsls r0, 24 cmp r0, 0 bne _08116444 - ldr r1, _08116454 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] negs r0, r0 strh r0, [r1, 0x2] @@ -569344,15 +550537,14 @@ _08116444: pop {r0} bx r0 .align 2, 0 -_08116450: .4byte 0x02038436 -_08116454: .4byte 0x0203841e + .pool thumb_func_end sub_8116420 thumb_func_start sub_8116458 sub_8116458: @ 8116458 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08116490 + ldr r5, =0x0203841e movs r0, 0x2 ldrsh r1, [r5, r0] movs r0, 0x1 @@ -569376,7 +550568,7 @@ _08116474: bl sub_80A69CC b _0811649C .align 2, 0 -_08116490: .4byte 0x0203841e + .pool _08116494: adds r0, r4, 0 movs r1, 0 @@ -569387,7 +550579,7 @@ _0811649C: lsrs r0, 16 movs r1, 0x30 bl __umodsi3 - ldr r1, _081164E0 + ldr r1, =0x0000ffe8 adds r0, r1 ldrh r1, [r4, 0x24] adds r0, r1 @@ -569397,37 +550589,34 @@ _0811649C: lsrs r0, 16 movs r1, 0x18 bl __umodsi3 - ldr r1, _081164E4 + ldr r1, =0x0000fff4 adds r0, r1 ldrh r1, [r4, 0x26] adds r0, r1 strh r0, [r4, 0x26] - ldr r1, _081164E8 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _081164EC + ldr r0, =sub_80A67BC + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081164E0: .4byte 0x0000ffe8 -_081164E4: .4byte 0x0000fff4 -_081164E8: .4byte move_anim_8074EE0 + 1 -_081164EC: .4byte sub_80A67BC + 1 + .pool thumb_func_end sub_8116458 thumb_func_start sub_81164F0 sub_81164F0: @ 81164F0 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08116550 + ldr r5, =0x0203841e ldrb r0, [r5] bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08116554 + ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -569455,26 +550644,23 @@ sub_81164F0: @ 81164F0 ldrb r1, [r5, 0x6] adds r0, r4, 0 bl sub_8008258 - ldr r1, _08116558 + ldr r1, =move_anim_8074EE0 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _0811655C + ldr r0, =sub_80A67BC + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08116550: .4byte 0x0203841e -_08116554: .4byte 0x02020630 -_08116558: .4byte move_anim_8074EE0 + 1 -_0811655C: .4byte sub_80A67BC + 1 + .pool thumb_func_end sub_81164F0 thumb_func_start sub_8116560 sub_8116560: @ 8116560 push {r4,lr} adds r4, r0, 0 - ldr r0, _08116578 + ldr r0, =0x0203841e movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 @@ -569484,34 +550670,32 @@ sub_8116560: @ 8116560 bl sub_80A69CC b _08116584 .align 2, 0 -_08116578: .4byte 0x0203841e + .pool _0811657C: adds r0, r4, 0 movs r1, 0x1 bl sub_80A6980 _08116584: - ldr r0, _0811659C + ldr r0, =0x0203841e ldrh r0, [r0, 0x6] strh r0, [r4, 0x2E] - ldr r1, _081165A0 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _081165A4 + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0811659C: .4byte 0x0203841e -_081165A0: .4byte move_anim_8072740 + 1 -_081165A4: .4byte sub_80A64B0 + 1 + .pool thumb_func_end sub_8116560 thumb_func_start sub_81165A8 sub_81165A8: @ 81165A8 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _081165C8 + ldr r4, =0x0203841e ldrb r1, [r4, 0x6] bl sub_8008258 movs r1, 0x4 @@ -569523,19 +550707,19 @@ sub_81165A8: @ 81165A8 bl sub_80A69CC b _081165D4 .align 2, 0 -_081165C8: .4byte 0x0203841e + .pool _081165CC: adds r0, r5, 0 movs r1, 0x1 bl sub_80A6980 _081165D4: - ldr r0, _081165E0 + ldr r0, =sub_81165E4 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081165E0: .4byte sub_81165E4 + 1 + .pool thumb_func_end sub_81165A8 thumb_func_start sub_81165E4 @@ -569577,7 +550761,7 @@ sub_8116620: @ 8116620 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r4, _08116660 + ldr r4, =0x0203841e movs r1, 0 ldrsh r0, [r4, r1] bl sub_811583C @@ -569602,7 +550786,7 @@ sub_8116620: @ 8116620 pop {r0} bx r0 .align 2, 0 -_08116660: .4byte 0x0203841e + .pool thumb_func_end sub_8116620 thumb_func_start sub_8116664 @@ -569617,19 +550801,18 @@ sub_8116664: @ 8116664 movs r0, 0x1 bl sub_811583C adds r5, r0, 0 - ldr r0, _08116690 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x7 bhi _0811670E lsls r0, 2 - ldr r1, _08116694 + ldr r1, =_08116698 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08116690: .4byte 0x0203841e -_08116694: .4byte _08116698 + .pool .align 2, 0 _08116698: .4byte _081166BA @@ -569644,33 +550827,32 @@ _081166B8: movs r5, 0 _081166BA: mov r0, sp - ldr r1, _081166C0 + ldr r1, =0x02038436 b _081166CA .align 2, 0 -_081166C0: .4byte 0x02038436 + .pool _081166C4: movs r5, 0 _081166C6: mov r0, sp - ldr r1, _081166D0 + ldr r1, =0x02038437 _081166CA: ldrb r1, [r1] strb r1, [r0] b _0811670E .align 2, 0 -_081166D0: .4byte 0x02038437 + .pool _081166D4: mov r1, sp - ldr r0, _081166E4 + ldr r0, =0x02038436 ldrb r0, [r0] strb r0, [r1] - ldr r0, _081166E8 + ldr r0, =0x02038437 ldrb r0, [r0] strb r0, [r1, 0x1] b _0811670E .align 2, 0 -_081166E4: .4byte 0x02038436 -_081166E8: .4byte 0x02038437 + .pool _081166EC: mov r1, sp movs r0, 0xFF @@ -569679,14 +550861,14 @@ _081166EC: _081166F4: movs r5, 0 mov r2, sp - ldr r0, _081166FC + ldr r0, =0x02038436 b _08116706 .align 2, 0 -_081166FC: .4byte 0x02038436 + .pool _08116700: movs r5, 0 mov r2, sp - ldr r0, _08116758 + ldr r0, =0x02038437 _08116706: ldrb r0, [r0] movs r1, 0x2 @@ -569729,7 +550911,7 @@ _0811673C: pop {r0} bx r0 .align 2, 0 -_08116758: .4byte 0x02038437 + .pool thumb_func_end sub_8116664 thumb_func_start sub_811675C @@ -569737,24 +550919,22 @@ sub_811675C: @ 811675C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08116780 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] bl sub_811583C adds r2, r0, 0 - ldr r0, _08116784 + ldr r0, =0x02022ff0 ldrb r0, [r0] cmp r0, 0x9 bhi _08116832 lsls r0, 2 - ldr r1, _08116788 + ldr r1, =_0811678C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08116780: .4byte 0x0203841e -_08116784: .4byte 0x02022ff0 -_08116788: .4byte _0811678C + .pool .align 2, 0 _0811678C: .4byte _081167B4 @@ -569768,64 +550948,58 @@ _0811678C: .4byte _0811682C .4byte _0811682C _081167B4: - ldr r1, _081167BC - ldr r0, _081167C0 + ldr r1, =0x0203841e + ldr r0, =0x00000b0c b _08116830 .align 2, 0 -_081167BC: .4byte 0x0203841e -_081167C0: .4byte 0x00000b0c + .pool _081167C4: - ldr r1, _081167CC + ldr r1, =0x0203841e movs r0, 0x9E lsls r0, 4 b _08116830 .align 2, 0 -_081167CC: .4byte 0x0203841e + .pool _081167D0: - ldr r1, _081167D8 - ldr r0, _081167DC + ldr r1, =0x0203841e + ldr r0, =0x00002f1e b _08116830 .align 2, 0 -_081167D8: .4byte 0x0203841e -_081167DC: .4byte 0x00002f1e + .pool _081167E0: - ldr r1, _081167E8 + ldr r1, =0x0203841e movs r0, 0x90 lsls r0, 7 b _08116830 .align 2, 0 -_081167E8: .4byte 0x0203841e + .pool _081167EC: - ldr r1, _081167F4 - ldr r0, _081167F8 + ldr r1, =0x0203841e + ldr r0, =0x00007ecb b _08116830 .align 2, 0 -_081167F4: .4byte 0x0203841e -_081167F8: .4byte 0x00007ecb + .pool _081167FC: - ldr r1, _08116804 - ldr r0, _08116808 + ldr r1, =0x0203841e + ldr r0, =0x00007ecb b _08116830 .align 2, 0 -_08116804: .4byte 0x0203841e -_08116808: .4byte 0x00007ecb + .pool _0811680C: - ldr r1, _08116814 - ldr r0, _08116818 + ldr r1, =0x0203841e + ldr r0, =0x00002a16 b _08116830 .align 2, 0 -_08116814: .4byte 0x0203841e -_08116818: .4byte 0x00002a16 + .pool _0811681C: - ldr r1, _08116824 - ldr r0, _08116828 + ldr r1, =0x0203841e + ldr r0, =0x00000d2e b _08116830 .align 2, 0 -_08116824: .4byte 0x0203841e -_08116828: .4byte 0x00000d2e + .pool _0811682C: - ldr r1, _08116840 - ldr r0, _08116844 + ldr r1, =0x0203841e + ldr r0, =0x00007fff _08116830: strh r0, [r1, 0x8] _08116832: @@ -569836,8 +551010,7 @@ _08116832: pop {r0} bx r0 .align 2, 0 -_08116840: .4byte 0x0203841e -_08116844: .4byte 0x00007fff + .pool thumb_func_end sub_811675C thumb_func_start sub_8116848 @@ -569846,7 +551019,7 @@ sub_8116848: @ 8116848 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08116870 + ldr r0, =0x0203841e ldrh r0, [r0] bl gpu_pal_tags_index_of lsls r0, 24 @@ -569860,7 +551033,7 @@ sub_8116848: @ 8116848 pop {r0} bx r0 .align 2, 0 -_08116870: .4byte 0x0203841e + .pool thumb_func_end sub_8116848 thumb_func_start sub_8116874 @@ -569868,7 +551041,7 @@ sub_8116874: @ 8116874 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _081168AC + ldr r3, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -569876,7 +551049,7 @@ sub_8116874: @ 8116874 strh r1, [r2, 0x8] lsrs r1, 16 strh r1, [r2, 0xA] - ldr r3, _081168B0 + ldr r3, =0x0203841e ldrh r1, [r3, 0x2] strh r1, [r2, 0xC] ldrh r1, [r3, 0x4] @@ -569887,15 +551060,13 @@ sub_8116874: @ 8116874 strh r1, [r2, 0x12] ldrh r1, [r3, 0x4] strh r1, [r2, 0x1C] - ldr r1, _081168B4 + ldr r1, =sub_81168B8 + 1 str r1, [r2] bl _call_via_r1 pop {r0} bx r0 .align 2, 0 -_081168AC: .4byte 0x03005e00 -_081168B0: .4byte 0x0203841e -_081168B4: .4byte sub_81168B8 + 1 + .pool thumb_func_end sub_8116874 thumb_func_start sub_81168B8 @@ -569907,7 +551078,7 @@ sub_81168B8: @ 81168B8 lsls r0, 24 lsrs r7, r0, 24 movs r6, 0 - ldr r2, _08116938 + ldr r2, =0x03005e00 lsls r5, r7, 2 adds r0, r5, r7 lsls r0, 3 @@ -569967,7 +551138,7 @@ _0811691A: strh r0, [r2, 0x1C] b _08116954 .align 2, 0 -_08116938: .4byte 0x03005e00 + .pool _0811693C: cmp r3, r1 ble _08116946 @@ -569998,7 +551169,7 @@ sub_8116960: @ 8116960 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r4, _08116994 + ldr r4, =0x0203841e ldrb r0, [r4] ldrb r1, [r4, 0x2] ldrb r2, [r4, 0x4] @@ -570006,21 +551177,19 @@ sub_8116960: @ 8116960 ldrb r4, [r4, 0x8] str r4, [sp] bl sub_80A27B0 - ldr r1, _08116998 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0811699C + ldr r1, =sub_81169A0 + 1 str r1, [r0] add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08116994: .4byte 0x0203841e -_08116998: .4byte 0x03005e00 -_0811699C: .4byte sub_81169A0 + 1 + .pool thumb_func_end sub_8116960 thumb_func_start sub_81169A0 @@ -570028,7 +551197,7 @@ sub_81169A0: @ 81169A0 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081169BC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -570040,7 +551209,7 @@ _081169B8: pop {r0} bx r0 .align 2, 0 -_081169BC: .4byte 0x02037fd4 + .pool thumb_func_end sub_81169A0 thumb_func_start sub_81169C0 @@ -570050,9 +551219,9 @@ sub_81169C0: @ 81169C0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081169EC + ldr r0, =0x03005e00 adds r1, r0 - ldr r2, _081169F0 + ldr r2, =0x0203841e ldrh r0, [r2] movs r3, 0 strh r0, [r1, 0x8] @@ -570064,13 +551233,11 @@ sub_81169C0: @ 81169C0 ldrh r0, [r2, 0x6] strh r0, [r1, 0x10] strh r3, [r1, 0x12] - ldr r0, _081169F4 + ldr r0, =sub_81169F8 + 1 str r0, [r1] bx lr .align 2, 0 -_081169EC: .4byte 0x03005e00 -_081169F0: .4byte 0x0203841e -_081169F4: .4byte sub_81169F8 + 1 + .pool thumb_func_end sub_81169C0 thumb_func_start sub_81169F8 @@ -570082,7 +551249,7 @@ sub_81169F8: @ 81169F8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08116A24 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x10 ldrsh r0, [r4, r1] @@ -570097,7 +551264,7 @@ sub_81169F8: @ 81169F8 strh r0, [r4, 0xA] b _08116ACA .align 2, 0 -_08116A24: .4byte 0x03005e00 + .pool _08116A28: ldrb r0, [r4, 0x8] bl duplicate_obj_of_side_rel2move_in_transparent_mode @@ -570105,7 +551272,7 @@ _08116A28: lsls r0, 16 cmp r0, 0 blt _08116AA6 - ldr r6, _08116AB4 + ldr r6, =0x02020630 movs r1, 0x14 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -570157,7 +551324,7 @@ _08116A50: adds r1, r6, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08116AB8 + ldr r1, =sub_8116AD0 + 1 str r1, [r0] ldrh r0, [r4, 0x12] adds r0, 0x1 @@ -570170,8 +551337,7 @@ _08116AA6: strh r0, [r4, 0xA] b _08116ACA .align 2, 0 -_08116AB4: .4byte 0x02020630 -_08116AB8: .4byte sub_8116AD0 + 1 + .pool _08116ABC: movs r1, 0x12 ldrsh r0, [r4, r1] @@ -570198,7 +551364,7 @@ sub_8116AD0: @ 8116AD0 strh r0, [r4, 0x2E] b _08116B08 _08116AE4: - ldr r3, _08116B10 + ldr r3, =0x03005e00 movs r0, 0x32 ldrsh r1, [r4, r0] lsls r1, 1 @@ -570220,7 +551386,7 @@ _08116B08: pop {r0} bx r0 .align 2, 0 -_08116B10: .4byte 0x03005e00 + .pool thumb_func_end sub_8116AD0 thumb_func_start sub_8116B14 @@ -570234,24 +551400,24 @@ sub_8116B14: @ 8116B14 lsrs r0, 24 mov r9, r0 movs r7, 0 - ldr r0, _08116C3C + ldr r0, =0x02022e24 strh r7, [r0] - ldr r0, _08116C40 + ldr r0, =0x02022e26 strh r7, [r0] - ldr r1, _08116C44 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r1, _08116C48 + ldr r1, =0x00003f3d movs r0, 0x4A bl lcd_io_set movs r1, 0x80 lsls r1, 8 movs r0, 0 bl lcd_io_set_bits - ldr r1, _08116C4C + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set - ldr r1, _08116C50 + ldr r1, =0x00000c08 movs r0, 0x52 bl lcd_io_set movs r0, 0xA @@ -570296,7 +551462,7 @@ _08116BA2: lsls r0, 24 cmp r0, 0 bne _08116C26 - ldr r5, _08116C54 + ldr r5, =0x02038436 ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 @@ -570317,8 +551483,8 @@ _08116BD2: lsrs r0, 24 cmp r0, 0x1 bne _08116C26 - ldr r3, _08116C58 - ldr r1, _08116C5C + ldr r3, =0x02020630 + ldr r1, =0x020241e4 ldrb r0, [r5] eors r0, r6 adds r0, r1 @@ -570354,51 +551520,40 @@ _08116C26: lsls r0, 24 cmp r0, 0 beq _08116C64 - ldr r0, _08116C60 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r5, [r0] b _08116CAC .align 2, 0 -_08116C3C: .4byte 0x02022e24 -_08116C40: .4byte 0x02022e26 -_08116C44: .4byte 0x00003f3f -_08116C48: .4byte 0x00003f3d -_08116C4C: .4byte 0x00003f42 -_08116C50: .4byte 0x00000c08 -_08116C54: .4byte 0x02038436 -_08116C58: .4byte 0x02020630 -_08116C5C: .4byte 0x020241e4 -_08116C60: .4byte 0x02039f34 + .pool _08116C64: - ldr r4, _08116C84 + ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08116C90 - ldr r1, _08116C88 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08116C8C + ldr r1, =0x02024744 b _08116CA0 .align 2, 0 -_08116C84: .4byte 0x02038436 -_08116C88: .4byte 0x0202406e -_08116C8C: .4byte 0x02024744 + .pool _08116C90: - ldr r1, _08116D38 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08116D3C + ldr r1, =0x020244ec _08116CA0: adds r0, r1 movs r1, 0xB @@ -570411,7 +551566,7 @@ _08116CAC: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08116D40 + ldr r0, =0x02038436 ldrb r0, [r0] adds r1, r4, 0 adds r2, r5, 0 @@ -570421,25 +551576,25 @@ _08116CAC: lsrs r5, 24 mov r0, sp bl sub_80A6B30 - ldr r1, _08116D44 + ldr r1, =0x08c20684 mov r0, sp movs r2, 0 bl sub_80A6D60 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _08116D48 + ldr r1, =0x08c20668 mov r2, sp ldrh r2, [r2, 0xA] bl sub_80A6CC0 - ldr r0, _08116D4C + ldr r0, =0x08597418 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 adds r1, 0x1 movs r2, 0x2 bl gpu_pal_apply - ldr r2, _08116D50 - ldr r0, _08116D54 + ldr r2, =0x02022e18 + ldr r0, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -570448,12 +551603,12 @@ _08116CAC: negs r0, r0 adds r0, 0x20 strh r0, [r2] - ldr r2, _08116D58 + ldr r2, =0x02022e1a ldrh r0, [r1, 0x22] negs r0, r0 adds r0, 0x20 strh r0, [r2] - ldr r1, _08116D5C + ldr r1, =0x03005e00 mov r2, r9 lsls r0, r2, 2 add r0, r9 @@ -570461,7 +551616,7 @@ _08116CAC: adds r0, r1 strh r5, [r0, 0x8] strh r7, [r0, 0x14] - ldr r1, _08116D60 + ldr r1, =sub_8116D64 + 1 str r1, [r0] add sp, 0x14 pop {r3,r4} @@ -570471,17 +551626,7 @@ _08116CAC: pop {r0} bx r0 .align 2, 0 -_08116D38: .4byte 0x0202406e -_08116D3C: .4byte 0x020244ec -_08116D40: .4byte 0x02038436 -_08116D44: .4byte 0x08c20684 -_08116D48: .4byte 0x08c20668 -_08116D4C: .4byte 0x08597418 -_08116D50: .4byte 0x02022e18 -_08116D54: .4byte 0x02020630 -_08116D58: .4byte 0x02022e1a -_08116D5C: .4byte 0x03005e00 -_08116D60: .4byte sub_8116D64 + 1 + .pool thumb_func_end sub_8116B14 thumb_func_start sub_8116D64 @@ -570493,7 +551638,7 @@ sub_8116D64: @ 8116D64 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r1, _08116E94 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -570503,7 +551648,7 @@ sub_8116D64: @ 8116D64 movs r1, 0 mov r8, r1 strh r0, [r5, 0x1C] - ldr r7, _08116E98 + ldr r7, =0x02022e1a ldrh r2, [r7] subs r1, r2, 0x4 strh r1, [r7] @@ -570525,12 +551670,12 @@ sub_8116D64: @ 8116D64 bne _08116E86 movs r0, 0 bl sub_80A477C - ldr r0, _08116E9C + ldr r0, =0x02022e24 mov r1, r8 strh r1, [r0] - ldr r0, _08116EA0 + ldr r0, =0x02022e26 strh r1, [r0] - ldr r4, _08116EA4 + ldr r4, =0x00003f3f movs r0, 0x48 adds r1, r4, 0 bl lcd_io_set @@ -570573,7 +551718,7 @@ _08116DF6: bl lcd_io_set movs r0, 0 bl obj_id_for_side_relative_to_move - ldr r4, _08116EA8 + ldr r4, =0x02020630 movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -570590,8 +551735,8 @@ _08116DF6: ldrsh r0, [r5, r1] cmp r0, 0x1 bne _08116E7C - ldr r2, _08116EAC - ldr r0, _08116EB0 + ldr r2, =0x020241e4 + ldr r0, =0x02038436 ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -570626,14 +551771,7 @@ _08116E86: pop {r0} bx r0 .align 2, 0 -_08116E94: .4byte 0x03005e00 -_08116E98: .4byte 0x02022e1a -_08116E9C: .4byte 0x02022e24 -_08116EA0: .4byte 0x02022e26 -_08116EA4: .4byte 0x00003f3f -_08116EA8: .4byte 0x02020630 -_08116EAC: .4byte 0x020241e4 -_08116EB0: .4byte 0x02038436 + .pool thumb_func_end sub_8116D64 thumb_func_start sub_8116EB4 @@ -570641,12 +551779,12 @@ sub_8116EB4: @ 8116EB4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _08116EF4 + ldr r4, =0x0203a110 movs r0, 0x18 bl malloc_and_clear str r0, [r4] movs r2, 0 - ldr r3, _08116EF8 + ldr r3, =0x0203841e _08116EC8: ldr r1, [r4] lsls r0, r2, 1 @@ -570660,21 +551798,18 @@ _08116EC8: lsrs r2, r0, 24 cmp r2, 0x7 bls _08116EC8 - ldr r0, _08116EFC + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _08116F00 + ldr r0, =sub_8116F04 + 1 str r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08116EF4: .4byte 0x0203a110 -_08116EF8: .4byte 0x0203841e -_08116EFC: .4byte 0x03005e00 -_08116F00: .4byte sub_8116F04 + 1 + .pool thumb_func_end sub_8116EB4 thumb_func_start sub_8116F04 @@ -570682,23 +551817,22 @@ sub_8116F04: @ 8116F04 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08116F1C + ldr r0, =0x0203a110 ldr r1, [r0] movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 bne _08116F24 - ldr r0, _08116F20 + ldr r0, =0x02038436 b _08116F26 .align 2, 0 -_08116F1C: .4byte 0x0203a110 -_08116F20: .4byte 0x02038436 + .pool _08116F24: - ldr r0, _08117050 + ldr r0, =0x02038437 _08116F26: ldrb r0, [r0] strb r0, [r1] - ldr r4, _08117054 + ldr r4, =0x0203a110 ldr r2, [r4] ldrb r0, [r2] movs r1, 0x2 @@ -570723,22 +551857,22 @@ _08116F56: movs r0, 0 strh r0, [r1, 0xA] _08116F5C: - ldr r0, _08117058 + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r0, _0811705C + ldr r0, =0x02022e26 strh r1, [r0] - ldr r1, _08117060 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r1, _08117064 + ldr r1, =0x00003f3d movs r0, 0x4A bl lcd_io_set movs r1, 0x80 lsls r1, 8 movs r0, 0 bl lcd_io_set_bits - ldr r1, _08117068 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -570766,7 +551900,7 @@ _08116FBA: lsls r0, 24 cmp r0, 0 beq _08117036 - ldr r4, _08117054 + ldr r4, =0x0203a110 ldr r1, [r4] movs r2, 0xA ldrsh r0, [r1, r2] @@ -570792,8 +551926,8 @@ _08116FEC: lsrs r5, r0, 24 cmp r5, 0x1 bne _08117036 - ldr r3, _0811706C - ldr r1, _08117070 + ldr r3, =0x02020630 + ldr r1, =0x020241e4 ldr r0, [r4] ldrb r0, [r0, 0x1] adds r0, r1 @@ -570825,33 +551959,24 @@ _08117036: lsls r0, 24 cmp r0, 0 beq _08117078 - ldr r0, _08117054 + ldr r0, =0x0203a110 ldr r1, [r0] - ldr r0, _08117074 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r0, [r0] b _081170C4 .align 2, 0 -_08117050: .4byte 0x02038437 -_08117054: .4byte 0x0203a110 -_08117058: .4byte 0x02022e24 -_0811705C: .4byte 0x02022e26 -_08117060: .4byte 0x00003f3f -_08117064: .4byte 0x00003f3d -_08117068: .4byte 0x00003f42 -_0811706C: .4byte 0x02020630 -_08117070: .4byte 0x020241e4 -_08117074: .4byte 0x02039f34 + .pool _08117078: - ldr r4, _0811709C + ldr r4, =0x0203a110 ldr r0, [r4] ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _081170A8 - ldr r1, _081170A0 + ldr r1, =0x0202406e ldr r0, [r4] ldrb r0, [r0] lsls r0, 1 @@ -570859,14 +551984,12 @@ _08117078: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081170A4 + ldr r1, =0x02024744 b _081170BA .align 2, 0 -_0811709C: .4byte 0x0203a110 -_081170A0: .4byte 0x0202406e -_081170A4: .4byte 0x02024744 + .pool _081170A8: - ldr r1, _081170DC + ldr r1, =0x0202406e ldr r0, [r4] ldrb r0, [r0] lsls r0, 1 @@ -570874,7 +551997,7 @@ _081170A8: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081170E0 + ldr r1, =0x020244ec _081170BA: adds r0, r1 movs r1, 0xB @@ -570882,21 +552005,18 @@ _081170BA: ldr r1, [r4] _081170C4: strh r0, [r1, 0x14] - ldr r0, _081170E4 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _081170E8 + ldr r0, =sub_81170EC + 1 str r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081170DC: .4byte 0x0202406e -_081170E0: .4byte 0x020244ec -_081170E4: .4byte 0x03005e00 -_081170E8: .4byte sub_81170EC + 1 + .pool thumb_func_end sub_8116F04 thumb_func_start sub_81170EC @@ -570909,8 +552029,8 @@ sub_81170EC: @ 81170EC lsrs r5, r0, 24 movs r0, 0 mov r8, r0 - ldr r6, _0811714C - ldr r4, _08117150 + ldr r6, =0x020241e4 + ldr r4, =0x0203a110 ldr r2, [r4] ldrb r0, [r2] adds r1, r0, r6 @@ -570940,43 +552060,38 @@ _0811712E: ldrsh r0, [r0, r4] cmp r0, 0 bne _08117158 - ldr r1, _08117154 + ldr r1, =0x08c2d930 mov r0, sp movs r2, 0 bl sub_80A6D60 b _08117162 .align 2, 0 -_0811714C: .4byte 0x020241e4 -_08117150: .4byte 0x0203a110 -_08117154: .4byte 0x08c2d930 + .pool _08117158: - ldr r1, _08117188 + ldr r1, =0x08c2da4c mov r0, sp movs r2, 0 bl sub_80A6D60 _08117162: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _0811718C + ldr r1, =0x08c2d720 mov r2, sp ldrh r2, [r2, 0xA] bl sub_80A6CC0 - ldr r0, _08117190 + ldr r0, =0x0203a110 ldr r0, [r0] movs r1, 0x6 ldrsh r0, [r0, r1] cmp r0, 0x6 bhi _081171F8 lsls r0, 2 - ldr r1, _08117194 + ldr r1, =_08117198 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08117188: .4byte 0x08c2da4c -_0811718C: .4byte 0x08c2d720 -_08117190: .4byte 0x0203a110 -_08117194: .4byte _08117198 + .pool .align 2, 0 _08117198: .4byte _081171B4 @@ -570987,37 +552102,37 @@ _08117198: .4byte _081171DC .4byte _081171E4 _081171B4: - ldr r0, _081171B8 + ldr r0, =0x08c2db88 b _081171E6 .align 2, 0 -_081171B8: .4byte 0x08c2db88 + .pool _081171BC: - ldr r0, _081171C0 + ldr r0, =0x08c2db68 b _081171E6 .align 2, 0 -_081171C0: .4byte 0x08c2db68 + .pool _081171C4: - ldr r0, _081171C8 + ldr r0, =0x08c2dba8 b _081171E6 .align 2, 0 -_081171C8: .4byte 0x08c2dba8 + .pool _081171CC: - ldr r0, _081171D0 + ldr r0, =0x08c2dbc8 b _081171E6 .align 2, 0 -_081171D0: .4byte 0x08c2dbc8 + .pool _081171D4: - ldr r0, _081171D8 + ldr r0, =0x08c2dc08 b _081171E6 .align 2, 0 -_081171D8: .4byte 0x08c2dc08 + .pool _081171DC: - ldr r0, _081171E0 + ldr r0, =0x08c2dc28 b _081171E6 .align 2, 0 -_081171E0: .4byte 0x08c2dc28 + .pool _081171E4: - ldr r0, _081171F4 + ldr r0, =0x08c2dc48 _081171E6: mov r1, sp ldrb r1, [r1, 0x8] @@ -571026,21 +552141,21 @@ _081171E6: bl decompress_palette b _08117206 .align 2, 0 -_081171F4: .4byte 0x08c2dc48 + .pool _081171F8: - ldr r0, _08117230 + ldr r0, =0x08c2dbe8 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette _08117206: - ldr r3, _08117234 + ldr r3, =0x02022e18 movs r2, 0 strh r2, [r3] - ldr r0, _08117238 + ldr r0, =0x02022e1a strh r2, [r0] - ldr r1, _0811723C + ldr r1, =0x0203a110 ldr r0, [r1] movs r4, 0x4 ldrsh r0, [r0, r4] @@ -571049,22 +552164,17 @@ _08117206: bne _08117248 movs r0, 0x40 strh r0, [r3] - ldr r2, _08117240 + ldr r2, =0x03005e00 lsls r3, r5, 2 adds r0, r3, r5 lsls r0, 3 adds r0, r2 - ldr r1, _08117244 + ldr r1, =0x0000fffd b _08117254 .align 2, 0 -_08117230: .4byte 0x08c2dbe8 -_08117234: .4byte 0x02022e18 -_08117238: .4byte 0x02022e1a -_0811723C: .4byte 0x0203a110 -_08117240: .4byte 0x03005e00 -_08117244: .4byte 0x0000fffd + .pool _08117248: - ldr r2, _08117270 + ldr r2, =0x03005e00 lsls r3, r5, 2 adds r0, r3, r5 lsls r0, 3 @@ -571085,7 +552195,7 @@ _08117254: movs r1, 0x14 b _08117280 .align 2, 0 -_08117270: .4byte 0x03005e00 + .pool _08117274: adds r0, r3, r5 lsls r0, 3 @@ -571106,12 +552216,12 @@ _08117280: strh r4, [r1, 0xE] ldrb r0, [r3, 0x2] strh r0, [r1, 0x14] - ldr r2, _081172C4 + ldr r2, =0x020241e4 ldrb r0, [r3, 0x1] adds r0, r2 ldrb r0, [r0] strh r0, [r1, 0x16] - ldr r0, _081172C8 + ldr r0, =sub_81172EC + 1 str r0, [r1] movs r1, 0x4 ldrsh r0, [r3, r1] @@ -571127,8 +552237,7 @@ _08117280: bl audio_play_and_stuff b _081172E0 .align 2, 0 -_081172C4: .4byte 0x020241e4 -_081172C8: .4byte sub_81172EC + 1 + .pool _081172CC: movs r0, 0x40 negs r0, r0 @@ -571152,8 +552261,8 @@ sub_81172EC: @ 81172EC push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _08117318 - ldr r1, _0811731C + ldr r2, =0x02022e1a + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -571172,8 +552281,7 @@ sub_81172EC: @ 81172EC beq _0811732A b _08117478 .align 2, 0 -_08117318: .4byte 0x02022e1a -_0811731C: .4byte 0x03005e00 + .pool _08117320: cmp r2, 0x2 beq _08117378 @@ -571255,12 +552363,12 @@ _081173AE: strh r0, [r5, 0x26] b _08117478 _081173B6: - ldr r0, _08117480 + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r0, _08117484 + ldr r0, =0x02022e26 strh r1, [r0] - ldr r4, _08117488 + ldr r4, =0x00003f3f movs r0, 0x48 adds r1, r4, 0 bl lcd_io_set @@ -571298,7 +552406,7 @@ _081173E6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0811748C + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles movs r1, 0xC @@ -571336,7 +552444,7 @@ _0811743A: orrs r0, r1 strb r0, [r2, 0x5] _08117466: - ldr r4, _08117490 + ldr r4, =0x0203a110 ldr r0, [r4] bl free movs r0, 0 @@ -571348,11 +552456,7 @@ _08117478: pop {r0} bx r0 .align 2, 0 -_08117480: .4byte 0x02022e24 -_08117484: .4byte 0x02022e26 -_08117488: .4byte 0x00003f3f -_0811748C: .4byte 0x02020630 -_08117490: .4byte 0x0203a110 + .pool thumb_func_end sub_81172EC thumb_func_start sub_8117494 @@ -571370,7 +552474,7 @@ sub_8117494: @ 8117494 adds r6, r0, 0 movs r1, 0 bl sub_81175C4 - ldr r0, _081174F4 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -571387,23 +552491,21 @@ sub_8117494: @ 8117494 movs r3, 0 bl sub_80A75AC adds r6, r0, 0 - ldr r1, _081174F8 + ldr r1, =0x0000ffff ands r6, r1 adds r0, r6, 0 bl sub_81175C4 strh r6, [r4, 0x26] strh r5, [r4, 0x8] strh r5, [r4, 0xA] - ldr r0, _081174FC + ldr r0, =sub_8117500 + 1 str r0, [r4] add sp, 0xC pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081174F4: .4byte 0x03005e00 -_081174F8: .4byte 0x0000ffff -_081174FC: .4byte sub_8117500 + 1 + .pool thumb_func_end sub_8117494 thumb_func_start sub_8117500 @@ -571414,7 +552516,7 @@ sub_8117500: @ 8117500 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08117524 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -571426,7 +552528,7 @@ sub_8117500: @ 8117500 beq _0811752E b _081175BE .align 2, 0 -_08117524: .4byte 0x03005e00 + .pool _08117528: cmp r1, 0x2 beq _081175B8 @@ -571469,7 +552571,7 @@ _08117560: lsrs r0, 16 ldrb r2, [r4, 0xC] movs r1, 0x10 - ldr r3, _081175B4 + ldr r3, =0x0000ffff bl pal_fade_1 _0811757A: movs r1, 0x24 @@ -571503,7 +552605,7 @@ _081175AC: strh r0, [r4, 0x8] b _081175BE .align 2, 0 -_081175B4: .4byte 0x0000ffff + .pool _081175B8: adds r0, r2, 0 bl move_anim_task_del @@ -571533,7 +552635,7 @@ _081175CE: adds r0, 0x10 cmp r2, r0 bge _081175FA - ldr r1, _0811760C + ldr r1, =0x02037b14 adds r3, r0, 0 _081175EA: lsls r0, r2, 1 @@ -571554,7 +552656,7 @@ _081175FA: pop {r0} bx r0 .align 2, 0 -_0811760C: .4byte 0x02037b14 + .pool thumb_func_end sub_81175C4 thumb_func_start sub_8117610 @@ -571564,7 +552666,7 @@ sub_8117610: @ 8117610 lsrs r6, r0, 24 movs r4, 0 movs r2, 0 - ldr r0, _08117658 + ldr r0, =0x02038436 ldrb r3, [r0] movs r5, 0x1 _08117620: @@ -571580,7 +552682,7 @@ _0811762E: cmp r2, 0x3 bls _08117620 movs r2, 0x5 - ldr r0, _0811765C + ldr r0, =0x0203841e adds r1, r0, 0 adds r1, 0x8 _0811763C: @@ -571597,8 +552699,7 @@ _0811763C: pop {r0} bx r0 .align 2, 0 -_08117658: .4byte 0x02038436 -_0811765C: .4byte 0x0203841e + .pool thumb_func_end sub_8117610 thumb_func_start sub_8117660 @@ -571608,17 +552709,17 @@ sub_8117660: @ 8117660 lsrs r6, r0, 24 movs r0, 0 bl sub_80A6DAC - ldr r0, _081176C8 + ldr r0, =sub_81176D8 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _081176CC + ldr r4, =0x0203841e movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 beq _0811769C - ldr r0, _081176D0 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -571631,12 +552732,12 @@ sub_8117660: @ 8117660 negs r0, r0 strh r0, [r4, 0x2] _0811769C: - ldr r0, _081176D4 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r2, _081176CC + ldr r2, =0x0203841e ldrh r0, [r2] strh r0, [r1, 0xA] ldrh r0, [r2, 0x2] @@ -571652,10 +552753,7 @@ _0811769C: pop {r0} bx r0 .align 2, 0 -_081176C8: .4byte sub_81176D8 + 1 -_081176CC: .4byte 0x0203841e -_081176D0: .4byte 0x02038436 -_081176D4: .4byte 0x03005e00 + .pool thumb_func_end sub_8117660 thumb_func_start sub_81176D8 @@ -571663,7 +552761,7 @@ sub_81176D8: @ 81176D8 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08117744 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -571678,13 +552776,13 @@ sub_81176D8: @ 81176D8 ldrh r7, [r1, 0x1E] adds r2, r7 strh r2, [r1, 0x1E] - ldr r6, _08117748 + ldr r6, =0x02022e20 lsls r0, r3, 16 asrs r0, 24 ldrh r4, [r6] adds r0, r4 strh r0, [r6] - ldr r4, _0811774C + ldr r4, =0x02022e22 lsls r0, r2, 16 asrs r0, 24 ldrh r7, [r4] @@ -571695,7 +552793,7 @@ sub_81176D8: @ 81176D8 strh r3, [r1, 0x1C] ands r2, r0 strh r2, [r1, 0x1E] - ldr r0, _08117750 + ldr r0, =0x0203841e movs r3, 0xE ldrsh r2, [r0, r3] movs r7, 0xE @@ -571714,10 +552812,7 @@ _0811773E: pop {r0} bx r0 .align 2, 0 -_08117744: .4byte 0x03005e00 -_08117748: .4byte 0x02022e20 -_0811774C: .4byte 0x02022e22 -_08117750: .4byte 0x0203841e + .pool thumb_func_end sub_81176D8 thumb_func_start sub_8117754 @@ -571726,10 +552821,10 @@ sub_8117754: @ 8117754 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08117778 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner - ldr r1, _0811777C + ldr r1, =0x0203841e lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0xE] @@ -571739,8 +552834,7 @@ sub_8117754: @ 8117754 pop {r0} bx r0 .align 2, 0 -_08117778: .4byte 0x02038436 -_0811777C: .4byte 0x0203841e + .pool thumb_func_end sub_8117754 thumb_func_start sub_8117780 @@ -571749,10 +552843,10 @@ sub_8117780: @ 8117780 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081177A4 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner - ldr r1, _081177A8 + ldr r1, =0x0203841e lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0xE] @@ -571762,8 +552856,7 @@ sub_8117780: @ 8117780 pop {r0} bx r0 .align 2, 0 -_081177A4: .4byte 0x02038437 -_081177A8: .4byte 0x0203841e + .pool thumb_func_end sub_8117780 thumb_func_start sub_81177AC @@ -571771,12 +552864,12 @@ sub_81177AC: @ 81177AC push {r4,r5,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r5, _081177D8 + ldr r5, =0x0203841e movs r4, 0 - ldr r0, _081177DC + ldr r0, =0x02038436 ldrb r2, [r0] movs r0, 0x2 - ldr r1, _081177E0 + ldr r1, =0x02038437 eors r0, r2 ldrb r1, [r1] cmp r0, r1 @@ -571790,9 +552883,7 @@ _081177C8: pop {r0} bx r0 .align 2, 0 -_081177D8: .4byte 0x0203841e -_081177DC: .4byte 0x02038436 -_081177E0: .4byte 0x02038437 + .pool thumb_func_end sub_81177AC thumb_func_start sub_81177E4 @@ -571801,9 +552892,9 @@ sub_81177E4: @ 81177E4 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r6, _08117844 + ldr r6, =0x02020630 _081177EE: - ldr r0, _08117848 + ldr r0, =0x02038436 ldrb r0, [r0] cmp r4, r0 beq _0811782C @@ -571813,14 +552904,14 @@ _081177EE: lsls r0, 24 cmp r0, 0 beq _0811782C - ldr r0, _0811784C + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r0, [r0] lsls r2, r0, 4 adds r2, r0 lsls r2, 2 adds r2, r6 - ldr r1, _08117850 + ldr r1, =0x0203841e adds r2, 0x3E movs r0, 0x1 ldrb r3, [r1] @@ -571845,10 +552936,7 @@ _0811782C: pop {r0} bx r0 .align 2, 0 -_08117844: .4byte 0x02020630 -_08117848: .4byte 0x02038436 -_0811784C: .4byte 0x020241e4 -_08117850: .4byte 0x0203841e + .pool thumb_func_end sub_81177E4 thumb_func_start sub_8117854 @@ -571904,22 +552992,22 @@ _081178B6: movs r2, 0 mov r8, r2 _081178BA: - ldr r0, _0811794C + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r0, _08117950 + ldr r0, =0x02022e26 strh r1, [r0] - ldr r1, _08117954 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r1, _08117958 + ldr r1, =0x00003f3d movs r0, 0x4A bl lcd_io_set movs r1, 0x80 lsls r1, 8 movs r0, 0 bl lcd_io_set_bits - ldr r1, _0811795C + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -571964,43 +553052,37 @@ _08117930: lsls r0, 24 cmp r0, 0 beq _08117964 - ldr r0, _08117960 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r4, [r0] b _081179A2 .align 2, 0 -_0811794C: .4byte 0x02022e24 -_08117950: .4byte 0x02022e26 -_08117954: .4byte 0x00003f3f -_08117958: .4byte 0x00003f3d -_0811795C: .4byte 0x00003f42 -_08117960: .4byte 0x02039f34 + .pool _08117964: adds r0, r7, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08117988 - ldr r1, _08117980 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08117984 + ldr r1, =0x02024744 b _08117996 .align 2, 0 -_08117980: .4byte 0x0202406e -_08117984: .4byte 0x02024744 + .pool _08117988: - ldr r1, _08117A44 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08117A48 + ldr r1, =0x020244ec _08117996: adds r0, r1 movs r1, 0xB @@ -572008,7 +553090,7 @@ _08117996: lsls r0, 16 lsrs r4, r0, 16 _081179A2: - ldr r5, _08117A4C + ldr r5, =0x020241e4 adds r0, r7, r5 ldrb r1, [r0] adds r0, r7, 0 @@ -572046,12 +553128,12 @@ _081179CC: ldr r0, [sp, 0x5C] movs r2, 0x20 bl decompress_palette - ldr r0, _08117A50 + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r0, _08117A54 + ldr r0, =0x02022e1a strh r1, [r0] - ldr r1, _08117A58 + ldr r1, =0x03005e00 mov r2, r9 lsls r0, r2, 2 add r0, r9 @@ -572074,7 +553156,7 @@ _081179CC: mov r2, sp ldrh r2, [r2, 0x20] strh r2, [r0, 0xE] - ldr r1, _08117A5C + ldr r1, =sub_8117A60 + 1 str r1, [r0] add sp, 0x24 pop {r3-r5} @@ -572085,13 +553167,7 @@ _081179CC: pop {r0} bx r0 .align 2, 0 -_08117A44: .4byte 0x0202406e -_08117A48: .4byte 0x020244ec -_08117A4C: .4byte 0x020241e4 -_08117A50: .4byte 0x02022e18 -_08117A54: .4byte 0x02022e1a -_08117A58: .4byte 0x03005e00 -_08117A5C: .4byte sub_8117A60 + 1 + .pool thumb_func_end sub_8117854 thumb_func_start sub_8117A60 @@ -572100,7 +553176,7 @@ sub_8117A60: @ 8117A60 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08117A9C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -572119,7 +553195,7 @@ _08117A7E: ldrsh r0, [r3, r1] cmp r0, 0 bge _08117AA4 - ldr r2, _08117AA0 + ldr r2, =0x02022e1a lsls r1, r4, 16 asrs r1, 24 ldrh r0, [r2] @@ -572127,10 +553203,9 @@ _08117A7E: strh r0, [r2] b _08117AB0 .align 2, 0 -_08117A9C: .4byte 0x03005e00 -_08117AA0: .4byte 0x02022e1a + .pool _08117AA4: - ldr r1, _08117AD4 + ldr r1, =0x02022e1a lsls r0, r4, 16 asrs r0, 24 ldrh r2, [r1] @@ -572156,7 +553231,7 @@ _08117AB0: beq _08117ADE b _08117C0C .align 2, 0 -_08117AD4: .4byte 0x02022e1a + .pool _08117AD8: cmp r0, 0x2 beq _08117B34 @@ -572235,11 +553310,11 @@ _08117B34: bne _08117C0C movs r0, 0 bl sub_80A477C - ldr r0, _08117C14 + ldr r0, =0x02022e24 strh r4, [r0] - ldr r0, _08117C18 + ldr r0, =0x02022e26 strh r4, [r0] - ldr r4, _08117C1C + ldr r4, =0x00003f3f movs r0, 0x48 adds r1, r4, 0 bl lcd_io_set @@ -572287,7 +553362,7 @@ _08117BB2: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08117C20 + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles movs r1, 0xC @@ -572310,10 +553385,7 @@ _08117C0C: pop {r0} bx r0 .align 2, 0 -_08117C14: .4byte 0x02022e24 -_08117C18: .4byte 0x02022e26 -_08117C1C: .4byte 0x00003f3f -_08117C20: .4byte 0x02020630 + .pool thumb_func_end sub_8117A60 thumb_func_start sub_8117C24 @@ -572321,16 +553393,15 @@ sub_8117C24: @ 8117C24 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08117C3C - ldr r1, _08117C40 + ldr r2, =0x0203841e + ldr r1, =0x02022ff0 ldrb r1, [r1] strh r1, [r2] bl move_anim_task_del pop {r0} bx r0 .align 2, 0 -_08117C3C: .4byte 0x0203841e -_08117C40: .4byte 0x02022ff0 + .pool thumb_func_end sub_8117C24 thumb_func_start sub_8117C44 @@ -572342,7 +553413,7 @@ sub_8117C44: @ 8117C44 movs r0, 0x80 lsls r0, 6 bl malloc_and_clear - ldr r1, _08117C6C + ldr r1, =0x020244d4 ldr r1, [r1] movs r2, 0xBE lsls r2, 1 @@ -572354,7 +553425,7 @@ sub_8117C44: @ 8117C44 pop {r0} bx r0 .align 2, 0 -_08117C6C: .4byte 0x020244d4 + .pool thumb_func_end sub_8117C44 thumb_func_start sub_8117C70 @@ -572363,7 +553434,7 @@ sub_8117C70: @ 8117C70 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r6, _08117C9C + ldr r6, =0x020244d4 ldr r0, [r6] movs r5, 0xBE lsls r5, 1 @@ -572380,7 +553451,7 @@ sub_8117C70: @ 8117C70 pop {r0} bx r0 .align 2, 0 -_08117C9C: .4byte 0x020244d4 + .pool thumb_func_end sub_8117C70 thumb_func_start sub_8117CA0 @@ -572390,7 +553461,7 @@ sub_8117CA0: @ 8117CA0 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _08117CE0 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -572418,26 +553489,26 @@ _08117CD2: beq _08117CD2 b _08117CFC .align 2, 0 -_08117CE0: .4byte 0x0203841e + .pool _08117CE4: cmp r0, 0x1 bne _08117CF0 - ldr r0, _08117CEC + ldr r0, =0x02038436 b _08117CF6 .align 2, 0 -_08117CEC: .4byte 0x02038436 + .pool _08117CF0: cmp r0, 0x2 bne _08117CFC - ldr r0, _08117D2C + ldr r0, =0x02038437 _08117CF6: ldrb r0, [r0] adds r4, r0, 0 adds r4, 0x10 _08117CFC: - ldr r0, _08117D30 + ldr r0, =0x020244d4 ldr r1, [r0] - ldr r0, _08117D34 + ldr r0, =0x0203841e movs r2, 0x2 ldrsh r0, [r0, r2] movs r2, 0xBE @@ -572447,7 +553518,7 @@ _08117CFC: lsls r0, 5 adds r0, r1 lsls r1, r4, 5 - ldr r2, _08117D38 + ldr r2, =0x02037714 adds r1, r2 movs r2, 0x20 bl memcpy @@ -572458,10 +553529,7 @@ _08117CFC: pop {r0} bx r0 .align 2, 0 -_08117D2C: .4byte 0x02038437 -_08117D30: .4byte 0x020244d4 -_08117D34: .4byte 0x0203841e -_08117D38: .4byte 0x02037714 + .pool thumb_func_end sub_8117CA0 thumb_func_start sub_8117D3C @@ -572471,7 +553539,7 @@ sub_8117D3C: @ 8117D3C lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _08117D7C + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -572499,29 +553567,29 @@ _08117D6E: beq _08117D6E b _08117D98 .align 2, 0 -_08117D7C: .4byte 0x0203841e + .pool _08117D80: cmp r0, 0x1 bne _08117D8C - ldr r0, _08117D88 + ldr r0, =0x02038436 b _08117D92 .align 2, 0 -_08117D88: .4byte 0x02038436 + .pool _08117D8C: cmp r0, 0x2 bne _08117D98 - ldr r0, _08117DC8 + ldr r0, =0x02038437 _08117D92: ldrb r0, [r0] adds r4, r0, 0 adds r4, 0x10 _08117D98: lsls r0, r4, 5 - ldr r1, _08117DCC + ldr r1, =0x02037714 adds r0, r1 - ldr r1, _08117DD0 + ldr r1, =0x020244d4 ldr r2, [r1] - ldr r1, _08117DD4 + ldr r1, =0x0203841e movs r3, 0x2 ldrsh r1, [r1, r3] movs r3, 0xBE @@ -572539,10 +553607,7 @@ _08117D98: pop {r0} bx r0 .align 2, 0 -_08117DC8: .4byte 0x02038437 -_08117DCC: .4byte 0x02037714 -_08117DD0: .4byte 0x020244d4 -_08117DD4: .4byte 0x0203841e + .pool thumb_func_end sub_8117D3C thumb_func_start sub_8117DD8 @@ -572552,7 +553617,7 @@ sub_8117DD8: @ 8117DD8 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r0, _08117E18 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -572580,27 +553645,27 @@ _08117E0A: beq _08117E0A b _08117E34 .align 2, 0 -_08117E18: .4byte 0x0203841e + .pool _08117E1C: cmp r0, 0x1 bne _08117E28 - ldr r0, _08117E24 + ldr r0, =0x02038436 b _08117E2E .align 2, 0 -_08117E24: .4byte 0x02038436 + .pool _08117E28: cmp r0, 0x2 bne _08117E34 - ldr r0, _08117E54 + ldr r0, =0x02038437 _08117E2E: ldrb r0, [r0] adds r4, r0, 0 adds r4, 0x10 _08117E34: lsls r1, r4, 5 - ldr r0, _08117E58 + ldr r0, =0x02037714 adds r0, r1, r0 - ldr r2, _08117E5C + ldr r2, =0x02037b14 adds r1, r2 movs r2, 0x20 bl memcpy @@ -572611,9 +553676,7 @@ _08117E34: pop {r0} bx r0 .align 2, 0 -_08117E54: .4byte 0x02038437 -_08117E58: .4byte 0x02037714 -_08117E5C: .4byte 0x02037b14 + .pool thumb_func_end sub_8117DD8 thumb_func_start sub_8117E60 @@ -572626,14 +553689,14 @@ sub_8117E60: @ 8117E60 lsrs r1, r0, 24 cmp r1, 0 beq _08117E80 - ldr r1, _08117E7C + ldr r1, =0x0203841e movs r0, 0x1 strh r0, [r1, 0xE] b _08117E84 .align 2, 0 -_08117E7C: .4byte 0x0203841e + .pool _08117E80: - ldr r0, _08117E90 + ldr r0, =0x0203841e strh r1, [r0, 0xE] _08117E84: adds r0, r4, 0 @@ -572642,7 +553705,7 @@ _08117E84: pop {r0} bx r0 .align 2, 0 -_08117E90: .4byte 0x0203841e + .pool thumb_func_end sub_8117E60 thumb_func_start sub_8117E94 @@ -572650,22 +553713,19 @@ sub_8117E94: @ 8117E94 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08117EB4 - ldr r1, _08117EB8 + ldr r2, =0x02038436 + ldr r1, =0x0202420c ldrb r1, [r1] strb r1, [r2] - ldr r2, _08117EBC - ldr r1, _08117EC0 + ldr r2, =0x02038437 + ldr r1, =0x0202420e ldrb r1, [r1] strb r1, [r2] bl move_anim_task_del pop {r0} bx r0 .align 2, 0 -_08117EB4: .4byte 0x02038436 -_08117EB8: .4byte 0x0202420c -_08117EBC: .4byte 0x02038437 -_08117EC0: .4byte 0x0202420e + .pool thumb_func_end sub_8117E94 thumb_func_start sub_8117EC4 @@ -572673,26 +553733,24 @@ sub_8117EC4: @ 8117EC4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08117EEC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner adds r4, r0, 0 - ldr r0, _08117EF0 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r4, 24 lsls r0, 24 cmp r4, r0 bne _08117EF8 - ldr r1, _08117EF4 + ldr r1, =0x0203841e movs r0, 0x1 b _08117EFC .align 2, 0 -_08117EEC: .4byte 0x02038436 -_08117EF0: .4byte 0x02038437 -_08117EF4: .4byte 0x0203841e + .pool _08117EF8: - ldr r1, _08117F0C + ldr r1, =0x0203841e movs r0, 0 _08117EFC: strh r0, [r1, 0xE] @@ -572702,7 +553760,7 @@ _08117EFC: pop {r0} bx r0 .align 2, 0 -_08117F0C: .4byte 0x0203841e + .pool thumb_func_end sub_8117EC4 thumb_func_start sub_8117F10 @@ -572710,16 +553768,15 @@ sub_8117F10: @ 8117F10 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08117F28 - ldr r1, _08117F2C + ldr r2, =0x02038437 + ldr r1, =0x0202420c ldrb r1, [r1] strb r1, [r2] bl move_anim_task_del pop {r0} bx r0 .align 2, 0 -_08117F28: .4byte 0x02038437 -_08117F2C: .4byte 0x0202420c + .pool thumb_func_end sub_8117F10 thumb_func_start sub_8117F30 @@ -572727,22 +553784,19 @@ sub_8117F30: @ 8117F30 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08117F50 - ldr r1, _08117F54 + ldr r2, =0x02038436 + ldr r1, =0x0202420b ldrb r1, [r1] strb r1, [r2] - ldr r2, _08117F58 - ldr r1, _08117F5C + ldr r2, =0x02038437 + ldr r1, =0x0202420e ldrb r1, [r1] strb r1, [r2] bl move_anim_task_del pop {r0} bx r0 .align 2, 0 -_08117F50: .4byte 0x02038436 -_08117F54: .4byte 0x0202420b -_08117F58: .4byte 0x02038437 -_08117F5C: .4byte 0x0202420e + .pool thumb_func_end sub_8117F30 thumb_func_start sub_8117F60 @@ -572758,14 +553812,14 @@ sub_8117F60: @ 8117F60 bl move_anim_task_del b _08117FB4 _08117F78: - ldr r0, _08117FBC + ldr r0, =0x03005e00 lsls r3, r4, 2 adds r3, r4 lsls r3, 3 adds r3, r0 - ldr r0, _08117FC0 + ldr r0, =0x020244d0 ldr r4, [r0] - ldr r2, _08117FC4 + ldr r2, =0x02038436 ldrb r0, [r2] ldr r1, [r4] lsls r0, 2 @@ -572782,9 +553836,9 @@ _08117F78: movs r2, 0x1 orrs r0, r2 strb r0, [r1] - ldr r0, _08117FC8 + ldr r0, =sub_8117FD0 + 1 str r0, [r3] - ldr r1, _08117FCC + ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] @@ -572793,11 +553847,7 @@ _08117FB4: pop {r0} bx r0 .align 2, 0 -_08117FBC: .4byte 0x03005e00 -_08117FC0: .4byte 0x020244d0 -_08117FC4: .4byte 0x02038436 -_08117FC8: .4byte sub_8117FD0 + 1 -_08117FCC: .4byte 0x020383fe + .pool thumb_func_end sub_8117F60 thumb_func_start sub_8117FD0 @@ -572805,21 +553855,21 @@ sub_8117FD0: @ 8117FD0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0811801C + ldr r0, =0x0203841e movs r2, 0xE ldrsh r1, [r0, r2] movs r0, 0x80 lsls r0, 5 cmp r1, r0 bne _08118014 - ldr r0, _08118020 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _08118024 + ldr r0, =0x02038436 ldrb r3, [r0] ldr r0, [r1] lsls r3, 2 adds r3, r0 - ldr r1, _08118028 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -572840,10 +553890,7 @@ _08118014: pop {r0} bx r0 .align 2, 0 -_0811801C: .4byte 0x0203841e -_08118020: .4byte 0x020244d0 -_08118024: .4byte 0x02038436 -_08118028: .4byte 0x03005e00 + .pool thumb_func_end sub_8117FD0 thumb_func_start lcd_bg_operations @@ -572859,23 +553906,21 @@ lcd_bg_operations: @ 811802C bls _08118040 b _08118132 _08118040: - ldr r0, _0811805C + ldr r0, =0x0859741a adds r0, r6, r0 ldrb r0, [r0] bl lcd_io_get - ldr r1, _08118060 + ldr r1, =0x0203a114 strh r0, [r1] cmp r5, 0x6 bhi _08118124 lsls r0, r5, 2 - ldr r1, _08118064 + ldr r1, =_08118068 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811805C: .4byte 0x0859741a -_08118060: .4byte 0x0203a114 -_08118064: .4byte _08118068 + .pool .align 2, 0 _08118068: .4byte _08118084 @@ -572886,7 +553931,7 @@ _08118068: .4byte _081180FC .4byte _08118110 _08118084: - ldr r2, _08118094 + ldr r2, =0x0203a114 lsls r3, r4, 6 ldrb r1, [r2, 0x1] movs r0, 0x3F @@ -572895,9 +553940,9 @@ _08118084: strb r0, [r2, 0x1] b _08118124 .align 2, 0 -_08118094: .4byte 0x0203a114 + .pool _08118098: - ldr r3, _081180AC + ldr r3, =0x0203a114 movs r0, 0x1 adds r1, r4, 0 ands r1, r0 @@ -572907,9 +553952,9 @@ _08118098: negs r0, r0 b _0811811E .align 2, 0 -_081180AC: .4byte 0x0203a114 + .pool _081180B0: - ldr r3, _081180C4 + ldr r3, =0x0203a114 movs r0, 0x1 adds r1, r4, 0 ands r1, r0 @@ -572919,9 +553964,9 @@ _081180B0: negs r0, r0 b _081180EE .align 2, 0 -_081180C4: .4byte 0x0203a114 + .pool _081180C8: - ldr r3, _081180DC + ldr r3, =0x0203a114 movs r0, 0x3 adds r1, r4, 0 ands r1, r0 @@ -572931,9 +553976,9 @@ _081180C8: negs r0, r0 b _081180EE .align 2, 0 -_081180DC: .4byte 0x0203a114 + .pool _081180E0: - ldr r3, _081180F8 + ldr r3, =0x0203a114 movs r0, 0x3 adds r1, r4, 0 ands r1, r0 @@ -572946,9 +553991,9 @@ _081180EE: strb r0, [r3] b _08118124 .align 2, 0 -_081180F8: .4byte 0x0203a114 + .pool _081180FC: - ldr r2, _0811810C + ldr r2, =0x0203a114 lsls r3, r4, 7 ldrb r1, [r2] movs r0, 0x7F @@ -572957,9 +554002,9 @@ _081180FC: strb r0, [r2] b _08118124 .align 2, 0 -_0811810C: .4byte 0x0203a114 + .pool _08118110: - ldr r3, _08118138 + ldr r3, =0x0203a114 movs r0, 0x1F adds r1, r4, 0 ands r1, r0 @@ -572971,10 +554016,10 @@ _0811811E: orrs r0, r1 strb r0, [r3, 0x1] _08118124: - ldr r0, _0811813C + ldr r0, =0x0859741a adds r0, r6, r0 ldrb r0, [r0] - ldr r1, _08118138 + ldr r1, =0x0203a114 ldrh r1, [r1] bl lcd_io_set _08118132: @@ -572982,8 +554027,7 @@ _08118132: pop {r0} bx r0 .align 2, 0 -_08118138: .4byte 0x0203a114 -_0811813C: .4byte 0x0859741a + .pool thumb_func_end lcd_bg_operations thumb_func_start sub_8118140 @@ -572996,7 +554040,7 @@ sub_8118140: @ 8118140 lsrs r4, r1, 24 cmp r2, 0x3 bhi _081181C8 - ldr r0, _0811816C + ldr r0, =0x0859741e adds r0, r2, r0 ldrb r0, [r0] bl lcd_io_get @@ -573005,13 +554049,12 @@ sub_8118140: @ 8118140 cmp r4, 0x6 bhi _081181C8 lsls r0, r4, 2 - ldr r1, _08118170 + ldr r1, =_08118174 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811816C: .4byte 0x0859741e -_08118170: .4byte _08118174 + .pool .align 2, 0 _08118174: .4byte _08118190 @@ -573070,63 +554113,58 @@ battle_intro_launch: @ 81181D4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _081181F8 + ldr r2, =0x02022fec ldr r0, [r2] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 beq _08118208 - ldr r0, _081181FC + ldr r0, =0x02038bce ldrh r1, [r0] - ldr r0, _08118200 + ldr r0, =0x00000c03 cmp r1, r0 beq _08118208 - ldr r0, _08118204 + ldr r0, =sub_8118D68 + 1 b _08118258 .align 2, 0 -_081181F8: .4byte 0x02022fec -_081181FC: .4byte 0x02038bce -_08118200: .4byte 0x00000c03 -_08118204: .4byte sub_8118D68 + 1 + .pool _08118208: ldr r2, [r2] movs r0, 0x2 ands r0, r2 cmp r0, 0 beq _0811821C - ldr r0, _08118218 + ldr r0, =task00_battle_intro_wireless + 1 b _08118258 .align 2, 0 -_08118218: .4byte task00_battle_intro_wireless + 1 + .pool _0811821C: - ldr r0, _08118228 + ldr r0, =0x003f0100 ands r0, r2 cmp r0, 0 beq _08118230 - ldr r0, _0811822C + ldr r0, =task_battle_intro_anim + 1 b _08118258 .align 2, 0 -_08118228: .4byte 0x003f0100 -_0811822C: .4byte task_battle_intro_anim + 1 + .pool _08118230: movs r0, 0x80 lsls r0, 5 ands r2, r0 cmp r2, 0 beq _08118250 - ldr r0, _08118248 + ldr r0, =0x082e9530 ldrb r0, [r0] cmp r0, 0x2 beq _08118250 movs r4, 0x3 - ldr r0, _0811824C + ldr r0, =task00_battle_intro_80BC6C8 + 1 b _08118258 .align 2, 0 -_08118248: .4byte 0x082e9530 -_0811824C: .4byte task00_battle_intro_80BC6C8 + 1 + .pool _08118250: - ldr r1, _08118284 + ldr r1, =0x08597424 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] @@ -573135,7 +554173,7 @@ _08118258: bl AddTask lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08118288 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -573152,8 +554190,7 @@ _08118258: pop {r0} bx r0 .align 2, 0 -_08118284: .4byte 0x08597424 -_08118288: .4byte 0x03005e00 + .pool thumb_func_end battle_intro_launch thumb_func_start sub_811828C @@ -573162,14 +554199,14 @@ sub_811828C: @ 811828C lsls r0, 24 lsrs r0, 24 bl remove_task - ldr r0, _081182D8 + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r0, _081182DC + ldr r0, =0x02022e1a strh r1, [r0] - ldr r0, _081182E0 + ldr r0, =0x02022e1c strh r1, [r0] - ldr r0, _081182E4 + ldr r0, =0x02022e1e strh r1, [r0] movs r0, 0x50 movs r1, 0 @@ -573180,7 +554217,7 @@ sub_811828C: @ 811828C movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r4, _081182E8 + ldr r4, =0x00003f3f movs r0, 0x48 adds r1, r4, 0 bl lcd_io_set @@ -573191,11 +554228,7 @@ sub_811828C: @ 811828C pop {r0} bx r0 .align 2, 0 -_081182D8: .4byte 0x02022e18 -_081182DC: .4byte 0x02022e1a -_081182E0: .4byte 0x02022e1c -_081182E4: .4byte 0x02022e1e -_081182E8: .4byte 0x00003f3f + .pool thumb_func_end sub_811828C thumb_func_start task_battle_intro_80BC47C @@ -573207,11 +554240,11 @@ task_battle_intro_80BC47C: @ 81182EC sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08118324 + ldr r1, =0x02022e18 ldrh r0, [r1] adds r0, 0x6 strh r0, [r1] - ldr r1, _08118328 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -573224,14 +554257,12 @@ task_battle_intro_80BC47C: @ 81182EC b _0811852A _08118318: lsls r0, 2 - ldr r1, _0811832C + ldr r1, =_08118330 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08118324: .4byte 0x02022e18 -_08118328: .4byte 0x03005e00 -_0811832C: .4byte _08118330 + .pool .align 2, 0 _08118330: .4byte _08118344 @@ -573240,7 +554271,7 @@ _08118330: .4byte _081183E4 .4byte _08118524 _08118344: - ldr r0, _0811835C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -573253,7 +554284,7 @@ _08118344: movs r1, 0x10 b _0811836A .align 2, 0 -_0811835C: .4byte 0x02022fec + .pool _08118360: lsls r0, r4, 2 adds r0, r4 @@ -573288,7 +554319,7 @@ _0811838C: bl lcd_io_set b _0811852A _0811839C: - ldr r1, _081183D8 + ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -573312,16 +554343,14 @@ _081183B4: strh r0, [r1, 0xC] movs r0, 0x20 strh r0, [r1, 0xE] - ldr r2, _081183DC + ldr r2, =0x020243fc ldrh r1, [r2] - ldr r0, _081183E0 + ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] b _0811852A .align 2, 0 -_081183D8: .4byte 0x02022e26 -_081183DC: .4byte 0x020243fc -_081183E0: .4byte 0x0000fffe + .pool _081183E4: lsls r0, r4, 2 adds r1, r0, r4 @@ -573342,34 +554371,33 @@ _08118400: ldrsh r0, [r2, r1] cmp r0, 0x1 bne _08118420 - ldr r2, _08118418 + ldr r2, =0x02022e1a ldrh r1, [r2] - ldr r0, _0811841C + ldr r0, =0x0000ffb0 cmp r1, r0 beq _0811842E subs r0, r1, 0x2 b _0811842C .align 2, 0 -_08118418: .4byte 0x02022e1a -_0811841C: .4byte 0x0000ffb0 + .pool _08118420: - ldr r2, _08118500 + ldr r2, =0x02022e1a ldrh r1, [r2] - ldr r0, _08118504 + ldr r0, =0x0000ffc8 cmp r1, r0 beq _0811842E subs r0, r1, 0x1 _0811842C: strh r0, [r2] _0811842E: - ldr r2, _08118508 + ldr r2, =0x02022e26 ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 ands r0, r1 cmp r0, 0 beq _08118442 - ldr r3, _0811850C + ldr r3, =0xfffffc04 adds r0, r1, r3 strh r0, [r2] _08118442: @@ -573387,9 +554415,9 @@ _08118442: strh r0, [r1, 0xC] _0811845A: movs r3, 0 - ldr r5, _08118510 + ldr r5, =0x02039b28 mov r9, r5 - ldr r7, _08118514 + ldr r7, =0x02038c28 mov r6, r9 adds r5, r1, 0 _08118466: @@ -573407,9 +554435,9 @@ _08118466: ble _08118466 cmp r3, 0x9F bgt _081184AA - ldr r7, _08118514 - ldr r6, _08118510 - ldr r1, _08118518 + ldr r7, =0x02038c28 + ldr r6, =0x02039b28 + ldr r1, =0x03005e00 mov r2, r12 adds r0, r2, r4 lsls r0, 3 @@ -573445,8 +554473,8 @@ _081184AA: adds r0, 0x1 strh r0, [r1, 0x8] str r2, [sp] - ldr r1, _0811851C - ldr r2, _08118520 + ldr r1, =0x0600e000 + ldr r2, =0x05000200 mov r0, sp bl CpuSet movs r0, 0x1 @@ -573467,15 +554495,7 @@ _081184AA: bl lcd_io_set b _0811852A .align 2, 0 -_08118500: .4byte 0x02022e1a -_08118504: .4byte 0x0000ffc8 -_08118508: .4byte 0x02022e26 -_0811850C: .4byte 0xfffffc04 -_08118510: .4byte 0x02039b28 -_08118514: .4byte 0x02038c28 -_08118518: .4byte 0x03005e00 -_0811851C: .4byte 0x0600e000 -_08118520: .4byte 0x05000200 + .pool _08118524: adds r0, r4, 0 bl sub_811828C @@ -573497,7 +554517,7 @@ task00_battle_intro_80BC6C8: @ 8118538 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08118564 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -573513,19 +554533,19 @@ task00_battle_intro_80BC6C8: @ 8118538 beq _0811856C b _08118580 .align 2, 0 -_08118564: .4byte 0x03005e00 + .pool _08118568: cmp r0, 0x4 bne _08118580 _0811856C: - ldr r1, _08118574 + ldr r1, =0x02022e18 ldrh r0, [r1] adds r0, 0x8 b _0811857E .align 2, 0 -_08118574: .4byte 0x02022e18 + .pool _08118578: - ldr r1, _081185BC + ldr r1, =0x02022e18 ldrh r0, [r1] adds r0, 0x6 _0811857E: @@ -573540,14 +554560,14 @@ _08118580: adds r6, r0, 0 cmp r1, 0x4 bne _081185E4 - ldr r7, _081185C0 + ldr r7, =0x02022e1a ldrh r0, [r4, 0x14] bl cosine2 lsls r0, 16 asrs r0, 16 cmp r0, 0 bge _081185A6 - ldr r1, _081185C4 + ldr r1, =0x000001ff adds r0, r1 _081185A6: asrs r0, 9 @@ -573561,14 +554581,12 @@ _081185A6: adds r0, r1, 0x4 b _081185CA .align 2, 0 -_081185BC: .4byte 0x02022e18 -_081185C0: .4byte 0x02022e1a -_081185C4: .4byte 0x000001ff + .pool _081185C8: adds r0, r1, 0x6 _081185CA: strh r0, [r4, 0x14] - ldr r2, _08118600 + ldr r2, =0x03005e00 adds r0, r6, r5 lsls r0, 3 adds r3, r0, r2 @@ -573591,13 +554609,12 @@ _081185E4: b _0811881A _081185F4: lsls r0, 2 - ldr r1, _08118604 + ldr r1, =_08118608 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08118600: .4byte 0x03005e00 -_08118604: .4byte _08118608 + .pool .align 2, 0 _08118608: .4byte _0811861C @@ -573606,13 +554623,13 @@ _08118608: .4byte _081186C8 .4byte _08118814 _0811861C: - ldr r1, _08118638 + ldr r1, =0x03005e00 adds r0, r6, r5 lsls r0, 3 adds r2, r0, r1 movs r3, 0x10 strh r3, [r2, 0x10] - ldr r0, _0811863C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -573621,8 +554638,7 @@ _0811861C: strh r3, [r2, 0xC] b _08118644 .align 2, 0 -_08118638: .4byte 0x03005e00 -_0811863C: .4byte 0x02022fec + .pool _08118640: movs r0, 0x1 strh r0, [r2, 0xC] @@ -573632,7 +554648,7 @@ _08118644: strh r0, [r2, 0x8] b _0811881A _0811864C: - ldr r0, _08118674 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -573652,9 +554668,9 @@ _08118662: bl lcd_io_set b _0811881A .align 2, 0 -_08118674: .4byte 0x03005e00 + .pool _08118678: - ldr r1, _081186B8 + ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -573667,7 +554683,7 @@ _08118678: beq _08118690 b _0811881A _08118690: - ldr r0, _081186BC + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -573680,19 +554696,16 @@ _08118690: strh r0, [r1, 0xE] movs r0, 0x1 strh r0, [r1, 0x12] - ldr r2, _081186C0 + ldr r2, =0x020243fc ldrh r1, [r2] - ldr r0, _081186C4 + ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] b _0811881A .align 2, 0 -_081186B8: .4byte 0x02022e26 -_081186BC: .4byte 0x03005e00 -_081186C0: .4byte 0x020243fc -_081186C4: .4byte 0x0000fffe + .pool _081186C8: - ldr r0, _08118700 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -573706,7 +554719,7 @@ _081186C8: lsls r0, 16 cmp r0, 0 bne _08118728 - ldr r1, _08118704 + ldr r1, =0x00001842 movs r0, 0x50 bl lcd_io_set movs r0, 0x52 @@ -573717,8 +554730,7 @@ _081186C8: bl lcd_io_set b _08118728 .align 2, 0 -_08118700: .4byte 0x03005e00 -_08118704: .4byte 0x00001842 + .pool _08118708: ldrh r2, [r1, 0x10] movs r0, 0x1F @@ -573737,18 +554749,18 @@ _08118708: movs r0, 0x4 strh r0, [r1, 0x12] _08118728: - ldr r2, _081187F8 + ldr r2, =0x02022e26 ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 ands r0, r1 cmp r0, 0 beq _0811873C - ldr r3, _081187FC + ldr r3, =0xfffffc04 adds r0, r1, r3 strh r0, [r2] _0811873C: - ldr r0, _08118800 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -573761,9 +554773,9 @@ _0811873C: strh r0, [r1, 0xC] _08118752: movs r3, 0 - ldr r0, _08118804 + ldr r0, =0x02039b28 mov r8, r0 - ldr r2, _08118808 + ldr r2, =0x02038c28 mov r12, r2 mov r7, r8 adds r4, r1, 0 @@ -573782,10 +554794,10 @@ _08118760: ble _08118760 cmp r3, 0x9F bgt _081187A4 - ldr r0, _08118808 + ldr r0, =0x02038c28 mov r12, r0 - ldr r7, _08118804 - ldr r1, _08118800 + ldr r7, =0x02039b28 + ldr r1, =0x03005e00 adds r0, r6, r5 lsls r0, 3 adds r4, r0, r1 @@ -573804,7 +554816,7 @@ _0811878A: cmp r3, 0x9F ble _0811878A _081187A4: - ldr r1, _08118800 + ldr r1, =0x03005e00 adds r0, r6, r5 lsls r0, 3 adds r1, r0, r1 @@ -573819,8 +554831,8 @@ _081187A4: adds r0, 0x1 strh r0, [r1, 0x8] str r2, [sp] - ldr r1, _0811880C - ldr r2, _08118810 + ldr r1, =0x0600e000 + ldr r2, =0x05000200 mov r0, sp bl CpuSet movs r0, 0x1 @@ -573841,18 +554853,12 @@ _081187A4: bl lcd_io_set b _0811881A .align 2, 0 -_081187F8: .4byte 0x02022e26 -_081187FC: .4byte 0xfffffc04 -_08118800: .4byte 0x03005e00 -_08118804: .4byte 0x02039b28 -_08118808: .4byte 0x02038c28 -_0811880C: .4byte 0x0600e000 -_08118810: .4byte 0x05000200 + .pool _08118814: adds r0, r5, 0 bl sub_811828C _0811881A: - ldr r0, _08118840 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -573871,7 +554877,7 @@ _08118832: pop {r0} bx r0 .align 2, 0 -_08118840: .4byte 0x03005e00 + .pool thumb_func_end task00_battle_intro_80BC6C8 thumb_func_start task_battle_intro_anim @@ -573882,11 +554888,11 @@ task_battle_intro_anim: @ 8118844 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08118878 + ldr r1, =0x02022e18 ldrh r0, [r1] adds r0, 0x8 strh r0, [r1] - ldr r1, _0811887C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -573899,14 +554905,12 @@ task_battle_intro_anim: @ 8118844 b _08118A96 _0811886E: lsls r0, 2 - ldr r1, _08118880 + ldr r1, =_08118884 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08118878: .4byte 0x02022e18 -_0811887C: .4byte 0x03005e00 -_08118880: .4byte _08118884 + .pool .align 2, 0 _08118884: .4byte _08118898 @@ -573915,36 +554919,32 @@ _08118884: .4byte _0811896C .4byte _08118A90 _08118898: - ldr r1, _081188D0 + ldr r1, =0x00001842 movs r0, 0x50 bl lcd_io_set - ldr r4, _081188D4 + ldr r4, =0x00000808 movs r0, 0x52 adds r1, r4, 0 bl lcd_io_set movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r1, _081188D8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r2, r0, r1 strh r4, [r2, 0x10] - ldr r0, _081188DC + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _081188E0 + ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 beq _081188E4 movs r0, 0x10 b _081188E6 .align 2, 0 -_081188D0: .4byte 0x00001842 -_081188D4: .4byte 0x00000808 -_081188D8: .4byte 0x03005e00 -_081188DC: .4byte 0x02022fec -_081188E0: .4byte 0x02000002 + .pool _081188E4: movs r0, 0x1 _081188E6: @@ -573954,7 +554954,7 @@ _081188E6: strh r0, [r2, 0x8] b _08118A96 _081188F0: - ldr r0, _08118918 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -573975,9 +554975,9 @@ _08118908: bl lcd_io_set b _08118A96 .align 2, 0 -_08118918: .4byte 0x03005e00 + .pool _0811891C: - ldr r1, _0811895C + ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -573990,7 +554990,7 @@ _0811891C: beq _08118934 b _08118A96 _08118934: - ldr r0, _08118960 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -574004,17 +555004,14 @@ _08118934: strh r0, [r1, 0xE] movs r0, 0x1 strh r0, [r1, 0x12] - ldr r2, _08118964 + ldr r2, =0x020243fc ldrh r1, [r2] - ldr r0, _08118968 + ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] b _08118A96 .align 2, 0 -_0811895C: .4byte 0x02022e26 -_08118960: .4byte 0x03005e00 -_08118964: .4byte 0x020243fc -_08118968: .4byte 0x0000fffe + .pool _0811896C: lsls r0, r5, 2 adds r1, r0, r5 @@ -574047,14 +555044,14 @@ _08118986: movs r0, 0x6 strh r0, [r2, 0x12] _081189A6: - ldr r2, _08118A74 + ldr r2, =0x02022e26 ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 ands r0, r1 cmp r0, 0 beq _081189BA - ldr r3, _08118A78 + ldr r3, =0xfffffc04 adds r0, r1, r3 strh r0, [r2] _081189BA: @@ -574071,9 +555068,9 @@ _081189BA: strh r0, [r1, 0xC] _081189D0: movs r3, 0 - ldr r6, _08118A7C + ldr r6, =0x02039b28 mov r8, r6 - ldr r7, _08118A80 + ldr r7, =0x02038c28 adds r4, r1, 0 _081189DA: lsls r2, r3, 1 @@ -574090,9 +555087,9 @@ _081189DA: ble _081189DA cmp r3, 0x9F bgt _08118A1E - ldr r7, _08118A80 - ldr r6, _08118A7C - ldr r1, _08118A84 + ldr r7, =0x02038c28 + ldr r6, =0x02039b28 + ldr r1, =0x03005e00 mov r2, r12 adds r0, r2, r5 lsls r0, 3 @@ -574112,7 +555109,7 @@ _08118A04: cmp r3, 0x9F ble _08118A04 _08118A1E: - ldr r1, _08118A84 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -574128,8 +555125,8 @@ _08118A1E: adds r0, 0x1 strh r0, [r1, 0x8] str r2, [sp] - ldr r1, _08118A88 - ldr r2, _08118A8C + ldr r1, =0x0600e000 + ldr r2, =0x05000200 mov r0, sp bl CpuSet movs r0, 0x1 @@ -574150,18 +555147,12 @@ _08118A1E: bl lcd_io_set b _08118A96 .align 2, 0 -_08118A74: .4byte 0x02022e26 -_08118A78: .4byte 0xfffffc04 -_08118A7C: .4byte 0x02039b28 -_08118A80: .4byte 0x02038c28 -_08118A84: .4byte 0x03005e00 -_08118A88: .4byte 0x0600e000 -_08118A8C: .4byte 0x05000200 + .pool _08118A90: adds r0, r5, 0 bl sub_811828C _08118A96: - ldr r0, _08118ABC + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -574181,7 +555172,7 @@ _08118AB0: pop {r0} bx r0 .align 2, 0 -_08118ABC: .4byte 0x03005e00 + .pool thumb_func_end task_battle_intro_anim thumb_func_start task00_battle_intro_wireless @@ -574193,7 +555184,7 @@ task00_battle_intro_wireless: @ 8118AC0 sub sp, 0x8 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08118B0C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -574206,7 +555197,7 @@ task00_battle_intro_wireless: @ 8118AC0 ldrsh r0, [r7, r2] cmp r0, 0 bne _08118B36 - ldr r2, _08118B10 + ldr r2, =0x02022e18 ldrh r1, [r2] movs r0, 0x80 lsls r0, 8 @@ -574220,31 +555211,29 @@ task00_battle_intro_wireless: @ 8118AC0 _08118AFE: adds r0, r1, 0x3 strh r0, [r2] - ldr r1, _08118B14 + ldr r1, =0x02022e1c ldrh r0, [r1] subs r0, 0x3 strh r0, [r1] b _08118B36 .align 2, 0 -_08118B0C: .4byte 0x03005e00 -_08118B10: .4byte 0x02022e18 -_08118B14: .4byte 0x02022e1c + .pool _08118B18: str r5, [sp] - ldr r1, _08118B58 - ldr r4, _08118B5C + ldr r1, =0x0600e000 + ldr r4, =0x05000200 mov r0, sp adds r2, r4, 0 bl CpuSet str r5, [sp, 0x4] add r0, sp, 0x4 - ldr r1, _08118B60 + ldr r1, =0x0600f000 adds r2, r4, 0 bl CpuSet movs r0, 0x1 strh r0, [r7, 0x10] _08118B36: - ldr r0, _08118B64 + ldr r0, =0x03005e00 lsls r2, r6, 2 adds r1, r2, r6 lsls r1, 3 @@ -574258,16 +555247,12 @@ _08118B36: b _08118D5A _08118B4E: lsls r0, r1, 2 - ldr r1, _08118B68 + ldr r1, =_08118B6C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08118B58: .4byte 0x0600e000 -_08118B5C: .4byte 0x05000200 -_08118B60: .4byte 0x0600f000 -_08118B64: .4byte 0x03005e00 -_08118B68: .4byte _08118B6C + .pool .align 2, 0 _08118B6C: .4byte _08118B80 @@ -574301,8 +555286,8 @@ _08118BA8: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - ldr r4, _08118C28 - ldr r5, _08118C2C + ldr r4, =0x02020630 + ldr r5, =0x0202449c ldr r0, [r5] adds r0, 0x7D ldrb r0, [r0] @@ -574331,7 +555316,7 @@ _08118BA8: adds r1, r4 mov r8, r1 add r0, r8 - ldr r6, _08118C30 + ldr r6, =sub_8038B74 + 1 str r6, [r0] adds r3, 0x7E ldrb r1, [r3] @@ -574355,17 +555340,14 @@ _08118BA8: movs r0, 0x48 movs r1, 0x3F bl lcd_io_set - ldr r1, _08118C34 + ldr r1, =0x00003f06 movs r0, 0x4A bl lcd_io_set b _08118D5A .align 2, 0 -_08118C28: .4byte 0x02020630 -_08118C2C: .4byte 0x0202449c -_08118C30: .4byte sub_8038B74 + 1 -_08118C34: .4byte 0x00003f06 + .pool _08118C38: - ldr r1, _08118C70 + ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF strh r0, [r1] @@ -574388,25 +555370,23 @@ _08118C50: strh r0, [r1, 0xC] movs r0, 0x20 strh r0, [r1, 0xE] - ldr r2, _08118C74 + ldr r2, =0x020243fc ldrh r1, [r2] - ldr r0, _08118C78 + ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] b _08118D5A .align 2, 0 -_08118C70: .4byte 0x02022e26 -_08118C74: .4byte 0x020243fc -_08118C78: .4byte 0x0000fffe + .pool _08118C7C: - ldr r2, _08118D40 + ldr r2, =0x02022e26 ldrh r1, [r2] movs r0, 0xFF lsls r0, 8 ands r0, r1 cmp r0, 0 beq _08118C90 - ldr r3, _08118D44 + ldr r3, =0xfffffc04 adds r0, r1, r3 strh r0, [r2] _08118C90: @@ -574423,9 +555403,9 @@ _08118C90: strh r0, [r1, 0xC] _08118CA6: movs r3, 0 - ldr r0, _08118D48 + ldr r0, =0x02039b28 mov r12, r0 - ldr r2, _08118D4C + ldr r2, =0x02038c28 mov r8, r2 mov r7, r12 adds r4, r1, 0 @@ -574444,10 +555424,10 @@ _08118CB4: ble _08118CB4 cmp r3, 0x9F bgt _08118CF8 - ldr r0, _08118D4C + ldr r0, =0x02038c28 mov r8, r0 - ldr r7, _08118D48 - ldr r1, _08118D50 + ldr r7, =0x02039b28 + ldr r1, =0x03005e00 adds r0, r5, r6 lsls r0, 3 adds r4, r0, r1 @@ -574498,11 +555478,7 @@ _08118CF8: bl lcd_io_set b _08118D5A .align 2, 0 -_08118D40: .4byte 0x02022e26 -_08118D44: .4byte 0xfffffc04 -_08118D48: .4byte 0x02039b28 -_08118D4C: .4byte 0x02038c28 -_08118D50: .4byte 0x03005e00 + .pool _08118D54: adds r0, r6, 0 bl sub_811828C @@ -574522,7 +555498,7 @@ sub_8118D68: @ 8118D68 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08118D90 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -574535,13 +555511,12 @@ sub_8118D68: @ 8118D68 b _08118FB2 _08118D86: lsls r0, 2 - ldr r1, _08118D94 + ldr r1, =_08118D98 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08118D90: .4byte 0x03005e00 -_08118D94: .4byte _08118D98 + .pool .align 2, 0 _08118D98: .4byte _08118DB0 @@ -574574,16 +555549,16 @@ _08118DD4: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - ldr r1, _08118E2C + ldr r1, =0x00005c0a movs r0, 0xA bl lcd_io_set - ldr r1, _08118E30 + ldr r1, =0x00005e0a movs r0, 0xC bl lcd_io_set movs r0, 0 bl lcd_io_get adds r1, r0, 0 - ldr r2, _08118E34 + ldr r2, =0x0000f040 adds r0, r2, 0 orrs r1, r0 lsls r1, 16 @@ -574594,32 +555569,25 @@ _08118DD4: lsls r1, 6 movs r0, 0x48 bl lcd_io_set - ldr r1, _08118E38 + ldr r1, =0x00003f3f movs r0, 0x4A bl lcd_io_set - ldr r1, _08118E3C - ldr r2, _08118E40 + ldr r1, =0x02022e16 + ldr r2, =0x0000ffd0 adds r0, r2, 0 strh r0, [r1] - ldr r1, _08118E44 + ldr r1, =0x02022e18 movs r0, 0xF0 strh r0, [r1] - ldr r1, _08118E48 + ldr r1, =0x02022e1c subs r2, 0xC0 adds r0, r2, 0 strh r0, [r1] b _08118FB2 .align 2, 0 -_08118E2C: .4byte 0x00005c0a -_08118E30: .4byte 0x00005e0a -_08118E34: .4byte 0x0000f040 -_08118E38: .4byte 0x00003f3f -_08118E3C: .4byte 0x02022e16 -_08118E40: .4byte 0x0000ffd0 -_08118E44: .4byte 0x02022e18 -_08118E48: .4byte 0x02022e1c + .pool _08118E4C: - ldr r2, _08118E9C + ldr r2, =0x02022e26 ldrh r3, [r2] movs r1, 0x80 lsls r1, 1 @@ -574655,18 +555623,16 @@ _08118E7E: strh r0, [r1, 0x8] movs r0, 0xF0 strh r0, [r1, 0xC] - ldr r2, _08118EA0 + ldr r2, =0x020243fc ldrh r1, [r2] - ldr r0, _08118EA4 + ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] b _08118FB2 .align 2, 0 -_08118E9C: .4byte 0x02022e26 -_08118EA0: .4byte 0x020243fc -_08118EA4: .4byte 0x0000fffe + .pool _08118EA8: - ldr r3, _08118EF4 + ldr r3, =0x02022e26 ldrh r2, [r3] movs r0, 0xFF lsls r0, 8 @@ -574692,10 +555658,10 @@ _08118EC2: subs r0, r1, 0x2 strh r0, [r3, 0xC] _08118ED8: - ldr r1, _08118EF8 + ldr r1, =0x02022e18 ldrh r0, [r3, 0xC] strh r0, [r1] - ldr r2, _08118EFC + ldr r2, =0x02022e1c negs r1, r0 strh r1, [r2] lsls r0, 16 @@ -574706,19 +555672,17 @@ _08118ED8: strh r0, [r3, 0x8] b _08118FB2 .align 2, 0 -_08118EF4: .4byte 0x02022e26 -_08118EF8: .4byte 0x02022e18 -_08118EFC: .4byte 0x02022e1c + .pool _08118F00: - ldr r1, _08118F8C + ldr r1, =0x02022e16 ldrh r0, [r1] adds r3, r0, 0x2 strh r3, [r1] - ldr r1, _08118F90 + ldr r1, =0x02022e1e ldrh r0, [r1] adds r0, 0x2 strh r0, [r1] - ldr r5, _08118F94 + ldr r5, =0x02022e26 ldrh r2, [r5] movs r0, 0xFF lsls r0, 8 @@ -574736,13 +555700,13 @@ _08118F28: cmp r0, 0 bne _08118FB2 str r0, [sp] - ldr r1, _08118F98 - ldr r2, _08118F9C + ldr r1, =0x0600e000 + ldr r2, =0x05000800 mov r0, sp bl CpuSet movs r0, 0 bl lcd_io_get - ldr r1, _08118FA0 + ldr r1, =0x0000bfff ands r1, r0 movs r0, 0 bl lcd_io_set @@ -574762,10 +555726,10 @@ _08118F28: lsls r1, 7 movs r0, 0xC bl lcd_io_set - ldr r1, _08118FA4 + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] - ldr r1, _08118FA8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -574776,14 +555740,7 @@ _08118F84: strh r1, [r0, 0x8] b _08118FB2 .align 2, 0 -_08118F8C: .4byte 0x02022e16 -_08118F90: .4byte 0x02022e1e -_08118F94: .4byte 0x02022e26 -_08118F98: .4byte 0x0600e000 -_08118F9C: .4byte 0x05000800 -_08118FA0: .4byte 0x0000bfff -_08118FA4: .4byte 0x02039b28 -_08118FA8: .4byte 0x03005e00 + .pool _08118FAC: adds r0, r4, 0 bl sub_811828C @@ -574826,12 +555783,12 @@ sub_8118FBC: @ 8118FBC bl battle_get_side_with_given_state lsls r0, 24 lsrs r0, 24 - ldr r1, _0811908C + ldr r1, =0x020244d4 ldr r2, [r1] lsls r4, 2 adds r2, 0x4 adds r2, r4 - ldr r1, _08119090 + ldr r1, =0x020244e4 adds r0, r1 ldrb r1, [r0] lsls r1, 11 @@ -574900,8 +555857,7 @@ _08119068: pop {r0} bx r0 .align 2, 0 -_0811908C: .4byte 0x020244d4 -_08119090: .4byte 0x020244e4 + .pool thumb_func_end sub_8118FBC thumb_func_start sub_8119094 @@ -574935,8 +555891,8 @@ sub_8119094: @ 8119094 mov r0, r9 lsls r0, 24 mov r9, r0 - ldr r4, _08119158 - ldr r0, _0811915C + ldr r4, =0x040000d4 + ldr r0, =0x020244d4 ldr r0, [r0] lsrs r2, 22 adds r0, 0x4 @@ -574949,7 +555905,7 @@ sub_8119094: @ 8119094 lsls r0, 19 adds r6, r0 str r6, [r4, 0x4] - ldr r0, _08119160 + ldr r0, =0x80000400 str r0, [r4, 0x8] ldr r0, [r4, 0x8] adds r2, r7, 0 @@ -575009,9 +555965,7 @@ _08119148: pop {r0} bx r0 .align 2, 0 -_08119158: .4byte 0x040000d4 -_0811915C: .4byte 0x020244d4 -_08119160: .4byte 0x80000400 + .pool thumb_func_end sub_8119094 thumb_func_start dp04_initiate_movement @@ -575023,7 +555977,7 @@ dp04_initiate_movement: @ 8119164 lsrs r4, r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r0, _08119188 + ldr r0, =0x02037590 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 @@ -575034,7 +555988,7 @@ dp04_initiate_movement: @ 8119164 bl invoke_player_npc_state_changer_chooser b _08119194 .align 2, 0 -_08119188: .4byte 0x02037590 + .pool _0811918C: adds r0, r3, 0 adds r1, r4, 0 @@ -575051,7 +556005,7 @@ invoke_player_npc_state_changer_chooser: @ 811919C sub sp, 0x4 mov r1, sp strb r0, [r1] - ldr r4, _081191C8 + ldr r4, =0x0859744c mov r0, sp bl sub_81191CC lsls r0, 24 @@ -575067,7 +556021,7 @@ invoke_player_npc_state_changer_chooser: @ 811919C pop {r0} bx r0 .align 2, 0 -_081191C8: .4byte 0x0859744c + .pool thumb_func_end invoke_player_npc_state_changer_chooser thumb_func_start sub_81191CC @@ -575082,7 +556036,7 @@ sub_81191CC: @ 81191CC cmp r1, 0 bne _081191F4 strb r0, [r4] - ldr r2, _081191F0 + ldr r2, =0x02037590 ldrb r0, [r2, 0xB] cmp r0, 0 bne _08119208 @@ -575090,9 +556044,9 @@ sub_81191CC: @ 81191CC movs r0, 0 b _0811921C .align 2, 0 -_081191F0: .4byte 0x02037590 + .pool _081191F4: - ldr r2, _08119210 + ldr r2, =0x02037590 cmp r1, r3 beq _08119218 ldrb r0, [r2, 0x2] @@ -575108,7 +556062,7 @@ _08119208: movs r0, 0x3 b _0811921C .align 2, 0 -_08119210: .4byte 0x02037590 + .pool _08119214: movs r0, 0x1 b _0811921A @@ -575138,12 +556092,12 @@ sub_8119238: @ 8119238 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08119268 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0811926C + ldr r1, =0x02037350 adds r4, r0, r1 ldrb r1, [r4, 0x1E] adds r0, r5, 0 @@ -575156,8 +556110,7 @@ sub_8119238: @ 8119238 bl sub_811A128 b _0811927A .align 2, 0 -_08119268: .4byte 0x02037590 -_0811926C: .4byte 0x02037350 + .pool _08119270: ldrb r0, [r4, 0x18] lsls r0, 28 @@ -575175,12 +556128,12 @@ sub_8119280: @ 8119280 lsls r0, 24 lsrs r5, r0, 24 adds r7, r5, 0 - ldr r6, _081192B4 + ldr r6, =0x02037590 ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081192B8 + ldr r1, =0x02037350 adds r4, r0, r1 ldrb r1, [r4, 0x1E] adds r0, r5, 0 @@ -575196,8 +556149,7 @@ sub_8119280: @ 8119280 bl npc_state_reaction_to_tile b _0811933A .align 2, 0 -_081192B4: .4byte 0x02037590 -_081192B8: .4byte 0x02037350 + .pool _081192BC: ldrb r0, [r4, 0x18] lsrs r0, 4 @@ -575241,7 +556193,7 @@ _08119304: bl tile_sound_react b _0811933A _08119316: - ldr r1, _08119340 + ldr r1, =0x0859745c ldrb r0, [r6, 0xA] lsls r0, 2 adds r0, r1 @@ -575263,7 +556215,7 @@ _0811933A: pop {r0} bx r0 .align 2, 0 -_08119340: .4byte 0x0859745c + .pool thumb_func_end sub_8119280 thumb_func_start npc_state_reaction_to_tile @@ -575272,7 +556224,7 @@ npc_state_reaction_to_tile: @ 8119344 lsls r0, 24 lsrs r5, r0, 24 adds r7, r5, 0 - ldr r6, _0811937C + ldr r6, =0x02037590 ldrb r0, [r6, 0xB] cmp r0, 0 beq _0811935A @@ -575296,7 +556248,7 @@ _0811935A: bl npc_use_some_d2s_and_sound b _081193BE .align 2, 0 -_0811937C: .4byte 0x02037590 + .pool _08119380: bl sub_811A128 cmp r4, 0x4 @@ -575319,7 +556271,7 @@ _0811939C: bl tile_sound_react b _081193BE _081193AE: - ldr r0, _081193C4 + ldr r0, =0x0859745c ldrb r1, [r6, 0xA] lsls r1, 2 adds r1, r0 @@ -575331,7 +556283,7 @@ _081193BE: pop {r0} bx r0 .align 2, 0 -_081193C4: .4byte 0x0859745c + .pool thumb_func_end npc_state_reaction_to_tile thumb_func_start sub_81193C8 @@ -575344,7 +556296,7 @@ sub_81193C8: @ 81193C8 lsrs r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r4, _081193FC + ldr r4, =0x08597468 mov r0, sp bl sub_8119400 lsls r0, 24 @@ -575360,7 +556312,7 @@ sub_81193C8: @ 81193C8 pop {r0} bx r0 .align 2, 0 -_081193FC: .4byte 0x08597468 + .pool thumb_func_end sub_81193C8 thumb_func_start sub_8119400 @@ -575370,8 +556322,8 @@ sub_8119400: @ 8119400 lsrs r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r4, _08119424 - ldr r3, _08119428 + ldr r4, =0x0859749c + ldr r3, =0x02037590 ldrb r3, [r3, 0x8] lsls r3, 2 adds r3, r4 @@ -575383,8 +556335,7 @@ sub_8119400: @ 8119400 pop {r1} bx r1 .align 2, 0 -_08119424: .4byte 0x0859749c -_08119428: .4byte 0x02037590 + .pool thumb_func_end sub_8119400 thumb_func_start sub_811942C @@ -575398,7 +556349,7 @@ sub_811942C: @ 811942C bl player_get_direction_upper_4bits lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _08119460 + ldr r2, =0x02037590 movs r0, 0 strb r0, [r2, 0xA] ldrb r1, [r4] @@ -575415,7 +556366,7 @@ sub_811942C: @ 811942C movs r0, 0x3 b _081194C0 .align 2, 0 -_08119460: .4byte 0x02037590 + .pool _08119464: strb r3, [r4] strb r1, [r2, 0x2] @@ -575439,11 +556390,11 @@ _0811946C: b _081194C0 _0811948A: ldrb r0, [r4] - ldr r2, _081194B8 + ldr r2, =0x02037590 cmp r0, r3 beq _081194BC _08119492: - ldr r0, _081194B8 + ldr r0, =0x02037590 ldrb r1, [r0, 0x2] adds r2, r0, 0 cmp r1, 0x2 @@ -575462,7 +556413,7 @@ _08119492: lsrs r0, 24 b _081194C0 .align 2, 0 -_081194B8: .4byte 0x02037590 + .pool _081194BC: movs r0, 0x2 strb r0, [r2, 0x2] @@ -575476,7 +556427,7 @@ _081194C0: sub_81194C8: @ 81194C8 push {r4-r6,lr} adds r5, r0, 0 - ldr r4, _081194F0 + ldr r4, =0x02037590 ldrb r0, [r4, 0x9] strb r0, [r5] ldrb r0, [r4, 0xA] @@ -575494,7 +556445,7 @@ sub_81194C8: @ 81194C8 movs r0, 0x1 b _0811953A .align 2, 0 -_081194F0: .4byte 0x02037590 + .pool _081194F4: bl player_get_direction_upper_4bits lsls r0, 24 @@ -575544,12 +556495,12 @@ sub_8119540: @ 8119540 bl player_get_direction_upper_4bits lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _0811958C + ldr r5, =0x02037590 ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08119590 + ldr r1, =0x02037350 adds r1, r0, r1 movs r0, 0 strb r0, [r5, 0x2] @@ -575572,14 +556523,13 @@ sub_8119540: @ 8119540 movs r0, 0x4 b _081195D8 .align 2, 0 -_0811958C: .4byte 0x02037590 -_08119590: .4byte 0x02037350 + .pool _08119594: ldrb r0, [r5, 0xA] adds r0, 0x1 strb r0, [r5, 0xA] _0811959A: - ldr r1, _081195B0 + ldr r1, =0x02037590 ldrb r0, [r1, 0xA] cmp r0, 0x27 bls _081195B4 @@ -575590,7 +556540,7 @@ _0811959A: movs r0, 0x6 b _081195D8 .align 2, 0 -_081195B0: .4byte 0x02037590 + .pool _081195B4: ldrb r0, [r7] cmp r0, r6 @@ -575635,12 +556585,12 @@ sub_81195E0: @ 81195E0 lsls r0, 24 lsrs r5, r0, 24 adds r2, r5, 0 - ldr r4, _08119640 + ldr r4, =0x02037590 ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08119644 + ldr r1, =0x02037350 adds r7, r0, r1 movs r0, 0x2 mov r1, r8 @@ -575664,8 +556614,7 @@ sub_81195E0: @ 81195E0 lsrs r0, 24 b _08119676 .align 2, 0 -_08119640: .4byte 0x02037590 -_08119644: .4byte 0x02037350 + .pool _08119648: strb r5, [r6] strb r0, [r4, 0x2] @@ -575690,7 +556639,7 @@ _08119668: movs r0, 0x6 b _08119676 _0811966E: - ldr r1, _08119684 + ldr r1, =0x02037590 movs r0, 0x2 strb r0, [r1, 0x2] movs r0, 0x7 @@ -575702,7 +556651,7 @@ _08119676: pop {r1} bx r1 .align 2, 0 -_08119684: .4byte 0x02037590 + .pool thumb_func_end sub_81195E0 thumb_func_start sub_8119688 @@ -575723,12 +556672,12 @@ sub_8119688: @ 8119688 lsls r0, 24 lsrs r5, r0, 24 adds r2, r5, 0 - ldr r4, _081196E4 + ldr r4, =0x02037590 ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081196E8 + ldr r1, =0x02037350 adds r7, r0, r1 movs r0, 0x2 mov r9, r0 @@ -575751,8 +556700,7 @@ sub_8119688: @ 8119688 strb r5, [r6] b _081196F6 .align 2, 0 -_081196E4: .4byte 0x02037590 -_081196E8: .4byte 0x02037350 + .pool _081196EC: cmp r0, r5 beq _081196FC @@ -575764,13 +556712,13 @@ _081196F6: movs r0, 0x4 b _08119750 _081196FC: - ldr r1, _08119708 + ldr r1, =0x02037590 movs r0, 0x2 strb r0, [r1, 0x2] movs r0, 0xC b _08119750 .align 2, 0 -_08119708: .4byte 0x02037590 + .pool _0811970C: mov r0, r9 strb r0, [r4, 0x8] @@ -575803,7 +556751,7 @@ _08119736: movs r0, 0x5 b _08119750 _08119748: - ldr r1, _08119760 + ldr r1, =0x02037590 movs r0, 0x2 strb r0, [r1, 0x2] movs r0, 0xA @@ -575816,7 +556764,7 @@ _08119750: pop {r1} bx r1 .align 2, 0 -_08119760: .4byte 0x02037590 + .pool thumb_func_end sub_8119688 thumb_func_start sub_8119764 @@ -575831,12 +556779,12 @@ sub_8119764: @ 8119764 lsrs r4, 16 lsls r5, 16 lsrs r5, 16 - ldr r6, _081197B8 + ldr r6, =0x02037590 ldrb r1, [r6, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081197BC + ldr r1, =0x02037350 adds r0, r1 ldrb r2, [r0, 0x1] movs r1, 0x3 @@ -575861,8 +556809,7 @@ sub_8119764: @ 8119764 pop {r1} bx r1 .align 2, 0 -_081197B8: .4byte 0x02037590 -_081197BC: .4byte 0x02037350 + .pool thumb_func_end sub_8119764 thumb_func_start sub_81197C0 @@ -575872,7 +556819,7 @@ sub_81197C0: @ 81197C0 lsrs r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r4, _081197E0 + ldr r4, =0x02037590 movs r3, 0 strb r3, [r4, 0x8] bl sub_8119400 @@ -575882,7 +556829,7 @@ sub_81197C0: @ 81197C0 pop {r1} bx r1 .align 2, 0 -_081197E0: .4byte 0x02037590 + .pool thumb_func_end sub_81197C0 thumb_func_start sub_81197E4 @@ -575900,12 +556847,12 @@ sub_81197F4: @ 81197F4 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08119828 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0811982C + ldr r1, =0x02037350 adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -575922,8 +556869,7 @@ _0811981A: pop {r0} bx r0 .align 2, 0 -_08119828: .4byte 0x02037590 -_0811982C: .4byte 0x02037350 + .pool thumb_func_end sub_81197F4 thumb_func_start sub_8119830 @@ -575932,12 +556878,12 @@ sub_8119830: @ 8119830 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - ldr r0, _08119860 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08119864 + ldr r1, =0x02037350 adds r4, r0, r1 ldrb r1, [r4, 0x1E] adds r0, r5, 0 @@ -575950,8 +556896,7 @@ sub_8119830: @ 8119830 bl sub_81197E4 b _081198BA .align 2, 0 -_08119860: .4byte 0x02037590 -_08119864: .4byte 0x02037350 + .pool _08119868: adds r0, r5, 0 bl sub_8119E38 @@ -576002,12 +556947,12 @@ sub_81198C0: @ 81198C0 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081198F4 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081198F8 + ldr r1, =0x02037350 adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -576024,8 +556969,7 @@ _081198E6: pop {r0} bx r0 .align 2, 0 -_081198F4: .4byte 0x02037590 -_081198F8: .4byte 0x02037350 + .pool thumb_func_end sub_81198C0 thumb_func_start sub_81198FC @@ -576033,12 +556977,12 @@ sub_81198FC: @ 81198FC push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08119930 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08119934 + ldr r1, =0x02037350 adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -576055,8 +556999,7 @@ _08119922: pop {r0} bx r0 .align 2, 0 -_08119930: .4byte 0x02037590 -_08119934: .4byte 0x02037350 + .pool thumb_func_end sub_81198FC thumb_func_start sub_8119938 @@ -576064,12 +557007,12 @@ sub_8119938: @ 8119938 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0811996C + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08119970 + ldr r1, =0x02037350 adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -576086,8 +557029,7 @@ _0811995E: pop {r0} bx r0 .align 2, 0 -_0811996C: .4byte 0x02037590 -_08119970: .4byte 0x02037350 + .pool thumb_func_end sub_8119938 thumb_func_start sub_8119974 @@ -576095,12 +557037,12 @@ sub_8119974: @ 8119974 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081199A8 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081199AC + ldr r1, =0x02037350 adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -576117,8 +557059,7 @@ _0811999A: pop {r0} bx r0 .align 2, 0 -_081199A8: .4byte 0x02037590 -_081199AC: .4byte 0x02037350 + .pool thumb_func_end sub_8119974 thumb_func_start sub_81199B0 @@ -576126,12 +557067,12 @@ sub_81199B0: @ 81199B0 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081199DC + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081199E0 + ldr r1, =0x02037350 adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -576144,8 +557085,7 @@ sub_81199B0: @ 81199B0 bl sub_8119974 b _08119A1E .align 2, 0 -_081199DC: .4byte 0x02037590 -_081199E0: .4byte 0x02037350 + .pool _081199E4: adds r0, r4, 0 bl sub_8119E38 @@ -576207,12 +557147,12 @@ _08119A50: bl sub_81197F4 b _08119A84 _08119A58: - ldr r0, _08119A8C + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08119A90 + ldr r0, =0x02037350 adds r4, r0 movs r0, 0x22 bl audio_play @@ -576231,8 +557171,7 @@ _08119A84: pop {r0} bx r0 .align 2, 0 -_08119A8C: .4byte 0x02037590 -_08119A90: .4byte 0x02037350 + .pool thumb_func_end sub_8119A24 thumb_func_start sub_8119A94 @@ -576251,12 +557190,12 @@ sub_8119AA4: @ 8119AA4 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r7, _08119AD4 + ldr r7, =0x02037590 ldrb r1, [r7, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08119AD8 + ldr r1, =0x02037350 adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -576269,8 +557208,7 @@ sub_8119AA4: @ 8119AA4 bl sub_808B8A8 b _08119B2C .align 2, 0 -_08119AD4: .4byte 0x02037590 -_08119AD8: .4byte 0x02037350 + .pool _08119ADC: adds r0, r4, 0 bl sub_8119E38 @@ -576322,12 +557260,12 @@ sub_8119B34: @ 8119B34 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r7, _08119B64 + ldr r7, =0x02037590 ldrb r1, [r7, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08119B68 + ldr r1, =0x02037350 adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -576340,8 +557278,7 @@ sub_8119B34: @ 8119B34 bl sub_808B8C0 b _08119BBC .align 2, 0 -_08119B64: .4byte 0x02037590 -_08119B68: .4byte 0x02037350 + .pool _08119B6C: adds r0, r4, 0 bl sub_8119E38 @@ -576393,12 +557330,12 @@ sub_8119BC4: @ 8119BC4 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r0, _08119BF4 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08119BF8 + ldr r1, =0x02037350 adds r5, r0, r1 ldrb r1, [r5, 0x1E] adds r0, r4, 0 @@ -576411,8 +557348,7 @@ sub_8119BC4: @ 8119BC4 bl sub_808B8D8 b _08119C36 .align 2, 0 -_08119BF4: .4byte 0x02037590 -_08119BF8: .4byte 0x02037350 + .pool _08119BFC: adds r0, r4, 0 bl sub_8119E38 @@ -576454,7 +557390,7 @@ sub_8119C3C: @ 8119C3C lsrs r3, r0, 16 lsls r1, 16 lsrs r2, r1, 16 - ldr r0, _08119C60 + ldr r0, =0x02037590 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 @@ -576467,7 +557403,7 @@ _08119C5A: pop {r0} bx r0 .align 2, 0 -_08119C60: .4byte 0x02037590 + .pool thumb_func_end sub_8119C3C thumb_func_start sub_8119C64 @@ -576479,7 +557415,7 @@ sub_8119C64: @ 8119C64 bl sub_8119DF8 lsls r0, 24 lsrs r2, r0, 24 - ldr r4, _08119C8C + ldr r4, =0x02037590 ldr r0, [r4, 0xC] movs r1, 0xF ands r0, r1 @@ -576492,7 +557428,7 @@ sub_8119C64: @ 8119C64 strb r0, [r4, 0x14] b _08119C9A .align 2, 0 -_08119C8C: .4byte 0x02037590 + .pool _08119C90: adds r0, r2, 0 bl sub_8119D80 @@ -576502,7 +557438,7 @@ _08119C9A: movs r0, 0xF adds r2, r5, 0 ands r2, r0 - ldr r4, _08119CB8 + ldr r4, =0x02037590 ldr r0, [r4, 0x10] movs r1, 0xF ands r0, r1 @@ -576515,7 +557451,7 @@ _08119C9A: strb r0, [r4, 0x1C] b _08119CC6 .align 2, 0 -_08119CB8: .4byte 0x02037590 + .pool _08119CBC: adds r0, r2, 0 bl sub_8119DBC @@ -576536,7 +557472,7 @@ sub_8119CCC: @ 8119CCC ldrb r0, [r3] cmp r0, 0 beq _08119CF6 - ldr r5, _08119D10 + ldr r5, =0x020375a4 _08119CDC: adds r0, r2, r5 adds r1, r3, r2 @@ -576556,7 +557492,7 @@ _08119CF6: ldrb r0, [r4] cmp r0, 0 beq _08119D26 - ldr r3, _08119D14 + ldr r3, =0x020375ac _08119D00: adds r0, r2, r3 adds r1, r4, r2 @@ -576568,8 +557504,7 @@ _08119D0C: movs r0, 0 b _08119D28 .align 2, 0 -_08119D10: .4byte 0x020375a4 -_08119D14: .4byte 0x020375ac + .pool _08119D18: adds r0, r2, 0x1 lsls r0, 24 @@ -576592,9 +557527,9 @@ sub_8119D30: @ 8119D30 movs r6, 0 movs r5, 0 _08119D36: - ldr r0, _08119D68 + ldr r0, =0x085974c0 adds r4, r5, r0 - ldr r0, _08119D6C + ldr r0, =0x02037590 ldr r1, [r0, 0xC] ldr r2, [r0, 0x10] ldr r0, [r4, 0x8] @@ -576616,8 +557551,7 @@ _08119D36: ldrb r0, [r4, 0x18] b _08119D7A .align 2, 0 -_08119D68: .4byte 0x085974c0 -_08119D6C: .4byte 0x02037590 + .pool _08119D70: adds r5, 0x1C adds r6, 0x1 @@ -576634,7 +557568,7 @@ _08119D7A: sub_8119D80: @ 8119D80 push {r4,lr} lsls r0, 24 - ldr r3, _08119DB8 + ldr r3, =0x02037590 ldr r2, [r3, 0xC] lsls r2, 4 movs r1, 0xF0 @@ -576662,14 +557596,14 @@ _08119D9C: pop {r0} bx r0 .align 2, 0 -_08119DB8: .4byte 0x02037590 + .pool thumb_func_end sub_8119D80 thumb_func_start sub_8119DBC sub_8119DBC: @ 8119DBC push {r4,lr} lsls r0, 24 - ldr r3, _08119DF4 + ldr r3, =0x02037590 ldr r2, [r3, 0x10] lsls r2, 4 movs r1, 0xF0 @@ -576697,7 +557631,7 @@ _08119DD8: pop {r0} bx r0 .align 2, 0 -_08119DF4: .4byte 0x02037590 + .pool thumb_func_end sub_8119DBC thumb_func_start sub_8119DF8 @@ -576747,12 +557681,12 @@ sub_8119E38: @ 8119E38 adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _08119E9C + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _08119EA0 + ldr r0, =0x02037350 adds r4, r0 ldrh r1, [r4, 0x10] add r0, sp, 0x4 @@ -576789,8 +557723,7 @@ sub_8119E38: @ 8119E38 pop {r1} bx r1 .align 2, 0 -_08119E9C: .4byte 0x02037590 -_08119EA0: .4byte 0x02037350 + .pool thumb_func_end sub_8119E38 thumb_func_start sub_8119EA4 @@ -576843,7 +557776,7 @@ sub_8119EF0: @ 8119EF0 lsls r0, 24 cmp r0, 0 bne _08119F08 - ldr r0, _08119F0C + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x8 bne _08119F10 @@ -576851,7 +557784,7 @@ _08119F08: movs r0, 0x1 b _08119F12 .align 2, 0 -_08119F0C: .4byte 0x02037318 + .pool _08119F10: movs r0, 0 _08119F12: @@ -576893,11 +557826,11 @@ _08119F48: thumb_func_start sub_8119F50 sub_8119F50: @ 8119F50 push {lr} - ldr r0, _08119F6C + ldr r0, =0x0203ab54 ldrb r0, [r0] cmp r0, 0 beq _08119F66 - ldr r1, _08119F70 + ldr r1, =0x0203ab55 ldrb r0, [r1] cmp r0, 0x63 bhi _08119F66 @@ -576907,8 +557840,7 @@ _08119F66: pop {r0} bx r0 .align 2, 0 -_08119F6C: .4byte 0x0203ab54 -_08119F70: .4byte 0x0203ab55 + .pool thumb_func_end sub_8119F50 thumb_func_start sub_8119F74 @@ -576992,7 +557924,7 @@ _08119FF2: sub_8119FF8: @ 8119FF8 push {r4,lr} sub sp, 0x4 - ldr r0, _0811A034 + ldr r0, =0x02037590 ldrb r1, [r0] movs r0, 0x18 ands r0, r1 @@ -577018,7 +557950,7 @@ sub_8119FF8: @ 8119FF8 movs r0, 0 b _0811A03A .align 2, 0 -_0811A034: .4byte 0x02037590 + .pool _0811A038: movs r0, 0x1 _0811A03A: @@ -577036,8 +557968,8 @@ player_should_look_direction_be_enforced_upon_movement: @ 811A044 lsls r0, 24 cmp r0, 0 beq _0811A078 - ldr r2, _0811A070 - ldr r0, _0811A074 + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -577051,8 +557983,7 @@ player_should_look_direction_be_enforced_upon_movement: @ 811A044 movs r0, 0 b _0811A07A .align 2, 0 -_0811A070: .4byte 0x02037350 -_0811A074: .4byte 0x02037590 + .pool _0811A078: movs r0, 0x1 _0811A07A: @@ -577065,10 +557996,10 @@ sub_811A080: @ 811A080 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _0811A0A8 + ldr r1, =0x02037348 movs r0, 0 strb r0, [r1] - ldr r0, _0811A0AC + ldr r0, =0x02037590 ldrb r1, [r0] movs r0, 0x6 ands r0, r1 @@ -577080,12 +558011,11 @@ sub_811A080: @ 811A080 bl sub_8085784 b _0811A0C4 .align 2, 0 -_0811A0A8: .4byte 0x02037348 -_0811A0AC: .4byte 0x02037590 + .pool _0811A0B0: adds r0, r2, 0 bl walkrun_set_bike_bits - ldr r4, _0811A0CC + ldr r4, =0x00000193 adds r0, r4, 0 bl sav1_set_x2C adds r0, r4, 0 @@ -577095,13 +558025,13 @@ _0811A0C4: pop {r0} bx r0 .align 2, 0 -_0811A0CC: .4byte 0x00000193 + .pool thumb_func_end sub_811A080 thumb_func_start sub_811A0D0 sub_811A0D0: @ 811A0D0 push {lr} - ldr r2, _0811A10C + ldr r2, =0x02037590 movs r3, 0 strb r3, [r2, 0x8] strb r3, [r2, 0x9] @@ -577120,7 +558050,7 @@ _0811A0E6: cmp r1, 0x7 bls _0811A0E6 movs r1, 0 - ldr r3, _0811A110 + ldr r3, =0x020375ac movs r2, 0 _0811A0FA: adds r0, r1, r3 @@ -577133,44 +558063,43 @@ _0811A0FA: pop {r0} bx r0 .align 2, 0 -_0811A10C: .4byte 0x02037590 -_0811A110: .4byte 0x020375ac + .pool thumb_func_end sub_811A0D0 thumb_func_start sub_811A114 sub_811A114: @ 811A114 lsls r0, 24 lsrs r0, 24 - ldr r2, _0811A124 + ldr r2, =0x02037590 strb r0, [r2, 0xA] lsrs r1, r0, 1 adds r0, r1 strb r0, [r2, 0xB] bx lr .align 2, 0 -_0811A124: .4byte 0x02037590 + .pool thumb_func_end sub_811A114 thumb_func_start sub_811A128 sub_811A128: @ 811A128 - ldr r1, _0811A134 + ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0xA] strb r0, [r1, 0xB] bx lr .align 2, 0 -_0811A134: .4byte 0x02037590 + .pool thumb_func_end sub_811A128 thumb_func_start sub_811A138 sub_811A138: @ 811A138 push {lr} sub sp, 0x8 - ldr r1, _0811A160 + ldr r1, =0x085974b8 mov r0, sp movs r2, 0x6 bl memcpy - ldr r2, _0811A164 + ldr r2, =0x02037590 ldrb r1, [r2] movs r0, 0x2 ands r0, r1 @@ -577183,8 +558112,7 @@ sub_811A138: @ 811A138 ldrsh r0, [r0, r1] b _0811A182 .align 2, 0 -_0811A160: .4byte 0x085974b8 -_0811A164: .4byte 0x02037590 + .pool _0811A168: movs r0, 0x4 ands r0, r1 @@ -577211,7 +558139,7 @@ _0811A182: sub_811A188: @ 811A188 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _0811A1D8 + ldr r5, =0x02037590 ldrb r1, [r5] movs r0, 0x4 ands r0, r1 @@ -577246,7 +558174,7 @@ _0811A1D0: pop {r0} bx r0 .align 2, 0 -_0811A1D8: .4byte 0x02037590 + .pool thumb_func_end sub_811A188 thumb_func_start is_tile_to_run_on @@ -577254,7 +558182,7 @@ is_tile_to_run_on: @ 811A1DC push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0811A200 + ldr r0, =0x02037318 ldrb r1, [r0, 0x1A] movs r0, 0x4 ands r0, r1 @@ -577270,7 +558198,7 @@ _0811A1FC: movs r0, 0x1 b _0811A206 .align 2, 0 -_0811A200: .4byte 0x02037318 + .pool _0811A204: movs r0, 0 _0811A206: @@ -577293,13 +558221,13 @@ sub_811A20C: @ 811A20C lsls r5, 24 lsrs r5, 24 bl clear_tasks - ldr r0, _0811A26C + ldr r0, =sub_811A2C0 + 1 movs r1, 0 bl AddTask adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _0811A270 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -577314,7 +558242,7 @@ sub_811A20C: @ 811A20C movs r1, 0x4 mov r2, r9 bl set_word_task_arg - ldr r0, _0811A274 + ldr r0, =sub_811A278 + 1 bl set_callback2 pop {r3,r4} mov r8, r3 @@ -577323,9 +558251,7 @@ sub_811A20C: @ 811A20C pop {r0} bx r0 .align 2, 0 -_0811A26C: .4byte sub_811A2C0 + 1 -_0811A270: .4byte 0x03005e00 -_0811A274: .4byte sub_811A278 + 1 + .pool thumb_func_end sub_811A20C thumb_func_start sub_811A278 @@ -577353,7 +558279,7 @@ sub_811A290: @ 811A290 sub_811A2A4: @ 811A2A4 lsls r0, 24 lsrs r0, 24 - ldr r3, _0811A2BC + ldr r3, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -577363,7 +558289,7 @@ sub_811A2A4: @ 811A2A4 strh r0, [r2, 0x8] bx lr .align 2, 0 -_0811A2BC: .4byte 0x03005e00 + .pool thumb_func_end sub_811A2A4 thumb_func_start sub_811A2C0 @@ -577389,7 +558315,7 @@ _0811A2DC: cmp r0, 0x1 beq _0811A2F2 _0811A2EA: - ldr r1, _0811A2F8 + ldr r1, =sub_811A2FC + 1 adds r0, r4, 0 bl sub_811A2A4 _0811A2F2: @@ -577397,7 +558323,7 @@ _0811A2F2: pop {r0} bx r0 .align 2, 0 -_0811A2F8: .4byte sub_811A2FC + 1 + .pool thumb_func_end sub_811A2C0 thumb_func_start sub_811A2FC @@ -577409,7 +558335,7 @@ sub_811A2FC: @ 811A2FC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0811A324 + ldr r1, =0x03005e08 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -577418,13 +558344,12 @@ sub_811A2FC: @ 811A2FC b _0811A41C _0811A318: lsls r0, 2 - ldr r1, _0811A328 + ldr r1, =_0811A32C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811A324: .4byte 0x03005e08 -_0811A328: .4byte _0811A32C + .pool .align 2, 0 _0811A32C: .4byte _0811A344 @@ -577434,7 +558359,7 @@ _0811A32C: .4byte _0811A3EC .4byte _0811A40C _0811A344: - ldr r0, _0811A36C + ldr r0, =sub_811A290 + 1 bl SetVBlankCallback movs r4, 0x1 negs r4, r4 @@ -577452,7 +558377,7 @@ _0811A344: movs r0, 0x5 b _0811A41A .align 2, 0 -_0811A36C: .4byte sub_811A290 + 1 + .pool _0811A370: bl sub_811AAAC lsls r0, 16 @@ -577501,7 +558426,7 @@ _0811A3CC: lsls r0, 24 b _0811A414 _0811A3D4: - ldr r0, _0811A3E8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -577511,9 +558436,9 @@ _0811A3D4: bl sub_811A8A4 b _0811A41C .align 2, 0 -_0811A3E8: .4byte 0x02037fd4 + .pool _0811A3EC: - ldr r0, _0811A408 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -577525,9 +558450,9 @@ _0811A3EC: bl sub_811A4D0 b _0811A41C .align 2, 0 -_0811A408: .4byte 0x02037fd4 + .pool _0811A40C: - ldr r0, _0811A424 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -577543,7 +558468,7 @@ _0811A41C: pop {r0} bx r0 .align 2, 0 -_0811A424: .4byte 0x02037fd4 + .pool thumb_func_end sub_811A2FC thumb_func_start sub_811A428 @@ -577554,20 +558479,19 @@ sub_811A428: @ 811A428 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0811A44C + ldr r1, =0x03005e08 adds r6, r0, r1 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0x4 bhi _0811A4BC lsls r0, 2 - ldr r1, _0811A450 + ldr r1, =_0811A454 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811A44C: .4byte 0x03005e08 -_0811A450: .4byte _0811A454 + .pool .align 2, 0 _0811A454: .4byte _0811A468 @@ -577646,20 +558570,19 @@ sub_811A4D0: @ 811A4D0 sub_811A4F0: @ 811A4F0 push {r4,r5,lr} movs r5, 0x3 - ldr r0, _0811A508 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x14 bls _0811A4FE b _0811A7D4 _0811A4FE: lsls r0, 2 - ldr r1, _0811A50C + ldr r1, =_0811A510 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811A508: .4byte 0x020375e0 -_0811A50C: .4byte _0811A510 + .pool .align 2, 0 _0811A510: .4byte _0811A564 @@ -577684,63 +558607,57 @@ _0811A510: .4byte _0811A7AC .4byte _0811A7BC _0811A564: - ldr r0, _0811A570 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0811A574 + ldr r1, =0x00002bb0 adds r4, r0, r1 b _0811A7C2 .align 2, 0 -_0811A570: .4byte 0x03005d8c -_0811A574: .4byte 0x00002bb0 + .pool _0811A578: - ldr r0, _0811A584 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0811A588 + ldr r2, =0x00002bbc adds r4, r0, r2 b _0811A7C2 .align 2, 0 -_0811A584: .4byte 0x03005d8c -_0811A588: .4byte 0x00002bbc + .pool _0811A58C: - ldr r0, _0811A598 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _0811A59C + ldr r3, =0x00002bc8 adds r4, r0, r3 b _0811A7C2 .align 2, 0 -_0811A598: .4byte 0x03005d8c -_0811A59C: .4byte 0x00002bc8 + .pool _0811A5A0: - ldr r0, _0811A5AC + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0811A5B0 + ldr r1, =0x00002bd4 adds r4, r0, r1 b _0811A7C2 .align 2, 0 -_0811A5AC: .4byte 0x03005d8c -_0811A5B0: .4byte 0x00002bd4 + .pool _0811A5B4: - ldr r2, _0811A5CC - ldr r0, _0811A5D0 + ldr r2, =0x03005d8c + ldr r0, =0x020375e2 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r3, _0811A5D4 + ldr r3, =0x00002be0 adds r0, r3 ldr r1, [r2] adds r4, r1, r0 b _0811A7C2 .align 2, 0 -_0811A5CC: .4byte 0x03005d8c -_0811A5D0: .4byte 0x020375e2 -_0811A5D4: .4byte 0x00002be0 + .pool _0811A5D8: - ldr r0, _0811A5F8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0811A5FC + ldr r2, =0x00002e36 adds r1, r0, r2 - ldr r3, _0811A600 + ldr r3, =0x00002e2a adds r2, r0, r3 movs r3, 0x5 _0811A5E6: @@ -577753,40 +558670,35 @@ _0811A5E6: adds r4, r1, 0 b _0811A7C2 .align 2, 0 -_0811A5F8: .4byte 0x03005d8c -_0811A5FC: .4byte 0x00002e36 -_0811A600: .4byte 0x00002e2a + .pool _0811A604: - ldr r2, _0811A620 - ldr r0, _0811A624 + ldr r2, =0x03005d8c + ldr r0, =0x020375e2 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 ldr r1, [r2] adds r0, r1 - ldr r1, _0811A628 + ldr r1, =0x000027d0 adds r4, r0, r1 - ldr r0, _0811A62C + ldr r0, =0x020375e4 ldrb r5, [r0] b _0811A7C2 .align 2, 0 -_0811A620: .4byte 0x03005d8c -_0811A624: .4byte 0x020375e2 -_0811A628: .4byte 0x000027d0 -_0811A62C: .4byte 0x020375e4 + .pool _0811A630: - ldr r2, _0811A654 - ldr r0, _0811A658 + ldr r2, =0x03005d8c + ldr r0, =0x020375e2 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r3, _0811A65C + ldr r3, =0x000027cc adds r0, r3 ldr r1, [r2] adds r1, r0 - ldr r0, _0811A660 + ldr r0, =0x020375e4 ldrh r0, [r0] lsls r0, 1 adds r0, 0x1C @@ -577794,72 +558706,62 @@ _0811A630: movs r5, 0x1 b _0811A7C2 .align 2, 0 -_0811A654: .4byte 0x03005d8c -_0811A658: .4byte 0x020375e2 -_0811A65C: .4byte 0x000027cc -_0811A660: .4byte 0x020375e4 + .pool _0811A664: - ldr r2, _0811A67C - ldr r0, _0811A680 + ldr r2, =0x03005d8c + ldr r0, =0x020375e2 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 ldr r1, [r2] adds r0, r1 - ldr r1, _0811A684 + ldr r1, =0x000027ce adds r4, r0, r1 movs r5, 0 b _0811A7C2 .align 2, 0 -_0811A67C: .4byte 0x03005d8c -_0811A680: .4byte 0x020375e2 -_0811A684: .4byte 0x000027ce + .pool _0811A688: - ldr r4, _0811A6A4 - ldr r1, _0811A6A8 + ldr r4, =0x02021ec4 + ldr r1, =0x03005d8c ldr r0, [r1] - ldr r2, _0811A6AC + ldr r2, =0x00002e6c adds r0, r2 ldrh r0, [r0] strh r0, [r4] ldr r0, [r1] - ldr r3, _0811A6B0 + ldr r3, =0x00002e6e adds r0, r3 ldrh r0, [r0] strh r0, [r4, 0x2] b _0811A7C2 .align 2, 0 -_0811A6A4: .4byte 0x02021ec4 -_0811A6A8: .4byte 0x03005d8c -_0811A6AC: .4byte 0x00002e6c -_0811A6B0: .4byte 0x00002e6e + .pool _0811A6B4: - ldr r0, _0811A6C8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0811A6CC + ldr r1, =0x00002baa adds r4, r0, r1 - ldr r2, _0811A6D0 + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r4] movs r5, 0x1 b _0811A7C2 .align 2, 0 -_0811A6C8: .4byte 0x03005d8c -_0811A6CC: .4byte 0x00002baa -_0811A6D0: .4byte 0x0000ffff + .pool _0811A6D4: - ldr r2, _0811A6F8 - ldr r0, _0811A6FC + ldr r2, =0x03005d8c + ldr r0, =0x020375e2 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r3, _0811A700 + ldr r3, =0x000027cc adds r0, r3 ldr r1, [r2] adds r1, r0 - ldr r0, _0811A704 + ldr r0, =0x020375e4 ldrh r0, [r0] lsls r0, 1 adds r0, 0x4 @@ -577867,102 +558769,91 @@ _0811A6D4: movs r5, 0 b _0811A7C2 .align 2, 0 -_0811A6F8: .4byte 0x03005d8c -_0811A6FC: .4byte 0x020375e2 -_0811A700: .4byte 0x000027cc -_0811A704: .4byte 0x020375e4 + .pool _0811A708: - ldr r2, _0811A720 - ldr r0, _0811A724 + ldr r2, =0x03005d8c + ldr r0, =0x020375e2 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 ldr r1, [r2] adds r0, r1 - ldr r1, _0811A728 + ldr r1, =0x000027e4 adds r4, r0, r1 movs r5, 0x1 b _0811A7C2 .align 2, 0 -_0811A720: .4byte 0x03005d8c -_0811A724: .4byte 0x020375e2 -_0811A728: .4byte 0x000027e4 + .pool _0811A72C: - ldr r4, _0811A738 + ldr r4, =0x02021ec4 adds r0, r4, 0 movs r1, 0x2 bl sub_811F88C b _0811A7C2 .align 2, 0 -_0811A738: .4byte 0x02021ec4 + .pool _0811A73C: - ldr r2, _0811A760 - ldr r0, _0811A764 + ldr r2, =0x03005d8c + ldr r0, =0x020375e2 ldrh r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r3, _0811A768 + ldr r3, =0x000027cc adds r0, r3 ldr r1, [r2] adds r1, r0 adds r4, r1, 0 adds r4, 0x14 - ldr r2, _0811A76C + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1, 0x14] movs r5, 0x2 b _0811A7C2 .align 2, 0 -_0811A760: .4byte 0x03005d8c -_0811A764: .4byte 0x020375e2 -_0811A768: .4byte 0x000027cc -_0811A76C: .4byte 0x0000ffff + .pool _0811A770: - ldr r0, _0811A77C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _0811A780 + ldr r3, =0x00003b6e adds r4, r0, r3 b _0811A7C2 .align 2, 0 -_0811A77C: .4byte 0x03005d8c -_0811A780: .4byte 0x00003b6e + .pool _0811A784: - ldr r0, _0811A790 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0811A794 + ldr r1, =0x00003b5a adds r4, r0, r1 b _0811A7C2 .align 2, 0 -_0811A790: .4byte 0x03005d8c -_0811A794: .4byte 0x00003b5a + .pool _0811A798: - ldr r0, _0811A7A4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0811A7A8 + ldr r2, =0x00003b6c adds r4, r0, r2 b _0811A7C2 .align 2, 0 -_0811A7A4: .4byte 0x03005d8c -_0811A7A8: .4byte 0x00003b6c + .pool _0811A7AC: - ldr r0, _0811A7B8 + ldr r0, =0x03005d90 ldr r0, [r0] movs r3, 0x82 lsls r3, 1 adds r4, r0, r3 b _0811A7C2 .align 2, 0 -_0811A7B8: .4byte 0x03005d90 + .pool _0811A7BC: bl sub_801B058 adds r4, r0, 0 _0811A7C2: bl overworld_free_bg_tilemaps - ldr r0, _0811A7DC + ldr r0, =0x020375e0 ldrb r0, [r0] - ldr r2, _0811A7E0 + ldr r2, =sub_80861B0 + 1 adds r1, r4, 0 adds r3, r5, 0 bl sub_811A20C @@ -577971,15 +558862,14 @@ _0811A7D4: pop {r0} bx r0 .align 2, 0 -_0811A7DC: .4byte 0x020375e0 -_0811A7E0: .4byte sub_80861B0 + 1 + .pool thumb_func_end sub_811A4F0 thumb_func_start sub_811A7E4 sub_811A7E4: @ 811A7E4 push {lr} bl fade_and_return_progress_probably - ldr r0, _0811A800 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -577990,35 +558880,32 @@ sub_811A7E4: @ 811A7E4 beq _0811A80E b _0811A840 .align 2, 0 -_0811A800: .4byte 0x030022c0 + .pool _0811A804: movs r0, 0x1 movs r1, 0 bl fade_screen b _0811A840 _0811A80E: - ldr r0, _0811A830 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0811A84E - ldr r0, _0811A834 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0811A838 + ldr r1, =0x00003b58 adds r0, r1 - ldr r1, _0811A83C + ldr r1, =0x0000ffff strh r1, [r0, 0x16] bl overworld_free_bg_tilemaps bl sub_811A8F0 b _0811A84E .align 2, 0 -_0811A830: .4byte 0x02037fd4 -_0811A834: .4byte 0x03005d8c -_0811A838: .4byte 0x00003b58 -_0811A83C: .4byte 0x0000ffff + .pool _0811A840: - ldr r1, _0811A854 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -578029,18 +558916,18 @@ _0811A84E: pop {r0} bx r0 .align 2, 0 -_0811A854: .4byte 0x030022c0 + .pool thumb_func_end sub_811A7E4 thumb_func_start sub_811A858 sub_811A858: @ 811A858 push {lr} - ldr r0, _0811A864 + ldr r0, =sub_811A7E4 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0811A864: .4byte sub_811A7E4 + 1 + .pool thumb_func_end sub_811A858 thumb_func_start sub_811A868 @@ -578049,7 +558936,7 @@ sub_811A868: @ 811A868 lsls r0, 16 lsrs r2, r0, 16 movs r0, 0 - ldr r1, _0811A888 + ldr r1, =0x08597530 _0811A872: ldrh r3, [r1] cmp r2, r3 @@ -578064,7 +558951,7 @@ _0811A884: pop {r1} bx r1 .align 2, 0 -_0811A888: .4byte 0x08597530 + .pool thumb_func_end sub_811A868 thumb_func_start sub_811A88C @@ -578090,7 +558977,7 @@ sub_811A8A4: @ 811A8A4 bl sub_811A868 adds r4, r0, 0 bl clear_tasks - ldr r0, _0811A8C8 + ldr r0, =0x08597530 lsls r4, 3 adds r0, 0x4 adds r4, r0 @@ -578100,83 +558987,75 @@ sub_811A8A4: @ 811A8A4 pop {r0} bx r0 .align 2, 0 -_0811A8C8: .4byte 0x08597530 + .pool thumb_func_end sub_811A8A4 thumb_func_start sub_811A8CC sub_811A8CC: @ 811A8CC push {lr} - ldr r0, _0811A8E4 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0811A8E8 + ldr r0, =0x00003b6e adds r1, r0 - ldr r2, _0811A8EC + ldr r2, =sub_80861B0 + 1 movs r0, 0xF movs r3, 0x3 bl sub_811A20C pop {r0} bx r0 .align 2, 0 -_0811A8E4: .4byte 0x03005d8c -_0811A8E8: .4byte 0x00003b6e -_0811A8EC: .4byte sub_80861B0 + 1 + .pool thumb_func_end sub_811A8CC thumb_func_start sub_811A8F0 sub_811A8F0: @ 811A8F0 push {lr} - ldr r0, _0811A908 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0811A90C + ldr r0, =0x00003b5a adds r1, r0 - ldr r2, _0811A910 + ldr r2, =sub_80861B0 + 1 movs r0, 0x10 movs r3, 0x3 bl sub_811A20C pop {r0} bx r0 .align 2, 0 -_0811A908: .4byte 0x03005d8c -_0811A90C: .4byte 0x00003b5a -_0811A910: .4byte sub_80861B0 + 1 + .pool thumb_func_end sub_811A8F0 thumb_func_start sub_811A914 sub_811A914: @ 811A914 push {lr} - ldr r0, _0811A92C + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0811A930 + ldr r0, =0x00003b6c adds r1, r0 - ldr r2, _0811A934 + ldr r2, =sub_80861B0 + 1 movs r0, 0x12 movs r3, 0x3 bl sub_811A20C pop {r0} bx r0 .align 2, 0 -_0811A92C: .4byte 0x03005d8c -_0811A930: .4byte 0x00003b6c -_0811A934: .4byte sub_80861B0 + 1 + .pool thumb_func_end sub_811A914 thumb_func_start sub_811A938 sub_811A938: @ 811A938 push {lr} - ldr r0, _0811A950 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0811A954 + ldr r0, =0x00003b5a adds r1, r0 - ldr r2, _0811A958 + ldr r2, =sub_80861B0 + 1 movs r0, 0x11 movs r3, 0x3 bl sub_811A20C pop {r0} bx r0 .align 2, 0 -_0811A950: .4byte 0x03005d8c -_0811A954: .4byte 0x00003b5a -_0811A958: .4byte sub_80861B0 + 1 + .pool thumb_func_end sub_811A938 thumb_func_start sub_811A95C @@ -578189,7 +559068,7 @@ sub_811A95C: @ 811A95C lsrs r5, r0, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r4, _0811A980 + ldr r4, =0x0203a118 movs r0, 0x50 bl malloc str r0, [r4] @@ -578198,7 +559077,7 @@ sub_811A95C: @ 811A95C movs r0, 0 b _0811AA7E .align 2, 0 -_0811A980: .4byte 0x0203a118 + .pool _0811A984: movs r7, 0 strb r5, [r0] @@ -578235,7 +559114,7 @@ _0811A9C6: ldr r0, [r4] strb r7, [r0, 0x4] ldr r3, [r4] - ldr r1, _0811AA2C + ldr r1, =0x08597550 lsls r2, r6, 1 adds r0, r2, r6 lsls r0, 3 @@ -578245,9 +559124,9 @@ _0811A9C6: str r0, [r3, 0x34] adds r0, r2, 0 _0811A9DE: - ldr r3, _0811AA30 + ldr r3, =0x0203a118 ldr r2, [r3] - ldr r1, _0811AA2C + ldr r1, =0x08597550 adds r0, r6 lsls r0, 3 adds r0, r1 @@ -578284,8 +559163,7 @@ _0811AA14: bl CpuSet b _0811AA64 .align 2, 0 -_0811AA2C: .4byte 0x08597550 -_0811AA30: .4byte 0x0203a118 + .pool _0811AA34: movs r3, 0 ldr r0, [r4] @@ -578293,7 +559171,7 @@ _0811AA34: cmp r3, r0 bge _0811AA5C adds r6, r4, 0 - ldr r1, _0811AA88 + ldr r1, =0x0000ffff adds r5, r1, 0 _0811AA44: ldr r2, [r6] @@ -578315,7 +559193,7 @@ _0811AA5C: str r0, [r1, 0x38] _0811AA64: bl sub_811F3AC - ldr r1, _0811AA8C + ldr r1, =0x0203a118 ldr r2, [r1] lsls r0, 24 lsrs r0, 24 @@ -578333,14 +559211,13 @@ _0811AA7E: pop {r1} bx r1 .align 2, 0 -_0811AA88: .4byte 0x0000ffff -_0811AA8C: .4byte 0x0203a118 + .pool thumb_func_end sub_811A95C thumb_func_start sub_811AA90 sub_811AA90: @ 811AA90 push {r4,lr} - ldr r4, _0811AAA8 + ldr r4, =0x0203a118 ldr r0, [r4] cmp r0, 0 beq _0811AAA2 @@ -578352,25 +559229,24 @@ _0811AAA2: pop {r0} bx r0 .align 2, 0 -_0811AAA8: .4byte 0x0203a118 + .pool thumb_func_end sub_811AA90 thumb_func_start sub_811AAAC sub_811AAAC: @ 811AAAC push {lr} - ldr r0, _0811AAC4 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0xA bhi _0811AB3E lsls r0, 2 - ldr r1, _0811AAC8 + ldr r1, =_0811AACC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811AAC4: .4byte 0x0203a118 -_0811AAC8: .4byte _0811AACC + .pool .align 2, 0 _0811AACC: .4byte _0811AAF8 @@ -578454,14 +559330,14 @@ _0811AB64: thumb_func_start sub_811AB68 sub_811AB68: @ 811AB68 push {r4-r7,lr} - ldr r0, _0811AB94 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _0811ABB8 bl sub_811BF78 - ldr r1, _0811AB98 + ldr r1, =0x0203a118 ldr r3, [r1] movs r2, 0 movs r0, 0x2 @@ -578475,8 +559351,7 @@ sub_811AB68: @ 811AB68 movs r0, 0x9 b _0811ACCC .align 2, 0 -_0811AB94: .4byte 0x030022c0 -_0811AB98: .4byte 0x0203a118 + .pool _0811AB9C: movs r0, 0x20 ands r0, r1 @@ -578505,7 +559380,7 @@ _0811ABB8: ands r0, r1 cmp r0, 0 beq _0811AB9C - ldr r2, _0811AC40 + ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x6] subs r0, 0x1 @@ -578517,7 +559392,7 @@ _0811ABDA: ldr r2, [r4] movs r0, 0x6 ldrsb r0, [r2, r0] - ldr r6, _0811AC44 + ldr r6, =0x08597550 cmp r0, 0 bge _0811ABF8 ldrb r0, [r2, 0x1] @@ -578567,34 +559442,33 @@ _0811AC36: movs r0, 0x3 b _0811ACCC .align 2, 0 -_0811AC40: .4byte 0x0203a118 -_0811AC44: .4byte 0x08597550 + .pool _0811AC48: - ldr r2, _0811AC54 + ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] b _0811ABDA .align 2, 0 -_0811AC54: .4byte 0x0203a118 + .pool _0811AC58: - ldr r2, _0811AC64 + ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x6] adds r0, 0x1 b _0811ABD8 .align 2, 0 -_0811AC64: .4byte 0x0203a118 + .pool _0811AC68: - ldr r2, _0811AC74 + ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] subs r0, 0x1 strb r0, [r1, 0x5] b _0811ABDA .align 2, 0 -_0811AC74: .4byte 0x0203a118 + .pool _0811AC78: bl sub_811B150 b _0811AC82 @@ -578632,9 +559506,9 @@ _0811ACB0: beq _0811ACCA ldr r2, [r7] ldr r0, [r2, 0x4] - ldr r1, _0811ACD4 + ldr r1, =0x00ffff00 ands r0, r1 - ldr r1, _0811ACD8 + ldr r1, =0x00040100 cmp r0, r1 bne _0811ACCA movs r0, 0 @@ -578646,20 +559520,19 @@ _0811ACCC: pop {r1} bx r1 .align 2, 0 -_0811ACD4: .4byte 0x00ffff00 -_0811ACD8: .4byte 0x00040100 + .pool thumb_func_end sub_811AB68 thumb_func_start sub_811ACDC sub_811ACDC: @ 811ACDC push {r4-r6,lr} - ldr r2, _0811ACFC + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _0811AD4A - ldr r0, _0811AD00 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0x5] lsls r0, 24 @@ -578668,8 +559541,7 @@ sub_811ACDC: @ 811ACDC beq _0811AD3E b _0811AD24 .align 2, 0 -_0811ACFC: .4byte 0x030022c0 -_0811AD00: .4byte 0x0203a118 + .pool _0811AD04: movs r0, 0x20 ands r0, r2 @@ -578722,7 +559594,7 @@ _0811AD4A: ands r0, r2 cmp r0, 0 beq _0811AD04 - ldr r2, _0811ADB8 + ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x6] subs r0, 0x1 @@ -578734,7 +559606,7 @@ _0811AD70: ldr r4, [r5] movs r3, 0x6 ldrsb r3, [r4, r3] - ldr r2, _0811ADBC + ldr r2, =0x08597550 ldrb r1, [r4, 0x1] lsls r0, r1, 1 adds r0, r1 @@ -578768,34 +559640,33 @@ _0811ADB2: movs r0, 0x3 b _0811AE32 .align 2, 0 -_0811ADB8: .4byte 0x0203a118 -_0811ADBC: .4byte 0x08597550 + .pool _0811ADC0: - ldr r2, _0811ADCC + ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] b _0811AD6E .align 2, 0 -_0811ADCC: .4byte 0x0203a118 + .pool _0811ADD0: - ldr r1, _0811ADDC + ldr r1, =0x0203a118 ldr r0, [r1] strb r3, [r0, 0x6] adds r6, r1, 0 b _0811AD70 .align 2, 0 -_0811ADDC: .4byte 0x0203a118 + .pool _0811ADE0: - ldr r2, _0811ADEC + ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] subs r0, 0x1 strb r0, [r1, 0x5] b _0811AD6E .align 2, 0 -_0811ADEC: .4byte 0x0203a118 + .pool _0811ADF0: bl sub_811B150 b _0811ADFA @@ -578819,15 +559690,15 @@ _0811AE0E: beq _0811AE28 ldr r2, [r6] ldr r0, [r2, 0x4] - ldr r1, _0811AE38 + ldr r1, =0x00ffff00 ands r0, r1 - ldr r1, _0811AE3C + ldr r1, =0x00040100 cmp r0, r1 bne _0811AE28 movs r0, 0 strb r0, [r2, 0x5] _0811AE28: - ldr r0, _0811AE40 + ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x4] @@ -578837,15 +559708,13 @@ _0811AE32: pop {r1} bx r1 .align 2, 0 -_0811AE38: .4byte 0x00ffff00 -_0811AE3C: .4byte 0x00040100 -_0811AE40: .4byte 0x0203a118 + .pool thumb_func_end sub_811ACDC thumb_func_start sub_811AE44 sub_811AE44: @ 811AE44 push {lr} - ldr r1, _0811AE5C + ldr r1, =0x030022c0 ldrh r2, [r1, 0x2E] movs r0, 0x2 ands r0, r2 @@ -578855,13 +559724,13 @@ sub_811AE44: @ 811AE44 bl sub_811B32C b _0811AEF6 .align 2, 0 -_0811AE5C: .4byte 0x030022c0 + .pool _0811AE60: movs r0, 0x1 ands r0, r2 cmp r0, 0 beq _0811AEAE - ldr r0, _0811AE80 + ldr r0, =0x0203a118 ldr r2, [r0] movs r1, 0xA ldrsb r1, [r2, r1] @@ -578872,7 +559741,7 @@ _0811AE60: bl sub_811B2B0 b _0811AEF6 .align 2, 0 -_0811AE80: .4byte 0x0203a118 + .pool _0811AE84: movs r0, 0xB ldrsb r0, [r2, r0] @@ -578948,21 +559817,20 @@ _0811AEFA: thumb_func_start sub_811AF00 sub_811AF00: @ 811AF00 push {lr} - ldr r2, _0811AF1C + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _0811AF24 - ldr r0, _0811AF20 + ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0x2 strb r0, [r1, 0x4] movs r0, 0xE b _0811AF86 .align 2, 0 -_0811AF1C: .4byte 0x030022c0 -_0811AF20: .4byte 0x0203a118 + .pool _0811AF24: movs r0, 0x1 ands r0, r1 @@ -579045,17 +559913,17 @@ _0811AFA8: bne _0811AFE4 _0811AFAC: bl sub_811B2A4 - ldr r1, _0811AFBC + ldr r1, =0x0203a118 ldr r1, [r1] strb r0, [r1, 0x4] movs r0, 0x7 b _0811AFE6 .align 2, 0 -_0811AFBC: .4byte 0x0203a118 + .pool _0811AFC0: - ldr r0, _0811AFDC + ldr r0, =0x020375f0 strh r1, [r0] - ldr r0, _0811AFE0 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0] subs r0, 0x11 @@ -579068,8 +559936,7 @@ _0811AFD8: movs r0, 0x18 b _0811AFE6 .align 2, 0 -_0811AFDC: .4byte 0x020375f0 -_0811AFE0: .4byte 0x0203a118 + .pool _0811AFE4: movs r0, 0 _0811AFE6: @@ -579097,23 +559964,23 @@ _0811B008: bne _0811B038 _0811B00C: bl sub_811B2A4 - ldr r1, _0811B01C + ldr r1, =0x0203a118 ldr r1, [r1] strb r0, [r1, 0x4] movs r0, 0x7 b _0811B03A .align 2, 0 -_0811B01C: .4byte 0x0203a118 + .pool _0811B020: bl sub_811BE9C - ldr r4, _0811B034 + ldr r4, =0x020375f0 bl sub_811B4EC strh r0, [r4] bl sub_811B3E4 movs r0, 0x18 b _0811B03A .align 2, 0 -_0811B034: .4byte 0x020375f0 + .pool _0811B038: movs r0, 0 _0811B03A: @@ -579141,24 +560008,24 @@ _0811B05C: cmp r1, 0x1 bne _0811B084 _0811B060: - ldr r0, _0811B06C + ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x4] movs r0, 0x7 b _0811B086 .align 2, 0 -_0811B06C: .4byte 0x0203a118 + .pool _0811B070: bl sub_811B418 - ldr r0, _0811B080 + ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x4] movs r0, 0x8 b _0811B086 .align 2, 0 -_0811B080: .4byte 0x0203a118 + .pool _0811B084: movs r0, 0 _0811B086: @@ -579169,7 +560036,7 @@ _0811B086: thumb_func_start sub_811B08C sub_811B08C: @ 811B08C push {lr} - ldr r0, _0811B0A0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -579178,7 +560045,7 @@ sub_811B08C: @ 811B08C movs r0, 0x1A b _0811B0B8 .align 2, 0 -_0811B0A0: .4byte 0x030022c0 + .pool _0811B0A4: movs r0, 0x2 ands r0, r1 @@ -579198,7 +560065,7 @@ _0811B0B8: thumb_func_start sub_811B0BC sub_811B0BC: @ 811B0BC push {lr} - ldr r0, _0811B0D0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -579207,10 +560074,10 @@ sub_811B0BC: @ 811B0BC movs r0, 0 b _0811B0E0 .align 2, 0 -_0811B0D0: .4byte 0x030022c0 + .pool _0811B0D4: bl sub_811B2A4 - ldr r1, _0811B0E4 + ldr r1, =0x0203a118 ldr r1, [r1] strb r0, [r1, 0x4] movs r0, 0x7 @@ -579218,19 +560085,19 @@ _0811B0E0: pop {r1} bx r1 .align 2, 0 -_0811B0E4: .4byte 0x0203a118 + .pool thumb_func_end sub_811B0BC thumb_func_start sub_811B0E8 sub_811B0E8: @ 811B0E8 - ldr r0, _0811B0F4 + ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0xA strb r0, [r1, 0x4] movs r0, 0x6 bx lr .align 2, 0 -_0811B0F4: .4byte 0x0203a118 + .pool thumb_func_end sub_811B0E8 thumb_func_start sub_811B0F8 @@ -579253,7 +560120,7 @@ _0811B114: bne _0811B148 _0811B118: bl sub_811B454 - ldr r2, _0811B130 + ldr r2, =0x0203a118 ldr r1, [r2] movs r0, 0 strb r0, [r1, 0x8] @@ -579263,16 +560130,16 @@ _0811B118: movs r0, 0x1F b _0811B14A .align 2, 0 -_0811B130: .4byte 0x0203a118 + .pool _0811B134: - ldr r4, _0811B144 + ldr r4, =0x020375f0 bl sub_811B4EC strh r0, [r4] bl sub_811B3E4 movs r0, 0x18 b _0811B14A .align 2, 0 -_0811B144: .4byte 0x020375f0 + .pool _0811B148: movs r0, 0 _0811B14A: @@ -579284,7 +560151,7 @@ _0811B14A: thumb_func_start sub_811B150 sub_811B150: @ 811B150 push {lr} - ldr r1, _0811B170 + ldr r1, =0x0203a118 ldr r2, [r1] ldrb r0, [r2] cmp r0, 0x13 @@ -579300,7 +560167,7 @@ _0811B160: movs r0, 0x22 b _0811B180 .align 2, 0 -_0811B170: .4byte 0x0203a118 + .pool _0811B174: ldrb r0, [r2, 0x4] strb r0, [r2, 0x8] @@ -579316,7 +560183,7 @@ _0811B180: thumb_func_start sub_811B184 sub_811B184: @ 811B184 push {lr} - ldr r2, _0811B1A4 + ldr r2, =0x0203a118 ldr r0, [r2] ldrb r1, [r0, 0x4] strb r1, [r0, 0x8] @@ -579332,7 +560199,7 @@ sub_811B184: @ 811B184 movs r0, 0x20 b _0811B1AE .align 2, 0 -_0811B1A4: .4byte 0x0203a118 + .pool _0811B1A8: movs r0, 0x5 strb r0, [r1, 0x4] @@ -579345,7 +560212,7 @@ _0811B1AE: thumb_func_start sub_811B1B4 sub_811B1B4: @ 811B1B4 push {r4,lr} - ldr r4, _0811B1D8 + ldr r4, =0x0203a118 ldr r1, [r4] ldrb r0, [r1, 0x4] strb r0, [r1, 0x8] @@ -579361,7 +560228,7 @@ sub_811B1B4: @ 811B1B4 bne _0811B1E8 b _0811B256 .align 2, 0 -_0811B1D8: .4byte 0x0203a118 + .pool _0811B1DC: cmp r0, 0x12 bne _0811B204 @@ -579441,7 +560308,7 @@ _0811B25C: thumb_func_start sub_811B264 sub_811B264: @ 811B264 push {lr} - ldr r2, _0811B280 + ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x4] strb r0, [r1, 0x8] @@ -579455,7 +560322,7 @@ sub_811B264: @ 811B264 beq _0811B28A b _0811B29E .align 2, 0 -_0811B280: .4byte 0x0203a118 + .pool _0811B284: cmp r0, 0x12 beq _0811B296 @@ -579480,18 +560347,18 @@ _0811B2A0: thumb_func_start sub_811B2A4 sub_811B2A4: @ 811B2A4 - ldr r0, _0811B2AC + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0x8] bx lr .align 2, 0 -_0811B2AC: .4byte 0x0203a118 + .pool thumb_func_end sub_811B2A4 thumb_func_start sub_811B2B0 sub_811B2B0: @ 811B2B0 push {lr} - ldr r0, _0811B2D8 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0x9] cmp r0, 0 @@ -579507,7 +560374,7 @@ sub_811B2B0: @ 811B2B0 bl sub_811F548 b _0811B2EC .align 2, 0 -_0811B2D8: .4byte 0x0203a118 + .pool _0811B2DC: bl sub_811B908 adds r1, r0, 0 @@ -579521,7 +560388,7 @@ _0811B2EC: lsrs r0, 16 cmp r0, 0 beq _0811B324 - ldr r2, _0811B320 + ldr r2, =0x0203a118 ldr r3, [r2] subs r0, 0x1 lsrs r1, r0, 31 @@ -579541,7 +560408,7 @@ _0811B2EC: movs r0, 0xB b _0811B326 .align 2, 0 -_0811B320: .4byte 0x0203a118 + .pool _0811B324: movs r0, 0 _0811B326: @@ -579551,20 +560418,20 @@ _0811B326: thumb_func_start sub_811B32C sub_811B32C: @ 811B32C - ldr r0, _0811B338 + ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x4] movs r0, 0xA bx lr .align 2, 0 -_0811B338: .4byte 0x0203a118 + .pool thumb_func_end sub_811B32C thumb_func_start sub_811B33C sub_811B33C: @ 811B33C push {lr} - ldr r1, _0811B35C + ldr r1, =0x0203a118 ldr r0, [r1] movs r2, 0 strb r2, [r0, 0xA] @@ -579580,7 +560447,7 @@ sub_811B33C: @ 811B33C strb r0, [r1, 0x9] b _0811B362 .align 2, 0 -_0811B35C: .4byte 0x0203a118 + .pool _0811B360: strb r2, [r1, 0x9] _0811B362: @@ -579592,18 +560459,17 @@ _0811B362: thumb_func_start sub_811B368 sub_811B368: @ 811B368 push {lr} - ldr r0, _0811B380 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x6 beq _0811B388 - ldr r0, _0811B384 + ldr r0, =0x0000ffff bl sub_811B488 movs r0, 0x1 b _0811B390 .align 2, 0 -_0811B380: .4byte 0x0203a118 -_0811B384: .4byte 0x0000ffff + .pool _0811B388: movs r0, 0x20 bl audio_play @@ -579634,7 +560500,7 @@ sub_811B394: @ 811B394 _0811B3BC: adds r0, r4, 0 bl sub_811B488 - ldr r0, _0811B3D4 + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r0, [r1] cmp r0, 0x6 @@ -579644,7 +560510,7 @@ _0811B3BC: movs r0, 0xD b _0811B3DC .align 2, 0 -_0811B3D4: .4byte 0x0203a118 + .pool _0811B3D8: strb r5, [r1, 0x4] movs r0, 0xC @@ -579658,7 +560524,7 @@ _0811B3DC: sub_811B3E4: @ 811B3E4 push {r4,r5,lr} movs r4, 0 - ldr r3, _0811B414 + ldr r3, =0x0203a118 ldr r0, [r3] ldrb r0, [r0, 0x7] cmp r4, r0 @@ -579683,20 +560549,20 @@ _0811B40E: pop {r0} bx r0 .align 2, 0 -_0811B414: .4byte 0x0203a118 + .pool thumb_func_end sub_811B3E4 thumb_func_start sub_811B418 sub_811B418: @ 811B418 push {r4,r5,lr} movs r3, 0 - ldr r2, _0811B44C + ldr r2, =0x0203a118 ldr r0, [r2] ldrb r0, [r0, 0x7] cmp r3, r0 bge _0811B444 adds r5, r2, 0 - ldr r0, _0811B450 + ldr r0, =0x0000ffff adds r4, r0, 0 _0811B42C: ldr r2, [r5] @@ -579716,15 +560582,14 @@ _0811B444: pop {r0} bx r0 .align 2, 0 -_0811B44C: .4byte 0x0203a118 -_0811B450: .4byte 0x0000ffff + .pool thumb_func_end sub_811B418 thumb_func_start sub_811B454 sub_811B454: @ 811B454 push {r4,r5,lr} movs r4, 0 - ldr r3, _0811B484 + ldr r3, =0x0203a118 ldr r0, [r3] ldrb r0, [r0, 0x7] cmp r4, r0 @@ -579749,7 +560614,7 @@ _0811B47E: pop {r0} bx r0 .align 2, 0 -_0811B484: .4byte 0x0203a118 + .pool thumb_func_end sub_811B454 thumb_func_start sub_811B488 @@ -579760,7 +560625,7 @@ sub_811B488: @ 811B488 lsrs r4, 16 bl sub_811B8C8 lsls r0, 16 - ldr r1, _0811B4A8 + ldr r1, =0x0203a118 ldr r1, [r1] lsrs r0, 15 adds r1, 0x3C @@ -579770,14 +560635,14 @@ sub_811B488: @ 811B488 pop {r0} bx r0 .align 2, 0 -_0811B4A8: .4byte 0x0203a118 + .pool thumb_func_end sub_811B488 thumb_func_start sub_811B4AC sub_811B4AC: @ 811B4AC push {r4,r5,lr} movs r2, 0 - ldr r0, _0811B4D4 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r1, [r0, 0x7] cmp r2, r1 @@ -579797,7 +560662,7 @@ _0811B4C2: movs r0, 0x1 b _0811B4E4 .align 2, 0 -_0811B4D4: .4byte 0x0203a118 + .pool _0811B4D8: adds r0, r2, 0x1 lsls r0, 16 @@ -579815,7 +560680,7 @@ _0811B4E4: thumb_func_start sub_811B4EC sub_811B4EC: @ 811B4EC push {lr} - ldr r0, _0811B514 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0] subs r0, 0x11 @@ -579833,7 +560698,7 @@ _0811B50E: movs r0, 0 b _0811B524 .align 2, 0 -_0811B514: .4byte 0x0203a118 + .pool _0811B518: movs r0, 0x1 b _0811B524 @@ -579850,7 +560715,7 @@ _0811B524: sub_811B528: @ 811B528 push {lr} adds r2, r0, 0 - ldr r0, _0811B54C + ldr r0, =0x0203a118 ldr r3, [r0] movs r1, 0xA ldrsb r1, [r3, r1] @@ -579865,7 +560730,7 @@ sub_811B528: @ 811B528 bl sub_811B568 b _0811B55E .align 2, 0 -_0811B54C: .4byte 0x0203a118 + .pool _0811B550: adds r0, r2, 0 bl sub_811B634 @@ -579893,7 +560758,7 @@ sub_811B568: @ 811B568 beq _0811B5A4 b _0811B62A _0811B57C: - ldr r0, _0811B598 + ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0xB ldrsb r0, [r1, r0] @@ -579909,14 +560774,14 @@ _0811B594: movs r0, 0xF b _0811B62C .align 2, 0 -_0811B598: .4byte 0x0203a118 + .pool _0811B59C: subs r0, r3, 0x1 strb r0, [r1, 0xC] movs r0, 0x11 b _0811B62C _0811B5A4: - ldr r0, _0811B5CC + ldr r0, =0x0203a118 ldr r2, [r0] movs r1, 0xB ldrsb r1, [r2, r1] @@ -579936,7 +560801,7 @@ _0811B5A4: movs r4, 0xF b _0811B5D6 .align 2, 0 -_0811B5CC: .4byte 0x0203a118 + .pool _0811B5D0: adds r0, r3, 0x1 strb r0, [r2, 0xC] @@ -579946,7 +560811,7 @@ _0811B5D6: adds r0, r4, 0 b _0811B62C _0811B5DE: - ldr r0, _0811B5F4 + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xA] movs r0, 0xA @@ -579957,12 +560822,12 @@ _0811B5DE: strb r0, [r1, 0xA] b _0811B594 .align 2, 0 -_0811B5F4: .4byte 0x0203a118 + .pool _0811B5F8: bl sub_811B744 b _0811B594 _0811B5FE: - ldr r0, _0811B620 + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xA] movs r0, 0xA @@ -579978,7 +560843,7 @@ _0811B5FE: bl sub_811B744 b _0811B594 .align 2, 0 -_0811B620: .4byte 0x0203a118 + .pool _0811B624: bl sub_811B744 b _0811B594 @@ -580004,7 +560869,7 @@ sub_811B634: @ 811B634 movs r0, 0 b _0811B6BC _0811B64A: - ldr r0, _0811B65C + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xB] movs r0, 0xB @@ -580014,7 +560879,7 @@ _0811B64A: subs r0, r2, 0x1 b _0811B662 .align 2, 0 -_0811B65C: .4byte 0x0203a118 + .pool _0811B660: movs r0, 0x3 _0811B662: @@ -580022,7 +560887,7 @@ _0811B662: bl sub_811B978 b _0811B6BA _0811B66A: - ldr r0, _0811B67C + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xB] movs r0, 0xB @@ -580032,12 +560897,12 @@ _0811B66A: adds r0, r2, 0x1 b _0811B662 .align 2, 0 -_0811B67C: .4byte 0x0203a118 + .pool _0811B680: movs r0, 0 b _0811B662 _0811B684: - ldr r0, _0811B69C + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r0, [r1, 0xA] adds r0, 0x1 @@ -580048,9 +560913,9 @@ _0811B684: beq _0811B6BA b _0811B6B6 .align 2, 0 -_0811B69C: .4byte 0x0203a118 + .pool _0811B6A0: - ldr r2, _0811B6C0 + ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0xA] subs r0, 0x1 @@ -580069,7 +560934,7 @@ _0811B6BC: pop {r1} bx r1 .align 2, 0 -_0811B6C0: .4byte 0x0203a118 + .pool thumb_func_end sub_811B634 thumb_func_start sub_811B6C4 @@ -580087,7 +560952,7 @@ sub_811B6C4: @ 811B6C4 movs r0, 0 b _0811B73A _0811B6DC: - ldr r0, _0811B6F0 + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r3, [r1, 0xB] movs r0, 0xB @@ -580097,12 +560962,12 @@ _0811B6DC: subs r0, r3, 0x1 b _0811B736 .align 2, 0 -_0811B6F0: .4byte 0x0203a118 + .pool _0811B6F4: strb r2, [r1, 0xB] b _0811B738 _0811B6F8: - ldr r0, _0811B70C + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xB] movs r0, 0xB @@ -580112,12 +560977,12 @@ _0811B6F8: adds r0, r2, 0x1 b _0811B736 .align 2, 0 -_0811B70C: .4byte 0x0203a118 + .pool _0811B710: movs r0, 0 b _0811B736 _0811B714: - ldr r0, _0811B724 + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r0, [r1, 0xB] adds r0, 0x1 @@ -580125,9 +560990,9 @@ _0811B714: bl sub_811B768 b _0811B738 .align 2, 0 -_0811B724: .4byte 0x0203a118 + .pool _0811B728: - ldr r2, _0811B740 + ldr r2, =0x0203a118 ldr r1, [r2] movs r0, 0 strb r0, [r1, 0xA] @@ -580142,13 +561007,13 @@ _0811B73A: pop {r1} bx r1 .align 2, 0 -_0811B740: .4byte 0x0203a118 + .pool thumb_func_end sub_811B6C4 thumb_func_start sub_811B744 sub_811B744: @ 811B744 push {lr} - ldr r2, _0811B764 + ldr r2, =0x0203a118 ldr r1, [r2] movs r0, 0xFF strb r0, [r1, 0xA] @@ -580164,13 +561029,13 @@ _0811B75E: pop {r0} bx r0 .align 2, 0 -_0811B764: .4byte 0x0203a118 + .pool thumb_func_end sub_811B744 thumb_func_start sub_811B768 sub_811B768: @ 811B768 push {r4,lr} - ldr r4, _0811B780 + ldr r4, =0x0203a118 ldr r1, [r4] ldrb r0, [r1, 0x9] cmp r0, 0 @@ -580180,7 +561045,7 @@ sub_811B768: @ 811B768 bl sub_811B978 b _0811B78E .align 2, 0 -_0811B780: .4byte 0x0203a118 + .pool _0811B784: ldrb r0, [r1, 0xB] bl sub_811B960 @@ -580200,12 +561065,12 @@ sub_811B794: @ 811B794 b _0811B8C0 _0811B79C: lsls r0, 2 - ldr r1, _0811B7A8 + ldr r1, =_0811B7AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811B7A8: .4byte _0811B7AC + .pool .align 2, 0 _0811B7AC: .4byte _0811B848 @@ -580215,7 +561080,7 @@ _0811B7AC: .4byte _0811B870 .4byte _0811B890 _0811B7C4: - ldr r0, _0811B7E4 + ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0x11 ldrsb r0, [r1, r0] @@ -580233,14 +561098,14 @@ _0811B7D6: subs r0, r2, 0x1 b _0811B80E .align 2, 0 -_0811B7E4: .4byte 0x0203a118 + .pool _0811B7E8: subs r0, r3, 0x1 strb r0, [r1, 0xE] movs r4, 0x13 b _0811B81E _0811B7F0: - ldr r0, _0811B814 + ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0x11 ldrsb r0, [r1, r0] @@ -580260,7 +561125,7 @@ _0811B80E: movs r4, 0x12 b _0811B81E .align 2, 0 -_0811B814: .4byte 0x0203a118 + .pool _0811B818: adds r0, r3, 0x1 strb r0, [r1, 0xE] @@ -580270,7 +561135,7 @@ _0811B81E: adds r0, r4, 0 b _0811B8C2 _0811B826: - ldr r0, _0811B838 + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0x10] movs r0, 0x10 @@ -580280,7 +561145,7 @@ _0811B826: subs r0, r2, 0x1 b _0811B83E .align 2, 0 -_0811B838: .4byte 0x0203a118 + .pool _0811B83C: movs r0, 0x1 _0811B83E: @@ -580290,7 +561155,7 @@ _0811B844: movs r0, 0x12 b _0811B8C2 _0811B848: - ldr r4, _0811B86C + ldr r4, =0x0203a118 ldr r1, [r4] ldrb r2, [r1, 0x10] movs r0, 0x10 @@ -580309,9 +561174,9 @@ _0811B866: strb r0, [r1, 0x10] b _0811B844 .align 2, 0 -_0811B86C: .4byte 0x0203a118 + .pool _0811B870: - ldr r0, _0811B884 + ldr r0, =0x0203a118 ldr r2, [r0] ldrb r0, [r2, 0xE] adds r1, r0, 0 @@ -580322,7 +561187,7 @@ _0811B870: subs r0, 0x4 b _0811B88A .align 2, 0 -_0811B884: .4byte 0x0203a118 + .pool _0811B888: movs r0, 0 _0811B88A: @@ -580330,7 +561195,7 @@ _0811B88A: movs r0, 0x15 b _0811B8C2 _0811B890: - ldr r3, _0811B8BC + ldr r3, =0x0203a118 ldr r1, [r3] ldrb r2, [r1, 0xE] ldrb r0, [r1, 0xF] @@ -580353,7 +561218,7 @@ _0811B8B4: movs r0, 0x16 b _0811B8C2 .align 2, 0 -_0811B8BC: .4byte 0x0203a118 + .pool _0811B8C0: movs r0, 0 _0811B8C2: @@ -580364,7 +561229,7 @@ _0811B8C2: thumb_func_start sub_811B8C8 sub_811B8C8: @ 811B8C8 - ldr r0, _0811B8E4 + ldr r0, =0x0203a118 ldr r0, [r0] movs r2, 0x6 ldrsb r2, [r0, r2] @@ -580378,12 +561243,12 @@ sub_811B8C8: @ 811B8C8 lsrs r0, 16 bx lr .align 2, 0 -_0811B8E4: .4byte 0x0203a118 + .pool thumb_func_end sub_811B8C8 thumb_func_start sub_811B8E8 sub_811B8E8: @ 811B8E8 - ldr r0, _0811B904 + ldr r0, =0x0203a118 ldr r0, [r0] movs r1, 0xB ldrsb r1, [r0, r1] @@ -580398,13 +561263,13 @@ sub_811B8E8: @ 811B8E8 lsrs r0, 16 bx lr .align 2, 0 -_0811B904: .4byte 0x0203a118 + .pool thumb_func_end sub_811B8E8 thumb_func_start sub_811B908 sub_811B908: @ 811B908 push {lr} - ldr r0, _0811B938 + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r0, [r1, 0xA] movs r3, 0 @@ -580420,7 +561285,7 @@ _0811B91A: movs r2, 0xB ldrsb r2, [r1, r2] _0811B926: - ldr r0, _0811B93C + ldr r0, =0x08597748 lsls r1, r2, 3 subs r1, r2 adds r1, r3, r1 @@ -580429,13 +561294,12 @@ _0811B926: pop {r1} bx r1 .align 2, 0 -_0811B938: .4byte 0x0203a118 -_0811B93C: .4byte 0x08597748 + .pool thumb_func_end sub_811B908 thumb_func_start sub_811B940 sub_811B940: @ 811B940 - ldr r0, _0811B95C + ldr r0, =0x0203a118 ldr r0, [r0] movs r1, 0x11 ldrsb r1, [r0, r1] @@ -580450,7 +561314,7 @@ sub_811B940: @ 811B940 lsrs r0, 16 bx lr .align 2, 0 -_0811B95C: .4byte 0x0203a118 + .pool thumb_func_end sub_811B940 thumb_func_start sub_811B960 @@ -580477,7 +561341,7 @@ sub_811B978: @ 811B978 push {lr} b _0811B98E _0811B97C: - ldr r0, _0811B99C + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0xA] movs r0, 0xA @@ -580495,7 +561359,7 @@ _0811B998: pop {r0} bx r0 .align 2, 0 -_0811B99C: .4byte 0x0203a118 + .pool thumb_func_end sub_811B978 thumb_func_start sub_811B9A0 @@ -580503,7 +561367,7 @@ sub_811B9A0: @ 811B9A0 push {lr} b _0811B9B6 _0811B9A4: - ldr r0, _0811B9C4 + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r2, [r1, 0x10] movs r0, 0x10 @@ -580521,13 +561385,13 @@ _0811B9C0: pop {r0} bx r0 .align 2, 0 -_0811B9C4: .4byte 0x0203a118 + .pool thumb_func_end sub_811B9A0 thumb_func_start sub_811B9C8 sub_811B9C8: @ 811B9C8 push {r4,lr} - ldr r4, _0811B9F4 + ldr r4, =0x0203a118 ldr r1, [r4] ldrb r0, [r1, 0x9] cmp r0, 0 @@ -580547,7 +561411,7 @@ _0811B9EE: adds r0, r1, 0 b _0811BA14 .align 2, 0 -_0811B9F4: .4byte 0x0203a118 + .pool _0811B9F8: ldrb r0, [r1, 0xB] bl sub_811B960 @@ -580590,8 +561454,8 @@ _0811BA34: thumb_func_start sub_811BA3C sub_811BA3C: @ 811BA3C - ldr r2, _0811BA54 - ldr r0, _0811BA58 + ldr r2, =0x08597550 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r1, [r0, 0x1] lsls r0, r1, 1 @@ -580602,24 +561466,23 @@ sub_811BA3C: @ 811BA3C lsrs r0, 7 bx lr .align 2, 0 -_0811BA54: .4byte 0x08597550 -_0811BA58: .4byte 0x0203a118 + .pool thumb_func_end sub_811BA3C thumb_func_start sub_811BA5C sub_811BA5C: @ 811BA5C - ldr r0, _0811BA64 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0] bx lr .align 2, 0 -_0811BA64: .4byte 0x0203a118 + .pool thumb_func_end sub_811BA5C thumb_func_start sub_811BA68 sub_811BA68: @ 811BA68 - ldr r2, _0811BA80 - ldr r0, _0811BA84 + ldr r2, =0x08597550 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r1, [r0, 0x1] lsls r0, r1, 1 @@ -580631,75 +561494,74 @@ sub_811BA68: @ 811BA68 lsrs r0, 25 bx lr .align 2, 0 -_0811BA80: .4byte 0x08597550 -_0811BA84: .4byte 0x0203a118 + .pool thumb_func_end sub_811BA68 thumb_func_start sub_811BA88 sub_811BA88: @ 811BA88 - ldr r0, _0811BA90 + ldr r0, =0x0203a118 ldr r0, [r0] ldr r0, [r0, 0x34] bx lr .align 2, 0 -_0811BA90: .4byte 0x0203a118 + .pool thumb_func_end sub_811BA88 thumb_func_start sub_811BA94 sub_811BA94: @ 811BA94 - ldr r0, _0811BA9C + ldr r0, =0x0203a118 ldr r0, [r0] adds r0, 0x3C bx lr .align 2, 0 -_0811BA9C: .4byte 0x0203a118 + .pool thumb_func_end sub_811BA94 thumb_func_start sub_811BAA0 sub_811BAA0: @ 811BAA0 - ldr r0, _0811BAA8 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0x3] bx lr .align 2, 0 -_0811BAA8: .4byte 0x0203a118 + .pool thumb_func_end sub_811BAA0 thumb_func_start sub_811BAAC sub_811BAAC: @ 811BAAC - ldr r0, _0811BAB4 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0x2] bx lr .align 2, 0 -_0811BAB4: .4byte 0x0203a118 + .pool thumb_func_end sub_811BAAC thumb_func_start sub_811BAB8 sub_811BAB8: @ 811BAB8 - ldr r0, _0811BAC0 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0x5] bx lr .align 2, 0 -_0811BAC0: .4byte 0x0203a118 + .pool thumb_func_end sub_811BAB8 thumb_func_start sub_811BAC4 sub_811BAC4: @ 811BAC4 - ldr r0, _0811BACC + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0x6] bx lr .align 2, 0 -_0811BACC: .4byte 0x0203a118 + .pool thumb_func_end sub_811BAC4 thumb_func_start sub_811BAD0 sub_811BAD0: @ 811BAD0 push {r4,r5,lr} - ldr r4, _0811BB00 - ldr r2, _0811BB04 + ldr r4, =0x08597550 + ldr r2, =0x0203a118 ldr r5, [r2] ldrb r3, [r5, 0x1] lsls r2, r3, 1 @@ -580722,15 +561584,14 @@ sub_811BAD0: @ 811BAD0 pop {r0} bx r0 .align 2, 0 -_0811BB00: .4byte 0x08597550 -_0811BB04: .4byte 0x0203a118 + .pool thumb_func_end sub_811BAD0 thumb_func_start sub_811BB08 sub_811BB08: @ 811BB08 push {r4,r5,lr} - ldr r4, _0811BB38 - ldr r2, _0811BB3C + ldr r4, =0x08597550 + ldr r2, =0x0203a118 ldr r5, [r2] ldrb r3, [r5, 0x1] lsls r2, r3, 1 @@ -580753,24 +561614,22 @@ sub_811BB08: @ 811BB08 pop {r0} bx r0 .align 2, 0 -_0811BB38: .4byte 0x08597550 -_0811BB3C: .4byte 0x0203a118 + .pool thumb_func_end sub_811BB08 thumb_func_start sub_811BB40 sub_811BB40: @ 811BB40 push {lr} adds r2, r0, 0 - ldr r0, _0811BB54 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x4 bne _0811BB5C - ldr r0, _0811BB58 + ldr r0, =0x085ec3b4 b _0811BB7A .align 2, 0 -_0811BB54: .4byte 0x0203a118 -_0811BB58: .4byte 0x085ec3b4 + .pool _0811BB5C: cmp r0, 0x4 blt _0811BB78 @@ -580778,15 +561637,14 @@ _0811BB5C: bgt _0811BB78 cmp r0, 0xF blt _0811BB78 - ldr r0, _0811BB70 + ldr r0, =0x085ec706 str r0, [r2] - ldr r0, _0811BB74 + ldr r0, =0x085ec727 b _0811BB7E .align 2, 0 -_0811BB70: .4byte 0x085ec706 -_0811BB74: .4byte 0x085ec727 + .pool _0811BB78: - ldr r0, _0811BB84 + ldr r0, =0x085ec3a6 _0811BB7A: str r0, [r2] movs r0, 0 @@ -580795,24 +561653,23 @@ _0811BB7E: pop {r0} bx r0 .align 2, 0 -_0811BB84: .4byte 0x085ec3a6 + .pool thumb_func_end sub_811BB40 thumb_func_start sub_811BB88 sub_811BB88: @ 811BB88 - ldr r2, _0811BB94 + ldr r2, =0x085ec410 str r2, [r0] - ldr r0, _0811BB98 + ldr r0, =0x085ec42f str r0, [r1] bx lr .align 2, 0 -_0811BB94: .4byte 0x085ec410 -_0811BB98: .4byte 0x085ec42f + .pool thumb_func_end sub_811BB88 thumb_func_start sub_811BB9C sub_811BB9C: @ 811BB9C - ldr r2, _0811BBAC + ldr r2, =0x0203a118 ldr r3, [r2] ldrb r2, [r3, 0xA] strb r2, [r0] @@ -580820,32 +561677,32 @@ sub_811BB9C: @ 811BB9C strb r0, [r1] bx lr .align 2, 0 -_0811BBAC: .4byte 0x0203a118 + .pool thumb_func_end sub_811BB9C thumb_func_start sub_811BBB0 sub_811BBB0: @ 811BBB0 - ldr r0, _0811BBB8 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0x9] bx lr .align 2, 0 -_0811BBB8: .4byte 0x0203a118 + .pool thumb_func_end sub_811BBB0 thumb_func_start sub_811BBBC sub_811BBBC: @ 811BBBC - ldr r0, _0811BBC4 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0xC] bx lr .align 2, 0 -_0811BBC4: .4byte 0x0203a118 + .pool thumb_func_end sub_811BBBC thumb_func_start sub_811BBC8 sub_811BBC8: @ 811BBC8 - ldr r2, _0811BBD8 + ldr r2, =0x0203a118 ldr r3, [r2] ldrb r2, [r3, 0x10] strb r2, [r0] @@ -580853,27 +561710,27 @@ sub_811BBC8: @ 811BBC8 strb r0, [r1] bx lr .align 2, 0 -_0811BBD8: .4byte 0x0203a118 + .pool thumb_func_end sub_811BBC8 thumb_func_start sub_811BBDC sub_811BBDC: @ 811BBDC - ldr r0, _0811BBE4 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0xE] bx lr .align 2, 0 -_0811BBE4: .4byte 0x0203a118 + .pool thumb_func_end sub_811BBDC thumb_func_start sub_811BBE8 sub_811BBE8: @ 811BBE8 - ldr r0, _0811BBF0 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0xF] bx lr .align 2, 0 -_0811BBF0: .4byte 0x0203a118 + .pool thumb_func_end sub_811BBE8 thumb_func_start sub_811BBF4 @@ -580885,7 +561742,7 @@ sub_811BBF4: @ 811BBF4 thumb_func_start sub_811BBF8 sub_811BBF8: @ 811BBF8 push {lr} - ldr r0, _0811BC0C + ldr r0, =0x0203a118 ldr r1, [r0] ldrb r0, [r1, 0x4] cmp r0, 0x2 @@ -580894,7 +561751,7 @@ sub_811BBF8: @ 811BBF8 beq _0811BC1A b _0811BC24 .align 2, 0 -_0811BC0C: .4byte 0x0203a118 + .pool _0811BC10: ldrb r0, [r1, 0x9] cmp r0, 0 @@ -580918,7 +561775,7 @@ _0811BC26: thumb_func_start sub_811BC2C sub_811BC2C: @ 811BC2C push {lr} - ldr r0, _0811BC40 + ldr r0, =0x0203a118 ldr r2, [r0] ldrb r0, [r2, 0x4] cmp r0, 0x2 @@ -580927,7 +561784,7 @@ sub_811BC2C: @ 811BC2C beq _0811BC5A b _0811BC68 .align 2, 0 -_0811BC40: .4byte 0x0203a118 + .pool _0811BC44: ldrb r0, [r2, 0x9] cmp r0, 0 @@ -580972,7 +561829,7 @@ sub_811BC7C: @ 811BC7C movs r2, 0 cmp r2, r3 bcs _0811BCB2 - ldr r0, _0811BCA4 + ldr r0, =0x0203a118 ldr r0, [r0] adds r4, r0, 0 adds r4, 0x3C @@ -580987,7 +561844,7 @@ _0811BC92: movs r0, 0x1 b _0811BCB4 .align 2, 0 -_0811BCA4: .4byte 0x0203a118 + .pool _0811BCA8: adds r0, r2, 0x1 lsls r0, 24 @@ -581004,12 +561861,12 @@ _0811BCB4: thumb_func_start sub_811BCBC sub_811BCBC: @ 811BCBC - ldr r0, _0811BCC4 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0, 0x12] bx lr .align 2, 0 -_0811BCC4: .4byte 0x0203a118 + .pool thumb_func_end sub_811BCBC thumb_func_start sub_811BCC8 @@ -581018,7 +561875,7 @@ sub_811BCC8: @ 811BCC8 lsls r0, 24 lsrs r3, r0, 24 movs r1, 0 - ldr r2, _0811BCE0 + ldr r2, =0x08597550 _0811BCD2: ldrb r0, [r2] cmp r0, r3 @@ -581027,7 +561884,7 @@ _0811BCD2: lsrs r0, 24 b _0811BCEE .align 2, 0 -_0811BCE0: .4byte 0x08597550 + .pool _0811BCE4: adds r2, 0x18 adds r1, 0x1 @@ -581043,12 +561900,12 @@ _0811BCEE: sub_811BCF4: @ 811BCF4 push {r4,lr} movs r2, 0 - ldr r0, _0811BD14 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r1, [r0, 0x7] cmp r2, r1 bge _0811BD24 - ldr r4, _0811BD18 + ldr r4, =0x0000ffff adds r3, r1, 0 adds r1, r0, 0 adds r1, 0x3C @@ -581059,8 +561916,7 @@ _0811BD0A: movs r0, 0 b _0811BD26 .align 2, 0 -_0811BD14: .4byte 0x0203a118 -_0811BD18: .4byte 0x0000ffff + .pool _0811BD1C: adds r1, 0x2 adds r2, 0x1 @@ -581078,12 +561934,12 @@ _0811BD26: sub_811BD2C: @ 811BD2C push {r4,lr} movs r2, 0 - ldr r0, _0811BD4C + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r1, [r0, 0x7] cmp r2, r1 bge _0811BD5C - ldr r4, _0811BD50 + ldr r4, =0x0000ffff adds r3, r1, 0 adds r1, r0, 0 adds r1, 0x3C @@ -581094,8 +561950,7 @@ _0811BD42: movs r0, 0 b _0811BD5E .align 2, 0 -_0811BD4C: .4byte 0x0203a118 -_0811BD50: .4byte 0x0000ffff + .pool _0811BD54: adds r1, 0x2 adds r2, 0x1 @@ -581112,7 +561967,7 @@ _0811BD5E: thumb_func_start sub_811BD64 sub_811BD64: @ 811BD64 push {r4,lr} - ldr r0, _0811BD78 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x11 @@ -581120,16 +561975,16 @@ sub_811BD64: @ 811BD64 bl sub_811BCF4 b _0811BD9C .align 2, 0 -_0811BD78: .4byte 0x0203a118 + .pool _0811BD7C: movs r0, 0 b _0811BD9C _0811BD80: - ldr r0, _0811BDA4 + ldr r0, =0x03005d8c ldr r0, [r0] movs r2, 0 - ldr r3, _0811BDA8 - ldr r4, _0811BDAC + ldr r3, =0x0000ffff + ldr r4, =0x00003b5a adds r1, r0, r4 _0811BD8C: ldrh r0, [r1] @@ -581145,15 +562000,13 @@ _0811BD9C: pop {r1} bx r1 .align 2, 0 -_0811BDA4: .4byte 0x03005d8c -_0811BDA8: .4byte 0x0000ffff -_0811BDAC: .4byte 0x00003b5a + .pool thumb_func_end sub_811BD64 thumb_func_start sub_811BDB0 sub_811BDB0: @ 811BDB0 push {lr} - ldr r0, _0811BDC4 + ldr r0, =0x0203a118 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x12 @@ -581161,15 +562014,15 @@ sub_811BDB0: @ 811BDB0 bl sub_811BCF4 b _0811BDDE .align 2, 0 -_0811BDC4: .4byte 0x0203a118 + .pool _0811BDC8: - ldr r0, _0811BDE4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0811BDE8 + ldr r1, =0x00003b58 adds r0, r1 movs r2, 0 ldrh r1, [r0, 0x14] - ldr r0, _0811BDEC + ldr r0, =0x0000ffff cmp r1, r0 bne _0811BDDC movs r2, 0x1 @@ -581179,9 +562032,7 @@ _0811BDDE: pop {r1} bx r1 .align 2, 0 -_0811BDE4: .4byte 0x03005d8c -_0811BDE8: .4byte 0x00003b58 -_0811BDEC: .4byte 0x0000ffff + .pool thumb_func_end sub_811BDB0 thumb_func_start sub_811BDF0 @@ -581189,17 +562040,17 @@ sub_811BDF0: @ 811BDF0 push {r4-r6,lr} sub sp, 0x20 adds r6, r0, 0 - ldr r0, _0811BE28 + ldr r0, =0x03005d8c ldr r4, [r0] bl sub_81AFBF0 - ldr r0, _0811BE2C + ldr r0, =0x00003b70 adds r5, r4, r0 adds r0, r5, 0 bl sub_8008C24 lsls r0, 16 cmp r0, 0 beq _0811BE34 - ldr r1, _0811BE30 + ldr r1, =0x00003b85 adds r0, r4, r1 ldrb r2, [r0] mov r0, sp @@ -581210,15 +562061,13 @@ sub_811BDF0: @ 811BDF0 bl sub_81AFC0C b _0811BE3C .align 2, 0 -_0811BE28: .4byte 0x03005d8c -_0811BE2C: .4byte 0x00003b70 -_0811BE30: .4byte 0x00003b85 + .pool _0811BE34: - ldr r1, _0811BE4C + ldr r1, =0x085ec6b2 movs r0, 0 bl sub_81AFC0C _0811BE3C: - ldr r1, _0811BE50 + ldr r1, =0x085ec6a8 adds r0, r6, 0 bl sub_81AFC28 add sp, 0x20 @@ -581226,23 +562075,21 @@ _0811BE3C: pop {r0} bx r0 .align 2, 0 -_0811BE4C: .4byte 0x085ec6b2 -_0811BE50: .4byte 0x085ec6a8 + .pool thumb_func_end sub_811BDF0 thumb_func_start sub_811BE54 sub_811BE54: @ 811BE54 push {r4,r5,lr} - ldr r0, _0811BE64 + ldr r0, =0x0203a118 ldr r0, [r0] adds r4, r0, 0 adds r4, 0x3C - ldr r2, _0811BE68 + ldr r2, =0x02021dc4 movs r5, 0 b _0811BE86 .align 2, 0 -_0811BE64: .4byte 0x0203a118 -_0811BE68: .4byte 0x02021dc4 + .pool _0811BE6C: ldrh r1, [r4] adds r0, r2, 0 @@ -581254,7 +562101,7 @@ _0811BE6C: adds r2, 0x1 adds r4, 0x2 adds r5, 0x1 - ldr r0, _0811BE98 + ldr r0, =0x0203a118 ldr r0, [r0] _0811BE86: ldrb r0, [r0, 0x7] @@ -581267,13 +562114,13 @@ _0811BE86: pop {r0} bx r0 .align 2, 0 -_0811BE98: .4byte 0x0203a118 + .pool thumb_func_end sub_811BE54 thumb_func_start sub_811BE9C sub_811BE9C: @ 811BE9C push {r4,r5,lr} - ldr r5, _0811BEB4 + ldr r5, =0x0203a118 ldr r0, [r5] ldrb r0, [r0] cmp r0, 0x9 @@ -581284,7 +562131,7 @@ sub_811BE9C: @ 811BE9C beq _0811BEC2 b _0811BF14 .align 2, 0 -_0811BEB4: .4byte 0x0203a118 + .pool _0811BEB8: cmp r0, 0xD beq _0811BF0C @@ -581292,30 +562139,30 @@ _0811BEB8: beq _0811BED0 b _0811BF14 _0811BEC2: - ldr r0, _0811BECC + ldr r0, =0x00000865 bl flag_set b _0811BF14 .align 2, 0 -_0811BECC: .4byte 0x00000865 + .pool _0811BED0: bl sub_811BF20 adds r1, r0, 0 cmp r1, 0 beq _0811BEE4 - ldr r1, _0811BEE0 + ldr r1, =0x020375e0 movs r0, 0x2 b _0811BF12 .align 2, 0 -_0811BEE0: .4byte 0x020375e0 + .pool _0811BEE4: - ldr r0, _0811BEEC + ldr r0, =0x020375e0 strh r1, [r0] b _0811BF14 .align 2, 0 -_0811BEEC: .4byte 0x020375e0 + .pool _0811BEF0: bl sub_811BE54 - ldr r4, _0811BF08 + ldr r4, =0x020375e0 ldr r0, [r5] adds r0, 0x3C bl sub_81226D8 @@ -581324,10 +562171,10 @@ _0811BEF0: strh r0, [r4] b _0811BF14 .align 2, 0 -_0811BF08: .4byte 0x020375e0 + .pool _0811BF0C: bl sub_811BF40 - ldr r1, _0811BF1C + ldr r1, =0x020375e0 _0811BF12: strh r0, [r1] _0811BF14: @@ -581335,13 +562182,13 @@ _0811BF14: pop {r0} bx r0 .align 2, 0 -_0811BF1C: .4byte 0x020375e0 + .pool thumb_func_end sub_811BE9C thumb_func_start sub_811BF20 sub_811BF20: @ 811BF20 push {lr} - ldr r0, _0811BF3C + ldr r0, =0x08597764 movs r1, 0x4 bl sub_811BC7C movs r1, 0 @@ -581354,7 +562201,7 @@ _0811BF34: pop {r1} bx r1 .align 2, 0 -_0811BF3C: .4byte 0x08597764 + .pool thumb_func_end sub_811BF20 thumb_func_start sub_811BF40 @@ -581365,7 +562212,7 @@ sub_811BF40: @ 811BF40 lsls r5, 9 _0811BF48: lsls r0, r4, 2 - ldr r1, _0811BF60 + ldr r1, =0x0859776c adds r0, r1 movs r1, 0x2 bl sub_811BC7C @@ -581375,7 +562222,7 @@ _0811BF48: lsrs r0, r5, 16 b _0811BF72 .align 2, 0 -_0811BF60: .4byte 0x0859776c + .pool _0811BF64: movs r0, 0x80 lsls r0, 9 @@ -581392,13 +562239,13 @@ _0811BF72: thumb_func_start sub_811BF78 sub_811BF78: @ 811BF78 - ldr r0, _0811BF84 + ldr r0, =0x0203a118 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x13] bx lr .align 2, 0 -_0811BF84: .4byte 0x0203a118 + .pool thumb_func_end sub_811BF78 thumb_func_start sub_811BF88 @@ -581427,7 +562274,7 @@ _0811BF9E: sub_811BFA4: @ 811BFA4 push {r4,lr} sub sp, 0x8 - ldr r0, _0811BFC0 + ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x5 @@ -581435,13 +562282,12 @@ sub_811BFA4: @ 811BFA4 b _0811C120 _0811BFB4: lsls r0, 2 - ldr r1, _0811BFC4 + ldr r1, =_0811BFC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811BFC0: .4byte 0x0203a11c -_0811BFC4: .4byte _0811BFC8 + .pool .align 2, 0 _0811BFC8: .4byte _0811BFE0 @@ -581453,11 +562299,11 @@ _0811BFC8: _0811BFE0: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0811C034 + ldr r1, =0x08597c54 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r4, _0811C038 + ldr r4, =0x0203a11c ldr r1, [r4] movs r0, 0xB0 lsls r0, 4 @@ -581470,7 +562316,7 @@ _0811BFE0: adds r1, r0 movs r0, 0x1 bl bg_set_tilemap - ldr r0, _0811C03C + ldr r0, =0x08597c64 bl Window_InitFromTemplates bl TextBox_ResetSomeField bl sub_811CF64 @@ -581479,30 +562325,27 @@ _0811BFE0: str r0, [sp, 0x4] movs r1, 0xE0 lsls r1, 19 - ldr r2, _0811C040 + ldr r2, =0x01000100 add r0, sp, 0x4 bl CpuFastSet b _0811C124 .align 2, 0 -_0811C034: .4byte 0x08597c54 -_0811C038: .4byte 0x0203a11c -_0811C03C: .4byte 0x08597c64 -_0811C040: .4byte 0x01000100 + .pool _0811C044: - ldr r1, _0811C084 + ldr r1, =0x08dcbdd0 movs r0, 0 str r0, [sp] movs r0, 0x3 movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _0811C088 + ldr r1, =0x08dcbf10 movs r0, 0x3 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map bl sub_811D60C - ldr r0, _0811C08C + ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xC0 lsls r1, 2 @@ -581514,11 +562357,9 @@ _0811C044: bl gpu_copy_wram_bg_tilemap_to_vram b _0811C124 .align 2, 0 -_0811C084: .4byte 0x08dcbdd0 -_0811C088: .4byte 0x08dcbf10 -_0811C08C: .4byte 0x0203a11c + .pool _0811C090: - ldr r1, _0811C0A8 + ldr r1, =0x08597b54 movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -581529,7 +562370,7 @@ _0811C090: bl gpu_copy_wram_bg_tilemap_to_vram b _0811C124 .align 2, 0 -_0811C0A8: .4byte 0x08597b54 + .pool _0811C0AC: bl sub_811CFCC bl sub_811D0BC @@ -581577,7 +562418,7 @@ _0811C120: movs r0, 0 b _0811C130 _0811C124: - ldr r0, _0811C138 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 @@ -581590,13 +562431,13 @@ _0811C130: pop {r1} bx r1 .align 2, 0 -_0811C138: .4byte 0x0203a11c + .pool thumb_func_end sub_811BFA4 thumb_func_start sub_811C13C sub_811C13C: @ 811C13C push {r4,lr} - ldr r4, _0811C154 + ldr r4, =0x0203a11c ldr r0, [r4] cmp r0, 0 beq _0811C14E @@ -581608,13 +562449,13 @@ _0811C14E: pop {r0} bx r0 .align 2, 0 -_0811C154: .4byte 0x0203a11c + .pool thumb_func_end sub_811C13C thumb_func_start sub_811C158 sub_811C158: @ 811C158 push {lr} - ldr r1, _0811C16C + ldr r1, =0x0203a11c ldr r1, [r1] movs r2, 0 strh r0, [r1, 0x4] @@ -581623,13 +562464,13 @@ sub_811C158: @ 811C158 pop {r0} bx r0 .align 2, 0 -_0811C16C: .4byte 0x0203a11c + .pool thumb_func_end sub_811C158 thumb_func_start sub_811C170 sub_811C170: @ 811C170 push {lr} - ldr r0, _0811C188 + ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0x22 @@ -581637,13 +562478,12 @@ sub_811C170: @ 811C170 b _0811C2CE _0811C17E: lsls r0, 2 - ldr r1, _0811C18C + ldr r1, =_0811C190 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811C188: .4byte 0x0203a11c -_0811C18C: .4byte _0811C190 + .pool .align 2, 0 _0811C190: .4byte _0811C2CE @@ -581781,7 +562621,7 @@ _0811C2D0: thumb_func_start sub_811C2D4 sub_811C2D4: @ 811C2D4 push {r4,lr} - ldr r4, _0811C2E8 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -581790,7 +562630,7 @@ sub_811C2D4: @ 811C2D4 beq _0811C2FA b _0811C304 .align 2, 0 -_0811C2E8: .4byte 0x0203a11c + .pool _0811C2EC: bl sub_811D2C8 ldr r1, [r4] @@ -581840,7 +562680,7 @@ sub_811C30C: @ 811C30C adds r0, r1, 0 lsls r0, 1 adds r4, r0 - ldr r1, _0811C378 + ldr r1, =0x08597c30 mov r2, r10 lsls r0, r2, 2 adds r0, r1 @@ -581854,7 +562694,7 @@ sub_811C30C: @ 811C30C movs r5, 0 cmp r5, r7 bcs _0811C3AA - ldr r2, _0811C37C + ldr r2, =0x0000ffff mov r8, r2 _0811C36C: ldrh r0, [r4] @@ -581863,8 +562703,7 @@ _0811C36C: movs r0, 0x48 b _0811C392 .align 2, 0 -_0811C378: .4byte 0x08597c30 -_0811C37C: .4byte 0x0000ffff + .pool _0811C380: ldrh r1, [r4] mov r0, sp @@ -581887,7 +562726,7 @@ _0811C392: cmp r5, r7 bcc _0811C36C _0811C3AA: - ldr r1, _0811C3E0 + ldr r1, =0x08597c30 mov r2, r10 lsls r0, r2, 2 adds r0, r1 @@ -581914,7 +562753,7 @@ _0811C3AA: pop {r1} bx r1 .align 2, 0 -_0811C3E0: .4byte 0x08597c30 + .pool thumb_func_end sub_811C30C thumb_func_start sub_811C3E4 @@ -581936,7 +562775,7 @@ sub_811C3E4: @ 811C3E4 thumb_func_start sub_811C404 sub_811C404: @ 811C404 push {r4,lr} - ldr r4, _0811C418 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -581945,7 +562784,7 @@ sub_811C404: @ 811C404 beq _0811C436 b _0811C440 .align 2, 0 -_0811C418: .4byte 0x0203a11c + .pool _0811C41C: bl sub_811DF90 movs r0, 0x2 @@ -581973,7 +562812,7 @@ _0811C442: thumb_func_start sub_811C448 sub_811C448: @ 811C448 push {r4,lr} - ldr r4, _0811C45C + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -581982,7 +562821,7 @@ sub_811C448: @ 811C448 beq _0811C47A b _0811C484 .align 2, 0 -_0811C45C: .4byte 0x0203a11c + .pool _0811C460: bl sub_811DF90 movs r0, 0x3 @@ -582010,7 +562849,7 @@ _0811C486: thumb_func_start sub_811C48C sub_811C48C: @ 811C48C push {r4,lr} - ldr r4, _0811C4A0 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -582019,7 +562858,7 @@ sub_811C48C: @ 811C48C beq _0811C4BE b _0811C4C8 .align 2, 0 -_0811C4A0: .4byte 0x0203a11c + .pool _0811C4A4: bl sub_811DF90 movs r0, 0x1 @@ -582047,7 +562886,7 @@ _0811C4CA: thumb_func_start sub_811C4D0 sub_811C4D0: @ 811C4D0 push {r4,lr} - ldr r4, _0811C4E4 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -582056,7 +562895,7 @@ sub_811C4D0: @ 811C4D0 beq _0811C506 b _0811C510 .align 2, 0 -_0811C4E4: .4byte 0x0203a11c + .pool _0811C4E8: bl sub_811DFB0 movs r0, 0 @@ -582085,7 +562924,7 @@ _0811C512: thumb_func_start sub_811C518 sub_811C518: @ 811C518 push {r4,lr} - ldr r4, _0811C52C + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -582095,7 +562934,7 @@ sub_811C518: @ 811C518 movs r0, 0x1 b _0811C54E .align 2, 0 -_0811C52C: .4byte 0x0203a11c + .pool _0811C530: bl sub_811DFB0 movs r0, 0 @@ -582118,19 +562957,18 @@ _0811C54E: thumb_func_start sub_811C554 sub_811C554: @ 811C554 push {lr} - ldr r0, _0811C56C + ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x4 bhi _0811C60E lsls r0, 2 - ldr r1, _0811C570 + ldr r1, =_0811C574 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811C56C: .4byte 0x0203a11c -_0811C570: .4byte _0811C574 + .pool .align 2, 0 _0811C574: .4byte _0811C588 @@ -582174,14 +563012,14 @@ _0811C5CC: bne _0811C618 bl sub_811E3AC _0811C5DA: - ldr r0, _0811C5E8 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _0811C618 .align 2, 0 -_0811C5E8: .4byte 0x0203a11c + .pool _0811C5EC: bl sub_811E418 lsls r0, 24 @@ -582191,7 +563029,7 @@ _0811C5EC: movs r0, 0 bl sub_811E6E0 bl sub_811E64C - ldr r0, _0811C614 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 @@ -582200,7 +563038,7 @@ _0811C60E: movs r0, 0 b _0811C61A .align 2, 0 -_0811C614: .4byte 0x0203a11c + .pool _0811C618: movs r0, 0x1 _0811C61A: @@ -582211,19 +563049,18 @@ _0811C61A: thumb_func_start sub_811C620 sub_811C620: @ 811C620 push {lr} - ldr r0, _0811C638 + ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x4 bhi _0811C6B8 lsls r0, 2 - ldr r1, _0811C63C + ldr r1, =_0811C640 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811C638: .4byte 0x0203a11c -_0811C63C: .4byte _0811C640 + .pool .align 2, 0 _0811C640: .4byte _0811C654 @@ -582244,7 +563081,7 @@ _0811C662: beq _0811C6B8 movs r0, 0x1 bl sub_811D9CC - ldr r0, _0811C68C + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 @@ -582256,7 +563093,7 @@ _0811C67E: bne _0811C6B8 b _0811C6A4 .align 2, 0 -_0811C68C: .4byte 0x0203a11c + .pool _0811C690: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -582266,14 +563103,14 @@ _0811C690: movs r0, 0 bl gpu_sync_bg_show _0811C6A4: - ldr r0, _0811C6B0 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _0811C6B8 .align 2, 0 -_0811C6B0: .4byte 0x0203a11c + .pool _0811C6B4: movs r0, 0 b _0811C6BA @@ -582287,19 +563124,18 @@ _0811C6BA: thumb_func_start sub_811C6C0 sub_811C6C0: @ 811C6C0 push {lr} - ldr r0, _0811C6D8 + ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x4 bhi _0811C778 lsls r0, 2 - ldr r1, _0811C6DC + ldr r1, =_0811C6E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811C6D8: .4byte 0x0203a11c -_0811C6DC: .4byte _0811C6E0 + .pool .align 2, 0 _0811C6E0: .4byte _0811C6F4 @@ -582334,14 +563170,14 @@ _0811C722: bl sub_811D9CC bl sub_811E578 _0811C736: - ldr r0, _0811C744 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _0811C778 .align 2, 0 -_0811C744: .4byte 0x0203a11c + .pool _0811C748: bl sub_811DAA4 lsls r0, 24 @@ -582353,7 +563189,7 @@ _0811C748: bne _0811C778 bl sub_811E64C bl sub_811DFC8 - ldr r0, _0811C774 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 @@ -582362,7 +563198,7 @@ _0811C76E: movs r0, 0 b _0811C77A .align 2, 0 -_0811C774: .4byte 0x0203a11c + .pool _0811C778: movs r0, 0x1 _0811C77A: @@ -582382,7 +563218,7 @@ sub_811C780: @ 811C780 thumb_func_start sub_811C78C sub_811C78C: @ 811C78C push {r4,lr} - ldr r4, _0811C7A0 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -582391,7 +563227,7 @@ sub_811C78C: @ 811C78C beq _0811C7B4 b _0811C7CA .align 2, 0 -_0811C7A0: .4byte 0x0203a11c + .pool _0811C7A4: movs r0, 0x1 movs r1, 0x4 @@ -582420,7 +563256,7 @@ _0811C7CC: thumb_func_start sub_811C7D4 sub_811C7D4: @ 811C7D4 push {r4,lr} - ldr r4, _0811C7EC + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0x1 @@ -582431,7 +563267,7 @@ sub_811C7D4: @ 811C7D4 beq _0811C7F6 b _0811C828 .align 2, 0 -_0811C7EC: .4byte 0x0203a11c + .pool _0811C7F0: cmp r0, 0x2 beq _0811C820 @@ -582451,7 +563287,7 @@ _0811C808: cmp r0, 0 bne _0811C828 bl sub_811E64C - ldr r0, _0811C824 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 @@ -582460,7 +563296,7 @@ _0811C820: movs r0, 0 b _0811C82A .align 2, 0 -_0811C824: .4byte 0x0203a11c + .pool _0811C828: movs r0, 0x1 _0811C82A: @@ -582472,19 +563308,18 @@ _0811C82A: thumb_func_start sub_811C830 sub_811C830: @ 811C830 push {lr} - ldr r0, _0811C848 + ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x5 bhi _0811C8E8 lsls r0, 2 - ldr r1, _0811C84C + ldr r1, =_0811C850 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811C848: .4byte 0x0203a11c -_0811C84C: .4byte _0811C850 + .pool .align 2, 0 _0811C850: .4byte _0811C868 @@ -582521,14 +563356,14 @@ _0811C898: movs r0, 0x2 bl sub_811D698 _0811C8A8: - ldr r0, _0811C8B4 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _0811C8E8 .align 2, 0 -_0811C8B4: .4byte 0x0203a11c + .pool _0811C8B8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -582539,7 +563374,7 @@ _0811C8B8: bl sub_811E6E0 bl sub_811E64C bl sub_811E794 - ldr r0, _0811C8E4 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 @@ -582548,7 +563383,7 @@ _0811C8DE: movs r0, 0 b _0811C8EA .align 2, 0 -_0811C8E4: .4byte 0x0203a11c + .pool _0811C8E8: movs r0, 0x1 _0811C8EA: @@ -582559,19 +563394,18 @@ _0811C8EA: thumb_func_start sub_811C8F0 sub_811C8F0: @ 811C8F0 push {lr} - ldr r0, _0811C908 + ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x5 bhi _0811C994 lsls r0, 2 - ldr r1, _0811C90C + ldr r1, =_0811C910 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811C908: .4byte 0x0203a11c -_0811C90C: .4byte _0811C910 + .pool .align 2, 0 _0811C910: .4byte _0811C928 @@ -582605,21 +563439,21 @@ _0811C952: movs r0, 0 bl gpu_sync_bg_show _0811C962: - ldr r0, _0811C970 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _0811C994 .align 2, 0 -_0811C970: .4byte 0x0203a11c + .pool _0811C974: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _0811C994 bl sub_811DFB0 - ldr r0, _0811C990 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 @@ -582628,7 +563462,7 @@ _0811C98C: movs r0, 0 b _0811C996 .align 2, 0 -_0811C990: .4byte 0x0203a11c + .pool _0811C994: movs r0, 0x1 _0811C996: @@ -582639,19 +563473,18 @@ _0811C996: thumb_func_start sub_811C99C sub_811C99C: @ 811C99C push {lr} - ldr r0, _0811C9B4 + ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x6 bhi _0811CA54 lsls r0, 2 - ldr r1, _0811C9B8 + ldr r1, =_0811C9BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811C9B4: .4byte 0x0203a11c -_0811C9B8: .4byte _0811C9BC + .pool .align 2, 0 _0811C9BC: .4byte _0811C9D8 @@ -582694,21 +563527,21 @@ _0811CA14: movs r0, 0 bl gpu_sync_bg_show _0811CA24: - ldr r0, _0811CA30 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _0811CA54 .align 2, 0 -_0811CA30: .4byte 0x0203a11c + .pool _0811CA34: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _0811CA54 bl sub_811DFB0 - ldr r0, _0811CA50 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 @@ -582717,7 +563550,7 @@ _0811CA4C: movs r0, 0 b _0811CA56 .align 2, 0 -_0811CA50: .4byte 0x0203a11c + .pool _0811CA54: movs r0, 0x1 _0811CA56: @@ -582728,19 +563561,18 @@ _0811CA56: thumb_func_start sub_811CA5C sub_811CA5C: @ 811CA5C push {lr} - ldr r0, _0811CA74 + ldr r0, =0x0203a11c ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x4 bhi _0811CB10 lsls r0, 2 - ldr r1, _0811CA78 + ldr r1, =_0811CA7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811CA74: .4byte 0x0203a11c -_0811CA78: .4byte _0811CA7C + .pool .align 2, 0 _0811CA7C: .4byte _0811CA90 @@ -582776,14 +563608,14 @@ _0811CAC4: bne _0811CB10 bl sub_811E3AC _0811CAD2: - ldr r0, _0811CAE0 + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _0811CB10 .align 2, 0 -_0811CAE0: .4byte 0x0203a11c + .pool _0811CAE4: bl sub_811E418 lsls r0, 24 @@ -582793,7 +563625,7 @@ _0811CAE4: movs r0, 0 bl sub_811E6E0 bl sub_811E64C - ldr r0, _0811CB0C + ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 @@ -582801,7 +563633,7 @@ _0811CAE4: movs r0, 0 b _0811CB12 .align 2, 0 -_0811CB0C: .4byte 0x0203a11c + .pool _0811CB10: movs r0, 0x1 _0811CB12: @@ -582821,7 +563653,7 @@ sub_811CB18: @ 811CB18 thumb_func_start sub_811CB24 sub_811CB24: @ 811CB24 push {r4,lr} - ldr r4, _0811CB3C + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0x1 @@ -582832,7 +563664,7 @@ sub_811CB24: @ 811CB24 beq _0811CB4A b _0811CB8E .align 2, 0 -_0811CB3C: .4byte 0x0203a11c + .pool _0811CB40: cmp r0, 0x2 beq _0811CB6C @@ -582882,7 +563714,7 @@ _0811CB90: thumb_func_start sub_811CB98 sub_811CB98: @ 811CB98 push {r4,lr} - ldr r4, _0811CBB0 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0x1 @@ -582893,7 +563725,7 @@ sub_811CB98: @ 811CB98 beq _0811CBBE b _0811CC00 .align 2, 0 -_0811CBB0: .4byte 0x0203a11c + .pool _0811CBB4: cmp r0, 0x2 beq _0811CBE2 @@ -582943,7 +563775,7 @@ _0811CC02: thumb_func_start sub_811CC08 sub_811CC08: @ 811CC08 push {r4,r5,lr} - ldr r5, _0811CC20 + ldr r5, =0x0203a11c ldr r0, [r5] ldrh r0, [r0] cmp r0, 0x1 @@ -582954,7 +563786,7 @@ sub_811CC08: @ 811CC08 beq _0811CC2E b _0811CC86 .align 2, 0 -_0811CC20: .4byte 0x0203a11c + .pool _0811CC24: cmp r0, 0x2 beq _0811CC64 @@ -583012,7 +563844,7 @@ _0811CC88: thumb_func_start sub_811CC90 sub_811CC90: @ 811CC90 push {r4,r5,lr} - ldr r5, _0811CCA8 + ldr r5, =0x0203a11c ldr r0, [r5] ldrh r0, [r0] cmp r0, 0x1 @@ -583023,7 +563855,7 @@ sub_811CC90: @ 811CC90 beq _0811CCB6 b _0811CD0A .align 2, 0 -_0811CCA8: .4byte 0x0203a11c + .pool _0811CCAC: cmp r0, 0x2 beq _0811CCEC @@ -583080,7 +563912,7 @@ _0811CD0C: thumb_func_start sub_811CD14 sub_811CD14: @ 811CD14 push {r4,lr} - ldr r4, _0811CD28 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -583089,7 +563921,7 @@ sub_811CD14: @ 811CD14 beq _0811CD40 b _0811CD4A .align 2, 0 -_0811CD28: .4byte 0x0203a11c + .pool _0811CD2C: bl sub_811DF90 movs r0, 0x4 @@ -583115,7 +563947,7 @@ _0811CD4C: thumb_func_start sub_811CD54 sub_811CD54: @ 811CD54 push {r4,lr} - ldr r4, _0811CD68 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -583124,7 +563956,7 @@ sub_811CD54: @ 811CD54 beq _0811CD80 b _0811CD8A .align 2, 0 -_0811CD68: .4byte 0x0203a11c + .pool _0811CD6C: bl sub_811DF90 movs r0, 0x5 @@ -583150,7 +563982,7 @@ _0811CD8C: thumb_func_start sub_811CD94 sub_811CD94: @ 811CD94 push {r4,lr} - ldr r4, _0811CDA8 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -583159,7 +563991,7 @@ sub_811CD94: @ 811CD94 beq _0811CDC0 b _0811CDCA .align 2, 0 -_0811CDA8: .4byte 0x0203a11c + .pool _0811CDAC: bl sub_811DF90 movs r0, 0x6 @@ -583185,7 +564017,7 @@ _0811CDCC: thumb_func_start sub_811CDD4 sub_811CDD4: @ 811CDD4 push {r4,lr} - ldr r4, _0811CDE8 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -583194,7 +564026,7 @@ sub_811CDD4: @ 811CDD4 beq _0811CE00 b _0811CE0A .align 2, 0 -_0811CDE8: .4byte 0x0203a11c + .pool _0811CDEC: bl sub_811DF90 movs r0, 0x7 @@ -583220,7 +564052,7 @@ _0811CE0C: thumb_func_start sub_811CE14 sub_811CE14: @ 811CE14 push {r4,lr} - ldr r4, _0811CE28 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -583229,7 +564061,7 @@ sub_811CE14: @ 811CE14 beq _0811CE40 b _0811CE4A .align 2, 0 -_0811CE28: .4byte 0x0203a11c + .pool _0811CE2C: bl sub_811DF90 movs r0, 0x8 @@ -583255,7 +564087,7 @@ _0811CE4C: thumb_func_start sub_811CE54 sub_811CE54: @ 811CE54 push {r4,lr} - ldr r4, _0811CE68 + ldr r4, =0x0203a11c ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 @@ -583264,7 +564096,7 @@ sub_811CE54: @ 811CE54 beq _0811CE80 b _0811CE8A .align 2, 0 -_0811CE68: .4byte 0x0203a11c + .pool _0811CE6C: bl sub_811DF90 movs r0, 0x9 @@ -583290,7 +564122,7 @@ _0811CE8C: thumb_func_start sub_811CE94 sub_811CE94: @ 811CE94 push {r4,lr} - ldr r4, _0811CEF8 + ldr r4, =0x0203a11c movs r0, 0x98 lsls r0, 5 bl malloc @@ -583337,7 +564169,7 @@ sub_811CE94: @ 811CE94 movs r0, 0x1 b _0811CEFE .align 2, 0 -_0811CEF8: .4byte 0x0203a11c + .pool _0811CEFC: movs r0, 0 _0811CEFE: @@ -583393,23 +564225,23 @@ sub_811CF04: @ 811CF04 sub_811CF64: @ 811CF64 push {r4,lr} bl sub_80A1A74 - ldr r0, _0811CFB8 + ldr r0, =0x08dcbdb0 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0811CFBC + ldr r0, =0x08597b14 movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0811CFC0 + ldr r0, =0x08597b34 movs r1, 0x40 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0811CFC4 + ldr r0, =0x08597c1c movs r1, 0xA0 movs r2, 0x8 bl gpu_pal_apply - ldr r4, _0811CFC8 + ldr r4, =0x08597c24 adds r0, r4, 0 movs r1, 0xB0 movs r2, 0xC @@ -583426,11 +564258,7 @@ sub_811CF64: @ 811CF64 pop {r0} bx r0 .align 2, 0 -_0811CFB8: .4byte 0x08dcbdb0 -_0811CFBC: .4byte 0x08597b14 -_0811CFC0: .4byte 0x08597b34 -_0811CFC4: .4byte 0x08597c1c -_0811CFC8: .4byte 0x08597c24 + .pool thumb_func_end sub_811CF64 thumb_func_start sub_811CFCC @@ -583604,12 +564432,12 @@ sub_811D104: @ 811D104 cmp r1, 0x9 bhi _0811D1BC lsls r0, r1, 2 - ldr r1, _0811D120 + ldr r1, =_0811D124 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811D120: .4byte _0811D124 + .pool .align 2, 0 _0811D124: .4byte _0811D14C @@ -583643,41 +564471,40 @@ _0811D16A: bl sub_811BB88 b _0811D1BC _0811D174: - ldr r0, _0811D17C + ldr r0, =0x085ec743 str r0, [sp, 0xC] b _0811D1BC .align 2, 0 -_0811D17C: .4byte 0x085ec743 + .pool _0811D180: - ldr r0, _0811D188 + ldr r0, =0x085ec752 str r0, [sp, 0xC] b _0811D1BC .align 2, 0 -_0811D188: .4byte 0x085ec752 + .pool _0811D18C: - ldr r0, _0811D194 + ldr r0, =0x085ec4c9 str r0, [sp, 0xC] - ldr r0, _0811D198 + ldr r0, =0x085ec4e9 b _0811D1BA .align 2, 0 -_0811D194: .4byte 0x085ec4c9 -_0811D198: .4byte 0x085ec4e9 + .pool _0811D19C: - ldr r0, _0811D1A4 + ldr r0, =0x085ec765 str r0, [sp, 0xC] b _0811D1BC .align 2, 0 -_0811D1A4: .4byte 0x085ec765 + .pool _0811D1A8: - ldr r0, _0811D1B0 + ldr r0, =0x085ec520 str r0, [sp, 0xC] b _0811D1BC .align 2, 0 -_0811D1B0: .4byte 0x085ec520 + .pool _0811D1B4: - ldr r0, _0811D20C + ldr r0, =0x085ec672 str r0, [sp, 0xC] - ldr r0, _0811D210 + ldr r0, =0x085ec688 _0811D1BA: str r0, [sp, 0x10] _0811D1BC: @@ -583719,8 +564546,7 @@ _0811D1FC: pop {r0} bx r0 .align 2, 0 -_0811D20C: .4byte 0x085ec672 -_0811D210: .4byte 0x085ec688 + .pool thumb_func_end sub_811D104 thumb_func_start sub_811D214 @@ -583729,14 +564555,14 @@ sub_811D214: @ 811D214 adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r0, _0811D22C + ldr r0, =0x08597c84 movs r1, 0x1 movs r2, 0xE bl sub_81996C0 pop {r0} bx r0 .align 2, 0 -_0811D22C: .4byte 0x08597c84 + .pool thumb_func_end sub_811D214 thumb_func_start sub_811D230 @@ -583745,31 +564571,31 @@ sub_811D230: @ 811D230 sub sp, 0x8 bl sub_811BA68 lsls r0, 24 - ldr r6, _0811D2AC + ldr r6, =0xffffff00 ldr r4, [sp] ands r4, r6 movs r1, 0x3 orrs r4, r1 str r4, [sp] - ldr r1, _0811D2B0 + ldr r1, =0x08597c30 lsrs r0, 22 adds r0, r1 ldrb r3, [r0] lsls r1, r3, 27 lsrs r1, 19 - ldr r5, _0811D2B4 + ldr r5, =0xffff00ff adds r2, r5, 0 ands r2, r4 orrs r2, r1 lsrs r3, 5 lsls r3, 16 - ldr r1, _0811D2B8 + ldr r1, =0xff00ffff ands r2, r1 orrs r2, r3 str r2, [sp] ldrb r3, [r0, 0x1] lsls r3, 24 - ldr r1, _0811D2BC + ldr r1, =0x00ffffff ands r1, r2 orrs r1, r3 str r1, [sp] @@ -583781,7 +564607,7 @@ sub_811D230: @ 811D230 movs r1, 0xB0 lsls r1, 4 orrs r0, r1 - ldr r1, _0811D2C0 + ldr r1, =0x0000ffff ands r0, r1 movs r1, 0xD8 lsls r1, 15 @@ -583789,7 +564615,7 @@ sub_811D230: @ 811D230 str r0, [sp, 0x4] mov r0, sp bl Window_AddFromTemplate - ldr r1, _0811D2C4 + ldr r1, =0x0203a11c ldr r1, [r1] strh r0, [r1, 0x2] lsls r0, 24 @@ -583800,13 +564626,7 @@ sub_811D230: @ 811D230 pop {r0} bx r0 .align 2, 0 -_0811D2AC: .4byte 0xffffff00 -_0811D2B0: .4byte 0x08597c30 -_0811D2B4: .4byte 0xffff00ff -_0811D2B8: .4byte 0xff00ffff -_0811D2BC: .4byte 0x00ffffff -_0811D2C0: .4byte 0x0000ffff -_0811D2C4: .4byte 0x0203a11c + .pool thumb_func_end sub_811D230 thumb_func_start sub_811D2C8 @@ -583837,7 +564657,7 @@ sub_811D2C8: @ 811D2C8 movs r1, 0x1 mov r8, r1 _0811D302: - ldr r0, _0811D350 + ldr r0, =0x0203a11c ldr r0, [r0] ldrb r0, [r0, 0x2] movs r1, 0x11 @@ -583848,7 +564668,7 @@ _0811D302: bge _0811D402 _0811D316: add r0, sp, 0xC - ldr r1, _0811D354 + ldr r1, =0x08597c8c movs r2, 0x4 bl memcpy mov r1, r8 @@ -583858,7 +564678,7 @@ _0811D316: movs r0, 0x6 strb r0, [r1, 0x2] _0811D32C: - ldr r0, _0811D350 + ldr r0, =0x0203a11c ldr r1, [r0] adds r2, r1, 0 adds r2, 0xB @@ -583875,11 +564695,10 @@ _0811D32C: mov r10, r1 b _0811D3CE .align 2, 0 -_0811D350: .4byte 0x0203a11c -_0811D354: .4byte 0x08597c8c + .pool _0811D358: ldrh r0, [r4] - ldr r1, _0811D370 + ldr r1, =0x0000ffff cmp r0, r1 beq _0811D374 adds r1, r0, 0 @@ -583889,7 +564708,7 @@ _0811D358: adds r4, 0x2 b _0811D3A2 .align 2, 0 -_0811D370: .4byte 0x0000ffff + .pool _0811D374: adds r4, 0x2 mov r0, r8 @@ -583946,7 +564765,7 @@ _0811D3CE: _0811D3D4: movs r0, 0xFF strb r0, [r2] - ldr r0, _0811D420 + ldr r0, =0x0203a11c ldr r2, [r0] ldrb r0, [r2, 0x2] adds r2, 0xB @@ -583967,7 +564786,7 @@ _0811D3D4: cmp r7, r1 blt _0811D316 _0811D402: - ldr r0, _0811D420 + ldr r0, =0x0203a11c ldr r0, [r0] ldrb r0, [r0, 0x2] movs r1, 0x3 @@ -583981,7 +564800,7 @@ _0811D402: pop {r0} bx r0 .align 2, 0 -_0811D420: .4byte 0x0203a11c + .pool thumb_func_end sub_811D2C8 thumb_func_start sub_811D424 @@ -583998,7 +564817,7 @@ sub_811D424: @ 811D424 lsrs r6, r0, 24 movs r0, 0 str r0, [sp] - ldr r2, _0811D4C4 + ldr r2, =0x01000200 mov r0, sp mov r1, r8 bl CpuFastSet @@ -584007,7 +564826,7 @@ sub_811D424: @ 811D424 cmp r6, 0x8 bne _0811D4D4 _0811D450: - ldr r0, _0811D4C8 + ldr r0, =0x08597c30 lsls r2, r6, 2 adds r2, r0 ldrb r1, [r2] @@ -584034,7 +564853,7 @@ _0811D474: adds r0, r2, r7 lsls r0, 1 add r0, r8 - ldr r4, _0811D4CC + ldr r4, =0x00001005 adds r1, r4, 0 strh r1, [r0] adds r7, r3, 0 @@ -584061,7 +564880,7 @@ _0811D4AE: adds r0, r3, r7 lsls r0, 1 add r0, r8 - ldr r2, _0811D4D0 + ldr r2, =0x00001007 adds r1, r2, 0 strh r1, [r0] adds r6, r4, 0 @@ -584069,12 +564888,9 @@ _0811D4AE: blt _0811D474 b _0811D5D6 .align 2, 0 -_0811D4C4: .4byte 0x01000200 -_0811D4C8: .4byte 0x08597c30 -_0811D4CC: .4byte 0x00001005 -_0811D4D0: .4byte 0x00001007 + .pool _0811D4D4: - ldr r4, _0811D5E8 + ldr r4, =0x08597c30 mov r10, r4 lsls r6, 2 mov r9, r6 @@ -584098,13 +564914,13 @@ _0811D4D4: adds r0, r7 lsls r0, 1 add r0, r8 - ldr r2, _0811D5EC + ldr r2, =0x00001001 adds r1, r2, 0 strh r1, [r0] adds r7, r4, 0 cmp r7, r5 bge _0811D52A - ldr r4, _0811D5F0 + ldr r4, =0x00001002 adds r2, r4, 0 lsls r1, r7, 1 lsls r0, r6, 6 @@ -584123,13 +564939,13 @@ _0811D52A: adds r0, r7 lsls r0, 1 add r0, r8 - ldr r2, _0811D5F4 + ldr r2, =0x00001003 adds r1, r2, 0 strh r1, [r0] adds r6, 0x1 cmp r6, r12 bge _0811D590 - ldr r0, _0811D5E8 + ldr r0, =0x08597c30 add r0, r9 ldrb r0, [r0] lsls r3, r0, 27 @@ -584140,7 +564956,7 @@ _0811D546: adds r1, r7 lsls r1, 1 add r1, r8 - ldr r4, _0811D5F8 + ldr r4, =0x00001005 adds r2, r4, 0 strh r2, [r1] adds r7, r0, 0 @@ -584167,7 +564983,7 @@ _0811D57C: adds r0, r7 lsls r0, 1 add r0, r8 - ldr r2, _0811D5FC + ldr r2, =0x00001007 adds r1, r2, 0 strh r1, [r0] adds r6, r4, 0 @@ -584184,13 +565000,13 @@ _0811D590: adds r0, r3, r7 lsls r0, 1 add r0, r8 - ldr r4, _0811D600 + ldr r4, =0x00001009 adds r1, r4, 0 strh r1, [r0] adds r7, r2, 0 cmp r7, r5 bge _0811D5CA - ldr r0, _0811D604 + ldr r0, =0x0000100a adds r2, r0, 0 lsls r1, r7, 1 lsls r0, r6, 6 @@ -584208,7 +565024,7 @@ _0811D5CA: adds r0, r3, r7 lsls r0, 1 add r0, r8 - ldr r2, _0811D608 + ldr r2, =0x0000100b adds r1, r2, 0 strh r1, [r0] _0811D5D6: @@ -584221,15 +565037,7 @@ _0811D5D6: pop {r0} bx r0 .align 2, 0 -_0811D5E8: .4byte 0x08597c30 -_0811D5EC: .4byte 0x00001001 -_0811D5F0: .4byte 0x00001002 -_0811D5F4: .4byte 0x00001003 -_0811D5F8: .4byte 0x00001005 -_0811D5FC: .4byte 0x00001007 -_0811D600: .4byte 0x00001009 -_0811D604: .4byte 0x0000100a -_0811D608: .4byte 0x0000100b + .pool thumb_func_end sub_811D424 thumb_func_start sub_811D60C @@ -584241,7 +565049,7 @@ sub_811D60C: @ 811D60C adds r4, r0, 0 bl sub_811BA68 lsls r0, 24 - ldr r1, _0811D634 + ldr r1, =0x08597c30 lsrs r0, 22 adds r0, r1 ldrb r1, [r0, 0x3] @@ -584253,7 +565061,7 @@ sub_811D60C: @ 811D60C beq _0811D64C b _0811D67C .align 2, 0 -_0811D634: .4byte 0x08597c30 + .pool _0811D638: cmp r1, 0x3 beq _0811D668 @@ -584418,7 +565226,7 @@ sub_811D758: @ 811D758 movs r5, 0 movs r4, 0xC2 lsls r4, 23 - ldr r6, _0811D790 + ldr r6, =0x08597c90 _0811D764: ldm r6!, {r2} lsrs r0, r4, 24 @@ -584442,7 +565250,7 @@ _0811D764: pop {r0} bx r0 .align 2, 0 -_0811D790: .4byte 0x08597c90 + .pool thumb_func_end sub_811D758 thumb_func_start sub_811D794 @@ -584594,10 +565402,10 @@ _0811D89E: bl sub_811F578 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _0811D8F4 + ldr r0, =0x0000ffff cmp r4, r0 beq _0811D926 - ldr r5, _0811D8F8 + ldr r5, =0x0203a11c ldr r0, [r5] adds r0, 0xCC adds r1, r4, 0 @@ -584625,8 +565433,7 @@ _0811D89E: bl sub_811D028 b _0811D926 .align 2, 0 -_0811D8F4: .4byte 0x0000ffff -_0811D8F8: .4byte 0x0203a11c + .pool _0811D8FC: ldr r2, [r5] adds r2, 0xCC @@ -584686,14 +565493,14 @@ sub_811D950: @ 811D950 adds r1, r3, r0 cmp r1, 0xFF ble _0811D97C - ldr r0, _0811D978 + ldr r0, =0xffffff00 adds r4, r1, r0 movs r0, 0x80 lsls r0, 1 subs r0, r3 b _0811D97E .align 2, 0 -_0811D978: .4byte 0xffffff00 + .pool _0811D97C: movs r4, 0 _0811D97E: @@ -584740,17 +565547,16 @@ sub_811D9B4: @ 811D9B4 thumb_func_start sub_811D9CC sub_811D9CC: @ 811D9CC push {lr} - ldr r1, _0811D9E0 + ldr r1, =0x0203a11c cmp r0, 0x6 bhi _0811DA86 lsls r0, 2 - ldr r1, _0811D9E4 + ldr r1, =_0811D9E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811D9E0: .4byte 0x0203a11c -_0811D9E4: .4byte _0811D9E8 + .pool .align 2, 0 _0811D9E8: .4byte _0811DA04 @@ -584761,7 +565567,7 @@ _0811D9E8: .4byte _0811DA64 .4byte _0811DA78 _0811DA04: - ldr r1, _0811DA14 + ldr r1, =0x0203a11c ldr r2, [r1] movs r0, 0 strb r0, [r2, 0x6] @@ -584769,17 +565575,17 @@ _0811DA04: movs r0, 0xA b _0811DA84 .align 2, 0 -_0811DA14: .4byte 0x0203a11c + .pool _0811DA18: - ldr r1, _0811DA24 + ldr r1, =0x0203a11c ldr r2, [r1] movs r3, 0 movs r0, 0x9 b _0811DA44 .align 2, 0 -_0811DA24: .4byte 0x0203a11c + .pool _0811DA28: - ldr r1, _0811DA38 + ldr r1, =0x0203a11c ldr r2, [r1] movs r0, 0xB strb r0, [r2, 0x6] @@ -584787,9 +565593,9 @@ _0811DA28: movs r0, 0x11 b _0811DA84 .align 2, 0 -_0811DA38: .4byte 0x0203a11c + .pool _0811DA3C: - ldr r1, _0811DA4C + ldr r1, =0x0203a11c ldr r2, [r1] movs r3, 0 movs r0, 0x11 @@ -584799,9 +565605,9 @@ _0811DA44: strb r3, [r0, 0x7] b _0811DA86 .align 2, 0 -_0811DA4C: .4byte 0x0203a11c + .pool _0811DA50: - ldr r1, _0811DA60 + ldr r1, =0x0203a11c ldr r2, [r1] movs r0, 0x11 strb r0, [r2, 0x6] @@ -584809,9 +565615,9 @@ _0811DA50: movs r0, 0xA b _0811DA84 .align 2, 0 -_0811DA60: .4byte 0x0203a11c + .pool _0811DA64: - ldr r1, _0811DA74 + ldr r1, =0x0203a11c ldr r2, [r1] movs r0, 0x12 strb r0, [r2, 0x6] @@ -584819,9 +565625,9 @@ _0811DA64: movs r0, 0x16 b _0811DA84 .align 2, 0 -_0811DA74: .4byte 0x0203a11c + .pool _0811DA78: - ldr r1, _0811DAA0 + ldr r1, =0x0203a11c ldr r2, [r1] movs r0, 0x16 strb r0, [r2, 0x6] @@ -584844,13 +565650,13 @@ _0811DA98: pop {r0} bx r0 .align 2, 0 -_0811DAA0: .4byte 0x0203a11c + .pool thumb_func_end sub_811D9CC thumb_func_start sub_811DAA4 sub_811DAA4: @ 811DAA4 push {r4,lr} - ldr r4, _0811DAD0 + ldr r4, =0x0203a11c ldr r1, [r4] ldrb r2, [r1, 0x6] ldrb r0, [r1, 0x7] @@ -584871,7 +565677,7 @@ sub_811DAA4: @ 811DAA4 lsrs r0, 31 b _0811DAD6 .align 2, 0 -_0811DAD0: .4byte 0x0203a11c + .pool _0811DAD4: movs r0, 0 _0811DAD6: @@ -584900,12 +565706,12 @@ sub_811DADC: @ 811DADC b _0811DC1A _0811DAFE: lsls r0, r4, 2 - ldr r1, _0811DB08 + ldr r1, =_0811DB0C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811DB08: .4byte _0811DB0C + .pool .align 2, 0 _0811DB0C: .4byte _0811DC1A @@ -585055,7 +565861,7 @@ sub_811DC28: @ 811DC28 adds r7, r1, 0 mov r9, r2 mov r10, r3 - ldr r0, _0811DD60 + ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xC0 lsls r1, 2 @@ -585072,13 +565878,13 @@ sub_811DC28: @ 811DC28 adds r0, r2 lsls r0, 1 adds r0, r6 - ldr r4, _0811DD64 + ldr r4, =0x00004001 adds r1, r4, 0 strh r1, [r0] adds r2, 0x1 cmp r2, r5 bge _0811DC84 - ldr r0, _0811DD68 + ldr r0, =0x00004002 adds r4, r0, 0 lsls r1, r2, 1 lsls r0, r3, 6 @@ -585097,7 +565903,7 @@ _0811DC84: adds r0, r2 lsls r0, 1 adds r0, r6 - ldr r2, _0811DD6C + ldr r2, =0x00004003 adds r1, r2, 0 strh r1, [r0] adds r3, 0x1 @@ -585120,7 +565926,7 @@ _0811DCB0: add r0, r12 lsls r0, 1 adds r0, r6 - ldr r2, _0811DD70 + ldr r2, =0x00004005 adds r1, r2, 0 strh r1, [r0] adds r2, r4, 0 @@ -585146,7 +565952,7 @@ _0811DCE0: adds r0, r2 lsls r0, 1 adds r0, r6 - ldr r2, _0811DD74 + ldr r2, =0x00004007 adds r1, r2, 0 strh r1, [r0] adds r3, r7, 0 @@ -585158,14 +565964,14 @@ _0811DCF4: adds r1, r0, r7 lsls r1, 1 adds r1, r6 - ldr r7, _0811DD78 + ldr r7, =0x00004009 adds r2, r7, 0 strh r2, [r1] adds r2, r4, 0 mov r12, r0 cmp r4, r5 bge _0811DD26 - ldr r0, _0811DD7C + ldr r0, =0x0000400a adds r7, r0, 0 lsls r1, r4, 1 lsls r0, r3, 6 @@ -585184,7 +565990,7 @@ _0811DD26: adds r0, r1, r2 lsls r0, 1 adds r0, r6 - ldr r2, _0811DD80 + ldr r2, =0x0000400b adds r1, r2, 0 strh r1, [r0] lsls r0, r4, 27 @@ -585208,15 +566014,7 @@ _0811DD26: pop {r0} bx r0 .align 2, 0 -_0811DD60: .4byte 0x0203a11c -_0811DD64: .4byte 0x00004001 -_0811DD68: .4byte 0x00004002 -_0811DD6C: .4byte 0x00004003 -_0811DD70: .4byte 0x00004005 -_0811DD74: .4byte 0x00004007 -_0811DD78: .4byte 0x00004009 -_0811DD7C: .4byte 0x0000400a -_0811DD80: .4byte 0x0000400b + .pool thumb_func_end sub_811DC28 thumb_func_start sub_811DD84 @@ -585227,17 +566025,16 @@ sub_811DD84: @ 811DD84 movs r0, 0x2 movs r2, 0 bl bg_change_y_offset - ldr r0, _0811DDA4 + ldr r0, =0x0203a11c ldr r0, [r0] - ldr r1, _0811DDA8 + ldr r1, =0x000002ce adds r0, r1 movs r1, 0 strh r1, [r0] pop {r0} bx r0 .align 2, 0 -_0811DDA4: .4byte 0x0203a11c -_0811DDA8: .4byte 0x000002ce + .pool thumb_func_end sub_811DD84 thumb_func_start sub_811DDAC @@ -585251,9 +566048,9 @@ sub_811DDAC: @ 811DDAC movs r0, 0x2 bl bg_get_y_offset adds r2, r0, 0 - ldr r0, _0811DDF8 + ldr r0, =0x0203a11c ldr r3, [r0] - ldr r0, _0811DDFC + ldr r0, =0x000002ce adds r1, r3, r0 ldrh r0, [r1] adds r0, r4 @@ -585279,8 +566076,7 @@ sub_811DDAC: @ 811DDAC str r0, [r1] b _0811DE0A .align 2, 0 -_0811DDF8: .4byte 0x0203a11c -_0811DDFC: .4byte 0x000002ce + .pool _0811DE00: movs r0, 0x2 adds r1, r2, 0 @@ -585297,7 +566093,7 @@ sub_811DE10: @ 811DE10 push {lr} movs r0, 0x2 bl bg_get_y_offset - ldr r1, _0811DE3C + ldr r1, =0x0203a11c ldr r2, [r1] movs r3, 0xB4 lsls r3, 2 @@ -585315,7 +566111,7 @@ sub_811DE10: @ 811DE10 movs r0, 0x1 b _0811DE42 .align 2, 0 -_0811DE3C: .4byte 0x0203a11c + .pool _0811DE40: movs r0, 0 _0811DE42: @@ -585325,15 +566121,14 @@ _0811DE42: thumb_func_start sub_811DE48 sub_811DE48: @ 811DE48 - ldr r0, _0811DE54 + ldr r0, =0x0203a11c ldr r0, [r0] - ldr r1, _0811DE58 + ldr r1, =0x000002ce adds r0, r1 ldrh r0, [r0] bx lr .align 2, 0 -_0811DE54: .4byte 0x0203a11c -_0811DE58: .4byte 0x000002ce + .pool thumb_func_end sub_811DE48 thumb_func_start sub_811DE5C @@ -585367,12 +566162,12 @@ sub_811DE5C: @ 811DE5C thumb_func_start sub_811DE90 sub_811DE90: @ 811DE90 push {r4,r5,lr} - ldr r0, _0811DEB8 + ldr r0, =0x08597ca0 bl gpu_tile_obj_alloc_and_load_multiple - ldr r0, _0811DEBC + ldr r0, =0x08597cc0 bl gpu_pal_obj_alloc_and_load_multiple movs r5, 0 - ldr r4, _0811DEC0 + ldr r4, =0x08597ce8 _0811DEA2: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load @@ -585384,9 +566179,7 @@ _0811DEA2: pop {r0} bx r0 .align 2, 0 -_0811DEB8: .4byte 0x08597ca0 -_0811DEBC: .4byte 0x08597cc0 -_0811DEC0: .4byte 0x08597ce8 + .pool thumb_func_end sub_811DE90 thumb_func_start sub_811DEC4 @@ -585394,7 +566187,7 @@ sub_811DEC4: @ 811DEC4 push {lr} bl sub_811BA68 lsls r0, 24 - ldr r1, _0811DF18 + ldr r1, =0x08597c30 lsrs r0, 22 adds r0, r1 ldrb r2, [r0] @@ -585402,7 +566195,7 @@ sub_811DEC4: @ 811DEC4 lsrs r1, 8 lsrs r2, 5 lsls r2, 19 - ldr r0, _0811DF1C + ldr r0, =0x08597d18 movs r3, 0xD0 lsls r3, 12 adds r1, r3 @@ -585415,7 +566208,7 @@ sub_811DEC4: @ 811DEC4 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _0811DF20 + ldr r1, =0x0203a11c ldr r2, [r1] movs r1, 0xB6 lsls r1, 2 @@ -585423,7 +566216,7 @@ sub_811DEC4: @ 811DEC4 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0811DF24 + ldr r0, =0x02020630 adds r1, r0 str r1, [r2] movs r0, 0x1 @@ -585431,10 +566224,7 @@ sub_811DEC4: @ 811DEC4 pop {r0} bx r0 .align 2, 0 -_0811DF18: .4byte 0x08597c30 -_0811DF1C: .4byte 0x08597d18 -_0811DF20: .4byte 0x0203a11c -_0811DF24: .4byte 0x02020630 + .pool thumb_func_end sub_811DEC4 thumb_func_start sub_811DF28 @@ -585460,13 +566250,13 @@ sub_811DF28: @ 811DF28 lsls r0, 16 cmp r0, 0 ble _0811DF56 - ldr r0, _0811DF5C + ldr r0, =0x0000fffa strh r0, [r1, 0x24] _0811DF56: pop {r0} bx r0 .align 2, 0 -_0811DF5C: .4byte 0x0000fffa + .pool thumb_func_end sub_811DF28 thumb_func_start sub_811DF60 @@ -585476,7 +566266,7 @@ sub_811DF60: @ 811DF60 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _0811DF8C + ldr r2, =0x0203a11c ldr r2, [r2] movs r3, 0xB6 lsls r3, 2 @@ -585494,12 +566284,12 @@ sub_811DF60: @ 811DF60 pop {r0} bx r0 .align 2, 0 -_0811DF8C: .4byte 0x0203a11c + .pool thumb_func_end sub_811DF60 thumb_func_start sub_811DF90 sub_811DF90: @ 811DF90 - ldr r0, _0811DFAC + ldr r0, =0x0203a11c ldr r1, [r0] movs r0, 0xB6 lsls r0, 2 @@ -585513,12 +566303,12 @@ sub_811DF90: @ 811DF90 strh r2, [r0, 0x24] bx lr .align 2, 0 -_0811DFAC: .4byte 0x0203a11c + .pool thumb_func_end sub_811DF90 thumb_func_start sub_811DFB0 sub_811DFB0: @ 811DFB0 - ldr r0, _0811DFC4 + ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xB6 lsls r1, 2 @@ -585528,7 +566318,7 @@ sub_811DFB0: @ 811DFB0 strh r0, [r1, 0x30] bx lr .align 2, 0 -_0811DFC4: .4byte 0x0203a11c + .pool thumb_func_end sub_811DFB0 thumb_func_start sub_811DFC8 @@ -585536,7 +566326,7 @@ sub_811DFC8: @ 811DFC8 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r6, _0811E040 + ldr r6, =0x08597d68 adds r0, r6, 0 movs r1, 0 movs r2, 0 @@ -585544,7 +566334,7 @@ sub_811DFC8: @ 811DFC8 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r5, _0811E044 + ldr r5, =0x0203a11c ldr r2, [r5] movs r1, 0xB7 lsls r1, 2 @@ -585553,7 +566343,7 @@ sub_811DFC8: @ 811DFC8 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, _0811E048 + ldr r4, =0x02020630 adds r1, r4 str r1, [r2] movs r0, 0x20 @@ -585574,7 +566364,7 @@ sub_811DFC8: @ 811DFC8 lsls r1, 2 adds r1, r4 str r1, [r3] - ldr r0, _0811E04C + ldr r0, =0x0000ffe0 strh r0, [r1, 0x24] add r2, r8 ldr r1, [r2] @@ -585590,16 +566380,13 @@ sub_811DFC8: @ 811DFC8 pop {r0} bx r0 .align 2, 0 -_0811E040: .4byte 0x08597d68 -_0811E044: .4byte 0x0203a11c -_0811E048: .4byte 0x02020630 -_0811E04C: .4byte 0x0000ffe0 + .pool thumb_func_end sub_811DFC8 thumb_func_start sub_811E050 sub_811E050: @ 811E050 push {r4-r6,lr} - ldr r5, _0811E084 + ldr r5, =0x0203a11c ldr r0, [r5] movs r4, 0xB7 lsls r4, 2 @@ -585622,14 +566409,14 @@ sub_811E050: @ 811E050 pop {r0} bx r0 .align 2, 0 -_0811E084: .4byte 0x0203a11c + .pool thumb_func_end sub_811E050 thumb_func_start sub_811E088 sub_811E088: @ 811E088 push {r4,lr} sub sp, 0x4 - ldr r0, _0811E0D0 + ldr r0, =0x0203a11c ldr r1, [r0] movs r2, 0xB7 lsls r2, 2 @@ -585660,7 +566447,7 @@ sub_811E088: @ 811E088 bl sub_811E0EC b _0811E0E4 .align 2, 0 -_0811E0D0: .4byte 0x0203a11c + .pool _0811E0D4: mov r0, sp ldrb r0, [r0] @@ -585689,7 +566476,7 @@ sub_811E0EC: @ 811E0EC negs r0, r0 cmp r5, r0 beq _0811E150 - ldr r0, _0811E14C + ldr r0, =0x0203a11c mov r8, r0 ldr r0, [r0] movs r4, 0xB7 @@ -585724,9 +566511,9 @@ sub_811E0EC: @ 811E0EC strh r5, [r1, 0x20] b _0811E192 .align 2, 0 -_0811E14C: .4byte 0x0203a11c + .pool _0811E150: - ldr r6, _0811E1A0 + ldr r6, =0x0203a11c ldr r0, [r6] movs r4, 0xB7 lsls r4, 2 @@ -585766,7 +566553,7 @@ _0811E192: pop {r0} bx r0 .align 2, 0 -_0811E1A0: .4byte 0x0203a11c + .pool thumb_func_end sub_811E0EC thumb_func_start sub_811E1A4 @@ -585797,7 +566584,7 @@ sub_811E1A4: @ 811E1A4 movs r6, 0x2 b _0811E1EC _0811E1D6: - ldr r3, _0811E22C + ldr r3, =0x08597d08 lsls r1, r4, 24 lsrs r0, r1, 24 movs r2, 0 @@ -585810,7 +566597,7 @@ _0811E1E4: adds r7, r0 movs r6, 0x3 _0811E1EC: - ldr r5, _0811E230 + ldr r5, =0x0203a11c ldr r0, [r5] movs r4, 0xB7 lsls r4, 2 @@ -585840,10 +566627,9 @@ _0811E1EC: strh r1, [r0, 0x22] b _0811E27A .align 2, 0 -_0811E22C: .4byte 0x08597d08 -_0811E230: .4byte 0x0203a11c + .pool _0811E234: - ldr r6, _0811E284 + ldr r6, =0x0203a11c ldr r0, [r6] movs r4, 0xB7 lsls r4, 2 @@ -585883,20 +566669,20 @@ _0811E27A: pop {r0} bx r0 .align 2, 0 -_0811E284: .4byte 0x0203a11c + .pool thumb_func_end sub_811E1A4 thumb_func_start sub_811E288 sub_811E288: @ 811E288 push {lr} - ldr r0, _0811E2CC + ldr r0, =0x08597d18 movs r1, 0 movs r2, 0 movs r3, 0x4 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _0811E2D0 + ldr r1, =0x0203a11c ldr r2, [r1] movs r1, 0xB9 lsls r1, 2 @@ -585904,10 +566690,10 @@ sub_811E288: @ 811E288 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0811E2D4 + ldr r0, =0x02020630 adds r1, r0 str r1, [r2] - ldr r0, _0811E2D8 + ldr r0, =sub_811E2DC + 1 str r0, [r1, 0x1C] ldrb r2, [r1, 0x5] movs r0, 0xD @@ -585920,10 +566706,7 @@ sub_811E288: @ 811E288 pop {r0} bx r0 .align 2, 0 -_0811E2CC: .4byte 0x08597d18 -_0811E2D0: .4byte 0x0203a11c -_0811E2D4: .4byte 0x02020630 -_0811E2D8: .4byte sub_811E2DC + 1 + .pool thumb_func_end sub_811E288 thumb_func_start sub_811E2DC @@ -585945,13 +566728,13 @@ sub_811E2DC: @ 811E2DC lsls r0, 16 cmp r0, 0 ble _0811E302 - ldr r0, _0811E308 + ldr r0, =0x0000fffa strh r0, [r1, 0x24] _0811E302: pop {r0} bx r0 .align 2, 0 -_0811E308: .4byte 0x0000fffa + .pool thumb_func_end sub_811E2DC thumb_func_start sub_811E30C @@ -585994,7 +566777,7 @@ sub_811E34C: @ 811E34C lsrs r3, r0, 24 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _0811E37C + ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xB9 lsls r1, 2 @@ -586015,13 +566798,13 @@ _0811E376: pop {r0} bx r0 .align 2, 0 -_0811E37C: .4byte 0x0203a11c + .pool thumb_func_end sub_811E34C thumb_func_start sub_811E380 sub_811E380: @ 811E380 push {r4,lr} - ldr r4, _0811E3A8 + ldr r4, =0x0203a11c ldr r0, [r4] movs r1, 0xB9 lsls r1, 2 @@ -586041,20 +566824,20 @@ _0811E3A2: pop {r0} bx r0 .align 2, 0 -_0811E3A8: .4byte 0x0203a11c + .pool thumb_func_end sub_811E380 thumb_func_start sub_811E3AC sub_811E3AC: @ 811E3AC push {r4-r6,lr} - ldr r0, _0811E404 + ldr r0, =0x08597df0 movs r1, 0xD0 movs r2, 0x80 movs r3, 0x6 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r5, _0811E408 + ldr r5, =0x0203a11c ldr r2, [r5] movs r1, 0xBA lsls r1, 2 @@ -586062,13 +566845,13 @@ sub_811E3AC: @ 811E3AC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, _0811E40C + ldr r4, =0x02020630 adds r1, r4 str r1, [r2] movs r6, 0 - ldr r0, _0811E410 + ldr r0, =0x0000ffc0 strh r0, [r1, 0x24] - ldr r0, _0811E414 + ldr r0, =0x08597dd0 movs r1, 0xD0 movs r2, 0x50 movs r3, 0x5 @@ -586089,17 +566872,13 @@ sub_811E3AC: @ 811E3AC pop {r0} bx r0 .align 2, 0 -_0811E404: .4byte 0x08597df0 -_0811E408: .4byte 0x0203a11c -_0811E40C: .4byte 0x02020630 -_0811E410: .4byte 0x0000ffc0 -_0811E414: .4byte 0x08597dd0 + .pool thumb_func_end sub_811E3AC thumb_func_start sub_811E418 sub_811E418: @ 811E418 push {r4,lr} - ldr r4, _0811E42C + ldr r4, =0x0203a11c ldr r2, [r4] ldrb r3, [r2, 0x9] cmp r3, 0 @@ -586109,7 +566888,7 @@ sub_811E418: @ 811E418 movs r0, 0 b _0811E4A6 .align 2, 0 -_0811E42C: .4byte 0x0203a11c + .pool _0811E430: movs r0, 0xBA lsls r0, 2 @@ -586145,14 +566924,14 @@ _0811E466: movs r1, 0x2 bl obj_anim_image_start _0811E476: - ldr r0, _0811E484 + ldr r0, =0x0203a11c ldr r1, [r0] ldrb r0, [r1, 0x9] adds r0, 0x1 strb r0, [r1, 0x9] b _0811E4A4 .align 2, 0 -_0811E484: .4byte 0x0203a11c + .pool _0811E488: movs r1, 0xBB lsls r1, 2 @@ -586179,7 +566958,7 @@ _0811E4A6: thumb_func_start sub_811E4AC sub_811E4AC: @ 811E4AC push {lr} - ldr r2, _0811E4CC + ldr r2, =0x0203a11c ldr r1, [r2] movs r0, 0 strb r0, [r1, 0x9] @@ -586193,13 +566972,13 @@ sub_811E4AC: @ 811E4AC pop {r0} bx r0 .align 2, 0 -_0811E4CC: .4byte 0x0203a11c + .pool thumb_func_end sub_811E4AC thumb_func_start sub_811E4D0 sub_811E4D0: @ 811E4D0 push {r4-r6,lr} - ldr r5, _0811E4E4 + ldr r5, =0x0203a11c ldr r3, [r5] ldrb r0, [r3, 0x9] cmp r0, 0 @@ -586209,7 +566988,7 @@ sub_811E4D0: @ 811E4D0 movs r0, 0 b _0811E554 .align 2, 0 -_0811E4E4: .4byte 0x0203a11c + .pool _0811E4E8: movs r1, 0xBB lsls r1, 2 @@ -586274,7 +567053,7 @@ _0811E554: thumb_func_start sub_811E55C sub_811E55C: @ 811E55C push {lr} - ldr r0, _0811E574 + ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xBB lsls r1, 2 @@ -586285,7 +567064,7 @@ sub_811E55C: @ 811E55C pop {r0} bx r0 .align 2, 0 -_0811E574: .4byte 0x0203a11c + .pool thumb_func_end sub_811E55C thumb_func_start sub_811E578 @@ -586295,7 +567074,7 @@ sub_811E578: @ 811E578 lsls r0, 24 cmp r0, 0 bne _0811E59C - ldr r0, _0811E598 + ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xBB lsls r1, 2 @@ -586305,9 +567084,9 @@ sub_811E578: @ 811E578 bl obj_anim_image_start b _0811E5AE .align 2, 0 -_0811E598: .4byte 0x0203a11c + .pool _0811E59C: - ldr r0, _0811E5B4 + ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xBB lsls r1, 2 @@ -586319,12 +567098,12 @@ _0811E5AE: pop {r0} bx r0 .align 2, 0 -_0811E5B4: .4byte 0x0203a11c + .pool thumb_func_end sub_811E578 thumb_func_start sub_811E5B8 sub_811E5B8: @ 811E5B8 - ldr r0, _0811E5D0 + ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xBB lsls r1, 2 @@ -586337,13 +567116,13 @@ sub_811E5B8: @ 811E5B8 bics r0, r1 bx lr .align 2, 0 -_0811E5D0: .4byte 0x0203a11c + .pool thumb_func_end sub_811E5B8 thumb_func_start sub_811E5D4 sub_811E5D4: @ 811E5D4 push {r4,lr} - ldr r4, _0811E640 + ldr r4, =0x08597e48 adds r0, r4, 0 movs r1, 0x60 movs r2, 0x50 @@ -586353,7 +567132,7 @@ sub_811E5D4: @ 811E5D4 lsrs r1, r0, 24 cmp r1, 0x40 beq _0811E602 - ldr r0, _0811E644 + ldr r0, =0x0203a11c ldr r2, [r0] movs r0, 0xBC lsls r0, 2 @@ -586361,7 +567140,7 @@ sub_811E5D4: @ 811E5D4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0811E648 + ldr r1, =0x02020630 adds r0, r1 str r0, [r2] _0811E602: @@ -586374,7 +567153,7 @@ _0811E602: lsrs r1, r0, 24 cmp r1, 0x40 beq _0811E636 - ldr r0, _0811E644 + ldr r0, =0x0203a11c ldr r2, [r0] movs r0, 0xBD lsls r0, 2 @@ -586382,7 +567161,7 @@ _0811E602: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0811E648 + ldr r1, =0x02020630 adds r0, r1 str r0, [r2] adds r0, 0x3F @@ -586396,16 +567175,14 @@ _0811E636: pop {r0} bx r0 .align 2, 0 -_0811E640: .4byte 0x08597e48 -_0811E644: .4byte 0x0203a11c -_0811E648: .4byte 0x02020630 + .pool thumb_func_end sub_811E5D4 thumb_func_start sub_811E64C sub_811E64C: @ 811E64C push {r4-r6,lr} bl sub_811BBF8 - ldr r6, _0811E6AC + ldr r6, =0x0203a11c ldr r1, [r6] movs r2, 0xBC lsls r2, 2 @@ -586452,12 +567229,12 @@ _0811E692: pop {r0} bx r0 .align 2, 0 -_0811E6AC: .4byte 0x0203a11c + .pool thumb_func_end sub_811E64C thumb_func_start sub_811E6B0 sub_811E6B0: @ 811E6B0 - ldr r3, _0811E6DC + ldr r3, =0x0203a11c ldr r0, [r3] movs r1, 0xBC lsls r1, 2 @@ -586479,7 +567256,7 @@ sub_811E6B0: @ 811E6B0 strb r0, [r1] bx lr .align 2, 0 -_0811E6DC: .4byte 0x0203a11c + .pool thumb_func_end sub_811E6B0 thumb_func_start sub_811E6E0 @@ -586487,7 +567264,7 @@ sub_811E6E0: @ 811E6E0 push {lr} cmp r0, 0 bne _0811E6FC - ldr r0, _0811E6F8 + ldr r0, =0x0203a11c ldr r2, [r0] movs r1, 0xBC lsls r1, 2 @@ -586496,9 +567273,9 @@ sub_811E6E0: @ 811E6E0 movs r1, 0x60 b _0811E70A .align 2, 0 -_0811E6F8: .4byte 0x0203a11c + .pool _0811E6FC: - ldr r0, _0811E71C + ldr r0, =0x0203a11c ldr r2, [r0] movs r1, 0xBC lsls r1, 2 @@ -586515,13 +567292,13 @@ _0811E70A: pop {r0} bx r0 .align 2, 0 -_0811E71C: .4byte 0x0203a11c + .pool thumb_func_end sub_811E6E0 thumb_func_start sub_811E720 sub_811E720: @ 811E720 push {r4,lr} - ldr r4, _0811E788 + ldr r4, =0x08597e30 adds r0, r4, 0 movs r1, 0xDC movs r2, 0x54 @@ -586531,7 +567308,7 @@ sub_811E720: @ 811E720 lsrs r1, r0, 24 cmp r1, 0x40 beq _0811E74E - ldr r0, _0811E78C + ldr r0, =0x0203a11c ldr r2, [r0] movs r0, 0xBE lsls r0, 2 @@ -586539,7 +567316,7 @@ sub_811E720: @ 811E720 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0811E790 + ldr r1, =0x02020630 adds r0, r1 str r0, [r2] _0811E74E: @@ -586552,7 +567329,7 @@ _0811E74E: lsrs r1, r0, 24 cmp r1, 0x40 beq _0811E77E - ldr r0, _0811E78C + ldr r0, =0x0203a11c ldr r2, [r0] movs r0, 0xBF lsls r0, 2 @@ -586560,7 +567337,7 @@ _0811E74E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0811E790 + ldr r1, =0x02020630 adds r0, r1 str r0, [r2] movs r1, 0x1 @@ -586571,16 +567348,14 @@ _0811E77E: pop {r0} bx r0 .align 2, 0 -_0811E788: .4byte 0x08597e30 -_0811E78C: .4byte 0x0203a11c -_0811E790: .4byte 0x02020630 + .pool thumb_func_end sub_811E720 thumb_func_start sub_811E794 sub_811E794: @ 811E794 push {r4-r6,lr} bl sub_811BBF8 - ldr r6, _0811E7F4 + ldr r6, =0x0203a11c ldr r1, [r6] movs r2, 0xBE lsls r2, 2 @@ -586627,12 +567402,12 @@ _0811E7DA: pop {r0} bx r0 .align 2, 0 -_0811E7F4: .4byte 0x0203a11c + .pool thumb_func_end sub_811E794 thumb_func_start sub_811E7F8 sub_811E7F8: @ 811E7F8 - ldr r3, _0811E824 + ldr r3, =0x0203a11c ldr r0, [r3] movs r1, 0xBE lsls r1, 2 @@ -586654,7 +567429,7 @@ sub_811E7F8: @ 811E7F8 strb r0, [r1] bx lr .align 2, 0 -_0811E824: .4byte 0x0203a11c + .pool thumb_func_end sub_811E7F8 thumb_func_start sub_811E828 @@ -586690,7 +567465,7 @@ _0811E852: cmp r0, 0x4 bne _0811E8D0 adds r0, r4, 0 - ldr r5, _0811E8D8 + ldr r5, =nullsub_12 + 1 movs r4, 0 str r4, [sp] adds r1, r5, 0 @@ -586701,7 +567476,7 @@ _0811E852: lsrs r2, r0, 24 cmp r2, 0x40 beq _0811E892 - ldr r1, _0811E8DC + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -586714,7 +567489,7 @@ _0811E852: movs r1, 0x2 bl obj_anim_image_start _0811E892: - ldr r0, _0811E8E0 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] movs r1, 0x69 @@ -586732,7 +567507,7 @@ _0811E8A0: lsrs r2, r0, 24 cmp r2, 0x40 beq _0811E8D0 - ldr r1, _0811E8DC + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -586750,9 +567525,7 @@ _0811E8D0: pop {r0} bx r0 .align 2, 0 -_0811E8D8: .4byte nullsub_12 + 1 -_0811E8DC: .4byte 0x02020630 -_0811E8E0: .4byte 0x03005d90 + .pool thumb_func_end sub_811E828 thumb_func_start sub_811E8E4 @@ -586760,7 +567533,7 @@ sub_811E8E4: @ 811E8E4 push {lr} bl sub_811BA68 lsls r0, 24 - ldr r1, _0811E904 + ldr r1, =0x08597c30 lsrs r0, 22 adds r0, r1 ldrb r0, [r0, 0x3] @@ -586772,7 +567545,7 @@ sub_811E8E4: @ 811E8E4 beq _0811E916 b _0811E91A .align 2, 0 -_0811E904: .4byte 0x08597c30 + .pool _0811E908: cmp r0, 0x2 beq _0811E912 @@ -586804,7 +567577,7 @@ sub_811E920: @ 811E920 movs r0, 0 b _0811E93E _0811E932: - ldr r0, _0811E944 + ldr r0, =0x08597e60 lsls r1, 2 adds r1, r4, r1 adds r1, r0 @@ -586815,7 +567588,7 @@ _0811E93E: pop {r1} bx r1 .align 2, 0 -_0811E944: .4byte 0x08597e60 + .pool thumb_func_end sub_811E920 thumb_func_start sub_811E948 @@ -586830,21 +567603,21 @@ sub_811E948: @ 811E948 mov r8, r0 cmp r0, 0x3 beq _0811E9FA - ldr r3, _0811EA0C + ldr r3, =0xffffff00 ldr r0, [sp, 0xC] ands r0, r3 movs r1, 0x3 orrs r0, r1 - ldr r2, _0811EA10 + ldr r2, =0xffff00ff ands r0, r2 adds r1, 0xFD orrs r0, r1 - ldr r1, _0811EA14 + ldr r1, =0xff00ffff ands r0, r1 movs r1, 0xB0 lsls r1, 12 orrs r0, r1 - ldr r1, _0811EA18 + ldr r1, =0x00ffffff ands r0, r1 movs r1, 0xE0 lsls r1, 21 @@ -586858,7 +567631,7 @@ sub_811E948: @ 811E948 movs r1, 0xB0 lsls r1, 4 orrs r0, r1 - ldr r1, _0811EA1C + ldr r1, =0x0000ffff ands r0, r1 movs r1, 0xD0 lsls r1, 14 @@ -586875,9 +567648,9 @@ sub_811E948: @ 811E948 movs r6, 0 mov r0, r8 lsls r1, r0, 4 - ldr r0, _0811EA20 + ldr r0, =0x08597e6c adds r5, r1, r0 - ldr r1, _0811EA24 + ldr r1, =0x08597e60 mov r10, r1 mov r9, r4 _0811E9C6: @@ -586916,13 +567689,7 @@ _0811E9FA: pop {r0} bx r0 .align 2, 0 -_0811EA0C: .4byte 0xffffff00 -_0811EA10: .4byte 0xffff00ff -_0811EA14: .4byte 0xff00ffff -_0811EA18: .4byte 0x00ffffff -_0811EA1C: .4byte 0x0000ffff -_0811EA20: .4byte 0x08597e6c -_0811EA24: .4byte 0x08597e60 + .pool thumb_func_end sub_811E948 thumb_func_start sub_811EA28 @@ -586937,21 +567704,21 @@ sub_811EA28: @ 811EA28 bgt _0811EA48 cmp r0, 0x11 blt _0811EA66 - ldr r0, _0811EA44 + ldr r0, =0x00000864 bl flag_check b _0811EA60 .align 2, 0 -_0811EA44: .4byte 0x00000864 + .pool _0811EA48: cmp r1, 0x15 beq _0811EA5C b _0811EA66 _0811EA4E: - ldr r0, _0811EA58 + ldr r0, =0x00000866 bl flag_check b _0811EA60 .align 2, 0 -_0811EA58: .4byte 0x00000866 + .pool _0811EA5C: bl sub_811F0F8 _0811EA60: @@ -586986,7 +567753,7 @@ _0811EA84: movs r0, 0 b _0811EA9A _0811EA92: - ldr r0, _0811EAA0 + ldr r0, =0x0859d004 lsls r1, r4, 3 adds r1, r0 ldrh r0, [r1, 0x6] @@ -586995,7 +567762,7 @@ _0811EA9A: pop {r1} bx r1 .align 2, 0 -_0811EAA0: .4byte 0x0859d004 + .pool thumb_func_end start_menu_is_selected_item_valid thumb_func_start sub_811EAA4 @@ -587003,15 +567770,15 @@ sub_811EAA4: @ 811EAA4 push {r4,r5,lr} lsls r2, r0, 16 lsrs r1, r2, 16 - ldr r0, _0811EAD0 + ldr r0, =0x0000ffff cmp r1, r0 beq _0811EB04 lsrs r3, r2, 25 - ldr r5, _0811EAD4 + ldr r5, =0x000001ff ands r5, r1 cmp r3, 0x15 bhi _0811EB08 - ldr r0, _0811EAD8 + ldr r0, =0x0859d004 lsls r2, r3, 3 adds r1, r2, r0 ldrh r4, [r1, 0x4] @@ -587023,9 +567790,7 @@ sub_811EAA4: @ 811EAA4 beq _0811EAE0 b _0811EB00 .align 2, 0 -_0811EAD0: .4byte 0x0000ffff -_0811EAD4: .4byte 0x000001ff -_0811EAD8: .4byte 0x0859d004 + .pool _0811EADC: cmp r3, 0x15 bne _0811EB00 @@ -587081,19 +567846,19 @@ _0811EB2C: cmp r2, 0x15 bne _0811EB48 _0811EB30: - ldr r0, _0811EB38 + ldr r0, =0x085f5490 ldrh r0, [r0] b _0811EB50 .align 2, 0 -_0811EB38: .4byte 0x085f5490 + .pool _0811EB3C: - ldr r0, _0811EB44 + ldr r0, =0x085fa1d4 ldrh r0, [r0] b _0811EB50 .align 2, 0 -_0811EB44: .4byte 0x085fa1d4 + .pool _0811EB48: - ldr r1, _0811EB58 + ldr r1, =0x0859d004 lsls r0, r2, 3 adds r0, r1 ldrh r0, [r0, 0x4] @@ -587103,7 +567868,7 @@ _0811EB50: movs r0, 0 b _0811EB5E .align 2, 0 -_0811EB58: .4byte 0x0859d004 + .pool _0811EB5C: movs r0, 0x1 _0811EB5E: @@ -587131,21 +567896,21 @@ _0811EB7C: _0811EB80: movs r0, 0xB muls r0, r2 - ldr r1, _0811EB8C + ldr r1, =0x083185c8 adds r0, r1 b _0811EBB2 .align 2, 0 -_0811EB8C: .4byte 0x083185c8 + .pool _0811EB90: movs r0, 0xD muls r0, r2 - ldr r1, _0811EB9C + ldr r1, =0x0831977c adds r0, r1 b _0811EBB2 .align 2, 0 -_0811EB9C: .4byte 0x0831977c + .pool _0811EBA0: - ldr r1, _0811EBB8 + ldr r1, =0x0859d004 lsls r0, 3 adds r0, r1 ldr r1, [r0] @@ -587158,7 +567923,7 @@ _0811EBB2: pop {r1} bx r1 .align 2, 0 -_0811EBB8: .4byte 0x0859d004 + .pool thumb_func_end sub_811EB64 thumb_func_start sub_811EBBC @@ -587172,15 +567937,15 @@ sub_811EBBC: @ 811EBBC lsls r0, 24 cmp r0, 0 beq _0811EBD8 - ldr r1, _0811EBD4 + ldr r1, =0x085eea42 b _0811EBEA .align 2, 0 -_0811EBD4: .4byte 0x085eea42 + .pool _0811EBD8: - ldr r0, _0811EBF4 + ldr r0, =0x0000ffff cmp r4, r0 beq _0811EBFC - ldr r1, _0811EBF8 + ldr r1, =0x000001ff ands r1, r4 lsrs r0, r6, 25 bl sub_811EB64 @@ -587190,8 +567955,7 @@ _0811EBEA: bl gf_strcpy b _0811EC02 .align 2, 0 -_0811EBF4: .4byte 0x0000ffff -_0811EBF8: .4byte 0x000001ff + .pool _0811EBFC: movs r0, 0xFF strb r0, [r5] @@ -587215,7 +567979,7 @@ sub_811EC08: @ 811EC08 lsls r3, 16 lsrs r3, 16 mov r9, r3 - ldr r0, _0811EC90 + ldr r0, =0xffff0000 adds r2, r0 lsrs r7, r2, 16 movs r0, 0 @@ -587227,7 +567991,7 @@ _0811EC2A: mov r8, r0 cmp r6, r7 bcs _0811EC5C - ldr r2, _0811EC94 + ldr r2, =0x0000ffff _0811EC36: ldrh r1, [r5] adds r0, r4, 0 @@ -587275,8 +568039,7 @@ _0811EC78: pop {r1} bx r1 .align 2, 0 -_0811EC90: .4byte 0xffff0000 -_0811EC94: .4byte 0x0000ffff + .pool thumb_func_end sub_811EC08 thumb_func_start sub_811EC98 @@ -587313,7 +568076,7 @@ _0811ECC8: mov r10, r0 cmp r2, r7 bcs _0811ECEE - ldr r6, _0811ECF8 + ldr r6, =0x0000ffff _0811ECD8: lsls r0, r1, 1 adds r0, r3 @@ -587334,7 +568097,7 @@ _0811ECEE: adds r5, r0 b _0811ED56 .align 2, 0 -_0811ECF8: .4byte 0x0000ffff + .pool _0811ECFC: movs r6, 0 ldr r1, [sp, 0x4] @@ -587342,7 +568105,7 @@ _0811ECFC: mov r9, r1 cmp r6, r8 bcs _0811ED30 - ldr r2, _0811ED48 + ldr r2, =0x0000ffff _0811ED0A: ldrh r1, [r5] adds r0, r4, 0 @@ -587375,7 +568138,7 @@ _0811ED30: movs r0, 0xFE b _0811ED4E .align 2, 0 -_0811ED48: .4byte 0x0000ffff + .pool _0811ED4C: movs r0, 0xFA _0811ED4E: @@ -587411,28 +568174,28 @@ sub_811ED7C: @ 811ED7C lsls r5, r0, 16 lsrs r0, r5, 16 adds r4, r0, 0 - ldr r0, _0811ED90 + ldr r0, =0x0000ffff cmp r4, r0 bne _0811ED94 movs r0, 0 b _0811EDBA .align 2, 0 -_0811ED90: .4byte 0x0000ffff + .pool _0811ED94: adds r0, r4, 0 bl sub_811EAA4 lsls r0, 24 cmp r0, 0 bne _0811EDB0 - ldr r1, _0811EDAC + ldr r1, =0x000001ff ands r1, r4 lsrs r0, r5, 25 bl sub_811EB64 b _0811EDB2 .align 2, 0 -_0811EDAC: .4byte 0x000001ff + .pool _0811EDB0: - ldr r0, _0811EDC0 + ldr r0, =0x085eea42 _0811EDB2: bl sub_8008C24 lsls r0, 16 @@ -587442,7 +568205,7 @@ _0811EDBA: pop {r1} bx r1 .align 2, 0 -_0811EDC0: .4byte 0x085eea42 + .pool thumb_func_end sub_811ED7C thumb_func_start sub_811EDC4 @@ -587518,7 +568281,7 @@ sub_811EE38: @ 811EE38 lsls r0, 16 lsrs r4, r0, 16 bl GenerateRandomNumber - ldr r2, _0811EE88 + ldr r2, =0x0859d004 lsls r1, r4, 3 adds r1, r2 lsls r0, 16 @@ -587536,7 +568299,7 @@ sub_811EE38: @ 811EE38 cmp r4, 0x13 bne _0811EE74 _0811EE66: - ldr r1, _0811EE88 + ldr r1, =0x0859d004 lsls r0, r4, 3 adds r0, r1 ldr r1, [r0] @@ -587547,15 +568310,14 @@ _0811EE74: movs r0, 0x7F ands r0, r4 lsls r0, 9 - ldr r1, _0811EE8C + ldr r1, =0x000001ff ands r2, r1 orrs r0, r2 pop {r4} pop {r1} bx r1 .align 2, 0 -_0811EE88: .4byte 0x0859d004 -_0811EE8C: .4byte 0x000001ff + .pool thumb_func_end sub_811EE38 thumb_func_start sub_811EE90 @@ -587570,10 +568332,10 @@ sub_811EE90: @ 811EE90 lsls r0, 24 cmp r0, 0 bne _0811EEB0 - ldr r0, _0811EEAC + ldr r0, =0x0000ffff b _0811EEC4 .align 2, 0 -_0811EEAC: .4byte 0x0000ffff + .pool _0811EEB0: cmp r4, 0 beq _0811EEBC @@ -587594,7 +568356,7 @@ _0811EEC4: thumb_func_start sub_811EECC sub_811EECC: @ 811EECC push {r4,r5,lr} - ldr r0, _0811EEE0 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x1 beq _0811EF04 @@ -587604,7 +568366,7 @@ sub_811EECC: @ 811EECC beq _0811EEEE b _0811EF58 .align 2, 0 -_0811EEE0: .4byte 0x020375e0 + .pool _0811EEE4: cmp r0, 0x2 beq _0811EF2C @@ -587612,19 +568374,18 @@ _0811EEE4: beq _0811EF3C b _0811EF58 _0811EEEE: - ldr r0, _0811EEFC + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0811EF00 + ldr r1, =0x00002bb0 adds r5, r0, r1 movs r2, 0x2 b _0811EF46 .align 2, 0 -_0811EEFC: .4byte 0x03005d8c -_0811EF00: .4byte 0x00002bb0 + .pool _0811EF04: - ldr r0, _0811EF24 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0811EF28 + ldr r1, =0x00002bbc adds r5, r0, r1 adds r0, r5, 0 movs r1, 0x3 @@ -587638,20 +568399,18 @@ _0811EF04: movs r3, 0x3 b _0811EF48 .align 2, 0 -_0811EF24: .4byte 0x03005d8c -_0811EF28: .4byte 0x00002bbc + .pool _0811EF2C: - ldr r0, _0811EF34 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0811EF38 + ldr r1, =0x00002bc8 b _0811EF42 .align 2, 0 -_0811EF34: .4byte 0x03005d8c -_0811EF38: .4byte 0x00002bc8 + .pool _0811EF3C: - ldr r0, _0811EF60 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0811EF64 + ldr r1, =0x00002bd4 _0811EF42: adds r5, r0, r1 _0811EF44: @@ -587659,7 +568418,7 @@ _0811EF44: _0811EF46: movs r3, 0x2 _0811EF48: - ldr r4, _0811EF68 + ldr r4, =0x02021fc4 adds r0, r4, 0 adds r1, r5, 0 bl sub_811EC08 @@ -587670,9 +568429,7 @@ _0811EF58: pop {r0} bx r0 .align 2, 0 -_0811EF60: .4byte 0x03005d8c -_0811EF64: .4byte 0x00002bd4 -_0811EF68: .4byte 0x02021fc4 + .pool thumb_func_end sub_811EECC thumb_func_start sub_811EF6C @@ -587690,12 +568447,12 @@ _0811EF7E: adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r0, _0811EF94 + ldr r0, =0x02021dc4 bl sub_811EBBC pop {r0} bx r0 .align 2, 0 -_0811EF94: .4byte 0x02021dc4 + .pool thumb_func_end sub_811EF6C thumb_func_start sub_811EF98 @@ -587706,9 +568463,9 @@ sub_811EF98: @ 811EF98 lsls r1, 19 ands r1, r0 lsrs r1, 24 - ldr r0, _0811EFB8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _0811EFBC + ldr r3, =0x00002e20 adds r0, r3 adds r0, r2 ldrb r0, [r0] @@ -587717,8 +568474,7 @@ sub_811EF98: @ 811EF98 ands r0, r1 bx lr .align 2, 0 -_0811EFB8: .4byte 0x03005d8c -_0811EFBC: .4byte 0x00002e20 + .pool thumb_func_end sub_811EF98 thumb_func_start sub_811EFC0 @@ -587731,9 +568487,9 @@ sub_811EFC0: @ 811EFC0 lsrs r3, r0, 27 movs r2, 0x7 ands r2, r1 - ldr r0, _0811EFE8 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0811EFEC + ldr r0, =0x00002e20 adds r1, r0 adds r1, r3 movs r0, 0x1 @@ -587745,8 +568501,7 @@ _0811EFE4: pop {r0} bx r0 .align 2, 0 -_0811EFE8: .4byte 0x03005d8c -_0811EFEC: .4byte 0x00002e20 + .pool thumb_func_end sub_811EFC0 thumb_func_start sub_811EFF0 @@ -587787,7 +568542,7 @@ sub_811F01C: @ 811F01C _0811F02C: adds r0, r5, 0 bl sub_811EFC0 - ldr r0, _0811F044 + ldr r0, =0x000001ff ands r4, r0 movs r1, 0xA0 lsls r1, 6 @@ -587796,7 +568551,7 @@ _0811F02C: adds r0, r4, 0 b _0811F084 .align 2, 0 -_0811F044: .4byte 0x000001ff + .pool _0811F048: bl GenerateRandomNumber lsls r0, 16 @@ -587827,13 +568582,13 @@ _0811F078: cmp r4, 0x20 bls _0811F05E _0811F082: - ldr r0, _0811F08C + ldr r0, =0x0000ffff _0811F084: pop {r4-r6} pop {r1} bx r1 .align 2, 0 -_0811F08C: .4byte 0x0000ffff + .pool thumb_func_end sub_811F01C thumb_func_start sub_811F090 @@ -587846,7 +568601,7 @@ sub_811F090: @ 811F090 bne _0811F0B4 b _0811F0EA _0811F0A0: - ldr r0, _0811F0B0 + ldr r0, =0x000001ff ands r4, r0 movs r1, 0xA0 lsls r1, 6 @@ -587855,7 +568610,7 @@ _0811F0A0: adds r0, r4, 0 b _0811F0EC .align 2, 0 -_0811F0B0: .4byte 0x000001ff + .pool _0811F0B4: bl GenerateRandomNumber lsls r0, 16 @@ -587884,13 +568639,13 @@ _0811F0E0: cmp r4, 0x20 bls _0811F0C8 _0811F0EA: - ldr r0, _0811F0F4 + ldr r0, =0x0000ffff _0811F0EC: pop {r4,r5} pop {r1} bx r1 .align 2, 0 -_0811F0F4: .4byte 0x0000ffff + .pool thumb_func_end sub_811F090 thumb_func_start sub_811F0F8 @@ -587915,11 +568670,11 @@ sub_811F108: @ 811F108 b _0811F172 _0811F11A: ldrh r1, [r5] - ldr r0, _0811F124 + ldr r0, =0x000001ff ands r0, r1 b _0811F174 .align 2, 0 -_0811F124: .4byte 0x000001ff + .pool _0811F128: bl GenerateRandomNumber lsls r0, 16 @@ -587928,7 +568683,7 @@ _0811F128: bl __umodsi3 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _0811F17C + ldr r0, =0x0859d004 ldr r5, [r0] ldrh r7, [r0, 0x4] movs r6, 0 @@ -587957,23 +568712,22 @@ _0811F166: cmp r6, r7 bcc _0811F146 _0811F172: - ldr r0, _0811F180 + ldr r0, =0x0000ffff _0811F174: pop {r4-r7} pop {r1} bx r1 .align 2, 0 -_0811F17C: .4byte 0x0859d004 -_0811F180: .4byte 0x0000ffff + .pool thumb_func_end sub_811F108 thumb_func_start sub_811F184 sub_811F184: @ 811F184 push {r4-r7,lr} movs r2, 0 - ldr r5, _0811F25C - ldr r4, _0811F260 - ldr r3, _0811F264 + ldr r5, =0x03005d8c + ldr r4, =0x00002bb0 + ldr r3, =0x0859e62c _0811F18E: ldr r1, [r5] lsls r0, r2, 1 @@ -587988,9 +568742,9 @@ _0811F18E: cmp r2, 0x3 bls _0811F18E movs r2, 0 - ldr r5, _0811F25C - ldr r4, _0811F268 - ldr r3, _0811F26C + ldr r5, =0x03005d8c + ldr r4, =0x00002bbc + ldr r3, =0x0859e634 _0811F1AE: ldr r1, [r5] lsls r0, r2, 1 @@ -588005,9 +568759,9 @@ _0811F1AE: cmp r2, 0x5 bls _0811F1AE movs r2, 0 - ldr r5, _0811F25C - ldr r4, _0811F270 - ldr r3, _0811F274 + ldr r5, =0x03005d8c + ldr r4, =0x00002bc8 + ldr r3, =0x0859e640 _0811F1CE: ldr r1, [r5] lsls r0, r2, 1 @@ -588022,9 +568776,9 @@ _0811F1CE: cmp r2, 0x5 bls _0811F1CE movs r2, 0 - ldr r5, _0811F25C - ldr r4, _0811F278 - ldr r3, _0811F27C + ldr r5, =0x03005d8c + ldr r4, =0x00002bd4 + ldr r3, =0x0859e64c _0811F1EE: ldr r1, [r5] lsls r0, r2, 1 @@ -588039,9 +568793,9 @@ _0811F1EE: cmp r2, 0x5 bls _0811F1EE movs r2, 0 - ldr r7, _0811F25C - ldr r6, _0811F280 - ldr r0, _0811F284 + ldr r7, =0x03005d8c + ldr r6, =0x00002be0 + ldr r0, =0x0000ffff adds r5, r0, 0 _0811F210: movs r3, 0 @@ -588068,8 +568822,8 @@ _0811F218: cmp r2, 0xF bls _0811F210 movs r2, 0 - ldr r4, _0811F25C - ldr r3, _0811F288 + ldr r4, =0x03005d8c + ldr r3, =0x00002e20 movs r1, 0 _0811F244: ldr r0, [r4] @@ -588085,25 +568839,14 @@ _0811F244: pop {r0} bx r0 .align 2, 0 -_0811F25C: .4byte 0x03005d8c -_0811F260: .4byte 0x00002bb0 -_0811F264: .4byte 0x0859e62c -_0811F268: .4byte 0x00002bbc -_0811F26C: .4byte 0x0859e634 -_0811F270: .4byte 0x00002bc8 -_0811F274: .4byte 0x0859e640 -_0811F278: .4byte 0x00002bd4 -_0811F27C: .4byte 0x0859e64c -_0811F280: .4byte 0x00002be0 -_0811F284: .4byte 0x0000ffff -_0811F288: .4byte 0x00002e20 + .pool thumb_func_end sub_811F184 thumb_func_start sub_811F28C sub_811F28C: @ 811F28C push {r4,lr} - ldr r4, _0811F2A8 - ldr r0, _0811F2AC + ldr r4, =0x0203a120 + ldr r0, =0x00003ba4 bl malloc str r0, [r4] cmp r0, 0 @@ -588113,8 +568856,7 @@ sub_811F28C: @ 811F28C movs r0, 0x1 b _0811F2B2 .align 2, 0 -_0811F2A8: .4byte 0x0203a120 -_0811F2AC: .4byte 0x00003ba4 + .pool _0811F2B0: movs r0, 0 _0811F2B2: @@ -588126,7 +568868,7 @@ _0811F2B2: thumb_func_start sub_811F2B8 sub_811F2B8: @ 811F2B8 push {r4,lr} - ldr r4, _0811F2D0 + ldr r4, =0x0203a120 ldr r0, [r4] cmp r0, 0 beq _0811F2CA @@ -588138,13 +568880,13 @@ _0811F2CA: pop {r0} bx r0 .align 2, 0 -_0811F2D0: .4byte 0x0203a120 + .pool thumb_func_end sub_811F2B8 thumb_func_start sub_811F2D4 sub_811F2D4: @ 811F2D4 push {r4,r5,lr} - ldr r4, _0811F3A0 + ldr r4, =0x0203a120 ldr r0, [r4] movs r5, 0 strh r5, [r0] @@ -588177,12 +568919,12 @@ _0811F2FE: adds r3, 0x1 cmp r3, 0x10 ble _0811F2FE - ldr r0, _0811F3A4 + ldr r0, =0x00000864 bl flag_check lsls r0, 24 cmp r0, 0 beq _0811F358 - ldr r0, _0811F3A0 + ldr r0, =0x0203a120 ldr r2, [r0] ldrh r0, [r2] adds r1, r0, 0x1 @@ -588210,12 +568952,12 @@ _0811F2FE: movs r0, 0x13 strh r0, [r3] _0811F358: - ldr r0, _0811F3A8 + ldr r0, =0x00000866 bl flag_check lsls r0, 24 cmp r0, 0 beq _0811F37A - ldr r0, _0811F3A0 + ldr r0, =0x0203a120 ldr r0, [r0] ldrh r1, [r0] adds r2, r1, 0x1 @@ -588230,7 +568972,7 @@ _0811F37A: bl sub_809D42C cmp r0, 0 beq _0811F398 - ldr r0, _0811F3A0 + ldr r0, =0x0203a120 ldr r0, [r0] ldrh r1, [r0] adds r2, r1, 0x1 @@ -588246,19 +568988,17 @@ _0811F398: pop {r0} bx r0 .align 2, 0 -_0811F3A0: .4byte 0x0203a120 -_0811F3A4: .4byte 0x00000864 -_0811F3A8: .4byte 0x00000866 + .pool thumb_func_end sub_811F2D4 thumb_func_start sub_811F3AC sub_811F3AC: @ 811F3AC - ldr r0, _0811F3B4 + ldr r0, =0x0203a120 ldr r0, [r0] ldrb r0, [r0] bx lr .align 2, 0 -_0811F3B4: .4byte 0x0203a120 + .pool thumb_func_end sub_811F3AC thumb_func_start sub_811F3B8 @@ -588266,7 +569006,7 @@ sub_811F3B8: @ 811F3B8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0811F3D4 + ldr r0, =0x0203a120 ldr r1, [r0] ldrh r0, [r1] cmp r2, r0 @@ -588277,7 +569017,7 @@ sub_811F3B8: @ 811F3B8 ldrb r0, [r1] b _0811F3DA .align 2, 0 -_0811F3D4: .4byte 0x0203a120 + .pool _0811F3D8: movs r0, 0x16 _0811F3DA: @@ -588292,7 +569032,7 @@ sub_811F3E0: @ 811F3E0 lsls r1, 24 lsls r2, 16 lsrs r5, r2, 16 - ldr r0, _0811F420 + ldr r0, =0x0859e5d4 lsrs r1, 22 adds r1, r0 ldr r1, [r1] @@ -588321,19 +569061,19 @@ _0811F414: pop {r1} bx r1 .align 2, 0 -_0811F420: .4byte 0x0859e5d4 + .pool thumb_func_end sub_811F3E0 thumb_func_start sub_811F424 sub_811F424: @ 811F424 lsls r0, 24 - ldr r1, _0811F430 + ldr r1, =0x0859e5d4 lsrs r0, 22 adds r0, r1 ldr r0, [r0] bx lr .align 2, 0 -_0811F430: .4byte 0x0859e5d4 + .pool thumb_func_end sub_811F424 thumb_func_start sub_811F434 @@ -588379,7 +569119,7 @@ sub_811F46C: @ 811F46C sub sp, 0x10 movs r3, 0 _0811F47A: - ldr r2, _0811F4BC + ldr r2, =0x0859e46c lsls r1, r3, 3 adds r0, r2, 0x4 adds r0, r1, r0 @@ -588387,7 +569127,7 @@ _0811F47A: str r0, [sp] adds r1, r2 ldr r7, [r1] - ldr r0, _0811F4C0 + ldr r0, =0x0203a120 ldr r1, [r0] lsls r2, r3, 1 adds r1, 0x2E @@ -588404,7 +569144,7 @@ _0811F47A: bge _0811F530 _0811F4A8: ldrh r0, [r7] - ldr r2, _0811F4C4 + ldr r2, =0x0000ffff cmp r0, r2 bne _0811F4FC adds r7, 0x2 @@ -588414,11 +569154,9 @@ _0811F4A8: adds r1, r0, r4 b _0811F4FE .align 2, 0 -_0811F4BC: .4byte 0x0859e46c -_0811F4C0: .4byte 0x0203a120 -_0811F4C4: .4byte 0x0000ffff + .pool _0811F4C8: - ldr r0, _0811F4F8 + ldr r0, =0x0203a120 ldr r2, [r0] mov r0, r10 lsls r1, r0, 1 @@ -588443,7 +569181,7 @@ _0811F4C8: strh r0, [r2] b _0811F526 .align 2, 0 -_0811F4F8: .4byte 0x0203a120 + .pool _0811F4FC: movs r4, 0x1 _0811F4FE: @@ -588501,16 +569239,15 @@ _0811F55A: adds r0, r1, 0 bl sub_811F6B8 _0811F560: - ldr r1, _0811F570 + ldr r1, =0x0203a120 ldr r1, [r1] - ldr r2, _0811F574 + ldr r2, =0x00003ba0 adds r1, r2 strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_0811F570: .4byte 0x0203a120 -_0811F574: .4byte 0x00003ba0 + .pool thumb_func_end sub_811F548 thumb_func_start sub_811F578 @@ -588518,43 +569255,40 @@ sub_811F578: @ 811F578 push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _0811F598 + ldr r0, =0x0203a120 ldr r1, [r0] - ldr r3, _0811F59C + ldr r3, =0x00003ba0 adds r0, r1, r3 ldrh r0, [r0] cmp r2, r0 bcs _0811F5A4 lsls r0, r2, 1 - ldr r2, _0811F5A0 + ldr r2, =0x00003984 adds r1, r2 adds r1, r0 ldrh r0, [r1] b _0811F5A6 .align 2, 0 -_0811F598: .4byte 0x0203a120 -_0811F59C: .4byte 0x00003ba0 -_0811F5A0: .4byte 0x00003984 + .pool _0811F5A4: - ldr r0, _0811F5AC + ldr r0, =0x0000ffff _0811F5A6: pop {r1} bx r1 .align 2, 0 -_0811F5AC: .4byte 0x0000ffff + .pool thumb_func_end sub_811F578 thumb_func_start sub_811F5B0 sub_811F5B0: @ 811F5B0 - ldr r0, _0811F5BC + ldr r0, =0x0203a120 ldr r0, [r0] - ldr r1, _0811F5C0 + ldr r1, =0x00003ba0 adds r0, r1 ldrh r0, [r0] bx lr .align 2, 0 -_0811F5BC: .4byte 0x0203a120 -_0811F5C0: .4byte 0x00003ba0 + .pool thumb_func_end sub_811F5B0 thumb_func_start sub_811F5C4 @@ -588566,7 +569300,7 @@ sub_811F5C4: @ 811F5C4 push {r5-r7} lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _0811F63C + ldr r1, =0x0859d004 lsls r0, r2, 3 adds r0, r1 ldrh r3, [r0, 0x4] @@ -588600,14 +569334,14 @@ _0811F606: lsls r0, 24 cmp r0, 0 beq _0811F630 - ldr r0, _0811F640 + ldr r0, =0x0203a120 ldr r2, [r0] lsls r0, r5, 1 - ldr r1, _0811F644 + ldr r1, =0x00003984 adds r2, r1 adds r2, r0 ldrh r0, [r4] - ldr r3, _0811F648 + ldr r3, =0x000001ff adds r1, r3, 0 ands r0, r1 mov r1, r9 @@ -588621,10 +569355,7 @@ _0811F630: bcc _0811F606 b _0811F698 .align 2, 0 -_0811F63C: .4byte 0x0859d004 -_0811F640: .4byte 0x0203a120 -_0811F644: .4byte 0x00003984 -_0811F648: .4byte 0x000001ff + .pool _0811F64C: ldr r1, [r0] movs r7, 0 @@ -588647,13 +569378,13 @@ _0811F664: lsls r0, 24 cmp r0, 0 beq _0811F690 - ldr r0, _0811F6AC + ldr r0, =0x0203a120 ldr r1, [r0] lsls r0, r5, 1 - ldr r3, _0811F6B0 + ldr r3, =0x00003984 adds r1, r3 adds r1, r0 - ldr r2, _0811F6B4 + ldr r2, =0x000001ff adds r0, r2, 0 ands r4, r0 mov r3, r10 @@ -588676,9 +569407,7 @@ _0811F698: pop {r1} bx r1 .align 2, 0 -_0811F6AC: .4byte 0x0203a120 -_0811F6B0: .4byte 0x00003984 -_0811F6B4: .4byte 0x000001ff + .pool thumb_func_end sub_811F5C4 thumb_func_start sub_811F6B8 @@ -588690,7 +569419,7 @@ sub_811F6B8: @ 811F6B8 lsrs r1, r0, 16 movs r4, 0 movs r6, 0 - ldr r3, _0811F724 + ldr r3, =0x0203a120 ldr r0, [r3] lsls r5, r1, 1 adds r0, 0x2E @@ -588704,7 +569433,7 @@ sub_811F6B8: @ 811F6B8 lsls r0, 3 subs r0, r1 lsls r7, r0, 2 - ldr r0, _0811F728 + ldr r0, =0x00003984 mov r12, r0 _0811F6E6: mov r0, r8 @@ -588740,8 +569469,7 @@ _0811F718: pop {r1} bx r1 .align 2, 0 -_0811F724: .4byte 0x0203a120 -_0811F728: .4byte 0x00003984 + .pool thumb_func_end sub_811F6B8 thumb_func_start sub_811F72C @@ -588750,7 +569478,7 @@ sub_811F72C: @ 811F72C lsls r0, 24 lsrs r3, r0, 24 movs r2, 0 - ldr r0, _0811F750 + ldr r0, =0x0203a120 ldr r0, [r0] ldrh r1, [r0] cmp r2, r1 @@ -588765,7 +569493,7 @@ _0811F744: movs r0, 0x1 b _0811F75E .align 2, 0 -_0811F750: .4byte 0x0203a120 + .pool _0811F754: adds r1, 0x2 adds r2, 0x1 @@ -588789,12 +569517,12 @@ sub_811F764: @ 811F764 cmp r2, 0x15 bhi _0811F81A lsls r0, r2, 2 - ldr r1, _0811F77C + ldr r1, =_0811F780 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0811F77C: .4byte _0811F780 + .pool .align 2, 0 _0811F780: .4byte _0811F7D8 @@ -588851,7 +569579,7 @@ _0811F80C: lsrs r0, 24 b _0811F82C _0811F81A: - ldr r1, _0811F834 + ldr r1, =0x0859d004 lsls r0, r2, 3 adds r0, r1 ldr r1, [r0] @@ -588865,7 +569593,7 @@ _0811F82C: pop {r1} bx r1 .align 2, 0 -_0811F834: .4byte 0x0859d004 + .pool thumb_func_end sub_811F764 thumb_func_start sub_811F838 @@ -588874,7 +569602,7 @@ sub_811F838: @ 811F838 lsls r0, 16 lsrs r3, r0, 16 movs r2, 0 - ldr r1, _0811F84C + ldr r1, =0x0859e658 _0811F842: ldrh r0, [r1] cmp r0, r3 @@ -588882,7 +569610,7 @@ _0811F842: movs r0, 0x1 b _0811F85A .align 2, 0 -_0811F84C: .4byte 0x0859e658 + .pool _0811F850: adds r1, 0x2 adds r2, 0x1 @@ -588925,10 +569653,10 @@ sub_811F88C: @ 811F88C push {lr} adds r2, r0, 0 lsls r1, 16 - ldr r0, _0811F8B4 + ldr r0, =0xffff0000 adds r1, r0 lsrs r0, r1, 16 - ldr r1, _0811F8B8 + ldr r1, =0x0000ffff cmp r0, r1 beq _0811F8AE adds r3, r1, 0 @@ -588944,15 +569672,14 @@ _0811F8AE: pop {r0} bx r0 .align 2, 0 -_0811F8B4: .4byte 0xffff0000 -_0811F8B8: .4byte 0x0000ffff + .pool thumb_func_end sub_811F88C thumb_func_start sub_811F8BC sub_811F8BC: @ 811F8BC push {lr} bl sub_801B058 - ldr r1, _0811F8D4 + ldr r1, =0x0000ffff adds r2, r1, 0 adds r1, r0, 0x6 _0811F8C8: @@ -588963,7 +569690,7 @@ _0811F8C8: pop {r0} bx r0 .align 2, 0 -_0811F8D4: .4byte 0x0000ffff + .pool thumb_func_end sub_811F8BC thumb_func_start sub_811F8D8 @@ -588971,7 +569698,7 @@ sub_811F8D8: @ 811F8D8 push {r4,r5,lr} asrs r4, r0, 9 movs r1, 0x7F - ldr r5, _0811F900 + ldr r5, =0x000001ff ands r5, r0 ands r4, r1 adds r0, r4, 0 @@ -588986,7 +569713,7 @@ sub_811F8D8: @ 811F8D8 lsrs r0, 24 b _0811F906 .align 2, 0 -_0811F900: .4byte 0x000001ff + .pool _0811F904: movs r0, 0 _0811F906: @@ -588997,29 +569724,29 @@ _0811F906: thumb_func_start sub_811F90C sub_811F90C: @ 811F90C - ldr r1, _0811F914 + ldr r1, =0x0203a124 str r0, [r1] bx lr .align 2, 0 -_0811F914: .4byte 0x0203a124 + .pool thumb_func_end sub_811F90C thumb_func_start sub_811F918 sub_811F918: @ 811F918 push {lr} sub sp, 0x4 - ldr r0, _0811F950 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x14] lsrs r0, 3 bl sub_8098758 - ldr r3, _0811F954 + ldr r3, =0x0203a124 ldr r2, [r3] ldr r1, [r0] str r1, [r2, 0x2C] ldr r0, [r0, 0x4] str r0, [r2, 0x30] - ldr r0, _0811F958 + ldr r0, =0x000010b4 adds r2, r0 movs r1, 0 strb r1, [r2] @@ -589027,24 +569754,21 @@ sub_811F918: @ 811F918 strh r1, [r0] ldr r1, [r3] adds r1, 0x34 - ldr r2, _0811F95C + ldr r2, =0x01000800 bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_0811F950: .4byte 0x03005d90 -_0811F954: .4byte 0x0203a124 -_0811F958: .4byte 0x000010b4 -_0811F95C: .4byte 0x01000800 + .pool thumb_func_end sub_811F918 thumb_func_start sub_811F960 sub_811F960: @ 811F960 push {r4-r7,lr} - ldr r0, _0811F980 + ldr r0, =0x0203a124 ldr r1, [r0] - ldr r2, _0811F984 + ldr r2, =0x000010b4 adds r0, r1, r2 ldrb r2, [r0] lsls r0, r2, 8 @@ -589058,8 +569782,7 @@ sub_811F960: @ 811F960 beq _0811F98E b _0811F9D8 .align 2, 0 -_0811F980: .4byte 0x0203a124 -_0811F984: .4byte 0x000010b4 + .pool _0811F988: cmp r2, 0xE beq _0811FA7C @@ -589073,7 +569796,7 @@ _0811F98E: adds r7, r5, 0 adds r7, 0xE0 _0811F99E: - ldr r6, _0811F9D0 + ldr r6, =0x0203a124 ldr r0, [r6] ldr r0, [r0, 0x2C] adds r0, 0x20 @@ -589093,14 +569816,13 @@ _0811F99E: movs r2, 0x8 bl CpuFastSet ldr r1, [r6] - ldr r0, _0811F9D4 + ldr r0, =0x000010b4 adds r1, r0 b _0811FA1E .align 2, 0 -_0811F9D0: .4byte 0x0203a124 -_0811F9D4: .4byte 0x000010b4 + .pool _0811F9D8: - ldr r0, _0811FA28 + ldr r0, =0x0203a124 ldr r0, [r0] ldr r0, [r0, 0x2C] adds r0, 0x60 @@ -589111,7 +569833,7 @@ _0811F9D8: adds r7, r5, 0 adds r7, 0xE0 _0811F9EE: - ldr r6, _0811FA28 + ldr r6, =0x0203a124 ldr r0, [r6] ldr r0, [r0, 0x2C] adds r0, 0x80 @@ -589131,7 +569853,7 @@ _0811F9EE: movs r2, 0x8 bl CpuFastSet ldr r1, [r6] - ldr r2, _0811FA2C + ldr r2, =0x000010b4 adds r1, r2 _0811FA1E: ldrb r0, [r1] @@ -589139,8 +569861,7 @@ _0811FA1E: strb r0, [r1] b _0811FA88 .align 2, 0 -_0811FA28: .4byte 0x0203a124 -_0811FA2C: .4byte 0x000010b4 + .pool _0811FA30: ldr r0, [r1, 0x2C] adds r0, 0xC0 @@ -589151,7 +569872,7 @@ _0811FA30: adds r7, r5, 0 adds r7, 0xE0 _0811FA42: - ldr r6, _0811FA80 + ldr r6, =0x0203a124 ldr r0, [r6] ldr r0, [r0, 0x2C] adds r0, 0xE0 @@ -589173,7 +569894,7 @@ _0811FA42: movs r2, 0x8 bl CpuFastSet ldr r1, [r6] - ldr r2, _0811FA84 + ldr r2, =0x000010b4 adds r1, r2 ldrb r0, [r1] adds r0, 0x1 @@ -589182,8 +569903,7 @@ _0811FA7C: movs r0, 0 b _0811FA8A .align 2, 0 -_0811FA80: .4byte 0x0203a124 -_0811FA84: .4byte 0x000010b4 + .pool _0811FA88: movs r0, 0x1 _0811FA8A: @@ -589212,7 +569932,7 @@ sub_811FAA4: @ 811FAA4 lsrs r5, r1, 16 lsls r2, 16 lsrs r6, r2, 16 - ldr r2, _0811FAF4 + ldr r2, =0x0203a124 ldr r3, [r2] movs r1, 0 strb r1, [r3, 0x5] @@ -589247,14 +569967,14 @@ _0811FAC2: pop {r0} bx r0 .align 2, 0 -_0811FAF4: .4byte 0x0203a124 + .pool thumb_func_end sub_811FAA4 thumb_func_start sub_811FAF8 sub_811FAF8: @ 811FAF8 push {r4-r7,lr} movs r5, 0 - ldr r4, _0811FBA0 + ldr r4, =0x0203a124 _0811FAFE: ldr r0, [r4] ldrh r0, [r0] @@ -589274,7 +569994,7 @@ _0811FAFE: cmp r5, 0x1 bls _0811FAFE movs r5, 0 - ldr r6, _0811FBA0 + ldr r6, =0x0203a124 _0811FB28: ldr r0, [r6] lsls r4, r5, 2 @@ -589295,7 +570015,7 @@ _0811FB28: cmp r5, 0x1 bls _0811FB28 movs r5, 0 - ldr r6, _0811FBA0 + ldr r6, =0x0203a124 _0811FB52: ldr r0, [r6] lsls r4, r5, 2 @@ -589315,7 +570035,7 @@ _0811FB52: lsrs r5, r0, 16 cmp r5, 0x3 bls _0811FB52 - ldr r4, _0811FBA0 + ldr r4, =0x0203a124 ldr r0, [r4] ldr r0, [r0, 0x24] cmp r0, 0 @@ -589336,13 +570056,13 @@ _0811FB9A: pop {r0} bx r0 .align 2, 0 -_0811FBA0: .4byte 0x0203a124 + .pool thumb_func_end sub_811FAF8 thumb_func_start sub_811FBA4 sub_811FBA4: @ 811FBA4 push {r4,r5,lr} - ldr r0, _0811FBD4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -589352,7 +570072,7 @@ sub_811FBA4: @ 811FBA4 beq _0811FBDC movs r0, 0x5 bl audio_play - ldr r2, _0811FBD8 + ldr r2, =0x0203a124 ldr r1, [r2] ldrb r0, [r1, 0x5] subs r0, 0x1 @@ -589365,8 +570085,7 @@ sub_811FBA4: @ 811FBA4 strb r0, [r1, 0x5] b _0811FC64 .align 2, 0 -_0811FBD4: .4byte 0x030022c0 -_0811FBD8: .4byte 0x0203a124 + .pool _0811FBDC: movs r0, 0x80 ands r0, r1 @@ -589376,7 +570095,7 @@ _0811FBDC: beq _0811FC0C movs r0, 0x5 bl audio_play - ldr r2, _0811FC08 + ldr r2, =0x0203a124 ldr r1, [r2] ldrb r0, [r1, 0x5] adds r0, 0x1 @@ -589389,7 +570108,7 @@ _0811FBDC: strb r5, [r0, 0x5] b _0811FC64 .align 2, 0 -_0811FC08: .4byte 0x0203a124 + .pool _0811FC0C: movs r0, 0x1 ands r0, r1 @@ -589397,7 +570116,7 @@ _0811FC0C: beq _0811FC68 movs r0, 0x5 bl audio_play - ldr r2, _0811FC3C + ldr r2, =0x0203a124 ldr r0, [r2] movs r1, 0x5 ldrsb r1, [r0, r1] @@ -589414,7 +570133,7 @@ _0811FC0C: movs r2, 0x1 b _0811FC62 .align 2, 0 -_0811FC3C: .4byte 0x0203a124 + .pool _0811FC40: strb r4, [r0, 0x4] movs r3, 0 @@ -589476,7 +570195,7 @@ sub_811FC80: @ 811FC80 lsrs r5, 16 lsls r6, 16 lsrs r6, 16 - ldr r4, _0811FE78 + ldr r4, =0x0203a124 ldr r0, [r4] adds r0, 0x34 str r0, [sp, 0x18] @@ -589489,7 +570208,7 @@ sub_811FC80: @ 811FC80 adds r0, 0x1E strh r5, [r0] add r1, sp, 0x20 - ldr r0, _0811FE7C + ldr r0, =0x08dc9628 str r0, [sp, 0x20] movs r0, 0xC8 lsls r0, 2 @@ -589512,7 +570231,7 @@ sub_811FC80: @ 811FC80 add r0, sp, 0x34 strh r6, [r0] add r1, sp, 0x38 - ldr r0, _0811FE80 + ldr r0, =0x08dc9608 str r0, [sp, 0x38] adds r0, r6, 0x1 strh r0, [r1, 0x4] @@ -589527,14 +570246,14 @@ sub_811FC80: @ 811FC80 bl memcpy strh r5, [r4] strh r6, [r4, 0x2] - ldr r0, _0811FE84 + ldr r0, =0x0859ee7c str r0, [r4, 0x4] - ldr r0, _0811FE88 + ldr r0, =0x0859ef14 str r0, [r4, 0x8] str r7, [r4, 0xC] - ldr r0, _0811FE8C + ldr r0, =0x082ec6a8 str r0, [r4, 0x10] - ldr r0, _0811FE90 + ldr r0, =nullsub_47 + 1 str r0, [r4, 0x14] mov r0, sp bl gpu_tile_obj_alloc_and_load_multiple @@ -589571,7 +570290,7 @@ _0811FD58: bne _0811FD70 b _0811FEFC _0811FD70: - ldr r6, _0811FE78 + ldr r6, =0x0203a124 ldr r2, [r6] lsls r0, r5, 2 adds r2, 0xC @@ -589579,7 +570298,7 @@ _0811FD70: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r1, _0811FE94 + ldr r1, =0x02020630 adds r0, r1 str r0, [r2] lsls r1, r5, 24 @@ -589602,11 +570321,11 @@ _0811FD70: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] - ldr r0, _0811FE98 + ldr r0, =0x0859eedc str r0, [r4, 0x8] - ldr r0, _0811FE9C + ldr r0, =sub_811FF40 + 1 str r0, [r4, 0x14] - ldr r0, _0811FEA0 + ldr r0, =0x0859ee84 str r0, [r4, 0x4] movs r5, 0 ldr r0, [sp, 0x48] @@ -589634,7 +570353,7 @@ _0811FDC8: bne _0811FDEE b _0811FF0C _0811FDEE: - ldr r6, _0811FE78 + ldr r6, =0x0203a124 ldr r1, [r6] lsls r0, r5, 2 adds r1, 0x14 @@ -589642,7 +570361,7 @@ _0811FDEE: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r7, _0811FE94 + ldr r7, =0x02020630 adds r0, r7 str r0, [r1] strh r5, [r0, 0x2E] @@ -589651,7 +570370,7 @@ _0811FDEE: lsrs r5, r0, 16 cmp r5, 0x3 bls _0811FDC8 - ldr r0, _0811FEA4 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x14] adds r0, r4, 0 movs r1, 0 @@ -589701,24 +570420,13 @@ _0811FDEE: bl oam_center b _0811FEAE .align 2, 0 -_0811FE78: .4byte 0x0203a124 -_0811FE7C: .4byte 0x08dc9628 -_0811FE80: .4byte 0x08dc9608 -_0811FE84: .4byte 0x0859ee7c -_0811FE88: .4byte 0x0859ef14 -_0811FE8C: .4byte 0x082ec6a8 -_0811FE90: .4byte nullsub_47 + 1 -_0811FE94: .4byte 0x02020630 -_0811FE98: .4byte 0x0859eedc -_0811FE9C: .4byte sub_811FF40 + 1 -_0811FEA0: .4byte 0x0859ee84 -_0811FEA4: .4byte nullsub_12 + 1 + .pool _0811FEA8: ldr r1, [r6] movs r0, 0 str r0, [r1, 0x28] _0811FEAE: - ldr r0, _0811FEF0 + ldr r0, =sub_811FF7C + 1 str r0, [r4, 0x14] ldr r0, [sp, 0x48] movs r2, 0xC0 @@ -589733,12 +570441,12 @@ _0811FEAE: lsrs r3, r0, 24 cmp r3, 0x40 beq _0811FF20 - ldr r0, _0811FEF4 + ldr r0, =0x0203a124 ldr r2, [r0] lsls r1, r3, 4 adds r1, r3 lsls r1, 2 - ldr r0, _0811FEF8 + ldr r0, =0x02020630 adds r1, r0 str r1, [r2, 0x24] ldr r3, [sp, 0x4C] @@ -589750,19 +570458,17 @@ _0811FEAE: bl obj_anim_image_start b _0811FF28 .align 2, 0 -_0811FEF0: .4byte sub_811FF7C + 1 -_0811FEF4: .4byte 0x0203a124 -_0811FEF8: .4byte 0x02020630 + .pool _0811FEFC: - ldr r0, _0811FF08 + ldr r0, =0x0203a124 ldr r0, [r0] lsls r1, r5, 2 adds r0, 0xC b _0811FF14 .align 2, 0 -_0811FF08: .4byte 0x0203a124 + .pool _0811FF0C: - ldr r0, _0811FF1C + ldr r0, =0x0203a124 ldr r0, [r0] lsls r1, r5, 2 adds r0, 0x14 @@ -589772,9 +570478,9 @@ _0811FF14: str r1, [r0] b _0811FF28 .align 2, 0 -_0811FF1C: .4byte 0x0203a124 + .pool _0811FF20: - ldr r0, _0811FF38 + ldr r0, =0x0203a124 ldr r1, [r0] movs r0, 0 str r0, [r1, 0x24] @@ -589788,7 +570494,7 @@ _0811FF28: pop {r0} bx r0 .align 2, 0 -_0811FF38: .4byte 0x0203a124 + .pool thumb_func_end sub_811FC80 thumb_func_start nullsub_47 @@ -589800,7 +570506,7 @@ nullsub_47: @ 811FF3C sub_811FF40: @ 811FF40 push {lr} adds r2, r0, 0 - ldr r0, _0811FF68 + ldr r0, =0x0203a124 ldr r0, [r0] movs r3, 0x2E ldrsh r1, [r2, r3] @@ -589817,7 +570523,7 @@ sub_811FF40: @ 811FF40 bl obj_anim_image_start b _0811FF76 .align 2, 0 -_0811FF68: .4byte 0x0203a124 + .pool _0811FF6C: lsls r1, 25 lsrs r1, 24 @@ -589830,7 +570536,7 @@ _0811FF76: thumb_func_start sub_811FF7C sub_811FF7C: @ 811FF7C - ldr r1, _0811FF90 + ldr r1, =0x0203a124 ldr r1, [r1] ldrb r1, [r1, 0x5] lsls r1, 24 @@ -589841,7 +570547,7 @@ sub_811FF7C: @ 811FF7C strh r1, [r0, 0x22] bx lr .align 2, 0 -_0811FF90: .4byte 0x0203a124 + .pool thumb_func_end sub_811FF7C thumb_func_start sub_811FF94 @@ -589853,14 +570559,14 @@ sub_811FF94: @ 811FF94 lsrs r1, 16 cmp r2, 0 bne _0811FFA4 - ldr r2, _0811FFB0 + ldr r2, =0x0859e65c _0811FFA4: movs r3, 0x10 bl sub_811FFD4 pop {r1} bx r1 .align 2, 0 -_0811FFB0: .4byte 0x0859e65c + .pool thumb_func_end sub_811FF94 thumb_func_start sub_811FFB4 @@ -589872,14 +570578,14 @@ sub_811FFB4: @ 811FFB4 lsrs r1, 16 cmp r2, 0 bne _0811FFC4 - ldr r2, _0811FFD0 + ldr r2, =0x0859e65c _0811FFC4: movs r3, 0x1 bl sub_811FFD4 pop {r1} bx r1 .align 2, 0 -_0811FFD0: .4byte 0x0859e65c + .pool thumb_func_end sub_811FFB4 thumb_func_start sub_811FFD4 @@ -589891,7 +570597,7 @@ sub_811FFD4: @ 811FFD4 lsls r0, 16 lsls r1, 16 lsrs r1, 16 - ldr r4, _08120050 + ldr r4, =0x0859e67c str r4, [sp, 0x18] movs r4, 0x80 add r5, sp, 0x18 @@ -589899,7 +570605,7 @@ sub_811FFD4: @ 811FFD4 orrs r0, r4 str r0, [r5, 0x4] str r2, [sp, 0x20] - ldr r0, _08120054 + ldr r0, =0xffff0000 mov r8, r0 add r4, sp, 0x20 ldr r0, [r4, 0x4] @@ -589911,14 +570617,14 @@ sub_811FFD4: @ 811FFD4 movs r2, 0 strh r6, [r0] strh r1, [r0, 0x2] - ldr r0, _08120058 + ldr r0, =0x0859ef1c str r0, [sp, 0x4] - ldr r0, _0812005C + ldr r0, =0x0859efa4 str r0, [sp, 0x8] str r2, [sp, 0xC] - ldr r0, _08120060 + ldr r0, =0x082ec6a8 str r0, [sp, 0x10] - ldr r0, _08120064 + ldr r0, =nullsub_47 + 1 str r0, [sp, 0x14] lsls r3, 23 lsrs r3, 16 @@ -589943,17 +570649,12 @@ sub_811FFD4: @ 811FFD4 movs r0, 0 b _08120072 .align 2, 0 -_08120050: .4byte 0x0859e67c -_08120054: .4byte 0xffff0000 -_08120058: .4byte 0x0859ef1c -_0812005C: .4byte 0x0859efa4 -_08120060: .4byte 0x082ec6a8 -_08120064: .4byte nullsub_47 + 1 + .pool _08120068: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08120080 + ldr r1, =0x02020630 adds r0, r1 _08120072: add sp, 0x28 @@ -589963,7 +570664,7 @@ _08120072: pop {r1} bx r1 .align 2, 0 -_08120080: .4byte 0x02020630 + .pool thumb_func_end sub_811FFD4 thumb_func_start sub_8120084 @@ -589971,7 +570672,7 @@ sub_8120084: @ 8120084 push {lr} lsls r0, 24 lsrs r0, 17 - ldr r2, _0812009C + ldr r2, =0x0859e67c adds r0, r2 movs r2, 0x80 movs r3, 0x10 @@ -589979,30 +570680,30 @@ sub_8120084: @ 8120084 pop {r0} bx r0 .align 2, 0 -_0812009C: .4byte 0x0859e67c + .pool thumb_func_end sub_8120084 thumb_func_start sub_81200A0 sub_81200A0: @ 81200A0 push {r4,lr} - ldr r0, _081200E0 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r1, _081200E4 + ldr r1, =0x00002e28 adds r0, r2, r1 movs r1, 0 strb r1, [r0] - ldr r3, _081200E8 + ldr r3, =0x00002e51 adds r0, r2, r3 strb r1, [r0] - ldr r0, _081200EC + ldr r0, =0x082e9531 ldrb r1, [r0] adds r3, 0x1 adds r0, r2, r3 strb r1, [r0] movs r3, 0 - ldr r0, _081200F0 + ldr r0, =0x00002e2a adds r2, r0 - ldr r4, _081200F4 + ldr r4, =0x0859efe4 _081200C6: lsls r0, r3, 1 adds r1, r2, r0 @@ -590018,32 +570719,25 @@ _081200C6: pop {r0} bx r0 .align 2, 0 -_081200E0: .4byte 0x03005d8c -_081200E4: .4byte 0x00002e28 -_081200E8: .4byte 0x00002e51 -_081200EC: .4byte 0x082e9531 -_081200F0: .4byte 0x00002e2a -_081200F4: .4byte 0x0859efe4 + .pool thumb_func_end sub_81200A0 thumb_func_start sub_81200F8 sub_81200F8: @ 81200F8 - ldr r0, _08120110 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _08120114 + ldr r0, =0x00002e28 adds r1, r0 movs r2, 0 movs r0, 0x1 strb r0, [r1] strb r2, [r1, 0x1] - ldr r0, _08120118 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r1, 0x2] bx lr .align 2, 0 -_08120110: .4byte 0x03005d8c -_08120114: .4byte 0x00002e28 -_08120118: .4byte 0x082e9531 + .pool thumb_func_end sub_81200F8 thumb_func_start sub_812011C @@ -590056,25 +570750,22 @@ sub_812011C: @ 812011C thumb_func_start sub_8120128 sub_8120128: @ 8120128 - ldr r0, _08120144 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _08120148 + ldr r0, =0x00002e28 adds r2, r1, r0 movs r3, 0 movs r0, 0x4 strb r0, [r2] strb r3, [r2, 0x1] - ldr r0, _0812014C + ldr r0, =0x082e9531 ldrb r0, [r0] - ldr r2, _08120150 + ldr r2, =0x00002e48 adds r1, r2 strb r0, [r1] bx lr .align 2, 0 -_08120144: .4byte 0x03005d8c -_08120148: .4byte 0x00002e28 -_0812014C: .4byte 0x082e9531 -_08120150: .4byte 0x00002e48 + .pool thumb_func_end sub_8120128 thumb_func_start sub_8120154 @@ -590088,7 +570779,7 @@ sub_8120154: @ 8120154 thumb_func_start sub_8120160 sub_8120160: @ 8120160 push {lr} - ldr r0, _08120188 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r1, [r0, 0xB] lsls r1, 8 @@ -590101,13 +570792,12 @@ sub_8120160: @ 8120160 cmp r0, 0x4 bhi _081201C0 lsls r0, 2 - ldr r1, _0812018C + ldr r1, =_08120190 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08120188: .4byte 0x03005d90 -_0812018C: .4byte _08120190 + .pool .align 2, 0 _08120190: .4byte _081201A4 @@ -590137,21 +570827,20 @@ _081201C0: thumb_func_start sub_81201C8 sub_81201C8: @ 81201C8 - ldr r0, _081201D4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081201D8 + ldr r1, =0x00002e28 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_081201D4: .4byte 0x03005d8c -_081201D8: .4byte 0x00002e28 + .pool thumb_func_end sub_81201C8 thumb_func_start sub_81201DC sub_81201DC: @ 81201DC push {r4,lr} - ldr r4, _081201F0 + ldr r4, =0x020375f0 bl sub_81201C8 lsls r0, 24 lsrs r0, 24 @@ -590160,39 +570849,37 @@ sub_81201DC: @ 81201DC pop {r0} bx r0 .align 2, 0 -_081201F0: .4byte 0x020375f0 + .pool thumb_func_end sub_81201DC thumb_func_start sub_81201F4 sub_81201F4: @ 81201F4 - ldr r1, _08120204 - ldr r0, _08120208 + ldr r1, =0x020375f0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0812020C + ldr r2, =0x00002e51 adds r0, r2 ldrb r0, [r0] strh r0, [r1] bx lr .align 2, 0 -_08120204: .4byte 0x020375f0 -_08120208: .4byte 0x03005d8c -_0812020C: .4byte 0x00002e51 + .pool thumb_func_end sub_81201F4 thumb_func_start sub_8120210 sub_8120210: @ 8120210 push {r4-r6,lr} - ldr r0, _0812026C + ldr r0, =0x03005d8c ldr r4, [r0] - ldr r0, _08120270 + ldr r0, =0x00002e28 adds r6, r4, r0 - ldr r1, _08120274 + ldr r1, =0x00002e42 adds r0, r4, r1 - ldr r5, _08120278 + ldr r5, =0x03005d90 ldr r1, [r5] bl gf_strcpy movs r2, 0 - ldr r0, _0812027C + ldr r0, =0x00002e4d adds r4, r0 _0812022C: adds r1, r4, r2 @@ -590229,28 +570916,24 @@ _0812024E: pop {r0} bx r0 .align 2, 0 -_0812026C: .4byte 0x03005d8c -_08120270: .4byte 0x00002e28 -_08120274: .4byte 0x00002e42 -_08120278: .4byte 0x03005d90 -_0812027C: .4byte 0x00002e4d + .pool thumb_func_end sub_8120210 thumb_func_start sub_8120280 sub_8120280: @ 8120280 push {r4-r7,lr} - ldr r0, _0812032C + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _08120330 + ldr r0, =0x020375e0 ldrh r0, [r0] - ldr r2, _08120334 + ldr r2, =0x00002e36 adds r5, r1, r2 cmp r0, 0 bne _08120296 - ldr r0, _08120338 + ldr r0, =0x00002e2a adds r5, r1, r0 _08120296: - ldr r2, _0812033C + ldr r2, =0x02021fc4 adds r4, r2, 0 movs r6, 0 _0812029C: @@ -590334,54 +571017,47 @@ _0812031E: pop {r0} bx r0 .align 2, 0 -_0812032C: .4byte 0x03005d8c -_08120330: .4byte 0x020375e0 -_08120334: .4byte 0x00002e36 -_08120338: .4byte 0x00002e2a -_0812033C: .4byte 0x02021fc4 + .pool thumb_func_end sub_8120280 thumb_func_start sub_8120340 sub_8120340: @ 8120340 push {lr} - ldr r0, _08120354 + ldr r0, =0x020375e0 ldrb r0, [r0] bl sub_81206C0 bl script_env_2_set_ctx_paused pop {r0} bx r0 .align 2, 0 -_08120354: .4byte 0x020375e0 + .pool thumb_func_end sub_8120340 thumb_func_start sub_8120358 sub_8120358: @ 8120358 - ldr r1, _08120368 - ldr r0, _0812036C + ldr r1, =0x020375f0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _08120370 + ldr r2, =0x00002e28 adds r0, r2 ldrb r0, [r0, 0x1] strh r0, [r1] bx lr .align 2, 0 -_08120368: .4byte 0x020375f0 -_0812036C: .4byte 0x03005d8c -_08120370: .4byte 0x00002e28 + .pool thumb_func_end sub_8120358 thumb_func_start sub_8120374 sub_8120374: @ 8120374 - ldr r0, _08120384 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08120388 + ldr r1, =0x00002e28 adds r0, r1 movs r1, 0x1 strb r1, [r0, 0x1] bx lr .align 2, 0 -_08120384: .4byte 0x03005d8c -_08120388: .4byte 0x00002e28 + .pool thumb_func_end sub_8120374 thumb_func_start sub_812038C @@ -590390,65 +571066,61 @@ sub_812038C: @ 812038C bl sub_811F01C lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _081203A4 + ldr r0, =0x0000ffff cmp r1, r0 bne _081203AC - ldr r1, _081203A8 + ldr r1, =0x020375f0 movs r0, 0 b _081203B6 .align 2, 0 -_081203A4: .4byte 0x0000ffff -_081203A8: .4byte 0x020375f0 + .pool _081203AC: - ldr r0, _081203BC + ldr r0, =0x02021cc4 bl sub_811EBBC - ldr r1, _081203C0 + ldr r1, =0x020375f0 movs r0, 0x1 _081203B6: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_081203BC: .4byte 0x02021cc4 -_081203C0: .4byte 0x020375f0 + .pool thumb_func_end sub_812038C thumb_func_start sub_81203C4 sub_81203C4: @ 81203C4 push {lr} - ldr r0, _081203E0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081203E4 + ldr r1, =0x00002e28 adds r2, r0, r1 ldrb r0, [r2, 0x1] cmp r0, 0xA bne _081203EC - ldr r1, _081203E8 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] strb r0, [r2, 0x1] b _081203F2 .align 2, 0 -_081203E0: .4byte 0x03005d8c -_081203E4: .4byte 0x00002e28 -_081203E8: .4byte 0x020375f0 + .pool _081203EC: - ldr r1, _081203F8 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] _081203F2: pop {r0} bx r0 .align 2, 0 -_081203F8: .4byte 0x020375f0 + .pool thumb_func_end sub_81203C4 thumb_func_start sub_81203FC sub_81203FC: @ 81203FC push {r4-r6,lr} - ldr r0, _08120460 + ldr r0, =0x03005d8c ldr r4, [r0] - ldr r0, _08120464 + ldr r0, =0x00002e28 adds r5, r4, r0 ldrb r0, [r5, 0x1] cmp r0, 0 @@ -590457,11 +571129,11 @@ sub_81203FC: @ 81203FC _08120410: ldrb r0, [r5, 0x1] lsls r0, 1 - ldr r1, _08120468 + ldr r1, =0x00002e2c adds r6, r4, r1 adds r0, r6, r0 ldrh r1, [r0] - ldr r0, _0812046C + ldr r0, =0x0000ffff cmp r1, r0 beq _08120480 bl GenerateRandomNumber @@ -590470,38 +571142,31 @@ _08120410: lsrs r4, 16 movs r0, 0x7 ands r4, r0 - ldr r0, _08120470 + ldr r0, =0x02021fc4 ldrb r1, [r5, 0x1] lsls r1, 1 adds r1, r6, r1 ldrh r1, [r1] bl sub_811EBBC adds r2, r0, 0 - ldr r1, _08120474 + ldr r1, =0x082942fd bl gf_strcpy adds r2, r0, 0 - ldr r0, _08120478 + ldr r0, =0x0859eff0 lsls r4, 2 adds r4, r0 ldr r1, [r4] adds r0, r2, 0 bl gf_strcpy adds r2, r0, 0 - ldr r1, _0812047C + ldr r1, =0x08294301 bl gf_strcpy b _081204A2 .align 2, 0 -_08120460: .4byte 0x03005d8c -_08120464: .4byte 0x00002e28 -_08120468: .4byte 0x00002e2c -_0812046C: .4byte 0x0000ffff -_08120470: .4byte 0x02021fc4 -_08120474: .4byte 0x082942fd -_08120478: .4byte 0x0859eff0 -_0812047C: .4byte 0x08294301 + .pool _08120480: - ldr r0, _081204BC - ldr r3, _081204C0 + ldr r0, =0x02021fc4 + ldr r3, =0x0859f010 ldrb r2, [r5, 0x2] adds r1, r2, 0x1 strb r1, [r5, 0x2] @@ -590528,21 +571193,20 @@ _081204A2: movs r0, 0xA b _081204C8 .align 2, 0 -_081204BC: .4byte 0x02021fc4 -_081204C0: .4byte 0x0859f010 + .pool _081204C4: ldrb r0, [r5, 0x1] adds r0, 0x1 _081204C8: strb r0, [r5, 0x1] - ldr r1, _081204D8 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081204D8: .4byte 0x020375f0 + .pool thumb_func_end sub_81203FC thumb_func_start sub_81204DC @@ -590553,12 +571217,12 @@ sub_81204DC: @ 81204DC mov r5, r8 push {r5-r7} sub sp, 0x1C - ldr r0, _081205AC + ldr r0, =0x03005d8c ldr r4, [r0] - ldr r0, _081205B0 + ldr r0, =0x00002e28 adds r0, r4, r0 str r0, [sp, 0x18] - ldr r1, _081205B4 + ldr r1, =0x0859f030 mov r0, sp movs r2, 0x18 bl memcpy @@ -590641,7 +571305,7 @@ _0812057E: bhi _081205BC lsls r0, r5, 1 add r0, r9 - ldr r1, _081205B8 + ldr r1, =0x0000ffff strh r1, [r0] adds r0, r7, 0x1 lsls r0, 16 @@ -590649,10 +571313,7 @@ _0812057E: adds r4, r5, 0x1 b _0812060E .align 2, 0 -_081205AC: .4byte 0x03005d8c -_081205B0: .4byte 0x00002e28 -_081205B4: .4byte 0x0859f030 -_081205B8: .4byte 0x0000ffff + .pool _081205BC: bl GenerateRandomNumber lsls r0, 16 @@ -590713,30 +571374,28 @@ _0812060E: thumb_func_start sub_8120628 sub_8120628: @ 8120628 - ldr r0, _08120638 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0812063C + ldr r1, =0x00002e51 adds r0, r1 movs r1, 0 strb r1, [r0] bx lr .align 2, 0 -_08120638: .4byte 0x03005d8c -_0812063C: .4byte 0x00002e51 + .pool thumb_func_end sub_8120628 thumb_func_start sub_8120640 sub_8120640: @ 8120640 - ldr r0, _08120650 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08120654 + ldr r1, =0x00002e28 adds r0, r1 movs r1, 0 strb r1, [r0, 0x1] bx lr .align 2, 0 -_08120650: .4byte 0x03005d8c -_08120654: .4byte 0x00002e28 + .pool thumb_func_end sub_8120640 thumb_func_start sub_8120658 @@ -590764,12 +571423,12 @@ sub_8120670: @ 8120670 cmp r0, 0x4 bhi _081206B6 lsls r0, 2 - ldr r1, _08120688 + ldr r1, =_0812068C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08120688: .4byte _0812068C + .pool .align 2, 0 _0812068C: .4byte _081206A0 @@ -590800,12 +571459,12 @@ sub_81206C0: @ 81206C0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081206E8 + ldr r0, =sub_8120944 + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081206EC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -590815,28 +571474,27 @@ sub_81206C0: @ 81206C0 pop {r0} bx r0 .align 2, 0 -_081206E8: .4byte sub_8120944 + 1 -_081206EC: .4byte 0x03005e00 + .pool thumb_func_end sub_81206C0 thumb_func_start sub_81206F0 sub_81206F0: @ 81206F0 - ldr r1, _081206F8 + ldr r1, =0x03002f84 movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_081206F8: .4byte 0x03002f84 + .pool thumb_func_end sub_81206F0 thumb_func_start sub_81206FC sub_81206FC: @ 81206FC - ldr r1, _08120704 + ldr r1, =0x03002f84 movs r0, 0x1 strb r0, [r1] bx lr .align 2, 0 -_08120704: .4byte 0x03002f84 + .pool thumb_func_end sub_81206FC thumb_func_start sub_8120708 @@ -590850,14 +571508,14 @@ sub_8120708: @ 8120708 movs r4, 0x1 str r4, [sp] str r4, [sp, 0x4] - ldr r0, _08120740 + ldr r0, =sub_81206FC + 1 str r0, [sp, 0x8] movs r0, 0 movs r1, 0x1 adds r2, r5, 0 movs r3, 0 bl Print - ldr r0, _08120744 + ldr r0, =0x03002f84 strb r4, [r0] movs r0, 0 movs r1, 0x3 @@ -590867,8 +571525,7 @@ sub_8120708: @ 8120708 pop {r0} bx r0 .align 2, 0 -_08120740: .4byte sub_81206FC + 1 -_08120744: .4byte 0x03002f84 + .pool thumb_func_end sub_8120708 thumb_func_start sub_8120748 @@ -590882,12 +571539,12 @@ sub_8120748: @ 8120748 b _08120938 _08120756: lsls r0, 2 - ldr r1, _08120760 + ldr r1, =_08120764 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08120760: .4byte _08120764 + .pool .align 2, 0 _08120764: .4byte _0812077C @@ -590897,15 +571554,15 @@ _08120764: .4byte _081207F8 .4byte _08120938 _0812077C: - ldr r0, _081207AC + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r0, _081207B0 + ldr r0, =0x020375e0 ldrh r0, [r0] - ldr r3, _081207B4 + ldr r3, =0x00002e36 adds r1, r2, r3 cmp r0, 0 bne _08120790 - ldr r0, _081207B8 + ldr r0, =0x00002e2a adds r1, r2, r0 _08120790: adds r2, r1, 0 @@ -590924,10 +571581,7 @@ _08120798: strb r0, [r6] b _08120938 .align 2, 0 -_081207AC: .4byte 0x03005d8c -_081207B0: .4byte 0x020375e0 -_081207B4: .4byte 0x00002e36 -_081207B8: .4byte 0x00002e2a + .pool _081207BC: ldrb r1, [r6] lsls r1, 1 @@ -591018,8 +571672,8 @@ _08120850: lsls r1, 1 adds r0, r1 strh r0, [r6, 0x6] - ldr r4, _08120898 - ldr r5, _0812089C + ldr r4, =0x03007630 + ldr r5, =0x0000ffff ldrh r2, [r6, 0x6] adds r0, r4, 0 adds r1, r5, 0 @@ -591040,8 +571694,7 @@ _08120850: bl MPlayPitchControl b _08120938 .align 2, 0 -_08120898: .4byte 0x03007630 -_0812089C: .4byte 0x0000ffff + .pool _081208A0: ldrh r2, [r6, 0xA] movs r3, 0xA @@ -591063,8 +571716,8 @@ _081208BC: subs r0, 0x40 _081208C0: strh r0, [r6, 0x8] - ldr r4, _08120910 - ldr r5, _08120914 + ldr r4, =0x03007630 + ldr r5, =0x0000ffff ldrh r2, [r6, 0x6] adds r0, r4, 0 adds r1, r5, 0 @@ -591100,8 +571753,7 @@ _081208C0: movs r0, 0 b _08120936 .align 2, 0 -_08120910: .4byte 0x03007630 -_08120914: .4byte 0x0000ffff + .pool _08120918: movs r0, 0x3 _0812091A: @@ -591116,7 +571768,7 @@ _08120922: lsls r0, 24 cmp r0, 0 bne _08120938 - ldr r0, _08120940 + ldr r0, =0x03007630 bl MPlayStop_rev01 movs r0, 0x4 _08120936: @@ -591126,7 +571778,7 @@ _08120938: pop {r0} bx r0 .align 2, 0 -_08120940: .4byte 0x03007630 + .pool thumb_func_end sub_8120748 thumb_func_start sub_8120944 @@ -591137,9 +571789,9 @@ sub_8120944: @ 8120944 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08120970 + ldr r1, =0x03005e00 adds r5, r0, r1 - ldr r1, _08120974 + ldr r1, =0x03006130 adds r0, r5, 0 bl sub_8120748 movs r1, 0x8 @@ -591149,14 +571801,12 @@ sub_8120944: @ 8120944 b _08120B50 _08120966: lsls r0, 2 - ldr r1, _08120978 + ldr r1, =_0812097C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08120970: .4byte 0x03005e00 -_08120974: .4byte 0x03006130 -_08120978: .4byte _0812097C + .pool .align 2, 0 _0812097C: .4byte _08120994 @@ -591167,7 +571817,7 @@ _0812097C: .4byte _08120A6E _08120994: bl sub_8120280 - ldr r0, _081209B4 + ldr r0, =0x02021fc4 bl sub_8120708 movs r0, 0 strh r0, [r5, 0xA] @@ -591179,7 +571829,7 @@ _08120994: movs r0, 0x1 b _08120B4E .align 2, 0 -_081209B4: .4byte 0x02021fc4 + .pool _081209B8: bl sub_80A3200 lsls r0, 24 @@ -591190,26 +571840,22 @@ _081209C4: movs r0, 0x2 b _08120B4E _081209C8: - ldr r0, _081209E4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _081209E8 + ldr r2, =0x00002e28 adds r4, r0, r2 movs r0, 0xE ldrsh r1, [r5, r0] - ldr r0, _081209EC + ldr r0, =0x02021fc4 adds r1, r0 movs r3, 0 ldrb r0, [r1] - ldr r7, _081209F0 + ldr r7, =0x03006130 ldrh r2, [r5, 0x12] - ldr r6, _081209F4 + ldr r6, =0x0203a128 b _08120A02 .align 2, 0 -_081209E4: .4byte 0x03005d8c -_081209E8: .4byte 0x00002e28 -_081209EC: .4byte 0x02021fc4 -_081209F0: .4byte 0x03006130 -_081209F4: .4byte 0x0203a128 + .pool _081209F8: adds r1, 0x1 adds r0, r3, 0x1 @@ -591286,7 +571932,7 @@ _08120A6E: strh r0, [r5, 0xC] b _08120B50 _08120A7E: - ldr r1, _08120AA8 + ldr r1, =0x02021fc4 movs r2, 0xE ldrsh r0, [r5, r2] adds r0, r1 @@ -591295,7 +571941,7 @@ _08120A7E: bne _08120AB0 movs r0, 0x6 bl sub_80A3228 - ldr r0, _08120AAC + ldr r0, =0x03007630 movs r1, 0x2 bl sub_82E0308 bl script_env_2_enable_and_set_ctx_running @@ -591303,8 +571949,7 @@ _08120A7E: bl remove_task b _08120B50 .align 2, 0 -_08120AA8: .4byte 0x02021fc4 -_08120AAC: .4byte 0x03007630 + .pool _08120AB0: cmp r4, 0 bne _08120AC6 @@ -591376,13 +572021,13 @@ _08120B28: movs r1, 0 strh r0, [r5, 0xE] strh r1, [r5, 0xA] - ldr r0, _08120B3C + ldr r0, =0x03006130 ldrh r0, [r0, 0x4] strh r0, [r5, 0xC] movs r0, 0x4 b _08120B4E .align 2, 0 -_08120B3C: .4byte 0x03006130 + .pool _08120B40: ldrh r0, [r5, 0xC] subs r0, 0x1 @@ -591404,13 +572049,13 @@ _08120B50: thumb_func_start sub_8120B5C sub_8120B5C: @ 8120B5C push {lr} - ldr r0, _08120B6C + ldr r0, =0x00004010 movs r1, 0x45 bl var_set pop {r0} bx r0 .align 2, 0 -_08120B6C: .4byte 0x00004010 + .pool thumb_func_end sub_8120B5C thumb_func_start sub_8120B70 @@ -591471,7 +572116,7 @@ _08120BB0: movs r2, 0x8 bl memset mov r0, sp - ldr r1, _08120C08 + ldr r1, =0x085edfb0 bl gf_strcpy adds r0, r5, 0 mov r1, sp @@ -591493,7 +572138,7 @@ _08120C00: pop {r0} bx r0 .align 2, 0 -_08120C08: .4byte 0x085edfb0 + .pool thumb_func_end sub_8120B70 thumb_func_start sub_8120C0C @@ -591508,12 +572153,12 @@ sub_8120C0C: @ 8120C0C cmp r0, 0x4 bhi _08120CC4 lsls r0, 2 - ldr r1, _08120C28 + ldr r1, =_08120C2C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08120C28: .4byte _08120C2C + .pool .align 2, 0 _08120C2C: .4byte _08120C92 @@ -591681,12 +572326,12 @@ _08120D44: cmp r0, 0x4 bhi _08120E02 lsls r0, 2 - ldr r1, _08120D54 + ldr r1, =_08120D58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08120D54: .4byte _08120D58 + .pool .align 2, 0 _08120D58: .4byte _08120DE6 @@ -591790,10 +572435,10 @@ _08120E02: thumb_func_start sub_8120E08 sub_8120E08: @ 8120E08 push {r4,r5,lr} - ldr r2, _08120E44 - ldr r0, _08120E48 + ldr r2, =0x0203a12c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08120E4C + ldr r1, =0x00002e28 adds r0, r1 str r0, [r2] movs r3, 0 @@ -591821,17 +572466,15 @@ _08120E24: pop {r0} bx r0 .align 2, 0 -_08120E44: .4byte 0x0203a12c -_08120E48: .4byte 0x03005d8c -_08120E4C: .4byte 0x00002e28 + .pool thumb_func_end sub_8120E08 thumb_func_start sub_8120E50 sub_8120E50: @ 8120E50 - ldr r3, _08120E68 - ldr r0, _08120E6C + ldr r3, =0x0203a12c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08120E70 + ldr r1, =0x00002e28 adds r0, r1 str r0, [r3] movs r2, 0 @@ -591841,9 +572484,7 @@ sub_8120E50: @ 8120E50 strb r2, [r0, 0x1] bx lr .align 2, 0 -_08120E68: .4byte 0x0203a12c -_08120E6C: .4byte 0x03005d8c -_08120E70: .4byte 0x00002e28 + .pool thumb_func_end sub_8120E50 thumb_func_start sub_8120E74 @@ -591865,7 +572506,7 @@ sub_8120E88: @ 8120E88 push {lr} adds r3, r0, 0 movs r2, 0 - ldr r1, _08120E9C + ldr r1, =0x0859f048 _08120E90: ldrb r0, [r1] cmp r0, r3 @@ -591873,18 +572514,18 @@ _08120E90: adds r0, r1, 0 b _08120EAA .align 2, 0 -_08120E9C: .4byte 0x0859f048 + .pool _08120EA0: adds r1, 0x10 adds r2, 0x1 cmp r2, 0x23 ble _08120E90 - ldr r0, _08120EB0 + ldr r0, =0x0859f278 _08120EAA: pop {r1} bx r1 .align 2, 0 -_08120EB0: .4byte 0x0859f278 + .pool thumb_func_end sub_8120E88 thumb_func_start sub_8120EB4 @@ -591918,7 +572559,7 @@ sub_8120ECC: @ 8120ECC sub_8120ED8: @ 8120ED8 push {lr} movs r1, 0 - ldr r2, _08120F04 + ldr r2, =0x0203a12c ldr r0, [r2] ldrb r0, [r0, 0x4] cmp r0, 0 @@ -591940,12 +572581,12 @@ _08120EFC: pop {r1} bx r1 .align 2, 0 -_08120F04: .4byte 0x0203a12c + .pool thumb_func_end sub_8120ED8 thumb_func_start sub_8120F08 sub_8120F08: @ 8120F08 - ldr r1, _08120F28 + ldr r1, =0x0203a12c lsls r0, 2 adds r0, 0x24 ldr r2, [r1] @@ -591962,12 +572603,12 @@ sub_8120F08: @ 8120F08 orrs r0, r1 bx lr .align 2, 0 -_08120F28: .4byte 0x0203a12c + .pool thumb_func_end sub_8120F08 thumb_func_start sub_8120F2C sub_8120F2C: @ 8120F2C - ldr r2, _08120F48 + ldr r2, =0x0203a12c lsls r0, 2 adds r0, 0x24 ldr r2, [r2] @@ -591981,14 +572622,14 @@ sub_8120F2C: @ 8120F2C strb r1, [r2, 0x3] bx lr .align 2, 0 -_08120F48: .4byte 0x0203a12c + .pool thumb_func_end sub_8120F2C thumb_func_start sub_8120F4C sub_8120F4C: @ 8120F4C push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08120F70 + ldr r0, =0x0203a12c ldr r0, [r0] adds r0, 0x4 adds r0, r5 @@ -592002,7 +572643,7 @@ sub_8120F4C: @ 8120F4C movs r0, 0 b _08120F76 .align 2, 0 -_08120F70: .4byte 0x0203a12c + .pool _08120F74: movs r0, 0x1 _08120F76: @@ -592015,7 +572656,7 @@ _08120F76: sub_8120F7C: @ 8120F7C push {r4,r5,lr} adds r5, r1, 0 - ldr r2, _08120FA8 + ldr r2, =0x0203a12c lsls r1, r0, 3 subs r1, r0 adds r1, 0x8 @@ -592033,14 +572674,14 @@ sub_8120F7C: @ 8120F7C pop {r0} bx r0 .align 2, 0 -_08120FA8: .4byte 0x0203a12c + .pool thumb_func_end sub_8120F7C thumb_func_start sub_8120FAC sub_8120FAC: @ 8120FAC push {r4,r5,lr} adds r5, r1, 0 - ldr r2, _08120FD8 + ldr r2, =0x0203a12c lsls r1, r0, 3 subs r1, r0 adds r1, 0x8 @@ -592058,7 +572699,7 @@ sub_8120FAC: @ 8120FAC pop {r0} bx r0 .align 2, 0 -_08120FD8: .4byte 0x0203a12c + .pool thumb_func_end sub_8120FAC thumb_func_start sub_8120FDC @@ -592069,13 +572710,13 @@ sub_8120FDC: @ 8120FDC push {r5,r6} mov r8, r0 adds r6, r1, 0 - ldr r0, _08121050 + ldr r0, =0x0203a12c mov r9, r0 ldr r0, [r0] adds r0, 0x4 add r0, r8 strb r6, [r0] - ldr r0, _08121054 + ldr r0, =0x03005d90 ldr r1, [r0] mov r0, r8 bl sub_8120FAC @@ -592086,7 +572727,7 @@ sub_8120FDC: @ 8120FDC adds r1, r0, 0 mov r0, r8 bl sub_8120F2C - ldr r5, _08121058 + ldr r5, =0x02021cc4 adds r0, r4, 0 bl sub_8120E74 adds r1, r0, 0 @@ -592094,7 +572735,7 @@ sub_8120FDC: @ 8120FDC movs r2, 0 movs r3, 0xA bl decimal_int_to_string - ldr r4, _0812105C + ldr r4, =0x02021dc4 adds r0, r6, 0 bl sub_8120ECC adds r1, r0, 0 @@ -592104,7 +572745,7 @@ sub_8120FDC: @ 8120FDC ldr r0, [r1] adds r0, 0x34 add r0, r8 - ldr r1, _08121060 + ldr r1, =0x082e9531 ldrb r1, [r1] strb r1, [r0] pop {r3,r4} @@ -592114,11 +572755,7 @@ sub_8120FDC: @ 8120FDC pop {r0} bx r0 .align 2, 0 -_08121050: .4byte 0x0203a12c -_08121054: .4byte 0x03005d90 -_08121058: .4byte 0x02021cc4 -_0812105C: .4byte 0x02021dc4 -_08121060: .4byte 0x082e9531 + .pool thumb_func_end sub_8120FDC thumb_func_start sub_8121064 @@ -592174,7 +572811,7 @@ sub_81210B8: @ 81210B8 push {r6,r7} mov r7, sp mov r8, sp - ldr r0, _08121140 + ldr r0, =0x0859f288 ldr r0, [r0] lsls r0, 3 lsrs r0, 3 @@ -592190,7 +572827,7 @@ sub_81210B8: @ 81210B8 bl sub_8121064 movs r5, 0 _081210E4: - ldr r1, _08121144 + ldr r1, =0x0859f048 mov r2, r9 adds r0, r2, r5 ldrb r0, [r0] @@ -592199,7 +572836,7 @@ _081210E4: ldrb r4, [r0] ldrb r6, [r0, 0x1] movs r1, 0 - ldr r2, _08121148 + ldr r2, =0x0203a12c ldr r0, [r2] ldrb r0, [r0, 0x4] cmp r0, r4 @@ -592221,7 +572858,7 @@ _08121112: bl sub_8120E74 cmp r0, r6 bcc _08121162 - ldr r0, _08121148 + ldr r0, =0x0203a12c ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x1] @@ -592230,16 +572867,13 @@ _08121112: lsrs r0, 24 cmp r0, 0x4 bne _08121150 - ldr r0, _0812114C + ldr r0, =0x03001178 ldrb r0, [r0] adds r1, r4, 0 bl sub_8120FDC b _0812115E .align 2, 0 -_08121140: .4byte 0x0859f288 -_08121144: .4byte 0x0859f048 -_08121148: .4byte 0x0203a12c -_0812114C: .4byte 0x03001178 + .pool _08121150: bl sub_8120ED8 lsls r0, 24 @@ -592270,13 +572904,13 @@ sub_8121178: @ 8121178 mov r6, r8 push {r6} adds r5, r0, 0 - ldr r6, _081211DC + ldr r6, =0x0203a12c ldr r0, [r6] adds r0, 0x4 adds r0, r5 ldrb r0, [r0] mov r8, r0 - ldr r4, _081211E0 + ldr r4, =0x02021cc4 adds r0, r5, 0 bl sub_8120F08 adds r1, r0, 0 @@ -592284,13 +572918,13 @@ sub_8121178: @ 8121178 movs r2, 0 movs r3, 0xA bl decimal_int_to_string - ldr r4, _081211E4 + ldr r4, =0x02021dc4 mov r0, r8 bl sub_8120ECC adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy - ldr r4, _081211E8 + ldr r4, =0x02021ec4 adds r0, r5, 0 adds r1, r4, 0 bl sub_8120F7C @@ -592309,23 +572943,20 @@ sub_8121178: @ 8121178 pop {r0} bx r0 .align 2, 0 -_081211DC: .4byte 0x0203a12c -_081211E0: .4byte 0x02021cc4 -_081211E4: .4byte 0x02021dc4 -_081211E8: .4byte 0x02021ec4 + .pool thumb_func_end sub_8121178 thumb_func_start sub_81211EC sub_81211EC: @ 81211EC push {r4,r5,lr} sub sp, 0xC - ldr r1, _081212F0 + ldr r1, =0x085eb7ea movs r0, 0x1 movs r2, 0 bl font_get_width_of_string adds r5, r0, 0 movs r4, 0 - ldr r0, _081212F4 + ldr r0, =0x0203a12c ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0 @@ -592343,7 +572974,7 @@ _0812121C: adds r4, 0x1 cmp r4, 0x3 bgt _08121230 - ldr r0, _081212F4 + ldr r0, =0x0203a12c ldr r0, [r0] adds r0, 0x4 adds r0, r4 @@ -592367,13 +572998,13 @@ _08121230: movs r1, 0 adds r2, r4, 0 bl CreateWindowFromRect - ldr r1, _081212F8 + ldr r1, =0x0203a130 strb r0, [r1] ldrb r0, [r1] movs r1, 0 bl SetStandardWindowBorderStyle movs r4, 0 - ldr r0, _081212F4 + ldr r0, =0x0203a12c ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0 @@ -592383,7 +573014,7 @@ _08121230: _08121272: bl sub_8120EB4 adds r2, r0, 0 - ldr r0, _081212F8 + ldr r0, =0x0203a130 ldrb r0, [r0] lsrs r1, r5, 24 str r1, [sp] @@ -592400,7 +573031,7 @@ _08121272: adds r4, 0x1 cmp r4, 0x3 bgt _081212AA - ldr r0, _081212F4 + ldr r0, =0x0203a12c ldr r0, [r0] adds r0, 0x4 adds r0, r4 @@ -592408,9 +573039,9 @@ _08121272: cmp r0, 0 bne _08121272 _081212AA: - ldr r5, _081212F8 + ldr r5, =0x0203a130 ldrb r0, [r5] - ldr r2, _081212F0 + ldr r2, =0x085eb7ea lsls r1, r4, 4 adds r1, 0x1 lsls r1, 24 @@ -592440,9 +573071,7 @@ _081212AA: pop {r0} bx r0 .align 2, 0 -_081212F0: .4byte 0x085eb7ea -_081212F4: .4byte 0x0203a12c -_081212F8: .4byte 0x0203a130 + .pool thumb_func_end sub_81211EC thumb_func_start sub_81212FC @@ -592453,7 +573082,7 @@ sub_81212FC: @ 81212FC lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0812131C + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r5, [r4, r0] @@ -592463,7 +573092,7 @@ sub_81212FC: @ 81212FC beq _0812132C b _08121376 .align 2, 0 -_0812131C: .4byte 0x03005e00 + .pool _08121320: bl sub_81211EC ldrh r0, [r4, 0x8] @@ -592487,19 +573116,19 @@ _0812132C: cmp r4, r0 bne _0812135C _0812134E: - ldr r1, _08121358 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] b _08121364 .align 2, 0 -_08121358: .4byte 0x020375f0 + .pool _0812135C: - ldr r0, _0812137C + ldr r0, =0x020375f0 strh r5, [r0] - ldr r0, _08121380 + ldr r0, =0x03001178 strb r4, [r0] _08121364: - ldr r0, _08121384 + ldr r0, =0x0203a130 ldrb r0, [r0] bl sub_80E2A78 adds r0, r6, 0 @@ -592510,42 +573139,40 @@ _08121376: pop {r0} bx r0 .align 2, 0 -_0812137C: .4byte 0x020375f0 -_08121380: .4byte 0x03001178 -_08121384: .4byte 0x0203a130 + .pool thumb_func_end sub_81212FC thumb_func_start sub_8121388 sub_8121388: @ 8121388 push {lr} - ldr r0, _08121398 + ldr r0, =sub_81212FC + 1 movs r1, 0x50 bl AddTask pop {r0} bx r0 .align 2, 0 -_08121398: .4byte sub_81212FC + 1 + .pool thumb_func_end sub_8121388 thumb_func_start sub_812139C sub_812139C: @ 812139C push {lr} - ldr r0, _081213AC + ldr r0, =0x03001178 ldrb r0, [r0] bl sub_8121178 pop {r0} bx r0 .align 2, 0 -_081213AC: .4byte 0x03001178 + .pool thumb_func_end sub_812139C thumb_func_start sub_81213B0 sub_81213B0: @ 81213B0 push {lr} - ldr r1, _081213CC - ldr r0, _081213D0 + ldr r1, =0x0203a12c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _081213D4 + ldr r2, =0x00002e28 adds r0, r2 str r0, [r1] bl sub_8120ED8 @@ -592554,23 +573181,21 @@ sub_81213B0: @ 81213B0 pop {r1} bx r1 .align 2, 0 -_081213CC: .4byte 0x0203a12c -_081213D0: .4byte 0x03005d8c -_081213D4: .4byte 0x00002e28 + .pool thumb_func_end sub_81213B0 thumb_func_start sub_81213D8 sub_81213D8: @ 81213D8 push {r4,r5,lr} - ldr r2, _08121400 - ldr r0, _08121404 + ldr r2, =0x0203a12c + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r3, _08121408 + ldr r3, =0x00002e28 adds r0, r1, r3 str r0, [r2] - ldr r5, _0812140C + ldr r5, =0x03001178 ldrb r0, [r5] - ldr r2, _08121410 + ldr r2, =0x00002e2c adds r1, r2 adds r1, r0 ldrb r4, [r1] @@ -592580,11 +573205,7 @@ sub_81213D8: @ 81213D8 movs r0, 0 b _0812141E .align 2, 0 -_08121400: .4byte 0x0203a12c -_08121404: .4byte 0x03005d8c -_08121408: .4byte 0x00002e28 -_0812140C: .4byte 0x03001178 -_08121410: .4byte 0x00002e2c + .pool _08121414: ldrb r0, [r5] adds r1, r4, 0 @@ -592599,10 +573220,10 @@ _0812141E: thumb_func_start sub_8121424 sub_8121424: @ 8121424 push {lr} - ldr r1, _0812143C - ldr r0, _08121440 + ldr r1, =0x0203a12c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _08121444 + ldr r2, =0x00002e28 adds r0, r2 str r0, [r1] ldrb r0, [r0, 0x1] @@ -592611,9 +573232,7 @@ sub_8121424: @ 8121424 movs r0, 0x1 b _0812144A .align 2, 0 -_0812143C: .4byte 0x0203a12c -_08121440: .4byte 0x03005d8c -_08121444: .4byte 0x00002e28 + .pool _08121448: movs r0, 0 _0812144A: @@ -592624,10 +573243,10 @@ _0812144A: thumb_func_start sub_8121450 sub_8121450: @ 8121450 push {lr} - ldr r1, _0812146C - ldr r0, _08121470 + ldr r1, =0x0203a12c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _08121474 + ldr r2, =0x00002e28 adds r0, r2 str r0, [r1] bl sub_81210B8 @@ -592636,9 +573255,7 @@ sub_8121450: @ 8121450 pop {r1} bx r1 .align 2, 0 -_0812146C: .4byte 0x0203a12c -_08121470: .4byte 0x03005d8c -_08121474: .4byte 0x00002e28 + .pool thumb_func_end sub_8121450 thumb_func_start sub_8121478 @@ -592649,16 +573266,16 @@ sub_8121478: @ 8121478 adds r7, r1, 0 lsls r2, 24 lsrs r6, r2, 24 - ldr r4, _081214D0 - ldr r0, _081214D4 + ldr r4, =0x0203a134 + ldr r0, =0x0000222c bl malloc_and_clear str r0, [r4] - ldr r1, _081214D8 + ldr r1, =0x0000021d adds r0, r1 movs r1, 0x2 strb r1, [r0] ldr r0, [r4] - ldr r2, _081214DC + ldr r2, =0x0000021e adds r0, r2 movs r1, 0x1 strb r1, [r0] @@ -592666,12 +573283,12 @@ sub_8121478: @ 8121478 movs r3, 0x88 lsls r3, 2 adds r1, r4, r3 - ldr r0, _081214E0 + ldr r0, =sub_811EBBC + 1 str r0, [r1] movs r0, 0x89 lsls r0, 2 adds r1, r4, r0 - ldr r0, _081214E4 + ldr r0, =sub_811EC08 + 1 str r0, [r1] ldrh r1, [r5, 0x20] adds r0, r1, 0 @@ -592686,22 +573303,17 @@ sub_8121478: @ 8121478 strb r1, [r0] b _081214F2 .align 2, 0 -_081214D0: .4byte 0x0203a134 -_081214D4: .4byte 0x0000222c -_081214D8: .4byte 0x0000021d -_081214DC: .4byte 0x0000021e -_081214E0: .4byte sub_811EBBC + 1 -_081214E4: .4byte sub_811EC08 + 1 + .pool _081214E8: - ldr r3, _0812151C + ldr r3, =0x0000021a adds r1, r4, r3 movs r0, 0 strb r0, [r1] movs r6, 0 _081214F2: - ldr r0, _08121520 + ldr r0, =0x0203a134 ldr r1, [r0] - ldr r2, _08121524 + ldr r2, =0x0000021e adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -592718,24 +573330,21 @@ _08121504: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _08121528 + ldr r1, =0x0859f3b4 b _08121540 .align 2, 0 -_0812151C: .4byte 0x0000021a -_08121520: .4byte 0x0203a134 -_08121524: .4byte 0x0000021e -_08121528: .4byte 0x0859f3b4 + .pool _0812152C: movs r0, 0x8A lsls r0, 2 adds r2, r1, r0 - ldr r3, _08121578 + ldr r3, =0x0000021a adds r0, r1, r3 ldrb r1, [r0] lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _0812157C + ldr r1, =0x0859f458 _08121540: adds r0, r1 str r0, [r2] @@ -592743,15 +573352,15 @@ _08121540: mov r1, sp bl sub_80D45E8 lsls r0, 16 - ldr r1, _08121580 + ldr r1, =0xffff0000 adds r0, r1 movs r1, 0xCD lsls r1, 17 cmp r0, r1 bhi _081215AC - ldr r1, _08121584 + ldr r1, =0x0203a134 ldr r2, [r1] - ldr r3, _08121578 + ldr r3, =0x0000021a adds r0, r2, r3 ldrb r0, [r0] adds r3, r1, 0 @@ -592759,37 +573368,33 @@ _08121540: beq _0812158C cmp r0, 0x9 beq _0812159C - ldr r0, _08121588 + ldr r0, =0x0000021b adds r1, r2, r0 movs r0, 0 strb r0, [r1] b _081215BA .align 2, 0 -_08121578: .4byte 0x0000021a -_0812157C: .4byte 0x0859f458 -_08121580: .4byte 0xffff0000 -_08121584: .4byte 0x0203a134 -_08121588: .4byte 0x0000021b + .pool _0812158C: - ldr r0, _08121598 + ldr r0, =0x0000021b adds r1, r2, r0 movs r0, 0x1 strb r0, [r1] b _081215BA .align 2, 0 -_08121598: .4byte 0x0000021b + .pool _0812159C: - ldr r0, _081215A8 + ldr r0, =0x0000021b adds r1, r2, r0 movs r0, 0x2 strb r0, [r1] b _081215BA .align 2, 0 -_081215A8: .4byte 0x0000021b + .pool _081215AC: - ldr r0, _081215E0 + ldr r0, =0x0203a134 ldr r1, [r0] - ldr r2, _081215E4 + ldr r2, =0x0000021b adds r1, r2 movs r2, 0 strb r2, [r1] @@ -592807,23 +573412,21 @@ _081215BA: adds r3, 0x4 adds r0, r1, r3 strb r6, [r0] - ldr r0, _081215E8 + ldr r0, =sub_81219F0 + 1 bl set_callback2 add sp, 0x4 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081215E0: .4byte 0x0203a134 -_081215E4: .4byte 0x0000021b -_081215E8: .4byte sub_81219F0 + 1 + .pool thumb_func_end sub_8121478 thumb_func_start sub_81215EC sub_81215EC: @ 81215EC push {r4-r6,lr} sub sp, 0xC - ldr r0, _0812160C + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -592833,13 +573436,12 @@ sub_81215EC: @ 81215EC b _081219E2 _08121600: lsls r0, 2 - ldr r1, _08121610 + ldr r1, =_08121614 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0812160C: .4byte 0x030022c0 -_08121610: .4byte _08121614 + .pool .align 2, 0 _08121614: .4byte _08121660 @@ -592873,12 +573475,12 @@ _0812166E: strh r0, [r1] movs r1, 0xE0 lsls r1, 19 - ldr r2, _08121684 + ldr r2, =0x01000200 add r0, sp, 0x8 bl CpuSet b _081219D4 .align 2, 0 -_08121684: .4byte 0x01000200 + .pool _08121688: bl sub_80A1A74 b _081219D4 @@ -592926,11 +573528,11 @@ _081216EC: _081216F4: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08121724 + ldr r1, =0x0859f290 movs r0, 0 movs r2, 0x3 bl bg_vram_setup - ldr r4, _08121728 + ldr r4, =0x0203a134 ldr r1, [r4] movs r2, 0x8B lsls r2, 2 @@ -592938,27 +573540,25 @@ _081216F4: movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _0812172C + ldr r0, =0x0000122c adds r1, r0 movs r0, 0x2 bl bg_set_tilemap b _081219D4 .align 2, 0 -_08121724: .4byte 0x0859f290 -_08121728: .4byte 0x0203a134 -_0812172C: .4byte 0x0000122c + .pool _08121730: - ldr r0, _0812173C + ldr r0, =0x0859f29c bl Window_InitFromTemplates bl TextBox_ResetSomeField b _081219D4 .align 2, 0 -_0812173C: .4byte 0x0859f29c + .pool _08121740: - ldr r2, _08121768 - ldr r0, _0812176C + ldr r2, =0x0859f2b8 + ldr r0, =0x0203a134 ldr r0, [r0] - ldr r1, _08121770 + ldr r1, =0x0000021a adds r0, r1 ldrb r1, [r0] lsls r0, r1, 2 @@ -592975,9 +573575,7 @@ _08121740: bl decompress_and_copy_tile_data_to_vram b _081219D4 .align 2, 0 -_08121768: .4byte 0x0859f2b8 -_0812176C: .4byte 0x0203a134 -_08121770: .4byte 0x0000021a + .pool _08121774: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -593003,10 +573601,10 @@ _08121782: movs r2, 0 movs r3, 0 bl bg_fill_tilemap_rect - ldr r2, _081217CC - ldr r0, _081217D0 + ldr r2, =0x0859f2b8 + ldr r0, =0x0203a134 ldr r0, [r0] - ldr r1, _081217D4 + ldr r1, =0x0000021a adds r0, r1 ldrb r1, [r0] lsls r0, r1, 2 @@ -593021,9 +573619,7 @@ _08121782: bl gpu_copy_to_wram_bg_tile_map b _081219D4 .align 2, 0 -_081217CC: .4byte 0x0859f2b8 -_081217D0: .4byte 0x0203a134 -_081217D4: .4byte 0x0000021a + .pool _081217D8: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram @@ -593037,11 +573633,11 @@ _081217EC: movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r6, _08121894 - ldr r4, _08121898 - ldr r0, _0812189C + ldr r6, =0x02037714 + ldr r4, =0x0859f2b8 + ldr r0, =0x0203a134 ldr r3, [r0] - ldr r2, _081218A0 + ldr r2, =0x0000021a adds r3, r2 ldrb r1, [r3] lsls r0, r1, 2 @@ -593052,7 +573648,7 @@ _081217EC: subs r2, 0x26 adds r0, r6, r2 strh r1, [r0] - ldr r5, _081218A4 + ldr r5, =0x02037b14 ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -593088,8 +573684,8 @@ _081217EC: movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _081218A8 - ldr r0, _081218AC + ldr r1, =0x0859f2b0 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r0, [r2, 0x8] lsls r0, 2 @@ -593114,15 +573710,9 @@ _081217EC: strh r0, [r5, 0x16] b _081219D4 .align 2, 0 -_08121894: .4byte 0x02037714 -_08121898: .4byte 0x0859f2b8 -_0812189C: .4byte 0x0203a134 -_081218A0: .4byte 0x0000021a -_081218A4: .4byte 0x02037b14 -_081218A8: .4byte 0x0859f2b0 -_081218AC: .4byte 0x03005d90 + .pool _081218B0: - ldr r0, _081218C8 + ldr r0, =0x0203a134 ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -593135,9 +573725,9 @@ _081218C2: bl sub_8121A1C b _081219D4 .align 2, 0 -_081218C8: .4byte 0x0203a134 + .pool _081218CC: - ldr r0, _081218E8 + ldr r0, =0x0203a134 ldr r0, [r0] movs r2, 0x86 lsls r2, 2 @@ -593151,26 +573741,25 @@ _081218DE: bl run_remoboxes b _081219D4 .align 2, 0 -_081218E8: .4byte 0x0203a134 + .pool _081218EC: bl sub_8087598 cmp r0, 0x1 bne _081219D4 b _081219E2 _081218F6: - ldr r0, _08121908 + ldr r0, =sub_8121C50 + 1 bl SetVBlankCallback - ldr r2, _0812190C + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] b _081219D4 .align 2, 0 -_08121908: .4byte sub_8121C50 + 1 -_0812190C: .4byte 0x02037fd4 + .pool _08121910: - ldr r5, _08121938 + ldr r5, =0x0203a134 ldr r0, [r5] movs r1, 0x85 lsls r1, 2 @@ -593181,7 +573770,7 @@ _08121910: lsls r0, 16 lsrs r4, r0, 16 ldr r0, [r5] - ldr r2, _0812193C + ldr r2, =0x0000021b adds r0, r2 ldrb r0, [r0] cmp r0, 0x1 @@ -593190,12 +573779,11 @@ _08121910: beq _08121958 b _081219D4 .align 2, 0 -_08121938: .4byte 0x0203a134 -_0812193C: .4byte 0x0000021b + .pool _08121940: adds r0, r4, 0 bl sub_80D2F68 - ldr r1, _08121954 + ldr r1, =nullsub_12 + 1 movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -593203,11 +573791,11 @@ _08121940: movs r2, 0x60 b _0812196A .align 2, 0 -_08121954: .4byte nullsub_12 + 1 + .pool _08121958: adds r0, r4, 0 bl sub_80D2F68 - ldr r1, _0812197C + ldr r1, =nullsub_12 + 1 movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -593223,7 +573811,7 @@ _0812196A: strb r0, [r1] b _081219D4 .align 2, 0 -_0812197C: .4byte nullsub_12 + 1 + .pool _08121980: movs r1, 0x82 lsls r1, 5 @@ -593242,26 +573830,24 @@ _08121980: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r2, _081219C8 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] - ldr r0, _081219CC + ldr r0, =0x0203a134 ldr r0, [r0] movs r1, 0x84 lsls r1, 2 adds r0, r1 - ldr r1, _081219D0 + ldr r1, =sub_8121C98 + 1 str r1, [r0] movs r0, 0x1 b _081219E4 .align 2, 0 -_081219C8: .4byte 0x02037fd4 -_081219CC: .4byte 0x0203a134 -_081219D0: .4byte sub_8121C98 + 1 + .pool _081219D4: - ldr r1, _081219EC + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -593276,7 +573862,7 @@ _081219E4: pop {r1} bx r1 .align 2, 0 -_081219EC: .4byte 0x030022c0 + .pool thumb_func_end sub_81215EC thumb_func_start sub_81219F0 @@ -593288,11 +573874,11 @@ _081219F2: lsrs r0, 24 cmp r0, 0x1 bne _08121A0C - ldr r0, _08121A08 + ldr r0, =sub_8121C64 + 1 bl set_callback2 b _08121A18 .align 2, 0 -_08121A08: .4byte sub_8121C64 + 1 + .pool _08121A0C: bl sub_81221AC lsls r0, 24 @@ -593311,7 +573897,7 @@ sub_8121A1C: @ 8121A1C push {r7} movs r6, 0 movs r5, 0 - ldr r2, _08121AE0 + ldr r2, =0x0203a134 ldr r0, [r2] movs r1, 0x8A lsls r1, 2 @@ -593362,7 +573948,7 @@ _08121A3C: cmp r5, r1 bcc _08121A3C _08121A8A: - ldr r4, _08121AE0 + ldr r4, =0x0203a134 ldr r1, [r4] movs r2, 0x80 lsls r2, 2 @@ -593375,12 +573961,12 @@ _08121A8A: bl gf_strcpy adds r2, r0, 0 ldr r1, [r4] - ldr r3, _08121AE4 + ldr r3, =0x0000021e adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 bne _08121AF0 - ldr r1, _08121AE8 + ldr r1, =0x085eea78 adds r0, r2, 0 bl gf_strcpy ldr r0, [r4] @@ -593398,15 +573984,12 @@ _08121A8A: subs r0, 0x60 ldrb r1, [r1, 0x2] subs r1, r0 - ldr r0, _08121AEC + ldr r0, =0x00000219 adds r2, r0 strb r1, [r2] b _08121B0C .align 2, 0 -_08121AE0: .4byte 0x0203a134 -_08121AE4: .4byte 0x0000021e -_08121AE8: .4byte 0x085eea78 -_08121AEC: .4byte 0x00000219 + .pool _08121AF0: movs r2, 0x80 lsls r2, 2 @@ -593418,7 +574001,7 @@ _08121AF0: adds r1, r0, r3 ldr r1, [r1] ldrb r1, [r1, 0x2] - ldr r2, _08121B18 + ldr r2, =0x00000219 adds r0, r2 strb r1, [r0] _08121B0C: @@ -593428,7 +574011,7 @@ _08121B0C: pop {r0} bx r0 .align 2, 0 -_08121B18: .4byte 0x00000219 + .pool thumb_func_end sub_8121A1C thumb_func_start sub_8121B1C @@ -593451,7 +574034,7 @@ sub_8121B1C: @ 8121B1C movs r1, 0 bl Window_FastFillPixels movs r6, 0 - ldr r1, _08121C40 + ldr r1, =0x0203a134 ldr r0, [r1] movs r2, 0x8A lsls r2, 2 @@ -593490,7 +574073,7 @@ _08121B60: adds r3, r7, r3 lsls r3, 24 lsrs r3, 24 - ldr r0, _08121C44 + ldr r0, =0x0859f2ac str r0, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -593511,7 +574094,7 @@ _08121BB8: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r2, _08121C40 + ldr r2, =0x0203a134 ldr r0, [r2] add r0, r10 ldr r0, [r0] @@ -593519,17 +574102,17 @@ _08121BB8: cmp r6, r0 bcc _08121B60 _08121BCC: - ldr r1, _08121C48 + ldr r1, =0x085eea78 add r0, sp, 0xC bl gf_strcpy - ldr r4, _08121C40 + ldr r4, =0x0203a134 ldr r1, [r4] movs r2, 0x80 lsls r2, 2 adds r1, r2 bl gf_strcpy ldr r0, [r4] - ldr r1, _08121C4C + ldr r1, =0x00000219 adds r0, r1 ldrb r2, [r0] movs r0, 0x1 @@ -593548,7 +574131,7 @@ _08121BCC: lsrs r2, 24 lsls r3, 24 lsrs r3, 24 - ldr r0, _08121C44 + ldr r0, =0x0859f2ac str r0, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -593572,10 +574155,7 @@ _08121BCC: pop {r0} bx r0 .align 2, 0 -_08121C40: .4byte 0x0203a134 -_08121C44: .4byte 0x0859f2ac -_08121C48: .4byte 0x085eea78 -_08121C4C: .4byte 0x00000219 + .pool thumb_func_end sub_8121B1C thumb_func_start sub_8121C50 @@ -593591,9 +574171,9 @@ sub_8121C50: @ 8121C50 thumb_func_start sub_8121C64 sub_8121C64: @ 8121C64 push {r4,lr} - ldr r4, _08121C90 + ldr r4, =0x0203a134 ldr r0, [r4] - ldr r1, _08121C94 + ldr r1, =0x0000021b adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -593611,8 +574191,7 @@ _08121C7C: pop {r0} bx r0 .align 2, 0 -_08121C90: .4byte 0x0203a134 -_08121C94: .4byte 0x0000021b + .pool thumb_func_end sub_8121C64 thumb_func_start sub_8121C98 @@ -593622,26 +574201,25 @@ sub_8121C98: @ 8121C98 lsls r0, 24 cmp r0, 0 bne _08121CB2 - ldr r0, _08121CB8 + ldr r0, =0x0203a134 ldr r0, [r0] movs r1, 0x84 lsls r1, 2 adds r0, r1 - ldr r1, _08121CBC + ldr r1, =sub_8121CC0 + 1 str r1, [r0] _08121CB2: pop {r0} bx r0 .align 2, 0 -_08121CB8: .4byte 0x0203a134 -_08121CBC: .4byte sub_8121CC0 + 1 + .pool thumb_func_end sub_8121C98 thumb_func_start sub_8121CC0 sub_8121CC0: @ 8121CC0 push {lr} sub sp, 0x4 - ldr r0, _08121CF4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -593654,21 +574232,19 @@ sub_8121CC0: @ 8121CC0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08121CF8 + ldr r0, =0x0203a134 ldr r0, [r0] movs r1, 0x84 lsls r1, 2 adds r0, r1 - ldr r1, _08121CFC + ldr r1, =sub_8121D00 + 1 str r1, [r0] _08121CEE: add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08121CF4: .4byte 0x030022c0 -_08121CF8: .4byte 0x0203a134 -_08121CFC: .4byte sub_8121D00 + 1 + .pool thumb_func_end sub_8121CC0 thumb_func_start sub_8121D00 @@ -593678,7 +574254,7 @@ sub_8121D00: @ 8121D00 lsls r0, 24 cmp r0, 0 bne _08121D88 - ldr r4, _08121D90 + ldr r4, =0x0203a134 ldr r0, [r4] movs r1, 0x83 lsls r1, 2 @@ -593686,7 +574262,7 @@ sub_8121D00: @ 8121D00 ldr r0, [r0] bl set_callback2 ldr r1, [r4] - ldr r2, _08121D94 + ldr r2, =0x0000021b adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x2 @@ -593709,13 +574285,13 @@ sub_8121D00: @ 8121D00 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08121D98 + ldr r1, =0x02020630 adds r0, r1 bl sub_80D2EF8 _08121D58: - ldr r4, _08121D90 + ldr r4, =0x0203a134 ldr r0, [r4] - ldr r2, _08121D9C + ldr r2, =0x0000222c movs r1, 0 bl memset bl sub_80A1A74 @@ -593735,10 +574311,7 @@ _08121D88: pop {r0} bx r0 .align 2, 0 -_08121D90: .4byte 0x0203a134 -_08121D94: .4byte 0x0000021b -_08121D98: .4byte 0x02020630 -_08121D9C: .4byte 0x0000222c + .pool thumb_func_end sub_8121D00 thumb_func_start sub_8121DA0 @@ -593765,7 +574338,7 @@ sub_8121DA0: @ 8121DA0 strh r0, [r1] movs r1, 0xC0 lsls r1, 19 - ldr r2, _08121E04 + ldr r2, =0x0100c000 mov r0, sp bl CpuSet movs r4, 0 @@ -593773,22 +574346,20 @@ sub_8121DA0: @ 8121DA0 add r0, sp, 0x4 movs r1, 0xE0 lsls r1, 19 - ldr r2, _08121E08 + ldr r2, =0x05000100 bl CpuSet add r0, sp, 0x8 strh r4, [r0] movs r1, 0xA0 lsls r1, 19 - ldr r2, _08121E0C + ldr r2, =0x01000200 bl CpuSet add sp, 0xC pop {r4} pop {r0} bx r0 .align 2, 0 -_08121E04: .4byte 0x0100c000 -_08121E08: .4byte 0x05000100 -_08121E0C: .4byte 0x01000200 + .pool thumb_func_end sub_8121DA0 thumb_func_start sub_8121E10 @@ -593863,12 +574434,12 @@ sub_8121E7C: @ 8121E7C lsrs r7, r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _08121F08 + ldr r0, =0x0203a140 strb r6, [r0] adds r0, r6, 0 movs r1, 0x1 bl sub_8197B1C - ldr r4, _08121F0C + ldr r4, =0x02021fc4 ldr r0, [sp, 0x30] cmp r0, r4 beq _08121EC0 @@ -593876,7 +574447,7 @@ sub_8121E7C: @ 8121E7C ldr r1, [sp, 0x30] bl ExpandTextCodes _08121EC0: - ldr r2, _08121F10 + ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -593894,16 +574465,16 @@ _08121EC0: adds r2, r4, 0 adds r3, r5, 0 bl text_box_related_one - ldr r1, _08121F14 + ldr r1, =0x0300117c ldr r0, [sp, 0x34] str r0, [r1] - ldr r1, _08121F18 + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 lsls r0, 3 adds r0, r1 - ldr r1, _08121F1C + ldr r1, =task_show_message + 1 str r1, [r0] add sp, 0x10 pop {r3} @@ -593912,12 +574483,7 @@ _08121EC0: pop {r0} bx r0 .align 2, 0 -_08121F08: .4byte 0x0203a140 -_08121F0C: .4byte 0x02021fc4 -_08121F10: .4byte 0x03003014 -_08121F14: .4byte 0x0300117c -_08121F18: .4byte 0x03005e00 -_08121F1C: .4byte task_show_message + 1 + .pool thumb_func_end sub_8121E7C thumb_func_start sub_8121F20 @@ -593941,13 +574507,13 @@ task_show_message: @ 8121F3C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08121F60 + ldr r0, =0x0203a140 ldrb r0, [r0] bl sub_8121F20 lsls r0, 16 cmp r0, 0 bne _08121F5A - ldr r0, _08121F64 + ldr r0, =0x0300117c ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 @@ -593956,31 +574522,28 @@ _08121F5A: pop {r0} bx r0 .align 2, 0 -_08121F60: .4byte 0x0203a140 -_08121F64: .4byte 0x0300117c + .pool thumb_func_end task_show_message thumb_func_start sub_8121F68 sub_8121F68: @ 8121F68 lsls r0, 24 lsrs r0, 24 - ldr r3, _08121F88 + ldr r3, =0x0203a138 ldr r2, [r1, 0x4] ldr r1, [r1] str r1, [r3] str r2, [r3, 0x4] - ldr r2, _08121F8C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _08121F90 + ldr r0, =sub_8121FDC + 1 str r0, [r1] bx lr .align 2, 0 -_08121F88: .4byte 0x0203a138 -_08121F8C: .4byte 0x03005e00 -_08121F90: .4byte sub_8121FDC + 1 + .pool thumb_func_end sub_8121F68 thumb_func_start sub_8121F94 @@ -593999,25 +574562,23 @@ sub_8121F94: @ 8121F94 lsrs r2, 24 movs r3, 0 bl sub_81996C0 - ldr r2, _08121FD0 + ldr r2, =0x0203a138 ldr r0, [r5] ldr r1, [r5, 0x4] str r0, [r2] str r1, [r2, 0x4] - ldr r1, _08121FD4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08121FD8 + ldr r1, =sub_8121FDC + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08121FD0: .4byte 0x0203a138 -_08121FD4: .4byte 0x03005e00 -_08121FD8: .4byte sub_8121FDC + 1 + .pool thumb_func_end sub_8121F94 thumb_func_start sub_8121FDC @@ -594044,17 +574605,17 @@ _08121FFC: _08122002: movs r0, 0x5 bl audio_play - ldr r0, _08122014 + ldr r0, =0x0203a138 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 b _08122028 .align 2, 0 -_08122014: .4byte 0x0203a138 + .pool _08122018: movs r0, 0x5 bl audio_play - ldr r0, _08122030 + ldr r0, =0x0203a138 ldr r1, [r0, 0x4] adds r0, r4, 0 bl _call_via_r1 @@ -594063,7 +574624,7 @@ _08122028: pop {r0} bx r0 .align 2, 0 -_08122030: .4byte 0x0203a138 + .pool thumb_func_end sub_8121FDC thumb_func_start sub_8122034 @@ -594075,7 +574636,7 @@ sub_8122034: @ 8122034 adds r5, r1, 0 ldrh r4, [r2] adds r6, r4, 0 - ldr r0, _08122068 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x30] movs r3, 0xF0 ands r3, r0 @@ -594096,7 +574657,7 @@ _08122062: lsls r0, r4, 16 b _081220B6 .align 2, 0 -_08122068: .4byte 0x030022c0 + .pool _0812206C: cmp r3, 0x80 bne _08122082 @@ -594159,12 +574720,12 @@ _081220C8: thumb_func_start sub_81220D0 sub_81220D0: @ 81220D0 push {lr} - ldr r0, _081220F0 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 bne _08122106 - ldr r0, _081220F4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 lsls r0, 2 @@ -594174,8 +574735,7 @@ sub_81220D0: @ 81220D0 movs r0, 0x1 b _08122108 .align 2, 0 -_081220F0: .4byte 0x03005d90 -_081220F4: .4byte 0x030022c0 + .pool _081220F8: movs r0, 0x80 lsls r0, 1 @@ -594194,12 +574754,12 @@ _08122108: thumb_func_start sub_812210C sub_812210C: @ 812210C push {lr} - ldr r0, _0812212C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 bne _08122142 - ldr r0, _08122130 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] movs r0, 0x80 lsls r0, 2 @@ -594209,8 +574769,7 @@ sub_812210C: @ 812210C movs r0, 0x1 b _08122144 .align 2, 0 -_0812212C: .4byte 0x03005d90 -_08122130: .4byte 0x030022c0 + .pool _08122134: movs r0, 0x80 lsls r0, 1 @@ -594233,10 +574792,10 @@ sub_8122148: @ 8122148 lsrs r0, 16 cmp r0, 0xAF bne _08122174 - ldr r0, _0812216C + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _08122170 + ldr r0, =0x00001919 cmp r1, r0 beq _08122166 bl in_trade_center @@ -594246,8 +574805,7 @@ _08122166: movs r0, 0 b _08122176 .align 2, 0 -_0812216C: .4byte 0x03005d8c -_08122170: .4byte 0x00001919 + .pool _08122174: movs r0, 0x1 _08122176: @@ -594289,7 +574847,7 @@ sub_81221AC: @ 81221AC bl is_c1_link_related_active cmp r0, 0x1 beq _081221BE - ldr r0, _081221C4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 bne _081221C8 @@ -594297,7 +574855,7 @@ _081221BE: movs r0, 0x1 b _081221CA .align 2, 0 -_081221C4: .4byte 0x03003124 + .pool _081221C8: movs r0, 0 _081221CA: @@ -594512,15 +575070,14 @@ _08122322: thumb_func_start sub_8122328 sub_8122328: @ 8122328 push {lr} - ldr r0, _0812233C + ldr r0, =0x0859f514 bl gpu_tile_obj_decompress_and_load - ldr r0, _08122340 + ldr r0, =0x0859f51c bl gpu_pal_obj_decompress_and_apply pop {r0} bx r0 .align 2, 0 -_0812233C: .4byte 0x0859f514 -_08122340: .4byte 0x0859f51c + .pool thumb_func_end sub_8122328 thumb_func_start sub_8122344 @@ -594534,10 +575091,10 @@ sub_8122344: @ 8122344 movs r5, 0 cmp r5, r6 bcs _0812239C - ldr r7, _081223A8 + ldr r7, =0x02020630 _08122358: lsls r1, r5, 4 - ldr r0, _081223AC + ldr r0, =0x0859f524 movs r2, 0 movs r3, 0 bl obj_add_from_template_forward_search @@ -594576,8 +575133,7 @@ _0812239C: pop {r0} bx r0 .align 2, 0 -_081223A8: .4byte 0x02020630 -_081223AC: .4byte 0x0859f524 + .pool thumb_func_end sub_8122344 thumb_func_start sub_81223B0 @@ -594589,7 +575145,7 @@ sub_81223B0: @ 81223B0 movs r4, 0 cmp r4, r5 bcs _081223F6 - ldr r7, _081223D8 + ldr r7, =0x02020630 _081223C0: subs r0, r5, 0x1 cmp r4, r0 @@ -594603,7 +575159,7 @@ _081223C0: bl obj_delete_and_free_resources b _081223EC .align 2, 0 -_081223D8: .4byte 0x02020630 + .pool _081223DC: adds r0, r6, r4 ldrb r1, [r0] @@ -594635,7 +575191,7 @@ sub_81223FC: @ 81223FC movs r3, 0 cmp r3, r4 bcs _0812243E - ldr r1, _08122444 + ldr r1, =0x02020630 mov r12, r1 movs r1, 0x1 ands r0, r1 @@ -594665,7 +575221,7 @@ _0812243E: pop {r0} bx r0 .align 2, 0 -_08122444: .4byte 0x02020630 + .pool thumb_func_end sub_81223FC thumb_func_start sub_8122448 @@ -594692,7 +575248,7 @@ sub_8122448: @ 8122448 movs r3, 0 cmp r3, r4 bcs _081224C8 - ldr r5, _0812249C + ldr r5, =0x02020630 lsls r0, r7, 16 asrs r0, 16 subs r0, 0x8 @@ -594714,7 +575270,7 @@ _0812247E: strh r1, [r0, 0x24] b _081224AE .align 2, 0 -_0812249C: .4byte 0x02020630 + .pool _081224A0: adds r2, r6, r3 ldrb r1, [r2] @@ -594750,14 +575306,14 @@ _081224C8: sub_81224D4: @ 81224D4 push {r4-r7,lr} movs r6, 0 - ldr r5, _08122508 + ldr r5, =0x03005d8c _081224DA: movs r0, 0xA bl sub_811EE38 ldr r1, [r5] lsls r4, r6, 3 adds r1, r4 - ldr r2, _0812250C + ldr r2, =0x00002e6c adds r1, r2 strh r0, [r1] bl GenerateRandomNumber @@ -594769,19 +575325,17 @@ _081224DA: bl sub_811EE38 ldr r1, [r5] adds r1, r4 - ldr r7, _08122510 + ldr r7, =0x00002e6e adds r1, r7 b _08122522 .align 2, 0 -_08122508: .4byte 0x03005d8c -_0812250C: .4byte 0x00002e6c -_08122510: .4byte 0x00002e6e + .pool _08122514: movs r0, 0xD bl sub_811EE38 ldr r1, [r5] adds r1, r4 - ldr r2, _08122570 + ldr r2, =0x00002e6e adds r1, r2 _08122522: strh r0, [r1] @@ -594790,7 +575344,7 @@ _08122522: adds r3, r4 movs r2, 0x1 ands r2, r0 - ldr r7, _08122574 + ldr r7, =0x00002e69 adds r3, r7 lsls r2, 6 ldrb r0, [r3] @@ -594800,7 +575354,7 @@ _08122522: ands r0, r1 orrs r0, r2 strb r0, [r3] - ldr r0, _08122578 + ldr r0, =0x00002e68 adds r1, r4, r0 ldr r0, [r5] adds r0, r1 @@ -594810,9 +575364,9 @@ _08122522: lsrs r6, r0, 16 cmp r6, 0x4 bls _081224DA - ldr r0, _0812257C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08122578 + ldr r1, =0x00002e68 adds r0, r1 movs r1, 0x5 movs r2, 0 @@ -594821,10 +575375,7 @@ _08122522: pop {r0} bx r0 .align 2, 0 -_08122570: .4byte 0x00002e6e -_08122574: .4byte 0x00002e69 -_08122578: .4byte 0x00002e68 -_0812257C: .4byte 0x03005d8c + .pool thumb_func_end sub_81224D4 thumb_func_start sub_8122580 @@ -594855,9 +575406,9 @@ _081225AA: ldr r2, [sp] mov r3, r10 lsls r0, r3, 3 - ldr r4, _081225F0 + ldr r4, =0x00002e68 adds r0, r4 - ldr r3, _081225F4 + ldr r3, =0x03005d8c ldr r1, [r3] adds r5, r1, r0 ldrb r6, [r5, 0x1] @@ -594888,8 +575439,7 @@ _081225AA: orrs r0, r6 b _0812269C .align 2, 0 -_081225F0: .4byte 0x00002e68 -_081225F4: .4byte 0x03005d8c + .pool _081225F8: lsrs r0, r3, 25 subs r2, r0 @@ -594986,9 +575536,9 @@ _0812269E: bhi _081226AE b _081225AA _081226AE: - ldr r4, _081226D0 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _081226D4 + ldr r1, =0x00002e68 adds r0, r1 movs r1, 0x5 movs r2, 0 @@ -595003,8 +575553,7 @@ _081226BE: pop {r0} bx r0 .align 2, 0 -_081226D0: .4byte 0x03005d8c -_081226D4: .4byte 0x00002e68 + .pool thumb_func_end sub_8122580 thumb_func_start sub_81226D8 @@ -595025,7 +575574,7 @@ sub_81226D8: @ 81226D8 beq _081226F8 b _081227F2 _081226F8: - ldr r4, _08122734 + ldr r4, =0x00000893 adds r0, r4, 0 bl flag_check lsls r0, 24 @@ -595033,16 +575582,16 @@ _081226F8: bne _08122744 adds r0, r4, 0 bl flag_set - ldr r0, _08122738 + ldr r0, =0x00000894 bl flag_check lsls r0, 24 cmp r0, 0 bne _08122744 - ldr r0, _0812273C + ldr r0, =0x03005d8c ldr r1, [r0] mov r0, r8 ldrh r2, [r0] - ldr r3, _08122740 + ldr r3, =0x00002e6c adds r0, r1, r3 strh r2, [r0] mov r2, r8 @@ -595053,10 +575602,7 @@ _081226F8: movs r0, 0x1 b _081227F4 .align 2, 0 -_08122734: .4byte 0x00000893 -_08122738: .4byte 0x00000894 -_0812273C: .4byte 0x03005d8c -_08122740: .4byte 0x00002e6c + .pool _08122744: mov r0, r8 ldrh r1, [r0, 0x2] @@ -595073,9 +575619,9 @@ _08122744: bl sub_8122B28 movs r5, 0 _08122762: - ldr r6, _081227CC + ldr r6, =0x03005d8c lsls r4, r5, 3 - ldr r1, _081227D0 + ldr r1, =0x00002e68 adds r0, r4, r1 ldr r1, [r6] adds r1, r0 @@ -595090,7 +575636,7 @@ _08122762: mov r12, r6 cmp r2, r5 bls _081227A6 - ldr r4, _081227D0 + ldr r4, =0x00002e68 _08122788: ldr r0, [r6] lsls r3, r2, 3 @@ -595110,7 +575656,7 @@ _08122788: _081227A6: mov r3, r12 ldr r2, [r3] - ldr r0, _081227D0 + ldr r0, =0x00002e68 adds r2, r0 adds r2, r7 ldr r0, [sp] @@ -595128,8 +575674,7 @@ _081227C2: movs r0, 0x1 b _081227F4 .align 2, 0 -_081227CC: .4byte 0x03005d8c -_081227D0: .4byte 0x00002e68 + .pool _081227D4: adds r0, r5, 0x1 lsls r0, 16 @@ -595137,7 +575682,7 @@ _081227D4: cmp r5, 0x4 bls _08122762 ldr r2, [r6] - ldr r1, _08122800 + ldr r1, =0x00002e88 adds r2, r1 ldr r0, [sp] ldr r1, [sp, 0x4] @@ -595155,7 +575700,7 @@ _081227F4: pop {r1} bx r1 .align 2, 0 -_08122800: .4byte 0x00002e88 + .pool thumb_func_end sub_81226D8 thumb_func_start sub_8122804 @@ -595335,9 +575880,9 @@ _08122946: movs r2, 0x2 bl sub_8122804 adds r4, r7, 0 - ldr r0, _08122990 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08122994 + ldr r1, =0x00002e68 adds r1, r0 mov r8, r1 movs r5, 0 @@ -595367,21 +575912,20 @@ _08122980: pop {r0} bx r0 .align 2, 0 -_08122990: .4byte 0x03005d8c -_08122994: .4byte 0x00002e68 + .pool thumb_func_end sub_812287C thumb_func_start sub_8122998 sub_8122998: @ 8122998 push {lr} - ldr r2, _081229B8 - ldr r0, _081229BC + ldr r2, =0x03005d8c + ldr r0, =0x020375e0 ldrh r1, [r0] lsls r1, 3 ldr r0, [r2] adds r1, r0 - ldr r0, _081229C0 - ldr r2, _081229C4 + ldr r0, =0x02021cc4 + ldr r2, =0x00002e6c adds r1, r2 movs r2, 0x2 movs r3, 0x1 @@ -595389,24 +575933,21 @@ sub_8122998: @ 8122998 pop {r0} bx r0 .align 2, 0 -_081229B8: .4byte 0x03005d8c -_081229BC: .4byte 0x020375e0 -_081229C0: .4byte 0x02021cc4 -_081229C4: .4byte 0x00002e6c + .pool thumb_func_end sub_8122998 thumb_func_start sub_81229C8 sub_81229C8: @ 81229C8 push {r4,lr} movs r4, 0 - ldr r0, _08122A18 + ldr r0, =0x03005d8c ldr r3, [r0] - ldr r1, _08122A1C + ldr r1, =0x00002e68 adds r0, r3, r1 ldrb r1, [r0] lsls r1, 25 lsrs r1, 25 - ldr r2, _08122A20 + ldr r2, =0x00002e70 adds r0, r3, r2 ldrb r0, [r0] lsls r0, 25 @@ -595414,7 +575955,7 @@ sub_81229C8: @ 81229C8 subs r1, r0 cmp r1, 0x1 bgt _08122A0C - ldr r1, _08122A24 + ldr r1, =0x00002e69 adds r0, r3, r1 ldrb r1, [r0] movs r2, 0x40 @@ -595422,7 +575963,7 @@ sub_81229C8: @ 81229C8 ands r0, r1 cmp r0, 0 bne _08122A0C - ldr r1, _08122A28 + ldr r1, =0x00002e71 adds r0, r3, r1 ldrb r1, [r0] adds r0, r2, 0 @@ -595432,26 +575973,21 @@ sub_81229C8: @ 81229C8 negs r0, r0 lsrs r4, r0, 31 _08122A0C: - ldr r0, _08122A2C + ldr r0, =0x020375f0 strh r4, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08122A18: .4byte 0x03005d8c -_08122A1C: .4byte 0x00002e68 -_08122A20: .4byte 0x00002e70 -_08122A24: .4byte 0x00002e69 -_08122A28: .4byte 0x00002e71 -_08122A2C: .4byte 0x020375f0 + .pool thumb_func_end sub_81229C8 thumb_func_start sub_8122A30 sub_8122A30: @ 8122A30 - ldr r2, _08122A4C - ldr r0, _08122A50 + ldr r2, =0x020375f0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _08122A54 + ldr r3, =0x00002e6c adds r1, r0, r3 adds r3, 0x2 adds r0, r3 @@ -595463,9 +575999,7 @@ sub_8122A30: @ 8122A30 strh r0, [r2] bx lr .align 2, 0 -_08122A4C: .4byte 0x020375f0 -_08122A50: .4byte 0x03005d8c -_08122A54: .4byte 0x00002e6c + .pool thumb_func_end sub_8122A30 thumb_func_start atk90_changetypestoenemyattacktype @@ -595620,7 +576154,7 @@ _08122B6A: ands r1, r0 lsls r1, 7 ldrh r2, [r5] - ldr r0, _08122BAC + ldr r0, =0xffffc07f ands r0, r2 orrs r0, r1 strh r0, [r5] @@ -595644,7 +576178,7 @@ _08122B6A: pop {r0} bx r0 .align 2, 0 -_08122BAC: .4byte 0xffffc07f + .pool thumb_func_end sub_8122B28 thumb_func_start sub_8122BB0 @@ -595652,12 +576186,12 @@ sub_8122BB0: @ 8122BB0 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 - ldr r6, _08122BD4 + ldr r6, =0x03005d8c _08122BB8: lsls r1, r4, 3 ldr r0, [r6] adds r1, r0 - ldr r0, _08122BD8 + ldr r0, =0x00002e6c adds r1, r0 adds r0, r5, 0 bl sub_8122BF0 @@ -595667,8 +576201,7 @@ _08122BB8: movs r0, 0x1 b _08122BE8 .align 2, 0 -_08122BD4: .4byte 0x03005d8c -_08122BD8: .4byte 0x00002e6c + .pool _08122BDC: adds r0, r4, 0x1 lsls r0, 16 @@ -595757,7 +576290,7 @@ sub_8122C5C: @ 8122C5C lsls r1, 16 lsrs r1, 16 movs r3, 0 - ldr r2, _08122C80 + ldr r2, =0x0859f53c _08122C6A: movs r0, 0 ldrsb r0, [r2, r0] @@ -595770,7 +576303,7 @@ _08122C6A: adds r0, r3, 0x1 b _08122C8E .align 2, 0 -_08122C80: .4byte 0x0859f53c + .pool _08122C84: adds r2, 0x8 adds r3, 0x1 @@ -595794,11 +576327,11 @@ sub_8122C94: @ 8122C94 cmp r0, 0 beq _08122CB4 lsls r0, 3 - ldr r1, _08122CB0 + ldr r1, =0x0859f534 adds r0, r1 b _08122CB6 .align 2, 0 -_08122CB0: .4byte 0x0859f534 + .pool _08122CB4: movs r0, 0 _08122CB6: @@ -595814,11 +576347,11 @@ sub_8122CBC: @ 8122CBC cmp r0, 0x16 bhi _08122CD4 lsls r0, 3 - ldr r1, _08122CD0 + ldr r1, =0x0859f534 adds r0, r1 b _08122CD6 .align 2, 0 -_08122CD0: .4byte 0x0859f534 + .pool _08122CD4: movs r0, 0 _08122CD6: @@ -595848,7 +576381,7 @@ sub_8122CF8: @ 8122CF8 adds r4, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r3, _08122D20 + ldr r3, =0x0203a144 str r0, [r3] movs r1, 0x79 adds r1, r0 @@ -595861,13 +576394,12 @@ sub_8122CF8: @ 8122CF8 ldr r1, [r3] cmp r2, 0x1 bne _08122D28 - ldr r0, _08122D24 + ldr r0, =sub_8123254 + 1 b _08122D2A .align 2, 0 -_08122D20: .4byte 0x0203a144 -_08122D24: .4byte sub_8123254 + 1 + .pool _08122D28: - ldr r0, _08122D60 + ldr r0, =sub_81230C4 + 1 _08122D2A: str r0, [r1, 0x18] cmp r4, 0 @@ -595896,7 +576428,7 @@ _08122D2A: strb r1, [r0] b _08122D80 .align 2, 0 -_08122D60: .4byte sub_81230C4 + 1 + .pool _08122D64: ldr r0, [r3] adds r0, 0x80 @@ -595921,7 +576453,7 @@ _08122D80: thumb_func_start sub_8122D88 sub_8122D88: @ 8122D88 push {r4,lr} - ldr r4, _08122DAC + ldr r4, =0x0203a144 str r0, [r4] bl sub_81238AC ldr r2, [r4] @@ -595938,14 +576470,14 @@ sub_8122D88: @ 8122D88 pop {r0} bx r0 .align 2, 0 -_08122DAC: .4byte 0x0203a144 + .pool thumb_func_end sub_8122D88 thumb_func_start sub_8122DB0 sub_8122DB0: @ 8122DB0 push {r4,r5,lr} sub sp, 0xC - ldr r0, _08122DCC + ldr r0, =0x0203a144 ldr r0, [r0] adds r0, 0x79 ldrb r0, [r0] @@ -595954,13 +576486,12 @@ sub_8122DB0: @ 8122DB0 b _0812300C _08122DC2: lsls r0, 2 - ldr r1, _08122DD0 + ldr r1, =_08122DD4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08122DCC: .4byte 0x0203a144 -_08122DD0: .4byte _08122DD4 + .pool .align 2, 0 _08122DD4: .4byte _08122DF4 @@ -595972,7 +576503,7 @@ _08122DD4: .4byte _08122F10 .4byte _08122F8C _08122DF4: - ldr r0, _08122E10 + ldr r0, =0x0203a144 ldr r1, [r0] adds r0, r1, 0 adds r0, 0x83 @@ -595982,23 +576513,21 @@ _08122DF4: adds r0, r1, 0 adds r0, 0x80 ldrb r0, [r0] - ldr r1, _08122E14 + ldr r1, =0x0859f77c movs r2, 0 str r2, [sp] b _08122E52 .align 2, 0 -_08122E10: .4byte 0x0203a144 -_08122E14: .4byte 0x0859f77c + .pool _08122E18: - ldr r0, _08122E24 - ldr r1, _08122E28 + ldr r0, =0x0859f77c + ldr r1, =0x06008000 bl LZ77UnCompVram b _08123014 .align 2, 0 -_08122E24: .4byte 0x0859f77c -_08122E28: .4byte 0x06008000 + .pool _08122E2C: - ldr r4, _08122E5C + ldr r4, =0x0203a144 ldr r0, [r4] adds r0, 0x83 ldrb r0, [r0] @@ -596013,7 +576542,7 @@ _08122E44: ldr r0, [r4] adds r0, 0x80 ldrb r0, [r0] - ldr r1, _08122E60 + ldr r1, =0x085a04e0 movs r2, 0x1 str r2, [sp] movs r2, 0 @@ -596022,16 +576551,14 @@ _08122E52: bl decompress_and_copy_tile_data_to_vram b _08123014 .align 2, 0 -_08122E5C: .4byte 0x0203a144 -_08122E60: .4byte 0x085a04e0 + .pool _08122E64: - ldr r0, _08122E70 - ldr r1, _08122E74 + ldr r0, =0x085a04e0 + ldr r1, =0x0600e000 bl LZ77UnCompVram b _08123014 .align 2, 0 -_08122E70: .4byte 0x085a04e0 -_08122E74: .4byte 0x0600e000 + .pool _08122E78: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -596039,16 +576566,16 @@ _08122E78: beq _08122E84 b _08123014 _08122E84: - ldr r0, _08122E90 + ldr r0, =0x0859f73c movs r1, 0x70 movs r2, 0x60 bl gpu_pal_apply b _08123014 .align 2, 0 -_08122E90: .4byte 0x0859f73c + .pool _08122E94: - ldr r0, _08122EA8 - ldr r1, _08122EAC + ldr r0, =0x0859f60c + ldr r1, =0x0203a144 ldr r1, [r1] movs r2, 0xC2 lsls r2, 1 @@ -596056,11 +576583,10 @@ _08122E94: bl LZ77UnCompWram b _08123014 .align 2, 0 -_08122EA8: .4byte 0x0859f60c -_08122EAC: .4byte 0x0203a144 + .pool _08122EB0: - ldr r0, _08122EC4 - ldr r1, _08122EC8 + ldr r0, =0x0859f650 + ldr r1, =0x0203a144 ldr r1, [r1] movs r5, 0xA1 lsls r5, 2 @@ -596068,11 +576594,10 @@ _08122EB0: bl LZ77UnCompWram b _08123014 .align 2, 0 -_08122EC4: .4byte 0x0859f650 -_08122EC8: .4byte 0x0203a144 + .pool _08122ECC: bl sub_81238AC - ldr r4, _08122F0C + ldr r4, =0x0203a144 ldr r2, [r4] adds r0, r2, 0 adds r0, 0x54 @@ -596099,9 +576624,9 @@ _08122ECC: bl GetMapName b _08123014 .align 2, 0 -_08122F0C: .4byte 0x0203a144 + .pool _08122F10: - ldr r0, _08122F38 + ldr r0, =0x0203a144 ldr r4, [r0] adds r0, r4, 0 adds r0, 0x78 @@ -596120,7 +576645,7 @@ _08122F10: bl sub_81236C4 b _08123014 .align 2, 0 -_08122F38: .4byte 0x0203a144 + .pool _08122F3C: adds r1, r4, 0 adds r1, 0x54 @@ -596164,7 +576689,7 @@ _08122F3C: _08122F8C: bl sub_8123FB0 bl sub_81237B4 - ldr r4, _08123010 + ldr r4, =0x0203a144 ldr r0, [r4] movs r1, 0 str r1, [r0, 0x1C] @@ -596224,9 +576749,9 @@ _0812300C: movs r0, 0 b _08123022 .align 2, 0 -_08123010: .4byte 0x0203a144 + .pool _08123014: - ldr r0, _0812302C + ldr r0, =0x0203a144 ldr r1, [r0] adds r1, 0x79 ldrb r0, [r1] @@ -596239,7 +576764,7 @@ _08123022: pop {r1} bx r1 .align 2, 0 -_0812302C: .4byte 0x0203a144 + .pool thumb_func_end sub_8122DB0 thumb_func_start sub_8123030 @@ -596253,21 +576778,20 @@ sub_8123030: @ 8123030 lsls r1, 24 lsrs r1, 24 bl sub_80A2A20 - ldr r0, _08123054 - ldr r1, _08123058 + ldr r0, =0x02037bf4 + ldr r1, =0x020377f4 movs r2, 0x30 bl CpuSet pop {r0} bx r0 .align 2, 0 -_08123054: .4byte 0x02037bf4 -_08123058: .4byte 0x020377f4 + .pool thumb_func_end sub_8123030 thumb_func_start sub_812305C sub_812305C: @ 812305C push {r4,lr} - ldr r4, _081230A8 + ldr r4, =0x0203a144 ldr r0, [r4] ldr r0, [r0, 0x1C] cmp r0, 0 @@ -596300,13 +576824,13 @@ _081230A0: pop {r0} bx r0 .align 2, 0 -_081230A8: .4byte 0x0203a144 + .pool thumb_func_end sub_812305C thumb_func_start sub_81230AC sub_81230AC: @ 81230AC push {lr} - ldr r0, _081230C0 + ldr r0, =0x0203a144 ldr r0, [r0] ldr r0, [r0, 0x18] bl _call_via_r0 @@ -596315,21 +576839,21 @@ sub_81230AC: @ 81230AC pop {r1} bx r1 .align 2, 0 -_081230C0: .4byte 0x0203a144 + .pool thumb_func_end sub_81230AC thumb_func_start sub_81230C4 sub_81230C4: @ 81230C4 push {r4,lr} movs r4, 0 - ldr r2, _08123160 + ldr r2, =0x0203a144 ldr r0, [r2] adds r0, 0x7B strb r4, [r0] ldr r0, [r2] adds r0, 0x7C strb r4, [r0] - ldr r3, _08123164 + ldr r3, =0x030022c0 ldrh r1, [r3, 0x2C] movs r0, 0x40 ands r0, r1 @@ -596402,8 +576926,7 @@ _08123150: movs r4, 0x4 b _08123172 .align 2, 0 -_08123160: .4byte 0x0203a144 -_08123164: .4byte 0x030022c0 + .pool _08123168: movs r0, 0x2 ands r0, r3 @@ -596418,7 +576941,7 @@ _08123172: movs r1, 0x4 strb r1, [r0] ldr r1, [r2] - ldr r0, _0812318C + ldr r0, =_swiopen + 1 str r0, [r1, 0x18] _08123184: adds r0, r4, 0 @@ -596426,13 +576949,13 @@ _08123184: pop {r1} bx r1 .align 2, 0 -_0812318C: .4byte _swiopen + 1 + .pool thumb_func_end sub_81230C4 thumb_func_start _swiopen _swiopen: @ 8123190 push {r4,r5,lr} - ldr r5, _081231A8 + ldr r5, =0x0203a144 ldr r1, [r5] adds r0, r1, 0 adds r0, 0x7A @@ -596444,7 +576967,7 @@ _swiopen: @ 8123190 movs r0, 0x2 b _08123248 .align 2, 0 -_081231A8: .4byte 0x0203a144 + .pool _081231AC: adds r0, r1, 0 adds r0, 0x7B @@ -596522,7 +577045,7 @@ _0812320A: _0812323C: bl sub_8123FB0 ldr r1, [r5] - ldr r0, _08123250 + ldr r0, =sub_81230C4 + 1 str r0, [r1, 0x18] movs r0, 0x3 _08123248: @@ -596530,14 +577053,14 @@ _08123248: pop {r1} bx r1 .align 2, 0 -_08123250: .4byte sub_81230C4 + 1 + .pool thumb_func_end _swiopen thumb_func_start sub_8123254 sub_8123254: @ 8123254 push {r4-r6,lr} movs r4, 0 - ldr r3, _08123324 + ldr r3, =0x0203a144 ldr r0, [r3] mov r12, r0 adds r0, 0x6A @@ -596545,7 +577068,7 @@ sub_8123254: @ 8123254 mov r5, r12 adds r5, 0x68 strh r4, [r5] - ldr r2, _08123328 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0x40 ands r0, r1 @@ -596561,7 +577084,7 @@ sub_8123254: @ 8123254 negs r0, r0 cmp r1, r0 ble _0812328E - ldr r0, _0812332C + ldr r0, =0x0000ffff strh r0, [r5] movs r4, 0x1 _0812328E: @@ -596598,7 +577121,7 @@ _081232AE: ble _081232D4 adds r1, r2, 0 adds r1, 0x6A - ldr r0, _0812332C + ldr r0, =0x0000ffff strh r0, [r1] movs r4, 0x1 _081232D4: @@ -596635,7 +577158,7 @@ _0812330A: cmp r4, 0x1 bne _0812331A ldr r0, [r6] - ldr r1, _08123330 + ldr r1, =sub_8123334 + 1 str r1, [r0, 0x18] adds r0, 0x6C movs r1, 0 @@ -596646,16 +577169,13 @@ _0812331A: pop {r1} bx r1 .align 2, 0 -_08123324: .4byte 0x0203a144 -_08123328: .4byte 0x030022c0 -_0812332C: .4byte 0x0000ffff -_08123330: .4byte sub_8123334 + 1 + .pool thumb_func_end sub_8123254 thumb_func_start sub_8123334 sub_8123334: @ 8123334 push {r4,r5,lr} - ldr r5, _08123408 + ldr r5, =0x0203a144 ldr r2, [r5] adds r3, r2, 0 adds r3, 0x5E @@ -596749,19 +577269,18 @@ _081233C2: _081233EE: bl sub_8123FB0 _081233F2: - ldr r0, _08123408 + ldr r0, =0x0203a144 ldr r2, [r0] adds r1, r2, 0 adds r1, 0x6C movs r0, 0 strh r0, [r1] - ldr r0, _0812340C + ldr r0, =sub_8123254 + 1 str r0, [r2, 0x18] movs r0, 0x3 b _08123412 .align 2, 0 -_08123408: .4byte 0x0203a144 -_0812340C: .4byte sub_8123254 + 1 + .pool _08123410: movs r0, 0x2 _08123412: @@ -596773,7 +577292,7 @@ _08123412: thumb_func_start sub_8123418 sub_8123418: @ 8123418 push {r4-r6,lr} - ldr r1, _08123494 + ldr r1, =0x0203a144 ldr r2, [r1] adds r0, r2, 0 adds r0, 0x78 @@ -596834,11 +577353,10 @@ _08123474: movs r0, 0x80 lsls r0, 9 str r0, [r2, 0x4C] - ldr r0, _08123498 + ldr r0, =0xfffff800 b _081234FA .align 2, 0 -_08123494: .4byte 0x0203a144 -_08123498: .4byte 0xfffff800 + .pool _0812349C: adds r0, r2, 0 adds r0, 0x5C @@ -596906,7 +577424,7 @@ _081234FA: sub_8123514: @ 8123514 push {r4-r6,lr} sub sp, 0xC - ldr r0, _0812352C + ldr r0, =0x0203a144 ldr r3, [r0] adds r2, r3, 0 adds r2, 0x6E @@ -596917,7 +577435,7 @@ sub_8123514: @ 8123514 movs r0, 0 b _081236B8 .align 2, 0 -_0812352C: .4byte 0x0203a144 + .pool _08123530: adds r0, r1, 0x1 movs r1, 0 @@ -596959,10 +577477,10 @@ _08123572: adds r0, r1, 0 adds r0, 0x78 ldrb r0, [r0] - ldr r2, _0812359C + ldr r2, =sub_8123254 + 1 cmp r0, 0 bne _08123584 - ldr r2, _081235A0 + ldr r2, =sub_81230C4 + 1 _08123584: str r2, [r1, 0x18] adds r0, r1, 0 @@ -596975,8 +577493,7 @@ _08123584: movs r4, 0 b _08123686 .align 2, 0 -_0812359C: .4byte sub_8123254 + 1 -_081235A0: .4byte sub_81230C4 + 1 + .pool _081235A4: ldr r2, [r3, 0x3C] ldr r0, [r3, 0x44] @@ -597069,7 +577586,7 @@ _0812363C: strh r1, [r3] str r0, [r2, 0x48] _0812364E: - ldr r0, _0812366C + ldr r0, =0x0203a144 ldr r2, [r0] adds r0, r2, 0 adds r0, 0x78 @@ -597077,7 +577594,7 @@ _0812364E: cmp r3, 0 bne _08123674 ldr r1, [r2, 0x4C] - ldr r0, _08123670 + ldr r0, =0x00007fff cmp r1, r0 bgt _08123684 adds r0, 0x1 @@ -597085,8 +577602,7 @@ _0812364E: str r3, [r2, 0x50] b _08123684 .align 2, 0 -_0812366C: .4byte 0x0203a144 -_08123670: .4byte 0x00007fff + .pool _08123674: ldr r0, [r2, 0x4C] movs r1, 0x80 @@ -597099,7 +577615,7 @@ _08123674: _08123684: movs r4, 0x1 _08123686: - ldr r0, _081236C0 + ldr r0, =0x0203a144 ldr r3, [r0] adds r0, r3, 0 adds r0, 0x5C @@ -597129,7 +577645,7 @@ _081236B8: pop {r1} bx r1 .align 2, 0 -_081236C0: .4byte 0x0203a144 + .pool thumb_func_end sub_8123514 thumb_func_start sub_81236C4 @@ -597152,9 +577668,9 @@ sub_81236C4: @ 81236C4 mov r9, r4 lsls r5, 24 lsrs r5, 24 - ldr r4, _08123784 + ldr r4, =0x0203a144 ldr r6, [r4] - ldr r7, _08123788 + ldr r7, =0x08329f40 mov r12, r7 adds r4, r5, 0 adds r4, 0x40 @@ -597230,13 +577746,12 @@ sub_81236C4: @ 81236C4 pop {r0} bx r0 .align 2, 0 -_08123784: .4byte 0x0203a144 -_08123788: .4byte 0x08329f40 + .pool thumb_func_end sub_81236C4 thumb_func_start sub_812378C sub_812378C: @ 812378C - ldr r2, _081237B0 + ldr r2, =0x0203a144 ldr r2, [r2] lsls r0, 16 asrs r0, 8 @@ -597255,13 +577770,13 @@ sub_812378C: @ 812378C strb r0, [r2] bx lr .align 2, 0 -_081237B0: .4byte 0x0203a144 + .pool thumb_func_end sub_812378C thumb_func_start sub_81237B4 sub_81237B4: @ 81237B4 push {r4,lr} - ldr r4, _08123820 + ldr r4, =0x0203a144 ldr r1, [r4] adds r0, r1, 0 adds r0, 0x7D @@ -597308,7 +577823,7 @@ _0812381A: pop {r0} bx r0 .align 2, 0 -_08123820: .4byte 0x0203a144 + .pool thumb_func_end sub_81237B4 thumb_func_start sub_8123824 @@ -597331,7 +577846,7 @@ sub_8123824: @ 8123824 movs r3, 0x48 bl sub_81236C4 bl sub_81237B4 - ldr r0, _08123868 + ldr r0, =0x0203a144 ldr r2, [r0] ldr r1, [r2, 0x20] cmp r1, 0 @@ -597347,7 +577862,7 @@ _08123860: pop {r0} bx r0 .align 2, 0 -_08123868: .4byte 0x0203a144 + .pool thumb_func_end sub_8123824 thumb_func_start sub_812386C @@ -597356,7 +577871,7 @@ sub_812386C: @ 812386C lsls r0, 16 lsrs r3, r0, 16 lsls r1, 16 - ldr r0, _0812388C + ldr r0, =0xfffe0000 adds r1, r0 lsrs r2, r1, 16 cmp r2, 0xE @@ -597369,12 +577884,12 @@ _08123886: movs r0, 0xD5 b _081238A4 .align 2, 0 -_0812388C: .4byte 0xfffe0000 + .pool _08123890: subs r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 - ldr r1, _081238A8 + ldr r1, =0x085a096c lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -597385,7 +577900,7 @@ _081238A4: pop {r1} bx r1 .align 2, 0 -_081238A8: .4byte 0x085a096c + .pool thumb_func_end sub_812386C thumb_func_start sub_81238AC @@ -597396,7 +577911,7 @@ sub_81238AC: @ 81238AC mov r5, r8 push {r5-r7} sub sp, 0xC - ldr r0, _081238D8 + ldr r0, =0x03005d8c ldr r2, [r0] movs r1, 0x4 ldrsb r1, [r2, r1] @@ -597412,7 +577927,7 @@ sub_81238AC: @ 81238AC bl sub_8123C00 b _08123BEC .align 2, 0 -_081238D8: .4byte 0x03005d8c + .pool _081238DC: ldr r1, [r3] movs r0, 0x4 @@ -597427,12 +577942,12 @@ _081238DC: cmp r0, 0x8 bhi _08123928 lsls r0, 2 - ldr r1, _08123900 + ldr r1, =_08123904 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08123900: .4byte _08123904 + .pool .align 2, 0 _08123904: .4byte _08123928 @@ -597445,9 +577960,9 @@ _08123904: .4byte _08123A28 .4byte _081239E4 _08123928: - ldr r4, _08123960 + ldr r4, =0x0203a144 ldr r0, [r4] - ldr r3, _08123964 + ldr r3, =0x02037318 ldrb r1, [r3, 0x14] movs r2, 0 strh r1, [r0] @@ -597457,7 +577972,7 @@ _08123928: ldrh r2, [r0] ldrh r0, [r0, 0x4] mov r9, r0 - ldr r0, _08123968 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r6, [r0] ldrh r3, [r0, 0x2] @@ -597474,17 +577989,15 @@ _08123956: strb r0, [r1] b _08123ABE .align 2, 0 -_08123960: .4byte 0x0203a144 -_08123964: .4byte 0x02037318 -_08123968: .4byte 0x03005d8c + .pool _0812396C: - ldr r2, _081239BC + ldr r2, =0x02037318 ldrb r1, [r2, 0x1A] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _081239C8 - ldr r4, _081239C0 + ldr r4, =0x03005d8c ldr r1, [r4] adds r0, r1, 0 adds r0, 0x24 @@ -597501,7 +578014,7 @@ _0812396C: lsrs r1, 16 bl get_mapheader_by_bank_and_number adds r5, r0, 0 - ldr r0, _081239C4 + ldr r0, =0x0203a144 ldr r0, [r0] ldrb r1, [r5, 0x14] strh r1, [r0] @@ -597517,11 +578030,9 @@ _0812396C: ldrh r3, [r0, 0x2A] b _08123ABE .align 2, 0 -_081239BC: .4byte 0x02037318 -_081239C0: .4byte 0x03005d8c -_081239C4: .4byte 0x0203a144 + .pool _081239C8: - ldr r0, _081239E0 + ldr r0, =0x0203a144 ldr r0, [r0] ldrb r1, [r2, 0x14] strh r1, [r0] @@ -597534,9 +578045,9 @@ _081239C8: movs r3, 0x1 b _08123ABE .align 2, 0 -_081239E0: .4byte 0x0203a144 + .pool _081239E4: - ldr r4, _08123A20 + ldr r4, =0x03005d8c ldr r1, [r4] movs r0, 0x14 ldrsb r0, [r1, r0] @@ -597549,7 +578060,7 @@ _081239E4: lsrs r1, 16 bl get_mapheader_by_bank_and_number adds r5, r0, 0 - ldr r0, _08123A24 + ldr r0, =0x0203a144 ldr r0, [r0] ldrb r1, [r5, 0x14] strh r1, [r0] @@ -597565,17 +578076,16 @@ _081239E4: ldrh r3, [r0, 0x1A] b _08123ABE .align 2, 0 -_08123A20: .4byte 0x03005d8c -_08123A24: .4byte 0x0203a144 + .pool _08123A28: - ldr r4, _08123A58 + ldr r4, =0x0203a144 ldr r0, [r4] - ldr r1, _08123A5C + ldr r1, =0x02037318 ldrb r1, [r1, 0x14] strh r1, [r0] cmp r1, 0x57 beq _08123A64 - ldr r0, _08123A60 + ldr r0, =0x03005d8c ldr r0, [r0] adds r7, r0, 0 adds r7, 0x24 @@ -597591,11 +578101,9 @@ _08123A28: adds r5, r0, 0 b _08123A8A .align 2, 0 -_08123A58: .4byte 0x0203a144 -_08123A5C: .4byte 0x02037318 -_08123A60: .4byte 0x03005d8c + .pool _08123A64: - ldr r0, _08123AA4 + ldr r0, =0x03005d8c ldr r0, [r0] adds r7, r0, 0 adds r7, 0x14 @@ -597614,7 +578122,7 @@ _08123A64: ldrb r0, [r5, 0x14] strh r0, [r1] _08123A8A: - ldr r4, _08123AA8 + ldr r4, =0x0203a144 ldr r0, [r4] ldrb r0, [r0] bl sub_8123F74 @@ -597626,8 +578134,7 @@ _08123A8A: movs r1, 0x1 b _08123AB0 .align 2, 0 -_08123AA4: .4byte 0x03005d8c -_08123AA8: .4byte 0x0203a144 + .pool _08123AAC: ldr r0, [r4] adds r0, 0x7F @@ -597641,8 +578148,8 @@ _08123AB0: ldrh r3, [r7, 0x6] _08123ABE: str r6, [sp] - ldr r5, _08123B44 - ldr r4, _08123B48 + ldr r5, =0x085a147c + ldr r4, =0x0203a144 ldr r0, [r4] mov r10, r0 ldrh r7, [r0] @@ -597708,8 +578215,7 @@ _08123B32: beq _08123B94 b _08123BC6 .align 2, 0 -_08123B44: .4byte 0x085a147c -_08123B48: .4byte 0x0203a144 + .pool _08123B4C: cmp r7, 0x33 beq _08123B5E @@ -597723,7 +578229,7 @@ _08123B56: b _08123BC6 _08123B5E: movs r6, 0 - ldr r0, _08123B90 + ldr r0, =0x03005d8c ldr r1, [r0] movs r2, 0 ldrsh r0, [r1, r2] @@ -597751,7 +578257,7 @@ _08123B84: lsrs r3, r0, 16 b _08123BC6 .align 2, 0 -_08123B90: .4byte 0x03005d8c + .pool _08123B94: movs r6, 0 ldr r0, [sp] @@ -597781,7 +578287,7 @@ _08123BB8: bl sub_8123F30 b _08123BEC _08123BC6: - ldr r0, _08123BFC + ldr r0, =0x0203a144 ldr r2, [r0] ldrh r0, [r2] lsls r0, 3 @@ -597810,7 +578316,7 @@ _08123BEC: pop {r0} bx r0 .align 2, 0 -_08123BFC: .4byte 0x0203a144 + .pool thumb_func_end sub_81238AC thumb_func_start sub_8123C00 @@ -597840,12 +578346,12 @@ sub_8123C00: @ 8123C00 cmp r0, 0x4 bhi _08123C94 lsls r0, 2 - ldr r1, _08123C3C + ldr r1, =_08123C40 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08123C3C: .4byte _08123C40 + .pool .align 2, 0 _08123C40: .4byte _08123C94 @@ -597854,49 +578360,49 @@ _08123C40: .4byte _08123C74 .4byte _08123C84 _08123C54: - ldr r2, _08123C60 + ldr r2, =0x0203a144 ldr r1, [r2] movs r0, 0x8 strh r0, [r1] b _08123D10 .align 2, 0 -_08123C60: .4byte 0x0203a144 + .pool _08123C64: - ldr r2, _08123C70 + ldr r2, =0x0203a144 ldr r1, [r2] movs r0, 0xC strh r0, [r1] b _08123D10 .align 2, 0 -_08123C70: .4byte 0x0203a144 + .pool _08123C74: - ldr r2, _08123C80 + ldr r2, =0x0203a144 ldr r1, [r2] movs r0, 0x27 strh r0, [r1] b _08123D10 .align 2, 0 -_08123C80: .4byte 0x0203a144 + .pool _08123C84: - ldr r2, _08123C90 + ldr r2, =0x0203a144 ldr r1, [r2] movs r0, 0x2E strh r0, [r1] b _08123D10 .align 2, 0 -_08123C90: .4byte 0x0203a144 + .pool _08123C94: mov r0, sp ldrb r0, [r0] ldrb r1, [r4] bl get_mapheader_by_bank_and_number - ldr r1, _08123D50 + ldr r1, =0x0203a144 mov r9, r1 ldr r2, [r1] ldrb r1, [r0, 0x14] strh r1, [r2] ldr r6, [r0] - ldr r1, _08123D54 + ldr r1, =0x085a147c ldrh r0, [r2] lsls r0, 3 adds r5, r0, r1 @@ -597952,7 +578458,7 @@ _08123D10: movs r1, 0 strb r1, [r0] ldr r2, [r2] - ldr r3, _08123D54 + ldr r3, =0x085a147c ldrh r0, [r2] lsls r0, 3 adds r0, r3 @@ -597979,8 +578485,7 @@ _08123D10: pop {r0} bx r0 .align 2, 0 -_08123D50: .4byte 0x0203a144 -_08123D54: .4byte 0x085a147c + .pool thumb_func_end sub_8123C00 thumb_func_start get_flagnr_blue_points @@ -598052,81 +578557,81 @@ _08123DCC: movs r0, 0 b _08123E96 _08123DD0: - ldr r0, _08123DD4 + ldr r0, =0x0000086f b _08123E4A .align 2, 0 -_08123DD4: .4byte 0x0000086f + .pool _08123DD8: movs r0, 0x87 lsls r0, 4 b _08123E4A _08123DDE: - ldr r0, _08123DE4 + ldr r0, =0x00000871 b _08123E4A .align 2, 0 -_08123DE4: .4byte 0x00000871 + .pool _08123DE8: - ldr r0, _08123DEC + ldr r0, =0x00000872 b _08123E4A .align 2, 0 -_08123DEC: .4byte 0x00000872 + .pool _08123DF0: - ldr r0, _08123DF4 + ldr r0, =0x00000873 b _08123E4A .align 2, 0 -_08123DF4: .4byte 0x00000873 + .pool _08123DF8: - ldr r0, _08123DFC + ldr r0, =0x00000874 b _08123E4A .align 2, 0 -_08123DFC: .4byte 0x00000874 + .pool _08123E00: - ldr r0, _08123E04 + ldr r0, =0x00000875 b _08123E4A .align 2, 0 -_08123E04: .4byte 0x00000875 + .pool _08123E08: - ldr r0, _08123E0C + ldr r0, =0x00000876 b _08123E4A .align 2, 0 -_08123E0C: .4byte 0x00000876 + .pool _08123E10: - ldr r0, _08123E14 + ldr r0, =0x00000877 b _08123E4A .align 2, 0 -_08123E14: .4byte 0x00000877 + .pool _08123E18: - ldr r0, _08123E1C + ldr r0, =0x00000878 b _08123E4A .align 2, 0 -_08123E1C: .4byte 0x00000878 + .pool _08123E20: - ldr r0, _08123E24 + ldr r0, =0x00000879 b _08123E4A .align 2, 0 -_08123E24: .4byte 0x00000879 + .pool _08123E28: - ldr r0, _08123E2C + ldr r0, =0x0000087a b _08123E4A .align 2, 0 -_08123E2C: .4byte 0x0000087a + .pool _08123E30: - ldr r0, _08123E34 + ldr r0, =0x0000087b b _08123E4A .align 2, 0 -_08123E34: .4byte 0x0000087b + .pool _08123E38: - ldr r0, _08123E3C + ldr r0, =0x0000087c b _08123E4A .align 2, 0 -_08123E3C: .4byte 0x0000087c + .pool _08123E40: - ldr r0, _08123E44 + ldr r0, =0x0000087d b _08123E4A .align 2, 0 -_08123E44: .4byte 0x0000087d + .pool _08123E48: - ldr r0, _08123E5C + ldr r0, =0x0000087e _08123E4A: bl flag_check lsls r0, 24 @@ -598138,9 +578643,9 @@ _08123E58: adds r0, r1, 0 b _08123E96 .align 2, 0 -_08123E5C: .4byte 0x0000087e + .pool _08123E60: - ldr r0, _08123E78 + ldr r0, =0x000008a8 bl flag_check adds r1, r0, 0 lsls r1, 24 @@ -598152,9 +578657,9 @@ _08123E60: ands r0, r1 b _08123E96 .align 2, 0 -_08123E78: .4byte 0x000008a8 + .pool _08123E7C: - ldr r0, _08123E90 + ldr r0, =0x000008a9 bl flag_check adds r1, r0, 0 lsls r1, 24 @@ -598164,7 +578669,7 @@ _08123E7C: lsrs r0, 31 b _08123E96 .align 2, 0 -_08123E90: .4byte 0x000008a9 + .pool _08123E94: movs r0, 0x1 _08123E96: @@ -598192,7 +578697,7 @@ sub_8123EB4: @ 8123EB4 lsls r0, 16 lsrs r3, r0, 16 movs r2, 0 - ldr r1, _08123ED0 + ldr r1, =0x085a1b84 _08123EBE: ldrh r0, [r1] cmp r0, r3 @@ -598202,13 +578707,13 @@ _08123EBE: lsrs r0, 16 b _08123F00 .align 2, 0 -_08123ED0: .4byte 0x085a1b84 + .pool _08123ED4: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x2 bls _08123EBE - ldr r1, _08123EF0 + ldr r1, =0x085a1b24 ldrh r0, [r1] cmp r0, 0xD5 beq _08123EFE @@ -598220,7 +578725,7 @@ _08123EE6: ldrh r0, [r1, 0x2] b _08123F00 .align 2, 0 -_08123EF0: .4byte 0x085a1b24 + .pool _08123EF4: adds r1, 0x4 adds r2, 0x4 @@ -598237,7 +578742,7 @@ _08123F00: thumb_func_start sub_8123F04 sub_8123F04: @ 8123F04 push {lr} - ldr r0, _08123F28 + ldr r0, =0x00004037 bl var_get subs r0, 0x1 lsls r0, 16 @@ -598246,7 +578751,7 @@ sub_8123F04: @ 8123F04 bls _08123F18 movs r1, 0 _08123F18: - ldr r0, _08123F2C + ldr r0, =0x085a1b8a lsls r1, 16 asrs r1, 15 adds r1, r0 @@ -598254,8 +578759,7 @@ _08123F18: pop {r1} bx r1 .align 2, 0 -_08123F28: .4byte 0x00004037 -_08123F2C: .4byte 0x085a1b8a + .pool thumb_func_end sub_8123F04 thumb_func_start sub_8123F30 @@ -598263,11 +578767,11 @@ sub_8123F30: @ 8123F30 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _08123F68 + ldr r0, =0x00004037 bl var_get lsls r0, 16 lsrs r1, r0, 16 - ldr r2, _08123F6C + ldr r2, =0xfff70000 adds r0, r2 lsrs r0, 16 cmp r0, 0x7 @@ -598276,7 +578780,7 @@ sub_8123F30: @ 8123F30 _08123F4C: subs r1, 0x9 lsls r1, 16 - ldr r0, _08123F70 + ldr r0, =0x085a1bac lsrs r1, 14 adds r1, r0 ldrh r0, [r1] @@ -598289,9 +578793,7 @@ _08123F4C: pop {r0} bx r0 .align 2, 0 -_08123F68: .4byte 0x00004037 -_08123F6C: .4byte 0xfff70000 -_08123F70: .4byte 0x085a1bac + .pool thumb_func_end sub_8123F30 thumb_func_start sub_8123F74 @@ -598300,7 +578802,7 @@ sub_8123F74: @ 8123F74 lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _08123F8C + ldr r3, =0x085a1bcc _08123F7E: adds r0, r1, r3 ldrb r0, [r0] @@ -598309,7 +578811,7 @@ _08123F7E: movs r0, 0x1 b _08123F98 .align 2, 0 -_08123F8C: .4byte 0x085a1bcc + .pool _08123F90: adds r1, 0x1 cmp r1, 0 @@ -598335,7 +578837,7 @@ sub_8123F9C: @ 8123F9C thumb_func_start sub_8123FB0 sub_8123FB0: @ 8123FB0 push {r4-r6,lr} - ldr r0, _08123FC4 + ldr r0, =0x0203a144 ldr r1, [r0] ldrh r0, [r1] cmp r0, 0xD5 @@ -598344,7 +578846,7 @@ sub_8123FB0: @ 8123FB0 strb r0, [r1, 0x3] b _0812402E .align 2, 0 -_08123FC4: .4byte 0x0203a144 + .pool _08123FC8: adds r0, r1, 0 adds r0, 0x78 @@ -598370,7 +578872,7 @@ _08123FE6: adds r0, r4, 0 adds r1, r5, 0 bl sub_812386C - ldr r1, _08124024 + ldr r1, =0x0203a144 ldr r1, [r1] lsls r0, 16 lsrs r0, 16 @@ -598394,9 +578896,9 @@ _08124008: movs r4, 0x1D b _08124008 .align 2, 0 -_08124024: .4byte 0x0203a144 + .pool _08124028: - ldr r0, _08124034 + ldr r0, =0x0203a144 ldr r0, [r0] strb r6, [r0, 0x3] _0812402E: @@ -598404,23 +578906,22 @@ _0812402E: pop {r0} bx r0 .align 2, 0 -_08124034: .4byte 0x0203a144 + .pool thumb_func_end sub_8123FB0 thumb_func_start sub_8124038 sub_8124038: @ 8124038 push {r4,r5,lr} lsls r0, 16 - ldr r1, _0812404C + ldr r1, =0xffff0000 adds r0, r1 lsrs r5, r0, 16 - ldr r0, _08124050 + ldr r0, =0x0000ffff cmp r5, r0 bne _08124058 b _0812407A .align 2, 0 -_0812404C: .4byte 0xffff0000 -_08124050: .4byte 0x0000ffff + .pool _08124054: movs r0, 0x1 b _0812407C @@ -598430,7 +578931,7 @@ _0812405A: adds r0, r4, 0 adds r1, r5, 0 bl sub_812386C - ldr r1, _08124084 + ldr r1, =0x0203a144 ldr r1, [r1] lsls r0, 16 lsrs r0, 16 @@ -598449,14 +578950,14 @@ _0812407C: pop {r1} bx r1 .align 2, 0 -_08124084: .4byte 0x0203a144 + .pool thumb_func_end sub_8124038 thumb_func_start sub_8124088 sub_8124088: @ 8124088 push {r4,lr} adds r2, r0, 0 - ldr r0, _081240CC + ldr r0, =0x0203a144 ldr r1, [r0] adds r3, r1, 0 adds r3, 0x7A @@ -598490,7 +578991,7 @@ _081240C6: pop {r0} bx r0 .align 2, 0 -_081240CC: .4byte 0x0203a144 + .pool thumb_func_end sub_8124088 thumb_func_start nullsub_48 @@ -598505,13 +579006,13 @@ sub_81240D4: @ 81240D4 lsls r0, 16 lsls r1, 16 lsrs r6, r1, 16 - ldr r1, _08124144 + ldr r1, =0x085a1c00 ldr r2, [r1, 0x4] ldr r1, [r1] str r1, [sp, 0x20] str r2, [sp, 0x24] mov r2, sp - ldr r1, _08124148 + ldr r1, =0x085a1c08 ldm r1!, {r3-r5} stm r2!, {r3-r5} ldm r1!, {r3-r5} @@ -598523,12 +579024,12 @@ sub_81240D4: @ 81240D4 str r1, [r2, 0x4] mov r0, sp strh r3, [r0] - ldr r0, _0812414C + ldr r0, =0x0203a144 ldr r4, [r0] adds r0, r4, 0 adds r0, 0x58 strh r3, [r0] - ldr r5, _08124150 + ldr r5, =0xffff0000 add r1, sp, 0x20 ldr r0, [r1, 0x4] ands r0, r5 @@ -598554,14 +579055,10 @@ sub_81240D4: @ 81240D4 subs r1, 0x84 orrs r0, r1 str r0, [r2, 0x4] - ldr r0, _08124154 + ldr r0, =sub_8124088 + 1 b _0812416E .align 2, 0 -_08124144: .4byte 0x085a1c00 -_08124148: .4byte 0x085a1c08 -_0812414C: .4byte 0x0203a144 -_08124150: .4byte 0xffff0000 -_08124154: .4byte sub_8124088 + 1 + .pool _08124158: movs r3, 0xA1 lsls r3, 2 @@ -598573,7 +579070,7 @@ _08124158: lsls r1, 3 orrs r0, r1 str r0, [r2, 0x4] - ldr r0, _081241D0 + ldr r0, =nullsub_48 + 1 _0812416E: str r0, [sp, 0x14] adds r0, r2, 0 @@ -598589,12 +579086,12 @@ _0812416E: lsrs r1, r0, 24 cmp r1, 0x40 beq _08124228 - ldr r4, _081241D4 + ldr r4, =0x0203a144 ldr r2, [r4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081241D8 + ldr r1, =0x02020630 adds r3, r0, r1 str r3, [r2, 0x1C] adds r2, 0x78 @@ -598621,9 +579118,7 @@ _0812416E: bl obj_anim_image_start b _08124204 .align 2, 0 -_081241D0: .4byte nullsub_48 + 1 -_081241D4: .4byte 0x0203a144 -_081241D8: .4byte 0x02020630 + .pool _081241DC: ldrb r1, [r3, 0x3] movs r0, 0x3F @@ -598646,7 +579141,7 @@ _081241DC: adds r0, 0x4 strh r0, [r2, 0x22] _08124204: - ldr r4, _08124230 + ldr r4, =0x0203a144 ldr r0, [r4] ldr r1, [r0, 0x1C] movs r0, 0x2 @@ -598657,7 +579152,7 @@ _08124204: ldr r2, [r1, 0x1C] lsls r0, 24 lsrs r0, 20 - ldr r4, _08124234 + ldr r4, =0x00000101 adds r0, r4 strh r0, [r2, 0x32] ldr r1, [r1, 0x1C] @@ -598669,14 +579164,13 @@ _08124228: pop {r0} bx r0 .align 2, 0 -_08124230: .4byte 0x0203a144 -_08124234: .4byte 0x00000101 + .pool thumb_func_end sub_81240D4 thumb_func_start sub_8124238 sub_8124238: @ 8124238 push {r4,lr} - ldr r4, _08124264 + ldr r4, =0x0203a144 ldr r0, [r4] ldr r0, [r0, 0x1C] cmp r0, 0 @@ -598695,31 +579189,31 @@ _0812425C: pop {r0} bx r0 .align 2, 0 -_08124264: .4byte 0x0203a144 + .pool thumb_func_end sub_8124238 thumb_func_start sub_8124268 sub_8124268: @ 8124268 - ldr r0, _08124274 + ldr r0, =0x0203a144 ldr r0, [r0] ldr r1, [r0, 0x1C] movs r0, 0x1 strh r0, [r1, 0x34] bx lr .align 2, 0 -_08124274: .4byte 0x0203a144 + .pool thumb_func_end sub_8124268 thumb_func_start sub_8124278 sub_8124278: @ 8124278 - ldr r0, _08124284 + ldr r0, =0x0203a144 ldr r0, [r0] ldr r1, [r0, 0x1C] movs r0, 0 strh r0, [r1, 0x34] bx lr .align 2, 0 -_08124284: .4byte 0x0203a144 + .pool thumb_func_end sub_8124278 thumb_func_start sub_8124288 @@ -598729,16 +579223,16 @@ sub_8124288: @ 8124288 lsls r0, 16 lsls r1, 16 lsrs r1, 16 - ldr r2, _081242E0 + ldr r2, =0x085a084c str r2, [sp, 0x18] movs r2, 0x80 add r6, sp, 0x18 lsrs r3, r0, 16 orrs r0, r2 str r0, [r6, 0x4] - ldr r0, _081242E4 + ldr r0, =0x085a082c str r0, [sp, 0x20] - ldr r2, _081242E8 + ldr r2, =0xffff0000 add r4, sp, 0x20 ldr r0, [r4, 0x4] ands r0, r2 @@ -598748,43 +579242,35 @@ sub_8124288: @ 8124288 movs r5, 0 strh r3, [r0] strh r1, [r0, 0x2] - ldr r0, _081242EC + ldr r0, =0x085a1c20 str r0, [sp, 0x4] - ldr r0, _081242F0 + ldr r0, =0x085a1c30 str r0, [sp, 0x8] str r5, [sp, 0xC] - ldr r0, _081242F4 + ldr r0, =0x082ec6a8 str r0, [sp, 0x10] - ldr r0, _081242F8 + ldr r0, =nullsub_12 + 1 str r0, [sp, 0x14] - ldr r0, _081242FC + ldr r0, =0x02037318 ldrb r0, [r0, 0x14] bl sub_8124668 cmp r0, 0 beq _08124304 - ldr r0, _08124300 + ldr r0, =0x0203a144 ldr r0, [r0] str r5, [r0, 0x20] b _081243A4 .align 2, 0 -_081242E0: .4byte 0x085a084c -_081242E4: .4byte 0x085a082c -_081242E8: .4byte 0xffff0000 -_081242EC: .4byte 0x085a1c20 -_081242F0: .4byte 0x085a1c30 -_081242F4: .4byte 0x082ec6a8 -_081242F8: .4byte nullsub_12 + 1 -_081242FC: .4byte 0x02037318 -_08124300: .4byte 0x0203a144 + .pool _08124304: - ldr r0, _0812436C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0x1 bne _08124316 - ldr r0, _08124370 + ldr r0, =0x085a08ec str r0, [sp, 0x18] - ldr r0, _08124374 + ldr r0, =0x085a08cc str r0, [sp, 0x20] _08124316: adds r0, r6, 0 @@ -598798,12 +579284,12 @@ _08124316: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _08124378 + ldr r1, =0x0203a144 ldr r2, [r1] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0812437C + ldr r0, =0x02020630 adds r1, r0 str r1, [r2, 0x20] adds r0, r2, 0 @@ -598825,15 +579311,10 @@ _08124316: adds r0, 0x4 strh r0, [r1, 0x22] ldr r1, [r2, 0x20] - ldr r0, _08124380 + ldr r0, =sub_81244EC + 1 b _081243A2 .align 2, 0 -_0812436C: .4byte 0x03005d90 -_08124370: .4byte 0x085a08ec -_08124374: .4byte 0x085a08cc -_08124378: .4byte 0x0203a144 -_0812437C: .4byte 0x02020630 -_08124380: .4byte sub_81244EC + 1 + .pool _08124384: adds r0, r2, 0 adds r0, 0x74 @@ -598849,7 +579330,7 @@ _08124384: subs r0, 0x42 strh r0, [r1, 0x22] ldr r1, [r2, 0x20] - ldr r0, _081243AC + ldr r0, =sub_812445C + 1 _081243A2: str r0, [r1, 0x1C] _081243A4: @@ -598858,13 +579339,13 @@ _081243A4: pop {r0} bx r0 .align 2, 0 -_081243AC: .4byte sub_812445C + 1 + .pool thumb_func_end sub_8124288 thumb_func_start sub_81243B0 sub_81243B0: @ 81243B0 push {lr} - ldr r3, _081243D4 + ldr r3, =0x0203a144 ldr r0, [r3] ldr r2, [r0, 0x20] cmp r2, 0 @@ -598876,20 +579357,19 @@ sub_81243B0: @ 81243B0 strb r0, [r2] ldr r0, [r3] ldr r1, [r0, 0x20] - ldr r0, _081243D8 + ldr r0, =nullsub_12 + 1 str r0, [r1, 0x1C] _081243CE: pop {r0} bx r0 .align 2, 0 -_081243D4: .4byte 0x0203a144 -_081243D8: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81243B0 thumb_func_start sub_81243DC sub_81243DC: @ 81243DC push {lr} - ldr r0, _08124414 + ldr r0, =0x0203a144 ldr r3, [r0] ldr r1, [r3, 0x20] cmp r1, 0 @@ -598913,11 +579393,10 @@ sub_81243DC: @ 81243DC subs r0, 0x42 strh r0, [r1, 0x22] ldr r1, [r3, 0x20] - ldr r0, _08124418 + ldr r0, =sub_812445C + 1 b _08124444 .align 2, 0 -_08124414: .4byte 0x0203a144 -_08124418: .4byte sub_812445C + 1 + .pool _0812441C: adds r0, r3, 0 adds r0, 0x74 @@ -598938,7 +579417,7 @@ _0812441C: ldr r0, [r3, 0x20] strh r2, [r0, 0x26] ldr r1, [r3, 0x20] - ldr r0, _08124458 + ldr r0, =sub_81244EC + 1 _08124444: str r0, [r1, 0x1C] adds r1, 0x3E @@ -598951,14 +579430,14 @@ _08124452: pop {r0} bx r0 .align 2, 0 -_08124458: .4byte sub_81244EC + 1 + .pool thumb_func_end sub_81243DC thumb_func_start sub_812445C sub_812445C: @ 812445C push {r4,lr} adds r3, r0, 0 - ldr r0, _081244C0 + ldr r0, =0x0203a144 ldr r1, [r0] adds r0, r1, 0 adds r0, 0x5C @@ -599008,7 +579487,7 @@ _081244BC: movs r0, 0 b _081244C6 .align 2, 0 -_081244C0: .4byte 0x0203a144 + .pool _081244C4: movs r0, 0x1 _081244C6: @@ -599045,7 +579524,7 @@ sub_81244EC: @ 81244EC sub_81244F8: @ 81244F8 push {lr} adds r2, r0, 0 - ldr r0, _08124538 + ldr r0, =0x0203a144 ldr r0, [r0] adds r0, 0x7E ldrb r0, [r0] @@ -599075,7 +579554,7 @@ sub_81244F8: @ 81244F8 strb r0, [r3] b _08124548 .align 2, 0 -_08124538: .4byte 0x0203a144 + .pool _0812453C: adds r2, 0x3E ldrb r1, [r2] @@ -599091,7 +579570,7 @@ _08124548: thumb_func_start sub_812454C sub_812454C: @ 812454C push {lr} - ldr r0, _08124568 + ldr r0, =0x0203a144 ldr r1, [r0] adds r0, r1, 0 adds r0, 0x7F @@ -599105,7 +579584,7 @@ _08124562: pop {r0} bx r0 .align 2, 0 -_08124568: .4byte 0x0203a144 + .pool thumb_func_end sub_812454C thumb_func_start GetMapName @@ -599124,7 +579603,7 @@ GetMapName: @ 812456C _08124584: cmp r1, 0xD4 bhi _081245A0 - ldr r0, _0812459C + ldr r0, =0x085a147c lsls r1, 3 adds r0, 0x4 adds r1, r0 @@ -599134,7 +579613,7 @@ _08124584: adds r1, r0, 0 b _081245B2 .align 2, 0 -_0812459C: .4byte 0x085a147c + .pool _081245A0: cmp r4, 0 bne _081245A6 @@ -599182,17 +579661,17 @@ sub_81245DC: @ 81245DC beq _081245F8 cmp r1, 0x57 bne _08124604 - ldr r1, _081245F4 + ldr r1, =0x085ec9d2 bl gf_strcpy b _0812460A .align 2, 0 -_081245F4: .4byte 0x085ec9d2 + .pool _081245F8: - ldr r1, _08124600 + ldr r1, =0x085ec9d8 bl gf_strcpy b _0812460A .align 2, 0 -_08124600: .4byte 0x085ec9d8 + .pool _08124604: movs r2, 0 bl GetMapName @@ -599211,13 +579690,13 @@ sub_8124610: @ 8124610 bl sub_81245DC b _08124626 _08124620: - ldr r1, _0812462C + ldr r1, =0x085ec9e4 bl gf_strcpy _08124626: pop {r1} bx r1 .align 2, 0 -_0812462C: .4byte 0x085ec9e4 + .pool thumb_func_end sub_8124610 thumb_func_start sub_8124630 @@ -599225,7 +579704,7 @@ sub_8124630: @ 8124630 push {r4,r5,lr} ldr r5, [sp, 0xC] lsls r0, 16 - ldr r4, _08124654 + ldr r4, =0x085a147c lsrs r0, 13 adds r0, r4 ldrb r4, [r0] @@ -599240,18 +579719,18 @@ sub_8124630: @ 8124630 pop {r0} bx r0 .align 2, 0 -_08124654: .4byte 0x085a147c + .pool thumb_func_end sub_8124630 thumb_func_start sub_8124658 sub_8124658: @ 8124658 - ldr r0, _08124664 + ldr r0, =0x0203a144 ldr r0, [r0] adds r0, 0x78 ldrb r0, [r0] bx lr .align 2, 0 -_08124664: .4byte 0x0203a144 + .pool thumb_func_end sub_8124658 thumb_func_start sub_8124668 @@ -599260,7 +579739,7 @@ sub_8124668: @ 8124668 lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _08124680 + ldr r3, =0x085a1c34 _08124672: adds r0, r1, r3 ldrb r0, [r0] @@ -599269,7 +579748,7 @@ _08124672: movs r0, 0x1 b _0812468C .align 2, 0 -_08124680: .4byte 0x085a1c34 + .pool _08124684: adds r1, 0x1 cmp r1, 0x2 @@ -599284,7 +579763,7 @@ _0812468C: sub_8124690: @ 8124690 push {r4,lr} sub sp, 0xC - ldr r0, _081246B0 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -599294,13 +579773,12 @@ sub_8124690: @ 8124690 b _081248AA _081246A4: lsls r0, 2 - ldr r1, _081246B4 + ldr r1, =_081246B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081246B0: .4byte 0x030022c0 -_081246B4: .4byte _081246B8 + .pool .align 2, 0 _081246B8: .4byte _081246E4 @@ -599344,19 +579822,17 @@ _081246E4: movs r0, 0x1E movs r1, 0 bl lcd_io_set - ldr r4, _08124748 - ldr r0, _0812474C + ldr r4, =0x0203a148 + ldr r0, =0x00000a74 bl malloc str r0, [r4] cmp r0, 0 bne _08124754 - ldr r0, _08124750 + ldr r0, =sub_8086194 + 1 bl set_callback2 b _081248AA .align 2, 0 -_08124748: .4byte 0x0203a148 -_0812474C: .4byte 0x00000a74 -_08124750: .4byte sub_8086194 + 1 + .pool _08124754: bl sub_80A1A74 bl reset_all_obj_data @@ -599366,20 +579842,20 @@ _08124754: _08124766: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08124778 + ldr r1, =0x085a1ee4 movs r0, 0x1 movs r2, 0x3 bl bg_vram_setup b _0812489C .align 2, 0 -_08124778: .4byte 0x085a1ee4 + .pool _0812477C: - ldr r0, _08124788 + ldr r0, =0x085a1ef0 bl Window_InitFromTemplates bl TextBox_ResetSomeField b _0812489C .align 2, 0 -_08124788: .4byte 0x085a1ef0 + .pool _0812478C: movs r0, 0 movs r1, 0x65 @@ -599388,7 +579864,7 @@ _0812478C: bl clear_scheduled_bg_copies_to_vram b _0812489C _0812479C: - ldr r4, _081247D8 + ldr r4, =0x0203a148 ldr r0, [r4] adds r0, 0x8 movs r1, 0 @@ -599402,38 +579878,34 @@ _0812479C: ldr r0, [r4] ldrh r1, [r0, 0x8] strh r1, [r0, 0x6] - ldr r1, _081247DC + ldr r1, =0x00000a4c adds r0, r1 movs r1, 0 movs r2, 0x10 bl sub_80090FC - ldr r1, _081247E0 + ldr r1, =0x03001180 movs r0, 0x1 str r0, [r1] bl sub_8124904 b _0812489C .align 2, 0 -_081247D8: .4byte 0x0203a148 -_081247DC: .4byte 0x00000a4c -_081247E0: .4byte 0x03001180 + .pool _081247E4: - ldr r0, _081247F0 - ldr r1, _081247F4 + ldr r0, =0x085a1c58 + ldr r1, =0x0600c000 bl LZ77UnCompVram b _0812489C .align 2, 0 -_081247F0: .4byte 0x085a1c58 -_081247F4: .4byte 0x0600c000 + .pool _081247F8: - ldr r0, _08124804 - ldr r1, _08124808 + ldr r0, =0x085a1c90 + ldr r1, =0x0600f000 bl LZ77UnCompVram b _0812489C .align 2, 0 -_08124804: .4byte 0x085a1c90 -_08124808: .4byte 0x0600f000 + .pool _0812480C: - ldr r0, _08124844 + ldr r0, =0x085a1c38 movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply @@ -599442,7 +579914,7 @@ _0812480C: movs r0, 0x2 movs r1, 0 bl Window_FastFillPixels - ldr r2, _08124848 + ldr r2, =0x085e8cb4 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -599456,8 +579928,7 @@ _0812480C: bl schedule_bg_copy_tilemap_to_vram b _0812489C .align 2, 0 -_08124844: .4byte 0x085a1c38 -_08124848: .4byte 0x085e8cb4 + .pool _0812484C: bl sub_8124A70 b _0812489C @@ -599467,11 +579938,11 @@ _08124852: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, _08124868 + ldr r0, =sub_81248C0 + 1 bl SetVBlankCallback b _0812489C .align 2, 0 -_08124868: .4byte sub_81248C0 + 1 + .pool _0812486C: movs r0, 0x50 movs r1, 0 @@ -599486,12 +579957,12 @@ _0812486C: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - ldr r0, _081248B4 + ldr r0, =sub_8124D14 + 1 bl sub_81248F4 - ldr r0, _081248B8 + ldr r0, =sub_81248D4 + 1 bl set_callback2 _0812489C: - ldr r1, _081248BC + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -599504,9 +579975,7 @@ _081248AA: pop {r0} bx r0 .align 2, 0 -_081248B4: .4byte sub_8124D14 + 1 -_081248B8: .4byte sub_81248D4 + 1 -_081248BC: .4byte 0x030022c0 + .pool thumb_func_end sub_8124690 thumb_func_start sub_81248C0 @@ -599522,7 +579991,7 @@ sub_81248C0: @ 81248C0 thumb_func_start sub_81248D4 sub_81248D4: @ 81248D4 push {lr} - ldr r0, _081248F0 + ldr r0, =0x0203a148 ldr r0, [r0] ldr r0, [r0] bl _call_via_r0 @@ -599532,26 +580001,26 @@ sub_81248D4: @ 81248D4 pop {r0} bx r0 .align 2, 0 -_081248F0: .4byte 0x0203a148 + .pool thumb_func_end sub_81248D4 thumb_func_start sub_81248F4 sub_81248F4: @ 81248F4 - ldr r1, _08124900 + ldr r1, =0x0203a148 ldr r1, [r1] str r0, [r1] movs r0, 0 strh r0, [r1, 0x4] bx lr .align 2, 0 -_08124900: .4byte 0x0203a148 + .pool thumb_func_end sub_81248F4 thumb_func_start sub_8124904 sub_8124904: @ 8124904 push {r4-r7,lr} sub sp, 0xC - ldr r2, _081249B8 + ldr r2, =0x0203a148 ldr r0, [r2] ldrb r0, [r0, 0xA] subs r0, 0x1 @@ -599563,7 +580032,7 @@ sub_8124904: @ 8124904 _0812491A: movs r7, 0 movs r3, 0 - ldr r0, _081249BC + ldr r0, =0x085a1edc mov r12, r0 adds r5, r2, 0 movs r6, 0 @@ -599629,13 +580098,11 @@ _08124926: bl Print movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _081249C0 + ldr r0, =0x03001180 str r7, [r0] b _081249CE .align 2, 0 -_081249B8: .4byte 0x0203a148 -_081249BC: .4byte 0x085a1edc -_081249C0: .4byte 0x03001180 + .pool _081249C4: adds r0, r3, 0x1 lsls r0, 16 @@ -599645,7 +580112,7 @@ _081249C4: _081249CE: cmp r7, 0 bne _08124A62 - ldr r0, _081249F0 + ldr r0, =0x03001180 ldr r0, [r0] cmp r0, 0x1 bne _081249F4 @@ -599659,13 +580126,13 @@ _081249CE: bl SetWindowBorderStyle b _081249FC .align 2, 0 -_081249F0: .4byte 0x03001180 + .pool _081249F4: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels _081249FC: - ldr r0, _08124A24 + ldr r0, =0x0203a148 ldr r2, [r0] adds r2, 0xC movs r0, 0x1 @@ -599679,14 +580146,13 @@ _081249FC: bl Print movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _08124A28 + ldr r0, =0x03001180 str r4, [r0] b _08124A62 .align 2, 0 -_08124A24: .4byte 0x0203a148 -_08124A28: .4byte 0x03001180 + .pool _08124A2C: - ldr r4, _08124A6C + ldr r4, =0x03001180 ldr r0, [r4] cmp r0, 0x1 bne _08124A48 @@ -599715,29 +580181,29 @@ _08124A62: pop {r0} bx r0 .align 2, 0 -_08124A6C: .4byte 0x03001180 + .pool thumb_func_end sub_8124904 thumb_func_start sub_8124A70 sub_8124A70: @ 8124A70 push {r4,r5,lr} sub sp, 0x8 - ldr r0, _08124ABC - ldr r5, _08124AC0 + ldr r0, =0x085a1d68 + ldr r5, =0x0203a148 ldr r1, [r5] - ldr r4, _08124AC4 + ldr r4, =0x0000088c adds r1, r4 bl LZ77UnCompWram ldr r0, [r5] adds r0, r4 str r0, [sp] - ldr r1, _08124AC8 + ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 movs r1, 0xE0 lsls r1, 1 orrs r0, r1 - ldr r1, _08124ACC + ldr r1, =0x0000ffff ands r0, r1 movs r1, 0x80 lsls r1, 10 @@ -599745,7 +580211,7 @@ sub_8124A70: @ 8124A70 str r0, [sp, 0x4] mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _08124AD0 + ldr r0, =0x085a1f10 bl gpu_pal_obj_alloc_tag_and_apply bl sub_8124AD4 bl sub_8124BE4 @@ -599754,12 +580220,7 @@ sub_8124A70: @ 8124A70 pop {r0} bx r0 .align 2, 0 -_08124ABC: .4byte 0x085a1d68 -_08124AC0: .4byte 0x0203a148 -_08124AC4: .4byte 0x0000088c -_08124AC8: .4byte 0xffff0000 -_08124ACC: .4byte 0x0000ffff -_08124AD0: .4byte 0x085a1f10 + .pool thumb_func_end sub_8124A70 thumb_func_start sub_8124AD4 @@ -599770,7 +580231,7 @@ sub_8124AD4: @ 8124AD4 mov r5, r8 push {r5-r7} sub sp, 0x1C - ldr r0, _08124B34 + ldr r0, =0x0000086f str r0, [sp, 0xC] movs r1, 0 mov r9, r1 @@ -599813,7 +580274,7 @@ _08124AFE: movs r7, 0x1 b _08124B44 .align 2, 0 -_08124B34: .4byte 0x0000086f + .pool _08124B38: ldr r3, [sp, 0x18] ldrh r0, [r3] @@ -599828,14 +580289,14 @@ _08124B44: ldr r3, [sp, 0x14] movs r0, 0 ldrsh r2, [r3, r0] - ldr r0, _08124B90 + ldr r0, =0x085a1f7c movs r3, 0xA bl obj_add_from_template_forward_search lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 beq _08124BB8 - ldr r1, _08124B94 + ldr r1, =0x02020630 mov r8, r1 lsls r4, r5, 4 adds r0, r4, r5 @@ -599855,13 +580316,11 @@ _08124B44: mov r0, r8 adds r0, 0x1C adds r0, r6, r0 - ldr r1, _08124B98 + ldr r1, =sub_8124CBC + 1 str r1, [r0] b _08124BA2 .align 2, 0 -_08124B90: .4byte 0x085a1f7c -_08124B94: .4byte 0x02020630 -_08124B98: .4byte sub_8124CBC + 1 + .pool _08124B9C: adds r0, r7, 0x3 lsls r0, 16 @@ -599869,7 +580328,7 @@ _08124B9C: _08124BA2: adds r4, r5 lsls r4, 2 - ldr r0, _08124BE0 + ldr r0, =0x02020630 adds r4, r0 lsls r1, r7, 24 lsrs r1, 24 @@ -599899,7 +580358,7 @@ _08124BB8: pop {r0} bx r0 .align 2, 0 -_08124BE0: .4byte 0x02020630 + .pool thumb_func_end sub_8124AD4 thumb_func_start sub_8124BE4 @@ -599912,14 +580371,14 @@ sub_8124BE4: @ 8124BE4 sub sp, 0xC movs r0, 0 mov r8, r0 - ldr r6, _08124CAC + ldr r6, =0x085a1f18 ldrh r0, [r6, 0x2] cmp r0, 0xD5 beq _08124C9C mov r5, sp adds r5, 0x6 add r7, sp, 0x4 - ldr r1, _08124CB0 + ldr r1, =0x02020630 mov r9, r1 movs r0, 0x1C add r0, r9 @@ -599956,7 +580415,7 @@ _08124C0C: ldrsh r1, [r7, r0] movs r0, 0 ldrsh r2, [r5, r0] - ldr r0, _08124CB4 + ldr r0, =0x085a1f7c movs r3, 0xA bl obj_add_from_template_forward_search lsls r0, 24 @@ -599975,7 +580434,7 @@ _08124C0C: orrs r0, r1 strb r0, [r4, 0x3] add r2, r10 - ldr r0, _08124CB8 + ldr r0, =sub_8124CBC + 1 str r0, [r2] adds r0, r4, 0 movs r1, 0x6 @@ -599987,7 +580446,7 @@ _08124C84: lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r6, _08124CAC + ldr r6, =0x085a1f18 lsls r0, 2 adds r1, r6, 0x2 adds r0, r1 @@ -600004,17 +580463,14 @@ _08124C9C: pop {r0} bx r0 .align 2, 0 -_08124CAC: .4byte 0x085a1f18 -_08124CB0: .4byte 0x02020630 -_08124CB4: .4byte 0x085a1f7c -_08124CB8: .4byte sub_8124CBC + 1 + .pool thumb_func_end sub_8124BE4 thumb_func_start sub_8124CBC sub_8124CBC: @ 8124CBC push {lr} adds r2, r0, 0 - ldr r0, _08124CFC + ldr r0, =0x0203a148 ldr r0, [r0] ldrh r1, [r0, 0x8] movs r3, 0x2E @@ -600045,7 +580501,7 @@ sub_8124CBC: @ 8124CBC strb r0, [r3] b _08124D0E .align 2, 0 -_08124CFC: .4byte 0x0203a148 + .pool _08124D00: movs r0, 0x10 strh r0, [r2, 0x30] @@ -600063,7 +580519,7 @@ _08124D0E: sub_8124D14: @ 8124D14 push {r4,lr} sub sp, 0x4 - ldr r4, _08124D28 + ldr r4, =0x0203a148 ldr r0, [r4] ldrh r1, [r0, 0x4] cmp r1, 0 @@ -600072,7 +580528,7 @@ sub_8124D14: @ 8124D14 beq _08124D46 b _08124D56 .align 2, 0 -_08124D28: .4byte 0x0203a148 + .pool _08124D2C: movs r0, 0x1 negs r0, r0 @@ -600091,7 +580547,7 @@ _08124D46: lsls r0, 24 cmp r0, 0 bne _08124D56 - ldr r0, _08124D60 + ldr r0, =sub_8124D64 + 1 bl sub_81248F4 _08124D56: add sp, 0x4 @@ -600099,13 +580555,13 @@ _08124D56: pop {r0} bx r0 .align 2, 0 -_08124D60: .4byte sub_8124D64 + 1 + .pool thumb_func_end sub_8124D14 thumb_func_start sub_8124D64 sub_8124D64: @ 8124D64 push {r4,lr} - ldr r0, _08124D88 + ldr r0, =0x0203a148 ldr r0, [r0] ldrh r0, [r0, 0x4] cmp r0, 0 @@ -600116,13 +580572,12 @@ sub_8124D64: @ 8124D64 cmp r0, 0x5 bhi _08124DF8 lsls r0, 2 - ldr r1, _08124D8C + ldr r1, =_08124D90 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08124D88: .4byte 0x0203a148 -_08124D8C: .4byte _08124D90 + .pool .align 2, 0 _08124D90: .4byte _08124DF8 @@ -600135,7 +580590,7 @@ _08124DA8: bl sub_8124904 b _08124DF8 _08124DAE: - ldr r4, _08124DD4 + ldr r4, =0x0203a148 ldr r0, [r4] ldrb r0, [r0, 0xA] cmp r0, 0x2 @@ -600146,43 +580601,39 @@ _08124DBC: movs r0, 0x5 bl m4aSongNumStart ldr r0, [r4] - ldr r1, _08124DD8 + ldr r1, =0x00000a72 adds r0, r1 movs r1, 0x1 strb r1, [r0] - ldr r0, _08124DDC + ldr r0, =sub_8124E0C + 1 bl sub_81248F4 b _08124DF8 .align 2, 0 -_08124DD4: .4byte 0x0203a148 -_08124DD8: .4byte 0x00000a72 -_08124DDC: .4byte sub_8124E0C + 1 + .pool _08124DE0: movs r0, 0x5 bl m4aSongNumStart - ldr r0, _08124E00 + ldr r0, =0x0203a148 ldr r0, [r0] - ldr r1, _08124E04 + ldr r1, =0x00000a72 adds r0, r1 movs r1, 0 strb r1, [r0] - ldr r0, _08124E08 + ldr r0, =sub_8124E0C + 1 bl sub_81248F4 _08124DF8: pop {r4} pop {r0} bx r0 .align 2, 0 -_08124E00: .4byte 0x0203a148 -_08124E04: .4byte 0x00000a72 -_08124E08: .4byte sub_8124E0C + 1 + .pool thumb_func_end sub_8124D64 thumb_func_start sub_8124E0C sub_8124E0C: @ 8124E0C push {r4,lr} sub sp, 0x4 - ldr r4, _08124E20 + ldr r4, =0x0203a148 ldr r0, [r4] ldrh r1, [r0, 0x4] cmp r1, 0 @@ -600191,7 +580642,7 @@ sub_8124E0C: @ 8124E0C beq _08124E3E b _08124F1A .align 2, 0 -_08124E20: .4byte 0x0203a148 + .pool _08124E24: movs r0, 0x1 negs r0, r0 @@ -600212,7 +580663,7 @@ _08124E3E: bne _08124F1A bl sub_812305C ldr r1, [r4] - ldr r2, _08124E68 + ldr r2, =0x00000a72 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 @@ -600226,7 +580677,7 @@ _08124E3E: beq _08124E84 b _08124EBC .align 2, 0 -_08124E68: .4byte 0x00000a72 + .pool _08124E6C: cmp r0, 0x3A beq _08124E7C @@ -600240,7 +580691,7 @@ _08124E7C: bl sub_8084CCC b _08124EFA _08124E84: - ldr r0, _08124E94 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] movs r1, 0xD @@ -600249,9 +580700,9 @@ _08124E84: movs r1, 0xC b _08124EB0 .align 2, 0 -_08124E94: .4byte 0x03005d90 + .pool _08124E98: - ldr r0, _08124EB8 + ldr r0, =0x000008b4 bl flag_check lsls r0, 24 movs r1, 0xB @@ -600267,10 +580718,10 @@ _08124EB0: bl sub_8084CCC b _08124EFA .align 2, 0 -_08124EB8: .4byte 0x000008b4 + .pool _08124EBC: - ldr r3, _08124ED8 - ldr r0, _08124EDC + ldr r3, =0x085a1e3c + ldr r0, =0x0203a148 ldr r0, [r0] ldrh r1, [r0, 0x8] lsls r0, r1, 1 @@ -600283,8 +580734,7 @@ _08124EBC: bl sub_8084CCC b _08124EFA .align 2, 0 -_08124ED8: .4byte 0x085a1e3c -_08124EDC: .4byte 0x0203a148 + .pool _08124EE0: adds r0, r2, r3 ldrb r0, [r0] @@ -600302,10 +580752,10 @@ _08124EFA: bl sub_80B69DC b _08124F06 _08124F00: - ldr r0, _08124F24 + ldr r0, =sub_81B58A8 + 1 bl set_callback2 _08124F06: - ldr r4, _08124F28 + ldr r4, =0x0203a148 ldr r0, [r4] cmp r0, 0 beq _08124F16 @@ -600320,35 +580770,34 @@ _08124F1A: pop {r0} bx r0 .align 2, 0 -_08124F24: .4byte sub_81B58A8 + 1 -_08124F28: .4byte 0x0203a148 + .pool thumb_func_end sub_8124E0C thumb_func_start sub_8124F2C sub_8124F2C: @ 8124F2C push {lr} - ldr r2, _08124F74 + ldr r2, =0x03006168 ldr r1, [r0, 0x4] str r1, [r2] - ldr r2, _08124F78 + ldr r2, =0x0300617c ldrb r1, [r0, 0x1F] strb r1, [r2] - ldr r2, _08124F7C + ldr r2, =0x03006164 ldrb r1, [r0, 0x19] strb r1, [r2] - ldr r2, _08124F80 + ldr r2, =0x03006178 ldrb r1, [r0, 0x1A] strb r1, [r2] - ldr r2, _08124F84 + ldr r2, =0x03006174 ldrb r1, [r0, 0x1B] strb r1, [r2] - ldr r2, _08124F88 + ldr r2, =0x0300616c ldrb r1, [r0, 0x1C] strb r1, [r2] - ldr r2, _08124F8C + ldr r2, =0x03006180 ldrb r1, [r0, 0x1D] strb r1, [r2] - ldr r2, _08124F90 + ldr r2, =0x03006170 ldrb r1, [r0, 0x1E] strb r1, [r2] ldrb r0, [r0] @@ -600358,20 +580807,12 @@ sub_8124F2C: @ 8124F2C b _081250B4 _08124F68: lsls r0, 2 - ldr r1, _08124F94 + ldr r1, =_08124F98 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08124F74: .4byte 0x03006168 -_08124F78: .4byte 0x0300617c -_08124F7C: .4byte 0x03006164 -_08124F80: .4byte 0x03006178 -_08124F84: .4byte 0x03006174 -_08124F88: .4byte 0x0300616c -_08124F8C: .4byte 0x03006180 -_08124F90: .4byte 0x03006170 -_08124F94: .4byte _08124F98 + .pool .align 2, 0 _08124F98: .4byte _08125024 @@ -600417,12 +580858,12 @@ _0812502A: b _081250B4 _08125030: bl sub_81254E0 - ldr r0, _08125040 + ldr r0, =0x0300617c ldrb r0, [r0] bl sub_81253A4 b _081250B4 .align 2, 0 -_08125040: .4byte 0x0300617c + .pool _08125044: bl sub_81254E0 bl sub_8125630 @@ -600480,26 +580921,26 @@ sub_81250B8: @ 81250B8 lsls r0, 24 lsrs r7, r0, 24 movs r2, 0 - ldr r0, _08125158 + ldr r0, =0x0300616c mov r8, r0 ldrb r0, [r0] cmp r2, r0 bcs _0812514A - ldr r1, _0812515C + ldr r1, =0x03006174 mov r12, r1 - ldr r3, _08125160 + ldr r3, =0x03006180 mov r10, r3 - ldr r0, _08125164 + ldr r0, =0x03006164 mov r9, r0 _081250DE: - ldr r1, _08125168 + ldr r1, =0x03006178 ldrb r0, [r1] adds r0, r2 mov r3, r10 ldrb r1, [r3] muls r0, r1 lsls r0, 1 - ldr r3, _0812516C + ldr r3, =0x03006168 ldr r1, [r3] adds r1, r0 mov r3, r9 @@ -600559,12 +581000,7 @@ _0812514A: pop {r0} bx r0 .align 2, 0 -_08125158: .4byte 0x0300616c -_0812515C: .4byte 0x03006174 -_08125160: .4byte 0x03006180 -_08125164: .4byte 0x03006164 -_08125168: .4byte 0x03006178 -_0812516C: .4byte 0x03006168 + .pool thumb_func_end sub_81250B8 thumb_func_start sub_8125170 @@ -600578,24 +581014,24 @@ sub_8125170: @ 8125170 lsrs r0, 24 mov r8, r0 movs r2, 0 - ldr r0, _08125218 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcs _08125208 - ldr r1, _0812521C + ldr r1, =0x03006174 mov r10, r1 _0812518E: - ldr r3, _08125220 + ldr r3, =0x03006178 ldrb r0, [r3] adds r0, r2 - ldr r3, _08125224 + ldr r3, =0x03006180 ldrb r1, [r3] muls r0, r1 lsls r0, 1 - ldr r3, _08125228 + ldr r3, =0x03006168 ldr r1, [r3] adds r1, r0 - ldr r3, _0812522C + ldr r3, =0x03006164 ldrb r0, [r3] lsls r0, 1 adds r3, r1, r0 @@ -600646,7 +581082,7 @@ _081251EC: _081251FC: lsls r0, r7, 24 lsrs r2, r0, 24 - ldr r1, _08125218 + ldr r1, =0x0300616c ldrb r1, [r1] cmp r2, r1 bcc _0812518E @@ -600659,19 +581095,14 @@ _08125208: pop {r0} bx r0 .align 2, 0 -_08125218: .4byte 0x0300616c -_0812521C: .4byte 0x03006174 -_08125220: .4byte 0x03006178 -_08125224: .4byte 0x03006180 -_08125228: .4byte 0x03006168 -_0812522C: .4byte 0x03006164 + .pool thumb_func_end sub_8125170 thumb_func_start sub_8125230 sub_8125230: @ 8125230 push {r4,r5,lr} movs r4, 0 - ldr r5, _0812524C + ldr r5, =0x00000c7f _08125236: lsls r0, r4, 16 lsrs r0, 16 @@ -600683,7 +581114,7 @@ _08125236: pop {r0} bx r0 .align 2, 0 -_0812524C: .4byte 0x00000c7f + .pool thumb_func_end sub_8125230 thumb_func_start sub_8125250 @@ -600693,25 +581124,25 @@ sub_8125250: @ 8125250 push {r7} sub sp, 0x4 movs r2, 0 - ldr r0, _081252D0 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcs _081252C2 - ldr r0, _081252D4 + ldr r0, =0x03006168 mov r8, r0 - ldr r3, _081252D8 + ldr r3, =0x03006174 _08125268: - ldr r0, _081252DC + ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 - ldr r0, _081252E0 + ldr r0, =0x03006180 ldrb r0, [r0] muls r0, r1 lsls r0, 1 mov r4, r8 ldr r1, [r4] adds r1, r0 - ldr r0, _081252E4 + ldr r0, =0x03006164 ldrb r0, [r0] lsls r0, 1 adds r4, r1, r0 @@ -600744,7 +581175,7 @@ _081252A8: _081252B6: lsls r0, r6, 24 lsrs r2, r0, 24 - ldr r0, _081252D0 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcc _08125268 @@ -600756,12 +581187,7 @@ _081252C2: pop {r0} bx r0 .align 2, 0 -_081252D0: .4byte 0x0300616c -_081252D4: .4byte 0x03006168 -_081252D8: .4byte 0x03006174 -_081252DC: .4byte 0x03006178 -_081252E0: .4byte 0x03006180 -_081252E4: .4byte 0x03006164 + .pool thumb_func_end sub_8125250 thumb_func_start sub_81252E8 @@ -600771,15 +581197,15 @@ sub_81252E8: @ 81252E8 push {r7} sub sp, 0x8 movs r2, 0 - ldr r0, _0812538C + ldr r0, =0x03006174 ldrb r0, [r0] cmp r2, r0 bcs _0812537E - ldr r0, _08125390 + ldr r0, =0x03006168 mov r8, r0 - ldr r3, _08125394 + ldr r3, =0x03006180 _08125300: - ldr r0, _08125398 + ldr r0, =0x03006178 ldrb r1, [r0] ldrb r0, [r3] muls r0, r1 @@ -600787,7 +581213,7 @@ _08125300: mov r4, r8 ldr r1, [r4] adds r1, r0 - ldr r0, _0812539C + ldr r0, =0x03006164 ldrb r0, [r0] adds r0, r2 lsls r0, 1 @@ -600799,13 +581225,13 @@ _08125300: ldrb r0, [r3] lsls r0, 1 adds r4, r0 - ldr r0, _081253A0 + ldr r0, =0x0300616c ldrb r0, [r0] subs r0, 0x1 adds r7, r2, 0x1 cmp r5, r0 bge _08125372 - ldr r6, _08125394 + ldr r6, =0x03006180 _08125336: ldrh r0, [r4] movs r2, 0x80 @@ -600832,7 +581258,7 @@ _0812535C: ldrb r0, [r6] lsls r0, 1 adds r4, r0 - ldr r0, _081253A0 + ldr r0, =0x0300616c ldrb r0, [r0] subs r0, 0x1 cmp r5, r0 @@ -600840,7 +581266,7 @@ _0812535C: _08125372: lsls r0, r7, 24 lsrs r2, r0, 24 - ldr r0, _0812538C + ldr r0, =0x03006174 ldrb r0, [r0] cmp r2, r0 bcc _08125300 @@ -600852,12 +581278,7 @@ _0812537E: pop {r0} bx r0 .align 2, 0 -_0812538C: .4byte 0x03006174 -_08125390: .4byte 0x03006168 -_08125394: .4byte 0x03006180 -_08125398: .4byte 0x03006178 -_0812539C: .4byte 0x03006164 -_081253A0: .4byte 0x0300616c + .pool thumb_func_end sub_81252E8 thumb_func_start sub_81253A4 @@ -600871,25 +581292,25 @@ sub_81253A4: @ 81253A4 lsrs r0, 24 mov r8, r0 movs r2, 0 - ldr r0, _08125430 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcs _08125420 - ldr r0, _08125434 + ldr r0, =0x03006168 mov r9, r0 - ldr r3, _08125438 + ldr r3, =0x03006174 _081253C4: - ldr r0, _0812543C + ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 - ldr r0, _08125440 + ldr r0, =0x03006180 ldrb r0, [r0] muls r0, r1 lsls r0, 1 mov r4, r9 ldr r1, [r4] adds r1, r0 - ldr r0, _08125444 + ldr r0, =0x03006164 ldrb r0, [r0] lsls r0, 1 adds r4, r1, r0 @@ -600923,7 +581344,7 @@ _08125406: _08125414: lsls r0, r6, 24 lsrs r2, r0, 24 - ldr r0, _08125430 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcc _081253C4 @@ -600936,12 +581357,7 @@ _08125420: pop {r0} bx r0 .align 2, 0 -_08125430: .4byte 0x0300616c -_08125434: .4byte 0x03006168 -_08125438: .4byte 0x03006174 -_0812543C: .4byte 0x03006178 -_08125440: .4byte 0x03006180 -_08125444: .4byte 0x03006164 + .pool thumb_func_end sub_81253A4 thumb_func_start sub_8125448 @@ -600951,25 +581367,25 @@ sub_8125448: @ 8125448 push {r7} sub sp, 0x4 movs r2, 0 - ldr r0, _081254C8 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcs _081254BA - ldr r0, _081254CC + ldr r0, =0x03006168 mov r8, r0 - ldr r3, _081254D0 + ldr r3, =0x03006174 _08125460: - ldr r0, _081254D4 + ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 - ldr r0, _081254D8 + ldr r0, =0x03006180 ldrb r0, [r0] muls r0, r1 lsls r0, 1 mov r4, r8 ldr r1, [r4] adds r1, r0 - ldr r0, _081254DC + ldr r0, =0x03006164 ldrb r0, [r0] lsls r0, 1 adds r4, r1, r0 @@ -601002,7 +581418,7 @@ _081254A0: _081254AE: lsls r0, r6, 24 lsrs r2, r0, 24 - ldr r0, _081254C8 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcc _08125460 @@ -601014,12 +581430,7 @@ _081254BA: pop {r0} bx r0 .align 2, 0 -_081254C8: .4byte 0x0300616c -_081254CC: .4byte 0x03006168 -_081254D0: .4byte 0x03006174 -_081254D4: .4byte 0x03006178 -_081254D8: .4byte 0x03006180 -_081254DC: .4byte 0x03006164 + .pool thumb_func_end sub_8125448 thumb_func_start sub_81254E0 @@ -601029,24 +581440,24 @@ sub_81254E0: @ 81254E0 mov r6, r8 push {r6,r7} movs r7, 0 - ldr r0, _08125618 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r7, r0 bcs _0812556C - ldr r0, _0812561C + ldr r0, =0x03006168 mov r8, r0 _081254F6: - ldr r0, _08125620 + ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r7 - ldr r0, _08125624 + ldr r0, =0x03006180 ldrb r0, [r0] muls r0, r1 lsls r0, 1 mov r2, r8 ldr r1, [r2] adds r1, r0 - ldr r0, _08125628 + ldr r0, =0x03006164 ldrb r0, [r0] lsls r0, 1 adds r5, r1, r0 @@ -601057,7 +581468,7 @@ _081254F6: strh r0, [r5] movs r6, 0x1 adds r5, r4, 0 - ldr r0, _0812562C + ldr r0, =0x03006174 ldrb r0, [r0] subs r0, 0x1 adds r7, 0x1 @@ -601077,7 +581488,7 @@ _0812552E: lsls r0, 24 lsrs r6, r0, 24 adds r5, r4, 0 - ldr r0, _0812562C + ldr r0, =0x03006174 ldrb r0, [r0] subs r0, 0x1 cmp r6, r0 @@ -601089,22 +581500,22 @@ _08125556: strh r0, [r5] lsls r0, r7, 24 lsrs r7, r0, 24 - ldr r0, _08125618 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r7, r0 bcc _081254F6 _0812556C: movs r6, 0 - ldr r0, _0812562C + ldr r0, =0x03006174 ldrb r0, [r0] cmp r6, r0 bcs _0812560C - ldr r3, _0812561C + ldr r3, =0x03006168 mov r9, r3 - ldr r0, _08125624 + ldr r0, =0x03006180 mov r8, r0 _0812557E: - ldr r0, _08125620 + ldr r0, =0x03006178 ldrb r0, [r0] mov r2, r8 ldrb r1, [r2] @@ -601113,7 +581524,7 @@ _0812557E: mov r3, r9 ldr r2, [r3] adds r2, r0 - ldr r0, _08125628 + ldr r0, =0x03006164 ldrb r0, [r0] adds r0, r6 lsls r0, 1 @@ -601128,13 +581539,13 @@ _0812557E: ldrb r0, [r1] lsls r0, 1 adds r5, r0 - ldr r0, _08125618 + ldr r0, =0x0300616c ldrb r0, [r0] subs r0, 0x1 adds r6, 0x1 cmp r7, r0 bge _081255F0 - ldr r4, _08125624 + ldr r4, =0x03006180 _081255BE: ldrb r1, [r4] lsls r1, 1 @@ -601154,7 +581565,7 @@ _081255BE: ldrb r0, [r4] lsls r0, 1 adds r5, r0 - ldr r0, _08125618 + ldr r0, =0x0300616c ldrb r0, [r0] subs r0, 0x1 cmp r7, r0 @@ -601169,7 +581580,7 @@ _081255F0: strh r0, [r5] lsls r0, r6, 24 lsrs r6, r0, 24 - ldr r0, _0812562C + ldr r0, =0x03006174 ldrb r0, [r0] cmp r6, r0 bcc _0812557E @@ -601181,12 +581592,7 @@ _0812560C: pop {r0} bx r0 .align 2, 0 -_08125618: .4byte 0x0300616c -_0812561C: .4byte 0x03006168 -_08125620: .4byte 0x03006178 -_08125624: .4byte 0x03006180 -_08125628: .4byte 0x03006164 -_0812562C: .4byte 0x03006174 + .pool thumb_func_end sub_81254E0 thumb_func_start sub_8125630 @@ -601196,25 +581602,25 @@ sub_8125630: @ 8125630 push {r7} sub sp, 0x4 movs r2, 0 - ldr r0, _081256B0 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcs _081256A2 - ldr r0, _081256B4 + ldr r0, =0x03006168 mov r8, r0 - ldr r3, _081256B8 + ldr r3, =0x03006174 _08125648: - ldr r0, _081256BC + ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 - ldr r0, _081256C0 + ldr r0, =0x03006180 ldrb r0, [r0] muls r0, r1 lsls r0, 1 mov r4, r8 ldr r1, [r4] adds r1, r0 - ldr r0, _081256C4 + ldr r0, =0x03006164 ldrb r0, [r0] lsls r0, 1 adds r4, r1, r0 @@ -601247,7 +581653,7 @@ _08125688: _08125696: lsls r0, r6, 24 lsrs r2, r0, 24 - ldr r0, _081256B0 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcc _08125648 @@ -601259,12 +581665,7 @@ _081256A2: pop {r0} bx r0 .align 2, 0 -_081256B0: .4byte 0x0300616c -_081256B4: .4byte 0x03006168 -_081256B8: .4byte 0x03006174 -_081256BC: .4byte 0x03006178 -_081256C0: .4byte 0x03006180 -_081256C4: .4byte 0x03006164 + .pool thumb_func_end sub_8125630 thumb_func_start sub_81256C8 @@ -601275,7 +581676,7 @@ sub_81256C8: @ 81256C8 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _081257F4 + ldr r0, =0x03006168 ldr r4, [r0] movs r6, 0 movs r0, 0x80 @@ -601304,7 +581705,7 @@ _081256F2: cmp r6, 0x3F bls _081256E0 movs r7, 0 - ldr r1, _081257F4 + ldr r1, =0x03006168 mov r10, r1 mov r3, sp movs r2, 0x80 @@ -601389,7 +581790,7 @@ _08125794: lsrs r7, r0, 24 cmp r7, 0x3F bls _08125716 - ldr r0, _081257F4 + ldr r0, =0x03006168 ldr r4, [r0] movs r6, 0 movs r0, 0x80 @@ -601427,7 +581828,7 @@ _081257D0: pop {r0} bx r0 .align 2, 0 -_081257F4: .4byte 0x03006168 + .pool thumb_func_end sub_81256C8 thumb_func_start sub_81257F8 @@ -601437,24 +581838,24 @@ sub_81257F8: @ 81257F8 push {r7} sub sp, 0x4 movs r2, 0 - ldr r0, _08125888 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcs _0812587A - ldr r0, _0812588C + ldr r0, =0x03006168 mov r8, r0 _0812580E: - ldr r0, _08125890 + ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 - ldr r0, _08125894 + ldr r0, =0x03006180 ldrb r0, [r0] muls r0, r1 lsls r0, 1 mov r3, r8 ldr r1, [r3] adds r1, r0 - ldr r0, _08125898 + ldr r0, =0x03006164 ldrb r0, [r0] lsls r0, 1 adds r4, r1, r0 @@ -601463,7 +581864,7 @@ _0812580E: strh r1, [r0] movs r5, 0x1 adds r4, 0x2 - ldr r0, _0812589C + ldr r0, =0x03006174 ldrb r0, [r0] subs r0, 0x1 adds r6, r2, 0x1 @@ -601488,7 +581889,7 @@ _0812585C: lsls r0, 24 lsrs r5, r0, 24 adds r4, 0x2 - ldr r0, _0812589C + ldr r0, =0x03006174 ldrb r0, [r0] subs r0, 0x1 cmp r5, r0 @@ -601496,7 +581897,7 @@ _0812585C: _0812586E: lsls r0, r6, 24 lsrs r2, r0, 24 - ldr r0, _08125888 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcc _0812580E @@ -601508,12 +581909,7 @@ _0812587A: pop {r0} bx r0 .align 2, 0 -_08125888: .4byte 0x0300616c -_0812588C: .4byte 0x03006168 -_08125890: .4byte 0x03006178 -_08125894: .4byte 0x03006180 -_08125898: .4byte 0x03006164 -_0812589C: .4byte 0x03006174 + .pool thumb_func_end sub_81257F8 thumb_func_start sub_81258A0 @@ -601523,15 +581919,15 @@ sub_81258A0: @ 81258A0 push {r7} sub sp, 0x8 movs r2, 0 - ldr r0, _0812593C + ldr r0, =0x03006174 ldrb r0, [r0] cmp r2, r0 bcs _0812592E - ldr r0, _08125940 + ldr r0, =0x03006168 mov r8, r0 - ldr r7, _08125944 + ldr r7, =0x03006180 _081258B8: - ldr r0, _08125948 + ldr r0, =0x03006178 ldrb r1, [r0] ldrb r0, [r7] muls r0, r1 @@ -601539,7 +581935,7 @@ _081258B8: mov r3, r8 ldr r1, [r3] adds r1, r0 - ldr r0, _0812594C + ldr r0, =0x03006164 ldrb r0, [r0] adds r0, r2 lsls r0, 1 @@ -601551,7 +581947,7 @@ _081258B8: ldrb r0, [r7] lsls r0, 1 adds r4, r0 - ldr r0, _08125950 + ldr r0, =0x0300616c ldrb r0, [r0] subs r0, 0x1 adds r6, r2, 0x1 @@ -601580,7 +581976,7 @@ _0812590C: ldrb r0, [r7] lsls r0, 1 adds r4, r0 - ldr r0, _08125950 + ldr r0, =0x0300616c ldrb r0, [r0] subs r0, 0x1 cmp r5, r0 @@ -601588,7 +581984,7 @@ _0812590C: _08125922: lsls r0, r6, 24 lsrs r2, r0, 24 - ldr r0, _0812593C + ldr r0, =0x03006174 ldrb r0, [r0] cmp r2, r0 bcc _081258B8 @@ -601600,12 +581996,7 @@ _0812592E: pop {r0} bx r0 .align 2, 0 -_0812593C: .4byte 0x03006174 -_08125940: .4byte 0x03006168 -_08125944: .4byte 0x03006180 -_08125948: .4byte 0x03006178 -_0812594C: .4byte 0x03006164 -_08125950: .4byte 0x0300616c + .pool thumb_func_end sub_81258A0 thumb_func_start sub_8125954 @@ -601620,7 +582011,7 @@ sub_8125954: @ 8125954 lsrs r0, 16 mov r10, r0 mov r2, sp - ldr r3, _081259C0 + ldr r3, =0x085a1f94 lsls r1, r0, 1 add r1, r10 adds r0, r1, r3 @@ -601666,7 +582057,7 @@ _081259A6: add r0, r8 b _081259D6 .align 2, 0 -_081259C0: .4byte 0x085a1f94 + .pool _081259C4: mov r0, r8 lsls r2, r0, 2 @@ -601715,7 +582106,7 @@ _08125A06: _08125A14: movs r3, 0x1F _08125A16: - ldr r1, _08125A74 + ldr r1, =0x03006168 mov r4, r8 lsls r0, r4, 2 mov r2, sp @@ -601763,12 +582154,12 @@ _08125A16: movs r7, 0x1F b _08125AEC .align 2, 0 -_08125A74: .4byte 0x03006168 + .pool _08125A78: mov r1, r10 lsls r0, r1, 1 add r0, r10 - ldr r1, _08125AAC + ldr r1, =0x085a1f94 adds r1, 0x2 adds r0, r1 ldrb r0, [r0] @@ -601791,7 +582182,7 @@ _08125A78: beq _08125AB6 b _08125AF8 .align 2, 0 -_08125AAC: .4byte 0x085a1f94 + .pool _08125AB0: cmp r0, 0x2 beq _08125ADA @@ -601921,13 +582312,13 @@ sub_8125B5C: @ 8125B5C lsrs r0, 16 b _08125B8E _08125B8C: - ldr r0, _08125B94 + ldr r0, =0x00007fff _08125B8E: pop {r4} pop {r1} bx r1 .align 2, 0 -_08125B94: .4byte 0x00007fff + .pool thumb_func_end sub_8125B5C thumb_func_start sub_8125B98 @@ -601959,12 +582350,12 @@ sub_8125B98: @ 8125B98 cmp r0, 0x5 bhi _08125C50 lsls r0, 2 - ldr r1, _08125BDC + ldr r1, =_08125BE0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08125BDC: .4byte _08125BE0 + .pool .align 2, 0 _08125BE0: .4byte _08125BF8 @@ -602060,12 +582451,12 @@ sub_8125C68: @ 8125C68 movs r0, 0 b _08125C8E _08125C8C: - ldr r0, _08125C94 + ldr r0, =0x00007fff _08125C8E: pop {r1} bx r1 .align 2, 0 -_08125C94: .4byte 0x00007fff + .pool thumb_func_end sub_8125C68 thumb_func_start sub_8125C98 @@ -602768,56 +583159,47 @@ _08126194: thumb_func_start sub_81261A4 sub_81261A4: @ 81261A4 push {lr} - ldr r2, _081261F4 + ldr r2, =0x03006188 ldrb r1, [r0, 0x18] lsls r1, 4 strh r1, [r2] - ldr r3, _081261F8 + ldr r3, =0x03006184 ldrh r2, [r2] lsls r2, 1 ldr r1, [r0, 0x8] adds r1, r2 str r1, [r3] - ldr r2, _081261FC + ldr r2, =0x03006168 ldr r1, [r0, 0x4] str r1, [r2] - ldr r2, _08126200 + ldr r2, =0x03006164 ldrb r1, [r0, 0x19] strb r1, [r2] - ldr r2, _08126204 + ldr r2, =0x03006178 ldrb r1, [r0, 0x1A] strb r1, [r2] - ldr r2, _08126208 + ldr r2, =0x03006174 ldrb r1, [r0, 0x1B] strb r1, [r2] - ldr r2, _0812620C + ldr r2, =0x0300616c ldrb r1, [r0, 0x1C] strb r1, [r2] - ldr r2, _08126210 + ldr r2, =0x03006180 ldrb r1, [r0, 0x1D] strb r1, [r2] - ldr r2, _08126214 + ldr r2, =0x03006170 ldrb r1, [r0, 0x1E] strb r1, [r2] ldrh r0, [r0, 0x14] cmp r0, 0x5 bhi _0812626A lsls r0, 2 - ldr r1, _08126218 + ldr r1, =_0812621C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081261F4: .4byte 0x03006188 -_081261F8: .4byte 0x03006184 -_081261FC: .4byte 0x03006168 -_08126200: .4byte 0x03006164 -_08126204: .4byte 0x03006178 -_08126208: .4byte 0x03006174 -_0812620C: .4byte 0x0300616c -_08126210: .4byte 0x03006180 -_08126214: .4byte 0x03006170 -_08126218: .4byte _0812621C + .pool .align 2, 0 _0812621C: .4byte _08126234 @@ -602856,97 +583238,81 @@ _0812626A: thumb_func_start sub_8126270 sub_8126270: @ 8126270 - ldr r2, _081262D8 + ldr r2, =0x03006184 ldr r1, [r2] movs r0, 0 strh r0, [r1] ldr r0, [r2] - ldr r2, _081262DC + ldr r2, =0x000018c6 adds r1, r2, 0 strh r1, [r0, 0x2] - ldr r2, _081262E0 + ldr r2, =0x000077bd adds r1, r2, 0 strh r1, [r0, 0x4] - ldr r2, _081262E4 + ldr r2, =0x00002d6b adds r1, r2, 0 strh r1, [r0, 0x6] - ldr r2, _081262E8 + ldr r2, =0x000018dd adds r1, r2, 0 strh r1, [r0, 0x8] - ldr r2, _081262EC + ldr r2, =0x00001ba6 adds r1, r2, 0 strh r1, [r0, 0xA] - ldr r2, _081262F0 + ldr r2, =0x000074c6 adds r1, r2, 0 strh r1, [r0, 0xC] - ldr r2, _081262F4 + ldr r2, =0x00001bbd adds r1, r2, 0 strh r1, [r0, 0xE] - ldr r2, _081262F8 + ldr r2, =0x000074dd adds r1, r2, 0 strh r1, [r0, 0x10] - ldr r2, _081262FC + ldr r2, =0x000077a6 adds r1, r2, 0 strh r1, [r0, 0x12] - ldr r2, _08126300 + ldr r2, =0x0000197d adds r1, r2, 0 strh r1, [r0, 0x14] - ldr r2, _08126304 + ldr r2, =0x00001bab adds r1, r2, 0 strh r1, [r0, 0x16] - ldr r2, _08126308 + ldr r2, =0x00007566 adds r1, r2, 0 strh r1, [r0, 0x18] - ldr r2, _0812630C + ldr r2, =0x00002cdd adds r1, r2, 0 strh r1, [r0, 0x1A] - ldr r2, _08126310 + ldr r2, =0x00002fa6 adds r1, r2, 0 strh r1, [r0, 0x1C] - ldr r2, _08126314 + ldr r2, =0x000074cb adds r1, r2, 0 strh r1, [r0, 0x1E] bx lr .align 2, 0 -_081262D8: .4byte 0x03006184 -_081262DC: .4byte 0x000018c6 -_081262E0: .4byte 0x000077bd -_081262E4: .4byte 0x00002d6b -_081262E8: .4byte 0x000018dd -_081262EC: .4byte 0x00001ba6 -_081262F0: .4byte 0x000074c6 -_081262F4: .4byte 0x00001bbd -_081262F8: .4byte 0x000074dd -_081262FC: .4byte 0x000077a6 -_08126300: .4byte 0x0000197d -_08126304: .4byte 0x00001bab -_08126308: .4byte 0x00007566 -_0812630C: .4byte 0x00002cdd -_08126310: .4byte 0x00002fa6 -_08126314: .4byte 0x000074cb + .pool thumb_func_end sub_8126270 thumb_func_start sub_8126318 sub_8126318: @ 8126318 - ldr r2, _0812632C + ldr r2, =0x03006184 ldr r0, [r2] movs r1, 0 strh r1, [r0] ldr r2, [r2] strh r1, [r2, 0x2] - ldr r1, _08126330 + ldr r1, =0x00007fff adds r0, r1, 0 strh r0, [r2, 0x4] bx lr .align 2, 0 -_0812632C: .4byte 0x03006184 -_08126330: .4byte 0x00007fff + .pool thumb_func_end sub_8126318 thumb_func_start sub_8126334 sub_8126334: @ 8126334 push {r4,r5,lr} - ldr r1, _0812636C + ldr r1, =0x03006184 ldr r0, [r1] movs r2, 0 strh r2, [r0] @@ -602974,13 +583340,13 @@ _08126346: pop {r0} bx r0 .align 2, 0 -_0812636C: .4byte 0x03006184 + .pool thumb_func_end sub_8126334 thumb_func_start sub_8126370 sub_8126370: @ 8126370 push {r4,lr} - ldr r2, _081263A0 + ldr r2, =0x03006184 ldr r1, [r2] movs r0, 0 strh r0, [r1] @@ -603004,7 +583370,7 @@ _0812637E: pop {r0} bx r0 .align 2, 0 -_081263A0: .4byte 0x03006184 + .pool thumb_func_end sub_8126370 thumb_func_start sub_81263A4 @@ -603023,11 +583389,11 @@ sub_81263A4: @ 81263A4 mov r9, r2 _081263BC: movs r6, 0 - ldr r3, _08126440 + ldr r3, =0x03006184 mov r12, r3 mov r0, r9 lsls r4, r0, 1 - ldr r5, _08126444 + ldr r5, =0x0300616c cmp r6, r9 bcs _081263E0 movs r2, 0 @@ -603045,7 +583411,7 @@ _081263E0: mov r1, r12 ldr r0, [r1] adds r0, r4, r0 - ldr r2, _08126448 + ldr r2, =0x00003def adds r1, r2, 0 strh r1, [r0] movs r3, 0 @@ -603053,29 +583419,29 @@ _081263E0: cmp r3, r5 bcs _081264E4 _081263F4: - ldr r2, _0812644C - ldr r0, _08126450 + ldr r2, =0x03006168 + ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r3 - ldr r0, _08126454 + ldr r0, =0x03006180 ldrb r0, [r0] muls r0, r1 lsls r0, 1 ldr r1, [r2] adds r1, r0 - ldr r0, _08126458 + ldr r0, =0x03006164 ldrb r0, [r0] lsls r0, 1 adds r4, r1, r0 movs r6, 0 - ldr r0, _0812645C + ldr r0, =0x03006174 adds r2, r0, 0 adds r3, 0x1 mov r10, r3 ldrb r3, [r2] cmp r6, r3 bcs _081264D6 - ldr r0, _08126460 + ldr r0, =0x03006188 mov r8, r0 _08126424: ldrh r0, [r4] @@ -603092,15 +583458,7 @@ _08126424: adds r7, r4, 0x2 b _081264CA .align 2, 0 -_08126440: .4byte 0x03006184 -_08126444: .4byte 0x0300616c -_08126448: .4byte 0x00003def -_0812644C: .4byte 0x03006168 -_08126450: .4byte 0x03006178 -_08126454: .4byte 0x03006180 -_08126458: .4byte 0x03006164 -_0812645C: .4byte 0x03006174 -_08126460: .4byte 0x03006188 + .pool _08126464: adds r0, r4, 0 bl sub_81267C4 @@ -603111,7 +583469,7 @@ _08126464: adds r7, r4, 0x2 cmp r3, r9 bcs _081264C0 - ldr r0, _08126490 + ldr r0, =0x03006184 ldr r2, [r0] ldrh r1, [r2, 0x2] mov r12, r0 @@ -603123,7 +583481,7 @@ _08126464: adds r0, 0x1 b _081264BE .align 2, 0 -_08126490: .4byte 0x03006184 + .pool _08126494: mov r2, r12 ldr r1, [r2] @@ -603150,7 +583508,7 @@ _081264B8: _081264BE: strh r0, [r4] _081264C0: - ldr r2, _081264F4 + ldr r2, =0x03006174 cmp r3, r9 bne _081264CA mov r3, r9 @@ -603166,7 +583524,7 @@ _081264D6: mov r1, r10 lsls r0, r1, 24 lsrs r3, r0, 24 - ldr r0, _081264F8 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r3, r0 bcc _081263F4 @@ -603179,8 +583537,7 @@ _081264E4: pop {r0} bx r0 .align 2, 0 -_081264F4: .4byte 0x03006174 -_081264F8: .4byte 0x0300616c + .pool thumb_func_end sub_81263A4 thumb_func_start sub_81264FC @@ -603189,35 +583546,35 @@ sub_81264FC: @ 81264FC mov r7, r8 push {r7} movs r2, 0 - ldr r0, _08126550 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcs _081265A0 - ldr r0, _08126554 + ldr r0, =0x03006168 mov r8, r0 _08126510: - ldr r0, _08126558 + ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 - ldr r0, _0812655C + ldr r0, =0x03006180 ldrb r0, [r0] muls r0, r1 lsls r0, 1 mov r3, r8 ldr r1, [r3] adds r1, r0 - ldr r0, _08126560 + ldr r0, =0x03006164 ldrb r0, [r0] lsls r0, 1 adds r4, r1, r0 movs r6, 0 - ldr r0, _08126564 + ldr r0, =0x03006174 adds r3, r0, 0 adds r7, r2, 0x1 ldrb r0, [r3] cmp r6, r0 bcs _08126594 - ldr r5, _08126568 + ldr r5, =0x03006188 _0812653C: ldrh r0, [r4] movs r2, 0x80 @@ -603230,13 +583587,7 @@ _0812653C: strh r0, [r4] b _08126586 .align 2, 0 -_08126550: .4byte 0x0300616c -_08126554: .4byte 0x03006168 -_08126558: .4byte 0x03006178 -_0812655C: .4byte 0x03006180 -_08126560: .4byte 0x03006164 -_08126564: .4byte 0x03006174 -_08126568: .4byte 0x03006188 + .pool _0812656C: adds r0, r4, 0 bl sub_8125C68 @@ -603251,7 +583602,7 @@ _0812657E: adds r0, 0x2 _08126582: strh r0, [r4] - ldr r3, _081265AC + ldr r3, =0x03006174 _08126586: adds r0, r6, 0x1 lsls r0, 24 @@ -603263,7 +583614,7 @@ _08126586: _08126594: lsls r0, r7, 24 lsrs r2, r0, 24 - ldr r0, _081265B0 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcc _08126510 @@ -603274,8 +583625,7 @@ _081265A0: pop {r0} bx r0 .align 2, 0 -_081265AC: .4byte 0x03006174 -_081265B0: .4byte 0x0300616c + .pool thumb_func_end sub_81264FC thumb_func_start sub_81265B4 @@ -603285,34 +583635,34 @@ sub_81265B4: @ 81265B4 push {r7} sub sp, 0x4 movs r2, 0 - ldr r0, _08126608 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcs _08126650 - ldr r0, _0812660C + ldr r0, =0x03006168 mov r8, r0 _081265CA: - ldr r0, _08126610 + ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 - ldr r0, _08126614 + ldr r0, =0x03006180 ldrb r0, [r0] muls r0, r1 lsls r0, 1 mov r3, r8 ldr r1, [r3] adds r1, r0 - ldr r0, _08126618 + ldr r0, =0x03006164 ldrb r0, [r0] lsls r0, 1 adds r4, r1, r0 movs r5, 0 - ldr r0, _0812661C + ldr r0, =0x03006174 adds r7, r2, 0x1 ldrb r0, [r0] cmp r5, r0 bcs _08126644 - ldr r6, _08126620 + ldr r6, =0x03006188 movs r0, 0x80 lsls r0, 8 adds r2, r0, 0 @@ -603325,13 +583675,7 @@ _081265FA: strh r0, [r4] b _08126634 .align 2, 0 -_08126608: .4byte 0x0300616c -_0812660C: .4byte 0x03006168 -_08126610: .4byte 0x03006178 -_08126614: .4byte 0x03006180 -_08126618: .4byte 0x03006164 -_0812661C: .4byte 0x03006174 -_08126620: .4byte 0x03006188 + .pool _08126624: adds r0, r4, 0 str r2, [sp] @@ -603345,14 +583689,14 @@ _08126634: lsls r0, 24 lsrs r5, r0, 24 adds r4, 0x2 - ldr r0, _0812665C + ldr r0, =0x03006174 ldrb r0, [r0] cmp r5, r0 bcc _081265FA _08126644: lsls r0, r7, 24 lsrs r2, r0, 24 - ldr r0, _08126660 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcc _081265CA @@ -603364,8 +583708,7 @@ _08126650: pop {r0} bx r0 .align 2, 0 -_0812665C: .4byte 0x03006174 -_08126660: .4byte 0x0300616c + .pool thumb_func_end sub_81265B4 thumb_func_start sub_8126664 @@ -603375,34 +583718,34 @@ sub_8126664: @ 8126664 push {r7} sub sp, 0x4 movs r2, 0 - ldr r0, _081266B8 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcs _08126700 - ldr r0, _081266BC + ldr r0, =0x03006168 mov r8, r0 _0812667A: - ldr r0, _081266C0 + ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 - ldr r0, _081266C4 + ldr r0, =0x03006180 ldrb r0, [r0] muls r0, r1 lsls r0, 1 mov r3, r8 ldr r1, [r3] adds r1, r0 - ldr r0, _081266C8 + ldr r0, =0x03006164 ldrb r0, [r0] lsls r0, 1 adds r4, r1, r0 movs r5, 0 - ldr r0, _081266CC + ldr r0, =0x03006174 adds r7, r2, 0x1 ldrb r0, [r0] cmp r5, r0 bcs _081266F4 - ldr r6, _081266D0 + ldr r6, =0x03006188 movs r0, 0x80 lsls r0, 8 adds r2, r0, 0 @@ -603415,13 +583758,7 @@ _081266AA: strh r0, [r4] b _081266E4 .align 2, 0 -_081266B8: .4byte 0x0300616c -_081266BC: .4byte 0x03006168 -_081266C0: .4byte 0x03006178 -_081266C4: .4byte 0x03006180 -_081266C8: .4byte 0x03006164 -_081266CC: .4byte 0x03006174 -_081266D0: .4byte 0x03006188 + .pool _081266D4: adds r0, r4, 0 str r2, [sp] @@ -603435,14 +583772,14 @@ _081266E4: lsls r0, 24 lsrs r5, r0, 24 adds r4, 0x2 - ldr r0, _0812670C + ldr r0, =0x03006174 ldrb r0, [r0] cmp r5, r0 bcc _081266AA _081266F4: lsls r0, r7, 24 lsrs r2, r0, 24 - ldr r0, _08126710 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcc _0812667A @@ -603454,8 +583791,7 @@ _08126700: pop {r0} bx r0 .align 2, 0 -_0812670C: .4byte 0x03006174 -_08126710: .4byte 0x0300616c + .pool thumb_func_end sub_8126664 thumb_func_start sub_8126714 @@ -603465,34 +583801,34 @@ sub_8126714: @ 8126714 push {r7} sub sp, 0x4 movs r2, 0 - ldr r0, _08126768 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcs _081267B0 - ldr r0, _0812676C + ldr r0, =0x03006168 mov r8, r0 _0812672A: - ldr r0, _08126770 + ldr r0, =0x03006178 ldrb r1, [r0] adds r1, r2 - ldr r0, _08126774 + ldr r0, =0x03006180 ldrb r0, [r0] muls r0, r1 lsls r0, 1 mov r3, r8 ldr r1, [r3] adds r1, r0 - ldr r0, _08126778 + ldr r0, =0x03006164 ldrb r0, [r0] lsls r0, 1 adds r4, r1, r0 movs r5, 0 - ldr r0, _0812677C + ldr r0, =0x03006174 adds r7, r2, 0x1 ldrb r0, [r0] cmp r5, r0 bcs _081267A4 - ldr r6, _08126780 + ldr r6, =0x03006188 movs r0, 0x80 lsls r0, 8 adds r2, r0, 0 @@ -603505,13 +583841,7 @@ _0812675A: strh r0, [r4] b _08126794 .align 2, 0 -_08126768: .4byte 0x0300616c -_0812676C: .4byte 0x03006168 -_08126770: .4byte 0x03006178 -_08126774: .4byte 0x03006180 -_08126778: .4byte 0x03006164 -_0812677C: .4byte 0x03006174 -_08126780: .4byte 0x03006188 + .pool _08126784: adds r0, r4, 0 str r2, [sp] @@ -603525,14 +583855,14 @@ _08126794: lsls r0, 24 lsrs r5, r0, 24 adds r4, 0x2 - ldr r0, _081267BC + ldr r0, =0x03006174 ldrb r0, [r0] cmp r5, r0 bcc _0812675A _081267A4: lsls r0, r7, 24 lsrs r2, r0, 24 - ldr r0, _081267C0 + ldr r0, =0x0300616c ldrb r0, [r0] cmp r2, r0 bcc _0812672A @@ -603544,8 +583874,7 @@ _081267B0: pop {r0} bx r0 .align 2, 0 -_081267BC: .4byte 0x03006174 -_081267C0: .4byte 0x0300616c + .pool thumb_func_end sub_8126714 thumb_func_start sub_81267C4 @@ -603806,54 +584135,46 @@ sub_812693C: @ 812693C thumb_func_start sub_8126968 sub_8126968: @ 8126968 push {lr} - ldr r3, _081269B0 + ldr r3, =0x0203a173 ldrb r0, [r3] cmp r0, 0x7 bhi _0812697E - ldr r2, _081269B4 - ldr r1, _081269B8 + ldr r2, =0x0203a14c + ldr r1, =0x0203bc40 lsls r0, 3 adds r0, r1 ldr r0, [r0] str r0, [r2] _0812697E: - ldr r2, _081269BC + ldr r2, =0x0203a17c ldrb r0, [r2, 0x9] cmp r0, 0 bne _08126996 - ldr r0, _081269C0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _081269C4 + ldr r3, =0x00001aae adds r1, r0, r3 str r1, [r2] - ldr r1, _081269C8 + ldr r1, =0x00001abe adds r0, r1 str r0, [r2, 0x4] _08126996: ldrb r0, [r2, 0x9] cmp r0, 0x1 bne _081269AC - ldr r0, _081269C0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _081269CC + ldr r3, =0x0000271c adds r1, r0, r3 str r1, [r2] - ldr r1, _081269D0 + ldr r1, =0x00002728 adds r0, r1 str r0, [r2, 0x4] _081269AC: pop {r0} bx r0 .align 2, 0 -_081269B0: .4byte 0x0203a173 -_081269B4: .4byte 0x0203a14c -_081269B8: .4byte 0x0203bc40 -_081269BC: .4byte 0x0203a17c -_081269C0: .4byte 0x03005d8c -_081269C4: .4byte 0x00001aae -_081269C8: .4byte 0x00001abe -_081269CC: .4byte 0x0000271c -_081269D0: .4byte 0x00002728 + .pool thumb_func_end sub_8126968 thumb_func_start sub_81269D4 @@ -603862,20 +584183,20 @@ sub_81269D4: @ 81269D4 sub sp, 0x8 lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _08126A18 + ldr r0, =0x0203a188 adds r4, r1, r0 cmp r1, 0 bne _08126A28 - ldr r0, _08126A1C + ldr r0, =0x085a6b90 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] str r1, [sp, 0x4] - ldr r0, _08126A20 + ldr r0, =0x085a6b48 movs r1, 0x4 bl GetMaxWidthInMenuTable lsls r0, 24 - ldr r2, _08126A24 + ldr r2, =0x00ffffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -603893,13 +584214,10 @@ _08126A14: mov r0, sp b _08126A2E .align 2, 0 -_08126A18: .4byte 0x0203a188 -_08126A1C: .4byte 0x085a6b90 -_08126A20: .4byte 0x085a6b48 -_08126A24: .4byte 0x00ffffff + .pool _08126A28: lsls r0, r1, 3 - ldr r1, _08126A54 + ldr r1, =0x085a6b90 adds r0, r1 _08126A2E: bl Window_AddFromTemplate @@ -603918,7 +584236,7 @@ _08126A2E: pop {r1} bx r1 .align 2, 0 -_08126A54: .4byte 0x085a6b90 + .pool thumb_func_end sub_81269D4 thumb_func_start sub_8126A58 @@ -603927,7 +584245,7 @@ sub_8126A58: @ 8126A58 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08126A84 + ldr r0, =0x0203a188 adds r4, r0 ldrb r0, [r4] movs r1, 0 @@ -603942,7 +584260,7 @@ sub_8126A58: @ 8126A58 pop {r0} bx r0 .align 2, 0 -_08126A84: .4byte 0x0203a188 + .pool thumb_func_end sub_8126A58 thumb_func_start sub_8126A88 @@ -603953,11 +584271,11 @@ sub_8126A88: @ 8126A88 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r2, _08126AB4 + ldr r2, =0x085a6b48 adds r0, r4, 0 movs r1, 0x4 bl PrintMenuTable - ldr r0, _08126AB8 + ldr r0, =0x0203a150 ldrb r2, [r0] adds r0, r4, 0 movs r1, 0x4 @@ -603966,14 +584284,13 @@ sub_8126A88: @ 8126A88 pop {r0} bx r0 .align 2, 0 -_08126AB4: .4byte 0x085a6b48 -_08126AB8: .4byte 0x0203a150 + .pool thumb_func_end sub_8126A88 thumb_func_start sub_8126ABC sub_8126ABC: @ 8126ABC push {lr} - ldr r1, _08126AD4 + ldr r1, =0x0203a150 movs r0, 0 strb r0, [r1] bl script_env_2_enable @@ -603982,7 +584299,7 @@ sub_8126ABC: @ 8126ABC pop {r0} bx r0 .align 2, 0 -_08126AD4: .4byte 0x0203a150 + .pool thumb_func_end sub_8126ABC thumb_func_start sub_8126AD8 @@ -603992,36 +584309,31 @@ sub_8126AD8: @ 8126AD8 lsls r4, 24 lsrs r4, 24 bl sub_8126ABC - ldr r2, _08126B14 - ldr r0, _08126B18 + ldr r2, =0x0203a17c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _08126B1C + ldr r3, =0x00001aae adds r1, r0, r3 str r1, [r2] - ldr r1, _08126B20 + ldr r1, =0x00001abe adds r0, r1 str r0, [r2, 0x4] movs r1, 0 movs r0, 0x10 strb r0, [r2, 0x8] strb r1, [r2, 0x9] - ldr r1, _08126B24 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08126B28 + ldr r1, =sub_8126B80 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08126B14: .4byte 0x0203a17c -_08126B18: .4byte 0x03005d8c -_08126B1C: .4byte 0x00001aae -_08126B20: .4byte 0x00001abe -_08126B24: .4byte 0x03005e00 -_08126B28: .4byte sub_8126B80 + 1 + .pool thumb_func_end sub_8126AD8 thumb_func_start sub_8126B2C @@ -604031,36 +584343,31 @@ sub_8126B2C: @ 8126B2C lsls r4, 24 lsrs r4, 24 bl sub_8126ABC - ldr r2, _08126B68 - ldr r0, _08126B6C + ldr r2, =0x0203a17c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _08126B70 + ldr r3, =0x0000271c adds r1, r0, r3 str r1, [r2] - ldr r1, _08126B74 + ldr r1, =0x00002728 adds r0, r1 str r0, [r2, 0x4] movs r0, 0xC strb r0, [r2, 0x8] movs r0, 0x1 strb r0, [r2, 0x9] - ldr r1, _08126B78 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08126B7C + ldr r1, =sub_8126B80 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08126B68: .4byte 0x0203a17c -_08126B6C: .4byte 0x03005d8c -_08126B70: .4byte 0x0000271c -_08126B74: .4byte 0x00002728 -_08126B78: .4byte 0x03005e00 -_08126B7C: .4byte sub_8126B80 + 1 + .pool thumb_func_end sub_8126B2C thumb_func_start sub_8126B80 @@ -604068,7 +584375,7 @@ sub_8126B80: @ 8126B80 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08126BCC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -604089,8 +584396,8 @@ sub_8126B80: @ 8126B80 beq _08126BF4 movs r0, 0x5 bl audio_play - ldr r1, _08126BD0 - ldr r0, _08126BD4 + ldr r1, =0x085a6b48 + ldr r0, =0x0203a150 ldrb r0, [r0] lsls r0, 3 adds r1, 0x4 @@ -604100,12 +584407,10 @@ sub_8126B80: @ 8126B80 bl _call_via_r1 b _08126C00 .align 2, 0 -_08126BCC: .4byte 0x02037fd4 -_08126BD0: .4byte 0x085a6b48 -_08126BD4: .4byte 0x0203a150 + .pool _08126BD8: bl GetMenuCursorPos - ldr r1, _08126BF0 + ldr r1, =0x0203a150 strb r0, [r1] lsls r0, r4, 24 asrs r0, 24 @@ -604115,7 +584420,7 @@ _08126BD8: bl sub_8126C08 b _08126C00 .align 2, 0 -_08126BF0: .4byte 0x0203a150 + .pool _08126BF4: movs r0, 0x5 bl audio_play @@ -604134,8 +584439,8 @@ sub_8126C08: @ 8126C08 movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r1, _08126C40 - ldr r0, _08126C44 + ldr r1, =0x085a6b68 + ldr r0, =0x0203a150 ldrb r0, [r0] lsls r0, 2 adds r0, r1 @@ -604156,8 +584461,7 @@ sub_8126C08: @ 8126C08 pop {r0} bx r0 .align 2, 0 -_08126C40: .4byte 0x085a6b68 -_08126C44: .4byte 0x0203a150 + .pool thumb_func_end sub_8126C08 thumb_func_start sub_8126C48 @@ -604169,21 +584473,19 @@ sub_8126C48: @ 8126C48 lsls r0, 24 cmp r0, 0 bne _08126C7C - ldr r4, _08126C70 - ldr r1, _08126C74 + ldr r4, =0x02021fc4 + ldr r1, =0x085ea83d adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _08126C78 + ldr r2, =sub_8126DA4 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC b _08126C96 .align 2, 0 -_08126C70: .4byte 0x02021fc4 -_08126C74: .4byte 0x085ea83d -_08126C78: .4byte sub_8126DA4 + 1 + .pool _08126C7C: - ldr r1, _08126C9C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -604191,7 +584493,7 @@ _08126C7C: movs r2, 0 movs r1, 0 strh r1, [r0, 0x1E] - ldr r0, _08126CA0 + ldr r0, =0x0203a173 strb r2, [r0] adds r0, r5, 0 bl sub_8126DCC @@ -604200,8 +584502,7 @@ _08126C96: pop {r0} bx r0 .align 2, 0 -_08126C9C: .4byte 0x03005e00 -_08126CA0: .4byte 0x0203a173 + .pool thumb_func_end sub_8126C48 thumb_func_start sub_8126CA4 @@ -604214,19 +584515,17 @@ sub_8126CA4: @ 8126CA4 lsls r0, 24 cmp r0, 0 bne _08126CD8 - ldr r4, _08126CCC - ldr r1, _08126CD0 + ldr r4, =0x02021fc4 + ldr r1, =0x085eaaec adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _08126CD4 + ldr r2, =sub_8126DA4 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC b _08126D00 .align 2, 0 -_08126CCC: .4byte 0x02021fc4 -_08126CD0: .4byte 0x085eaaec -_08126CD4: .4byte sub_8126DA4 + 1 + .pool _08126CD8: movs r0, 0 bl sub_8126A58 @@ -604236,22 +584535,21 @@ _08126CD8: movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _08126D08 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, _08126D0C + ldr r1, =sub_8129ABC + 1 str r1, [r0] _08126D00: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08126D08: .4byte 0x03005e00 -_08126D0C: .4byte sub_8129ABC + 1 + .pool thumb_func_end sub_8126CA4 thumb_func_start sub_8126D10 @@ -604263,21 +584561,19 @@ sub_8126D10: @ 8126D10 lsls r0, 24 cmp r0, 0 bne _08126D44 - ldr r4, _08126D38 - ldr r1, _08126D3C + ldr r4, =0x02021fc4 + ldr r1, =0x085ea83d adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _08126D40 + ldr r2, =sub_8126DA4 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC b _08126D5E .align 2, 0 -_08126D38: .4byte 0x02021fc4 -_08126D3C: .4byte 0x085ea83d -_08126D40: .4byte sub_8126DA4 + 1 + .pool _08126D44: - ldr r1, _08126D64 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -604285,7 +584581,7 @@ _08126D44: movs r2, 0 movs r1, 0x1 strh r1, [r0, 0x1E] - ldr r0, _08126D68 + ldr r0, =0x0203a173 strb r2, [r0] adds r0, r5, 0 bl sub_8126DCC @@ -604294,8 +584590,7 @@ _08126D5E: pop {r0} bx r0 .align 2, 0 -_08126D64: .4byte 0x03005e00 -_08126D68: .4byte 0x0203a173 + .pool thumb_func_end sub_8126D10 thumb_func_start sub_8126D6C @@ -604305,18 +584600,17 @@ sub_8126D6C: @ 8126D6C lsrs r4, r0, 24 movs r0, 0 bl sub_8126A58 - ldr r0, _08126D90 + ldr r0, =0x0203a17c ldrb r0, [r0, 0x9] cmp r0, 0 bne _08126D98 - ldr r0, _08126D94 + ldr r0, =0x0823b4e8 bl script_env_1_execute_new_script adds r0, r4, 0 bl remove_task b _08126D9E .align 2, 0 -_08126D90: .4byte 0x0203a17c -_08126D94: .4byte 0x0823b4e8 + .pool _08126D98: adds r0, r4, 0 bl sub_816B060 @@ -604333,19 +584627,18 @@ sub_8126DA4: @ 8126DA4 lsls r4, 24 lsrs r4, 24 bl sub_8126C08 - ldr r1, _08126DC4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08126DC8 + ldr r1, =sub_8126B80 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08126DC4: .4byte 0x03005e00 -_08126DC8: .4byte sub_8126B80 + 1 + .pool thumb_func_end sub_8126DA4 thumb_func_start sub_8126DCC @@ -604354,7 +584647,7 @@ sub_8126DCC: @ 8126DCC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08126DF8 + ldr r0, =0x085a6bb0 movs r1, 0xD0 movs r2, 0x20 bl gpu_pal_apply @@ -604369,7 +584662,7 @@ sub_8126DCC: @ 8126DCC pop {r0} bx r0 .align 2, 0 -_08126DF8: .4byte 0x085a6bb0 + .pool thumb_func_end sub_8126DCC thumb_func_start sub_8126DFC @@ -604385,25 +584678,23 @@ sub_8126DFC: @ 8126DFC lsrs r4, 24 adds r0, r5, 0 bl sub_8126E8C - ldr r0, _08126E38 + ldr r0, =0x0203a173 ldrb r2, [r0] adds r0, r4, 0 movs r1, 0x9 bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed - ldr r1, _08126E3C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08126E40 + ldr r1, =sub_8127088 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08126E38: .4byte 0x0203a173 -_08126E3C: .4byte 0x03005e00 -_08126E40: .4byte sub_8127088 + 1 + .pool thumb_func_end sub_8126DFC thumb_func_start sub_8126E44 @@ -604412,32 +584703,29 @@ sub_8126E44: @ 8126E44 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _08126E7C + ldr r5, =0x0203a188 ldrb r0, [r5, 0x1] movs r1, 0x11 bl Window_FastFillPixels adds r0, r4, 0 bl sub_8126E8C ldrb r0, [r5, 0x1] - ldr r1, _08126E80 + ldr r1, =0x0203a173 ldrb r2, [r1] movs r1, 0x9 bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed - ldr r1, _08126E84 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08126E88 + ldr r1, =sub_8127088 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08126E7C: .4byte 0x0203a188 -_08126E80: .4byte 0x0203a173 -_08126E84: .4byte 0x03005e00 -_08126E88: .4byte sub_8127088 + 1 + .pool thumb_func_end sub_8126E44 thumb_func_start sub_8126E8C @@ -604452,11 +584740,11 @@ sub_8126E8C: @ 8126E8C lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08126EEC + ldr r1, =0x03005e08 adds r1, r0, r1 - ldr r0, _08126EF0 + ldr r0, =0x0203a188 ldrb r5, [r0, 0x1] - ldr r0, _08126EF4 + ldr r0, =0x0203a17c ldrb r0, [r0, 0x9] movs r2, 0 mov r8, r2 @@ -604491,9 +584779,7 @@ _08126EC8: bl sub_8126F68 b _08126F0C .align 2, 0 -_08126EEC: .4byte 0x03005e08 -_08126EF0: .4byte 0x0203a188 -_08126EF4: .4byte 0x0203a17c + .pool _08126EF8: lsls r3, r4, 28 lsrs r3, 24 @@ -604510,17 +584796,17 @@ _08126F0C: lsrs r4, r0, 24 cmp r4, 0x7 bls _08126EC8 - ldr r0, _08126F5C + ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r6 lsls r1, 3 adds r1, r0 movs r2, 0x1E ldrsh r0, [r1, r2] - ldr r2, _08126F60 + ldr r2, =0x085e8cf0 cmp r0, 0x2 bne _08126F2C - ldr r2, _08126F64 + ldr r2, =0x085eb7ea _08126F2C: lsls r0, r4, 4 adds r0, 0x1 @@ -604544,9 +584830,7 @@ _08126F2C: pop {r0} bx r0 .align 2, 0 -_08126F5C: .4byte 0x03005e00 -_08126F60: .4byte 0x085e8cf0 -_08126F64: .4byte 0x085eb7ea + .pool thumb_func_end sub_8126E8C thumb_func_start sub_8126F68 @@ -604584,7 +584868,7 @@ _08126FA2: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _0812704C + ldr r4, =0x02021fc4 adds r0, r4, 0 bl sub_8127058 adds r0, r4, 0 @@ -604592,7 +584876,7 @@ _08126FA2: lsls r0, 16 lsrs r0, 16 adds r6, r0, r4 - ldr r1, _08127050 + ldr r1, =0x085a6b28 mov r2, r8 lsls r0, r2, 2 adds r0, r1 @@ -604623,7 +584907,7 @@ _08126FA2: movs r0, 0xBA strb r0, [r6] adds r6, 0x1 - ldr r1, _08127054 + ldr r1, =0x0203bc40 mov r2, r8 lsls r0, r2, 3 adds r0, r1 @@ -604657,9 +584941,7 @@ _08126FA2: pop {r0} bx r0 .align 2, 0 -_0812704C: .4byte 0x02021fc4 -_08127050: .4byte 0x085a6b28 -_08127054: .4byte 0x0203bc40 + .pool thumb_func_end sub_8126F68 thumb_func_start sub_8127058 @@ -604668,7 +584950,7 @@ sub_8127058: @ 8127058 adds r5, r0, 0 lsls r4, r1, 24 lsrs r4, 24 - ldr r1, _08127074 + ldr r1, =0x085ea7c8 bl gf_strcpy cmp r4, 0x1 bne _08127078 @@ -604677,7 +584959,7 @@ sub_8127058: @ 8127058 movs r0, 0x5 b _0812707E .align 2, 0 -_08127074: .4byte 0x085ea7c8 + .pool _08127078: movs r0, 0x2 strb r0, [r5, 0x2] @@ -604694,7 +584976,7 @@ sub_8127088: @ 8127088 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081270B8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -604715,7 +584997,7 @@ sub_8127088: @ 8127088 beq _081270DE b _081270CE .align 2, 0 -_081270B8: .4byte 0x02037fd4 + .pool _081270BC: cmp r1, 0x8 bne _081270CE @@ -604728,7 +585010,7 @@ _081270C0: _081270CE: movs r0, 0x5 bl audio_play - ldr r0, _081270E4 + ldr r0, =0x0203a173 strb r4, [r0] adds r0, r5, 0 bl sub_81270E8 @@ -604737,7 +585019,7 @@ _081270DE: pop {r0} bx r0 .align 2, 0 -_081270E4: .4byte 0x0203a173 + .pool thumb_func_end sub_8127088 thumb_func_start sub_81270E8 @@ -604745,18 +585027,18 @@ sub_81270E8: @ 81270E8 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _08127134 + ldr r4, =0x0203a173 ldrb r0, [r4] bl sub_8161AD0 - ldr r1, _08127138 + ldr r1, =0x0203a151 strb r0, [r1] lsls r0, 24 cmp r0, 0 beq _08127154 ldrb r0, [r4] bl sub_8161A38 - ldr r2, _0812713C - ldr r1, _08127140 + ldr r2, =0x0203a14c + ldr r1, =0x0203bc40 ldrb r0, [r4] lsls r0, 3 adds r0, r1 @@ -604764,36 +585046,29 @@ sub_81270E8: @ 81270E8 str r0, [r2] adds r0, r5, 0 bl sub_81279B4 - ldr r0, _08127144 + ldr r0, =0x0203a170 movs r1, 0 strh r1, [r0] - ldr r0, _08127148 + ldr r0, =0x0203a16e strh r1, [r0] - ldr r1, _0812714C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08127150 + ldr r1, =sub_8127620 + 1 str r1, [r0] b _0812716E .align 2, 0 -_08127134: .4byte 0x0203a173 -_08127138: .4byte 0x0203a151 -_0812713C: .4byte 0x0203a14c -_08127140: .4byte 0x0203bc40 -_08127144: .4byte 0x0203a170 -_08127148: .4byte 0x0203a16e -_0812714C: .4byte 0x03005e00 -_08127150: .4byte sub_8127620 + 1 + .pool _08127154: movs r0, 0x1 bl sub_8126A58 - ldr r4, _08127174 - ldr r1, _08127178 + ldr r4, =0x02021fc4 + ldr r1, =0x085ea83d adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _0812717C + ldr r2, =sub_8127180 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -604802,9 +585077,7 @@ _0812716E: pop {r0} bx r0 .align 2, 0 -_08127174: .4byte 0x02021fc4 -_08127178: .4byte 0x085ea83d -_0812717C: .4byte sub_8127180 + 1 + .pool thumb_func_end sub_81270E8 thumb_func_start sub_8127180 @@ -604828,7 +585101,7 @@ sub_812719C: @ 812719C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _081271BC + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -604841,7 +585114,7 @@ sub_812719C: @ 812719C bl sub_81271CC b _081271C6 .align 2, 0 -_081271BC: .4byte 0x03005e00 + .pool _081271C0: adds r0, r2, 0 bl sub_8127268 @@ -604863,19 +585136,18 @@ sub_81271CC: @ 81271CC movs r1, 0 bl sub_81973C4 bl sub_8126C08 - ldr r1, _08127200 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08127204 + ldr r1, =sub_8126B80 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08127200: .4byte 0x03005e00 -_08127204: .4byte sub_8126B80 + 1 + .pool thumb_func_end sub_81271CC thumb_func_start sub_8127208 @@ -604884,14 +585156,14 @@ sub_8127208: @ 8127208 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08127244 + ldr r0, =0x085a6bb0 movs r1, 0xD0 movs r2, 0x20 bl gpu_pal_apply movs r0, 0 movs r1, 0 bl sub_8197434 - ldr r1, _08127248 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -604899,7 +585171,7 @@ sub_8127208: @ 8127208 movs r2, 0 movs r1, 0x2 strh r1, [r0, 0x1E] - ldr r0, _0812724C + ldr r0, =0x0203a173 strb r2, [r0] adds r0, r4, 0 bl sub_8126DFC @@ -604907,16 +585179,14 @@ sub_8127208: @ 8127208 pop {r0} bx r0 .align 2, 0 -_08127244: .4byte 0x085a6bb0 -_08127248: .4byte 0x03005e00 -_0812724C: .4byte 0x0203a173 + .pool thumb_func_end sub_8127208 thumb_func_start sub_8127250 sub_8127250: @ 8127250 push {lr} lsls r1, 24 - ldr r2, _08127264 + ldr r2, =0x085a6b28 lsrs r1, 22 adds r1, r2 ldr r1, [r1] @@ -604924,7 +585194,7 @@ sub_8127250: @ 8127250 pop {r0} bx r0 .align 2, 0 -_08127264: .4byte 0x085a6b28 + .pool thumb_func_end sub_8127250 thumb_func_start sub_8127268 @@ -604945,9 +585215,9 @@ sub_8127268: @ 8127268 thumb_func_start sub_8127284 sub_8127284: @ 8127284 push {lr} - ldr r3, _081272AC + ldr r3, =0x0203a18c ldr r2, [r3] - ldr r0, _081272B0 + ldr r0, =0x0203a151 ldrb r0, [r0] adds r0, 0x1 movs r1, 0xA4 @@ -604959,34 +585229,32 @@ sub_8127284: @ 8127284 ldrb r1, [r1] cmp r1, 0x8 bls _081272B8 - ldr r2, _081272B4 + ldr r2, =0x00000521 adds r1, r0, r2 movs r0, 0x8 strb r0, [r1] b _081272BE .align 2, 0 -_081272AC: .4byte 0x0203a18c -_081272B0: .4byte 0x0203a151 -_081272B4: .4byte 0x00000521 + .pool _081272B8: - ldr r2, _081272C4 + ldr r2, =0x00000521 adds r0, r2 strb r1, [r0] _081272BE: pop {r0} bx r0 .align 2, 0 -_081272C4: .4byte 0x00000521 + .pool thumb_func_end sub_8127284 thumb_func_start sub_81272C8 sub_81272C8: @ 81272C8 push {r4,lr} - ldr r0, _081272E8 - ldr r1, _081272EC - ldr r2, _081272F0 + ldr r0, =0x0203a170 + ldr r1, =0x0203a16e + ldr r2, =0x0203a18c ldr r3, [r2] - ldr r4, _081272F4 + ldr r4, =0x00000521 adds r2, r3, r4 ldrb r2, [r2] subs r4, 0x1 @@ -604997,21 +585265,18 @@ sub_81272C8: @ 81272C8 pop {r0} bx r0 .align 2, 0 -_081272E8: .4byte 0x0203a170 -_081272EC: .4byte 0x0203a16e -_081272F0: .4byte 0x0203a18c -_081272F4: .4byte 0x00000521 + .pool thumb_func_end sub_81272C8 thumb_func_start sub_81272F8 sub_81272F8: @ 81272F8 push {r4,lr} sub sp, 0x4 - ldr r0, _08127320 - ldr r1, _08127324 - ldr r2, _08127328 + ldr r0, =0x0203a170 + ldr r1, =0x0203a16e + ldr r2, =0x0203a18c ldr r3, [r2] - ldr r4, _0812732C + ldr r4, =0x00000521 adds r2, r3, r4 ldrb r2, [r2] subs r4, 0x1 @@ -605025,10 +585290,7 @@ sub_81272F8: @ 81272F8 pop {r0} bx r0 .align 2, 0 -_08127320: .4byte 0x0203a170 -_08127324: .4byte 0x0203a16e -_08127328: .4byte 0x0203a18c -_0812732C: .4byte 0x00000521 + .pool thumb_func_end sub_81272F8 thumb_func_start sub_8127330 @@ -605039,16 +585301,16 @@ sub_8127330: @ 8127330 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08127368 + ldr r0, =0x03005e08 adds r1, r0 - ldr r0, _0812736C + ldr r0, =0x0203a173 ldrb r0, [r0] subs r0, 0x6 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bls _08127378 - ldr r0, _08127370 + ldr r0, =0x0203a17c ldrb r0, [r0, 0x9] cmp r0, 0x1 bne _08127378 @@ -605056,22 +585318,19 @@ sub_8127330: @ 8127330 ldrsh r0, [r1, r2] cmp r0, 0 bne _08127378 - ldr r0, _08127374 + ldr r0, =0x02021cc4 movs r1, 0x1 bl sub_8127058 b _08127380 .align 2, 0 -_08127368: .4byte 0x03005e08 -_0812736C: .4byte 0x0203a173 -_08127370: .4byte 0x0203a17c -_08127374: .4byte 0x02021cc4 + .pool _08127378: - ldr r0, _08127434 + ldr r0, =0x02021cc4 movs r1, 0 bl sub_8127058 _08127380: movs r6, 0 - ldr r1, _08127438 + ldr r1, =0x0203a18c ldr r0, [r1] movs r3, 0xA4 lsls r3, 3 @@ -605090,7 +585349,7 @@ _08127396: adds r4, r0 ldr r0, [r5] adds r0, r4 - ldr r1, _0812743C + ldr r1, =0x0203a14c ldr r1, [r1] adds r1, r6 ldrb r1, [r1] @@ -605114,7 +585373,7 @@ _08127396: cmp r6, r0 blt _08127396 _081273D6: - ldr r5, _08127438 + ldr r5, =0x0203a18c lsls r4, r6, 1 adds r4, r6 lsls r4, 3 @@ -605123,7 +585382,7 @@ _081273D6: adds r4, r3 ldr r0, [r5] adds r0, r4 - ldr r1, _08127440 + ldr r1, =0x085e8cf0 bl gf_strcpy ldr r0, [r5] lsls r2, r6, 3 @@ -605135,14 +585394,14 @@ _081273D6: movs r1, 0x2 negs r1, r1 str r1, [r0] - ldr r2, _08127444 + ldr r2, =0x03006310 adds r1, r2, 0 - ldr r0, _08127448 + ldr r0, =0x085a6bd0 ldm r0!, {r3,r4,r6} stm r1!, {r3,r4,r6} ldm r0!, {r3,r4,r6} stm r1!, {r3,r4,r6} - ldr r0, _0812744C + ldr r0, =0x0203a188 ldrb r0, [r0, 0x1] strb r0, [r2, 0x10] ldr r0, [r5] @@ -605152,7 +585411,7 @@ _081273D6: ldrb r1, [r1] strh r1, [r2, 0xC] str r0, [r2] - ldr r6, _08127450 + ldr r6, =0x00000521 adds r0, r6 ldrb r0, [r0] strh r0, [r2, 0xE] @@ -605160,14 +585419,7 @@ _081273D6: pop {r0} bx r0 .align 2, 0 -_08127434: .4byte 0x02021cc4 -_08127438: .4byte 0x0203a18c -_0812743C: .4byte 0x0203a14c -_08127440: .4byte 0x085e8cf0 -_08127444: .4byte 0x03006310 -_08127448: .4byte 0x085a6bd0 -_0812744C: .4byte 0x0203a188 -_08127450: .4byte 0x00000521 + .pool thumb_func_end sub_8127330 thumb_func_start sub_8127454 @@ -605176,10 +585428,10 @@ sub_8127454: @ 8127454 adds r5, r0, 0 lsls r4, r1, 16 lsrs r4, 16 - ldr r1, _08127478 + ldr r1, =0x02021cc4 bl gf_strcpy lsls r4, 5 - ldr r0, _0812747C + ldr r0, =0x085a5c09 adds r4, r0 adds r0, r5, 0 adds r1, r4, 0 @@ -605188,8 +585440,7 @@ sub_8127454: @ 8127454 pop {r0} bx r0 .align 2, 0 -_08127478: .4byte 0x02021cc4 -_0812747C: .4byte 0x085a5c09 + .pool thumb_func_end sub_8127454 thumb_func_start sub_8127480 @@ -605264,9 +585515,9 @@ _081274F6: sub_8127500: @ 8127500 push {r4,lr} sub sp, 0x10 - ldr r4, _08127548 + ldr r4, =0x0203a18c ldr r1, [r4] - ldr r2, _0812754C + ldr r2, =0x00000522 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF @@ -605282,7 +585533,7 @@ sub_8127500: @ 8127500 movs r0, 0x6E str r0, [sp, 0x4] str r0, [sp, 0x8] - ldr r0, _08127550 + ldr r0, =0x0203a170 str r0, [sp, 0xC] movs r0, 0x2 movs r1, 0x3C @@ -605290,7 +585541,7 @@ sub_8127500: @ 8127500 movs r3, 0x94 bl sub_81AF4A0 ldr r1, [r4] - ldr r2, _0812754C + ldr r2, =0x00000522 adds r1, r2 strb r0, [r1] _08127540: @@ -605299,24 +585550,22 @@ _08127540: pop {r0} bx r0 .align 2, 0 -_08127548: .4byte 0x0203a18c -_0812754C: .4byte 0x00000522 -_08127550: .4byte 0x0203a170 + .pool thumb_func_end sub_8127500 thumb_func_start sub_8127554 sub_8127554: @ 8127554 push {r4,lr} - ldr r4, _08127578 + ldr r4, =0x0203a18c ldr r0, [r4] - ldr r2, _0812757C + ldr r2, =0x00000522 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF beq _08127572 bl sub_81AF620 ldr r0, [r4] - ldr r1, _0812757C + ldr r1, =0x00000522 adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -605325,8 +585574,7 @@ _08127572: pop {r0} bx r0 .align 2, 0 -_08127578: .4byte 0x0203a18c -_0812757C: .4byte 0x00000522 + .pool thumb_func_end sub_8127554 thumb_func_start sub_8127580 @@ -605353,18 +585601,18 @@ sub_812759C: @ 812759C lsls r5, r4, 2 adds r5, r4 lsls r5, 3 - ldr r0, _08127600 + ldr r0, =0x03005e08 adds r5, r0 movs r0, 0x3 bl sub_81269D4 - ldr r0, _08127604 + ldr r0, =0x0203a173 ldrb r0, [r0] bl sub_8127718 - ldr r6, _08127608 - ldr r0, _0812760C + ldr r6, =0x0203a18c + ldr r0, =0x00000524 bl malloc_and_clear str r0, [r6] - ldr r1, _08127610 + ldr r1, =0x00000522 adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -605373,10 +585621,10 @@ sub_812759C: @ 812759C bl sub_81272F8 adds r0, r4, 0 bl sub_8127330 - ldr r0, _08127614 - ldr r1, _08127618 + ldr r0, =0x03006310 + ldr r1, =0x0203a170 ldrh r1, [r1] - ldr r2, _0812761C + ldr r2, =0x0203a16e ldrh r2, [r2] bl calls_per_item_funcs_in_list_outer lsls r0, 24 @@ -605387,14 +585635,7 @@ sub_812759C: @ 812759C pop {r0} bx r0 .align 2, 0 -_08127600: .4byte 0x03005e08 -_08127604: .4byte 0x0203a173 -_08127608: .4byte 0x0203a18c -_0812760C: .4byte 0x00000524 -_08127610: .4byte 0x00000522 -_08127614: .4byte 0x03006310 -_08127618: .4byte 0x0203a170 -_0812761C: .4byte 0x0203a16e + .pool thumb_func_end sub_812759C thumb_func_start sub_8127620 @@ -605405,19 +585646,18 @@ sub_8127620: @ 8127620 lsrs r4, 24 adds r0, r4, 0 bl sub_812759C - ldr r1, _08127644 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08127648 + ldr r1, =sub_812764C + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08127644: .4byte 0x03005e00 -_08127648: .4byte sub_812764C + 1 + .pool thumb_func_end sub_8127620 thumb_func_start sub_812764C @@ -605430,9 +585670,9 @@ sub_812764C: @ 812764C lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _08127694 + ldr r1, =0x03005e08 adds r5, r0, r1 - ldr r0, _08127698 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -605442,8 +585682,8 @@ sub_812764C: @ 812764C bl sub_81AE604 adds r4, r0, 0 ldrb r0, [r5, 0x1A] - ldr r7, _0812769C - ldr r1, _081276A0 + ldr r7, =0x0203a170 + ldr r1, =0x0203a16e mov r8, r1 adds r1, r7, 0 mov r2, r8 @@ -605457,14 +585697,11 @@ sub_812764C: @ 812764C bne _081276C4 b _08127700 .align 2, 0 -_08127694: .4byte 0x03005e08 -_08127698: .4byte 0x02037fd4 -_0812769C: .4byte 0x0203a170 -_081276A0: .4byte 0x0203a16e + .pool _081276A4: movs r0, 0x5 bl audio_play - ldr r0, _081276C0 + ldr r0, =0x085a6b78 movs r2, 0x16 ldrsh r1, [r5, r2] lsls r1, 3 @@ -605475,11 +585712,11 @@ _081276A4: bl _call_via_r1 b _08127700 .align 2, 0 -_081276C0: .4byte 0x085a6b78 + .pool _081276C4: movs r0, 0x5 bl audio_play - ldr r0, _0812770C + ldr r0, =0x0203a172 strb r4, [r0] bl sub_8127554 ldrb r0, [r5, 0x1A] @@ -605489,10 +585726,10 @@ _081276C4: movs r0, 0x1 bl sub_8126A58 bl sub_81277A8 - ldr r0, _08127710 + ldr r0, =0x0203a18c ldr r0, [r0] bl free - ldr r1, _08127714 + ldr r1, =0x085a6b78 movs r2, 0x16 ldrsh r0, [r5, r2] lsls r0, 3 @@ -605507,9 +585744,7 @@ _08127700: pop {r0} bx r0 .align 2, 0 -_0812770C: .4byte 0x0203a172 -_08127710: .4byte 0x0203a18c -_08127714: .4byte 0x085a6b78 + .pool thumb_func_end sub_812764C thumb_func_start sub_8127718 @@ -605541,24 +585776,22 @@ sub_8127744: @ 8127744 push {r4,r5,lr} sub sp, 0xC adds r4, r0, 0 - ldr r0, _08127764 + ldr r0, =0x0203a188 ldrb r5, [r0, 0x3] adds r0, r5, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _08127768 + ldr r0, =0x0203a151 ldrb r0, [r0] cmp r4, r0 bcc _08127770 - ldr r2, _0812776C + ldr r2, =0x085e8d62 b _08127782 .align 2, 0 -_08127764: .4byte 0x0203a188 -_08127768: .4byte 0x0203a151 -_0812776C: .4byte 0x085e8d62 + .pool _08127770: - ldr r1, _081277A0 - ldr r0, _081277A4 + ldr r1, =0x085a5c08 + ldr r0, =0x0203a14c ldr r0, [r0] adds r0, r4 ldrb r0, [r0] @@ -605581,8 +585814,7 @@ _08127782: pop {r0} bx r0 .align 2, 0 -_081277A0: .4byte 0x085a5c08 -_081277A4: .4byte 0x0203a14c + .pool thumb_func_end sub_8127744 thumb_func_start sub_81277A8 @@ -605602,7 +585834,7 @@ sub_81277BC: @ 81277BC lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _081277D4 + ldr r3, =0x0203a152 _081277C6: adds r0, r1, r3 ldrb r0, [r0] @@ -605611,7 +585843,7 @@ _081277C6: movs r0, 0x1 b _081277E4 .align 2, 0 -_081277D4: .4byte 0x0203a152 + .pool _081277D8: adds r0, r1, 0x1 lsls r0, 24 @@ -605630,7 +585862,7 @@ sub_81277E8: @ 81277E8 lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _08127800 + ldr r3, =0x0203a162 _081277F2: adds r0, r1, r3 ldrb r0, [r0] @@ -605639,7 +585871,7 @@ _081277F2: movs r0, 0x1 b _08127810 .align 2, 0 -_08127800: .4byte 0x0203a162 + .pool _08127804: adds r0, r1, 0x1 lsls r0, 24 @@ -605660,20 +585892,20 @@ sub_8127814: @ 8127814 mov r5, r8 push {r5-r7} movs r5, 0 - ldr r0, _081278B4 + ldr r0, =0x0203a152 movs r1, 0 movs r2, 0x10 bl memset - ldr r0, _081278B8 + ldr r0, =0x0203a162 movs r1, 0 movs r2, 0xC bl memset movs r6, 0 - ldr r0, _081278BC + ldr r0, =0x03005d8c mov r10, r0 - ldr r1, _081278C0 + ldr r1, =0x00001aae mov r9, r1 - ldr r3, _081278C4 + ldr r3, =0x0203a173 mov r8, r3 _08127842: mov r1, r10 @@ -605687,16 +585919,16 @@ _08127842: mov r3, r8 ldrb r0, [r3] lsls r0, 3 - ldr r1, _081278C8 + ldr r1, =0x0203bc40 adds r0, r1 ldrb r0, [r0, 0x4] cmp r2, r0 bcs _081278E2 - ldr r7, _081278B4 + ldr r7, =0x0203a152 adds r3, r1, 0 mov r12, r3 _08127868: - ldr r0, _081278CC + ldr r0, =0x0203a14c ldr r1, [r0] adds r1, r2 mov r3, r10 @@ -605714,7 +585946,7 @@ _08127868: ldrb r0, [r7] cmp r0, r4 beq _081278A2 - ldr r3, _081278B4 + ldr r3, =0x0203a152 adds r2, r4, 0 _08127890: adds r0, r1, 0x1 @@ -605736,13 +585968,7 @@ _081278A2: lsrs r5, r0, 16 b _081278E2 .align 2, 0 -_081278B4: .4byte 0x0203a152 -_081278B8: .4byte 0x0203a162 -_081278BC: .4byte 0x03005d8c -_081278C0: .4byte 0x00001aae -_081278C4: .4byte 0x0203a173 -_081278C8: .4byte 0x0203bc40 -_081278CC: .4byte 0x0203a14c + .pool _081278D0: lsls r0, r4, 16 lsrs r2, r0, 16 @@ -605761,12 +585987,12 @@ _081278E2: bls _08127842 movs r5, 0 movs r6, 0 - ldr r3, _0812790C + ldr r3, =0x0203bc40 mov r8, r3 _081278F4: - ldr r0, _08127910 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08127914 + ldr r1, =0x0000271c adds r0, r1 adds r0, r6 ldrb r0, [r0] @@ -605776,16 +586002,14 @@ _081278F4: movs r2, 0 b _0812798C .align 2, 0 -_0812790C: .4byte 0x0203bc40 -_08127910: .4byte 0x03005d8c -_08127914: .4byte 0x0000271c + .pool _08127918: - ldr r0, _08127978 + ldr r0, =0x0203a14c ldr r1, [r0] adds r1, r2 - ldr r0, _0812797C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _08127980 + ldr r3, =0x0000271c adds r0, r3 adds r0, r6 ldrb r1, [r1] @@ -605803,7 +586027,7 @@ _08127918: movs r1, 0 cmp r1, r5 bcs _08127966 - ldr r2, _08127984 + ldr r2, =0x0203a162 ldrb r0, [r2] cmp r0, r4 beq _08127966 @@ -605822,7 +586046,7 @@ _08127954: _08127966: cmp r1, r5 bne _08127988 - ldr r0, _08127984 + ldr r0, =0x0203a162 adds r0, r5, r0 strb r4, [r0] adds r0, r5, 0x1 @@ -605830,15 +586054,12 @@ _08127966: lsrs r5, r0, 16 b _0812799A .align 2, 0 -_08127978: .4byte 0x0203a14c -_0812797C: .4byte 0x03005d8c -_08127980: .4byte 0x0000271c -_08127984: .4byte 0x0203a162 + .pool _08127988: lsls r0, r4, 16 lsrs r2, r0, 16 _0812798C: - ldr r0, _081279B0 + ldr r0, =0x0203a173 ldrb r0, [r0] lsls r0, 3 add r0, r8 @@ -605858,7 +586079,7 @@ _0812799A: pop {r0} bx r0 .align 2, 0 -_081279B0: .4byte 0x0203a173 + .pool thumb_func_end sub_8127814 thumb_func_start sub_81279B4 @@ -605875,14 +586096,14 @@ sub_81279B4: @ 81279B4 sub_81279C4: @ 81279C4 push {r4,lr} movs r2, 0 - ldr r0, _081279F0 + ldr r0, =0x0203a170 ldrh r0, [r0] - ldr r1, _081279F4 + ldr r1, =0x0203a16e ldrh r1, [r1] adds r0, r1 adds r1, r0, 0x1 - ldr r4, _081279F8 - ldr r3, _081279FC + ldr r4, =0x0203a152 + ldr r3, =0x0203a162 _081279D8: adds r0, r2, r4 ldrb r0, [r0] @@ -605898,10 +586119,7 @@ _081279EC: movs r0, 0 b _08127A0C .align 2, 0 -_081279F0: .4byte 0x0203a170 -_081279F4: .4byte 0x0203a16e -_081279F8: .4byte 0x0203a152 -_081279FC: .4byte 0x0203a162 + .pool _08127A00: adds r0, r2, 0x1 lsls r0, 16 @@ -605939,19 +586157,18 @@ sub_8127A30: @ 8127A30 movs r0, 0 movs r1, 0 bl sub_8197434 - ldr r1, _08127A54 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08127A58 + ldr r1, =sub_8127A14 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08127A54: .4byte 0x03005e00 -_08127A58: .4byte sub_8127A14 + 1 + .pool thumb_func_end sub_8127A30 thumb_func_start sub_8127A5C @@ -605959,7 +586176,7 @@ sub_8127A5C: @ 8127A5C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08127A88 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -605977,7 +586194,7 @@ _08127A82: pop {r0} bx r0 .align 2, 0 -_08127A88: .4byte 0x030022c0 + .pool thumb_func_end sub_8127A5C thumb_func_start sub_8127A8C @@ -605989,7 +586206,7 @@ sub_8127A8C: @ 8127A8C lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _08127AC4 + ldr r0, =0x03005e08 adds r4, r0 bl sub_8127554 bl sub_81277A8 @@ -605997,7 +586214,7 @@ sub_8127A8C: @ 8127A8C movs r1, 0 movs r2, 0 bl sub_81AE6C8 - ldr r0, _08127AC8 + ldr r0, =0x0203a18c ldr r0, [r0] bl free adds r0, r5, 0 @@ -606006,8 +586223,7 @@ sub_8127A8C: @ 8127A8C pop {r0} bx r0 .align 2, 0 -_08127AC4: .4byte 0x03005e08 -_08127AC8: .4byte 0x0203a18c + .pool thumb_func_end sub_8127A8C thumb_func_start sub_8127ACC @@ -606015,12 +586231,12 @@ sub_8127ACC: @ 8127ACC push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _08127AFC + ldr r3, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 adds r4, r2, r3 - ldr r0, _08127B00 + ldr r0, =0x03005d8c ldr r1, [r0] ldrh r0, [r1] strh r0, [r4, 0xE] @@ -606035,8 +586251,7 @@ sub_8127ACC: @ 8127ACC pop {r0} bx r0 .align 2, 0 -_08127AFC: .4byte 0x03005e00 -_08127B00: .4byte 0x03005d8c + .pool thumb_func_end sub_8127ACC thumb_func_start sub_8127B04 @@ -606047,7 +586262,7 @@ sub_8127B04: @ 8127B04 lsls r5, 24 lsrs r5, 24 bl cur_mapdata_full_redraw - ldr r0, _08127B4C + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -606056,7 +586271,7 @@ sub_8127B04: @ 8127B04 asrs r1, 24 movs r2, 0x1 negs r2, r2 - ldr r3, _08127B50 + ldr r3, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -606074,8 +586289,7 @@ sub_8127B04: @ 8127B04 pop {r0} bx r0 .align 2, 0 -_08127B4C: .4byte 0x03005d8c -_08127B50: .4byte 0x03005e00 + .pool thumb_func_end sub_8127B04 thumb_func_start sub_8127B54 @@ -606085,22 +586299,21 @@ sub_8127B54: @ 8127B54 lsrs r2, r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, _08127B74 + ldr r0, =0x0000ffff cmp r2, 0x22 beq _08127B7C cmp r2, 0x26 bne _08127B86 - ldr r0, _08127B78 + ldr r0, =0x085a72e4 adds r0, r1, r0 ldrb r0, [r0] lsls r0, 28 lsrs r0, 16 b _08127B86 .align 2, 0 -_08127B74: .4byte 0x0000ffff -_08127B78: .4byte 0x085a72e4 + .pool _08127B7C: - ldr r0, _08127B8C + ldr r0, =0x085a72ec adds r0, r1, r0 ldrb r0, [r0] lsls r0, 28 @@ -606109,7 +586322,7 @@ _08127B86: pop {r1} bx r1 .align 2, 0 -_08127B8C: .4byte 0x085a72ec + .pool thumb_func_end sub_8127B54 thumb_func_start sub_8127B90 @@ -606168,10 +586381,10 @@ _08127BF0: ldr r4, [sp, 0x10] lsls r4, 5 str r4, [sp, 0x18] - ldr r0, _08127C58 + ldr r0, =0x085a5c24 adds r0, r4, r0 str r0, [sp, 0x1C] - ldr r0, _08127C5C + ldr r0, =0x085a5c08 adds r0, r4, r0 str r0, [sp, 0x24] ldr r3, [sp, 0x8] @@ -606218,8 +586431,7 @@ _08127C50: mov r8, r4 b _08127C64 .align 2, 0 -_08127C58: .4byte 0x085a5c24 -_08127C5C: .4byte 0x085a5c08 + .pool _08127C60: movs r0, 0 mov r8, r0 @@ -606247,7 +586459,7 @@ _08127C8E: movs r6, 0 _08127C90: ldr r3, [sp, 0x18] - ldr r4, _08127CD8 + ldr r4, =0x085a5c08 adds r0, r3, r4 ldrb r0, [r0] ldr r4, [sp, 0x20] @@ -606257,7 +586469,7 @@ _08127C90: bl sub_8127B54 lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _08127CDC + ldr r0, =0x0000ffff cmp r5, r0 beq _08127CE0 asrs r0, r7, 16 @@ -606281,8 +586493,7 @@ _08127C90: bl sub_8088338 b _08127D06 .align 2, 0 -_08127CD8: .4byte 0x085a5c08 -_08127CDC: .4byte 0x0000ffff + .pool _08127CE0: asrs r0, r7, 16 mov r2, r9 @@ -606342,20 +586553,19 @@ sub_8127D38: @ 8127D38 lsrs r4, r1, 16 lsls r2, 16 lsrs r2, 16 - ldr r1, _08127D60 + ldr r1, =0x085a5c08 lsls r0, r2, 5 adds r0, r1 ldrb r0, [r0, 0x12] cmp r0, 0x9 bhi _08127E10 lsls r0, 2 - ldr r1, _08127D64 + ldr r1, =_08127D68 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08127D60: .4byte 0x085a5c08 -_08127D64: .4byte _08127D68 + .pool .align 2, 0 _08127D68: .4byte _08127D90 @@ -606456,12 +586666,12 @@ sub_8127E18: @ 8127E18 push {r5-r7} sub sp, 0x4 movs r6, 0 - ldr r7, _08127EF8 - ldr r0, _08127EFC + ldr r7, =0x02037318 + ldr r0, =0x020375e2 mov r8, r0 - ldr r1, _08127F00 + ldr r1, =0x020375e4 mov r10, r1 - ldr r2, _08127F04 + ldr r2, =0x03005d8c mov r9, r2 _08127E34: adds r5, r6, 0 @@ -606484,7 +586694,7 @@ _08127E34: ldrh r0, [r0, 0x14] cmp r0, r5 beq _08127E82 - ldr r0, _08127EF8 + ldr r0, =0x02037318 ldr r3, [r0, 0x4] ldrb r6, [r3] adds r4, r5, 0 @@ -606509,11 +586719,11 @@ _08127E82: adds r4, r2 lsls r4, 3 adds r1, r4, r1 - ldr r5, _08127F08 + ldr r5, =0x00003f20 adds r0, r5, 0 ldrb r1, [r1, 0x1] adds r0, r1 - ldr r1, _08127F0C + ldr r1, =0x0203a190 ldr r1, [r1] ldr r1, [r1, 0x1C] ldrh r1, [r1] @@ -606524,13 +586734,13 @@ _08127E82: ldrb r0, [r4] mov r6, r8 strh r0, [r6] - ldr r1, _08127F10 + ldr r1, =0x0203aa34 ldrh r1, [r1] mov r2, r10 strh r1, [r2] - ldr r1, _08127F14 + ldr r1, =0x0203aa36 ldrh r1, [r1] - ldr r4, _08127F18 + ldr r4, =0x020375e6 strh r1, [r4] mov r5, r9 ldr r2, [r5] @@ -606544,7 +586754,7 @@ _08127E82: mov r6, r10 movs r4, 0 ldrsh r3, [r6, r4] - ldr r5, _08127F18 + ldr r5, =0x020375e6 movs r6, 0 ldrsh r4, [r5, r6] str r4, [sp] @@ -606558,15 +586768,7 @@ _08127E82: bl sub_808F254 b _08127F26 .align 2, 0 -_08127EF8: .4byte 0x02037318 -_08127EFC: .4byte 0x020375e2 -_08127F00: .4byte 0x020375e4 -_08127F04: .4byte 0x03005d8c -_08127F08: .4byte 0x00003f20 -_08127F0C: .4byte 0x0203a190 -_08127F10: .4byte 0x0203aa34 -_08127F14: .4byte 0x0203aa36 -_08127F18: .4byte 0x020375e6 + .pool _08127F1C: adds r0, r6, 0x1 lsls r0, 24 @@ -606588,7 +586790,7 @@ _08127F26: sub_8127F38: @ 8127F38 push {lr} movs r1, 0 - ldr r0, _08127F54 + ldr r0, =0x0203a17c ldrb r2, [r0, 0x8] cmp r1, r2 bcs _08127F62 @@ -606601,7 +586803,7 @@ _08127F46: movs r0, 0x1 b _08127F64 .align 2, 0 -_08127F54: .4byte 0x0203a17c + .pool _08127F58: adds r0, r1, 0x1 lsls r0, 16 @@ -606620,31 +586822,27 @@ sub_8127F68: @ 8127F68 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08127F98 + ldr r0, =0x0203a17c ldrb r0, [r0, 0x9] cmp r0, 0x1 bne _08127FAC - ldr r0, _08127F9C + ldr r0, =0x0203a173 ldrb r0, [r0] cmp r0, 0x6 beq _08127FAC cmp r0, 0x7 beq _08127FAC - ldr r4, _08127FA0 - ldr r1, _08127FA4 + ldr r4, =0x02021fc4 + ldr r1, =0x085ea9ae adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _08127FA8 + ldr r2, =sub_8127A5C + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC b _0812804C .align 2, 0 -_08127F98: .4byte 0x0203a17c -_08127F9C: .4byte 0x0203a173 -_08127FA0: .4byte 0x02021fc4 -_08127FA4: .4byte 0x085ea9ae -_08127FA8: .4byte sub_8127A5C + 1 + .pool _08127FAC: bl sub_81279C4 lsls r0, 24 @@ -606659,22 +586857,21 @@ _08127FAC: movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _08127FE0 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, _08127FE4 + ldr r1, =sub_8128060 + 1 str r1, [r0] b _0812804C .align 2, 0 -_08127FE0: .4byte 0x03005e00 -_08127FE4: .4byte sub_8128060 + 1 + .pool _08127FE8: - ldr r0, _08128008 - ldr r4, _0812800C + ldr r0, =0x02021cc4 + ldr r4, =0x0203a17c ldrb r1, [r4, 0x8] movs r2, 0x1 movs r3, 0x2 @@ -606682,35 +586879,30 @@ _08127FE8: ldrb r0, [r4, 0x9] cmp r0, 0 bne _08128018 - ldr r0, _08128010 - ldr r1, _08128014 + ldr r0, =0x02021fc4 + ldr r1, =0x085ea8ea bl ExpandTextCodes b _08128020 .align 2, 0 -_08128008: .4byte 0x02021cc4 -_0812800C: .4byte 0x0203a17c -_08128010: .4byte 0x02021fc4 -_08128014: .4byte 0x085ea8ea + .pool _08128018: - ldr r0, _0812802C - ldr r1, _08128030 + ldr r0, =0x02021fc4 + ldr r1, =0x085ea931 bl ExpandTextCodes _08128020: - ldr r1, _0812802C - ldr r2, _08128034 + ldr r1, =0x02021fc4 + ldr r2, =sub_8127A5C + 1 adds r0, r5, 0 bl sub_81978EC b _0812804C .align 2, 0 -_0812802C: .4byte 0x02021fc4 -_08128030: .4byte 0x085ea931 -_08128034: .4byte sub_8127A5C + 1 + .pool _08128038: - ldr r4, _08128054 - ldr r1, _08128058 + ldr r4, =0x02021fc4 + ldr r1, =0x085ea8d2 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _0812805C + ldr r2, =sub_8127A5C + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -606719,9 +586911,7 @@ _0812804C: pop {r0} bx r0 .align 2, 0 -_08128054: .4byte 0x02021fc4 -_08128058: .4byte 0x085ea8d2 -_0812805C: .4byte sub_8127A5C + 1 + .pool thumb_func_end sub_8127F68 thumb_func_start sub_8128060 @@ -606729,7 +586919,7 @@ sub_8128060: @ 8128060 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08128084 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -606744,13 +586934,13 @@ sub_8128060: @ 8128060 beq _0812808E b _08128112 .align 2, 0 -_08128084: .4byte 0x03005e00 + .pool _08128088: cmp r0, 0x2 beq _081280FC b _08128112 _0812808E: - ldr r0, _081280A8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -606762,17 +586952,17 @@ _0812808E: strh r0, [r7, 0xC] b _08128112 .align 2, 0 -_081280A8: .4byte 0x02037fd4 + .pool _081280AC: - ldr r4, _081280EC + ldr r4, =0x02037fd4 ldrb r0, [r4, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r4, 0x8] - ldr r5, _081280F0 - ldr r0, _081280F4 + ldr r5, =0x0203a190 + ldr r0, =0x0203a172 ldrb r1, [r0] - ldr r0, _081280F8 + ldr r0, =0x0203a14c ldr r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -606792,10 +586982,7 @@ _081280AC: strh r0, [r7, 0xC] b _08128112 .align 2, 0 -_081280EC: .4byte 0x02037fd4 -_081280F0: .4byte 0x0203a190 -_081280F4: .4byte 0x0203a172 -_081280F8: .4byte 0x0203a14c + .pool _081280FC: bl sub_80ABDFC lsls r0, 24 @@ -606818,9 +587005,9 @@ sub_8128118: @ 8128118 adds r6, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _08128194 - ldr r4, _08128198 - ldr r5, _0812819C + ldr r3, =0x0203aa38 + ldr r4, =0x02020630 + ldr r5, =0x03005dd0 ldr r2, [r5, 0x4] lsls r0, r2, 4 adds r0, r2 @@ -606851,10 +587038,10 @@ sub_8128118: @ 8128118 adds r0, r4, 0 adds r0, 0x1C adds r0, r2, r0 - ldr r1, _081281A0 + ldr r1, =sub_81292D0 + 1 str r1, [r0] adds r2, r4 - ldr r3, _081281A4 + ldr r3, =0x085a7250 ldr r0, [r6] ldrb r0, [r0, 0x12] lsls r0, 2 @@ -606876,11 +587063,7 @@ sub_8128118: @ 8128118 pop {r0} bx r0 .align 2, 0 -_08128194: .4byte 0x0203aa38 -_08128198: .4byte 0x02020630 -_0812819C: .4byte 0x03005dd0 -_081281A0: .4byte sub_81292D0 + 1 -_081281A4: .4byte 0x085a7250 + .pool thumb_func_end sub_8128118 thumb_func_start sub_81281A8 @@ -606889,13 +587072,13 @@ sub_81281A8: @ 81281A8 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r3, _081281FC + ldr r3, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 adds r2, r3 ldrb r2, [r2, 0x12] - ldr r3, _08128200 + ldr r3, =0x085a7250 ldr r0, [r1] ldrb r4, [r0, 0x12] lsls r1, r4, 2 @@ -606920,32 +587103,29 @@ _081281E2: lsls r0, 24 lsrs r2, r0, 24 _081281EA: - ldr r0, _08128204 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 bne _0812820C - ldr r1, _08128208 + ldr r1, =nullsub_12 + 1 str r0, [sp] movs r0, 0xC1 b _08128214 .align 2, 0 -_081281FC: .4byte 0x03005e00 -_08128200: .4byte 0x085a7250 -_08128204: .4byte 0x03005d90 -_08128208: .4byte nullsub_12 + 1 + .pool _0812820C: - ldr r1, _08128258 + ldr r1, =nullsub_12 + 1 movs r0, 0 str r0, [sp] movs r0, 0xC2 _08128214: movs r3, 0x48 bl sub_808DD68 - ldr r1, _0812825C + ldr r1, =0x0203aa39 strb r0, [r1] - ldr r3, _08128260 - ldr r0, _0812825C + ldr r3, =0x02020630 + ldr r0, =0x0203aa39 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -606958,14 +587138,14 @@ _08128214: movs r2, 0x4 orrs r1, r2 strb r1, [r0, 0x5] - ldr r4, _08128264 + ldr r4, =0x0203aa38 ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r3 bl obj_delete_and_free_tiles - ldr r0, _08128268 + ldr r0, =0x03005dd0 ldr r0, [r0, 0x4] strb r0, [r4] add sp, 0x4 @@ -606973,11 +587153,7 @@ _08128214: pop {r0} bx r0 .align 2, 0 -_08128258: .4byte nullsub_12 + 1 -_0812825C: .4byte 0x0203aa39 -_08128260: .4byte 0x02020630 -_08128264: .4byte 0x0203aa38 -_08128268: .4byte 0x03005dd0 + .pool thumb_func_end sub_81281A8 thumb_func_start sub_812826C @@ -606985,10 +587161,10 @@ sub_812826C: @ 812826C push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _08128298 - ldr r0, _0812829C + ldr r2, =0x085a5c08 + ldr r0, =0x0203a172 ldrb r1, [r0] - ldr r0, _081282A0 + ldr r0, =0x0203a14c ldr r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -607000,15 +587176,12 @@ sub_812826C: @ 812826C b _081283B2 _0812828C: lsls r0, 2 - ldr r1, _081282A4 + ldr r1, =_081282A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08128298: .4byte 0x085a5c08 -_0812829C: .4byte 0x0203a172 -_081282A0: .4byte 0x0203a14c -_081282A4: .4byte _081282A8 + .pool .align 2, 0 _081282A8: .4byte _081282D0 @@ -607022,7 +587195,7 @@ _081282A8: .4byte _08128388 .4byte _081283A0 _081282D0: - ldr r0, _081282E0 + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 @@ -607030,9 +587203,9 @@ _081282D0: movs r0, 0x1 b _08128394 .align 2, 0 -_081282E0: .4byte 0x03005e00 + .pool _081282E4: - ldr r1, _081282F8 + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -607042,9 +587215,9 @@ _081282E4: movs r1, 0x1 b _081283B0 .align 2, 0 -_081282F8: .4byte 0x03005e00 + .pool _081282FC: - ldr r1, _08128310 + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -607054,9 +587227,9 @@ _081282FC: movs r1, 0x1 b _081283B0 .align 2, 0 -_08128310: .4byte 0x03005e00 + .pool _08128314: - ldr r1, _08128324 + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -607064,9 +587237,9 @@ _08128314: movs r1, 0x4 b _081283AC .align 2, 0 -_08128324: .4byte 0x03005e00 + .pool _08128328: - ldr r0, _08128338 + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 @@ -607074,9 +587247,9 @@ _08128328: movs r0, 0x2 b _08128394 .align 2, 0 -_08128338: .4byte 0x03005e00 + .pool _0812833C: - ldr r1, _0812834C + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -607084,9 +587257,9 @@ _0812833C: movs r1, 0x1 b _081283AC .align 2, 0 -_0812834C: .4byte 0x03005e00 + .pool _08128350: - ldr r0, _0812836C + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 @@ -607100,9 +587273,9 @@ _08128350: strh r0, [r1, 0xA] b _081283B2 .align 2, 0 -_0812836C: .4byte 0x03005e00 + .pool _08128370: - ldr r1, _08128384 + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -607112,9 +587285,9 @@ _08128370: movs r1, 0x4 b _081283B0 .align 2, 0 -_08128384: .4byte 0x03005e00 + .pool _08128388: - ldr r0, _0812839C + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 @@ -607125,9 +587298,9 @@ _08128394: strh r0, [r1, 0x14] b _081283B2 .align 2, 0 -_0812839C: .4byte 0x03005e00 + .pool _081283A0: - ldr r1, _081283B8 + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -607142,7 +587315,7 @@ _081283B2: pop {r0} bx r0 .align 2, 0 -_081283B8: .4byte 0x03005e00 + .pool thumb_func_end sub_812826C thumb_func_start sub_81283BC @@ -607151,15 +587324,15 @@ sub_81283BC: @ 81283BC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08128404 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0x1C] - ldr r3, _08128408 - ldr r0, _0812840C + ldr r3, =0x02020630 + ldr r0, =0x0203aa38 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -607167,7 +587340,7 @@ sub_81283BC: @ 81283BC adds r0, r3 movs r2, 0x1 strh r2, [r0, 0x3C] - ldr r0, _08128410 + ldr r0, =0x0203aa39 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -607181,10 +587354,7 @@ sub_81283BC: @ 81283BC pop {r0} bx r0 .align 2, 0 -_08128404: .4byte 0x03005e00 -_08128408: .4byte 0x02020630 -_0812840C: .4byte 0x0203aa38 -_08128410: .4byte 0x0203aa39 + .pool thumb_func_end sub_81283BC thumb_func_start sub_8128414 @@ -607193,15 +587363,15 @@ sub_8128414: @ 8128414 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08128468 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0x1C] - ldr r3, _0812846C - ldr r0, _08128470 + ldr r3, =0x02020630 + ldr r0, =0x0203aa38 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -607209,7 +587379,7 @@ sub_8128414: @ 8128414 adds r0, r3 movs r2, 0x1 strh r2, [r0, 0x3C] - ldr r0, _08128474 + ldr r0, =0x0203aa39 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -607217,11 +587387,11 @@ sub_8128414: @ 8128414 adds r0, r3 strh r2, [r0, 0x3C] bl sub_8128DE0 - ldr r5, _08128478 - ldr r1, _0812847C + ldr r5, =0x02021fc4 + ldr r1, =0x085ea8bf adds r0, r5, 0 bl ExpandTextCodes - ldr r2, _08128480 + ldr r2, =sub_8128B80 + 1 adds r0, r4, 0 adds r1, r5, 0 bl sub_81978EC @@ -607229,13 +587399,7 @@ sub_8128414: @ 8128414 pop {r0} bx r0 .align 2, 0 -_08128468: .4byte 0x03005e00 -_0812846C: .4byte 0x02020630 -_08128470: .4byte 0x0203aa38 -_08128474: .4byte 0x0203aa39 -_08128478: .4byte 0x02021fc4 -_0812847C: .4byte 0x085ea8bf -_08128480: .4byte sub_8128B80 + 1 + .pool thumb_func_end sub_8128414 thumb_func_start sub_8128484 @@ -607274,7 +587438,7 @@ sub_81284AC: @ 81284AC lsrs r5, r3, 16 lsls r1, 16 asrs r1, 16 - ldr r3, _081284E8 + ldr r3, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -607296,7 +587460,7 @@ sub_81284AC: @ 81284AC movs r0, 0 b _081284EE .align 2, 0 -_081284E8: .4byte 0x03005e00 + .pool _081284EC: movs r0, 0x1 _081284EE: @@ -607358,7 +587522,7 @@ sub_812853C: @ 812853C lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r1, _08128578 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r10 lsls r0, 3 @@ -607375,13 +587539,12 @@ sub_812853C: @ 812853C b _0812893C _0812856E: lsls r0, 2 - ldr r1, _0812857C + ldr r1, =_08128580 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08128578: .4byte 0x03005e00 -_0812857C: .4byte _08128580 + .pool .align 2, 0 _08128580: .4byte _08128594 @@ -607404,7 +587567,7 @@ _081285A4: lsls r0, r2, 2 add r0, r10 lsls r0, 3 - ldr r3, _0812867C + ldr r3, =0x03005e00 adds r0, r3 ldrh r0, [r0, 0xA] subs r0, r6 @@ -607426,7 +587589,7 @@ _081285D0: ldr r0, [sp, 0x1C] add r0, r10 lsls r0, 3 - ldr r2, _0812867C + ldr r2, =0x03005e00 adds r0, r2 ldrh r0, [r0, 0x8] adds r0, r7 @@ -607509,7 +587672,7 @@ _0812866E: bcc _081285A4 b _0812893C .align 2, 0 -_0812867C: .4byte 0x03005e00 + .pool _08128680: movs r6, 0 mov r3, r10 @@ -607618,7 +587781,7 @@ _08128752: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _08128830 + ldr r2, =0x03005e00 ldr r3, [sp, 0x8] cmp r7, r3 bcc _081286B8 @@ -607653,7 +587816,7 @@ _08128790: ldr r0, [sp, 0x1C] add r0, r10 lsls r0, 3 - ldr r1, _08128830 + ldr r1, =0x03005e00 adds r0, r1 ldrh r0, [r0, 0x8] adds r0, r7 @@ -607728,7 +587891,7 @@ _08128822: bcc _08128790 b _0812893C .align 2, 0 -_08128830: .4byte 0x03005e00 + .pool _08128834: movs r6, 0 ldr r0, [sp, 0x4] @@ -607740,7 +587903,7 @@ _0812883E: lsls r0, r1, 2 add r0, r10 lsls r1, r0, 3 - ldr r2, _081288B4 + ldr r2, =0x03005e00 adds r0, r1, r2 ldrh r0, [r0, 0xA] subs r0, r6 @@ -607794,7 +587957,7 @@ _081288A4: bcc _0812883E b _0812893C .align 2, 0 -_081288B4: .4byte 0x03005e00 + .pool _081288B8: mov r3, r10 lsls r1, r3, 2 @@ -607881,14 +588044,14 @@ sub_8128950: @ 8128950 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0812898C + ldr r0, =0x0203a172 ldrb r1, [r0] - ldr r0, _08128990 + ldr r0, =0x0203a14c ldr r0, [r0] adds r0, r1 ldrb r1, [r0] lsls r1, 5 - ldr r0, _08128994 + ldr r0, =0x085a5c08 adds r1, r0 adds r0, r5, 0 bl sub_812853C @@ -607896,30 +588059,25 @@ sub_8128950: @ 8128950 lsrs r0, 24 cmp r0, 0x1 bne _081289A4 - ldr r4, _08128998 - ldr r1, _0812899C + ldr r4, =0x02021fc4 + ldr r1, =0x085ea897 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _081289A0 + ldr r2, =sub_81289D0 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC b _081289BE .align 2, 0 -_0812898C: .4byte 0x0203a172 -_08128990: .4byte 0x0203a14c -_08128994: .4byte 0x085a5c08 -_08128998: .4byte 0x02021fc4 -_0812899C: .4byte 0x085ea897 -_081289A0: .4byte sub_81289D0 + 1 + .pool _081289A4: movs r0, 0x20 bl audio_play - ldr r4, _081289C4 - ldr r1, _081289C8 + ldr r4, =0x02021fc4 + ldr r1, =0x085ea8a6 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _081289CC + ldr r2, =sub_8129020 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -607928,9 +588086,7 @@ _081289BE: pop {r0} bx r0 .align 2, 0 -_081289C4: .4byte 0x02021fc4 -_081289C8: .4byte 0x085ea8a6 -_081289CC: .4byte sub_8129020 + 1 + .pool thumb_func_end sub_8128950 thumb_func_start sub_81289D0 @@ -607940,14 +588096,14 @@ sub_81289D0: @ 81289D0 lsls r4, 24 lsrs r4, 24 bl sub_8197930 - ldr r1, _081289EC + ldr r1, =0x085a72c4 adds r0, r4, 0 bl sub_8121F68 pop {r4} pop {r0} bx r0 .align 2, 0 -_081289EC: .4byte 0x085a72c4 + .pool thumb_func_end sub_81289D0 thumb_func_start sub_81289F0 @@ -607960,10 +588116,10 @@ sub_81289F0: @ 81289F0 bl sub_8197434 adds r0, r4, 0 bl sub_8128AAC - ldr r2, _08128A34 - ldr r0, _08128A38 + ldr r2, =0x085a5c08 + ldr r0, =0x0203a172 ldrb r1, [r0] - ldr r0, _08128A3C + ldr r0, =0x0203a14c ldr r0, [r0] adds r0, r1 ldrb r3, [r0] @@ -607972,7 +588128,7 @@ sub_81289F0: @ 81289F0 ldrb r0, [r0, 0x11] cmp r0, 0x4 beq _08128A44 - ldr r0, _08128A40 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -607983,13 +588139,10 @@ sub_81289F0: @ 81289F0 bl sub_8127D38 b _08128A64 .align 2, 0 -_08128A34: .4byte 0x085a5c08 -_08128A38: .4byte 0x0203a172 -_08128A3C: .4byte 0x0203a14c -_08128A40: .4byte 0x03005e00 + .pool _08128A44: - ldr r2, _08128A90 - ldr r0, _08128A94 + ldr r2, =0x0203aa34 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -607997,15 +588150,15 @@ _08128A44: ldrh r0, [r1, 0x8] subs r0, 0x7 strh r0, [r2] - ldr r2, _08128A98 + ldr r2, =0x0203aa36 ldrh r0, [r1, 0xA] subs r0, 0x7 strh r0, [r2] - ldr r0, _08128A9C + ldr r0, =0x08275d1f bl script_env_1_execute_new_script _08128A64: - ldr r2, _08128AA0 - ldr r0, _08128AA4 + ldr r2, =0x02020630 + ldr r0, =0x0203aa38 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -608014,7 +588167,7 @@ _08128A64: ldrh r1, [r0, 0x22] adds r1, 0x2 strh r1, [r0, 0x22] - ldr r0, _08128AA8 + ldr r0, =0x02037318 ldrb r0, [r0, 0x14] cmp r0, 0x56 bne _08128A84 @@ -608026,13 +588179,7 @@ _08128A84: pop {r0} bx r0 .align 2, 0 -_08128A90: .4byte 0x0203aa34 -_08128A94: .4byte 0x03005e00 -_08128A98: .4byte 0x0203aa36 -_08128A9C: .4byte 0x08275d1f -_08128AA0: .4byte 0x02020630 -_08128AA4: .4byte 0x0203aa38 -_08128AA8: .4byte 0x02037318 + .pool thumb_func_end sub_81289F0 thumb_func_start sub_8128AAC @@ -608041,7 +588188,7 @@ sub_8128AAC: @ 8128AAC lsls r0, 24 lsrs r6, r0, 24 movs r3, 0 - ldr r0, _08128AE8 + ldr r0, =0x0203a17c ldrb r1, [r0, 0x8] adds r5, r0, 0 cmp r3, r1 @@ -608062,26 +588209,25 @@ _08128AD2: cmp r0, 0 bne _08128B3C movs r3, 0 - ldr r0, _08128AEC + ldr r0, =0x0203a152 ldrb r1, [r0] adds r2, r0, 0 cmp r1, 0 bne _08128B28 b _08128B48 .align 2, 0 -_08128AE8: .4byte 0x0203a17c -_08128AEC: .4byte 0x0203a152 + .pool _08128AF0: - ldr r0, _08128B1C + ldr r0, =0x0203a172 ldrb r1, [r0] - ldr r0, _08128B20 + ldr r0, =0x0203a14c ldr r0, [r0] adds r0, r1 ldrb r0, [r0] strb r0, [r2] ldr r2, [r5, 0x4] adds r2, r3 - ldr r0, _08128B24 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -608095,9 +588241,7 @@ _08128AF0: strb r0, [r2] b _08128AD2 .align 2, 0 -_08128B1C: .4byte 0x0203a172 -_08128B20: .4byte 0x0203a14c -_08128B24: .4byte 0x03005e00 + .pool _08128B28: adds r0, r3, 0x1 lsls r0, 16 @@ -608111,20 +588255,19 @@ _08128B28: b _08128B6E _08128B3C: movs r3, 0 - ldr r0, _08128B54 + ldr r0, =0x0203a162 ldrb r1, [r0] adds r2, r0, 0 cmp r1, 0 bne _08128B5C _08128B48: - ldr r0, _08128B58 + ldr r0, =0x0203a172 ldrb r0, [r0] adds r0, 0x1 strb r0, [r2] b _08128B76 .align 2, 0 -_08128B54: .4byte 0x0203a162 -_08128B58: .4byte 0x0203a172 + .pool _08128B5C: adds r0, r3, 0x1 lsls r0, 16 @@ -608136,7 +588279,7 @@ _08128B5C: cmp r0, 0 bne _08128B5C _08128B6E: - ldr r0, _08128B7C + ldr r0, =0x0203a172 ldrb r0, [r0] adds r0, 0x1 strb r0, [r1] @@ -608145,7 +588288,7 @@ _08128B76: pop {r0} bx r0 .align 2, 0 -_08128B7C: .4byte 0x0203a172 + .pool thumb_func_end sub_8128AAC thumb_func_start sub_8128B80 @@ -608155,14 +588298,14 @@ sub_8128B80: @ 8128B80 lsls r4, 24 lsrs r4, 24 bl sub_8197930 - ldr r1, _08128B9C + ldr r1, =0x085a72cc adds r0, r4, 0 bl sub_8121F68 pop {r4} pop {r0} bx r0 .align 2, 0 -_08128B9C: .4byte 0x085a72cc + .pool thumb_func_end sub_8128B80 thumb_func_start sub_8128BA0 @@ -608190,21 +588333,20 @@ sub_8128BBC: @ 8128BBC movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _08128BE4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, _08128BE8 + ldr r1, =c1_overworld_prev_quest + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08128BE4: .4byte 0x03005e00 -_08128BE8: .4byte c1_overworld_prev_quest + 1 + .pool thumb_func_end sub_8128BBC thumb_func_start c1_overworld_prev_quest @@ -608212,7 +588354,7 @@ c1_overworld_prev_quest: @ 8128BEC push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08128C0C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -608225,10 +588367,10 @@ c1_overworld_prev_quest: @ 8128BEC beq _08128C30 b _08128C4C .align 2, 0 -_08128C0C: .4byte 0x03005e00 + .pool _08128C10: bl script_env_2_enable - ldr r0, _08128C2C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -608240,15 +588382,15 @@ _08128C10: strh r0, [r5, 0xC] b _08128C4C .align 2, 0 -_08128C2C: .4byte 0x02037fd4 + .pool _08128C30: bl sub_812A3C8 - ldr r0, _08128C54 + ldr r0, =0x00000be5 bl gpu_pal_free_tag - ldr r1, _08128C58 - ldr r0, _08128C5C + ldr r1, =0x03005dac + ldr r0, =sub_8128CD4 + 1 str r0, [r1] - ldr r0, _08128C60 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -608257,10 +588399,7 @@ _08128C4C: pop {r0} bx r0 .align 2, 0 -_08128C54: .4byte 0x00000be5 -_08128C58: .4byte 0x03005dac -_08128C5C: .4byte sub_8128CD4 + 1 -_08128C60: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end c1_overworld_prev_quest thumb_func_start sub_8128C64 @@ -608271,7 +588410,7 @@ sub_8128C64: @ 8128C64 lsls r1, r0, 2 adds r1, r0 lsls r5, r1, 3 - ldr r6, _08128C88 + ldr r6, =0x03005e08 adds r4, r5, r6 movs r1, 0x4 ldrsh r0, [r4, r1] @@ -608283,7 +588422,7 @@ sub_8128C64: @ 8128C64 beq _08128C96 b _08128CCA .align 2, 0 -_08128C88: .4byte 0x03005e08 + .pool _08128C8C: cmp r0, 0x2 beq _08128CA8 @@ -608294,11 +588433,11 @@ _08128C96: bl sub_80E9578 b _08128CAC _08128C9C: - ldr r0, _08128CA4 + ldr r0, =0x08275d0c bl script_env_1_execute_new_script b _08128CAC .align 2, 0 -_08128CA4: .4byte 0x08275d0c + .pool _08128CA8: bl script_env_2_enable _08128CAC: @@ -608315,14 +588454,14 @@ _08128CB4: adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 - ldr r1, _08128CD0 + ldr r1, =sub_812764C + 1 str r1, [r0] _08128CCA: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08128CD0: .4byte sub_812764C + 1 + .pool thumb_func_end sub_8128C64 thumb_func_start sub_8128CD4 @@ -608330,7 +588469,7 @@ sub_8128CD4: @ 8128CD4 push {r4,lr} bl script_env_2_enable bl pal_fill_black - ldr r0, _08128D08 + ldr r0, =sub_8128C64 + 1 movs r1, 0x8 bl AddTask adds r4, r0, 0 @@ -608338,7 +588477,7 @@ sub_8128CD4: @ 8128CD4 lsrs r4, 24 adds r0, r4, 0 bl sub_8127580 - ldr r1, _08128D0C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -608349,8 +588488,7 @@ sub_8128CD4: @ 8128CD4 pop {r0} bx r0 .align 2, 0 -_08128D08: .4byte sub_8128C64 + 1 -_08128D0C: .4byte 0x03005e00 + .pool thumb_func_end sub_8128CD4 thumb_func_start sub_8128D10 @@ -608361,9 +588499,9 @@ sub_8128D10: @ 8128D10 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08128D40 + ldr r0, =0x03005e08 adds r2, r1, r0 - ldr r0, _08128D44 + ldr r0, =0x0203aa3a ldrb r1, [r0] adds r3, r0, 0 cmp r1, 0x1 @@ -608380,8 +588518,7 @@ sub_8128D10: @ 8128D10 adds r0, 0x1 b _08128D62 .align 2, 0 -_08128D40: .4byte 0x03005e08 -_08128D44: .4byte 0x0203aa3a + .pool _08128D48: ldrb r0, [r3] cmp r0, 0x2 @@ -608389,7 +588526,7 @@ _08128D48: movs r0, 0x2 ldrsh r1, [r2, r0] subs r1, 0x7 - ldr r0, _08128D68 + ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x4] cmp r1, r0 @@ -608401,7 +588538,7 @@ _08128D62: movs r0, 0 b _08128DAE .align 2, 0 -_08128D68: .4byte 0x02037318 + .pool _08128D6C: ldrb r0, [r3] cmp r0, 0x3 @@ -608424,7 +588561,7 @@ _08128D82: ldrsh r0, [r2, r4] adds r1, r0 subs r1, 0x8 - ldr r0, _08128DA8 + ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0] cmp r1, r0 @@ -608436,7 +588573,7 @@ _08128DA2: movs r0, 0 b _08128DAE .align 2, 0 -_08128DA8: .4byte 0x02037318 + .pool _08128DAC: movs r0, 0x1 _08128DAE: @@ -608448,7 +588585,7 @@ _08128DAE: thumb_func_start sub_8128DB4 sub_8128DB4: @ 8128DB4 push {lr} - ldr r0, _08128DD4 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x2C] movs r1, 0xF0 ands r1, r0 @@ -608463,7 +588600,7 @@ sub_8128DB4: @ 8128DB4 movs r0, 0 b _08128DDA .align 2, 0 -_08128DD4: .4byte 0x030022c0 + .pool _08128DD8: movs r0, 0x1 _08128DDA: @@ -608474,11 +588611,11 @@ _08128DDA: thumb_func_start sub_8128DE0 sub_8128DE0: @ 8128DE0 push {r4,lr} - ldr r1, _08128E0C + ldr r1, =0x0203aa3a movs r0, 0 strb r0, [r1] - ldr r4, _08128E10 - ldr r3, _08128E14 + ldr r4, =0x02020630 + ldr r3, =0x0203aa38 ldrb r1, [r3] lsls r0, r1, 4 adds r0, r1 @@ -608496,9 +588633,7 @@ sub_8128DE0: @ 8128DE0 pop {r0} bx r0 .align 2, 0 -_08128E0C: .4byte 0x0203aa3a -_08128E10: .4byte 0x02020630 -_08128E14: .4byte 0x0203aa38 + .pool thumb_func_end sub_8128DE0 thumb_func_start sub_8128E18 @@ -608512,10 +588647,10 @@ sub_8128E18: @ 8128E18 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08128E58 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r5, _08128E5C - ldr r3, _08128E60 + ldr r5, =0x02020630 + ldr r3, =0x0203aa38 ldrb r1, [r3] lsls r0, r1, 4 adds r0, r1 @@ -608531,20 +588666,17 @@ _08128E46: ldrsh r0, [r4, r1] cmp r0, 0x1 bne _08128E68 - ldr r0, _08128E64 + ldr r0, =0x085a72d4 movs r3, 0x18 ldrsh r1, [r4, r3] lsls r1, 3 b _08128E76 .align 2, 0 -_08128E58: .4byte 0x03005e08 -_08128E5C: .4byte 0x02020630 -_08128E60: .4byte 0x0203aa38 -_08128E64: .4byte 0x085a72d4 + .pool _08128E68: cmp r0, 0x2 bne _08128E88 - ldr r0, _08128E84 + ldr r0, =0x085a72d4 movs r3, 0x18 ldrsh r1, [r4, r3] lsls r1, 3 @@ -608556,16 +588688,16 @@ _08128E76: bl _call_via_r1 b _08128FBA .align 2, 0 -_08128E84: .4byte 0x085a72d4 + .pool _08128E88: - ldr r2, _08128FC4 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r7, 0xF0 adds r0, r7, 0 ands r0, r1 cmp r0, 0x40 bne _08128EBC - ldr r1, _08128FC8 + ldr r1, =0x0203aa3a movs r0, 0x1 strb r0, [r1] ldrb r1, [r3] @@ -608579,7 +588711,7 @@ _08128E88: adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08128FCC + ldr r1, =0x0000fffe strh r1, [r0, 0x34] ldrh r0, [r4, 0x2] subs r0, 0x1 @@ -608590,7 +588722,7 @@ _08128EBC: ands r0, r1 cmp r0, 0x80 bne _08128EEC - ldr r1, _08128FC8 + ldr r1, =0x0203aa3a movs r0, 0x2 strb r0, [r1] ldrb r1, [r3] @@ -608615,7 +588747,7 @@ _08128EEC: ands r0, r1 cmp r0, 0x20 bne _08128F1C - ldr r1, _08128FC8 + ldr r1, =0x0203aa3a movs r0, 0x3 strb r0, [r1] ldrb r1, [r3] @@ -608623,7 +588755,7 @@ _08128EEC: adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08128FCC + ldr r1, =0x0000fffe strh r1, [r0, 0x32] ldrb r1, [r3] lsls r0, r1, 4 @@ -608640,7 +588772,7 @@ _08128F1C: ands r0, r1 cmp r0, 0x10 bne _08128F4C - ldr r1, _08128FC8 + ldr r1, =0x0203aa3a movs r0, 0x4 strb r0, [r1] ldrb r1, [r3] @@ -608672,12 +588804,12 @@ _08128F4C: _08128F62: bl sub_8128DE0 _08128F66: - ldr r0, _08128FC8 + ldr r0, =0x0203aa3a ldrb r0, [r0] cmp r0, 0 beq _08128F94 - ldr r3, _08128FD0 - ldr r2, _08128FD4 + ldr r3, =0x02020630 + ldr r2, =0x0203aa38 ldrb r1, [r2] lsls r0, r1, 4 adds r0, r1 @@ -608700,7 +588832,7 @@ _08128F94: ldrsh r0, [r4, r1] cmp r0, 0 bne _08128FBA - ldr r3, _08128FC4 + ldr r3, =0x030022c0 ldrh r1, [r3, 0x2E] movs r2, 0x1 adds r0, r2, 0 @@ -608723,11 +588855,7 @@ _08128FBA: pop {r0} bx r0 .align 2, 0 -_08128FC4: .4byte 0x030022c0 -_08128FC8: .4byte 0x0203aa3a -_08128FCC: .4byte 0x0000fffe -_08128FD0: .4byte 0x02020630 -_08128FD4: .4byte 0x0203aa38 + .pool thumb_func_end sub_8128E18 thumb_func_start sub_8128FD8 @@ -608739,8 +588867,8 @@ sub_8128FD8: @ 8128FD8 movs r0, 0 movs r1, 0x1 bl sub_8197434 - ldr r2, _08129010 - ldr r0, _08129014 + ldr r2, =0x02020630 + ldr r0, =0x0203aa38 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -608748,22 +588876,19 @@ sub_8128FD8: @ 8128FD8 adds r0, r2 movs r2, 0 strh r2, [r0, 0x3C] - ldr r1, _08129018 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 strh r2, [r0, 0x1C] - ldr r1, _0812901C + ldr r1, =sub_8128E18 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08129010: .4byte 0x02020630 -_08129014: .4byte 0x0203aa38 -_08129018: .4byte 0x03005e00 -_0812901C: .4byte sub_8128E18 + 1 + .pool thumb_func_end sub_8128FD8 thumb_func_start sub_8129020 @@ -608771,7 +588896,7 @@ sub_8129020: @ 8129020 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08129044 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -608788,7 +588913,7 @@ _08129040: pop {r0} bx r0 .align 2, 0 -_08129044: .4byte 0x030022c0 + .pool thumb_func_end sub_8129020 thumb_func_start sub_8129048 @@ -608799,14 +588924,14 @@ sub_8129048: @ 8129048 mov r2, sp movs r0, 0 strh r0, [r2] - ldr r2, _08129064 + ldr r2, =0x01000452 mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08129064: .4byte 0x01000452 + .pool thumb_func_end sub_8129048 thumb_func_start sub_8129068 @@ -608814,7 +588939,7 @@ sub_8129068: @ 8129068 push {lr} adds r2, r0, 0 lsls r1, 16 - ldr r0, _08129084 + ldr r0, =0x083dfc74 ldr r0, [r0] lsrs r1, 11 ldr r0, [r0, 0x8] @@ -608825,7 +588950,7 @@ sub_8129068: @ 8129068 pop {r0} bx r0 .align 2, 0 -_08129084: .4byte 0x083dfc74 + .pool thumb_func_end sub_8129068 thumb_func_start sub_8129088 @@ -608839,10 +588964,10 @@ sub_8129088: @ 8129088 adds r5, r4, 0 cmp r2, 0 beq _0812909E - ldr r0, _081290C0 + ldr r0, =0x000003ff ands r2, r0 _0812909E: - ldr r0, _081290C4 + ldr r0, =0x083dfc74 ldr r0, [r0] lsls r1, r2, 5 ldr r0, [r0, 0x4] @@ -608858,8 +588983,7 @@ _0812909E: beq _081290D2 b _0812919A .align 2, 0 -_081290C0: .4byte 0x000003ff -_081290C4: .4byte 0x083dfc74 + .pool _081290C8: cmp r5, 0x2 beq _0812913E @@ -609006,18 +589130,17 @@ _081291AA: thumb_func_start sub_81291CC sub_81291CC: @ 81291CC lsls r0, 16 - ldr r1, _081291E0 + ldr r1, =0x083dfc78 ldr r1, [r1] ldr r1, [r1, 0xC] lsrs r0, 15 adds r0, r1 ldrh r1, [r0] - ldr r0, _081291E4 + ldr r0, =0x00000fff ands r0, r1 bx lr .align 2, 0 -_081291E0: .4byte 0x083dfc78 -_081291E4: .4byte 0x00000fff + .pool thumb_func_end sub_81291CC thumb_func_start sub_81291E8 @@ -609029,7 +589152,7 @@ sub_81291E8: @ 81291E8 ldr r0, [r0] ldrb r0, [r0, 0x12] movs r6, 0 - ldr r1, _08129258 + ldr r1, =0x085a71b0 lsls r5, r0, 4 adds r0, r5, r1 ldrb r0, [r0, 0xC] @@ -609079,14 +589202,14 @@ _0812924C: pop {r0} bx r0 .align 2, 0 -_08129258: .4byte 0x085a71b0 + .pool thumb_func_end sub_81291E8 thumb_func_start sub_812925C sub_812925C: @ 812925C push {r4,r5,lr} lsls r0, 24 - ldr r3, _081292C0 + ldr r3, =0x0203aa3c movs r1, 0 strb r1, [r3] ldrb r2, [r3, 0x1] @@ -609101,7 +589224,7 @@ sub_812925C: @ 812925C subs r2, 0x10 ands r1, r2 strb r1, [r3, 0x1] - ldr r1, _081292C4 + ldr r1, =0x085a7250 lsrs r0, 22 adds r0, r1 ldrb r1, [r0] @@ -609109,7 +589232,7 @@ sub_812925C: @ 812925C lsls r1, 6 strb r1, [r3, 0x1] ldrh r2, [r3, 0x2] - ldr r1, _081292C8 + ldr r1, =0xfffffe00 ands r1, r2 strh r1, [r3, 0x2] ldrb r2, [r3, 0x3] @@ -609123,7 +589246,7 @@ sub_812925C: @ 812925C orrs r4, r0 strb r4, [r3, 0x3] ldrh r1, [r3, 0x4] - ldr r0, _081292CC + ldr r0, =0xfffffc00 ands r0, r1 strh r0, [r3, 0x4] ldrb r0, [r3, 0x5] @@ -609135,10 +589258,7 @@ sub_812925C: @ 812925C pop {r0} bx r0 .align 2, 0 -_081292C0: .4byte 0x0203aa3c -_081292C4: .4byte 0x085a7250 -_081292C8: .4byte 0xfffffe00 -_081292CC: .4byte 0xfffffc00 + .pool thumb_func_end sub_812925C thumb_func_start sub_81292D0 @@ -609150,11 +589270,11 @@ sub_81292D0: @ 81292D0 strh r1, [r0, 0x38] strh r1, [r0, 0x3A] strh r1, [r0, 0x3C] - ldr r1, _081292E4 + ldr r1, =sub_81292E8 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_081292E4: .4byte sub_81292E8 + 1 + .pool thumb_func_end sub_81292D0 thumb_func_start sub_81292E8 @@ -609211,13 +589331,13 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 8129334 lsrs r4, 24 bl sub_8129048 lsls r4, 5 - ldr r0, _0812939C + ldr r0, =0x085a5c08 adds r4, r0 str r4, [r5] ldrb r0, [r4, 0x11] cmp r0, 0x4 beq _081293B4 - ldr r0, _081293A0 + ldr r0, =0x00000be5 bl gpu_pal_free_tag adds r0, r5, 0 bl sub_81291E8 @@ -609226,9 +589346,9 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 8129334 bl sub_812925C adds r0, r5, 0 bl sub_81291A4 - ldr r1, _081293A4 + ldr r1, =0x00000884 adds r0, r5, r1 - ldr r1, _081293A8 + ldr r1, =0x083dfc78 ldr r2, [r1] ldr r1, [r5] ldr r1, [r1, 0x1C] @@ -609239,25 +589359,20 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 8129334 ldrh r1, [r1, 0xE] lsrs r1, 12 bl sub_8129068 - ldr r0, _081293AC + ldr r0, =0x085a72bc bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _081293B0 + ldr r0, =0x085a728c movs r1, 0 movs r2, 0 movs r3, 0 bl obj_add_from_template_forward_search b _081293C6 .align 2, 0 -_0812939C: .4byte 0x085a5c08 -_081293A0: .4byte 0x00000be5 -_081293A4: .4byte 0x00000884 -_081293A8: .4byte 0x083dfc78 -_081293AC: .4byte 0x085a72bc -_081293B0: .4byte 0x085a728c + .pool _081293B4: ldr r0, [r4, 0x1C] ldrh r0, [r0] - ldr r1, _081293D4 + ldr r1, =nullsub_12 + 1 movs r2, 0x1 str r2, [sp] movs r2, 0 @@ -609271,7 +589386,7 @@ _081293C6: pop {r1} bx r1 .align 2, 0 -_081293D4: .4byte nullsub_12 + 1 + .pool thumb_func_end gpu_pal_decompress_alloc_tag_and_upload thumb_func_start sub_81293D8 @@ -609291,23 +589406,23 @@ sub_81293D8: @ 81293D8 adds r0, r5, 0 movs r1, 0 bl sub_812949C - ldr r4, _0812947C + ldr r4, =0x0203cebc ldr r1, [r4] bl call_LZZUnCompWram ldr r0, [r4] - ldr r4, _08129480 + ldr r4, =0x0203cec0 ldr r1, [r4] bl sub_81AFE44 ldr r0, [r4] str r0, [sp] - ldr r4, _08129484 + ldr r4, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r4 movs r1, 0x80 lsls r1, 2 orrs r0, r1 lsls r2, r7, 16 - ldr r1, _08129488 + ldr r1, =0x0000ffff ands r0, r1 orrs r0, r2 str r0, [sp, 0x4] @@ -609327,7 +589442,7 @@ sub_81293D8: @ 81293D8 bl malloc adds r5, r0, 0 adds r1, r5, 0 - ldr r0, _0812948C + ldr r0, =0x08614ff4 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2-r4} @@ -609348,11 +589463,7 @@ sub_81293D8: @ 81293D8 adds r0, r4, 0 b _08129492 .align 2, 0 -_0812947C: .4byte 0x0203cebc -_08129480: .4byte 0x0203cec0 -_08129484: .4byte 0xffff0000 -_08129488: .4byte 0x0000ffff -_0812948C: .4byte 0x08614ff4 + .pool _08129490: movs r0, 0x40 _08129492: @@ -609373,7 +589484,7 @@ sub_812949C: @ 812949C bls _081294AC movs r3, 0 _081294AC: - ldr r2, _081294BC + ldr r2, =0x085a6be8 lsls r0, 2 lsls r1, r3, 3 adds r0, r1 @@ -609382,7 +589493,7 @@ _081294AC: pop {r1} bx r1 .align 2, 0 -_081294BC: .4byte 0x085a6be8 + .pool thumb_func_end sub_812949C thumb_func_start sub_81294C0 @@ -609399,11 +589510,11 @@ sub_81294C0: @ 81294C0 lsrs r7, r1, 16 lsls r4, 24 lsrs r4, 24 - ldr r6, _08129588 + ldr r6, =0x0203a190 adds r0, r6, 0 bl sub_8129048 lsls r4, 5 - ldr r0, _0812958C + ldr r0, =0x085a5c08 adds r4, r0 str r4, [r6] ldrb r0, [r4, 0x11] @@ -609416,9 +589527,9 @@ sub_81294C0: @ 81294C0 bl sub_812925C adds r0, r6, 0 bl sub_81291A4 - ldr r0, _08129590 + ldr r0, =0x00000884 adds r5, r6, r0 - ldr r0, _08129594 + ldr r0, =0x083dfc78 ldr r1, [r0] ldr r0, [r6] ldr r0, [r0, 0x1C] @@ -609433,14 +589544,14 @@ sub_81294C0: @ 81294C0 adds r0, r6, 0 adds r0, 0x84 str r0, [sp, 0x4] - ldr r1, _08129598 + ldr r1, =0x085a72f4 ldr r0, [r6] ldrb r0, [r0, 0x12] lsls r0, 1 adds r0, r1 ldrh r0, [r0] lsls r0, 21 - ldr r4, _0812959C + ldr r4, =0xffff0000 mov r2, r8 lsls r1, r2, 16 lsrs r0, 16 @@ -609459,7 +589570,7 @@ sub_81294C0: @ 81294C0 bl malloc adds r4, r0, 0 adds r1, r4, 0 - ldr r0, _081295A0 + ldr r0, =0x085a72a4 ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} @@ -609478,17 +589589,11 @@ sub_81294C0: @ 81294C0 bl free b _081295BA .align 2, 0 -_08129588: .4byte 0x0203a190 -_0812958C: .4byte 0x085a5c08 -_08129590: .4byte 0x00000884 -_08129594: .4byte 0x083dfc78 -_08129598: .4byte 0x085a72f4 -_0812959C: .4byte 0xffff0000 -_081295A0: .4byte 0x085a72a4 + .pool _081295A4: ldr r0, [r4, 0x1C] ldrh r0, [r0] - ldr r1, _081295C8 + ldr r1, =nullsub_12 + 1 movs r2, 0x1 str r2, [sp] movs r2, 0 @@ -609505,7 +589610,7 @@ _081295BA: pop {r1} bx r1 .align 2, 0 -_081295C8: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81294C0 thumb_func_start sub_81295CC @@ -609547,7 +589652,7 @@ sub_81295CC: @ 81295CC lsrs r4, r0, 24 cmp r4, 0x40 beq _08129696 - ldr r2, _08129630 + ldr r2, =0x02020630 lsls r3, r4, 4 adds r1, r3, r4 lsls r1, 2 @@ -609560,9 +589665,9 @@ sub_81295CC: @ 81295CC lsls r0, r7, 16 b _081296B2 .align 2, 0 -_08129630: .4byte 0x02020630 + .pool _08129634: - ldr r0, _08129678 + ldr r0, =0x085a6be8 lsls r1, r6, 3 adds r1, r0 ldr r0, [r1] @@ -609576,7 +589681,7 @@ _08129634: lsrs r4, r0, 24 cmp r4, 0x40 beq _08129696 - ldr r1, _0812967C + ldr r1, =0x02020630 lsls r2, r4, 4 adds r0, r2, r4 lsls r0, 2 @@ -609595,8 +589700,7 @@ _08129634: strh r0, [r5, 0x26] b _081296BC .align 2, 0 -_08129678: .4byte 0x085a6be8 -_0812967C: .4byte 0x02020630 + .pool _08129680: strh r7, [r5, 0x26] b _081296BC @@ -609613,7 +589717,7 @@ _08129696: movs r0, 0x40 b _081296D8 _0812969A: - ldr r2, _081296E8 + ldr r2, =0x02020630 lsls r3, r4, 4 adds r1, r3, r4 lsls r1, 2 @@ -609656,14 +589760,14 @@ _081296D8: pop {r1} bx r1 .align 2, 0 -_081296E8: .4byte 0x02020630 + .pool thumb_func_end sub_81295CC thumb_func_start sub_81296EC sub_81296EC: @ 81296EC lsls r0, 24 lsrs r0, 24 - ldr r3, _08129704 + ldr r3, =0x0203a17c ldr r1, [r3] adds r1, r0 movs r2, 0 @@ -609673,19 +589777,19 @@ sub_81296EC: @ 81296EC strb r2, [r1] bx lr .align 2, 0 -_08129704: .4byte 0x0203a17c + .pool thumb_func_end sub_81296EC thumb_func_start sub_8129708 sub_8129708: @ 8129708 push {r4-r6,lr} - ldr r6, _08129728 + ldr r6, =0x020375e2 movs r0, 0 strh r0, [r6] - ldr r2, _0812972C + ldr r2, =0x020375f0 strh r0, [r2] - ldr r4, _08129730 - ldr r1, _08129734 + ldr r4, =0x020375e0 + ldr r1, =0x0203aac4 ldrh r0, [r4] ldrb r1, [r1] cmp r0, r1 @@ -609694,21 +589798,18 @@ sub_8129708: @ 8129708 strh r0, [r2] b _08129796 .align 2, 0 -_08129728: .4byte 0x020375e2 -_0812972C: .4byte 0x020375f0 -_08129730: .4byte 0x020375e0 -_08129734: .4byte 0x0203aac4 + .pool _08129738: - ldr r1, _08129740 + ldr r1, =0x020375e4 ldrb r0, [r2] strh r0, [r1] b _08129796 .align 2, 0 -_08129740: .4byte 0x020375e4 + .pool _08129744: - ldr r3, _0812979C - ldr r2, _081297A0 - ldr r1, _081297A4 + ldr r3, =0x085a5c08 + ldr r2, =0x0203a17c + ldr r1, =0x0203aa44 ldrh r0, [r4] lsls r0, 3 adds r4, r0, r1 @@ -609726,7 +589827,7 @@ _08129744: ldrb r0, [r4] bl sub_81296EC movs r1, 0 - ldr r0, _081297A8 + ldr r0, =0x02037318 ldr r0, [r0, 0x4] ldrb r2, [r0] cmp r1, r2 @@ -609752,26 +589853,23 @@ _08129796: pop {r0} bx r0 .align 2, 0 -_0812979C: .4byte 0x085a5c08 -_081297A0: .4byte 0x0203a17c -_081297A4: .4byte 0x0203aa44 -_081297A8: .4byte 0x02037318 + .pool thumb_func_end sub_8129708 thumb_func_start sub_81297AC sub_81297AC: @ 81297AC push {r4-r6,lr} movs r2, 0 - ldr r0, _081297D8 + ldr r0, =0x02037318 ldr r0, [r0, 0x4] ldrb r1, [r0] cmp r2, r1 bcs _081297F0 adds r3, r0, 0 ldr r5, [r3, 0x4] - ldr r0, _081297DC + ldr r0, =0x020375e0 ldrh r4, [r0] - ldr r6, _081297E0 + ldr r6, =0x020375e2 _081297C4: lsls r0, r2, 1 adds r0, r2 @@ -609784,9 +589882,7 @@ _081297C4: strh r0, [r6] b _081297F0 .align 2, 0 -_081297D8: .4byte 0x02037318 -_081297DC: .4byte 0x020375e0 -_081297E0: .4byte 0x020375e2 + .pool _081297E4: adds r0, r2, 0x1 lsls r0, 24 @@ -609811,19 +589907,19 @@ sub_81297F8: @ 81297F8 movs r6, 0 b _081298BE _08129808: - ldr r3, _081298D8 + ldr r3, =0x0203aa44 lsls r5, r6, 3 adds r4, r5, r3 ldrb r1, [r4] - ldr r2, _081298DC + ldr r2, =0x0203a17c ldr r0, [r2] adds r0, r1 ldrb r0, [r0] lsls r0, 5 - ldr r7, _081298E0 + ldr r7, =0x085a5c08 adds r0, r7 ldrb r2, [r0, 0x11] - ldr r7, _081298DC + ldr r7, =0x0203a17c ldr r0, [r7, 0x4] adds r0, r1 ldrb r0, [r0] @@ -609850,7 +589946,7 @@ _08129846: ldrb r0, [r0, 0x1] cmp r4, r0 bcs _0812989C - ldr r3, _081298D8 + ldr r3, =0x0203aa44 adds r3, r7 mov r9, r3 subs r5, r6, 0x7 @@ -609858,7 +589954,7 @@ _08129846: _0812985E: adds r0, r4, 0x7 add r0, r8 - ldr r1, _081298E4 + ldr r1, =0x02037318 ldr r3, [r1] ldr r1, [sp] subs r2, r1, r6 @@ -609890,14 +589986,14 @@ _0812989C: mov r1, r10 lsls r0, r1, 24 lsrs r6, r0, 24 - ldr r3, _081298D8 + ldr r3, =0x0203aa44 adds r5, r7, 0 adds r0, r7, r3 ldrb r0, [r0, 0x2] cmp r6, r0 bcc _08129846 _081298AE: - ldr r2, _081298D8 + ldr r2, =0x0203aa44 adds r0, r7, r2 ldrb r0, [r0] bl sub_81296EC @@ -609906,7 +590002,7 @@ _081298B8: lsls r0, r3, 24 lsrs r6, r0, 24 _081298BE: - ldr r0, _081298E8 + ldr r0, =0x0203aac4 ldrb r0, [r0] cmp r6, r0 bcc _08129808 @@ -609919,11 +590015,7 @@ _081298BE: pop {r0} bx r0 .align 2, 0 -_081298D8: .4byte 0x0203aa44 -_081298DC: .4byte 0x0203a17c -_081298E0: .4byte 0x085a5c08 -_081298E4: .4byte 0x02037318 -_081298E8: .4byte 0x0203aac4 + .pool thumb_func_end sub_81297F8 thumb_func_start sub_81298EC @@ -609931,7 +590023,7 @@ sub_81298EC: @ 81298EC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08129910 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -609946,7 +590038,7 @@ sub_81298EC: @ 81298EC beq _0812991E b _08129994 .align 2, 0 -_08129910: .4byte 0x03005e00 + .pool _08129914: cmp r0, 0x2 beq _08129954 @@ -609959,14 +590051,14 @@ _0812991E: strh r0, [r4, 0xC] b _08129994 _08129928: - ldr r0, _0812994C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08129994 bl cur_mapdata_full_redraw - ldr r0, _08129950 + ldr r0, =0x08275d2e bl script_env_1_execute_new_script movs r0, 0 movs r1, 0x1 @@ -609975,8 +590067,7 @@ _08129928: strh r0, [r4, 0xC] b _08129994 .align 2, 0 -_0812994C: .4byte 0x02037fd4 -_08129950: .4byte 0x08275d2e + .pool _08129954: bl script_env_2_enable adds r0, r5, 0 @@ -609991,15 +590082,15 @@ _08129968: lsrs r0, 24 cmp r0, 0x1 bne _08129994 - ldr r4, _0812999C - ldr r1, _081299A0 + ldr r4, =0x02021fc4 + ldr r1, =0x085eaac5 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _081299A4 + ldr r2, =sub_8129D64 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC - ldr r0, _081299A8 + ldr r0, =0x02037318 ldrb r0, [r0, 0x14] cmp r0, 0x56 bne _08129994 @@ -610009,17 +590100,14 @@ _08129994: pop {r0} bx r0 .align 2, 0 -_0812999C: .4byte 0x02021fc4 -_081299A0: .4byte 0x085eaac5 -_081299A4: .4byte sub_8129D64 + 1 -_081299A8: .4byte 0x02037318 + .pool thumb_func_end sub_81298EC thumb_func_start sub_81299AC sub_81299AC: @ 81299AC push {lr} movs r1, 0 - ldr r0, _081299C8 + ldr r0, =0x0203a17c ldrb r2, [r0, 0x8] cmp r1, r2 bcs _081299D6 @@ -610032,7 +590120,7 @@ _081299BA: movs r0, 0x1 b _081299D8 .align 2, 0 -_081299C8: .4byte 0x0203a17c + .pool _081299CC: adds r0, r1, 0x1 lsls r0, 16 @@ -610053,9 +590141,9 @@ sub_81299DC: @ 81299DC push {r6} sub sp, 0x4 bl player_get_direction__sp1AA - ldr r3, _08129A24 - ldr r2, _08129A28 - ldr r4, _08129A2C + ldr r3, =0x0203aa38 + ldr r2, =0x02020630 + ldr r4, =0x03005dd0 ldr r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -610064,7 +590152,7 @@ sub_81299DC: @ 81299DC ldrh r0, [r0, 0x2E] strb r0, [r3] bl sub_812A39C - ldr r0, _08129A30 + ldr r0, =0x085a7404 movs r1, 0x78 movs r2, 0x50 movs r3, 0 @@ -610072,24 +590160,19 @@ sub_81299DC: @ 81299DC lsls r0, 24 lsrs r0, 24 str r0, [r4, 0x4] - ldr r0, _08129A34 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 bne _08129A3C - ldr r1, _08129A38 + ldr r1, =nullsub_12 + 1 str r0, [sp] movs r0, 0xC1 b _08129A44 .align 2, 0 -_08129A24: .4byte 0x0203aa38 -_08129A28: .4byte 0x02020630 -_08129A2C: .4byte 0x03005dd0 -_08129A30: .4byte 0x085a7404 -_08129A34: .4byte 0x03005d90 -_08129A38: .4byte nullsub_12 + 1 + .pool _08129A3C: - ldr r1, _08129AA8 + ldr r1, =nullsub_12 + 1 movs r0, 0 str r0, [sp] movs r0, 0xC2 @@ -610097,10 +590180,10 @@ _08129A44: movs r2, 0x88 movs r3, 0x48 bl sub_808DD68 - ldr r1, _08129AAC + ldr r1, =0x0203aa39 strb r0, [r1] - ldr r6, _08129AB0 - ldr r0, _08129AAC + ldr r6, =0x02020630 + ldr r0, =0x0203aa39 ldrb r0, [r0] lsls r1, r0, 4 adds r1, r0 @@ -610116,14 +590199,14 @@ _08129A44: mov r2, r8 orrs r0, r2 strb r0, [r1, 0x5] - ldr r5, _08129AB4 + ldr r5, =0x0203aa38 ldrb r1, [r5] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r6 bl obj_delete_and_free_tiles - ldr r0, _08129AB8 + ldr r0, =0x03005dd0 ldr r0, [r0, 0x4] strb r0, [r5] ldrb r1, [r5] @@ -610143,11 +590226,7 @@ _08129A44: pop {r0} bx r0 .align 2, 0 -_08129AA8: .4byte nullsub_12 + 1 -_08129AAC: .4byte 0x0203aa39 -_08129AB0: .4byte 0x02020630 -_08129AB4: .4byte 0x0203aa38 -_08129AB8: .4byte 0x03005dd0 + .pool thumb_func_end sub_81299DC thumb_func_start sub_8129ABC @@ -610158,7 +590237,7 @@ sub_8129ABC: @ 8129ABC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08129AE0 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0x4 ldrsh r0, [r4, r1] @@ -610170,13 +590249,13 @@ sub_8129ABC: @ 8129ABC beq _08129AEA b _08129B2E .align 2, 0 -_08129AE0: .4byte 0x03005e08 + .pool _08129AE4: cmp r0, 0x2 beq _08129B1A b _08129B2E _08129AEA: - ldr r0, _08129B08 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -610190,7 +590269,7 @@ _08129AEA: strh r0, [r4, 0xA] b _08129B2E .align 2, 0 -_08129B08: .4byte 0x02037fd4 + .pool _08129B0C: bl sub_81299DC bl pal_fill_black @@ -610221,8 +590300,8 @@ sub_8129B34: @ 8129B34 movs r0, 0 movs r1, 0x1 bl sub_8197434 - ldr r4, _08129BB4 - ldr r3, _08129BB8 + ldr r4, =0x02020630 + ldr r3, =0x0203aa38 ldrb r1, [r3] lsls r0, r1, 4 adds r0, r1 @@ -610248,9 +590327,9 @@ sub_8129B34: @ 8129B34 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08129BBC + ldr r1, =sub_812A36C + 1 str r1, [r0] - ldr r2, _08129BC0 + ldr r2, =0x0203aa39 ldrb r1, [r2] lsls r0, r1, 4 adds r0, r1 @@ -610265,24 +590344,19 @@ sub_8129B34: @ 8129B34 adds r0, r4 movs r1, 0x48 strh r1, [r0, 0x22] - ldr r1, _08129BC4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 strh r6, [r0, 0x1C] - ldr r1, _08129BC8 + ldr r1, =sub_8128E18 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08129BB4: .4byte 0x02020630 -_08129BB8: .4byte 0x0203aa38 -_08129BBC: .4byte sub_812A36C + 1 -_08129BC0: .4byte 0x0203aa39 -_08129BC4: .4byte 0x03005e00 -_08129BC8: .4byte sub_8128E18 + 1 + .pool thumb_func_end sub_8129B34 thumb_func_start sub_8129BCC @@ -610291,7 +590365,7 @@ sub_8129BCC: @ 8129BCC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08129BF4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -610305,7 +590379,7 @@ sub_8129BCC: @ 8129BCC pop {r0} bx r0 .align 2, 0 -_08129BF4: .4byte 0x03005e00 + .pool thumb_func_end sub_8129BCC thumb_func_start sub_8129BF8 @@ -610314,7 +590388,7 @@ sub_8129BF8: @ 8129BF8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08129C58 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -610322,8 +590396,8 @@ sub_8129BF8: @ 8129BF8 movs r1, 0 strh r1, [r0, 0x1C] bl sub_8128DE0 - ldr r3, _08129C5C - ldr r5, _08129C60 + ldr r3, =0x02020630 + ldr r5, =0x0203aa38 ldrb r1, [r5] lsls r0, r1, 4 adds r0, r1 @@ -610341,13 +590415,13 @@ sub_8129BF8: @ 8129BF8 lsls r0, 2 adds r3, 0x1C adds r0, r3 - ldr r1, _08129C64 + ldr r1, =nullsub_12 + 1 str r1, [r0] - ldr r5, _08129C68 - ldr r1, _08129C6C + ldr r5, =0x02021fc4 + ldr r1, =0x085eaa62 adds r0, r5, 0 bl ExpandTextCodes - ldr r2, _08129C70 + ldr r2, =sub_812A1F0 + 1 adds r0, r4, 0 adds r1, r5, 0 bl sub_81978EC @@ -610355,13 +590429,7 @@ sub_8129BF8: @ 8129BF8 pop {r0} bx r0 .align 2, 0 -_08129C58: .4byte 0x03005e00 -_08129C5C: .4byte 0x02020630 -_08129C60: .4byte 0x0203aa38 -_08129C64: .4byte nullsub_12 + 1 -_08129C68: .4byte 0x02021fc4 -_08129C6C: .4byte 0x085eaa62 -_08129C70: .4byte sub_812A1F0 + 1 + .pool thumb_func_end sub_8129BF8 thumb_func_start sub_8129C74 @@ -610371,26 +590439,23 @@ sub_8129C74: @ 8129C74 lsrs r5, r0, 24 adds r0, r5, 0 bl sub_812A0E8 - ldr r0, _08129C98 + ldr r0, =0x0203aac4 ldrb r0, [r0] cmp r0, 0 beq _08129CA8 - ldr r4, _08129C9C - ldr r1, _08129CA0 + ldr r4, =0x02021fc4 + ldr r1, =0x085eaaa3 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _08129CA4 + ldr r2, =sub_812A1A0 + 1 b _08129D14 .align 2, 0 -_08129C98: .4byte 0x0203aac4 -_08129C9C: .4byte 0x02021fc4 -_08129CA0: .4byte 0x085eaaa3 -_08129CA4: .4byte sub_812A1A0 + 1 + .pool _08129CA8: lsls r1, r5, 2 adds r1, r5 lsls r1, 3 - ldr r0, _08129D20 + ldr r0, =0x03005e08 adds r1, r0 movs r2, 0 ldrsh r0, [r1, r2] @@ -610412,8 +590477,8 @@ _08129CA8: cmp r0, 0x1 bne _08129D3C _08129CDE: - ldr r3, _08129D24 - ldr r4, _08129D28 + ldr r3, =0x02020630 + ldr r4, =0x0203aa38 ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -610431,32 +590496,26 @@ _08129CDE: lsls r0, 2 adds r3, 0x1C adds r0, r3 - ldr r1, _08129D2C + ldr r1, =nullsub_12 + 1 str r1, [r0] - ldr r4, _08129D30 - ldr r1, _08129D34 + ldr r4, =0x02021fc4 + ldr r1, =0x085eaa62 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _08129D38 + ldr r2, =sub_812A1F0 + 1 _08129D14: adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC b _08129D50 .align 2, 0 -_08129D20: .4byte 0x03005e08 -_08129D24: .4byte 0x02020630 -_08129D28: .4byte 0x0203aa38 -_08129D2C: .4byte nullsub_12 + 1 -_08129D30: .4byte 0x02021fc4 -_08129D34: .4byte 0x085eaa62 -_08129D38: .4byte sub_812A1F0 + 1 + .pool _08129D3C: - ldr r4, _08129D58 - ldr r1, _08129D5C + ldr r4, =0x02021fc4 + ldr r1, =0x085eaa81 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _08129D60 + ldr r2, =sub_8129D64 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -610465,9 +590524,7 @@ _08129D50: pop {r0} bx r0 .align 2, 0 -_08129D58: .4byte 0x02021fc4 -_08129D5C: .4byte 0x085eaa81 -_08129D60: .4byte sub_8129D64 + 1 + .pool thumb_func_end sub_8129C74 thumb_func_start sub_8129D64 @@ -610475,7 +590532,7 @@ sub_8129D64: @ 8129D64 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08129D88 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -610492,7 +590549,7 @@ _08129D84: pop {r0} bx r0 .align 2, 0 -_08129D88: .4byte 0x030022c0 + .pool thumb_func_end sub_8129D64 thumb_func_start sub_8129D8C @@ -610500,7 +590557,7 @@ sub_8129D8C: @ 8129D8C push {lr} adds r2, r1, 0 lsls r0, 24 - ldr r1, _08129DA4 + ldr r1, =0x085a5c08 lsrs r0, 19 adds r0, r1 ldrb r1, [r0, 0x12] @@ -610510,7 +590567,7 @@ sub_8129D8C: @ 8129D8C strb r0, [r2, 0x1] b _08129E06 .align 2, 0 -_08129DA4: .4byte 0x085a5c08 + .pool _08129DA8: cmp r1, 0x1 bne _08129DB4 @@ -610580,8 +590637,8 @@ sub_8129E0C: @ 8129E0C push {r4-r6,lr} lsls r0, 24 lsls r1, 24 - ldr r5, _08129E64 - ldr r6, _08129E68 + ldr r5, =0x02020630 + ldr r6, =0x0203aa38 ldrb r3, [r6] lsls r2, r3, 4 adds r2, r3 @@ -610599,9 +590656,9 @@ sub_8129E0C: @ 8129E0C adds r3, r5, 0 adds r3, 0x1C adds r2, r3 - ldr r3, _08129E6C + ldr r3, =nullsub_12 + 1 str r3, [r2] - ldr r4, _08129E70 + ldr r4, =0x0203aa39 ldrb r3, [r4] lsls r2, r3, 4 adds r2, r3 @@ -610622,10 +590679,7 @@ sub_8129E0C: @ 8129E0C pop {r0} bx r0 .align 2, 0 -_08129E64: .4byte 0x02020630 -_08129E68: .4byte 0x0203aa38 -_08129E6C: .4byte nullsub_12 + 1 -_08129E70: .4byte 0x0203aa39 + .pool thumb_func_end sub_8129E0C thumb_func_start sub_8129E74 @@ -610639,7 +590693,7 @@ sub_8129E74: @ 8129E74 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r3, _08129F08 + ldr r3, =0x03005e00 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 @@ -610653,7 +590707,7 @@ sub_8129E74: @ 8129E74 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r2, _08129F0C + ldr r2, =0x0203a17c ldr r0, [r2, 0x4] adds r0, r1 ldrb r0, [r0] @@ -610703,8 +590757,7 @@ _08129ED4: movs r0, 0x1 b _08129F12 .align 2, 0 -_08129F08: .4byte 0x03005e00 -_08129F0C: .4byte 0x0203a17c + .pool _08129F10: movs r0, 0 _08129F12: @@ -610722,9 +590775,9 @@ sub_8129F20: @ 8129F20 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r2, _08129F94 - ldr r3, _08129F98 - ldr r0, _08129F9C + ldr r2, =0x0203a17c + ldr r3, =0x0203aa44 + ldr r0, =0x0203aac4 ldrb r0, [r0] lsls r0, 3 adds r0, r3 @@ -610737,7 +590790,7 @@ sub_8129F20: @ 8129F20 movs r6, 0xF ands r6, r0 movs r4, 0 - ldr r7, _08129FA0 + ldr r7, =0x03005d8c mov r9, r3 _08129F4A: ldr r1, [r7] @@ -610745,44 +590798,38 @@ _08129F4A: adds r0, r4 lsls r5, r0, 3 adds r1, r5 - ldr r2, _08129FA4 + ldr r2, =0x00000c74 adds r0, r1, r2 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, r8 bne _08129FB0 - ldr r2, _08129FA8 + ldr r2, =0x00000c76 adds r0, r1, r2 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, r6 bne _08129FB0 - ldr r2, _08129FAC + ldr r2, =0x00000c84 adds r0, r1, r2 ldrh r0, [r0] bl flag_check lsls r0, 24 cmp r0, 0 bne _08129FB0 - ldr r0, _08129F9C + ldr r0, =0x0203aac4 ldrb r1, [r0] lsls r1, 3 add r1, r9 ldr r0, [r7] adds r0, r5 - ldr r2, _08129FAC + ldr r2, =0x00000c84 adds r0, r2 ldrh r0, [r0] strh r0, [r1, 0x4] b _08129FBA .align 2, 0 -_08129F94: .4byte 0x0203a17c -_08129F98: .4byte 0x0203aa44 -_08129F9C: .4byte 0x0203aac4 -_08129FA0: .4byte 0x03005d8c -_08129FA4: .4byte 0x00000c74 -_08129FA8: .4byte 0x00000c76 -_08129FAC: .4byte 0x00000c84 + .pool _08129FB0: adds r0, r4, 0x1 lsls r0, 16 @@ -610811,14 +590858,14 @@ _08129FD2: ldrb r0, [r1] cmp r0, 0 beq _0812A024 - ldr r0, _0812A018 + ldr r0, =0x085a5c08 ldrb r2, [r1] lsls r1, r2, 5 adds r1, r0 ldrb r0, [r1, 0x11] cmp r0, 0x4 bne _0812A024 - ldr r5, _0812A01C + ldr r5, =0x0203aa44 adds r0, r2, 0 adds r1, r5, 0 bl sub_8129D8C @@ -610833,20 +590880,18 @@ _08129FD2: bne _0812A024 strb r6, [r5] bl sub_8129F20 - ldr r0, _0812A020 + ldr r0, =0x0203aac4 strb r4, [r0] movs r0, 0x1 b _0812A034 .align 2, 0 -_0812A018: .4byte 0x085a5c08 -_0812A01C: .4byte 0x0203aa44 -_0812A020: .4byte 0x0203aac4 + .pool _0812A024: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 _0812A02A: - ldr r0, _0812A03C + ldr r0, =0x0203a17c ldrb r1, [r0, 0x8] cmp r6, r1 bcc _08129FD2 @@ -610856,7 +590901,7 @@ _0812A034: pop {r1} bx r1 .align 2, 0 -_0812A03C: .4byte 0x0203a17c + .pool thumb_func_end sub_8129FC8 thumb_func_start sub_812A040 @@ -610880,12 +590925,12 @@ sub_812A040: @ 812A040 lsrs r3, 24 mov r8, r3 movs r4, 0 - ldr r7, _0812A0D8 + ldr r7, =0x0203a17c ldrb r0, [r7, 0x8] cmp r4, r0 bcs _0812A0C6 adds r6, r7, 0 - ldr r5, _0812A0DC + ldr r5, =0x0203aac4 _0812A072: ldr r0, [r6] adds r0, r4 @@ -610898,7 +590943,7 @@ _0812A072: ands r2, r0 cmp r1, 0 beq _0812A0BA - ldr r0, _0812A0E0 + ldr r0, =0x085a5c08 lsls r1, 5 adds r1, r0 ldrb r0, [r1, 0x11] @@ -610913,7 +590958,7 @@ _0812A072: bcc _0812A0BA cmp r8, r2 bcc _0812A0BA - ldr r0, _0812A0E4 + ldr r0, =0x0203aa44 ldrb r1, [r5] lsls r1, 3 adds r1, r0 @@ -610939,10 +590984,7 @@ _0812A0C6: pop {r0} bx r0 .align 2, 0 -_0812A0D8: .4byte 0x0203a17c -_0812A0DC: .4byte 0x0203aac4 -_0812A0E0: .4byte 0x085a5c08 -_0812A0E4: .4byte 0x0203aa44 + .pool thumb_func_end sub_812A040 thumb_func_start sub_812A0E8 @@ -610950,7 +590992,7 @@ sub_812A0E8: @ 812A0E8 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _0812A140 + ldr r4, =0x0203aac4 movs r0, 0 strb r0, [r4] adds r0, r6, 0 @@ -610960,7 +591002,7 @@ sub_812A0E8: @ 812A0E8 cmp r0, 0x1 beq _0812A18C movs r5, 0 - ldr r0, _0812A144 + ldr r0, =0x0203a17c ldrb r1, [r0, 0x8] cmp r5, r1 bcs _0812A15A @@ -610971,7 +591013,7 @@ _0812A10E: ldrb r1, [r0] cmp r1, 0 beq _0812A14C - ldr r4, _0812A148 + ldr r4, =0x0203aa44 adds r0, r1, 0 adds r1, r4, 0 bl sub_8129D8C @@ -610989,24 +591031,22 @@ _0812A10E: strb r0, [r7] b _0812A15A .align 2, 0 -_0812A140: .4byte 0x0203aac4 -_0812A144: .4byte 0x0203a17c -_0812A148: .4byte 0x0203aa44 + .pool _0812A14C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0812A194 + ldr r0, =0x0203a17c ldrb r1, [r0, 0x8] cmp r5, r1 bcc _0812A10E _0812A15A: - ldr r0, _0812A198 + ldr r0, =0x0203aac4 ldrb r0, [r0] cmp r0, 0 beq _0812A18C - ldr r0, _0812A194 - ldr r2, _0812A19C + ldr r0, =0x0203a17c + ldr r2, =0x0203aa44 ldrb r1, [r2] ldr r0, [r0, 0x4] adds r0, r1 @@ -611030,9 +591070,7 @@ _0812A18C: pop {r0} bx r0 .align 2, 0 -_0812A194: .4byte 0x0203a17c -_0812A198: .4byte 0x0203aac4 -_0812A19C: .4byte 0x0203aa44 + .pool thumb_func_end sub_812A0E8 thumb_func_start sub_812A1A0 @@ -611042,14 +591080,14 @@ sub_812A1A0: @ 812A1A0 lsls r4, 24 lsrs r4, 24 bl sub_8197930 - ldr r1, _0812A1BC + ldr r1, =0x085a7348 adds r0, r4, 0 bl sub_8121F68 pop {r4} pop {r0} bx r0 .align 2, 0 -_0812A1BC: .4byte 0x085a7348 + .pool thumb_func_end sub_812A1A0 thumb_func_start sub_812A1C0 @@ -611061,21 +591099,20 @@ sub_812A1C0: @ 812A1C0 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _0812A1E8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, _0812A1EC + ldr r1, =sub_81298EC + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0812A1E8: .4byte 0x03005e00 -_0812A1EC: .4byte sub_81298EC + 1 + .pool thumb_func_end sub_812A1C0 thumb_func_start sub_812A1F0 @@ -611085,14 +591122,14 @@ sub_812A1F0: @ 812A1F0 lsls r4, 24 lsrs r4, 24 bl sub_8197930 - ldr r1, _0812A20C + ldr r1, =0x085a7350 adds r0, r4, 0 bl sub_8121F68 pop {r4} pop {r0} bx r0 .align 2, 0 -_0812A20C: .4byte 0x085a7350 + .pool thumb_func_end sub_812A1F0 thumb_func_start sub_812A210 @@ -611120,21 +591157,20 @@ sub_812A22C: @ 812A22C movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _0812A254 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0xC] - ldr r1, _0812A258 + ldr r1, =sub_812A25C + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0812A254: .4byte 0x03005e00 -_0812A258: .4byte sub_812A25C + 1 + .pool thumb_func_end sub_812A22C thumb_func_start sub_812A25C @@ -611142,7 +591178,7 @@ sub_812A25C: @ 812A25C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0812A27C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -611155,9 +591191,9 @@ sub_812A25C: @ 812A25C beq _0812A29C b _0812A2B2 .align 2, 0 -_0812A27C: .4byte 0x03005e00 + .pool _0812A280: - ldr r0, _0812A298 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -611169,13 +591205,13 @@ _0812A280: strh r0, [r5, 0xC] b _0812A2B2 .align 2, 0 -_0812A298: .4byte 0x02037fd4 + .pool _0812A29C: bl sub_812A3C8 - ldr r0, _0812A2B8 - ldr r1, _0812A2BC + ldr r0, =0x03005dac + ldr r1, =sub_812A334 + 1 str r1, [r0] - ldr r0, _0812A2C0 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -611184,9 +591220,7 @@ _0812A2B2: pop {r0} bx r0 .align 2, 0 -_0812A2B8: .4byte 0x03005dac -_0812A2BC: .4byte sub_812A334 + 1 -_0812A2C0: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_812A25C thumb_func_start sub_812A2C4 @@ -611197,7 +591231,7 @@ sub_812A2C4: @ 812A2C4 lsls r1, r0, 2 adds r1, r0 lsls r5, r1, 3 - ldr r6, _0812A2E8 + ldr r6, =0x03005e08 adds r4, r5, r6 movs r1, 0x4 ldrsh r0, [r4, r1] @@ -611209,7 +591243,7 @@ sub_812A2C4: @ 812A2C4 beq _0812A2F6 b _0812A32A .align 2, 0 -_0812A2E8: .4byte 0x03005e08 + .pool _0812A2EC: cmp r0, 0x2 beq _0812A308 @@ -611220,11 +591254,11 @@ _0812A2F6: bl sub_80E9578 b _0812A30C _0812A2FC: - ldr r0, _0812A304 + ldr r0, =0x08275d0c bl script_env_1_execute_new_script b _0812A30C .align 2, 0 -_0812A304: .4byte 0x08275d0c + .pool _0812A308: bl script_env_2_enable _0812A30C: @@ -611241,14 +591275,14 @@ _0812A314: adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 - ldr r1, _0812A330 + ldr r1, =sub_8126B80 + 1 str r1, [r0] _0812A32A: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0812A330: .4byte sub_8126B80 + 1 + .pool thumb_func_end sub_812A2C4 thumb_func_start sub_812A334 @@ -611259,12 +591293,12 @@ sub_812A334: @ 812A334 movs r1, 0x1 bl sub_81973C4 bl sub_8126ABC - ldr r0, _0812A364 + ldr r0, =sub_812A2C4 + 1 movs r1, 0x8 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0812A368 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -611274,8 +591308,7 @@ sub_812A334: @ 812A334 pop {r0} bx r0 .align 2, 0 -_0812A364: .4byte sub_812A2C4 + 1 -_0812A368: .4byte 0x03005e00 + .pool thumb_func_end sub_812A334 thumb_func_start sub_812A36C @@ -611311,25 +591344,24 @@ _0812A398: thumb_func_start sub_812A39C sub_812A39C: @ 812A39C push {lr} - ldr r0, _0812A3B0 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 bne _0812A3B8 - ldr r0, _0812A3B4 + ldr r0, =0x085a73d8 bl gpu_pal_obj_alloc_tag_and_apply b _0812A3BE .align 2, 0 -_0812A3B0: .4byte 0x03005d90 -_0812A3B4: .4byte 0x085a73d8 + .pool _0812A3B8: - ldr r0, _0812A3C4 + ldr r0, =0x085a73e0 bl gpu_pal_obj_alloc_tag_and_apply _0812A3BE: pop {r0} bx r0 .align 2, 0 -_0812A3C4: .4byte 0x085a73e0 + .pool thumb_func_end sub_812A39C thumb_func_start sub_812A3C8 @@ -611351,40 +591383,34 @@ sub_812A3D4: @ 812A3D4 lsrs r0, 24 cmp r0, 0x1 bne _0812A430 - ldr r0, _0812A414 - ldr r1, _0812A418 + ldr r0, =0x02021cc4 + ldr r1, =0x0203a172 ldrb r2, [r1] - ldr r1, _0812A41C + ldr r1, =0x0203a14c ldr r1, [r1] adds r1, r2 ldrb r1, [r1] lsls r1, 5 - ldr r2, _0812A420 + ldr r2, =0x085a5c09 adds r1, r2 bl gf_strcpy - ldr r4, _0812A424 - ldr r1, _0812A428 + ldr r4, =0x02021fc4 + ldr r1, =0x085eaa14 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _0812A42C + ldr r2, =sub_812A458 + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC b _0812A444 .align 2, 0 -_0812A414: .4byte 0x02021cc4 -_0812A418: .4byte 0x0203a172 -_0812A41C: .4byte 0x0203a14c -_0812A420: .4byte 0x085a5c09 -_0812A424: .4byte 0x02021fc4 -_0812A428: .4byte 0x085eaa14 -_0812A42C: .4byte sub_812A458 + 1 + .pool _0812A430: - ldr r4, _0812A44C - ldr r1, _0812A450 + ldr r4, =0x02021fc4 + ldr r1, =0x085ea9e0 adds r0, r4, 0 bl ExpandTextCodes - ldr r2, _0812A454 + ldr r2, =sub_8127A5C + 1 adds r0, r5, 0 adds r1, r4, 0 bl sub_81978EC @@ -611393,9 +591419,7 @@ _0812A444: pop {r0} bx r0 .align 2, 0 -_0812A44C: .4byte 0x02021fc4 -_0812A450: .4byte 0x085ea9e0 -_0812A454: .4byte sub_8127A5C + 1 + .pool thumb_func_end sub_812A3D4 thumb_func_start sub_812A458 @@ -611405,14 +591429,14 @@ sub_812A458: @ 812A458 lsls r4, 24 lsrs r4, 24 bl sub_8197930 - ldr r1, _0812A474 + ldr r1, =0x085a741c adds r0, r4, 0 bl sub_8121F68 pop {r4} pop {r0} bx r0 .align 2, 0 -_0812A474: .4byte 0x085a741c + .pool thumb_func_end sub_812A458 thumb_func_start sub_812A478 @@ -611421,27 +591445,27 @@ sub_812A478: @ 812A478 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0812A4C0 + ldr r0, =0x0203a172 ldrb r1, [r0] - ldr r0, _0812A4C4 + ldr r0, =0x0203a14c ldr r0, [r0] adds r0, r1 movs r1, 0 strb r1, [r0] - ldr r5, _0812A4C8 + ldr r5, =0x0203a173 ldrb r0, [r5] bl sub_8161AD0 - ldr r1, _0812A4CC + ldr r1, =0x0203a151 strb r0, [r1] ldrb r0, [r5] bl sub_8161A38 adds r0, r4, 0 bl sub_8127814 - ldr r5, _0812A4D0 - ldr r1, _0812A4D4 + ldr r5, =0x02021fc4 + ldr r1, =0x085eaa3d adds r0, r5, 0 bl ExpandTextCodes - ldr r2, _0812A4D8 + ldr r2, =sub_8127A5C + 1 adds r0, r4, 0 adds r1, r5, 0 bl sub_81978EC @@ -611449,13 +591473,7 @@ sub_812A478: @ 812A478 pop {r0} bx r0 .align 2, 0 -_0812A4C0: .4byte 0x0203a172 -_0812A4C4: .4byte 0x0203a14c -_0812A4C8: .4byte 0x0203a173 -_0812A4CC: .4byte 0x0203a151 -_0812A4D0: .4byte 0x02021fc4 -_0812A4D4: .4byte 0x085eaa3d -_0812A4D8: .4byte sub_8127A5C + 1 + .pool thumb_func_end sub_812A478 thumb_func_start sub_812A4DC @@ -611464,7 +591482,7 @@ sub_812A4DC: @ 812A4DC sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0812A4FC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -611477,7 +591495,7 @@ sub_812A4DC: @ 812A4DC beq _0812A518 b _0812A530 .align 2, 0 -_0812A4FC: .4byte 0x03005e00 + .pool _0812A500: movs r0, 0x1 negs r0, r0 @@ -611491,13 +591509,13 @@ _0812A500: strh r0, [r4, 0x8] b _0812A530 _0812A518: - ldr r0, _0812A538 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0812A530 - ldr r0, _0812A53C + ldr r0, =sub_812A588 + 1 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -611507,8 +591525,7 @@ _0812A530: pop {r0} bx r0 .align 2, 0 -_0812A538: .4byte 0x02037fd4 -_0812A53C: .4byte sub_812A588 + 1 + .pool thumb_func_end sub_812A4DC thumb_func_start sub_812A540 @@ -611518,19 +591535,19 @@ sub_812A540: @ 812A540 adds r6, r1, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _0812A57C + ldr r5, =0x0203ab34 movs r0, 0x68 bl malloc_and_clear str r0, [r5] adds r0, r4, 0 adds r1, r6, 0 bl sub_812A6D4 - ldr r0, _0812A580 + ldr r0, =sub_812A4DC + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0812A584 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -611541,16 +591558,14 @@ sub_812A540: @ 812A540 pop {r0} bx r0 .align 2, 0 -_0812A57C: .4byte 0x0203ab34 -_0812A580: .4byte sub_812A4DC + 1 -_0812A584: .4byte 0x03005e00 + .pool thumb_func_end sub_812A540 thumb_func_start sub_812A588 sub_812A588: @ 812A588 push {lr} sub sp, 0x4 - ldr r0, _0812A5A4 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -611558,13 +591573,12 @@ sub_812A588: @ 812A588 cmp r0, 0xB bhi _0812A666 lsls r0, 2 - ldr r1, _0812A5A8 + ldr r1, =_0812A5AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0812A5A4: .4byte 0x030022c0 -_0812A5A8: .4byte _0812A5AC + .pool .align 2, 0 _0812A5AC: .4byte _0812A5DC @@ -611629,7 +591643,7 @@ _0812A644: bl sub_812AA78 bl sub_812AA90 _0812A64C: - ldr r1, _0812A65C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -611638,16 +591652,16 @@ _0812A64C: strb r0, [r1] b _0812A666 .align 2, 0 -_0812A65C: .4byte 0x030022c0 + .pool _0812A660: - ldr r0, _0812A66C + ldr r0, =sub_812A670 + 1 bl set_callback2 _0812A666: add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_0812A66C: .4byte sub_812A670 + 1 + .pool thumb_func_end sub_812A588 thumb_func_start sub_812A670 @@ -611667,7 +591681,7 @@ sub_812A688: @ 812A688 bl copy_super_sprites_to_oam bl copy_queue_process bl copy_pal_bg_faded_to_pal_ram - ldr r4, _0812A6D0 + ldr r4, =0x0203ab34 ldr r0, [r4] adds r0, 0x58 ldrh r1, [r0] @@ -611692,7 +591706,7 @@ sub_812A688: @ 812A688 pop {r0} bx r0 .align 2, 0 -_0812A6D0: .4byte 0x0203ab34 + .pool thumb_func_end sub_812A688 thumb_func_start sub_812A6D4 @@ -611702,7 +591716,7 @@ sub_812A6D4: @ 812A6D4 adds r5, r1, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0812A708 + ldr r0, =nullsub_49 + 1 movs r1, 0xFF bl AddTask adds r1, r0, 0 @@ -611711,7 +591725,7 @@ sub_812A6D4: @ 812A6D4 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0812A70C + ldr r1, =0x03005e00 adds r0, r1 strh r4, [r0, 0x8] adds r0, 0xA @@ -611721,23 +591735,22 @@ sub_812A6D4: @ 812A6D4 pop {r0} bx r0 .align 2, 0 -_0812A708: .4byte nullsub_49 + 1 -_0812A70C: .4byte 0x03005e00 + .pool thumb_func_end sub_812A6D4 thumb_func_start sub_812A710 sub_812A710: @ 812A710 push {lr} - ldr r0, _0812A740 + ldr r0, =nullsub_49 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 - ldr r0, _0812A744 + ldr r0, =0x03005e00 adds r2, r0 - ldr r3, _0812A748 + ldr r3, =0x0203ab34 ldr r1, [r3] ldrh r0, [r2, 0x8] strb r0, [r1, 0x1] @@ -611749,9 +591762,7 @@ sub_812A710: @ 812A710 pop {r0} bx r0 .align 2, 0 -_0812A740: .4byte nullsub_49 + 1 -_0812A744: .4byte 0x03005e00 -_0812A748: .4byte 0x0203ab34 + .pool thumb_func_end sub_812A710 thumb_func_start nullsub_49 @@ -611771,31 +591782,29 @@ sub_812A750: @ 812A750 str r0, [sp] movs r1, 0xC0 lsls r1, 19 - ldr r2, _0812A790 + ldr r2, =0x05006000 mov r0, sp bl CpuSet movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0812A794 + ldr r1, =0x085a7424 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r0, _0812A798 + ldr r0, =0x085a7434 bl Window_InitFromTemplates bl TextBox_ResetSomeField add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_0812A790: .4byte 0x05006000 -_0812A794: .4byte 0x085a7424 -_0812A798: .4byte 0x085a7434 + .pool thumb_func_end sub_812A750 thumb_func_start sub_812A79C sub_812A79C: @ 812A79C push {lr} - ldr r0, _0812A7B8 + ldr r0, =sub_812A688 + 1 bl SetVBlankCallback movs r0, 0x1 bl enable_irqs @@ -611806,7 +591815,7 @@ sub_812A79C: @ 812A79C pop {r0} bx r0 .align 2, 0 -_0812A7B8: .4byte sub_812A688 + 1 + .pool thumb_func_end sub_812A79C thumb_func_start sub_812A7BC @@ -611819,10 +591828,10 @@ sub_812A7BC: @ 812A7BC lsls r3, 9 mov r4, sp movs r6, 0 - ldr r1, _0812A808 + ldr r1, =0x040000d4 movs r5, 0x80 lsls r5, 5 - ldr r7, _0812A80C + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -611851,8 +591860,7 @@ _0812A7DA: pop {r0} bx r0 .align 2, 0 -_0812A808: .4byte 0x040000d4 -_0812A80C: .4byte 0x81000800 + .pool thumb_func_end sub_812A7BC thumb_func_start sub_812A810 @@ -611863,17 +591871,16 @@ sub_812A810: @ 812A810 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r0, _0812A82C + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _0812A830 + ldr r1, =0x81000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] add sp, 0x4 bx lr .align 2, 0 -_0812A82C: .4byte 0x040000d4 -_0812A830: .4byte 0x81000200 + .pool thumb_func_end sub_812A810 thumb_func_start sub_812A834 @@ -611921,17 +591928,16 @@ sub_812A834: @ 812A834 movs r0, 0x4A movs r1, 0x3F bl lcd_io_set - ldr r1, _0812A8BC + ldr r1, =0x00001048 movs r0, 0x50 bl lcd_io_set - ldr r1, _0812A8C0 + ldr r1, =0x00000809 movs r0, 0x52 bl lcd_io_set pop {r0} bx r0 .align 2, 0 -_0812A8BC: .4byte 0x00001048 -_0812A8C0: .4byte 0x00000809 + .pool thumb_func_end sub_812A834 thumb_func_start sub_812A8C4 @@ -611940,7 +591946,7 @@ sub_812A8C4: @ 812A8C4 mov r7, r8 push {r7} bl sub_812A710 - ldr r5, _0812A9A4 + ldr r5, =0x0203ab34 ldr r0, [r5] movs r4, 0 strb r4, [r0] @@ -611986,10 +591992,10 @@ sub_812A8C4: @ 812A8C4 adds r1, 0x60 strh r0, [r1] movs r7, 0 - ldr r0, _0812A9A8 + ldr r0, =0x085a76b4 mov r8, r0 _0812A934: - ldr r0, _0812A9A4 + ldr r0, =0x0203ab34 ldr r4, [r0] lsls r6, r7, 1 adds r0, r4, 0 @@ -612042,8 +592048,7 @@ _0812A934: pop {r0} bx r0 .align 2, 0 -_0812A9A4: .4byte 0x0203ab34 -_0812A9A8: .4byte 0x085a76b4 + .pool thumb_func_end sub_812A8C4 thumb_func_start sub_812A9AC @@ -612051,7 +592056,7 @@ sub_812A9AC: @ 812A9AC push {lr} bl sub_80A1A74 bl reset_all_obj_data - ldr r1, _0812A9C8 + ldr r1, =0x02021b38 movs r0, 0x80 strb r0, [r1] bl gpu_pal_allocator_reset @@ -612059,61 +592064,52 @@ sub_812A9AC: @ 812A9AC pop {r0} bx r0 .align 2, 0 -_0812A9C8: .4byte 0x02021b38 + .pool thumb_func_end sub_812A9AC thumb_func_start sub_812A9CC sub_812A9CC: @ 812A9CC push {r4,r5,lr} - ldr r4, _0812AA20 + ldr r4, =0x0203aacc movs r0, 0x8 bl malloc str r0, [r4] - ldr r4, _0812AA24 + ldr r4, =0x0203aad0 movs r0, 0xE bl malloc_and_clear str r0, [r4] - ldr r5, _0812AA28 + ldr r5, =0x0203aadc movs r0, 0x8 bl malloc_and_clear str r0, [r5] ldr r1, [r4] - ldr r2, _0812AA2C + ldr r2, =0x00002051 adds r0, r2, 0 strh r0, [r1] ldr r1, [r4] - ldr r2, _0812AA30 + ldr r2, =0x00002851 adds r0, r2, 0 strh r0, [r1, 0x2] - ldr r2, _0812AA34 + ldr r2, =0x00002061 adds r0, r2, 0 strh r0, [r1, 0x4] - ldr r2, _0812AA38 + ldr r2, =0x00002861 adds r0, r2, 0 strh r0, [r1, 0x6] - ldr r2, _0812AA3C + ldr r2, =0x000020be adds r0, r2, 0 strh r0, [r1, 0x8] - ldr r2, _0812AA40 + ldr r2, =0x000028be adds r0, r2, 0 strh r0, [r1, 0xA] - ldr r2, _0812AA44 + ldr r2, =0x000020bf adds r0, r2, 0 strh r0, [r1, 0xC] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0812AA20: .4byte 0x0203aacc -_0812AA24: .4byte 0x0203aad0 -_0812AA28: .4byte 0x0203aadc -_0812AA2C: .4byte 0x00002051 -_0812AA30: .4byte 0x00002851 -_0812AA34: .4byte 0x00002061 -_0812AA38: .4byte 0x00002861 -_0812AA3C: .4byte 0x000020be -_0812AA40: .4byte 0x000028be -_0812AA44: .4byte 0x000020bf + .pool thumb_func_end sub_812A9CC thumb_func_start sub_812AA48 @@ -612163,7 +592159,7 @@ sub_812AA90: @ 812AA90 thumb_func_start sub_812AAA8 sub_812AAA8: @ 812AAA8 push {r4,lr} - ldr r4, _0812AAC4 + ldr r4, =sub_812AAC8 + 1 adds r0, r4, 0 movs r1, 0 bl AddTask @@ -612174,7 +592170,7 @@ sub_812AAA8: @ 812AAA8 pop {r0} bx r0 .align 2, 0 -_0812AAC4: .4byte sub_812AAC8 + 1 + .pool thumb_func_end sub_812AAA8 thumb_func_start sub_812AAC8 @@ -612182,13 +592178,13 @@ sub_812AAC8: @ 812AAC8 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r6, _0812AAF8 + ldr r6, =0x085a7450 lsls r1, r0, 2 adds r1, r0 lsls r4, r1, 3 - ldr r5, _0812AAFC + ldr r5, =0x03005e00 _0812AAD8: - ldr r0, _0812AB00 + ldr r0, =0x0203ab34 ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -612203,9 +592199,7 @@ _0812AAD8: pop {r0} bx r0 .align 2, 0 -_0812AAF8: .4byte 0x085a7450 -_0812AAFC: .4byte 0x03005e00 -_0812AB00: .4byte 0x0203ab34 + .pool thumb_func_end sub_812AAC8 thumb_func_start sub_812AB04 @@ -612219,7 +592213,7 @@ sub_812AB04: @ 812AB04 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r4, _0812AB34 + ldr r4, =0x0203ab34 ldr r0, [r4] ldrb r0, [r0, 0x2] bl sub_812D3B4 @@ -612233,19 +592227,19 @@ sub_812AB04: @ 812AB04 pop {r1} bx r1 .align 2, 0 -_0812AB34: .4byte 0x0203ab34 + .pool thumb_func_end sub_812AB04 thumb_func_start sub_812AB38 sub_812AB38: @ 812AB38 push {lr} - ldr r0, _0812AB58 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0812AB50 - ldr r0, _0812AB5C + ldr r0, =0x0203ab34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -612255,14 +592249,13 @@ _0812AB50: pop {r1} bx r1 .align 2, 0 -_0812AB58: .4byte 0x02037fd4 -_0812AB5C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812AB38 thumb_func_start sub_812AB60 sub_812AB60: @ 812AB60 push {lr} - ldr r3, _0812AB8C + ldr r3, =0x0203ab34 ldr r1, [r3] movs r0, 0 strh r0, [r1, 0xE] @@ -612284,7 +592277,7 @@ sub_812AB60: @ 812AB60 strb r0, [r3] b _0812ABA0 .align 2, 0 -_0812AB8C: .4byte 0x0203ab34 + .pool _0812AB90: ldrb r0, [r3, 0xA] cmp r0, 0 @@ -612306,7 +592299,7 @@ sub_812ABA8: @ 812ABA8 lsls r0, 24 cmp r0, 0 beq _0812ABBC - ldr r0, _0812ABC4 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x4 strb r0, [r1] @@ -612315,7 +592308,7 @@ _0812ABBC: pop {r1} bx r1 .align 2, 0 -_0812ABC4: .4byte 0x0203ab34 + .pool thumb_func_end sub_812ABA8 thumb_func_start sub_812ABC8 @@ -612323,14 +592316,14 @@ sub_812ABC8: @ 812ABC8 push {lr} movs r0, 0 bl sub_812DEE4 - ldr r2, _0812ABF0 + ldr r2, =0x0203ab34 ldr r1, [r2] movs r0, 0x5 strb r0, [r1] ldr r2, [r2] movs r0, 0xC ldrsh r1, [r2, r0] - ldr r0, _0812ABF4 + ldr r0, =0x0000270e cmp r1, r0 ble _0812ABE8 movs r0, 0x17 @@ -612340,14 +592333,13 @@ _0812ABE8: pop {r1} bx r1 .align 2, 0 -_0812ABF0: .4byte 0x0203ab34 -_0812ABF4: .4byte 0x0000270e + .pool thumb_func_end sub_812ABC8 thumb_func_start sub_812ABF8 sub_812ABF8: @ 812ABF8 push {r4,r5,lr} - ldr r0, _0812AC14 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -612355,20 +592347,19 @@ sub_812ABF8: @ 812ABF8 beq _0812AC1C movs r0, 0 bl sub_812DC80 - ldr r0, _0812AC18 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x8 b _0812ACE2 .align 2, 0 -_0812AC14: .4byte 0x030022c0 -_0812AC18: .4byte 0x0203ab34 + .pool _0812AC1C: movs r0, 0x80 lsls r0, 1 ands r0, r1 cmp r0, 0 beq _0812AC82 - ldr r0, _0812AC78 + ldr r0, =0x0203ab34 ldr r2, [r0] movs r1, 0xC ldrsh r0, [r2, r1] @@ -612395,7 +592386,7 @@ _0812AC42: cmp r0, 0x2 ble _0812AC42 _0812AC5A: - ldr r0, _0812AC78 + ldr r0, =0x0203ab34 ldr r1, [r0] ldrh r0, [r1, 0xC] subs r0, 0x3 @@ -612410,7 +592401,7 @@ _0812AC5A: bl audio_play b _0812ACE4 .align 2, 0 -_0812AC78: .4byte 0x0203ab34 + .pool _0812AC7C: movs r0, 0x6 strb r0, [r2] @@ -612420,7 +592411,7 @@ _0812AC82: ands r0, r1 cmp r0, 0 beq _0812ACB2 - ldr r4, _0812ACEC + ldr r4, =0x0203ab34 ldr r0, [r4] movs r1, 0xC ldrsh r0, [r0, r1] @@ -612439,11 +592430,11 @@ _0812AC82: adds r0, 0x1 strh r0, [r1, 0x12] _0812ACB2: - ldr r0, _0812ACEC + ldr r0, =0x0203ab34 ldr r3, [r0] movs r1, 0x12 ldrsh r2, [r3, r1] - ldr r4, _0812ACF0 + ldr r4, =0x030022c0 adds r5, r0, 0 cmp r2, 0x2 bgt _0812ACD0 @@ -612473,8 +592464,7 @@ _0812ACE4: pop {r1} bx r1 .align 2, 0 -_0812ACEC: .4byte 0x0203ab34 -_0812ACF0: .4byte 0x030022c0 + .pool thumb_func_end sub_812ABF8 thumb_func_start sub_812ACF4 @@ -612484,7 +592474,7 @@ sub_812ACF4: @ 812ACF4 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, _0812AD2C + ldr r2, =0x085ef734 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -612496,7 +592486,7 @@ sub_812ACF4: @ 812ACF4 movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _0812AD30 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x7 strb r0, [r1] @@ -612505,14 +592495,13 @@ sub_812ACF4: @ 812ACF4 pop {r1} bx r1 .align 2, 0 -_0812AD2C: .4byte 0x085ef734 -_0812AD30: .4byte 0x0203ab34 + .pool thumb_func_end sub_812ACF4 thumb_func_start sub_812AD34 sub_812AD34: @ 812AD34 push {lr} - ldr r0, _0812AD58 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -612521,7 +592510,7 @@ sub_812AD34: @ 812AD34 movs r0, 0 movs r1, 0x1 bl sub_8197434 - ldr r0, _0812AD5C + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x5 strb r0, [r1] @@ -612530,8 +592519,7 @@ _0812AD52: pop {r1} bx r1 .align 2, 0 -_0812AD58: .4byte 0x030022c0 -_0812AD5C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812AD34 thumb_func_start sub_812AD60 @@ -612541,7 +592529,7 @@ sub_812AD60: @ 812AD60 lsls r0, 24 cmp r0, 0 beq _0812AD74 - ldr r0, _0812AD7C + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x5 strb r0, [r1] @@ -612550,7 +592538,7 @@ _0812AD74: pop {r1} bx r1 .align 2, 0 -_0812AD7C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812AD60 thumb_func_start sub_812AD80 @@ -612568,7 +592556,7 @@ sub_812AD80: @ 812AD80 bl sub_80EEC80 movs r0, 0 strh r0, [r4, 0x8] - ldr r4, _0812ADC0 + ldr r4, =0x0203ab34 ldr r0, [r4] ldrb r1, [r0, 0x4] movs r0, 0x20 @@ -612580,7 +592568,7 @@ sub_812AD80: @ 812AD80 movs r0, 0xA b _0812ADCE .align 2, 0 -_0812ADC0: .4byte 0x0203ab34 + .pool _0812ADC4: movs r0, 0x1 bl sub_812DEE4 @@ -612588,7 +592576,7 @@ _0812ADC4: movs r0, 0xB _0812ADCE: strb r0, [r1] - ldr r4, _0812ADF0 + ldr r4, =0x0203ab34 ldr r0, [r4] movs r1, 0x8 strh r1, [r0, 0x1A] @@ -612604,7 +592592,7 @@ _0812ADE6: pop {r1} bx r1 .align 2, 0 -_0812ADF0: .4byte 0x0203ab34 + .pool thumb_func_end sub_812AD80 thumb_func_start sub_812ADF4 @@ -612616,7 +592604,7 @@ sub_812ADF4: @ 812ADF4 beq _0812AE18 movs r0, 0x1 bl sub_812DEE4 - ldr r3, _0812AE20 + ldr r3, =0x0203ab34 ldr r2, [r3] ldrb r1, [r2, 0x4] movs r0, 0xDF @@ -612630,7 +592618,7 @@ _0812AE18: pop {r1} bx r1 .align 2, 0 -_0812AE20: .4byte 0x0203ab34 + .pool thumb_func_end sub_812ADF4 thumb_func_start sub_812AE24 @@ -612644,7 +592632,7 @@ sub_812AE24: @ 812AE24 cmp r1, 0x1D ble _0812AE40 bl sub_812B55C - ldr r0, _0812AE48 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0xC strb r0, [r1] @@ -612653,13 +592641,13 @@ _0812AE40: pop {r1} bx r1 .align 2, 0 -_0812AE48: .4byte 0x0203ab34 + .pool thumb_func_end sub_812AE24 thumb_func_start sub_812AE4C sub_812AE4C: @ 812AE4C push {r4,lr} - ldr r0, _0812AE80 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -612667,7 +592655,7 @@ sub_812AE4C: @ 812AE4C beq _0812AE78 movs r0, 0x18 bl audio_play - ldr r4, _0812AE84 + ldr r4, =0x0203ab34 ldr r0, [r4] ldrb r0, [r0, 0x18] bl sub_812BEDC @@ -612683,14 +592671,13 @@ _0812AE78: pop {r1} bx r1 .align 2, 0 -_0812AE80: .4byte 0x030022c0 -_0812AE84: .4byte 0x0203ab34 + .pool thumb_func_end sub_812AE4C thumb_func_start sub_812AE88 sub_812AE88: @ 812AE88 push {r4,lr} - ldr r4, _0812AEB8 + ldr r4, =0x0203ab34 ldr r0, [r4] ldrb r0, [r0, 0x18] bl sub_812BF04 @@ -612714,7 +592701,7 @@ _0812AEB4: movs r0, 0x1 b _0812AEBE .align 2, 0 -_0812AEB8: .4byte 0x0203ab34 + .pool _0812AEBC: movs r0, 0 _0812AEBE: @@ -612726,7 +592713,7 @@ _0812AEBE: thumb_func_start sub_812AEC4 sub_812AEC4: @ 812AEC4 push {r4,lr} - ldr r4, _0812AF30 + ldr r4, =0x0203ab34 ldr r2, [r4] ldrb r1, [r2, 0x4] movs r0, 0xC0 @@ -612770,26 +592757,25 @@ _0812AF12: ands r0, r1 cmp r0, 0 beq _0812AF38 - ldr r0, _0812AF34 + ldr r0, =0x00000185 bl fanfare_play movs r0, 0x6 bl sub_812DEE4 b _0812AF62 .align 2, 0 -_0812AF30: .4byte 0x0203ab34 -_0812AF34: .4byte 0x00000185 + .pool _0812AF38: movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _0812AF54 - ldr r0, _0812AF50 + ldr r0, =0x00000185 bl fanfare_play movs r0, 0x5 bl sub_812DEE4 b _0812AF62 .align 2, 0 -_0812AF50: .4byte 0x00000185 + .pool _0812AF54: movs r0, 0xC3 lsls r0, 1 @@ -612797,7 +592783,7 @@ _0812AF54: movs r0, 0x2 bl sub_812DEE4 _0812AF62: - ldr r2, _0812AFC8 + ldr r2, =0x0203ab34 ldr r3, [r2] ldrh r1, [r3, 0x8] movs r0, 0xE0 @@ -612848,7 +592834,7 @@ _0812AFA6: bl sub_812D1A8 b _0812AFEE .align 2, 0 -_0812AFC8: .4byte 0x0203ab34 + .pool _0812AFCC: movs r0, 0x3 bl sub_812DEE4 @@ -612862,7 +592848,7 @@ _0812AFCC: strh r0, [r1, 0x10] lsls r0, 16 asrs r0, 16 - ldr r2, _0812AFF8 + ldr r2, =0x0000270f cmp r0, r2 ble _0812AFEE strh r2, [r1, 0x10] @@ -612872,7 +592858,7 @@ _0812AFEE: pop {r1} bx r1 .align 2, 0 -_0812AFF8: .4byte 0x0000270f + .pool thumb_func_end sub_812AEC4 thumb_func_start sub_812AFFC @@ -612882,7 +592868,7 @@ sub_812AFFC: @ 812AFFC lsls r0, 24 cmp r0, 0 beq _0812B010 - ldr r0, _0812B018 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x10 strb r0, [r1] @@ -612891,7 +592877,7 @@ _0812B010: pop {r1} bx r1 .align 2, 0 -_0812B018: .4byte 0x0203ab34 + .pool thumb_func_end sub_812AFFC thumb_func_start sub_812B01C @@ -612901,7 +592887,7 @@ sub_812B01C: @ 812B01C lsls r0, 24 cmp r0, 0 beq _0812B088 - ldr r4, _0812B090 + ldr r4, =0x0203ab34 ldr r1, [r4] movs r0, 0x13 strb r0, [r1] @@ -612956,7 +592942,7 @@ _0812B088: pop {r1} bx r1 .align 2, 0 -_0812B090: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B01C thumb_func_start sub_812B094 @@ -612966,7 +592952,7 @@ sub_812B094: @ 812B094 lsls r0, 24 cmp r0, 0 bne _0812B0CC - ldr r4, _0812B0D4 + ldr r4, =0x0203ab34 ldr r1, [r4] movs r0, 0x13 strb r0, [r1] @@ -612993,7 +592979,7 @@ _0812B0CC: pop {r1} bx r1 .align 2, 0 -_0812B0D4: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B094 thumb_func_start sub_812B0D8 @@ -613003,7 +592989,7 @@ sub_812B0D8: @ 812B0D8 lsls r0, 24 cmp r0, 0 beq _0812B0FC - ldr r2, _0812B104 + ldr r2, =0x0203ab34 ldr r1, [r2] movs r0, 0x13 strb r0, [r1] @@ -613020,7 +593006,7 @@ _0812B0FC: pop {r1} bx r1 .align 2, 0 -_0812B104: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B0D8 thumb_func_start sub_812B108 @@ -613032,7 +593018,7 @@ sub_812B108: @ 812B108 bl sub_812CEB8 movs r0, 0x2 bl sub_812CEB8 - ldr r0, _0812B12C + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x2 strb r0, [r1] @@ -613040,7 +593026,7 @@ sub_812B108: @ 812B108 pop {r1} bx r1 .align 2, 0 -_0812B12C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B108 thumb_func_start sub_812B130 @@ -613056,7 +593042,7 @@ sub_812B130: @ 812B130 ble _0812B14E movs r0, 0 strh r0, [r1, 0xA] - ldr r0, _0812B154 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x13 strb r0, [r1] @@ -613065,7 +593051,7 @@ _0812B14E: pop {r1} bx r1 .align 2, 0 -_0812B154: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B130 thumb_func_start sub_812B158 @@ -613075,7 +593061,7 @@ sub_812B158: @ 812B158 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, _0812B1A8 + ldr r2, =0x085ef6e9 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -613098,7 +593084,7 @@ sub_812B158: @ 812B158 movs r0, 0x15 movs r1, 0x7 bl sub_80323CC - ldr r0, _0812B1AC + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x16 strb r0, [r1] @@ -613107,8 +593093,7 @@ sub_812B158: @ 812B158 pop {r1} bx r1 .align 2, 0 -_0812B1A8: .4byte 0x085ef6e9 -_0812B1AC: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B158 thumb_func_start sub_812B1B0 @@ -613128,7 +593113,7 @@ sub_812B1B0: @ 812B1B0 bl sub_812CEB8 movs r0, 0x2 bl sub_812CEB8 - ldr r0, _0812B1E8 + ldr r0, =0x0203ab34 ldr r1, [r0] ldrh r0, [r1, 0x12] ldrh r2, [r1, 0xC] @@ -613137,7 +593122,7 @@ sub_812B1B0: @ 812B1B0 movs r0, 0x1B b _0812B206 .align 2, 0 -_0812B1E8: .4byte 0x0203ab34 + .pool _0812B1EC: cmp r1, 0x1 beq _0812B1F8 @@ -613149,7 +593134,7 @@ _0812B1F8: movs r0, 0 movs r1, 0x1 bl sub_8197434 - ldr r0, _0812B210 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x5 _0812B206: @@ -613159,7 +593144,7 @@ _0812B208: pop {r1} bx r1 .align 2, 0 -_0812B210: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B1B0 thumb_func_start sub_812B214 @@ -613169,7 +593154,7 @@ sub_812B214: @ 812B214 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, _0812B24C + ldr r2, =0x085ef6f8 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -613181,7 +593166,7 @@ sub_812B214: @ 812B214 movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _0812B250 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x18 strb r0, [r1] @@ -613190,14 +593175,13 @@ sub_812B214: @ 812B214 pop {r1} bx r1 .align 2, 0 -_0812B24C: .4byte 0x085ef6f8 -_0812B250: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B214 thumb_func_start sub_812B254 sub_812B254: @ 812B254 push {lr} - ldr r0, _0812B278 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -613206,7 +593190,7 @@ sub_812B254: @ 812B254 movs r0, 0 movs r1, 0x1 bl sub_8197434 - ldr r0, _0812B27C + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x5 strb r0, [r1] @@ -613215,8 +593199,7 @@ _0812B272: pop {r1} bx r1 .align 2, 0 -_0812B278: .4byte 0x030022c0 -_0812B27C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B254 thumb_func_start sub_812B280 @@ -613226,7 +593209,7 @@ sub_812B280: @ 812B280 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, _0812B2B8 + ldr r2, =0x085ef710 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -613238,7 +593221,7 @@ sub_812B280: @ 812B280 movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _0812B2BC + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x1A strb r0, [r1] @@ -613247,14 +593230,13 @@ sub_812B280: @ 812B280 pop {r1} bx r1 .align 2, 0 -_0812B2B8: .4byte 0x085ef710 -_0812B2BC: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B280 thumb_func_start sub_812B2C0 sub_812B2C0: @ 812B2C0 push {lr} - ldr r0, _0812B2E4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -613263,7 +593245,7 @@ sub_812B2C0: @ 812B2C0 movs r0, 0 movs r1, 0x1 bl sub_8197434 - ldr r0, _0812B2E8 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x1B strb r0, [r1] @@ -613272,15 +593254,14 @@ _0812B2DE: pop {r1} bx r1 .align 2, 0 -_0812B2E4: .4byte 0x030022c0 -_0812B2E8: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B2C0 thumb_func_start sub_812B2EC sub_812B2EC: @ 812B2EC push {r4,lr} sub sp, 0x4 - ldr r4, _0812B328 + ldr r4, =0x0203ab34 ldr r0, [r4] ldrh r0, [r0, 0xC] bl sub_8145C58 @@ -613305,13 +593286,13 @@ sub_812B2EC: @ 812B2EC pop {r1} bx r1 .align 2, 0 -_0812B328: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B2EC thumb_func_start sub_812B32C sub_812B32C: @ 812B32C push {r4-r6,lr} - ldr r0, _0812B478 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -613321,127 +593302,127 @@ sub_812B32C: @ 812B32C beq _0812B340 b _0812B470 _0812B340: - ldr r6, _0812B47C + ldr r6, =0x0203ab34 ldr r0, [r6] ldr r0, [r0, 0x64] bl set_callback2 - ldr r4, _0812B480 + ldr r4, =0x0203aaf4 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B484 + ldr r4, =0x0203aaf8 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B488 + ldr r4, =0x0203aafc ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B48C + ldr r4, =0x0203ab00 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B490 + ldr r4, =0x0203ab04 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B494 + ldr r4, =0x0203ab08 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B498 + ldr r4, =0x0203ab0c ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B49C + ldr r4, =0x0203ab10 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4A0 + ldr r4, =0x0203ab14 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4A4 + ldr r4, =0x0203ab18 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4A8 + ldr r4, =0x0203ab1c ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4AC + ldr r4, =0x0203ab20 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4B0 + ldr r4, =0x0203ab24 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4B4 + ldr r4, =0x0203ab28 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4B8 + ldr r4, =0x0203aae4 ldr r0, [r4] cmp r0, 0 beq _0812B3E4 bl free str r5, [r4] _0812B3E4: - ldr r4, _0812B4BC + ldr r4, =0x0203aae8 ldr r0, [r4] cmp r0, 0 beq _0812B3F2 bl free str r5, [r4] _0812B3F2: - ldr r4, _0812B4C0 + ldr r4, =0x0203aaec ldr r0, [r4] cmp r0, 0 beq _0812B400 bl free str r5, [r4] _0812B400: - ldr r4, _0812B4C4 + ldr r4, =0x0203aaf0 ldr r0, [r4] cmp r0, 0 beq _0812B40E bl free str r5, [r4] _0812B40E: - ldr r4, _0812B4C8 + ldr r4, =0x0203aac8 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4CC + ldr r4, =0x0203aacc ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4D0 + ldr r4, =0x0203aad0 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4D4 + ldr r4, =0x0203aad4 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4D8 + ldr r4, =0x0203aad8 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4DC + ldr r4, =0x0203aadc ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4E0 + ldr r4, =0x0203aae0 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4E4 + ldr r4, =0x0203ab2c ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0812B4E8 + ldr r4, =0x0203ab30 ldr r0, [r4] bl free str r5, [r4] @@ -613454,41 +593435,13 @@ _0812B470: pop {r1} bx r1 .align 2, 0 -_0812B478: .4byte 0x02037fd4 -_0812B47C: .4byte 0x0203ab34 -_0812B480: .4byte 0x0203aaf4 -_0812B484: .4byte 0x0203aaf8 -_0812B488: .4byte 0x0203aafc -_0812B48C: .4byte 0x0203ab00 -_0812B490: .4byte 0x0203ab04 -_0812B494: .4byte 0x0203ab08 -_0812B498: .4byte 0x0203ab0c -_0812B49C: .4byte 0x0203ab10 -_0812B4A0: .4byte 0x0203ab14 -_0812B4A4: .4byte 0x0203ab18 -_0812B4A8: .4byte 0x0203ab1c -_0812B4AC: .4byte 0x0203ab20 -_0812B4B0: .4byte 0x0203ab24 -_0812B4B4: .4byte 0x0203ab28 -_0812B4B8: .4byte 0x0203aae4 -_0812B4BC: .4byte 0x0203aae8 -_0812B4C0: .4byte 0x0203aaec -_0812B4C4: .4byte 0x0203aaf0 -_0812B4C8: .4byte 0x0203aac8 -_0812B4CC: .4byte 0x0203aacc -_0812B4D0: .4byte 0x0203aad0 -_0812B4D4: .4byte 0x0203aad4 -_0812B4D8: .4byte 0x0203aad8 -_0812B4DC: .4byte 0x0203aadc -_0812B4E0: .4byte 0x0203aae0 -_0812B4E4: .4byte 0x0203ab2c -_0812B4E8: .4byte 0x0203ab30 + .pool thumb_func_end sub_812B32C thumb_func_start sub_812B4EC sub_812B4EC: @ 812B4EC push {r4,lr} - ldr r4, _0812B550 + ldr r4, =0x0203ab34 ldr r1, [r4] ldrb r0, [r1, 0xA] cmp r0, 0 @@ -613508,7 +593461,7 @@ sub_812B4EC: @ 812B4EC cmp r3, 0x3 beq _0812B52C ldr r2, [r4] - ldr r1, _0812B554 + ldr r1, =0x085a77fe lsls r0, r3, 1 adds r0, r1 ldrb r1, [r0] @@ -613523,9 +593476,9 @@ _0812B52C: lsrs r3, r0, 24 cmp r3, 0x5 beq _0812B54A - ldr r0, _0812B550 + ldr r0, =0x0203ab34 ldr r2, [r0] - ldr r1, _0812B558 + ldr r1, =0x085a7804 lsls r0, r3, 1 adds r0, r1 ldrb r1, [r0] @@ -613537,15 +593490,13 @@ _0812B54A: pop {r0} bx r0 .align 2, 0 -_0812B550: .4byte 0x0203ab34 -_0812B554: .4byte 0x085a77fe -_0812B558: .4byte 0x085a7804 + .pool thumb_func_end sub_812B4EC thumb_func_start sub_812B55C sub_812B55C: @ 812B55C push {lr} - ldr r2, _0812B578 + ldr r2, =0x0203ab34 ldr r1, [r2] movs r0, 0 strb r0, [r1, 0x6] @@ -613559,7 +593510,7 @@ _0812B572: pop {r0} bx r0 .align 2, 0 -_0812B578: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B55C thumb_func_start sub_812B57C @@ -613569,7 +593520,7 @@ sub_812B57C: @ 812B57C lsrs r1, r0, 24 movs r2, 0 movs r3, 0x1 - ldr r4, _0812B598 + ldr r4, =0x085a77f6 _0812B588: adds r0, r1, 0 ands r0, r3 @@ -613579,7 +593530,7 @@ _0812B588: ldrb r0, [r0] b _0812B5AA .align 2, 0 -_0812B598: .4byte 0x085a77f6 + .pool _0812B59C: lsrs r1, 1 adds r0, r2, 0x1 @@ -613600,8 +593551,8 @@ sub_812B5B0: @ 812B5B0 bl GenerateRandomNumber lsls r0, 24 lsrs r0, 24 - ldr r4, _0812B5DC - ldr r1, _0812B5E0 + ldr r4, =0x085a76c0 + ldr r1, =0x0203ab34 ldr r1, [r1] movs r3, 0x12 ldrsh r2, [r1, r3] @@ -613617,8 +593568,7 @@ sub_812B5B0: @ 812B5B0 movs r0, 0 b _0812B5E6 .align 2, 0 -_0812B5DC: .4byte 0x085a76c0 -_0812B5E0: .4byte 0x0203ab34 + .pool _0812B5E4: movs r0, 0x1 _0812B5E6: @@ -613631,11 +593581,11 @@ _0812B5E6: sub_812B5EC: @ 812B5EC push {r4-r6,lr} movs r5, 0 - ldr r6, _0812B62C + ldr r6, =0x085a76d2 _0812B5F2: bl GenerateRandomNumber movs r2, 0xFF - ldr r1, _0812B630 + ldr r1, =0x0203ab34 ldr r3, [r1] lsls r1, r5, 16 asrs r4, r1, 16 @@ -613662,8 +593612,7 @@ _0812B620: pop {r1} bx r1 .align 2, 0 -_0812B62C: .4byte 0x085a76d2 -_0812B630: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B5EC thumb_func_start sub_812B634 @@ -613672,7 +593621,7 @@ sub_812B634: @ 812B634 mov r7, r8 push {r7} movs r6, 0 - ldr r0, _0812B678 + ldr r0, =0x085a76e4 mov r8, r0 movs r7, 0x80 lsls r7, 17 @@ -613680,7 +593629,7 @@ _0812B644: bl GenerateRandomNumber movs r5, 0xFF ands r5, r0 - ldr r0, _0812B67C + ldr r0, =0x0203ab34 ldr r4, [r0] lsls r2, r6, 16 asrs r1, r2, 16 @@ -613703,19 +593652,18 @@ _0812B644: adds r3, r0, 0 b _0812B69E .align 2, 0 -_0812B678: .4byte 0x085a76e4 -_0812B67C: .4byte 0x0203ab34 + .pool _0812B680: asrs r0, r2, 16 cmp r0, 0x4 bne _0812B69E - ldr r0, _0812B6C4 + ldr r0, =0x0203ab34 ldr r0, [r0] ldrb r0, [r0, 0x3] cmp r0, 0x1 bne _0812B69E lsls r0, r3, 16 - ldr r1, _0812B6C8 + ldr r1, =0xfff60000 adds r0, r1 lsrs r3, r0, 16 cmp r0, 0 @@ -613742,8 +593690,7 @@ _0812B6B4: pop {r1} bx r1 .align 2, 0 -_0812B6C4: .4byte 0x0203ab34 -_0812B6C8: .4byte 0xfff60000 + .pool thumb_func_end sub_812B634 thumb_func_start sub_812B6CC @@ -613751,18 +593698,17 @@ sub_812B6CC: @ 812B6CC push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _0812B6E0 + ldr r0, =0x0203ab34 ldr r2, [r0] ldrb r0, [r2, 0x3] cmp r0, 0 beq _0812B6E8 - ldr r0, _0812B6E4 + ldr r0, =0x085a7768 b _0812B6EA .align 2, 0 -_0812B6E0: .4byte 0x0203ab34 -_0812B6E4: .4byte 0x085a7768 + .pool _0812B6E8: - ldr r0, _0812B6FC + ldr r0, =0x085a7702 _0812B6EA: lsls r1, r3, 4 adds r1, r3 @@ -613773,13 +593719,13 @@ _0812B6EA: pop {r1} bx r1 .align 2, 0 -_0812B6FC: .4byte 0x085a7702 + .pool thumb_func_end sub_812B6CC thumb_func_start sub_812B700 sub_812B700: @ 812B700 push {r4-r6,lr} - ldr r0, _0812B724 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x5] @@ -613795,7 +593741,7 @@ sub_812B700: @ 812B700 movs r6, 0x5 b _0812B72E .align 2, 0 -_0812B724: .4byte 0x0203ab34 + .pool _0812B728: subs r0, r5, 0x1 lsls r0, 16 @@ -613816,7 +593762,7 @@ _0812B72E: cmp r4, r0 bcs _0812B728 _0812B74E: - ldr r0, _0812B75C + ldr r0, =0x0203ab34 ldr r0, [r0] strb r6, [r0, 0x5] _0812B754: @@ -613824,7 +593770,7 @@ _0812B754: pop {r0} bx r0 .align 2, 0 -_0812B75C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B700 thumb_func_start sub_812B760 @@ -613836,7 +593782,7 @@ sub_812B760: @ 812B760 bl GenerateRandomNumber movs r1, 0xFF ands r1, r0 - ldr r0, _0812B780 + ldr r0, =0x085a77ce lsls r4, 1 adds r4, r0 ldrh r4, [r4] @@ -613845,7 +593791,7 @@ sub_812B760: @ 812B760 movs r0, 0 b _0812B786 .align 2, 0 -_0812B780: .4byte 0x085a77ce + .pool _0812B784: movs r0, 0x1 _0812B786: @@ -613858,18 +593804,17 @@ _0812B786: dp15_jump_random_unknown: @ 812B78C push {r4,r5,lr} movs r4, 0 - ldr r0, _0812B7A4 + ldr r0, =0x0203ab34 ldr r0, [r0] movs r2, 0x10 ldrsh r1, [r0, r2] - ldr r0, _0812B7A8 + ldr r0, =0x0000012b cmp r1, r0 ble _0812B7AC movs r4, 0x4 b _0812B7C2 .align 2, 0 -_0812B7A4: .4byte 0x0203ab34 -_0812B7A8: .4byte 0x0000012b + .pool _0812B7AC: cmp r1, 0xF9 ble _0812B7B4 @@ -613892,7 +593837,7 @@ _0812B7C2: bl __umodsi3 lsls r0, 24 lsrs r1, r0, 24 - ldr r5, _0812B7E4 + ldr r5, =0x085a77d8 lsls r4, 2 adds r0, r4, r5 ldrb r0, [r0] @@ -613901,7 +593846,7 @@ _0812B7C2: movs r0, 0x4 b _0812B822 .align 2, 0 -_0812B7E4: .4byte 0x085a77d8 + .pool _0812B7E8: bl GenerateRandomNumber lsls r0, 16 @@ -613911,8 +593856,8 @@ _0812B7E8: lsls r0, 24 adds r2, r5, 0x2 adds r2, r4, r2 - ldr r3, _0812B818 - ldr r1, _0812B81C + ldr r3, =0x085a77ec + ldr r1, =0x0203ab34 ldr r1, [r1] ldrb r1, [r1, 0xB] lsls r1, 1 @@ -613926,8 +593871,7 @@ _0812B7E8: movs r0, 0x8 b _0812B822 .align 2, 0 -_0812B818: .4byte 0x085a77ec -_0812B81C: .4byte 0x0203ab34 + .pool _0812B820: movs r0, 0x2 _0812B822: @@ -613939,7 +593883,7 @@ _0812B822: thumb_func_start sub_812B828 sub_812B828: @ 812B828 push {r4,lr} - ldr r4, _0812B858 + ldr r4, =0x0203ab34 ldr r1, [r4] movs r0, 0 strh r0, [r1, 0x8] @@ -613962,7 +593906,7 @@ _0812B852: pop {r0} bx r0 .align 2, 0 -_0812B858: .4byte 0x0203ab34 + .pool thumb_func_end sub_812B828 thumb_func_start sub_812B85C @@ -613993,16 +593937,16 @@ sub_812B85C: @ 812B85C lsrs r1, r0, 24 cmp r1, 0x9 beq _0812B8BC - ldr r0, _0812B8C4 + ldr r0, =0x0203ab34 ldr r2, [r0] - ldr r0, _0812B8C8 + ldr r0, =0x085a7828 lsls r1, 1 adds r0, r1, r0 ldrh r0, [r0] ldrh r3, [r2, 0xE] adds r0, r3 strh r0, [r2, 0xE] - ldr r0, _0812B8CC + ldr r0, =0x085a7816 adds r1, r0 ldrh r0, [r2, 0x8] ldrh r1, [r1] @@ -614015,9 +593959,7 @@ _0812B8BC: pop {r0} bx r0 .align 2, 0 -_0812B8C4: .4byte 0x0203ab34 -_0812B8C8: .4byte 0x085a7828 -_0812B8CC: .4byte 0x085a7816 + .pool thumb_func_end sub_812B85C thumb_func_start sub_812B8D0 @@ -614049,16 +593991,16 @@ sub_812B8D0: @ 812B8D0 bne _0812B90C movs r1, 0x1 _0812B90C: - ldr r0, _0812B994 + ldr r0, =0x0203ab34 ldr r2, [r0] - ldr r0, _0812B998 + ldr r0, =0x085a7828 lsls r1, 1 adds r0, r1, r0 ldrh r0, [r0] ldrh r3, [r2, 0xE] adds r0, r3 strh r0, [r2, 0xE] - ldr r0, _0812B99C + ldr r0, =0x085a7816 adds r1, r0 ldrh r0, [r2, 0x8] ldrh r1, [r1] @@ -614093,16 +594035,16 @@ _0812B930: bne _0812B96A movs r1, 0x1 _0812B96A: - ldr r0, _0812B994 + ldr r0, =0x0203ab34 ldr r2, [r0] - ldr r0, _0812B998 + ldr r0, =0x085a7828 lsls r1, 1 adds r0, r1, r0 ldrh r0, [r0] ldrh r3, [r2, 0xE] adds r0, r3 strh r0, [r2, 0xE] - ldr r0, _0812B99C + ldr r0, =0x085a7816 adds r1, r0 ldrh r0, [r2, 0x8] ldrh r1, [r1] @@ -614115,9 +594057,7 @@ _0812B98E: pop {r0} bx r0 .align 2, 0 -_0812B994: .4byte 0x0203ab34 -_0812B998: .4byte 0x085a7828 -_0812B99C: .4byte 0x085a7816 + .pool thumb_func_end sub_812B8D0 thumb_func_start sub_812B9A0 @@ -614147,16 +594087,16 @@ sub_812B9A0: @ 812B9A0 beq _0812B9FE cmp r1, 0 beq _0812B9F8 - ldr r0, _0812BA60 + ldr r0, =0x0203ab34 ldr r2, [r0] - ldr r0, _0812BA64 + ldr r0, =0x085a7828 lsls r1, 1 adds r0, r1, r0 ldrh r0, [r0] ldrh r3, [r2, 0xE] adds r0, r3 strh r0, [r2, 0xE] - ldr r0, _0812BA68 + ldr r0, =0x085a7816 adds r1, r0 ldrh r0, [r2, 0x8] ldrh r1, [r1] @@ -614190,16 +594130,16 @@ _0812B9FE: beq _0812BA5A cmp r1, 0 beq _0812BA54 - ldr r0, _0812BA60 + ldr r0, =0x0203ab34 ldr r2, [r0] - ldr r0, _0812BA64 + ldr r0, =0x085a7828 lsls r1, 1 adds r0, r1, r0 ldrh r0, [r0] ldrh r3, [r2, 0xE] adds r0, r3 strh r0, [r2, 0xE] - ldr r0, _0812BA68 + ldr r0, =0x085a7816 adds r1, r0 ldrh r0, [r2, 0x8] ldrh r1, [r1] @@ -614213,9 +594153,7 @@ _0812BA5A: pop {r0} bx r0 .align 2, 0 -_0812BA60: .4byte 0x0203ab34 -_0812BA64: .4byte 0x085a7828 -_0812BA68: .4byte 0x085a7816 + .pool thumb_func_end sub_812B9A0 thumb_func_start sub_812BA6C @@ -614231,12 +594169,12 @@ sub_812BA6C: @ 812BA6C bne _0812BA90 cmp r3, r2 bne _0812BA90 - ldr r0, _0812BA8C + ldr r0, =0x085a780e adds r0, r3, r0 ldrb r0, [r0] b _0812BAB6 .align 2, 0 -_0812BA8C: .4byte 0x085a780e + .pool _0812BA90: cmp r3, 0 bne _0812BA9C @@ -614269,7 +594207,7 @@ _0812BAB6: thumb_func_start sub_812BABC sub_812BABC: @ 812BABC push {r4,lr} - ldr r4, _0812BAD8 + ldr r4, =sub_812BAFC + 1 adds r0, r4, 0 movs r1, 0x4 bl AddTask @@ -614280,13 +594218,13 @@ sub_812BABC: @ 812BABC pop {r0} bx r0 .align 2, 0 -_0812BAD8: .4byte sub_812BAFC + 1 + .pool thumb_func_end sub_812BABC thumb_func_start sub_812BADC sub_812BADC: @ 812BADC push {lr} - ldr r0, _0812BAF0 + ldr r0, =sub_812BAFC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -614295,7 +594233,7 @@ sub_812BADC: @ 812BADC movs r0, 0 b _0812BAF6 .align 2, 0 -_0812BAF0: .4byte sub_812BAFC + 1 + .pool _0812BAF4: movs r0, 0x1 _0812BAF6: @@ -614308,8 +594246,8 @@ sub_812BAFC: @ 812BAFC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0812BB2C - ldr r2, _0812BB30 + ldr r5, =0x085a74c4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -614329,8 +594267,7 @@ _0812BB0E: pop {r0} bx r0 .align 2, 0 -_0812BB2C: .4byte 0x085a74c4 -_0812BB30: .4byte 0x03005e00 + .pool thumb_func_end sub_812BAFC thumb_func_start sub_812BB34 @@ -614344,7 +594281,7 @@ sub_812BB34: @ 812BB34 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r0, _0812BB5C + ldr r0, =0x0203ab34 ldr r0, [r0] movs r1, 0xE ldrsh r0, [r0, r1] @@ -614355,7 +594292,7 @@ sub_812BB34: @ 812BB34 movs r0, 0x1 b _0812BB62 .align 2, 0 -_0812BB5C: .4byte 0x0203ab34 + .pool _0812BB60: movs r0, 0 _0812BB62: @@ -614384,7 +594321,7 @@ sub_812BB68: @ 812BB68 movs r0, 0x15 bl audio_play _0812BB8E: - ldr r0, _0812BC10 + ldr r0, =0x0203ab34 ldr r2, [r0] ldrh r0, [r2, 0xE] subs r0, 0x1 @@ -614392,7 +594329,7 @@ _0812BB8E: ldrh r3, [r2, 0xC] movs r0, 0xC ldrsh r1, [r2, r0] - ldr r0, _0812BC14 + ldr r0, =0x0000270e cmp r1, r0 bgt _0812BBA8 adds r0, r3, 0x1 @@ -614400,7 +594337,7 @@ _0812BB8E: _0812BBA8: movs r0, 0x8 strh r0, [r4, 0xA] - ldr r0, _0812BC18 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x1 ands r0, r1 @@ -614413,7 +594350,7 @@ _0812BBBC: lsls r0, 24 cmp r0, 0 beq _0812BBF6 - ldr r0, _0812BC18 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x8 ands r0, r1 @@ -614421,7 +594358,7 @@ _0812BBBC: beq _0812BBF6 movs r0, 0x15 bl audio_play - ldr r1, _0812BC10 + ldr r1, =0x0203ab34 ldr r2, [r1] ldrh r0, [r2, 0xE] ldrh r3, [r2, 0xC] @@ -614429,7 +594366,7 @@ _0812BBBC: strh r0, [r2, 0xC] lsls r0, 16 asrs r0, 16 - ldr r3, _0812BC1C + ldr r3, =0x0000270f cmp r0, r3 ble _0812BBF0 strh r3, [r2, 0xC] @@ -614438,7 +594375,7 @@ _0812BBF0: movs r0, 0 strh r0, [r1, 0xE] _0812BBF6: - ldr r0, _0812BC10 + ldr r0, =0x0203ab34 ldr r0, [r0] movs r1, 0xE ldrsh r0, [r0, r1] @@ -614453,10 +594390,7 @@ _0812BC08: pop {r1} bx r1 .align 2, 0 -_0812BC10: .4byte 0x0203ab34 -_0812BC14: .4byte 0x0000270e -_0812BC18: .4byte 0x030022c0 -_0812BC1C: .4byte 0x0000270f + .pool thumb_func_end sub_812BB68 thumb_func_start sub_812BC20 @@ -614466,7 +594400,7 @@ sub_812BC20: @ 812BC20 lsls r0, 24 cmp r0, 0 beq _0812BC3A - ldr r0, _0812BC40 + ldr r0, =sub_812BAFC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -614476,7 +594410,7 @@ _0812BC3A: pop {r1} bx r1 .align 2, 0 -_0812BC40: .4byte sub_812BAFC + 1 + .pool thumb_func_end sub_812BC20 thumb_func_start sub_812BC44 @@ -614485,7 +594419,7 @@ sub_812BC44: @ 812BC44 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r0, _0812BC90 + ldr r0, =0x0203ab34 ldr r0, [r0] lsls r2, r4, 1 adds r0, 0x28 @@ -614506,7 +594440,7 @@ sub_812BC44: @ 812BC44 lsls r0, 16 lsrs r1, r0, 16 _0812BC76: - ldr r2, _0812BC94 + ldr r2, =0x085a766e lsls r1, 16 asrs r1, 16 lsls r0, r4, 2 @@ -614520,8 +594454,7 @@ _0812BC76: pop {r1} bx r1 .align 2, 0 -_0812BC90: .4byte 0x0203ab34 -_0812BC94: .4byte 0x085a766e + .pool thumb_func_end sub_812BC44 thumb_func_start sub_812BC98 @@ -614533,7 +594466,7 @@ sub_812BC98: @ 812BC98 lsls r1, 16 lsrs r5, r1, 16 movs r6, 0 - ldr r0, _0812BCE0 + ldr r0, =0x0203ab34 ldr r0, [r0] lsls r1, r4, 1 adds r0, 0x1C @@ -614545,7 +594478,7 @@ sub_812BC98: @ 812BC98 lsls r0, 16 cmp r0, 0 beq _0812BCC2 - ldr r6, _0812BCE4 + ldr r6, =0x0000ffff _0812BCC2: lsls r1, r5, 16 asrs r1, 16 @@ -614562,14 +594495,13 @@ _0812BCC2: pop {r1} bx r1 .align 2, 0 -_0812BCE0: .4byte 0x0203ab34 -_0812BCE4: .4byte 0x0000ffff + .pool thumb_func_end sub_812BC98 thumb_func_start sub_812BCE8 sub_812BCE8: @ 812BCE8 push {lr} - ldr r1, _0812BD20 + ldr r1, =0x0203ab34 ldr r1, [r1] movs r2, 0x16 ldrsh r1, [r1, r2] @@ -614588,7 +594520,7 @@ sub_812BCE8: @ 812BCE8 lsls r0, 16 lsrs r1, r0, 16 _0812BD10: - ldr r0, _0812BD24 + ldr r0, =0x085a76ad lsls r1, 16 asrs r1, 16 adds r1, r0 @@ -614596,8 +594528,7 @@ _0812BD10: pop {r1} bx r1 .align 2, 0 -_0812BD20: .4byte 0x0203ab34 -_0812BD24: .4byte 0x085a76ad + .pool thumb_func_end sub_812BCE8 thumb_func_start sub_812BD28 @@ -614605,7 +594536,7 @@ sub_812BD28: @ 812BD28 push {r4-r6,lr} adds r5, r0, 0 lsls r5, 24 - ldr r0, _0812BD6C + ldr r0, =0x0203ab34 ldr r6, [r0] lsrs r5, 23 adds r4, r6, 0 @@ -614635,7 +594566,7 @@ sub_812BD28: @ 812BD28 pop {r0} bx r0 .align 2, 0 -_0812BD6C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812BD28 thumb_func_start sub_812BD70 @@ -614646,7 +594577,7 @@ sub_812BD70: @ 812BD70 adds r5, r0, 0 lsls r1, 16 lsrs r4, r1, 16 - ldr r7, _0812BDD0 + ldr r7, =0x0203ab34 ldr r0, [r7] lsls r6, r5, 1 adds r0, 0x1C @@ -614687,13 +594618,13 @@ _0812BDC4: pop {r1} bx r1 .align 2, 0 -_0812BDD0: .4byte 0x0203ab34 + .pool thumb_func_end sub_812BD70 thumb_func_start sub_812BDD4 sub_812BDD4: @ 812BDD4 push {r4,lr} - ldr r1, _0812BE08 + ldr r1, =0x0203ab34 ldr r4, [r1] lsls r0, 16 asrs r0, 16 @@ -614716,7 +594647,7 @@ sub_812BDD4: @ 812BDD4 pop {r0} bx r0 .align 2, 0 -_0812BE08: .4byte 0x0203ab34 + .pool thumb_func_end sub_812BDD4 thumb_func_start sub_812BE0C @@ -614724,7 +594655,7 @@ sub_812BE0C: @ 812BE0C push {r4,r5,lr} lsls r0, 16 lsrs r4, r0, 16 - ldr r5, _0812BE58 + ldr r5, =0x0203ab34 ldr r0, [r5] movs r1, 0x14 ldrsh r0, [r0, r1] @@ -614759,15 +594690,15 @@ _0812BE4E: pop {r1} bx r1 .align 2, 0 -_0812BE58: .4byte 0x0203ab34 + .pool thumb_func_end sub_812BE0C thumb_func_start sub_812BE5C sub_812BE5C: @ 812BE5C push {r4-r6,lr} movs r4, 0 - ldr r5, _0812BE98 - ldr r6, _0812BE9C + ldr r5, =sub_812BF2C + 1 + ldr r6, =0x03005e00 _0812BE64: adds r0, r5, 0 movs r1, 0x2 @@ -614779,7 +594710,7 @@ _0812BE64: lsls r1, 3 adds r1, r6 strh r4, [r1, 0x26] - ldr r1, _0812BEA0 + ldr r1, =0x0203ab34 ldr r1, [r1] adds r1, 0x3A adds r1, r4 @@ -614794,9 +594725,7 @@ _0812BE64: pop {r0} bx r0 .align 2, 0 -_0812BE98: .4byte sub_812BF2C + 1 -_0812BE9C: .4byte 0x03005e00 -_0812BEA0: .4byte 0x0203ab34 + .pool thumb_func_end sub_812BE5C thumb_func_start sub_812BEA4 @@ -614804,8 +594733,8 @@ sub_812BEA4: @ 812BEA4 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _0812BED4 - ldr r1, _0812BED8 + ldr r4, =0x03005e00 + ldr r1, =0x0203ab34 ldr r2, [r1] adds r2, 0x3A adds r2, r0 @@ -614826,16 +594755,15 @@ sub_812BEA4: @ 812BEA4 pop {r0} bx r0 .align 2, 0 -_0812BED4: .4byte 0x03005e00 -_0812BED8: .4byte 0x0203ab34 + .pool thumb_func_end sub_812BEA4 thumb_func_start sub_812BEDC sub_812BEDC: @ 812BEDC lsls r0, 24 lsrs r0, 24 - ldr r2, _0812BEFC - ldr r1, _0812BF00 + ldr r2, =0x03005e00 + ldr r1, =0x0203ab34 ldr r1, [r1] adds r1, 0x3A adds r1, r0 @@ -614848,16 +594776,15 @@ sub_812BEDC: @ 812BEDC strh r1, [r0, 0x8] bx lr .align 2, 0 -_0812BEFC: .4byte 0x03005e00 -_0812BF00: .4byte 0x0203ab34 + .pool thumb_func_end sub_812BEDC thumb_func_start sub_812BF04 sub_812BF04: @ 812BF04 lsls r0, 24 lsrs r0, 24 - ldr r2, _0812BF24 - ldr r1, _0812BF28 + ldr r2, =0x03005e00 + ldr r1, =0x0203ab34 ldr r1, [r1] adds r1, 0x3A adds r1, r0 @@ -614871,8 +594798,7 @@ sub_812BF04: @ 812BF04 lsrs r0, 24 bx lr .align 2, 0 -_0812BF24: .4byte 0x03005e00 -_0812BF28: .4byte 0x0203ab34 + .pool thumb_func_end sub_812BF04 thumb_func_start sub_812BF2C @@ -614880,8 +594806,8 @@ sub_812BF2C: @ 812BF2C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0812BF5C - ldr r2, _0812BF60 + ldr r5, =0x085a74d0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -614901,8 +594827,7 @@ _0812BF3E: pop {r0} bx r0 .align 2, 0 -_0812BF5C: .4byte 0x085a74d0 -_0812BF60: .4byte 0x03005e00 + .pool thumb_func_end sub_812BF2C thumb_func_start sub_812BF64 @@ -614917,7 +594842,7 @@ sub_812BF68: @ 812BF68 ldrh r0, [r0, 0x26] lsls r0, 24 lsrs r0, 24 - ldr r1, _0812BF84 + ldr r1, =0x0203ab34 ldr r1, [r1] movs r2, 0x1A ldrsh r1, [r1, r2] @@ -614926,7 +594851,7 @@ sub_812BF68: @ 812BF68 pop {r1} bx r1 .align 2, 0 -_0812BF84: .4byte 0x0203ab34 + .pool thumb_func_end sub_812BF68 thumb_func_start sub_812BF88 @@ -614937,7 +594862,7 @@ sub_812BF88: @ 812BF88 adds r0, 0x1 movs r2, 0 strh r0, [r4, 0x8] - ldr r0, _0812C010 + ldr r0, =0x0203ab34 ldr r3, [r0] movs r0, 0x26 ldrsh r1, [r4, r0] @@ -614962,7 +594887,7 @@ sub_812BF88: @ 812BF88 ldrb r0, [r3, 0x6] cmp r0, 0 beq _0812BFDC - ldr r1, _0812C014 + ldr r1, =0x085a74e4 movs r2, 0x26 ldrsh r0, [r4, r2] lsls r0, 2 @@ -614973,11 +594898,11 @@ sub_812BF88: @ 812BF88 cmp r0, 0 bne _0812BFF4 _0812BFDC: - ldr r0, _0812C010 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x6] - ldr r1, _0812C018 + ldr r1, =0x085a74f0 movs r2, 0x26 ldrsh r0, [r4, r2] lsls r0, 2 @@ -614985,7 +594910,7 @@ _0812BFDC: ldr r0, [r0] bl _call_via_r0 _0812BFF4: - ldr r0, _0812C010 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r2, 0x26 ldrsh r0, [r4, r2] @@ -614999,9 +594924,7 @@ _0812BFF4: pop {r1} bx r1 .align 2, 0 -_0812C010: .4byte 0x0203ab34 -_0812C014: .4byte 0x085a74e4 -_0812C018: .4byte 0x085a74f0 + .pool thumb_func_end sub_812BF88 thumb_func_start sub_812C01C @@ -615009,11 +594932,11 @@ sub_812C01C: @ 812C01C push {r4-r7,lr} sub sp, 0xC adds r4, r0, 0 - ldr r1, _0812C060 + ldr r1, =0x085a74fc mov r0, sp movs r2, 0xA bl memcpy - ldr r7, _0812C064 + ldr r7, =0x0203ab34 ldr r5, [r7] movs r1, 0x26 ldrsh r0, [r4, r1] @@ -615037,8 +594960,7 @@ sub_812C01C: @ 812C01C bl sub_812BD70 b _0812C0A0 .align 2, 0 -_0812C060: .4byte 0x085a74fc -_0812C064: .4byte 0x0203ab34 + .pool _0812C068: adds r0, r5, 0 adds r0, 0x2E @@ -615072,7 +594994,7 @@ _0812C0A0: _0812C0A4: cmp r2, 0 bne _0812C0D2 - ldr r0, _0812C0DC + ldr r0, =0x0203ab34 ldr r1, [r0] movs r6, 0x26 ldrsh r0, [r4, r6] @@ -615100,14 +595022,14 @@ _0812C0D2: pop {r1} bx r1 .align 2, 0 -_0812C0DC: .4byte 0x0203ab34 + .pool thumb_func_end sub_812C01C thumb_func_start sub_812C0E0 sub_812C0E0: @ 812C0E0 push {r4,lr} adds r2, r0, 0 - ldr r4, _0812C134 + ldr r4, =0x0203ab34 ldr r1, [r4] movs r3, 0x26 ldrsh r0, [r2, r3] @@ -615149,13 +595071,13 @@ _0812C12A: pop {r1} bx r1 .align 2, 0 -_0812C134: .4byte 0x0203ab34 + .pool thumb_func_end sub_812C0E0 thumb_func_start sub_812C138 sub_812C138: @ 812C138 push {r4,r5,lr} - ldr r4, _0812C17C + ldr r4, =0x0203ab34 ldr r0, [r4] ldrb r0, [r0, 0x4] bl sub_812B57C @@ -615171,7 +595093,7 @@ sub_812C138: @ 812C138 movs r5, 0 movs r3, 0x1 _0812C15A: - ldr r1, _0812C180 + ldr r1, =0x085a7508 movs r2, 0x12 ldrsh r0, [r4, r2] subs r0, 0x1 @@ -615187,8 +595109,7 @@ _0812C15A: pop {r1} bx r1 .align 2, 0 -_0812C17C: .4byte 0x0203ab34 -_0812C180: .4byte 0x085a7508 + .pool thumb_func_end sub_812C138 thumb_func_start sub_812C184 @@ -615213,13 +595134,13 @@ sub_812C184: @ 812C184 cmp r0, r5 bne _0812C1BC _0812C1AC: - ldr r0, _0812C1B8 + ldr r0, =0x0203ab34 ldr r0, [r0] strb r1, [r0, 0x7] movs r0, 0x1 b _0812C1BE .align 2, 0 -_0812C1B8: .4byte 0x0203ab34 + .pool _0812C1BC: movs r0, 0 _0812C1BE: @@ -615277,7 +595198,7 @@ _0812C212: thumb_func_start sub_812C218 sub_812C218: @ 812C218 push {lr} - ldr r0, _0812C22C + ldr r0, =0x0203ab34 ldr r0, [r0] ldrb r1, [r0, 0x4] movs r0, 0xC2 @@ -615287,7 +595208,7 @@ sub_812C218: @ 812C218 movs r0, 0 b _0812C232 .align 2, 0 -_0812C22C: .4byte 0x0203ab34 + .pool _0812C230: movs r0, 0x1 _0812C232: @@ -615320,7 +595241,7 @@ _0812C24C: lsls r0, 24 cmp r0, 0 beq _0812C278 - ldr r0, _0812C274 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x2 strh r0, [r1, 0x34] @@ -615328,7 +595249,7 @@ _0812C24C: movs r0, 0x1 b _0812C286 .align 2, 0 -_0812C274: .4byte 0x0203ab34 + .pool _0812C278: adds r0, r4, 0x1 lsls r0, 16 @@ -615381,14 +595302,14 @@ _0812C2C2: lsls r0, 24 cmp r0, 0 beq _0812C2E8 - ldr r0, _0812C2E4 + ldr r0, =0x0203ab34 ldr r0, [r0] strh r7, [r0, 0x34] strh r6, [r0, 0x2E] movs r0, 0x1 b _0812C390 .align 2, 0 -_0812C2E4: .4byte 0x0203ab34 + .pool _0812C2E8: adds r0, r4, 0x1 lsls r0, 16 @@ -615399,7 +595320,7 @@ _0812C2E8: _0812C2F4: movs r7, 0x1 adds r6, r5, 0 - ldr r0, _0812C348 + ldr r0, =0x0203ab34 mov r10, r0 _0812C2FC: lsls r5, r7, 16 @@ -615440,7 +595361,7 @@ _0812C33A: movs r0, 0x1 b _0812C390 .align 2, 0 -_0812C348: .4byte 0x0203ab34 + .pool _0812C34C: asrs r0, r5, 16 cmp r0, 0x3 @@ -615491,8 +595412,8 @@ _0812C390: thumb_func_start sub_812C3A0 sub_812C3A0: @ 812C3A0 push {lr} - ldr r1, _0812C3C0 - ldr r0, _0812C3C4 + ldr r1, =0x085a7514 + ldr r0, =0x0203ab34 ldr r0, [r0] movs r2, 0x12 ldrsh r0, [r0, r2] @@ -615506,14 +595427,13 @@ sub_812C3A0: @ 812C3A0 pop {r1} bx r1 .align 2, 0 -_0812C3C0: .4byte 0x085a7514 -_0812C3C4: .4byte 0x0203ab34 + .pool thumb_func_end sub_812C3A0 thumb_func_start sub_812C3C8 sub_812C3C8: @ 812C3C8 push {r4-r7,lr} - ldr r0, _0812C3FC + ldr r0, =0x0203ab34 ldr r0, [r0] movs r5, 0 ldrh r7, [r0, 0x34] @@ -615527,7 +595447,7 @@ _0812C3D6: asrs r1, 16 movs r0, 0x1 bl sub_812BC98 - ldr r1, _0812C3FC + ldr r1, =0x0203ab34 ldr r1, [r1] lsls r0, 24 lsrs r0, 24 @@ -615539,7 +595459,7 @@ _0812C3D6: movs r0, 0x1 b _0812C40E .align 2, 0 -_0812C3FC: .4byte 0x0203ab34 + .pool _0812C400: adds r0, r4, 0x1 lsls r0, 16 @@ -615561,7 +595481,7 @@ sub_812C414: @ 812C414 lsls r0, 24 cmp r0, 0 beq _0812C476 - ldr r0, _0812C468 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r2, 0x34 ldrsh r0, [r1, r2] @@ -615583,7 +595503,7 @@ _0812C43C: asrs r1, 16 movs r0, 0x1 bl sub_812BC98 - ldr r1, _0812C468 + ldr r1, =0x0203ab34 ldr r1, [r1] lsls r0, 24 lsrs r0, 24 @@ -615598,7 +595518,7 @@ _0812C43C: ble _0812C43C b _0812C472 .align 2, 0 -_0812C468: .4byte 0x0203ab34 + .pool _0812C46C: movs r0, 0x2 strh r0, [r1, 0x36] @@ -615607,7 +595527,7 @@ _0812C472: movs r0, 0x1 b _0812C4B2 _0812C476: - ldr r0, _0812C4B8 + ldr r0, =0x0203ab34 ldr r0, [r0] movs r1, 0x34 ldrsh r0, [r0, r1] @@ -615623,7 +595543,7 @@ _0812C486: asrs r1, 16 movs r0, 0x1 bl sub_812BC98 - ldr r1, _0812C4B8 + ldr r1, =0x0203ab34 ldr r1, [r1] lsls r0, 24 lsrs r0, 24 @@ -615643,13 +595563,13 @@ _0812C4B2: pop {r1} bx r1 .align 2, 0 -_0812C4B8: .4byte 0x0203ab34 + .pool thumb_func_end sub_812C414 thumb_func_start sub_812C4BC sub_812C4BC: @ 812C4BC push {r4,lr} - ldr r2, _0812C4F8 + ldr r2, =0x0203ab34 ldr r0, [r2] ldrb r3, [r0, 0x7] adds r4, r3, 0 @@ -615663,7 +595583,7 @@ sub_812C4BC: @ 812C4BC bne _0812C4D8 movs r3, 0x1 _0812C4D8: - ldr r1, _0812C4FC + ldr r1, =0x085a7520 ldr r0, [r2] movs r2, 0x12 ldrsh r0, [r0, r2] @@ -615679,8 +595599,7 @@ _0812C4D8: pop {r1} bx r1 .align 2, 0 -_0812C4F8: .4byte 0x0203ab34 -_0812C4FC: .4byte 0x085a7520 + .pool thumb_func_end sub_812C4BC thumb_func_start sub_812C500 @@ -615690,7 +595609,7 @@ sub_812C500: @ 812C500 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0812C540 + ldr r0, =0x0203ab34 ldr r0, [r0] movs r5, 0 ldrh r1, [r0, 0x36] @@ -615709,7 +595628,7 @@ _0812C518: lsrs r0, 24 cmp r0, r7 bne _0812C544 - ldr r0, _0812C540 + ldr r0, =0x0203ab34 ldr r0, [r0] mov r1, r8 strh r1, [r0, 0x38] @@ -615717,7 +595636,7 @@ _0812C518: movs r0, 0x1 b _0812C552 .align 2, 0 -_0812C540: .4byte 0x0203ab34 + .pool _0812C544: adds r0, r4, 0x1 lsls r0, 16 @@ -615741,7 +595660,7 @@ sub_812C55C: @ 812C55C push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0812C584 + ldr r0, =0x0203ab34 ldr r0, [r0] movs r2, 0x34 ldrsh r1, [r0, r2] @@ -615755,9 +595674,9 @@ sub_812C55C: @ 812C55C lsrs r0, 24 b _0812C5D2 .align 2, 0 -_0812C584: .4byte 0x0203ab34 + .pool _0812C588: - ldr r0, _0812C598 + ldr r0, =0x0203ab34 ldr r0, [r0] strh r5, [r0, 0x32] mov r1, r8 @@ -615765,7 +595684,7 @@ _0812C588: movs r0, 0x1 b _0812C5D2 .align 2, 0 -_0812C598: .4byte 0x0203ab34 + .pool _0812C59C: movs r2, 0x1 mov r8, r2 @@ -615820,14 +595739,14 @@ _0812C5E8: lsls r0, 24 cmp r0, 0 bne _0812C5E2 - ldr r0, _0812C604 + ldr r0, =0x0203ab34 ldr r0, [r0] strh r5, [r0, 0x2E] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0812C604: .4byte 0x0203ab34 + .pool thumb_func_end sub_812C5DC thumb_func_start sub_812C608 @@ -615857,8 +595776,8 @@ _0812C624: thumb_func_start sub_812C628 sub_812C628: @ 812C628 push {lr} - ldr r1, _0812C644 - ldr r0, _0812C648 + ldr r1, =0x085a752c + ldr r0, =0x0203ab34 ldr r0, [r0] movs r2, 0x12 ldrsh r0, [r0, r2] @@ -615870,15 +595789,14 @@ sub_812C628: @ 812C628 pop {r0} bx r0 .align 2, 0 -_0812C644: .4byte 0x085a752c -_0812C648: .4byte 0x0203ab34 + .pool thumb_func_end sub_812C628 thumb_func_start sub_812C64C sub_812C64C: @ 812C64C push {r4-r7,lr} sub sp, 0x4 - ldr r0, _0812C6B4 + ldr r0, =0x0203ab34 ldr r2, [r0] movs r1, 0x34 ldrsh r0, [r2, r1] @@ -615919,14 +595837,14 @@ _0812C68C: lsrs r0, 24 cmp r1, r0 bne _0812C6B8 - ldr r0, _0812C6B4 + ldr r0, =0x0203ab34 ldr r1, [r0] movs r0, 0x2 strh r0, [r1, 0x36] strh r5, [r1, 0x30] b _0812C6C4 .align 2, 0 -_0812C6B4: .4byte 0x0203ab34 + .pool _0812C6B8: adds r0, r4, 0x1 lsls r0, 16 @@ -615945,7 +595863,7 @@ _0812C6C4: j5_08111E84: @ 812C6CC push {r4-r7,lr} sub sp, 0x4 - ldr r4, _0812C734 + ldr r4, =0x0203ab34 ldr r2, [r4] ldrh r3, [r2, 0x34] movs r1, 0x34 @@ -615994,7 +595912,7 @@ _0812C70C: strh r5, [r0, 0x30] b _0812C744 .align 2, 0 -_0812C734: .4byte 0x0203ab34 + .pool _0812C738: adds r0, r4, 0x1 lsls r0, 16 @@ -616013,7 +595931,7 @@ _0812C744: sub_812C74C: @ 812C74C push {r4-r7,lr} sub sp, 0x4 - ldr r6, _0812C774 + ldr r6, =0x0203ab34 ldr r2, [r6] ldrh r4, [r2, 0x34] movs r0, 0x34 @@ -616030,16 +595948,16 @@ sub_812C74C: @ 812C74C bl j5_08111E84 b _0812C84A .align 2, 0 -_0812C774: .4byte 0x0203ab34 + .pool _0812C778: - ldr r0, _0812C784 + ldr r0, =0x0203ab34 ldr r0, [r0] movs r1, 0 strh r5, [r0, 0x36] strh r1, [r0, 0x30] b _0812C84A .align 2, 0 -_0812C784: .4byte 0x0203ab34 + .pool _0812C788: movs r0, 0x2 strh r0, [r1, 0x36] @@ -616097,7 +596015,7 @@ _0812C7C6: ble _0812C7C6 movs r5, 0x1 mov r7, sp - ldr r6, _0812C82C + ldr r6, =0x0203ab34 _0812C7F8: ldr r0, [r6] ldrh r1, [r0, 0x34] @@ -616125,7 +596043,7 @@ _0812C824: strh r5, [r1, 0x30] b _0812C84A .align 2, 0 -_0812C82C: .4byte 0x0203ab34 + .pool _0812C830: cmp r4, 0x2 ble _0812C792 @@ -616261,8 +596179,8 @@ _0812C8F8: thumb_func_start sub_812C8FC sub_812C8FC: @ 812C8FC push {lr} - ldr r1, _0812C918 - ldr r0, _0812C91C + ldr r1, =0x085a7538 + ldr r0, =0x0203ab34 ldr r0, [r0] movs r2, 0x12 ldrsh r0, [r0, r2] @@ -616274,15 +596192,14 @@ sub_812C8FC: @ 812C8FC pop {r0} bx r0 .align 2, 0 -_0812C918: .4byte 0x085a7538 -_0812C91C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812C8FC thumb_func_start sub_812C920 sub_812C920: @ 812C920 push {r4-r7,lr} movs r6, 0 - ldr r7, _0812C95C + ldr r7, =0x0203ab34 ldr r0, [r7] ldrh r1, [r0, 0x2E] movs r4, 0x2 @@ -616308,7 +596225,7 @@ sub_812C920: @ 812C920 movs r4, 0x2 b _0812C96A .align 2, 0 -_0812C95C: .4byte 0x0203ab34 + .pool _0812C960: lsls r0, r6, 16 movs r1, 0x80 @@ -616389,14 +596306,14 @@ _0812C9DE: cmp r5, r0 beq _0812C9D8 _0812C9F6: - ldr r0, _0812CA04 + ldr r0, =0x0203ab34 ldr r0, [r0] strh r6, [r0, 0x32] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0812CA04: .4byte 0x0203ab34 + .pool thumb_func_end sub_812C920 thumb_func_start sub_812CA08 @@ -616409,7 +596326,7 @@ sub_812CA08: @ 812CA08 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r4, _0812CA74 + ldr r4, =0x0203ab34 ldr r2, [r4] movs r5, 0x36 ldrsh r1, [r2, r5] @@ -616452,7 +596369,7 @@ sub_812CA08: @ 812CA08 movs r5, 0 b _0812CA7E .align 2, 0 -_0812CA74: .4byte 0x0203ab34 + .pool _0812CA78: adds r0, r5, 0x1 lsls r0, 16 @@ -616462,7 +596379,7 @@ _0812CA7E: asrs r5, r6, 16 cmp r5, 0x4 bgt _0812CAA4 - ldr r0, _0812CB38 + ldr r0, =0x0203ab34 ldr r0, [r0] ldrh r1, [r0, 0x36] subs r1, r5 @@ -616477,7 +596394,7 @@ _0812CA7E: lsrs r6, 16 str r6, [sp] _0812CAA4: - ldr r0, _0812CB38 + ldr r0, =0x0203ab34 mov r9, r0 _0812CAA8: movs r5, 0x1 @@ -616550,7 +596467,7 @@ _0812CB28: mov r8, r0 b _0812CB4A .align 2, 0 -_0812CB38: .4byte 0x0203ab34 + .pool _0812CB3C: movs r2, 0x80 lsls r2, 9 @@ -616572,7 +596489,7 @@ _0812CB4A: str r0, [sp] b _0812CAA8 _0812CB60: - ldr r0, _0812CB7C + ldr r0, =0x0203ab34 ldr r0, [r0] mov r5, sp ldrh r5, [r5] @@ -616586,7 +596503,7 @@ _0812CB60: pop {r0} bx r0 .align 2, 0 -_0812CB7C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812CA08 thumb_func_start sub_812CB80 @@ -616595,7 +596512,7 @@ sub_812CB80: @ 812CB80 mov r7, r8 push {r7} bl sub_812CA08 - ldr r4, _0812CC24 + ldr r4, =0x0203ab34 ldr r2, [r4] movs r0, 0x36 ldrsh r1, [r2, r0] @@ -616670,7 +596587,7 @@ _0812CBF6: strh r0, [r1, 0x32] b _0812CC34 .align 2, 0 -_0812CC24: .4byte 0x0203ab34 + .pool _0812CC28: adds r0, r5, 0x1 lsls r0, 16 @@ -616679,7 +596596,7 @@ _0812CC28: cmp r0, 0x4 ble _0812CBF6 _0812CC34: - ldr r7, _0812CCB0 + ldr r7, =0x0203ab34 _0812CC36: ldr r0, [r7] ldrh r0, [r0, 0x2E] @@ -616738,9 +596655,9 @@ _0812CCA4: strh r0, [r1, 0x32] b _0812CC36 .align 2, 0 -_0812CCB0: .4byte 0x0203ab34 + .pool _0812CCB4: - ldr r7, _0812CD30 + ldr r7, =0x0203ab34 _0812CCB6: ldr r0, [r7] ldrh r0, [r0, 0x2E] @@ -616799,7 +596716,7 @@ _0812CD24: strh r0, [r1, 0x32] b _0812CCB6 .align 2, 0 -_0812CD30: .4byte 0x0203ab34 + .pool _0812CD34: pop {r3} mov r8, r3 @@ -616814,13 +596731,13 @@ sub_812CD40: @ 812CD40 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _0812CD6C + ldr r5, =sub_812CD74 + 1 adds r0, r5, 0 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0812CD70 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -616831,8 +596748,7 @@ sub_812CD40: @ 812CD40 pop {r0} bx r0 .align 2, 0 -_0812CD6C: .4byte sub_812CD74 + 1 -_0812CD70: .4byte 0x03005e00 + .pool thumb_func_end sub_812CD40 thumb_func_start sub_812CD74 @@ -616841,8 +596757,8 @@ sub_812CD74: @ 812CD74 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _0812CD9C - ldr r2, _0812CDA0 + ldr r3, =0x085a7544 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -616857,8 +596773,7 @@ sub_812CD74: @ 812CD74 pop {r0} bx r0 .align 2, 0 -_0812CD9C: .4byte 0x085a7544 -_0812CDA0: .4byte 0x03005e00 + .pool thumb_func_end sub_812CD74 thumb_func_start sub_812CDA4 @@ -616866,7 +596781,7 @@ sub_812CDA4: @ 812CDA4 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r1, _0812CDD4 + ldr r1, =0x085a7550 movs r2, 0x26 ldrsh r0, [r4, r2] lsls r0, 1 @@ -616887,7 +596802,7 @@ sub_812CDA4: @ 812CDA4 pop {r0} bx r0 .align 2, 0 -_0812CDD4: .4byte 0x085a7550 + .pool thumb_func_end sub_812CDA4 thumb_func_start sub_812CDD8 @@ -616915,7 +596830,7 @@ sub_812CDF4: @ 812CDF4 sub sp, 0x4 lsls r4, r1, 24 lsrs r4, 24 - ldr r1, _0812CE28 + ldr r1, =0x085a7550 movs r2, 0x26 ldrsh r0, [r0, r2] lsls r0, 1 @@ -616935,7 +596850,7 @@ sub_812CDF4: @ 812CDF4 pop {r0} bx r0 .align 2, 0 -_0812CE28: .4byte 0x085a7550 + .pool thumb_func_end sub_812CDF4 thumb_func_start sub_812CE2C @@ -616943,11 +596858,11 @@ sub_812CE2C: @ 812CE2C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0812CE4C + ldr r2, =0x085a8408 lsls r1, r0, 2 adds r1, r2 ldr r2, [r1] - ldr r1, _0812CE50 + ldr r1, =0x085a8430 adds r0, r1 ldrb r1, [r0] adds r0, r2, 0 @@ -616956,8 +596871,7 @@ sub_812CE2C: @ 812CE2C pop {r0} bx r0 .align 2, 0 -_0812CE4C: .4byte 0x085a8408 -_0812CE50: .4byte 0x085a8430 + .pool thumb_func_end sub_812CE2C thumb_func_start sub_812CE54 @@ -616965,11 +596879,11 @@ sub_812CE54: @ 812CE54 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0812CE74 + ldr r2, =0x085a841c lsls r1, r0, 2 adds r1, r2 ldr r2, [r1] - ldr r1, _0812CE78 + ldr r1, =0x085a8430 adds r0, r1 ldrb r1, [r0] adds r0, r2, 0 @@ -616978,8 +596892,7 @@ sub_812CE54: @ 812CE54 pop {r0} bx r0 .align 2, 0 -_0812CE74: .4byte 0x085a841c -_0812CE78: .4byte 0x085a8430 + .pool thumb_func_end sub_812CE54 thumb_func_start sub_812CE7C @@ -616988,12 +596901,12 @@ sub_812CE7C: @ 812CE7C lsls r0, 24 lsrs r1, r0, 24 movs r4, 0 - ldr r0, _0812CEB0 + ldr r0, =0x085a843b adds r0, r1, r0 ldrb r0, [r0] cmp r4, r0 bcs _0812CEA8 - ldr r7, _0812CEB4 + ldr r7, =0x085a8435 adds r6, r0, 0 lsls r5, r1, 1 _0812CE94: @@ -617011,8 +596924,7 @@ _0812CEA8: pop {r0} bx r0 .align 2, 0 -_0812CEB0: .4byte 0x085a843b -_0812CEB4: .4byte 0x085a8435 + .pool thumb_func_end sub_812CE7C thumb_func_start sub_812CEB8 @@ -617021,12 +596933,12 @@ sub_812CEB8: @ 812CEB8 lsls r0, 24 lsrs r1, r0, 24 movs r4, 0 - ldr r0, _0812CEEC + ldr r0, =0x085a843b adds r0, r1, r0 ldrb r0, [r0] cmp r4, r0 bcs _0812CEE4 - ldr r7, _0812CEF0 + ldr r7, =0x085a8435 adds r6, r0, 0 lsls r5, r1, 1 _0812CED0: @@ -617044,17 +596956,16 @@ _0812CEE4: pop {r0} bx r0 .align 2, 0 -_0812CEEC: .4byte 0x085a843b -_0812CEF0: .4byte 0x085a8435 + .pool thumb_func_end sub_812CEB8 thumb_func_start sub_812CEF4 sub_812CEF4: @ 812CEF4 push {r4,r5,lr} movs r4, 0 - ldr r5, _0812CF28 + ldr r5, =0x02020630 _0812CEFA: - ldr r0, _0812CF2C + ldr r0, =sub_812D024 + 1 bl obj_add_empty_with_callback lsls r0, 24 lsrs r0, 24 @@ -617063,7 +596974,7 @@ _0812CEFA: lsls r1, 2 adds r1, r5 strh r4, [r1, 0x2E] - ldr r1, _0812CF30 + ldr r1, =0x0203ab34 ldr r1, [r1] adds r1, 0x44 adds r1, r4 @@ -617077,16 +596988,14 @@ _0812CEFA: pop {r0} bx r0 .align 2, 0 -_0812CF28: .4byte 0x02020630 -_0812CF2C: .4byte sub_812D024 + 1 -_0812CF30: .4byte 0x0203ab34 + .pool thumb_func_end sub_812CEF4 thumb_func_start sub_812CF34 sub_812CF34: @ 812CF34 lsls r0, 24 lsrs r0, 24 - ldr r1, _0812CF64 + ldr r1, =0x0203ab34 ldr r1, [r1] adds r1, 0x44 adds r1, r0 @@ -617094,7 +597003,7 @@ sub_812CF34: @ 812CF34 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812CF68 + ldr r1, =0x02020630 adds r0, r1 movs r2, 0 movs r1, 0x1 @@ -617108,19 +597017,18 @@ sub_812CF34: @ 812CF34 strh r2, [r0, 0x3C] bx lr .align 2, 0 -_0812CF64: .4byte 0x0203ab34 -_0812CF68: .4byte 0x02020630 + .pool thumb_func_end sub_812CF34 thumb_func_start sub_812CF6C sub_812CF6C: @ 812CF6C push {r4,r5,lr} movs r2, 0 - ldr r0, _0812CF9C + ldr r0, =0x0203ab34 ldr r0, [r0] adds r3, r0, 0 adds r3, 0x44 - ldr r4, _0812CFA0 + ldr r4, =0x02020630 _0812CF7A: adds r0, r3, r2 ldrb r1, [r0] @@ -617139,8 +597047,7 @@ _0812CF7A: movs r0, 0 b _0812CFB0 .align 2, 0 -_0812CF9C: .4byte 0x0203ab34 -_0812CFA0: .4byte 0x02020630 + .pool _0812CFA4: adds r0, r2, 0x1 lsls r0, 24 @@ -617159,7 +597066,7 @@ sub_812CFB8: @ 812CFB8 push {r4,lr} movs r4, 0 _0812CFBC: - ldr r0, _0812CFD4 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x44 adds r0, r4 @@ -617171,7 +597078,7 @@ _0812CFBC: movs r0, 0 b _0812CFE4 .align 2, 0 -_0812CFD4: .4byte 0x0203ab34 + .pool _0812CFD8: adds r0, r4, 0x1 lsls r0, 24 @@ -617193,7 +597100,7 @@ sub_812CFEC: @ 812CFEC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0812D008 + ldr r0, =0x02020630 adds r1, r0 movs r2, 0x30 ldrsh r0, [r1, r2] @@ -617202,7 +597109,7 @@ sub_812CFEC: @ 812CFEC movs r0, 0x1 b _0812D01E .align 2, 0 -_0812D008: .4byte 0x02020630 + .pool _0812D00C: ldrh r2, [r1, 0x3C] movs r3, 0x3C @@ -617278,7 +597185,7 @@ _0812D080: lsls r0, 1 strh r0, [r2, 0x34] _0812D08E: - ldr r1, _0812D0AC + ldr r1, =0x085a8430 movs r3, 0x2E ldrsh r0, [r2, r3] adds r0, r1 @@ -617294,19 +597201,19 @@ _0812D0A6: pop {r0} bx r0 .align 2, 0 -_0812D0AC: .4byte 0x085a8430 + .pool thumb_func_end sub_812D024 thumb_func_start sub_812D0B0 sub_812D0B0: @ 812D0B0 push {r4,lr} - ldr r4, _0812D0D8 + ldr r4, =sub_812D128 + 1 adds r0, r4, 0 movs r1, 0x6 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0812D0DC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -617318,18 +597225,17 @@ sub_812D0B0: @ 812D0B0 pop {r0} bx r0 .align 2, 0 -_0812D0D8: .4byte sub_812D128 + 1 -_0812D0DC: .4byte 0x03005e00 + .pool thumb_func_end sub_812D0B0 thumb_func_start sub_812D0E0 sub_812D0E0: @ 812D0E0 push {lr} - ldr r0, _0812D104 + ldr r0, =sub_812D128 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _0812D108 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -617341,12 +597247,11 @@ sub_812D0E0: @ 812D0E0 movs r0, 0 b _0812D120 .align 2, 0 -_0812D104: .4byte sub_812D128 + 1 -_0812D108: .4byte 0x03005e00 + .pool _0812D10C: adds r0, r2, 0 bl remove_task - ldr r0, _0812D124 + ldr r0, =0x085a84ac ldr r0, [r0] movs r1, 0x10 movs r2, 0x20 @@ -617356,7 +597261,7 @@ _0812D120: pop {r1} bx r1 .align 2, 0 -_0812D124: .4byte 0x085a84ac + .pool thumb_func_end sub_812D0E0 thumb_func_start sub_812D128 @@ -617367,7 +597272,7 @@ sub_812D128: @ 812D128 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0812D180 + ldr r0, =0x03005e00 adds r2, r1, r0 ldrh r0, [r2, 0xA] subs r0, 0x1 @@ -617394,7 +597299,7 @@ _0812D162: negs r0, r1 strh r0, [r2, 0xE] _0812D166: - ldr r0, _0812D184 + ldr r0, =0x085a84a0 movs r3, 0xC ldrsh r1, [r2, r3] lsls r1, 2 @@ -617406,38 +597311,36 @@ _0812D166: pop {r0} bx r0 .align 2, 0 -_0812D180: .4byte 0x03005e00 -_0812D184: .4byte 0x085a84a0 + .pool thumb_func_end sub_812D128 thumb_func_start sub_812D188 sub_812D188: @ 812D188 push {lr} - ldr r0, _0812D1A0 + ldr r0, =sub_812D230 + 1 movs r1, 0x8 bl AddTask - ldr r1, _0812D1A4 + ldr r1, =0x0203ab34 ldr r1, [r1] adds r1, 0x3E strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_0812D1A0: .4byte sub_812D230 + 1 -_0812D1A4: .4byte 0x0203ab34 + .pool thumb_func_end sub_812D188 thumb_func_start sub_812D1A8 sub_812D1A8: @ 812D1A8 push {r4,lr} - ldr r0, _0812D1D4 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3E ldrb r0, [r0] lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0812D1D8 + ldr r0, =0x03005e00 adds r4, r0 adds r0, r4, 0 bl sub_812D394 @@ -617451,21 +597354,20 @@ sub_812D1A8: @ 812D1A8 pop {r0} bx r0 .align 2, 0 -_0812D1D4: .4byte 0x0203ab34 -_0812D1D8: .4byte 0x03005e00 + .pool thumb_func_end sub_812D1A8 thumb_func_start sub_812D1DC sub_812D1DC: @ 812D1DC push {r4,lr} - ldr r0, _0812D204 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3E ldrb r0, [r0] lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0812D208 + ldr r0, =0x03005e00 adds r4, r0 adds r0, r4, 0 bl sub_812D394 @@ -617477,14 +597379,13 @@ sub_812D1DC: @ 812D1DC pop {r0} bx r0 .align 2, 0 -_0812D204: .4byte 0x0203ab34 -_0812D208: .4byte 0x03005e00 + .pool thumb_func_end sub_812D1DC thumb_func_start sub_812D20C sub_812D20C: @ 812D20C - ldr r2, _0812D228 - ldr r0, _0812D22C + ldr r2, =0x03005e00 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3E ldrb r1, [r0] @@ -617497,8 +597398,7 @@ sub_812D20C: @ 812D20C lsrs r0, 24 bx lr .align 2, 0 -_0812D228: .4byte 0x03005e00 -_0812D22C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812D20C thumb_func_start sub_812D230 @@ -617507,8 +597407,8 @@ sub_812D230: @ 812D230 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _0812D258 - ldr r2, _0812D25C + ldr r3, =0x085a7558 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -617522,8 +597422,7 @@ sub_812D230: @ 812D230 pop {r0} bx r0 .align 2, 0 -_0812D258: .4byte 0x085a7558 -_0812D25C: .4byte 0x03005e00 + .pool thumb_func_end sub_812D230 thumb_func_start nullsub_50 @@ -617558,7 +597457,7 @@ sub_812D264: @ 812D264 sub_812D28C: @ 812D28C push {r4,r5,lr} adds r4, r0, 0 - ldr r2, _0812D2C0 + ldr r2, =0x02020630 movs r0, 0xC ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -617583,18 +597482,18 @@ sub_812D28C: @ 812D28C movs r2, 0x1 b _0812D2CC .align 2, 0 -_0812D2C0: .4byte 0x02020630 + .pool _0812D2C4: cmp r1, 0x10 bne _0812D2CC movs r3, 0x2 movs r2, 0x2 _0812D2CC: - ldr r0, _0812D304 + ldr r0, =0x0203aacc ldr r0, [r0] lsls r1, r2, 1 adds r1, r0 - ldr r2, _0812D308 + ldr r2, =0x085a7568 lsls r0, r3, 2 adds r0, r2 ldrh r0, [r0] @@ -617617,8 +597516,7 @@ _0812D2FC: pop {r0} bx r0 .align 2, 0 -_0812D304: .4byte 0x0203aacc -_0812D308: .4byte 0x085a7568 + .pool thumb_func_end sub_812D28C thumb_func_start sub_812D30C @@ -617648,11 +597546,11 @@ _0812D332: ldrsh r0, [r4, r1] cmp r0, 0 bne _0812D366 - ldr r0, _0812D38C + ldr r0, =0x0203aacc ldr r0, [r0] lsls r1, r2, 1 adds r1, r0 - ldr r0, _0812D390 + ldr r0, =0x085a7568 lsls r2, r3, 2 adds r0, 0x2 adds r2, r0 @@ -617691,8 +597589,7 @@ _0812D384: pop {r0} bx r0 .align 2, 0 -_0812D38C: .4byte 0x0203aacc -_0812D390: .4byte 0x085a7568 + .pool thumb_func_end sub_812D30C thumb_func_start sub_812D394 @@ -617724,7 +597621,7 @@ sub_812D3B4: @ 812D3B4 movs r5, 0 cmp r5, r6 bge _0812D41E - ldr r7, _0812D3D8 + ldr r7, =0x085a7568 _0812D3C4: movs r3, 0 movs r1, 0 @@ -617736,14 +597633,14 @@ _0812D3C4: movs r1, 0x1 b _0812D3E4 .align 2, 0 -_0812D3D8: .4byte 0x085a7568 + .pool _0812D3DC: cmp r0, 0xF bne _0812D3E4 movs r3, 0x2 movs r1, 0x2 _0812D3E4: - ldr r0, _0812D438 + ldr r0, =0x0203aacc ldr r0, [r0] lsls r1, 1 adds r1, r0 @@ -617776,7 +597673,7 @@ _0812D41E: asrs r0, r2, 16 cmp r0, 0xF bgt _0812D484 - ldr r7, _0812D43C + ldr r7, =0x085a756a _0812D428: movs r3, 0 movs r1, 0x3 @@ -617787,15 +597684,14 @@ _0812D428: movs r1, 0x1 b _0812D448 .align 2, 0 -_0812D438: .4byte 0x0203aacc -_0812D43C: .4byte 0x085a756a + .pool _0812D440: cmp r0, 0xF bne _0812D448 movs r3, 0x2 movs r1, 0x2 _0812D448: - ldr r0, _0812D4A0 + ldr r0, =0x0203aacc ldr r0, [r0] lsls r1, 1 adds r1, r0 @@ -617825,8 +597721,8 @@ _0812D448: cmp r0, 0xF ble _0812D428 _0812D484: - ldr r2, _0812D4A4 - ldr r0, _0812D4A8 + ldr r2, =0x03005e00 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3E ldrb r1, [r0] @@ -617839,15 +597735,13 @@ _0812D484: pop {r0} bx r0 .align 2, 0 -_0812D4A0: .4byte 0x0203aacc -_0812D4A4: .4byte 0x03005e00 -_0812D4A8: .4byte 0x0203ab34 + .pool thumb_func_end sub_812D3B4 thumb_func_start sub_812D4AC sub_812D4AC: @ 812D4AC push {r4,lr} - ldr r4, _0812D4C8 + ldr r4, =sub_812D4EC + 1 adds r0, r4, 0 movs r1, 0x7 bl AddTask @@ -617858,13 +597752,13 @@ sub_812D4AC: @ 812D4AC pop {r0} bx r0 .align 2, 0 -_0812D4C8: .4byte sub_812D4EC + 1 + .pool thumb_func_end sub_812D4AC thumb_func_start sub_812D4CC sub_812D4CC: @ 812D4CC push {lr} - ldr r0, _0812D4E0 + ldr r0, =sub_812D4EC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -617873,7 +597767,7 @@ sub_812D4CC: @ 812D4CC movs r0, 0 b _0812D4E6 .align 2, 0 -_0812D4E0: .4byte sub_812D4EC + 1 + .pool _0812D4E4: movs r0, 0x1 _0812D4E6: @@ -617887,8 +597781,8 @@ sub_812D4EC: @ 812D4EC adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _0812D514 - ldr r2, _0812D518 + ldr r3, =0x085a7574 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -617902,14 +597796,13 @@ sub_812D4EC: @ 812D4EC pop {r0} bx r0 .align 2, 0 -_0812D514: .4byte 0x085a7574 -_0812D518: .4byte 0x03005e00 + .pool thumb_func_end sub_812D4EC thumb_func_start sub_812D51C sub_812D51C: @ 812D51C push {lr} - ldr r3, _0812D588 + ldr r3, =0x0203ab34 ldr r1, [r3] movs r2, 0 strb r2, [r1, 0xA] @@ -617925,9 +597818,9 @@ sub_812D51C: @ 812D51C movs r1, 0xA0 lsls r1, 3 strh r1, [r0, 0x10] - ldr r0, _0812D58C + ldr r0, =0x02021bbc strh r2, [r0] - ldr r0, _0812D590 + ldr r0, =0x02021bbe strh r2, [r0] movs r0, 0x14 movs r1, 0 @@ -617951,16 +597844,14 @@ sub_812D51C: @ 812D51C pop {r0} bx r0 .align 2, 0 -_0812D588: .4byte 0x0203ab34 -_0812D58C: .4byte 0x02021bbc -_0812D590: .4byte 0x02021bbe + .pool thumb_func_end sub_812D51C thumb_func_start sub_812D594 sub_812D594: @ 812D594 push {r4,r5,lr} adds r4, r0, 0 - ldr r1, _0812D604 + ldr r1, =0x02021bbc ldrh r0, [r1] subs r0, 0x8 strh r0, [r1] @@ -617973,7 +597864,7 @@ sub_812D594: @ 812D594 movs r2, 0xFF ands r0, r2 lsrs r5, r0, 3 - ldr r0, _0812D608 + ldr r0, =0x000001ff ands r1, r0 movs r0, 0x14 bl lcd_io_set @@ -618014,8 +597905,7 @@ _0812D5F4: pop {r0} bx r0 .align 2, 0 -_0812D604: .4byte 0x02021bbc -_0812D608: .4byte 0x000001ff + .pool thumb_func_end sub_812D594 thumb_func_start sub_812D60C @@ -618051,17 +597941,17 @@ sub_812D63C: @ 812D63C push {r7} sub sp, 0x14 adds r7, r0, 0 - ldr r1, _0812D6D8 + ldr r1, =0x085a75c0 mov r0, sp movs r2, 0x4 bl memcpy add r0, sp, 0x4 mov r8, r0 - ldr r1, _0812D6DC + ldr r1, =0x085a75c4 movs r2, 0x8 bl memcpy add r6, sp, 0xC - ldr r1, _0812D6E0 + ldr r1, =0x085a75cc adds r0, r6, 0 movs r2, 0x8 bl memcpy @@ -618086,14 +597976,14 @@ sub_812D63C: @ 812D63C movs r1, 0 ldrsh r0, [r6, r1] bl sub_812EBAC - ldr r0, _0812D6E4 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3F ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812D6E8 + ldr r1, =0x02020630 adds r0, r1 mov r2, sp adds r1, r2, r5 @@ -618119,11 +598009,7 @@ _0812D6CC: pop {r0} bx r0 .align 2, 0 -_0812D6D8: .4byte 0x085a75c0 -_0812D6DC: .4byte 0x085a75c4 -_0812D6E0: .4byte 0x085a75cc -_0812D6E4: .4byte 0x0203ab34 -_0812D6E8: .4byte 0x02020630 + .pool thumb_func_end sub_812D63C thumb_func_start sub_812D6EC @@ -618148,14 +598034,14 @@ sub_812D6EC: @ 812D6EC strh r0, [r4, 0x12] movs r0, 0x2 bl sub_812EBAC - ldr r0, _0812D738 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3F ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812D73C + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x3 bl obj_anim_image_start_if_different @@ -618164,8 +598050,7 @@ _0812D730: pop {r0} bx r0 .align 2, 0 -_0812D738: .4byte 0x0203ab34 -_0812D73C: .4byte 0x02020630 + .pool thumb_func_end sub_812D6EC thumb_func_start sub_812D740 @@ -618217,7 +598102,7 @@ sub_812D774: @ 812D774 ble _0812D7DC movs r0, 0 strh r0, [r4, 0x12] - ldr r0, _0812D7B4 + ldr r0, =0x0203ab34 ldr r1, [r0] ldrb r0, [r1, 0x5] cmp r0, 0 @@ -618231,7 +598116,7 @@ sub_812D774: @ 812D774 adds r0, 0x1 b _0812D7D4 .align 2, 0 -_0812D7B4: .4byte 0x0203ab34 + .pool _0812D7B8: movs r1, 0x14 ldrsh r0, [r4, r1] @@ -618263,7 +598148,7 @@ _0812D7DC: sub_812D7E4: @ 812D7E4 push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _0812D80C + ldr r6, =0x0203ab34 ldr r0, [r6] movs r1, 0x14 ldrsh r0, [r0, r1] @@ -618279,7 +598164,7 @@ sub_812D7E4: @ 812D7E4 bl sub_812BE0C b _0812D838 .align 2, 0 -_0812D80C: .4byte 0x0203ab34 + .pool _0812D810: movs r0, 0x1 bl sub_812BCE8 @@ -618311,7 +598196,7 @@ _0812D842: bne _0812D866 movs r0, 0x1 bl sub_812BCE8 - ldr r1, _0812D86C + ldr r1, =0x0203ab34 ldr r1, [r1] lsls r0, 24 lsrs r0, 24 @@ -618327,7 +598212,7 @@ _0812D866: pop {r0} bx r0 .align 2, 0 -_0812D86C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812D7E4 thumb_func_start sub_812D870 @@ -618348,7 +598233,7 @@ sub_812D870: @ 812D870 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r5, _0812D8C4 + ldr r5, =0x0203ab34 ldr r1, [r5] ldrb r0, [r1, 0x5] cmp r0, 0 @@ -618361,17 +598246,15 @@ sub_812D870: @ 812D870 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812D8C8 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x5 bl obj_anim_image_start_if_different - ldr r0, _0812D8CC + ldr r0, =0x00000187 bl fanfare_play b _0812D914 .align 2, 0 -_0812D8C4: .4byte 0x0203ab34 -_0812D8C8: .4byte 0x02020630 -_0812D8CC: .4byte 0x00000187 + .pool _0812D8D0: movs r0, 0xC0 strh r0, [r4, 0x10] @@ -618381,7 +598264,7 @@ _0812D8D0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0812D91C + ldr r4, =0x02020630 adds r0, r4 movs r1, 0x4 bl obj_anim_image_start_if_different @@ -618410,7 +598293,7 @@ _0812D914: pop {r0} bx r0 .align 2, 0 -_0812D91C: .4byte 0x02020630 + .pool thumb_func_end sub_812D870 thumb_func_start sub_812D920 @@ -618445,7 +598328,7 @@ _0812D948: sub_812D950: @ 812D950 push {r4,r5,lr} adds r4, r0, 0 - ldr r1, _0812D990 + ldr r1, =0x02021bbc ldrh r0, [r1] subs r0, 0x8 strh r0, [r1] @@ -618461,7 +598344,7 @@ sub_812D950: @ 812D950 movs r2, 0xFF ands r0, r2 lsrs r5, r0, 3 - ldr r0, _0812D994 + ldr r0, =0x000001ff ands r1, r0 movs r0, 0x14 bl lcd_io_set @@ -618474,8 +598357,7 @@ sub_812D950: @ 812D950 bl sub_812DC50 b _0812D99E .align 2, 0 -_0812D990: .4byte 0x02021bbc -_0812D994: .4byte 0x000001ff + .pool _0812D998: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -618490,14 +598372,14 @@ _0812D99E: sub_812D9A4: @ 812D9A4 push {r4-r6,lr} adds r5, r0, 0 - ldr r4, _0812D9F8 + ldr r4, =0x0203ab34 ldr r0, [r4] movs r6, 0 strb r6, [r0, 0xB] ldr r1, [r4] ldrb r0, [r1, 0x5] strb r0, [r1, 0xA] - ldr r0, _0812D9FC + ldr r0, =0x02021bbc strh r6, [r0] movs r0, 0x14 movs r1, 0 @@ -618516,16 +598398,14 @@ sub_812D9A4: @ 812D9A4 ldrb r0, [r0, 0xA] cmp r0, 0 bne _0812DA04 - ldr r0, _0812DA00 + ldr r0, =sub_812D4EC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task b _0812DA1A .align 2, 0 -_0812D9F8: .4byte 0x0203ab34 -_0812D9FC: .4byte 0x02021bbc -_0812DA00: .4byte sub_812D4EC + 1 + .pool _0812DA04: movs r0, 0x4 bl sub_812DEE4 @@ -618546,7 +598426,7 @@ _0812DA1A: sub_812DA20: @ 812DA20 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _0812DA3C + ldr r0, =0x0203ab34 ldr r5, [r0] movs r0, 0x1A ldrsh r1, [r5, r0] @@ -618559,7 +598439,7 @@ sub_812DA20: @ 812DA20 strh r0, [r4, 0x8] b _0812DA66 .align 2, 0 -_0812DA3C: .4byte 0x0203ab34 + .pool _0812DA40: movs r1, 0x1C ldrsh r0, [r5, r1] @@ -618592,7 +598472,7 @@ sub_812DA6C: @ 812DA6C lsls r0, 24 cmp r0, 0 beq _0812DA86 - ldr r0, _0812DA8C + ldr r0, =sub_812D4EC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -618601,7 +598481,7 @@ _0812DA86: pop {r0} bx r0 .align 2, 0 -_0812DA8C: .4byte sub_812D4EC + 1 + .pool thumb_func_end sub_812DA6C thumb_func_start sub_812DA90 @@ -618612,8 +598492,8 @@ sub_812DA90: @ 812DA90 bl sub_812EA7C bl sub_812EBCC bl sub_812EC20 - ldr r5, _0812DAF8 - ldr r3, _0812DAFC + ldr r5, =0x02020630 + ldr r3, =0x0203ab34 ldr r0, [r3] adds r0, 0x4E ldrb r1, [r0] @@ -618643,7 +598523,7 @@ sub_812DA90: @ 812DA90 strh r0, [r4, 0x10] strh r1, [r4, 0x12] bl sub_80A2F30 - ldr r0, _0812DB00 + ldr r0, =0x00000187 bl fanfare_play movs r0, 0xB2 bl audio_play @@ -618651,16 +598531,14 @@ sub_812DA90: @ 812DA90 pop {r0} bx r0 .align 2, 0 -_0812DAF8: .4byte 0x02020630 -_0812DAFC: .4byte 0x0203ab34 -_0812DB00: .4byte 0x00000187 + .pool thumb_func_end sub_812DA90 thumb_func_start sub_812DB04 sub_812DB04: @ 812DB04 push {r4,r5,lr} adds r4, r0, 0 - ldr r1, _0812DB80 + ldr r1, =0x02021bbe ldrh r0, [r4, 0x10] strh r0, [r1] ldrh r1, [r4, 0x10] @@ -618695,8 +598573,8 @@ _0812DB3C: bl sub_812EC94 bl sub_812E5A8 bl sub_812EDC0 - ldr r2, _0812DB84 - ldr r0, _0812DB88 + ldr r2, =0x02020630 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x4E ldrb r1, [r0] @@ -618719,16 +598597,14 @@ _0812DB7A: pop {r0} bx r0 .align 2, 0 -_0812DB80: .4byte 0x02021bbe -_0812DB84: .4byte 0x02020630 -_0812DB88: .4byte 0x0203ab34 + .pool thumb_func_end sub_812DB04 thumb_func_start sub_812DB8C sub_812DB8C: @ 812DB8C push {r4,lr} adds r4, r0, 0 - ldr r1, _0812DBB8 + ldr r1, =0x02021bbe movs r0, 0 strh r0, [r1] movs r0, 0x16 @@ -618747,19 +598623,19 @@ _0812DBB2: pop {r0} bx r0 .align 2, 0 -_0812DBB8: .4byte 0x02021bbe + .pool thumb_func_end sub_812DB8C thumb_func_start sub_812DBBC sub_812DBBC: @ 812DBBC push {lr} - ldr r1, _0812DBFC + ldr r1, =0x02021bbc movs r0, 0 strh r0, [r1] movs r0, 0x14 movs r1, 0 bl lcd_io_set - ldr r0, _0812DC00 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x60 ldrh r0, [r0] @@ -618768,7 +598644,7 @@ sub_812DBBC: @ 812DBBC bl sub_812E8F8 bl sub_812E8C4 bl sub_812ED8C - ldr r0, _0812DC04 + ldr r0, =sub_812D4EC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -618776,9 +598652,7 @@ sub_812DBBC: @ 812DBBC pop {r0} bx r0 .align 2, 0 -_0812DBFC: .4byte 0x02021bbc -_0812DC00: .4byte 0x0203ab34 -_0812DC04: .4byte sub_812D4EC + 1 + .pool thumb_func_end sub_812DBBC thumb_func_start sub_812DC08 @@ -618798,7 +598672,7 @@ _0812DC14: lsls r1, 2 adds r1, r6, r1 lsls r1, 1 - ldr r0, _0812DC4C + ldr r0, =0x085a96e0 adds r1, r0 lsls r3, r4, 5 adds r3, r5, r3 @@ -618817,7 +598691,7 @@ _0812DC14: pop {r0} bx r0 .align 2, 0 -_0812DC4C: .4byte 0x085a96e0 + .pool thumb_func_end sub_812DC08 thumb_func_start sub_812DC50 @@ -618832,7 +598706,7 @@ _0812DC58: lsls r3, 16 lsrs r3, 16 movs r0, 0x1 - ldr r1, _0812DC7C + ldr r1, =0x085a9898 movs r2, 0x2 bl gpu_copy_bg_tile_map_to_vram adds r0, r4, 0x1 @@ -618844,7 +598718,7 @@ _0812DC58: pop {r0} bx r0 .align 2, 0 -_0812DC7C: .4byte 0x085a9898 + .pool thumb_func_end sub_812DC50 thumb_func_start sub_812DC80 @@ -618853,13 +598727,13 @@ sub_812DC80: @ 812DC80 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _0812DCAC + ldr r5, =sub_812DCD4 + 1 adds r0, r5, 0 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0812DCB0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -618870,14 +598744,13 @@ sub_812DC80: @ 812DC80 pop {r0} bx r0 .align 2, 0 -_0812DCAC: .4byte sub_812DCD4 + 1 -_0812DCB0: .4byte 0x03005e00 + .pool thumb_func_end sub_812DC80 thumb_func_start sub_812DCB4 sub_812DCB4: @ 812DCB4 push {lr} - ldr r0, _0812DCC8 + ldr r0, =sub_812DCD4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -618886,7 +598759,7 @@ sub_812DCB4: @ 812DCB4 movs r0, 0 b _0812DCCE .align 2, 0 -_0812DCC8: .4byte sub_812DCD4 + 1 + .pool _0812DCCC: movs r0, 0x1 _0812DCCE: @@ -618900,8 +598773,8 @@ sub_812DCD4: @ 812DCD4 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _0812DCFC - ldr r2, _0812DD00 + ldr r3, =0x085a75d4 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -618915,8 +598788,7 @@ sub_812DCD4: @ 812DCD4 pop {r0} bx r0 .align 2, 0 -_0812DCFC: .4byte 0x085a75d4 -_0812DD00: .4byte 0x03005e00 + .pool thumb_func_end sub_812DCD4 thumb_func_start sub_812DD04 @@ -618944,7 +598816,7 @@ sub_812DD04: @ 812DD04 sub_812DD28: @ 812DD28 push {lr} adds r2, r0, 0 - ldr r0, _0812DD44 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -618957,7 +598829,7 @@ _0812DD3E: pop {r0} bx r0 .align 2, 0 -_0812DD44: .4byte 0x02037fd4 + .pool thumb_func_end sub_812DD28 thumb_func_start sub_812DD48 @@ -618966,7 +598838,7 @@ sub_812DD48: @ 812DD48 adds r4, r0, 0 bl sub_812DFDC bl sub_812FAF4 - ldr r0, _0812DD74 + ldr r0, =0x085a7444 bl Window_AddFromTemplate movs r0, 0x1 bl Window_WriteStandardTileMap @@ -618980,7 +598852,7 @@ sub_812DD48: @ 812DD48 pop {r0} bx r0 .align 2, 0 -_0812DD74: .4byte 0x085a7444 + .pool thumb_func_end sub_812DD48 thumb_func_start sub_812DD78 @@ -618988,11 +598860,11 @@ sub_812DD78: @ 812DD78 push {r4,r5,lr} sub sp, 0xC adds r5, r0, 0 - ldr r0, _0812DDBC + ldr r0, =0x085a744c str r0, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, _0812DDC0 + ldr r0, =0x085ef750 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -619017,8 +598889,7 @@ sub_812DD78: @ 812DD78 pop {r0} bx r0 .align 2, 0 -_0812DDBC: .4byte 0x085a744c -_0812DDC0: .4byte 0x085ef750 + .pool thumb_func_end sub_812DD78 thumb_func_start sub_812DDC4 @@ -619026,7 +598897,7 @@ sub_812DDC4: @ 812DDC4 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r0, _0812DE10 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x6 ands r0, r1 @@ -619058,7 +598929,7 @@ _0812DE08: pop {r0} bx r0 .align 2, 0 -_0812DE10: .4byte 0x030022c0 + .pool thumb_func_end sub_812DDC4 thumb_func_start sub_812DE14 @@ -619095,7 +598966,7 @@ sub_812DE48: @ 812DE48 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r0, _0812DE78 + ldr r0, =0x0203ab34 ldr r0, [r0] ldrb r0, [r0, 0x2] bl sub_812D3B4 @@ -619114,13 +598985,13 @@ sub_812DE48: @ 812DE48 pop {r0} bx r0 .align 2, 0 -_0812DE78: .4byte 0x0203ab34 + .pool thumb_func_end sub_812DE48 thumb_func_start sub_812DE7C sub_812DE7C: @ 812DE7C push {lr} - ldr r0, _0812DE90 + ldr r0, =sub_812DCD4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -619128,27 +598999,27 @@ sub_812DE7C: @ 812DE7C pop {r0} bx r0 .align 2, 0 -_0812DE90: .4byte sub_812DCD4 + 1 + .pool thumb_func_end sub_812DE7C thumb_func_start sub_812DE94 sub_812DE94: @ 812DE94 push {lr} - ldr r0, _0812DED4 + ldr r0, =sub_812E0B0 + 1 movs r1, 0x3 bl AddTask lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0812DED8 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3D strb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0812DEDC + ldr r1, =0x03005e00 adds r0, r1 - ldr r1, _0812DEE0 + ldr r1, =0x0000ffff strh r1, [r0, 0xA] movs r1, 0x4 adds r2, r0, 0 @@ -619166,10 +599037,7 @@ _0812DEC0: pop {r0} bx r0 .align 2, 0 -_0812DED4: .4byte sub_812E0B0 + 1 -_0812DED8: .4byte 0x0203ab34 -_0812DEDC: .4byte 0x03005e00 -_0812DEE0: .4byte 0x0000ffff + .pool thumb_func_end sub_812DE94 thumb_func_start sub_812DEE4 @@ -619181,18 +599049,18 @@ sub_812DEE4: @ 812DEE4 lsls r4, 24 lsrs r4, 24 bl sub_812DFDC - ldr r0, _0812DF5C + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3D ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0812DF60 + ldr r1, =0x03005e00 adds r7, r0, r1 strh r4, [r7, 0xA] movs r6, 0 - ldr r1, _0812DF64 + ldr r1, =0x085a7a04 lsls r5, r4, 2 adds r0, r5, r1 ldr r0, [r0] @@ -619235,9 +599103,7 @@ _0812DF52: pop {r0} bx r0 .align 2, 0 -_0812DF5C: .4byte 0x0203ab34 -_0812DF60: .4byte 0x03005e00 -_0812DF64: .4byte 0x085a7a04 + .pool thumb_func_end sub_812DEE4 thumb_func_start sub_812DF68 @@ -619250,14 +599116,14 @@ sub_812DF68: @ 812DF68 ldr r4, [sp, 0x1C] lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0812DFBC + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3D ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0812DFC0 + ldr r1, =0x03005e00 adds r0, r1 mov r12, r0 movs r5, 0x4 @@ -619285,8 +599151,7 @@ _0812DF96: strh r0, [r4] b _0812DFCE .align 2, 0 -_0812DFBC: .4byte 0x0203ab34 -_0812DFC0: .4byte 0x03005e00 + .pool _0812DFC4: adds r0, r5, 0x1 lsls r0, 24 @@ -619305,20 +599170,20 @@ _0812DFCE: thumb_func_start sub_812DFDC sub_812DFDC: @ 812DFDC push {r4-r6,lr} - ldr r0, _0812E040 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3D ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0812E044 + ldr r1, =0x03005e00 adds r4, r0, r1 ldrh r1, [r4, 0xA] - ldr r0, _0812E048 + ldr r0, =0x0000ffff cmp r1, r0 beq _0812E008 - ldr r0, _0812E04C + ldr r0, =0x085a7a20 movs r2, 0xA ldrsh r1, [r4, r2] lsls r1, 2 @@ -619340,7 +599205,7 @@ _0812E00E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812E050 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles movs r0, 0x40 @@ -619355,29 +599220,25 @@ _0812E02E: pop {r0} bx r0 .align 2, 0 -_0812E040: .4byte 0x0203ab34 -_0812E044: .4byte 0x03005e00 -_0812E048: .4byte 0x0000ffff -_0812E04C: .4byte 0x085a7a20 -_0812E050: .4byte 0x02020630 + .pool thumb_func_end sub_812DFDC thumb_func_start sub_812E054 sub_812E054: @ 812E054 push {r4,r5,lr} - ldr r0, _0812E090 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3D ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0812E094 + ldr r1, =0x03005e00 adds r0, r1 movs r2, 0x4 adds r3, r0, 0 adds r3, 0x8 - ldr r4, _0812E098 + ldr r4, =0x02020630 _0812E070: lsls r0, r2, 1 adds r1, r3, r0 @@ -619396,9 +599257,7 @@ _0812E070: movs r0, 0 b _0812E0A8 .align 2, 0 -_0812E090: .4byte 0x0203ab34 -_0812E094: .4byte 0x03005e00 -_0812E098: .4byte 0x02020630 + .pool _0812E09C: adds r0, r2, 0x1 lsls r0, 24 @@ -619418,8 +599277,8 @@ sub_812E0B0: @ 812E0B0 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r3, _0812E0D8 - ldr r2, _0812E0DC + ldr r3, =0x085a7610 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -619433,8 +599292,7 @@ sub_812E0B0: @ 812E0B0 pop {r0} bx r0 .align 2, 0 -_0812E0D8: .4byte 0x085a7610 -_0812E0DC: .4byte 0x03005e00 + .pool thumb_func_end sub_812E0B0 thumb_func_start nullsub_51 @@ -619452,7 +599310,7 @@ _0812E0EA: lsls r5, r0, 16 lsls r7, r6, 16 _0812E0F0: - ldr r0, _0812E148 + ldr r0, =0x085a7ce0 asrs r1, r5, 16 movs r2, 0 movs r3, 0xE @@ -619462,7 +599320,7 @@ _0812E0F0: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0812E14C + ldr r0, =0x02020630 adds r1, r0 ldrb r0, [r1, 0x5] movs r2, 0xC @@ -619470,7 +599328,7 @@ _0812E0F0: strb r0, [r1, 0x5] strh r6, [r1, 0x2E] strh r4, [r1, 0x30] - ldr r0, _0812E150 + ldr r0, =0x0000ffff strh r0, [r1, 0x34] lsls r0, r4, 16 movs r1, 0xC0 @@ -619495,16 +599353,14 @@ _0812E0F0: pop {r0} bx r0 .align 2, 0 -_0812E148: .4byte 0x085a7ce0 -_0812E14C: .4byte 0x02020630 -_0812E150: .4byte 0x0000ffff + .pool thumb_func_end sub_812E0E4 thumb_func_start sub_812E154 sub_812E154: @ 812E154 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0812E1C4 + ldr r0, =0x0203ab34 ldr r4, [r0] movs r1, 0x2E ldrsh r0, [r5, r1] @@ -619554,7 +599410,7 @@ sub_812E154: @ 812E154 pop {r0} bx r0 .align 2, 0 -_0812E1C4: .4byte 0x0203ab34 + .pool thumb_func_end sub_812E154 thumb_func_start sub_812E1C8 @@ -619562,7 +599418,7 @@ sub_812E1C8: @ 812E1C8 push {r4-r6,lr} movs r4, 0xCB movs r5, 0x1 - ldr r6, _0812E22C + ldr r6, =0x0000270f _0812E1D0: lsls r4, 16 asrs r4, 16 @@ -619585,7 +599441,7 @@ _0812E1D0: ble _0812E1D0 movs r4, 0xEB movs r5, 0x1 - ldr r6, _0812E22C + ldr r6, =0x0000270f _0812E1FE: lsls r4, 16 asrs r4, 16 @@ -619610,7 +599466,7 @@ _0812E1FE: pop {r0} bx r0 .align 2, 0 -_0812E22C: .4byte 0x0000270f + .pool thumb_func_end sub_812E1C8 thumb_func_start sub_812E230 @@ -619628,7 +599484,7 @@ sub_812E230: @ 812E230 mov r8, r0 lsls r4, 16 lsrs r4, 16 - ldr r0, _0812E29C + ldr r0, =0x085a7cf8 lsls r5, 16 asrs r5, 16 lsls r6, 16 @@ -619642,7 +599498,7 @@ sub_812E230: @ 812E230 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _0812E2A0 + ldr r0, =0x02020630 adds r2, r0 ldrb r1, [r2, 0x5] movs r0, 0xD @@ -619660,7 +599516,7 @@ sub_812E230: @ 812E230 adds r0, r4 lsls r0, 1 strh r0, [r2, 0x32] - ldr r0, _0812E2A4 + ldr r0, =0x0000ffff strh r0, [r2, 0x34] pop {r3} mov r8, r3 @@ -619668,16 +599524,14 @@ sub_812E230: @ 812E230 pop {r0} bx r0 .align 2, 0 -_0812E29C: .4byte 0x085a7cf8 -_0812E2A0: .4byte 0x02020630 -_0812E2A4: .4byte 0x0000ffff + .pool thumb_func_end sub_812E230 thumb_func_start sub_812E2A8 sub_812E2A8: @ 812E2A8 push {r4,lr} adds r4, r0, 0 - ldr r0, _0812E2FC + ldr r0, =0x0203ab34 ldr r1, [r0] ldrh r2, [r1, 0xC] movs r3, 0x2E @@ -619716,13 +599570,13 @@ _0812E2F6: pop {r0} bx r0 .align 2, 0 -_0812E2FC: .4byte 0x0203ab34 + .pool thumb_func_end sub_812E2A8 thumb_func_start sub_812E300 sub_812E300: @ 812E300 push {lr} - ldr r0, _0812E330 + ldr r0, =0x085a7d10 movs r1, 0x58 movs r2, 0x48 movs r3, 0xF @@ -619730,7 +599584,7 @@ sub_812E300: @ 812E300 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _0812E334 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -619739,21 +599593,19 @@ sub_812E300: @ 812E300 movs r2, 0xC orrs r1, r2 strb r1, [r0, 0x5] - ldr r1, _0812E338 + ldr r1, =0x085a7fc0 bl obj_set_f18_to_r0_f42_to_40 pop {r0} bx r0 .align 2, 0 -_0812E330: .4byte 0x085a7d10 -_0812E334: .4byte 0x02020630 -_0812E338: .4byte 0x085a7fc0 + .pool thumb_func_end sub_812E300 thumb_func_start sub_812E33C sub_812E33C: @ 812E33C push {r4,r5,lr} sub sp, 0x18 - ldr r4, _0812E3D4 + ldr r4, =0x0203aae4 ldr r0, [r4] cmp r0, 0 bne _0812E350 @@ -619762,7 +599614,7 @@ sub_812E33C: @ 812E33C str r0, [r4] _0812E350: ldr r2, [r4] - ldr r0, _0812E3D8 + ldr r0, =0x0203aad8 ldr r1, [r0] str r1, [r2] movs r3, 0x80 @@ -619787,7 +599639,7 @@ _0812E350: str r1, [r2, 0x20] strh r3, [r2, 0x24] mov r1, sp - ldr r0, _0812E3DC + ldr r0, =0x085a7d28 ldm r0!, {r3-r5} stm r1!, {r3-r5} ldm r0!, {r3-r5} @@ -619801,7 +599653,7 @@ _0812E350: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _0812E3E0 + ldr r1, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -619818,7 +599670,7 @@ _0812E350: movs r3, 0x2 orrs r1, r3 strb r1, [r2] - ldr r1, _0812E3E4 + ldr r1, =0x0203ab34 ldr r1, [r1] adds r1, 0x3F strb r0, [r1] @@ -619827,27 +599679,23 @@ _0812E350: pop {r0} bx r0 .align 2, 0 -_0812E3D4: .4byte 0x0203aae4 -_0812E3D8: .4byte 0x0203aad8 -_0812E3DC: .4byte 0x085a7d28 -_0812E3E0: .4byte 0x02020630 -_0812E3E4: .4byte 0x0203ab34 + .pool thumb_func_end sub_812E33C thumb_func_start sub_812E3E8 sub_812E3E8: @ 812E3E8 push {r4,lr} - ldr r0, _0812E418 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x3F ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812E41C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles - ldr r4, _0812E420 + ldr r4, =0x0203aae4 ldr r0, [r4] cmp r0, 0 beq _0812E410 @@ -619859,9 +599707,7 @@ _0812E410: pop {r0} bx r0 .align 2, 0 -_0812E418: .4byte 0x0203ab34 -_0812E41C: .4byte 0x02020630 -_0812E420: .4byte 0x0203aae4 + .pool thumb_func_end sub_812E3E8 thumb_func_start sub_812E424 @@ -619901,13 +599747,13 @@ _0812E458: cmp r0, 0 bne _0812E46A _0812E466: - ldr r0, _0812E470 + ldr r0, =0x0000fff8 strh r0, [r2, 0x26] _0812E46A: pop {r0} bx r0 .align 2, 0 -_0812E470: .4byte 0x0000fff8 + .pool thumb_func_end sub_812E424 thumb_func_start sub_812E474 @@ -619918,7 +599764,7 @@ sub_812E474: @ 812E474 mov r5, r8 push {r5-r7} sub sp, 0x18 - ldr r4, _0812E584 + ldr r4, =0x0203aae8 ldr r0, [r4] cmp r0, 0 bne _0812E490 @@ -619927,7 +599773,7 @@ sub_812E474: @ 812E474 str r0, [r4] _0812E490: ldr r2, [r4] - ldr r0, _0812E588 + ldr r0, =0x0203aad8 mov r10, r0 ldr r0, [r0] movs r1, 0xA0 @@ -619938,7 +599784,7 @@ _0812E490: lsls r0, 2 strh r0, [r2, 0x4] mov r1, sp - ldr r0, _0812E58C + ldr r0, =0x085a7d40 ldm r0!, {r3-r5} stm r1!, {r3-r5} ldm r0!, {r3,r4,r7} @@ -619955,7 +599801,7 @@ _0812E490: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r5, _0812E590 + ldr r5, =0x02020630 mov r9, r5 adds r2, r0, r5 ldrb r1, [r2, 0x5] @@ -619973,14 +599819,14 @@ _0812E490: movs r6, 0x2 orrs r0, r6 strb r0, [r1] - ldr r1, _0812E594 + ldr r1, =0x085a7fe0 adds r0, r2, 0 bl obj_set_f18_to_r0_f42_to_40 - ldr r5, _0812E598 + ldr r5, =0x0203ab34 ldr r0, [r5] adds r0, 0x49 strb r4, [r0] - ldr r4, _0812E59C + ldr r4, =0x0203aaec ldr r0, [r4] cmp r0, 0 bne _0812E510 @@ -619999,7 +599845,7 @@ _0812E510: lsls r0, 3 strh r0, [r2, 0x4] mov r1, sp - ldr r0, _0812E5A0 + ldr r0, =0x085a7d58 ldm r0!, {r3,r4,r7} stm r1!, {r3,r4,r7} ldm r0!, {r3,r4,r7} @@ -620029,7 +599875,7 @@ _0812E510: ldrb r0, [r1] orrs r0, r6 strb r0, [r1] - ldr r1, _0812E5A4 + ldr r1, =0x085a7ff4 adds r0, r2, 0 bl obj_set_f18_to_r0_f42_to_40 ldr r0, [r5] @@ -620044,22 +599890,14 @@ _0812E510: pop {r0} bx r0 .align 2, 0 -_0812E584: .4byte 0x0203aae8 -_0812E588: .4byte 0x0203aad8 -_0812E58C: .4byte 0x085a7d40 -_0812E590: .4byte 0x02020630 -_0812E594: .4byte 0x085a7fe0 -_0812E598: .4byte 0x0203ab34 -_0812E59C: .4byte 0x0203aaec -_0812E5A0: .4byte 0x085a7d58 -_0812E5A4: .4byte 0x085a7ff4 + .pool thumb_func_end sub_812E474 thumb_func_start sub_812E5A8 sub_812E5A8: @ 812E5A8 push {r4,r5,lr} sub sp, 0x18 - ldr r4, _0812E634 + ldr r4, =0x0203aaf0 ldr r0, [r4] cmp r0, 0 bne _0812E5BC @@ -620068,7 +599906,7 @@ sub_812E5A8: @ 812E5A8 str r0, [r4] _0812E5BC: ldr r2, [r4] - ldr r0, _0812E638 + ldr r0, =0x0203aad8 ldr r0, [r0] movs r1, 0xC0 lsls r1, 6 @@ -620078,13 +599916,13 @@ _0812E5BC: lsls r0, 3 strh r0, [r2, 0x4] mov r1, sp - ldr r0, _0812E63C + ldr r0, =0x085a7d70 ldm r0!, {r3-r5} stm r1!, {r3-r5} ldm r0!, {r3-r5} stm r1!, {r3-r5} str r2, [sp, 0xC] - ldr r0, _0812E640 + ldr r0, =0x02021bbc ldrh r0, [r0] movs r1, 0xA8 subs r1, r0 @@ -620100,7 +599938,7 @@ _0812E5BC: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _0812E644 + ldr r1, =0x02020630 adds r0, r1 ldrb r2, [r0, 0x5] movs r1, 0xD @@ -620115,9 +599953,9 @@ _0812E5BC: movs r2, 0x2 orrs r1, r2 strb r1, [r3] - ldr r1, _0812E648 + ldr r1, =0x085a8010 bl obj_set_f18_to_r0_f42_to_40 - ldr r0, _0812E64C + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x42 strb r4, [r0] @@ -620126,13 +599964,7 @@ _0812E5BC: pop {r0} bx r0 .align 2, 0 -_0812E634: .4byte 0x0203aaf0 -_0812E638: .4byte 0x0203aad8 -_0812E63C: .4byte 0x085a7d70 -_0812E640: .4byte 0x02021bbc -_0812E644: .4byte 0x02020630 -_0812E648: .4byte 0x085a8010 -_0812E64C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812E5A8 thumb_func_start sub_812E650 @@ -620141,7 +599973,7 @@ sub_812E650: @ 812E650 movs r4, 0 movs r5, 0 _0812E656: - ldr r0, _0812E6B8 + ldr r0, =0x085a7d88 movs r1, 0xB8 lsls r1, 1 movs r2, 0 @@ -620152,7 +599984,7 @@ _0812E656: lsls r3, r0, 4 adds r3, r0 lsls r3, 2 - ldr r1, _0812E6BC + ldr r1, =0x02020630 adds r3, r1 ldrb r2, [r3, 0x5] movs r6, 0xD @@ -620171,7 +600003,7 @@ _0812E656: mov r2, r12 strb r1, [r2] strh r5, [r3, 0x3C] - ldr r1, _0812E6C0 + ldr r1, =0x0203ab34 ldr r1, [r1] adds r1, 0x4B adds r1, r4 @@ -620190,16 +600022,14 @@ _0812E656: pop {r0} bx r0 .align 2, 0 -_0812E6B8: .4byte 0x085a7d88 -_0812E6BC: .4byte 0x02020630 -_0812E6C0: .4byte 0x0203ab34 + .pool thumb_func_end sub_812E650 thumb_func_start sub_812E6C4 sub_812E6C4: @ 812E6C4 push {r4,lr} adds r4, r0, 0 - ldr r0, _0812E708 + ldr r0, =0x0203ab34 ldr r1, [r0] ldrh r0, [r4, 0x3C] ldrh r1, [r1, 0x14] @@ -620227,7 +600057,7 @@ sub_812E6C4: @ 812E6C4 pop {r0} bx r0 .align 2, 0 -_0812E708: .4byte 0x0203ab34 + .pool thumb_func_end sub_812E6C4 thumb_func_start sub_812E70C @@ -620239,7 +600069,7 @@ sub_812E70C: @ 812E70C push {r5-r7} movs r1, 0xB8 lsls r1, 1 - ldr r0, _0812E7BC + ldr r0, =0x085a7da0 movs r2, 0x64 movs r3, 0x9 bl obj_add_from_template_forward_search @@ -620249,7 +600079,7 @@ sub_812E70C: @ 812E70C lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r7, _0812E7C0 + ldr r7, =0x02020630 adds r2, r0, r7 adds r1, r2, 0 adds r1, 0x3E @@ -620269,18 +600099,18 @@ sub_812E70C: @ 812E70C mov r3, r8 orrs r0, r3 strb r0, [r2, 0x5] - ldr r0, _0812E7C4 + ldr r0, =0x085a8028 mov r9, r0 adds r0, r2, 0 mov r1, r9 bl obj_set_f18_to_r0_f42_to_40 - ldr r6, _0812E7C8 + ldr r6, =0x0203ab34 ldr r0, [r6] adds r0, 0x4E strb r4, [r0] movs r1, 0x90 lsls r1, 1 - ldr r0, _0812E7BC + ldr r0, =0x085a7da0 movs r2, 0x68 movs r3, 0x4 bl obj_add_from_template_forward_search @@ -620316,16 +600146,13 @@ sub_812E70C: @ 812E70C pop {r0} bx r0 .align 2, 0 -_0812E7BC: .4byte 0x085a7da0 -_0812E7C0: .4byte 0x02020630 -_0812E7C4: .4byte 0x085a8028 -_0812E7C8: .4byte 0x0203ab34 + .pool thumb_func_end sub_812E70C thumb_func_start sub_812E7CC sub_812E7CC: @ 812E7CC push {r4,lr} - ldr r0, _0812E81C + ldr r0, =0x085a7db8 movs r1, 0xB8 lsls r1, 1 movs r2, 0x4C @@ -620337,7 +600164,7 @@ sub_812E7CC: @ 812E7CC lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _0812E820 + ldr r1, =0x02020630 adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -620352,9 +600179,9 @@ sub_812E7CC: @ 812E7CC movs r2, 0x4 orrs r1, r2 strb r1, [r0, 0x5] - ldr r1, _0812E824 + ldr r1, =0x085a803c bl obj_set_f18_to_r0_f42_to_40 - ldr r0, _0812E828 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x40 strb r4, [r0] @@ -620362,28 +600189,25 @@ sub_812E7CC: @ 812E7CC pop {r0} bx r0 .align 2, 0 -_0812E81C: .4byte 0x085a7db8 -_0812E820: .4byte 0x02020630 -_0812E824: .4byte 0x085a803c -_0812E828: .4byte 0x0203ab34 + .pool thumb_func_end sub_812E7CC thumb_func_start sub_812E82C sub_812E82C: @ 812E82C push {r4,lr} - ldr r0, _0812E8B4 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x40 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812E8B8 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles movs r4, 0 _0812E846: - ldr r0, _0812E8B4 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x49 adds r0, r4 @@ -620391,7 +600215,7 @@ _0812E846: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812E8B8 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -620399,7 +600223,7 @@ _0812E846: lsrs r4, r0, 24 cmp r4, 0x1 bls _0812E846 - ldr r4, _0812E8BC + ldr r4, =0x0203aae8 ldr r0, [r4] cmp r0, 0 beq _0812E878 @@ -620407,7 +600231,7 @@ _0812E846: movs r0, 0 str r0, [r4] _0812E878: - ldr r4, _0812E8C0 + ldr r4, =0x0203aaec ldr r0, [r4] cmp r0, 0 beq _0812E888 @@ -620417,7 +600241,7 @@ _0812E878: _0812E888: movs r4, 0 _0812E88A: - ldr r0, _0812E8B4 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x4B adds r0, r4 @@ -620425,7 +600249,7 @@ _0812E88A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812E8B8 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -620437,10 +600261,7 @@ _0812E88A: pop {r0} bx r0 .align 2, 0 -_0812E8B4: .4byte 0x0203ab34 -_0812E8B8: .4byte 0x02020630 -_0812E8BC: .4byte 0x0203aae8 -_0812E8C0: .4byte 0x0203aaec + .pool thumb_func_end sub_812E82C thumb_func_start sub_812E8C4 @@ -620448,7 +600269,7 @@ sub_812E8C4: @ 812E8C4 push {r4,lr} movs r4, 0 _0812E8C8: - ldr r0, _0812E8F0 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x4E adds r0, r4 @@ -620456,7 +600277,7 @@ _0812E8C8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812E8F4 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -620468,24 +600289,23 @@ _0812E8C8: pop {r0} bx r0 .align 2, 0 -_0812E8F0: .4byte 0x0203ab34 -_0812E8F4: .4byte 0x02020630 + .pool thumb_func_end sub_812E8C4 thumb_func_start sub_812E8F8 sub_812E8F8: @ 812E8F8 push {r4,lr} - ldr r0, _0812E928 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x42 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812E92C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles - ldr r4, _0812E930 + ldr r4, =0x0203aaf0 ldr r0, [r4] cmp r0, 0 beq _0812E920 @@ -620497,9 +600317,7 @@ _0812E920: pop {r0} bx r0 .align 2, 0 -_0812E928: .4byte 0x0203ab34 -_0812E92C: .4byte 0x02020630 -_0812E930: .4byte 0x0203aaf0 + .pool thumb_func_end sub_812E8F8 thumb_func_start sub_812E934 @@ -620509,7 +600327,7 @@ sub_812E934: @ 812E934 mov r5, r9 mov r4, r8 push {r4-r6} - ldr r0, _0812E9D8 + ldr r0, =0x085a7dd0 mov r10, r0 movs r1, 0x98 movs r2, 0x20 @@ -620520,7 +600338,7 @@ sub_812E934: @ 812E934 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r2, _0812E9DC + ldr r2, =0x02020630 mov r9, r2 adds r3, r1, r2 ldrb r2, [r3, 0x5] @@ -620539,13 +600357,13 @@ sub_812E934: @ 812E934 movs r2, 0x1 orrs r1, r2 strb r1, [r5] - ldr r6, _0812E9E0 + ldr r6, =0x0203ab34 ldr r1, [r6] adds r1, 0x50 strb r0, [r1] movs r0, 0x8 strh r0, [r3, 0x2E] - ldr r0, _0812E9E4 + ldr r0, =0x0000ffff strh r0, [r3, 0x30] movs r0, 0x1 negs r0, r0 @@ -620585,10 +600403,7 @@ sub_812E934: @ 812E934 pop {r0} bx r0 .align 2, 0 -_0812E9D8: .4byte 0x085a7dd0 -_0812E9DC: .4byte 0x02020630 -_0812E9E0: .4byte 0x0203ab34 -_0812E9E4: .4byte 0x0000ffff + .pool thumb_func_end sub_812E934 thumb_func_start sub_812E9E8 @@ -620648,8 +600463,8 @@ sub_812EA44: @ 812EA44 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _0812EA74 - ldr r1, _0812EA78 + ldr r4, =0x02020630 + ldr r1, =0x0203ab34 ldr r3, [r1] adds r1, r3, 0 adds r1, 0x50 @@ -620670,8 +600485,7 @@ sub_812EA44: @ 812EA44 pop {r0} bx r0 .align 2, 0 -_0812EA74: .4byte 0x02020630 -_0812EA78: .4byte 0x0203ab34 + .pool thumb_func_end sub_812EA44 thumb_func_start sub_812EA7C @@ -620679,7 +600493,7 @@ sub_812EA7C: @ 812EA7C push {r4,lr} movs r4, 0 _0812EA80: - ldr r0, _0812EAA8 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x50 adds r0, r4 @@ -620687,7 +600501,7 @@ _0812EA80: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812EAAC + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -620699,8 +600513,7 @@ _0812EA80: pop {r0} bx r0 .align 2, 0 -_0812EAA8: .4byte 0x0203ab34 -_0812EAAC: .4byte 0x02020630 + .pool thumb_func_end sub_812EA7C thumb_func_start sub_812EAB0 @@ -620709,7 +600522,7 @@ sub_812EAB0: @ 812EAB0 mov r6, r9 mov r5, r8 push {r5,r6} - ldr r0, _0812EB3C + ldr r0, =0x085a7de8 mov r8, r0 movs r1, 0x48 movs r2, 0x50 @@ -620717,7 +600530,7 @@ sub_812EAB0: @ 812EAB0 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _0812EB40 + ldr r1, =0x02020630 mov r9, r1 lsls r2, r0, 4 adds r2, r0 @@ -620739,7 +600552,7 @@ sub_812EAB0: @ 812EAB0 strh r1, [r2, 0x3A] movs r1, 0x8 strh r1, [r2, 0x3C] - ldr r5, _0812EB44 + ldr r5, =0x0203ab34 ldr r1, [r5] adds r1, 0x52 strb r0, [r1] @@ -620773,9 +600586,7 @@ sub_812EAB0: @ 812EAB0 pop {r0} bx r0 .align 2, 0 -_0812EB3C: .4byte 0x085a7de8 -_0812EB40: .4byte 0x02020630 -_0812EB44: .4byte 0x0203ab34 + .pool thumb_func_end sub_812EAB0 thumb_func_start sub_812EB48 @@ -620783,7 +600594,7 @@ sub_812EB48: @ 812EB48 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r1, _0812EBA4 + ldr r1, =0x085a7614 mov r0, sp movs r2, 0x2 bl memcpy @@ -620801,7 +600612,7 @@ sub_812EB48: @ 812EB48 bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 4 - ldr r2, _0812EBA8 + ldr r2, =0x01030000 adds r0, r2 lsrs r0, 16 movs r2, 0x38 @@ -620824,14 +600635,13 @@ _0812EB9A: pop {r0} bx r0 .align 2, 0 -_0812EBA4: .4byte 0x085a7614 -_0812EBA8: .4byte 0x01030000 + .pool thumb_func_end sub_812EB48 thumb_func_start sub_812EBAC sub_812EBAC: @ 812EBAC - ldr r3, _0812EBC4 - ldr r1, _0812EBC8 + ldr r3, =0x02020630 + ldr r1, =0x0203ab34 ldr r1, [r1] adds r1, 0x52 ldrb r2, [r1] @@ -620842,8 +600652,7 @@ sub_812EBAC: @ 812EBAC strh r0, [r1, 0x3C] bx lr .align 2, 0 -_0812EBC4: .4byte 0x02020630 -_0812EBC8: .4byte 0x0203ab34 + .pool thumb_func_end sub_812EBAC thumb_func_start sub_812EBCC @@ -620853,7 +600662,7 @@ sub_812EBCC: @ 812EBCC bl gpu_pal_tags_index_of lsls r0, 24 lsrs r0, 4 - ldr r1, _0812EC14 + ldr r1, =0x01030000 adds r0, r1 lsrs r0, 16 movs r1, 0 @@ -620862,7 +600671,7 @@ sub_812EBCC: @ 812EBCC bl sub_80B609C movs r4, 0 _0812EBEA: - ldr r0, _0812EC18 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x52 adds r0, r4 @@ -620870,7 +600679,7 @@ _0812EBEA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812EC1C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -620882,22 +600691,20 @@ _0812EBEA: pop {r0} bx r0 .align 2, 0 -_0812EC14: .4byte 0x01030000 -_0812EC18: .4byte 0x0203ab34 -_0812EC1C: .4byte 0x02020630 + .pool thumb_func_end sub_812EBCC thumb_func_start sub_812EC20 sub_812EC20: @ 812EC20 push {lr} - ldr r0, _0812EC58 + ldr r0, =0x085a7e00 movs r1, 0xA8 movs r2, 0x50 movs r3, 0x6 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _0812EC5C + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -620909,65 +600716,62 @@ sub_812EC20: @ 812EC20 movs r3, 0x4 orrs r2, r3 strb r2, [r1, 0x5] - ldr r1, _0812EC60 + ldr r1, =0x0203ab34 ldr r1, [r1] adds r1, 0x41 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_0812EC58: .4byte 0x085a7e00 -_0812EC5C: .4byte 0x02020630 -_0812EC60: .4byte 0x0203ab34 + .pool thumb_func_end sub_812EC20 thumb_func_start sub_812EC64 sub_812EC64: @ 812EC64 - ldr r1, _0812EC6C + ldr r1, =0x02021bbe ldrh r1, [r1] strh r1, [r0, 0x26] bx lr .align 2, 0 -_0812EC6C: .4byte 0x02021bbe + .pool thumb_func_end sub_812EC64 thumb_func_start sub_812EC70 sub_812EC70: @ 812EC70 push {lr} - ldr r0, _0812EC8C + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x41 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812EC90 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles pop {r0} bx r0 .align 2, 0 -_0812EC8C: .4byte 0x0203ab34 -_0812EC90: .4byte 0x02020630 + .pool thumb_func_end sub_812EC70 thumb_func_start sub_812EC94 sub_812EC94: @ 812EC94 push {r4,r5,lr} sub sp, 0x8 - ldr r1, _0812ED0C + ldr r1, =0x085a7616 mov r0, sp movs r2, 0x8 bl memcpy movs r4, 0 _0812ECA4: - ldr r0, _0812ED10 + ldr r0, =0x02021bbc ldrh r0, [r0] movs r1, 0x50 subs r1, r0 lsls r1, 16 asrs r1, 16 - ldr r0, _0812ED14 + ldr r0, =0x085a7e18 movs r2, 0x44 movs r3, 0 bl obj_add_from_template_forward_search @@ -620976,7 +600780,7 @@ _0812ECA4: lsls r3, r0, 4 adds r3, r0 lsls r3, 2 - ldr r1, _0812ED18 + ldr r1, =0x02020630 adds r3, r1 ldrb r2, [r3, 0x5] movs r5, 0xD @@ -620998,7 +600802,7 @@ _0812ECA4: add r1, sp ldrh r1, [r1] strh r1, [r3, 0x2E] - ldr r1, _0812ED1C + ldr r1, =0x0203ab34 ldr r1, [r1] adds r1, 0x54 adds r1, r4 @@ -621013,11 +600817,7 @@ _0812ECA4: pop {r0} bx r0 .align 2, 0 -_0812ED0C: .4byte 0x085a7616 -_0812ED10: .4byte 0x02021bbc -_0812ED14: .4byte 0x085a7e18 -_0812ED18: .4byte 0x02020630 -_0812ED1C: .4byte 0x0203ab34 + .pool thumb_func_end sub_812EC94 thumb_func_start sub_812ED20 @@ -621082,7 +600882,7 @@ sub_812ED8C: @ 812ED8C push {r4,lr} movs r4, 0 _0812ED90: - ldr r0, _0812EDB8 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x54 adds r0, r4 @@ -621090,7 +600890,7 @@ _0812ED90: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812EDBC + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -621102,14 +600902,13 @@ _0812ED90: pop {r0} bx r0 .align 2, 0 -_0812EDB8: .4byte 0x0203ab34 -_0812EDBC: .4byte 0x02020630 + .pool thumb_func_end sub_812ED8C thumb_func_start sub_812EDC0 sub_812EDC0: @ 812EDC0 push {r4,lr} - ldr r0, _0812EE08 + ldr r0, =0x085a7e30 movs r1, 0xA8 movs r2, 0x3C movs r3, 0x8 @@ -621120,7 +600919,7 @@ sub_812EDC0: @ 812EDC0 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _0812EE0C + ldr r1, =0x02020630 adds r0, r1 ldrb r2, [r0, 0x5] movs r1, 0xD @@ -621134,7 +600933,7 @@ sub_812EDC0: @ 812EDC0 orrs r1, r2 strb r1, [r0, 0x1] bl obj_alloc_rotscale_entry - ldr r0, _0812EE10 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x43 strb r4, [r0] @@ -621142,9 +600941,7 @@ sub_812EDC0: @ 812EDC0 pop {r0} bx r0 .align 2, 0 -_0812EE08: .4byte 0x085a7e30 -_0812EE0C: .4byte 0x02020630 -_0812EE10: .4byte 0x0203ab34 + .pool thumb_func_end sub_812EDC0 thumb_func_start sub_812EE14 @@ -621229,8 +601026,8 @@ _0812EE90: thumb_func_start sub_812EEA8 sub_812EEA8: @ 812EEA8 - ldr r2, _0812EEC4 - ldr r0, _0812EEC8 + ldr r2, =0x02020630 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x43 ldrb r1, [r0] @@ -621243,21 +601040,20 @@ sub_812EEA8: @ 812EEA8 lsrs r0, 24 bx lr .align 2, 0 -_0812EEC4: .4byte 0x02020630 -_0812EEC8: .4byte 0x0203ab34 + .pool thumb_func_end sub_812EEA8 thumb_func_start sub_812EECC sub_812EECC: @ 812EECC push {r4,lr} - ldr r0, _0812EEF8 + ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x43 ldrb r0, [r0] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0812EEFC + ldr r0, =0x02020630 adds r4, r0 ldrb r0, [r4, 0x3] lsls r0, 26 @@ -621269,8 +601065,7 @@ sub_812EECC: @ 812EECC pop {r0} bx r0 .align 2, 0 -_0812EEF8: .4byte 0x0203ab34 -_0812EEFC: .4byte 0x02020630 + .pool thumb_func_end sub_812EECC thumb_func_start sub_812EF00 @@ -621278,7 +601073,7 @@ sub_812EF00: @ 812EF00 push {r4,lr} adds r3, r0, 0 adds r2, r1, 0 - ldr r0, _0812EF4C + ldr r0, =0x085a7f98 lsls r3, 16 asrs r3, 16 lsls r2, 16 @@ -621292,7 +601087,7 @@ sub_812EF00: @ 812EF00 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _0812EF50 + ldr r1, =0x02020630 adds r0, r1 ldrb r2, [r0, 0x5] movs r1, 0xD @@ -621311,8 +601106,7 @@ sub_812EF00: @ 812EF00 pop {r1} bx r1 .align 2, 0 -_0812EF4C: .4byte 0x085a7f98 -_0812EF50: .4byte 0x02020630 + .pool thumb_func_end sub_812EF00 thumb_func_start sub_812EF54 @@ -621340,7 +601134,7 @@ sub_812EF6C: @ 812EF6C lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0812EF94 + ldr r0, =0x02020630 adds r4, r0 ldrb r0, [r4, 0x3] lsls r0, 26 @@ -621352,7 +601146,7 @@ sub_812EF6C: @ 812EF6C pop {r0} bx r0 .align 2, 0 -_0812EF94: .4byte 0x02020630 + .pool thumb_func_end sub_812EF6C thumb_func_start sub_812EF98 @@ -621362,11 +601156,11 @@ sub_812EF98: @ 812EF98 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, _0812EFD4 + ldr r3, =0x085a78c8 lsrs r1, 22 adds r3, r1, r3 ldr r5, [r3] - ldr r3, _0812EFD8 + ldr r3, =0x085a783a adds r4, r1, r3 movs r6, 0 ldrsh r4, [r4, r6] @@ -621387,8 +601181,7 @@ sub_812EF98: @ 812EF98 pop {r1} bx r1 .align 2, 0 -_0812EFD4: .4byte 0x085a78c8 -_0812EFD8: .4byte 0x085a783a + .pool thumb_func_end sub_812EF98 thumb_func_start sub_812EFDC @@ -621407,7 +601200,7 @@ sub_812EFDC: @ 812EFDC lsls r5, 16 lsrs r5, 16 mov r9, r5 - ldr r0, _0812F068 + ldr r0, =0x085a8264 lsrs r4, 22 adds r0, r4, r0 mov r3, sp @@ -621416,7 +601209,7 @@ sub_812EFDC: @ 812EFDC stm r3!, {r5-r7} ldm r0!, {r5-r7} stm r3!, {r5-r7} - ldr r0, _0812F06C + ldr r0, =0x03001188 adds r0, r4, r0 ldr r0, [r0] str r0, [sp, 0xC] @@ -621433,7 +601226,7 @@ sub_812EFDC: @ 812EFDC lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _0812F070 + ldr r1, =0x02020630 adds r2, r0, r1 ldrb r0, [r2, 0x5] movs r1, 0xC @@ -621445,7 +601238,7 @@ sub_812EFDC: @ 812EFDC strh r5, [r2, 0x3A] movs r0, 0x1 strh r0, [r2, 0x3C] - ldr r0, _0812F074 + ldr r0, =0x085a82cc adds r4, r0 ldr r1, [r4] cmp r1, 0 @@ -621462,10 +601255,7 @@ _0812F056: pop {r1} bx r1 .align 2, 0 -_0812F068: .4byte 0x085a8264 -_0812F06C: .4byte 0x03001188 -_0812F070: .4byte 0x02020630 -_0812F074: .4byte 0x085a82cc + .pool thumb_func_end sub_812EFDC thumb_func_start sub_812F078 @@ -621480,12 +601270,12 @@ sub_812F080: @ 812F080 push {r4,r5,lr} sub sp, 0x10 adds r4, r0, 0 - ldr r1, _0812F0FC + ldr r1, =0x085a761e mov r0, sp movs r2, 0x8 bl memcpy add r5, sp, 0x8 - ldr r1, _0812F100 + ldr r1, =0x085a7626 adds r0, r5, 0 movs r2, 0x8 bl memcpy @@ -621539,8 +601329,7 @@ _0812F0F2: pop {r0} bx r0 .align 2, 0 -_0812F0FC: .4byte 0x085a761e -_0812F100: .4byte 0x085a7626 + .pool thumb_func_end sub_812F080 thumb_func_start sub_812F104 @@ -621631,7 +601420,7 @@ _0812F194: adds r0, 0x4 strh r0, [r2, 0x20] lsls r0, 16 - ldr r1, _0812F1AC + ldr r1, =0x010f0000 cmp r0, r1 ble _0812F1B4 _0812F1A2: @@ -621640,7 +601429,7 @@ _0812F1A2: strh r0, [r2, 0x2E] b _0812F1B4 .align 2, 0 -_0812F1AC: .4byte 0x010f0000 + .pool _0812F1B0: movs r0, 0 strh r0, [r2, 0x3C] @@ -621718,12 +601507,12 @@ sub_812F21C: @ 812F21C cmp r0, 0x5 bhi _0812F2C6 lsls r0, 2 - ldr r1, _0812F234 + ldr r1, =_0812F238 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0812F234: .4byte _0812F238 + .pool .align 2, 0 _0812F238: .4byte _0812F250 @@ -621733,7 +601522,7 @@ _0812F238: .4byte _0812F2AC .4byte _0812F2C2 _0812F250: - ldr r0, _0812F284 + ldr r0, =0x0203ab34 ldr r0, [r0] ldrb r1, [r0, 0xA] subs r1, 0x1 @@ -621759,7 +601548,7 @@ _0812F268: strh r0, [r4, 0x30] b _0812F2C6 .align 2, 0 -_0812F284: .4byte 0x0203ab34 + .pool _0812F288: ldrh r0, [r4, 0x20] adds r0, 0x4 @@ -622040,7 +601829,7 @@ sub_812F470: @ 812F470 ldrsh r0, [r5, r1] cmp r0, 0x2 bgt _0812F4C0 - ldr r1, _0812F4BC + ldr r1, =0x085a8510 lsls r0, 2 adds r0, r1 ldr r4, [r0] @@ -622070,9 +601859,9 @@ sub_812F470: @ 812F470 strh r0, [r5, 0x32] b _0812F4FC .align 2, 0 -_0812F4BC: .4byte 0x085a8510 + .pool _0812F4C0: - ldr r1, _0812F510 + ldr r1, =0x085a8510 movs r2, 0x30 ldrsh r0, [r5, r2] lsls r0, 2 @@ -622110,7 +601899,7 @@ _0812F4FC: pop {r0} bx r0 .align 2, 0 -_0812F510: .4byte 0x085a8510 + .pool thumb_func_end sub_812F470 thumb_func_start sub_812F514 @@ -622118,17 +601907,17 @@ sub_812F514: @ 812F514 push {r4-r6,lr} sub sp, 0x30 adds r4, r0, 0 - ldr r1, _0812F550 + ldr r1, =0x085a762e mov r0, sp movs r2, 0x10 bl memcpy add r6, sp, 0x10 - ldr r1, _0812F554 + ldr r1, =0x085a763e adds r0, r6, 0 movs r2, 0x10 bl memcpy add r5, sp, 0x20 - ldr r1, _0812F558 + ldr r1, =0x085a764e adds r0, r5, 0 movs r2, 0x10 bl memcpy @@ -622142,9 +601931,7 @@ sub_812F514: @ 812F514 beq _0812F562 b _0812F5D8 .align 2, 0 -_0812F550: .4byte 0x085a762e -_0812F554: .4byte 0x085a763e -_0812F558: .4byte 0x085a764e + .pool _0812F55C: cmp r0, 0x2 beq _0812F5A0 @@ -622230,7 +602017,7 @@ sub_812F5E0: @ 812F5E0 push {r4,lr} sub sp, 0x10 adds r4, r0, 0 - ldr r1, _0812F644 + ldr r1, =0x085a765e mov r0, sp movs r2, 0x10 bl memcpy @@ -622277,7 +602064,7 @@ _0812F63C: pop {r0} bx r0 .align 2, 0 -_0812F644: .4byte 0x085a765e + .pool thumb_func_end sub_812F5E0 thumb_func_start sub_812F648 @@ -622301,7 +602088,7 @@ _0812F660: beq _0812F71C b _0812F76C _0812F66A: - ldr r0, _0812F6D8 + ldr r0, =0x0203ab34 ldr r2, [r0] adds r1, r2, 0 adds r1, 0x5C @@ -622311,7 +602098,7 @@ _0812F66A: movs r0, 0x3F strh r0, [r1] subs r1, 0x4 - ldr r0, _0812F6DC + ldr r0, =0x00002088 strh r0, [r1] adds r2, r5, 0 adds r2, 0x3E @@ -622345,7 +602132,7 @@ _0812F6B0: movs r0, 0xD0 strh r0, [r5, 0x34] _0812F6BC: - ldr r0, _0812F6D8 + ldr r0, =0x0203ab34 ldr r2, [r0] ldrh r0, [r5, 0x32] lsls r0, 8 @@ -622360,16 +602147,15 @@ _0812F6BC: ble _0812F76C b _0812F75E .align 2, 0 -_0812F6D8: .4byte 0x0203ab34 -_0812F6DC: .4byte 0x00002088 + .pool _0812F6E0: - ldr r6, _0812F774 + ldr r6, =0x0203ab34 ldr r0, [r6] movs r1, 0x12 ldrsh r0, [r0, r1] cmp r0, 0 beq _0812F76C - ldr r1, _0812F778 + ldr r1, =nullsub_12 + 1 movs r4, 0 str r4, [sp] movs r0, 0x5 @@ -622379,7 +602165,7 @@ _0812F6E0: ldr r2, [r6] adds r1, r2, 0 adds r1, 0x58 - ldr r0, _0812F77C + ldr r0, =0x0000c0e0 strh r0, [r1] adds r1, 0x2 movs r0, 0xD1 @@ -622415,7 +602201,7 @@ _0812F738: movs r0, 0xD0 strh r0, [r5, 0x34] _0812F744: - ldr r0, _0812F774 + ldr r0, =0x0203ab34 ldr r2, [r0] ldrh r0, [r5, 0x32] lsls r0, 8 @@ -622442,9 +602228,7 @@ _0812F76C: pop {r0} bx r0 .align 2, 0 -_0812F774: .4byte 0x0203ab34 -_0812F778: .4byte nullsub_12 + 1 -_0812F77C: .4byte 0x0000c0e0 + .pool thumb_func_end sub_812F648 thumb_func_start nullsub_101 @@ -622465,7 +602249,7 @@ sub_812F784: @ 812F784 thumb_func_start sub_812F794 sub_812F794: @ 812F794 push {r4,lr} - ldr r0, _0812F7BC + ldr r0, =0x085a8520 ldr r4, [r0] movs r0, 0x6 bl gpu_pal_tags_index_of @@ -622483,12 +602267,12 @@ sub_812F794: @ 812F794 pop {r0} bx r0 .align 2, 0 -_0812F7BC: .4byte 0x085a8520 + .pool thumb_func_end sub_812F794 thumb_func_start sub_812F7C0 sub_812F7C0: @ 812F7C0 - ldr r0, _0812F7E0 + ldr r0, =0x0203ab34 ldr r2, [r0] adds r1, r2, 0 adds r1, 0x58 @@ -622505,35 +602289,35 @@ sub_812F7C0: @ 812F7C0 strh r1, [r0] bx lr .align 2, 0 -_0812F7E0: .4byte 0x0203ab34 + .pool thumb_func_end sub_812F7C0 thumb_func_start sub_812F7E4 sub_812F7E4: @ 812F7E4 push {r4-r6,lr} bl sub_812F8A0 - ldr r4, _0812F884 + ldr r4, =0x0203aad4 movs r0, 0xC8 lsls r0, 6 bl malloc adds r1, r0, 0 str r1, [r4] - ldr r0, _0812F888 + ldr r0, =0x08dd0050 bl call_LZZUnCompWram - ldr r4, _0812F88C + ldr r4, =0x0203aad8 movs r0, 0xD8 lsls r0, 6 bl malloc adds r1, r0, 0 str r1, [r4] - ldr r0, _0812F890 + ldr r0, =0x085a858c bl call_LZZUnCompWram - ldr r4, _0812F894 + ldr r4, =0x0203ab30 movs r0, 0xB0 bl malloc_and_clear str r0, [r4] movs r3, 0 - ldr r5, _0812F898 + ldr r5, =0x085a8334 adds r6, r4, 0 _0812F822: ldr r2, [r4] @@ -622554,7 +602338,7 @@ _0812F822: ldr r3, [r6] adds r2, r3, 0 adds r2, 0x88 - ldr r0, _0812F884 + ldr r0, =0x0203aad4 ldr r1, [r0] movs r4, 0xA0 lsls r4, 4 @@ -622578,29 +602362,23 @@ _0812F822: str r1, [r0] adds r0, r3, 0 bl gpu_tile_obj_alloc_and_load_multiple - ldr r0, _0812F89C + ldr r0, =0x085a8544 bl gpu_pal_obj_alloc_and_load_multiple pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0812F884: .4byte 0x0203aad4 -_0812F888: .4byte 0x08dd0050 -_0812F88C: .4byte 0x0203aad8 -_0812F890: .4byte 0x085a858c -_0812F894: .4byte 0x0203ab30 -_0812F898: .4byte 0x085a8334 -_0812F89C: .4byte 0x085a8544 + .pool thumb_func_end sub_812F7E4 thumb_func_start sub_812F8A0 sub_812F8A0: @ 812F8A0 push {r4-r6,lr} - ldr r5, _0812F8FC + ldr r5, =0x0203ab2c movs r0, 0x8 bl malloc_and_clear str r0, [r5] - ldr r4, _0812F900 + ldr r4, =0x0203aae0 movs r0, 0x80 lsls r0, 6 bl malloc_and_clear @@ -622608,7 +602386,7 @@ sub_812F8A0: @ 812F8A0 adds r3, r0, 0 movs r1, 0 adds r6, r4, 0 - ldr r0, _0812F904 + ldr r0, =0x085a83e4 ldr r4, [r0] _0812F8C2: movs r2, 0 @@ -622640,33 +602418,31 @@ _0812F8C6: pop {r0} bx r0 .align 2, 0 -_0812F8FC: .4byte 0x0203ab2c -_0812F900: .4byte 0x0203aae0 -_0812F904: .4byte 0x085a83e4 + .pool thumb_func_end sub_812F8A0 thumb_func_start sub_812F908 sub_812F908: @ 812F908 push {r4,r5,lr} - ldr r4, _0812F948 + ldr r4, =0x0203aac8 movs r5, 0x88 lsls r5, 6 adds r0, r5, 0 bl malloc adds r1, r0, 0 str r1, [r4] - ldr r0, _0812F94C + ldr r0, =0x08dcdb30 bl call_LZZUnCompWram ldr r1, [r4] movs r0, 0x2 adds r2, r5, 0 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r0, _0812F950 + ldr r0, =0x08dcda90 movs r1, 0 movs r2, 0xA0 bl gpu_pal_apply - ldr r0, _0812F954 + ldr r0, =0x085a8524 movs r1, 0xD0 movs r2, 0x20 bl gpu_pal_apply @@ -622674,10 +602450,7 @@ sub_812F908: @ 812F908 pop {r0} bx r0 .align 2, 0 -_0812F948: .4byte 0x0203aac8 -_0812F94C: .4byte 0x08dcdb30 -_0812F950: .4byte 0x08dcda90 -_0812F954: .4byte 0x085a8524 + .pool thumb_func_end sub_812F908 thumb_func_start sub_812F958 @@ -622692,7 +602465,7 @@ sub_812F958: @ 812F958 thumb_func_start sub_812F968 sub_812F968: @ 812F968 push {lr} - ldr r1, _0812F97C + ldr r1, =0x08dce770 movs r2, 0xA0 lsls r2, 3 movs r0, 0x2 @@ -622701,7 +602474,7 @@ sub_812F968: @ 812F968 pop {r0} bx r0 .align 2, 0 -_0812F97C: .4byte 0x08dce770 + .pool thumb_func_end sub_812F968 thumb_func_start sub_812F980 @@ -622711,7 +602484,7 @@ sub_812F980: @ 812F980 mov r6, r8 push {r6,r7} movs r1, 0x4 - ldr r0, _0812FA74 + ldr r0, =0x0203aad0 mov r8, r0 _0812F98E: movs r0, 0 @@ -622825,7 +602598,7 @@ _0812FA32: pop {r0} bx r0 .align 2, 0 -_0812FA74: .4byte 0x0203aad0 + .pool thumb_func_end sub_812F980 thumb_func_start sub_812FA78 @@ -622833,7 +602606,7 @@ sub_812FA78: @ 812FA78 push {r4-r6,lr} adds r4, r0, 0 ldr r5, [sp, 0x10] - ldr r6, _0812FAE8 + ldr r6, =0x0203aadc ldr r0, [r6] strh r1, [r0] ldr r1, [r6] @@ -622852,7 +602625,7 @@ sub_812FA78: @ 812FA78 bl gpu_copy_bg_tile_map_to_vram ldr r1, [r6] adds r1, 0x2 - ldr r0, _0812FAEC + ldr r0, =0x000001e1 adds r3, r5, r0 lsls r3, 16 lsrs r3, 16 @@ -622871,7 +602644,7 @@ sub_812FA78: @ 812FA78 bl gpu_copy_bg_tile_map_to_vram ldr r1, [r6] adds r1, 0x6 - ldr r0, _0812FAF0 + ldr r0, =0x00000201 adds r5, r0 lsls r5, 16 lsrs r5, 16 @@ -622883,15 +602656,13 @@ sub_812FA78: @ 812FA78 pop {r0} bx r0 .align 2, 0 -_0812FAE8: .4byte 0x0203aadc -_0812FAEC: .4byte 0x000001e1 -_0812FAF0: .4byte 0x00000201 + .pool thumb_func_end sub_812FA78 thumb_func_start sub_812FAF4 sub_812FAF4: @ 812FAF4 push {lr} - ldr r1, _0812FB10 + ldr r1, =0x08dcec70 movs r2, 0xA0 lsls r2, 3 movs r0, 0x2 @@ -622902,61 +602673,61 @@ sub_812FAF4: @ 812FAF4 pop {r0} bx r0 .align 2, 0 -_0812FB10: .4byte 0x08dcec70 + .pool thumb_func_end sub_812FAF4 thumb_func_start sub_812FB14 sub_812FB14: @ 812FB14 - ldr r1, _0812FB88 - ldr r0, _0812FB8C + ldr r1, =0x03001188 + ldr r0, =0x0203aaf4 ldr r0, [r0] str r0, [r1] - ldr r0, _0812FB90 + ldr r0, =0x0203aaf8 ldr r0, [r0] str r0, [r1, 0x4] - ldr r0, _0812FB94 + ldr r0, =0x0203aafc ldr r0, [r0] str r0, [r1, 0x8] - ldr r0, _0812FB98 + ldr r0, =0x0203ab04 ldr r0, [r0] str r0, [r1, 0xC] - ldr r0, _0812FB9C + ldr r0, =0x0203ab08 ldr r0, [r0] str r0, [r1, 0x10] - ldr r0, _0812FBA0 + ldr r0, =0x0203ab18 ldr r0, [r0] str r0, [r1, 0x14] - ldr r0, _0812FBA4 + ldr r0, =0x0203ab1c ldr r0, [r0] str r0, [r1, 0x18] - ldr r0, _0812FBA8 + ldr r0, =0x0203ab20 ldr r0, [r0] str r0, [r1, 0x1C] - ldr r0, _0812FBAC + ldr r0, =0x0203ab24 ldr r0, [r0] str r0, [r1, 0x20] - ldr r0, _0812FBB0 + ldr r0, =0x0203ab28 ldr r0, [r0] str r0, [r1, 0x24] - ldr r0, _0812FBB4 + ldr r0, =0x0203ab00 ldr r0, [r0] str r0, [r1, 0x28] str r0, [r1, 0x2C] str r0, [r1, 0x30] str r0, [r1, 0x34] - ldr r0, _0812FBB8 + ldr r0, =0x0203ab0c ldr r0, [r0] str r0, [r1, 0x38] str r0, [r1, 0x3C] str r0, [r1, 0x40] str r0, [r1, 0x44] str r0, [r1, 0x48] - ldr r0, _0812FBBC + ldr r0, =0x0203ab10 ldr r0, [r0] str r0, [r1, 0x4C] str r0, [r1, 0x50] str r0, [r1, 0x54] - ldr r0, _0812FBC0 + ldr r0, =0x0203ab14 ldr r0, [r0] str r0, [r1, 0x58] str r0, [r1, 0x5C] @@ -622965,21 +602736,7 @@ sub_812FB14: @ 812FB14 str r0, [r1, 0x64] bx lr .align 2, 0 -_0812FB88: .4byte 0x03001188 -_0812FB8C: .4byte 0x0203aaf4 -_0812FB90: .4byte 0x0203aaf8 -_0812FB94: .4byte 0x0203aafc -_0812FB98: .4byte 0x0203ab04 -_0812FB9C: .4byte 0x0203ab08 -_0812FBA0: .4byte 0x0203ab18 -_0812FBA4: .4byte 0x0203ab1c -_0812FBA8: .4byte 0x0203ab20 -_0812FBAC: .4byte 0x0203ab24 -_0812FBB0: .4byte 0x0203ab28 -_0812FBB4: .4byte 0x0203ab00 -_0812FBB8: .4byte 0x0203ab0c -_0812FBBC: .4byte 0x0203ab10 -_0812FBC0: .4byte 0x0203ab14 + .pool thumb_func_end sub_812FB14 thumb_func_start sub_812FBC4 @@ -622987,17 +602744,17 @@ sub_812FBC4: @ 812FBC4 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r4, _0812FD6C + ldr r4, =0x0203aaf4 movs r0, 0x8 bl malloc_and_clear str r0, [r4] - ldr r6, _0812FD70 + ldr r6, =0x0203aad4 ldr r1, [r6] str r1, [r0] movs r5, 0xC0 lsls r5, 3 strh r5, [r0, 0x4] - ldr r4, _0812FD74 + ldr r4, =0x0203aaf8 movs r0, 0x8 bl malloc_and_clear str r0, [r4] @@ -623009,7 +602766,7 @@ sub_812FBC4: @ 812FBC4 mov r8, r1 mov r2, r8 strh r2, [r0, 0x4] - ldr r4, _0812FD78 + ldr r4, =0x0203aafc movs r0, 0x8 bl malloc_and_clear str r0, [r4] @@ -623020,7 +602777,7 @@ sub_812FBC4: @ 812FBC4 str r1, [r0] mov r4, r8 strh r4, [r0, 0x4] - ldr r4, _0812FD7C + ldr r4, =0x0203ab00 movs r0, 0x8 bl malloc_and_clear str r0, [r4] @@ -623031,7 +602788,7 @@ sub_812FBC4: @ 812FBC4 str r1, [r0] mov r3, r8 strh r3, [r0, 0x4] - ldr r4, _0812FD80 + ldr r4, =0x0203ab04 movs r0, 0x8 bl malloc_and_clear str r0, [r4] @@ -623043,7 +602800,7 @@ sub_812FBC4: @ 812FBC4 movs r5, 0xC0 lsls r5, 2 strh r5, [r0, 0x4] - ldr r4, _0812FD84 + ldr r4, =0x0203ab08 movs r0, 0x8 bl malloc_and_clear str r0, [r4] @@ -623055,7 +602812,7 @@ sub_812FBC4: @ 812FBC4 movs r1, 0x80 lsls r1, 3 strh r1, [r0, 0x4] - ldr r4, _0812FD88 + ldr r4, =0x0203ab0c movs r0, 0x8 bl malloc_and_clear str r0, [r4] @@ -623066,7 +602823,7 @@ sub_812FBC4: @ 812FBC4 str r1, [r0] mov r4, r8 strh r4, [r0, 0x4] - ldr r4, _0812FD8C + ldr r4, =0x0203ab10 movs r0, 0x8 bl malloc_and_clear str r0, [r4] @@ -623076,7 +602833,7 @@ sub_812FBC4: @ 812FBC4 adds r1, r2 str r1, [r0] strh r5, [r0, 0x4] - ldr r4, _0812FD90 + ldr r4, =0x0203ab14 movs r0, 0x8 bl malloc_and_clear str r0, [r4] @@ -623086,7 +602843,7 @@ sub_812FBC4: @ 812FBC4 adds r1, r3 str r1, [r0] strh r5, [r0, 0x4] - ldr r4, _0812FD94 + ldr r4, =0x0203ab18 movs r0, 0x10 bl malloc_and_clear str r0, [r4] @@ -623102,7 +602859,7 @@ sub_812FBC4: @ 812FBC4 adds r1, r3 str r1, [r0, 0x8] strh r2, [r0, 0xC] - ldr r4, _0812FD98 + ldr r4, =0x0203ab1c movs r0, 0x8 bl malloc_and_clear str r0, [r4] @@ -623114,7 +602871,7 @@ sub_812FBC4: @ 812FBC4 movs r1, 0xA0 lsls r1, 2 strh r1, [r0, 0x4] - ldr r4, _0812FD9C + ldr r4, =0x0203ab20 movs r0, 0x28 bl malloc_and_clear str r0, [r4] @@ -623143,7 +602900,7 @@ sub_812FBC4: @ 812FBC4 adds r2, r1 str r2, [r0, 0x20] strh r3, [r0, 0x24] - ldr r4, _0812FDA0 + ldr r4, =0x0203ab24 movs r0, 0x10 bl malloc_and_clear str r0, [r4] @@ -623160,7 +602917,7 @@ sub_812FBC4: @ 812FBC4 adds r2, r4 str r2, [r0, 0x8] strh r1, [r0, 0xC] - ldr r4, _0812FDA4 + ldr r4, =0x0203ab28 movs r0, 0x10 bl malloc_and_clear str r0, [r4] @@ -623183,35 +602940,21 @@ sub_812FBC4: @ 812FBC4 pop {r0} bx r0 .align 2, 0 -_0812FD6C: .4byte 0x0203aaf4 -_0812FD70: .4byte 0x0203aad4 -_0812FD74: .4byte 0x0203aaf8 -_0812FD78: .4byte 0x0203aafc -_0812FD7C: .4byte 0x0203ab00 -_0812FD80: .4byte 0x0203ab04 -_0812FD84: .4byte 0x0203ab08 -_0812FD88: .4byte 0x0203ab0c -_0812FD8C: .4byte 0x0203ab10 -_0812FD90: .4byte 0x0203ab14 -_0812FD94: .4byte 0x0203ab18 -_0812FD98: .4byte 0x0203ab1c -_0812FD9C: .4byte 0x0203ab20 -_0812FDA0: .4byte 0x0203ab24 -_0812FDA4: .4byte 0x0203ab28 + .pool thumb_func_end sub_812FBC4 thumb_func_start sub_812FDA8 sub_812FDA8: @ 812FDA8 push {r4-r7,lr} - ldr r3, _0812FDD8 - ldr r4, _0812FDDC - ldr r1, _0812FDE0 + ldr r3, =0x02039f5d + ldr r4, =0x02039f5c + ldr r1, =0x03005d8c ldr r2, [r1] subs r0, 0x1 lsls r1, r0, 5 adds r2, r1 - ldr r1, _0812FDE4 - ldr r5, _0812FDE8 + ldr r1, =0x02039f3c + ldr r5, =0x00002e90 adds r2, r5 ldm r2!, {r5-r7} stm r1!, {r5-r7} @@ -623226,11 +602969,7 @@ sub_812FDA8: @ 812FDA8 pop {r0} bx r0 .align 2, 0 -_0812FDD8: .4byte 0x02039f5d -_0812FDDC: .4byte 0x02039f5c -_0812FDE0: .4byte 0x03005d8c -_0812FDE4: .4byte 0x02039f3c -_0812FDE8: .4byte 0x00002e90 + .pool thumb_func_end sub_812FDA8 thumb_func_start sub_812FDEC @@ -623254,19 +602993,19 @@ sub_812FDF8: @ 812FDF8 thumb_func_start sub_812FE0C sub_812FE0C: @ 812FE0C push {r4,r5,lr} - ldr r0, _0812FE48 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 - ldr r4, _0812FE4C + ldr r4, =0x030061c4 ldr r0, [r4] bl free movs r5, 0 str r5, [r4] - ldr r4, _0812FE50 + ldr r4, =0x03006190 ldr r0, [r4] bl free str r5, [r4] - ldr r0, _0812FE54 + ldr r0, =0x030011f7 ldrb r0, [r0] bl Window_Remove movs r0, 0x1 @@ -623277,17 +603016,14 @@ sub_812FE0C: @ 812FE0C pop {r0} bx r0 .align 2, 0 -_0812FE48: .4byte 0x030022c0 -_0812FE4C: .4byte 0x030061c4 -_0812FE50: .4byte 0x03006190 -_0812FE54: .4byte 0x030011f7 + .pool thumb_func_end sub_812FE0C thumb_func_start sub_812FE58 sub_812FE58: @ 812FE58 push {r4-r7,lr} sub sp, 0x4 - ldr r1, _0812FE78 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -623298,13 +603034,12 @@ sub_812FE58: @ 812FE58 b _0812FFA0 _0812FE6E: lsls r0, 2 - ldr r1, _0812FE7C + ldr r1, =_0812FE80 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0812FE78: .4byte 0x030022c0 -_0812FE7C: .4byte _0812FE80 + .pool .align 2, 0 _0812FE80: .4byte _0812FE94 @@ -623317,21 +603052,19 @@ _0812FE94: movs r0, 0 bl SetVBlankCallback bl init_uns_table_pokemon_copy - ldr r1, _0812FEBC - ldr r0, _0812FEC0 + ldr r1, =0x030061c0 + ldr r0, =0x02039f3c str r0, [r1] movs r0, 0x1 bl sub_8130238 bl sub_81301EC - ldr r1, _0812FEC4 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0812FF3E .align 2, 0 -_0812FEBC: .4byte 0x030061c0 -_0812FEC0: .4byte 0x02039f3c -_0812FEC4: .4byte 0x030022c0 + .pool _0812FEC8: bl sub_80A1A74 movs r2, 0xC0 @@ -623339,10 +603072,10 @@ _0812FEC8: movs r3, 0xC0 lsls r3, 9 movs r5, 0 - ldr r1, _0812FF0C + ldr r1, =0x040000d4 movs r4, 0x80 lsls r4, 5 - ldr r6, _0812FF10 + ldr r6, =0x85000400 movs r7, 0x85 lsls r7, 24 _0812FEE2: @@ -623367,8 +603100,7 @@ _0812FEE2: bl reset_all_obj_data b _0812FF36 .align 2, 0 -_0812FF0C: .4byte 0x040000d4 -_0812FF10: .4byte 0x85000400 + .pool _0812FF14: ldrh r0, [r4, 0x20] bl SeedRng @@ -623379,13 +603111,13 @@ _0812FF14: adds r1, r4, r0 b _0812FF3E _0812FF2A: - ldr r0, _0812FF48 + ldr r0, =0x02039f5d ldrb r0, [r0] - ldr r1, _0812FF4C + ldr r1, =0x02039f5c ldrb r1, [r1] bl sub_8130884 _0812FF36: - ldr r1, _0812FF50 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -623395,16 +603127,14 @@ _0812FF3E: strb r0, [r1] b _0812FFA0 .align 2, 0 -_0812FF48: .4byte 0x02039f5d -_0812FF4C: .4byte 0x02039f5c -_0812FF50: .4byte 0x030022c0 + .pool _0812FF54: - ldr r0, _0812FFA8 + ldr r0, =0x02039f5d ldrb r0, [r0] - ldr r1, _0812FFAC + ldr r1, =0x02039f5c ldrb r1, [r1] bl sub_813010C - ldr r0, _0812FFB0 + ldr r0, =0x085b0838 movs r1, 0 movs r2, 0x2 bl gpu_pal_apply @@ -623412,24 +603142,24 @@ _0812FF54: lsls r1, 19 movs r4, 0 str r4, [sp] - ldr r0, _0812FFB4 + ldr r0, =0x040000d4 mov r2, sp str r2, [r0] str r1, [r0, 0x4] - ldr r1, _0812FFB8 + ldr r1, =0x85000100 str r1, [r0, 0x8] ldr r0, [r0, 0x8] movs r0, 0x2 bl sub_80A2390 - ldr r0, _0812FFBC + ldr r0, =sub_81302D0 + 1 bl SetVBlankCallback - ldr r0, _0812FFC0 + ldr r0, =0x030011f0 strb r4, [r0] movs r1, 0x9A lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _0812FFC4 + ldr r0, =sub_812FDF8 + 1 bl set_callback2 _0812FFA0: add sp, 0x4 @@ -623437,21 +603167,14 @@ _0812FFA0: pop {r0} bx r0 .align 2, 0 -_0812FFA8: .4byte 0x02039f5d -_0812FFAC: .4byte 0x02039f5c -_0812FFB0: .4byte 0x085b0838 -_0812FFB4: .4byte 0x040000d4 -_0812FFB8: .4byte 0x85000100 -_0812FFBC: .4byte sub_81302D0 + 1 -_0812FFC0: .4byte 0x030011f0 -_0812FFC4: .4byte sub_812FDF8 + 1 + .pool thumb_func_end sub_812FE58 thumb_func_start sub_812FFC8 sub_812FFC8: @ 812FFC8 push {lr} sub sp, 0x4 - ldr r3, _0812FFE0 + ldr r3, =0x030011f0 ldrb r1, [r3] cmp r1, 0x1 beq _0813001C @@ -623461,13 +603184,13 @@ sub_812FFC8: @ 812FFC8 beq _0812FFEA b _08130082 .align 2, 0 -_0812FFE0: .4byte 0x030011f0 + .pool _0812FFE4: cmp r1, 0x2 beq _0813005C b _08130082 _0812FFEA: - ldr r0, _08130010 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -623476,22 +603199,20 @@ _0812FFEA: movs r0, 0x1 strb r0, [r3] _0812FFFA: - ldr r0, _08130014 + ldr r0, =0x030011f6 ldrb r0, [r0] cmp r0, 0 beq _08130082 - ldr r1, _08130018 + ldr r1, =0x030011f4 ldrh r0, [r1] cmp r0, 0 beq _08130082 subs r0, 0x1 b _08130080 .align 2, 0 -_08130010: .4byte 0x02037fd4 -_08130014: .4byte 0x030011f6 -_08130018: .4byte 0x030011f4 + .pool _0813001C: - ldr r0, _08130050 + ldr r0, =0x030022c0 ldrh r2, [r0, 0x2E] ands r1, r2 cmp r1, 0 @@ -623510,32 +603231,30 @@ _0813002E: movs r3, 0x10 bl sub_80A1AD4 _08130040: - ldr r0, _08130054 + ldr r0, =0x030011f6 ldrb r0, [r0] cmp r0, 0 beq _08130082 - ldr r1, _08130058 + ldr r1, =0x030011f4 movs r0, 0 b _08130080 .align 2, 0 -_08130050: .4byte 0x030022c0 -_08130054: .4byte 0x030011f6 -_08130058: .4byte 0x030011f4 + .pool _0813005C: - ldr r0, _08130088 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0813006E - ldr r0, _0813008C + ldr r0, =sub_812FE0C + 1 bl set_callback2 _0813006E: - ldr r0, _08130090 + ldr r0, =0x030011f6 ldrb r0, [r0] cmp r0, 0 beq _08130082 - ldr r1, _08130094 + ldr r1, =0x030011f4 ldrh r0, [r1] cmp r0, 0x1D bhi _08130082 @@ -623547,10 +603266,7 @@ _08130082: pop {r0} bx r0 .align 2, 0 -_08130088: .4byte 0x02037fd4 -_0813008C: .4byte sub_812FE0C + 1 -_08130090: .4byte 0x030011f6 -_08130094: .4byte 0x030011f4 + .pool thumb_func_end sub_812FFC8 thumb_func_start sub_8130098 @@ -623558,7 +603274,7 @@ sub_8130098: @ 8130098 push {r4,lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08130100 + ldr r1, =0x085b07e8 movs r0, 0 movs r2, 0x1 bl bg_vram_setup @@ -623576,8 +603292,8 @@ sub_8130098: @ 8130098 adds r1, r0, 0 movs r0, 0x1 bl bg_set_tilemap - ldr r4, _08130104 - ldr r0, _08130108 + ldr r4, =0x030011f7 + ldr r0, =0x085b07ec bl Window_AddFromTemplate strb r0, [r4] bl TextBox_ResetSomeField @@ -623595,9 +603311,7 @@ sub_8130098: @ 8130098 pop {r0} bx r0 .align 2, 0 -_08130100: .4byte 0x085b07e8 -_08130104: .4byte 0x030011f7 -_08130108: .4byte 0x085b07ec + .pool thumb_func_end sub_8130098 thumb_func_start sub_813010C @@ -623610,19 +603324,19 @@ sub_813010C: @ 813010C lsrs r1, 24 cmp r1, 0x1 beq _081301D4 - ldr r6, _08130170 + ldr r6, =0x030061c0 ldr r1, [r6] ldrb r5, [r1, 0xA] cmp r0, 0x7 bhi _08130190 - ldr r4, _08130174 + ldr r4, =0x02021cc4 adds r0, r4, 0 adds r1, r5, 0 bl sub_818E868 - ldr r1, _08130178 + ldr r1, =0x085e8d5e adds r0, r4, 0 bl gf_strcat - ldr r1, _0813017C + ldr r1, =0x085b07d4 ldr r0, [r6] ldrb r0, [r0, 0x1E] lsls r0, 2 @@ -623630,48 +603344,41 @@ sub_813010C: @ 813010C ldr r1, [r0] adds r0, r4, 0 bl gf_strcat - ldr r4, _08130180 + ldr r4, =0x02021dc4 ldr r1, [r6] adds r1, 0x16 adds r0, r4, 0 bl gf_strcpy adds r0, r4, 0 bl sub_81DB5AC - ldr r0, _08130184 + ldr r0, =0x02021ec4 ldr r1, [r6] adds r1, 0xB bl gf_strcpy - ldr r0, _08130188 - ldr r1, _0813018C + ldr r0, =0x02021fc4 + ldr r1, =0x0827ea0c bl ExpandTextCodes b _081301A6 .align 2, 0 -_08130170: .4byte 0x030061c0 -_08130174: .4byte 0x02021cc4 -_08130178: .4byte 0x085e8d5e -_0813017C: .4byte 0x085b07d4 -_08130180: .4byte 0x02021dc4 -_08130184: .4byte 0x02021ec4 -_08130188: .4byte 0x02021fc4 -_0813018C: .4byte 0x0827ea0c + .pool _08130190: - ldr r0, _081301DC + ldr r0, =0x02021cc4 adds r1, 0xB bl gf_strcpy - ldr r0, _081301E0 - ldr r2, _081301E4 + ldr r0, =0x02021fc4 + ldr r2, =0x085b07f4 lsls r1, r5, 2 adds r1, r2 ldr r1, [r1] bl ExpandTextCodes _081301A6: - ldr r4, _081301E0 + ldr r4, =0x02021fc4 movs r0, 0x1 adds r1, r4, 0 movs r2, 0xD0 bl sub_81DB35C adds r3, r0, 0 - ldr r0, _081301E8 + ldr r0, =0x030011f7 ldrb r0, [r0] lsls r3, 24 lsrs r3, 24 @@ -623691,10 +603398,7 @@ _081301D4: pop {r0} bx r0 .align 2, 0 -_081301DC: .4byte 0x02021cc4 -_081301E0: .4byte 0x02021fc4 -_081301E4: .4byte 0x085b07f4 -_081301E8: .4byte 0x030011f7 + .pool thumb_func_end sub_813010C thumb_func_start sub_81301EC @@ -623703,15 +603407,15 @@ sub_81301EC: @ 81301EC movs r0, 0 movs r1, 0 bl lcd_io_set - ldr r2, _0813022C + ldr r2, =0x04000200 ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 strh r0, [r2] - ldr r1, _08130230 + ldr r1, =0x00000c42 movs r0, 0x8 bl lcd_io_set - ldr r1, _08130234 + ldr r1, =0x00000a45 movs r0, 0xA bl lcd_io_set movs r0, 0x50 @@ -623726,9 +603430,7 @@ sub_81301EC: @ 81301EC pop {r0} bx r0 .align 2, 0 -_0813022C: .4byte 0x04000200 -_08130230: .4byte 0x00000c42 -_08130234: .4byte 0x00000a45 + .pool thumb_func_end sub_81301EC thumb_func_start sub_8130238 @@ -623738,40 +603440,36 @@ sub_8130238: @ 8130238 lsrs r1, r0, 24 cmp r1, 0 bne _0813025C - ldr r0, _08130250 + ldr r0, =0x030011f6 strb r1, [r0] - ldr r0, _08130254 + ldr r0, =0x030011f2 strh r1, [r0] - ldr r0, _08130258 + ldr r0, =0x030011f4 strh r1, [r0] b _0813026E .align 2, 0 -_08130250: .4byte 0x030011f6 -_08130254: .4byte 0x030011f2 -_08130258: .4byte 0x030011f4 + .pool _0813025C: - ldr r1, _08130274 + ldr r1, =0x030011f6 movs r0, 0x1 strb r0, [r1] - ldr r1, _08130278 + ldr r1, =0x030011f2 movs r0, 0xF strh r0, [r1] - ldr r1, _0813027C + ldr r1, =0x030011f4 movs r0, 0x1E strh r0, [r1] _0813026E: pop {r0} bx r0 .align 2, 0 -_08130274: .4byte 0x030011f6 -_08130278: .4byte 0x030011f2 -_0813027C: .4byte 0x030011f4 + .pool thumb_func_end sub_8130238 thumb_func_start sub_8130280 sub_8130280: @ 8130280 push {lr} - ldr r0, _08130294 + ldr r0, =0x030011f6 ldrb r0, [r0] cmp r0, 0 bne _08130298 @@ -623780,13 +603478,13 @@ sub_8130280: @ 8130280 bl lcd_io_set b _081302C0 .align 2, 0 -_08130294: .4byte 0x030011f6 + .pool _08130298: - ldr r1, _081302C4 + ldr r1, =0x00000a45 movs r0, 0xA bl lcd_io_set - ldr r1, _081302C8 - ldr r0, _081302CC + ldr r1, =0x030011f2 + ldr r0, =0x030011f4 ldrh r0, [r0] lsrs r0, 1 strh r0, [r1] @@ -623804,9 +603502,7 @@ _081302C0: pop {r0} bx r0 .align 2, 0 -_081302C4: .4byte 0x00000a45 -_081302C8: .4byte 0x030011f2 -_081302CC: .4byte 0x030011f4 + .pool thumb_func_end sub_8130280 thumb_func_start sub_81302D0 @@ -623828,21 +603524,21 @@ sub_81302E8: @ 81302E8 lsrs r5, r0, 16 lsls r4, 24 lsrs r4, 24 - ldr r6, _08130334 + ldr r6, =0x030061c0 ldr r0, [r6] ldr r1, [r0, 0x4] ldr r2, [r0] adds r0, r5, 0 bl species_and_otid_get_pal - ldr r7, _08130338 + ldr r7, =0x030061c4 ldr r1, [r7] bl call_LZZUnCompVram cmp r4, 0 bne _08130348 lsls r0, r5, 3 - ldr r1, _0813033C + ldr r1, =0x0830a18c adds r0, r1 - ldr r4, _08130340 + ldr r4, =0x020244d4 ldr r1, [r4] ldr r1, [r1, 0x8] ldr r2, [r6] @@ -623852,21 +603548,17 @@ sub_81302E8: @ 81302E8 ldr r0, [r4] ldr r0, [r0, 0x8] ldr r1, [r7] - ldr r2, _08130344 + ldr r2, =0x03006190 ldr r2, [r2] bl sub_8130380 b _0813036C .align 2, 0 -_08130334: .4byte 0x030061c0 -_08130338: .4byte 0x030061c4 -_0813033C: .4byte 0x0830a18c -_08130340: .4byte 0x020244d4 -_08130344: .4byte 0x03006190 + .pool _08130348: lsls r0, r5, 3 - ldr r1, _08130374 + ldr r1, =0x083028b8 adds r0, r1 - ldr r4, _08130378 + ldr r4, =0x020244d4 ldr r1, [r4] ldr r1, [r1, 0x4] ldr r2, [r6] @@ -623876,7 +603568,7 @@ _08130348: ldr r0, [r4] ldr r0, [r0, 0x4] ldr r1, [r7] - ldr r2, _0813037C + ldr r2, =0x03006190 ldr r2, [r2] bl sub_8130380 _0813036C: @@ -623884,9 +603576,7 @@ _0813036C: pop {r0} bx r0 .align 2, 0 -_08130374: .4byte 0x083028b8 -_08130378: .4byte 0x020244d4 -_0813037C: .4byte 0x03006190 + .pool thumb_func_end sub_81302E8 thumb_func_start sub_8130380 @@ -623997,7 +603687,7 @@ sub_8130430: @ 8130430 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r0, _0813046C + ldr r0, =0x085a989c movs r2, 0x80 lsls r2, 1 movs r1, 0 @@ -624006,7 +603696,7 @@ sub_8130430: @ 8130430 beq _0813044E b _081305A4 _0813044E: - ldr r0, _08130470 + ldr r0, =0x030061c0 ldr r0, [r0] ldrb r0, [r0, 0xA] movs r1, 0x3 @@ -624016,14 +603706,12 @@ _0813044E: cmp r0, 0x4 bhi _0813050C lsls r0, 2 - ldr r1, _08130474 + ldr r1, =_08130478 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813046C: .4byte 0x085a989c -_08130470: .4byte 0x030061c0 -_08130474: .4byte _08130478 + .pool .align 2, 0 _08130478: .4byte _0813048C @@ -624032,63 +603720,58 @@ _08130478: .4byte _081304D4 .4byte _081304F8 _0813048C: - ldr r0, _0813049C + ldr r0, =0x085a9a9c movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram - ldr r0, _081304A0 + ldr r0, =0x085ae974 b _081304E0 .align 2, 0 -_0813049C: .4byte 0x085a9a9c -_081304A0: .4byte 0x085ae974 + .pool _081304A4: - ldr r0, _081304B4 + ldr r0, =0x085aab20 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram - ldr r0, _081304B8 + ldr r0, =0x085aee80 b _081304E0 .align 2, 0 -_081304B4: .4byte 0x085aab20 -_081304B8: .4byte 0x085aee80 + .pool _081304BC: - ldr r0, _081304CC + ldr r0, =0x085ab750 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram - ldr r0, _081304D0 + ldr r0, =0x085af38c b _081304E0 .align 2, 0 -_081304CC: .4byte 0x085ab750 -_081304D0: .4byte 0x085af38c + .pool _081304D4: - ldr r0, _081304EC + ldr r0, =0x085ac288 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram - ldr r0, _081304F0 + ldr r0, =0x085af898 _081304E0: - ldr r1, _081304F4 + ldr r1, =0x03006190 ldr r1, [r1] bl RLUnCompWram b _0813050C .align 2, 0 -_081304EC: .4byte 0x085ac288 -_081304F0: .4byte 0x085af898 -_081304F4: .4byte 0x03006190 + .pool _081304F8: - ldr r0, _08130588 + ldr r0, =0x085ad240 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram - ldr r0, _0813058C - ldr r1, _08130590 + ldr r0, =0x085afda4 + ldr r1, =0x03006190 ldr r1, [r1] bl RLUnCompWram _0813050C: movs r1, 0 - ldr r5, _08130594 - ldr r0, _08130598 + ldr r5, =0x06006000 + ldr r0, =0x00001015 adds r4, r0, 0 _08130514: movs r3, 0 @@ -624109,9 +603792,9 @@ _08130518: cmp r1, 0x13 bls _08130514 movs r1, 0 - ldr r0, _0813059C + ldr r0, =0x0600608c mov r12, r0 - ldr r7, _08130590 + ldr r7, =0x03006190 _0813053C: movs r3, 0 adds r6, r1, 0x1 @@ -624138,8 +603821,8 @@ _08130544: cmp r1, 0x9 bls _0813053C movs r3, 0 - ldr r4, _081305A0 - ldr r2, _08130590 + ldr r4, =0x0600608e + ldr r2, =0x03006190 _08130570: lsls r1, r3, 1 adds r1, r4 @@ -624154,27 +603837,20 @@ _08130570: bls _08130570 b _08130676 .align 2, 0 -_08130588: .4byte 0x085ad240 -_0813058C: .4byte 0x085afda4 -_08130590: .4byte 0x03006190 -_08130594: .4byte 0x06006000 -_08130598: .4byte 0x00001015 -_0813059C: .4byte 0x0600608c -_081305A0: .4byte 0x0600608e + .pool _081305A4: cmp r5, 0x7 bhi _081305C0 - ldr r0, _081305B8 + ldr r0, =0x085ae370 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram - ldr r0, _081305BC + ldr r0, =0x085b02b0 b _08130650 .align 2, 0 -_081305B8: .4byte 0x085ae370 -_081305BC: .4byte 0x085b02b0 + .pool _081305C0: - ldr r0, _081305E0 + ldr r0, =0x030061c0 ldr r0, [r0] ldrb r0, [r0, 0xA] movs r1, 0x3 @@ -624184,13 +603860,12 @@ _081305C0: cmp r0, 0x4 bhi _08130676 lsls r0, 2 - ldr r1, _081305E4 + ldr r1, =_081305E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081305E0: .4byte 0x030061c0 -_081305E4: .4byte _081305E8 + .pool .align 2, 0 _081305E8: .4byte _081305FC @@ -624199,65 +603874,58 @@ _081305E8: .4byte _08130644 .4byte _08130664 _081305FC: - ldr r0, _0813060C + ldr r0, =0x085a9a9c movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram - ldr r0, _08130610 + ldr r0, =0x085ae974 b _08130650 .align 2, 0 -_0813060C: .4byte 0x085a9a9c -_08130610: .4byte 0x085ae974 + .pool _08130614: - ldr r0, _08130624 + ldr r0, =0x085aab20 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram - ldr r0, _08130628 + ldr r0, =0x085aee80 b _08130650 .align 2, 0 -_08130624: .4byte 0x085aab20 -_08130628: .4byte 0x085aee80 + .pool _0813062C: - ldr r0, _0813063C + ldr r0, =0x085ab750 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram - ldr r0, _08130640 + ldr r0, =0x085af38c b _08130650 .align 2, 0 -_0813063C: .4byte 0x085ab750 -_08130640: .4byte 0x085af38c + .pool _08130644: - ldr r0, _08130658 + ldr r0, =0x085ac288 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram - ldr r0, _0813065C + ldr r0, =0x085af898 _08130650: - ldr r1, _08130660 + ldr r1, =0x06006000 bl RLUnCompVram b _08130676 .align 2, 0 -_08130658: .4byte 0x085ac288 -_0813065C: .4byte 0x085af898 -_08130660: .4byte 0x06006000 + .pool _08130664: - ldr r0, _0813067C + ldr r0, =0x085ad240 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram - ldr r0, _08130680 - ldr r1, _08130684 + ldr r0, =0x085afda4 + ldr r1, =0x06006000 bl RLUnCompVram _08130676: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0813067C: .4byte 0x085ad240 -_08130680: .4byte 0x085afda4 -_08130684: .4byte 0x06006000 + .pool thumb_func_end sub_8130430 thumb_func_start sub_8130688 @@ -624265,18 +603933,18 @@ sub_8130688: @ 8130688 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _081306BC - ldr r1, _081306C0 + ldr r3, =0x030022c0 + ldr r1, =0x085b0830 ldr r2, [r1, 0x4] ldr r1, [r1] str r1, [r3, 0x38] str r2, [r3, 0x3C] ldrh r2, [r3, 0x3C] - ldr r1, _081306C4 + ldr r1, =0xfffffc00 ands r1, r2 strh r1, [r3, 0x3C] ldrh r1, [r3, 0x3A] - ldr r0, _081306C8 + ldr r0, =0xfffffe00 ands r0, r1 movs r1, 0x58 orrs r0, r1 @@ -624288,10 +603956,7 @@ sub_8130688: @ 8130688 pop {r0} bx r0 .align 2, 0 -_081306BC: .4byte 0x030022c0 -_081306C0: .4byte 0x085b0830 -_081306C4: .4byte 0xfffffc00 -_081306C8: .4byte 0xfffffe00 + .pool thumb_func_end sub_8130688 thumb_func_start sub_81306CC @@ -624301,14 +603966,14 @@ sub_81306CC: @ 81306CC lsrs r0, 24 cmp r0, 0x7 bhi _081306E4 - ldr r0, _081306E0 + ldr r0, =0x030061c0 ldr r0, [r0] ldrb r0, [r0, 0xA] b _081306F4 .align 2, 0 -_081306E0: .4byte 0x030061c0 + .pool _081306E4: - ldr r0, _08130704 + ldr r0, =0x030061c0 ldr r0, [r0] ldrb r0, [r0, 0xA] movs r1, 0x3 @@ -624319,13 +603984,12 @@ _081306F4: cmp r0, 0x4 bhi _08130732 lsls r0, 2 - ldr r1, _08130708 + ldr r1, =_0813070C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08130704: .4byte 0x030061c0 -_08130708: .4byte _0813070C + .pool .align 2, 0 _0813070C: .4byte _08130720 @@ -624355,12 +604019,12 @@ _08130732: thumb_func_start sub_8130738 sub_8130738: @ 8130738 push {r4,lr} - ldr r4, _08130758 + ldr r4, =0x030061c4 movs r0, 0x80 lsls r0, 2 bl malloc_and_clear str r0, [r4] - ldr r4, _0813075C + ldr r4, =0x03006190 movs r0, 0x80 lsls r0, 6 bl malloc_and_clear @@ -624369,8 +604033,7 @@ sub_8130738: @ 8130738 pop {r0} bx r0 .align 2, 0 -_08130758: .4byte 0x030061c4 -_0813075C: .4byte 0x03006190 + .pool thumb_func_end sub_8130738 thumb_func_start sub_8130760 @@ -624378,16 +604041,16 @@ sub_8130760: @ 8130760 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _081307A0 - ldr r0, _081307A4 + ldr r1, =0x030061a0 + ldr r0, =0x03006190 ldr r0, [r0] str r0, [r1, 0x4] - ldr r0, _081307A8 + ldr r0, =0x030061c4 ldr r0, [r0] str r0, [r1, 0x8] movs r2, 0 strb r2, [r1, 0x18] - ldr r0, _081307AC + ldr r0, =0x030061c0 ldr r0, [r0] ldrb r0, [r0] strb r0, [r1, 0x1F] @@ -624403,16 +604066,12 @@ sub_8130760: @ 8130760 cmp r0, 0x22 bhi _08130844 lsls r0, 2 - ldr r1, _081307B0 + ldr r1, =_081307B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081307A0: .4byte 0x030061a0 -_081307A4: .4byte 0x03006190 -_081307A8: .4byte 0x030061c4 -_081307AC: .4byte 0x030061c0 -_081307B0: .4byte _081307B4 + .pool .align 2, 0 _081307B4: .4byte _08130844 @@ -624460,7 +604119,7 @@ _08130846: movs r0, 0x2 strh r0, [r4, 0x16] strb r3, [r4] - ldr r0, _0813087C + ldr r0, =0x06010000 str r0, [r4, 0x10] adds r0, r4, 0 bl sub_8124F2C @@ -624468,7 +604127,7 @@ _08130846: bl sub_81261A4 adds r0, r4, 0 bl sub_8126058 - ldr r0, _08130880 + ldr r0, =0x030061c4 ldr r0, [r0] movs r1, 0x80 lsls r1, 1 @@ -624479,8 +604138,7 @@ _08130846: pop {r0} bx r0 .align 2, 0 -_0813087C: .4byte 0x06010000 -_08130880: .4byte 0x030061c4 + .pool thumb_func_end sub_8130760 thumb_func_start sub_8130884 @@ -624493,7 +604151,7 @@ sub_8130884: @ 8130884 lsls r5, 24 lsrs r5, 24 bl sub_8130738 - ldr r0, _081308C4 + ldr r0, =0x030061c0 ldr r0, [r0] ldrh r0, [r0, 0x8] movs r1, 0 @@ -624512,7 +604170,7 @@ sub_8130884: @ 8130884 pop {r0} bx r0 .align 2, 0 -_081308C4: .4byte 0x030061c0 + .pool thumb_func_end sub_8130884 thumb_func_start sub_81308C8 @@ -624520,12 +604178,12 @@ sub_81308C8: @ 81308C8 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _0813093C + ldr r1, =0x020244a8 ldr r0, [r1] ldr r3, [r0, 0x18] movs r4, 0 mov r12, r1 - ldr r2, _08130940 + ldr r2, =0x02022fec movs r1, 0 _081308DC: adds r0, r3, r4 @@ -624534,13 +604192,13 @@ _081308DC: cmp r4, 0x53 bls _081308DC ldr r0, [r2] - ldr r1, _08130944 + ldr r1, =0x0a7f098a ands r0, r1 cmp r0, 0x8 bne _0813092E movs r4, 0 - ldr r6, _08130948 - ldr r5, _0813094C + ldr r6, =0x02038bca + ldr r5, =0x08310040 _081308F6: lsls r2, r4, 1 ldrh r1, [r6] @@ -624578,11 +604236,7 @@ _0813092E: pop {r0} bx r0 .align 2, 0 -_0813093C: .4byte 0x020244a8 -_08130940: .4byte 0x02022fec -_08130944: .4byte 0x0a7f098a -_08130948: .4byte 0x02038bca -_0813094C: .4byte 0x08310040 + .pool thumb_func_end sub_81308C8 thumb_func_start sub_8130950 @@ -624590,11 +604244,11 @@ sub_8130950: @ 8130950 push {r4-r7,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08130988 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r4, 0 - ldr r6, _0813098C + ldr r6, =0x02024064 movs r3, 0 _08130962: adds r0, r1, r4 @@ -624603,7 +604257,7 @@ _08130962: cmp r4, 0x1B bls _08130962 movs r4, 0 - ldr r3, _08130988 + ldr r3, =0x020244a8 movs r5, 0x1 _08130972: adds r1, r2, 0 @@ -624617,8 +604271,7 @@ _08130972: movs r1, 0x64 b _08130998 .align 2, 0 -_08130988: .4byte 0x020244a8 -_0813098C: .4byte 0x02024064 + .pool _08130990: ldr r0, [r3] ldr r0, [r0, 0x14] @@ -624637,9 +604290,9 @@ _08130998: lsls r0, 24 lsrs r6, r0, 24 movs r4, 0 - ldr r5, _08130A44 + ldr r5, =0x020244a8 _081309B4: - ldr r7, _08130A48 + ldr r7, =0x0832a328 lsls r0, r4, 2 adds r0, r7 ldr r0, [r0] @@ -624668,23 +604321,23 @@ _081309CE: adds r4, 0x1 cmp r4, 0x3 ble _081309B4 - ldr r0, _08130A44 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x1C] adds r0, 0x20 movs r1, 0 strb r1, [r0] - ldr r0, _08130A4C - ldr r6, _08130A50 + ldr r0, =0x0203ab3c + ldr r6, =0x02024064 ldrb r2, [r6] strb r2, [r0] - ldr r0, _08130A54 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _08130A60 - ldr r5, _08130A58 + ldr r5, =0x0202420c bl GenerateRandomNumber adds r4, r0, 0 ldrb r0, [r6] @@ -624696,7 +604349,7 @@ _081309CE: eors r0, r2 adds r1, r0 strb r1, [r5] - ldr r0, _08130A5C + ldr r0, =0x02024210 ldrb r1, [r0] ldrb r2, [r5] lsls r0, r2, 2 @@ -624709,20 +604362,14 @@ _081309CE: strb r2, [r5] b _08130A68 .align 2, 0 -_08130A44: .4byte 0x020244a8 -_08130A48: .4byte 0x0832a328 -_08130A4C: .4byte 0x0203ab3c -_08130A50: .4byte 0x02024064 -_08130A54: .4byte 0x02022fec -_08130A58: .4byte 0x0202420c -_08130A5C: .4byte 0x02024210 + .pool _08130A60: - ldr r0, _08130A7C + ldr r0, =0x0202420c movs r1, 0x1 eors r1, r2 strb r1, [r0] _08130A68: - ldr r0, _08130A80 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 17 @@ -624732,14 +604379,13 @@ _08130A68: bl sub_8186438 b _08130AE6 .align 2, 0 -_08130A7C: .4byte 0x0202420c -_08130A80: .4byte 0x02022fec + .pool _08130A84: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _08130AA0 - ldr r0, _08130A9C + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x80 @@ -624747,14 +604393,14 @@ _08130A84: str r0, [r1, 0xC] b _08130B72 .align 2, 0 -_08130A9C: .4byte 0x020244a8 + .pool _08130AA0: movs r0, 0x80 lsls r0, 3 ands r0, r1 cmp r0, 0 beq _08130ABC - ldr r0, _08130AB8 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x80 @@ -624762,13 +604408,13 @@ _08130AA0: str r0, [r1, 0xC] b _08130B72 .align 2, 0 -_08130AB8: .4byte 0x020244a8 + .pool _08130ABC: movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _08130AD8 - ldr r0, _08130AD4 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x80 @@ -624776,7 +604422,7 @@ _08130ABC: str r0, [r1, 0xC] b _08130B72 .align 2, 0 -_08130AD4: .4byte 0x020244a8 + .pool _08130AD8: movs r0, 0x80 lsls r0, 12 @@ -624785,45 +604431,44 @@ _08130AD8: beq _08130AF4 bl sub_81A6FB4 _08130AE6: - ldr r1, _08130AF0 + ldr r1, =0x020244a8 ldr r1, [r1] ldr r1, [r1, 0x14] str r0, [r1, 0xC] b _08130B72 .align 2, 0 -_08130AF0: .4byte 0x020244a8 + .pool _08130AF4: - ldr r0, _08130B08 + ldr r0, =0x0c3f0900 ands r0, r1 cmp r0, 0 beq _08130B10 - ldr r0, _08130B0C + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x7 str r0, [r1, 0xC] b _08130B72 .align 2, 0 -_08130B08: .4byte 0x0c3f0900 -_08130B0C: .4byte 0x020244a8 + .pool _08130B10: movs r0, 0x80 lsls r0, 8 ands r1, r0 cmp r1, 0 beq _08130B58 - ldr r0, _08130B48 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r4, [r0, 0x14] - ldr r3, _08130B4C - ldr r0, _08130B50 + ldr r3, =0x08310030 + ldr r0, =0x02038bca ldrh r0, [r0] lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r3, 0x1C adds r1, r3 - ldr r0, _08130B54 + ldr r0, =0x02038bcc ldrh r2, [r0] lsls r0, r2, 2 adds r0, r2 @@ -624835,16 +604480,13 @@ _08130B10: str r1, [r4, 0xC] b _08130B72 .align 2, 0 -_08130B48: .4byte 0x020244a8 -_08130B4C: .4byte 0x08310030 -_08130B50: .4byte 0x02038bca -_08130B54: .4byte 0x02038bcc + .pool _08130B58: - ldr r0, _08130B94 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] - ldr r2, _08130B98 - ldr r0, _08130B9C + ldr r2, =0x08310030 + ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -624854,13 +604496,13 @@ _08130B58: ldr r0, [r0] str r0, [r3, 0xC] _08130B72: - ldr r0, _08130BA0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _08130B8C - ldr r0, _08130B94 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] ldr r0, [r2, 0xC] @@ -624872,18 +604514,15 @@ _08130B8C: pop {r0} bx r0 .align 2, 0 -_08130B94: .4byte 0x020244a8 -_08130B98: .4byte 0x08310030 -_08130B9C: .4byte 0x02038bca -_08130BA0: .4byte 0x02022fec + .pool thumb_func_end sub_8130950 thumb_func_start sub_8130BA4 sub_8130BA4: @ 8130BA4 push {r4,lr} - ldr r0, _08130BBC + ldr r0, =0x020241ea ldrh r4, [r0] - ldr r0, _08130BC0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 @@ -624892,21 +604531,20 @@ sub_8130BA4: @ 8130BA4 bl sub_8130BDC b _08130BC8 .align 2, 0 -_08130BBC: .4byte 0x020241ea -_08130BC0: .4byte 0x02022fec + .pool _08130BC4: bl sub_8130CF4 _08130BC8: lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _08130BD8 + ldr r0, =0x020241ea strh r4, [r0] adds r0, r1, 0 pop {r4} pop {r1} bx r1 .align 2, 0 -_08130BD8: .4byte 0x020241ea + .pool thumb_func_end sub_8130BA4 thumb_func_start sub_8130BDC @@ -624916,7 +604554,7 @@ sub_8130BDC: @ 8130BDC push {r7} sub sp, 0x8 bl sub_8131074 - ldr r1, _08130C44 + ldr r1, =0x020244a8 ldr r0, [r1] ldr r0, [r0, 0x14] ldr r0, [r0, 0xC] @@ -624952,7 +604590,7 @@ _08130C0C: cmp r0, 0 bne _08130BF8 _08130C2C: - ldr r1, _08130C44 + ldr r1, =0x020244a8 ldr r0, [r1] ldr r3, [r0, 0x14] ldrb r2, [r3, 0x10] @@ -624964,7 +604602,7 @@ _08130C2C: movs r0, 0x4 b _08130CE0 .align 2, 0 -_08130C44: .4byte 0x020244a8 + .pool _08130C48: movs r0, 0x4 ands r0, r2 @@ -624983,8 +604621,8 @@ _08130C58: strb r2, [r0] movs r3, 0x1 mov r8, r0 - ldr r1, _08130CEC - ldr r0, _08130CF0 + ldr r1, =0x02024084 + ldr r0, =0x0203ab3c ldrb r2, [r0] mov r5, sp mov r7, r8 @@ -625052,8 +604690,7 @@ _08130CE0: pop {r1} bx r1 .align 2, 0 -_08130CEC: .4byte 0x02024084 -_08130CF0: .4byte 0x0203ab3c + .pool thumb_func_end sub_8130BDC thumb_func_start sub_8130CF4 @@ -625075,7 +604712,7 @@ sub_8130CF4: @ 8130CF4 str r1, [sp, 0x20] mov r10, sp _08130D14: - ldr r0, _08130D3C + ldr r0, =0x0203ab3c ldrb r0, [r0] cmp r8, r0 beq _08130D2E @@ -625083,7 +604720,7 @@ _08130D14: mov r7, r8 muls r7, r0 adds r0, r7, 0 - ldr r1, _08130D40 + ldr r1, =0x02024084 adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 @@ -625092,23 +604729,21 @@ _08130D2E: movs r0, 0xFF ldr r2, [sp, 0x20] strb r0, [r2] - ldr r0, _08130D44 + ldr r0, =0x0000ffff mov r7, r10 strh r0, [r7] b _08130EAE .align 2, 0 -_08130D3C: .4byte 0x0203ab3c -_08130D40: .4byte 0x02024084 -_08130D44: .4byte 0x0000ffff + .pool _08130D48: - ldr r0, _08130D68 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 beq _08130D70 - ldr r0, _08130D6C + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x92 ldrb r0, [r0] @@ -625116,26 +604751,25 @@ _08130D48: bl sub_8130950 b _08130D76 .align 2, 0 -_08130D68: .4byte 0x02022fec -_08130D6C: .4byte 0x0202449c + .pool _08130D70: movs r0, 0xF bl sub_8130950 _08130D76: - ldr r0, _08130DF0 + ldr r0, =0x0202420c mov r1, r8 strb r1, [r0] movs r1, 0x1 mov r2, r8 ands r2, r1 - ldr r0, _08130DF4 + ldr r0, =0x0203ab3c ldrb r0, [r0] ands r1, r0 cmp r2, r1 beq _08130D90 bl sub_8131074 _08130D90: - ldr r2, _08130DF8 + ldr r2, =0x020244a8 ldr r0, [r2] ldr r0, [r0, 0x14] movs r1, 0 @@ -625186,9 +604820,7 @@ _08130DD8: strb r0, [r7] b _08130EAE .align 2, 0 -_08130DF0: .4byte 0x0202420c -_08130DF4: .4byte 0x0203ab3c -_08130DF8: .4byte 0x020244a8 + .pool _08130DFC: movs r0, 0x4 ands r0, r1 @@ -625209,11 +604841,11 @@ _08130E10: movs r5, 0x1 movs r3, 0x1 adds r6, r1, 0 - ldr r0, _08130F38 + ldr r0, =0x0203ab3c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 - ldr r2, _08130F3C + ldr r2, =0x02024090 adds r0, r2 adds r4, r0, 0x2 add r7, sp, 0x14 @@ -625270,7 +604902,7 @@ _08130E72: ldrb r2, [r6] mov r0, r10 strh r2, [r0] - ldr r0, _08130F38 + ldr r0, =0x0203ab3c ldrb r1, [r0] movs r0, 0x2 eors r0, r1 @@ -625278,7 +604910,7 @@ _08130E72: bne _08130EAE cmp r2, 0x63 bgt _08130EAE - ldr r0, _08130F40 + ldr r0, =0x0000ffff mov r1, r10 strh r0, [r1] _08130EAE: @@ -625301,7 +604933,7 @@ _08130EC4: strb r0, [r2] movs r4, 0x1 mov r8, r4 - ldr r6, _08130F44 + ldr r6, =0x0202420c ldr r3, [sp, 0x18] mov r1, sp adds r1, 0x2 @@ -625354,10 +604986,7 @@ _08130EFE: pop {r1} bx r1 .align 2, 0 -_08130F38: .4byte 0x0203ab3c -_08130F3C: .4byte 0x02024090 -_08130F40: .4byte 0x0000ffff -_08130F44: .4byte 0x0202420c + .pool thumb_func_end sub_8130CF4 thumb_func_start tai_run_script @@ -625366,7 +604995,7 @@ tai_run_script: @ 8130F48 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r7, _08130FC0 + ldr r7, =0x020244a8 ldr r0, [r7] ldr r0, [r0, 0x14] ldrb r0, [r0] @@ -625376,7 +605005,7 @@ tai_run_script: @ 8130F48 b _08131066 _08130F60: mov r9, r7 - ldr r0, _08130FC4 + ldr r0, =0x0203ab38 mov r8, r0 _08130F66: mov r1, r9 @@ -625389,16 +605018,16 @@ _08130F66: bgt _0813105A cmp r0, 0 bne _0813105A - ldr r1, _08130FC8 + ldr r1, =0x082dbef8 ldrb r0, [r2, 0x11] lsls r0, 2 adds r0, r1 ldr r0, [r0] mov r1, r8 str r0, [r1] - ldr r5, _08130FCC + ldr r5, =0x02024084 ldrb r4, [r2, 0x1] - ldr r0, _08130FD0 + ldr r0, =0x0203ab3c ldrb r1, [r0] movs r0, 0x58 adds r3, r1, 0 @@ -625425,16 +605054,12 @@ _08130FB0: strb r0, [r1] b _0813105A .align 2, 0 -_08130FC0: .4byte 0x020244a8 -_08130FC4: .4byte 0x0203ab38 -_08130FC8: .4byte 0x082dbef8 -_08130FCC: .4byte 0x02024084 -_08130FD0: .4byte 0x0203ab3c + .pool _08130FD4: ldrh r1, [r2, 0x2] cmp r1, 0 beq _08130FF4 - ldr r1, _08130FF0 + ldr r1, =0x085b083c mov r2, r8 ldr r0, [r2] ldrb r0, [r0] @@ -625444,7 +605069,7 @@ _08130FD4: bl _call_via_r0 b _0813100A .align 2, 0 -_08130FF0: .4byte 0x085b083c + .pool _08130FF4: adds r0, r2, 0x4 ldrb r2, [r2, 0x1] @@ -625458,7 +605083,7 @@ _08130FF4: orrs r0, r1 strb r0, [r2, 0x10] _0813100A: - ldr r2, _08131040 + ldr r2, =0x020244a8 ldr r0, [r2] ldr r3, [r0, 0x14] ldrb r1, [r3, 0x10] @@ -625485,7 +605110,7 @@ _0813100A: strb r0, [r2] b _0813104E .align 2, 0 -_08131040: .4byte 0x020244a8 + .pool _08131044: ldr r0, [r6] ldr r1, [r0, 0x14] @@ -625521,14 +605146,14 @@ sub_8131074: @ 8131074 mov r7, r8 push {r7} movs r7, 0 - ldr r4, _081310C0 + ldr r4, =0x020244a8 ldr r0, [r4] ldr r2, [r0, 0x18] - ldr r3, _081310C4 + ldr r3, =0x0202420c ldrb r1, [r3] lsls r0, r1, 4 adds r2, r0 - ldr r5, _081310C8 + ldr r5, =0x02024248 lsls r1, 1 adds r1, r5 ldrh r0, [r2] @@ -625557,9 +605182,7 @@ _081310A0: strh r0, [r2] b _081310E4 .align 2, 0 -_081310C0: .4byte 0x020244a8 -_081310C4: .4byte 0x0202420c -_081310C8: .4byte 0x02024248 + .pool _081310CC: adds r5, 0x2 adds r7, 0x1 @@ -625585,7 +605208,7 @@ _081310E4: sub_81310F0: @ 81310F0 push {r4,lr} lsls r0, 24 - ldr r4, _08131114 + ldr r4, =0x020244a8 movs r3, 0 lsrs r1, r0, 20 movs r2, 0x3 @@ -625602,14 +605225,14 @@ _081310FC: pop {r0} bx r0 .align 2, 0 -_08131114: .4byte 0x020244a8 + .pool thumb_func_end sub_81310F0 thumb_func_start b_history__record_ability_usage_of_player b_history__record_ability_usage_of_player: @ 8131118 lsls r0, 24 lsrs r0, 24 - ldr r2, _0813112C + ldr r2, =0x020244a8 ldr r2, [r2] ldr r2, [r2, 0x18] adds r2, 0x40 @@ -625617,14 +605240,14 @@ b_history__record_ability_usage_of_player: @ 8131118 strb r1, [r2] bx lr .align 2, 0 -_0813112C: .4byte 0x020244a8 + .pool thumb_func_end b_history__record_ability_usage_of_player thumb_func_start sub_8131130 sub_8131130: @ 8131130 lsls r0, 24 lsrs r0, 24 - ldr r1, _08131144 + ldr r1, =0x020244a8 ldr r1, [r1] ldr r1, [r1, 0x18] adds r1, 0x40 @@ -625633,14 +605256,14 @@ sub_8131130: @ 8131130 strb r0, [r1] bx lr .align 2, 0 -_08131144: .4byte 0x020244a8 + .pool thumb_func_end sub_8131130 thumb_func_start b_history__record_item_x12_of_player b_history__record_item_x12_of_player: @ 8131148 lsls r0, 24 lsrs r0, 24 - ldr r2, _0813115C + ldr r2, =0x020244a8 ldr r2, [r2] ldr r2, [r2, 0x18] adds r2, 0x44 @@ -625648,14 +605271,14 @@ b_history__record_item_x12_of_player: @ 8131148 strb r1, [r2] bx lr .align 2, 0 -_0813115C: .4byte 0x020244a8 + .pool thumb_func_end b_history__record_item_x12_of_player thumb_func_start sub_8131160 sub_8131160: @ 8131160 lsls r0, 24 lsrs r0, 24 - ldr r1, _08131174 + ldr r1, =0x020244a8 ldr r1, [r1] ldr r1, [r1, 0x18] adds r1, 0x44 @@ -625664,7 +605287,7 @@ sub_8131160: @ 8131160 strb r0, [r1] bx lr .align 2, 0 -_08131174: .4byte 0x020244a8 + .pool thumb_func_end sub_8131160 thumb_func_start tai00_unk @@ -625674,7 +605297,7 @@ tai00_unk: @ 8131178 lsls r0, 16 movs r1, 0xFF lsls r1, 16 - ldr r3, _081311AC + ldr r3, =0x0203ab38 ldr r2, [r3] ands r1, r0 lsrs r1, 16 @@ -625694,7 +605317,7 @@ tai00_unk: @ 8131178 str r1, [r3] b _081311B4 .align 2, 0 -_081311AC: .4byte 0x0203ab38 + .pool _081311B0: adds r0, r2, 0x6 str r0, [r3] @@ -625710,7 +605333,7 @@ tai01_unk: @ 81311B8 lsls r0, 16 movs r1, 0xFF lsls r1, 16 - ldr r3, _081311EC + ldr r3, =0x0203ab38 ldr r2, [r3] ands r1, r0 lsrs r1, 16 @@ -625730,7 +605353,7 @@ tai01_unk: @ 81311B8 str r1, [r3] b _081311F4 .align 2, 0 -_081311EC: .4byte 0x0203ab38 + .pool _081311F0: adds r0, r2, 0x6 str r0, [r3] @@ -625746,7 +605369,7 @@ tai02_unk: @ 81311F8 lsls r0, 16 movs r1, 0xFF lsls r1, 16 - ldr r3, _0813122C + ldr r3, =0x0203ab38 ldr r2, [r3] ands r1, r0 lsrs r1, 16 @@ -625766,7 +605389,7 @@ tai02_unk: @ 81311F8 str r1, [r3] b _08131234 .align 2, 0 -_0813122C: .4byte 0x0203ab38 + .pool _08131230: adds r0, r2, 0x6 str r0, [r3] @@ -625782,7 +605405,7 @@ tai03_unk: @ 8131238 lsls r0, 16 movs r1, 0xFF lsls r1, 16 - ldr r3, _0813126C + ldr r3, =0x0203ab38 ldr r2, [r3] ands r1, r0 lsrs r1, 16 @@ -625802,7 +605425,7 @@ tai03_unk: @ 8131238 str r1, [r3] b _08131274 .align 2, 0 -_0813126C: .4byte 0x0203ab38 + .pool _08131270: adds r0, r2, 0x6 str r0, [r3] @@ -625814,13 +605437,13 @@ _08131274: thumb_func_start tai04_unk tai04_unk: @ 8131278 push {r4,lr} - ldr r2, _081312B4 + ldr r2, =0x020244a8 ldr r0, [r2] ldr r0, [r0, 0x14] adds r1, r0, 0x4 ldrb r0, [r0, 0x1] adds r1, r0 - ldr r3, _081312B8 + ldr r3, =0x0203ab38 ldr r0, [r3] ldrb r0, [r0, 0x1] ldrb r4, [r1] @@ -625845,29 +605468,27 @@ _081312A8: pop {r0} bx r0 .align 2, 0 -_081312B4: .4byte 0x020244a8 -_081312B8: .4byte 0x0203ab38 + .pool thumb_func_end tai04_unk thumb_func_start tai05_unk tai05_unk: @ 81312BC push {r4,lr} - ldr r0, _081312D0 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _081312D8 - ldr r0, _081312D4 + ldr r0, =0x0203ab3c b _081312DA .align 2, 0 -_081312D0: .4byte 0x0203ab38 -_081312D4: .4byte 0x0203ab3c + .pool _081312D8: - ldr r0, _08131310 + ldr r0, =0x0202420c _081312DA: ldrb r1, [r0] - ldr r2, _08131314 + ldr r2, =0x02024084 movs r0, 0x58 muls r1, r0 adds r1, r2 @@ -625893,8 +605514,7 @@ _081312DA: str r1, [r4] b _0813131C .align 2, 0 -_08131310: .4byte 0x0202420c -_08131314: .4byte 0x02024084 + .pool _08131318: adds r0, r2, 0x7 str r0, [r4] @@ -625907,22 +605527,21 @@ _0813131C: thumb_func_start tai06_unk tai06_unk: @ 8131324 push {r4,lr} - ldr r0, _08131338 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _08131340 - ldr r0, _0813133C + ldr r0, =0x0203ab3c b _08131342 .align 2, 0 -_08131338: .4byte 0x0203ab38 -_0813133C: .4byte 0x0203ab3c + .pool _08131340: - ldr r0, _08131378 + ldr r0, =0x0202420c _08131342: ldrb r1, [r0] - ldr r2, _0813137C + ldr r2, =0x02024084 movs r0, 0x58 muls r1, r0 adds r1, r2 @@ -625948,8 +605567,7 @@ _08131342: str r1, [r4] b _08131384 .align 2, 0 -_08131378: .4byte 0x0202420c -_0813137C: .4byte 0x02024084 + .pool _08131380: adds r0, r2, 0x7 str r0, [r4] @@ -625962,22 +605580,21 @@ _08131384: thumb_func_start tai07_unk tai07_unk: @ 813138C push {r4,lr} - ldr r0, _081313A0 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _081313A8 - ldr r0, _081313A4 + ldr r0, =0x0203ab3c b _081313AA .align 2, 0 -_081313A0: .4byte 0x0203ab38 -_081313A4: .4byte 0x0203ab3c + .pool _081313A8: - ldr r0, _081313E0 + ldr r0, =0x0202420c _081313AA: ldrb r1, [r0] - ldr r2, _081313E4 + ldr r2, =0x02024084 movs r0, 0x58 muls r1, r0 adds r1, r2 @@ -626003,8 +605620,7 @@ _081313AA: str r1, [r4] b _081313EC .align 2, 0 -_081313E0: .4byte 0x0202420c -_081313E4: .4byte 0x02024084 + .pool _081313E8: adds r0, r2, 0x7 str r0, [r4] @@ -626017,22 +605633,21 @@ _081313EC: thumb_func_start tai08_unk tai08_unk: @ 81313F4 push {r4,lr} - ldr r0, _08131408 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _08131410 - ldr r0, _0813140C + ldr r0, =0x0203ab3c b _08131412 .align 2, 0 -_08131408: .4byte 0x0203ab38 -_0813140C: .4byte 0x0203ab3c + .pool _08131410: - ldr r0, _08131448 + ldr r0, =0x0202420c _08131412: ldrb r1, [r0] - ldr r2, _0813144C + ldr r2, =0x02024084 movs r0, 0x58 muls r1, r0 adds r1, r2 @@ -626058,8 +605673,7 @@ _08131412: str r1, [r4] b _08131454 .align 2, 0 -_08131448: .4byte 0x0202420c -_0813144C: .4byte 0x02024084 + .pool _08131450: adds r0, r2, 0x7 str r0, [r4] @@ -626072,19 +605686,18 @@ _08131454: thumb_func_start tai09_unk tai09_unk: @ 813145C push {r4,r5,lr} - ldr r0, _08131470 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 bne _08131478 - ldr r0, _08131474 + ldr r0, =0x0203ab3c b _0813147A .align 2, 0 -_08131470: .4byte 0x0203ab38 -_08131474: .4byte 0x0203ab3c + .pool _08131478: - ldr r0, _081314BC + ldr r0, =0x0202420c _0813147A: ldrb r4, [r0] ldr r3, [r5] @@ -626098,7 +605711,7 @@ _0813147A: ldrb r0, [r3, 0x5] lsls r0, 24 orrs r2, r0 - ldr r1, _081314C0 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r4 adds r1, 0x4C @@ -626120,8 +605733,7 @@ _0813147A: str r1, [r5] b _081314CA .align 2, 0 -_081314BC: .4byte 0x0202420c -_081314C0: .4byte 0x02024084 + .pool _081314C4: adds r0, r3, 0 adds r0, 0xA @@ -626135,19 +605747,18 @@ _081314CA: thumb_func_start tai0A_unk tai0A_unk: @ 81314D0 push {r4,r5,lr} - ldr r0, _081314E4 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 bne _081314EC - ldr r0, _081314E8 + ldr r0, =0x0203ab3c b _081314EE .align 2, 0 -_081314E4: .4byte 0x0203ab38 -_081314E8: .4byte 0x0203ab3c + .pool _081314EC: - ldr r0, _08131530 + ldr r0, =0x0202420c _081314EE: ldrb r4, [r0] ldr r3, [r5] @@ -626161,7 +605772,7 @@ _081314EE: ldrb r0, [r3, 0x5] lsls r0, 24 orrs r2, r0 - ldr r1, _08131534 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r4 adds r1, 0x4C @@ -626183,8 +605794,7 @@ _081314EE: str r1, [r5] b _0813153E .align 2, 0 -_08131530: .4byte 0x0202420c -_08131534: .4byte 0x02024084 + .pool _08131538: adds r0, r3, 0 adds r0, 0xA @@ -626198,19 +605808,18 @@ _0813153E: thumb_func_start tai0B_unk tai0B_unk: @ 8131544 push {r4,r5,lr} - ldr r0, _08131558 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 bne _08131560 - ldr r0, _0813155C + ldr r0, =0x0203ab3c b _08131562 .align 2, 0 -_08131558: .4byte 0x0203ab38 -_0813155C: .4byte 0x0203ab3c + .pool _08131560: - ldr r0, _081315A4 + ldr r0, =0x0202420c _08131562: ldrb r4, [r0] ldr r3, [r5] @@ -626224,7 +605833,7 @@ _08131562: ldrb r0, [r3, 0x5] lsls r0, 24 orrs r2, r0 - ldr r1, _081315A8 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r4 adds r1, 0x50 @@ -626246,8 +605855,7 @@ _08131562: str r1, [r5] b _081315B2 .align 2, 0 -_081315A4: .4byte 0x0202420c -_081315A8: .4byte 0x02024084 + .pool _081315AC: adds r0, r3, 0 adds r0, 0xA @@ -626261,19 +605869,18 @@ _081315B2: thumb_func_start tai0C_unk tai0C_unk: @ 81315B8 push {r4,r5,lr} - ldr r0, _081315CC + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 bne _081315D4 - ldr r0, _081315D0 + ldr r0, =0x0203ab3c b _081315D6 .align 2, 0 -_081315CC: .4byte 0x0203ab38 -_081315D0: .4byte 0x0203ab3c + .pool _081315D4: - ldr r0, _08131618 + ldr r0, =0x0202420c _081315D6: ldrb r4, [r0] ldr r3, [r5] @@ -626287,7 +605894,7 @@ _081315D6: ldrb r0, [r3, 0x5] lsls r0, 24 orrs r2, r0 - ldr r1, _0813161C + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r4 adds r1, 0x50 @@ -626309,8 +605916,7 @@ _081315D6: str r1, [r5] b _08131626 .align 2, 0 -_08131618: .4byte 0x0202420c -_0813161C: .4byte 0x02024084 + .pool _08131620: adds r0, r3, 0 adds r0, 0xA @@ -626324,19 +605930,18 @@ _08131626: thumb_func_start tai0D_unk tai0D_unk: @ 813162C push {r4,r5,lr} - ldr r0, _08131640 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 bne _08131648 - ldr r0, _08131644 + ldr r0, =0x0203ab3c b _0813164A .align 2, 0 -_08131640: .4byte 0x0203ab38 -_08131644: .4byte 0x0203ab3c + .pool _08131648: - ldr r0, _08131688 + ldr r0, =0x0202420c _0813164A: ldrb r4, [r0] ldr r3, [r5] @@ -626350,7 +605955,7 @@ _0813164A: ldrb r0, [r3, 0x5] lsls r0, 24 orrs r1, r0 - ldr r2, _0813168C + ldr r2, =0x020242ac lsls r0, r4, 2 adds r0, r2 ldr r0, [r0] @@ -626370,8 +605975,7 @@ _0813164A: str r1, [r5] b _08131696 .align 2, 0 -_08131688: .4byte 0x0202420c -_0813168C: .4byte 0x020242ac + .pool _08131690: adds r0, r3, 0 adds r0, 0xA @@ -626385,19 +605989,18 @@ _08131696: thumb_func_start tai0E_unk tai0E_unk: @ 813169C push {r4,r5,lr} - ldr r0, _081316B0 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 bne _081316B8 - ldr r0, _081316B4 + ldr r0, =0x0203ab3c b _081316BA .align 2, 0 -_081316B0: .4byte 0x0203ab38 -_081316B4: .4byte 0x0203ab3c + .pool _081316B8: - ldr r0, _081316F8 + ldr r0, =0x0202420c _081316BA: ldrb r4, [r0] ldr r3, [r5] @@ -626411,7 +606014,7 @@ _081316BA: ldrb r0, [r3, 0x5] lsls r0, 24 orrs r1, r0 - ldr r2, _081316FC + ldr r2, =0x020242ac lsls r0, r4, 2 adds r0, r2 ldr r0, [r0] @@ -626431,8 +606034,7 @@ _081316BA: str r1, [r5] b _08131706 .align 2, 0 -_081316F8: .4byte 0x0202420c -_081316FC: .4byte 0x020242ac + .pool _08131700: adds r0, r3, 0 adds r0, 0xA @@ -626446,24 +606048,23 @@ _08131706: thumb_func_start tai0F_unk tai0F_unk: @ 813170C push {r4,lr} - ldr r0, _0813171C + ldr r0, =0x0203ab38 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 bne _08131724 - ldr r0, _08131720 + ldr r0, =0x0203ab3c b _08131726 .align 2, 0 -_0813171C: .4byte 0x0203ab38 -_08131720: .4byte 0x0203ab3c + .pool _08131724: - ldr r0, _08131770 + ldr r0, =0x0202420c _08131726: ldrb r0, [r0] bl battle_get_per_side_status movs r2, 0x1 ands r2, r0 - ldr r4, _08131774 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] @@ -626475,7 +606076,7 @@ _08131726: ldrb r0, [r3, 0x5] lsls r0, 24 orrs r1, r0 - ldr r0, _08131778 + ldr r0, =0x0202428e lsls r2, 1 adds r2, r0 ldrh r0, [r2] @@ -626495,9 +606096,7 @@ _08131726: str r1, [r4] b _08131782 .align 2, 0 -_08131770: .4byte 0x0202420c -_08131774: .4byte 0x0203ab38 -_08131778: .4byte 0x0202428e + .pool _0813177C: adds r0, r3, 0 adds r0, 0xA @@ -626511,24 +606110,23 @@ _08131782: thumb_func_start tai10_unk tai10_unk: @ 8131788 push {r4,lr} - ldr r0, _08131798 + ldr r0, =0x0203ab38 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 bne _081317A0 - ldr r0, _0813179C + ldr r0, =0x0203ab3c b _081317A2 .align 2, 0 -_08131798: .4byte 0x0203ab38 -_0813179C: .4byte 0x0203ab3c + .pool _081317A0: - ldr r0, _081317EC + ldr r0, =0x0202420c _081317A2: ldrb r0, [r0] bl battle_get_per_side_status movs r2, 0x1 ands r2, r0 - ldr r4, _081317F0 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3, 0x2] ldrb r0, [r3, 0x3] @@ -626540,7 +606138,7 @@ _081317A2: ldrb r0, [r3, 0x5] lsls r0, 24 orrs r1, r0 - ldr r0, _081317F4 + ldr r0, =0x0202428e lsls r2, 1 adds r2, r0 ldrh r0, [r2] @@ -626560,9 +606158,7 @@ _081317A2: str r1, [r4] b _081317FE .align 2, 0 -_081317EC: .4byte 0x0202420c -_081317F0: .4byte 0x0203ab38 -_081317F4: .4byte 0x0202428e + .pool _081317F8: adds r0, r3, 0 adds r0, 0xA @@ -626576,10 +606172,10 @@ _081317FE: thumb_func_start tai11_unk tai11_unk: @ 8131804 push {lr} - ldr r0, _08131830 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] - ldr r3, _08131834 + ldr r3, =0x0203ab38 ldr r2, [r3] ldr r0, [r0, 0x8] ldrb r1, [r2, 0x1] @@ -626598,8 +606194,7 @@ tai11_unk: @ 8131804 str r1, [r3] b _0813183C .align 2, 0 -_08131830: .4byte 0x020244a8 -_08131834: .4byte 0x0203ab38 + .pool _08131838: adds r0, r2, 0x6 str r0, [r3] @@ -626611,10 +606206,10 @@ _0813183C: thumb_func_start tai12_unk tai12_unk: @ 8131840 push {lr} - ldr r0, _0813186C + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] - ldr r3, _08131870 + ldr r3, =0x0203ab38 ldr r2, [r3] ldr r0, [r0, 0x8] ldrb r1, [r2, 0x1] @@ -626633,8 +606228,7 @@ tai12_unk: @ 8131840 str r1, [r3] b _08131878 .align 2, 0 -_0813186C: .4byte 0x020244a8 -_08131870: .4byte 0x0203ab38 + .pool _08131874: adds r0, r2, 0x6 str r0, [r3] @@ -626646,10 +606240,10 @@ _08131878: thumb_func_start tai13_unk tai13_unk: @ 813187C push {lr} - ldr r0, _081318A8 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] - ldr r3, _081318AC + ldr r3, =0x0203ab38 ldr r2, [r3] ldr r0, [r0, 0x8] ldrb r1, [r2, 0x1] @@ -626668,8 +606262,7 @@ tai13_unk: @ 813187C str r1, [r3] b _081318B4 .align 2, 0 -_081318A8: .4byte 0x020244a8 -_081318AC: .4byte 0x0203ab38 + .pool _081318B0: adds r0, r2, 0x6 str r0, [r3] @@ -626681,10 +606274,10 @@ _081318B4: thumb_func_start tai14_unk tai14_unk: @ 81318B8 push {lr} - ldr r0, _081318E4 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] - ldr r3, _081318E8 + ldr r3, =0x0203ab38 ldr r2, [r3] ldr r0, [r0, 0x8] ldrb r1, [r2, 0x1] @@ -626703,8 +606296,7 @@ tai14_unk: @ 81318B8 str r1, [r3] b _081318F0 .align 2, 0 -_081318E4: .4byte 0x020244a8 -_081318E8: .4byte 0x0203ab38 + .pool _081318EC: adds r0, r2, 0x6 str r0, [r3] @@ -626716,7 +606308,7 @@ _081318F0: thumb_func_start tai15_unk tai15_unk: @ 81318F4 push {lr} - ldr r3, _08131934 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -626728,7 +606320,7 @@ tai15_unk: @ 81318F4 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r0, _08131938 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r0, [r0, 0x8] @@ -626748,8 +606340,7 @@ tai15_unk: @ 81318F4 str r1, [r3] b _08131942 .align 2, 0 -_08131934: .4byte 0x0203ab38 -_08131938: .4byte 0x020244a8 + .pool _0813193C: adds r0, r2, 0 adds r0, 0x9 @@ -626762,7 +606353,7 @@ _08131942: thumb_func_start tai16_unk tai16_unk: @ 8131948 push {lr} - ldr r3, _08131988 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -626774,7 +606365,7 @@ tai16_unk: @ 8131948 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r0, _0813198C + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r0, [r0, 0x8] @@ -626794,8 +606385,7 @@ tai16_unk: @ 8131948 str r1, [r3] b _08131996 .align 2, 0 -_08131988: .4byte 0x0203ab38 -_0813198C: .4byte 0x020244a8 + .pool _08131990: adds r0, r2, 0 adds r0, 0x9 @@ -626808,7 +606398,7 @@ _08131996: thumb_func_start tai17_unk tai17_unk: @ 813199C push {lr} - ldr r3, _081319DC + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -626820,7 +606410,7 @@ tai17_unk: @ 813199C ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r0, _081319E0 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r0, [r0, 0x8] @@ -626840,8 +606430,7 @@ tai17_unk: @ 813199C str r1, [r3] b _081319EA .align 2, 0 -_081319DC: .4byte 0x0203ab38 -_081319E0: .4byte 0x020244a8 + .pool _081319E4: adds r0, r2, 0 adds r0, 0x9 @@ -626854,7 +606443,7 @@ _081319EA: thumb_func_start tai18_unk tai18_unk: @ 81319F0 push {lr} - ldr r3, _08131A30 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -626866,7 +606455,7 @@ tai18_unk: @ 81319F0 ldrb r0, [r2, 0x4] lsls r0, 24 orrs r1, r0 - ldr r0, _08131A34 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r0, [r0, 0x8] @@ -626886,8 +606475,7 @@ tai18_unk: @ 81319F0 str r1, [r3] b _08131A3E .align 2, 0 -_08131A30: .4byte 0x0203ab38 -_08131A34: .4byte 0x020244a8 + .pool _08131A38: adds r0, r2, 0 adds r0, 0x9 @@ -626900,13 +606488,13 @@ _08131A3E: thumb_func_start tai19_unk tai19_unk: @ 8131A44 push {lr} - ldr r3, _08131A78 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 orrs r1, r0 - ldr r0, _08131A7C + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldrh r0, [r0, 0x2] @@ -626925,8 +606513,7 @@ tai19_unk: @ 8131A44 str r1, [r3] b _08131A84 .align 2, 0 -_08131A78: .4byte 0x0203ab38 -_08131A7C: .4byte 0x020244a8 + .pool _08131A80: adds r0, r2, 0x7 str r0, [r3] @@ -626938,13 +606525,13 @@ _08131A84: thumb_func_start tai1A_unk tai1A_unk: @ 8131A88 push {lr} - ldr r3, _08131ABC + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] lsls r0, 8 orrs r1, r0 - ldr r0, _08131AC0 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldrh r0, [r0, 0x2] @@ -626963,8 +606550,7 @@ tai1A_unk: @ 8131A88 str r1, [r3] b _08131AC8 .align 2, 0 -_08131ABC: .4byte 0x0203ab38 -_08131AC0: .4byte 0x020244a8 + .pool _08131AC4: adds r0, r2, 0x7 str r0, [r3] @@ -626976,7 +606562,7 @@ _08131AC8: thumb_func_start tai1B_unk tai1B_unk: @ 8131ACC push {r4,lr} - ldr r2, _08131B18 + ldr r2, =0x0203ab38 ldr r1, [r2] ldrb r3, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -626991,7 +606577,7 @@ tai1B_unk: @ 8131ACC ldrb r0, [r3] cmp r0, 0xFF beq _08131B28 - ldr r0, _08131B1C + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r1, [r0, 0x8] @@ -627014,8 +606600,7 @@ _08131AF6: str r1, [r4] b _08131B2E .align 2, 0 -_08131B18: .4byte 0x0203ab38 -_08131B1C: .4byte 0x020244a8 + .pool _08131B20: adds r3, 0x1 ldrb r0, [r3] @@ -627034,7 +606619,7 @@ _08131B2E: thumb_func_start tai1C_unk tai1C_unk: @ 8131B34 push {r4,lr} - ldr r2, _08131B70 + ldr r2, =0x0203ab38 ldr r1, [r2] ldrb r3, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -627050,7 +606635,7 @@ tai1C_unk: @ 8131B34 adds r4, r2, 0 cmp r0, 0xFF beq _08131B80 - ldr r0, _08131B74 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r2, [r0, 0x8] @@ -627064,8 +606649,7 @@ _08131B60: str r0, [r1] b _08131B98 .align 2, 0 -_08131B70: .4byte 0x0203ab38 -_08131B74: .4byte 0x020244a8 + .pool _08131B78: adds r3, 0x1 ldrb r0, [r3] @@ -627093,7 +606677,7 @@ _08131B98: thumb_func_start tai1D_unk tai1D_unk: @ 8131BA0 push {r4,r5,lr} - ldr r2, _08131BEC + ldr r2, =0x0203ab38 ldr r1, [r2] ldrb r3, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -627106,10 +606690,10 @@ tai1D_unk: @ 8131BA0 lsls r0, 24 orrs r3, r0 ldrh r0, [r3] - ldr r5, _08131BF0 + ldr r5, =0x0000ffff cmp r0, r5 beq _08131C00 - ldr r0, _08131BF4 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r1, [r0, 0x8] @@ -627132,9 +606716,7 @@ _08131BCC: str r1, [r4] b _08131C06 .align 2, 0 -_08131BEC: .4byte 0x0203ab38 -_08131BF0: .4byte 0x0000ffff -_08131BF4: .4byte 0x020244a8 + .pool _08131BF8: adds r3, 0x2 ldrh r0, [r3] @@ -627153,7 +606735,7 @@ _08131C06: thumb_func_start tai1E_unk tai1E_unk: @ 8131C0C push {r4,r5,lr} - ldr r2, _08131C48 + ldr r2, =0x0203ab38 ldr r1, [r2] ldrb r3, [r1, 0x1] ldrb r0, [r1, 0x2] @@ -627166,11 +606748,11 @@ tai1E_unk: @ 8131C0C lsls r0, 24 orrs r3, r0 ldrh r0, [r3] - ldr r4, _08131C4C + ldr r4, =0x0000ffff adds r5, r2, 0 cmp r0, r4 beq _08131C5C - ldr r0, _08131C50 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r2, [r0, 0x8] @@ -627184,9 +606766,7 @@ _08131C3A: str r0, [r1] b _08131C74 .align 2, 0 -_08131C48: .4byte 0x0203ab38 -_08131C4C: .4byte 0x0000ffff -_08131C50: .4byte 0x020244a8 + .pool _08131C54: adds r3, 0x2 ldrh r0, [r3] @@ -627215,11 +606795,11 @@ _08131C74: tai1F_unk: @ 8131C7C push {r4,r5,lr} movs r3, 0 - ldr r4, _08131CBC - ldr r1, _08131CC0 - ldr r0, _08131CC4 + ldr r4, =0x0203ab38 + ldr r1, =0x02024084 + ldr r0, =0x0203ab3c ldrb r2, [r0] - ldr r5, _08131CC8 + ldr r5, =0x0831c898 movs r0, 0x58 muls r0, r2 adds r1, 0xC @@ -627248,10 +606828,7 @@ _08131CAE: str r0, [r4] b _08131CE4 .align 2, 0 -_08131CBC: .4byte 0x0203ab38 -_08131CC0: .4byte 0x02024084 -_08131CC4: .4byte 0x0203ab3c -_08131CC8: .4byte 0x0831c898 + .pool _08131CCC: ldr r2, [r4] ldrb r1, [r2, 0x1] @@ -627275,11 +606852,11 @@ _08131CE4: tai20_unk: @ 8131CEC push {r4,r5,lr} movs r3, 0 - ldr r4, _08131D2C - ldr r1, _08131D30 - ldr r0, _08131D34 + ldr r4, =0x0203ab38 + ldr r1, =0x02024084 + ldr r0, =0x0203ab3c ldrb r2, [r0] - ldr r5, _08131D38 + ldr r5, =0x0831c898 movs r0, 0x58 muls r0, r2 adds r1, 0xC @@ -627308,10 +606885,7 @@ _08131D1E: str r0, [r4] b _08131D54 .align 2, 0 -_08131D2C: .4byte 0x0203ab38 -_08131D30: .4byte 0x02024084 -_08131D34: .4byte 0x0203ab3c -_08131D38: .4byte 0x0831c898 + .pool _08131D3C: ldr r2, [r4] ldrb r1, [r2, 0x1] @@ -627333,40 +606907,37 @@ _08131D54: thumb_func_start tai21_unk tai21_unk: @ 8131D5C - ldr r0, _08131D74 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] - ldr r0, _08131D78 + ldr r0, =0x03005d10 ldrb r0, [r0, 0x13] str r0, [r1, 0x8] - ldr r1, _08131D7C + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08131D74: .4byte 0x020244a8 -_08131D78: .4byte 0x03005d10 -_08131D7C: .4byte 0x0203ab38 + .pool thumb_func_end tai21_unk thumb_func_start dp15_get_some_type dp15_get_some_type: @ 8131D80 push {r4,lr} - ldr r1, _08131D98 + ldr r1, =0x0203ab38 ldr r0, [r1] ldrb r0, [r0, 0x1] adds r4, r1, 0 cmp r0, 0x4 bhi _08131E5A lsls r0, 2 - ldr r1, _08131D9C + ldr r1, =_08131DA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08131D98: .4byte 0x0203ab38 -_08131D9C: .4byte _08131DA0 + .pool .align 2, 0 _08131DA0: .4byte _08131DD8 @@ -627375,11 +606946,11 @@ _08131DA0: .4byte _08131DFC .4byte _08131E44 _08131DB4: - ldr r0, _08131DCC + ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] - ldr r2, _08131DD0 - ldr r0, _08131DD4 + ldr r2, =0x02024084 + ldr r0, =0x0203ab3c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -627388,15 +606959,13 @@ _08131DB4: ldrb r0, [r0] b _08131E58 .align 2, 0 -_08131DCC: .4byte 0x020244a8 -_08131DD0: .4byte 0x02024084 -_08131DD4: .4byte 0x0203ab3c + .pool _08131DD8: - ldr r0, _08131DF0 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] - ldr r2, _08131DF4 - ldr r0, _08131DF8 + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -627405,15 +606974,13 @@ _08131DD8: ldrb r0, [r0] b _08131E58 .align 2, 0 -_08131DF0: .4byte 0x020244a8 -_08131DF4: .4byte 0x02024084 -_08131DF8: .4byte 0x0202420c + .pool _08131DFC: - ldr r0, _08131E14 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] - ldr r2, _08131E18 - ldr r0, _08131E1C + ldr r2, =0x02024084 + ldr r0, =0x0203ab3c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -627422,15 +606989,13 @@ _08131DFC: ldrb r0, [r0] b _08131E58 .align 2, 0 -_08131E14: .4byte 0x020244a8 -_08131E18: .4byte 0x02024084 -_08131E1C: .4byte 0x0203ab3c + .pool _08131E20: - ldr r0, _08131E38 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] - ldr r2, _08131E3C - ldr r0, _08131E40 + ldr r2, =0x02024084 + ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -627439,14 +607004,12 @@ _08131E20: ldrb r0, [r0] b _08131E58 .align 2, 0 -_08131E38: .4byte 0x020244a8 -_08131E3C: .4byte 0x02024084 -_08131E40: .4byte 0x0202420c + .pool _08131E44: - ldr r0, _08131E68 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] - ldr r2, _08131E6C + ldr r2, =0x0831c898 ldrh r1, [r3, 0x2] lsls r0, r1, 1 adds r0, r1 @@ -627463,8 +607026,7 @@ _08131E5A: pop {r0} bx r0 .align 2, 0 -_08131E68: .4byte 0x020244a8 -_08131E6C: .4byte 0x0831c898 + .pool thumb_func_end dp15_get_some_type thumb_func_start sub_8131E70 @@ -627474,11 +607036,11 @@ sub_8131E70: @ 8131E70 lsrs r0, 24 cmp r0, 0x1 bne _08131E84 - ldr r0, _08131E80 + ldr r0, =0x0203ab3c ldrb r0, [r0] b _08131EAC .align 2, 0 -_08131E80: .4byte 0x0203ab3c + .pool _08131E84: cmp r0, 0x1 ble _08131E90 @@ -627487,18 +607049,18 @@ _08131E84: cmp r0, 0x3 beq _08131E9C _08131E90: - ldr r0, _08131E98 + ldr r0, =0x0202420c ldrb r0, [r0] b _08131EAC .align 2, 0 -_08131E98: .4byte 0x0202420c + .pool _08131E9C: - ldr r0, _08131EA0 + ldr r0, =0x0203ab3c b _08131EA6 .align 2, 0 -_08131EA0: .4byte 0x0203ab3c + .pool _08131EA4: - ldr r0, _08131EB0 + ldr r0, =0x0202420c _08131EA6: ldrb r1, [r0] movs r0, 0x2 @@ -627507,19 +607069,19 @@ _08131EAC: pop {r1} bx r1 .align 2, 0 -_08131EB0: .4byte 0x0202420c + .pool thumb_func_end sub_8131E70 thumb_func_start tai5F_unk tai5F_unk: @ 8131EB4 push {r4,lr} - ldr r4, _08131EF0 + ldr r4, =0x0203ab38 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8131E70 lsls r0, 24 lsrs r0, 24 - ldr r2, _08131EF4 + ldr r2, =0x02024084 movs r1, 0x58 muls r0, r1 adds r3, r0, r2 @@ -627536,23 +607098,21 @@ tai5F_unk: @ 8131EB4 cmp r0, r2 bne _08131EFC _08131EE4: - ldr r0, _08131EF8 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x1 b _08131F04 .align 2, 0 -_08131EF0: .4byte 0x0203ab38 -_08131EF4: .4byte 0x02024084 -_08131EF8: .4byte 0x020244a8 + .pool _08131EFC: - ldr r0, _08131F14 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0 _08131F04: str r0, [r1, 0x8] - ldr r1, _08131F18 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x3 str r0, [r1] @@ -627560,16 +607120,15 @@ _08131F04: pop {r0} bx r0 .align 2, 0 -_08131F14: .4byte 0x020244a8 -_08131F18: .4byte 0x0203ab38 + .pool thumb_func_end tai5F_unk thumb_func_start dp15_move_get_power__2_8 dp15_move_get_power__2_8: @ 8131F1C - ldr r0, _08131F3C + ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] - ldr r2, _08131F40 + ldr r2, =0x0831c898 ldrh r1, [r3, 0x2] lsls r0, r1, 1 adds r0, r1 @@ -627577,15 +607136,13 @@ dp15_move_get_power__2_8: @ 8131F1C adds r0, r2 ldrb r0, [r0, 0x1] str r0, [r3, 0x8] - ldr r1, _08131F44 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08131F3C: .4byte 0x020244a8 -_08131F40: .4byte 0x0831c898 -_08131F44: .4byte 0x0203ab38 + .pool thumb_func_end dp15_move_get_power__2_8 thumb_func_start dp15_is_most_powerful_move__8 @@ -627597,11 +607154,11 @@ dp15_is_most_powerful_move__8: @ 8131F48 push {r5-r7} sub sp, 0x14 movs r3, 0 - ldr r0, _08132088 + ldr r0, =0x085b09c8 ldrh r1, [r0] - ldr r5, _0813208C - ldr r6, _08132090 - ldr r2, _08132094 + ldr r5, =0x0000ffff + ldr r6, =0x0831c898 + ldr r2, =0x020244a8 cmp r1, r5 beq _08131F86 ldr r0, [r2] @@ -627612,7 +607169,7 @@ dp15_is_most_powerful_move__8: @ 8131F48 lsls r0, 2 adds r0, r6 ldrb r4, [r0] - ldr r1, _08132088 + ldr r1, =0x085b09c8 _08131F76: ldrh r0, [r1] cmp r4, r0 @@ -627636,37 +607193,37 @@ _08131F86: b _08132126 _08131F9C: lsls r0, r3, 1 - ldr r1, _08132088 + ldr r1, =0x085b09c8 adds r0, r1 ldrh r3, [r0] - ldr r0, _0813208C + ldr r0, =0x0000ffff cmp r3, r0 beq _08131FAC b _08132126 _08131FAC: - ldr r0, _08132098 + ldr r0, =0x02024400 movs r1, 0 strh r1, [r0] - ldr r0, _0813209C + ldr r0, =0x0202449c ldr r0, [r0] strb r1, [r0, 0x13] - ldr r0, _081320A0 + ldr r0, =0x02024474 movs r2, 0x1 strb r2, [r0, 0xE] - ldr r0, _081320A4 + ldr r0, =0x0202427c strb r1, [r0] - ldr r0, _081320A8 + ldr r0, =0x02024211 strb r2, [r0] movs r6, 0 mov r9, r3 - ldr r2, _08132088 + ldr r2, =0x085b09c8 ldrh r2, [r2] str r2, [sp, 0x10] _08131FD0: movs r3, 0 - ldr r5, _081320AC + ldr r5, =0x02024084 lsls r4, r6, 1 - ldr r7, _081320B0 + ldr r7, =0x0203ab3c lsls r0, r6, 2 mov r8, r0 adds r1, r6, 0x1 @@ -627674,7 +607231,7 @@ _08131FD0: ldr r2, [sp, 0x10] cmp r2, r9 beq _08132014 - ldr r2, _08132090 + ldr r2, =0x0831c898 ldrb r1, [r7] movs r0, 0x58 muls r0, r1 @@ -627688,7 +607245,7 @@ _08131FD0: lsls r0, 2 adds r0, r2 ldrb r2, [r0] - ldr r1, _08132088 + ldr r1, =0x085b09c8 _08132004: ldrh r0, [r1] cmp r2, r0 @@ -627710,12 +607267,12 @@ _08132014: cmp r0, 0 beq _081320C0 lsls r0, r3, 1 - ldr r2, _08132088 + ldr r2, =0x085b09c8 adds r0, r2 ldrh r0, [r0] cmp r0, r9 bne _081320C0 - ldr r0, _08132090 + ldr r0, =0x0831c898 ldrh r2, [r1] lsls r1, r2, 1 adds r1, r2 @@ -627724,10 +607281,10 @@ _08132014: ldrb r0, [r1, 0x1] cmp r0, 0x1 bls _081320C0 - ldr r5, _081320B4 + ldr r5, =0x020241ea strh r2, [r5] ldrb r0, [r7] - ldr r4, _081320B8 + ldr r4, =0x0202420c ldrb r1, [r4] bl sub_8046E7C ldrh r0, [r5] @@ -627736,8 +607293,8 @@ _08132014: bl move_effectiveness_something mov r4, sp add r4, r8 - ldr r2, _081320BC - ldr r0, _08132094 + ldr r2, =0x020241f0 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] adds r0, 0x18 @@ -627754,20 +607311,7 @@ _08132014: str r0, [r4] b _081320C8 .align 2, 0 -_08132088: .4byte 0x085b09c8 -_0813208C: .4byte 0x0000ffff -_08132090: .4byte 0x0831c898 -_08132094: .4byte 0x020244a8 -_08132098: .4byte 0x02024400 -_0813209C: .4byte 0x0202449c -_081320A0: .4byte 0x02024474 -_081320A4: .4byte 0x0202427c -_081320A8: .4byte 0x02024211 -_081320AC: .4byte 0x02024084 -_081320B0: .4byte 0x0203ab3c -_081320B4: .4byte 0x020241ea -_081320B8: .4byte 0x0202420c -_081320BC: .4byte 0x020241f0 + .pool _081320C0: mov r1, sp add r1, r8 @@ -627780,7 +607324,7 @@ _081320C8: b _08131FD0 _081320D0: movs r6, 0 - ldr r2, _08132114 + ldr r2, =0x020244a8 ldr r0, [r2] ldr r0, [r0, 0x14] ldrb r0, [r0, 0x1] @@ -627788,7 +607332,7 @@ _081320D0: add r0, sp ldr r1, [sp] ldr r0, [r0] - ldr r5, _08132118 + ldr r5, =0x0203ab38 cmp r1, r0 bgt _08132106 adds r4, r2, 0 @@ -627816,8 +607360,7 @@ _08132106: str r0, [r1, 0x8] b _08132130 .align 2, 0 -_08132114: .4byte 0x020244a8 -_08132118: .4byte 0x0203ab38 + .pool _0813211C: ldr r0, [r2] ldr r1, [r0, 0x14] @@ -627829,7 +607372,7 @@ _08132126: ldr r1, [r0, 0x14] movs r0, 0 str r0, [r1, 0x8] - ldr r5, _08132148 + ldr r5, =0x0203ab38 _08132130: ldr r0, [r5] adds r0, 0x1 @@ -627843,35 +607386,32 @@ _08132130: pop {r0} bx r0 .align 2, 0 -_08132148: .4byte 0x0203ab38 + .pool thumb_func_end dp15_is_most_powerful_move__8 thumb_func_start dp15_get_move_to_execute_B dp15_get_move_to_execute_B: @ 813214C push {lr} - ldr r0, _08132168 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r3, r0, 0 cmp r1, 0x1 bne _08132178 - ldr r0, _0813216C + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] - ldr r1, _08132170 - ldr r0, _08132174 + ldr r1, =0x02024248 + ldr r0, =0x0203ab3c b _08132182 .align 2, 0 -_08132168: .4byte 0x0203ab38 -_0813216C: .4byte 0x020244a8 -_08132170: .4byte 0x02024248 -_08132174: .4byte 0x0203ab3c + .pool _08132178: - ldr r0, _08132198 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] - ldr r1, _0813219C - ldr r0, _081321A0 + ldr r1, =0x02024248 + ldr r0, =0x0202420c _08132182: ldrb r0, [r0] lsls r0, 1 @@ -627884,18 +607424,16 @@ _08132182: pop {r0} bx r0 .align 2, 0 -_08132198: .4byte 0x020244a8 -_0813219C: .4byte 0x02024248 -_081321A0: .4byte 0x0202420c + .pool thumb_func_end dp15_get_move_to_execute_B thumb_func_start tai26_unk tai26_unk: @ 81321A4 push {lr} - ldr r3, _081321D0 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] - ldr r0, _081321D4 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r0, [r0, 0x8] @@ -627914,8 +607452,7 @@ tai26_unk: @ 81321A4 str r1, [r3] b _081321DC .align 2, 0 -_081321D0: .4byte 0x0203ab38 -_081321D4: .4byte 0x020244a8 + .pool _081321D8: adds r0, r2, 0x6 str r0, [r3] @@ -627927,10 +607464,10 @@ _081321DC: thumb_func_start tai27_unk tai27_unk: @ 81321E0 push {lr} - ldr r3, _0813220C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] - ldr r0, _08132210 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldr r0, [r0, 0x8] @@ -627949,8 +607486,7 @@ tai27_unk: @ 81321E0 str r1, [r3] b _08132218 .align 2, 0 -_0813220C: .4byte 0x0203ab38 -_08132210: .4byte 0x020244a8 + .pool _08132214: adds r0, r2, 0x6 str r0, [r3] @@ -627962,13 +607498,13 @@ _08132218: thumb_func_start tai28_unk tai28_unk: @ 813221C push {lr} - ldr r0, _08132254 + ldr r0, =0x0203ab3c ldrb r0, [r0] - ldr r1, _08132258 + ldr r1, =0x0202420c ldrb r1, [r1] movs r2, 0x1 bl b_first_side - ldr r3, _0813225C + ldr r3, =0x0203ab38 ldr r2, [r3] lsls r0, 24 lsrs r0, 24 @@ -627988,9 +607524,7 @@ tai28_unk: @ 813221C str r1, [r3] b _08132264 .align 2, 0 -_08132254: .4byte 0x0203ab3c -_08132258: .4byte 0x0202420c -_0813225C: .4byte 0x0203ab38 + .pool _08132260: adds r0, r2, 0x6 str r0, [r3] @@ -628002,13 +607536,13 @@ _08132264: thumb_func_start tai29_unk tai29_unk: @ 8132268 push {lr} - ldr r0, _081322A0 + ldr r0, =0x0203ab3c ldrb r0, [r0] - ldr r1, _081322A4 + ldr r1, =0x0202420c ldrb r1, [r1] movs r2, 0x1 bl b_first_side - ldr r3, _081322A8 + ldr r3, =0x0203ab38 ldr r2, [r3] lsls r0, 24 lsrs r0, 24 @@ -628028,9 +607562,7 @@ tai29_unk: @ 8132268 str r1, [r3] b _081322B0 .align 2, 0 -_081322A0: .4byte 0x0203ab3c -_081322A4: .4byte 0x0202420c -_081322A8: .4byte 0x0203ab38 + .pool _081322AC: adds r0, r2, 0x6 str r0, [r3] @@ -628054,43 +607586,41 @@ tai2C_unk: @ 81322BC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _081322DC + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0 str r0, [r1, 0x8] - ldr r0, _081322E0 + ldr r0, =0x0203ab38 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 bne _081322E8 - ldr r0, _081322E4 + ldr r0, =0x0203ab3c b _081322EA .align 2, 0 -_081322DC: .4byte 0x020244a8 -_081322E0: .4byte 0x0203ab38 -_081322E4: .4byte 0x0203ab3c + .pool _081322E8: - ldr r0, _08132330 + ldr r0, =0x0202420c _081322EA: ldrb r5, [r0] adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 - ldr r1, _08132334 + ldr r1, =0x02024744 mov r8, r1 cmp r0, 0 bne _08132300 - ldr r0, _08132338 + ldr r0, =0x020244ec mov r8, r0 _08132300: - ldr r0, _0813233C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _08132344 - ldr r4, _08132340 + ldr r4, =0x0202406e lsls r0, r5, 1 adds r0, r4 ldrb r7, [r0] @@ -628107,13 +607637,9 @@ _08132300: ldrb r6, [r0] b _0813234E .align 2, 0 -_08132330: .4byte 0x0202420c -_08132334: .4byte 0x02024744 -_08132338: .4byte 0x020244ec -_0813233C: .4byte 0x02022fec -_08132340: .4byte 0x0202406e + .pool _08132344: - ldr r1, _081323AC + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrb r6, [r0] @@ -628146,7 +607672,7 @@ _08132350: lsls r1, 1 cmp r0, r1 beq _08132394 - ldr r0, _081323B0 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] ldr r0, [r1, 0x8] @@ -628156,7 +607682,7 @@ _08132394: adds r5, 0x1 cmp r5, 0x5 ble _08132350 - ldr r1, _081323B4 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -628166,34 +607692,31 @@ _08132394: pop {r0} bx r0 .align 2, 0 -_081323AC: .4byte 0x0202406e -_081323B0: .4byte 0x020244a8 -_081323B4: .4byte 0x0203ab38 + .pool thumb_func_end tai2C_unk thumb_func_start dp15_get_move_id__8 dp15_get_move_id__8: @ 81323B8 - ldr r0, _081323CC + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] ldrh r0, [r1, 0x2] str r0, [r1, 0x8] - ldr r1, _081323D0 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_081323CC: .4byte 0x020244a8 -_081323D0: .4byte 0x0203ab38 + .pool thumb_func_end dp15_get_move_id__8 thumb_func_start dp15_move_get_move_script_id dp15_move_get_move_script_id: @ 81323D4 - ldr r0, _081323F4 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] - ldr r2, _081323F8 + ldr r2, =0x0831c898 ldrh r1, [r3, 0x2] lsls r0, r1, 1 adds r0, r1 @@ -628201,40 +607724,37 @@ dp15_move_get_move_script_id: @ 81323D4 adds r0, r2 ldrb r0, [r0] str r0, [r3, 0x8] - ldr r1, _081323FC + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_081323F4: .4byte 0x020244a8 -_081323F8: .4byte 0x0831c898 -_081323FC: .4byte 0x0203ab38 + .pool thumb_func_end dp15_move_get_move_script_id thumb_func_start tai2F_unk tai2F_unk: @ 8132400 push {r4-r7,lr} - ldr r0, _08132414 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] mov r12, r0 cmp r1, 0x1 bne _0813241C - ldr r0, _08132418 + ldr r0, =0x0203ab3c b _0813241E .align 2, 0 -_08132414: .4byte 0x0203ab38 -_08132418: .4byte 0x0203ab3c + .pool _0813241C: - ldr r0, _08132440 + ldr r0, =0x0202420c _0813241E: ldrb r3, [r0] - ldr r0, _08132444 + ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, r3 beq _081324F0 - ldr r7, _08132448 + ldr r7, =0x020244a8 ldr r5, [r7] ldr r0, [r5, 0x18] adds r0, 0x40 @@ -628247,11 +607767,9 @@ _0813241E: str r0, [r1, 0x8] b _08132504 .align 2, 0 -_08132440: .4byte 0x0202420c -_08132444: .4byte 0x02024064 -_08132448: .4byte 0x020244a8 + .pool _0813244C: - ldr r1, _0813247C + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 adds r4, r0, r1 @@ -628276,9 +607794,9 @@ _08132468: str r0, [r1, 0x8] b _08132504 .align 2, 0 -_0813247C: .4byte 0x02024084 + .pool _08132480: - ldr r6, _081324BC + ldr r6, =0x083203cc ldrh r0, [r4] lsls r1, r0, 3 subs r1, r0 @@ -628304,12 +607822,11 @@ _08132480: adds r0, r6 ldrb r0, [r0, 0x16] str r0, [r2, 0x8] - ldr r0, _081324C0 + ldr r0, =0x0203ab38 mov r12, r0 b _08132504 .align 2, 0 -_081324BC: .4byte 0x083203cc -_081324C0: .4byte 0x0203ab38 + .pool _081324C4: ldr r0, [r7] ldr r2, [r0, 0x14] @@ -628320,11 +607837,11 @@ _081324C4: adds r0, r6 ldrb r0, [r0, 0x17] str r0, [r2, 0x8] - ldr r1, _081324DC + ldr r1, =0x0203ab38 mov r12, r1 b _08132504 .align 2, 0 -_081324DC: .4byte 0x0203ab38 + .pool _081324E0: ldr r1, [r5, 0x14] ldrb r0, [r2, 0x16] @@ -628336,10 +607853,10 @@ _081324E8: str r0, [r1, 0x8] b _08132504 _081324F0: - ldr r0, _08132514 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] - ldr r1, _08132518 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 adds r0, r1 @@ -628355,14 +607872,13 @@ _08132504: pop {r0} bx r0 .align 2, 0 -_08132514: .4byte 0x020244a8 -_08132518: .4byte 0x02024084 + .pool thumb_func_end tai2F_unk thumb_func_start tai60_unk tai60_unk: @ 813251C push {r4-r6,lr} - ldr r4, _08132554 + ldr r4, =0x0203ab38 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8131E70 @@ -628376,7 +607892,7 @@ tai60_unk: @ 813251C cmp r0, 0x2 bne _081325BC _0813253A: - ldr r0, _08132558 + ldr r0, =0x020244a8 ldr r4, [r0] ldr r1, [r4, 0x18] adds r1, 0x40 @@ -628390,10 +607906,9 @@ _0813253A: str r3, [r0, 0x8] b _081325CA .align 2, 0 -_08132554: .4byte 0x0203ab38 -_08132558: .4byte 0x020244a8 + .pool _0813255C: - ldr r1, _08132584 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r5 adds r4, r0, r1 @@ -628414,9 +607929,9 @@ _08132576: ldrb r3, [r0] b _081325CA .align 2, 0 -_08132584: .4byte 0x02024084 + .pool _08132588: - ldr r2, _081325B0 + ldr r2, =0x083203cc ldrh r1, [r4] lsls r0, r1, 3 subs r0, r1 @@ -628436,7 +607951,7 @@ _08132588: adds r3, r4, 0 b _081325CA .align 2, 0 -_081325B0: .4byte 0x083203cc + .pool _081325B4: ldrb r3, [r1, 0x16] b _081325CA @@ -628444,13 +607959,13 @@ _081325B8: ldrb r3, [r1, 0x17] b _081325CA _081325BC: - ldr r1, _081325DC + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r5 adds r0, r1 adds r0, 0x20 ldrb r3, [r0] - ldr r6, _081325E0 + ldr r6, =0x020244a8 _081325CA: cmp r3, 0 bne _081325E8 @@ -628459,14 +607974,12 @@ _081325CE: ldr r1, [r0, 0x14] movs r0, 0x2 str r0, [r1, 0x8] - ldr r2, _081325E4 + ldr r2, =0x0203ab38 b _08132608 .align 2, 0 -_081325DC: .4byte 0x02024084 -_081325E0: .4byte 0x020244a8 -_081325E4: .4byte 0x0203ab38 + .pool _081325E8: - ldr r0, _081325FC + ldr r0, =0x0203ab38 ldr r1, [r0] adds r2, r0, 0 ldrb r1, [r1, 0x2] @@ -628477,7 +607990,7 @@ _081325E8: movs r0, 0x1 b _08132606 .align 2, 0 -_081325FC: .4byte 0x0203ab38 + .pool _08132600: ldr r0, [r6] ldr r1, [r0, 0x14] @@ -628498,30 +608011,30 @@ tai30_unk: @ 8132614 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _081326D0 + ldr r0, =0x02024400 movs r1, 0 strh r1, [r0] - ldr r0, _081326D4 + ldr r0, =0x0202449c ldr r0, [r0] strb r1, [r0, 0x13] - ldr r0, _081326D8 + ldr r0, =0x02024474 movs r3, 0 movs r2, 0x1 strb r2, [r0, 0xE] - ldr r0, _081326DC + ldr r0, =0x0202427c strb r1, [r0] - ldr r0, _081326E0 + ldr r0, =0x02024211 strb r2, [r0] - ldr r0, _081326E4 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] str r3, [r0, 0x8] movs r5, 0 - ldr r4, _081326E8 - ldr r7, _081326EC - ldr r0, _081326F0 + ldr r4, =0x020241f0 + ldr r7, =0x020241ea + ldr r0, =0x02024090 mov r8, r0 - ldr r6, _081326F4 + ldr r6, =0x0203ab3c _0813264A: movs r0, 0x28 str r0, [r4] @@ -628538,7 +608051,7 @@ _0813264A: beq _081326B8 ldrh r0, [r7] ldrb r1, [r6] - ldr r2, _081326F8 + ldr r2, =0x0202420c ldrb r2, [r2] bl move_effectiveness_something ldr r0, [r4] @@ -628565,7 +608078,7 @@ _0813268E: movs r0, 0xA str r0, [r4] _08132698: - ldr r0, _081326DC + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x8 ands r0, r1 @@ -628574,7 +608087,7 @@ _08132698: movs r0, 0 str r0, [r4] _081326A8: - ldr r0, _081326E4 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] ldr r0, [r2, 0x8] @@ -628586,7 +608099,7 @@ _081326B8: adds r5, 0x1 cmp r5, 0x3 ble _0813264A - ldr r1, _081326FC + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -628596,49 +608109,38 @@ _081326B8: pop {r0} bx r0 .align 2, 0 -_081326D0: .4byte 0x02024400 -_081326D4: .4byte 0x0202449c -_081326D8: .4byte 0x02024474 -_081326DC: .4byte 0x0202427c -_081326E0: .4byte 0x02024211 -_081326E4: .4byte 0x020244a8 -_081326E8: .4byte 0x020241f0 -_081326EC: .4byte 0x020241ea -_081326F0: .4byte 0x02024090 -_081326F4: .4byte 0x0203ab3c -_081326F8: .4byte 0x0202420c -_081326FC: .4byte 0x0203ab38 + .pool thumb_func_end tai30_unk thumb_func_start dp15_simulate_damage_bonus_jump_if_eq dp15_simulate_damage_bonus_jump_if_eq: @ 8132700 push {r4,r5,lr} - ldr r0, _08132798 + ldr r0, =0x02024400 movs r1, 0 strh r1, [r0] - ldr r0, _0813279C + ldr r0, =0x0202449c ldr r0, [r0] strb r1, [r0, 0x13] - ldr r0, _081327A0 + ldr r0, =0x02024474 movs r2, 0x1 strb r2, [r0, 0xE] - ldr r5, _081327A4 + ldr r5, =0x0202427c strb r1, [r5] - ldr r0, _081327A8 + ldr r0, =0x02024211 strb r2, [r0] - ldr r4, _081327AC + ldr r4, =0x020241f0 movs r0, 0x28 str r0, [r4] - ldr r1, _081327B0 - ldr r0, _081327B4 + ldr r1, =0x020241ea + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldrh r0, [r0, 0x2] strh r0, [r1] ldrh r0, [r1] - ldr r1, _081327B8 + ldr r1, =0x0203ab3c ldrb r1, [r1] - ldr r2, _081327BC + ldr r2, =0x0202420c ldrb r2, [r2] bl move_effectiveness_something ldr r0, [r4] @@ -628674,7 +608176,7 @@ _08132764: str r0, [r4] _08132772: ldrb r0, [r4] - ldr r3, _081327C0 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] cmp r0, r1 @@ -628692,17 +608194,7 @@ _08132772: str r1, [r3] b _081327C8 .align 2, 0 -_08132798: .4byte 0x02024400 -_0813279C: .4byte 0x0202449c -_081327A0: .4byte 0x02024474 -_081327A4: .4byte 0x0202427c -_081327A8: .4byte 0x02024211 -_081327AC: .4byte 0x020241f0 -_081327B0: .4byte 0x020241ea -_081327B4: .4byte 0x020244a8 -_081327B8: .4byte 0x0203ab3c -_081327BC: .4byte 0x0202420c -_081327C0: .4byte 0x0203ab38 + .pool _081327C4: adds r0, r2, 0x6 str r0, [r3] @@ -628729,18 +608221,17 @@ tai34_unk: @ 81327D8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _081327F0 + ldr r0, =0x0203ab38 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 bne _08132818 - ldr r0, _081327F4 + ldr r0, =0x0203ab3c b _0813281A .align 2, 0 -_081327F0: .4byte 0x0203ab38 -_081327F4: .4byte 0x0203ab3c + .pool _081327F8: - ldr r3, _08132814 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x6] ldrb r0, [r2, 0x7] @@ -628755,21 +608246,21 @@ _081327F8: str r1, [r3] b _0813289A .align 2, 0 -_08132814: .4byte 0x0203ab38 + .pool _08132818: - ldr r0, _081328A8 + ldr r0, =0x0202420c _0813281A: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 - ldr r1, _081328AC + ldr r1, =0x02024744 mov r9, r1 cmp r0, 0 bne _0813282E - ldr r0, _081328B0 + ldr r0, =0x020244ec mov r9, r0 _0813282E: - ldr r0, _081328B4 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r7, [r1, 0x2] ldrb r0, [r1, 0x3] @@ -628818,7 +608309,7 @@ _08132888: mov r0, r8 cmp r0, 0x5 ble _08132850 - ldr r1, _081328B4 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0xA str r0, [r1] @@ -628831,10 +608322,7 @@ _0813289A: pop {r0} bx r0 .align 2, 0 -_081328A8: .4byte 0x0202420c -_081328AC: .4byte 0x02024744 -_081328B0: .4byte 0x020244ec -_081328B4: .4byte 0x0203ab38 + .pool thumb_func_end tai34_unk thumb_func_start tai35_unk @@ -628844,30 +608332,29 @@ tai35_unk: @ 81328B8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _081328D0 + ldr r0, =0x0203ab38 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 bne _081328D8 - ldr r0, _081328D4 + ldr r0, =0x0203ab3c b _081328DA .align 2, 0 -_081328D0: .4byte 0x0203ab38 -_081328D4: .4byte 0x0203ab3c + .pool _081328D8: - ldr r0, _08132984 + ldr r0, =0x0202420c _081328DA: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 - ldr r1, _08132988 + ldr r1, =0x02024744 mov r10, r1 cmp r0, 0 bne _081328EE - ldr r0, _0813298C + ldr r0, =0x020244ec mov r10, r0 _081328EE: - ldr r2, _08132990 + ldr r2, =0x0203ab38 ldr r1, [r2] ldrb r7, [r1, 0x2] ldrb r0, [r1, 0x3] @@ -628920,7 +608407,7 @@ _08132950: mov r1, r8 cmp r1, 0x5 ble _0813290C - ldr r3, _08132990 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x6] ldrb r0, [r2, 0x7] @@ -628941,22 +608428,19 @@ _08132950: pop {r0} bx r0 .align 2, 0 -_08132984: .4byte 0x0202420c -_08132988: .4byte 0x02024744 -_0813298C: .4byte 0x020244ec -_08132990: .4byte 0x0203ab38 + .pool thumb_func_end tai35_unk thumb_func_start dp15_get_weather__8 dp15_get_weather__8: @ 8132994 push {lr} - ldr r2, _081329F4 + ldr r2, =0x020243cc ldrh r1, [r2] movs r0, 0x7 ands r0, r1 cmp r0, 0 beq _081329AC - ldr r0, _081329F8 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x1 @@ -628967,7 +608451,7 @@ _081329AC: ands r0, r1 cmp r0, 0 beq _081329C0 - ldr r0, _081329F8 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x2 @@ -628978,7 +608462,7 @@ _081329C0: ands r0, r1 cmp r0, 0 beq _081329D4 - ldr r0, _081329F8 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0 @@ -628989,29 +608473,27 @@ _081329D4: ands r0, r1 cmp r0, 0 beq _081329E8 - ldr r0, _081329F8 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x14] movs r0, 0x3 str r0, [r1, 0x8] _081329E8: - ldr r1, _081329FC + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_081329F4: .4byte 0x020243cc -_081329F8: .4byte 0x020244a8 -_081329FC: .4byte 0x0203ab38 + .pool thumb_func_end dp15_get_weather__8 thumb_func_start tai37_unk tai37_unk: @ 8132A00 push {lr} - ldr r2, _08132A38 - ldr r0, _08132A3C + ldr r2, =0x0831c898 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldrh r1, [r0, 0x2] @@ -629019,7 +608501,7 @@ tai37_unk: @ 8132A00 adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r3, _08132A40 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r0, [r0] ldrb r1, [r2, 0x1] @@ -629038,9 +608520,7 @@ tai37_unk: @ 8132A00 str r1, [r3] b _08132A48 .align 2, 0 -_08132A38: .4byte 0x0831c898 -_08132A3C: .4byte 0x020244a8 -_08132A40: .4byte 0x0203ab38 + .pool _08132A44: adds r0, r2, 0x6 str r0, [r3] @@ -629052,8 +608532,8 @@ _08132A48: thumb_func_start tai38_unk tai38_unk: @ 8132A4C push {lr} - ldr r2, _08132A84 - ldr r0, _08132A88 + ldr r2, =0x0831c898 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x14] ldrh r1, [r0, 0x2] @@ -629061,7 +608541,7 @@ tai38_unk: @ 8132A4C adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r3, _08132A8C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r0, [r0] ldrb r1, [r2, 0x1] @@ -629080,9 +608560,7 @@ tai38_unk: @ 8132A4C str r1, [r3] b _08132A94 .align 2, 0 -_08132A84: .4byte 0x0831c898 -_08132A88: .4byte 0x020244a8 -_08132A8C: .4byte 0x0203ab38 + .pool _08132A90: adds r0, r2, 0x6 str r0, [r3] @@ -629094,22 +608572,21 @@ _08132A94: thumb_func_start tai39_unk tai39_unk: @ 8132A98 push {r4,lr} - ldr r0, _08132AAC + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _08132AB4 - ldr r0, _08132AB0 + ldr r0, =0x0203ab3c b _08132AB6 .align 2, 0 -_08132AAC: .4byte 0x0203ab38 -_08132AB0: .4byte 0x0203ab3c + .pool _08132AB4: - ldr r0, _08132AEC + ldr r0, =0x0202420c _08132AB6: ldrb r3, [r0] - ldr r1, _08132AF0 + ldr r1, =0x02024084 ldr r2, [r4] movs r0, 0x58 muls r0, r3 @@ -629136,8 +608613,7 @@ _08132AB6: str r1, [r4] b _08132AFA .align 2, 0 -_08132AEC: .4byte 0x0202420c -_08132AF0: .4byte 0x02024084 + .pool _08132AF4: adds r0, r2, 0 adds r0, 0x8 @@ -629151,22 +608627,21 @@ _08132AFA: thumb_func_start tai3A_unk tai3A_unk: @ 8132B00 push {r4,lr} - ldr r0, _08132B14 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _08132B1C - ldr r0, _08132B18 + ldr r0, =0x0203ab3c b _08132B1E .align 2, 0 -_08132B14: .4byte 0x0203ab38 -_08132B18: .4byte 0x0203ab3c + .pool _08132B1C: - ldr r0, _08132B54 + ldr r0, =0x0202420c _08132B1E: ldrb r3, [r0] - ldr r1, _08132B58 + ldr r1, =0x02024084 ldr r2, [r4] movs r0, 0x58 muls r0, r3 @@ -629193,8 +608668,7 @@ _08132B1E: str r1, [r4] b _08132B62 .align 2, 0 -_08132B54: .4byte 0x0202420c -_08132B58: .4byte 0x02024084 + .pool _08132B5C: adds r0, r2, 0 adds r0, 0x8 @@ -629208,22 +608682,21 @@ _08132B62: thumb_func_start tai3B_unk tai3B_unk: @ 8132B68 push {r4,lr} - ldr r0, _08132B7C + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _08132B84 - ldr r0, _08132B80 + ldr r0, =0x0203ab3c b _08132B86 .align 2, 0 -_08132B7C: .4byte 0x0203ab38 -_08132B80: .4byte 0x0203ab3c + .pool _08132B84: - ldr r0, _08132BBC + ldr r0, =0x0202420c _08132B86: ldrb r3, [r0] - ldr r1, _08132BC0 + ldr r1, =0x02024084 ldr r2, [r4] movs r0, 0x58 muls r0, r3 @@ -629250,8 +608723,7 @@ _08132B86: str r1, [r4] b _08132BCA .align 2, 0 -_08132BBC: .4byte 0x0202420c -_08132BC0: .4byte 0x02024084 + .pool _08132BC4: adds r0, r2, 0 adds r0, 0x8 @@ -629265,22 +608737,21 @@ _08132BCA: thumb_func_start tai3C_unk tai3C_unk: @ 8132BD0 push {r4,lr} - ldr r0, _08132BE4 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _08132BEC - ldr r0, _08132BE8 + ldr r0, =0x0203ab3c b _08132BEE .align 2, 0 -_08132BE4: .4byte 0x0203ab38 -_08132BE8: .4byte 0x0203ab3c + .pool _08132BEC: - ldr r0, _08132C24 + ldr r0, =0x0202420c _08132BEE: ldrb r3, [r0] - ldr r1, _08132C28 + ldr r1, =0x02024084 ldr r2, [r4] movs r0, 0x58 muls r0, r3 @@ -629307,8 +608778,7 @@ _08132BEE: str r1, [r4] b _08132C32 .align 2, 0 -_08132C24: .4byte 0x0202420c -_08132C28: .4byte 0x02024084 + .pool _08132C2C: adds r0, r2, 0 adds r0, 0x8 @@ -629324,8 +608794,8 @@ tai3D_unk: @ 8132C38 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r2, _08132CE8 - ldr r0, _08132CEC + ldr r2, =0x0831c898 + ldr r0, =0x020244a8 mov r8, r0 ldr r0, [r0] ldr r0, [r0, 0x14] @@ -629337,35 +608807,35 @@ tai3D_unk: @ 8132C38 ldrb r0, [r0, 0x1] cmp r0, 0x1 bls _08132D1C - ldr r0, _08132CF0 + ldr r0, =0x02024400 movs r1, 0 strh r1, [r0] - ldr r0, _08132CF4 + ldr r0, =0x0202449c ldr r0, [r0] strb r1, [r0, 0x13] - ldr r0, _08132CF8 + ldr r0, =0x02024474 movs r7, 0x1 strb r7, [r0, 0xE] - ldr r0, _08132CFC + ldr r0, =0x0202427c strb r1, [r0] - ldr r0, _08132D00 + ldr r0, =0x02024211 strb r7, [r0] - ldr r5, _08132D04 + ldr r5, =0x020241ea mov r1, r8 ldr r0, [r1] ldr r0, [r0, 0x14] ldrh r0, [r0, 0x2] strh r0, [r5] - ldr r4, _08132D08 + ldr r4, =0x0203ab3c ldrb r0, [r4] - ldr r6, _08132D0C + ldr r6, =0x0202420c ldrb r1, [r6] bl sub_8046E7C ldrh r0, [r5] ldrb r1, [r4] ldrb r2, [r6] bl move_effectiveness_something - ldr r4, _08132D10 + ldr r4, =0x020241f0 mov r1, r8 ldr r0, [r1] ldr r1, [r0, 0x14] @@ -629383,7 +608853,7 @@ tai3D_unk: @ 8132C38 bne _08132CB8 str r7, [r4] _08132CB8: - ldr r2, _08132D14 + ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 muls r0, r1 @@ -629392,7 +608862,7 @@ _08132CB8: ldr r0, [r4] cmp r1, r0 bgt _08132D1C - ldr r3, _08132D18 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -629407,21 +608877,9 @@ _08132CB8: str r1, [r3] b _08132D24 .align 2, 0 -_08132CE8: .4byte 0x0831c898 -_08132CEC: .4byte 0x020244a8 -_08132CF0: .4byte 0x02024400 -_08132CF4: .4byte 0x0202449c -_08132CF8: .4byte 0x02024474 -_08132CFC: .4byte 0x0202427c -_08132D00: .4byte 0x02024211 -_08132D04: .4byte 0x020241ea -_08132D08: .4byte 0x0203ab3c -_08132D0C: .4byte 0x0202420c -_08132D10: .4byte 0x020241f0 -_08132D14: .4byte 0x02024084 -_08132D18: .4byte 0x0203ab38 + .pool _08132D1C: - ldr r1, _08132D30 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -629432,14 +608890,14 @@ _08132D24: pop {r0} bx r0 .align 2, 0 -_08132D30: .4byte 0x0203ab38 + .pool thumb_func_end tai3D_unk thumb_func_start dp15_determine_move_damage_jump_if_not_fatal dp15_determine_move_damage_jump_if_not_fatal: @ 8132D34 push {r4-r7,lr} - ldr r2, _08132DD0 - ldr r7, _08132DD4 + ldr r2, =0x0831c898 + ldr r7, =0x020244a8 ldr r0, [r7] ldr r0, [r0, 0x14] ldrh r1, [r0, 0x2] @@ -629450,34 +608908,34 @@ dp15_determine_move_damage_jump_if_not_fatal: @ 8132D34 ldrb r0, [r0, 0x1] cmp r0, 0x1 bls _08132E04 - ldr r0, _08132DD8 + ldr r0, =0x02024400 movs r1, 0 strh r1, [r0] - ldr r0, _08132DDC + ldr r0, =0x0202449c ldr r0, [r0] strb r1, [r0, 0x13] - ldr r0, _08132DE0 + ldr r0, =0x02024474 movs r2, 0x1 strb r2, [r0, 0xE] - ldr r0, _08132DE4 + ldr r0, =0x0202427c strb r1, [r0] - ldr r0, _08132DE8 + ldr r0, =0x02024211 strb r2, [r0] - ldr r6, _08132DEC + ldr r6, =0x020241ea ldr r0, [r7] ldr r0, [r0, 0x14] ldrh r0, [r0, 0x2] strh r0, [r6] - ldr r4, _08132DF0 + ldr r4, =0x0203ab3c ldrb r0, [r4] - ldr r5, _08132DF4 + ldr r5, =0x0202420c ldrb r1, [r5] bl sub_8046E7C ldrh r0, [r6] ldrb r1, [r4] ldrb r2, [r5] bl move_effectiveness_something - ldr r4, _08132DF8 + ldr r4, =0x020241f0 ldr r0, [r7] ldr r1, [r0, 0x14] adds r0, r1, 0 @@ -629490,7 +608948,7 @@ dp15_determine_move_damage_jump_if_not_fatal: @ 8132D34 movs r1, 0x64 bl __divsi3 str r0, [r4] - ldr r3, _08132DFC + ldr r3, =0x02024084 ldrb r2, [r5] movs r1, 0x58 muls r1, r2 @@ -629498,7 +608956,7 @@ dp15_determine_move_damage_jump_if_not_fatal: @ 8132D34 ldrh r1, [r1, 0x28] cmp r1, r0 ble _08132E04 - ldr r3, _08132E00 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -629513,21 +608971,9 @@ dp15_determine_move_damage_jump_if_not_fatal: @ 8132D34 str r1, [r3] b _08132E0C .align 2, 0 -_08132DD0: .4byte 0x0831c898 -_08132DD4: .4byte 0x020244a8 -_08132DD8: .4byte 0x02024400 -_08132DDC: .4byte 0x0202449c -_08132DE0: .4byte 0x02024474 -_08132DE4: .4byte 0x0202427c -_08132DE8: .4byte 0x02024211 -_08132DEC: .4byte 0x020241ea -_08132DF0: .4byte 0x0203ab3c -_08132DF4: .4byte 0x0202420c -_08132DF8: .4byte 0x020241f0 -_08132DFC: .4byte 0x02024084 -_08132E00: .4byte 0x0203ab38 + .pool _08132E04: - ldr r1, _08132E14 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -629536,13 +608982,13 @@ _08132E0C: pop {r0} bx r0 .align 2, 0 -_08132E14: .4byte 0x0203ab38 + .pool thumb_func_end dp15_determine_move_damage_jump_if_not_fatal thumb_func_start tai3F_unk tai3F_unk: @ 8132E18 push {r4-r7,lr} - ldr r0, _08132E34 + ldr r0, =0x0203ab38 ldr r5, [r0] adds r7, r5, 0x2 ldrb r1, [r5, 0x1] @@ -629555,7 +609001,7 @@ tai3F_unk: @ 8132E18 beq _08132EDC b _08132F40 .align 2, 0 -_08132E34: .4byte 0x0203ab38 + .pool _08132E38: cmp r1, 0x2 beq _08132EDC @@ -629564,8 +609010,8 @@ _08132E38: b _08132F40 _08132E42: movs r4, 0 - ldr r3, _08132E7C - ldr r2, _08132E80 + ldr r3, =0x02024084 + ldr r2, =0x0203ab3c ldrb r1, [r2] movs r0, 0x58 muls r0, r1 @@ -629594,11 +609040,10 @@ _08132E74: beq _08132F18 b _08132F28 .align 2, 0 -_08132E7C: .4byte 0x02024084 -_08132E80: .4byte 0x0203ab3c + .pool _08132E84: - ldr r3, _08132EA0 - ldr r2, _08132EA4 + ldr r3, =0x02024084 + ldr r2, =0x0203ab3c ldrb r1, [r2] movs r0, 0x2 eors r0, r1 @@ -629611,8 +609056,7 @@ _08132E84: adds r0, r5, 0 b _08132F1A .align 2, 0 -_08132EA0: .4byte 0x02024084 -_08132EA4: .4byte 0x0203ab3c + .pool _08132EA8: movs r4, 0 adds r3, 0xC @@ -629643,10 +609087,10 @@ _08132EBC: b _08132E74 _08132EDC: movs r4, 0 - ldr r3, _08132F20 + ldr r3, =0x020244a8 ldr r0, [r3] ldr r1, [r0, 0x18] - ldr r2, _08132F24 + ldr r2, =0x0202420c ldrb r0, [r2] lsls r0, 4 adds r1, r0 @@ -629681,8 +609125,7 @@ _08132F1A: str r0, [r6] b _08132F40 .align 2, 0 -_08132F20: .4byte 0x020244a8 -_08132F24: .4byte 0x0202420c + .pool _08132F28: ldr r2, [r6] ldrb r1, [r2, 0x4] @@ -629705,7 +609148,7 @@ _08132F40: thumb_func_start tai40_unk tai40_unk: @ 8132F48 push {r4-r7,lr} - ldr r1, _08132F64 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r6, r0, 0x2 ldrb r0, [r0, 0x1] @@ -629718,7 +609161,7 @@ tai40_unk: @ 8132F48 beq _08132FB4 b _08133018 .align 2, 0 -_08132F64: .4byte 0x0203ab38 + .pool _08132F68: cmp r0, 0x2 beq _08132FB4 @@ -629726,8 +609169,8 @@ _08132F68: bne _08133018 _08132F70: movs r3, 0 - ldr r2, _08132FAC - ldr r4, _08132FB0 + ldr r2, =0x02024084 + ldr r4, =0x0203ab3c ldrb r1, [r4] movs r0, 0x58 muls r0, r1 @@ -629758,14 +609201,13 @@ _08132FA6: bne _08132FF0 b _08133000 .align 2, 0 -_08132FAC: .4byte 0x02024084 -_08132FB0: .4byte 0x0203ab3c + .pool _08132FB4: movs r3, 0 - ldr r4, _08132FF8 + ldr r4, =0x020244a8 ldr r0, [r4] ldr r1, [r0, 0x18] - ldr r2, _08132FFC + ldr r2, =0x0202420c ldrb r0, [r2] lsls r0, 4 adds r1, r0 @@ -629799,8 +609241,7 @@ _08132FF0: str r0, [r5] b _08133018 .align 2, 0 -_08132FF8: .4byte 0x020244a8 -_08132FFC: .4byte 0x0202420c + .pool _08133000: ldr r2, [r5] ldrb r1, [r2, 0x4] @@ -629823,7 +609264,7 @@ _08133018: thumb_func_start tai41_unk tai41_unk: @ 8133020 push {r4-r7,lr} - ldr r1, _08133038 + ldr r1, =0x0203ab38 ldr r0, [r1] ldrb r0, [r0, 0x1] adds r5, r1, 0 @@ -629835,7 +609276,7 @@ tai41_unk: @ 8133020 beq _08133090 b _08133110 .align 2, 0 -_08133038: .4byte 0x0203ab38 + .pool _0813303C: cmp r0, 0x2 beq _08133090 @@ -629843,15 +609284,15 @@ _0813303C: bne _08133110 _08133044: movs r3, 0 - ldr r1, _08133080 - ldr r0, _08133084 + ldr r1, =0x02024084 + ldr r0, =0x0203ab3c ldrb r2, [r0] - ldr r6, _08133088 + ldr r6, =0x0831c898 movs r0, 0x58 muls r0, r2 adds r1, 0xC adds r2, r0, r1 - ldr r4, _0813308C + ldr r4, =0x0203ab38 _08133058: ldrh r0, [r2] cmp r0, 0 @@ -629876,19 +609317,16 @@ _0813307A: beq _081330DC b _081330F8 .align 2, 0 -_08133080: .4byte 0x02024084 -_08133084: .4byte 0x0203ab3c -_08133088: .4byte 0x0831c898 -_0813308C: .4byte 0x0203ab38 + .pool _08133090: movs r3, 0 - ldr r1, _081330E4 - ldr r0, _081330E8 + ldr r1, =0x02024084 + ldr r0, =0x0203ab3c ldrb r2, [r0] - ldr r0, _081330EC + ldr r0, =0x0831c898 mov r12, r0 - ldr r7, _081330F0 - ldr r6, _081330F4 + ldr r7, =0x020244a8 + ldr r6, =0x0202420c movs r0, 0x58 muls r0, r2 adds r1, 0xC @@ -629928,11 +609366,7 @@ _081330DC: str r0, [r5] b _08133110 .align 2, 0 -_081330E4: .4byte 0x02024084 -_081330E8: .4byte 0x0203ab3c -_081330EC: .4byte 0x0831c898 -_081330F0: .4byte 0x020244a8 -_081330F4: .4byte 0x0202420c + .pool _081330F8: ldr r2, [r5] ldrb r1, [r2, 0x3] @@ -629955,7 +609389,7 @@ _08133110: thumb_func_start tai42_unk tai42_unk: @ 8133118 push {r4-r6,lr} - ldr r1, _08133130 + ldr r1, =0x0203ab38 ldr r0, [r1] ldrb r0, [r0, 0x1] adds r4, r1, 0 @@ -629967,7 +609401,7 @@ tai42_unk: @ 8133118 beq _08133188 b _081331F4 .align 2, 0 -_08133130: .4byte 0x0203ab38 + .pool _08133134: cmp r0, 0x2 beq _08133188 @@ -629975,15 +609409,15 @@ _08133134: bne _081331F4 _0813313C: movs r3, 0 - ldr r1, _08133178 - ldr r0, _0813317C + ldr r1, =0x02024084 + ldr r0, =0x0203ab3c ldrb r2, [r0] - ldr r6, _08133180 + ldr r6, =0x0831c898 movs r0, 0x58 muls r0, r2 adds r1, 0xC adds r2, r0, r1 - ldr r5, _08133184 + ldr r5, =0x0203ab38 _08133150: ldrh r0, [r2] cmp r0, 0 @@ -630008,21 +609442,18 @@ _08133172: bne _081331C2 b _081331DC .align 2, 0 -_08133178: .4byte 0x02024084 -_0813317C: .4byte 0x0203ab3c -_08133180: .4byte 0x0831c898 -_08133184: .4byte 0x0203ab38 + .pool _08133188: movs r3, 0 - ldr r0, _081331CC + ldr r0, =0x020244a8 ldr r0, [r0] ldr r1, [r0, 0x18] - ldr r0, _081331D0 + ldr r0, =0x0202420c ldrb r0, [r0] - ldr r6, _081331D4 + ldr r6, =0x0831c898 lsls r0, 4 adds r2, r0, r1 - ldr r5, _081331D8 + ldr r5, =0x0203ab38 _0813319C: ldrh r0, [r2] cmp r0, 0 @@ -630051,10 +609482,7 @@ _081331C2: str r0, [r4] b _081331F4 .align 2, 0 -_081331CC: .4byte 0x020244a8 -_081331D0: .4byte 0x0202420c -_081331D4: .4byte 0x0831c898 -_081331D8: .4byte 0x0203ab38 + .pool _081331DC: ldr r2, [r4] ldrb r1, [r2, 0x3] @@ -630077,19 +609505,18 @@ _081331F4: thumb_func_start tai43_unk tai43_unk: @ 81331FC push {r4,r5,lr} - ldr r0, _08133210 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 bne _08133218 - ldr r0, _08133214 + ldr r0, =0x0203ab3c b _0813321A .align 2, 0 -_08133210: .4byte 0x0203ab38 -_08133214: .4byte 0x0203ab3c + .pool _08133218: - ldr r0, _08133238 + ldr r0, =0x0202420c _0813321A: ldrb r3, [r0] adds r4, r5, 0 @@ -630097,7 +609524,7 @@ _0813321A: ldrb r0, [r2, 0x2] cmp r0, 0 bne _08133240 - ldr r0, _0813323C + ldr r0, =0x020242bc lsls r1, r3, 3 subs r1, r3 lsls r1, 2 @@ -630107,8 +609534,7 @@ _0813321A: beq _08133244 b _0813325A .align 2, 0 -_08133238: .4byte 0x0202420c -_0813323C: .4byte 0x020242bc + .pool _08133240: cmp r0, 0x1 beq _0813324A @@ -630117,7 +609543,7 @@ _08133244: str r0, [r4] b _0813327C _0813324A: - ldr r0, _08133274 + ldr r0, =0x020242bc lsls r1, r3, 3 subs r1, r3 lsls r1, 2 @@ -630139,7 +609565,7 @@ _0813325A: str r1, [r4] b _0813327C .align 2, 0 -_08133274: .4byte 0x020242bc + .pool _08133278: adds r0, r2, 0x7 str r0, [r5] @@ -630152,7 +609578,7 @@ _0813327C: thumb_func_start tai44_unk tai44_unk: @ 8133284 push {r4,lr} - ldr r4, _08133298 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r0, [r3, 0x1] cmp r0, 0 @@ -630161,16 +609587,16 @@ tai44_unk: @ 8133284 beq _081332C8 b _08133308 .align 2, 0 -_08133298: .4byte 0x0203ab38 + .pool _0813329C: - ldr r2, _081332BC - ldr r0, _081332C0 + ldr r2, =0x020242bc + ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081332C4 + ldr r1, =0x020244a8 ldr r1, [r1] ldr r1, [r1, 0x14] ldrh r0, [r0, 0x4] @@ -630179,18 +609605,16 @@ _0813329C: beq _081332E4 b _08133308 .align 2, 0 -_081332BC: .4byte 0x020242bc -_081332C0: .4byte 0x02024064 -_081332C4: .4byte 0x020244a8 + .pool _081332C8: - ldr r2, _081332FC - ldr r0, _08133300 + ldr r2, =0x020242bc + ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _08133304 + ldr r1, =0x020244a8 ldr r1, [r1] ldr r1, [r1, 0x14] ldrh r0, [r0, 0x6] @@ -630211,9 +609635,7 @@ _081332E4: str r1, [r4] b _0813330C .align 2, 0 -_081332FC: .4byte 0x020242bc -_08133300: .4byte 0x02024064 -_08133304: .4byte 0x020244a8 + .pool _08133308: adds r0, r3, 0x6 str r0, [r4] @@ -630225,7 +609647,7 @@ _0813330C: thumb_func_start tai45_unk tai45_unk: @ 8133314 - ldr r0, _08133324 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] ldrb r1, [r2, 0x10] @@ -630234,13 +609656,13 @@ tai45_unk: @ 8133314 strb r0, [r2, 0x10] bx lr .align 2, 0 -_08133324: .4byte 0x020244a8 + .pool thumb_func_end tai45_unk thumb_func_start tai46_unk tai46_unk: @ 8133328 push {r4,lr} - ldr r0, _0813336C + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x7B ldrb r0, [r0] @@ -630257,7 +609679,7 @@ tai46_unk: @ 8133328 lsrs r0, 24 cmp r0, r4 bcs _08133374 - ldr r3, _08133370 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -630272,10 +609694,9 @@ tai46_unk: @ 8133328 str r1, [r3] b _0813337C .align 2, 0 -_0813336C: .4byte 0x0202449c -_08133370: .4byte 0x0203ab38 + .pool _08133374: - ldr r1, _08133384 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -630284,12 +609705,12 @@ _0813337C: pop {r0} bx r0 .align 2, 0 -_08133384: .4byte 0x0203ab38 + .pool thumb_func_end tai46_unk thumb_func_start dp15_end_with_move_5 dp15_end_with_move_5: @ 8133388 - ldr r0, _08133398 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] ldrb r1, [r2, 0x10] @@ -630298,31 +609719,30 @@ dp15_end_with_move_5: @ 8133388 strb r0, [r2, 0x10] bx lr .align 2, 0 -_08133398: .4byte 0x020244a8 + .pool thumb_func_end dp15_end_with_move_5 thumb_func_start dp15_get_held_item_x12__8 dp15_get_held_item_x12__8: @ 813339C push {r4,lr} - ldr r0, _081333AC + ldr r0, =0x0203ab38 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 bne _081333B4 - ldr r0, _081333B0 + ldr r0, =0x0203ab3c b _081333B6 .align 2, 0 -_081333AC: .4byte 0x0203ab38 -_081333B0: .4byte 0x0203ab3c + .pool _081333B4: - ldr r0, _081333D4 + ldr r0, =0x0202420c _081333B6: ldrb r2, [r0] - ldr r0, _081333D8 + ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, r2 beq _081333E0 - ldr r4, _081333DC + ldr r4, =0x020244a8 ldr r0, [r4] ldr r0, [r0, 0x18] adds r0, 0x44 @@ -630332,24 +609752,22 @@ _081333B6: ldr r1, [r4] b _081333F2 .align 2, 0 -_081333D4: .4byte 0x0202420c -_081333D8: .4byte 0x02024064 -_081333DC: .4byte 0x020244a8 + .pool _081333E0: - ldr r1, _08133408 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 adds r0, r1 ldrh r0, [r0, 0x2E] bl itemid_get_x12 - ldr r1, _0813340C + ldr r1, =0x020244a8 ldr r1, [r1] _081333F2: ldr r1, [r1, 0x14] lsls r0, 24 lsrs r0, 24 str r0, [r1, 0x8] - ldr r1, _08133410 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x2 str r0, [r1] @@ -630357,47 +609775,43 @@ _081333F2: pop {r0} bx r0 .align 2, 0 -_08133408: .4byte 0x02024084 -_0813340C: .4byte 0x020244a8 -_08133410: .4byte 0x0203ab38 + .pool thumb_func_end dp15_get_held_item_x12__8 thumb_func_start tai62_unk tai62_unk: @ 8133414 push {r4,lr} - ldr r0, _08133440 + ldr r0, =0x0203ab38 ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_8131E70 lsls r0, 24 lsrs r3, r0, 24 movs r0, 0x1 - ldr r1, _08133444 + ldr r1, =0x0203ab3c ldrb r2, [r1] adds r1, r3, 0 ands r1, r0 ands r0, r2 cmp r1, r0 bne _0813344C - ldr r1, _08133448 + ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 adds r0, r1 ldrh r3, [r0, 0x2E] b _08133458 .align 2, 0 -_08133440: .4byte 0x0203ab38 -_08133444: .4byte 0x0203ab3c -_08133448: .4byte 0x02024084 + .pool _0813344C: - ldr r0, _08133480 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x18] adds r0, 0x44 adds r0, r3 ldrb r3, [r0] _08133458: - ldr r4, _08133484 + ldr r4, =0x0203ab38 ldr r2, [r4] ldrb r1, [r2, 0x2] ldrb r0, [r2, 0x3] @@ -630417,8 +609831,7 @@ _08133458: str r1, [r4] b _0813348E .align 2, 0 -_08133480: .4byte 0x020244a8 -_08133484: .4byte 0x0203ab38 + .pool _08133488: adds r0, r2, 0 adds r0, 0x8 @@ -630432,21 +609845,20 @@ _0813348E: thumb_func_start tai49_unk tai49_unk: @ 8133494 push {lr} - ldr r0, _081334A4 + ldr r0, =0x0203ab38 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 bne _081334AC - ldr r0, _081334A8 + ldr r0, =0x0203ab3c b _081334AE .align 2, 0 -_081334A4: .4byte 0x0203ab38 -_081334A8: .4byte 0x0203ab3c + .pool _081334AC: - ldr r0, _081334DC + ldr r0, =0x0202420c _081334AE: ldrb r1, [r0] - ldr r2, _081334E0 + ldr r2, =0x02024084 movs r0, 0x58 muls r1, r0 adds r0, r1, r2 @@ -630455,47 +609867,43 @@ _081334AE: adds r1, r2 ldr r1, [r1] bl pokemon_species_get_gender_info - ldr r1, _081334E4 + ldr r1, =0x020244a8 ldr r1, [r1] ldr r1, [r1, 0x14] lsls r0, 24 lsrs r0, 24 str r0, [r1, 0x8] - ldr r1, _081334E8 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x2 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_081334DC: .4byte 0x0202420c -_081334E0: .4byte 0x02024084 -_081334E4: .4byte 0x020244a8 -_081334E8: .4byte 0x0203ab38 + .pool thumb_func_end tai49_unk thumb_func_start dp15_enter_battle_countdown_get_state dp15_enter_battle_countdown_get_state: @ 81334EC push {r4,lr} - ldr r0, _08133500 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _08133508 - ldr r0, _08133504 + ldr r0, =0x0203ab3c b _0813350A .align 2, 0 -_08133500: .4byte 0x0203ab38 -_08133504: .4byte 0x0203ab3c + .pool _08133508: - ldr r0, _0813352C + ldr r0, =0x0202420c _0813350A: ldrb r3, [r0] - ldr r0, _08133530 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] - ldr r1, _08133534 + ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -630509,33 +609917,30 @@ _0813350A: pop {r0} bx r0 .align 2, 0 -_0813352C: .4byte 0x0202420c -_08133530: .4byte 0x020244a8 -_08133534: .4byte 0x020242bc + .pool thumb_func_end dp15_enter_battle_countdown_get_state thumb_func_start dp15_stockpile_get_num_uses dp15_stockpile_get_num_uses: @ 8133538 push {r4,lr} - ldr r0, _0813354C + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _08133554 - ldr r0, _08133550 + ldr r0, =0x0203ab3c b _08133556 .align 2, 0 -_0813354C: .4byte 0x0203ab38 -_08133550: .4byte 0x0203ab3c + .pool _08133554: - ldr r0, _08133578 + ldr r0, =0x0202420c _08133556: ldrb r3, [r0] - ldr r0, _0813357C + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] - ldr r1, _08133580 + ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -630549,54 +609954,49 @@ _08133556: pop {r0} bx r0 .align 2, 0 -_08133578: .4byte 0x0202420c -_0813357C: .4byte 0x020244a8 -_08133580: .4byte 0x020242bc + .pool thumb_func_end dp15_stockpile_get_num_uses thumb_func_start dp15_is_double_battle dp15_is_double_battle: @ 8133584 - ldr r0, _081335A0 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] - ldr r0, _081335A4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 str r0, [r2, 0x8] - ldr r1, _081335A8 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_081335A0: .4byte 0x020244a8 -_081335A4: .4byte 0x02022fec -_081335A8: .4byte 0x0203ab38 + .pool thumb_func_end dp15_is_double_battle thumb_func_start dp15_get_dp08_item__8 dp15_get_dp08_item__8: @ 81335AC push {r4,lr} - ldr r0, _081335C0 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _081335C8 - ldr r0, _081335C4 + ldr r0, =0x0203ab3c b _081335CA .align 2, 0 -_081335C0: .4byte 0x0203ab38 -_081335C4: .4byte 0x0203ab3c + .pool _081335C8: - ldr r0, _081335EC + ldr r0, =0x0202420c _081335CA: ldrb r3, [r0] - ldr r0, _081335F0 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] - ldr r0, _081335F4 + ldr r0, =0x0202449c ldr r1, [r0] lsls r0, r3, 1 adds r0, r1 @@ -630610,17 +610010,15 @@ _081335CA: pop {r0} bx r0 .align 2, 0 -_081335EC: .4byte 0x0202420c -_081335F0: .4byte 0x020244a8 -_081335F4: .4byte 0x0202449c + .pool thumb_func_end dp15_get_dp08_item__8 thumb_func_start dp15_move_get_type__8 dp15_move_get_type__8: @ 81335F8 - ldr r0, _08133618 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] - ldr r2, _0813361C + ldr r2, =0x0831c898 ldr r1, [r3, 0x8] lsls r0, r1, 1 adds r0, r1 @@ -630628,23 +610026,21 @@ dp15_move_get_type__8: @ 81335F8 adds r0, r2 ldrb r0, [r0, 0x2] str r0, [r3, 0x8] - ldr r1, _08133620 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08133618: .4byte 0x020244a8 -_0813361C: .4byte 0x0831c898 -_08133620: .4byte 0x0203ab38 + .pool thumb_func_end dp15_move_get_type__8 thumb_func_start dp15_move_get_power__8_8 dp15_move_get_power__8_8: @ 8133624 - ldr r0, _08133644 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] - ldr r2, _08133648 + ldr r2, =0x0831c898 ldr r1, [r3, 0x8] lsls r0, r1, 1 adds r0, r1 @@ -630652,23 +610048,21 @@ dp15_move_get_power__8_8: @ 8133624 adds r0, r2 ldrb r0, [r0, 0x1] str r0, [r3, 0x8] - ldr r1, _0813364C + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08133644: .4byte 0x020244a8 -_08133648: .4byte 0x0831c898 -_0813364C: .4byte 0x0203ab38 + .pool thumb_func_end dp15_move_get_power__8_8 thumb_func_start dp15_move_get_move_script_id__8 dp15_move_get_move_script_id__8: @ 8133650 - ldr r0, _08133670 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] - ldr r2, _08133674 + ldr r2, =0x0831c898 ldr r1, [r3, 0x8] lsls r0, r1, 1 adds r0, r1 @@ -630676,39 +610070,36 @@ dp15_move_get_move_script_id__8: @ 8133650 adds r0, r2 ldrb r0, [r0] str r0, [r3, 0x8] - ldr r1, _08133678 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08133670: .4byte 0x020244a8 -_08133674: .4byte 0x0831c898 -_08133678: .4byte 0x0203ab38 + .pool thumb_func_end dp15_move_get_move_script_id__8 thumb_func_start dp15_get_protect_endure_activity dp15_get_protect_endure_activity: @ 813367C push {r4,lr} - ldr r0, _08133690 + ldr r0, =0x0203ab38 ldr r1, [r0] ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 bne _08133698 - ldr r0, _08133694 + ldr r0, =0x0203ab3c b _0813369A .align 2, 0 -_08133690: .4byte 0x0203ab38 -_08133694: .4byte 0x0203ab3c + .pool _08133698: - ldr r0, _081336BC + ldr r0, =0x0202420c _0813369A: ldrb r3, [r0] - ldr r0, _081336C0 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] - ldr r1, _081336C4 + ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -630722,9 +610113,7 @@ _0813369A: pop {r0} bx r0 .align 2, 0 -_081336BC: .4byte 0x0202420c -_081336C0: .4byte 0x020244a8 -_081336C4: .4byte 0x020242bc + .pool thumb_func_end dp15_get_protect_endure_activity thumb_func_start nullsub_106 @@ -630760,7 +610149,7 @@ nullsub_111: @ 81336DC thumb_func_start tai58_unk tai58_unk: @ 81336E0 push {r4,lr} - ldr r4, _0813370C + ldr r4, =0x0203ab38 ldr r0, [r4] adds r0, 0x5 bl b_mc_stack_push @@ -630780,12 +610169,12 @@ tai58_unk: @ 81336E0 pop {r0} bx r0 .align 2, 0 -_0813370C: .4byte 0x0203ab38 + .pool thumb_func_end tai58_unk thumb_func_start dp15_jump dp15_jump: @ 8133710 - ldr r3, _0813372C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -630800,7 +610189,7 @@ dp15_jump: @ 8133710 str r1, [r3] bx lr .align 2, 0 -_0813372C: .4byte 0x0203ab38 + .pool thumb_func_end dp15_jump thumb_func_start dp15_return @@ -630810,7 +610199,7 @@ dp15_return: @ 8133730 lsls r0, 24 cmp r0, 0 bne _0813374A - ldr r0, _08133750 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x14] ldrb r1, [r2, 0x10] @@ -630821,13 +610210,13 @@ _0813374A: pop {r0} bx r0 .align 2, 0 -_08133750: .4byte 0x020244a8 + .pool thumb_func_end dp15_return thumb_func_start dp15_compare_attacker_defender_levels dp15_compare_attacker_defender_levels: @ 8133754 push {r4,r5,lr} - ldr r5, _0813376C + ldr r5, =0x0203ab38 ldr r4, [r5] ldrb r0, [r4, 0x1] cmp r0, 0x1 @@ -630838,21 +610227,21 @@ dp15_compare_attacker_defender_levels: @ 8133754 beq _08133776 b _08133824 .align 2, 0 -_0813376C: .4byte 0x0203ab38 + .pool _08133770: cmp r0, 0x2 beq _081337D8 b _08133824 _08133776: - ldr r3, _0813379C - ldr r0, _081337A0 + ldr r3, =0x02024084 + ldr r0, =0x0203ab3c ldrb r0, [r0] movs r2, 0x58 adds r1, r0, 0 muls r1, r2 adds r1, r3 adds r1, 0x2A - ldr r0, _081337A4 + ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -630863,19 +610252,17 @@ _08133776: bhi _081337FA b _08133820 .align 2, 0 -_0813379C: .4byte 0x02024084 -_081337A0: .4byte 0x0203ab3c -_081337A4: .4byte 0x0202420c + .pool _081337A8: - ldr r3, _081337CC - ldr r0, _081337D0 + ldr r3, =0x02024084 + ldr r0, =0x0203ab3c ldrb r0, [r0] movs r2, 0x58 adds r1, r0, 0 muls r1, r2 adds r1, r3 adds r1, 0x2A - ldr r0, _081337D4 + ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -630886,19 +610273,17 @@ _081337A8: bcc _081337FA b _08133820 .align 2, 0 -_081337CC: .4byte 0x02024084 -_081337D0: .4byte 0x0203ab3c -_081337D4: .4byte 0x0202420c + .pool _081337D8: - ldr r3, _08133814 - ldr r0, _08133818 + ldr r3, =0x02024084 + ldr r0, =0x0203ab3c ldrb r0, [r0] movs r2, 0x58 adds r1, r0, 0 muls r1, r2 adds r1, r3 adds r1, 0x2A - ldr r0, _0813381C + ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r2 adds r0, r3 @@ -630921,9 +610306,7 @@ _081337FA: str r1, [r5] b _08133824 .align 2, 0 -_08133814: .4byte 0x02024084 -_08133818: .4byte 0x0203ab3c -_0813381C: .4byte 0x0202420c + .pool _08133820: adds r0, r4, 0x6 str r0, [r5] @@ -630936,8 +610319,8 @@ _08133824: thumb_func_start tai5C_unk tai5C_unk: @ 813382C push {lr} - ldr r2, _08133860 - ldr r0, _08133864 + ldr r2, =0x020242bc + ldr r0, =0x0202420c ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -630947,7 +610330,7 @@ tai5C_unk: @ 813382C lsls r0, 28 cmp r0, 0 beq _0813386C - ldr r3, _08133868 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -630962,11 +610345,9 @@ tai5C_unk: @ 813382C str r1, [r3] b _08133874 .align 2, 0 -_08133860: .4byte 0x020242bc -_08133864: .4byte 0x0202420c -_08133868: .4byte 0x0203ab38 + .pool _0813386C: - ldr r1, _08133878 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -630974,14 +610355,14 @@ _08133874: pop {r0} bx r0 .align 2, 0 -_08133878: .4byte 0x0203ab38 + .pool thumb_func_end tai5C_unk thumb_func_start tai5D_unk tai5D_unk: @ 813387C push {lr} - ldr r2, _081338B0 - ldr r0, _081338B4 + ldr r2, =0x020242bc + ldr r0, =0x0202420c ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -630991,7 +610372,7 @@ tai5D_unk: @ 813387C lsls r0, 28 cmp r0, 0 bne _081338BC - ldr r3, _081338B8 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -631006,11 +610387,9 @@ tai5D_unk: @ 813387C str r1, [r3] b _081338C4 .align 2, 0 -_081338B0: .4byte 0x020242bc -_081338B4: .4byte 0x0202420c -_081338B8: .4byte 0x0203ab38 + .pool _081338BC: - ldr r1, _081338C8 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -631018,23 +610397,23 @@ _081338C4: pop {r0} bx r0 .align 2, 0 -_081338C8: .4byte 0x0203ab38 + .pool thumb_func_end tai5D_unk thumb_func_start tai5E_unk tai5E_unk: @ 81338CC push {lr} - ldr r0, _08133900 + ldr r0, =0x0203ab3c ldrb r3, [r0] movs r0, 0x1 - ldr r1, _08133904 + ldr r1, =0x0202420c ldrb r2, [r1] adds r1, r0, 0 ands r1, r3 ands r0, r2 cmp r1, r0 bne _0813390C - ldr r3, _08133908 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -631049,11 +610428,9 @@ tai5E_unk: @ 81338CC str r1, [r3] b _08133914 .align 2, 0 -_08133900: .4byte 0x0203ab3c -_08133904: .4byte 0x0202420c -_08133908: .4byte 0x0203ab38 + .pool _0813390C: - ldr r1, _08133918 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -631061,18 +610438,18 @@ _08133914: pop {r0} bx r0 .align 2, 0 -_08133918: .4byte 0x0203ab38 + .pool thumb_func_end tai5E_unk thumb_func_start tai61_unk tai61_unk: @ 813391C push {r4,lr} - ldr r4, _08133958 + ldr r4, =0x0203ab38 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_8131E70 lsls r0, 24 - ldr r1, _0813395C + ldr r1, =0x020244a8 ldr r1, [r1] ldr r1, [r1, 0x4] lsrs r0, 22 @@ -631096,8 +610473,7 @@ tai61_unk: @ 813391C str r1, [r4] b _08133966 .align 2, 0 -_08133958: .4byte 0x0203ab38 -_0813395C: .4byte 0x020244a8 + .pool _08133960: ldr r0, [r4] adds r0, 0x6 @@ -631111,7 +610487,7 @@ _08133966: thumb_func_start b_mc_stack_push b_mc_stack_push: @ 813396C push {r4,lr} - ldr r1, _0813398C + ldr r1, =0x020244a8 ldr r1, [r1] ldr r3, [r1, 0x1C] adds r4, r3, 0 @@ -631127,12 +610503,12 @@ b_mc_stack_push: @ 813396C pop {r0} bx r0 .align 2, 0 -_0813398C: .4byte 0x020244a8 + .pool thumb_func_end b_mc_stack_push thumb_func_start b_mc_stack_push_cursor b_mc_stack_push_cursor: @ 8133990 - ldr r0, _081339B0 + ldr r0, =0x020244a8 ldr r0, [r0] ldr r2, [r0, 0x1C] adds r3, r2, 0 @@ -631143,19 +610519,18 @@ b_mc_stack_push_cursor: @ 8133990 lsls r0, 24 lsrs r0, 22 adds r2, r0 - ldr r0, _081339B4 + ldr r0, =0x0203ab38 ldr r0, [r0] str r0, [r2] bx lr .align 2, 0 -_081339B0: .4byte 0x020244a8 -_081339B4: .4byte 0x0203ab38 + .pool thumb_func_end b_mc_stack_push_cursor thumb_func_start b_mc_stack_pop_cursor b_mc_stack_pop_cursor: @ 81339B8 push {lr} - ldr r3, _081339D0 + ldr r3, =0x020244a8 ldr r0, [r3] ldr r0, [r0, 0x1C] adds r1, r0, 0 @@ -631166,11 +610541,11 @@ b_mc_stack_pop_cursor: @ 81339B8 movs r0, 0 b _081339EE .align 2, 0 -_081339D0: .4byte 0x020244a8 + .pool _081339D4: subs r0, 0x1 strb r0, [r1] - ldr r2, _081339F4 + ldr r2, =0x0203ab38 ldr r0, [r3] ldr r1, [r0, 0x1C] adds r0, r1, 0 @@ -631185,24 +610560,24 @@ _081339EE: pop {r1} bx r1 .align 2, 0 -_081339F4: .4byte 0x0203ab38 + .pool thumb_func_end b_mc_stack_pop_cursor thumb_func_start sub_81339F8 sub_81339F8: @ 81339F8 push {r4-r6,lr} - ldr r0, _08133A4C + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _08133A50 + ldr r0, =0x00002e28 adds r5, r1, r0 movs r2, 0 movs r0, 0x2 strb r0, [r5] - ldr r0, _08133A54 + ldr r0, =0x00002e59 adds r1, r0 strb r2, [r1] movs r4, 0 - ldr r6, _08133A58 + ldr r6, =0x085b09e4 _08133A12: movs r0, 0xB muls r0, r4 @@ -631214,7 +610589,7 @@ _08133A12: bl gf_strcpy adds r1, r5, 0x1 adds r1, r4 - ldr r0, _08133A5C + ldr r0, =0x085b09f4 adds r0, r4, r0 ldrb r0, [r0] strb r0, [r1] @@ -631232,25 +610607,20 @@ _08133A12: pop {r0} bx r0 .align 2, 0 -_08133A4C: .4byte 0x03005d8c -_08133A50: .4byte 0x00002e28 -_08133A54: .4byte 0x00002e59 -_08133A58: .4byte 0x085b09e4 -_08133A5C: .4byte 0x085b09f4 + .pool thumb_func_end sub_81339F8 thumb_func_start sub_8133A60 sub_8133A60: @ 8133A60 - ldr r0, _08133A70 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08133A74 + ldr r1, =0x00002e59 adds r0, r1 movs r1, 0 strb r1, [r0] bx lr .align 2, 0 -_08133A70: .4byte 0x03005d8c -_08133A74: .4byte 0x00002e59 + .pool thumb_func_end sub_8133A60 thumb_func_start sub_8133A78 @@ -631265,30 +610635,30 @@ sub_8133A78: @ 8133A78 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08133AD4 + ldr r0, =0x03005e08 adds r7, r1, r0 - ldr r0, _08133AD8 + ldr r0, =0x03005d8c ldr r4, [r0] - ldr r0, _08133ADC + ldr r0, =0x00002e28 adds r0, r4 mov r9, r0 - ldr r0, _08133AE0 + ldr r0, =0x085b09f8 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0xC] str r1, [sp, 0x10] - ldr r1, _08133AE4 + ldr r1, =0x085eb7ea movs r0, 0x1 movs r2, 0 bl font_get_width_of_string adds r6, r0, 0 - ldr r1, _08133AE8 + ldr r1, =0x085e8d38 movs r0, 0x1 movs r2, 0 bl font_get_width_of_string mov r8, r0 movs r5, 0 - ldr r0, _08133AEC + ldr r0, =0x00002e29 adds r4, r0 _08133AC2: mov r0, r9 @@ -631300,17 +610670,11 @@ _08133AC2: mov r0, r8 b _08133B00 .align 2, 0 -_08133AD4: .4byte 0x03005e08 -_08133AD8: .4byte 0x03005d8c -_08133ADC: .4byte 0x00002e28 -_08133AE0: .4byte 0x085b09f8 -_08133AE4: .4byte 0x085eb7ea -_08133AE8: .4byte 0x085e8d38 -_08133AEC: .4byte 0x00002e29 + .pool _08133AF0: ldrb r1, [r1] lsls r1, 5 - ldr r0, _08133B64 + ldr r0, =0x085a5c09 adds r1, r0 movs r0, 0x1 movs r2, 0 @@ -631328,7 +610692,7 @@ _08133B06: adds r0, r6, 0 bl convert_pixel_width_to_tile_width lsls r0, 24 - ldr r2, _08133B68 + ldr r2, =0x00ffffff ldr r1, [sp, 0xC] ands r1, r2 orrs r1, r0 @@ -631360,19 +610724,17 @@ _08133B3C: movs r1, 0 str r1, [sp, 0x8] movs r1, 0x1 - ldr r2, _08133B6C + ldr r2, =0x085e8d38 movs r3, 0x8 bl Print b _08133B94 .align 2, 0 -_08133B64: .4byte 0x085a5c09 -_08133B68: .4byte 0x00ffffff -_08133B6C: .4byte 0x085e8d38 + .pool _08133B70: ldrb r0, [r7, 0x6] ldrb r2, [r1] lsls r2, 5 - ldr r1, _08133BDC + ldr r1, =0x085a5c09 adds r2, r1 lsls r1, r5, 4 adds r1, 0x1 @@ -631393,7 +610755,7 @@ _08133B94: cmp r5, 0x3 bls _08133B3C ldrb r0, [r7, 0x6] - ldr r2, _08133BE0 + ldr r2, =0x085eb7ea lsls r1, r5, 4 adds r1, 0x1 lsls r1, 24 @@ -631420,8 +610782,7 @@ _08133B94: pop {r0} bx r0 .align 2, 0 -_08133BDC: .4byte 0x085a5c09 -_08133BE0: .4byte 0x085eb7ea + .pool thumb_func_end sub_8133A78 thumb_func_start sub_8133BE4 @@ -631434,21 +610795,19 @@ sub_8133BE4: @ 8133BE4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08133C08 + ldr r1, =0x03005e08 adds r4, r0, r1 cmp r2, 0x78 bls _08133C14 - ldr r1, _08133C0C - ldr r2, _08133C10 + ldr r1, =0x020375e0 + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] b _08133C18 .align 2, 0 -_08133C08: .4byte 0x03005e08 -_08133C0C: .4byte 0x020375e0 -_08133C10: .4byte 0x0000ffff + .pool _08133C14: - ldr r0, _08133C44 + ldr r0, =0x020375e0 strh r2, [r0] _08133C18: ldrb r0, [r4, 0x6] @@ -631467,7 +610826,7 @@ _08133C18: pop {r0} bx r0 .align 2, 0 -_08133C44: .4byte 0x020375e0 + .pool thumb_func_end sub_8133BE4 thumb_func_start sub_8133C48 @@ -631475,9 +610834,9 @@ sub_8133C48: @ 8133C48 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08133C74 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08133C78 + ldr r1, =0x00002e28 adds r6, r0, r1 bl ProcessMenuInput lsls r0, 24 @@ -631494,8 +610853,7 @@ sub_8133C48: @ 8133C48 beq _08133CCA b _08133C90 .align 2, 0 -_08133C74: .4byte 0x03005d8c -_08133C78: .4byte 0x00002e28 + .pool _08133C7C: cmp r1, 0x4 bne _08133C90 @@ -631509,11 +610867,11 @@ _08133C80: _08133C90: movs r0, 0x5 bl audio_play - ldr r0, _08133CD0 + ldr r0, =0x020375e2 lsls r4, 24 asrs r4, 24 strh r4, [r0] - ldr r5, _08133CD4 + ldr r5, =0x02021cc4 movs r0, 0xB adds r1, r4, 0 muls r1, r0 @@ -631537,31 +610895,28 @@ _08133CCA: pop {r0} bx r0 .align 2, 0 -_08133CD0: .4byte 0x020375e2 -_08133CD4: .4byte 0x02021cc4 + .pool thumb_func_end sub_8133C48 thumb_func_start sub_8133CD8 sub_8133CD8: @ 8133CD8 - ldr r0, _08133CE8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08133CEC - ldr r2, _08133CF0 + ldr r1, =0x020375f0 + ldr r2, =0x00002e59 adds r0, r2 ldrb r0, [r0] strh r0, [r1] bx lr .align 2, 0 -_08133CE8: .4byte 0x03005d8c -_08133CEC: .4byte 0x020375f0 -_08133CF0: .4byte 0x00002e59 + .pool thumb_func_end sub_8133CD8 thumb_func_start sub_8133CF4 sub_8133CF4: @ 8133CF4 push {r4,r5,lr} movs r4, 0 - ldr r5, _08133D0C + ldr r5, =0x020375f0 _08133CFA: adds r0, r4, 0 bl sub_8161AD0 @@ -631572,14 +610927,14 @@ _08133CFA: strh r0, [r5] b _08133D20 .align 2, 0 -_08133D0C: .4byte 0x020375f0 + .pool _08133D10: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 bls _08133CFA - ldr r1, _08133D28 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] _08133D20: @@ -631587,21 +610942,21 @@ _08133D20: pop {r0} bx r0 .align 2, 0 -_08133D28: .4byte 0x020375f0 + .pool thumb_func_end sub_8133CF4 thumb_func_start sub_8133D2C sub_8133D2C: @ 8133D2C push {r4-r6,lr} - ldr r6, _08133D78 + ldr r6, =0x020375f0 movs r0, 0 strh r0, [r6] - ldr r4, _08133D7C - ldr r5, _08133D80 + ldr r4, =0x085a5c08 + ldr r5, =0x020375e0 ldrh r0, [r5] lsls r0, 5 adds r2, r0, r4 - ldr r0, _08133D84 + ldr r0, =0x020375e4 ldrh r0, [r0] lsls r0, 5 adds r0, r4 @@ -631617,7 +610972,7 @@ sub_8133D2C: @ 8133D2C negs r1, r1 cmp r0, r1 bne _08133D72 - ldr r0, _08133D88 + ldr r0, =0x02021dc4 ldrh r1, [r5] lsls r1, 5 adds r1, r4 @@ -631630,23 +610985,19 @@ _08133D72: pop {r0} bx r0 .align 2, 0 -_08133D78: .4byte 0x020375f0 -_08133D7C: .4byte 0x085a5c08 -_08133D80: .4byte 0x020375e0 -_08133D84: .4byte 0x020375e4 -_08133D88: .4byte 0x02021dc4 + .pool thumb_func_end sub_8133D2C thumb_func_start sub_8133D8C sub_8133D8C: @ 8133D8C push {lr} - ldr r0, _08133D9C + ldr r0, =sub_8127208 + 1 movs r1, 0 bl AddTask pop {r0} bx r0 .align 2, 0 -_08133D9C: .4byte sub_8127208 + 1 + .pool thumb_func_end sub_8133D8C thumb_func_start sub_8133DA0 @@ -631659,38 +611010,32 @@ sub_8133DA0: @ 8133DA0 lsrs r0, 24 cmp r0, 0x1 bne _08133DFC - ldr r5, _08133DE0 - ldr r0, _08133DE4 + ldr r5, =0x020375e4 + ldr r0, =0x0203a172 ldrb r1, [r0] - ldr r0, _08133DE8 + ldr r0, =0x0203a14c ldr r0, [r0] adds r0, r1 ldrb r0, [r0] strh r0, [r5] - ldr r0, _08133DEC - ldr r1, _08133DF0 + ldr r0, =0x02021ec4 + ldr r1, =0x020375e0 ldrh r1, [r1] lsls r1, 5 - ldr r4, _08133DF4 + ldr r4, =0x085a5c09 adds r1, r4 bl gf_strcpy - ldr r0, _08133DF8 + ldr r0, =0x02021dc4 ldrh r1, [r5] lsls r1, 5 adds r1, r4 bl gf_strcpy b _08133E04 .align 2, 0 -_08133DE0: .4byte 0x020375e4 -_08133DE4: .4byte 0x0203a172 -_08133DE8: .4byte 0x0203a14c -_08133DEC: .4byte 0x02021ec4 -_08133DF0: .4byte 0x020375e0 -_08133DF4: .4byte 0x085a5c09 -_08133DF8: .4byte 0x02021dc4 + .pool _08133DFC: - ldr r1, _08133E14 - ldr r2, _08133E18 + ldr r1, =0x020375e4 + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] _08133E04: @@ -631701,8 +611046,7 @@ _08133E04: pop {r0} bx r0 .align 2, 0 -_08133E14: .4byte 0x020375e4 -_08133E18: .4byte 0x0000ffff + .pool thumb_func_end sub_8133DA0 thumb_func_start sub_8133E1C @@ -631710,7 +611054,7 @@ sub_8133E1C: @ 8133E1C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08133E34 + ldr r2, =0x020375e4 movs r1, 0 strh r1, [r2] bl remove_task @@ -631718,7 +611062,7 @@ sub_8133E1C: @ 8133E1C pop {r0} bx r0 .align 2, 0 -_08133E34: .4byte 0x020375e4 + .pool thumb_func_end sub_8133E1C thumb_func_start sub_8133E38 @@ -631726,41 +611070,41 @@ sub_8133E38: @ 8133E38 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _08133E9C + ldr r0, =0x03005d8c ldr r6, [r0] - ldr r0, _08133EA0 + ldr r0, =0x00002e28 adds r5, r6, r0 - ldr r1, _08133EA4 + ldr r1, =0x020375e4 mov r8, r1 ldrb r0, [r1] bl sub_81619DC - ldr r0, _08133EA8 + ldr r0, =0x020375e0 ldrb r0, [r0] bl sub_8161960 - ldr r4, _08133EAC + ldr r4, =0x020375e2 ldrh r1, [r4] movs r0, 0xB muls r0, r1 adds r0, 0x5 adds r5, r0 - ldr r0, _08133EB0 + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r5, 0 bl gf_strcpy - ldr r2, _08133EB4 + ldr r2, =0x00002e29 adds r0, r6, r2 ldrh r1, [r4] adds r0, r1 mov r2, r8 ldrh r1, [r2] strb r1, [r0] - ldr r1, _08133EB8 + ldr r1, =0x00002e5a adds r0, r6, r1 ldrh r4, [r4] adds r0, r4 movs r1, 0x2 strb r1, [r0] - ldr r2, _08133EBC + ldr r2, =0x00002e59 adds r6, r2 movs r0, 0x1 strb r0, [r6] @@ -631770,21 +611114,13 @@ sub_8133E38: @ 8133E38 pop {r0} bx r0 .align 2, 0 -_08133E9C: .4byte 0x03005d8c -_08133EA0: .4byte 0x00002e28 -_08133EA4: .4byte 0x020375e4 -_08133EA8: .4byte 0x020375e0 -_08133EAC: .4byte 0x020375e2 -_08133EB0: .4byte 0x03005d90 -_08133EB4: .4byte 0x00002e29 -_08133EB8: .4byte 0x00002e5a -_08133EBC: .4byte 0x00002e59 + .pool thumb_func_end sub_8133E38 thumb_func_start sub_8133EC0 sub_8133EC0: @ 8133EC0 push {lr} - ldr r0, _08133ED8 + ldr r0, =sub_8133C48 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -631793,7 +611129,7 @@ sub_8133EC0: @ 8133EC0 pop {r0} bx r0 .align 2, 0 -_08133ED8: .4byte sub_8133C48 + 1 + .pool thumb_func_end sub_8133EC0 thumb_func_start sub_8133EDC @@ -631805,14 +611141,14 @@ sub_8133EDC: @ 8133EDC bls _08133EE8 movs r1, 0 _08133EE8: - ldr r0, _08133EF4 + ldr r0, =0x085b1df8 lsls r1, 1 adds r1, r0 ldrh r0, [r1] pop {r1} bx r1 .align 2, 0 -_08133EF4: .4byte 0x085b1df8 + .pool thumb_func_end sub_8133EDC thumb_func_start sub_8133EF8 @@ -631885,12 +611221,12 @@ set_256color_bg_bg0: @ 8133F0C add r1, sp, 0x4 movs r0, 0 strh r0, [r1] - ldr r2, _08134180 + ldr r2, =0x040000d4 str r1, [r2] movs r1, 0xC0 lsls r1, 19 str r1, [r2, 0x4] - ldr r0, _08134184 + ldr r0, =0x8100c000 str r0, [r2, 0x8] ldr r0, [r2, 0x8] movs r0, 0 @@ -631901,7 +611237,7 @@ set_256color_bg_bg0: @ 8133F0C movs r0, 0xE0 lsls r0, 19 str r0, [r2, 0x4] - ldr r0, _08134188 + ldr r0, =0x85000100 str r0, [r2, 0x8] ldr r0, [r2, 0x8] add r0, sp, 0x4 @@ -631911,24 +611247,24 @@ set_256color_bg_bg0: @ 8133F0C movs r0, 0xA0 lsls r0, 19 str r0, [r2, 0x4] - ldr r0, _0813418C + ldr r0, =0x81000200 str r0, [r2, 0x8] ldr r0, [r2, 0x8] - ldr r0, _08134190 + ldr r0, =0x085b0e04 bl LZ77UnCompVram - ldr r0, _08134194 - ldr r1, _08134198 + ldr r0, =0x085b0a80 + ldr r1, =0x06003000 bl LZ77UnCompVram - ldr r0, _0813419C - ldr r1, _081341A0 + ldr r0, =0x085b0c0c + ldr r1, =0x06003800 bl LZ77UnCompVram movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081341A4 + ldr r1, =0x085b1e00 movs r0, 0 movs r2, 0x3 bl bg_vram_setup - ldr r0, _081341A8 + ldr r0, =0x085b1dcc bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r1, 0xAA @@ -631947,15 +611283,15 @@ set_256color_bg_bg0: @ 8133F0C movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _081341AC + ldr r0, =0x085b0a00 movs r1, 0 movs r2, 0x40 bl gpu_pal_apply - ldr r0, _081341B0 + ldr r0, =0x085b1ed8 bl gpu_tile_obj_decompress_and_load - ldr r0, _081341B4 + ldr r0, =0x085b1ee8 bl gpu_tile_obj_decompress_and_load - ldr r0, _081341B8 + ldr r0, =0x085b1ef8 bl gpu_pal_obj_alloc_and_load_multiple movs r0, 0x1 negs r0, r0 @@ -631967,9 +611303,9 @@ set_256color_bg_bg0: @ 8133F0C bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, _081341BC + ldr r0, =sub_8133EF8 + 1 bl SetVBlankCallback - ldr r0, _081341C0 + ldr r0, =sub_81341E0 + 1 bl set_callback2 movs r0, 0x48 movs r1, 0x3F @@ -632002,13 +611338,13 @@ set_256color_bg_bg0: @ 8133F0C bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show - ldr r0, _081341C4 + ldr r0, =sub_81341FC + 1 movs r1, 0 bl AddTask adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _081341C8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -632017,22 +611353,22 @@ set_256color_bg_bg0: @ 8133F0C mov r10, r3 mov r1, r10 strh r1, [r0, 0x8] - ldr r0, _081341CC + ldr r0, =0x085b1f10 movs r1, 0x78 movs r2, 0x38 movs r3, 0x2 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r3, _081341D0 + ldr r3, =0x02020630 mov r8, r3 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 add r1, r8 strh r4, [r1, 0x2E] - ldr r6, _081341D4 - ldr r5, _081341D8 + ldr r6, =0x085b1f28 + ldr r5, =0x085b1dec ldrb r1, [r5] ldrb r2, [r5, 0x1] adds r0, r6, 0 @@ -632075,7 +611411,7 @@ set_256color_bg_bg0: @ 8133F0C strh r4, [r1, 0x2E] movs r0, 0x2 strh r0, [r1, 0x30] - ldr r1, _081341DC + ldr r1, =0x030011f8 movs r0, 0xFF strh r0, [r1] add sp, 0xC @@ -632087,30 +611423,7 @@ set_256color_bg_bg0: @ 8133F0C pop {r0} bx r0 .align 2, 0 -_08134180: .4byte 0x040000d4 -_08134184: .4byte 0x8100c000 -_08134188: .4byte 0x85000100 -_0813418C: .4byte 0x81000200 -_08134190: .4byte 0x085b0e04 -_08134194: .4byte 0x085b0a80 -_08134198: .4byte 0x06003000 -_0813419C: .4byte 0x085b0c0c -_081341A0: .4byte 0x06003800 -_081341A4: .4byte 0x085b1e00 -_081341A8: .4byte 0x085b1dcc -_081341AC: .4byte 0x085b0a00 -_081341B0: .4byte 0x085b1ed8 -_081341B4: .4byte 0x085b1ee8 -_081341B8: .4byte 0x085b1ef8 -_081341BC: .4byte sub_8133EF8 + 1 -_081341C0: .4byte sub_81341E0 + 1 -_081341C4: .4byte sub_81341FC + 1 -_081341C8: .4byte 0x03005e00 -_081341CC: .4byte 0x085b1f10 -_081341D0: .4byte 0x02020630 -_081341D4: .4byte 0x085b1f28 -_081341D8: .4byte 0x085b1dec -_081341DC: .4byte 0x030011f8 + .pool thumb_func_end set_256color_bg_bg0 thumb_func_start sub_81341E0 @@ -632131,7 +611444,7 @@ sub_81341FC: @ 81341FC sub sp, 0xC lsls r0, 24 lsrs r0, 24 - ldr r1, _08134250 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -632144,7 +611457,7 @@ sub_81341FC: @ 81341FC movs r1, 0 movs r3, 0xD bl SetWindowBorderStyle - ldr r2, _08134254 + ldr r2, =0x085e8c53 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -632157,16 +611470,14 @@ sub_81341FC: @ 81341FC bl Window_WriteStandardTileMap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _08134258 + ldr r0, =sub_813425C + 1 str r0, [r4] add sp, 0xC pop {r4} pop {r0} bx r0 .align 2, 0 -_08134250: .4byte 0x03005e00 -_08134254: .4byte 0x085e8c53 -_08134258: .4byte sub_813425C + 1 + .pool thumb_func_end sub_81341FC thumb_func_start sub_813425C @@ -632174,22 +611485,22 @@ sub_813425C: @ 813425C push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _081342D8 + ldr r2, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r6, r0, r2 ldrh r7, [r6, 0x8] ldrb r4, [r6, 0x8] - ldr r1, _081342DC + ldr r1, =0x030022c0 ldrh r3, [r1, 0x2E] movs r0, 0x1 ands r0, r3 cmp r0, 0 beq _081342F8 bl sub_8134604 - ldr r0, _081342E0 - ldr r1, _081342E4 + ldr r0, =0x085b1f40 + ldr r1, =0x085b1dec lsls r2, r4, 1 adds r3, r2, r1 ldrb r5, [r3] @@ -632212,32 +611523,25 @@ sub_813425C: @ 813425C bl sub_8134690 lsls r0, 24 lsrs r0, 24 - ldr r4, _081342E8 + ldr r4, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r2, r4, 0 adds r2, 0x10 adds r2, r1, r2 - ldr r3, _081342EC + ldr r3, =0x085b1ed0 str r3, [r2] adds r4, 0x1C adds r1, r4 - ldr r2, _081342F0 + ldr r2, =sub_8134774 + 1 str r2, [r1] strh r0, [r6, 0xA] - ldr r0, _081342F4 + ldr r0, =sub_8134340 + 1 str r0, [r6] b _08134334 .align 2, 0 -_081342D8: .4byte 0x03005e00 -_081342DC: .4byte 0x030022c0 -_081342E0: .4byte 0x085b1f40 -_081342E4: .4byte 0x085b1dec -_081342E8: .4byte 0x02020630 -_081342EC: .4byte 0x085b1ed0 -_081342F0: .4byte sub_8134774 + 1 -_081342F4: .4byte sub_8134340 + 1 + .pool _081342F8: movs r0, 0x20 ands r0, r3 @@ -632247,11 +611551,11 @@ _081342F8: beq _08134314 subs r0, r7, 0x1 strh r0, [r6, 0x8] - ldr r0, _08134310 + ldr r0, =sub_8134640 + 1 str r0, [r6] b _08134334 .align 2, 0 -_08134310: .4byte sub_8134640 + 1 + .pool _08134314: ldrh r1, [r1, 0x2E] movs r0, 0x10 @@ -632267,14 +611571,14 @@ _08134314: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - ldr r1, _0813433C + ldr r1, =sub_8134640 + 1 str r1, [r0] _08134334: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0813433C: .4byte sub_8134640 + 1 + .pool thumb_func_end sub_813425C thumb_func_start sub_8134340 @@ -632282,8 +611586,8 @@ sub_8134340: @ 8134340 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _08134384 - ldr r2, _08134388 + ldr r3, =0x02020630 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -632308,15 +611612,13 @@ sub_8134340: @ 8134340 ldrsh r0, [r1, r3] cmp r0, 0x40 bne _0813437E - ldr r0, _0813438C + ldr r0, =sub_8134390 + 1 str r0, [r2] _0813437E: pop {r0} bx r0 .align 2, 0 -_08134384: .4byte 0x02020630 -_08134388: .4byte 0x03005e00 -_0813438C: .4byte sub_8134390 + 1 + .pool thumb_func_end sub_8134340 thumb_func_start sub_8134390 @@ -632325,7 +611627,7 @@ sub_8134390: @ 8134390 sub sp, 0xC lsls r0, 24 lsrs r0, 24 - ldr r1, _081343F0 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -632339,7 +611641,7 @@ sub_8134390: @ 8134390 movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _081343F4 + ldr r2, =0x085e8c90 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -632350,23 +611652,20 @@ sub_8134390: @ 8134390 bl Print movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _081343F8 + ldr r0, =0x085b1ddc movs r1, 0xAA lsls r1, 2 movs r2, 0xD movs r3, 0 bl sub_81996C0 - ldr r0, _081343FC + ldr r0, =sub_8134400 + 1 str r0, [r4] add sp, 0xC pop {r4} pop {r0} bx r0 .align 2, 0 -_081343F0: .4byte 0x03005e00 -_081343F4: .4byte 0x085e8c90 -_081343F8: .4byte 0x085b1ddc -_081343FC: .4byte sub_8134400 + 1 + .pool thumb_func_end sub_8134390 thumb_func_start sub_8134400 @@ -632391,8 +611690,8 @@ _08134420: beq _08134450 b _0813449A _08134426: - ldr r2, _08134444 - ldr r1, _08134448 + ldr r2, =0x020375f0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -632400,24 +611699,22 @@ _08134426: ldrh r0, [r0, 0x8] strh r0, [r2] bl dp13_810BB8C - ldr r0, _0813444C + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 b _0813449A .align 2, 0 -_08134444: .4byte 0x020375f0 -_08134448: .4byte 0x03005e00 -_0813444C: .4byte 0x030022c0 + .pool _08134450: movs r0, 0x5 bl audio_play - ldr r0, _081344A0 + ldr r0, =0x03005e00 lsls r5, r4, 2 adds r5, r4 lsls r5, 3 adds r5, r0 ldrb r4, [r5, 0xA] - ldr r6, _081344A4 + ldr r6, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -632439,33 +611736,30 @@ _08134450: bl rotscale_free_entry adds r0, r4, 0 bl obj_delete_and_free_tiles - ldr r0, _081344A8 + ldr r0, =sub_81344AC + 1 str r0, [r5] _0813449A: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081344A0: .4byte 0x03005e00 -_081344A4: .4byte 0x02020630 -_081344A8: .4byte sub_81344AC + 1 + .pool thumb_func_end sub_8134400 thumb_func_start sub_81344AC sub_81344AC: @ 81344AC lsls r0, 24 lsrs r0, 24 - ldr r2, _081344C0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _081344C4 + ldr r0, =sub_81341FC + 1 str r0, [r1] bx lr .align 2, 0 -_081344C0: .4byte 0x03005e00 -_081344C4: .4byte sub_81341FC + 1 + .pool thumb_func_end sub_81344AC thumb_func_start sub_81344C8 @@ -632494,20 +611788,20 @@ sub_81344C8: @ 81344C8 adds r1, r4, 0 muls r1, r0 mov r9, r1 - ldr r0, _081345E8 + ldr r0, =0x083185c8 add r9, r0 - ldr r0, _081345EC + ldr r0, =0x085b1de4 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x2C] str r1, [sp, 0x30] - ldr r3, _081345F0 + ldr r3, =0x085b1df2 lsls r5, 1 adds r2, r5, r3 mov r10, r2 ldrb r0, [r2] lsls r0, 8 - ldr r1, _081345F4 + ldr r1, =0xffff00ff ldr r2, [sp, 0x2C] ands r2, r1 orrs r2, r0 @@ -632516,13 +611810,13 @@ sub_81344C8: @ 81344C8 adds r5, r3 ldrb r1, [r5] lsls r1, 16 - ldr r0, _081345F8 + ldr r0, =0xff00ffff ands r0, r2 orrs r0, r1 str r0, [sp, 0x2C] add r0, sp, 0x2C bl Window_AddFromTemplate - ldr r4, _081345FC + ldr r4, =0x030011f8 strh r0, [r4] lsls r0, 24 lsrs r0, 24 @@ -632536,7 +611830,7 @@ sub_81344C8: @ 81344C8 ldrb r0, [r4] lsls r2, 24 lsrs r2, 24 - ldr r1, _08134600 + ldr r1, =0x085b1e0c mov r8, r1 str r1, [sp] movs r6, 0 @@ -632601,19 +611895,13 @@ sub_81344C8: @ 81344C8 pop {r0} bx r0 .align 2, 0 -_081345E8: .4byte 0x083185c8 -_081345EC: .4byte 0x085b1de4 -_081345F0: .4byte 0x085b1df2 -_081345F4: .4byte 0xffff00ff -_081345F8: .4byte 0xff00ffff -_081345FC: .4byte 0x030011f8 -_08134600: .4byte 0x085b1e0c + .pool thumb_func_end sub_81344C8 thumb_func_start sub_8134604 sub_8134604: @ 8134604 push {r4,lr} - ldr r4, _0813463C + ldr r4, =0x030011f8 ldrb r0, [r4] movs r1, 0 bl Window_FastFillPixels @@ -632635,7 +611923,7 @@ sub_8134604: @ 8134604 pop {r0} bx r0 .align 2, 0 -_0813463C: .4byte 0x030011f8 + .pool thumb_func_end sub_8134604 thumb_func_start sub_8134640 @@ -632645,19 +611933,18 @@ sub_8134640: @ 8134640 lsls r4, 24 lsrs r4, 24 bl sub_8134604 - ldr r1, _08134660 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08134664 + ldr r1, =sub_8134668 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08134660: .4byte 0x03005e00 -_08134664: .4byte sub_8134668 + 1 + .pool thumb_func_end sub_8134640 thumb_func_start sub_8134668 @@ -632665,21 +611952,20 @@ sub_8134668: @ 8134668 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08134688 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 adds r4, r1 ldrb r0, [r4, 0x8] bl sub_81344C8 - ldr r0, _0813468C + ldr r0, =sub_813425C + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_08134688: .4byte 0x03005e00 -_0813468C: .4byte sub_813425C + 1 + .pool thumb_func_end sub_8134668 thumb_func_start sub_8134690 @@ -632696,7 +611982,7 @@ sub_8134690: @ 8134690 str r2, [sp, 0x4] movs r1, 0xE str r1, [sp, 0x8] - ldr r1, _081346D4 + ldr r1, =0x0000ffff str r1, [sp, 0xC] movs r1, 0x8 movs r2, 0 @@ -632704,7 +611990,7 @@ sub_8134690: @ 8134690 bl sub_818D3E4 lsls r0, 24 lsrs r0, 24 - ldr r1, _081346D8 + ldr r1, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -632718,16 +612004,15 @@ sub_8134690: @ 8134690 pop {r1} bx r1 .align 2, 0 -_081346D4: .4byte 0x0000ffff -_081346D8: .4byte 0x02020630 + .pool thumb_func_end sub_8134690 thumb_func_start sub_81346DC sub_81346DC: @ 81346DC push {r4,lr} adds r4, r0, 0 - ldr r2, _08134734 - ldr r3, _08134738 + ldr r2, =0x085b1e28 + ldr r3, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -632767,15 +612052,14 @@ sub_81346DC: @ 81346DC pop {r0} bx r0 .align 2, 0 -_08134734: .4byte 0x085b1e28 -_08134738: .4byte 0x03005e00 + .pool thumb_func_end sub_81346DC thumb_func_start sub_813473C sub_813473C: @ 813473C push {lr} adds r3, r0, 0 - ldr r2, _08134764 + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -632793,7 +612077,7 @@ sub_813473C: @ 813473C bl obj_anim_image_start_if_different b _08134770 .align 2, 0 -_08134764: .4byte 0x03005e00 + .pool _08134768: adds r0, r3, 0 movs r1, 0 @@ -632916,10 +612200,10 @@ sub_81347C8: @ 81347C8 mov r8, r0 mov r2, sp movs r6, 0 - ldr r1, _081348E8 + ldr r1, =0x040000d4 movs r5, 0x80 lsls r5, 5 - ldr r7, _081348EC + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -632949,7 +612233,7 @@ _0813486C: lsls r3, 3 movs r4, 0 str r4, [sp, 0x4] - ldr r2, _081348E8 + ldr r2, =0x040000d4 mov r1, r8 str r1, [r2] str r0, [r2, 0x4] @@ -632971,27 +612255,23 @@ _0813486C: orrs r3, r0 str r3, [r2, 0x8] ldr r0, [r2, 0x8] - ldr r0, _081348F0 + ldr r0, =0x08dcc05c movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _081348F4 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne _081348FC - ldr r0, _081348F8 + ldr r0, =0x08dcc01c movs r1, 0 movs r2, 0x20 bl gpu_pal_apply b _08134906 .align 2, 0 -_081348E8: .4byte 0x040000d4 -_081348EC: .4byte 0x81000800 -_081348F0: .4byte 0x08dcc05c -_081348F4: .4byte 0x020375e0 -_081348F8: .4byte 0x08dcc01c + .pool _081348FC: - ldr r0, _08134974 + ldr r0, =0x08dcc03c movs r1, 0 movs r2, 0x20 bl gpu_pal_apply @@ -633000,17 +612280,17 @@ _08134906: movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _08134978 + ldr r0, =0x085b21d4 movs r1, 0xC0 movs r2, 0x8 bl gpu_pal_apply movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0813497C + ldr r1, =0x085b21fc movs r0, 0 movs r2, 0x3 bl bg_vram_setup - ldr r0, _08134980 + ldr r0, =0x085b21dc bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r1, 0x94 @@ -633024,9 +612304,9 @@ _08134906: bl reset_all_obj_data bl sub_80A1A74 bl gpu_pal_allocator_reset - ldr r0, _08134984 + ldr r0, =0x085b2208 bl gpu_tile_obj_decompress_and_load - ldr r0, _08134988 + ldr r0, =0x085b2218 bl gpu_pal_obj_alloc_and_load_multiple add sp, 0x8 pop {r3} @@ -633035,12 +612315,7 @@ _08134906: pop {r0} bx r0 .align 2, 0 -_08134974: .4byte 0x08dcc03c -_08134978: .4byte 0x085b21d4 -_0813497C: .4byte 0x085b21fc -_08134980: .4byte 0x085b21dc -_08134984: .4byte 0x085b2208 -_08134988: .4byte 0x085b2218 + .pool thumb_func_end sub_81347C8 thumb_func_start sub_813498C @@ -633056,9 +612331,9 @@ sub_813498C: @ 813498C bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, _081349EC + ldr r0, =sub_81347B4 + 1 bl SetVBlankCallback - ldr r0, _081349F0 + ldr r0, =sub_8134C9C + 1 bl set_callback2 movs r0, 0x50 movs r1, 0 @@ -633083,8 +612358,7 @@ sub_813498C: @ 813498C pop {r0} bx r0 .align 2, 0 -_081349EC: .4byte sub_81347B4 + 1 -_081349F0: .4byte sub_8134C9C + 1 + .pool thumb_func_end sub_813498C thumb_func_start sub_81349F4 @@ -633096,16 +612370,16 @@ sub_81349F4: @ 81349F4 push {r4-r6} sub sp, 0xC bl sub_81347C8 - ldr r0, _08134B1C - ldr r1, _08134B20 + ldr r0, =0x08dcc648 + ldr r1, =0x06003800 bl LZ77UnCompVram - ldr r0, _08134B24 + ldr r0, =sub_8134CB8 + 1 movs r1, 0 bl AddTask adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r1, _08134B28 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -633123,14 +612397,14 @@ sub_81349F4: @ 81349F4 movs r1, 0x96 lsls r1, 1 strh r1, [r0, 0xA] - ldr r0, _08134B2C + ldr r0, =0x085b2250 movs r1, 0x78 movs r2, 0x50 movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _08134B30 + ldr r1, =0x02020630 mov r9, r1 lsls r1, r0, 4 adds r1, r0 @@ -633153,7 +612427,7 @@ sub_81349F4: @ 81349F4 adds r0, r4, 0 ands r0, r2 strb r0, [r1, 0x3] - ldr r0, _08134B34 + ldr r0, =0x085b2268 movs r1, 0x78 movs r2, 0x50 movs r3, 0 @@ -633175,7 +612449,7 @@ sub_81349F4: @ 81349F4 movs r0, 0x2 orrs r4, r0 strb r4, [r1, 0x3] - ldr r0, _08134B38 + ldr r0, =0x085b22a0 movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 @@ -633189,7 +612463,7 @@ sub_81349F4: @ 81349F4 strh r6, [r1, 0x2E] movs r0, 0x2D strh r0, [r1, 0x30] - ldr r0, _08134B3C + ldr r0, =0x085b22b8 movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 @@ -633204,7 +612478,7 @@ sub_81349F4: @ 81349F4 movs r0, 0x5A strh r0, [r1, 0x30] bl sub_813498C - ldr r2, _08134B40 + ldr r2, =0x085efae0 movs r0, 0x1 str r0, [sp] mov r1, r8 @@ -633226,16 +612500,7 @@ sub_81349F4: @ 81349F4 pop {r0} bx r0 .align 2, 0 -_08134B1C: .4byte 0x08dcc648 -_08134B20: .4byte 0x06003800 -_08134B24: .4byte sub_8134CB8 + 1 -_08134B28: .4byte 0x03005e00 -_08134B2C: .4byte 0x085b2250 -_08134B30: .4byte 0x02020630 -_08134B34: .4byte 0x085b2268 -_08134B38: .4byte 0x085b22a0 -_08134B3C: .4byte 0x085b22b8 -_08134B40: .4byte 0x085efae0 + .pool thumb_func_end sub_81349F4 thumb_func_start sub_8134B44 @@ -633247,17 +612512,17 @@ sub_8134B44: @ 8134B44 push {r5-r7} sub sp, 0x10 bl sub_81347C8 - ldr r0, _08134B8C - ldr r1, _08134B90 + ldr r0, =0x08dcc908 + ldr r1, =0x06003800 bl LZ77UnCompVram - ldr r0, _08134B94 + ldr r0, =sub_8134F10 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r7, r0, 24 adds r0, r7, 0 bl sub_8135130 - ldr r1, _08134B98 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -633272,24 +612537,21 @@ sub_8134B44: @ 8134B44 str r0, [sp, 0xC] b _08134BA4 .align 2, 0 -_08134B8C: .4byte 0x08dcc908 -_08134B90: .4byte 0x06003800 -_08134B94: .4byte sub_8134F10 + 1 -_08134B98: .4byte 0x03005e00 + .pool _08134B9C: movs r1, 0x5A mov r10, r1 movs r2, 0x87 str r2, [sp, 0xC] _08134BA4: - ldr r0, _08134C84 + ldr r0, =0x085b2250 movs r1, 0x78 movs r2, 0x50 movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r6, _08134C88 + ldr r6, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -633313,7 +612575,7 @@ _08134BA4: adds r0, r4, 0 ands r0, r2 strb r0, [r1, 0x3] - ldr r0, _08134C8C + ldr r0, =0x085b2268 movs r1, 0x78 movs r2, 0x50 movs r3, 0 @@ -633335,7 +612597,7 @@ _08134BA4: movs r0, 0x2 orrs r4, r0 strb r4, [r1, 0x3] - ldr r0, _08134C90 + ldr r0, =0x085b22a0 movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 @@ -633349,7 +612611,7 @@ _08134BA4: strh r7, [r1, 0x2E] mov r2, r10 strh r2, [r1, 0x30] - ldr r0, _08134C94 + ldr r0, =0x085b22b8 movs r1, 0x78 movs r2, 0x50 movs r3, 0x2 @@ -633365,7 +612627,7 @@ _08134BA4: ldrh r0, [r0, 0xC] strh r0, [r1, 0x30] bl sub_813498C - ldr r2, _08134C98 + ldr r2, =0x085efae8 movs r0, 0x1 str r0, [sp] mov r1, r9 @@ -633387,12 +612649,7 @@ _08134BA4: pop {r0} bx r0 .align 2, 0 -_08134C84: .4byte 0x085b2250 -_08134C88: .4byte 0x02020630 -_08134C8C: .4byte 0x085b2268 -_08134C90: .4byte 0x085b22a0 -_08134C94: .4byte 0x085b22b8 -_08134C98: .4byte 0x085efae8 + .pool thumb_func_end sub_8134B44 thumb_func_start sub_8134C9C @@ -633412,26 +612669,24 @@ sub_8134CB8: @ 8134CB8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08134CDC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08134CD8 - ldr r0, _08134CE0 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _08134CE4 + ldr r0, =sub_8134CE8 + 1 str r0, [r1] _08134CD8: pop {r0} bx r0 .align 2, 0 -_08134CDC: .4byte 0x02037fd4 -_08134CE0: .4byte 0x03005e00 -_08134CE4: .4byte sub_8134CE8 + 1 + .pool thumb_func_end sub_8134CB8 thumb_func_start sub_8134CE8 @@ -633439,7 +612694,7 @@ sub_8134CE8: @ 8134CE8 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08134D18 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -633458,7 +612713,7 @@ sub_8134CE8: @ 8134CE8 strh r0, [r5, 0x8] b _08134DBE .align 2, 0 -_08134D18: .4byte 0x03005e00 + .pool _08134D1C: movs r2, 0xE ldrsh r1, [r5, r2] @@ -633485,19 +612740,18 @@ _08134D1C: adds r1, r0 adds r4, r1 strh r4, [r5, 0xA] - ldr r2, _08134D68 + ldr r2, =0x030022c0 ldrh r0, [r2, 0x2E] movs r3, 0x1 adds r1, r3, 0 ands r1, r0 cmp r1, 0 beq _08134D70 - ldr r0, _08134D6C + ldr r0, =sub_8134DC4 + 1 str r0, [r5] b _08134DBE .align 2, 0 -_08134D68: .4byte 0x030022c0 -_08134D6C: .4byte sub_8134DC4 + 1 + .pool _08134D70: strh r1, [r5, 0x10] ldrh r1, [r2, 0x2C] @@ -633560,7 +612814,7 @@ sub_8134DC4: @ 8134DC4 adds r2, r5, 0 movs r3, 0xD bl SetWindowBorderStyle - ldr r2, _08134E20 + ldr r2, =0x085efac6 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -633573,27 +612827,24 @@ sub_8134DC4: @ 8134DC4 bl Window_WriteStandardTileMap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _08134E24 + ldr r0, =0x085b21f4 adds r1, r5, 0 movs r2, 0xD movs r3, 0x1 bl sub_81996C0 - ldr r1, _08134E28 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08134E2C + ldr r1, =c3_80BF560 + 1 str r1, [r0] add sp, 0xC pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08134E20: .4byte 0x085efac6 -_08134E24: .4byte 0x085b21f4 -_08134E28: .4byte 0x03005e00 -_08134E2C: .4byte c3_80BF560 + 1 + .pool thumb_func_end sub_8134DC4 thumb_func_start c3_80BF560 @@ -633620,16 +612871,15 @@ _08134E50: _08134E56: movs r0, 0x5 bl audio_play - ldr r0, _08134E6C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08134E70 + ldr r0, =sub_8134EA4 + 1 b _08134E94 .align 2, 0 -_08134E6C: .4byte 0x03005e00 -_08134E70: .4byte sub_8134EA4 + 1 + .pool _08134E74: movs r0, 0x5 bl audio_play @@ -633638,12 +612888,12 @@ _08134E74: bl sub_8198070 movs r0, 0 bl Window_FillTileMap - ldr r0, _08134E9C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08134EA0 + ldr r0, =sub_8134CE8 + 1 _08134E94: str r0, [r1] _08134E96: @@ -633651,8 +612901,7 @@ _08134E96: pop {r0} bx r0 .align 2, 0 -_08134E9C: .4byte 0x03005e00 -_08134EA0: .4byte sub_8134CE8 + 1 + .pool thumb_func_end c3_80BF560 thumb_func_start sub_8134EA4 @@ -633661,7 +612910,7 @@ sub_8134EA4: @ 8134EA4 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r1, _08134EE0 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -633678,36 +612927,34 @@ sub_8134EA4: @ 8134EA4 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08134EE4 + ldr r0, =c2_080111BC + 1 str r0, [r4] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_08134EE0: .4byte 0x03005e00 -_08134EE4: .4byte c2_080111BC + 1 + .pool thumb_func_end sub_8134EA4 thumb_func_start c2_080111BC c2_080111BC: @ 8134EE8 push {lr} - ldr r0, _08134F08 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08134F02 bl Window_FreeMemory - ldr r0, _08134F0C + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 _08134F02: pop {r0} bx r0 .align 2, 0 -_08134F08: .4byte 0x02037fd4 -_08134F0C: .4byte 0x030022c0 + .pool thumb_func_end c2_080111BC thumb_func_start sub_8134F10 @@ -633715,26 +612962,24 @@ sub_8134F10: @ 8134F10 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08134F34 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08134F30 - ldr r0, _08134F38 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _08134F3C + ldr r0, =sub_8134F40 + 1 str r0, [r1] _08134F30: pop {r0} bx r0 .align 2, 0 -_08134F34: .4byte 0x02037fd4 -_08134F38: .4byte 0x03005e00 -_08134F3C: .4byte sub_8134F40 + 1 + .pool thumb_func_end sub_8134F10 thumb_func_start sub_8134F40 @@ -633744,27 +612989,25 @@ sub_8134F40: @ 8134F40 lsrs r4, r0, 24 adds r0, r4, 0 bl sub_8135130 - ldr r0, _08134F6C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 beq _08134F66 - ldr r0, _08134F70 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08134F74 + ldr r0, =sub_8134F78 + 1 str r0, [r1] _08134F66: pop {r4} pop {r0} bx r0 .align 2, 0 -_08134F6C: .4byte 0x030022c0 -_08134F70: .4byte 0x03005e00 -_08134F74: .4byte sub_8134F78 + 1 + .pool thumb_func_end sub_8134F40 thumb_func_start sub_8134F78 @@ -633781,40 +613024,38 @@ sub_8134F78: @ 8134F78 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _08134FA8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08134FAC + ldr r1, =sub_8134FB0 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_08134FA8: .4byte 0x03005e00 -_08134FAC: .4byte sub_8134FB0 + 1 + .pool thumb_func_end sub_8134F78 thumb_func_start sub_8134FB0 sub_8134FB0: @ 8134FB0 push {lr} - ldr r0, _08134FCC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08134FC6 - ldr r0, _08134FD0 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 _08134FC6: pop {r0} bx r0 .align 2, 0 -_08134FCC: .4byte 0x02037fd4 -_08134FD0: .4byte 0x030022c0 + .pool thumb_func_end sub_8134FB0 thumb_func_start sub_8134FD4 @@ -633906,7 +613147,7 @@ sub_813504C: @ 813504C beq _081350A0 b _081350DE _08135060: - ldr r0, _0813507C + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 @@ -633920,7 +613161,7 @@ _08135060: strh r0, [r1, 0xE] b _081350DE .align 2, 0 -_0813507C: .4byte 0x03005e00 + .pool _08135080: movs r0, 0x3B strh r0, [r1, 0xE] @@ -633940,7 +613181,7 @@ _08135094: bl sub_81350E8 b _081350DE _081350A0: - ldr r0, _081350BC + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 @@ -633954,7 +613195,7 @@ _081350A0: strh r0, [r1, 0xE] b _081350DE .align 2, 0 -_081350BC: .4byte 0x03005e00 + .pool _081350C0: movs r5, 0 strh r5, [r1, 0xE] @@ -633986,7 +613227,7 @@ sub_81350E8: @ 81350E8 lsrs r0, 24 lsls r1, 24 lsrs r3, r1, 24 - ldr r2, _08135108 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -633998,7 +613239,7 @@ sub_81350E8: @ 81350E8 beq _0813511E b _0813512A .align 2, 0 -_08135108: .4byte 0x03005e00 + .pool _0813510C: cmp r0, 0xB beq _08135116 @@ -634031,12 +613272,12 @@ sub_8135130: @ 8135130 lsls r4, 24 lsrs r4, 24 bl sub_802F588 - ldr r1, _08135198 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r6, r0, r1 - ldr r5, _0813519C + ldr r5, =0x03005cf8 movs r0, 0x2 ldrsb r0, [r5, r0] strh r0, [r6, 0xC] @@ -634075,8 +613316,7 @@ sub_8135130: @ 8135130 movs r0, 0 b _081351A2 .align 2, 0 -_08135198: .4byte 0x03005e00 -_0813519C: .4byte 0x03005cf8 + .pool _081351A0: movs r0, 0x1 _081351A2: @@ -634091,7 +613331,7 @@ sub_81351AC: @ 81351AC push {r4-r7,lr} sub sp, 0x4 adds r6, r0, 0 - ldr r2, _0813523C + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r6, r0] lsls r0, r1, 2 @@ -634127,7 +613367,7 @@ _081351E8: str r1, [sp] movs r0, 0 bl rotscale_set_direct - ldr r1, _08135240 + ldr r1, =0x085b22d0 lsls r2, r7, 1 adds r0, r2, r1 ldrb r0, [r0] @@ -634162,8 +613402,7 @@ _08135230: pop {r0} bx r0 .align 2, 0 -_0813523C: .4byte 0x03005e00 -_08135240: .4byte 0x085b22d0 + .pool thumb_func_end sub_81351AC thumb_func_start sub_8135244 @@ -634171,7 +613410,7 @@ sub_8135244: @ 8135244 push {r4-r7,lr} sub sp, 0x4 adds r6, r0, 0 - ldr r2, _081352D4 + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r6, r0] lsls r0, r1, 2 @@ -634207,7 +613446,7 @@ _08135280: str r1, [sp] movs r0, 0x1 bl rotscale_set_direct - ldr r1, _081352D8 + ldr r1, =0x085b22d0 lsls r2, r7, 1 adds r0, r2, r1 ldrb r0, [r0] @@ -634242,15 +613481,14 @@ _081352C8: pop {r0} bx r0 .align 2, 0 -_081352D4: .4byte 0x03005e00 -_081352D8: .4byte 0x085b22d0 + .pool thumb_func_end sub_8135244 thumb_func_start sub_81352DC sub_81352DC: @ 81352DC push {r4,lr} adds r4, r0, 0 - ldr r2, _08135318 + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -634279,7 +613517,7 @@ _08135308: adds r0, r1, 0x1 b _0813533A .align 2, 0 -_08135318: .4byte 0x03005e00 + .pool _0813531C: ldrh r1, [r4, 0x30] adds r0, r1, 0 @@ -634309,7 +613547,7 @@ _0813533C: lsls r0, r1, 1 cmp r0, 0 bge _08135354 - ldr r1, _0813537C + ldr r1, =0x00000fff adds r0, r1 _08135354: asrs r0, 12 @@ -634323,7 +613561,7 @@ _08135354: lsls r0, r1, 1 cmp r0, 0 bge _08135370 - ldr r2, _0813537C + ldr r2, =0x00000fff adds r0, r2 _08135370: asrs r0, 12 @@ -634332,14 +613570,14 @@ _08135370: pop {r0} bx r0 .align 2, 0 -_0813537C: .4byte 0x00000fff + .pool thumb_func_end sub_81352DC thumb_func_start sub_8135380 sub_8135380: @ 8135380 push {r4,lr} adds r4, r0, 0 - ldr r2, _081353BC + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -634368,7 +613606,7 @@ _081353AC: adds r0, r1, 0x1 b _081353DE .align 2, 0 -_081353BC: .4byte 0x03005e00 + .pool _081353C0: ldrh r1, [r4, 0x30] adds r0, r1, 0 @@ -634398,7 +613636,7 @@ _081353E0: lsls r0, r1, 1 cmp r0, 0 bge _081353F8 - ldr r1, _08135420 + ldr r1, =0x00000fff adds r0, r1 _081353F8: asrs r0, 12 @@ -634412,7 +613650,7 @@ _081353F8: lsls r0, r1, 1 cmp r0, 0 bge _08135414 - ldr r2, _08135420 + ldr r2, =0x00000fff adds r0, r2 _08135414: asrs r0, 12 @@ -634421,7 +613659,7 @@ _08135414: pop {r0} bx r0 .align 2, 0 -_08135420: .4byte 0x00000fff + .pool thumb_func_end sub_8135380 thumb_func_start npc_before_player_of_type @@ -634430,7 +613668,7 @@ npc_before_player_of_type: @ 8135424 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r4, _08135464 + ldr r4, =0x0203ab40 adds r1, r4, 0x2 adds r0, r4, 0 bl player_get_pos_to_plus_one_step_in_direction_player_is_facing @@ -634442,7 +613680,7 @@ npc_before_player_of_type: @ 8135424 bl npc_id_by_pos_and_height lsls r0, 24 lsrs r0, 24 - ldr r2, _08135468 + ldr r2, =0x02037350 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -634450,15 +613688,13 @@ npc_before_player_of_type: @ 8135424 ldrb r0, [r2, 0x5] cmp r0, r5 bne _08135470 - ldr r1, _0813546C + ldr r1, =0x020375f2 ldrb r0, [r2, 0x8] strh r0, [r1] movs r0, 0x1 b _08135472 .align 2, 0 -_08135464: .4byte 0x0203ab40 -_08135468: .4byte 0x02037350 -_0813546C: .4byte 0x020375f2 + .pool _08135470: movs r0, 0 _08135472: @@ -634470,10 +613706,10 @@ _08135472: thumb_func_start oei_task_add oei_task_add: @ 8135478 push {lr} - ldr r0, _08135494 + ldr r0, =0x0203ab40 adds r1, r0, 0x2 bl player_get_pos_to_plus_one_step_in_direction_player_is_facing - ldr r0, _08135498 + ldr r0, =task08_080C9820 + 1 movs r1, 0x8 bl AddTask lsls r0, 24 @@ -634481,8 +613717,7 @@ oei_task_add: @ 8135478 pop {r1} bx r1 .align 2, 0 -_08135494: .4byte 0x0203ab40 -_08135498: .4byte task08_080C9820 + 1 + .pool thumb_func_end oei_task_add thumb_func_start task08_080C9820 @@ -634492,14 +613727,14 @@ task08_080C9820: @ 813549C lsrs r5, r0, 24 adds r6, r5, 0 bl script_env_2_enable - ldr r1, _081354F0 + ldr r1, =0x02037590 movs r0, 0x1 strb r0, [r1, 0x6] ldrb r1, [r1, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081354F4 + ldr r1, =0x02037350 adds r4, r0, r1 adds r0, r4, 0 bl npc_is_visible_or_is_x40 @@ -634512,36 +613747,32 @@ task08_080C9820: @ 813549C cmp r0, 0 beq _0813551E _081354D2: - ldr r0, _081354F8 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x5 bne _08135504 movs r0, 0x3B bl oe_exec - ldr r0, _081354FC + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _08135500 + ldr r0, =sub_8135578 + 1 b _0813551C .align 2, 0 -_081354F0: .4byte 0x02037590 -_081354F4: .4byte 0x02037350 -_081354F8: .4byte 0x02037318 -_081354FC: .4byte 0x03005e00 -_08135500: .4byte sub_8135578 + 1 + .pool _08135504: bl sub_808C114 adds r0, r4, 0 movs r1, 0x39 bl npc_set_state_2 - ldr r0, _08135524 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _08135528 + ldr r0, =sub_813552C + 1 _0813551C: str r0, [r1] _0813551E: @@ -634549,8 +613780,7 @@ _0813551E: pop {r0} bx r0 .align 2, 0 -_08135524: .4byte 0x03005e00 -_08135528: .4byte sub_813552C + 1 + .pool thumb_func_end task08_080C9820 thumb_func_start sub_813552C @@ -634558,12 +613788,12 @@ sub_813552C: @ 813552C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08135568 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0813556C + ldr r1, =0x02037350 adds r0, r1 bl npc_get_bit7_or_const_x10_when_inactive lsls r0, 24 @@ -634572,22 +613802,19 @@ sub_813552C: @ 813552C bne _08135560 movs r0, 0x3B bl oe_exec - ldr r0, _08135570 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08135574 + ldr r0, =sub_8135578 + 1 str r0, [r1] _08135560: pop {r4} pop {r0} bx r0 .align 2, 0 -_08135568: .4byte 0x02037590 -_0813556C: .4byte 0x02037350 -_08135570: .4byte 0x03005e00 -_08135574: .4byte sub_8135578 + 1 + .pool thumb_func_end sub_813552C thumb_func_start sub_8135578 @@ -634602,7 +613829,7 @@ sub_8135578: @ 8135578 cmp r4, 0 bne _081355FC bl player_get_direction__sp1AA - ldr r6, _08135604 + ldr r6, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r6, 0x4] @@ -634626,12 +613853,12 @@ _081355B0: movs r0, 0x3 str r0, [r6, 0x8] _081355B8: - ldr r5, _08135608 + ldr r5, =0x02037590 ldrb r0, [r5, 0x5] lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _0813560C + ldr r0, =0x02037350 adds r4, r0 bl sub_808BF6C adds r1, r0, 0 @@ -634643,30 +613870,25 @@ _081355B8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08135610 + ldr r1, =0x02020630 adds r0, r1 ldrb r1, [r6, 0x8] bl obj_anim_image_start movs r0, 0x6 bl oe_active_list_remove - ldr r1, _08135614 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _08135618 + ldr r1, =sub_813561C + 1 str r1, [r0] _081355FC: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08135604: .4byte 0x02038c08 -_08135608: .4byte 0x02037590 -_0813560C: .4byte 0x02037350 -_08135610: .4byte 0x02020630 -_08135614: .4byte 0x03005e00 -_08135618: .4byte sub_813561C + 1 + .pool thumb_func_end sub_8135578 thumb_func_start sub_813561C @@ -634675,7 +613897,7 @@ sub_813561C: @ 813561C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _0813564C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -634685,7 +613907,7 @@ sub_813561C: @ 813561C ldrh r0, [r0, 0x1A] orrs r1, r0 bl _call_via_r1 - ldr r1, _08135650 + ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x6] adds r0, r4, 0 @@ -634694,8 +613916,7 @@ sub_813561C: @ 813561C pop {r0} bx r0 .align 2, 0 -_0813564C: .4byte 0x03005e00 -_08135650: .4byte 0x02037590 + .pool thumb_func_end sub_813561C thumb_func_start sub_8135654 @@ -634705,23 +613926,19 @@ sub_8135654: @ 8135654 lsls r0, 24 cmp r0, 0 beq _0813568C - ldr r4, _08135678 + ldr r4, =0x020375f0 bl brm_get_pokemon_selection lsls r0, 24 lsrs r0, 24 strh r0, [r4] - ldr r1, _0813567C - ldr r0, _08135680 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _08135684 - ldr r0, _08135688 + ldr r1, =0x0203ceec + ldr r0, =sub_8179834 + 1 b _081356A8 .align 2, 0 -_08135678: .4byte 0x020375f0 -_0813567C: .4byte 0x03005db0 -_08135680: .4byte hm_add_c3_launch_phase_2 + 1 -_08135684: .4byte 0x0203ceec -_08135688: .4byte sub_8179834 + 1 + .pool _0813568C: movs r0, 0x56 bl npc_before_player_of_type @@ -634732,11 +613949,11 @@ _0813568C: movs r0, 0 b _081356AC _0813569E: - ldr r1, _081356B4 - ldr r0, _081356B8 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _081356BC - ldr r0, _081356C0 + ldr r1, =0x0203ceec + ldr r0, =sub_81356C4 + 1 _081356A8: str r0, [r1] movs r0, 0x1 @@ -634745,27 +613962,23 @@ _081356AC: pop {r1} bx r1 .align 2, 0 -_081356B4: .4byte 0x03005db0 -_081356B8: .4byte hm_add_c3_launch_phase_2 + 1 -_081356BC: .4byte 0x0203ceec -_081356C0: .4byte sub_81356C4 + 1 + .pool thumb_func_end sub_8135654 thumb_func_start sub_81356C4 sub_81356C4: @ 81356C4 push {lr} bl brm_get_pokemon_selection - ldr r1, _081356DC + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r0, _081356E0 + ldr r0, =0x082907f0 bl script_env_1_execute_new_script pop {r0} bx r0 .align 2, 0 -_081356DC: .4byte 0x02038c08 -_081356E0: .4byte 0x082907f0 + .pool thumb_func_end sub_81356C4 thumb_func_start oei_rocksmash @@ -634774,12 +613987,12 @@ oei_rocksmash: @ 81356E4 bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _0813570C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _08135710 + ldr r2, =sub_8135714 + 1 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -634789,8 +614002,7 @@ oei_rocksmash: @ 81356E4 pop {r1} bx r1 .align 2, 0 -_0813570C: .4byte 0x03005e00 -_08135710: .4byte sub_8135714 + 1 + .pool thumb_func_end oei_rocksmash thumb_func_start sub_8135714 @@ -634816,21 +614028,18 @@ sub_813572C: @ 813572C movs r0, 0 b _0813574C _0813573E: - ldr r1, _08135750 - ldr r0, _08135754 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _08135758 - ldr r0, _0813575C + ldr r1, =0x0203ceec + ldr r0, =hm2_dig + 1 str r0, [r1] movs r0, 0x1 _0813574C: pop {r1} bx r1 .align 2, 0 -_08135750: .4byte 0x03005db0 -_08135754: .4byte hm_add_c3_launch_phase_2 + 1 -_08135758: .4byte 0x0203ceec -_0813575C: .4byte hm2_dig + 1 + .pool thumb_func_end sub_813572C thumb_func_start hm2_dig @@ -634840,14 +614049,14 @@ hm2_dig: @ 8135760 movs r0, 0x26 bl oe_exec bl brm_get_pokemon_selection - ldr r1, _0813577C + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0813577C: .4byte 0x02038c08 + .pool thumb_func_end hm2_dig thumb_func_start sub_8135780 @@ -634856,12 +614065,12 @@ sub_8135780: @ 8135780 bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _081357B4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _081357B8 + ldr r2, =sub_81357BC + 1 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -634876,8 +614085,7 @@ _081357AC: pop {r1} bx r1 .align 2, 0 -_081357B4: .4byte 0x03005e00 -_081357B8: .4byte sub_81357BC + 1 + .pool thumb_func_end sub_8135780 thumb_func_start sub_81357BC @@ -634893,12 +614101,12 @@ sub_81357BC: @ 81357BC bl sub_817963C b _081357EE _081357D6: - ldr r0, _081357F4 + ldr r0, =task08_080A1C44 + 1 movs r1, 0x8 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081357F8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -634909,8 +614117,7 @@ _081357EE: pop {r0} bx r0 .align 2, 0 -_081357F4: .4byte task08_080A1C44 + 1 -_081357F8: .4byte 0x03005e00 + .pool thumb_func_end sub_81357BC thumb_func_start sub_81357FC @@ -634920,11 +614127,11 @@ sub_81357FC: @ 81357FC adds r6, r1, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _0813584C - ldr r0, _08135850 + ldr r5, =0x0203ab50 + ldr r0, =0x00000e88 bl malloc str r0, [r5] - ldr r2, _08135854 + ldr r2, =0x00000809 adds r0, r2 movs r3, 0 strb r4, [r0] @@ -634933,15 +614140,15 @@ sub_81357FC: @ 81357FC lsls r4, 4 adds r1, r0, r4 str r3, [r1] - ldr r1, _08135858 + ldr r1, =0x00000e7c adds r0, r1 movs r1, 0xFF strb r1, [r0] ldr r0, [r5] - ldr r4, _0813585C + ldr r4, =0x00000e7d adds r0, r4 strb r3, [r0] - ldr r0, _08135860 + ldr r0, =0x0203ab48 str r6, [r0] ldr r5, [r5] adds r2, r5, r2 @@ -634954,103 +614161,88 @@ sub_81357FC: @ 81357FC beq _0813586A b _081358C0 .align 2, 0 -_0813584C: .4byte 0x0203ab50 -_08135850: .4byte 0x00000e88 -_08135854: .4byte 0x00000809 -_08135858: .4byte 0x00000e7c -_0813585C: .4byte 0x00000e7d -_08135860: .4byte 0x0203ab48 + .pool _08135864: cmp r2, 0x3 beq _081358A4 b _081358C0 _0813586A: - ldr r0, _0813587C + ldr r0, =0x00000804 adds r1, r5, r0 - ldr r0, _08135880 + ldr r0, =0x085b269b str r0, [r1] - ldr r4, _08135884 + ldr r4, =0x00000808 adds r1, r5, r4 movs r0, 0x2 b _081358D2 .align 2, 0 -_0813587C: .4byte 0x00000804 -_08135880: .4byte 0x085b269b -_08135884: .4byte 0x00000808 + .pool _08135888: - ldr r1, _08135898 + ldr r1, =0x00000804 adds r0, r5, r1 - ldr r1, _0813589C + ldr r1, =0x085b269d str r1, [r0] - ldr r4, _081358A0 + ldr r4, =0x00000808 adds r0, r5, r4 strb r2, [r0] b _081358D4 .align 2, 0 -_08135898: .4byte 0x00000804 -_0813589C: .4byte 0x085b269d -_081358A0: .4byte 0x00000808 + .pool _081358A4: - ldr r0, _081358B4 + ldr r0, =0x00000804 adds r1, r5, r0 - ldr r0, _081358B8 + ldr r0, =0x085b269f str r0, [r1] - ldr r4, _081358BC + ldr r4, =0x00000808 adds r1, r5, r4 movs r0, 0x2 b _081358D2 .align 2, 0 -_081358B4: .4byte 0x00000804 -_081358B8: .4byte 0x085b269f -_081358BC: .4byte 0x00000808 + .pool _081358C0: - ldr r0, _081358E0 + ldr r0, =0x0203ab50 ldr r1, [r0] - ldr r0, _081358E4 + ldr r0, =0x00000804 adds r2, r1, r0 - ldr r0, _081358E8 + ldr r0, =0x085b2698 str r0, [r2] - ldr r4, _081358EC + ldr r4, =0x00000808 adds r1, r4 movs r0, 0x3 _081358D2: strb r0, [r1] _081358D4: - ldr r0, _081358F0 + ldr r0, =sub_813594C + 1 bl set_callback2 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081358E0: .4byte 0x0203ab50 -_081358E4: .4byte 0x00000804 -_081358E8: .4byte 0x085b2698 -_081358EC: .4byte 0x00000808 -_081358F0: .4byte sub_813594C + 1 + .pool thumb_func_end sub_81357FC thumb_func_start sub_81358F4 sub_81358F4: @ 81358F4 push {lr} - ldr r1, _08135904 + ldr r1, =sub_8059D50 + 1 movs r0, 0x1 bl sub_81357FC pop {r0} bx r0 .align 2, 0 -_08135904: .4byte sub_8059D50 + 1 + .pool thumb_func_end sub_81358F4 thumb_func_start sub_8135908 sub_8135908: @ 8135908 push {lr} - ldr r1, _08135918 + ldr r1, =c2_exit_to_overworld_2_switch + 1 movs r0, 0x2 bl sub_81357FC pop {r0} bx r0 .align 2, 0 -_08135918: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_8135908 thumb_func_start sub_813591C @@ -635103,7 +614295,7 @@ _08135972: sub_8135978: @ 8135978 push {r4,lr} sub sp, 0x4 - ldr r0, _08135998 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -635113,13 +614305,12 @@ sub_8135978: @ 8135978 b _08135BB8 _0813598C: lsls r0, 2 - ldr r1, _0813599C + ldr r1, =_081359A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08135998: .4byte 0x030022c0 -_0813599C: .4byte _081359A0 + .pool .align 2, 0 _081359A0: .4byte _081359EC @@ -635147,38 +614338,37 @@ _081359EC: b _08135B9E _081359F6: bl remove_some_task - ldr r1, _08135A04 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _08135BA6 .align 2, 0 -_08135A04: .4byte 0x030022c0 + .pool _08135A08: bl gpu_pal_allocator_reset b _08135B9E _08135A0E: bl sub_80A1A74 - ldr r2, _08135A28 + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r1, _08135A2C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _08135BA6 .align 2, 0 -_08135A28: .4byte 0x02037fd4 -_08135A2C: .4byte 0x030022c0 + .pool _08135A30: bl reset_all_obj_data b _08135B9E _08135A36: - ldr r0, _08135A4C + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r1, _08135A50 + ldr r1, =0x00000809 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -635188,20 +614378,18 @@ _08135A46: bl clear_tasks b _08135B9E .align 2, 0 -_08135A4C: .4byte 0x0203ab50 -_08135A50: .4byte 0x00000809 + .pool _08135A54: bl sub_8135BDC - ldr r0, _08135A68 + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r1, _08135A6C + ldr r1, =0x00000e7e adds r0, r1 movs r1, 0 strh r1, [r0] b _08135B9E .align 2, 0 -_08135A68: .4byte 0x0203ab50 -_08135A6C: .4byte 0x00000e7e + .pool _08135A70: bl sub_8135C38 lsls r0, 24 @@ -635209,13 +614397,13 @@ _08135A70: bne _08135A7C b _08135BD0 _08135A7C: - ldr r1, _08135A88 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _08135BA6 .align 2, 0 -_08135A88: .4byte 0x030022c0 + .pool _08135A8C: bl sub_813625C bl sub_81362E0 @@ -635226,73 +614414,68 @@ _08135A9A: movs r1, 0x40 movs r2, 0 bl sub_8136444 - ldr r1, _08135AB8 + ldr r1, =0x0203ab50 ldr r1, [r1] - ldr r2, _08135ABC + ldr r2, =0x00000e74 adds r1, r2 strb r0, [r1] - ldr r1, _08135AC0 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _08135BA6 .align 2, 0 -_08135AB8: .4byte 0x0203ab50 -_08135ABC: .4byte 0x00000e74 -_08135AC0: .4byte 0x030022c0 + .pool _08135AC4: - ldr r0, _08135AD4 + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r1, _08135AD8 + ldr r1, =0x00000e75 adds r0, r1 movs r1, 0x7 bl sub_8122344 b _08135B9E .align 2, 0 -_08135AD4: .4byte 0x0203ab50 -_08135AD8: .4byte 0x00000e75 + .pool _08135ADC: - ldr r0, _08135AF0 + ldr r0, =0x0203ab48 ldrh r0, [r0, 0x4] - ldr r1, _08135AF4 + ldr r1, =0x00001005 bl sub_8136110 - ldr r1, _08135AF8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _08135BA6 .align 2, 0 -_08135AF0: .4byte 0x0203ab48 -_08135AF4: .4byte 0x00001005 -_08135AF8: .4byte 0x030022c0 + .pool _08135AFC: bl sub_8135D24 b _08135B9E _08135B02: bl sub_8135E2C - ldr r1, _08135B10 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _08135BA6 .align 2, 0 -_08135B10: .4byte 0x030022c0 + .pool _08135B14: bl sub_81363BC b _08135B9E _08135B1A: - ldr r0, _08135B50 + ldr r0, =sub_81365C8 + 1 movs r1, 0 bl AddTask adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08135B54 - ldr r2, _08135B58 + ldr r0, =0x03006310 + ldr r2, =0x0203ab48 ldrh r1, [r2, 0x6] ldrh r2, [r2, 0x4] bl calls_per_item_funcs_in_list_outer - ldr r2, _08135B5C + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -635300,17 +614483,13 @@ _08135B1A: lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0x8] - ldr r1, _08135B60 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _08135BA6 .align 2, 0 -_08135B50: .4byte sub_81365C8 + 1 -_08135B54: .4byte 0x03006310 -_08135B58: .4byte 0x0203ab48 -_08135B5C: .4byte 0x03005e00 -_08135B60: .4byte 0x030022c0 + .pool _08135B64: bl sub_8135DAC b _08135B9E @@ -635320,13 +614499,13 @@ _08135B6A: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r1, _08135B80 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _08135BA6 .align 2, 0 -_08135B80: .4byte 0x030022c0 + .pool _08135B84: movs r0, 0x1 negs r0, r0 @@ -635335,13 +614514,13 @@ _08135B84: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r2, _08135BB0 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] _08135B9E: - ldr r1, _08135BB4 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -635351,18 +614530,16 @@ _08135BA6: strb r0, [r1] b _08135BD0 .align 2, 0 -_08135BB0: .4byte 0x02037fd4 -_08135BB4: .4byte 0x030022c0 + .pool _08135BB8: - ldr r0, _08135BC8 + ldr r0, =sub_8135938 + 1 bl SetVBlankCallback - ldr r0, _08135BCC + ldr r0, =sub_813591C + 1 bl set_callback2 movs r0, 0x1 b _08135BD2 .align 2, 0 -_08135BC8: .4byte sub_8135938 + 1 -_08135BCC: .4byte sub_813591C + 1 + .pool _08135BD0: movs r0, 0 _08135BD2: @@ -635378,11 +614555,11 @@ sub_8135BDC: @ 8135BDC bl sub_8121DA0 movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08135C30 + ldr r1, =0x085b2620 movs r0, 0 movs r2, 0x3 bl bg_vram_setup - ldr r0, _08135C34 + ldr r0, =0x0203ab50 ldr r1, [r0] movs r0, 0x2 bl bg_set_tilemap @@ -635405,31 +614582,28 @@ sub_8135BDC: @ 8135BDC pop {r0} bx r0 .align 2, 0 -_08135C30: .4byte 0x085b2620 -_08135C34: .4byte 0x0203ab50 + .pool thumb_func_end sub_8135BDC thumb_func_start sub_8135C38 sub_8135C38: @ 8135C38 push {r4,lr} sub sp, 0x4 - ldr r0, _08135C58 + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r1, _08135C5C + ldr r1, =0x00000e7e adds r0, r1 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x5 bhi _08135D18 lsls r0, 2 - ldr r1, _08135C60 + ldr r1, =_08135C64 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08135C58: .4byte 0x0203ab50 -_08135C5C: .4byte 0x00000e7e -_08135C60: .4byte _08135C64 + .pool .align 2, 0 _08135C64: .4byte _08135C7C @@ -635440,7 +614614,7 @@ _08135C64: .4byte _08135CFC _08135C7C: bl reset_temp_tile_data_buffers - ldr r1, _08135C94 + ldr r1, =0x08d9b2b4 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -635449,66 +614623,62 @@ _08135C7C: bl decompress_and_copy_tile_data_to_vram b _08135CDE .align 2, 0 -_08135C94: .4byte 0x08d9b2b4 + .pool _08135C98: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08135D18 - ldr r0, _08135CB4 - ldr r4, _08135CB8 + ldr r0, =0x08d9b7c8 + ldr r4, =0x0203ab50 ldr r1, [r4] bl call_LZZUnCompWram ldr r1, [r4] b _08135CE2 .align 2, 0 -_08135CB4: .4byte 0x08d9b7c8 -_08135CB8: .4byte 0x0203ab50 + .pool _08135CBC: - ldr r0, _08135CC8 + ldr r0, =0x08d9b470 movs r1, 0 movs r2, 0xC0 bl decompress_palette b _08135CDE .align 2, 0 -_08135CC8: .4byte 0x08d9b470 + .pool _08135CCC: - ldr r0, _08135CD4 + ldr r0, =0x085b26f4 bl gpu_tile_obj_decompress_and_load b _08135CDE .align 2, 0 -_08135CD4: .4byte 0x085b26f4 + .pool _08135CD8: - ldr r0, _08135CF0 + ldr r0, =0x085b26fc bl gpu_pal_obj_decompress_and_apply _08135CDE: - ldr r0, _08135CF4 + ldr r0, =0x0203ab50 ldr r1, [r0] _08135CE2: - ldr r0, _08135CF8 + ldr r0, =0x00000e7e adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _08135D18 .align 2, 0 -_08135CF0: .4byte 0x085b26fc -_08135CF4: .4byte 0x0203ab50 -_08135CF8: .4byte 0x00000e7e + .pool _08135CFC: bl sub_8122328 - ldr r0, _08135D10 + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r1, _08135D14 + ldr r1, =0x00000e7e adds r0, r1 movs r1, 0 strh r1, [r0] movs r0, 0x1 b _08135D1A .align 2, 0 -_08135D10: .4byte 0x0203ab50 -_08135D14: .4byte 0x00000e7e + .pool _08135D18: movs r0, 0 _08135D1A: @@ -635521,7 +614691,7 @@ _08135D1A: thumb_func_start sub_8135D24 sub_8135D24: @ 8135D24 push {r4,lr} - ldr r0, _08135D74 + ldr r0, =0x085b2748 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 @@ -635532,7 +614702,7 @@ sub_8135D24: @ 8135D24 movs r1, 0xA movs r2, 0xD0 bl copy_textbox_border_tile_patterns_to_vram - ldr r0, _08135D78 + ldr r0, =0x0860f074 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -635554,8 +614724,7 @@ _08135D50: pop {r0} bx r0 .align 2, 0 -_08135D74: .4byte 0x085b2748 -_08135D78: .4byte 0x0860f074 + .pool thumb_func_end sub_8135D24 thumb_func_start sub_8135D7C @@ -635569,7 +614738,7 @@ sub_8135D7C: @ 8135D7C movs r4, 0 str r4, [sp] str r4, [sp, 0x4] - ldr r3, _08135DA8 + ldr r3, =0x085b271c str r3, [sp, 0x8] str r4, [sp, 0xC] str r1, [sp, 0x10] @@ -635581,13 +614750,13 @@ sub_8135D7C: @ 8135D7C pop {r0} bx r0 .align 2, 0 -_08135DA8: .4byte 0x085b271c + .pool thumb_func_end sub_8135D7C thumb_func_start sub_8135DAC sub_8135DAC: @ 8135DAC push {r4,lr} - ldr r0, _08135E14 + ldr r0, =0x00000111 bl itemid_get_item adds r4, r0, 0 movs r0, 0x1 @@ -635598,23 +614767,23 @@ sub_8135DAC: @ 8135DAC movs r0, 0 adds r1, r4, 0 bl sub_8135D7C - ldr r1, _08135E18 + ldr r1, =0x085e931d movs r0, 0x2 movs r2, 0 bl sub_8135D7C - ldr r1, _08135E1C + ldr r1, =0x085e9323 movs r0, 0x3 movs r2, 0 bl sub_8135D7C - ldr r1, _08135E20 + ldr r1, =0x085e9327 movs r0, 0x4 movs r2, 0 bl sub_8135D7C - ldr r1, _08135E24 + ldr r1, =0x085e932d movs r0, 0x5 movs r2, 0 bl sub_8135D7C - ldr r1, _08135E28 + ldr r1, =0x085e9334 movs r0, 0x6 movs r2, 0 bl sub_8135D7C @@ -635631,21 +614800,16 @@ _08135DFE: pop {r0} bx r0 .align 2, 0 -_08135E14: .4byte 0x00000111 -_08135E18: .4byte 0x085e931d -_08135E1C: .4byte 0x085e9323 -_08135E20: .4byte 0x085e9327 -_08135E24: .4byte 0x085e932d -_08135E28: .4byte 0x085e9334 + .pool thumb_func_end sub_8135DAC thumb_func_start sub_8135E2C sub_8135E2C: @ 8135E2C push {r4-r7,lr} movs r6, 0 - ldr r1, _08135EE4 + ldr r1, =0x0203ab50 ldr r0, [r1] - ldr r2, _08135EE8 + ldr r2, =0x0000080a adds r0, r2 ldrb r0, [r0] subs r0, 0x1 @@ -635654,7 +614818,7 @@ sub_8135E2C: @ 8135E2C adds r5, r1, 0 _08135E42: lsls r4, r6, 5 - ldr r3, _08135EEC + ldr r3, =0x00000954 adds r4, r3 ldr r0, [r5] adds r0, r4 @@ -635662,7 +614826,7 @@ _08135E42: bl sub_8135F04 ldr r1, [r5] lsls r2, r6, 3 - ldr r7, _08135EF0 + ldr r7, =0x0000080c adds r0, r1, r7 adds r0, r2 adds r4, r1, r4 @@ -635675,24 +614839,24 @@ _08135E42: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r4, _08135EE8 + ldr r4, =0x0000080a adds r1, r4 ldrb r0, [r1] subs r0, 0x1 cmp r6, r0 blt _08135E42 _08135E7C: - ldr r5, _08135EE4 + ldr r5, =0x0203ab50 lsls r4, r6, 5 - ldr r7, _08135EEC + ldr r7, =0x00000954 adds r4, r7 ldr r0, [r5] adds r0, r4 - ldr r1, _08135EF4 + ldr r1, =0x085e9344 bl gf_strcpy ldr r1, [r5] lsls r2, r6, 3 - ldr r3, _08135EF0 + ldr r3, =0x0000080c adds r0, r1, r3 adds r0, r2 adds r4, r1, r4 @@ -635704,9 +614868,9 @@ _08135E7C: movs r0, 0x2 negs r0, r0 str r0, [r1] - ldr r2, _08135EF8 + ldr r2, =0x03006310 adds r1, r2, 0 - ldr r0, _08135EFC + ldr r0, =0x085b27b0 ldm r0!, {r4,r6,r7} stm r1!, {r4,r6,r7} ldm r0!, {r4,r6,r7} @@ -635719,13 +614883,13 @@ _08135E7C: orrs r0, r1 strb r0, [r2, 0x17] ldr r1, [r5] - ldr r4, _08135EE8 + ldr r4, =0x0000080a adds r0, r1, r4 ldrb r0, [r0] strh r0, [r2, 0xC] adds r3, r1, r3 str r3, [r2] - ldr r6, _08135F00 + ldr r6, =0x0000080b adds r1, r6 ldrb r0, [r1] strh r0, [r2, 0xE] @@ -635733,27 +614897,20 @@ _08135E7C: pop {r0} bx r0 .align 2, 0 -_08135EE4: .4byte 0x0203ab50 -_08135EE8: .4byte 0x0000080a -_08135EEC: .4byte 0x00000954 -_08135EF0: .4byte 0x0000080c -_08135EF4: .4byte 0x085e9344 -_08135EF8: .4byte 0x03006310 -_08135EFC: .4byte 0x085b27b0 -_08135F00: .4byte 0x0000080b + .pool thumb_func_end sub_8135E2C thumb_func_start sub_8135F04 sub_8135F04: @ 8135F04 push {r4-r6,lr} lsls r1, 16 - ldr r2, _08135F5C + ldr r2, =0x03005d8c lsrs r1, 13 - ldr r3, _08135F60 + ldr r3, =0x00000848 adds r1, r3 ldr r5, [r2] adds r5, r1 - ldr r2, _08135F64 + ldr r2, =0x085b262c ldrb r1, [r5] lsls r1, 2 adds r1, r2 @@ -635769,7 +614926,7 @@ sub_8135F04: @ 8135F04 movs r0, 0x57 strb r0, [r4] adds r4, 0x1 - ldr r6, _08135F68 + ldr r6, =0x02021cc4 adds r0, r5, 0 bl sub_8136EA4 adds r1, r0, 0 @@ -635779,18 +614936,14 @@ sub_8135F04: @ 8135F04 movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r1, _08135F6C + ldr r1, =0x085e934f adds r0, r4, 0 bl ExpandTextCodes pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08135F5C: .4byte 0x03005d8c -_08135F60: .4byte 0x00000848 -_08135F64: .4byte 0x085b262c -_08135F68: .4byte 0x02021cc4 -_08135F6C: .4byte 0x085e934f + .pool thumb_func_end sub_8135F04 thumb_func_start sub_8135F70 @@ -635803,10 +614956,10 @@ sub_8135F70: @ 8135F70 beq _08135F9C movs r0, 0x5 bl audio_play - ldr r2, _08135FB8 - ldr r0, _08135FBC + ldr r2, =0x02020630 + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r1, _08135FC0 + ldr r1, =0x00000e74 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -635814,12 +614967,12 @@ sub_8135F70: @ 8135F70 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _08135FC4 + ldr r1, =sub_8136470 + 1 str r1, [r0] _08135F9C: - ldr r0, _08135FBC + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r1, _08135FC8 + ldr r1, =0x00000e7d adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -635831,11 +614984,7 @@ _08135FB0: pop {r0} bx r0 .align 2, 0 -_08135FB8: .4byte 0x02020630 -_08135FBC: .4byte 0x0203ab50 -_08135FC0: .4byte 0x00000e74 -_08135FC4: .4byte sub_8136470 + 1 -_08135FC8: .4byte 0x00000e7d + .pool thumb_func_end sub_8135F70 thumb_func_start sub_8135FCC @@ -635852,9 +615001,9 @@ sub_8135FCC: @ 8135FCC negs r0, r0 cmp r4, r0 beq _081360A0 - ldr r1, _08136024 + ldr r1, =0x03005d8c lsls r0, r4, 3 - ldr r2, _08136028 + ldr r2, =0x00000848 adds r0, r2 ldr r1, [r1] adds r1, r0 @@ -635884,8 +615033,7 @@ _08136002: strh r1, [r6, 0x2] b _08136032 .align 2, 0 -_08136024: .4byte 0x03005d8c -_08136028: .4byte 0x00000848 + .pool _0813602C: movs r0, 0xF strh r0, [r6] @@ -635922,7 +615070,7 @@ _08136032: lsrs r5, r0, 24 cmp r5, 0x4 bls _08136002 - ldr r4, _0813609C + ldr r4, =0x02021cc4 mov r0, r8 bl sub_8136EDC adds r1, r0, 0 @@ -635938,7 +615086,7 @@ _08136032: bl sub_8135D7C b _081360F8 .align 2, 0 -_0813609C: .4byte 0x02021cc4 + .pool _081360A0: add r0, sp, 0x8 movs r1, 0xF @@ -636033,10 +615181,10 @@ _0813614A: mov r12, r1 cmp r6, 0x27 bhi _08136192 - ldr r0, _081361A8 + ldr r0, =0x03005d8c mov r9, r0 lsls r7, r2, 3 - ldr r1, _081361AC + ldr r1, =0x00000848 mov r8, r1 _08136160: mov r0, r9 @@ -636046,7 +615194,7 @@ _08136160: ldrb r0, [r0] cmp r0, 0 bne _08136188 - ldr r1, _081361AC + ldr r1, =0x00000848 adds r2, r1 adds r3, r2, r7 ldr r4, [r3] @@ -636078,8 +615226,7 @@ _08136192: pop {r0} bx r0 .align 2, 0 -_081361A8: .4byte 0x03005d8c -_081361AC: .4byte 0x00000848 + .pool thumb_func_end sub_8136140 thumb_func_start sub_81361B0 @@ -636087,9 +615234,9 @@ sub_81361B0: @ 81361B0 push {r4-r7,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _08136204 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08136208 + ldr r1, =0x00000848 adds r6, r0, r1 cmp r4, r5 beq _08136246 @@ -636126,8 +615273,7 @@ _081361E8: blt _081361E8 b _08136234 .align 2, 0 -_08136204: .4byte 0x03005d8c -_08136208: .4byte 0x00000848 + .pool _0813620C: lsls r3, r4, 16 lsls r0, r5, 16 @@ -636167,39 +615313,39 @@ _08136246: thumb_func_start sub_813624C sub_813624C: @ 813624C - ldr r1, _08136258 + ldr r1, =0x0203ab48 movs r0, 0 strh r0, [r1, 0x4] strh r0, [r1, 0x6] bx lr .align 2, 0 -_08136258: .4byte 0x0203ab48 + .pool thumb_func_end sub_813624C thumb_func_start sub_813625C sub_813625C: @ 813625C push {r4,r5,lr} bl sub_8136140 - ldr r0, _081362BC + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r1, _081362C0 + ldr r1, =0x0000080a adds r0, r1 movs r1, 0 strb r1, [r0] movs r2, 0 - ldr r5, _081362C4 - ldr r4, _081362C8 + ldr r5, =0x03005d8c + ldr r4, =0x00000848 _08136274: ldr r0, [r5] lsls r1, r2, 3 adds r0, r1 adds r0, r4 ldrb r0, [r0] - ldr r3, _081362BC + ldr r3, =0x0203ab50 cmp r0, 0 beq _08136290 ldr r1, [r3] - ldr r0, _081362C0 + ldr r0, =0x0000080a adds r1, r0 ldrb r0, [r1] adds r0, 0x1 @@ -636211,7 +615357,7 @@ _08136290: cmp r2, 0x27 bls _08136274 ldr r0, [r3] - ldr r2, _081362C0 + ldr r2, =0x0000080a adds r0, r2 ldrb r1, [r0] adds r1, 0x1 @@ -636221,19 +615367,15 @@ _08136290: ldrb r2, [r2] cmp r2, 0x9 bls _081362D0 - ldr r2, _081362CC + ldr r2, =0x0000080b adds r1, r0, r2 movs r0, 0x9 strb r0, [r1] b _081362D6 .align 2, 0 -_081362BC: .4byte 0x0203ab50 -_081362C0: .4byte 0x0000080a -_081362C4: .4byte 0x03005d8c -_081362C8: .4byte 0x00000848 -_081362CC: .4byte 0x0000080b + .pool _081362D0: - ldr r1, _081362DC + ldr r1, =0x0000080b adds r0, r1 strb r2, [r0] _081362D6: @@ -636241,21 +615383,21 @@ _081362D6: pop {r0} bx r0 .align 2, 0 -_081362DC: .4byte 0x0000080b + .pool thumb_func_end sub_813625C thumb_func_start sub_81362E0 sub_81362E0: @ 81362E0 push {r4,r5,lr} - ldr r0, _08136328 + ldr r0, =0x0203ab48 ldrh r1, [r0, 0x6] adds r3, r0, 0 - ldr r4, _0813632C + ldr r4, =0x0203ab50 cmp r1, 0 beq _08136308 ldrh r0, [r3, 0x6] ldr r1, [r4] - ldr r5, _08136330 + ldr r5, =0x0000080b adds r2, r1, r5 ldrb r2, [r2] adds r0, r2 @@ -636272,7 +615414,7 @@ _08136308: ldrh r0, [r2, 0x4] adds r1, r0 ldr r0, [r4] - ldr r4, _08136334 + ldr r4, =0x0000080a adds r0, r4 ldrb r0, [r0] cmp r1, r0 @@ -636283,10 +615425,7 @@ _08136308: strh r1, [r2, 0x4] b _0813633C .align 2, 0 -_08136328: .4byte 0x0203ab48 -_0813632C: .4byte 0x0203ab50 -_08136330: .4byte 0x0000080b -_08136334: .4byte 0x0000080a + .pool _08136338: subs r0, 0x1 strh r0, [r3, 0x4] @@ -636299,7 +615438,7 @@ _0813633C: thumb_func_start sub_8136344 sub_8136344: @ 8136344 push {r4-r7,lr} - ldr r0, _081363AC + ldr r0, =0x0203ab48 ldrh r1, [r0, 0x4] adds r5, r0, 0 cmp r1, 0x4 @@ -636310,13 +615449,13 @@ sub_8136344: @ 8136344 cmp r4, r0 bge _081363A4 ldrh r2, [r5, 0x6] - ldr r6, _081363B0 + ldr r6, =0x0203ab50 ldr r0, [r6] - ldr r3, _081363B4 + ldr r3, =0x0000080b adds r1, r0, r3 ldrb r1, [r1] adds r2, r1 - ldr r7, _081363B8 + ldr r7, =0x0000080a adds r0, r7 ldrb r0, [r0] cmp r2, r0 @@ -636338,11 +615477,11 @@ _08136374: bge _081363A4 ldrh r2, [r5, 0x6] ldr r1, [r6] - ldr r7, _081363B4 + ldr r7, =0x0000080b adds r0, r1, r7 ldrb r0, [r0] adds r2, r0 - ldr r0, _081363B8 + ldr r0, =0x0000080a adds r1, r0 ldrb r1, [r1] cmp r2, r1 @@ -636352,24 +615491,21 @@ _081363A4: pop {r0} bx r0 .align 2, 0 -_081363AC: .4byte 0x0203ab48 -_081363B0: .4byte 0x0203ab50 -_081363B4: .4byte 0x0000080b -_081363B8: .4byte 0x0000080a + .pool thumb_func_end sub_8136344 thumb_func_start sub_81363BC sub_81363BC: @ 81363BC push {r4,lr} sub sp, 0x10 - ldr r4, _08136404 + ldr r4, =0x0203ab50 ldr r1, [r4] - ldr r2, _08136408 + ldr r2, =0x00000e7c adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF bne _081363FC - ldr r2, _0813640C + ldr r2, =0x0000080a adds r0, r1, r2 ldrb r0, [r0] adds r2, 0x1 @@ -636377,10 +615513,10 @@ sub_81363BC: @ 81363BC ldrb r1, [r1] subs r0, r1 str r0, [sp] - ldr r0, _08136410 + ldr r0, =0x00000456 str r0, [sp, 0x4] str r0, [sp, 0x8] - ldr r0, _08136414 + ldr r0, =0x0203ab4e str r0, [sp, 0xC] movs r0, 0x2 movs r1, 0xB0 @@ -636388,7 +615524,7 @@ sub_81363BC: @ 81363BC movs r3, 0x98 bl sub_81AF4A0 ldr r1, [r4] - ldr r2, _08136408 + ldr r2, =0x00000e7c adds r1, r2 strb r0, [r1] _081363FC: @@ -636397,26 +615533,22 @@ _081363FC: pop {r0} bx r0 .align 2, 0 -_08136404: .4byte 0x0203ab50 -_08136408: .4byte 0x00000e7c -_0813640C: .4byte 0x0000080a -_08136410: .4byte 0x00000456 -_08136414: .4byte 0x0203ab4e + .pool thumb_func_end sub_81363BC thumb_func_start sub_8136418 sub_8136418: @ 8136418 push {r4,lr} - ldr r4, _0813643C + ldr r4, =0x0203ab50 ldr r0, [r4] - ldr r2, _08136440 + ldr r2, =0x00000e7c adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF beq _08136436 bl sub_81AF620 ldr r0, [r4] - ldr r1, _08136440 + ldr r1, =0x00000e7c adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -636425,8 +615557,7 @@ _08136436: pop {r0} bx r0 .align 2, 0 -_0813643C: .4byte 0x0203ab50 -_08136440: .4byte 0x00000e7c + .pool thumb_func_end sub_8136418 thumb_func_start sub_8136444 @@ -636437,7 +615568,7 @@ sub_8136444: @ 8136444 adds r3, r2, 0 lsls r3, 24 lsrs r3, 24 - ldr r0, _0813646C + ldr r0, =0x085b2704 lsls r4, 16 asrs r4, 16 lsls r5, 16 @@ -636451,7 +615582,7 @@ sub_8136444: @ 8136444 pop {r1} bx r1 .align 2, 0 -_0813646C: .4byte 0x085b2704 + .pool thumb_func_end sub_8136444 thumb_func_start sub_8136470 @@ -636480,7 +615611,7 @@ _0813648E: movs r1, 0x1 orrs r0, r1 strb r0, [r4, 0x1] - ldr r0, _081364B0 + ldr r0, =0x085b26f0 str r0, [r4, 0x10] adds r0, r4, 0 bl obj_alloc_rotscale_entry @@ -636489,7 +615620,7 @@ _0813648E: strh r5, [r4, 0x30] b _081364E0 .align 2, 0 -_081364B0: .4byte 0x085b26f0 + .pool _081364B4: ldrh r0, [r4, 0x30] adds r0, 0x1 @@ -636510,14 +615641,14 @@ _081364B4: lsls r0, 26 lsrs r0, 27 bl rotscale_free_entry - ldr r0, _081364E8 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _081364E0: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081364E8: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8136470 thumb_func_start sub_81364EC @@ -636534,20 +615665,19 @@ sub_81364EC: @ 81364EC movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _0813651C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08136520 + ldr r1, =sub_8136524 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_0813651C: .4byte 0x03005e00 -_08136520: .4byte sub_8136524 + 1 + .pool thumb_func_end sub_81364EC thumb_func_start sub_8136524 @@ -636558,17 +615688,17 @@ sub_8136524: @ 8136524 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08136588 + ldr r1, =0x03005e08 adds r2, r0, r1 - ldr r0, _0813658C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081365BE - ldr r6, _08136590 + ldr r6, =0x0203ab50 ldr r0, [r6] - ldr r1, _08136594 + ldr r1, =0x00000809 adds r0, r1 ldrb r0, [r0] subs r0, 0x2 @@ -636576,12 +615706,12 @@ sub_8136524: @ 8136524 lsrs r0, 24 cmp r0, 0x1 bhi _0813655A - ldr r1, _08136598 - ldr r0, _0813659C + ldr r1, =0x03005dac + ldr r0, =sub_80AF168 + 1 str r0, [r1] _0813655A: ldrb r0, [r2] - ldr r4, _081365A0 + ldr r4, =0x0203ab4e subs r2, r4, 0x2 adds r1, r4, 0 bl sub_81AE6C8 @@ -636598,20 +615728,14 @@ _0813655A: bl set_callback2 b _081365AC .align 2, 0 -_08136588: .4byte 0x03005e08 -_0813658C: .4byte 0x02037fd4 -_08136590: .4byte 0x0203ab50 -_08136594: .4byte 0x00000809 -_08136598: .4byte 0x03005dac -_0813659C: .4byte sub_80AF168 + 1 -_081365A0: .4byte 0x0203ab4e + .pool _081365A4: subs r0, r4, 0x6 ldr r0, [r0] bl set_callback2 _081365AC: bl Window_FreeMemory - ldr r0, _081365C4 + ldr r0, =0x0203ab50 ldr r0, [r0] bl free adds r0, r5, 0 @@ -636621,7 +615745,7 @@ _081365BE: pop {r0} bx r0 .align 2, 0 -_081365C4: .4byte 0x0203ab50 + .pool thumb_func_end sub_8136524 thumb_func_start sub_81365C8 @@ -636637,11 +615761,11 @@ sub_81365C8: @ 81365C8 adds r0, r7 lsls r0, 3 mov r8, r0 - ldr r0, _08136664 + ldr r0, =0x03005e08 mov r10, r0 mov r6, r8 add r6, r10 - ldr r0, _08136668 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -636656,7 +615780,7 @@ _081365F4: bne _08136602 b _08136708 _08136602: - ldr r0, _0813666C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -636666,7 +615790,7 @@ _08136602: cmp r0, 0 beq _08136688 ldrb r0, [r6] - ldr r4, _08136670 + ldr r4, =0x0203ab4e subs r2, r4, 0x2 adds r1, r4, 0 bl get_coro_args_x18_x1A @@ -636674,9 +615798,9 @@ _08136602: ldrh r1, [r4, 0x6] ldrh r0, [r4, 0x4] adds r1, r0 - ldr r5, _08136674 + ldr r5, =0x0203ab50 ldr r0, [r5] - ldr r2, _08136678 + ldr r2, =0x0000080a adds r0, r2 ldrb r0, [r0] subs r0, 0x1 @@ -636685,35 +615809,27 @@ _08136602: movs r0, 0x5 bl audio_play ldrh r0, [r4, 0x4] - ldr r1, _0813667C + ldr r1, =0x00002005 bl sub_8136110 ldrh r0, [r4, 0x4] ldrh r4, [r4, 0x6] adds r0, r4 strh r0, [r6, 0x4] ldr r0, [r5] - ldr r1, _08136680 + ldr r1, =0x00000e7d adds r0, r1 movs r1, 0x1 strb r1, [r0] mov r0, r10 subs r0, 0x8 add r0, r8 - ldr r1, _08136684 + ldr r1, =sub_813671C + 1 str r1, [r0] b _08136708 .align 2, 0 -_08136664: .4byte 0x03005e08 -_08136668: .4byte 0x02037fd4 -_0813666C: .4byte 0x030022c0 -_08136670: .4byte 0x0203ab4e -_08136674: .4byte 0x0203ab50 -_08136678: .4byte 0x0000080a -_0813667C: .4byte 0x00002005 -_08136680: .4byte 0x00000e7d -_08136684: .4byte sub_813671C + 1 + .pool _08136688: - ldr r5, _081366C8 + ldr r5, =0x0203ab48 ldrh r2, [r5, 0x4] mov r8, r2 ldrb r0, [r6] @@ -636730,7 +615846,7 @@ _08136688: movs r1, 0x5 bl sub_8136110 ldrh r0, [r5, 0x4] - ldr r1, _081366CC + ldr r1, =0x00001005 bl sub_8136110 _081366B6: movs r0, 0x2 @@ -636742,29 +615858,26 @@ _081366B6: bne _081366F8 b _08136708 .align 2, 0 -_081366C8: .4byte 0x0203ab48 -_081366CC: .4byte 0x00001005 + .pool _081366D0: movs r0, 0x5 bl audio_play - ldr r0, _081366EC - ldr r2, _081366F0 + ldr r0, =0x020375f0 + ldr r2, =0x0000ffff adds r1, r2, 0 strh r1, [r0] - ldr r0, _081366F4 + ldr r0, =0x0203ce7c mov r1, r9 strh r1, [r0] adds r0, r7, 0 bl sub_81364EC b _08136708 .align 2, 0 -_081366EC: .4byte 0x020375f0 -_081366F0: .4byte 0x0000ffff -_081366F4: .4byte 0x0203ce7c + .pool _081366F8: movs r0, 0x5 bl audio_play - ldr r0, _08136718 + ldr r0, =0x0203ce7c strh r4, [r0] adds r0, r7, 0 bl sub_8136938 @@ -636777,7 +615890,7 @@ _08136708: pop {r0} bx r0 .align 2, 0 -_08136718: .4byte 0x0203ce7c + .pool thumb_func_end sub_81365C8 thumb_func_start sub_813671C @@ -636792,7 +615905,7 @@ sub_813671C: @ 813671C lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _08136760 + ldr r1, =0x03005e08 adds r7, r0, r1 bl sub_81221EC lsls r0, 24 @@ -636801,7 +615914,7 @@ sub_813671C: @ 813671C bne _08136742 b _08136848 _08136742: - ldr r0, _08136764 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -636810,16 +615923,14 @@ _08136742: movs r0, 0x5 bl audio_play ldrb r0, [r7] - ldr r1, _08136768 + ldr r1, =0x0203ab4e subs r2, r1, 0x2 bl get_coro_args_x18_x1A b _08136822 .align 2, 0 -_08136760: .4byte 0x03005e08 -_08136764: .4byte 0x030022c0 -_08136768: .4byte 0x0203ab4e + .pool _0813676C: - ldr r6, _081367B0 + ldr r6, =0x0203ab48 ldrh r4, [r6, 0x6] ldrh r5, [r6, 0x4] ldrb r0, [r7] @@ -636838,7 +615949,7 @@ _0813676C: _08136790: movs r4, 0 _08136792: - ldr r0, _081367B0 + ldr r0, =0x0203ab48 ldrh r0, [r0, 0x6] adds r0, r4, r0 lsls r0, 16 @@ -636848,12 +615959,11 @@ _08136792: cmp r5, r0 bne _081367B8 adds r0, r4, 0 - ldr r1, _081367B4 + ldr r1, =0x00002005 bl sub_8136110 b _081367C0 .align 2, 0 -_081367B0: .4byte 0x0203ab48 -_081367B4: .4byte 0x00002005 + .pool _081367B8: adds r0, r4, 0 movs r1, 0x5 @@ -636865,16 +615975,16 @@ _081367C0: cmp r4, 0x8 bls _08136792 _081367CA: - ldr r5, _08136804 + ldr r5, =0x0203ab50 ldr r0, [r5] - ldr r4, _08136808 + ldr r4, =0x00000e75 adds r0, r4 movs r1, 0x7 movs r2, 0 bl sub_81223FC ldr r0, [r5] adds r0, r4 - ldr r1, _0813680C + ldr r1, =0x0203ab48 ldrh r3, [r1, 0x4] lsls r3, 4 adds r3, 0x8 @@ -636892,13 +616002,11 @@ _081367CA: bne _0813683A b _08136848 .align 2, 0 -_08136804: .4byte 0x0203ab50 -_08136808: .4byte 0x00000e75 -_0813680C: .4byte 0x0203ab48 + .pool _08136810: movs r0, 0x5 bl audio_play - ldr r0, _0813682C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -636910,7 +616018,7 @@ _08136822: bl sub_8136854 b _08136848 .align 2, 0 -_0813682C: .4byte 0x030022c0 + .pool _08136830: mov r0, r8 movs r1, 0x1 @@ -636942,17 +616050,17 @@ sub_8136854: @ 8136854 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08136914 + ldr r1, =0x03005e08 adds r6, r0, r1 - ldr r2, _08136918 + ldr r2, =0x0203ab48 ldrh r0, [r2, 0x4] ldrh r1, [r2, 0x6] adds r0, r1 lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _0813691C + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r1, _08136920 + ldr r1, =0x00000e7d adds r0, r1 movs r1, 0 strb r1, [r0] @@ -636978,13 +616086,13 @@ _081368AA: ldrsh r0, [r6, r1] cmp r0, r5 bge _081368BA - ldr r1, _08136918 + ldr r1, =0x0203ab48 ldrh r0, [r1, 0x4] subs r0, 0x1 strh r0, [r1, 0x4] _081368BA: - ldr r0, _08136924 - ldr r2, _08136918 + ldr r0, =0x03006310 + ldr r2, =0x0203ab48 ldrh r1, [r2, 0x6] ldrh r2, [r2, 0x4] bl calls_per_item_funcs_in_list_outer @@ -636993,9 +616101,9 @@ _081368BA: strh r0, [r6] movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _0813691C + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r1, _08136928 + ldr r1, =0x00000e75 adds r0, r1 movs r1, 0x7 movs r2, 0x1 @@ -637011,29 +616119,21 @@ _081368E6: lsrs r4, r0, 24 cmp r4, 0x8 bls _081368E6 - ldr r0, _08136918 + ldr r0, =0x0203ab48 ldrh r0, [r0, 0x4] - ldr r1, _0813692C + ldr r1, =0x00001005 bl sub_8136110 - ldr r1, _08136930 + ldr r1, =0x03005e00 adds r0, r5, r7 lsls r0, 3 adds r0, r1 - ldr r1, _08136934 + ldr r1, =sub_81365C8 + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08136914: .4byte 0x03005e08 -_08136918: .4byte 0x0203ab48 -_0813691C: .4byte 0x0203ab50 -_08136920: .4byte 0x00000e7d -_08136924: .4byte 0x03006310 -_08136928: .4byte 0x00000e75 -_0813692C: .4byte 0x00001005 -_08136930: .4byte 0x03005e00 -_08136934: .4byte sub_81365C8 + 1 + .pool thumb_func_end sub_8136854 thumb_func_start sub_8136938 @@ -637044,11 +616144,11 @@ sub_8136938: @ 8136938 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _0813695C + ldr r1, =0x03005e08 adds r6, r0, r1 - ldr r0, _08136960 + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r1, _08136964 + ldr r1, =0x00000808 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 @@ -637056,9 +616156,7 @@ sub_8136938: @ 8136938 movs r0, 0x8 b _0813696A .align 2, 0 -_0813695C: .4byte 0x03005e08 -_08136960: .4byte 0x0203ab50 -_08136964: .4byte 0x00000808 + .pool _08136968: movs r0, 0x9 _0813696A: @@ -637070,14 +616168,14 @@ _0813696A: movs r3, 0xE bl SetWindowBorderStyle ldrb r0, [r6, 0x2] - ldr r5, _081369C8 + ldr r5, =0x0203ab50 ldr r3, [r5] - ldr r4, _081369CC + ldr r4, =0x00000808 adds r1, r3, r4 ldrb r1, [r1] - ldr r2, _081369D0 + ldr r2, =0x085b2668 mov r12, r2 - ldr r2, _081369D4 + ldr r2, =0x00000804 adds r3, r2 ldr r3, [r3] mov r2, r12 @@ -637092,23 +616190,18 @@ _0813696A: bl Window_WriteStandardTileMap movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081369D8 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081369DC + ldr r1, =sub_81369E0 + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081369C8: .4byte 0x0203ab50 -_081369CC: .4byte 0x00000808 -_081369D0: .4byte 0x085b2668 -_081369D4: .4byte 0x00000804 -_081369D8: .4byte 0x03005e00 -_081369DC: .4byte sub_81369E0 + 1 + .pool thumb_func_end sub_8136938 thumb_func_start sub_81369E0 @@ -637140,10 +616233,10 @@ sub_81369E0: @ 81369E0 _08136A18: movs r0, 0x5 bl audio_play - ldr r1, _08136A44 - ldr r0, _08136A48 + ldr r1, =0x085b2668 + ldr r0, =0x0203ab50 ldr r0, [r0] - ldr r2, _08136A4C + ldr r2, =0x00000804 adds r0, r2 ldr r0, [r0] adds r0, r4 @@ -637159,9 +616252,7 @@ _08136A3C: pop {r0} bx r0 .align 2, 0 -_08136A44: .4byte 0x085b2668 -_08136A48: .4byte 0x0203ab50 -_08136A4C: .4byte 0x00000804 + .pool thumb_func_end sub_81369E0 thumb_func_start sub_8136A50 @@ -637169,54 +616260,50 @@ sub_8136A50: @ 8136A50 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08136A6C + ldr r1, =0x0203ab50 ldr r1, [r1] movs r2, 0x80 lsls r2, 4 adds r1, r2 - ldr r2, _08136A70 + ldr r2, =sub_8136A74 + 1 str r2, [r1] bl sub_81364EC pop {r0} bx r0 .align 2, 0 -_08136A6C: .4byte 0x0203ab50 -_08136A70: .4byte sub_8136A74 + 1 + .pool thumb_func_end sub_8136A50 thumb_func_start sub_8136A74 sub_8136A74: @ 8136A74 push {lr} - ldr r2, _08136A90 - ldr r0, _08136A94 + ldr r2, =0x03005d8c + ldr r0, =0x0203ce7c ldrh r1, [r0] lsls r1, 3 - ldr r0, _08136A98 + ldr r0, =0x00000848 adds r1, r0 ldr r0, [r2] adds r0, r1 - ldr r1, _08136A9C + ldr r1, =sub_8136AA0 + 1 bl sub_8166204 pop {r0} bx r0 .align 2, 0 -_08136A90: .4byte 0x03005d8c -_08136A94: .4byte 0x0203ce7c -_08136A98: .4byte 0x00000848 -_08136A9C: .4byte sub_8136AA0 + 1 + .pool thumb_func_end sub_8136A74 thumb_func_start sub_8136AA0 sub_8136AA0: @ 8136AA0 push {lr} - ldr r0, _08136AB0 + ldr r0, =0x0203ab48 ldr r1, [r0] movs r0, 0 bl sub_81357FC pop {r0} bx r0 .align 2, 0 -_08136AB0: .4byte 0x0203ab48 + .pool thumb_func_end sub_8136AA0 thumb_func_start sub_8136AB4 @@ -637229,28 +616316,28 @@ sub_8136AB4: @ 8136AB4 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08136B24 + ldr r1, =0x03005e08 adds r0, r1 ldrb r0, [r0, 0x2] movs r1, 0 bl sub_8198070 - ldr r0, _08136B28 - ldr r3, _08136B2C - ldr r1, _08136B30 + ldr r0, =0x02021cc4 + ldr r3, =0x085b262c + ldr r1, =0x03005d8c ldr r2, [r1] - ldr r1, _08136B34 + ldr r1, =0x0203ce7c ldrh r1, [r1] lsls r1, 3 adds r2, r1 - ldr r1, _08136B38 + ldr r1, =0x00000848 adds r2, r1 ldrb r1, [r2] lsls r1, 2 adds r1, r3 ldr r1, [r1] bl gf_strcpy - ldr r5, _08136B3C - ldr r1, _08136B40 + ldr r5, =0x02021fc4 + ldr r1, =0x085e9353 adds r0, r5, 0 bl ExpandTextCodes bl sav2_get_text_speed @@ -637260,7 +616347,7 @@ sub_8136AB4: @ 8136AB4 str r1, [sp] str r0, [sp, 0x4] str r5, [sp, 0x8] - ldr r0, _08136B44 + ldr r0, =sub_8136B48 + 1 str r0, [sp, 0xC] adds r0, r4, 0 movs r1, 0xA @@ -637272,15 +616359,7 @@ sub_8136AB4: @ 8136AB4 pop {r0} bx r0 .align 2, 0 -_08136B24: .4byte 0x03005e08 -_08136B28: .4byte 0x02021cc4 -_08136B2C: .4byte 0x085b262c -_08136B30: .4byte 0x03005d8c -_08136B34: .4byte 0x0203ce7c -_08136B38: .4byte 0x00000848 -_08136B3C: .4byte 0x02021fc4 -_08136B40: .4byte 0x085e9353 -_08136B44: .4byte sub_8136B48 + 1 + .pool thumb_func_end sub_8136AB4 thumb_func_start sub_8136B48 @@ -637289,14 +616368,14 @@ sub_8136B48: @ 8136B48 sub sp, 0x10 lsls r0, 24 lsrs r0, 24 - ldr r1, _08136B70 + ldr r1, =0x085b27a8 movs r2, 0x2 str r2, [sp] movs r2, 0x1 str r2, [sp, 0x4] movs r2, 0xE str r2, [sp, 0x8] - ldr r2, _08136B74 + ldr r2, =0x085b26a4 str r2, [sp, 0xC] movs r2, 0x1 movs r3, 0 @@ -637305,8 +616384,7 @@ sub_8136B48: @ 8136B48 pop {r0} bx r0 .align 2, 0 -_08136B70: .4byte 0x085b27a8 -_08136B74: .4byte 0x085b26a4 + .pool thumb_func_end sub_8136B48 thumb_func_start sub_8136B78 @@ -637316,8 +616394,8 @@ sub_8136B78: @ 8136B78 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _08136BB4 - ldr r1, _08136BB8 + ldr r5, =0x02021fc4 + ldr r1, =0x085e9367 adds r0, r5, 0 bl ExpandTextCodes bl sav2_get_text_speed @@ -637327,7 +616405,7 @@ sub_8136B78: @ 8136B78 str r1, [sp] str r0, [sp, 0x4] str r5, [sp, 0x8] - ldr r0, _08136BBC + ldr r0, =sub_8136BC0 + 1 str r0, [sp, 0xC] adds r0, r4, 0 movs r1, 0xA @@ -637339,9 +616417,7 @@ sub_8136B78: @ 8136B78 pop {r0} bx r0 .align 2, 0 -_08136BB4: .4byte 0x02021fc4 -_08136BB8: .4byte 0x085e9367 -_08136BBC: .4byte sub_8136BC0 + 1 + .pool thumb_func_end sub_8136B78 thumb_func_start sub_8136BC0 @@ -637349,23 +616425,23 @@ sub_8136BC0: @ 8136BC0 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08136C3C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 beq _08136C36 - ldr r0, _08136C40 + ldr r0, =0x0203ce7c ldrb r0, [r0] bl sub_8136F68 movs r0, 0x5 bl audio_play - ldr r5, _08136C44 + ldr r5, =0x0203ab4e subs r6, r5, 0x2 lsls r4, r7, 2 adds r4, r7 lsls r4, 3 - ldr r0, _08136C48 + ldr r0, =0x03005e08 adds r4, r0 ldrb r0, [r4] adds r1, r5, 0 @@ -637377,7 +616453,7 @@ sub_8136BC0: @ 8136BC0 bl sub_813625C bl sub_81362E0 bl sub_8135E2C - ldr r0, _08136C4C + ldr r0, =0x03006310 ldrh r1, [r5] ldrh r2, [r6] bl calls_per_item_funcs_in_list_outer @@ -637385,7 +616461,7 @@ sub_8136BC0: @ 8136BC0 lsrs r0, 24 strh r0, [r4] ldrh r0, [r6] - ldr r1, _08136C50 + ldr r1, =0x00001005 bl sub_8136110 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram @@ -637398,12 +616474,7 @@ _08136C36: pop {r0} bx r0 .align 2, 0 -_08136C3C: .4byte 0x030022c0 -_08136C40: .4byte 0x0203ce7c -_08136C44: .4byte 0x0203ab4e -_08136C48: .4byte 0x03005e08 -_08136C4C: .4byte 0x03006310 -_08136C50: .4byte 0x00001005 + .pool thumb_func_end sub_8136BC0 thumb_func_start sub_8136C54 @@ -637418,19 +616489,18 @@ sub_8136C54: @ 8136C54 movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram bl sub_81363BC - ldr r1, _08136C84 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08136C88 + ldr r1, =sub_81365C8 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08136C84: .4byte 0x03005e00 -_08136C88: .4byte sub_81365C8 + 1 + .pool thumb_func_end sub_8136C54 thumb_func_start sub_8136C8C @@ -637441,15 +616511,15 @@ sub_8136C8C: @ 8136C8C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _08136CF8 + ldr r0, =0x02024744 bl get_nature lsls r0, 24 lsrs r0, 24 - ldr r5, _08136CFC - ldr r7, _08136D00 + ldr r5, =0x03005d8c + ldr r7, =0x0203ce7c ldrh r2, [r7] lsls r2, 3 - ldr r6, _08136D04 + ldr r6, =0x00000848 adds r2, r6 ldr r1, [r5] adds r1, r2 @@ -637457,8 +616527,8 @@ sub_8136C8C: @ 8136C8C adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _08136D08 - ldr r3, _08136D0C + ldr r0, =0x02022f58 + ldr r3, =0x085b262c ldr r2, [r5] ldrh r1, [r7] lsls r1, 3 @@ -637486,12 +616556,7 @@ sub_8136C8C: @ 8136C8C adds r0, 0x1 b _08136D1A .align 2, 0 -_08136CF8: .4byte 0x02024744 -_08136CFC: .4byte 0x03005d8c -_08136D00: .4byte 0x0203ce7c -_08136D04: .4byte 0x00000848 -_08136D08: .4byte 0x02022f58 -_08136D0C: .4byte 0x085b262c + .pool _08136D10: cmp r4, 0 ble _08136D18 @@ -637516,24 +616581,24 @@ sub_8136D2C: @ 8136D2C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _08136D78 + ldr r5, =0x0203ce7c ldrb r0, [r5] bl sub_80FC3E8 - ldr r0, _08136D7C - ldr r3, _08136D80 - ldr r1, _08136D84 + ldr r0, =0x02021cc4 + ldr r3, =0x085b262c + ldr r1, =0x03005d8c ldr r2, [r1] ldrh r1, [r5] lsls r1, 3 adds r2, r1 - ldr r1, _08136D88 + ldr r1, =0x00000848 adds r2, r1 ldrb r1, [r2] lsls r1, 2 adds r1, r3 ldr r1, [r1] bl gf_strcpy - ldr r1, _08136D8C + ldr r1, =0x020375f0 ldrh r0, [r5] strh r0, [r1] lsls r0, 24 @@ -637547,12 +616612,7 @@ sub_8136D2C: @ 8136D2C pop {r0} bx r0 .align 2, 0 -_08136D78: .4byte 0x0203ce7c -_08136D7C: .4byte 0x02021cc4 -_08136D80: .4byte 0x085b262c -_08136D84: .4byte 0x03005d8c -_08136D88: .4byte 0x00000848 -_08136D8C: .4byte 0x020375f0 + .pool thumb_func_end sub_8136D2C thumb_func_start sub_8136D90 @@ -637561,12 +616621,12 @@ sub_8136D90: @ 8136D90 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r6, _08136DD4 - ldr r0, _08136DD8 - ldr r5, _08136DDC + ldr r6, =0x020375e0 + ldr r0, =0x03005d8c + ldr r5, =0x0203ce7c ldrh r1, [r5] lsls r1, 3 - ldr r2, _08136DE0 + ldr r2, =0x00000848 adds r1, r2 ldr r0, [r0] adds r0, r1 @@ -637574,7 +616634,7 @@ sub_8136D90: @ 8136D90 lsls r0, 24 lsrs r0, 24 strh r0, [r6] - ldr r1, _08136DE4 + ldr r1, =0x020375f0 ldrh r0, [r5] strh r0, [r1] lsls r0, 24 @@ -637588,11 +616648,7 @@ sub_8136D90: @ 8136D90 pop {r0} bx r0 .align 2, 0 -_08136DD4: .4byte 0x020375e0 -_08136DD8: .4byte 0x03005d8c -_08136DDC: .4byte 0x0203ce7c -_08136DE0: .4byte 0x00000848 -_08136DE4: .4byte 0x020375f0 + .pool thumb_func_end sub_8136D90 thumb_func_start sub_8136DE8 @@ -637603,7 +616659,7 @@ sub_8136DE8: @ 8136DE8 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _08136E18 + ldr r5, =0x03005e08 adds r0, r4, r5 ldrb r0, [r0, 0x2] movs r1, 0 @@ -637613,31 +616669,30 @@ sub_8136DE8: @ 8136DE8 bl sub_81363BC subs r5, 0x8 adds r4, r5 - ldr r0, _08136E1C + ldr r0, =sub_81365C8 + 1 str r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08136E18: .4byte 0x03005e08 -_08136E1C: .4byte sub_81365C8 + 1 + .pool thumb_func_end sub_8136DE8 thumb_func_start sub_8136E20 sub_8136E20: @ 8136E20 push {r4,lr} lsls r0, 24 - ldr r3, _08136E78 + ldr r3, =0x03005d8c ldr r1, [r3] lsrs r0, 21 adds r1, r0 - ldr r2, _08136E7C + ldr r2, =0x00000848 adds r1, r2 movs r2, 0 strb r2, [r1] ldr r1, [r3] adds r1, r0 - ldr r4, _08136E80 + ldr r4, =0x00000849 adds r1, r4 strb r2, [r1] ldr r1, [r3] @@ -637662,17 +616717,14 @@ sub_8136E20: @ 8136E20 strb r2, [r1] ldr r1, [r3] adds r1, r0 - ldr r0, _08136E84 + ldr r0, =0x0000084e adds r1, r0 strb r2, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_08136E78: .4byte 0x03005d8c -_08136E7C: .4byte 0x00000848 -_08136E80: .4byte 0x00000849 -_08136E84: .4byte 0x0000084e + .pool thumb_func_end sub_8136E20 thumb_func_start sub_8136E88 @@ -637742,9 +616794,9 @@ _08136EEE: sub_8136EF4: @ 8136EF4 push {lr} movs r1, 0 - ldr r0, _08136F10 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r3, _08136F14 + ldr r3, =0x00000848 _08136EFE: lsls r0, r1, 3 adds r0, r2, r0 @@ -637756,8 +616808,7 @@ _08136EFE: asrs r0, 24 b _08136F26 .align 2, 0 -_08136F10: .4byte 0x03005d8c -_08136F14: .4byte 0x00000848 + .pool _08136F18: adds r0, r1, 0x1 lsls r0, 24 @@ -637782,10 +616833,10 @@ sub_8136F2C: @ 8136F2C negs r0, r0 cmp r1, r0 beq _08136F60 - ldr r0, _08136F58 + ldr r0, =0x03005d8c ldr r2, [r0] lsls r0, r1, 3 - ldr r1, _08136F5C + ldr r1, =0x00000848 adds r2, r1 adds r2, r0 ldr r0, [r4] @@ -637795,8 +616846,7 @@ sub_8136F2C: @ 8136F2C movs r0, 0x1 b _08136F62 .align 2, 0 -_08136F58: .4byte 0x03005d8c -_08136F5C: .4byte 0x00000848 + .pool _08136F60: movs r0, 0 _08136F62: @@ -637810,11 +616860,11 @@ sub_8136F68: @ 8136F68 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08136F8C + ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r2, 3 adds r0, r1 - ldr r1, _08136F90 + ldr r1, =0x00000848 adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -637824,8 +616874,7 @@ sub_8136F68: @ 8136F68 movs r0, 0x1 b _08136F96 .align 2, 0 -_08136F8C: .4byte 0x03005d8c -_08136F90: .4byte 0x00000848 + .pool _08136F94: movs r0, 0 _08136F96: @@ -637891,7 +616940,7 @@ sub_8136FE4: @ 8136FE4 lsrs r0, 24 movs r6, 0 movs r4, 0 - ldr r1, _08137040 + ldr r1, =0x085b25a0 mov r9, r1 lsls r1, r0, 2 adds r7, r1, r0 @@ -637930,7 +616979,7 @@ _0813702A: pop {r1} bx r1 .align 2, 0 -_08137040: .4byte 0x085b25a0 + .pool thumb_func_end sub_8136FE4 thumb_func_start sub_8137044 @@ -637940,7 +616989,7 @@ sub_8137044: @ 8137044 movs r1, 0 bl sub_8136F9C lsls r0, 24 - ldr r1, _08137064 + ldr r1, =0x085b262c lsrs r0, 22 adds r0, r1 ldr r1, [r0] @@ -637950,7 +616999,7 @@ sub_8137044: @ 8137044 pop {r0} bx r0 .align 2, 0 -_08137064: .4byte 0x085b262c + .pool thumb_func_end sub_8137044 thumb_func_start sub_8137068 @@ -637960,10 +617009,10 @@ sub_8137068: @ 8137068 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r7, _08137098 + ldr r7, =0x085b262c _08137074: lsls r1, r4, 3 - ldr r0, _0813709C + ldr r0, =0x085b2720 adds r1, r0 adds r0, r5, 0 bl sub_8136FE4 @@ -637979,8 +617028,7 @@ _08137074: movs r0, 0x1 b _081370AC .align 2, 0 -_08137098: .4byte 0x085b262c -_0813709C: .4byte 0x085b2720 + .pool _081370A0: adds r0, r4, 0x1 lsls r0, 24 @@ -638040,49 +617088,40 @@ sub_81370FC: @ 81370FC lsls r0, 24 cmp r0, 0 beq _08137134 - ldr r4, _08137120 + ldr r4, =0x020375f0 bl brm_get_pokemon_selection lsls r0, 24 lsrs r0, 24 strh r0, [r4] - ldr r1, _08137124 - ldr r0, _08137128 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _0813712C - ldr r0, _08137130 + ldr r1, =0x0203ceec + ldr r0, =sub_8179918 + 1 b _08137152 .align 2, 0 -_08137120: .4byte 0x020375f0 -_08137124: .4byte 0x03005db0 -_08137128: .4byte hm_add_c3_launch_phase_2 + 1 -_0813712C: .4byte 0x0203ceec -_08137130: .4byte sub_8179918 + 1 + .pool _08137134: - ldr r0, _08137158 + ldr r0, =0x02037318 ldrb r0, [r0, 0x15] cmp r0, 0x1 bne _08137170 - ldr r0, _0813715C + ldr r0, =0x00000888 bl flag_check lsls r0, 24 cmp r0, 0 bne _08137170 - ldr r1, _08137160 - ldr r0, _08137164 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _08137168 - ldr r0, _0813716C + ldr r1, =0x0203ceec + ldr r0, =hm2_flash + 1 _08137152: str r0, [r1] movs r0, 0x1 b _08137172 .align 2, 0 -_08137158: .4byte 0x02037318 -_0813715C: .4byte 0x00000888 -_08137160: .4byte 0x03005db0 -_08137164: .4byte hm_add_c3_launch_phase_2 + 1 -_08137168: .4byte 0x0203ceec -_0813716C: .4byte hm2_flash + 1 + .pool _08137170: movs r0, 0 _08137172: @@ -638099,16 +617138,16 @@ hm2_flash: @ 8137178 lsls r4, 24 lsrs r4, 24 bl brm_get_pokemon_selection - ldr r1, _081371A8 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r1, _081371AC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r2, _081371B0 + ldr r2, =sub_81371B4 + 1 lsrs r1, r2, 16 strh r1, [r0, 0x18] strh r2, [r0, 0x1A] @@ -638116,9 +617155,7 @@ hm2_flash: @ 8137178 pop {r0} bx r0 .align 2, 0 -_081371A8: .4byte 0x02038c08 -_081371AC: .4byte 0x03005e00 -_081371B0: .4byte sub_81371B4 + 1 + .pool thumb_func_end hm2_flash thumb_func_start sub_81371B4 @@ -638126,15 +617163,14 @@ sub_81371B4: @ 81371B4 push {lr} movs r0, 0xCF bl audio_play - ldr r0, _081371CC + ldr r0, =0x00000888 bl flag_set - ldr r0, _081371D0 + ldr r0, =0x082926f8 bl script_env_1_execute_new_script pop {r0} bx r0 .align 2, 0 -_081371CC: .4byte 0x00000888 -_081371D0: .4byte 0x082926f8 + .pool thumb_func_end sub_81371B4 thumb_func_start sub_81371D4 @@ -638197,13 +617233,13 @@ c2_change_map: @ 8137200 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _081372DC + ldr r1, =0x040000d4 mov r0, sp str r0, [r1] movs r0, 0xC0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _081372E0 + ldr r0, =0x8100c000 str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r4, 0 @@ -638213,38 +617249,38 @@ c2_change_map: @ 8137200 movs r0, 0xE0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _081372E4 + ldr r0, =0x85000100 str r0, [r1, 0x8] ldr r0, [r1, 0x8] mov r0, sp strh r4, [r0] str r0, [r1] - ldr r0, _081372E8 + ldr r0, =0x05000002 str r0, [r1, 0x4] - ldr r0, _081372EC + ldr r0, =0x810001ff str r0, [r1, 0x8] ldr r0, [r1, 0x8] bl sub_80A1A74 bl clear_tasks bl reset_all_obj_data - ldr r3, _081372F0 + ldr r3, =0x04000208 ldrh r2, [r3] strh r4, [r3] - ldr r4, _081372F4 + ldr r4, =0x04000200 ldrh r0, [r4] movs r1, 0x1 orrs r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, _081372F8 + ldr r0, =sub_81371EC + 1 bl SetVBlankCallback - ldr r0, _081372FC + ldr r0, =sub_81371D4 + 1 bl set_callback2 bl sub_8137304 lsls r0, 24 cmp r0, 0 bne _081372D2 - ldr r0, _08137300 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 _081372D2: @@ -638253,16 +617289,7 @@ _081372D2: pop {r0} bx r0 .align 2, 0 -_081372DC: .4byte 0x040000d4 -_081372E0: .4byte 0x8100c000 -_081372E4: .4byte 0x85000100 -_081372E8: .4byte 0x05000002 -_081372EC: .4byte 0x810001ff -_081372F0: .4byte 0x04000208 -_081372F4: .4byte 0x04000200 -_081372F8: .4byte sub_81371EC + 1 -_081372FC: .4byte sub_81371D4 + 1 -_08137300: .4byte 0x030022c0 + .pool thumb_func_end c2_change_map thumb_func_start sub_8137304 @@ -638275,7 +617302,7 @@ sub_8137304: @ 8137304 lsls r0, 24 lsrs r5, r0, 24 movs r3, 0 - ldr r4, _08137344 + ldr r4, =0x085b27c8 ldrb r0, [r4] cmp r0, 0 beq _08137358 @@ -638298,7 +617325,7 @@ _08137326: movs r0, 0x1 b _0813735A .align 2, 0 -_08137344: .4byte 0x085b27c8 + .pool _08137348: adds r0, r3, 0x1 lsls r0, 24 @@ -638324,7 +617351,7 @@ sub_8137360: @ 8137360 lsrs r5, r0, 24 lsrs r4, r1, 24 movs r3, 0 - ldr r1, _0813738C + ldr r1, =0x085b27c8 ldrb r0, [r1] cmp r0, 0 beq _081373A0 @@ -638341,7 +617368,7 @@ _08137376: ldrb r0, [r2, 0x2] b _081373A2 .align 2, 0 -_0813738C: .4byte 0x085b27c8 + .pool _08137390: adds r0, r3, 0x1 lsls r0, 24 @@ -638367,7 +617394,7 @@ fade_type_for_given_maplight_pair: @ 81373A8 lsrs r5, r0, 24 lsrs r4, r1, 24 movs r3, 0 - ldr r1, _081373D4 + ldr r1, =0x085b27c8 ldrb r0, [r1] cmp r0, 0 beq _081373E8 @@ -638384,7 +617411,7 @@ _081373BE: ldrb r0, [r2, 0x3] b _081373EA .align 2, 0 -_081373D4: .4byte 0x085b27c8 + .pool _081373D8: adds r0, r3, 0x1 lsls r0, 24 @@ -638405,30 +617432,29 @@ _081373EA: thumb_func_start sub_81373F0 sub_81373F0: @ 81373F0 push {lr} - ldr r0, _08137400 + ldr r0, =sub_8137404 + 1 movs r1, 0 bl AddTask pop {r0} bx r0 .align 2, 0 -_08137400: .4byte sub_8137404 + 1 + .pool thumb_func_end sub_81373F0 thumb_func_start sub_8137404 sub_8137404: @ 8137404 lsls r0, 24 lsrs r0, 24 - ldr r2, _08137418 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _0813741C + ldr r0, =sub_8137420 + 1 str r0, [r1] bx lr .align 2, 0 -_08137418: .4byte 0x03005e00 -_0813741C: .4byte sub_8137420 + 1 + .pool thumb_func_end sub_8137404 thumb_func_start sub_8137420 @@ -638440,21 +617466,21 @@ sub_8137420: @ 8137420 movs r0, 0 movs r1, 0 bl lcd_io_set - ldr r0, _0813749C - ldr r1, _081374A0 + ldr r0, =0x085b2a90 + ldr r1, =0x0600c000 bl LZ77UnCompVram - ldr r0, _081374A4 - ldr r1, _081374A8 + ldr r0, =0x085b28b0 + ldr r1, =0x0600f800 bl LZ77UnCompVram - ldr r0, _081374AC + ldr r0, =0x085b2850 movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _081374B0 + ldr r0, =0x085b28a0 movs r1, 0xE0 movs r2, 0x10 bl gpu_pal_apply - ldr r1, _081374B4 + ldr r1, =0x00003e41 movs r0, 0x50 bl lcd_io_set movs r0, 0x52 @@ -638463,19 +617489,19 @@ sub_8137420: @ 8137420 movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r1, _081374B8 + ldr r1, =0x00001f0c movs r0, 0x8 bl lcd_io_set movs r1, 0x8A lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r1, _081374BC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081374C0 + ldr r1, =sub_81374C4 + 1 str r1, [r0] movs r2, 0 movs r1, 0x10 @@ -638485,16 +617511,7 @@ sub_8137420: @ 8137420 pop {r0} bx r0 .align 2, 0 -_0813749C: .4byte 0x085b2a90 -_081374A0: .4byte 0x0600c000 -_081374A4: .4byte 0x085b28b0 -_081374A8: .4byte 0x0600f800 -_081374AC: .4byte 0x085b2850 -_081374B0: .4byte 0x085b28a0 -_081374B4: .4byte 0x00003e41 -_081374B8: .4byte 0x00001f0c -_081374BC: .4byte 0x03005e00 -_081374C0: .4byte sub_81374C4 + 1 + .pool thumb_func_end sub_8137420 thumb_func_start sub_81374C4 @@ -638502,7 +617519,7 @@ sub_81374C4: @ 81374C4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _081374F4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -638522,18 +617539,18 @@ sub_81374C4: @ 81374C4 strh r0, [r5, 0xA] b _08137500 .align 2, 0 -_081374F4: .4byte 0x03005e00 + .pool _081374F8: movs r0, 0 strh r0, [r5, 0xC] - ldr r0, _08137508 + ldr r0, =sub_813750C + 1 str r0, [r5] _08137500: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08137508: .4byte sub_813750C + 1 + .pool thumb_func_end sub_81374C4 thumb_func_start sub_813750C @@ -638542,10 +617559,10 @@ sub_813750C: @ 813750C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08137548 + ldr r1, =0x00001010 movs r0, 0x52 bl lcd_io_set - ldr r1, _0813754C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -638556,7 +617573,7 @@ sub_813750C: @ 813750C adds r0, r1, 0x1 strh r0, [r4, 0xC] lsls r1, 1 - ldr r0, _08137550 + ldr r0, =0x085b28a0 adds r0, r1, r0 movs r2, 0x10 subs r2, r1 @@ -638566,15 +617583,13 @@ sub_813750C: @ 813750C bl gpu_pal_apply b _08137566 .align 2, 0 -_08137548: .4byte 0x00001010 -_0813754C: .4byte 0x03005e00 -_08137550: .4byte 0x085b28a0 + .pool _08137554: - ldr r0, _0813756C + ldr r0, =0x085b2850 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _08137570 + ldr r0, =sub_8137574 + 1 str r0, [r4] movs r0, 0x8 strh r0, [r4, 0xC] @@ -638583,8 +617598,7 @@ _08137566: pop {r0} bx r0 .align 2, 0 -_0813756C: .4byte 0x085b2850 -_08137570: .4byte sub_8137574 + 1 + .pool thumb_func_end sub_813750C thumb_func_start sub_8137574 @@ -638592,7 +617606,7 @@ sub_8137574: @ 8137574 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08137594 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -638606,45 +617620,44 @@ sub_8137574: @ 8137574 strh r0, [r1, 0xC] b _081375A0 .align 2, 0 -_08137594: .4byte 0x03005e00 + .pool _08137598: - ldr r0, _081375A4 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 _081375A0: pop {r0} bx r0 .align 2, 0 -_081375A4: .4byte 0x030022c0 + .pool thumb_func_end sub_8137574 thumb_func_start sub_81375A8 sub_81375A8: @ 81375A8 push {lr} - ldr r0, _081375B8 + ldr r0, =sub_81375BC + 1 movs r1, 0 bl AddTask pop {r0} bx r0 .align 2, 0 -_081375B8: .4byte sub_81375BC + 1 + .pool thumb_func_end sub_81375A8 thumb_func_start sub_81375BC sub_81375BC: @ 81375BC lsls r0, 24 lsrs r0, 24 - ldr r2, _081375D0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _081375D4 + ldr r0, =sub_81375D8 + 1 str r0, [r1] bx lr .align 2, 0 -_081375D0: .4byte 0x03005e00 -_081375D4: .4byte sub_81375D8 + 1 + .pool thumb_func_end sub_81375BC thumb_func_start sub_81375D8 @@ -638656,11 +617669,11 @@ sub_81375D8: @ 81375D8 movs r0, 0 movs r1, 0 bl lcd_io_set - ldr r0, _08137654 - ldr r1, _08137658 + ldr r0, =0x085b2a90 + ldr r1, =0x0600c000 bl LZ77UnCompVram - ldr r0, _0813765C - ldr r1, _08137660 + ldr r0, =0x085b28b0 + ldr r1, =0x0600f800 bl LZ77UnCompVram movs r0, 0x50 movs r1, 0 @@ -638671,27 +617684,27 @@ sub_81375D8: @ 81375D8 movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r1, _08137664 + ldr r1, =0x00001f0c movs r0, 0x8 bl lcd_io_set movs r1, 0x8A lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _08137668 + ldr r0, =0x085b2850 movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0813766C + ldr r0, =0x085b2870 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _08137670 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08137674 + ldr r1, =sub_8137678 + 1 str r1, [r0] movs r2, 0 movs r1, 0x10 @@ -638702,15 +617715,7 @@ sub_81375D8: @ 81375D8 pop {r0} bx r0 .align 2, 0 -_08137654: .4byte 0x085b2a90 -_08137658: .4byte 0x0600c000 -_0813765C: .4byte 0x085b28b0 -_08137660: .4byte 0x0600f800 -_08137664: .4byte 0x00001f0c -_08137668: .4byte 0x085b2850 -_0813766C: .4byte 0x085b2870 -_08137670: .4byte 0x03005e00 -_08137674: .4byte sub_8137678 + 1 + .pool thumb_func_end sub_81375D8 thumb_func_start sub_8137678 @@ -638718,7 +617723,7 @@ sub_8137678: @ 8137678 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _081376AC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -638732,7 +617737,7 @@ sub_8137678: @ 8137678 movs r0, 0xF subs r0, r1 lsls r0, 1 - ldr r1, _081376B0 + ldr r1, =0x085b2890 adds r0, r1 lsls r2, 17 lsrs r2, 16 @@ -638740,25 +617745,22 @@ sub_8137678: @ 8137678 bl gpu_pal_apply b _081376C8 .align 2, 0 -_081376AC: .4byte 0x03005e00 -_081376B0: .4byte 0x085b2890 + .pool _081376B4: - ldr r1, _081376D0 + ldr r1, =0x00001010 movs r0, 0x52 bl lcd_io_set - ldr r1, _081376D4 + ldr r1, =0x00003e41 movs r0, 0x50 bl lcd_io_set - ldr r0, _081376D8 + ldr r0, =sub_81376DC + 1 str r0, [r4] _081376C8: pop {r4} pop {r0} bx r0 .align 2, 0 -_081376D0: .4byte 0x00001010 -_081376D4: .4byte 0x00003e41 -_081376D8: .4byte sub_81376DC + 1 + .pool thumb_func_end sub_8137678 thumb_func_start sub_81376DC @@ -638766,7 +617768,7 @@ sub_81376DC: @ 81376DC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08137710 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -638789,13 +617791,13 @@ sub_81376DC: @ 81376DC strh r0, [r5, 0xA] b _08137726 .align 2, 0 -_08137710: .4byte 0x03005e00 + .pool _08137714: - ldr r0, _0813772C + ldr r0, =0x085b2870 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _08137730 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 _08137726: @@ -638803,8 +617805,7 @@ _08137726: pop {r0} bx r0 .align 2, 0 -_0813772C: .4byte 0x085b2870 -_08137730: .4byte 0x030022c0 + .pool thumb_func_end sub_81376DC thumb_func_start sub_8137734 @@ -638814,21 +617815,20 @@ sub_8137734: @ 8137734 push {r7} sub sp, 0x1C bl sp000_heal_pokemon - ldr r4, _08137758 + ldr r4, =0x00000864 adds r0, r4, 0 bl flag_check lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1 bne _08137760 - ldr r0, _0813775C + ldr r0, =0x0203bce4 strb r1, [r0] b _0813776C .align 2, 0 -_08137758: .4byte 0x00000864 -_0813775C: .4byte 0x0203bce4 + .pool _08137760: - ldr r1, _081377A4 + ldr r1, =0x0203bce4 movs r0, 0 strb r0, [r1] adds r0, r4, 0 @@ -638838,7 +617838,7 @@ _0813776C: bl sub_80847F8 cmp r0, 0 bne _0813778E - ldr r0, _081377A8 + ldr r0, =0x03005d90 ldr r2, [r0] ldrh r1, [r2, 0xE] lsls r1, 16 @@ -638851,7 +617851,7 @@ _0813776C: bl sav12_xor_set _0813778E: bl sub_8076D48 - ldr r0, _081377A8 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 @@ -638860,8 +617860,7 @@ _0813778E: bl sub_8084F6C b _081377B2 .align 2, 0 -_081377A4: .4byte 0x0203bce4 -_081377A8: .4byte 0x03005d90 + .pool _081377AC: movs r0, 0x2 bl sub_8084F6C @@ -638875,7 +617874,7 @@ _081377BC: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 - ldr r0, _08137870 + ldr r0, =0x020244ec adds r4, r1, r0 movs r0, 0 strb r6, [r5] @@ -638915,7 +617914,7 @@ _0813780A: bne _0813785A movs r0, 0x2A bl sav12_xor_increment - ldr r0, _08137874 + ldr r0, =0x0000089b bl flag_set mov r3, sp add r2, sp, 0x4 @@ -638942,12 +617941,12 @@ _08137838: ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08137870 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x43 bl sub_80EE4DC _0813785A: - ldr r0, _08137878 + ldr r0, =sub_8173694 + 1 bl set_callback2 movs r0, 0 add sp, 0x1C @@ -638957,32 +617956,30 @@ _0813785A: pop {r1} bx r1 .align 2, 0 -_08137870: .4byte 0x020244ec -_08137874: .4byte 0x0000089b -_08137878: .4byte sub_8173694 + 1 + .pool thumb_func_end sub_8137734 thumb_func_start sp0C8_whiteout_maybe sp0C8_whiteout_maybe: @ 813787C push {lr} - ldr r0, _0813788C + ldr r0, =c2_whiteout + 1 bl set_callback2 movs r0, 0 pop {r1} bx r1 .align 2, 0 -_0813788C: .4byte c2_whiteout + 1 + .pool thumb_func_end sp0C8_whiteout_maybe thumb_func_start sub_8137890 sub_8137890: @ 8137890 push {r4,lr} - ldr r0, _081378B4 + ldr r0, =0x00004024 bl var_get adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _081378B8 + ldr r0, =0x00004025 bl var_get lsls r0, 16 lsrs r0, 16 @@ -638993,18 +617990,17 @@ sub_8137890: @ 8137890 pop {r1} bx r1 .align 2, 0 -_081378B4: .4byte 0x00004024 -_081378B8: .4byte 0x00004025 + .pool thumb_func_end sub_8137890 thumb_func_start sub_81378BC sub_81378BC: @ 81378BC push {r4,lr} adds r4, r0, 0 - ldr r0, _081378DC + ldr r0, =0x00004024 lsrs r1, r4, 16 bl var_set - ldr r0, _081378E0 + ldr r0, =0x00004025 lsls r4, 16 lsrs r4, 16 adds r1, r4, 0 @@ -639013,8 +618009,7 @@ sub_81378BC: @ 81378BC pop {r0} bx r0 .align 2, 0 -_081378DC: .4byte 0x00004024 -_081378E0: .4byte 0x00004025 + .pool thumb_func_end sub_81378BC thumb_func_start sub_81378E4 @@ -639043,8 +618038,8 @@ sub_8137904: @ 8137904 adds r1, r0, 0 cmp r4, 0 beq _08137928 - ldr r3, _08137934 - ldr r2, _08137938 + ldr r3, =0x41c64e6d + ldr r2, =0x00003039 _08137918: adds r0, r1, 0 muls r0, r3 @@ -639061,8 +618056,7 @@ _08137928: pop {r0} bx r0 .align 2, 0 -_08137934: .4byte 0x41c64e6d -_08137938: .4byte 0x00003039 + .pool thumb_func_end sub_8137904 thumb_func_start sub_813793C @@ -639075,7 +618069,7 @@ _08137946: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08137970 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -639085,15 +618079,14 @@ _08137946: adds r0, r4, 0 movs r1, 0 bl pokemon_getattr - ldr r1, _08137974 + ldr r1, =0x0000ffff ands r1, r0 cmp r1, r6 bne _08137978 movs r0, 0x1 b _08137980 .align 2, 0 -_08137970: .4byte 0x020244ec -_08137974: .4byte 0x0000ffff + .pool _08137978: adds r5, 0x1 cmp r5, 0x5 @@ -639116,8 +618109,8 @@ sub_8137988: @ 8137988 cmp r0, 0 beq _081379CE bl sub_802F588 - ldr r1, _081379BC - ldr r0, _081379C0 + ldr r1, =0x085b2b44 + ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 @@ -639125,21 +618118,19 @@ sub_8137988: @ 8137988 ldrb r0, [r0] cmp r0, 0 beq _081379C8 - ldr r0, _081379C4 + ldr r0, =0x0000089a bl flag_set b _081379CE .align 2, 0 -_081379BC: .4byte 0x085b2b44 -_081379C0: .4byte 0x03005cf8 -_081379C4: .4byte 0x0000089a + .pool _081379C8: - ldr r0, _081379D4 + ldr r0, =0x0000089a bl flag_clear _081379CE: pop {r0} bx r0 .align 2, 0 -_081379D4: .4byte 0x0000089a + .pool thumb_func_end sub_8137988 thumb_func_start sub_81379D8 @@ -639163,26 +618154,26 @@ _081379F2: thumb_func_start sub_81379F8 sub_81379F8: @ 81379F8 push {lr} - ldr r0, _08137A08 + ldr r0, =sub_81379D8 + 1 movs r1, 0x50 bl AddTask pop {r0} bx r0 .align 2, 0 -_08137A08: .4byte sub_81379D8 + 1 + .pool thumb_func_end sub_81379F8 thumb_func_start sub_8137A0C sub_8137A0C: @ 8137A0C push {lr} - ldr r0, _08137A1C + ldr r0, =0x00004049 bl var_get_pointer movs r1, 0 strh r1, [r0] pop {r0} bx r0 .align 2, 0 -_08137A1C: .4byte 0x00004049 + .pool thumb_func_end sub_8137A0C thumb_func_start sub_8137A20 @@ -639191,7 +618182,7 @@ sub_8137A20: @ 8137A20 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _08137A48 + ldr r0, =0x00004049 bl var_get_pointer adds r5, r0, 0 ldrh r0, [r5] @@ -639205,35 +618196,34 @@ sub_8137A20: @ 8137A20 pop {r0} bx r0 .align 2, 0 -_08137A48: .4byte 0x00004049 + .pool thumb_func_end sub_8137A20 thumb_func_start sub_8137A4C sub_8137A4C: @ 8137A4C push {lr} - ldr r0, _08137A68 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne _08137A70 movs r0, 0 bl sub_80C0844 - ldr r1, _08137A6C + ldr r1, =0x020375e2 strh r0, [r1] movs r0, 0x1 bl sub_80C0844 b _08137A80 .align 2, 0 -_08137A68: .4byte 0x020375e0 -_08137A6C: .4byte 0x020375e2 + .pool _08137A70: movs r0, 0 bl pokedex_count - ldr r1, _08137A90 + ldr r1, =0x020375e2 strh r0, [r1] movs r0, 0x1 bl pokedex_count _08137A80: - ldr r1, _08137A94 + ldr r1, =0x020375e4 strh r0, [r1] bl sub_809D42C lsls r0, 16 @@ -639241,8 +618231,7 @@ _08137A80: pop {r1} bx r1 .align 2, 0 -_08137A90: .4byte 0x020375e2 -_08137A94: .4byte 0x020375e4 + .pool thumb_func_end sub_8137A4C thumb_func_start sub_8137A98 @@ -639256,135 +618245,135 @@ sub_8137A98: @ 8137A98 _08137AA4: cmp r0, 0x13 bhi _08137AB0 - ldr r0, _08137AAC + ldr r0, =0x082a5dab b _08137C06 .align 2, 0 -_08137AAC: .4byte 0x082a5dab + .pool _08137AB0: cmp r0, 0x1D bhi _08137ABC - ldr r0, _08137AB8 + ldr r0, =0x082a5df1 b _08137C06 .align 2, 0 -_08137AB8: .4byte 0x082a5df1 + .pool _08137ABC: cmp r0, 0x27 bhi _08137AC8 - ldr r0, _08137AC4 + ldr r0, =0x082a5e34 b _08137C06 .align 2, 0 -_08137AC4: .4byte 0x082a5e34 + .pool _08137AC8: cmp r0, 0x31 bhi _08137AD4 - ldr r0, _08137AD0 + ldr r0, =0x082a5e83 b _08137C06 .align 2, 0 -_08137AD0: .4byte 0x082a5e83 + .pool _08137AD4: cmp r0, 0x3B bhi _08137AE0 - ldr r0, _08137ADC + ldr r0, =0x082a5eb9 b _08137C06 .align 2, 0 -_08137ADC: .4byte 0x082a5eb9 + .pool _08137AE0: cmp r0, 0x45 bhi _08137AEC - ldr r0, _08137AE8 + ldr r0, =0x082a5ef4 b _08137C06 .align 2, 0 -_08137AE8: .4byte 0x082a5ef4 + .pool _08137AEC: cmp r0, 0x4F bhi _08137AF8 - ldr r0, _08137AF4 + ldr r0, =0x082a5f39 b _08137C06 .align 2, 0 -_08137AF4: .4byte 0x082a5f39 + .pool _08137AF8: cmp r0, 0x59 bhi _08137B04 - ldr r0, _08137B00 + ldr r0, =0x082a5f82 b _08137C06 .align 2, 0 -_08137B00: .4byte 0x082a5f82 + .pool _08137B04: cmp r0, 0x63 bhi _08137B10 - ldr r0, _08137B0C + ldr r0, =0x082a5fb9 b _08137C06 .align 2, 0 -_08137B0C: .4byte 0x082a5fb9 + .pool _08137B10: cmp r0, 0x6D bhi _08137B1C - ldr r0, _08137B18 + ldr r0, =0x082a6018 b _08137C06 .align 2, 0 -_08137B18: .4byte 0x082a6018 + .pool _08137B1C: cmp r0, 0x77 bhi _08137B28 - ldr r0, _08137B24 + ldr r0, =0x082a6061 b _08137C06 .align 2, 0 -_08137B24: .4byte 0x082a6061 + .pool _08137B28: cmp r0, 0x81 bhi _08137B34 - ldr r0, _08137B30 + ldr r0, =0x082a609c b _08137C06 .align 2, 0 -_08137B30: .4byte 0x082a609c + .pool _08137B34: cmp r0, 0x8B bhi _08137B40 - ldr r0, _08137B3C + ldr r0, =0x082a60d5 b _08137C06 .align 2, 0 -_08137B3C: .4byte 0x082a60d5 + .pool _08137B40: cmp r0, 0x95 bhi _08137B4C - ldr r0, _08137B48 + ldr r0, =0x082a6124 b _08137C06 .align 2, 0 -_08137B48: .4byte 0x082a6124 + .pool _08137B4C: cmp r0, 0x9F bhi _08137B58 - ldr r0, _08137B54 + ldr r0, =0x082a616f b _08137C06 .align 2, 0 -_08137B54: .4byte 0x082a616f + .pool _08137B58: cmp r0, 0xA9 bhi _08137B64 - ldr r0, _08137B60 + ldr r0, =0x082a61d6 b _08137C06 .align 2, 0 -_08137B60: .4byte 0x082a61d6 + .pool _08137B64: cmp r0, 0xB3 bhi _08137B70 - ldr r0, _08137B6C + ldr r0, =0x082a623a b _08137C06 .align 2, 0 -_08137B6C: .4byte 0x082a623a + .pool _08137B70: cmp r0, 0xBD bhi _08137B7C - ldr r0, _08137B78 + ldr r0, =0x082a6287 b _08137C06 .align 2, 0 -_08137B78: .4byte 0x082a6287 + .pool _08137B7C: cmp r0, 0xC7 bls _08137BEA cmp r0, 0xC8 bne _08137BB8 - ldr r0, _08137BB4 + ldr r0, =0x00000199 bl species_to_pokedex_index lsls r0, 16 lsrs r0, 16 @@ -639405,11 +618394,11 @@ _08137B7C: bne _08137BEA b _08137C04 .align 2, 0 -_08137BB4: .4byte 0x00000199 + .pool _08137BB8: cmp r0, 0xC9 bne _08137BF8 - ldr r0, _08137BF0 + ldr r0, =0x00000199 bl species_to_pokedex_index lsls r0, 16 lsrs r0, 16 @@ -639429,67 +618418,64 @@ _08137BB8: cmp r0, 0 beq _08137C04 _08137BEA: - ldr r0, _08137BF4 + ldr r0, =0x082a62c9 b _08137C06 .align 2, 0 -_08137BF0: .4byte 0x00000199 -_08137BF4: .4byte 0x082a62c9 + .pool _08137BF8: cmp r0, 0xCA beq _08137C04 _08137BFC: - ldr r0, _08137C00 + ldr r0, =0x082a5d6c b _08137C06 .align 2, 0 -_08137C00: .4byte 0x082a5d6c + .pool _08137C04: - ldr r0, _08137C0C + ldr r0, =0x082a6312 _08137C06: pop {r1} bx r1 .align 2, 0 -_08137C0C: .4byte 0x082a6312 + .pool thumb_func_end sub_8137A98 thumb_func_start sub_8137C10 sub_8137C10: @ 8137C10 push {lr} - ldr r0, _08137C24 + ldr r0, =0x020375e0 ldrh r0, [r0] bl sub_8137A98 bl box_related_two__2 pop {r0} bx r0 .align 2, 0 -_08137C24: .4byte 0x020375e0 + .pool thumb_func_end sub_8137C10 thumb_func_start sub_8137C28 sub_8137C28: @ 8137C28 push {lr} - ldr r0, _08137C38 + ldr r0, =sub_8174194 + 1 bl set_callback2 bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_08137C38: .4byte sub_8174194 + 1 + .pool thumb_func_end sub_8137C28 thumb_func_start sub_8137C3C sub_8137C3C: @ 8137C3C push {lr} - ldr r0, _08137C50 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 - ldr r1, _08137C54 - ldr r0, _08137C58 + ldr r1, =0x03005dac + ldr r0, =mapldr_080CA5C0 + 1 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08137C50: .4byte c2_exit_to_overworld_2_switch + 1 -_08137C54: .4byte 0x03005dac -_08137C58: .4byte mapldr_080CA5C0 + 1 + .pool thumb_func_end sub_8137C3C thumb_func_start mapldr_080CA5C0 @@ -639507,14 +618493,14 @@ mapldr_080CA5C0: @ 8137C5C movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _08137C90 + ldr r0, =sub_8137C94 + 1 movs r1, 0xA bl AddTask add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08137C90: .4byte sub_8137C94 + 1 + .pool thumb_func_end mapldr_080CA5C0 thumb_func_start sub_8137C94 @@ -639522,7 +618508,7 @@ sub_8137C94: @ 8137C94 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08137CB0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -639534,73 +618520,66 @@ _08137CAC: pop {r0} bx r0 .align 2, 0 -_08137CB0: .4byte 0x02037fd4 + .pool thumb_func_end sub_8137C94 thumb_func_start sub_8137CB4 sub_8137CB4: @ 8137CB4 push {lr} - ldr r0, _08137CC4 + ldr r0, =sub_8177888 + 1 bl set_callback2 bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_08137CC4: .4byte sub_8177888 + 1 + .pool thumb_func_end sub_8137CB4 thumb_func_start sub_8137CC8 sub_8137CC8: @ 8137CC8 push {lr} - ldr r0, _08137CE0 - ldr r1, _08137CE4 + ldr r0, =0x030022c0 + ldr r1, =c2_exit_to_overworld_2_switch + 1 str r1, [r0, 0x8] - ldr r0, _08137CE8 + ldr r0, =sub_8134B44 + 1 bl set_callback2 bl script_env_2_enable pop {r0} bx r0 .align 2, 0 -_08137CE0: .4byte 0x030022c0 -_08137CE4: .4byte c2_exit_to_overworld_2_switch + 1 -_08137CE8: .4byte sub_8134B44 + 1 + .pool thumb_func_end sub_8137CC8 thumb_func_start wild_pokemon_reroll wild_pokemon_reroll: @ 8137CEC - ldr r0, _08137D00 + ldr r0, =0x0203ab54 movs r1, 0 strb r1, [r0] - ldr r0, _08137D04 + ldr r0, =0x0203ab55 strb r1, [r0] - ldr r1, _08137D08 + ldr r1, =0x0203ab58 movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_08137D00: .4byte 0x0203ab54 -_08137D04: .4byte 0x0203ab55 -_08137D08: .4byte 0x0203ab58 + .pool thumb_func_end wild_pokemon_reroll thumb_func_start sub_8137D0C sub_8137D0C: @ 8137D0C - ldr r1, _08137D24 + ldr r1, =0x0203ab54 movs r0, 0x1 strb r0, [r1] - ldr r1, _08137D28 + ldr r1, =0x0203ab55 movs r0, 0 strb r0, [r1] - ldr r1, _08137D2C - ldr r0, _08137D30 + ldr r1, =0x0203ab58 + ldr r0, =0x030022c0 ldr r0, [r0, 0x20] str r0, [r1] bx lr .align 2, 0 -_08137D24: .4byte 0x0203ab54 -_08137D28: .4byte 0x0203ab55 -_08137D2C: .4byte 0x0203ab58 -_08137D30: .4byte 0x030022c0 + .pool thumb_func_end sub_8137D0C thumb_func_start sp0E3_walkrun_bitfield_interpretation @@ -639636,28 +618615,27 @@ sub_8137D5C: @ 8137D5C lsrs r6, r1, 24 cmp r6, 0x63 bhi _08137D88 - ldr r4, _08137D80 + ldr r4, =0x02021cc4 adds r0, r4, 0 adds r1, r6, 0 movs r2, 0 movs r3, 0x2 bl decimal_int_to_string - ldr r1, _08137D84 + ldr r1, =0x085eb5ee adds r0, r4, 0 bl gf_strcat b _08137D90 .align 2, 0 -_08137D80: .4byte 0x02021cc4 -_08137D84: .4byte 0x085eb5ee + .pool _08137D88: - ldr r0, _08137DDC - ldr r1, _08137DE0 + ldr r0, =0x02021cc4 + ldr r1, =0x085eb5cf bl gf_strcpy _08137D90: - ldr r0, _08137DE4 + ldr r0, =0x00000e0f cmp r7, r0 bhi _08137DF0 - ldr r4, _08137DE8 + ldr r4, =0x02021dc4 adds r0, r7, 0 movs r1, 0x3C bl __udivsi3 @@ -639681,19 +618659,15 @@ _08137D90: movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r1, _08137DEC + ldr r1, =0x085eb5e5 adds r0, r4, 0 bl gf_strcat b _08137DF8 .align 2, 0 -_08137DDC: .4byte 0x02021cc4 -_08137DE0: .4byte 0x085eb5cf -_08137DE4: .4byte 0x00000e0f -_08137DE8: .4byte 0x02021dc4 -_08137DEC: .4byte 0x085eb5e5 + .pool _08137DF0: - ldr r0, _08137E04 - ldr r1, _08137E08 + ldr r0, =0x02021dc4 + ldr r1, =0x085eb5da bl gf_strcpy _08137DF8: movs r4, 0 @@ -639702,8 +618676,7 @@ _08137DF8: movs r4, 0x5 b _08137E2A .align 2, 0 -_08137E04: .4byte 0x02021dc4 -_08137E08: .4byte 0x085eb5da + .pool _08137E0C: cmp r6, 0x3 bhi _08137E14 @@ -639754,24 +618727,24 @@ _08137E58: lsls r0, 24 lsrs r4, r0, 24 _08137E5C: - ldr r0, _08137E68 + ldr r0, =0x020375f0 strh r4, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08137E68: .4byte 0x020375f0 + .pool thumb_func_end sub_8137D5C thumb_func_start sub_8137E6C sub_8137E6C: @ 8137E6C push {r4,r5,lr} - ldr r0, _08137E90 - ldr r1, _08137E94 + ldr r0, =0x030022c0 + ldr r1, =0x0203ab58 ldr r4, [r0, 0x20] ldr r0, [r1] subs r4, r0 - ldr r5, _08137E98 + ldr r5, =0x0203ab55 ldrb r1, [r5] adds r0, r4, 0 bl sub_8137D5C @@ -639782,9 +618755,7 @@ sub_8137E6C: @ 8137E6C pop {r0} bx r0 .align 2, 0 -_08137E90: .4byte 0x030022c0 -_08137E94: .4byte 0x0203ab58 -_08137E98: .4byte 0x0203ab55 + .pool thumb_func_end sub_8137E6C thumb_func_start sub_8137E9C @@ -639796,13 +618767,13 @@ sub_8137E9C: @ 8137E9C lsls r1, 24 lsrs r1, 24 mov r8, r1 - ldr r6, _08137EF0 + ldr r6, =0x00004028 adds r0, r6, 0 bl var_get adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r7, _08137EF4 + ldr r7, =0x00004029 adds r0, r7, 0 bl var_get lsls r0, 16 @@ -639819,7 +618790,7 @@ _08137ECC: lsrs r1, r5, 16 adds r0, r7, 0 bl var_set - ldr r0, _08137EF8 + ldr r0, =0x00004027 mov r1, r8 bl var_set _08137EE6: @@ -639829,26 +618800,24 @@ _08137EE6: pop {r0} bx r0 .align 2, 0 -_08137EF0: .4byte 0x00004028 -_08137EF4: .4byte 0x00004029 -_08137EF8: .4byte 0x00004027 + .pool thumb_func_end sub_8137E9C thumb_func_start sub_8137EFC sub_8137EFC: @ 8137EFC push {r4,lr} - ldr r0, _08137F30 + ldr r0, =0x00004028 bl var_get adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _08137F34 + ldr r0, =0x00004029 bl var_get lsls r0, 16 adds r4, r0 cmp r4, 0 beq _08137F3C - ldr r0, _08137F38 + ldr r0, =0x00004027 bl var_get adds r1, r0, 0 lsls r1, 24 @@ -639858,9 +618827,7 @@ sub_8137EFC: @ 8137EFC movs r0, 0x1 b _08137F3E .align 2, 0 -_08137F30: .4byte 0x00004028 -_08137F34: .4byte 0x00004029 -_08137F38: .4byte 0x00004027 + .pool _08137F3C: movs r0, 0 _08137F3E: @@ -639872,12 +618839,12 @@ _08137F3E: thumb_func_start sub_8137F44 sub_8137F44: @ 8137F44 push {r4,lr} - ldr r0, _08137F84 + ldr r0, =0x020322dc ldrh r1, [r0] - ldr r0, _08137F88 + ldr r0, =0x00000c1d cmp r1, r0 beq _08137F7C - ldr r4, _08137F8C + ldr r4, =0x000040a9 adds r0, r4, 0 bl var_get lsls r0, 16 @@ -639901,36 +618868,33 @@ _08137F7C: pop {r0} bx r0 .align 2, 0 -_08137F84: .4byte 0x020322dc -_08137F88: .4byte 0x00000c1d -_08137F8C: .4byte 0x000040a9 + .pool thumb_func_end sub_8137F44 thumb_func_start sub_8137F90 sub_8137F90: @ 8137F90 push {lr} - ldr r0, _08137FA8 + ldr r0, =0x0000088d bl flag_set - ldr r0, _08137FAC + ldr r0, =0x0000404a bl var_get_pointer movs r1, 0 strh r1, [r0] pop {r0} bx r0 .align 2, 0 -_08137FA8: .4byte 0x0000088d -_08137FAC: .4byte 0x0000404a + .pool thumb_func_end sub_8137F90 thumb_func_start sub_8137FB0 sub_8137FB0: @ 8137FB0 push {lr} - ldr r0, _08137FBC + ldr r0, =0x0000088d bl flag_clear pop {r0} bx r0 .align 2, 0 -_08137FBC: .4byte 0x0000088d + .pool thumb_func_end sub_8137FB0 thumb_func_start sub_8137FC0 @@ -639938,12 +618902,12 @@ sub_8137FC0: @ 8137FC0 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _08137FEC + ldr r0, =0x0000088d bl flag_check lsls r0, 24 cmp r0, 0 beq _08137FE6 - ldr r0, _08137FF0 + ldr r0, =0x0000404a bl var_get_pointer ldrh r1, [r0] adds r1, r4, r1 @@ -639956,8 +618920,7 @@ _08137FE6: movs r0, 0 b _08137FF6 .align 2, 0 -_08137FEC: .4byte 0x0000088d -_08137FF0: .4byte 0x0000404a + .pool _08137FF4: movs r0, 0x1 _08137FF6: @@ -639975,24 +618938,22 @@ sub_8137FFC: @ 8137FFC adds r5, r1, 0 adds r6, r2, 0 adds r7, r3, 0 - ldr r0, _0813802C + ldr r0, =0x0000404a bl var_get_pointer adds r4, r0, 0 - ldr r0, _08138030 + ldr r0, =0x000040b4 bl var_get_pointer ldrh r0, [r0] subs r0, 0x1 cmp r0, 0x9 bhi _081380C2 lsls r0, 2 - ldr r1, _08138034 + ldr r1, =_08138038 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813802C: .4byte 0x0000404a -_08138030: .4byte 0x000040b4 -_08138034: .4byte _08138038 + .pool .align 2, 0 _08138038: .4byte _08138060 @@ -640089,7 +619050,7 @@ is_tile_that_overrides_player_control: @ 81380D8 lsls r0, 24 cmp r0, 0 beq _0813810A - ldr r0, _08138110 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x1 blt _0813810A @@ -640098,7 +619059,7 @@ is_tile_that_overrides_player_control: @ 81380D8 cmp r0, 0x6 bne _0813810A _081380F6: - ldr r0, _08138114 + ldr r0, =0x000040f2 bl var_get_pointer ldrh r1, [r0] adds r1, 0x1 @@ -640111,8 +619072,7 @@ _0813810A: movs r0, 0 b _0813811A .align 2, 0 -_08138110: .4byte 0x02037318 -_08138114: .4byte 0x000040f2 + .pool _08138118: movs r0, 0x1 _0813811A: @@ -640128,7 +619088,7 @@ sub_8138120: @ 8138120 lsls r0, 24 cmp r0, 0 beq _08138152 - ldr r0, _08138158 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x1 blt _08138152 @@ -640137,7 +619097,7 @@ sub_8138120: @ 8138120 cmp r0, 0x6 bne _08138152 _0813813E: - ldr r0, _0813815C + ldr r0, =0x000040f3 bl var_get_pointer ldrh r1, [r0] adds r1, 0x1 @@ -640150,8 +619110,7 @@ _08138152: movs r0, 0 b _08138162 .align 2, 0 -_08138158: .4byte 0x02037318 -_0813815C: .4byte 0x000040f3 + .pool _08138160: movs r0, 0x1 _08138162: @@ -640167,7 +619126,7 @@ sub_8138168: @ 8138168 lsls r0, 24 cmp r0, 0 beq _0813819A - ldr r0, _081381A0 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x1 blt _0813819A @@ -640176,7 +619135,7 @@ sub_8138168: @ 8138168 cmp r0, 0x6 bne _0813819A _08138186: - ldr r0, _081381A4 + ldr r0, =0x000040f5 bl var_get_pointer ldrh r1, [r0] adds r1, 0x1 @@ -640189,8 +619148,7 @@ _0813819A: movs r0, 0 b _081381AA .align 2, 0 -_081381A0: .4byte 0x02037318 -_081381A4: .4byte 0x000040f5 + .pool _081381A8: movs r0, 0x1 _081381AA: @@ -640206,7 +619164,7 @@ sub_81381B0: @ 81381B0 lsls r0, 24 cmp r0, 0 beq _081381E2 - ldr r0, _081381E8 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x1 blt _081381E2 @@ -640215,7 +619173,7 @@ sub_81381B0: @ 81381B0 cmp r0, 0x6 bne _081381E2 _081381CE: - ldr r0, _081381EC + ldr r0, =0x000040f4 bl var_get_pointer ldrh r1, [r0] adds r1, 0x1 @@ -640228,8 +619186,7 @@ _081381E2: movs r0, 0 b _081381F2 .align 2, 0 -_081381E8: .4byte 0x02037318 -_081381EC: .4byte 0x000040f4 + .pool _081381F0: movs r0, 0x1 _081381F2: @@ -640245,7 +619202,7 @@ sub_81381F8: @ 81381F8 lsls r0, 24 cmp r0, 0 beq _0813822A - ldr r0, _08138230 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x1 blt _0813822A @@ -640254,7 +619211,7 @@ sub_81381F8: @ 81381F8 cmp r0, 0x6 bne _0813822A _08138216: - ldr r0, _08138234 + ldr r0, =0x000040f6 bl var_get_pointer ldrh r1, [r0] adds r1, 0x1 @@ -640267,8 +619224,7 @@ _0813822A: movs r0, 0 b _0813823A .align 2, 0 -_08138230: .4byte 0x02037318 -_08138234: .4byte 0x000040f6 + .pool _08138238: movs r0, 0x1 _0813823A: @@ -640291,7 +619247,7 @@ sub_8138240: @ 8138240 movs r4, 0 cmp r4, r5 bcs _0813828A - ldr r0, _08138298 + ldr r0, =0x0858d144 mov r8, r0 _08138262: cmp r7, r4 @@ -640302,7 +619258,7 @@ _08138262: lsls r1, r4, 3 subs r1, r4 lsls r1, 2 - ldr r2, _0813829C + ldr r2, =0x020229f0 adds r1, r2 bl gf_strcpy adds r0, r6, 0x1 @@ -640322,8 +619278,7 @@ _0813828A: pop {r1} bx r1 .align 2, 0 -_08138298: .4byte 0x0858d144 -_0813829C: .4byte 0x020229f0 + .pool thumb_func_end sub_8138240 thumb_func_start sub_81382A0 @@ -640338,12 +619293,12 @@ sub_81382A0: @ 81382A0 movs r0, 0 mov r9, r0 mov r8, r0 - ldr r1, _081382EC + ldr r1, =0x085b2b5c add r0, sp, 0x8 movs r2, 0x4 bl memcpy add r4, sp, 0xC - ldr r1, _081382F0 + ldr r1, =0x085b2b60 adds r0, r4, 0 movs r2, 0x8 bl memcpy @@ -640363,8 +619318,7 @@ sub_81382A0: @ 81382A0 beq _0813833C b _08138350 .align 2, 0 -_081382EC: .4byte 0x085b2b5c -_081382F0: .4byte 0x085b2b60 + .pool _081382F4: cmp r1, 0x3 beq _081382FE @@ -640373,16 +619327,16 @@ _081382F4: b _08138350 _081382FE: movs r7, 0x2 - ldr r0, _0813830C + ldr r0, =0x03005d8c ldr r1, [r0] ldrh r0, [r1] subs r0, 0x1 b _0813832C .align 2, 0 -_0813830C: .4byte 0x03005d8c + .pool _08138310: movs r7, 0x1 - ldr r0, _08138320 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0] mov r9, r1 @@ -640390,9 +619344,9 @@ _08138310: subs r0, 0x1 b _0813834A .align 2, 0 -_08138320: .4byte 0x03005d8c + .pool _08138324: - ldr r0, _08138338 + ldr r0, =0x03005d8c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 @@ -640404,10 +619358,10 @@ _0813832C: mov r8, r1 b _08138350 .align 2, 0 -_08138338: .4byte 0x03005d8c + .pool _0813833C: movs r7, 0x3 - ldr r0, _08138354 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r3, [r0] mov r9, r3 @@ -640421,11 +619375,11 @@ _08138350: movs r6, 0 b _08138410 .align 2, 0 -_08138354: .4byte 0x03005d8c + .pool _08138358: cmp r10, r6 beq _0813840A - ldr r0, _08138378 + ldr r0, =0x020229e8 lsls r2, r6, 3 subs r1, r2, r6 lsls r1, 2 @@ -640440,7 +619394,7 @@ _08138358: beq _08138388 b _0813838C .align 2, 0 -_08138378: .4byte 0x020229e8 + .pool _0813837C: ldrb r0, [r1, 0x13] movs r5, 0xEC @@ -640520,7 +619474,7 @@ _0813840A: lsls r0, 24 lsrs r6, r0, 24 _08138410: - ldr r0, _08138428 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r6, r0 bcc _08138358 @@ -640533,7 +619487,7 @@ _08138410: pop {r0} bx r0 .align 2, 0 -_08138428: .4byte 0x020375e0 + .pool thumb_func_end sub_81382A0 thumb_func_start sub_813842C @@ -640559,7 +619513,7 @@ sub_813842C: @ 813842C cmp r4, 0x69 bne _081384E6 _08138454: - ldr r0, _0813849C + ldr r0, =0x03005d8c ldr r0, [r0] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -640569,7 +619523,7 @@ _08138454: lsrs r2, r0, 24 cmp r2, 0x10 beq _081384E6 - ldr r1, _081384A0 + ldr r1, =0x02037350 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -640578,7 +619532,7 @@ _08138454: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _081384A4 + ldr r0, =0x02020630 adds r1, r0 lsls r3, r5, 4 ldrb r2, [r1, 0x5] @@ -640594,9 +619548,7 @@ _08138454: beq _081384C4 b _081384E6 .align 2, 0 -_0813849C: .4byte 0x03005d8c -_081384A0: .4byte 0x02037350 -_081384A4: .4byte 0x02020630 + .pool _081384A8: cmp r4, 0xEB beq _081384B2 @@ -640604,17 +619556,17 @@ _081384A8: beq _081384BC b _081384E6 _081384B2: - ldr r0, _081384B8 + ldr r0, =0x08499a18 b _081384C6 .align 2, 0 -_081384B8: .4byte 0x08499a18 + .pool _081384BC: - ldr r0, _081384C0 + ldr r0, =0x084a54b8 b _081384C6 .align 2, 0 -_081384C0: .4byte 0x084a54b8 + .pool _081384C4: - ldr r0, _081384D4 + ldr r0, =0x084987f8 _081384C6: movs r2, 0x80 lsls r2, 1 @@ -640623,9 +619575,9 @@ _081384C6: bl gpu_pal_apply b _081384E6 .align 2, 0 -_081384D4: .4byte 0x084987f8 + .pool _081384D8: - ldr r0, _081384EC + ldr r0, =0x084a4278 movs r2, 0x80 lsls r2, 1 adds r1, r3, r2 @@ -640636,16 +619588,16 @@ _081384E6: pop {r0} bx r0 .align 2, 0 -_081384EC: .4byte 0x084a4278 + .pool thumb_func_end sub_813842C thumb_func_start sub_81384F0 sub_81384F0: @ 81384F0 push {r4,r5,lr} movs r4, 0 - ldr r5, _08138510 + ldr r5, =0x085b2b68 _081384F6: - ldr r0, _08138514 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r4, r0 bne _0813851C @@ -640653,19 +619605,17 @@ _081384F6: adds r1, r5 ldrb r0, [r1] ldrb r1, [r1, 0x1] - ldr r2, _08138518 + ldr r2, =0x00000206 bl setmaptile_0 b _0813852A .align 2, 0 -_08138510: .4byte 0x085b2b68 -_08138514: .4byte 0x020375e0 -_08138518: .4byte 0x00000206 + .pool _0813851C: lsls r1, r4, 2 adds r1, r5 ldrb r0, [r1] ldrb r1, [r1, 0x1] - ldr r2, _0813853C + ldr r2, =0x00000205 bl setmaptile_0 _0813852A: adds r0, r4, 0x1 @@ -640677,7 +619627,7 @@ _0813852A: pop {r0} bx r0 .align 2, 0 -_0813853C: .4byte 0x00000205 + .pool thumb_func_end sub_81384F0 thumb_func_start sub_8138540 @@ -640691,20 +619641,19 @@ _08138548: adds r0, r4, 0 adds r1, r5, 0 bl cur_mapdata_get_blockid_at - ldr r1, _08138564 + ldr r1, =0xfffffde6 adds r0, r1 cmp r0, 0x37 bls _0813855A b _08138734 _0813855A: lsls r0, 2 - ldr r1, _08138568 + ldr r1, =_0813856C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08138564: .4byte 0xfffffde6 -_08138568: .4byte _0813856C + .pool .align 2, 0 _0813856C: .4byte _081386F2 @@ -640768,98 +619717,98 @@ _0813864C: lsls r2, 2 b _08138720 _08138652: - ldr r2, _08138658 + ldr r2, =0x00000231 b _08138720 .align 2, 0 -_08138658: .4byte 0x00000231 + .pool _0813865C: movs r2, 0x8E lsls r2, 2 b _08138720 _08138662: - ldr r2, _08138668 + ldr r2, =0x00000239 b _08138720 .align 2, 0 -_08138668: .4byte 0x00000239 + .pool _0813866C: movs r2, 0x88 lsls r2, 2 b _08138720 _08138672: - ldr r2, _08138678 + ldr r2, =0x00000221 b _08138720 .align 2, 0 -_08138678: .4byte 0x00000221 + .pool _0813867C: - ldr r2, _08138680 + ldr r2, =0x00000e28 b _08138720 .align 2, 0 -_08138680: .4byte 0x00000e28 + .pool _08138684: - ldr r2, _08138688 + ldr r2, =0x00000e29 b _08138720 .align 2, 0 -_08138688: .4byte 0x00000e29 + .pool _0813868C: - ldr r2, _08138690 + ldr r2, =0x00000232 b _08138720 .align 2, 0 -_08138690: .4byte 0x00000232 + .pool _08138694: - ldr r2, _08138698 + ldr r2, =0x00000233 b _08138720 .align 2, 0 -_08138698: .4byte 0x00000233 + .pool _0813869C: - ldr r2, _081386A0 + ldr r2, =0x0000023a b _08138720 .align 2, 0 -_081386A0: .4byte 0x0000023a + .pool _081386A4: - ldr r2, _081386A8 + ldr r2, =0x0000023b b _08138720 .align 2, 0 -_081386A8: .4byte 0x0000023b + .pool _081386AC: - ldr r2, _081386B0 + ldr r2, =0x00000222 b _08138720 .align 2, 0 -_081386B0: .4byte 0x00000222 + .pool _081386B4: - ldr r2, _081386B8 + ldr r2, =0x00000223 b _08138720 .align 2, 0 -_081386B8: .4byte 0x00000223 + .pool _081386BC: - ldr r2, _081386C0 + ldr r2, =0x00000e2a b _08138720 .align 2, 0 -_081386C0: .4byte 0x00000e2a + .pool _081386C4: - ldr r2, _081386C8 + ldr r2, =0x00000e2b b _08138720 .align 2, 0 -_081386C8: .4byte 0x00000e2b + .pool _081386CC: - ldr r2, _081386D0 + ldr r2, =0x00000e42 b _08138720 .align 2, 0 -_081386D0: .4byte 0x00000e42 + .pool _081386D4: - ldr r2, _081386D8 + ldr r2, =0x0000021a b _08138720 .align 2, 0 -_081386D8: .4byte 0x0000021a + .pool _081386DC: - ldr r2, _081386E0 + ldr r2, =0x00000e43 b _08138720 .align 2, 0 -_081386E0: .4byte 0x00000e43 + .pool _081386E4: - ldr r2, _081386E8 + ldr r2, =0x0000021a b _08138720 .align 2, 0 -_081386E8: .4byte 0x0000021a + .pool _081386EC: movs r2, 0xE4 lsls r2, 4 @@ -640872,20 +619821,20 @@ _081386F2: lsls r1, 2 cmp r0, r1 bne _0813870C - ldr r2, _08138708 + ldr r2, =0x00000e48 b _08138720 .align 2, 0 -_08138708: .4byte 0x00000e48 + .pool _0813870C: - ldr r2, _08138710 + ldr r2, =0x00000e49 b _08138720 .align 2, 0 -_08138710: .4byte 0x00000e49 + .pool _08138714: - ldr r2, _08138718 + ldr r2, =0x00000e41 b _08138720 .align 2, 0 -_08138718: .4byte 0x00000e41 + .pool _0813871C: movs r2, 0xE5 lsls r2, 4 @@ -640895,7 +619844,7 @@ _08138720: bl setmaptile_0 b _08138734 _0813872A: - ldr r2, _0813874C + ldr r2, =0x00000251 adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 @@ -640914,18 +619863,18 @@ _08138744: pop {r0} bx r0 .align 2, 0 -_0813874C: .4byte 0x00000251 + .pool thumb_func_end sub_8138540 thumb_func_start sub_8138750 sub_8138750: @ 8138750 push {r4-r6,lr} - ldr r4, _0813878C + ldr r4, =0x085b2b68 movs r5, 0x3 _08138756: ldrb r0, [r4] ldrb r1, [r4, 0x1] - ldr r2, _08138790 + ldr r2, =0x00000206 bl setmaptile_0 adds r4, 0x4 subs r5, 0x1 @@ -640939,22 +619888,19 @@ _0813876E: adds r0, r4, 0 adds r1, r5, 0 bl cur_mapdata_get_blockid_at - ldr r1, _08138794 + ldr r1, =0xfffffde0 adds r0, r1 cmp r0, 0x30 bls _08138780 b _081388CA _08138780: lsls r0, 2 - ldr r1, _08138798 + ldr r1, =_0813879C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813878C: .4byte 0x085b2b68 -_08138790: .4byte 0x00000206 -_08138794: .4byte 0xfffffde0 -_08138798: .4byte _0813879C + .pool .align 2, 0 _0813879C: .4byte _08138860 @@ -641011,60 +619957,60 @@ _08138860: lsls r2, 2 b _081388B2 _08138866: - ldr r2, _0813886C + ldr r2, =0x00000231 b _081388B2 .align 2, 0 -_0813886C: .4byte 0x00000231 + .pool _08138870: movs r2, 0x8E lsls r2, 2 b _081388B2 _08138876: - ldr r2, _0813887C + ldr r2, =0x00000239 b _081388B2 .align 2, 0 -_0813887C: .4byte 0x00000239 + .pool _08138880: - ldr r2, _08138884 + ldr r2, =0x00000232 b _081388B2 .align 2, 0 -_08138884: .4byte 0x00000232 + .pool _08138888: - ldr r2, _0813888C + ldr r2, =0x00000233 b _081388B2 .align 2, 0 -_0813888C: .4byte 0x00000233 + .pool _08138890: - ldr r2, _08138894 + ldr r2, =0x0000023a b _081388B2 .align 2, 0 -_08138894: .4byte 0x0000023a + .pool _08138898: - ldr r2, _0813889C + ldr r2, =0x0000023b b _081388B2 .align 2, 0 -_0813889C: .4byte 0x0000023b + .pool _081388A0: - ldr r2, _081388A4 + ldr r2, =0x00000e42 b _081388B2 .align 2, 0 -_081388A4: .4byte 0x00000e42 + .pool _081388A8: - ldr r2, _081388AC + ldr r2, =0x00000e43 b _081388B2 .align 2, 0 -_081388AC: .4byte 0x00000e43 + .pool _081388B0: - ldr r2, _081388BC + ldr r2, =0x0000021a _081388B2: adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 b _081388CA .align 2, 0 -_081388BC: .4byte 0x0000021a + .pool _081388C0: - ldr r2, _081388E0 + ldr r2, =0x00000251 adds r0, r4, 0 adds r1, r5, 0 bl setmaptile_0 @@ -641083,28 +620029,26 @@ _081388DA: pop {r0} bx r0 .align 2, 0 -_081388E0: .4byte 0x00000251 + .pool thumb_func_end sub_8138750 thumb_func_start sub_81388E4 sub_81388E4: @ 81388E4 push {lr} - ldr r0, _08138904 + ldr r0, =0x0203ab5c movs r1, 0 strb r1, [r0] - ldr r0, _08138908 + ldr r0, =0x0203ab5d strb r1, [r0] movs r0, 0x2C bl audio_play - ldr r0, _0813890C + ldr r0, =sub_8138910 + 1 movs r1, 0x8 bl AddTask pop {r0} bx r0 .align 2, 0 -_08138904: .4byte 0x0203ab5c -_08138908: .4byte 0x0203ab5d -_0813890C: .4byte sub_8138910 + 1 + .pool thumb_func_end sub_81388E4 thumb_func_start sub_8138910 @@ -641112,18 +620056,18 @@ sub_8138910: @ 8138910 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08138958 - ldr r5, _0813895C + ldr r0, =0x085b2b78 + ldr r5, =0x0203ab5d ldrb r1, [r5] adds r0, r1, r0 - ldr r4, _08138960 + ldr r4, =0x0203ab5c ldrb r2, [r4] ldrb r0, [r0] cmp r0, r2 bne _0813896C - ldr r0, _08138964 + ldr r0, =0x020375e0 ldrb r0, [r0] - ldr r2, _08138968 + ldr r2, =0x085b2b7e lsls r1, 1 adds r1, r2 ldrh r1, [r1] @@ -641142,11 +620086,7 @@ sub_8138910: @ 8138910 bl script_env_2_enable_and_set_ctx_running b _08138970 .align 2, 0 -_08138958: .4byte 0x085b2b78 -_0813895C: .4byte 0x0203ab5d -_08138960: .4byte 0x0203ab5c -_08138964: .4byte 0x020375e0 -_08138968: .4byte 0x085b2b7e + .pool _0813896C: adds r0, r2, 0x1 strb r0, [r4] @@ -641172,12 +620112,12 @@ sub_8138978: @ 8138978 cmp r0, 0x7 bhi _08138A40 lsls r0, 2 - ldr r1, _0813899C + ldr r1, =_081389A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813899C: .4byte _081389A0 + .pool .align 2, 0 _081389A0: .4byte _081389C0 @@ -641317,50 +620257,47 @@ _08138A92: thumb_func_start sub_8138AA4 sub_8138AA4: @ 8138AA4 push {lr} - ldr r0, _08138AB8 + ldr r0, =0x020375e0 ldrb r0, [r0] - ldr r1, _08138ABC + ldr r1, =0x085b2b7e ldrh r1, [r1, 0x8] bl sub_8138978 pop {r0} bx r0 .align 2, 0 -_08138AB8: .4byte 0x020375e0 -_08138ABC: .4byte 0x085b2b7e + .pool thumb_func_end sub_8138AA4 thumb_func_start sub_8138AC0 sub_8138AC0: @ 8138AC0 push {lr} - ldr r0, _08138ACC + ldr r0, =0x02021fc4 bl box_related_two__2 pop {r0} bx r0 .align 2, 0 -_08138ACC: .4byte 0x02021fc4 + .pool thumb_func_end sub_8138AC0 thumb_func_start sub_8138AD0 sub_8138AD0: @ 8138AD0 - ldr r1, _08138AE4 - ldr r0, _08138AE8 + ldr r1, =0x020375e0 + ldr r0, =0x03005d8c ldr r2, [r0] ldrh r0, [r2] strh r0, [r1] - ldr r1, _08138AEC + ldr r1, =0x020375e2 ldrh r0, [r2, 0x2] strh r0, [r1] bx lr .align 2, 0 -_08138AE4: .4byte 0x020375e0 -_08138AE8: .4byte 0x03005d8c -_08138AEC: .4byte 0x020375e2 + .pool thumb_func_end sub_8138AD0 thumb_func_start sub_8138AF0 sub_8138AF0: @ 8138AF0 push {lr} - ldr r0, _08138B0C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r1, [r0, 0xB] lsls r1, 8 @@ -641373,79 +620310,73 @@ sub_8138AF0: @ 8138AF0 pop {r1} bx r1 .align 2, 0 -_08138B0C: .4byte 0x03005d90 + .pool thumb_func_end sub_8138AF0 thumb_func_start sub_8138B10 sub_8138B10: @ 8138B10 push {lr} - ldr r0, _08138B28 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 bne _08138B34 - ldr r0, _08138B2C - ldr r1, _08138B30 + ldr r0, =0x02021cc4 + ldr r1, =0x085eb5f9 bl gf_strcpy b _08138B3C .align 2, 0 -_08138B28: .4byte 0x03005d90 -_08138B2C: .4byte 0x02021cc4 -_08138B30: .4byte 0x085eb5f9 + .pool _08138B34: - ldr r0, _08138B40 - ldr r1, _08138B44 + ldr r0, =0x02021cc4 + ldr r1, =0x085eb601 bl gf_strcpy _08138B3C: pop {r0} bx r0 .align 2, 0 -_08138B40: .4byte 0x02021cc4 -_08138B44: .4byte 0x085eb601 + .pool thumb_func_end sub_8138B10 thumb_func_start sub_8138B48 sub_8138B48: @ 8138B48 push {lr} - ldr r0, _08138B60 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 bne _08138B6C - ldr r0, _08138B64 - ldr r1, _08138B68 + ldr r0, =0x02021cc4 + ldr r1, =0x085eb60e bl gf_strcpy b _08138B74 .align 2, 0 -_08138B60: .4byte 0x03005d90 -_08138B64: .4byte 0x02021cc4 -_08138B68: .4byte 0x085eb60e + .pool _08138B6C: - ldr r0, _08138B78 - ldr r1, _08138B7C + ldr r0, =0x02021cc4 + ldr r1, =0x085eb60a bl gf_strcpy _08138B74: pop {r0} bx r0 .align 2, 0 -_08138B78: .4byte 0x02021cc4 -_08138B7C: .4byte 0x085eb60a + .pool thumb_func_end sub_8138B48 thumb_func_start sub_8138B80 sub_8138B80: @ 8138B80 - ldr r0, _08138B88 + ldr r0, =0x0202433a ldrb r0, [r0] bx lr .align 2, 0 -_08138B88: .4byte 0x0202433a + .pool thumb_func_end sub_8138B80 thumb_func_start sub_8138B8C sub_8138B8C: @ 8138B8C push {lr} sub sp, 0x4 - ldr r0, _08138BAC + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 beq _08138BB0 @@ -641459,7 +620390,7 @@ sub_8138B8C: @ 8138B8C bl warp1_set b _08138BC2 .align 2, 0 -_08138BAC: .4byte 0x020375e0 + .pool _08138BB0: movs r2, 0x1 negs r2, r2 @@ -641478,26 +620409,26 @@ _08138BC2: thumb_func_start sub_8138BC8 sub_8138BC8: @ 8138BC8 push {lr} - ldr r0, _08138BD8 + ldr r0, =0x020375e0 ldrh r0, [r0] bl flag_set pop {r0} bx r0 .align 2, 0 -_08138BD8: .4byte 0x020375e0 + .pool thumb_func_end sub_8138BC8 thumb_func_start sub_8138BDC sub_8138BDC: @ 8138BDC push {lr} - ldr r0, _08138BFC + ldr r0, =0x03005cf8 movs r1, 0 ldrsh r0, [r0, r1] movs r1, 0x7 bl __divsi3 lsls r0, 16 lsrs r0, 16 - ldr r1, _08138C00 + ldr r1, =0x0000270f cmp r0, r1 bls _08138BF6 adds r0, r1, 0 @@ -641505,8 +620436,7 @@ _08138BF6: pop {r1} bx r1 .align 2, 0 -_08138BFC: .4byte 0x03005cf8 -_08138C00: .4byte 0x0000270f + .pool thumb_func_end sub_8138BDC thumb_func_start sub_8138C04 @@ -641517,7 +620447,7 @@ sub_8138C04: @ 8138C04 lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _08138C28 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x20 @@ -641527,7 +620457,7 @@ sub_8138C04: @ 8138C04 movs r0, 0x6 b _08138C7E .align 2, 0 -_08138C28: .4byte 0x020244ec + .pool _08138C2C: adds r0, r4, 0 movs r1, 0x20 @@ -641579,29 +620509,29 @@ _08138C7E: thumb_func_start sub_8138C84 sub_8138C84: @ 8138C84 push {lr} - ldr r0, _08138C90 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl sub_817018C pop {r0} bx r0 .align 2, 0 -_08138C90: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_8138C84 thumb_func_start sub_8138C94 sub_8138C94: @ 8138C94 push {lr} - ldr r0, _08138CA0 + ldr r0, =sub_8138C84 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_08138CA0: .4byte sub_8138C84 + 1 + .pool thumb_func_end sub_8138C94 thumb_func_start sp0D9_ComputerRelated sp0D9_ComputerRelated: @ 8138CA4 push {r4,lr} - ldr r4, _08138CE0 + ldr r4, =sub_8138CE8 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -641613,7 +620543,7 @@ sp0D9_ComputerRelated: @ 8138CA4 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08138CE4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -641629,8 +620559,7 @@ _08138CD8: pop {r0} bx r0 .align 2, 0 -_08138CE0: .4byte sub_8138CE8 + 1 -_08138CE4: .4byte 0x03005e00 + .pool thumb_func_end sp0D9_ComputerRelated thumb_func_start sub_8138CE8 @@ -641641,7 +620570,7 @@ sub_8138CE8: @ 8138CE8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08138D0C + ldr r0, =0x03005e00 adds r1, r0 movs r2, 0x8 ldrsh r0, [r1, r2] @@ -641653,7 +620582,7 @@ _08138D06: pop {r0} bx r0 .align 2, 0 -_08138D0C: .4byte 0x03005e00 + .pool thumb_func_end sub_8138CE8 thumb_func_start sub_8138D10 @@ -641734,50 +620663,50 @@ sub_8138D88: @ 8138D88 lsls r0, 16 cmp r0, 0 beq _08138DC4 - ldr r0, _08138DA8 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne _08138DAC movs r3, 0x4 b _08138DE6 .align 2, 0 -_08138DA8: .4byte 0x020375e0 + .pool _08138DAC: cmp r0, 0x1 bne _08138DB8 - ldr r3, _08138DB4 + ldr r3, =0x0000025a b _08138DE6 .align 2, 0 -_08138DB4: .4byte 0x0000025a + .pool _08138DB8: cmp r0, 0x2 bne _08138DE6 - ldr r3, _08138DC0 + ldr r3, =0x00000259 b _08138DE6 .align 2, 0 -_08138DC0: .4byte 0x00000259 + .pool _08138DC4: - ldr r0, _08138DD0 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne _08138DD4 movs r3, 0x5 b _08138DE6 .align 2, 0 -_08138DD0: .4byte 0x020375e0 + .pool _08138DD4: cmp r0, 0x1 bne _08138DE0 - ldr r3, _08138DDC + ldr r3, =0x0000027f b _08138DE6 .align 2, 0 -_08138DDC: .4byte 0x0000027f + .pool _08138DE0: cmp r0, 0x2 bne _08138DE6 - ldr r3, _08138E18 + ldr r3, =0x0000027e _08138DE6: - ldr r0, _08138E1C + ldr r0, =0x03005d8c ldr r2, [r0] movs r5, 0 ldrsh r0, [r2, r5] @@ -641801,8 +620730,7 @@ _08138DE6: pop {r0} bx r0 .align 2, 0 -_08138E18: .4byte 0x0000027e -_08138E1C: .4byte 0x03005d8c + .pool thumb_func_end sub_8138D88 thumb_func_start sub_8138E20 @@ -641845,27 +620773,27 @@ _08138E5A: _08138E5C: movs r5, 0xFF _08138E5E: - ldr r0, _08138E6C + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne _08138E70 movs r4, 0x4 b _08138E82 .align 2, 0 -_08138E6C: .4byte 0x020375e0 + .pool _08138E70: cmp r0, 0x1 bne _08138E7C - ldr r4, _08138E78 + ldr r4, =0x0000025a b _08138E82 .align 2, 0 -_08138E78: .4byte 0x0000025a + .pool _08138E7C: cmp r0, 0x2 bne _08138E82 - ldr r4, _08138EB8 + ldr r4, =0x00000259 _08138E82: - ldr r0, _08138EBC + ldr r0, =0x03005d8c ldr r2, [r0] movs r1, 0 ldrsh r0, [r2, r1] @@ -641890,14 +620818,13 @@ _08138E82: pop {r0} bx r0 .align 2, 0 -_08138EB8: .4byte 0x00000259 -_08138EBC: .4byte 0x03005d8c + .pool thumb_func_end sub_8138E2C thumb_func_start sub_8138EC0 sub_8138EC0: @ 8138EC0 push {r4,lr} - ldr r4, _08138EFC + ldr r4, =sub_8138F04 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -641909,7 +620836,7 @@ sub_8138EC0: @ 8138EC0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08138F00 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -641925,8 +620852,7 @@ _08138EF4: pop {r0} bx r0 .align 2, 0 -_08138EFC: .4byte sub_8138F04 + 1 -_08138F00: .4byte 0x03005e00 + .pool thumb_func_end sub_8138EC0 thumb_func_start sub_8138F04 @@ -641937,7 +620863,7 @@ sub_8138F04: @ 8138F04 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08138F28 + ldr r0, =0x03005e00 adds r1, r0 movs r2, 0x8 ldrsh r0, [r1, r2] @@ -641949,7 +620875,7 @@ _08138F22: pop {r0} bx r0 .align 2, 0 -_08138F28: .4byte 0x03005e00 + .pool thumb_func_end sub_8138F04 thumb_func_start sub_8138F2C @@ -641966,20 +620892,19 @@ sub_8138F2C: @ 8138F2C ldrsh r0, [r4, r1] cmp r0, 0 beq _08138F64 - ldr r2, _08138F5C + ldr r2, =0x00000e9d movs r0, 0x12 movs r1, 0x8 bl setmaptile_0 - ldr r2, _08138F60 + ldr r2, =0x00000ea5 movs r0, 0x12 movs r1, 0x9 bl setmaptile_0 b _08138F7A .align 2, 0 -_08138F5C: .4byte 0x00000e9d -_08138F60: .4byte 0x00000ea5 + .pool _08138F64: - ldr r2, _08138FA8 + ldr r2, =0x00000e58 movs r0, 0x12 movs r1, 0x8 bl setmaptile_0 @@ -642011,17 +620936,17 @@ _08138F9A: pop {r0} bx r0 .align 2, 0 -_08138FA8: .4byte 0x00000e58 + .pool thumb_func_end sub_8138F2C thumb_func_start sub_8138FAC sub_8138FAC: @ 8138FAC push {lr} - ldr r2, _08138FCC + ldr r2, =0x00000e9d movs r0, 0x12 movs r1, 0x8 bl setmaptile_0 - ldr r2, _08138FD0 + ldr r2, =0x00000ea5 movs r0, 0x12 movs r1, 0x9 bl setmaptile_0 @@ -642029,36 +620954,33 @@ sub_8138FAC: @ 8138FAC pop {r0} bx r0 .align 2, 0 -_08138FCC: .4byte 0x00000e9d -_08138FD0: .4byte 0x00000ea5 + .pool thumb_func_end sub_8138FAC thumb_func_start sub_8138FD4 sub_8138FD4: @ 8138FD4 push {lr} - ldr r1, _08138FE4 - ldr r0, _08138FE8 + ldr r1, =0x020375e0 + ldr r0, =0x000001f5 strh r0, [r1] bl flag_set pop {r0} bx r0 .align 2, 0 -_08138FE4: .4byte 0x020375e0 -_08138FE8: .4byte 0x000001f5 + .pool thumb_func_end sub_8138FD4 thumb_func_start sub_8138FEC sub_8138FEC: @ 8138FEC push {lr} - ldr r1, _08138FFC - ldr r0, _08139000 + ldr r1, =0x020375e0 + ldr r0, =0x000001f5 strh r0, [r1] bl flag_clear pop {r0} bx r0 .align 2, 0 -_08138FFC: .4byte 0x020375e0 -_08139000: .4byte 0x000001f5 + .pool thumb_func_end sub_8138FEC thumb_func_start sub_8139004 @@ -642069,7 +620991,7 @@ sub_8139004: @ 8139004 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _08139024 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 bl pokemon_getattr @@ -642078,7 +621000,7 @@ sub_8139004: @ 8139004 movs r0, 0x1 b _0813902A .align 2, 0 -_08139024: .4byte 0x020244ec + .pool _08139028: movs r0, 0 _0813902A: @@ -642094,7 +621016,7 @@ sub_8139030: @ 8139030 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _08139050 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 bl pokemon_getattr @@ -642103,7 +621025,7 @@ sub_8139030: @ 8139030 movs r0, 0x1 b _08139056 .align 2, 0 -_08139050: .4byte 0x020244ec + .pool _08139054: movs r0, 0 _08139056: @@ -642119,7 +621041,7 @@ sub_813905C: @ 813905C lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _0813907C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 bl pokemon_getattr @@ -642128,7 +621050,7 @@ sub_813905C: @ 813905C movs r0, 0x1 b _08139082 .align 2, 0 -_0813907C: .4byte 0x020244ec + .pool _08139080: movs r0, 0 _08139082: @@ -642144,7 +621066,7 @@ sub_8139088: @ 8139088 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _081390A8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 bl pokemon_getattr @@ -642153,7 +621075,7 @@ sub_8139088: @ 8139088 movs r0, 0x1 b _081390AE .align 2, 0 -_081390A8: .4byte 0x020244ec + .pool _081390AC: movs r0, 0 _081390AE: @@ -642169,7 +621091,7 @@ sub_81390B4: @ 81390B4 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _081390D4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F bl pokemon_getattr @@ -642178,7 +621100,7 @@ sub_81390B4: @ 81390B4 movs r0, 0x1 b _081390DA .align 2, 0 -_081390D4: .4byte 0x020244ec + .pool _081390D8: movs r0, 0 _081390DA: @@ -642190,12 +621112,12 @@ _081390DA: sub_81390E0: @ 81390E0 push {r4-r6,lr} movs r5, 0 - ldr r6, _08139130 + ldr r6, =0x083203cc _081390E6: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08139134 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -642223,20 +621145,18 @@ _081390E6: cmp r0, 0xC bne _0813913C _08139128: - ldr r1, _08139138 + ldr r1, =0x020375f0 movs r0, 0x1 b _0813914A .align 2, 0 -_08139130: .4byte 0x083203cc -_08139134: .4byte 0x020244ec -_08139138: .4byte 0x020375f0 + .pool _0813913C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 bls _081390E6 - ldr r1, _08139154 + ldr r1, =0x020375f0 movs r0, 0 _0813914A: strh r0, [r1] @@ -642244,14 +621164,14 @@ _0813914A: pop {r0} bx r0 .align 2, 0 -_08139154: .4byte 0x020375f0 + .pool thumb_func_end sub_81390E0 thumb_func_start sub_8139158 sub_8139158: @ 8139158 push {lr} sub sp, 0x8 - ldr r0, _081391A4 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r3, [r0] adds r3, 0x7 @@ -642270,7 +621190,7 @@ sub_8139158: @ 8139158 bl sub_808DC44 lsls r0, 24 lsrs r0, 24 - ldr r2, _081391A8 + ldr r2, =0x02037350 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -642285,8 +621205,7 @@ sub_8139158: @ 8139158 pop {r0} bx r0 .align 2, 0 -_081391A4: .4byte 0x03005d8c -_081391A8: .4byte 0x02037350 + .pool thumb_func_end sub_8139158 thumb_func_start sp114_080CAA88 @@ -642296,7 +621215,7 @@ sp114_080CAA88: @ 81391AC lsls r0, 24 lsrs r0, 24 bl sub_808EEA8 - ldr r0, _081391CC + ldr r0, =0x03005d8c ldr r0, [r0] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -642305,7 +621224,7 @@ sp114_080CAA88: @ 81391AC pop {r0} bx r0 .align 2, 0 -_081391CC: .4byte 0x03005d8c + .pool thumb_func_end sp114_080CAA88 thumb_func_start sub_81391D0 @@ -642316,27 +621235,26 @@ sub_81391D0: @ 81391D0 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _081391F8 + ldr r1, =0x020244ec adds r0, r1 bl get_nature lsls r0, 24 lsrs r0, 24 - ldr r1, _081391FC + ldr r1, =0x02021cc4 bl sub_8137068 lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_081391F8: .4byte 0x020244ec -_081391FC: .4byte 0x02021cc4 + .pool thumb_func_end sub_81391D0 thumb_func_start sub_8139200 sub_8139200: @ 8139200 push {r4,lr} - ldr r4, _08139220 - ldr r0, _08139224 + ldr r4, =0x02021cc4 + ldr r0, =0x00004026 bl var_get adds r1, r0, 0 lsls r1, 16 @@ -642348,8 +621266,7 @@ sub_8139200: @ 8139200 pop {r0} bx r0 .align 2, 0 -_08139220: .4byte 0x02021cc4 -_08139224: .4byte 0x00004026 + .pool thumb_func_end sub_8139200 thumb_func_start sub_8139228 @@ -642366,30 +621283,30 @@ sub_8139228: @ 8139228 thumb_func_start sub_8139238 sub_8139238: @ 8139238 push {lr} - ldr r0, _08139244 + ldr r0, =0x02021cc4 bl sub_8165284 pop {r0} bx r0 .align 2, 0 -_08139244: .4byte 0x02021cc4 + .pool thumb_func_end sub_8139238 thumb_func_start sub_8139248 sub_8139248: @ 8139248 push {r4,r5,lr} - ldr r0, _0813927C + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r1, _08139280 + ldr r1, =0x00002e68 adds r0, r2, r1 ldrb r1, [r0] lsls r1, 25 - ldr r0, _08139284 + ldr r0, =0x00002e6a adds r2, r0 lsrs r1, 25 ldrh r2, [r2] adds r1, r2 - ldr r2, _08139288 - ldr r0, _0813928C + ldr r2, =0x085b2b88 + ldr r0, =0x020375e0 ldrh r0, [r0] adds r0, r2 ldrb r0, [r0] @@ -642399,17 +621316,12 @@ sub_8139248: @ 8139248 lsls r0, 24 cmp r0, 0 bne _08139294 - ldr r4, _08139290 + ldr r4, =0x085b2b94 b _08139296 .align 2, 0 -_0813927C: .4byte 0x03005d8c -_08139280: .4byte 0x00002e68 -_08139284: .4byte 0x00002e6a -_08139288: .4byte 0x085b2b88 -_0813928C: .4byte 0x020375e0 -_08139290: .4byte 0x085b2b94 + .pool _08139294: - ldr r4, _081392A8 + ldr r4, =0x085b2ba0 _08139296: adds r0, r5, 0 movs r1, 0xC @@ -642420,14 +621332,14 @@ _08139296: pop {r1} bx r1 .align 2, 0 -_081392A8: .4byte 0x085b2ba0 + .pool thumb_func_end sub_8139248 thumb_func_start sub_81392AC sub_81392AC: @ 81392AC push {lr} - ldr r1, _081392C4 - ldr r0, _081392C8 + ldr r1, =0x020375e0 + ldr r0, =0x00000213 strh r0, [r1] bl flag_check lsls r0, 24 @@ -642436,8 +621348,7 @@ sub_81392AC: @ 81392AC movs r0, 0x1 b _081392CE .align 2, 0 -_081392C4: .4byte 0x020375e0 -_081392C8: .4byte 0x00000213 + .pool _081392CC: movs r0, 0 _081392CE: @@ -642448,7 +621359,7 @@ _081392CE: thumb_func_start sub_81392D4 sub_81392D4: @ 81392D4 push {lr} - ldr r1, _081392EC + ldr r1, =0x020375e0 movs r0, 0x85 lsls r0, 2 strh r0, [r1] @@ -642459,7 +621370,7 @@ sub_81392D4: @ 81392D4 movs r0, 0x1 b _081392F2 .align 2, 0 -_081392EC: .4byte 0x020375e0 + .pool _081392F0: movs r0, 0 _081392F2: @@ -642470,8 +621381,8 @@ _081392F2: thumb_func_start sub_81392F8 sub_81392F8: @ 81392F8 push {lr} - ldr r1, _08139310 - ldr r0, _08139314 + ldr r1, =0x020375e0 + ldr r0, =0x00000215 strh r0, [r1] bl flag_check lsls r0, 24 @@ -642480,8 +621391,7 @@ sub_81392F8: @ 81392F8 movs r0, 0x1 b _0813931A .align 2, 0 -_08139310: .4byte 0x020375e0 -_08139314: .4byte 0x00000215 + .pool _08139318: movs r0, 0 _0813931A: @@ -642492,8 +621402,8 @@ _0813931A: thumb_func_start sub_8139320 sub_8139320: @ 8139320 push {lr} - ldr r1, _08139338 - ldr r0, _0813933C + ldr r1, =0x020375e0 + ldr r0, =0x00000216 strh r0, [r1] bl flag_check lsls r0, 24 @@ -642502,8 +621412,7 @@ sub_8139320: @ 8139320 movs r0, 0x1 b _08139342 .align 2, 0 -_08139338: .4byte 0x020375e0 -_0813933C: .4byte 0x00000216 + .pool _08139340: movs r0, 0 _08139342: @@ -642519,7 +621428,7 @@ sub_8139348: @ 8139348 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _0813936C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x47 movs r2, 0 @@ -642529,7 +621438,7 @@ sub_8139348: @ 8139348 pop {r1} bx r1 .align 2, 0 -_0813936C: .4byte 0x020244ec + .pool thumb_func_end sub_8139348 thumb_func_start sub_8139370 @@ -642538,7 +621447,7 @@ sub_8139370: @ 8139370 sub sp, 0x4 movs r0, 0x2A bl sav12_xor_increment - ldr r0, _081393C0 + ldr r0, =0x0000089b bl flag_set movs r1, 0x1 mov r0, sp @@ -642548,7 +621457,7 @@ sub_8139370: @ 8139370 lsrs r0, 24 movs r1, 0x64 muls r1, r0 - ldr r0, _081393C4 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x47 @@ -642569,8 +621478,7 @@ _081393B6: pop {r0} bx r0 .align 2, 0 -_081393C0: .4byte 0x0000089b -_081393C4: .4byte 0x020244ec + .pool thumb_func_end sub_8139370 thumb_func_start sub_81393C8 @@ -642581,18 +621489,17 @@ sub_81393C8: @ 81393C8 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _081393EC + ldr r1, =0x020244ec adds r0, r1 bl sub_806DC8C lsls r0, 16 - ldr r1, _081393F0 + ldr r1, =0x01fd0000 cmp r0, r1 bhi _081393F4 movs r0, 0 b _081393F6 .align 2, 0 -_081393EC: .4byte 0x020244ec -_081393F0: .4byte 0x01fd0000 + .pool _081393F4: movs r0, 0x1 _081393F6: @@ -642608,7 +621515,7 @@ sub_81393FC: @ 81393FC lsls r0, 24 cmp r0, 0 bne _08139454 - ldr r0, _0813942C + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0x83 @@ -642620,12 +621527,11 @@ sub_81393FC: @ 81393FC lsls r0, 24 cmp r0, 0 beq _08139434 - ldr r0, _08139430 + ldr r0, =0x0000409a movs r1, 0x4 b _08139446 .align 2, 0 -_0813942C: .4byte 0x03005d8c -_08139430: .4byte 0x0000409a + .pool _08139434: movs r0, 0xE9 lsls r0, 2 @@ -642633,14 +621539,14 @@ _08139434: lsls r0, 24 cmp r0, 0 beq _08139454 - ldr r0, _08139450 + ldr r0, =0x0000409a movs r1, 0x5 _08139446: bl var_set movs r0, 0x1 b _08139456 .align 2, 0 -_08139450: .4byte 0x0000409a + .pool _08139454: movs r0, 0 _08139456: @@ -642651,19 +621557,19 @@ _08139456: thumb_func_start sub_813945C sub_813945C: @ 813945C push {lr} - ldr r0, _08139468 + ldr r0, =0x000008bf bl flag_set pop {r0} bx r0 .align 2, 0 -_08139468: .4byte 0x000008bf + .pool thumb_func_end sub_813945C thumb_func_start sub_813946C sub_813946C: @ 813946C push {r4,r5,lr} sub sp, 0x14 - ldr r5, _081394D4 + ldr r5, =0x020244ec movs r1, 0x90 lsls r1, 1 movs r4, 0 @@ -642708,13 +621614,13 @@ sub_813946C: @ 813946C pop {r0} bx r0 .align 2, 0 -_081394D4: .4byte 0x020244ec + .pool thumb_func_end sub_813946C thumb_func_start sub_81394D8 sub_81394D8: @ 81394D8 push {r4-r6,lr} - ldr r0, _08139514 + ldr r0, =0x00004023 bl var_get lsls r0, 16 lsrs r0, 16 @@ -642730,7 +621636,7 @@ sub_81394D8: @ 81394D8 _081394FA: movs r0, 0x64 muls r0, r4 - ldr r1, _08139518 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x41 movs r2, 0 @@ -642740,8 +621646,7 @@ _081394FA: movs r0, 0x1 b _08139528 .align 2, 0 -_08139514: .4byte 0x00004023 -_08139518: .4byte 0x020244ec + .pool _0813951C: adds r0, r4, 0x1 lsls r0, 24 @@ -642769,7 +621674,7 @@ sub_8139530: @ 8139530 thumb_func_start sub_8139540 sub_8139540: @ 8139540 push {lr} - ldr r0, _08139554 + ldr r0, =0x020244ec movs r1, 0x3F bl sub_806DD7C lsls r0, 24 @@ -642778,7 +621683,7 @@ sub_8139540: @ 8139540 movs r0, 0x1 b _0813955A .align 2, 0 -_08139554: .4byte 0x020244ec + .pool _08139558: movs r0, 0 _0813955A: @@ -642789,28 +621694,28 @@ _0813955A: thumb_func_start sub_8139560 sub_8139560: @ 8139560 push {lr} - ldr r0, _081395A4 + ldr r0, =sub_81395BC + 1 movs r1, 0x9 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081395A8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _081395AC + ldr r0, =0x020375e2 ldrh r0, [r0] movs r2, 0 strh r0, [r1, 0x8] strh r2, [r1, 0xA] - ldr r0, _081395B0 + ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r1, 0xC] - ldr r0, _081395B4 + ldr r0, =0x020375e6 ldrh r0, [r0] strh r0, [r1, 0xE] - ldr r0, _081395B8 + ldr r0, =0x020375e0 ldrh r0, [r0] strh r0, [r1, 0x10] movs r0, 0 @@ -642820,12 +621725,7 @@ sub_8139560: @ 8139560 pop {r0} bx r0 .align 2, 0 -_081395A4: .4byte sub_81395BC + 1 -_081395A8: .4byte 0x03005e00 -_081395AC: .4byte 0x020375e2 -_081395B0: .4byte 0x020375e4 -_081395B4: .4byte 0x020375e6 -_081395B8: .4byte 0x020375e0 + .pool thumb_func_end sub_8139560 thumb_func_start sub_81395BC @@ -642836,7 +621736,7 @@ sub_81395BC: @ 81395BC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0813961C + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4, 0x2] adds r0, 0x1 @@ -642875,7 +621775,7 @@ _08139614: pop {r0} bx r0 .align 2, 0 -_0813961C: .4byte 0x03005e08 + .pool thumb_func_end sub_81395BC thumb_func_start sub_8139620 @@ -642950,7 +621850,7 @@ _08139698: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081396C8 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x41 @@ -642969,7 +621869,7 @@ _08139698: adds r0, r5, 0 b _081396D8 .align 2, 0 -_081396C8: .4byte 0x020244ec + .pool _081396CC: adds r0, r5, 0x1 lsls r0, 24 @@ -642987,11 +621887,11 @@ _081396D8: thumb_func_start sub_81396E0 sub_81396E0: @ 81396E0 push {lr} - ldr r0, _08139700 + ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08139704 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x41 movs r2, 0 @@ -643001,8 +621901,7 @@ sub_81396E0: @ 81396E0 pop {r1} bx r1 .align 2, 0 -_08139700: .4byte 0x020375e0 -_08139704: .4byte 0x020244ec + .pool thumb_func_end sub_81396E0 thumb_func_start nullsub_54 @@ -643013,12 +621912,12 @@ nullsub_54: @ 8139708 thumb_func_start sub_813970C sub_813970C: @ 813970C push {r4,lr} - ldr r0, _0813972C + ldr r0, =0x000040c2 bl var_get lsls r0, 16 lsrs r0, 16 adds r3, r0, 0 - ldr r2, _08139730 + ldr r2, =0x03005cf8 movs r1, 0 ldrsh r0, [r2, r1] subs r0, r3 @@ -643027,8 +621926,7 @@ sub_813970C: @ 813970C movs r0, 0 b _0813974C .align 2, 0 -_0813972C: .4byte 0x000040c2 -_08139730: .4byte 0x03005cf8 + .pool _08139734: ldrh r1, [r2] movs r4, 0 @@ -643052,8 +621950,8 @@ _0813974C: thumb_func_start sub_8139754 sub_8139754: @ 8139754 push {r4,lr} - ldr r0, _08139768 - ldr r4, _0813976C + ldr r0, =0x000040c2 + ldr r4, =0x03005cf8 ldrh r1, [r4] bl var_set ldrh r0, [r4] @@ -643061,18 +621959,17 @@ sub_8139754: @ 8139754 pop {r1} bx r1 .align 2, 0 -_08139768: .4byte 0x000040c2 -_0813976C: .4byte 0x03005cf8 + .pool thumb_func_end sub_8139754 thumb_func_start sub_8139770 sub_8139770: @ 8139770 push {r4-r6,lr} - ldr r6, _081397AC + ldr r6, =0x020375e0 ldrh r0, [r6] movs r5, 0x64 muls r0, r5 - ldr r4, _081397B0 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x3 bl pokemon_getattr @@ -643081,11 +621978,11 @@ sub_8139770: @ 8139770 ldrh r0, [r6] muls r0, r5 adds r0, r4 - ldr r4, _081397B4 + ldr r4, =0x02021cc4 movs r1, 0x7 adds r2, r4, 0 bl pokemon_getattr - ldr r0, _081397B8 + ldr r0, =0x03005d90 ldr r0, [r0] adds r1, r4, 0 bl sub_8008C44 @@ -643095,10 +621992,7 @@ _081397A6: movs r0, 0x1 b _081397BE .align 2, 0 -_081397AC: .4byte 0x020375e0 -_081397B0: .4byte 0x020244ec -_081397B4: .4byte 0x02021cc4 -_081397B8: .4byte 0x03005d90 + .pool _081397BC: movs r0, 0 _081397BE: @@ -643110,44 +622004,42 @@ _081397BE: thumb_func_start sub_81397C4 sub_81397C4: @ 81397C4 push {r4,r5,lr} - ldr r2, _081397D8 + ldr r2, =0x020375f0 ldrh r1, [r2] - ldr r0, _081397DC + ldr r0, =0x0000270f cmp r1, r0 bls _081397E0 movs r0, 0 bl sub_80EF340 b _08139862 .align 2, 0 -_081397D8: .4byte 0x020375f0 -_081397DC: .4byte 0x0000270f + .pool _081397E0: - ldr r0, _081397F0 + ldr r0, =0x000003e7 cmp r1, r0 bls _081397F8 - ldr r4, _081397F4 + ldr r4, =0x02021cc4 movs r0, 0xA1 strb r0, [r4] adds r4, 0x1 b _0813981C .align 2, 0 -_081397F0: .4byte 0x000003e7 -_081397F4: .4byte 0x02021cc4 + .pool _081397F8: cmp r1, 0x63 bls _0813980C - ldr r4, _08139808 + ldr r4, =0x02021cc4 movs r0, 0xA1 strb r0, [r4] strb r0, [r4, 0x1] adds r4, 0x2 b _0813981C .align 2, 0 -_08139808: .4byte 0x02021cc4 + .pool _0813980C: cmp r1, 0x9 bls _0813983C - ldr r4, _08139838 + ldr r4, =0x02021cc4 movs r0, 0xA1 strb r0, [r4] strb r0, [r4, 0x1] @@ -643166,9 +622058,9 @@ _0813981C: bl decimal_int_to_string b _08139862 .align 2, 0 -_08139838: .4byte 0x02021cc4 + .pool _0813983C: - ldr r4, _08139868 + ldr r4, =0x02021cc4 movs r0, 0xA1 strb r0, [r4] strb r0, [r4, 0x1] @@ -643190,24 +622082,23 @@ _08139862: pop {r0} bx r0 .align 2, 0 -_08139868: .4byte 0x02021cc4 + .pool thumb_func_end sub_81397C4 thumb_func_start sub_813986C sub_813986C: @ 813986C push {lr} - ldr r0, _08139880 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x4 bhi _081398B8 lsls r0, 2 - ldr r1, _08139884 + ldr r1, =_08139888 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08139880: .4byte 0x020375f0 -_08139884: .4byte _08139888 + .pool .align 2, 0 _08139888: .4byte _0813989C @@ -643244,8 +622135,8 @@ _081398BA: thumb_func_start sub_81398C0 sub_81398C0: @ 81398C0 push {r4,lr} - ldr r1, _081398D8 - ldr r2, _081398DC + ldr r1, =0x020375e0 + ldr r2, =0xfffffedf adds r0, r2, 0 ldrh r2, [r1] adds r0, r2 @@ -643256,17 +622147,16 @@ sub_81398C0: @ 81398C0 movs r0, 0 b _081398FC .align 2, 0 -_081398D8: .4byte 0x020375e0 -_081398DC: .4byte 0xfffffedf + .pool _081398E0: - ldr r4, _08139904 + ldr r4, =0x02021dc4 ldrh r0, [r1] bl sub_81B6CFC lsls r0, 16 lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _08139908 + ldr r0, =0x0831977c adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -643276,8 +622166,7 @@ _081398FC: pop {r1} bx r1 .align 2, 0 -_08139904: .4byte 0x02021dc4 -_08139908: .4byte 0x0831977c + .pool thumb_func_end sub_81398C0 thumb_func_start sub_813990C @@ -643292,7 +622181,7 @@ sub_813990C: @ 813990C _0813991C: movs r0, 0x64 muls r0, r4 - ldr r1, _08139934 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x4 bl pokemon_getattr @@ -643301,7 +622190,7 @@ _0813991C: movs r0, 0x1 b _08139944 .align 2, 0 -_08139934: .4byte 0x020244ec + .pool _08139938: adds r0, r4, 0x1 lsls r0, 24 @@ -643319,13 +622208,13 @@ _08139944: thumb_func_start sub_813994C sub_813994C: @ 813994C push {lr} - ldr r0, _0813996C + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _08139970 + ldr r0, =0x00000f1a cmp r1, r0 bne _08139978 - ldr r0, _08139974 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 @@ -643334,9 +622223,7 @@ sub_813994C: @ 813994C movs r0, 0x1 b _0813997A .align 2, 0 -_0813996C: .4byte 0x03005d8c -_08139970: .4byte 0x00000f1a -_08139974: .4byte 0x000040ce + .pool _08139978: movs r0, 0 _0813997A: @@ -643359,7 +622246,7 @@ sub_8139980: @ 8139980 thumb_func_start sub_8139994 sub_8139994: @ 8139994 push {lr} - ldr r0, _081399B0 + ldr r0, =0x03005d8c ldr r0, [r0] ldrb r0, [r0, 0x15] subs r0, 0x10 @@ -643368,13 +622255,12 @@ sub_8139994: @ 8139994 cmp r0, 0x5 bhi _081399E4 lsls r0, 2 - ldr r1, _081399B4 + ldr r1, =_081399B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081399B0: .4byte 0x03005d8c -_081399B4: .4byte _081399B8 + .pool .align 2, 0 _081399B8: .4byte _081399E4 @@ -643401,23 +622287,23 @@ _081399E0: _081399E4: movs r1, 0x4 _081399E6: - ldr r0, _081399F0 + ldr r0, =0x00004043 bl var_set pop {r0} bx r0 .align 2, 0 -_081399F0: .4byte 0x00004043 + .pool thumb_func_end sub_8139994 thumb_func_start sub_81399F4 sub_81399F4: @ 81399F4 push {r4,lr} - ldr r2, _08139A24 + ldr r2, =0x0203ab60 movs r0, 0 strh r0, [r2] - ldr r1, _08139A28 + ldr r1, =0x0203ab62 strh r0, [r1] - ldr r0, _08139A2C + ldr r0, =0x03005d8c ldr r3, [r0] movs r0, 0x14 ldrsb r0, [r3, r0] @@ -643431,15 +622317,12 @@ sub_81399F4: @ 81399F4 cmp r0, 0x4 bhi _08139A6E lsls r0, 2 - ldr r1, _08139A30 + ldr r1, =_08139A34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08139A24: .4byte 0x0203ab60 -_08139A28: .4byte 0x0203ab62 -_08139A2C: .4byte 0x03005d8c -_08139A30: .4byte _08139A34 + .pool .align 2, 0 _08139A34: .4byte _08139A66 @@ -643482,7 +622365,7 @@ _08139A6E: thumb_func_start sub_8139A78 sub_8139A78: @ 8139A78 push {r4-r6,lr} - ldr r0, _08139AB0 + ldr r0, =sub_8139AF4 + 1 movs r1, 0x9 bl AddTask lsls r0, 24 @@ -643490,15 +622373,15 @@ sub_8139A78: @ 8139A78 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08139AB4 + ldr r0, =0x03005e08 adds r4, r1, r0 movs r3, 0 strh r3, [r4, 0x2] strh r3, [r4, 0x4] movs r6, 0x1 strh r6, [r4, 0x8] - ldr r0, _08139AB8 - ldr r1, _08139ABC + ldr r0, =0x020375e2 + ldr r1, =0x020375e4 ldrh r2, [r0] ldrh r0, [r1] cmp r2, r0 @@ -643509,10 +622392,7 @@ sub_8139A78: @ 8139A78 strh r6, [r4, 0xC] b _08139AC8 .align 2, 0 -_08139AB0: .4byte sub_8139AF4 + 1 -_08139AB4: .4byte 0x03005e08 -_08139AB8: .4byte 0x020375e2 -_08139ABC: .4byte 0x020375e4 + .pool _08139AC0: subs r0, r2 lsls r0, 16 @@ -643523,7 +622403,7 @@ _08139AC8: bls _08139ACE movs r5, 0x8 _08139ACE: - ldr r0, _08139AF0 + ldr r0, =0x085b2c18 adds r0, r5, r0 ldrb r0, [r0] strh r0, [r4, 0xA] @@ -643538,7 +622418,7 @@ _08139ACE: pop {r0} bx r0 .align 2, 0 -_08139AF0: .4byte 0x085b2c18 + .pool thumb_func_end sub_8139A78 thumb_func_start sub_8139AF4 @@ -643549,7 +622429,7 @@ sub_8139AF4: @ 8139AF4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08139B5C + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4, 0x2] adds r0, 0x1 @@ -643590,7 +622470,7 @@ _08139B54: pop {r0} bx r0 .align 2, 0 -_08139B5C: .4byte 0x03005e08 + .pool thumb_func_end sub_8139AF4 thumb_func_start sub_8139B60 @@ -643600,14 +622480,14 @@ sub_8139B60: @ 8139B60 mov r5, r8 push {r5,r6} sub sp, 0xC - ldr r5, _08139BFC - ldr r0, _08139C00 + ldr r5, =0x0203ab5e + ldr r0, =0x085b2bac bl Window_AddFromTemplate strb r0, [r5] ldrb r0, [r5] movs r1, 0 bl SetStandardWindowBorderStyle - ldr r4, _08139C04 + ldr r4, =0x085eb6a5 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x40 @@ -643627,8 +622507,8 @@ sub_8139B60: @ 8139B60 movs r1, 0x1 adds r2, r4, 0 bl Print - ldr r6, _08139C08 - ldr r4, _08139C0C + ldr r6, =0x085b2bb4 + ldr r4, =0x020375e2 ldrh r0, [r4] lsls r0, 2 adds r0, r6 @@ -643665,17 +622545,13 @@ sub_8139B60: @ 8139B60 pop {r0} bx r0 .align 2, 0 -_08139BFC: .4byte 0x0203ab5e -_08139C00: .4byte 0x085b2bac -_08139C04: .4byte 0x085eb6a5 -_08139C08: .4byte 0x085b2bb4 -_08139C0C: .4byte 0x020375e2 + .pool thumb_func_end sub_8139B60 thumb_func_start sub_8139C10 sub_8139C10: @ 8139C10 push {r4,lr} - ldr r4, _08139C28 + ldr r4, =0x0203ab5e ldrb r0, [r4] movs r1, 0x1 bl sub_8198070 @@ -643685,7 +622561,7 @@ sub_8139C10: @ 8139C10 pop {r0} bx r0 .align 2, 0 -_08139C28: .4byte 0x0203ab5e + .pool thumb_func_end sub_8139C10 thumb_func_start sub_8139C2C @@ -643695,7 +622571,7 @@ sub_8139C2C: @ 8139C2C lsrs r6, r0, 16 lsls r1, 24 lsrs r5, r1, 24 - ldr r4, _08139C74 + ldr r4, =sub_8139C80 + 1 adds r0, r4, 0 bl is_function_an_active_task lsls r0, 24 @@ -643707,7 +622583,7 @@ sub_8139C2C: @ 8139C2C bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08139C78 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -643716,7 +622592,7 @@ sub_8139C2C: @ 8139C2C strh r0, [r1, 0x8] strh r0, [r1, 0xA] strh r5, [r1, 0xC] - ldr r0, _08139C7C + ldr r0, =0x085b2c21 adds r0, r6, r0 ldrb r0, [r0] strh r0, [r1, 0xE] @@ -643725,9 +622601,7 @@ _08139C6C: pop {r0} bx r0 .align 2, 0 -_08139C74: .4byte sub_8139C80 + 1 -_08139C78: .4byte 0x03005e00 -_08139C7C: .4byte 0x085b2c21 + .pool thumb_func_end sub_8139C2C thumb_func_start sub_8139C80 @@ -643745,7 +622619,7 @@ sub_8139C80: @ 8139C80 ldr r1, [sp] adds r0, r1 lsls r0, 3 - ldr r1, _08139D08 + ldr r1, =0x03005e08 adds r6, r0, r1 movs r2, 0x2 ldrsh r0, [r6, r2] @@ -643759,7 +622633,7 @@ sub_8139C80: @ 8139C80 cmp r0, 0 bne _08139D10 movs r1, 0 - ldr r2, _08139D0C + ldr r2, =0x085b2bf4 mov r10, r2 _08139CBA: movs r5, 0 @@ -643801,11 +622675,10 @@ _08139CCA: bls _08139CBA b _08139D62 .align 2, 0 -_08139D08: .4byte 0x03005e08 -_08139D0C: .4byte 0x085b2bf4 + .pool _08139D10: movs r1, 0 - ldr r0, _08139D94 + ldr r0, =0x085b2c06 mov r10, r0 _08139D16: movs r5, 0 @@ -643870,18 +622743,18 @@ _08139D7C: pop {r0} bx r0 .align 2, 0 -_08139D94: .4byte 0x085b2c06 + .pool thumb_func_end sub_8139C80 thumb_func_start sub_8139D98 sub_8139D98: @ 8139D98 push {r4-r7,lr} sub sp, 0x18 - ldr r6, _08139E40 + ldr r6, =0x020375e0 ldrh r0, [r6] movs r5, 0x64 muls r0, r5 - ldr r4, _08139E44 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x27 bl pokemon_getattr @@ -643916,7 +622789,7 @@ sub_8139D98: @ 8139D98 movs r1, 0x2C bl pokemon_getattr str r0, [sp, 0x14] - ldr r1, _08139E48 + ldr r1, =0x020375e2 movs r0, 0 strh r0, [r1] movs r4, 0 @@ -643933,10 +622806,10 @@ _08139E00: lsrs r4, r0, 24 cmp r4, 0x5 bls _08139E00 - ldr r2, _08139E4C + ldr r2, =0x020375e4 movs r0, 0 strh r0, [r2] - ldr r1, _08139E50 + ldr r1, =0x020375e6 ldr r0, [sp] strh r0, [r1] movs r4, 0x1 @@ -643956,11 +622829,7 @@ _08139E28: strh r4, [r6] b _08139E6C .align 2, 0 -_08139E40: .4byte 0x020375e0 -_08139E44: .4byte 0x020244ec -_08139E48: .4byte 0x020375e2 -_08139E4C: .4byte 0x020375e4 -_08139E50: .4byte 0x020375e6 + .pool _08139E54: cmp r1, r0 bne _08139E6E @@ -643990,7 +622859,7 @@ _08139E6E: thumb_func_start warp0_in_pokecenter warp0_in_pokecenter: @ 8139E80 push {r4,lr} - ldr r0, _08139EB0 + ldr r0, =0x020322dc movs r1, 0 ldrsb r1, [r0, r1] lsls r1, 8 @@ -644000,9 +622869,9 @@ warp0_in_pokecenter: @ 8139E80 adds r0, r1 lsls r0, 16 lsrs r3, r0, 16 - ldr r2, _08139EB4 + ldr r2, =0x085b2c2a ldrh r0, [r2] - ldr r1, _08139EB8 + ldr r1, =0x0000ffff cmp r0, r1 beq _08139EC6 adds r4, r1, 0 @@ -644014,9 +622883,7 @@ _08139EA4: movs r0, 0x1 b _08139EC8 .align 2, 0 -_08139EB0: .4byte 0x020322dc -_08139EB4: .4byte 0x085b2c2a -_08139EB8: .4byte 0x0000ffff + .pool _08139EBC: adds r1, 0x2 adds r2, 0x2 @@ -644034,17 +622901,16 @@ _08139EC8: thumb_func_start sub_8139ED0 sub_8139ED0: @ 8139ED0 push {lr} - ldr r0, _08139EE4 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _08139EE8 + ldr r0, =0x00003c1a cmp r1, r0 beq _08139EEC movs r0, 0x1 b _08139EEE .align 2, 0 -_08139EE4: .4byte 0x03005d8c -_08139EE8: .4byte 0x00003c1a + .pool _08139EEC: movs r0, 0 _08139EEE: @@ -644058,7 +622924,7 @@ sub_8139EF4: @ 8139EF4 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _08139F1C + ldr r0, =0x0000402f bl var_get_pointer adds r5, r0, 0 ldrh r0, [r5] @@ -644072,14 +622938,14 @@ sub_8139EF4: @ 8139EF4 pop {r0} bx r0 .align 2, 0 -_08139F1C: .4byte 0x0000402f + .pool thumb_func_end sub_8139EF4 thumb_func_start sub_8139F20 sub_8139F20: @ 8139F20 push {r4-r7,lr} movs r4, 0 - ldr r0, _08139F40 + ldr r0, =0x0000402f bl var_get lsls r0, 16 lsrs r6, r0, 16 @@ -644088,14 +622954,13 @@ sub_8139F20: @ 8139F20 b _0813A03A _08139F34: lsls r0, r6, 2 - ldr r1, _08139F44 + ldr r1, =_08139F48 adds r1, r0, r1 ldr r1, [r1] adds r2, r0, 0 mov pc, r1 .align 2, 0 -_08139F40: .4byte 0x0000402f -_08139F44: .4byte _08139F48 + .pool .align 2, 0 _08139F48: .4byte _08139F70 @@ -644109,13 +622974,13 @@ _08139F48: .4byte _08139FFC .4byte _0813A014 _08139F70: - ldr r0, _08139F8C + ldr r0, =0x03005d90 ldr r0, [r0] movs r3, 0xCE lsls r3, 4 adds r1, r0, r3 adds r3, r1, r2 - ldr r1, _08139F90 + ldr r1, =0x00000ce2 adds r0, r1 adds r1, r0, r2 ldrh r0, [r3] @@ -644124,12 +622989,11 @@ _08139F70: bcs _0813A028 b _0813A038 .align 2, 0 -_08139F8C: .4byte 0x03005d90 -_08139F90: .4byte 0x00000ce2 + .pool _08139F94: - ldr r0, _08139FAC + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r3, _08139FB0 + ldr r3, =0x00000d0c adds r2, r0, r3 adds r3, 0x2 _08139F9E: @@ -644140,58 +623004,49 @@ _08139F9E: bcs _0813A028 b _0813A038 .align 2, 0 -_08139FAC: .4byte 0x03005d90 -_08139FB0: .4byte 0x00000d0c + .pool _08139FB4: - ldr r0, _08139FC0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08139FC4 + ldr r1, =0x00000de2 adds r2, r0, r1 - ldr r3, _08139FC8 + ldr r3, =0x00000de4 b _08139F9E .align 2, 0 -_08139FC0: .4byte 0x03005d90 -_08139FC4: .4byte 0x00000de2 -_08139FC8: .4byte 0x00000de4 + .pool _08139FCC: - ldr r0, _08139FD8 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08139FDC + ldr r1, =0x00000dc8 adds r2, r0, r1 - ldr r3, _08139FE0 + ldr r3, =0x00000dca b _08139F9E .align 2, 0 -_08139FD8: .4byte 0x03005d90 -_08139FDC: .4byte 0x00000dc8 -_08139FE0: .4byte 0x00000dca + .pool _08139FE4: - ldr r0, _08139FF0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08139FF4 + ldr r1, =0x00000dda adds r2, r0, r1 - ldr r3, _08139FF8 + ldr r3, =0x00000ddc b _08139F9E .align 2, 0 -_08139FF0: .4byte 0x03005d90 -_08139FF4: .4byte 0x00000dda -_08139FF8: .4byte 0x00000ddc + .pool _08139FFC: - ldr r0, _0813A008 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0813A00C + ldr r1, =0x00000e04 adds r2, r0, r1 - ldr r3, _0813A010 + ldr r3, =0x00000e06 b _08139F9E .align 2, 0 -_0813A008: .4byte 0x03005d90 -_0813A00C: .4byte 0x00000e04 -_0813A010: .4byte 0x00000e06 + .pool _0813A014: - ldr r0, _0813A02C + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0813A030 + ldr r1, =0x00000e1a adds r2, r0, r1 - ldr r3, _0813A034 + ldr r3, =0x00000e1c adds r1, r0, r3 ldrh r0, [r2] ldrh r3, [r1] @@ -644201,19 +623056,17 @@ _0813A028: adds r4, r0, 0 b _0813A03A .align 2, 0 -_0813A02C: .4byte 0x03005d90 -_0813A030: .4byte 0x00000e1a -_0813A034: .4byte 0x00000e1c + .pool _0813A038: ldrh r4, [r1] _0813A03A: movs r2, 0 - ldr r5, _0813A078 + ldr r5, =0x085b2cc8 lsls r0, r6, 1 adds r1, r0, r5 ldrb r1, [r1] adds r3, r0, 0 - ldr r7, _0813A07C + ldr r7, =0x085b2c50 cmp r1, r4 bcs _0813A062 adds r1, r3, 0 @@ -644239,20 +623092,19 @@ _0813A062: pop {r0} bx r0 .align 2, 0 -_0813A078: .4byte 0x085b2cc8 -_0813A07C: .4byte 0x085b2c50 + .pool thumb_func_end sub_8139F20 thumb_func_start sub_813A080 sub_813A080: @ 813A080 push {r4-r7,lr} - ldr r0, _0813A0BC + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _0813A0C0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0813A0C4 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 @@ -644265,19 +623117,15 @@ sub_813A080: @ 813A080 lsls r0, 24 cmp r0, 0 bne _0813A0D8 - ldr r1, _0813A0C8 + ldr r1, =0x020375e2 movs r0, 0x5 strh r0, [r1] - ldr r1, _0813A0CC + ldr r1, =0x020375e4 movs r0, 0x4 strh r0, [r1] b _0813A110 .align 2, 0 -_0813A0BC: .4byte 0x000040ce -_0813A0C0: .4byte 0x03005d90 -_0813A0C4: .4byte 0x00000ca9 -_0813A0C8: .4byte 0x020375e2 -_0813A0CC: .4byte 0x020375e4 + .pool _0813A0D0: movs r0, 0x4 strh r0, [r6] @@ -644285,12 +623133,12 @@ _0813A0D0: b _0813A10E _0813A0D8: movs r3, 0 - ldr r6, _0813A118 - ldr r7, _0813A11C + ldr r6, =0x020375e2 + ldr r7, =0x020375e4 lsls r1, r4, 1 lsls r2, r5, 2 - ldr r4, _0813A120 - ldr r0, _0813A124 + ldr r4, =0x085b2cdc + ldr r0, =0x03005d90 ldr r0, [r0] adds r1, r2 movs r2, 0xCE @@ -644319,16 +623167,13 @@ _0813A110: pop {r0} bx r0 .align 2, 0 -_0813A118: .4byte 0x020375e2 -_0813A11C: .4byte 0x020375e4 -_0813A120: .4byte 0x085b2cdc -_0813A124: .4byte 0x03005d90 + .pool thumb_func_end sub_813A080 thumb_func_start sub_813A128 sub_813A128: @ 813A128 push {r4,lr} - ldr r0, _0813A158 + ldr r0, =sub_813A2DC + 1 movs r1, 0x8 bl AddTask lsls r0, 24 @@ -644336,9 +623181,9 @@ sub_813A128: @ 813A128 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0813A15C + ldr r1, =0x03005e00 adds r3, r0, r1 - ldr r1, _0813A160 + ldr r1, =0x020375e0 ldrh r0, [r1] strh r0, [r3, 0x1E] ldrh r0, [r1] @@ -644347,15 +623192,12 @@ sub_813A128: @ 813A128 b _0813A2C6 _0813A14E: lsls r0, 2 - ldr r1, _0813A164 + ldr r1, =_0813A168 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813A158: .4byte sub_813A2DC + 1 -_0813A15C: .4byte 0x03005e00 -_0813A160: .4byte 0x020375e0 -_0813A164: .4byte _0813A168 + .pool .align 2, 0 _0813A168: .4byte _0813A19C @@ -644536,7 +623378,7 @@ _0813A2BE: strh r4, [r3, 0x26] b _0813A2D2 _0813A2C6: - ldr r1, _0813A2D8 + ldr r1, =0x020375f0 movs r0, 0x7F strh r0, [r1] adds r0, r4, 0 @@ -644546,7 +623388,7 @@ _0813A2D2: pop {r0} bx r0 .align 2, 0 -_0813A2D8: .4byte 0x020375f0 + .pool thumb_func_end sub_813A128 thumb_func_start sub_813A2DC @@ -644560,13 +623402,13 @@ sub_813A2DC: @ 813A2DC lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _0813A408 + ldr r1, =0x03005e00 adds r6, r0, r1 bl script_env_2_enable - ldr r0, _0813A40C + ldr r0, =0x0203ab68 movs r5, 0 strh r5, [r0] - ldr r1, _0813A410 + ldr r1, =0x0203ab6c movs r0, 0x40 strb r0, [r1] ldrh r0, [r6, 0x1E] @@ -644575,13 +623417,13 @@ sub_813A2DC: @ 813A2DC ldrb r0, [r6, 0x1E] movs r1, 0 bl sub_813ACE8 - ldr r4, _0813A414 + ldr r4, =0x0203ab64 movs r1, 0xA ldrsh r0, [r6, r1] lsls r0, 3 bl malloc_and_clear str r0, [r4] - ldr r0, _0813A418 + ldr r0, =0x0203ab6a strh r5, [r0] bl sub_813A42C movs r3, 0 @@ -644592,16 +623434,16 @@ sub_813A2DC: @ 813A2DC mov r8, r1 cmp r3, r0 bge _0813A36A - ldr r5, _0813A41C + ldr r5, =0x085b2cf0 _0813A33A: lsls r1, r4, 2 - ldr r0, _0813A420 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 6 adds r1, r0 adds r1, r5 ldr r0, [r1] - ldr r1, _0813A414 + ldr r1, =0x0203ab64 ldr r2, [r1] lsls r1, r4, 3 adds r1, r2 @@ -644660,7 +623502,7 @@ _0813A38C: strh r0, [r6, 0x22] movs r1, 0 bl SetStandardWindowBorderStyle - ldr r4, _0813A424 + ldr r4, =0x030061d0 ldrh r0, [r6, 0xA] strh r0, [r4, 0xC] ldrh r0, [r6, 0x8] @@ -644678,12 +623520,12 @@ _0813A38C: strh r0, [r6, 0x24] movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0813A408 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _0813A428 + ldr r1, =sub_813A4EC + 1 str r1, [r0] add sp, 0x20 pop {r3} @@ -644692,24 +623534,16 @@ _0813A38C: pop {r0} bx r0 .align 2, 0 -_0813A408: .4byte 0x03005e00 -_0813A40C: .4byte 0x0203ab68 -_0813A410: .4byte 0x0203ab6c -_0813A414: .4byte 0x0203ab64 -_0813A418: .4byte 0x0203ab6a -_0813A41C: .4byte 0x085b2cf0 -_0813A420: .4byte 0x020375e0 -_0813A424: .4byte 0x030061d0 -_0813A428: .4byte sub_813A4EC + 1 + .pool thumb_func_end sub_813A2DC thumb_func_start sub_813A42C sub_813A42C: @ 813A42C - ldr r1, _0813A460 - ldr r0, _0813A464 + ldr r1, =0x030061d0 + ldr r0, =0x0203ab64 ldr r0, [r0] str r0, [r1] - ldr r0, _0813A468 + ldr r0, =sub_813A46C + 1 str r0, [r1, 0x4] movs r0, 0 str r0, [r1, 0x8] @@ -644732,9 +623566,7 @@ sub_813A42C: @ 813A42C strb r0, [r1, 0x17] bx lr .align 2, 0 -_0813A460: .4byte 0x030061d0 -_0813A464: .4byte 0x0203ab64 -_0813A468: .4byte sub_813A46C + 1 + .pool thumb_func_end sub_813A42C thumb_func_start sub_813A46C @@ -644743,7 +623575,7 @@ sub_813A46C: @ 813A46C sub sp, 0x4 movs r0, 0x5 bl audio_play - ldr r0, _0813A4DC + ldr r0, =sub_813A4EC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -644752,7 +623584,7 @@ sub_813A46C: @ 813A46C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0813A4E0 + ldr r0, =0x03005e00 adds r4, r0 ldrh r0, [r4, 0x24] lsls r0, 24 @@ -644760,7 +623592,7 @@ sub_813A46C: @ 813A46C mov r1, sp movs r2, 0 bl get_coro_args_x18_x1A - ldr r1, _0813A4E4 + ldr r1, =0x0203ab68 mov r0, sp ldrh r0, [r0] strh r0, [r1] @@ -644770,7 +623602,7 @@ sub_813A46C: @ 813A46C mov r1, sp bl sub_81AE838 ldrh r0, [r4, 0x1E] - ldr r5, _0813A4E8 + ldr r5, =0x0203ab6a ldrh r1, [r5] bl sub_813AC44 ldrh r0, [r4, 0x1E] @@ -644790,10 +623622,7 @@ _0813A4D4: pop {r0} bx r0 .align 2, 0 -_0813A4DC: .4byte sub_813A4EC + 1 -_0813A4E0: .4byte 0x03005e00 -_0813A4E4: .4byte 0x0203ab68 -_0813A4E8: .4byte 0x0203ab6a + .pool thumb_func_end sub_813A46C thumb_func_start sub_813A4EC @@ -644804,7 +623633,7 @@ sub_813A4EC: @ 813A4EC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0813A518 + ldr r1, =0x03005e00 adds r6, r0, r1 ldrh r0, [r6, 0x24] lsls r0, 24 @@ -644820,18 +623649,18 @@ sub_813A4EC: @ 813A4EC bne _0813A530 b _0813A566 .align 2, 0 -_0813A518: .4byte 0x03005e00 + .pool _0813A51C: - ldr r1, _0813A52C + ldr r1, =0x020375f0 movs r0, 0x7F strh r0, [r1] movs r0, 0x5 bl audio_play b _0813A54C .align 2, 0 -_0813A52C: .4byte 0x020375f0 + .pool _0813A530: - ldr r0, _0813A554 + ldr r0, =0x020375f0 strh r4, [r0] movs r0, 0x5 bl audio_play @@ -644849,11 +623678,11 @@ _0813A54C: bl sub_813A570 b _0813A566 .align 2, 0 -_0813A554: .4byte 0x020375f0 + .pool _0813A558: adds r0, r5, 0 bl sub_813A738 - ldr r0, _0813A56C + ldr r0, =sub_813A600 + 1 str r0, [r6] bl script_env_2_enable_and_set_ctx_running _0813A566: @@ -644861,7 +623690,7 @@ _0813A566: pop {r0} bx r0 .align 2, 0 -_0813A56C: .4byte sub_813A600 + 1 + .pool thumb_func_end sub_813A4EC thumb_func_start sub_813A570 @@ -644874,7 +623703,7 @@ sub_813A570: @ 813A570 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0813A5F8 + ldr r0, =0x03005e00 adds r4, r0 ldrh r0, [r4, 0x24] lsls r0, 24 @@ -644893,7 +623722,7 @@ sub_813A570: @ 813A570 movs r1, 0 movs r2, 0 bl sub_81AE6C8 - ldr r0, _0813A5FC + ldr r0, =0x0203ab64 ldr r0, [r0] bl free ldrh r0, [r4, 0x22] @@ -644923,8 +623752,7 @@ sub_813A570: @ 813A570 pop {r0} bx r0 .align 2, 0 -_0813A5F8: .4byte 0x03005e00 -_0813A5FC: .4byte 0x0203ab64 + .pool thumb_func_end sub_813A570 thumb_func_start sub_813A600 @@ -644932,7 +623760,7 @@ sub_813A600: @ 813A600 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0813A628 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -644945,20 +623773,19 @@ sub_813A600: @ 813A600 bne _0813A624 movs r0, 0x1 strh r0, [r1, 0x14] - ldr r0, _0813A62C + ldr r0, =sub_813A664 + 1 str r0, [r1] _0813A624: pop {r0} bx r0 .align 2, 0 -_0813A628: .4byte 0x03005e00 -_0813A62C: .4byte sub_813A664 + 1 + .pool thumb_func_end sub_813A600 thumb_func_start sub_813A630 sub_813A630: @ 813A630 push {lr} - ldr r0, _0813A648 + ldr r0, =sub_813A600 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 @@ -644967,9 +623794,9 @@ sub_813A630: @ 813A630 bl script_env_2_enable_and_set_ctx_running b _0813A65C .align 2, 0 -_0813A648: .4byte sub_813A600 + 1 + .pool _0813A64C: - ldr r0, _0813A660 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -644981,7 +623808,7 @@ _0813A65C: pop {r0} bx r0 .align 2, 0 -_0813A660: .4byte 0x03005e00 + .pool thumb_func_end sub_813A630 thumb_func_start sub_813A664 @@ -644993,19 +623820,18 @@ sub_813A664: @ 813A664 bl script_env_2_enable adds r0, r4, 0 bl sub_813A694 - ldr r1, _0813A68C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0813A690 + ldr r1, =sub_813A4EC + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0813A68C: .4byte 0x03005e00 -_0813A690: .4byte sub_813A4EC + 1 + .pool thumb_func_end sub_813A664 thumb_func_start sub_813A694 @@ -645017,10 +623843,10 @@ sub_813A694: @ 813A694 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813A72C + ldr r0, =0x03005e00 adds r4, r1, r0 mov r1, sp - ldr r0, _0813A730 + ldr r0, =0x085b3030 ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldr r0, [r0] @@ -645075,7 +623901,7 @@ sub_813A694: @ 813A694 ldrh r1, [r4, 0x8] subs r0, r1 strh r0, [r2, 0x8] - ldr r1, _0813A734 + ldr r1, =0x0203ab68 mov r0, sp bl sub_81AF380 lsls r0, 24 @@ -645087,9 +623913,7 @@ _0813A724: pop {r0} bx r0 .align 2, 0 -_0813A72C: .4byte 0x03005e00 -_0813A730: .4byte 0x085b3030 -_0813A734: .4byte 0x0203ab68 + .pool thumb_func_end sub_813A694 thumb_func_start sub_813A738 @@ -645100,7 +623924,7 @@ sub_813A738: @ 813A738 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813A764 + ldr r0, =0x03005e00 adds r2, r1, r0 movs r0, 0x8 ldrsh r1, [r2, r0] @@ -645116,7 +623940,7 @@ _0813A75E: pop {r0} bx r0 .align 2, 0 -_0813A764: .4byte 0x03005e00 + .pool thumb_func_end sub_813A738 thumb_func_start nullsub_55 @@ -645128,8 +623952,8 @@ nullsub_55: @ 813A768 sub_813A76C: @ 813A76C push {r4-r6,lr} movs r4, 0 - ldr r6, _0813A794 - ldr r0, _0813A798 + ldr r6, =0x020229e8 + ldr r0, =0x0000401f adds r5, r0, 0 _0813A776: lsls r0, r4, 3 @@ -645146,8 +623970,7 @@ _0813A776: bl var_set b _0813A7A8 .align 2, 0 -_0813A794: .4byte 0x020229e8 -_0813A798: .4byte 0x0000401f + .pool _0813A79C: subs r0, r5, r4 lsls r0, 16 @@ -645168,7 +623991,7 @@ _0813A7A8: thumb_func_start sub_813A7B8 sub_813A7B8: @ 813A7B8 push {lr} - ldr r1, _0813A7E8 + ldr r1, =0x020375e0 ldrh r0, [r1] cmp r0, 0x5 bls _0813A7C6 @@ -645178,11 +624001,11 @@ _0813A7C6: ldrh r1, [r1] movs r0, 0x64 muls r0, r1 - ldr r1, _0813A7EC + ldr r1, =0x020244ec adds r0, r1 bl get_nature lsls r0, 24 - ldr r1, _0813A7F0 + ldr r1, =0x085b3040 lsrs r0, 22 adds r0, r1 ldr r0, [r0] @@ -645190,9 +624013,7 @@ _0813A7C6: pop {r0} bx r0 .align 2, 0 -_0813A7E8: .4byte 0x020375e0 -_0813A7EC: .4byte 0x020244ec -_0813A7F0: .4byte 0x085b3040 + .pool thumb_func_end sub_813A7B8 thumb_func_start sub_813A7F4 @@ -645201,7 +624022,7 @@ sub_813A7F4: @ 813A7F4 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _0813A81C + ldr r0, =0x00004030 bl var_get_pointer adds r5, r0, 0 ldrh r0, [r5] @@ -645215,39 +624036,37 @@ sub_813A7F4: @ 813A7F4 pop {r0} bx r0 .align 2, 0 -_0813A81C: .4byte 0x00004030 + .pool thumb_func_end sub_813A7F4 thumb_func_start sub_813A820 sub_813A820: @ 813A820 push {r4,lr} - ldr r0, _0813A848 + ldr r0, =0x00004030 bl var_get adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r1, _0813A84C + ldr r1, =0x085b30a4 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] bl box_related_two__2 - ldr r0, _0813A850 + ldr r0, =0x00004031 adds r1, r4, 0 bl var_set pop {r4} pop {r0} bx r0 .align 2, 0 -_0813A848: .4byte 0x00004030 -_0813A84C: .4byte 0x085b30a4 -_0813A850: .4byte 0x00004031 + .pool thumb_func_end sub_813A820 thumb_func_start sub_813A854 sub_813A854: @ 813A854 push {r4,lr} - ldr r4, _0813A870 - ldr r0, _0813A874 + ldr r4, =0x085b30d4 + ldr r0, =0x00004031 bl var_get lsls r0, 16 lsrs r0, 14 @@ -645258,8 +624077,7 @@ sub_813A854: @ 813A854 pop {r0} bx r0 .align 2, 0 -_0813A870: .4byte 0x085b30d4 -_0813A874: .4byte 0x00004031 + .pool thumb_func_end sub_813A854 thumb_func_start sub_813A878 @@ -645270,26 +624088,26 @@ sub_813A878: @ 813A878 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0813A8D4 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _0813A8D8 + ldr r0, =0x00004031 bl var_get lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _0813A8DC + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r5, r0, 16 - ldr r4, _0813A8E0 + ldr r4, =0x00004033 adds r0, r4, 0 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 bne _0813A8F0 - ldr r1, _0813A8E4 + ldr r1, =0x085b3104 lsls r0, r6, 1 adds r0, r1 ldrh r1, [r0] @@ -645305,11 +624123,7 @@ sub_813A878: @ 813A878 bl var_set b _0813A8F0 .align 2, 0 -_0813A8D4: .4byte 0x000040ce -_0813A8D8: .4byte 0x00004031 -_0813A8DC: .4byte 0x000040cf -_0813A8E0: .4byte 0x00004033 -_0813A8E4: .4byte 0x085b3104 + .pool _0813A8E8: adds r0, r4, 0 movs r1, 0x3 @@ -645326,23 +624140,23 @@ _0813A8F0: sub_813A8FC: @ 813A8FC push {lr} sub sp, 0x2C - ldr r0, _0813A948 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0813A94C + ldr r1, =0x00000eb8 adds r0, r1 ldrh r1, [r0] add r0, sp, 0xC movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r1, _0813A950 + ldr r1, =0x085eb6ad bl gf_strcpy movs r0, 0x1 add r1, sp, 0xC movs r2, 0x30 bl sub_81DB368 adds r3, r0, 0 - ldr r0, _0813A954 + ldr r0, =0x0203ab6d ldrb r0, [r0] lsls r3, 24 lsrs r3, 24 @@ -645358,17 +624172,14 @@ sub_813A8FC: @ 813A8FC pop {r0} bx r0 .align 2, 0 -_0813A948: .4byte 0x03005d90 -_0813A94C: .4byte 0x00000eb8 -_0813A950: .4byte 0x085eb6ad -_0813A954: .4byte 0x0203ab6d + .pool thumb_func_end sub_813A8FC thumb_func_start sub_813A958 sub_813A958: @ 813A958 push {r4,lr} - ldr r4, _0813A980 - ldr r0, _0813A984 + ldr r4, =0x0203ab6d + ldr r0, =0x085b311c bl Window_AddFromTemplate strb r0, [r4] ldrb r0, [r4] @@ -645382,14 +624193,13 @@ sub_813A958: @ 813A958 pop {r0} bx r0 .align 2, 0 -_0813A980: .4byte 0x0203ab6d -_0813A984: .4byte 0x085b311c + .pool thumb_func_end sub_813A958 thumb_func_start sub_813A988 sub_813A988: @ 813A988 push {r4,lr} - ldr r4, _0813A9A0 + ldr r4, =0x0203ab6d ldrb r0, [r4] movs r1, 0x1 bl sub_8198070 @@ -645399,17 +624209,17 @@ sub_813A988: @ 813A988 pop {r0} bx r0 .align 2, 0 -_0813A9A0: .4byte 0x0203ab6d + .pool thumb_func_end sub_813A988 thumb_func_start sub_813A9A4 sub_813A9A4: @ 813A9A4 push {lr} - ldr r0, _0813A9BC + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _0813A9C0 + ldr r2, =0x00000eb8 adds r1, r0, r2 - ldr r0, _0813A9C4 + ldr r0, =0x020375e0 ldrh r2, [r1] ldrh r0, [r0] cmp r2, r0 @@ -645417,9 +624227,7 @@ sub_813A9A4: @ 813A9A4 movs r0, 0 b _0813A9CA .align 2, 0 -_0813A9BC: .4byte 0x03005d90 -_0813A9C0: .4byte 0x00000eb8 -_0813A9C4: .4byte 0x020375e0 + .pool _0813A9C8: subs r0, r2, r0 _0813A9CA: @@ -645431,24 +624239,21 @@ _0813A9CA: thumb_func_start sub_813A9D0 sub_813A9D0: @ 813A9D0 push {lr} - ldr r0, _0813A9EC + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0813A9F0 + ldr r1, =0x00000eb8 adds r2, r0, r1 ldrh r1, [r2] - ldr r0, _0813A9F4 + ldr r0, =0x020375e0 ldrh r0, [r0] adds r1, r0 - ldr r0, _0813A9F8 + ldr r0, =0x0000270f cmp r1, r0 ble _0813A9FC strh r0, [r2] b _0813A9FE .align 2, 0 -_0813A9EC: .4byte 0x03005d90 -_0813A9F0: .4byte 0x00000eb8 -_0813A9F4: .4byte 0x020375e0 -_0813A9F8: .4byte 0x0000270f + .pool _0813A9FC: strh r1, [r2] _0813A9FE: @@ -645458,22 +624263,21 @@ _0813A9FE: thumb_func_start sub_813AA04 sub_813AA04: @ 813AA04 - ldr r0, _0813AA10 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0813AA14 + ldr r1, =0x00000eb8 adds r0, r1 ldrh r0, [r0] bx lr .align 2, 0 -_0813AA10: .4byte 0x03005d90 -_0813AA14: .4byte 0x00000eb8 + .pool thumb_func_end sub_813AA04 thumb_func_start sub_813AA18 sub_813AA18: @ 813AA18 push {r4,lr} - ldr r4, _0813AA3C - ldr r0, _0813AA40 + ldr r4, =0x0203ab6e + ldr r0, =0x085b3124 bl Window_AddFromTemplate strb r0, [r4] ldrb r0, [r4] @@ -645486,14 +624290,13 @@ sub_813AA18: @ 813AA18 pop {r0} bx r0 .align 2, 0 -_0813AA3C: .4byte 0x0203ab6e -_0813AA40: .4byte 0x085b3124 + .pool thumb_func_end sub_813AA18 thumb_func_start sub_813AA44 sub_813AA44: @ 813AA44 push {r4,lr} - ldr r4, _0813AA5C + ldr r4, =0x0203ab6e ldrb r0, [r4] movs r1, 0x1 bl sub_8198070 @@ -645503,7 +624306,7 @@ sub_813AA44: @ 813AA44 pop {r0} bx r0 .align 2, 0 -_0813AA5C: .4byte 0x0203ab6e + .pool thumb_func_end sub_813AA44 thumb_func_start sub_813AA60 @@ -645514,7 +624317,7 @@ sub_813AA60: @ 813AA60 lsls r1, 16 lsrs r5, r1, 16 lsrs r4, r0, 16 - ldr r1, _0813AA9C + ldr r1, =0xfffd0000 adds r0, r1 lsrs r0, 16 cmp r0, 0x3 @@ -645538,7 +624341,7 @@ _0813AA78: beq _0813AAAA b _0813ABC2 .align 2, 0 -_0813AA9C: .4byte 0xfffd0000 + .pool _0813AAA0: cmp r4, 0x5 beq _0813AB5C @@ -645546,7 +624349,7 @@ _0813AAA0: beq _0813AB94 b _0813ABC2 _0813AAAA: - ldr r1, _0813AADC + ldr r1, =0x085b3170 lsls r0, r5, 2 adds r0, r1 ldr r2, [r0] @@ -645561,20 +624364,18 @@ _0813AAAA: movs r1, 0x1 movs r3, 0 bl text_box_related_one - ldr r1, _0813AAE0 + ldr r1, =0x085b312c lsls r0, r5, 1 adds r1, r0, r1 ldrh r5, [r1] - ldr r0, _0813AAE4 + ldr r0, =0x0000ffff cmp r5, r0 beq _0813AB18 b _0813AB2C .align 2, 0 -_0813AADC: .4byte 0x085b3170 -_0813AAE0: .4byte 0x085b312c -_0813AAE4: .4byte 0x0000ffff + .pool _0813AAE8: - ldr r1, _0813AB20 + ldr r1, =0x085b319c lsls r0, r5, 2 adds r0, r1 ldr r2, [r0] @@ -645590,11 +624391,11 @@ _0813AAE8: movs r1, 0x1 movs r3, 0 bl text_box_related_one - ldr r1, _0813AB24 + ldr r1, =0x085b3142 lsls r0, r5, 1 adds r1, r0, r1 ldrh r5, [r1] - ldr r0, _0813AB28 + ldr r0, =0x0000ffff cmp r5, r0 bne _0813AB2C _0813AB18: @@ -645602,11 +624403,9 @@ _0813AB18: bl sub_813ABD4 b _0813ABC2 .align 2, 0 -_0813AB20: .4byte 0x085b319c -_0813AB24: .4byte 0x085b3142 -_0813AB28: .4byte 0x0000ffff + .pool _0813AB2C: - ldr r4, _0813AB54 + ldr r4, =0x0000157c adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -645619,14 +624418,13 @@ _0813AB2C: movs r2, 0x58 movs r3, 0 bl sub_81295CC - ldr r1, _0813AB58 + ldr r1, =0x0203ab6c strb r0, [r1] b _0813ABC2 .align 2, 0 -_0813AB54: .4byte 0x0000157c -_0813AB58: .4byte 0x0203ab6c + .pool _0813AB5C: - ldr r1, _0813AB8C + ldr r1, =0x085b31b4 lsls r0, r5, 2 adds r0, r1 ldr r2, [r0] @@ -645642,17 +624440,16 @@ _0813AB5C: movs r1, 0x1 movs r3, 0 bl text_box_related_one - ldr r1, _0813AB90 + ldr r1, =0x085b314e lsls r0, r5, 1 adds r0, r1 ldrh r0, [r0] bl sub_813ABD4 b _0813ABC2 .align 2, 0 -_0813AB8C: .4byte 0x085b31b4 -_0813AB90: .4byte 0x085b314e + .pool _0813AB94: - ldr r1, _0813ABCC + ldr r1, =0x085b31d0 lsls r0, r5, 2 adds r0, r1 ldr r2, [r0] @@ -645668,7 +624465,7 @@ _0813AB94: movs r1, 0x1 movs r3, 0 bl text_box_related_one - ldr r1, _0813ABD0 + ldr r1, =0x085b315c lsls r0, r5, 1 adds r0, r1 ldrh r0, [r0] @@ -645679,8 +624476,7 @@ _0813ABC2: pop {r0} bx r0 .align 2, 0 -_0813ABCC: .4byte 0x085b31d0 -_0813ABD0: .4byte 0x085b315c + .pool thumb_func_end sub_813AA60 thumb_func_start sub_813ABD4 @@ -645689,7 +624485,7 @@ sub_813ABD4: @ 813ABD4 adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 - ldr r4, _0813AC38 + ldr r4, =0x0000157c adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -645698,13 +624494,13 @@ sub_813ABD4: @ 813ABD4 adds r1, r4, 0 adds r2, r5, 0 bl AddItemIconObject - ldr r4, _0813AC3C + ldr r4, =0x0203ab6c strb r0, [r4] lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 beq _0813AC32 - ldr r3, _0813AC40 + ldr r3, =0x02020630 ldrb r0, [r4] lsls r1, r0, 4 adds r1, r0 @@ -645734,9 +624530,7 @@ _0813AC32: pop {r0} bx r0 .align 2, 0 -_0813AC38: .4byte 0x0000157c -_0813AC3C: .4byte 0x0203ab6c -_0813AC40: .4byte 0x02020630 + .pool thumb_func_end sub_813ABD4 thumb_func_start sub_813AC44 @@ -645744,7 +624538,7 @@ sub_813AC44: @ 813AC44 push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r2, _0813AC74 + ldr r2, =0x0203ab6c ldrb r0, [r2] cmp r0, 0x40 beq _0813AC70 @@ -645756,68 +624550,60 @@ sub_813AC44: @ 813AC44 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0813AC78 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_resources _0813AC6A: - ldr r1, _0813AC74 + ldr r1, =0x0203ab6c movs r0, 0x40 strb r0, [r1] _0813AC70: pop {r0} bx r0 .align 2, 0 -_0813AC74: .4byte 0x0203ab6c -_0813AC78: .4byte 0x02020630 + .pool thumb_func_end sub_813AC44 thumb_func_start sub_813AC7C sub_813AC7C: @ 813AC7C push {lr} - ldr r0, _0813ACA4 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 beq _0813ACB8 - ldr r0, _0813ACA8 - ldr r2, _0813ACAC - ldr r1, _0813ACB0 + ldr r0, =0x02021cc4 + ldr r2, =0x085b320c + ldr r1, =0x020375e0 ldrh r1, [r1] lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0xD muls r1, r2 - ldr r2, _0813ACB4 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy b _0813ACD2 .align 2, 0 -_0813ACA4: .4byte 0x020375e2 -_0813ACA8: .4byte 0x02021cc4 -_0813ACAC: .4byte 0x085b320c -_0813ACB0: .4byte 0x020375e0 -_0813ACB4: .4byte 0x0831977c + .pool _0813ACB8: - ldr r0, _0813ACD8 - ldr r2, _0813ACDC - ldr r1, _0813ACE0 + ldr r0, =0x02021cc4 + ldr r2, =0x085b31f8 + ldr r1, =0x020375e0 ldrh r1, [r1] lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0xD muls r1, r2 - ldr r2, _0813ACE4 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy _0813ACD2: pop {r0} bx r0 .align 2, 0 -_0813ACD8: .4byte 0x02021cc4 -_0813ACDC: .4byte 0x085b31f8 -_0813ACE0: .4byte 0x020375e0 -_0813ACE4: .4byte 0x0831977c + .pool thumb_func_end sub_813AC7C thumb_func_start sub_813ACE8 @@ -645833,12 +624619,12 @@ sub_813ACE8: @ 813ACE8 lsrs r0, 24 cmp r0, 0x1 bhi _0813AD20 - ldr r0, _0813AD28 + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 bne _0813AD18 - ldr r4, _0813AD2C - ldr r0, _0813AD30 + ldr r4, =0x0203ab5e + ldr r0, =0x085b3220 bl Window_AddFromTemplate strb r0, [r4] ldrb r0, [r4] @@ -645853,9 +624639,7 @@ _0813AD20: pop {r0} bx r0 .align 2, 0 -_0813AD28: .4byte 0x020375e4 -_0813AD2C: .4byte 0x0203ab5e -_0813AD30: .4byte 0x085b3220 + .pool thumb_func_end sub_813ACE8 thumb_func_start sub_813AD34 @@ -645873,7 +624657,7 @@ sub_813AD34: @ 813AD34 lsrs r0, 24 cmp r0, 0x1 bhi _0813ADAC - ldr r4, _0813AD88 + ldr r4, =0x0203ab5e ldrb r0, [r4] movs r1, 0x60 str r1, [sp] @@ -645886,7 +624670,7 @@ sub_813AD34: @ 813AD34 cmp r6, 0xA bne _0813AD90 ldrb r0, [r4] - ldr r2, _0813AD8C + ldr r2, =0x085b3254 lsls r1, r5, 2 adds r1, r2 ldr r2, [r1] @@ -645900,11 +624684,10 @@ sub_813AD34: @ 813AD34 bl Print b _0813ADAC .align 2, 0 -_0813AD88: .4byte 0x0203ab5e -_0813AD8C: .4byte 0x085b3254 + .pool _0813AD90: ldrb r0, [r4] - ldr r2, _0813ADB4 + ldr r2, =0x085b3228 lsls r1, r7, 2 adds r1, r2 ldr r2, [r1] @@ -645922,13 +624705,13 @@ _0813ADAC: pop {r0} bx r0 .align 2, 0 -_0813ADB4: .4byte 0x085b3228 + .pool thumb_func_end sub_813AD34 thumb_func_start sub_813ADB8 sub_813ADB8: @ 813ADB8 push {r4,lr} - ldr r4, _0813ADD0 + ldr r4, =0x0203ab5e ldrb r0, [r4] movs r1, 0x1 bl sub_8198070 @@ -645938,7 +624721,7 @@ sub_813ADB8: @ 813ADB8 pop {r0} bx r0 .align 2, 0 -_0813ADD0: .4byte 0x0203ab5e + .pool thumb_func_end sub_813ADB8 thumb_func_start sub_813ADD4 @@ -645948,7 +624731,7 @@ sub_813ADD4: @ 813ADD4 mov r6, r8 push {r6,r7} sub sp, 0x18 - ldr r0, _0813AEA0 + ldr r0, =sub_813A600 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r1, r0, 24 @@ -645957,7 +624740,7 @@ sub_813ADD4: @ 813ADD4 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0813AEA4 + ldr r1, =0x03005e00 adds r6, r0, r1 ldrh r0, [r6, 0x24] lsls r0, 24 @@ -645974,7 +624757,7 @@ sub_813ADD4: @ 813ADD4 bl SetStandardWindowBorderStyle movs r5, 0 mov r9, r4 - ldr r0, _0813AEA8 + ldr r0, =0x085b2cf0 mov r8, r0 movs r4, 0 _0813AE1E: @@ -645985,7 +624768,7 @@ _0813AE1E: ldrh r2, [r1] adds r2, r5 lsls r2, 2 - ldr r1, _0813AEAC + ldr r1, =0x020375e0 ldrh r1, [r1] lsls r1, 6 adds r2, r1 @@ -646010,7 +624793,7 @@ _0813AE1E: ldrh r0, [r6, 0x22] lsls r0, 24 lsrs r0, 24 - ldr r2, _0813AEB0 + ldr r2, =0x085e8b3a mov r3, r9 ldrh r1, [r3] lsls r1, 28 @@ -646040,25 +624823,21 @@ _0813AE90: pop {r0} bx r0 .align 2, 0 -_0813AEA0: .4byte sub_813A600 + 1 -_0813AEA4: .4byte 0x03005e00 -_0813AEA8: .4byte 0x085b2cf0 -_0813AEAC: .4byte 0x020375e0 -_0813AEB0: .4byte 0x085e8b3a + .pool thumb_func_end sub_813ADD4 thumb_func_start sub_813AEB4 sub_813AEB4: @ 813AEB4 push {r4,lr} movs r1, 0 - ldr r0, _0813AEF8 + ldr r0, =0x020375e2 strh r1, [r0] - ldr r0, _0813AEFC + ldr r0, =0x0000400e bl var_get adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _0813AF00 + ldr r0, =0x0000400d bl var_get lsls r0, 16 lsrs r1, r0, 16 @@ -646066,8 +624845,8 @@ sub_813AEB4: @ 813AEB4 beq _0813AF18 movs r2, 0 lsls r1, 1 - ldr r3, _0813AF04 - ldr r0, _0813AF08 + ldr r3, =0x0861500c + ldr r0, =0x085b320c adds r0, r1, r0 ldrh r1, [r0] _0813AEE2: @@ -646083,22 +624862,18 @@ _0813AEE2: bls _0813AEE2 b _0813AF38 .align 2, 0 -_0813AEF8: .4byte 0x020375e2 -_0813AEFC: .4byte 0x0000400e -_0813AF00: .4byte 0x0000400d -_0813AF04: .4byte 0x0861500c -_0813AF08: .4byte 0x085b320c + .pool _0813AF0C: - ldr r0, _0813AF14 + ldr r0, =0x020375e2 strh r2, [r0] b _0813AF38 .align 2, 0 -_0813AF14: .4byte 0x020375e2 + .pool _0813AF18: movs r2, 0 lsls r1, 1 - ldr r3, _0813AF40 - ldr r0, _0813AF44 + ldr r3, =0x0861500c + ldr r0, =0x085b31f8 adds r0, r1, r0 ldrh r1, [r0] _0813AF24: @@ -646117,14 +624892,13 @@ _0813AF38: pop {r0} bx r0 .align 2, 0 -_0813AF40: .4byte 0x0861500c -_0813AF44: .4byte 0x085b31f8 + .pool thumb_func_end sub_813AEB4 thumb_func_start sub_813AF48 sub_813AF48: @ 813AF48 push {r4,r5,lr} - ldr r0, _0813AFBC + ldr r0, =sub_813A600 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r5, r0, 24 @@ -646133,7 +624907,7 @@ sub_813AF48: @ 813AF48 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0813AFC0 + ldr r0, =0x03005e00 adds r4, r0 ldrh r0, [r4, 0x24] lsls r0, 24 @@ -646141,7 +624915,7 @@ sub_813AF48: @ 813AF48 movs r1, 0 movs r2, 0 bl sub_81AE6C8 - ldr r0, _0813AFC4 + ldr r0, =0x0203ab64 ldr r0, [r0] bl free ldrh r0, [r4, 0x22] @@ -646174,21 +624948,19 @@ _0813AFB6: pop {r0} bx r0 .align 2, 0 -_0813AFBC: .4byte sub_813A600 + 1 -_0813AFC0: .4byte 0x03005e00 -_0813AFC4: .4byte 0x0203ab64 + .pool thumb_func_end sub_813AF48 thumb_func_start sub_813AFC8 sub_813AFC8: @ 813AFC8 push {lr} - ldr r0, _0813AFD8 + ldr r0, =task_deoxys_sound + 1 movs r1, 0x8 bl AddTask pop {r0} bx r0 .align 2, 0 -_0813AFD8: .4byte task_deoxys_sound + 1 + .pool thumb_func_end sub_813AFC8 thumb_func_start task_deoxys_sound @@ -646198,25 +624970,24 @@ task_deoxys_sound: @ 813AFDC push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0813AFFC + ldr r0, =0x000008d4 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0813B004 - ldr r1, _0813B000 + ldr r1, =0x020375f0 movs r0, 0x3 b _0813B06A .align 2, 0 -_0813AFFC: .4byte 0x000008d4 -_0813B000: .4byte 0x020375f0 + .pool _0813B004: - ldr r0, _0813B04C + ldr r0, =0x00004035 mov r8, r0 bl var_get lsls r0, 16 lsrs r5, r0, 16 - ldr r4, _0813B050 + ldr r4, =0x00004034 adds r0, r4, 0 bl var_get lsls r0, 16 @@ -646226,7 +624997,7 @@ _0813B004: bl var_set cmp r5, 0 beq _0813B05C - ldr r0, _0813B054 + ldr r0, =0x085b33f6 subs r1, r5, 0x1 adds r1, r0 ldrb r0, [r1] @@ -646237,21 +625008,18 @@ _0813B004: mov r0, r8 movs r1, 0 bl var_set - ldr r1, _0813B058 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] b _0813B070 .align 2, 0 -_0813B04C: .4byte 0x00004035 -_0813B050: .4byte 0x00004034 -_0813B054: .4byte 0x085b33f6 -_0813B058: .4byte 0x020375f0 + .pool _0813B05C: cmp r5, 0xA bne _0813B080 - ldr r0, _0813B078 + ldr r0, =0x000008d4 bl flag_set - ldr r1, _0813B07C + ldr r1, =0x020375f0 movs r0, 0x2 _0813B06A: strh r0, [r1] @@ -646261,8 +625029,7 @@ _0813B070: bl remove_task b _0813B0A2 .align 2, 0 -_0813B078: .4byte 0x000008d4 -_0813B07C: .4byte 0x020375f0 + .pool _0813B080: adds r0, r5, 0x1 lsls r0, 16 @@ -646270,10 +625037,10 @@ _0813B080: lsls r0, r5, 24 lsrs r0, 24 bl sub_813B0B4 - ldr r0, _0813B0AC + ldr r0, =0x00004035 adds r1, r5, 0 bl var_set - ldr r1, _0813B0B0 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] adds r0, r7, 0 @@ -646285,8 +625052,7 @@ _0813B0A2: pop {r0} bx r0 .align 2, 0 -_0813B0AC: .4byte 0x00004035 -_0813B0B0: .4byte 0x020375f0 + .pool thumb_func_end task_deoxys_sound thumb_func_start sub_813B0B4 @@ -646296,13 +625062,13 @@ sub_813B0B4: @ 813B0B4 lsls r0, 24 lsrs r4, r0, 24 lsls r0, r4, 5 - ldr r1, _0813B0E8 + ldr r1, =0x085b3280 adds r0, r1 movs r1, 0xD0 lsls r1, 1 movs r2, 0x8 bl gpu_pal_apply - ldr r0, _0813B0EC + ldr r0, =0x03005d8c ldr r0, [r0] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -646315,24 +625081,23 @@ sub_813B0B4: @ 813B0B4 bl audio_play b _0813B0F8 .align 2, 0 -_0813B0E8: .4byte 0x085b3280 -_0813B0EC: .4byte 0x03005d8c + .pool _0813B0F0: movs r0, 0x82 lsls r0, 1 bl audio_play _0813B0F8: - ldr r0, _0813B12C + ldr r0, =sub_813B160 + 1 movs r1, 0x8 bl AddTask - ldr r3, _0813B130 + ldr r3, =0x02038c08 movs r0, 0x1 str r0, [r3] movs r0, 0x3A str r0, [r3, 0x4] movs r0, 0x1A str r0, [r3, 0x8] - ldr r0, _0813B134 + ldr r0, =0x085b33e0 lsls r2, r4, 1 adds r1, r2, r0 ldrb r1, [r1] @@ -646347,16 +625112,14 @@ _0813B0F8: movs r0, 0x3C b _0813B13A .align 2, 0 -_0813B12C: .4byte sub_813B160 + 1 -_0813B130: .4byte 0x02038c08 -_0813B134: .4byte 0x085b33e0 + .pool _0813B138: movs r0, 0x5 _0813B13A: str r0, [r3, 0x14] movs r0, 0x42 bl oe_exec - ldr r0, _0813B15C + ldr r0, =0x085b33e0 adds r1, r5, r0 ldrb r1, [r1] adds r0, 0x1 @@ -646369,7 +625132,7 @@ _0813B13A: pop {r0} bx r0 .align 2, 0 -_0813B15C: .4byte 0x085b33e0 + .pool thumb_func_end sub_813B0B4 thumb_func_start sub_813B160 @@ -646394,15 +625157,15 @@ _0813B17C: thumb_func_start increment_var_x4026_on_birth_island_modulo_100 increment_var_x4026_on_birth_island_modulo_100: @ 813B184 push {r4,lr} - ldr r4, _0813B1B4 + ldr r4, =0x00004034 adds r0, r4, 0 bl var_get lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _0813B1B8 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _0813B1BC + ldr r0, =0x00003a1a cmp r1, r0 bne _0813B1C8 adds r0, r2, 0x1 @@ -646415,9 +625178,7 @@ increment_var_x4026_on_birth_island_modulo_100: @ 813B184 bl var_set b _0813B1C8 .align 2, 0 -_0813B1B4: .4byte 0x00004034 -_0813B1B8: .4byte 0x03005d8c -_0813B1BC: .4byte 0x00003a1a + .pool _0813B1C0: adds r0, r4, 0 adds r1, r2, 0 @@ -646431,11 +625192,11 @@ _0813B1C8: thumb_func_start sub_813B1D0 sub_813B1D0: @ 813B1D0 push {lr} - ldr r0, _0813B1FC + ldr r0, =0x00004035 bl var_get lsls r0, 24 lsrs r0, 19 - ldr r1, _0813B200 + ldr r1, =0x085b3280 adds r0, r1 movs r1, 0xD0 lsls r1, 1 @@ -646449,32 +625210,31 @@ sub_813B1D0: @ 813B1D0 pop {r0} bx r0 .align 2, 0 -_0813B1FC: .4byte 0x00004035 -_0813B200: .4byte 0x085b3280 + .pool thumb_func_end sub_813B1D0 thumb_func_start set_unknown_box_id set_unknown_box_id: @ 813B204 - ldr r1, _0813B20C + ldr r1, =0x0203ab6f strb r0, [r1] bx lr .align 2, 0 -_0813B20C: .4byte 0x0203ab6f + .pool thumb_func_end set_unknown_box_id thumb_func_start get_unknown_box_id get_unknown_box_id: @ 813B210 - ldr r0, _0813B218 + ldr r0, =0x0203ab6f ldrb r0, [r0] bx lr .align 2, 0 -_0813B218: .4byte 0x0203ab6f + .pool thumb_func_end get_unknown_box_id thumb_func_start sub_813B21C sub_813B21C: @ 813B21C push {r4,r5,lr} - ldr r5, _0813B250 + ldr r5, =0x000008d7 adds r0, r5, 0 bl flag_check lsls r0, 24 @@ -646484,7 +625244,7 @@ sub_813B21C: @ 813B21C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0813B254 + ldr r0, =0x00004036 bl var_get lsls r0, 16 lsrs r0, 16 @@ -646495,8 +625255,7 @@ sub_813B21C: @ 813B21C movs r0, 0x1 b _0813B25A .align 2, 0 -_0813B250: .4byte 0x000008d7 -_0813B254: .4byte 0x00004036 + .pool _0813B258: movs r0, 0 _0813B25A: @@ -646508,7 +625267,7 @@ _0813B25A: thumb_func_start sub_813B260 sub_813B260: @ 813B260 push {r4-r7,lr} - ldr r0, _0813B2B8 + ldr r0, =0x00004036 bl var_get lsls r0, 24 lsrs r0, 24 @@ -646535,10 +625294,10 @@ _0813B27E: lsrs r0, 16 cmp r0, r4 beq _0813B2A6 - ldr r0, _0813B2BC + ldr r0, =0x000008d7 bl flag_clear _0813B2A6: - ldr r0, _0813B2B8 + ldr r0, =0x00004036 lsrs r1, r7, 16 bl var_set bl sub_813B21C @@ -646546,8 +625305,7 @@ _0813B2A6: lsrs r0, 24 b _0813B2DC .align 2, 0 -_0813B2B8: .4byte 0x00004036 -_0813B2BC: .4byte 0x000008d7 + .pool _0813B2C0: adds r5, 0x1 cmp r5, 0x1D @@ -646575,7 +625333,7 @@ sub_813B2E4: @ 813B2E4 bl GenerateRandomNumber lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _0813B324 + ldr r0, =0x00004038 movs r1, 0 bl var_set movs r0, 0xDF @@ -646585,13 +625343,13 @@ sub_813B2E4: @ 813B2E4 lsrs r0, 24 cmp r0, 0x1 beq _0813B340 - ldr r0, _0813B328 + ldr r0, =0x000001bf bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0813B330 - ldr r0, _0813B32C + ldr r0, =0x00004037 movs r1, 0x7 ands r4, r1 adds r1, r4, 0 @@ -646599,9 +625357,7 @@ sub_813B2E4: @ 813B2E4 bl var_set b _0813B36A .align 2, 0 -_0813B324: .4byte 0x00004038 -_0813B328: .4byte 0x000001bf -_0813B32C: .4byte 0x00004037 + .pool _0813B330: movs r0, 0x1 ands r4, r0 @@ -646611,19 +625367,19 @@ _0813B330: lsls r0, 16 lsrs r4, r0, 16 _0813B340: - ldr r0, _0813B350 + ldr r0, =0x00004037 movs r1, 0x7 ands r4, r1 adds r1, r4, 0x1 bl var_set b _0813B36A .align 2, 0 -_0813B350: .4byte 0x00004037 + .pool _0813B354: bl GenerateRandomNumber lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _0813B370 + ldr r0, =0x00004037 movs r1, 0x7 ands r4, r1 adds r1, r4, 0 @@ -646634,19 +625390,19 @@ _0813B36A: pop {r0} bx r0 .align 2, 0 -_0813B370: .4byte 0x00004037 + .pool thumb_func_end sub_813B2E4 thumb_func_start sub_813B374 sub_813B374: @ 813B374 push {r4,lr} - ldr r0, _0813B39C + ldr r0, =0x00004037 bl var_get adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _0813B3A0 - ldr r2, _0813B3A4 + ldr r0, =0x02021cc4 + ldr r2, =0x085b3400 subs r1, r4, 0x1 adds r1, r2 ldrb r1, [r1] @@ -646657,9 +625413,7 @@ sub_813B374: @ 813B374 movs r0, 0x1 b _0813B3AA .align 2, 0 -_0813B39C: .4byte 0x00004037 -_0813B3A0: .4byte 0x02021cc4 -_0813B3A4: .4byte 0x085b3400 + .pool _0813B3A8: movs r0, 0 _0813B3AA: @@ -646671,12 +625425,12 @@ _0813B3AA: thumb_func_start sub_813B3B0 sub_813B3B0: @ 813B3B0 push {r4-r6,lr} - ldr r5, _0813B400 + ldr r5, =0x00004038 adds r0, r5, 0 bl var_get lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _0813B404 + ldr r0, =0x00004037 bl var_get lsls r0, 16 lsrs r6, r0, 16 @@ -646685,13 +625439,13 @@ sub_813B3B0: @ 813B3B0 adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _0813B408 + ldr r0, =0x000003e7 cmp r4, r0 bls _0813B474 adds r0, r5, 0 movs r1, 0 bl var_set - ldr r0, _0813B40C + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -646703,17 +625457,13 @@ sub_813B3B0: @ 813B3B0 bgt _0813B414 cmp r0, 0x65 blt _0813B414 - ldr r0, _0813B410 + ldr r0, =0x00004039 movs r1, 0x1 b _0813B478 .align 2, 0 -_0813B400: .4byte 0x00004038 -_0813B404: .4byte 0x00004037 -_0813B408: .4byte 0x000003e7 -_0813B40C: .4byte 0x03005d8c -_0813B410: .4byte 0x00004039 + .pool _0813B414: - ldr r0, _0813B43C + ldr r0, =0x03005d8c ldr r2, [r0] movs r1, 0x4 ldrsb r1, [r2, r1] @@ -646731,17 +625481,16 @@ _0813B414: cmp r0, 0x36 blt _0813B444 _0813B436: - ldr r0, _0813B440 + ldr r0, =0x00004039 movs r1, 0x1 b _0813B478 .align 2, 0 -_0813B43C: .4byte 0x03005d8c -_0813B440: .4byte 0x00004039 + .pool _0813B444: ldr r3, [r3] movs r2, 0x5 ldrsb r2, [r3, r2] - ldr r1, _0813B464 + ldr r1, =0x085b3410 subs r0, r6, 0x1 adds r0, r1 ldrb r0, [r0] @@ -646754,13 +625503,13 @@ _0813B444: movs r0, 0x1 b _0813B47E .align 2, 0 -_0813B464: .4byte 0x085b3410 + .pool _0813B468: - ldr r0, _0813B470 + ldr r0, =0x00004037 movs r1, 0 b _0813B478 .align 2, 0 -_0813B470: .4byte 0x00004037 + .pool _0813B474: adds r0, r5, 0 adds r1, r4, 0 @@ -646787,11 +625536,11 @@ sub_813B484: @ 813B484 sub_813B490: @ 813B490 push {r4-r7,lr} movs r3, 0 - ldr r0, _0813B4C4 + ldr r0, =0x03005d8c ldr r4, [r0] movs r6, 0x4 ldrsb r6, [r4, r6] - ldr r5, _0813B4C8 + ldr r5, =0x085b3420 adds r0, r5, 0x2 mov r12, r0 adds r7, r5, 0x1 @@ -646813,8 +625562,7 @@ _0813B4A4: ldrb r0, [r0] b _0813B4D8 .align 2, 0 -_0813B4C4: .4byte 0x03005d8c -_0813B4C8: .4byte 0x085b3420 + .pool _0813B4CC: adds r0, r3, 0x1 lsls r0, 24 @@ -646831,7 +625579,7 @@ _0813B4D8: thumb_func_start sub_813B4E0 sub_813B4E0: @ 813B4E0 push {lr} - ldr r0, _0813B508 + ldr r0, =0x020375e0 ldrh r0, [r0] bl sub_81D15CC cmp r0, 0 @@ -646849,7 +625597,7 @@ sub_813B4E0: @ 813B4E0 movs r0, 0x1 b _0813B50E .align 2, 0 -_0813B508: .4byte 0x020375e0 + .pool _0813B50C: movs r0, 0 _0813B50E: @@ -646860,7 +625608,7 @@ _0813B50E: thumb_func_start sub_813B514 sub_813B514: @ 813B514 push {lr} - ldr r0, _0813B528 + ldr r0, =0x0000403f bl var_get lsls r0, 16 cmp r0, 0 @@ -646868,7 +625616,7 @@ sub_813B514: @ 813B514 movs r0, 0x1 b _0813B52E .align 2, 0 -_0813B528: .4byte 0x0000403f + .pool _0813B52C: movs r0, 0 _0813B52E: @@ -646879,39 +625627,36 @@ _0813B52E: thumb_func_start sub_813B534 sub_813B534: @ 813B534 push {lr} - ldr r2, _0813B558 - ldr r1, _0813B55C + ldr r2, =0x0203ab70 + ldr r1, =0x02022fec ldr r0, [r1] str r0, [r2] movs r0, 0 str r0, [r1] - ldr r0, _0813B560 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _0813B552 - ldr r0, _0813B564 + ldr r0, =sub_80B3AF8 + 1 movs r1, 0x5 bl AddTask _0813B552: pop {r0} bx r0 .align 2, 0 -_0813B558: .4byte 0x0203ab70 -_0813B55C: .4byte 0x02022fec -_0813B560: .4byte 0x03003124 -_0813B564: .4byte sub_80B3AF8 + 1 + .pool thumb_func_end sub_813B534 thumb_func_start sub_813B568 sub_813B568: @ 813B568 push {lr} - ldr r0, _0813B578 + ldr r0, =sub_813B57C + 1 movs r1, 0x5 bl AddTask pop {r0} bx r0 .align 2, 0 -_0813B578: .4byte sub_813B57C + 1 + .pool thumb_func_end sub_813B568 thumb_func_start sub_813B57C @@ -646919,7 +625664,7 @@ sub_813B57C: @ 813B57C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0813B5A0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -646931,13 +625676,12 @@ sub_813B57C: @ 813B57C b _0813B7C6 _0813B596: lsls r0, 2 - ldr r1, _0813B5A4 + ldr r1, =_0813B5A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813B5A0: .4byte 0x03005e00 -_0813B5A4: .4byte _0813B5A8 + .pool .align 2, 0 _0813B5A8: .4byte _0813B5D0 @@ -646951,7 +625695,7 @@ _0813B5A8: .4byte _0813B784 .4byte _0813B7A8 _0813B5D0: - ldr r0, _0813B5E0 + ldr r0, =sub_80B3AF8 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -646960,7 +625704,7 @@ _0813B5D0: _0813B5DE: b _0813B790 .align 2, 0 -_0813B5E0: .4byte sub_80B3AF8 + 1 + .pool _0813B5E4: bl sub_800A520 lsls r0, 24 @@ -646978,12 +625722,12 @@ _0813B5FE: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _0813B610 + ldr r1, =0x020375e0 movs r2, 0x2 bl link_0800A448 b _0813B708 .align 2, 0 -_0813B610: .4byte 0x020375e0 + .pool _0813B614: bl sub_800A550 movs r1, 0x2 @@ -646998,8 +625742,8 @@ _0813B622: beq _0813B62E b _0813B790 _0813B62E: - ldr r5, _0813B658 - ldr r0, _0813B65C + ldr r5, =0x020375e2 + ldr r0, =0x020223c4 movs r1, 0x80 lsls r1, 1 adds r0, r1 @@ -647007,60 +625751,54 @@ _0813B62E: strh r0, [r5] movs r0, 0x1 bl sub_800A5EC - ldr r0, _0813B660 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x1 bne _0813B668 ldrh r1, [r5] cmp r1, 0x1 bne _0813B668 - ldr r0, _0813B664 + ldr r0, =0x020375f0 strh r1, [r0] b _0813B790 .align 2, 0 -_0813B658: .4byte 0x020375e2 -_0813B65C: .4byte 0x020223c4 -_0813B660: .4byte 0x020375e0 -_0813B664: .4byte 0x020375f0 + .pool _0813B668: - ldr r0, _0813B680 + ldr r0, =0x020375e0 ldrh r1, [r0] adds r2, r0, 0 cmp r1, 0 bne _0813B68C - ldr r0, _0813B684 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 bne _0813B68C - ldr r1, _0813B688 + ldr r1, =0x020375f0 movs r0, 0x2 b _0813B6AC .align 2, 0 -_0813B680: .4byte 0x020375e0 -_0813B684: .4byte 0x020375e2 -_0813B688: .4byte 0x020375f0 + .pool _0813B68C: ldrh r0, [r2] cmp r0, 0x1 bne _0813B6A8 - ldr r0, _0813B6A0 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 bne _0813B6A8 - ldr r1, _0813B6A4 + ldr r1, =0x020375f0 movs r0, 0x3 b _0813B6AC .align 2, 0 -_0813B6A0: .4byte 0x020375e2 -_0813B6A4: .4byte 0x020375f0 + .pool _0813B6A8: - ldr r1, _0813B6B0 + ldr r1, =0x020375f0 movs r0, 0 _0813B6AC: strh r0, [r1] b _0813B790 .align 2, 0 -_0813B6B0: .4byte 0x020375f0 + .pool _0813B6B4: bl sub_800A520 lsls r0, 24 @@ -647076,12 +625814,12 @@ _0813B6C2: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _0813B6E0 + ldr r1, =0x020375f0 movs r2, 0x2 bl link_0800A448 b _0813B708 .align 2, 0 -_0813B6E0: .4byte 0x020375f0 + .pool _0813B6E4: bl sub_800A550 movs r1, 0x1 @@ -647092,14 +625830,14 @@ _0813B6E4: lsls r0, 24 cmp r0, 0 beq _0813B790 - ldr r1, _0813B71C - ldr r0, _0813B720 + ldr r1, =0x020375f0 + ldr r0, =0x020223c4 ldrh r0, [r0] strh r0, [r1] movs r0, 0 bl sub_800A5EC _0813B708: - ldr r1, _0813B724 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -647109,35 +625847,31 @@ _0813B708: strh r1, [r0, 0x8] b _0813B7C6 .align 2, 0 -_0813B71C: .4byte 0x020375f0 -_0813B720: .4byte 0x020223c4 -_0813B724: .4byte 0x03005e00 + .pool _0813B728: bl link_get_multiplayer_id lsls r0, 24 cmp r0, 0 bne _0813B74C - ldr r0, _0813B744 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x2 bne _0813B790 - ldr r0, _0813B748 + ldr r0, =0x0824979b bl box_related_two__3 b _0813B790 .align 2, 0 -_0813B744: .4byte 0x020375f0 -_0813B748: .4byte 0x0824979b + .pool _0813B74C: - ldr r0, _0813B75C + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x3 bne _0813B790 - ldr r0, _0813B760 + ldr r0, =0x0824979b bl box_related_two__3 b _0813B790 .align 2, 0 -_0813B75C: .4byte 0x020375f0 -_0813B760: .4byte 0x0824979b + .pool _0813B764: movs r0, 0 bl a_pressed_maybe @@ -647160,7 +625894,7 @@ _0813B784: cmp r0, 0x1 bne _0813B7C6 _0813B790: - ldr r0, _0813B7A4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -647170,16 +625904,16 @@ _0813B790: strh r0, [r1, 0x8] b _0813B7C6 .align 2, 0 -_0813B7A4: .4byte 0x03005e00 + .pool _0813B7A8: - ldr r0, _0813B7CC + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _0813B7B4 bl sub_800AC34 _0813B7B4: - ldr r0, _0813B7D0 - ldr r1, _0813B7D4 + ldr r0, =0x02022fec + ldr r1, =0x0203ab70 ldr r1, [r1] str r1, [r0] bl script_env_2_enable_and_set_ctx_running @@ -647190,28 +625924,25 @@ _0813B7C6: pop {r0} bx r0 .align 2, 0 -_0813B7CC: .4byte 0x030030fc -_0813B7D0: .4byte 0x02022fec -_0813B7D4: .4byte 0x0203ab70 + .pool thumb_func_end sub_813B57C thumb_func_start sub_813B7D8 sub_813B7D8: @ 813B7D8 push {lr} - ldr r0, _0813B7F0 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne _0813B7F8 - ldr r2, _0813B7F4 + ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 movs r0, 0 movs r1, 0x1 bl sub_81D6720 b _0813B802 .align 2, 0 -_0813B7F0: .4byte 0x020375e0 -_0813B7F4: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool _0813B7F8: - ldr r2, _0813B808 + ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 movs r0, 0x1 movs r1, 0 bl sub_81D6720 @@ -647219,13 +625950,13 @@ _0813B802: pop {r0} bx r0 .align 2, 0 -_0813B808: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_813B7D8 thumb_func_start sub_813B80C sub_813B80C: @ 813B80C push {lr} - ldr r0, _0813B820 + ldr r0, =sub_813B824 + 1 movs r1, 0x8 bl AddTask movs r0, 0x9D @@ -647233,7 +625964,7 @@ sub_813B80C: @ 813B80C pop {r0} bx r0 .align 2, 0 -_0813B820: .4byte sub_813B824 + 1 + .pool thumb_func_end sub_813B80C thumb_func_start sub_813B824 @@ -647245,14 +625976,14 @@ sub_813B824: @ 813B824 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0813B874 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] movs r0, 0x2 ldrsh r1, [r4, r0] - ldr r0, _0813B878 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r1, r0 bne _0813B858 @@ -647266,7 +625997,7 @@ sub_813B824: @ 813B824 _0813B858: movs r0, 0 ldrsh r1, [r4, r0] - ldr r0, _0813B87C + ldr r0, =0x020375e0 ldrh r0, [r0] subs r0, 0x1 cmp r1, r0 @@ -647278,20 +626009,18 @@ _0813B86C: pop {r0} bx r0 .align 2, 0 -_0813B874: .4byte 0x03005e08 -_0813B878: .4byte 0x020375e2 -_0813B87C: .4byte 0x020375e0 + .pool thumb_func_end sub_813B824 thumb_func_start sub_813B880 sub_813B880: @ 813B880 push {lr} - ldr r0, _0813B8A8 + ldr r0, =_fwalk + 1 movs r1, 0x8 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0813B8AC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -647305,8 +626034,7 @@ sub_813B880: @ 813B880 pop {r0} bx r0 .align 2, 0 -_0813B8A8: .4byte _fwalk + 1 -_0813B8AC: .4byte 0x03005e00 + .pool thumb_func_end sub_813B880 thumb_func_start _fwalk @@ -647322,7 +626050,7 @@ _fwalk: @ 813B8B0 lsls r0, 2 add r0, r9 lsls r0, 3 - ldr r1, _0813B95C + ldr r1, =0x03005e08 adds r5, r0, r1 movs r0, 0x6 ldrsh r1, [r5, r0] @@ -647347,7 +626075,7 @@ _0813B8EA: adds r7, r6, 0x1 mov r8, r7 _0813B8F4: - ldr r0, _0813B960 + ldr r0, =0x03005d8c ldr r1, [r0] movs r2, 0 ldrsh r0, [r1, r2] @@ -647357,7 +626085,7 @@ _0813B8F4: ldrsh r1, [r1, r3] adds r1, r6 adds r1, 0x4 - ldr r7, _0813B964 + ldr r7, =0x00000201 adds r2, r4, r7 add r2, r10 movs r7, 0x6 @@ -647397,16 +626125,14 @@ _0813B94E: pop {r0} bx r0 .align 2, 0 -_0813B95C: .4byte 0x03005e08 -_0813B960: .4byte 0x03005d8c -_0813B964: .4byte 0x00000201 + .pool thumb_func_end _fwalk thumb_func_start sub_813B968 sub_813B968: @ 813B968 push {r4,r5,lr} - ldr r5, _0813B998 - ldr r0, _0813B99C + ldr r5, =0x020375f0 + ldr r0, =0x020375e0 ldrh r0, [r0] movs r1, 0x7 bl __udivsi3 @@ -647426,14 +626152,13 @@ sub_813B968: @ 813B968 pop {r0} bx r0 .align 2, 0 -_0813B998: .4byte 0x020375f0 -_0813B99C: .4byte 0x020375e0 + .pool thumb_func_end sub_813B968 thumb_func_start sub_813B9A0 sub_813B9A0: @ 813B9A0 push {lr} - ldr r0, _0813B9BC + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x1C] movs r0, 0xB0 @@ -647446,13 +626171,13 @@ _0813B9B6: pop {r0} bx r0 .align 2, 0 -_0813B9BC: .4byte 0x03005d8c + .pool thumb_func_end sub_813B9A0 thumb_func_start sub_813B9C0 sub_813B9C0: @ 813B9C0 push {r4,lr} - ldr r0, _0813B9F0 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -647463,9 +626188,9 @@ sub_813B9C0: @ 813B9C0 adds r0, r1 lsls r0, 16 lsrs r3, r0, 16 - ldr r2, _0813B9F4 + ldr r2, =0x085b3444 ldrh r0, [r2] - ldr r1, _0813B9F8 + ldr r1, =0x0000ffff cmp r0, r1 beq _0813BA06 adds r4, r1, 0 @@ -647477,9 +626202,7 @@ _0813B9E6: movs r0, 0x1 b _0813BA08 .align 2, 0 -_0813B9F0: .4byte 0x03005d8c -_0813B9F4: .4byte 0x085b3444 -_0813B9F8: .4byte 0x0000ffff + .pool _0813B9FC: adds r1, 0x2 adds r2, 0x2 @@ -647496,9 +626219,9 @@ _0813BA08: thumb_func_start sub_813BA10 sub_813BA10: @ 813BA10 - ldr r0, _0813BA28 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0813BA2C + ldr r2, =0x0000141e adds r1, r0, r2 movs r2, 0 strh r2, [r1] @@ -647508,8 +626231,7 @@ sub_813BA10: @ 813BA10 strh r2, [r0] bx lr .align 2, 0 -_0813BA28: .4byte 0x03005d8c -_0813BA2C: .4byte 0x0000141e + .pool thumb_func_end sub_813BA10 thumb_func_start sub_813BA30 @@ -647520,9 +626242,9 @@ sub_813BA30: @ 813BA30 cmp r0, 0 beq _0813BA52 bl sub_813BCE8 - ldr r0, _0813BA58 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0813BA5C + ldr r0, =0x03005d90 ldr r0, [r0] ldrh r0, [r0, 0xE] movs r2, 0xA1 @@ -647533,16 +626255,15 @@ _0813BA52: pop {r0} bx r0 .align 2, 0 -_0813BA58: .4byte 0x03005d8c -_0813BA5C: .4byte 0x03005d90 + .pool thumb_func_end sub_813BA30 thumb_func_start sub_813BA60 sub_813BA60: @ 813BA60 push {r4,lr} - ldr r4, _0813BABC + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _0813BAC0 + ldr r1, =0x0000141e adds r0, r1 ldrh r0, [r0] lsrs r0, 7 @@ -647553,25 +626274,25 @@ sub_813BA60: @ 813BA60 bl sub_813BF60 bl sub_813BD84 ldr r1, [r4] - ldr r0, _0813BAC4 + ldr r0, =0x03005d90 ldr r0, [r0] ldrh r0, [r0, 0xE] movs r2, 0xA1 lsls r2, 5 adds r1, r2 strh r0, [r1] - ldr r0, _0813BAC8 + ldr r0, =0x00000315 bl flag_clear - ldr r0, _0813BACC + ldr r0, =0x00000316 bl flag_clear - ldr r0, _0813BAD0 + ldr r0, =0x00000317 bl flag_clear movs r0, 0xC6 lsls r0, 2 bl flag_clear - ldr r0, _0813BAD4 + ldr r0, =0x000002da bl flag_clear - ldr r0, _0813BAD8 + ldr r0, =0x00004095 movs r1, 0x1 bl var_set _0813BAB6: @@ -647579,14 +626300,7 @@ _0813BAB6: pop {r0} bx r0 .align 2, 0 -_0813BABC: .4byte 0x03005d8c -_0813BAC0: .4byte 0x0000141e -_0813BAC4: .4byte 0x03005d90 -_0813BAC8: .4byte 0x00000315 -_0813BACC: .4byte 0x00000316 -_0813BAD0: .4byte 0x00000317 -_0813BAD4: .4byte 0x000002da -_0813BAD8: .4byte 0x00004095 + .pool thumb_func_end sub_813BA60 thumb_func_start sub_813BADC @@ -647594,20 +626308,20 @@ sub_813BADC: @ 813BADC push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0813BB28 + ldr r0, =0x00004095 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 bne _0813BB58 - ldr r4, _0813BB2C + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r5, _0813BB30 + ldr r5, =0x0000141e adds r3, r0, r5 ldrh r2, [r3] movs r1, 0x7F ands r1, r2 - ldr r0, _0813BB34 + ldr r0, =0x085b3470 adds r0, r6, r0 ldrb r0, [r0] adds r1, r0 @@ -647622,35 +626336,31 @@ sub_813BADC: @ 813BADC ldr r0, [r4] adds r0, r5 ldrh r2, [r0] - ldr r1, _0813BB38 + ldr r1, =0x0000ff80 ands r1, r2 strh r1, [r0] b _0813BB58 .align 2, 0 -_0813BB28: .4byte 0x00004095 -_0813BB2C: .4byte 0x03005d8c -_0813BB30: .4byte 0x0000141e -_0813BB34: .4byte 0x085b3470 -_0813BB38: .4byte 0x0000ff80 + .pool _0813BB3C: ldr r2, [r4] adds r2, r5 ldrh r1, [r2] - ldr r0, _0813BB50 + ldr r0, =0x0000ff80 ands r0, r1 movs r1, 0x14 orrs r0, r1 strh r0, [r2] b _0813BB58 .align 2, 0 -_0813BB50: .4byte 0x0000ff80 + .pool _0813BB54: adds r0, r2, r0 strh r0, [r3] _0813BB58: - ldr r0, _0813BB6C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0813BB70 + ldr r1, =0x0000141e adds r0, r1 ldrb r1, [r0] movs r0, 0x7F @@ -647659,8 +626369,7 @@ _0813BB58: pop {r1} bx r1 .align 2, 0 -_0813BB6C: .4byte 0x03005d8c -_0813BB70: .4byte 0x0000141e + .pool thumb_func_end sub_813BADC thumb_func_start sub_813BB74 @@ -647669,14 +626378,14 @@ sub_813BB74: @ 813BB74 sub sp, 0x8 movs r3, 0 movs r5, 0 - ldr r7, _0813BBBC - ldr r2, _0813BBC0 + ldr r7, =0x03005d8c + ldr r2, =0x0000141e movs r6, 0x1 _0813BB82: ldr r0, [r7] adds r0, r2 ldrh r1, [r0] - ldr r0, _0813BBC4 + ldr r0, =0x085b3474 adds r0, r5, r0 ldrb r4, [r0] asrs r1, r4 @@ -647702,20 +626411,18 @@ _0813BB82: strh r1, [r0] b _0813BBEA .align 2, 0 -_0813BBBC: .4byte 0x03005d8c -_0813BBC0: .4byte 0x0000141e -_0813BBC4: .4byte 0x085b3474 + .pool _0813BBC8: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x7 bls _0813BB82 - ldr r0, _0813BBF4 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r0, _0813BBF8 + ldr r0, =0x0000141e adds r2, r0 - ldr r1, _0813BBFC + ldr r1, =0x085b3474 adds r1, r3, r1 movs r0, 0x1 ldrb r1, [r1] @@ -647730,9 +626437,7 @@ _0813BBEA: pop {r1} bx r1 .align 2, 0 -_0813BBF4: .4byte 0x03005d8c -_0813BBF8: .4byte 0x0000141e -_0813BBFC: .4byte 0x085b3474 + .pool thumb_func_end sub_813BB74 thumb_func_start sub_813BC00 @@ -647762,9 +626467,9 @@ _0813BC1E: b _0813BC8C _0813BC2E: movs r5, 0 - ldr r2, _0813BC9C + ldr r2, =0x03005d8c mov r8, r2 - ldr r0, _0813BCA0 + ldr r0, =0x0000141e mov r9, r0 movs r4, 0x1 _0813BC3A: @@ -647772,7 +626477,7 @@ _0813BC3A: ldr r0, [r1] add r0, r9 ldrh r1, [r0] - ldr r7, _0813BCA4 + ldr r7, =0x085b347c adds r0, r5, r7 ldrb r6, [r0] asrs r1, r6 @@ -647791,9 +626496,9 @@ _0813BC5E: lsrs r5, r0, 24 cmp r5, 0x7 bls _0813BC3A - ldr r0, _0813BC9C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0813BCA0 + ldr r2, =0x0000141e adds r4, r0, r2 ldrh r1, [r4] mov r2, r10 @@ -647820,9 +626525,7 @@ _0813BC8E: pop {r1} bx r1 .align 2, 0 -_0813BC9C: .4byte 0x03005d8c -_0813BCA0: .4byte 0x0000141e -_0813BCA4: .4byte 0x085b347c + .pool thumb_func_end sub_813BC00 thumb_func_start sub_813BCA8 @@ -647830,9 +626533,9 @@ sub_813BCA8: @ 813BCA8 push {r4,r5,lr} movs r3, 0 movs r2, 0 - ldr r0, _0813BCE0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0813BCE4 + ldr r1, =0x0000141e adds r0, r1 ldrh r4, [r0] movs r5, 0x1 @@ -647858,29 +626561,27 @@ _0813BCCE: pop {r1} bx r1 .align 2, 0 -_0813BCE0: .4byte 0x03005d8c -_0813BCE4: .4byte 0x0000141e + .pool thumb_func_end sub_813BCA8 thumb_func_start sub_813BCE8 sub_813BCE8: @ 813BCE8 push {r4-r6,lr} movs r5, 0 - ldr r2, _0813BCFC + ldr r2, =0x03005d90 ldr r0, [r2] ldrh r1, [r0, 0xE] - ldr r0, _0813BD00 + ldr r0, =0x000003e6 cmp r1, r0 bhi _0813BD58 adds r6, r2, 0 b _0813BD32 .align 2, 0 -_0813BCFC: .4byte 0x03005d90 -_0813BD00: .4byte 0x000003e6 + .pool _0813BD04: ldr r0, [r6] ldrh r1, [r0, 0xE] - ldr r4, _0813BD50 + ldr r4, =0x03005d8c ldr r0, [r4] movs r2, 0xA1 lsls r2, 5 @@ -647906,7 +626607,7 @@ _0813BD32: lsrs r0, 16 cmp r0, 0x4 bhi _0813BD54 - ldr r0, _0813BD50 + ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, [r6] ldrh r0, [r0, 0xE] @@ -647916,7 +626617,7 @@ _0813BD32: strh r0, [r1] b _0813BD58 .align 2, 0 -_0813BD50: .4byte 0x03005d8c + .pool _0813BD54: cmp r5, 0x8 bne _0813BD04 @@ -647928,28 +626629,26 @@ _0813BD58: thumb_func_start sub_813BD60 sub_813BD60: @ 813BD60 - ldr r0, _0813BD78 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0813BD7C + ldr r1, =0x0000141e adds r0, r1 ldrh r0, [r0] - ldr r1, _0813BD80 + ldr r1, =0x020375e0 ldrh r1, [r1] asrs r0, r1 movs r1, 0x1 ands r0, r1 bx lr .align 2, 0 -_0813BD78: .4byte 0x03005d8c -_0813BD7C: .4byte 0x0000141e -_0813BD80: .4byte 0x020375e0 + .pool thumb_func_end sub_813BD60 thumb_func_start sub_813BD84 sub_813BD84: @ 813BD84 - ldr r0, _0813BDAC + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r0, _0813BDB0 + ldr r0, =0x0000141e adds r2, r0 ldrh r1, [r2] movs r3, 0x80 @@ -647967,8 +626666,7 @@ sub_813BD84: @ 813BD84 strh r0, [r2] bx lr .align 2, 0 -_0813BDAC: .4byte 0x03005d8c -_0813BDB0: .4byte 0x0000141e + .pool thumb_func_end sub_813BD84 thumb_func_start sub_813BDB4 @@ -647976,19 +626674,18 @@ sub_813BDB4: @ 813BDB4 push {lr} movs r3, 0 movs r2, 0 - ldr r0, _0813BDD0 + ldr r0, =0x020375e0 ldrh r0, [r0] subs r0, 0x8 cmp r0, 0x7 bhi _0813BE14 lsls r0, 2 - ldr r1, _0813BDD4 + ldr r1, =_0813BDD8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813BDD0: .4byte 0x020375e0 -_0813BDD4: .4byte _0813BDD8 + .pool .align 2, 0 _0813BDD8: .4byte _0813BE14 @@ -648019,17 +626716,16 @@ _0813BE10: movs r3, 0x1 movs r2, 0x5 _0813BE14: - ldr r0, _0813BE28 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0813BE2C + ldr r1, =0x00003150 adds r0, r1 adds r1, r3, 0 bl sub_813BE30 pop {r0} bx r0 .align 2, 0 -_0813BE28: .4byte 0x03005d8c -_0813BE2C: .4byte 0x00003150 + .pool thumb_func_end sub_813BDB4 thumb_func_start sub_813BE30 @@ -648048,12 +626744,12 @@ sub_813BE30: @ 813BE30 cmp r2, 0x5 bhi _0813BED4 lsls r0, r2, 2 - ldr r1, _0813BE54 + ldr r1, =_0813BE58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813BE54: .4byte _0813BE58 + .pool .align 2, 0 _0813BE58: .4byte _0813BED4 @@ -648063,55 +626759,49 @@ _0813BE58: .4byte _0813BEAC .4byte _0813BEC0 _0813BE70: - ldr r0, _0813BE7C - ldr r1, _0813BE80 + ldr r0, =0x02021cc4 + ldr r1, =0x085ead14 bl gf_strcpy b _0813BF04 .align 2, 0 -_0813BE7C: .4byte 0x02021cc4 -_0813BE80: .4byte 0x085ead14 + .pool _0813BE84: - ldr r0, _0813BE90 - ldr r1, _0813BE94 + ldr r0, =0x02021cc4 + ldr r1, =0x085ead1b bl gf_strcpy b _0813BF04 .align 2, 0 -_0813BE90: .4byte 0x02021cc4 -_0813BE94: .4byte 0x085ead1b + .pool _0813BE98: - ldr r0, _0813BEA4 - ldr r1, _0813BEA8 + ldr r0, =0x02021cc4 + ldr r1, =0x085ead22 bl gf_strcpy b _0813BF04 .align 2, 0 -_0813BEA4: .4byte 0x02021cc4 -_0813BEA8: .4byte 0x085ead22 + .pool _0813BEAC: - ldr r0, _0813BEB8 - ldr r1, _0813BEBC + ldr r0, =0x02021cc4 + ldr r1, =0x085ead29 bl gf_strcpy b _0813BF04 .align 2, 0 -_0813BEB8: .4byte 0x02021cc4 -_0813BEBC: .4byte 0x085ead29 + .pool _0813BEC0: - ldr r0, _0813BECC - ldr r1, _0813BED0 + ldr r0, =0x02021cc4 + ldr r1, =0x085ead30 bl gf_strcpy b _0813BF04 .align 2, 0 -_0813BECC: .4byte 0x02021cc4 -_0813BED0: .4byte 0x085ead30 + .pool _0813BED4: - ldr r0, _0813BEE0 - ldr r1, _0813BEE4 + ldr r0, =0x02021cc4 + ldr r1, =0x085ead0c bl gf_strcpy b _0813BF04 .align 2, 0 -_0813BEE0: .4byte 0x02021cc4 -_0813BEE4: .4byte 0x085ead0c + .pool _0813BEE8: - ldr r4, _0813BF0C + ldr r4, =0x02021cc4 adds r0, r4, 0 movs r2, 0x7 bl gf_strncpy @@ -648128,28 +626818,27 @@ _0813BF04: pop {r0} bx r0 .align 2, 0 -_0813BF0C: .4byte 0x02021cc4 + .pool thumb_func_end sub_813BE30 thumb_func_start sub_813BF10 sub_813BF10: @ 813BF10 push {lr} - ldr r0, _0813BF34 + ldr r0, =0x00004095 bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 bne _0813BF40 bl sub_813BA30 - ldr r0, _0813BF38 + ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 bne _0813BF3C bl sub_813BB74 b _0813BF40 .align 2, 0 -_0813BF34: .4byte 0x00004095 -_0813BF38: .4byte 0x0202433a + .pool _0813BF3C: bl sub_813BC00 _0813BF40: @@ -648159,9 +626848,9 @@ _0813BF40: thumb_func_start sub_813BF44 sub_813BF44: @ 813BF44 - ldr r0, _0813BF58 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0813BF5C + ldr r1, =0x0000141e adds r0, r1 ldrh r0, [r0] lsrs r0, 7 @@ -648169,15 +626858,14 @@ sub_813BF44: @ 813BF44 ands r0, r1 bx lr .align 2, 0 -_0813BF58: .4byte 0x03005d8c -_0813BF5C: .4byte 0x0000141e + .pool thumb_func_end sub_813BF44 thumb_func_start sub_813BF60 sub_813BF60: @ 813BF60 - ldr r0, _0813BF74 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0813BF78 + ldr r0, =0x0000141e adds r1, r0 ldrh r2, [r1] movs r0, 0x80 @@ -648185,14 +626873,13 @@ sub_813BF60: @ 813BF60 strh r0, [r1] bx lr .align 2, 0 -_0813BF74: .4byte 0x03005d8c -_0813BF78: .4byte 0x0000141e + .pool thumb_func_end sub_813BF60 thumb_func_start sub_813BF7C sub_813BF7C: @ 813BF7C push {lr} - ldr r0, _0813BF90 + ldr r0, =0x020375e0 ldrb r0, [r0] bl sub_813BADC lsls r0, 24 @@ -648200,7 +626887,7 @@ sub_813BF7C: @ 813BF7C pop {r1} bx r1 .align 2, 0 -_0813BF90: .4byte 0x020375e0 + .pool thumb_func_end sub_813BF7C thumb_func_start sub_813BF94 @@ -648211,7 +626898,7 @@ sub_813BF94: @ 813BF94 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r2, _0813BFC0 + ldr r2, =0x01000008 mov r0, sp adds r1, r4, 0 bl CpuSet @@ -648227,7 +626914,7 @@ sub_813BF94: @ 813BF94 pop {r0} bx r0 .align 2, 0 -_0813BFC0: .4byte 0x01000008 + .pool thumb_func_end sub_813BF94 thumb_func_start sub_813BFC4 @@ -648400,33 +627087,33 @@ _0813C0E8: strh r0, [r2, 0xA] lsls r0, 16 lsrs r0, 16 - ldr r1, _0813C0FC + ldr r1, =0x0000270f cmp r0, r1 bls _0813C12A strh r1, [r2, 0xA] b _0813C12A .align 2, 0 -_0813C0FC: .4byte 0x0000270f + .pool _0813C100: ldrh r0, [r2, 0xC] adds r0, 0x1 strh r0, [r2, 0xC] lsls r0, 16 lsrs r0, 16 - ldr r1, _0813C114 + ldr r1, =0x0000270f cmp r0, r1 bls _0813C12A strh r1, [r2, 0xC] b _0813C12A .align 2, 0 -_0813C114: .4byte 0x0000270f + .pool _0813C118: ldrh r0, [r2, 0xE] adds r0, 0x1 strh r0, [r2, 0xE] lsls r0, 16 lsrs r0, 16 - ldr r1, _0813C130 + ldr r1, =0x0000270f cmp r0, r1 bls _0813C12A strh r1, [r2, 0xE] @@ -648434,7 +627121,7 @@ _0813C12A: pop {r0} bx r0 .align 2, 0 -_0813C130: .4byte 0x0000270f + .pool thumb_func_end sub_813C0D0 thumb_func_start sub_813C134 @@ -648462,7 +627149,7 @@ _0813C152: _0813C154: adds r0, r4, 0 bl sub_80847F8 - ldr r1, _0813C16C + ldr r1, =0x0000270e cmp r0, r1 bhi _0813C166 adds r0, r4, 0 @@ -648472,7 +627159,7 @@ _0813C166: pop {r0} bx r0 .align 2, 0 -_0813C16C: .4byte 0x0000270e + .pool thumb_func_end sub_813C134 thumb_func_start sub_813C170 @@ -648514,7 +627201,7 @@ sub_813C170: @ 813C170 strh r7, [r4, 0x8] adds r2, r6, 0 adds r2, 0x54 - ldr r1, _0813C1F4 + ldr r1, =0x020229e8 mov r3, r9 lsls r0, r3, 3 subs r0, r3 @@ -648537,22 +627224,21 @@ _0813C1D4: pop {r0} bx r0 .align 2, 0 -_0813C1F4: .4byte 0x020229e8 + .pool thumb_func_end sub_813C170 thumb_func_start sub_813C1F8 sub_813C1F8: @ 813C1F8 push {lr} - ldr r0, _0813C20C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0813C210 + ldr r1, =0x00003150 adds r0, r1 bl sub_813BFC4 pop {r0} bx r0 .align 2, 0 -_0813C20C: .4byte 0x03005d8c -_0813C210: .4byte 0x00003150 + .pool thumb_func_end sub_813C1F8 thumb_func_start sub_813C214 @@ -648560,14 +627246,14 @@ sub_813C214: @ 813C214 push {lr} movs r1, 0x64 muls r1, r0 - ldr r0, _0813C234 + ldr r0, =0x02039b6c adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] lsls r0, 16 lsrs r0, 16 - ldr r2, _0813C238 + ldr r2, =0x0000270f cmp r0, r2 bls _0813C230 strh r2, [r1] @@ -648575,8 +627261,7 @@ _0813C230: pop {r0} bx r0 .align 2, 0 -_0813C234: .4byte 0x02039b6c -_0813C238: .4byte 0x0000270f + .pool thumb_func_end sub_813C214 thumb_func_start sub_813C23C @@ -648584,14 +627269,14 @@ sub_813C23C: @ 813C23C push {lr} movs r1, 0x64 muls r1, r0 - ldr r0, _0813C25C + ldr r0, =0x02039b6e adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] lsls r0, 16 lsrs r0, 16 - ldr r2, _0813C260 + ldr r2, =0x0000270f cmp r0, r2 bls _0813C258 strh r2, [r1] @@ -648599,15 +627284,14 @@ _0813C258: pop {r0} bx r0 .align 2, 0 -_0813C25C: .4byte 0x02039b6e -_0813C260: .4byte 0x0000270f + .pool thumb_func_end sub_813C23C thumb_func_start sub_813C264 sub_813C264: @ 813C264 push {r4,lr} adds r4, r0, 0 - ldr r0, _0813C278 + ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 beq _0813C27C @@ -648615,7 +627299,7 @@ sub_813C264: @ 813C264 beq _0813C28A b _0813C298 .align 2, 0 -_0813C278: .4byte 0x0202433a + .pool _0813C27C: eors r0, r4 bl sub_813C214 @@ -648644,19 +627328,19 @@ sub_813C2A0: @ 813C2A0 beq _0813C2DA adds r0, r4, 0 bl sub_813C264 - ldr r0, _0813C2E4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0813C2E8 + ldr r1, =0x00003150 adds r0, r1 movs r1, 0x64 adds r3, r4, 0 muls r3, r1 - ldr r2, _0813C2EC + ldr r2, =0x02039b88 adds r1, r3, r2 subs r2, 0x30 adds r3, r2 ldrh r2, [r3, 0xE] - ldr r3, _0813C2F0 + ldr r3, =0x0202433a ldrb r3, [r3] lsls r4, 24 lsrs r4, 24 @@ -648668,17 +627352,14 @@ _0813C2DA: pop {r0} bx r0 .align 2, 0 -_0813C2E4: .4byte 0x03005d8c -_0813C2E8: .4byte 0x00003150 -_0813C2EC: .4byte 0x02039b88 -_0813C2F0: .4byte 0x0202433a + .pool thumb_func_end sub_813C2A0 thumb_func_start sub_813C2F4 sub_813C2F4: @ 813C2F4 push {r4,lr} sub sp, 0xC - ldr r4, _0813C36C + ldr r4, =0x02021cc4 movs r0, 0x17 bl sub_80847F8 adds r1, r0, 0 @@ -648686,7 +627367,7 @@ sub_813C2F4: @ 813C2F4 movs r2, 0 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _0813C370 + ldr r4, =0x02021dc4 movs r0, 0x18 bl sub_80847F8 adds r1, r0, 0 @@ -648694,7 +627375,7 @@ sub_813C2F4: @ 813C2F4 movs r2, 0 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _0813C374 + ldr r4, =0x02021ec4 movs r0, 0x19 bl sub_80847F8 adds r1, r0, 0 @@ -648702,8 +627383,8 @@ sub_813C2F4: @ 813C2F4 movs r2, 0 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _0813C378 - ldr r1, _0813C37C + ldr r4, =0x02021fc4 + ldr r1, =0x085ef6a1 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -648711,7 +627392,7 @@ sub_813C2F4: @ 813C2F4 movs r2, 0xD0 bl sub_81DB35C adds r3, r0, 0 - ldr r0, _0813C380 + ldr r0, =0x0203ab74 ldrb r0, [r0] lsls r3, 24 lsrs r3, 24 @@ -648728,12 +627409,7 @@ sub_813C2F4: @ 813C2F4 pop {r0} bx r0 .align 2, 0 -_0813C36C: .4byte 0x02021cc4 -_0813C370: .4byte 0x02021dc4 -_0813C374: .4byte 0x02021ec4 -_0813C378: .4byte 0x02021fc4 -_0813C37C: .4byte 0x085ef6a1 -_0813C380: .4byte 0x0203ab74 + .pool thumb_func_end sub_813C2F4 thumb_func_start sub_813C384 @@ -648752,10 +627428,10 @@ sub_813C384: @ 813C384 ldr r7, [r6, 0xC] cmp r7, 0 bne _0813C40C - ldr r0, _0813C400 + ldr r0, =0x0203ab74 mov r8, r0 ldrb r0, [r0] - ldr r2, _0813C404 + ldr r2, =0x085b3d84 lsls r4, 3 adds r4, 0x1 lsls r4, 24 @@ -648768,7 +627444,7 @@ sub_813C384: @ 813C384 bl Print mov r1, r8 ldrb r0, [r1] - ldr r5, _0813C408 + ldr r5, =0x085b3d8c str r4, [sp] str r7, [sp, 0x4] str r7, [sp, 0x8] @@ -648796,22 +627472,20 @@ sub_813C384: @ 813C384 bl Print b _0813C4A8 .align 2, 0 -_0813C400: .4byte 0x0203ab74 -_0813C404: .4byte 0x085b3d84 -_0813C408: .4byte 0x085b3d8c + .pool _0813C40C: - ldr r0, _0813C4B4 + ldr r0, =0x02021cc4 movs r1, 0x8 bl sub_800917C - ldr r0, _0813C4B4 + ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0x7 bl gf_strncpy lsls r1, r5, 24 lsrs r1, 24 - ldr r0, _0813C4B4 + ldr r0, =0x02021cc4 bl sub_8009308 - ldr r0, _0813C4B8 + ldr r0, =0x0203ab74 mov r8, r0 ldrb r0, [r0] lsls r4, 3 @@ -648823,11 +627497,11 @@ _0813C40C: str r5, [sp, 0x4] str r5, [sp, 0x8] movs r1, 0x1 - ldr r2, _0813C4B4 + ldr r2, =0x02021cc4 movs r3, 0x8 bl Print ldrh r1, [r6, 0xA] - ldr r0, _0813C4B4 + ldr r0, =0x02021cc4 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string @@ -648837,11 +627511,11 @@ _0813C40C: str r5, [sp, 0x4] str r5, [sp, 0x8] movs r1, 0x1 - ldr r2, _0813C4B4 + ldr r2, =0x02021cc4 movs r3, 0x50 bl Print ldrh r1, [r6, 0xC] - ldr r0, _0813C4B4 + ldr r0, =0x02021cc4 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string @@ -648851,11 +627525,11 @@ _0813C40C: str r5, [sp, 0x4] str r5, [sp, 0x8] movs r1, 0x1 - ldr r2, _0813C4B4 + ldr r2, =0x02021cc4 movs r3, 0x80 bl Print ldrh r1, [r6, 0xE] - ldr r0, _0813C4B4 + ldr r0, =0x02021cc4 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string @@ -648865,7 +627539,7 @@ _0813C40C: str r5, [sp, 0x4] str r5, [sp, 0x8] movs r1, 0x1 - ldr r2, _0813C4B4 + ldr r2, =0x02021cc4 movs r3, 0xB0 bl Print _0813C4A8: @@ -648876,8 +627550,7 @@ _0813C4A8: pop {r0} bx r0 .align 2, 0 -_0813C4B4: .4byte 0x02021cc4 -_0813C4B8: .4byte 0x0203ab74 + .pool thumb_func_end sub_813C384 thumb_func_start sub_813C4BC @@ -648887,8 +627560,8 @@ sub_813C4BC: @ 813C4BC mov r6, r8 push {r6,r7} sub sp, 0xC - ldr r6, _0813C580 - ldr r0, _0813C584 + ldr r6, =0x0203ab74 + ldr r0, =0x085b3d7c bl Window_AddFromTemplate strb r0, [r6] ldrb r0, [r6] @@ -648897,8 +627570,8 @@ sub_813C4BC: @ 813C4BC ldrb r0, [r6] movs r1, 0x11 bl Window_FastFillPixels - ldr r5, _0813C588 - ldr r1, _0813C58C + ldr r5, =0x02021fc4 + ldr r1, =0x085ef68d adds r0, r5, 0 bl ExpandTextCodes movs r0, 0x1 @@ -648916,14 +627589,14 @@ sub_813C4BC: @ 813C4BC str r4, [sp, 0x8] adds r2, r5, 0 bl Print - ldr r0, _0813C590 + ldr r0, =0x03005d8c mov r8, r0 ldr r0, [r0] - ldr r1, _0813C594 + ldr r1, =0x00003150 mov r9, r1 add r0, r9 bl sub_813C2F4 - ldr r1, _0813C598 + ldr r1, =0x085ef6bd adds r0, r5, 0 bl ExpandTextCodes ldrb r0, [r6] @@ -648943,7 +627616,7 @@ _0813C540: ldr r2, [r7] adds r0, r2, r5 lsrs r1, r6, 24 - ldr r3, _0813C59C + ldr r3, =0x000031a0 adds r2, r3 adds r2, r4 ldrb r2, [r2] @@ -648955,7 +627628,7 @@ _0813C540: adds r4, 0x1 cmp r4, 0x4 ble _0813C540 - ldr r4, _0813C580 + ldr r4, =0x0203ab74 ldrb r0, [r4] bl Window_WriteStandardTileMap ldrb r0, [r4] @@ -648969,20 +627642,13 @@ _0813C540: pop {r0} bx r0 .align 2, 0 -_0813C580: .4byte 0x0203ab74 -_0813C584: .4byte 0x085b3d7c -_0813C588: .4byte 0x02021fc4 -_0813C58C: .4byte 0x085ef68d -_0813C590: .4byte 0x03005d8c -_0813C594: .4byte 0x00003150 -_0813C598: .4byte 0x085ef6bd -_0813C59C: .4byte 0x000031a0 + .pool thumb_func_end sub_813C4BC thumb_func_start sub_813C5A0 sub_813C5A0: @ 813C5A0 push {r4,lr} - ldr r4, _0813C5B8 + ldr r4, =0x0203ab74 ldrb r0, [r4] movs r1, 0 bl sub_819746C @@ -648992,7 +627658,7 @@ sub_813C5A0: @ 813C5A0 pop {r0} bx r0 .align 2, 0 -_0813C5B8: .4byte 0x0203ab74 + .pool thumb_func_end sub_813C5A0 thumb_func_start sub_813C5BC @@ -649000,26 +627666,24 @@ sub_813C5BC: @ 813C5BC push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0813C5E0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0813C5DC - ldr r0, _0813C5E4 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _0813C5E8 + ldr r0, =sub_813C5EC + 1 str r0, [r1] _0813C5DC: pop {r0} bx r0 .align 2, 0 -_0813C5E0: .4byte 0x02037fd4 -_0813C5E4: .4byte 0x03005e00 -_0813C5E8: .4byte sub_813C5EC + 1 + .pool thumb_func_end sub_813C5BC thumb_func_start sub_813C5EC @@ -649030,9 +627694,9 @@ sub_813C5EC: @ 813C5EC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0813C620 + ldr r0, =0x03005e00 adds r4, r1, r0 - ldr r0, _0813C624 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -649045,16 +627709,14 @@ sub_813C5EC: @ 813C5EC _0813C610: movs r0, 0x5 bl audio_play - ldr r0, _0813C628 + ldr r0, =sub_813C62C + 1 str r0, [r4] _0813C61A: pop {r4} pop {r0} bx r0 .align 2, 0 -_0813C620: .4byte 0x03005e00 -_0813C624: .4byte 0x030022c0 -_0813C628: .4byte sub_813C62C + 1 + .pool thumb_func_end sub_813C5EC thumb_func_start sub_813C62C @@ -649071,20 +627733,19 @@ sub_813C62C: @ 813C62C movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _0813C65C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0813C660 + ldr r1, =sub_813C664 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_0813C65C: .4byte 0x03005e00 -_0813C660: .4byte sub_813C664 + 1 + .pool thumb_func_end sub_813C62C thumb_func_start sub_813C664 @@ -649092,15 +627753,15 @@ sub_813C664: @ 813C664 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0813C69C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0813C694 - ldr r0, _0813C6A0 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 - ldr r0, _0813C6A4 + ldr r0, =0x0203ab78 ldr r0, [r0] bl free movs r0, 0 @@ -649113,9 +627774,7 @@ _0813C694: pop {r0} bx r0 .align 2, 0 -_0813C69C: .4byte 0x02037fd4 -_0813C6A0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 -_0813C6A4: .4byte 0x0203ab78 + .pool thumb_func_end sub_813C664 thumb_func_start sub_813C6A8 @@ -649153,10 +627812,10 @@ sub_813C6D4: @ 813C6D4 mov r8, r0 mov r2, sp movs r6, 0 - ldr r1, _0813C804 + ldr r1, =0x040000d4 movs r5, 0x80 lsls r5, 5 - ldr r7, _0813C808 + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -649186,7 +627845,7 @@ _0813C6FA: lsls r3, 3 movs r4, 0 str r4, [sp, 0x4] - ldr r2, _0813C804 + ldr r2, =0x040000d4 mov r1, r8 str r1, [r2] str r0, [r2, 0x4] @@ -649275,8 +627934,7 @@ _0813C6FA: pop {r0} bx r0 .align 2, 0 -_0813C804: .4byte 0x040000d4 -_0813C808: .4byte 0x81000800 + .pool thumb_func_end sub_813C6D4 thumb_func_start sub_813C80C @@ -649348,12 +628006,12 @@ sub_813C890: @ 813C890 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _0813C8CC + ldr r1, =0x085b3484 adds r0, r4, 0 movs r2, 0xC0 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r1, _0813C8D0 + ldr r1, =0x085b3564 movs r0, 0x20 str r0, [sp] str r0, [sp, 0x4] @@ -649361,7 +628019,7 @@ sub_813C890: @ 813C890 movs r2, 0 movs r3, 0 bl gpu_copy_to_iwram_tile_map_rect - ldr r0, _0813C8D4 + ldr r0, =0x085b3544 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply @@ -649370,9 +628028,7 @@ sub_813C890: @ 813C890 pop {r0} bx r0 .align 2, 0 -_0813C8CC: .4byte 0x085b3484 -_0813C8D0: .4byte 0x085b3564 -_0813C8D4: .4byte 0x085b3544 + .pool thumb_func_end sub_813C890 thumb_func_start sub_813C8D8 @@ -649401,19 +628057,19 @@ sub_813C904: @ 813C904 push {lr} movs r0, 0 bl SetVBlankCallback - ldr r0, _0813C918 + ldr r0, =sub_813C91C + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0813C918: .4byte sub_813C91C + 1 + .pool thumb_func_end sub_813C904 thumb_func_start sub_813C91C sub_813C91C: @ 813C91C push {r4,lr} sub sp, 0x4 - ldr r0, _0813C93C + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -649423,13 +628079,12 @@ sub_813C91C: @ 813C91C b _0813CA3C _0813C930: lsls r0, 2 - ldr r1, _0813C940 + ldr r1, =_0813C944 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813C93C: .4byte 0x030022c0 -_0813C940: .4byte _0813C944 + .pool .align 2, 0 _0813C944: .4byte _0813C964 @@ -649449,14 +628104,14 @@ _0813C970: bl sub_813C80C b _0813CA00 _0813C976: - ldr r4, _0813C9A0 + ldr r4, =0x0203ab78 movs r0, 0x80 lsls r0, 4 bl malloc_and_clear str r0, [r4] movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0813C9A4 + ldr r1, =0x085b3d64 movs r0, 0 movs r2, 0x2 bl bg_vram_setup @@ -649466,8 +628121,7 @@ _0813C976: bl sub_813C828 b _0813CA00 .align 2, 0 -_0813C9A0: .4byte 0x0203ab78 -_0813C9A4: .4byte 0x085b3d64 + .pool _0813C9A8: movs r0, 0x3 bl sub_813C890 @@ -649491,12 +628145,12 @@ _0813C9BE: bl gpu_copy_wram_bg_tilemap_to_vram b _0813CA00 _0813C9DE: - ldr r0, _0813C9EC + ldr r0, =0x085b3d6c bl Window_InitFromTemplates bl TextBox_ResetSomeField b _0813CA00 .align 2, 0 -_0813C9EC: .4byte 0x085b3d6c + .pool _0813C9F0: movs r0, 0x1 negs r0, r0 @@ -649506,7 +628160,7 @@ _0813C9F0: movs r3, 0 bl sub_80A1AD4 _0813CA00: - ldr r1, _0813CA10 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -649515,18 +628169,18 @@ _0813CA00: strb r0, [r1] b _0813CA3C .align 2, 0 -_0813CA10: .4byte 0x030022c0 + .pool _0813CA14: bl sub_813C880 - ldr r0, _0813CA44 + ldr r0, =sub_813C8D8 + 1 bl SetVBlankCallback bl sub_81D5C8C - ldr r0, _0813CA48 + ldr r0, =sub_813C5BC + 1 movs r1, 0x8 bl AddTask - ldr r0, _0813CA4C + ldr r0, =sub_813C8EC + 1 bl set_callback2 - ldr r0, _0813CA50 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -649538,15 +628192,12 @@ _0813CA3C: pop {r0} bx r0 .align 2, 0 -_0813CA44: .4byte sub_813C8D8 + 1 -_0813CA48: .4byte sub_813C5BC + 1 -_0813CA4C: .4byte sub_813C8EC + 1 -_0813CA50: .4byte 0x030022c0 + .pool thumb_func_end sub_813C91C thumb_func_start sub_813CA54 sub_813CA54: @ 813CA54 - ldr r0, _0813CA64 + ldr r0, =0x0203ab7c ldr r0, [r0] movs r1, 0x8A lsls r1, 1 @@ -649555,14 +628206,14 @@ sub_813CA54: @ 813CA54 strh r1, [r0] bx lr .align 2, 0 -_0813CA64: .4byte 0x0203ab7c + .pool thumb_func_end sub_813CA54 thumb_func_start sub_813CA68 sub_813CA68: @ 813CA68 push {lr} sub sp, 0x4 - ldr r0, _0813CA88 + ldr r0, =0x0203ab7c ldr r0, [r0] movs r1, 0x8A lsls r1, 1 @@ -649571,13 +628222,12 @@ sub_813CA68: @ 813CA68 cmp r0, 0x4 bhi _0813CB20 lsls r0, 2 - ldr r1, _0813CA8C + ldr r1, =_0813CA90 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813CA88: .4byte 0x0203ab7c -_0813CA8C: .4byte _0813CA90 + .pool .align 2, 0 _0813CA90: .4byte _0813CAA4 @@ -649586,25 +628236,25 @@ _0813CA90: .4byte _0813CAEC .4byte _0813CB10 _0813CAA4: - ldr r0, _0813CAB0 + ldr r0, =0x0203ab7c ldr r0, [r0] ldrh r0, [r0, 0xE] bl sub_813CB40 b _0813CB24 .align 2, 0 -_0813CAB0: .4byte 0x0203ab7c + .pool _0813CAB4: bl sub_813CF0C b _0813CB24 _0813CABA: - ldr r1, _0813CAE4 + ldr r1, =0x085b3db4 movs r0, 0 str r0, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r0, _0813CAE8 + ldr r0, =0x0203ab7c ldr r1, [r0] movs r0, 0x8B lsls r0, 1 @@ -649616,35 +628266,32 @@ _0813CABA: bl gpu_copy_bg_tile_map_to_vram b _0813CB24 .align 2, 0 -_0813CAE4: .4byte 0x085b3db4 -_0813CAE8: .4byte 0x0203ab7c + .pool _0813CAEC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 bne _0813CB34 - ldr r0, _0813CB04 - ldr r1, _0813CB08 - ldr r2, _0813CB0C + ldr r0, =0x085b3d94 + ldr r1, =0x02037854 + ldr r2, =0x04000008 bl CpuSet b _0813CB24 .align 2, 0 -_0813CB04: .4byte 0x085b3d94 -_0813CB08: .4byte 0x02037854 -_0813CB0C: .4byte 0x04000008 + .pool _0813CB10: - ldr r1, _0813CB1C + ldr r1, =0xfffff800 movs r0, 0x2 movs r2, 0 bl bg_change_y_offset b _0813CB24 .align 2, 0 -_0813CB1C: .4byte 0xfffff800 + .pool _0813CB20: movs r0, 0 b _0813CB36 _0813CB24: - ldr r0, _0813CB3C + ldr r0, =0x0203ab7c ldr r1, [r0] movs r0, 0x8A lsls r0, 1 @@ -649659,7 +628306,7 @@ _0813CB36: pop {r1} bx r1 .align 2, 0 -_0813CB3C: .4byte 0x0203ab7c + .pool thumb_func_end sub_813CA68 thumb_func_start sub_813CB40 @@ -649670,16 +628317,16 @@ sub_813CB40: @ 813CB40 push {r6,r7} lsls r0, 16 lsrs r7, r0, 16 - ldr r5, _0813CBE8 + ldr r5, =0x0203ab7c ldr r0, [r5] - ldr r1, _0813CBEC + ldr r1, =0x000006e2 adds r0, r1 movs r4, 0 strh r4, [r0] - ldr r0, _0813CBF0 + ldr r0, =0x0000403e bl var_get ldr r1, [r5] - ldr r2, _0813CBF4 + ldr r2, =0x000006e4 adds r1, r2 strh r0, [r1] lsls r0, 16 @@ -649688,9 +628335,9 @@ sub_813CB40: @ 813CB40 bls _0813CB70 strh r4, [r1] _0813CB70: - ldr r0, _0813CBF8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _0813CBFC + ldr r3, =0x000031dc adds r0, r3 ldrh r1, [r0, 0x8] cmp r7, r1 @@ -649707,7 +628354,7 @@ _0813CB80: adds r0, r1, r3 strh r4, [r0] movs r6, 0 - ldr r1, _0813CC00 + ldr r1, =0x085b3ee8 _0813CB96: lsls r0, r6, 1 adds r0, r1 @@ -649722,7 +628369,7 @@ _0813CBA2: cmp r6, 0 beq _0813CB96 movs r6, 0 - ldr r4, _0813CC04 + ldr r4, =0x085b3ef0 ldrh r0, [r4] movs r1, 0xCE lsls r1, 1 @@ -649752,14 +628399,7 @@ _0813CBC0: beq _0813CC0E b _0813CC2E .align 2, 0 -_0813CBE8: .4byte 0x0203ab7c -_0813CBEC: .4byte 0x000006e2 -_0813CBF0: .4byte 0x0000403e -_0813CBF4: .4byte 0x000006e4 -_0813CBF8: .4byte 0x03005d8c -_0813CBFC: .4byte 0x000031dc -_0813CC00: .4byte 0x085b3ee8 -_0813CC04: .4byte 0x085b3ef0 + .pool _0813CC08: cmp r0, 0x1A beq _0813CC1A @@ -649784,7 +628424,7 @@ _0813CC2E: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r4, _0813CC74 + ldr r4, =0x085b3ef0 lsls r0, r6, 1 adds r0, r6 lsls r0, 1 @@ -649794,7 +628434,7 @@ _0813CC2E: bne _0813CBC0 _0813CC44: movs r6, 0 - ldr r1, _0813CC78 + ldr r1, =0x08552d48 ldrb r0, [r1] cmp r0, 0xFF beq _0813CCF8 @@ -649818,8 +628458,7 @@ _0813CC4E: beq _0813CC82 b _0813CC9C .align 2, 0 -_0813CC74: .4byte 0x085b3ef0 -_0813CC78: .4byte 0x08552d48 + .pool _0813CC7C: cmp r0, 0x1A beq _0813CC8C @@ -649830,7 +628469,7 @@ _0813CC82: bl sub_813CD04 b _0813CC9C _0813CC8C: - ldr r0, _0813CCB4 + ldr r0, =0x08552d48 adds r1, r4, r6 lsls r1, 2 adds r1, r0 @@ -649841,7 +628480,7 @@ _0813CC9C: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r1, _0813CCB4 + ldr r1, =0x08552d48 lsls r0, r6, 2 adds r0, r6 lsls r0, 2 @@ -649851,7 +628490,7 @@ _0813CC9C: bne _0813CC4E b _0813CCF8 .align 2, 0 -_0813CCB4: .4byte 0x08552d48 + .pool _0813CCB8: ldr r2, [r5] movs r3, 0x89 @@ -649900,7 +628539,7 @@ sub_813CD04: @ 813CD04 lsrs r5, r0, 16 lsls r1, 16 lsrs r3, r1, 16 - ldr r4, _0813CD60 + ldr r4, =0x0203ab7c ldr r2, [r4] movs r0, 0x88 lsls r0, 1 @@ -649940,7 +628579,7 @@ _0813CD58: pop {r0} bx r0 .align 2, 0 -_0813CD60: .4byte 0x0203ab7c + .pool thumb_func_end sub_813CD04 thumb_func_start sub_813CD64 @@ -649950,7 +628589,7 @@ sub_813CD64: @ 813CD64 lsrs r2, r0, 16 lsls r1, 16 lsrs r1, 16 - ldr r0, _0813CE28 + ldr r0, =0x0203ab7c ldr r0, [r0] movs r3, 0x89 lsls r3, 1 @@ -649968,7 +628607,7 @@ sub_813CD64: @ 813CD64 cmp r5, 0xD4 bhi _0813CE22 movs r3, 0 - ldr r0, _0813CE2C + ldr r0, =0x085b3eea _0813CD96: ldrh r4, [r0] cmp r5, r4 @@ -649977,7 +628616,7 @@ _0813CD96: adds r3, 0x1 cmp r3, 0x2 bls _0813CD96 - ldr r1, _0813CE30 + ldr r1, =0x085b3efc ldrh r0, [r1] cmp r0, 0xD5 beq _0813CDD2 @@ -650003,7 +628642,7 @@ _0813CDC8: bne _0813CDB2 _0813CDD2: movs r3, 0 - ldr r0, _0813CE28 + ldr r0, =0x0203ab7c ldr r2, [r0] movs r4, 0x89 lsls r4, 1 @@ -650049,9 +628688,7 @@ _0813CE22: pop {r0} bx r0 .align 2, 0 -_0813CE28: .4byte 0x0203ab7c -_0813CE2C: .4byte 0x085b3eea -_0813CE30: .4byte 0x085b3efc + .pool thumb_func_end sub_813CD64 thumb_func_start sub_813CE34 @@ -650080,15 +628717,15 @@ sub_813CE48: @ 813CE48 lsrs r0, 16 cmp r0, 0xD2 bne _0813CE7C - ldr r0, _0813CEC0 + ldr r0, =0x0203ab7c ldr r2, [r0] - ldr r0, _0813CEC4 + ldr r0, =0x000006e2 adds r1, r2, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] ldrh r1, [r1] - ldr r0, _0813CEC8 + ldr r0, =0x000006e4 adds r2, r0 ldrh r0, [r2] adds r0, 0x1 @@ -650127,9 +628764,7 @@ _0813CEBC: movs r0, 0 b _0813CECE .align 2, 0 -_0813CEC0: .4byte 0x0203ab7c -_0813CEC4: .4byte 0x000006e2 -_0813CEC8: .4byte 0x000006e4 + .pool _0813CECC: movs r0, 0x1 _0813CECE: @@ -650182,12 +628817,12 @@ sub_813CF0C: @ 813CF0C push {r5-r7} sub sp, 0x4 movs r4, 0 - ldr r2, _0813D11C + ldr r2, =0x0203ab7c adds r7, r2, 0 movs r6, 0x8B lsls r6, 1 movs r5, 0 - ldr r3, _0813D120 + ldr r3, =0x0000027f _0813CF26: ldr r0, [r7] lsls r1, r4, 1 @@ -650236,7 +628871,7 @@ _0813CF5A: lsls r7, 1 adds r1, r2, r7 adds r1, r0 - ldr r0, _0813D124 + ldr r0, =0x0000ffff strh r0, [r1] _0813CF84: adds r0, r5, 0x1 @@ -650265,11 +628900,11 @@ _0813CF84: _0813CFB2: movs r5, 0 movs r6, 0 - ldr r7, _0813D11C + ldr r7, =0x0203ab7c mov r12, r7 movs r7, 0x8B lsls r7, 1 - ldr r3, _0813D124 + ldr r3, =0x0000ffff _0813CFC0: movs r4, 0 adds r1, r6, 0x1 @@ -650435,16 +629070,16 @@ _0813D0E4: b _0813CFC0 _0813D0F0: movs r4, 0 - ldr r6, _0813D11C + ldr r6, =0x0203ab7c movs r5, 0x8B lsls r5, 1 - ldr r7, _0813D124 + ldr r7, =0x0000ffff mov r12, r7 movs r0, 0xA0 lsls r0, 8 mov r9, r0 - ldr r7, _0813D128 - ldr r1, _0813D12C + ldr r7, =0x0000a010 + ldr r1, =0x0000ffcf mov r8, r1 _0813D108: ldr r0, [r6] @@ -650458,11 +629093,7 @@ _0813D108: strh r7, [r2] b _0813D198 .align 2, 0 -_0813D11C: .4byte 0x0203ab7c -_0813D120: .4byte 0x0000027f -_0813D124: .4byte 0x0000ffff -_0813D128: .4byte 0x0000a010 -_0813D12C: .4byte 0x0000ffcf + .pool _0813D130: cmp r0, 0 beq _0813D198 @@ -650482,7 +629113,7 @@ _0813D142: ands r0, r1 cmp r0, 0 beq _0813D158 - ldr r0, _0813D1B4 + ldr r0, =0x0000ff3f ands r0, r1 strh r0, [r2] _0813D158: @@ -650494,7 +629125,7 @@ _0813D158: ands r0, r1 cmp r0, 0 beq _0813D16E - ldr r0, _0813D1B8 + ldr r0, =0x0000ffaf ands r0, r1 strh r0, [r2] _0813D16E: @@ -650506,14 +629137,14 @@ _0813D16E: ands r0, r1 cmp r0, 0 beq _0813D184 - ldr r0, _0813D1BC + ldr r0, =0x0000ff5f ands r0, r1 strh r0, [r2] _0813D184: ldr r1, [r6] adds r1, r5 adds r1, r3 - ldr r2, _0813D1C0 + ldr r2, =0x085b3f18 ldrh r0, [r1] adds r0, r2 ldrb r0, [r0] @@ -650524,7 +629155,7 @@ _0813D198: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _0813D1C4 + ldr r0, =0x0000027f cmp r4, r0 bls _0813D108 add sp, 0x4 @@ -650536,17 +629167,13 @@ _0813D198: pop {r0} bx r0 .align 2, 0 -_0813D1B4: .4byte 0x0000ff3f -_0813D1B8: .4byte 0x0000ffaf -_0813D1BC: .4byte 0x0000ff5f -_0813D1C0: .4byte 0x085b3f18 -_0813D1C4: .4byte 0x0000027f + .pool thumb_func_end sub_813CF0C thumb_func_start sub_813D1C8 sub_813D1C8: @ 813D1C8 push {lr} - ldr r1, _0813D1F4 + ldr r1, =0x0203ab7c ldr r2, [r1] movs r3, 0x89 lsls r3, 1 @@ -650561,23 +629188,22 @@ sub_813D1C8: @ 813D1C8 ldrh r0, [r0] cmp r0, 0 bne _0813D1FC - ldr r0, _0813D1F8 + ldr r0, =0x0000061e adds r1, r2, r0 movs r0, 0x1 strb r0, [r1] b _0813D206 .align 2, 0 -_0813D1F4: .4byte 0x0203ab7c -_0813D1F8: .4byte 0x0000061e + .pool _0813D1FC: ldr r0, [r3] - ldr r1, _0813D248 + ldr r1, =0x0000061e adds r0, r1 movs r1, 0 strb r1, [r0] _0813D206: ldr r1, [r3] - ldr r2, _0813D24C + ldr r2, =0x00000616 adds r0, r1, r2 movs r2, 0 strh r2, [r0] @@ -650588,15 +629214,15 @@ _0813D206: adds r3, 0x2 adds r0, r1, r3 strh r2, [r0] - ldr r0, _0813D250 + ldr r0, =0x0000061c adds r2, r1, r0 movs r0, 0x40 strh r0, [r2] - ldr r2, _0813D254 + ldr r2, =0x0000061f adds r1, r2 movs r0, 0x1 strb r0, [r1] - ldr r1, _0813D258 + ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -650607,11 +629233,7 @@ _0813D206: pop {r0} bx r0 .align 2, 0 -_0813D248: .4byte 0x0000061e -_0813D24C: .4byte 0x00000616 -_0813D250: .4byte 0x0000061c -_0813D254: .4byte 0x0000061f -_0813D258: .4byte 0x00003f44 + .pool thumb_func_end sub_813D1C8 thumb_func_start sub_813D25C @@ -650619,15 +629241,15 @@ sub_813D25C: @ 813D25C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0813D298 + ldr r0, =0x0203ab7c ldr r2, [r0] - ldr r3, _0813D29C + ldr r3, =0x0000061e adds r1, r2, r3 ldrb r1, [r1] adds r7, r0, 0 cmp r1, 0 bne _0813D32A - ldr r0, _0813D2A0 + ldr r0, =0x00000616 adds r1, r2, r0 ldrh r0, [r1] cmp r0, 0 @@ -650646,11 +629268,9 @@ sub_813D25C: @ 813D25C adds r0, r2, r3 b _0813D2A8 .align 2, 0 -_0813D298: .4byte 0x0203ab7c -_0813D29C: .4byte 0x0000061e -_0813D2A0: .4byte 0x00000616 + .pool _0813D2A4: - ldr r1, _0813D310 + ldr r1, =0x0000061c adds r0, r2, r1 _0813D2A8: ldrh r1, [r0] @@ -650658,9 +629278,9 @@ _0813D2A8: movs r2, 0x7F ands r1, r2 strh r1, [r0] - ldr r3, _0813D314 + ldr r3, =0x08329f40 ldr r1, [r7] - ldr r2, _0813D318 + ldr r2, =0x0000061a adds r0, r1, r2 ldrh r0, [r0] lsls r0, 1 @@ -650669,7 +629289,7 @@ _0813D2A8: lsls r2, 16 asrs r2, 20 lsls r2, 16 - ldr r0, _0813D310 + ldr r0, =0x0000061c adds r1, r0 ldrh r0, [r1] lsls r0, 1 @@ -650683,7 +629303,7 @@ _0813D2A8: movs r0, 0x52 bl lcd_io_set ldr r1, [r7] - ldr r2, _0813D31C + ldr r2, =0x00000616 adds r0, r1, r2 movs r3, 0 strh r3, [r0] @@ -650700,22 +629320,18 @@ _0813D2A8: ldrh r0, [r0] cmp r0, 0 beq _0813D3C6 - ldr r3, _0813D320 + ldr r3, =0x0000061e adds r1, r3 movs r0, 0x1 b _0813D3C4 .align 2, 0 -_0813D310: .4byte 0x0000061c -_0813D314: .4byte 0x08329f40 -_0813D318: .4byte 0x0000061a -_0813D31C: .4byte 0x00000616 -_0813D320: .4byte 0x0000061e + .pool _0813D324: subs r0, 0x1 strh r0, [r1] b _0813D3C6 _0813D32A: - ldr r0, _0813D3D0 + ldr r0, =0x00000616 adds r1, r2, r0 ldrh r0, [r1] adds r0, 0x1 @@ -650726,7 +629342,7 @@ _0813D32A: bls _0813D3C6 movs r0, 0 strh r0, [r1] - ldr r3, _0813D3D4 + ldr r3, =0x0000061f adds r1, r2, r3 ldrb r0, [r1] adds r0, 0x1 @@ -650753,7 +629369,7 @@ _0813D366: adds r0, r1, r3 adds r0, r2 ldr r3, [r0] - ldr r0, _0813D3D4 + ldr r0, =0x0000061f adds r1, r0 ldrb r0, [r1] movs r1, 0x1 @@ -650777,7 +629393,7 @@ _0813D366: bcc _0813D366 _0813D3A0: ldr r0, [r7] - ldr r3, _0813D3D4 + ldr r3, =0x0000061f adds r1, r0, r3 ldrb r0, [r1] cmp r0, 0x4 @@ -650803,8 +629419,7 @@ _0813D3C6: pop {r0} bx r0 .align 2, 0 -_0813D3D0: .4byte 0x00000616 -_0813D3D4: .4byte 0x0000061f + .pool thumb_func_end sub_813D25C thumb_func_start sub_813D3D8 @@ -650814,8 +629429,8 @@ sub_813D3D8: @ 813D3D8 adds r6, r1, 0 lsls r4, 16 lsrs r4, 16 - ldr r5, _0813D41C - ldr r0, _0813D420 + ldr r5, =0x0203ab7c + ldr r0, =0x000015bc bl malloc_and_clear str r0, [r5] movs r1, 0 @@ -650826,12 +629441,12 @@ sub_813D3D8: @ 813D3D8 adds r0, r2 str r6, [r0] strb r1, [r6] - ldr r0, _0813D424 + ldr r0, =sub_813D42C + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0813D428 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -650841,10 +629456,7 @@ sub_813D3D8: @ 813D3D8 pop {r0} bx r0 .align 2, 0 -_0813D41C: .4byte 0x0203ab7c -_0813D420: .4byte 0x000015bc -_0813D424: .4byte sub_813D42C + 1 -_0813D428: .4byte 0x03005e00 + .pool thumb_func_end sub_813D3D8 thumb_func_start sub_813D42C @@ -650853,7 +629465,7 @@ sub_813D42C: @ 813D42C sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0813D454 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -650866,13 +629478,12 @@ sub_813D42C: @ 813D42C b _0813D584 _0813D44A: lsls r0, 2 - ldr r1, _0813D458 + ldr r1, =_0813D45C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813D454: .4byte 0x03005e00 -_0813D458: .4byte _0813D45C + .pool .align 2, 0 _0813D45C: .4byte _0813D48C @@ -650902,9 +629513,9 @@ _0813D4A8: movs r1, 0x1 movs r2, 0x3 bl gpu_bg_config_set_field - ldr r0, _0813D4CC + ldr r0, =0x085b4018 bl sub_81C4D70 - ldr r0, _0813D4D0 + ldr r0, =0x0203ab7c ldr r0, [r0] movs r1, 0xF7 lsls r1, 4 @@ -650914,8 +629525,7 @@ _0813D4A8: bl sub_80090FC b _0813D584 .align 2, 0 -_0813D4CC: .4byte 0x085b4018 -_0813D4D0: .4byte 0x0203ab7c + .pool _0813D4D4: bl sub_81C4E90 cmp r0, 0x1 @@ -650934,9 +629544,9 @@ _0813D4EC: bne _0813D594 b _0813D584 _0813D4F8: - ldr r0, _0813D518 + ldr r0, =0x0203ab7c ldr r0, [r0] - ldr r2, _0813D51C + ldr r2, =0x000006ec adds r0, r2 bl sub_8122D88 movs r0, 0x1 @@ -650948,8 +629558,7 @@ _0813D4F8: bl sub_8123824 b _0813D584 .align 2, 0 -_0813D518: .4byte 0x0203ab7c -_0813D51C: .4byte 0x000006ec + .pool _0813D520: bl sub_813D6D0 b _0813D584 @@ -650969,7 +629578,7 @@ _0813D532: bl sub_80A1AD4 b _0813D584 _0813D544: - ldr r1, _0813D568 + ldr r1, =0x00003f41 movs r0, 0x50 bl lcd_io_set bl sub_813D1C8 @@ -650983,21 +629592,21 @@ _0813D544: bl lcd_io_set_bits b _0813D584 .align 2, 0 -_0813D568: .4byte 0x00003f41 + .pool _0813D56C: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r2 - ldr r1, _0813D580 + ldr r1, =sub_813D5A0 + 1 str r1, [r0] movs r1, 0 strh r1, [r0, 0x8] b _0813D594 .align 2, 0 -_0813D580: .4byte sub_813D5A0 + 1 + .pool _0813D584: - ldr r0, _0813D59C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -651011,7 +629620,7 @@ _0813D594: pop {r0} bx r0 .align 2, 0 -_0813D59C: .4byte 0x03005e00 + .pool thumb_func_end sub_813D42C thumb_func_start sub_813D5A0 @@ -651021,7 +629630,7 @@ sub_813D5A0: @ 813D5A0 lsls r0, 24 lsrs r5, r0, 24 bl sub_813D25C - ldr r1, _0813D5C8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -651036,14 +629645,14 @@ sub_813D5A0: @ 813D5A0 beq _0813D5E2 b _0813D5D4 .align 2, 0 -_0813D5C8: .4byte 0x03005e00 + .pool _0813D5CC: cmp r1, 0x2 beq _0813D640 cmp r1, 0x3 beq _0813D652 _0813D5D4: - ldr r0, _0813D5F0 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -651051,7 +629660,7 @@ _0813D5D4: movs r0, 0 strh r0, [r1, 0x8] _0813D5E2: - ldr r0, _0813D5F4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -651059,10 +629668,9 @@ _0813D5E2: bne _0813D6A8 b _0813D698 .align 2, 0 -_0813D5F0: .4byte 0x03005e00 -_0813D5F4: .4byte 0x02037fd4 + .pool _0813D5F8: - ldr r0, _0813D610 + ldr r0, =0x030022c0 ldrh r2, [r0, 0x2E] movs r3, 0x2 adds r0, r3, 0 @@ -651074,7 +629682,7 @@ _0813D5F8: bl audio_play b _0813D698 .align 2, 0 -_0813D610: .4byte 0x030022c0 + .pool _0813D614: movs r0, 0x10 ands r0, r2 @@ -651085,7 +629693,7 @@ _0813D614: ands r0, r2 cmp r0, 0 beq _0813D6A8 - ldr r0, _0813D63C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x13] cmp r0, 0x1 @@ -651096,7 +629704,7 @@ _0813D630: bl audio_play b _0813D698 .align 2, 0 -_0813D63C: .4byte 0x03005d90 + .pool _0813D640: movs r0, 0x15 negs r0, r0 @@ -651107,7 +629715,7 @@ _0813D640: bl sub_80A1AD4 b _0813D698 _0813D652: - ldr r0, _0813D690 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -651116,7 +629724,7 @@ _0813D652: cmp r7, 0 bne _0813D6A8 bl sub_813D824 - ldr r4, _0813D694 + ldr r4, =0x0203ab7c ldr r0, [r4] movs r1, 0xDD lsls r1, 3 @@ -651133,10 +629741,9 @@ _0813D652: str r7, [r4] b _0813D6A8 .align 2, 0 -_0813D690: .4byte 0x02037fd4 -_0813D694: .4byte 0x0203ab7c + .pool _0813D698: - ldr r0, _0813D6B0 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -651150,7 +629757,7 @@ _0813D6A8: pop {r0} bx r0 .align 2, 0 -_0813D6B0: .4byte 0x03005e00 + .pool thumb_func_end sub_813D5A0 thumb_func_start sub_813D6B4 @@ -651175,16 +629782,16 @@ sub_813D6D0: @ 813D6D0 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _0813D7F8 + ldr r0, =0x085b401c bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0813D7FC + ldr r0, =0x085b4024 bl gpu_pal_obj_alloc_tag_and_apply - ldr r0, _0813D800 + ldr r0, =0x03001204 movs r1, 0 strh r1, [r0] - ldr r2, _0813D804 + ldr r2, =0x03001200 strh r1, [r2] - ldr r1, _0813D808 + ldr r1, =0x0203ab7c ldr r0, [r1] movs r3, 0x89 lsls r3, 1 @@ -651192,13 +629799,13 @@ sub_813D6D0: @ 813D6D0 ldrh r0, [r0] cmp r0, 0 beq _0813D7D8 - ldr r5, _0813D80C + ldr r5, =0x03001202 mov r10, r1 adds r7, r2, 0 - ldr r0, _0813D810 + ldr r0, =0x030011fc mov r9, r0 - ldr r6, _0813D814 - ldr r1, _0813D818 + ldr r6, =0x085a147c + ldr r1, =0x030011fe mov r8, r1 _0813D710: mov r2, r10 @@ -651256,14 +629863,14 @@ _0813D710: ldrsh r1, [r0, r2] movs r0, 0 ldrsh r2, [r3, r0] - ldr r0, _0813D81C + ldr r0, =0x085b4034 movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 beq _0813D7BE - ldr r0, _0813D820 + ldr r0, =0x02020630 lsls r2, r1, 4 adds r2, r1 lsls r2, 2 @@ -651276,7 +629883,7 @@ _0813D710: strb r0, [r3] mov r1, r10 ldr r3, [r1] - ldr r4, _0813D800 + ldr r4, =0x03001204 ldrh r1, [r4] adds r0, r1, 0x1 strh r0, [r4] @@ -651302,9 +629909,9 @@ _0813D7BE: cmp r1, r0 blt _0813D710 _0813D7D8: - ldr r0, _0813D808 + ldr r0, =0x0203ab7c ldr r0, [r0] - ldr r1, _0813D800 + ldr r1, =0x03001204 ldrh r1, [r1] movs r3, 0xDC lsls r3, 3 @@ -651318,17 +629925,7 @@ _0813D7D8: pop {r0} bx r0 .align 2, 0 -_0813D7F8: .4byte 0x085b401c -_0813D7FC: .4byte 0x085b4024 -_0813D800: .4byte 0x03001204 -_0813D804: .4byte 0x03001200 -_0813D808: .4byte 0x0203ab7c -_0813D80C: .4byte 0x03001202 -_0813D810: .4byte 0x030011fc -_0813D814: .4byte 0x085a147c -_0813D818: .4byte 0x030011fe -_0813D81C: .4byte 0x085b4034 -_0813D820: .4byte 0x02020630 + .pool thumb_func_end sub_813D6D0 thumb_func_start sub_813D824 @@ -651339,7 +629936,7 @@ sub_813D824: @ 813D824 movs r0, 0x2 bl gpu_pal_free_tag movs r4, 0 - ldr r1, _0813D8A4 + ldr r1, =0x0203ab7c ldr r0, [r1] movs r2, 0xDC lsls r2, 3 @@ -651374,7 +629971,7 @@ _0813D86C: bl gpu_pal_free_tag movs r4, 0 _0813D87A: - ldr r0, _0813D8A4 + ldr r0, =0x0203ab7c ldr r0, [r0] lsls r1, r4, 2 movs r2, 0xFB @@ -651395,41 +629992,37 @@ _0813D892: pop {r0} bx r0 .align 2, 0 -_0813D8A4: .4byte 0x0203ab7c + .pool thumb_func_end sub_813D824 thumb_func_start sub_813D8A8 sub_813D8A8: @ 813D8A8 push {lr} sub sp, 0x8 - ldr r0, _0813D8D4 + ldr r0, =0x0203ab7c ldr r1, [r0] - ldr r0, _0813D8D8 + ldr r0, =0x00000fbc adds r1, r0 str r1, [sp] - ldr r0, _0813D8DC + ldr r0, =0x00030600 str r0, [sp, 0x4] - ldr r0, _0813D8E0 + ldr r0, =0x08dc4140 bl LZ77UnCompWram mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _0813D8E4 + ldr r0, =0x085b40ec bl gpu_pal_obj_alloc_tag_and_apply add sp, 0x8 pop {r0} bx r0 .align 2, 0 -_0813D8D4: .4byte 0x0203ab7c -_0813D8D8: .4byte 0x00000fbc -_0813D8DC: .4byte 0x00030600 -_0813D8E0: .4byte 0x08dc4140 -_0813D8E4: .4byte 0x085b40ec + .pool thumb_func_end sub_813D8A8 thumb_func_start sub_813D8E8 sub_813D8E8: @ 813D8E8 push {r4-r6,lr} - ldr r1, _0813D91C + ldr r1, =0x0203ab7c ldr r0, [r1] movs r2, 0x88 lsls r2, 1 @@ -651455,17 +630048,17 @@ _0813D904: bls _0813D904 b _0813D9A4 .align 2, 0 -_0813D91C: .4byte 0x0203ab7c + .pool _0813D920: movs r4, 0 - ldr r5, _0813D974 + ldr r5, =0x02020630 _0813D924: lsls r1, r4, 21 movs r6, 0xA0 lsls r6, 16 adds r1, r6 asrs r1, 16 - ldr r0, _0813D978 + ldr r0, =0x085b40fc movs r2, 0x8C movs r3, 0 bl obj_add_from_template_forward_search @@ -651482,15 +630075,15 @@ _0813D924: lsrs r0, 22 lsls r1, r4, 4 adds r0, r1 - ldr r6, _0813D97C + ldr r6, =0x000003ff adds r1, r6, 0 ands r0, r1 - ldr r6, _0813D980 + ldr r6, =0xfffffc00 adds r1, r6, 0 ands r2, r1 orrs r2, r0 strh r2, [r3, 0x4] - ldr r0, _0813D984 + ldr r0, =0x0203ab7c ldr r0, [r0] lsls r1, r4, 2 movs r2, 0xFB @@ -651500,13 +630093,9 @@ _0813D924: str r3, [r0] b _0813D99A .align 2, 0 -_0813D974: .4byte 0x02020630 -_0813D978: .4byte 0x085b40fc -_0813D97C: .4byte 0x000003ff -_0813D980: .4byte 0xfffffc00 -_0813D984: .4byte 0x0203ab7c + .pool _0813D988: - ldr r0, _0813D9AC + ldr r0, =0x0203ab7c ldr r1, [r0] lsls r0, r4, 2 movs r6, 0xFB @@ -651526,7 +630115,7 @@ _0813D9A4: pop {r0} bx r0 .align 2, 0 -_0813D9AC: .4byte 0x0203ab7c + .pool thumb_func_end sub_813D8E8 thumb_func_start sub_813D9B0 @@ -651545,7 +630134,7 @@ sub_813D9C0: @ 813D9C0 lsls r0, 24 lsrs r2, r0, 24 movs r7, 0 - ldr r1, _0813D9E4 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -651558,7 +630147,7 @@ sub_813D9C0: @ 813D9C0 beq _0813DA00 b _0813DA30 .align 2, 0 -_0813D9E4: .4byte 0x03005e00 + .pool _0813D9E8: movs r0, 0x1 negs r0, r0 @@ -651572,7 +630161,7 @@ _0813D9E8: strh r0, [r6, 0x8] b _0813DA30 _0813DA00: - ldr r0, _0813DA38 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -651582,7 +630171,7 @@ _0813DA00: ldrsh r1, [r6, r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0813DA3C + ldr r0, =0x020244ec adds r7, r1, r0 ldrh r4, [r6, 0xC] ldrb r5, [r6, 0xE] @@ -651600,8 +630189,7 @@ _0813DA30: pop {r0} bx r0 .align 2, 0 -_0813DA38: .4byte 0x02037fd4 -_0813DA3C: .4byte 0x020244ec + .pool thumb_func_end sub_813D9C0 thumb_func_start sub_813DA40 @@ -651616,12 +630204,12 @@ sub_813DA40: @ 813DA40 lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r0, _0813DA80 + ldr r0, =sub_813D9C0 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0813DA84 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -651631,15 +630219,13 @@ sub_813DA40: @ 813DA40 strh r4, [r1, 0xC] strh r5, [r1, 0xE] strh r6, [r1, 0x1C] - ldr r0, _0813DA88 + ldr r0, =sub_813D9B0 + 1 bl set_callback2 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0813DA80: .4byte sub_813D9C0 + 1 -_0813DA84: .4byte 0x03005e00 -_0813DA88: .4byte sub_813D9B0 + 1 + .pool thumb_func_end sub_813DA40 thumb_func_start evolution_cutscene @@ -651671,7 +630257,7 @@ evolution_cutscene: @ 813DA8C add r0, sp, 0x14 movs r1, 0xC0 lsls r1, 19 - ldr r2, _0813DD10 + ldr r2, =0x05006000 bl CpuSet movs r0, 0x4C movs r1, 0 @@ -651695,28 +630281,28 @@ evolution_cutscene: @ 813DA8C movs r1, 0 bl lcd_io_set bl sub_80A1A74 - ldr r0, _0813DD14 + ldr r0, =0x02022e14 movs r2, 0 strh r2, [r0] - ldr r0, _0813DD18 + ldr r0, =0x02022e16 strh r2, [r0] - ldr r0, _0813DD1C + ldr r0, =0x02022e18 strh r2, [r0] - ldr r0, _0813DD20 + ldr r0, =0x02022e1a strh r2, [r0] - ldr r0, _0813DD24 + ldr r0, =0x02022e1c strh r2, [r0] - ldr r0, _0813DD28 + ldr r0, =0x02022e1e strh r2, [r0] - ldr r1, _0813DD2C + ldr r1, =0x02022e20 movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0813DD30 + ldr r0, =0x02022e22 movs r1, 0 strh r1, [r0] - ldr r1, _0813DD34 + ldr r1, =0x02022ff0 movs r0, 0x9 strb r0, [r1] bl c2_berry_program_update_menu @@ -651725,27 +630311,27 @@ evolution_cutscene: @ 813DA8C bl remove_some_task bl clear_tasks bl gpu_pal_allocator_reset - ldr r0, _0813DD38 + ldr r0, =0x0300301c movs r2, 0x4 strb r2, [r0] movs r0, 0x64 bl malloc_and_clear - ldr r1, _0813DD3C + ldr r1, =0x0203ab80 str r0, [r1] bl init_uns_table_pokemon_copy adds r0, r4, 0 movs r1, 0x2 mov r2, sp bl pokemon_getattr - ldr r0, _0813DD40 + ldr r0, =0x02021cc4 mov r1, sp bl strcpy_limit_10_chars - ldr r0, _0813DD44 + ldr r0, =0x02021dc4 movs r1, 0xB mov r2, r10 muls r2, r1 adds r1, r2, 0 - ldr r2, _0813DD48 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy adds r0, r4, 0 @@ -651763,9 +630349,9 @@ evolution_cutscene: @ 813DA8C bl pokemon_getattr mov r9, r0 lsls r0, r5, 3 - ldr r1, _0813DD4C + ldr r1, =0x0830a18c adds r0, r1 - ldr r2, _0813DD50 + ldr r2, =0x020244d4 ldr r1, [r2] ldr r1, [r1, 0x8] adds r2, r5, 0 @@ -651782,27 +630368,27 @@ evolution_cutscene: @ 813DA8C adds r0, r5, 0 movs r1, 0x1 bl sub_806A068 - ldr r0, _0813DD54 + ldr r0, =0x0202499c mov r8, r0 - ldr r1, _0813DD58 + ldr r1, =0x082ec6a8 str r1, [r0, 0x10] movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r1, _0813DD3C + ldr r1, =0x0203ab80 ldr r2, [r1] lsls r1, r0, 24 lsrs r3, r1, 24 strb r0, [r2] - ldr r7, _0813DD5C + ldr r7, =0x02020630 lsls r1, r3, 4 adds r1, r3 lsls r1, 2 adds r6, r7, 0 adds r6, 0x1C adds r0, r1, r6 - ldr r2, _0813DD60 + ldr r2, =nullsub_18 + 1 str r2, [r0] adds r1, r7 ldrb r2, [r1, 0x5] @@ -651819,9 +630405,9 @@ evolution_cutscene: @ 813DA8C strb r0, [r1] mov r1, r10 lsls r0, r1, 3 - ldr r2, _0813DD4C + ldr r2, =0x0830a18c adds r0, r2 - ldr r2, _0813DD50 + ldr r2, =0x020244d4 ldr r1, [r2] ldr r1, [r1, 0x10] mov r2, r10 @@ -651838,7 +630424,7 @@ evolution_cutscene: @ 813DA8C mov r0, r10 movs r1, 0x3 bl sub_806A068 - ldr r0, _0813DD58 + ldr r0, =0x082ec6a8 mov r1, r8 str r0, [r1, 0x10] mov r0, r8 @@ -651846,7 +630432,7 @@ evolution_cutscene: @ 813DA8C movs r2, 0x40 movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r1, _0813DD3C + ldr r1, =0x0203ab80 ldr r2, [r1] lsls r1, r0, 24 lsrs r3, r1, 24 @@ -651855,7 +630441,7 @@ evolution_cutscene: @ 813DA8C adds r1, r3 lsls r1, 2 adds r6, r1, r6 - ldr r2, _0813DD60 + ldr r2, =nullsub_18 + 1 str r2, [r6] adds r1, r7 ldrb r0, [r1, 0x5] @@ -651869,15 +630455,15 @@ evolution_cutscene: @ 813DA8C orrs r0, r2 strb r0, [r1] bl sub_817BE78 - ldr r0, _0813DD64 + ldr r0, =sub_813E570 + 1 movs r1, 0 bl AddTask - ldr r1, _0813DD3C + ldr r1, =0x0203ab80 ldr r2, [r1] lsls r1, r0, 24 lsrs r3, r1, 24 strb r0, [r2, 0x2] - ldr r1, _0813DD68 + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -651897,9 +630483,9 @@ evolution_cutscene: @ 813DA8C mov r2, sp ldrh r2, [r2, 0x1C] strh r2, [r0, 0x1C] - ldr r1, _0813DD3C + ldr r1, =0x0203ab80 ldr r0, [r1] - ldr r1, _0813DD6C + ldr r1, =0x02037754 adds r0, 0x4 movs r2, 0x60 bl memcpy @@ -651907,12 +630493,12 @@ evolution_cutscene: @ 813DA8C lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _0813DD70 + ldr r0, =nullsub_83 + 1 bl SetHBlankCallback - ldr r0, _0813DD74 + ldr r0, =sub_813FCDC + 1 bl SetVBlankCallback bl m4aMPlayAllStop - ldr r0, _0813DD78 + ldr r0, =sub_813E3A4 + 1 bl set_callback2 add sp, 0x24 pop {r3-r5} @@ -651923,33 +630509,7 @@ evolution_cutscene: @ 813DA8C pop {r0} bx r0 .align 2, 0 -_0813DD10: .4byte 0x05006000 -_0813DD14: .4byte 0x02022e14 -_0813DD18: .4byte 0x02022e16 -_0813DD1C: .4byte 0x02022e18 -_0813DD20: .4byte 0x02022e1a -_0813DD24: .4byte 0x02022e1c -_0813DD28: .4byte 0x02022e1e -_0813DD2C: .4byte 0x02022e20 -_0813DD30: .4byte 0x02022e22 -_0813DD34: .4byte 0x02022ff0 -_0813DD38: .4byte 0x0300301c -_0813DD3C: .4byte 0x0203ab80 -_0813DD40: .4byte 0x02021cc4 -_0813DD44: .4byte 0x02021dc4 -_0813DD48: .4byte 0x083185c8 -_0813DD4C: .4byte 0x0830a18c -_0813DD50: .4byte 0x020244d4 -_0813DD54: .4byte 0x0202499c -_0813DD58: .4byte 0x082ec6a8 -_0813DD5C: .4byte 0x02020630 -_0813DD60: .4byte nullsub_18 + 1 -_0813DD64: .4byte sub_813E570 + 1 -_0813DD68: .4byte 0x03005e00 -_0813DD6C: .4byte 0x02037754 -_0813DD70: .4byte nullsub_83 + 1 -_0813DD74: .4byte sub_813FCDC + 1 -_0813DD78: .4byte sub_813E3A4 + 1 + .pool thumb_func_end evolution_cutscene thumb_func_start sub_813DD7C @@ -651959,8 +630519,8 @@ sub_813DD7C: @ 813DD7C mov r5, r8 push {r5,r6} sub sp, 0x8 - ldr r2, _0813DF14 - ldr r0, _0813DF18 + ldr r2, =0x03005e00 + ldr r0, =0x0203ab80 mov r8, r0 ldr r0, [r0] ldrb r1, [r0, 0x2] @@ -651973,7 +630533,7 @@ sub_813DD7C: @ 813DD7C movs r1, 0x64 adds r4, r2, 0 muls r4, r1 - ldr r1, _0813DF1C + ldr r1, =0x020244ec adds r4, r1 ldrh r5, [r0, 0xC] adds r0, r4, 0 @@ -651992,7 +630552,7 @@ sub_813DD7C: @ 813DD7C str r4, [sp, 0x4] movs r1, 0xC0 lsls r1, 19 - ldr r2, _0813DF20 + ldr r2, =0x05006000 add r0, sp, 0x4 bl CpuSet movs r0, 0x4C @@ -652017,39 +630577,39 @@ sub_813DD7C: @ 813DD7C movs r1, 0 bl lcd_io_set bl sub_80A1A74 - ldr r0, _0813DF24 + ldr r0, =0x02022e14 strh r4, [r0] - ldr r0, _0813DF28 + ldr r0, =0x02022e16 strh r4, [r0] - ldr r0, _0813DF2C + ldr r0, =0x02022e18 strh r4, [r0] - ldr r0, _0813DF30 + ldr r0, =0x02022e1a strh r4, [r0] - ldr r0, _0813DF34 + ldr r0, =0x02022e1c strh r4, [r0] - ldr r0, _0813DF38 + ldr r0, =0x02022e1e strh r4, [r0] - ldr r1, _0813DF3C + ldr r1, =0x02022e20 movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0813DF40 + ldr r0, =0x02022e22 strh r4, [r0] - ldr r1, _0813DF44 + ldr r1, =0x02022ff0 movs r0, 0x9 strb r0, [r1] bl c2_berry_program_update_menu bl sub_8035AA4 bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r1, _0813DF48 + ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] lsls r0, r5, 3 - ldr r1, _0813DF4C + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _0813DF50 + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x10] adds r2, r5, 0 @@ -652066,8 +630626,8 @@ sub_813DD7C: @ 813DD7C adds r0, r5, 0 movs r1, 0x3 bl sub_806A068 - ldr r0, _0813DF54 - ldr r1, _0813DF58 + ldr r0, =0x0202499c + ldr r1, =0x082ec6a8 str r1, [r0, 0x10] movs r1, 0x78 movs r2, 0x40 @@ -652078,14 +630638,14 @@ sub_813DD7C: @ 813DD7C lsls r2, r0, 24 lsrs r2, 24 strb r0, [r1, 0x1] - ldr r3, _0813DF5C + ldr r3, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 adds r0, r3, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, _0813DF60 + ldr r2, =nullsub_18 + 1 str r2, [r0] adds r1, r3 ldrb r2, [r1, 0x5] @@ -652098,11 +630658,11 @@ sub_813DD7C: @ 813DD7C lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _0813DF64 + ldr r0, =nullsub_83 + 1 bl SetHBlankCallback - ldr r0, _0813DF68 + ldr r0, =sub_813FCDC + 1 bl SetVBlankCallback - ldr r0, _0813DF6C + ldr r0, =sub_813E3A4 + 1 bl set_callback2 movs r0, 0x1 negs r0, r0 @@ -652127,37 +630687,15 @@ sub_813DD7C: @ 813DD7C pop {r0} bx r0 .align 2, 0 -_0813DF14: .4byte 0x03005e00 -_0813DF18: .4byte 0x0203ab80 -_0813DF1C: .4byte 0x020244ec -_0813DF20: .4byte 0x05006000 -_0813DF24: .4byte 0x02022e14 -_0813DF28: .4byte 0x02022e16 -_0813DF2C: .4byte 0x02022e18 -_0813DF30: .4byte 0x02022e1a -_0813DF34: .4byte 0x02022e1c -_0813DF38: .4byte 0x02022e1e -_0813DF3C: .4byte 0x02022e20 -_0813DF40: .4byte 0x02022e22 -_0813DF44: .4byte 0x02022ff0 -_0813DF48: .4byte 0x0300301c -_0813DF4C: .4byte 0x0830a18c -_0813DF50: .4byte 0x020244d4 -_0813DF54: .4byte 0x0202499c -_0813DF58: .4byte 0x082ec6a8 -_0813DF5C: .4byte 0x02020630 -_0813DF60: .4byte nullsub_18 + 1 -_0813DF64: .4byte nullsub_83 + 1 -_0813DF68: .4byte sub_813FCDC + 1 -_0813DF6C: .4byte sub_813E3A4 + 1 + .pool thumb_func_end sub_813DD7C thumb_func_start sub_813DF70 sub_813DF70: @ 813DF70 push {r4-r6,lr} sub sp, 0xC - ldr r2, _0813DFAC - ldr r0, _0813DFB0 + ldr r2, =0x03005e00 + ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r1, [r0, 0x2] lsls r0, r1, 2 @@ -652168,10 +630706,10 @@ sub_813DF70: @ 813DF70 ldrsh r2, [r0, r1] movs r1, 0x64 muls r2, r1 - ldr r1, _0813DFB4 + ldr r1, =0x020244ec adds r4, r2, r1 ldrh r6, [r0, 0xC] - ldr r0, _0813DFB8 + ldr r0, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r0, r3 @@ -652181,16 +630719,12 @@ sub_813DF70: @ 813DF70 b _0813E1C8 _0813DFA2: lsls r0, 2 - ldr r1, _0813DFBC + ldr r1, =_0813DFC0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813DFAC: .4byte 0x03005e00 -_0813DFB0: .4byte 0x0203ab80 -_0813DFB4: .4byte 0x020244ec -_0813DFB8: .4byte 0x030022c0 -_0813DFBC: .4byte _0813DFC0 + .pool .align 2, 0 _0813DFC0: .4byte _0813DFE0 @@ -652211,55 +630745,45 @@ _0813DFE0: bl SetVBlankCallback bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r1, _0813E02C + ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - ldr r0, _0813E030 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _0813E034 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r0, _0813E038 + ldr r0, =0x02022e18 strh r1, [r0] - ldr r0, _0813E03C + ldr r0, =0x02022e1a strh r1, [r0] - ldr r0, _0813E040 + ldr r0, =0x02022e1c strh r1, [r0] - ldr r0, _0813E044 + ldr r0, =0x02022e1e strh r1, [r0] - ldr r2, _0813E048 + ldr r2, =0x02022e20 movs r3, 0x80 lsls r3, 1 adds r0, r3, 0 strh r0, [r2] - ldr r0, _0813E04C + ldr r0, =0x02022e22 strh r1, [r0] b _0813E180 .align 2, 0 -_0813E02C: .4byte 0x0300301c -_0813E030: .4byte 0x02022e14 -_0813E034: .4byte 0x02022e16 -_0813E038: .4byte 0x02022e18 -_0813E03C: .4byte 0x02022e1a -_0813E040: .4byte 0x02022e1c -_0813E044: .4byte 0x02022e1e -_0813E048: .4byte 0x02022e20 -_0813E04C: .4byte 0x02022e22 + .pool _0813E050: bl sub_80A1A74 - ldr r0, _0813E06C + ldr r0, =nullsub_83 + 1 bl SetHBlankCallback - ldr r0, _0813E070 + ldr r0, =sub_813FD64 + 1 bl SetVBlankCallback - ldr r1, _0813E074 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _0813E188 .align 2, 0 -_0813E06C: .4byte nullsub_83 + 1 -_0813E070: .4byte sub_813FD64 + 1 -_0813E074: .4byte 0x030022c0 + .pool _0813E078: bl sub_807F19C b _0813E180 @@ -652276,13 +630800,13 @@ _0813E07E: bl Bg_FillWramTileMapRectWithTileAndPalette movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r1, _0813E0A4 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _0813E188 .align 2, 0 -_0813E0A4: .4byte 0x030022c0 + .pool _0813E0A8: adds r0, r4, 0 movs r1, 0x1 @@ -652293,9 +630817,9 @@ _0813E0A8: bl pokemon_getattr adds r4, r0, 0 lsls r0, r6, 3 - ldr r1, _0813E0E8 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _0813E0EC + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x10] adds r2, r6, 0 @@ -652311,32 +630835,31 @@ _0813E0A8: bl decompress_palette b _0813E180 .align 2, 0 -_0813E0E8: .4byte 0x0830a18c -_0813E0EC: .4byte 0x020244d4 + .pool _0813E0F0: adds r0, r6, 0 movs r1, 0x1 bl sub_806A068 - ldr r0, _0813E148 - ldr r1, _0813E14C + ldr r0, =0x0202499c + ldr r1, =0x082ec6a8 str r1, [r0, 0x10] movs r1, 0x78 movs r2, 0x40 movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r1, _0813E150 + ldr r1, =0x0203ab80 ldr r1, [r1] lsls r2, r0, 24 lsrs r2, 24 strb r0, [r1, 0x1] - ldr r3, _0813E154 + ldr r3, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 adds r0, r3, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, _0813E158 + ldr r2, =nullsub_18 + 1 str r2, [r0] adds r1, r3 ldrb r2, [r1, 0x5] @@ -652345,7 +630868,7 @@ _0813E0F0: movs r2, 0x20 orrs r0, r2 strb r0, [r1, 0x5] - ldr r1, _0813E15C + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -652355,14 +630878,9 @@ _0813E0F0: bl sub_807B154 b _0813E1C8 .align 2, 0 -_0813E148: .4byte 0x0202499c -_0813E14C: .4byte 0x082ec6a8 -_0813E150: .4byte 0x0203ab80 -_0813E154: .4byte 0x02020630 -_0813E158: .4byte nullsub_18 + 1 -_0813E15C: .4byte 0x030022c0 + .pool _0813E160: - ldr r0, _0813E190 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0813E174 @@ -652377,7 +630895,7 @@ _0813E174: movs r2, 0 bl sub_80A2A20 _0813E180: - ldr r1, _0813E194 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -652387,8 +630905,7 @@ _0813E188: strb r0, [r1] b _0813E1C8 .align 2, 0 -_0813E190: .4byte 0x030030fc -_0813E194: .4byte 0x030022c0 + .pool _0813E198: movs r0, 0x1 negs r0, r0 @@ -652402,7 +630919,7 @@ _0813E198: bl gpu_sync_bg_show movs r0, 0x1 bl gpu_sync_bg_show - ldr r0, _0813E1D0 + ldr r0, =sub_813E3C0 + 1 bl set_callback2 movs r1, 0x9A lsls r1, 5 @@ -652414,7 +630931,7 @@ _0813E1C8: pop {r0} bx r0 .align 2, 0 -_0813E1D0: .4byte sub_813E3C0 + 1 + .pool thumb_func_end sub_813DF70 thumb_func_start sub_813E1D4 @@ -652438,16 +630955,16 @@ sub_813E1D4: @ 813E1D4 movs r1, 0x2 mov r2, sp bl pokemon_getattr - ldr r0, _0813E344 + ldr r0, =0x02021cc4 mov r1, sp bl strcpy_limit_10_chars - ldr r0, _0813E348 + ldr r0, =0x02021dc4 movs r1, 0xB muls r1, r5 - ldr r2, _0813E34C + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy - ldr r1, _0813E350 + ldr r1, =0x02021cc0 movs r0, 0x1 strb r0, [r1] adds r0, r4, 0 @@ -652465,7 +630982,7 @@ sub_813E1D4: @ 813E1D4 movs r1, 0x1 bl pokemon_getattr mov r10, r0 - ldr r1, _0813E354 + ldr r1, =0x0203ab80 mov r9, r1 movs r0, 0x64 bl malloc_and_clear @@ -652474,9 +630991,9 @@ sub_813E1D4: @ 813E1D4 movs r4, 0 strb r6, [r0] lsls r0, r5, 3 - ldr r1, _0813E358 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _0813E35C + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x8] adds r2, r5, 0 @@ -652493,8 +631010,8 @@ sub_813E1D4: @ 813E1D4 adds r0, r5, 0 movs r1, 0x1 bl sub_806A068 - ldr r0, _0813E360 - ldr r1, _0813E364 + ldr r0, =0x0202499c + ldr r1, =0x082ec6a8 str r1, [r0, 0x10] movs r1, 0x78 movs r2, 0x40 @@ -652505,14 +631022,14 @@ sub_813E1D4: @ 813E1D4 lsls r1, r0, 24 lsrs r6, r1, 24 strb r0, [r2, 0x1] - ldr r3, _0813E368 + ldr r3, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 adds r0, r3, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, _0813E36C + ldr r2, =nullsub_18 + 1 str r2, [r0] adds r1, r3 ldrb r2, [r1, 0x5] @@ -652527,7 +631044,7 @@ sub_813E1D4: @ 813E1D4 orrs r0, r2 strb r0, [r1] bl sub_817BE78 - ldr r0, _0813E370 + ldr r0, =sub_813F1B8 + 1 movs r1, 0 bl AddTask mov r1, r9 @@ -652535,7 +631052,7 @@ sub_813E1D4: @ 813E1D4 lsls r1, r0, 24 lsrs r6, r1, 24 strb r0, [r2, 0x2] - ldr r1, _0813E374 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -652550,33 +631067,33 @@ sub_813E1D4: @ 813E1D4 mov r1, sp ldrh r1, [r1, 0x14] strh r1, [r0, 0x1C] - ldr r0, _0813E378 + ldr r0, =0x02022e14 strh r4, [r0] - ldr r0, _0813E37C + ldr r0, =0x02022e16 strh r4, [r0] - ldr r0, _0813E380 + ldr r0, =0x02022e18 strh r4, [r0] - ldr r0, _0813E384 + ldr r0, =0x02022e1a strh r4, [r0] - ldr r0, _0813E388 + ldr r0, =0x02022e1c strh r4, [r0] - ldr r0, _0813E38C + ldr r0, =0x02022e1e strh r4, [r0] - ldr r1, _0813E390 + ldr r1, =0x02022e20 movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0813E394 + ldr r0, =0x02022e22 strh r4, [r0] - ldr r2, _0813E398 + ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x2 orrs r0, r1 strb r0, [r2] - ldr r0, _0813E39C + ldr r0, =sub_813FD64 + 1 bl SetVBlankCallback - ldr r0, _0813E3A0 + ldr r0, =sub_813E3C0 + 1 bl set_callback2 add sp, 0x18 pop {r3-r5} @@ -652587,30 +631104,7 @@ sub_813E1D4: @ 813E1D4 pop {r0} bx r0 .align 2, 0 -_0813E344: .4byte 0x02021cc4 -_0813E348: .4byte 0x02021dc4 -_0813E34C: .4byte 0x083185c8 -_0813E350: .4byte 0x02021cc0 -_0813E354: .4byte 0x0203ab80 -_0813E358: .4byte 0x0830a18c -_0813E35C: .4byte 0x020244d4 -_0813E360: .4byte 0x0202499c -_0813E364: .4byte 0x082ec6a8 -_0813E368: .4byte 0x02020630 -_0813E36C: .4byte nullsub_18 + 1 -_0813E370: .4byte sub_813F1B8 + 1 -_0813E374: .4byte 0x03005e00 -_0813E378: .4byte 0x02022e14 -_0813E37C: .4byte 0x02022e16 -_0813E380: .4byte 0x02022e18 -_0813E384: .4byte 0x02022e1a -_0813E388: .4byte 0x02022e1c -_0813E38C: .4byte 0x02022e1e -_0813E390: .4byte 0x02022e20 -_0813E394: .4byte 0x02022e22 -_0813E398: .4byte 0x03003014 -_0813E39C: .4byte sub_813FD64 + 1 -_0813E3A0: .4byte sub_813E3C0 + 1 + .pool thumb_func_end sub_813E1D4 thumb_func_start sub_813E3A4 @@ -652656,7 +631150,7 @@ sub_813E3DC: @ 813E3DC str r0, [sp, 0x8] add r0, r10 lsls r7, r0, 3 - ldr r1, _0813E558 + ldr r1, =0x0832531c adds r1, r7 mov r8, r1 ldrh r0, [r1] @@ -652664,7 +631158,7 @@ sub_813E3DC: @ 813E3DC beq _0813E40C b _0813E546 _0813E40C: - ldr r6, _0813E55C + ldr r6, =0x020244e9 ldrb r0, [r6] cmp r0, 0x5 bls _0813E416 @@ -652672,7 +631166,7 @@ _0813E40C: _0813E416: movs r5, 0x64 muls r0, r5 - ldr r4, _0813E560 + ldr r4, =0x020244ec adds r0, r4 mov r9, r0 ldr r1, [sp, 0x4] @@ -652681,7 +631175,7 @@ _0813E416: ldrb r0, [r6] muls r0, r5 adds r0, r4 - ldr r1, _0813E558 + ldr r1, =0x0832531c adds r2, r1, r7 adds r2, 0xC movs r1, 0xB @@ -652693,7 +631187,7 @@ _0813E416: ldrh r2, [r1, 0xC] movs r1, 0xB muls r2, r1 - ldr r1, _0813E564 + ldr r1, =0x083185c8 adds r2, r1 movs r1, 0x2 bl pokemon_setattr @@ -652723,7 +631217,7 @@ _0813E484: ldrb r1, [r5] movs r0, 0x64 muls r0, r1 - ldr r1, _0813E560 + ldr r1, =0x020244ec adds r0, r1 adds r1, r4, 0 mov r2, sp @@ -652732,12 +631226,12 @@ _0813E484: cmp r4, 0x36 ble _0813E484 movs r4, 0x43 - ldr r7, _0813E55C + ldr r7, =0x020244e9 _0813E4A0: ldrb r0, [r7] movs r6, 0x64 muls r0, r6 - ldr r5, _0813E560 + ldr r5, =0x020244ec adds r0, r5 adds r1, r4, 0 mov r2, sp @@ -652745,7 +631239,7 @@ _0813E4A0: adds r4, 0x1 cmp r4, 0x4F ble _0813E4A0 - ldr r4, _0813E55C + ldr r4, =0x020244e9 ldrb r0, [r4] muls r0, r6 adds r0, r5 @@ -652765,7 +631259,7 @@ _0813E4A0: adds r0, r5 bl pokemon_calc_effective_stats bl calc_player_party_count - ldr r0, _0813E558 + ldr r0, =0x0832531c mov r4, r8 add r4, r10 lsls r4, 3 @@ -652785,7 +631279,7 @@ _0813E4A0: mov r0, r9 movs r1, 0xB bl pokemon_getattr - ldr r1, _0813E568 + ldr r1, =0x0000012f cmp r0, r1 bne _0813E546 mov r0, r9 @@ -652800,7 +631294,7 @@ _0813E4A0: lsls r1, 1 cmp r0, r1 bne _0813E546 - ldr r2, _0813E56C + ldr r2, =0x085b58c4 mov r0, r9 movs r1, 0x2 bl pokemon_setattr @@ -652814,12 +631308,7 @@ _0813E546: pop {r0} bx r0 .align 2, 0 -_0813E558: .4byte 0x0832531c -_0813E55C: .4byte 0x020244e9 -_0813E560: .4byte 0x020244ec -_0813E564: .4byte 0x083185c8 -_0813E568: .4byte 0x0000012f -_0813E56C: .4byte 0x085b58c4 + .pool thumb_func_end sub_813E3DC thumb_func_start sub_813E570 @@ -652831,7 +631320,7 @@ sub_813E570: @ 813E570 sub sp, 0x18 lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _0813E5E0 + ldr r2, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -652840,10 +631329,10 @@ sub_813E570: @ 813E570 ldrsh r1, [r3, r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0813E5E4 + ldr r0, =0x020244ec adds r1, r0 mov r9, r1 - ldr r0, _0813E5E8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] adds r5, r2, 0 adds r6, r0, 0 @@ -652853,7 +631342,7 @@ sub_813E570: @ 813E570 ldrsh r0, [r3, r1] cmp r0, 0x8 bne _0813E5F0 - ldr r4, _0813E5EC + ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -652879,10 +631368,7 @@ sub_813E570: @ 813E570 bl sub_8140134 bl _0813F1A4 .align 2, 0 -_0813E5E0: .4byte 0x03005e00 -_0813E5E4: .4byte 0x020244ec -_0813E5E8: .4byte 0x030022c0 -_0813E5EC: .4byte 0x02024332 + .pool _0813E5F0: lsls r1, r7, 2 adds r0, r1, r7 @@ -652896,12 +631382,12 @@ _0813E5F0: bl _0813F1A4 _0813E606: lsls r0, 2 - ldr r1, _0813E610 + ldr r1, =_0813E614 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813E610: .4byte _0813E614 + .pool .align 2, 0 _0813E614: .4byte _0813E670 @@ -652935,8 +631421,8 @@ _0813E670: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r2, _0813E6C8 - ldr r0, _0813E6CC + ldr r2, =0x02020630 + ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r1, [r0] lsls r0, r1, 4 @@ -652949,7 +631435,7 @@ _0813E670: negs r1, r1 ands r1, r2 strb r1, [r0] - ldr r0, _0813E6D0 + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -652967,11 +631453,9 @@ _0813E670: bl gpu_sync_bg_show bl _0813F1A4 .align 2, 0 -_0813E6C8: .4byte 0x02020630 -_0813E6CC: .4byte 0x0203ab80 -_0813E6D0: .4byte 0x03005e00 + .pool _0813E6D4: - ldr r0, _0813E704 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -652979,24 +631463,21 @@ _0813E6D4: beq _0813E6E4 bl _0813F1A4 _0813E6E4: - ldr r4, _0813E708 - ldr r1, _0813E70C + ldr r4, =0x02021fc4 + ldr r1, =0x085cc990 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0 bl battle_show_message_maybe - ldr r0, _0813E710 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r0 b _0813EC52 .align 2, 0 -_0813E704: .4byte 0x02037fd4 -_0813E708: .4byte 0x02021fc4 -_0813E70C: .4byte 0x085cc990 -_0813E710: .4byte 0x03005e00 + .pool _0813E714: movs r0, 0 bl a_pressed_maybe @@ -653005,20 +631486,19 @@ _0813E714: beq _0813E724 bl _0813F1A4 _0813E724: - ldr r0, _0813E738 + ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] - ldr r1, _0813E73C + ldr r1, =0x03005e00 mov r3, r8 adds r4, r3, r7 lsls r4, 3 adds r4, r1 b _0813EB90 .align 2, 0 -_0813E738: .4byte 0x0203ab80 -_0813E73C: .4byte 0x03005e00 + .pool _0813E740: - ldr r0, _0813E768 + ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] bl sub_8140208 @@ -653029,15 +631509,14 @@ _0813E752: movs r0, 0xBC lsls r0, 1 bl audio_play - ldr r0, _0813E76C + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r0 b _0813EC52 .align 2, 0 -_0813E768: .4byte 0x0203ab80 -_0813E76C: .4byte 0x03005e00 + .pool _0813E770: bl mplay_has_finished_maybe lsls r0, 24 @@ -653046,9 +631525,9 @@ _0813E770: beq _0813E780 bl _0813F1A4 _0813E780: - ldr r0, _0813E7A8 + ldr r0, =0x00000179 bl current_map_music_set - ldr r0, _0813E7AC + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -653064,10 +631543,9 @@ _0813E780: bl sub_80A1AD4 bl _0813F1A4 .align 2, 0 -_0813E7A8: .4byte 0x00000179 -_0813E7AC: .4byte 0x03005e00 + .pool _0813E7B0: - ldr r0, _0813E7DC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -653079,20 +631557,18 @@ _0813E7C0: bl sub_8140000 movs r0, 0x11 bl sub_817BE94 - ldr r1, _0813E7E0 + ldr r1, =0x02024332 strb r0, [r1, 0x2] - ldr r0, _0813E7E4 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r0 b _0813EC52 .align 2, 0 -_0813E7DC: .4byte 0x02037fd4 -_0813E7E0: .4byte 0x02024332 -_0813E7E4: .4byte 0x03005e00 + .pool _0813E7E8: - ldr r4, _0813E820 + ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -653110,7 +631586,7 @@ _0813E7FE: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - ldr r0, _0813E824 + ldr r0, =0x0203ab80 ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x3] @@ -653118,10 +631594,9 @@ _0813E7FE: strb r0, [r4, 0x2] bl _0813F1A4 .align 2, 0 -_0813E820: .4byte 0x02024332 -_0813E824: .4byte 0x0203ab80 + .pool _0813E828: - ldr r4, _0813E858 + ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -653132,7 +631607,7 @@ _0813E828: beq _0813E83E bl _0813F1A4 _0813E83E: - ldr r0, _0813E85C + ldr r0, =0x0203ab80 ldr r1, [r0] ldrb r0, [r1] ldrb r1, [r1, 0x1] @@ -653144,10 +631619,9 @@ _0813E83E: adds r1, r5 b _0813EC52 .align 2, 0 -_0813E858: .4byte 0x02024332 -_0813E85C: .4byte 0x0203ab80 + .pool _0813E860: - ldr r2, _0813E89C + ldr r2, =0x0203ab80 ldr r1, [r2] ldrb r0, [r1, 0x3] subs r0, 0x1 @@ -653160,7 +631634,7 @@ _0813E874: ldr r1, [r2] movs r0, 0x3 strb r0, [r1, 0x3] - ldr r0, _0813E8A0 + ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -653177,23 +631651,21 @@ _0813E890: adds r1, r5 b _0813EC52 .align 2, 0 -_0813E89C: .4byte 0x0203ab80 -_0813E8A0: .4byte 0x02024332 + .pool _0813E8A4: bl sub_817C068 - ldr r1, _0813E8B8 + ldr r1, =0x02024332 strb r0, [r1, 0x2] - ldr r0, _0813E8BC + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 adds r1, r0 b _0813EC52 .align 2, 0 -_0813E8B8: .4byte 0x02024332 -_0813E8BC: .4byte 0x03005e00 + .pool _0813E8C0: - ldr r6, _0813E8E8 + ldr r6, =0x02024332 ldrb r0, [r6, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -653213,9 +631685,9 @@ _0813E8D6: strb r0, [r6, 0x2] b _0813EB96 .align 2, 0 -_0813E8E8: .4byte 0x02024332 + .pool _0813E8EC: - ldr r0, _0813E914 + ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -653234,7 +631706,7 @@ _0813E902: adds r1, r5 b _0813EC52 .align 2, 0 -_0813E914: .4byte 0x02024332 + .pool _0813E918: bl mplay_has_finished_maybe lsls r0, 24 @@ -653243,8 +631715,8 @@ _0813E918: bl _0813F1A4 _0813E926: bl m4aMPlayAllStop - ldr r0, _0813E958 - ldr r1, _0813E95C + ldr r0, =0x02037754 + ldr r1, =0x0203ab80 ldr r1, [r1] adds r1, 0x4 movs r2, 0x60 @@ -653257,18 +631729,16 @@ _0813E926: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _0813E960 + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 adds r1, r0 b _0813EC52 .align 2, 0 -_0813E958: .4byte 0x02037754 -_0813E95C: .4byte 0x0203ab80 -_0813E960: .4byte 0x03005e00 + .pool _0813E964: - ldr r0, _0813E988 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -653276,7 +631746,7 @@ _0813E964: beq _0813E974 bl _0813F1A4 _0813E974: - ldr r0, _0813E98C + ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0, 0x1] mov r1, r8 @@ -653286,8 +631756,7 @@ _0813E974: ldrh r1, [r4, 0xC] b _0813EB92 .align 2, 0 -_0813E988: .4byte 0x02037fd4 -_0813E98C: .4byte 0x0203ab80 + .pool _0813E990: bl sub_80A3678 lsls r0, 24 @@ -653295,16 +631764,16 @@ _0813E990: bne _0813E99E bl _0813F1A4 _0813E99E: - ldr r4, _0813EA0C - ldr r1, _0813EA10 + ldr r4, =0x02021fc4 + ldr r1, =0x085cc9a6 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0 bl battle_show_message_maybe - ldr r0, _0813EA14 + ldr r0, =0x00000173 bl song_play_for_text - ldr r2, _0813EA18 + ldr r2, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -653339,10 +631808,7 @@ _0813E99E: bl sav12_xor_increment b _0813F1A4 .align 2, 0 -_0813EA0C: .4byte 0x02021fc4 -_0813EA10: .4byte 0x085cc9a6 -_0813EA14: .4byte 0x00000173 -_0813EA18: .4byte 0x03005e00 + .pool _0813EA1C: movs r0, 0 bl a_pressed_maybe @@ -653351,7 +631817,7 @@ _0813EA1C: beq _0813EA2A b _0813F1A4 _0813EA2A: - ldr r1, _0813EA88 + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -653385,21 +631851,19 @@ _0813EA5E: movs r1, 0x2 add r2, sp, 0x4 bl pokemon_getattr - ldr r0, _0813EA8C + ldr r0, =0x02022f58 add r1, sp, 0x4 bl strcpy_limit_10_chars - ldr r0, _0813EA90 + ldr r0, =0x0000ffff cmp r6, r0 bne _0813EA94 movs r0, 0x16 strh r0, [r4, 0x8] b _0813F1A4 .align 2, 0 -_0813EA88: .4byte 0x03005e00 -_0813EA8C: .4byte 0x02022f58 -_0813EA90: .4byte 0x0000ffff + .pool _0813EA94: - ldr r0, _0813EAA4 + ldr r0, =0x0000fffe cmp r6, r0 bne _0813EA9C b _0813F1A4 @@ -653408,7 +631872,7 @@ _0813EA9C: strh r0, [r4, 0x8] b _0813F1A4 .align 2, 0 -_0813EAA4: .4byte 0x0000fffe + .pool _0813EAA8: movs r0, 0x1 negs r0, r0 @@ -653417,16 +631881,16 @@ _0813EAA8: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0813EAC4 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r0 b _0813EC52 .align 2, 0 -_0813EAC4: .4byte 0x03005e00 + .pool _0813EAC8: - ldr r0, _0813EB28 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r2, 0x80 adds r0, r2, 0 @@ -653460,21 +631924,19 @@ _0813EB06: adds r0, r7, 0 bl remove_task bl sub_805F094 - ldr r4, _0813EB2C + ldr r4, =0x0203ab80 ldr r0, [r4] bl free str r6, [r4] bl Window_FreeMemory - ldr r0, _0813EB30 + ldr r0, =0x030061e8 ldr r0, [r0] bl set_callback2 b _0813F1A4 .align 2, 0 -_0813EB28: .4byte 0x02037fd4 -_0813EB2C: .4byte 0x0203ab80 -_0813EB30: .4byte 0x030061e8 + .pool _0813EB34: - ldr r0, _0813EB68 + ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -653486,8 +631948,8 @@ _0813EB34: b _0813F1A4 _0813EB48: bl m4aMPlayAllStop - ldr r0, _0813EB6C - ldr r1, _0813EB70 + ldr r0, =0x0006001c + ldr r1, =0x00007fff str r1, [sp] movs r1, 0 movs r2, 0x10 @@ -653499,11 +631961,9 @@ _0813EB48: adds r1, r5 b _0813EC52 .align 2, 0 -_0813EB68: .4byte 0x02024332 -_0813EB6C: .4byte 0x0006001c -_0813EB70: .4byte 0x00007fff + .pool _0813EB74: - ldr r0, _0813EBA0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -653511,7 +631971,7 @@ _0813EB74: beq _0813EB82 b _0813F1A4 _0813EB82: - ldr r0, _0813EBA4 + ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] mov r3, r8 @@ -653528,10 +631988,9 @@ _0813EB96: strh r0, [r4, 0x8] b _0813F1A4 .align 2, 0 -_0813EBA0: .4byte 0x02037fd4 -_0813EBA4: .4byte 0x0203ab80 + .pool _0813EBA8: - ldr r0, _0813EBD4 + ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] bl sub_8140208 @@ -653539,7 +631998,7 @@ _0813EBA8: bne _0813EBB8 b _0813F1A4 _0813EBB8: - ldr r0, _0813EBD8 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -653548,24 +632007,21 @@ _0813EBB8: ldrsh r0, [r1, r3] cmp r0, 0 beq _0813EBE4 - ldr r0, _0813EBDC - ldr r1, _0813EBE0 + ldr r0, =0x02021fc4 + ldr r1, =0x085cc9ee bl ExpandTextCodes b _0813EBEC .align 2, 0 -_0813EBD4: .4byte 0x0203ab80 -_0813EBD8: .4byte 0x03005e00 -_0813EBDC: .4byte 0x02021fc4 -_0813EBE0: .4byte 0x085cc9ee + .pool _0813EBE4: - ldr r0, _0813EC04 - ldr r1, _0813EC08 + ldr r0, =0x02021fc4 + ldr r1, =0x085cc9d3 bl ExpandTextCodes _0813EBEC: - ldr r0, _0813EC04 + ldr r0, =0x02021fc4 movs r1, 0 bl battle_show_message_maybe - ldr r1, _0813EC0C + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -653574,9 +632030,7 @@ _0813EBEC: strh r1, [r0, 0x1A] b _0813F16E .align 2, 0 -_0813EC04: .4byte 0x02021fc4 -_0813EC08: .4byte 0x085cc9d3 -_0813EC0C: .4byte 0x03005e00 + .pool _0813EC10: movs r0, 0 bl a_pressed_maybe @@ -653592,15 +632046,15 @@ _0813EC1E: b _0813F1A4 _0813EC2A: bl sub_804F574 - ldr r0, _0813EC5C + ldr r0, =0x0000016f bl fanfare_play - ldr r0, _0813EC60 + ldr r0, =0x085cc270 ldr r0, [r0, 0xC] bl sub_814E6F0 - ldr r0, _0813EC64 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r0, _0813EC68 + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -653613,10 +632067,7 @@ _0813EC52: strh r0, [r1, 0x8] b _0813F1A4 .align 2, 0 -_0813EC5C: .4byte 0x0000016f -_0813EC60: .4byte 0x085cc270 -_0813EC64: .4byte 0x02022e2c -_0813EC68: .4byte 0x03005e00 + .pool _0813EC6C: movs r0, 0 bl a_pressed_maybe @@ -653631,7 +632082,7 @@ _0813EC7A: beq _0813EC86 b _0813F1A4 _0813EC86: - ldr r0, _0813ECA4 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -653648,7 +632099,7 @@ _0813EC9E: strh r0, [r1, 0x8] b _0813F1A4 .align 2, 0 -_0813ECA4: .4byte 0x03005e00 + .pool _0813ECA8: mov r3, r8 adds r0, r3, r7 @@ -653661,12 +632112,12 @@ _0813ECA8: b _0813F1A4 _0813ECBA: lsls r0, 2 - ldr r1, _0813ECC4 + ldr r1, =_0813ECC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813ECC4: .4byte _0813ECC8 + .pool .align 2, 0 _0813ECC8: .4byte _0813ECFC @@ -653697,13 +632148,13 @@ _0813ED0A: b _0813F1A4 _0813ED16: bl sub_804F574 - ldr r0, _0813ED3C + ldr r0, =0x085cc270 ldr r0, [r0, 0x10] bl sub_814E6F0 - ldr r0, _0813ED40 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r0, _0813ED44 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -653712,9 +632163,7 @@ _0813ED16: adds r0, 0x1 b _0813F1A2 .align 2, 0 -_0813ED3C: .4byte 0x085cc270 -_0813ED40: .4byte 0x02022e2c -_0813ED44: .4byte 0x03005e00 + .pool _0813ED48: movs r0, 0 bl a_pressed_maybe @@ -653729,13 +632178,13 @@ _0813ED56: beq _0813ED62 b _0813F1A4 _0813ED62: - ldr r0, _0813ED84 + ldr r0, =0x085cc270 ldr r0, [r0, 0x14] bl sub_814E6F0 - ldr r0, _0813ED88 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r0, _0813ED8C + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -653744,9 +632193,7 @@ _0813ED62: adds r0, 0x1 b _0813F1A2 .align 2, 0 -_0813ED84: .4byte 0x085cc270 -_0813ED88: .4byte 0x02022e2c -_0813ED8C: .4byte 0x03005e00 + .pool _0813ED90: movs r0, 0 bl a_pressed_maybe @@ -653757,13 +632204,13 @@ _0813ED90: lsls r0, 24 cmp r0, 0 bne _0813EDCE - ldr r0, _0813EE20 + ldr r0, =0x085cc270 ldr r0, [r0, 0x18] bl sub_814E6F0 - ldr r0, _0813EE24 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r0, _0813EE28 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -653796,10 +632243,10 @@ _0813EDEA: movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - ldr r0, _0813EE2C + ldr r0, =0x085ccabb movs r1, 0xC bl battle_show_message_maybe - ldr r0, _0813EE28 + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -653808,25 +632255,21 @@ _0813EDEA: adds r0, 0x1 movs r2, 0 strh r0, [r1, 0x14] - ldr r0, _0813EE30 + ldr r0, =0x02024332 strb r2, [r0, 0x1] movs r0, 0 bl sub_8056B74 b _0813F1A4 .align 2, 0 -_0813EE20: .4byte 0x085cc270 -_0813EE24: .4byte 0x02022e2c -_0813EE28: .4byte 0x03005e00 -_0813EE2C: .4byte 0x085ccabb -_0813EE30: .4byte 0x02024332 + .pool _0813EE34: - ldr r0, _0813EEC0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _0813EE5C - ldr r4, _0813EEC4 + ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 beq _0813EE5C @@ -653838,13 +632281,13 @@ _0813EE34: strb r0, [r4, 0x1] bl sub_8056B74 _0813EE5C: - ldr r0, _0813EEC0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0813EE84 - ldr r4, _0813EEC4 + ldr r4, =0x02024332 ldrb r0, [r4, 0x1] cmp r0, 0 bne _0813EE84 @@ -653856,7 +632299,7 @@ _0813EE5C: strb r0, [r4, 0x1] bl sub_8056B74 _0813EE84: - ldr r0, _0813EEC0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 @@ -653871,11 +632314,11 @@ _0813EE84: bl sub_8056A3C movs r0, 0x5 bl audio_play - ldr r0, _0813EEC4 + ldr r0, =0x02024332 ldrb r2, [r0, 0x1] cmp r2, 0 beq _0813EECC - ldr r0, _0813EEC8 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -653884,11 +632327,9 @@ _0813EE84: strh r0, [r1, 0x14] b _0813EEF2 .align 2, 0 -_0813EEC0: .4byte 0x030022c0 -_0813EEC4: .4byte 0x02024332 -_0813EEC8: .4byte 0x03005e00 + .pool _0813EECC: - ldr r0, _0813EF28 + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -653907,7 +632348,7 @@ _0813EECC: movs r3, 0x10 bl sub_80A1AD4 _0813EEF2: - ldr r0, _0813EF2C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -653924,7 +632365,7 @@ _0813EF00: bl sub_8056A3C movs r0, 0x5 bl audio_play - ldr r1, _0813EF28 + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -653933,10 +632374,9 @@ _0813EF00: strh r1, [r0, 0x14] b _0813F1A4 .align 2, 0 -_0813EF28: .4byte 0x03005e00 -_0813EF2C: .4byte 0x030022c0 + .pool _0813EF30: - ldr r0, _0813EF70 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -653945,20 +632385,20 @@ _0813EF30: b _0813F1A4 _0813EF3E: bl Window_FreeMemory - ldr r0, _0813EF74 - ldr r1, _0813EF78 + ldr r0, =0x020244ec + ldr r1, =0x03005e00 mov r3, r8 adds r5, r3, r7 lsls r5, 3 adds r5, r1 ldrb r1, [r5, 0x1C] - ldr r2, _0813EF7C + ldr r2, =0x020244e9 ldrb r2, [r2] subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, _0813EF80 - ldr r4, _0813EF84 + ldr r3, =sub_813DD7C + 1 + ldr r4, =0x020244e2 ldrh r4, [r4] str r4, [sp] bl sub_81BFA38 @@ -653967,14 +632407,9 @@ _0813EF3E: strh r0, [r5, 0x14] b _0813F1A4 .align 2, 0 -_0813EF70: .4byte 0x02037fd4 -_0813EF74: .4byte 0x020244ec -_0813EF78: .4byte 0x03005e00 -_0813EF7C: .4byte 0x020244e9 -_0813EF80: .4byte sub_813DD7C + 1 -_0813EF84: .4byte 0x020244e2 + .pool _0813EF88: - ldr r0, _0813EFBC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -653983,7 +632418,7 @@ _0813EF88: b _0813F1A4 _0813EF96: ldr r1, [r6, 0x4] - ldr r0, _0813EFC0 + ldr r0, =sub_813E3A4 + 1 cmp r1, r0 beq _0813EFA0 b _0813F1A4 @@ -653993,7 +632428,7 @@ _0813EFA0: lsrs r6, r0, 24 cmp r6, 0x4 bne _0813EFC8 - ldr r0, _0813EFC4 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -654001,9 +632436,7 @@ _0813EFA0: movs r0, 0xA b _0813F1A2 .align 2, 0 -_0813EFBC: .4byte 0x02037fd4 -_0813EFC0: .4byte sub_813E3A4 + 1 -_0813EFC4: .4byte 0x03005e00 + .pool _0813EFC8: adds r1, r6, 0 adds r1, 0xD @@ -654015,15 +632448,15 @@ _0813EFC8: bl sub_806E804 cmp r0, 0 beq _0813F014 - ldr r0, _0813F004 - ldr r3, _0813F008 + ldr r0, =0x085cc270 + ldr r3, =0x000004cc adds r0, r3 ldr r0, [r0] bl sub_814E6F0 - ldr r0, _0813F00C + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _0813F010 + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -654032,12 +632465,9 @@ _0813EFC8: strh r1, [r0, 0x14] b _0813F1A4 .align 2, 0 -_0813F004: .4byte 0x085cc270 -_0813F008: .4byte 0x000004cc -_0813F00C: .4byte 0x02022e2c -_0813F010: .4byte 0x03005e00 + .pool _0813F014: - ldr r1, _0813F050 + ldr r1, =0x02022f68 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -654052,12 +632482,12 @@ _0813F014: mov r0, r9 adds r1, r4, 0 bl sub_806B9A8 - ldr r0, _0813F054 + ldr r0, =0x020244e2 ldrh r1, [r0] mov r0, r9 adds r2, r4, 0 bl sub_80691F4 - ldr r0, _0813F058 + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -654066,20 +632496,18 @@ _0813F014: adds r0, 0x1 b _0813F1A2 .align 2, 0 -_0813F050: .4byte 0x02022f68 -_0813F054: .4byte 0x020244e2 -_0813F058: .4byte 0x03005e00 + .pool _0813F05C: - ldr r0, _0813F084 + ldr r0, =0x085cc270 movs r1, 0xCF lsls r1, 2 adds r0, r1 ldr r0, [r0] bl sub_814E6F0 - ldr r0, _0813F088 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r0, _0813F08C + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -654088,9 +632516,7 @@ _0813F05C: adds r0, 0x1 b _0813F1A2 .align 2, 0 -_0813F084: .4byte 0x085cc270 -_0813F088: .4byte 0x02022e2c -_0813F08C: .4byte 0x03005e00 + .pool _0813F090: movs r0, 0 bl a_pressed_maybe @@ -654105,13 +632531,13 @@ _0813F09E: beq _0813F0AA b _0813F1A4 _0813F0AA: - ldr r0, _0813F0CC + ldr r0, =0x085cc270 ldr r0, [r0, 0x1C] bl sub_814E6F0 - ldr r0, _0813F0D0 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r0, _0813F0D4 + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -654120,9 +632546,7 @@ _0813F0AA: adds r0, 0x1 b _0813F1A2 .align 2, 0 -_0813F0CC: .4byte 0x085cc270 -_0813F0D0: .4byte 0x02022e2c -_0813F0D4: .4byte 0x03005e00 + .pool _0813F0D8: movs r0, 0 bl a_pressed_maybe @@ -654133,16 +632557,16 @@ _0813F0D8: lsls r0, 24 cmp r0, 0 bne _0813F1A4 - ldr r0, _0813F114 + ldr r0, =0x085cc270 movs r1, 0xD0 lsls r1, 2 adds r0, r1 ldr r0, [r0] bl sub_814E6F0 - ldr r0, _0813F118 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _0813F11C + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -654151,17 +632575,15 @@ _0813F0D8: strh r1, [r0, 0x8] b _0813F1A4 .align 2, 0 -_0813F114: .4byte 0x085cc270 -_0813F118: .4byte 0x02022e2c -_0813F11C: .4byte 0x03005e00 + .pool _0813F120: - ldr r0, _0813F148 + ldr r0, =0x085cc270 ldr r0, [r0, 0x20] bl sub_814E6F0 - ldr r0, _0813F14C + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _0813F150 + ldr r1, =0x03005e00 mov r3, r8 adds r0, r3, r7 lsls r0, 3 @@ -654174,17 +632596,15 @@ _0813F120: strh r1, [r0, 0x14] b _0813F1A4 .align 2, 0 -_0813F148: .4byte 0x085cc270 -_0813F14C: .4byte 0x02022e2c -_0813F150: .4byte 0x03005e00 + .pool _0813F154: - ldr r0, _0813F174 + ldr r0, =0x085cc270 ldr r0, [r0, 0x24] bl sub_814E6F0 - ldr r0, _0813F178 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _0813F17C + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -654194,9 +632614,7 @@ _0813F16E: strh r1, [r0, 0x8] b _0813F1A4 .align 2, 0 -_0813F174: .4byte 0x085cc270 -_0813F178: .4byte 0x02022e2c -_0813F17C: .4byte 0x03005e00 + .pool _0813F180: movs r0, 0 bl a_pressed_maybe @@ -654207,7 +632625,7 @@ _0813F180: lsls r0, 24 cmp r0, 0 bne _0813F1A4 - ldr r0, _0813F1B4 + ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 lsls r1, 3 @@ -654224,7 +632642,7 @@ _0813F1A4: pop {r0} bx r0 .align 2, 0 -_0813F1B4: .4byte 0x03005e00 + .pool thumb_func_end sub_813E570 thumb_func_start sub_813F1B8 @@ -654236,7 +632654,7 @@ sub_813F1B8: @ 813F1B8 sub sp, 0x18 lsls r0, 24 lsrs r7, r0, 24 - ldr r3, _0813F1F8 + ldr r3, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -654245,7 +632663,7 @@ sub_813F1B8: @ 813F1B8 ldrsh r2, [r0, r1] movs r1, 0x64 muls r2, r1 - ldr r1, _0813F1FC + ldr r1, =0x020244ec adds r2, r1 mov r9, r2 movs r2, 0x8 @@ -654256,14 +632674,12 @@ sub_813F1B8: @ 813F1B8 bl _0813FCC4 _0813F1EC: lsls r0, 2 - ldr r1, _0813F200 + ldr r1, =_0813F204 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813F1F8: .4byte 0x03005e00 -_0813F1FC: .4byte 0x020244ec -_0813F200: .4byte _0813F204 + .pool .align 2, 0 _0813F204: .4byte _0813F258 @@ -654288,24 +632704,22 @@ _0813F204: .4byte _0813F7A4 .4byte _0813F7E4 _0813F258: - ldr r4, _0813F278 - ldr r1, _0813F27C + ldr r4, =0x02021fc4 + ldr r1, =0x085cc990 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 adds r1, r4, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r1, _0813F280 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 b _0813F6B4 .align 2, 0 -_0813F278: .4byte 0x02021fc4 -_0813F27C: .4byte 0x085cc990 -_0813F280: .4byte 0x03005e00 + .pool _0813F284: movs r0, 0 bl a_pressed_maybe @@ -654314,7 +632728,7 @@ _0813F284: beq _0813F294 bl _0813FCC4 _0813F294: - ldr r0, _0813F2A8 + ldr r0, =0x03005e00 lsls r4, r7, 2 adds r4, r7 lsls r4, 3 @@ -654324,7 +632738,7 @@ _0813F294: bl cry_related b _0813F6F2 .align 2, 0 -_0813F2A8: .4byte 0x03005e00 + .pool _0813F2AC: bl sub_80A3678 lsls r0, 24 @@ -654332,20 +632746,19 @@ _0813F2AC: bne _0813F2BA bl _0813FCC4 _0813F2BA: - ldr r0, _0813F2D4 + ldr r0, =0x00000179 bl m4aSongNumStop movs r0, 0xBC lsls r0, 1 bl audio_play - ldr r1, _0813F2D8 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 b _0813F6B4 .align 2, 0 -_0813F2D4: .4byte 0x00000179 -_0813F2D8: .4byte 0x03005e00 + .pool _0813F2DC: bl mplay_has_finished_maybe lsls r0, 24 @@ -654354,9 +632767,9 @@ _0813F2DC: beq _0813F2EC bl _0813FCC4 _0813F2EC: - ldr r0, _0813F30C + ldr r0, =0x00000179 bl song_play_for_text - ldr r1, _0813F310 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -654369,10 +632782,9 @@ _0813F2EC: movs r1, 0x4 b _0813F9C8 .align 2, 0 -_0813F30C: .4byte 0x00000179 -_0813F310: .4byte 0x03005e00 + .pool _0813F314: - ldr r0, _0813F368 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -654382,8 +632794,8 @@ _0813F314: _0813F324: movs r0, 0x1 bl sub_8140000 - ldr r2, _0813F36C - ldr r0, _0813F370 + ldr r2, =0x02020630 + ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r1, [r0] lsls r0, r1, 4 @@ -654396,9 +632808,9 @@ _0813F324: adds r6, 0x10 adds r0, r6, 0 bl sub_817BE94 - ldr r1, _0813F374 + ldr r1, =0x02024332 strb r0, [r1, 0x2] - ldr r1, _0813F378 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -654406,19 +632818,14 @@ _0813F324: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - ldr r1, _0813F37C + ldr r1, =0x00000603 movs r0, 0xE bl lcd_io_set bl _0813FCC4 .align 2, 0 -_0813F368: .4byte 0x02037fd4 -_0813F36C: .4byte 0x02020630 -_0813F370: .4byte 0x0203ab80 -_0813F374: .4byte 0x02024332 -_0813F378: .4byte 0x03005e00 -_0813F37C: .4byte 0x00000603 + .pool _0813F380: - ldr r4, _0813F3B8 + ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -654436,7 +632843,7 @@ _0813F396: ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - ldr r0, _0813F3BC + ldr r0, =0x0203ab80 ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x3] @@ -654444,10 +632851,9 @@ _0813F396: strb r0, [r4, 0x2] bl _0813FCC4 .align 2, 0 -_0813F3B8: .4byte 0x02024332 -_0813F3BC: .4byte 0x0203ab80 + .pool _0813F3C0: - ldr r4, _0813F3E8 + ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -654458,7 +632864,7 @@ _0813F3C0: beq _0813F3D6 bl _0813FCC4 _0813F3D6: - ldr r0, _0813F3EC + ldr r0, =0x0203ab80 ldr r1, [r0] ldrb r0, [r1] ldrb r1, [r1, 0x1] @@ -654466,10 +632872,9 @@ _0813F3D6: strb r0, [r4, 0x2] b _0813F6AC .align 2, 0 -_0813F3E8: .4byte 0x02024332 -_0813F3EC: .4byte 0x0203ab80 + .pool _0813F3F0: - ldr r2, _0813F424 + ldr r2, =0x0203ab80 ldr r1, [r2] ldrb r0, [r1, 0x3] subs r0, 0x1 @@ -654482,7 +632887,7 @@ _0813F404: ldr r1, [r2] movs r0, 0x3 strb r0, [r1, 0x3] - ldr r0, _0813F428 + ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -654495,23 +632900,21 @@ _0813F404: _0813F420: b _0813F6AC .align 2, 0 -_0813F424: .4byte 0x0203ab80 -_0813F428: .4byte 0x02024332 + .pool _0813F42C: bl sub_817C068 - ldr r1, _0813F440 + ldr r1, =0x02024332 strb r0, [r1, 0x2] - ldr r1, _0813F444 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 b _0813F6B4 .align 2, 0 -_0813F440: .4byte 0x02024332 -_0813F444: .4byte 0x03005e00 + .pool _0813F448: - ldr r6, _0813F470 + ldr r6, =0x02024332 ldrb r0, [r6, 0x2] lsls r1, r0, 2 adds r1, r0 @@ -654531,9 +632934,9 @@ _0813F45E: strb r0, [r6, 0x2] b _0813F6F2 .align 2, 0 -_0813F470: .4byte 0x02024332 + .pool _0813F474: - ldr r0, _0813F494 + ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -654548,7 +632951,7 @@ _0813F48A: bl audio_play b _0813F6AC .align 2, 0 -_0813F494: .4byte 0x02024332 + .pool _0813F498: bl mplay_has_finished_maybe lsls r0, 24 @@ -654556,30 +632959,27 @@ _0813F498: bne _0813F4A6 bl _0813FCC4 _0813F4A6: - ldr r0, _0813F4D4 + ldr r0, =0x0203ab84 ldr r0, [r0] bl free - ldr r5, _0813F4D8 + ldr r5, =0x0203ab80 ldr r0, [r5] ldrb r0, [r0, 0x1] - ldr r1, _0813F4DC + ldr r1, =0x03005e00 lsls r4, r7, 2 adds r4, r7 lsls r4, 3 adds r4, r1 ldrh r1, [r4, 0xC] bl sub_81401E0 - ldr r0, _0813F4E0 + ldr r0, =0x02037754 ldr r1, [r5] adds r1, 0x4 movs r2, 0x60 bl memcpy b _0813F6F2 .align 2, 0 -_0813F4D4: .4byte 0x0203ab84 -_0813F4D8: .4byte 0x0203ab80 -_0813F4DC: .4byte 0x03005e00 -_0813F4E0: .4byte 0x02037754 + .pool _0813F4E4: bl sub_80A3678 lsls r0, 24 @@ -654587,17 +632987,17 @@ _0813F4E4: bne _0813F4F2 bl _0813FCC4 _0813F4F2: - ldr r4, _0813F560 - ldr r1, _0813F564 + ldr r4, =0x02021fc4 + ldr r1, =0x085cc9a6 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 adds r1, r4, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r0, _0813F568 + ldr r0, =0x00000173 bl fanfare_play - ldr r2, _0813F56C + ldr r2, =0x03005e00 lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -654632,10 +633032,7 @@ _0813F4F2: bl sav12_xor_increment b _0813FCC4 .align 2, 0 -_0813F560: .4byte 0x02021fc4 -_0813F564: .4byte 0x085cc9a6 -_0813F568: .4byte 0x00000173 -_0813F56C: .4byte 0x03005e00 + .pool _0813F570: movs r0, 0 bl a_pressed_maybe @@ -654651,7 +633048,7 @@ _0813F57E: beq _0813F58C b _0813FCC4 _0813F58C: - ldr r1, _0813F5DC + ldr r1, =0x03005e00 lsls r4, r7, 2 adds r0, r4, r7 lsls r0, 3 @@ -654678,21 +633075,19 @@ _0813F58C: movs r1, 0x2 add r2, sp, 0x4 bl pokemon_getattr - ldr r0, _0813F5E0 + ldr r0, =0x02022f58 add r1, sp, 0x4 bl strcpy_limit_10_chars - ldr r0, _0813F5E4 + ldr r0, =0x0000ffff cmp r6, r0 bne _0813F5E8 movs r0, 0x14 strh r0, [r5, 0x8] b _0813FCC4 .align 2, 0 -_0813F5DC: .4byte 0x03005e00 -_0813F5E0: .4byte 0x02022f58 -_0813F5E4: .4byte 0x0000ffff + .pool _0813F5E8: - ldr r0, _0813F5F8 + ldr r0, =0x0000fffe cmp r6, r0 bne _0813F5F0 b _0813FCC4 @@ -654701,24 +633096,22 @@ _0813F5F0: strh r0, [r5, 0x8] b _0813FCC4 .align 2, 0 -_0813F5F8: .4byte 0x0000fffe + .pool _0813F5FC: - ldr r0, _0813F618 + ldr r0, =0x00000179 bl song_play_for_text - ldr r1, _0813F61C + ldr r1, =0x085ef6d2 movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r0, _0813F620 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 adds r1, r0 b _0813F78C .align 2, 0 -_0813F618: .4byte 0x00000179 -_0813F61C: .4byte 0x085ef6d2 -_0813F620: .4byte 0x03005e00 + .pool _0813F624: movs r0, 0 bl a_pressed_maybe @@ -654730,26 +633123,24 @@ _0813F624: _0813F634: adds r0, r7, 0 bl remove_task - ldr r4, _0813F65C + ldr r4, =0x0203ab80 ldr r0, [r4] bl free str r5, [r4] - ldr r2, _0813F660 + ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x3 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _0813F664 + ldr r0, =0x030061e8 ldr r0, [r0] bl set_callback2 b _0813FCC4 .align 2, 0 -_0813F65C: .4byte 0x0203ab80 -_0813F660: .4byte 0x03003014 -_0813F664: .4byte 0x030061e8 + .pool _0813F668: - ldr r0, _0813F6BC + ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 adds r0, r1 @@ -654761,8 +633152,8 @@ _0813F668: b _0813FCC4 _0813F67C: bl m4aMPlayAllStop - ldr r2, _0813F6C0 - ldr r0, _0813F6C4 + ldr r2, =0x02020630 + ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r1, [r0] lsls r0, r1, 4 @@ -654774,9 +633165,9 @@ _0813F67C: adds r1, 0x10 movs r0, 0x1 lsls r0, r1 - ldr r1, _0813F6C8 + ldr r1, =0x0004001c orrs r0, r1 - ldr r1, _0813F6CC + ldr r1, =0x00007fff str r1, [sp] movs r1, 0 movs r2, 0x10 @@ -654793,13 +633184,9 @@ _0813F6B4: strh r1, [r0, 0x8] b _0813FCC4 .align 2, 0 -_0813F6BC: .4byte 0x02024332 -_0813F6C0: .4byte 0x02020630 -_0813F6C4: .4byte 0x0203ab80 -_0813F6C8: .4byte 0x0004001c -_0813F6CC: .4byte 0x00007fff + .pool _0813F6D0: - ldr r0, _0813F6FC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -654807,7 +633194,7 @@ _0813F6D0: beq _0813F6DE b _0813FCC4 _0813F6DE: - ldr r0, _0813F700 + ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] lsls r4, r7, 2 @@ -654822,10 +633209,9 @@ _0813F6F2: strh r0, [r4, 0x8] b _0813FCC4 .align 2, 0 -_0813F6FC: .4byte 0x02037fd4 -_0813F700: .4byte 0x0203ab80 + .pool _0813F704: - ldr r0, _0813F738 + ldr r0, =0x0203ab80 ldr r0, [r0] ldrb r0, [r0] bl sub_8140208 @@ -654833,15 +633219,15 @@ _0813F704: bne _0813F714 b _0813FCC4 _0813F714: - ldr r4, _0813F73C - ldr r1, _0813F740 + ldr r4, =0x02021fc4 + ldr r1, =0x085cc9ee adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 adds r1, r4, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r1, _0813F744 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -654850,10 +633236,7 @@ _0813F714: strh r1, [r0, 0x1A] b _0813FC8C .align 2, 0 -_0813F738: .4byte 0x0203ab80 -_0813F73C: .4byte 0x02021fc4 -_0813F740: .4byte 0x085cc9ee -_0813F744: .4byte 0x03005e00 + .pool _0813F748: movs r0, 0 bl a_pressed_maybe @@ -654869,16 +633252,16 @@ _0813F756: b _0813FCC4 _0813F762: bl sub_804F574 - ldr r0, _0813F794 + ldr r0, =0x0000016f bl fanfare_play - ldr r0, _0813F798 + ldr r0, =0x085cc270 ldr r0, [r0, 0xC] bl sub_814E6F0 - ldr r1, _0813F79C + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r0, _0813F7A0 + ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -654891,10 +633274,7 @@ _0813F78C: strh r0, [r1, 0x8] b _0813FCC4 .align 2, 0 -_0813F794: .4byte 0x0000016f -_0813F798: .4byte 0x085cc270 -_0813F79C: .4byte 0x02022e2c -_0813F7A0: .4byte 0x03005e00 + .pool _0813F7A4: movs r0, 0 bl a_pressed_maybe @@ -654910,7 +633290,7 @@ _0813F7B2: beq _0813F7C0 b _0813FCC4 _0813F7C0: - ldr r0, _0813F7E0 + ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -654927,7 +633307,7 @@ _0813F7D8: strh r0, [r1, 0x8] b _0813FCC4 .align 2, 0 -_0813F7E0: .4byte 0x03005e00 + .pool _0813F7E4: lsls r1, r7, 2 adds r0, r1, r7 @@ -654941,12 +633321,12 @@ _0813F7E4: b _0813FCC4 _0813F7F8: lsls r0, 2 - ldr r1, _0813F804 + ldr r1, =_0813F808 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0813F804: .4byte _0813F808 + .pool .align 2, 0 _0813F808: .4byte _0813F838 @@ -654976,14 +633356,14 @@ _0813F846: b _0813FCC4 _0813F852: bl sub_804F574 - ldr r0, _0813F878 + ldr r0, =0x085cc270 ldr r0, [r0, 0x10] bl sub_814E6F0 - ldr r1, _0813F87C + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r0, _0813F880 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -654992,9 +633372,7 @@ _0813F852: adds r0, 0x1 b _0813FCC2 .align 2, 0 -_0813F878: .4byte 0x085cc270 -_0813F87C: .4byte 0x02022e2c -_0813F880: .4byte 0x03005e00 + .pool _0813F884: movs r0, 0 bl a_pressed_maybe @@ -655009,14 +633387,14 @@ _0813F892: beq _0813F89E b _0813FCC4 _0813F89E: - ldr r0, _0813F8C0 + ldr r0, =0x085cc270 ldr r0, [r0, 0x14] bl sub_814E6F0 - ldr r1, _0813F8C4 + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r0, _0813F8C8 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -655025,9 +633403,7 @@ _0813F89E: adds r0, 0x1 b _0813FCC2 .align 2, 0 -_0813F8C0: .4byte 0x085cc270 -_0813F8C4: .4byte 0x02022e2c -_0813F8C8: .4byte 0x03005e00 + .pool _0813F8CC: movs r0, 0 bl a_pressed_maybe @@ -655038,14 +633414,14 @@ _0813F8CC: lsls r0, 24 cmp r0, 0 bne _0813F90C - ldr r0, _0813F958 + ldr r0, =0x085cc270 ldr r0, [r0, 0x18] bl sub_814E6F0 - ldr r1, _0813F95C + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r0, _0813F960 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -655076,14 +633452,14 @@ _0813F928: movs r1, 0xA8 movs r2, 0xE0 bl sub_809882C - ldr r0, _0813F964 + ldr r0, =0x0833900c movs r1, 0xA8 movs r2, 0xE movs r3, 0 bl sub_81996C0 - ldr r3, _0813F968 + ldr r3, =0x02024332 strb r4, [r3, 0x1] - ldr r0, _0813F960 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -655095,11 +633471,7 @@ _0813F928: strb r2, [r3, 0x1] b _0813FCC4 .align 2, 0 -_0813F958: .4byte 0x085cc270 -_0813F95C: .4byte 0x02022e2c -_0813F960: .4byte 0x03005e00 -_0813F964: .4byte 0x0833900c -_0813F968: .4byte 0x02024332 + .pool _0813F96C: bl sub_8198C58 lsls r0, 24 @@ -655118,19 +633490,19 @@ _0813F986: beq _0813F9E4 b _0813FCC4 _0813F98C: - ldr r0, _0813F9D4 + ldr r0, =0x02024332 strb r6, [r0, 0x1] - ldr r0, _0813F9D8 + ldr r0, =0x085cc270 movs r1, 0x92 lsls r1, 3 adds r0, r1 ldr r0, [r0] bl sub_814E6F0 - ldr r1, _0813F9DC + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r1, _0813F9E0 + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -655153,25 +633525,22 @@ _0813F9C8: bl sub_80A1AD4 b _0813FCC4 .align 2, 0 -_0813F9D4: .4byte 0x02024332 -_0813F9D8: .4byte 0x085cc270 -_0813F9DC: .4byte 0x02022e2c -_0813F9E0: .4byte 0x03005e00 + .pool _0813F9E4: - ldr r1, _0813FA14 + ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x1] - ldr r0, _0813FA18 + ldr r0, =0x085cc270 movs r1, 0x92 lsls r1, 3 adds r0, r1 ldr r0, [r0] bl sub_814E6F0 - ldr r1, _0813FA1C + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r1, _0813FA20 + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -655180,12 +633549,9 @@ _0813F9E4: strh r1, [r0, 0x14] b _0813FCC4 .align 2, 0 -_0813FA14: .4byte 0x02024332 -_0813FA18: .4byte 0x085cc270 -_0813FA1C: .4byte 0x02022e2c -_0813FA20: .4byte 0x03005e00 + .pool _0813FA24: - ldr r0, _0813FA8C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -655193,7 +633559,7 @@ _0813FA24: beq _0813FA32 b _0813FCC4 _0813FA32: - ldr r0, _0813FA90 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _0813FA3E @@ -655209,20 +633575,20 @@ _0813FA3E: bl bg_get_tilemap bl free bl Window_FreeMemory - ldr r0, _0813FA94 - ldr r1, _0813FA98 + ldr r0, =0x020244ec + ldr r1, =0x03005e00 mov r2, r8 adds r5, r2, r7 lsls r5, 3 adds r5, r1 ldrb r1, [r5, 0x1C] - ldr r2, _0813FA9C + ldr r2, =0x020244e9 ldrb r2, [r2] subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, _0813FAA0 - ldr r4, _0813FAA4 + ldr r3, =sub_813DF70 + 1 + ldr r4, =0x020244e2 ldrh r4, [r4] str r4, [sp] bl sub_81BFA38 @@ -655231,15 +633597,9 @@ _0813FA3E: strh r0, [r5, 0x14] b _0813FCC4 .align 2, 0 -_0813FA8C: .4byte 0x02037fd4 -_0813FA90: .4byte 0x030030fc -_0813FA94: .4byte 0x020244ec -_0813FA98: .4byte 0x03005e00 -_0813FA9C: .4byte 0x020244e9 -_0813FAA0: .4byte sub_813DF70 + 1 -_0813FAA4: .4byte 0x020244e2 + .pool _0813FAA8: - ldr r0, _0813FADC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -655247,9 +633607,9 @@ _0813FAA8: beq _0813FAB6 b _0813FCC4 _0813FAB6: - ldr r0, _0813FAE0 + ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, _0813FAE4 + ldr r0, =sub_813E3C0 + 1 cmp r1, r0 beq _0813FAC2 b _0813FCC4 @@ -655259,7 +633619,7 @@ _0813FAC2: lsrs r6, r0, 24 cmp r6, 0x4 bne _0813FAEC - ldr r0, _0813FAE8 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -655267,10 +633627,7 @@ _0813FAC2: movs r0, 0x9 b _0813FCC2 .align 2, 0 -_0813FADC: .4byte 0x02037fd4 -_0813FAE0: .4byte 0x030022c0 -_0813FAE4: .4byte sub_813E3C0 + 1 -_0813FAE8: .4byte 0x03005e00 + .pool _0813FAEC: adds r1, r6, 0 adds r1, 0xD @@ -655282,16 +633639,16 @@ _0813FAEC: bl sub_806E804 cmp r0, 0 beq _0813FB3C - ldr r0, _0813FB2C - ldr r1, _0813FB30 + ldr r0, =0x085cc270 + ldr r1, =0x000004cc adds r0, r1 ldr r0, [r0] bl sub_814E6F0 - ldr r1, _0813FB34 + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r1, _0813FB38 + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -655300,12 +633657,9 @@ _0813FAEC: strh r1, [r0, 0x14] b _0813FCC4 .align 2, 0 -_0813FB2C: .4byte 0x085cc270 -_0813FB30: .4byte 0x000004cc -_0813FB34: .4byte 0x02022e2c -_0813FB38: .4byte 0x03005e00 + .pool _0813FB3C: - ldr r1, _0813FB90 + ldr r1, =0x02022f68 movs r0, 0xFD strb r0, [r1] movs r0, 0x2 @@ -655320,22 +633674,22 @@ _0813FB3C: mov r0, r9 adds r1, r4, 0 bl sub_806B9A8 - ldr r0, _0813FB94 + ldr r0, =0x020244e2 ldrh r1, [r0] mov r0, r9 adds r2, r4, 0 bl sub_80691F4 - ldr r0, _0813FB98 + ldr r0, =0x085cc270 movs r1, 0xCF lsls r1, 2 adds r0, r1 ldr r0, [r0] bl sub_814E6F0 - ldr r1, _0813FB9C + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r0, _0813FBA0 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -655344,11 +633698,7 @@ _0813FB3C: adds r0, 0x1 b _0813FCC2 .align 2, 0 -_0813FB90: .4byte 0x02022f68 -_0813FB94: .4byte 0x020244e2 -_0813FB98: .4byte 0x085cc270 -_0813FB9C: .4byte 0x02022e2c -_0813FBA0: .4byte 0x03005e00 + .pool _0813FBA4: movs r0, 0 bl a_pressed_maybe @@ -655363,14 +633713,14 @@ _0813FBB2: beq _0813FBBE b _0813FCC4 _0813FBBE: - ldr r0, _0813FBE0 + ldr r0, =0x085cc270 ldr r0, [r0, 0x1C] bl sub_814E6F0 - ldr r1, _0813FBE4 + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r0, _0813FBE8 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -655379,9 +633729,7 @@ _0813FBBE: adds r0, 0x1 b _0813FCC2 .align 2, 0 -_0813FBE0: .4byte 0x085cc270 -_0813FBE4: .4byte 0x02022e2c -_0813FBE8: .4byte 0x03005e00 + .pool _0813FBEC: movs r0, 0 bl a_pressed_maybe @@ -655392,17 +633740,17 @@ _0813FBEC: lsls r0, 24 cmp r0, 0 bne _0813FCC4 - ldr r0, _0813FC2C + ldr r0, =0x085cc270 movs r1, 0xD0 lsls r1, 2 adds r0, r1 ldr r0, [r0] bl sub_814E6F0 - ldr r1, _0813FC30 + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r1, _0813FC34 + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -655411,18 +633759,16 @@ _0813FBEC: strh r1, [r0, 0x8] b _0813FCC4 .align 2, 0 -_0813FC2C: .4byte 0x085cc270 -_0813FC30: .4byte 0x02022e2c -_0813FC34: .4byte 0x03005e00 + .pool _0813FC38: - ldr r0, _0813FC64 + ldr r0, =0x085cc270 ldr r0, [r0, 0x20] bl sub_814E6F0 - ldr r1, _0813FC68 + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r1, _0813FC6C + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -655435,18 +633781,16 @@ _0813FC38: strh r1, [r0, 0x14] b _0813FCC4 .align 2, 0 -_0813FC64: .4byte 0x085cc270 -_0813FC68: .4byte 0x02022e2c -_0813FC6C: .4byte 0x03005e00 + .pool _0813FC70: - ldr r0, _0813FC94 + ldr r0, =0x085cc270 ldr r0, [r0, 0x24] bl sub_814E6F0 - ldr r1, _0813FC98 + ldr r1, =0x02022e2c movs r0, 0 movs r2, 0x1 bl sub_807F1A8 - ldr r1, _0813FC9C + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r7 lsls r0, 3 @@ -655456,9 +633800,7 @@ _0813FC8C: strh r1, [r0, 0x8] b _0813FCC4 .align 2, 0 -_0813FC94: .4byte 0x085cc270 -_0813FC98: .4byte 0x02022e2c -_0813FC9C: .4byte 0x03005e00 + .pool _0813FCA0: movs r0, 0 bl a_pressed_maybe @@ -655469,7 +633811,7 @@ _0813FCA0: lsls r0, 24 cmp r0, 0 bne _0813FCC4 - ldr r0, _0813FCD4 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -655486,7 +633828,7 @@ _0813FCC4: pop {r0} bx r0 .align 2, 0 -_0813FCD4: .4byte 0x03005e00 + .pool thumb_func_end sub_813F1B8 thumb_func_start nullsub_83 @@ -655497,35 +633839,35 @@ nullsub_83: @ 813FCD8 thumb_func_start sub_813FCDC sub_813FCDC: @ 813FCDC push {lr} - ldr r0, _0813FD44 + ldr r0, =0x02022e14 ldrh r1, [r0] movs r0, 0x10 bl lcd_io_set - ldr r0, _0813FD48 + ldr r0, =0x02022e16 ldrh r1, [r0] movs r0, 0x12 bl lcd_io_set - ldr r0, _0813FD4C + ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 bl lcd_io_set - ldr r0, _0813FD50 + ldr r0, =0x02022e1a ldrh r1, [r0] movs r0, 0x16 bl lcd_io_set - ldr r0, _0813FD54 + ldr r0, =0x02022e1c ldrh r1, [r0] movs r0, 0x18 bl lcd_io_set - ldr r0, _0813FD58 + ldr r0, =0x02022e1e ldrh r1, [r0] movs r0, 0x1A bl lcd_io_set - ldr r0, _0813FD5C + ldr r0, =0x02022e20 ldrh r1, [r0] movs r0, 0x1C bl lcd_io_set - ldr r0, _0813FD60 + ldr r0, =0x02022e22 ldrh r1, [r0] movs r0, 0x1E bl lcd_io_set @@ -655536,48 +633878,41 @@ sub_813FCDC: @ 813FCDC pop {r0} bx r0 .align 2, 0 -_0813FD44: .4byte 0x02022e14 -_0813FD48: .4byte 0x02022e16 -_0813FD4C: .4byte 0x02022e18 -_0813FD50: .4byte 0x02022e1a -_0813FD54: .4byte 0x02022e1c -_0813FD58: .4byte 0x02022e1e -_0813FD5C: .4byte 0x02022e20 -_0813FD60: .4byte 0x02022e22 + .pool thumb_func_end sub_813FCDC thumb_func_start sub_813FD64 sub_813FD64: @ 813FD64 push {lr} - ldr r0, _0813FDCC + ldr r0, =0x02022e14 ldrh r1, [r0] movs r0, 0x10 bl lcd_io_set - ldr r0, _0813FDD0 + ldr r0, =0x02022e16 ldrh r1, [r0] movs r0, 0x12 bl lcd_io_set - ldr r0, _0813FDD4 + ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 bl lcd_io_set - ldr r0, _0813FDD8 + ldr r0, =0x02022e1a ldrh r1, [r0] movs r0, 0x16 bl lcd_io_set - ldr r0, _0813FDDC + ldr r0, =0x02022e1c ldrh r1, [r0] movs r0, 0x18 bl lcd_io_set - ldr r0, _0813FDE0 + ldr r0, =0x02022e1e ldrh r1, [r0] movs r0, 0x1A bl lcd_io_set - ldr r0, _0813FDE4 + ldr r0, =0x02022e20 ldrh r1, [r0] movs r0, 0x1C bl lcd_io_set - ldr r0, _0813FDE8 + ldr r0, =0x02022e22 ldrh r1, [r0] movs r0, 0x1E bl lcd_io_set @@ -655588,14 +633923,7 @@ sub_813FD64: @ 813FD64 pop {r0} bx r0 .align 2, 0 -_0813FDCC: .4byte 0x02022e14 -_0813FDD0: .4byte 0x02022e16 -_0813FDD4: .4byte 0x02022e18 -_0813FDD8: .4byte 0x02022e1a -_0813FDDC: .4byte 0x02022e1c -_0813FDE0: .4byte 0x02022e1e -_0813FDE4: .4byte 0x02022e20 -_0813FDE8: .4byte 0x02022e22 + .pool thumb_func_end sub_813FD64 thumb_func_start sub_813FDEC @@ -655606,7 +633934,7 @@ sub_813FDEC: @ 813FDEC lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0813FE6C + ldr r1, =0x03005e08 adds r4, r0, r1 movs r0, 0xC ldrsh r5, [r4, r0] @@ -655624,7 +633952,7 @@ sub_813FDEC: @ 813FDEC strh r0, [r4] lsls r1, 16 asrs r1, 16 - ldr r3, _0813FE70 + ldr r3, =0x085b58c9 movs r2, 0x4 ldrsh r0, [r4, r2] lsls r2, r0, 2 @@ -655665,10 +633993,9 @@ _0813FE5E: ldrb r0, [r0] b _0813FE8A .align 2, 0 -_0813FE6C: .4byte 0x03005e08 -_0813FE70: .4byte 0x085b58c9 + .pool _0813FE74: - ldr r0, _0813FEA0 + ldr r0, =0x0203ab84 lsls r1, 5 ldr r0, [r0] adds r0, r1 @@ -655692,7 +634019,7 @@ _0813FE9A: pop {r0} bx r0 .align 2, 0 -_0813FEA0: .4byte 0x0203ab84 + .pool thumb_func_end sub_813FDEC thumb_func_start sub_813FEA4 @@ -655700,14 +634027,14 @@ sub_813FEA4: @ 813FEA4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0813FEC8 + ldr r0, =sub_813FEE8 + 1 movs r1, 0x7 bl AddTask lsls r0, 24 lsrs r2, r0, 24 cmp r4, 0 bne _0813FED0 - ldr r1, _0813FECC + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -655715,10 +634042,9 @@ sub_813FEA4: @ 813FEA4 strh r4, [r0, 0xC] b _0813FEDE .align 2, 0 -_0813FEC8: .4byte sub_813FEE8 + 1 -_0813FECC: .4byte 0x03005e00 + .pool _0813FED0: - ldr r0, _0813FEE4 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -655730,7 +634056,7 @@ _0813FEDE: pop {r0} bx r0 .align 2, 0 -_0813FEE4: .4byte 0x03005e00 + .pool thumb_func_end sub_813FEA4 thumb_func_start sub_813FEE8 @@ -655741,11 +634067,11 @@ sub_813FEE8: @ 813FEE8 push {r6,r7} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0813FF14 + ldr r0, =0x02022e18 mov r8, r0 - ldr r1, _0813FF18 + ldr r1, =0x02022e1a mov r9, r1 - ldr r1, _0813FF1C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -655754,18 +634080,14 @@ sub_813FEE8: @ 813FEE8 ldrsh r0, [r0, r2] cmp r0, 0 bne _0813FF28 - ldr r7, _0813FF20 - ldr r6, _0813FF24 + ldr r7, =0x02022e1c + ldr r6, =0x02022e1e b _0813FF2C .align 2, 0 -_0813FF14: .4byte 0x02022e18 -_0813FF18: .4byte 0x02022e1a -_0813FF1C: .4byte 0x03005e00 -_0813FF20: .4byte 0x02022e1c -_0813FF24: .4byte 0x02022e1e + .pool _0813FF28: - ldr r7, _0813FFB4 - ldr r6, _0813FFB8 + ldr r7, =0x02022e20 + ldr r6, =0x02022e22 _0813FF2C: lsls r4, r5, 2 adds r4, r5 @@ -655805,7 +634127,7 @@ _0813FF2C: bl sine adds r0, 0x10 strh r0, [r6] - ldr r0, _0813FFBC + ldr r0, =sub_813FDEC + 1 bl is_function_an_active_task lsls r0, 24 lsrs r4, r0, 24 @@ -655830,9 +634152,7 @@ _0813FFA6: pop {r0} bx r0 .align 2, 0 -_0813FFB4: .4byte 0x02022e20 -_0813FFB8: .4byte 0x02022e22 -_0813FFBC: .4byte sub_813FDEC + 1 + .pool thumb_func_end sub_813FEE8 thumb_func_start sub_813FFC0 @@ -655840,8 +634160,8 @@ sub_813FFC0: @ 813FFC0 push {r4-r7,lr} adds r6, r0, 0 movs r1, 0 - ldr r5, _0813FFF8 - ldr r7, _0813FFFC + ldr r5, =0x085b5884 + ldr r7, =0x085b58d9 _0813FFCA: lsls r0, r1, 4 adds r4, r1, 0x1 @@ -655867,8 +634187,7 @@ _0813FFD6: pop {r0} bx r0 .align 2, 0 -_0813FFF8: .4byte 0x085b5884 -_0813FFFC: .4byte 0x085b58d9 + .pool thumb_func_end sub_813FFC0 thumb_func_start sub_8140000 @@ -655877,7 +634196,7 @@ sub_8140000: @ 8140000 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _08140024 + ldr r4, =0x0203ab84 movs r0, 0xC8 lsls r0, 3 bl malloc_and_clear @@ -655889,28 +634208,28 @@ sub_8140000: @ 8140000 movs r4, 0x2 b _0814002C .align 2, 0 -_08140024: .4byte 0x0203ab84 + .pool _08140028: movs r6, 0x1 movs r4, 0x3 _0814002C: - ldr r0, _081400AC + ldr r0, =0x085b51e4 movs r1, 0xA0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _081400B0 + ldr r1, =0x085b4134 movs r0, 0 str r0, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _081400B4 + ldr r1, =0x085b482c movs r0, 0x1 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r1, _081400B8 + ldr r1, =0x085b4d10 adds r0, r4, 0 movs r2, 0 movs r3, 0 @@ -655921,10 +634240,10 @@ _0814002C: bl gpu_copy_wram_bg_tilemap_to_vram cmp r5, 0 bne _081400C4 - ldr r1, _081400BC + ldr r1, =0x00000442 movs r0, 0x50 bl lcd_io_set - ldr r1, _081400C0 + ldr r1, =0x00000808 movs r0, 0x52 bl lcd_io_set movs r1, 0xBA @@ -655945,17 +634264,12 @@ _0814002C: bl gpu_sync_bg_show b _081400DE .align 2, 0 -_081400AC: .4byte 0x085b51e4 -_081400B0: .4byte 0x085b4134 -_081400B4: .4byte 0x085b482c -_081400B8: .4byte 0x085b4d10 -_081400BC: .4byte 0x00000442 -_081400C0: .4byte 0x00000808 + .pool _081400C4: - ldr r1, _081400F4 + ldr r1, =0x00000842 movs r0, 0x50 bl lcd_io_set - ldr r1, _081400F8 + ldr r1, =0x00000808 movs r0, 0x52 bl lcd_io_set movs r1, 0xDA @@ -655963,7 +634277,7 @@ _081400C4: movs r0, 0 bl lcd_io_set _081400DE: - ldr r0, _081400FC + ldr r0, =sub_813FDEC + 1 movs r1, 0x5 bl AddTask adds r0, r5, 0 @@ -655973,21 +634287,19 @@ _081400DE: pop {r0} bx r0 .align 2, 0 -_081400F4: .4byte 0x00000842 -_081400F8: .4byte 0x00000808 -_081400FC: .4byte sub_813FDEC + 1 + .pool thumb_func_end sub_8140000 thumb_func_start sub_8140100 sub_8140100: @ 8140100 push {lr} - ldr r0, _0814012C + ldr r0, =sub_813FDEC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF beq _0814011E - ldr r0, _08140130 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -656002,14 +634314,13 @@ _0814011E: pop {r0} bx r0 .align 2, 0 -_0814012C: .4byte sub_813FDEC + 1 -_08140130: .4byte 0x03005e00 + .pool thumb_func_end sub_8140100 thumb_func_start sub_8140134 sub_8140134: @ 8140134 push {lr} - ldr r0, _0814016C + ldr r0, =sub_813FDEC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -656017,7 +634328,7 @@ sub_8140134: @ 8140134 beq _08140148 bl remove_task _08140148: - ldr r0, _08140170 + ldr r0, =sub_813FEE8 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -656033,8 +634344,7 @@ _0814015A: pop {r0} bx r0 .align 2, 0 -_0814016C: .4byte sub_813FDEC + 1 -_08140170: .4byte sub_813FEE8 + 1 + .pool thumb_func_end sub_8140134 thumb_func_start sub_8140174 @@ -656043,12 +634353,12 @@ sub_8140174: @ 8140174 movs r0, 0x50 movs r1, 0 bl lcd_io_set - ldr r0, _081401D0 + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r0, _081401D4 + ldr r0, =0x02022e1a strh r1, [r0] - ldr r0, _081401D8 + ldr r0, =0x02022e1c strh r1, [r0] movs r0, 0x1 movs r1, 0x5 @@ -656072,16 +634382,13 @@ sub_8140174: @ 8140174 lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _081401DC + ldr r0, =0x0203ab84 ldr r0, [r0] bl free pop {r0} bx r0 .align 2, 0 -_081401D0: .4byte 0x02022e18 -_081401D4: .4byte 0x02022e1a -_081401D8: .4byte 0x02022e1c -_081401DC: .4byte 0x0203ab84 + .pool thumb_func_end sub_8140174 thumb_func_start sub_81401E0 @@ -656095,7 +634402,7 @@ sub_81401E0: @ 81401E0 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, _08140204 + ldr r2, =0x02020630 adds r0, r2 movs r2, 0 movs r3, 0 @@ -656103,7 +634410,7 @@ sub_81401E0: @ 81401E0 pop {r0} bx r0 .align 2, 0 -_08140204: .4byte 0x02020630 + .pool thumb_func_end sub_81401E0 thumb_func_start sub_8140208 @@ -656111,21 +634418,20 @@ sub_8140208: @ 8140208 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08140228 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r2, 0x1C adds r1, r2 ldr r1, [r1] - ldr r0, _0814022C + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _08140230 movs r0, 0 b _08140232 .align 2, 0 -_08140228: .4byte 0x02020630 -_0814022C: .4byte nullsub_12 + 1 + .pool _08140230: movs r0, 0x1 _08140232: @@ -656139,7 +634445,7 @@ sub_8140238: @ 8140238 bl run_active_tasks bl call_obj_callbacks bl obj_sync_something - ldr r0, _08140260 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r1, r0, 0 adds r1, 0xB8 @@ -656152,7 +634458,7 @@ _0814025A: pop {r0} bx r0 .align 2, 0 -_08140260: .4byte 0x0203ab88 + .pool thumb_func_end sub_8140238 thumb_func_start sub_8140264 @@ -656163,7 +634469,7 @@ sub_8140264: @ 8140264 bl copy_queue_process bl copy_pal_bg_faded_to_pal_ram bl sub_8142814 - ldr r4, _081402D8 + ldr r4, =0x0203ab88 ldr r0, [r4] ldrh r0, [r0, 0x26] movs r2, 0x80 @@ -656187,13 +634493,13 @@ _081402A0: ldrsh r0, [r2, r3] cmp r0, 0 beq _081402C0 - ldr r1, _081402DC - ldr r3, _081402E0 + ldr r1, =0x040000d4 + ldr r3, =0x0000133c adds r0, r2, r3 str r0, [r1] - ldr r0, _081402E4 + ldr r0, =0x060021c0 str r0, [r1, 0x4] - ldr r0, _081402E8 + ldr r0, =0x800001a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r0, 0 @@ -656212,11 +634518,7 @@ _081402C0: beq _08140348 b _08140374 .align 2, 0 -_081402D8: .4byte 0x0203ab88 -_081402DC: .4byte 0x040000d4 -_081402E0: .4byte 0x0000133c -_081402E4: .4byte 0x060021c0 -_081402E8: .4byte 0x800001a0 + .pool _081402EC: movs r0, 0 movs r1, 0x1 @@ -656224,40 +634526,36 @@ _081402EC: bl gpu_bg_config_set_field movs r0, 0 bl gpu_sync_bg_show - ldr r1, _08140318 + ldr r1, =0x040000d4 ldr r2, [r4] movs r3, 0xCF lsls r3, 2 adds r0, r2, r3 str r0, [r1] - ldr r0, _0814031C + ldr r0, =0x0600f9c0 str r0, [r1, 0x4] - ldr r0, _08140320 + ldr r0, =0x800001a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r0, 0x2 strh r0, [r2, 0x28] b _08140374 .align 2, 0 -_08140318: .4byte 0x040000d4 -_0814031C: .4byte 0x0600f9c0 -_08140320: .4byte 0x800001a0 + .pool _08140324: - ldr r1, _0814033C + ldr r1, =0x040000d4 movs r2, 0xCF lsls r2, 2 adds r0, r2 str r0, [r1] - ldr r0, _08140340 + ldr r0, =0x0600f9c0 str r0, [r1, 0x4] - ldr r0, _08140344 + ldr r0, =0x800001a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] b _08140374 .align 2, 0 -_0814033C: .4byte 0x040000d4 -_08140340: .4byte 0x0600f9c0 -_08140344: .4byte 0x800001a0 + .pool _08140348: movs r0, 0 movs r1, 0x1 @@ -656268,12 +634566,12 @@ _08140348: mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _0814037C + ldr r1, =0x040000d4 mov r3, sp str r3, [r1] - ldr r0, _08140380 + ldr r0, =0x0600f9c0 str r0, [r1, 0x4] - ldr r0, _08140384 + ldr r0, =0x810001a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] ldr r1, [r4] @@ -656285,9 +634583,7 @@ _08140374: pop {r0} bx r0 .align 2, 0 -_0814037C: .4byte 0x040000d4 -_08140380: .4byte 0x0600f9c0 -_08140384: .4byte 0x810001a0 + .pool thumb_func_end sub_8140264 thumb_func_start sub_8140388 @@ -656296,14 +634592,14 @@ sub_8140388: @ 8140388 sub sp, 0x4 movs r5, 0 str r5, [sp] - ldr r4, _081403F8 + ldr r4, =0x0203ab88 movs r0, 0xE6 lsls r0, 6 bl malloc_and_clear str r0, [r4] movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081403FC + ldr r1, =0x085b6140 movs r0, 0x1 movs r2, 0x3 bl bg_vram_setup @@ -656314,25 +634610,25 @@ sub_8140388: @ 8140388 movs r0, 0 bl bg_set_tilemap ldr r1, [r4] - ldr r2, _08140400 + ldr r2, =0x0000117c adds r1, r2 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _08140404 + ldr r0, =0x0000317c adds r1, r0 movs r0, 0x2 bl bg_set_tilemap - ldr r0, _08140408 + ldr r0, =0x085b614c bl Window_InitFromTemplates bl sub_8197200 - ldr r0, _0814040C + ldr r0, =0x0203ab8c strb r5, [r0] - ldr r0, _08140410 + ldr r0, =0x085b5dfc mov r1, sp bl malloc_and_decompress ldr r1, [r4] - ldr r2, _08140414 + ldr r2, =0x0000397c adds r1, r2 str r0, [r1] add sp, 0x4 @@ -656340,22 +634636,15 @@ sub_8140388: @ 8140388 pop {r0} bx r0 .align 2, 0 -_081403F8: .4byte 0x0203ab88 -_081403FC: .4byte 0x085b6140 -_08140400: .4byte 0x0000117c -_08140404: .4byte 0x0000317c -_08140408: .4byte 0x085b614c -_0814040C: .4byte 0x0203ab8c -_08140410: .4byte 0x085b5dfc -_08140414: .4byte 0x0000397c + .pool thumb_func_end sub_8140388 thumb_func_start sub_8140418 sub_8140418: @ 8140418 push {r4,r5,lr} - ldr r5, _08140468 + ldr r5, =0x0203ab88 ldr r0, [r5] - ldr r4, _0814046C + ldr r4, =0x0000397c adds r0, r4 ldr r0, [r0] bl free @@ -656384,21 +634673,20 @@ sub_8140418: @ 8140418 pop {r0} bx r0 .align 2, 0 -_08140468: .4byte 0x0203ab88 -_0814046C: .4byte 0x0000397c + .pool thumb_func_end sub_8140418 thumb_func_start sub_8140470 sub_8140470: @ 8140470 push {r4-r6,lr} sub sp, 0x8 - ldr r1, _08140504 + ldr r1, =0x085b6418 mov r0, sp movs r2, 0x6 bl memcpy - ldr r5, _08140508 + ldr r5, =0x0203ab88 ldr r3, [r5] - ldr r4, _0814050C + ldr r4, =0x020375e0 ldrb r0, [r4] movs r1, 0x1 ands r1, r0 @@ -656420,7 +634708,7 @@ sub_8140470: @ 8140470 strb r1, [r0, 0x4] _081404AA: ldr r1, [r5] - ldr r2, _08140510 + ldr r2, =0x085b6348 ldrb r0, [r1, 0x4] lsls r0, 30 lsrs r0, 25 @@ -656437,7 +634725,7 @@ _081404AA: adds r1, 0x23 strb r0, [r1] ldr r2, [r5] - ldr r3, _08140514 + ldr r3, =0x085b6344 ldrb r1, [r2, 0x4] lsls r0, r1, 30 lsrs r0, 30 @@ -656458,29 +634746,23 @@ _081404AA: ldrb r0, [r0, 0x19] cmp r0, 0x1 bne _08140520 - ldr r4, _08140518 - ldr r3, _0814051C + ldr r4, =0x02037714 + ldr r3, =0x02037b14 mov r0, sp ldrh r2, [r0] b _08140528 .align 2, 0 -_08140504: .4byte 0x085b6418 -_08140508: .4byte 0x0203ab88 -_0814050C: .4byte 0x020375e0 -_08140510: .4byte 0x085b6348 -_08140514: .4byte 0x085b6344 -_08140518: .4byte 0x02037714 -_0814051C: .4byte 0x02037b14 + .pool _08140520: - ldr r4, _08140594 - ldr r3, _08140598 + ldr r4, =0x02037714 + ldr r3, =0x02037b14 mov r0, sp ldrh r2, [r0, 0x2] _08140528: adds r0, r3, 0 adds r0, 0xA2 strh r2, [r0] - ldr r1, _0814059C + ldr r1, =0x0000ffff adds r0, r1, 0 ands r0, r2 strh r0, [r3] @@ -656490,17 +634772,17 @@ _08140528: strh r0, [r2] ands r0, r1 strh r0, [r4] - ldr r0, _081405A0 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0xB8 bl sub_8151678 movs r4, 0 _0814054E: - ldr r5, _081405A0 + ldr r5, =0x0203ab88 ldr r0, [r5] adds r0, 0xB8 lsls r2, r4, 3 - ldr r1, _081405A4 + ldr r1, =0x085b6388 adds r2, r1 adds r1, r4, 0 bl sub_815168C @@ -656513,7 +634795,7 @@ _0814054E: _0814056C: movs r0, 0x64 muls r0, r4 - ldr r1, _081405A8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x41 bl pokemon_getattr @@ -656530,12 +634812,7 @@ _0814056C: movs r2, 0x1 b _081405B2 .align 2, 0 -_08140594: .4byte 0x02037714 -_08140598: .4byte 0x02037b14 -_0814059C: .4byte 0x0000ffff -_081405A0: .4byte 0x0203ab88 -_081405A4: .4byte 0x085b6388 -_081405A8: .4byte 0x020244ec + .pool _081405AC: ldr r0, [r5] ldrb r1, [r0, 0x2] @@ -656560,7 +634837,7 @@ _081405B6: sub_81405CC: @ 81405CC push {r4,r5,lr} sub sp, 0xC - ldr r0, _081405EC + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -656570,13 +634847,12 @@ sub_81405CC: @ 81405CC b _081407F8 _081405E0: lsls r0, 2 - ldr r1, _081405F0 + ldr r1, =_081405F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081405EC: .4byte 0x030022c0 -_081405F0: .4byte _081405F4 + .pool .align 2, 0 _081405F4: .4byte _08140618 @@ -656603,12 +634879,12 @@ _08140630: lsls r1, 6 movs r0, 0x50 bl lcd_io_set - ldr r1, _0814064C + ldr r1, =0x0000060a movs r0, 0x52 bl lcd_io_set b _081407F8 .align 2, 0 -_0814064C: .4byte 0x0000060a + .pool _08140650: bl sub_80A1A74 bl reset_all_obj_data @@ -656616,19 +634892,19 @@ _08140650: bl reset_temp_tile_data_buffers b _081407F8 _08140662: - ldr r0, _08140690 + ldr r0, =0x085b5bfc movs r2, 0xE0 lsls r2, 1 movs r1, 0 bl gpu_pal_apply - ldr r1, _08140694 + ldr r1, =0x08dbc2e8 movs r4, 0 str r4, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _08140698 + ldr r1, =0x08dbca14 str r4, [sp] movs r0, 0x2 movs r2, 0 @@ -656636,9 +634912,7 @@ _08140662: bl decompress_and_copy_tile_data_to_vram b _081407F8 .align 2, 0 -_08140690: .4byte 0x085b5bfc -_08140694: .4byte 0x08dbc2e8 -_08140698: .4byte 0x08dbca14 + .pool _0814069C: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -656647,14 +634921,14 @@ _0814069C: b _08140806 _081406A8: bl sub_8140470 - ldr r1, _081406BC + ldr r1, =0x085b5fa0 movs r0, 0x2 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map b _081407F8 .align 2, 0 -_081406BC: .4byte 0x085b5fa0 + .pool _081406C0: movs r0, 0 bl sub_8142C0C @@ -656678,12 +634952,12 @@ _081406E0: bl sub_81436D0 movs r0, 0 bl sub_81424FC - ldr r4, _08140740 + ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 bl sub_81973FC ldrb r0, [r4] - ldr r2, _08140744 + ldr r2, =0x082a5b89 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -656696,19 +634970,16 @@ _081406E0: ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram - ldr r1, _08140748 + ldr r1, =0x02021bbc movs r2, 0x3C negs r2, r2 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0814074C + ldr r0, =0x02021bbe strh r5, [r0] b _081407F8 .align 2, 0 -_08140740: .4byte 0x0203ab8c -_08140744: .4byte 0x082a5b89 -_08140748: .4byte 0x02021bbc -_0814074C: .4byte 0x02021bbe + .pool _08140750: movs r1, 0x82 lsls r1, 5 @@ -656728,7 +634999,7 @@ _08140750: _0814077A: movs r0, 0x1 bl enable_irqs - ldr r0, _081407E0 + ldr r0, =sub_8140264 + 1 bl SetVBlankCallback movs r0, 0x1 str r0, [sp] @@ -656737,16 +635008,16 @@ _0814077A: movs r2, 0x10 movs r3, 0 bl sub_80A27B0 - ldr r0, _081407E4 + ldr r0, =sub_81408A8 + 1 movs r1, 0 bl AddTask - ldr r5, _081407E8 + ldr r5, =0x0203ab88 ldr r1, [r5] adds r1, 0xA4 strb r0, [r1] lsls r0, 24 lsrs r0, 24 - ldr r1, _081407EC + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -656759,24 +635030,19 @@ _0814077A: lsls r0, 16 lsrs r0, 16 bl sub_80EDE84 - ldr r0, _081407F0 + ldr r0, =sub_8140814 + 1 movs r1, 0x1 bl AddTask ldr r1, [r5] adds r1, 0xA5 strb r0, [r1] - ldr r0, _081407F4 + ldr r0, =sub_8140238 + 1 bl set_callback2 b _08140806 .align 2, 0 -_081407E0: .4byte sub_8140264 + 1 -_081407E4: .4byte sub_81408A8 + 1 -_081407E8: .4byte 0x0203ab88 -_081407EC: .4byte 0x03005e00 -_081407F0: .4byte sub_8140814 + 1 -_081407F4: .4byte sub_8140238 + 1 + .pool _081407F8: - ldr r1, _08140810 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -656789,13 +635055,13 @@ _08140806: pop {r0} bx r0 .align 2, 0 -_08140810: .4byte 0x030022c0 + .pool thumb_func_end sub_81405CC thumb_func_start sub_8140814 sub_8140814: @ 8140814 push {r4-r6,lr} - ldr r3, _081408A4 + ldr r3, =0x0203ab88 ldr r0, [r3] adds r0, 0x21 ldrb r2, [r0] @@ -656868,7 +635134,7 @@ _0814088E: pop {r0} bx r0 .align 2, 0 -_081408A4: .4byte 0x0203ab88 + .pool thumb_func_end sub_8140814 thumb_func_start sub_81408A8 @@ -656885,10 +635151,10 @@ sub_81408A8: @ 81408A8 lsls r1, 6 movs r0, 0x50 bl lcd_io_set - ldr r1, _08140904 + ldr r1, =0x00000808 movs r0, 0x52 bl lcd_io_set - ldr r1, _08140908 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -656902,8 +635168,8 @@ sub_81408A8: @ 81408A8 bl sub_81424FC movs r0, 0x6 bl sub_814372C - ldr r1, _0814090C - ldr r2, _08140910 + ldr r1, =sub_8140968 + 1 + ldr r2, =0x0000ffff adds r0, r4, 0 movs r3, 0x3 bl sub_8141F7C @@ -656912,10 +635178,7 @@ _081408FE: pop {r0} bx r0 .align 2, 0 -_08140904: .4byte 0x00000808 -_08140908: .4byte 0x03005e00 -_0814090C: .4byte sub_8140968 + 1 -_08140910: .4byte 0x0000ffff + .pool thumb_func_end sub_81408A8 thumb_func_start sub_8140914 @@ -656926,12 +635189,12 @@ sub_8140914: @ 8140914 lsls r4, 24 lsrs r4, 24 bl sub_8197930 - ldr r5, _0814095C + ldr r5, =0x0203ab8c ldrb r0, [r5] movs r1, 0 bl sub_81973FC ldrb r0, [r5] - ldr r2, _08140960 + ldr r2, =0x082a5c13 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -656944,7 +635207,7 @@ sub_8140914: @ 8140914 ldrb r0, [r5] movs r1, 0x3 bl Window_CopyToVram - ldr r1, _08140964 + ldr r1, =0x085b6410 adds r0, r4, 0 bl sub_8121F68 add sp, 0xC @@ -656952,9 +635215,7 @@ sub_8140914: @ 8140914 pop {r0} bx r0 .align 2, 0 -_0814095C: .4byte 0x0203ab8c -_08140960: .4byte 0x082a5c13 -_08140964: .4byte 0x085b6410 + .pool thumb_func_end sub_8140914 thumb_func_start sub_8140968 @@ -656966,19 +635227,18 @@ sub_8140968: @ 8140968 movs r0, 0 movs r1, 0x1 bl sub_819746C - ldr r1, _0814098C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08140990 + ldr r1, =sub_8140BD0 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0814098C: .4byte 0x03005e00 -_08140990: .4byte sub_8140BD0 + 1 + .pool thumb_func_end sub_8140968 thumb_func_start sub_8140994 @@ -656987,7 +635247,7 @@ sub_8140994: @ 8140994 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081409B4 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0xA5 ldrb r0, [r0] @@ -656998,7 +635258,7 @@ sub_8140994: @ 8140994 pop {r0} bx r0 .align 2, 0 -_081409B4: .4byte 0x0203ab88 + .pool thumb_func_end sub_8140994 thumb_func_start sub_81409B8 @@ -657014,12 +635274,12 @@ sub_81409B8: @ 81409B8 b _08140AE8 _081409CA: lsls r0, r4, 2 - ldr r1, _081409D4 + ldr r1, =_081409D8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081409D4: .4byte _081409D8 + .pool .align 2, 0 _081409D8: .4byte _08140A18 @@ -657039,7 +635299,7 @@ _081409D8: .4byte _08140AE8 .4byte _08140A90 _08140A18: - ldr r0, _08140A38 + ldr r0, =0x0203ab88 ldr r0, [r0] movs r1, 0xBE lsls r1, 1 @@ -657054,7 +635314,7 @@ _08140A18: bl sub_8152008 b _08140B4E .align 2, 0 -_08140A38: .4byte 0x0203ab88 + .pool _08140A3C: lsls r0, r4, 1 adds r0, r4 @@ -657062,7 +635322,7 @@ _08140A3C: lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r5, _08140A84 + ldr r5, =0x0203ab88 ldr r0, [r5] movs r4, 0xBE lsls r4, 1 @@ -657077,10 +635337,10 @@ _08140A3C: bl sub_8152008 ldr r0, [r5] adds r4, r0, r4 - ldr r1, _08140A88 + ldr r1, =0x0000397c adds r0, r1 ldr r1, [r0] - ldr r0, _08140A8C + ldr r0, =0x00000232 adds r1, r0 movs r0, 0x3 str r0, [sp] @@ -657091,9 +635351,7 @@ _08140A3C: bl sub_8152058 b _08140B4E .align 2, 0 -_08140A84: .4byte 0x0203ab88 -_08140A88: .4byte 0x0000397c -_08140A8C: .4byte 0x00000232 + .pool _08140A90: subs r0, r4, 0x1 movs r1, 0x5 @@ -657103,7 +635361,7 @@ _08140A90: adds r1, 0xA lsls r1, 24 lsrs r7, r1, 24 - ldr r5, _08140AE0 + ldr r5, =0x0203ab88 ldr r0, [r5] movs r4, 0xBE lsls r4, 1 @@ -657118,7 +635376,7 @@ _08140A90: bl sub_8152008 ldr r0, [r5] adds r4, r0, r4 - ldr r1, _08140AE4 + ldr r1, =0x0000397c adds r0, r1 ldr r1, [r0] movs r0, 0xA0 @@ -657133,8 +635391,7 @@ _08140A90: bl sub_8152058 b _08140B4E .align 2, 0 -_08140AE0: .4byte 0x0203ab88 -_08140AE4: .4byte 0x0000397c + .pool _08140AE8: adds r0, r4, 0 movs r1, 0x5 @@ -657155,7 +635412,7 @@ _08140AE8: adds r1, 0x7 lsls r1, 24 lsrs r7, r1, 24 - ldr r5, _08140B5C + ldr r5, =0x0203ab88 ldr r0, [r5] movs r4, 0xBE lsls r4, 1 @@ -657170,7 +635427,7 @@ _08140AE8: bl sub_8152008 ldr r0, [r5] adds r4, r0, r4 - ldr r1, _08140B60 + ldr r1, =0x0000397c adds r0, r1 ldr r1, [r0] movs r0, 0x88 @@ -657191,8 +635448,7 @@ _08140B4E: pop {r0} bx r0 .align 2, 0 -_08140B5C: .4byte 0x0203ab88 -_08140B60: .4byte 0x0000397c + .pool thumb_func_end sub_81409B8 thumb_func_start sub_8140B64 @@ -657200,7 +635456,7 @@ sub_8140B64: @ 8140B64 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08140B88 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -657213,7 +635469,7 @@ sub_8140B64: @ 8140B64 pop {r0} bx r0 .align 2, 0 -_08140B88: .4byte 0x03005e00 + .pool thumb_func_end sub_8140B64 thumb_func_start sub_8140B8C @@ -657221,12 +635477,12 @@ sub_8140B8C: @ 8140B8C push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08140BC4 + ldr r5, =0x0203ab88 ldr r2, [r5] movs r6, 0 movs r1, 0x1 strh r1, [r2, 0x28] - ldr r1, _08140BC8 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -657240,15 +635496,13 @@ sub_8140B8C: @ 8140B8C ldr r0, [r5] adds r0, 0x21 strb r6, [r0] - ldr r0, _08140BCC + ldr r0, =sub_8141040 + 1 str r0, [r4] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08140BC4: .4byte 0x0203ab88 -_08140BC8: .4byte 0x03005e00 -_08140BCC: .4byte sub_8141040 + 1 + .pool thumb_func_end sub_8140B8C thumb_func_start sub_8140BD0 @@ -657256,7 +635510,7 @@ sub_8140BD0: @ 8140BD0 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08140C24 + ldr r1, =0x0203ab88 ldr r0, [r1] ldr r2, [r0, 0x8] movs r0, 0x20 @@ -657264,12 +635518,12 @@ sub_8140BD0: @ 8140BD0 cmp r0, 0 beq _08140C30 movs r3, 0xB - ldr r5, _08140C28 + ldr r5, =0x085b6154 adds r0, r5, 0 adds r0, 0xE4 ldr r0, [r0] ands r2, r0 - ldr r0, _08140C2C + ldr r0, =0x03005e00 mov r12, r0 lsls r7, r6, 2 cmp r2, 0 @@ -657297,17 +635551,15 @@ _08140BFE: bne _08140BFE b _08140C6E .align 2, 0 -_08140C24: .4byte 0x0203ab88 -_08140C28: .4byte 0x085b6154 -_08140C2C: .4byte 0x03005e00 + .pool _08140C30: movs r3, 0x6 - ldr r5, _08140C9C + ldr r5, =0x085b6154 adds r0, r5, 0 adds r0, 0x80 ldr r0, [r0] ands r2, r0 - ldr r0, _08140CA0 + ldr r0, =0x03005e00 mov r12, r0 lsls r7, r6, 2 cmp r2, 0 @@ -657348,15 +635600,13 @@ _08140C6E: ldrb r0, [r4, 0x10] bl sub_8142284 strh r5, [r4, 0xA] - ldr r0, _08140CA4 + ldr r0, =sub_8140B8C + 1 str r0, [r4] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08140C9C: .4byte 0x085b6154 -_08140CA0: .4byte 0x03005e00 -_08140CA4: .4byte sub_8140B8C + 1 + .pool thumb_func_end sub_8140BD0 thumb_func_start sub_8140CA8 @@ -657370,7 +635620,7 @@ sub_8140CA8: @ 8140CA8 lsrs r5, r1, 24 movs r6, 0 movs r7, 0 - ldr r1, _08140CF0 + ldr r1, =0x085b641e mov r0, sp movs r2, 0x4 bl memcpy @@ -657395,7 +635645,7 @@ sub_8140CA8: @ 8140CA8 movs r6, 0x5 b _08140D1C .align 2, 0 -_08140CF0: .4byte 0x085b641e + .pool _08140CF4: cmp r5, 0x3 bgt _08140D1C @@ -657474,7 +635724,7 @@ sub_8140D6C: @ 8140D6C movs r0, 0 mov r9, r0 movs r5, 0 - ldr r4, _08140F48 + ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r0, 0x40 ands r0, r1 @@ -657484,7 +635734,7 @@ sub_8140D6C: @ 8140D6C lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08140F4C + ldr r1, =0x03005e08 adds r0, r1 adds r0, 0x8 movs r1, 0 @@ -657503,7 +635753,7 @@ _08140DA8: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08140F4C + ldr r1, =0x03005e08 adds r0, r1 adds r0, 0x8 movs r1, 0x1 @@ -657522,7 +635772,7 @@ _08140DCE: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08140F4C + ldr r1, =0x03005e08 adds r0, r1 adds r0, 0x8 movs r1, 0x2 @@ -657541,7 +635791,7 @@ _08140DF4: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _08140F4C + ldr r1, =0x03005e08 adds r0, r1 adds r0, 0x8 movs r1, 0x3 @@ -657555,7 +635805,7 @@ _08140E1A: bne _08140E20 b _08140F3A _08140E20: - ldr r0, _08140F50 + ldr r0, =0x03005e00 lsls r6, r7, 2 adds r4, r6, r7 lsls r4, 3 @@ -657568,10 +635818,10 @@ _08140E20: strh r1, [r4, 0xA] movs r0, 0x5 bl audio_play - ldr r5, _08140F54 + ldr r5, =0x0203ab88 ldr r0, [r5] adds r0, 0xB8 - ldr r1, _08140F58 + ldr r1, =0x0000ffff bl sub_8151A9C ldr r5, [r5] movs r2, 0xB8 @@ -657599,13 +635849,13 @@ _08140E20: bl sub_8142284 movs r4, 0 mov r9, r6 - ldr r1, _08140F5C + ldr r1, =0x02020630 mov r12, r1 movs r2, 0x8 add r2, r12 mov r10, r2 _08140E8C: - ldr r0, _08140F54 + ldr r0, =0x0203ab88 ldr r5, [r0] adds r0, r4, 0 adds r0, 0x29 @@ -657626,12 +635876,12 @@ _08140E8C: ldrh r1, [r0] ldrh r2, [r2] adds r1, r2 - ldr r2, _08140F60 + ldr r2, =0x000003ff mov r8, r2 mov r0, r8 ands r1, r0 ldrh r2, [r3, 0x4] - ldr r0, _08140F64 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] @@ -657640,7 +635890,7 @@ _08140E8C: lsrs r4, r0, 24 cmp r4, 0x3 bls _08140E8C - ldr r0, _08140F50 + ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r7 lsls r1, 3 @@ -657651,7 +635901,7 @@ _08140E8C: lsrs r0, 16 cmp r0, 0x3 bhi _08140F3A - ldr r2, _08140F68 + ldr r2, =0x085b6154 movs r0, 0x10 ldrsh r1, [r1, r0] lsls r0, r1, 2 @@ -657674,7 +635924,7 @@ _08140E8C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08140F5C + ldr r1, =0x02020630 adds r3, r0, r1 adds r2, r3, 0 adds r2, 0x40 @@ -657688,7 +635938,7 @@ _08140E8C: mov r2, r8 ands r1, r2 ldrh r2, [r3, 0x4] - ldr r0, _08140F64 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] @@ -657701,15 +635951,7 @@ _08140F3A: pop {r0} bx r0 .align 2, 0 -_08140F48: .4byte 0x030022c0 -_08140F4C: .4byte 0x03005e08 -_08140F50: .4byte 0x03005e00 -_08140F54: .4byte 0x0203ab88 -_08140F58: .4byte 0x0000ffff -_08140F5C: .4byte 0x02020630 -_08140F60: .4byte 0x000003ff -_08140F64: .4byte 0xfffffc00 -_08140F68: .4byte 0x085b6154 + .pool thumb_func_end sub_8140D6C thumb_func_start sub_8140F6C @@ -657718,7 +635960,7 @@ sub_8140F6C: @ 8140F6C lsls r0, 24 lsrs r4, r0, 24 bl sub_80EECA4 - ldr r0, _08140F8C + ldr r0, =0x0203ab88 ldr r1, [r0] movs r0, 0xFF strh r0, [r1, 0x28] @@ -657730,33 +635972,31 @@ sub_8140F6C: @ 8140F6C strb r2, [r0] b _08140F96 .align 2, 0 -_08140F8C: .4byte 0x0203ab88 + .pool _08140F90: adds r1, 0x23 movs r0, 0 strb r0, [r1] _08140F96: - ldr r0, _08140FB8 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x21 movs r1, 0 strb r1, [r0] - ldr r1, _08140FBC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0x20 strh r1, [r0, 0xA] - ldr r1, _08140FC0 + ldr r1, =sub_81410FC + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08140FB8: .4byte 0x0203ab88 -_08140FBC: .4byte 0x03005e00 -_08140FC0: .4byte sub_81410FC + 1 + .pool thumb_func_end sub_8140F6C thumb_func_start sub_8140FC4 @@ -657764,14 +636004,14 @@ sub_8140FC4: @ 8140FC4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _08141034 + ldr r4, =0x0203ab88 ldr r2, [r4] ldrb r1, [r2, 0x1A] lsls r1, 28 lsrs r1, 28 adds r2, 0x1B adds r2, r1 - ldr r3, _08141038 + ldr r3, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -657810,15 +636050,13 @@ sub_8140FC4: @ 8140FC4 _08141024: ldrh r0, [r5, 0x22] bl sub_8143514 - ldr r0, _0814103C + ldr r0, =sub_8140F6C + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08141034: .4byte 0x0203ab88 -_08141038: .4byte 0x03005e00 -_0814103C: .4byte sub_8140F6C + 1 + .pool thumb_func_end sub_8140FC4 thumb_func_start sub_8141040 @@ -657828,7 +636066,7 @@ sub_8141040: @ 8141040 lsrs r5, r0, 24 adds r0, r5, 0 bl sub_8140D6C - ldr r1, _08141068 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -657843,7 +636081,7 @@ sub_8141040: @ 8141040 beq _08141072 b _0814108A .align 2, 0 -_08141068: .4byte 0x03005e00 + .pool _0814106C: cmp r0, 0x3B beq _08141084 @@ -657864,7 +636102,7 @@ _08141084: strh r0, [r4, 0xA] b _0814109A _0814108A: - ldr r0, _081410D8 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -657873,16 +636111,16 @@ _0814108A: adds r0, 0x1 strh r0, [r1, 0xA] _0814109A: - ldr r0, _081410DC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _081410F2 - ldr r0, _081410E0 + ldr r0, =0x0203ab88 ldr r3, [r0] - ldr r2, _081410E4 - ldr r1, _081410D8 + ldr r2, =0x085b6154 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -657903,21 +636141,18 @@ _0814109A: bl audio_play b _081410F2 .align 2, 0 -_081410D8: .4byte 0x03005e00 -_081410DC: .4byte 0x030022c0 -_081410E0: .4byte 0x0203ab88 -_081410E4: .4byte 0x085b6154 + .pool _081410E8: movs r0, 0x5F bl m4aSongNumStart - ldr r0, _081410F8 + ldr r0, =sub_8140FC4 + 1 str r0, [r4] _081410F2: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081410F8: .4byte sub_8140FC4 + 1 + .pool thumb_func_end sub_8141040 thumb_func_start sub_81410FC @@ -657925,7 +636160,7 @@ sub_81410FC: @ 81410FC push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08141154 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -657940,12 +636175,12 @@ sub_81410FC: @ 81410FC asrs r0, 16 cmp r0, 0x2 ble _08141128 - ldr r1, _08141158 + ldr r1, =0x02021bbc ldrh r0, [r1] adds r0, 0x2 strh r0, [r1] _08141128: - ldr r0, _0814115C + ldr r0, =0x0203ab88 ldr r1, [r0] ldrh r0, [r1, 0x26] adds r0, 0x4 @@ -657954,7 +636189,7 @@ _08141128: asrs r0, 16 cmp r0, 0x68 bne _08141180 - ldr r2, _08141160 + ldr r2, =0x02020630 adds r0, r1, 0 adds r0, 0x55 ldrb r1, [r0] @@ -657963,15 +636198,11 @@ _08141128: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _08141164 + ldr r1, =nullsub_12 + 1 str r1, [r0] b _08141180 .align 2, 0 -_08141154: .4byte 0x03005e00 -_08141158: .4byte 0x02021bbc -_0814115C: .4byte 0x0203ab88 -_08141160: .4byte 0x02020630 -_08141164: .4byte nullsub_12 + 1 + .pool _08141168: movs r0, 0x1 movs r1, 0xFF @@ -657979,7 +636210,7 @@ _08141168: movs r0, 0x1 movs r1, 0xFF bl sub_8143038 - ldr r0, _08141188 + ldr r0, =sub_8141344 + 1 str r0, [r4] movs r0, 0 strh r0, [r4, 0xA] @@ -657988,7 +636219,7 @@ _08141180: pop {r0} bx r0 .align 2, 0 -_08141188: .4byte sub_8141344 + 1 + .pool thumb_func_end sub_81410FC thumb_func_start sub_814118C @@ -657998,7 +636229,7 @@ sub_814118C: @ 814118C lsrs r4, r0, 16 lsls r1, 16 lsrs r1, 16 - ldr r0, _081411A8 + ldr r0, =0x0203ab88 ldr r3, [r0] ldrb r2, [r3, 0x2] adds r5, r0, 0 @@ -658008,13 +636239,13 @@ sub_814118C: @ 814118C bge _081411B2 b _08141280 .align 2, 0 -_081411A8: .4byte 0x0203ab88 + .pool _081411AC: cmp r2, 0x3 beq _08141214 b _08141280 _081411B2: - ldr r0, _081411DC + ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] subs r0, 0x4 lsls r0, 24 @@ -658028,7 +636259,7 @@ _081411B2: cmp r0, 0 beq _08141296 _081411CC: - ldr r0, _081411E0 + ldr r0, =0x085b6348 ldrb r1, [r3, 0x4] lsls r1, 30 lsrs r1, 25 @@ -658037,14 +636268,13 @@ _081411CC: lsrs r0, 1 b _0814133A .align 2, 0 -_081411DC: .4byte 0x03005cf8 -_081411E0: .4byte 0x085b6348 + .pool _081411E4: movs r0, 0x3 ands r0, r1 cmp r0, 0 bne _08141200 - ldr r0, _081411FC + ldr r0, =0x085b6348 ldrb r1, [r3, 0x4] lsls r1, 30 lsrs r1, 25 @@ -658053,9 +636283,9 @@ _081411E4: lsrs r0, 1 b _0814133A .align 2, 0 -_081411FC: .4byte 0x085b6348 + .pool _08141200: - ldr r0, _08141210 + ldr r0, =0x085b6348 ldrb r1, [r3, 0x4] lsls r1, 30 lsrs r1, 25 @@ -658063,9 +636293,9 @@ _08141200: ldrb r0, [r1, 0x2] b _0814133A .align 2, 0 -_08141210: .4byte 0x085b6348 + .pool _08141214: - ldr r0, _08141240 + ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] subs r0, 0x4 lsls r0, 24 @@ -658079,7 +636309,7 @@ _08141214: cmp r0, 0 beq _08141296 _0814122E: - ldr r0, _08141244 + ldr r0, =0x085b6348 ldrb r1, [r3, 0x4] lsls r1, 30 lsrs r1, 25 @@ -658088,8 +636318,7 @@ _0814122E: lsrs r0, 1 b _0814133A .align 2, 0 -_08141240: .4byte 0x03005cf8 -_08141244: .4byte 0x085b6348 + .pool _08141248: movs r0, 0x1 ands r0, r1 @@ -658097,7 +636326,7 @@ _08141248: beq _08141268 cmp r4, 0x6 bls _08141268 - ldr r0, _08141264 + ldr r0, =0x085b6348 ldrb r1, [r3, 0x4] lsls r1, 30 lsrs r1, 25 @@ -658106,9 +636335,9 @@ _08141248: lsrs r0, 2 b _0814133A .align 2, 0 -_08141264: .4byte 0x085b6348 + .pool _08141268: - ldr r1, _0814127C + ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] lsls r0, 30 @@ -658118,9 +636347,9 @@ _08141268: lsrs r0, 1 b _0814133A .align 2, 0 -_0814127C: .4byte 0x085b6348 + .pool _08141280: - ldr r0, _0814129C + ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] subs r0, 0x4 lsls r0, 24 @@ -658135,9 +636364,9 @@ _08141296: movs r0, 0x1 b _0814133A .align 2, 0 -_0814129C: .4byte 0x03005cf8 + .pool _081412A0: - ldr r1, _081412B4 + ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] lsls r0, 30 @@ -658147,7 +636376,7 @@ _081412A0: lsrs r0, 1 b _0814133A .align 2, 0 -_081412B4: .4byte 0x085b6348 + .pool _081412B8: movs r0, 0x3 ands r0, r1 @@ -658155,7 +636384,7 @@ _081412B8: bne _081412F0 cmp r4, 0xC bls _081412DC - ldr r1, _081412D8 + ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] lsls r0, 30 @@ -658165,9 +636394,9 @@ _081412B8: lsrs r0, 1 b _0814133A .align 2, 0 -_081412D8: .4byte 0x085b6348 + .pool _081412DC: - ldr r1, _081412EC + ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] lsls r0, 30 @@ -658176,7 +636405,7 @@ _081412DC: ldrb r0, [r0, 0x2] b _0814133A .align 2, 0 -_081412EC: .4byte 0x085b6348 + .pool _081412F0: movs r0, 0x80 lsls r0, 8 @@ -658185,7 +636414,7 @@ _081412F0: beq _08141328 cmp r4, 0xC bls _08141314 - ldr r1, _08141310 + ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] lsls r0, 30 @@ -658194,9 +636423,9 @@ _081412F0: ldrb r0, [r0, 0x2] b _0814133A .align 2, 0 -_08141310: .4byte 0x085b6348 + .pool _08141314: - ldr r1, _08141324 + ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] lsls r0, 30 @@ -658205,9 +636434,9 @@ _08141314: ldrb r0, [r0, 0x1] b _0814133A .align 2, 0 -_08141324: .4byte 0x085b6348 + .pool _08141328: - ldr r1, _08141340 + ldr r1, =0x085b6348 ldr r0, [r5] ldrb r0, [r0, 0x4] lsls r0, 30 @@ -658221,7 +636450,7 @@ _0814133A: pop {r1} bx r1 .align 2, 0 -_08141340: .4byte 0x085b6348 + .pool thumb_func_end sub_814118C thumb_func_start sub_8141344 @@ -658236,7 +636465,7 @@ sub_8141344: @ 8141344 lsrs r0, 24 mov r10, r0 movs r4, 0 - ldr r1, _081413D0 + ldr r1, =0x085b6422 mov r0, sp movs r2, 0x8 bl memcpy @@ -658248,9 +636477,9 @@ sub_8141344: @ 8141344 bl __umodsi3 lsls r0, 16 lsrs r6, r0, 16 - ldr r3, _081413D4 + ldr r3, =0x0203ab88 ldr r0, [r3] - ldr r2, _081413D8 + ldr r2, =0x03005e00 mov r5, r10 lsls r1, r5, 2 add r1, r10 @@ -658279,7 +636508,7 @@ sub_8141344: @ 8141344 subs r0, r4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081413DC + ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 @@ -658293,10 +636522,7 @@ _081413C8: lsls r0, r5, 25 b _081413EA .align 2, 0 -_081413D0: .4byte 0x085b6422 -_081413D4: .4byte 0x0203ab88 -_081413D8: .4byte 0x03005e00 -_081413DC: .4byte 0x03005cf8 + .pool _081413E0: lsls r1, r5, 24 asrs r1, 24 @@ -658305,12 +636531,12 @@ _081413E0: lsls r0, 25 _081413EA: lsrs r5, r0, 24 - ldr r0, _08141530 + ldr r0, =0x0203ab88 ldr r6, [r0] ldrb r0, [r6, 0x4] lsls r0, 30 lsrs r0, 25 - ldr r1, _08141534 + ldr r1, =0x085b6348 adds r0, r1 lsls r4, 24 asrs r4, 24 @@ -658325,10 +636551,10 @@ _081413EA: bl __floatsisf cmp r4, 0 bge _0814141C - ldr r1, _08141538 + ldr r1, =0x47800000 bl __addsf3 _0814141C: - ldr r1, _0814153C + ldr r1, =0x40a00000 bl __divsf3 bl __fixunssfsi lsls r0, 16 @@ -658360,7 +636586,7 @@ _0814141C: bl __floatsisf cmp r4, 0 bge _08141468 - ldr r1, _08141538 + ldr r1, =0x47800000 bl __addsf3 _08141468: mov r2, r9 @@ -658370,7 +636596,7 @@ _08141468: ldrb r0, [r6, 0x4] lsls r0, 30 lsrs r0, 25 - ldr r5, _08141534 + ldr r5, =0x085b6348 adds r0, r5 movs r1, 0x18 ldrsh r4, [r0, r1] @@ -658379,14 +636605,14 @@ _08141468: adds r5, r0, 0 cmp r4, 0 bge _08141492 - ldr r1, _08141538 + ldr r1, =0x47800000 bl __addsf3 adds r5, r0, 0 _08141492: str r5, [r7] adds r7, r6, 0 adds r7, 0x90 - ldr r1, _08141540 + ldr r1, =0x3f000000 adds r0, r5, 0 bl __mulsf3 adds r1, r5, 0 @@ -658400,7 +636626,7 @@ _08141492: adds r2, r0, 0 cmp r4, 0 bge _081414C2 - ldr r1, _08141538 + ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 _081414C2: @@ -658410,10 +636636,10 @@ _081414C2: str r0, [r7] adds r1, r6, 0 adds r1, 0x94 - ldr r0, _08141544 + ldr r0, =0x42880000 str r0, [r1] adds r1, 0x8 - ldr r0, _08141548 + ldr r0, =0x00000000 str r0, [r1] adds r5, r6, 0 adds r5, 0x98 @@ -658425,26 +636651,26 @@ _081414C2: adds r2, r0, 0 cmp r4, 0 bge _081414F8 - ldr r1, _08141538 + ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 _081414F8: - ldr r0, _0814154C + ldr r0, =0x41000000 adds r1, r2, 0 bl __divsf3 bl __negsf2 str r0, [r5] adds r1, r6, 0 adds r1, 0xA0 - ldr r0, _08141550 + ldr r0, =0x42100000 str r0, [r1] - ldr r1, _08141554 + ldr r1, =0x03005e00 mov r5, r10 lsls r0, r5, 2 add r0, r10 lsls r0, 3 adds r0, r1 - ldr r1, _08141558 + ldr r1, =sub_814155C + 1 str r1, [r0] add sp, 0x8 pop {r3-r5} @@ -658455,17 +636681,7 @@ _081414F8: pop {r0} bx r0 .align 2, 0 -_08141530: .4byte 0x0203ab88 -_08141534: .4byte 0x085b6348 -_08141538: .4byte 0x47800000 -_0814153C: .4byte 0x40a00000 -_08141540: .4byte 0x3f000000 -_08141544: .4byte 0x42880000 -_08141548: .4byte 0x00000000 -_0814154C: .4byte 0x41000000 -_08141550: .4byte 0x42100000 -_08141554: .4byte 0x03005e00 -_08141558: .4byte sub_814155C + 1 + .pool thumb_func_end sub_8141344 thumb_func_start sub_814155C @@ -658473,7 +636689,7 @@ sub_814155C: @ 814155C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _081415C0 + ldr r4, =0x0203ab88 ldr r3, [r4] ldrb r1, [r3, 0x3] movs r2, 0x80 @@ -658490,12 +636706,12 @@ sub_814155C: @ 814155C lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, _081415C4 + ldr r2, =0x02020630 adds r1, r2 str r1, [r3, 0x38] - ldr r2, _081415C8 + ldr r2, =sub_81446AC + 1 str r2, [r1, 0x1C] - ldr r1, _081415CC + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -658513,17 +636729,13 @@ sub_814155C: @ 814155C bl sub_814372C movs r0, 0x5C bl m4aSongNumStart - ldr r0, _081415D0 + ldr r0, =sub_81415D4 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_081415C0: .4byte 0x0203ab88 -_081415C4: .4byte 0x02020630 -_081415C8: .4byte sub_81446AC + 1 -_081415CC: .4byte 0x03005e00 -_081415D0: .4byte sub_81415D4 + 1 + .pool thumb_func_end sub_814155C thumb_func_start sub_81415D4 @@ -658531,7 +636743,7 @@ sub_81415D4: @ 81415D4 push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _08141610 + ldr r6, =0x0203ab88 ldr r3, [r6] adds r0, r3, 0 adds r0, 0x7D @@ -658559,9 +636771,9 @@ sub_81415D4: @ 81415D4 strb r0, [r2, 0x3] b _081416C6 .align 2, 0 -_08141610: .4byte 0x0203ab88 + .pool _08141614: - ldr r2, _08141688 + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r0, r1, r4 lsls r0, 3 @@ -658597,7 +636809,7 @@ _08141614: lsls r1, 5 bl sub_8151A48 _08141660: - ldr r0, _08141688 + ldr r0, =0x03005e00 adds r1, r7, r4 lsls r1, 3 adds r4, r1, r0 @@ -658605,7 +636817,7 @@ _08141660: ldrsh r0, [r4, r1] cmp r0, 0x3C bgt _08141690 - ldr r0, _0814168C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -658619,10 +636831,9 @@ _08141680: strh r0, [r4, 0xA] b _081416C6 .align 2, 0 -_08141688: .4byte 0x03005e00 -_0814168C: .4byte 0x030022c0 + .pool _08141690: - ldr r0, _081416CC + ldr r0, =0x0203ab88 ldr r1, [r0] ldrb r0, [r1, 0x1A] lsls r0, 28 @@ -658644,15 +636855,14 @@ _08141690: bl sub_8143038 movs r0, 0x20 strh r0, [r4, 0xA] - ldr r0, _081416D0 + ldr r0, =sub_81416D4 + 1 str r0, [r4] _081416C6: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081416CC: .4byte 0x0203ab88 -_081416D0: .4byte sub_81416D4 + 1 + .pool thumb_func_end sub_81415D4 thumb_func_start sub_81416D4 @@ -658660,7 +636870,7 @@ sub_81416D4: @ 81416D4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0814172C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -658675,12 +636885,12 @@ sub_81416D4: @ 81416D4 asrs r0, 16 cmp r0, 0x2 ble _08141700 - ldr r1, _08141730 + ldr r1, =0x02021bbc ldrh r0, [r1] subs r0, 0x2 strh r0, [r1] _08141700: - ldr r0, _08141734 + ldr r0, =0x0203ab88 ldr r1, [r0] ldrh r0, [r1, 0x26] subs r0, 0x4 @@ -658689,7 +636899,7 @@ _08141700: asrs r0, 16 cmp r0, 0x68 bne _08141768 - ldr r2, _08141738 + ldr r2, =0x02020630 adds r0, r1, 0 adds r0, 0x55 ldrb r1, [r0] @@ -658698,15 +636908,11 @@ _08141700: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _0814173C + ldr r1, =sub_814390C + 1 str r1, [r0] b _08141768 .align 2, 0 -_0814172C: .4byte 0x03005e00 -_08141730: .4byte 0x02021bbc -_08141734: .4byte 0x0203ab88 -_08141738: .4byte 0x02020630 -_0814173C: .4byte sub_814390C + 1 + .pool _08141740: ldrh r0, [r4, 0x20] lsls r0, 24 @@ -658722,20 +636928,19 @@ _08141756: movs r0, 0x3D _08141758: strh r0, [r4, 0xA] - ldr r0, _08141770 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _08141774 + ldr r0, =sub_8141778 + 1 str r0, [r1] _08141768: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08141770: .4byte 0x03005e00 -_08141774: .4byte sub_8141778 + 1 + .pool thumb_func_end sub_81416D4 thumb_func_start sub_8141778 @@ -658743,7 +636948,7 @@ sub_8141778: @ 8141778 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _081417C8 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -658779,7 +636984,7 @@ _081417A2: bl sub_8143038 b _081417F4 .align 2, 0 -_081417C8: .4byte 0x03005e00 + .pool _081417CC: ldrh r1, [r4, 0x20] lsls r1, 24 @@ -658794,7 +636999,7 @@ _081417CC: bl sub_8143038 b _081417F4 _081417E8: - ldr r1, _081417FC + ldr r1, =sub_814189C + 1 adds r0, r2, 0 movs r2, 0x1E movs r3, 0 @@ -658804,7 +637009,7 @@ _081417F4: pop {r0} bx r0 .align 2, 0 -_081417FC: .4byte sub_814189C + 1 + .pool thumb_func_end sub_8141778 thumb_func_start sub_8141800 @@ -658812,7 +637017,7 @@ sub_8141800: @ 8141800 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08141858 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -658843,30 +637048,28 @@ sub_8141800: @ 8141800 movs r0, 0x1D bl sav12_xor_set _08141848: - ldr r1, _0814185C - ldr r2, _08141860 + ldr r1, =sub_8141A18 + 1 + ldr r2, =0x0000ffff adds r0, r5, 0 movs r3, 0x3 bl sub_8141F7C b _08141888 .align 2, 0 -_08141858: .4byte 0x03005e00 -_0814185C: .4byte sub_8141A18 + 1 -_08141860: .4byte 0x0000ffff + .pool _08141864: bl mplay_has_finished_maybe lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 bne _08141888 - ldr r1, _08141890 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 strh r2, [r0, 0x1E] - ldr r1, _08141894 - ldr r2, _08141898 + ldr r1, =sub_8141AC0 + 1 + ldr r2, =0x0000ffff adds r0, r5, 0 movs r3, 0x3 bl sub_8141F7C @@ -658875,9 +637078,7 @@ _08141888: pop {r0} bx r0 .align 2, 0 -_08141890: .4byte 0x03005e00 -_08141894: .4byte sub_8141AC0 + 1 -_08141898: .4byte 0x0000ffff + .pool thumb_func_end sub_8141800 thumb_func_start sub_814189C @@ -658886,7 +637087,7 @@ sub_814189C: @ 814189C sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _081418DC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -658903,30 +637104,27 @@ sub_814189C: @ 814189C ldrsh r0, [r0, r1] cmp r0, 0xC bne _081418EC - ldr r0, _081418E0 + ldr r0, =0x00000185 bl fanfare_play - ldr r4, _081418E4 + ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 bl sub_81973FC ldrb r0, [r4] - ldr r2, _081418E8 + ldr r2, =0x082a5bd7 b _08141902 .align 2, 0 -_081418DC: .4byte 0x03005e00 -_081418E0: .4byte 0x00000185 -_081418E4: .4byte 0x0203ab8c -_081418E8: .4byte 0x082a5bd7 + .pool _081418EC: movs r0, 0xC3 lsls r0, 1 bl fanfare_play - ldr r4, _08141920 + ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 bl sub_81973FC ldrb r0, [r4] - ldr r2, _08141924 + ldr r2, =0x082a5bcb _08141902: movs r1, 0x1 str r1, [sp] @@ -658942,17 +637140,16 @@ _08141902: bl Window_CopyToVram b _08141958 .align 2, 0 -_08141920: .4byte 0x0203ab8c -_08141924: .4byte 0x082a5bcb + .pool _08141928: movs r0, 0x20 bl m4aSongNumStart - ldr r4, _08141974 + ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 bl sub_81973FC ldrb r0, [r4] - ldr r2, _08141978 + ldr r2, =0x082a5be0 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -658966,24 +637163,21 @@ _08141928: movs r1, 0x3 bl Window_CopyToVram _08141958: - ldr r1, _0814197C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0xA] - ldr r1, _08141980 + ldr r1, =sub_8141800 + 1 str r1, [r0] add sp, 0xC pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08141974: .4byte 0x0203ab8c -_08141978: .4byte 0x082a5be0 -_0814197C: .4byte 0x03005e00 -_08141980: .4byte sub_8141800 + 1 + .pool thumb_func_end sub_814189C thumb_func_start sub_8141984 @@ -658991,7 +637185,7 @@ sub_8141984: @ 8141984 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _081419A8 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -659006,7 +637200,7 @@ sub_8141984: @ 8141984 adds r0, 0x1 b _081419E4 .align 2, 0 -_081419A8: .4byte 0x03005e00 + .pool _081419AC: ldrh r0, [r4, 0x22] adds r0, 0x1 @@ -659017,13 +637211,13 @@ _081419AC: bl sub_8143514 movs r2, 0x22 ldrsh r1, [r4, r2] - ldr r0, _081419CC + ldr r0, =0x0000270e cmp r1, r0 ble _081419D0 strh r5, [r4, 0xA] b _081419E6 .align 2, 0 -_081419CC: .4byte 0x0000270e + .pool _081419D0: ldrh r0, [r4, 0xA] subs r0, 0x1 @@ -659038,7 +637232,7 @@ _081419DC: _081419E4: strh r0, [r4, 0x16] _081419E6: - ldr r0, _08141A0C + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -659047,8 +637241,8 @@ _081419E6: ldrsh r0, [r1, r2] cmp r0, 0 bne _08141A04 - ldr r1, _08141A10 - ldr r2, _08141A14 + ldr r1, =sub_8141AC0 + 1 + ldr r2, =0x0000ffff adds r0, r6, 0 movs r3, 0x3 bl sub_8141F7C @@ -659057,9 +637251,7 @@ _08141A04: pop {r0} bx r0 .align 2, 0 -_08141A0C: .4byte 0x03005e00 -_08141A10: .4byte sub_8141AC0 + 1 -_08141A14: .4byte 0x0000ffff + .pool thumb_func_end sub_8141984 thumb_func_start sub_8141A18 @@ -659071,12 +637263,12 @@ sub_8141A18: @ 8141A18 sub sp, 0xC lsls r0, 24 lsrs r0, 24 - ldr r3, _08141AA4 - ldr r1, _08141AA8 + ldr r3, =0x02021cc4 + ldr r1, =0x0203ab88 mov r9, r1 ldr r1, [r1] ldrb r2, [r1, 0x19] - ldr r1, _08141AAC + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -659089,12 +637281,12 @@ sub_8141A18: @ 8141A18 movs r2, 0 movs r3, 0x2 bl decimal_int_to_string - ldr r2, _08141AB0 + ldr r2, =0x02021fc4 mov r8, r2 - ldr r1, _08141AB4 + ldr r1, =0x082a5bef mov r0, r8 bl ExpandTextCodes - ldr r5, _08141AB8 + ldr r5, =0x0203ab8c ldrb r0, [r5] movs r1, 0 bl sub_81973FC @@ -659120,7 +637312,7 @@ sub_8141A18: @ 8141A18 muls r0, r1 strh r0, [r4, 0xA] strh r6, [r4, 0x16] - ldr r0, _08141ABC + ldr r0, =sub_8141984 + 1 str r0, [r4] add sp, 0xC pop {r3,r4} @@ -659130,13 +637322,7 @@ sub_8141A18: @ 8141A18 pop {r0} bx r0 .align 2, 0 -_08141AA4: .4byte 0x02021cc4 -_08141AA8: .4byte 0x0203ab88 -_08141AAC: .4byte 0x03005e00 -_08141AB0: .4byte 0x02021fc4 -_08141AB4: .4byte 0x082a5bef -_08141AB8: .4byte 0x0203ab8c -_08141ABC: .4byte sub_8141984 + 1 + .pool thumb_func_end sub_8141A18 thumb_func_start sub_8141AC0 @@ -659145,10 +637331,10 @@ sub_8141AC0: @ 8141AC0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _08141B40 + ldr r5, =0x0203ab88 ldr r0, [r5] adds r0, 0xB8 - ldr r1, _08141B44 + ldr r1, =0x0000ffff bl sub_8151A9C ldr r6, [r5] movs r0, 0xB8 @@ -659172,10 +637358,10 @@ sub_8141AC0: @ 8141AC0 ldrb r0, [r2] ands r1, r0 strb r1, [r2] - ldr r6, _08141B48 + ldr r6, =0x02020630 ldr r2, [r5] - ldr r5, _08141B4C - ldr r0, _08141B50 + ldr r5, =0x085b6154 + ldr r0, =0x03005e00 lsls r3, r4, 2 adds r3, r4 lsls r3, 3 @@ -659199,18 +637385,13 @@ sub_8141AC0: @ 8141AC0 movs r2, 0x4 orrs r1, r2 strb r1, [r0] - ldr r0, _08141B54 + ldr r0, =sub_8141B58 + 1 str r0, [r3] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08141B40: .4byte 0x0203ab88 -_08141B44: .4byte 0x0000ffff -_08141B48: .4byte 0x02020630 -_08141B4C: .4byte 0x085b6154 -_08141B50: .4byte 0x03005e00 -_08141B54: .4byte sub_8141B58 + 1 + .pool thumb_func_end sub_8141AC0 thumb_func_start sub_8141B58 @@ -659222,14 +637403,14 @@ sub_8141B58: @ 8141B58 lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r1, _08141C38 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 movs r2, 0 strh r5, [r0, 0x10] - ldr r4, _08141C3C + ldr r4, =0x0203ab88 ldr r1, [r4] ldrb r0, [r1, 0x1A] lsls r0, 28 @@ -659239,7 +637420,7 @@ sub_8141B58: @ 8141B58 strb r2, [r1] movs r0, 0 bl sub_81424FC - ldr r3, _08141C40 + ldr r3, =0x02020630 ldr r0, [r4] adds r0, 0x6C ldrb r1, [r0] @@ -659256,10 +637437,10 @@ sub_8141B58: @ 8141B58 movs r0, 0x8 adds r0, r7 mov r12, r0 - ldr r1, _08141C44 + ldr r1, =0xfffffc00 mov r8, r1 _08141BB0: - ldr r0, _08141C3C + ldr r0, =0x0203ab88 ldr r4, [r0] adds r0, r4, r5 adds r0, 0x65 @@ -659276,7 +637457,7 @@ _08141BB0: ldrh r1, [r0] ldrh r2, [r2] adds r1, r2 - ldr r2, _08141C48 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r3, 0x4] @@ -659289,7 +637470,7 @@ _08141BB0: lsrs r5, r0, 24 cmp r5, 0x3 bls _08141BB0 - ldr r0, _08141C38 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -659303,12 +637484,12 @@ _08141BB0: ldrsh r0, [r2, r1] cmp r0, 0x6 bne _08141C58 - ldr r4, _08141C4C + ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 bl sub_81973FC ldrb r0, [r4] - ldr r2, _08141C50 + ldr r2, =0x082a5c21 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -659321,29 +637502,22 @@ _08141BB0: ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram - ldr r1, _08141C54 + ldr r1, =dp01t_12_3_battle_menu + 1 b _08141C8E .align 2, 0 -_08141C38: .4byte 0x03005e00 -_08141C3C: .4byte 0x0203ab88 -_08141C40: .4byte 0x02020630 -_08141C44: .4byte 0xfffffc00 -_08141C48: .4byte 0x000003ff -_08141C4C: .4byte 0x0203ab8c -_08141C50: .4byte 0x082a5c21 -_08141C54: .4byte dp01t_12_3_battle_menu + 1 + .pool _08141C58: movs r0, 0x22 ldrsh r1, [r2, r0] - ldr r0, _08141C9C + ldr r0, =0x0000270f cmp r1, r0 bne _08141CB0 - ldr r4, _08141CA0 + ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 bl sub_81973FC ldrb r0, [r4] - ldr r2, _08141CA4 + ldr r2, =0x082a5c61 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -659356,32 +637530,28 @@ _08141C58: ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram - ldr r1, _08141CA8 + ldr r1, =sub_8140914 + 1 _08141C8E: - ldr r2, _08141CAC + ldr r2, =0x0000ffff adds r0, r6, 0 movs r3, 0x3 bl sub_8141F7C b _08141CF2 .align 2, 0 -_08141C9C: .4byte 0x0000270f -_08141CA0: .4byte 0x0203ab8c -_08141CA4: .4byte 0x082a5c61 -_08141CA8: .4byte sub_8140914 + 1 -_08141CAC: .4byte 0x0000ffff + .pool _08141CB0: - ldr r0, _08141CB8 + ldr r0, =sub_8140914 + 1 str r0, [r2] b _08141CF2 .align 2, 0 -_08141CB8: .4byte sub_8140914 + 1 + .pool _08141CBC: - ldr r4, _08141D00 + ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 bl sub_81973FC ldrb r0, [r4] - ldr r2, _08141D04 + ldr r2, =0x082a5c04 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -659394,7 +637564,7 @@ _08141CBC: ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram - ldr r1, _08141D08 + ldr r1, =sub_8140994 + 1 adds r0, r6, 0 movs r2, 0x3C movs r3, 0x3 @@ -659407,9 +637577,7 @@ _08141CF2: pop {r0} bx r0 .align 2, 0 -_08141D00: .4byte 0x0203ab8c -_08141D04: .4byte 0x082a5c04 -_08141D08: .4byte sub_8140994 + 1 + .pool thumb_func_end sub_8141B58 thumb_func_start dp01t_12_3_battle_menu @@ -659419,7 +637587,7 @@ dp01t_12_3_battle_menu: @ 8141D0C lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r1, _08141DB4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -659433,8 +637601,8 @@ dp01t_12_3_battle_menu: @ 8141D0C bl sub_81424FC movs r0, 0x6 bl sub_814372C - ldr r7, _08141DB8 - ldr r3, _08141DBC + ldr r7, =0x02020630 + ldr r3, =0x0203ab88 movs r6, 0x5 negs r6, r6 _08141D44: @@ -659456,22 +637624,22 @@ _08141D44: lsrs r4, r0, 24 cmp r4, 0xB bls _08141D44 - ldr r1, _08141DB4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r2, r0, r1 movs r0, 0x22 ldrsh r1, [r2, r0] - ldr r0, _08141DC0 + ldr r0, =0x0000270f cmp r1, r0 bne _08141DD4 - ldr r4, _08141DC4 + ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 bl sub_81973FC ldrb r0, [r4] - ldr r2, _08141DC8 + ldr r2, =0x082a5c61 movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -659484,23 +637652,16 @@ _08141D44: ldrb r0, [r4] movs r1, 0x3 bl Window_CopyToVram - ldr r1, _08141DCC - ldr r2, _08141DD0 + ldr r1, =sub_8140914 + 1 + ldr r2, =0x0000ffff adds r0, r5, 0 movs r3, 0x3 bl sub_8141F7C b _08141DD8 .align 2, 0 -_08141DB4: .4byte 0x03005e00 -_08141DB8: .4byte 0x02020630 -_08141DBC: .4byte 0x0203ab88 -_08141DC0: .4byte 0x0000270f -_08141DC4: .4byte 0x0203ab8c -_08141DC8: .4byte 0x082a5c61 -_08141DCC: .4byte sub_8140914 + 1 -_08141DD0: .4byte 0x0000ffff + .pool _08141DD4: - ldr r0, _08141DE0 + ldr r0, =sub_8140914 + 1 str r0, [r2] _08141DD8: add sp, 0xC @@ -659508,7 +637669,7 @@ _08141DD8: pop {r0} bx r0 .align 2, 0 -_08141DE0: .4byte sub_8140914 + 1 + .pool thumb_func_end dp01t_12_3_battle_menu thumb_func_start sub_8141DE4 @@ -659517,15 +637678,15 @@ sub_8141DE4: @ 8141DE4 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _08141E28 + ldr r4, =0x0203ab88 ldr r0, [r4] adds r0, 0xB8 - ldr r1, _08141E2C + ldr r1, =0x0000ffff bl sub_8151A9C ldr r0, [r4] adds r0, 0xB8 bl sub_8151678 - ldr r1, _08141E30 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -659539,16 +637700,13 @@ sub_8141DE4: @ 8141DE4 ldrb r1, [r1, 0x19] cmp r0, r1 bcs _08141E38 - ldr r1, _08141E34 + ldr r1, =0x020375e0 movs r0, 0x1 b _08141E3C .align 2, 0 -_08141E28: .4byte 0x0203ab88 -_08141E2C: .4byte 0x0000ffff -_08141E30: .4byte 0x03005e00 -_08141E34: .4byte 0x020375e0 + .pool _08141E38: - ldr r1, _08141E70 + ldr r1, =0x020375e0 movs r0, 0 _08141E3C: strh r0, [r1] @@ -659563,21 +637721,19 @@ _08141E3C: movs r2, 0 movs r3, 0x10 bl sub_80A27B0 - ldr r1, _08141E74 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08141E78 + ldr r1, =sub_8141E7C + 1 str r1, [r0] add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08141E70: .4byte 0x020375e0 -_08141E74: .4byte 0x03005e00 -_08141E78: .4byte sub_8141E7C + 1 + .pool thumb_func_end sub_8141DE4 thumb_func_start sub_8141E7C @@ -659592,8 +637748,8 @@ sub_8141E7C: @ 8141E7C bne _08141EDE movs r0, 0 bl SetVBlankCallback - ldr r1, _08141EE4 - ldr r0, _08141EE8 + ldr r1, =0x02021bbc + ldr r0, =0x02021bbe strh r4, [r0] strh r4, [r1] bl sub_8121DA0 @@ -659611,10 +637767,10 @@ sub_8141E7C: @ 8141E7C bl sub_80A1A74 bl reset_all_obj_data bl sub_8140418 - ldr r1, _08141EEC - ldr r0, _08141EF0 + ldr r1, =0x03005dac + ldr r0, =sub_80AF168 + 1 str r0, [r1] - ldr r0, _08141EF4 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 adds r0, r5, 0 bl remove_task @@ -659623,11 +637779,7 @@ _08141EDE: pop {r0} bx r0 .align 2, 0 -_08141EE4: .4byte 0x02021bbc -_08141EE8: .4byte 0x02021bbe -_08141EEC: .4byte 0x03005dac -_08141EF0: .4byte sub_80AF168 + 1 -_08141EF4: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_8141E7C thumb_func_start sub_8141EF8 @@ -659635,7 +637787,7 @@ sub_8141EF8: @ 8141EF8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08141F6C + ldr r1, =0x0203ab88 ldr r3, [r1] adds r0, r3, 0 adds r0, 0xA8 @@ -659643,7 +637795,7 @@ sub_8141EF8: @ 8141EF8 adds r5, r1, 0 cmp r0, 0 beq _08141F1E - ldr r0, _08141F70 + ldr r0, =0x030022c0 adds r2, r3, 0 adds r2, 0xAA ldrh r1, [r0, 0x2E] @@ -659652,7 +637804,7 @@ sub_8141EF8: @ 8141EF8 cmp r0, 0 beq _08141F52 _08141F1E: - ldr r1, _08141F74 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -659683,7 +637835,7 @@ _08141F52: adds r1, r0, 0 adds r1, 0xA8 ldrh r2, [r1] - ldr r0, _08141F78 + ldr r0, =0x0000ffff cmp r2, r0 beq _08141F64 subs r0, r2, 0x1 @@ -659693,10 +637845,7 @@ _08141F64: pop {r0} bx r0 .align 2, 0 -_08141F6C: .4byte 0x0203ab88 -_08141F70: .4byte 0x030022c0 -_08141F74: .4byte 0x03005e00 -_08141F78: .4byte 0x0000ffff + .pool thumb_func_end sub_8141EF8 thumb_func_start sub_8141F7C @@ -659709,12 +637858,12 @@ sub_8141F7C: @ 8141F7C lsrs r4, r2, 16 lsls r3, 16 lsrs r7, r3, 16 - ldr r2, _08141FCC + ldr r2, =0x0203ab88 ldr r0, [r2] mov r12, r0 mov r3, r12 adds r3, 0xB4 - ldr r1, _08141FD0 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -659731,7 +637880,7 @@ _08141FAC: str r5, [r0] subs r0, 0x4 strh r4, [r0] - ldr r0, _08141FD4 + ldr r0, =0x0000ffff cmp r4, r0 bne _08141FD8 cmp r7, 0 @@ -659743,9 +637892,7 @@ _08141FAC: strh r4, [r1] b _08141FDE .align 2, 0 -_08141FCC: .4byte 0x0203ab88 -_08141FD0: .4byte 0x03005e00 -_08141FD4: .4byte 0x0000ffff + .pool _08141FD8: ldr r0, [r2] adds r0, 0xAA @@ -659755,13 +637902,13 @@ _08141FDE: adds r0, r6 lsls r0, 3 adds r0, r3 - ldr r1, _08141FF0 + ldr r1, =sub_8141EF8 + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08141FF0: .4byte sub_8141EF8 + 1 + .pool thumb_func_end sub_8141F7C thumb_func_start sub_8141FF4 @@ -659770,7 +637917,7 @@ sub_8141FF4: @ 8141FF4 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r3, _08142068 + ldr r3, =0x0203ab88 ldr r0, [r3] strb r4, [r0] ldr r2, [r3] @@ -659796,7 +637943,7 @@ sub_8141FF4: @ 8141FF4 negs r0, r0 ands r0, r1 strb r0, [r2, 0x3] - ldr r6, _0814206C + ldr r6, =0x03005e00 adds r2, r3, 0 movs r1, 0 _08142036: @@ -659825,14 +637972,13 @@ _08142036: pop {r0} bx r0 .align 2, 0 -_08142068: .4byte 0x0203ab88 -_0814206C: .4byte 0x03005e00 + .pool thumb_func_end sub_8141FF4 thumb_func_start sub_8142070 sub_8142070: @ 8142070 push {lr} - ldr r2, _081420CC + ldr r2, =0x0203ab88 ldr r1, [r2] movs r0, 0 str r0, [r1, 0x8] @@ -659849,7 +637995,7 @@ _0814207E: cmp r1, 0x5 bls _0814207E movs r1, 0 - ldr r3, _081420CC + ldr r3, =0x0203ab88 movs r2, 0 _08142096: ldr r0, [r3] @@ -659862,7 +638008,7 @@ _08142096: cmp r1, 0x3 bls _08142096 movs r1, 0 - ldr r3, _081420CC + ldr r3, =0x0203ab88 movs r2, 0 _081420AE: ldr r0, [r3] @@ -659880,7 +638026,7 @@ _081420AE: pop {r0} bx r0 .align 2, 0 -_081420CC: .4byte 0x0203ab88 + .pool thumb_func_end sub_8142070 thumb_func_start sub_81420D0 @@ -659895,14 +638041,14 @@ sub_81420D0: @ 81420D0 lsls r1, 24 lsrs r5, r1, 24 mov r1, sp - ldr r0, _08142104 + ldr r0, =0x085b642c ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} ldr r0, [r0] str r0, [r1] add r2, sp, 0x10 adds r1, r2, 0 - ldr r0, _08142108 + ldr r0, =0x085b643c ldm r0!, {r3,r6,r7} stm r1!, {r3,r6,r7} mov r8, r2 @@ -659911,12 +638057,11 @@ sub_81420D0: @ 81420D0 movs r0, 0 b _081421C8 .align 2, 0 -_08142104: .4byte 0x085b642c -_08142108: .4byte 0x085b643c + .pool _0814210C: - ldr r6, _081421D8 + ldr r6, =0x0203ab88 ldr r3, [r6] - ldr r1, _081421DC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -659924,7 +638069,7 @@ _0814210C: movs r7, 0x14 ldrsh r1, [r0, r7] adds r3, r1 - ldr r4, _081421E0 + ldr r4, =0x085b62e4 lsls r5, 3 adds r2, r5, r4 ldrb r1, [r2, 0x2] @@ -659975,10 +638120,10 @@ _08142174: cmp r3, 0x3 bls _08142144 movs r6, 0 - ldr r0, _081421E4 + ldr r0, =0x085b62e8 add r0, r12 ldr r7, [r0] - ldr r4, _081421D8 + ldr r4, =0x0203ab88 mov r5, r8 _0814218A: lsls r0, r6, 2 @@ -660023,10 +638168,7 @@ _081421C8: pop {r1} bx r1 .align 2, 0 -_081421D8: .4byte 0x0203ab88 -_081421DC: .4byte 0x03005e00 -_081421E0: .4byte 0x085b62e4 -_081421E4: .4byte 0x085b62e8 + .pool thumb_func_end sub_81420D0 thumb_func_start sub_81421E8 @@ -660045,12 +638187,12 @@ sub_81421E8: @ 81421E8 cmp r2, 0xF bhi _08142278 lsls r0, r2, 2 - ldr r1, _0814220C + ldr r1, =_08142210 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0814220C: .4byte _08142210 + .pool .align 2, 0 _08142210: .4byte _08142250 @@ -660130,12 +638272,12 @@ _081422AA: lsls r0, 24 lsrs r4, r0, 24 adds r2, r7, 0x5 - ldr r1, _08142300 + ldr r1, =0x0203ab88 mov r12, r1 cmp r4, r2 bge _081422E8 ldr r0, [r1] - ldr r3, _08142304 + ldr r3, =0x085b6154 ldr r5, [r0, 0x8] adds r6, r3, 0 adds r6, 0x8 @@ -660163,7 +638305,7 @@ _081422E8: mov r2, r12 ldr r0, [r2] adds r0, 0xB8 - ldr r1, _08142308 + ldr r1, =0x0000dfff ldr r3, [sp, 0x18] ands r3, r1 str r3, [sp, 0x18] @@ -660171,12 +638313,10 @@ _081422E8: bl sub_8151A48 b _081424E2 .align 2, 0 -_08142300: .4byte 0x0203ab88 -_08142304: .4byte 0x085b6154 -_08142308: .4byte 0x0000dfff + .pool _0814230C: mov r0, sp - ldr r1, _0814235C + ldr r1, =0x085b63f0 ldm r1!, {r2,r4,r5} stm r0!, {r2,r4,r5} ldm r1!, {r3-r5} @@ -660196,7 +638336,7 @@ _0814232A: bl __udivsi3 lsls r0, 24 lsrs r0, 8 - ldr r3, _08142360 + ldr r3, =0xffff0000 adds r0, r3 lsrs r0, 16 mov r8, r0 @@ -660211,53 +638351,48 @@ _0814232A: bgt _08142368 cmp r0, 0x1 beq _0814237C - ldr r4, _08142364 + ldr r4, =0x0203ab88 mov r12, r4 b _081423D4 .align 2, 0 -_0814235C: .4byte 0x085b63f0 -_08142360: .4byte 0xffff0000 -_08142364: .4byte 0x0203ab88 + .pool _08142368: cmp r0, 0x3 beq _081423A4 cmp r0, 0x4 beq _081423B8 - ldr r5, _08142378 + ldr r5, =0x0203ab88 mov r12, r5 b _081423D4 .align 2, 0 -_08142378: .4byte 0x0203ab88 + .pool _0814237C: - ldr r3, _08142388 - ldr r2, _0814238C + ldr r3, =0x02020630 + ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x43 b _081423C0 .align 2, 0 -_08142388: .4byte 0x02020630 -_0814238C: .4byte 0x0203ab88 + .pool _08142390: - ldr r3, _0814239C - ldr r2, _081423A0 + ldr r3, =0x02020630 + ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x44 b _081423C0 .align 2, 0 -_0814239C: .4byte 0x02020630 -_081423A0: .4byte 0x0203ab88 + .pool _081423A4: - ldr r3, _081423B0 - ldr r2, _081423B4 + ldr r3, =0x02020630 + ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x45 b _081423C0 .align 2, 0 -_081423B0: .4byte 0x02020630 -_081423B4: .4byte 0x0203ab88 + .pool _081423B8: - ldr r3, _08142424 - ldr r2, _08142428 + ldr r3, =0x02020630 + ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x46 _081423C0: @@ -660277,7 +638412,7 @@ _081423D4: bne _08142430 mov r1, r12 ldr r4, [r1] - ldr r1, _0814242C + ldr r1, =0x085b6154 lsls r2, r7, 2 adds r0, r2, r7 lsls r0, 2 @@ -660311,14 +638446,12 @@ _081423D4: bl sub_815168C b _081424C4 .align 2, 0 -_08142424: .4byte 0x02020630 -_08142428: .4byte 0x0203ab88 -_0814242C: .4byte 0x085b6154 + .pool _08142430: movs r4, 0 lsls r5, r7, 2 str r5, [sp, 0x1C] - ldr r0, _081424F4 + ldr r0, =0x085b6154 mov r10, r0 _0814243A: lsls r0, r4, 2 @@ -660377,7 +638510,7 @@ _081424A2: lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r2, _081424F8 + ldr r2, =0x0203ab88 mov r12, r2 _081424B0: adds r0, r4, 0x1 @@ -660391,10 +638524,10 @@ _081424B0: movs r4, 0 str r4, [sp, 0x18] _081424C4: - ldr r0, _081424F8 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0xB8 - ldr r2, _081424F4 + ldr r2, =0x085b6154 ldr r5, [sp, 0x1C] adds r1, r5, r7 lsls r1, 2 @@ -660415,8 +638548,7 @@ _081424E2: pop {r0} bx r0 .align 2, 0 -_081424F4: .4byte 0x085b6154 -_081424F8: .4byte 0x0203ab88 + .pool thumb_func_end sub_8142284 thumb_func_start sub_81424FC @@ -660429,7 +638561,7 @@ sub_81424FC: @ 81424FC sub sp, 0x2C lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _08142548 + ldr r4, =0x0203ab88 ldr r1, [r4] movs r0, 0x1 strh r0, [r1, 0x2A] @@ -660437,9 +638569,9 @@ sub_81424FC: @ 81424FC movs r1, 0 bl sub_8142E70 ldr r1, [r4] - ldr r2, _0814254C + ldr r2, =0x0000117c adds r0, r1, r2 - ldr r2, _08142550 + ldr r2, =0x0000397c adds r1, r2 ldr r1, [r1] movs r2, 0x10 @@ -660452,15 +638584,12 @@ sub_81424FC: @ 81424FC cmp r5, 0xF bhi _081425FC lsls r0, r5, 2 - ldr r1, _08142554 + ldr r1, =_08142558 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08142548: .4byte 0x0203ab88 -_0814254C: .4byte 0x0000117c -_08142550: .4byte 0x0000397c -_08142554: .4byte _08142558 + .pool .align 2, 0 _08142558: .4byte _08142738 @@ -660566,7 +638695,7 @@ _08142628: lsls r0, r1, 2 adds r0, r1 lsls r0, 2 - ldr r2, _08142748 + ldr r2, =0x085b6154 adds r0, r2 ldrb r0, [r0, 0x6] ldr r1, [sp, 0x1C] @@ -660578,7 +638707,7 @@ _08142628: lsls r0, r1, 2 adds r0, r1 lsls r0, 2 - ldr r1, _08142748 + ldr r1, =0x085b6154 adds r0, r1 ldrb r0, [r0, 0x3] ldr r2, [sp, 0x20] @@ -660594,7 +638723,7 @@ _08142628: mov r8, r2 ldr r0, [sp, 0x1C] mov r12, r0 - ldr r1, _0814274C + ldr r1, =0x0203ab88 str r1, [sp, 0x28] _08142672: mov r2, r9 @@ -660604,7 +638733,7 @@ _08142672: lsls r1, r0, 2 adds r1, r0 lsls r1, 2 - ldr r0, _08142748 + ldr r0, =0x085b6154 adds r1, r0 str r7, [sp, 0x24] ldrb r0, [r7] @@ -660619,14 +638748,14 @@ _08142672: ldrh r2, [r6] adds r2, r0 lsls r2, 1 - ldr r0, _08142750 + ldr r0, =0x0000117c adds r5, r4, r0 adds r2, r5, r2 mov r1, r12 ldrb r0, [r1] ldrb r1, [r7] adds r1, r0 - ldr r0, _08142754 + ldr r0, =0x0000397c adds r4, r0 ldr r3, [r4] lsls r0, r1, 1 @@ -660707,10 +638836,7 @@ _08142738: pop {r0} bx r0 .align 2, 0 -_08142748: .4byte 0x085b6154 -_0814274C: .4byte 0x0203ab88 -_08142750: .4byte 0x0000117c -_08142754: .4byte 0x0000397c + .pool thumb_func_end sub_81424FC thumb_func_start sub_8142758 @@ -660719,7 +638845,7 @@ sub_8142758: @ 8142758 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08142790 + ldr r1, =0x085b6448 mov r0, sp movs r2, 0x5 bl memcpy @@ -660727,7 +638853,7 @@ sub_8142758: @ 8142758 bls _08142770 movs r4, 0 _08142770: - ldr r3, _08142794 + ldr r3, =0x085b6154 lsls r0, r4, 2 adds r0, r4 lsls r2, r0, 2 @@ -660743,8 +638869,7 @@ _08142770: beq _0814279E b _08142808 .align 2, 0 -_08142790: .4byte 0x085b6448 -_08142794: .4byte 0x085b6154 + .pool _08142798: cmp r0, 0xC beq _081427E8 @@ -660756,7 +638881,7 @@ _0814279E: subs r0, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081427C0 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x16 adds r1, r0, r4 @@ -660767,12 +638892,12 @@ _0814279E: adds r0, 0x1 b _081427DC .align 2, 0 -_081427C0: .4byte 0x0203ab88 + .pool _081427C4: subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081427E4 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x12 adds r1, r0, r4 @@ -660786,9 +638911,9 @@ _081427DC: ldrb r0, [r0] b _0814280A .align 2, 0 -_081427E4: .4byte 0x0203ab88 + .pool _081427E8: - ldr r0, _08142804 + ldr r0, =0x0203ab88 ldr r1, [r0] adds r0, r3, 0 adds r0, 0x8 @@ -660802,7 +638927,7 @@ _081427E8: ldrb r0, [r0, 0x4] b _0814280A .align 2, 0 -_08142804: .4byte 0x0203ab88 + .pool _08142808: movs r0, 0 _0814280A: @@ -660815,7 +638940,7 @@ _0814280A: thumb_func_start sub_8142814 sub_8142814: @ 8142814 push {r4-r6,lr} - ldr r4, _081428B4 + ldr r4, =0x0203ab88 ldr r0, [r4] ldrh r1, [r0, 0x2C] movs r0, 0x20 @@ -660835,7 +638960,7 @@ sub_8142814: @ 8142814 ldr r3, [r4] movs r0, 0x2E ldrsh r1, [r3, r0] - ldr r0, _081428B8 + ldr r0, =0x02021bbe movs r4, 0 ldrsh r2, [r0, r4] adds r2, 0x50 @@ -660846,7 +638971,7 @@ sub_8142814: @ 8142814 subs r4, r0 movs r6, 0x2C ldrsh r5, [r3, r6] - ldr r0, _081428BC + ldr r0, =0x02021bbc movs r6, 0 ldrsh r1, [r0, r6] adds r1, 0x74 @@ -660867,7 +638992,7 @@ sub_8142814: @ 8142814 lsrs r1, 16 movs r0, 0x28 bl lcd_io_set - ldr r6, _081428C0 + ldr r6, =0x0fff0000 ands r4, r6 lsrs r4, 16 movs r0, 0x2A @@ -660886,10 +639011,7 @@ sub_8142814: @ 8142814 pop {r0} bx r0 .align 2, 0 -_081428B4: .4byte 0x0203ab88 -_081428B8: .4byte 0x02021bbe -_081428BC: .4byte 0x02021bbc -_081428C0: .4byte 0x0fff0000 + .pool thumb_func_end sub_8142814 thumb_func_start sub_81428C4 @@ -660899,14 +639021,14 @@ sub_81428C4: @ 81428C4 lsls r4, 24 lsrs r4, 24 bl sub_8197930 - ldr r1, _081428E0 + ldr r1, =0x085b6408 adds r0, r4, 0 bl sub_8121F68 pop {r4} pop {r0} bx r0 .align 2, 0 -_081428E0: .4byte 0x085b6408 + .pool thumb_func_end sub_81428C4 thumb_func_start sub_81428E4 @@ -660914,7 +639036,7 @@ sub_81428E4: @ 81428E4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08142910 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -660922,7 +639044,7 @@ sub_81428E4: @ 81428E4 bne _08142908 movs r0, 0 bl SetVBlankCallback - ldr r0, _08142914 + ldr r0, =sub_81405CC + 1 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -660931,8 +639053,7 @@ _08142908: pop {r0} bx r0 .align 2, 0 -_08142910: .4byte 0x02037fd4 -_08142914: .4byte sub_81405CC + 1 + .pool thumb_func_end sub_81428E4 thumb_func_start sub_8142918 @@ -660954,7 +639075,7 @@ sub_8142918: @ 8142918 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r2, _08142970 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] lsls r1, 26 lsrs r1, 26 @@ -660965,21 +639086,19 @@ sub_8142918: @ 8142918 orrs r0, r1 strb r0, [r2, 0x4] bl fade_and_return_progress_probably - ldr r1, _08142974 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08142978 + ldr r1, =sub_81428E4 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_08142970: .4byte 0x02037fd4 -_08142974: .4byte 0x03005e00 -_08142978: .4byte sub_81428E4 + 1 + .pool thumb_func_end sub_8142918 thumb_func_start sub_814297C @@ -661005,7 +639124,7 @@ sub_81429A0: @ 81429A0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _081429E4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -661013,13 +639132,13 @@ sub_81429A0: @ 81429A0 ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - ldr r0, _081429E8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 beq _081429DE - ldr r1, _081429EC + ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] bl sub_8145C14 @@ -661034,9 +639153,7 @@ _081429DE: pop {r0} bx r0 .align 2, 0 -_081429E4: .4byte 0x03005e00 -_081429E8: .4byte 0x030022c0 -_081429EC: .4byte 0x020375e0 + .pool thumb_func_end sub_81429A0 thumb_func_start sub_81429F0 @@ -661045,14 +639162,14 @@ sub_81429F0: @ 81429F0 sub sp, 0xC lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08142A68 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 beq _08142A60 - ldr r2, _08142A6C - ldr r0, _08142A70 + ldr r2, =0x085b6344 + ldr r0, =0x020375e0 ldrh r1, [r0] movs r5, 0x1 adds r0, r5, 0 @@ -661062,12 +639179,12 @@ sub_81429F0: @ 81429F0 adds r0, r1 adds r0, r2 ldrb r1, [r0] - ldr r0, _08142A74 + ldr r0, =0x02021cc4 movs r2, 0x2 movs r3, 0x1 bl decimal_int_to_string - ldr r4, _08142A78 - ldr r1, _08142A7C + ldr r4, =0x02021fc4 + ldr r1, =0x082a5b12 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -661085,12 +639202,12 @@ sub_81429F0: @ 81429F0 movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r1, _08142A80 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _08142A84 + ldr r1, =sub_81428C4 + 1 str r1, [r0] _08142A60: add sp, 0xC @@ -661098,14 +639215,7 @@ _08142A60: pop {r0} bx r0 .align 2, 0 -_08142A68: .4byte 0x030022c0 -_08142A6C: .4byte 0x085b6344 -_08142A70: .4byte 0x020375e0 -_08142A74: .4byte 0x02021cc4 -_08142A78: .4byte 0x02021fc4 -_08142A7C: .4byte 0x082a5b12 -_08142A80: .4byte 0x03005e00 -_08142A84: .4byte sub_81428C4 + 1 + .pool thumb_func_end sub_81429F0 thumb_func_start sub_8142A88 @@ -661116,7 +639226,7 @@ sub_8142A88: @ 8142A88 sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08142B10 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -661124,8 +639234,8 @@ sub_8142A88: @ 8142A88 movs r1, 0x22 ldrsh r0, [r6, r1] bl sub_8145B54 - ldr r2, _08142B14 - ldr r0, _08142B18 + ldr r2, =0x085b6344 + ldr r0, =0x020375e0 mov r8, r0 ldrh r1, [r0] movs r7, 0x1 @@ -661136,7 +639246,7 @@ sub_8142A88: @ 8142A88 adds r0, r1 adds r0, r2 ldrb r4, [r0] - ldr r0, _08142B1C + ldr r0, =0x02021cc4 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x1 @@ -661158,7 +639268,7 @@ sub_8142A88: @ 8142A88 movs r0, 0 movs r1, 0 bl sub_81973FC - ldr r2, _08142B20 + ldr r2, =0x082a5b6b str r7, [sp] movs r0, 0xFF str r0, [sp, 0x4] @@ -661170,19 +639280,14 @@ sub_8142A88: @ 8142A88 movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _08142B24 + ldr r0, =sub_81429F0 + 1 str r0, [r6] b _08142BB0 .align 2, 0 -_08142B10: .4byte 0x03005e00 -_08142B14: .4byte 0x085b6344 -_08142B18: .4byte 0x020375e0 -_08142B1C: .4byte 0x02021cc4 -_08142B20: .4byte 0x082a5b6b -_08142B24: .4byte sub_81429F0 + 1 + .pool _08142B28: - ldr r4, _08142B68 - ldr r1, _08142B6C + ldr r4, =0x02021fc4 + ldr r1, =0x082a5b12 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -661201,22 +639306,19 @@ _08142B28: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r1, _08142B70 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08142B74 + ldr r1, =sub_81428C4 + 1 str r1, [r0] b _08142BB0 .align 2, 0 -_08142B68: .4byte 0x02021fc4 -_08142B6C: .4byte 0x082a5b12 -_08142B70: .4byte 0x03005e00 -_08142B74: .4byte sub_81428C4 + 1 + .pool _08142B78: - ldr r5, _08142BBC - ldr r1, _08142BC0 + ldr r5, =0x02021fc4 + ldr r1, =0x082a5b4e adds r0, r5, 0 bl ExpandTextCodes movs r0, 0 @@ -661235,7 +639337,7 @@ _08142B78: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _08142BC4 + ldr r0, =sub_81429A0 + 1 str r0, [r6] strh r4, [r6, 0x22] strh r4, [r6, 0x8] @@ -661247,9 +639349,7 @@ _08142BB0: pop {r0} bx r0 .align 2, 0 -_08142BBC: .4byte 0x02021fc4 -_08142BC0: .4byte 0x082a5b4e -_08142BC4: .4byte sub_81429A0 + 1 + .pool thumb_func_end sub_8142A88 thumb_func_start sub_8142BC8 @@ -661262,14 +639362,14 @@ sub_8142BC8: @ 8142BC8 movs r1, 0x1 movs r2, 0x1 bl sub_8145BAC - ldr r0, _08142C04 + ldr r0, =sub_8142A88 + 1 movs r1, 0 bl AddTask adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 bl sub_8145C30 - ldr r2, _08142C08 + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -661279,8 +639379,7 @@ sub_8142BC8: @ 8142BC8 pop {r0} bx r0 .align 2, 0 -_08142C04: .4byte sub_8142A88 + 1 -_08142C08: .4byte 0x03005e00 + .pool thumb_func_end sub_8142BC8 thumb_func_start sub_8142C0C @@ -661290,20 +639389,17 @@ sub_8142C0C: @ 8142C0C cmp r0, 0 bne _08142C44 bl gpu_pal_allocator_reset - ldr r0, _08142C34 + ldr r0, =0x085b7384 bl gpu_pal_obj_alloc_and_load_multiple - ldr r0, _08142C38 + ldr r0, =0x085b7864 bl gpu_tile_obj_decompress_and_load - ldr r0, _08142C3C + ldr r0, =0x085b7978 bl gpu_tile_obj_decompress_and_load - ldr r0, _08142C40 + ldr r0, =0x085b7a40 bl gpu_tile_obj_decompress_and_load b _08142C5A .align 2, 0 -_08142C34: .4byte 0x085b7384 -_08142C38: .4byte 0x085b7864 -_08142C3C: .4byte 0x085b7978 -_08142C40: .4byte 0x085b7a40 + .pool _08142C44: movs r0, 0xE bl gpu_tile_obj_free_by_tag @@ -661332,7 +639428,7 @@ sub_8142C60: @ 8142C60 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r0, _08142CC4 + ldr r0, =0x02020630 lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -661358,10 +639454,10 @@ sub_8142C60: @ 8142C60 adds r0, 0x1E strh r0, [r6] lsls r0, 16 - ldr r1, _08142CC8 + ldr r1, =0x01670000 cmp r0, r1 bls _08142CBC - ldr r1, _08142CCC + ldr r1, =0xfffffeb6 adds r0, r2, r1 strh r0, [r6] _08142CBC: @@ -661370,9 +639466,7 @@ _08142CBC: pop {r1} bx r1 .align 2, 0 -_08142CC4: .4byte 0x02020630 -_08142CC8: .4byte 0x01670000 -_08142CCC: .4byte 0xfffffeb6 + .pool thumb_func_end sub_8142C60 thumb_func_start sub_8142CD0 @@ -661381,9 +639475,9 @@ sub_8142CD0: @ 8142CD0 mov r7, r8 push {r7} sub sp, 0x8 - ldr r4, _08142E1C + ldr r4, =0x085b7488 ldr r0, [r4] - ldr r5, _08142E20 + ldr r5, =0x0201c000 adds r1, r5, 0 bl LZ77UnCompWram str r5, [sp] @@ -661395,7 +639489,7 @@ sub_8142CD0: @ 8142CD0 str r0, [sp, 0x4] mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r4, _08142E24 + ldr r4, =0x085b7490 ldr r0, [r4] adds r1, r5, 0 bl LZ77UnCompWram @@ -661407,7 +639501,7 @@ sub_8142CD0: @ 8142CD0 mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram movs r6, 0 - ldr r0, _08142E28 + ldr r0, =0x02020630 mov r8, r0 _08142D18: lsls r0, r6, 1 @@ -661420,14 +639514,14 @@ _08142D24: lsls r1, r5, 1 adds r1, r5 lsls r1, 3 - ldr r0, _08142E2C + ldr r0, =0x085b75b0 adds r0, r1, r0 adds r1, 0x94 adds r2, r4, 0 adds r2, 0x5C movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r1, _08142E30 + ldr r1, =0x0203ab88 ldr r1, [r1] adds r2, r5, 0 adds r2, 0x1D @@ -661465,12 +639559,12 @@ _08142D6E: cmp r6, 0x2 bls _08142D18 movs r6, 0 - ldr r4, _08142E28 + ldr r4, =0x02020630 _08142D86: lsls r1, r6, 1 adds r1, r6 lsls r1, 3 - ldr r0, _08142E34 + ldr r0, =0x085b7508 adds r0, r1, r0 adds r1, 0x94 lsls r1, 16 @@ -661478,7 +639572,7 @@ _08142D86: movs r2, 0x46 movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r1, _08142E30 + ldr r1, =0x0203ab88 ldr r1, [r1] adds r1, r6 adds r1, 0x65 @@ -661500,12 +639594,12 @@ _08142D86: cmp r6, 0x3 bls _08142D86 movs r6, 0 - ldr r4, _08142E28 + ldr r4, =0x02020630 _08142DCC: lsls r2, r6, 1 adds r2, r6 lsls r2, 3 - ldr r0, _08142E38 + ldr r0, =0x085b7568 adds r0, r2, r0 adds r2, 0x5C lsls r2, 16 @@ -661513,7 +639607,7 @@ _08142DCC: movs r1, 0x7E movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r1, _08142E30 + ldr r1, =0x0203ab88 ldr r1, [r1] adds r1, r6 adds r1, 0x69 @@ -661541,14 +639635,7 @@ _08142DCC: pop {r0} bx r0 .align 2, 0 -_08142E1C: .4byte 0x085b7488 -_08142E20: .4byte 0x0201c000 -_08142E24: .4byte 0x085b7490 -_08142E28: .4byte 0x02020630 -_08142E2C: .4byte 0x085b75b0 -_08142E30: .4byte 0x0203ab88 -_08142E34: .4byte 0x085b7508 -_08142E38: .4byte 0x085b7568 + .pool thumb_func_end sub_8142CD0 thumb_func_start sub_8142E3C @@ -661556,7 +639643,7 @@ sub_8142E3C: @ 8142E3C push {r4,lr} movs r4, 0 _08142E40: - ldr r0, _08142E68 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, r4 adds r0, 0x59 @@ -661564,7 +639651,7 @@ _08142E40: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08142E6C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -661576,8 +639663,7 @@ _08142E40: pop {r0} bx r0 .align 2, 0 -_08142E68: .4byte 0x0203ab88 -_08142E6C: .4byte 0x02020630 + .pool thumb_func_end sub_8142E3C thumb_func_start sub_8142E70 @@ -661596,8 +639682,8 @@ sub_8142E70: @ 8142E70 cmp r0, 0x1 bne _08142F66 movs r4, 0 - ldr r5, _08142EB8 - ldr r3, _08142EBC + ldr r5, =0x02020630 + ldr r3, =0x0203ab88 movs r2, 0x4 _08142E92: ldr r0, [r3] @@ -661619,16 +639705,15 @@ _08142E92: bls _08142E92 b _08142F66 .align 2, 0 -_08142EB8: .4byte 0x02020630 -_08142EBC: .4byte 0x0203ab88 + .pool _08142EC0: movs r4, 0 - ldr r0, _08142F08 + ldr r0, =0x0203ab88 mov r9, r0 - ldr r7, _08142F0C + ldr r7, =0x085b62e4 adds r1, r7, 0x4 mov r8, r1 - ldr r5, _08142F10 + ldr r5, =0x02020630 movs r6, 0x5 negs r6, r6 _08142ED2: @@ -661660,9 +639745,7 @@ _08142ED2: strb r1, [r0] b _08142F2C .align 2, 0 -_08142F08: .4byte 0x0203ab88 -_08142F0C: .4byte 0x085b62e4 -_08142F10: .4byte 0x02020630 + .pool _08142F14: adds r0, r2, r4 adds r0, 0x59 @@ -661684,8 +639767,8 @@ _08142F2C: bls _08142ED2 cmp r4, 0x12 bhi _08142F66 - ldr r6, _08142F74 - ldr r3, _08142F78 + ldr r6, =0x02020630 + ldr r3, =0x0203ab88 movs r5, 0x5 negs r5, r5 _08142F42: @@ -661715,8 +639798,7 @@ _08142F66: pop {r0} bx r0 .align 2, 0 -_08142F74: .4byte 0x02020630 -_08142F78: .4byte 0x0203ab88 + .pool thumb_func_end sub_8142E70 thumb_func_start sub_8142F7C @@ -661725,12 +639807,12 @@ sub_8142F7C: @ 8142F7C mov r7, r8 push {r7} movs r5, 0 - ldr r6, _08143028 - ldr r4, _0814302C + ldr r6, =0x0203ab88 + ldr r4, =0x02020630 movs r0, 0x4 mov r8, r0 _08142F8C: - ldr r0, _08143030 + ldr r0, =0x085b7928 movs r1, 0x74 movs r2, 0x14 movs r3, 0xA @@ -661771,7 +639853,7 @@ _08142F8C: adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08143034 + ldr r1, =sub_814390C + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -661807,10 +639889,7 @@ _08142F8C: pop {r0} bx r0 .align 2, 0 -_08143028: .4byte 0x0203ab88 -_0814302C: .4byte 0x02020630 -_08143030: .4byte 0x085b7928 -_08143034: .4byte sub_814390C + 1 + .pool thumb_func_end sub_8142F7C thumb_func_start sub_8143038 @@ -661827,8 +639906,8 @@ sub_8143038: @ 8143038 movs r6, 0 cmp r0, 0 beq _08143084 - ldr r4, _0814307C - ldr r3, _08143080 + ldr r4, =0x02020630 + ldr r3, =0x0203ab88 movs r2, 0x4 _08143056: ldr r0, [r3] @@ -661850,13 +639929,12 @@ _08143056: bls _08143056 b _08143142 .align 2, 0 -_0814307C: .4byte 0x02020630 -_08143080: .4byte 0x0203ab88 + .pool _08143084: - ldr r0, _081430C4 + ldr r0, =0x0203ab88 mov r8, r0 - ldr r7, _081430C8 - ldr r0, _081430CC + ldr r7, =0x02020630 + ldr r0, =0x085b6154 mov r12, r0 movs r0, 0x5 negs r0, r0 @@ -661887,9 +639965,7 @@ _081430A8: strb r1, [r0] b _08143138 .align 2, 0 -_081430C4: .4byte 0x0203ab88 -_081430C8: .4byte 0x02020630 -_081430CC: .4byte 0x085b6154 + .pool _081430D0: adds r5, r6, 0 adds r5, 0x31 @@ -661966,8 +640042,8 @@ sub_8143150: @ 8143150 lsrs r5, r0, 24 cmp r5, 0 bne _08143180 - ldr r2, _08143178 - ldr r0, _0814317C + ldr r2, =0x02020630 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x6C ldrb r1, [r0] @@ -661982,11 +640058,10 @@ sub_8143150: @ 8143150 strb r1, [r0] b _081431D0 .align 2, 0 -_08143178: .4byte 0x02020630 -_0814317C: .4byte 0x0203ab88 + .pool _08143180: - ldr r4, _081431D8 - ldr r3, _081431DC + ldr r4, =0x02020630 + ldr r3, =0x0203ab88 ldr r0, [r3] adds r0, 0x6C ldrb r1, [r0] @@ -662007,7 +640082,7 @@ _08143180: adds r1, r0 lsls r1, 2 adds r1, r4 - ldr r0, _081431E0 + ldr r0, =0x085b6154 lsls r2, r5, 2 adds r2, r5 lsls r2, 2 @@ -662030,18 +640105,16 @@ _081431D0: pop {r0} bx r0 .align 2, 0 -_081431D8: .4byte 0x02020630 -_081431DC: .4byte 0x0203ab88 -_081431E0: .4byte 0x085b6154 + .pool thumb_func_end sub_8143150 thumb_func_start sub_81431E4 sub_81431E4: @ 81431E4 push {r4-r7,lr} sub sp, 0xC - ldr r4, _0814326C + ldr r4, =0x085b741c ldr r0, [r4] - ldr r5, _08143270 + ldr r5, =0x0201c000 adds r1, r5, 0 bl LZ77UnCompWram str r5, [sp, 0x4] @@ -662056,7 +640129,7 @@ sub_81431E4: @ 81431E4 mov r0, sp strh r1, [r0] movs r0, 0 - ldr r7, _08143274 + ldr r7, =0x02020630 _08143210: movs r4, 0 adds r6, r0, 0x1 @@ -662066,12 +640139,12 @@ _08143216: lsls r0, r1, 1 adds r0, r1 lsls r0, 3 - ldr r1, _08143278 + ldr r1, =0x085b7610 adds r0, r1 movs r1, 0x28 mov r2, sp bl sub_8142C60 - ldr r1, _0814327C + ldr r1, =0x0203ab88 ldr r1, [r1] adds r2, r4, 0x7 adds r2, r5, r2 @@ -662105,18 +640178,14 @@ _08143216: pop {r0} bx r0 .align 2, 0 -_0814326C: .4byte 0x085b741c -_08143270: .4byte 0x0201c000 -_08143274: .4byte 0x02020630 -_08143278: .4byte 0x085b7610 -_0814327C: .4byte 0x0203ab88 + .pool thumb_func_end sub_81431E4 thumb_func_start sub_8143280 sub_8143280: @ 8143280 push {r4-r6,lr} adds r6, r0, 0 - ldr r0, _08143304 + ldr r0, =0x0203ab88 ldr r1, [r0] ldrh r0, [r6, 0x2E] ldrh r1, [r1, 0x24] @@ -662124,10 +640193,10 @@ sub_8143280: @ 8143280 lsls r0, 16 lsrs r4, r0, 16 asrs r1, r0, 16 - ldr r0, _08143308 + ldr r0, =0x00000167 cmp r1, r0 ble _081432A2 - ldr r2, _0814330C + ldr r2, =0xfffffe98 adds r0, r1, r2 lsls r0, 16 lsrs r4, r0, 16 @@ -662162,7 +640231,7 @@ _081432A2: _081432DC: lsls r0, r2, 12 lsrs r5, r0, 16 - ldr r1, _08143310 + ldr r1, =0x02021bc0 lsls r0, r3, 3 adds r1, r0, r1 adds r0, r4, 0 @@ -662182,10 +640251,7 @@ _081432EE: pop {r0} bx r0 .align 2, 0 -_08143304: .4byte 0x0203ab88 -_08143308: .4byte 0x00000167 -_0814330C: .4byte 0xfffffe98 -_08143310: .4byte 0x02021bc0 + .pool thumb_func_end sub_8143280 thumb_func_start sub_8143314 @@ -662195,10 +640261,10 @@ sub_8143314: @ 8143314 push {r7} sub sp, 0x8 movs r5, 0 - ldr r7, _081434E8 + ldr r7, =0x0201c000 mov r6, sp _08143322: - ldr r0, _081434EC + ldr r0, =0x085b7750 lsls r4, r5, 3 adds r4, r0 ldr r0, [r4] @@ -662206,14 +640272,14 @@ _08143322: bl LZ77UnCompWram str r7, [sp] ldrh r2, [r4, 0x4] - ldr r0, _081434F0 + ldr r0, =0xffff0000 ldr r1, [r6, 0x4] ands r1, r0 orrs r1, r2 str r1, [r6, 0x4] ldrh r2, [r4, 0x6] lsls r2, 16 - ldr r0, _081434F4 + ldr r0, =0x0000ffff ands r0, r1 orrs r0, r2 str r0, [r6, 0x4] @@ -662224,16 +640290,16 @@ _08143322: lsrs r5, r0, 24 cmp r5, 0x4 bls _08143322 - ldr r0, _081434F8 + ldr r0, =0x085b77e4 movs r1, 0xD0 movs r2, 0x10 movs r3, 0x4 bl obj_add_from_template_forward_search - ldr r3, _081434FC + ldr r3, =0x0203ab88 ldr r1, [r3] adds r1, 0x50 strb r0, [r1] - ldr r4, _08143500 + ldr r4, =0x02020630 ldr r0, [r3] adds r0, 0x50 ldrb r1, [r0] @@ -662254,7 +640320,7 @@ _0814338C: lsls r0, 16 adds r1, r0 asrs r1, 16 - ldr r0, _08143504 + ldr r0, =0x085b77fc movs r2, 0x18 movs r3, 0 bl obj_add_from_template_forward_search @@ -662295,16 +640361,16 @@ _0814338C: lsrs r5, r0, 24 cmp r5, 0x3 bls _0814338C - ldr r0, _08143508 + ldr r0, =0x085b7814 movs r1, 0x78 movs r2, 0x44 movs r3, 0x4 bl obj_add_from_template_forward_search - ldr r2, _081434FC + ldr r2, =0x0203ab88 ldr r1, [r2] adds r1, 0x55 strb r0, [r1] - ldr r3, _08143500 + ldr r3, =0x02020630 ldr r0, [r2] adds r0, 0x55 ldrb r1, [r0] @@ -662325,7 +640391,7 @@ _0814341C: lsls r2, 16 adds r1, r2 asrs r1, 16 - ldr r0, _0814350C + ldr r0, =0x085b782c movs r2, 0x24 movs r3, 0x4 bl obj_add_from_template_forward_search @@ -662368,16 +640434,16 @@ _0814341C: lsrs r5, r0, 24 cmp r5, 0x2 bls _0814341C - ldr r0, _08143510 + ldr r0, =0x085b7844 movs r1, 0x98 movs r2, 0x60 movs r3, 0x9 bl obj_add_from_template_forward_search - ldr r3, _081434FC + ldr r3, =0x0203ab88 ldr r1, [r3] adds r1, 0x6C strb r0, [r1] - ldr r4, _08143500 + ldr r4, =0x02020630 ldr r0, [r3] adds r0, 0x6C ldrb r0, [r0] @@ -662421,17 +640487,7 @@ _0814341C: pop {r0} bx r0 .align 2, 0 -_081434E8: .4byte 0x0201c000 -_081434EC: .4byte 0x085b7750 -_081434F0: .4byte 0xffff0000 -_081434F4: .4byte 0x0000ffff -_081434F8: .4byte 0x085b77e4 -_081434FC: .4byte 0x0203ab88 -_08143500: .4byte 0x02020630 -_08143504: .4byte 0x085b77fc -_08143508: .4byte 0x085b7814 -_0814350C: .4byte 0x085b782c -_08143510: .4byte 0x085b7844 + .pool thumb_func_end sub_8143314 thumb_func_start sub_8143514 @@ -662448,9 +640504,9 @@ sub_8143514: @ 8143514 mov r8, r0 movs r4, 0 movs r6, 0 - ldr r1, _08143600 + ldr r1, =0x02020630 mov r9, r1 - ldr r0, _08143604 + ldr r0, =0x0203ab88 mov r10, r0 _08143534: adds r0, r7, 0 @@ -662458,7 +640514,7 @@ _08143534: bl __udivsi3 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08143604 + ldr r1, =0x0203ab88 ldr r0, [r1] adds r3, r6, 0 adds r3, 0x15 @@ -662468,7 +640524,7 @@ _08143534: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08143600 + ldr r1, =0x02020630 adds r0, r1 adds r0, 0x3E ldrb r1, [r0] @@ -662510,7 +640566,7 @@ _0814356E: adds r3, r0, r4 adds r4, r3, 0 adds r4, 0x40 - ldr r1, _08143608 + ldr r1, =0x02020638 adds r0, r1 ldr r0, [r0] ldr r1, [r0] @@ -662519,11 +640575,11 @@ _0814356E: ldrh r2, [r0] ldrh r4, [r4] adds r2, r4 - ldr r4, _0814360C + ldr r4, =0x000003ff adds r0, r4, 0 ands r2, r0 ldrh r0, [r3, 0x4] - ldr r4, _08143610 + ldr r4, =0xfffffc00 adds r1, r4, 0 ands r0, r1 orrs r0, r2 @@ -662554,11 +640610,7 @@ _081435CC: pop {r0} bx r0 .align 2, 0 -_08143600: .4byte 0x02020630 -_08143604: .4byte 0x0203ab88 -_08143608: .4byte 0x02020638 -_0814360C: .4byte 0x000003ff -_08143610: .4byte 0xfffffc00 + .pool thumb_func_end sub_8143514 thumb_func_start sub_8143614 @@ -662567,7 +640619,7 @@ sub_8143614: @ 8143614 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0814364C + ldr r1, =0x085b7b04 mov r0, sp movs r2, 0x5 bl memcpy @@ -662575,7 +640627,7 @@ sub_8143614: @ 8143614 bls _0814362C movs r4, 0 _0814362C: - ldr r3, _08143650 + ldr r3, =0x085b6154 lsls r0, r4, 2 adds r0, r4 lsls r2, r0, 2 @@ -662591,8 +640643,7 @@ _0814362C: beq _0814365A b _081436C4 .align 2, 0 -_0814364C: .4byte 0x085b7b04 -_08143650: .4byte 0x085b6154 + .pool _08143654: cmp r0, 0xC beq _081436A4 @@ -662604,7 +640655,7 @@ _0814365A: subs r0, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0814367C + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x16 adds r1, r0, r4 @@ -662615,12 +640666,12 @@ _0814365A: adds r0, 0x1 b _08143698 .align 2, 0 -_0814367C: .4byte 0x0203ab88 + .pool _08143680: subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081436A0 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x12 adds r1, r0, r4 @@ -662634,9 +640685,9 @@ _08143698: ldrb r0, [r0] b _081436C6 .align 2, 0 -_081436A0: .4byte 0x0203ab88 + .pool _081436A4: - ldr r0, _081436C0 + ldr r0, =0x0203ab88 ldr r1, [r0] adds r0, r3, 0 adds r0, 0x8 @@ -662650,7 +640701,7 @@ _081436A4: ldrb r0, [r0, 0x4] b _081436C6 .align 2, 0 -_081436C0: .4byte 0x0203ab88 + .pool _081436C4: movs r0, 0 _081436C6: @@ -662665,14 +640716,14 @@ sub_81436D0: @ 81436D0 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0814371C + ldr r1, =0x0203ab88 ldr r1, [r1] adds r1, 0x55 ldrb r2, [r1] lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, _08143720 + ldr r2, =0x02020630 adds r4, r1, r2 bl sub_8143614 adds r3, r4, 0 @@ -662688,11 +640739,11 @@ sub_81436D0: @ 81436D0 ldrh r1, [r0] ldrh r2, [r2] adds r1, r2 - ldr r2, _08143724 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r4, 0x4] - ldr r0, _08143728 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] @@ -662700,10 +640751,7 @@ sub_81436D0: @ 81436D0 pop {r0} bx r0 .align 2, 0 -_0814371C: .4byte 0x0203ab88 -_08143720: .4byte 0x02020630 -_08143724: .4byte 0x000003ff -_08143728: .4byte 0xfffffc00 + .pool thumb_func_end sub_81436D0 thumb_func_start sub_814372C @@ -662714,7 +640762,7 @@ sub_814372C: @ 814372C lsls r0, 24 lsrs r2, r0, 24 movs r6, 0 - ldr r1, _08143758 + ldr r1, =0x0203ab88 ldr r0, [r1] ldrb r0, [r0, 0x19] adds r5, r1, 0 @@ -662727,13 +640775,12 @@ _08143746: b _081438A8 _0814374C: lsls r0, r2, 2 - ldr r1, _0814375C + ldr r1, =_08143760 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08143758: .4byte 0x0203ab88 -_0814375C: .4byte _08143760 + .pool .align 2, 0 _08143760: .4byte _081438A8 @@ -662745,14 +640792,14 @@ _08143760: .4byte _0814377C _0814377C: movs r4, 0 - ldr r5, _081437EC - ldr r6, _081437F0 + ldr r5, =0x02020630 + ldr r6, =0x0203ab88 movs r0, 0x5 negs r0, r0 mov r12, r0 adds r7, r5, 0 adds r7, 0x8 - ldr r2, _081437F4 + ldr r2, =0xfffffc00 mov r8, r2 _08143790: ldr r0, [r6] @@ -662786,7 +640833,7 @@ _08143790: ldrh r1, [r0] ldrh r2, [r2] adds r1, r2 - ldr r2, _081437F8 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r3, 0x4] @@ -662801,19 +640848,16 @@ _08143790: bls _08143790 b _081438F4 .align 2, 0 -_081437EC: .4byte 0x02020630 -_081437F0: .4byte 0x0203ab88 -_081437F4: .4byte 0xfffffc00 -_081437F8: .4byte 0x000003ff + .pool _081437FC: - ldr r2, _08143804 + ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x58 b _0814386A .align 2, 0 -_08143804: .4byte 0x02020630 + .pool _08143808: - ldr r2, _0814382C + ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x58 ldrb r1, [r0] @@ -662832,16 +640876,16 @@ _08143808: ldrh r1, [r0, 0x8] b _08143886 .align 2, 0 -_0814382C: .4byte 0x02020630 + .pool _08143830: - ldr r2, _08143838 + ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x57 b _0814386A .align 2, 0 -_08143838: .4byte 0x02020630 + .pool _0814383C: - ldr r2, _08143860 + ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x57 ldrb r1, [r0] @@ -662860,9 +640904,9 @@ _0814383C: ldrh r1, [r0, 0x8] b _08143886 .align 2, 0 -_08143860: .4byte 0x02020630 + .pool _08143864: - ldr r2, _0814389C + ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x56 _0814386A: @@ -662883,27 +640927,25 @@ _0814386A: _08143886: ldrh r4, [r4] adds r1, r4 - ldr r2, _081438A0 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r3, 0x4] - ldr r0, _081438A4 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] b _081438F4 .align 2, 0 -_0814389C: .4byte 0x02020630 -_081438A0: .4byte 0x000003ff -_081438A4: .4byte 0xfffffc00 + .pool _081438A8: movs r4, 0 lsls r7, r6, 2 - ldr r6, _08143900 + ldr r6, =0x02020630 movs r0, 0x8 adds r0, r6 mov r12, r0 - ldr r2, _08143904 + ldr r2, =0xfffffc00 mov r8, r2 _081438B8: ldr r0, [r5] @@ -662923,7 +640965,7 @@ _081438B8: ldrh r1, [r0, 0x8] ldrh r2, [r2] adds r1, r2 - ldr r2, _08143908 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r3, 0x4] @@ -662943,29 +640985,27 @@ _081438F4: pop {r0} bx r0 .align 2, 0 -_08143900: .4byte 0x02020630 -_08143904: .4byte 0xfffffc00 -_08143908: .4byte 0x000003ff + .pool thumb_func_end sub_814372C thumb_func_start sub_814390C sub_814390C: @ 814390C - ldr r1, _08143918 + ldr r1, =0x0203ab88 ldr r1, [r1] ldrh r1, [r1, 0x26] strh r1, [r0, 0x24] bx lr .align 2, 0 -_08143918: .4byte 0x0203ab88 + .pool thumb_func_end sub_814390C thumb_func_start sub_814391C sub_814391C: @ 814391C push {r4,r5,lr} sub sp, 0x8 - ldr r4, _08143988 + ldr r4, =0x085b7948 ldr r0, [r4] - ldr r5, _0814398C + ldr r5, =0x0201c000 adds r1, r5, 0 bl LZ77UnCompWram str r5, [sp] @@ -662976,19 +641016,19 @@ sub_814391C: @ 814391C str r0, [sp, 0x4] mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _08143990 + ldr r0, =0x085b7950 movs r1, 0x74 movs r2, 0x50 movs r3, 0x51 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _08143994 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r1, r2 - ldr r0, _08143998 + ldr r0, =0x0203ab88 ldr r0, [r0] ldrh r0, [r0, 0x24] movs r2, 0 @@ -663012,11 +641052,7 @@ sub_814391C: @ 814391C pop {r0} bx r0 .align 2, 0 -_08143988: .4byte 0x085b7948 -_0814398C: .4byte 0x0201c000 -_08143990: .4byte 0x085b7950 -_08143994: .4byte 0x02020630 -_08143998: .4byte 0x0203ab88 + .pool thumb_func_end sub_814391C thumb_func_start sub_814399C @@ -663024,10 +641060,10 @@ sub_814399C: @ 814399C ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 - ldr r1, _081439C0 + ldr r1, =0x02021bc0 lsls r0, 3 adds r0, r1 - ldr r1, _081439C4 + ldr r1, =0x0203ab88 ldr r2, [r1] ldrh r1, [r2, 0x2C] strh r1, [r0, 0x6] @@ -663039,22 +641075,21 @@ sub_814399C: @ 814399C strh r1, [r0, 0x4] bx lr .align 2, 0 -_081439C0: .4byte 0x02021bc0 -_081439C4: .4byte 0x0203ab88 + .pool thumb_func_end sub_814399C thumb_func_start sub_81439C8 sub_81439C8: @ 81439C8 push {r4-r6,lr} movs r4, 0 - ldr r5, _08143A34 - ldr r6, _08143A38 + ldr r5, =0x0203ab88 + ldr r6, =0x02020630 _081439D0: movs r3, 0x39 subs r3, r4 lsls r3, 24 lsrs r3, 24 - ldr r0, _08143A3C + ldr r0, =0x085b7928 movs r1, 0x74 movs r2, 0x50 bl obj_add_from_template_forward_search @@ -663101,9 +641136,7 @@ _08143A24: pop {r0} bx r0 .align 2, 0 -_08143A34: .4byte 0x0203ab88 -_08143A38: .4byte 0x02020630 -_08143A3C: .4byte 0x085b7928 + .pool thumb_func_end sub_81439C8 thumb_func_start sub_8143A40 @@ -663113,12 +641146,12 @@ sub_8143A40: @ 8143A40 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08143ABC + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x3C ldrb r5, [r0] movs r6, 0 - ldr r7, _08143AC0 + ldr r7, =0x02020630 movs r0, 0x1C adds r0, r7 mov r10, r0 @@ -663139,7 +641172,7 @@ _08143A64: strb r1, [r3] mov r1, r10 adds r2, r4, r1 - ldr r1, _08143AC4 + ldr r1, =nullsub_12 + 1 str r1, [r2] movs r1, 0 bl obj_anim_image_start @@ -663171,16 +641204,14 @@ _08143A8C: pop {r0} bx r0 .align 2, 0 -_08143ABC: .4byte 0x0203ab88 -_08143AC0: .4byte 0x02020630 -_08143AC4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8143A40 thumb_func_start sub_8143AC8 sub_8143AC8: @ 8143AC8 push {r4,r5,lr} adds r3, r0, 0 - ldr r0, _08143AF8 + ldr r0, =0x0203ab88 ldr r0, [r0] ldrh r4, [r0, 0x24] movs r2, 0x24 @@ -663196,16 +641227,14 @@ sub_8143AC8: @ 8143AC8 subs r2, r0, r4 strh r2, [r3, 0x3A] lsls r1, r2, 16 - ldr r0, _08143AFC + ldr r0, =0x01670000 cmp r1, r0 ble _08143B08 - ldr r5, _08143B00 + ldr r5, =0xfffffe98 adds r0, r2, r5 b _08143B06 .align 2, 0 -_08143AF8: .4byte 0x0203ab88 -_08143AFC: .4byte 0x01670000 -_08143B00: .4byte 0xfffffe98 + .pool _08143B04: subs r0, r2, r4 _08143B06: @@ -663222,12 +641251,12 @@ _08143B08: sub_8143B14: @ 8143B14 push {r4,r5,lr} bl sub_8143AC8 - ldr r5, _08143B40 + ldr r5, =0x0203ab88 ldr r4, [r5] lsls r0, 16 asrs r0, 16 bl __floatsisf - ldr r1, _08143B44 + ldr r1, =0x41f00000 bl __divsf3 bl __fixunssfsi adds r4, 0x7E @@ -663239,8 +641268,7 @@ sub_8143B14: @ 8143B14 pop {r1} bx r1 .align 2, 0 -_08143B40: .4byte 0x0203ab88 -_08143B44: .4byte 0x41f00000 + .pool thumb_func_end sub_8143B14 thumb_func_start sub_8143B48 @@ -663285,7 +641313,7 @@ sub_8143B84: @ 8143B84 mov r7, r8 push {r7} adds r7, r0, 0 - ldr r5, _08143BCC + ldr r5, =0x0203ab88 ldr r6, [r5] adds r4, r6, 0 adds r4, 0x8C @@ -663301,7 +641329,7 @@ sub_8143B84: @ 8143B84 bl __addsf3 adds r6, r0, 0 str r6, [r4] - ldr r0, _08143BD0 + ldr r0, =0x43b40000 mov r8, r0 adds r0, r6, 0 mov r1, r8 @@ -663313,10 +641341,9 @@ sub_8143B84: @ 8143B84 bl __subsf3 b _08143BE8 .align 2, 0 -_08143BCC: .4byte 0x0203ab88 -_08143BD0: .4byte 0x43b40000 + .pool _08143BD4: - ldr r1, _08143C80 + ldr r1, =0x00000000 adds r0, r6, 0 bl __ltsf2 cmp r0, 0 @@ -663374,14 +641401,14 @@ _08143BEA: lsls r0, 24 cmp r0, 0 beq _08143C74 - ldr r0, _08143C84 - ldr r4, _08143C88 + ldr r0, =0x030075f0 + ldr r4, =0x0000ffff ldrh r2, [r7, 0x24] lsls r2, 24 asrs r2, 24 adds r1, r4, 0 bl MPlayPanpotControl - ldr r0, _08143C8C + ldr r0, =0x03007630 ldrh r2, [r7, 0x24] lsls r2, 24 asrs r2, 24 @@ -663394,27 +641421,24 @@ _08143C74: pop {r0} bx r0 .align 2, 0 -_08143C80: .4byte 0x00000000 -_08143C84: .4byte 0x030075f0 -_08143C88: .4byte 0x0000ffff -_08143C8C: .4byte 0x03007630 + .pool thumb_func_end sub_8143B84 thumb_func_start sub_8143C90 sub_8143C90: @ 8143C90 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _08143CEC + ldr r0, =0x0203ab88 ldr r1, [r0] ldrh r0, [r5, 0x3A] ldrh r1, [r1, 0x24] adds r2, r0, r1 strh r2, [r5, 0x34] lsls r1, r2, 16 - ldr r0, _08143CF0 + ldr r0, =0x01670000 cmp r1, r0 ble _08143CAE - ldr r1, _08143CF4 + ldr r1, =0xfffffe98 adds r0, r2, r1 strh r0, [r5, 0x34] _08143CAE: @@ -663438,7 +641462,7 @@ _08143CAE: movs r2, 0x36 ldrsh r1, [r5, r2] muls r0, r1 - ldr r1, _08143CF8 + ldr r1, =0x02021bbe asrs r0, 12 ldrh r1, [r1] adds r0, r1 @@ -663447,10 +641471,7 @@ _08143CAE: pop {r0} bx r0 .align 2, 0 -_08143CEC: .4byte 0x0203ab88 -_08143CF0: .4byte 0x01670000 -_08143CF4: .4byte 0xfffffe98 -_08143CF8: .4byte 0x02021bbe + .pool thumb_func_end sub_8143C90 thumb_func_start sub_8143CFC @@ -663490,14 +641511,14 @@ _08143D2E: ldrsh r0, [r5, r1] cmp r0, 0 bne _08143D6C - ldr r7, _08143D64 + ldr r7, =0x0203ab88 ldr r6, [r7] adds r4, r6, 0 adds r4, 0x94 adds r0, r6, 0 adds r0, 0xA0 ldr r0, [r0] - ldr r1, _08143D68 + ldr r1, =0x40000000 bl __subsf3 adds r1, r0, 0 ldr r0, [r4] @@ -663506,17 +641527,16 @@ _08143D2E: bgt _08143DF8 b _08143D8C .align 2, 0 -_08143D64: .4byte 0x0203ab88 -_08143D68: .4byte 0x40000000 + .pool _08143D6C: - ldr r7, _08143E00 + ldr r7, =0x0203ab88 ldr r6, [r7] adds r4, r6, 0 adds r4, 0x94 adds r0, r6, 0 adds r0, 0xA0 ldr r0, [r0] - ldr r1, _08143E04 + ldr r1, =0x40000000 bl __subsf3 adds r1, r0, 0 ldr r0, [r4] @@ -663558,7 +641578,7 @@ _08143D8C: lsls r1, 1 adds r1, 0xF strh r1, [r5, 0x3A] - ldr r0, _08143E08 + ldr r0, =sub_8143C90 + 1 str r0, [r5, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange @@ -663567,22 +641587,18 @@ _08143D8C: adds r2, 0x9C adds r1, r3, 0 adds r1, 0x98 - ldr r0, _08143E0C + ldr r0, =0x00000000 str r0, [r1] str r0, [r2] subs r1, 0xC - ldr r0, _08143E10 + ldr r0, =0xbf800000 str r0, [r1] _08143DF8: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08143E00: .4byte 0x0203ab88 -_08143E04: .4byte 0x40000000 -_08143E08: .4byte sub_8143C90 + 1 -_08143E0C: .4byte 0x00000000 -_08143E10: .4byte 0xbf800000 + .pool thumb_func_end sub_8143CFC thumb_func_start sub_8143E14 @@ -663612,9 +641628,9 @@ _08143E3C: ldrsh r0, [r7, r1] bl __floatsisf mov r9, r0 - ldr r0, _08143E94 + ldr r0, =0x085b6348 mov r10, r0 - ldr r1, _08143E98 + ldr r1, =0x0203ab88 mov r8, r1 ldr r0, [r1] ldrb r4, [r0, 0x4] @@ -663645,8 +641661,7 @@ _08143E3C: bl __divsf3 b _08143EFC .align 2, 0 -_08143E94: .4byte 0x085b6348 -_08143E98: .4byte 0x0203ab88 + .pool _08143E9C: movs r1, 0x2E ldrsh r0, [r7, r1] @@ -663656,9 +641671,9 @@ _08143E9C: ldrsh r0, [r7, r1] bl __floatsisf mov r9, r0 - ldr r0, _08143F90 + ldr r0, =0x085b6348 mov r10, r0 - ldr r1, _08143F94 + ldr r1, =0x0203ab88 mov r8, r1 ldr r0, [r1] ldrb r4, [r0, 0x4] @@ -663714,7 +641729,7 @@ _08143EFC: adds r1, r5, 0 bl __mulsf3 adds r1, r0, 0 - ldr r0, _08143F98 + ldr r0, =0x40000000 bl __divsf3 adds r1, r0, 0 adds r0, r4, 0 @@ -663724,7 +641739,7 @@ _08143EFC: str r0, [r1] adds r1, r6, 0 adds r1, 0x8C - ldr r0, _08143F9C + ldr r0, =0x00000000 str r0, [r1] adds r2, r7, 0 adds r2, 0x2C @@ -663746,7 +641761,7 @@ _08143EFC: negs r1, r1 ands r0, r1 strb r0, [r3] - ldr r0, _08143FA0 + ldr r0, =sub_8143CFC + 1 str r0, [r7, 0x1C] strh r2, [r7, 0x32] _08143F80: @@ -663758,11 +641773,7 @@ _08143F80: pop {r0} bx r0 .align 2, 0 -_08143F90: .4byte 0x085b6348 -_08143F94: .4byte 0x0203ab88 -_08143F98: .4byte 0x40000000 -_08143F9C: .4byte 0x00000000 -_08143FA0: .4byte sub_8143CFC + 1 + .pool thumb_func_end sub_8143E14 thumb_func_start sub_8143FA4 @@ -663773,7 +641784,7 @@ sub_8143FA4: @ 8143FA4 ldrsh r0, [r5, r1] bl __floatsisf adds r4, r0, 0 - ldr r1, _08144044 + ldr r1, =0x3d4ccccd bl __mulsf3 adds r1, r4, 0 bl __mulsf3 @@ -663791,7 +641802,7 @@ sub_8143FA4: @ 8143FA4 lsls r0, r1, 16 cmp r0, 0 blt _0814403E - ldr r4, _08144048 + ldr r4, =0x0203ab88 ldr r0, [r4] adds r0, 0x7D movs r1, 0xFF @@ -663826,7 +641837,7 @@ sub_8143FA4: @ 8143FA4 lsls r1, 1 adds r1, 0xF strh r1, [r5, 0x3A] - ldr r0, _0814404C + ldr r0, =sub_8143C90 + 1 str r0, [r5, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange @@ -663840,9 +641851,7 @@ _0814403E: pop {r0} bx r0 .align 2, 0 -_08144044: .4byte 0x3d4ccccd -_08144048: .4byte 0x0203ab88 -_0814404C: .4byte sub_8143C90 + 1 + .pool thumb_func_end sub_8143FA4 thumb_func_start sub_8144050 @@ -663863,8 +641872,8 @@ sub_8144050: @ 8144050 asrs r0, 16 cmp r0, 0x2D bne _0814411E - ldr r2, _08144090 - ldr r0, _08144094 + ldr r2, =0x02020630 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x73 ldrb r1, [r0] @@ -663879,8 +641888,7 @@ sub_8144050: @ 8144050 strh r4, [r3, 0x26] b _0814411E .align 2, 0 -_08144090: .4byte 0x02020630 -_08144094: .4byte 0x0203ab88 + .pool _08144098: lsls r0, r1, 16 asrs r0, 16 @@ -663888,8 +641896,8 @@ _08144098: ldrsh r1, [r3, r2] cmp r0, r1 bge _081440E4 - ldr r2, _081440D4 - ldr r0, _081440D8 + ldr r2, =0x02020630 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x73 ldrb r1, [r0] @@ -663913,8 +641921,7 @@ _08144098: strh r0, [r3, 0x26] b _0814411E .align 2, 0 -_081440D4: .4byte 0x02020630 -_081440D8: .4byte 0x0203ab88 + .pool _081440DC: ldrh r0, [r3, 0x26] subs r0, 0x1 @@ -663945,7 +641952,7 @@ _081440E4: mov r1, r12 strb r0, [r1] strh r2, [r3, 0x32] - ldr r0, _08144124 + ldr r0, =sub_8143FA4 + 1 str r0, [r3, 0x1C] movs r0, 0x3D bl m4aSongNumStart @@ -663954,7 +641961,7 @@ _0814411E: pop {r0} bx r0 .align 2, 0 -_08144124: .4byte sub_8143FA4 + 1 + .pool thumb_func_end sub_8144050 thumb_func_start sub_8144128 @@ -663983,7 +641990,7 @@ _0814414C: cmp r0, 0 beq _0814415C _08144154: - ldr r0, _08144164 + ldr r0, =sub_8144050 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x32] @@ -663992,7 +641999,7 @@ _0814415C: pop {r0} bx r0 .align 2, 0 -_08144164: .4byte sub_8144050 + 1 + .pool thumb_func_end sub_8144128 thumb_func_start sub_8144168 @@ -664000,7 +642007,7 @@ sub_8144168: @ 8144168 push {r4,lr} adds r4, r0, 0 bl sub_8143B84 - ldr r0, _0814418C + ldr r0, =0x0203ab88 ldr r0, [r0] ldrb r0, [r0, 0x3] lsls r0, 27 @@ -664012,22 +642019,21 @@ sub_8144168: @ 8144168 _08144182: adds r0, r4, 0 bl sub_81446DC - ldr r0, _08144190 + ldr r0, =sub_8143E14 + 1 b _0814419C .align 2, 0 -_0814418C: .4byte 0x0203ab88 -_08144190: .4byte sub_8143E14 + 1 + .pool _08144194: adds r0, r4, 0 bl sub_81448B8 - ldr r0, _081441A4 + ldr r0, =sub_8144128 + 1 _0814419C: str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081441A4: .4byte sub_8144128 + 1 + .pool thumb_func_end sub_8144168 thumb_func_start prev_quest_read_x24_hm_usage @@ -664042,11 +642048,11 @@ prev_quest_read_x24_hm_usage: @ 81441A8 asrs r0, 16 cmp r0, 0xF bne _081441CE - ldr r0, _08144238 + ldr r0, =0x0203ab88 ldr r4, [r0] adds r4, 0x98 ldr r0, [r4] - ldr r1, _0814423C + ldr r1, =0xbf800000 bl __mulsf3 str r0, [r4] _081441CE: @@ -664058,7 +642064,7 @@ _081441CE: ldrsh r0, [r5, r1] cmp r0, 0 bne _08144244 - ldr r2, _08144238 + ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x7D movs r1, 0xFF @@ -664093,15 +642099,13 @@ _081441CE: lsls r1, 1 adds r1, 0xF strh r1, [r5, 0x3A] - ldr r0, _08144240 + ldr r0, =sub_8143C90 + 1 str r0, [r5, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange b _0814425C .align 2, 0 -_08144238: .4byte 0x0203ab88 -_0814423C: .4byte 0xbf800000 -_08144240: .4byte sub_8143C90 + 1 + .pool _08144244: adds r0, r5, 0 adds r0, 0x2C @@ -664130,8 +642134,8 @@ sub_8144264: @ 8144264 strh r0, [r6, 0x32] adds r0, r6, 0 bl sub_8143B14 - ldr r1, _081442F0 - ldr r4, _081442F4 + ldr r1, =0x085b62e4 + ldr r4, =0x0203ab88 ldr r2, [r4] adds r0, r2, 0 adds r0, 0x7E @@ -664178,15 +642182,13 @@ sub_8144264: @ 8144264 lsls r1, 1 adds r1, 0xF strh r1, [r6, 0x3A] - ldr r0, _081442F8 + ldr r0, =sub_8143C90 + 1 str r0, [r6, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange b _081443F8 .align 2, 0 -_081442F0: .4byte 0x085b62e4 -_081442F4: .4byte 0x0203ab88 -_081442F8: .4byte sub_8143C90 + 1 + .pool _081442FC: movs r0, 0x38 bl m4aSongNumStart @@ -664200,7 +642202,7 @@ _081442FC: ldr r4, [r4] adds r1, r4, 0 adds r1, 0x8C - ldr r0, _08144338 + ldr r0, =0x00000000 str r0, [r1] adds r0, r4, 0 adds r0, 0x7E @@ -664213,16 +642215,15 @@ _081442FC: adds r1, r4, 0 adds r1, 0x7F strb r0, [r1] - ldr r5, _0814433C + ldr r5, =0x085b6348 b _08144378 .align 2, 0 -_08144338: .4byte 0x00000000 -_0814433C: .4byte 0x085b6348 + .pool _08144340: ldr r7, [r4] adds r4, r7, 0 adds r4, 0x8C - ldr r5, _081443A0 + ldr r5, =0x085b6348 ldrb r0, [r7, 0x4] lsls r0, 30 lsrs r0, 25 @@ -664246,11 +642247,11 @@ _08144340: adds r0, 0x7F strb r4, [r0] _08144378: - ldr r0, _081443A4 + ldr r0, =0x085b62e4 lsls r1, r2, 3 adds r0, 0x4 adds r1, r0 - ldr r2, _081443A8 + ldr r2, =0x0203ab88 ldr r3, [r2] ldr r1, [r1] ldr r0, [r3, 0x8] @@ -664267,9 +642268,7 @@ _08144378: strh r0, [r6, 0x32] b _081443E8 .align 2, 0 -_081443A0: .4byte 0x085b6348 -_081443A4: .4byte 0x085b62e4 -_081443A8: .4byte 0x0203ab88 + .pool _081443AC: strh r1, [r6, 0x2E] ldrb r1, [r3, 0x4] @@ -664294,22 +642293,22 @@ _081443C4: beq _081443E0 adds r1, r3, 0 adds r1, 0x8C - ldr r0, _081443DC + ldr r0, =0x3f000000 b _081443E6 .align 2, 0 -_081443DC: .4byte 0x3f000000 + .pool _081443E0: adds r1, r3, 0 adds r1, 0x8C - ldr r0, _08144404 + ldr r0, =0xbfc00000 _081443E6: str r0, [r1] _081443E8: ldr r0, [r2] adds r0, 0x98 - ldr r1, _08144408 + ldr r1, =0x3dae147b str r1, [r0] - ldr r0, _0814440C + ldr r0, =prev_quest_read_x24_hm_usage + 1 str r0, [r6, 0x1C] movs r0, 0x5 strh r0, [r6, 0x30] @@ -664320,9 +642319,7 @@ _081443F8: pop {r0} bx r0 .align 2, 0 -_08144404: .4byte 0xbfc00000 -_08144408: .4byte 0x3dae147b -_0814440C: .4byte prev_quest_read_x24_hm_usage + 1 + .pool thumb_func_end sub_8144264 thumb_func_start sub_8144410 @@ -664333,11 +642330,11 @@ sub_8144410: @ 8144410 push {r6,r7} adds r6, r0, 0 bl sub_8143B84 - ldr r4, _081444A4 + ldr r4, =0x0203ab88 ldr r0, [r4] adds r0, 0x8C ldr r0, [r0] - ldr r1, _081444A8 + ldr r1, =0x3f000000 bl __gtsf2 cmp r0, 0 bgt _081444FA @@ -664351,12 +642348,12 @@ sub_8144410: @ 8144410 ldr r2, [r4] adds r1, r2, 0 adds r1, 0x90 - ldr r0, _081444AC + ldr r0, =0x00000000 str r0, [r1] movs r0, 0x8C adds r0, r2 mov r8, r0 - ldr r1, _081444B0 + ldr r1, =0x085b6348 mov r9, r1 ldrb r0, [r2, 0x4] lsls r7, r0, 30 @@ -664369,7 +642366,7 @@ sub_8144410: @ 8144410 adds r5, r0, 0 cmp r4, 0 bge _08144476 - ldr r1, _081444B4 + ldr r1, =0x43800000 bl __addsf3 adds r5, r0, 0 _08144476: @@ -664389,22 +642386,17 @@ _08144476: str r0, [r1] movs r0, 0x4 strh r0, [r6, 0x30] - ldr r0, _081444B8 + ldr r0, =sub_8144264 + 1 str r0, [r6, 0x1C] b _081444FA .align 2, 0 -_081444A4: .4byte 0x0203ab88 -_081444A8: .4byte 0x3f000000 -_081444AC: .4byte 0x00000000 -_081444B0: .4byte 0x085b6348 -_081444B4: .4byte 0x43800000 -_081444B8: .4byte sub_8144264 + 1 + .pool _081444BC: ldr r4, [r4] adds r7, r4, 0 adds r7, 0x90 ldr r0, [r7] - ldr r6, _08144508 + ldr r6, =0x00000000 adds r1, r6, 0 bl __nesf2 cmp r0, 0 @@ -664421,8 +642413,8 @@ _081444BC: adds r4, 0x98 ldr r0, [r4] bl __extendsfdf2 - ldr r2, _0814450C - ldr r3, _08144510 + ldr r2, =0x3ff33333 + ldr r3, =0x33333333 bl __divdf3 bl __truncdfsf2 str r0, [r4] @@ -664434,9 +642426,7 @@ _081444FA: pop {r0} bx r0 .align 2, 0 -_08144508: .4byte 0x00000000 -_0814450C: .4byte 0x3ff33333 -_08144510: .4byte 0x33333333 + .pool thumb_func_end sub_8144410 thumb_func_start sub_8144514 @@ -664446,12 +642436,12 @@ sub_8144514: @ 8144514 push {r7} adds r6, r0, 0 bl sub_8143B84 - ldr r0, _081445C4 + ldr r0, =0x0203ab88 ldr r5, [r0] adds r0, r5, 0 adds r0, 0x94 ldr r0, [r0] - ldr r1, _081445C8 + ldr r1, =0x42200000 bl __gtsf2 cmp r0, 0 bgt _081445B8 @@ -664467,11 +642457,11 @@ sub_8144514: @ 8144514 adds r2, r0, 0 cmp r4, 0 bge _08144556 - ldr r1, _081445CC + ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 _08144556: - ldr r0, _081445D0 + ldr r0, =0x40800000 adds r1, r2, 0 bl __divsf3 bl __negsf2 @@ -664488,7 +642478,7 @@ _08144556: adds r2, r0, 0 cmp r4, 0 bge _08144586 - ldr r1, _081445CC + ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 _08144586: @@ -664513,7 +642503,7 @@ _08144586: strb r0, [r2] movs r0, 0x3 strh r0, [r6, 0x30] - ldr r0, _081445D4 + ldr r0, =sub_8144410 + 1 str r0, [r6, 0x1C] _081445B8: pop {r3} @@ -664522,11 +642512,7 @@ _081445B8: pop {r0} bx r0 .align 2, 0 -_081445C4: .4byte 0x0203ab88 -_081445C8: .4byte 0x42200000 -_081445CC: .4byte 0x47800000 -_081445D0: .4byte 0x40800000 -_081445D4: .4byte sub_8144410 + 1 + .pool thumb_func_end sub_8144514 thumb_func_start sub_81445D8 @@ -664536,11 +642522,11 @@ sub_81445D8: @ 81445D8 push {r7} adds r6, r0, 0 bl sub_8143B84 - ldr r4, _08144694 + ldr r4, =0x0203ab88 ldr r0, [r4] adds r0, 0x94 ldr r0, [r0] - ldr r1, _08144698 + ldr r1, =0x42700000 bl __gtsf2 cmp r0, 0 bgt _0814468A @@ -664559,11 +642545,11 @@ sub_81445D8: @ 81445D8 adds r2, r0, 0 cmp r4, 0 bge _08144620 - ldr r1, _0814469C + ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 _08144620: - ldr r0, _081446A0 + ldr r0, =0x41a00000 adds r1, r2, 0 bl __divsf3 bl __negsf2 @@ -664575,7 +642561,7 @@ _08144620: adds r0, r5, 0 adds r0, 0x8C ldr r1, [r0] - ldr r0, _081446A4 + ldr r0, =0x3f800000 bl __subsf3 adds r5, r0, 0 movs r1, 0 @@ -664585,7 +642571,7 @@ _08144620: adds r2, r0, 0 cmp r4, 0 bge _0814465C - ldr r1, _0814469C + ldr r1, =0x47800000 bl __addsf3 adds r2, r0, 0 _0814465C: @@ -664609,7 +642595,7 @@ _0814465C: strb r0, [r2] movs r0, 0x2 strh r0, [r6, 0x30] - ldr r0, _081446A8 + ldr r0, =sub_8144514 + 1 str r0, [r6, 0x1C] _0814468A: pop {r3} @@ -664618,12 +642604,7 @@ _0814468A: pop {r0} bx r0 .align 2, 0 -_08144694: .4byte 0x0203ab88 -_08144698: .4byte 0x42700000 -_0814469C: .4byte 0x47800000 -_081446A0: .4byte 0x41a00000 -_081446A4: .4byte 0x3f800000 -_081446A8: .4byte sub_8144514 + 1 + .pool thumb_func_end sub_81445D8 thumb_func_start sub_81446AC @@ -664643,13 +642624,13 @@ sub_81446AC: @ 81446AC negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _081446D8 + ldr r0, =sub_81445D8 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081446D8: .4byte sub_81445D8 + 1 + .pool thumb_func_end sub_81446AC thumb_func_start sub_81446DC @@ -664661,7 +642642,7 @@ sub_81446DC: @ 81446DC push {r5-r7} sub sp, 0x8 mov r8, r0 - ldr r1, _0814489C + ldr r1, =0x085b7b0a mov r0, sp movs r2, 0x8 bl memcpy @@ -664671,8 +642652,8 @@ sub_81446DC: @ 81446DC lsls r0, 16 lsrs r0, 16 mov r9, r0 - ldr r5, _081448A0 - ldr r0, _081448A4 + ldr r5, =0x0203ab88 + ldr r0, =0x085b79f8 movs r2, 0xC negs r2, r2 movs r1, 0x24 @@ -664681,7 +642662,7 @@ sub_81446DC: @ 81446DC ldr r1, [r5] adds r1, 0x73 strb r0, [r1] - ldr r4, _081448A8 + ldr r4, =0x085b7abc mov r3, r8 movs r0, 0x2E ldrsh r2, [r3, r0] @@ -664710,7 +642691,7 @@ sub_81446DC: @ 81446DC ldr r1, [r5] adds r1, 0x75 strb r0, [r1] - ldr r3, _081448AC + ldr r3, =0x02020630 ldr r0, [r5] adds r0, 0x75 ldrb r1, [r0] @@ -664727,7 +642708,7 @@ sub_81446DC: @ 81446DC strb r1, [r0, 0x1] movs r7, 0 adds r6, r3, 0 - ldr r0, _081448B0 + ldr r0, =0x085b6348 mov r12, r0 mov r10, r5 _0814477C: @@ -664841,14 +642822,14 @@ _0814477C: lsrs r1, 25 add r1, r12 ldrb r0, [r1, 0x2] - ldr r1, _081448B4 + ldr r1, =0x0000ffff adds r0, r1 adds r3, r0 strh r3, [r2, 0x34] adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _081448AC + ldr r2, =0x02020630 cmp r7, 0x2 bls _0814477C mov r3, r10 @@ -664876,13 +642857,7 @@ _0814477C: pop {r0} bx r0 .align 2, 0 -_0814489C: .4byte 0x085b7b0a -_081448A0: .4byte 0x0203ab88 -_081448A4: .4byte 0x085b79f8 -_081448A8: .4byte 0x085b7abc -_081448AC: .4byte 0x02020630 -_081448B0: .4byte 0x085b6348 -_081448B4: .4byte 0x0000ffff + .pool thumb_func_end sub_81446DC thumb_func_start sub_81448B8 @@ -664895,7 +642870,7 @@ sub_81448B8: @ 81448B8 adds r7, r0, 0 movs r0, 0 mov r8, r0 - ldr r1, _08144A0C + ldr r1, =0x085b7b12 mov r0, sp movs r2, 0x8 bl memcpy @@ -664904,7 +642879,7 @@ sub_81448B8: @ 81448B8 lsls r0, 16 lsrs r0, 16 mov r9, r0 - ldr r0, _08144A10 + ldr r0, =0x085b7a10 movs r1, 0x2E ldrsh r2, [r7, r1] lsls r2, 2 @@ -664919,7 +642894,7 @@ sub_81448B8: @ 81448B8 ldrsh r2, [r2, r3] movs r3, 0x32 bl obj_add_from_template_forward_search - ldr r5, _08144A14 + ldr r5, =0x0203ab88 ldr r1, [r5] adds r1, 0x73 strb r0, [r1] @@ -664929,13 +642904,13 @@ sub_81448B8: @ 81448B8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, _08144A18 + ldr r6, =0x02020630 adds r0, r6 ldrh r1, [r7, 0x2E] lsls r1, 24 lsrs r1, 24 bl obj_anim_image_start - ldr r0, _08144A1C + ldr r0, =0x085b7aec movs r1, 0x2E ldrsh r2, [r7, r1] lsls r2, 2 @@ -664978,7 +642953,7 @@ sub_81448B8: @ 81448B8 mov r0, r9 lsls r2, r0, 16 asrs r2, 16 - ldr r3, _08144A20 + ldr r3, =0x085b6348 ldr r0, [r5] ldrb r1, [r0, 0x4] lsls r1, 30 @@ -664993,7 +642968,7 @@ sub_81448B8: @ 81448B8 adds r2, r0 strh r2, [r7, 0x3C] _08144992: - ldr r0, _08144A14 + ldr r0, =0x0203ab88 ldr r4, [r0] mov r1, r8 adds r2, r4, r1 @@ -665054,12 +643029,7 @@ _08144992: pop {r0} bx r0 .align 2, 0 -_08144A0C: .4byte 0x085b7b12 -_08144A10: .4byte 0x085b7a10 -_08144A14: .4byte 0x0203ab88 -_08144A18: .4byte 0x02020630 -_08144A1C: .4byte 0x085b7aec -_08144A20: .4byte 0x085b6348 + .pool thumb_func_end sub_81448B8 thumb_func_start sub_8144A24 @@ -665084,7 +643054,7 @@ sub_8144A24: @ 8144A24 lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x10] - ldr r3, _08144B10 + ldr r3, =0x0203ab88 ldr r0, [r3] adds r0, 0x7D movs r5, 0x1 @@ -665113,11 +643083,11 @@ sub_8144A24: @ 8144A24 str r0, [r4] adds r1, r6, 0 adds r1, 0x98 - ldr r0, _08144B14 + ldr r0, =0x00000000 str r0, [r1] adds r2, r6, 0 adds r2, 0x8C - ldr r1, _08144B18 + ldr r1, =0x085b6348 ldrb r0, [r6, 0x4] lsls r0, 30 lsrs r0, 25 @@ -665164,7 +643134,7 @@ _08144AD6: cmp r5, 0x3 bls _08144ACA _08144AEC: - ldr r0, _08144B10 + ldr r0, =0x0203ab88 ldr r0, [r0] ldrb r1, [r0, 0x3] movs r0, 0x1F @@ -665182,13 +643152,11 @@ _08144AEC: bl cry_related b _08144B70 .align 2, 0 -_08144B10: .4byte 0x0203ab88 -_08144B14: .4byte 0x00000000 -_08144B18: .4byte 0x085b6348 + .pool _08144B1C: movs r0, 0x1 strh r0, [r7, 0x2E] - ldr r0, _08144B34 + ldr r0, =0x0203ab88 ldr r2, [r0] ldrb r1, [r2, 0x3] movs r0, 0x20 @@ -665199,11 +643167,11 @@ _08144B1C: strb r0, [r2, 0x3] b _08144AEC .align 2, 0 -_08144B34: .4byte 0x0203ab88 + .pool _08144B38: lsrs r0, r5, 1 strh r0, [r7, 0x2E] - ldr r0, _08144B54 + ldr r0, =0x0203ab88 ldr r3, [r0] movs r1, 0x1 ands r1, r5 @@ -665215,7 +643183,7 @@ _08144B38: strb r0, [r3, 0x3] b _08144AEC .align 2, 0 -_08144B54: .4byte 0x0203ab88 + .pool _08144B58: movs r0, 0x98 lsls r0, 1 @@ -665231,7 +643199,7 @@ _08144B64: _08144B70: movs r0, 0x2 mov r10, r0 - ldr r4, _08144BA4 + ldr r4, =0x0203ab88 ldr r5, [r4] adds r0, r5, 0 adds r0, 0x7F @@ -665255,7 +643223,7 @@ _08144B70: adds r0, 0x6 b _08144BAC .align 2, 0 -_08144BA4: .4byte 0x0203ab88 + .pool _08144BA8: mov r0, r8 add r0, r10 @@ -665266,12 +643234,12 @@ _08144BAC: mov r5, r10 cmp r5, r8 bcs _08144C18 - ldr r1, _08144C40 + ldr r1, =0x085b6160 mov r10, r1 _08144BBC: ldr r3, [r4] lsls r0, r6, 3 - ldr r1, _08144C44 + ldr r1, =0x085b62e8 adds r0, r1 ldr r1, [r3, 0x8] ldr r2, [r0] @@ -665337,8 +643305,7 @@ _08144C18: ldrh r0, [r0, 0xC] b _08144C54 .align 2, 0 -_08144C40: .4byte 0x085b6160 -_08144C44: .4byte 0x085b62e8 + .pool _08144C48: ldr r0, [sp, 0x10] mov r1, r9 @@ -665347,7 +643314,7 @@ _08144C48: ldrb r0, [r0] _08144C54: strh r0, [r7, 0x3C] - ldr r1, _08144C6C + ldr r1, =sub_8144168 + 1 str r1, [r7, 0x1C] add sp, 0x14 pop {r3-r5} @@ -665358,7 +643325,7 @@ _08144C54: pop {r0} bx r0 .align 2, 0 -_08144C6C: .4byte sub_8144168 + 1 + .pool thumb_func_end sub_8144A24 thumb_func_start sub_8144C70 @@ -665383,7 +643350,7 @@ sub_8144C70: @ 8144C70 negs r1, r1 cmp r0, r1 bge _08144CC0 - ldr r4, _08144CC8 + ldr r4, =0x0203ab88 ldr r3, [r4] ldrb r1, [r3, 0x3] movs r0, 0x40 @@ -665400,7 +643367,7 @@ _08144CAC: movs r0, 0 strb r0, [r1, 0x1] ldr r1, [r4] - ldr r0, _08144CCC + ldr r0, =0x085b7b1a ldrh r0, [r0] strh r0, [r1, 0x34] _08144CC0: @@ -665408,8 +643375,7 @@ _08144CC0: pop {r0} bx r0 .align 2, 0 -_08144CC8: .4byte 0x0203ab88 -_08144CCC: .4byte 0x085b7b1a + .pool thumb_func_end sub_8144C70 thumb_func_start sub_8144CD0 @@ -665417,7 +643383,7 @@ sub_8144CD0: @ 8144CD0 push {r4,lr} sub sp, 0x18 adds r4, r0, 0 - ldr r1, _08144D4C + ldr r1, =0x085b7b2e mov r0, sp movs r2, 0x18 bl memcpy @@ -665434,7 +643400,7 @@ sub_8144CD0: @ 8144CD0 ands r2, r0 cmp r2, 0 beq _08144D2E - ldr r3, _08144D50 + ldr r3, =0x02021bbe movs r0, 0x3C ldrsh r2, [r4, r0] lsls r2, 1 @@ -665477,14 +643443,13 @@ _08144D2E: strb r0, [r3] b _08144D7E .align 2, 0 -_08144D4C: .4byte 0x085b7b2e -_08144D50: .4byte 0x02021bbe + .pool _08144D54: - ldr r1, _08144D88 + ldr r1, =0x02021bbe movs r0, 0 strh r0, [r1] - ldr r2, _08144D8C - ldr r0, _08144D90 + ldr r2, =0x02020630 + ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x73 ldrb r1, [r0] @@ -665506,9 +643471,7 @@ _08144D7E: pop {r0} bx r0 .align 2, 0 -_08144D88: .4byte 0x02021bbe -_08144D8C: .4byte 0x02020630 -_08144D90: .4byte 0x0203ab88 + .pool thumb_func_end sub_8144CD0 thumb_func_start sub_8144D94 @@ -665522,15 +643485,15 @@ sub_8144D94: @ 8144D94 ldrsh r0, [r5, r1] bl __floatsisf adds r4, r0, 0 - ldr r1, _08144E44 + ldr r1, =0x3d1fbe77 bl __mulsf3 adds r1, r4, 0 bl __mulsf3 bl __fixsfsi strh r0, [r5, 0x26] - ldr r0, _08144E48 + ldr r0, =0x0203ab88 ldr r3, [r0] - ldr r2, _08144E4C + ldr r2, =0x085b7b1a ldrb r0, [r3, 0x1] subs r0, 0x1 lsrs r1, r0, 31 @@ -665552,9 +643515,9 @@ _08144DDC: ble _08144E3E movs r0, 0 strh r0, [r5, 0x30] - ldr r3, _08144E50 + ldr r3, =sub_8144C70 + 1 str r3, [r5, 0x1C] - ldr r2, _08144E54 + ldr r2, =0x02020630 movs r0, 0x3A ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -665570,7 +643533,7 @@ _08144DDC: adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _08144E58 + ldr r1, =0x0000fffe strh r1, [r0, 0x30] movs r0, 0x38 ldrsh r1, [r5, r0] @@ -665590,7 +643553,7 @@ _08144DDC: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08144E5C + ldr r1, =sub_8144CD0 + 1 str r1, [r0] movs r0, 0xD6 bl m4aSongNumStart @@ -665599,13 +643562,7 @@ _08144E3E: pop {r0} bx r0 .align 2, 0 -_08144E44: .4byte 0x3d1fbe77 -_08144E48: .4byte 0x0203ab88 -_08144E4C: .4byte 0x085b7b1a -_08144E50: .4byte sub_8144C70 + 1 -_08144E54: .4byte 0x02020630 -_08144E58: .4byte 0x0000fffe -_08144E5C: .4byte sub_8144CD0 + 1 + .pool thumb_func_end sub_8144D94 thumb_func_start sub_8144E60 @@ -665616,7 +643573,7 @@ sub_8144E60: @ 8144E60 ldrsh r0, [r4, r1] cmp r0, 0 bne _08144EE4 - ldr r0, _08144E8C + ldr r0, =0x0203ab88 ldr r3, [r0] ldr r1, [r3, 0x38] movs r2, 0x2E @@ -665625,7 +643582,7 @@ sub_8144E60: @ 8144E60 bne _08144E94 movs r0, 0x34 ldrsh r2, [r1, r0] - ldr r1, _08144E90 + ldr r1, =0x085b6348 ldrb r0, [r3, 0x4] lsls r0, 30 lsrs r0, 25 @@ -665633,12 +643590,11 @@ sub_8144E60: @ 8144E60 ldrh r0, [r0, 0x8] b _08144EA6 .align 2, 0 -_08144E8C: .4byte 0x0203ab88 -_08144E90: .4byte 0x085b6348 + .pool _08144E94: movs r0, 0x34 ldrsh r2, [r1, r0] - ldr r1, _08144ED8 + ldr r1, =0x085b6348 ldrb r0, [r3, 0x4] lsls r0, 30 lsrs r0, 25 @@ -665660,23 +643616,21 @@ _08144EA6: strh r0, [r4, 0x3C] movs r0, 0x2B bl m4aSongNumStart - ldr r2, _08144EDC + ldr r2, =0x0203ab88 ldr r1, [r2] movs r0, 0x1 strb r0, [r1, 0x1] ldr r1, [r2] - ldr r0, _08144EE0 + ldr r0, =0x085b7b1a ldrh r0, [r0] strh r0, [r1, 0x34] b _08144F7C .align 2, 0 -_08144ED8: .4byte 0x085b6348 -_08144EDC: .4byte 0x0203ab88 -_08144EE0: .4byte 0x085b7b1a + .pool _08144EE4: - ldr r5, _08144F24 + ldr r5, =0x0203ab88 ldr r3, [r5] - ldr r2, _08144F28 + ldr r2, =0x085b7b1a ldrb r0, [r3, 0x1] subs r0, 0x1 lsrs r1, r0, 31 @@ -665700,7 +643654,7 @@ _08144F06: bne _08144F30 movs r0, 0x34 ldrsh r2, [r1, r0] - ldr r1, _08144F2C + ldr r1, =0x085b6348 ldrb r0, [r3, 0x4] lsls r0, 30 lsrs r0, 25 @@ -665708,13 +643662,11 @@ _08144F06: ldrh r0, [r0, 0xA] b _08144F42 .align 2, 0 -_08144F24: .4byte 0x0203ab88 -_08144F28: .4byte 0x085b7b1a -_08144F2C: .4byte 0x085b6348 + .pool _08144F30: movs r0, 0x34 ldrsh r2, [r1, r0] - ldr r1, _08144F84 + ldr r1, =0x085b6348 ldrb r0, [r3, 0x4] lsls r0, 30 lsrs r0, 25 @@ -665724,7 +643676,7 @@ _08144F30: _08144F42: cmp r2, r0 bne _08144F7C - ldr r2, _08144F88 + ldr r2, =0x02020630 movs r0, 0x36 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -665733,7 +643685,7 @@ _08144F42: adds r1, r2, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08144F8C + ldr r1, =sub_8144D94 + 1 str r1, [r0] movs r0, 0x36 ldrsh r1, [r4, r0] @@ -665747,7 +643699,7 @@ _08144F42: negs r1, r1 ands r1, r2 strb r1, [r0] - ldr r0, _08144F90 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3C] @@ -665756,10 +643708,7 @@ _08144F7C: pop {r0} bx r0 .align 2, 0 -_08144F84: .4byte 0x085b6348 -_08144F88: .4byte 0x02020630 -_08144F8C: .4byte sub_8144D94 + 1 -_08144F90: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8144E60 thumb_func_start sub_8144F94 @@ -665794,7 +643743,7 @@ sub_8144FB0: @ 8144FB0 strh r0, [r4, 0x22] b _0814501C _08144FC8: - ldr r0, _08145024 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] adds r2, r4, 0 adds r2, 0x3E @@ -665811,8 +643760,8 @@ _08144FC8: bl m4aSongNumStop adds r0, r4, 0 bl obj_delete_and_free_tiles - ldr r5, _08145028 - ldr r4, _0814502C + ldr r5, =0x02020630 + ldr r4, =0x0203ab88 ldr r0, [r4] adds r0, 0x74 ldrb r1, [r0] @@ -665837,9 +643786,7 @@ _0814501C: pop {r0} bx r0 .align 2, 0 -_08145024: .4byte nullsub_12 + 1 -_08145028: .4byte 0x02020630 -_0814502C: .4byte 0x0203ab88 + .pool thumb_func_end sub_8144FB0 thumb_func_start sub_8145030 @@ -665898,7 +643845,7 @@ _08145088: _08145090: movs r0, 0x2B bl m4aSongNumStart - ldr r0, _081450CC + ldr r0, =0x0203ab88 ldr r0, [r0] ldr r0, [r0, 0x38] ldrh r1, [r0, 0x2E] @@ -665907,9 +643854,9 @@ _08145090: lsrs r1, 24 adds r0, r4, 0 bl obj_anim_image_start - ldr r0, _081450D0 + ldr r0, =sub_8144FB0 + 1 str r0, [r4, 0x1C] - ldr r2, _081450D4 + ldr r2, =0x02020630 movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -665926,9 +643873,7 @@ _081450C6: pop {r0} bx r0 .align 2, 0 -_081450CC: .4byte 0x0203ab88 -_081450D0: .4byte sub_8144FB0 + 1 -_081450D4: .4byte 0x02020630 + .pool thumb_func_end sub_8145030 thumb_func_start sub_81450D8 @@ -665936,12 +643881,12 @@ sub_81450D8: @ 81450D8 push {r4,r5,lr} sub sp, 0x14 adds r4, r0, 0 - ldr r1, _08145154 + ldr r1, =0x085b7b46 mov r0, sp movs r2, 0x2 bl memcpy add r5, sp, 0x4 - ldr r1, _08145158 + ldr r1, =0x085b7b48 adds r0, r5, 0 movs r2, 0x10 bl memcpy @@ -665952,7 +643897,7 @@ sub_81450D8: @ 81450D8 asrs r0, 16 cmp r0, 0x7 ble _0814516C - ldr r0, _0814515C + ldr r0, =0x0203ab88 ldr r0, [r0] ldr r0, [r0, 0x38] movs r1, 0x2E @@ -665977,30 +643922,25 @@ sub_81450D8: @ 81450D8 adds r4, r0 asrs r4, 1 negs r4, r4 - ldr r0, _08145160 - ldr r5, _08145164 + ldr r0, =0x030075f0 + ldr r5, =0x0000ffff lsls r4, 24 asrs r4, 24 adds r1, r5, 0 adds r2, r4, 0 bl MPlayPanpotControl - ldr r0, _08145168 + ldr r0, =0x03007630 adds r1, r5, 0 adds r2, r4, 0 bl MPlayPanpotControl b _08145208 .align 2, 0 -_08145154: .4byte 0x085b7b46 -_08145158: .4byte 0x085b7b48 -_0814515C: .4byte 0x0203ab88 -_08145160: .4byte 0x030075f0 -_08145164: .4byte 0x0000ffff -_08145168: .4byte 0x03007630 + .pool _0814516C: lsls r0, r1, 16 cmp r0, 0 blt _081451BC - ldr r0, _081451B8 + ldr r0, =0x0203ab88 ldr r0, [r0] ldr r0, [r0, 0x38] movs r2, 0x2E @@ -666036,11 +643976,11 @@ _0814516C: strh r0, [r4, 0x22] b _08145208 .align 2, 0 -_081451B8: .4byte 0x0203ab88 + .pool _081451BC: movs r0, 0x5E bl m4aSongNumStartOrChange - ldr r0, _081451DC + ldr r0, =0x0203ab88 ldr r0, [r0] ldr r0, [r0, 0x38] movs r2, 0x2E @@ -666053,7 +643993,7 @@ _081451BC: bl cry_related b _081451EC .align 2, 0 -_081451DC: .4byte 0x0203ab88 + .pool _081451E0: movs r0, 0x98 lsls r0, 1 @@ -666061,7 +644001,7 @@ _081451E0: negs r1, r1 bl cry_related _081451EC: - ldr r0, _08145210 + ldr r0, =0x0203ab88 ldr r0, [r0] ldr r0, [r0, 0x38] ldrh r1, [r0, 0x2E] @@ -666072,7 +644012,7 @@ _081451EC: bl obj_anim_image_start movs r0, 0x2D strh r0, [r4, 0x30] - ldr r0, _08145214 + ldr r0, =sub_8145030 + 1 str r0, [r4, 0x1C] _08145208: add sp, 0x14 @@ -666080,8 +644020,7 @@ _08145208: pop {r0} bx r0 .align 2, 0 -_08145210: .4byte 0x0203ab88 -_08145214: .4byte sub_8145030 + 1 + .pool thumb_func_end sub_81450D8 thumb_func_start sub_8145218 @@ -666089,7 +644028,7 @@ sub_8145218: @ 8145218 push {r4,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r1, _08145278 + ldr r1, =0x085b7b46 mov r0, sp movs r2, 0x2 bl memcpy @@ -666099,7 +644038,7 @@ sub_8145218: @ 8145218 lsls r0, 16 cmp r0, 0 blt _08145284 - ldr r0, _0814527C + ldr r0, =0x0203ab88 ldr r0, [r0] ldr r0, [r0, 0x38] movs r1, 0x2E @@ -666112,7 +644051,7 @@ sub_8145218: @ 8145218 ldrh r2, [r4, 0x20] adds r0, r2 strh r0, [r4, 0x20] - ldr r1, _08145280 + ldr r1, =0x02020630 movs r2, 0x3A ldrsh r0, [r4, r2] lsls r2, r0, 4 @@ -666133,11 +644072,9 @@ sub_8145218: @ 8145218 strb r0, [r2] b _08145288 .align 2, 0 -_08145278: .4byte 0x085b7b46 -_0814527C: .4byte 0x0203ab88 -_08145280: .4byte 0x02020630 + .pool _08145284: - ldr r0, _08145290 + ldr r0, =sub_8144F94 + 1 str r0, [r4, 0x1C] _08145288: add sp, 0x4 @@ -666145,14 +644082,14 @@ _08145288: pop {r0} bx r0 .align 2, 0 -_08145290: .4byte sub_8144F94 + 1 + .pool thumb_func_end sub_8145218 thumb_func_start sub_8145294 sub_8145294: @ 8145294 push {r4,lr} adds r4, r0, 0 - ldr r0, _081452D0 + ldr r0, =0x0203ab88 ldr r3, [r0] ldr r1, [r3, 0x38] movs r2, 0x2E @@ -666161,7 +644098,7 @@ sub_8145294: @ 8145294 bne _081452DC movs r0, 0x34 ldrsh r2, [r1, r0] - ldr r1, _081452D4 + ldr r1, =0x085b6348 ldrb r0, [r3, 0x4] lsls r0, 30 lsrs r0, 25 @@ -666170,7 +644107,7 @@ sub_8145294: @ 8145294 adds r0, 0x5A cmp r2, r0 bne _0814533E - ldr r2, _081452D8 + ldr r2, =0x02020630 movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -666180,13 +644117,11 @@ sub_8145294: @ 8145294 movs r3, 0x34 b _08145306 .align 2, 0 -_081452D0: .4byte 0x0203ab88 -_081452D4: .4byte 0x085b6348 -_081452D8: .4byte 0x02020630 + .pool _081452DC: movs r0, 0x34 ldrsh r2, [r1, r0] - ldr r1, _08145344 + ldr r1, =0x085b6348 ldrb r0, [r3, 0x4] lsls r0, 30 lsrs r0, 25 @@ -666197,7 +644132,7 @@ _081452DC: adds r0, r1 cmp r2, r0 bne _0814533E - ldr r2, _08145348 + ldr r2, =0x02020630 movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -666221,7 +644156,7 @@ _08145306: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _0814534C + ldr r1, =sub_8145218 + 1 str r1, [r0] movs r0, 0x36 ldrsh r1, [r4, r0] @@ -666229,7 +644164,7 @@ _08145306: adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _08145350 + ldr r1, =sub_81450D8 + 1 str r1, [r0] movs r0, 0x2B bl m4aSongNumStart @@ -666238,10 +644173,7 @@ _0814533E: pop {r0} bx r0 .align 2, 0 -_08145344: .4byte 0x085b6348 -_08145348: .4byte 0x02020630 -_0814534C: .4byte sub_8145218 + 1 -_08145350: .4byte sub_81450D8 + 1 + .pool thumb_func_end sub_8145294 thumb_func_start sub_8145354 @@ -666254,7 +644186,7 @@ sub_8145354: @ 8145354 lsrs r7, r1, 24 movs r0, 0 mov r8, r0 - ldr r0, _08145378 + ldr r0, =0x030061ec ldrb r0, [r0] cmp r0, 0x1 beq _081453F8 @@ -666264,20 +644196,20 @@ sub_8145354: @ 8145354 beq _08145382 b _0814544A .align 2, 0 -_08145378: .4byte 0x030061ec + .pool _0814537C: cmp r0, 0x2 beq _08145434 b _0814544A _08145382: - ldr r5, _081453EC + ldr r5, =0x0203ab90 ldr r0, [r5] cmp r0, 0 bne _0814539E movs r0, 0x1C bl malloc_and_clear str r0, [r5] - ldr r4, _081453F0 + ldr r4, =0x0203ab94 adds r0, r7, 0 movs r1, 0x7 bl Window_GetField @@ -666310,7 +644242,7 @@ _0814539E: movs r4, 0 _081453D2: adds r0, r7, 0 - ldr r1, _081453F4 + ldr r1, =0x085b8c10 movs r2, 0x20 adds r3, r4, 0 bl Window_CopyToPixels @@ -666321,12 +644253,10 @@ _081453D2: bls _081453D2 b _08145420 .align 2, 0 -_081453EC: .4byte 0x0203ab90 -_081453F0: .4byte 0x0203ab94 -_081453F4: .4byte 0x085b8c10 + .pool _081453F8: movs r4, 0 - ldr r1, _0814542C + ldr r1, =0x0203ab90 ldr r0, [r1] ldrb r0, [r0, 0x16] lsls r0, 3 @@ -666346,18 +644276,17 @@ _08145408: cmp r4, r0 blt _08145408 _08145420: - ldr r1, _08145430 + ldr r1, =0x030061ec ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _0814544A .align 2, 0 -_0814542C: .4byte 0x0203ab90 -_08145430: .4byte 0x030061ec + .pool _08145434: adds r0, r7, 0 bl sub_8145814 - ldr r0, _08145458 + ldr r0, =0x085b8bf0 ldrb r1, [r6, 0x3] lsls r1, 4 movs r2, 0x20 @@ -666372,7 +644301,7 @@ _0814544A: pop {r1} bx r1 .align 2, 0 -_08145458: .4byte 0x085b8bf0 + .pool thumb_func_end sub_8145354 thumb_func_start sub_814545C @@ -666385,7 +644314,7 @@ sub_814545C: @ 814545C bl sub_8145814 adds r0, r4, 0 bl sub_8145648 - ldr r2, _081454A0 + ldr r2, =0x0203ab90 ldr r1, [r2] ldrb r0, [r1, 0x1B] cmp r0, 0 @@ -666408,9 +644337,9 @@ _0814547E: bl sub_814560C b _0814552A .align 2, 0 -_081454A0: .4byte 0x0203ab90 + .pool _081454A4: - ldr r5, _081454B4 + ldr r5, =0x0203ab90 ldr r0, [r5] ldrb r0, [r0, 0x10] cmp r0, 0 @@ -666418,7 +644347,7 @@ _081454A4: bl sub_814560C b _0814552A .align 2, 0 -_081454B4: .4byte 0x0203ab90 + .pool _081454B8: cmp r0, 0x1 bne _081454C2 @@ -666442,7 +644371,7 @@ _081454DC: movs r0, 0x1 strb r0, [r1, 0x10] _081454E6: - ldr r5, _08145530 + ldr r5, =0x0203ab90 ldr r1, [r5] ldrb r4, [r1, 0x10] subs r4, 0x1 @@ -666479,7 +644408,7 @@ _0814552A: pop {r0} bx r0 .align 2, 0 -_08145530: .4byte 0x0203ab90 + .pool thumb_func_end sub_814545C thumb_func_start sub_8145534 @@ -666488,11 +644417,11 @@ sub_8145534: @ 8145534 lsls r0, 16 lsrs r4, r0, 16 adds r5, r4, 0 - ldr r0, _08145574 + ldr r0, =0x03007420 ldr r0, [r0, 0x4] cmp r0, 0 bge _08145582 - ldr r6, _08145578 + ldr r6, =0x0203ab90 ldr r1, [r6] ldrb r0, [r1, 0x1A] cmp r0, 0 @@ -666514,8 +644443,7 @@ sub_8145534: @ 8145534 strb r0, [r1, 0x1A] b _08145582 .align 2, 0 -_08145574: .4byte 0x03007420 -_08145578: .4byte 0x0203ab90 + .pool _0814557C: adds r0, r5, 0 bl sub_8145588 @@ -666534,31 +644462,30 @@ sub_8145588: @ 8145588 movs r2, 0x7D movs r3, 0xA bl sub_80A32C0 - ldr r0, _081455A4 + ldr r0, =0x0203ab90 ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x10] pop {r0} bx r0 .align 2, 0 -_081455A4: .4byte 0x0203ab90 + .pool thumb_func_end sub_8145588 thumb_func_start sub_81455A8 sub_81455A8: @ 81455A8 push {r4,lr} - ldr r3, _081455B8 + ldr r3, =0x03002f50 movs r0, 0 ldrsb r0, [r3, r0] cmp r0, 0x1 bgt _081455C0 - ldr r0, _081455BC + ldr r0, =0x030066d0 b _081455D8 .align 2, 0 -_081455B8: .4byte 0x03002f50 -_081455BC: .4byte 0x030066d0 + .pool _081455C0: - ldr r2, _08145604 + ldr r2, =0x03006380 ldrb r1, [r2, 0xB] movs r0, 0 ldrsb r0, [r3, r0] @@ -666575,7 +644502,7 @@ _081455D8: lsls r1, 3 adds r3, r0, r1 movs r2, 0 - ldr r4, _08145608 + ldr r4, =0x0203ab90 _081455E2: ldr r1, [r4] adds r1, r2 @@ -666595,14 +644522,13 @@ _081455E2: pop {r0} bx r0 .align 2, 0 -_08145604: .4byte 0x03006380 -_08145608: .4byte 0x0203ab90 + .pool thumb_func_end sub_81455A8 thumb_func_start sub_814560C sub_814560C: @ 814560C push {r4,lr} - ldr r4, _08145644 + ldr r4, =0x0203ab90 ldr r1, [r4] ldrb r0, [r1, 0x16] lsls r0, 3 @@ -666627,7 +644553,7 @@ sub_814560C: @ 814560C pop {r0} bx r0 .align 2, 0 -_08145644: .4byte 0x0203ab90 + .pool thumb_func_end sub_814560C thumb_func_start sub_8145648 @@ -666635,7 +644561,7 @@ sub_8145648: @ 8145648 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _081456A0 + ldr r4, =0x0203ab90 ldr r0, [r4] ldrb r1, [r0, 0x11] adds r0, r6, 0 @@ -666664,7 +644590,7 @@ _0814567E: lsls r3, 16 lsrs r3, 16 adds r0, r6, 0 - ldr r1, _081456A4 + ldr r1, =0x085b8c10 movs r2, 0x20 bl Window_CopyToPixels adds r0, r4, 0x1 @@ -666676,8 +644602,7 @@ _0814567E: pop {r0} bx r0 .align 2, 0 -_081456A0: .4byte 0x0203ab90 -_081456A4: .4byte 0x085b8c10 + .pool thumb_func_end sub_8145648 thumb_func_start sub_81456A8 @@ -666901,7 +644826,7 @@ sub_8145850: @ 8145850 lsrs r7, r1, 24 movs r0, 0 mov r8, r0 - ldr r6, _08145870 + ldr r6, =0x030061ec ldrb r0, [r6] cmp r0, 0 beq _08145874 @@ -666909,9 +644834,9 @@ sub_8145850: @ 8145850 beq _081458B0 b _081458F8 .align 2, 0 -_08145870: .4byte 0x030061ec + .pool _08145874: - ldr r5, _081458A4 + ldr r5, =0x0203ab98 ldr r0, [r5] cmp r0, 0 bne _08145884 @@ -666919,12 +644844,12 @@ _08145874: bl malloc_and_clear str r0, [r5] _08145884: - ldr r1, _081458A8 + ldr r1, =0x085b8438 adds r0, r7, 0 movs r2, 0 movs r3, 0 bl Window_CopyToPixels - ldr r0, _081458AC + ldr r0, =0x085b8418 ldrb r1, [r4, 0x3] lsls r1, 4 movs r2, 0x20 @@ -666934,15 +644859,13 @@ _08145884: strb r0, [r6] b _081458F8 .align 2, 0 -_081458A4: .4byte 0x0203ab98 -_081458A8: .4byte 0x085b8438 -_081458AC: .4byte 0x085b8418 + .pool _081458B0: - ldr r0, _08145904 + ldr r0, =0x085b8c80 bl gpu_tile_obj_alloc_and_load_multiple - ldr r0, _08145908 + ldr r0, =0x085b8c90 bl gpu_pal_obj_alloc_and_load_multiple - ldr r0, _0814590C + ldr r0, =0x085b8c68 ldrb r1, [r4, 0x4] lsls r1, 19 movs r2, 0xA0 @@ -666957,7 +644880,7 @@ _081458B0: asrs r2, 16 movs r3, 0x1 bl obj_add_from_template_forward_search - ldr r2, _08145910 + ldr r2, =0x0203ab98 ldr r3, [r2] lsls r0, 24 lsrs r0, 24 @@ -666979,17 +644902,14 @@ _081458F8: pop {r1} bx r1 .align 2, 0 -_08145904: .4byte 0x085b8c80 -_08145908: .4byte 0x085b8c90 -_0814590C: .4byte 0x085b8c68 -_08145910: .4byte 0x0203ab98 + .pool thumb_func_end sub_8145850 thumb_func_start sub_8145914 sub_8145914: @ 8145914 push {r4-r6,lr} - ldr r4, _08145960 - ldr r6, _08145964 + ldr r4, =0x02020630 + ldr r6, =0x0203ab98 ldr r0, [r6] ldrh r1, [r0, 0x4] lsls r0, r1, 4 @@ -667009,7 +644929,7 @@ sub_8145914: @ 8145914 lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r4, _08145968 + ldr r4, =0x0203ab90 ldr r0, [r4] bl free movs r5, 0 @@ -667021,9 +644941,7 @@ sub_8145914: @ 8145914 pop {r0} bx r0 .align 2, 0 -_08145960: .4byte 0x02020630 -_08145964: .4byte 0x0203ab98 -_08145968: .4byte 0x0203ab90 + .pool thumb_func_end sub_8145914 thumb_func_start sub_814596C @@ -667031,8 +644949,8 @@ sub_814596C: @ 814596C push {r4-r7,lr} sub sp, 0x14 adds r7, r0, 0 - ldr r3, _081459B4 - ldr r4, _081459B8 + ldr r3, =0x02020630 + ldr r4, =0x0203ab98 ldr r0, [r4] ldrh r1, [r0, 0x4] lsls r0, r1, 4 @@ -667054,7 +644972,7 @@ sub_814596C: @ 814596C adds r0, r3 movs r1, 0 strh r1, [r0, 0x6] - ldr r0, _081459BC + ldr r0, =0x0203ab90 ldr r0, [r0] ldrb r1, [r0, 0x10] cmp r1, 0x2 @@ -667065,9 +644983,7 @@ sub_814596C: @ 814596C beq _081459C6 b _08145A2E .align 2, 0 -_081459B4: .4byte 0x02020630 -_081459B8: .4byte 0x0203ab98 -_081459BC: .4byte 0x0203ab90 + .pool _081459C0: cmp r1, 0x6 beq _08145A20 @@ -667132,7 +645048,7 @@ _08145A20: _08145A2E: add r4, sp, 0xC _08145A30: - ldr r0, _08145A60 + ldr r0, =0x0203ab98 ldr r2, [r0] ldrb r5, [r2] movs r1, 0 @@ -667157,7 +645073,7 @@ _08145A30: ble _08145A82 b _08145A7A .align 2, 0 -_08145A60: .4byte 0x0203ab98 + .pool _08145A64: ldrb r0, [r2, 0x2] subs r0, r5, r0 @@ -667176,13 +645092,13 @@ _08145A7A: movs r0, 0 strb r0, [r1, 0x1] _08145A82: - ldr r2, _08145B18 + ldr r2, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r2 movs r1, 0x80 lsls r1, 1 orrs r0, r1 - ldr r1, _08145B1C + ldr r1, =0x0000ffff ands r0, r1 movs r1, 0x80 lsls r1, 17 @@ -667210,7 +645126,7 @@ _08145A82: str r0, [sp] movs r0, 0 bl rotscale_set_direct - ldr r2, _08145B20 + ldr r2, =0x08329f40 ldr r0, [r6] ldrb r0, [r0] lsls r0, 24 @@ -667251,9 +645167,7 @@ _08145B0A: pop {r0} bx r0 .align 2, 0 -_08145B18: .4byte 0xffff0000 -_08145B1C: .4byte 0x0000ffff -_08145B20: .4byte 0x08329f40 + .pool thumb_func_end sub_814596C thumb_func_start sub_8145B24 @@ -667273,7 +645187,7 @@ sub_8145B24: @ 8145B24 bhi _08145B40 movs r2, 0xE0 _08145B40: - ldr r1, _08145B50 + ldr r1, =0x0203ab98 ldr r0, [r1] strb r2, [r0, 0x1] ldr r1, [r1] @@ -667282,7 +645196,7 @@ _08145B40: pop {r0} bx r0 .align 2, 0 -_08145B50: .4byte 0x0203ab98 + .pool thumb_func_end sub_8145B24 thumb_func_start sub_8145B54 @@ -667290,12 +645204,12 @@ sub_8145B54: @ 8145B54 push {r4,lr} sub sp, 0xC adds r1, r0, 0 - ldr r0, _08145B9C + ldr r0, =0x02021cc4 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _08145BA0 - ldr r1, _08145BA4 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8dab adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -667303,7 +645217,7 @@ sub_8145B54: @ 8145B54 movs r2, 0x40 bl sub_81DB368 adds r3, r0, 0 - ldr r0, _08145BA8 + ldr r0, =0x0203ab9c ldrb r0, [r0] lsls r3, 24 lsrs r3, 24 @@ -667320,10 +645234,7 @@ sub_8145B54: @ 8145B54 pop {r0} bx r0 .align 2, 0 -_08145B9C: .4byte 0x02021cc4 -_08145BA0: .4byte 0x02021fc4 -_08145BA4: .4byte 0x085e8dab -_08145BA8: .4byte 0x0203ab9c + .pool thumb_func_end sub_8145B54 thumb_func_start sub_8145BAC @@ -667343,13 +645254,13 @@ sub_8145BAC: @ 8145BAC str r0, [sp, 0x4] movs r0, 0xF str r0, [sp, 0x8] - ldr r0, _08145C0C + ldr r0, =0x00000141 str r0, [sp, 0xC] add r0, sp, 0x10 movs r1, 0 adds r2, r4, 0 bl rbox_template_set - ldr r4, _08145C10 + ldr r4, =0x0203ab9c add r0, sp, 0x10 bl Window_AddFromTemplate strb r0, [r4] @@ -667371,14 +645282,13 @@ sub_8145BAC: @ 8145BAC pop {r0} bx r0 .align 2, 0 -_08145C0C: .4byte 0x00000141 -_08145C10: .4byte 0x0203ab9c + .pool thumb_func_end sub_8145BAC thumb_func_start sub_8145C14 sub_8145C14: @ 8145C14 push {r4,lr} - ldr r4, _08145C2C + ldr r4, =0x0203ab9c ldrb r0, [r4] movs r1, 0x1 bl sub_819746C @@ -667388,16 +645298,16 @@ sub_8145C14: @ 8145C14 pop {r0} bx r0 .align 2, 0 -_08145C2C: .4byte 0x0203ab9c + .pool thumb_func_end sub_8145C14 thumb_func_start sub_8145C30 sub_8145C30: @ 8145C30 - ldr r0, _08145C4C + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _08145C50 + ldr r0, =0x00000494 adds r1, r0 - ldr r0, _08145C54 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xAC ldr r0, [r0] @@ -667407,30 +645317,26 @@ sub_8145C30: @ 8145C30 lsrs r0, 16 bx lr .align 2, 0 -_08145C4C: .4byte 0x03005d8c -_08145C50: .4byte 0x00000494 -_08145C54: .4byte 0x03005d90 + .pool thumb_func_end sub_8145C30 thumb_func_start sub_8145C58 sub_8145C58: @ 8145C58 lsls r0, 16 lsrs r0, 16 - ldr r1, _08145C74 + ldr r1, =0x03005d8c ldr r2, [r1] - ldr r1, _08145C78 + ldr r1, =0x03005d90 ldr r1, [r1] adds r1, 0xAC ldr r1, [r1] eors r0, r1 - ldr r1, _08145C7C + ldr r1, =0x00000494 adds r2, r1 strh r0, [r2] bx lr .align 2, 0 -_08145C74: .4byte 0x03005d8c -_08145C78: .4byte 0x03005d90 -_08145C7C: .4byte 0x00000494 + .pool thumb_func_end sub_8145C58 thumb_func_start sub_8145C80 @@ -667441,25 +645347,25 @@ sub_8145C80: @ 8145C80 bl sub_8145C30 lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _08145C98 + ldr r0, =0x0000270e cmp r1, r0 bls _08145C9C movs r0, 0 b _08145CC0 .align 2, 0 -_08145C98: .4byte 0x0000270e + .pool _08145C9C: adds r0, r1, r4 cmp r1, r0 ble _08145CAC - ldr r0, _08145CA8 + ldr r0, =0x0000270f b _08145CBA .align 2, 0 -_08145CA8: .4byte 0x0000270f + .pool _08145CAC: lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _08145CC8 + ldr r0, =0x0000270f cmp r1, r0 bls _08145CB8 adds r1, r0, 0 @@ -667473,7 +645379,7 @@ _08145CC0: pop {r1} bx r1 .align 2, 0 -_08145CC8: .4byte 0x0000270f + .pool thumb_func_end sub_8145C80 thumb_func_start sub_8145CCC @@ -667517,10 +645423,10 @@ _08145D0C: movs r0, 0 b _08145D42 _08145D10: - ldr r6, _08145D14 + ldr r6, =0x0000ffff b _08145D26 .align 2, 0 -_08145D14: .4byte 0x0000ffff + .pool _08145D18: subs r0, r5, 0x1 lsls r0, 24 @@ -667559,7 +645465,7 @@ sub_8145D48: @ 8145D48 lsls r1, 24 lsrs r6, r1, 24 movs r2, 0 - ldr r0, _08145D8C + ldr r0, =0x085b91b8 ldrb r1, [r0] adds r4, r0, 0 cmp r1, 0xD5 @@ -667589,7 +645495,7 @@ _08145D7E: bne _08145D98 b _08145DB8 .align 2, 0 -_08145D8C: .4byte 0x085b91b8 + .pool _08145D90: adds r0, r4, 0x4 adds r0, r1, r0 @@ -667598,7 +645504,7 @@ _08145D90: _08145D98: cmp r0, r3 bne _08145DB8 - ldr r5, _08145DC0 + ldr r5, =0x085b91b8 _08145D9E: lsls r1, r2, 3 adds r0, r1, r5 @@ -667620,7 +645526,7 @@ _08145DBA: pop {r1} bx r1 .align 2, 0 -_08145DC0: .4byte 0x085b91b8 + .pool thumb_func_end sub_8145D48 thumb_func_start hm_prepare_rocksmash @@ -667635,16 +645541,16 @@ hm_prepare_rocksmash: @ 8145DC4 movs r0, 0 b _08145DF2 _08145DD8: - ldr r4, _08145DF8 + ldr r4, =0x020375f0 bl brm_get_pokemon_selection lsls r0, 24 lsrs r0, 24 strh r0, [r4] - ldr r1, _08145DFC - ldr r0, _08145E00 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _08145E04 - ldr r0, _08145E08 + ldr r1, =0x0203ceec + ldr r0, =sub_8145E0C + 1 str r0, [r1] movs r0, 0x1 _08145DF2: @@ -667652,28 +645558,23 @@ _08145DF2: pop {r1} bx r1 .align 2, 0 -_08145DF8: .4byte 0x020375f0 -_08145DFC: .4byte 0x03005db0 -_08145E00: .4byte hm_add_c3_launch_phase_2 + 1 -_08145E04: .4byte 0x0203ceec -_08145E08: .4byte sub_8145E0C + 1 + .pool thumb_func_end hm_prepare_rocksmash thumb_func_start sub_8145E0C sub_8145E0C: @ 8145E0C push {lr} bl brm_get_pokemon_selection - ldr r1, _08145E24 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] - ldr r0, _08145E28 + ldr r0, =0x082908fd bl script_env_1_execute_new_script pop {r0} bx r0 .align 2, 0 -_08145E24: .4byte 0x02038c08 -_08145E28: .4byte 0x082908fd + .pool thumb_func_end sub_8145E0C thumb_func_start sub_8145E2C @@ -667682,32 +645583,28 @@ sub_8145E2C: @ 8145E2C bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _08145E60 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _08145E64 + ldr r2, =sub_8145E74 + 1 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] - ldr r0, _08145E68 + ldr r0, =0x02038c08 ldr r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08145E6C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08145E70 + ldr r1, =0x02021cc4 bl sub_81B1B44 movs r0, 0 pop {r1} bx r1 .align 2, 0 -_08145E60: .4byte 0x03005e00 -_08145E64: .4byte sub_8145E74 + 1 -_08145E68: .4byte 0x02038c08 -_08145E6C: .4byte 0x020244ec -_08145E70: .4byte 0x02021cc4 + .pool thumb_func_end sub_8145E2C thumb_func_start sub_8145E74 @@ -667723,7 +645620,7 @@ sub_8145E74: @ 8145E74 thumb_func_start sub_8145E84 sub_8145E84: @ 8145E84 push {r4,lr} - ldr r4, _08145E94 + ldr r4, =0x0300120b ldrb r0, [r4] cmp r0, 0 beq _08145E98 @@ -667731,9 +645628,9 @@ sub_8145E84: @ 8145E84 beq _08145EAC b _08145EC0 .align 2, 0 -_08145E94: .4byte 0x0300120b + .pool _08145E98: - ldr r0, _08145EA8 + ldr r0, =0x0300120a ldrb r0, [r0] bl sub_8145F6C ldrb r0, [r4] @@ -667741,7 +645638,7 @@ _08145E98: strb r0, [r4] b _08145EC0 .align 2, 0 -_08145EA8: .4byte 0x0300120a + .pool _08145EAC: bl sub_8145F20 lsls r0, 24 @@ -667749,7 +645646,7 @@ _08145EAC: beq _08145EC0 movs r0, 0 strb r0, [r4] - ldr r0, _08145ED8 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 _08145EC0: bl run_active_tasks @@ -667760,21 +645657,20 @@ _08145EC0: pop {r0} bx r0 .align 2, 0 -_08145ED8: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_8145E84 thumb_func_start sub_8145EDC sub_8145EDC: @ 8145EDC push {lr} - ldr r1, _08145EEC + ldr r1, =0x0300120a strb r0, [r1] - ldr r0, _08145EF0 + ldr r0, =sub_8145E84 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_08145EEC: .4byte 0x0300120a -_08145EF0: .4byte sub_8145E84 + 1 + .pool thumb_func_end sub_8145EDC thumb_func_start sub_8145EF4 @@ -667782,15 +645678,14 @@ sub_8145EF4: @ 8145EF4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08145F08 - ldr r1, _08145F0C + ldr r2, =0x030022c0 + ldr r1, =sub_8085E50 + 1 str r1, [r2, 0x4] bl sub_8145F6C pop {r0} bx r0 .align 2, 0 -_08145F08: .4byte 0x030022c0 -_08145F0C: .4byte sub_8085E50 + 1 + .pool thumb_func_end sub_8145EF4 thumb_func_start sub_8145F10 @@ -667806,11 +645701,11 @@ sub_8145F10: @ 8145F10 thumb_func_start sub_8145F20 sub_8145F20: @ 8145F20 push {r4,lr} - ldr r0, _08145F44 + ldr r0, =sub_8145FA8 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08145F48 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -667822,12 +645717,11 @@ sub_8145F20: @ 8145F20 movs r0, 0 b _08145F60 .align 2, 0 -_08145F44: .4byte sub_8145FA8 + 1 -_08145F48: .4byte 0x03005e00 + .pool _08145F4C: adds r0, r2, 0 bl remove_task - ldr r4, _08145F68 + ldr r4, =0x0203aba0 ldr r0, [r4] bl free movs r0, 0 @@ -667838,7 +645732,7 @@ _08145F60: pop {r1} bx r1 .align 2, 0 -_08145F68: .4byte 0x0203aba0 + .pool thumb_func_end sub_8145F20 thumb_func_start sub_8145F6C @@ -667847,18 +645741,18 @@ sub_8145F6C: @ 8145F6C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08145F9C + ldr r0, =sub_8145FA8 + 1 movs r1, 0x2 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08145FA0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 strh r4, [r1, 0xA] - ldr r4, _08145FA4 + ldr r4, =0x0203aba0 movs r0, 0x3C bl malloc_and_clear str r0, [r4] @@ -667866,9 +645760,7 @@ sub_8145F6C: @ 8145F6C pop {r0} bx r0 .align 2, 0 -_08145F9C: .4byte sub_8145FA8 + 1 -_08145FA0: .4byte 0x03005e00 -_08145FA4: .4byte 0x0203aba0 + .pool thumb_func_end sub_8145F6C thumb_func_start sub_8145FA8 @@ -667876,8 +645768,8 @@ sub_8145FA8: @ 8145FA8 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08145FD8 - ldr r2, _08145FDC + ldr r5, =0x085c8a98 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -667897,8 +645789,7 @@ _08145FBA: pop {r0} bx r0 .align 2, 0 -_08145FD8: .4byte 0x085c8a98 -_08145FDC: .4byte 0x03005e00 + .pool thumb_func_end sub_8145FA8 thumb_func_start sub_8145FE0 @@ -667906,11 +645797,11 @@ sub_8145FE0: @ 8145FE0 push {r4,lr} adds r4, r0, 0 bl sub_80AC3D0 - ldr r0, _0814600C - ldr r1, _08146010 - ldr r2, _08146014 + ldr r0, =0x02037b14 + ldr r1, =0x02037714 + ldr r2, =0x04000100 bl CpuSet - ldr r1, _08146018 + ldr r1, =0x085c8948 movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -667923,10 +645814,7 @@ sub_8145FE0: @ 8145FE0 movs r0, 0x1 b _0814602A .align 2, 0 -_0814600C: .4byte 0x02037b14 -_08146010: .4byte 0x02037714 -_08146014: .4byte 0x04000100 -_08146018: .4byte 0x085c8948 + .pool _0814601C: movs r1, 0x4 bl AddTask @@ -667944,7 +645832,7 @@ _0814602A: sub_8146030: @ 8146030 push {r4,lr} adds r4, r0, 0 - ldr r1, _08146050 + ldr r1, =0x085c8948 movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -667958,7 +645846,7 @@ sub_8146030: @ 8146030 movs r0, 0 b _0814605C .align 2, 0 -_08146050: .4byte 0x085c8948 + .pool _08146054: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -667974,7 +645862,7 @@ _0814605C: sub_8146064: @ 8146064 push {r4,lr} adds r4, r0, 0 - ldr r1, _08146088 + ldr r1, =0x085c89f0 movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -667990,7 +645878,7 @@ sub_8146064: @ 8146064 pop {r1} bx r1 .align 2, 0 -_08146088: .4byte 0x085c89f0 + .pool thumb_func_end sub_8146064 thumb_func_start sub_814608C @@ -667999,7 +645887,7 @@ sub_814608C: @ 814608C adds r4, r0, 0 movs r0, 0 strh r0, [r4, 0x26] - ldr r1, _081460B8 + ldr r1, =0x085c89f0 movs r2, 0xA ldrsh r0, [r4, r2] lsls r0, 2 @@ -668018,7 +645906,7 @@ _081460B0: pop {r1} bx r1 .align 2, 0 -_081460B8: .4byte 0x085c89f0 + .pool thumb_func_end sub_814608C thumb_func_start sub_81460BC @@ -668028,7 +645916,7 @@ sub_81460BC: @ 81460BC lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r1, _081460F0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -668049,7 +645937,7 @@ sub_81460BC: @ 81460BC bl sub_8149D78 b _08146104 .align 2, 0 -_081460F0: .4byte 0x03005e00 + .pool _081460F4: bl sub_8149DDC lsls r0, 24 @@ -668069,8 +645957,8 @@ sub_814610C: @ 814610C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0814613C - ldr r2, _08146140 + ldr r5, =0x085c8aa8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -668090,8 +645978,7 @@ _0814611E: pop {r0} bx r0 .align 2, 0 -_0814613C: .4byte 0x085c8aa8 -_08146140: .4byte 0x03005e00 + .pool thumb_func_end sub_814610C thumb_func_start sub_8146144 @@ -668175,13 +646062,13 @@ _081461CE: thumb_func_start sub_81461D8 sub_81461D8: @ 81461D8 push {lr} - ldr r0, _081461FC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081461F4 - ldr r0, _08146200 + ldr r0, =sub_814610C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -668191,8 +646078,7 @@ _081461F4: pop {r1} bx r1 .align 2, 0 -_081461FC: .4byte 0x02037fd4 -_08146200: .4byte sub_814610C + 1 + .pool thumb_func_end sub_81461D8 thumb_func_start sub_8146204 @@ -668200,8 +646086,8 @@ sub_8146204: @ 8146204 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08146234 - ldr r2, _08146238 + ldr r5, =0x085c8ab4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -668221,8 +646107,7 @@ _08146216: pop {r0} bx r0 .align 2, 0 -_08146234: .4byte 0x085c8ab4 -_08146238: .4byte 0x03005e00 + .pool thumb_func_end sub_8146204 thumb_func_start sub_814623C @@ -668240,8 +646125,8 @@ sub_814623C: @ 814623C movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08146298 - ldr r1, _0814629C + ldr r0, =0x020393a8 + ldr r1, =0x0203aba0 ldr r1, [r1] movs r2, 0x14 ldrsh r1, [r1, r2] @@ -668251,9 +646136,9 @@ sub_814623C: @ 814623C movs r2, 0 movs r3, 0x2 bl sub_8149F98 - ldr r0, _081462A0 + ldr r0, =sub_8146320 + 1 bl SetVBlankCallback - ldr r0, _081462A4 + ldr r0, =sub_8146358 + 1 bl SetHBlankCallback movs r0, 0x3 bl enable_irqs @@ -668266,17 +646151,14 @@ sub_814623C: @ 814623C pop {r1} bx r1 .align 2, 0 -_08146298: .4byte 0x020393a8 -_0814629C: .4byte 0x0203aba0 -_081462A0: .4byte sub_8146320 + 1 -_081462A4: .4byte sub_8146358 + 1 + .pool thumb_func_end sub_814623C thumb_func_start sub_81462A8 sub_81462A8: @ 81462A8 push {r4,r5,lr} sub sp, 0x8 - ldr r4, _08146310 + ldr r4, =0x0203aba0 ldr r2, [r4] ldrb r1, [r2] movs r1, 0 @@ -668287,7 +646169,7 @@ sub_81462A8: @ 81462A8 ldrh r1, [r0, 0xC] adds r1, 0x8 strh r1, [r0, 0xC] - ldr r3, _08146314 + ldr r3, =0x02038c28 ldr r1, [r4] movs r2, 0x14 ldrsh r1, [r1, r2] @@ -668301,13 +646183,13 @@ sub_81462A8: @ 81462A8 adds r0, r3, 0 movs r3, 0x2 bl sub_8149F98 - ldr r0, _08146318 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081462FA - ldr r0, _0814631C + ldr r0, =sub_8146204 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -668324,45 +646206,39 @@ _081462FA: pop {r1} bx r1 .align 2, 0 -_08146310: .4byte 0x0203aba0 -_08146314: .4byte 0x02038c28 -_08146318: .4byte 0x02037fd4 -_0814631C: .4byte sub_8146204 + 1 + .pool thumb_func_end sub_81462A8 thumb_func_start sub_8146320 sub_8146320: @ 8146320 push {lr} bl sub_8149F2C - ldr r0, _08146348 + ldr r0, =0x0203aba0 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 beq _08146344 - ldr r1, _0814634C - ldr r0, _08146350 + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r2, 0xF0 lsls r2, 3 adds r0, r2 str r0, [r1, 0x4] - ldr r0, _08146354 + ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _08146344: pop {r0} bx r0 .align 2, 0 -_08146348: .4byte 0x0203aba0 -_0814634C: .4byte 0x040000d4 -_08146350: .4byte 0x02038c28 -_08146354: .4byte 0x800000a0 + .pool thumb_func_end sub_8146320 thumb_func_start sub_8146358 sub_8146358: @ 8146358 - ldr r1, _08146378 - ldr r0, _0814637C + ldr r1, =0x02038c28 + ldr r0, =0x04000006 ldrh r0, [r0] lsls r0, 1 movs r2, 0xF0 @@ -668370,7 +646246,7 @@ sub_8146358: @ 8146358 adds r1, r2 adds r0, r1 ldrh r1, [r0] - ldr r0, _08146380 + ldr r0, =0x04000014 strh r1, [r0] adds r0, 0x4 strh r1, [r0] @@ -668378,9 +646254,7 @@ sub_8146358: @ 8146358 strh r1, [r0] bx lr .align 2, 0 -_08146378: .4byte 0x02038c28 -_0814637C: .4byte 0x04000006 -_08146380: .4byte 0x04000014 + .pool thumb_func_end sub_8146358 thumb_func_start sub_8146384 @@ -668388,8 +646262,8 @@ sub_8146384: @ 8146384 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081463B4 - ldr r2, _081463B8 + ldr r5, =0x085c8abc + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -668409,8 +646283,7 @@ _08146396: pop {r0} bx r0 .align 2, 0 -_081463B4: .4byte 0x085c8abc -_081463B8: .4byte 0x03005e00 + .pool thumb_func_end sub_8146384 thumb_func_start sub_81463BC @@ -668428,17 +646301,17 @@ sub_81463BC: @ 81463BC movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08146410 + ldr r0, =0x0203aba0 ldr r1, [r0] - ldr r0, _08146414 + ldr r0, =0x020393a8 movs r2, 0x16 ldrsh r1, [r1, r2] movs r2, 0xA0 lsls r2, 1 bl memset - ldr r0, _08146418 + ldr r0, =sub_81464B0 + 1 bl SetVBlankCallback - ldr r0, _0814641C + ldr r0, =sub_81464E8 + 1 bl SetHBlankCallback movs r0, 0x3 bl enable_irqs @@ -668451,16 +646324,13 @@ sub_81463BC: @ 81463BC pop {r1} bx r1 .align 2, 0 -_08146410: .4byte 0x0203aba0 -_08146414: .4byte 0x020393a8 -_08146418: .4byte sub_81464B0 + 1 -_0814641C: .4byte sub_81464E8 + 1 + .pool thumb_func_end sub_81463BC thumb_func_start sub_8146420 sub_8146420: @ 8146420 push {r4-r7,lr} - ldr r1, _081464A0 + ldr r1, =0x0203aba0 ldr r2, [r1] ldrb r1, [r2] movs r1, 0 @@ -668483,10 +646353,10 @@ _08146448: lsrs r0, r4, 8 asrs r1, r7, 16 bl sine - ldr r1, _081464A4 + ldr r1, =0x02038c28 lsls r2, r5, 1 adds r2, r1 - ldr r6, _081464A0 + ldr r6, =0x0203aba0 ldr r1, [r6] ldrh r1, [r1, 0x16] adds r0, r1 @@ -668501,13 +646371,13 @@ _08146448: lsrs r4, r0, 16 cmp r5, 0x9F bls _08146448 - ldr r0, _081464A8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0814648E - ldr r0, _081464AC + ldr r0, =sub_8146384 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -668523,45 +646393,39 @@ _0814648E: pop {r1} bx r1 .align 2, 0 -_081464A0: .4byte 0x0203aba0 -_081464A4: .4byte 0x02038c28 -_081464A8: .4byte 0x02037fd4 -_081464AC: .4byte sub_8146384 + 1 + .pool thumb_func_end sub_8146420 thumb_func_start sub_81464B0 sub_81464B0: @ 81464B0 push {lr} bl sub_8149F2C - ldr r0, _081464D8 + ldr r0, =0x0203aba0 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 beq _081464D4 - ldr r1, _081464DC - ldr r0, _081464E0 + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r2, 0xF0 lsls r2, 3 adds r0, r2 str r0, [r1, 0x4] - ldr r0, _081464E4 + ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _081464D4: pop {r0} bx r0 .align 2, 0 -_081464D8: .4byte 0x0203aba0 -_081464DC: .4byte 0x040000d4 -_081464E0: .4byte 0x02038c28 -_081464E4: .4byte 0x800000a0 + .pool thumb_func_end sub_81464B0 thumb_func_start sub_81464E8 sub_81464E8: @ 81464E8 - ldr r1, _08146508 - ldr r0, _0814650C + ldr r1, =0x02038c28 + ldr r0, =0x04000006 ldrh r0, [r0] lsls r0, 1 movs r2, 0xF0 @@ -668569,7 +646433,7 @@ sub_81464E8: @ 81464E8 adds r1, r2 adds r0, r1 ldrh r1, [r0] - ldr r0, _08146510 + ldr r0, =0x04000016 strh r1, [r0] adds r0, 0x4 strh r1, [r0] @@ -668577,9 +646441,7 @@ sub_81464E8: @ 81464E8 strh r1, [r0] bx lr .align 2, 0 -_08146508: .4byte 0x02038c28 -_0814650C: .4byte 0x04000006 -_08146510: .4byte 0x04000016 + .pool thumb_func_end sub_81464E8 thumb_func_start sub_8146514 @@ -668587,8 +646449,8 @@ sub_8146514: @ 8146514 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08146544 - ldr r2, _08146548 + ldr r5, =0x085c8afc + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -668608,8 +646470,7 @@ _08146526: pop {r0} bx r0 .align 2, 0 -_08146544: .4byte 0x085c8afc -_08146548: .4byte 0x03005e00 + .pool thumb_func_end sub_8146514 thumb_func_start sub_814654C @@ -668617,8 +646478,8 @@ sub_814654C: @ 814654C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0814657C - ldr r2, _08146580 + ldr r5, =0x085c8ac4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -668638,8 +646499,7 @@ _0814655E: pop {r0} bx r0 .align 2, 0 -_0814657C: .4byte 0x085c8ac4 -_08146580: .4byte 0x03005e00 + .pool thumb_func_end sub_814654C thumb_func_start sub_8146584 @@ -668647,8 +646507,8 @@ sub_8146584: @ 8146584 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081465B4 - ldr r2, _081465B8 + ldr r5, =0x085c8ae0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -668668,8 +646528,7 @@ _08146596: pop {r0} bx r0 .align 2, 0 -_081465B4: .4byte 0x085c8ae0 -_081465B8: .4byte 0x03005e00 + .pool thumb_func_end sub_8146584 thumb_func_start sub_81465BC @@ -668677,8 +646536,8 @@ sub_81465BC: @ 81465BC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081465EC - ldr r2, _081465F0 + ldr r5, =0x085c8b14 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -668698,8 +646557,7 @@ _081465CE: pop {r0} bx r0 .align 2, 0 -_081465EC: .4byte 0x085c8b14 -_081465F0: .4byte 0x03005e00 + .pool thumb_func_end sub_81465BC thumb_func_start sub_81465F4 @@ -668707,8 +646565,8 @@ sub_81465F4: @ 81465F4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08146624 - ldr r2, _08146628 + ldr r5, =0x085c8b2c + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -668728,8 +646586,7 @@ _08146606: pop {r0} bx r0 .align 2, 0 -_08146624: .4byte 0x085c8b2c -_08146628: .4byte 0x03005e00 + .pool thumb_func_end sub_81465F4 thumb_func_start sub_814662C @@ -668737,8 +646594,8 @@ sub_814662C: @ 814662C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0814665C - ldr r2, _08146660 + ldr r5, =0x085c8b44 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -668758,8 +646615,7 @@ _0814663E: pop {r0} bx r0 .align 2, 0 -_0814665C: .4byte 0x085c8b44 -_08146660: .4byte 0x03005e00 + .pool thumb_func_end sub_814662C thumb_func_start sub_8146664 @@ -668767,8 +646623,8 @@ sub_8146664: @ 8146664 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08146694 - ldr r2, _08146698 + ldr r5, =0x085c8b5c + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -668788,8 +646644,7 @@ _08146676: pop {r0} bx r0 .align 2, 0 -_08146694: .4byte 0x085c8b5c -_08146698: .4byte 0x03005e00 + .pool thumb_func_end sub_8146664 thumb_func_start sub_814669C @@ -668806,7 +646661,7 @@ sub_814669C: @ 814669C movs r0, 0x80 lsls r0, 7 strh r0, [r4, 0x12] - ldr r0, _081466F8 + ldr r0, =0x0203aba0 ldr r2, [r0] movs r0, 0x3F strh r0, [r2, 0x2] @@ -668815,17 +646670,17 @@ sub_814669C: @ 814669C strh r0, [r2, 0x6] movs r0, 0xA0 strh r0, [r2, 0x8] - ldr r0, _081466FC + ldr r0, =0x00003f41 strh r0, [r2, 0xE] ldrh r0, [r4, 0xA] lsls r0, 8 ldrh r1, [r4, 0xC] orrs r0, r1 strh r0, [r2, 0x10] - ldr r0, _08146700 + ldr r0, =0x02038c28 movs r2, 0xF0 movs r1, 0x9F - ldr r3, _08146704 + ldr r3, =0x000008be adds r0, r3 _081466E2: strh r2, [r0] @@ -668833,17 +646688,13 @@ _081466E2: subs r1, 0x1 cmp r1, 0 bge _081466E2 - ldr r0, _08146708 + ldr r0, =sub_8146F3C + 1 bl SetVBlankCallback pop {r4} pop {r0} bx r0 .align 2, 0 -_081466F8: .4byte 0x0203aba0 -_081466FC: .4byte 0x00003f41 -_08146700: .4byte 0x02038c28 -_08146704: .4byte 0x000008be -_08146708: .4byte sub_8146F3C + 1 + .pool thumb_func_end sub_814669C thumb_func_start sub_814670C @@ -668862,12 +646713,12 @@ sub_814670C: @ 814670C mov r0, sp strh r5, [r0] ldr r1, [sp, 0x4] - ldr r2, _08146754 + ldr r2, =0x01000400 bl CpuSet - ldr r0, _08146758 + ldr r0, =0x085baed0 ldr r1, [sp, 0x8] bl LZ77UnCompVram - ldr r0, _0814675C + ldr r0, =0x085baeb0 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -668880,9 +646731,7 @@ sub_814670C: @ 814670C pop {r1} bx r1 .align 2, 0 -_08146754: .4byte 0x01000400 -_08146758: .4byte 0x085baed0 -_0814675C: .4byte 0x085baeb0 + .pool thumb_func_end sub_814670C thumb_func_start sub_8146760 @@ -668901,12 +646750,12 @@ sub_8146760: @ 8146760 mov r0, sp strh r5, [r0] ldr r1, [sp, 0x4] - ldr r2, _081467A8 + ldr r2, =0x01000400 bl CpuSet - ldr r0, _081467AC + ldr r0, =0x085bb4a4 ldr r1, [sp, 0x8] bl LZ77UnCompVram - ldr r0, _081467B0 + ldr r0, =0x085baeb0 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -668919,9 +646768,7 @@ sub_8146760: @ 8146760 pop {r1} bx r1 .align 2, 0 -_081467A8: .4byte 0x01000400 -_081467AC: .4byte 0x085bb4a4 -_081467B0: .4byte 0x085baeb0 + .pool thumb_func_end sub_8146760 thumb_func_start sub_81467B4 @@ -668940,9 +646787,9 @@ sub_81467B4: @ 81467B4 mov r0, sp strh r5, [r0] ldr r1, [sp, 0x4] - ldr r2, _081467F8 + ldr r2, =0x01000400 bl CpuSet - ldr r0, _081467FC + ldr r0, =0x085bbc14 ldr r1, [sp, 0x8] movs r2, 0x80 lsls r2, 5 @@ -668956,8 +646803,7 @@ sub_81467B4: @ 81467B4 pop {r1} bx r1 .align 2, 0 -_081467F8: .4byte 0x01000400 -_081467FC: .4byte 0x085bbc14 + .pool thumb_func_end sub_81467B4 thumb_func_start sub_8146800 @@ -668973,15 +646819,15 @@ sub_8146800: @ 8146800 movs r0, 0 strh r0, [r1] ldr r1, [sp, 0x4] - ldr r2, _08146848 + ldr r2, =0x01000400 mov r0, sp bl CpuSet - ldr r0, _0814684C + ldr r0, =0x085b9330 ldr r1, [sp, 0x8] movs r2, 0xB0 lsls r2, 2 bl CpuSet - ldr r0, _08146850 + ldr r0, =0x085c8ed4 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -668994,9 +646840,7 @@ sub_8146800: @ 8146800 pop {r1} bx r1 .align 2, 0 -_08146848: .4byte 0x01000400 -_0814684C: .4byte 0x085b9330 -_08146850: .4byte 0x085c8ed4 + .pool thumb_func_end sub_8146800 thumb_func_start sub_8146854 @@ -669010,11 +646854,11 @@ sub_8146854: @ 8146854 add r1, sp, 0xC add r0, sp, 0x8 bl sub_8149F58 - ldr r5, _081468DC + ldr r5, =0x085c9020 movs r1, 0 ldr r0, [sp, 0x8] mov r9, r0 - ldr r6, _081468E0 + ldr r6, =0x02038c28 mov r8, r6 movs r0, 0xF0 lsls r0, 8 @@ -669070,8 +646914,7 @@ _08146880: pop {r1} bx r1 .align 2, 0 -_081468DC: .4byte 0x085c9020 -_081468E0: .4byte 0x02038c28 + .pool thumb_func_end sub_8146854 thumb_func_start sub_81468E4 @@ -669082,10 +646925,10 @@ sub_81468E4: @ 81468E4 add r1, sp, 0xC add r0, sp, 0x8 bl sub_8149F58 - ldr r0, _08146924 + ldr r0, =0x085bb248 ldr r1, [sp, 0x8] bl LZ77UnCompVram - ldr r0, _08146928 + ldr r0, =0x02038c28 movs r1, 0x10 ldrsh r2, [r4, r1] movs r3, 0x12 @@ -669105,8 +646948,7 @@ sub_81468E4: @ 81468E4 pop {r1} bx r1 .align 2, 0 -_08146924: .4byte 0x085bb248 -_08146928: .4byte 0x02038c28 + .pool thumb_func_end sub_81468E4 thumb_func_start sub_814692C @@ -669117,10 +646959,10 @@ sub_814692C: @ 814692C add r1, sp, 0xC add r0, sp, 0x8 bl sub_8149F58 - ldr r0, _0814696C + ldr r0, =0x085bb930 ldr r1, [sp, 0x8] bl LZ77UnCompVram - ldr r0, _08146970 + ldr r0, =0x02038c28 movs r1, 0x10 ldrsh r2, [r4, r1] movs r3, 0x12 @@ -669140,8 +646982,7 @@ sub_814692C: @ 814692C pop {r1} bx r1 .align 2, 0 -_0814696C: .4byte 0x085bb930 -_08146970: .4byte 0x02038c28 + .pool thumb_func_end sub_814692C thumb_func_start sub_8146974 @@ -669152,16 +646993,16 @@ sub_8146974: @ 8146974 add r1, sp, 0xC add r0, sp, 0x8 bl sub_8149F58 - ldr r0, _081469C0 + ldr r0, =0x085bc2b4 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _081469C4 + ldr r0, =0x085bc314 ldr r1, [sp, 0x8] movs r2, 0xA0 lsls r2, 2 bl CpuSet - ldr r0, _081469C8 + ldr r0, =0x02038c28 movs r1, 0x10 ldrsh r2, [r4, r1] movs r3, 0x12 @@ -669181,9 +647022,7 @@ sub_8146974: @ 8146974 pop {r1} bx r1 .align 2, 0 -_081469C0: .4byte 0x085bc2b4 -_081469C4: .4byte 0x085bc314 -_081469C8: .4byte 0x02038c28 + .pool thumb_func_end sub_8146974 thumb_func_start sub_81469CC @@ -669194,16 +647033,16 @@ sub_81469CC: @ 81469CC add r1, sp, 0xC add r0, sp, 0x8 bl sub_8149F58 - ldr r0, _08146A18 + ldr r0, =0x085bc2d4 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _08146A1C + ldr r0, =0x085bcb14 ldr r1, [sp, 0x8] movs r2, 0xA0 lsls r2, 2 bl CpuSet - ldr r0, _08146A20 + ldr r0, =0x02038c28 movs r1, 0x10 ldrsh r2, [r4, r1] movs r3, 0x12 @@ -669223,9 +647062,7 @@ sub_81469CC: @ 81469CC pop {r1} bx r1 .align 2, 0 -_08146A18: .4byte 0x085bc2d4 -_08146A1C: .4byte 0x085bcb14 -_08146A20: .4byte 0x02038c28 + .pool thumb_func_end sub_81469CC thumb_func_start sub_8146A24 @@ -669236,16 +647073,16 @@ sub_8146A24: @ 8146A24 add r1, sp, 0xC add r0, sp, 0x8 bl sub_8149F58 - ldr r0, _08146A70 + ldr r0, =0x085bc2f4 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _08146A74 + ldr r0, =0x085bd314 ldr r1, [sp, 0x8] movs r2, 0xA0 lsls r2, 2 bl CpuSet - ldr r0, _08146A78 + ldr r0, =0x02038c28 movs r1, 0x10 ldrsh r2, [r4, r1] movs r3, 0x12 @@ -669265,9 +647102,7 @@ sub_8146A24: @ 8146A24 pop {r1} bx r1 .align 2, 0 -_08146A70: .4byte 0x085bc2f4 -_08146A74: .4byte 0x085bd314 -_08146A78: .4byte 0x02038c28 + .pool thumb_func_end sub_8146A24 thumb_func_start sub_8146A7C @@ -669282,13 +647117,13 @@ sub_8146A7C: @ 8146A7C movs r0, 0 strh r0, [r1] ldr r1, [sp, 0x4] - ldr r2, _08146ABC + ldr r2, =0x01000400 mov r0, sp bl CpuSet - ldr r0, _08146AC0 + ldr r0, =0x085bdb34 ldr r1, [sp, 0x8] bl LZ77UnCompVram - ldr r0, _08146AC4 + ldr r0, =0x085be1e8 ldr r1, [sp, 0x4] bl LZ77UnCompVram ldrh r0, [r4, 0x8] @@ -669300,9 +647135,7 @@ sub_8146A7C: @ 8146A7C pop {r1} bx r1 .align 2, 0 -_08146ABC: .4byte 0x01000400 -_08146AC0: .4byte 0x085bdb34 -_08146AC4: .4byte 0x085be1e8 + .pool thumb_func_end sub_8146A7C thumb_func_start sub_8146AC8 @@ -669326,7 +647159,7 @@ sub_8146AC8: @ 8146AC8 bl __udivsi3 lsls r0, 16 lsrs r0, 11 - ldr r1, _08146B20 + ldr r1, =0x085beda0 adds r0, r1 movs r1, 0xF0 movs r2, 0x20 @@ -669350,7 +647183,7 @@ _08146B18: pop {r1} bx r1 .align 2, 0 -_08146B20: .4byte 0x085beda0 + .pool thumb_func_end sub_8146AC8 thumb_func_start sub_8146B24 @@ -669370,7 +647203,7 @@ sub_8146B24: @ 8146B24 bl __divsi3 lsls r0, 16 asrs r0, 11 - ldr r1, _08146B78 + ldr r1, =0x085beee0 adds r0, r1 movs r1, 0xF0 movs r2, 0x20 @@ -669396,7 +647229,7 @@ _08146B6E: pop {r1} bx r1 .align 2, 0 -_08146B78: .4byte 0x085beee0 + .pool thumb_func_end sub_8146B24 thumb_func_start sub_8146B7C @@ -669404,7 +647237,7 @@ sub_8146B7C: @ 8146B7C push {r4,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r0, _08146BA4 + ldr r0, =0xffff8000 movs r1, 0 str r1, [sp] movs r1, 0x1 @@ -669420,26 +647253,26 @@ sub_8146B7C: @ 8146B7C pop {r1} bx r1 .align 2, 0 -_08146BA4: .4byte 0xffff8000 + .pool thumb_func_end sub_8146B7C thumb_func_start sub_8146BA8 sub_8146BA8: @ 8146BA8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08146BE8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08146BDE - ldr r1, _08146BEC + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08146BF0 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08146BF4 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] @@ -669455,10 +647288,7 @@ _08146BDE: pop {r1} bx r1 .align 2, 0 -_08146BE8: .4byte 0x02037fd4 -_08146BEC: .4byte 0x040000b0 -_08146BF0: .4byte 0x0000c5ff -_08146BF4: .4byte 0x00007fff + .pool thumb_func_end sub_8146BA8 thumb_func_start sub_8146BF8 @@ -669466,7 +647296,7 @@ sub_8146BF8: @ 8146BF8 push {r4,r5,lr} sub sp, 0x8 adds r3, r0, 0 - ldr r2, _08146C80 + ldr r2, =0x0203aba0 ldr r1, [r2] ldrb r0, [r1] movs r0, 0 @@ -669506,12 +647336,12 @@ _08146C42: ldrh r0, [r3, 0x10] adds r0, 0x8 strh r0, [r3, 0x10] - ldr r0, _08146C84 + ldr r0, =0xffffff00 adds r1, r0, 0 ldrh r5, [r3, 0x12] adds r1, r5 strh r1, [r3, 0x12] - ldr r0, _08146C88 + ldr r0, =0x02038c28 movs r5, 0x10 ldrsh r2, [r3, r5] lsls r1, 16 @@ -669533,9 +647363,7 @@ _08146C42: pop {r1} bx r1 .align 2, 0 -_08146C80: .4byte 0x0203aba0 -_08146C84: .4byte 0xffffff00 -_08146C88: .4byte 0x02038c28 + .pool thumb_func_end sub_8146BF8 thumb_func_start sub_8146C8C @@ -669543,7 +647371,7 @@ sub_8146C8C: @ 8146C8C push {r4,r5,lr} sub sp, 0x8 adds r3, r0, 0 - ldr r2, _08146D14 + ldr r2, =0x0203aba0 ldr r1, [r2] ldrb r0, [r1] movs r0, 0 @@ -669583,12 +647411,12 @@ _08146CD6: ldrh r0, [r3, 0x10] adds r0, 0x8 strh r0, [r3, 0x10] - ldr r0, _08146D18 + ldr r0, =0xffffff00 adds r1, r0, 0 ldrh r5, [r3, 0x12] adds r1, r5 strh r1, [r3, 0x12] - ldr r0, _08146D1C + ldr r0, =0x02038c28 movs r5, 0x10 ldrsh r2, [r3, r5] lsls r1, 16 @@ -669610,9 +647438,7 @@ _08146CD6: pop {r1} bx r1 .align 2, 0 -_08146D14: .4byte 0x0203aba0 -_08146D18: .4byte 0xffffff00 -_08146D1C: .4byte 0x02038c28 + .pool thumb_func_end sub_8146C8C thumb_func_start sub_8146D20 @@ -669620,7 +647446,7 @@ sub_8146D20: @ 8146D20 push {r4-r7,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r7, _08146D84 + ldr r7, =0x0203aba0 ldr r0, [r7] ldrb r1, [r0] movs r6, 0 @@ -669628,12 +647454,12 @@ sub_8146D20: @ 8146D20 ldrh r0, [r4, 0x10] adds r0, 0x8 strh r0, [r4, 0x10] - ldr r0, _08146D88 + ldr r0, =0xffffff00 adds r1, r0, 0 ldrh r3, [r4, 0x12] adds r1, r3 strh r1, [r4, 0x12] - ldr r0, _08146D8C + ldr r0, =0x02038c28 movs r3, 0x10 ldrsh r2, [r4, r3] lsls r1, 16 @@ -669668,9 +647494,7 @@ _08146D70: pop {r1} bx r1 .align 2, 0 -_08146D84: .4byte 0x0203aba0 -_08146D88: .4byte 0xffffff00 -_08146D8C: .4byte 0x02038c28 + .pool thumb_func_end sub_8146D20 thumb_func_start sub_8146D90 @@ -669697,7 +647521,7 @@ sub_8146DAC: @ 8146DAC push {r4,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r0, _08146DD4 + ldr r0, =0x0000ffff movs r1, 0 str r1, [sp] movs r1, 0x1 @@ -669713,14 +647537,14 @@ sub_8146DAC: @ 8146DAC pop {r1} bx r1 .align 2, 0 -_08146DD4: .4byte 0x0000ffff + .pool thumb_func_end sub_8146DAC thumb_func_start sub_8146DD8 sub_8146DD8: @ 8146DD8 push {lr} adds r2, r0, 0 - ldr r0, _08146DF4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -669734,14 +647558,14 @@ _08146DEE: pop {r1} bx r1 .align 2, 0 -_08146DF4: .4byte 0x02037fd4 + .pool thumb_func_end sub_8146DD8 thumb_func_start sub_8146DF8 sub_8146DF8: @ 8146DF8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08146E78 + ldr r0, =0x0203aba0 ldr r0, [r0] ldrb r1, [r0] movs r3, 0 @@ -669749,7 +647573,7 @@ sub_8146DF8: @ 8146DF8 ldrh r2, [r4, 0xC] movs r0, 0xC ldrsh r1, [r4, r0] - ldr r0, _08146E7C + ldr r0, =0x000003ff cmp r1, r0 bgt _08146E18 adds r0, r2, 0 @@ -669771,7 +647595,7 @@ _08146E18: bge _08146E34 strh r3, [r4, 0xA] _08146E34: - ldr r0, _08146E80 + ldr r0, =0x02038c28 movs r1, 0xA ldrsh r3, [r4, r1] movs r1, 0x78 @@ -669783,13 +647607,13 @@ _08146E34: bne _08146E90 movs r0, 0 bl SetVBlankCallback - ldr r1, _08146E84 + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08146E88 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08146E8C + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] @@ -669801,12 +647625,7 @@ _08146E34: bl remove_task b _08146EB0 .align 2, 0 -_08146E78: .4byte 0x0203aba0 -_08146E7C: .4byte 0x000003ff -_08146E80: .4byte 0x02038c28 -_08146E84: .4byte 0x040000b0 -_08146E88: .4byte 0x0000c5ff -_08146E8C: .4byte 0x00007fff + .pool _08146E90: ldrh r1, [r4, 0xE] movs r2, 0xE @@ -669815,10 +647634,10 @@ _08146E90: bne _08146EA4 adds r0, r1, 0x1 strh r0, [r4, 0xE] - ldr r0, _08146EB8 + ldr r0, =sub_8146F68 + 1 bl SetVBlankCallback _08146EA4: - ldr r0, _08146EBC + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -669830,41 +647649,40 @@ _08146EB0: pop {r1} bx r1 .align 2, 0 -_08146EB8: .4byte sub_8146F68 + 1 -_08146EBC: .4byte 0x0203aba0 + .pool thumb_func_end sub_8146DF8 thumb_func_start sub_8146EC0 sub_8146EC0: @ 8146EC0 push {lr} - ldr r1, _08146F1C + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08146F20 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08146F24 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F2C - ldr r2, _08146F28 + ldr r2, =0x0203aba0 ldr r0, [r2] ldrb r0, [r0] cmp r0, 0 beq _08146EF8 - ldr r1, _08146F2C - ldr r0, _08146F30 + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r3, 0xF0 lsls r3, 3 adds r0, r3 str r0, [r1, 0x4] - ldr r0, _08146F34 + ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _08146EF8: - ldr r1, _08146F38 + ldr r1, =0x04000048 ldr r2, [r2] ldrh r0, [r2, 0x2] strh r0, [r1] @@ -669883,56 +647701,43 @@ _08146EF8: pop {r0} bx r0 .align 2, 0 -_08146F1C: .4byte 0x040000b0 -_08146F20: .4byte 0x0000c5ff -_08146F24: .4byte 0x00007fff -_08146F28: .4byte 0x0203aba0 -_08146F2C: .4byte 0x040000d4 -_08146F30: .4byte 0x02038c28 -_08146F34: .4byte 0x800000a0 -_08146F38: .4byte 0x04000048 + .pool thumb_func_end sub_8146EC0 thumb_func_start sub_8146F3C sub_8146F3C: @ 8146F3C push {lr} bl sub_8146EC0 - ldr r1, _08146F58 - ldr r0, _08146F5C + ldr r1, =0x040000b0 + ldr r0, =0x020393a8 str r0, [r1] - ldr r0, _08146F60 + ldr r0, =0x04000010 str r0, [r1, 0x4] - ldr r0, _08146F64 + ldr r0, =0xa2400001 str r0, [r1, 0x8] ldr r0, [r1, 0x8] pop {r0} bx r0 .align 2, 0 -_08146F58: .4byte 0x040000b0 -_08146F5C: .4byte 0x020393a8 -_08146F60: .4byte 0x04000010 -_08146F64: .4byte 0xa2400001 + .pool thumb_func_end sub_8146F3C thumb_func_start sub_8146F68 sub_8146F68: @ 8146F68 push {lr} bl sub_8146EC0 - ldr r1, _08146F84 - ldr r0, _08146F88 + ldr r1, =0x040000b0 + ldr r0, =0x020393a8 str r0, [r1] - ldr r0, _08146F8C + ldr r0, =0x04000040 str r0, [r1, 0x4] - ldr r0, _08146F90 + ldr r0, =0xa2400001 str r0, [r1, 0x8] ldr r0, [r1, 0x8] pop {r0} bx r0 .align 2, 0 -_08146F84: .4byte 0x040000b0 -_08146F88: .4byte 0x020393a8 -_08146F8C: .4byte 0x04000040 -_08146F90: .4byte 0xa2400001 + .pool thumb_func_end sub_8146F68 thumb_func_start sub_8146F94 @@ -669940,8 +647745,8 @@ sub_8146F94: @ 8146F94 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08146FC4 - ldr r2, _08146FC8 + ldr r5, =0x085c8b7c + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -669961,8 +647766,7 @@ _08146FA6: pop {r0} bx r0 .align 2, 0 -_08146FC4: .4byte 0x085c8b7c -_08146FC8: .4byte 0x03005e00 + .pool thumb_func_end sub_8146F94 thumb_func_start sub_8146FCC @@ -669973,17 +647777,17 @@ sub_8146FCC: @ 8146FCC add r0, sp, 0x4 add r1, sp, 0x8 bl sub_8149F58 - ldr r0, _0814700C + ldr r0, =0x085b98b0 ldr r1, [sp, 0x8] movs r2, 0x20 bl CpuSet movs r0, 0 str r0, [sp] ldr r1, [sp, 0x4] - ldr r2, _08147010 + ldr r2, =0x05000200 mov r0, sp bl CpuSet - ldr r0, _08147014 + ldr r0, =0x085c8ed4 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -669996,9 +647800,7 @@ sub_8146FCC: @ 8146FCC pop {r1} bx r1 .align 2, 0 -_0814700C: .4byte 0x085b98b0 -_08147010: .4byte 0x05000200 -_08147014: .4byte 0x085c8ed4 + .pool thumb_func_end sub_8146FCC thumb_func_start sub_8147018 @@ -670008,12 +647810,12 @@ sub_8147018: @ 8147018 push {r7} sub sp, 0x10 adds r7, r0, 0 - ldr r1, _08147098 + ldr r1, =0x085c8b88 mov r0, sp movs r2, 0x4 bl memcpy add r4, sp, 0x4 - ldr r1, _0814709C + ldr r1, =0x085c8b8c adds r0, r4, 0 movs r2, 0xA bl memcpy @@ -670022,7 +647824,7 @@ sub_8147018: @ 8147018 ands r5, r0 movs r1, 0 mov r8, r4 - ldr r6, _081470A0 + ldr r6, =0x02038c08 _08147046: lsls r5, 16 asrs r5, 16 @@ -670065,9 +647867,7 @@ _08147046: pop {r1} bx r1 .align 2, 0 -_08147098: .4byte 0x085c8b88 -_0814709C: .4byte 0x085c8b8c -_081470A0: .4byte 0x02038c08 + .pool thumb_func_end sub_8147018 thumb_func_start sub_81470A4 @@ -670079,7 +647879,7 @@ sub_81470A4: @ 81470A4 cmp r0, 0 bne _081470C4 bl sub_8149F84 - ldr r0, _081470CC + ldr r0, =sub_8146F94 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -670089,14 +647889,14 @@ _081470C4: pop {r1} bx r1 .align 2, 0 -_081470CC: .4byte sub_8146F94 + 1 + .pool thumb_func_end sub_81470A4 thumb_func_start sub_81470D0 sub_81470D0: @ 81470D0 push {r4,r5,lr} - ldr r0, _0814712C - ldr r5, _08147130 + ldr r0, =0x085c8e68 + ldr r5, =0x02038c08 movs r2, 0 ldrsh r1, [r5, r2] movs r3, 0x4 @@ -670105,7 +647905,7 @@ sub_81470D0: @ 81470D0 bl obj_add_from_template_backward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _08147134 + ldr r1, =0x02020630 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -670126,7 +647926,7 @@ sub_81470D0: @ 81470D0 strh r0, [r4, 0x2E] ldr r0, [r5, 0xC] strh r0, [r4, 0x30] - ldr r0, _08147138 + ldr r0, =0x0000ffff strh r0, [r4, 0x32] adds r0, r4, 0 bl obj_alloc_rotscale_entry @@ -670138,10 +647938,7 @@ sub_81470D0: @ 81470D0 pop {r1} bx r1 .align 2, 0 -_0814712C: .4byte 0x085c8e68 -_08147130: .4byte 0x02038c08 -_08147134: .4byte 0x02020630 -_08147138: .4byte 0x0000ffff + .pool thumb_func_end sub_81470D0 thumb_func_start sub_814713C @@ -670149,7 +647946,7 @@ sub_814713C: @ 814713C push {r4-r6,lr} sub sp, 0x4 adds r4, r0, 0 - ldr r1, _0814715C + ldr r1, =0x085c8b96 mov r0, sp movs r2, 0x4 bl memcpy @@ -670162,7 +647959,7 @@ sub_814713C: @ 814713C strh r0, [r4, 0x30] b _081471F2 .align 2, 0 -_0814715C: .4byte 0x085c8b96 + .pool _08147160: ldrh r0, [r4, 0x20] lsls r1, r0, 16 @@ -670183,7 +647980,7 @@ _08147160: cmp r5, r0 beq _081471CE strh r2, [r4, 0x32] - ldr r0, _081471FC + ldr r0, =0x04000008 ldrh r2, [r0] lsrs r2, 8 movs r0, 0x1F @@ -670199,7 +647996,7 @@ _08147160: adds r0, r5 lsls r0, 1 adds r0, r2 - ldr r6, _08147200 + ldr r6, =0x0000f001 adds r3, r6, 0 strh r3, [r0] subs r0, r1, 0x1 @@ -670243,8 +648040,7 @@ _081471F2: pop {r0} bx r0 .align 2, 0 -_081471FC: .4byte 0x04000008 -_08147200: .4byte 0x0000f001 + .pool thumb_func_end sub_814713C thumb_func_start sub_8147204 @@ -670252,8 +648048,8 @@ sub_8147204: @ 8147204 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08147234 - ldr r2, _08147238 + ldr r5, =0x085c8b9c + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -670273,8 +648069,7 @@ _08147216: pop {r0} bx r0 .align 2, 0 -_08147234: .4byte 0x085c8b9c -_08147238: .4byte 0x03005e00 + .pool thumb_func_end sub_8147204 thumb_func_start sub_814723C @@ -670283,19 +648078,19 @@ sub_814723C: @ 814723C adds r4, r0, 0 bl sub_8149F08 bl dp12_8087EA4 - ldr r0, _08147290 + ldr r0, =0x0203aba0 ldr r1, [r0] movs r0, 0 strh r0, [r1, 0x2] movs r0, 0x3F strh r0, [r1, 0x4] - ldr r0, _08147294 + ldr r0, =0x0000f0f1 strh r0, [r1, 0x6] movs r0, 0xA0 strh r0, [r1, 0x8] movs r1, 0 - ldr r3, _08147298 - ldr r2, _0814729C + ldr r3, =0x020393a8 + ldr r2, =0x0000f3f4 _08147262: lsls r0, r1, 1 adds r0, r3 @@ -670305,9 +648100,9 @@ _08147262: lsrs r1, r0, 16 cmp r1, 0x9F bls _08147262 - ldr r0, _081472A0 + ldr r0, =sub_8147688 + 1 bl SetVBlankCallback - ldr r0, _08147290 + ldr r0, =0x0203aba0 ldr r1, [r0] movs r0, 0x78 strh r0, [r1, 0x2C] @@ -670319,11 +648114,7 @@ _08147262: pop {r1} bx r1 .align 2, 0 -_08147290: .4byte 0x0203aba0 -_08147294: .4byte 0x0000f0f1 -_08147298: .4byte 0x020393a8 -_0814729C: .4byte 0x0000f3f4 -_081472A0: .4byte sub_8147688 + 1 + .pool thumb_func_end sub_814723C thumb_func_start sub_81472A4 @@ -670331,7 +648122,7 @@ sub_81472A4: @ 81472A4 push {r4-r7,lr} sub sp, 0xC adds r6, r0, 0 - ldr r2, _0814732C + ldr r2, =0x0203aba0 ldr r1, [r2] ldrb r0, [r1] movs r0, 0 @@ -670350,9 +648141,9 @@ sub_81472A4: @ 81472A4 movs r1, 0x78 movs r2, 0x50 bl sub_814A1AC - ldr r5, _08147330 + ldr r5, =0x02038c28 _081472D4: - ldr r4, _0814732C + ldr r4, =0x0203aba0 ldr r0, [r4] movs r7, 0x2A ldrsh r3, [r0, r7] @@ -670397,8 +648188,7 @@ _08147318: pop {r1} bx r1 .align 2, 0 -_0814732C: .4byte 0x0203aba0 -_08147330: .4byte 0x02038c28 + .pool thumb_func_end sub_81472A4 thumb_func_start sub_8147334 @@ -670412,7 +648202,7 @@ sub_8147334: @ 8147334 add r1, sp, 0xC movs r0, 0 strb r0, [r1] - ldr r4, _081473B8 + ldr r4, =0x0203aba0 ldr r1, [r4] ldrb r0, [r1] movs r0, 0 @@ -670447,7 +648237,7 @@ _08147372: ldrh r1, [r3, 0x28] movs r4, 0xF0 _0814738A: - ldr r6, _081473BC + ldr r6, =0x02038c28 movs r0, 0x2A ldrsh r2, [r3, r0] lsls r2, 1 @@ -670469,8 +648259,7 @@ _0814738A: strb r0, [r5] b _08147372 .align 2, 0 -_081473B8: .4byte 0x0203aba0 -_081473BC: .4byte 0x02038c28 + .pool _081473C0: ldr r1, [r7] ldrh r0, [r1, 0x2E] @@ -670493,7 +648282,7 @@ _081473DE: cmp r0, r2 bge _08147406 adds r3, r4, 0 - ldr r5, _08147424 + ldr r5, =0x0203aba0 _081473EA: ldr r2, [r5] ldrh r0, [r2, 0x2A] @@ -670525,7 +648314,7 @@ _08147406: pop {r1} bx r1 .align 2, 0 -_08147424: .4byte 0x0203aba0 + .pool thumb_func_end sub_8147334 thumb_func_start sub_8147428 @@ -670533,7 +648322,7 @@ sub_8147428: @ 8147428 push {r4-r6,lr} sub sp, 0xC adds r6, r0, 0 - ldr r2, _081474A8 + ldr r2, =0x0203aba0 ldr r1, [r2] ldrb r0, [r1] movs r0, 0 @@ -670551,9 +648340,9 @@ sub_8147428: @ 8147428 movs r1, 0x78 movs r2, 0x50 bl sub_814A1AC - ldr r5, _081474AC + ldr r5, =0x02038c28 _08147456: - ldr r4, _081474A8 + ldr r4, =0x0203aba0 ldr r0, [r4] movs r1, 0x2A ldrsh r3, [r0, r1] @@ -670595,8 +648384,7 @@ _08147494: pop {r1} bx r1 .align 2, 0 -_081474A8: .4byte 0x0203aba0 -_081474AC: .4byte 0x02038c28 + .pool thumb_func_end sub_8147428 thumb_func_start sub_81474B0 @@ -670611,7 +648399,7 @@ sub_81474B0: @ 81474B0 add r1, sp, 0xC movs r0, 0 strb r0, [r1] - ldr r4, _08147538 + ldr r4, =0x0203aba0 ldr r1, [r4] ldrb r0, [r1] movs r0, 0 @@ -670629,9 +648417,9 @@ sub_81474B0: @ 81474B0 movs r2, 0x50 movs r3, 0 bl sub_814A1AC - ldr r7, _0814753C + ldr r7, =0x02038c28 mov r10, r7 - ldr r0, _08147538 + ldr r0, =0x0203aba0 mov r8, r0 add r6, sp, 0xC _081474F4: @@ -670670,8 +648458,7 @@ _08147514: strb r0, [r6] b _081474F4 .align 2, 0 -_08147538: .4byte 0x0203aba0 -_0814753C: .4byte 0x02038c28 + .pool _08147540: mov r0, r8 ldr r2, [r0] @@ -670693,9 +648480,9 @@ _0814755E: ldrsh r0, [r2, r4] cmp r0, r3 ble _08147588 - ldr r6, _081475A8 + ldr r6, =0x02038c28 adds r3, r1, 0 - ldr r5, _081475AC + ldr r5, =0x0203aba0 _0814756C: ldr r2, [r5] ldrh r0, [r2, 0x2A] @@ -670712,7 +648499,7 @@ _0814756C: cmp r1, r0 bgt _0814756C _08147588: - ldr r7, _081475AC + ldr r7, =0x0203aba0 ldr r0, [r7] ldrb r1, [r0] adds r1, 0x1 @@ -670728,8 +648515,7 @@ _08147588: pop {r1} bx r1 .align 2, 0 -_081475A8: .4byte 0x02038c28 -_081475AC: .4byte 0x0203aba0 + .pool thumb_func_end sub_81474B0 thumb_func_start sub_81475B0 @@ -670737,7 +648523,7 @@ sub_81475B0: @ 81475B0 push {r4-r7,lr} sub sp, 0xC adds r7, r0, 0 - ldr r1, _08147640 + ldr r1, =0x0203aba0 ldr r0, [r1] ldrb r2, [r0] movs r2, 0 @@ -670754,10 +648540,10 @@ sub_81475B0: @ 81475B0 movs r1, 0x78 movs r2, 0x50 bl sub_814A1AC - ldr r6, _08147644 + ldr r6, =0x02038c28 _081475DC: movs r2, 0x78 - ldr r5, _08147640 + ldr r5, =0x0203aba0 ldr r3, [r5] ldrh r4, [r3, 0x28] movs r1, 0x28 @@ -670807,25 +648593,24 @@ _0814762A: pop {r1} bx r1 .align 2, 0 -_08147640: .4byte 0x0203aba0 -_08147644: .4byte 0x02038c28 + .pool thumb_func_end sub_81475B0 thumb_func_start sub_8147648 sub_8147648: @ 8147648 push {lr} - ldr r1, _08147678 + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _0814767C + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08147680 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, _08147684 + ldr r0, =sub_8147204 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -670834,43 +648619,40 @@ sub_8147648: @ 8147648 pop {r1} bx r1 .align 2, 0 -_08147678: .4byte 0x040000b0 -_0814767C: .4byte 0x0000c5ff -_08147680: .4byte 0x00007fff -_08147684: .4byte sub_8147204 + 1 + .pool thumb_func_end sub_8147648 thumb_func_start sub_8147688 sub_8147688: @ 8147688 push {r4,lr} - ldr r4, _081476F4 + ldr r4, =0x040000b0 ldrh r1, [r4, 0xA] - ldr r0, _081476F8 + ldr r0, =0x0000c5ff ands r0, r1 strh r0, [r4, 0xA] ldrh r1, [r4, 0xA] - ldr r0, _081476FC + ldr r0, =0x00007fff ands r0, r1 strh r0, [r4, 0xA] ldrh r0, [r4, 0xA] bl sub_8149F2C - ldr r3, _08147700 + ldr r3, =0x0203aba0 ldr r0, [r3] ldrb r0, [r0] cmp r0, 0 beq _081476C0 - ldr r1, _08147704 - ldr r0, _08147708 + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r2, 0xF0 lsls r2, 3 adds r0, r2 str r0, [r1, 0x4] - ldr r0, _0814770C + ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _081476C0: - ldr r2, _08147710 + ldr r2, =0x04000048 ldr r1, [r3] ldrh r0, [r1, 0x2] strh r0, [r2] @@ -670881,7 +648663,7 @@ _081476C0: ldrh r0, [r1, 0x8] strh r0, [r2] subs r2, 0x4 - ldr r0, _08147708 + ldr r0, =0x02038c28 movs r1, 0xF0 lsls r1, 3 adds r0, r1 @@ -670889,22 +648671,14 @@ _081476C0: strh r1, [r2] str r0, [r4] str r2, [r4, 0x4] - ldr r0, _08147714 + ldr r0, =0xa2400001 str r0, [r4, 0x8] ldr r0, [r4, 0x8] pop {r4} pop {r0} bx r0 .align 2, 0 -_081476F4: .4byte 0x040000b0 -_081476F8: .4byte 0x0000c5ff -_081476FC: .4byte 0x00007fff -_08147700: .4byte 0x0203aba0 -_08147704: .4byte 0x040000d4 -_08147708: .4byte 0x02038c28 -_0814770C: .4byte 0x800000a0 -_08147710: .4byte 0x04000048 -_08147714: .4byte 0xa2400001 + .pool thumb_func_end sub_8147688 thumb_func_start sub_8147718 @@ -670912,8 +648686,8 @@ sub_8147718: @ 8147718 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08147748 - ldr r2, _0814774C + ldr r5, =0x085c8bb8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -670933,8 +648707,7 @@ _0814772A: pop {r0} bx r0 .align 2, 0 -_08147748: .4byte 0x085c8bb8 -_0814774C: .4byte 0x03005e00 + .pool thumb_func_end sub_8147718 thumb_func_start sub_8147750 @@ -670944,8 +648717,8 @@ sub_8147750: @ 8147750 bl sub_8149F08 bl dp12_8087EA4 movs r2, 0 - ldr r4, _08147798 - ldr r3, _0814779C + ldr r4, =0x020393a8 + ldr r3, =0x0203aba0 _08147762: lsls r1, r2, 1 adds r1, r4 @@ -670957,9 +648730,9 @@ _08147762: lsrs r2, r0, 24 cmp r2, 0x9F bls _08147762 - ldr r0, _081477A0 + ldr r0, =sub_8147888 + 1 bl SetVBlankCallback - ldr r0, _081477A4 + ldr r0, =sub_81478C0 + 1 bl SetHBlankCallback movs r0, 0x2 bl enable_irqs @@ -670971,10 +648744,7 @@ _08147762: pop {r1} bx r1 .align 2, 0 -_08147798: .4byte 0x020393a8 -_0814779C: .4byte 0x0203aba0 -_081477A0: .4byte sub_8147888 + 1 -_081477A4: .4byte sub_81478C0 + 1 + .pool thumb_func_end sub_8147750 thumb_func_start sub_81477A8 @@ -670984,7 +648754,7 @@ sub_81477A8: @ 81477A8 push {r7} sub sp, 0x4 adds r6, r0, 0 - ldr r0, _08147874 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] movs r0, 0 @@ -671002,7 +648772,7 @@ sub_81477A8: @ 81477A8 lsls r5, 3 adds r0, r4, r5 strh r0, [r6, 0xA] - ldr r0, _08147878 + ldr r0, =0x1fff0000 cmp r1, r0 bgt _081477E4 movs r1, 0xC0 @@ -671016,10 +648786,10 @@ _081477E8: lsrs r0, r4, 8 asrs r1, r7, 16 bl sine - ldr r1, _0814787C + ldr r1, =0x02038c28 lsls r2, r5, 1 adds r2, r1 - ldr r1, _08147874 + ldr r1, =0x0203aba0 ldr r1, [r1] ldrh r1, [r1, 0x16] adds r0, r1 @@ -671056,19 +648826,19 @@ _08147838: ldrsh r0, [r6, r5] cmp r0, 0 beq _0814785A - ldr r0, _08147880 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0814785A - ldr r0, _08147884 + ldr r0, =sub_8147718 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task _0814785A: - ldr r0, _08147874 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -671082,46 +648852,39 @@ _0814785A: pop {r1} bx r1 .align 2, 0 -_08147874: .4byte 0x0203aba0 -_08147878: .4byte 0x1fff0000 -_0814787C: .4byte 0x02038c28 -_08147880: .4byte 0x02037fd4 -_08147884: .4byte sub_8147718 + 1 + .pool thumb_func_end sub_81477A8 thumb_func_start sub_8147888 sub_8147888: @ 8147888 push {lr} bl sub_8149F2C - ldr r0, _081478B0 + ldr r0, =0x0203aba0 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 beq _081478AC - ldr r1, _081478B4 - ldr r0, _081478B8 + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r2, 0xF0 lsls r2, 3 adds r0, r2 str r0, [r1, 0x4] - ldr r0, _081478BC + ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _081478AC: pop {r0} bx r0 .align 2, 0 -_081478B0: .4byte 0x0203aba0 -_081478B4: .4byte 0x040000d4 -_081478B8: .4byte 0x02038c28 -_081478BC: .4byte 0x800000a0 + .pool thumb_func_end sub_8147888 thumb_func_start sub_81478C0 sub_81478C0: @ 81478C0 - ldr r1, _081478E0 - ldr r0, _081478E4 + ldr r1, =0x02038c28 + ldr r0, =0x04000006 ldrh r0, [r0] lsls r0, 1 movs r2, 0xF0 @@ -671129,7 +648892,7 @@ sub_81478C0: @ 81478C0 adds r1, r2 adds r0, r1 ldrh r1, [r0] - ldr r0, _081478E8 + ldr r0, =0x04000016 strh r1, [r0] adds r0, 0x4 strh r1, [r0] @@ -671137,9 +648900,7 @@ sub_81478C0: @ 81478C0 strh r1, [r0] bx lr .align 2, 0 -_081478E0: .4byte 0x02038c28 -_081478E4: .4byte 0x04000006 -_081478E8: .4byte 0x04000016 + .pool thumb_func_end sub_81478C0 thumb_func_start sub_81478EC @@ -671147,8 +648908,8 @@ sub_81478EC: @ 81478EC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0814791C - ldr r2, _08147920 + ldr r5, =0x085c8bc0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -671168,8 +648929,7 @@ _081478FE: pop {r0} bx r0 .align 2, 0 -_0814791C: .4byte 0x085c8bc0 -_08147920: .4byte 0x03005e00 + .pool thumb_func_end sub_81478EC thumb_func_start sub_8147924 @@ -671178,7 +648938,7 @@ sub_8147924: @ 8147924 adds r4, r0, 0 bl sub_8149F08 bl dp12_8087EA4 - ldr r0, _08147970 + ldr r0, =0x0203aba0 ldr r1, [r0] movs r2, 0 movs r0, 0x3F @@ -671189,7 +648949,7 @@ sub_8147924: @ 8147924 movs r0, 0xA0 strh r0, [r1, 0x8] movs r1, 0 - ldr r3, _08147974 + ldr r3, =0x020393a8 movs r2, 0xF2 _0814794A: lsls r0, r1, 1 @@ -671200,7 +648960,7 @@ _0814794A: lsrs r1, r0, 24 cmp r1, 0x9F bls _0814794A - ldr r0, _08147978 + ldr r0, =sub_8147A58 + 1 bl SetVBlankCallback ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -671210,9 +648970,7 @@ _0814794A: pop {r1} bx r1 .align 2, 0 -_08147970: .4byte 0x0203aba0 -_08147974: .4byte 0x020393a8 -_08147978: .4byte sub_8147A58 + 1 + .pool thumb_func_end sub_8147924 thumb_func_start sub_814797C @@ -671221,12 +648979,12 @@ sub_814797C: @ 814797C mov r7, r8 push {r7} adds r4, r0, 0 - ldr r0, _08147A10 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] movs r0, 0 strb r0, [r1] - ldr r7, _08147A14 + ldr r7, =0x02038c28 ldrh r0, [r4, 0xC] ldrb r5, [r4, 0xC] adds r0, 0x10 @@ -671282,7 +649040,7 @@ _081479D8: adds r0, 0x1 strh r0, [r4, 0x8] _081479F6: - ldr r0, _08147A10 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -671295,25 +649053,24 @@ _081479F6: pop {r1} bx r1 .align 2, 0 -_08147A10: .4byte 0x0203aba0 -_08147A14: .4byte 0x02038c28 + .pool thumb_func_end sub_814797C thumb_func_start sub_8147A18 sub_8147A18: @ 8147A18 push {lr} - ldr r1, _08147A48 + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08147A4C + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08147A50 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, _08147A54 + ldr r0, =sub_81478EC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -671322,43 +649079,40 @@ sub_8147A18: @ 8147A18 pop {r1} bx r1 .align 2, 0 -_08147A48: .4byte 0x040000b0 -_08147A4C: .4byte 0x0000c5ff -_08147A50: .4byte 0x00007fff -_08147A54: .4byte sub_81478EC + 1 + .pool thumb_func_end sub_8147A18 thumb_func_start sub_8147A58 sub_8147A58: @ 8147A58 push {r4,lr} - ldr r4, _08147AB8 + ldr r4, =0x040000b0 ldrh r1, [r4, 0xA] - ldr r0, _08147ABC + ldr r0, =0x0000c5ff ands r0, r1 strh r0, [r4, 0xA] ldrh r1, [r4, 0xA] - ldr r0, _08147AC0 + ldr r0, =0x00007fff ands r0, r1 strh r0, [r4, 0xA] ldrh r0, [r4, 0xA] bl sub_8149F2C - ldr r3, _08147AC4 + ldr r3, =0x0203aba0 ldr r0, [r3] ldrb r0, [r0] cmp r0, 0 beq _08147A90 - ldr r1, _08147AC8 - ldr r0, _08147ACC + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r2, 0xF0 lsls r2, 3 adds r0, r2 str r0, [r1, 0x4] - ldr r0, _08147AD0 + ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _08147A90: - ldr r2, _08147AD4 + ldr r2, =0x04000048 ldr r1, [r3] ldrh r0, [r1, 0x2] strh r0, [r2] @@ -671368,28 +649122,18 @@ _08147A90: subs r2, 0x6 ldrh r0, [r1, 0x8] strh r0, [r2] - ldr r0, _08147AD8 + ldr r0, =0x020393a8 str r0, [r4] - ldr r0, _08147ADC + ldr r0, =0x04000040 str r0, [r4, 0x4] - ldr r0, _08147AE0 + ldr r0, =0xa2400001 str r0, [r4, 0x8] ldr r0, [r4, 0x8] pop {r4} pop {r0} bx r0 .align 2, 0 -_08147AB8: .4byte 0x040000b0 -_08147ABC: .4byte 0x0000c5ff -_08147AC0: .4byte 0x00007fff -_08147AC4: .4byte 0x0203aba0 -_08147AC8: .4byte 0x040000d4 -_08147ACC: .4byte 0x02038c28 -_08147AD0: .4byte 0x800000a0 -_08147AD4: .4byte 0x04000048 -_08147AD8: .4byte 0x020393a8 -_08147ADC: .4byte 0x04000040 -_08147AE0: .4byte 0xa2400001 + .pool thumb_func_end sub_8147A58 thumb_func_start sub_8147AE4 @@ -671397,7 +649141,7 @@ sub_8147AE4: @ 8147AE4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08147B00 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -671408,7 +649152,7 @@ sub_8147AE4: @ 8147AE4 pop {r0} bx r0 .align 2, 0 -_08147B00: .4byte 0x03005e00 + .pool thumb_func_end sub_8147AE4 thumb_func_start sub_8147B04 @@ -671416,7 +649160,7 @@ sub_8147B04: @ 8147B04 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08147B20 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -671427,7 +649171,7 @@ sub_8147B04: @ 8147B04 pop {r0} bx r0 .align 2, 0 -_08147B20: .4byte 0x03005e00 + .pool thumb_func_end sub_8147B04 thumb_func_start sub_8147B24 @@ -671435,7 +649179,7 @@ sub_8147B24: @ 8147B24 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08147B40 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -671446,7 +649190,7 @@ sub_8147B24: @ 8147B24 pop {r0} bx r0 .align 2, 0 -_08147B40: .4byte 0x03005e00 + .pool thumb_func_end sub_8147B24 thumb_func_start sub_8147B44 @@ -671454,7 +649198,7 @@ sub_8147B44: @ 8147B44 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08147B60 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -671465,7 +649209,7 @@ sub_8147B44: @ 8147B44 pop {r0} bx r0 .align 2, 0 -_08147B60: .4byte 0x03005e00 + .pool thumb_func_end sub_8147B44 thumb_func_start sub_8147B64 @@ -671473,7 +649217,7 @@ sub_8147B64: @ 8147B64 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08147B80 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -671484,7 +649228,7 @@ sub_8147B64: @ 8147B64 pop {r0} bx r0 .align 2, 0 -_08147B80: .4byte 0x03005e00 + .pool thumb_func_end sub_8147B64 thumb_func_start sub_8147B84 @@ -671492,8 +649236,8 @@ sub_8147B84: @ 8147B84 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08147BB4 - ldr r2, _08147BB8 + ldr r5, =0x085c8bcc + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -671513,8 +649257,7 @@ _08147B96: pop {r0} bx r0 .align 2, 0 -_08147BB4: .4byte 0x085c8bcc -_08147BB8: .4byte 0x03005e00 + .pool thumb_func_end sub_8147B84 thumb_func_start sub_8147BBC @@ -671531,7 +649274,7 @@ sub_8147BBC: @ 8147BBC strh r0, [r4, 0xC] movs r0, 0xEF strh r0, [r4, 0xE] - ldr r0, _08147C14 + ldr r0, =0x0203aba0 ldr r1, [r0] movs r0, 0x3F strh r0, [r1, 0x2] @@ -671540,8 +649283,8 @@ sub_8147BBC: @ 8147BBC movs r0, 0xA0 strh r0, [r1, 0x8] movs r1, 0 - ldr r3, _08147C18 - ldr r2, _08147C1C + ldr r3, =0x020393a8 + ldr r2, =0x0000f0f1 _08147BF0: lsls r0, r1, 1 adds r0, r3 @@ -671551,7 +649294,7 @@ _08147BF0: lsrs r1, r0, 24 cmp r1, 0x9F bls _08147BF0 - ldr r0, _08147C20 + ldr r0, =sub_81480CC + 1 bl SetVBlankCallback ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -671561,10 +649304,7 @@ _08147BF0: pop {r1} bx r1 .align 2, 0 -_08147C14: .4byte 0x0203aba0 -_08147C18: .4byte 0x020393a8 -_08147C1C: .4byte 0x0000f0f1 -_08147C20: .4byte sub_81480CC + 1 + .pool thumb_func_end sub_8147BBC thumb_func_start sub_8147C24 @@ -671574,15 +649314,15 @@ sub_8147C24: @ 8147C24 push {r7} sub sp, 0x8 mov r8, r0 - ldr r6, _08147CCC + ldr r6, =0x085c94d0 add r1, sp, 0x4 mov r0, sp bl sub_8149F58 - ldr r0, _08147CD0 + ldr r0, =0x085b9af0 ldr r1, [sp, 0x4] movs r2, 0xF0 bl CpuSet - ldr r1, _08147CD4 + ldr r1, =0x085c8fdc mov r2, r8 movs r3, 0x26 ldrsh r0, [r2, r3] @@ -671592,8 +649332,8 @@ sub_8147C24: @ 8147C24 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _08147CD8 - ldr r0, _08147CDC + ldr r1, =0x085c8ff0 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 2 @@ -671636,7 +649376,7 @@ _08147C7E: ble _08147C78 movs r0, 0x2 bl enable_irqs - ldr r0, _08147CE0 + ldr r0, =sub_81481E0 + 1 bl SetHBlankCallback mov r2, r8 ldrh r0, [r2, 0x8] @@ -671650,24 +649390,19 @@ _08147C7E: pop {r1} bx r1 .align 2, 0 -_08147CCC: .4byte 0x085c94d0 -_08147CD0: .4byte 0x085b9af0 -_08147CD4: .4byte 0x085c8fdc -_08147CD8: .4byte 0x085c8ff0 -_08147CDC: .4byte 0x03005d90 -_08147CE0: .4byte sub_81481E0 + 1 + .pool thumb_func_end sub_8147C24 thumb_func_start sub_8147CE4 sub_8147CE4: @ 8147CE4 push {r4-r7,lr} adds r4, r0, 0 - ldr r0, _08147DC8 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] movs r0, 0 strb r0, [r1] - ldr r7, _08147DCC + ldr r7, =0x02038c28 ldrh r0, [r4, 0xA] ldrb r5, [r4, 0xA] adds r0, 0x10 @@ -671765,7 +649500,7 @@ _08147D9A: adds r0, 0x1 strh r0, [r4, 0x8] _08147DA6: - ldr r0, _08147DC8 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrh r0, [r1, 0x18] subs r0, 0x8 @@ -671782,20 +649517,19 @@ _08147DA6: pop {r1} bx r1 .align 2, 0 -_08147DC8: .4byte 0x0203aba0 -_08147DCC: .4byte 0x02038c28 + .pool thumb_func_end sub_8147CE4 thumb_func_start sub_8147DD0 sub_8147DD0: @ 8147DD0 push {r4,r5,lr} adds r4, r0, 0 - ldr r2, _08147E44 + ldr r2, =0x0203aba0 ldr r1, [r2] ldrb r0, [r1] movs r0, 0 strb r0, [r1] - ldr r1, _08147E48 + ldr r1, =0x02038c28 adds r5, r2, 0 movs r2, 0xF0 _08147DE4: @@ -671843,15 +649577,14 @@ _08147DE4: pop {r1} bx r1 .align 2, 0 -_08147E44: .4byte 0x0203aba0 -_08147E48: .4byte 0x02038c28 + .pool thumb_func_end sub_8147DD0 thumb_func_start sub_8147E4C sub_8147E4C: @ 8147E4C push {r4,lr} adds r4, r0, 0 - ldr r0, _08147E84 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrh r0, [r1, 0x18] subs r0, 0x8 @@ -671877,7 +649610,7 @@ _08147E7C: pop {r1} bx r1 .align 2, 0 -_08147E84: .4byte 0x0203aba0 + .pool thumb_func_end sub_8147E4C thumb_func_start sub_8147E88 @@ -671886,7 +649619,7 @@ sub_8147E88: @ 8147E88 mov r7, r8 push {r7} adds r6, r0, 0 - ldr r7, _08147F28 + ldr r7, =0x0203aba0 ldr r1, [r7] ldrh r0, [r1, 0x18] subs r0, 0x8 @@ -671908,17 +649641,17 @@ sub_8147E88: @ 8147E88 strb r0, [r1] movs r0, 0 bl SetVBlankCallback - ldr r1, _08147F2C + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08147F30 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08147F34 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] - ldr r4, _08147F38 + ldr r4, =0x02038c28 movs r5, 0xA0 lsls r5, 1 adds r0, r4, 0 @@ -671947,7 +649680,7 @@ sub_8147E88: @ 8147E88 ldr r1, [r7] movs r0, 0xBF strh r0, [r1, 0xE] - ldr r0, _08147F3C + ldr r0, =sub_8148160 + 1 bl SetVBlankCallback _08147F1C: movs r0, 0 @@ -671957,19 +649690,14 @@ _08147F1C: pop {r1} bx r1 .align 2, 0 -_08147F28: .4byte 0x0203aba0 -_08147F2C: .4byte 0x040000b0 -_08147F30: .4byte 0x0000c5ff -_08147F34: .4byte 0x00007fff -_08147F38: .4byte 0x02038c28 -_08147F3C: .4byte sub_8148160 + 1 + .pool thumb_func_end sub_8147E88 thumb_func_start sub_8147F40 sub_8147F40: @ 8147F40 push {r4-r7,lr} adds r4, r0, 0 - ldr r2, _08148000 + ldr r2, =0x0203aba0 ldr r1, [r2] ldrb r0, [r1] movs r0, 0 @@ -672012,7 +649740,7 @@ _08147F7A: cmp r0, 0 blt _08147FDC movs r7, 0x50 - ldr r5, _08148004 + ldr r5, =0x02038c28 _08147F98: lsls r0, r2, 16 asrs r3, r0, 16 @@ -672070,22 +649798,21 @@ _08147FEA: pop {r1} bx r1 .align 2, 0 -_08148000: .4byte 0x0203aba0 -_08148004: .4byte 0x02038c28 + .pool thumb_func_end sub_8147F40 thumb_func_start sub_8148008 sub_8148008: @ 8148008 push {r4-r6,lr} adds r4, r0, 0 - ldr r5, _08148038 + ldr r5, =0x0203aba0 ldr r0, [r5] ldrb r1, [r0] movs r6, 0 strb r6, [r0] movs r0, 0x1 negs r0, r0 - ldr r2, _0814803C + ldr r2, =0x00007fff movs r1, 0x10 bl sub_80A2A20 ldr r1, [r5] @@ -672100,15 +649827,14 @@ sub_8148008: @ 8148008 pop {r1} bx r1 .align 2, 0 -_08148038: .4byte 0x0203aba0 -_0814803C: .4byte 0x00007fff + .pool thumb_func_end sub_8148008 thumb_func_start sub_8148040 sub_8148040: @ 8148040 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08148084 + ldr r5, =0x0203aba0 ldr r1, [r5] ldrb r0, [r1] movs r0, 0 @@ -672116,7 +649842,7 @@ sub_8148040: @ 8148040 ldrh r0, [r4, 0xE] adds r0, 0x1 strh r0, [r4, 0xE] - ldr r0, _08148088 + ldr r0, =0x02038c28 movs r2, 0xE ldrsh r1, [r4, r2] movs r2, 0xA0 @@ -672140,21 +649866,20 @@ _08148070: pop {r1} bx r1 .align 2, 0 -_08148084: .4byte 0x0203aba0 -_08148088: .4byte 0x02038c28 + .pool thumb_func_end sub_8148040 thumb_func_start sub_814808C sub_814808C: @ 814808C push {r4,lr} adds r4, r0, 0 - ldr r1, _081480C0 + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _081480C4 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _081480C8 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] @@ -672169,42 +649894,40 @@ sub_814808C: @ 814808C pop {r1} bx r1 .align 2, 0 -_081480C0: .4byte 0x040000b0 -_081480C4: .4byte 0x0000c5ff -_081480C8: .4byte 0x00007fff + .pool thumb_func_end sub_814808C thumb_func_start sub_81480CC sub_81480CC: @ 81480CC push {r4,lr} - ldr r4, _08148134 + ldr r4, =0x040000b0 ldrh r1, [r4, 0xA] - ldr r0, _08148138 + ldr r0, =0x0000c5ff ands r0, r1 strh r0, [r4, 0xA] ldrh r1, [r4, 0xA] - ldr r0, _0814813C + ldr r0, =0x00007fff ands r0, r1 strh r0, [r4, 0xA] ldrh r0, [r4, 0xA] bl sub_8149F2C - ldr r3, _08148140 + ldr r3, =0x0203aba0 ldr r0, [r3] ldrb r0, [r0] cmp r0, 0 beq _08148104 - ldr r1, _08148144 - ldr r0, _08148148 + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r2, 0xF0 lsls r2, 3 adds r0, r2 str r0, [r1, 0x4] - ldr r0, _0814814C + ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _08148104: - ldr r2, _08148150 + ldr r2, =0x04000012 ldr r1, [r3] ldrh r0, [r1, 0x1C] strh r0, [r2] @@ -672217,107 +649940,85 @@ _08148104: subs r2, 0x6 ldrh r0, [r1, 0x8] strh r0, [r2] - ldr r0, _08148154 + ldr r0, =0x020393a8 str r0, [r4] - ldr r0, _08148158 + ldr r0, =0x04000040 str r0, [r4, 0x4] - ldr r0, _0814815C + ldr r0, =0xa2400001 str r0, [r4, 0x8] ldr r0, [r4, 0x8] pop {r4} pop {r0} bx r0 .align 2, 0 -_08148134: .4byte 0x040000b0 -_08148138: .4byte 0x0000c5ff -_0814813C: .4byte 0x00007fff -_08148140: .4byte 0x0203aba0 -_08148144: .4byte 0x040000d4 -_08148148: .4byte 0x02038c28 -_0814814C: .4byte 0x800000a0 -_08148150: .4byte 0x04000012 -_08148154: .4byte 0x020393a8 -_08148158: .4byte 0x04000040 -_0814815C: .4byte 0xa2400001 + .pool thumb_func_end sub_81480CC thumb_func_start sub_8148160 sub_8148160: @ 8148160 push {r4,lr} - ldr r4, _081481B4 + ldr r4, =0x040000b0 ldrh r1, [r4, 0xA] - ldr r0, _081481B8 + ldr r0, =0x0000c5ff ands r0, r1 strh r0, [r4, 0xA] ldrh r1, [r4, 0xA] - ldr r0, _081481BC + ldr r0, =0x00007fff ands r0, r1 strh r0, [r4, 0xA] ldrh r0, [r4, 0xA] bl sub_8149F2C - ldr r2, _081481C0 + ldr r2, =0x0203aba0 ldr r0, [r2] ldrb r0, [r0] cmp r0, 0 beq _08148198 - ldr r1, _081481C4 - ldr r0, _081481C8 + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r3, 0xF0 lsls r3, 3 adds r0, r3 str r0, [r1, 0x4] - ldr r0, _081481CC + ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _08148198: - ldr r1, _081481D0 + ldr r1, =0x04000050 ldr r0, [r2] ldrh r0, [r0, 0xE] strh r0, [r1] - ldr r0, _081481D4 + ldr r0, =0x020393a8 str r0, [r4] - ldr r0, _081481D8 + ldr r0, =0x04000054 str r0, [r4, 0x4] - ldr r0, _081481DC + ldr r0, =0xa2400001 str r0, [r4, 0x8] ldr r0, [r4, 0x8] pop {r4} pop {r0} bx r0 .align 2, 0 -_081481B4: .4byte 0x040000b0 -_081481B8: .4byte 0x0000c5ff -_081481BC: .4byte 0x00007fff -_081481C0: .4byte 0x0203aba0 -_081481C4: .4byte 0x040000d4 -_081481C8: .4byte 0x02038c28 -_081481CC: .4byte 0x800000a0 -_081481D0: .4byte 0x04000050 -_081481D4: .4byte 0x020393a8 -_081481D8: .4byte 0x04000054 -_081481DC: .4byte 0xa2400001 + .pool thumb_func_end sub_8148160 thumb_func_start sub_81481E0 sub_81481E0: @ 81481E0 push {lr} - ldr r0, _081481F4 + ldr r0, =0x04000006 ldrh r0, [r0] cmp r0, 0x4F bhi _08148200 - ldr r1, _081481F8 - ldr r0, _081481FC + ldr r1, =0x04000010 + ldr r0, =0x0203aba0 ldr r0, [r0] ldrh r0, [r0, 0x18] b _08148208 .align 2, 0 -_081481F4: .4byte 0x04000006 -_081481F8: .4byte 0x04000010 -_081481FC: .4byte 0x0203aba0 + .pool _08148200: - ldr r1, _08148210 - ldr r0, _08148214 + ldr r1, =0x04000010 + ldr r0, =0x0203aba0 ldr r0, [r0] ldrh r0, [r0, 0x1A] _08148208: @@ -672325,8 +650026,7 @@ _08148208: pop {r0} bx r0 .align 2, 0 -_08148210: .4byte 0x04000010 -_08148214: .4byte 0x0203aba0 + .pool thumb_func_end sub_81481E0 thumb_func_start sub_8148218 @@ -672337,13 +650037,13 @@ sub_8148218: @ 8148218 push {r5,r6} sub sp, 0x4 adds r4, r0, 0 - ldr r0, _08148360 + ldr r0, =0x085c8bf4 movs r2, 0x26 ldrsh r1, [r4, r2] mov r8, r1 add r0, r8 ldrb r0, [r0] - ldr r2, _08148364 + ldr r2, =0x085c8c0e lsls r1, 2 mov r8, r1 adds r1, r2 @@ -672357,14 +650057,14 @@ sub_8148218: @ 8148218 adds r2, 0x2A lsls r2, 16 asrs r2, 16 - ldr r5, _08148368 + ldr r5, =0x0201c000 str r5, [sp] movs r3, 0 bl sub_80B5E6C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r0, _0814836C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] bl sub_806F000 @@ -672384,7 +650084,7 @@ sub_8148218: @ 8148218 lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r1, _08148370 + ldr r1, =0x02020630 adds r5, r1 movs r2, 0x24 ldrsh r0, [r4, r2] @@ -672392,7 +650092,7 @@ sub_8148218: @ 8148218 adds r6, r0 lsls r6, 2 adds r6, r1 - ldr r0, _08148374 + ldr r0, =sub_8148380 + 1 str r0, [r5, 0x1C] str r0, [r6, 0x1C] ldrb r0, [r5, 0x1] @@ -672458,7 +650158,7 @@ sub_8148218: @ 8148218 ldrb r0, [r5, 0x3] lsls r0, 26 lsrs r0, 27 - ldr r2, _08148378 + ldr r2, =0x085c8bfa mov r3, r8 adds r1, r3, r2 movs r4, 0 @@ -672473,7 +650173,7 @@ sub_8148218: @ 8148218 ldrb r0, [r6, 0x3] lsls r0, 26 lsrs r0, 27 - ldr r1, _0814837C + ldr r1, =0xfffffe00 movs r2, 0x80 lsls r2, 2 movs r3, 0 @@ -672486,21 +650186,14 @@ sub_8148218: @ 8148218 pop {r0} bx r0 .align 2, 0 -_08148360: .4byte 0x085c8bf4 -_08148364: .4byte 0x085c8c0e -_08148368: .4byte 0x0201c000 -_0814836C: .4byte 0x03005d90 -_08148370: .4byte 0x02020630 -_08148374: .4byte sub_8148380 + 1 -_08148378: .4byte 0x085c8bfa -_0814837C: .4byte 0xfffffe00 + .pool thumb_func_end sub_8148218 thumb_func_start sub_8148380 sub_8148380: @ 8148380 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _081483A4 + ldr r5, =0x085c8c24 _08148386: movs r1, 0x2E ldrsh r0, [r4, r1] @@ -672516,7 +650209,7 @@ _08148386: pop {r0} bx r0 .align 2, 0 -_081483A4: .4byte 0x085c8c24 + .pool thumb_func_end sub_8148380 thumb_func_start sub_81483A8 @@ -672530,12 +650223,12 @@ sub_81483AC: @ 81483AC push {r4,r5,lr} sub sp, 0x8 adds r5, r0, 0 - ldr r1, _081483F0 + ldr r1, =0x085c8c40 mov r0, sp movs r2, 0x4 bl memcpy add r4, sp, 0x4 - ldr r1, _081483F4 + ldr r1, =0x085c8c44 adds r0, r4, 0 movs r2, 0x4 bl memcpy @@ -672560,8 +650253,7 @@ sub_81483AC: @ 81483AC pop {r1} bx r1 .align 2, 0 -_081483F0: .4byte 0x085c8c40 -_081483F4: .4byte 0x085c8c44 + .pool thumb_func_end sub_81483AC thumb_func_start sub_81483F8 @@ -672651,7 +650343,7 @@ _0814847C: thumb_func_start sub_8148484 sub_8148484: @ 8148484 - ldr r3, _08148498 + ldr r3, =0x02020630 lsls r0, 16 asrs r0, 16 lsls r2, r0, 4 @@ -672661,12 +650353,12 @@ sub_8148484: @ 8148484 strh r1, [r2, 0x3C] bx lr .align 2, 0 -_08148498: .4byte 0x02020630 + .pool thumb_func_end sub_8148484 thumb_func_start sub_814849C sub_814849C: @ 814849C - ldr r2, _081484B4 + ldr r2, =0x02020630 lsls r0, 16 asrs r0, 16 lsls r1, r0, 4 @@ -672678,12 +650370,12 @@ sub_814849C: @ 814849C strh r0, [r1, 0x2E] bx lr .align 2, 0 -_081484B4: .4byte 0x02020630 + .pool thumb_func_end sub_814849C thumb_func_start sub_81484B8 sub_81484B8: @ 81484B8 - ldr r2, _081484CC + ldr r2, =0x02020630 lsls r0, 16 asrs r0, 16 lsls r1, r0, 4 @@ -672694,7 +650386,7 @@ sub_81484B8: @ 81484B8 ldrsh r0, [r1, r2] bx lr .align 2, 0 -_081484CC: .4byte 0x02020630 + .pool thumb_func_end sub_81484B8 thumb_func_start sub_81484D0 @@ -672702,8 +650394,8 @@ sub_81484D0: @ 81484D0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08148500 - ldr r2, _08148504 + ldr r5, =0x085c8c48 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -672723,8 +650415,7 @@ _081484E2: pop {r0} bx r0 .align 2, 0 -_08148500: .4byte 0x085c8c48 -_08148504: .4byte 0x03005e00 + .pool thumb_func_end sub_81484D0 thumb_func_start sub_8148508 @@ -672740,7 +650431,7 @@ sub_8148508: @ 8148508 strh r0, [r5, 0xC] movs r0, 0x1 strh r0, [r5, 0xE] - ldr r2, _08148580 + ldr r2, =0x0203aba0 ldr r1, [r2] movs r0, 0x3F strh r0, [r1, 0x2] @@ -672749,7 +650440,7 @@ sub_8148508: @ 8148508 strh r0, [r1, 0x8] ldrb r0, [r1] strb r4, [r1] - ldr r4, _08148584 + ldr r4, =0x020393a8 adds r6, r2, 0 movs r2, 0xF0 _0814853A: @@ -672773,9 +650464,9 @@ _0814853A: movs r0, 0x4 movs r1, 0x10 bl lcd_io_set_bits - ldr r0, _08148588 + ldr r0, =sub_814869C + 1 bl SetVBlankCallback - ldr r0, _0814858C + ldr r0, =sub_8148728 + 1 bl SetHBlankCallback ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -672785,10 +650476,7 @@ _0814853A: pop {r1} bx r1 .align 2, 0 -_08148580: .4byte 0x0203aba0 -_08148584: .4byte 0x020393a8 -_08148588: .4byte sub_814869C + 1 -_0814858C: .4byte sub_8148728 + 1 + .pool thumb_func_end sub_8148508 thumb_func_start sub_8148590 @@ -672797,7 +650485,7 @@ sub_8148590: @ 8148590 mov r7, r8 push {r7} adds r3, r0, 0 - ldr r2, _0814860C + ldr r2, =0x0203aba0 ldr r1, [r2] ldrb r0, [r1] movs r0, 0 @@ -672819,7 +650507,7 @@ _081485BC: ldrh r4, [r3, 0xC] movs r0, 0xC ldrsh r1, [r3, r0] - ldr r0, _08148610 + ldr r0, =0x00000fff ldrh r2, [r3, 0xE] cmp r1, r0 bgt _081485CE @@ -672834,7 +650522,7 @@ _081485CE: strh r0, [r3, 0xE] _081485DA: movs r5, 0 - ldr r7, _08148614 + ldr r7, =0x02038c28 movs r1, 0xA0 lsls r1, 1 adds r1, r7 @@ -672859,9 +650547,7 @@ _081485E8: subs r0, r1 b _0814862A .align 2, 0 -_0814860C: .4byte 0x0203aba0 -_08148610: .4byte 0x00000fff -_08148614: .4byte 0x02038c28 + .pool _08148618: ldr r0, [r6] ldrh r0, [r0, 0x14] @@ -672904,18 +650590,18 @@ _08148644: thumb_func_start sub_814865C sub_814865C: @ 814865C push {lr} - ldr r1, _0814868C + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08148690 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08148694 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, _08148698 + ldr r0, =sub_81484D0 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -672924,28 +650610,25 @@ sub_814865C: @ 814865C pop {r1} bx r1 .align 2, 0 -_0814868C: .4byte 0x040000b0 -_08148690: .4byte 0x0000c5ff -_08148694: .4byte 0x00007fff -_08148698: .4byte sub_81484D0 + 1 + .pool thumb_func_end sub_814865C thumb_func_start sub_814869C sub_814869C: @ 814869C push {r4,lr} - ldr r4, _081486FC + ldr r4, =0x040000b0 ldrh r1, [r4, 0xA] - ldr r0, _08148700 + ldr r0, =0x0000c5ff ands r0, r1 strh r0, [r4, 0xA] ldrh r1, [r4, 0xA] - ldr r0, _08148704 + ldr r0, =0x00007fff ands r0, r1 strh r0, [r4, 0xA] ldrh r0, [r4, 0xA] bl sub_8149F2C - ldr r2, _08148708 - ldr r0, _0814870C + ldr r2, =0x04000048 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrh r0, [r1, 0x2] strh r0, [r2] @@ -672958,49 +650641,39 @@ sub_814869C: @ 814869C ldrb r0, [r1] cmp r0, 0 beq _081486E6 - ldr r1, _08148710 - ldr r0, _08148714 + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r2, 0xF0 lsls r2, 3 adds r0, r2 str r0, [r1, 0x4] - ldr r0, _08148718 + ldr r0, =0x80000140 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _081486E6: - ldr r0, _0814871C + ldr r0, =0x020394e8 str r0, [r4] - ldr r0, _08148720 + ldr r0, =0x04000040 str r0, [r4, 0x4] - ldr r0, _08148724 + ldr r0, =0xa2400001 str r0, [r4, 0x8] ldr r0, [r4, 0x8] pop {r4} pop {r0} bx r0 .align 2, 0 -_081486FC: .4byte 0x040000b0 -_08148700: .4byte 0x0000c5ff -_08148704: .4byte 0x00007fff -_08148708: .4byte 0x04000048 -_0814870C: .4byte 0x0203aba0 -_08148710: .4byte 0x040000d4 -_08148714: .4byte 0x02038c28 -_08148718: .4byte 0x80000140 -_0814871C: .4byte 0x020394e8 -_08148720: .4byte 0x04000040 -_08148724: .4byte 0xa2400001 + .pool thumb_func_end sub_814869C thumb_func_start sub_8148728 sub_8148728: @ 8148728 push {lr} - ldr r2, _08148754 + ldr r2, =0x04000006 ldrh r0, [r2] cmp r0, 0x9F bhi _0814874E - ldr r1, _08148758 + ldr r1, =0x02038c28 ldrh r0, [r2] lsls r0, 1 movs r2, 0xF0 @@ -673008,7 +650681,7 @@ sub_8148728: @ 8148728 adds r1, r2 adds r0, r1 ldrh r1, [r0] - ldr r0, _0814875C + ldr r0, =0x04000014 strh r1, [r0] adds r0, 0x4 strh r1, [r0] @@ -673018,9 +650691,7 @@ _0814874E: pop {r0} bx r0 .align 2, 0 -_08148754: .4byte 0x04000006 -_08148758: .4byte 0x02038c28 -_0814875C: .4byte 0x04000014 + .pool thumb_func_end sub_8148728 thumb_func_start sub_8148760 @@ -673028,8 +650699,8 @@ sub_8148760: @ 8148760 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08148790 - ldr r2, _08148794 + ldr r5, =0x085c8c54 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -673049,8 +650720,7 @@ _08148772: pop {r0} bx r0 .align 2, 0 -_08148790: .4byte 0x085c8c54 -_08148794: .4byte 0x03005e00 + .pool thumb_func_end sub_8148760 thumb_func_start sub_8148798 @@ -673062,7 +650732,7 @@ sub_8148798: @ 8148798 adds r6, r0, 0 bl sub_8149F08 bl dp12_8087EA4 - ldr r0, _08148854 + ldr r0, =0x0203aba0 ldr r1, [r0] movs r2, 0 movs r0, 0x3F @@ -673071,7 +650741,7 @@ sub_8148798: @ 8148798 movs r0, 0xA0 strh r0, [r1, 0x8] movs r4, 0 - ldr r5, _08148858 + ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r0, r5 @@ -673083,7 +650753,7 @@ _081487CC: lsls r2, r4, 1 mov r7, r12 adds r1, r2, r7 - ldr r0, _08148854 + ldr r0, =0x0203aba0 ldr r3, [r0] ldrh r0, [r3, 0x14] strh r0, [r1] @@ -673131,9 +650801,9 @@ _081487CC: strh r0, [r6, 0x14] movs r0, 0x2 bl enable_irqs - ldr r0, _0814885C + ldr r0, =sub_814869C + 1 bl SetVBlankCallback - ldr r0, _08148860 + ldr r0, =sub_8148728 + 1 bl SetHBlankCallback ldrh r0, [r6, 0x8] adds r0, 0x1 @@ -673146,10 +650816,7 @@ _081487CC: pop {r1} bx r1 .align 2, 0 -_08148854: .4byte 0x0203aba0 -_08148858: .4byte 0x02038c28 -_0814885C: .4byte sub_814869C + 1 -_08148860: .4byte sub_8148728 + 1 + .pool thumb_func_end sub_8148798 thumb_func_start sub_8148864 @@ -673161,16 +650828,16 @@ sub_8148864: @ 8148864 push {r5-r7} sub sp, 0x18 mov r9, r0 - ldr r1, _0814890C + ldr r1, =0x085c8c64 mov r0, sp movs r2, 0x2 bl memcpy add r4, sp, 0x4 - ldr r1, _08148910 + ldr r1, =0x085c8c66 adds r0, r4, 0 movs r2, 0x4 bl memcpy - ldr r2, _08148914 + ldr r2, =0x0203aba0 ldr r1, [r2] ldrb r0, [r1] movs r0, 0 @@ -673220,13 +650887,13 @@ _081488BA: beq _08148966 _081488E2: lsls r1, r0, 1 - ldr r0, _08148918 + ldr r0, =0x02038ea8 adds r4, r1, r0 movs r2, 0xA0 lsls r2, 1 adds r0, r2 adds r3, r1, r0 - ldr r0, _0814891C + ldr r0, =0x02039128 adds r1, r0 ldrh r2, [r4] cmp r2, 0xEF @@ -673240,11 +650907,7 @@ _081488E2: str r0, [sp, 0x8] b _08148940 .align 2, 0 -_0814890C: .4byte 0x085c8c64 -_08148910: .4byte 0x085c8c66 -_08148914: .4byte 0x0203aba0 -_08148918: .4byte 0x02038ea8 -_0814891C: .4byte 0x02039128 + .pool _08148920: ldrh r0, [r3] lsrs r0, 8 @@ -673257,7 +650920,7 @@ _08148920: strh r0, [r1] _08148932: ldrh r2, [r3] - ldr r0, _081489E0 + ldr r0, =0x00000fff cmp r2, r0 bhi _08148940 ldrh r0, [r1] @@ -673266,11 +650929,11 @@ _08148932: _08148940: lsls r0, r5, 16 asrs r0, 15 - ldr r1, _081489E4 + ldr r1, =0x02038c28 adds r2, r0, r1 - ldr r1, _081489E8 + ldr r1, =0x02038d68 adds r3, r0, r1 - ldr r0, _081489EC + ldr r0, =0x0203aba0 ldr r1, [r0] ldrh r0, [r4] ldrh r1, [r1, 0x14] @@ -673296,7 +650959,7 @@ _08148970: cmp r7, 0x1 bls _081488B2 movs r7, 0 - ldr r3, _081489F0 + ldr r3, =0x02038ea8 mov r8, r3 _08148980: movs r6, 0 @@ -673335,7 +650998,7 @@ _081489B6: lsls r0, 1 add r0, r8 adds r3, r1, r0 - ldr r0, _081489F4 + ldr r0, =0x02039128 adds r1, r0 ldrh r2, [r4] cmp r2, 0xEF @@ -673349,12 +651012,7 @@ _081489B6: str r0, [sp, 0x8] b _08148A18 .align 2, 0 -_081489E0: .4byte 0x00000fff -_081489E4: .4byte 0x02038c28 -_081489E8: .4byte 0x02038d68 -_081489EC: .4byte 0x0203aba0 -_081489F0: .4byte 0x02038ea8 -_081489F4: .4byte 0x02039128 + .pool _081489F8: ldrh r0, [r3] lsrs r0, 8 @@ -673367,7 +651025,7 @@ _081489F8: strh r0, [r1] _08148A0A: ldrh r2, [r3] - ldr r0, _08148AC4 + ldr r0, =0x00000fff cmp r2, r0 bhi _08148A18 ldrh r0, [r1] @@ -673376,11 +651034,11 @@ _08148A0A: _08148A18: lsls r0, r5, 16 asrs r0, 15 - ldr r1, _08148AC8 + ldr r1, =0x02038c28 adds r2, r0, r1 - ldr r1, _08148ACC + ldr r1, =0x02038d68 adds r3, r0, r1 - ldr r1, _08148AD0 + ldr r1, =0x0203aba0 ldr r0, [r1] ldrh r1, [r0, 0x14] ldrh r0, [r4] @@ -673451,7 +651109,7 @@ _08148A98: adds r0, 0x1 strh r0, [r3, 0x8] _08148AA6: - ldr r0, _08148AD0 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -673467,10 +651125,7 @@ _08148AA6: pop {r1} bx r1 .align 2, 0 -_08148AC4: .4byte 0x00000fff -_08148AC8: .4byte 0x02038c28 -_08148ACC: .4byte 0x02038d68 -_08148AD0: .4byte 0x0203aba0 + .pool thumb_func_end sub_8148864 thumb_func_start sub_8148AD4 @@ -673478,9 +651133,9 @@ sub_8148AD4: @ 8148AD4 push {r4,r5,lr} adds r3, r0, 0 movs r2, 0x1 - ldr r5, _08148B0C + ldr r5, =0x0000ff10 movs r1, 0 - ldr r4, _08148B10 + ldr r4, =0x020393a8 _08148AE0: lsls r0, r1, 1 adds r0, r4 @@ -673507,25 +651162,24 @@ _08148B04: pop {r1} bx r1 .align 2, 0 -_08148B0C: .4byte 0x0000ff10 -_08148B10: .4byte 0x020393a8 + .pool thumb_func_end sub_8148AD4 thumb_func_start sub_8148B14 sub_8148B14: @ 8148B14 push {lr} - ldr r1, _08148B44 + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08148B48 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08148B4C + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, _08148B50 + ldr r0, =sub_8148760 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -673534,10 +651188,7 @@ sub_8148B14: @ 8148B14 pop {r1} bx r1 .align 2, 0 -_08148B44: .4byte 0x040000b0 -_08148B48: .4byte 0x0000c5ff -_08148B4C: .4byte 0x00007fff -_08148B50: .4byte sub_8148760 + 1 + .pool thumb_func_end sub_8148B14 thumb_func_start sub_8148B54 @@ -673545,8 +651196,8 @@ sub_8148B54: @ 8148B54 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08148B84 - ldr r2, _08148B88 + ldr r5, =0x085c8c6c + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -673566,8 +651217,7 @@ _08148B66: pop {r0} bx r0 .align 2, 0 -_08148B84: .4byte 0x085c8c6c -_08148B88: .4byte 0x03005e00 + .pool thumb_func_end sub_8148B54 thumb_func_start sub_8148B8C @@ -673575,8 +651225,8 @@ sub_8148B8C: @ 8148B8C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08148BBC - ldr r2, _08148BC0 + ldr r5, =0x085c8c78 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -673596,8 +651246,7 @@ _08148B9E: pop {r0} bx r0 .align 2, 0 -_08148BBC: .4byte 0x085c8c78 -_08148BC0: .4byte 0x03005e00 + .pool thumb_func_end sub_8148B8C thumb_func_start sub_8148BC4 @@ -673606,7 +651255,7 @@ sub_8148BC4: @ 8148BC4 adds r5, r0, 0 bl sub_8149F08 bl dp12_8087EA4 - ldr r0, _08148C18 + ldr r0, =0x0203aba0 ldr r1, [r0] movs r0, 0 strh r0, [r1, 0x2] @@ -673616,10 +651265,10 @@ sub_8148BC4: @ 8148BC4 strh r0, [r1, 0x6] movs r0, 0xA0 strh r0, [r1, 0x8] - ldr r0, _08148C1C + ldr r0, =0x02038c28 movs r2, 0 movs r1, 0x9F - ldr r3, _08148C20 + ldr r3, =0x000008be adds r0, r3 _08148BEE: strh r2, [r0] @@ -673628,7 +651277,7 @@ _08148BEE: cmp r1, 0 bge _08148BEE movs r4, 0 - ldr r0, _08148C24 + ldr r0, =sub_8146F68 + 1 bl SetVBlankCallback ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -673643,10 +651292,7 @@ _08148BEE: pop {r1} bx r1 .align 2, 0 -_08148C18: .4byte 0x0203aba0 -_08148C1C: .4byte 0x02038c28 -_08148C20: .4byte 0x000008be -_08148C24: .4byte sub_8146F68 + 1 + .pool thumb_func_end sub_8148BC4 thumb_func_start sub_8148C28 @@ -673657,13 +651303,13 @@ sub_8148C28: @ 8148C28 ldrsh r0, [r4, r1] cmp r0, 0x1 bne _08148C6C - ldr r1, _08148C60 + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08148C64 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08148C68 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] @@ -673676,11 +651322,9 @@ sub_8148C28: @ 8148C28 bl remove_task b _08148CDE .align 2, 0 -_08148C60: .4byte 0x040000b0 -_08148C64: .4byte 0x0000c5ff -_08148C68: .4byte 0x00007fff + .pool _08148C6C: - ldr r5, _08148CC8 + ldr r5, =0x0203aba0 ldr r1, [r5] ldrb r0, [r1] movs r0, 0 @@ -673688,7 +651332,7 @@ _08148C6C: ldrh r2, [r4, 0xC] movs r0, 0xC ldrsh r1, [r4, r0] - ldr r0, _08148CCC + ldr r0, =0x000003ff cmp r1, r0 bgt _08148C88 adds r0, r2, 0 @@ -673713,7 +651357,7 @@ _08148C9C: movs r0, 0xA0 strh r0, [r4, 0xA] _08148CA8: - ldr r0, _08148CD0 + ldr r0, =0x02038c28 movs r2, 0xA ldrsh r3, [r4, r2] movs r1, 0x78 @@ -673728,9 +651372,7 @@ _08148CA8: bl sub_8149F84 b _08148CDE .align 2, 0 -_08148CC8: .4byte 0x0203aba0 -_08148CCC: .4byte 0x000003ff -_08148CD0: .4byte 0x02038c28 + .pool _08148CD4: ldr r0, [r5] ldrb r1, [r0] @@ -673748,7 +651390,7 @@ _08148CDE: sub_8148CE8: @ 8148CE8 push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _08148D60 + ldr r6, =0x0203aba0 ldr r0, [r6] ldrb r1, [r0] movs r5, 0 @@ -673764,7 +651406,7 @@ sub_8148CE8: @ 8148CE8 strh r0, [r4, 0xA] strh r5, [r4, 0x14] _08148D0A: - ldr r1, _08148D64 + ldr r1, =0x085c8c80 movs r2, 0x14 ldrsh r0, [r4, r2] lsls r0, 1 @@ -673782,7 +651424,7 @@ _08148D0A: lsls r0, 1 subs r1, r0 strh r1, [r4, 0x14] - ldr r0, _08148D68 + ldr r0, =0x02038c28 movs r1, 0xA ldrsh r3, [r4, r1] movs r1, 0x78 @@ -673807,16 +651449,14 @@ _08148D4C: pop {r1} bx r1 .align 2, 0 -_08148D60: .4byte 0x0203aba0 -_08148D64: .4byte 0x085c8c80 -_08148D68: .4byte 0x02038c28 + .pool thumb_func_end sub_8148CE8 thumb_func_start sub_8148D6C sub_8148D6C: @ 8148D6C push {r4,lr} adds r4, r0, 0 - ldr r0, _08148DE8 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] movs r0, 0 @@ -673839,7 +651479,7 @@ _08148D8E: movs r0, 0xA0 strh r0, [r4, 0xA] _08148D9A: - ldr r0, _08148DEC + ldr r0, =0x02038c28 movs r2, 0xA ldrsh r3, [r4, r2] movs r1, 0x78 @@ -673849,13 +651489,13 @@ _08148D9A: ldrsh r0, [r4, r1] cmp r0, 0xA0 bne _08148DD6 - ldr r1, _08148DF0 + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08148DF4 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08148DF8 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] @@ -673875,11 +651515,7 @@ _08148DD6: adds r0, 0x8 b _08148E08 .align 2, 0 -_08148DE8: .4byte 0x0203aba0 -_08148DEC: .4byte 0x02038c28 -_08148DF0: .4byte 0x040000b0 -_08148DF4: .4byte 0x0000c5ff -_08148DF8: .4byte 0x00007fff + .pool _08148DFC: ldrh r0, [r4, 0x14] subs r0, 0x1 @@ -673915,7 +651551,7 @@ _08148E28: adds r0, 0x1 strh r0, [r4, 0x14] _08148E3C: - ldr r0, _08148E50 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -673926,7 +651562,7 @@ _08148E3C: pop {r1} bx r1 .align 2, 0 -_08148E50: .4byte 0x0203aba0 + .pool thumb_func_end sub_8148D6C thumb_func_start sub_8148E54 @@ -673934,8 +651570,8 @@ sub_8148E54: @ 8148E54 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08148E84 - ldr r2, _08148E88 + ldr r5, =0x085c8c84 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -673955,8 +651591,7 @@ _08148E66: pop {r0} bx r0 .align 2, 0 -_08148E84: .4byte 0x085c8c84 -_08148E88: .4byte 0x03005e00 + .pool thumb_func_end sub_8148E54 thumb_func_start sub_8148E8C @@ -673967,7 +651602,7 @@ sub_8148E8C: @ 8148E8C add r0, sp, 0x4 add r1, sp, 0x8 bl sub_8149F58 - ldr r4, _08148F30 + ldr r4, =0x085bacd0 ldr r1, [sp, 0x8] adds r0, r4, 0 movs r2, 0x10 @@ -673986,10 +651621,10 @@ sub_8148E8C: @ 8148E8C adds r0, r2, 0 strh r0, [r1] ldr r1, [sp, 0x4] - ldr r2, _08148F34 + ldr r2, =0x01000400 mov r0, sp bl CpuSet - ldr r0, _08148F38 + ldr r0, =0x085c8ed4 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -674000,9 +651635,9 @@ sub_8148E8C: @ 8148E8C ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - ldr r5, _08148F3C + ldr r5, =0x03001210 strb r1, [r5] - ldr r0, _08148F40 + ldr r0, =0x0000ffff strh r0, [r5, 0x2] strb r4, [r5, 0x4] movs r2, 0x9A @@ -674017,10 +651652,10 @@ sub_8148E8C: @ 8148E8C strh r2, [r5, 0x12] strb r1, [r5, 0x14] strb r1, [r5, 0x18] - ldr r2, _08148F44 + ldr r2, =0x0000fffd strh r2, [r5, 0x1A] strb r4, [r5, 0x1C] - ldr r3, _08148F48 + ldr r3, =0x00000133 strh r3, [r5, 0x1E] adds r0, r5, 0 adds r0, 0x20 @@ -674039,13 +651674,7 @@ sub_8148E8C: @ 8148E8C pop {r1} bx r1 .align 2, 0 -_08148F30: .4byte 0x085bacd0 -_08148F34: .4byte 0x01000400 -_08148F38: .4byte 0x085c8ed4 -_08148F3C: .4byte 0x03001210 -_08148F40: .4byte 0x0000ffff -_08148F44: .4byte 0x0000fffd -_08148F48: .4byte 0x00000133 + .pool thumb_func_end sub_8148E8C thumb_func_start sub_8148F4C @@ -674064,7 +651693,7 @@ _08148F62: movs r5, 0 adds r6, r0, 0x1 _08148F66: - ldr r1, _08148FF8 + ldr r1, =0x085c8d38 lsrs r0, r5, 1 lsls r0, 2 adds r0, r1 @@ -674072,7 +651701,7 @@ _08148F66: lsls r1, r5, 1 adds r1, r5 lsls r1, 2 - ldr r2, _08148FFC + ldr r2, =0x03001210 adds r4, r1, r2 adds r1, r4, 0 bl sub_8149048 @@ -674085,7 +651714,7 @@ _08148F66: ands r0, r5 cmp r0, 0x1 bne _08148FA0 - ldr r0, _08149000 + ldr r0, =0x0000027d adds r1, r0, 0 lsls r0, r2, 16 asrs r0, 16 @@ -674112,7 +651741,7 @@ _08148FAC: ldr r0, [sp] lsls r1, 1 adds r1, r0 - ldr r2, _08149004 + ldr r2, =0x0000f002 adds r0, r2, 0 strh r0, [r1] _08148FCA: @@ -674140,23 +651769,20 @@ _08148FE8: pop {r1} bx r1 .align 2, 0 -_08148FF8: .4byte 0x085c8d38 -_08148FFC: .4byte 0x03001210 -_08149000: .4byte 0x0000027d -_08149004: .4byte 0x0000f002 + .pool thumb_func_end sub_8148F4C thumb_func_start sub_8149008 sub_8149008: @ 8149008 push {r4,lr} adds r4, r0, 0 - ldr r1, _0814903C + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08149040 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08149044 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] @@ -674171,9 +651797,7 @@ sub_8149008: @ 8149008 pop {r1} bx r1 .align 2, 0 -_0814903C: .4byte 0x040000b0 -_08149040: .4byte 0x0000c5ff -_08149044: .4byte 0x00007fff + .pool thumb_func_end sub_8149008 thumb_func_start sub_8149048 @@ -674193,7 +651817,7 @@ sub_8149048: @ 8149048 negs r0, r0 cmp r1, r0 beq _081490CE - ldr r1, _0814908C + ldr r1, =0x03001208 ldrh r0, [r3] strh r0, [r1] ldrh r0, [r3, 0x2] @@ -674212,7 +651836,7 @@ sub_8149048: @ 8149048 beq _0814909A b _081490B2 .align 2, 0 -_0814908C: .4byte 0x03001208 + .pool _08149090: cmp r0, 0x3 beq _081490A6 @@ -674239,7 +651863,7 @@ _081490B0: _081490B2: movs r4, 0x2 ldrsh r1, [r2, r4] - ldr r0, _081490D4 + ldr r0, =0x0000027f cmp r1, r0 bgt _081490CE ldrb r0, [r2, 0x4] @@ -674255,7 +651879,7 @@ _081490CE: movs r0, 0 b _08149138 .align 2, 0 -_081490D4: .4byte 0x0000027f + .pool _081490D8: ldrb r0, [r2, 0x8] cmp r0, 0 @@ -674320,8 +651944,8 @@ sub_8149140: @ 8149140 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08149170 - ldr r2, _08149174 + ldr r5, =0x085c8d40 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -674341,8 +651965,7 @@ _08149152: pop {r0} bx r0 .align 2, 0 -_08149170: .4byte 0x085c8d40 -_08149174: .4byte 0x03005e00 + .pool thumb_func_end sub_8149140 thumb_func_start sub_8149178 @@ -674357,13 +651980,13 @@ sub_8149178: @ 8149178 movs r0, 0 strh r0, [r1] ldr r1, [sp, 0x4] - ldr r2, _081491BC + ldr r2, =0x01000400 mov r0, sp bl CpuSet - ldr r0, _081491C0 + ldr r0, =0x085be51c ldr r1, [sp, 0x8] bl LZ77UnCompVram - ldr r0, _081491C4 + ldr r0, =0x085bea88 ldr r1, [sp, 0x4] bl LZ77UnCompVram ldrh r0, [r4, 0x8] @@ -674377,9 +652000,7 @@ sub_8149178: @ 8149178 pop {r1} bx r1 .align 2, 0 -_081491BC: .4byte 0x01000400 -_081491C0: .4byte 0x085be51c -_081491C4: .4byte 0x085bea88 + .pool thumb_func_end sub_8149178 thumb_func_start sub_81491C8 @@ -674403,7 +652024,7 @@ sub_81491C8: @ 81491C8 bl __divsi3 lsls r0, 16 lsrs r0, 11 - ldr r1, _08149220 + ldr r1, =0x085bf0a0 adds r0, r1 movs r1, 0xF0 movs r2, 0x20 @@ -674427,7 +652048,7 @@ _08149218: pop {r1} bx r1 .align 2, 0 -_08149220: .4byte 0x085bf0a0 + .pool thumb_func_end sub_81491C8 thumb_func_start sub_8149224 @@ -674447,7 +652068,7 @@ sub_8149224: @ 8149224 bl __divsi3 lsls r0, 16 asrs r0, 11 - ldr r1, _08149278 + ldr r1, =0x085bf2a0 adds r0, r1 movs r1, 0xF0 movs r2, 0x20 @@ -674473,7 +652094,7 @@ _0814926E: pop {r1} bx r1 .align 2, 0 -_08149278: .4byte 0x085bf2a0 + .pool thumb_func_end sub_8149224 thumb_func_start sub_814927C @@ -674481,8 +652102,8 @@ sub_814927C: @ 814927C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081492AC - ldr r2, _081492B0 + ldr r5, =0x085c8d60 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -674502,8 +652123,7 @@ _0814928E: pop {r0} bx r0 .align 2, 0 -_081492AC: .4byte 0x085c8d60 -_081492B0: .4byte 0x03005e00 + .pool thumb_func_end sub_814927C thumb_func_start sub_81492B4 @@ -674513,7 +652133,7 @@ sub_81492B4: @ 81492B4 adds r4, r0, 0 bl sub_8149F08 bl dp12_8087EA4 - ldr r1, _0814933C + ldr r1, =0x00009a08 movs r0, 0x8 bl lcd_io_set add r0, sp, 0x4 @@ -674523,27 +652143,27 @@ sub_81492B4: @ 81492B4 movs r0, 0 strh r0, [r1] ldr r1, [sp, 0x4] - ldr r2, _08149340 + ldr r2, =0x01000400 mov r0, sp bl CpuSet - ldr r0, _08149344 + ldr r0, =0x085bf6a0 ldr r1, [sp, 0x8] movs r2, 0x80 lsls r2, 5 bl CpuSet - ldr r0, _08149348 + ldr r0, =0x0203aba0 ldr r1, [r0] movs r0, 0 strh r0, [r1, 0x20] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r0, _0814934C + ldr r0, =0x085bf540 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply movs r2, 0 - ldr r3, _08149350 + ldr r3, =0x02038c28 movs r6, 0 movs r0, 0xF0 lsls r0, 3 @@ -674561,7 +652181,7 @@ _08149316: lsrs r2, r0, 16 cmp r2, 0x9F bls _08149316 - ldr r0, _08149354 + ldr r0, =sub_8149508 + 1 bl SetVBlankCallback movs r0, 0 add sp, 0xC @@ -674569,13 +652189,7 @@ _08149316: pop {r1} bx r1 .align 2, 0 -_0814933C: .4byte 0x00009a08 -_08149340: .4byte 0x01000400 -_08149344: .4byte 0x085bf6a0 -_08149348: .4byte 0x0203aba0 -_0814934C: .4byte 0x085bf540 -_08149350: .4byte 0x02038c28 -_08149354: .4byte sub_8149508 + 1 + .pool thumb_func_end sub_81492B4 thumb_func_start sub_8149358 @@ -674586,7 +652200,7 @@ sub_8149358: @ 8149358 add r1, sp, 0x4 mov r0, sp bl sub_8149F58 - ldr r0, _08149384 + ldr r0, =0x085c6be0 ldr r1, [sp] movs r2, 0x80 lsls r2, 4 @@ -674600,7 +652214,7 @@ sub_8149358: @ 8149358 pop {r1} bx r1 .align 2, 0 -_08149384: .4byte 0x085c6be0 + .pool thumb_func_end sub_8149358 thumb_func_start sub_8149388 @@ -674622,7 +652236,7 @@ _081493A0: lsrs r0, 16 adds r0, 0x5 lsls r0, 5 - ldr r1, _081493D4 + ldr r1, =0x085bf4a0 adds r0, r1 movs r1, 0xF0 movs r2, 0x20 @@ -674646,7 +652260,7 @@ _081493CC: pop {r1} bx r1 .align 2, 0 -_081493D4: .4byte 0x085bf4a0 + .pool thumb_func_end sub_8149388 thumb_func_start sub_81493D8 @@ -674666,7 +652280,7 @@ sub_81493D8: @ 81493D8 adds r0, 0x1 strh r0, [r1, 0x8] strh r2, [r1, 0xA] - ldr r0, _0814940C + ldr r0, =0xffff8000 str r2, [sp] movs r1, 0x2 movs r3, 0x10 @@ -674677,20 +652291,20 @@ _08149402: pop {r1} bx r1 .align 2, 0 -_0814940C: .4byte 0xffff8000 + .pool thumb_func_end sub_81493D8 thumb_func_start sub_8149410 sub_8149410: @ 8149410 push {lr} adds r2, r0, 0 - ldr r0, _08149434 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0814942E - ldr r0, _08149438 + ldr r0, =0x0203aba0 ldr r1, [r0] movs r0, 0x1 strh r0, [r1, 0x20] @@ -674702,19 +652316,18 @@ _0814942E: pop {r1} bx r1 .align 2, 0 -_08149434: .4byte 0x02037fd4 -_08149438: .4byte 0x0203aba0 + .pool thumb_func_end sub_8149410 thumb_func_start sub_814943C sub_814943C: @ 814943C push {r4,lr} adds r4, r0, 0 - ldr r0, _08149464 + ldr r0, =0x00007fff movs r1, 0x8 movs r2, 0 bl sub_80A2A20 - ldr r0, _08149468 + ldr r0, =0xffff8000 movs r1, 0 movs r2, 0 bl sub_80A2A20 @@ -674726,8 +652339,7 @@ sub_814943C: @ 814943C pop {r1} bx r1 .align 2, 0 -_08149464: .4byte 0x00007fff -_08149468: .4byte 0xffff8000 + .pool thumb_func_end sub_814943C thumb_func_start sub_814946C @@ -674747,7 +652359,7 @@ sub_814946C: @ 814946C bl __divsi3 lsls r0, 16 lsrs r0, 11 - ldr r1, _081494F8 + ldr r1, =0x085bf4a0 adds r0, r1 movs r1, 0xF0 movs r2, 0x20 @@ -674760,7 +652372,7 @@ _0814949A: asrs r0, 16 cmp r0, 0x27 ble _081494F0 - ldr r0, _081494FC + ldr r0, =0x0203aba0 ldr r1, [r0] movs r0, 0 strh r0, [r1, 0x2] @@ -674771,8 +652383,8 @@ _0814949A: movs r0, 0xA0 strh r0, [r1, 0x8] movs r1, 0 - ldr r5, _08149500 - ldr r3, _08149504 + ldr r5, =sub_8146F68 + 1 + ldr r3, =0x020393a8 movs r2, 0 _081494C4: lsls r0, r1, 1 @@ -674801,62 +652413,52 @@ _081494F0: pop {r1} bx r1 .align 2, 0 -_081494F8: .4byte 0x085bf4a0 -_081494FC: .4byte 0x0203aba0 -_08149500: .4byte sub_8146F68 + 1 -_08149504: .4byte 0x020393a8 + .pool thumb_func_end sub_814946C thumb_func_start sub_8149508 sub_8149508: @ 8149508 push {lr} - ldr r1, _08149534 + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08149538 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _0814953C + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F2C - ldr r0, _08149540 + ldr r0, =0x0203aba0 ldr r0, [r0] movs r1, 0x20 ldrsh r0, [r0, r1] cmp r0, 0 bne _08149548 - ldr r2, _08149544 + ldr r2, =0x02038c28 b _08149554 .align 2, 0 -_08149534: .4byte 0x040000b0 -_08149538: .4byte 0x0000c5ff -_0814953C: .4byte 0x00007fff -_08149540: .4byte 0x0203aba0 -_08149544: .4byte 0x02038c28 + .pool _08149548: - ldr r2, _08149568 + ldr r2, =0x02038c28 cmp r0, 0x1 bne _08149554 movs r0, 0xF0 lsls r0, 3 adds r2, r0 _08149554: - ldr r1, _0814956C + ldr r1, =0x040000b0 str r2, [r1] - ldr r0, _08149570 + ldr r0, =0x04000012 str r0, [r1, 0x4] - ldr r0, _08149574 + ldr r0, =0xa2400001 str r0, [r1, 0x8] ldr r0, [r1, 0x8] pop {r0} bx r0 .align 2, 0 -_08149568: .4byte 0x02038c28 -_0814956C: .4byte 0x040000b0 -_08149570: .4byte 0x04000012 -_08149574: .4byte 0xa2400001 + .pool thumb_func_end sub_8149508 thumb_func_start sub_8149578 @@ -674864,8 +652466,8 @@ sub_8149578: @ 8149578 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081495A8 - ldr r2, _081495AC + ldr r5, =0x085c8d8c + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -674885,8 +652487,7 @@ _0814958A: pop {r0} bx r0 .align 2, 0 -_081495A8: .4byte 0x085c8d8c -_081495AC: .4byte 0x03005e00 + .pool thumb_func_end sub_8149578 thumb_func_start sub_81495B0 @@ -674895,7 +652496,7 @@ sub_81495B0: @ 81495B0 adds r5, r0, 0 bl sub_8149F08 bl dp12_8087EA4 - ldr r0, _08149618 + ldr r0, =0x0203aba0 ldr r1, [r0] movs r2, 0 movs r0, 0xBF @@ -674908,7 +652509,7 @@ sub_81495B0: @ 81495B0 movs r0, 0xA0 strh r0, [r1, 0x8] movs r1, 0 - ldr r2, _0814961C + ldr r2, =0x020393a8 movs r4, 0 movs r3, 0xF0 _081495DC: @@ -674927,9 +652528,9 @@ _081495DC: bls _081495DC movs r0, 0x2 bl enable_irqs - ldr r0, _08149620 + ldr r0, =sub_8149840 + 1 bl SetHBlankCallback - ldr r0, _08149624 + ldr r0, =sub_8149774 + 1 bl SetVBlankCallback ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -674939,10 +652540,7 @@ _081495DC: pop {r1} bx r1 .align 2, 0 -_08149618: .4byte 0x0203aba0 -_0814961C: .4byte 0x020393a8 -_08149620: .4byte sub_8149840 + 1 -_08149624: .4byte sub_8149774 + 1 + .pool thumb_func_end sub_81495B0 thumb_func_start sub_8149628 @@ -674950,21 +652548,21 @@ sub_8149628: @ 8149628 push {r4-r6,lr} sub sp, 0x10 adds r6, r0, 0 - ldr r1, _08149690 + ldr r1, =0x085c8da0 mov r0, sp movs r2, 0x10 bl memcpy movs r5, 0 movs r4, 0 _0814963C: - ldr r0, _08149694 + ldr r0, =sub_8149864 + 1 bl obj_add_empty_with_callback lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08149698 + ldr r0, =0x02020630 adds r2, r1, r0 movs r0, 0xF0 strh r0, [r2, 0x20] @@ -674998,16 +652596,14 @@ _0814963C: pop {r1} bx r1 .align 2, 0 -_08149690: .4byte 0x085c8da0 -_08149694: .4byte sub_8149864 + 1 -_08149698: .4byte 0x02020630 + .pool thumb_func_end sub_8149628 thumb_func_start sub_814969C sub_814969C: @ 814969C push {r4,lr} adds r4, r0, 0 - ldr r2, _081496D0 + ldr r2, =0x0203aba0 ldr r1, [r2] ldrb r0, [r1] movs r0, 0 @@ -675019,7 +652615,7 @@ sub_814969C: @ 814969C ble _081496C6 movs r0, 0x1 negs r0, r0 - ldr r2, _081496D4 + ldr r2, =0x00007fff movs r1, 0x10 bl sub_80A2A20 ldrh r0, [r4, 0x8] @@ -675031,26 +652627,25 @@ _081496C6: pop {r1} bx r1 .align 2, 0 -_081496D0: .4byte 0x0203aba0 -_081496D4: .4byte 0x00007fff + .pool thumb_func_end sub_814969C thumb_func_start sub_81496D8 sub_81496D8: @ 81496D8 push {r4-r6,lr} adds r6, r0, 0 - ldr r4, _0814972C + ldr r4, =0x0203aba0 ldr r0, [r4] ldrb r1, [r0] movs r5, 0 strb r5, [r0] - ldr r1, _08149730 + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08149734 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08149738 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] @@ -675066,7 +652661,7 @@ sub_81496D8: @ 81496D8 strh r0, [r1, 0xE] movs r0, 0x3F strh r0, [r1, 0x2] - ldr r0, _0814973C + ldr r0, =sub_8149804 + 1 bl SetVBlankCallback ldrh r0, [r6, 0x8] adds r0, 0x1 @@ -675076,17 +652671,13 @@ sub_81496D8: @ 81496D8 pop {r1} bx r1 .align 2, 0 -_0814972C: .4byte 0x0203aba0 -_08149730: .4byte 0x040000b0 -_08149734: .4byte 0x0000c5ff -_08149738: .4byte 0x00007fff -_0814973C: .4byte sub_8149804 + 1 + .pool thumb_func_end sub_81496D8 thumb_func_start sub_8149740 sub_8149740: @ 8149740 push {lr} - ldr r0, _0814976C + ldr r0, =0x0203aba0 ldr r1, [r0] ldrh r0, [r1, 0x12] adds r0, 0x1 @@ -675096,7 +652687,7 @@ sub_8149740: @ 8149740 cmp r0, 0x10 bls _08149766 bl sub_8149F84 - ldr r0, _08149770 + ldr r0, =sub_8149578 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -675106,26 +652697,25 @@ _08149766: pop {r1} bx r1 .align 2, 0 -_0814976C: .4byte 0x0203aba0 -_08149770: .4byte sub_8149578 + 1 + .pool thumb_func_end sub_8149740 thumb_func_start sub_8149774 sub_8149774: @ 8149774 push {r4,lr} - ldr r4, _081497D8 + ldr r4, =0x040000b0 ldrh r1, [r4, 0xA] - ldr r0, _081497DC + ldr r0, =0x0000c5ff ands r0, r1 strh r0, [r4, 0xA] ldrh r1, [r4, 0xA] - ldr r0, _081497E0 + ldr r0, =0x00007fff ands r0, r1 strh r0, [r4, 0xA] ldrh r0, [r4, 0xA] bl sub_8149F2C - ldr r2, _081497E4 - ldr r0, _081497E8 + ldr r2, =0x04000050 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrh r0, [r1, 0xE] strh r0, [r2] @@ -675141,47 +652731,37 @@ sub_8149774: @ 8149774 ldrb r0, [r1] cmp r0, 0 beq _081497C4 - ldr r1, _081497EC - ldr r0, _081497F0 + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r2, 0xF0 lsls r2, 3 adds r0, r2 str r0, [r1, 0x4] - ldr r0, _081497F4 + ldr r0, =0x80000140 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _081497C4: - ldr r0, _081497F8 + ldr r0, =0x020394e8 str r0, [r4] - ldr r0, _081497FC + ldr r0, =0x04000040 str r0, [r4, 0x4] - ldr r0, _08149800 + ldr r0, =0xa2400001 str r0, [r4, 0x8] ldr r0, [r4, 0x8] pop {r4} pop {r0} bx r0 .align 2, 0 -_081497D8: .4byte 0x040000b0 -_081497DC: .4byte 0x0000c5ff -_081497E0: .4byte 0x00007fff -_081497E4: .4byte 0x04000050 -_081497E8: .4byte 0x0203aba0 -_081497EC: .4byte 0x040000d4 -_081497F0: .4byte 0x02038c28 -_081497F4: .4byte 0x80000140 -_081497F8: .4byte 0x020394e8 -_081497FC: .4byte 0x04000040 -_08149800: .4byte 0xa2400001 + .pool thumb_func_end sub_8149774 thumb_func_start sub_8149804 sub_8149804: @ 8149804 push {lr} bl sub_8149F2C - ldr r1, _08149838 - ldr r0, _0814983C + ldr r1, =0x04000054 + ldr r0, =0x0203aba0 ldr r2, [r0] ldrh r0, [r2, 0x12] strh r0, [r1] @@ -675203,15 +652783,14 @@ sub_8149804: @ 8149804 pop {r0} bx r0 .align 2, 0 -_08149838: .4byte 0x04000054 -_0814983C: .4byte 0x0203aba0 + .pool thumb_func_end sub_8149804 thumb_func_start sub_8149840 sub_8149840: @ 8149840 - ldr r2, _08149858 - ldr r1, _0814985C - ldr r0, _08149860 + ldr r2, =0x04000054 + ldr r1, =0x02038c28 + ldr r0, =0x04000006 ldrh r0, [r0] lsls r0, 1 movs r3, 0xF0 @@ -675222,9 +652801,7 @@ sub_8149840: @ 8149840 strh r0, [r2] bx lr .align 2, 0 -_08149858: .4byte 0x04000054 -_0814985C: .4byte 0x02038c28 -_08149860: .4byte 0x04000006 + .pool thumb_func_end sub_8149840 thumb_func_start sub_8149864 @@ -675242,19 +652819,19 @@ sub_8149864: @ 8149864 ldrsh r0, [r3, r1] cmp r0, 0 beq _0814994C - ldr r0, _0814988C + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] movs r0, 0x1 strb r0, [r1] b _0814994C .align 2, 0 -_0814988C: .4byte 0x0203aba0 + .pool _08149890: movs r2, 0x22 ldrsh r1, [r3, r2] lsls r1, 1 - ldr r0, _08149954 + ldr r0, =0x02038c28 adds r6, r1, r0 movs r2, 0xA0 lsls r2, 1 @@ -675316,7 +652893,7 @@ _08149902: ldrsh r0, [r3, r2] cmp r0, 0 beq _08149914 - ldr r0, _08149958 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] movs r0, 0x1 @@ -675328,7 +652905,7 @@ _08149914: beq _0814994C movs r2, 0x3A ldrsh r0, [r3, r2] - ldr r2, _08149958 + ldr r2, =0x0203aba0 cmp r0, 0 beq _0814993E ldr r0, [r2] @@ -675355,8 +652932,7 @@ _0814994C: pop {r0} bx r0 .align 2, 0 -_08149954: .4byte 0x02038c28 -_08149958: .4byte 0x0203aba0 + .pool thumb_func_end sub_8149864 thumb_func_start sub_814995C @@ -675364,8 +652940,8 @@ sub_814995C: @ 814995C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0814998C - ldr r2, _08149990 + ldr r5, =0x085c8db0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -675385,8 +652961,7 @@ _0814996E: pop {r0} bx r0 .align 2, 0 -_0814998C: .4byte 0x085c8db0 -_08149990: .4byte 0x03005e00 + .pool thumb_func_end sub_814995C thumb_func_start sub_8149994 @@ -675397,7 +652972,7 @@ sub_8149994: @ 8149994 add r0, sp, 0x4 add r1, sp, 0x8 bl sub_8149F58 - ldr r0, _081499DC + ldr r0, =0x085bacd0 ldr r1, [sp, 0x8] movs r2, 0x10 bl CpuSet @@ -675407,10 +652982,10 @@ sub_8149994: @ 8149994 adds r0, r2, 0 strh r0, [r1] ldr r1, [sp, 0x4] - ldr r2, _081499E0 + ldr r2, =0x01000400 mov r0, sp bl CpuSet - ldr r0, _081499E4 + ldr r0, =0x085c8ed4 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -675423,9 +652998,7 @@ sub_8149994: @ 8149994 pop {r1} bx r1 .align 2, 0 -_081499DC: .4byte 0x085bacd0 -_081499E0: .4byte 0x01000400 -_081499E4: .4byte 0x085c8ed4 + .pool thumb_func_end sub_8149994 thumb_func_start sub_81499E8 @@ -675447,7 +653020,7 @@ sub_81499E8: @ 81499E8 movs r1, 0xC ldrsh r0, [r4, r1] lsls r0, 5 - ldr r1, _08149A3C + ldr r1, =0x085bacd0 adds r0, r1 ldr r1, [sp] movs r2, 0x10 @@ -675471,7 +653044,7 @@ _08149A2A: pop {r1} bx r1 .align 2, 0 -_08149A3C: .4byte 0x085bacd0 + .pool thumb_func_end sub_81499E8 thumb_func_start sub_8149A40 @@ -675484,7 +653057,7 @@ sub_8149A40: @ 8149A40 cmp r1, 0 bne _08149A60 bl sub_8149F84 - ldr r0, _08149A68 + ldr r0, =sub_814995C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -675494,7 +653067,7 @@ _08149A60: pop {r1} bx r1 .align 2, 0 -_08149A68: .4byte sub_814995C + 1 + .pool thumb_func_end sub_8149A40 thumb_func_start sub_8149A6C @@ -675502,8 +653075,8 @@ sub_8149A6C: @ 8149A6C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08149A9C - ldr r2, _08149AA0 + ldr r5, =0x085c8dbc + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -675523,8 +653096,7 @@ _08149A7E: pop {r0} bx r0 .align 2, 0 -_08149A9C: .4byte 0x085c8dbc -_08149AA0: .4byte 0x03005e00 + .pool thumb_func_end sub_8149A6C thumb_func_start sub_8149AA4 @@ -675533,7 +653105,7 @@ sub_8149AA4: @ 8149AA4 adds r5, r0, 0 bl sub_8149F08 bl dp12_8087EA4 - ldr r0, _08149AFC + ldr r0, =0x0203aba0 ldr r1, [r0] movs r2, 0 movs r0, 0x3F @@ -675542,7 +653114,7 @@ sub_8149AA4: @ 8149AA4 movs r0, 0xA0 strh r0, [r1, 0x8] movs r1, 0 - ldr r2, _08149B00 + ldr r2, =0x02038c28 movs r3, 0xF0 adds r4, r2, 0 _08149AC8: @@ -675560,7 +653132,7 @@ _08149AC8: adds r0, r4, 0 movs r2, 0xA0 bl CpuSet - ldr r0, _08149B04 + ldr r0, =sub_8149CE8 + 1 bl SetVBlankCallback ldrh r0, [r5, 0x8] adds r0, 0x1 @@ -675570,9 +653142,7 @@ _08149AC8: pop {r1} bx r1 .align 2, 0 -_08149AFC: .4byte 0x0203aba0 -_08149B00: .4byte 0x02038c28 -_08149B04: .4byte sub_8149CE8 + 1 + .pool thumb_func_end sub_8149AA4 thumb_func_start sub_8149B08 @@ -675582,10 +653152,10 @@ sub_8149B08: @ 8149B08 push {r6} sub sp, 0xC mov r8, r0 - ldr r0, _08149B7C + ldr r0, =0x0203aba0 ldr r0, [r0] adds r0, 0x24 - ldr r6, _08149B80 + ldr r6, =0x085c8dd0 mov r2, r8 movs r3, 0xA ldrsh r1, [r2, r3] @@ -675634,8 +653204,7 @@ sub_8149B08: @ 8149B08 pop {r1} bx r1 .align 2, 0 -_08149B7C: .4byte 0x0203aba0 -_08149B80: .4byte 0x085c8dd0 + .pool thumb_func_end sub_8149B08 thumb_func_start sub_8149B84 @@ -675645,18 +653214,18 @@ sub_8149B84: @ 8149B84 mov r6, r8 push {r6,r7} adds r6, r0, 0 - ldr r0, _08149BD4 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] movs r0, 0 strb r0, [r1] mov r8, r0 movs r7, 0 - ldr r0, _08149BD8 + ldr r0, =0x02038c28 mov r9, r0 _08149BA0: - ldr r1, _08149BD8 - ldr r0, _08149BD4 + ldr r1, =0x02038c28 + ldr r0, =0x0203aba0 ldr r2, [r0] movs r3, 0x2A ldrsh r0, [r2, r3] @@ -675683,8 +653252,7 @@ _08149BC8: lsrs r3, r1, 16 b _08149BF4 .align 2, 0 -_08149BD4: .4byte 0x0203aba0 -_08149BD8: .4byte 0x02038c28 + .pool _08149BDC: lsls r0, r5, 16 asrs r0, 16 @@ -675700,7 +653268,7 @@ _08149BEA: bgt _08149BF4 lsrs r5, r1, 16 _08149BF4: - ldr r0, _08149C18 + ldr r0, =0x0203aba0 ldr r4, [r0] movs r0, 0x2A ldrsh r2, [r4, r0] @@ -675719,7 +653287,7 @@ _08149BF4: strh r0, [r6, 0x8] b _08149C40 .align 2, 0 -_08149C18: .4byte 0x0203aba0 + .pool _08149C1C: adds r0, r4, 0 adds r0, 0x24 @@ -675739,7 +653307,7 @@ _08149C1C: cmp r0, 0xF ble _08149BA0 _08149C40: - ldr r0, _08149C5C + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -675753,7 +653321,7 @@ _08149C40: pop {r1} bx r1 .align 2, 0 -_08149C5C: .4byte 0x0203aba0 + .pool thumb_func_end sub_8149B84 thumb_func_start sub_8149C60 @@ -675767,18 +653335,18 @@ sub_8149C60: @ 8149C60 asrs r0, 16 cmp r0, 0x6 ble _08149CAC - ldr r1, _08149C9C + ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] - ldr r0, _08149CA0 + ldr r0, =0x0000c5ff ands r0, r2 strh r0, [r1, 0xA] ldrh r2, [r1, 0xA] - ldr r0, _08149CA4 + ldr r0, =0x00007fff ands r0, r2 strh r0, [r1, 0xA] ldrh r0, [r1, 0xA] bl sub_8149F84 - ldr r0, _08149CA8 + ldr r0, =sub_8149A6C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -675786,15 +653354,12 @@ sub_8149C60: @ 8149C60 movs r0, 0 b _08149CC4 .align 2, 0 -_08149C9C: .4byte 0x040000b0 -_08149CA0: .4byte 0x0000c5ff -_08149CA4: .4byte 0x00007fff -_08149CA8: .4byte sub_8149A6C + 1 + .pool _08149CAC: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - ldr r1, _08149CC8 + ldr r1, =0x085c8e16 movs r3, 0xA ldrsh r0, [r2, r3] subs r0, 0x1 @@ -675807,7 +653372,7 @@ _08149CC4: pop {r1} bx r1 .align 2, 0 -_08149CC8: .4byte 0x085c8e16 + .pool thumb_func_end sub_8149C60 thumb_func_start sub_8149CCC @@ -675833,34 +653398,34 @@ _08149CE4: thumb_func_start sub_8149CE8 sub_8149CE8: @ 8149CE8 push {r4,lr} - ldr r4, _08149D54 + ldr r4, =0x040000b0 ldrh r1, [r4, 0xA] - ldr r0, _08149D58 + ldr r0, =0x0000c5ff ands r0, r1 strh r0, [r4, 0xA] ldrh r1, [r4, 0xA] - ldr r0, _08149D5C + ldr r0, =0x00007fff ands r0, r1 strh r0, [r4, 0xA] ldrh r0, [r4, 0xA] bl sub_8149F2C - ldr r3, _08149D60 + ldr r3, =0x0203aba0 ldr r0, [r3] ldrb r0, [r0] cmp r0, 0 beq _08149D20 - ldr r1, _08149D64 - ldr r0, _08149D68 + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r2, 0xF0 lsls r2, 3 adds r0, r2 str r0, [r1, 0x4] - ldr r0, _08149D6C + ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _08149D20: - ldr r2, _08149D70 + ldr r2, =0x04000048 ldr r1, [r3] ldrh r0, [r1, 0x2] strh r0, [r2] @@ -675871,7 +653436,7 @@ _08149D20: ldrh r0, [r1, 0x8] strh r0, [r2] subs r2, 0x4 - ldr r0, _08149D68 + ldr r0, =0x02038c28 movs r1, 0xF0 lsls r1, 3 adds r0, r1 @@ -675879,22 +653444,14 @@ _08149D20: strh r1, [r2] str r0, [r4] str r2, [r4, 0x4] - ldr r0, _08149D74 + ldr r0, =0xa2400001 str r0, [r4, 0x8] ldr r0, [r4, 0x8] pop {r4} pop {r0} bx r0 .align 2, 0 -_08149D54: .4byte 0x040000b0 -_08149D58: .4byte 0x0000c5ff -_08149D5C: .4byte 0x00007fff -_08149D60: .4byte 0x0203aba0 -_08149D64: .4byte 0x040000d4 -_08149D68: .4byte 0x02038c28 -_08149D6C: .4byte 0x800000a0 -_08149D70: .4byte 0x04000048 -_08149D74: .4byte 0xa2400001 + .pool thumb_func_end sub_8149CE8 thumb_func_start sub_8149D78 @@ -675919,13 +653476,13 @@ sub_8149D78: @ 8149D78 lsrs r6, 16 lsls r3, 16 lsrs r3, 16 - ldr r0, _08149DD4 + ldr r0, =sub_8149DFC + 1 movs r1, 0x3 str r3, [sp] bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08149DD8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -675945,14 +653502,13 @@ sub_8149D78: @ 8149D78 pop {r0} bx r0 .align 2, 0 -_08149DD4: .4byte sub_8149DFC + 1 -_08149DD8: .4byte 0x03005e00 + .pool thumb_func_end sub_8149D78 thumb_func_start sub_8149DDC sub_8149DDC: @ 8149DDC push {lr} - ldr r0, _08149DF0 + ldr r0, =sub_8149DFC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -675961,7 +653517,7 @@ sub_8149DDC: @ 8149DDC movs r0, 0 b _08149DF6 .align 2, 0 -_08149DF0: .4byte sub_8149DFC + 1 + .pool _08149DF4: movs r0, 0x1 _08149DF6: @@ -675974,8 +653530,8 @@ sub_8149DFC: @ 8149DFC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08149E2C - ldr r2, _08149E30 + ldr r5, =0x085c8e24 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -675995,8 +653551,7 @@ _08149E0E: pop {r0} bx r0 .align 2, 0 -_08149E2C: .4byte 0x085c8e24 -_08149E30: .4byte 0x03005e00 + .pool thumb_func_end sub_8149DFC thumb_func_start sub_8149E34 @@ -676030,7 +653585,7 @@ _08149E64: movs r0, 0x1 negs r0, r0 ldrb r1, [r4, 0x16] - ldr r2, _08149E8C + ldr r2, =0x00002d6b bl sub_80A2A20 _08149E70: movs r2, 0x16 @@ -676048,7 +653603,7 @@ _08149E82: pop {r1} bx r1 .align 2, 0 -_08149E8C: .4byte 0x00002d6b + .pool thumb_func_end sub_8149E34 thumb_func_start sub_8149E90 @@ -676081,7 +653636,7 @@ _08149EBE: movs r0, 0x1 negs r0, r0 ldrb r1, [r4, 0x16] - ldr r2, _08149EF0 + ldr r2, =0x00002d6b bl sub_80A2A20 _08149ECA: movs r0, 0x16 @@ -676094,15 +653649,14 @@ _08149ECA: lsls r0, 16 cmp r0, 0 bne _08149EF8 - ldr r0, _08149EF4 + ldr r0, =sub_8149DFC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task b _08149EFE .align 2, 0 -_08149EF0: .4byte 0x00002d6b -_08149EF4: .4byte sub_8149DFC + 1 + .pool _08149EF8: ldrh r0, [r4, 0xA] strh r0, [r4, 0x14] @@ -676117,7 +653671,7 @@ _08149EFE: thumb_func_start sub_8149F08 sub_8149F08: @ 8149F08 push {r4,lr} - ldr r4, _08149F28 + ldr r4, =0x0203aba0 ldr r0, [r4] movs r1, 0 movs r2, 0x3C @@ -676131,7 +653685,7 @@ sub_8149F08: @ 8149F08 pop {r0} bx r0 .align 2, 0 -_08149F28: .4byte 0x0203aba0 + .pool thumb_func_end sub_8149F08 thumb_func_start sub_8149F2C @@ -676146,7 +653700,7 @@ sub_8149F2C: @ 8149F2C thumb_func_start sub_8149F40 sub_8149F40: @ 8149F40 - ldr r1, _08149F54 + ldr r1, =0x04000008 ldrh r1, [r1] lsrs r1, 2 lsls r1, 30 @@ -676157,13 +653711,13 @@ sub_8149F40: @ 8149F40 str r1, [r0] bx lr .align 2, 0 -_08149F54: .4byte 0x04000008 + .pool thumb_func_end sub_8149F40 thumb_func_start sub_8149F58 sub_8149F58: @ 8149F58 push {r4,lr} - ldr r3, _08149F80 + ldr r3, =0x04000008 ldrh r2, [r3] lsrs r2, 8 ldrh r3, [r3] @@ -676182,7 +653736,7 @@ sub_8149F58: @ 8149F58 pop {r0} bx r0 .align 2, 0 -_08149F80: .4byte 0x04000008 + .pool thumb_func_end sub_8149F58 thumb_func_start sub_8149F84 @@ -676240,7 +653794,7 @@ _08149FD0: add r0, r9 strh r0, [r1] lsls r1, r5, 16 - ldr r0, _0814A010 + ldr r0, =0xffff0000 adds r1, r0 adds r0, r6, 0x1 lsls r0, 24 @@ -676260,7 +653814,7 @@ _0814A000: pop {r0} bx r0 .align 2, 0 -_0814A010: .4byte 0xffff0000 + .pool thumb_func_end sub_8149F98 thumb_func_start sub_814A014 @@ -676398,7 +653952,7 @@ _0814A104: adds r2, r1, 0 _0814A114: lsls r1, r7, 16 - ldr r0, _0814A1A8 + ldr r0, =0xffff0000 adds r1, r0 asrs r0, r1, 15 add r0, r9 @@ -676430,7 +653984,7 @@ _0814A146: ble _0814A164 adds r1, r0, 0 _0814A14E: - ldr r2, _0814A1A8 + ldr r2, =0xffff0000 adds r0, r4, r2 lsrs r3, r0, 16 mov r8, r3 @@ -676479,7 +654033,7 @@ _0814A196: pop {r0} bx r0 .align 2, 0 -_0814A1A8: .4byte 0xffff0000 + .pool thumb_func_end sub_814A014 thumb_func_start sub_814A1AC @@ -676703,13 +654257,13 @@ sub_814A324: @ 814A324 movs r0, 0 strh r0, [r1] ldr r1, [sp, 0x4] - ldr r2, _0814A368 + ldr r2, =0x01000400 mov r0, sp bl CpuSet - ldr r0, _0814A36C + ldr r0, =0x085c7c00 ldr r1, [sp, 0x8] bl LZ77UnCompVram - ldr r0, _0814A370 + ldr r0, =0x085c7be0 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -676722,9 +654276,7 @@ sub_814A324: @ 814A324 pop {r1} bx r1 .align 2, 0 -_0814A368: .4byte 0x01000400 -_0814A36C: .4byte 0x085c7c00 -_0814A370: .4byte 0x085c7be0 + .pool thumb_func_end sub_814A324 thumb_func_start sub_814A374 @@ -676735,10 +654287,10 @@ sub_814A374: @ 814A374 add r1, sp, 0xC add r0, sp, 0x8 bl sub_8149F58 - ldr r0, _0814A3B4 + ldr r0, =0x085c828c ldr r1, [sp, 0x8] bl LZ77UnCompVram - ldr r0, _0814A3B8 + ldr r0, =0x02038c28 movs r1, 0x10 ldrsh r2, [r4, r1] movs r3, 0x12 @@ -676758,8 +654310,7 @@ sub_814A374: @ 814A374 pop {r1} bx r1 .align 2, 0 -_0814A3B4: .4byte 0x085c828c -_0814A3B8: .4byte 0x02038c28 + .pool thumb_func_end sub_814A374 thumb_func_start sub_814A3BC @@ -676767,8 +654318,8 @@ sub_814A3BC: @ 814A3BC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0814A3EC - ldr r2, _0814A3F0 + ldr r5, =0x085c99d0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -676788,8 +654339,7 @@ _0814A3CE: pop {r0} bx r0 .align 2, 0 -_0814A3EC: .4byte 0x085c99d0 -_0814A3F0: .4byte 0x03005e00 + .pool thumb_func_end sub_814A3BC thumb_func_start sub_814A3F4 @@ -676797,8 +654347,8 @@ sub_814A3F4: @ 814A3F4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0814A424 - ldr r2, _0814A428 + ldr r5, =0x085c99e8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -676818,8 +654368,7 @@ _0814A406: pop {r0} bx r0 .align 2, 0 -_0814A424: .4byte 0x085c99e8 -_0814A428: .4byte 0x03005e00 + .pool thumb_func_end sub_814A3F4 thumb_func_start sub_814A42C @@ -676837,7 +654386,7 @@ sub_814A42C: @ 814A42C movs r0, 0x80 lsls r0, 6 strh r0, [r4, 0xC] - ldr r0, _0814A4B4 + ldr r0, =0x00007fff strh r0, [r4, 0xA] strh r5, [r4, 0x12] movs r0, 0x10 @@ -676845,18 +654394,18 @@ sub_814A42C: @ 814A42C movs r0, 0xA0 lsls r0, 4 strh r0, [r4, 0x16] - ldr r6, _0814A4B8 + ldr r6, =0x0203aba0 ldr r2, [r6] - ldr r3, _0814A4BC + ldr r3, =0x00003f41 strh r3, [r2, 0xE] ldrh r0, [r4, 0x14] lsls r0, 8 ldrh r1, [r4, 0x12] orrs r0, r1 strh r0, [r2, 0x10] - ldr r0, _0814A4C0 + ldr r0, =0x04000050 strh r3, [r0] - ldr r1, _0814A4C4 + ldr r1, =0x04000052 ldrh r0, [r2, 0x10] strh r0, [r1] add r0, sp, 0x4 @@ -676865,12 +654414,12 @@ sub_814A42C: @ 814A42C mov r0, sp strh r5, [r0] ldr r1, [sp, 0x4] - ldr r2, _0814A4C8 + ldr r2, =0x01000400 bl CpuSet - ldr r0, _0814A4CC + ldr r0, =0x085c7c00 ldr r1, [sp, 0x8] bl LZ77UnCompVram - ldr r0, _0814A4D0 + ldr r0, =0x085c7be0 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -676885,14 +654434,7 @@ sub_814A42C: @ 814A42C pop {r1} bx r1 .align 2, 0 -_0814A4B4: .4byte 0x00007fff -_0814A4B8: .4byte 0x0203aba0 -_0814A4BC: .4byte 0x00003f41 -_0814A4C0: .4byte 0x04000050 -_0814A4C4: .4byte 0x04000052 -_0814A4C8: .4byte 0x01000400 -_0814A4CC: .4byte 0x085c7c00 -_0814A4D0: .4byte 0x085c7be0 + .pool thumb_func_end sub_814A42C thumb_func_start sub_814A4D4 @@ -676903,7 +654445,7 @@ sub_814A4D4: @ 814A4D4 add r1, sp, 0x4 mov r0, sp bl sub_8149F58 - ldr r0, _0814A4FC + ldr r0, =0x085c828c ldr r1, [sp] bl LZ77UnCompVram ldrh r0, [r4, 0x8] @@ -676915,7 +654457,7 @@ sub_814A4D4: @ 814A4D4 pop {r1} bx r1 .align 2, 0 -_0814A4FC: .4byte 0x085c828c + .pool thumb_func_end sub_814A4D4 thumb_func_start sub_814A500 @@ -676923,9 +654465,9 @@ sub_814A500: @ 814A500 push {r4-r6,lr} adds r5, r0, 0 movs r2, 0 - ldr r6, _0814A540 - ldr r4, _0814A544 - ldr r3, _0814A548 + ldr r6, =sub_814A684 + 1 + ldr r4, =0x020393a8 + ldr r3, =0x0203aba0 _0814A50C: lsls r1, r2, 1 adds r1, r4 @@ -676939,7 +654481,7 @@ _0814A50C: bls _0814A50C adds r0, r6, 0 bl SetVBlankCallback - ldr r0, _0814A54C + ldr r0, =sub_814A6CC + 1 bl SetHBlankCallback movs r0, 0x2 bl enable_irqs @@ -676951,10 +654493,7 @@ _0814A50C: pop {r1} bx r1 .align 2, 0 -_0814A540: .4byte sub_814A684 + 1 -_0814A544: .4byte 0x020393a8 -_0814A548: .4byte 0x0203aba0 -_0814A54C: .4byte sub_814A6CC + 1 + .pool thumb_func_end sub_814A500 thumb_func_start sub_814A550 @@ -676964,7 +654503,7 @@ sub_814A550: @ 814A550 push {r7} sub sp, 0x4 adds r4, r0, 0 - ldr r1, _0814A598 + ldr r1, =0x0203aba0 ldr r0, [r1] ldrb r2, [r0] movs r3, 0 @@ -676988,7 +654527,7 @@ sub_814A550: @ 814A550 ble _0814A5A2 movs r1, 0xC ldrsh r0, [r4, r1] - ldr r1, _0814A59C + ldr r1, =0xfffffe80 adds r0, r1 cmp r0, 0 blt _0814A5A0 @@ -676996,8 +654535,7 @@ sub_814A550: @ 814A550 strh r0, [r4, 0xC] b _0814A5A2 .align 2, 0 -_0814A598: .4byte 0x0203aba0 -_0814A59C: .4byte 0xfffffe80 + .pool _0814A5A0: strh r3, [r4, 0xC] _0814A5A2: @@ -677040,10 +654578,10 @@ _0814A5E4: lsrs r0, r6, 8 asrs r1, r7, 16 bl sine - ldr r1, _0814A674 + ldr r1, =0x02038c28 lsls r2, r5, 1 adds r2, r1 - ldr r1, _0814A678 + ldr r1, =0x0203aba0 ldr r1, [r1] ldrh r1, [r1, 0x16] adds r0, r1 @@ -677079,13 +654617,13 @@ _0814A632: ldrsh r0, [r4, r2] cmp r0, 0 beq _0814A654 - ldr r0, _0814A67C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0814A654 - ldr r0, _0814A680 + ldr r0, =sub_814A3F4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -677094,7 +654632,7 @@ _0814A654: ldrh r0, [r4, 0x16] subs r0, 0x11 strh r0, [r4, 0x16] - ldr r0, _0814A678 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -677108,18 +654646,15 @@ _0814A654: pop {r1} bx r1 .align 2, 0 -_0814A674: .4byte 0x02038c28 -_0814A678: .4byte 0x0203aba0 -_0814A67C: .4byte 0x02037fd4 -_0814A680: .4byte sub_814A3F4 + 1 + .pool thumb_func_end sub_814A550 thumb_func_start sub_814A684 sub_814A684: @ 814A684 push {lr} bl sub_8149F2C - ldr r2, _0814A6B8 - ldr r0, _0814A6BC + ldr r2, =0x04000050 + ldr r0, =0x0203aba0 ldr r1, [r0] ldrh r0, [r1, 0xE] strh r0, [r2] @@ -677129,31 +654664,27 @@ sub_814A684: @ 814A684 ldrb r0, [r1] cmp r0, 0 beq _0814A6B4 - ldr r1, _0814A6C0 - ldr r0, _0814A6C4 + ldr r1, =0x040000d4 + ldr r0, =0x02038c28 str r0, [r1] movs r2, 0xF0 lsls r2, 3 adds r0, r2 str r0, [r1, 0x4] - ldr r0, _0814A6C8 + ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] _0814A6B4: pop {r0} bx r0 .align 2, 0 -_0814A6B8: .4byte 0x04000050 -_0814A6BC: .4byte 0x0203aba0 -_0814A6C0: .4byte 0x040000d4 -_0814A6C4: .4byte 0x02038c28 -_0814A6C8: .4byte 0x800000a0 + .pool thumb_func_end sub_814A684 thumb_func_start sub_814A6CC sub_814A6CC: @ 814A6CC - ldr r1, _0814A6E4 - ldr r0, _0814A6E8 + ldr r1, =0x02038c28 + ldr r0, =0x04000006 ldrh r0, [r0] lsls r0, 1 movs r2, 0xF0 @@ -677161,13 +654692,11 @@ sub_814A6CC: @ 814A6CC adds r1, r2 adds r0, r1 ldrh r1, [r0] - ldr r0, _0814A6EC + ldr r0, =0x04000012 strh r1, [r0] bx lr .align 2, 0 -_0814A6E4: .4byte 0x02038c28 -_0814A6E8: .4byte 0x04000006 -_0814A6EC: .4byte 0x04000012 + .pool thumb_func_end sub_814A6CC thumb_func_start sub_814A6F0 @@ -677175,8 +654704,8 @@ sub_814A6F0: @ 814A6F0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0814A720 - ldr r2, _0814A724 + ldr r5, =0x085c99f8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -677196,8 +654725,7 @@ _0814A702: pop {r0} bx r0 .align 2, 0 -_0814A720: .4byte 0x085c99f8 -_0814A724: .4byte 0x03005e00 + .pool thumb_func_end sub_814A6F0 thumb_func_start sub_814A728 @@ -677205,8 +654733,8 @@ sub_814A728: @ 814A728 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0814A758 - ldr r2, _0814A75C + ldr r5, =0x085c9a08 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -677226,8 +654754,7 @@ _0814A73A: pop {r0} bx r0 .align 2, 0 -_0814A758: .4byte 0x085c9a08 -_0814A75C: .4byte 0x03005e00 + .pool thumb_func_end sub_814A728 thumb_func_start sub_814A760 @@ -677235,8 +654762,8 @@ sub_814A760: @ 814A760 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0814A790 - ldr r2, _0814A794 + ldr r5, =0x085c9a1c + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -677256,8 +654783,7 @@ _0814A772: pop {r0} bx r0 .align 2, 0 -_0814A790: .4byte 0x085c9a1c -_0814A794: .4byte 0x03005e00 + .pool thumb_func_end sub_814A760 thumb_func_start sub_814A798 @@ -677270,7 +654796,7 @@ sub_814A798: @ 814A798 add r1, sp, 0x10 add r0, sp, 0xC bl sub_8149F58 - ldr r0, _0814A820 + ldr r0, =0x085c8598 ldr r1, [sp, 0x10] bl LZ77UnCompVram movs r4, 0x20 @@ -677301,7 +654827,7 @@ sub_814A798: @ 814A798 bl Bg_FillWramTileMapRectWithTileAndPalette movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _0814A824 + ldr r0, =0x085c8578 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -677323,8 +654849,7 @@ sub_814A798: @ 814A798 pop {r1} bx r1 .align 2, 0 -_0814A820: .4byte 0x085c8598 -_0814A824: .4byte 0x085c8578 + .pool thumb_func_end sub_814A798 thumb_func_start sub_814A828 @@ -677332,7 +654857,7 @@ sub_814A828: @ 814A828 push {r4,r5,lr} sub sp, 0x24 adds r4, r0, 0 - ldr r1, _0814A894 + ldr r1, =0x085c8928 movs r2, 0x4 str r2, [sp] str r2, [sp, 0x4] @@ -677383,7 +654908,7 @@ _0814A88A: pop {r1} bx r1 .align 2, 0 -_0814A894: .4byte 0x085c8928 + .pool thumb_func_end sub_814A828 thumb_func_start sub_814A898 @@ -677420,9 +654945,9 @@ _0814A8CA: b _0814A92C _0814A8D4: movs r2, 0xFA - ldr r6, _0814A8F4 + ldr r6, =0x02037714 movs r3, 0 - ldr r5, _0814A8F8 + ldr r5, =0x02037b14 _0814A8DC: lsls r1, r2, 1 adds r0, r1, r6 @@ -677436,31 +654961,29 @@ _0814A8DC: bls _0814A8DC b _0814A94C .align 2, 0 -_0814A8F4: .4byte 0x02037714 -_0814A8F8: .4byte 0x02037b14 + .pool _0814A8FC: - ldr r0, _0814A90C + ldr r0, =0xffff7fff movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, _0814A910 + ldr r0, =0x085c86f4 b _0814A91E .align 2, 0 -_0814A90C: .4byte 0xffff7fff -_0814A910: .4byte 0x085c86f4 + .pool _0814A914: - ldr r0, _0814A918 + ldr r0, =0x085c87f4 b _0814A91E .align 2, 0 -_0814A918: .4byte 0x085c87f4 + .pool _0814A91C: - ldr r0, _0814A928 + ldr r0, =0x085c88a4 _0814A91E: ldr r1, [sp, 0xC] bl LZ77UnCompVram b _0814A94C .align 2, 0 -_0814A928: .4byte 0x085c88a4 + .pool _0814A92C: movs r0, 0x20 str r0, [sp] @@ -677500,7 +655023,7 @@ sub_814A960: @ 814A960 add r1, sp, 0x10 add r0, sp, 0xC bl sub_8149F58 - ldr r0, _0814A9FC + ldr r0, =0x085c8598 ldr r1, [sp, 0x10] bl LZ77UnCompVram movs r4, 0x20 @@ -677531,7 +655054,7 @@ sub_814A960: @ 814A960 bl Bg_FillWramTileMapRectWithTileAndPalette movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r4, _0814AA00 + ldr r4, =0x085c8578 adds r0, r4, 0 movs r1, 0xE0 movs r2, 0x20 @@ -677561,8 +655084,7 @@ sub_814A960: @ 814A960 pop {r1} bx r1 .align 2, 0 -_0814A9FC: .4byte 0x085c8598 -_0814AA00: .4byte 0x085c8578 + .pool thumb_func_end sub_814A960 thumb_func_start sub_814AA04 @@ -677570,7 +655092,7 @@ sub_814AA04: @ 814AA04 push {r4-r6,lr} sub sp, 0x24 adds r6, r0, 0 - ldr r1, _0814AA7C + ldr r1, =0x085c9a30 movs r2, 0xC ldrsh r0, [r6, r2] adds r0, r1 @@ -677584,7 +655106,7 @@ sub_814AA04: @ 814AA04 adds r0, r5, 0 movs r1, 0x7 bl __udivsi3 - ldr r1, _0814AA80 + ldr r1, =0x085c8928 movs r2, 0x4 str r2, [sp] str r2, [sp, 0x4] @@ -677624,8 +655146,7 @@ _0814AA70: pop {r1} bx r1 .align 2, 0 -_0814AA7C: .4byte 0x085c9a30 -_0814AA80: .4byte 0x085c8928 + .pool thumb_func_end sub_814AA04 thumb_func_start sub_814AA84 @@ -677637,7 +655158,7 @@ sub_814AA84: @ 814AA84 movs r2, 0x3 movs r3, 0 bl pal_fade_1 - ldr r0, _0814AAB4 + ldr r0, =0xffff3fff movs r1, 0x10 movs r2, 0 bl sub_80A2A20 @@ -677652,7 +655173,7 @@ sub_814AA84: @ 814AA84 pop {r1} bx r1 .align 2, 0 -_0814AAB4: .4byte 0xffff3fff + .pool thumb_func_end sub_814AA84 thumb_func_start sub_814AAB8 @@ -677669,12 +655190,12 @@ sub_814AAB8: @ 814AAB8 strh r0, [r7, 0xE] cmp r0, 0 beq _0814AB2C - ldr r0, _0814AB24 + ldr r0, =0x085c8928 mov r8, r0 movs r4, 0x4 str r4, [sp] str r4, [sp, 0x4] - ldr r5, _0814AB28 + ldr r5, =0x085c9a30 movs r1, 0xC ldrsh r0, [r7, r1] adds r0, r5 @@ -677709,14 +655230,13 @@ sub_814AAB8: @ 814AAB8 bl bg_copy_tilemap_rect b _0814AB78 .align 2, 0 -_0814AB24: .4byte 0x085c8928 -_0814AB28: .4byte 0x085c9a30 + .pool _0814AB2C: movs r1, 0xC ldrsh r0, [r7, r1] cmp r0, 0 ble _0814AB72 - ldr r1, _0814AB9C + ldr r1, =0x085c9a30 subs r0, 0x1 adds r0, r1 ldrb r5, [r0] @@ -677767,7 +655287,7 @@ _0814AB86: pop {r1} bx r1 .align 2, 0 -_0814AB9C: .4byte 0x085c9a30 + .pool thumb_func_end sub_814AAB8 thumb_func_start sub_814ABA0 @@ -677807,7 +655327,7 @@ sub_814ABE4: @ 814ABE4 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0814AC2C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -677818,11 +655338,11 @@ sub_814ABE4: @ 814ABE4 strh r0, [r6, 0xC] cmp r0, 0 bne _0814AC24 - ldr r5, _0814AC30 + ldr r5, =0x02022e14 ldrh r1, [r5] movs r0, 0x12 bl lcd_io_set - ldr r4, _0814AC34 + ldr r4, =0x02022e16 ldrh r1, [r4] movs r0, 0x10 bl lcd_io_set @@ -677839,9 +655359,7 @@ _0814AC24: pop {r0} bx r0 .align 2, 0 -_0814AC2C: .4byte 0x03005e00 -_0814AC30: .4byte 0x02022e14 -_0814AC34: .4byte 0x02022e16 + .pool thumb_func_end sub_814ABE4 thumb_func_start sub_814AC38 @@ -677853,7 +655371,7 @@ sub_814AC38: @ 814AC38 add r1, sp, 0xC add r0, sp, 0x8 bl sub_8149F58 - ldr r0, _0814ACB4 + ldr r0, =0x085c8598 ldr r1, [sp, 0xC] bl LZ77UnCompVram movs r0, 0x20 @@ -677866,13 +655384,13 @@ sub_814AC38: @ 814AC38 bl bg_fill_tilemap_rect movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _0814ACB8 + ldr r0, =0x085c8578 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0814ACBC + ldr r0, =0x02022e14 strh r5, [r0] - ldr r4, _0814ACC0 + ldr r4, =0x02022e16 strh r5, [r4] movs r0, 0x12 movs r1, 0 @@ -677881,7 +655399,7 @@ sub_814AC38: @ 814AC38 movs r0, 0x10 bl lcd_io_set strh r5, [r6, 0xC] - ldr r0, _0814ACC4 + ldr r0, =sub_814ABE4 + 1 movs r1, 0x1 bl AddTask lsls r0, 24 @@ -677900,17 +655418,13 @@ sub_814AC38: @ 814AC38 beq _0814ACCE b _0814AD1C .align 2, 0 -_0814ACB4: .4byte 0x085c8598 -_0814ACB8: .4byte 0x085c8578 -_0814ACBC: .4byte 0x02022e14 -_0814ACC0: .4byte 0x02022e16 -_0814ACC4: .4byte sub_814ABE4 + 1 + .pool _0814ACC8: cmp r1, 0x2 beq _0814AD00 b _0814AD1C _0814ACCE: - ldr r0, _0814ACE0 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -677920,41 +655434,39 @@ _0814ACCE: strh r0, [r1, 0xA] b _0814AD2E .align 2, 0 -_0814ACE0: .4byte 0x03005e00 + .pool _0814ACE4: - ldr r1, _0814ACF8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0814ACFC + ldr r1, =0x0000ffff strh r1, [r0, 0x8] movs r1, 0x1 negs r1, r1 b _0814AD2C .align 2, 0 -_0814ACF8: .4byte 0x03005e00 -_0814ACFC: .4byte 0x0000ffff + .pool _0814AD00: - ldr r1, _0814AD14 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x8] - ldr r1, _0814AD18 + ldr r1, =0x0000ffff b _0814AD2C .align 2, 0 -_0814AD14: .4byte 0x03005e00 -_0814AD18: .4byte 0x0000ffff + .pool _0814AD1C: - ldr r1, _0814AD40 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0814AD44 + ldr r1, =0x0000ffff strh r1, [r0, 0x8] movs r1, 0x1 _0814AD2C: @@ -677969,8 +655481,7 @@ _0814AD2E: pop {r1} bx r1 .align 2, 0 -_0814AD40: .4byte 0x03005e00 -_0814AD44: .4byte 0x0000ffff + .pool thumb_func_end sub_814AC38 thumb_func_start sub_814AD48 @@ -677978,7 +655489,7 @@ sub_814AD48: @ 814AD48 push {r4,lr} sub sp, 0x24 adds r4, r0, 0 - ldr r1, _0814ADAC + ldr r1, =0x085c9a53 movs r2, 0xC ldrsh r0, [r4, r2] adds r0, r1 @@ -677986,7 +655497,7 @@ sub_814AD48: @ 814AD48 lsrs r2, r3, 3 movs r0, 0x7 ands r3, r0 - ldr r1, _0814ADB0 + ldr r1, =0x085c8928 movs r0, 0x4 str r0, [sp] str r0, [sp, 0x4] @@ -678024,15 +655535,14 @@ _0814ADA0: pop {r1} bx r1 .align 2, 0 -_0814ADAC: .4byte 0x085c9a53 -_0814ADB0: .4byte 0x085c8928 + .pool thumb_func_end sub_814AD48 thumb_func_start sub_814ADB4 sub_814ADB4: @ 814ADB4 push {r4,lr} adds r4, r0, 0 - ldr r0, _0814ADD4 + ldr r0, =0xffff7fff movs r1, 0x10 movs r2, 0 bl sub_80A2A20 @@ -678046,7 +655556,7 @@ sub_814ADB4: @ 814ADB4 pop {r1} bx r1 .align 2, 0 -_0814ADD4: .4byte 0xffff7fff + .pool thumb_func_end sub_814ADB4 thumb_func_start sub_814ADD8 @@ -678054,7 +655564,7 @@ sub_814ADD8: @ 814ADD8 push {r4,lr} sub sp, 0xC adds r4, r0, 0 - ldr r1, _0814AE38 + ldr r1, =0x085c9a53 movs r2, 0xC ldrsh r0, [r4, r2] adds r0, r1 @@ -678082,7 +655592,7 @@ sub_814ADD8: @ 814ADD8 asrs r0, 16 cmp r0, 0x3F ble _0814AE2E - ldr r0, _0814AE3C + ldr r0, =sub_814ABE4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -678097,8 +655607,7 @@ _0814AE2E: pop {r1} bx r1 .align 2, 0 -_0814AE38: .4byte 0x085c9a53 -_0814AE3C: .4byte sub_814ABE4 + 1 + .pool thumb_func_end sub_814ADD8 thumb_func_start sub_814AE40 @@ -678106,10 +655615,10 @@ sub_814AE40: @ 814AE40 push {r4,r5,lr} sub sp, 0x8 adds r5, r0, 0 - ldr r0, _0814AEA4 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r4, _0814AEA8 + ldr r4, =0x02022e16 strh r1, [r4] movs r0, 0x12 movs r1, 0 @@ -678146,8 +655655,7 @@ sub_814AE40: @ 814AE40 pop {r1} bx r1 .align 2, 0 -_0814AEA4: .4byte 0x02022e14 -_0814AEA8: .4byte 0x02022e16 + .pool thumb_func_end sub_814AE40 thumb_func_start nullsub_112 @@ -678157,26 +655665,24 @@ nullsub_112: @ 814AEAC thumb_func_start sub_814AEB0 sub_814AEB0: @ 814AEB0 - ldr r1, _0814AEC0 - ldr r0, _0814AEC4 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0814AEC8 + ldr r1, =bx_exec_buffer_A_ch0_tbl4 + 1 str r1, [r0] bx lr .align 2, 0 -_0814AEC0: .4byte 0x03005d60 -_0814AEC4: .4byte 0x02024064 -_0814AEC8: .4byte bx_exec_buffer_A_ch0_tbl4 + 1 + .pool thumb_func_end sub_814AEB0 thumb_func_start bx_exec_buffer_A_ch0_tbl4 bx_exec_buffer_A_ch0_tbl4: @ 814AECC push {lr} - ldr r2, _0814AF00 - ldr r1, _0814AF04 - ldr r0, _0814AF08 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -678185,13 +655691,13 @@ bx_exec_buffer_A_ch0_tbl4: @ 814AECC ands r1, r0 cmp r1, 0 beq _0814AF18 - ldr r0, _0814AF0C + ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _0814AF14 - ldr r0, _0814AF10 + ldr r0, =0x085c9a94 ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -678199,11 +655705,7 @@ bx_exec_buffer_A_ch0_tbl4: @ 814AECC bl _call_via_r0 b _0814AF18 .align 2, 0 -_0814AF00: .4byte 0x02024068 -_0814AF04: .4byte 0x0832a328 -_0814AF08: .4byte 0x02024064 -_0814AF0C: .4byte 0x02023064 -_0814AF10: .4byte 0x085c9a94 + .pool _0814AF14: bl dp01_tbl4_exec_completed _0814AF18: @@ -678214,9 +655716,9 @@ _0814AF18: thumb_func_start sub_814AF1C sub_814AF1C: @ 814AF1C push {lr} - ldr r2, _0814AF44 - ldr r1, _0814AF48 - ldr r0, _0814AF4C + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -678226,7 +655728,7 @@ sub_814AF1C: @ 814AF1C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0814AF50 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0814AF40 bl dp01_tbl4_exec_completed @@ -678234,18 +655736,15 @@ _0814AF40: pop {r0} bx r0 .align 2, 0 -_0814AF44: .4byte 0x02020630 -_0814AF48: .4byte 0x020241e4 -_0814AF4C: .4byte 0x02024064 -_0814AF50: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_814AF1C thumb_func_start sub_814AF54 sub_814AF54: @ 814AF54 push {r4-r6,lr} - ldr r6, _0814AFAC - ldr r5, _0814AFB0 - ldr r4, _0814AFB4 + ldr r6, =0x02020630 + ldr r5, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -678256,7 +655755,7 @@ sub_814AF54: @ 814AF54 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _0814AFB8 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0814AFA4 movs r0, 0 @@ -678283,18 +655782,15 @@ _0814AFA4: pop {r0} bx r0 .align 2, 0 -_0814AFAC: .4byte 0x02020630 -_0814AFB0: .4byte 0x020241e4 -_0814AFB4: .4byte 0x02024064 -_0814AFB8: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_814AF54 thumb_func_start sub_814AFBC sub_814AFBC: @ 814AFBC push {r4,lr} - ldr r4, _0814AFFC + ldr r4, =0x020244d0 ldr r1, [r4] - ldr r3, _0814B000 + ldr r3, =0x02024064 ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -678323,8 +655819,7 @@ _0814AFF4: pop {r0} bx r0 .align 2, 0 -_0814AFFC: .4byte 0x020244d0 -_0814B000: .4byte 0x02024064 + .pool thumb_func_end sub_814AFBC thumb_func_start sub_814B004 @@ -678339,16 +655834,16 @@ sub_814B004: @ 814B004 lsls r0, 24 cmp r0, 0 beq _0814B05C - ldr r0, _0814B048 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _0814B05C _0814B028: - ldr r2, _0814B04C - ldr r1, _0814B050 - ldr r0, _0814B054 + ldr r2, =0x02020630 + ldr r1, =0x03005d70 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -678358,20 +655853,16 @@ _0814B028: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0814B058 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0814B094 b _0814B092 .align 2, 0 -_0814B048: .4byte 0x02022fec -_0814B04C: .4byte 0x02020630 -_0814B050: .4byte 0x03005d70 -_0814B054: .4byte 0x02024064 -_0814B058: .4byte nullsub_12 + 1 + .pool _0814B05C: - ldr r2, _0814B0CC - ldr r5, _0814B0D0 - ldr r0, _0814B0D4 + ldr r2, =0x02020630 + ldr r5, =0x03005d70 + ldr r0, =0x02024064 ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -678382,7 +655873,7 @@ _0814B05C: adds r4, 0x1C adds r0, r4 ldr r2, [r0] - ldr r0, _0814B0D8 + ldr r0, =nullsub_12 + 1 cmp r2, r0 bne _0814B094 movs r0, 0x2 @@ -678407,9 +655898,9 @@ _0814B094: _0814B0A0: cmp r6, 0 beq _0814B0C6 - ldr r0, _0814B0DC + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r3, _0814B0D4 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -678418,24 +655909,18 @@ _0814B0A0: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, _0814B0E0 + ldr r1, =0x03005d60 ldrb r0, [r3] lsls r0, 2 adds r0, r1 - ldr r1, _0814B0E4 + ldr r1, =sub_814AFBC + 1 str r1, [r0] _0814B0C6: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0814B0CC: .4byte 0x02020630 -_0814B0D0: .4byte 0x03005d70 -_0814B0D4: .4byte 0x02024064 -_0814B0D8: .4byte nullsub_12 + 1 -_0814B0DC: .4byte 0x020244d0 -_0814B0E0: .4byte 0x03005d60 -_0814B0E4: .4byte sub_814AFBC + 1 + .pool thumb_func_end sub_814B004 thumb_func_start sub_814B0E8 @@ -678445,10 +655930,10 @@ sub_814B0E8: @ 814B0E8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _0814B260 + ldr r0, =0x020244d0 mov r12, r0 ldr r0, [r0] - ldr r7, _0814B264 + ldr r7, =0x02024064 ldrb r2, [r7] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -678481,9 +655966,9 @@ _0814B114: beq _0814B136 b _0814B252 _0814B136: - ldr r1, _0814B268 + ldr r1, =0x02020630 mov r10, r1 - ldr r0, _0814B26C + ldr r0, =0x03005d7c mov r9, r0 adds r0, r2, r0 ldrb r1, [r0] @@ -678494,10 +655979,10 @@ _0814B136: adds r5, 0x1C adds r0, r5 ldr r3, [r0] - ldr r0, _0814B270 + ldr r0, =nullsub_12 + 1 cmp r3, r0 bne _0814B252 - ldr r0, _0814B274 + ldr r0, =0x020241e4 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -678527,7 +656012,7 @@ _0814B136: lsls r0, 24 cmp r0, 0 beq _0814B1F0 - ldr r0, _0814B278 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -678543,19 +656028,19 @@ _0814B136: lsls r0, 2 add r0, r10 bl obj_delete_and_free_tiles - ldr r4, _0814B27C + ldr r4, =0x03005d70 ldrb r0, [r7] mov r1, r8 eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _0814B280 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0814B284 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -678570,28 +656055,28 @@ _0814B136: ldrb r0, [r0] bl sub_80729D0 _0814B1F0: - ldr r1, _0814B26C - ldr r4, _0814B264 + ldr r1, =0x03005d7c + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0814B268 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles - ldr r5, _0814B27C + ldr r5, =0x03005d70 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _0814B280 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0814B284 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -678601,7 +656086,7 @@ _0814B1F0: adds r0, r5 ldrb r0, [r0] bl sub_80729D0 - ldr r0, _0814B260 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r2, [r0, 0x8] ldrb r1, [r2, 0x9] @@ -678609,11 +656094,11 @@ _0814B1F0: negs r0, r0 ands r0, r1 strb r0, [r2, 0x9] - ldr r1, _0814B288 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0814B28C + ldr r1, =sub_814B004 + 1 str r1, [r0] _0814B252: pop {r3-r5} @@ -678624,26 +656109,15 @@ _0814B252: pop {r0} bx r0 .align 2, 0 -_0814B260: .4byte 0x020244d0 -_0814B264: .4byte 0x02024064 -_0814B268: .4byte 0x02020630 -_0814B26C: .4byte 0x03005d7c -_0814B270: .4byte nullsub_12 + 1 -_0814B274: .4byte 0x020241e4 -_0814B278: .4byte 0x02022fec -_0814B27C: .4byte 0x03005d70 -_0814B280: .4byte 0x0202406e -_0814B284: .4byte 0x020244ec -_0814B288: .4byte 0x03005d60 -_0814B28C: .4byte sub_814B004 + 1 + .pool thumb_func_end sub_814B0E8 thumb_func_start sub_814B290 sub_814B290: @ 814B290 push {lr} - ldr r2, _0814B2C4 - ldr r1, _0814B2C8 - ldr r0, _0814B2CC + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -678666,17 +656140,15 @@ _0814B2BE: pop {r0} bx r0 .align 2, 0 -_0814B2C4: .4byte 0x02020630 -_0814B2C8: .4byte 0x020241e4 -_0814B2CC: .4byte 0x02024064 + .pool thumb_func_end sub_814B290 thumb_func_start bx_t4_healthbar_update bx_t4_healthbar_update: @ 814B2D0 push {r4-r6,lr} - ldr r5, _0814B310 + ldr r5, =0x02024064 ldrb r0, [r5] - ldr r6, _0814B314 + ldr r6, =0x03005d70 adds r1, r0, r6 ldrb r1, [r1] movs r2, 0 @@ -678702,17 +656174,16 @@ bx_t4_healthbar_update: @ 814B2D0 bl heathbar_draw_hp b _0814B332 .align 2, 0 -_0814B310: .4byte 0x02024064 -_0814B314: .4byte 0x03005d70 + .pool _0814B318: - ldr r2, _0814B338 + ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0814B33C + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 bl dp01_tbl4_exec_completed @@ -678721,16 +656192,15 @@ _0814B332: pop {r0} bx r0 .align 2, 0 -_0814B338: .4byte 0x0202406e -_0814B33C: .4byte 0x020244ec + .pool thumb_func_end bx_t4_healthbar_update thumb_func_start sub_814B340 sub_814B340: @ 814B340 push {r4-r6,lr} - ldr r6, _0814B3C4 - ldr r5, _0814B3C8 - ldr r4, _0814B3CC + ldr r6, =0x02020630 + ldr r5, =0x020241e4 + ldr r4, =0x02024064 ldrb r2, [r4] adds r0, r2, r5 ldrb r1, [r0] @@ -678745,13 +656215,13 @@ sub_814B340: @ 814B340 adds r1, r0 cmp r1, 0xA0 ble _0814B3BC - ldr r1, _0814B3D0 + ldr r1, =0x0202406e lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814B3D4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -678777,7 +656247,7 @@ sub_814B340: @ 814B340 lsls r0, 2 adds r0, r6 bl obj_delete_and_free_tiles - ldr r1, _0814B3D8 + ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -678788,20 +656258,15 @@ _0814B3BC: pop {r0} bx r0 .align 2, 0 -_0814B3C4: .4byte 0x02020630 -_0814B3C8: .4byte 0x020241e4 -_0814B3CC: .4byte 0x02024064 -_0814B3D0: .4byte 0x0202406e -_0814B3D4: .4byte 0x020244ec -_0814B3D8: .4byte 0x03005d70 + .pool thumb_func_end sub_814B340 thumb_func_start sub_814B3DC sub_814B3DC: @ 814B3DC push {r4-r6,lr} - ldr r0, _0814B438 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r6, _0814B43C + ldr r6, =0x02024064 ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -678813,13 +656278,13 @@ sub_814B3DC: @ 814B3DC ands r0, r1 cmp r0, 0 bne _0814B430 - ldr r5, _0814B440 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0814B444 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -678830,7 +656295,7 @@ sub_814B3DC: @ 814B3DC lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r1, _0814B448 + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -678841,11 +656306,7 @@ _0814B430: pop {r0} bx r0 .align 2, 0 -_0814B438: .4byte 0x020244d0 -_0814B43C: .4byte 0x02024064 -_0814B440: .4byte 0x020241e4 -_0814B444: .4byte 0x02020630 -_0814B448: .4byte 0x03005d70 + .pool thumb_func_end sub_814B3DC thumb_func_start bx_t4_button_a @@ -678865,12 +656326,12 @@ _0814B45E: thumb_func_start dp01t_0F_4_move_anim dp01t_0F_4_move_anim: @ 814B464 push {r4,lr} - ldr r1, _0814B4A0 - ldr r0, _0814B4A4 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _0814B4A8 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -678888,15 +656349,12 @@ dp01t_0F_4_move_anim: @ 814B464 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, _0814B4AC + ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl4_exec_completed b _0814B4DA .align 2, 0 -_0814B4A0: .4byte 0x020241e4 -_0814B4A4: .4byte 0x02024064 -_0814B4A8: .4byte 0x02020630 -_0814B4AC: .4byte 0x020244b9 + .pool _0814B4B0: ldrh r0, [r4, 0x30] movs r1, 0x3 @@ -678929,9 +656387,9 @@ _0814B4DA: thumb_func_start sub_814B4E0 sub_814B4E0: @ 814B4E0 push {r4,lr} - ldr r2, _0814B538 - ldr r0, _0814B53C - ldr r4, _0814B540 + ldr r2, =0x02020630 + ldr r0, =0x03005d70 + ldr r4, =0x02024064 ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -678941,12 +656399,12 @@ sub_814B4E0: @ 814B4E0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0814B544 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0814B532 adds r0, r3, 0 bl sub_805E408 - ldr r0, _0814B548 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r2, [r4] ldr r1, [r0] @@ -678962,32 +656420,26 @@ sub_814B4E0: @ 814B4E0 movs r3, 0x6 bl move_anim_start_t4 _0814B526: - ldr r0, _0814B54C + ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, _0814B550 + ldr r0, =sub_814B554 + 1 str r0, [r1] _0814B532: pop {r4} pop {r0} bx r0 .align 2, 0 -_0814B538: .4byte 0x02020630 -_0814B53C: .4byte 0x03005d70 -_0814B540: .4byte 0x02024064 -_0814B544: .4byte nullsub_12 + 1 -_0814B548: .4byte 0x020244d0 -_0814B54C: .4byte 0x03005d60 -_0814B550: .4byte sub_814B554 + 1 + .pool thumb_func_end sub_814B4E0 thumb_func_start sub_814B554 sub_814B554: @ 814B554 push {lr} - ldr r0, _0814B594 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _0814B598 + ldr r0, =0x02024064 ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -678999,8 +656451,8 @@ sub_814B554: @ 814B554 ands r0, r1 cmp r0, 0 bne _0814B590 - ldr r2, _0814B59C - ldr r0, _0814B5A0 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -679009,7 +656461,7 @@ sub_814B554: @ 814B554 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0814B5A4 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0814B590 bl dp01_tbl4_exec_completed @@ -679017,11 +656469,7 @@ _0814B590: pop {r0} bx r0 .align 2, 0 -_0814B594: .4byte 0x020244d0 -_0814B598: .4byte 0x02024064 -_0814B59C: .4byte 0x02020630 -_0814B5A0: .4byte 0x020241e4 -_0814B5A4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_814B554 thumb_func_start sub_814B5A8 @@ -679029,9 +656477,9 @@ sub_814B5A8: @ 814B5A8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r3, _0814B670 + ldr r3, =0x020244d0 ldr r0, [r3] - ldr r7, _0814B674 + ldr r7, =0x02024064 ldrb r1, [r7] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -679059,15 +656507,15 @@ sub_814B5A8: @ 814B5A8 negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r4, _0814B678 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - ldr r0, _0814B67C + ldr r0, =c3_0802FDF4 + 1 movs r1, 0xA bl AddTask - ldr r0, _0814B680 + ldr r0, =0x0202406e mov r8, r0 ldrb r1, [r7] lsls r0, r1, 1 @@ -679075,21 +656523,21 @@ sub_814B5A8: @ 814B5A8 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _0814B684 + ldr r5, =0x020244ec adds r0, r5 bl sub_805E990 - ldr r1, _0814B688 + ldr r1, =0x020241e4 ldrb r0, [r7] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0814B68C + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 bl obj_anim_image_start - ldr r4, _0814B690 + ldr r4, =0x03005d70 ldrb r1, [r7] adds r0, r1, r4 ldrb r0, [r0] @@ -679106,11 +656554,11 @@ sub_814B5A8: @ 814B5A8 adds r0, r4 ldrb r0, [r0] bl sub_80729D0 - ldr r1, _0814B694 + ldr r1, =0x03005d60 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, _0814B698 + ldr r1, =sub_814B4E0 + 1 str r1, [r0] _0814B664: pop {r3} @@ -679119,25 +656567,15 @@ _0814B664: pop {r0} bx r0 .align 2, 0 -_0814B670: .4byte 0x020244d0 -_0814B674: .4byte 0x02024064 -_0814B678: .4byte 0x000027f9 -_0814B67C: .4byte c3_0802FDF4 + 1 -_0814B680: .4byte 0x0202406e -_0814B684: .4byte 0x020244ec -_0814B688: .4byte 0x020241e4 -_0814B68C: .4byte 0x02020630 -_0814B690: .4byte 0x03005d70 -_0814B694: .4byte 0x03005d60 -_0814B698: .4byte sub_814B4E0 + 1 + .pool thumb_func_end sub_814B5A8 thumb_func_start sub_814B69C sub_814B69C: @ 814B69C push {r4-r6,lr} - ldr r6, _0814B71C + ldr r6, =0x020244d0 ldr r0, [r6] - ldr r4, _0814B720 + ldr r4, =0x02024064 ldrb r2, [r4] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -679149,18 +656587,18 @@ sub_814B69C: @ 814B69C ands r0, r1 cmp r0, 0 bne _0814B6CE - ldr r0, _0814B724 + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0814B728 + ldr r0, =0x020244ec adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 _0814B6CE: - ldr r5, _0814B72C - ldr r0, _0814B730 + ldr r5, =0x02020630 + ldr r0, =0x03005d7c ldrb r2, [r4] adds r0, r2, r0 ldrb r1, [r0] @@ -679171,7 +656609,7 @@ _0814B6CE: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _0814B734 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0814B714 ldr r0, [r6] @@ -679187,40 +656625,32 @@ _0814B6CE: bne _0814B714 adds r0, r3, r5 bl obj_delete_and_free_tiles - ldr r1, _0814B738 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0814B73C + ldr r1, =sub_814B5A8 + 1 str r1, [r0] _0814B714: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0814B71C: .4byte 0x020244d0 -_0814B720: .4byte 0x02024064 -_0814B724: .4byte 0x0202406e -_0814B728: .4byte 0x020244ec -_0814B72C: .4byte 0x02020630 -_0814B730: .4byte 0x03005d7c -_0814B734: .4byte nullsub_12 + 1 -_0814B738: .4byte 0x03005d60 -_0814B73C: .4byte sub_814B5A8 + 1 + .pool thumb_func_end sub_814B69C thumb_func_start dp01_tbl4_exec_completed dp01_tbl4_exec_completed: @ 814B740 push {r4,lr} sub sp, 0x4 - ldr r1, _0814B780 - ldr r4, _0814B784 + ldr r1, =0x03005d60 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0814B788 + ldr r1, =bx_exec_buffer_A_ch0_tbl4 + 1 str r1, [r0] - ldr r0, _0814B78C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -679233,7 +656663,7 @@ dp01_tbl4_exec_completed: @ 814B740 movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _0814B790 + ldr r1, =0x02023064 ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -679241,14 +656671,10 @@ dp01_tbl4_exec_completed: @ 814B740 strb r1, [r0] b _0814B7A6 .align 2, 0 -_0814B780: .4byte 0x03005d60 -_0814B784: .4byte 0x02024064 -_0814B788: .4byte bx_exec_buffer_A_ch0_tbl4 + 1 -_0814B78C: .4byte 0x02022fec -_0814B790: .4byte 0x02023064 + .pool _0814B794: - ldr r2, _0814B7B0 - ldr r1, _0814B7B4 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -679262,16 +656688,15 @@ _0814B7A6: pop {r0} bx r0 .align 2, 0 -_0814B7B0: .4byte 0x02024068 -_0814B7B4: .4byte 0x0832a328 + .pool thumb_func_end dp01_tbl4_exec_completed thumb_func_start sub_814B7B8 sub_814B7B8: @ 814B7B8 push {lr} - ldr r0, _0814B7E0 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0814B7E4 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -679288,16 +656713,15 @@ _0814B7DA: pop {r0} bx r0 .align 2, 0 -_0814B7E0: .4byte 0x020244d0 -_0814B7E4: .4byte 0x02024064 + .pool thumb_func_end sub_814B7B8 thumb_func_start sub_814B7E8 sub_814B7E8: @ 814B7E8 push {lr} - ldr r0, _0814B810 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0814B814 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -679314,8 +656738,7 @@ _0814B80A: pop {r0} bx r0 .align 2, 0 -_0814B810: .4byte 0x020244d0 -_0814B814: .4byte 0x02024064 + .pool thumb_func_end sub_814B7E8 thumb_func_start dp01t_00_4_getattr @@ -679323,8 +656746,8 @@ dp01t_00_4_getattr: @ 814B818 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _0814B844 - ldr r0, _0814B848 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -679332,7 +656755,7 @@ dp01t_00_4_getattr: @ 814B818 ldrb r0, [r1] cmp r0, 0 bne _0814B850 - ldr r0, _0814B84C + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -679341,9 +656764,7 @@ dp01t_00_4_getattr: @ 814B818 adds r6, r0, 0 b _0814B872 .align 2, 0 -_0814B844: .4byte 0x02023064 -_0814B848: .4byte 0x02024064 -_0814B84C: .4byte 0x0202406e + .pool _0814B850: ldrb r4, [r1] movs r5, 0 @@ -679388,8 +656809,8 @@ dp01_getattr_by_ch1_for_player_pokemon__: @ 814B88C lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _0814B8C0 - ldr r3, _0814B8C4 + ldr r2, =0x02023064 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -679400,14 +656821,12 @@ dp01_getattr_by_ch1_for_player_pokemon__: @ 814B88C bl _0814C022 _0814B8B6: lsls r0, 2 - ldr r1, _0814B8C8 + ldr r1, =_0814B8CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0814B8C0: .4byte 0x02023064 -_0814B8C4: .4byte 0x02024064 -_0814B8C8: .4byte _0814B8CC + .pool .align 2, 0 _0814B8CC: .4byte _0814B9BC @@ -679474,7 +656893,7 @@ _0814B9BC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0814BBD0 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -679527,7 +656946,7 @@ _0814BA08: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0814BBD0 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -679563,7 +656982,7 @@ _0814BA08: ands r0, r6 lsls r0, 5 ldrh r2, [r3, 0x14] - ldr r1, _0814BBD4 + ldr r1, =0xfffffc1f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x14] @@ -679586,7 +657005,7 @@ _0814BA08: ands r1, r0 lsls r1, 15 ldr r0, [sp, 0x14] - ldr r2, _0814BBD8 + ldr r2, =0xfff07fff ands r0, r2 orrs r0, r1 str r0, [sp, 0x14] @@ -679597,7 +657016,7 @@ _0814BA08: ands r0, r6 lsls r0, 4 ldrh r2, [r3, 0x16] - ldr r1, _0814BBDC + ldr r1, =0xfffffe0f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x16] @@ -679711,28 +657130,25 @@ _0814BBC0: bls _0814BBC0 b _0814C022 .align 2, 0 -_0814BBD0: .4byte 0x020244ec -_0814BBD4: .4byte 0xfffffc1f -_0814BBD8: .4byte 0xfff07fff -_0814BBDC: .4byte 0xfffffe0f + .pool _0814BBE0: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BBEC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB b _0814BF5A .align 2, 0 -_0814BBEC: .4byte 0x020244ec + .pool _0814BBF0: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BBFC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC b _0814BF5A .align 2, 0 -_0814BBFC: .4byte 0x020244ec + .pool _0814BC00: movs r6, 0 add r2, sp, 0x58 @@ -679742,7 +657158,7 @@ _0814BC00: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0814BC64 + ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 _0814BC16: @@ -679766,7 +657182,7 @@ _0814BC16: ble _0814BC16 movs r0, 0x64 muls r0, r5 - ldr r1, _0814BC64 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -679784,11 +657200,11 @@ _0814BC54: bls _0814BC54 b _0814C022 .align 2, 0 -_0814BC64: .4byte 0x020244ec + .pool _0814BC68: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BC80 + ldr r1, =0x020244ec adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -679798,13 +657214,13 @@ _0814BC68: adds r1, 0x9 b _0814BF5A .align 2, 0 -_0814BC80: .4byte 0x020244ec + .pool _0814BC84: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _0814BCBC + ldr r2, =0x020244ec mov r8, r2 _0814BC90: adds r1, r6, 0 @@ -679819,7 +657235,7 @@ _0814BC90: ble _0814BC90 movs r0, 0x64 muls r0, r5 - ldr r1, _0814BCBC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -679828,11 +657244,11 @@ _0814BC90: adds r6, 0x1 b _0814C022 .align 2, 0 -_0814BCBC: .4byte 0x020244ec + .pool _0814BCC0: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BCD8 + ldr r1, =0x020244ec adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -679842,20 +657258,20 @@ _0814BCC0: adds r1, 0x8 b _0814C01A .align 2, 0 -_0814BCD8: .4byte 0x020244ec + .pool _0814BCDC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BCE8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 b _0814BCF6 .align 2, 0 -_0814BCE8: .4byte 0x020244ec + .pool _0814BCEC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BD18 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x19 _0814BCF6: @@ -679875,120 +657291,120 @@ _0814BCF6: movs r6, 0x3 b _0814C022 .align 2, 0 -_0814BD18: .4byte 0x020244ec + .pool _0814BD1C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BD28 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A b _0814C01A .align 2, 0 -_0814BD28: .4byte 0x020244ec + .pool _0814BD2C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BD38 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B b _0814C01A .align 2, 0 -_0814BD38: .4byte 0x020244ec + .pool _0814BD3C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BD48 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C b _0814C01A .align 2, 0 -_0814BD48: .4byte 0x020244ec + .pool _0814BD4C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BD58 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D b _0814C01A .align 2, 0 -_0814BD58: .4byte 0x020244ec + .pool _0814BD5C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BD68 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E b _0814C01A .align 2, 0 -_0814BD68: .4byte 0x020244ec + .pool _0814BD6C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BD78 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F b _0814C01A .align 2, 0 -_0814BD78: .4byte 0x020244ec + .pool _0814BD7C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BD88 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 b _0814C01A .align 2, 0 -_0814BD88: .4byte 0x020244ec + .pool _0814BD8C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BD98 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 b _0814C01A .align 2, 0 -_0814BD98: .4byte 0x020244ec + .pool _0814BD9C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BDA8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 b _0814C01A .align 2, 0 -_0814BDA8: .4byte 0x020244ec + .pool _0814BDAC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BDB8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 b _0814C01A .align 2, 0 -_0814BDB8: .4byte 0x020244ec + .pool _0814BDBC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BDC8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 b _0814C01A .align 2, 0 -_0814BDC8: .4byte 0x020244ec + .pool _0814BDCC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BDD8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 b _0814C01A .align 2, 0 -_0814BDD8: .4byte 0x020244ec + .pool _0814BDDC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0814BE28 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -680017,83 +657433,83 @@ _0814BDDC: movs r6, 0x6 b _0814C022 .align 2, 0 -_0814BE28: .4byte 0x020244ec + .pool _0814BE2C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BE38 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 b _0814C01A .align 2, 0 -_0814BE38: .4byte 0x020244ec + .pool _0814BE3C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BE48 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 b _0814C01A .align 2, 0 -_0814BE48: .4byte 0x020244ec + .pool _0814BE4C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BE58 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 b _0814C01A .align 2, 0 -_0814BE58: .4byte 0x020244ec + .pool _0814BE5C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BE68 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A b _0814C01A .align 2, 0 -_0814BE68: .4byte 0x020244ec + .pool _0814BE6C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BE78 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B b _0814C01A .align 2, 0 -_0814BE78: .4byte 0x020244ec + .pool _0814BE7C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BE88 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C b _0814C01A .align 2, 0 -_0814BE88: .4byte 0x020244ec + .pool _0814BE8C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BE98 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0 b _0814BEB6 .align 2, 0 -_0814BE98: .4byte 0x020244ec + .pool _0814BE9C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BEA8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 b _0814BF5A .align 2, 0 -_0814BEA8: .4byte 0x020244ec + .pool _0814BEAC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BEDC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x37 _0814BEB6: @@ -680115,74 +657531,74 @@ _0814BEB6: movs r6, 0x4 b _0814C022 .align 2, 0 -_0814BEDC: .4byte 0x020244ec + .pool _0814BEE0: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BEEC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 b _0814C01A .align 2, 0 -_0814BEEC: .4byte 0x020244ec + .pool _0814BEF0: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BEFC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 b _0814BF5A .align 2, 0 -_0814BEFC: .4byte 0x020244ec + .pool _0814BF00: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BF0C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A b _0814BF5A .align 2, 0 -_0814BF0C: .4byte 0x020244ec + .pool _0814BF10: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BF1C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B b _0814BF5A .align 2, 0 -_0814BF1C: .4byte 0x020244ec + .pool _0814BF20: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BF2C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C b _0814BF5A .align 2, 0 -_0814BF2C: .4byte 0x020244ec + .pool _0814BF30: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BF3C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D b _0814BF5A .align 2, 0 -_0814BF3C: .4byte 0x020244ec + .pool _0814BF40: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BF4C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E b _0814BF5A .align 2, 0 -_0814BF4C: .4byte 0x020244ec + .pool _0814BF50: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BF6C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3F _0814BF5A: @@ -680195,101 +657611,101 @@ _0814BF5A: movs r6, 0x2 b _0814C022 .align 2, 0 -_0814BF6C: .4byte 0x020244ec + .pool _0814BF70: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BF7C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 b _0814C01A .align 2, 0 -_0814BF7C: .4byte 0x020244ec + .pool _0814BF80: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BF8C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 b _0814C01A .align 2, 0 -_0814BF8C: .4byte 0x020244ec + .pool _0814BF90: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BF9C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 b _0814C01A .align 2, 0 -_0814BF9C: .4byte 0x020244ec + .pool _0814BFA0: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BFAC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 b _0814C01A .align 2, 0 -_0814BFAC: .4byte 0x020244ec + .pool _0814BFB0: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BFBC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F b _0814C01A .align 2, 0 -_0814BFBC: .4byte 0x020244ec + .pool _0814BFC0: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BFCC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 b _0814C01A .align 2, 0 -_0814BFCC: .4byte 0x020244ec + .pool _0814BFD0: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BFDC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 b _0814C01A .align 2, 0 -_0814BFDC: .4byte 0x020244ec + .pool _0814BFE0: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BFEC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 b _0814C01A .align 2, 0 -_0814BFEC: .4byte 0x020244ec + .pool _0814BFF0: movs r0, 0x64 muls r0, r5 - ldr r1, _0814BFFC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 b _0814C01A .align 2, 0 -_0814BFFC: .4byte 0x020244ec + .pool _0814C000: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C00C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 b _0814C01A .align 2, 0 -_0814C00C: .4byte 0x020244ec + .pool _0814C010: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C034 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 _0814C01A: @@ -680307,7 +657723,7 @@ _0814C022: pop {r1} bx r1 .align 2, 0 -_0814C034: .4byte 0x020244ec + .pool thumb_func_end dp01_getattr_by_ch1_for_player_pokemon__ thumb_func_start sub_814C038 @@ -680321,8 +657737,8 @@ sub_814C038: @ 814C038 thumb_func_start sub_814C044 sub_814C044: @ 814C044 push {r4,r5,lr} - ldr r1, _0814C068 - ldr r0, _0814C06C + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -680330,16 +657746,14 @@ sub_814C044: @ 814C044 ldrb r0, [r1] cmp r0, 0 bne _0814C074 - ldr r0, _0814C070 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_814C09C b _0814C092 .align 2, 0 -_0814C068: .4byte 0x02023064 -_0814C06C: .4byte 0x02024064 -_0814C070: .4byte 0x0202406e + .pool _0814C074: ldrb r4, [r1] movs r5, 0 @@ -680374,10 +657788,10 @@ sub_814C09C: @ 814C09C sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0814C0D4 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 - ldr r2, _0814C0D8 + ldr r2, =0x02023067 adds r3, r0, r2 adds r6, r3, 0 subs r1, r2, 0x2 @@ -680389,14 +657803,12 @@ sub_814C09C: @ 814C09C bl _0814CA62 _0814C0C8: lsls r0, 2 - ldr r1, _0814C0DC + ldr r1, =_0814C0E0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0814C0D4: .4byte 0x02024064 -_0814C0D8: .4byte 0x02023067 -_0814C0DC: .4byte _0814C0E0 + .pool .align 2, 0 _0814C0E0: .4byte _0814C1D0 @@ -680463,7 +657875,7 @@ _0814C1D0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0814C364 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -680530,7 +657942,7 @@ _0814C236: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0814C364 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -680640,13 +658052,13 @@ _0814C236: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C364: .4byte 0x020244ec + .pool _0814C368: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C380 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C384 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680654,14 +658066,13 @@ _0814C368: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C380: .4byte 0x020244ec -_0814C384: .4byte 0x02024064 + .pool _0814C388: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C3A0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C3A4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680669,8 +658080,7 @@ _0814C388: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C3A0: .4byte 0x020244ec -_0814C3A4: .4byte 0x02024064 + .pool _0814C3A8: movs r0, 0 mov r8, r0 @@ -680680,7 +658090,7 @@ _0814C3A8: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0814C3FC + ldr r0, =0x020244ec adds r7, r1, r0 adds r6, r3, 0 adds r6, 0x8 @@ -680705,21 +658115,21 @@ _0814C3C2: ble _0814C3C2 movs r0, 0x64 muls r0, r5 - ldr r1, _0814C3FC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 mov r2, r9 bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C3FC: .4byte 0x020244ec + .pool _0814C400: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C41C + ldr r1, =0x020244ec adds r0, r1 - ldr r3, _0814C420 - ldr r1, _0814C424 + ldr r3, =0x02023064 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -680728,16 +658138,14 @@ _0814C400: adds r1, 0x9 b _0814C4A4 .align 2, 0 -_0814C41C: .4byte 0x020244ec -_0814C420: .4byte 0x02023064 -_0814C424: .4byte 0x02024064 + .pool _0814C428: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0814C484 + ldr r0, =0x020244ec adds r4, r0 - ldr r5, _0814C488 + ldr r5, =0x02024064 ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -680774,15 +658182,14 @@ _0814C428: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C484: .4byte 0x020244ec -_0814C488: .4byte 0x02024064 + .pool _0814C48C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C4B0 + ldr r1, =0x020244ec adds r0, r1 - ldr r3, _0814C4B4 - ldr r1, _0814C4B8 + ldr r3, =0x02023064 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -680795,15 +658202,13 @@ _0814C4A4: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C4B0: .4byte 0x020244ec -_0814C4B4: .4byte 0x02023064 -_0814C4B8: .4byte 0x02024064 + .pool _0814C4BC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C4D4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C4D8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680811,14 +658216,13 @@ _0814C4BC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C4D4: .4byte 0x020244ec -_0814C4D8: .4byte 0x02024064 + .pool _0814C4DC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C4F4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C4F8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680826,14 +658230,13 @@ _0814C4DC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C4F4: .4byte 0x020244ec -_0814C4F8: .4byte 0x02024064 + .pool _0814C4FC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C514 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C518 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680841,14 +658244,13 @@ _0814C4FC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C514: .4byte 0x020244ec -_0814C518: .4byte 0x02024064 + .pool _0814C51C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C534 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C538 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680856,14 +658258,13 @@ _0814C51C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C534: .4byte 0x020244ec -_0814C538: .4byte 0x02024064 + .pool _0814C53C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C554 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C558 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680871,14 +658272,13 @@ _0814C53C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C554: .4byte 0x020244ec -_0814C558: .4byte 0x02024064 + .pool _0814C55C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C574 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C578 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680886,14 +658286,13 @@ _0814C55C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C574: .4byte 0x020244ec -_0814C578: .4byte 0x02024064 + .pool _0814C57C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C594 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C598 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680901,14 +658300,13 @@ _0814C57C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C594: .4byte 0x020244ec -_0814C598: .4byte 0x02024064 + .pool _0814C59C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C5B4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C5B8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680916,14 +658314,13 @@ _0814C59C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C5B4: .4byte 0x020244ec -_0814C5B8: .4byte 0x02024064 + .pool _0814C5BC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C5D4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C5D8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680931,14 +658328,13 @@ _0814C5BC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C5D4: .4byte 0x020244ec -_0814C5D8: .4byte 0x02024064 + .pool _0814C5DC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C5F4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C5F8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680946,14 +658342,13 @@ _0814C5DC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C5F4: .4byte 0x020244ec -_0814C5F8: .4byte 0x02024064 + .pool _0814C5FC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C614 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C618 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680961,14 +658356,13 @@ _0814C5FC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C614: .4byte 0x020244ec -_0814C618: .4byte 0x02024064 + .pool _0814C61C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C634 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C638 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680976,14 +658370,13 @@ _0814C61C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C634: .4byte 0x020244ec -_0814C638: .4byte 0x02024064 + .pool _0814C63C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C654 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C658 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -680991,14 +658384,13 @@ _0814C63C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C654: .4byte 0x020244ec -_0814C658: .4byte 0x02024064 + .pool _0814C65C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C674 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C678 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681006,15 +658398,14 @@ _0814C65C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C674: .4byte 0x020244ec -_0814C678: .4byte 0x02024064 + .pool _0814C67C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0814C6E4 + ldr r0, =0x020244ec adds r4, r0 - ldr r5, _0814C6E8 + ldr r5, =0x02024064 ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -681056,14 +658447,13 @@ _0814C67C: adds r0, r4, 0 b _0814C79C .align 2, 0 -_0814C6E4: .4byte 0x020244ec -_0814C6E8: .4byte 0x02024064 + .pool _0814C6EC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C704 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C708 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681071,14 +658461,13 @@ _0814C6EC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C704: .4byte 0x020244ec -_0814C708: .4byte 0x02024064 + .pool _0814C70C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C724 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C728 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681086,14 +658475,13 @@ _0814C70C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C724: .4byte 0x020244ec -_0814C728: .4byte 0x02024064 + .pool _0814C72C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C744 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C748 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681101,14 +658489,13 @@ _0814C72C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C744: .4byte 0x020244ec -_0814C748: .4byte 0x02024064 + .pool _0814C74C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C764 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C768 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681116,14 +658503,13 @@ _0814C74C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C764: .4byte 0x020244ec -_0814C768: .4byte 0x02024064 + .pool _0814C76C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C784 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C788 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681131,14 +658517,13 @@ _0814C76C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C784: .4byte 0x020244ec -_0814C788: .4byte 0x02024064 + .pool _0814C78C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C7A4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C7A8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681147,14 +658532,13 @@ _0814C79C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C7A4: .4byte 0x020244ec -_0814C7A8: .4byte 0x02024064 + .pool _0814C7AC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C7C4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C7C8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681162,14 +658546,13 @@ _0814C7AC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C7C4: .4byte 0x020244ec -_0814C7C8: .4byte 0x02024064 + .pool _0814C7CC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C7E4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C7E8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681177,14 +658560,13 @@ _0814C7CC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C7E4: .4byte 0x020244ec -_0814C7E8: .4byte 0x02024064 + .pool _0814C7EC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C804 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C808 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681192,14 +658574,13 @@ _0814C7EC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C804: .4byte 0x020244ec -_0814C808: .4byte 0x02024064 + .pool _0814C80C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C824 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C828 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681207,14 +658588,13 @@ _0814C80C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C824: .4byte 0x020244ec -_0814C828: .4byte 0x02024064 + .pool _0814C82C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C844 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C848 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681222,14 +658602,13 @@ _0814C82C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C844: .4byte 0x020244ec -_0814C848: .4byte 0x02024064 + .pool _0814C84C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C864 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C868 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681237,14 +658616,13 @@ _0814C84C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C864: .4byte 0x020244ec -_0814C868: .4byte 0x02024064 + .pool _0814C86C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C884 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C888 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681252,14 +658630,13 @@ _0814C86C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C884: .4byte 0x020244ec -_0814C888: .4byte 0x02024064 + .pool _0814C88C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C8A4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C8A8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681267,14 +658644,13 @@ _0814C88C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C8A4: .4byte 0x020244ec -_0814C8A8: .4byte 0x02024064 + .pool _0814C8AC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C8C4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C8C8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681282,14 +658658,13 @@ _0814C8AC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C8C4: .4byte 0x020244ec -_0814C8C8: .4byte 0x02024064 + .pool _0814C8CC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C8E4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C8E8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681297,14 +658672,13 @@ _0814C8CC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C8E4: .4byte 0x020244ec -_0814C8E8: .4byte 0x02024064 + .pool _0814C8EC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C904 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C908 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681312,14 +658686,13 @@ _0814C8EC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C904: .4byte 0x020244ec -_0814C908: .4byte 0x02024064 + .pool _0814C90C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C924 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C928 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681327,14 +658700,13 @@ _0814C90C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C924: .4byte 0x020244ec -_0814C928: .4byte 0x02024064 + .pool _0814C92C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C944 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C948 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681342,14 +658714,13 @@ _0814C92C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C944: .4byte 0x020244ec -_0814C948: .4byte 0x02024064 + .pool _0814C94C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C964 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C968 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681357,14 +658728,13 @@ _0814C94C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C964: .4byte 0x020244ec -_0814C968: .4byte 0x02024064 + .pool _0814C96C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C984 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C988 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681372,14 +658742,13 @@ _0814C96C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C984: .4byte 0x020244ec -_0814C988: .4byte 0x02024064 + .pool _0814C98C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C9A4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C9A8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681387,14 +658756,13 @@ _0814C98C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C9A4: .4byte 0x020244ec -_0814C9A8: .4byte 0x02024064 + .pool _0814C9AC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C9C4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C9C8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681402,14 +658770,13 @@ _0814C9AC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C9C4: .4byte 0x020244ec -_0814C9C8: .4byte 0x02024064 + .pool _0814C9CC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814C9E4 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814C9E8 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681417,14 +658784,13 @@ _0814C9CC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814C9E4: .4byte 0x020244ec -_0814C9E8: .4byte 0x02024064 + .pool _0814C9EC: movs r0, 0x64 muls r0, r5 - ldr r1, _0814CA04 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814CA08 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681432,14 +658798,13 @@ _0814C9EC: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814CA04: .4byte 0x020244ec -_0814CA08: .4byte 0x02024064 + .pool _0814CA0C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814CA24 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814CA28 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681447,14 +658812,13 @@ _0814CA0C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814CA24: .4byte 0x020244ec -_0814CA28: .4byte 0x02024064 + .pool _0814CA2C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814CA44 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814CA48 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -681462,29 +658826,28 @@ _0814CA2C: bl pokemon_setattr b _0814CA62 .align 2, 0 -_0814CA44: .4byte 0x020244ec -_0814CA48: .4byte 0x02024064 + .pool _0814CA4C: movs r0, 0x64 muls r0, r5 - ldr r1, _0814CA8C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0814CA90 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 bl pokemon_setattr _0814CA62: - ldr r2, _0814CA94 - ldr r0, _0814CA90 + ldr r2, =0x0202406e + ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0814CA8C + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 add sp, 0x34 @@ -681496,16 +658859,14 @@ _0814CA62: pop {r0} bx r0 .align 2, 0 -_0814CA8C: .4byte 0x020244ec -_0814CA90: .4byte 0x02024064 -_0814CA94: .4byte 0x0202406e + .pool thumb_func_end sub_814C09C thumb_func_start sub_814CA98 sub_814CA98: @ 814CA98 push {r4-r7,lr} - ldr r1, _0814CAFC - ldr r7, _0814CB00 + ldr r1, =0x0202406e + ldr r7, =0x02024064 ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -681513,12 +658874,12 @@ sub_814CA98: @ 814CA98 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, _0814CB04 + ldr r4, =0x02023064 lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 ldrb r0, [r0] - ldr r1, _0814CB08 + ldr r1, =0x020244ec adds r0, r1 adds r5, r3, r0 movs r3, 0 @@ -681554,10 +658915,7 @@ _0814CAF0: pop {r0} bx r0 .align 2, 0 -_0814CAFC: .4byte 0x0202406e -_0814CB00: .4byte 0x02024064 -_0814CB04: .4byte 0x02023064 -_0814CB08: .4byte 0x020244ec + .pool thumb_func_end sub_814CA98 thumb_func_start sub_814CB0C @@ -681565,16 +658923,16 @@ sub_814CB0C: @ 814CB0C push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _0814CC00 + ldr r0, =0x0202406e mov r8, r0 - ldr r6, _0814CC04 + ldr r6, =0x02024064 ldrb r1, [r6] lsls r0, r1, 1 add r0, r8 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _0814CC08 + ldr r4, =0x020244ec adds r0, r4 bl sub_805DD7C ldrb r0, [r6] @@ -681595,7 +658953,7 @@ sub_814CB0C: @ 814CB0C lsrs r1, 24 adds r0, r4, 0 bl sub_806A068 - ldr r0, _0814CC0C + ldr r0, =0x0202499c mov r8, r0 ldrb r0, [r6] movs r1, 0x2 @@ -681617,11 +658975,11 @@ sub_814CB0C: @ 814CB0C adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _0814CC10 + ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, _0814CC14 + ldr r5, =0x02020630 ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -681629,7 +658987,7 @@ sub_814CB0C: @ 814CB0C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0814CC18 + ldr r1, =0x0000ff10 strh r1, [r0, 0x24] ldrb r2, [r6] adds r0, r2, r4 @@ -681659,15 +659017,15 @@ sub_814CB0C: @ 814CB0C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0814CC1C + ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] bl obj_anim_image_start - ldr r1, _0814CC20 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _0814CC24 + ldr r1, =sub_814B290 + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -681675,30 +659033,21 @@ sub_814CB0C: @ 814CB0C pop {r0} bx r0 .align 2, 0 -_0814CC00: .4byte 0x0202406e -_0814CC04: .4byte 0x02024064 -_0814CC08: .4byte 0x020244ec -_0814CC0C: .4byte 0x0202499c -_0814CC10: .4byte 0x020241e4 -_0814CC14: .4byte 0x02020630 -_0814CC18: .4byte 0x0000ff10 -_0814CC1C: .4byte 0x020244e4 -_0814CC20: .4byte 0x03005d60 -_0814CC24: .4byte sub_814B290 + 1 + .pool thumb_func_end sub_814CB0C thumb_func_start sub_814CC28 sub_814CC28: @ 814CC28 push {r4-r6,lr} - ldr r5, _0814CC80 + ldr r5, =0x02024064 ldrb r0, [r5] - ldr r4, _0814CC84 + ldr r4, =0x02023064 lsls r1, r0, 9 adds r6, r4, 0x2 adds r1, r6 ldrb r1, [r1] bl sub_805EF84 - ldr r2, _0814CC88 + ldr r2, =0x0202406e ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -681713,7 +659062,7 @@ sub_814CC28: @ 814CC28 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0814CC8C + ldr r2, =0x020244ec adds r0, r2 bl sub_805DD7C ldrb r0, [r5] @@ -681721,22 +659070,17 @@ sub_814CC28: @ 814CC28 adds r1, r6 ldrb r1, [r1] bl sub_814CC98 - ldr r1, _0814CC90 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0814CC94 + ldr r1, =sub_814B69C + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0814CC80: .4byte 0x02024064 -_0814CC84: .4byte 0x02023064 -_0814CC88: .4byte 0x0202406e -_0814CC8C: .4byte 0x020244ec -_0814CC90: .4byte 0x03005d60 -_0814CC94: .4byte sub_814B69C + 1 + .pool thumb_func_end sub_814CC28 thumb_func_start sub_814CC98 @@ -681753,10 +659097,10 @@ sub_814CC98: @ 814CC98 lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, _0814CDEC + ldr r0, =0x0202406e lsls r2, r6, 1 adds r2, r0 - ldr r0, _0814CDF0 + ldr r0, =0x02023064 lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -681765,7 +659109,7 @@ sub_814CC98: @ 814CC98 ldrh r1, [r2] movs r0, 0x64 muls r0, r1 - ldr r1, _0814CDF4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -681773,9 +659117,9 @@ sub_814CC98: @ 814CC98 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _0814CDF8 + ldr r0, =sub_805D714 + 1 bl object_new_hidden_with_callback - ldr r1, _0814CDFC + ldr r1, =0x03005d7c mov r9, r1 add r9, r6 mov r1, r9 @@ -681787,7 +659131,7 @@ sub_814CC98: @ 814CC98 lsrs r1, 24 mov r0, r8 bl sub_806A068 - ldr r0, _0814CE00 + ldr r0, =0x0202499c mov r10, r0 adds r0, r6, 0 movs r1, 0x2 @@ -681809,10 +659153,10 @@ sub_814CC98: @ 814CC98 adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _0814CE04 + ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] - ldr r5, _0814CE08 + ldr r5, =0x02020630 mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -681857,7 +659201,7 @@ sub_814CC98: @ 814CC98 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0814CE0C + ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] bl obj_anim_image_start @@ -681878,7 +659222,7 @@ sub_814CC98: @ 814CC98 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0814CE10 + ldr r1, =nullsub_12 + 1 str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -681900,23 +659244,14 @@ sub_814CC98: @ 814CC98 pop {r0} bx r0 .align 2, 0 -_0814CDEC: .4byte 0x0202406e -_0814CDF0: .4byte 0x02023064 -_0814CDF4: .4byte 0x020244ec -_0814CDF8: .4byte sub_805D714 + 1 -_0814CDFC: .4byte 0x03005d7c -_0814CE00: .4byte 0x0202499c -_0814CE04: .4byte 0x020241e4 -_0814CE08: .4byte 0x02020630 -_0814CE0C: .4byte 0x020244e4 -_0814CE10: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_814CC98 thumb_func_start sub_814CE14 sub_814CE14: @ 814CE14 push {r4-r6,lr} - ldr r1, _0814CE48 - ldr r6, _0814CE4C + ldr r1, =0x02023064 + ldr r6, =0x02024064 ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -681924,7 +659259,7 @@ sub_814CE14: @ 814CE14 ldrb r3, [r0] cmp r3, 0 bne _0814CE5C - ldr r0, _0814CE50 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -681932,27 +659267,23 @@ sub_814CE14: @ 814CE14 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, _0814CE54 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _0814CE58 + ldr r1, =sub_814CEA4 + 1 str r1, [r0] b _0814CE92 .align 2, 0 -_0814CE48: .4byte 0x02023064 -_0814CE4C: .4byte 0x02024064 -_0814CE50: .4byte 0x020244d0 -_0814CE54: .4byte 0x03005d60 -_0814CE58: .4byte sub_814CEA4 + 1 + .pool _0814CE5C: - ldr r5, _0814CE98 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0814CE9C + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -681963,7 +659294,7 @@ _0814CE5C: lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r1, _0814CEA0 + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -681974,17 +659305,15 @@ _0814CE92: pop {r0} bx r0 .align 2, 0 -_0814CE98: .4byte 0x020241e4 -_0814CE9C: .4byte 0x02020630 -_0814CEA0: .4byte 0x03005d70 + .pool thumb_func_end sub_814CE14 thumb_func_start sub_814CEA4 sub_814CEA4: @ 814CEA4 push {r4-r6,lr} - ldr r6, _0814CEC4 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _0814CEC8 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -681998,8 +659327,7 @@ sub_814CEA4: @ 814CEA4 beq _0814CEFA b _0814CF22 .align 2, 0 -_0814CEC4: .4byte 0x020244d0 -_0814CEC8: .4byte 0x02024064 + .pool _0814CECC: ldr r1, [r4] lsls r0, r2, 2 @@ -682038,19 +659366,18 @@ _0814CEFA: adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r1, _0814CF28 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0814CF2C + ldr r1, =sub_814B3DC + 1 str r1, [r0] _0814CF22: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0814CF28: .4byte 0x03005d60 -_0814CF2C: .4byte sub_814B3DC + 1 + .pool thumb_func_end sub_814CEA4 thumb_func_start sub_814CF30 @@ -682058,13 +659385,13 @@ sub_814CF30: @ 814CF30 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _0814CF58 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _0814CF60 - ldr r0, _0814CF5C + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status movs r1, 0x2 @@ -682075,15 +659402,14 @@ sub_814CF30: @ 814CF30 movs r7, 0x5A b _0814CF62 .align 2, 0 -_0814CF58: .4byte 0x02022fec -_0814CF5C: .4byte 0x02024064 + .pool _0814CF60: movs r7, 0x50 _0814CF62: - ldr r5, _0814CFA8 + ldr r5, =0x02024064 ldrb r0, [r5] bl sub_806D864 - ldr r6, _0814CFAC + ldr r6, =0x020229e8 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -682114,8 +659440,7 @@ _0814CF94: adds r4, r0, 0x2 b _0814D002 .align 2, 0 -_0814CFA8: .4byte 0x02024064 -_0814CFAC: .4byte 0x020229e8 + .pool _0814CFB0: ldrb r0, [r5] bl sub_806D864 @@ -682157,7 +659482,7 @@ _0814CFF2: adds r1, r6 ldrb r4, [r1, 0x13] _0814D002: - ldr r5, _0814D0C0 + ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 bl sub_805DF84 @@ -682168,9 +659493,9 @@ _0814D002: lsrs r1, 24 adds r0, r4, 0 bl template_build_for_pokemon_or_trainer - ldr r6, _0814D0C4 + ldr r6, =0x0202499c mov r8, r7 - ldr r0, _0814D0C8 + ldr r0, =0x08305d2c lsls r4, 2 adds r4, r0 ldrb r0, [r4] @@ -682190,11 +659515,11 @@ _0814D002: mov r1, r8 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r6, _0814D0CC + ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _0814D0D0 + ldr r4, =0x02020630 ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -682224,7 +659549,7 @@ _0814D002: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0814D0D4 + ldr r1, =0x0000fffe strh r1, [r0, 0x2E] ldrb r0, [r5] adds r0, r6 @@ -682234,13 +659559,13 @@ _0814D002: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _0814D0D8 + ldr r1, =sub_805D7AC + 1 str r1, [r0] - ldr r1, _0814D0DC + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0814D0E0 + ldr r1, =sub_814AF1C + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -682248,15 +659573,7 @@ _0814D002: pop {r0} bx r0 .align 2, 0 -_0814D0C0: .4byte 0x02024064 -_0814D0C4: .4byte 0x0202499c -_0814D0C8: .4byte 0x08305d2c -_0814D0CC: .4byte 0x020241e4 -_0814D0D0: .4byte 0x02020630 -_0814D0D4: .4byte 0x0000fffe -_0814D0D8: .4byte sub_805D7AC + 1 -_0814D0DC: .4byte 0x03005d60 -_0814D0E0: .4byte sub_814AF1C + 1 + .pool thumb_func_end sub_814CF30 thumb_func_start sub_814D0E4 @@ -682270,15 +659587,15 @@ sub_814D0E4: @ 814D0E4 thumb_func_start sub_814D0F0 sub_814D0F0: @ 814D0F0 push {r4-r6,lr} - ldr r6, _0814D17C - ldr r4, _0814D180 + ldr r6, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0814D184 + ldr r5, =0x02020630 adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -682297,7 +659614,7 @@ sub_814D0F0: @ 814D0F0 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0814D188 + ldr r1, =0x0000ffd8 strh r1, [r0, 0x32] ldrb r0, [r4] adds r0, r6 @@ -682317,7 +659634,7 @@ sub_814D0F0: @ 814D0F0 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0814D18C + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -682326,34 +659643,27 @@ sub_814D0F0: @ 814D0F0 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0814D190 + ldr r1, =nullsub_12 + 1 bl oamt_set_x3A_32 - ldr r1, _0814D194 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0814D198 + ldr r1, =sub_814AF54 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0814D17C: .4byte 0x020241e4 -_0814D180: .4byte 0x02024064 -_0814D184: .4byte 0x02020630 -_0814D188: .4byte 0x0000ffd8 -_0814D18C: .4byte sub_80A6EEC + 1 -_0814D190: .4byte nullsub_12 + 1 -_0814D194: .4byte 0x03005d60 -_0814D198: .4byte sub_814AF54 + 1 + .pool thumb_func_end sub_814D0F0 thumb_func_start sub_814D19C sub_814D19C: @ 814D19C push {r4-r6,lr} - ldr r6, _0814D1E8 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _0814D1EC + ldr r5, =0x02024064 ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -682388,8 +659698,7 @@ _0814D1D0: strb r1, [r0, 0x4] b _0814D266 .align 2, 0 -_0814D1E8: .4byte 0x020244d0 -_0814D1EC: .4byte 0x02024064 + .pool _0814D1F0: ldrb r1, [r3] movs r0, 0x40 @@ -682399,22 +659708,22 @@ _0814D1F0: cmp r4, 0 bne _0814D266 strb r4, [r3, 0x4] - ldr r2, _0814D26C + ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0814D270 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 movs r1, 0x40 negs r1, r1 movs r0, 0x10 bl audio_play_and_stuff - ldr r2, _0814D274 - ldr r3, _0814D278 + ldr r2, =0x02020630 + ldr r3, =0x020241e4 ldrb r0, [r5] adds r0, r3 ldrb r1, [r0] @@ -682440,26 +659749,20 @@ _0814D1F0: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _0814D27C + ldr r1, =sub_8039C00 + 1 str r1, [r0] - ldr r1, _0814D280 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0814D284 + ldr r1, =sub_814B340 + 1 str r1, [r0] _0814D266: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0814D26C: .4byte 0x0202406e -_0814D270: .4byte 0x020244ec -_0814D274: .4byte 0x02020630 -_0814D278: .4byte 0x020241e4 -_0814D27C: .4byte sub_8039C00 + 1 -_0814D280: .4byte 0x03005d60 -_0814D284: .4byte sub_814B340 + 1 + .pool thumb_func_end sub_814D19C thumb_func_start sub_814D288 @@ -682499,7 +659802,7 @@ sub_814D2B8: @ 814D2B8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r5, _0814D3A8 + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 @@ -682507,7 +659810,7 @@ sub_814D2B8: @ 814D2B8 beq _0814D2CE b _0814D3F4 _0814D2CE: - ldr r0, _0814D3AC + ldr r0, =0x02023064 mov r12, r0 ldrb r1, [r5] lsls r1, 9 @@ -682520,7 +659823,7 @@ _0814D2CE: ldrb r0, [r0] lsls r0, 8 orrs r6, r0 - ldr r0, _0814D3B0 + ldr r0, =0x02038432 mov r8, r0 mov r0, r12 adds r0, 0x3 @@ -682528,7 +659831,7 @@ _0814D2CE: ldrb r0, [r1] mov r1, r8 strb r0, [r1] - ldr r3, _0814D3B4 + ldr r3, =0x02038408 ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -682542,7 +659845,7 @@ _0814D2CE: lsls r0, 8 orrs r2, r0 strh r2, [r3] - ldr r3, _0814D3B8 + ldr r3, =0x02038404 ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -682568,7 +659871,7 @@ _0814D2CE: lsls r0, 24 orrs r2, r0 str r2, [r3] - ldr r2, _0814D3BC + ldr r2, =0x0203841a ldrb r0, [r5] lsls r0, 9 mov r1, r12 @@ -682576,7 +659879,7 @@ _0814D2CE: adds r0, r1 ldrb r0, [r0] strb r0, [r2] - ldr r4, _0814D3C0 + ldr r4, =0x0203841c ldrb r1, [r5] lsls r1, 9 mov r0, r12 @@ -682590,14 +659893,14 @@ _0814D2CE: lsls r0, 8 orrs r2, r0 strh r2, [r4] - ldr r7, _0814D3C4 + ldr r7, =0x02038400 ldrb r1, [r5] lsls r1, 9 mov r0, r12 adds r0, 0x10 adds r1, r0 str r1, [r7] - ldr r2, _0814D3C8 + ldr r2, =0x020244bc ldrb r0, [r5] lsls r0, 2 adds r0, r2 @@ -682614,17 +659917,9 @@ _0814D2CE: bl dp01_tbl4_exec_completed b _0814D3F4 .align 2, 0 -_0814D3A8: .4byte 0x02024064 -_0814D3AC: .4byte 0x02023064 -_0814D3B0: .4byte 0x02038432 -_0814D3B4: .4byte 0x02038408 -_0814D3B8: .4byte 0x02038404 -_0814D3BC: .4byte 0x0203841a -_0814D3C0: .4byte 0x0203841c -_0814D3C4: .4byte 0x02038400 -_0814D3C8: .4byte 0x020244bc + .pool _0814D3CC: - ldr r0, _0814D400 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -682633,11 +659928,11 @@ _0814D3CC: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, _0814D404 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0814D408 + ldr r1, =bx_move_anim_4 + 1 str r1, [r0] ldrh r1, [r4] ldr r2, [r7] @@ -682650,9 +659945,7 @@ _0814D3F4: pop {r0} bx r0 .align 2, 0 -_0814D400: .4byte 0x020244d0 -_0814D404: .4byte 0x03005d60 -_0814D408: .4byte bx_move_anim_4 + 1 + .pool thumb_func_end sub_814D2B8 thumb_func_start bx_move_anim_4 @@ -682662,8 +659955,8 @@ bx_move_anim_4: @ 814D40C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _0814D458 - ldr r6, _0814D45C + ldr r2, =0x02023064 + ldr r6, =0x02024064 ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -682680,7 +659973,7 @@ bx_move_anim_4: @ 814D40C adds r1, r2 ldrb r1, [r1] mov r8, r1 - ldr r7, _0814D460 + ldr r7, =0x020244d0 ldr r5, [r7] ldr r1, [r5, 0x4] lsls r0, r3, 1 @@ -682696,9 +659989,7 @@ bx_move_anim_4: @ 814D40C beq _0814D46E b _0814D580 .align 2, 0 -_0814D458: .4byte 0x02023064 -_0814D45C: .4byte 0x02024064 -_0814D460: .4byte 0x020244d0 + .pool _0814D464: cmp r2, 0x2 beq _0814D4CE @@ -682754,10 +660045,10 @@ _0814D4A4: strb r1, [r0, 0x4] b _0814D580 _0814D4CE: - ldr r0, _0814D534 + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _0814D538 + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _0814D580 @@ -682791,9 +660082,9 @@ _0814D4CE: ands r0, r2 strb r0, [r1] _0814D51C: - ldr r0, _0814D53C + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0814D540 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -682804,10 +660095,7 @@ _0814D51C: strb r1, [r0, 0x4] b _0814D580 .align 2, 0 -_0814D534: .4byte 0x020383f8 -_0814D538: .4byte 0x020383fd -_0814D53C: .4byte 0x020244d0 -_0814D540: .4byte 0x02024064 + .pool _0814D544: ldrb r1, [r0] movs r0, 0x40 @@ -682849,26 +660137,26 @@ _0814D580: thumb_func_start sub_814D590 sub_814D590: @ 814D590 push {r4,r5,lr} - ldr r0, _0814D5CC + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _0814D5D0 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r5, _0814D5D4 + ldr r5, =0x02024064 ldrb r4, [r5] lsls r4, 9 - ldr r0, _0814D5D8 + ldr r0, =0x02023066 adds r4, r0 ldrh r0, [r4] bl battle_pick_message - ldr r0, _0814D5DC + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _0814D5E0 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0814D5E4 + ldr r1, =bx_t4_button_a + 1 str r1, [r0] ldrh r0, [r4] bl sub_817C95C @@ -682876,13 +660164,7 @@ sub_814D590: @ 814D590 pop {r0} bx r0 .align 2, 0 -_0814D5CC: .4byte 0x02022e14 -_0814D5D0: .4byte 0x02022e16 -_0814D5D4: .4byte 0x02024064 -_0814D5D8: .4byte 0x02023066 -_0814D5DC: .4byte 0x02022e2c -_0814D5E0: .4byte 0x03005d60 -_0814D5E4: .4byte bx_t4_button_a + 1 + .pool thumb_func_end sub_814D590 thumb_func_start sub_814D5E8 @@ -682950,8 +660232,8 @@ sub_814D63C: @ 814D63C sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _0814D6B4 - ldr r0, _0814D6B8 + ldr r3, =0x02023064 + ldr r0, =0x02024064 mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -682965,16 +660247,16 @@ sub_814D63C: @ 814D63C orrs r1, r0 lsls r1, 16 asrs r7, r1, 16 - ldr r0, _0814D6BC + ldr r0, =0x00007fff cmp r7, r0 beq _0814D6CC - ldr r6, _0814D6C0 + ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _0814D6C4 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x3A bl pokemon_getattr @@ -682991,7 +660273,7 @@ sub_814D63C: @ 814D63C adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _0814D6C8 + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -682999,39 +660281,34 @@ sub_814D63C: @ 814D63C bl sub_807294C b _0814D6F6 .align 2, 0 -_0814D6B4: .4byte 0x02023064 -_0814D6B8: .4byte 0x02024064 -_0814D6BC: .4byte 0x00007fff -_0814D6C0: .4byte 0x0202406e -_0814D6C4: .4byte 0x020244ec -_0814D6C8: .4byte 0x03005d70 + .pool _0814D6CC: - ldr r1, _0814D714 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814D718 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A bl pokemon_getattr adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _0814D71C + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] movs r3, 0 bl sub_807294C _0814D6F6: - ldr r1, _0814D720 - ldr r0, _0814D724 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0814D728 + ldr r1, =bx_t4_healthbar_update + 1 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -683041,12 +660318,7 @@ _0814D6F6: pop {r0} bx r0 .align 2, 0 -_0814D714: .4byte 0x0202406e -_0814D718: .4byte 0x020244ec -_0814D71C: .4byte 0x03005d70 -_0814D720: .4byte 0x03005d60 -_0814D724: .4byte 0x02024064 -_0814D728: .4byte bx_t4_healthbar_update + 1 + .pool thumb_func_end sub_814D63C thumb_func_start sub_814D72C @@ -683060,28 +660332,28 @@ sub_814D72C: @ 814D72C thumb_func_start sub_814D738 sub_814D738: @ 814D738 push {r4,lr} - ldr r4, _0814D794 + ldr r4, =0x02024064 ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0814D78C - ldr r0, _0814D798 + ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _0814D79C + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0814D7A0 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0x9 bl healthbar_draw_field_maybe ldrb r2, [r4] - ldr r0, _0814D7A4 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -683093,36 +660365,30 @@ sub_814D738: @ 814D738 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _0814D7A8 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0814D7AC + ldr r1, =sub_814B7B8 + 1 str r1, [r0] _0814D78C: pop {r4} pop {r0} bx r0 .align 2, 0 -_0814D794: .4byte 0x02024064 -_0814D798: .4byte 0x03005d70 -_0814D79C: .4byte 0x0202406e -_0814D7A0: .4byte 0x020244ec -_0814D7A4: .4byte 0x020244d0 -_0814D7A8: .4byte 0x03005d60 -_0814D7AC: .4byte sub_814B7B8 + 1 + .pool thumb_func_end sub_814D738 thumb_func_start sub_814D7B0 sub_814D7B0: @ 814D7B0 push {r4,r5,lr} - ldr r5, _0814D808 + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0814D800 - ldr r4, _0814D80C + ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -683147,21 +660413,18 @@ sub_814D7B0: @ 814D7B0 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, _0814D810 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0814D814 + ldr r1, =sub_814B7B8 + 1 str r1, [r0] _0814D800: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0814D808: .4byte 0x02024064 -_0814D80C: .4byte 0x02023064 -_0814D810: .4byte 0x03005d60 -_0814D814: .4byte sub_814B7B8 + 1 + .pool thumb_func_end sub_814D7B0 thumb_func_start sub_814D818 @@ -683239,7 +660502,7 @@ sub_814D878: @ 814D878 thumb_func_start sub_814D884 sub_814D884: @ 814D884 push {lr} - ldr r2, _0814D89C + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x80 negs r0, r0 @@ -683249,15 +660512,15 @@ sub_814D884: @ 814D884 pop {r0} bx r0 .align 2, 0 -_0814D89C: .4byte 0x02022d0c + .pool thumb_func_end sub_814D884 thumb_func_start sub_814D8A0 sub_814D8A0: @ 814D8A0 push {lr} - ldr r3, _0814D8CC - ldr r1, _0814D8D0 - ldr r0, _0814D8D4 + ldr r3, =0x02022d0c + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -683275,15 +660538,13 @@ sub_814D8A0: @ 814D8A0 pop {r0} bx r0 .align 2, 0 -_0814D8CC: .4byte 0x02022d0c -_0814D8D0: .4byte 0x02023064 -_0814D8D4: .4byte 0x02024064 + .pool thumb_func_end sub_814D8A0 thumb_func_start sub_814D8D8 sub_814D8D8: @ 814D8D8 push {lr} - ldr r2, _0814D8EC + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -683292,13 +660553,13 @@ sub_814D8D8: @ 814D8D8 pop {r0} bx r0 .align 2, 0 -_0814D8EC: .4byte 0x02022d0c + .pool thumb_func_end sub_814D8D8 thumb_func_start sub_814D8F0 sub_814D8F0: @ 814D8F0 push {lr} - ldr r3, _0814D914 + ldr r3, =0x02022d0c ldr r1, [r3] lsls r1, 24 lsrs r1, 31 @@ -683314,15 +660575,15 @@ sub_814D8F0: @ 814D8F0 pop {r0} bx r0 .align 2, 0 -_0814D914: .4byte 0x02022d0c + .pool thumb_func_end sub_814D8F0 thumb_func_start dp01t_29_4_blink dp01t_29_4_blink: @ 814D918 push {r4,lr} - ldr r3, _0814D940 - ldr r2, _0814D944 - ldr r4, _0814D948 + ldr r3, =0x02020630 + ldr r2, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -683338,11 +660599,9 @@ dp01t_29_4_blink: @ 814D918 bl dp01_tbl4_exec_completed b _0814D976 .align 2, 0 -_0814D940: .4byte 0x02020630 -_0814D944: .4byte 0x020241e4 -_0814D948: .4byte 0x02024064 + .pool _0814D94C: - ldr r1, _0814D97C + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -683356,20 +660615,18 @@ _0814D94C: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, _0814D980 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0814D984 + ldr r1, =dp01t_0F_4_move_anim + 1 str r1, [r0] _0814D976: pop {r4} pop {r0} bx r0 .align 2, 0 -_0814D97C: .4byte 0x020244b9 -_0814D980: .4byte 0x03005d60 -_0814D984: .4byte dp01t_0F_4_move_anim + 1 + .pool thumb_func_end dp01t_29_4_blink thumb_func_start sub_814D988 @@ -683383,7 +660640,7 @@ sub_814D988: @ 814D988 thumb_func_start sub_814D994 sub_814D994: @ 814D994 push {r4,lr} - ldr r4, _0814D9D0 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -683392,7 +660649,7 @@ sub_814D994: @ 814D994 bne _0814D9A8 movs r3, 0xC0 _0814D9A8: - ldr r2, _0814D9D4 + ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -683411,15 +660668,14 @@ _0814D9A8: pop {r0} bx r0 .align 2, 0 -_0814D9D0: .4byte 0x02024064 -_0814D9D4: .4byte 0x02023064 + .pool thumb_func_end sub_814D994 thumb_func_start sub_814D9D8 sub_814D9D8: @ 814D9D8 push {r4,r5,lr} - ldr r4, _0814DA0C - ldr r5, _0814DA10 + ldr r4, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -683441,8 +660697,7 @@ sub_814D9D8: @ 814D9D8 bl song_play_for_text b _0814DA28 .align 2, 0 -_0814DA0C: .4byte 0x02023064 -_0814DA10: .4byte 0x02024064 + .pool _0814DA14: adds r0, r4, 0x1 adds r0, r3, r0 @@ -683463,15 +660718,15 @@ _0814DA28: thumb_func_start sub_814DA34 sub_814DA34: @ 814DA34 push {lr} - ldr r1, _0814DA68 - ldr r0, _0814DA6C + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814DA70 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -683485,23 +660740,21 @@ sub_814DA34: @ 814DA34 pop {r0} bx r0 .align 2, 0 -_0814DA68: .4byte 0x0202406e -_0814DA6C: .4byte 0x02024064 -_0814DA70: .4byte 0x020244ec + .pool thumb_func_end sub_814DA34 thumb_func_start dp01t_2E_4_battle_intro dp01t_2E_4_battle_intro: @ 814DA74 push {lr} - ldr r1, _0814DA9C - ldr r0, _0814DAA0 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r0, [r0] bl battle_intro_launch - ldr r2, _0814DAA4 + ldr r2, =0x020243fc ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -683510,23 +660763,21 @@ dp01t_2E_4_battle_intro: @ 814DA74 pop {r0} bx r0 .align 2, 0 -_0814DA9C: .4byte 0x02023064 -_0814DAA0: .4byte 0x02024064 -_0814DAA4: .4byte 0x020243fc + .pool thumb_func_end dp01t_2E_4_battle_intro thumb_func_start sub_814DAA8 sub_814DAA8: @ 814DAA8 push {r4-r7,lr} - ldr r5, _0814DB94 - ldr r6, _0814DB98 + ldr r5, =0x020241e4 + ldr r6, =0x02024064 ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0814DB9C + ldr r4, =0x02020630 adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -683545,7 +660796,7 @@ sub_814DAA8: @ 814DAA8 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0814DBA0 + ldr r1, =0x0000ffd8 strh r1, [r0, 0x32] ldrb r0, [r6] adds r0, r5 @@ -683565,7 +660816,7 @@ sub_814DAA8: @ 814DAA8 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0814DBA4 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r2, [r6] adds r0, r2, r5 @@ -683582,7 +660833,7 @@ sub_814DAA8: @ 814DAA8 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0814DBA8 + ldr r1, =sub_805CC00 + 1 bl oamt_set_x3A_32 ldrb r0, [r6] adds r0, r5 @@ -683593,13 +660844,13 @@ sub_814DAA8: @ 814DAA8 adds r0, r4 movs r1, 0x1 bl obj_anim_image_start - ldr r0, _0814DBAC + ldr r0, =0x0000d6f9 bl gpu_pal_alloc_new lsls r0, 24 lsrs r7, r0, 24 ldrb r0, [r6] bl sub_806D864 - ldr r4, _0814DBB0 + ldr r4, =0x020229e8 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -683630,14 +660881,7 @@ _0814DB80: adds r0, 0x2 b _0814DC06 .align 2, 0 -_0814DB94: .4byte 0x020241e4 -_0814DB98: .4byte 0x02024064 -_0814DB9C: .4byte 0x02020630 -_0814DBA0: .4byte 0x0000ffd8 -_0814DBA4: .4byte sub_80A6EEC + 1 -_0814DBA8: .4byte sub_805CC00 + 1 -_0814DBAC: .4byte 0x0000d6f9 -_0814DBB0: .4byte 0x020229e8 + .pool _0814DBB4: ldrb r0, [r6] bl sub_806D864 @@ -683679,7 +660923,7 @@ _0814DBF6: adds r1, r4 ldrb r0, [r1, 0x13] _0814DC06: - ldr r1, _0814DCA0 + ldr r1, =0x08305d8c lsls r0, 3 adds r0, r1 ldr r0, [r0] @@ -683689,9 +660933,9 @@ _0814DC06: adds r1, r4, r2 movs r2, 0x20 bl decompress_palette - ldr r2, _0814DCA4 - ldr r1, _0814DCA8 - ldr r5, _0814DCAC + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r5, =0x02024064 ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -683704,19 +660948,19 @@ _0814DC06: ands r0, r2 orrs r0, r4 strb r0, [r1, 0x5] - ldr r0, _0814DCB0 + ldr r0, =sub_814DCCC + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r4, _0814DCB4 + ldr r4, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r4 ldrb r0, [r5] strh r0, [r1, 0x8] - ldr r3, _0814DCB8 + ldr r3, =0x020244d0 ldr r0, [r3] ldrb r2, [r5] ldr r1, [r0, 0x4] @@ -683729,14 +660973,14 @@ _0814DC06: ands r0, r1 cmp r0, 0 beq _0814DC80 - ldr r0, _0814DCBC + ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, _0814DCC0 + ldr r1, =sub_8073C30 + 1 str r1, [r0] _0814DC80: ldr r0, [r3] @@ -683745,27 +660989,17 @@ _0814DC80: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _0814DCC4 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0814DCC8 + ldr r1, =nullsub_112 + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0814DCA0: .4byte 0x08305d8c -_0814DCA4: .4byte 0x02020630 -_0814DCA8: .4byte 0x020241e4 -_0814DCAC: .4byte 0x02024064 -_0814DCB0: .4byte sub_814DCCC + 1 -_0814DCB4: .4byte 0x03005e00 -_0814DCB8: .4byte 0x020244d0 -_0814DCBC: .4byte 0x020244b4 -_0814DCC0: .4byte sub_8073C30 + 1 -_0814DCC4: .4byte 0x03005d60 -_0814DCC8: .4byte nullsub_112 + 1 + .pool thumb_func_end sub_814DAA8 thumb_func_start sub_814DCCC @@ -683777,7 +661011,7 @@ sub_814DCCC: @ 814DCCC lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _0814DCF4 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -683791,9 +661025,9 @@ sub_814DCCC: @ 814DCCC strh r0, [r1, 0xA] b _0814DDB4 .align 2, 0 -_0814DCF4: .4byte 0x03005e00 + .pool _0814DCF8: - ldr r7, _0814DD38 + ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 ldrh r0, [r1, 0x8] @@ -683802,19 +661036,19 @@ _0814DCF8: lsls r0, 24 cmp r0, 0 beq _0814DD18 - ldr r0, _0814DD3C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _0814DD48 _0814DD18: - ldr r0, _0814DD40 + ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _0814DD44 + ldr r0, =0x0202406e lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -683824,17 +661058,14 @@ _0814DD18: bl sub_814CC98 b _0814DD9C .align 2, 0 -_0814DD38: .4byte 0x02024064 -_0814DD3C: .4byte 0x02022fec -_0814DD40: .4byte 0x02023064 -_0814DD44: .4byte 0x0202406e + .pool _0814DD48: - ldr r4, _0814DDC0 + ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r5, _0814DDC4 + ldr r5, =0x0202406e lsls r0, 1 adds r0, r5 ldrh r0, [r0] @@ -683859,7 +661090,7 @@ _0814DD48: ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0814DDC8 + ldr r2, =0x020244ec adds r0, r2 bl sub_805DD7C ldrb r0, [r7] @@ -683869,12 +661100,12 @@ _0814DD48: eors r0, r6 strb r0, [r7] _0814DD9C: - ldr r1, _0814DDCC - ldr r2, _0814DDD0 + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _0814DDD4 + ldr r1, =sub_814B0E8 + 1 str r1, [r0] mov r3, r9 strb r3, [r2] @@ -683888,19 +661119,14 @@ _0814DDB4: pop {r0} bx r0 .align 2, 0 -_0814DDC0: .4byte 0x02023064 -_0814DDC4: .4byte 0x0202406e -_0814DDC8: .4byte 0x020244ec -_0814DDCC: .4byte 0x03005d60 -_0814DDD0: .4byte 0x02024064 -_0814DDD4: .4byte sub_814B0E8 + 1 + .pool thumb_func_end sub_814DCCC thumb_func_start sub_814DDD8 sub_814DDD8: @ 814DDD8 push {r4-r6,lr} - ldr r1, _0814DE00 - ldr r0, _0814DE04 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -683916,12 +661142,11 @@ sub_814DDD8: @ 814DDD8 bl dp01_tbl4_exec_completed b _0814DE7C .align 2, 0 -_0814DE00: .4byte 0x02023064 -_0814DE04: .4byte 0x02024064 + .pool _0814DE08: - ldr r6, _0814DE84 + ldr r6, =0x020244d0 ldr r0, [r6] - ldr r5, _0814DE88 + ldr r5, =0x02024064 ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -683934,7 +661159,7 @@ _0814DE08: strb r1, [r0] ldrb r0, [r5] lsls r3, r0, 9 - ldr r4, _0814DE8C + ldr r4, =0x02023068 adds r1, r3, r4 subs r2, r4, 0x3 adds r2, r3, r2 @@ -683943,7 +661168,7 @@ _0814DE08: adds r3, r4 ldrb r3, [r3] bl sub_80735DC - ldr r2, _0814DE90 + ldr r2, =0x020244b4 ldrb r1, [r5] adds r1, r2 movs r3, 0 @@ -683971,31 +661196,26 @@ _0814DE08: movs r1, 0x5D strb r1, [r0, 0x5] _0814DE70: - ldr r0, _0814DE94 + ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, _0814DE98 + ldr r0, =sub_814DE9C + 1 str r0, [r1] _0814DE7C: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0814DE84: .4byte 0x020244d0 -_0814DE88: .4byte 0x02024064 -_0814DE8C: .4byte 0x02023068 -_0814DE90: .4byte 0x020244b4 -_0814DE94: .4byte 0x03005d60 -_0814DE98: .4byte sub_814DE9C + 1 + .pool thumb_func_end sub_814DDD8 thumb_func_start sub_814DE9C sub_814DE9C: @ 814DE9C push {r4,lr} - ldr r4, _0814DEDC + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _0814DEE0 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -684024,16 +661244,15 @@ _0814DED4: pop {r0} bx r0 .align 2, 0 -_0814DEDC: .4byte 0x020244d0 -_0814DEE0: .4byte 0x02024064 + .pool thumb_func_end sub_814DE9C thumb_func_start sub_814DEE4 sub_814DEE4: @ 814DEE4 push {lr} - ldr r0, _0814DF20 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _0814DF24 + ldr r0, =0x02024064 ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -684045,26 +661264,22 @@ sub_814DEE4: @ 814DEE4 ands r0, r1 cmp r0, 0 beq _0814DF16 - ldr r2, _0814DF28 - ldr r0, _0814DF2C + ldr r2, =0x03005e00 + ldr r0, =0x020244b4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _0814DF30 + ldr r1, =sub_8073C30 + 1 str r1, [r0] _0814DF16: bl dp01_tbl4_exec_completed pop {r0} bx r0 .align 2, 0 -_0814DF20: .4byte 0x020244d0 -_0814DF24: .4byte 0x02024064 -_0814DF28: .4byte 0x03005e00 -_0814DF2C: .4byte 0x020244b4 -_0814DF30: .4byte sub_8073C30 + 1 + .pool thumb_func_end sub_814DEE4 thumb_func_start sub_814DF34 @@ -684078,14 +661293,14 @@ sub_814DF34: @ 814DF34 thumb_func_start sub_814DF40 sub_814DF40: @ 814DF40 push {r4,lr} - ldr r4, _0814DF90 + ldr r4, =0x02024064 ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _0814DF86 - ldr r3, _0814DF94 - ldr r0, _0814DF98 + ldr r3, =0x02020630 + ldr r0, =0x020241e4 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -684093,7 +661308,7 @@ sub_814DF40: @ 814DF40 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, _0814DF9C + ldr r0, =0x02023064 lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -684116,23 +661331,20 @@ _0814DF86: pop {r0} bx r0 .align 2, 0 -_0814DF90: .4byte 0x02024064 -_0814DF94: .4byte 0x02020630 -_0814DF98: .4byte 0x020241e4 -_0814DF9C: .4byte 0x02023064 + .pool thumb_func_end sub_814DF40 thumb_func_start sub_814DFA0 sub_814DFA0: @ 814DFA0 push {r4-r6,lr} sub sp, 0x4 - ldr r5, _0814DFE8 + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0814E002 - ldr r4, _0814DFEC + ldr r4, =0x02023064 ldrb r2, [r5] lsls r1, r2, 9 adds r0, r4, 0x1 @@ -684157,14 +661369,13 @@ sub_814DFA0: @ 814DFA0 bl dp01_tbl4_exec_completed b _0814DFFC .align 2, 0 -_0814DFE8: .4byte 0x02024064 -_0814DFEC: .4byte 0x02023064 + .pool _0814DFF0: - ldr r0, _0814E00C + ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, _0814E010 + ldr r0, =sub_814B7E8 + 1 str r0, [r1] _0814DFFC: adds r0, r6, 0 @@ -684175,25 +661386,23 @@ _0814E002: pop {r0} bx r0 .align 2, 0 -_0814E00C: .4byte 0x03005d60 -_0814E010: .4byte sub_814B7E8 + 1 + .pool thumb_func_end sub_814DFA0 thumb_func_start sub_814E014 sub_814E014: @ 814E014 push {lr} - ldr r0, _0814E02C + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 - ldr r1, _0814E030 + ldr r1, =0x02023066 adds r0, r1 bl sub_81851A8 bl dp01_tbl4_exec_completed pop {r0} bx r0 .align 2, 0 -_0814E02C: .4byte 0x02024064 -_0814E030: .4byte 0x02023066 + .pool thumb_func_end sub_814E014 thumb_func_start sub_814E034 @@ -684207,27 +661416,27 @@ sub_814E034: @ 814E034 thumb_func_start sub_814E040 sub_814E040: @ 814E040 push {r4,r5,lr} - ldr r5, _0814E0A4 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r0, 9 - ldr r4, _0814E0A8 + ldr r4, =0x02023068 adds r0, r4 bl sub_81851A8 - ldr r2, _0814E0AC + ldr r2, =0x0202433a ldrb r0, [r5] lsls r0, 9 subs r1, r4, 0x3 adds r0, r1 ldrb r0, [r0] strb r0, [r2] - ldr r0, _0814E0B0 + ldr r0, =0x03005d90 ldr r3, [r0] ldrb r0, [r5] lsls r0, 9 subs r4, 0x2 adds r0, r4 ldrb r0, [r0] - ldr r1, _0814E0B4 + ldr r1, =0x00000ca9 adds r3, r1 movs r1, 0x1 ands r1, r0 @@ -684243,23 +661452,17 @@ sub_814E040: @ 814E040 movs r0, 0x3 bl sub_80A2390 bl dp01_tbl4_exec_completed - ldr r1, _0814E0B8 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0814E0BC + ldr r1, =sub_80587B0 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0814E0A4: .4byte 0x02024064 -_0814E0A8: .4byte 0x02023068 -_0814E0AC: .4byte 0x0202433a -_0814E0B0: .4byte 0x03005d90 -_0814E0B4: .4byte 0x00000ca9 -_0814E0B8: .4byte 0x03005d60 -_0814E0BC: .4byte sub_80587B0 + 1 + .pool thumb_func_end sub_814E040 thumb_func_start nullsub_113 @@ -684277,24 +661480,24 @@ battle_pick_message: @ 814E0C4 lsls r0, 16 lsrs r6, r0, 16 movs r7, 0 - ldr r4, _0814E180 - ldr r0, _0814E184 + ldr r4, =0x0203aba8 + ldr r0, =0x02024064 mov r8, r0 ldrb r1, [r0] lsls r1, 9 - ldr r0, _0814E188 + ldr r0, =0x02023068 adds r1, r0 str r1, [r4] - ldr r2, _0814E18C + ldr r2, =0x02024208 ldrh r0, [r1, 0x4] strh r0, [r2] - ldr r2, _0814E190 + ldr r2, =0x0202420a ldrb r0, [r1, 0x6] strb r0, [r2] - ldr r5, _0814E194 + ldr r5, =0x02024474 ldrb r0, [r1, 0x7] strb r0, [r5, 0x17] - ldr r3, _0814E198 + ldr r3, =0x0202449c ldr r0, [r3] adds r0, 0x52 ldrb r1, [r1, 0x8] @@ -684304,7 +661507,7 @@ battle_pick_message: @ 814E0C4 ldr r1, [r4] ldrb r1, [r1, 0x9] strb r1, [r0] - ldr r1, _0814E19C + ldr r1, =0x0202420f ldr r2, [r4] ldrb r0, [r2, 0xA] strb r0, [r1] @@ -684315,9 +661518,9 @@ battle_pick_message: @ 814E0C4 movs r2, 0 mov r12, r8 mov r9, r5 - ldr r1, _0814E1A0 + ldr r1, =0x02022f58 mov r10, r1 - ldr r3, _0814E1A4 + ldr r3, =0x0203aba4 _0814E126: adds r0, r2, r3 ldr r1, [r4] @@ -684329,11 +661532,11 @@ _0814E126: cmp r2, 0x3 ble _0814E126 movs r2, 0 - ldr r0, _0814E1A0 + ldr r0, =0x02022f58 mov r8, r0 - ldr r3, _0814E180 - ldr r5, _0814E1A8 - ldr r4, _0814E1AC + ldr r3, =0x0203aba8 + ldr r5, =0x02022f68 + ldr r4, =0x02022f78 _0814E144: mov r0, r8 adds r1, r2, r0 @@ -684362,24 +661565,12 @@ _0814E144: b _0814E6B8 _0814E176: lsls r0, r6, 2 - ldr r1, _0814E1B0 + ldr r1, =_0814E1B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0814E180: .4byte 0x0203aba8 -_0814E184: .4byte 0x02024064 -_0814E188: .4byte 0x02023068 -_0814E18C: .4byte 0x02024208 -_0814E190: .4byte 0x0202420a -_0814E194: .4byte 0x02024474 -_0814E198: .4byte 0x0202449c -_0814E19C: .4byte 0x0202420f -_0814E1A0: .4byte 0x02022f58 -_0814E1A4: .4byte 0x0203aba4 -_0814E1A8: .4byte 0x02022f68 -_0814E1AC: .4byte 0x02022f78 -_0814E1B0: .4byte _0814E1B4 + .pool .align 2, 0 _0814E1B4: .4byte _0814E1CC @@ -684389,13 +661580,13 @@ _0814E1B4: .4byte _0814E4F8 .4byte _0814E55C _0814E1CC: - ldr r0, _0814E204 + ldr r0, =0x02022fec ldr r2, [r0] movs r0, 0x8 ands r0, r2 cmp r0, 0 beq _0814E26C - ldr r0, _0814E208 + ldr r0, =0x02000002 ands r0, r2 cmp r0, 0 beq _0814E248 @@ -684411,44 +661602,39 @@ _0814E1CC: movs r0, 0x80 lsls r0, 17 ands r2, r0 - ldr r7, _0814E20C + ldr r7, =0x085cbbcd cmp r2, 0 bne _0814E200 b _0814E6D8 _0814E200: - ldr r7, _0814E210 + ldr r7, =0x085cd318 b _0814E6D8 .align 2, 0 -_0814E204: .4byte 0x02022fec -_0814E208: .4byte 0x02000002 -_0814E20C: .4byte 0x085cbbcd -_0814E210: .4byte 0x085cd318 + .pool _0814E214: - ldr r0, _0814E224 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 cmp r1, r0 bne _0814E22C - ldr r7, _0814E228 + ldr r7, =0x085cbb9c b _0814E6D8 .align 2, 0 -_0814E224: .4byte 0x02038bca -_0814E228: .4byte 0x085cbb9c + .pool _0814E22C: movs r0, 0x80 lsls r0, 17 ands r2, r0 - ldr r7, _0814E240 + ldr r7, =0x085cbbb9 cmp r2, 0 bne _0814E23A b _0814E6D8 _0814E23A: - ldr r7, _0814E244 + ldr r7, =0x085cd301 b _0814E6D8 .align 2, 0 -_0814E240: .4byte 0x085cbbb9 -_0814E244: .4byte 0x085cd301 + .pool _0814E248: movs r0, 0x80 lsls r0, 15 @@ -684458,49 +661644,47 @@ _0814E248: movs r0, 0x80 lsls r0, 8 ands r2, r0 - ldr r7, _0814E264 + ldr r7, =0x085cbb9c cmp r2, 0 bne _0814E260 b _0814E6D8 _0814E260: - ldr r7, _0814E268 + ldr r7, =0x085cce17 b _0814E6D8 .align 2, 0 -_0814E264: .4byte 0x085cbb9c -_0814E268: .4byte 0x085cce17 + .pool _0814E26C: movs r0, 0x80 lsls r0, 6 ands r0, r2 cmp r0, 0 beq _0814E280 - ldr r7, _0814E27C + ldr r7, =0x085cbb5a b _0814E6D8 .align 2, 0 -_0814E27C: .4byte 0x085cbb5a + .pool _0814E280: movs r0, 0x1 ands r0, r2 cmp r0, 0 beq _0814E290 - ldr r7, _0814E28C + ldr r7, =0x085cbb82 b _0814E6D8 .align 2, 0 -_0814E28C: .4byte 0x085cbb82 + .pool _0814E290: movs r0, 0x80 lsls r0, 2 ands r2, r0 - ldr r7, _0814E2A4 + ldr r7, =0x085cbb47 cmp r2, 0 bne _0814E29E b _0814E6D8 _0814E29E: - ldr r7, _0814E2A8 + ldr r7, =0x085cbb6d b _0814E6D8 .align 2, 0 -_0814E2A4: .4byte 0x085cbb47 -_0814E2A8: .4byte 0x085cbb6d + .pool _0814E2AC: mov r1, r12 ldrb r0, [r1] @@ -684508,7 +661692,7 @@ _0814E2AC: lsls r0, 24 cmp r0, 0 bne _0814E310 - ldr r0, _0814E2D4 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 ands r0, r1 @@ -684519,41 +661703,39 @@ _0814E2AC: ands r0, r1 cmp r0, 0 beq _0814E2DC - ldr r7, _0814E2D8 + ldr r7, =0x085cce38 b _0814E6D8 .align 2, 0 -_0814E2D4: .4byte 0x02022fec -_0814E2D8: .4byte 0x085cce38 + .pool _0814E2DC: movs r0, 0x80 lsls r0, 8 ands r0, r1 cmp r0, 0 beq _0814E2F0 - ldr r7, _0814E2EC + ldr r7, =0x085cbc96 b _0814E6D8 .align 2, 0 -_0814E2EC: .4byte 0x085cbc96 + .pool _0814E2F0: movs r0, 0x40 ands r1, r0 - ldr r7, _0814E300 + ldr r7, =0x085cbc96 cmp r1, 0 bne _0814E2FC b _0814E6D8 _0814E2FC: - ldr r7, _0814E304 + ldr r7, =0x085cbce5 b _0814E6D8 .align 2, 0 -_0814E300: .4byte 0x085cbc96 -_0814E304: .4byte 0x085cbce5 + .pool _0814E308: - ldr r7, _0814E30C + ldr r7, =0x085cbc8e b _0814E6D8 .align 2, 0 -_0814E30C: .4byte 0x085cbc8e + .pool _0814E310: - ldr r0, _0814E334 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 ands r0, r1 @@ -684570,55 +661752,49 @@ _0814E310: cmp r0, 0 beq _0814E33C _0814E330: - ldr r7, _0814E338 + ldr r7, =0x085ccdde b _0814E6D8 .align 2, 0 -_0814E334: .4byte 0x02022fec -_0814E338: .4byte 0x085ccdde + .pool _0814E33C: movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _0814E34C - ldr r7, _0814E348 + ldr r7, =0x085cbc4e b _0814E6D8 .align 2, 0 -_0814E348: .4byte 0x085cbc4e + .pool _0814E34C: - ldr r0, _0814E35C + ldr r0, =0x02000002 ands r1, r0 - ldr r7, _0814E360 + ldr r7, =0x085cbbfa cmp r1, 0 bne _0814E358 b _0814E6D8 _0814E358: - ldr r7, _0814E364 + ldr r7, =0x085cbc37 b _0814E6D8 .align 2, 0 -_0814E35C: .4byte 0x02000002 -_0814E360: .4byte 0x085cbbfa -_0814E364: .4byte 0x085cbc37 + .pool _0814E368: - ldr r0, _0814E384 + ldr r0, =0x02000002 ands r1, r0 cmp r1, 0 beq _0814E380 - ldr r0, _0814E388 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 - ldr r7, _0814E38C + ldr r7, =0x085cbc27 cmp r1, r0 beq _0814E380 b _0814E6D8 _0814E380: - ldr r7, _0814E390 + ldr r7, =0x085cbbe7 b _0814E6D8 .align 2, 0 -_0814E384: .4byte 0x02000002 -_0814E388: .4byte 0x02038bca -_0814E38C: .4byte 0x085cbc27 -_0814E390: .4byte 0x085cbbe7 + .pool _0814E394: mov r1, r12 ldrb r0, [r1] @@ -684626,49 +661802,46 @@ _0814E394: lsls r0, 24 cmp r0, 0 bne _0814E3EC - ldr r0, _0814E3B4 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 ldrb r2, [r0] cmp r2, 0 bne _0814E3BC - ldr r7, _0814E3B8 + ldr r7, =0x085cbcfd b _0814E6D8 .align 2, 0 -_0814E3B4: .4byte 0x0202449c -_0814E3B8: .4byte 0x085cbcfd + .pool _0814E3BC: cmp r2, 0x1 beq _0814E3CC - ldr r0, _0814E3D0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0814E3D8 _0814E3CC: - ldr r7, _0814E3D4 + ldr r7, =0x085cbd1b b _0814E6D8 .align 2, 0 -_0814E3D0: .4byte 0x02022fec -_0814E3D4: .4byte 0x085cbd1b + .pool _0814E3D8: - ldr r7, _0814E3E4 + ldr r7, =0x085cbd3d cmp r2, 0x2 beq _0814E3E0 b _0814E6D8 _0814E3E0: - ldr r7, _0814E3E8 + ldr r7, =0x085cbd2a b _0814E6D8 .align 2, 0 -_0814E3E4: .4byte 0x085cbd3d -_0814E3E8: .4byte 0x085cbd2a + .pool _0814E3EC: - ldr r0, _0814E418 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0x80 lsls r0, 4 - ldr r2, _0814E41C + ldr r2, =0x02022fec cmp r1, r0 beq _0814E406 ldr r0, [r2] @@ -684681,23 +661854,20 @@ _0814E406: ldr r0, [r2] movs r1, 0x40 ands r0, r1 - ldr r7, _0814E420 + ldr r7, =0x085cbd65 cmp r0, 0 bne _0814E414 b _0814E6D8 _0814E414: - ldr r7, _0814E424 + ldr r7, =0x085cbd75 b _0814E6D8 .align 2, 0 -_0814E418: .4byte 0x02038bca -_0814E41C: .4byte 0x02022fec -_0814E420: .4byte 0x085cbd65 -_0814E424: .4byte 0x085cbd75 + .pool _0814E428: - ldr r7, _0814E42C + ldr r7, =0x085cbd52 b _0814E6D8 .align 2, 0 -_0814E42C: .4byte 0x085cbd52 + .pool _0814E430: mov r4, r9 ldrb r0, [r4, 0x17] @@ -684705,47 +661875,44 @@ _0814E430: lsls r0, 24 cmp r0, 0 bne _0814E488 - ldr r0, _0814E45C + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB1 ldrb r2, [r0] cmp r2, 0 beq _0814E456 - ldr r0, _0814E460 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 ands r0, r1 cmp r0, 0 beq _0814E468 _0814E456: - ldr r7, _0814E464 + ldr r7, =0x085cbca5 b _0814E6D8 .align 2, 0 -_0814E45C: .4byte 0x0202449c -_0814E460: .4byte 0x02022fec -_0814E464: .4byte 0x085cbca5 + .pool _0814E468: cmp r2, 0x1 bne _0814E474 - ldr r7, _0814E470 + ldr r7, =0x085cbcad b _0814E6D8 .align 2, 0 -_0814E470: .4byte 0x085cbcad + .pool _0814E474: - ldr r7, _0814E480 + ldr r7, =0x085cbcc7 cmp r2, 0x2 beq _0814E47C b _0814E6D8 _0814E47C: - ldr r7, _0814E484 + ldr r7, =0x085cbcb8 b _0814E6D8 .align 2, 0 -_0814E480: .4byte 0x085cbcc7 -_0814E484: .4byte 0x085cbcb8 + .pool _0814E488: - ldr r0, _0814E4A4 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _0814E4A8 + ldr r0, =0x02000002 ands r0, r1 cmp r0, 0 beq _0814E4DC @@ -684757,33 +661924,30 @@ _0814E488: ldrb r0, [r4, 0x17] b _0814E4EA .align 2, 0 -_0814E4A4: .4byte 0x02022fec -_0814E4A8: .4byte 0x02000002 + .pool _0814E4AC: movs r0, 0x40 ands r1, r0 cmp r1, 0 beq _0814E4BC - ldr r7, _0814E4B8 + ldr r7, =0x085cbc7e b _0814E6D8 .align 2, 0 -_0814E4B8: .4byte 0x085cbc7e + .pool _0814E4BC: - ldr r0, _0814E4D0 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 - ldr r7, _0814E4D4 + ldr r7, =0x085cbc6e cmp r1, r0 beq _0814E4CC b _0814E6D8 _0814E4CC: - ldr r7, _0814E4D8 + ldr r7, =0x085cbc14 b _0814E6D8 .align 2, 0 -_0814E4D0: .4byte 0x02038bca -_0814E4D4: .4byte 0x085cbc6e -_0814E4D8: .4byte 0x085cbc14 + .pool _0814E4DC: movs r0, 0x80 lsls r0, 8 @@ -684793,59 +661957,54 @@ _0814E4DC: mov r1, r9 ldrb r0, [r1, 0x17] _0814E4EA: - ldr r7, _0814E4F4 + ldr r7, =0x085cce04 cmp r0, 0x1 beq _0814E4F2 b _0814E6D8 _0814E4F2: b _0814E4CC .align 2, 0 -_0814E4F4: .4byte 0x085cce04 + .pool _0814E4F8: mov r0, r10 bl sub_814F8F8 - ldr r0, _0814E524 + ldr r0, =0x0203aba8 ldr r2, [r0] ldrh r1, [r2] movs r0, 0xB1 lsls r0, 1 cmp r1, r0 bls _0814E534 - ldr r0, _0814E528 - ldr r1, _0814E52C + ldr r0, =0x02022f68 + ldr r1, =0x0202449c ldr r1, [r1] adds r1, 0x8E ldrb r2, [r1] lsls r1, r2, 4 adds r1, r2 - ldr r2, _0814E530 + ldr r2, =0x085ccbbc adds r1, r2 bl gf_strcpy b _0814E544 .align 2, 0 -_0814E524: .4byte 0x0203aba8 -_0814E528: .4byte 0x02022f68 -_0814E52C: .4byte 0x0202449c -_0814E530: .4byte 0x085ccbbc + .pool _0814E534: - ldr r0, _0814E550 + ldr r0, =0x02022f68 ldrh r2, [r2] movs r1, 0xD muls r1, r2 - ldr r2, _0814E554 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy _0814E544: - ldr r0, _0814E550 + ldr r0, =0x02022f68 bl sub_814F950 - ldr r7, _0814E558 + ldr r7, =0x085cbdac b _0814E6D8 .align 2, 0 -_0814E550: .4byte 0x02022f68 -_0814E554: .4byte 0x0831977c -_0814E558: .4byte 0x085cbdac + .pool _0814E55C: - ldr r4, _0814E59C + ldr r4, =0x02022f58 ldrb r1, [r4] movs r0, 0x80 ands r0, r1 @@ -684868,34 +662027,31 @@ _0814E55C: eors r0, r1 strb r0, [r4] _0814E58A: - ldr r0, _0814E59C + ldr r0, =0x02022f58 ldrb r0, [r0] subs r0, 0x2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bhi _0814E5A4 - ldr r7, _0814E5A0 + ldr r7, =0x085cb4ca b _0814E6D8 .align 2, 0 -_0814E59C: .4byte 0x02022f58 -_0814E5A0: .4byte 0x085cb4ca + .pool _0814E5A4: - ldr r0, _0814E5B8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 - ldr r7, _0814E5BC + ldr r7, =0x085cb5d2 cmp r0, 0 bne _0814E5B4 b _0814E6D8 _0814E5B4: - ldr r7, _0814E5C0 + ldr r7, =0x085cb5df b _0814E6D8 .align 2, 0 -_0814E5B8: .4byte 0x02022fec -_0814E5BC: .4byte 0x085cb5d2 -_0814E5C0: .4byte 0x085cb5df + .pool _0814E5C4: mov r1, r12 ldrb r0, [r1] @@ -684911,13 +662067,13 @@ _0814E5C4: eors r0, r1 strb r0, [r4] _0814E5E0: - ldr r0, _0814E600 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _0814E638 - ldr r0, _0814E604 + ldr r0, =0x02022f58 ldrb r0, [r0] cmp r0, 0x2 beq _0814E628 @@ -684927,8 +662083,7 @@ _0814E5E0: beq _0814E60E b _0814E6D8 .align 2, 0 -_0814E600: .4byte 0x02022fec -_0814E604: .4byte 0x02022f58 + .pool _0814E608: cmp r0, 0x3 beq _0814E630 @@ -684937,32 +662092,31 @@ _0814E60E: movs r0, 0x80 lsls r0, 16 ands r1, r0 - ldr r7, _0814E620 + ldr r7, =0x085cb538 cmp r1, 0 beq _0814E6D8 - ldr r7, _0814E624 + ldr r7, =0x085cce53 b _0814E6D8 .align 2, 0 -_0814E620: .4byte 0x085cb538 -_0814E624: .4byte 0x085cce53 + .pool _0814E628: - ldr r7, _0814E62C + ldr r7, =0x085cb567 b _0814E6D8 .align 2, 0 -_0814E62C: .4byte 0x085cb567 + .pool _0814E630: - ldr r7, _0814E634 + ldr r7, =0x085cb5a6 b _0814E6D8 .align 2, 0 -_0814E634: .4byte 0x085cb5a6 + .pool _0814E638: - ldr r0, _0814E658 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 cmp r1, r0 bne _0814E680 - ldr r0, _0814E65C + ldr r0, =0x02022f58 ldrb r0, [r0] cmp r0, 0x2 beq _0814E670 @@ -684972,29 +662126,28 @@ _0814E638: beq _0814E666 b _0814E6D8 .align 2, 0 -_0814E658: .4byte 0x02038bca -_0814E65C: .4byte 0x02022f58 + .pool _0814E660: cmp r0, 0x3 beq _0814E678 b _0814E6D8 _0814E666: - ldr r7, _0814E66C + ldr r7, =0x085cba2e b _0814E6D8 .align 2, 0 -_0814E66C: .4byte 0x085cba2e + .pool _0814E670: - ldr r7, _0814E674 + ldr r7, =0x085cd24c b _0814E6D8 .align 2, 0 -_0814E674: .4byte 0x085cd24c + .pool _0814E678: - ldr r7, _0814E67C + ldr r7, =0x085cd267 b _0814E6D8 .align 2, 0 -_0814E67C: .4byte 0x085cd267 + .pool _0814E680: - ldr r0, _0814E694 + ldr r0, =0x02022f58 ldrb r0, [r0] cmp r0, 0x2 beq _0814E6A8 @@ -685004,39 +662157,39 @@ _0814E680: beq _0814E69E b _0814E6D8 .align 2, 0 -_0814E694: .4byte 0x02022f58 + .pool _0814E698: cmp r0, 0x3 beq _0814E6B0 b _0814E6D8 _0814E69E: - ldr r7, _0814E6A4 + ldr r7, =0x085cb524 b _0814E6D8 .align 2, 0 -_0814E6A4: .4byte 0x085cb524 + .pool _0814E6A8: - ldr r7, _0814E6AC + ldr r7, =0x085cb54f b _0814E6D8 .align 2, 0 -_0814E6AC: .4byte 0x085cb54f + .pool _0814E6B0: - ldr r7, _0814E6B4 + ldr r7, =0x085cb581 b _0814E6D8 .align 2, 0 -_0814E6B4: .4byte 0x085cb581 + .pool _0814E6B8: movs r0, 0xBE lsls r0, 1 cmp r6, r0 bls _0814E6CC - ldr r1, _0814E6C8 + ldr r1, =0x02022e2c movs r0, 0xFF strb r0, [r1] b _0814E6DE .align 2, 0 -_0814E6C8: .4byte 0x02022e2c + .pool _0814E6CC: - ldr r1, _0814E6EC + ldr r1, =0x085cc270 adds r0, r6, 0 subs r0, 0xC lsls r0, 2 @@ -685054,18 +662207,18 @@ _0814E6DE: pop {r0} bx r0 .align 2, 0 -_0814E6EC: .4byte 0x085cc270 + .pool thumb_func_end battle_pick_message thumb_func_start sub_814E6F0 sub_814E6F0: @ 814E6F0 push {lr} - ldr r1, _0814E6FC + ldr r1, =0x02022e2c bl sub_814E764 pop {r1} bx r1 .align 2, 0 -_0814E6FC: .4byte 0x02022e2c + .pool thumb_func_end sub_814E6F0 thumb_func_start sub_814E700 @@ -685073,7 +662226,7 @@ sub_814E700: @ 814E700 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r1, _0814E718 + ldr r1, =0x085cd422 mov r0, sp movs r2, 0x8 bl memcpy @@ -685081,7 +662234,7 @@ sub_814E700: @ 814E700 movs r3, 0 b _0814E728 .align 2, 0 -_0814E718: .4byte 0x085cd422 + .pool _0814E71C: strb r1, [r2] adds r4, 0x1 @@ -685098,7 +662251,7 @@ _0814E730: ldr r5, [sp] ldr r4, [sp, 0x4] movs r3, 0 - ldr r2, _0814E74C + ldr r2, =0x0831bca8 _0814E738: ldr r1, [r2] ldr r0, [r1] @@ -685110,7 +662263,7 @@ _0814E738: ldr r0, [r2, 0x4] b _0814E75A .align 2, 0 -_0814E74C: .4byte 0x0831bca8 + .pool _0814E750: adds r2, 0x8 adds r3, 0x1 @@ -685135,19 +662288,18 @@ sub_814E764: @ 814E764 mov r8, r1 movs r6, 0 movs r4, 0 - ldr r0, _0814E78C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 beq _0814E794 - ldr r0, _0814E790 + ldr r0, =0x0203c7b4 ldrb r7, [r0] b _0814E79C .align 2, 0 -_0814E78C: .4byte 0x02022fec -_0814E790: .4byte 0x0203c7b4 + .pool _0814E794: bl link_get_multiplayer_id lsls r0, 24 @@ -685170,12 +662322,12 @@ _0814E7AC: bl _0814F5C0 _0814E7BC: lsls r0, 2 - ldr r1, _0814E7C8 + ldr r1, =_0814E7CC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0814E7C8: .4byte _0814E7CC + .pool .align 2, 0 _0814E7CC: .4byte _0814E8A0 @@ -685232,16 +662384,15 @@ _0814E7CC: .4byte _0814F5B4 .4byte _0814E8E4 _0814E8A0: - ldr r5, _0814E8B0 + ldr r5, =0x02022f58 ldrb r0, [r5] cmp r0, 0xFD bne _0814E8B8 - ldr r4, _0814E8B4 + ldr r4, =0x02021cc4 adds r0, r5, 0 b _0814E8F0 .align 2, 0 -_0814E8B0: .4byte 0x02022f58 -_0814E8B4: .4byte 0x02021cc4 + .pool _0814E8B8: adds r0, r5, 0 bl sub_814E700 @@ -685253,21 +662404,20 @@ _0814E8C8: adds r4, r5, 0 bl _0814F5C0 _0814E8CE: - ldr r1, _0814E8DC + ldr r1, =0x02022f68 ldrb r0, [r1] cmp r0, 0xFD bne _0814E904 - ldr r4, _0814E8E0 + ldr r4, =0x02021dc4 b _0814E8EE .align 2, 0 -_0814E8DC: .4byte 0x02022f68 -_0814E8E0: .4byte 0x02021dc4 + .pool _0814E8E4: - ldr r1, _0814E8FC + ldr r1, =0x02022f78 ldrb r0, [r1] cmp r0, 0xFD bne _0814E904 - ldr r4, _0814E900 + ldr r4, =0x02021ec4 _0814E8EE: adds r0, r1, 0 _0814E8F0: @@ -685275,37 +662425,36 @@ _0814E8F0: bl sub_814F648 bl _0814F5C0 .align 2, 0 -_0814E8FC: .4byte 0x02022f78 -_0814E900: .4byte 0x02021ec4 + .pool _0814E904: adds r4, r1, 0 bl _0814F5C0 _0814E90A: - ldr r4, _0814E910 + ldr r4, =0x02021cc4 bl _0814F5C0 .align 2, 0 -_0814E910: .4byte 0x02021cc4 + .pool _0814E914: - ldr r4, _0814E91C + ldr r4, =0x02021dc4 bl _0814F5C0 .align 2, 0 -_0814E91C: .4byte 0x02021dc4 + .pool _0814E920: - ldr r4, _0814E928 + ldr r4, =0x02021ec4 bl _0814F5C0 .align 2, 0 -_0814E928: .4byte 0x02021ec4 + .pool _0814E92C: movs r0, 0 bl battle_get_side_with_given_state - ldr r1, _0814E958 + ldr r1, =0x0202406e lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814E95C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685314,19 +662463,18 @@ _0814E92C: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814E958: .4byte 0x0202406e -_0814E95C: .4byte 0x020244ec + .pool _0814E960: movs r0, 0x1 bl battle_get_side_with_given_state - ldr r1, _0814E98C + ldr r1, =0x0202406e lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814E990 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685335,19 +662483,18 @@ _0814E960: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814E98C: .4byte 0x0202406e -_0814E990: .4byte 0x02024744 + .pool _0814E994: movs r0, 0x2 bl battle_get_side_with_given_state - ldr r1, _0814E9C0 + ldr r1, =0x0202406e lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814E9C4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685356,19 +662503,18 @@ _0814E994: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814E9C0: .4byte 0x0202406e -_0814E9C4: .4byte 0x020244ec + .pool _0814E9C8: movs r0, 0x3 bl battle_get_side_with_given_state - ldr r1, _0814E9F4 + ldr r1, =0x0202406e lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814E9F8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685377,11 +662523,10 @@ _0814E9C8: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814E9F4: .4byte 0x0202406e -_0814E9F8: .4byte 0x02024744 + .pool _0814E9FC: - ldr r2, _0814EA2C - ldr r1, _0814EA30 + ldr r2, =0x0202406e + ldr r1, =0x020229e8 lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -685392,7 +662537,7 @@ _0814E9FC: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814EA34 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685401,12 +662546,10 @@ _0814E9FC: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814EA2C: .4byte 0x0202406e -_0814EA30: .4byte 0x020229e8 -_0814EA34: .4byte 0x020244ec + .pool _0814EA38: - ldr r2, _0814EA6C - ldr r1, _0814EA70 + ldr r2, =0x0202406e + ldr r1, =0x020229e8 lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -685419,7 +662562,7 @@ _0814EA38: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814EA74 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685428,12 +662571,10 @@ _0814EA38: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814EA6C: .4byte 0x0202406e -_0814EA70: .4byte 0x020229e8 -_0814EA74: .4byte 0x02024744 + .pool _0814EA78: - ldr r2, _0814EAAC - ldr r1, _0814EAB0 + ldr r2, =0x0202406e + ldr r1, =0x020229e8 lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -685446,7 +662587,7 @@ _0814EA78: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814EAB4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685455,12 +662596,10 @@ _0814EA78: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814EAAC: .4byte 0x0202406e -_0814EAB0: .4byte 0x020229e8 -_0814EAB4: .4byte 0x020244ec + .pool _0814EAB8: - ldr r2, _0814EAEC - ldr r1, _0814EAF0 + ldr r2, =0x0202406e + ldr r1, =0x020229e8 lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -685473,7 +662612,7 @@ _0814EAB8: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814EAF4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685482,31 +662621,26 @@ _0814EAB8: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814EAEC: .4byte 0x0202406e -_0814EAF0: .4byte 0x020229e8 -_0814EAF4: .4byte 0x02024744 + .pool _0814EAF8: - ldr r4, _0814EB1C + ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 adds r2, r4, 0 cmp r0, 0 beq _0814EB74 - ldr r0, _0814EB20 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, _0814EB24 + ldr r4, =0x085cbd85 cmp r1, 0 beq _0814EB36 - ldr r4, _0814EB28 + ldr r4, =0x085cbd8b b _0814EB36 .align 2, 0 -_0814EB1C: .4byte 0x0202420b -_0814EB20: .4byte 0x02022fec -_0814EB24: .4byte 0x085cbd85 -_0814EB28: .4byte 0x085cbd8b + .pool _0814EB2C: mov r3, r8 adds r0, r3, r6 @@ -685524,22 +662658,21 @@ _0814EB36: movs r0, 0x1 ands r0, r1 bl battle_get_side_with_given_state - ldr r1, _0814EB6C + ldr r1, =0x0202406e lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814EB70 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2 mov r2, sp bl pokemon_getattr b _0814EB9E .align 2, 0 -_0814EB6C: .4byte 0x0202406e -_0814EB70: .4byte 0x02024744 + .pool _0814EB74: ldrb r0, [r2] bl battle_get_per_side_status @@ -685547,14 +662680,14 @@ _0814EB74: movs r0, 0x1 ands r0, r1 bl battle_get_side_with_given_state - ldr r1, _0814EBA8 + ldr r1, =0x0202406e lsls r0, 24 lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814EBAC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685564,10 +662697,9 @@ _0814EB9E: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814EBA8: .4byte 0x0202406e -_0814EBAC: .4byte 0x020244ec + .pool _0814EBB0: - ldr r4, _0814EBEC + ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -685579,7 +662711,7 @@ _0814EBB0: movs r0, 0x1 ands r0, r1 bl battle_get_side_with_given_state - ldr r1, _0814EBF0 + ldr r1, =0x0202406e lsls r0, 24 lsrs r0, 23 adds r0, 0x4 @@ -685587,16 +662719,14 @@ _0814EBB0: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814EBF4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp bl pokemon_getattr b _0814EC24 .align 2, 0 -_0814EBEC: .4byte 0x0202420b -_0814EBF0: .4byte 0x0202406e -_0814EBF4: .4byte 0x020244ec + .pool _0814EBF8: ldrb r0, [r4] bl battle_get_per_side_status @@ -685604,7 +662734,7 @@ _0814EBF8: movs r0, 0x1 ands r0, r1 bl battle_get_side_with_given_state - ldr r1, _0814EC30 + ldr r1, =0x0202406e lsls r0, 24 lsrs r0, 23 adds r0, 0x4 @@ -685612,7 +662742,7 @@ _0814EBF8: ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814EC34 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685622,28 +662752,27 @@ _0814EC24: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814EC30: .4byte 0x0202406e -_0814EC34: .4byte 0x02024744 + .pool _0814EC38: - ldr r5, _0814EC90 + ldr r5, =0x0202420b ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0814ECA8 - ldr r0, _0814EC94 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, _0814EC98 + ldr r4, =0x085cbd85 cmp r1, 0 beq _0814EC56 - ldr r4, _0814EC9C + ldr r4, =0x085cbd8b _0814EC56: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _0814ECA0 - ldr r2, _0814ECA4 + ldr r3, =0x0202406e + ldr r2, =0x02024744 mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF @@ -685671,21 +662800,16 @@ _0814EC78: bl pokemon_getattr b _0814ECC2 .align 2, 0 -_0814EC90: .4byte 0x0202420b -_0814EC94: .4byte 0x02022fec -_0814EC98: .4byte 0x085cbd85 -_0814EC9C: .4byte 0x085cbd8b -_0814ECA0: .4byte 0x0202406e -_0814ECA4: .4byte 0x02024744 + .pool _0814ECA8: - ldr r1, _0814ECCC + ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814ECD0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685695,28 +662819,27 @@ _0814ECC2: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814ECCC: .4byte 0x0202406e -_0814ECD0: .4byte 0x020244ec + .pool _0814ECD4: - ldr r5, _0814ED2C + ldr r5, =0x0202420c ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0814ED44 - ldr r0, _0814ED30 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, _0814ED34 + ldr r4, =0x085cbd85 cmp r1, 0 beq _0814ECF2 - ldr r4, _0814ED38 + ldr r4, =0x085cbd8b _0814ECF2: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _0814ED3C - ldr r2, _0814ED40 + ldr r3, =0x0202406e + ldr r2, =0x02024744 mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF @@ -685744,21 +662867,16 @@ _0814ED14: bl pokemon_getattr b _0814ED5E .align 2, 0 -_0814ED2C: .4byte 0x0202420c -_0814ED30: .4byte 0x02022fec -_0814ED34: .4byte 0x085cbd85 -_0814ED38: .4byte 0x085cbd8b -_0814ED3C: .4byte 0x0202406e -_0814ED40: .4byte 0x02024744 + .pool _0814ED44: - ldr r1, _0814ED68 + ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814ED6C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685768,28 +662886,27 @@ _0814ED5E: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814ED68: .4byte 0x0202406e -_0814ED6C: .4byte 0x020244ec + .pool _0814ED70: - ldr r5, _0814EDC8 + ldr r5, =0x0202420e ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0814EDE0 - ldr r0, _0814EDCC + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, _0814EDD0 + ldr r4, =0x085cbd85 cmp r1, 0 beq _0814ED8E - ldr r4, _0814EDD4 + ldr r4, =0x085cbd8b _0814ED8E: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _0814EDD8 - ldr r2, _0814EDDC + ldr r3, =0x0202406e + ldr r2, =0x02024744 mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF @@ -685817,21 +662934,16 @@ _0814EDB0: bl pokemon_getattr b _0814EDFA .align 2, 0 -_0814EDC8: .4byte 0x0202420e -_0814EDCC: .4byte 0x02022fec -_0814EDD0: .4byte 0x085cbd85 -_0814EDD4: .4byte 0x085cbd8b -_0814EDD8: .4byte 0x0202406e -_0814EDDC: .4byte 0x02024744 + .pool _0814EDE0: - ldr r1, _0814EE04 + ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814EE08 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685841,28 +662953,27 @@ _0814EDFA: bl get_end_of_string_ptr_limit_10_chars bl _0814F5BE .align 2, 0 -_0814EE04: .4byte 0x0202406e -_0814EE08: .4byte 0x020244ec + .pool _0814EE0C: - ldr r5, _0814EE64 + ldr r5, =0x02024064 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0814EE7C - ldr r0, _0814EE68 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, _0814EE6C + ldr r4, =0x085cbd85 cmp r1, 0 beq _0814EE2A - ldr r4, _0814EE70 + ldr r4, =0x085cbd8b _0814EE2A: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _0814EE74 - ldr r2, _0814EE78 + ldr r3, =0x0202406e + ldr r2, =0x02024744 mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF @@ -685890,21 +663001,16 @@ _0814EE4C: bl pokemon_getattr b _0814EE96 .align 2, 0 -_0814EE64: .4byte 0x02024064 -_0814EE68: .4byte 0x02022fec -_0814EE6C: .4byte 0x085cbd85 -_0814EE70: .4byte 0x085cbd8b -_0814EE74: .4byte 0x0202406e -_0814EE78: .4byte 0x02024744 + .pool _0814EE7C: - ldr r1, _0814EEA0 + ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814EEA4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685914,28 +663020,27 @@ _0814EE96: bl get_end_of_string_ptr_limit_10_chars b _0814F5BE .align 2, 0 -_0814EEA0: .4byte 0x0202406e -_0814EEA4: .4byte 0x020244ec + .pool _0814EEA8: - ldr r5, _0814EF00 + ldr r5, =0x02024474 ldrb r0, [r5, 0x17] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0814EF18 - ldr r0, _0814EF04 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, _0814EF08 + ldr r4, =0x085cbd85 cmp r1, 0 beq _0814EEC6 - ldr r4, _0814EF0C + ldr r4, =0x085cbd8b _0814EEC6: ldrb r1, [r4] adds r0, r1, 0 - ldr r3, _0814EF10 - ldr r2, _0814EF14 + ldr r3, =0x0202406e + ldr r2, =0x02024744 mov r12, r2 adds r2, r5, 0 cmp r0, 0xFF @@ -685963,21 +663068,16 @@ _0814EEE8: bl pokemon_getattr b _0814EF32 .align 2, 0 -_0814EF00: .4byte 0x02024474 -_0814EF04: .4byte 0x02022fec -_0814EF08: .4byte 0x085cbd85 -_0814EF0C: .4byte 0x085cbd8b -_0814EF10: .4byte 0x0202406e -_0814EF14: .4byte 0x02024744 + .pool _0814EF18: - ldr r1, _0814EF3C + ldr r1, =0x0202406e ldrb r0, [r5, 0x17] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814EF40 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp @@ -685987,10 +663087,9 @@ _0814EF32: bl get_end_of_string_ptr_limit_10_chars b _0814F5BE .align 2, 0 -_0814EF3C: .4byte 0x0202406e -_0814EF40: .4byte 0x020244ec + .pool _0814EF44: - ldr r0, _0814EF58 + ldr r0, =0x0203aba8 ldr r2, [r0] ldrh r1, [r2] movs r0, 0xB1 @@ -686000,9 +663099,9 @@ _0814EF44: ldrh r1, [r2] b _0814EF8A .align 2, 0 -_0814EF58: .4byte 0x0203aba8 + .pool _0814EF5C: - ldr r0, _0814EF7C + ldr r0, =0x0203aba8 ldr r2, [r0] ldrh r1, [r2, 0x2] movs r0, 0xB1 @@ -686010,37 +663109,35 @@ _0814EF5C: cmp r1, r0 bls _0814EF88 _0814EF6A: - ldr r0, _0814EF80 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x8E ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 - ldr r1, _0814EF84 + ldr r1, =0x085ccbbc adds r4, r0, r1 b _0814F5C0 .align 2, 0 -_0814EF7C: .4byte 0x0203aba8 -_0814EF80: .4byte 0x0202449c -_0814EF84: .4byte 0x085ccbbc + .pool _0814EF88: ldrh r1, [r2, 0x2] _0814EF8A: movs r0, 0xD muls r1, r0 - ldr r0, _0814EF94 + ldr r0, =0x0831977c adds r4, r1, r0 b _0814F5C0 .align 2, 0 -_0814EF94: .4byte 0x0831977c + .pool _0814EF98: - ldr r0, _0814EFCC + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _0814EFD0 + ldr r0, =0x02000002 ands r0, r1 cmp r0, 0 beq _0814F06E - ldr r2, _0814EFD4 + ldr r2, =0x02024208 ldrh r0, [r2] cmp r0, 0xAF bne _0814F064 @@ -686048,12 +663145,12 @@ _0814EF98: ands r1, r0 cmp r1, 0 bne _0814F014 - ldr r0, _0814EFD8 + ldr r0, =0x02024474 adds r0, 0x25 ldrb r0, [r0] cmp r0, 0 beq _0814EFE0 - ldr r2, _0814EFDC + ldr r2, =0x0202420f ldrb r1, [r2] movs r0, 0x1 ands r0, r1 @@ -686061,13 +663158,9 @@ _0814EF98: bne _0814EFEC b _0814F05C .align 2, 0 -_0814EFCC: .4byte 0x02022fec -_0814EFD0: .4byte 0x02000002 -_0814EFD4: .4byte 0x02024208 -_0814EFD8: .4byte 0x02024474 -_0814EFDC: .4byte 0x0202420f + .pool _0814EFE0: - ldr r2, _0814F008 + ldr r2, =0x0202420f ldrb r1, [r2] movs r0, 0x1 ands r0, r1 @@ -686078,28 +663171,26 @@ _0814EFEC: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _0814F00C + ldr r0, =0x02024404 adds r1, r0 mov r0, sp bl gf_strcpy - ldr r1, _0814F010 + ldr r1, =0x085cc0ad mov r0, sp bl gf_strcat b _0814F5BE .align 2, 0 -_0814F008: .4byte 0x0202420f -_0814F00C: .4byte 0x02024404 -_0814F010: .4byte 0x085cc0ad + .pool _0814F014: - ldr r2, _0814F048 - ldr r0, _0814F04C + ldr r2, =0x020229e8 + ldr r0, =0x02024474 adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _0814F050 + ldr r1, =0x0202420f ldrb r2, [r1] ldrh r0, [r0, 0x18] cmp r0, r2 @@ -686107,68 +663198,61 @@ _0814F014: lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r0, _0814F054 + ldr r0, =0x02024404 adds r1, r0 mov r0, sp bl gf_strcpy - ldr r1, _0814F058 + ldr r1, =0x085cc0ad mov r0, sp bl gf_strcat b _0814F5BE .align 2, 0 -_0814F048: .4byte 0x020229e8 -_0814F04C: .4byte 0x02024474 -_0814F050: .4byte 0x0202420f -_0814F054: .4byte 0x02024404 -_0814F058: .4byte 0x085cc0ad + .pool _0814F05C: - ldr r4, _0814F060 + ldr r4, =0x085cc0a0 b _0814F5C0 .align 2, 0 -_0814F060: .4byte 0x085cc0a0 + .pool _0814F064: ldrh r0, [r2] mov r1, sp bl itemid_get_name b _0814F5BE _0814F06E: - ldr r0, _0814F07C + ldr r0, =0x02024208 ldrh r0, [r0] mov r1, sp bl itemid_get_name b _0814F5BE .align 2, 0 -_0814F07C: .4byte 0x02024208 + .pool _0814F080: - ldr r0, _0814F084 + ldr r0, =0x0202420a b _0814F0C0 .align 2, 0 -_0814F084: .4byte 0x0202420a + .pool _0814F088: - ldr r1, _0814F090 - ldr r0, _0814F094 + ldr r1, =0x0203aba4 + ldr r0, =0x0202420b b _0814F0BC .align 2, 0 -_0814F090: .4byte 0x0203aba4 -_0814F094: .4byte 0x0202420b + .pool _0814F098: - ldr r1, _0814F0A0 - ldr r0, _0814F0A4 + ldr r1, =0x0203aba4 + ldr r0, =0x0202420c b _0814F0BC .align 2, 0 -_0814F0A0: .4byte 0x0203aba4 -_0814F0A4: .4byte 0x0202420c + .pool _0814F0A8: - ldr r1, _0814F0B0 - ldr r0, _0814F0B4 + ldr r1, =0x0203aba4 + ldr r0, =0x02024474 ldrb r0, [r0, 0x17] b _0814F0BE .align 2, 0 -_0814F0B0: .4byte 0x0203aba4 -_0814F0B4: .4byte 0x02024474 + .pool _0814F0B8: - ldr r1, _0814F0CC - ldr r0, _0814F0D0 + ldr r1, =0x0203aba4 + ldr r0, =0x0202420e _0814F0BC: ldrb r0, [r0] _0814F0BE: @@ -686177,15 +663261,13 @@ _0814F0C0: ldrb r1, [r0] movs r0, 0xD muls r1, r0 - ldr r0, _0814F0D4 + ldr r0, =0x0831b6db adds r4, r1, r0 b _0814F5C0 .align 2, 0 -_0814F0CC: .4byte 0x0203aba4 -_0814F0D0: .4byte 0x0202420e -_0814F0D4: .4byte 0x0831b6db + .pool _0814F0D8: - ldr r0, _0814F0EC + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 20 @@ -686195,9 +663277,9 @@ _0814F0D8: bl sub_806B870 b _0814F59C .align 2, 0 -_0814F0EC: .4byte 0x02022fec + .pool _0814F0F0: - ldr r3, _0814F108 + ldr r3, =0x02038bca ldrh r2, [r3] movs r0, 0xC0 lsls r0, 4 @@ -686208,24 +663290,24 @@ _0814F0F0: lsrs r0, 16 b _0814F5A0 .align 2, 0 -_0814F108: .4byte 0x02038bca + .pool _0814F10C: - ldr r0, _0814F118 + ldr r0, =0x000003fe cmp r2, r0 bne _0814F11C bl sub_81A4D00 b _0814F59C .align 2, 0 -_0814F118: .4byte 0x000003fe + .pool _0814F11C: - ldr r0, _0814F128 + ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 beq _0814F12C ldrh r0, [r3] b _0814F598 .align 2, 0 -_0814F128: .4byte 0x003f0100 + .pool _0814F12C: movs r0, 0x80 lsls r0, 19 @@ -686244,7 +663326,7 @@ _0814F13E: bl sub_8165264 b _0814F59C _0814F14E: - ldr r2, _0814F160 + ldr r2, =0x08310030 ldrh r1, [r3] lsls r0, r1, 2 adds r0, r1 @@ -686254,9 +663336,9 @@ _0814F14E: movs r0, 0xD b _0814F5A2 .align 2, 0 -_0814F160: .4byte 0x08310030 + .pool _0814F164: - ldr r0, _0814F1A4 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 20 @@ -686264,7 +663346,7 @@ _0814F164: cmp r0, 0 beq _0814F1AC movs r2, 0 - ldr r4, _0814F1A8 + ldr r4, =0x020244a8 ldr r3, [r4] _0814F178: mov r1, sp @@ -686288,10 +663370,9 @@ _0814F178: bl sub_8009308 b _0814F5BE .align 2, 0 -_0814F1A4: .4byte 0x02022fec -_0814F1A8: .4byte 0x020244a8 + .pool _0814F1AC: - ldr r3, _0814F1C0 + ldr r3, =0x02038bca ldrh r2, [r3] movs r0, 0xC0 lsls r0, 4 @@ -686302,25 +663383,25 @@ _0814F1AC: eors r0, r1 b _0814F284 .align 2, 0 -_0814F1C0: .4byte 0x02038bca + .pool _0814F1C4: - ldr r0, _0814F1D4 + ldr r0, =0x000003fe cmp r2, r0 bne _0814F1D8 mov r0, sp bl sub_81A4D50 b _0814F5BE .align 2, 0 -_0814F1D4: .4byte 0x000003fe + .pool _0814F1D8: - ldr r0, _0814F1E4 + ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 beq _0814F1E8 ldrh r1, [r3] b _0814F5B8 .align 2, 0 -_0814F1E4: .4byte 0x003f0100 + .pool _0814F1E8: movs r0, 0x80 lsls r0, 19 @@ -686345,22 +663426,22 @@ _0814F20E: lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0814F21C + ldr r0, =0x08310034 adds r4, r1, r0 b _0814F5C0 .align 2, 0 -_0814F21C: .4byte 0x08310034 + .pool _0814F220: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, _0814F22C + ldr r1, =0x020229f0 adds r4, r0, r1 b _0814F5C0 .align 2, 0 -_0814F22C: .4byte 0x020229f0 + .pool _0814F230: - ldr r4, _0814F240 + ldr r4, =0x020229e8 lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -686369,9 +663450,9 @@ _0814F230: movs r0, 0x2 b _0814F266 .align 2, 0 -_0814F240: .4byte 0x020229e8 + .pool _0814F244: - ldr r4, _0814F254 + ldr r4, =0x020229e8 lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -686380,9 +663461,9 @@ _0814F244: movs r0, 0x1 b _0814F266 .align 2, 0 -_0814F254: .4byte 0x020229e8 + .pool _0814F258: - ldr r4, _0814F278 + ldr r4, =0x020229e8 lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -686399,84 +663480,78 @@ _0814F266: adds r4, r1, r4 b _0814F5C0 .align 2, 0 -_0814F278: .4byte 0x020229e8 + .pool _0814F27C: - ldr r0, _0814F290 + ldr r0, =0x02024474 ldrb r0, [r0, 0x17] bl sub_806D864 _0814F284: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, _0814F294 + ldr r0, =0x020229f0 adds r4, r1, r0 b _0814F5C0 .align 2, 0 -_0814F290: .4byte 0x02024474 -_0814F294: .4byte 0x020229f0 + .pool _0814F298: - ldr r0, _0814F2AC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 beq _0814F2B4 - ldr r4, _0814F2B0 + ldr r4, =0x020229f0 b _0814F5C0 .align 2, 0 -_0814F2AC: .4byte 0x02022fec -_0814F2B0: .4byte 0x020229f0 + .pool _0814F2B4: - ldr r0, _0814F2BC + ldr r0, =0x03005d90 ldr r4, [r0] b _0814F5C0 .align 2, 0 -_0814F2BC: .4byte 0x03005d90 + .pool _0814F2C0: - ldr r0, _0814F2D4 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _0814F2D8 + ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 beq _0814F2E0 - ldr r0, _0814F2DC + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0x2 b _0814F55A .align 2, 0 -_0814F2D4: .4byte 0x02022fec -_0814F2D8: .4byte 0x003f0100 -_0814F2DC: .4byte 0x02038bca + .pool _0814F2E0: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 beq _0814F2F8 - ldr r0, _0814F2F4 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0x4 b _0814F584 .align 2, 0 -_0814F2F4: .4byte 0x02038bca + .pool _0814F2F8: bl sub_80B1CA4 adds r4, r0, 0 b _0814F5C0 _0814F300: - ldr r0, _0814F310 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _0814F314 + ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 beq _0814F31C - ldr r0, _0814F318 + ldr r0, =0x02038bca b _0814F556 .align 2, 0 -_0814F310: .4byte 0x02022fec -_0814F314: .4byte 0x003f0100 -_0814F318: .4byte 0x02038bca + .pool _0814F31C: movs r0, 0x80 lsls r0, 19 @@ -686485,31 +663560,31 @@ _0814F31C: bne _0814F328 b _0814F5C0 _0814F328: - ldr r0, _0814F32C + ldr r0, =0x02038bca b _0814F580 .align 2, 0 -_0814F32C: .4byte 0x02038bca + .pool _0814F330: - ldr r0, _0814F384 + ldr r0, =0x02024474 ldrb r0, [r0, 0x17] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0814F39C - ldr r0, _0814F388 + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x8 ands r1, r0 - ldr r4, _0814F38C + ldr r4, =0x085cbd85 cmp r1, 0 beq _0814F34E - ldr r4, _0814F390 + ldr r4, =0x085cbd8b _0814F34E: ldrb r1, [r4] adds r0, r1, 0 - ldr r5, _0814F394 + ldr r5, =0x02024744 mov r12, r5 - ldr r2, _0814F398 + ldr r2, =0x0202449c cmp r0, 0xFF beq _0814F36E _0814F35C: @@ -686534,20 +663609,15 @@ _0814F36E: bl pokemon_getattr b _0814F3B4 .align 2, 0 -_0814F384: .4byte 0x02024474 -_0814F388: .4byte 0x02022fec -_0814F38C: .4byte 0x085cbd85 -_0814F390: .4byte 0x085cbd8b -_0814F394: .4byte 0x02024744 -_0814F398: .4byte 0x0202449c + .pool _0814F39C: - ldr r0, _0814F3BC + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x52 ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0814F3C0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp @@ -686557,117 +663627,106 @@ _0814F3B4: bl get_end_of_string_ptr_limit_10_chars b _0814F5BE .align 2, 0 -_0814F3BC: .4byte 0x0202449c -_0814F3C0: .4byte 0x020244ec + .pool _0814F3C4: - ldr r0, _0814F3D8 + ldr r0, =0x000008ab bl flag_check lsls r0, 24 - ldr r4, _0814F3DC + ldr r4, =0x085cc015 cmp r0, 0 bne _0814F3D4 b _0814F5C0 _0814F3D4: - ldr r4, _0814F3E0 + ldr r4, =0x085cc01f b _0814F5C0 .align 2, 0 -_0814F3D8: .4byte 0x000008ab -_0814F3DC: .4byte 0x085cc015 -_0814F3E0: .4byte 0x085cc01f + .pool _0814F3E4: - ldr r0, _0814F3E8 + ldr r0, =0x0202420b b _0814F3EE .align 2, 0 -_0814F3E8: .4byte 0x0202420b + .pool _0814F3EC: - ldr r0, _0814F404 + ldr r0, =0x0202420c _0814F3EE: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 - ldr r4, _0814F408 + ldr r4, =0x085cbd9a cmp r0, 0 beq _0814F3FE b _0814F5C0 _0814F3FE: - ldr r4, _0814F40C + ldr r4, =0x085cbd9e b _0814F5C0 .align 2, 0 -_0814F404: .4byte 0x0202420c -_0814F408: .4byte 0x085cbd9a -_0814F40C: .4byte 0x085cbd9e + .pool _0814F410: - ldr r0, _0814F414 + ldr r0, =0x0202420b b _0814F41A .align 2, 0 -_0814F414: .4byte 0x0202420b + .pool _0814F418: - ldr r0, _0814F430 + ldr r0, =0x0202420c _0814F41A: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 - ldr r4, _0814F434 + ldr r4, =0x085cbd91 cmp r0, 0 beq _0814F42A b _0814F5C0 _0814F42A: - ldr r4, _0814F438 + ldr r4, =0x085cbd95 b _0814F5C0 .align 2, 0 -_0814F430: .4byte 0x0202420c -_0814F434: .4byte 0x085cbd91 -_0814F438: .4byte 0x085cbd95 + .pool _0814F43C: - ldr r0, _0814F440 + ldr r0, =0x0202420b b _0814F446 .align 2, 0 -_0814F440: .4byte 0x0202420b + .pool _0814F444: - ldr r0, _0814F45C + ldr r0, =0x0202420c _0814F446: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 - ldr r4, _0814F460 + ldr r4, =0x085cbda3 cmp r0, 0 beq _0814F456 b _0814F5C0 _0814F456: - ldr r4, _0814F464 + ldr r4, =0x085cbda7 b _0814F5C0 .align 2, 0 -_0814F45C: .4byte 0x0202420c -_0814F460: .4byte 0x085cbda3 -_0814F464: .4byte 0x085cbda7 + .pool _0814F468: - ldr r0, _0814F478 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _0814F47C + ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 beq _0814F484 - ldr r0, _0814F480 + ldr r0, =0x02038bcc b _0814F596 .align 2, 0 -_0814F478: .4byte 0x02022fec -_0814F47C: .4byte 0x003f0100 -_0814F480: .4byte 0x02038bcc + .pool _0814F484: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 beq _0814F49C - ldr r0, _0814F498 + ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_81D5530 b _0814F59C .align 2, 0 -_0814F498: .4byte 0x02038bcc + .pool _0814F49C: - ldr r2, _0814F4B0 - ldr r0, _0814F4B4 + ldr r2, =0x08310030 + ldr r0, =0x02038bcc ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 @@ -686677,116 +663736,106 @@ _0814F49C: movs r0, 0xD b _0814F5A2 .align 2, 0 -_0814F4B0: .4byte 0x08310030 -_0814F4B4: .4byte 0x02038bcc + .pool _0814F4B8: - ldr r0, _0814F4C8 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _0814F4CC + ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 beq _0814F4D4 - ldr r0, _0814F4D0 + ldr r0, =0x02038bcc b _0814F5B6 .align 2, 0 -_0814F4C8: .4byte 0x02022fec -_0814F4CC: .4byte 0x003f0100 -_0814F4D0: .4byte 0x02038bcc + .pool _0814F4D4: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 beq _0814F4F0 - ldr r0, _0814F4EC + ldr r0, =0x02038bcc ldrh r1, [r0] mov r0, sp bl sub_81D5554 b _0814F5BE .align 2, 0 -_0814F4EC: .4byte 0x02038bcc + .pool _0814F4F0: - ldr r0, _0814F500 + ldr r0, =0x02038bcc ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 - ldr r1, _0814F504 + ldr r1, =0x08310034 adds r4, r0, r1 b _0814F5C0 .align 2, 0 -_0814F500: .4byte 0x02038bcc -_0814F504: .4byte 0x08310034 + .pool _0814F508: - ldr r0, _0814F51C + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _0814F520 + ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 beq _0814F528 - ldr r0, _0814F524 + ldr r0, =0x02038bcc ldrh r1, [r0] movs r0, 0x2 b _0814F55A .align 2, 0 -_0814F51C: .4byte 0x02022fec -_0814F520: .4byte 0x003f0100 -_0814F524: .4byte 0x02038bcc + .pool _0814F528: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 beq _0814F540 - ldr r0, _0814F53C + ldr r0, =0x02038bcc ldrh r1, [r0] movs r0, 0x4 b _0814F584 .align 2, 0 -_0814F53C: .4byte 0x02038bcc + .pool _0814F540: bl sub_80B1CE0 adds r4, r0, 0 b _0814F5C0 _0814F548: - ldr r0, _0814F564 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r0, _0814F568 + ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 beq _0814F574 - ldr r0, _0814F56C + ldr r0, =0x02038bcc _0814F556: ldrh r1, [r0] movs r0, 0x1 _0814F55A: bl sub_81A36D0 - ldr r4, _0814F570 + ldr r4, =0x02021fc4 b _0814F5C0 .align 2, 0 -_0814F564: .4byte 0x02022fec -_0814F568: .4byte 0x003f0100 -_0814F56C: .4byte 0x02038bcc -_0814F570: .4byte 0x02021fc4 + .pool _0814F574: movs r0, 0x80 lsls r0, 19 ands r1, r0 cmp r1, 0 beq _0814F5C0 - ldr r0, _0814F58C + ldr r0, =0x02038bcc _0814F580: ldrh r1, [r0] movs r0, 0x3 _0814F584: bl sub_81D572C - ldr r4, _0814F590 + ldr r4, =0x02021fc4 b _0814F5C0 .align 2, 0 -_0814F58C: .4byte 0x02038bcc -_0814F590: .4byte 0x02021fc4 + .pool _0814F594: - ldr r0, _0814F5AC + ldr r0, =0x02038bce _0814F596: ldrh r0, [r0] _0814F598: @@ -686798,14 +663847,13 @@ _0814F5A0: movs r1, 0xD _0814F5A2: muls r1, r0 - ldr r0, _0814F5B0 + ldr r0, =0x0830fcd4 adds r4, r1, r0 b _0814F5C0 .align 2, 0 -_0814F5AC: .4byte 0x02038bce -_0814F5B0: .4byte 0x0830fcd4 + .pool _0814F5B4: - ldr r0, _0814F60C + ldr r0, =0x02038bce _0814F5B6: ldrh r1, [r0] _0814F5B8: @@ -686856,7 +663904,7 @@ _0814F5F6: adds r6, 0x1 b _0814F61C .align 2, 0 -_0814F60C: .4byte 0x02038bce + .pool _0814F610: mov r3, r8 adds r0, r3, r6 @@ -686915,12 +663963,12 @@ _0814F666: b _0814F8E0 _0814F672: lsls r0, r1, 2 - ldr r1, _0814F67C + ldr r1, =_0814F680 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0814F67C: .4byte _0814F680 + .pool .align 2, 0 _0814F680: .4byte _0814F6AC @@ -686940,14 +663988,14 @@ _0814F6AC: ldrb r0, [r0, 0x2] lsls r0, 8 orrs r1, r0 - ldr r0, _0814F6C4 + ldr r0, =0x085cc270 subs r1, 0xC lsls r1, 2 adds r1, r0 ldr r1, [r1] b _0814F8BE .align 2, 0 -_0814F6C4: .4byte 0x085cc270 + .pool _0814F6C8: ldrb r0, [r4, 0x1] cmp r0, 0x2 @@ -687004,20 +664052,20 @@ _0814F71C: orrs r1, r0 movs r0, 0xD muls r1, r0 - ldr r0, _0814F730 + ldr r0, =0x0831977c adds r1, r0 b _0814F8BE .align 2, 0 -_0814F730: .4byte 0x0831977c + .pool _0814F734: adds r0, r5, r7 ldrb r0, [r0, 0x1] lsls r1, r0, 3 subs r1, r0 - ldr r0, _0814F740 + ldr r0, =0x0831ae38 b _0814F846 .align 2, 0 -_0814F740: .4byte 0x0831ae38 + .pool _0814F744: ldrb r0, [r4, 0x1] bl battle_side_get_owner @@ -687027,30 +664075,29 @@ _0814F744: ldrb r1, [r4, 0x2] movs r0, 0x64 muls r0, r1 - ldr r1, _0814F764 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp bl pokemon_getattr b _0814F7A4 .align 2, 0 -_0814F764: .4byte 0x020244ec + .pool _0814F768: - ldr r0, _0814F780 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 beq _0814F788 - ldr r1, _0814F784 + ldr r1, =0x085cbd8b adds r0, r6, 0 bl gf_strcat b _0814F790 .align 2, 0 -_0814F780: .4byte 0x02022fec -_0814F784: .4byte 0x085cbd8b + .pool _0814F788: - ldr r1, _0814F7B4 + ldr r1, =0x085cbd85 adds r0, r6, 0 bl gf_strcat _0814F790: @@ -687058,7 +664105,7 @@ _0814F790: ldrb r1, [r0, 0x2] movs r0, 0x64 muls r0, r1 - ldr r1, _0814F7B8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2 mov r2, sp @@ -687071,10 +664118,9 @@ _0814F7A4: bl gf_strcat b _0814F8DE .align 2, 0 -_0814F7B4: .4byte 0x085cbd85 -_0814F7B8: .4byte 0x02024744 + .pool _0814F7BC: - ldr r1, _0814F7CC + ldr r1, =0x085cbe00 adds r0, r5, r7 ldrb r0, [r0, 0x1] lsls r0, 2 @@ -687082,7 +664128,7 @@ _0814F7BC: ldr r1, [r0] b _0814F848 .align 2, 0 -_0814F7CC: .4byte 0x085cbe00 + .pool _0814F7D0: adds r0, r5, r7 ldrb r1, [r0, 0x1] @@ -687102,19 +664148,19 @@ _0814F7E2: ldrb r1, [r4, 0x2] movs r0, 0x64 muls r0, r1 - ldr r1, _0814F804 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 adds r2, r6, 0 bl pokemon_getattr b _0814F81A .align 2, 0 -_0814F804: .4byte 0x020244ec + .pool _0814F808: ldrb r1, [r4, 0x2] movs r0, 0x64 muls r0, r1 - ldr r1, _0814F824 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2 adds r2, r6, 0 @@ -687124,9 +664170,9 @@ _0814F81A: bl get_end_of_string_ptr_limit_10_chars b _0814F8DE .align 2, 0 -_0814F824: .4byte 0x02024744 + .pool _0814F828: - ldr r1, _0814F838 + ldr r1, =0x085cbe6c adds r0, r5, r7 ldrb r0, [r0, 0x1] lsls r0, 2 @@ -687134,13 +664180,13 @@ _0814F828: ldr r1, [r0] b _0814F848 .align 2, 0 -_0814F838: .4byte 0x085cbe6c + .pool _0814F83C: adds r0, r5, r7 ldrb r1, [r0, 0x1] movs r0, 0xD muls r1, r0 - ldr r0, _0814F854 + ldr r0, =0x0831b6db _0814F846: adds r1, r0 _0814F848: @@ -687149,30 +664195,30 @@ _0814F848: adds r5, 0x2 b _0814F8E0 .align 2, 0 -_0814F854: .4byte 0x0831b6db + .pool _0814F858: adds r0, r5, r7 ldrb r2, [r0, 0x1] ldrb r0, [r0, 0x2] lsls r0, 8 orrs r2, r0 - ldr r0, _0814F8A0 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0814F8A4 + ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 beq _0814F8D6 cmp r2, 0xAF bne _0814F8CC - ldr r2, _0814F8A8 - ldr r0, _0814F8AC + ldr r2, =0x020229e8 + ldr r0, =0x02024474 adds r0, 0x25 ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _0814F8B0 + ldr r1, =0x0202420f ldrb r2, [r1] ldrh r0, [r0, 0x18] cmp r0, r2 @@ -687180,28 +664226,22 @@ _0814F858: lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r0, _0814F8B4 + ldr r0, =0x02024404 adds r1, r0 adds r0, r6, 0 bl gf_strcpy - ldr r1, _0814F8B8 + ldr r1, =0x085cc0ad b _0814F8BE .align 2, 0 -_0814F8A0: .4byte 0x02022fec -_0814F8A4: .4byte 0x02000002 -_0814F8A8: .4byte 0x020229e8 -_0814F8AC: .4byte 0x02024474 -_0814F8B0: .4byte 0x0202420f -_0814F8B4: .4byte 0x02024404 -_0814F8B8: .4byte 0x085cc0ad + .pool _0814F8BC: - ldr r1, _0814F8C8 + ldr r1, =0x085cc0a0 _0814F8BE: adds r0, r6, 0 bl gf_strcat b _0814F8DE .align 2, 0 -_0814F8C8: .4byte 0x085cc0a0 + .pool _0814F8CC: adds r0, r2, 0 adds r1, r6, 0 @@ -687233,8 +664273,8 @@ sub_814F8F8: @ 814F8F8 push {r4,r5,lr} adds r4, r0, 0 movs r2, 0 - ldr r5, _0814F92C - ldr r3, _0814F930 + ldr r5, =0x0203aba8 + ldr r3, =0x085cd336 _0814F902: cmp r2, 0x4 beq _0814F918 @@ -687253,18 +664293,16 @@ _0814F918: blt _0814F944 cmp r2, 0x2 bgt _0814F938 - ldr r1, _0814F934 + ldr r1, =0x085ccbb5 adds r0, r4, 0 bl gf_strcpy b _0814F944 .align 2, 0 -_0814F92C: .4byte 0x0203aba8 -_0814F930: .4byte 0x085cd336 -_0814F934: .4byte 0x085ccbb5 + .pool _0814F938: cmp r2, 0x4 bgt _0814F944 - ldr r1, _0814F94C + ldr r1, =0x085ccbb9 adds r0, r4, 0 bl gf_strcpy _0814F944: @@ -687272,7 +664310,7 @@ _0814F944: pop {r0} bx r0 .align 2, 0 -_0814F94C: .4byte 0x085ccbb9 + .pool thumb_func_end sub_814F8F8 thumb_func_start sub_814F950 @@ -687287,8 +664325,8 @@ _0814F95A: ldrb r0, [r3] cmp r0, 0xFF bne _0814F958 - ldr r1, _0814F990 - ldr r5, _0814F994 + ldr r1, =0x085cd336 + ldr r5, =0x0203aba8 movs r0, 0 lsls r0, 1 adds r2, r0, r1 @@ -687309,14 +664347,12 @@ _0814F976: bhi _0814F9E0 _0814F984: lsls r0, r4, 2 - ldr r1, _0814F998 + ldr r1, =_0814F99C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0814F990: .4byte 0x085cd336 -_0814F994: .4byte 0x0203aba8 -_0814F998: .4byte _0814F99C + .pool .align 2, 0 _0814F99C: .4byte _0814F9B0 @@ -687325,30 +664361,30 @@ _0814F99C: .4byte _0814F9C8 .4byte _0814F9D8 _0814F9B0: - ldr r1, _0814F9B4 + ldr r1, =0x085cbdb7 b _0814F9CA .align 2, 0 -_0814F9B4: .4byte 0x085cbdb7 + .pool _0814F9B8: - ldr r1, _0814F9BC + ldr r1, =0x085cbdb9 b _0814F9CA .align 2, 0 -_0814F9BC: .4byte 0x085cbdb9 + .pool _0814F9C0: - ldr r1, _0814F9C4 + ldr r1, =0x085cbdbb b _0814F9CA .align 2, 0 -_0814F9C4: .4byte 0x085cbdbb + .pool _0814F9C8: - ldr r1, _0814F9D4 + ldr r1, =0x085cbdbd _0814F9CA: adds r0, r3, 0 bl gf_strcpy b _0814F9E0 .align 2, 0 -_0814F9D4: .4byte 0x085cbdbd + .pool _0814F9D8: - ldr r1, _0814F9E8 + ldr r1, =0x085cbdbf adds r0, r3, 0 bl gf_strcpy _0814F9E0: @@ -687356,7 +664392,7 @@ _0814F9E0: pop {r0} bx r0 .align 2, 0 -_0814F9E8: .4byte 0x085cbdbf + .pool thumb_func_end sub_814F950 thumb_func_start battle_show_message_maybe @@ -687369,8 +664405,8 @@ battle_show_message_maybe: @ 814F9EC adds r4, r0, 0 lsls r1, 24 lsrs r7, r1, 24 - ldr r1, _0814FA1C - ldr r0, _0814FA20 + ldr r1, =0x085cd660 + ldr r0, =0x02024474 adds r0, 0x24 ldrb r0, [r0] lsls r0, 2 @@ -687386,8 +664422,7 @@ battle_show_message_maybe: @ 814F9EC movs r0, 0 b _0814FA36 .align 2, 0 -_0814FA1C: .4byte 0x085cd660 -_0814FA20: .4byte 0x02024474 + .pool _0814FA24: lsls r0, r7, 1 adds r0, r7 @@ -687452,7 +664487,7 @@ _0814FA36: ldrb r0, [r0, 0x6] cmp r0, 0xFF bne _0814FAC6 - ldr r0, _0814FAD8 + ldr r0, =0x02024474 adds r0, 0x24 ldrb r0, [r0] adds r1, r7, 0 @@ -687471,26 +664506,25 @@ _0814FA36: _0814FAC6: cmp r7, 0x16 bne _0814FAE0 - ldr r0, _0814FADC + ldr r0, =0x03003014 ldrb r2, [r0] movs r1, 0x3 negs r1, r1 ands r1, r2 b _0814FAE8 .align 2, 0 -_0814FAD8: .4byte 0x02024474 -_0814FADC: .4byte 0x03003014 + .pool _0814FAE0: - ldr r0, _0814FB04 + ldr r0, =0x03003014 ldrb r1, [r0] movs r2, 0x2 orrs r1, r2 _0814FAE8: strb r1, [r0] adds r3, r0, 0 - ldr r0, _0814FB08 + ldr r0, =0x02022fec ldr r1, [r0] - ldr r2, _0814FB0C + ldr r2, =0x01000002 ands r1, r2 adds r2, r0, 0 cmp r1, 0 @@ -687500,9 +664534,7 @@ _0814FAE8: orrs r0, r1 b _0814FB18 .align 2, 0 -_0814FB04: .4byte 0x03003014 -_0814FB08: .4byte 0x02022fec -_0814FB0C: .4byte 0x01000002 + .pool _0814FB10: ldrb r1, [r3] movs r0, 0x5 @@ -687516,21 +664548,21 @@ _0814FB18: bne _0814FB6C _0814FB22: ldr r1, [r2] - ldr r0, _0814FB30 + ldr r0, =0x02000002 ands r0, r1 cmp r0, 0 beq _0814FB34 movs r6, 0x1 b _0814FB5C .align 2, 0 -_0814FB30: .4byte 0x02000002 + .pool _0814FB34: movs r0, 0x80 lsls r0, 17 ands r1, r0 cmp r1, 0 beq _0814FB54 - ldr r4, _0814FB50 + ldr r4, =0x085cd668 bl sub_8185FC4 lsls r0, 24 lsrs r0, 24 @@ -687538,20 +664570,20 @@ _0814FB34: ldrb r6, [r0] b _0814FB5C .align 2, 0 -_0814FB50: .4byte 0x085cd668 + .pool _0814FB54: bl sav2_get_text_speed lsls r0, 24 lsrs r6, r0, 24 _0814FB5C: - ldr r0, _0814FB68 + ldr r0, =0x03003014 ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] b _0814FB7E .align 2, 0 -_0814FB68: .4byte 0x03003014 + .pool _0814FB6C: adds r0, r6, r7 lsls r0, 2 @@ -687588,13 +664620,13 @@ _0814FB9C: thumb_func_start sub_814FBAC sub_814FBAC: @ 814FBAC push {r4,r5,lr} - ldr r0, _0814FC08 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r1, r2, 9 - ldr r0, _0814FC0C + ldr r0, =0x02023068 adds r1, r0 - ldr r4, _0814FC10 - ldr r0, _0814FC14 + ldr r4, =0x08d85620 + ldr r0, =0x020244b0 adds r2, r0 ldrb r2, [r2] adds r0, r1, 0 @@ -687606,7 +664638,7 @@ sub_814FBAC: @ 814FBAC ldrb r1, [r1] bl sub_814FC20 lsls r0, 24 - ldr r5, _0814FC18 + ldr r5, =0x02037714 lsrs r0, 22 adds r0, r4 ldrh r1, [r0] @@ -687616,7 +664648,7 @@ sub_814FBAC: @ 814FBAC ldrh r0, [r0, 0x2] adds r5, 0xB6 strh r0, [r5] - ldr r4, _0814FC1C + ldr r4, =0x02037bcc adds r0, r2, 0 adds r1, r4, 0 movs r2, 0x1 @@ -687630,12 +664662,7 @@ sub_814FBAC: @ 814FBAC pop {r0} bx r0 .align 2, 0 -_0814FC08: .4byte 0x02024064 -_0814FC0C: .4byte 0x02023068 -_0814FC10: .4byte 0x08d85620 -_0814FC14: .4byte 0x020244b0 -_0814FC18: .4byte 0x02037714 -_0814FC1C: .4byte 0x02037bcc + .pool thumb_func_end sub_814FBAC thumb_func_start sub_814FC20 @@ -687693,13 +664720,13 @@ sub_814FC70: @ 814FC70 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0814FC94 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0814FC8E - ldr r0, _0814FC98 + ldr r0, =sub_814FCC8 + 1 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -687708,8 +664735,7 @@ _0814FC8E: pop {r0} bx r0 .align 2, 0 -_0814FC94: .4byte 0x02037fd4 -_0814FC98: .4byte sub_814FCC8 + 1 + .pool thumb_func_end sub_814FC70 thumb_func_start sub_814FC9C @@ -687717,7 +664743,7 @@ sub_814FC9C: @ 814FC9C push {lr} sub sp, 0x4 bl script_env_2_enable - ldr r0, _0814FCC4 + ldr r0, =sub_814FC70 + 1 movs r1, 0x1 bl AddTask movs r0, 0x1 @@ -687731,7 +664757,7 @@ sub_814FC9C: @ 814FC9C pop {r0} bx r0 .align 2, 0 -_0814FCC4: .4byte sub_814FC70 + 1 + .pool thumb_func_end sub_814FC9C thumb_func_start sub_814FCC8 @@ -687743,7 +664769,7 @@ sub_814FCC8: @ 814FCC8 sub sp, 0x18 movs r4, 0 str r4, [sp, 0x14] - ldr r1, _0814FCF0 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -687752,13 +664778,12 @@ sub_814FCC8: @ 814FCC8 cmp r0, 0x9 bhi _0814FD20 lsls r0, 2 - ldr r1, _0814FCF4 + ldr r1, =_0814FCF8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0814FCF0: .4byte 0x030022c0 -_0814FCF4: .4byte _0814FCF8 + .pool .align 2, 0 _0814FCF8: .4byte _0814FD20 @@ -687785,10 +664810,10 @@ _0814FD20: mov r9, r0 add r2, sp, 0xC movs r6, 0 - ldr r1, _0814FDC4 + ldr r1, =0x040000d4 movs r5, 0x80 lsls r5, 5 - ldr r7, _0814FDC8 + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r8, r0 @@ -687818,7 +664843,7 @@ _0814FD4E: lsls r3, 3 movs r4, 0 str r4, [sp, 0x10] - ldr r2, _0814FDC4 + ldr r2, =0x040000d4 mov r1, r9 str r1, [r2] str r0, [r2, 0x4] @@ -687840,11 +664865,11 @@ _0814FD4E: orrs r3, r0 str r3, [r2, 0x8] ldr r0, [r2, 0x8] - ldr r4, _0814FDCC - ldr r0, _0814FDD0 + ldr r4, =0x0203abac + ldr r0, =0x00004110 bl malloc_and_clear str r0, [r4] - ldr r1, _0814FDD4 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -687852,11 +664877,7 @@ _0814FD4E: adds r0, 0x1 b _08150224 .align 2, 0 -_0814FDC4: .4byte 0x040000d4 -_0814FDC8: .4byte 0x81000800 -_0814FDCC: .4byte 0x0203abac -_0814FDD0: .4byte 0x00004110 -_0814FDD4: .4byte 0x030022c0 + .pool _0814FDD8: bl reset_all_obj_data bl clear_tasks @@ -687865,7 +664886,7 @@ _0814FDD8: bl reset_temp_tile_data_buffers bl sub_80AAFA4 movs r4, 0 - ldr r0, _0814FE6C + ldr r0, =0x0854c14c ldr r0, [r0] adds r1, r0, 0 adds r1, 0xF0 @@ -687883,36 +664904,36 @@ _0814FDFC: bl map_music_set_to_zero movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0814FE70 + ldr r1, =0x085cd66c movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r4, _0814FE74 + ldr r4, =0x0203abac ldr r1, [r4] adds r1, 0xFC movs r0, 0 bl bg_set_tilemap ldr r1, [r4] - ldr r3, _0814FE78 + ldr r3, =0x000010fc adds r1, r3 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _0814FE7C + ldr r0, =0x000020fc adds r1, r0 movs r0, 0x2 bl bg_set_tilemap ldr r1, [r4] - ldr r2, _0814FE80 + ldr r2, =0x000030fc adds r1, r2 movs r0, 0x3 bl bg_set_tilemap - ldr r2, _0814FE84 - ldr r1, _0814FE88 + ldr r2, =0x02021bbc + ldr r1, =0x02021bbe movs r0, 0 strh r0, [r1] strh r0, [r2] - ldr r1, _0814FE8C + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -687920,19 +664941,11 @@ _0814FDFC: adds r0, 0x1 b _08150224 .align 2, 0 -_0814FE6C: .4byte 0x0854c14c -_0814FE70: .4byte 0x085cd66c -_0814FE74: .4byte 0x0203abac -_0814FE78: .4byte 0x000010fc -_0814FE7C: .4byte 0x000020fc -_0814FE80: .4byte 0x000030fc -_0814FE84: .4byte 0x02021bbc -_0814FE88: .4byte 0x02021bbe -_0814FE8C: .4byte 0x030022c0 + .pool _0814FE90: movs r4, 0 add r5, sp, 0x14 - ldr r6, _0814FF18 + ldr r6, =0x085cdb54 _0814FE96: lsls r0, r4, 3 adds r0, r6 @@ -687942,17 +664955,17 @@ _0814FE96: lsrs r4, r0, 24 cmp r4, 0x2 bls _0814FE96 - ldr r0, _0814FF1C + ldr r0, =0x085cdb74 bl gpu_pal_obj_alloc_and_load_multiple - ldr r0, _0814FF20 + ldr r0, =0x085cd67c adds r1, r5, 0 bl malloc_and_decompress - ldr r4, _0814FF24 + ldr r4, =0x0203abac ldr r1, [r4] - ldr r2, _0814FF28 + ldr r2, =0x000040fc adds r1, r2 str r0, [r1] - ldr r0, _0814FF2C + ldr r0, =0x085cd7d4 adds r1, r5, 0 bl malloc_and_decompress ldr r1, [r4] @@ -687960,31 +664973,31 @@ _0814FE96: lsls r3, 7 adds r1, r3 str r0, [r1] - ldr r0, _0814FF30 + ldr r0, =0x085cd958 adds r1, r5, 0 bl malloc_and_decompress ldr r1, [r4] - ldr r2, _0814FF34 + ldr r2, =0x00004104 adds r1, r2 str r0, [r1] - ldr r0, _0814FF38 + ldr r0, =0x085cdb30 adds r1, r5, 0 bl malloc_and_decompress ldr r1, [r4] - ldr r3, _0814FF3C + ldr r3, =0x0000410c adds r2, r1, r3 str r0, [r2] - ldr r0, _0814FF40 + ldr r0, =0x00004108 adds r1, r0 - ldr r0, _0814FF44 + ldr r0, =0x085cdb1c str r0, [r1] - ldr r1, _0814FF48 + ldr r1, =0x08dba5b8 movs r0, 0 str r0, [sp] movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _0814FF4C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -687992,20 +665005,7 @@ _0814FE96: adds r0, 0x1 b _08150224 .align 2, 0 -_0814FF18: .4byte 0x085cdb54 -_0814FF1C: .4byte 0x085cdb74 -_0814FF20: .4byte 0x085cd67c -_0814FF24: .4byte 0x0203abac -_0814FF28: .4byte 0x000040fc -_0814FF2C: .4byte 0x085cd7d4 -_0814FF30: .4byte 0x085cd958 -_0814FF34: .4byte 0x00004104 -_0814FF38: .4byte 0x085cdb30 -_0814FF3C: .4byte 0x0000410c -_0814FF40: .4byte 0x00004108 -_0814FF44: .4byte 0x085cdb1c -_0814FF48: .4byte 0x08dba5b8 -_0814FF4C: .4byte 0x030022c0 + .pool _0814FF50: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -688013,11 +665013,11 @@ _0814FF50: beq _0814FF5C b _08150226 _0814FF5C: - ldr r0, _0814FF74 + ldr r0, =0x08dba518 movs r1, 0 movs r2, 0x80 bl gpu_pal_apply - ldr r1, _0814FF78 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -688025,12 +665025,11 @@ _0814FF5C: adds r0, 0x1 b _08150224 .align 2, 0 -_0814FF74: .4byte 0x08dba518 -_0814FF78: .4byte 0x030022c0 + .pool _0814FF7C: bl sub_8150D28 bl run_active_tasks - ldr r1, _0814FF94 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -688038,9 +665037,9 @@ _0814FF7C: adds r0, 0x1 b _08150224 .align 2, 0 -_0814FF94: .4byte 0x030022c0 + .pool _0814FF98: - ldr r0, _0814FFB0 + ldr r0, =0x0203abac ldr r0, [r0] ldrb r0, [r0, 0x2] cmp r0, 0x7 @@ -688052,9 +665051,9 @@ _0814FF98: adds r0, 0x1 b _08150224 .align 2, 0 -_0814FFB0: .4byte 0x0203abac + .pool _0814FFB4: - ldr r0, _0814FFF4 + ldr r0, =0x0854c14c ldr r0, [r0] adds r1, r0, 0 adds r1, 0xF0 @@ -688090,9 +665089,9 @@ _0814FFDE: adds r0, 0x1 b _08150224 .align 2, 0 -_0814FFF4: .4byte 0x0854c14c + .pool _0814FFF8: - ldr r6, _0815007C + ldr r6, =0x0203abac ldr r0, [r6] movs r1, 0x82 lsls r1, 7 @@ -688109,7 +665108,7 @@ _0814FFF8: movs r3, 0x11 bl bg_copy_tilemap_rect_simple ldr r0, [r6] - ldr r2, _08150080 + ldr r2, =0x00004104 adds r0, r2 ldr r1, [r0] movs r0, 0x1E @@ -688123,7 +665122,7 @@ _0814FFF8: movs r3, 0 bl bg_copy_tilemap_rect_simple ldr r0, [r6] - ldr r1, _08150084 + ldr r1, =0x00004108 adds r0, r1 ldr r1, [r0] movs r0, 0x5 @@ -688136,7 +665135,7 @@ _0814FFF8: movs r3, 0 bl bg_copy_tilemap_rect_simple ldr r0, [r6] - ldr r2, _08150088 + ldr r2, =0x0000410c adds r0, r2 ldr r1, [r0] str r4, [sp] @@ -688147,7 +665146,7 @@ _0814FFF8: movs r2, 0 movs r3, 0x2 bl bg_copy_tilemap_rect_simple - ldr r1, _0815008C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -688155,19 +665154,15 @@ _0814FFF8: adds r0, 0x1 b _08150224 .align 2, 0 -_0815007C: .4byte 0x0203abac -_08150080: .4byte 0x00004104 -_08150084: .4byte 0x00004108 -_08150088: .4byte 0x0000410c -_0815008C: .4byte 0x030022c0 + .pool _08150090: - ldr r0, _08150180 + ldr r0, =0x020375e0 ldrb r0, [r0] bl sub_81514C8 - ldr r1, _08150184 + ldr r1, =0x0203abac mov r9, r1 ldr r0, [r1] - ldr r2, _08150188 + ldr r2, =0x000040fc mov r8, r2 add r0, r8 ldr r1, [r0] @@ -688265,7 +665260,7 @@ _08150090: movs r2, 0x18 movs r3, 0x17 bl bg_copy_tilemap_rect_simple - ldr r1, _0815018C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -688273,10 +665268,7 @@ _08150090: adds r0, 0x1 b _08150224 .align 2, 0 -_08150180: .4byte 0x020375e0 -_08150184: .4byte 0x0203abac -_08150188: .4byte 0x000040fc -_0815018C: .4byte 0x030022c0 + .pool _08150190: movs r0, 0x1 negs r0, r0 @@ -688286,12 +665278,12 @@ _08150190: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _081501C0 + ldr r0, =0x000001a9 movs r1, 0x1 bl sub_80A3194 movs r0, 0x1 bl sub_8150B6C - ldr r1, _081501C4 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 @@ -688299,46 +665291,39 @@ _08150190: adds r0, 0x1 b _08150224 .align 2, 0 -_081501C0: .4byte 0x000001a9 -_081501C4: .4byte 0x030022c0 + .pool _081501C8: - ldr r3, _081501FC + ldr r3, =0x04000208 ldrh r2, [r3] movs r0, 0 strh r0, [r3] - ldr r4, _08150200 + ldr r4, =0x04000200 ldrh r0, [r4] movs r1, 0x1 orrs r0, r1 strh r0, [r4] strh r2, [r3] - ldr r0, _08150204 + ldr r0, =sub_8150800 + 1 bl SetVBlankCallback - ldr r0, _08150208 + ldr r0, =mainloop + 1 bl set_callback2 - ldr r0, _0815020C + ldr r0, =sub_81503E4 + 1 movs r1, 0 bl AddTask - ldr r0, _08150210 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne _08150218 - ldr r0, _08150214 + ldr r0, =sub_8150550 + 1 b _0815021A .align 2, 0 -_081501FC: .4byte 0x04000208 -_08150200: .4byte 0x04000200 -_08150204: .4byte sub_8150800 + 1 -_08150208: .4byte mainloop + 1 -_0815020C: .4byte sub_81503E4 + 1 -_08150210: .4byte 0x020375e0 -_08150214: .4byte sub_8150550 + 1 + .pool _08150218: - ldr r0, _08150234 + ldr r0, =sub_8150664 + 1 _0815021A: movs r1, 0x1 bl AddTask - ldr r1, _08150238 + ldr r1, =0x0203abac ldr r1, [r1] _08150224: strb r0, [r1] @@ -688351,8 +665336,7 @@ _08150226: pop {r0} bx r0 .align 2, 0 -_08150234: .4byte sub_8150664 + 1 -_08150238: .4byte 0x0203abac + .pool thumb_func_end sub_814FCC8 thumb_func_start mainloop @@ -688384,13 +665368,13 @@ c2_8011A1C: @ 8150258 bl gpu_sync_bg_hide movs r0, 0 bl sub_8150B6C - ldr r0, _081503B8 + ldr r0, =0x02021bbc strh r4, [r0] movs r0, 0 bl sub_80AB130 add r0, sp, 0x4 mov r8, r0 - ldr r0, _081503BC + ldr r0, =0x0854c14c ldr r0, [r0] adds r1, r0, 0 adds r1, 0xF0 @@ -688417,20 +665401,20 @@ _08150298: bl bg_unset_tilemap movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r6, _081503C0 + ldr r6, =0x0203abac ldr r0, [r6] - ldr r2, _081503C4 + ldr r2, =0x00004108 adds r1, r0, r2 movs r5, 0 str r5, [r1] - ldr r4, _081503C8 + ldr r4, =0x0000410c adds r0, r4 ldr r0, [r0] bl free ldr r0, [r6] adds r4, r0, r4 str r5, [r4] - ldr r4, _081503CC + ldr r4, =0x00004104 adds r0, r4 ldr r0, [r0] bl free @@ -688445,7 +665429,7 @@ _08150298: ldr r0, [r6] adds r4, r0, r4 str r5, [r4] - ldr r4, _081503D0 + ldr r4, =0x000040fc adds r0, r4 ldr r0, [r0] bl free @@ -688460,10 +665444,10 @@ _08150298: lsls r3, 9 mov r4, sp movs r6, 0 - ldr r1, _081503D4 + ldr r1, =0x040000d4 movs r5, 0x80 lsls r5, 5 - ldr r7, _081503D8 + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -688493,7 +665477,7 @@ _08150340: lsls r3, 3 movs r4, 0 str r4, [sp, 0x4] - ldr r2, _081503D4 + ldr r2, =0x040000d4 mov r1, r8 str r1, [r2] str r0, [r2, 0x4] @@ -688516,9 +665500,9 @@ _08150340: str r3, [r2, 0x8] ldr r0, [r2, 0x8] bl warp_in - ldr r0, _081503DC + ldr r0, =0x03005dac str r4, [r0] - ldr r0, _081503E0 + ldr r0, =c2_load_new_map + 1 bl set_callback2 add sp, 0x8 pop {r3} @@ -688527,17 +665511,7 @@ _08150340: pop {r0} bx r0 .align 2, 0 -_081503B8: .4byte 0x02021bbc -_081503BC: .4byte 0x0854c14c -_081503C0: .4byte 0x0203abac -_081503C4: .4byte 0x00004108 -_081503C8: .4byte 0x0000410c -_081503CC: .4byte 0x00004104 -_081503D0: .4byte 0x000040fc -_081503D4: .4byte 0x040000d4 -_081503D8: .4byte 0x81000800 -_081503DC: .4byte 0x03005dac -_081503E0: .4byte c2_load_new_map + 1 + .pool thumb_func_end c2_8011A1C thumb_func_start sub_81503E4 @@ -688547,7 +665521,7 @@ sub_81503E4: @ 81503E4 lsls r0, 24 lsrs r6, r0, 24 movs r4, 0 - ldr r5, _08150410 + ldr r5, =0x0203abac ldr r3, [r5] ldrh r0, [r3, 0x6] adds r0, 0x1 @@ -688564,7 +665538,7 @@ sub_81503E4: @ 81503E4 beq _0815043C b _08150542 .align 2, 0 -_08150410: .4byte 0x0203abac + .pool _08150414: cmp r2, 0x3 bne _0815041A @@ -688597,7 +665571,7 @@ _0815043C: beq _08150448 b _08150542 _08150448: - ldr r0, _0815048C + ldr r0, =0x0854c14c ldr r0, [r0] adds r2, r0, 0 adds r2, 0xF0 @@ -688633,9 +665607,9 @@ _08150478: strb r0, [r1, 0x1] b _08150542 .align 2, 0 -_0815048C: .4byte 0x0854c14c + .pool _08150490: - ldr r0, _081504A4 + ldr r0, =0x0854c14c ldr r2, [r0] movs r1, 0xDA lsls r1, 3 @@ -688646,7 +665620,7 @@ _08150490: strb r0, [r3, 0x1] b _08150542 .align 2, 0 -_081504A4: .4byte 0x0854c14c + .pool _081504A8: ldrh r1, [r3, 0x6] ldrh r0, [r3, 0x4] @@ -688685,7 +665659,7 @@ _081504DE: b _08150542 _081504EA: lsls r1, r0, 16 - ldr r0, _0815050C + ldr r0, =0x023a0000 cmp r1, r0 bne _08150542 movs r0, 0x3 @@ -688700,9 +665674,9 @@ _081504EA: bl play_sound_effect b _08150542 .align 2, 0 -_0815050C: .4byte 0x023a0000 + .pool _08150510: - ldr r0, _08150524 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -688712,7 +665686,7 @@ _08150510: strb r0, [r3, 0x1] b _08150542 .align 2, 0 -_08150524: .4byte 0x02037fd4 + .pool _08150528: movs r0, 0 bl SetVBlankCallback @@ -688721,7 +665695,7 @@ _08150528: ldr r0, [r5] ldrb r0, [r0] bl remove_task - ldr r0, _0815054C + ldr r0, =c2_8011A1C + 1 bl set_callback2 _08150542: add sp, 0x4 @@ -688729,14 +665703,14 @@ _08150542: pop {r0} bx r0 .align 2, 0 -_0815054C: .4byte c2_8011A1C + 1 + .pool thumb_func_end sub_81503E4 thumb_func_start sub_8150550 sub_8150550: @ 8150550 push {r4-r6,lr} sub sp, 0xC - ldr r6, _081505A4 + ldr r6, =0x0203abac ldr r1, [r6] ldrb r0, [r1, 0x1] cmp r0, 0xFF @@ -688778,7 +665752,7 @@ _08150590: beq _081505F4 b _08150630 .align 2, 0 -_081505A4: .4byte 0x0203abac + .pool _081505A8: cmp r1, 0x28 beq _081505CA @@ -688820,7 +665794,7 @@ _081505EC: bl Bg_FillWramTileMapRectWithTileAndPalette b _08150630 _081505F4: - ldr r1, _08150658 + ldr r1, =0x00004108 adds r0, r1 ldr r1, [r0] movs r0, 0x5 @@ -688834,7 +665808,7 @@ _081505F4: movs r3, 0 bl bg_copy_tilemap_rect_simple ldr r0, [r6] - ldr r1, _0815065C + ldr r1, =0x0000410c adds r0, r1 ldr r1, [r0] str r4, [sp] @@ -688850,7 +665824,7 @@ _081505F4: strb r0, [r1, 0x15] _08150630: bl sub_815115C - ldr r3, _08150660 + ldr r3, =0x02021bbc movs r0, 0 ldrsh r2, [r3, r0] adds r1, r2, 0x1 @@ -688869,16 +665843,14 @@ _08150646: pop {r0} bx r0 .align 2, 0 -_08150658: .4byte 0x00004108 -_0815065C: .4byte 0x0000410c -_08150660: .4byte 0x02021bbc + .pool thumb_func_end sub_8150550 thumb_func_start sub_8150664 sub_8150664: @ 8150664 push {r4-r7,lr} sub sp, 0xC - ldr r7, _081506B8 + ldr r7, =0x0203abac ldr r1, [r7] ldrb r0, [r1, 0x1] cmp r0, 0xFF @@ -688922,13 +665894,13 @@ _081506A6: beq _081506E8 b _081507B6 .align 2, 0 -_081506B8: .4byte 0x0203abac + .pool _081506BC: cmp r1, 0x28 beq _08150784 cmp r1, 0xB0 bne _081507B6 - ldr r1, _081506E4 + ldr r1, =0x0000410c adds r0, r1 ldr r1, [r0] movs r0, 0x2 @@ -688943,7 +665915,7 @@ _081506BC: bl bg_copy_tilemap_rect_simple b _081507B6 .align 2, 0 -_081506E4: .4byte 0x0000410c + .pool _081506E8: movs r0, 0x3 str r0, [sp] @@ -688969,7 +665941,7 @@ _081506E8: strb r0, [r1, 0x15] b _081507B6 _0815071A: - ldr r5, _08150780 + ldr r5, =0x00004108 adds r0, r5 ldr r0, [r0] ldrh r1, [r0, 0x4] @@ -689016,9 +665988,9 @@ _0815071A: bl Bg_FillWramTileMapRectWithTileAndPalette b _081507B6 .align 2, 0 -_08150780: .4byte 0x00004108 + .pool _08150784: - ldr r5, _081507D0 + ldr r5, =0x00004108 adds r0, r5 ldr r0, [r0] ldrh r1, [r0, 0x8] @@ -689043,24 +666015,22 @@ _08150784: bl Bg_FillWramTileMapRectWithTileAndPalette _081507B6: bl sub_81511B8 - ldr r0, _081507D4 + ldr r0, =0x0203abac ldr r1, [r0] ldrh r0, [r1, 0x6] ldrh r1, [r1, 0x4] cmp r0, r1 bcs _081507DC - ldr r4, _081507D8 + ldr r4, =0x02021bbc movs r1, 0 ldrsh r0, [r4, r1] b _081507E6 .align 2, 0 -_081507D0: .4byte 0x00004108 -_081507D4: .4byte 0x0203abac -_081507D8: .4byte 0x02021bbc + .pool _081507DC: - ldr r0, _081507F8 + ldr r0, =0x0854c14c ldr r4, [r0] - ldr r0, _081507FC + ldr r0, =0x000006fc adds r4, r0 ldrh r0, [r4] _081507E6: @@ -689073,8 +666043,7 @@ _081507E6: pop {r0} bx r0 .align 2, 0 -_081507F8: .4byte 0x0854c14c -_081507FC: .4byte 0x000006fc + .pool thumb_func_end sub_8150664 thumb_func_start sub_8150800 @@ -689084,7 +666053,7 @@ sub_8150800: @ 8150800 bl gpu_copy_wram_bg_tilemap_to_vram movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r4, _08150860 + ldr r4, =0x0203abac ldr r0, [r4] ldrb r1, [r0, 0x14] movs r0, 0x1C @@ -689116,7 +666085,7 @@ sub_8150800: @ 8150800 pop {r0} bx r0 .align 2, 0 -_08150860: .4byte 0x0203abac + .pool thumb_func_end sub_8150800 thumb_func_start nullsub_58 @@ -689128,12 +666097,12 @@ nullsub_58: @ 8150864 sub_8150868: @ 8150868 push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _081508D0 + ldr r0, =0x0203abac ldr r6, [r0] ldrb r0, [r6, 0x1] cmp r0, 0xFF beq _08150934 - ldr r0, _081508D4 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne _081508E4 @@ -689143,10 +666112,10 @@ sub_8150868: @ 8150868 bl __floatsisf cmp r4, 0 bge _08150892 - ldr r1, _081508D8 + ldr r1, =0x47800000 bl __addsf3 _08150892: - ldr r1, _081508DC + ldr r1, =0x3e0f5c29 bl __mulsf3 bl __fixunssfsi lsls r0, 24 @@ -689160,10 +666129,10 @@ _08150892: bl __floatsisf cmp r4, 0 bge _081508BA - ldr r1, _081508D8 + ldr r1, =0x47800000 bl __addsf3 _081508BA: - ldr r1, _081508E0 + ldr r1, =0x3d89374c bl __mulsf3 bl __fixunssfsi lsls r0, 24 @@ -689173,11 +666142,7 @@ _081508BA: strh r1, [r5, 0x22] b _08150934 .align 2, 0 -_081508D0: .4byte 0x0203abac -_081508D4: .4byte 0x020375e0 -_081508D8: .4byte 0x47800000 -_081508DC: .4byte 0x3e0f5c29 -_081508E0: .4byte 0x3d89374c + .pool _081508E4: movs r0, 0x6 ldrsh r4, [r6, r0] @@ -689185,10 +666150,10 @@ _081508E4: bl __floatsisf cmp r4, 0 bge _081508F8 - ldr r1, _0815093C + ldr r1, =0x47800000 bl __addsf3 _081508F8: - ldr r1, _08150940 + ldr r1, =0x3e0f5c29 bl __mulsf3 bl __fixunssfsi lsls r0, 24 @@ -689202,10 +666167,10 @@ _081508F8: bl __floatsisf cmp r4, 0 bge _08150920 - ldr r1, _0815093C + ldr r1, =0x47800000 bl __addsf3 _08150920: - ldr r1, _08150944 + ldr r1, =0x3d89374c bl __mulsf3 bl __fixunssfsi lsls r0, 24 @@ -689218,23 +666183,21 @@ _08150934: pop {r0} bx r0 .align 2, 0 -_0815093C: .4byte 0x47800000 -_08150940: .4byte 0x3e0f5c29 -_08150944: .4byte 0x3d89374c + .pool thumb_func_end sub_8150868 thumb_func_start sub_8150948 sub_8150948: @ 8150948 push {r4-r6,lr} adds r5, r0, 0 - ldr r0, _081509B4 + ldr r0, =0x0203abac ldr r6, [r0] ldrb r0, [r6, 0x1] cmp r0, 0xFF bne _08150958 b _08150A60 _08150958: - ldr r0, _081509B8 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne _081509C8 @@ -689244,10 +666207,10 @@ _08150958: bl __floatsisf cmp r4, 0 bge _08150974 - ldr r1, _081509BC + ldr r1, =0x47800000 bl __addsf3 _08150974: - ldr r1, _081509C0 + ldr r1, =0x3e0f5c29 bl __mulsf3 bl __fixunssfsi lsls r0, 24 @@ -689261,10 +666224,10 @@ _08150974: bl __floatsisf cmp r4, 0 bge _0815099C - ldr r1, _081509BC + ldr r1, =0x47800000 bl __addsf3 _0815099C: - ldr r1, _081509C4 + ldr r1, =0x3d89374c bl __mulsf3 bl __fixunssfsi lsls r0, 24 @@ -689274,11 +666237,7 @@ _0815099C: strh r1, [r5, 0x22] b _08150A18 .align 2, 0 -_081509B4: .4byte 0x0203abac -_081509B8: .4byte 0x020375e0 -_081509BC: .4byte 0x47800000 -_081509C0: .4byte 0x3e0f5c29 -_081509C4: .4byte 0x3d89374c + .pool _081509C8: movs r0, 0x6 ldrsh r4, [r6, r0] @@ -689286,10 +666245,10 @@ _081509C8: bl __floatsisf cmp r4, 0 bge _081509DC - ldr r1, _08150A3C + ldr r1, =0x47800000 bl __addsf3 _081509DC: - ldr r1, _08150A40 + ldr r1, =0x3e0f5c29 bl __mulsf3 bl __fixunssfsi lsls r0, 24 @@ -689303,10 +666262,10 @@ _081509DC: bl __floatsisf cmp r4, 0 bge _08150A04 - ldr r1, _08150A3C + ldr r1, =0x47800000 bl __addsf3 _08150A04: - ldr r1, _08150A44 + ldr r1, =0x3d89374c bl __mulsf3 bl __fixunssfsi lsls r0, 24 @@ -689334,9 +666293,7 @@ _08150A18: strh r0, [r5, 0x32] b _08150A60 .align 2, 0 -_08150A3C: .4byte 0x47800000 -_08150A40: .4byte 0x3e0f5c29 -_08150A44: .4byte 0x3d89374c + .pool _08150A48: movs r2, 0 movs r0, 0x10 @@ -689593,11 +666550,11 @@ _08150C1C: movs r0, 0x46 movs r1, 0 bl lcd_io_set - ldr r0, _08150C6C + ldr r0, =0x020375e0 ldrh r3, [r0] cmp r3, 0 bne _08150C74 - ldr r1, _08150C70 + ldr r1, =0x0203abac ldr r2, [r1] movs r0, 0xB0 strb r0, [r2, 0x14] @@ -689610,10 +666567,9 @@ _08150C1C: movs r0, 0x50 b _08150C8C .align 2, 0 -_08150C6C: .4byte 0x020375e0 -_08150C70: .4byte 0x0203abac + .pool _08150C74: - ldr r1, _08150D24 + ldr r1, =0x0203abac ldr r2, [r1] movs r3, 0 movs r0, 0x60 @@ -689687,7 +666643,7 @@ _08150D1C: pop {r0} bx r0 .align 2, 0 -_08150D24: .4byte 0x0203abac + .pool thumb_func_end sub_8150B6C thumb_func_start sub_8150D28 @@ -689698,7 +666654,7 @@ sub_8150D28: @ 8150D28 mov r5, r8 push {r5-r7} sub sp, 0x28 - ldr r1, _08150E3C + ldr r1, =0x085cdbe4 add r0, sp, 0xC movs r2, 0x2 bl memcpy @@ -689707,26 +666663,26 @@ sub_8150D28: @ 8150D28 lsrs r0, 16 mov r9, r0 add r6, sp, 0x10 - ldr r1, _08150E40 + ldr r1, =0x085cdbe6 adds r0, r6, 0 movs r2, 0x4 bl memcpy add r5, sp, 0x14 - ldr r1, _08150E44 + ldr r1, =0x085cdbea adds r0, r5, 0 movs r2, 0x8 bl memcpy add r4, sp, 0x1C - ldr r1, _08150E48 + ldr r1, =0x085cdbf2 adds r0, r4, 0 movs r2, 0x4 bl memcpy - ldr r0, _08150E4C + ldr r0, =0x085cdbf8 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x20] str r1, [sp, 0x24] - ldr r0, _08150E50 + ldr r0, =0x020375e0 ldrh r0, [r0] mov r8, r6 mov r10, r5 @@ -689735,13 +666691,13 @@ sub_8150D28: @ 8150D28 cmp r0, 0x1 beq _08150E68 _08150D86: - ldr r0, _08150E54 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] add r0, sp adds r0, 0xC ldrb r0, [r0] - ldr r1, _08150E58 + ldr r1, =sub_8150948 + 1 movs r2, 0x66 str r2, [sp] movs r2, 0xC8 @@ -689751,7 +666707,7 @@ _08150D86: lsrs r6, r0, 24 cmp r6, 0x40 beq _08150DD0 - ldr r0, _08150E5C + ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -689772,7 +666728,7 @@ _08150D86: movs r0, 0x49 strh r0, [r1, 0x30] _08150DD0: - ldr r4, _08150E60 + ldr r4, =0x085cdb9c adds r0, r4, 0 movs r1, 0xB0 movs r2, 0x2B @@ -689780,7 +666736,7 @@ _08150DD0: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _08150E5C + ldr r5, =0x02020630 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -689812,7 +666768,7 @@ _08150DD0: strh r1, [r0, 0x2E] movs r1, 0x63 strh r1, [r0, 0x30] - ldr r2, _08150E64 + ldr r2, =0x0203abac ldr r1, [r2] movs r0, 0x7 strb r0, [r1, 0x2] @@ -689824,21 +666780,11 @@ _08150DD0: bl sub_80AB130 b _08150F3A .align 2, 0 -_08150E3C: .4byte 0x085cdbe4 -_08150E40: .4byte 0x085cdbe6 -_08150E44: .4byte 0x085cdbea -_08150E48: .4byte 0x085cdbf2 -_08150E4C: .4byte 0x085cdbf8 -_08150E50: .4byte 0x020375e0 -_08150E54: .4byte 0x03005d90 -_08150E58: .4byte sub_8150948 + 1 -_08150E5C: .4byte 0x02020630 -_08150E60: .4byte 0x085cdb9c -_08150E64: .4byte 0x0203abac + .pool _08150E68: - ldr r7, _08151008 + ldr r7, =0x0203abac ldr r0, [r7] - ldr r1, _0815100C + ldr r1, =0x000040fc adds r0, r1 ldr r1, [r0] adds r1, 0x48 @@ -689852,13 +666798,13 @@ _08150E68: movs r2, 0x18 movs r3, 0x1A bl bg_copy_tilemap_rect_simple - ldr r0, _08151010 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] add r0, sp adds r0, 0xC ldrb r0, [r0] - ldr r1, _08151014 + ldr r1, =sub_8150948 + 1 movs r2, 0x66 str r2, [sp] movs r2, 0x80 @@ -689868,7 +666814,7 @@ _08150E68: lsrs r6, r0, 24 cmp r6, 0x40 beq _08150ED4 - ldr r0, _08151018 + ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -689889,7 +666835,7 @@ _08150E68: movs r0, 0x27 strh r0, [r1, 0x30] _08150ED4: - ldr r4, _0815101C + ldr r4, =0x085cdb9c adds r0, r4, 0 movs r1, 0x68 movs r2, 0x9 @@ -689897,7 +666843,7 @@ _08150ED4: bl obj_add_from_template_forward_search lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _08151018 + ldr r5, =0x02020630 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -689933,13 +666879,13 @@ _08150ED4: movs r0, 0x2 strb r0, [r1, 0x2] ldr r1, [r7] - ldr r0, _08151020 + ldr r0, =0x00000109 strh r0, [r1, 0x4] movs r0, 0x7 bl sub_80AB130 _08150F3A: movs r4, 0 - ldr r5, _08151018 + ldr r5, =0x02020630 _08150F3E: lsls r1, r4, 20 movs r2, 0xC0 @@ -689947,10 +666893,10 @@ _08150F3E: adds r1, r2 asrs r1, 16 lsls r2, r4, 19 - ldr r3, _08151024 + ldr r3, =0xfff80000 adds r2, r3 asrs r2, 16 - ldr r0, _08151028 + ldr r0, =0x085cdbcc movs r3, 0x68 bl obj_add_from_template_forward_search lsls r0, 24 @@ -689979,7 +666925,7 @@ _08150F3E: lsrs r0, 16 add r0, r8 ldrb r0, [r0] - ldr r5, _0815102C + ldr r5, =0x020375e0 ldrh r4, [r5] lsls r4, 2 add r1, sp, 0x20 @@ -690001,7 +666947,7 @@ _08150F3E: lsrs r6, r0, 24 cmp r6, 0x40 beq _08151074 - ldr r1, _08151018 + ldr r1, =0x02020630 lsls r2, r6, 4 adds r0, r2, r6 lsls r0, 2 @@ -690040,16 +666986,7 @@ _08150F3E: movs r1, 0x6 b _08151044 .align 2, 0 -_08151008: .4byte 0x0203abac -_0815100C: .4byte 0x000040fc -_08151010: .4byte 0x03005d90 -_08151014: .4byte sub_8150948 + 1 -_08151018: .4byte 0x02020630 -_0815101C: .4byte 0x085cdb9c -_08151020: .4byte 0x00000109 -_08151024: .4byte 0xfff80000 -_08151028: .4byte 0x085cdbcc -_0815102C: .4byte 0x020375e0 + .pool _08151030: adds r0, r4, 0 movs r1, 0x7 @@ -690076,7 +667013,7 @@ _08151056: bl obj_anim_image_start strh r5, [r4, 0x30] _0815105C: - ldr r0, _08151084 + ldr r0, =0x02020630 mov r2, r8 adds r1, r2, r6 lsls r1, 2 @@ -690098,7 +667035,7 @@ _08151074: pop {r0} bx r0 .align 2, 0 -_08151084: .4byte 0x02020630 + .pool thumb_func_end sub_8150D28 thumb_func_start sub_8151088 @@ -690111,7 +667048,7 @@ sub_8151088: @ 8151088 sub sp, 0xC movs r3, 0 mov r9, r3 - ldr r2, _08151154 + ldr r2, =0x0203abac ldr r0, [r2] ldrb r1, [r0, 0x1B] adds r1, 0x2 @@ -690139,7 +667076,7 @@ _081510AA: lsls r0, 3 mov r8, r0 _081510CC: - ldr r0, _08151154 + ldr r0, =0x0203abac ldr r6, [r0] lsls r3, r7, 1 ldr r1, [sp] @@ -690152,7 +667089,7 @@ _081510CC: lsls r0, 24 lsrs r0, 24 mov r12, r0 - ldr r0, _08151158 + ldr r0, =0x000040fc adds r5, r6, r0 ldr r0, [r5] lsls r1, 1 @@ -690206,14 +667143,13 @@ _081510CC: pop {r0} bx r0 .align 2, 0 -_08151154: .4byte 0x0203abac -_08151158: .4byte 0x000040fc + .pool thumb_func_end sub_8151088 thumb_func_start sub_815115C sub_815115C: @ 815115C push {r4,r5,lr} - ldr r5, _081511B4 + ldr r5, =0x0203abac ldr r4, [r5] ldrb r0, [r4, 0x1C] adds r0, 0x1 @@ -690256,13 +667192,13 @@ _081511AC: pop {r0} bx r0 .align 2, 0 -_081511B4: .4byte 0x0203abac + .pool thumb_func_end sub_815115C thumb_func_start sub_81511B8 sub_81511B8: @ 81511B8 push {r4,r5,lr} - ldr r5, _08151210 + ldr r5, =0x0203abac ldr r4, [r5] ldrb r0, [r4, 0x1C] adds r0, 0x1 @@ -690305,7 +667241,7 @@ _08151208: pop {r0} bx r0 .align 2, 0 -_08151210: .4byte 0x0203abac + .pool thumb_func_end sub_81511B8 thumb_func_start sub_8151214 @@ -690317,7 +667253,7 @@ sub_8151214: @ 8151214 push {r5-r7} sub sp, 0xC movs r7, 0 - ldr r3, _08151378 + ldr r3, =0x0203abac ldr r0, [r3] strb r7, [r0, 0x1E] strb r7, [r0, 0x1D] @@ -690341,7 +667277,7 @@ sub_8151214: @ 8151214 ldrb r0, [r1, 0x18] subs r0, 0x2 strb r0, [r1, 0x18] - ldr r4, _0815137C + ldr r4, =0x0203abb2 ldr r0, [r3] ldrb r1, [r0, 0x1A] adds r2, r1, 0 @@ -690351,16 +667287,16 @@ sub_8151214: @ 8151214 lsls r0, 5 subs r0, r2, r0 strb r0, [r4] - ldr r6, _08151380 + ldr r6, =0x0203abb0 mov r9, r3 - ldr r0, _08151384 + ldr r0, =0x0203abb1 mov r8, r0 _0815126E: mov r1, r9 ldr r2, [r1] ldrb r0, [r2, 0x19] strb r0, [r6] - ldr r0, _0815137C + ldr r0, =0x0203abb2 ldrb r0, [r0] adds r1, r0, r7 adds r0, r1, 0 @@ -690420,8 +667356,8 @@ _0815126E: lsrs r7, r0, 24 cmp r7, 0x8 bls _0815126E - ldr r5, _08151380 - ldr r4, _08151378 + ldr r5, =0x0203abb0 + ldr r4, =0x0203abac ldr r0, [r4] ldrb r1, [r0, 0x19] adds r2, r1, 0 @@ -690486,10 +667422,7 @@ _08151368: pop {r0} bx r0 .align 2, 0 -_08151378: .4byte 0x0203abac -_0815137C: .4byte 0x0203abb2 -_08151380: .4byte 0x0203abb0 -_08151384: .4byte 0x0203abb1 + .pool thumb_func_end sub_8151214 thumb_func_start sub_8151388 @@ -690501,7 +667434,7 @@ sub_8151388: @ 8151388 push {r5-r7} sub sp, 0xC movs r7, 0 - ldr r2, _081514B8 + ldr r2, =0x0203abac ldr r0, [r2] strb r7, [r0, 0x1E] strb r7, [r0, 0x1D] @@ -690524,20 +667457,20 @@ sub_8151388: @ 8151388 ldrb r0, [r1, 0x18] adds r0, 0x2 strb r0, [r1, 0x18] - ldr r1, _081514BC + ldr r1, =0x0203abb5 ldr r0, [r2] ldrb r0, [r0, 0x1A] strb r0, [r1] - ldr r6, _081514C0 + ldr r6, =0x0203abb3 mov r10, r2 - ldr r0, _081514C4 + ldr r0, =0x0203abb4 mov r9, r0 _081513D4: mov r1, r10 ldr r2, [r1] ldrb r0, [r2, 0x19] strb r0, [r6] - ldr r0, _081514BC + ldr r0, =0x0203abb5 ldrb r0, [r0] adds r1, r0, r7 adds r0, r1, 0 @@ -690597,8 +667530,8 @@ _081513D4: lsrs r7, r0, 24 cmp r7, 0x8 bls _081513D4 - ldr r4, _081514C4 - ldr r5, _081514B8 + ldr r4, =0x0203abb4 + ldr r5, =0x0203abac ldr r3, [r5] ldrb r1, [r3, 0x1A] adds r2, r1, 0 @@ -690644,10 +667577,7 @@ _081514A6: pop {r0} bx r0 .align 2, 0 -_081514B8: .4byte 0x0203abac -_081514BC: .4byte 0x0203abb5 -_081514C0: .4byte 0x0203abb3 -_081514C4: .4byte 0x0203abb4 + .pool thumb_func_end sub_8151388 thumb_func_start sub_81514C8 @@ -690660,7 +667590,7 @@ sub_81514C8: @ 81514C8 cmp r0, 0x1 beq _08151500 _081514D6: - ldr r1, _081514FC + ldr r1, =0x0203abac ldr r2, [r1] movs r3, 0 movs r0, 0x2 @@ -690677,9 +667607,9 @@ _081514D6: bl sub_8151214 b _08151522 .align 2, 0 -_081514FC: .4byte 0x0203abac + .pool _08151500: - ldr r1, _08151530 + ldr r1, =0x0203abac ldr r2, [r1] movs r0, 0x2 strb r0, [r2, 0x1B] @@ -690695,14 +667625,14 @@ _08151500: bl sub_8151088 bl sub_8151388 _08151522: - ldr r0, _08151530 + ldr r0, =0x0203abac ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x1C] pop {r0} bx r0 .align 2, 0 -_08151530: .4byte 0x0203abac + .pool thumb_func_end sub_81514C8 thumb_func_start sub_8151534 @@ -691034,7 +667964,7 @@ sub_8151744: @ 8151744 b _081518F4 _0815175C: movs r7, 0x1F - ldr r0, _0815178C + ldr r0, =0xfffffc1f mov r10, r0 movs r1, 0x7D negs r1, r1 @@ -691045,9 +667975,9 @@ _0815176C: ldrh r0, [r5, 0x6] add r0, r12 lsls r0, 1 - ldr r1, _08151790 + ldr r1, =0x02037b14 adds r3, r0, r1 - ldr r1, _08151794 + ldr r1, =0x02037714 adds r6, r0, r1 ldrb r0, [r5] lsls r0, 25 @@ -691058,9 +667988,7 @@ _0815176C: beq _081517F6 b _081518E2 .align 2, 0 -_0815178C: .4byte 0xfffffc1f -_08151790: .4byte 0x02037b14 -_08151794: .4byte 0x02037714 + .pool _08151798: ldr r0, [r3] lsls r2, r0, 27 @@ -691316,7 +668244,7 @@ _08151962: ldrb r0, [r3, 0x8] cmp r2, r0 bcs _08151982 - ldr r4, _0815198C + ldr r4, =0x02037b14 _0815196A: ldrh r0, [r3, 0x6] adds r0, r2 @@ -691337,13 +668265,13 @@ _08151982: adds r1, 0x1 b _081519BC .align 2, 0 -_0815198C: .4byte 0x02037b14 + .pool _08151990: ldrb r0, [r3, 0x8] cmp r2, r0 bcs _081519B4 - ldr r5, _081519D4 - ldr r4, _081519D8 + ldr r5, =0x02037b14 + ldr r4, =0x02037714 _0815199A: ldrh r0, [r3, 0x6] adds r0, r2 @@ -691377,8 +668305,7 @@ _081519CA: pop {r1} bx r1 .align 2, 0 -_081519D4: .4byte 0x02037b14 -_081519D8: .4byte 0x02037714 + .pool thumb_func_end sub_815194C thumb_func_start task_tutorial_controls_fadein @@ -691519,9 +668446,9 @@ _08151AAA: beq _08151B12 ldrh r1, [r4, 0xA] lsls r1, 1 - ldr r0, _08151B08 + ldr r0, =0x02037b14 adds r0, r1, r0 - ldr r2, _08151B0C + ldr r2, =0x02037714 adds r1, r2 ldrb r2, [r4, 0xC] lsls r2, 1 @@ -691545,8 +668472,7 @@ _08151AAA: strb r0, [r4, 0x7] b _08151B12 .align 2, 0 -_08151B08: .4byte 0x02037b14 -_08151B0C: .4byte 0x02037714 + .pool _08151B10: strb r3, [r4, 0x7] _08151B12: @@ -691555,14 +668481,14 @@ _08151B12: lsrs r5, r0, 24 cmp r5, 0xF bls _08151AAA - ldr r0, _08151B28 + ldr r0, =0x0000ffff cmp r7, r0 bne _08151B2C movs r0, 0 strb r0, [r6] b _08151B30 .align 2, 0 -_08151B28: .4byte 0x0000ffff + .pool _08151B2C: ldrh r0, [r6, 0x2] bics r0, r7 @@ -691681,8 +668607,8 @@ sub_8151BD4: @ 8151BD4 adds r0, r2, r0 cmp r2, r0 bge _08151C16 - ldr r5, _08151C48 - ldr r3, _08151C4C + ldr r5, =0x02037b14 + ldr r3, =0x02037714 _08151BFC: lsls r0, r2, 1 adds r1, r0, r5 @@ -691723,8 +668649,7 @@ _08151C16: pop {r0} bx r0 .align 2, 0 -_08151C48: .4byte 0x02037b14 -_08151C4C: .4byte 0x02037714 + .pool thumb_func_end sub_8151BD4 thumb_func_start sub_8151C50 @@ -691886,8 +668811,8 @@ sub_8151D28: @ 8151D28 adds r0, r2, r0 cmp r2, r0 bge _08151D8E - ldr r5, _08151DA8 - ldr r4, _08151DAC + ldr r5, =0x02037b14 + ldr r4, =0x02037714 _08151D74: lsls r0, r2, 1 adds r1, r0, r5 @@ -691916,8 +668841,7 @@ _08151D8E: strh r0, [r2] b _08151E3A .align 2, 0 -_08151DA8: .4byte 0x02037b14 -_08151DAC: .4byte 0x02037714 + .pool _08151DB0: movs r0, 0x1 mov r9, r0 @@ -691960,8 +668884,8 @@ _08151DE4: adds r0, r2, r0 cmp r2, r0 bge _08151E1A - ldr r6, _08151E48 - ldr r4, _08151E4C + ldr r6, =0x02037b14 + ldr r4, =0x02037714 _08151E00: lsls r0, r2, 1 adds r1, r0, r6 @@ -692003,8 +668927,7 @@ _08151E3A: pop {r0} bx r0 .align 2, 0 -_08151E48: .4byte 0x02037b14 -_08151E4C: .4byte 0x02037714 + .pool thumb_func_end sub_8151D28 thumb_func_start sub_8151E50 @@ -692045,7 +668968,7 @@ _08151E78: beq _08151E92 b _08151FE6 _08151E92: - ldr r0, _08151EE0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] adds r0, r3, 0 ands r0, r1 @@ -692085,7 +669008,7 @@ _08151EB8: beq _08151EEA b _08151FD0 .align 2, 0 -_08151EE0: .4byte 0x02037fd4 + .pool _08151EE4: cmp r0, 0x2 beq _08151F92 @@ -692506,7 +669429,7 @@ sub_81521C0: @ 81521C0 bls _081521D6 movs r4, 0x40 _081521D6: - ldr r6, _08152204 + ldr r6, =0x0203abb8 movs r0, 0x8 bl malloc_and_clear str r0, [r6] @@ -692527,13 +669450,13 @@ _081521FE: movs r0, 0 b _08152244 .align 2, 0 -_08152204: .4byte 0x0203abb8 + .pool _08152208: strb r4, [r1] cmp r5, r4 bcs _08152242 adds r3, r6, 0 - ldr r0, _08152250 + ldr r0, =0x082ec690 mov r12, r0 movs r2, 0x4 mov r8, r2 @@ -692568,14 +669491,14 @@ _08152244: pop {r1} bx r1 .align 2, 0 -_08152250: .4byte 0x082ec690 + .pool thumb_func_end sub_81521C0 thumb_func_start sub_8152254 sub_8152254: @ 8152254 push {r4-r7,lr} movs r3, 0 - ldr r0, _08152268 + ldr r0, =0x0203abb8 ldr r2, [r0] adds r5, r0, 0 cmp r2, 0 @@ -692583,14 +669506,14 @@ sub_8152254: @ 8152254 movs r0, 0 b _081522C4 .align 2, 0 -_08152268: .4byte 0x0203abb8 + .pool _0815226C: ldrb r2, [r2] cmp r3, r2 bcs _08152292 - ldr r0, _081522CC + ldr r0, =0x030024f8 mov r12, r0 - ldr r4, _081522D0 + ldr r4, =0x082ec690 adds r2, r5, 0 _0815227A: lsls r1, r3, 3 @@ -692632,8 +669555,7 @@ _081522C4: pop {r1} bx r1 .align 2, 0 -_081522CC: .4byte 0x030024f8 -_081522D0: .4byte 0x082ec690 + .pool thumb_func_end sub_8152254 thumb_func_start sub_81522D4 @@ -692642,7 +669564,7 @@ sub_81522D4: @ 81522D4 mov r7, r8 push {r7} movs r6, 0 - ldr r0, _081522F0 + ldr r0, =0x0203abb8 ldr r1, [r0] adds r3, r0, 0 cmp r1, 0 @@ -692654,7 +669576,7 @@ _081522EC: movs r0, 0 b _081523D2 .align 2, 0 -_081522F0: .4byte 0x0203abb8 + .pool _081522F4: ldrb r1, [r1] cmp r6, r1 @@ -692689,15 +669611,14 @@ _08152322: cmp r0, 0 beq _08152348 lsls r0, r6, 3 - ldr r1, _08152340 + ldr r1, =0x030024f8 adds r0, r1 - ldr r1, _08152344 + ldr r1, =0x082ec690 ldm r1!, {r2,r3} stm r0!, {r2,r3} b _081523C0 .align 2, 0 -_08152340: .4byte 0x030024f8 -_08152344: .4byte 0x082ec690 + .pool _08152348: ldrb r0, [r2, 0xE] ldrb r4, [r2, 0xA] @@ -692711,11 +669632,11 @@ _08152348: movs r1, 0xC ldrsh r0, [r3, r1] adds r2, r0 - ldr r1, _081523DC + ldr r1, =0x000001ff adds r0, r1, 0 ands r2, r0 ldrh r0, [r3, 0x2] - ldr r1, _081523E0 + ldr r1, =0xfffffe00 mov r12, r1 mov r1, r12 ands r0, r1 @@ -692740,27 +669661,27 @@ _08152348: ldr r2, [r4, 0x4] adds r2, r5, r2 ldrh r3, [r2, 0x14] - ldr r1, _081523E4 + ldr r1, =0x000003ff adds r0, r1, 0 adds r1, r3, 0 ands r1, r0 mov r12, r1 ldrh r0, [r2, 0x4] - ldr r3, _081523E8 + ldr r3, =0xfffffc00 adds r1, r3, 0 ands r0, r1 mov r1, r12 orrs r0, r1 strh r0, [r2, 0x4] lsls r1, r6, 3 - ldr r2, _081523EC + ldr r2, =0x030024f8 ldr r0, [r4, 0x4] adds r1, r2 adds r0, r5, r0 ldm r0!, {r2,r3} stm r1!, {r2,r3} _081523C0: - ldr r3, _081523F0 + ldr r3, =0x0203abb8 _081523C2: adds r0, r6, 0x1 lsls r0, 24 @@ -692778,12 +669699,7 @@ _081523D2: pop {r1} bx r1 .align 2, 0 -_081523DC: .4byte 0x000001ff -_081523E0: .4byte 0xfffffe00 -_081523E4: .4byte 0x000003ff -_081523E8: .4byte 0xfffffc00 -_081523EC: .4byte 0x030024f8 -_081523F0: .4byte 0x0203abb8 + .pool thumb_func_end sub_81522D4 thumb_func_start sub_81523F4 @@ -692798,7 +669714,7 @@ sub_81523F4: @ 81523F4 bl gpu_tile_obj_tag_get_range_start lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _0815242C + ldr r0, =0x0000ffff cmp r5, r0 beq _08152430 strb r6, [r4, 0x18] @@ -692815,7 +669731,7 @@ sub_81523F4: @ 81523F4 movs r0, 0x1 b _08152432 .align 2, 0 -_0815242C: .4byte 0x0000ffff + .pool _08152430: movs r0, 0 _08152432: @@ -692830,7 +669746,7 @@ sub_8152438: @ 8152438 adds r4, r1, 0 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08152468 + ldr r0, =0x0203abb8 ldr r0, [r0] cmp r0, 0 beq _0815246C @@ -692851,7 +669767,7 @@ sub_8152438: @ 8152438 adds r0, r2, 0 b _0815246E .align 2, 0 -_08152468: .4byte 0x0203abb8 + .pool _0815246C: movs r0, 0xFF _0815246E: @@ -692869,7 +669785,7 @@ sub_8152474: @ 8152474 lsrs r4, r1, 24 lsls r2, 16 lsrs r5, r2, 16 - ldr r0, _081524AC + ldr r0, =0x0203abb8 ldr r0, [r0] cmp r0, 0 beq _081524A8 @@ -692892,7 +669808,7 @@ _081524A8: movs r0, 0xFF b _081524BC .align 2, 0 -_081524AC: .4byte 0x0203abb8 + .pool _081524B0: lsls r1, r4, 1 adds r0, r2, 0 @@ -692937,7 +669853,7 @@ sub_81524C4: @ 81524C4 lsrs r5, 24 mov r10, r5 movs r5, 0 - ldr r0, _08152510 + ldr r0, =0x0203abb8 ldr r0, [r0] cmp r0, 0 beq _0815255E @@ -692946,7 +669862,7 @@ sub_81524C4: @ 81524C4 bne _08152530 b _0815255E .align 2, 0 -_08152510: .4byte 0x0203abb8 + .pool _08152514: adds r5, r2, 0 adds r0, r5, 0 @@ -693053,7 +669969,7 @@ sub_81525D0: @ 81525D0 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _081525F8 + ldr r6, =0x0203abb8 ldr r0, [r6] cmp r0, 0 beq _081525F2 @@ -693071,7 +669987,7 @@ _081525F2: movs r0, 0xFF b _0815263C .align 2, 0 -_081525F8: .4byte 0x0203abb8 + .pool _081525FC: adds r0, r2, 0 movs r1, 0 @@ -693086,7 +670002,7 @@ _081525FC: ldr r2, [r3, 0x4] adds r2, r4, r2 ldrh r1, [r2, 0x2] - ldr r0, _08152644 + ldr r0, =0xfffffe00 ands r0, r1 movs r1, 0xF0 orrs r0, r1 @@ -693098,9 +670014,9 @@ _081525FC: orrs r0, r2 strb r0, [r1, 0x19] lsls r1, r5, 3 - ldr r0, _08152648 + ldr r0, =0x030024f8 adds r1, r0 - ldr r0, _0815264C + ldr r0, =0x082ec690 ldm r0!, {r2,r3} stm r1!, {r2,r3} adds r0, r5, 0 @@ -693109,16 +670025,14 @@ _0815263C: pop {r1} bx r1 .align 2, 0 -_08152644: .4byte 0xfffffe00 -_08152648: .4byte 0x030024f8 -_0815264C: .4byte 0x082ec690 + .pool thumb_func_end sub_81525D0 thumb_func_start calls_flash_erase_block calls_flash_erase_block: @ 8152650 push {r4,r5,lr} movs r4, 0 - ldr r5, _0815267C + ldr r5, =0x03007860 _08152656: ldr r1, [r5] adds r0, r4, 0 @@ -693138,23 +670052,21 @@ _08152656: pop {r0} bx r0 .align 2, 0 -_0815267C: .4byte 0x03007860 + .pool thumb_func_end calls_flash_erase_block thumb_func_start sub_8152680 sub_8152680: @ 8152680 - ldr r0, _08152690 + ldr r0, =0x03006200 movs r1, 0 str r1, [r0] - ldr r0, _08152694 + ldr r0, =0x030061f0 strh r1, [r0] - ldr r0, _08152698 + ldr r0, =0x030061fc str r1, [r0] bx lr .align 2, 0 -_08152690: .4byte 0x03006200 -_08152694: .4byte 0x030061f0 -_08152698: .4byte 0x030061fc + .pool thumb_func_end sub_8152680 thumb_func_start sub_815269C @@ -693177,7 +670089,7 @@ _081526B6: beq _081526E4 b _081526F4 _081526BC: - ldr r2, _081526CC + ldr r2, =0x030061fc movs r1, 0x1 lsls r1, r3 ldr r0, [r2] @@ -693185,9 +670097,9 @@ _081526BC: str r0, [r2] b _081526F4 .align 2, 0 -_081526CC: .4byte 0x030061fc + .pool _081526D0: - ldr r2, _081526E0 + ldr r2, =0x030061fc adds r1, r0, 0 lsls r1, r3 ldr r0, [r2] @@ -693195,9 +670107,9 @@ _081526D0: str r0, [r2] b _081526F4 .align 2, 0 -_081526E0: .4byte 0x030061fc + .pool _081526E4: - ldr r0, _081526FC + ldr r0, =0x030061fc movs r1, 0x1 lsls r1, r3 ldr r0, [r0] @@ -693211,7 +670123,7 @@ _081526F4: pop {r1} bx r1 .align 2, 0 -_081526FC: .4byte 0x030061fc + .pool thumb_func_end sub_815269C thumb_func_start save_write_to_flash @@ -693220,10 +670132,10 @@ save_write_to_flash: @ 8152700 adds r7, r1, 0 lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _08152724 - ldr r0, _08152728 + ldr r1, =0x03006204 + ldr r0, =0x0203abbc str r0, [r1] - ldr r0, _0815272C + ldr r0, =0x0000ffff cmp r2, r0 beq _08152730 adds r0, r2, 0 @@ -693233,16 +670145,14 @@ save_write_to_flash: @ 8152700 lsrs r5, r0, 24 b _08152782 .align 2, 0 -_08152724: .4byte 0x03006204 -_08152728: .4byte 0x0203abbc -_0815272C: .4byte 0x0000ffff + .pool _08152730: - ldr r1, _0815278C - ldr r5, _08152790 + ldr r1, =0x030061f8 + ldr r5, =0x030061f0 ldrh r0, [r5] strh r0, [r1] - ldr r1, _08152794 - ldr r6, _08152798 + ldr r1, =0x030061f4 + ldr r6, =0x03006200 ldr r4, [r6] str r4, [r1] adds r0, 0x1 @@ -693264,17 +670174,17 @@ _08152756: lsrs r4, r0, 16 cmp r4, 0xD bls _08152756 - ldr r0, _0815279C + ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 beq _08152782 movs r5, 0xFF - ldr r1, _08152790 - ldr r0, _0815278C + ldr r1, =0x030061f0 + ldr r0, =0x030061f8 ldrh r0, [r0] strh r0, [r1] - ldr r1, _08152798 - ldr r0, _08152794 + ldr r1, =0x03006200 + ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r1] _08152782: @@ -693283,11 +670193,7 @@ _08152782: pop {r1} bx r1 .align 2, 0 -_0815278C: .4byte 0x030061f8 -_08152790: .4byte 0x030061f0 -_08152794: .4byte 0x030061f4 -_08152798: .4byte 0x03006200 -_0815279C: .4byte 0x030061fc + .pool thumb_func_end save_write_to_flash thumb_func_start sub_81527A0 @@ -693300,7 +670206,7 @@ sub_81527A0: @ 81527A0 adds r4, r1, 0 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _0815286C + ldr r0, =0x030061f0 ldrh r0, [r0] adds r0, r6, r0 lsls r0, 16 @@ -693310,7 +670216,7 @@ sub_81527A0: @ 81527A0 bl __umodsi3 lsls r0, 16 lsrs r5, r0, 16 - ldr r2, _08152870 + ldr r2, =0x03006200 ldr r1, [r2] movs r0, 0x1 ands r1, r0 @@ -693327,11 +670233,11 @@ sub_81527A0: @ 81527A0 ldrh r4, [r0, 0x4] movs r3, 0 mov r9, r2 - ldr r2, _08152874 + ldr r2, =0x03006204 mov r12, r2 mov r8, r12 movs r2, 0 - ldr r1, _08152878 + ldr r1, =0x00000fff _081527F2: mov r7, r8 ldr r0, [r7] @@ -693344,14 +670250,14 @@ _081527F2: bls _081527F2 mov r0, r12 ldr r1, [r0] - ldr r2, _0815287C + ldr r2, =0x00000ff4 adds r0, r1, r2 strh r6, [r0] - ldr r3, _08152880 + ldr r3, =0x00000ff8 adds r2, r1, r3 - ldr r0, _08152884 + ldr r0, =0x08012025 str r0, [r2] - ldr r6, _08152888 + ldr r6, =0x00000ffc adds r1, r6 mov r7, r9 ldr r0, [r7] @@ -693377,9 +670283,9 @@ _08152840: mov r0, r10 adds r1, r4, 0 bl sub_8153164 - ldr r1, _08152874 + ldr r1, =0x03006204 ldr r1, [r1] - ldr r7, _0815288C + ldr r7, =0x00000ff6 adds r2, r1, r7 strh r0, [r2] lsrs r0, r5, 24 @@ -693394,15 +670300,7 @@ _08152840: pop {r1} bx r1 .align 2, 0 -_0815286C: .4byte 0x030061f0 -_08152870: .4byte 0x03006200 -_08152874: .4byte 0x03006204 -_08152878: .4byte 0x00000fff -_0815287C: .4byte 0x00000ff4 -_08152880: .4byte 0x00000ff8 -_08152884: .4byte 0x08012025 -_08152888: .4byte 0x00000ffc -_0815288C: .4byte 0x00000ff6 + .pool thumb_func_end sub_81527A0 thumb_func_start sub_8152890 @@ -693413,10 +670311,10 @@ sub_8152890: @ 8152890 lsrs r7, r0, 24 lsls r2, 16 lsrs r2, 16 - ldr r4, _081528F4 + ldr r4, =0x0203abbc movs r3, 0 movs r6, 0 - ldr r1, _081528F8 + ldr r1, =0x00000fff _081528A4: adds r0, r4, r3 strb r6, [r0] @@ -693425,9 +670323,9 @@ _081528A4: lsrs r3, r0, 16 cmp r3, r1 bls _081528A4 - ldr r0, _081528FC + ldr r0, =0x00000ff8 adds r1, r4, r0 - ldr r0, _08152900 + ldr r0, =0x08012025 str r0, [r1] movs r3, 0 cmp r3, r2 @@ -693446,7 +670344,7 @@ _081528D2: adds r0, r5, 0 adds r1, r2, 0 bl sub_8153164 - ldr r2, _08152904 + ldr r2, =0x00000ff4 adds r1, r4, r2 strh r0, [r1] adds r0, r7, 0 @@ -693458,11 +670356,7 @@ _081528D2: pop {r1} bx r1 .align 2, 0 -_081528F4: .4byte 0x0203abbc -_081528F8: .4byte 0x00000fff -_081528FC: .4byte 0x00000ff8 -_08152900: .4byte 0x08012025 -_08152904: .4byte 0x00000ff4 + .pool thumb_func_end sub_8152890 thumb_func_start sub_8152908 @@ -693493,15 +670387,15 @@ _0815292E: thumb_func_start sub_8152934 sub_8152934: @ 8152934 push {r4-r6,lr} - ldr r1, _08152970 - ldr r0, _08152974 + ldr r1, =0x03006204 + ldr r0, =0x0203abbc str r0, [r1] - ldr r1, _08152978 - ldr r5, _0815297C + ldr r1, =0x030061f8 + ldr r5, =0x030061f0 ldrh r0, [r5] strh r0, [r1] - ldr r1, _08152980 - ldr r6, _08152984 + ldr r1, =0x030061f4 + ldr r6, =0x03006200 ldr r4, [r6] str r4, [r1] adds r0, 0x1 @@ -693512,55 +670406,41 @@ sub_8152934: @ 8152934 strh r0, [r5] adds r4, 0x1 str r4, [r6] - ldr r1, _08152988 + ldr r1, =0x03006208 movs r0, 0 strh r0, [r1] - ldr r1, _0815298C + ldr r1, =0x030061fc movs r0, 0 str r0, [r1] pop {r4-r6} pop {r1} bx r1 .align 2, 0 -_08152970: .4byte 0x03006204 -_08152974: .4byte 0x0203abbc -_08152978: .4byte 0x030061f8 -_0815297C: .4byte 0x030061f0 -_08152980: .4byte 0x030061f4 -_08152984: .4byte 0x03006200 -_08152988: .4byte 0x03006208 -_0815298C: .4byte 0x030061fc + .pool thumb_func_end sub_8152934 thumb_func_start sub_8152990 sub_8152990: @ 8152990 - ldr r1, _081529B4 - ldr r0, _081529B8 + ldr r1, =0x03006204 + ldr r0, =0x0203abbc str r0, [r1] - ldr r1, _081529BC - ldr r0, _081529C0 + ldr r1, =0x030061f8 + ldr r0, =0x030061f0 ldrh r0, [r0] strh r0, [r1] - ldr r1, _081529C4 - ldr r0, _081529C8 + ldr r1, =0x030061f4 + ldr r0, =0x03006200 ldr r0, [r0] str r0, [r1] - ldr r1, _081529CC + ldr r1, =0x03006208 movs r0, 0 strh r0, [r1] - ldr r1, _081529D0 + ldr r1, =0x030061fc movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_081529B4: .4byte 0x03006204 -_081529B8: .4byte 0x0203abbc -_081529BC: .4byte 0x030061f8 -_081529C0: .4byte 0x030061f0 -_081529C4: .4byte 0x030061f4 -_081529C8: .4byte 0x03006200 -_081529CC: .4byte 0x03006208 -_081529D0: .4byte 0x030061fc + .pool thumb_func_end sub_8152990 thumb_func_start sub_81529D4 @@ -693568,7 +670448,7 @@ sub_81529D4: @ 81529D4 push {r4,r5,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _08152A10 + ldr r4, =0x03006208 ldrh r2, [r4] subs r0, 0x1 cmp r2, r0 @@ -693579,27 +670459,22 @@ sub_81529D4: @ 81529D4 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - ldr r0, _08152A14 + ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 beq _08152A2A movs r5, 0xFF - ldr r1, _08152A18 - ldr r0, _08152A1C + ldr r1, =0x030061f0 + ldr r0, =0x030061f8 ldrh r0, [r0] strh r0, [r1] - ldr r1, _08152A20 - ldr r0, _08152A24 + ldr r1, =0x03006200 + ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r1] b _08152A2A .align 2, 0 -_08152A10: .4byte 0x03006208 -_08152A14: .4byte 0x030061fc -_08152A18: .4byte 0x030061f0 -_08152A1C: .4byte 0x030061f8 -_08152A20: .4byte 0x03006200 -_08152A24: .4byte 0x030061f4 + .pool _08152A28: movs r5, 0xFF _08152A2A: @@ -693614,21 +670489,21 @@ sub_8152A34: @ 8152A34 push {r4,lr} lsls r0, 16 movs r4, 0x1 - ldr r2, _08152A68 + ldr r2, =0xffff0000 adds r0, r2 lsrs r0, 16 bl calls_flash_erase_block_2 - ldr r0, _08152A6C + ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 beq _08152A5E movs r4, 0xFF - ldr r1, _08152A70 - ldr r0, _08152A74 + ldr r1, =0x030061f0 + ldr r0, =0x030061f8 ldrh r0, [r0] strh r0, [r1] - ldr r1, _08152A78 - ldr r0, _08152A7C + ldr r1, =0x03006200 + ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r1] _08152A5E: @@ -693637,12 +670512,7 @@ _08152A5E: pop {r1} bx r1 .align 2, 0 -_08152A68: .4byte 0xffff0000 -_08152A6C: .4byte 0x030061fc -_08152A70: .4byte 0x030061f0 -_08152A74: .4byte 0x030061f8 -_08152A78: .4byte 0x03006200 -_08152A7C: .4byte 0x030061f4 + .pool thumb_func_end sub_8152A34 thumb_func_start calls_flash_erase_block_2 @@ -693655,7 +670525,7 @@ calls_flash_erase_block_2: @ 8152A80 adds r4, r1, 0 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _08152B4C + ldr r0, =0x030061f0 ldrh r0, [r0] adds r0, r6, r0 lsls r0, 16 @@ -693665,7 +670535,7 @@ calls_flash_erase_block_2: @ 8152A80 bl __umodsi3 lsls r0, 16 lsrs r5, r0, 16 - ldr r2, _08152B50 + ldr r2, =0x03006200 ldr r1, [r2] movs r0, 0x1 ands r1, r0 @@ -693682,11 +670552,11 @@ calls_flash_erase_block_2: @ 8152A80 ldrh r3, [r0, 0x4] movs r4, 0 mov r9, r2 - ldr r2, _08152B54 + ldr r2, =0x03006204 mov r12, r2 mov r8, r12 movs r2, 0 - ldr r1, _08152B58 + ldr r1, =0x00000fff _08152AD2: mov r7, r8 ldr r0, [r7] @@ -693699,14 +670569,14 @@ _08152AD2: bls _08152AD2 mov r0, r12 ldr r1, [r0] - ldr r2, _08152B5C + ldr r2, =0x00000ff4 adds r0, r1, r2 strh r6, [r0] - ldr r6, _08152B60 + ldr r6, =0x00000ff8 adds r2, r1, r6 - ldr r0, _08152B64 + ldr r0, =0x08012025 str r0, [r2] - ldr r7, _08152B68 + ldr r7, =0x00000ffc adds r1, r7 mov r2, r9 ldr r0, [r2] @@ -693733,34 +670603,23 @@ _08152B22: mov r0, r10 adds r1, r3, 0 bl sub_8153164 - ldr r1, _08152B54 + ldr r1, =0x03006204 ldr r1, [r1] - ldr r2, _08152B6C + ldr r2, =0x00000ff6 adds r1, r2 strh r0, [r1] - ldr r0, _08152B70 + ldr r0, =0x03007860 ldr r1, [r0] adds r0, r5, 0 bl _call_via_r1 movs r6, 0x1 movs r4, 0 - ldr r7, _08152B74 + ldr r7, =0x00000ff7 mov r9, r7 - ldr r7, _08152B78 + ldr r7, =0x03007854 b _08152B82 .align 2, 0 -_08152B4C: .4byte 0x030061f0 -_08152B50: .4byte 0x03006200 -_08152B54: .4byte 0x03006204 -_08152B58: .4byte 0x00000fff -_08152B5C: .4byte 0x00000ff4 -_08152B60: .4byte 0x00000ff8 -_08152B64: .4byte 0x08012025 -_08152B68: .4byte 0x00000ffc -_08152B6C: .4byte 0x00000ff6 -_08152B70: .4byte 0x03007860 -_08152B74: .4byte 0x00000ff7 -_08152B78: .4byte 0x03007854 + .pool _08152B7C: adds r0, r4, 0x1 lsls r0, 16 @@ -693768,7 +670627,7 @@ _08152B7C: _08152B82: cmp r4, r9 bhi _08152BA0 - ldr r0, _08152BAC + ldr r0, =0x03006204 ldr r0, [r0] adds r0, r4 ldrb r2, [r0] @@ -693787,17 +670646,16 @@ _08152BA0: lsrs r1, r0, 24 b _08152C08 .align 2, 0 -_08152BAC: .4byte 0x03006204 + .pool _08152BB0: movs r6, 0x1 movs r4, 0 - ldr r1, _08152BBC + ldr r1, =0x03007854 mov r9, r1 - ldr r7, _08152BC0 + ldr r7, =0x00000ff9 b _08152BCA .align 2, 0 -_08152BBC: .4byte 0x03007854 -_08152BC0: .4byte 0x00000ff9 + .pool _08152BC4: adds r0, r4, 0x1 lsls r0, 16 @@ -693806,7 +670664,7 @@ _08152BCA: cmp r4, 0x6 bhi _08152BEC adds r1, r4, r7 - ldr r0, _08152C00 + ldr r0, =0x03006204 ldr r0, [r0] adds r0, r4, r0 adds r0, r7 @@ -693829,7 +670687,7 @@ _08152BEC: movs r0, 0x1 b _08152C10 .align 2, 0 -_08152C00: .4byte 0x03006204 + .pool _08152C04: mov r6, r8 lsrs r1, r6, 24 @@ -693851,7 +670709,7 @@ _08152C10: sav12_xor_get: @ 8152C20 push {r4-r6,lr} lsls r0, 16 - ldr r6, _08152C74 + ldr r6, =0x030061f0 lsrs r0, 16 ldrh r1, [r6] adds r0, r1 @@ -693862,7 +670720,7 @@ sav12_xor_get: @ 8152C20 bl __umodsi3 lsls r0, 16 lsrs r4, r0, 16 - ldr r5, _08152C78 + ldr r5, =0x03006200 ldr r1, [r5] movs r0, 0x1 ands r1, r0 @@ -693872,8 +670730,8 @@ sav12_xor_get: @ 8152C20 adds r0, r4, r0 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _08152C7C - ldr r1, _08152C80 + ldr r0, =0x03007854 + ldr r1, =0x00000ff8 ldr r3, [r0] adds r0, r4, 0 movs r2, 0x25 @@ -693888,19 +670746,16 @@ sav12_xor_get: @ 8152C20 movs r0, 0x1 b _08152C9C .align 2, 0 -_08152C74: .4byte 0x030061f0 -_08152C78: .4byte 0x03006200 -_08152C7C: .4byte 0x03007854 -_08152C80: .4byte 0x00000ff8 + .pool _08152C84: lsls r1, r4, 24 lsrs r1, 24 movs r0, 0 bl sub_815269C - ldr r0, _08152CA4 + ldr r0, =0x030061f8 ldrh r0, [r0] strh r0, [r6] - ldr r0, _08152CA8 + ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r5] movs r0, 0xFF @@ -693909,15 +670764,14 @@ _08152C9C: pop {r1} bx r1 .align 2, 0 -_08152CA4: .4byte 0x030061f8 -_08152CA8: .4byte 0x030061f4 + .pool thumb_func_end sav12_xor_get thumb_func_start sub_8152CAC sub_8152CAC: @ 8152CAC push {r4-r6,lr} lsls r0, 16 - ldr r6, _08152D08 + ldr r6, =0x030061f0 lsrs r0, 16 ldrh r1, [r6] adds r0, r1 @@ -693929,7 +670783,7 @@ sub_8152CAC: @ 8152CAC bl __umodsi3 lsls r0, 16 lsrs r4, r0, 16 - ldr r5, _08152D0C + ldr r5, =0x03006200 ldr r1, [r5] movs r0, 0x1 ands r1, r0 @@ -693939,9 +670793,9 @@ sub_8152CAC: @ 8152CAC adds r0, r4, r0 lsls r0, 16 lsrs r4, r0, 16 - ldr r3, _08152D10 - ldr r1, _08152D14 - ldr r0, _08152D18 + ldr r3, =0x03007854 + ldr r1, =0x00000ff8 + ldr r0, =0x03006204 ldr r0, [r0] adds r0, r1 ldrb r2, [r0] @@ -693958,20 +670812,16 @@ sub_8152CAC: @ 8152CAC movs r0, 0x1 b _08152D34 .align 2, 0 -_08152D08: .4byte 0x030061f0 -_08152D0C: .4byte 0x03006200 -_08152D10: .4byte 0x03007854 -_08152D14: .4byte 0x00000ff8 -_08152D18: .4byte 0x03006204 + .pool _08152D1C: lsls r1, r4, 24 lsrs r1, 24 movs r0, 0 bl sub_815269C - ldr r0, _08152D3C + ldr r0, =0x030061f8 ldrh r0, [r0] strh r0, [r6] - ldr r0, _08152D40 + ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r5] movs r0, 0xFF @@ -693980,15 +670830,14 @@ _08152D34: pop {r1} bx r1 .align 2, 0 -_08152D3C: .4byte 0x030061f8 -_08152D40: .4byte 0x030061f4 + .pool thumb_func_end sub_8152CAC thumb_func_start sub_8152D44 sub_8152D44: @ 8152D44 push {r4-r6,lr} lsls r0, 16 - ldr r6, _08152D98 + ldr r6, =0x030061f0 lsrs r0, 16 ldrh r1, [r6] adds r0, r1 @@ -694000,7 +670849,7 @@ sub_8152D44: @ 8152D44 bl __umodsi3 lsls r0, 16 lsrs r4, r0, 16 - ldr r5, _08152D9C + ldr r5, =0x03006200 ldr r1, [r5] movs r0, 0x1 ands r1, r0 @@ -694010,8 +670859,8 @@ sub_8152D44: @ 8152D44 adds r0, r4, r0 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _08152DA0 - ldr r1, _08152DA4 + ldr r0, =0x03007854 + ldr r1, =0x00000ff8 ldr r3, [r0] adds r0, r4, 0 movs r2, 0x25 @@ -694026,19 +670875,16 @@ sub_8152D44: @ 8152D44 movs r0, 0x1 b _08152DC0 .align 2, 0 -_08152D98: .4byte 0x030061f0 -_08152D9C: .4byte 0x03006200 -_08152DA0: .4byte 0x03007854 -_08152DA4: .4byte 0x00000ff8 + .pool _08152DA8: lsls r1, r4, 24 lsrs r1, 24 movs r0, 0 bl sub_815269C - ldr r0, _08152DC8 + ldr r0, =0x030061f8 ldrh r0, [r0] strh r0, [r6] - ldr r0, _08152DCC + ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r5] movs r0, 0xFF @@ -694047,8 +670893,7 @@ _08152DC0: pop {r1} bx r1 .align 2, 0 -_08152DC8: .4byte 0x030061f8 -_08152DCC: .4byte 0x030061f4 + .pool thumb_func_end sub_8152D44 thumb_func_start sub_8152DD0 @@ -694057,18 +670902,16 @@ sub_8152DD0: @ 8152DD0 adds r6, r1, 0 lsls r0, 16 lsrs r4, r0, 16 - ldr r1, _08152DE8 - ldr r0, _08152DEC + ldr r1, =0x03006204 + ldr r0, =0x0203abbc str r0, [r1] - ldr r0, _08152DF0 + ldr r0, =0x0000ffff cmp r4, r0 beq _08152DF4 movs r5, 0xFF b _08152E06 .align 2, 0 -_08152DE8: .4byte 0x03006204 -_08152DEC: .4byte 0x0203abbc -_08152DF0: .4byte 0x0000ffff + .pool _08152DF4: adds r0, r6, 0 bl sub_8152EC8 @@ -694090,7 +670933,7 @@ sub_8152E10: @ 8152E10 mov r7, r8 push {r7} mov r8, r1 - ldr r0, _08152EAC + ldr r0, =0x03006200 ldr r1, [r0] movs r0, 0x1 ands r1, r0 @@ -694099,7 +670942,7 @@ sub_8152E10: @ 8152E10 lsls r0, 17 lsrs r7, r0, 16 movs r5, 0 - ldr r6, _08152EB0 + ldr r6, =0x03006204 _08152E2C: adds r0, r5, r7 lsls r0, 24 @@ -694107,12 +670950,12 @@ _08152E2C: ldr r1, [r6] bl sub_815314C ldr r0, [r6] - ldr r1, _08152EB4 + ldr r1, =0x00000ff4 adds r0, r1 ldrh r1, [r0] cmp r1, 0 bne _08152E48 - ldr r0, _08152EB8 + ldr r0, =0x030061f0 strh r5, [r0] _08152E48: ldr r0, [r6] @@ -694124,14 +670967,14 @@ _08152E48: lsls r0, 16 lsrs r3, r0, 16 ldr r2, [r6] - ldr r1, _08152EBC + ldr r1, =0x00000ff8 adds r0, r2, r1 ldr r1, [r0] - ldr r0, _08152EC0 + ldr r0, =0x08012025 adds r5, 0x1 cmp r1, r0 bne _08152E98 - ldr r1, _08152EC4 + ldr r1, =0x00000ff6 adds r0, r2, r1 ldrh r0, [r0] cmp r0, r3 @@ -694141,7 +670984,7 @@ _08152E48: cmp r2, r0 bcs _08152E98 adds r3, r4, 0 - ldr r4, _08152EB0 + ldr r4, =0x03006204 _08152E80: ldr r1, [r3] adds r1, r2 @@ -694167,13 +671010,7 @@ _08152E98: pop {r1} bx r1 .align 2, 0 -_08152EAC: .4byte 0x03006200 -_08152EB0: .4byte 0x03006204 -_08152EB4: .4byte 0x00000ff4 -_08152EB8: .4byte 0x030061f0 -_08152EBC: .4byte 0x00000ff8 -_08152EC0: .4byte 0x08012025 -_08152EC4: .4byte 0x00000ff6 + .pool thumb_func_end sub_8152E10 thumb_func_start sub_8152EC8 @@ -694191,21 +671028,21 @@ sub_8152EC8: @ 8152EC8 movs r6, 0 movs r5, 0 movs r4, 0 - ldr r7, _08152F54 + ldr r7, =0x03006204 _08152EE4: lsls r0, r4, 24 lsrs r0, 24 ldr r1, [r7] bl sub_815314C ldr r2, [r7] - ldr r1, _08152F58 + ldr r1, =0x00000ff8 adds r0, r2, r1 ldr r1, [r0] - ldr r0, _08152F5C + ldr r0, =0x08012025 cmp r1, r0 bne _08152F34 movs r5, 0x1 - ldr r3, _08152F60 + ldr r3, =0x00000ff4 adds r0, r2, r3 ldrh r0, [r0] lsls r0, 3 @@ -694216,12 +671053,12 @@ _08152EE4: lsls r0, 16 lsrs r2, r0, 16 ldr r1, [r7] - ldr r3, _08152F64 + ldr r3, =0x00000ff6 adds r0, r1, r3 ldrh r0, [r0] cmp r0, r2 bne _08152F34 - ldr r2, _08152F68 + ldr r2, =0x00000ffc adds r0, r1, r2 ldr r0, [r0] mov r8, r0 @@ -694239,7 +671076,7 @@ _08152F34: bls _08152EE4 cmp r5, 0 beq _08152F70 - ldr r0, _08152F6C + ldr r0, =0x00003fff movs r1, 0xFF str r1, [sp] cmp r6, r0 @@ -694248,13 +671085,7 @@ _08152F34: str r2, [sp] b _08152F74 .align 2, 0 -_08152F54: .4byte 0x03006204 -_08152F58: .4byte 0x00000ff8 -_08152F5C: .4byte 0x08012025 -_08152F60: .4byte 0x00000ff4 -_08152F64: .4byte 0x00000ff6 -_08152F68: .4byte 0x00000ffc -_08152F6C: .4byte 0x00003fff + .pool _08152F70: movs r3, 0 str r3, [sp] @@ -694262,7 +671093,7 @@ _08152F74: movs r6, 0 movs r5, 0 movs r4, 0 - ldr r7, _08152FEC + ldr r7, =0x03006204 _08152F7C: adds r0, r4, 0 adds r0, 0xE @@ -694271,14 +671102,14 @@ _08152F7C: ldr r1, [r7] bl sub_815314C ldr r2, [r7] - ldr r1, _08152FF0 + ldr r1, =0x00000ff8 adds r0, r2, r1 ldr r1, [r0] - ldr r0, _08152FF4 + ldr r0, =0x08012025 cmp r1, r0 bne _08152FD0 movs r5, 0x1 - ldr r3, _08152FF8 + ldr r3, =0x00000ff4 adds r0, r2, r3 ldrh r0, [r0] lsls r0, 3 @@ -694289,12 +671120,12 @@ _08152F7C: lsls r0, 16 lsrs r2, r0, 16 ldr r1, [r7] - ldr r3, _08152FFC + ldr r3, =0x00000ff6 adds r0, r1, r3 ldrh r0, [r0] cmp r0, r2 bne _08152FD0 - ldr r2, _08153000 + ldr r2, =0x00000ffc adds r0, r1, r2 ldr r0, [r0] mov r9, r0 @@ -694312,20 +671143,14 @@ _08152FD0: bls _08152F7C cmp r5, 0 beq _08153008 - ldr r0, _08153004 + ldr r0, =0x00003fff movs r1, 0xFF cmp r6, r0 bne _0815300A movs r1, 0x1 b _0815300A .align 2, 0 -_08152FEC: .4byte 0x03006204 -_08152FF0: .4byte 0x00000ff8 -_08152FF4: .4byte 0x08012025 -_08152FF8: .4byte 0x00000ff4 -_08152FFC: .4byte 0x00000ff6 -_08153000: .4byte 0x00000ffc -_08153004: .4byte 0x00003fff + .pool _08153008: movs r1, 0 _0815300A: @@ -694354,48 +671179,48 @@ _0815302C: adds r0, 0x1 cmp r1, r0 bcs _08153044 - ldr r0, _08153040 + ldr r0, =0x03006200 mov r3, r9 b _08153064 .align 2, 0 -_08153040: .4byte 0x03006200 + .pool _08153044: - ldr r0, _0815304C + ldr r0, =0x03006200 mov r1, r8 str r1, [r0] b _08153094 .align 2, 0 -_0815304C: .4byte 0x03006200 + .pool _08153050: cmp r8, r9 bcs _08153060 - ldr r0, _0815305C + ldr r0, =0x03006200 mov r2, r9 str r2, [r0] b _08153094 .align 2, 0 -_0815305C: .4byte 0x03006200 + .pool _08153060: - ldr r0, _08153068 + ldr r0, =0x03006200 mov r3, r8 _08153064: str r3, [r0] b _08153094 .align 2, 0 -_08153068: .4byte 0x03006200 + .pool _0815306C: - ldr r0, _08153078 + ldr r0, =0x03006200 mov r2, r8 str r2, [r0] cmp r1, 0xFF beq _0815308C b _08153094 .align 2, 0 -_08153078: .4byte 0x03006200 + .pool _0815307C: cmp r1, 0x1 bne _08153098 - ldr r0, _08153090 + ldr r0, =0x03006200 mov r3, r9 str r3, [r0] ldr r0, [sp] @@ -694405,7 +671230,7 @@ _0815308C: movs r0, 0xFF b _081530C4 .align 2, 0 -_08153090: .4byte 0x03006200 + .pool _08153094: movs r0, 0x1 b _081530C4 @@ -694415,20 +671240,19 @@ _08153098: bne _081530B8 cmp r1, 0 bne _081530B8 - ldr r0, _081530B0 + ldr r0, =0x03006200 str r1, [r0] - ldr r0, _081530B4 + ldr r0, =0x030061f0 strh r1, [r0] movs r0, 0 b _081530C4 .align 2, 0 -_081530B0: .4byte 0x03006200 -_081530B4: .4byte 0x030061f0 + .pool _081530B8: - ldr r0, _081530D4 + ldr r0, =0x03006200 movs r1, 0 str r1, [r0] - ldr r0, _081530D8 + ldr r0, =0x030061f0 strh r1, [r0] movs r0, 0x2 _081530C4: @@ -694441,8 +671265,7 @@ _081530C4: pop {r1} bx r1 .align 2, 0 -_081530D4: .4byte 0x03006200 -_081530D8: .4byte 0x030061f0 + .pool thumb_func_end sub_8152EC8 thumb_func_start sub_81530DC @@ -694453,13 +671276,13 @@ sub_81530DC: @ 81530DC lsrs r0, 24 lsls r2, 16 lsrs r4, r2, 16 - ldr r5, _08153130 + ldr r5, =0x0203abbc adds r1, r5, 0 bl sub_815314C - ldr r1, _08153134 + ldr r1, =0x00000ff8 adds r0, r5, r1 ldr r1, [r0] - ldr r0, _08153138 + ldr r0, =0x08012025 cmp r1, r0 bne _08153144 adds r0, r5, 0 @@ -694467,7 +671290,7 @@ sub_81530DC: @ 81530DC bl sub_8153164 lsls r0, 16 lsrs r0, 16 - ldr r2, _0815313C + ldr r2, =0x00000ff4 adds r1, r5, r2 ldrh r1, [r1] cmp r1, r0 @@ -694489,10 +671312,7 @@ _0815312A: movs r0, 0x1 b _08153146 .align 2, 0 -_08153130: .4byte 0x0203abbc -_08153134: .4byte 0x00000ff8 -_08153138: .4byte 0x08012025 -_0815313C: .4byte 0x00000ff4 + .pool _08153140: movs r0, 0x2 b _08153146 @@ -694550,16 +671370,16 @@ _08153182: thumb_func_start sub_8153190 sub_8153190: @ 8153190 push {r4,r5,lr} - ldr r3, _081531F0 - ldr r0, _081531F4 - ldr r2, _081531F8 + ldr r3, =0x03006220 + ldr r0, =0x03005d90 + ldr r2, =0x085cdc00 ldrh r1, [r2] ldr r0, [r0] adds r0, r1 str r0, [r3] ldrh r0, [r2, 0x2] strh r0, [r3, 0x4] - ldr r5, _081531FC + ldr r5, =0x03005d8c adds r3, 0x8 adds r2, 0x4 movs r4, 0x3 @@ -694576,9 +671396,9 @@ _081531AC: cmp r4, 0 bge _081531AC movs r4, 0x5 - ldr r1, _081531F0 - ldr r5, _08153200 - ldr r0, _081531F8 + ldr r1, =0x03006220 + ldr r5, =0x03005d94 + ldr r0, =0x085cdc00 adds r3, r1, 0 adds r3, 0x28 adds r2, r0, 0 @@ -694599,11 +671419,7 @@ _081531D2: pop {r0} bx r0 .align 2, 0 -_081531F0: .4byte 0x03006220 -_081531F4: .4byte 0x03005d90 -_081531F8: .4byte 0x085cdc00 -_081531FC: .4byte 0x03005d8c -_08153200: .4byte 0x03005d94 + .pool thumb_func_end sub_8153190 thumb_func_start calls_flash_erase_block_3 @@ -694611,7 +671427,7 @@ calls_flash_erase_block_3: @ 8153204 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08153224 + ldr r1, =0x0203cf5c ldr r6, [r1] movs r0, 0 str r0, [r1] @@ -694619,13 +671435,12 @@ calls_flash_erase_block_3: @ 8153204 cmp r4, 0x5 bhi _081532AC lsls r0, r4, 2 - ldr r1, _08153228 + ldr r1, =_0815322C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08153224: .4byte 0x0203cf5c -_08153228: .4byte _0815322C + .pool .align 2, 0 _0815322C: .4byte _081532AC @@ -694636,7 +671451,7 @@ _0815322C: .4byte _08153244 _08153244: movs r4, 0x1C - ldr r5, _08153298 + ldr r5, =0x03007860 _08153248: ldr r1, [r5] adds r0, r4, 0 @@ -694649,17 +671464,17 @@ _08153248: _0815325A: movs r0, 0xA bl sub_80847F8 - ldr r1, _0815329C + ldr r1, =0x000003e6 cmp r0, r1 bhi _0815326C movs r0, 0xA bl sav12_xor_increment _0815326C: bl save_serialize_game - ldr r0, _081532A0 - ldr r1, _081532A4 + ldr r0, =0x0000ffff + ldr r1, =0x03006220 bl save_write_to_flash - ldr r4, _081532A8 + ldr r4, =0x0201c000 movs r5, 0xF8 lsls r5, 4 movs r0, 0x1C @@ -694673,26 +671488,21 @@ _0815326C: bl sub_8152890 b _0815331A .align 2, 0 -_08153298: .4byte 0x03007860 -_0815329C: .4byte 0x000003e6 -_081532A0: .4byte 0x0000ffff -_081532A4: .4byte 0x03006220 -_081532A8: .4byte 0x0201c000 + .pool _081532AC: bl save_serialize_game - ldr r0, _081532BC - ldr r1, _081532C0 + ldr r0, =0x0000ffff + ldr r1, =0x03006220 bl save_write_to_flash b _0815331A .align 2, 0 -_081532BC: .4byte 0x0000ffff -_081532C0: .4byte 0x03006220 + .pool _081532C4: bl save_serialize_game movs r4, 0 _081532CA: adds r0, r4, 0 - ldr r1, _081532F4 + ldr r1, =0x03006220 bl calls_flash_erase_block_2 adds r0, r4, 0x1 lsls r0, 24 @@ -694702,7 +671512,7 @@ _081532CA: movs r4, 0 _081532DE: adds r0, r4, 0 - ldr r1, _081532F4 + ldr r1, =0x03006220 bl sav12_xor_get adds r0, r4, 0x1 lsls r0, 24 @@ -694711,10 +671521,10 @@ _081532DE: bls _081532DE b _0815331A .align 2, 0 -_081532F4: .4byte 0x03006220 + .pool _081532F8: movs r4, 0x1C - ldr r5, _08153328 + ldr r5, =0x03007860 _081532FC: ldr r1, [r5] adds r0, r4, 0 @@ -694725,21 +671535,18 @@ _081532FC: cmp r4, 0x1F bls _081532FC bl save_serialize_game - ldr r0, _0815332C - ldr r1, _08153330 + ldr r0, =0x0000ffff + ldr r1, =0x03006220 bl save_write_to_flash _0815331A: - ldr r0, _08153334 + ldr r0, =0x0203cf5c str r6, [r0] movs r0, 0 pop {r4-r6} pop {r1} bx r1 .align 2, 0 -_08153328: .4byte 0x03007860 -_0815332C: .4byte 0x0000ffff -_08153330: .4byte 0x03006220 -_08153334: .4byte 0x0203cf5c + .pool thumb_func_end calls_flash_erase_block_3 thumb_func_start save_game_when_memory_present @@ -694747,30 +671554,28 @@ save_game_when_memory_present: @ 8153338 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08153364 + ldr r0, =0x03005d88 ldr r4, [r0] cmp r4, 0x1 bne _0815335A adds r0, r5, 0 bl calls_flash_erase_block_3 - ldr r0, _08153368 + ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 beq _08153370 adds r0, r5, 0 bl fullscreen_save_activate _0815335A: - ldr r1, _0815336C + ldr r1, =0x03006294 movs r0, 0xFF strh r0, [r1] movs r0, 0xFF b _08153376 .align 2, 0 -_08153364: .4byte 0x03005d88 -_08153368: .4byte 0x030061fc -_0815336C: .4byte 0x03006294 + .pool _08153370: - ldr r0, _0815337C + ldr r0, =0x03006294 strh r4, [r0] movs r0, 0x1 _08153376: @@ -694778,25 +671583,24 @@ _08153376: pop {r1} bx r1 .align 2, 0 -_0815337C: .4byte 0x03006294 + .pool thumb_func_end save_game_when_memory_present thumb_func_start sub_8153380 sub_8153380: @ 8153380 push {lr} - ldr r0, _0815339C + ldr r0, =0x03005d88 ldr r0, [r0] cmp r0, 0x1 bne _081533A4 bl sub_8153190 bl save_serialize_game - ldr r0, _081533A0 + ldr r0, =0x03006220 bl sub_8152934 movs r0, 0 b _081533A6 .align 2, 0 -_0815339C: .4byte 0x03005d88 -_081533A0: .4byte 0x03006220 + .pool _081533A4: movs r0, 0x1 _081533A6: @@ -694807,12 +671611,12 @@ _081533A6: thumb_func_start sub_81533AC sub_81533AC: @ 81533AC push {r4,lr} - ldr r1, _081533D0 + ldr r1, =0x03006220 movs r0, 0xE bl sub_81529D4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081533D4 + ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 beq _081533C8 @@ -694824,8 +671628,7 @@ _081533C8: movs r0, 0 b _081533DA .align 2, 0 -_081533D0: .4byte 0x03006220 -_081533D4: .4byte 0x030061fc + .pool _081533D8: movs r0, 0x1 _081533DA: @@ -694837,10 +671640,10 @@ _081533DA: thumb_func_start sub_81533E0 sub_81533E0: @ 81533E0 push {lr} - ldr r1, _08153400 + ldr r1, =0x03006220 movs r0, 0xE bl sub_8152A34 - ldr r0, _08153404 + ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 beq _081533F8 @@ -694851,17 +671654,16 @@ _081533F8: pop {r1} bx r1 .align 2, 0 -_08153400: .4byte 0x03006220 -_08153404: .4byte 0x030061fc + .pool thumb_func_end sub_81533E0 thumb_func_start sub_8153408 sub_8153408: @ 8153408 push {lr} - ldr r1, _08153428 + ldr r1, =0x03006220 movs r0, 0xE bl sub_8152CAC - ldr r0, _0815342C + ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 beq _08153420 @@ -694872,23 +671674,22 @@ _08153420: pop {r1} bx r1 .align 2, 0 -_08153428: .4byte 0x03006220 -_0815342C: .4byte 0x030061fc + .pool thumb_func_end sub_8153408 thumb_func_start sub_8153430 sub_8153430: @ 8153430 push {r4,lr} - ldr r0, _08153460 + ldr r0, =0x03005d88 ldr r0, [r0] cmp r0, 0x1 bne _0815346C bl sub_8153190 bl save_serialize_game - ldr r4, _08153464 + ldr r4, =0x03006220 adds r0, r4, 0 bl sub_8152990 - ldr r0, _08153468 + ldr r0, =0x03006208 ldrh r0, [r0] adds r0, 0x1 lsls r0, 16 @@ -694898,9 +671699,7 @@ sub_8153430: @ 8153430 movs r0, 0 b _0815346E .align 2, 0 -_08153460: .4byte 0x03005d88 -_08153464: .4byte 0x03006220 -_08153468: .4byte 0x03006208 + .pool _0815346C: movs r0, 0x1 _0815346E: @@ -694913,7 +671712,7 @@ _0815346E: sub_8153474: @ 8153474 push {r4-r6,lr} movs r6, 0 - ldr r0, _081534A0 + ldr r0, =0x03006208 ldrh r1, [r0] adds r1, 0x1 strh r1, [r0] @@ -694924,7 +671723,7 @@ sub_8153474: @ 8153474 adds r0, r1, 0x1 lsls r0, 16 lsrs r0, 16 - ldr r4, _081534A4 + ldr r4, =0x03006220 adds r1, r4, 0 bl sub_8152A34 adds r0, r5, 0 @@ -694932,15 +671731,14 @@ sub_8153474: @ 8153474 bl sub_8152D44 b _081534B2 .align 2, 0 -_081534A0: .4byte 0x03006208 -_081534A4: .4byte 0x03006220 + .pool _081534A8: - ldr r1, _081534C8 + ldr r1, =0x03006220 adds r0, r5, 0 bl sub_8152D44 movs r6, 0x1 _081534B2: - ldr r0, _081534CC + ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 beq _081534C0 @@ -694952,8 +671750,7 @@ _081534C0: pop {r1} bx r1 .align 2, 0 -_081534C8: .4byte 0x03006220 -_081534CC: .4byte 0x030061fc + .pool thumb_func_end sub_8153474 thumb_func_start sub_81534D0 @@ -694961,18 +671758,17 @@ sub_81534D0: @ 81534D0 push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081534E8 + ldr r0, =0x03005d88 ldr r0, [r0] cmp r0, 0x1 beq _081534F0 - ldr r1, _081534EC + ldr r1, =0x03006210 movs r0, 0x4 strh r0, [r1] movs r0, 0xFF b _08153550 .align 2, 0 -_081534E8: .4byte 0x03005d88 -_081534EC: .4byte 0x03006210 + .pool _081534F0: bl sub_8153190 cmp r4, 0 @@ -694980,25 +671776,22 @@ _081534F0: cmp r4, 0x3 beq _08153528 _081534FC: - ldr r0, _08153518 - ldr r1, _0815351C + ldr r0, =0x0000ffff + ldr r1, =0x03006220 bl sub_8152DD0 lsls r0, 24 lsrs r4, r0, 24 bl save_deserialize_game - ldr r0, _08153520 + ldr r0, =0x03006210 strh r4, [r0] - ldr r1, _08153524 + ldr r1, =0x03006214 movs r0, 0 str r0, [r1] b _0815354E .align 2, 0 -_08153518: .4byte 0x0000ffff -_0815351C: .4byte 0x03006220 -_08153520: .4byte 0x03006210 -_08153524: .4byte 0x03006214 + .pool _08153528: - ldr r5, _08153558 + ldr r5, =0x0201c000 movs r6, 0xF8 lsls r6, 4 movs r0, 0x1C @@ -695022,25 +671815,23 @@ _08153550: pop {r1} bx r1 .align 2, 0 -_08153558: .4byte 0x0201c000 + .pool thumb_func_end sub_81534D0 thumb_func_start sub_815355C sub_815355C: @ 815355C push {r4-r7,lr} - ldr r5, _08153570 - ldr r0, _08153574 + ldr r5, =0x03006204 + ldr r0, =0x0203abbc str r0, [r5] adds r7, r0, 0 - ldr r0, _08153578 + ldr r0, =0x03005d88 ldr r4, [r0] cmp r4, 0x1 beq _0815358C b _081535C8 .align 2, 0 -_08153570: .4byte 0x03006204 -_08153574: .4byte 0x0203abbc -_08153578: .4byte 0x03005d88 + .pool _0815357C: ldrb r1, [r7, 0xA] ldrb r0, [r7, 0xB] @@ -695052,9 +671843,9 @@ _0815357C: b _081535CA _0815358C: bl sub_8153190 - ldr r0, _081535D0 + ldr r0, =0x03006220 bl sub_8152EC8 - ldr r0, _081535D4 + ldr r0, =0x03006200 ldr r1, [r0] ands r1, r4 lsls r0, r1, 3 @@ -695069,7 +671860,7 @@ _081535A6: ldr r1, [r5] bl sub_815314C ldr r0, [r5] - ldr r1, _081535D8 + ldr r1, =0x00000ff4 adds r0, r1 ldrh r0, [r0] cmp r0, 0 @@ -695086,9 +671877,7 @@ _081535CA: pop {r1} bx r1 .align 2, 0 -_081535D0: .4byte 0x03006220 -_081535D4: .4byte 0x03006200 -_081535D8: .4byte 0x00000ff4 + .pool thumb_func_end sub_815355C thumb_func_start sub_81535DC @@ -695103,7 +671892,7 @@ sub_81535DC: @ 81535DC lsrs r0, 24 cmp r0, 0x1 bhi _08153608 - ldr r4, _0815360C + ldr r4, =0x0203abbc movs r3, 0x80 lsls r3, 5 adds r0, r1, 0 @@ -695111,18 +671900,17 @@ sub_81535DC: @ 81535DC adds r2, r4, 0 bl ReadFlash ldr r1, [r4] - ldr r0, _08153610 + ldr r0, =0x0000b39d cmp r1, r0 beq _08153614 _08153608: movs r0, 0xFF b _0815362A .align 2, 0 -_0815360C: .4byte 0x0203abbc -_08153610: .4byte 0x0000b39d + .pool _08153614: movs r3, 0 - ldr r5, _08153630 + ldr r5, =0x00000ffb adds r2, r4, 0x4 _0815361A: adds r0, r6, r3 @@ -695138,7 +671926,7 @@ _0815362A: pop {r1} bx r1 .align 2, 0 -_08153630: .4byte 0x00000ffb + .pool thumb_func_end sub_81535DC thumb_func_start sub_8153634 @@ -695153,12 +671941,12 @@ sub_8153634: @ 8153634 lsrs r0, 24 cmp r0, 0x1 bhi _08153680 - ldr r7, _08153674 - ldr r0, _08153678 + ldr r7, =0x0203abbc + ldr r0, =0x0000b39d adds r3, r7, 0 stm r3!, {r0} movs r2, 0 - ldr r4, _0815367C + ldr r4, =0x00000ffb _08153654: adds r0, r3, r2 adds r1, r5, r2 @@ -695175,9 +671963,7 @@ _08153654: movs r0, 0x1 b _08153682 .align 2, 0 -_08153674: .4byte 0x0203abbc -_08153678: .4byte 0x0000b39d -_0815367C: .4byte 0x00000ffb + .pool _08153680: movs r0, 0xFF _08153682: @@ -695194,7 +671980,7 @@ sub_8153688: @ 8153688 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _081536AC + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -695203,13 +671989,12 @@ sub_8153688: @ 8153688 b _081537C2 _081536A2: lsls r0, 2 - ldr r1, _081536B0 + ldr r1, =_081536B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081536AC: .4byte 0x03005e08 -_081536B0: .4byte _081536B4 + .pool .align 2, 0 _081536B4: .4byte _081536E4 @@ -695225,14 +672010,14 @@ _081536B4: .4byte _08153796 .4byte _081537A8 _081536E4: - ldr r0, _081536F0 + ldr r0, =0x03002700 movs r1, 0x1 strb r1, [r0] movs r0, 0x1 strh r0, [r4] b _081537C2 .align 2, 0 -_081536F0: .4byte 0x03002700 + .pool _081536F4: bl sub_800ADF8 movs r0, 0x2 @@ -695332,7 +672117,7 @@ _081537A8: asrs r0, 16 cmp r0, 0x5 ble _081537C2 - ldr r1, _081537C8 + ldr r1, =0x03002700 movs r0, 0 strb r0, [r1] adds r0, r2, 0 @@ -695342,7 +672127,7 @@ _081537C2: pop {r0} bx r0 .align 2, 0 -_081537C8: .4byte 0x03002700 + .pool thumb_func_end sub_8153688 thumb_func_start sub_81537CC @@ -695382,16 +672167,15 @@ _081537FE: thumb_func_start sub_8153804 sub_8153804: @ 8153804 push {lr} - ldr r0, _08153818 - ldr r1, _0815381C + ldr r0, =0x02021fc4 + ldr r1, =0x08674c86 bl ExpandTextCodes movs r0, 0x3 bl sub_81538C4 pop {r0} bx r0 .align 2, 0 -_08153818: .4byte 0x02021fc4 -_0815381C: .4byte 0x08674c86 + .pool thumb_func_end sub_8153804 thumb_func_start sub_8153820 @@ -695399,8 +672183,8 @@ sub_8153820: @ 8153820 push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r1, _08153848 - ldr r2, _0815384C + ldr r1, =0x082ded2c + ldr r2, =0x082ded70 bl script_env_init adds r0, r4, 0 adds r1, r5, 0 @@ -695414,8 +672198,7 @@ sub_8153820: @ 8153820 pop {r0} bx r0 .align 2, 0 -_08153848: .4byte 0x082ded2c -_0815384C: .4byte 0x082ded70 + .pool thumb_func_end sub_8153820 thumb_func_start sub_8153850 @@ -695443,19 +672226,19 @@ _0815386A: sub_8153870: @ 8153870 push {lr} adds r1, r0, 0 - ldr r0, _08153880 + ldr r0, =0x0203bbc0 bl sub_8153820 pop {r0} bx r0 .align 2, 0 -_08153880: .4byte 0x0203bbc0 + .pool thumb_func_end sub_8153870 thumb_func_start sub_8153884 sub_8153884: @ 8153884 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _0815389C + ldr r4, =0x0203bbc0 adds r0, r4, 0 bl sub_8153850 ldr r1, [r4, 0x6C] @@ -695464,14 +672247,14 @@ sub_8153884: @ 8153884 pop {r1} bx r1 .align 2, 0 -_0815389C: .4byte 0x0203bbc0 + .pool thumb_func_end sub_8153884 thumb_func_start sub_81538A0 sub_81538A0: @ 81538A0 push {r4,lr} adds r1, r0, 0 - ldr r4, _081538C0 + ldr r4, =0x0203bbc0 adds r0, r4, 0 bl sub_8153820 _081538AC: @@ -695484,25 +672267,25 @@ _081538AC: pop {r1} bx r1 .align 2, 0 -_081538C0: .4byte 0x0203bbc0 + .pool thumb_func_end sub_81538A0 thumb_func_start sub_81538C4 sub_81538C4: @ 81538C4 - ldr r1, _081538CC + ldr r1, =0x0203bbc0 str r0, [r1, 0x6C] bx lr .align 2, 0 -_081538CC: .4byte 0x0203bbc0 + .pool thumb_func_end sub_81538C4 thumb_func_start sub_81538D0 sub_81538D0: @ 81538D0 push {lr} movs r2, 0 - ldr r0, _081538F0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081538F4 + ldr r1, =0x00003b18 adds r3, r0, r1 movs r1, 0 _081538DE: @@ -695516,16 +672299,15 @@ _081538DE: pop {r1} bx r1 .align 2, 0 -_081538F0: .4byte 0x03005d8c -_081538F4: .4byte 0x00003b18 + .pool thumb_func_end sub_81538D0 thumb_func_start sub_81538F8 sub_81538F8: @ 81538F8 push {r4,r5,lr} - ldr r5, _08153930 + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r1, _08153934 + ldr r1, =0x00003b18 adds r4, r0, r1 bl sub_81538D0 adds r1, r0, 0 @@ -695541,7 +672323,7 @@ sub_81538F8: @ 81538F8 cmp r1, 0 beq _0815392A ldr r0, [r5] - ldr r2, _08153938 + ldr r2, =0x00003b14 adds r0, r2 ldr r0, [r0] cmp r1, r0 @@ -695550,9 +672332,7 @@ _0815392A: movs r0, 0 b _0815393E .align 2, 0 -_08153930: .4byte 0x03005d8c -_08153934: .4byte 0x00003b18 -_08153938: .4byte 0x00003b14 + .pool _0815393C: movs r0, 0x1 _0815393E: @@ -695568,20 +672348,18 @@ sub_8153944: @ 8153944 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r0, _08153964 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _08153968 + ldr r0, =0x00003b14 adds r1, r0 - ldr r2, _0815396C + ldr r2, =0x01000008 mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08153964: .4byte 0x03005d8c -_08153968: .4byte 0x00003b14 -_0815396C: .4byte 0x01000008 + .pool thumb_func_end sub_8153944 thumb_func_start sub_8153970 @@ -695606,13 +672384,13 @@ _08153990: bl sub_8153944 b _081539BC _08153996: - ldr r4, _081539C4 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _081539C8 + ldr r1, =0x00003b18 adds r0, r1 strb r3, [r0] ldr r0, [r4] - ldr r2, _081539CC + ldr r2, =0x00003b19 adds r0, r2 strb r5, [r0] ldr r0, [r4] @@ -695621,7 +672399,7 @@ _08153996: strh r6, [r0] bl sub_81538D0 ldr r1, [r4] - ldr r2, _081539D0 + ldr r2, =0x00003b14 adds r1, r2 str r0, [r1] _081539BC: @@ -695629,18 +672407,15 @@ _081539BC: pop {r0} bx r0 .align 2, 0 -_081539C4: .4byte 0x03005d8c -_081539C8: .4byte 0x00003b18 -_081539CC: .4byte 0x00003b19 -_081539D0: .4byte 0x00003b14 + .pool thumb_func_end sub_8153970 thumb_func_start sub_81539D4 sub_81539D4: @ 81539D4 push {r4-r6,lr} - ldr r6, _081539F0 + ldr r6, =0x03005d8c ldr r0, [r6] - ldr r1, _081539F4 + ldr r1, =0x00003b18 adds r4, r0, r1 bl sub_81538F8 cmp r0, 0 @@ -695649,8 +672424,7 @@ sub_81539D4: @ 81539D4 movs r0, 0 b _08153A1A .align 2, 0 -_081539F0: .4byte 0x03005d8c -_081539F4: .4byte 0x00003b18 + .pool _081539F8: ldrh r5, [r4, 0x2] ldrb r0, [r4, 0x1] @@ -695664,7 +672438,7 @@ _081539F8: _08153A0C: bl sub_81538D0 ldr r1, [r6] - ldr r2, _08153A20 + ldr r2, =0x00003b14 adds r1, r2 str r0, [r1] _08153A18: @@ -695674,7 +672448,7 @@ _08153A1A: pop {r1} bx r1 .align 2, 0 -_08153A20: .4byte 0x00003b14 + .pool thumb_func_end sub_81539D4 thumb_func_start script_status_stop_and_ret_1 @@ -695762,7 +672536,7 @@ sub_8153A94: @ 8153A94 cmp r5, r0 bne _08153ABE _08153AB8: - ldr r0, _08153AC8 + ldr r0, =0x02021fc4 bl ExpandTextCodes _08153ABE: movs r0, 0 @@ -695770,7 +672544,7 @@ _08153ABE: pop {r1} bx r1 .align 2, 0 -_08153AC8: .4byte 0x02021fc4 + .pool thumb_func_end sub_8153A94 thumb_func_start sub_8153ACC @@ -695805,17 +672579,17 @@ sub_8153AE8: @ 8153AE8 subs r4, r0 ldr r0, [r7, 0x64] adds r4, r0 - ldr r0, _08153B3C + ldr r0, =0x02021cc4 mov r9, r0 - ldr r6, _08153B40 + ldr r6, =0x03005d8c ldr r1, [r6] - ldr r5, _08153B44 + ldr r5, =0x000031f8 adds r1, r5 movs r2, 0x7 bl gf_strncpy adds r0, r4, 0 bl sub_80E15E4 - ldr r4, _08153B48 + ldr r4, =0x02021dc4 ldr r1, [r6] adds r1, r5 adds r0, r4, 0 @@ -695824,31 +672598,25 @@ sub_8153AE8: @ 8153AE8 mov r0, r8 cmp r0, 0 bne _08153B54 - ldr r0, _08153B4C - ldr r1, _08153B50 + ldr r0, =0x02021fc4 + ldr r1, =0x08674ae4 b _08153B74 .align 2, 0 -_08153B3C: .4byte 0x02021cc4 -_08153B40: .4byte 0x03005d8c -_08153B44: .4byte 0x000031f8 -_08153B48: .4byte 0x02021dc4 -_08153B4C: .4byte 0x02021fc4 -_08153B50: .4byte 0x08674ae4 + .pool _08153B54: mov r0, r9 adds r1, r4, 0 bl sub_8008C44 cmp r0, 0 beq _08153B70 - ldr r0, _08153B68 - ldr r1, _08153B6C + ldr r0, =0x02021fc4 + ldr r1, =0x08674b16 b _08153B74 .align 2, 0 -_08153B68: .4byte 0x02021fc4 -_08153B6C: .4byte 0x08674b16 + .pool _08153B70: - ldr r0, _08153B90 - ldr r1, _08153B94 + ldr r0, =0x02021fc4 + ldr r1, =0x08674b42 _08153B74: bl ExpandTextCodes movs r0, 0x2 @@ -695856,14 +672624,12 @@ _08153B74: bl sub_80E162C cmp r0, 0x1 bne _08153B9C - ldr r0, _08153B98 + ldr r0, =0x0000402d movs r1, 0x1 bl var_set b _08153BA0 .align 2, 0 -_08153B90: .4byte 0x02021fc4 -_08153B94: .4byte 0x08674b42 -_08153B98: .4byte 0x0000402d + .pool _08153B9C: movs r0, 0x1 str r0, [r7, 0x6C] @@ -695889,8 +672655,8 @@ sub_8153BB0: @ 8153BB0 adds r2, 0x1 str r2, [r4, 0x8] bl sub_80F9B30 - ldr r0, _08153BDC - ldr r1, _08153BE0 + ldr r0, =0x02021fc4 + ldr r1, =0x08674b6a bl ExpandTextCodes movs r0, 0x2 str r0, [r4, 0x6C] @@ -695899,8 +672665,7 @@ sub_8153BB0: @ 8153BB0 pop {r1} bx r1 .align 2, 0 -_08153BDC: .4byte 0x02021fc4 -_08153BE0: .4byte 0x08674b6a + .pool thumb_func_end sub_8153BB0 thumb_func_start sub_8153BE4 @@ -695960,8 +672725,8 @@ sub_8153C4C: @ 8153C4C push {r4,lr} adds r4, r0, 0 bl sub_809D3E8 - ldr r0, _08153C68 - ldr r1, _08153C6C + ldr r0, =0x02021fc4 + ldr r1, =0x08674b9e bl ExpandTextCodes movs r0, 0x2 str r0, [r4, 0x6C] @@ -695970,8 +672735,7 @@ sub_8153C4C: @ 8153C4C pop {r1} bx r1 .align 2, 0 -_08153C68: .4byte 0x02021fc4 -_08153C6C: .4byte 0x08674b9e + .pool thumb_func_end sub_8153C4C thumb_func_start sub_8153C70 @@ -695983,8 +672747,8 @@ sub_8153C70: @ 8153C70 adds r1, 0x1 str r1, [r4, 0x8] bl sub_811EFC0 - ldr r0, _08153C94 - ldr r1, _08153C98 + ldr r0, =0x02021fc4 + ldr r1, =0x08674bd4 bl ExpandTextCodes movs r0, 0x2 str r0, [r4, 0x6C] @@ -695993,8 +672757,7 @@ sub_8153C70: @ 8153C70 pop {r1} bx r1 .align 2, 0 -_08153C94: .4byte 0x02021fc4 -_08153C98: .4byte 0x08674bd4 + .pool thumb_func_end sub_8153C70 thumb_func_start sub_8153C9C @@ -696049,37 +672812,32 @@ sub_8153CC8: @ 8153CC8 lsls r0, 1 cmp r4, r0 bne _08153D18 - ldr r0, _08153D10 - ldr r1, _08153D14 + ldr r0, =0x02021cc4 + ldr r1, =0x085e8264 movs r2, 0xB bl gf_strncpy b _08153D22 .align 2, 0 -_08153D10: .4byte 0x02021cc4 -_08153D14: .4byte 0x085e8264 + .pool _08153D18: - ldr r0, _08153D38 - ldr r1, _08153D3C + ldr r0, =0x02021cc4 + ldr r1, =0x085e8268 movs r2, 0xB bl gf_strncpy _08153D22: - ldr r0, _08153D40 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r0, 0x6 bne _08153D4C - ldr r0, _08153D44 - ldr r1, _08153D48 + ldr r0, =0x02021fc4 + ldr r1, =0x08674c02 bl ExpandTextCodes movs r0, 0x3 b _08153DB6 .align 2, 0 -_08153D38: .4byte 0x02021cc4 -_08153D3C: .4byte 0x085e8268 -_08153D40: .4byte 0x020244e9 -_08153D44: .4byte 0x02021fc4 -_08153D48: .4byte 0x08674c02 + .pool _08153D4C: - ldr r7, _08153DC8 + ldr r7, =0x020246e0 adds r0, r7, 0 adds r1, r5, 0 movs r2, 0x64 @@ -696119,8 +672877,8 @@ _08153D86: _08153DA4: bl party_compaction bl calc_player_party_count - ldr r0, _08153DCC - ldr r1, _08153DD0 + ldr r0, =0x02021fc4 + ldr r1, =0x08674bf0 bl ExpandTextCodes movs r0, 0x2 _08153DB6: @@ -696133,9 +672891,7 @@ _08153DB6: pop {r1} bx r1 .align 2, 0 -_08153DC8: .4byte 0x020246e0 -_08153DCC: .4byte 0x02021fc4 -_08153DD0: .4byte 0x08674bf0 + .pool thumb_func_end sub_8153CC8 thumb_func_start sub_8153DD4 @@ -696148,15 +672904,15 @@ sub_8153DD4: @ 8153DD4 subs r1, r0 ldr r0, [r4, 0x64] adds r1, r0 - ldr r0, _08153E0C + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _08153E10 + ldr r2, =0x00000bec adds r0, r2 movs r2, 0xBC bl memcpy bl sub_81652B4 - ldr r0, _08153E14 - ldr r1, _08153E18 + ldr r0, =0x02021fc4 + ldr r1, =0x08674c31 bl ExpandTextCodes movs r0, 0x2 str r0, [r4, 0x6C] @@ -696165,10 +672921,7 @@ sub_8153DD4: @ 8153DD4 pop {r1} bx r1 .align 2, 0 -_08153E0C: .4byte 0x03005d90 -_08153E10: .4byte 0x00000bec -_08153E14: .4byte 0x02021fc4 -_08153E18: .4byte 0x08674c31 + .pool thumb_func_end sub_8153DD4 thumb_func_start sub_8153E1C @@ -696176,8 +672929,8 @@ sub_8153E1C: @ 8153E1C push {r4,lr} adds r4, r0, 0 bl sub_809D5F4 - ldr r0, _08153E38 - ldr r1, _08153E3C + ldr r0, =0x02021fc4 + ldr r1, =0x085ecad8 bl ExpandTextCodes movs r0, 0x2 str r0, [r4, 0x6C] @@ -696186,8 +672939,7 @@ sub_8153E1C: @ 8153E1C pop {r1} bx r1 .align 2, 0 -_08153E38: .4byte 0x02021fc4 -_08153E3C: .4byte 0x085ecad8 + .pool thumb_func_end sub_8153E1C thumb_func_start sub_8153E40 @@ -696285,15 +673037,15 @@ dp03_step_water_reflection: @ 8153ED4 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08153F84 + ldr r0, =0x02020630 adds r7, r1, r0 - ldr r0, _08153F88 + ldr r0, =objc_80DAF50 + 1 str r0, [r7, 0x1C] ldrb r1, [r7, 0x5] movs r0, 0xC orrs r1, r0 strb r1, [r7, 0x5] - ldr r2, _08153F8C + ldr r2, =0x084975c4 lsrs r0, r1, 4 adds r0, r2 ldrb r0, [r0] @@ -696310,12 +673062,12 @@ dp03_step_water_reflection: @ 8153ED4 orrs r0, r1 mov r1, r8 strb r0, [r1] - ldr r0, _08153F90 + ldr r0, =0x082ec69c str r0, [r7, 0x8] adds r0, r7, 0 movs r1, 0 bl obj_anim_image_start - ldr r0, _08153F94 + ldr r0, =0x082ec6a8 str r0, [r7, 0x10] mov r1, r8 ldrb r0, [r1] @@ -696353,11 +673105,7 @@ _08153F7A: pop {r0} bx r0 .align 2, 0 -_08153F84: .4byte 0x02020630 -_08153F88: .4byte objc_80DAF50 + 1 -_08153F8C: .4byte 0x084975c4 -_08153F90: .4byte 0x082ec69c -_08153F94: .4byte 0x082ec6a8 + .pool thumb_func_end dp03_step_water_reflection thumb_func_start sub_8153F98 @@ -696379,7 +673127,7 @@ npc_pal_op: @ 8153FAC sub sp, 0x8 adds r5, r0, 0 adds r4, r1, 0 - ldr r1, _08154004 + ldr r1, =0x085cdc38 mov r0, sp movs r2, 0x6 bl memcpy @@ -696416,7 +673164,7 @@ _08153FEE: bl npc_pal_op_A b _08154012 .align 2, 0 -_08154004: .4byte 0x085cdc38 + .pool _08154008: ldrb r1, [r4, 0x5] lsrs r1, 4 @@ -696438,7 +673186,7 @@ npc_pal_op_B: @ 815401C bl npc_get_type adds r2, r0, 0 ldrh r1, [r2, 0x4] - ldr r0, _08154048 + ldr r0, =0x000011ff cmp r1, r0 beq _08154070 ldrb r0, [r2, 0xC] @@ -696451,7 +673199,7 @@ npc_pal_op_B: @ 815401C bl npc_load_two_palettes__no_record b _0815406A .align 2, 0 -_08154048: .4byte 0x000011ff + .pool _0815404C: cmp r1, 0xA bne _0815405A @@ -696484,7 +673232,7 @@ npc_pal_op_A: @ 8154078 bl npc_get_type adds r2, r0, 0 ldrh r1, [r2, 0x4] - ldr r0, _081540A4 + ldr r0, =0x000011ff cmp r1, r0 beq _0815409C adds r0, r1, 0 @@ -696497,7 +673245,7 @@ _0815409C: pop {r0} bx r0 .align 2, 0 -_081540A4: .4byte 0x000011ff + .pool thumb_func_end npc_pal_op_A thumb_func_start objc_80DAF50 @@ -696512,16 +673260,16 @@ objc_80DAF50: @ 81540A8 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081540F0 + ldr r1, =0x02037350 adds r7, r0, r1 ldrb r1, [r7, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081540F4 + ldr r1, =0x02020630 adds r5, r0, r1 ldr r0, [r7] - ldr r1, _081540F8 + ldr r1, =0x00020001 ands r0, r1 cmp r0, r1 bne _081540E0 @@ -696540,11 +673288,9 @@ _081540E0: strb r0, [r2] b _08154214 .align 2, 0 -_081540F0: .4byte 0x02037350 -_081540F4: .4byte 0x02020630 -_081540F8: .4byte 0x00020001 + .pool _081540FC: - ldr r1, _08154220 + ldr r1, =0x084975c4 ldrb r0, [r5, 0x5] lsrs r0, 4 adds r0, r1 @@ -696587,7 +673333,7 @@ _081540FC: lsls r1, 22 lsrs r1, 22 ldrh r2, [r4, 0x4] - ldr r0, _08154224 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] @@ -696692,14 +673438,13 @@ _08154214: pop {r0} bx r0 .align 2, 0 -_08154220: .4byte 0x084975c4 -_08154224: .4byte 0xfffffc00 + .pool thumb_func_end objc_80DAF50 thumb_func_start sub_8154228 sub_8154228: @ 8154228 push {r4,lr} - ldr r0, _08154270 + ldr r0, =0x085059f8 ldr r0, [r0, 0x20] movs r1, 0 movs r2, 0 @@ -696713,7 +673458,7 @@ sub_8154228: @ 8154228 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08154274 + ldr r0, =0x02020630 adds r1, r0 ldrb r2, [r1, 0x5] movs r0, 0xD @@ -696734,15 +673479,14 @@ _08154266: pop {r1} bx r1 .align 2, 0 -_08154270: .4byte 0x085059f8 -_08154274: .4byte 0x02020630 + .pool thumb_func_end sub_8154228 thumb_func_start objid_set_invisible objid_set_invisible: @ 8154278 lsls r0, 24 lsrs r0, 24 - ldr r2, _08154294 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -696754,7 +673498,7 @@ objid_set_invisible: @ 8154278 strb r0, [r1] bx lr .align 2, 0 -_08154294: .4byte 0x02020630 + .pool thumb_func_end objid_set_invisible thumb_func_start sub_8154298 @@ -696775,7 +673519,7 @@ sub_8154298: @ 8154298 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r1, _0815433C + ldr r1, =0x02020630 adds r2, r0, r1 adds r0, r2, 0 adds r0, 0x3E @@ -696809,7 +673553,7 @@ _081542E2: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r1, _0815433C + ldr r1, =0x02020630 adds r2, r0, r1 mov r0, sp ldrh r0, [r0] @@ -696841,20 +673585,20 @@ _0815432E: pop {r0} bx r0 .align 2, 0 -_0815433C: .4byte 0x02020630 + .pool thumb_func_end sub_8154298 thumb_func_start oei_shadow oei_shadow: @ 8154340 push {r4,r5,lr} - ldr r5, _081543CC + ldr r5, =0x02038c08 ldrb r0, [r5] ldrb r1, [r5, 0x4] ldrb r2, [r5, 0x8] bl get_npc_id_by_local_id lsls r0, 24 lsrs r0, 24 - ldr r2, _081543D0 + ldr r2, =0x02037350 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -696862,8 +673606,8 @@ oei_shadow: @ 8154340 ldrb r0, [r1, 0x5] bl npc_get_type adds r4, r0, 0 - ldr r2, _081543D4 - ldr r1, _081543D8 + ldr r2, =0x085059f8 + ldr r1, =0x085cdc3e ldrb r0, [r4, 0xC] lsls r0, 26 lsrs r0, 30 @@ -696880,7 +673624,7 @@ oei_shadow: @ 8154340 lsrs r1, r0, 24 cmp r1, 0x40 beq _081543C4 - ldr r0, _081543DC + ldr r0, =0x02020630 lsls r2, r1, 4 adds r2, r1 lsls r2, 2 @@ -696900,7 +673644,7 @@ oei_shadow: @ 8154340 ldrh r1, [r4, 0xA] lsls r1, 16 asrs r1, 17 - ldr r3, _081543E0 + ldr r3, =0x085cdc42 ldrb r0, [r4, 0xC] lsls r0, 26 lsrs r0, 30 @@ -696915,12 +673659,7 @@ _081543C4: pop {r1} bx r1 .align 2, 0 -_081543CC: .4byte 0x02038c08 -_081543D0: .4byte 0x02037350 -_081543D4: .4byte 0x085059f8 -_081543D8: .4byte 0x085cdc3e -_081543DC: .4byte 0x02020630 -_081543E0: .4byte 0x085cdc42 + .pool thumb_func_end oei_shadow thumb_func_start oamc_shadow @@ -696952,13 +673691,13 @@ _08154412: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081544A0 + ldr r1, =0x02037350 adds r4, r0, r1 ldrb r0, [r4, 0x4] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _081544A4 + ldr r0, =0x02020630 adds r1, r0 ldrb r0, [r1, 0x5] movs r2, 0xC @@ -696976,7 +673715,7 @@ _08154412: adds r0, r1 strh r0, [r5, 0x22] ldr r0, [r4] - ldr r1, _081544A8 + ldr r1, =0x00400001 ands r0, r1 cmp r0, r1 bne _08154490 @@ -697015,16 +673754,14 @@ _08154498: pop {r0} bx r0 .align 2, 0 -_081544A0: .4byte 0x02037350 -_081544A4: .4byte 0x02020630 -_081544A8: .4byte 0x00400001 + .pool thumb_func_end oamc_shadow thumb_func_start oei_grass_normal oei_grass_normal: @ 81544AC push {r4,r5,lr} sub sp, 0x4 - ldr r5, _08154544 + ldr r5, =0x02038c08 ldrh r1, [r5] mov r0, sp strh r1, [r0] @@ -697037,7 +673774,7 @@ oei_grass_normal: @ 81544AC movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _08154548 + ldr r0, =0x085059f8 ldr r0, [r0, 0x10] mov r1, sp movs r2, 0 @@ -697053,7 +673790,7 @@ oei_grass_normal: @ 81544AC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815454C + ldr r1, =0x02020630 adds r3, r0, r1 adds r2, r3, 0 adds r2, 0x3E @@ -697096,9 +673833,7 @@ _08154538: pop {r1} bx r1 .align 2, 0 -_08154544: .4byte 0x02038c08 -_08154548: .4byte 0x085059f8 -_0815454C: .4byte 0x02020630 + .pool thumb_func_end oei_grass_normal thumb_func_start unc_grass_normal @@ -697112,13 +673847,13 @@ unc_grass_normal: @ 8154550 lsrs r4, r0, 8 lsls r0, 24 lsrs r7, r0, 24 - ldr r3, _081545FC + ldr r3, =0x02037334 ldrb r1, [r3] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _0815459C - ldr r0, _08154600 + ldr r0, =0x03005d8c ldr r2, [r0] movs r0, 0x5 ldrsb r0, [r2, r0] @@ -697188,15 +673923,14 @@ _081545F0: bl oe_stop b _08154648 .align 2, 0 -_081545FC: .4byte 0x02037334 -_08154600: .4byte 0x03005d8c + .pool _08154604: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08154654 + ldr r1, =0x02037350 adds r2, r0, r1 ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] @@ -697233,19 +673967,19 @@ _08154648: pop {r0} bx r0 .align 2, 0 -_08154654: .4byte 0x02037350 + .pool thumb_func_end unc_grass_normal thumb_func_start sub_8154658 sub_8154658: @ 8154658 push {r4,lr} - ldr r4, _081546BC + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0xC bl sub_80930E0 - ldr r0, _081546C0 + ldr r0, =0x085059f8 ldr r0, [r0, 0x28] movs r2, 0 ldrsh r1, [r4, r2] @@ -697260,7 +673994,7 @@ sub_8154658: @ 8154658 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _081546C4 + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -697288,9 +674022,7 @@ _081546B4: pop {r1} bx r1 .align 2, 0 -_081546BC: .4byte 0x02038c08 -_081546C0: .4byte 0x085059f8 -_081546C4: .4byte 0x02020630 + .pool thumb_func_end sub_8154658 thumb_func_start sub_81546C8 @@ -697307,7 +674039,7 @@ sub_81546C8: @ 81546C8 lsls r2, 24 lsrs r6, r2, 24 movs r5, 0 - ldr r0, _08154738 + ldr r0, =0x02020630 mov r8, r0 lsls r3, 16 asrs r3, 16 @@ -697326,7 +674058,7 @@ _081546EC: cmp r0, 0 beq _08154740 ldr r1, [r2, 0x1C] - ldr r0, _0815473C + ldr r0, =unc_grass_normal + 1 cmp r1, r0 bne _08154740 movs r1, 0x30 @@ -697352,8 +674084,7 @@ _081546EC: adds r0, r5, 0 b _0815474C .align 2, 0 -_08154738: .4byte 0x02020630 -_0815473C: .4byte unc_grass_normal + 1 + .pool _08154740: adds r0, r5, 0x1 lsls r0, 24 @@ -697373,7 +674104,7 @@ _0815474C: sub_8154758: @ 8154758 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _081547F4 + ldr r5, =0x02038c08 ldrh r1, [r5] mov r0, sp strh r1, [r0] @@ -697386,7 +674117,7 @@ sub_8154758: @ 8154758 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _081547F8 + ldr r0, =0x085059f8 ldr r0, [r0, 0x3C] mov r1, sp movs r2, 0 @@ -697402,7 +674133,7 @@ sub_8154758: @ 8154758 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081547FC + ldr r1, =0x02020630 adds r4, r0, r1 adds r2, r4, 0 adds r2, 0x3E @@ -697446,9 +674177,7 @@ _081547E8: pop {r1} bx r1 .align 2, 0 -_081547F4: .4byte 0x02038c08 -_081547F8: .4byte 0x085059f8 -_081547FC: .4byte 0x02020630 + .pool thumb_func_end sub_8154758 thumb_func_start unc_grass_tall @@ -697462,13 +674191,13 @@ unc_grass_tall: @ 8154800 lsrs r7, r0, 8 lsls r0, 24 lsrs r6, r0, 24 - ldr r3, _081548AC + ldr r3, =0x02037334 ldrb r1, [r3] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _0815484C - ldr r0, _081548B0 + ldr r0, =0x03005d8c ldr r2, [r0] movs r0, 0x5 ldrsb r0, [r2, r0] @@ -697538,15 +674267,14 @@ _081548A0: bl oe_stop b _081548EA .align 2, 0 -_081548AC: .4byte 0x02037334 -_081548B0: .4byte 0x03005d8c + .pool _081548B4: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081548F8 + ldr r1, =0x02037350 adds r2, r0, r1 ldr r0, [r2, 0x10] ldr r1, [r5, 0x30] @@ -697575,19 +674303,19 @@ _081548EA: pop {r0} bx r0 .align 2, 0 -_081548F8: .4byte 0x02037350 + .pool thumb_func_end unc_grass_tall thumb_func_start sub_81548FC sub_81548FC: @ 81548FC push {r4,lr} - ldr r4, _08154960 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _08154964 + ldr r0, =0x085059f8 ldr r0, [r0, 0x40] movs r2, 0 ldrsh r1, [r4, r2] @@ -697602,7 +674330,7 @@ sub_81548FC: @ 81548FC lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _08154968 + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -697630,15 +674358,13 @@ _08154958: pop {r1} bx r1 .align 2, 0 -_08154960: .4byte 0x02038c08 -_08154964: .4byte 0x085059f8 -_08154968: .4byte 0x02020630 + .pool thumb_func_end sub_81548FC thumb_func_start sub_815496C sub_815496C: @ 815496C push {r4-r6,lr} - ldr r6, _08154A00 + ldr r6, =0x02038c08 ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] @@ -697648,9 +674374,9 @@ sub_815496C: @ 815496C lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08154A04 + ldr r0, =0x02037350 adds r5, r1, r0 - ldr r0, _08154A08 + ldr r0, =0x085059f8 ldr r0, [r0, 0x78] movs r1, 0 movs r2, 0 @@ -697663,7 +674389,7 @@ sub_815496C: @ 815496C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r4, _08154A0C + ldr r4, =0x02020630 adds r2, r4 adds r3, r2, 0 adds r3, 0x3E @@ -697711,10 +674437,7 @@ _081549F8: pop {r1} bx r1 .align 2, 0 -_08154A00: .4byte 0x02038c08 -_08154A04: .4byte 0x02037350 -_08154A08: .4byte 0x085059f8 -_08154A0C: .4byte 0x02020630 + .pool thumb_func_end sub_815496C thumb_func_start sub_8154A10 @@ -697738,7 +674461,7 @@ sub_8154A10: @ 8154A10 lsls r0, 24 cmp r0, 0 bne _08154A4E - ldr r5, _08154A58 + ldr r5, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -697755,7 +674478,7 @@ _08154A4E: bl oe_stop b _08154AF2 .align 2, 0 -_08154A58: .4byte 0x02037350 + .pool _08154A5C: ldrb r0, [r1, 0x5] bl npc_get_type @@ -697770,7 +674493,7 @@ _08154A5C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08154B00 + ldr r1, =0x02020630 adds r6, r0, r1 ldrh r5, [r6, 0x22] ldrh r7, [r6, 0x20] @@ -697839,19 +674562,19 @@ _08154AF2: pop {r0} bx r0 .align 2, 0 -_08154B00: .4byte 0x02020630 + .pool thumb_func_end sub_8154A10 thumb_func_start sub_8154B04 sub_8154B04: @ 8154B04 push {r4,lr} - ldr r4, _08154B6C + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _08154B70 + ldr r0, =0x085059f8 ldr r0, [r0, 0x2C] movs r2, 0 ldrsh r1, [r4, r2] @@ -697866,7 +674589,7 @@ sub_8154B04: @ 8154B04 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08154B74 + ldr r1, =0x02020630 adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -697894,21 +674617,19 @@ _08154B62: pop {r1} bx r1 .align 2, 0 -_08154B6C: .4byte 0x02038c08 -_08154B70: .4byte 0x085059f8 -_08154B74: .4byte 0x02020630 + .pool thumb_func_end sub_8154B04 thumb_func_start sub_8154B78 sub_8154B78: @ 8154B78 push {r4,r5,lr} - ldr r4, _08154BE0 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _08154BE4 + ldr r0, =0x085059f8 ldr r0, [r0, 0x5C] movs r2, 0 ldrsh r1, [r4, r2] @@ -697924,7 +674645,7 @@ sub_8154B78: @ 8154B78 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08154BE8 + ldr r1, =0x02020630 adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -697952,21 +674673,19 @@ _08154BD8: pop {r1} bx r1 .align 2, 0 -_08154BE0: .4byte 0x02038c08 -_08154BE4: .4byte 0x085059f8 -_08154BE8: .4byte 0x02020630 + .pool thumb_func_end sub_8154B78 thumb_func_start sub_8154BEC sub_8154BEC: @ 8154BEC push {r4,r5,lr} - ldr r4, _08154C54 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _08154C58 + ldr r0, =0x085059f8 ldr r0, [r0, 0x6C] movs r2, 0 ldrsh r1, [r4, r2] @@ -697982,7 +674701,7 @@ sub_8154BEC: @ 8154BEC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08154C5C + ldr r1, =0x02020630 adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -698010,15 +674729,13 @@ _08154C4C: pop {r1} bx r1 .align 2, 0 -_08154C54: .4byte 0x02038c08 -_08154C58: .4byte 0x085059f8 -_08154C5C: .4byte 0x02020630 + .pool thumb_func_end sub_8154BEC thumb_func_start sub_8154C60 sub_8154C60: @ 8154C60 push {lr} - ldr r2, _08154C78 + ldr r2, =0x085cdc4c movs r3, 0x2E ldrsh r1, [r0, r3] lsls r1, 2 @@ -698028,7 +674745,7 @@ sub_8154C60: @ 8154C60 pop {r0} bx r0 .align 2, 0 -_08154C78: .4byte 0x085cdc4c + .pool thumb_func_end sub_8154C60 thumb_func_start sub_8154C7C @@ -698095,7 +674812,7 @@ _08154CE4: thumb_func_start sub_8154CEC sub_8154CEC: @ 8154CEC push {r4-r6,lr} - ldr r6, _08154D80 + ldr r6, =0x02038c08 ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] @@ -698105,9 +674822,9 @@ sub_8154CEC: @ 8154CEC lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08154D84 + ldr r0, =0x02037350 adds r5, r1, r0 - ldr r0, _08154D88 + ldr r0, =0x085059f8 ldr r0, [r0, 0x34] movs r1, 0 movs r2, 0 @@ -698122,7 +674839,7 @@ sub_8154CEC: @ 8154CEC lsls r3, r4, 4 adds r3, r4 lsls r3, 2 - ldr r4, _08154D8C + ldr r4, =0x02020630 adds r3, r4 movs r1, 0x3E adds r1, r3 @@ -698165,10 +674882,7 @@ _08154D76: pop {r1} bx r1 .align 2, 0 -_08154D80: .4byte 0x02038c08 -_08154D84: .4byte 0x02037350 -_08154D88: .4byte 0x085059f8 -_08154D8C: .4byte 0x02020630 + .pool thumb_func_end sub_8154CEC thumb_func_start sub_8154D90 @@ -698202,8 +674916,8 @@ _08154DC0: bl oe_stop b _08154E0A _08154DCA: - ldr r3, _08154E14 - ldr r2, _08154E18 + ldr r3, =0x02020630 + ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -698239,20 +674953,19 @@ _08154E0A: pop {r0} bx r0 .align 2, 0 -_08154E14: .4byte 0x02020630 -_08154E18: .4byte 0x02037350 + .pool thumb_func_end sub_8154D90 thumb_func_start sub_8154E1C sub_8154E1C: @ 8154E1C push {r4,lr} - ldr r4, _08154E80 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0xC bl sub_80930E0 - ldr r0, _08154E84 + ldr r0, =0x085059f8 ldr r0, [r0, 0x38] movs r2, 0 ldrsh r1, [r4, r2] @@ -698267,7 +674980,7 @@ sub_8154E1C: @ 8154E1C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _08154E88 + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -698295,21 +675008,19 @@ _08154E78: pop {r1} bx r1 .align 2, 0 -_08154E80: .4byte 0x02038c08 -_08154E84: .4byte 0x085059f8 -_08154E88: .4byte 0x02020630 + .pool thumb_func_end sub_8154E1C thumb_func_start oei_water_drop_tall oei_water_drop_tall: @ 8154E8C push {r4,lr} - ldr r4, _08154EF0 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _08154EF4 + ldr r0, =0x085059f8 ldr r0, [r0, 0x30] movs r2, 0 ldrsh r1, [r4, r2] @@ -698324,7 +675035,7 @@ oei_water_drop_tall: @ 8154E8C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _08154EF8 + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -698352,15 +675063,13 @@ _08154EE8: pop {r1} bx r1 .align 2, 0 -_08154EF0: .4byte 0x02038c08 -_08154EF4: .4byte 0x085059f8 -_08154EF8: .4byte 0x02020630 + .pool thumb_func_end oei_water_drop_tall thumb_func_start sub_8154EFC sub_8154EFC: @ 8154EFC push {r4-r7,lr} - ldr r7, _08154F9C + ldr r7, =0x02038c08 ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] @@ -698370,9 +675079,9 @@ sub_8154EFC: @ 8154EFC lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _08154FA0 + ldr r0, =0x02037350 adds r6, r1, r0 - ldr r0, _08154FA4 + ldr r0, =0x085059f8 ldr r0, [r0, 0x34] movs r1, 0 movs r2, 0 @@ -698388,9 +675097,9 @@ sub_8154EFC: @ 8154EFC lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r3, _08154FA8 + ldr r3, =0x02020630 adds r0, r3 - ldr r1, _08154FAC + ldr r1, =sub_8154FB4 + 1 str r1, [r0, 0x1C] adds r5, r0, 0 adds r5, 0x3E @@ -698418,7 +675127,7 @@ sub_8154EFC: @ 8154EFC strh r1, [r0, 0x30] ldr r1, [r7, 0x8] strh r1, [r0, 0x32] - ldr r1, _08154FB0 + ldr r1, =0x0000ffff strh r1, [r0, 0x34] movs r1, 0x1 negs r1, r1 @@ -698436,12 +675145,7 @@ _08154F92: pop {r1} bx r1 .align 2, 0 -_08154F9C: .4byte 0x02038c08 -_08154FA0: .4byte 0x02037350 -_08154FA4: .4byte 0x085059f8 -_08154FA8: .4byte 0x02020630 -_08154FAC: .4byte sub_8154FB4 + 1 -_08154FB0: .4byte 0x0000ffff + .pool thumb_func_end sub_8154EFC thumb_func_start sub_8154FB4 @@ -698463,7 +675167,7 @@ sub_8154FB4: @ 8154FB4 lsls r0, 24 cmp r0, 0 bne _08154FEE - ldr r2, _08154FF8 + ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -698480,13 +675184,13 @@ _08154FEE: bl oe_stop b _08155046 .align 2, 0 -_08154FF8: .4byte 0x02037350 + .pool _08154FFC: ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08155050 + ldr r1, =0x02020630 adds r0, r1 ldrh r1, [r0, 0x20] strh r1, [r4, 0x20] @@ -698523,15 +675227,15 @@ _08155046: pop {r0} bx r0 .align 2, 0 -_08155050: .4byte 0x02020630 + .pool thumb_func_end sub_8154FB4 thumb_func_start oei_ripples oei_ripples: @ 8155054 push {r4,lr} - ldr r0, _081550A8 + ldr r0, =0x085059f8 ldr r0, [r0, 0x14] - ldr r4, _081550AC + ldr r4, =0x02038c08 movs r2, 0 ldrsh r1, [r4, r2] movs r3, 0x4 @@ -698545,7 +675249,7 @@ oei_ripples: @ 8155054 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _081550B0 + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -698571,15 +675275,13 @@ _081550A0: pop {r1} bx r1 .align 2, 0 -_081550A8: .4byte 0x085059f8 -_081550AC: .4byte 0x02038c08 -_081550B0: .4byte 0x02020630 + .pool thumb_func_end oei_ripples thumb_func_start sub_81550B4 sub_81550B4: @ 81550B4 push {r4-r6,lr} - ldr r6, _08155148 + ldr r6, =0x02038c08 ldrb r0, [r6] ldrb r1, [r6, 0x4] ldrb r2, [r6, 0x8] @@ -698589,9 +675291,9 @@ sub_81550B4: @ 81550B4 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0815514C + ldr r0, =0x02037350 adds r5, r1, r0 - ldr r0, _08155150 + ldr r0, =0x085059f8 ldr r0, [r0, 0x7C] movs r1, 0 movs r2, 0 @@ -698604,7 +675306,7 @@ sub_81550B4: @ 81550B4 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r4, _08155154 + ldr r4, =0x02020630 adds r2, r4 adds r3, r2, 0 adds r3, 0x3E @@ -698652,10 +675354,7 @@ _08155140: pop {r1} bx r1 .align 2, 0 -_08155148: .4byte 0x02038c08 -_0815514C: .4byte 0x02037350 -_08155150: .4byte 0x085059f8 -_08155154: .4byte 0x02020630 + .pool thumb_func_end sub_81550B4 thumb_func_start sub_8155158 @@ -698677,7 +675376,7 @@ sub_8155158: @ 8155158 lsls r0, 24 cmp r0, 0 bne _08155192 - ldr r5, _0815519C + ldr r5, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -698694,7 +675393,7 @@ _08155192: bl oe_stop b _081551E4 .align 2, 0 -_0815519C: .4byte 0x02037350 + .pool _081551A0: ldrb r0, [r1, 0x5] bl npc_get_type @@ -698708,7 +675407,7 @@ _081551A0: lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, _081551EC + ldr r2, =0x02020630 adds r1, r2 ldrh r2, [r1, 0x20] strh r2, [r4, 0x20] @@ -698734,19 +675433,19 @@ _081551E4: pop {r0} bx r0 .align 2, 0 -_081551EC: .4byte 0x02020630 + .pool thumb_func_end sub_8155158 thumb_func_start sub_81551F0 sub_81551F0: @ 81551F0 push {r4,lr} - ldr r4, _08155250 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _08155254 + ldr r0, =0x085059f8 ldr r0, [r0, 0x44] movs r2, 0 ldrsh r1, [r4, r2] @@ -698761,7 +675460,7 @@ sub_81551F0: @ 81551F0 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _08155258 + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -698787,21 +675486,19 @@ _08155248: pop {r1} bx r1 .align 2, 0 -_08155250: .4byte 0x02038c08 -_08155254: .4byte 0x085059f8 -_08155258: .4byte 0x02020630 + .pool thumb_func_end sub_81551F0 thumb_func_start sub_815525C sub_815525C: @ 815525C push {r4,lr} - ldr r4, _081552BC + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _081552C0 + ldr r0, =0x085059f8 ldr r0, [r0, 0x48] movs r2, 0 ldrsh r1, [r4, r2] @@ -698816,7 +675513,7 @@ sub_815525C: @ 815525C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _081552C4 + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -698842,21 +675539,19 @@ _081552B4: pop {r1} bx r1 .align 2, 0 -_081552BC: .4byte 0x02038c08 -_081552C0: .4byte 0x085059f8 -_081552C4: .4byte 0x02020630 + .pool thumb_func_end sub_815525C thumb_func_start sub_81552C8 sub_81552C8: @ 81552C8 push {r4,lr} - ldr r4, _08155328 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _0815532C + ldr r0, =0x085059f8 ldr r0, [r0, 0x4C] movs r2, 0 ldrsh r1, [r4, r2] @@ -698871,7 +675566,7 @@ sub_81552C8: @ 81552C8 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _08155330 + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -698897,21 +675592,19 @@ _08155320: pop {r1} bx r1 .align 2, 0 -_08155328: .4byte 0x02038c08 -_0815532C: .4byte 0x085059f8 -_08155330: .4byte 0x02020630 + .pool thumb_func_end sub_81552C8 thumb_func_start sub_8155334 sub_8155334: @ 8155334 push {r4,lr} - ldr r4, _08155394 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _08155398 + ldr r0, =0x085059f8 ldr r0, [r0, 0x50] movs r2, 0 ldrsh r1, [r4, r2] @@ -698926,7 +675619,7 @@ sub_8155334: @ 8155334 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _0815539C + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -698952,9 +675645,7 @@ _0815538C: pop {r1} bx r1 .align 2, 0 -_08155394: .4byte 0x02038c08 -_08155398: .4byte 0x085059f8 -_0815539C: .4byte 0x02020630 + .pool thumb_func_end sub_8155334 thumb_func_start ash @@ -698962,7 +675653,7 @@ ash: @ 81553A0 push {r4,lr} lsls r2, 16 lsrs r2, 16 - ldr r4, _081553D0 + ldr r4, =0x02038c08 lsls r0, 16 asrs r0, 16 str r0, [r4] @@ -698983,14 +675674,14 @@ ash: @ 81553A0 pop {r0} bx r0 .align 2, 0 -_081553D0: .4byte 0x02038c08 + .pool thumb_func_end ash thumb_func_start oei_ash oei_ash: @ 81553D4 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _08155454 + ldr r5, =0x02038c08 ldrh r1, [r5] mov r0, sp strh r1, [r0] @@ -699003,7 +675694,7 @@ oei_ash: @ 81553D4 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _08155458 + ldr r0, =0x085059f8 ldr r0, [r0, 0x18] mov r1, sp movs r2, 0 @@ -699019,7 +675710,7 @@ oei_ash: @ 81553D4 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _0815545C + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -699052,15 +675743,13 @@ _0815544A: pop {r1} bx r1 .align 2, 0 -_08155454: .4byte 0x02038c08 -_08155458: .4byte 0x085059f8 -_0815545C: .4byte 0x02020630 + .pool thumb_func_end oei_ash thumb_func_start sub_8155460 sub_8155460: @ 8155460 push {lr} - ldr r2, _08155478 + ldr r2, =0x085cdc54 movs r3, 0x2E ldrsh r1, [r0, r3] lsls r1, 2 @@ -699070,7 +675759,7 @@ sub_8155460: @ 8155460 pop {r0} bx r0 .align 2, 0 -_08155478: .4byte 0x085cdc54 + .pool thumb_func_end sub_8155460 thumb_func_start sub_815547C @@ -699129,8 +675818,8 @@ sub_81554AC: @ 81554AC movs r2, 0x32 ldrsh r1, [r4, r2] bl cur_mapdata_draw_block_at - ldr r2, _08155504 - ldr r0, _08155508 + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -699146,8 +675835,7 @@ sub_81554AC: @ 81554AC pop {r0} bx r0 .align 2, 0 -_08155504: .4byte 0x02037350 -_08155508: .4byte 0x02037590 + .pool thumb_func_end sub_81554AC thumb_func_start sub_815550C @@ -699175,13 +675863,13 @@ _0815552C: thumb_func_start sub_8155534 sub_8155534: @ 8155534 push {r4,r5,lr} - ldr r4, _0815559C + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _081555A0 + ldr r0, =0x085059f8 ldr r0, [r0, 0x1C] movs r2, 0 ldrsh r1, [r4, r2] @@ -699197,7 +675885,7 @@ sub_8155534: @ 8155534 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _081555A4 + ldr r0, =0x02020630 adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -699211,7 +675899,7 @@ sub_8155534: @ 8155534 strb r0, [r1, 0x5] ldr r0, [r4, 0x8] strh r0, [r1, 0x32] - ldr r0, _081555A8 + ldr r0, =0x0000ffff strh r0, [r1, 0x34] movs r0, 0x1 negs r0, r0 @@ -699225,10 +675913,7 @@ _0815558E: pop {r1} bx r1 .align 2, 0 -_0815559C: .4byte 0x02038c08 -_081555A0: .4byte 0x085059f8 -_081555A4: .4byte 0x02020630 -_081555A8: .4byte 0x0000ffff + .pool thumb_func_end sub_8155534 thumb_func_start sub_81555AC @@ -699236,7 +675921,7 @@ sub_81555AC: @ 81555AC lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, _081555D4 + ldr r3, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -699253,7 +675938,7 @@ sub_81555AC: @ 81555AC strh r0, [r2, 0x2E] bx lr .align 2, 0 -_081555D4: .4byte 0x02020630 + .pool thumb_func_end sub_81555AC thumb_func_start sub_81555D8 @@ -699261,7 +675946,7 @@ sub_81555D8: @ 81555D8 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, _08155600 + ldr r3, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -699278,7 +675963,7 @@ sub_81555D8: @ 81555D8 strh r3, [r2, 0x2E] bx lr .align 2, 0 -_08155600: .4byte 0x02020630 + .pool thumb_func_end sub_81555D8 thumb_func_start sub_8155604 @@ -699287,13 +675972,13 @@ sub_8155604: @ 8155604 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r4, _08155630 + ldr r4, =0x02020630 lsls r3, r0, 4 adds r3, r0 lsls r3, 2 adds r3, r4 ldrh r0, [r3, 0x2E] - ldr r4, _08155634 + ldr r4, =0xfffff0ff ands r4, r0 movs r0, 0xF0 lsls r0, 20 @@ -699306,8 +675991,7 @@ sub_8155604: @ 8155604 pop {r0} bx r0 .align 2, 0 -_08155630: .4byte 0x02020630 -_08155634: .4byte 0xfffff0ff + .pool thumb_func_end sub_8155604 thumb_func_start sub_8155638 @@ -699346,13 +676030,13 @@ sub_8155658: @ 8155658 lsls r4, r0, 3 adds r4, r0 lsls r4, 2 - ldr r0, _081556A8 + ldr r0, =0x02037350 adds r4, r0 ldrb r0, [r4, 0x4] lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, _081556AC + ldr r0, =0x02020630 adds r5, r0 adds r0, r4, 0 adds r1, r6, 0 @@ -699377,8 +676061,7 @@ sub_8155658: @ 8155658 pop {r0} bx r0 .align 2, 0 -_081556A8: .4byte 0x02037350 -_081556AC: .4byte 0x02020630 + .pool thumb_func_end sub_8155658 thumb_func_start sub_81556B0 @@ -699387,7 +676070,7 @@ sub_81556B0: @ 81556B0 sub sp, 0xC adds r5, r0, 0 adds r4, r1, 0 - ldr r1, _081556E4 + ldr r1, =0x085cdc60 mov r0, sp movs r2, 0x9 bl memcpy @@ -699408,7 +676091,7 @@ _081556DC: pop {r0} bx r0 .align 2, 0 -_081556E4: .4byte 0x085cdc60 + .pool thumb_func_end sub_81556B0 thumb_func_start sub_81556E8 @@ -699497,7 +676180,7 @@ sub_815577C: @ 815577C sub sp, 0x4 adds r5, r1, 0 adds r4, r2, 0 - ldr r1, _081557E0 + ldr r1, =0x085cdc6a mov r0, sp movs r2, 0x4 bl memcpy @@ -699543,7 +676226,7 @@ _081557CC: ldrh r0, [r4, 0x26] b _081557EA .align 2, 0 -_081557E0: .4byte 0x085cdc6a + .pool _081557E4: ldrh r0, [r4, 0x26] ldrh r3, [r4, 0x30] @@ -699568,7 +676251,7 @@ sub_8155800: @ 8155800 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08155844 + ldr r0, =0x082ec6ac movs r1, 0 movs r2, 0 movs r3, 0xFF @@ -699578,9 +676261,9 @@ sub_8155800: @ 8155800 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r1, _08155848 + ldr r1, =0x02020630 adds r2, r1 - ldr r1, _0815584C + ldr r1, =sub_8155850 + 1 str r1, [r2, 0x1C] movs r1, 0x3E adds r1, r2 @@ -699597,9 +676280,7 @@ sub_8155800: @ 8155800 pop {r1} bx r1 .align 2, 0 -_08155844: .4byte 0x082ec6ac -_08155848: .4byte 0x02020630 -_0815584C: .4byte sub_8155850 + 1 + .pool thumb_func_end sub_8155800 thumb_func_start sub_8155850 @@ -699611,7 +676292,7 @@ sub_8155850: @ 8155850 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815588C + ldr r1, =0x02020630 adds r3, r0, r1 ldrh r1, [r2, 0x32] adds r0, r1, 0x1 @@ -699637,19 +676318,19 @@ _08155888: pop {r0} bx r0 .align 2, 0 -_0815588C: .4byte 0x02020630 + .pool thumb_func_end sub_8155850 thumb_func_start sub_8155890 sub_8155890: @ 8155890 push {r4,lr} - ldr r4, _081558F4 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0xC bl sub_80930E0 - ldr r0, _081558F8 + ldr r0, =0x085059f8 ldr r0, [r0, 0x24] movs r2, 0 ldrsh r1, [r4, r2] @@ -699664,7 +676345,7 @@ sub_8155890: @ 8155890 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _081558FC + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -699692,15 +676373,13 @@ _081558EC: pop {r1} bx r1 .align 2, 0 -_081558F4: .4byte 0x02038c08 -_081558F8: .4byte 0x085059f8 -_081558FC: .4byte 0x02020630 + .pool thumb_func_end sub_8155890 thumb_func_start sub_8155900 sub_8155900: @ 8155900 push {r4-r7,lr} - ldr r7, _081559AC + ldr r7, =0x02038c08 ldrb r0, [r7] ldrb r1, [r7, 0x4] ldrb r2, [r7, 0x8] @@ -699710,9 +676389,9 @@ sub_8155900: @ 8155900 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _081559B0 + ldr r0, =0x02037350 adds r6, r1, r0 - ldr r0, _081559B4 + ldr r0, =0x085059f8 ldr r0, [r0, 0x74] movs r1, 0 movs r2, 0 @@ -699728,7 +676407,7 @@ sub_8155900: @ 8155900 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r4, _081559B8 + ldr r4, =0x02020630 adds r0, r4 adds r3, r0, 0 adds r3, 0x3E @@ -699783,10 +676462,7 @@ _081559A4: pop {r1} bx r1 .align 2, 0 -_081559AC: .4byte 0x02038c08 -_081559B0: .4byte 0x02037350 -_081559B4: .4byte 0x085059f8 -_081559B8: .4byte 0x02020630 + .pool thumb_func_end sub_8155900 thumb_func_start sub_81559BC @@ -699808,7 +676484,7 @@ sub_81559BC: @ 81559BC lsls r0, 24 cmp r0, 0 bne _081559F6 - ldr r2, _08155A00 + ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -699825,9 +676501,9 @@ _081559F6: bl oe_stop b _08155A76 .align 2, 0 -_08155A00: .4byte 0x02037350 + .pool _08155A04: - ldr r2, _08155A80 + ldr r2, =0x02020630 ldrb r1, [r1, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -699863,8 +676539,8 @@ _08155A2C: _08155A46: strh r6, [r4, 0x20] strh r5, [r4, 0x22] - ldr r3, _08155A80 - ldr r2, _08155A84 + ldr r3, =0x02020630 + ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -699890,20 +676566,19 @@ _08155A76: pop {r0} bx r0 .align 2, 0 -_08155A80: .4byte 0x02020630 -_08155A84: .4byte 0x02037350 + .pool thumb_func_end sub_81559BC thumb_func_start sub_8155A88 sub_8155A88: @ 8155A88 push {r4,lr} - ldr r4, _08155AE0 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0 bl sub_80930E0 - ldr r0, _08155AE4 + ldr r0, =0x085059f8 adds r0, 0x88 ldr r0, [r0] movs r2, 0 @@ -699919,7 +676594,7 @@ sub_8155A88: @ 8155A88 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08155AE8 + ldr r0, =0x02020630 adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -699940,9 +676615,7 @@ _08155AD8: pop {r1} bx r1 .align 2, 0 -_08155AE0: .4byte 0x02038c08 -_08155AE4: .4byte 0x085059f8 -_08155AE8: .4byte 0x02020630 + .pool thumb_func_end sub_8155A88 thumb_func_start sub_8155AEC @@ -699964,7 +676637,7 @@ sub_8155AEC: @ 8155AEC movs r1, 0 bl sub_80979D4 ldrh r1, [r4, 0x3E] - ldr r0, _08155B28 + ldr r0, =0x00001004 ands r0, r1 cmp r0, 0 beq _08155B20 @@ -699976,19 +676649,19 @@ _08155B20: pop {r0} bx r0 .align 2, 0 -_08155B28: .4byte 0x00001004 + .pool thumb_func_end sub_8155AEC thumb_func_start sub_8155B2C sub_8155B2C: @ 8155B2C push {r4,lr} - ldr r4, _08155B94 + ldr r4, =0x02038c08 adds r1, r4, 0x4 adds r0, r4, 0 movs r2, 0x8 movs r3, 0x4 bl sub_80930E0 - ldr r0, _08155B98 + ldr r0, =0x085059f8 ldr r0, [r0, 0x58] movs r2, 0 ldrsh r1, [r4, r2] @@ -700003,7 +676676,7 @@ sub_8155B2C: @ 8155B2C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _08155B9C + ldr r0, =0x02020630 adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -700033,9 +676706,7 @@ _08155B8C: pop {r1} bx r1 .align 2, 0 -_08155B94: .4byte 0x02038c08 -_08155B98: .4byte 0x085059f8 -_08155B9C: .4byte 0x02020630 + .pool thumb_func_end sub_8155B2C thumb_func_start sub_8155BA0 @@ -700084,7 +676755,7 @@ sub_8155BD0: @ 8155BD0 lsrs r6, r1, 24 lsls r2, 24 lsrs r7, r2, 24 - ldr r5, _08155C04 + ldr r5, =0x02038c08 ldrb r0, [r5] ldrb r1, [r5, 0x4] ldrb r2, [r5, 0x8] @@ -700098,9 +676769,9 @@ sub_8155BD0: @ 8155BD0 movs r0, 0x40 b _08155C74 .align 2, 0 -_08155C04: .4byte 0x02038c08 + .pool _08155C08: - ldr r1, _08155C80 + ldr r1, =0x085059f8 lsls r0, r6, 2 adds r0, r1 ldr r0, [r0] @@ -700119,7 +676790,7 @@ _08155C08: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _08155C84 + ldr r0, =0x02020630 adds r2, r0 movs r0, 0x3E adds r0, r2 @@ -700162,8 +676833,7 @@ _08155C74: pop {r1} bx r1 .align 2, 0 -_08155C80: .4byte 0x085059f8 -_08155C84: .4byte 0x02020630 + .pool thumb_func_end sub_8155BD0 thumb_func_start sub_8155C88 @@ -700191,7 +676861,7 @@ sub_8155C88: @ 8155C88 adds r0, r5, 0 bl oe_stop _08155CB8: - ldr r4, _08155D70 + ldr r4, =0x02037350 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -700210,7 +676880,7 @@ _08155CB8: lsls r2, r1, 4 adds r2, r1 lsls r2, 2 - ldr r1, _08155D74 + ldr r1, =0x02020630 adds r2, r1 adds r1, r2, 0 adds r1, 0x3E @@ -700284,8 +676954,7 @@ _08155D68: pop {r0} bx r0 .align 2, 0 -_08155D70: .4byte 0x02037350 -_08155D74: .4byte 0x02020630 + .pool thumb_func_end sub_8155C88 thumb_func_start sub_8155D78 @@ -700296,7 +676965,7 @@ sub_8155D78: @ 8155D78 ldrb r0, [r0] cmp r0, 0x1 bne _08155D96 - ldr r2, _08155D9C + ldr r2, =0x02020630 ldrb r1, [r1, 0x1A] lsls r0, r1, 4 adds r0, r1 @@ -700309,7 +676978,7 @@ _08155D96: pop {r0} bx r0 .align 2, 0 -_08155D9C: .4byte 0x02020630 + .pool thumb_func_end sub_8155D78 thumb_func_start sub_8155DA0 @@ -700326,7 +676995,7 @@ sub_8155DA0: @ 8155DA0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08155DC8 + ldr r1, =0x02020630 adds r1, r0, r1 movs r3, 0x3C ldrsh r0, [r1, r3] @@ -700335,7 +677004,7 @@ sub_8155DA0: @ 8155DA0 movs r0, 0 b _08155DD8 .align 2, 0 -_08155DC8: .4byte 0x02020630 + .pool _08155DCC: movs r0, 0x2 strb r0, [r2] @@ -700352,7 +677021,7 @@ _08155DD8: thumb_func_start sub_8155DDC sub_8155DDC: @ 8155DDC push {r4,lr} - ldr r4, _08155E44 + ldr r4, =0x02038c08 ldr r0, [r4] adds r0, 0x7 str r0, [r4] @@ -700364,7 +677033,7 @@ sub_8155DDC: @ 8155DDC movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _08155E48 + ldr r0, =0x085059f8 adds r0, 0x8C ldr r0, [r0] movs r2, 0 @@ -700377,7 +677046,7 @@ sub_8155DDC: @ 8155DDC lsrs r2, r0, 24 cmp r2, 0x40 beq _08155E3C - ldr r0, _08155E4C + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -700403,9 +677072,7 @@ _08155E3C: pop {r1} bx r1 .align 2, 0 -_08155E44: .4byte 0x02038c08 -_08155E48: .4byte 0x085059f8 -_08155E4C: .4byte 0x02020630 + .pool thumb_func_end sub_8155DDC thumb_func_start sub_8155E50 @@ -700586,12 +677253,12 @@ sub_8155F80: @ 8155F80 b _08156156 _08155F8E: lsls r0, 2 - ldr r1, _08155F98 + ldr r1, =_08155F9C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08155F98: .4byte _08155F9C + .pool .align 2, 0 _08155F9C: .4byte _08155FC0 @@ -700619,9 +677286,9 @@ _08155FC0: cmp r0, 0x60 bne _08156016 movs r1, 0 - ldr r4, _08156028 + ldr r4, =0x0600f800 mov r12, r4 - ldr r0, _0815602C + ldr r0, =0x0000bff4 adds r7, r0, 0 _08155FEA: movs r2, 0xC @@ -700650,7 +677317,7 @@ _08155FF6: _08156016: movs r2, 0x2E ldrsh r1, [r5, r2] - ldr r0, _08156030 + ldr r0, =0x00000137 cmp r1, r0 bgt _08156022 b _08156156 @@ -700659,11 +677326,9 @@ _08156022: movs r0, 0x1 b _0815611A .align 2, 0 -_08156028: .4byte 0x0600f800 -_0815602C: .4byte 0x0000bff4 -_08156030: .4byte 0x00000137 + .pool _08156034: - ldr r4, _08156068 + ldr r4, =0x08329f40 movs r3, 0x2E ldrsh r0, [r5, r3] movs r1, 0x3 @@ -700688,7 +677353,7 @@ _08156034: strh r1, [r5, 0x2E] b _08156156 .align 2, 0 -_08156068: .4byte 0x08329f40 + .pool _0815606C: movs r3, 0x2E ldrsh r0, [r5, r3] @@ -700789,7 +677454,7 @@ _0815611A: b _08156156 _08156120: movs r1, 0 - ldr r6, _08156190 + ldr r6, =0x0600f800 movs r4, 0 _08156126: movs r2, 0xC @@ -700849,7 +677514,7 @@ _08156184: pop {r0} bx r0 .align 2, 0 -_08156190: .4byte 0x0600f800 + .pool thumb_func_end sub_8155F80 thumb_func_start sub_8156194 @@ -700925,7 +677590,7 @@ _08156212: lsls r0, r7, 3 adds r0, r7 lsls r0, 2 - ldr r1, _081562AC + ldr r1, =0x02037350 adds r4, r0, r1 ldrb r0, [r4] lsls r0, 31 @@ -700937,7 +677602,7 @@ _08156212: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081562B0 + ldr r1, =0x02020630 adds r5, r0, r1 adds r0, r6, 0 adds r0, 0x28 @@ -700999,8 +677664,7 @@ _0815628C: strb r0, [r2] b _081562BE .align 2, 0 -_081562AC: .4byte 0x02037350 -_081562B0: .4byte 0x02020630 + .pool _081562B4: adds r0, r7, 0x1 lsls r0, 24 @@ -701018,7 +677682,7 @@ sub_81562C4: @ 81562C4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _0815631C + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0xC] movs r1, 0 @@ -701047,7 +677711,7 @@ _081562DE: strb r1, [r0] ldr r0, [r2] ldr r2, [r0, 0xC] - ldr r1, _08156320 + ldr r1, =0x02039e00 adds r0, r2, 0 adds r0, 0x41 ldrb r0, [r0] @@ -701060,14 +677724,13 @@ _081562DE: pop {r0} bx r0 .align 2, 0 -_0815631C: .4byte 0x02039f34 -_08156320: .4byte 0x02039e00 + .pool thumb_func_end sub_81562C4 thumb_func_start sub_8156324 sub_8156324: @ 8156324 push {r4-r6,lr} - ldr r1, _081563AC + ldr r1, =0x02039f34 ldr r0, [r1] ldr r0, [r0, 0xC] ldr r0, [r0, 0x14] @@ -701108,7 +677771,7 @@ _0815636C: bl GenerateRandomNumber adds r5, r0, 0 ands r5, r6 - ldr r4, _081563AC + ldr r4, =0x02039f34 ldr r0, [r4] ldr r1, [r0, 0xC] adds r0, r1, 0x5 @@ -701138,7 +677801,7 @@ _0815639E: pop {r1} bx r1 .align 2, 0 -_081563AC: .4byte 0x02039f34 + .pool thumb_func_end sub_8156324 thumb_func_start sub_81563B0 @@ -701146,7 +677809,7 @@ sub_81563B0: @ 81563B0 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r5, _08156408 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r0, [r0, 0xC] ldrb r0, [r0] @@ -701154,8 +677817,8 @@ sub_81563B0: @ 81563B0 cmp r0, 0x2 beq _081564A0 adds r7, r5, 0 - ldr r6, _0815640C - ldr r0, _08156410 + ldr r6, =0x0203ab38 + ldr r0, =0x02039e1e mov r8, r0 _081563CC: ldr r0, [r7] @@ -701167,7 +677830,7 @@ _081563CC: bgt _08156496 cmp r0, 0 bne _08156496 - ldr r1, _08156414 + ldr r1, =0x082de350 ldrb r0, [r2, 0x10] lsls r0, 2 adds r0, r1 @@ -701188,10 +677851,7 @@ _081563CC: strh r0, [r2, 0x2] b _0815641A .align 2, 0 -_08156408: .4byte 0x02039f34 -_0815640C: .4byte 0x0203ab38 -_08156410: .4byte 0x02039e1e -_08156414: .4byte 0x082de350 + .pool _08156418: strh r1, [r2, 0x2] _0815641A: @@ -701205,7 +677865,7 @@ _08156426: ldrh r1, [r2, 0x2] cmp r1, 0 beq _08156444 - ldr r1, _08156440 + ldr r1, =0x085cdd00 ldr r0, [r6] ldrb r0, [r0] lsls r0, 2 @@ -701214,7 +677874,7 @@ _08156426: bl _call_via_r0 b _08156458 .align 2, 0 -_08156440: .4byte 0x085cdd00 + .pool _08156444: adds r0, r2, 0x5 ldrb r2, [r2, 0x4] @@ -701227,7 +677887,7 @@ _08156444: orrs r0, r1 strb r0, [r2, 0x9] _08156458: - ldr r2, _08156480 + ldr r2, =0x02039f34 ldr r0, [r2] ldr r3, [r0, 0xC] ldrb r1, [r3, 0x9] @@ -701248,7 +677908,7 @@ _08156458: strb r2, [r1] b _0815648A .align 2, 0 -_08156480: .4byte 0x02039f34 + .pool _08156484: ldrb r0, [r1] adds r0, 0x1 @@ -701280,12 +677940,12 @@ sub_81564AC: @ 81564AC lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _081564BC + ldr r3, =0x02039f34 ldr r0, [r3] ldr r0, [r0, 0x8] b _081564CC .align 2, 0 -_081564BC: .4byte 0x02039f34 + .pool _081564C0: adds r1, 0x1 cmp r1, 0x3 @@ -701307,13 +677967,13 @@ _081564D2: thumb_func_start sub_81564DC sub_81564DC: @ 81564DC push {r4,lr} - ldr r3, _08156508 + ldr r3, =0x02039f34 ldr r0, [r3] ldr r0, [r0, 0xC] adds r1, r0, 0x5 ldrb r0, [r0, 0x4] adds r1, r0 - ldr r2, _0815650C + ldr r2, =0x0203ab38 ldr r0, [r2] ldrb r0, [r0, 0x1] lsls r0, 24 @@ -701328,8 +677988,7 @@ sub_81564DC: @ 81564DC movs r4, 0xFF b _08156516 .align 2, 0 -_08156508: .4byte 0x02039f34 -_0815650C: .4byte 0x0203ab38 + .pool _08156510: cmp r0, 0 bge _08156516 @@ -701351,32 +678010,31 @@ _08156516: thumb_func_start sub_8156530 sub_8156530: @ 8156530 - ldr r0, _08156548 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] ldr r0, [r0] ldrb r0, [r0, 0x1] strh r0, [r1, 0x18] - ldr r1, _0815654C + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08156548: .4byte 0x02039f34 -_0815654C: .4byte 0x0203ab38 + .pool thumb_func_end sub_8156530 thumb_func_start sub_8156550 sub_8156550: @ 8156550 push {lr} bl sub_8156530 - ldr r0, _08156584 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156588 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701394,8 +678052,7 @@ sub_8156550: @ 8156550 str r1, [r3] b _08156590 .align 2, 0 -_08156584: .4byte 0x02039f34 -_08156588: .4byte 0x0203ab38 + .pool _0815658C: adds r0, r2, 0x5 str r0, [r3] @@ -701408,12 +678065,12 @@ _08156590: sub_8156594: @ 8156594 push {lr} bl sub_8156530 - ldr r0, _081565C8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081565CC + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701431,8 +678088,7 @@ sub_8156594: @ 8156594 str r1, [r3] b _081565D4 .align 2, 0 -_081565C8: .4byte 0x02039f34 -_081565CC: .4byte 0x0203ab38 + .pool _081565D0: adds r0, r2, 0x5 str r0, [r3] @@ -701445,12 +678101,12 @@ _081565D4: sub_81565D8: @ 81565D8 push {lr} bl sub_8156530 - ldr r0, _0815660C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156610 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701468,8 +678124,7 @@ sub_81565D8: @ 81565D8 str r1, [r3] b _08156618 .align 2, 0 -_0815660C: .4byte 0x02039f34 -_08156610: .4byte 0x0203ab38 + .pool _08156614: adds r0, r2, 0x5 str r0, [r3] @@ -701482,12 +678137,12 @@ _08156618: sub_815661C: @ 815661C push {lr} bl sub_8156530 - ldr r0, _08156650 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156654 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701505,8 +678160,7 @@ sub_815661C: @ 815661C str r1, [r3] b _0815665C .align 2, 0 -_08156650: .4byte 0x02039f34 -_08156654: .4byte 0x0203ab38 + .pool _08156658: adds r0, r2, 0x5 str r0, [r3] @@ -701517,7 +678171,7 @@ _0815665C: thumb_func_start sub_8156660 sub_8156660: @ 8156660 - ldr r0, _0815667C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] ldr r0, [r0] @@ -701525,26 +678179,25 @@ sub_8156660: @ 8156660 lsls r0, 24 asrs r0, 24 strh r0, [r1, 0x18] - ldr r1, _08156680 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_0815667C: .4byte 0x02039f34 -_08156680: .4byte 0x0203ab38 + .pool thumb_func_end sub_8156660 thumb_func_start sub_8156684 sub_8156684: @ 8156684 push {lr} bl sub_8156660 - ldr r0, _081566B8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081566BC + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701562,8 +678215,7 @@ sub_8156684: @ 8156684 str r1, [r3] b _081566C4 .align 2, 0 -_081566B8: .4byte 0x02039f34 -_081566BC: .4byte 0x0203ab38 + .pool _081566C0: adds r0, r2, 0x5 str r0, [r3] @@ -701576,12 +678228,12 @@ _081566C4: sub_81566C8: @ 81566C8 push {lr} bl sub_8156660 - ldr r0, _081566FC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156700 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701599,8 +678251,7 @@ sub_81566C8: @ 81566C8 str r1, [r3] b _08156708 .align 2, 0 -_081566FC: .4byte 0x02039f34 -_08156700: .4byte 0x0203ab38 + .pool _08156704: adds r0, r2, 0x5 str r0, [r3] @@ -701613,12 +678264,12 @@ _08156708: sub_815670C: @ 815670C push {lr} bl sub_8156660 - ldr r0, _08156740 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156744 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701636,8 +678287,7 @@ sub_815670C: @ 815670C str r1, [r3] b _0815674C .align 2, 0 -_08156740: .4byte 0x02039f34 -_08156744: .4byte 0x0203ab38 + .pool _08156748: adds r0, r2, 0x5 str r0, [r3] @@ -701650,12 +678300,12 @@ _0815674C: sub_8156750: @ 8156750 push {lr} bl sub_8156660 - ldr r0, _08156784 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156788 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701673,8 +678323,7 @@ sub_8156750: @ 8156750 str r1, [r3] b _08156790 .align 2, 0 -_08156784: .4byte 0x02039f34 -_08156788: .4byte 0x0203ab38 + .pool _0815678C: adds r0, r2, 0x5 str r0, [r3] @@ -701685,7 +678334,7 @@ _08156790: thumb_func_start sub_8156794 sub_8156794: @ 8156794 - ldr r0, _081567B4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] ldr r0, [r0, 0x8] @@ -701695,26 +678344,25 @@ sub_8156794: @ 8156794 adds r0, r1 ldrb r0, [r0] strh r0, [r2, 0x18] - ldr r1, _081567B8 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_081567B4: .4byte 0x02039f34 -_081567B8: .4byte 0x0203ab38 + .pool thumb_func_end sub_8156794 thumb_func_start sub_81567BC sub_81567BC: @ 81567BC push {lr} bl sub_8156794 - ldr r0, _081567F0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081567F4 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701732,8 +678380,7 @@ sub_81567BC: @ 81567BC str r1, [r3] b _081567FC .align 2, 0 -_081567F0: .4byte 0x02039f34 -_081567F4: .4byte 0x0203ab38 + .pool _081567F8: adds r0, r2, 0x5 str r0, [r3] @@ -701746,12 +678393,12 @@ _081567FC: sub_8156800: @ 8156800 push {lr} bl sub_8156794 - ldr r0, _08156834 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156838 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701769,8 +678416,7 @@ sub_8156800: @ 8156800 str r1, [r3] b _08156840 .align 2, 0 -_08156834: .4byte 0x02039f34 -_08156838: .4byte 0x0203ab38 + .pool _0815683C: adds r0, r2, 0x5 str r0, [r3] @@ -701783,12 +678429,12 @@ _08156840: sub_8156844: @ 8156844 push {lr} bl sub_8156794 - ldr r0, _08156878 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _0815687C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701806,8 +678452,7 @@ sub_8156844: @ 8156844 str r1, [r3] b _08156884 .align 2, 0 -_08156878: .4byte 0x02039f34 -_0815687C: .4byte 0x0203ab38 + .pool _08156880: adds r0, r2, 0x5 str r0, [r3] @@ -701820,12 +678465,12 @@ _08156884: sub_8156888: @ 8156888 push {lr} bl sub_8156794 - ldr r0, _081568BC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081568C0 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701843,8 +678488,7 @@ sub_8156888: @ 8156888 str r1, [r3] b _081568C8 .align 2, 0 -_081568BC: .4byte 0x02039f34 -_081568C0: .4byte 0x0203ab38 + .pool _081568C4: adds r0, r2, 0x5 str r0, [r3] @@ -701856,7 +678500,7 @@ _081568C8: thumb_func_start sub_81568CC sub_81568CC: @ 81568CC push {r4,lr} - ldr r0, _08156904 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r4, [r0, 0xC] adds r1, r4, 0 @@ -701875,7 +678519,7 @@ sub_81568CC: @ 81568CC lsls r0, 24 asrs r0, 24 strh r0, [r4, 0x18] - ldr r1, _08156908 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -701883,20 +678527,19 @@ sub_81568CC: @ 81568CC pop {r0} bx r0 .align 2, 0 -_08156904: .4byte 0x02039f34 -_08156908: .4byte 0x0203ab38 + .pool thumb_func_end sub_81568CC thumb_func_start sub_815690C sub_815690C: @ 815690C push {lr} bl sub_81568CC - ldr r0, _08156940 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156944 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701914,8 +678557,7 @@ sub_815690C: @ 815690C str r1, [r3] b _0815694C .align 2, 0 -_08156940: .4byte 0x02039f34 -_08156944: .4byte 0x0203ab38 + .pool _08156948: adds r0, r2, 0x5 str r0, [r3] @@ -701928,12 +678570,12 @@ _0815694C: sub_8156950: @ 8156950 push {lr} bl sub_81568CC - ldr r0, _08156984 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156988 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701951,8 +678593,7 @@ sub_8156950: @ 8156950 str r1, [r3] b _08156990 .align 2, 0 -_08156984: .4byte 0x02039f34 -_08156988: .4byte 0x0203ab38 + .pool _0815698C: adds r0, r2, 0x5 str r0, [r3] @@ -701965,12 +678606,12 @@ _08156990: sub_8156994: @ 8156994 push {lr} bl sub_81568CC - ldr r0, _081569C8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081569CC + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -701988,8 +678629,7 @@ sub_8156994: @ 8156994 str r1, [r3] b _081569D4 .align 2, 0 -_081569C8: .4byte 0x02039f34 -_081569CC: .4byte 0x0203ab38 + .pool _081569D0: adds r0, r2, 0x5 str r0, [r3] @@ -702002,12 +678642,12 @@ _081569D4: sub_81569D8: @ 81569D8 push {lr} bl sub_81568CC - ldr r0, _08156A0C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156A10 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -702025,8 +678665,7 @@ sub_81569D8: @ 81569D8 str r1, [r3] b _08156A18 .align 2, 0 -_08156A0C: .4byte 0x02039f34 -_08156A10: .4byte 0x0203ab38 + .pool _08156A14: adds r0, r2, 0x5 str r0, [r3] @@ -702037,7 +678676,7 @@ _08156A18: thumb_func_start sub_8156A1C sub_8156A1C: @ 8156A1C - ldr r0, _08156A40 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r3, [r0, 0xC] adds r1, r3, 0 @@ -702050,24 +678689,23 @@ sub_8156A1C: @ 8156A1C adds r0, r2 ldrh r0, [r0, 0x4] strh r0, [r3, 0x18] - ldr r1, _08156A44 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08156A40: .4byte 0x02039f34 -_08156A44: .4byte 0x0203ab38 + .pool thumb_func_end sub_8156A1C thumb_func_start sub_8156A48 sub_8156A48: @ 8156A48 push {r4,r5,lr} bl sub_8156A1C - ldr r0, _08156A84 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08156A88 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3] ldrb r0, [r3, 0x1] @@ -702092,8 +678730,7 @@ sub_8156A48: @ 8156A48 str r1, [r4] b _08156A90 .align 2, 0 -_08156A84: .4byte 0x02039f34 -_08156A88: .4byte 0x0203ab38 + .pool _08156A8C: adds r0, r3, 0x6 str r0, [r4] @@ -702107,10 +678744,10 @@ _08156A90: sub_8156A98: @ 8156A98 push {r4,r5,lr} bl sub_8156A1C - ldr r0, _08156AD4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08156AD8 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3] ldrb r0, [r3, 0x1] @@ -702135,8 +678772,7 @@ sub_8156A98: @ 8156A98 str r1, [r4] b _08156AE0 .align 2, 0 -_08156AD4: .4byte 0x02039f34 -_08156AD8: .4byte 0x0203ab38 + .pool _08156ADC: adds r0, r3, 0x6 str r0, [r4] @@ -702150,10 +678786,10 @@ _08156AE0: sub_8156AE8: @ 8156AE8 push {r4,r5,lr} bl sub_8156A1C - ldr r0, _08156B24 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08156B28 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3] ldrb r0, [r3, 0x1] @@ -702178,8 +678814,7 @@ sub_8156AE8: @ 8156AE8 str r1, [r4] b _08156B30 .align 2, 0 -_08156B24: .4byte 0x02039f34 -_08156B28: .4byte 0x0203ab38 + .pool _08156B2C: adds r0, r3, 0x6 str r0, [r4] @@ -702193,10 +678828,10 @@ _08156B30: sub_8156B38: @ 8156B38 push {r4,r5,lr} bl sub_8156A1C - ldr r0, _08156B74 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08156B78 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3] ldrb r0, [r3, 0x1] @@ -702221,8 +678856,7 @@ sub_8156B38: @ 8156B38 str r1, [r4] b _08156B80 .align 2, 0 -_08156B74: .4byte 0x02039f34 -_08156B78: .4byte 0x0203ab38 + .pool _08156B7C: adds r0, r3, 0x6 str r0, [r4] @@ -702234,10 +678868,10 @@ _08156B80: thumb_func_start sub_8156B88 sub_8156B88: @ 8156B88 - ldr r0, _08156BA8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r1, _08156BAC + ldr r1, =0x02039f00 adds r0, r2, 0 adds r0, 0x41 ldrb r0, [r0] @@ -702245,25 +678879,23 @@ sub_8156B88: @ 8156B88 adds r0, r1 ldrh r0, [r0] strh r0, [r2, 0x18] - ldr r1, _08156BB0 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08156BA8: .4byte 0x02039f34 -_08156BAC: .4byte 0x02039f00 -_08156BB0: .4byte 0x0203ab38 + .pool thumb_func_end sub_8156B88 thumb_func_start sub_8156BB4 sub_8156BB4: @ 8156BB4 push {r4,r5,lr} bl sub_8156B88 - ldr r0, _08156BF0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08156BF4 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3] ldrb r0, [r3, 0x1] @@ -702288,8 +678920,7 @@ sub_8156BB4: @ 8156BB4 str r1, [r4] b _08156BFC .align 2, 0 -_08156BF0: .4byte 0x02039f34 -_08156BF4: .4byte 0x0203ab38 + .pool _08156BF8: adds r0, r3, 0x6 str r0, [r4] @@ -702303,10 +678934,10 @@ _08156BFC: sub_8156C04: @ 8156C04 push {r4,r5,lr} bl sub_8156B88 - ldr r0, _08156C40 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08156C44 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3] ldrb r0, [r3, 0x1] @@ -702331,8 +678962,7 @@ sub_8156C04: @ 8156C04 str r1, [r4] b _08156C4C .align 2, 0 -_08156C40: .4byte 0x02039f34 -_08156C44: .4byte 0x0203ab38 + .pool _08156C48: adds r0, r3, 0x6 str r0, [r4] @@ -702346,10 +678976,10 @@ _08156C4C: sub_8156C54: @ 8156C54 push {r4,r5,lr} bl sub_8156B88 - ldr r0, _08156C90 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08156C94 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3] ldrb r0, [r3, 0x1] @@ -702374,8 +679004,7 @@ sub_8156C54: @ 8156C54 str r1, [r4] b _08156C9C .align 2, 0 -_08156C90: .4byte 0x02039f34 -_08156C94: .4byte 0x0203ab38 + .pool _08156C98: adds r0, r3, 0x6 str r0, [r4] @@ -702389,10 +679018,10 @@ _08156C9C: sub_8156CA4: @ 8156CA4 push {r4,r5,lr} bl sub_8156B88 - ldr r0, _08156CE0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08156CE4 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3] ldrb r0, [r3, 0x1] @@ -702417,8 +679046,7 @@ sub_8156CA4: @ 8156CA4 str r1, [r4] b _08156CEC .align 2, 0 -_08156CE0: .4byte 0x02039f34 -_08156CE4: .4byte 0x0203ab38 + .pool _08156CE8: adds r0, r3, 0x6 str r0, [r4] @@ -702430,33 +679058,31 @@ _08156CEC: thumb_func_start sub_8156CF4 sub_8156CF4: @ 8156CF4 - ldr r0, _08156D0C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] - ldr r0, _08156D10 + ldr r0, =0x02039f2c ldrh r0, [r0] strh r0, [r1, 0x18] - ldr r1, _08156D14 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08156D0C: .4byte 0x02039f34 -_08156D10: .4byte 0x02039f2c -_08156D14: .4byte 0x0203ab38 + .pool thumb_func_end sub_8156CF4 thumb_func_start sub_8156D18 sub_8156D18: @ 8156D18 push {lr} bl sub_8156CF4 - ldr r0, _08156D4C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156D50 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -702474,8 +679100,7 @@ sub_8156D18: @ 8156D18 str r1, [r3] b _08156D58 .align 2, 0 -_08156D4C: .4byte 0x02039f34 -_08156D50: .4byte 0x0203ab38 + .pool _08156D54: adds r0, r2, 0x5 str r0, [r3] @@ -702488,12 +679113,12 @@ _08156D58: sub_8156D5C: @ 8156D5C push {lr} bl sub_8156CF4 - ldr r0, _08156D90 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156D94 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -702511,8 +679136,7 @@ sub_8156D5C: @ 8156D5C str r1, [r3] b _08156D9C .align 2, 0 -_08156D90: .4byte 0x02039f34 -_08156D94: .4byte 0x0203ab38 + .pool _08156D98: adds r0, r2, 0x5 str r0, [r3] @@ -702524,8 +679148,8 @@ _08156D9C: thumb_func_start sub_8156DA0 sub_8156DA0: @ 8156DA0 push {r4,lr} - ldr r2, _08156DD8 - ldr r4, _08156DDC + ldr r2, =0x02039e00 + ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0xC] ldrb r1, [r0, 0x4] @@ -702543,7 +679167,7 @@ sub_8156DA0: @ 8156DA0 lsls r0, 24 asrs r0, 24 strh r0, [r1, 0x18] - ldr r1, _08156DE0 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -702551,19 +679175,17 @@ sub_8156DA0: @ 8156DA0 pop {r0} bx r0 .align 2, 0 -_08156DD8: .4byte 0x02039e00 -_08156DDC: .4byte 0x02039f34 -_08156DE0: .4byte 0x0203ab38 + .pool thumb_func_end sub_8156DA0 thumb_func_start sub_8156DE4 sub_8156DE4: @ 8156DE4 push {r4,lr} bl sub_8156DA0 - ldr r0, _08156E18 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] - ldr r3, _08156E1C + ldr r3, =0x0203ab38 ldr r2, [r3] movs r4, 0x18 ldrsh r1, [r0, r4] @@ -702584,8 +679206,7 @@ sub_8156DE4: @ 8156DE4 str r1, [r3] b _08156E24 .align 2, 0 -_08156E18: .4byte 0x02039f34 -_08156E1C: .4byte 0x0203ab38 + .pool _08156E20: adds r0, r2, 0x5 str r0, [r3] @@ -702599,10 +679220,10 @@ _08156E24: sub_8156E2C: @ 8156E2C push {r4,lr} bl sub_8156DA0 - ldr r0, _08156E60 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] - ldr r3, _08156E64 + ldr r3, =0x0203ab38 ldr r2, [r3] movs r4, 0x18 ldrsh r1, [r0, r4] @@ -702623,8 +679244,7 @@ sub_8156E2C: @ 8156E2C str r1, [r3] b _08156E6C .align 2, 0 -_08156E60: .4byte 0x02039f34 -_08156E64: .4byte 0x0203ab38 + .pool _08156E68: adds r0, r2, 0x5 str r0, [r3] @@ -702638,10 +679258,10 @@ _08156E6C: sub_8156E74: @ 8156E74 push {r4,lr} bl sub_8156DA0 - ldr r0, _08156EA8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] - ldr r3, _08156EAC + ldr r3, =0x0203ab38 ldr r2, [r3] movs r4, 0x18 ldrsh r1, [r0, r4] @@ -702662,8 +679282,7 @@ sub_8156E74: @ 8156E74 str r1, [r3] b _08156EB4 .align 2, 0 -_08156EA8: .4byte 0x02039f34 -_08156EAC: .4byte 0x0203ab38 + .pool _08156EB0: adds r0, r2, 0x5 str r0, [r3] @@ -702677,10 +679296,10 @@ _08156EB4: sub_8156EBC: @ 8156EBC push {r4,lr} bl sub_8156DA0 - ldr r0, _08156EF0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] - ldr r3, _08156EF4 + ldr r3, =0x0203ab38 ldr r2, [r3] movs r4, 0x18 ldrsh r1, [r0, r4] @@ -702701,8 +679320,7 @@ sub_8156EBC: @ 8156EBC str r1, [r3] b _08156EFC .align 2, 0 -_08156EF0: .4byte 0x02039f34 -_08156EF4: .4byte 0x0203ab38 + .pool _08156EF8: adds r0, r2, 0x5 str r0, [r3] @@ -702714,8 +679332,8 @@ _08156EFC: thumb_func_start sub_8156F04 sub_8156F04: @ 8156F04 - ldr r2, _08156F34 - ldr r0, _08156F38 + ldr r2, =0x02039e00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r3, [r0, 0xC] ldrb r1, [r3, 0x4] @@ -702728,33 +679346,30 @@ sub_8156F04: @ 8156F04 adds r2, 0x1E adds r1, r2 ldrh r0, [r1] - ldr r1, _08156F3C + ldr r1, =0x0858c2b4 lsls r0, 3 adds r0, r1 ldrb r0, [r0] strh r0, [r3, 0x18] - ldr r1, _08156F40 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08156F34: .4byte 0x02039e00 -_08156F38: .4byte 0x02039f34 -_08156F3C: .4byte 0x0858c2b4 -_08156F40: .4byte 0x0203ab38 + .pool thumb_func_end sub_8156F04 thumb_func_start sub_8156F44 sub_8156F44: @ 8156F44 push {lr} bl sub_8156F04 - ldr r0, _08156F78 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156F7C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -702772,8 +679387,7 @@ sub_8156F44: @ 8156F44 str r1, [r3] b _08156F84 .align 2, 0 -_08156F78: .4byte 0x02039f34 -_08156F7C: .4byte 0x0203ab38 + .pool _08156F80: adds r0, r2, 0x5 str r0, [r3] @@ -702786,12 +679400,12 @@ _08156F84: sub_8156F88: @ 8156F88 push {lr} bl sub_8156F04 - ldr r0, _08156FBC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08156FC0 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -702809,8 +679423,7 @@ sub_8156F88: @ 8156F88 str r1, [r3] b _08156FC8 .align 2, 0 -_08156FBC: .4byte 0x02039f34 -_08156FC0: .4byte 0x0203ab38 + .pool _08156FC4: adds r0, r2, 0x5 str r0, [r3] @@ -702821,8 +679434,8 @@ _08156FC8: thumb_func_start sub_8156FCC sub_8156FCC: @ 8156FCC - ldr r2, _08157004 - ldr r0, _08157008 + ldr r2, =0x02039e00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r3, [r0, 0xC] ldrb r1, [r3, 0x4] @@ -702835,8 +679448,8 @@ sub_8156FCC: @ 8156FCC adds r2, 0x1E adds r1, r2 ldrh r0, [r1] - ldr r2, _0815700C - ldr r1, _08157010 + ldr r2, =0x0858cdcc + ldr r1, =0x0858c2b4 lsls r0, 3 adds r0, r1 ldrb r0, [r0] @@ -702844,29 +679457,25 @@ sub_8156FCC: @ 8156FCC adds r0, r2 ldrb r0, [r0] strh r0, [r3, 0x18] - ldr r1, _08157014 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] bx lr .align 2, 0 -_08157004: .4byte 0x02039e00 -_08157008: .4byte 0x02039f34 -_0815700C: .4byte 0x0858cdcc -_08157010: .4byte 0x0858c2b4 -_08157014: .4byte 0x0203ab38 + .pool thumb_func_end sub_8156FCC thumb_func_start sub_8157018 sub_8157018: @ 8157018 push {lr} bl sub_8156FCC - ldr r0, _0815704C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157050 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -702884,8 +679493,7 @@ sub_8157018: @ 8157018 str r1, [r3] b _08157058 .align 2, 0 -_0815704C: .4byte 0x02039f34 -_08157050: .4byte 0x0203ab38 + .pool _08157054: adds r0, r2, 0x5 str r0, [r3] @@ -702898,12 +679506,12 @@ _08157058: sub_815705C: @ 815705C push {lr} bl sub_8156FCC - ldr r0, _08157090 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157094 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -702921,8 +679529,7 @@ sub_815705C: @ 815705C str r1, [r3] b _0815709C .align 2, 0 -_08157090: .4byte 0x02039f34 -_08157094: .4byte 0x0203ab38 + .pool _08157098: adds r0, r2, 0x5 str r0, [r3] @@ -702934,8 +679541,8 @@ _0815709C: thumb_func_start sub_81570A0 sub_81570A0: @ 81570A0 push {r4-r7,lr} - ldr r2, _08157100 - ldr r5, _08157104 + ldr r2, =0x02039e00 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0xC] ldrb r0, [r1, 0x4] @@ -702947,8 +679554,8 @@ sub_81570A0: @ 81570A0 adds r2, 0x1E adds r0, r2 ldrh r0, [r0] - ldr r3, _08157108 - ldr r4, _0815710C + ldr r3, =0x0858cdcc + ldr r4, =0x0858c2b4 lsls r0, 3 adds r0, r4 ldrb r0, [r0] @@ -702956,7 +679563,7 @@ sub_81570A0: @ 81570A0 adds r0, r3 ldrb r7, [r0, 0x1] movs r6, 0 - ldr r0, _08157110 + ldr r0, =0x0203ab38 mov r12, r0 adds r1, r2 _081570D4: @@ -702984,11 +679591,7 @@ _081570F2: movs r0, 0x1 b _0815711A .align 2, 0 -_08157100: .4byte 0x02039e00 -_08157104: .4byte 0x02039f34 -_08157108: .4byte 0x0858cdcc -_0815710C: .4byte 0x0858c2b4 -_08157110: .4byte 0x0203ab38 + .pool _08157114: ldr r0, [r5] ldr r1, [r0, 0xC] @@ -703008,14 +679611,14 @@ _0815711A: sub_815712C: @ 815712C push {lr} bl sub_81570A0 - ldr r0, _0815715C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 beq _08157164 - ldr r3, _08157160 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -703030,10 +679633,9 @@ sub_815712C: @ 815712C str r1, [r3] b _0815716C .align 2, 0 -_0815715C: .4byte 0x02039f34 -_08157160: .4byte 0x0203ab38 + .pool _08157164: - ldr r1, _08157170 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -703041,14 +679643,14 @@ _0815716C: pop {r0} bx r0 .align 2, 0 -_08157170: .4byte 0x0203ab38 + .pool thumb_func_end sub_815712C thumb_func_start sub_8157174 sub_8157174: @ 8157174 push {r4-r7,lr} - ldr r2, _081571D4 - ldr r5, _081571D8 + ldr r2, =0x02039e00 + ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0xC] ldrb r0, [r1, 0x4] @@ -703060,8 +679662,8 @@ sub_8157174: @ 8157174 adds r2, 0x1E adds r0, r2 ldrh r0, [r0] - ldr r3, _081571DC - ldr r4, _081571E0 + ldr r3, =0x0858cdcc + ldr r4, =0x0858c2b4 lsls r0, 3 adds r0, r4 ldrb r0, [r0] @@ -703069,7 +679671,7 @@ sub_8157174: @ 8157174 adds r0, r3 ldrb r7, [r0, 0x2] movs r6, 0 - ldr r0, _081571E4 + ldr r0, =0x0203ab38 mov r12, r0 adds r1, r2 _081571A8: @@ -703097,11 +679699,7 @@ _081571C6: movs r0, 0x1 b _081571EE .align 2, 0 -_081571D4: .4byte 0x02039e00 -_081571D8: .4byte 0x02039f34 -_081571DC: .4byte 0x0858cdcc -_081571E0: .4byte 0x0858c2b4 -_081571E4: .4byte 0x0203ab38 + .pool _081571E8: ldr r0, [r5] ldr r1, [r0, 0xC] @@ -703121,14 +679719,14 @@ _081571EE: sub_8157200: @ 8157200 push {lr} bl sub_8157174 - ldr r0, _08157230 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 beq _08157238 - ldr r3, _08157234 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -703143,10 +679741,9 @@ sub_8157200: @ 8157200 str r1, [r3] b _08157240 .align 2, 0 -_08157230: .4byte 0x02039f34 -_08157234: .4byte 0x0203ab38 + .pool _08157238: - ldr r1, _08157244 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] @@ -703154,14 +679751,14 @@ _08157240: pop {r0} bx r0 .align 2, 0 -_08157244: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157200 thumb_func_start sub_8157248 sub_8157248: @ 8157248 push {r4,lr} - ldr r2, _08157290 - ldr r0, _08157294 + ldr r2, =0x02039e00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r4, [r0, 0xC] ldrb r1, [r4, 0x4] @@ -703174,8 +679771,8 @@ sub_8157248: @ 8157248 adds r2, 0x1E adds r1, r2 ldrh r0, [r1] - ldr r2, _08157298 - ldr r1, _0815729C + ldr r2, =0x0858cdcc + ldr r1, =0x0858c2b4 lsls r0, 3 adds r0, r1 ldrb r0, [r0] @@ -703187,7 +679784,7 @@ sub_8157248: @ 8157248 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x18] - ldr r1, _081572A0 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -703195,23 +679792,19 @@ sub_8157248: @ 8157248 pop {r0} bx r0 .align 2, 0 -_08157290: .4byte 0x02039e00 -_08157294: .4byte 0x02039f34 -_08157298: .4byte 0x0858cdcc -_0815729C: .4byte 0x0858c2b4 -_081572A0: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157248 thumb_func_start sub_81572A4 sub_81572A4: @ 81572A4 push {lr} bl sub_8157248 - ldr r0, _081572D8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081572DC + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703229,8 +679822,7 @@ sub_81572A4: @ 81572A4 str r1, [r3] b _081572E4 .align 2, 0 -_081572D8: .4byte 0x02039f34 -_081572DC: .4byte 0x0203ab38 + .pool _081572E0: adds r0, r2, 0x5 str r0, [r3] @@ -703243,12 +679835,12 @@ _081572E4: sub_81572E8: @ 81572E8 push {lr} bl sub_8157248 - ldr r0, _0815731C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157320 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703266,8 +679858,7 @@ sub_81572E8: @ 81572E8 str r1, [r3] b _08157328 .align 2, 0 -_0815731C: .4byte 0x02039f34 -_08157320: .4byte 0x0203ab38 + .pool _08157324: adds r0, r2, 0x5 str r0, [r3] @@ -703280,12 +679871,12 @@ _08157328: sub_815732C: @ 815732C push {lr} bl sub_8157248 - ldr r0, _08157360 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157364 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703303,8 +679894,7 @@ sub_815732C: @ 815732C str r1, [r3] b _0815736C .align 2, 0 -_08157360: .4byte 0x02039f34 -_08157364: .4byte 0x0203ab38 + .pool _08157368: adds r0, r2, 0x5 str r0, [r3] @@ -703317,12 +679907,12 @@ _0815736C: sub_8157370: @ 8157370 push {lr} bl sub_8157248 - ldr r0, _081573A4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081573A8 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703340,8 +679930,7 @@ sub_8157370: @ 8157370 str r1, [r3] b _081573B0 .align 2, 0 -_081573A4: .4byte 0x02039f34 -_081573A8: .4byte 0x0203ab38 + .pool _081573AC: adds r0, r2, 0x5 str r0, [r3] @@ -703353,8 +679942,8 @@ _081573B0: thumb_func_start sub_81573B4 sub_81573B4: @ 81573B4 push {r4,lr} - ldr r2, _081573FC - ldr r0, _08157400 + ldr r2, =0x02039e00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r4, [r0, 0xC] ldrb r1, [r4, 0x4] @@ -703367,8 +679956,8 @@ sub_81573B4: @ 81573B4 adds r2, 0x1E adds r1, r2 ldrh r0, [r1] - ldr r2, _08157404 - ldr r1, _08157408 + ldr r2, =0x0858cdcc + ldr r1, =0x0858c2b4 lsls r0, 3 adds r0, r1 ldrb r0, [r0] @@ -703380,7 +679969,7 @@ sub_81573B4: @ 81573B4 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x18] - ldr r1, _0815740C + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -703388,23 +679977,19 @@ sub_81573B4: @ 81573B4 pop {r0} bx r0 .align 2, 0 -_081573FC: .4byte 0x02039e00 -_08157400: .4byte 0x02039f34 -_08157404: .4byte 0x0858cdcc -_08157408: .4byte 0x0858c2b4 -_0815740C: .4byte 0x0203ab38 + .pool thumb_func_end sub_81573B4 thumb_func_start sub_8157410 sub_8157410: @ 8157410 push {lr} bl sub_81573B4 - ldr r0, _08157444 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157448 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703422,8 +680007,7 @@ sub_8157410: @ 8157410 str r1, [r3] b _08157450 .align 2, 0 -_08157444: .4byte 0x02039f34 -_08157448: .4byte 0x0203ab38 + .pool _0815744C: adds r0, r2, 0x5 str r0, [r3] @@ -703436,12 +680020,12 @@ _08157450: sub_8157454: @ 8157454 push {lr} bl sub_81573B4 - ldr r0, _08157488 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _0815748C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703459,8 +680043,7 @@ sub_8157454: @ 8157454 str r1, [r3] b _08157494 .align 2, 0 -_08157488: .4byte 0x02039f34 -_0815748C: .4byte 0x0203ab38 + .pool _08157490: adds r0, r2, 0x5 str r0, [r3] @@ -703473,12 +680056,12 @@ _08157494: sub_8157498: @ 8157498 push {lr} bl sub_81573B4 - ldr r0, _081574CC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081574D0 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703496,8 +680079,7 @@ sub_8157498: @ 8157498 str r1, [r3] b _081574D8 .align 2, 0 -_081574CC: .4byte 0x02039f34 -_081574D0: .4byte 0x0203ab38 + .pool _081574D4: adds r0, r2, 0x5 str r0, [r3] @@ -703510,12 +680092,12 @@ _081574D8: sub_81574DC: @ 81574DC push {lr} bl sub_81573B4 - ldr r0, _08157510 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157514 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703533,8 +680115,7 @@ sub_81574DC: @ 81574DC str r1, [r3] b _0815751C .align 2, 0 -_08157510: .4byte 0x02039f34 -_08157514: .4byte 0x0203ab38 + .pool _08157518: adds r0, r2, 0x5 str r0, [r3] @@ -703546,8 +680127,8 @@ _0815751C: thumb_func_start sub_8157520 sub_8157520: @ 8157520 push {r4,r5,lr} - ldr r3, _08157550 - ldr r5, _08157554 + ldr r3, =0x02039e00 + ldr r5, =0x02039f34 ldr r4, [r5] ldr r1, [r4, 0xC] ldrb r0, [r1, 0x4] @@ -703570,8 +680151,7 @@ sub_8157520: @ 8157520 movs r1, 0 b _08157560 .align 2, 0 -_08157550: .4byte 0x02039e00 -_08157554: .4byte 0x02039f34 + .pool _08157558: ldrb r0, [r0, 0xB] lsls r0, 25 @@ -703581,7 +680161,7 @@ _08157560: ldr r0, [r5] ldr r0, [r0, 0xC] strh r1, [r0, 0x18] - ldr r1, _08157574 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -703589,19 +680169,19 @@ _08157560: pop {r0} bx r0 .align 2, 0 -_08157574: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157520 thumb_func_start sub_8157578 sub_8157578: @ 8157578 push {lr} bl sub_8157520 - ldr r0, _081575AC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081575B0 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703619,8 +680199,7 @@ sub_8157578: @ 8157578 str r1, [r3] b _081575B8 .align 2, 0 -_081575AC: .4byte 0x02039f34 -_081575B0: .4byte 0x0203ab38 + .pool _081575B4: adds r0, r2, 0x5 str r0, [r3] @@ -703633,12 +680212,12 @@ _081575B8: sub_81575BC: @ 81575BC push {lr} bl sub_8157520 - ldr r0, _081575F0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081575F4 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703656,8 +680235,7 @@ sub_81575BC: @ 81575BC str r1, [r3] b _081575FC .align 2, 0 -_081575F0: .4byte 0x02039f34 -_081575F4: .4byte 0x0203ab38 + .pool _081575F8: adds r0, r2, 0x5 str r0, [r3] @@ -703670,12 +680248,12 @@ _081575FC: sub_8157600: @ 8157600 push {lr} bl sub_8157520 - ldr r0, _08157634 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157638 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703693,8 +680271,7 @@ sub_8157600: @ 8157600 str r1, [r3] b _08157640 .align 2, 0 -_08157634: .4byte 0x02039f34 -_08157638: .4byte 0x0203ab38 + .pool _0815763C: adds r0, r2, 0x5 str r0, [r3] @@ -703707,12 +680284,12 @@ _08157640: sub_8157644: @ 8157644 push {lr} bl sub_8157520 - ldr r0, _08157678 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _0815767C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -703730,8 +680307,7 @@ sub_8157644: @ 8157644 str r1, [r3] b _08157684 .align 2, 0 -_08157678: .4byte 0x02039f34 -_0815767C: .4byte 0x0203ab38 + .pool _08157680: adds r0, r2, 0x5 str r0, [r3] @@ -703744,8 +680320,8 @@ _08157684: sub_8157688: @ 8157688 push {r4-r6,lr} movs r3, 0 - ldr r2, _081576F4 - ldr r0, _081576F8 + ldr r2, =0x02039e00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] ldrb r1, [r0, 0x4] @@ -703761,7 +680337,7 @@ sub_8157688: @ 8157688 adds r6, r2, 0 _081576AA: lsls r1, r4, 1 - ldr r0, _081576F8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] adds r0, 0x41 @@ -703788,11 +680364,11 @@ _081576D2: _081576DC: movs r3, 0x1 _081576DE: - ldr r0, _081576F8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] strh r3, [r0, 0x18] - ldr r1, _081576FC + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -703800,23 +680376,21 @@ _081576DE: pop {r0} bx r0 .align 2, 0 -_081576F4: .4byte 0x02039e00 -_081576F8: .4byte 0x02039f34 -_081576FC: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157688 thumb_func_start sub_8157700 sub_8157700: @ 8157700 push {lr} bl sub_8157688 - ldr r0, _08157730 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 beq _08157738 - ldr r3, _08157734 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -703831,10 +680405,9 @@ sub_8157700: @ 8157700 str r1, [r3] b _08157740 .align 2, 0 -_08157730: .4byte 0x02039f34 -_08157734: .4byte 0x0203ab38 + .pool _08157738: - ldr r1, _08157744 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -703842,21 +680415,21 @@ _08157740: pop {r0} bx r0 .align 2, 0 -_08157744: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157700 thumb_func_start sub_8157748 sub_8157748: @ 8157748 push {lr} bl sub_8157688 - ldr r0, _08157778 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 bne _08157780 - ldr r3, _0815777C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -703871,10 +680444,9 @@ sub_8157748: @ 8157748 str r1, [r3] b _08157788 .align 2, 0 -_08157778: .4byte 0x02039f34 -_0815777C: .4byte 0x0203ab38 + .pool _08157780: - ldr r1, _0815778C + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -703882,15 +680454,15 @@ _08157788: pop {r0} bx r0 .align 2, 0 -_0815778C: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157748 thumb_func_start sub_8157790 sub_8157790: @ 8157790 push {r4-r6,lr} movs r3, 0 - ldr r2, _081577FC - ldr r0, _08157800 + ldr r2, =0x02039e00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] ldrb r1, [r0, 0x4] @@ -703906,7 +680478,7 @@ sub_8157790: @ 8157790 adds r6, r2, 0 _081577B2: lsls r1, r4, 1 - ldr r0, _08157800 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] adds r0, 0x41 @@ -703932,11 +680504,11 @@ _081577D8: _081577E2: movs r3, 0x1 _081577E4: - ldr r0, _08157800 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] strh r3, [r0, 0x18] - ldr r1, _08157804 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -703944,23 +680516,21 @@ _081577E4: pop {r0} bx r0 .align 2, 0 -_081577FC: .4byte 0x02039e00 -_08157800: .4byte 0x02039f34 -_08157804: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157790 thumb_func_start sub_8157808 sub_8157808: @ 8157808 push {lr} bl sub_8157790 - ldr r0, _08157838 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 beq _08157840 - ldr r3, _0815783C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -703975,10 +680545,9 @@ sub_8157808: @ 8157808 str r1, [r3] b _08157848 .align 2, 0 -_08157838: .4byte 0x02039f34 -_0815783C: .4byte 0x0203ab38 + .pool _08157840: - ldr r1, _0815784C + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -703986,21 +680555,21 @@ _08157848: pop {r0} bx r0 .align 2, 0 -_0815784C: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157808 thumb_func_start sub_8157850 sub_8157850: @ 8157850 push {lr} bl sub_8157790 - ldr r0, _08157880 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 bne _08157888 - ldr r3, _08157884 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -704015,10 +680584,9 @@ sub_8157850: @ 8157850 str r1, [r3] b _08157890 .align 2, 0 -_08157880: .4byte 0x02039f34 -_08157884: .4byte 0x0203ab38 + .pool _08157888: - ldr r1, _08157894 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -704026,15 +680594,15 @@ _08157890: pop {r0} bx r0 .align 2, 0 -_08157894: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157850 thumb_func_start sub_8157898 sub_8157898: @ 8157898 push {r4-r6,lr} movs r5, 0 - ldr r3, _081578EC - ldr r6, _081578F0 + ldr r3, =0x02039e00 + ldr r6, =0x02039f34 ldr r4, [r6] ldr r1, [r4, 0xC] ldrb r0, [r1, 0x4] @@ -704066,7 +680634,7 @@ _081578D6: ldr r0, [r6] ldr r0, [r0, 0xC] strh r5, [r0, 0x18] - ldr r1, _081578F4 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -704074,23 +680642,21 @@ _081578D6: pop {r0} bx r0 .align 2, 0 -_081578EC: .4byte 0x02039e00 -_081578F0: .4byte 0x02039f34 -_081578F4: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157898 thumb_func_start sub_81578F8 sub_81578F8: @ 81578F8 push {lr} bl sub_8157898 - ldr r0, _08157928 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 beq _08157930 - ldr r3, _0815792C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -704105,10 +680671,9 @@ sub_81578F8: @ 81578F8 str r1, [r3] b _08157938 .align 2, 0 -_08157928: .4byte 0x02039f34 -_0815792C: .4byte 0x0203ab38 + .pool _08157930: - ldr r1, _0815793C + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -704116,21 +680681,21 @@ _08157938: pop {r0} bx r0 .align 2, 0 -_0815793C: .4byte 0x0203ab38 + .pool thumb_func_end sub_81578F8 thumb_func_start sub_8157940 sub_8157940: @ 8157940 push {lr} bl sub_8157898 - ldr r0, _08157970 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 bne _08157978 - ldr r3, _08157974 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -704145,10 +680710,9 @@ sub_8157940: @ 8157940 str r1, [r3] b _08157980 .align 2, 0 -_08157970: .4byte 0x02039f34 -_08157974: .4byte 0x0203ab38 + .pool _08157978: - ldr r1, _08157984 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -704156,19 +680720,19 @@ _08157980: pop {r0} bx r0 .align 2, 0 -_08157984: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157940 thumb_func_start sub_8157988 sub_8157988: @ 8157988 push {r4,r5,lr} - ldr r4, _081579C4 + ldr r4, =0x0203ab38 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_81564AC lsls r0, 24 lsrs r0, 24 - ldr r1, _081579C8 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r5, [r1, 0xC] ldr r2, [r1, 0x4] @@ -704190,20 +680754,19 @@ sub_8157988: @ 8157988 pop {r0} bx r0 .align 2, 0 -_081579C4: .4byte 0x0203ab38 -_081579C8: .4byte 0x02039f34 + .pool thumb_func_end sub_8157988 thumb_func_start sub_81579CC sub_81579CC: @ 81579CC push {lr} bl sub_8157988 - ldr r0, _08157A00 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157A04 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -704221,8 +680784,7 @@ sub_81579CC: @ 81579CC str r1, [r3] b _08157A0C .align 2, 0 -_08157A00: .4byte 0x02039f34 -_08157A04: .4byte 0x0203ab38 + .pool _08157A08: adds r0, r2, 0x5 str r0, [r3] @@ -704235,12 +680797,12 @@ _08157A0C: sub_8157A10: @ 8157A10 push {lr} bl sub_8157988 - ldr r0, _08157A44 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157A48 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -704258,8 +680820,7 @@ sub_8157A10: @ 8157A10 str r1, [r3] b _08157A50 .align 2, 0 -_08157A44: .4byte 0x02039f34 -_08157A48: .4byte 0x0203ab38 + .pool _08157A4C: adds r0, r2, 0x5 str r0, [r3] @@ -704272,12 +680833,12 @@ _08157A50: sub_8157A54: @ 8157A54 push {lr} bl sub_8157988 - ldr r0, _08157A88 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157A8C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -704295,8 +680856,7 @@ sub_8157A54: @ 8157A54 str r1, [r3] b _08157A94 .align 2, 0 -_08157A88: .4byte 0x02039f34 -_08157A8C: .4byte 0x0203ab38 + .pool _08157A90: adds r0, r2, 0x5 str r0, [r3] @@ -704309,12 +680869,12 @@ _08157A94: sub_8157A98: @ 8157A98 push {lr} bl sub_8157988 - ldr r0, _08157ACC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157AD0 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -704332,8 +680892,7 @@ sub_8157A98: @ 8157A98 str r1, [r3] b _08157AD8 .align 2, 0 -_08157ACC: .4byte 0x02039f34 -_08157AD0: .4byte 0x0203ab38 + .pool _08157AD4: adds r0, r2, 0x5 str r0, [r3] @@ -704346,7 +680905,7 @@ _08157AD8: sub_8157ADC: @ 8157ADC push {r4-r6,lr} movs r6, 0 - ldr r5, _08157B2C + ldr r5, =0x0203ab38 ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_81564AC @@ -704357,8 +680916,8 @@ sub_8157ADC: @ 8157ADC lsls r0, 24 cmp r0, 0 beq _08157B18 - ldr r2, _08157B30 - ldr r0, _08157B34 + ldr r2, =0x0858c2b4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r4, 3 @@ -704373,7 +680932,7 @@ sub_8157ADC: @ 8157ADC orrs r0, r1 lsrs r6, r0, 31 _08157B18: - ldr r0, _08157B34 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] strh r6, [r0, 0x18] @@ -704384,21 +680943,19 @@ _08157B18: pop {r0} bx r0 .align 2, 0 -_08157B2C: .4byte 0x0203ab38 -_08157B30: .4byte 0x0858c2b4 -_08157B34: .4byte 0x02039f34 + .pool thumb_func_end sub_8157ADC thumb_func_start sub_8157B38 sub_8157B38: @ 8157B38 push {lr} bl sub_8157ADC - ldr r0, _08157B6C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157B70 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -704416,8 +680973,7 @@ sub_8157B38: @ 8157B38 str r1, [r3] b _08157B78 .align 2, 0 -_08157B6C: .4byte 0x02039f34 -_08157B70: .4byte 0x0203ab38 + .pool _08157B74: adds r0, r2, 0x5 str r0, [r3] @@ -704430,12 +680986,12 @@ _08157B78: sub_8157B7C: @ 8157B7C push {lr} bl sub_8157ADC - ldr r0, _08157BB0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157BB4 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -704453,8 +681009,7 @@ sub_8157B7C: @ 8157B7C str r1, [r3] b _08157BBC .align 2, 0 -_08157BB0: .4byte 0x02039f34 -_08157BB4: .4byte 0x0203ab38 + .pool _08157BB8: adds r0, r2, 0x5 str r0, [r3] @@ -704467,12 +681022,12 @@ _08157BBC: sub_8157BC0: @ 8157BC0 push {lr} bl sub_8157ADC - ldr r0, _08157BF4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157BF8 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -704490,8 +681045,7 @@ sub_8157BC0: @ 8157BC0 str r1, [r3] b _08157C00 .align 2, 0 -_08157BF4: .4byte 0x02039f34 -_08157BF8: .4byte 0x0203ab38 + .pool _08157BFC: adds r0, r2, 0x5 str r0, [r3] @@ -704504,12 +681058,12 @@ _08157C00: sub_8157C04: @ 8157C04 push {lr} bl sub_8157ADC - ldr r0, _08157C38 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08157C3C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -704527,8 +681081,7 @@ sub_8157C04: @ 8157C04 str r1, [r3] b _08157C44 .align 2, 0 -_08157C38: .4byte 0x02039f34 -_08157C3C: .4byte 0x0203ab38 + .pool _08157C40: adds r0, r2, 0x5 str r0, [r3] @@ -704540,7 +681093,7 @@ _08157C44: thumb_func_start sub_8157C48 sub_8157C48: @ 8157C48 push {lr} - ldr r0, _08157C6C + ldr r0, =0x0203ab38 ldr r0, [r0] ldrb r0, [r0, 0x1] bl sub_81564AC @@ -704550,44 +681103,42 @@ sub_8157C48: @ 8157C48 lsls r0, 24 cmp r0, 0 beq _08157C74 - ldr r0, _08157C70 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] movs r0, 0 b _08157C7C .align 2, 0 -_08157C6C: .4byte 0x0203ab38 -_08157C70: .4byte 0x02039f34 + .pool _08157C74: - ldr r0, _08157C8C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] movs r0, 0x1 _08157C7C: strh r0, [r1, 0x18] - ldr r1, _08157C90 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x2 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08157C8C: .4byte 0x02039f34 -_08157C90: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157C48 thumb_func_start sub_8157C94 sub_8157C94: @ 8157C94 push {lr} bl sub_8157C48 - ldr r0, _08157CC4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 beq _08157CCC - ldr r3, _08157CC8 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -704602,10 +681153,9 @@ sub_8157C94: @ 8157C94 str r1, [r3] b _08157CD4 .align 2, 0 -_08157CC4: .4byte 0x02039f34 -_08157CC8: .4byte 0x0203ab38 + .pool _08157CCC: - ldr r1, _08157CD8 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -704613,21 +681163,21 @@ _08157CD4: pop {r0} bx r0 .align 2, 0 -_08157CD8: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157C94 thumb_func_start sub_8157CDC sub_8157CDC: @ 8157CDC push {lr} bl sub_8157C48 - ldr r0, _08157D0C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 bne _08157D14 - ldr r3, _08157D10 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -704642,10 +681192,9 @@ sub_8157CDC: @ 8157CDC str r1, [r3] b _08157D1C .align 2, 0 -_08157D0C: .4byte 0x02039f34 -_08157D10: .4byte 0x0203ab38 + .pool _08157D14: - ldr r1, _08157D20 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -704653,19 +681202,19 @@ _08157D1C: pop {r0} bx r0 .align 2, 0 -_08157D20: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157CDC thumb_func_start sub_8157D24 sub_8157D24: @ 8157D24 push {r4,lr} - ldr r4, _08157D58 + ldr r4, =0x0203ab38 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_81564AC lsls r0, 24 lsrs r0, 24 - ldr r1, _08157D5C + ldr r1, =0x02039f34 ldr r1, [r1] ldr r3, [r1, 0xC] ldr r2, [r1, 0x4] @@ -704684,22 +681233,21 @@ sub_8157D24: @ 8157D24 pop {r0} bx r0 .align 2, 0 -_08157D58: .4byte 0x0203ab38 -_08157D5C: .4byte 0x02039f34 + .pool thumb_func_end sub_8157D24 thumb_func_start sub_8157D60 sub_8157D60: @ 8157D60 push {lr} bl sub_8157D24 - ldr r0, _08157D90 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 beq _08157D98 - ldr r3, _08157D94 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -704714,10 +681262,9 @@ sub_8157D60: @ 8157D60 str r1, [r3] b _08157DA0 .align 2, 0 -_08157D90: .4byte 0x02039f34 -_08157D94: .4byte 0x0203ab38 + .pool _08157D98: - ldr r1, _08157DA4 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -704725,21 +681272,21 @@ _08157DA0: pop {r0} bx r0 .align 2, 0 -_08157DA4: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157D60 thumb_func_start sub_8157DA8 sub_8157DA8: @ 8157DA8 push {lr} bl sub_8157D24 - ldr r0, _08157DD8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 bne _08157DE0 - ldr r3, _08157DDC + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -704754,10 +681301,9 @@ sub_8157DA8: @ 8157DA8 str r1, [r3] b _08157DE8 .align 2, 0 -_08157DD8: .4byte 0x02039f34 -_08157DDC: .4byte 0x0203ab38 + .pool _08157DE0: - ldr r1, _08157DEC + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -704765,19 +681311,19 @@ _08157DE8: pop {r0} bx r0 .align 2, 0 -_08157DEC: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157DA8 thumb_func_start sub_8157DF0 sub_8157DF0: @ 8157DF0 push {r4,r5,lr} - ldr r4, _08157E34 + ldr r4, =0x0203ab38 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_81564AC lsls r0, 24 lsrs r0, 24 - ldr r1, _08157E38 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r5, [r1, 0xC] ldr r3, [r1, 0x4] @@ -704803,22 +681349,21 @@ sub_8157DF0: @ 8157DF0 pop {r0} bx r0 .align 2, 0 -_08157E34: .4byte 0x0203ab38 -_08157E38: .4byte 0x02039f34 + .pool thumb_func_end sub_8157DF0 thumb_func_start sub_8157E3C sub_8157E3C: @ 8157E3C push {lr} bl sub_8157DF0 - ldr r0, _08157E6C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 bge _08157E74 - ldr r3, _08157E70 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -704833,10 +681378,9 @@ sub_8157E3C: @ 8157E3C str r1, [r3] b _08157E7C .align 2, 0 -_08157E6C: .4byte 0x02039f34 -_08157E70: .4byte 0x0203ab38 + .pool _08157E74: - ldr r1, _08157E80 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -704844,21 +681388,21 @@ _08157E7C: pop {r0} bx r0 .align 2, 0 -_08157E80: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157E3C thumb_func_start sub_8157E84 sub_8157E84: @ 8157E84 push {lr} bl sub_8157DF0 - ldr r0, _08157EB4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 ble _08157EBC - ldr r3, _08157EB8 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -704873,10 +681417,9 @@ sub_8157E84: @ 8157E84 str r1, [r3] b _08157EC4 .align 2, 0 -_08157EB4: .4byte 0x02039f34 -_08157EB8: .4byte 0x0203ab38 + .pool _08157EBC: - ldr r1, _08157EC8 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -704884,21 +681427,21 @@ _08157EC4: pop {r0} bx r0 .align 2, 0 -_08157EC8: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157E84 thumb_func_start sub_8157ECC sub_8157ECC: @ 8157ECC push {lr} bl sub_8157DF0 - ldr r0, _08157EFC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 bne _08157F04 - ldr r3, _08157F00 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -704913,10 +681456,9 @@ sub_8157ECC: @ 8157ECC str r1, [r3] b _08157F0C .align 2, 0 -_08157EFC: .4byte 0x02039f34 -_08157F00: .4byte 0x0203ab38 + .pool _08157F04: - ldr r1, _08157F10 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -704924,21 +681466,21 @@ _08157F0C: pop {r0} bx r0 .align 2, 0 -_08157F10: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157ECC thumb_func_start sub_8157F14 sub_8157F14: @ 8157F14 push {lr} bl sub_8157DF0 - ldr r0, _08157F44 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 beq _08157F4C - ldr r3, _08157F48 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -704953,10 +681495,9 @@ sub_8157F14: @ 8157F14 str r1, [r3] b _08157F54 .align 2, 0 -_08157F44: .4byte 0x02039f34 -_08157F48: .4byte 0x0203ab38 + .pool _08157F4C: - ldr r1, _08157F58 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -704964,21 +681505,21 @@ _08157F54: pop {r0} bx r0 .align 2, 0 -_08157F58: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157F14 thumb_func_start sub_8157F5C sub_8157F5C: @ 8157F5C push {r4,lr} - ldr r4, _08157F94 + ldr r4, =0x0203ab38 ldr r0, [r4] ldrb r0, [r0, 0x1] bl sub_81564AC lsls r0, 24 - ldr r1, _08157F98 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r3, [r1, 0xC] - ldr r2, _08157F9C + ldr r2, =0x02039f00 lsrs r0, 23 adds r0, r2 adds r1, r3, 0 @@ -704997,23 +681538,21 @@ sub_8157F5C: @ 8157F5C pop {r0} bx r0 .align 2, 0 -_08157F94: .4byte 0x0203ab38 -_08157F98: .4byte 0x02039f34 -_08157F9C: .4byte 0x02039f00 + .pool thumb_func_end sub_8157F5C thumb_func_start sub_8157FA0 sub_8157FA0: @ 8157FA0 push {lr} bl sub_8157F5C - ldr r0, _08157FD0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 bge _08157FD8 - ldr r3, _08157FD4 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -705028,10 +681567,9 @@ sub_8157FA0: @ 8157FA0 str r1, [r3] b _08157FE0 .align 2, 0 -_08157FD0: .4byte 0x02039f34 -_08157FD4: .4byte 0x0203ab38 + .pool _08157FD8: - ldr r1, _08157FE4 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -705039,21 +681577,21 @@ _08157FE0: pop {r0} bx r0 .align 2, 0 -_08157FE4: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157FA0 thumb_func_start sub_8157FE8 sub_8157FE8: @ 8157FE8 push {lr} bl sub_8157F5C - ldr r0, _08158018 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 ble _08158020 - ldr r3, _0815801C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -705068,10 +681606,9 @@ sub_8157FE8: @ 8157FE8 str r1, [r3] b _08158028 .align 2, 0 -_08158018: .4byte 0x02039f34 -_0815801C: .4byte 0x0203ab38 + .pool _08158020: - ldr r1, _0815802C + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -705079,21 +681616,21 @@ _08158028: pop {r0} bx r0 .align 2, 0 -_0815802C: .4byte 0x0203ab38 + .pool thumb_func_end sub_8157FE8 thumb_func_start sub_8158030 sub_8158030: @ 8158030 push {lr} bl sub_8157F5C - ldr r0, _08158060 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 bne _08158068 - ldr r3, _08158064 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -705108,10 +681645,9 @@ sub_8158030: @ 8158030 str r1, [r3] b _08158070 .align 2, 0 -_08158060: .4byte 0x02039f34 -_08158064: .4byte 0x0203ab38 + .pool _08158068: - ldr r1, _08158074 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -705119,21 +681655,21 @@ _08158070: pop {r0} bx r0 .align 2, 0 -_08158074: .4byte 0x0203ab38 + .pool thumb_func_end sub_8158030 thumb_func_start sub_8158078 sub_8158078: @ 8158078 push {lr} bl sub_8157F5C - ldr r0, _081580A8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 beq _081580B0 - ldr r3, _081580AC + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -705148,10 +681684,9 @@ sub_8158078: @ 8158078 str r1, [r3] b _081580B8 .align 2, 0 -_081580A8: .4byte 0x02039f34 -_081580AC: .4byte 0x0203ab38 + .pool _081580B0: - ldr r1, _081580BC + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -705159,20 +681694,20 @@ _081580B8: pop {r0} bx r0 .align 2, 0 -_081580BC: .4byte 0x0203ab38 + .pool thumb_func_end sub_8158078 thumb_func_start sub_81580C0 sub_81580C0: @ 81580C0 push {r4,r5,lr} - ldr r5, _081580FC + ldr r5, =0x0203ab38 ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_81564AC lsls r0, 24 ldr r3, [r5] ldrb r2, [r3, 0x2] - ldr r1, _08158100 + ldr r1, =0x02039f34 ldr r4, [r1] ldr r1, [r4] lsrs r0, 23 @@ -705182,7 +681717,7 @@ sub_81580C0: @ 81580C0 adds r1, r0 ldrh r0, [r1] ldr r2, [r4, 0xC] - ldr r1, _08158104 + ldr r1, =0x0858c2b4 lsls r0, 3 adds r0, r1 ldrb r0, [r0] @@ -705193,21 +681728,19 @@ sub_81580C0: @ 81580C0 pop {r0} bx r0 .align 2, 0 -_081580FC: .4byte 0x0203ab38 -_08158100: .4byte 0x02039f34 -_08158104: .4byte 0x0858c2b4 + .pool thumb_func_end sub_81580C0 thumb_func_start sub_8158108 sub_8158108: @ 8158108 push {lr} bl sub_81580C0 - ldr r0, _0815813C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08158140 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -705225,8 +681758,7 @@ sub_8158108: @ 8158108 str r1, [r3] b _08158148 .align 2, 0 -_0815813C: .4byte 0x02039f34 -_08158140: .4byte 0x0203ab38 + .pool _08158144: adds r0, r2, 0x5 str r0, [r3] @@ -705239,12 +681771,12 @@ _08158148: sub_815814C: @ 815814C push {lr} bl sub_81580C0 - ldr r0, _08158180 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08158184 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -705262,8 +681794,7 @@ sub_815814C: @ 815814C str r1, [r3] b _0815818C .align 2, 0 -_08158180: .4byte 0x02039f34 -_08158184: .4byte 0x0203ab38 + .pool _08158188: adds r0, r2, 0x5 str r0, [r3] @@ -705276,12 +681807,12 @@ _0815818C: sub_8158190: @ 8158190 push {lr} bl sub_81580C0 - ldr r0, _081581C4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081581C8 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -705299,8 +681830,7 @@ sub_8158190: @ 8158190 str r1, [r3] b _081581D0 .align 2, 0 -_081581C4: .4byte 0x02039f34 -_081581C8: .4byte 0x0203ab38 + .pool _081581CC: adds r0, r2, 0x5 str r0, [r3] @@ -705313,12 +681843,12 @@ _081581D0: sub_81581D4: @ 81581D4 push {lr} bl sub_81580C0 - ldr r0, _08158208 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _0815820C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -705336,8 +681866,7 @@ sub_81581D4: @ 81581D4 str r1, [r3] b _08158214 .align 2, 0 -_08158208: .4byte 0x02039f34 -_0815820C: .4byte 0x0203ab38 + .pool _08158210: adds r0, r2, 0x5 str r0, [r3] @@ -705349,7 +681878,7 @@ _08158214: thumb_func_start sub_8158218 sub_8158218: @ 8158218 push {r4,r5,lr} - ldr r5, _0815824C + ldr r5, =0x0203ab38 ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_81564AC @@ -705357,7 +681886,7 @@ sub_8158218: @ 8158218 lsrs r0, 24 ldr r3, [r5] ldrb r2, [r3, 0x2] - ldr r1, _08158250 + ldr r1, =0x02039f34 ldr r4, [r1] ldr r1, [r4] lsls r2, 2 @@ -705374,20 +681903,19 @@ sub_8158218: @ 8158218 pop {r0} bx r0 .align 2, 0 -_0815824C: .4byte 0x0203ab38 -_08158250: .4byte 0x02039f34 + .pool thumb_func_end sub_8158218 thumb_func_start sub_8158254 sub_8158254: @ 8158254 push {lr} bl sub_8158218 - ldr r0, _08158288 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _0815828C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -705405,8 +681933,7 @@ sub_8158254: @ 8158254 str r1, [r3] b _08158294 .align 2, 0 -_08158288: .4byte 0x02039f34 -_0815828C: .4byte 0x0203ab38 + .pool _08158290: adds r0, r2, 0x5 str r0, [r3] @@ -705419,12 +681946,12 @@ _08158294: sub_8158298: @ 8158298 push {lr} bl sub_8158218 - ldr r0, _081582CC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081582D0 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -705442,8 +681969,7 @@ sub_8158298: @ 8158298 str r1, [r3] b _081582D8 .align 2, 0 -_081582CC: .4byte 0x02039f34 -_081582D0: .4byte 0x0203ab38 + .pool _081582D4: adds r0, r2, 0x5 str r0, [r3] @@ -705456,12 +681982,12 @@ _081582D8: sub_81582DC: @ 81582DC push {lr} bl sub_8158218 - ldr r0, _08158310 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08158314 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -705479,8 +682005,7 @@ sub_81582DC: @ 81582DC str r1, [r3] b _0815831C .align 2, 0 -_08158310: .4byte 0x02039f34 -_08158314: .4byte 0x0203ab38 + .pool _08158318: adds r0, r2, 0x5 str r0, [r3] @@ -705493,12 +682018,12 @@ _0815831C: sub_8158320: @ 8158320 push {lr} bl sub_8158218 - ldr r0, _08158354 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08158358 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -705516,8 +682041,7 @@ sub_8158320: @ 8158320 str r1, [r3] b _08158360 .align 2, 0 -_08158354: .4byte 0x02039f34 -_08158358: .4byte 0x0203ab38 + .pool _0815835C: adds r0, r2, 0x5 str r0, [r3] @@ -705529,14 +682053,14 @@ _08158360: thumb_func_start sub_8158364 sub_8158364: @ 8158364 push {r4,r5,lr} - ldr r5, _081583A8 + ldr r5, =0x0203ab38 ldr r0, [r5] ldrb r0, [r0, 0x1] bl sub_81564AC lsls r0, 24 ldr r3, [r5] ldrb r2, [r3, 0x2] - ldr r1, _081583AC + ldr r1, =0x02039f34 ldr r4, [r1] ldr r1, [r4] lsrs r0, 23 @@ -705546,8 +682070,8 @@ sub_8158364: @ 8158364 adds r1, r0 ldrh r0, [r1] ldr r4, [r4, 0xC] - ldr r2, _081583B0 - ldr r1, _081583B4 + ldr r2, =0x0858cdcc + ldr r1, =0x0858c2b4 lsls r0, 3 adds r0, r1 ldrb r0, [r0] @@ -705561,22 +682085,19 @@ sub_8158364: @ 8158364 pop {r0} bx r0 .align 2, 0 -_081583A8: .4byte 0x0203ab38 -_081583AC: .4byte 0x02039f34 -_081583B0: .4byte 0x0858cdcc -_081583B4: .4byte 0x0858c2b4 + .pool thumb_func_end sub_8158364 thumb_func_start sub_81583B8 sub_81583B8: @ 81583B8 push {lr} bl sub_8158364 - ldr r0, _081583EC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _081583F0 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -705594,8 +682115,7 @@ sub_81583B8: @ 81583B8 str r1, [r3] b _081583F8 .align 2, 0 -_081583EC: .4byte 0x02039f34 -_081583F0: .4byte 0x0203ab38 + .pool _081583F4: adds r0, r2, 0x5 str r0, [r3] @@ -705608,12 +682128,12 @@ _081583F8: sub_81583FC: @ 81583FC push {lr} bl sub_8158364 - ldr r0, _08158430 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] - ldr r3, _08158434 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] cmp r0, r1 @@ -705631,8 +682151,7 @@ sub_81583FC: @ 81583FC str r1, [r3] b _0815843C .align 2, 0 -_08158430: .4byte 0x02039f34 -_08158434: .4byte 0x0203ab38 + .pool _08158438: adds r0, r2, 0x5 str r0, [r3] @@ -705644,10 +682163,10 @@ _0815843C: thumb_func_start sub_8158440 sub_8158440: @ 8158440 push {r4,lr} - ldr r0, _08158464 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r3, [r0, 0xC] - ldr r4, _08158468 + ldr r4, =0x0203ab38 ldr r2, [r4] ldrb r0, [r2, 0x1] lsls r0, 1 @@ -705662,17 +682181,16 @@ sub_8158440: @ 8158440 pop {r0} bx r0 .align 2, 0 -_08158464: .4byte 0x02039f34 -_08158468: .4byte 0x0203ab38 + .pool thumb_func_end sub_8158440 thumb_func_start sub_815846C sub_815846C: @ 815846C push {r4,lr} - ldr r0, _08158494 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r3, [r0, 0xC] - ldr r4, _08158498 + ldr r4, =0x0203ab38 ldr r2, [r4] ldrb r0, [r2, 0x1] lsls r0, 1 @@ -705689,17 +682207,16 @@ sub_815846C: @ 815846C pop {r0} bx r0 .align 2, 0 -_08158494: .4byte 0x02039f34 -_08158498: .4byte 0x0203ab38 + .pool thumb_func_end sub_815846C thumb_func_start sub_815849C sub_815849C: @ 815849C push {r4,lr} - ldr r0, _081584CC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _081584D0 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r0, [r3, 0x1] lsls r0, 1 @@ -705719,17 +682236,16 @@ sub_815849C: @ 815849C pop {r0} bx r0 .align 2, 0 -_081584CC: .4byte 0x02039f34 -_081584D0: .4byte 0x0203ab38 + .pool thumb_func_end sub_815849C thumb_func_start sub_81584D4 sub_81584D4: @ 81584D4 push {r4,lr} - ldr r0, _08158500 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08158504 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3, 0x1] lsls r1, 1 @@ -705748,17 +682264,16 @@ sub_81584D4: @ 81584D4 pop {r0} bx r0 .align 2, 0 -_08158500: .4byte 0x02039f34 -_08158504: .4byte 0x0203ab38 + .pool thumb_func_end sub_81584D4 thumb_func_start sub_8158508 sub_8158508: @ 8158508 push {r4,lr} - ldr r0, _08158534 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08158538 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3, 0x1] lsls r1, 1 @@ -705777,17 +682292,16 @@ sub_8158508: @ 8158508 pop {r0} bx r0 .align 2, 0 -_08158534: .4byte 0x02039f34 -_08158538: .4byte 0x0203ab38 + .pool thumb_func_end sub_8158508 thumb_func_start sub_815853C sub_815853C: @ 815853C push {r4,lr} - ldr r0, _08158578 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] - ldr r4, _0815857C + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r0, [r3, 0x1] lsls r0, 1 @@ -705814,8 +682328,7 @@ sub_815853C: @ 815853C str r1, [r4] b _08158586 .align 2, 0 -_08158578: .4byte 0x02039f34 -_0815857C: .4byte 0x0203ab38 + .pool _08158580: adds r0, r3, 0 adds r0, 0x8 @@ -705829,10 +682342,10 @@ _08158586: thumb_func_start sub_815858C sub_815858C: @ 815858C push {r4,lr} - ldr r0, _081585C8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] - ldr r4, _081585CC + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r0, [r3, 0x1] lsls r0, 1 @@ -705859,8 +682372,7 @@ sub_815858C: @ 815858C str r1, [r4] b _081585D6 .align 2, 0 -_081585C8: .4byte 0x02039f34 -_081585CC: .4byte 0x0203ab38 + .pool _081585D0: adds r0, r3, 0 adds r0, 0x8 @@ -705874,10 +682386,10 @@ _081585D6: thumb_func_start sub_81585DC sub_81585DC: @ 81585DC push {r4,lr} - ldr r0, _08158618 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] - ldr r4, _0815861C + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r0, [r3, 0x1] lsls r0, 1 @@ -705904,8 +682416,7 @@ sub_81585DC: @ 81585DC str r1, [r4] b _08158626 .align 2, 0 -_08158618: .4byte 0x02039f34 -_0815861C: .4byte 0x0203ab38 + .pool _08158620: adds r0, r3, 0 adds r0, 0x8 @@ -705919,10 +682430,10 @@ _08158626: thumb_func_start sub_815862C sub_815862C: @ 815862C push {r4,lr} - ldr r0, _08158668 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] - ldr r4, _0815866C + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r0, [r3, 0x1] lsls r0, 1 @@ -705949,8 +682460,7 @@ sub_815862C: @ 815862C str r1, [r4] b _08158676 .align 2, 0 -_08158668: .4byte 0x02039f34 -_0815866C: .4byte 0x0203ab38 + .pool _08158670: adds r0, r3, 0 adds r0, 0x8 @@ -705964,10 +682474,10 @@ _08158676: thumb_func_start sub_815867C sub_815867C: @ 815867C push {r4,r5,lr} - ldr r0, _081586BC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _081586C0 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3, 0x1] lsls r1, 1 @@ -705995,8 +682505,7 @@ sub_815867C: @ 815867C str r1, [r4] b _081586C8 .align 2, 0 -_081586BC: .4byte 0x02039f34 -_081586C0: .4byte 0x0203ab38 + .pool _081586C4: adds r0, r3, 0x7 str r0, [r4] @@ -706009,10 +682518,10 @@ _081586C8: thumb_func_start sub_81586D0 sub_81586D0: @ 81586D0 push {r4,r5,lr} - ldr r0, _08158710 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08158714 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3, 0x1] lsls r1, 1 @@ -706040,8 +682549,7 @@ sub_81586D0: @ 81586D0 str r1, [r4] b _0815871C .align 2, 0 -_08158710: .4byte 0x02039f34 -_08158714: .4byte 0x0203ab38 + .pool _08158718: adds r0, r3, 0x7 str r0, [r4] @@ -706054,10 +682562,10 @@ _0815871C: thumb_func_start sub_8158724 sub_8158724: @ 8158724 push {r4,r5,lr} - ldr r0, _08158764 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _08158768 + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3, 0x1] lsls r1, 1 @@ -706085,8 +682593,7 @@ sub_8158724: @ 8158724 str r1, [r4] b _08158770 .align 2, 0 -_08158764: .4byte 0x02039f34 -_08158768: .4byte 0x0203ab38 + .pool _0815876C: adds r0, r3, 0x7 str r0, [r4] @@ -706099,10 +682606,10 @@ _08158770: thumb_func_start sub_8158778 sub_8158778: @ 8158778 push {r4,r5,lr} - ldr r0, _081587B8 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r4, _081587BC + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r1, [r3, 0x1] lsls r1, 1 @@ -706130,8 +682637,7 @@ sub_8158778: @ 8158778 str r1, [r4] b _081587C4 .align 2, 0 -_081587B8: .4byte 0x02039f34 -_081587BC: .4byte 0x0203ab38 + .pool _081587C0: adds r0, r3, 0x7 str r0, [r4] @@ -706147,10 +682653,10 @@ sub_81587CC: @ 81587CC bl GenerateRandomNumber movs r2, 0xFF ands r2, r0 - ldr r0, _08158808 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] - ldr r4, _0815880C + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r0, [r3, 0x1] lsls r0, 1 @@ -706173,8 +682679,7 @@ sub_81587CC: @ 81587CC str r1, [r4] b _08158814 .align 2, 0 -_08158808: .4byte 0x02039f34 -_0815880C: .4byte 0x0203ab38 + .pool _08158810: adds r0, r3, 0x6 str r0, [r4] @@ -706190,10 +682695,10 @@ sub_815881C: @ 815881C bl GenerateRandomNumber movs r2, 0xFF ands r2, r0 - ldr r0, _08158858 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r1, [r0, 0xC] - ldr r4, _0815885C + ldr r4, =0x0203ab38 ldr r3, [r4] ldrb r0, [r3, 0x1] lsls r0, 1 @@ -706216,8 +682721,7 @@ sub_815881C: @ 815881C str r1, [r4] b _08158864 .align 2, 0 -_08158858: .4byte 0x02039f34 -_0815885C: .4byte 0x0203ab38 + .pool _08158860: adds r0, r3, 0x6 str r0, [r4] @@ -706229,7 +682733,7 @@ _08158864: thumb_func_start sub_815886C sub_815886C: @ 815886C - ldr r3, _08158888 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -706244,13 +682748,13 @@ sub_815886C: @ 815886C str r1, [r3] bx lr .align 2, 0 -_08158888: .4byte 0x0203ab38 + .pool thumb_func_end sub_815886C thumb_func_start dp15_call dp15_call: @ 815888C push {r4,lr} - ldr r4, _081588B8 + ldr r4, =0x0203ab38 ldr r0, [r4] adds r0, 0x5 bl sub_81588E0 @@ -706270,7 +682774,7 @@ dp15_call: @ 815888C pop {r0} bx r0 .align 2, 0 -_081588B8: .4byte 0x0203ab38 + .pool thumb_func_end dp15_call thumb_func_start sub_81588BC @@ -706280,7 +682784,7 @@ sub_81588BC: @ 81588BC lsls r0, 24 cmp r0, 0 bne _081588D6 - ldr r0, _081588DC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] ldrb r1, [r2, 0x9] @@ -706291,13 +682795,13 @@ _081588D6: pop {r0} bx r0 .align 2, 0 -_081588DC: .4byte 0x02039f34 + .pool thumb_func_end sub_81588BC thumb_func_start sub_81588E0 sub_81588E0: @ 81588E0 push {r4,lr} - ldr r1, _08158904 + ldr r1, =0x02039f34 ldr r1, [r1] ldr r3, [r1, 0xC] adds r4, r3, 0 @@ -706314,13 +682818,13 @@ sub_81588E0: @ 81588E0 pop {r0} bx r0 .align 2, 0 -_08158904: .4byte 0x02039f34 + .pool thumb_func_end sub_81588E0 thumb_func_start sub_8158908 sub_8158908: @ 8158908 push {lr} - ldr r3, _08158920 + ldr r3, =0x02039f34 ldr r0, [r3] ldr r0, [r0, 0xC] adds r1, r0, 0 @@ -706331,11 +682835,11 @@ sub_8158908: @ 8158908 movs r0, 0 b _08158940 .align 2, 0 -_08158920: .4byte 0x02039f34 + .pool _08158924: subs r0, 0x1 strb r0, [r1] - ldr r2, _08158944 + ldr r2, =0x0203ab38 ldr r0, [r3] ldr r1, [r0, 0xC] adds r0, r1, 0 @@ -706351,7 +682855,7 @@ _08158940: pop {r1} bx r1 .align 2, 0 -_08158944: .4byte 0x0203ab38 + .pool thumb_func_end sub_8158908 thumb_func_start sub_8158948 @@ -706359,10 +682863,10 @@ sub_8158948: @ 8158948 push {r4-r6,lr} movs r5, 0 movs r4, 0 - ldr r6, _08158978 + ldr r6, =0x02039e1e _08158950: lsls r1, r4, 1 - ldr r0, _0815897C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] adds r0, 0x41 @@ -706381,18 +682885,17 @@ _08158950: movs r5, 0x1 b _08158986 .align 2, 0 -_08158978: .4byte 0x02039e1e -_0815897C: .4byte 0x02039f34 + .pool _08158980: adds r4, 0x1 cmp r4, 0x3 ble _08158950 _08158986: - ldr r0, _0815899C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] strh r5, [r0, 0x18] - ldr r1, _081589A0 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x1 str r0, [r1] @@ -706400,22 +682903,21 @@ _08158986: pop {r0} bx r0 .align 2, 0 -_0815899C: .4byte 0x02039f34 -_081589A0: .4byte 0x0203ab38 + .pool thumb_func_end sub_8158948 thumb_func_start sub_81589A4 sub_81589A4: @ 81589A4 push {lr} bl sub_8158948 - ldr r0, _081589D4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 beq _081589DC - ldr r3, _081589D8 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -706430,10 +682932,9 @@ sub_81589A4: @ 81589A4 str r1, [r3] b _081589E4 .align 2, 0 -_081589D4: .4byte 0x02039f34 -_081589D8: .4byte 0x0203ab38 + .pool _081589DC: - ldr r1, _081589E8 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -706441,21 +682942,21 @@ _081589E4: pop {r0} bx r0 .align 2, 0 -_081589E8: .4byte 0x0203ab38 + .pool thumb_func_end sub_81589A4 thumb_func_start sub_81589EC sub_81589EC: @ 81589EC push {lr} bl sub_8158948 - ldr r0, _08158A1C + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 bne _08158A24 - ldr r3, _08158A20 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -706470,10 +682971,9 @@ sub_81589EC: @ 81589EC str r1, [r3] b _08158A2C .align 2, 0 -_08158A1C: .4byte 0x02039f34 -_08158A20: .4byte 0x0203ab38 + .pool _08158A24: - ldr r1, _08158A30 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -706481,23 +682981,23 @@ _08158A2C: pop {r0} bx r0 .align 2, 0 -_08158A30: .4byte 0x0203ab38 + .pool thumb_func_end sub_81589EC thumb_func_start sub_8158A34 sub_8158A34: @ 8158A34 push {r4-r6,lr} movs r6, 0 - ldr r3, _08158A60 + ldr r3, =0x0203ab38 ldr r0, [r3] ldrb r5, [r0, 0x1] ldrb r0, [r0, 0x2] lsls r0, 8 orrs r5, r0 movs r4, 0 - ldr r0, _08158A64 + ldr r0, =0x02039e00 mov r12, r0 - ldr r2, _08158A68 + ldr r2, =0x02039f34 ldr r0, [r2] ldr r0, [r0, 0xC] adds r0, 0x41 @@ -706509,9 +683009,7 @@ sub_8158A34: @ 8158A34 ldrh r0, [r0] b _08158A88 .align 2, 0 -_08158A60: .4byte 0x0203ab38 -_08158A64: .4byte 0x02039e00 -_08158A68: .4byte 0x02039f34 + .pool _08158A6C: adds r4, 0x1 cmp r4, 0x3 @@ -706547,14 +683045,14 @@ _08158A8E: sub_8158AA0: @ 8158AA0 push {lr} bl sub_8158A34 - ldr r0, _08158AD0 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 beq _08158AD8 - ldr r3, _08158AD4 + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -706569,10 +683067,9 @@ sub_8158AA0: @ 8158AA0 str r1, [r3] b _08158AE0 .align 2, 0 -_08158AD0: .4byte 0x02039f34 -_08158AD4: .4byte 0x0203ab38 + .pool _08158AD8: - ldr r1, _08158AE4 + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -706580,21 +683077,21 @@ _08158AE0: pop {r0} bx r0 .align 2, 0 -_08158AE4: .4byte 0x0203ab38 + .pool thumb_func_end sub_8158AA0 thumb_func_start sub_8158AE8 sub_8158AE8: @ 8158AE8 push {lr} bl sub_8158A34 - ldr r0, _08158B18 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0xC] movs r1, 0x18 ldrsh r0, [r0, r1] cmp r0, 0 bne _08158B20 - ldr r3, _08158B1C + ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2] ldrb r0, [r2, 0x1] @@ -706609,10 +683106,9 @@ sub_8158AE8: @ 8158AE8 str r1, [r3] b _08158B28 .align 2, 0 -_08158B18: .4byte 0x02039f34 -_08158B1C: .4byte 0x0203ab38 + .pool _08158B20: - ldr r1, _08158B2C + ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] @@ -706620,7 +683116,7 @@ _08158B28: pop {r0} bx r0 .align 2, 0 -_08158B2C: .4byte 0x0203ab38 + .pool thumb_func_end sub_8158AE8 thumb_func_start sub_8158B30 @@ -706628,12 +683124,12 @@ sub_8158B30: @ 8158B30 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _08158B8C + ldr r1, =0x03005e00 lsls r6, r0, 2 adds r6, r0 lsls r6, 3 adds r6, r1 - ldr r1, _08158B90 + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r6, 0x8] ldrh r0, [r1, 0x2] @@ -706662,15 +683158,13 @@ sub_8158B30: @ 8158B30 strh r0, [r6, 0x10] movs r0, 0xA strh r0, [r6, 0x1C] - ldr r0, _08158B94 + ldr r0, =sub_8158B98 + 1 str r0, [r6] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08158B8C: .4byte 0x03005e00 -_08158B90: .4byte 0x0203841e -_08158B94: .4byte sub_8158B98 + 1 + .pool thumb_func_end sub_8158B30 thumb_func_start sub_8158B98 @@ -706678,7 +683172,7 @@ sub_8158B98: @ 8158B98 push {r4-r6,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08158BC8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -706696,12 +683190,11 @@ sub_8158B98: @ 8158B98 movs r0, 0x5 strh r0, [r4, 0x1C] strh r1, [r4, 0x1E] - ldr r0, _08158BCC + ldr r0, =sub_8158C04 + 1 str r0, [r4] b _08158BFE .align 2, 0 -_08158BC8: .4byte 0x03005e00 -_08158BCC: .4byte sub_8158C04 + 1 + .pool _08158BD0: ldrh r0, [r4, 0x1C] adds r0, 0x1 @@ -706736,7 +683229,7 @@ sub_8158C04: @ 8158C04 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08158C54 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -706771,7 +683264,7 @@ _08158C4C: pop {r0} bx r0 .align 2, 0 -_08158C54: .4byte 0x03005e00 + .pool thumb_func_end sub_8158C04 thumb_func_start mas_80DCF38 @@ -706786,7 +683279,7 @@ mas_80DCF38: @ 8158C58 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _08158CFC + ldr r0, =0x0203841e ldrh r1, [r0] str r1, [sp] ldrb r5, [r0, 0x4] @@ -706818,7 +683311,7 @@ mas_80DCF38: @ 8158C58 adds r1, r5, 0 adds r2, r6, 0 bl sub_80A5314 - ldr r2, _08158D00 + ldr r2, =0x03005e00 mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -706841,7 +683334,7 @@ mas_80DCF38: @ 8158C58 strh r2, [r1, 0x1C] strh r4, [r1, 0x1E] strh r3, [r1, 0x20] - ldr r2, _08158D04 + ldr r2, =sub_8158D08 + 1 str r2, [r1] mov r0, r8 bl _call_via_r2 @@ -706854,9 +683347,7 @@ mas_80DCF38: @ 8158C58 pop {r0} bx r0 .align 2, 0 -_08158CFC: .4byte 0x0203841e -_08158D00: .4byte 0x03005e00 -_08158D04: .4byte sub_8158D08 + 1 + .pool thumb_func_end mas_80DCF38 thumb_func_start sub_8158D08 @@ -706864,7 +683355,7 @@ sub_8158D08: @ 8158D08 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08158D4C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -706894,9 +683385,9 @@ sub_8158D08: @ 8158D08 bl move_anim_related_task_del b _08158D82 .align 2, 0 -_08158D4C: .4byte 0x03005e00 + .pool _08158D50: - ldr r1, _08158D88 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -706925,7 +683416,7 @@ _08158D82: pop {r0} bx r0 .align 2, 0 -_08158D88: .4byte 0x03005e00 + .pool thumb_func_end sub_8158D08 thumb_func_start sub_8158D8C @@ -706943,53 +683434,51 @@ sub_8158D8C: @ 8158D8C lsls r0, 24 cmp r0, 0 beq _08158DD0 - ldr r0, _08158DC0 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _08158DC8 - ldr r0, _08158DC4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r4, [r0] b _08158E76 .align 2, 0 -_08158DC0: .4byte 0x0203841e -_08158DC4: .4byte 0x02039f34 + .pool _08158DC8: adds r0, r5, 0 bl move_anim_task_del b _08158E76 _08158DD0: - ldr r0, _08158DE4 + ldr r0, =0x0203841e movs r2, 0 ldrsh r1, [r0, r2] adds r2, r0, 0 cmp r1, 0 bne _08158DEC - ldr r0, _08158DE8 + ldr r0, =0x02038436 ldrb r4, [r0] b _08158E12 .align 2, 0 -_08158DE4: .4byte 0x0203841e -_08158DE8: .4byte 0x02038436 + .pool _08158DEC: cmp r1, 0x1 bne _08158DFC - ldr r0, _08158DF8 + ldr r0, =0x02038437 ldrb r4, [r0] b _08158E12 .align 2, 0 -_08158DF8: .4byte 0x02038437 + .pool _08158DFC: cmp r1, 0x2 bne _08158E08 - ldr r0, _08158E04 + ldr r0, =0x02038436 b _08158E0A .align 2, 0 -_08158E04: .4byte 0x02038436 + .pool _08158E08: - ldr r0, _08158E34 + ldr r0, =0x02038437 _08158E0A: ldrb r1, [r0] movs r0, 0x2 @@ -707012,32 +683501,31 @@ _08158E1E: bl move_anim_task_del b _08158E8C .align 2, 0 -_08158E34: .4byte 0x02038437 + .pool _08158E38: adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08158E5C - ldr r1, _08158E54 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08158E58 + ldr r1, =0x02024744 b _08158E6A .align 2, 0 -_08158E54: .4byte 0x0202406e -_08158E58: .4byte 0x02024744 + .pool _08158E5C: - ldr r1, _08158E94 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08158E98 + ldr r1, =0x020244ec _08158E6A: adds r0, r1 movs r1, 0xB @@ -707060,8 +683548,7 @@ _08158E8C: pop {r0} bx r0 .align 2, 0 -_08158E94: .4byte 0x0202406e -_08158E98: .4byte 0x020244ec + .pool thumb_func_end sub_8158D8C thumb_func_start sub_8158E9C @@ -707079,53 +683566,51 @@ sub_8158E9C: @ 8158E9C lsls r0, 24 cmp r0, 0 beq _08158EE0 - ldr r0, _08158ED0 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _08158ED8 - ldr r0, _08158ED4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r4, [r0] b _08158F86 .align 2, 0 -_08158ED0: .4byte 0x0203841e -_08158ED4: .4byte 0x02039f34 + .pool _08158ED8: adds r0, r6, 0 bl move_anim_task_del b _08158F86 _08158EE0: - ldr r0, _08158EF4 + ldr r0, =0x0203841e movs r2, 0 ldrsh r1, [r0, r2] adds r2, r0, 0 cmp r1, 0 bne _08158EFC - ldr r0, _08158EF8 + ldr r0, =0x02038436 ldrb r4, [r0] b _08158F22 .align 2, 0 -_08158EF4: .4byte 0x0203841e -_08158EF8: .4byte 0x02038436 + .pool _08158EFC: cmp r1, 0x1 bne _08158F0C - ldr r0, _08158F08 + ldr r0, =0x02038437 ldrb r4, [r0] b _08158F22 .align 2, 0 -_08158F08: .4byte 0x02038437 + .pool _08158F0C: cmp r1, 0x2 bne _08158F18 - ldr r0, _08158F14 + ldr r0, =0x02038436 b _08158F1A .align 2, 0 -_08158F14: .4byte 0x02038436 + .pool _08158F18: - ldr r0, _08158F44 + ldr r0, =0x02038437 _08158F1A: ldrb r1, [r0] movs r0, 0x2 @@ -707148,32 +683633,31 @@ _08158F2E: bl move_anim_task_del b _08158FEE .align 2, 0 -_08158F44: .4byte 0x02038437 + .pool _08158F48: adds r0, r4, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _08158F6C - ldr r1, _08158F64 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08158F68 + ldr r1, =0x02024744 b _08158F7A .align 2, 0 -_08158F64: .4byte 0x0202406e -_08158F68: .4byte 0x02024744 + .pool _08158F6C: - ldr r1, _08158FB8 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08158FBC + ldr r1, =0x020244ec _08158F7A: adds r0, r1 movs r1, 0xB @@ -707181,12 +683665,12 @@ _08158F7A: lsls r0, 16 lsrs r4, r0, 16 _08158F86: - ldr r1, _08158FC0 + ldr r1, =0x03005e00 lsls r2, r6, 2 adds r0, r2, r6 lsls r0, 3 adds r0, r1 - ldr r3, _08158FC4 + ldr r3, =0x0203841e ldrh r1, [r3, 0x2] strh r1, [r0, 0x8] strh r4, [r0, 0xA] @@ -707205,25 +683689,21 @@ _08158F86: bl sub_80A32E4 b _08158FD0 .align 2, 0 -_08158FB8: .4byte 0x0202406e -_08158FBC: .4byte 0x020244ec -_08158FC0: .4byte 0x03005e00 -_08158FC4: .4byte 0x0203841e + .pool _08158FC8: adds r0, r4, 0 movs r2, 0x7 bl sub_80A32E4 _08158FD0: - ldr r0, _08158FE0 + ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 adds r1, r0 - ldr r0, _08158FE4 + ldr r0, =sub_8158FF4 + 1 str r0, [r1] b _08158FEE .align 2, 0 -_08158FE0: .4byte 0x03005e00 -_08158FE4: .4byte sub_8158FF4 + 1 + .pool _08158FE8: adds r0, r6, 0 bl move_anim_task_del @@ -707242,7 +683722,7 @@ sub_8158FF4: @ 8158FF4 lsls r0, 24 lsrs r4, r0, 24 mov r9, r4 - ldr r1, _08159024 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -707260,7 +683740,7 @@ sub_8158FF4: @ 8158FF4 strh r0, [r1, 0x1A] b _0815906A .align 2, 0 -_08159024: .4byte 0x03005e00 + .pool _08159028: movs r2, 0x8 ldrsh r0, [r1, r2] @@ -707305,7 +683785,7 @@ sub_8159078: @ 8159078 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r1, _0815909C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -707319,7 +683799,7 @@ sub_8159078: @ 8159078 strh r0, [r1, 0x1A] b _081590B0 .align 2, 0 -_0815909C: .4byte 0x03005e00 + .pool _081590A0: bl sub_80A36EC lsls r0, 24 @@ -707338,12 +683818,12 @@ sub_81590B8: @ 81590B8 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _081590EC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081590F0 + ldr r1, =0x0203841e ldrh r1, [r1] strh r1, [r0, 0x1C] movs r0, 0x40 @@ -707355,23 +683835,21 @@ sub_81590B8: @ 81590B8 lsls r0, 24 cmp r0, 0 beq _081590F8 - ldr r0, _081590F4 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] b _08159102 .align 2, 0 -_081590EC: .4byte 0x03005e00 -_081590F0: .4byte 0x0203841e -_081590F4: .4byte 0x02039f34 + .pool _081590F8: - ldr r1, _08159120 - ldr r0, _08159124 + ldr r1, =0x02038438 + ldr r0, =0x02038436 ldrb r0, [r0] lsls r0, 1 adds r0, r1 _08159102: ldrh r2, [r0] - ldr r0, _08159128 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -707382,14 +683860,11 @@ _08159102: strh r0, [r1, 0xC] cmp r2, 0 beq _08159130 - ldr r0, _0815912C + ldr r0, =sub_815913C + 1 str r0, [r1] b _08159136 .align 2, 0 -_08159120: .4byte 0x02038438 -_08159124: .4byte 0x02038436 -_08159128: .4byte 0x03005e00 -_0815912C: .4byte sub_815913C + 1 + .pool _08159130: adds r0, r4, 0 bl move_anim_task_del @@ -707406,7 +683881,7 @@ sub_815913C: @ 815913C push {r7} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0815916C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -707421,13 +683896,12 @@ sub_815913C: @ 815913C cmp r2, 0x5 bhi _081591DC lsls r0, r2, 2 - ldr r1, _08159170 + ldr r1, =_08159174 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815916C: .4byte 0x03005e00 -_08159170: .4byte _08159174 + .pool .align 2, 0 _08159174: .4byte _081591C2 @@ -707442,14 +683916,14 @@ _0815918C: mov r0, r8 movs r2, 0x4 bl play_cry_maybe - ldr r1, _081591A4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 b _081591B0 .align 2, 0 -_081591A4: .4byte 0x03005e00 + .pool _081591A8: lsls r0, r4, 2 adds r0, r4 @@ -707467,7 +683941,7 @@ _081591B8: bne _08159204 _081591C2: bl sub_80A369C - ldr r0, _081591D8 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -707477,7 +683951,7 @@ _081591C2: strh r0, [r1, 0x1A] b _08159204 .align 2, 0 -_081591D8: .4byte 0x03005e00 + .pool _081591DC: movs r1, 0x1C ldrsh r0, [r0, r1] @@ -707512,7 +683986,7 @@ sub_8159210: @ 8159210 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08159240 + ldr r0, =0x0203841e ldrh r5, [r0] ldrb r0, [r0, 0x2] lsls r0, 24 @@ -707529,7 +684003,7 @@ sub_8159210: @ 8159210 pop {r0} bx r0 .align 2, 0 -_08159240: .4byte 0x0203841e + .pool thumb_func_end sub_8159210 thumb_func_start sub_8159244 @@ -707538,7 +684012,7 @@ sub_8159244: @ 8159244 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08159274 + ldr r0, =0x0203841e ldrh r5, [r0] ldrb r0, [r0, 0x2] lsls r0, 24 @@ -707555,7 +684029,7 @@ sub_8159244: @ 8159244 pop {r0} bx r0 .align 2, 0 -_08159274: .4byte 0x0203841e + .pool thumb_func_end sub_8159244 thumb_func_start sub_8159278 @@ -707568,7 +684042,7 @@ sub_8159278: @ 8159278 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _081592FC + ldr r0, =0x0203841e ldrb r5, [r0, 0x2] ldrb r6, [r0, 0x4] ldrh r1, [r0, 0x6] @@ -707595,7 +684069,7 @@ sub_8159278: @ 8159278 adds r1, r5, 0 adds r2, r6, 0 bl sub_80A5314 - ldr r2, _08159300 + ldr r2, =0x03005e00 mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -707611,7 +684085,7 @@ sub_8159278: @ 8159278 strh r0, [r1, 0x12] strh r2, [r1, 0x1C] strh r4, [r1, 0x1E] - ldr r2, _08159304 + ldr r2, =sub_8159308 + 1 str r2, [r1] mov r0, r8 bl _call_via_r2 @@ -707622,9 +684096,7 @@ sub_8159278: @ 8159278 pop {r0} bx r0 .align 2, 0 -_081592FC: .4byte 0x0203841e -_08159300: .4byte 0x03005e00 -_08159304: .4byte sub_8159308 + 1 + .pool thumb_func_end sub_8159278 thumb_func_start sub_8159308 @@ -707633,7 +684105,7 @@ sub_8159308: @ 8159308 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _08159360 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -707658,7 +684130,7 @@ sub_8159308: @ 8159308 bl sub_80A52EC strh r0, [r4, 0x1E] _08159342: - ldr r1, _08159364 + ldr r1, =0x02038440 ldrh r0, [r4, 0x1E] strb r0, [r1] movs r3, 0x1E @@ -707674,8 +684146,7 @@ _0815935A: pop {r0} bx r0 .align 2, 0 -_08159360: .4byte 0x03005e00 -_08159364: .4byte 0x02038440 + .pool thumb_func_end sub_8159308 thumb_func_start nullsub_114 @@ -707685,26 +684156,24 @@ nullsub_114: @ 8159368 thumb_func_start sub_815936C sub_815936C: @ 815936C - ldr r1, _0815937C - ldr r0, _08159380 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08159384 + ldr r1, =bx_exec_buffer_A_ch0_tbl6 + 1 str r1, [r0] bx lr .align 2, 0 -_0815937C: .4byte 0x03005d60 -_08159380: .4byte 0x02024064 -_08159384: .4byte bx_exec_buffer_A_ch0_tbl6 + 1 + .pool thumb_func_end sub_815936C thumb_func_start bx_exec_buffer_A_ch0_tbl6 bx_exec_buffer_A_ch0_tbl6: @ 8159388 push {lr} - ldr r2, _081593BC - ldr r1, _081593C0 - ldr r0, _081593C4 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -707713,13 +684182,13 @@ bx_exec_buffer_A_ch0_tbl6: @ 8159388 ands r1, r0 cmp r1, 0 beq _081593D4 - ldr r0, _081593C8 + ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _081593D0 - ldr r0, _081593CC + ldr r0, =0x085cdf20 ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -707727,11 +684196,7 @@ bx_exec_buffer_A_ch0_tbl6: @ 8159388 bl _call_via_r0 b _081593D4 .align 2, 0 -_081593BC: .4byte 0x02024068 -_081593C0: .4byte 0x0832a328 -_081593C4: .4byte 0x02024064 -_081593C8: .4byte 0x02023064 -_081593CC: .4byte 0x085cdf20 + .pool _081593D0: bl dp01_tbl6_exec_completed _081593D4: @@ -707742,7 +684207,7 @@ _081593D4: thumb_func_start bx_battle_menu_t6_2 bx_battle_menu_t6_2: @ 81593D8 push {r4,r5,lr} - ldr r0, _08159408 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 @@ -707751,8 +684216,8 @@ bx_battle_menu_t6_2: @ 81593D8 beq _08159446 movs r0, 0x5 bl audio_play - ldr r1, _0815940C - ldr r0, _08159410 + ldr r1, =0x020244ac + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -707764,9 +684229,7 @@ bx_battle_menu_t6_2: @ 81593D8 beq _0815941E b _08159440 .align 2, 0 -_08159408: .4byte 0x030022c0 -_0815940C: .4byte 0x020244ac -_08159410: .4byte 0x02024064 + .pool _08159414: cmp r0, 0x2 beq _0815942A @@ -707801,8 +684264,8 @@ _08159446: ands r0, r1 cmp r0, 0 beq _08159484 - ldr r5, _0815947C - ldr r4, _08159480 + ldr r5, =0x020244ac + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -707822,15 +684285,14 @@ _08159446: movs r2, 0x1 b _081594F2 .align 2, 0 -_0815947C: .4byte 0x020244ac -_08159480: .4byte 0x02024064 + .pool _08159484: movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _081594C0 - ldr r5, _081594B8 - ldr r4, _081594BC + ldr r5, =0x020244ac + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -707850,15 +684312,14 @@ _08159484: movs r2, 0x1 b _081594F2 .align 2, 0 -_081594B8: .4byte 0x020244ac -_081594BC: .4byte 0x02024064 + .pool _081594C0: movs r0, 0x40 ands r0, r1 cmp r0, 0 beq _0815950C - ldr r5, _08159504 - ldr r4, _08159508 + ldr r5, =0x020244ac + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -707886,15 +684347,14 @@ _081594F2: bl sub_8059CB4 b _0815954E .align 2, 0 -_08159504: .4byte 0x020244ac -_08159508: .4byte 0x02024064 + .pool _0815950C: movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _0815954E - ldr r5, _08159554 - ldr r4, _08159558 + ldr r5, =0x020244ac + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -707924,16 +684384,15 @@ _0815954E: pop {r0} bx r0 .align 2, 0 -_08159554: .4byte 0x020244ac -_08159558: .4byte 0x02024064 + .pool thumb_func_end bx_battle_menu_t6_2 thumb_func_start sub_815955C sub_815955C: @ 815955C push {lr} - ldr r2, _08159584 - ldr r1, _08159588 - ldr r0, _0815958C + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -707943,7 +684402,7 @@ sub_815955C: @ 815955C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08159590 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08159580 bl dp01_tbl6_exec_completed @@ -707951,10 +684410,7 @@ _08159580: pop {r0} bx r0 .align 2, 0 -_08159584: .4byte 0x02020630 -_08159588: .4byte 0x020241e4 -_0815958C: .4byte 0x02024064 -_08159590: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_815955C thumb_func_start bx_t6_button_a @@ -707974,9 +684430,9 @@ _081595A6: thumb_func_start sub_81595AC sub_81595AC: @ 81595AC push {lr} - ldr r2, _081595D4 - ldr r1, _081595D8 - ldr r0, _081595DC + ldr r2, =0x02020630 + ldr r1, =0x03005d70 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -707986,7 +684442,7 @@ sub_81595AC: @ 81595AC adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081595E0 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _081595D0 bl dp01_tbl6_exec_completed @@ -707994,30 +684450,27 @@ _081595D0: pop {r0} bx r0 .align 2, 0 -_081595D4: .4byte 0x02020630 -_081595D8: .4byte 0x03005d70 -_081595DC: .4byte 0x02024064 -_081595E0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81595AC thumb_func_start sub_81595E4 sub_81595E4: @ 81595E4 push {lr} - ldr r0, _08159614 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0815960E - ldr r2, _08159618 - ldr r0, _0815961C + ldr r2, =0x030022c0 + ldr r0, =0x00000439 adds r3, r2, r0 ldrb r1, [r3] movs r0, 0x3 negs r0, r0 ands r0, r1 strb r0, [r3] - ldr r0, _08159620 + ldr r0, =0x03005d00 ldr r0, [r0] str r0, [r2] ldr r0, [r2, 0x8] @@ -708026,22 +684479,19 @@ _0815960E: pop {r0} bx r0 .align 2, 0 -_08159614: .4byte 0x02037fd4 -_08159618: .4byte 0x030022c0 -_0815961C: .4byte 0x00000439 -_08159620: .4byte 0x03005d00 + .pool thumb_func_end sub_81595E4 thumb_func_start bx_wait_t6 bx_wait_t6: @ 8159624 push {lr} - ldr r0, _08159654 + ldr r0, =0x020244b9 ldrb r0, [r0] cmp r0, 0 beq _0815964A - ldr r0, _08159658 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0815965C + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -708059,26 +684509,24 @@ _0815964E: pop {r0} bx r0 .align 2, 0 -_08159654: .4byte 0x020244b9 -_08159658: .4byte 0x020244d0 -_0815965C: .4byte 0x02024064 + .pool thumb_func_end bx_wait_t6 thumb_func_start sub_8159660 sub_8159660: @ 8159660 push {lr} - ldr r0, _08159688 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08159684 - ldr r1, _0815968C - ldr r0, _08159690 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08159694 + ldr r1, =sub_8159698 + 1 str r1, [r0] bl Window_FreeMemory bl sub_81358F4 @@ -708086,27 +684534,24 @@ _08159684: pop {r0} bx r0 .align 2, 0 -_08159688: .4byte 0x02037fd4 -_0815968C: .4byte 0x03005d60 -_08159690: .4byte 0x02024064 -_08159694: .4byte sub_8159698 + 1 + .pool thumb_func_end sub_8159660 thumb_func_start sub_8159698 sub_8159698: @ 8159698 push {lr} - ldr r0, _081596C4 + ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, _081596C8 + ldr r0, =sub_8038420 + 1 cmp r1, r0 bne _081596BE - ldr r0, _081596CC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081596BE - ldr r0, _081596D0 + ldr r0, =0x0203ce7c ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 @@ -708115,18 +684560,15 @@ _081596BE: pop {r0} bx r0 .align 2, 0 -_081596C4: .4byte 0x030022c0 -_081596C8: .4byte sub_8038420 + 1 -_081596CC: .4byte 0x02037fd4 -_081596D0: .4byte 0x0203ce7c + .pool thumb_func_end sub_8159698 thumb_func_start sub_81596D4 sub_81596D4: @ 81596D4 push {lr} - ldr r0, _081596FC + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08159700 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -708143,22 +684585,21 @@ _081596F6: pop {r0} bx r0 .align 2, 0 -_081596FC: .4byte 0x020244d0 -_08159700: .4byte 0x02024064 + .pool thumb_func_end sub_81596D4 thumb_func_start dp01_tbl6_exec_completed dp01_tbl6_exec_completed: @ 8159704 push {r4,lr} sub sp, 0x4 - ldr r1, _08159744 - ldr r4, _08159748 + ldr r1, =0x03005d60 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0815974C + ldr r1, =bx_exec_buffer_A_ch0_tbl6 + 1 str r1, [r0] - ldr r0, _08159750 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -708171,7 +684612,7 @@ dp01_tbl6_exec_completed: @ 8159704 movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _08159754 + ldr r1, =0x02023064 ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -708179,14 +684620,10 @@ dp01_tbl6_exec_completed: @ 8159704 strb r1, [r0] b _0815976A .align 2, 0 -_08159744: .4byte 0x03005d60 -_08159748: .4byte 0x02024064 -_0815974C: .4byte bx_exec_buffer_A_ch0_tbl6 + 1 -_08159750: .4byte 0x02022fec -_08159754: .4byte 0x02023064 + .pool _08159758: - ldr r2, _08159774 - ldr r1, _08159778 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -708200,16 +684637,15 @@ _0815976A: pop {r0} bx r0 .align 2, 0 -_08159774: .4byte 0x02024068 -_08159778: .4byte 0x0832a328 + .pool thumb_func_end dp01_tbl6_exec_completed thumb_func_start bx_80364D0 bx_80364D0: @ 815977C push {lr} - ldr r0, _081597A4 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _081597A8 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -708226,8 +684662,7 @@ _0815979E: pop {r0} bx r0 .align 2, 0 -_081597A4: .4byte 0x020244d0 -_081597A8: .4byte 0x02024064 + .pool thumb_func_end bx_80364D0 thumb_func_start sub_81597AC @@ -708289,10 +684724,10 @@ sub_81597F4: @ 81597F4 thumb_func_start sub_8159800 sub_8159800: @ 8159800 push {r4-r6,lr} - ldr r4, _081598B8 + ldr r4, =0x03005d90 ldr r0, [r4] ldrb r0, [r0, 0x8] - ldr r5, _081598BC + ldr r5, =0x02024064 ldrb r1, [r5] bl sub_805DF84 ldr r0, [r4] @@ -708304,8 +684739,8 @@ sub_8159800: @ 8159800 lsrs r1, 24 adds r0, r6, 0 bl template_build_for_pokemon_or_trainer - ldr r0, _081598C0 - ldr r2, _081598C4 + ldr r0, =0x0202499c + ldr r2, =0x08305d2c ldr r1, [r4] ldrb r1, [r1, 0x8] lsls r1, 2 @@ -708321,11 +684756,11 @@ sub_8159800: @ 8159800 movs r1, 0x50 movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r6, _081598C8 + ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _081598CC + ldr r4, =0x02020630 ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -708355,7 +684790,7 @@ sub_8159800: @ 8159800 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _081598D0 + ldr r1, =0x0000fffe strh r1, [r0, 0x2E] ldrb r0, [r5] adds r0, r6 @@ -708365,28 +684800,19 @@ sub_8159800: @ 8159800 lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _081598D4 + ldr r1, =sub_805D7AC + 1 str r1, [r0] - ldr r1, _081598D8 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _081598DC + ldr r1, =sub_815955C + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081598B8: .4byte 0x03005d90 -_081598BC: .4byte 0x02024064 -_081598C0: .4byte 0x0202499c -_081598C4: .4byte 0x08305d2c -_081598C8: .4byte 0x020241e4 -_081598CC: .4byte 0x02020630 -_081598D0: .4byte 0x0000fffe -_081598D4: .4byte sub_805D7AC + 1 -_081598D8: .4byte 0x03005d60 -_081598DC: .4byte sub_815955C + 1 + .pool thumb_func_end sub_8159800 thumb_func_start sub_81598E0 @@ -708424,15 +684850,15 @@ sub_8159904: @ 8159904 thumb_func_start sub_8159910 sub_8159910: @ 8159910 push {r4,r5,lr} - ldr r0, _08159950 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x8] movs r0, 0x4 strb r0, [r1, 0x8] - ldr r1, _08159954 + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] - ldr r5, _08159958 + ldr r5, =0x02024064 ldrb r4, [r5] movs r0, 0x1 bl battle_get_side_with_given_state @@ -708443,38 +684869,34 @@ sub_8159910: @ 8159910 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, _0815995C + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08159960 + ldr r1, =bx_wait_t6 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08159950: .4byte 0x020244d0 -_08159954: .4byte 0x020244b9 -_08159958: .4byte 0x02024064 -_0815995C: .4byte 0x03005d60 -_08159960: .4byte bx_wait_t6 + 1 + .pool thumb_func_end sub_8159910 thumb_func_start sub_8159964 sub_8159964: @ 8159964 push {r4,r5,lr} - ldr r1, _081599AC - ldr r5, _081599B0 + ldr r1, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r1, [r0] - ldr r0, _081599B4 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] strb r1, [r0, 0x8] - ldr r1, _081599B8 + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] ldrb r4, [r5] @@ -708487,22 +684909,17 @@ sub_8159964: @ 8159964 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, _081599BC + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _081599C0 + ldr r1, =bx_wait_t6 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081599AC: .4byte 0x02023064 -_081599B0: .4byte 0x02024064 -_081599B4: .4byte 0x020244d0 -_081599B8: .4byte 0x020244b9 -_081599BC: .4byte 0x03005d60 -_081599C0: .4byte bx_wait_t6 + 1 + .pool thumb_func_end sub_8159964 thumb_func_start sub_81599C4 @@ -708524,44 +684941,38 @@ sub_81599D0: @ 81599D0 thumb_func_start dp01t_10_6_message dp01t_10_6_message: @ 81599DC push {r4,lr} - ldr r0, _08159A14 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _08159A18 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r4, _08159A1C + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 9 - ldr r1, _08159A20 + ldr r1, =0x02023066 adds r0, r1 ldrh r0, [r0] bl battle_pick_message - ldr r0, _08159A24 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _08159A28 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08159A2C + ldr r1, =bx_t6_button_a + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08159A14: .4byte 0x02022e14 -_08159A18: .4byte 0x02022e16 -_08159A1C: .4byte 0x02024064 -_08159A20: .4byte 0x02023066 -_08159A24: .4byte 0x02022e2c -_08159A28: .4byte 0x03005d60 -_08159A2C: .4byte bx_t6_button_a + 1 + .pool thumb_func_end dp01t_10_6_message thumb_func_start dp01t_11_6_message_for_player_only dp01t_11_6_message_for_player_only: @ 8159A30 push {lr} - ldr r0, _08159A48 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -708570,7 +684981,7 @@ dp01t_11_6_message_for_player_only: @ 8159A30 bl dp01t_10_6_message b _08159A50 .align 2, 0 -_08159A48: .4byte 0x02024064 + .pool _08159A4C: bl dp01_tbl6_exec_completed _08159A50: @@ -708586,40 +684997,36 @@ sub_8159A54: @ 8159A54 lsrs r1, r0, 24 cmp r1, 0 bne _08159A7A - ldr r0, _08159A80 + ldr r0, =0x02022e14 strh r1, [r0] - ldr r1, _08159A84 + ldr r1, =0x02022e16 movs r0, 0xA0 strh r0, [r1] - ldr r1, _08159A88 - ldr r0, _08159A8C + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08159A90 + ldr r1, =bx_battle_menu_t6_2 + 1 str r1, [r0] _08159A7A: pop {r0} bx r0 .align 2, 0 -_08159A80: .4byte 0x02022e14 -_08159A84: .4byte 0x02022e16 -_08159A88: .4byte 0x03005d60 -_08159A8C: .4byte 0x02024064 -_08159A90: .4byte bx_battle_menu_t6_2 + 1 + .pool thumb_func_end sub_8159A54 thumb_func_start sub_8159A94 sub_8159A94: @ 8159A94 push {r4,lr} - ldr r1, _08159AE0 - ldr r0, _08159AE4 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08159AE8 + ldr r1, =sub_8159A54 + 1 str r1, [r0] - ldr r0, _08159AEC + ldr r0, =0x085cca54 movs r1, 0x2 bl battle_show_message_maybe movs r4, 0 @@ -708630,29 +685037,23 @@ _08159AAE: adds r4, 0x1 cmp r4, 0x3 ble _08159AAE - ldr r1, _08159AF0 - ldr r0, _08159AE4 + ldr r1, =0x020244ac + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - ldr r0, _08159AF4 + ldr r0, =0x085cca04 bl sub_814E6F0 - ldr r0, _08159AF8 + ldr r0, =0x02022e2c movs r1, 0x1 bl battle_show_message_maybe pop {r4} pop {r0} bx r0 .align 2, 0 -_08159AE0: .4byte 0x03005d60 -_08159AE4: .4byte 0x02024064 -_08159AE8: .4byte sub_8159A54 + 1 -_08159AEC: .4byte 0x085cca54 -_08159AF0: .4byte 0x020244ac -_08159AF4: .4byte 0x085cca04 -_08159AF8: .4byte 0x02022e2c + .pool thumb_func_end sub_8159A94 thumb_func_start sub_8159AFC @@ -708682,24 +685083,21 @@ sub_8159B14: @ 8159B14 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _08159B44 - ldr r2, _08159B48 + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _08159B4C + ldr r1, =sub_8159660 + 1 str r1, [r0] - ldr r1, _08159B50 + ldr r1, =0x020244b8 ldrb r0, [r2] strb r0, [r1] add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08159B44: .4byte 0x03005d60 -_08159B48: .4byte 0x02024064 -_08159B4C: .4byte sub_8159660 + 1 -_08159B50: .4byte 0x020244b8 + .pool thumb_func_end sub_8159B14 thumb_func_start sub_8159B54 @@ -708737,18 +685135,18 @@ sub_8159B78: @ 8159B78 thumb_func_start sub_8159B84 sub_8159B84: @ 8159B84 push {lr} - ldr r0, _08159BB0 - ldr r1, _08159BB4 + ldr r0, =0x03005d70 + ldr r1, =0x02024064 ldrb r1, [r1] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _08159BB8 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08159BBC + ldr r2, =0x020244ec adds r1, r2 movs r2, 0xB bl healthbar_draw_field_maybe @@ -708756,10 +685154,7 @@ sub_8159B84: @ 8159B84 pop {r0} bx r0 .align 2, 0 -_08159BB0: .4byte 0x03005d70 -_08159BB4: .4byte 0x02024064 -_08159BB8: .4byte 0x0202406e -_08159BBC: .4byte 0x020244ec + .pool thumb_func_end sub_8159B84 thumb_func_start sub_8159BC0 @@ -708893,7 +685288,7 @@ sub_8159C74: @ 8159C74 thumb_func_start sub_8159C80 sub_8159C80: @ 8159C80 push {r4,lr} - ldr r4, _08159CBC + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -708902,7 +685297,7 @@ sub_8159C80: @ 8159C80 bne _08159C94 movs r3, 0xC0 _08159C94: - ldr r2, _08159CC0 + ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -708921,15 +685316,14 @@ _08159C94: pop {r0} bx r0 .align 2, 0 -_08159CBC: .4byte 0x02024064 -_08159CC0: .4byte 0x02023064 + .pool thumb_func_end sub_8159C80 thumb_func_start dp01t_34_6_move_anim_start_t3 dp01t_34_6_move_anim_start_t3: @ 8159CC4 push {r4,r5,lr} - ldr r4, _08159CF8 - ldr r5, _08159CFC + ldr r4, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -708951,8 +685345,7 @@ dp01t_34_6_move_anim_start_t3: @ 8159CC4 bl song_play_for_text b _08159D14 .align 2, 0 -_08159CF8: .4byte 0x02023064 -_08159CFC: .4byte 0x02024064 + .pool _08159D00: adds r0, r4, 0x1 adds r0, r3, r0 @@ -708973,15 +685366,15 @@ _08159D14: thumb_func_start sub_8159D20 sub_8159D20: @ 8159D20 push {lr} - ldr r1, _08159D50 - ldr r0, _08159D54 + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08159D58 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -708993,23 +685386,21 @@ sub_8159D20: @ 8159D20 pop {r0} bx r0 .align 2, 0 -_08159D50: .4byte 0x0202406e -_08159D54: .4byte 0x02024064 -_08159D58: .4byte 0x020244ec + .pool thumb_func_end sub_8159D20 thumb_func_start dp01t_2E_6_battle_intro dp01t_2E_6_battle_intro: @ 8159D5C push {lr} - ldr r1, _08159D84 - ldr r0, _08159D88 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r0, [r0] bl battle_intro_launch - ldr r2, _08159D8C + ldr r2, =0x020243fc ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -709018,26 +685409,24 @@ dp01t_2E_6_battle_intro: @ 8159D5C pop {r0} bx r0 .align 2, 0 -_08159D84: .4byte 0x02023064 -_08159D88: .4byte 0x02024064 -_08159D8C: .4byte 0x020243fc + .pool thumb_func_end dp01t_2E_6_battle_intro thumb_func_start sub_8159D90 sub_8159D90: @ 8159D90 push {r4,r5,lr} - ldr r5, _08159DD4 - ldr r4, _08159DD8 + ldr r5, =0x03005d70 + ldr r4, =0x02024064 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _08159DDC + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08159DE0 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0xA bl healthbar_draw_field_maybe @@ -709047,22 +685436,17 @@ sub_8159D90: @ 8159D90 adds r0, r5 ldrb r0, [r0] bl sub_80729D0 - ldr r1, _08159DE4 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08159DE8 + ldr r1, =sub_81595AC + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08159DD4: .4byte 0x03005d70 -_08159DD8: .4byte 0x02024064 -_08159DDC: .4byte 0x0202406e -_08159DE0: .4byte 0x020244ec -_08159DE4: .4byte 0x03005d60 -_08159DE8: .4byte sub_81595AC + 1 + .pool thumb_func_end sub_8159D90 thumb_func_start sub_8159DEC @@ -709101,8 +685485,8 @@ sub_8159E10: @ 8159E10 sub_8159E1C: @ 8159E1C push {r4-r6,lr} sub sp, 0x4 - ldr r5, _08159E54 - ldr r6, _08159E58 + ldr r5, =0x02023064 + ldr r6, =0x02024064 ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -709126,14 +685510,13 @@ sub_8159E1C: @ 8159E1C bl dp01_tbl6_exec_completed b _08159E68 .align 2, 0 -_08159E54: .4byte 0x02023064 -_08159E58: .4byte 0x02024064 + .pool _08159E5C: - ldr r0, _08159E70 + ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, _08159E74 + ldr r0, =sub_81596D4 + 1 str r0, [r1] _08159E68: add sp, 0x4 @@ -709141,8 +685524,7 @@ _08159E68: pop {r0} bx r0 .align 2, 0 -_08159E70: .4byte 0x03005d60 -_08159E74: .4byte sub_81596D4 + 1 + .pool thumb_func_end sub_8159E1C thumb_func_start sub_8159E78 @@ -709164,9 +685546,9 @@ sub_8159E84: @ 8159E84 thumb_func_start sub_8159E90 sub_8159E90: @ 8159E90 push {r4,lr} - ldr r2, _08159ED4 - ldr r1, _08159ED8 - ldr r4, _08159EDC + ldr r2, =0x0202433a + ldr r1, =0x02023064 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -709178,29 +685560,24 @@ sub_8159E90: @ 8159E90 movs r0, 0x3 bl sub_80A2390 bl dp01_tbl6_exec_completed - ldr r0, _08159EE0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x6 ands r0, r1 cmp r0, 0x2 bne _08159ECC - ldr r0, _08159EE4 + ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, _08159EE8 + ldr r0, =sub_81595E4 + 1 str r0, [r1] _08159ECC: pop {r4} pop {r0} bx r0 .align 2, 0 -_08159ED4: .4byte 0x0202433a -_08159ED8: .4byte 0x02023064 -_08159EDC: .4byte 0x02024064 -_08159EE0: .4byte 0x02022fec -_08159EE4: .4byte 0x03005d60 -_08159EE8: .4byte sub_81595E4 + 1 + .pool thumb_func_end sub_8159E90 thumb_func_start nullsub_115 @@ -709210,19 +685587,16 @@ nullsub_115: @ 8159EEC thumb_func_start sub_8159EF0 sub_8159EF0: @ 8159EF0 - ldr r1, _08159F00 - ldr r0, _08159F04 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _08159F08 - ldr r0, _08159F0C + ldr r1, =0x0203ceec + ldr r0, =hm2_sweet_scent + 1 str r0, [r1] movs r0, 0x1 bx lr .align 2, 0 -_08159F00: .4byte 0x03005db0 -_08159F04: .4byte hm_add_c3_launch_phase_2 + 1 -_08159F08: .4byte 0x0203ceec -_08159F0C: .4byte hm2_sweet_scent + 1 + .pool thumb_func_end sub_8159EF0 thumb_func_start hm2_sweet_scent @@ -709231,14 +685605,14 @@ hm2_sweet_scent: @ 8159F10 movs r0, 0x33 bl oe_exec bl brm_get_pokemon_selection - ldr r1, _08159F28 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_08159F28: .4byte 0x02038c08 + .pool thumb_func_end hm2_sweet_scent thumb_func_start sub_8159F2C @@ -709248,12 +685622,12 @@ sub_8159F2C: @ 8159F2C bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _08159F54 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _08159F58 + ldr r2, =sub_8159F5C + 1 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -709261,8 +685635,7 @@ sub_8159F2C: @ 8159F2C pop {r1} bx r1 .align 2, 0 -_08159F54: .4byte 0x03005e00 -_08159F58: .4byte sub_8159F5C + 1 + .pool thumb_func_end sub_8159F2C thumb_func_start sub_8159F5C @@ -709271,19 +685644,19 @@ sub_8159F5C: @ 8159F5C sub sp, 0x4 movs r0, 0xEC bl audio_play - ldr r5, _08159FD4 - ldr r1, _08159FD8 + ldr r5, =0x02037714 + ldr r1, =0x02037fe8 movs r4, 0x80 lsls r4, 1 adds r0, r5, 0 adds r2, r4, 0 bl CpuFastSet - ldr r0, _08159FDC + ldr r0, =0x02037b14 adds r1, r5, 0 adds r2, r4, 0 bl CpuFastSet bl sub_808BCDC - ldr r2, _08159FE0 + ldr r2, =0x02020630 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -709302,12 +685675,12 @@ sub_8159F5C: @ 8159F5C movs r2, 0 movs r3, 0x8 bl sub_80A1AD4 - ldr r0, _08159FE4 + ldr r0, =sub_8159FEC + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08159FE8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -709321,12 +685694,7 @@ sub_8159F5C: @ 8159F5C pop {r0} bx r0 .align 2, 0 -_08159FD4: .4byte 0x02037714 -_08159FD8: .4byte 0x02037fe8 -_08159FDC: .4byte 0x02037b14 -_08159FE0: .4byte 0x02020630 -_08159FE4: .4byte sub_8159FEC + 1 -_08159FE8: .4byte 0x03005e00 + .pool thumb_func_end sub_8159F5C thumb_func_start sub_8159FEC @@ -709335,7 +685703,7 @@ sub_8159FEC: @ 8159FEC sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0815A03C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -709348,7 +685716,7 @@ sub_8159FEC: @ 8159FEC movs r1, 0x8 movs r2, 0x1F bl sub_80A2A20 - ldr r0, _0815A040 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -709368,13 +685736,12 @@ sub_8159FEC: @ 8159FEC bl remove_task b _0815A088 .align 2, 0 -_0815A03C: .4byte 0x02037fd4 -_0815A040: .4byte 0x03005e00 + .pool _0815A044: - ldr r0, _0815A07C + ldr r0, =sub_815A090 + 1 str r0, [r4] bl sub_808BCDC - ldr r2, _0815A080 + ldr r2, =0x02020630 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -709396,8 +685763,7 @@ _0815A044: bl sub_81BE6B8 b _0815A088 .align 2, 0 -_0815A07C: .4byte sub_815A090 + 1 -_0815A080: .4byte 0x02020630 + .pool _0815A084: adds r0, r1, 0x1 strh r0, [r4, 0x8] @@ -709413,19 +685779,19 @@ sub_815A090: @ 815A090 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0815A0C4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0815A0BE - ldr r0, _0815A0C8 - ldr r1, _0815A0CC + ldr r0, =0x02037fe8 + ldr r1, =0x02037714 movs r2, 0x80 lsls r2, 1 bl CpuFastSet bl sub_80AC3E4 - ldr r0, _0815A0D0 + ldr r0, =0x08290cae bl script_env_1_execute_new_script adds r0, r4, 0 bl remove_task @@ -709434,17 +685800,14 @@ _0815A0BE: pop {r0} bx r0 .align 2, 0 -_0815A0C4: .4byte 0x02037fd4 -_0815A0C8: .4byte 0x02037fe8 -_0815A0CC: .4byte 0x02037714 -_0815A0D0: .4byte 0x08290cae + .pool thumb_func_end sub_815A090 thumb_func_start sub_815A0D4 sub_815A0D4: @ 815A0D4 push {lr} adds r2, r0, 0 - ldr r1, _0815A0F8 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r3, [r2, 0x20] adds r0, r3 @@ -709460,7 +685823,7 @@ sub_815A0D4: @ 815A0D4 ldrh r0, [r1, 0x4] b _0815A100 .align 2, 0 -_0815A0F8: .4byte 0x0203841e + .pool _0815A0FC: ldrh r0, [r1, 0x4] negs r0, r0 @@ -709468,12 +685831,12 @@ _0815A100: strh r0, [r2, 0x2E] ldrh r0, [r1, 0x8] strh r0, [r2, 0x30] - ldr r0, _0815A110 + ldr r0, =sub_815A114 + 1 str r0, [r2, 0x1C] pop {r0} bx r0 .align 2, 0 -_0815A110: .4byte sub_815A114 + 1 + .pool thumb_func_end sub_815A0D4 thumb_func_start sub_815A114 @@ -709524,7 +685887,7 @@ sub_815A160: @ 815A160 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _0815A1AC + ldr r6, =0x02038437 ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -709554,7 +685917,7 @@ sub_815A160: @ 815A160 pop {r0} bx r0 .align 2, 0 -_0815A1AC: .4byte 0x02038437 + .pool thumb_func_end sub_815A160 thumb_func_start sub_815A1B0 @@ -709563,11 +685926,11 @@ sub_815A1B0: @ 815A1B0 adds r4, r0, 0 movs r0, 0x5A strh r0, [r4, 0x2E] - ldr r0, _0815A1EC + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] movs r0, 0x7 strh r0, [r4, 0x30] - ldr r1, _0815A1F0 + ldr r1, =sub_815A1F4 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 movs r1, 0xFD @@ -709587,8 +685950,7 @@ sub_815A1B0: @ 815A1B0 pop {r0} bx r0 .align 2, 0 -_0815A1EC: .4byte sub_80A64B0 + 1 -_0815A1F0: .4byte sub_815A1F4 + 1 + .pool thumb_func_end sub_815A1B0 thumb_func_start sub_815A1F4 @@ -709616,14 +685978,14 @@ sub_815A1F4: @ 815A1F4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _0815A230 + ldr r0, =sub_815A234 + 1 str r0, [r4, 0x1C] _0815A228: pop {r4} pop {r0} bx r0 .align 2, 0 -_0815A230: .4byte sub_815A234 + 1 + .pool thumb_func_end sub_815A1F4 thumb_func_start sub_815A234 @@ -709648,7 +686010,7 @@ sub_815A254: @ 815A254 push {r4-r7,lr} sub sp, 0x4 adds r5, r0, 0 - ldr r4, _0815A2E0 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -709695,14 +686057,14 @@ _0815A2B2: movs r1, 0 adds r2, r3, 0 bl sub_80A73E0 - ldr r0, _0815A2E4 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r5, 0x2E] strh r7, [r5, 0x32] strh r6, [r5, 0x36] - ldr r0, _0815A2E8 + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] - ldr r1, _0815A2EC + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 add sp, 0x4 @@ -709710,10 +686072,7 @@ _0815A2B2: pop {r0} bx r0 .align 2, 0 -_0815A2E0: .4byte 0x02038437 -_0815A2E4: .4byte 0x0203841e -_0815A2E8: .4byte sub_80A6EEC + 1 -_0815A2EC: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_815A254 thumb_func_start sub_815A2F0 @@ -709730,13 +686089,13 @@ sub_815A2F0: @ 815A2F0 bl lcd_io_set movs r0, 0x4 strh r0, [r4, 0x2E] - ldr r0, _0815A318 + ldr r0, =sub_815A31C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0815A318: .4byte sub_815A31C + 1 + .pool thumb_func_end sub_815A2F0 thumb_func_start sub_815A31C @@ -709805,14 +686164,14 @@ _0815A35C: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r0, _0815A3A8 + ldr r0, =sub_815A3AC + 1 str r0, [r4, 0x1C] _0815A3A0: pop {r4} pop {r0} bx r0 .align 2, 0 -_0815A3A8: .4byte sub_815A3AC + 1 + .pool thumb_func_end sub_815A31C thumb_func_start sub_815A3AC @@ -709845,13 +686204,13 @@ sub_815A3AC: @ 815A3AC ands r0, r1 cmp r0, 0 beq _0815A3E8 - ldr r0, _0815A3EC + ldr r0, =sub_815A3F0 + 1 str r0, [r3, 0x1C] _0815A3E8: pop {r0} bx r0 .align 2, 0 -_0815A3EC: .4byte sub_815A3F0 + 1 + .pool thumb_func_end sub_815A3AC thumb_func_start sub_815A3F0 @@ -709863,12 +686222,12 @@ sub_815A3F0: @ 815A3F0 cmp r0, 0x6 bhi _0815A448 lsls r0, 2 - ldr r1, _0815A408 + ldr r1, =_0815A40C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815A408: .4byte _0815A40C + .pool .align 2, 0 _0815A40C: .4byte _0815A428 @@ -709885,12 +686244,12 @@ _0815A428: strh r1, [r4, 0x26] b _0815A450 _0815A432: - ldr r0, _0815A43C + ldr r0, =0x0000ffff strh r0, [r4, 0x24] movs r0, 0 b _0815A44E .align 2, 0 -_0815A43C: .4byte 0x0000ffff + .pool _0815A440: movs r0, 0 strh r0, [r4, 0x24] @@ -709899,7 +686258,7 @@ _0815A440: _0815A448: movs r0, 0 strh r0, [r4, 0x24] - ldr r0, _0815A494 + ldr r0, =0x0000ffff _0815A44E: strh r0, [r4, 0x26] _0815A450: @@ -709930,15 +686289,14 @@ _0815A462: ldrh r1, [r4, 0x2E] movs r0, 0x52 bl lcd_io_set - ldr r0, _0815A498 + ldr r0, =sub_815A49C + 1 str r0, [r4, 0x1C] _0815A48C: pop {r4} pop {r0} bx r0 .align 2, 0 -_0815A494: .4byte 0x0000ffff -_0815A498: .4byte sub_815A49C + 1 + .pool thumb_func_end sub_815A3F0 thumb_func_start sub_815A49C @@ -710000,22 +686358,20 @@ _0815A4FE: sub_815A504: @ 815A504 lsls r0, 24 lsrs r0, 24 - ldr r2, _0815A520 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _0815A524 + ldr r0, =sub_815A52C + 1 str r0, [r1] - ldr r1, _0815A528 + ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] bx lr .align 2, 0 -_0815A520: .4byte 0x03005e00 -_0815A524: .4byte sub_815A52C + 1 -_0815A528: .4byte 0x020383fe + .pool thumb_func_end sub_815A504 thumb_func_start sub_815A52C @@ -710029,7 +686385,7 @@ sub_815A52C: @ 815A52C bl sub_80A6D94 lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _0815A5B8 + ldr r7, =0x03005e00 lsls r5, r4, 2 adds r1, r5, r4 lsls r1, 3 @@ -710041,7 +686397,7 @@ sub_815A52C: @ 815A52C asrs r0, 16 cmp r0, 0x4 bne _0815A59C - ldr r0, _0815A5BC + ldr r0, =0x02037b14 lsls r2, r6, 4 adds r1, r2, 0 adds r1, 0xB @@ -710077,9 +686433,9 @@ _0815A57A: add r0, r9 strh r1, [r0, 0x12] _0815A59C: - ldr r0, _0815A5C0 + ldr r0, =0x0203841e ldrh r1, [r0, 0xE] - ldr r0, _0815A5C4 + ldr r0, =0x0000ffff cmp r1, r0 bne _0815A5AC adds r0, r4, 0 @@ -710092,32 +686448,27 @@ _0815A5AC: pop {r0} bx r0 .align 2, 0 -_0815A5B8: .4byte 0x03005e00 -_0815A5BC: .4byte 0x02037b14 -_0815A5C0: .4byte 0x0203841e -_0815A5C4: .4byte 0x0000ffff + .pool thumb_func_end sub_815A52C thumb_func_start c3_80DE6F0 c3_80DE6F0: @ 815A5C8 lsls r0, 24 lsrs r0, 24 - ldr r2, _0815A5E4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _0815A5E8 + ldr r0, =sub_815A5F0 + 1 str r0, [r1] - ldr r1, _0815A5EC + ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] bx lr .align 2, 0 -_0815A5E4: .4byte 0x03005e00 -_0815A5E8: .4byte sub_815A5F0 + 1 -_0815A5EC: .4byte 0x020383fe + .pool thumb_func_end c3_80DE6F0 thumb_func_start sub_815A5F0 @@ -710133,7 +686484,7 @@ sub_815A5F0: @ 815A5F0 bl sub_80A6D94 lsls r0, 24 lsrs r7, r0, 24 - ldr r5, _0815A6B0 + ldr r5, =0x03005e00 mov r0, r8 lsls r3, r0, 2 adds r1, r3, r0 @@ -710146,7 +686497,7 @@ sub_815A5F0: @ 815A5F0 asrs r0, 16 cmp r0, 0x4 bne _0815A692 - ldr r0, _0815A6B4 + ldr r0, =0x02037b14 lsls r2, r7, 4 adds r1, r2, 0 adds r1, 0xB @@ -710157,7 +686508,7 @@ sub_815A5F0: @ 815A5F0 mov r10, r3 mov r9, r0 adds r5, r2, 0 - ldr r2, _0815A6B8 + ldr r2, =0x02037714 mov r12, r2 lsls r0, r7, 5 add r0, r9 @@ -710201,13 +686552,13 @@ _0815A66E: mov r0, r10 add r0, r8 lsls r0, 3 - ldr r2, _0815A6B0 + ldr r2, =0x03005e00 adds r0, r2 strh r1, [r0, 0x12] _0815A692: - ldr r0, _0815A6BC + ldr r0, =0x0203841e ldrh r1, [r0, 0xE] - ldr r0, _0815A6C0 + ldr r0, =0x0000ffff cmp r1, r0 bne _0815A6A2 mov r0, r8 @@ -710221,11 +686572,7 @@ _0815A6A2: pop {r0} bx r0 .align 2, 0 -_0815A6B0: .4byte 0x03005e00 -_0815A6B4: .4byte 0x02037b14 -_0815A6B8: .4byte 0x02037714 -_0815A6BC: .4byte 0x0203841e -_0815A6C0: .4byte 0x0000ffff + .pool thumb_func_end sub_815A5F0 thumb_func_start sub_815A6C4 @@ -710235,7 +686582,7 @@ sub_815A6C4: @ 815A6C4 adds r4, r0, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _0815A728 + ldr r0, =0x02038437 ldrb r0, [r0] mov r5, sp adds r5, 0x2 @@ -710243,18 +686590,18 @@ sub_815A6C4: @ 815A6C4 mov r2, sp adds r3, r5, 0 bl sub_80A8924 - ldr r0, _0815A72C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0815A6F8 - ldr r1, _0815A730 + ldr r1, =0x0203841e ldrh r0, [r1, 0x4] negs r0, r0 strh r0, [r1, 0x4] _0815A6F8: - ldr r1, _0815A730 + ldr r1, =0x0203841e ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] mov r2, sp @@ -710266,22 +686613,18 @@ _0815A6F8: ldrh r5, [r5] adds r0, r5 strh r0, [r4, 0x36] - ldr r0, _0815A734 + ldr r0, =0x0000ffce strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, _0815A738 + ldr r0, =sub_815A73C + 1 str r0, [r4, 0x1C] add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815A728: .4byte 0x02038437 -_0815A72C: .4byte 0x02038436 -_0815A730: .4byte 0x0203841e -_0815A734: .4byte 0x0000ffce -_0815A738: .4byte sub_815A73C + 1 + .pool thumb_func_end sub_815A6C4 thumb_func_start sub_815A73C @@ -710296,9 +686639,9 @@ sub_815A73C: @ 815A73C movs r0, 0x1E strh r0, [r4, 0x2E] strh r1, [r4, 0x30] - ldr r0, _0815A764 + ldr r0, =sub_80A64B0 + 1 str r0, [r4, 0x1C] - ldr r1, _0815A768 + ldr r1, =sub_815A76C + 1 adds r0, r4, 0 bl oamt_set_x3A_32 _0815A75E: @@ -710306,8 +686649,7 @@ _0815A75E: pop {r0} bx r0 .align 2, 0 -_0815A764: .4byte sub_80A64B0 + 1 -_0815A768: .4byte sub_815A76C + 1 + .pool thumb_func_end sub_815A73C thumb_func_start sub_815A76C @@ -710354,7 +686696,7 @@ sub_815A7B0: @ 815A7B0 push {r4,r5,lr} adds r4, r0, 0 bl sub_80A6838 - ldr r5, _0815A7E0 + ldr r5, =0x0203841e movs r0, 0 ldrsh r1, [r5, r0] adds r0, r4, 0 @@ -710363,18 +686705,16 @@ sub_815A7B0: @ 815A7B0 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, _0815A7E4 + ldr r0, =sub_80A67D8 + 1 str r0, [r4, 0x1C] - ldr r1, _0815A7E8 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815A7E0: .4byte 0x0203841e -_0815A7E4: .4byte sub_80A67D8 + 1 -_0815A7E8: .4byte move_anim_8072740 + 1 + .pool thumb_func_end sub_815A7B0 thumb_func_start sub_815A7EC @@ -710387,7 +686727,7 @@ sub_815A7EC: @ 815A7EC bne _0815A84C adds r0, r4, 0 bl sub_80A6838 - ldr r5, _0815A828 + ldr r5, =0x0203841e movs r2, 0 ldrsh r1, [r5, r2] adds r0, r4, 0 @@ -710396,7 +686736,7 @@ sub_815A7EC: @ 815A7EC lsls r0, 24 cmp r0, 0 bne _0815A840 - ldr r0, _0815A82C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -710405,8 +686745,7 @@ sub_815A7EC: @ 815A7EC ldrh r0, [r5, 0x4] b _0815A846 .align 2, 0 -_0815A828: .4byte 0x0203841e -_0815A82C: .4byte 0x02038436 + .pool _0815A830: movs r1, 0x4 ldrsh r0, [r5, r1] @@ -710496,21 +686835,20 @@ sub_815A8C8: @ 815A8C8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0815A8E4 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0815A8EC - ldr r1, _0815A8E8 + ldr r1, =0x0203841e movs r0, 0 b _0815A8F0 .align 2, 0 -_0815A8E4: .4byte 0x02038437 -_0815A8E8: .4byte 0x0203841e + .pool _0815A8EC: - ldr r1, _0815A900 + ldr r1, =0x0203841e movs r0, 0x1 _0815A8F0: strh r0, [r1, 0xE] @@ -710520,7 +686858,7 @@ _0815A8F0: pop {r0} bx r0 .align 2, 0 -_0815A900: .4byte 0x0203841e + .pool thumb_func_end sub_815A8C8 thumb_func_start sub_815A904 @@ -710528,18 +686866,17 @@ sub_815A904: @ 815A904 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0815A918 + ldr r0, =0x02038404 ldr r0, [r0] cmp r0, 0 ble _0815A920 - ldr r1, _0815A91C + ldr r1, =0x0203841e movs r0, 0 b _0815A924 .align 2, 0 -_0815A918: .4byte 0x02038404 -_0815A91C: .4byte 0x0203841e + .pool _0815A920: - ldr r1, _0815A930 + ldr r1, =0x0203841e movs r0, 0x1 _0815A924: strh r0, [r1, 0xE] @@ -710548,24 +686885,24 @@ _0815A924: pop {r0} bx r0 .align 2, 0 -_0815A930: .4byte 0x0203841e + .pool thumb_func_end sub_815A904 thumb_func_start sub_815A934 sub_815A934: @ 815A934 push {r4,r5,lr} adds r5, r0, 0 - ldr r1, _0815A990 + ldr r1, =0x00001f3f movs r0, 0x4A bl lcd_io_set movs r1, 0x80 lsls r1, 8 movs r0, 0 bl lcd_io_set_bits - ldr r0, _0815A994 + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r4, _0815A998 + ldr r4, =0x02022e26 strh r1, [r4] movs r0, 0x40 movs r1, 0 @@ -710589,16 +686926,13 @@ sub_815A934: @ 815A934 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _0815A99C + ldr r0, =sub_815A9A0 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815A990: .4byte 0x00001f3f -_0815A994: .4byte 0x02022e24 -_0815A998: .4byte 0x02022e26 -_0815A99C: .4byte sub_815A9A0 + 1 + .pool thumb_func_end sub_815A934 thumb_func_start sub_815A9A0 @@ -710610,12 +686944,12 @@ sub_815A9A0: @ 815A9A0 cmp r0, 0x5 bhi _0815AA60 lsls r0, 2 - ldr r1, _0815A9B8 + ldr r1, =_0815A9BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815A9B8: .4byte _0815A9BC + .pool .align 2, 0 _0815A9BC: .4byte _0815A9D4 @@ -710697,21 +687031,21 @@ _0815AA42: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _0815AA68 + ldr r0, =sub_815AA6C + 1 str r0, [r4, 0x1C] _0815AA60: pop {r4} pop {r0} bx r0 .align 2, 0 -_0815AA68: .4byte sub_815AA6C + 1 + .pool thumb_func_end sub_815A9A0 thumb_func_start sub_815AA6C sub_815AA6C: @ 815AA6C push {r4,lr} adds r4, r0, 0 - ldr r1, _0815AAA0 + ldr r1, =0x00003f3f movs r0, 0x4A bl lcd_io_set movs r0, 0 @@ -710731,19 +687065,19 @@ sub_815AA6C: @ 815AA6C pop {r0} bx r0 .align 2, 0 -_0815AAA0: .4byte 0x00003f3f + .pool thumb_func_end sub_815AA6C thumb_func_start sub_815AAA4 sub_815AAA4: @ 815AAA4 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _0815AB18 + ldr r6, =0x0203841e movs r1, 0x6 ldrsh r0, [r6, r1] cmp r0, 0 bne _0815AAD0 - ldr r4, _0815AB1C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -710770,10 +687104,10 @@ _0815AAD0: lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x10 - ldr r4, _0815AB20 + ldr r4, =0x000003ff adds r0, r4, 0 ands r1, r0 - ldr r0, _0815AB24 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] @@ -710788,23 +687122,19 @@ _0815AAD0: movs r1, 0x10 orrs r0, r1 strb r0, [r5, 0x3] - ldr r0, _0815AB28 + ldr r0, =0x0000fff4 strh r0, [r5, 0x24] movs r0, 0x2 b _0815AB32 .align 2, 0 -_0815AB18: .4byte 0x0203841e -_0815AB1C: .4byte 0x02038436 -_0815AB20: .4byte 0x000003ff -_0815AB24: .4byte 0xfffffc00 -_0815AB28: .4byte 0x0000fff4 + .pool _0815AB2C: movs r0, 0xC strh r0, [r5, 0x24] - ldr r0, _0815AB50 + ldr r0, =0x0000fffe _0815AB32: strh r0, [r5, 0x30] - ldr r1, _0815AB54 + ldr r1, =0x0203841e ldrh r0, [r1, 0x8] strh r0, [r5, 0x2E] movs r2, 0x34 @@ -710814,15 +687144,13 @@ _0815AB32: ldrh r0, [r1, 0x4] strh r0, [r5, 0x34] _0815AB46: - ldr r0, _0815AB58 + ldr r0, =sub_815AB5C + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0815AB50: .4byte 0x0000fffe -_0815AB54: .4byte 0x0203841e -_0815AB58: .4byte sub_815AB5C + 1 + .pool thumb_func_end sub_815AAA4 thumb_func_start sub_815AB5C @@ -710913,41 +687241,36 @@ sub_815ABEC: @ 815ABEC lsls r0, 24 cmp r0, 0 beq _0815AC40 - ldr r1, _0815AC28 + ldr r1, =0x00001f3f movs r0, 0x48 bl lcd_io_set - ldr r1, _0815AC2C - ldr r2, _0815AC30 + ldr r1, =0x02022e28 + ldr r2, =0x000098f0 adds r0, r2, 0 strh r0, [r1] - ldr r1, _0815AC34 + ldr r1, =0x02022e2a movs r0, 0xA0 strh r0, [r1] - ldr r0, _0815AC38 + ldr r0, =0x02022e24 ldrh r1, [r0] movs r0, 0x42 bl lcd_io_set - ldr r0, _0815AC3C + ldr r0, =0x02022e26 ldrh r1, [r0] movs r0, 0x46 bl lcd_io_set b _0815AC70 .align 2, 0 -_0815AC28: .4byte 0x00001f3f -_0815AC2C: .4byte 0x02022e28 -_0815AC30: .4byte 0x000098f0 -_0815AC34: .4byte 0x02022e2a -_0815AC38: .4byte 0x02022e24 -_0815AC3C: .4byte 0x02022e26 + .pool _0815AC40: - ldr r1, _0815AC7C + ldr r1, =0x00001f3f movs r0, 0x48 bl lcd_io_set - ldr r1, _0815AC80 + ldr r1, =0x02022e28 movs r0, 0xF0 strh r0, [r1] - ldr r4, _0815AC84 - ldr r1, _0815AC88 + ldr r4, =0x02022e2a + ldr r1, =0x000078a0 adds r0, r1, 0 strh r0, [r4] movs r0, 0x42 @@ -710967,10 +687290,7 @@ _0815AC70: pop {r0} bx r0 .align 2, 0 -_0815AC7C: .4byte 0x00001f3f -_0815AC80: .4byte 0x02022e28 -_0815AC84: .4byte 0x02022e2a -_0815AC88: .4byte 0x000078a0 + .pool thumb_func_end sub_815ABEC thumb_func_start sub_815AC8C @@ -710978,13 +687298,13 @@ sub_815AC8C: @ 815AC8C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0815ACC4 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r0, _0815ACC8 + ldr r0, =0x02022e28 movs r1, 0 strh r1, [r0] - ldr r0, _0815ACCC + ldr r0, =0x02022e2a strh r1, [r0] bl sub_80A4DF0 lsls r0, 24 @@ -711001,27 +687321,24 @@ _0815ACB8: pop {r0} bx r0 .align 2, 0 -_0815ACC4: .4byte 0x00003f3f -_0815ACC8: .4byte 0x02022e28 -_0815ACCC: .4byte 0x02022e2a + .pool thumb_func_end sub_815AC8C thumb_func_start sub_815ACD0 sub_815ACD0: @ 815ACD0 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _0815ACE4 + ldr r6, =0x0203841e movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 bne _0815ACEC - ldr r4, _0815ACE8 + ldr r4, =0x02038436 b _0815ACEE .align 2, 0 -_0815ACE4: .4byte 0x0203841e -_0815ACE8: .4byte 0x02038436 + .pool _0815ACEC: - ldr r4, _0815AD40 + ldr r4, =0x02038437 _0815ACEE: ldrb r0, [r4] movs r1, 0 @@ -711037,7 +687354,7 @@ _0815ACEE: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] - ldr r2, _0815AD44 + ldr r2, =0x0203841e ldrh r0, [r2, 0x4] strh r0, [r5, 0x26] movs r3, 0 @@ -711058,15 +687375,13 @@ _0815AD26: ldrh r0, [r2, 0xA] strh r0, [r5, 0x34] strh r4, [r5, 0x36] - ldr r0, _0815AD48 + ldr r0, =sub_815AD4C + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0815AD40: .4byte 0x02038437 -_0815AD44: .4byte 0x0203841e -_0815AD48: .4byte sub_815AD4C + 1 + .pool thumb_func_end sub_815ACD0 thumb_func_start sub_815AD4C @@ -711079,7 +687394,7 @@ sub_815AD4C: @ 815AD4C movs r1, 0xFF ands r0, r1 strh r0, [r2, 0x30] - ldr r1, _0815AD94 + ldr r1, =0x08329f40 movs r3, 0x30 ldrsh r0, [r2, r3] lsls r0, 1 @@ -711106,7 +687421,7 @@ sub_815AD4C: @ 815AD4C bl move_anim_8072740 b _0815ADAA .align 2, 0 -_0815AD94: .4byte 0x08329f40 + .pool _0815AD98: lsls r0, r1, 16 asrs r0, 16 @@ -711130,21 +687445,19 @@ sub_815ADB0: @ 815ADB0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0815ADD0 + ldr r0, =0x03005e00 adds r5, r1, r0 - ldr r0, _0815ADD4 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _0815ADDC - ldr r4, _0815ADD8 + ldr r4, =0x02038436 b _0815ADDE .align 2, 0 -_0815ADD0: .4byte 0x03005e00 -_0815ADD4: .4byte 0x0203841e -_0815ADD8: .4byte 0x02038436 + .pool _0815ADDC: - ldr r4, _0815AE24 + ldr r4, =0x02038437 _0815ADDE: ldrb r0, [r4] bl sub_80A6190 @@ -711170,21 +687483,19 @@ _0815AE08: strh r0, [r5, 0xE] movs r0, 0x8 strh r0, [r5, 0x10] - ldr r1, _0815AE28 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] strh r0, [r5, 0x12] strh r2, [r5, 0x14] strh r2, [r5, 0x16] cmp r7, 0x1 bne _0815AE30 - ldr r0, _0815AE2C + ldr r0, =0x02022e18 b _0815AE32 .align 2, 0 -_0815AE24: .4byte 0x02038437 -_0815AE28: .4byte 0x0203841e -_0815AE2C: .4byte 0x02022e18 + .pool _0815AE30: - ldr r0, _0815AE50 + ldr r0, =0x02022e1c _0815AE32: ldrh r2, [r0] strh r2, [r5, 0x18] @@ -711201,7 +687512,7 @@ _0815AE32: ldrh r3, [r5, 0x18] b _0815AE58 .align 2, 0 -_0815AE50: .4byte 0x02022e1c + .pool _0815AE54: strh r2, [r5, 0x1E] ldrh r3, [r5, 0x1A] @@ -711215,7 +687526,7 @@ _0815AE58: ldrsh r0, [r5, r6] cmp r1, r0 bgt _0815AE8E - ldr r4, _0815AE98 + ldr r4, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r0, r4 @@ -711237,16 +687548,15 @@ _0815AE74: _0815AE8E: cmp r7, 0x1 bne _0815AEA0 - ldr r0, _0815AE9C + ldr r0, =0x04000014 b _0815AEA2 .align 2, 0 -_0815AE98: .4byte 0x02038c28 -_0815AE9C: .4byte 0x04000014 + .pool _0815AEA0: - ldr r0, _0815AECC + ldr r0, =0x04000018 _0815AEA2: str r0, [sp] - ldr r0, _0815AED0 + ldr r0, =0xa2600001 str r0, [sp, 0x4] mov r1, sp movs r2, 0 @@ -711258,16 +687568,14 @@ _0815AEA2: ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, _0815AED4 + ldr r0, =sub_815AED8 + 1 str r0, [r5] add sp, 0xC pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0815AECC: .4byte 0x04000018 -_0815AED0: .4byte 0xa2600001 -_0815AED4: .4byte sub_815AED8 + 1 + .pool thumb_func_end sub_815ADB0 thumb_func_start sub_815AED8 @@ -711278,7 +687586,7 @@ sub_815AED8: @ 815AED8 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _0815AF28 + ldr r1, =0x03005e00 adds r4, r0, r1 ldrh r0, [r4, 0x8] ldrh r1, [r4, 0x12] @@ -711314,7 +687622,7 @@ _0815AF00: strh r0, [r4, 0x26] b _0815AF30 .align 2, 0 -_0815AF28: .4byte 0x03005e00 + .pool _0815AF2C: subs r0, r1, 0x1 strh r0, [r4, 0x10] @@ -711352,7 +687660,7 @@ _0815AF5C: ldrsh r0, [r4, r2] cmp r1, r0 bge _0815AF90 - ldr r5, _0815AFE8 + ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -711380,7 +687688,7 @@ _0815AF90: ldrsh r0, [r4, r2] cmp r1, r0 bgt _0815AFC4 - ldr r5, _0815AFE8 + ldr r5, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r6, r5, r0 @@ -711409,7 +687717,7 @@ _0815AFC4: ldrsh r0, [r4, r1] cmp r0, 0 beq _0815AFDA - ldr r1, _0815AFEC + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] _0815AFDA: @@ -711420,8 +687728,7 @@ _0815AFE0: pop {r0} bx r0 .align 2, 0 -_0815AFE8: .4byte 0x02038c28 -_0815AFEC: .4byte 0x02039b28 + .pool thumb_func_end sub_815AED8 thumb_func_start sub_815AFF0 @@ -711432,12 +687739,12 @@ sub_815AFF0: @ 815AFF0 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0815B044 + ldr r0, =0x03005e00 adds r4, r0 movs r5, 0 strh r5, [r4, 0x8] strh r5, [r4, 0xA] - ldr r6, _0815B048 + ldr r6, =0x02038436 ldrb r0, [r6] movs r1, 0x2 bl sub_80A5C6C @@ -711452,7 +687759,7 @@ sub_815AFF0: @ 815AFF0 strh r0, [r4, 0xE] movs r0, 0x20 strh r0, [r4, 0x10] - ldr r0, _0815B04C + ldr r0, =0x0000ffec strh r0, [r4, 0x12] strh r5, [r4, 0x14] movs r0, 0 @@ -711460,16 +687767,13 @@ sub_815AFF0: @ 815AFF0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r0, _0815B050 + ldr r0, =sub_815B054 + 1 str r0, [r4] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0815B044: .4byte 0x03005e00 -_0815B048: .4byte 0x02038436 -_0815B04C: .4byte 0x0000ffec -_0815B050: .4byte sub_815B054 + 1 + .pool thumb_func_end sub_815AFF0 thumb_func_start sub_815B054 @@ -711483,7 +687787,7 @@ sub_815B054: @ 815B054 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0815B080 + ldr r1, =0x03005e00 adds r6, r0, r1 movs r1, 0x8 ldrsh r0, [r6, r1] @@ -711492,13 +687796,12 @@ sub_815B054: @ 815B054 b _0815B22E _0815B074: lsls r0, 2 - ldr r1, _0815B084 + ldr r1, =_0815B088 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815B080: .4byte 0x03005e00 -_0815B084: .4byte _0815B088 + .pool .align 2, 0 _0815B088: .4byte _0815B0A0 @@ -711529,7 +687832,7 @@ _0815B0BC: ldrh r2, [r6, 0x12] ldrh r0, [r6, 0xE] adds r2, r0 - ldr r0, _0815B150 + ldr r0, =0x08593114 lsls r1, 16 asrs r1, 16 lsls r2, 16 @@ -711552,7 +687855,7 @@ _0815B0BC: bl audio_play_and_stuff cmp r4, 0x40 beq _0815B120 - ldr r5, _0815B154 + ldr r5, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -711569,7 +687872,7 @@ _0815B0BC: strb r0, [r3] adds r5, 0x1C adds r1, r5 - ldr r0, _0815B158 + ldr r0, =nullsub_12 + 1 str r0, [r1] _0815B120: ldrh r1, [r6, 0xA] @@ -711588,7 +687891,7 @@ _0815B138: ldrh r1, [r6, 0x26] lsls r1, 24 lsrs r1, 24 - ldr r2, _0815B15C + ldr r2, =0x085ce2a0 adds r0, r6, 0 bl sub_80A7CFC ldrh r0, [r6, 0xA] @@ -711597,10 +687900,7 @@ _0815B138: strh r4, [r6, 0x8] b _0815B22E .align 2, 0 -_0815B150: .4byte 0x08593114 -_0815B154: .4byte 0x02020630 -_0815B158: .4byte nullsub_12 + 1 -_0815B15C: .4byte 0x085ce2a0 + .pool _0815B160: adds r0, r6, 0 bl sub_80A7D34 @@ -711654,7 +687954,7 @@ _0815B1B2: _0815B1B8: movs r5, 0 movs r7, 0 - ldr r3, _0815B214 + ldr r3, =0x02020630 movs r0, 0x1C adds r0, r3 mov r8, r0 @@ -711666,7 +687966,7 @@ _0815B1C4: adds r0, 0x14 adds r0, r4, r0 ldr r1, [r0] - ldr r0, _0815B218 + ldr r0, =0x08593114 cmp r1, r0 bne _0815B200 adds r0, r4, r3 @@ -711679,7 +687979,7 @@ _0815B1C4: bl obj_anim_image_start mov r0, r8 adds r1, r4, r0 - ldr r0, _0815B21C + ldr r0, =sub_815B23C + 1 str r0, [r1] adds r0, r7, 0x1 lsls r0, 16 @@ -711700,9 +688000,7 @@ _0815B20A: strh r0, [r6, 0x8] b _0815B22E .align 2, 0 -_0815B214: .4byte 0x02020630 -_0815B218: .4byte 0x08593114 -_0815B21C: .4byte sub_815B23C + 1 + .pool _0815B220: movs r1, 0x14 ldrsh r0, [r6, r1] @@ -711729,7 +688027,7 @@ sub_815B23C: @ 815B23C ands r0, r1 cmp r0, 0 beq _0815B270 - ldr r3, _0815B278 + ldr r3, =0x03005e00 movs r0, 0x30 ldrsh r1, [r4, r0] lsls r1, 1 @@ -711751,7 +688049,7 @@ _0815B270: pop {r0} bx r0 .align 2, 0 -_0815B278: .4byte 0x03005e00 + .pool thumb_func_end sub_815B23C thumb_func_start sub_815B27C @@ -711810,7 +688108,7 @@ _0815B2D8: ldrsh r0, [r5, r1] cmp r0, 0x3D bne _0815B324 - ldr r1, _0815B32C + ldr r1, =move_anim_8072740 + 1 adds r0, r5, 0 bl oamt_set_x3A_32 ldrh r0, [r5, 0x24] @@ -711826,7 +688124,7 @@ _0815B2D8: strh r1, [r5, 0x26] movs r0, 0x14 strh r0, [r5, 0x2E] - ldr r4, _0815B330 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -711839,16 +688137,14 @@ _0815B2D8: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - ldr r0, _0815B334 + ldr r0, =sub_80A6EEC + 1 str r0, [r5, 0x1C] _0815B324: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815B32C: .4byte move_anim_8072740 + 1 -_0815B330: .4byte 0x02038437 -_0815B334: .4byte sub_80A6EEC + 1 + .pool thumb_func_end sub_815B27C thumb_func_start sub_815B338 @@ -711856,7 +688152,7 @@ sub_815B338: @ 815B338 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0815B358 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -711869,14 +688165,14 @@ sub_815B338: @ 815B338 beq _0815B37C b _0815B38E .align 2, 0 -_0815B358: .4byte 0x03005e00 + .pool _0815B35C: movs r0, 0 bl obj_id_for_side_relative_to_move adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _0815B378 + ldr r2, =0x085ce350 adds r0, r4, 0 bl sub_80A7CFC ldrh r0, [r4, 0x8] @@ -711884,7 +688180,7 @@ _0815B35C: strh r0, [r4, 0x8] b _0815B38E .align 2, 0 -_0815B378: .4byte 0x085ce350 + .pool _0815B37C: adds r0, r4, 0 bl sub_80A7D34 @@ -711923,7 +688219,7 @@ _0815B3B4: beq _0815B478 b _0815B496 _0815B3BE: - ldr r4, _0815B3F0 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -711945,7 +688241,7 @@ _0815B3BE: strh r0, [r5, 0x32] b _0815B46C .align 2, 0 -_0815B3F0: .4byte 0x02038436 + .pool _0815B3F4: ldrh r0, [r5, 0x30] adds r0, 0x60 @@ -711993,7 +688289,7 @@ _0815B424: bne _0815B496 movs r0, 0 strh r0, [r5, 0x34] - ldr r1, _0815B474 + ldr r1, =0x02020630 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -712011,7 +688307,7 @@ _0815B46C: strh r0, [r5, 0x2E] b _0815B496 .align 2, 0 -_0815B474: .4byte 0x02020630 + .pool _0815B478: ldrh r0, [r5, 0x26] subs r0, 0x6 @@ -712037,17 +688333,16 @@ _0815B496: sub_815B49C: @ 815B49C push {r4,lr} adds r4, r0, 0 - ldr r0, _0815B4B4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0815B4BC - ldr r0, _0815B4B8 + ldr r0, =0x0000fff0 b _0815B4C0 .align 2, 0 -_0815B4B4: .4byte 0x02038436 -_0815B4B8: .4byte 0x0000fff0 + .pool _0815B4BC: movs r0, 0x80 lsls r0, 1 @@ -712055,13 +688350,13 @@ _0815B4C0: strh r0, [r4, 0x20] movs r0, 0 strh r0, [r4, 0x22] - ldr r0, _0815B4D0 + ldr r0, =sub_815B4D4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0815B4D0: .4byte sub_815B4D4 + 1 + .pool thumb_func_end sub_815B49C thumb_func_start sub_815B4D4 @@ -712071,7 +688366,7 @@ sub_815B4D4: @ 815B4D4 ldrh r0, [r4, 0x2E] adds r0, 0x48 strh r0, [r4, 0x2E] - ldr r0, _0815B4F4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -712082,7 +688377,7 @@ sub_815B4D4: @ 815B4D4 asrs r0, 20 b _0815B500 .align 2, 0 -_0815B4F4: .4byte 0x02038436 + .pool _0815B4F8: ldrh r0, [r4, 0x2E] lsls r0, 16 @@ -712108,7 +688403,7 @@ _0815B500: lsls r0, 16 cmp r0, 0 bne _0815B54C - ldr r0, _0815B56C + ldr r0, =0x085ce3a0 ldrh r1, [r4, 0x24] ldrh r2, [r4, 0x20] adds r1, r2 @@ -712143,7 +688438,7 @@ _0815B566: pop {r0} bx r0 .align 2, 0 -_0815B56C: .4byte 0x085ce3a0 + .pool thumb_func_end sub_815B4D4 thumb_func_start sub_815B570 @@ -712166,10 +688461,10 @@ _0815B58A: lsrs r1, 22 adds r1, 0x5 _0815B592: - ldr r3, _0815B5C4 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _0815B5C8 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] @@ -712186,15 +688481,13 @@ _0815B5B4: lsls r0, 24 asrs r0, 24 strh r0, [r4, 0x26] - ldr r0, _0815B5CC + ldr r0, =sub_815B5D0 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0815B5C4: .4byte 0x000003ff -_0815B5C8: .4byte 0xfffffc00 -_0815B5CC: .4byte sub_815B5D0 + 1 + .pool thumb_func_end sub_815B570 thumb_func_start sub_815B5D0 @@ -712255,7 +688548,7 @@ _0815B628: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _0815B658 + ldr r0, =0x0000ffff strh r0, [r3, 0x30] _0815B640: ldrh r0, [r3, 0x30] @@ -712273,7 +688566,7 @@ _0815B654: pop {r0} bx r0 .align 2, 0 -_0815B658: .4byte 0x0000ffff + .pool thumb_func_end sub_815B5D0 thumb_func_start sub_815B65C @@ -712282,7 +688575,7 @@ sub_815B65C: @ 815B65C lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _0815B694 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -712296,7 +688589,7 @@ sub_815B65C: @ 815B65C adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _0815B698 + ldr r2, =0x085ce3b8 adds r0, r4, 0 bl sub_80A7CFC ldrh r0, [r4, 0x8] @@ -712304,8 +688597,7 @@ sub_815B65C: @ 815B65C strh r0, [r4, 0x8] b _0815B6AE .align 2, 0 -_0815B694: .4byte 0x03005e00 -_0815B698: .4byte 0x085ce3b8 + .pool _0815B69C: adds r0, r4, 0 bl sub_80A7D34 @@ -712326,7 +688618,7 @@ sub_815B6B4: @ 815B6B4 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _0815B6EC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -712340,7 +688632,7 @@ sub_815B6B4: @ 815B6B4 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _0815B6F0 + ldr r2, =0x085ce3e0 adds r0, r4, 0 bl sub_80A7CFC ldrh r0, [r4, 0x8] @@ -712348,8 +688640,7 @@ sub_815B6B4: @ 815B6B4 strh r0, [r4, 0x8] b _0815B706 .align 2, 0 -_0815B6EC: .4byte 0x03005e00 -_0815B6F0: .4byte 0x085ce3e0 + .pool _0815B6F4: adds r0, r4, 0 bl sub_80A7D34 @@ -712382,7 +688673,7 @@ _0815B71E: movs r0, 0x90 lsls r0, 4 strh r0, [r4, 0x30] - ldr r0, _0815B744 + ldr r0, =0x02038436 ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -712394,7 +688685,7 @@ _0815B71E: strh r0, [r4, 0x2E] b _0815B770 .align 2, 0 -_0815B744: .4byte 0x02038436 + .pool _0815B748: ldrh r2, [r4, 0x30] lsls r1, r2, 16 @@ -712427,7 +688718,7 @@ sub_815B778: @ 815B778 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _0815B7B0 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -712441,7 +688732,7 @@ sub_815B778: @ 815B778 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _0815B7B4 + ldr r2, =0x085ce430 adds r0, r4, 0 bl sub_80A7CFC ldrh r0, [r4, 0x8] @@ -712449,8 +688740,7 @@ sub_815B778: @ 815B778 strh r0, [r4, 0x8] b _0815B7CA .align 2, 0 -_0815B7B0: .4byte 0x03005e00 -_0815B7B4: .4byte 0x085ce430 + .pool _0815B7B8: adds r0, r4, 0 bl sub_80A7D34 @@ -712475,7 +688765,7 @@ sub_815B7D0: @ 815B7D0 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _0815B800 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -712488,13 +688778,12 @@ sub_815B7D0: @ 815B7D0 b _0815BAFC _0815B7F6: lsls r0, 2 - ldr r1, _0815B804 + ldr r1, =_0815B808 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815B800: .4byte 0x03005e00 -_0815B804: .4byte _0815B808 + .pool .align 2, 0 _0815B808: .4byte _0815B81C @@ -712506,7 +688795,7 @@ _0815B81C: movs r0, 0x4C movs r1, 0 bl lcd_io_set - ldr r0, _0815B840 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -712519,26 +688808,25 @@ _0815B81C: bl lcd_bg_operations b _0815B84E .align 2, 0 -_0815B840: .4byte 0x02038436 + .pool _0815B844: movs r0, 0x2 movs r1, 0x2 movs r2, 0x1 bl lcd_bg_operations _0815B84E: - ldr r0, _0815B864 + ldr r0, =0x03005e00 mov r6, r8 lsls r1, r6, 2 add r1, r8 lsls r1, 3 adds r1, r0 - ldr r0, _0815B868 + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r1, 0x1C] b _0815BA26 .align 2, 0 -_0815B864: .4byte 0x03005e00 -_0815B868: .4byte 0x0203841e + .pool _0815B86C: mov r1, r8 lsls r0, r1, 2 @@ -712572,9 +688860,9 @@ _0815B886: _0815B8A6: b _0815BA7A _0815B8A8: - ldr r5, _0815B8D8 + ldr r5, =0x02038436 ldrb r0, [r5] - ldr r1, _0815B8DC + ldr r1, =0x02038437 ldrb r1, [r1] mov r2, r8 lsls r4, r2, 2 @@ -712594,21 +688882,20 @@ _0815B8A8: movs r1, 0 b _0815B8EA .align 2, 0 -_0815B8D8: .4byte 0x02038436 -_0815B8DC: .4byte 0x02038437 + .pool _0815B8E0: ldrb r0, [r5] bl battle_get_per_side_status lsls r0, 24 lsrs r1, r0, 24 _0815B8EA: - ldr r0, _0815B9CC + ldr r0, =0x020244d4 ldr r2, [r0] lsls r0, r1, 2 adds r2, 0x4 adds r2, r0 - ldr r1, _0815B9D0 - ldr r0, _0815B9D4 + ldr r1, =0x020244e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -712616,7 +688903,7 @@ _0815B8EA: ldr r0, [r2] adds r0, r1 ldr r1, [sp] - ldr r2, _0815B9D8 + ldr r2, =0x04000200 bl CpuSet ldr r1, [sp] movs r2, 0x80 @@ -712629,7 +688916,7 @@ _0815B8EA: lsls r0, 24 cmp r0, 0 beq _0815BA1C - ldr r5, _0815B9DC + ldr r5, =0x02039f34 ldr r0, [r5] ldr r0, [r0, 0x18] ldrh r0, [r0] @@ -712691,7 +688978,7 @@ _0815B988: cmp r5, 0x7 ble _0815B980 _0815B99C: - ldr r0, _0815B9DC + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldrh r0, [r0, 0x2] @@ -712699,9 +688986,9 @@ _0815B99C: lsls r0, 24 cmp r0, 0 beq _0815B9EC - ldr r3, _0815B9E0 - ldr r4, _0815B9E4 - ldr r2, _0815B9D4 + ldr r3, =0x02020630 + ldr r4, =0x020241e4 + ldr r2, =0x02038436 ldrb r0, [r2] adds r0, r4 ldrb r1, [r0] @@ -712711,21 +688998,14 @@ _0815B99C: adds r1, r3, 0 adds r1, 0x10 adds r0, r1 - ldr r1, _0815B9E8 + ldr r1, =0x082ff6c0 b _0815BA06 .align 2, 0 -_0815B9CC: .4byte 0x020244d4 -_0815B9D0: .4byte 0x020244e4 -_0815B9D4: .4byte 0x02038436 -_0815B9D8: .4byte 0x04000200 -_0815B9DC: .4byte 0x02039f34 -_0815B9E0: .4byte 0x02020630 -_0815B9E4: .4byte 0x020241e4 -_0815B9E8: .4byte 0x082ff6c0 + .pool _0815B9EC: - ldr r3, _0815BA30 - ldr r4, _0815BA34 - ldr r2, _0815BA38 + ldr r3, =0x02020630 + ldr r4, =0x020241e4 + ldr r2, =0x02038436 ldrb r0, [r2] adds r0, r4 ldrb r1, [r0] @@ -712735,7 +689015,7 @@ _0815B9EC: adds r1, r3, 0 adds r1, 0x10 adds r0, r1 - ldr r1, _0815BA3C + ldr r1, =0x082ff694 _0815BA06: str r1, [r0] ldrb r0, [r2] @@ -712748,7 +689028,7 @@ _0815BA06: movs r1, 0 bl sub_8008258 _0815BA1C: - ldr r0, _0815BA40 + ldr r0, =0x03005e00 mov r1, r9 add r1, r8 lsls r1, 3 @@ -712759,11 +689039,7 @@ _0815BA26: strh r0, [r1, 0x8] b _0815BAFC .align 2, 0 -_0815BA30: .4byte 0x02020630 -_0815BA34: .4byte 0x020241e4 -_0815BA38: .4byte 0x02038436 -_0815BA3C: .4byte 0x082ff694 -_0815BA40: .4byte 0x03005e00 + .pool _0815BA44: mov r1, r8 lsls r0, r1, 2 @@ -712800,7 +689076,7 @@ _0815BA82: movs r0, 0x4C movs r1, 0 bl lcd_io_set - ldr r0, _0815BAA8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 @@ -712813,7 +689089,7 @@ _0815BA82: bl lcd_bg_operations b _0815BAB6 .align 2, 0 -_0815BAA8: .4byte 0x02038436 + .pool _0815BAAC: movs r0, 0x2 movs r1, 0x2 @@ -712824,14 +689100,14 @@ _0815BAB6: lsls r0, 24 cmp r0, 0 bne _0815BAF6 - ldr r4, _0815BB0C + ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0815BAF6 - ldr r0, _0815BB10 + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 add r1, r8 @@ -712842,7 +689118,7 @@ _0815BAB6: cmp r0, 0 bne _0815BAF6 ldrb r0, [r4] - ldr r1, _0815BB14 + ldr r1, =0x020244d0 ldr r1, [r1] ldr r2, [r1] lsls r1, r0, 2 @@ -712861,9 +689137,7 @@ _0815BAFC: pop {r0} bx r0 .align 2, 0 -_0815BB0C: .4byte 0x02038436 -_0815BB10: .4byte 0x03005e00 -_0815BB14: .4byte 0x020244d0 + .pool thumb_func_end sub_815B7D0 thumb_func_start c3_80DFBE4 @@ -712871,10 +689145,10 @@ c3_80DFBE4: @ 815BB18 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _0815BB48 - ldr r3, _0815BB4C - ldr r2, _0815BB50 - ldr r1, _0815BB54 + ldr r4, =0x0203841e + ldr r3, =0x02020630 + ldr r2, =0x020241e4 + ldr r1, =0x02038436 ldrb r1, [r1] adds r1, r2 ldrb r2, [r1] @@ -712892,10 +689166,7 @@ c3_80DFBE4: @ 815BB18 pop {r0} bx r0 .align 2, 0 -_0815BB48: .4byte 0x0203841e -_0815BB4C: .4byte 0x02020630 -_0815BB50: .4byte 0x020241e4 -_0815BB54: .4byte 0x02038436 + .pool thumb_func_end c3_80DFBE4 thumb_func_start sub_815BB58 @@ -712904,9 +689175,9 @@ sub_815BB58: @ 815BB58 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0815BB7C + ldr r0, =0x02038436 ldrb r0, [r0] - ldr r1, _0815BB80 + ldr r1, =0x02038437 ldrb r1, [r1] movs r2, 0x1 bl sub_805E448 @@ -712916,8 +689187,7 @@ sub_815BB58: @ 815BB58 pop {r0} bx r0 .align 2, 0 -_0815BB7C: .4byte 0x02038436 -_0815BB80: .4byte 0x02038437 + .pool thumb_func_end sub_815BB58 thumb_func_start sub_815BB84 @@ -712926,7 +689196,7 @@ sub_815BB84: @ 815BB84 sub sp, 0x10 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0815BBAC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -712939,13 +689209,12 @@ sub_815BB84: @ 815BB84 b _0815BDF2 _0815BBA2: lsls r0, 2 - ldr r1, _0815BBB0 + ldr r1, =_0815BBB4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815BBAC: .4byte 0x03005e00 -_0815BBB0: .4byte _0815BBB4 + .pool .align 2, 0 _0815BBB4: .4byte _0815BBC8 @@ -712954,7 +689223,7 @@ _0815BBB4: .4byte _0815BD72 .4byte _0815BDA6 _0815BBC8: - ldr r1, _0815BC24 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -712980,7 +689249,7 @@ _0815BBC8: _0815BC02: mov r0, sp bl sub_80A6B30 - ldr r1, _0815BC28 + ldr r1, =0x08c2a6ec mov r0, sp movs r2, 0 bl sub_80A6D60 @@ -712988,72 +689257,62 @@ _0815BC02: lsls r0, 24 cmp r0, 0 beq _0815BC34 - ldr r1, _0815BC2C - ldr r3, _0815BC30 + ldr r1, =0x02022e18 + ldr r3, =0x0000ffc8 b _0815BC5C .align 2, 0 -_0815BC24: .4byte 0x00003f42 -_0815BC28: .4byte 0x08c2a6ec -_0815BC2C: .4byte 0x02022e18 -_0815BC30: .4byte 0x0000ffc8 + .pool _0815BC34: - ldr r0, _0815BC4C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 beq _0815BC58 - ldr r1, _0815BC50 - ldr r2, _0815BC54 + ldr r1, =0x02022e18 + ldr r2, =0x0000ff79 adds r0, r2, 0 b _0815BC5E .align 2, 0 -_0815BC4C: .4byte 0x02038436 -_0815BC50: .4byte 0x02022e18 -_0815BC54: .4byte 0x0000ff79 + .pool _0815BC58: - ldr r1, _0815BCA0 - ldr r3, _0815BCA4 + ldr r1, =0x02022e18 + ldr r3, =0x0000fff6 _0815BC5C: adds r0, r3, 0 _0815BC5E: strh r0, [r1] - ldr r1, _0815BCA8 + ldr r1, =0x02022e1a movs r0, 0 strh r0, [r1] mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _0815BCAC + ldr r1, =0x08c2a634 mov r2, sp ldrh r2, [r2, 0xA] bl sub_80A6CC0 - ldr r0, _0815BCB0 + ldr r0, =0x08c2a6d4 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette - ldr r0, _0815BCB4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0815BCA0 + ldr r0, =0x02022e18 ldrh r0, [r0] strh r0, [r1, 0x1C] - ldr r0, _0815BCA8 + ldr r0, =0x02022e1a ldrh r0, [r0] strh r0, [r1, 0x1E] ldrh r0, [r1, 0x8] adds r0, 0x1 b _0815BD8E .align 2, 0 -_0815BCA0: .4byte 0x02022e18 -_0815BCA4: .4byte 0x0000fff6 -_0815BCA8: .4byte 0x02022e1a -_0815BCAC: .4byte 0x08c2a634 -_0815BCB0: .4byte 0x08c2a6d4 -_0815BCB4: .4byte 0x03005e00 + .pool _0815BCB8: lsls r0, r4, 2 adds r0, r4 @@ -713123,8 +689382,8 @@ _0815BD20: ldrsh r0, [r4, r2] cmp r0, 0 bne _0815BDF2 - ldr r2, _0815BD64 - ldr r1, _0815BD68 + ldr r2, =0x02022e18 + ldr r1, =0x085ce460 movs r3, 0xC ldrsh r0, [r4, r3] adds r0, r1 @@ -713144,8 +689403,7 @@ _0815BD20: strh r0, [r4, 0x8] b _0815BDF2 .align 2, 0 -_0815BD64: .4byte 0x02022e18 -_0815BD68: .4byte 0x085ce460 + .pool _0815BD6C: movs r0, 0x3 strh r0, [r4, 0x8] @@ -713195,10 +689453,10 @@ _0815BDC8: movs r1, 0x4 movs r2, 0x1 bl lcd_bg_operations - ldr r0, _0815BDFC + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r0, _0815BE00 + ldr r0, =0x02022e1a strh r1, [r0] movs r0, 0x50 movs r1, 0 @@ -713214,8 +689472,7 @@ _0815BDF2: pop {r0} bx r0 .align 2, 0 -_0815BDFC: .4byte 0x02022e18 -_0815BE00: .4byte 0x02022e1a + .pool thumb_func_end sub_815BB84 thumb_func_start sub_815BE04 @@ -713241,7 +689498,7 @@ sub_815BE04: @ 815BE04 lsls r0, 16 lsrs r5, r0, 16 _0815BE2E: - ldr r4, _0815BF28 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -713256,12 +689513,12 @@ _0815BE2E: lsrs r0, 24 adds r0, 0x20 strh r0, [r7, 0x22] - ldr r1, _0815BF2C + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r7, 0x30] ldrh r0, [r1, 0x2] strh r0, [r7, 0x32] - ldr r4, _0815BF30 + ldr r4, =0x085ce48c movs r0, 0x20 ldrsh r1, [r7, r0] movs r0, 0x22 @@ -713298,7 +689555,7 @@ _0815BE2E: lsls r2, r0, 4 add r2, r9 lsls r2, 2 - ldr r1, _0815BF34 + ldr r1, =0x02020630 mov r10, r1 adds r5, r2, r1 adds r0, r5, 0 @@ -713314,7 +689571,7 @@ _0815BE2E: adds r0, r4, 0 movs r1, 0x2 bl obj_anim_image_start - ldr r1, _0815BF2C + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r5, 0x30] ldrh r0, [r1, 0x2] @@ -713323,7 +689580,7 @@ _0815BE2E: strh r0, [r4, 0x30] ldrh r0, [r1, 0x2] strh r0, [r4, 0x32] - ldr r0, _0815BF38 + ldr r0, =0x0000ffff strh r0, [r5, 0x3C] movs r0, 0x1 negs r0, r0 @@ -713341,7 +689598,7 @@ _0815BE2E: add r10, r0 ldr r2, [sp] add r2, r10 - ldr r0, _0815BF3C + ldr r0, =sub_815C050 + 1 str r0, [r2] add r6, r10 str r0, [r6] @@ -713349,7 +689606,7 @@ _0815BE2E: strh r1, [r7, 0x3A] mov r0, r8 strh r0, [r7, 0x3C] - ldr r0, _0815BF40 + ldr r0, =sub_815BF44 + 1 str r0, [r7, 0x1C] add sp, 0x4 pop {r3-r5} @@ -713360,13 +689617,7 @@ _0815BE2E: pop {r0} bx r0 .align 2, 0 -_0815BF28: .4byte 0x02038436 -_0815BF2C: .4byte 0x0203841e -_0815BF30: .4byte 0x085ce48c -_0815BF34: .4byte 0x02020630 -_0815BF38: .4byte 0x0000ffff -_0815BF3C: .4byte sub_815C050 + 1 -_0815BF40: .4byte sub_815BF44 + 1 + .pool thumb_func_end sub_815BE04 thumb_func_start sub_815BF44 @@ -713394,7 +689645,7 @@ sub_815BF44: @ 815BF44 negs r1, r1 cmp r0, r1 bge _0815BF92 - ldr r2, _0815BFEC + ldr r2, =0x02020630 movs r0, 0x3A ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -713421,7 +689672,7 @@ _0815BF92: negs r0, r0 cmp r1, r0 bge _0815BFC6 - ldr r2, _0815BFEC + ldr r2, =0x02020630 movs r0, 0x3C ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -713453,21 +689704,20 @@ _0815BFC6: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _0815BFF0 + ldr r0, =sub_815BFF4 + 1 str r0, [r3, 0x1C] _0815BFE8: pop {r0} bx r0 .align 2, 0 -_0815BFEC: .4byte 0x02020630 -_0815BFF0: .4byte sub_815BFF4 + 1 + .pool thumb_func_end sub_815BF44 thumb_func_start sub_815BFF4 sub_815BFF4: @ 815BFF4 push {r4-r6,lr} adds r4, r0, 0 - ldr r5, _0815C048 + ldr r5, =0x02020630 movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -713477,7 +689727,7 @@ sub_815BFF4: @ 815BFF4 adds r6, 0x1C adds r0, r3, r6 ldr r2, [r0] - ldr r0, _0815C04C + ldr r0, =nullsub_12 + 1 cmp r2, r0 bne _0815C040 movs r1, 0x3C @@ -713505,8 +689755,7 @@ _0815C040: pop {r0} bx r0 .align 2, 0 -_0815C048: .4byte 0x02020630 -_0815C04C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_815BFF4 thumb_func_start sub_815C050 @@ -713547,13 +689796,13 @@ sub_815C050: @ 815C050 orrs r0, r1 mov r1, r12 strb r0, [r1] - ldr r0, _0815C0A0 + ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] _0815C09C: pop {r0} bx r0 .align 2, 0 -_0815C0A0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_815C050 thumb_func_start sub_815C0A4 @@ -713562,7 +689811,7 @@ sub_815C0A4: @ 815C0A4 sub sp, 0x10 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0815C0CC + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -713575,13 +689824,12 @@ sub_815C0A4: @ 815C0A4 b _0815C396 _0815C0C2: lsls r0, 2 - ldr r1, _0815C0D0 + ldr r1, =_0815C0D4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815C0CC: .4byte 0x03005e00 -_0815C0D0: .4byte _0815C0D4 + .pool .align 2, 0 _0815C0D4: .4byte _0815C0EC @@ -713591,10 +689839,10 @@ _0815C0D4: .4byte _0815C310 .4byte _0815C34A _0815C0EC: - ldr r1, _0815C148 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set - ldr r1, _0815C14C + ldr r1, =0x00000d03 movs r0, 0x52 bl lcd_io_set movs r0, 0x1 @@ -713616,7 +689864,7 @@ _0815C0EC: _0815C124: mov r0, sp bl sub_80A6B30 - ldr r1, _0815C150 + ldr r1, =0x08c2a6ec mov r0, sp movs r2, 0 bl sub_80A6D60 @@ -713624,18 +689872,14 @@ _0815C124: lsls r0, 24 cmp r0, 0 beq _0815C15C - ldr r1, _0815C154 - ldr r3, _0815C158 + ldr r1, =0x02022e18 + ldr r3, =0x0000ffc8 adds r0, r3, 0 b _0815C1CA .align 2, 0 -_0815C148: .4byte 0x00003f42 -_0815C14C: .4byte 0x00000d03 -_0815C150: .4byte 0x08c2a6ec -_0815C154: .4byte 0x02022e18 -_0815C158: .4byte 0x0000ffc8 + .pool _0815C15C: - ldr r0, _0815C1A0 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status lsls r0, 24 @@ -713647,104 +689891,94 @@ _0815C15C: bne _0815C1B4 cmp r4, 0x1 bne _0815C180 - ldr r1, _0815C1A4 - ldr r2, _0815C1A8 + ldr r1, =0x02022e18 + ldr r2, =0x0000ff65 adds r0, r2, 0 strh r0, [r1] _0815C180: cmp r4, 0x3 bne _0815C18C - ldr r1, _0815C1A4 - ldr r3, _0815C1AC + ldr r1, =0x02022e18 + ldr r3, =0x0000ff8d adds r0, r3, 0 strh r0, [r1] _0815C18C: cmp r4, 0 bne _0815C196 - ldr r1, _0815C1A4 + ldr r1, =0x02022e18 movs r0, 0xE strh r0, [r1] _0815C196: cmp r4, 0x2 bne _0815C1CC - ldr r1, _0815C1A4 - ldr r2, _0815C1B0 + ldr r1, =0x02022e18 + ldr r2, =0x0000ffec b _0815C1C8 .align 2, 0 -_0815C1A0: .4byte 0x02038437 -_0815C1A4: .4byte 0x02022e18 -_0815C1A8: .4byte 0x0000ff65 -_0815C1AC: .4byte 0x0000ff8d -_0815C1B0: .4byte 0x0000ffec + .pool _0815C1B4: cmp r4, 0x1 bne _0815C1C0 - ldr r1, _0815C208 - ldr r3, _0815C20C + ldr r1, =0x02022e18 + ldr r3, =0x0000ff79 adds r0, r3, 0 strh r0, [r1] _0815C1C0: cmp r4, 0 bne _0815C1CC - ldr r1, _0815C208 - ldr r2, _0815C210 + ldr r1, =0x02022e18 + ldr r2, =0x0000fff6 _0815C1C8: adds r0, r2, 0 _0815C1CA: strh r0, [r1] _0815C1CC: - ldr r1, _0815C214 + ldr r1, =0x02022e1a movs r0, 0 strh r0, [r1] mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _0815C218 + ldr r1, =0x08c2a634 mov r2, sp ldrh r2, [r2, 0xA] bl sub_80A6CC0 - ldr r0, _0815C21C + ldr r0, =0x08c2a6d4 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette - ldr r0, _0815C220 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _0815C208 + ldr r0, =0x02022e18 ldrh r0, [r0] strh r0, [r1, 0x1C] - ldr r0, _0815C214 + ldr r0, =0x02022e1a ldrh r0, [r0] strh r0, [r1, 0x1E] b _0815C2A4 .align 2, 0 -_0815C208: .4byte 0x02022e18 -_0815C20C: .4byte 0x0000ff79 -_0815C210: .4byte 0x0000fff6 -_0815C214: .4byte 0x02022e1a -_0815C218: .4byte 0x08c2a634 -_0815C21C: .4byte 0x08c2a6d4 -_0815C220: .4byte 0x03005e00 + .pool _0815C224: - ldr r1, _0815C258 + ldr r1, =0x03005e00 lsls r4, r6, 2 adds r0, r4, r6 lsls r0, 3 adds r5, r0, r1 movs r0, 0 strh r0, [r5, 0xE] - ldr r0, _0815C25C + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0815C268 - ldr r2, _0815C260 - ldr r1, _0815C264 + ldr r2, =0x02022e18 + ldr r1, =0x085ce4a4 movs r3, 0xC ldrsh r0, [r5, r3] adds r0, r1 @@ -713755,13 +689989,10 @@ _0815C224: adds r0, r5 b _0815C27A .align 2, 0 -_0815C258: .4byte 0x03005e00 -_0815C25C: .4byte 0x02038437 -_0815C260: .4byte 0x02022e18 -_0815C264: .4byte 0x085ce4a4 + .pool _0815C268: - ldr r2, _0815C298 - ldr r1, _0815C29C + ldr r2, =0x02022e18 + ldr r1, =0x085ce4a4 movs r3, 0xC ldrsh r0, [r5, r3] adds r0, r1 @@ -713771,7 +690002,7 @@ _0815C268: subs r0, r1 _0815C27A: strh r0, [r2] - ldr r0, _0815C2A0 + ldr r0, =0x03005e00 adds r1, r4, r6 lsls r1, 3 adds r1, r0 @@ -713785,9 +690016,7 @@ _0815C27A: strh r0, [r1, 0x8] b _0815C396 .align 2, 0 -_0815C298: .4byte 0x02022e18 -_0815C29C: .4byte 0x085ce4a4 -_0815C2A0: .4byte 0x03005e00 + .pool _0815C2A4: ldrh r0, [r1, 0x8] adds r0, 0x1 @@ -713831,7 +690060,7 @@ _0815C2E2: strh r1, [r4, 0xE] lsls r1, 16 asrs r1, 16 - ldr r2, _0815C30C + ldr r2, =0x085ce4a8 movs r3, 0xC ldrsh r0, [r4, r3] adds r0, r2 @@ -713844,7 +690073,7 @@ _0815C302: strh r0, [r4, 0x8] b _0815C396 .align 2, 0 -_0815C30C: .4byte 0x085ce4a8 + .pool _0815C310: lsls r0, r6, 2 adds r0, r6 @@ -713894,10 +690123,10 @@ _0815C36C: movs r1, 0x4 movs r2, 0x1 bl lcd_bg_operations - ldr r0, _0815C3A0 + ldr r0, =0x02022e18 movs r1, 0 strh r1, [r0] - ldr r0, _0815C3A4 + ldr r0, =0x02022e1a strh r1, [r0] movs r0, 0x50 movs r1, 0 @@ -713913,8 +690142,7 @@ _0815C396: pop {r0} bx r0 .align 2, 0 -_0815C3A0: .4byte 0x02022e18 -_0815C3A4: .4byte 0x02022e1a + .pool thumb_func_end sub_815C0A4 thumb_func_start sub_815C3A8 @@ -713923,7 +690151,7 @@ sub_815C3A8: @ 815C3A8 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _0815C3E0 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -713937,7 +690165,7 @@ sub_815C3A8: @ 815C3A8 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _0815C3E4 + ldr r2, =0x085ce4b0 adds r0, r4, 0 bl sub_80A7CFC ldrh r0, [r4, 0x8] @@ -713945,8 +690173,7 @@ sub_815C3A8: @ 815C3A8 strh r0, [r4, 0x8] b _0815C3FA .align 2, 0 -_0815C3E0: .4byte 0x03005e00 -_0815C3E4: .4byte 0x085ce4b0 + .pool _0815C3E8: adds r0, r4, 0 bl sub_80A7D34 @@ -713988,7 +690215,7 @@ _0815C41E: ldrh r0, [r4, 0x32] adds r0, 0x80 strh r0, [r4, 0x32] - ldr r0, _0815C44C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -714000,7 +690227,7 @@ _0815C41E: negs r0, r0 b _0815C456 .align 2, 0 -_0815C44C: .4byte 0x02038436 + .pool _0815C450: ldrh r0, [r4, 0x30] lsls r0, 16 @@ -714033,9 +690260,9 @@ sub_815C478: @ 815C478 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0815C49C + ldr r1, =0x03005e00 adds r4, r0, r1 - ldr r5, _0815C4A0 + ldr r5, =0x0203841e movs r1, 0x2 ldrsh r0, [r5, r1] cmp r0, 0 @@ -714044,8 +690271,7 @@ sub_815C478: @ 815C478 bl move_anim_task_del b _0815C538 .align 2, 0 -_0815C49C: .4byte 0x03005e00 -_0815C4A0: .4byte 0x0203841e + .pool _0815C4A4: movs r1, 0x4 ldrsh r0, [r5, r1] @@ -714093,12 +690319,12 @@ _0815C4BC: ldrsh r0, [r5, r1] cmp r0, 0 bne _0815C508 - ldr r0, _0815C504 + ldr r0, =0x02038436 b _0815C50A .align 2, 0 -_0815C504: .4byte 0x02038436 + .pool _0815C508: - ldr r0, _0815C540 + ldr r0, =0x02038437 _0815C50A: ldrb r0, [r0] bl battle_side_get_owner @@ -714120,15 +690346,14 @@ _0815C528: lsrs r0, 24 movs r1, 0 bl sub_80A7270 - ldr r0, _0815C544 + ldr r0, =sub_815C548 + 1 str r0, [r4] _0815C538: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815C540: .4byte 0x02038437 -_0815C544: .4byte sub_815C548 + 1 + .pool thumb_func_end sub_815C478 thumb_func_start sub_815C548 @@ -714139,7 +690364,7 @@ sub_815C548: @ 815C548 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0815C56C + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r6, [r4, r0] @@ -714151,7 +690376,7 @@ sub_815C548: @ 815C548 beq _0815C57C b _0815C6A8 .align 2, 0 -_0815C56C: .4byte 0x03005e00 + .pool _0815C570: cmp r6, 0x2 beq _0815C628 @@ -714161,7 +690386,7 @@ _0815C570: _0815C57A: b _0815C6A8 _0815C57C: - ldr r2, _0815C5CC + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -714200,9 +690425,9 @@ _0815C57C: strh r6, [r4, 0xA] b _0815C690 .align 2, 0 -_0815C5CC: .4byte 0x02020630 + .pool _0815C5D0: - ldr r2, _0815C624 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -714243,9 +690468,9 @@ _0815C5D0: strh r0, [r4, 0xA] b _0815C690 .align 2, 0 -_0815C624: .4byte 0x02020630 + .pool _0815C628: - ldr r2, _0815C68C + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -714293,7 +690518,7 @@ _0815C628: strh r5, [r4, 0x8] b _0815C6A8 .align 2, 0 -_0815C68C: .4byte 0x02020630 + .pool _0815C690: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -714316,7 +690541,7 @@ _0815C6A8: sub_815C6B0: @ 815C6B0 push {r4,lr} adds r4, r0, 0 - ldr r0, _0815C6CC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -714324,16 +690549,15 @@ sub_815C6B0: @ 815C6B0 cmp r0, 0 bne _0815C6D4 strh r0, [r4, 0x20] - ldr r1, _0815C6D0 + ldr r1, =0x0203841e ldrh r0, [r1] b _0815C6DE .align 2, 0 -_0815C6CC: .4byte 0x02038436 -_0815C6D0: .4byte 0x0203841e + .pool _0815C6D4: movs r0, 0xF0 strh r0, [r4, 0x20] - ldr r1, _0815C6F8 + ldr r1, =0x0203841e ldrh r0, [r1] subs r0, 0x1E _0815C6DE: @@ -714343,14 +690567,13 @@ _0815C6DE: ldrb r1, [r1, 0x2] adds r0, r4, 0 bl obj_anim_image_start - ldr r0, _0815C6FC + ldr r0, =sub_815C700 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0815C6F8: .4byte 0x0203841e -_0815C6FC: .4byte sub_815C700 + 1 + .pool thumb_func_end sub_815C6B0 thumb_func_start sub_815C700 @@ -714360,7 +690583,7 @@ sub_815C700: @ 815C700 ldrh r0, [r4, 0x2E] adds r0, 0x3 strh r0, [r4, 0x2E] - ldr r0, _0815C740 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -714386,7 +690609,7 @@ _0815C732: bl sine b _0815C768 .align 2, 0 -_0815C740: .4byte 0x02038436 + .pool _0815C744: ldrh r1, [r4, 0x20] subs r1, 0x5 @@ -714420,7 +690643,7 @@ sub_815C770: @ 815C770 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0815C7B8 + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 strh r0, [r4, 0x8] @@ -714434,7 +690657,7 @@ sub_815C770: @ 815C770 movs r0, 0x80 lsls r0, 4 strh r0, [r4, 0x24] - ldr r0, _0815C7BC + ldr r0, =0x0203841e ldrb r0, [r0] bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -714442,15 +690665,13 @@ sub_815C770: @ 815C770 strh r0, [r4, 0x26] movs r1, 0 bl sub_80A7270 - ldr r0, _0815C7C0 + ldr r0, =sub_815C7C4 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_0815C7B8: .4byte 0x03005e00 -_0815C7BC: .4byte 0x0203841e -_0815C7C0: .4byte sub_815C7C4 + 1 + .pool thumb_func_end sub_815C770 thumb_func_start sub_815C7C4 @@ -714464,7 +690685,7 @@ sub_815C7C4: @ 815C7C4 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0815C7F0 + ldr r1, =0x03005e00 adds r7, r0, r1 movs r1, 0x8 ldrsh r0, [r7, r1] @@ -714477,7 +690698,7 @@ sub_815C7C4: @ 815C7C4 beq _0815C7FC b _0815C8DA .align 2, 0 -_0815C7F0: .4byte 0x03005e00 + .pool _0815C7F4: mov r2, r8 cmp r2, 0x2 @@ -714534,7 +690755,7 @@ _0815C854: strh r0, [r7, 0xC] b _0815C8DA _0815C860: - ldr r1, _0815C8B8 + ldr r1, =0xfffffe00 adds r0, r1, 0 ldrh r2, [r7, 0xC] adds r1, r0, r2 @@ -714578,7 +690799,7 @@ _0815C8B2: strh r1, [r7, 0x8] b _0815C8DA .align 2, 0 -_0815C8B8: .4byte 0xfffffe00 + .pool _0815C8BC: lsls r0, r2, 16 asrs r0, 16 @@ -714607,7 +690828,7 @@ _0815C8DA: lsls r0, 24 lsrs r0, 24 bl sub_80A73A0 - ldr r2, _0815C948 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r7, r0] lsls r0, r1, 4 @@ -714649,7 +690870,7 @@ _0815C90E: strh r0, [r7, 0x24] b _0815C950 .align 2, 0 -_0815C948: .4byte 0x02020630 + .pool _0815C94C: movs r0, 0x2 strh r0, [r7, 0x8] @@ -714670,12 +690891,12 @@ sub_815C95C: @ 815C95C ldrsh r0, [r5, r1] cmp r0, 0 bne _0815C9BC - ldr r6, _0815C9B4 + ldr r6, =0x0203841e movs r2, 0x4 ldrsh r0, [r6, r2] cmp r0, 0 bne _0815C990 - ldr r4, _0815C9B8 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -714708,8 +690929,7 @@ _0815C990: strh r0, [r5, 0x2E] b _0815CA1A .align 2, 0 -_0815C9B4: .4byte 0x0203841e -_0815C9B8: .4byte 0x02038436 + .pool _0815C9BC: ldrh r1, [r5, 0x30] lsls r0, r1, 16 @@ -714771,7 +690991,7 @@ sub_815CA20: @ 815CA20 lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 - ldr r1, _0815CA50 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -714780,20 +691000,18 @@ sub_815CA20: @ 815CA20 ldrsh r0, [r2, r1] cmp r0, 0 bne _0815CB2C - ldr r0, _0815CA54 + ldr r0, =0x0203841e movs r3, 0 ldrsh r1, [r0, r3] mov r8, r0 cmp r1, 0 bne _0815CA5C - ldr r0, _0815CA58 + ldr r0, =0x02038436 b _0815CA5E .align 2, 0 -_0815CA50: .4byte 0x03005e00 -_0815CA54: .4byte 0x0203841e -_0815CA58: .4byte 0x02038436 + .pool _0815CA5C: - ldr r0, _0815CA98 + ldr r0, =0x02038437 _0815CA5E: ldrb r0, [r0] strh r0, [r2, 0x1E] @@ -714802,7 +691020,7 @@ _0815CA5E: bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0815CA9C + ldr r1, =0x03005e00 lsls r4, r7, 2 adds r0, r4, r7 lsls r0, 3 @@ -714823,8 +691041,7 @@ _0815CA5E: lsls r2, r5, 4 b _0815CB08 .align 2, 0 -_0815CA98: .4byte 0x02038437 -_0815CA9C: .4byte 0x03005e00 + .pool _0815CAA0: cmp r0, 0x2 beq _0815CACA @@ -714869,7 +691086,7 @@ _0815CAD2: cmp r0, 0 bne _0815CB08 _0815CAF8: - ldr r0, _0815CB24 + ldr r0, =0x02020630 lsls r2, r5, 4 adds r1, r2, r5 lsls r1, 2 @@ -714878,13 +691095,13 @@ _0815CAF8: adds r0, 0x10 strh r0, [r1, 0x26] _0815CB08: - ldr r1, _0815CB24 + ldr r1, =0x02020630 adds r0, r2, r5 lsls r0, 2 adds r0, r1 movs r1, 0x2 strh r1, [r0, 0x24] - ldr r0, _0815CB28 + ldr r0, =0x03005e00 adds r1, r4, r7 lsls r1, 3 adds r1, r0 @@ -714893,8 +691110,7 @@ _0815CB08: strh r0, [r1, 0x8] b _0815CB78 .align 2, 0 -_0815CB24: .4byte 0x02020630 -_0815CB28: .4byte 0x03005e00 + .pool _0815CB2C: ldrb r5, [r2, 0x1C] ldrh r0, [r2, 0xC] @@ -714906,7 +691122,7 @@ _0815CB2C: cmp r0, 0x3 bne _0815CB50 strh r4, [r2, 0xC] - ldr r0, _0815CB84 + ldr r0, =0x02020630 lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -714924,7 +691140,7 @@ _0815CB50: bne _0815CB78 adds r0, r5, 0 bl sub_80A7344 - ldr r1, _0815CB84 + ldr r1, =0x02020630 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -714940,7 +691156,7 @@ _0815CB78: pop {r0} bx r0 .align 2, 0 -_0815CB84: .4byte 0x02020630 + .pool thumb_func_end sub_815CA20 thumb_func_start sub_815CB88 @@ -714958,15 +691174,15 @@ sub_815CB88: @ 815CB88 lsls r1, r2, 22 lsrs r1, 22 adds r1, r0 - ldr r3, _0815CBD4 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _0815CBD8 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] bl GenerateRandomNumber2 - ldr r5, _0815CBDC + ldr r5, =0x000001ff ands r5, r0 bl GenerateRandomNumber2 movs r1, 0xFF @@ -714980,9 +691196,7 @@ sub_815CB88: @ 815CB88 adds r0, r5, r2 b _0815CBE8 .align 2, 0 -_0815CBD4: .4byte 0x000003ff -_0815CBD8: .4byte 0xfffffc00 -_0815CBDC: .4byte 0x000001ff + .pool _0815CBE0: movs r3, 0xBC lsls r3, 3 @@ -715005,30 +691219,29 @@ _0815CBFA: subs r0, r1 _0815CC02: strh r0, [r4, 0x30] - ldr r0, _0815CC14 + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r4, 0x32] lsls r0, 16 cmp r0, 0 bne _0815CC1C - ldr r0, _0815CC18 + ldr r0, =0x0000fff8 b _0815CC1E .align 2, 0 -_0815CC14: .4byte 0x0203841e -_0815CC18: .4byte 0x0000fff8 + .pool _0815CC1C: movs r0, 0xF8 _0815CC1E: strh r0, [r4, 0x20] movs r0, 0x68 strh r0, [r4, 0x22] - ldr r0, _0815CC30 + ldr r0, =sub_815CC34 + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815CC30: .4byte sub_815CC34 + 1 + .pool thumb_func_end sub_815CB88 thumb_func_start sub_815CC34 @@ -715090,17 +691303,17 @@ _0815CC8E: sub_815CC94: @ 815CC94 push {r4,r5,lr} adds r5, r0, 0 - ldr r1, _0815CCF8 + ldr r1, =0x00001f3f movs r0, 0x4A bl lcd_io_set movs r1, 0x80 lsls r1, 8 movs r0, 0 bl lcd_io_set_bits - ldr r0, _0815CCFC + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r4, _0815CD00 + ldr r4, =0x02022e26 strh r1, [r4] movs r0, 0x40 movs r1, 0 @@ -715108,7 +691321,7 @@ sub_815CC94: @ 815CC94 ldrh r1, [r4] movs r0, 0x44 bl lcd_io_set - ldr r0, _0815CD04 + ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r5, 0x2E] adds r0, r5, 0 @@ -715127,17 +691340,13 @@ sub_815CC94: @ 815CC94 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _0815CD08 + ldr r0, =sub_815CD0C + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815CCF8: .4byte 0x00001f3f -_0815CCFC: .4byte 0x02022e24 -_0815CD00: .4byte 0x02022e26 -_0815CD04: .4byte 0x0203841e -_0815CD08: .4byte sub_815CD0C + 1 + .pool thumb_func_end sub_815CC94 thumb_func_start sub_815CD0C @@ -715206,7 +691415,7 @@ _0815CD7A: strh r0, [r4, 0x30] b _0815CDAA _0815CD82: - ldr r1, _0815CDB0 + ldr r1, =0x00003f3f movs r0, 0x4A bl lcd_io_set movs r0, 0 @@ -715227,14 +691436,14 @@ _0815CDAA: pop {r0} bx r0 .align 2, 0 -_0815CDB0: .4byte 0x00003f3f + .pool thumb_func_end sub_815CD0C thumb_func_start sub_815CDB4 sub_815CDB4: @ 815CDB4 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _0815CDF0 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -715247,12 +691456,12 @@ sub_815CDB4: @ 815CDB4 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] - ldr r1, _0815CDF4 + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0x2E] ldrh r0, [r1, 0x2] strh r0, [r4, 0x30] - ldr r1, _0815CDF8 + ldr r1, =sub_815CDFC + 1 str r1, [r4, 0x1C] adds r0, r4, 0 bl _call_via_r1 @@ -715260,9 +691469,7 @@ sub_815CDB4: @ 815CDB4 pop {r0} bx r0 .align 2, 0 -_0815CDF0: .4byte 0x02038436 -_0815CDF4: .4byte 0x0203841e -_0815CDF8: .4byte sub_815CDFC + 1 + .pool thumb_func_end sub_815CDB4 thumb_func_start sub_815CDFC @@ -715295,15 +691502,15 @@ sub_815CDFC: @ 815CDFC cmp r0, 0xC3 ble _0815CE48 _0815CE36: - ldr r0, _0815CE44 + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 subs r0, 0x1 b _0815CE52 .align 2, 0 -_0815CE44: .4byte 0x02038436 + .pool _0815CE48: - ldr r0, _0815CE94 + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 adds r0, 0x1 @@ -715341,16 +691548,16 @@ _0815CE52: strh r0, [r4, 0x38] b _0815CEC8 .align 2, 0 -_0815CE94: .4byte 0x02038436 + .pool _0815CE98: cmp r2, 0x1 bne _0815CEC8 - ldr r1, _0815CED0 + ldr r1, =0xfffffc00 adds r0, r1, 0 ldrh r2, [r4, 0x32] adds r0, r2 strh r0, [r4, 0x32] - ldr r3, _0815CED4 + ldr r3, =0xffffff00 adds r0, r3, 0 ldrh r1, [r4, 0x34] adds r0, r1 @@ -715371,8 +691578,7 @@ _0815CEC8: pop {r0} bx r0 .align 2, 0 -_0815CED0: .4byte 0xfffffc00 -_0815CED4: .4byte 0xffffff00 + .pool thumb_func_end sub_815CDFC thumb_func_start sub_815CED8 @@ -715394,7 +691600,7 @@ sub_815CED8: @ 815CED8 beq _0815CF18 movs r0, 0x1 str r0, [sp, 0x1C] - ldr r0, _0815CF14 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldr r1, [r0, 0x10] @@ -715405,9 +691611,9 @@ sub_815CED8: @ 815CED8 movs r3, 0x14 b _0815D058 .align 2, 0 -_0815CF14: .4byte 0x02039f34 + .pool _0815CF18: - ldr r0, _0815CF88 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -715415,15 +691621,15 @@ _0815CF18: beq _0815CFC4 movs r0, 0 str r0, [sp, 0x1C] - ldr r6, _0815CF8C - ldr r4, _0815CF90 + ldr r6, =0x0202406e + ldr r4, =0x02038437 ldrb r0, [r4] lsls r0, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r7, _0815CF94 + ldr r7, =0x020244ec adds r0, r7 movs r1, 0 bl pokemon_getattr @@ -715437,7 +691643,7 @@ _0815CF18: movs r1, 0x1 bl pokemon_getattr mov r8, r0 - ldr r0, _0815CF98 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r2, [r4] ldr r1, [r0] @@ -715459,18 +691665,14 @@ _0815CF18: adds r0, r7 b _0815CFAA .align 2, 0 -_0815CF88: .4byte 0x02038436 -_0815CF8C: .4byte 0x0202406e -_0815CF90: .4byte 0x02038437 -_0815CF94: .4byte 0x020244ec -_0815CF98: .4byte 0x020244d0 + .pool _0815CF9C: ldrb r0, [r4] lsls r0, 1 adds r0, r6 ldrh r0, [r0] muls r0, r5 - ldr r1, _0815CFB8 + ldr r1, =0x02024744 adds r0, r1 _0815CFAA: movs r1, 0xB @@ -715479,7 +691681,7 @@ _0815CFAA: lsrs r6, r0, 16 b _0815CFBE .align 2, 0 -_0815CFB8: .4byte 0x02024744 + .pool _0815CFBC: ldrh r6, [r1, 0x2] _0815CFBE: @@ -715489,15 +691691,15 @@ _0815CFBE: _0815CFC4: movs r2, 0x1 str r2, [sp, 0x1C] - ldr r6, _0815D028 - ldr r4, _0815D02C + ldr r6, =0x0202406e + ldr r4, =0x02038437 ldrb r0, [r4] lsls r0, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r7, _0815D030 + ldr r7, =0x02024744 adds r0, r7 movs r1, 0 bl pokemon_getattr @@ -715511,7 +691713,7 @@ _0815CFC4: movs r1, 0x1 bl pokemon_getattr mov r8, r0 - ldr r0, _0815D034 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r2, [r4] ldr r1, [r0] @@ -715530,15 +691732,11 @@ _0815CFC4: adds r0, r6 ldrh r0, [r0] muls r0, r5 - ldr r1, _0815D038 + ldr r1, =0x020244ec adds r0, r1 b _0815D048 .align 2, 0 -_0815D028: .4byte 0x0202406e -_0815D02C: .4byte 0x02038437 -_0815D030: .4byte 0x02024744 -_0815D034: .4byte 0x020244d0 -_0815D038: .4byte 0x020244ec + .pool _0815D03C: ldrb r0, [r4] lsls r0, 1 @@ -715555,16 +691753,16 @@ _0815D048: _0815D054: ldrh r6, [r1, 0x2] _0815D056: - ldr r3, _0815D144 + ldr r3, =0x0000ffec _0815D058: mov r10, r3 _0815D05A: - ldr r0, _0815D148 + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A8328 lsls r0, 24 lsrs r7, r0, 24 - ldr r5, _0815D148 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -715589,7 +691787,7 @@ _0815D05A: str r3, [sp, 0x8] mov r0, r8 str r0, [sp, 0xC] - ldr r0, _0815D14C + ldr r0, =0x02038437 ldrb r0, [r0] str r0, [sp, 0x10] movs r0, 0x1 @@ -715602,7 +691800,7 @@ _0815D05A: adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _0815D150 + ldr r0, =0x02020630 lsls r5, r6, 4 adds r5, r6 lsls r5, 2 @@ -715625,7 +691823,7 @@ _0815D05A: movs r2, 0x4 orrs r0, r2 strb r0, [r5, 0x1] - ldr r0, _0815D154 + ldr r0, =0x00007fff lsrs r1, 4 lsls r1, 4 movs r3, 0x80 @@ -715643,7 +691841,7 @@ _0815D05A: lsls r1, 6 movs r0, 0x50 bl lcd_io_set - ldr r0, _0815D158 + ldr r0, =0x03005e00 ldr r1, [sp, 0x18] lsls r4, r1, 2 adds r4, r1 @@ -715659,7 +691857,7 @@ _0815D05A: movs r0, 0x52 bl lcd_io_set strh r6, [r4, 0x8] - ldr r0, _0815D15C + ldr r0, =sub_815D160 + 1 str r0, [r4] add sp, 0x20 pop {r3-r5} @@ -715670,13 +691868,7 @@ _0815D05A: pop {r0} bx r0 .align 2, 0 -_0815D144: .4byte 0x0000ffec -_0815D148: .4byte 0x02038436 -_0815D14C: .4byte 0x02038437 -_0815D150: .4byte 0x02020630 -_0815D154: .4byte 0x00007fff -_0815D158: .4byte 0x03005e00 -_0815D15C: .4byte sub_815D160 + 1 + .pool thumb_func_end sub_815CED8 thumb_func_start sub_815D160 @@ -715684,7 +691876,7 @@ sub_815D160: @ 815D160 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0815D1B4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -715717,15 +691909,14 @@ sub_815D160: @ 815D160 lsls r0, 1 strh r0, [r4, 0x1C] strh r0, [r4, 0x1E] - ldr r0, _0815D1B8 + ldr r0, =sub_815D1BC + 1 str r0, [r4] _0815D1AE: pop {r4} pop {r0} bx r0 .align 2, 0 -_0815D1B4: .4byte 0x03005e00 -_0815D1B8: .4byte sub_815D1BC + 1 + .pool thumb_func_end sub_815D160 thumb_func_start sub_815D1BC @@ -715734,7 +691925,7 @@ sub_815D1BC: @ 815D1BC sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r2, _0815D234 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -715747,7 +691938,7 @@ sub_815D1BC: @ 815D1BC ldrh r0, [r5, 0x1E] adds r0, 0x80 strh r0, [r5, 0x1E] - ldr r1, _0815D238 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -715780,7 +691971,7 @@ sub_815D1BC: @ 815D1BC bl sub_80A749C adds r0, r6, 0 bl sub_80A8610 - ldr r0, _0815D23C + ldr r0, =sub_80A6814 + 1 str r0, [r5] _0815D22A: add sp, 0x4 @@ -715788,9 +691979,7 @@ _0815D22A: pop {r0} bx r0 .align 2, 0 -_0815D234: .4byte 0x03005e00 -_0815D238: .4byte 0x02020630 -_0815D23C: .4byte sub_80A6814 + 1 + .pool thumb_func_end sub_815D1BC thumb_func_start sub_815D240 @@ -715802,21 +691991,19 @@ sub_815D240: @ 815D240 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0815D260 + ldr r0, =0x03005e00 adds r4, r1, r0 - ldr r0, _0815D264 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _0815D26C - ldr r0, _0815D268 + ldr r0, =0x02038436 b _0815D26E .align 2, 0 -_0815D260: .4byte 0x03005e00 -_0815D264: .4byte 0x0203841e -_0815D268: .4byte 0x02038436 + .pool _0815D26C: - ldr r0, _0815D2EC + ldr r0, =0x02038437 _0815D26E: ldrb r5, [r0] movs r6, 0 @@ -715856,7 +692043,7 @@ _0815D2B4: ldrh r0, [r4, 0x22] adds r0, 0x42 strh r0, [r4, 0x24] - ldr r0, _0815D2F0 + ldr r0, =0x0203841e ldrb r0, [r0] bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -715868,36 +692055,31 @@ _0815D2B4: lsrs r0, 24 cmp r0, 0x1 bne _0815D304 - ldr r0, _0815D2F4 + ldr r0, =0x04000014 str r0, [sp] - ldr r1, _0815D2F8 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set - ldr r0, _0815D2FC + ldr r0, =0x02022e18 ldrh r5, [r0] - ldr r0, _0815D300 + ldr r0, =0x02022e1a b _0815D316 .align 2, 0 -_0815D2EC: .4byte 0x02038437 -_0815D2F0: .4byte 0x0203841e -_0815D2F4: .4byte 0x04000014 -_0815D2F8: .4byte 0x00003f42 -_0815D2FC: .4byte 0x02022e18 -_0815D300: .4byte 0x02022e1a + .pool _0815D304: - ldr r0, _0815D37C + ldr r0, =0x04000018 str r0, [sp] - ldr r1, _0815D380 + ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set - ldr r0, _0815D384 + ldr r0, =0x02022e1c ldrh r5, [r0] - ldr r0, _0815D388 + ldr r0, =0x02022e1e _0815D316: ldrh r3, [r0] movs r7, 0 movs r2, 0 - ldr r6, _0815D38C + ldr r6, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r0, r6 @@ -715927,7 +692109,7 @@ _0815D326: asrs r0, 16 cmp r0, 0x9F ble _0815D326 - ldr r0, _0815D390 + ldr r0, =0xa6600001 str r0, [sp, 0x4] mov r1, sp movs r2, 0 @@ -715939,20 +692121,14 @@ _0815D326: ldr r1, [sp, 0x4] ldr r2, [sp, 0x8] bl sub_80BA038 - ldr r0, _0815D394 + ldr r0, =sub_815D398 + 1 str r0, [r4] add sp, 0xC pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0815D37C: .4byte 0x04000018 -_0815D380: .4byte 0x00003f44 -_0815D384: .4byte 0x02022e1c -_0815D388: .4byte 0x02022e1e -_0815D38C: .4byte 0x02038c28 -_0815D390: .4byte 0xa6600001 -_0815D394: .4byte sub_815D398 + 1 + .pool thumb_func_end sub_815D240 thumb_func_start sub_815D398 @@ -715968,7 +692144,7 @@ sub_815D398: @ 815D398 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0815D3CC + ldr r1, =0x03005e00 adds r6, r0, r1 ldrb r0, [r6, 0x12] bl battle_get_per_side_status_permutated @@ -715976,20 +692152,18 @@ sub_815D398: @ 815D398 lsrs r0, 24 cmp r0, 0x1 bne _0815D3D8 - ldr r0, _0815D3D0 + ldr r0, =0x02022e18 ldrh r0, [r0] str r0, [sp, 0x4] - ldr r0, _0815D3D4 + ldr r0, =0x02022e1a b _0815D3E0 .align 2, 0 -_0815D3CC: .4byte 0x03005e00 -_0815D3D0: .4byte 0x02022e18 -_0815D3D4: .4byte 0x02022e1a + .pool _0815D3D8: - ldr r0, _0815D3F8 + ldr r0, =0x02022e1c ldrh r0, [r0] str r0, [sp, 0x4] - ldr r0, _0815D3FC + ldr r0, =0x02022e1e _0815D3E0: ldrh r0, [r0] str r0, [sp, 0x8] @@ -716005,8 +692179,7 @@ _0815D3EE: beq _0815D40E b _0815D63C .align 2, 0 -_0815D3F8: .4byte 0x02022e1c -_0815D3FC: .4byte 0x02022e1e + .pool _0815D400: cmp r0, 0x2 bne _0815D406 @@ -716062,7 +692235,7 @@ _0815D40E: ldrsh r0, [r6, r3] cmp r1, r0 ble _0815D52E - ldr r0, _0815D584 + ldr r0, =0x02039b28 mov r10, r0 ldr r1, [sp, 0x4] lsls r0, r1, 16 @@ -716083,7 +692256,7 @@ _0815D47E: subs r0, r1 lsls r0, 7 adds r2, r0 - ldr r0, _0815D588 + ldr r0, =0x02038c28 adds r2, r0 lsls r4, 16 asrs r4, 16 @@ -716101,7 +692274,7 @@ _0815D47E: subs r0, r1 lsls r0, 7 adds r3, r0 - ldr r1, _0815D588 + ldr r1, =0x02038c28 adds r3, r1 lsls r1, r7, 16 asrs r1, 16 @@ -716111,7 +692284,7 @@ _0815D47E: lsls r2, r7, 16 asrs r2, 16 lsls r0, r2, 1 - ldr r7, _0815D58C + ldr r7, =0x08329f40 adds r0, r7 ldrh r0, [r0] lsls r0, 16 @@ -716151,7 +692324,7 @@ _0815D47E: lsls r0, 16 lsrs r0, 16 mov r9, r0 - ldr r0, _0815D590 + ldr r0, =0xffff0000 add r0, r12 lsrs r2, r0, 16 lsls r3, r2, 16 @@ -716165,7 +692338,7 @@ _0815D52E: lsls r1, r2, 17 cmp r1, 0 blt _0815D55A - ldr r4, _0815D588 + ldr r4, =0x02038c28 ldr r7, [sp, 0x4] lsls r0, r7, 16 asrs r0, 16 @@ -716207,10 +692380,7 @@ _0815D55A: strh r0, [r6, 0xE] b _0815D59A .align 2, 0 -_0815D584: .4byte 0x02039b28 -_0815D588: .4byte 0x02038c28 -_0815D58C: .4byte 0x08329f40 -_0815D590: .4byte 0xffff0000 + .pool _0815D594: ldrh r0, [r6, 0x10] adds r0, 0x1 @@ -716249,14 +692419,14 @@ _0815D5CC: asrs r0, 16 cmp r0, 0xC ble _0815D63C - ldr r1, _0815D5E8 + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] movs r0, 0 strh r0, [r6, 0xC] b _0815D62E .align 2, 0 -_0815D5E8: .4byte 0x02039b28 + .pool _0815D5EC: ldrh r0, [r6, 0xC] adds r0, 0x1 @@ -716319,30 +692489,27 @@ sub_815D64C: @ 815D64C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0815D684 + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 strh r0, [r4, 0x8] - ldr r0, _0815D688 + ldr r0, =0x0203841e ldrb r0, [r0] bl obj_id_for_side_relative_to_move adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 strh r1, [r4, 0x26] - ldr r2, _0815D68C + ldr r2, =0x085ce5f0 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, _0815D690 + ldr r0, =sub_815D694 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_0815D684: .4byte 0x03005e00 -_0815D688: .4byte 0x0203841e -_0815D68C: .4byte 0x085ce5f0 -_0815D690: .4byte sub_815D694 + 1 + .pool thumb_func_end sub_815D64C thumb_func_start sub_815D694 @@ -716353,7 +692520,7 @@ sub_815D694: @ 815D694 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r2, _0815D6EC + ldr r2, =0x03005e00 adds r3, r0, r2 ldrh r0, [r3, 0x8] adds r1, r0, 0x1 @@ -716380,22 +692547,20 @@ sub_815D694: @ 815D694 ands r0, r5 cmp r0, 0 bne _0815D6F8 - ldr r2, _0815D6F0 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _0815D6F4 + ldr r1, =0x0000ffff strh r1, [r0, 0x24] b _0815D708 .align 2, 0 -_0815D6EC: .4byte 0x03005e00 -_0815D6F0: .4byte 0x02020630 -_0815D6F4: .4byte 0x0000ffff + .pool _0815D6F8: - ldr r2, _0815D728 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -716419,7 +692584,7 @@ _0815D720: pop {r0} bx r0 .align 2, 0 -_0815D728: .4byte 0x02020630 + .pool thumb_func_end sub_815D694 thumb_func_start sub_815D72C @@ -716503,7 +692668,7 @@ sub_815D7B4: @ 815D7B4 ldrh r6, [r4, 0x20] ldrh r5, [r4, 0x22] bl sub_80A6838 - ldr r0, _0815D7FC + ldr r0, =0x0203841e ldrb r1, [r0] adds r0, r4, 0 bl sub_8008258 @@ -716523,15 +692688,14 @@ sub_815D7B4: @ 815D7B4 bl sub_815D72C movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, _0815D800 + ldr r0, =sub_815D804 + 1 str r0, [r4, 0x1C] add sp, 0x8 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0815D7FC: .4byte 0x0203841e -_0815D800: .4byte sub_815D804 + 1 + .pool thumb_func_end sub_815D7B4 thumb_func_start sub_815D804 @@ -716594,13 +692758,13 @@ _0815D86A: sub_815D870: @ 815D870 push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _0815D8C8 + ldr r6, =0x0203841e ldrh r0, [r6, 0x6] strh r0, [r5, 0x2E] ldrb r1, [r6] adds r0, r5, 0 bl sub_8008258 - ldr r0, _0815D8CC + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -716610,7 +692774,7 @@ sub_815D870: @ 815D870 negs r0, r0 strh r0, [r6, 0x2] _0815D896: - ldr r4, _0815D8D0 + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -716627,16 +692791,13 @@ _0815D896: ldrh r6, [r6, 0x4] adds r0, r6 strh r0, [r5, 0x22] - ldr r0, _0815D8D4 + ldr r0, =sub_810E2C8 + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0815D8C8: .4byte 0x0203841e -_0815D8CC: .4byte 0x02038437 -_0815D8D0: .4byte 0x02038436 -_0815D8D4: .4byte sub_810E2C8 + 1 + .pool thumb_func_end sub_815D870 thumb_func_start sub_815D8D8 @@ -716647,7 +692808,7 @@ sub_815D8D8: @ 815D8D8 lsls r0, 24 lsrs r5, r0, 24 movs r7, 0 - ldr r2, _0815D928 + ldr r2, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -716682,7 +692843,7 @@ sub_815D8D8: @ 815D8D8 strh r0, [r3, 0x10] b _0815D92E .align 2, 0 -_0815D928: .4byte 0x03005e00 + .pool _0815D92C: strh r7, [r3, 0x1A] _0815D92E: @@ -716726,7 +692887,7 @@ _0815D95A: mov r12, r2 cmp r0, 0 beq _0815D998 - ldr r3, _0815D994 + ldr r3, =0x02020630 movs r2, 0x26 ldrsh r0, [r4, r2] lsls r1, r0, 4 @@ -716740,9 +692901,9 @@ _0815D95A: adds r2, r3, 0 b _0815D9AE .align 2, 0 -_0815D994: .4byte 0x02020630 + .pool _0815D998: - ldr r2, _0815D9DC + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -716777,7 +692938,7 @@ _0815D9AE: subs r0, r2 b _0815D9F2 .align 2, 0 -_0815D9DC: .4byte 0x02020630 + .pool _0815D9E0: movs r1, 0x26 ldrsh r0, [r4, r1] @@ -716800,7 +692961,7 @@ _0815D9F2: bgt _0815DA12 adds r0, r5, 0 bl remove_task - ldr r1, _0815DA1C + ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] @@ -716811,7 +692972,7 @@ _0815DA12: pop {r0} bx r0 .align 2, 0 -_0815DA1C: .4byte 0x020383fe + .pool thumb_func_end sub_815D8D8 thumb_func_start sub_815DA20 @@ -716823,7 +692984,7 @@ sub_815DA20: @ 815DA20 lsls r0, 24 lsrs r6, r0, 24 movs r7, 0 - ldr r2, _0815DA74 + ldr r2, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -716858,7 +693019,7 @@ sub_815DA20: @ 815DA20 strh r0, [r3, 0x10] b _0815DA7A .align 2, 0 -_0815DA74: .4byte 0x03005e00 + .pool _0815DA78: strh r7, [r3, 0x1A] _0815DA7A: @@ -716893,7 +693054,7 @@ _0815DAA6: mov r1, r8 adds r4, r0, r1 ldrh r2, [r4, 0xC] - ldr r1, _0815DAF8 + ldr r1, =0x00007fff adds r0, r1, 0 ands r0, r2 ldrh r2, [r4, 0x16] @@ -716915,7 +693076,7 @@ _0815DAA6: mov r12, r3 cmp r0, 0 beq _0815DB00 - ldr r3, _0815DAFC + ldr r3, =0x02020630 movs r2, 0x26 ldrsh r0, [r4, r2] lsls r1, r0, 4 @@ -716929,10 +693090,9 @@ _0815DAA6: adds r2, r3, 0 b _0815DB16 .align 2, 0 -_0815DAF8: .4byte 0x00007fff -_0815DAFC: .4byte 0x02020630 + .pool _0815DB00: - ldr r2, _0815DB44 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -716967,7 +693127,7 @@ _0815DB16: subs r0, r2 b _0815DB5A .align 2, 0 -_0815DB44: .4byte 0x02020630 + .pool _0815DB48: movs r1, 0x26 ldrsh r0, [r4, r1] @@ -716996,7 +693156,7 @@ _0815DB5A: strh r0, [r2, 0x8] movs r0, 0 strh r0, [r2, 0x22] - ldr r0, _0815DB8C + ldr r0, =sub_815D8D8 + 1 str r0, [r2] _0815DB80: pop {r3,r4} @@ -717006,7 +693166,7 @@ _0815DB80: pop {r0} bx r0 .align 2, 0 -_0815DB8C: .4byte sub_815D8D8 + 1 + .pool thumb_func_end sub_815DA20 thumb_func_start sub_815DB90 @@ -717016,20 +693176,20 @@ sub_815DB90: @ 815DB90 push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0815DBF0 + ldr r0, =0x03005e00 mov r8, r0 lsls r7, r6, 2 adds r0, r7, r6 lsls r0, 3 mov r1, r8 adds r4, r0, r1 - ldr r1, _0815DBF4 - ldr r2, _0815DBF8 + ldr r1, =0x020241e4 + ldr r2, =0x02038436 ldrb r0, [r2] adds r0, r1 ldrb r0, [r0] strh r0, [r4, 0x26] - ldr r5, _0815DBFC + ldr r5, =0x0203841e ldrh r0, [r5] strh r0, [r4, 0x24] ldrh r0, [r5] @@ -717041,7 +693201,7 @@ sub_815DB90: @ 815DB90 cmp r0, 0 beq _0815DBD4 ldrh r0, [r4, 0x14] - ldr r3, _0815DC00 + ldr r3, =0xffff8000 adds r1, r3, 0 orrs r0, r1 strh r0, [r4, 0x14] @@ -717059,11 +693219,7 @@ _0815DBD4: adds r4, r7, 0 b _0815DC74 .align 2, 0 -_0815DBF0: .4byte 0x03005e00 -_0815DBF4: .4byte 0x020241e4 -_0815DBF8: .4byte 0x02038436 -_0815DBFC: .4byte 0x0203841e -_0815DC00: .4byte 0xffff8000 + .pool _0815DC04: movs r7, 0x2 ldrsh r0, [r5, r7] @@ -717073,19 +693229,19 @@ _0815DC04: cmp r0, 0 beq _0815DC20 ldrh r1, [r5, 0x2] - ldr r0, _0815DC1C + ldr r0, =0x00007fff ands r0, r1 b _0815DC28 .align 2, 0 -_0815DC1C: .4byte 0x00007fff + .pool _0815DC20: ldrh r0, [r5, 0x2] - ldr r2, _0815DC50 + ldr r2, =0xffff8000 adds r1, r2, 0 orrs r0, r1 _0815DC28: strh r0, [r4, 0xC] - ldr r0, _0815DC54 + ldr r0, =0x0203841e movs r3, 0x4 ldrsh r1, [r0, r3] movs r2, 0x80 @@ -717094,28 +693250,25 @@ _0815DC28: adds r5, r0, 0 cmp r1, 0 beq _0815DC60 - ldr r3, _0815DC58 + ldr r3, =0x03005e00 lsls r4, r6, 2 adds r1, r4, r6 lsls r1, 3 adds r1, r3 ldrh r2, [r5, 0x4] - ldr r0, _0815DC5C + ldr r0, =0x00007fff ands r0, r2 b _0815DC72 .align 2, 0 -_0815DC50: .4byte 0xffff8000 -_0815DC54: .4byte 0x0203841e -_0815DC58: .4byte 0x03005e00 -_0815DC5C: .4byte 0x00007fff + .pool _0815DC60: - ldr r3, _0815DC98 + ldr r3, =0x03005e00 lsls r4, r6, 2 adds r1, r4, r6 lsls r1, 3 adds r1, r3 ldrh r2, [r5, 0x4] - ldr r7, _0815DC9C + ldr r7, =0xffff8000 adds r0, r7, 0 orrs r0, r2 _0815DC72: @@ -717131,7 +693284,7 @@ _0815DC74: strh r1, [r0, 0x10] ldrh r1, [r5, 0xA] strh r1, [r0, 0x12] - ldr r1, _0815DCA0 + ldr r1, =sub_815DA20 + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -717139,9 +693292,7 @@ _0815DC74: pop {r0} bx r0 .align 2, 0 -_0815DC98: .4byte 0x03005e00 -_0815DC9C: .4byte 0xffff8000 -_0815DCA0: .4byte sub_815DA20 + 1 + .pool thumb_func_end sub_815DB90 thumb_func_start sub_815DCA4 @@ -717152,9 +693303,9 @@ sub_815DCA4: @ 815DCA4 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0815DCDC + ldr r1, =0x03005e00 adds r5, r0, r1 - ldr r4, _0815DCE0 + ldr r4, =0x0203841e movs r1, 0x2 ldrsh r0, [r4, r1] cmp r0, 0 @@ -717172,14 +693323,12 @@ _0815DCC4: ldrsh r0, [r4, r1] cmp r0, 0 bne _0815DCE8 - ldr r0, _0815DCE4 + ldr r0, =0x02038436 b _0815DCEA .align 2, 0 -_0815DCDC: .4byte 0x03005e00 -_0815DCE0: .4byte 0x0203841e -_0815DCE4: .4byte 0x02038436 + .pool _0815DCE8: - ldr r0, _0815DD38 + ldr r0, =0x02038437 _0815DCEA: ldrb r4, [r0] adds r0, r4, 0 @@ -717199,26 +693348,23 @@ _0815DCEA: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x14] - ldr r0, _0815DD3C + ldr r0, =0x0203841e ldrb r0, [r0] bl obj_id_for_side_relative_to_move adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 strh r1, [r5, 0x26] - ldr r2, _0815DD40 + ldr r2, =0x085ce74c adds r0, r5, 0 bl sub_80A7CFC - ldr r0, _0815DD44 + ldr r0, =sub_815DD48 + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815DD38: .4byte 0x02038437 -_0815DD3C: .4byte 0x0203841e -_0815DD40: .4byte 0x085ce74c -_0815DD44: .4byte sub_815DD48 + 1 + .pool thumb_func_end sub_815DCA4 thumb_func_start sub_815DD48 @@ -717229,7 +693375,7 @@ sub_815DD48: @ 815DD48 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0815DD68 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -717239,7 +693385,7 @@ sub_815DD48: @ 815DD48 beq _0815DDCC b _0815DDDA .align 2, 0 -_0815DD68: .4byte 0x03005e00 + .pool _0815DD6C: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -717281,12 +693427,12 @@ _0815DDB4: ldrh r1, [r4, 0x26] lsls r1, 24 lsrs r1, 24 - ldr r2, _0815DDC8 + ldr r2, =0x085ce74c adds r0, r4, 0 bl sub_80A7CFC b _0815DDDA .align 2, 0 -_0815DDC8: .4byte 0x085ce74c + .pool _0815DDCC: movs r1, 0xC ldrsh r0, [r4, r1] @@ -717312,7 +693458,7 @@ sub_815DDE0: @ 815DDE0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r2, _0815DE04 + ldr r2, =0x03005e00 adds r4, r0, r2 cmp r1, 0 bne _0815DE08 @@ -717320,7 +693466,7 @@ sub_815DDE0: @ 815DDE0 movs r3, 0xEC b _0815DE0C .align 2, 0 -_0815DE04: .4byte 0x03005e00 + .pool _0815DE08: movs r1, 0x1E movs r3, 0x14 @@ -717352,7 +693498,7 @@ _0815DE0C: strh r0, [r2, 0x2] movs r5, 0 mov r8, r2 - ldr r7, _0815DEB0 + ldr r7, =0x02020630 _0815DE44: lsls r0, r5, 1 add r0, sp @@ -717368,7 +693514,7 @@ _0815DE44: subs r3, 0x5 lsls r3, 24 lsrs r3, 24 - ldr r0, _0815DEB4 + ldr r0, =0x085ce76c bl obj_add_from_template_forward_search lsls r0, 24 lsrs r1, r0, 24 @@ -717388,7 +693534,7 @@ _0815DE44: adds r0, r2, 0 _0815DE86: strh r0, [r1, 0x30] - ldr r0, _0815DEB8 + ldr r0, =0x0000ffff strh r0, [r1, 0x32] strh r6, [r1, 0x34] movs r0, 0x2 @@ -717409,9 +693555,7 @@ _0815DE98: pop {r0} bx r0 .align 2, 0 -_0815DEB0: .4byte 0x02020630 -_0815DEB4: .4byte 0x085ce76c -_0815DEB8: .4byte 0x0000ffff + .pool thumb_func_end sub_815DDE0 thumb_func_start sub_815DEBC @@ -717433,7 +693577,7 @@ sub_815DEBC: @ 815DEBC asrs r0, 16 cmp r0, 0x6 ble _0815DF02 - ldr r3, _0815DF08 + ldr r3, =0x03005e00 movs r0, 0x36 ldrsh r1, [r4, r0] lsls r1, 1 @@ -717455,7 +693599,7 @@ _0815DF02: pop {r0} bx r0 .align 2, 0 -_0815DF08: .4byte 0x03005e00 + .pool thumb_func_end sub_815DEBC thumb_func_start sub_815DF0C @@ -717463,21 +693607,21 @@ sub_815DF0C: @ 815DF0C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0815DF54 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 adds r4, r1 movs r0, 0 strh r0, [r4, 0x8] - ldr r1, _0815DF58 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] strh r0, [r4, 0xA] ldrb r0, [r1] bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r0, 24 - ldr r2, _0815DF5C + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -717490,16 +693634,13 @@ sub_815DF0C: @ 815DF0C adds r1, r2, 0 adds r0, r1 strh r0, [r4, 0xC] - ldr r0, _0815DF60 + ldr r0, =sub_815DF64 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_0815DF54: .4byte 0x03005e00 -_0815DF58: .4byte 0x0203841e -_0815DF5C: .4byte 0x02020630 -_0815DF60: .4byte sub_815DF64 + 1 + .pool thumb_func_end sub_815DF0C thumb_func_start sub_815DF64 @@ -717507,7 +693648,7 @@ sub_815DF64: @ 815DF64 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0815DFAC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -717517,7 +693658,7 @@ sub_815DF64: @ 815DF64 cmp r0, 0 beq _0815DFB4 ldrh r0, [r4, 0xC] - ldr r2, _0815DFB0 + ldr r2, =0x085ce784 movs r3, 0x8 ldrsh r1, [r4, r3] lsls r1, 1 @@ -717541,8 +693682,7 @@ _0815DFA4: strh r0, [r4, 0xA] b _0815DFC6 .align 2, 0 -_0815DFAC: .4byte 0x03005e00 -_0815DFB0: .4byte 0x085ce784 + .pool _0815DFB4: ldrh r0, [r4, 0xC] movs r1, 0x10 @@ -717565,9 +693705,9 @@ sub_815DFCC: @ 815DFCC lsrs r0, 24 movs r2, 0xD0 lsls r2, 1 - ldr r1, _0815E008 + ldr r1, =0x02038436 ldrb r3, [r1] - ldr r1, _0815E00C + ldr r1, =0x0203841e ldrb r1, [r1] str r1, [sp] movs r1, 0xA @@ -717576,11 +693716,11 @@ sub_815DFCC: @ 815DFCC str r1, [sp, 0x8] movs r1, 0x1E str r1, [sp, 0xC] - ldr r1, _0815E010 + ldr r1, =0x08c2dc68 str r1, [sp, 0x10] - ldr r1, _0815E014 + ldr r1, =0x08c2ddc4 str r1, [sp, 0x14] - ldr r1, _0815E018 + ldr r1, =0x08c2dda4 str r1, [sp, 0x18] movs r1, 0 bl sub_8117854 @@ -717588,25 +693728,21 @@ sub_815DFCC: @ 815DFCC pop {r0} bx r0 .align 2, 0 -_0815E008: .4byte 0x02038436 -_0815E00C: .4byte 0x0203841e -_0815E010: .4byte 0x08c2dc68 -_0815E014: .4byte 0x08c2ddc4 -_0815E018: .4byte 0x08c2dda4 + .pool thumb_func_end sub_815DFCC thumb_func_start sub_815E01C sub_815E01C: @ 815E01C push {r4-r6,lr} adds r5, r0, 0 - ldr r6, _0815E074 + ldr r6, =0x02038436 ldrb r0, [r6] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0815E038 - ldr r1, _0815E078 + ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 strh r0, [r1] @@ -717615,7 +693751,7 @@ _0815E038: movs r1, 0 bl sub_80A5C6C lsls r0, 24 - ldr r4, _0815E078 + ldr r4, =0x0203841e lsrs r0, 24 ldrh r1, [r4] adds r0, r1 @@ -717635,13 +693771,11 @@ _0815E038: movs r0, 0xA0 lsls r0, 2 strh r0, [r5, 0x2E] - ldr r0, _0815E07C + ldr r0, =0x0000fd80 strh r0, [r5, 0x30] b _0815E0A8 .align 2, 0 -_0815E074: .4byte 0x02038436 -_0815E078: .4byte 0x0203841e -_0815E07C: .4byte 0x0000fd80 + .pool _0815E080: cmp r0, 0x1 bne _0815E09A @@ -717664,7 +693798,7 @@ _0815E09A: lsls r0, 2 strh r0, [r5, 0x2E] _0815E0A8: - ldr r0, _0815E0D4 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -717680,14 +693814,13 @@ _0815E0A8: orrs r0, r1 strb r0, [r2] _0815E0C8: - ldr r0, _0815E0D8 + ldr r0, =sub_815E0DC + 1 str r0, [r5, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0815E0D4: .4byte 0x02038436 -_0815E0D8: .4byte sub_815E0DC + 1 + .pool thumb_func_end sub_815E01C thumb_func_start sub_815E0DC @@ -717730,7 +693863,7 @@ sub_815E114: @ 815E114 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0815E140 + ldr r0, =0x03005e00 adds r6, r1, r0 bl sub_80A4DF0 lsls r0, 24 @@ -717745,7 +693878,7 @@ sub_815E114: @ 815E114 strh r0, [r6, 0x16] b _0815E14E .align 2, 0 -_0815E140: .4byte 0x03005e00 + .pool _0815E144: movs r0, 0xC strh r0, [r6, 0x12] @@ -717753,7 +693886,7 @@ _0815E144: strh r0, [r6, 0x14] strh r1, [r6, 0x16] _0815E14E: - ldr r5, _0815E184 + ldr r5, =0x02038436 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 @@ -717778,7 +693911,7 @@ _0815E17C: adds r0, r4, r0 b _0815E1AC .align 2, 0 -_0815E184: .4byte 0x02038436 + .pool _0815E188: ldrb r0, [r5] movs r1, 0x2 @@ -717799,7 +693932,7 @@ _0815E1A8: subs r0, r4, r0 _0815E1AC: strh r0, [r6, 0x1E] - ldr r5, _0815E200 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x3 bl sub_80A5C6C @@ -717818,7 +693951,7 @@ _0815E1D0: asrs r0, 2 subs r0, r4, r0 strh r0, [r6, 0x20] - ldr r4, _0815E204 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -717831,15 +693964,13 @@ _0815E1D0: lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x24] - ldr r0, _0815E208 + ldr r0, =sub_815E20C + 1 str r0, [r6] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0815E200: .4byte 0x02038436 -_0815E204: .4byte 0x02038437 -_0815E208: .4byte sub_815E20C + 1 + .pool thumb_func_end sub_815E114 thumb_func_start sub_815E20C @@ -717853,7 +693984,7 @@ sub_815E20C: @ 815E20C lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _0815E234 + ldr r1, =0x03005e00 adds r5, r0, r1 movs r0, 0x8 ldrsh r1, [r5, r0] @@ -717865,7 +693996,7 @@ sub_815E20C: @ 815E20C _0815E230: b _0815E33E .align 2, 0 -_0815E234: .4byte 0x03005e00 + .pool _0815E238: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -717894,7 +694025,7 @@ _0815E238: bl sub_815E34C movs r6, 0 mov r8, r4 - ldr r4, _0815E2AC + ldr r4, =0x02020630 _0815E272: add r0, sp, 0x10 movs r2, 0 @@ -717902,7 +694033,7 @@ _0815E272: mov r3, r8 movs r0, 0 ldrsh r2, [r3, r0] - ldr r0, _0815E2B0 + ldr r0, =0x085ce7ec movs r3, 0x23 bl obj_add_from_template_forward_search lsls r0, 24 @@ -717925,8 +694056,7 @@ _0815E272: strh r0, [r1, 0x24] b _0815E2EE .align 2, 0 -_0815E2AC: .4byte 0x02020630 -_0815E2B0: .4byte 0x085ce7ec + .pool _0815E2B4: lsls r2, r3, 4 adds r1, r2, r3 @@ -717961,7 +694091,7 @@ _0815E2DC: _0815E2EC: strh r0, [r1, 0x26] _0815E2EE: - ldr r1, _0815E32C + ldr r1, =0x02020630 adds r0, r2, r3 lsls r0, 2 adds r0, r1 @@ -717994,7 +694124,7 @@ _0815E324: strh r0, [r5, 0xC] b _0815E33E .align 2, 0 -_0815E32C: .4byte 0x02020630 + .pool _0815E330: movs r1, 0x1C ldrsh r0, [r5, r1] @@ -718118,7 +694248,7 @@ sub_815E404: @ 815E404 asrs r0, 16 cmp r0, 0x24 ble _0815E43A - ldr r3, _0815E440 + ldr r3, =0x03005e00 movs r0, 0x32 ldrsh r1, [r4, r0] lsls r1, 1 @@ -718140,14 +694270,14 @@ _0815E43A: pop {r0} bx r0 .align 2, 0 -_0815E440: .4byte 0x03005e00 + .pool thumb_func_end sub_815E404 thumb_func_start sub_815E444 sub_815E444: @ 815E444 push {r4,lr} adds r4, r0, 0 - ldr r1, _0815E470 + ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0x20] ldrh r0, [r1, 0x2] @@ -718158,18 +694288,16 @@ sub_815E444: @ 815E444 strh r0, [r4, 0x36] ldrh r0, [r1, 0x8] strh r0, [r4, 0x2E] - ldr r1, _0815E474 + ldr r1, =move_anim_8072740 + 1 adds r0, r4, 0 bl oamt_set_x3A_32 - ldr r0, _0815E478 + ldr r0, =sub_80A70C0 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0815E470: .4byte 0x0203841e -_0815E474: .4byte move_anim_8072740 + 1 -_0815E478: .4byte sub_80A70C0 + 1 + .pool thumb_func_end sub_815E444 thumb_func_start sub_815E47C @@ -718185,9 +694313,9 @@ sub_815E47C: @ 815E47C lsls r0, 2 add r0, r9 lsls r0, 3 - ldr r1, _0815E59C + ldr r1, =0x03005e00 adds r7, r0, r1 - ldr r0, _0815E5A0 + ldr r0, =0x02038436 mov r10, r0 ldrb r0, [r0] movs r1, 0x2 @@ -718202,7 +694330,7 @@ sub_815E47C: @ 815E47C lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x20] - ldr r0, _0815E5A4 + ldr r0, =0x02038437 mov r8, r0 ldrb r0, [r0] movs r1, 0x2 @@ -718230,7 +694358,7 @@ _0815E4EE: asrs r0, 2 adds r0, r4, r0 strh r0, [r7, 0x24] - ldr r4, _0815E5A8 + ldr r4, =0x085ce84c movs r0, 0x1E ldrsh r5, [r7, r0] movs r1, 0x20 @@ -718251,7 +694379,7 @@ _0815E4EE: strh r0, [r7, 0x26] cmp r0, 0x40 beq _0815E5B8 - ldr r4, _0815E5AC + ldr r4, =0x02020630 movs r0, 0x26 ldrsh r1, [r7, r0] lsls r0, r1, 4 @@ -718282,7 +694410,7 @@ _0815E4EE: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0815E5B0 + ldr r1, =0x0000ffe0 strh r1, [r0, 0x38] movs r0, 0x26 ldrsh r1, [r7, r0] @@ -718307,17 +694435,11 @@ _0815E4EE: movs r1, 0x1 bl sub_8008258 _0815E596: - ldr r0, _0815E5B4 + ldr r0, =sub_815E5CC + 1 str r0, [r7] b _0815E5BE .align 2, 0 -_0815E59C: .4byte 0x03005e00 -_0815E5A0: .4byte 0x02038436 -_0815E5A4: .4byte 0x02038437 -_0815E5A8: .4byte 0x085ce84c -_0815E5AC: .4byte 0x02020630 -_0815E5B0: .4byte 0x0000ffe0 -_0815E5B4: .4byte sub_815E5CC + 1 + .pool _0815E5B8: mov r0, r9 bl move_anim_task_del @@ -718339,7 +694461,7 @@ sub_815E5CC: @ 815E5CC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0815E5F0 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -718351,7 +694473,7 @@ sub_815E5CC: @ 815E5CC beq _0815E5FE b _0815E6D2 .align 2, 0 -_0815E5F0: .4byte 0x03005e00 + .pool _0815E5F4: cmp r1, 0x2 beq _0815E658 @@ -718372,7 +694494,7 @@ _0815E5FE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815E630 + ldr r1, =0x02020630 adds r0, r1 bl sub_80A6900 ldrh r0, [r4, 0xC] @@ -718384,14 +694506,14 @@ _0815E5FE: ble _0815E6D2 b _0815E6BE .align 2, 0 -_0815E630: .4byte 0x02020630 + .pool _0815E634: movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815E654 + ldr r1, =0x02020630 adds r0, r1 bl sub_80A6900 lsls r0, 24 @@ -718402,7 +694524,7 @@ _0815E634: strh r0, [r4, 0xC] b _0815E6BE .align 2, 0 -_0815E654: .4byte 0x02020630 + .pool _0815E658: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -718416,7 +694538,7 @@ _0815E658: ldrh r2, [r4, 0xC] adds r2, 0x1 strh r2, [r4, 0xC] - ldr r5, _0815E6C8 + ldr r5, =0x02020630 movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -718459,7 +694581,7 @@ _0815E6BE: strh r0, [r4, 0x8] b _0815E6D2 .align 2, 0 -_0815E6C8: .4byte 0x02020630 + .pool _0815E6CC: adds r0, r2, 0 bl move_anim_task_del @@ -718473,29 +694595,28 @@ _0815E6D2: sub_815E6D8: @ 815E6D8 push {r4-r6,lr} adds r4, r0, 0 - ldr r0, _0815E6EC + ldr r0, =0x0203841e movs r2, 0 ldrsh r1, [r0, r2] adds r6, r0, 0 cmp r1, 0 bne _0815E6F4 - ldr r0, _0815E6F0 + ldr r0, =0x02038436 b _0815E6F6 .align 2, 0 -_0815E6EC: .4byte 0x0203841e -_0815E6F0: .4byte 0x02038436 + .pool _0815E6F4: - ldr r0, _0815E75C + ldr r0, =0x02038437 _0815E6F6: ldrb r5, [r0] ldrh r2, [r4, 0x4] lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x10 - ldr r3, _0815E760 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _0815E764 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] @@ -718538,9 +694659,7 @@ _0815E724: subs r0, 0x8 b _0815E772 .align 2, 0 -_0815E75C: .4byte 0x02038437 -_0815E760: .4byte 0x000003ff -_0815E764: .4byte 0xfffffc00 + .pool _0815E768: adds r0, r5, 0 movs r1, 0x5 @@ -718548,13 +694667,13 @@ _0815E768: adds r0, 0x8 _0815E772: strh r0, [r4, 0x20] - ldr r0, _0815E780 + ldr r0, =sub_815E784 + 1 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0815E780: .4byte sub_815E784 + 1 + .pool thumb_func_end sub_815E6D8 thumb_func_start sub_815E784 @@ -718668,7 +694787,7 @@ sub_815E840: @ 815E840 push {r4,lr} lsls r0, 24 lsrs r1, r0, 24 - ldr r2, _0815E858 + ldr r2, =0x0203841e movs r3, 0 ldrsh r0, [r2, r3] cmp r0, 0 @@ -718677,9 +694796,9 @@ sub_815E840: @ 815E840 bl move_anim_task_del b _0815E884 .align 2, 0 -_0815E858: .4byte 0x0203841e + .pool _0815E85C: - ldr r0, _0815E88C + ldr r0, =0x03005e00 lsls r4, r1, 2 adds r4, r1 lsls r4, 3 @@ -718692,19 +694811,17 @@ _0815E85C: lsls r1, 24 lsrs r1, 24 strh r1, [r4, 0x26] - ldr r2, _0815E890 + ldr r2, =0x085ce87c adds r0, r4, 0 bl sub_80A7CFC - ldr r0, _0815E894 + ldr r0, =sub_815E898 + 1 str r0, [r4] _0815E884: pop {r4} pop {r0} bx r0 .align 2, 0 -_0815E88C: .4byte 0x03005e00 -_0815E890: .4byte 0x085ce87c -_0815E894: .4byte sub_815E898 + 1 + .pool thumb_func_end sub_815E840 thumb_func_start sub_815E898 @@ -718715,7 +694832,7 @@ sub_815E898: @ 815E898 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0815E8D8 + ldr r1, =0x03005e00 adds r4, r0, r1 ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -718731,7 +694848,7 @@ sub_815E898: @ 815E898 ands r0, r1 cmp r0, 0 bne _0815E8E0 - ldr r2, _0815E8DC + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -718741,17 +694858,16 @@ sub_815E898: @ 815E898 movs r1, 0x2 b _0815E8F0 .align 2, 0 -_0815E8D8: .4byte 0x03005e00 -_0815E8DC: .4byte 0x02020630 + .pool _0815E8E0: - ldr r2, _0815E938 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _0815E93C + ldr r1, =0x0000fffe _0815E8F0: strh r1, [r0, 0x24] _0815E8F2: @@ -718761,7 +694877,7 @@ _0815E8F2: lsrs r5, r0, 24 cmp r5, 0 bne _0815E94E - ldr r2, _0815E938 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -718778,21 +694894,18 @@ _0815E8F2: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0815E940 + ldr r1, =0x03005e00 adds r0, r1 ldrh r1, [r0, 0x26] lsls r1, 24 lsrs r1, 24 - ldr r2, _0815E944 + ldr r2, =0x085ce87c bl sub_80A7CFC strh r5, [r4, 0xA] strh r5, [r4, 0xC] b _0815E94E .align 2, 0 -_0815E938: .4byte 0x02020630 -_0815E93C: .4byte 0x0000fffe -_0815E940: .4byte 0x03005e00 -_0815E944: .4byte 0x085ce87c + .pool _0815E948: adds r0, r6, 0 bl move_anim_task_del @@ -718806,18 +694919,17 @@ _0815E94E: sub_815E954: @ 815E954 push {r4,r5,lr} adds r5, r0, 0 - ldr r0, _0815E968 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 bne _0815E970 - ldr r4, _0815E96C + ldr r4, =0x02038436 b _0815E972 .align 2, 0 -_0815E968: .4byte 0x0203841e -_0815E96C: .4byte 0x02038436 + .pool _0815E970: - ldr r4, _0815E9B0 + ldr r4, =0x02038437 _0815E972: ldrb r0, [r4] movs r1, 0x2 @@ -718838,21 +694950,19 @@ _0815E972: _0815E996: movs r2, 0 strh r2, [r5, 0x2E] - ldr r1, _0815E9B4 + ldr r1, =0x0203841e ldrh r0, [r1, 0x2] strh r0, [r5, 0x30] strh r2, [r5, 0x32] ldrh r0, [r1, 0x4] strh r0, [r5, 0x34] - ldr r0, _0815E9B8 + ldr r0, =sub_815E9BC + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815E9B0: .4byte 0x02038437 -_0815E9B4: .4byte 0x0203841e -_0815E9B8: .4byte sub_815E9BC + 1 + .pool thumb_func_end sub_815E954 thumb_func_start sub_815E9BC @@ -718907,7 +695017,7 @@ _0815EA10: sub_815EA14: @ 815EA14 push {lr} adds r3, r0, 0 - ldr r0, _0815EA40 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -718927,22 +695037,21 @@ sub_815EA14: @ 815EA14 movs r0, 0x1 b _0815EA4A .align 2, 0 -_0815EA40: .4byte 0x0203841e + .pool _0815EA44: movs r0, 0x8C strh r0, [r3, 0x20] - ldr r0, _0815EA58 + ldr r0, =0x0000ffff _0815EA4A: strh r0, [r3, 0x3C] movs r0, 0x38 strh r0, [r3, 0x22] - ldr r0, _0815EA5C + ldr r0, =sub_815EA60 + 1 str r0, [r3, 0x1C] pop {r0} bx r0 .align 2, 0 -_0815EA58: .4byte 0x0000ffff -_0815EA5C: .4byte sub_815EA60 + 1 + .pool thumb_func_end sub_815EA14 thumb_func_start sub_815EA60 @@ -718956,12 +695065,12 @@ sub_815EA60: @ 815EA60 b _0815EC40 _0815EA6E: lsls r0, 2 - ldr r1, _0815EA78 + ldr r1, =_0815EA7C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815EA78: .4byte _0815EA7C + .pool .align 2, 0 _0815EA7C: .4byte _0815EAA0 @@ -719023,7 +695132,7 @@ _0815EAE4: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r3, _0815EB20 + ldr r3, =0x08329f40 movs r0, 0x30 ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -719044,7 +695153,7 @@ _0815EAE4: _0815EB1C: b _0815EC12 .align 2, 0 -_0815EB20: .4byte 0x08329f40 + .pool _0815EB24: ldrh r0, [r4, 0x30] adds r0, 0x1 @@ -719067,7 +695176,7 @@ _0815EB36: ldrh r0, [r4, 0x22] subs r0, r1 strh r0, [r4, 0x22] - ldr r3, _0815EB70 + ldr r3, =0x08329f40 movs r0, 0x30 ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -719086,7 +695195,7 @@ _0815EB36: bne _0815EC40 b _0815EC16 .align 2, 0 -_0815EB70: .4byte 0x08329f40 + .pool _0815EB74: ldrh r2, [r4, 0x30] adds r2, 0x1 @@ -719098,7 +695207,7 @@ _0815EB74: ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r3, _0815EBCC + ldr r3, =0x08329f40 movs r0, 0x30 ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -719119,10 +695228,10 @@ _0815EB74: lsls r1, r2, 22 lsrs r1, 22 adds r1, 0x10 - ldr r3, _0815EBD0 + ldr r3, =0x000003ff adds r0, r3, 0 ands r1, r0 - ldr r0, _0815EBD4 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] @@ -719133,9 +695242,7 @@ _0815EBC0: bne _0815EC40 b _0815EC12 .align 2, 0 -_0815EBCC: .4byte 0x08329f40 -_0815EBD0: .4byte 0x000003ff -_0815EBD4: .4byte 0xfffffc00 + .pool _0815EBD8: movs r3, 0x3C ldrsh r0, [r4, r3] @@ -719206,7 +695313,7 @@ sub_815EC48: @ 815EC48 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0815ECA4 + ldr r0, =0x03005e00 adds r6, r1, r0 movs r0, 0 bl obj_id_for_side_relative_to_move @@ -719222,7 +695329,7 @@ sub_815EC48: @ 815EC48 lsrs r7, r0, 24 cmp r7, 0x1 bne _0815ECB4 - ldr r5, _0815ECA8 + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -719241,37 +695348,35 @@ sub_815EC48: @ 815EC48 strh r7, [r6, 0x24] b _0815ECD4 .align 2, 0 -_0815ECA4: .4byte 0x03005e00 -_0815ECA8: .4byte 0x02038436 + .pool _0815ECAC: - ldr r0, _0815ECB0 + ldr r0, =0x0000ffff b _0815ECD2 .align 2, 0 -_0815ECB0: .4byte 0x0000ffff + .pool _0815ECB4: - ldr r0, _0815ECC8 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0815ECD0 - ldr r0, _0815ECCC + ldr r0, =0x0000ffff b _0815ECD2 .align 2, 0 -_0815ECC8: .4byte 0x02038436 -_0815ECCC: .4byte 0x0000ffff + .pool _0815ECD0: movs r0, 0x1 _0815ECD2: strh r0, [r6, 0x24] _0815ECD4: - ldr r0, _0815ECE0 + ldr r0, =sub_815ECE4 + 1 str r0, [r6] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0815ECE0: .4byte sub_815ECE4 + 1 + .pool thumb_func_end sub_815EC48 thumb_func_start sub_815ECE4 @@ -719282,7 +695387,7 @@ sub_815ECE4: @ 815ECE4 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0815ED08 + ldr r1, =0x03005e00 adds r3, r0, r1 movs r1, 0x8 ldrsh r0, [r3, r1] @@ -719291,13 +695396,12 @@ sub_815ECE4: @ 815ECE4 b _0815EE78 _0815ECFE: lsls r0, 2 - ldr r1, _0815ED0C + ldr r1, =_0815ED10 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815ED08: .4byte 0x03005e00 -_0815ED0C: .4byte _0815ED10 + .pool .align 2, 0 _0815ED10: .4byte _0815ED34 @@ -719321,7 +695425,7 @@ _0815ED34: _0815ED44: b _0815EE50 _0815ED46: - ldr r2, _0815ED74 + ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -719346,9 +695450,9 @@ _0815ED46: _0815ED72: b _0815EE50 .align 2, 0 -_0815ED74: .4byte 0x02020630 + .pool _0815ED78: - ldr r2, _0815EDA4 + ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -719371,7 +695475,7 @@ _0815ED78: bne _0815EE78 b _0815EE50 .align 2, 0 -_0815EDA4: .4byte 0x02020630 + .pool _0815EDA8: ldrh r0, [r3, 0xA] adds r0, 0x1 @@ -719393,7 +695497,7 @@ _0815EDA8: strh r0, [r3, 0x8] b _0815EE78 _0815EDCE: - ldr r2, _0815EDF4 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -719413,7 +695517,7 @@ _0815EDCE: bne _0815EE78 b _0815EE50 .align 2, 0 -_0815EDF4: .4byte 0x02020630 + .pool _0815EDF8: ldrh r0, [r3, 0xA] adds r0, 0x1 @@ -719424,7 +695528,7 @@ _0815EDF8: bne _0815EE78 b _0815EE50 _0815EE08: - ldr r2, _0815EE24 + ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -719438,9 +695542,9 @@ _0815EE08: subs r0, r2 b _0815EE40 .align 2, 0 -_0815EE24: .4byte 0x02020630 + .pool _0815EE28: - ldr r2, _0815EE5C + ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -719470,9 +695574,9 @@ _0815EE54: strh r0, [r3, 0x8] b _0815EE78 .align 2, 0 -_0815EE5C: .4byte 0x02020630 + .pool _0815EE60: - ldr r2, _0815EE80 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -719488,14 +695592,14 @@ _0815EE78: pop {r0} bx r0 .align 2, 0 -_0815EE80: .4byte 0x02020630 + .pool thumb_func_end sub_815ECE4 thumb_func_start sub_815EE84 sub_815EE84: @ 815EE84 push {r4,lr} adds r4, r0, 0 - ldr r0, _0815EEA0 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -719503,13 +695607,12 @@ sub_815EE84: @ 815EE84 adds r0, r4, 0 movs r1, 0x1 bl sub_80A69CC - ldr r0, _0815EEA4 + ldr r0, =0x02038436 b _0815EEAA .align 2, 0 -_0815EEA0: .4byte 0x0203841e -_0815EEA4: .4byte 0x02038436 + .pool _0815EEA8: - ldr r0, _0815EF00 + ldr r0, =0x02038437 _0815EEAA: ldrb r0, [r0] strh r0, [r4, 0x3C] @@ -719548,14 +695651,13 @@ _0815EECE: movs r0, 0x4 orrs r1, r0 strb r1, [r4, 0x1] - ldr r0, _0815EF04 + ldr r0, =sub_815EF08 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0815EF00: .4byte 0x02038437 -_0815EF04: .4byte sub_815EF08 + 1 + .pool thumb_func_end sub_815EE84 thumb_func_start sub_815EF08 @@ -719569,12 +695671,12 @@ sub_815EF08: @ 815EF08 b _0815F106 _0815EF16: lsls r0, 2 - ldr r1, _0815EF20 + ldr r1, =_0815EF24 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815EF20: .4byte _0815EF24 + .pool .align 2, 0 _0815EF24: .4byte _0815EF38 @@ -719588,12 +695690,12 @@ _0815EF38: cmp r0, 0x5 bhi _0815EF68 lsls r0, 2 - ldr r1, _0815EF4C + ldr r1, =_0815EF50 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815EF4C: .4byte _0815EF50 + .pool .align 2, 0 _0815EF50: .4byte _0815EF6C @@ -719860,7 +695962,7 @@ sub_815F10C: @ 815F10C ands r0, r1 cmp r0, 0 bne _0815F16A - ldr r0, _0815F188 + ldr r0, =0x085ce3a0 ldrh r1, [r4, 0x20] adds r1, r5 lsls r1, 16 @@ -719888,14 +695990,14 @@ _0815F17C: pop {r0} bx r0 .align 2, 0 -_0815F188: .4byte 0x085ce3a0 + .pool thumb_func_end sub_815F10C thumb_func_start sub_815F18C sub_815F18C: @ 815F18C push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _0815F1C8 + ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -719912,7 +696014,7 @@ sub_815F18C: @ 815F18C cmp r0, 0 beq _0815F1D0 _0815F1B8: - ldr r2, _0815F1CC + ldr r2, =0x0203841e ldrh r1, [r5, 0x20] ldrh r0, [r2] subs r0, r1, r0 @@ -719921,10 +696023,9 @@ _0815F1B8: subs r1, r0 b _0815F1DE .align 2, 0 -_0815F1C8: .4byte 0x02038437 -_0815F1CC: .4byte 0x0203841e + .pool _0815F1D0: - ldr r2, _0815F204 + ldr r2, =0x0203841e ldrh r1, [r5, 0x20] ldrh r0, [r2] adds r0, r1, r0 @@ -719946,14 +696047,13 @@ _0815F1DE: ldrh r0, [r5, 0x2E] strh r0, [r5, 0x20] strh r2, [r5, 0x22] - ldr r0, _0815F208 + ldr r0, =sub_815F10C + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815F204: .4byte 0x0203841e -_0815F208: .4byte sub_815F10C + 1 + .pool thumb_func_end sub_815F18C thumb_func_start sub_815F20C @@ -719969,7 +696069,7 @@ sub_815F20C: @ 815F20C lsls r0, 24 lsrs r5, r0, 24 adds r2, r5, 0 - ldr r0, _0815F250 + ldr r0, =0x03005e00 mov r9, r0 lsls r7, r6, 2 adds r0, r7, r6 @@ -719990,7 +696090,7 @@ sub_815F20C: @ 815F20C strh r0, [r4, 0xC] b _0815F2A0 .align 2, 0 -_0815F250: .4byte 0x03005e00 + .pool _0815F254: cmp r0, 0x1 bne _0815F2AC @@ -720018,7 +696118,7 @@ _0815F254: strh r0, [r4, 0xE] adds r0, r5, 0 bl sub_80A7344 - ldr r1, _0815F2A8 + ldr r1, =0x02020630 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -720034,9 +696134,9 @@ _0815F2A0: strh r0, [r4, 0x8] b _0815F310 .align 2, 0 -_0815F2A8: .4byte 0x02020630 + .pool _0815F2AC: - ldr r4, _0815F31C + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 bl refresh_graphics_maybe @@ -720044,8 +696144,8 @@ _0815F2AC: lsls r0, 24 cmp r0, 0 beq _0815F2EE - ldr r3, _0815F320 - ldr r2, _0815F324 + ldr r3, =0x02020630 + ldr r2, =0x020241e4 ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -720055,7 +696155,7 @@ _0815F2AC: adds r1, r3, 0 adds r1, 0x10 adds r0, r1 - ldr r1, _0815F328 + ldr r1, =0x082ff6c0 str r1, [r0] ldrb r0, [r4] adds r0, r2 @@ -720069,7 +696169,7 @@ _0815F2AC: _0815F2EE: mov r4, r9 adds r3, r7, 0 - ldr r5, _0815F32C + ldr r5, =sub_815F330 + 1 movs r1, 0xF mov r2, r8 adds r0, r4, r2 @@ -720093,11 +696193,7 @@ _0815F310: pop {r0} bx r0 .align 2, 0 -_0815F31C: .4byte 0x02038436 -_0815F320: .4byte 0x02020630 -_0815F324: .4byte 0x020241e4 -_0815F328: .4byte 0x082ff6c0 -_0815F32C: .4byte sub_815F330 + 1 + .pool thumb_func_end sub_815F20C thumb_func_start sub_815F330 @@ -720109,7 +696205,7 @@ sub_815F330: @ 815F330 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _0815F35C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -720124,7 +696220,7 @@ sub_815F330: @ 815F330 beq _0815F36A b _0815F482 .align 2, 0 -_0815F35C: .4byte 0x03005e00 + .pool _0815F360: cmp r5, 0x2 beq _0815F400 @@ -720132,12 +696228,12 @@ _0815F360: beq _0815F43C b _0815F482 _0815F36A: - ldr r0, _0815F38C + ldr r0, =0x02020630 lsls r1, r3, 4 adds r1, r3 lsls r1, 2 adds r1, r0 - ldr r0, _0815F390 + ldr r0, =0x0000ff38 strh r0, [r1, 0x26] movs r0, 0xC8 strh r0, [r1, 0x24] @@ -720149,14 +696245,13 @@ _0815F36A: strh r5, [r4, 0x1C] b _0815F42E .align 2, 0 -_0815F38C: .4byte 0x02020630 -_0815F390: .4byte 0x0000ff38 + .pool _0815F394: ldrh r1, [r4, 0x1C] adds r1, 0x70 movs r5, 0 strh r1, [r4, 0x1C] - ldr r2, _0815F3F8 + ldr r2, =0x02020630 lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -720195,15 +696290,14 @@ _0815F3CE: asrs r1, 24 movs r0, 0x7D bl audio_play_and_stuff - ldr r1, _0815F3FC + ldr r1, =0xfffff800 adds r0, r1, 0 ldrh r2, [r4, 0x1C] adds r0, r2 strh r0, [r4, 0x1C] b _0815F42E .align 2, 0 -_0815F3F8: .4byte 0x02020630 -_0815F3FC: .4byte 0xfffff800 + .pool _0815F400: ldrh r0, [r4, 0x1C] subs r0, 0x70 @@ -720214,7 +696308,7 @@ _0815F400: movs r0, 0 strh r0, [r4, 0x1C] _0815F410: - ldr r0, _0815F438 + ldr r0, =0x02020630 lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -720235,12 +696329,12 @@ _0815F42E: strh r0, [r4, 0x8] b _0815F482 .align 2, 0 -_0815F438: .4byte 0x02020630 + .pool _0815F43C: ldrh r0, [r4, 0x1C] adds r0, 0x70 strh r0, [r4, 0x1C] - ldr r2, _0815F488 + ldr r2, =0x02020630 lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -720275,14 +696369,14 @@ _0815F482: pop {r0} bx r0 .align 2, 0 -_0815F488: .4byte 0x02020630 + .pool thumb_func_end sub_815F330 thumb_func_start sub_815F48C sub_815F48C: @ 815F48C push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _0815F4B0 + ldr r4, =0x02038437 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -720294,11 +696388,10 @@ sub_815F48C: @ 815F48C adds r1, r5, 0 adds r1, 0x43 strb r0, [r1] - ldr r4, _0815F4B4 + ldr r4, =0x0000ff70 b _0815F4C8 .align 2, 0 -_0815F4B0: .4byte 0x02038437 -_0815F4B4: .4byte 0x0000ff70 + .pool _0815F4B8: ldrb r0, [r4] bl sub_80A82E4 @@ -720306,9 +696399,9 @@ _0815F4B8: adds r1, r5, 0 adds r1, 0x43 strb r0, [r1] - ldr r4, _0815F4E4 + ldr r4, =0x0000ffa0 _0815F4C8: - ldr r0, _0815F4E8 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x3 bl sub_80A5C6C @@ -720316,15 +696409,13 @@ _0815F4C8: lsrs r0, 24 strh r0, [r5, 0x22] strh r4, [r5, 0x26] - ldr r0, _0815F4EC + ldr r0, =sub_815F4F0 + 1 str r0, [r5, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815F4E4: .4byte 0x0000ffa0 -_0815F4E8: .4byte 0x02038437 -_0815F4EC: .4byte sub_815F4F0 + 1 + .pool thumb_func_end sub_815F48C thumb_func_start sub_815F4F0 @@ -720338,12 +696429,12 @@ sub_815F4F0: @ 815F4F0 b _0815F61A _0815F4FE: lsls r0, 2 - ldr r1, _0815F508 + ldr r1, =_0815F50C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815F508: .4byte _0815F50C + .pool .align 2, 0 _0815F50C: .4byte _0815F520 @@ -720373,7 +696464,7 @@ _0815F544: adds r1, 0x4 movs r5, 0 strh r1, [r4, 0x30] - ldr r2, _0815F580 + ldr r2, =0x08329f40 movs r3, 0x30 ldrsh r0, [r4, r3] lsls r0, 1 @@ -720398,13 +696489,13 @@ _0815F544: strh r5, [r4, 0x26] b _0815F5D8 .align 2, 0 -_0815F580: .4byte 0x08329f40 + .pool _0815F584: ldrh r1, [r4, 0x30] adds r1, 0x6 movs r3, 0 strh r1, [r4, 0x30] - ldr r2, _0815F5B0 + ldr r2, =0x08329f40 movs r5, 0x30 ldrsh r0, [r4, r5] lsls r0, 1 @@ -720422,7 +696513,7 @@ _0815F584: strh r3, [r4, 0x26] b _0815F5D8 .align 2, 0 -_0815F5B0: .4byte 0x08329f40 + .pool _0815F5B4: ldrh r0, [r4, 0x30] adds r0, 0x1 @@ -720514,7 +696605,7 @@ sub_815F620: @ 815F620 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, _0815F678 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_but_dont_free_vram _0815F66E: @@ -720522,9 +696613,9 @@ _0815F66E: bl move_anim_task_del b _0815F780 .align 2, 0 -_0815F678: .4byte 0x02020630 + .pool _0815F67C: - ldr r4, _0815F70C + ldr r4, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -720547,7 +696638,7 @@ _0815F67C: strh r7, [r6, 0x32] movs r0, 0x10 strh r0, [r5, 0x34] - ldr r0, _0815F710 + ldr r0, =0x0000fff0 strh r0, [r6, 0x34] strh r7, [r5, 0x36] movs r0, 0x80 @@ -720560,7 +696651,7 @@ _0815F67C: strh r0, [r6, 0x3A] strh r7, [r5, 0x3C] strh r7, [r6, 0x3C] - ldr r2, _0815F714 + ldr r2, =0x03005e00 mov r1, r8 lsls r3, r1, 2 adds r0, r3, r1 @@ -720568,9 +696659,9 @@ _0815F67C: adds r0, r2 movs r1, 0x2 strh r1, [r0, 0x8] - ldr r0, _0815F718 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _0815F71C + ldr r0, =0x02038437 ldrb r0, [r0] ldr r1, [r1] lsls r0, 2 @@ -720597,11 +696688,7 @@ _0815F67C: strb r0, [r2] b _0815F736 .align 2, 0 -_0815F70C: .4byte 0x02020630 -_0815F710: .4byte 0x0000fff0 -_0815F714: .4byte 0x03005e00 -_0815F718: .4byte 0x020244d0 -_0815F71C: .4byte 0x02038437 + .pool _0815F720: adds r1, r5, 0 adds r1, 0x3E @@ -720641,16 +696728,16 @@ _0815F736: adds r3, r7, 0 adds r3, 0x1C adds r2, r3 - ldr r0, _0815F790 + ldr r0, =sub_815F7C4 + 1 str r0, [r2] adds r1, r3 str r0, [r1] mov r0, r12 add r0, r8 lsls r0, 3 - ldr r1, _0815F794 + ldr r1, =0x03005e00 adds r0, r1 - ldr r1, _0815F798 + ldr r1, =sub_815F79C + 1 str r1, [r0] _0815F780: pop {r3-r5} @@ -720661,9 +696748,7 @@ _0815F780: pop {r0} bx r0 .align 2, 0 -_0815F790: .4byte sub_815F7C4 + 1 -_0815F794: .4byte 0x03005e00 -_0815F798: .4byte sub_815F79C + 1 + .pool thumb_func_end sub_815F620 thumb_func_start sub_815F79C @@ -720671,7 +696756,7 @@ sub_815F79C: @ 815F79C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _0815F7C0 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -720686,7 +696771,7 @@ _0815F7BA: pop {r0} bx r0 .align 2, 0 -_0815F7C0: .4byte 0x03005e00 + .pool thumb_func_end sub_815F79C thumb_func_start sub_815F7C4 @@ -720702,9 +696787,9 @@ sub_815F7C4: @ 815F7C4 ble _0815F80E movs r0, 0 strh r0, [r4, 0x30] - ldr r0, _0815F838 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _0815F83C + ldr r0, =0x02038437 ldrb r0, [r0] ldr r1, [r1] lsls r0, 2 @@ -720750,8 +696835,7 @@ _0815F80E: beq _0815F858 b _0815F896 .align 2, 0 -_0815F838: .4byte 0x020244d0 -_0815F83C: .4byte 0x02038437 + .pool _0815F840: ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -720779,7 +696863,7 @@ _0815F858: lsls r0, 16 cmp r0, 0 bge _0815F896 - ldr r3, _0815F89C + ldr r3, =0x03005e00 movs r2, 0x3C ldrsh r1, [r4, r2] lsls r1, 1 @@ -720801,7 +696885,7 @@ _0815F896: pop {r0} bx r0 .align 2, 0 -_0815F89C: .4byte 0x03005e00 + .pool thumb_func_end sub_815F7C4 thumb_func_start sub_815F8A0 @@ -720809,10 +696893,10 @@ sub_815F8A0: @ 815F8A0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r3, _0815F8EC + ldr r3, =0x0203841e movs r2, 0 strh r2, [r3, 0xE] - ldr r1, _0815F8F0 + ldr r1, =0x0203841a ldrb r0, [r1] ldrb r1, [r1] adds r0, r1, 0 @@ -720847,8 +696931,7 @@ _0815F8E0: pop {r0} bx r0 .align 2, 0 -_0815F8EC: .4byte 0x0203841e -_0815F8F0: .4byte 0x0203841a + .pool thumb_func_end sub_815F8A0 thumb_func_start sub_815F8F4 @@ -720862,7 +696945,7 @@ sub_815F8F4: @ 815F8F4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _0815F924 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -720874,13 +696957,12 @@ sub_815F8F4: @ 815F8F4 b _0815FE68 _0815F91A: lsls r0, 2 - ldr r1, _0815F928 + ldr r1, =_0815F92C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815F924: .4byte 0x03005e00 -_0815F928: .4byte _0815F92C + .pool .align 2, 0 _0815F92C: .4byte _0815F940 @@ -720893,7 +696975,7 @@ _0815F940: bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _0815F98C + ldr r1, =0x03005e00 mov r2, r8 lsls r4, r2, 2 adds r0, r4, r2 @@ -720905,14 +696987,14 @@ _0815F940: ldrh r1, [r6, 0xA] adds r0, r1 strh r0, [r6, 0xA] - ldr r0, _0815F990 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 mov r9, r4 cmp r0, 0 bne _0815F998 - ldr r2, _0815F994 + ldr r2, =0x02020630 lsls r3, r7, 4 adds r1, r3, r7 lsls r1, 2 @@ -720925,11 +697007,9 @@ _0815F940: strh r0, [r1, 0x24] b _0815F9B2 .align 2, 0 -_0815F98C: .4byte 0x03005e00 -_0815F990: .4byte 0x02038436 -_0815F994: .4byte 0x02020630 + .pool _0815F998: - ldr r3, _0815F9EC + ldr r3, =0x02020630 lsls r4, r7, 4 adds r2, r4, r7 lsls r2, 2 @@ -720943,7 +697023,7 @@ _0815F998: adds r2, r3, 0 adds r3, r4, 0 _0815F9B2: - ldr r1, _0815F9F0 + ldr r1, =0x03005e00 mov r0, r9 add r0, r8 lsls r0, 3 @@ -720973,14 +697053,13 @@ _0815F9DE: strh r0, [r4, 0x8] b _0815FE68 .align 2, 0 -_0815F9EC: .4byte 0x02020630 -_0815F9F0: .4byte 0x03005e00 + .pool _0815F9F4: bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 beq _0815FA28 - ldr r0, _0815FA20 + ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] ldr r2, [r0, 0x8] @@ -720988,7 +697067,7 @@ _0815F9F4: ldr r3, [r0, 0xC] mov r9, r3 ldrh r6, [r0] - ldr r0, _0815FA24 + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_80A82E4 lsls r0, 24 @@ -720996,23 +697075,22 @@ _0815F9F4: movs r7, 0 b _0815FB4E .align 2, 0 -_0815FA20: .4byte 0x02039f34 -_0815FA24: .4byte 0x02038436 + .pool _0815FA28: - ldr r4, _0815FA8C + ldr r4, =0x02038436 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0815FAC8 - ldr r7, _0815FA90 + ldr r7, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r7 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _0815FA94 + ldr r5, =0x020244ec adds r0, r5 movs r1, 0 bl pokemon_getattr @@ -721026,7 +697104,7 @@ _0815FA28: movs r1, 0x1 bl pokemon_getattr mov r9, r0 - ldr r0, _0815FA98 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r2, [r4] ldr r1, [r0] @@ -721046,16 +697124,13 @@ _0815FA28: lsrs r6, r0, 16 b _0815FA9E .align 2, 0 -_0815FA8C: .4byte 0x02038436 -_0815FA90: .4byte 0x0202406e -_0815FA94: .4byte 0x020244ec -_0815FA98: .4byte 0x020244d0 + .pool _0815FA9C: ldrh r6, [r1, 0x2] _0815FA9E: movs r0, 0x1 bl obj_id_for_side_relative_to_move - ldr r2, _0815FAC4 + ldr r2, =0x02020630 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -721072,16 +697147,16 @@ _0815FA9E: lsls r5, 1 b _0815FB50 .align 2, 0 -_0815FAC4: .4byte 0x02020630 + .pool _0815FAC8: - ldr r7, _0815FB20 + ldr r7, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r7 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _0815FB24 + ldr r5, =0x02024744 adds r0, r5 movs r1, 0 bl pokemon_getattr @@ -721095,7 +697170,7 @@ _0815FAC8: movs r1, 0x1 bl pokemon_getattr mov r9, r0 - ldr r0, _0815FB28 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r2, [r4] ldr r1, [r0] @@ -721115,15 +697190,13 @@ _0815FAC8: lsrs r6, r0, 16 b _0815FB2E .align 2, 0 -_0815FB20: .4byte 0x0202406e -_0815FB24: .4byte 0x02024744 -_0815FB28: .4byte 0x020244d0 + .pool _0815FB2C: ldrh r6, [r1, 0x2] _0815FB2E: movs r0, 0x1 bl obj_id_for_side_relative_to_move - ldr r2, _0815FBCC + ldr r2, =0x02020630 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -721137,9 +697210,9 @@ _0815FB2E: lsrs r4, r0, 24 movs r7, 0x1 _0815FB4E: - ldr r5, _0815FBD0 + ldr r5, =0x0000ffe0 _0815FB50: - ldr r0, _0815FBD4 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x1 bl sub_80A5C6C @@ -721153,7 +697226,7 @@ _0815FB50: str r4, [sp, 0x8] mov r0, r9 str r0, [sp, 0xC] - ldr r4, _0815FBD8 + ldr r4, =0x02038436 ldrb r0, [r4] str r0, [sp, 0x10] movs r0, 0 @@ -721164,7 +697237,7 @@ _0815FB50: bl sub_80A8394 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0815FBDC + ldr r0, =0x020244d0 ldr r1, [r0] ldrb r0, [r4] ldr r1, [r1] @@ -721173,7 +697246,7 @@ _0815FB50: ldrh r0, [r0, 0x2] cmp r0, 0 beq _0815FBBA - ldr r1, _0815FBCC + ldr r1, =0x02020630 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -721185,12 +697258,12 @@ _0815FB50: lsls r2, 1 adds r1, r2, 0 orrs r0, r1 - ldr r3, _0815FBE0 + ldr r3, =0x00007fff movs r1, 0x10 movs r2, 0x6 bl pal_fade_1 _0815FBBA: - ldr r0, _0815FBE4 + ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -721199,15 +697272,9 @@ _0815FBBA: strh r5, [r1, 0x26] b _0815FD7E .align 2, 0 -_0815FBCC: .4byte 0x02020630 -_0815FBD0: .4byte 0x0000ffe0 -_0815FBD4: .4byte 0x02038437 -_0815FBD8: .4byte 0x02038436 -_0815FBDC: .4byte 0x020244d0 -_0815FBE0: .4byte 0x00007fff -_0815FBE4: .4byte 0x03005e00 + .pool _0815FBE8: - ldr r1, _0815FC34 + ldr r1, =0x03005e00 mov r0, r8 lsls r4, r0, 2 adds r0, r4, r0 @@ -721222,14 +697289,14 @@ _0815FBE8: ldrh r2, [r6, 0xA] adds r0, r2 strh r0, [r6, 0xA] - ldr r0, _0815FC38 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 mov r9, r4 cmp r0, 0 bne _0815FC40 - ldr r3, _0815FC3C + ldr r3, =0x02020630 lsls r4, r5, 4 adds r2, r4, r5 lsls r2, 2 @@ -721244,11 +697311,9 @@ _0815FBE8: adds r3, r4, 0 b _0815FC56 .align 2, 0 -_0815FC34: .4byte 0x03005e00 -_0815FC38: .4byte 0x02038436 -_0815FC3C: .4byte 0x02020630 + .pool _0815FC40: - ldr r2, _0815FCA4 + ldr r2, =0x02020630 lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -721260,7 +697325,7 @@ _0815FC40: adds r0, r4 strh r0, [r1, 0x24] _0815FC56: - ldr r1, _0815FCA8 + ldr r1, =0x03005e00 mov r0, r9 add r0, r8 lsls r0, 3 @@ -721279,7 +697344,7 @@ _0815FC56: ldrsh r0, [r6, r1] cmp r0, 0 bne _0815FCD6 - ldr r0, _0815FCAC + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -721287,7 +697352,7 @@ _0815FC56: bne _0815FCB4 lsls r4, r5, 16 asrs r4, 16 - ldr r0, _0815FCB0 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0 bl sub_80A5C6C @@ -721297,14 +697362,11 @@ _0815FC56: bge _0815FCD6 b _0815FCCA .align 2, 0 -_0815FCA4: .4byte 0x02020630 -_0815FCA8: .4byte 0x03005e00 -_0815FCAC: .4byte 0x02038436 -_0815FCB0: .4byte 0x02038437 + .pool _0815FCB4: lsls r4, r5, 16 asrs r4, 16 - ldr r0, _0815FCF8 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0 bl sub_80A5C6C @@ -721316,8 +697378,8 @@ _0815FCCA: ldrh r0, [r6, 0x24] adds r0, 0x1 strh r0, [r6, 0x24] - ldr r1, _0815FCFC - ldr r0, _0815FD00 + ldr r1, =0x0203841e + ldr r0, =0x0000ffff strh r0, [r1, 0xE] _0815FCD6: lsls r0, r5, 16 @@ -721330,7 +697392,7 @@ _0815FCD6: bhi _0815FCE8 b _0815FE68 _0815FCE8: - ldr r0, _0815FD04 + ldr r0, =0x03005e00 mov r1, r9 add r1, r8 lsls r1, 3 @@ -721339,16 +697401,13 @@ _0815FCE8: strh r0, [r1, 0xA] b _0815FD7E .align 2, 0 -_0815FCF8: .4byte 0x02038437 -_0815FCFC: .4byte 0x0203841e -_0815FD00: .4byte 0x0000ffff -_0815FD04: .4byte 0x03005e00 + .pool _0815FD08: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _0815FD54 + ldr r1, =0x03005e00 mov r3, r8 lsls r4, r3, 2 adds r0, r4, r3 @@ -721360,10 +697419,10 @@ _0815FD08: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r5, _0815FD58 + ldr r5, =0x02020630 adds r0, r5 bl sub_80A8610 - ldr r0, _0815FD5C + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -721380,9 +697439,7 @@ _0815FD08: strh r0, [r1, 0x24] b _0815FD74 .align 2, 0 -_0815FD54: .4byte 0x03005e00 -_0815FD58: .4byte 0x02020630 -_0815FD5C: .4byte 0x02038436 + .pool _0815FD60: lsls r0, r7, 4 adds r0, r7 @@ -721395,7 +697452,7 @@ _0815FD60: subs r1, r2 strh r1, [r0, 0x24] _0815FD74: - ldr r0, _0815FD88 + ldr r0, =0x03005e00 mov r1, r9 add r1, r8 lsls r1, 3 @@ -721406,13 +697463,13 @@ _0815FD7E: strh r0, [r1, 0x8] b _0815FE68 .align 2, 0 -_0815FD88: .4byte 0x03005e00 + .pool _0815FD8C: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _0815FE00 + ldr r1, =0x03005e00 mov r0, r8 lsls r4, r0, 2 adds r0, r4, r0 @@ -721424,7 +697481,7 @@ _0815FD8C: ldrh r3, [r2, 0xA] adds r0, r3 strh r0, [r2, 0xA] - ldr r0, _0815FE04 + ldr r0, =0x02038436 mov r10, r0 ldrb r0, [r0] str r2, [sp, 0x18] @@ -721434,7 +697491,7 @@ _0815FD8C: ldr r2, [sp, 0x18] cmp r0, 0 bne _0815FE0C - ldr r1, _0815FE08 + ldr r1, =0x02020630 lsls r5, r7, 4 adds r0, r5, r7 lsls r0, 2 @@ -721463,11 +697520,9 @@ _0815FD8C: strh r2, [r6, 0x24] b _0815FE44 .align 2, 0 -_0815FE00: .4byte 0x03005e00 -_0815FE04: .4byte 0x02038436 -_0815FE08: .4byte 0x02020630 + .pool _0815FE0C: - ldr r1, _0815FE78 + ldr r1, =0x02020630 lsls r5, r7, 4 adds r0, r5, r7 lsls r0, 2 @@ -721495,14 +697550,14 @@ _0815FE0C: movs r4, 0 strh r4, [r6, 0x24] _0815FE44: - ldr r1, _0815FE7C + ldr r1, =0x03005e00 mov r0, r9 add r0, r8 lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0xA] strh r1, [r0, 0xA] - ldr r1, _0815FE78 + ldr r1, =0x02020630 adds r0, r3, r7 lsls r0, 2 adds r0, r1 @@ -721522,8 +697577,7 @@ _0815FE68: pop {r0} bx r0 .align 2, 0 -_0815FE78: .4byte 0x02020630 -_0815FE7C: .4byte 0x03005e00 + .pool thumb_func_end sub_815F8F4 thumb_func_start sub_815FE80 @@ -721538,7 +697592,7 @@ sub_815FE80: @ 815FE80 beq _0815FF3A b _0815FFBC _0815FE92: - ldr r0, _0815FF18 + ldr r0, =0x0203841e movs r2, 0xE ldrsh r1, [r0, r2] movs r0, 0x1 @@ -721552,7 +697606,7 @@ _0815FE92: asrs r1, 24 movs r0, 0x7A bl audio_play_and_stuff - ldr r0, _0815FF1C + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x1 bl sub_80A5C6C @@ -721560,7 +697614,7 @@ _0815FE92: lsrs r0, 24 adds r0, 0x10 strh r0, [r4, 0x22] - ldr r0, _0815FF20 + ldr r0, =0x0000ffe0 strh r0, [r4, 0x2E] ldrh r0, [r4, 0x3C] adds r0, 0x1 @@ -721572,7 +697626,7 @@ _0815FE92: negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r0, _0815FF24 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -721585,7 +697639,7 @@ _0815FE92: bne _0815FFBC movs r0, 0x1 bl obj_id_for_side_relative_to_move - ldr r2, _0815FF28 + ldr r2, =0x02020630 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -721600,11 +697654,7 @@ _0815FE92: strb r0, [r1] b _0815FFBC .align 2, 0 -_0815FF18: .4byte 0x0203841e -_0815FF1C: .4byte 0x02038437 -_0815FF20: .4byte 0x0000ffe0 -_0815FF24: .4byte 0x02038436 -_0815FF28: .4byte 0x02020630 + .pool _0815FF2C: adds r0, r4, 0 adds r0, 0x3E @@ -721646,7 +697696,7 @@ _0815FF6E: ldrh r1, [r4, 0x32] adds r0, r1 strh r0, [r4, 0x32] - ldr r0, _0815FF98 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -721661,7 +697711,7 @@ _0815FF6E: adds r1, r2, 0 b _0815FFA8 .align 2, 0 -_0815FF98: .4byte 0x02038436 + .pool _0815FF9C: ldrh r1, [r4, 0x32] lsls r0, r1, 16 @@ -721690,7 +697740,7 @@ sub_815FFC4: @ 815FFC4 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0815FFEC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -721703,13 +697753,12 @@ sub_815FFC4: @ 815FFC4 b _08160132 _0815FFE0: lsls r0, 2 - ldr r1, _0815FFF0 + ldr r1, =_0815FFF4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815FFEC: .4byte 0x03005e00 -_0815FFF0: .4byte _0815FFF4 + .pool .align 2, 0 _0815FFF4: .4byte _08160008 @@ -721718,21 +697767,21 @@ _0815FFF4: .4byte _081600CC .4byte _08160132 _08160008: - ldr r0, _0816004C + ldr r0, =0x02038436 ldrb r0, [r0] movs r1, 0 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r0, _08160050 + ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0 bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 - ldr r1, _08160054 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -721751,16 +697800,14 @@ _0816003E: strh r0, [r1, 0x26] b _08160150 .align 2, 0 -_0816004C: .4byte 0x02038436 -_08160050: .4byte 0x02038437 -_08160054: .4byte 0x03005e00 + .pool _08160058: - ldr r1, _08160094 - ldr r0, _08160098 + ldr r1, =0x020241e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] - ldr r1, _0816009C + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -721786,9 +697833,7 @@ _08160058: ldrsh r1, [r2, r3] b _08160126 .align 2, 0 -_08160094: .4byte 0x020241e4 -_08160098: .4byte 0x02038436 -_0816009C: .4byte 0x02020630 + .pool _081600A0: movs r3, 0x20 ldrsh r0, [r1, r3] @@ -721814,12 +697859,12 @@ _081600B4: strh r1, [r0, 0x26] b _08160150 _081600CC: - ldr r1, _0816010C - ldr r0, _08160110 + ldr r1, =0x020241e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] - ldr r1, _08160114 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -721847,9 +697892,7 @@ _081600CC: bgt _08160150 b _0816012A .align 2, 0 -_0816010C: .4byte 0x020241e4 -_08160110: .4byte 0x02038436 -_08160114: .4byte 0x02020630 + .pool _08160118: movs r3, 0x20 ldrsh r0, [r1, r3] @@ -721867,12 +697910,12 @@ _0816012A: strh r0, [r2, 0x26] b _08160150 _08160132: - ldr r1, _08160158 - ldr r0, _0816015C + ldr r1, =0x020241e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] - ldr r1, _08160160 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -721886,9 +697929,7 @@ _08160150: pop {r0} bx r0 .align 2, 0 -_08160158: .4byte 0x020241e4 -_0816015C: .4byte 0x02038436 -_08160160: .4byte 0x02020630 + .pool thumb_func_end sub_815FFC4 thumb_func_start sub_8160164 @@ -721899,7 +697940,7 @@ sub_8160164: @ 8160164 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081601CC + ldr r0, =0x03005e00 adds r4, r1, r0 movs r0, 0 bl obj_id_for_side_relative_to_move @@ -721907,7 +697948,7 @@ sub_8160164: @ 8160164 lsrs r0, 24 movs r5, 0 strh r0, [r4, 0xE] - ldr r0, _081601D0 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -721919,7 +697960,7 @@ sub_8160164: @ 8160164 movs r1, 0x1 _08160198: strh r1, [r4, 0x10] - ldr r2, _081601D4 + ldr r2, =0x02020630 movs r0, 0xE ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -721939,16 +697980,13 @@ _08160198: movs r0, 0x1 strh r0, [r4, 0x1C] strh r5, [r4, 0x20] - ldr r0, _081601D8 + ldr r0, =sub_81601DC + 1 str r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081601CC: .4byte 0x03005e00 -_081601D0: .4byte 0x02038436 -_081601D4: .4byte 0x02020630 -_081601D8: .4byte sub_81601DC + 1 + .pool thumb_func_end sub_8160164 thumb_func_start sub_81601DC @@ -721959,7 +697997,7 @@ sub_81601DC: @ 81601DC lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _08160200 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -721971,7 +698009,7 @@ sub_81601DC: @ 81601DC beq _0816020A b _081602DA .align 2, 0 -_08160200: .4byte 0x03005e00 + .pool _08160204: cmp r0, 0x2 beq _081602D4 @@ -721982,14 +698020,14 @@ _0816020A: movs r2, 0xFF ands r0, r2 strh r0, [r4, 0x1E] - ldr r5, _0816027C + ldr r5, =0x02020630 movs r6, 0xE ldrsh r0, [r4, r6] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r1, r5 - ldr r3, _08160280 + ldr r3, =0x08329f40 movs r6, 0x1E ldrsh r0, [r4, r6] lsls r0, 1 @@ -722034,22 +698072,21 @@ _0816020A: strh r1, [r0, 0x20] b _081602C4 .align 2, 0 -_0816027C: .4byte 0x02020630 -_08160280: .4byte 0x08329f40 + .pool _08160284: ldrh r0, [r4, 0x1E] adds r0, 0x8 movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x1E] - ldr r3, _081602CC + ldr r3, =0x02020630 movs r1, 0xE ldrsh r0, [r4, r1] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r1, r3 - ldr r2, _081602D0 + ldr r2, =0x08329f40 movs r5, 0x1E ldrsh r0, [r4, r5] lsls r0, 1 @@ -722075,8 +698112,7 @@ _081602C4: strh r0, [r4, 0x8] b _081602DA .align 2, 0 -_081602CC: .4byte 0x02020630 -_081602D0: .4byte 0x08329f40 + .pool _081602D4: adds r0, r2, 0 bl move_anim_task_del @@ -722090,7 +698126,7 @@ _081602DA: sub_81602E0: @ 81602E0 push {r4,lr} adds r4, r0, 0 - ldr r0, _08160334 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -722127,20 +698163,20 @@ _08160326: pop {r0} bx r0 .align 2, 0 -_08160334: .4byte 0x02038437 + .pool thumb_func_end sub_81602E0 thumb_func_start sub_8160338 sub_8160338: @ 8160338 push {r4,lr} adds r4, r0, 0 - ldr r0, _08160370 + ldr r0, =0x02038437 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 cmp r0, 0 bne _0816037C - ldr r2, _08160374 + ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] subs r0, r1 @@ -722149,7 +698185,7 @@ sub_8160338: @ 8160338 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - ldr r0, _08160378 + ldr r0, =0x0000fff5 strh r0, [r4, 0x2E] movs r0, 0xC0 strh r0, [r4, 0x30] @@ -722158,15 +698194,13 @@ sub_8160338: @ 8160338 bl sub_8008258 b _08160396 .align 2, 0 -_08160370: .4byte 0x02038437 -_08160374: .4byte 0x0203841e -_08160378: .4byte 0x0000fff5 + .pool _0816037C: movs r0, 0xB strh r0, [r4, 0x2E] movs r0, 0xC0 strh r0, [r4, 0x30] - ldr r1, _081603A0 + ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] adds r0, r2 @@ -722176,21 +698210,20 @@ _0816037C: adds r0, r1 strh r0, [r4, 0x22] _08160396: - ldr r0, _081603A4 + ldr r0, =sub_81602E0 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081603A0: .4byte 0x0203841e -_081603A4: .4byte sub_81602E0 + 1 + .pool thumb_func_end sub_8160338 thumb_func_start sub_81603A8 sub_81603A8: @ 81603A8 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _081603EC + ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -722212,7 +698245,7 @@ _081603D2: strh r0, [r5, 0x3A] movs r1, 0x10 strh r1, [r5, 0x3C] - ldr r0, _081603F0 + ldr r0, =sub_81603F4 + 1 str r0, [r5, 0x1C] lsls r1, 8 movs r0, 0x52 @@ -722221,8 +698254,7 @@ _081603D2: pop {r0} bx r0 .align 2, 0 -_081603EC: .4byte 0x02038436 -_081603F0: .4byte sub_81603F4 + 1 + .pool thumb_func_end sub_81603A8 thumb_func_start sub_81603F4 @@ -722367,10 +698399,10 @@ sub_81604F0: @ 81604F0 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _0816050C + ldr r2, =0x0203841e movs r0, 0 strh r0, [r2, 0xE] - ldr r0, _08160510 + ldr r0, =0x0203841c ldrh r1, [r0] movs r0, 0x60 ands r0, r1 @@ -722379,8 +698411,7 @@ sub_81604F0: @ 81604F0 movs r0, 0x1 b _08160536 .align 2, 0 -_0816050C: .4byte 0x0203841e -_08160510: .4byte 0x0203841c + .pool _08160514: movs r0, 0x7 ands r0, r1 @@ -722418,30 +698449,27 @@ sub_8160544: @ 8160544 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0816057C + ldr r0, =0x03005e00 adds r4, r0 movs r0, 0 strh r0, [r4, 0x8] - ldr r0, _08160580 + ldr r0, =0x0203841e ldrb r0, [r0] bl obj_id_for_side_relative_to_move adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 strh r1, [r4, 0x26] - ldr r2, _08160584 + ldr r2, =0x085ce9c8 adds r0, r4, 0 bl sub_80A7CFC - ldr r0, _08160588 + ldr r0, =sub_816058C + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_0816057C: .4byte 0x03005e00 -_08160580: .4byte 0x0203841e -_08160584: .4byte 0x085ce9c8 -_08160588: .4byte sub_816058C + 1 + .pool thumb_func_end sub_8160544 thumb_func_start sub_816058C @@ -722452,7 +698480,7 @@ sub_816058C: @ 816058C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r2, _081605E4 + ldr r2, =0x03005e00 adds r3, r0, r2 ldrh r0, [r3, 0x8] adds r1, r0, 0x1 @@ -722479,22 +698507,20 @@ sub_816058C: @ 816058C ands r0, r5 cmp r0, 0 bne _081605F0 - ldr r2, _081605E8 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081605EC + ldr r1, =0x0000ffff strh r1, [r0, 0x24] b _08160600 .align 2, 0 -_081605E4: .4byte 0x03005e00 -_081605E8: .4byte 0x02020630 -_081605EC: .4byte 0x0000ffff + .pool _081605F0: - ldr r2, _08160620 + ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -722518,7 +698544,7 @@ _08160618: pop {r0} bx r0 .align 2, 0 -_08160620: .4byte 0x02020630 + .pool thumb_func_end sub_816058C thumb_func_start sub_8160624 @@ -722536,7 +698562,7 @@ sub_8160638: @ 8160638 push {lr} sub sp, 0x4 bl script_env_2_enable - ldr r0, _08160660 + ldr r0, =sub_8160664 + 1 movs r1, 0xA bl AddTask movs r0, 0x1 @@ -722550,7 +698576,7 @@ sub_8160638: @ 8160638 pop {r0} bx r0 .align 2, 0 -_08160660: .4byte sub_8160664 + 1 + .pool thumb_func_end sub_8160638 thumb_func_start sub_8160664 @@ -722558,16 +698584,16 @@ sub_8160664: @ 8160664 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08160690 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08160688 - ldr r0, _08160694 + ldr r0, =sub_81606A0 + 1 bl set_callback2 - ldr r1, _08160698 - ldr r0, _0816069C + ldr r1, =0x03005dac + ldr r0, =sub_80AF168 + 1 str r0, [r1] adds r0, r4, 0 bl remove_task @@ -722576,10 +698602,7 @@ _08160688: pop {r0} bx r0 .align 2, 0 -_08160690: .4byte 0x02037fd4 -_08160694: .4byte sub_81606A0 + 1 -_08160698: .4byte 0x03005dac -_0816069C: .4byte sub_80AF168 + 1 + .pool thumb_func_end sub_8160664 thumb_func_start sub_81606A0 @@ -722589,33 +698612,33 @@ sub_81606A0: @ 81606A0 bl gpu_pal_allocator_reset bl clear_tasks bl clear_scheduled_bg_copies_to_vram - ldr r6, _08160720 + ldr r6, =0x0203bc34 movs r0, 0x8C lsls r0, 1 bl malloc_and_clear str r0, [r6] - ldr r1, _08160724 + ldr r1, =0x020375e0 ldrh r1, [r1] adds r0, 0x44 movs r5, 0 strb r1, [r0] - ldr r0, _08160728 + ldr r0, =sub_8160624 + 1 bl SetVBlankCallback bl sub_81607EC movs r0, 0 bl sub_81D2824 - ldr r4, _0816072C + ldr r4, =0x0203bc38 movs r0, 0 strh r5, [r4] strh r5, [r4, 0x2] strb r0, [r4, 0x4] bl sub_8161280 - ldr r0, _08160730 + ldr r0, =0x085cebb0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _08160734 + ldr r0, =0x085cebb8 bl gpu_pal_obj_alloc_tag_and_apply bl sub_81610B8 - ldr r0, _08160738 + ldr r0, =0x03006310 ldrh r1, [r4] ldrh r2, [r4, 0x2] bl calls_per_item_funcs_in_list_outer @@ -722628,20 +698651,13 @@ sub_81606A0: @ 81606A0 movs r1, 0 movs r2, 0x2 bl rboxid_80040B8 - ldr r0, _0816073C + ldr r0, =sub_816082C + 1 bl set_callback2 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08160720: .4byte 0x0203bc34 -_08160724: .4byte 0x020375e0 -_08160728: .4byte sub_8160624 + 1 -_0816072C: .4byte 0x0203bc38 -_08160730: .4byte 0x085cebb0 -_08160734: .4byte 0x085cebb8 -_08160738: .4byte 0x03006310 -_0816073C: .4byte sub_816082C + 1 + .pool thumb_func_end sub_81606A0 thumb_func_start sub_8160740 @@ -722651,7 +698667,7 @@ sub_8160740: @ 8160740 bl gpu_pal_allocator_reset bl clear_tasks bl clear_scheduled_bg_copies_to_vram - ldr r5, _081607C8 + ldr r5, =0x0203bc34 movs r0, 0x8C lsls r0, 1 bl malloc_and_clear @@ -722659,28 +698675,28 @@ sub_8160740: @ 8160740 movs r1, 0x1C strb r1, [r0] ldr r0, [r5] - ldr r1, _081607CC + ldr r1, =0x020375e0 ldrh r1, [r1] adds r0, 0x44 strb r1, [r0] ldr r0, [r5] - ldr r1, _081607D0 + ldr r1, =0x020375e2 ldrh r1, [r1] adds r0, 0x45 strb r1, [r0] - ldr r0, _081607D4 + ldr r0, =sub_8160624 + 1 bl SetVBlankCallback bl sub_81607EC - ldr r4, _081607D8 + ldr r4, =0x0203bc38 ldrb r0, [r4, 0x4] bl sub_81D2824 bl sub_8161280 - ldr r0, _081607DC + ldr r0, =0x085cebb0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _081607E0 + ldr r0, =0x085cebb8 bl gpu_pal_obj_alloc_tag_and_apply bl sub_81610B8 - ldr r0, _081607E4 + ldr r0, =0x03006310 ldrh r1, [r4] ldrh r2, [r4, 0x2] bl calls_per_item_funcs_in_list_outer @@ -722693,21 +698709,13 @@ sub_8160740: @ 8160740 movs r1, 0 movs r2, 0x2 bl rboxid_80040B8 - ldr r0, _081607E8 + ldr r0, =sub_816082C + 1 bl set_callback2 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081607C8: .4byte 0x0203bc34 -_081607CC: .4byte 0x020375e0 -_081607D0: .4byte 0x020375e2 -_081607D4: .4byte sub_8160624 + 1 -_081607D8: .4byte 0x0203bc38 -_081607DC: .4byte 0x085cebb0 -_081607E0: .4byte 0x085cebb8 -_081607E4: .4byte 0x03006310 -_081607E8: .4byte sub_816082C + 1 + .pool thumb_func_end sub_8160740 thumb_func_start sub_81607EC @@ -722716,7 +698724,7 @@ sub_81607EC: @ 81607EC bl sub_8121DA0 movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08160828 + ldr r1, =0x085cec28 movs r0, 0 movs r2, 0x2 bl bg_vram_setup @@ -722735,7 +698743,7 @@ sub_81607EC: @ 81607EC pop {r0} bx r0 .align 2, 0 -_08160828: .4byte 0x085cec28 + .pool thumb_func_end sub_81607EC thumb_func_start sub_816082C @@ -722755,7 +698763,7 @@ sub_816082C: @ 816082C sub_816084C: @ 816084C push {r4,lr} adds r1, r0, 0 - ldr r4, _08160864 + ldr r4, =0x02021fc4 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -722764,7 +698772,7 @@ sub_816084C: @ 816084C pop {r0} bx r0 .align 2, 0 -_08160864: .4byte 0x02021fc4 + .pool thumb_func_end sub_816084C thumb_func_start sub_8160868 @@ -722773,7 +698781,7 @@ sub_8160868: @ 8160868 mov r7, r8 push {r7} sub sp, 0x4 - ldr r1, _08160888 + ldr r1, =0x0203bc34 ldr r0, [r1] ldrb r0, [r0] adds r7, r1, 0 @@ -722782,13 +698790,12 @@ sub_8160868: @ 8160868 b _08160E8A _0816087E: lsls r0, 2 - ldr r1, _0816088C + ldr r1, =_08160890 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08160888: .4byte 0x0203bc34 -_0816088C: .4byte _08160890 + .pool .align 2, 0 _08160890: .4byte _08160918 @@ -722839,7 +698846,7 @@ _08160918: movs r1, 0 b _08160CAE _08160932: - ldr r0, _08160948 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -722851,7 +698858,7 @@ _08160940: movs r0, 0x4 b _08160E88 .align 2, 0 -_08160948: .4byte 0x02037fd4 + .pool _0816094C: ldr r1, [r7] ldrb r0, [r1] @@ -722869,7 +698876,7 @@ _08160964: movs r0, 0 bl sub_8161074 _0816096A: - ldr r0, _0816097C + ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -722877,7 +698884,7 @@ _0816096A: bl sub_81611AC b _08160E8A .align 2, 0 -_0816097C: .4byte 0x0203bc34 + .pool _08160980: movs r0, 0x1 bl sub_8160F50 @@ -722890,27 +698897,27 @@ _08160988: b _08160E8A _08160994: bl sub_81D2C50 - ldr r0, _081609A4 + ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 b _08160E88 .align 2, 0 -_081609A4: .4byte 0x0203bc34 + .pool _081609A8: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 bne _08160A0A - ldr r5, _081609F0 + ldr r5, =0x0203bc34 ldr r0, [r5] adds r0, 0x44 ldrb r1, [r0] movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _081609F4 + ldr r0, =0x020244ec adds r4, r0 bl sub_8161054 adds r1, r0, 0 @@ -722919,23 +698926,19 @@ _081609A8: adds r0, r4, 0 bl pokemon_moveset_pad_ lsls r0, 16 - ldr r1, _081609F8 + ldr r1, =0xffff0000 cmp r0, r1 beq _08160A04 - ldr r0, _081609FC + ldr r0, =0x085ef8e4 bl sub_816084C - ldr r1, _08160A00 + ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] ldr r1, [r5] movs r0, 0x1F b _08160E88 .align 2, 0 -_081609F0: .4byte 0x0203bc34 -_081609F4: .4byte 0x020244ec -_081609F8: .4byte 0xffff0000 -_081609FC: .4byte 0x085ef8e4 -_08160A00: .4byte 0x020375e0 + .pool _08160A04: ldr r1, [r5] movs r0, 0x10 @@ -722949,28 +698952,27 @@ _08160A0A: beq _08160A18 b _08160E8A _08160A18: - ldr r0, _08160A28 + ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 bne _08160A30 - ldr r0, _08160A2C + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x3 b _08160E88 .align 2, 0 -_08160A28: .4byte 0x0203bc38 -_08160A2C: .4byte 0x0203bc34 + .pool _08160A30: cmp r0, 0x1 beq _08160A36 b _08160E8A _08160A36: - ldr r0, _08160A40 + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x5 b _08160E88 .align 2, 0 -_08160A40: .4byte 0x0203bc34 + .pool _08160A44: bl sub_81D2C3C lsls r0, 16 @@ -722979,24 +698981,24 @@ _08160A44: b _08160E8A _08160A50: bl sub_81D2C50 - ldr r0, _08160A60 + ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 b _08160E88 .align 2, 0 -_08160A60: .4byte 0x0203bc34 + .pool _08160A64: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 bne _08160A7C - ldr r0, _08160A78 + ldr r0, =0x020375e0 strh r1, [r0] b _08160E82 .align 2, 0 -_08160A78: .4byte 0x020375e0 + .pool _08160A7C: movs r0, 0x1 negs r0, r0 @@ -723006,39 +699008,37 @@ _08160A7C: beq _08160A8A b _08160E8A _08160A8A: - ldr r0, _08160A9C + ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 bne _08160AA4 - ldr r0, _08160AA0 + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x3 b _08160E88 .align 2, 0 -_08160A9C: .4byte 0x0203bc38 -_08160AA0: .4byte 0x0203bc34 + .pool _08160AA4: cmp r0, 0x1 beq _08160AAA b _08160E8A _08160AAA: - ldr r0, _08160AB4 + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x5 b _08160E88 .align 2, 0 -_08160AB4: .4byte 0x0203bc34 + .pool _08160AB8: - ldr r0, _08160AC8 + ldr r0, =0x085ef8f3 bl sub_816084C - ldr r0, _08160ACC + ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 b _08160E88 .align 2, 0 -_08160AC8: .4byte 0x085ef8f3 -_08160ACC: .4byte 0x0203bc34 + .pool _08160AD0: bl sub_81D2C3C lsls r0, 16 @@ -723047,27 +699047,26 @@ _08160AD0: b _08160E8A _08160ADC: bl sub_81D2C50 - ldr r0, _08160AE8 + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x12 b _08160E88 .align 2, 0 -_08160AE8: .4byte 0x0203bc34 + .pool _08160AEC: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 bne _08160B10 - ldr r0, _08160B08 + ldr r0, =0x085efa10 bl sub_816084C - ldr r0, _08160B0C + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x13 b _08160E88 .align 2, 0 -_08160B08: .4byte 0x085efa10 -_08160B0C: .4byte 0x0203bc34 + .pool _08160B10: movs r0, 0x1 negs r0, r0 @@ -723077,33 +699076,30 @@ _08160B10: beq _08160B1E b _08160E8A _08160B1E: - ldr r0, _08160B28 + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x18 b _08160E88 .align 2, 0 -_08160B28: .4byte 0x0203bc34 + .pool _08160B2C: - ldr r4, _08160B50 + ldr r4, =0x02021dc4 bl sub_8161054 movs r1, 0xD muls r1, r0 - ldr r0, _08160B54 + ldr r0, =0x0831977c adds r1, r0 adds r0, r4, 0 bl gf_strcpy - ldr r0, _08160B58 + ldr r0, =0x085ef960 bl sub_816084C - ldr r0, _08160B5C + ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 b _08160E88 .align 2, 0 -_08160B50: .4byte 0x02021dc4 -_08160B54: .4byte 0x0831977c -_08160B58: .4byte 0x085ef960 -_08160B5C: .4byte 0x0203bc34 + .pool _08160B60: bl sub_81D2C3C lsls r0, 16 @@ -723112,25 +699108,25 @@ _08160B60: b _08160E8A _08160B6C: bl sub_81D2C50 - ldr r0, _08160B7C + ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 b _08160E88 .align 2, 0 -_08160B7C: .4byte 0x0203bc34 + .pool _08160B80: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 bne _08160B98 - ldr r0, _08160B94 + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x1B b _08160E88 .align 2, 0 -_08160B94: .4byte 0x0203bc34 + .pool _08160B98: movs r0, 0x1 negs r0, r0 @@ -723140,21 +699136,20 @@ _08160B98: beq _08160BA6 b _08160E8A _08160BA6: - ldr r0, _08160BBC + ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 bne _08160BC4 - ldr r2, _08160BC0 + ldr r2, =0x0203bc34 ldr r1, [r2] movs r0, 0x3 strb r0, [r1] adds r7, r2, 0 b _08160BD0 .align 2, 0 -_08160BBC: .4byte 0x0203bc38 -_08160BC0: .4byte 0x0203bc34 + .pool _08160BC4: - ldr r7, _08160BD8 + ldr r7, =0x0203bc34 cmp r0, 0x1 bne _08160BD0 ldr r1, [r7] @@ -723165,7 +699160,7 @@ _08160BD0: movs r0, 0x10 b _08160E88 .align 2, 0 -_08160BD8: .4byte 0x0203bc34 + .pool _08160BDC: bl sub_81D2C3C lsls r0, 16 @@ -723176,28 +699171,27 @@ _08160BE8: movs r0, 0x3 movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _08160C00 + ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 bne _08160C08 - ldr r0, _08160C04 + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x3 b _08160E88 .align 2, 0 -_08160C00: .4byte 0x0203bc38 -_08160C04: .4byte 0x0203bc34 + .pool _08160C08: cmp r0, 0x1 beq _08160C0E b _08160E8A _08160C0E: - ldr r0, _08160C18 + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x5 b _08160E88 .align 2, 0 -_08160C18: .4byte 0x0203bc34 + .pool _08160C1C: bl sub_81D2C3C lsls r0, 16 @@ -723206,7 +699200,7 @@ _08160C1C: beq _08160C2A b _08160E8A _08160C2A: - ldr r0, _08160C44 + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x14 strb r0, [r1] @@ -723218,9 +699212,9 @@ _08160C2A: bl sub_80A1AD4 b _08160E8A .align 2, 0 -_08160C44: .4byte 0x0203bc34 + .pool _08160C48: - ldr r0, _08160C84 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -723231,28 +699225,24 @@ _08160C56: bl sub_8161054 lsls r0, 16 lsrs r0, 16 - ldr r4, _08160C88 - ldr r1, _08160C8C + ldr r4, =0x020244ec + ldr r1, =0x0203bc34 ldr r1, [r1] adds r1, 0x44 ldrb r1, [r1] - ldr r2, _08160C90 + ldr r2, =0x020244e9 ldrb r2, [r2] subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, _08160C94 + ldr r3, =sub_8160740 + 1 str r0, [sp] adds r0, r4, 0 bl sub_81BFA38 bl sub_8160EA0 b _08160E8A .align 2, 0 -_08160C84: .4byte 0x02037fd4 -_08160C88: .4byte 0x020244ec -_08160C8C: .4byte 0x0203bc34 -_08160C90: .4byte 0x020244e9 -_08160C94: .4byte sub_8160740 + 1 + .pool _08160C98: bl sub_81D2C3C lsls r0, 16 @@ -723279,15 +699269,15 @@ _08160CB8: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08160CD4 + ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 b _08160E88 .align 2, 0 -_08160CD4: .4byte 0x0203bc34 + .pool _08160CD8: - ldr r0, _08160CF4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -723296,12 +699286,11 @@ _08160CD8: b _08160E8A _08160CE6: bl sub_8160EA0 - ldr r0, _08160CF8 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 b _08160E8A .align 2, 0 -_08160CF4: .4byte 0x02037fd4 -_08160CF8: .4byte c2_exit_to_overworld_2_switch + 1 + .pool _08160CFC: movs r0, 0x1 negs r0, r0 @@ -723310,12 +699299,12 @@ _08160CFC: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _08160D28 + ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r0, _08160D2C + ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 bne _08160D30 @@ -723323,8 +699312,7 @@ _08160CFC: bl render_previous_quest_text b _08160D3A .align 2, 0 -_08160D28: .4byte 0x0203bc34 -_08160D2C: .4byte 0x0203bc38 + .pool _08160D30: cmp r0, 0x1 bne _08160D3A @@ -723337,7 +699325,7 @@ _08160D3A: bl Window_CopyToVram b _08160E8A _08160D48: - ldr r0, _08160D68 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -723354,26 +699342,26 @@ _08160D56: movs r0, 0x18 b _08160E88 .align 2, 0 -_08160D68: .4byte 0x02037fd4 + .pool _08160D6C: adds r0, r1, 0 adds r0, 0x44 ldrb r0, [r0] movs r4, 0x64 muls r0, r4 - ldr r5, _08160DF4 + ldr r5, =0x020244ec adds r0, r5 ldrb r1, [r2] adds r1, 0xD bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - ldr r2, _08160DF8 + ldr r2, =0x02021ec4 movs r1, 0xD mov r8, r1 mov r1, r8 muls r1, r0 - ldr r6, _08160DFC + ldr r6, =0x0831977c adds r1, r6 adds r0, r2, 0 bl gf_strcpy @@ -723400,74 +699388,66 @@ _08160D6C: ldrb r2, [r0] adds r0, r4, 0 bl sub_80691F4 - ldr r4, _08160E00 + ldr r4, =0x02021dc4 bl sub_8161054 mov r1, r8 muls r1, r0 adds r1, r6 adds r0, r4, 0 bl gf_strcpy - ldr r0, _08160E04 + ldr r0, =0x085ef979 bl sub_816084C ldr r1, [r7] movs r0, 0x1E strb r0, [r1] - ldr r1, _08160E08 + ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] b _08160E8A .align 2, 0 -_08160DF4: .4byte 0x020244ec -_08160DF8: .4byte 0x02021ec4 -_08160DFC: .4byte 0x0831977c -_08160E00: .4byte 0x02021dc4 -_08160E04: .4byte 0x085ef979 -_08160E08: .4byte 0x020375e0 + .pool _08160E0C: bl sub_81D2C3C lsls r0, 16 cmp r0, 0 bne _08160E8A - ldr r0, _08160E2C + ldr r0, =0x085ef9a6 bl sub_816084C - ldr r0, _08160E30 + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x1F strb r0, [r1] - ldr r0, _08160E34 + ldr r0, =0x0000016f bl fanfare_play b _08160E8A .align 2, 0 -_08160E2C: .4byte 0x085ef9a6 -_08160E30: .4byte 0x0203bc34 -_08160E34: .4byte 0x0000016f + .pool _08160E38: bl sub_81D2C3C lsls r0, 16 cmp r0, 0 bne _08160E8A - ldr r0, _08160E50 + ldr r0, =0x0000016f bl fanfare_play - ldr r0, _08160E54 + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x20 b _08160E88 .align 2, 0 -_08160E50: .4byte 0x0000016f -_08160E54: .4byte 0x0203bc34 + .pool _08160E58: bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 beq _08160E8A - ldr r0, _08160E6C + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x21 b _08160E88 .align 2, 0 -_08160E6C: .4byte 0x0203bc34 + .pool _08160E70: - ldr r0, _08160E98 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -723476,7 +699456,7 @@ _08160E70: movs r0, 0x5 bl audio_play _08160E82: - ldr r0, _08160E9C + ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0xE _08160E88: @@ -723489,21 +699469,20 @@ _08160E8A: pop {r0} bx r0 .align 2, 0 -_08160E98: .4byte 0x030022c0 -_08160E9C: .4byte 0x0203bc34 + .pool thumb_func_end sub_8160868 thumb_func_start sub_8160EA0 sub_8160EA0: @ 8160EA0 push {r4,lr} bl sub_8161234 - ldr r4, _08160ED8 + ldr r4, =0x0203bc34 ldr r0, [r4] movs r1, 0x89 lsls r1, 1 adds r0, r1 ldrb r0, [r0] - ldr r1, _08160EDC + ldr r1, =0x0203bc38 adds r2, r1, 0x2 bl sub_81AE6C8 bl Window_FreeMemory @@ -723517,8 +699496,7 @@ sub_8160EA0: @ 8160EA0 pop {r0} bx r0 .align 2, 0 -_08160ED8: .4byte 0x0203bc34 -_08160EDC: .4byte 0x0203bc38 + .pool thumb_func_end sub_8160EA0 thumb_func_start render_previous_quest_text @@ -723528,8 +699506,8 @@ render_previous_quest_text: @ 8160EE0 lsls r0, 24 lsrs r5, r0, 24 movs r2, 0 - ldr r6, _08160F40 - ldr r4, _08160F44 + ldr r6, =0x02020630 + ldr r4, =0x0203bc34 movs r3, 0x4 _08160EF0: ldr r0, [r4] @@ -723549,8 +699527,8 @@ _08160EF0: ble _08160EF0 cmp r5, 0 bne _08160F38 - ldr r4, _08160F48 - ldr r1, _08160F4C + ldr r4, =0x02021fc4 + ldr r1, =0x085ef8c2 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x3 @@ -723571,10 +699549,7 @@ _08160F38: pop {r0} bx r0 .align 2, 0 -_08160F40: .4byte 0x02020630 -_08160F44: .4byte 0x0203bc34 -_08160F48: .4byte 0x02021fc4 -_08160F4C: .4byte 0x085ef8c2 + .pool thumb_func_end render_previous_quest_text thumb_func_start sub_8160F50 @@ -723582,7 +699557,7 @@ sub_8160F50: @ 8160F50 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r6, _08160FB8 + ldr r6, =0x0203bc34 ldr r0, [r6] movs r4, 0x89 lsls r4, 1 @@ -723593,7 +699568,7 @@ sub_8160F50: @ 8160F50 ldr r0, [r6] adds r0, r4 ldrb r0, [r0] - ldr r4, _08160FBC + ldr r4, =0x0203bc38 adds r2, r4, 0x2 adds r1, r4, 0 bl get_coro_args_x18_x1A @@ -723604,7 +699579,7 @@ sub_8160F50: @ 8160F50 adds r0, 0x1 cmp r5, r0 bne _08161010 - ldr r0, _08160FC0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x30 ands r0, r1 @@ -723628,9 +699603,7 @@ _08160F9C: strb r0, [r4, 0x4] b _08160FD4 .align 2, 0 -_08160FB8: .4byte 0x0203bc34 -_08160FBC: .4byte 0x0203bc38 -_08160FC0: .4byte 0x030022c0 + .pool _08160FC4: movs r0, 0 bl Window_WriteStandardTileMap @@ -723652,16 +699625,15 @@ _08160FE4: ldr r1, [r6] movs r0, 0xC strb r0, [r1] - ldr r4, _08161008 - ldr r1, _0816100C + ldr r4, =0x02021fc4 + ldr r1, =0x085ef9e6 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 bl sub_81D2BF4 b _0816103E .align 2, 0 -_08161008: .4byte 0x02021fc4 -_0816100C: .4byte 0x085ef9e6 + .pool _08161010: movs r0, 0x5 bl audio_play @@ -723669,14 +699641,14 @@ _08161010: ldr r1, [r6] movs r0, 0x8 strb r0, [r1] - ldr r0, _08161044 + ldr r0, =0x02021dc4 movs r1, 0xD muls r1, r5 - ldr r2, _08161048 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r4, _0816104C - ldr r1, _08161050 + ldr r4, =0x02021fc4 + ldr r1, =0x085ef8da adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -723686,17 +699658,14 @@ _0816103E: pop {r0} bx r0 .align 2, 0 -_08161044: .4byte 0x02021dc4 -_08161048: .4byte 0x0831977c -_0816104C: .4byte 0x02021fc4 -_08161050: .4byte 0x085ef8da + .pool thumb_func_end sub_8160F50 thumb_func_start sub_8161054 sub_8161054: @ 8161054 - ldr r0, _0816106C + ldr r0, =0x0203bc34 ldr r2, [r0] - ldr r1, _08161070 + ldr r1, =0x0203bc38 ldrh r0, [r1, 0x2] ldrh r1, [r1] adds r0, r1 @@ -723706,8 +699675,7 @@ sub_8161054: @ 8161054 ldr r0, [r2] bx lr .align 2, 0 -_0816106C: .4byte 0x0203bc34 -_08161070: .4byte 0x0203bc38 + .pool thumb_func_end sub_8161054 thumb_func_start sub_8161074 @@ -723718,8 +699686,8 @@ sub_8161074: @ 8161074 lsrs r5, r0, 24 cmp r5, 0 bne _081610A6 - ldr r4, _081610B0 - ldr r1, _081610B4 + ldr r4, =0x02021fc4 + ldr r1, =0x085ef8c2 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x3 @@ -723740,14 +699708,13 @@ _081610A6: pop {r0} bx r0 .align 2, 0 -_081610B0: .4byte 0x02021fc4 -_081610B4: .4byte 0x085ef8c2 + .pool thumb_func_end sub_8161074 thumb_func_start sub_81610B8 sub_81610B8: @ 81610B8 push {r4-r7,lr} - ldr r2, _0816119C + ldr r2, =0x0203bc34 ldr r0, [r2] movs r1, 0x8A lsls r1, 1 @@ -723755,14 +699722,14 @@ sub_81610B8: @ 81610B8 movs r1, 0xFF strb r1, [r0] ldr r0, [r2] - ldr r2, _081611A0 + ldr r2, =0x00000113 adds r1, r0, r2 movs r0, 0x1 negs r0, r0 strb r0, [r1] bl sub_81611AC movs r4, 0 - ldr r5, _081611A4 + ldr r5, =0x085cec10 _081610DC: adds r2, r4, 0 cmp r4, 0 @@ -723785,7 +699752,7 @@ _081610E4: adds r0, r5, 0 movs r3, 0 bl obj_add_from_template_forward_search - ldr r2, _0816119C + ldr r2, =0x0203bc34 ldr r1, [r2] adds r1, 0x1 adds r1, r4 @@ -723794,7 +699761,7 @@ _081610E4: cmp r4, 0x7 ble _081610DC movs r4, 0 - ldr r7, _081611A4 + ldr r7, =0x085cec10 adds r6, r2, 0 _0816111C: adds r2, r4, 0 @@ -723831,7 +699798,7 @@ _08161124: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _081611A8 + ldr r5, =0x02020630 adds r0, r5 movs r1, 0x2 bl obj_anim_image_start @@ -723839,7 +699806,7 @@ _08161124: cmp r4, 0x7 ble _0816111C movs r4, 0 - ldr r3, _0816119C + ldr r3, =0x0203bc34 movs r2, 0x4 _08161176: ldr r0, [r3] @@ -723861,16 +699828,13 @@ _08161176: pop {r0} bx r0 .align 2, 0 -_0816119C: .4byte 0x0203bc34 -_081611A0: .4byte 0x00000113 -_081611A4: .4byte 0x085cec10 -_081611A8: .4byte 0x02020630 + .pool thumb_func_end sub_81610B8 thumb_func_start sub_81611AC sub_81611AC: @ 81611AC push {r4-r6,lr} - ldr r4, _08161218 + ldr r4, =0x0203bc34 ldr r1, [r4] movs r2, 0x8A lsls r2, 1 @@ -723878,7 +699842,7 @@ sub_81611AC: @ 81611AC ldrb r0, [r0] cmp r0, 0xFF bne _081611D4 - ldr r0, _0816121C + ldr r0, =0x085cebc0 movs r3, 0x8B lsls r3, 1 adds r1, r3 @@ -723890,14 +699854,14 @@ sub_81611AC: @ 81611AC strb r0, [r1] _081611D4: ldr r0, [r4] - ldr r6, _08161220 + ldr r6, =0x00000113 adds r0, r6 ldrb r0, [r0] cmp r0, 0xFF bne _08161210 - ldr r0, _08161224 + ldr r0, =0x0203ce8c adds r2, r0, 0 - ldr r1, _08161228 + ldr r1, =0x085cebd0 ldm r1!, {r3,r5,r6} stm r2!, {r3,r5,r6} ldr r1, [r1] @@ -723907,15 +699871,15 @@ _081611D4: lsls r3, 1 adds r1, r2, r3 ldrb r1, [r1] - ldr r5, _0816122C + ldr r5, =0x00000111 adds r2, r5 ldrb r2, [r2] subs r1, r2 strh r1, [r0, 0x8] - ldr r1, _08161230 + ldr r1, =0x0203bc38 bl sub_81AF380 ldr r1, [r4] - ldr r6, _08161220 + ldr r6, =0x00000113 adds r1, r6 strb r0, [r1] _08161210: @@ -723923,19 +699887,13 @@ _08161210: pop {r0} bx r0 .align 2, 0 -_08161218: .4byte 0x0203bc34 -_0816121C: .4byte 0x085cebc0 -_08161220: .4byte 0x00000113 -_08161224: .4byte 0x0203ce8c -_08161228: .4byte 0x085cebd0 -_0816122C: .4byte 0x00000111 -_08161230: .4byte 0x0203bc38 + .pool thumb_func_end sub_81611AC thumb_func_start sub_8161234 sub_8161234: @ 8161234 push {r4,lr} - ldr r4, _08161278 + ldr r4, =0x0203bc34 ldr r0, [r4] movs r2, 0x8A lsls r2, 1 @@ -723952,14 +699910,14 @@ sub_8161234: @ 8161234 strb r1, [r0] _08161256: ldr r0, [r4] - ldr r2, _0816127C + ldr r2, =0x00000113 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF beq _08161270 bl sub_81AF620 ldr r0, [r4] - ldr r2, _0816127C + ldr r2, =0x00000113 adds r1, r0, r2 movs r0, 0xFF strb r0, [r1] @@ -723968,8 +699926,7 @@ _08161270: pop {r0} bx r0 .align 2, 0 -_08161278: .4byte 0x0203bc34 -_0816127C: .4byte 0x00000113 + .pool thumb_func_end sub_8161234 thumb_func_start sub_8161280 @@ -723979,14 +699936,14 @@ sub_8161280: @ 8161280 mov r6, r8 push {r6,r7} sub sp, 0xC - ldr r4, _08161364 + ldr r4, =0x0203bc34 ldr r1, [r4] adds r0, r1, 0 adds r0, 0x44 ldrb r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _08161368 + ldr r2, =0x020244ec adds r0, r2 adds r1, 0x12 bl sub_806E0B4 @@ -724004,7 +699961,7 @@ sub_8161280: @ 8161280 mov r8, r4 movs r0, 0xD mov r12, r0 - ldr r2, _0816136C + ldr r2, =0x0831977c mov r9, r2 _081612C2: mov r7, r8 @@ -724034,18 +699991,18 @@ _081612C2: cmp r5, r0 blt _081612C2 _081612F6: - ldr r4, _08161364 + ldr r4, =0x0203bc34 ldr r0, [r4] adds r0, 0x44 ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08161368 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 mov r2, sp bl pokemon_getattr - ldr r0, _08161370 + ldr r0, =0x02021cc4 mov r1, sp bl strcpy_limit_10_chars ldr r2, [r4] @@ -724057,7 +700014,7 @@ _081612F6: adds r1, r2, 0 adds r1, 0x48 adds r1, r0 - ldr r0, _08161374 + ldr r0, =0x085e8cf0 str r0, [r1] ldrb r0, [r3] lsls r0, 3 @@ -724076,7 +700033,7 @@ _081612F6: ldrb r1, [r1] bl sub_81D28C8 ldr r1, [r4] - ldr r2, _08161378 + ldr r2, =0x00000111 adds r1, r2 strb r0, [r1] add sp, 0xC @@ -724087,12 +700044,7 @@ _081612F6: pop {r0} bx r0 .align 2, 0 -_08161364: .4byte 0x0203bc34 -_08161368: .4byte 0x020244ec -_0816136C: .4byte 0x0831977c -_08161370: .4byte 0x02021cc4 -_08161374: .4byte 0x085e8cf0 -_08161378: .4byte 0x00000111 + .pool thumb_func_end sub_8161280 thumb_func_start sub_816137C @@ -724101,7 +700053,7 @@ sub_816137C: @ 816137C mov r7, r8 push {r7} adds r4, r0, 0 - ldr r0, _081613C0 + ldr r0, =0x0203bc38 ldrb r0, [r0, 0x4] cmp r0, 0 beq _08161394 @@ -724111,8 +700063,8 @@ sub_816137C: @ 816137C bne _081613CC _08161394: movs r5, 0 - ldr r4, _081613C4 - ldr r3, _081613C8 + ldr r4, =0x02020630 + ldr r3, =0x0203bc34 movs r2, 0x4 _0816139C: ldr r0, [r3] @@ -724134,12 +700086,10 @@ _0816139C: bls _0816139C b _081614FE .align 2, 0 -_081613C0: .4byte 0x0203bc38 -_081613C4: .4byte 0x02020630 -_081613C8: .4byte 0x0203bc34 + .pool _081613CC: - ldr r1, _08161410 - ldr r0, _08161414 + ldr r1, =0x0858cdcc + ldr r0, =0x0858c2b4 lsls r4, 3 adds r0, r4, r0 ldrb r0, [r0] @@ -724156,8 +700106,8 @@ _081613CC: movs r6, 0 _081613EE: movs r5, 0 - ldr r7, _08161418 - ldr r4, _0816141C + ldr r7, =0x0203bc34 + ldr r4, =0x02020630 _081613F4: cmp r5, r6 bcs _08161420 @@ -724173,10 +700123,7 @@ _081613F4: bl obj_anim_image_start b _08161436 .align 2, 0 -_08161410: .4byte 0x0858cdcc -_08161414: .4byte 0x0858c2b4 -_08161418: .4byte 0x0203bc34 -_0816141C: .4byte 0x02020630 + .pool _08161420: ldr r0, [r7] adds r0, 0x1 @@ -724209,8 +700156,8 @@ _08161436: lsrs r5, r0, 16 cmp r5, 0x7 bls _081613F4 - ldr r1, _081614A8 - ldr r0, _081614AC + ldr r1, =0x0858cdcc + ldr r0, =0x0858c2b4 add r0, r8 ldrb r0, [r0] lsls r0, 2 @@ -724225,9 +700172,9 @@ _08161436: movs r6, 0 _0816147C: movs r5, 0 - ldr r0, _081614B0 + ldr r0, =0x0203bc34 mov r8, r0 - ldr r7, _081614B4 + ldr r7, =0x02020630 _08161484: cmp r5, r6 bcs _081614B8 @@ -724246,10 +700193,7 @@ _08161484: bl obj_anim_image_start b _081614D4 .align 2, 0 -_081614A8: .4byte 0x0858cdcc -_081614AC: .4byte 0x0858c2b4 -_081614B0: .4byte 0x0203bc34 -_081614B4: .4byte 0x02020630 + .pool _081614B8: mov r3, r8 ldr r0, [r3] @@ -724302,7 +700246,7 @@ hm_prepare_dive_probably: @ 8161508 lsrs r0, 24 movs r6, 0x64 muls r0, r6 - ldr r4, _08161554 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x3A bl pokemon_getattr @@ -724329,7 +700273,7 @@ hm_prepare_dive_probably: @ 8161508 movs r0, 0 b _0816155A .align 2, 0 -_08161554: .4byte 0x020244ec + .pool _08161558: movs r0, 0x1 _0816155A: @@ -724344,7 +700288,7 @@ sub_8161560: @ 8161560 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0816159C + ldr r0, =0x0203cec8 movs r1, 0xA strb r1, [r0, 0xB] ldrb r1, [r0, 0x9] @@ -724356,20 +700300,18 @@ sub_8161560: @ 8161560 bl sub_81B0FCC movs r0, 0x5 bl sub_81B3054 - ldr r1, _081615A0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081615A4 + ldr r1, =sub_81B1370 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0816159C: .4byte 0x0203cec8 -_081615A0: .4byte 0x03005e00 -_081615A4: .4byte sub_81B1370 + 1 + .pool thumb_func_end sub_8161560 thumb_func_start sub_81615A8 @@ -724383,7 +700325,7 @@ sub_81615A8: @ 81615A8 lsls r0, 24 lsrs r4, r0, 24 str r4, [sp, 0x4] - ldr r1, _081615E0 + ldr r1, =0x0203cec8 ldrb r7, [r1, 0x9] mov r8, r7 ldrb r0, [r1, 0xA] @@ -724393,24 +700335,22 @@ sub_81615A8: @ 81615A8 movs r0, 0 strb r0, [r1, 0xB] bl sub_81B3054 - ldr r1, _081615E4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081615E8 + ldr r1, =sub_81B1370 + 1 str r1, [r0] b _08161658 .align 2, 0 -_081615E0: .4byte 0x0203cec8 -_081615E4: .4byte 0x03005e00 -_081615E8: .4byte sub_81B1370 + 1 + .pool _081615EC: movs r0, 0x64 mov r10, r0 mov r0, r10 muls r0, r5 - ldr r1, _08161624 + ldr r1, =0x020244ec mov r9, r1 adds r6, r0, r1 adds r0, r6, 0 @@ -724432,7 +700372,7 @@ _0816161A: bl sub_81617B8 b _08161658 .align 2, 0 -_08161624: .4byte 0x020244ec + .pool _08161628: movs r0, 0x1 bl audio_play @@ -724449,7 +700389,7 @@ _08161628: asrs r3, 16 movs r2, 0x1 negs r2, r2 - ldr r0, _08161668 + ldr r0, =sub_816166C + 1 str r0, [sp] ldr r0, [sp, 0x4] mov r1, r8 @@ -724464,7 +700404,7 @@ _08161658: pop {r0} bx r0 .align 2, 0 -_08161668: .4byte sub_816166C + 1 + .pool thumb_func_end sub_81615A8 thumb_func_start sub_816166C @@ -724476,12 +700416,12 @@ sub_816166C: @ 816166C lsrs r4, 24 movs r0, 0x1 bl audio_play - ldr r5, _081616B4 + ldr r5, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r5, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081616B8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A bl pokemon_getattr @@ -724491,7 +700431,7 @@ sub_816166C: @ 816166C lsls r3, 16 asrs r3, 16 ldrb r1, [r5, 0xA] - ldr r0, _081616BC + ldr r0, =sub_81616C0 + 1 str r0, [sp] adds r0, r4, 0 movs r2, 0x1 @@ -724501,9 +700441,7 @@ sub_816166C: @ 816166C pop {r0} bx r0 .align 2, 0 -_081616B4: .4byte 0x0203cec8 -_081616B8: .4byte 0x020244ec -_081616BC: .4byte sub_81616C0 + 1 + .pool thumb_func_end sub_816166C thumb_func_start sub_81616C0 @@ -724512,17 +700450,17 @@ sub_81616C0: @ 81616C0 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _08161708 + ldr r0, =0x0203cec8 movs r1, 0xA ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _0816170C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08161710 + ldr r1, =0x02021cc4 bl sub_81B1B44 - ldr r4, _08161714 - ldr r1, _08161718 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9c17 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -724530,24 +700468,18 @@ sub_81616C0: @ 81616C0 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0816171C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08161720 + ldr r1, =sub_8161724 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08161708: .4byte 0x0203cec8 -_0816170C: .4byte 0x020244ec -_08161710: .4byte 0x02021cc4 -_08161714: .4byte 0x02021fc4 -_08161718: .4byte 0x085e9c17 -_0816171C: .4byte 0x03005e00 -_08161720: .4byte sub_8161724 + 1 + .pool thumb_func_end sub_81616C0 thumb_func_start sub_8161724 @@ -724560,7 +700492,7 @@ sub_8161724: @ 8161724 lsrs r0, 24 cmp r0, 0x1 beq _08161772 - ldr r4, _08161778 + ldr r4, =0x0203cec8 movs r0, 0 strb r0, [r4, 0xB] ldrb r0, [r4, 0x9] @@ -724578,21 +700510,19 @@ sub_8161724: @ 8161724 bl Window_FillTileMap movs r0, 0 bl sub_81B3054 - ldr r1, _0816177C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08161780 + ldr r1, =sub_81B1370 + 1 str r1, [r0] _08161772: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08161778: .4byte 0x0203cec8 -_0816177C: .4byte 0x03005e00 -_08161780: .4byte sub_81B1370 + 1 + .pool thumb_func_end sub_8161724 thumb_func_start sub_8161784 @@ -724607,20 +700537,19 @@ sub_8161784: @ 8161784 beq _081617AA movs r0, 0x5 bl sub_81B3054 - ldr r0, _081617B0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081617B4 + ldr r0, =sub_81B1370 + 1 str r0, [r1] _081617AA: pop {r4} pop {r0} bx r0 .align 2, 0 -_081617B0: .4byte 0x03005e00 -_081617B4: .4byte sub_81B1370 + 1 + .pool thumb_func_end sub_8161784 thumb_func_start sub_81617B8 @@ -724631,35 +700560,33 @@ sub_81617B8: @ 81617B8 lsrs r4, 24 movs r0, 0x5 bl audio_play - ldr r0, _081617E8 + ldr r0, =0x085e9712 movs r1, 0 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081617EC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081617F0 + ldr r1, =sub_8161784 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081617E8: .4byte 0x085e9712 -_081617EC: .4byte 0x03005e00 -_081617F0: .4byte sub_8161784 + 1 + .pool thumb_func_end sub_81617B8 thumb_func_start sub_81617F4 sub_81617F4: @ 81617F4 push {r4,lr} - ldr r0, _08161868 + ldr r0, =0x0203bc40 mov r12, r0 - ldr r0, _0816186C + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r2, _08161870 + ldr r2, =0x00002734 adds r0, r1, r2 mov r4, r12 str r0, [r4] @@ -724669,7 +700596,7 @@ sub_81617F4: @ 81617F4 adds r0, r1, r2 str r0, [r4, 0x8] strb r3, [r4, 0xC] - ldr r4, _08161874 + ldr r4, =0x00002748 adds r0, r1, r4 mov r2, r12 str r0, [r2, 0x10] @@ -724687,13 +700614,13 @@ sub_81617F4: @ 81617F4 mov r0, r12 adds r0, 0x24 strb r2, [r0] - ldr r2, _08161878 + ldr r2, =0x0000278e adds r0, r1, r2 str r0, [r4, 0x28] mov r0, r12 adds r0, 0x2C strb r3, [r0] - ldr r4, _0816187C + ldr r4, =0x00002798 adds r0, r1, r4 mov r2, r12 str r0, [r2, 0x30] @@ -724711,12 +700638,7 @@ sub_81617F4: @ 81617F4 pop {r0} bx r0 .align 2, 0 -_08161868: .4byte 0x0203bc40 -_0816186C: .4byte 0x03005d8c -_08161870: .4byte 0x00002734 -_08161874: .4byte 0x00002748 -_08161878: .4byte 0x0000278e -_0816187C: .4byte 0x00002798 + .pool thumb_func_end sub_81617F4 thumb_func_start sub_8161880 @@ -724724,7 +700646,7 @@ sub_8161880: @ 8161880 push {r4,r5,lr} lsls r0, 24 movs r3, 0 - ldr r1, _081618B0 + ldr r1, =0x0203bc40 lsrs r2, r0, 21 adds r0, r2, r1 ldrb r0, [r0, 0x4] @@ -724748,7 +700670,7 @@ _081618AA: pop {r0} bx r0 .align 2, 0 -_081618B0: .4byte 0x0203bc40 + .pool thumb_func_end sub_8161880 thumb_func_start sub_81618B4 @@ -724773,7 +700695,7 @@ sub_81618D0: @ 81618D0 push {r4,lr} lsls r0, 24 movs r2, 0 - ldr r1, _081618FC + ldr r1, =0x0203bc40 lsrs r0, 21 adds r0, r1 movs r1, 0x4 @@ -724793,7 +700715,7 @@ _081618E8: adds r0, r1, 0 b _08161910 .align 2, 0 -_081618FC: .4byte 0x0203bc40 + .pool _08161900: adds r0, r1, 0x1 lsls r0, 24 @@ -724815,12 +700737,12 @@ sub_8161918: @ 8161918 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _08161944 + ldr r1, =0x085a5c08 lsls r0, r3, 5 adds r0, r1 ldrb r0, [r0, 0x13] movs r2, 0 - ldr r1, _08161948 + ldr r1, =0x0203bc40 lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x4] @@ -724835,8 +700757,7 @@ _08161936: movs r0, 0x1 b _08161958 .align 2, 0 -_08161944: .4byte 0x085a5c08 -_08161948: .4byte 0x0203bc40 + .pool _0816194C: adds r0, r2, 0x1 lsls r0, 24 @@ -724859,7 +700780,7 @@ sub_8161960: @ 8161960 adds r4, r0, 0 cmp r4, 0 beq _081619A0 - ldr r1, _08161998 + ldr r1, =0x085a5c08 lsls r0, r4, 5 adds r0, r1 ldrb r5, [r0, 0x13] @@ -724871,7 +700792,7 @@ sub_8161960: @ 8161960 negs r0, r0 cmp r2, r0 beq _081619A0 - ldr r0, _0816199C + ldr r0, =0x0203bc40 lsls r1, r5, 3 adds r1, r0 ldr r0, [r1] @@ -724880,8 +700801,7 @@ sub_8161960: @ 8161960 movs r0, 0x1 b _081619A2 .align 2, 0 -_08161998: .4byte 0x085a5c08 -_0816199C: .4byte 0x0203bc40 + .pool _081619A0: movs r0, 0 _081619A2: @@ -724897,7 +700817,7 @@ sub_81619A8: @ 81619A8 lsrs r0, 24 cmp r0, 0 beq _081619D4 - ldr r1, _081619D0 + ldr r1, =0x085a5c08 lsls r0, 5 adds r0, r1 ldrb r0, [r0, 0x13] @@ -724911,7 +700831,7 @@ sub_81619A8: @ 81619A8 movs r0, 0x1 b _081619D6 .align 2, 0 -_081619D0: .4byte 0x085a5c08 + .pool _081619D4: movs r0, 0 _081619D6: @@ -724936,8 +700856,8 @@ _081619EA: movs r0, 0x1 b _08161A28 _081619F8: - ldr r2, _08161A30 - ldr r1, _08161A34 + ldr r2, =0x0203bc40 + ldr r1, =0x085a5c08 lsls r0, r5, 5 adds r0, r1 ldrb r4, [r0, 0x13] @@ -724967,8 +700887,7 @@ _08161A28: pop {r1} bx r1 .align 2, 0 -_08161A30: .4byte 0x0203bc40 -_08161A34: .4byte 0x085a5c08 + .pool thumb_func_end sub_81619DC thumb_func_start sub_8161A38 @@ -724981,7 +700900,7 @@ sub_8161A38: @ 8161A38 sub sp, 0x4 lsls r0, 24 movs r6, 0 - ldr r2, _08161ACC + ldr r2, =0x0203bc40 lsrs r0, 21 adds r1, r0, r2 ldrb r3, [r1, 0x4] @@ -725001,7 +700920,7 @@ _08161A5C: ldrb r1, [r1, 0x4] cmp r3, r1 bcs _08161AAE - ldr r0, _08161ACC + ldr r0, =0x0203bc40 mov r9, r0 adds r1, r0, 0 mov r8, r1 @@ -725054,7 +700973,7 @@ _08161ABC: pop {r0} bx r0 .align 2, 0 -_08161ACC: .4byte 0x0203bc40 + .pool thumb_func_end sub_8161A38 thumb_func_start sub_8161AD0 @@ -725063,7 +700982,7 @@ sub_8161AD0: @ 8161AD0 lsls r0, 24 movs r4, 0 movs r3, 0 - ldr r2, _08161B0C + ldr r2, =0x0203bc40 lsrs r1, r0, 21 adds r0, r1, r2 ldrb r0, [r0, 0x4] @@ -725093,7 +701012,7 @@ _08161B04: pop {r1} bx r1 .align 2, 0 -_08161B0C: .4byte 0x0203bc40 + .pool thumb_func_end sub_8161AD0 thumb_func_start sub_8161B10 @@ -725121,32 +701040,30 @@ _08161B16: thumb_func_start sub_8161B34 sub_8161B34: @ 8161B34 push {r4,r5,lr} - ldr r5, _08161B54 + ldr r5, =0x03005d8c ldr r0, [r5] - ldr r4, _08161B58 + ldr r4, =0x000031dc adds r0, r4 movs r1, 0 movs r2, 0x1C bl memset ldr r0, [r5] adds r0, r4 - ldr r1, _08161B5C + ldr r1, =0x00000197 strh r1, [r0, 0x8] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08161B54: .4byte 0x03005d8c -_08161B58: .4byte 0x000031dc -_08161B5C: .4byte 0x00000197 + .pool thumb_func_end sub_8161B34 thumb_func_start sub_8161B60 sub_8161B60: @ 8161B60 push {r4-r6,lr} movs r2, 0 - ldr r6, _08161B8C - ldr r4, _08161B90 + ldr r6, =0x0203bc86 + ldr r4, =0x0203bc80 movs r3, 0 adds r5, r4, 0x1 _08161B6C: @@ -725167,8 +701084,7 @@ _08161B6C: pop {r0} bx r0 .align 2, 0 -_08161B8C: .4byte 0x0203bc86 -_08161B90: .4byte 0x0203bc80 + .pool thumb_func_end sub_8161B60 thumb_func_start sub_8161B94 @@ -725180,29 +701096,27 @@ sub_8161B94: @ 8161B94 lsls r0, 16 cmp r0, 0 bne _08161BBC - ldr r0, _08161BB0 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r2, _08161BB4 + ldr r2, =0x000031dc adds r1, r2 - ldr r2, _08161BB8 + ldr r2, =0x00000197 b _08161BC8 .align 2, 0 -_08161BB0: .4byte 0x03005d8c -_08161BB4: .4byte 0x000031dc -_08161BB8: .4byte 0x00000197 + .pool _08161BBC: - ldr r0, _08161CA8 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r2, _08161CAC + ldr r2, =0x000031dc adds r1, r2 movs r2, 0xCC lsls r2, 1 _08161BC8: strh r2, [r1, 0x8] adds r7, r0, 0 - ldr r6, _08161CB0 + ldr r6, =0x02024744 ldr r0, [r7] - ldr r5, _08161CAC + ldr r5, =0x000031dc adds r0, r5 ldrh r1, [r0, 0x8] movs r4, 0 @@ -725275,11 +701189,11 @@ _08161BC8: ldr r1, [r7] adds r1, r5 strb r0, [r1, 0x12] - ldr r4, _08161CB4 + ldr r4, =0x0203bc86 mov r0, r8 strb r0, [r4] bl GenerateRandomNumber - ldr r5, _08161CB8 + ldr r5, =0x085cec30 lsls r0, 16 lsrs r0, 16 movs r1, 0x14 @@ -725299,11 +701213,7 @@ _08161BC8: pop {r0} bx r0 .align 2, 0 -_08161CA8: .4byte 0x03005d8c -_08161CAC: .4byte 0x000031dc -_08161CB0: .4byte 0x02024744 -_08161CB4: .4byte 0x0203bc86 -_08161CB8: .4byte 0x085cec30 + .pool thumb_func_end sub_8161B94 thumb_func_start sub_8161CBC @@ -725311,18 +701221,18 @@ sub_8161CBC: @ 8161CBC push {lr} bl sub_8161B34 bl sub_8161B60 - ldr r0, _08161CD4 + ldr r0, =0x020375e0 ldrh r0, [r0] bl sub_8161B94 pop {r0} bx r0 .align 2, 0 -_08161CD4: .4byte 0x020375e0 + .pool thumb_func_end sub_8161CBC thumb_func_start mapnumbers_history_shift_sav1_0_2_4_out mapnumbers_history_shift_sav1_0_2_4_out: @ 8161CD8 - ldr r0, _08161CF8 + ldr r0, =0x0203bc80 ldrb r1, [r0, 0x2] strb r1, [r0, 0x4] ldrb r1, [r0, 0x3] @@ -725331,7 +701241,7 @@ mapnumbers_history_shift_sav1_0_2_4_out: @ 8161CD8 strb r1, [r0, 0x2] ldrb r1, [r0, 0x1] strb r1, [r0, 0x3] - ldr r1, _08161CFC + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x4] strb r1, [r0] @@ -725339,24 +701249,23 @@ mapnumbers_history_shift_sav1_0_2_4_out: @ 8161CD8 strb r1, [r0, 0x1] bx lr .align 2, 0 -_08161CF8: .4byte 0x0203bc80 -_08161CFC: .4byte 0x03005d8c + .pool thumb_func_end mapnumbers_history_shift_sav1_0_2_4_out thumb_func_start sub_8161D00 sub_8161D00: @ 8161D00 push {r4,r5,lr} movs r1, 0 - ldr r0, _08161D44 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _08161D48 + ldr r2, =0x000031dc adds r0, r2 ldrb r0, [r0, 0x13] cmp r0, 0 beq _08161D3E - ldr r0, _08161D4C + ldr r0, =0x0203bc86 strb r1, [r0] - ldr r5, _08161D50 + ldr r5, =0x085cec30 adds r4, r0, 0 _08161D1A: bl GenerateRandomNumber @@ -725380,10 +701289,7 @@ _08161D3E: pop {r0} bx r0 .align 2, 0 -_08161D44: .4byte 0x03005d8c -_08161D48: .4byte 0x000031dc -_08161D4C: .4byte 0x0203bc86 -_08161D50: .4byte 0x085cec30 + .pool thumb_func_end sub_8161D00 thumb_func_start sub_8161D54 @@ -725400,15 +701306,15 @@ sub_8161D54: @ 8161D54 bl sub_8161D00 b _08161DE2 _08161D6E: - ldr r0, _08161DC4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08161DC8 + ldr r1, =0x000031dc adds r0, r1 ldrb r0, [r0, 0x13] cmp r0, 0 beq _08161DE2 - ldr r7, _08161DCC - ldr r3, _08161DD0 + ldr r7, =0x0203bc86 + ldr r3, =0x085cec30 _08161D80: lsls r0, r4, 1 adds r0, r4 @@ -725418,9 +701324,9 @@ _08161D80: ldrb r1, [r1] cmp r0, r1 bne _08161DD8 - ldr r6, _08161DD0 + ldr r6, =0x085cec30 adds r5, r2, 0x1 - ldr r4, _08161DD4 + ldr r4, =0x0203bc80 _08161D96: bl GenerateRandomNumber lsls r0, 16 @@ -725444,11 +701350,7 @@ _08161DBA: strb r1, [r7, 0x1] b _08161DE2 .align 2, 0 -_08161DC4: .4byte 0x03005d8c -_08161DC8: .4byte 0x000031dc -_08161DCC: .4byte 0x0203bc86 -_08161DD0: .4byte 0x085cec30 -_08161DD4: .4byte 0x0203bc80 + .pool _08161DD8: adds r0, r4, 0x1 lsls r0, 24 @@ -725468,14 +701370,14 @@ sub_8161DE8: @ 8161DE8 lsrs r2, r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, _08161E14 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _08161E18 + ldr r3, =0x000031dc adds r0, r3 ldrb r0, [r0, 0x13] cmp r0, 0 beq _08161E20 - ldr r0, _08161E1C + ldr r0, =0x0203bc86 ldrb r3, [r0] cmp r2, r3 bne _08161E20 @@ -725485,9 +701387,7 @@ sub_8161DE8: @ 8161DE8 movs r0, 0x1 b _08161E22 .align 2, 0 -_08161E14: .4byte 0x03005d8c -_08161E18: .4byte 0x000031dc -_08161E1C: .4byte 0x0203bc86 + .pool _08161E20: movs r0, 0 _08161E22: @@ -725499,11 +701399,11 @@ _08161E22: sub_8161E28: @ 8161E28 push {r4,r5,lr} sub sp, 0x4 - ldr r5, _08161EB4 + ldr r5, =0x02024744 bl zero_enemy_party_data - ldr r4, _08161EB8 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r1, _08161EBC + ldr r1, =0x000031dc adds r0, r1 ldrh r1, [r0, 0x8] ldrb r2, [r0, 0xC] @@ -725513,43 +701413,43 @@ sub_8161E28: @ 8161E28 adds r0, r5, 0 bl sub_8068060 ldr r2, [r4] - ldr r0, _08161EC0 + ldr r0, =0x000031e9 adds r2, r0 adds r0, r5, 0 movs r1, 0x37 bl pokemon_setattr ldr r2, [r4] - ldr r1, _08161EC4 + ldr r1, =0x000031e6 adds r2, r1 adds r0, r5, 0 movs r1, 0x39 bl pokemon_setattr ldr r2, [r4] - ldr r0, _08161EC8 + ldr r0, =0x000031ea adds r2, r0 adds r0, r5, 0 movs r1, 0x16 bl pokemon_setattr ldr r2, [r4] - ldr r1, _08161ECC + ldr r1, =0x000031eb adds r2, r1 adds r0, r5, 0 movs r1, 0x17 bl pokemon_setattr ldr r2, [r4] - ldr r0, _08161ED0 + ldr r0, =0x000031ec adds r2, r0 adds r0, r5, 0 movs r1, 0x18 bl pokemon_setattr ldr r2, [r4] - ldr r1, _08161ED4 + ldr r1, =0x000031ed adds r2, r1 adds r0, r5, 0 movs r1, 0x21 bl pokemon_setattr ldr r2, [r4] - ldr r0, _08161ED8 + ldr r0, =0x000031ee adds r2, r0 adds r0, r5, 0 movs r1, 0x2F @@ -725559,22 +701459,13 @@ sub_8161E28: @ 8161E28 pop {r0} bx r0 .align 2, 0 -_08161EB4: .4byte 0x02024744 -_08161EB8: .4byte 0x03005d8c -_08161EBC: .4byte 0x000031dc -_08161EC0: .4byte 0x000031e9 -_08161EC4: .4byte 0x000031e6 -_08161EC8: .4byte 0x000031ea -_08161ECC: .4byte 0x000031eb -_08161ED0: .4byte 0x000031ec -_08161ED4: .4byte 0x000031ed -_08161ED8: .4byte 0x000031ee + .pool thumb_func_end sub_8161E28 thumb_func_start sub_8161EDC sub_8161EDC: @ 8161EDC push {lr} - ldr r0, _08161F0C + ldr r0, =0x03005d8c ldr r1, [r0] ldrb r0, [r1, 0x4] ldrb r1, [r1, 0x5] @@ -725594,7 +701485,7 @@ sub_8161EDC: @ 8161EDC movs r0, 0x1 b _08161F12 .align 2, 0 -_08161F0C: .4byte 0x03005d8c + .pool _08161F10: movs r0, 0 _08161F12: @@ -725608,9 +701499,9 @@ sub_8161F18: @ 8161F18 adds r6, r0, 0 movs r1, 0x39 bl pokemon_getattr - ldr r5, _08161F44 + ldr r5, =0x03005d8c ldr r1, [r5] - ldr r4, _08161F48 + ldr r4, =0x000031dc adds r1, r4 strh r0, [r1, 0xA] adds r0, r6, 0 @@ -725624,41 +701515,39 @@ sub_8161F18: @ 8161F18 pop {r0} bx r0 .align 2, 0 -_08161F44: .4byte 0x03005d8c -_08161F48: .4byte 0x000031dc + .pool thumb_func_end sub_8161F18 thumb_func_start sub_8161F4C sub_8161F4C: @ 8161F4C - ldr r0, _08161F5C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08161F60 + ldr r1, =0x000031dc adds r0, r1 movs r1, 0 strb r1, [r0, 0x13] bx lr .align 2, 0 -_08161F5C: .4byte 0x03005d8c -_08161F60: .4byte 0x000031dc + .pool thumb_func_end sub_8161F4C thumb_func_start sub_8161F64 sub_8161F64: @ 8161F64 - ldr r3, _08161F70 + ldr r3, =0x0203bc86 ldrb r2, [r3] strb r2, [r0] ldrb r0, [r3, 0x1] strb r0, [r1] bx lr .align 2, 0 -_08161F70: .4byte 0x0203bc86 + .pool thumb_func_end sub_8161F64 thumb_func_start sub_8161F74 sub_8161F74: @ 8161F74 push {lr} - ldr r1, _08161F8C - ldr r0, _08161F90 + ldr r1, =0x085df96c + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -725667,26 +701556,25 @@ sub_8161F74: @ 8161F74 pop {r0} bx r0 .align 2, 0 -_08161F8C: .4byte 0x085df96c -_08161F90: .4byte 0x020375e0 + .pool thumb_func_end sub_8161F74 thumb_func_start sub_8161F94 sub_8161F94: @ 8161F94 push {r4-r7,lr} - ldr r4, _08162034 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _08162038 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r5, r0, 30 - ldr r0, _0816203C + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r6, r0, 16 ldr r0, [r4] - ldr r2, _08162040 + ldr r2, =0x00000ca8 adds r0, r2 movs r7, 0 movs r1, 0x1 @@ -725695,7 +701583,7 @@ sub_8161F94: @ 8161F94 adds r2, 0xA adds r0, r1, r2 strh r7, [r0] - ldr r0, _08162038 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r2, [r1] movs r0, 0x5 @@ -725703,7 +701591,7 @@ sub_8161F94: @ 8161F94 ands r0, r2 strb r0, [r1] ldr r1, [r4] - ldr r2, _08162038 + ldr r2, =0x00000ca9 adds r1, r2 ldrb r2, [r1] movs r0, 0x9 @@ -725712,9 +701600,9 @@ sub_8161F94: @ 8161F94 strb r0, [r1] bl sub_81A3ACC ldr r4, [r4] - ldr r0, _08162044 + ldr r0, =0x00000cdc adds r3, r4, r0 - ldr r2, _08162048 + ldr r2, =0x085df9ac lsls r1, r5, 2 lsls r0, r6, 3 adds r1, r0 @@ -725734,7 +701622,7 @@ sub_8161F94: @ 8161F94 strh r7, [r1] _0816200E: bl sub_8164ED8 - ldr r0, _0816204C + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -725744,37 +701632,30 @@ _0816200E: negs r3, r3 movs r0, 0 bl saved_warp2_set - ldr r0, _08162050 + ldr r0, =0x02038bca strh r7, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08162034: .4byte 0x03005d90 -_08162038: .4byte 0x00000ca9 -_0816203C: .4byte 0x000040ce -_08162040: .4byte 0x00000ca8 -_08162044: .4byte 0x00000cdc -_08162048: .4byte 0x085df9ac -_0816204C: .4byte 0x03005d8c -_08162050: .4byte 0x02038bca + .pool thumb_func_end sub_8161F94 thumb_func_start sub_8162054 sub_8162054: @ 8162054 push {r4-r6,lr} - ldr r5, _08162084 + ldr r5, =0x03005d90 ldr r0, [r5] - ldr r4, _08162088 + ldr r4, =0x00000ca9 adds r0, r4 ldrb r0, [r0] lsls r0, 30 lsrs r6, r0, 30 - ldr r0, _0816208C + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _08162090 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 beq _08162094 @@ -725786,26 +701667,23 @@ sub_8162054: @ 8162054 beq _081620D8 b _081620E8 .align 2, 0 -_08162084: .4byte 0x03005d90 -_08162088: .4byte 0x00000ca9 -_0816208C: .4byte 0x000040ce -_08162090: .4byte 0x020375e2 + .pool _08162094: adds r0, r6, 0 lsls r1, 24 lsrs r1, 24 bl sub_8164FCC - ldr r1, _081620A4 + ldr r1, =0x020375f0 strh r0, [r1] b _081620E8 .align 2, 0 -_081620A4: .4byte 0x020375f0 + .pool _081620A8: - ldr r4, _081620CC + ldr r4, =0x020375f0 ldr r2, [r5] - ldr r0, _081620D0 + ldr r0, =0x00000cdc adds r2, r0 - ldr r3, _081620D4 + ldr r3, =0x085df9ac lsls r0, r6, 2 lsls r1, 3 adds r0, r1 @@ -725819,16 +701697,14 @@ _081620A8: strh r0, [r4] b _081620E8 .align 2, 0 -_081620CC: .4byte 0x020375f0 -_081620D0: .4byte 0x00000cdc -_081620D4: .4byte 0x085df9ac + .pool _081620D8: ldr r1, [r5] adds r0, r1, r4 ldrb r0, [r0] lsls r0, 30 lsrs r0, 30 - ldr r2, _081620F0 + ldr r2, =0x00000d07 adds r1, r2 strb r0, [r1] _081620E8: @@ -725836,24 +701712,24 @@ _081620E8: pop {r0} bx r0 .align 2, 0 -_081620F0: .4byte 0x00000d07 + .pool thumb_func_end sub_8162054 thumb_func_start sub_81620F4 sub_81620F4: @ 81620F4 push {r4-r7,lr} - ldr r6, _08162124 + ldr r6, =0x03005d90 ldr r0, [r6] - ldr r7, _08162128 + ldr r7, =0x00000ca9 adds r0, r7 ldrb r0, [r0] lsls r0, 30 lsrs r5, r0, 30 - ldr r0, _0816212C + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _08162130 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 beq _08162134 @@ -725865,10 +701741,7 @@ sub_81620F4: @ 81620F4 beq _081621A4 b _081621B4 .align 2, 0 -_08162124: .4byte 0x03005d90 -_08162128: .4byte 0x00000ca9 -_0816212C: .4byte 0x000040ce -_08162130: .4byte 0x020375e2 + .pool _08162134: ldr r2, [r6] lsls r0, r5, 1 @@ -725878,21 +701751,21 @@ _08162134: lsls r1, 4 adds r2, r1 adds r2, r0 - ldr r0, _0816214C + ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] b _081621B4 .align 2, 0 -_0816214C: .4byte 0x020375e4 + .pool _08162150: - ldr r0, _08162174 + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 beq _08162180 ldr r2, [r6] - ldr r0, _08162178 + ldr r0, =0x00000cdc adds r2, r0 - ldr r3, _0816217C + ldr r3, =0x085df9ac lsls r1, r5, 2 lsls r0, r4, 3 adds r1, r0 @@ -725903,14 +701776,12 @@ _08162150: str r0, [r2] b _081621B4 .align 2, 0 -_08162174: .4byte 0x020375e4 -_08162178: .4byte 0x00000cdc -_0816217C: .4byte 0x085df9ac + .pool _08162180: ldr r2, [r6] - ldr r1, _0816219C + ldr r1, =0x00000cdc adds r2, r1 - ldr r3, _081621A0 + ldr r3, =0x085df9cc lsls r1, r5, 2 lsls r0, r4, 3 adds r1, r0 @@ -725921,15 +701792,14 @@ _08162180: str r0, [r2] b _081621B4 .align 2, 0 -_0816219C: .4byte 0x00000cdc -_081621A0: .4byte 0x085df9cc + .pool _081621A4: ldr r1, [r6] adds r0, r1, r7 ldrb r0, [r0] lsls r0, 30 lsrs r0, 30 - ldr r2, _081621BC + ldr r2, =0x00000d07 adds r1, r2 strb r0, [r1] _081621B4: @@ -725937,43 +701807,43 @@ _081621B4: pop {r0} bx r0 .align 2, 0 -_081621BC: .4byte 0x00000d07 + .pool thumb_func_end sub_81620F4 thumb_func_start sub_81621C0 sub_81621C0: @ 81621C0 push {r4,r5,lr} - ldr r0, _08162210 + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xFA lsls r0, 1 cmp r1, r0 bne _081621DA - ldr r0, _08162214 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08162218 + ldr r1, =0x00000bec adds r0, r1 bl sub_816534C _081621DA: - ldr r5, _08162214 + ldr r5, =0x03005d90 ldr r0, [r5] - ldr r1, _0816221C + ldr r1, =0x00000d04 adds r2, r0, r1 ldrh r1, [r2] - ldr r0, _08162220 + ldr r0, =0x0000270e cmp r1, r0 bhi _081621EE adds r0, r1, 0x1 strh r0, [r2] _081621EE: ldr r1, [r5] - ldr r4, _08162224 + ldr r4, =0x00000cb2 adds r1, r4 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] bl sub_8163E90 - ldr r1, _08162228 + ldr r1, =0x020375f0 ldr r0, [r5] adds r0, r4 ldrh r0, [r0] @@ -725982,13 +701852,7 @@ _081621EE: pop {r0} bx r0 .align 2, 0 -_08162210: .4byte 0x02038bca -_08162214: .4byte 0x03005d90 -_08162218: .4byte 0x00000bec -_0816221C: .4byte 0x00000d04 -_08162220: .4byte 0x0000270e -_08162224: .4byte 0x00000cb2 -_08162228: .4byte 0x020375f0 + .pool thumb_func_end sub_81621C0 thumb_func_start sub_816222C @@ -726001,20 +701865,20 @@ sub_816222C: @ 816222C sub sp, 0x3C movs r0, 0 str r0, [sp, 0x24] - ldr r4, _081623A0 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081623A4 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r0, 30 mov r10, r0 - ldr r0, _081623A8 + ldr r0, =0x000040ce bl var_get lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x2C] - ldr r0, _081623AC + ldr r0, =0x000040cf bl var_get lsls r0, 16 cmp r0, 0 @@ -726037,7 +701901,7 @@ _0816227A: movs r4, 0xE7 lsls r4, 3 adds r0, r4 - ldr r5, _081623A0 + ldr r5, =0x03005d90 ldr r1, [r5] movs r2, 0 mov r8, r2 @@ -726061,13 +701925,13 @@ _08162298: adds r2, r7, 0 muls r2, r0 _081622B2: - ldr r3, _081623A0 + ldr r3, =0x03005d90 ldr r1, [r3] movs r0, 0x2C muls r0, r5 adds r0, r2 adds r1, r0 - ldr r4, _081623B0 + ldr r4, =0x0000076c adds r0, r1, r4 ldrh r0, [r0] cmp r0, 0 @@ -726089,19 +701953,19 @@ _081622E4: adds r5, 0x1 cmp r5, 0x3 ble _081622B2 - ldr r0, _081623B4 + ldr r0, =0x085df9f6 ldr r1, [sp, 0x2C] adds r0, r1, r0 ldrb r0, [r0] cmp r6, r0 blt _0816233E - ldr r3, _081623A0 + ldr r3, =0x03005d90 ldr r2, [r3] movs r4, 0xEC adds r3, r7, 0 muls r3, r4 adds r1, r2, r3 - ldr r5, _081623B8 + ldr r5, =0x0000073a adds r0, r1, r5 ldrh r0, [r0] ldr r4, [sp, 0x28] @@ -726140,9 +702004,9 @@ _0816233E: bne _08162396 bl sub_8165B20 movs r7, 0 - ldr r0, _081623A0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r4, _081623BC + ldr r4, =0x085df9ec adds r2, r0, 0 adds r2, 0xDC ldr r1, [sp, 0x24] @@ -726185,16 +702049,9 @@ _0816239C: movs r0, 0 b _081623DA .align 2, 0 -_081623A0: .4byte 0x03005d90 -_081623A4: .4byte 0x00000ca9 -_081623A8: .4byte 0x000040ce -_081623AC: .4byte 0x000040cf -_081623B0: .4byte 0x0000076c -_081623B4: .4byte 0x085df9f6 -_081623B8: .4byte 0x0000073a -_081623BC: .4byte 0x085df9ec + .pool _081623C0: - ldr r4, _081623EC + ldr r4, =0x02038bca bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -726215,15 +702072,15 @@ _081623DA: pop {r1} bx r1 .align 2, 0 -_081623EC: .4byte 0x02038bca + .pool thumb_func_end sub_816222C thumb_func_start sub_81623F0 sub_81623F0: @ 81623F0 push {r4-r7,lr} - ldr r6, _0816240C + ldr r6, =0x03005d90 ldr r0, [r6] - ldr r1, _08162410 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 @@ -726233,10 +702090,9 @@ sub_81623F0: @ 81623F0 bl sub_8165E18 b _08162530 .align 2, 0 -_0816240C: .4byte 0x03005d90 -_08162410: .4byte 0x00000ca9 + .pool _08162414: - ldr r0, _08162474 + ldr r0, =0x000040ce bl var_get adds r4, r0, 0 lsls r4, 16 @@ -726253,17 +702109,17 @@ _08162414: cmp r4, 0x1 bhi _08162488 ldr r1, [r6] - ldr r2, _08162478 + ldr r2, =0x00000cb2 adds r0, r1, r2 ldrh r3, [r0] - ldr r2, _0816247C + ldr r2, =0x02038bca lsls r0, r3, 2 - ldr r4, _08162480 + ldr r4, =0x00000cb4 adds r1, r4 adds r0, r1, r0 ldrh r0, [r0] strh r0, [r2] - ldr r4, _08162484 + ldr r4, =0x02038bcc lsls r0, r3, 1 adds r0, 0x1 lsls r0, 1 @@ -726278,34 +702134,29 @@ _08162414: bl sub_8162614 b _08162530 .align 2, 0 -_08162474: .4byte 0x000040ce -_08162478: .4byte 0x00000cb2 -_0816247C: .4byte 0x02038bca -_08162480: .4byte 0x00000cb4 -_08162484: .4byte 0x02038bcc + .pool _08162488: bl sub_816222C lsls r0, 24 cmp r0, 0 beq _081624B4 - ldr r4, _081624AC + ldr r4, =0x02038bca ldrh r0, [r4] movs r1, 0 bl sub_8162614 ldr r1, [r6] - ldr r2, _081624B0 + ldr r2, =0x00000cb2 adds r0, r1, r2 ldrh r0, [r0] lsls r0, 1 adds r2, 0x2 b _08162528 .align 2, 0 -_081624AC: .4byte 0x02038bca -_081624B0: .4byte 0x00000cb2 + .pool _081624B4: lsls r7, r5, 24 adds r5, r6, 0 - ldr r6, _08162538 + ldr r6, =0x00000cb2 _081624BA: ldr r0, [r5] adds r0, r6 @@ -726320,17 +702171,17 @@ _081624BA: ldrh r0, [r0] cmp r4, r0 bge _081624FC - ldr r2, _0816253C + ldr r2, =0x00000cb4 adds r0, r1, r2 ldrh r0, [r0] cmp r0, r3 beq _081624FC - ldr r0, _08162540 + ldr r0, =0x03005d90 ldr r1, [r0] subs r2, 0x2 adds r0, r1, r2 ldrh r2, [r0] - ldr r0, _0816253C + ldr r0, =0x00000cb4 adds r1, r0 _081624EE: adds r1, 0x2 @@ -726342,26 +702193,26 @@ _081624EE: bne _081624EE _081624FC: ldr r0, [r5] - ldr r1, _08162538 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] cmp r4, r0 bne _081624BA - ldr r4, _08162544 + ldr r4, =0x02038bca strh r3, [r4] ldrh r0, [r4] movs r1, 0 bl sub_8162614 - ldr r0, _08162540 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r2, _08162538 + ldr r2, =0x00000cb2 adds r0, r1, r2 ldrh r2, [r0] adds r0, r2, 0x1 cmp r0, 0x6 bgt _08162530 lsls r0, r2, 1 - ldr r2, _0816253C + ldr r2, =0x00000cb4 _08162528: adds r1, r2 adds r1, r0 @@ -726372,10 +702223,7 @@ _08162530: pop {r0} bx r0 .align 2, 0 -_08162538: .4byte 0x00000cb2 -_0816253C: .4byte 0x00000cb4 -_08162540: .4byte 0x03005d90 -_08162544: .4byte 0x02038bca + .pool thumb_func_end sub_81623F0 thumb_func_start sub_8162548 @@ -726390,7 +702238,7 @@ sub_8162548: @ 8162548 bhi _08162584 cmp r1, 0x6 bne _08162570 - ldr r2, _0816256C + ldr r2, =0x085dfa1a lsls r1, r0, 2 adds r0, r2, 0x2 adds r0, r1, r0 @@ -726399,9 +702247,9 @@ sub_8162548: @ 8162548 ldrh r4, [r1] b _0816258A .align 2, 0 -_0816256C: .4byte 0x085dfa1a + .pool _08162570: - ldr r2, _08162580 + ldr r2, =0x085df9fa lsls r1, r3, 2 adds r0, r2, 0x2 adds r0, r1, r0 @@ -726410,9 +702258,9 @@ _08162570: ldrh r4, [r1] b _0816258A .align 2, 0 -_08162580: .4byte 0x085df9fa + .pool _08162584: - ldr r1, _081625B0 + ldr r1, =0x085df9fa ldrh r0, [r1, 0x1E] ldrh r4, [r1, 0x1C] _0816258A: @@ -726433,7 +702281,7 @@ _0816258A: pop {r1} bx r1 .align 2, 0 -_081625B0: .4byte 0x085df9fa + .pool thumb_func_end sub_8162548 thumb_func_start sub_81625B4 @@ -726449,13 +702297,13 @@ sub_81625B4: @ 81625B4 bhi _081625F4 cmp r1, 0x6 bne _081625D4 - ldr r1, _081625D0 + ldr r1, =0x085dfa1a lsls r2, r0, 2 b _081625D8 .align 2, 0 -_081625D0: .4byte 0x085dfa1a + .pool _081625D4: - ldr r1, _081625F0 + ldr r1, =0x085df9fa lsls r2, 2 _081625D8: adds r0, r1, 0x2 @@ -726470,9 +702318,9 @@ _081625D8: ldrh r0, [r2] b _08162604 .align 2, 0 -_081625F0: .4byte 0x085df9fa + .pool _081625F4: - ldr r0, _08162610 + ldr r0, =0x085df9fa ldrh r1, [r0, 0x1E] ldrh r2, [r0, 0x1C] subs r1, r2 @@ -726487,7 +702335,7 @@ _08162604: pop {r0} bx r0 .align 2, 0 -_08162610: .4byte 0x085df9fa + .pool thumb_func_end sub_81625B4 thumb_func_start sub_8162614 @@ -726503,59 +702351,54 @@ sub_8162614: @ 8162614 lsls r0, 1 cmp r4, r0 bne _08162640 - ldr r0, _08162638 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0816263C + ldr r1, =0x00000bed adds r0, r1 b _081626BA .align 2, 0 -_08162638: .4byte 0x03005d90 -_0816263C: .4byte 0x00000bed + .pool _08162640: - ldr r0, _0816264C + ldr r0, =0x000003fe cmp r4, r0 bne _08162650 bl sub_81A4DD8 b _08162788 .align 2, 0 -_0816264C: .4byte 0x000003fe + .pool _08162650: - ldr r0, _08162664 + ldr r0, =0x0000012b cmp r4, r0 bhi _0816266C - ldr r0, _08162668 + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r4 adds r0, r1 b _081626BA .align 2, 0 -_08162664: .4byte 0x0000012b -_08162668: .4byte 0x0203bc88 + .pool _0816266C: - ldr r0, _08162688 + ldr r0, =0x0000018f cmp r4, r0 bhi _08162698 - ldr r0, _0816268C + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08162690 + ldr r1, =0xfffffed4 adds r2, r4, r1 movs r1, 0xEC muls r1, r2 adds r0, r1 - ldr r1, _08162694 + ldr r1, =0x00000739 adds r0, r1 b _081626BA .align 2, 0 -_08162688: .4byte 0x0000018f -_0816268C: .4byte 0x03005d90 -_08162690: .4byte 0xfffffed4 -_08162694: .4byte 0x00000739 + .pool _08162698: - ldr r3, _081626EC - ldr r0, _081626F0 + ldr r3, =0x08610970 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _081626F4 + ldr r0, =0xfffffe70 adds r2, r6, r0 lsls r0, r2, 4 adds r0, r2 @@ -726572,7 +702415,7 @@ _08162698: _081626BA: ldrb r2, [r0] movs r1, 0 - ldr r3, _081626F8 + ldr r3, =0x085dcedc ldrb r0, [r3] cmp r0, r2 beq _081626D4 @@ -726587,7 +702430,7 @@ _081626C6: _081626D4: cmp r1, 0x1E beq _08162700 - ldr r0, _081626FC + ldr r0, =0x085dcf0e adds r0, r1, r0 ldrb r1, [r0] cmp r5, 0x1 @@ -726598,14 +702441,10 @@ _081626D4: bne _0816272E b _08162750 .align 2, 0 -_081626EC: .4byte 0x08610970 -_081626F0: .4byte 0x03005d90 -_081626F4: .4byte 0xfffffe70 -_081626F8: .4byte 0x085dcedc -_081626FC: .4byte 0x085dcf0e + .pool _08162700: movs r1, 0 - ldr r3, _08162738 + ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 beq _08162718 @@ -726620,7 +702459,7 @@ _0816270A: _08162718: cmp r1, 0x14 beq _0816275C - ldr r0, _0816273C + ldr r0, =0x085dcf2c adds r0, r1, r0 ldrb r1, [r0] cmp r5, 0x1 @@ -726630,25 +702469,23 @@ _08162718: cmp r5, 0xF beq _08162750 _0816272E: - ldr r0, _08162740 + ldr r0, =0x00004010 bl var_set b _08162788 .align 2, 0 -_08162738: .4byte 0x085dcefa -_0816273C: .4byte 0x085dcf2c -_08162740: .4byte 0x00004010 + .pool _08162744: - ldr r0, _0816274C + ldr r0, =0x00004011 bl var_set b _08162788 .align 2, 0 -_0816274C: .4byte 0x00004011 + .pool _08162750: - ldr r0, _08162758 + ldr r0, =0x0000401e bl var_set b _08162788 .align 2, 0 -_08162758: .4byte 0x0000401e + .pool _0816275C: cmp r5, 0x1 beq _08162770 @@ -726657,20 +702494,20 @@ _0816275C: cmp r5, 0xF beq _08162780 _08162768: - ldr r0, _0816276C + ldr r0, =0x00004010 b _08162772 .align 2, 0 -_0816276C: .4byte 0x00004010 + .pool _08162770: - ldr r0, _0816277C + ldr r0, =0x00004011 _08162772: movs r1, 0x7 bl var_set b _08162788 .align 2, 0 -_0816277C: .4byte 0x00004011 + .pool _08162780: - ldr r0, _08162790 + ldr r0, =0x0000401e movs r1, 0x7 bl var_set _08162788: @@ -726678,7 +702515,7 @@ _08162788: pop {r0} bx r0 .align 2, 0 -_08162790: .4byte 0x0000401e + .pool thumb_func_end sub_8162614 thumb_func_start sub_8162794 @@ -726703,51 +702540,46 @@ sub_81627A4: @ 81627A4 lsls r0, 1 cmp r4, r0 bne _081627CC - ldr r0, _081627C4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081627C8 + ldr r1, =0x00000bed adds r0, r1 b _08162836 .align 2, 0 -_081627C4: .4byte 0x03005d90 -_081627C8: .4byte 0x00000bed + .pool _081627CC: - ldr r0, _081627E0 + ldr r0, =0x0000012b cmp r4, r0 bhi _081627E8 - ldr r0, _081627E4 + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r4 adds r0, r1 b _08162836 .align 2, 0 -_081627E0: .4byte 0x0000012b -_081627E4: .4byte 0x0203bc88 + .pool _081627E8: - ldr r0, _08162804 + ldr r0, =0x0000018f cmp r4, r0 bhi _08162814 - ldr r0, _08162808 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0816280C + ldr r1, =0xfffffed4 adds r2, r4, r1 movs r1, 0xEC muls r1, r2 adds r0, r1 - ldr r1, _08162810 + ldr r1, =0x00000739 adds r0, r1 b _08162836 .align 2, 0 -_08162804: .4byte 0x0000018f -_08162808: .4byte 0x03005d90 -_0816280C: .4byte 0xfffffed4 -_08162810: .4byte 0x00000739 + .pool _08162814: - ldr r3, _08162858 - ldr r0, _0816285C + ldr r3, =0x08610970 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _08162860 + ldr r0, =0xfffffe70 adds r2, r5, r0 lsls r0, r2, 4 adds r0, r2 @@ -726764,7 +702596,7 @@ _08162814: _08162836: ldrb r2, [r0] movs r1, 0 - ldr r3, _08162864 + ldr r3, =0x085dcedc ldrb r0, [r3] cmp r0, r2 beq _08162850 @@ -726779,17 +702611,13 @@ _08162842: _08162850: cmp r1, 0x1E beq _0816286C - ldr r0, _08162868 + ldr r0, =0x085dcf0e b _08162892 .align 2, 0 -_08162858: .4byte 0x08610970 -_0816285C: .4byte 0x03005d90 -_08162860: .4byte 0xfffffe70 -_08162864: .4byte 0x085dcedc -_08162868: .4byte 0x085dcf0e + .pool _0816286C: movs r1, 0 - ldr r3, _0816288C + ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 beq _08162884 @@ -726807,9 +702635,9 @@ _08162884: movs r0, 0x7 b _08162896 .align 2, 0 -_0816288C: .4byte 0x085dcefa + .pool _08162890: - ldr r0, _0816289C + ldr r0, =0x085dcf2c _08162892: adds r0, r1, r0 ldrb r0, [r0] @@ -726818,7 +702646,7 @@ _08162896: pop {r1} bx r1 .align 2, 0 -_0816289C: .4byte 0x085dcf2c + .pool thumb_func_end sub_81627A4 thumb_func_start sub_81628A0 @@ -726833,7 +702661,7 @@ sub_81628A0: @ 81628A0 mov r8, r1 mov r10, r0 movs r5, 0 - ldr r2, _08162924 + ldr r2, =0x03005d90 ldr r0, [r2] mov r4, r10 ldrb r4, [r4, 0xC] @@ -726841,7 +702669,7 @@ sub_81628A0: @ 81628A0 mov r9, r5 movs r7, 0x4 str r7, [sp, 0x1C] - ldr r1, _08162928 + ldr r1, =0x00000744 adds r1, r0 mov r12, r1 _081628CA: @@ -726859,10 +702687,10 @@ _081628DE: adds r3, 0x1 cmp r3, 0x3 bgt _081628FA - ldr r7, _08162924 + ldr r7, =0x03005d90 ldr r0, [r7] adds r1, r3, r4 - ldr r7, _08162928 + ldr r7, =0x00000744 adds r0, r7 adds r0, r1 adds r1, r2, r3 @@ -726874,9 +702702,9 @@ _081628FA: cmp r3, 0x4 bne _08162944 movs r6, 0 - ldr r1, _08162924 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r3, _0816292C + ldr r3, =0x0000073c adds r0, r3 ldr r2, [sp, 0x1C] adds r0, r2 @@ -726894,14 +702722,12 @@ _0816291C: movs r6, 0x7 b _08162944 .align 2, 0 -_08162924: .4byte 0x03005d90 -_08162928: .4byte 0x00000744 -_0816292C: .4byte 0x0000073c + .pool _08162930: adds r6, 0x1 cmp r6, 0x6 bgt _08162944 - ldr r7, _08162970 + ldr r7, =0x03005d90 ldr r0, [r7] adds r0, r3 adds r0, r2 @@ -726923,7 +702749,7 @@ _08162944: _0816295A: cmp r5, 0x4 bgt _08162974 - ldr r2, _08162970 + ldr r2, =0x03005d90 ldr r0, [r2] movs r1, 0xEC muls r1, r5 @@ -726933,12 +702759,12 @@ _0816295A: adds r0, r4 b _081629B2 .align 2, 0 -_08162970: .4byte 0x03005d90 + .pool _08162974: movs r5, 0 - ldr r7, _081629BC + ldr r7, =0x03005d90 ldr r0, [r7] - ldr r1, _081629C0 + ldr r1, =0x0000073a adds r0, r1 ldrh r0, [r0] cmp r0, 0 @@ -726960,7 +702786,7 @@ _0816298A: _0816299E: cmp r5, 0x4 bgt _081629C4 - ldr r1, _081629BC + ldr r1, =0x03005d90 ldr r0, [r1] movs r1, 0xEC muls r1, r5 @@ -726974,13 +702800,12 @@ _081629B2: bl memcpy b _08162A8A .align 2, 0 -_081629BC: .4byte 0x03005d90 -_081629C0: .4byte 0x0000073a + .pool _081629C4: mov r2, sp - ldr r4, _08162A1C + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r3, _08162A20 + ldr r3, =0x0000073a adds r0, r3 ldrh r0, [r0] movs r1, 0 @@ -726998,7 +702823,7 @@ _081629E4: adds r7, r5, 0x1 cmp r3, r8 bge _08162A2E - ldr r1, _08162A1C + ldr r1, =0x03005d90 ldr r0, [r1] movs r2, 0xEC adds r1, r5, 0 @@ -727023,8 +702848,7 @@ _081629FE: strh r5, [r0] b _08162A2E .align 2, 0 -_08162A1C: .4byte 0x03005d90 -_08162A20: .4byte 0x0000073a + .pool _08162A24: cmp r1, r0 bhi _08162A2E @@ -727038,7 +702862,7 @@ _08162A2E: lsls r2, r1, 1 mov r4, sp adds r3, r4, r2 - ldr r1, _08162A9C + ldr r1, =0x03005d90 ldr r0, [r1] movs r4, 0xEC adds r1, r5, 0 @@ -727061,7 +702885,7 @@ _08162A54: mov r1, r8 bl __modsi3 adds r5, r0, 0 - ldr r0, _08162A9C + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r5, 1 add r1, sp @@ -727086,7 +702910,7 @@ _08162A8A: pop {r0} bx r0 .align 2, 0 -_08162A9C: .4byte 0x03005d90 + .pool thumb_func_end sub_81628A0 thumb_func_start sub_8162AA0 @@ -727100,20 +702924,18 @@ sub_8162AA0: @ 8162AA0 lsls r0, 1 cmp r4, r0 bne _08162AD0 - ldr r1, _08162AC4 - ldr r0, _08162AC8 + ldr r1, =0x0831f578 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _08162ACC + ldr r2, =0x00000bed adds r0, r2 ldrb r0, [r0] adds r0, r1 b _08162BC8 .align 2, 0 -_08162AC4: .4byte 0x0831f578 -_08162AC8: .4byte 0x03005d90 -_08162ACC: .4byte 0x00000bed + .pool _08162AD0: - ldr r0, _08162AE0 + ldr r0, =0x000003fe cmp r4, r0 bne _08162AE4 bl sub_81A4CB0 @@ -727121,13 +702943,13 @@ _08162AD0: lsrs r0, 24 b _08162BCA .align 2, 0 -_08162AE0: .4byte 0x000003fe + .pool _08162AE4: - ldr r0, _08162AFC + ldr r0, =0x0000012b cmp r4, r0 bhi _08162B08 - ldr r2, _08162B00 - ldr r0, _08162B04 + ldr r2, =0x0831f578 + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r4 @@ -727136,62 +702958,55 @@ _08162AE4: adds r0, r2 b _08162BC8 .align 2, 0 -_08162AFC: .4byte 0x0000012b -_08162B00: .4byte 0x0831f578 -_08162B04: .4byte 0x0203bc88 + .pool _08162B08: - ldr r0, _08162B2C + ldr r0, =0x0000018f cmp r4, r0 bhi _08162B64 - ldr r0, _08162B30 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 beq _08162B38 - ldr r4, _08162B34 + ldr r4, =0x0831f578 bl sub_818649C lsls r0, 24 lsrs r0, 24 adds r0, r4 b _08162BC8 .align 2, 0 -_08162B2C: .4byte 0x0000018f -_08162B30: .4byte 0x02022fec -_08162B34: .4byte 0x0831f578 + .pool _08162B38: - ldr r3, _08162B54 - ldr r0, _08162B58 + ldr r3, =0x0831f578 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08162B5C + ldr r1, =0xfffffed4 adds r2, r4, r1 movs r1, 0xEC muls r1, r2 adds r0, r1 - ldr r2, _08162B60 + ldr r2, =0x00000739 adds r0, r2 ldrb r0, [r0] adds r0, r3 b _08162BC8 .align 2, 0 -_08162B54: .4byte 0x0831f578 -_08162B58: .4byte 0x03005d90 -_08162B5C: .4byte 0xfffffed4 -_08162B60: .4byte 0x00000739 + .pool _08162B64: - ldr r0, _08162B9C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 bne _08162BB0 - ldr r4, _08162BA0 - ldr r3, _08162BA4 - ldr r0, _08162BA8 + ldr r4, =0x0831f578 + ldr r3, =0x08610970 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _08162BAC + ldr r0, =0xfffffe70 adds r2, r5, r0 lsls r0, r2, 4 adds r0, r2 @@ -727209,14 +703024,10 @@ _08162B64: adds r0, r4 b _08162BC8 .align 2, 0 -_08162B9C: .4byte 0x02022fec -_08162BA0: .4byte 0x0831f578 -_08162BA4: .4byte 0x08610970 -_08162BA8: .4byte 0x03005d90 -_08162BAC: .4byte 0xfffffe70 + .pool _08162BB0: - ldr r5, _08162BD0 - ldr r4, _08162BD4 + ldr r5, =0x0831f578 + ldr r4, =0x08610970 bl sub_81864A8 lsls r0, 24 lsrs r0, 24 @@ -727233,8 +703044,7 @@ _08162BCA: pop {r1} bx r1 .align 2, 0 -_08162BD0: .4byte 0x0831f578 -_08162BD4: .4byte 0x08610970 + .pool thumb_func_end sub_8162AA0 thumb_func_start sub_8162BD8 @@ -727248,19 +703058,17 @@ sub_8162BD8: @ 8162BD8 lsls r0, 1 cmp r4, r0 bne _08162C08 - ldr r1, _08162BFC - ldr r0, _08162C00 + ldr r1, =0x0831f5ca + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _08162C04 + ldr r2, =0x00000bed adds r0, r2 ldrb r0, [r0] b _08162C26 .align 2, 0 -_08162BFC: .4byte 0x0831f5ca -_08162C00: .4byte 0x03005d90 -_08162C04: .4byte 0x00000bed + .pool _08162C08: - ldr r0, _08162C18 + ldr r0, =0x000003fe cmp r4, r0 bne _08162C1C bl sub_81A4D00 @@ -727268,27 +703076,25 @@ _08162C08: lsrs r0, 24 b _08162D1E .align 2, 0 -_08162C18: .4byte 0x000003fe + .pool _08162C1C: - ldr r0, _08162C2C + ldr r0, =0x00000c03 cmp r4, r0 bne _08162C38 - ldr r0, _08162C30 - ldr r1, _08162C34 + ldr r0, =0x08310030 + ldr r1, =0x00007da1 _08162C26: adds r0, r1 ldrb r0, [r0] b _08162D1E .align 2, 0 -_08162C2C: .4byte 0x00000c03 -_08162C30: .4byte 0x08310030 -_08162C34: .4byte 0x00007da1 + .pool _08162C38: - ldr r0, _08162C54 + ldr r0, =0x0000012b cmp r4, r0 bhi _08162C60 - ldr r2, _08162C58 - ldr r0, _08162C5C + ldr r2, =0x0831f5ca + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r4 @@ -727298,21 +703104,19 @@ _08162C38: ldrb r0, [r0] b _08162D1E .align 2, 0 -_08162C54: .4byte 0x0000012b -_08162C58: .4byte 0x0831f5ca -_08162C5C: .4byte 0x0203bc88 + .pool _08162C60: - ldr r0, _08162C84 + ldr r0, =0x0000018f cmp r4, r0 bhi _08162CBC - ldr r0, _08162C88 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 beq _08162C90 - ldr r4, _08162C8C + ldr r4, =0x0831f5ca bl sub_818649C lsls r0, 24 lsrs r0, 24 @@ -727320,39 +703124,34 @@ _08162C60: ldrb r0, [r0] b _08162D1E .align 2, 0 -_08162C84: .4byte 0x0000018f -_08162C88: .4byte 0x02022fec -_08162C8C: .4byte 0x0831f5ca + .pool _08162C90: - ldr r3, _08162CAC - ldr r0, _08162CB0 + ldr r3, =0x0831f5ca + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08162CB4 + ldr r1, =0xfffffed4 adds r2, r4, r1 movs r1, 0xEC muls r1, r2 adds r0, r1 - ldr r2, _08162CB8 + ldr r2, =0x00000739 adds r0, r2 ldrb r0, [r0] adds r0, r3 ldrb r0, [r0] b _08162D1E .align 2, 0 -_08162CAC: .4byte 0x0831f5ca -_08162CB0: .4byte 0x03005d90 -_08162CB4: .4byte 0xfffffed4 -_08162CB8: .4byte 0x00000739 + .pool _08162CBC: - ldr r0, _08162CE8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 beq _08162CF4 - ldr r5, _08162CEC - ldr r4, _08162CF0 + ldr r5, =0x0831f5ca + ldr r4, =0x08610970 bl sub_81864A8 lsls r0, 24 lsrs r0, 24 @@ -727365,15 +703164,13 @@ _08162CBC: ldrb r0, [r0] b _08162D1E .align 2, 0 -_08162CE8: .4byte 0x02022fec -_08162CEC: .4byte 0x0831f5ca -_08162CF0: .4byte 0x08610970 + .pool _08162CF4: - ldr r4, _08162D24 - ldr r3, _08162D28 - ldr r0, _08162D2C + ldr r4, =0x0831f5ca + ldr r3, =0x08610970 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _08162D30 + ldr r0, =0xfffffe70 adds r2, r5, r0 lsls r0, r2, 4 adds r0, r2 @@ -727395,10 +703192,7 @@ _08162D1E: pop {r1} bx r1 .align 2, 0 -_08162D24: .4byte 0x0831f5ca -_08162D28: .4byte 0x08610970 -_08162D2C: .4byte 0x03005d90 -_08162D30: .4byte 0xfffffe70 + .pool thumb_func_end sub_8162BD8 thumb_func_start sub_8162D34 @@ -727412,32 +703206,30 @@ sub_8162D34: @ 8162D34 lsls r0, 1 cmp r4, r0 bne _08162D5C - ldr r0, _08162D54 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08162D58 + ldr r1, =0x00000bed adds r0, r1 b _08162E0A .align 2, 0 -_08162D54: .4byte 0x03005d90 -_08162D58: .4byte 0x00000bed + .pool _08162D5C: - ldr r0, _08162D70 + ldr r0, =0x0000012b cmp r4, r0 bhi _08162D78 - ldr r0, _08162D74 + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r4 adds r0, r1 b _08162E0A .align 2, 0 -_08162D70: .4byte 0x0000012b -_08162D74: .4byte 0x0203bc88 + .pool _08162D78: - ldr r0, _08162D98 + ldr r0, =0x0000018f cmp r4, r0 bhi _08162DC0 - ldr r0, _08162D9C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -727449,32 +703241,29 @@ _08162D78: lsrs r0, 24 b _08162E0C .align 2, 0 -_08162D98: .4byte 0x0000018f -_08162D9C: .4byte 0x02022fec + .pool _08162DA0: - ldr r0, _08162DB4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08162DB8 + ldr r1, =0xfffffed4 adds r2, r4, r1 movs r1, 0xEC muls r1, r2 adds r0, r1 - ldr r1, _08162DBC + ldr r1, =0x00000739 adds r0, r1 b _08162E0A .align 2, 0 -_08162DB4: .4byte 0x03005d90 -_08162DB8: .4byte 0xfffffed4 -_08162DBC: .4byte 0x00000739 + .pool _08162DC0: - ldr r0, _08162DE0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 beq _08162DE8 - ldr r4, _08162DE4 + ldr r4, =0x08610970 bl sub_81864A8 lsls r0, 24 lsrs r0, 24 @@ -727483,13 +703272,12 @@ _08162DC0: adds r0, r4 b _08162E08 .align 2, 0 -_08162DE0: .4byte 0x02022fec -_08162DE4: .4byte 0x08610970 + .pool _08162DE8: - ldr r3, _08162E14 - ldr r0, _08162E18 + ldr r3, =0x08610970 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _08162E1C + ldr r0, =0xfffffe70 adds r2, r5, r0 lsls r0, r2, 4 adds r0, r2 @@ -727511,9 +703299,7 @@ _08162E0C: pop {r1} bx r1 .align 2, 0 -_08162E14: .4byte 0x08610970 -_08162E18: .4byte 0x03005d90 -_08162E1C: .4byte 0xfffffe70 + .pool thumb_func_end sub_8162D34 thumb_func_start sub_8162E20 @@ -727528,7 +703314,7 @@ sub_8162E20: @ 8162E20 lsls r0, 1 cmp r5, r0 bne _08162E54 - ldr r0, _08162E50 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xBF lsls r1, 4 @@ -727543,21 +703329,21 @@ _08162E40: ble _08162E40 b _08162F5C .align 2, 0 -_08162E50: .4byte 0x03005d90 + .pool _08162E54: - ldr r0, _08162E64 + ldr r0, =0x000003fe cmp r5, r0 bne _08162E68 adds r0, r6, 0 bl sub_81A4D50 b _08162F62 .align 2, 0 -_08162E64: .4byte 0x000003fe + .pool _08162E68: - ldr r0, _08162E80 + ldr r0, =0x00000c03 cmp r5, r0 bne _08162E88 - ldr r2, _08162E84 + ldr r2, =0x08317dd4 _08162E70: adds r0, r6, r4 adds r1, r4, r2 @@ -727568,13 +703354,12 @@ _08162E70: ble _08162E70 b _08162F5C .align 2, 0 -_08162E80: .4byte 0x00000c03 -_08162E84: .4byte 0x08317dd4 + .pool _08162E88: - ldr r0, _08162EAC + ldr r0, =0x0000012b cmp r5, r0 bhi _08162EB4 - ldr r0, _08162EB0 + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r5 @@ -727590,13 +703375,12 @@ _08162E9A: ble _08162E9A b _08162F5C .align 2, 0 -_08162EAC: .4byte 0x0000012b -_08162EB0: .4byte 0x0203bc88 + .pool _08162EB4: - ldr r0, _08162ED0 + ldr r0, =0x0000018f cmp r5, r0 bhi _08162F00 - ldr r0, _08162ED4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -727607,14 +703391,13 @@ _08162EB4: bl sub_8186468 b _08162F62 .align 2, 0 -_08162ED0: .4byte 0x0000018f -_08162ED4: .4byte 0x02022fec + .pool _08162ED8: - ldr r2, _08162EF8 + ldr r2, =0x03005d90 movs r0, 0xEC adds r1, r5, 0 muls r1, r0 - ldr r0, _08162EFC + ldr r0, =0xfffef2a8 adds r1, r0 ldr r0, [r2] adds r0, r1 @@ -727625,10 +703408,9 @@ _08162ED8: bl sub_81DB5E8 b _08162F62 .align 2, 0 -_08162EF8: .4byte 0x03005d90 -_08162EFC: .4byte 0xfffef2a8 + .pool _08162F00: - ldr r0, _08162F20 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -727643,13 +703425,13 @@ _08162F00: lsrs r4, r0, 24 b _08162F3E .align 2, 0 -_08162F20: .4byte 0x02022fec + .pool _08162F24: - ldr r1, _08162F54 + ldr r1, =0x03005d90 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r2, _08162F58 + ldr r2, =0xffff969c adds r0, r2 ldr r1, [r1] adds r1, r0 @@ -727668,8 +703450,7 @@ _08162F3E: bl sub_81DB5E8 b _08162F62 .align 2, 0 -_08162F54: .4byte 0x03005d90 -_08162F58: .4byte 0xffff969c + .pool _08162F5C: adds r1, r6, r4 movs r0, 0xFF @@ -727691,16 +703472,15 @@ sub_8162F68: @ 8162F68 lsls r0, 1 cmp r4, r0 bne _08162F90 - ldr r0, _08162F88 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08162F8C + ldr r1, =0x00000bed adds r0, r1 b _0816300E .align 2, 0 -_08162F88: .4byte 0x03005d90 -_08162F8C: .4byte 0x00000bed + .pool _08162F90: - ldr r0, _08162FA0 + ldr r0, =0x000003fe cmp r4, r0 bne _08162FA4 bl sub_81A4DB8 @@ -727708,44 +703488,40 @@ _08162F90: lsrs r0, 24 b _08163042 .align 2, 0 -_08162FA0: .4byte 0x000003fe + .pool _08162FA4: - ldr r0, _08162FB8 + ldr r0, =0x0000012b cmp r4, r0 bhi _08162FC0 - ldr r0, _08162FBC + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r4 adds r0, r1 b _0816300E .align 2, 0 -_08162FB8: .4byte 0x0000012b -_08162FBC: .4byte 0x0203bc88 + .pool _08162FC0: - ldr r0, _08162FDC + ldr r0, =0x0000018f cmp r4, r0 bhi _08162FEC - ldr r0, _08162FE0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08162FE4 + ldr r1, =0xfffffed4 adds r2, r4, r1 movs r1, 0xEC muls r1, r2 adds r0, r1 - ldr r1, _08162FE8 + ldr r1, =0x00000739 adds r0, r1 b _0816300E .align 2, 0 -_08162FDC: .4byte 0x0000018f -_08162FE0: .4byte 0x03005d90 -_08162FE4: .4byte 0xfffffed4 -_08162FE8: .4byte 0x00000739 + .pool _08162FEC: - ldr r3, _08163030 - ldr r0, _08163034 + ldr r3, =0x08610970 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _08163038 + ldr r0, =0xfffffe70 adds r2, r5, r0 lsls r0, r2, 4 adds r0, r2 @@ -727762,7 +703538,7 @@ _08162FEC: _0816300E: ldrb r2, [r0] movs r1, 0 - ldr r3, _0816303C + ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 beq _08163028 @@ -727780,10 +703556,7 @@ _08163028: movs r0, 0 b _08163042 .align 2, 0 -_08163030: .4byte 0x08610970 -_08163034: .4byte 0x03005d90 -_08163038: .4byte 0xfffffe70 -_0816303C: .4byte 0x085dcefa + .pool _08163040: movs r0, 0x1 _08163042: @@ -727799,7 +703572,7 @@ sub_8163048: @ 8163048 lsls r4, 24 lsrs r4, 24 bl zero_enemy_party_data - ldr r0, _08163068 + ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 adds r2, r4, 0 @@ -727808,7 +703581,7 @@ sub_8163048: @ 8163048 pop {r0} bx r0 .align 2, 0 -_08163068: .4byte 0x02038bca + .pool thumb_func_end sub_8163048 thumb_func_start sub_816306C @@ -727818,12 +703591,12 @@ sub_816306C: @ 816306C lsls r4, 24 lsrs r4, 24 bl zero_enemy_party_data - ldr r0, _08163098 + ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 adds r2, r4, 0 bl sub_81630C4 - ldr r0, _0816309C + ldr r0, =0x02038bcc ldrh r0, [r0] movs r1, 0x3 adds r2, r4, 0 @@ -727832,8 +703605,7 @@ sub_816306C: @ 816306C pop {r0} bx r0 .align 2, 0 -_08163098: .4byte 0x02038bca -_0816309C: .4byte 0x02038bcc + .pool thumb_func_end sub_816306C thumb_func_start sub_81630A0 @@ -727843,7 +703615,7 @@ sub_81630A0: @ 81630A0 lsls r4, 24 lsrs r4, 24 bl zero_enemy_party_data - ldr r0, _081630C0 + ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 adds r2, r4, 0 @@ -727852,7 +703624,7 @@ sub_81630A0: @ 81630A0 pop {r0} bx r0 .align 2, 0 -_081630C0: .4byte 0x02038bca + .pool thumb_func_end sub_81630A0 thumb_func_start sub_81630C4 @@ -727878,7 +703650,7 @@ sub_81630C4: @ 81630C4 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x20] - ldr r0, _08163128 + ldr r0, =0x0000012b cmp r5, r0 bhi _08163138 adds r0, r5, 0 @@ -727886,9 +703658,9 @@ sub_81630C4: @ 81630C4 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x24] - ldr r0, _0816312C + ldr r0, =0x02038bca ldrh r2, [r0] - ldr r0, _08163130 + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r2 @@ -727899,17 +703671,14 @@ sub_81630C4: @ 81630C4 str r0, [sp, 0x28] ldr r2, [sp, 0x2C] ldrh r1, [r2] - ldr r0, _08163134 + ldr r0, =0x0000ffff cmp r1, r0 bne _08163124 b _08163278 _08163124: b _08163260 .align 2, 0 -_08163128: .4byte 0x0000012b -_0816312C: .4byte 0x02038bca -_08163130: .4byte 0x0203bc88 -_08163134: .4byte 0x0000ffff + .pool _08163138: movs r0, 0xFA lsls r0, 1 @@ -727921,11 +703690,11 @@ _08163138: blt _0816314A b _08163426 _0816314A: - ldr r4, _08163178 + ldr r4, =0x03005d90 _0816314C: movs r0, 0x64 muls r0, r7 - ldr r1, _0816317C + ldr r1, =0x02024744 adds r0, r1 ldr r5, [sp, 0x18] subs r2, r7, r5 @@ -727944,18 +703713,17 @@ _0816314C: blt _0816314C b _08163426 .align 2, 0 -_08163178: .4byte 0x03005d90 -_0816317C: .4byte 0x02024744 + .pool _08163180: - ldr r0, _0816318C + ldr r0, =0x000003fe cmp r5, r0 bne _08163190 bl sub_81A4E04 b _08163426 .align 2, 0 -_0816318C: .4byte 0x000003fe + .pool _08163190: - ldr r0, _08163200 + ldr r0, =0x0000018f cmp r5, r0 bhi _08163218 movs r6, 0 @@ -727966,17 +703734,17 @@ _08163190: blt _081631A4 b _08163426 _081631A4: - ldr r2, _08163204 + ldr r2, =0xfffffed4 adds r1, r5, r2 movs r0, 0xEC adds r2, r1, 0 muls r2, r0 mov r8, r2 muls r0, r5 - ldr r5, _08163208 + ldr r5, =0xfffef2a8 adds r4, r0, r5 _081631B6: - ldr r0, _0816320C + ldr r0, =0x03005d90 ldr r3, [r0] movs r0, 0x2C adds r2, r6, 0 @@ -727984,7 +703752,7 @@ _081631B6: mov r1, r8 adds r0, r2, r1 adds r1, r3, r0 - ldr r5, _08163210 + ldr r5, =0x0000076c adds r0, r1, r5 ldrh r0, [r0] cmp r0, 0 @@ -727997,7 +703765,7 @@ _081631B6: bhi _081631F0 movs r0, 0x64 muls r0, r7 - ldr r1, _08163214 + ldr r1, =0x02024744 adds r0, r1 adds r1, r3, r4 adds r2, 0x34 @@ -728014,12 +703782,7 @@ _081631F0: blt _081631B6 b _08163426 .align 2, 0 -_08163200: .4byte 0x0000018f -_08163204: .4byte 0xfffffed4 -_08163208: .4byte 0xfffef2a8 -_0816320C: .4byte 0x03005d90 -_08163210: .4byte 0x0000076c -_08163214: .4byte 0x02024744 + .pool _08163218: ldr r7, [sp, 0x18] adds r0, r7, 0x3 @@ -728027,17 +703790,17 @@ _08163218: blt _08163222 b _08163426 _08163222: - ldr r6, _08163254 + ldr r6, =0x03005d90 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r1, _08163258 + ldr r1, =0xffff969c adds r5, r0, r1 movs r4, 0 _08163230: movs r0, 0x64 muls r0, r7 - ldr r1, _0816325C + ldr r1, =0x02024744 adds r0, r1 ldr r1, [r6] adds r1, r5 @@ -728053,9 +703816,7 @@ _08163230: blt _08163230 b _08163426 .align 2, 0 -_08163254: .4byte 0x03005d90 -_08163258: .4byte 0xffff969c -_0816325C: .4byte 0x02024744 + .pool _08163260: ldr r0, [sp, 0x28] adds r0, 0x1 @@ -728066,7 +703827,7 @@ _08163260: ldr r5, [sp, 0x2C] adds r0, r5 ldrh r1, [r0] - ldr r0, _081632C8 + ldr r0, =0x0000ffff cmp r1, r0 bne _08163260 _08163278: @@ -728099,7 +703860,7 @@ _08163296: cmp r2, 0x14 bne _081632BE _081632B6: - ldr r0, _081632CC + ldr r0, =0x00000351 cmp r4, r0 bls _081632BE b _0816341E @@ -728110,8 +703871,7 @@ _081632BE: mov r8, r5 b _081632D2 .align 2, 0 -_081632C8: .4byte 0x0000ffff -_081632CC: .4byte 0x00000351 + .pool _081632D0: adds r6, 0x1 _081632D2: @@ -728120,12 +703880,12 @@ _081632D2: movs r1, 0x64 adds r0, r6, 0 muls r0, r1 - ldr r2, _08163438 + ldr r2, =0x02024744 adds r0, r2 movs r1, 0xB movs r2, 0 bl pokemon_getattr - ldr r1, _0816343C + ldr r1, =0x0203bc8c ldr r2, [r1] lsls r1, r4, 4 adds r1, r2 @@ -728140,11 +703900,11 @@ _081632FC: movs r6, 0 cmp r6, r8 bge _08163346 - ldr r5, _08163440 + ldr r5, =0x085cecb0 mov r9, r5 movs r3, 0 _08163308: - ldr r0, _08163438 + ldr r0, =0x02024744 adds r5, r3, r0 adds r0, r5, 0 movs r1, 0xC @@ -728158,7 +703918,7 @@ _08163308: movs r1, 0xC movs r2, 0 bl pokemon_getattr - ldr r1, _0816343C + ldr r1, =0x0203bc8c ldr r2, [r1] lsls r1, r4, 4 adds r1, r2 @@ -728203,9 +703963,9 @@ _08163368: movs r1, 0x64 mov r0, r8 muls r0, r1 - ldr r2, _08163438 + ldr r2, =0x02024744 adds r0, r2 - ldr r5, _0816343C + ldr r5, =0x0203bc8c ldr r2, [r5] lsls r4, 4 adds r2, r4, r2 @@ -728231,7 +703991,7 @@ _08163368: muls r3, r0 mov r1, r9 str r1, [sp, 0x3C] - ldr r2, _08163438 + ldr r2, =0x02024744 mov r10, r2 _081633B8: ldr r0, [r5] @@ -728266,18 +704026,18 @@ _081633EC: movs r5, 0x64 mov r4, r8 muls r4, r5 - ldr r6, _08163438 + ldr r6, =0x02024744 adds r4, r6 adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0x14 bl pokemon_setattr - ldr r0, _0816343C + ldr r0, =0x0203bc8c ldr r0, [r0] add r0, r9 ldrb r2, [r0, 0xA] lsls r2, 1 - ldr r0, _08163440 + ldr r0, =0x085cecb0 adds r2, r0 adds r0, r4, 0 movs r1, 0xC @@ -728298,9 +704058,7 @@ _08163426: pop {r0} bx r0 .align 2, 0 -_08163438: .4byte 0x02024744 -_0816343C: .4byte 0x0203bc8c -_08163440: .4byte 0x085cecb0 + .pool thumb_func_end sub_81630C4 thumb_func_start sub_8163444 @@ -728317,7 +704075,7 @@ sub_8163444: @ 8163444 movs r1, 0xFF add r0, sp, 0x4 strb r1, [r0] - ldr r0, _08163518 + ldr r0, =0x03005d90 ldr r2, [r0] movs r0, 0xDC adds r0, r2 @@ -728330,7 +704088,7 @@ sub_8163444: @ 8163444 movs r0, 0x6 str r0, [sp, 0x10] _08163474: - ldr r1, _0816351C + ldr r1, =0x00000ca9 adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x3 @@ -728352,7 +704110,7 @@ _08163494: adds r6, r2, r7 movs r0, 0x64 muls r0, r6 - ldr r1, _08163520 + ldr r1, =0x02024744 adds r0, r1 lsls r5, r7, 1 adds r4, r5, r7 @@ -728388,7 +704146,7 @@ _081634D4: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _08163520 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x20 @@ -728413,9 +704171,7 @@ _081634D4: pop {r0} bx r0 .align 2, 0 -_08163518: .4byte 0x03005d90 -_0816351C: .4byte 0x00000ca9 -_08163520: .4byte 0x02024744 + .pool thumb_func_end sub_8163444 thumb_func_start sub_8163524 @@ -728427,7 +704183,7 @@ sub_8163524: @ 8163524 bl sub_8165C40 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08163548 + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r4 @@ -728437,7 +704193,7 @@ sub_8163524: @ 8163524 ldrh r1, [r5] b _08163558 .align 2, 0 -_08163548: .4byte 0x0203bc88 + .pool _0816354C: adds r0, r4, 0x1 lsls r0, 24 @@ -728446,7 +704202,7 @@ _0816354C: adds r0, r5 ldrh r1, [r0] _08163558: - ldr r0, _08163588 + ldr r0, =0x0000ffff cmp r1, r0 bne _0816354C _0816355E: @@ -728463,7 +704219,7 @@ _0816355E: cmp r6, 0x14 bne _08163580 _0816357A: - ldr r0, _0816358C + ldr r0, =0x00000351 cmp r1, r0 bhi _0816355E _08163580: @@ -728472,34 +704228,31 @@ _08163580: pop {r1} bx r1 .align 2, 0 -_08163588: .4byte 0x0000ffff -_0816358C: .4byte 0x00000351 + .pool thumb_func_end sub_8163524 thumb_func_start sub_8163590 sub_8163590: @ 8163590 push {lr} bl zero_enemy_party_data - ldr r0, _081635B4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081635B8 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r1, [r0] movs r0, 0x3 ands r0, r1 cmp r0, 0x2 beq _081635C0 - ldr r0, _081635BC + ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 bl sub_81635D4 b _081635CA .align 2, 0 -_081635B4: .4byte 0x03005d90 -_081635B8: .4byte 0x00000ca9 -_081635BC: .4byte 0x02038bca + .pool _081635C0: - ldr r0, _081635D0 + ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 bl sub_816379C @@ -728507,7 +704260,7 @@ _081635CA: pop {r0} bx r0 .align 2, 0 -_081635D0: .4byte 0x02038bca + .pool thumb_func_end sub_8163590 thumb_func_start sub_81635D4 @@ -728524,11 +704277,11 @@ sub_81635D4: @ 81635D4 lsls r1, 24 lsrs r1, 24 str r1, [sp, 0x10] - ldr r0, _0816362C + ldr r0, =0x0000012b cmp r2, r0 bhi _0816364A - ldr r4, _08163630 - ldr r0, _08163634 + ldr r4, =0x03005d90 + ldr r0, =0x000040ce bl var_get lsls r0, 24 ldr r4, [r4] @@ -728542,7 +704295,7 @@ sub_81635D4: @ 81635D4 bl __udivsi3 lsls r0, 24 lsrs r1, r0, 24 - ldr r3, _08163638 + ldr r3, =0x00000cb2 adds r4, r3 ldrh r0, [r4] cmp r0, 0x5 @@ -728554,10 +704307,7 @@ sub_81635D4: @ 81635D4 lsrs r0, 24 b _081636A6 .align 2, 0 -_0816362C: .4byte 0x0000012b -_08163630: .4byte 0x03005d90 -_08163634: .4byte 0x000040ce -_08163638: .4byte 0x00000cb2 + .pool _0816363C: adds r0, r1, 0 movs r1, 0x1 @@ -728576,11 +704326,11 @@ _0816364A: blt _0816365C b _08163776 _0816365C: - ldr r4, _0816368C + ldr r4, =0x03005d90 _0816365E: movs r0, 0x64 muls r0, r7 - ldr r1, _08163690 + ldr r1, =0x02024744 adds r0, r1 ldr r1, [sp, 0x10] subs r2, r7, r1 @@ -728601,16 +704351,15 @@ _0816365E: blt _0816365E b _08163776 .align 2, 0 -_0816368C: .4byte 0x03005d90 -_08163690: .4byte 0x02024744 + .pool _08163694: - ldr r0, _081636A0 + ldr r0, =0x000003fe cmp r3, r0 bne _081636A4 bl sub_81A6CD0 b _08163776 .align 2, 0 -_081636A0: .4byte 0x000003fe + .pool _081636A4: movs r0, 0x1F _081636A6: @@ -728619,7 +704368,7 @@ _081636A6: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x14] - ldr r0, _08163788 + ldr r0, =0x03005d90 ldr r1, [r0] ldrb r2, [r1, 0xA] ldrb r0, [r1, 0xB] @@ -728634,7 +704383,7 @@ _081636A6: mov r8, r2 movs r7, 0 _081636CE: - ldr r1, _0816378C + ldr r1, =0x03006298 lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -728644,9 +704393,9 @@ _081636CE: movs r0, 0x64 adds r6, r5, 0 muls r6, r0 - ldr r1, _08163790 + ldr r1, =0x02024744 adds r0, r6, r1 - ldr r3, _08163794 + ldr r3, =0x0203bc8c ldr r2, [r3] mov r1, r9 lsls r4, r1, 4 @@ -728671,7 +704420,7 @@ _081636CE: mov r10, r7 adds r7, r4, 0 _08163718: - ldr r0, _08163794 + ldr r0, =0x0203bc8c ldr r1, [r0] mov r2, r9 lsls r0, r2, 4 @@ -728680,7 +704429,7 @@ _08163718: adds r0, 0x2 adds r0, r1 ldrh r1, [r0] - ldr r2, _08163790 + ldr r2, =0x02024744 adds r0, r6, r2 adds r2, r3, 0 str r3, [sp, 0x1C] @@ -728694,18 +704443,18 @@ _08163718: movs r3, 0x64 adds r4, r5, 0 muls r4, r3 - ldr r0, _08163790 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0xC bl pokemon_setattr - ldr r1, _08163794 + ldr r1, =0x0203bc8c ldr r0, [r1] adds r0, r7, r0 ldrb r2, [r0, 0xA] lsls r2, 1 - ldr r0, _08163798 + ldr r0, =0x085cecb0 adds r2, r0 adds r0, r4, 0 movs r1, 0xC @@ -728725,11 +704474,7 @@ _08163776: pop {r0} bx r0 .align 2, 0 -_08163788: .4byte 0x03005d90 -_0816378C: .4byte 0x03006298 -_08163790: .4byte 0x02024744 -_08163794: .4byte 0x0203bc8c -_08163798: .4byte 0x085cecb0 + .pool thumb_func_end sub_81635D4 thumb_func_start sub_816379C @@ -728743,7 +704488,7 @@ sub_816379C: @ 816379C lsls r1, 24 lsrs r1, 24 str r1, [sp, 0x10] - ldr r0, _08163898 + ldr r0, =0x03005d90 ldr r1, [r0] ldrb r0, [r1, 0xA] mov r9, r0 @@ -728761,7 +704506,7 @@ sub_816379C: @ 816379C movs r7, 0 mov r8, r7 _081637D0: - ldr r1, _0816389C + ldr r1, =0x03006298 mov r2, r8 lsls r0, r2, 1 adds r0, r1 @@ -728771,9 +704516,9 @@ _081637D0: movs r7, 0x64 adds r6, r5, 0 muls r6, r7 - ldr r1, _081638A0 + ldr r1, =0x02024744 adds r0, r6, r1 - ldr r7, _081638A4 + ldr r7, =0x0203bc8c ldr r2, [r7] lsls r4, 4 adds r2, r4, r2 @@ -728797,18 +704542,18 @@ _081637D0: mov r8, r4 mov r5, r8 _08163818: - ldr r1, _081638A4 + ldr r1, =0x0203bc8c ldr r0, [r1] adds r0, r5, r0 lsls r4, r7, 1 adds r0, 0x2 adds r0, r4 ldrh r1, [r0] - ldr r2, _081638A0 + ldr r2, =0x02024744 adds r0, r6, r2 adds r2, r7, 0 bl sub_81A7024 - ldr r1, _081638A4 + ldr r1, =0x0203bc8c ldr r0, [r1] adds r0, r5, r0 adds r0, 0x2 @@ -728828,18 +704573,18 @@ _08163846: movs r2, 0x64 mov r4, r10 muls r4, r2 - ldr r7, _081638A0 + ldr r7, =0x02024744 adds r4, r7 adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0xC bl pokemon_setattr - ldr r1, _081638A4 + ldr r1, =0x0203bc8c ldr r0, [r1] add r0, r8 ldrb r2, [r0, 0xA] lsls r2, 1 - ldr r0, _081638A8 + ldr r0, =0x085cecb0 adds r2, r0 adds r0, r4, 0 movs r1, 0xC @@ -728859,18 +704604,14 @@ _08163846: pop {r0} bx r0 .align 2, 0 -_08163898: .4byte 0x03005d90 -_0816389C: .4byte 0x03006298 -_081638A0: .4byte 0x02024744 -_081638A4: .4byte 0x0203bc8c -_081638A8: .4byte 0x085cecb0 + .pool thumb_func_end sub_816379C thumb_func_start sub_81638AC sub_81638AC: @ 81638AC push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _08163910 + ldr r4, =0x02021fc4 adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x3 @@ -728900,7 +704641,7 @@ _081638E4: cmp r0, 0xFE bne _081638E4 _081638EE: - ldr r2, _08163910 + ldr r2, =0x02021fc4 adds r0, r1, r2 ldrb r0, [r0] adds r3, r2, 0 @@ -728921,43 +704662,40 @@ _0816390A: pop {r0} bx r0 .align 2, 0 -_08163910: .4byte 0x02021fc4 + .pool thumb_func_end sub_81638AC thumb_func_start sub_8163914 sub_8163914: @ 8163914 push {lr} bl sub_8165C40 - ldr r0, _08163928 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 beq _08163930 - ldr r0, _0816392C + ldr r0, =0x02038bcc b _08163932 .align 2, 0 -_08163928: .4byte 0x020375e2 -_0816392C: .4byte 0x02038bcc + .pool _08163930: - ldr r0, _08163944 + ldr r0, =0x02038bca _08163932: ldrh r3, [r0] movs r0, 0xFA lsls r0, 1 cmp r3, r0 bne _08163950 - ldr r0, _08163948 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0816394C + ldr r1, =0x00000bfc b _08163986 .align 2, 0 -_08163944: .4byte 0x02038bca -_08163948: .4byte 0x03005d90 -_0816394C: .4byte 0x00000bfc + .pool _08163950: - ldr r0, _0816396C + ldr r0, =0x0000012b cmp r3, r0 bhi _08163974 - ldr r2, _08163970 + ldr r2, =0x0203bc88 movs r0, 0x34 adds r1, r3, 0 muls r1, r0 @@ -728967,26 +704705,23 @@ _08163950: bl sub_81638AC b _081639A8 .align 2, 0 -_0816396C: .4byte 0x0000012b -_08163970: .4byte 0x0203bc88 + .pool _08163974: - ldr r0, _08163990 + ldr r0, =0x0000018f cmp r3, r0 bhi _0816399C - ldr r1, _08163994 + ldr r1, =0x03005d90 movs r0, 0xEC muls r0, r3 ldr r1, [r1] adds r0, r1 - ldr r1, _08163998 + ldr r1, =0xfffef2b8 _08163986: adds r0, r1 bl sub_81638AC b _081639A8 .align 2, 0 -_08163990: .4byte 0x0000018f -_08163994: .4byte 0x03005d90 -_08163998: .4byte 0xfffef2b8 + .pool _0816399C: adds r0, r3, 0 adds r0, 0x70 @@ -729003,19 +704738,18 @@ sub_81639AC: @ 81639AC push {r4-r6,lr} sub sp, 0x4 bl sub_81864CC - ldr r0, _081639C8 + ldr r0, =0x02024474 adds r0, 0x26 ldrb r0, [r0] cmp r0, 0xA bhi _08163A78 lsls r0, 2 - ldr r1, _081639CC + ldr r1, =_081639D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081639C8: .4byte 0x02024474 -_081639CC: .4byte _081639D0 + .pool .align 2, 0 _081639D0: .4byte _081639FC @@ -729030,12 +704764,12 @@ _081639D0: .4byte _081639FC .4byte _081639FC _081639FC: - ldr r0, _08163A20 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _08163A24 + ldr r2, =0x00000ebc adds r1, r0, r2 ldr r2, [r1] - ldr r0, _08163A28 + ldr r0, =0x00fffffe cmp r2, r0 bhi _08163A2C adds r0, r2, 0x1 @@ -729047,18 +704781,16 @@ _081639FC: bl sub_81DA57C b _08163A78 .align 2, 0 -_08163A20: .4byte 0x03005d90 -_08163A24: .4byte 0x00000ebc -_08163A28: .4byte 0x00fffffe + .pool _08163A2C: - ldr r0, _08163A34 + ldr r0, =0x00ffffff str r0, [r1] b _08163A78 .align 2, 0 -_08163A34: .4byte 0x00ffffff + .pool _08163A38: movs r5, 0 - ldr r6, _08163A6C + ldr r6, =0x03005d8c _08163A3C: movs r0, 0x64 adds r4, r5, 0 @@ -729072,7 +704804,7 @@ _08163A3C: bl pokemon_getattr mov r1, sp strh r0, [r1] - ldr r0, _08163A70 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xC @@ -729083,19 +704815,18 @@ _08163A3C: ble _08163A3C b _08163A78 .align 2, 0 -_08163A6C: .4byte 0x03005d8c -_08163A70: .4byte 0x020244ec + .pool _08163A74: bl sub_816537C _08163A78: - ldr r0, _08163A88 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 add sp, 0x4 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08163A88: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_81639AC thumb_func_start sub_8163A8C @@ -729108,10 +704839,10 @@ sub_8163A8C: @ 8163A8C lsrs r0, 24 cmp r0, 0x1 bne _08163AB0 - ldr r0, _08163AB8 - ldr r1, _08163ABC + ldr r0, =0x030022c0 + ldr r1, =sub_81639AC + 1 str r1, [r0, 0x8] - ldr r0, _08163AC0 + ldr r0, =sub_8036760 + 1 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -729120,17 +704851,15 @@ _08163AB0: pop {r0} bx r0 .align 2, 0 -_08163AB8: .4byte 0x030022c0 -_08163ABC: .4byte sub_81639AC + 1 -_08163AC0: .4byte sub_8036760 + 1 + .pool thumb_func_end sub_8163A8C thumb_func_start sub_8163AC4 sub_8163AC4: @ 8163AC4 push {r4-r6,lr} sub sp, 0x4 - ldr r0, _08163AE4 - ldr r2, _08163AE8 + ldr r0, =0x02024474 + ldr r2, =0x020375e0 ldrh r1, [r2] adds r0, 0x26 strb r1, [r0] @@ -729140,14 +704869,12 @@ sub_8163AC4: @ 8163AC4 b _08163E68 _08163ADA: lsls r0, 2 - ldr r1, _08163AEC + ldr r1, =_08163AF0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08163AE4: .4byte 0x02024474 -_08163AE8: .4byte 0x020375e0 -_08163AEC: .4byte _08163AF0 + .pool .align 2, 0 _08163AF0: .4byte _08163B1C @@ -729162,11 +704889,11 @@ _08163AF0: .4byte _08163DF4 .4byte _08163DC8 _08163B1C: - ldr r5, _08163B3C + ldr r5, =0x02022fec movs r0, 0x84 lsls r0, 1 str r0, [r5] - ldr r0, _08163B40 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r4, r0, 16 @@ -729178,8 +704905,7 @@ _08163B1C: beq _08163B4E b _08163BA6 .align 2, 0 -_08163B3C: .4byte 0x02022fec -_08163B40: .4byte 0x000040ce + .pool _08163B44: cmp r4, 0x2 beq _08163B64 @@ -729200,34 +704926,31 @@ _08163B56: _08163B64: movs r0, 0x2 bl sub_816306C - ldr r1, _08163B88 - ldr r0, _08163B8C + ldr r1, =0x02038bce + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _08163B90 + ldr r2, =0x00000cd6 adds r0, r2 ldrh r0, [r0] strh r0, [r1] ldrh r0, [r1] bl sub_8165404 ldr r0, [r5] - ldr r1, _08163B94 + ldr r1, =0x00408041 orrs r0, r1 str r0, [r5] b _08163BA6 .align 2, 0 -_08163B88: .4byte 0x02038bce -_08163B8C: .4byte 0x03005d90 -_08163B90: .4byte 0x00000cd6 -_08163B94: .4byte 0x00408041 + .pool _08163B98: ldr r0, [r5] - ldr r1, _08163BB8 + ldr r1, =0x00800043 orrs r0, r1 str r0, [r5] movs r0, 0x2 bl sub_816306C _08163BA6: - ldr r0, _08163BBC + ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 @@ -729235,16 +704958,15 @@ _08163BA6: movs r0, 0 b _08163E10 .align 2, 0 -_08163BB8: .4byte 0x00800043 -_08163BBC: .4byte sub_8163A8C + 1 + .pool _08163BC0: movs r5, 0 - ldr r6, _08163C04 + ldr r6, =0x03005d8c _08163BC4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08163C08 + ldr r0, =0x020244ec adds r0, r4, r0 movs r1, 0xC bl pokemon_getattr @@ -729261,7 +704983,7 @@ _08163BC4: adds r5, 0x1 cmp r5, 0x5 ble _08163BC4 - ldr r0, _08163C0C + ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 @@ -729269,17 +704991,15 @@ _08163BC4: movs r0, 0xC b _08163E10 .align 2, 0 -_08163C04: .4byte 0x03005d8c -_08163C08: .4byte 0x020244ec -_08163C0C: .4byte sub_8163A8C + 1 + .pool _08163C10: bl zero_enemy_party_data movs r5, 0 - ldr r4, _08163C58 + ldr r4, =0x03005d90 _08163C18: movs r0, 0x64 muls r0, r5 - ldr r1, _08163C5C + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2C adds r2, r5, 0 @@ -729293,13 +705013,13 @@ _08163C18: adds r5, 0x1 cmp r5, 0x2 ble _08163C18 - ldr r1, _08163C60 - ldr r0, _08163C64 + ldr r1, =0x02022fec + ldr r0, =0x00000808 str r0, [r1] - ldr r1, _08163C68 + ldr r1, =0x02038bca movs r0, 0 strh r0, [r1] - ldr r0, _08163C6C + ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 @@ -729307,17 +705027,12 @@ _08163C18: movs r0, 0xD b _08163E10 .align 2, 0 -_08163C58: .4byte 0x03005d90 -_08163C5C: .4byte 0x02024744 -_08163C60: .4byte 0x02022fec -_08163C64: .4byte 0x00000808 -_08163C68: .4byte 0x02038bca -_08163C6C: .4byte sub_8163A8C + 1 + .pool _08163C70: - ldr r4, _08163CAC - ldr r0, _08163CB0 + ldr r4, =0x02022fec + ldr r0, =0x00010008 str r0, [r4] - ldr r0, _08163CB4 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r1, r0, 16 @@ -729327,15 +705042,15 @@ _08163C70: orrs r0, r1 str r0, [r4] _08163C8A: - ldr r0, _08163CB8 + ldr r0, =0x02038bca ldrh r1, [r0] - ldr r0, _08163CBC + ldr r0, =0x000003fe cmp r1, r0 bne _08163C9A movs r0, 0x2 bl sub_8163048 _08163C9A: - ldr r0, _08163CC0 + ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 @@ -729343,17 +705058,12 @@ _08163C9A: movs r0, 0x3 b _08163E10 .align 2, 0 -_08163CAC: .4byte 0x02022fec -_08163CB0: .4byte 0x00010008 -_08163CB4: .4byte 0x000040ce -_08163CB8: .4byte 0x02038bca -_08163CBC: .4byte 0x000003fe -_08163CC0: .4byte sub_8163A8C + 1 + .pool _08163CC4: - ldr r4, _08163CF8 - ldr r0, _08163CFC + ldr r4, =0x02022fec + ldr r0, =0x00020008 str r0, [r4] - ldr r0, _08163D00 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r1, r0, 16 @@ -729363,9 +705073,9 @@ _08163CC4: orrs r0, r1 str r0, [r4] _08163CDE: - ldr r0, _08163D04 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _08163D08 + ldr r2, =0x00000ca9 adds r0, r2 ldrb r1, [r0] movs r0, 0x3 @@ -729376,16 +705086,12 @@ _08163CDE: bl sub_8163048 b _08163D12 .align 2, 0 -_08163CF8: .4byte 0x02022fec -_08163CFC: .4byte 0x00020008 -_08163D00: .4byte 0x000040ce -_08163D04: .4byte 0x03005d90 -_08163D08: .4byte 0x00000ca9 + .pool _08163D0C: movs r0, 0x3 bl sub_81630A0 _08163D12: - ldr r0, _08163D24 + ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 @@ -729393,14 +705099,14 @@ _08163D12: movs r0, 0x4 b _08163E10 .align 2, 0 -_08163D24: .4byte sub_8163A8C + 1 + .pool _08163D28: - ldr r1, _08163D48 - ldr r0, _08163D4C + ldr r1, =0x02022fec + ldr r0, =0x00040008 str r0, [r1] - ldr r0, _08163D50 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08163D54 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r1, [r0] movs r0, 0x3 @@ -729411,15 +705117,12 @@ _08163D28: bl sub_8163048 b _08163D5E .align 2, 0 -_08163D48: .4byte 0x02022fec -_08163D4C: .4byte 0x00040008 -_08163D50: .4byte 0x03005d90 -_08163D54: .4byte 0x00000ca9 + .pool _08163D58: movs r0, 0x3 bl sub_81630A0 _08163D5E: - ldr r0, _08163D70 + ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 @@ -729427,12 +705130,12 @@ _08163D5E: movs r0, 0x5 b _08163E10 .align 2, 0 -_08163D70: .4byte sub_8163A8C + 1 + .pool _08163D74: - ldr r4, _08163DA4 - ldr r0, _08163DA8 + ldr r4, =0x02022fec + ldr r0, =0x00080008 str r0, [r4] - ldr r0, _08163DAC + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r1, r0, 16 @@ -729443,7 +705146,7 @@ _08163D74: str r0, [r4] _08163D8E: bl sub_8163590 - ldr r0, _08163DB0 + ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 @@ -729451,12 +705154,9 @@ _08163D8E: movs r0, 0x6 b _08163E10 .align 2, 0 -_08163DA4: .4byte 0x02022fec -_08163DA8: .4byte 0x00080008 -_08163DAC: .4byte 0x000040ce -_08163DB0: .4byte sub_8163A8C + 1 + .pool _08163DB4: - ldr r1, _08163DC4 + ldr r1, =0x02022fec movs r0, 0x84 lsls r0, 1 str r0, [r1] @@ -729464,14 +705164,14 @@ _08163DB4: bl sub_8163048 b _08163E00 .align 2, 0 -_08163DC4: .4byte 0x02022fec + .pool _08163DC8: - ldr r1, _08163DE8 - ldr r0, _08163DEC + ldr r1, =0x02022fec + ldr r0, =0x00200008 str r0, [r1] movs r0, 0x3 bl sub_8163048 - ldr r0, _08163DF0 + ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 @@ -729479,17 +705179,15 @@ _08163DC8: movs r0, 0xA b _08163E10 .align 2, 0 -_08163DE8: .4byte 0x02022fec -_08163DEC: .4byte 0x00200008 -_08163DF0: .4byte sub_8163A8C + 1 + .pool _08163DF4: - ldr r1, _08163E20 - ldr r0, _08163E24 + ldr r1, =0x02022fec + ldr r0, =0x00008109 str r0, [r1] movs r0, 0x1 bl sub_816306C _08163E00: - ldr r0, _08163E28 + ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 @@ -729502,28 +705200,26 @@ _08163E10: bl sub_8145EF4 b _08163E68 .align 2, 0 -_08163E20: .4byte 0x02022fec -_08163E24: .4byte 0x00008109 -_08163E28: .4byte sub_8163A8C + 1 + .pool _08163E2C: - ldr r1, _08163E70 - ldr r0, _08163E74 + ldr r1, =0x02022fec + ldr r0, =0x00408049 str r0, [r1] - ldr r5, _08163E78 + ldr r5, =0x00000c03 adds r0, r5, 0 bl sub_8165404 - ldr r4, _08163E7C + ldr r4, =0x02038bfc movs r0, 0 strb r0, [r4] - ldr r0, _08163E80 + ldr r0, =0x08224158 bl battle_configure_by_script movs r0, 0x1 strb r0, [r4] - ldr r0, _08163E84 + ldr r0, =0x08224167 bl battle_configure_by_script - ldr r0, _08163E88 + ldr r0, =0x02038bce strh r5, [r0] - ldr r0, _08163E8C + ldr r0, =sub_8163A8C + 1 movs r1, 0x1 bl AddTask movs r0, 0 @@ -729536,27 +705232,20 @@ _08163E68: pop {r0} bx r0 .align 2, 0 -_08163E70: .4byte 0x02022fec -_08163E74: .4byte 0x00408049 -_08163E78: .4byte 0x00000c03 -_08163E7C: .4byte 0x02038bfc -_08163E80: .4byte 0x08224158 -_08163E84: .4byte 0x08224167 -_08163E88: .4byte 0x02038bce -_08163E8C: .4byte sub_8163A8C + 1 + .pool thumb_func_end sub_8163AC4 thumb_func_start sub_8163E90 sub_8163E90: @ 8163E90 push {r4-r6,lr} - ldr r6, _08163ED8 + ldr r6, =0x03005d90 ldr r0, [r6] - ldr r1, _08163EDC + ldr r1, =0x00000ca9 adds r0, r1 ldrb r5, [r0] lsls r5, 30 lsrs r5, 30 - ldr r0, _08163EE0 + ldr r0, =0x000040ce bl var_get adds r4, r0, 0 lsls r4, 24 @@ -729583,9 +705272,7 @@ _08163ED0: pop {r0} bx r0 .align 2, 0 -_08163ED8: .4byte 0x03005d90 -_08163EDC: .4byte 0x00000ca9 -_08163EE0: .4byte 0x000040ce + .pool thumb_func_end sub_8163E90 thumb_func_start sub_8163EE4 @@ -729594,19 +705281,19 @@ sub_8163EE4: @ 8163EE4 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r4, _08163F2C + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _08163F30 + ldr r1, =0x0000064c adds r5, r0, r1 adds r0, r5, 0 bl sub_8164FB8 ldr r0, [r4] - ldr r2, _08163F34 + ldr r2, =0x00000ca9 adds r0, r2 ldrb r0, [r0] lsls r0, 30 lsrs r6, r0, 30 - ldr r0, _08163F38 + ldr r0, =0x000040ce bl var_get lsls r0, 24 lsrs r7, r0, 24 @@ -729614,7 +705301,7 @@ sub_8163EE4: @ 8163EE4 ldrb r0, [r2, 0x8] cmp r0, 0 beq _08163F40 - ldr r4, _08163F3C + ldr r4, =0x085dcefa ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] adds r0, r1 @@ -729625,13 +705312,9 @@ sub_8163EE4: @ 8163EE4 movs r1, 0x14 b _08163F52 .align 2, 0 -_08163F2C: .4byte 0x03005d90 -_08163F30: .4byte 0x0000064c -_08163F34: .4byte 0x00000ca9 -_08163F38: .4byte 0x000040ce -_08163F3C: .4byte 0x085dcefa + .pool _08163F40: - ldr r4, _0816401C + ldr r4, =0x085dcedc ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] adds r0, r1 @@ -729648,7 +705331,7 @@ _08163F52: strb r0, [r5, 0x1] adds r0, r5, 0 adds r0, 0xC - ldr r4, _08164020 + ldr r4, =0x03005d90 ldr r1, [r4] adds r1, 0xA bl sub_80842F4 @@ -729675,9 +705358,9 @@ _08163F96: lsls r2, r4, 1 mov r1, r12 adds r3, r1, r2 - ldr r0, _08164024 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r7, _08164028 + ldr r7, =0x00002bbc adds r0, r1, r7 adds r0, r2 ldrh r0, [r0] @@ -729690,7 +705373,7 @@ _08163F96: ldrh r0, [r0] strh r0, [r3] adds r3, r6, r2 - ldr r0, _0816402C + ldr r0, =0x00002bd4 adds r1, r0 adds r1, r2 ldrh r0, [r1] @@ -729700,10 +705383,10 @@ _08163F96: ble _08163F96 movs r4, 0 _08163FCC: - ldr r6, _08164020 + ldr r6, =0x03005d90 ldr r0, [r6] lsls r1, r4, 1 - ldr r2, _08164030 + ldr r2, =0x00000caa adds r0, r2 adds r1, r0, r1 ldrh r0, [r1] @@ -729712,7 +705395,7 @@ _08163FCC: adds r1, r0, 0 movs r0, 0x64 muls r0, r1 - ldr r1, _08164034 + ldr r1, =0x02024488 adds r0, r1 movs r1, 0x2C muls r1, r4 @@ -729723,12 +705406,12 @@ _08163FF4: adds r4, 0x1 cmp r4, 0x3 ble _08163FCC - ldr r0, _08164038 + ldr r0, =0x082e9531 ldrb r0, [r0] mov r7, r8 strb r0, [r7] ldr r0, [r6] - ldr r1, _0816403C + ldr r1, =0x0000064c adds r0, r1 bl sub_8164F70 bl sub_8163E90 @@ -729739,28 +705422,20 @@ _08163FF4: pop {r0} bx r0 .align 2, 0 -_0816401C: .4byte 0x085dcedc -_08164020: .4byte 0x03005d90 -_08164024: .4byte 0x03005d8c -_08164028: .4byte 0x00002bbc -_0816402C: .4byte 0x00002bd4 -_08164030: .4byte 0x00000caa -_08164034: .4byte 0x02024488 -_08164038: .4byte 0x082e9531 -_0816403C: .4byte 0x0000064c + .pool thumb_func_end sub_8163EE4 thumb_func_start sub_8164040 sub_8164040: @ 8164040 push {r4,r5,lr} - ldr r5, _081640C0 + ldr r5, =0x03005d90 ldr r0, [r5] - ldr r1, _081640C4 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r4, [r0] lsls r4, 30 lsrs r4, 30 - ldr r0, _081640C8 + ldr r0, =0x000040ce bl var_get lsls r0, 16 ldr r5, [r5] @@ -729776,13 +705451,13 @@ sub_8164040: @ 8164040 bl __udivsi3 lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _081640CC + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 bne _0816408E cmp r1, 0x1 bgt _0816408A - ldr r1, _081640D0 + ldr r1, =0x00000cb2 adds r0, r5, r1 ldrh r0, [r0] cmp r0, 0 @@ -729790,11 +705465,11 @@ sub_8164040: @ 8164040 _0816408A: bl sub_8163EE4 _0816408E: - ldr r4, _081640C0 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081640CC + ldr r1, =0x020375e2 ldrh r1, [r1] - ldr r2, _081640D4 + ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] movs r0, 0x80 @@ -729802,7 +705477,7 @@ _0816408E: movs r1, 0 bl var_set ldr r1, [r4] - ldr r0, _081640C4 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x4 @@ -729813,12 +705488,7 @@ _0816408E: pop {r0} bx r0 .align 2, 0 -_081640C0: .4byte 0x03005d90 -_081640C4: .4byte 0x00000ca9 -_081640C8: .4byte 0x000040ce -_081640CC: .4byte 0x020375e2 -_081640D0: .4byte 0x00000cb2 -_081640D4: .4byte 0x00000ca8 + .pool thumb_func_end sub_8164040 thumb_func_start nullsub_61 @@ -729838,7 +705508,7 @@ sub_81640E0: @ 81640E0 adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 - ldr r4, _08164178 + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0xB movs r2, 0 @@ -729854,9 +705524,9 @@ sub_81640E0: @ 81640E0 lsrs r4, r0, 16 movs r6, 0 movs r2, 0 - ldr r0, _0816417C + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _08164180 + ldr r0, =0xfffffe70 adds r5, r0 lsls r0, r5, 4 adds r0, r5 @@ -729878,7 +705548,7 @@ _08164130: cmp r2, 0x2 ble _08164122 bl GenerateRandomNumber - ldr r4, _08164184 + ldr r4, =0x03006298 lsls r0, 16 lsrs r0, 16 adds r1, r6, 0 @@ -729907,10 +705577,7 @@ _08164150: pop {r0} bx r0 .align 2, 0 -_08164178: .4byte 0x020244ec -_0816417C: .4byte 0x03005d90 -_08164180: .4byte 0xfffffe70 -_08164184: .4byte 0x03006298 + .pool thumb_func_end sub_81640E0 thumb_func_start sub_8164188 @@ -729924,15 +705591,15 @@ sub_8164188: @ 8164188 adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 - ldr r6, _08164288 + ldr r6, =0x03005d90 ldr r0, [r6] - ldr r1, _0816428C + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r0, 30 str r0, [sp, 0xC] - ldr r4, _08164290 + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0xB movs r2, 0 @@ -729952,9 +705619,9 @@ sub_8164188: @ 8164188 mov r8, r3 movs r7, 0 adds r2, r6, 0 - ldr r0, _08164294 + ldr r0, =0xfffffed4 adds r5, r0 - ldr r6, _08164298 + ldr r6, =0x0000076c mov r10, sp movs r0, 0xEC adds r1, r5, 0 @@ -730007,7 +705674,7 @@ _0816423A: cmp r7, 0x3 ble _081641E6 bl GenerateRandomNumber - ldr r4, _0816429C + ldr r4, =0x03006298 lsls r0, 16 lsrs r0, 16 mov r1, r8 @@ -730040,12 +705707,7 @@ _08164258: pop {r0} bx r0 .align 2, 0 -_08164288: .4byte 0x03005d90 -_0816428C: .4byte 0x00000ca9 -_08164290: .4byte 0x020244ec -_08164294: .4byte 0xfffffed4 -_08164298: .4byte 0x0000076c -_0816429C: .4byte 0x03006298 + .pool thumb_func_end sub_8164188 thumb_func_start sub_81642A0 @@ -730056,21 +705718,21 @@ sub_81642A0: @ 81642A0 mov r5, r8 push {r5-r7} sub sp, 0x4C - ldr r0, _08164608 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0xC7 lsls r1, 4 adds r1, r0, r1 str r1, [sp, 0x24] - ldr r5, _0816460C + ldr r5, =0x03005d90 ldr r0, [r5] - ldr r2, _08164610 + ldr r2, =0x00000ca9 adds r0, r2 ldrb r0, [r0] lsls r0, 30 lsrs r0, 30 str r0, [sp, 0x14] - ldr r0, _08164614 + ldr r0, =0x000040ce bl var_get lsls r0, 16 ldr r1, [r5] @@ -730088,7 +705750,7 @@ sub_81642A0: @ 81642A0 lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x18] - ldr r4, _08164618 + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0xB movs r2, 0 @@ -730120,12 +705782,12 @@ _0816431A: cmp r9, r7 bge _08164368 ldr r0, [r5] - ldr r3, _0816461C + ldr r3, =0x00000cb4 adds r1, r0, r3 ldrh r0, [r1] cmp r0, r8 beq _08164368 - ldr r0, _08164620 + ldr r0, =0x0203bc88 ldr r2, [r0] movs r4, 0x34 mov r0, r8 @@ -730151,7 +705813,7 @@ _08164368: cmp r9, r7 bne _0816431A ldr r0, [r5] - ldr r1, _0816461C + ldr r1, =0x00000cb4 adds r0, r1 adds r0, r6 mov r2, r8 @@ -730167,11 +705829,11 @@ _08164368: ldr r0, [sp, 0x24] str r0, [sp, 0x40] _0816438C: - ldr r1, _0816460C + ldr r1, =0x03005d90 ldr r0, [r1] mov r2, r9 lsls r1, r2, 1 - ldr r3, _0816461C + ldr r3, =0x00000cb4 adds r0, r3 adds r0, r1 ldrh r0, [r0] @@ -730202,14 +705864,14 @@ _081643C0: ands r0, r7 cmp r0, 0 beq _081643F4 - ldr r3, _0816460C + ldr r3, =0x03005d90 ldr r0, [r3] - ldr r4, _0816461C + ldr r4, =0x00000cb4 adds r0, r4 ldr r1, [sp, 0x28] adds r0, r1 ldrh r2, [r0] - ldr r0, _08164624 + ldr r0, =0x0203bc8c ldr r0, [r0] lsls r2, 4 adds r2, r0 @@ -730223,13 +705885,13 @@ _081643F4: movs r5, 0x8 cmp r5, r10 bge _08164430 - ldr r2, _0816460C + ldr r2, =0x03005d90 ldr r0, [r2] - ldr r1, _08164624 + ldr r1, =0x0203bc8c ldr r3, [r1] lsls r1, r6, 4 adds r1, r3 - ldr r4, _08164628 + ldr r4, =0x00000cc4 adds r2, r0, r4 ldrh r0, [r1] mov r12, r0 @@ -730254,9 +705916,9 @@ _0816440E: _08164430: cmp r5, r10 bne _081643C0 - ldr r1, _0816460C + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r2, _0816461C + ldr r2, =0x00000cb4 adds r0, r2 ldr r3, [sp, 0x38] adds r0, r3 @@ -730279,7 +705941,7 @@ _08164430: bl sub_8165B20 movs r4, 0 mov r9, r4 - ldr r0, _0816460C + ldr r0, =0x03005d90 ldr r0, [r0] movs r2, 0 adds r6, r0, 0 @@ -730291,7 +705953,7 @@ _08164474: lsrs r0, r4, 30 cmp r0, 0 beq _081644E0 - ldr r1, _0816462C + ldr r1, =0x085df9ec ldrb r0, [r6, 0x1] adds r0, r1 ldrb r0, [r0] @@ -730310,7 +705972,7 @@ _08164474: cmp r0, r3 bne _081644E0 movs r5, 0 - ldr r0, _0816460C + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xE0 adds r1, r2, r0 @@ -730353,7 +706015,7 @@ _081644E0: cmp r4, 0 beq _08164532 bl GenerateRandomNumber - ldr r6, _0816460C + ldr r6, =0x03005d90 ldr r4, [r6] lsls r0, 16 lsrs r0, 16 @@ -730385,7 +706047,7 @@ _08164532: mov r1, sp str r1, [sp, 0x3C] _0816453C: - ldr r0, _0816460C + ldr r0, =0x03005d90 movs r2, 0xEC mov r1, r9 muls r1, r2 @@ -730407,13 +706069,13 @@ _0816455A: adds r7, 0x1 cmp r7, 0x39 bls _0816455A - ldr r0, _0816460C + ldr r0, =0x03005d90 ldr r5, [r0] movs r1, 0xEC mov r6, r9 muls r6, r1 adds r4, r5, r6 - ldr r1, _08164630 + ldr r1, =0x0000073a adds r0, r4, r1 ldrh r0, [r0] movs r1, 0x7 @@ -730444,9 +706106,9 @@ _0816455A: bne _08164656 movs r5, 0 movs r7, 0 - ldr r2, _0816460C + ldr r2, =0x03005d90 mov r8, r2 - ldr r3, _08164634 + ldr r3, =0x0000076c _081645B8: mov r4, r8 ldr r2, [r4] @@ -730488,18 +706150,7 @@ _081645B8: cmp r0, 0 b _08164638 .align 2, 0 -_08164608: .4byte 0x03005d8c -_0816460C: .4byte 0x03005d90 -_08164610: .4byte 0x00000ca9 -_08164614: .4byte 0x000040ce -_08164618: .4byte 0x020244ec -_0816461C: .4byte 0x00000cb4 -_08164620: .4byte 0x0203bc88 -_08164624: .4byte 0x0203bc8c -_08164628: .4byte 0x00000cc4 -_0816462C: .4byte 0x085df9ec -_08164630: .4byte 0x0000073a -_08164634: .4byte 0x0000076c + .pool _08164638: beq _0816463C adds r5, 0x1 @@ -730528,7 +706179,7 @@ _08164660: cmp r1, 0 beq _081646A0 bl GenerateRandomNumber - ldr r6, _081646B0 + ldr r6, =0x03005d90 ldr r4, [r6] lsls r0, 16 lsrs r0, 16 @@ -730537,7 +706188,7 @@ _08164660: lsls r0, 2 add r0, sp ldr r0, [r0] - ldr r5, _081646B4 + ldr r5, =0x00000cc2 adds r4, r5 strh r0, [r4] ldrh r0, [r4] @@ -730545,7 +706196,7 @@ _08164660: ldr r1, [sp, 0x24] adds r1, 0xC0 strb r0, [r1, 0x1] - ldr r0, _081646B8 + ldr r0, =0x00000361 bl flag_clear ldr r0, [r6] adds r0, r5 @@ -730561,9 +706212,7 @@ _081646A0: pop {r0} bx r0 .align 2, 0 -_081646B0: .4byte 0x03005d90 -_081646B4: .4byte 0x00000cc2 -_081646B8: .4byte 0x00000361 + .pool thumb_func_end sub_81642A0 thumb_func_start sub_81646BC @@ -730588,7 +706237,7 @@ sub_81646BC: @ 81646BC subs r0, 0xC9 cmp r5, r0 bhi _081646FC - ldr r0, _081646F8 + ldr r0, =0x0203bc8c ldr r1, [r0] lsls r0, r4, 4 adds r0, r1 @@ -730598,15 +706247,15 @@ sub_81646BC: @ 81646BC mov r10, r0 b _081647CE .align 2, 0 -_081646F8: .4byte 0x0203bc8c + .pool _081646FC: - ldr r0, _08164738 + ldr r0, =0x0000018f cmp r5, r0 bhi _08164750 - ldr r0, _0816473C + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r1, _08164740 - ldr r0, _08164744 + ldr r1, =0x03006298 + ldr r0, =0x020375e2 ldrh r0, [r0] adds r0, 0x1 lsls r0, 1 @@ -730614,7 +706263,7 @@ _081646FC: ldrh r1, [r0] movs r0, 0x2C muls r1, r0 - ldr r0, _08164748 + ldr r0, =0xfffffed4 adds r2, r5, r0 movs r0, 0xEC muls r0, r2 @@ -730625,23 +706274,18 @@ _081646FC: adds r0, r3, r1 ldrh r0, [r0] mov r9, r0 - ldr r2, _0816474C + ldr r2, =0x0000076c adds r3, r2 ldrh r3, [r3] mov r10, r3 b _081647CE .align 2, 0 -_08164738: .4byte 0x0000018f -_0816473C: .4byte 0x03005d90 -_08164740: .4byte 0x03006298 -_08164744: .4byte 0x020375e2 -_08164748: .4byte 0xfffffed4 -_0816474C: .4byte 0x0000076c + .pool _08164750: - ldr r4, _08164800 + ldr r4, =0x03005d90 ldr r3, [r4] - ldr r1, _08164804 - ldr r0, _08164808 + ldr r1, =0x03006298 + ldr r0, =0x020375e2 ldrh r0, [r0] subs r0, 0x1 lsls r0, 1 @@ -730650,7 +706294,7 @@ _08164750: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r2, _0816480C + ldr r2, =0xfffffe70 adds r1, r5, r2 lsls r2, r1, 4 adds r2, r1 @@ -730665,7 +706309,7 @@ _08164750: ldrh r3, [r3] mov r10, r3 movs r3, 0 - ldr r7, _08164810 + ldr r7, =0x02021ec4 mov r8, r7 adds r0, r4, 0 mov r12, r0 @@ -730688,34 +706332,34 @@ _08164794: adds r1, r3, r7 movs r0, 0xFF strb r0, [r1] - ldr r0, _08164800 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _0816480C + ldr r0, =0xfffffe70 adds r1, r5, r0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r2, r0 - ldr r1, _08164814 + ldr r1, =0x0000011b adds r0, r2, r1 ldrb r1, [r0] adds r0, r7, 0 bl sub_8009308 _081647CE: - ldr r0, _08164818 + ldr r0, =0x02021cc4 movs r1, 0xD mov r2, r9 muls r2, r1 adds r1, r2, 0 - ldr r2, _0816481C + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r0, _08164820 + ldr r0, =0x02021dc4 movs r1, 0xB mov r2, r10 muls r2, r1 adds r1, r2, 0 - ldr r2, _08164824 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy pop {r3-r5} @@ -730726,16 +706370,7 @@ _081647CE: pop {r0} bx r0 .align 2, 0 -_08164800: .4byte 0x03005d90 -_08164804: .4byte 0x03006298 -_08164808: .4byte 0x020375e2 -_0816480C: .4byte 0xfffffe70 -_08164810: .4byte 0x02021ec4 -_08164814: .4byte 0x0000011b -_08164818: .4byte 0x02021cc4 -_0816481C: .4byte 0x0831977c -_08164820: .4byte 0x02021dc4 -_08164824: .4byte 0x083185c8 + .pool thumb_func_end sub_81646BC thumb_func_start sub_8164828 @@ -730755,26 +706390,23 @@ sub_8164828: @ 8164828 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _0816486C + ldr r0, =0x020375f2 ldrh r0, [r0] subs r5, r0, 0x2 - ldr r0, _08164870 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r5, 1 - ldr r2, _08164874 + ldr r2, =0x00000cb4 adds r0, r2 adds r0, r1 ldrh r7, [r0] movs r3, 0 str r3, [sp] - ldr r4, _08164878 + ldr r4, =0x085dd500 lsls r6, r7, 16 b _08164884 .align 2, 0 -_0816486C: .4byte 0x020375f2 -_08164870: .4byte 0x03005d90 -_08164874: .4byte 0x00000cb4 -_08164878: .4byte 0x085dd500 + .pool _0816487C: adds r4, 0x8 ldr r0, [sp] @@ -730792,20 +706424,19 @@ _08164884: cmp r1, r0 bne _0816487C _0816489A: - ldr r0, _081648B0 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x4 bls _081648A4 b _08164AC2 _081648A4: lsls r0, 2 - ldr r1, _081648B4 + ldr r1, =_081648B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081648B0: .4byte 0x020375e2 -_081648B4: .4byte _081648B8 + .pool .align 2, 0 _081648B8: .4byte _081648CC @@ -730823,26 +706454,25 @@ _081648D6: subs r0, 0xC9 cmp r7, r0 ble _081648E2 - ldr r0, _081648EC + ldr r0, =0x0000018f cmp r7, r0 bgt _081648F4 _081648E2: - ldr r0, _081648F0 + ldr r0, =0x02021cc4 adds r1, r7, 0 bl sub_8162E20 b _08164AC2 .align 2, 0 -_081648EC: .4byte 0x0000018f -_081648F0: .4byte 0x02021cc4 + .pool _081648F4: movs r3, 0 lsls r2, r7, 16 mov r10, r2 - ldr r6, _0816496C + ldr r6, =0x02021cc4 mov r9, r6 - ldr r4, _08164970 + ldr r4, =0x03005d90 mov r8, r4 - ldr r5, _08164974 + ldr r5, =0xfffffe70 adds r1, r7, r5 lsls r0, r1, 4 adds r0, r1 @@ -730865,21 +706495,21 @@ _08164910: adds r1, r3, r6 movs r0, 0xFF strb r0, [r1] - ldr r2, _08164970 + ldr r2, =0x03005d90 ldr r1, [r2] - ldr r3, _08164974 + ldr r3, =0xfffffe70 adds r0, r7, r3 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 adds r1, r4 - ldr r5, _08164978 + ldr r5, =0x0000011b adds r0, r1, r5 ldrb r1, [r0] adds r0, r6, 0 bl sub_8009308 - ldr r0, _0816497C - ldr r2, _08164970 + ldr r0, =0x02021dc4 + ldr r2, =0x03005d90 ldr r1, [r2] adds r1, r4 adds r1, 0xDE @@ -730887,35 +706517,29 @@ _08164910: movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r0, _08164980 + ldr r0, =0x02021ec4 mov r3, r10 lsrs r1, r3, 16 bl sub_8162E20 b _08164AC2 .align 2, 0 -_0816496C: .4byte 0x02021cc4 -_08164970: .4byte 0x03005d90 -_08164974: .4byte 0xfffffe70 -_08164978: .4byte 0x0000011b -_0816497C: .4byte 0x02021dc4 -_08164980: .4byte 0x02021ec4 + .pool _08164984: - ldr r0, _08164994 + ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r5, 2 adds r1, r0 - ldr r4, _08164998 + ldr r4, =0x00000cc4 adds r1, r4 b _081649A8 .align 2, 0 -_08164994: .4byte 0x03005d90 -_08164998: .4byte 0x00000cc4 + .pool _0816499C: - ldr r0, _081649B4 + ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r5, 2 adds r1, r0 - ldr r5, _081649B8 + ldr r5, =0x00000cc6 adds r1, r5 _081649A8: adds r0, r7, 0 @@ -730923,71 +706547,62 @@ _081649A8: bl sub_81646BC b _08164AC2 .align 2, 0 -_081649B4: .4byte 0x03005d90 -_081649B8: .4byte 0x00000cc6 + .pool _081649BC: - ldr r0, _081649F0 + ldr r0, =0x02038bce strh r7, [r0] - ldr r0, _081649F4 + ldr r0, =0x0000012b cmp r7, r0 bgt _08164A08 - ldr r0, _081649F8 + ldr r0, =0x03005d90 ldr r4, [r0] lsls r1, r5, 1 adds r0, r1, 0 adds r0, 0x8 lsls r0, 1 - ldr r3, _081649FC + ldr r3, =0x00000cb4 adds r2, r4, r3 adds r0, r2, r0 ldrh r3, [r0] - ldr r5, _08164A00 + ldr r5, =0x00000cd8 adds r0, r4, r5 strh r3, [r0] adds r1, 0x9 lsls r1, 1 adds r2, r1 ldrh r0, [r2] - ldr r1, _08164A04 + ldr r1, =0x00000cda adds r4, r1 strh r0, [r4] b _08164A46 .align 2, 0 -_081649F0: .4byte 0x02038bce -_081649F4: .4byte 0x0000012b -_081649F8: .4byte 0x03005d90 -_081649FC: .4byte 0x00000cb4 -_08164A00: .4byte 0x00000cd8 -_08164A04: .4byte 0x00000cda + .pool _08164A08: - ldr r0, _08164A20 + ldr r0, =0x0000018f cmp r7, r0 bgt _08164A30 - ldr r0, _08164A24 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r3, _08164A28 + ldr r3, =0x03006298 ldrh r2, [r3, 0x4] - ldr r4, _08164A2C + ldr r4, =0x00000cd8 adds r0, r1, r4 strh r2, [r0] ldrh r0, [r3, 0x6] b _08164A40 .align 2, 0 -_08164A20: .4byte 0x0000018f -_08164A24: .4byte 0x03005d90 -_08164A28: .4byte 0x03006298 -_08164A2C: .4byte 0x00000cd8 + .pool _08164A30: - ldr r0, _08164AD8 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r3, _08164ADC + ldr r3, =0x03006298 ldrh r2, [r3] - ldr r4, _08164AE0 + ldr r4, =0x00000cd8 adds r0, r1, r4 strh r2, [r0] ldrh r0, [r3, 0x2] _08164A40: - ldr r5, _08164AE4 + ldr r5, =0x00000cda adds r1, r5 strh r0, [r1] _08164A46: @@ -731013,16 +706628,16 @@ _08164A60: bl sub_8162548 lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _08164AE8 + ldr r0, =0x02038bce ldrh r0, [r0] cmp r0, r3 beq _08164A60 movs r2, 0 cmp r2, r5 bge _08164AA2 - ldr r1, _08164AD8 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r4, _08164AEC + ldr r4, =0x00000cb4 adds r0, r4 ldrh r0, [r0] cmp r0, r3 @@ -731042,18 +706657,18 @@ _08164A8E: _08164AA2: cmp r2, r5 bne _08164A60 - ldr r5, _08164AD8 + ldr r5, =0x03005d90 ldr r0, [r5] - ldr r1, _08164AEC + ldr r1, =0x00000cb4 adds r0, r1 add r0, r10 strh r3, [r0] mov r5, r9 cmp r5, 0xD ble _08164A4E - ldr r2, _08164AD8 + ldr r2, =0x03005d90 ldr r0, [r2] - ldr r3, _08164AF0 + ldr r3, =0x00000cd6 adds r0, r3 strh r7, [r0] _08164AC2: @@ -731064,30 +706679,23 @@ _08164AC2: subs r0, 0xC9 cmp r7, r0 bgt _08164AF8 - ldr r0, _08164AF4 + ldr r0, =0x085dd500 ldr r4, [sp] lsls r1, r4, 3 b _08164B04 .align 2, 0 -_08164AD8: .4byte 0x03005d90 -_08164ADC: .4byte 0x03006298 -_08164AE0: .4byte 0x00000cd8 -_08164AE4: .4byte 0x00000cda -_08164AE8: .4byte 0x02038bce -_08164AEC: .4byte 0x00000cb4 -_08164AF0: .4byte 0x00000cd6 -_08164AF4: .4byte 0x085dd500 + .pool _08164AF8: - ldr r0, _08164B1C + ldr r0, =0x0000018f cmp r7, r0 bgt _08164B28 - ldr r0, _08164B20 + ldr r0, =0x085dd500 ldr r5, [sp] lsls r1, r5, 3 _08164B04: adds r0, 0x4 adds r1, r0 - ldr r0, _08164B24 + ldr r0, =0x020375e2 ldrh r0, [r0] ldr r1, [r1] lsls r0, 2 @@ -731096,13 +706704,11 @@ _08164B04: bl box_related_two__2 b _08164B54 .align 2, 0 -_08164B1C: .4byte 0x0000018f -_08164B20: .4byte 0x085dd500 -_08164B24: .4byte 0x020375e2 + .pool _08164B28: - ldr r0, _08164B64 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _08164B68 + ldr r0, =0xfffffe70 adds r2, r7, r0 lsls r0, r2, 4 adds r0, r2 @@ -731111,10 +706717,10 @@ _08164B28: adds r1, 0xDC ldrb r0, [r1] lsls r0, 27 - ldr r1, _08164B6C + ldr r1, =0x085dd690 lsrs r0, 25 adds r0, r1 - ldr r1, _08164B70 + ldr r1, =0x020375e2 ldrh r1, [r1] ldr r0, [r0] lsls r1, 2 @@ -731131,10 +706737,7 @@ _08164B54: pop {r0} bx r0 .align 2, 0 -_08164B64: .4byte 0x03005d90 -_08164B68: .4byte 0xfffffe70 -_08164B6C: .4byte 0x085dd690 -_08164B70: .4byte 0x020375e2 + .pool thumb_func_end sub_8164828 thumb_func_start sub_8164B74 @@ -731144,40 +706747,35 @@ sub_8164B74: @ 8164B74 mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r4, _08164BB8 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _08164BBC + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r7, r0, 30 - ldr r0, _08164BC0 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r5, r0, 16 ldr r0, [r4] - ldr r2, _08164BC4 + ldr r2, =0x00000cb2 adds r0, r2 ldrh r6, [r0] bl link_get_multiplayer_id - ldr r0, _08164BC8 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x6 bls _08164BAC b _08164DB6 _08164BAC: lsls r0, 2 - ldr r1, _08164BCC + ldr r1, =_08164BD0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08164BB8: .4byte 0x03005d90 -_08164BBC: .4byte 0x00000ca9 -_08164BC0: .4byte 0x000040ce -_08164BC4: .4byte 0x00000cb2 -_08164BC8: .4byte 0x020375f0 -_08164BCC: .4byte _08164BD0 + .pool .align 2, 0 _08164BD0: .4byte _08164BEC @@ -731192,11 +706790,11 @@ _08164BEC: beq _08164BF2 b _08164DB0 _08164BF2: - ldr r0, _08164C30 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r7, 1 adds r0, r1 - ldr r3, _08164C34 + ldr r3, =0x00000cec adds r0, r3 ldrh r0, [r0] movs r1, 0x7 @@ -731216,13 +706814,11 @@ _08164C18: mov r1, sp movs r2, 0x4 bl link_0800A448 - ldr r1, _08164C38 + ldr r1, =0x020375f0 movs r0, 0x1 b _08164DB4 .align 2, 0 -_08164C30: .4byte 0x03005d90 -_08164C34: .4byte 0x00000cec -_08164C38: .4byte 0x020375f0 + .pool _08164C3C: bl sub_800A550 movs r1, 0x3 @@ -731232,7 +706828,7 @@ _08164C3C: b _08164DB6 _08164C4A: bl sub_800A5B4 - ldr r1, _08164CD0 + ldr r1, =0x020223c4 movs r0, 0x80 lsls r0, 1 adds r2, r1, r0 @@ -731244,7 +706840,7 @@ _08164C4A: _08164C60: str r0, [sp] movs r4, 0 - ldr r0, _08164CD4 + ldr r0, =0x03005d90 mov r9, r0 _08164C68: adds r1, r4, 0x1 @@ -731266,12 +706862,12 @@ _08164C74: bge _08164CB0 mov r1, r9 ldr r0, [r1] - ldr r1, _08164CD8 + ldr r1, =0x00000cb4 adds r0, r1 ldrh r0, [r0] cmp r0, r3 beq _08164CB0 - ldr r6, _08164CD4 + ldr r6, =0x03005d90 adds r5, r1, 0 _08164C9C: adds r2, 0x1 @@ -731290,21 +706886,18 @@ _08164CB0: mov r2, r9 ldr r0, [r2] lsls r1, r4, 1 - ldr r2, _08164CD8 + ldr r2, =0x00000cb4 adds r0, r2 adds r0, r1 strh r3, [r0] mov r4, r8 cmp r4, 0xD ble _08164C68 - ldr r1, _08164CDC + ldr r1, =0x020375f0 movs r0, 0x2 b _08164DB4 .align 2, 0 -_08164CD0: .4byte 0x020223c4 -_08164CD4: .4byte 0x03005d90 -_08164CD8: .4byte 0x00000cb4 -_08164CDC: .4byte 0x020375f0 + .pool _08164CE0: bl sub_800A520 lsls r0, 24 @@ -731313,19 +706906,17 @@ _08164CE0: bl bitmask_all_link_players_but_self lsls r0, 24 lsrs r0, 24 - ldr r1, _08164D08 + ldr r1, =0x03005d90 ldr r1, [r1] - ldr r3, _08164D0C + ldr r3, =0x00000cb4 adds r1, r3 movs r2, 0x28 bl link_0800A448 - ldr r1, _08164D10 + ldr r1, =0x020375f0 movs r0, 0x3 b _08164DB4 .align 2, 0 -_08164D08: .4byte 0x03005d90 -_08164D0C: .4byte 0x00000cb4 -_08164D10: .4byte 0x020375f0 + .pool _08164D14: bl sub_800A550 movs r1, 0x3 @@ -731333,21 +706924,21 @@ _08164D14: cmp r1, 0x3 bne _08164DB6 bl sub_800A5B4 - ldr r4, _08164D78 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r5, _08164D7C + ldr r5, =0x00000cb4 adds r0, r5 - ldr r1, _08164D80 + ldr r1, =0x020223c4 movs r2, 0x28 bl memcpy - ldr r2, _08164D84 + ldr r2, =0x02038bca ldr r1, [r4] lsls r0, r6, 2 adds r1, r5 adds r0, r1, r0 ldrh r0, [r0] strh r0, [r2] - ldr r4, _08164D88 + ldr r4, =0x02038bcc lsls r0, r6, 1 adds r0, 0x1 lsls r0, 1 @@ -731360,40 +706951,33 @@ _08164D14: ldrh r0, [r4] movs r1, 0x1 bl sub_8162614 - ldr r0, _08164D8C + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _08164DB0 - ldr r0, _08164D90 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 bne _08164DB0 - ldr r1, _08164D94 + ldr r1, =0x020375f0 movs r0, 0x4 b _08164DB4 .align 2, 0 -_08164D78: .4byte 0x03005d90 -_08164D7C: .4byte 0x00000cb4 -_08164D80: .4byte 0x020223c4 -_08164D84: .4byte 0x02038bca -_08164D88: .4byte 0x02038bcc -_08164D8C: .4byte 0x03003124 -_08164D90: .4byte 0x030030fc -_08164D94: .4byte 0x020375f0 + .pool _08164D98: bl sub_800AC34 - ldr r1, _08164DA4 + ldr r1, =0x020375f0 movs r0, 0x5 b _08164DB4 .align 2, 0 -_08164DA4: .4byte 0x020375f0 + .pool _08164DA8: - ldr r0, _08164DC4 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08164DB6 _08164DB0: - ldr r1, _08164DC8 + ldr r1, =0x020375f0 movs r0, 0x6 _08164DB4: strh r0, [r1] @@ -731406,14 +706990,13 @@ _08164DB6: pop {r0} bx r0 .align 2, 0 -_08164DC4: .4byte 0x03003124 -_08164DC8: .4byte 0x020375f0 + .pool thumb_func_end sub_8164B74 thumb_func_start sub_8164DCC sub_8164DCC: @ 8164DCC push {lr} - ldr r0, _08164DE0 + ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 beq _08164DDA @@ -731422,15 +707005,15 @@ _08164DDA: pop {r0} bx r0 .align 2, 0 -_08164DE0: .4byte 0x030030fc + .pool thumb_func_end sub_8164DCC thumb_func_start sub_8164DE4 sub_8164DE4: @ 8164DE4 push {lr} - ldr r0, _08164DFC + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08164E00 + ldr r1, =0x00000cd6 adds r0, r1 ldrh r0, [r0] movs r1, 0xF @@ -731438,64 +707021,63 @@ sub_8164DE4: @ 8164DE4 pop {r0} bx r0 .align 2, 0 -_08164DFC: .4byte 0x03005d90 -_08164E00: .4byte 0x00000cd6 + .pool thumb_func_end sub_8164DE4 thumb_func_start sub_8164E04 sub_8164E04: @ 8164E04 push {r4-r6,lr} sub sp, 0x20 - ldr r0, _08164EA4 + ldr r0, =0x000040ce bl var_get lsls r0, 16 cmp r0, 0 bne _08164E9A - ldr r5, _08164EA8 + ldr r5, =0x02038bca ldrh r1, [r5] mov r0, sp bl sub_8162E20 mov r0, sp bl sub_8009370 - ldr r4, _08164EAC + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _08164EB0 + ldr r1, =0x00000bd8 adds r0, r1 mov r1, sp bl gf_strcpy ldr r0, [r4] - ldr r2, _08164EB4 + ldr r2, =0x00000beb adds r0, r2 ldrh r1, [r5] bl sub_8165B88 - ldr r6, _08164EB8 + ldr r6, =0x0202406e ldrh r0, [r6, 0x2] movs r5, 0x64 muls r0, r5 - ldr r1, _08164EBC + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB movs r2, 0 bl pokemon_getattr ldr r1, [r4] - ldr r2, _08164EC0 + ldr r2, =0x00000bd6 adds r1, r2 strh r0, [r1] ldrh r0, [r6] muls r0, r5 - ldr r1, _08164EC4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB movs r2, 0 bl pokemon_getattr ldr r1, [r4] - ldr r2, _08164EC8 + ldr r2, =0x00000bd4 adds r1, r2 strh r0, [r1] movs r2, 0 movs r5, 0xBE lsls r5, 4 - ldr r3, _08164ECC + ldr r3, =0x020240b4 adds r6, r4, 0 _08164E7C: ldr r0, [r4] @@ -731508,9 +707090,9 @@ _08164E7C: cmp r2, 0xA ble _08164E7C ldr r0, [r6] - ldr r1, _08164ED0 + ldr r1, =0x0202433a ldrb r1, [r1] - ldr r2, _08164ED4 + ldr r2, =0x00000d06 adds r0, r2 strb r1, [r0] _08164E9A: @@ -731519,19 +707101,7 @@ _08164E9A: pop {r0} bx r0 .align 2, 0 -_08164EA4: .4byte 0x000040ce -_08164EA8: .4byte 0x02038bca -_08164EAC: .4byte 0x03005d90 -_08164EB0: .4byte 0x00000bd8 -_08164EB4: .4byte 0x00000beb -_08164EB8: .4byte 0x0202406e -_08164EBC: .4byte 0x02024744 -_08164EC0: .4byte 0x00000bd6 -_08164EC4: .4byte 0x020244ec -_08164EC8: .4byte 0x00000bd4 -_08164ECC: .4byte 0x020240b4 -_08164ED0: .4byte 0x0202433a -_08164ED4: .4byte 0x00000d06 + .pool thumb_func_end sub_8164E04 thumb_func_start sub_8164ED8 @@ -731539,11 +707109,11 @@ sub_8164ED8: @ 8164ED8 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _08164F64 + ldr r0, =0x03005d90 ldr r0, [r0] movs r3, 0 movs r2, 0 - ldr r4, _08164F68 + ldr r4, =0x0000064c adds r1, r0, r4 _08164EEA: ldm r1!, {r0} @@ -731551,14 +707121,14 @@ _08164EEA: adds r2, 0x1 cmp r2, 0x39 bls _08164EEA - ldr r5, _08164F64 + ldr r5, =0x03005d90 ldr r1, [r5] - ldr r2, _08164F6C + ldr r2, =0x00000734 adds r0, r1, r2 ldr r0, [r0] cmp r0, r3 beq _08164F0A - ldr r3, _08164F68 + ldr r3, =0x0000064c adds r0, r1, r3 bl sub_8164FB8 _08164F0A: @@ -731609,9 +707179,7 @@ _08164F52: pop {r0} bx r0 .align 2, 0 -_08164F64: .4byte 0x03005d90 -_08164F68: .4byte 0x0000064c -_08164F6C: .4byte 0x00000734 + .pool thumb_func_end sub_8164ED8 thumb_func_start sub_8164F70 @@ -731677,7 +707245,7 @@ sub_8164FCC: @ 8164FCC push {lr} lsls r0, 24 lsls r1, 24 - ldr r2, _08164FF4 + ldr r2, =0x03005d90 ldr r2, [r2] lsrs r0, 23 lsrs r1, 22 @@ -731687,7 +707255,7 @@ sub_8164FCC: @ 8164FCC adds r2, r1 adds r2, r0 ldrh r0, [r2] - ldr r1, _08164FF8 + ldr r1, =0x0000270f cmp r0, r1 bls _08164FEE adds r0, r1, 0 @@ -731695,8 +707263,7 @@ _08164FEE: pop {r1} bx r1 .align 2, 0 -_08164FF4: .4byte 0x03005d90 -_08164FF8: .4byte 0x0000270f + .pool thumb_func_end sub_8164FCC thumb_func_start sub_8164FFC @@ -731705,7 +707272,7 @@ sub_8164FFC: @ 8164FFC sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08165018 + ldr r1, =0x085dfa42 mov r0, sp movs r2, 0x4 bl memcpy @@ -731714,7 +707281,7 @@ sub_8164FFC: @ 8164FFC movs r0, 0x3 b _08165022 .align 2, 0 -_08165018: .4byte 0x085dfa42 + .pool _0816501C: mov r1, sp adds r0, r1, r4 @@ -731734,15 +707301,15 @@ sub_816502C: @ 816502C mov r5, r8 push {r5-r7} sub sp, 0xC - ldr r0, _08165144 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08165148 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r0, 30 adds r5, r0, 0 - ldr r0, _0816514C + ldr r0, =0x000040ce bl var_get lsls r0, 24 lsrs r0, 24 @@ -731758,7 +707325,7 @@ sub_816502C: @ 816502C movs r0, 0x45 mov r10, r0 _0816506A: - ldr r1, _08165150 + ldr r1, =0x020375f0 mov r9, r1 movs r0, 0 strh r0, [r1] @@ -731772,13 +707339,13 @@ _0816506A: movs r6, 0 cmp r6, r8 bge _081650DC - ldr r7, _08165154 + ldr r7, =0x03005d8c mov r5, sp _0816508C: - ldr r0, _08165144 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r6, 1 - ldr r2, _08165158 + ldr r2, =0x00000caa adds r0, r2 adds r0, r1 ldrh r1, [r0] @@ -731814,7 +707381,7 @@ _081650D4: cmp r6, r8 blt _0816508C _081650DC: - ldr r0, _08165150 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 beq _08165132 @@ -731846,7 +707413,7 @@ _08165110: ldrb r0, [r0, 0x1] cmp r0, 0x4 bls _08165132 - ldr r2, _08165154 + ldr r2, =0x03005d8c mov r0, sp ldrb r1, [r0] movs r0, 0x64 @@ -731868,12 +707435,7 @@ _08165132: pop {r0} bx r0 .align 2, 0 -_08165144: .4byte 0x03005d90 -_08165148: .4byte 0x00000ca9 -_0816514C: .4byte 0x000040ce -_08165150: .4byte 0x020375f0 -_08165154: .4byte 0x03005d8c -_08165158: .4byte 0x00000caa + .pool thumb_func_end sub_816502C thumb_func_start sub_816515C @@ -731882,15 +707444,15 @@ sub_816515C: @ 816515C mov r7, r9 mov r6, r8 push {r6,r7} - ldr r1, _08165188 + ldr r1, =0x03005d90 ldr r2, [r1] - ldr r0, _0816518C + ldr r0, =0x00000bec adds r7, r2, r0 ldrb r0, [r2, 0x8] adds r5, r1, 0 cmp r0, 0 beq _08165194 - ldr r4, _08165190 + ldr r4, =0x085dcefa ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] adds r0, r1 @@ -731901,11 +707463,9 @@ sub_816515C: @ 816515C movs r1, 0x14 b _081651A6 .align 2, 0 -_08165188: .4byte 0x03005d90 -_0816518C: .4byte 0x00000bec -_08165190: .4byte 0x085dcefa + .pool _08165194: - ldr r4, _08165234 + ldr r4, =0x085dcedc ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] adds r0, r1 @@ -731931,11 +707491,11 @@ _081651A6: strh r0, [r7, 0x2] movs r6, 0x7 movs r4, 0 - ldr r0, _08165238 + ldr r0, =0x03005d8c mov r8, r0 adds r5, r7, 0 adds r5, 0x10 - ldr r1, _0816523C + ldr r1, =0x00002bbc mov r12, r1 adds r3, r7, 0 adds r3, 0x28 @@ -731964,7 +707524,7 @@ _081651E0: _08165206: movs r0, 0x64 muls r0, r4 - ldr r1, _08165240 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C muls r1, r4 @@ -731983,44 +707543,37 @@ _08165206: pop {r0} bx r0 .align 2, 0 -_08165234: .4byte 0x085dcedc -_08165238: .4byte 0x03005d8c -_0816523C: .4byte 0x00002bbc -_08165240: .4byte 0x020244ec + .pool thumb_func_end sub_816515C thumb_func_start sub_8165244 sub_8165244: @ 8165244 - ldr r1, _08165258 - ldr r0, _0816525C + ldr r1, =0x0831f578 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _08165260 + ldr r2, =0x00000bed adds r0, r2 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08165258: .4byte 0x0831f578 -_0816525C: .4byte 0x03005d90 -_08165260: .4byte 0x00000bed + .pool thumb_func_end sub_8165244 thumb_func_start sub_8165264 sub_8165264: @ 8165264 - ldr r1, _08165278 - ldr r0, _0816527C + ldr r1, =0x0831f5ca + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _08165280 + ldr r2, =0x00000bed adds r0, r2 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08165278: .4byte 0x0831f5ca -_0816527C: .4byte 0x03005d90 -_08165280: .4byte 0x00000bed + .pool thumb_func_end sub_8165264 thumb_func_start sub_8165284 @@ -732028,7 +707581,7 @@ sub_8165284: @ 8165284 push {r4,lr} adds r3, r0, 0 movs r2, 0 - ldr r0, _081652B0 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xBF lsls r1, 4 @@ -732048,18 +707601,18 @@ _08165294: pop {r0} bx r0 .align 2, 0 -_081652B0: .4byte 0x03005d90 + .pool thumb_func_end sub_8165284 thumb_func_start sub_81652B4 sub_81652B4: @ 81652B4 push {r4-r6,lr} - ldr r2, _081652E0 + ldr r2, =0x020375f0 movs r0, 0 strh r0, [r2] - ldr r1, _081652E4 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r3, _081652E8 + ldr r3, =0x00000bec adds r5, r0, r3 movs r4, 0 movs r3, 0 @@ -732077,9 +707630,7 @@ _081652CC: strh r0, [r2] b _08165316 .align 2, 0 -_081652E0: .4byte 0x020375f0 -_081652E4: .4byte 0x03005d90 -_081652E8: .4byte 0x00000bec + .pool _081652EC: movs r4, 0 movs r3, 0 @@ -732091,15 +707642,15 @@ _081652F2: cmp r3, 0x2D bls _081652F2 ldr r1, [r6] - ldr r2, _0816531C + ldr r2, =0x00000ca4 adds r0, r1, r2 ldr r0, [r0] cmp r0, r4 beq _08165316 - ldr r3, _08165320 + ldr r3, =0x00000bec adds r0, r1, r3 bl sub_816534C - ldr r1, _08165324 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] _08165316: @@ -732107,9 +707658,7 @@ _08165316: pop {r0} bx r0 .align 2, 0 -_0816531C: .4byte 0x00000ca4 -_08165320: .4byte 0x00000bec -_08165324: .4byte 0x020375f0 + .pool thumb_func_end sub_81652B4 thumb_func_start sub_8165328 @@ -732151,64 +707700,60 @@ _08165352: thumb_func_start sub_8165360 sub_8165360: @ 8165360 push {lr} - ldr r0, _08165374 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08165378 + ldr r1, =0x00000bfc adds r0, r1 bl sub_81638AC pop {r0} bx r0 .align 2, 0 -_08165374: .4byte 0x03005d90 -_08165378: .4byte 0x00000bfc + .pool thumb_func_end sub_8165360 thumb_func_start sub_816537C sub_816537C: @ 816537C push {lr} - ldr r0, _08165390 + ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x3 bne _08165398 - ldr r1, _08165394 + ldr r1, =0x02021fc4 movs r0, 0xFF strb r0, [r1] b _081653C0 .align 2, 0 -_08165390: .4byte 0x0202433a -_08165394: .4byte 0x02021fc4 + .pool _08165398: cmp r0, 0x1 bne _081653B4 - ldr r0, _081653AC + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081653B0 + ldr r1, =0x00000c14 adds r0, r1 bl sub_81638AC b _081653C0 .align 2, 0 -_081653AC: .4byte 0x03005d90 -_081653B0: .4byte 0x00000c14 + .pool _081653B4: - ldr r0, _081653C4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081653C8 + ldr r1, =0x00000c08 adds r0, r1 bl sub_81638AC _081653C0: pop {r0} bx r0 .align 2, 0 -_081653C4: .4byte 0x03005d90 -_081653C8: .4byte 0x00000c08 + .pool thumb_func_end sub_816537C thumb_func_start start_menu_compose_normal start_menu_compose_normal: @ 81653CC push {lr} - ldr r0, _081653FC + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08165400 + ldr r1, =0x00000ca8 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -732228,8 +707773,7 @@ _081653F8: pop {r0} bx r0 .align 2, 0 -_081653FC: .4byte 0x03005d90 -_08165400: .4byte 0x00000ca8 + .pool thumb_func_end start_menu_compose_normal thumb_func_start sub_8165404 @@ -732243,7 +707787,7 @@ sub_8165404: @ 8165404 lsls r0, 16 lsrs r7, r0, 16 bl sub_8165C40 - ldr r0, _08165530 + ldr r0, =0x00000c03 cmp r7, r0 beq _08165420 b _0816554C @@ -732263,7 +707807,7 @@ _0816542A: mov r0, r9 add r0, r10 lsls r0, 2 - ldr r6, _08165534 + ldr r6, =0x085dd6d0 adds r5, r0, r6 _08165440: bl GenerateRandomNumber @@ -732274,7 +707818,7 @@ _08165440: lsls r0, 16 orrs r4, r0 str r4, [sp, 0x44] - ldr r0, _08165538 + ldr r0, =0x0000ef2a adds r1, r4, 0 bl sub_806EBD0 lsls r0, 24 @@ -732291,13 +707835,13 @@ _08165440: movs r0, 0x64 mov r6, r10 muls r6, r0 - ldr r1, _0816553C + ldr r1, =0x02024618 mov r8, r1 adds r0, r6, r1 mov r5, r9 add r5, r10 lsls r5, 2 - ldr r2, _08165534 + ldr r2, =0x085dd6d0 adds r3, r5, r2 ldrh r1, [r3] ldrb r2, [r3, 0x3] @@ -732308,14 +707852,14 @@ _08165440: mov r3, r10 str r3, [sp, 0x4] str r4, [sp, 0x8] - ldr r4, _08165538 + ldr r4, =0x0000ef2a str r4, [sp, 0xC] mov r3, r12 bl create_pokemon_set_level str r7, [sp, 0x44] movs r3, 0 mov r4, r8 - ldr r0, _08165540 + ldr r0, =0x085dd6d5 adds r5, r0 _081654B0: adds r1, r3, 0 @@ -732335,8 +707879,8 @@ _081654B0: movs r6, 0x64 mov r4, r10 muls r4, r6 - ldr r7, _08165544 - ldr r6, _0816553C + ldr r7, =0x085dd6dc + ldr r6, =0x02024618 mov r0, r9 add r0, r10 lsls r5, r0, 2 @@ -732358,11 +707902,11 @@ _081654DE: movs r1, 0x64 mov r4, r10 muls r4, r1 - ldr r0, _0816553C + ldr r0, =0x02024618 adds r4, r0 adds r0, r4, 0 movs r1, 0x7 - ldr r2, _08165548 + ldr r2, =0x08317dd4 bl pokemon_setattr movs r0, 0 str r0, [sp, 0x44] @@ -732380,27 +707924,21 @@ _081654DE: _0816552E: b _0816585A .align 2, 0 -_08165530: .4byte 0x00000c03 -_08165534: .4byte 0x085dd6d0 -_08165538: .4byte 0x0000ef2a -_0816553C: .4byte 0x02024618 -_08165540: .4byte 0x085dd6d5 -_08165544: .4byte 0x085dd6dc -_08165548: .4byte 0x08317dd4 + .pool _0816554C: movs r0, 0xFA lsls r0, 1 cmp r7, r0 bne _08165564 add r0, sp, 0x10 - ldr r1, _08165560 + ldr r1, =0x082e9531 ldrb r1, [r1] strb r1, [r0] b _0816585A .align 2, 0 -_08165560: .4byte 0x082e9531 + .pool _08165564: - ldr r0, _081656CC + ldr r0, =0x0000012b cmp r7, r0 bls _0816556C b _081656E8 @@ -732431,12 +707969,12 @@ _0816556C: adds r0, 0x48 str r0, [sp, 0x5C] _081655A6: - ldr r0, _081656D0 + ldr r0, =0x03005d90 ldr r1, [r0] mov r0, r10 adds r0, 0x12 lsls r0, 1 - ldr r2, _081656D4 + ldr r2, =0x00000cb4 adds r1, r2 adds r1, r0 ldrh r1, [r1] @@ -732445,11 +707983,11 @@ _081655A6: mov r3, r10 muls r3, r6 mov r8, r3 - ldr r0, _081656D8 + ldr r0, =0x02024618 mov r9, r0 mov r0, r8 add r0, r9 - ldr r6, _081656DC + ldr r6, =0x0203bc8c ldr r4, [r6] lsls r5, r1, 4 adds r4, r5, r4 @@ -732510,20 +708048,20 @@ _08165634: movs r1, 0x64 mov r4, r10 muls r4, r1 - ldr r0, _081656D8 + ldr r0, =0x02024618 adds r4, r0 adds r0, r4, 0 movs r1, 0x20 ldr r2, [sp, 0x5C] bl pokemon_setattr - ldr r0, _081656DC + ldr r0, =0x0203bc8c ldr r1, [r0] ldr r2, [sp, 0x54] lsls r0, r2, 4 adds r0, r1 ldrb r2, [r0, 0xA] lsls r2, 1 - ldr r0, _081656E0 + ldr r0, =0x085cecb0 adds r2, r0 adds r0, r4, 0 movs r1, 0xC @@ -732531,7 +708069,7 @@ _08165634: movs r0, 0 str r0, [sp, 0x44] movs r2, 0 - ldr r0, _081656E4 + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r7 @@ -732553,7 +708091,7 @@ _0816567E: movs r3, 0x64 mov r4, r10 muls r4, r3 - ldr r0, _081656D8 + ldr r0, =0x02024618 adds r4, r0 adds r0, r4, 0 movs r1, 0x7 @@ -732576,20 +708114,14 @@ _0816567E: _081656CA: b _0816585A .align 2, 0 -_081656CC: .4byte 0x0000012b -_081656D0: .4byte 0x03005d90 -_081656D4: .4byte 0x00000cb4 -_081656D8: .4byte 0x02024618 -_081656DC: .4byte 0x0203bc8c -_081656E0: .4byte 0x085cecb0 -_081656E4: .4byte 0x0203bc88 + .pool _081656E8: - ldr r0, _08165774 + ldr r0, =0x0000018f cmp r7, r0 bls _081656F0 b _081657F0 _081656F0: - ldr r1, _08165778 + ldr r1, =0xfffffed4 adds r0, r7, r1 lsls r0, 16 lsrs r7, r0, 16 @@ -732599,14 +708131,14 @@ _081656F0: adds r3, 0x44 str r3, [sp, 0x64] add r5, sp, 0x18 - ldr r6, _0816577C + ldr r6, =0x000015fc mov r9, r6 - ldr r0, _08165780 + ldr r0, =0x0000ffff mov r8, r0 movs r1, 0x24 str r1, [sp, 0x6C] _08165710: - ldr r1, _08165784 + ldr r1, =0x03005d90 movs r0, 0xEC adds r4, r7, 0 muls r4, r0 @@ -732615,7 +708147,7 @@ _08165710: adds r4, r2 ldr r0, [r1] adds r4, r0, r4 - ldr r3, _08165788 + ldr r3, =0x00000cb4 adds r0, r3 ldr r6, [sp, 0x6C] adds r0, r6 @@ -732654,12 +708186,7 @@ _08165710: bl sub_8009308 b _0816579C .align 2, 0 -_08165774: .4byte 0x0000018f -_08165778: .4byte 0xfffffed4 -_0816577C: .4byte 0x000015fc -_08165780: .4byte 0x0000ffff -_08165784: .4byte 0x03005d90 -_08165788: .4byte 0x00000cb4 + .pool _0816578C: ldrh r0, [r5, 0x20] mov r1, r8 @@ -732673,7 +708200,7 @@ _0816579C: movs r0, 0x64 mov r4, r10 muls r4, r0 - ldr r0, _081657EC + ldr r0, =0x02024618 adds r4, r0 adds r0, r4, 0 adds r1, r5, 0 @@ -732706,9 +708233,9 @@ _0816579C: ble _08165710 b _0816585A .align 2, 0 -_081657EC: .4byte 0x02024618 + .pool _081657F0: - ldr r1, _0816586C + ldr r1, =0xfffffe70 adds r0, r7, r1 lsls r0, 16 lsrs r7, r0, 16 @@ -732717,7 +708244,7 @@ _081657F0: mov r3, sp adds r3, 0x44 str r3, [sp, 0x64] - ldr r6, _08165870 + ldr r6, =0x03005d90 mov r8, r6 movs r5, 0x24 lsls r0, r7, 4 @@ -732729,12 +708256,12 @@ _08165812: movs r0, 0x64 mov r4, r10 muls r4, r0 - ldr r0, _08165874 + ldr r0, =0x02024618 adds r4, r0 mov r1, r8 ldr r0, [r1] adds r1, r0, r6 - ldr r2, _08165878 + ldr r2, =0x00000cb4 adds r0, r2 adds r0, r5 ldrb r2, [r0] @@ -732769,10 +708296,7 @@ _0816585A: pop {r0} bx r0 .align 2, 0 -_0816586C: .4byte 0xfffffe70 -_08165870: .4byte 0x03005d90 -_08165874: .4byte 0x02024618 -_08165878: .4byte 0x00000cb4 + .pool thumb_func_end sub_8165404 thumb_func_start sub_816587C @@ -732812,7 +708336,7 @@ _081658B4: ldrh r0, [r6, 0x2] strh r0, [r5, 0x2] movs r2, 0 - ldr r0, _08165914 + ldr r0, =0x085dcf40 ldrb r1, [r0] ldrb r3, [r6, 0x1] mov r12, r0 @@ -732858,7 +708382,7 @@ _08165904: ldrb r0, [r0] b _0816591A .align 2, 0 -_08165914: .4byte 0x085dcf40 + .pool _08165918: movs r0, 0x2B _0816591A: @@ -732895,7 +708419,7 @@ _08165948: subs r2, 0x1 cmp r2, 0 bge _08165948 - ldr r3, _081659D0 + ldr r3, =0x085dfa46 ldr r1, [sp, 0x8] movs r2, 0x5 _0816595C: @@ -732906,7 +708430,7 @@ _0816595C: subs r2, 0x1 cmp r2, 0 bge _0816595C - ldr r3, _081659D4 + ldr r3, =0x085dfa52 ldr r1, [sp, 0xC] movs r2, 0x5 _08165970: @@ -732941,7 +708465,7 @@ _08165988: ble _08165988 movs r0, 0 str r0, [sp] - ldr r2, _081659D8 + ldr r2, =0x0500000b mov r0, sp ldr r1, [sp, 0x10] bl CpuSet @@ -732958,9 +708482,7 @@ _081659BE: pop {r1} bx r1 .align 2, 0 -_081659D0: .4byte 0x085dfa46 -_081659D4: .4byte 0x085dfa52 -_081659D8: .4byte 0x0500000b + .pool thumb_func_end sub_816587C thumb_func_start sub_81659DC @@ -733000,7 +708522,7 @@ _08165A14: ldrh r0, [r4, 0x2] strh r0, [r6, 0x2] movs r2, 0 - ldr r0, _08165A64 + ldr r0, =0x085dcf40 ldrb r1, [r0, 0x1] ldrb r3, [r4, 0x1] mov r12, r0 @@ -733038,7 +708560,7 @@ _08165A58: ldrb r0, [r0] b _08165A6A .align 2, 0 -_08165A64: .4byte 0x085dcf40 + .pool _08165A68: movs r0, 0x24 _08165A6A: @@ -733155,7 +708677,7 @@ sub_8165B20: @ 8165B20 mov r6, r8 push {r6,r7} movs r5, 0 - ldr r0, _08165B84 + ldr r0, =0x03005d90 mov r8, r0 mov r9, r8 _08165B30: @@ -733202,7 +708724,7 @@ _08165B70: pop {r0} bx r0 .align 2, 0 -_08165B84: .4byte 0x03005d90 + .pool thumb_func_end sub_8165B20 thumb_func_start sub_8165B88 @@ -733216,24 +708738,23 @@ sub_8165B88: @ 8165B88 lsls r0, 1 cmp r2, r0 bne _08165BA4 - ldr r0, _08165BA0 + ldr r0, =0x082e9531 b _08165C28 .align 2, 0 -_08165BA0: .4byte 0x082e9531 + .pool _08165BA4: - ldr r0, _08165BB0 + ldr r0, =0x0000012b cmp r2, r0 bhi _08165BB8 - ldr r0, _08165BB4 + ldr r0, =0x082e9531 b _08165C28 .align 2, 0 -_08165BB0: .4byte 0x0000012b -_08165BB4: .4byte 0x082e9531 + .pool _08165BB8: - ldr r0, _08165BD4 + ldr r0, =0x0000018f cmp r2, r0 bhi _08165BFC - ldr r0, _08165BD8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -733243,25 +708764,22 @@ _08165BB8: bl sub_81864B4 b _08165C2A .align 2, 0 -_08165BD4: .4byte 0x0000018f -_08165BD8: .4byte 0x02022fec + .pool _08165BDC: - ldr r0, _08165BF0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08165BF4 + ldr r1, =0xfffffed4 adds r2, r1 movs r1, 0xEC muls r1, r2 adds r0, r1 - ldr r1, _08165BF8 + ldr r1, =0x0000081c adds r0, r1 b _08165C28 .align 2, 0 -_08165BF0: .4byte 0x03005d90 -_08165BF4: .4byte 0xfffffed4 -_08165BF8: .4byte 0x0000081c + .pool _08165BFC: - ldr r0, _08165C10 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -733271,17 +708789,17 @@ _08165BFC: bl sub_81864C0 b _08165C2A .align 2, 0 -_08165C10: .4byte 0x02022fec + .pool _08165C14: - ldr r0, _08165C34 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _08165C38 + ldr r0, =0xfffffe70 adds r1, r3, r0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r2, r0 - ldr r1, _08165C3C + ldr r1, =0x0000011b adds r0, r2, r1 _08165C28: ldrb r0, [r0] @@ -733291,28 +708809,26 @@ _08165C2A: pop {r0} bx r0 .align 2, 0 -_08165C34: .4byte 0x03005d90 -_08165C38: .4byte 0xfffffe70 -_08165C3C: .4byte 0x0000011b + .pool thumb_func_end sub_8165B88 thumb_func_start sub_8165C40 sub_8165C40: @ 8165C40 push {lr} - ldr r0, _08165C6C + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08165C70 + ldr r1, =0x00000ca9 adds r2, r0, r1 ldrb r1, [r2] movs r0, 0x3 ands r0, r1 cmp r0, 0x2 beq _08165C84 - ldr r1, _08165C74 - ldr r0, _08165C78 + ldr r1, =0x0203bc88 + ldr r0, =0x085d5acc str r0, [r1] - ldr r1, _08165C7C - ldr r0, _08165C80 + ldr r1, =0x0203bc8c + ldr r0, =0x085d97bc str r0, [r1] ldrb r0, [r2] lsls r0, 30 @@ -733320,12 +708836,7 @@ sub_8165C40: @ 8165C40 bl sub_8165C90 b _08165C88 .align 2, 0 -_08165C6C: .4byte 0x03005d90 -_08165C70: .4byte 0x00000ca9 -_08165C74: .4byte 0x0203bc88 -_08165C78: .4byte 0x085d5acc -_08165C7C: .4byte 0x0203bc8c -_08165C80: .4byte 0x085d97bc + .pool _08165C84: bl sub_8165D78 _08165C88: @@ -733368,7 +708879,7 @@ _08165CBA: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08165D04 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -733400,7 +708911,7 @@ _08165CF4: pop {r1} bx r1 .align 2, 0 -_08165D04: .4byte 0x020244ec + .pool thumb_func_end sub_8165CB4 thumb_func_start sub_8165D08 @@ -733439,7 +708950,7 @@ _08165D3A: thumb_func_start sub_8165D40 sub_8165D40: @ 8165D40 push {lr} - ldr r0, _08165D6C + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 @@ -733459,7 +708970,7 @@ _08165D58: lsrs r0, 16 b _08165D72 .align 2, 0 -_08165D6C: .4byte 0x000040cf + .pool _08165D70: movs r0, 0 _08165D72: @@ -733470,58 +708981,48 @@ _08165D72: thumb_func_start sub_8165D78 sub_8165D78: @ 8165D78 push {lr} - ldr r0, _08165D94 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x4 bne _08165DA8 - ldr r1, _08165D98 - ldr r0, _08165D9C + ldr r1, =0x0203bc88 + ldr r0, =0x085dda14 str r0, [r1] - ldr r1, _08165DA0 - ldr r0, _08165DA4 + ldr r1, =0x0203bc8c + ldr r0, =0x085de02c b _08165DF2 .align 2, 0 -_08165D94: .4byte 0x000040cf -_08165D98: .4byte 0x0203bc88 -_08165D9C: .4byte 0x085dda14 -_08165DA0: .4byte 0x0203bc8c -_08165DA4: .4byte 0x085de02c + .pool _08165DA8: cmp r0, 0x2 bne _08165DC8 - ldr r1, _08165DB8 - ldr r0, _08165DBC + ldr r1, =0x0203bc88 + ldr r0, =0x085de610 str r0, [r1] - ldr r1, _08165DC0 - ldr r0, _08165DC4 + ldr r1, =0x0203bc8c + ldr r0, =0x085dec28 b _08165DF2 .align 2, 0 -_08165DB8: .4byte 0x0203bc88 -_08165DBC: .4byte 0x085de610 -_08165DC0: .4byte 0x0203bc8c -_08165DC4: .4byte 0x085dec28 + .pool _08165DC8: cmp r0, 0x3 bne _08165DE8 - ldr r1, _08165DD8 - ldr r0, _08165DDC + ldr r1, =0x0203bc88 + ldr r0, =0x085df084 str r0, [r1] - ldr r1, _08165DE0 - ldr r0, _08165DE4 + ldr r1, =0x0203bc8c + ldr r0, =0x085df69c b _08165DF2 .align 2, 0 -_08165DD8: .4byte 0x0203bc88 -_08165DDC: .4byte 0x085df084 -_08165DE0: .4byte 0x0203bc8c -_08165DE4: .4byte 0x085df69c + .pool _08165DE8: - ldr r1, _08165E08 - ldr r0, _08165E0C + ldr r1, =0x0203bc88 + ldr r0, =0x085d5acc str r0, [r1] - ldr r1, _08165E10 - ldr r0, _08165E14 + ldr r1, =0x0203bc8c + ldr r0, =0x085d97bc _08165DF2: str r0, [r1] bl sub_8165CB4 @@ -733534,23 +709035,20 @@ _08165E02: pop {r1} bx r1 .align 2, 0 -_08165E08: .4byte 0x0203bc88 -_08165E0C: .4byte 0x085d5acc -_08165E10: .4byte 0x0203bc8c -_08165E14: .4byte 0x085d97bc + .pool thumb_func_end sub_8165D78 thumb_func_start sub_8165E18 sub_8165E18: @ 8165E18 push {r4,r5,lr} - ldr r5, _08165E94 + ldr r5, =0x03005d90 _08165E1C: bl sub_8165D40 lsls r0, 16 lsrs r4, r0, 16 movs r3, 0 ldr r1, [r5] - ldr r2, _08165E98 + ldr r2, =0x00000cb2 adds r0, r1, r2 ldrh r0, [r0] cmp r3, r0 @@ -733560,12 +709058,12 @@ _08165E1C: ldrh r0, [r0] cmp r0, r4 beq _08165E58 - ldr r0, _08165E94 + ldr r0, =0x03005d90 ldr r1, [r0] subs r2, 0x2 adds r0, r1, r2 ldrh r2, [r0] - ldr r0, _08165E9C + ldr r0, =0x00000cb4 adds r1, r0 _08165E4A: adds r1, 0x2 @@ -733577,26 +709075,26 @@ _08165E4A: bne _08165E4A _08165E58: ldr r0, [r5] - ldr r1, _08165E98 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] cmp r3, r0 bne _08165E1C - ldr r5, _08165EA0 + ldr r5, =0x02038bca strh r4, [r5] ldrh r0, [r5] movs r1, 0 bl sub_8162614 - ldr r0, _08165E94 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r2, _08165E98 + ldr r2, =0x00000cb2 adds r0, r1, r2 ldrh r2, [r0] adds r0, r2, 0x1 cmp r0, 0x2 bgt _08165E8C lsls r0, r2, 1 - ldr r2, _08165E9C + ldr r2, =0x00000cb4 adds r1, r2 adds r1, r0 ldrh r0, [r5] @@ -733606,10 +709104,7 @@ _08165E8C: pop {r0} bx r0 .align 2, 0 -_08165E94: .4byte 0x03005d90 -_08165E98: .4byte 0x00000cb2 -_08165E9C: .4byte 0x00000cb4 -_08165EA0: .4byte 0x02038bca + .pool thumb_func_end sub_8165E18 thumb_func_start sub_8165EA4 @@ -733630,9 +709125,9 @@ sub_8165EA4: @ 8165EA4 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x20] - ldr r0, _08165EE4 + ldr r0, =0x02038bca ldrh r2, [r0] - ldr r0, _08165EE8 + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r2 @@ -733645,8 +709140,7 @@ sub_8165EA4: @ 8165EA4 ldrh r1, [r2] b _08165EFE .align 2, 0 -_08165EE4: .4byte 0x02038bca -_08165EE8: .4byte 0x0203bc88 + .pool _08165EEC: ldr r0, [sp, 0x24] adds r0, 0x1 @@ -733658,7 +709152,7 @@ _08165EEC: adds r0, r6 ldrh r1, [r0] _08165EFE: - ldr r0, _08165F20 + ldr r0, =0x0000ffff cmp r1, r0 bne _08165EEC movs r0, 0 @@ -733673,7 +709167,7 @@ _08165EFE: str r4, [sp, 0x2C] b _08166092 .align 2, 0 -_08165F20: .4byte 0x0000ffff + .pool _08165F24: bl GenerateRandomNumber lsls r0, 16 @@ -733696,12 +709190,12 @@ _08165F44: movs r1, 0x64 adds r0, r6, 0 muls r0, r1 - ldr r2, _081660AC + ldr r2, =0x02024744 adds r0, r2 movs r1, 0xB movs r2, 0 bl pokemon_getattr - ldr r1, _081660B0 + ldr r1, =0x0203bc8c ldr r2, [r1] lsls r1, r4, 4 adds r1, r2 @@ -733716,11 +709210,11 @@ _08165F6E: movs r6, 0 cmp r6, r7 bge _08165FB8 - ldr r0, _081660B4 + ldr r0, =0x085cecb0 mov r9, r0 movs r3, 0 _08165F7A: - ldr r1, _081660AC + ldr r1, =0x02024744 adds r5, r3, r1 adds r0, r5, 0 movs r1, 0xC @@ -733734,7 +709228,7 @@ _08165F7A: movs r1, 0xC movs r2, 0 bl pokemon_getattr - ldr r1, _081660B0 + ldr r1, =0x0203bc8c ldr r2, [r1] lsls r1, r4, 4 adds r1, r2 @@ -733780,9 +709274,9 @@ _08165FDA: movs r6, 0x64 adds r0, r7, 0 muls r0, r6 - ldr r1, _081660AC + ldr r1, =0x02024744 adds r0, r1 - ldr r5, _081660B0 + ldr r5, =0x0203bc8c ldr r2, [r5] lsls r4, 4 adds r2, r4, r2 @@ -733809,7 +709303,7 @@ _08165FDA: mov r8, r1 adds r3, r5, 0 mov r5, r9 - ldr r2, _081660AC + ldr r2, =0x02024744 mov r10, r2 _0816602E: ldr r0, [r3] @@ -733842,18 +709336,18 @@ _0816605E: movs r2, 0x64 adds r4, r7, 0 muls r4, r2 - ldr r6, _081660AC + ldr r6, =0x02024744 adds r4, r6 adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0x14 bl pokemon_setattr - ldr r0, _081660B0 + ldr r0, =0x0203bc8c ldr r0, [r0] add r0, r9 ldrb r2, [r0, 0xA] lsls r2, 1 - ldr r0, _081660B4 + ldr r0, =0x085cecb0 adds r2, r0 adds r0, r4, 0 movs r1, 0xC @@ -733875,9 +709369,7 @@ _0816609A: pop {r0} bx r0 .align 2, 0 -_081660AC: .4byte 0x02024744 -_081660B0: .4byte 0x0203bc8c -_081660B4: .4byte 0x085cecb0 + .pool thumb_func_end sub_8165EA4 thumb_func_start sub_81660B8 @@ -733886,7 +709378,7 @@ sub_81660B8: @ 81660B8 lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _081660E4 + ldr r3, =0x085dcedc ldrb r0, [r3] cmp r0, r2 beq _081660DA @@ -733903,14 +709395,13 @@ _081660C8: _081660DA: cmp r1, 0x1E beq _081660EC - ldr r0, _081660E8 + ldr r0, =0x085dcf0e b _08166116 .align 2, 0 -_081660E4: .4byte 0x085dcedc -_081660E8: .4byte 0x085dcf0e + .pool _081660EC: movs r1, 0 - ldr r3, _08166110 + ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 beq _08166108 @@ -733930,9 +709421,9 @@ _08166108: movs r0, 0x7 b _0816611A .align 2, 0 -_08166110: .4byte 0x085dcefa + .pool _08166114: - ldr r0, _08166120 + ldr r0, =0x085dcf2c _08166116: adds r0, r1, r0 ldrb r0, [r0] @@ -733940,7 +709431,7 @@ _0816611A: pop {r1} bx r1 .align 2, 0 -_08166120: .4byte 0x085dcf2c + .pool thumb_func_end sub_81660B8 thumb_func_start sub_8166124 @@ -733948,7 +709439,7 @@ sub_8166124: @ 8166124 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _08166170 + ldr r2, =0x03005d90 movs r0, 0xEC muls r0, r6 movs r1, 0xE7 @@ -733985,7 +709476,7 @@ _08166154: movs r0, 0x1 b _08166182 .align 2, 0 -_08166170: .4byte 0x03005d90 + .pool _08166174: movs r3, 0xE7 lsls r3, 3 @@ -734003,24 +709494,24 @@ _08166182: thumb_func_start sub_8166188 sub_8166188: @ 8166188 push {r4-r7,lr} - ldr r0, _081661F0 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _081661F4 + ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 beq _081661E8 bl sub_8165C40 lsls r0, 24 movs r5, 0 - ldr r7, _081661F8 + ldr r7, =0x083203cc lsrs r0, 22 - ldr r1, _081661FC + ldr r1, =0x0831f72c adds r6, r0, r1 _081661A6: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08166200 + ldr r0, =0x02024744 adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -734053,11 +709544,7 @@ _081661E8: pop {r0} bx r0 .align 2, 0 -_081661F0: .4byte 0x02022fec -_081661F4: .4byte 0x02000002 -_081661F8: .4byte 0x083203cc -_081661FC: .4byte 0x0831f72c -_08166200: .4byte 0x02024744 + .pool thumb_func_end sub_8166188 thumb_func_start sub_8166204 @@ -734065,50 +709552,45 @@ sub_8166204: @ 8166204 push {r4-r6,lr} adds r5, r0, 0 adds r6, r1, 0 - ldr r4, _08166234 - ldr r0, _08166238 + ldr r4, =0x0203bcac + ldr r0, =0x0000806c bl malloc_and_clear str r0, [r4] - ldr r1, _0816623C - ldr r2, _08166240 + ldr r1, =0x0203bc90 + ldr r2, =0x00007fd0 adds r0, r2 str r0, [r1] str r5, [r0, 0x8] str r6, [r0, 0x4] - ldr r0, _08166244 + ldr r0, =sub_8166380 + 1 bl launch_c3_walk_stairs_and_run_once - ldr r0, _08166248 + ldr r0, =sub_816631C + 1 bl set_callback2 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08166234: .4byte 0x0203bcac -_08166238: .4byte 0x0000806c -_0816623C: .4byte 0x0203bc90 -_08166240: .4byte 0x00007fd0 -_08166244: .4byte sub_8166380 + 1 -_08166248: .4byte sub_816631C + 1 + .pool thumb_func_end sub_8166204 thumb_func_start sub_816624C sub_816624C: @ 816624C push {r4,r5,lr} - ldr r4, _0816629C - ldr r0, _081662A0 + ldr r4, =0x0203bcac + ldr r0, =0x0000806c bl malloc_and_clear str r0, [r4] - ldr r5, _081662A4 - ldr r1, _081662A8 + ldr r5, =0x0203bc90 + ldr r1, =0x00007fd0 adds r0, r1 str r0, [r5] - ldr r1, _081662AC + ldr r1, =0x0203bc98 ldr r1, [r1] str r1, [r0, 0x8] - ldr r1, _081662B0 + ldr r1, =0x0203bc94 ldr r1, [r1] str r1, [r0, 0x4] - ldr r4, _081662B4 + ldr r4, =0x0203bc9c ldrb r0, [r4] bl sub_81672E4 strb r0, [r4] @@ -734123,29 +709605,21 @@ _08166284: adds r0, r5, 0 adds r0, 0x56 strb r1, [r0] - ldr r0, _081662B8 + ldr r0, =sub_8166380 + 1 bl launch_c3_walk_stairs_and_run_once - ldr r0, _081662BC + ldr r0, =sub_81662C0 + 1 bl set_callback2 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0816629C: .4byte 0x0203bcac -_081662A0: .4byte 0x0000806c -_081662A4: .4byte 0x0203bc90 -_081662A8: .4byte 0x00007fd0 -_081662AC: .4byte 0x0203bc98 -_081662B0: .4byte 0x0203bc94 -_081662B4: .4byte 0x0203bc9c -_081662B8: .4byte sub_8166380 + 1 -_081662BC: .4byte sub_81662C0 + 1 + .pool thumb_func_end sub_816624C thumb_func_start sub_81662C0 sub_81662C0: @ 81662C0 push {r4,lr} - ldr r4, _081662F8 + ldr r4, =0x0203bc90 ldr r0, [r4] ldr r0, [r0] bl _call_via_r0 @@ -734154,23 +709628,21 @@ sub_81662C0: @ 81662C0 bl fade_and_return_progress_probably ldr r4, [r4] ldr r1, [r4] - ldr r0, _081662FC + ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive + 1 cmp r1, r0 bne _081662F0 adds r0, r4, 0 adds r0, 0x50 movs r1, 0 strb r1, [r0] - ldr r0, _08166300 + ldr r0, =sub_8166304 + 1 bl set_callback2 _081662F0: pop {r4} pop {r0} bx r0 .align 2, 0 -_081662F8: .4byte 0x0203bc90 -_081662FC: .4byte map_warp_consider_1_to_outside_or_stair_or_dive + 1 -_08166300: .4byte sub_8166304 + 1 + .pool thumb_func_end sub_81662C0 thumb_func_start sub_8166304 @@ -734187,7 +709659,7 @@ sub_8166304: @ 8166304 thumb_func_start sub_816631C sub_816631C: @ 816631C push {lr} - ldr r0, _0816633C + ldr r0, =0x0203bc90 ldr r0, [r0] ldr r0, [r0] bl _call_via_r0 @@ -734198,7 +709670,7 @@ sub_816631C: @ 816631C pop {r0} bx r0 .align 2, 0 -_0816633C: .4byte 0x0203bc90 + .pool thumb_func_end sub_816631C thumb_func_start sub_8166340 @@ -734207,22 +709679,21 @@ sub_8166340: @ 8166340 bl copy_super_sprites_to_oam bl copy_queue_process bl copy_pal_bg_faded_to_pal_ram - ldr r0, _08166364 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _08166368 + ldr r1, =0x00007c58 adds r0, r1 bl sub_81D2108 bl sub_80BA0A8 pop {r0} bx r0 .align 2, 0 -_08166364: .4byte 0x0203bcac -_08166368: .4byte 0x00007c58 + .pool thumb_func_end sub_8166340 thumb_func_start launch_c3_walk_stairs_and_run_once launch_c3_walk_stairs_and_run_once: @ 816636C - ldr r1, _0816637C + ldr r1, =0x0203bc90 ldr r1, [r1] str r0, [r1] adds r1, 0x50 @@ -734230,14 +709701,14 @@ launch_c3_walk_stairs_and_run_once: @ 816636C strb r0, [r1] bx lr .align 2, 0 -_0816637C: .4byte 0x0203bc90 + .pool thumb_func_end launch_c3_walk_stairs_and_run_once thumb_func_start sub_8166380 sub_8166380: @ 8166380 push {r4,r5,lr} sub sp, 0x4 - ldr r1, _081663A0 + ldr r1, =0x0203bc90 ldr r0, [r1] adds r0, 0x50 ldrb r0, [r0] @@ -734247,13 +709718,12 @@ sub_8166380: @ 8166380 b _08166556 _08166394: lsls r0, 2 - ldr r1, _081663A4 + ldr r1, =_081663A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081663A0: .4byte 0x0203bc90 -_081663A4: .4byte _081663A8 + .pool .align 2, 0 _081663A8: .4byte _081663E8 @@ -734273,21 +709743,19 @@ _081663A8: .4byte _08166528 .4byte _08166550 _081663E8: - ldr r2, _08166400 + ldr r2, =0x0203bcac ldr r0, [r2] - ldr r1, _08166404 + ldr r1, =0x00007b10 adds r0, r1 movs r1, 0xFF strb r1, [r0] ldr r0, [r2] - ldr r2, _08166408 + ldr r2, =0x00007c58 adds r0, r2 bl sub_81D1ED4 b _0816653C .align 2, 0 -_08166400: .4byte 0x0203bcac -_08166404: .4byte 0x00007b10 -_08166408: .4byte 0x00007c58 + .pool _0816640C: bl reset_all_obj_data bl gpu_pal_allocator_reset @@ -734299,20 +709767,20 @@ _08166416: str r0, [sp] movs r1, 0xC0 lsls r1, 19 - ldr r2, _08166430 + ldr r2, =0x05006000 mov r0, sp bl CpuSet b _0816653C .align 2, 0 -_08166430: .4byte 0x05006000 + .pool _08166434: movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0816645C + ldr r1, =0x085dfccc movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r0, _08166460 + ldr r0, =0x085dfcdc bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 @@ -734321,8 +709789,7 @@ _08166434: bl sub_809882C b _0816653C .align 2, 0 -_0816645C: .4byte 0x085dfccc -_08166460: .4byte 0x085dfcdc + .pool _08166464: ldr r1, [r2] b _08166540 @@ -734333,13 +709800,13 @@ _08166468: bne _08166556 b _0816653C _08166474: - ldr r1, _08166480 + ldr r1, =0x030022b0 movs r0, 0x14 strh r0, [r1] bl sub_8167420 b _0816653C .align 2, 0 -_08166480: .4byte 0x030022b0 + .pool _08166484: bl sub_8167930 lsls r0, 24 @@ -734352,9 +709819,9 @@ _08166490: bl sub_8167760 b _0816653C _0816649C: - ldr r0, _081664B0 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _081664B4 + ldr r1, =0x00007b0e adds r0, r1 bl sub_81D312C lsls r0, 24 @@ -734362,17 +709829,16 @@ _0816649C: bne _08166556 b _0816653C .align 2, 0 -_081664B0: .4byte 0x0203bcac -_081664B4: .4byte 0x00007b0e + .pool _081664B8: ldr r1, [r2] b _08166540 _081664BC: - ldr r5, _081664D8 + ldr r5, =0x0203bcac ldr r1, [r5] - ldr r4, _081664DC + ldr r4, =0x00007c58 adds r0, r1, r4 - ldr r2, _081664E0 + ldr r2, =0x00007c6c adds r1, r2 bl sub_81D2754 ldr r0, [r5] @@ -734380,20 +709846,18 @@ _081664BC: bl sub_81D20AC b _0816653C .align 2, 0 -_081664D8: .4byte 0x0203bcac -_081664DC: .4byte 0x00007c58 -_081664E0: .4byte 0x00007c6c + .pool _081664E4: - ldr r4, _08166508 + ldr r4, =0x0203bcac ldr r0, [r4] - ldr r1, _0816650C + ldr r1, =0x00007c58 adds r0, r1 bl sub_81D20BC lsls r0, 24 cmp r0, 0 bne _08166556 ldr r2, [r4] - ldr r1, _0816650C + ldr r1, =0x00007c58 adds r0, r2, r1 adds r1, 0x14 adds r2, r1 @@ -734401,18 +709865,16 @@ _081664E4: bl sub_81D1F84 b _0816653C .align 2, 0 -_08166508: .4byte 0x0203bcac -_0816650C: .4byte 0x00007c58 + .pool _08166510: - ldr r0, _08166520 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r2, _08166524 + ldr r2, =0x00007c58 adds r0, r2 bl sub_81D2230 b _0816653C .align 2, 0 -_08166520: .4byte 0x0203bcac -_08166524: .4byte 0x00007c58 + .pool _08166528: movs r0, 0 bl Window_WriteStandardTileMap @@ -734422,7 +709884,7 @@ _08166528: movs r1, 0x1 bl sub_8167BA0 _0816653C: - ldr r0, _0816654C + ldr r0, =0x0203bc90 ldr r1, [r0] _08166540: adds r1, 0x50 @@ -734431,9 +709893,9 @@ _08166540: strb r0, [r1] b _08166556 .align 2, 0 -_0816654C: .4byte 0x0203bc90 + .pool _08166550: - ldr r0, _08166560 + ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive + 1 bl launch_c3_walk_stairs_and_run_once _08166556: add sp, 0x4 @@ -734441,14 +709903,14 @@ _08166556: pop {r0} bx r0 .align 2, 0 -_08166560: .4byte map_warp_consider_1_to_outside_or_stair_or_dive + 1 + .pool thumb_func_end sub_8166380 thumb_func_start map_warp_consider_1_to_outside_or_stair_or_dive map_warp_consider_1_to_outside_or_stair_or_dive: @ 8166564 push {r4,lr} sub sp, 0x4 - ldr r4, _0816657C + ldr r4, =0x0203bc90 ldr r0, [r4] adds r0, 0x50 ldrb r1, [r0] @@ -734458,7 +709920,7 @@ map_warp_consider_1_to_outside_or_stair_or_dive: @ 8166564 beq _081665C0 b _08166610 .align 2, 0 -_0816657C: .4byte 0x0203bc90 + .pool _08166580: movs r0, 0x1 negs r0, r0 @@ -734467,7 +709929,7 @@ _08166580: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _081665BC + ldr r0, =sub_8166340 + 1 bl SetVBlankCallback movs r0, 0 bl gpu_sync_bg_show @@ -734484,30 +709946,30 @@ _08166580: strb r0, [r1] b _08166610 .align 2, 0 -_081665BC: .4byte sub_8166340 + 1 + .pool _081665C0: - ldr r0, _08166618 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08166610 - ldr r4, _0816661C + ldr r4, =0x0203bcac ldr r0, [r4] - ldr r1, _08166620 + ldr r1, =0x00007b1c adds r0, r1 bl sub_81D3464 ldr r4, [r4] - ldr r2, _08166624 + ldr r2, =0x00008041 adds r0, r4, r2 ldrb r1, [r0] - ldr r3, _08166628 + ldr r3, =0x00008040 adds r0, r4, r3 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 beq _0816660A - ldr r1, _0816662C + ldr r1, =0x00007fb3 adds r0, r4, r1 movs r1, 0 ldrsb r1, [r0, r1] @@ -734515,14 +709977,14 @@ _081665C0: adds r0, r4, r2 adds r0, r1 ldrb r2, [r0] - ldr r3, _08166620 + ldr r3, =0x00007b1c adds r0, r4, r3 subs r3, 0xC adds r1, r4, r3 ldrb r1, [r1] bl sub_81D3480 _0816660A: - ldr r0, _08166630 + ldr r0, =sub_8166634 + 1 bl launch_c3_walk_stairs_and_run_once _08166610: add sp, 0x4 @@ -734530,19 +709992,13 @@ _08166610: pop {r0} bx r0 .align 2, 0 -_08166618: .4byte 0x02037fd4 -_0816661C: .4byte 0x0203bcac -_08166620: .4byte 0x00007b1c -_08166624: .4byte 0x00008041 -_08166628: .4byte 0x00008040 -_0816662C: .4byte 0x00007fb3 -_08166630: .4byte sub_8166634 + 1 + .pool thumb_func_end map_warp_consider_1_to_outside_or_stair_or_dive thumb_func_start sub_8166634 sub_8166634: @ 8166634 push {lr} - ldr r0, _08166650 + ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 ldrb r0, [r0] @@ -734551,13 +710007,12 @@ sub_8166634: @ 8166634 b _0816680E _08166644: lsls r0, 2 - ldr r1, _08166654 + ldr r1, =_08166658 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08166650: .4byte 0x0203bc90 -_08166654: .4byte _08166658 + .pool .align 2, 0 _08166658: .4byte _08166678 @@ -734569,7 +710024,7 @@ _08166658: .4byte _081667AC .4byte _081667F4 _08166678: - ldr r2, _081666A8 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0x40 ands r0, r1 @@ -734579,21 +710034,18 @@ _08166678: bl audio_play movs r0, 0x1 bl sub_8167CA0 - ldr r0, _081666AC + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _081666B0 + ldr r1, =0x00007b1c adds r0, r1 bl sub_81D3520 - ldr r0, _081666B4 + ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0x1 b _0816680C .align 2, 0 -_081666A8: .4byte 0x030022c0 -_081666AC: .4byte 0x0203bcac -_081666B0: .4byte 0x00007b1c -_081666B4: .4byte 0x0203bc90 + .pool _081666B8: movs r0, 0x80 ands r0, r1 @@ -734603,20 +710055,18 @@ _081666B8: bl audio_play movs r0, 0 bl sub_8167CA0 - ldr r0, _081666E4 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r2, _081666E8 + ldr r2, =0x00007b1c adds r0, r2 bl sub_81D3520 - ldr r0, _081666EC + ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0x1 b _0816680C .align 2, 0 -_081666E4: .4byte 0x0203bcac -_081666E8: .4byte 0x00007b1c -_081666EC: .4byte 0x0203bc90 + .pool _081666F0: ldrh r1, [r2, 0x2E] movs r0, 0x2 @@ -734625,13 +710075,13 @@ _081666F0: beq _08166710 movs r0, 0x5 bl audio_play - ldr r0, _0816670C + ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0x3 b _0816680C .align 2, 0 -_0816670C: .4byte 0x0203bc90 + .pool _08166710: movs r0, 0x1 ands r0, r1 @@ -734641,9 +710091,9 @@ _08166710: _0816671A: movs r0, 0x5 bl audio_play - ldr r0, _08166740 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r2, _08166744 + ldr r2, =0x00008041 adds r1, r0, r2 ldrb r1, [r1] subs r2, 0x1 @@ -734652,27 +710102,25 @@ _0816671A: subs r0, 0x1 cmp r1, r0 bne _0816674C - ldr r0, _08166748 + ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0x3 b _0816680C .align 2, 0 -_08166740: .4byte 0x0203bcac -_08166744: .4byte 0x00008041 -_08166748: .4byte 0x0203bc90 + .pool _0816674C: - ldr r0, _08166758 + ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0x5 b _0816680C .align 2, 0 -_08166758: .4byte 0x0203bc90 + .pool _0816675C: - ldr r0, _0816677C + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _08166780 + ldr r1, =0x00008044 adds r0, r1 ldr r0, [r0] bl _call_via_r0 @@ -734680,23 +710128,21 @@ _0816675C: lsrs r1, r0, 24 cmp r1, 0 bne _0816680E - ldr r0, _08166784 + ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 b _0816680C .align 2, 0 -_0816677C: .4byte 0x0203bcac -_08166780: .4byte 0x00008044 -_08166784: .4byte 0x0203bc90 + .pool _08166788: - ldr r0, _08166790 + ldr r0, =sub_8166BEC + 1 bl launch_c3_walk_stairs_and_run_once b _0816680E .align 2, 0 -_08166790: .4byte sub_8166BEC + 1 + .pool _08166794: bl sub_8166D44 - ldr r0, _081667A8 + ldr r0, =0x0203bc90 ldr r1, [r0] adds r1, 0x50 ldrb r0, [r1] @@ -734704,7 +710150,7 @@ _08166794: strb r0, [r1] b _0816680E .align 2, 0 -_081667A8: .4byte 0x0203bc90 + .pool _081667AC: bl sub_8166DE4 lsls r0, 24 @@ -734728,21 +710174,21 @@ _081667CC: cmp r0, 0 beq _081667E8 bl sub_8166F50 - ldr r0, _081667E4 + ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0x7 b _0816680C .align 2, 0 -_081667E4: .4byte 0x0203bc90 + .pool _081667E8: - ldr r0, _081667F0 + ldr r0, =sub_816681C + 1 bl launch_c3_walk_stairs_and_run_once b _0816680E .align 2, 0 -_081667F0: .4byte sub_816681C + 1 + .pool _081667F4: - ldr r0, _08166814 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -734750,7 +710196,7 @@ _081667F4: beq _0816680E bl sub_8166F94 _08166804: - ldr r0, _08166818 + ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0 @@ -734760,15 +710206,14 @@ _0816680E: pop {r0} bx r0 .align 2, 0 -_08166814: .4byte 0x030022c0 -_08166818: .4byte 0x0203bc90 + .pool thumb_func_end sub_8166634 thumb_func_start sub_816681C sub_816681C: @ 816681C push {r4,r5,lr} sub sp, 0x4 - ldr r5, _08166834 + ldr r5, =0x0203bc90 ldr r0, [r5] adds r0, 0x50 ldrb r4, [r0] @@ -734778,21 +710223,21 @@ sub_816681C: @ 816681C beq _08166888 b _081668D4 .align 2, 0 -_08166834: .4byte 0x0203bc90 + .pool _08166838: - ldr r0, _08166874 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _08166878 + ldr r1, =0x00008041 adds r0, r1 ldrb r0, [r0] bl sub_81672A4 - ldr r1, _0816687C + ldr r1, =0x0203bc9c strb r0, [r1] - ldr r1, _08166880 + ldr r1, =0x0203bc94 ldr r2, [r5] ldr r0, [r2, 0x4] str r0, [r1] - ldr r1, _08166884 + ldr r1, =0x0203bc98 ldr r0, [r2, 0x8] str r0, [r1] movs r0, 0x1 @@ -734809,13 +710254,9 @@ _08166838: strb r0, [r1] b _081668D4 .align 2, 0 -_08166874: .4byte 0x0203bcac -_08166878: .4byte 0x00008041 -_0816687C: .4byte 0x0203bc9c -_08166880: .4byte 0x0203bc94 -_08166884: .4byte 0x0203bc98 + .pool _08166888: - ldr r0, _081668DC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -734825,25 +710266,25 @@ _08166888: bne _081668D4 movs r0, 0 bl SetVBlankCallback - ldr r4, _081668E0 + ldr r4, =0x0203bca0 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _081668E4 + ldr r4, =0x0203bca4 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _081668E8 + ldr r4, =0x0203bca8 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _081668EC + ldr r4, =0x0203bcac ldr r0, [r4] bl free str r5, [r4] bl Window_FreeMemory - ldr r1, _081668F0 - ldr r0, _081668F4 + ldr r1, =0x030022c0 + ldr r0, =sub_816624C + 1 str r0, [r1, 0x8] bl sub_8179D70 _081668D4: @@ -734852,20 +710293,14 @@ _081668D4: pop {r0} bx r0 .align 2, 0 -_081668DC: .4byte 0x02037fd4 -_081668E0: .4byte 0x0203bca0 -_081668E4: .4byte 0x0203bca4 -_081668E8: .4byte 0x0203bca8 -_081668EC: .4byte 0x0203bcac -_081668F0: .4byte 0x030022c0 -_081668F4: .4byte sub_816624C + 1 + .pool thumb_func_end sub_816681C thumb_func_start sub_81668F8 sub_81668F8: @ 81668F8 push {r4,lr} sub sp, 0x4 - ldr r1, _08166918 + ldr r1, =0x0203bc90 ldr r0, [r1] adds r0, 0x50 ldrb r0, [r0] @@ -734875,13 +710310,12 @@ sub_81668F8: @ 81668F8 b _08166A18 _0816690C: lsls r0, 2 - ldr r1, _0816691C + ldr r1, =_08166920 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08166918: .4byte 0x0203bc90 -_0816691C: .4byte _08166920 + .pool .align 2, 0 _08166920: .4byte _0816693C @@ -734892,11 +710326,11 @@ _08166920: .4byte _081669C8 .4byte _081669F4 _0816693C: - ldr r0, _0816695C + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _08166960 + ldr r1, =0x00008041 adds r0, r1 - ldr r1, _08166964 + ldr r1, =0x0203bc9c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 @@ -734908,9 +710342,7 @@ _0816693C: ldr r1, [r4] b _081669E2 .align 2, 0 -_0816695C: .4byte 0x0203bcac -_08166960: .4byte 0x00008041 -_08166964: .4byte 0x0203bc9c + .pool _08166968: ldr r0, [r4] adds r0, 0x50 @@ -734918,9 +710350,9 @@ _08166968: strb r1, [r0] b _08166A18 _08166972: - ldr r0, _08166994 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _08166998 + ldr r1, =0x00008044 adds r0, r1 ldr r0, [r0] bl _call_via_r0 @@ -734928,15 +710360,13 @@ _08166972: lsrs r1, r0, 24 cmp r1, 0 bne _08166A18 - ldr r0, _0816699C + ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 strb r1, [r0] b _08166A18 .align 2, 0 -_08166994: .4byte 0x0203bcac -_08166998: .4byte 0x00008044 -_0816699C: .4byte 0x0203bc90 + .pool _081669A0: movs r0, 0x1 negs r0, r0 @@ -734955,7 +710385,7 @@ _081669AE: bl gpu_sync_bg_show b _081669DE _081669C8: - ldr r0, _081669EC + ldr r0, =sub_8166340 + 1 bl SetVBlankCallback movs r0, 0x1 negs r0, r0 @@ -734965,7 +710395,7 @@ _081669C8: movs r3, 0 bl sub_80A1AD4 _081669DE: - ldr r0, _081669F0 + ldr r0, =0x0203bc90 ldr r1, [r0] _081669E2: adds r1, 0x50 @@ -734974,23 +710404,22 @@ _081669E2: strb r0, [r1] b _08166A18 .align 2, 0 -_081669EC: .4byte sub_8166340 + 1 -_081669F0: .4byte 0x0203bc90 + .pool _081669F4: - ldr r0, _08166A20 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08166A18 - ldr r0, _08166A24 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _08166A28 + ldr r1, =0x00007b1c adds r0, r1 bl sub_81D3464 - ldr r0, _08166A2C + ldr r0, =sub_8166A34 + 1 bl launch_c3_walk_stairs_and_run_once - ldr r0, _08166A30 + ldr r0, =sub_816631C + 1 bl set_callback2 _08166A18: add sp, 0x4 @@ -734998,17 +710427,13 @@ _08166A18: pop {r0} bx r0 .align 2, 0 -_08166A20: .4byte 0x02037fd4 -_08166A24: .4byte 0x0203bcac -_08166A28: .4byte 0x00007b1c -_08166A2C: .4byte sub_8166A34 + 1 -_08166A30: .4byte sub_816631C + 1 + .pool thumb_func_end sub_81668F8 thumb_func_start sub_8166A34 sub_8166A34: @ 8166A34 push {r4-r6,lr} - ldr r1, _08166A50 + ldr r1, =0x0203bc90 ldr r0, [r1] adds r0, 0x50 ldrb r0, [r0] @@ -735018,13 +710443,12 @@ sub_8166A34: @ 8166A34 b _08166BDA _08166A46: lsls r0, 2 - ldr r1, _08166A54 + ldr r1, =_08166A58 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08166A50: .4byte 0x0203bc90 -_08166A54: .4byte _08166A58 + .pool .align 2, 0 _08166A58: .4byte _08166A70 @@ -735035,11 +710459,11 @@ _08166A58: .4byte _08166BB6 _08166A70: ldr r4, [r5] - ldr r3, _08166A9C + ldr r3, =0x020244ec str r3, [r4, 0xC] - ldr r0, _08166AA0 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r2, _08166AA4 + ldr r2, =0x00008041 adds r1, r0, r2 ldrb r1, [r1] lsls r1, 2 @@ -735051,17 +710475,14 @@ _08166A70: muls r1, r2 adds r1, r3 str r1, [r4, 0xC] - ldr r3, _08166AA8 + ldr r3, =0x00007b1c adds r0, r3 bl sub_81D3520 b _08166BAA .align 2, 0 -_08166A9C: .4byte 0x020244ec -_08166AA0: .4byte 0x0203bcac -_08166AA4: .4byte 0x00008041 -_08166AA8: .4byte 0x00007b1c + .pool _08166AAC: - ldr r0, _08166ABC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -735071,21 +710492,21 @@ _08166AAC: _08166ABA: b _08166BAA .align 2, 0 -_08166ABC: .4byte 0x030022c0 + .pool _08166AC0: bl sub_8167104 - ldr r6, _08166B00 + ldr r6, =0x0203bc90 ldr r0, [r6] adds r0, 0x5C - ldr r4, _08166B04 + ldr r4, =0x0203bcac ldr r1, [r4] - ldr r5, _08166B08 + ldr r5, =0x00007ca8 adds r1, r5 bl sub_81D2754 ldr r2, [r4] - ldr r4, _08166B0C + ldr r4, =0x00007c58 adds r0, r2, r4 - ldr r3, _08166B10 + ldr r3, =0x00007fb3 adds r1, r2, r3 movs r3, 0 ldrsb r3, [r1, r3] @@ -735101,15 +710522,11 @@ _08166AC0: ldr r1, [r6] b _08166BAC .align 2, 0 -_08166B00: .4byte 0x0203bc90 -_08166B04: .4byte 0x0203bcac -_08166B08: .4byte 0x00007ca8 -_08166B0C: .4byte 0x00007c58 -_08166B10: .4byte 0x00007fb3 + .pool _08166B14: - ldr r5, _08166B78 + ldr r5, =0x0203bcac ldr r0, [r5] - ldr r1, _08166B7C + ldr r1, =0x00007c58 adds r0, r1 bl sub_81D2074 lsls r0, 24 @@ -735117,7 +710534,7 @@ _08166B14: cmp r6, 0 bne _08166BDA ldr r0, [r5] - ldr r4, _08166B80 + ldr r4, =0x00008041 adds r0, r4 ldrb r0, [r0] bl sub_81672A4 @@ -735127,13 +710544,13 @@ _08166B14: ldr r3, [r5] adds r4, r3, r4 ldrb r1, [r4] - ldr r2, _08166B84 + ldr r2, =0x00008040 adds r0, r3, r2 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 beq _08166B6C - ldr r4, _08166B88 + ldr r4, =0x00007fb3 adds r0, r3, r4 movs r1, 0 ldrsb r1, [r0, r1] @@ -735141,27 +710558,21 @@ _08166B14: adds r0, r3, r2 adds r0, r1 ldrb r2, [r0] - ldr r4, _08166B8C + ldr r4, =0x00007b1c adds r0, r3, r4 subs r4, 0xC adds r1, r3, r4 ldrb r1, [r1] bl sub_81D3480 _08166B6C: - ldr r1, _08166B90 + ldr r1, =0x0203bc90 ldr r0, [r1] adds r0, 0x52 strb r6, [r0] ldr r1, [r1] b _08166BAC .align 2, 0 -_08166B78: .4byte 0x0203bcac -_08166B7C: .4byte 0x00007c58 -_08166B80: .4byte 0x00008041 -_08166B84: .4byte 0x00008040 -_08166B88: .4byte 0x00007fb3 -_08166B8C: .4byte 0x00007b1c -_08166B90: .4byte 0x0203bc90 + .pool _08166B94: ldr r1, [r5] adds r1, 0x52 @@ -735182,7 +710593,7 @@ _08166BAC: strb r0, [r1] b _08166BDA _08166BB6: - ldr r0, _08166BE0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -735192,26 +710603,24 @@ _08166BB6: lsls r0, 24 cmp r0, 0 bne _08166BDA - ldr r0, _08166BE4 + ldr r0, =0x0203ce7c ldrb r0, [r0] bl sub_8136F68 - ldr r0, _08166BE8 + ldr r0, =sub_8166BEC + 1 bl launch_c3_walk_stairs_and_run_once _08166BDA: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08166BE0: .4byte 0x030022c0 -_08166BE4: .4byte 0x0203ce7c -_08166BE8: .4byte sub_8166BEC + 1 + .pool thumb_func_end sub_8166A34 thumb_func_start sub_8166BEC sub_8166BEC: @ 8166BEC push {r4-r6,lr} sub sp, 0x4 - ldr r4, _08166C08 + ldr r4, =0x0203bc90 ldr r0, [r4] adds r2, r0, 0 adds r2, 0x50 @@ -735224,7 +710633,7 @@ sub_8166BEC: @ 8166BEC beq _08166C16 b _08166D18 .align 2, 0 -_08166C08: .4byte 0x0203bc90 + .pool _08166C0C: cmp r1, 0x2 beq _08166C40 @@ -735241,7 +710650,7 @@ _08166C16: bl sub_80A1AD4 b _08166C4A _08166C28: - ldr r0, _08166C3C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -735251,9 +710660,9 @@ _08166C28: strb r0, [r2] b _08166D18 .align 2, 0 -_08166C3C: .4byte 0x02037fd4 + .pool _08166C40: - ldr r1, _08166C58 + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] bl sub_80BA0A8 @@ -735265,27 +710674,27 @@ _08166C4A: strb r0, [r1] b _08166D18 .align 2, 0 -_08166C58: .4byte 0x02039b28 + .pool _08166C5C: ldr r0, [r0, 0x4] bl set_callback2 - ldr r0, _08166D20 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _08166D24 + ldr r1, =0x00007b1c adds r0, r1 bl sub_81D354C movs r4, 0 _08166C70: - ldr r5, _08166D20 + ldr r5, =0x0203bcac ldr r0, [r5] - ldr r2, _08166D28 + ldr r2, =0x00007b06 adds r0, r2 adds r0, r4 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08166D2C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -735305,7 +710714,7 @@ _08166C70: _08166CAE: ldr r0, [r5] lsls r1, r4, 2 - ldr r2, _08166D30 + ldr r2, =0x00007b44 adds r0, r2 adds r0, r1 ldr r0, [r0] @@ -735315,9 +710724,9 @@ _08166CAE: lsrs r4, r0, 24 cmp r4, 0x1 bls _08166CAE - ldr r6, _08166D20 + ldr r6, =0x0203bcac ldr r0, [r6] - ldr r2, _08166D34 + ldr r2, =0x00007b10 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF @@ -735326,22 +710735,22 @@ _08166CAE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08166D2C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles _08166CE6: movs r0, 0 bl SetVBlankCallback - ldr r4, _08166D38 + ldr r4, =0x0203bca0 ldr r0, [r4] bl free movs r5, 0 str r5, [r4] - ldr r4, _08166D3C + ldr r4, =0x0203bca4 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _08166D40 + ldr r4, =0x0203bca8 ldr r0, [r4] bl free str r5, [r4] @@ -735355,24 +710764,16 @@ _08166D18: pop {r0} bx r0 .align 2, 0 -_08166D20: .4byte 0x0203bcac -_08166D24: .4byte 0x00007b1c -_08166D28: .4byte 0x00007b06 -_08166D2C: .4byte 0x02020630 -_08166D30: .4byte 0x00007b44 -_08166D34: .4byte 0x00007b10 -_08166D38: .4byte 0x0203bca0 -_08166D3C: .4byte 0x0203bca4 -_08166D40: .4byte 0x0203bca8 + .pool thumb_func_end sub_8166BEC thumb_func_start sub_8166D44 sub_8166D44: @ 8166D44 push {r4,lr} sub sp, 0x4C - ldr r0, _08166DCC + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _08166DD0 + ldr r1, =0x00008041 adds r0, r1 ldrb r0, [r0] bl sub_81672A4 @@ -735380,17 +710781,17 @@ sub_8166D44: @ 8166D44 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _08166DD4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2 add r2, sp, 0xC bl pokemon_getattr add r0, sp, 0xC bl get_end_of_string_ptr_limit_10_chars - ldr r1, _08166DD8 + ldr r1, =0x085ec7a0 add r0, sp, 0xC bl gf_strcat - ldr r4, _08166DDC + ldr r4, =0x02021fc4 adds r0, r4, 0 add r1, sp, 0xC bl gf_strcpy @@ -735416,7 +710817,7 @@ sub_8166D44: @ 8166D44 movs r0, 0x2 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _08166DE0 + ldr r0, =0x085dfcfc movs r1, 0x97 movs r2, 0xE movs r3, 0 @@ -735426,12 +710827,7 @@ sub_8166D44: @ 8166D44 pop {r0} bx r0 .align 2, 0 -_08166DCC: .4byte 0x0203bcac -_08166DD0: .4byte 0x00008041 -_08166DD4: .4byte 0x020244ec -_08166DD8: .4byte 0x085ec7a0 -_08166DDC: .4byte 0x02021fc4 -_08166DE0: .4byte 0x085dfcfc + .pool thumb_func_end sub_8166D44 thumb_func_start sub_8166DE4 @@ -735478,7 +710874,7 @@ sub_8166E24: @ 8166E24 movs r0, 0x2 movs r1, 0x11 bl Window_FastFillPixels - ldr r3, _08166EA0 + ldr r3, =0x0203bc90 ldr r0, [r3] adds r0, 0x53 movs r1, 0 @@ -735524,7 +710920,7 @@ _08166E84: ldrb r0, [r1] cmp r0, 0x4 bhi _08166EA8 - ldr r0, _08166EA4 + ldr r0, =0x02021fc4 ldrb r1, [r1] adds r2, 0x61 adds r2, r1 @@ -735532,18 +710928,17 @@ _08166E84: bl sub_8166FD4 b _08166EB8 .align 2, 0 -_08166EA0: .4byte 0x0203bc90 -_08166EA4: .4byte 0x02021fc4 + .pool _08166EA8: - ldr r0, _08166ED4 - ldr r1, _08166ED8 + ldr r0, =0x02021fc4 + ldr r1, =0x0203bc90 ldr r1, [r1] adds r1, 0x53 ldrb r1, [r1] movs r2, 0 bl sub_8166FD4 _08166EB8: - ldr r0, _08166ED4 + ldr r0, =0x02021fc4 bl sub_8166FB0 movs r0, 0x2 bl Window_WriteStandardTileMap @@ -735554,8 +710949,7 @@ _08166EB8: pop {r0} bx r0 .align 2, 0 -_08166ED4: .4byte 0x02021fc4 -_08166ED8: .4byte 0x0203bc90 + .pool thumb_func_end sub_8166E24 thumb_func_start sub_8166EDC @@ -735564,7 +710958,7 @@ sub_8166EDC: @ 8166EDC movs r0, 0x2 movs r1, 0x11 bl Window_FastFillPixels - ldr r5, _08166F14 + ldr r5, =0x0203bc90 adds r3, r5, 0 movs r4, 0x5 _08166EEC: @@ -735588,13 +710982,13 @@ _08166EEC: bne _08166F1E b _08166EEC .align 2, 0 -_08166F14: .4byte 0x0203bc90 + .pool _08166F18: strb r4, [r1] movs r0, 0 b _08166F44 _08166F1E: - ldr r4, _08166F4C + ldr r4, =0x02021fc4 ldr r0, [r5] adds r1, r0, 0 adds r1, 0x53 @@ -735615,7 +711009,7 @@ _08166F44: pop {r1} bx r1 .align 2, 0 -_08166F4C: .4byte 0x02021fc4 + .pool thumb_func_end sub_8166EDC thumb_func_start sub_8166F50 @@ -735629,7 +711023,7 @@ sub_8166F50: @ 8166F50 movs r1, 0x97 movs r2, 0xE bl sub_8098858 - ldr r2, _08166F90 + ldr r2, =0x085ec800 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -735648,7 +711042,7 @@ sub_8166F50: @ 8166F50 pop {r0} bx r0 .align 2, 0 -_08166F90: .4byte 0x085ec800 + .pool thumb_func_end sub_8166F50 thumb_func_start sub_8166F94 @@ -735669,7 +711063,7 @@ sub_8166F94: @ 8166F94 sub_8166FB0: @ 8166FB0 push {lr} sub sp, 0xC - ldr r2, _08166FD0 + ldr r2, =0x02021fc4 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -735683,7 +711077,7 @@ sub_8166FB0: @ 8166FB0 pop {r0} bx r0 .align 2, 0 -_08166FD0: .4byte 0x02021fc4 + .pool thumb_func_end sub_8166FB0 thumb_func_start sub_8166FD4 @@ -735702,21 +711096,20 @@ sub_8166FD4: @ 8166FD4 movs r0, 0 _08166FEC: lsls r0, 16 - ldr r1, _08167008 + ldr r1, =0x085dfd04 lsls r0, r3, 2 adds r0, r1 ldr r1, [r0] adds r0, r4, 0 bl gf_strcpy - ldr r1, _0816700C + ldr r1, =0x085ec7e1 adds r0, r4, 0 bl gf_strcat b _08167018 .align 2, 0 -_08167008: .4byte 0x085dfd04 -_0816700C: .4byte 0x085ec7e1 + .pool _08167010: - ldr r1, _08167020 + ldr r1, =0x085ec7ef adds r0, r4, 0 bl gf_strcpy _08167018: @@ -735724,7 +711117,7 @@ _08167018: pop {r0} bx r0 .align 2, 0 -_08167020: .4byte 0x085ec7ef + .pool thumb_func_end sub_8166FD4 thumb_func_start sub_8167024 @@ -735733,7 +711126,7 @@ sub_8167024: @ 8167024 adds r6, r0, 0 adds r5, r1, 0 movs r4, 0 - ldr r7, _08167050 + ldr r7, =0x085dfcb0 _0816702E: lsls r0, r4, 2 adds r0, r7 @@ -735751,7 +711144,7 @@ _0816702E: pop {r0} bx r0 .align 2, 0 -_08167050: .4byte 0x085dfcb0 + .pool thumb_func_end sub_8167024 thumb_func_start sub_8167054 @@ -735773,7 +711166,7 @@ sub_8167054: @ 8167054 movs r4, 0 mov r7, sp _08167078: - ldr r1, _081670FC + ldr r1, =0x085dfcb0 lsls r0, r4, 2 adds r0, r1 ldr r6, [r0] @@ -735783,7 +711176,7 @@ _08167078: lsls r0, 24 lsrs r0, 24 strb r0, [r7] - ldr r1, _08167100 + ldr r1, =0x0203bc90 ldr r1, [r1] lsls r2, r4, 1 adds r1, 0x66 @@ -735840,28 +711233,27 @@ _081670F0: pop {r0} bx r0 .align 2, 0 -_081670FC: .4byte 0x085dfcb0 -_08167100: .4byte 0x0203bc90 + .pool thumb_func_end sub_8167054 thumb_func_start sub_8167104 sub_8167104: @ 8167104 push {r4,r5,lr} - ldr r5, _08167170 - ldr r0, _08167174 + ldr r5, =0x020244ec + ldr r0, =0x0203bcac ldr r1, [r0] - ldr r2, _08167178 + ldr r2, =0x00008041 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 2 adds r1, r0 - ldr r0, _0816717C + ldr r0, =0x00007fb9 adds r1, r0 ldrb r1, [r1] movs r0, 0x64 muls r0, r1 adds r5, r0, r5 - ldr r4, _08167180 + ldr r4, =0x0203bc90 ldr r1, [r4] adds r1, 0x57 adds r0, r5, 0 @@ -735898,11 +711290,7 @@ _08167144: pop {r0} bx r0 .align 2, 0 -_08167170: .4byte 0x020244ec -_08167174: .4byte 0x0203bcac -_08167178: .4byte 0x00008041 -_0816717C: .4byte 0x00007fb9 -_08167180: .4byte 0x0203bc90 + .pool thumb_func_end sub_8167104 thumb_func_start sub_8167184 @@ -735913,7 +711301,7 @@ sub_8167184: @ 8167184 mov r5, r8 push {r5-r7} mov r10, r1 - ldr r1, _081671CC + ldr r1, =0x0203bc90 ldr r3, [r1] ldrb r1, [r0, 0x1] adds r2, r3, 0 @@ -735935,7 +711323,7 @@ sub_8167184: @ 8167184 adds r0, r3, 0 adds r0, 0x6E strh r1, [r0] - ldr r0, _081671D0 + ldr r0, =0x0203bc9e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -735943,8 +711331,7 @@ sub_8167184: @ 8167184 movs r0, 0x1 b _081671DA .align 2, 0 -_081671CC: .4byte 0x0203bc90 -_081671D0: .4byte 0x0203bc9e + .pool _081671D4: cmp r0, 0 bge _08167250 @@ -735953,7 +711340,7 @@ _081671DA: movs r2, 0 lsls r0, 24 mov r9, r0 - ldr r0, _08167260 + ldr r0, =0x0203bc90 mov r8, r0 _081671E4: mov r0, r8 @@ -735983,7 +711370,7 @@ _081671E4: adds r0, r1 lsrs r5, r0, 24 _0816721C: - ldr r0, _08167264 + ldr r0, =0x085dfcc4 adds r0, r6, r0 ldrb r1, [r0] mov r0, r10 @@ -736018,16 +711405,15 @@ _08167250: pop {r0} bx r0 .align 2, 0 -_08167260: .4byte 0x0203bc90 -_08167264: .4byte 0x085dfcc4 + .pool thumb_func_end sub_8167184 thumb_func_start sub_8167268 sub_8167268: @ 8167268 push {lr} - ldr r0, _08167294 + ldr r0, =0x0203bcac ldr r1, [r0] - ldr r2, _08167298 + ldr r2, =0x00008041 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 2 @@ -736046,8 +711432,7 @@ sub_8167268: @ 8167268 movs r0, 0 b _0816729E .align 2, 0 -_08167294: .4byte 0x0203bcac -_08167298: .4byte 0x00008041 + .pool _0816729C: movs r0, 0x1 _0816729E: @@ -736064,7 +711449,7 @@ sub_81672A4: @ 81672A4 _081672AC: movs r0, 0x64 muls r0, r4 - ldr r1, _081672C8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2D bl pokemon_getattr @@ -736075,7 +711460,7 @@ _081672AC: adds r0, r4, 0 b _081672DE .align 2, 0 -_081672C8: .4byte 0x020244ec + .pool _081672CC: subs r0, r5, 0x1 lsls r0, 24 @@ -736105,7 +711490,7 @@ sub_81672E4: @ 81672E4 _081672F2: movs r0, 0x64 muls r0, r4 - ldr r1, _08167320 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2D bl pokemon_getattr @@ -736128,7 +711513,7 @@ _08167314: pop {r1} bx r1 .align 2, 0 -_08167320: .4byte 0x020244ec + .pool thumb_func_end sub_81672E4 thumb_func_start sub_8167324 @@ -736148,21 +711533,21 @@ sub_8167338: @ 8167338 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _081673C0 + ldr r0, =0x085dfd18 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _081673C4 + ldr r0, =0x085dfd20 bl gpu_pal_obj_alloc_tag_and_apply - ldr r2, _081673C8 + ldr r2, =0x0203bc90 ldr r0, [r2] adds r0, 0x54 movs r1, 0 strb r1, [r0] movs r4, 0 adds r5, r2, 0 - ldr r6, _081673CC + ldr r6, =0x085dfd28 adds r0, r6, 0x2 mov r8, r0 - ldr r7, _081673D0 + ldr r7, =0x0202064c _08167360: ldr r0, [r5] adds r0, 0x61 @@ -736177,7 +711562,7 @@ _08167360: add r2, r8 movs r0, 0 ldrsh r2, [r2, r0] - ldr r0, _081673D4 + ldr r0, =0x085dfd5c movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 24 @@ -736194,7 +711579,7 @@ _08167360: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _081673D8 + ldr r1, =sub_81673DC + 1 str r1, [r0] _081673A2: ldr r1, [r5] @@ -736214,13 +711599,7 @@ _081673AC: pop {r0} bx r0 .align 2, 0 -_081673C0: .4byte 0x085dfd18 -_081673C4: .4byte 0x085dfd20 -_081673C8: .4byte 0x0203bc90 -_081673CC: .4byte 0x085dfd28 -_081673D0: .4byte 0x0202064c -_081673D4: .4byte 0x085dfd5c -_081673D8: .4byte sub_81673DC + 1 + .pool thumb_func_end sub_8167338 thumb_func_start sub_81673DC @@ -736251,7 +711630,7 @@ _081673F8: ble _08167418 adds r0, r1, 0 bl obj_delete_and_free_tiles - ldr r0, _0816741C + ldr r0, =0x0203bc90 ldr r1, [r0] adds r1, 0x54 ldrb r0, [r1] @@ -736261,7 +711640,7 @@ _08167418: pop {r0} bx r0 .align 2, 0 -_0816741C: .4byte 0x0203bc90 + .pool thumb_func_end sub_81673DC thumb_func_start sub_8167420 @@ -736269,14 +711648,14 @@ sub_8167420: @ 8167420 push {r4-r6,lr} movs r4, 0 movs r5, 0 - ldr r6, _0816742C + ldr r6, =0x0203bcac b _08167472 .align 2, 0 -_0816742C: .4byte 0x0203bcac + .pool _08167430: movs r0, 0x64 muls r0, r4 - ldr r1, _081674A0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2D bl pokemon_getattr @@ -736286,18 +711665,18 @@ _08167430: ldr r1, [r6] lsls r2, r5, 2 adds r1, r2 - ldr r0, _081674A4 + ldr r0, =0x00007fb8 adds r1, r0 movs r0, 0xE strb r0, [r1] ldr r0, [r6] adds r0, r2 - ldr r1, _081674A8 + ldr r1, =0x00007fb9 adds r0, r1 strb r4, [r0] ldr r0, [r6] adds r0, r2 - ldr r2, _081674AC + ldr r2, =0x00007fba adds r0, r2 strh r3, [r0] adds r0, r5, 0x1 @@ -736313,15 +711692,15 @@ _08167472: lsrs r0, 24 cmp r4, r0 bcc _08167430 - ldr r2, _081674B0 + ldr r2, =0x0203bcac ldr r0, [r2] - ldr r1, _081674B4 + ldr r1, =0x00008041 adds r0, r1 movs r1, 0 strb r1, [r0] ldr r0, [r2] adds r1, r5, 0x1 - ldr r2, _081674B8 + ldr r2, =0x00008040 adds r0, r2 strb r1, [r0] bl sub_81674BC @@ -736329,37 +711708,31 @@ _08167472: pop {r0} bx r0 .align 2, 0 -_081674A0: .4byte 0x020244ec -_081674A4: .4byte 0x00007fb8 -_081674A8: .4byte 0x00007fb9 -_081674AC: .4byte 0x00007fba -_081674B0: .4byte 0x0203bcac -_081674B4: .4byte 0x00008041 -_081674B8: .4byte 0x00008040 + .pool thumb_func_end sub_8167420 thumb_func_start sub_81674BC sub_81674BC: @ 81674BC push {r4,r5,lr} - ldr r4, _08167528 + ldr r4, =0x0203bcac ldr r0, [r4] - ldr r5, _0816752C + ldr r5, =0x00008041 adds r0, r5 ldrb r0, [r0] movs r1, 0 bl sub_816753C ldr r0, [r4] - ldr r1, _08167530 + ldr r1, =0x00007fb3 adds r0, r1 movs r1, 0 strb r1, [r0] ldr r0, [r4] - ldr r2, _08167534 + ldr r2, =0x00007fb4 adds r0, r2 movs r1, 0x1 strb r1, [r0] ldr r0, [r4] - ldr r1, _08167538 + ldr r1, =0x00007fb5 adds r0, r1 movs r1, 0x2 strb r1, [r0] @@ -736394,11 +711767,7 @@ _08167510: pop {r0} bx r0 .align 2, 0 -_08167528: .4byte 0x0203bcac -_0816752C: .4byte 0x00008041 -_08167530: .4byte 0x00007fb3 -_08167534: .4byte 0x00007fb4 -_08167538: .4byte 0x00007fb5 + .pool thumb_func_end sub_81674BC thumb_func_start sub_816753C @@ -736413,16 +711782,16 @@ sub_816753C: @ 816753C adds r4, r1, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081675EC + ldr r0, =0x0203bcac mov r9, r0 ldr r1, [r0] lsls r5, 16 asrs r0, r5, 14 adds r0, r1, r0 - ldr r3, _081675F0 + ldr r3, =0x00007fb8 adds r2, r0, r3 ldrb r7, [r2] - ldr r2, _081675F4 + ldr r2, =0x00007fb9 adds r0, r2 ldrb r0, [r0] mov r10, r0 @@ -736434,11 +711803,11 @@ sub_816753C: @ 816753C lsls r0, r4, 1 adds r0, r4 lsls r0, 3 - ldr r2, _081675F8 + ldr r2, =0x00007b4d adds r0, r2 adds r0, r1, r0 lsls r2, r4, 6 - ldr r3, _081675FC + ldr r3, =0x00007b95 adds r2, r3 adds r1, r2 lsrs r5, 16 @@ -736451,9 +711820,9 @@ sub_816753C: @ 816753C bl sub_81D2ED4 mov r3, r9 ldr r1, [r3] - ldr r2, _08167600 + ldr r2, =0x00007c58 adds r0, r1, r2 - ldr r3, _08167604 + ldr r3, =0x00007fb0 adds r1, r3 str r5, [sp] str r4, [sp, 0x4] @@ -736489,13 +711858,7 @@ sub_816753C: @ 816753C pop {r0} bx r0 .align 2, 0 -_081675EC: .4byte 0x0203bcac -_081675F0: .4byte 0x00007fb8 -_081675F4: .4byte 0x00007fb9 -_081675F8: .4byte 0x00007b4d -_081675FC: .4byte 0x00007b95 -_08167600: .4byte 0x00007c58 -_08167604: .4byte 0x00007fb0 + .pool thumb_func_end sub_816753C thumb_func_start sub_8167608 @@ -736506,9 +711869,9 @@ sub_8167608: @ 8167608 sub sp, 0x28 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0816769C + ldr r1, =0x0203bcac ldr r3, [r1] - ldr r0, _081676A0 + ldr r0, =0x00007b10 mov r8, r0 adds r0, r3, r0 ldrb r0, [r0] @@ -736537,13 +711900,13 @@ sub_8167608: @ 8167608 ldr r1, [r7] lsls r0, 24 lsrs r0, 24 - ldr r2, _081676A4 + ldr r2, =0x00007b12 adds r1, r2 strh r0, [r1] adds r0, r5, 0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram ldr r1, [r7] - ldr r3, _081676A8 + ldr r3, =0x00007b14 adds r1, r3 strh r0, [r1] mov r0, sp @@ -736554,7 +711917,7 @@ sub_8167608: @ 8167608 lsls r0, 24 lsrs r1, r0, 24 ldr r0, [r7] - ldr r2, _081676A0 + ldr r2, =0x00007b10 adds r0, r2 strb r1, [r0] cmp r1, 0x40 @@ -736569,15 +711932,12 @@ sub_8167608: @ 8167608 strb r1, [r0] b _08167742 .align 2, 0 -_0816769C: .4byte 0x0203bcac -_081676A0: .4byte 0x00007b10 -_081676A4: .4byte 0x00007b12 -_081676A8: .4byte 0x00007b14 + .pool _081676AC: ldr r0, [r7] add r0, r8 strb r1, [r0] - ldr r4, _08167700 + ldr r4, =0x02020630 ldr r2, [r7] mov r0, r8 adds r3, r2, r0 @@ -736588,7 +711948,7 @@ _081676AC: adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08167704 + ldr r1, =sub_8168168 + 1 str r1, [r0] ldrb r1, [r3] lsls r0, r1, 4 @@ -736598,16 +711958,16 @@ _081676AC: ldrh r1, [r0, 0x26] subs r1, 0x22 strh r1, [r0, 0x26] - ldr r3, _08167708 + ldr r3, =0x00007b18 adds r1, r2, r3 subs r3, 0x4 adds r0, r2, r3 ldrh r0, [r0] lsls r0, 5 - ldr r3, _0816770C + ldr r3, =0x06010000 adds r0, r3 str r0, [r1] - ldr r0, _08167710 + ldr r0, =0x00007b12 adds r2, r0 ldrh r0, [r2] lsls r0, 4 @@ -736617,30 +711977,26 @@ _081676AC: strh r0, [r2] b _08167742 .align 2, 0 -_08167700: .4byte 0x02020630 -_08167704: .4byte sub_8168168 + 1 -_08167708: .4byte 0x00007b18 -_0816770C: .4byte 0x06010000 -_08167710: .4byte 0x00007b12 + .pool _08167714: lsls r1, r6, 13 movs r0, 0xC1 lsls r0, 2 adds r1, r0 adds r1, r3, r1 - ldr r2, _08167750 + ldr r2, =0x00007b18 adds r0, r3, r2 ldr r2, [r0] - ldr r0, _08167754 + ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] - ldr r1, _08167758 + ldr r1, =0x80000400 str r1, [r0, 0x8] ldr r0, [r0, 0x8] lsls r0, r6, 7 adds r0, 0x4 adds r0, r3, r0 - ldr r2, _0816775C + ldr r2, =0x00007b12 adds r1, r3, r2 ldrh r1, [r1] movs r2, 0x20 @@ -736653,10 +712009,7 @@ _08167742: pop {r0} bx r0 .align 2, 0 -_08167750: .4byte 0x00007b18 -_08167754: .4byte 0x040000d4 -_08167758: .4byte 0x80000400 -_0816775C: .4byte 0x00007b12 + .pool thumb_func_end sub_8167608 thumb_func_start sub_8167760 @@ -736678,9 +712031,9 @@ sub_8167760: @ 8167760 adds r0, r4, 0 bl gpu_pal_obj_alloc_and_load_multiple movs r4, 0 - ldr r1, _081677E8 + ldr r1, =0x0203bcac ldr r0, [r1] - ldr r2, _081677EC + ldr r2, =0x00008040 adds r0, r2 ldrb r0, [r0] subs r0, 0x1 @@ -736692,7 +712045,7 @@ sub_8167760: @ 8167760 cmp r4, r0 bge _0816781C adds r5, r1, 0 - ldr r7, _081677F0 + ldr r7, =0x02020630 movs r0, 0x1C adds r0, r7 mov r8, r0 @@ -736713,7 +712066,7 @@ _081677AC: cmp r3, 0x40 beq _081677FC ldr r0, [r5] - ldr r2, _081677F4 + ldr r2, =0x00007b06 adds r0, r2 adds r0, r4 strb r3, [r0] @@ -736723,18 +712076,14 @@ _081677AC: adds r1, r0, r7 strh r4, [r1, 0x2E] add r0, r8 - ldr r1, _081677F8 + ldr r1, =sub_8168180 + 1 str r1, [r0] b _08167808 .align 2, 0 -_081677E8: .4byte 0x0203bcac -_081677EC: .4byte 0x00008040 -_081677F0: .4byte 0x02020630 -_081677F4: .4byte 0x00007b06 -_081677F8: .4byte sub_8168180 + 1 + .pool _081677FC: ldr r0, [r5] - ldr r1, _08167864 + ldr r1, =0x00007b06 adds r0, r1 adds r0, r4 movs r1, 0xFF @@ -736744,7 +712093,7 @@ _08167808: lsls r0, 16 lsrs r4, r0, 16 ldr r0, [r5] - ldr r2, _08167868 + ldr r2, =0x00008040 adds r0, r2 ldrb r0, [r0] subs r0, 0x1 @@ -736755,8 +712104,8 @@ _0816781C: strh r0, [r6] cmp r4, 0x5 bhi _0816788A - ldr r5, _0816786C - ldr r7, _08167870 + ldr r5, =0x0203bcac + ldr r7, =0x02020630 _08167828: lsls r2, r4, 2 adds r2, r4 @@ -736774,7 +712123,7 @@ _08167828: cmp r3, 0x40 beq _08167874 ldr r0, [r5] - ldr r1, _08167864 + ldr r1, =0x00007b06 adds r0, r1 adds r0, r4 strb r3, [r0] @@ -736788,13 +712137,10 @@ _08167828: strb r0, [r1, 0x3] b _08167880 .align 2, 0 -_08167864: .4byte 0x00007b06 -_08167868: .4byte 0x00008040 -_0816786C: .4byte 0x0203bcac -_08167870: .4byte 0x02020630 + .pool _08167874: ldr r0, [r5] - ldr r2, _081678E4 + ldr r2, =0x00007b06 adds r0, r2 adds r0, r4 movs r1, 0xFF @@ -736808,7 +712154,7 @@ _08167880: _0816788A: movs r0, 0x66 strh r0, [r6] - ldr r0, _081678E8 + ldr r0, =sub_81681B4 + 1 str r0, [r6, 0x14] lsls r2, r4, 2 adds r2, r4 @@ -736825,13 +712171,13 @@ _0816788A: lsrs r3, r0, 24 cmp r3, 0x40 beq _081678F4 - ldr r0, _081678EC + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _081678E4 + ldr r1, =0x00007b06 adds r0, r1 adds r0, r4 strb r3, [r0] - ldr r0, _081678F0 + ldr r0, =0x02020630 lsls r2, r3, 4 adds r2, r3 lsls r2, 2 @@ -736850,14 +712196,11 @@ _0816788A: strb r1, [r2, 0x3] b _08167902 .align 2, 0 -_081678E4: .4byte 0x00007b06 -_081678E8: .4byte sub_81681B4 + 1 -_081678EC: .4byte 0x0203bcac -_081678F0: .4byte 0x02020630 + .pool _081678F4: - ldr r0, _08167928 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r2, _0816792C + ldr r2, =0x00007b06 adds r0, r2 adds r0, r4 movs r1, 0xFF @@ -736879,17 +712222,16 @@ _08167902: pop {r0} bx r0 .align 2, 0 -_08167928: .4byte 0x0203bcac -_0816792C: .4byte 0x00007b06 + .pool thumb_func_end sub_8167760 thumb_func_start sub_8167930 sub_8167930: @ 8167930 push {r4,r5,lr} sub sp, 0x8 - ldr r0, _08167950 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r2, _08167954 + ldr r2, =0x00008048 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xB @@ -736897,14 +712239,12 @@ sub_8167930: @ 8167930 b _08167B78 _08167944: lsls r0, 2 - ldr r1, _08167958 + ldr r1, =_0816795C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08167950: .4byte 0x0203bcac -_08167954: .4byte 0x00008048 -_08167958: .4byte _0816795C + .pool .align 2, 0 _0816795C: .4byte _0816798C @@ -736953,59 +712293,55 @@ _0816798C: movs r0, 0x3 movs r2, 0 bl bg_change_y_offset - ldr r1, _081679FC + ldr r1, =0x00007040 movs r0, 0 bl lcd_io_set movs r1, 0x91 lsls r1, 2 movs r0, 0x50 bl lcd_io_set - ldr r1, _08167A00 + ldr r1, =0x0000040b movs r0, 0x52 bl lcd_io_set b _08167B7E .align 2, 0 -_081679FC: .4byte 0x00007040 -_08167A00: .4byte 0x0000040b + .pool _08167A04: - ldr r4, _08167A2C + ldr r4, =0x0203bca4 movs r0, 0xD0 lsls r0, 5 bl malloc str r0, [r4] - ldr r5, _08167A30 + ldr r5, =0x0203bca0 movs r4, 0xA0 lsls r4, 3 adds r0, r4, 0 bl malloc str r0, [r5] - ldr r5, _08167A34 + ldr r5, =0x0203bca8 adds r0, r4, 0 bl malloc str r0, [r5] b _08167B7E .align 2, 0 -_08167A2C: .4byte 0x0203bca4 -_08167A30: .4byte 0x0203bca0 -_08167A34: .4byte 0x0203bca8 + .pool _08167A38: - ldr r0, _08167A40 - ldr r1, _08167A44 + ldr r0, =0x085dfb60 + ldr r1, =0x0203bca8 b _08167AA0 .align 2, 0 -_08167A40: .4byte 0x085dfb60 -_08167A44: .4byte 0x0203bca8 + .pool _08167A48: - ldr r1, _08167A58 + ldr r1, =0x085dfa80 movs r0, 0x3 movs r2, 0xE0 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram b _08167B7E .align 2, 0 -_08167A58: .4byte 0x085dfa80 + .pool _08167A5C: - ldr r0, _08167A70 + ldr r0, =0x0203bca8 ldr r1, [r0] movs r2, 0xA0 lsls r2, 3 @@ -737014,50 +712350,44 @@ _08167A5C: bl gpu_copy_bg_tile_map_to_vram b _08167B7E .align 2, 0 -_08167A70: .4byte 0x0203bca8 + .pool _08167A74: - ldr r0, _08167A8C + ldr r0, =0x085dfa60 movs r1, 0xD0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _08167A90 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _08167A94 + ldr r1, =0x00007b0e adds r0, r1 - ldr r1, _08167A98 + ldr r1, =0x0000ffb0 strh r1, [r0] b _08167B7E .align 2, 0 -_08167A8C: .4byte 0x085dfa60 -_08167A90: .4byte 0x0203bcac -_08167A94: .4byte 0x00007b0e -_08167A98: .4byte 0x0000ffb0 + .pool _08167A9C: - ldr r0, _08167AA8 - ldr r1, _08167AAC + ldr r0, =0x08dccf7c + ldr r1, =0x0203bca4 _08167AA0: ldr r1, [r1] bl LZ77UnCompVram b _08167B7E .align 2, 0 -_08167AA8: .4byte 0x08dccf7c -_08167AAC: .4byte 0x0203bca4 + .pool _08167AB0: - ldr r0, _08167AC8 - ldr r1, _08167ACC + ldr r0, =0x08dcd81c + ldr r1, =0x0203bca0 ldr r1, [r1] bl LZ77UnCompVram - ldr r0, _08167AD0 + ldr r0, =0x08dccf5c movs r1, 0x20 movs r2, 0x20 bl gpu_pal_apply b _08167B7E .align 2, 0 -_08167AC8: .4byte 0x08dcd81c -_08167ACC: .4byte 0x0203bca0 -_08167AD0: .4byte 0x08dccf5c + .pool _08167AD4: - ldr r0, _08167AE8 + ldr r0, =0x0203bca4 ldr r1, [r0] movs r2, 0xD0 lsls r2, 5 @@ -737067,13 +712397,13 @@ _08167AD4: bl gpu_copy_bg_tile_pattern_data_to_vram b _08167B7E .align 2, 0 -_08167AE8: .4byte 0x0203bca4 + .pool _08167AEC: - ldr r0, _08167B14 + ldr r0, =0x0203bca0 ldr r1, [r0] movs r0, 0x1 bl bg_set_tilemap - ldr r1, _08167B18 + ldr r1, =0x08dcda30 movs r0, 0xC str r0, [sp] movs r0, 0x4 @@ -737086,35 +712416,32 @@ _08167AEC: bl gpu_copy_wram_bg_tilemap_to_vram b _08167B7E .align 2, 0 -_08167B14: .4byte 0x0203bca0 -_08167B18: .4byte 0x08dcda30 + .pool _08167B1C: - ldr r0, _08167B2C - ldr r1, _08167B30 + ldr r0, =0x085dfc0c + ldr r1, =0x0203bcac ldr r1, [r1] - ldr r2, _08167B34 + ldr r2, =0x00007304 adds r1, r2 bl LZ77UnCompVram b _08167B7E .align 2, 0 -_08167B2C: .4byte 0x085dfc0c -_08167B30: .4byte 0x0203bcac -_08167B34: .4byte 0x00007304 + .pool _08167B38: - ldr r0, _08167B68 + ldr r0, =0x0203bcac ldr r1, [r0] - ldr r0, _08167B6C + ldr r0, =0x00007304 adds r1, r0 movs r2, 0xA0 lsls r2, 3 movs r0, 0x2 movs r3, 0 bl gpu_copy_bg_tile_map_to_vram - ldr r0, _08167B70 + ldr r0, =0x086231e8 movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _08167B74 + ldr r0, =0x08623208 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -737122,18 +712449,15 @@ _08167B38: bl sub_81D21DC b _08167B7E .align 2, 0 -_08167B68: .4byte 0x0203bcac -_08167B6C: .4byte 0x00007304 -_08167B70: .4byte 0x086231e8 -_08167B74: .4byte 0x08623208 + .pool _08167B78: movs r0, 0 strb r0, [r1] b _08167B8E _08167B7E: - ldr r0, _08167B98 + ldr r0, =0x0203bcac ldr r1, [r0] - ldr r2, _08167B9C + ldr r2, =0x00008048 adds r1, r2 ldrb r0, [r1] adds r0, 0x1 @@ -737145,8 +712469,7 @@ _08167B8E: pop {r1} bx r1 .align 2, 0 -_08167B98: .4byte 0x0203bcac -_08167B9C: .4byte 0x00008048 + .pool thumb_func_end sub_8167930 thumb_func_start sub_8167BA0 @@ -737166,19 +712489,19 @@ sub_8167BA0: @ 8167BA0 movs r0, 0x1 movs r1, 0 bl Window_FastFillPixels - ldr r7, _08167C60 + ldr r7, =0x0203bcac ldr r3, [r7] - ldr r1, _08167C64 + ldr r1, =0x00008041 adds r0, r3, r1 ldrb r1, [r0] - ldr r2, _08167C68 + ldr r2, =0x00008040 adds r0, r3, r2 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 beq _08167C46 lsls r2, r4, 6 - ldr r0, _08167C6C + ldr r0, =0x00007b95 adds r2, r0 adds r2, r3, r2 movs r0, 0x1 @@ -737191,7 +712514,7 @@ sub_8167BA0: @ 8167BA0 movs r3, 0 bl Print ldr r0, [r7] - ldr r1, _08167C64 + ldr r1, =0x00008041 adds r0, r1 ldrb r0, [r0] bl sub_81672A4 @@ -737199,23 +712522,23 @@ sub_8167BA0: @ 8167BA0 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _08167C70 + ldr r1, =0x020244ec adds r0, r1 bl get_nature adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldr r0, [r7] - ldr r6, _08167C74 + ldr r6, =0x0000804a adds r0, r6 - ldr r1, _08167C78 + ldr r1, =0x085ebf8d bl gf_strcpy - ldr r1, _08167C7C + ldr r1, =0x0861cb50 lsls r4, 2 adds r4, r1 ldr r1, [r4] bl gf_strcpy - ldr r0, _08167C80 + ldr r0, =0x085dfcc9 str r0, [sp] str r5, [sp, 0x4] ldr r0, [r7] @@ -737238,15 +712561,7 @@ _08167C46: bl Window_CopyToVram b _08167C94 .align 2, 0 -_08167C60: .4byte 0x0203bcac -_08167C64: .4byte 0x00008041 -_08167C68: .4byte 0x00008040 -_08167C6C: .4byte 0x00007b95 -_08167C70: .4byte 0x020244ec -_08167C74: .4byte 0x0000804a -_08167C78: .4byte 0x085ebf8d -_08167C7C: .4byte 0x0861cb50 -_08167C80: .4byte 0x085dfcc9 + .pool _08167C84: movs r0, 0 movs r1, 0x2 @@ -737272,18 +712587,17 @@ sub_8167CA0: @ 8167CA0 lsrs r7, r0, 24 cmp r7, 0 beq _08167CC0 - ldr r0, _08167CB8 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _08167CBC + ldr r1, =0x00007fb5 adds r0, r1 b _08167CC8 .align 2, 0 -_08167CB8: .4byte 0x0203bcac -_08167CBC: .4byte 0x00007fb5 + .pool _08167CC0: - ldr r0, _08167D78 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r2, _08167D7C + ldr r2, =0x00007fb4 adds r0, r2 _08167CC8: ldrb r0, [r0] @@ -737291,18 +712605,18 @@ _08167CC8: asrs r0, 24 lsls r0, 16 lsrs r6, r0, 16 - ldr r5, _08167D78 + ldr r5, =0x0203bcac ldr r2, [r5] - ldr r3, _08167D80 + ldr r3, =0x00007c58 adds r0, r2, r3 - ldr r4, _08167D84 + ldr r4, =0x00007fb3 adds r1, r2, r4 movs r3, 0 ldrsb r3, [r1, r3] lsls r1, r3, 2 adds r1, r3 lsls r1, 2 - ldr r4, _08167D88 + ldr r4, =0x00007c6c adds r1, r4 adds r1, r2, r1 lsls r3, r6, 2 @@ -737312,10 +712626,10 @@ _08167CC8: adds r2, r3 bl sub_81D1F84 ldr r4, [r5] - ldr r1, _08167D8C + ldr r1, =0x00008041 adds r0, r4, r1 ldrb r1, [r0] - ldr r2, _08167D90 + ldr r2, =0x00008040 mov r12, r2 adds r0, r4, r2 ldrb r0, [r0] @@ -737327,14 +712641,14 @@ _08167CC8: mov r8, r0 cmp r7, 0 beq _08167D98 - ldr r3, _08167D7C + ldr r3, =0x00007fb4 adds r0, r4, r3 ldrb r1, [r0] subs r2, 0x8B adds r0, r4, r2 strb r1, [r0] ldr r0, [r5] - ldr r4, _08167D84 + ldr r4, =0x00007fb3 adds r1, r0, r4 ldrb r1, [r1] adds r0, r3 @@ -737345,7 +712659,7 @@ _08167CC8: ldr r0, [r5] adds r2, r0, r2 ldrb r1, [r2] - ldr r2, _08167D94 + ldr r2, =0x00007fb6 adds r0, r2 strb r1, [r0] ldr r1, [r5] @@ -737359,40 +712673,33 @@ _08167CC8: ldrb r0, [r0] _08167D58: subs r2, r0, 0x1 - ldr r0, _08167D8C + ldr r0, =0x00008041 adds r1, r0 strb r2, [r1] - ldr r1, _08167D78 + ldr r1, =0x0203bcac ldr r3, [r1] adds r0, r3, r0 ldrb r0, [r0] adds r6, r1, 0 cmp r0, 0 bne _08167D74 - ldr r1, _08167D90 + ldr r1, =0x00008040 adds r0, r3, r1 ldrb r0, [r0] _08167D74: subs r1, r0, 0x1 b _08167E1E .align 2, 0 -_08167D78: .4byte 0x0203bcac -_08167D7C: .4byte 0x00007fb4 -_08167D80: .4byte 0x00007c58 -_08167D84: .4byte 0x00007fb3 -_08167D88: .4byte 0x00007c6c -_08167D8C: .4byte 0x00008041 -_08167D90: .4byte 0x00008040 -_08167D94: .4byte 0x00007fb6 + .pool _08167D98: - ldr r3, _08167DDC + ldr r3, =0x00007fb5 adds r0, r4, r3 ldrb r1, [r0] - ldr r2, _08167DE0 + ldr r2, =0x00007fb4 adds r0, r4, r2 strb r1, [r0] ldr r0, [r5] - ldr r4, _08167DE4 + ldr r4, =0x00007fb3 adds r1, r0, r4 ldrb r1, [r1] adds r0, r3 @@ -737403,7 +712710,7 @@ _08167D98: ldr r0, [r5] adds r2, r0, r2 ldrb r1, [r2] - ldr r2, _08167DE8 + ldr r2, =0x00007fb6 adds r0, r2 strb r1, [r0] ldr r2, [r5] @@ -737419,21 +712726,18 @@ _08167D98: adds r3, r1, 0x1 b _08167DEE .align 2, 0 -_08167DDC: .4byte 0x00007fb5 -_08167DE0: .4byte 0x00007fb4 -_08167DE4: .4byte 0x00007fb3 -_08167DE8: .4byte 0x00007fb6 + .pool _08167DEC: movs r3, 0 _08167DEE: - ldr r1, _08167E10 + ldr r1, =0x00008041 adds r0, r2, r1 strb r3, [r0] - ldr r2, _08167E14 + ldr r2, =0x0203bcac ldr r3, [r2] adds r1, r3, r1 ldrb r1, [r1] - ldr r4, _08167E18 + ldr r4, =0x00008040 adds r0, r3, r4 ldrb r0, [r0] subs r0, 0x1 @@ -737443,21 +712747,19 @@ _08167DEE: adds r1, 0x1 b _08167E1E .align 2, 0 -_08167E10: .4byte 0x00008041 -_08167E14: .4byte 0x0203bcac -_08167E18: .4byte 0x00008040 + .pool _08167E1C: movs r1, 0 _08167E1E: - ldr r2, _08167E58 + ldr r2, =0x00007b4c adds r0, r3, r2 strb r1, [r0] adds r5, r6, 0 ldr r0, [r5] - ldr r3, _08167E5C + ldr r3, =0x00008041 adds r1, r0, r3 ldrb r2, [r1] - ldr r4, _08167E60 + ldr r4, =0x00008040 adds r1, r0, r4 ldrb r1, [r1] subs r1, 0x1 @@ -737465,40 +712767,34 @@ _08167E1E: negs r1, r2 orrs r1, r2 lsrs r4, r1, 31 - ldr r1, _08167E64 + ldr r1, =0x00007b1c adds r0, r1 bl sub_81D3520 mov r2, r8 cmp r2, 0 bne _08167E70 ldr r0, [r5] - ldr r3, _08167E68 + ldr r3, =0x00008044 adds r0, r3 - ldr r1, _08167E6C + ldr r1, =sub_8167EA4 + 1 b _08167E90 .align 2, 0 -_08167E58: .4byte 0x00007b4c -_08167E5C: .4byte 0x00008041 -_08167E60: .4byte 0x00008040 -_08167E64: .4byte 0x00007b1c -_08167E68: .4byte 0x00008044 -_08167E6C: .4byte sub_8167EA4 + 1 + .pool _08167E70: cmp r4, 0 bne _08167E88 ldr r0, [r5] - ldr r4, _08167E80 + ldr r4, =0x00008044 adds r0, r4 - ldr r1, _08167E84 + ldr r1, =sub_8167FA4 + 1 b _08167E90 .align 2, 0 -_08167E80: .4byte 0x00008044 -_08167E84: .4byte sub_8167FA4 + 1 + .pool _08167E88: ldr r0, [r6] - ldr r1, _08167E9C + ldr r1, =0x00008044 adds r0, r1 - ldr r1, _08167EA0 + ldr r1, =sub_8168048 + 1 _08167E90: str r1, [r0] pop {r3} @@ -737507,16 +712803,15 @@ _08167E90: pop {r0} bx r0 .align 2, 0 -_08167E9C: .4byte 0x00008044 -_08167EA0: .4byte sub_8168048 + 1 + .pool thumb_func_end sub_8167CA0 thumb_func_start sub_8167EA4 sub_8167EA4: @ 8167EA4 push {r4-r6,lr} - ldr r4, _08167EC0 + ldr r4, =0x0203bcac ldr r1, [r4] - ldr r5, _08167EC4 + ldr r5, =0x00008048 adds r0, r1, r5 ldrb r0, [r0] cmp r0, 0x1 @@ -737527,8 +712822,7 @@ sub_8167EA4: @ 8167EA4 beq _08167ED2 b _08167F9C .align 2, 0 -_08167EC0: .4byte 0x0203bcac -_08167EC4: .4byte 0x00008048 + .pool _08167EC8: cmp r0, 0x2 beq _08167F08 @@ -737536,15 +712830,15 @@ _08167EC8: beq _08167F48 b _08167F9C _08167ED2: - ldr r2, _08167EE0 + ldr r2, =0x00007fb3 adds r0, r1, r2 ldrb r0, [r0] bl sub_8167608 b _08167F2C .align 2, 0 -_08167EE0: .4byte 0x00007fb3 + .pool _08167EE4: - ldr r6, _08167F00 + ldr r6, =0x00007fb3 adds r0, r1, r6 ldrb r0, [r0] lsls r0, 24 @@ -737554,26 +712848,25 @@ _08167EE4: movs r1, 0 bl sub_8167BA0 ldr r1, [r4] - ldr r0, _08167F04 + ldr r0, =0x00008048 adds r1, r0 b _08167F30 .align 2, 0 -_08167F00: .4byte 0x00007fb3 -_08167F04: .4byte 0x00008048 + .pool _08167F08: - ldr r2, _08167F38 + ldr r2, =0x00007c58 adds r0, r1, r2 - ldr r6, _08167F3C + ldr r6, =0x00007b0e adds r1, r6 bl sub_81D3178 lsls r0, 24 cmp r0, 0 bne _08167F9C ldr r1, [r4] - ldr r2, _08167F40 + ldr r2, =0x00007b4c adds r0, r1, r2 ldrb r0, [r0] - ldr r6, _08167F44 + ldr r6, =0x00007fb6 adds r1, r6 ldrb r1, [r1] bl sub_816753C @@ -737586,19 +712879,16 @@ _08167F30: strb r0, [r1] b _08167F9C .align 2, 0 -_08167F38: .4byte 0x00007c58 -_08167F3C: .4byte 0x00007b0e -_08167F40: .4byte 0x00007b4c -_08167F44: .4byte 0x00007fb6 + .pool _08167F48: - ldr r2, _08167F90 + ldr r2, =0x00007b1c adds r0, r1, r2 bl sub_81D3464 ldr r3, [r4] - ldr r6, _08167F94 + ldr r6, =0x00008041 adds r0, r3, r6 ldrb r1, [r0] - ldr r2, _08167F98 + ldr r2, =0x00008040 adds r0, r3, r2 ldrb r0, [r0] subs r0, 0x1 @@ -737612,7 +712902,7 @@ _08167F48: adds r0, r3, r2 adds r0, r1 ldrb r2, [r0] - ldr r6, _08167F90 + ldr r6, =0x00007b1c adds r0, r3, r6 subs r6, 0xC adds r1, r3, r6 @@ -737626,9 +712916,7 @@ _08167F82: movs r0, 0 b _08167F9E .align 2, 0 -_08167F90: .4byte 0x00007b1c -_08167F94: .4byte 0x00008041 -_08167F98: .4byte 0x00008040 + .pool _08167F9C: movs r0, 0x1 _08167F9E: @@ -737640,9 +712928,9 @@ _08167F9E: thumb_func_start sub_8167FA4 sub_8167FA4: @ 8167FA4 push {r4,r5,lr} - ldr r4, _08167FC0 + ldr r4, =0x0203bcac ldr r1, [r4] - ldr r5, _08167FC4 + ldr r5, =0x00008048 adds r2, r1, r5 ldrb r0, [r2] cmp r0, 0x1 @@ -737653,8 +712941,7 @@ sub_8167FA4: @ 8167FA4 beq _08167FD2 b _0816803E .align 2, 0 -_08167FC0: .4byte 0x0203bcac -_08167FC4: .4byte 0x00008048 + .pool _08167FC8: cmp r0, 0x2 beq _08168014 @@ -737662,9 +712949,9 @@ _08167FC8: beq _08168038 b _0816803E _08167FD2: - ldr r2, _08167FE8 + ldr r2, =0x00007c58 adds r0, r1, r2 - ldr r2, _08167FEC + ldr r2, =0x00007b0e adds r1, r2 bl sub_81D31A4 lsls r0, 24 @@ -737672,10 +712959,9 @@ _08167FD2: bne _0816803E b _08168024 .align 2, 0 -_08167FE8: .4byte 0x00007c58 -_08167FEC: .4byte 0x00007b0e + .pool _08167FF0: - ldr r2, _0816800C + ldr r2, =0x00007fb3 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 24 @@ -737685,17 +712971,16 @@ _08167FF0: movs r1, 0 bl sub_8167BA0 ldr r1, [r4] - ldr r0, _08168010 + ldr r0, =0x00008048 adds r1, r0 b _08168028 .align 2, 0 -_0816800C: .4byte 0x00007fb3 -_08168010: .4byte 0x00008048 + .pool _08168014: - ldr r2, _08168030 + ldr r2, =0x00007b4c adds r0, r1, r2 ldrb r0, [r0] - ldr r2, _08168034 + ldr r2, =0x00007fb6 adds r1, r2 ldrb r1, [r1] bl sub_816753C @@ -737708,8 +712993,7 @@ _08168028: strb r0, [r1] b _0816803E .align 2, 0 -_08168030: .4byte 0x00007b4c -_08168034: .4byte 0x00007fb6 + .pool _08168038: movs r0, 0 strb r0, [r2] @@ -737725,9 +713009,9 @@ _08168040: thumb_func_start sub_8168048 sub_8168048: @ 8168048 push {r4-r6,lr} - ldr r4, _08168064 + ldr r4, =0x0203bcac ldr r1, [r4] - ldr r5, _08168068 + ldr r5, =0x00008048 adds r0, r1, r5 ldrb r0, [r0] cmp r0, 0x1 @@ -737738,8 +713022,7 @@ sub_8168048: @ 8168048 beq _08168076 b _08168160 .align 2, 0 -_08168064: .4byte 0x0203bcac -_08168068: .4byte 0x00008048 + .pool _0816806C: cmp r0, 0x2 beq _081680CC @@ -737747,28 +713030,26 @@ _0816806C: beq _0816810C b _08168160 _08168076: - ldr r2, _0816809C + ldr r2, =0x00007c58 adds r0, r1, r2 bl sub_81D2074 ldr r0, [r4] - ldr r6, _081680A0 + ldr r6, =0x00007b0e adds r0, r6 bl sub_81D3150 lsls r0, 24 cmp r0, 0 bne _08168160 ldr r0, [r4] - ldr r1, _081680A4 + ldr r1, =0x00007fb3 adds r0, r1 ldrb r0, [r0] bl sub_8167608 b _081680F0 .align 2, 0 -_0816809C: .4byte 0x00007c58 -_081680A0: .4byte 0x00007b0e -_081680A4: .4byte 0x00007fb3 + .pool _081680A8: - ldr r2, _081680C4 + ldr r2, =0x00007fb3 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 24 @@ -737778,26 +713059,25 @@ _081680A8: movs r1, 0 bl sub_8167BA0 ldr r1, [r4] - ldr r6, _081680C8 + ldr r6, =0x00008048 adds r1, r6 b _081680F4 .align 2, 0 -_081680C4: .4byte 0x00007fb3 -_081680C8: .4byte 0x00008048 + .pool _081680CC: - ldr r2, _081680FC + ldr r2, =0x00007c58 adds r0, r1, r2 - ldr r6, _08168100 + ldr r6, =0x00007b0e adds r1, r6 bl sub_81D3178 lsls r0, 24 cmp r0, 0 bne _08168160 ldr r1, [r4] - ldr r2, _08168104 + ldr r2, =0x00007b4c adds r0, r1, r2 ldrb r0, [r0] - ldr r6, _08168108 + ldr r6, =0x00007fb6 adds r1, r6 ldrb r1, [r1] bl sub_816753C @@ -737810,19 +713090,16 @@ _081680F4: strb r0, [r1] b _08168160 .align 2, 0 -_081680FC: .4byte 0x00007c58 -_08168100: .4byte 0x00007b0e -_08168104: .4byte 0x00007b4c -_08168108: .4byte 0x00007fb6 + .pool _0816810C: - ldr r2, _08168154 + ldr r2, =0x00007b1c adds r0, r1, r2 bl sub_81D3464 ldr r3, [r4] - ldr r6, _08168158 + ldr r6, =0x00008041 adds r0, r3, r6 ldrb r1, [r0] - ldr r2, _0816815C + ldr r2, =0x00008040 adds r0, r3, r2 ldrb r0, [r0] subs r0, 0x1 @@ -737836,7 +713113,7 @@ _0816810C: adds r0, r3, r2 adds r0, r1 ldrb r2, [r0] - ldr r6, _08168154 + ldr r6, =0x00007b1c adds r0, r3, r6 subs r6, 0xC adds r1, r3, r6 @@ -737850,9 +713127,7 @@ _08168146: movs r0, 0 b _08168162 .align 2, 0 -_08168154: .4byte 0x00007b1c -_08168158: .4byte 0x00008041 -_0816815C: .4byte 0x00008040 + .pool _08168160: movs r0, 0x1 _08168162: @@ -737863,17 +713138,16 @@ _08168162: thumb_func_start sub_8168168 sub_8168168: @ 8168168 - ldr r1, _08168178 + ldr r1, =0x0203bcac ldr r1, [r1] - ldr r2, _0816817C + ldr r2, =0x00007b0e adds r1, r2 ldrh r1, [r1] adds r1, 0x26 strh r1, [r0, 0x20] bx lr .align 2, 0 -_08168178: .4byte 0x0203bcac -_0816817C: .4byte 0x00007b0e + .pool thumb_func_end sub_8168168 thumb_func_start sub_8168180 @@ -737882,9 +713156,9 @@ sub_8168180: @ 8168180 adds r2, r0, 0 movs r0, 0x2E ldrsh r1, [r2, r0] - ldr r0, _081681A0 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r3, _081681A4 + ldr r3, =0x00008041 adds r0, r3 ldrb r0, [r0] cmp r1, r0 @@ -737894,8 +713168,7 @@ sub_8168180: @ 8168180 bl obj_anim_image_start b _081681B0 .align 2, 0 -_081681A0: .4byte 0x0203bcac -_081681A4: .4byte 0x00008041 + .pool _081681A8: adds r0, r2, 0 movs r1, 0x1 @@ -737909,9 +713182,9 @@ _081681B0: sub_81681B4: @ 81681B4 push {r4,lr} adds r4, r0, 0 - ldr r0, _081681D4 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r2, _081681D8 + ldr r2, =0x00008041 adds r1, r0, r2 ldrb r1, [r1] subs r2, 0x1 @@ -737923,8 +713196,7 @@ sub_81681B4: @ 81681B4 movs r0, 0x65 b _081681DE .align 2, 0 -_081681D4: .4byte 0x0203bcac -_081681D8: .4byte 0x00008041 + .pool _081681DC: movs r0, 0x66 _081681DE: @@ -737947,15 +713219,15 @@ sub_81681F4: @ 81681F4 lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _08168230 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 bl pokemon_getattr lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08168234 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r3, _08168238 + ldr r3, =0x00007fb3 adds r1, r0, r3 ldrb r1, [r1] lsls r1, 24 @@ -737970,9 +713242,7 @@ sub_81681F4: @ 81681F4 bl __udivsi3 b _0816823E .align 2, 0 -_08168230: .4byte 0x020244ec -_08168234: .4byte 0x0203bcac -_08168238: .4byte 0x00007fb3 + .pool _0816823C: movs r0, 0x9 _0816823E: @@ -737986,20 +713256,20 @@ _0816823E: sub_8168248: @ 8168248 push {lr} sub sp, 0x10 - ldr r0, _08168284 + ldr r0, =0x085dfdb8 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x8] str r1, [sp, 0xC] - ldr r0, _08168288 + ldr r0, =0x08dccbb8 str r0, [sp] - ldr r1, _0816828C + ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 movs r1, 0x80 lsls r1, 4 orrs r0, r1 - ldr r1, _08168290 + ldr r1, =0x0000ffff ands r0, r1 adds r1, 0x1 orrs r0, r1 @@ -738012,10 +713282,7 @@ sub_8168248: @ 8168248 pop {r0} bx r0 .align 2, 0 -_08168284: .4byte 0x085dfdb8 -_08168288: .4byte 0x08dccbb8 -_0816828C: .4byte 0xffff0000 -_08168290: .4byte 0x0000ffff + .pool thumb_func_end sub_8168248 thumb_func_start sub_8168294 @@ -738025,11 +713292,11 @@ sub_8168294: @ 8168294 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08168318 + ldr r0, =0x0203bcac ldr r0, [r0] - ldr r1, _0816831C + ldr r1, =0x00007b44 adds r7, r0, r1 - ldr r0, _08168320 + ldr r0, =0x085dfda0 mov r10, r0 movs r6, 0 movs r1, 0x40 @@ -738054,7 +713321,7 @@ _081682B6: lsrs r1, r0, 24 cmp r1, 0x40 beq _081682FE - ldr r0, _08168324 + ldr r0, =0x02020630 lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -738086,18 +713353,15 @@ _081682FE: pop {r0} bx r0 .align 2, 0 -_08168318: .4byte 0x0203bcac -_0816831C: .4byte 0x00007b44 -_08168320: .4byte 0x085dfda0 -_08168324: .4byte 0x02020630 + .pool thumb_func_end sub_8168294 thumb_func_start sub_8168328 sub_8168328: @ 8168328 push {r4,r5,lr} - ldr r4, _08168340 + ldr r4, =0x0203bcac ldr r0, [r4] - ldr r5, _08168344 + ldr r5, =0x00008048 adds r0, r5 ldrb r0, [r0] cmp r0, 0 @@ -738106,12 +713370,11 @@ sub_8168328: @ 8168328 beq _08168360 b _0816836C .align 2, 0 -_08168340: .4byte 0x0203bcac -_08168344: .4byte 0x00008048 + .pool _08168348: bl sub_8168248 ldr r1, [r4] - ldr r0, _0816835C + ldr r0, =0x00008048 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 @@ -738119,7 +713382,7 @@ _08168348: movs r0, 0x1 b _0816836E .align 2, 0 -_0816835C: .4byte 0x00008048 + .pool _08168360: bl sub_8168294 ldr r0, [r4] @@ -738162,14 +713425,14 @@ _08168398: _081683A0: ldrh r0, [r2, 0x30] strh r0, [r2, 0x20] - ldr r0, _081683B0 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _081683A8: pop {r4} pop {r0} bx r0 .align 2, 0 -_081683B0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8168374 thumb_func_start nullsub_117 @@ -738179,14 +713442,14 @@ nullsub_117: @ 81683B4 thumb_func_start bx_goto_buffer_A_ch0_tbl3 bx_goto_buffer_A_ch0_tbl3: @ 81683B8 - ldr r1, _081683E4 - ldr r0, _081683E8 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _081683EC + ldr r1, =bx_exec_buffer_A_ch0_tbl2 + 1 str r1, [r0] - ldr r2, _081683F0 + ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x94 movs r1, 0 @@ -738202,18 +713465,15 @@ bx_goto_buffer_A_ch0_tbl3: @ 81683B8 strb r1, [r0] bx lr .align 2, 0 -_081683E4: .4byte 0x03005d60 -_081683E8: .4byte 0x02024064 -_081683EC: .4byte bx_exec_buffer_A_ch0_tbl2 + 1 -_081683F0: .4byte 0x0202449c + .pool thumb_func_end bx_goto_buffer_A_ch0_tbl3 thumb_func_start bx_exec_buffer_A_ch0_tbl2 bx_exec_buffer_A_ch0_tbl2: @ 81683F4 push {lr} - ldr r2, _08168428 - ldr r1, _0816842C - ldr r0, _08168430 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -738222,13 +713482,13 @@ bx_exec_buffer_A_ch0_tbl2: @ 81683F4 ands r1, r0 cmp r1, 0 beq _08168440 - ldr r0, _08168434 + ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _0816843C - ldr r0, _08168438 + ldr r0, =0x085dfdc0 ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -738236,11 +713496,7 @@ bx_exec_buffer_A_ch0_tbl2: @ 81683F4 bl _call_via_r0 b _08168440 .align 2, 0 -_08168428: .4byte 0x02024068 -_0816842C: .4byte 0x0832a328 -_08168430: .4byte 0x02024064 -_08168434: .4byte 0x02023064 -_08168438: .4byte 0x085dfdc0 + .pool _0816843C: bl dp01_tbl5_exec_completed _08168440: @@ -738251,7 +713507,7 @@ _08168440: thumb_func_start sub_8168444 sub_8168444: @ 8168444 push {r4,r5,lr} - ldr r1, _08168460 + ldr r1, =0x0202449c ldr r0, [r1] adds r0, 0x94 ldrb r0, [r0] @@ -738261,13 +713517,12 @@ sub_8168444: @ 8168444 b _08168564 _08168456: lsls r0, 2 - ldr r1, _08168464 + ldr r1, =_08168468 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08168460: .4byte 0x0202449c -_08168464: .4byte _08168468 + .pool .align 2, 0 _08168468: .4byte _08168480 @@ -738396,9 +713651,9 @@ _08168564: thumb_func_start sub_816856C sub_816856C: @ 816856C push {lr} - ldr r2, _08168594 - ldr r1, _08168598 - ldr r0, _0816859C + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -738408,7 +713663,7 @@ sub_816856C: @ 816856C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081685A0 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08168590 bl dp01_tbl5_exec_completed @@ -738416,10 +713671,7 @@ _08168590: pop {r0} bx r0 .align 2, 0 -_08168594: .4byte 0x02020630 -_08168598: .4byte 0x020241e4 -_0816859C: .4byte 0x02024064 -_081685A0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_816856C thumb_func_start sub_81685A4 @@ -738439,7 +713691,7 @@ _081685B6: thumb_func_start bx_wait_t5 bx_wait_t5: @ 81685BC push {lr} - ldr r0, _081685D0 + ldr r0, =0x020244b9 ldrb r0, [r0] cmp r0, 0 bne _081685CA @@ -738448,24 +713700,24 @@ _081685CA: pop {r0} bx r0 .align 2, 0 -_081685D0: .4byte 0x020244b9 + .pool thumb_func_end bx_wait_t5 thumb_func_start sub_81685D4 sub_81685D4: @ 81685D4 push {lr} - ldr r0, _08168600 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081685FC - ldr r1, _08168604 - ldr r0, _08168608 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0816860C + ldr r1, =sub_8168610 + 1 str r1, [r0] bl nullsub_35 bl Window_FreeMemory @@ -738474,27 +713726,24 @@ _081685FC: pop {r0} bx r0 .align 2, 0 -_08168600: .4byte 0x02037fd4 -_08168604: .4byte 0x03005d60 -_08168608: .4byte 0x02024064 -_0816860C: .4byte sub_8168610 + 1 + .pool thumb_func_end sub_81685D4 thumb_func_start sub_8168610 sub_8168610: @ 8168610 push {lr} - ldr r0, _0816863C + ldr r0, =0x030022c0 ldr r1, [r0, 0x4] - ldr r0, _08168640 + ldr r0, =sub_8038420 + 1 cmp r1, r0 bne _08168636 - ldr r0, _08168644 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08168636 - ldr r0, _08168648 + ldr r0, =0x0203ce7c ldrh r1, [r0] movs r0, 0x1 bl dp01_build_cmdbuf_x23_aa_0 @@ -738503,10 +713752,7 @@ _08168636: pop {r0} bx r0 .align 2, 0 -_0816863C: .4byte 0x030022c0 -_08168640: .4byte sub_8038420 + 1 -_08168644: .4byte 0x02037fd4 -_08168648: .4byte 0x0203ce7c + .pool thumb_func_end sub_8168610 thumb_func_start sub_816864C @@ -738514,9 +713760,9 @@ sub_816864C: @ 816864C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _081687E8 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r5, _081687EC + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -738529,12 +713775,12 @@ sub_816864C: @ 816864C ands r0, r1 cmp r0, 0 bne _08168684 - ldr r0, _081687F0 + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _081687F4 + ldr r0, =0x020244ec adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 @@ -738554,12 +713800,12 @@ _08168684: ands r0, r1 cmp r0, 0 bne _081686B6 - ldr r0, _081687F0 + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _081687F4 + ldr r0, =0x020244ec adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 @@ -738590,9 +713836,9 @@ _081686D2: ands r0, r1 cmp r0, 0 bne _081687DC - ldr r0, _081687F8 + ldr r0, =0x02020630 mov r8, r0 - ldr r7, _081687FC + ldr r7, =0x03005d7c adds r0, r2, r7 ldrb r1, [r0] lsls r0, r1, 4 @@ -738602,10 +713848,10 @@ _081686D2: adds r4, 0x1C adds r0, r4 ldr r3, [r0] - ldr r0, _08168800 + ldr r0, =nullsub_12 + 1 cmp r3, r0 bne _081687DC - ldr r0, _08168804 + ldr r0, =0x020241e4 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -738619,7 +713865,7 @@ _081686D2: lsls r0, 24 cmp r0, 0 beq _0816877A - ldr r0, _08168808 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -738634,19 +713880,19 @@ _081686D2: lsls r0, 2 add r0, r8 bl obj_delete_and_free_tiles - ldr r4, _0816880C + ldr r4, =0x03005d70 ldrb r0, [r5] adds r1, r6, 0 eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _081687F0 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _081687F4 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -738659,28 +713905,28 @@ _081686D2: ldrb r0, [r0] bl sub_80729D0 _0816877A: - ldr r1, _081687FC - ldr r4, _081687EC + ldr r1, =0x03005d7c + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081687F8 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles - ldr r5, _0816880C + ldr r5, =0x03005d70 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _081687F0 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _081687F4 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -738690,7 +713936,7 @@ _0816877A: adds r0, r5 ldrb r0, [r0] bl sub_80729D0 - ldr r0, _081687E8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r2, [r0, 0x8] ldrb r1, [r2, 0x9] @@ -738698,11 +713944,11 @@ _0816877A: negs r0, r0 ands r0, r1 strb r0, [r2, 0x9] - ldr r1, _08168810 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08168814 + ldr r1, =sub_8168818 + 1 str r1, [r0] _081687DC: pop {r3} @@ -738711,18 +713957,7 @@ _081687DC: pop {r0} bx r0 .align 2, 0 -_081687E8: .4byte 0x020244d0 -_081687EC: .4byte 0x02024064 -_081687F0: .4byte 0x0202406e -_081687F4: .4byte 0x020244ec -_081687F8: .4byte 0x02020630 -_081687FC: .4byte 0x03005d7c -_08168800: .4byte nullsub_12 + 1 -_08168804: .4byte 0x020241e4 -_08168808: .4byte 0x02022fec -_0816880C: .4byte 0x03005d70 -_08168810: .4byte 0x03005d60 -_08168814: .4byte sub_8168818 + 1 + .pool thumb_func_end sub_816864C thumb_func_start sub_8168818 @@ -738731,9 +713966,9 @@ sub_8168818: @ 8168818 mov r7, r8 push {r7} movs r4, 0 - ldr r2, _08168910 - ldr r0, _08168914 - ldr r1, _08168918 + ldr r2, =0x02020630 + ldr r0, =0x03005d70 + ldr r1, =0x02024064 mov r8, r1 ldrb r3, [r1] adds r0, r3, r0 @@ -738744,14 +713979,14 @@ sub_8168818: @ 8168818 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0816891C + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08168842 movs r4, 0x1 _08168842: cmp r4, 0 beq _08168904 - ldr r7, _08168920 + ldr r7, =0x020244d0 ldr r0, [r7] ldr r4, [r0, 0x4] lsls r0, r3, 1 @@ -738821,15 +714056,15 @@ _08168842: ldrb r1, [r0, 0x1] ands r4, r1 strb r4, [r0, 0x1] - ldr r4, _08168924 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - ldr r0, _08168928 + ldr r0, =c3_0802FDF4 + 1 movs r1, 0xA bl AddTask - ldr r2, _0816892C + ldr r2, =0x0202406e mov r0, r8 ldrb r1, [r0] lsls r0, r1, 1 @@ -738837,7 +714072,7 @@ _08168842: ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _08168930 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 bl dp01_tbl5_exec_completed @@ -738848,23 +714083,15 @@ _08168904: pop {r0} bx r0 .align 2, 0 -_08168910: .4byte 0x02020630 -_08168914: .4byte 0x03005d70 -_08168918: .4byte 0x02024064 -_0816891C: .4byte nullsub_12 + 1 -_08168920: .4byte 0x020244d0 -_08168924: .4byte 0x000027f9 -_08168928: .4byte c3_0802FDF4 + 1 -_0816892C: .4byte 0x0202406e -_08168930: .4byte 0x020244ec + .pool thumb_func_end sub_8168818 thumb_func_start sub_8168934 sub_8168934: @ 8168934 push {r4-r6,lr} - ldr r5, _08168974 + ldr r5, =0x02024064 ldrb r0, [r5] - ldr r6, _08168978 + ldr r6, =0x03005d70 adds r1, r0, r6 ldrb r1, [r1] movs r2, 0 @@ -738890,17 +714117,16 @@ sub_8168934: @ 8168934 bl heathbar_draw_hp b _08168996 .align 2, 0 -_08168974: .4byte 0x02024064 -_08168978: .4byte 0x03005d70 + .pool _0816897C: - ldr r2, _0816899C + ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _081689A0 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 bl dp01_tbl5_exec_completed @@ -738909,19 +714135,18 @@ _08168996: pop {r0} bx r0 .align 2, 0 -_0816899C: .4byte 0x0202406e -_081689A0: .4byte 0x020244ec + .pool thumb_func_end sub_8168934 thumb_func_start bx_blink_t5 bx_blink_t5: @ 81689A4 push {r4,lr} - ldr r1, _081689E0 - ldr r0, _081689E4 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _081689E8 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -738939,15 +714164,12 @@ bx_blink_t5: @ 81689A4 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, _081689EC + ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl5_exec_completed b _08168A1A .align 2, 0 -_081689E0: .4byte 0x020241e4 -_081689E4: .4byte 0x02024064 -_081689E8: .4byte 0x02020630 -_081689EC: .4byte 0x020244b9 + .pool _081689F0: ldrh r0, [r4, 0x30] movs r1, 0x3 @@ -738980,9 +714202,9 @@ _08168A1A: thumb_func_start sub_8168A20 sub_8168A20: @ 8168A20 push {r4-r6,lr} - ldr r0, _08168A7C + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r6, _08168A80 + ldr r6, =0x02024064 ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -738994,13 +714216,13 @@ sub_8168A20: @ 8168A20 ands r0, r1 cmp r0, 0 bne _08168A74 - ldr r5, _08168A84 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08168A88 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -739011,7 +714233,7 @@ sub_8168A20: @ 8168A20 lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r1, _08168A8C + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -739022,19 +714244,15 @@ _08168A74: pop {r0} bx r0 .align 2, 0 -_08168A7C: .4byte 0x020244d0 -_08168A80: .4byte 0x02024064 -_08168A84: .4byte 0x020241e4 -_08168A88: .4byte 0x02020630 -_08168A8C: .4byte 0x03005d70 + .pool thumb_func_end sub_8168A20 thumb_func_start sub_8168A90 sub_8168A90: @ 8168A90 push {lr} - ldr r2, _08168AB8 - ldr r1, _08168ABC - ldr r0, _08168AC0 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -739044,7 +714262,7 @@ sub_8168A90: @ 8168A90 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08168AC4 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08168AB4 bl dp01_tbl5_exec_completed @@ -739052,18 +714270,15 @@ _08168AB4: pop {r0} bx r0 .align 2, 0 -_08168AB8: .4byte 0x02020630 -_08168ABC: .4byte 0x020241e4 -_08168AC0: .4byte 0x02024064 -_08168AC4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8168A90 thumb_func_start sub_8168AC8 sub_8168AC8: @ 8168AC8 push {lr} - ldr r0, _08168AF0 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08168AF4 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -739080,22 +714295,21 @@ _08168AEA: pop {r0} bx r0 .align 2, 0 -_08168AF0: .4byte 0x020244d0 -_08168AF4: .4byte 0x02024064 + .pool thumb_func_end sub_8168AC8 thumb_func_start dp01_tbl5_exec_completed dp01_tbl5_exec_completed: @ 8168AF8 push {r4,lr} sub sp, 0x4 - ldr r1, _08168B38 - ldr r4, _08168B3C + ldr r1, =0x03005d60 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08168B40 + ldr r1, =bx_exec_buffer_A_ch0_tbl2 + 1 str r1, [r0] - ldr r0, _08168B44 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -739108,7 +714322,7 @@ dp01_tbl5_exec_completed: @ 8168AF8 movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _08168B48 + ldr r1, =0x02023064 ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -739116,14 +714330,10 @@ dp01_tbl5_exec_completed: @ 8168AF8 strb r1, [r0] b _08168B5E .align 2, 0 -_08168B38: .4byte 0x03005d60 -_08168B3C: .4byte 0x02024064 -_08168B40: .4byte bx_exec_buffer_A_ch0_tbl2 + 1 -_08168B44: .4byte 0x02022fec -_08168B48: .4byte 0x02023064 + .pool _08168B4C: - ldr r2, _08168B68 - ldr r1, _08168B6C + ldr r2, =0x02024068 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -739137,16 +714347,15 @@ _08168B5E: pop {r0} bx r0 .align 2, 0 -_08168B68: .4byte 0x02024068 -_08168B6C: .4byte 0x0832a328 + .pool thumb_func_end dp01_tbl5_exec_completed thumb_func_start sub_8168B70 sub_8168B70: @ 8168B70 push {lr} - ldr r0, _08168B98 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08168B9C + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -739163,8 +714372,7 @@ _08168B92: pop {r0} bx r0 .align 2, 0 -_08168B98: .4byte 0x020244d0 -_08168B9C: .4byte 0x02024064 + .pool thumb_func_end sub_8168B70 thumb_func_start dp01t_00_5_getattr @@ -739172,8 +714380,8 @@ dp01t_00_5_getattr: @ 8168BA0 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _08168BCC - ldr r0, _08168BD0 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -739181,7 +714389,7 @@ dp01t_00_5_getattr: @ 8168BA0 ldrb r0, [r1] cmp r0, 0 bne _08168BD8 - ldr r0, _08168BD4 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -739190,9 +714398,7 @@ dp01t_00_5_getattr: @ 8168BA0 adds r6, r0, 0 b _08168BFA .align 2, 0 -_08168BCC: .4byte 0x02023064 -_08168BD0: .4byte 0x02024064 -_08168BD4: .4byte 0x0202406e + .pool _08168BD8: ldrb r4, [r1] movs r5, 0 @@ -739237,8 +714443,8 @@ sub_8168C14: @ 8168C14 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _08168C48 - ldr r3, _08168C4C + ldr r2, =0x02023064 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -739249,14 +714455,12 @@ sub_8168C14: @ 8168C14 bl _081693AA _08168C3E: lsls r0, 2 - ldr r1, _08168C50 + ldr r1, =_08168C54 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08168C48: .4byte 0x02023064 -_08168C4C: .4byte 0x02024064 -_08168C50: .4byte _08168C54 + .pool .align 2, 0 _08168C54: .4byte _08168D44 @@ -739323,7 +714527,7 @@ _08168D44: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08168F58 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -739376,7 +714580,7 @@ _08168D90: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08168F58 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -739412,7 +714616,7 @@ _08168D90: ands r0, r6 lsls r0, 5 ldrh r2, [r3, 0x14] - ldr r1, _08168F5C + ldr r1, =0xfffffc1f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x14] @@ -739435,7 +714639,7 @@ _08168D90: ands r1, r0 lsls r1, 15 ldr r0, [sp, 0x14] - ldr r2, _08168F60 + ldr r2, =0xfff07fff ands r0, r2 orrs r0, r1 str r0, [sp, 0x14] @@ -739446,7 +714650,7 @@ _08168D90: ands r0, r6 lsls r0, 4 ldrh r2, [r3, 0x16] - ldr r1, _08168F64 + ldr r1, =0xfffffe0f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x16] @@ -739560,28 +714764,25 @@ _08168F48: bls _08168F48 b _081693AA .align 2, 0 -_08168F58: .4byte 0x020244ec -_08168F5C: .4byte 0xfffffc1f -_08168F60: .4byte 0xfff07fff -_08168F64: .4byte 0xfffffe0f + .pool _08168F68: movs r0, 0x64 muls r0, r5 - ldr r1, _08168F74 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB b _081692E2 .align 2, 0 -_08168F74: .4byte 0x020244ec + .pool _08168F78: movs r0, 0x64 muls r0, r5 - ldr r1, _08168F84 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC b _081692E2 .align 2, 0 -_08168F84: .4byte 0x020244ec + .pool _08168F88: movs r6, 0 add r2, sp, 0x58 @@ -739591,7 +714792,7 @@ _08168F88: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08168FEC + ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 _08168F9E: @@ -739615,7 +714816,7 @@ _08168F9E: ble _08168F9E movs r0, 0x64 muls r0, r5 - ldr r1, _08168FEC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -739633,11 +714834,11 @@ _08168FDC: bls _08168FDC b _081693AA .align 2, 0 -_08168FEC: .4byte 0x020244ec + .pool _08168FF0: movs r0, 0x64 muls r0, r5 - ldr r1, _08169008 + ldr r1, =0x020244ec adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -739647,13 +714848,13 @@ _08168FF0: adds r1, 0x9 b _081692E2 .align 2, 0 -_08169008: .4byte 0x020244ec + .pool _0816900C: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _08169044 + ldr r2, =0x020244ec mov r8, r2 _08169018: adds r1, r6, 0 @@ -739668,7 +714869,7 @@ _08169018: ble _08169018 movs r0, 0x64 muls r0, r5 - ldr r1, _08169044 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -739677,11 +714878,11 @@ _08169018: adds r6, 0x1 b _081693AA .align 2, 0 -_08169044: .4byte 0x020244ec + .pool _08169048: movs r0, 0x64 muls r0, r5 - ldr r1, _08169060 + ldr r1, =0x020244ec adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -739691,20 +714892,20 @@ _08169048: adds r1, 0x8 b _081693A2 .align 2, 0 -_08169060: .4byte 0x020244ec + .pool _08169064: movs r0, 0x64 muls r0, r5 - ldr r1, _08169070 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 b _0816907E .align 2, 0 -_08169070: .4byte 0x020244ec + .pool _08169074: movs r0, 0x64 muls r0, r5 - ldr r1, _081690A0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x19 _0816907E: @@ -739724,120 +714925,120 @@ _0816907E: movs r6, 0x3 b _081693AA .align 2, 0 -_081690A0: .4byte 0x020244ec + .pool _081690A4: movs r0, 0x64 muls r0, r5 - ldr r1, _081690B0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A b _081693A2 .align 2, 0 -_081690B0: .4byte 0x020244ec + .pool _081690B4: movs r0, 0x64 muls r0, r5 - ldr r1, _081690C0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B b _081693A2 .align 2, 0 -_081690C0: .4byte 0x020244ec + .pool _081690C4: movs r0, 0x64 muls r0, r5 - ldr r1, _081690D0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C b _081693A2 .align 2, 0 -_081690D0: .4byte 0x020244ec + .pool _081690D4: movs r0, 0x64 muls r0, r5 - ldr r1, _081690E0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D b _081693A2 .align 2, 0 -_081690E0: .4byte 0x020244ec + .pool _081690E4: movs r0, 0x64 muls r0, r5 - ldr r1, _081690F0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E b _081693A2 .align 2, 0 -_081690F0: .4byte 0x020244ec + .pool _081690F4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169100 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F b _081693A2 .align 2, 0 -_08169100: .4byte 0x020244ec + .pool _08169104: movs r0, 0x64 muls r0, r5 - ldr r1, _08169110 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 b _081693A2 .align 2, 0 -_08169110: .4byte 0x020244ec + .pool _08169114: movs r0, 0x64 muls r0, r5 - ldr r1, _08169120 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 b _081693A2 .align 2, 0 -_08169120: .4byte 0x020244ec + .pool _08169124: movs r0, 0x64 muls r0, r5 - ldr r1, _08169130 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 b _081693A2 .align 2, 0 -_08169130: .4byte 0x020244ec + .pool _08169134: movs r0, 0x64 muls r0, r5 - ldr r1, _08169140 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 b _081693A2 .align 2, 0 -_08169140: .4byte 0x020244ec + .pool _08169144: movs r0, 0x64 muls r0, r5 - ldr r1, _08169150 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 b _081693A2 .align 2, 0 -_08169150: .4byte 0x020244ec + .pool _08169154: movs r0, 0x64 muls r0, r5 - ldr r1, _08169160 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 b _081693A2 .align 2, 0 -_08169160: .4byte 0x020244ec + .pool _08169164: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081691B0 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -739866,83 +715067,83 @@ _08169164: movs r6, 0x6 b _081693AA .align 2, 0 -_081691B0: .4byte 0x020244ec + .pool _081691B4: movs r0, 0x64 muls r0, r5 - ldr r1, _081691C0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 b _081693A2 .align 2, 0 -_081691C0: .4byte 0x020244ec + .pool _081691C4: movs r0, 0x64 muls r0, r5 - ldr r1, _081691D0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 b _081693A2 .align 2, 0 -_081691D0: .4byte 0x020244ec + .pool _081691D4: movs r0, 0x64 muls r0, r5 - ldr r1, _081691E0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 b _081693A2 .align 2, 0 -_081691E0: .4byte 0x020244ec + .pool _081691E4: movs r0, 0x64 muls r0, r5 - ldr r1, _081691F0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A b _081693A2 .align 2, 0 -_081691F0: .4byte 0x020244ec + .pool _081691F4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169200 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B b _081693A2 .align 2, 0 -_08169200: .4byte 0x020244ec + .pool _08169204: movs r0, 0x64 muls r0, r5 - ldr r1, _08169210 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C b _081693A2 .align 2, 0 -_08169210: .4byte 0x020244ec + .pool _08169214: movs r0, 0x64 muls r0, r5 - ldr r1, _08169220 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0 b _0816923E .align 2, 0 -_08169220: .4byte 0x020244ec + .pool _08169224: movs r0, 0x64 muls r0, r5 - ldr r1, _08169230 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 b _081692E2 .align 2, 0 -_08169230: .4byte 0x020244ec + .pool _08169234: movs r0, 0x64 muls r0, r5 - ldr r1, _08169264 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x37 _0816923E: @@ -739964,74 +715165,74 @@ _0816923E: movs r6, 0x4 b _081693AA .align 2, 0 -_08169264: .4byte 0x020244ec + .pool _08169268: movs r0, 0x64 muls r0, r5 - ldr r1, _08169274 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 b _081693A2 .align 2, 0 -_08169274: .4byte 0x020244ec + .pool _08169278: movs r0, 0x64 muls r0, r5 - ldr r1, _08169284 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 b _081692E2 .align 2, 0 -_08169284: .4byte 0x020244ec + .pool _08169288: movs r0, 0x64 muls r0, r5 - ldr r1, _08169294 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A b _081692E2 .align 2, 0 -_08169294: .4byte 0x020244ec + .pool _08169298: movs r0, 0x64 muls r0, r5 - ldr r1, _081692A4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B b _081692E2 .align 2, 0 -_081692A4: .4byte 0x020244ec + .pool _081692A8: movs r0, 0x64 muls r0, r5 - ldr r1, _081692B4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C b _081692E2 .align 2, 0 -_081692B4: .4byte 0x020244ec + .pool _081692B8: movs r0, 0x64 muls r0, r5 - ldr r1, _081692C4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D b _081692E2 .align 2, 0 -_081692C4: .4byte 0x020244ec + .pool _081692C8: movs r0, 0x64 muls r0, r5 - ldr r1, _081692D4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E b _081692E2 .align 2, 0 -_081692D4: .4byte 0x020244ec + .pool _081692D8: movs r0, 0x64 muls r0, r5 - ldr r1, _081692F4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3F _081692E2: @@ -740044,101 +715245,101 @@ _081692E2: movs r6, 0x2 b _081693AA .align 2, 0 -_081692F4: .4byte 0x020244ec + .pool _081692F8: movs r0, 0x64 muls r0, r5 - ldr r1, _08169304 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 b _081693A2 .align 2, 0 -_08169304: .4byte 0x020244ec + .pool _08169308: movs r0, 0x64 muls r0, r5 - ldr r1, _08169314 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 b _081693A2 .align 2, 0 -_08169314: .4byte 0x020244ec + .pool _08169318: movs r0, 0x64 muls r0, r5 - ldr r1, _08169324 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 b _081693A2 .align 2, 0 -_08169324: .4byte 0x020244ec + .pool _08169328: movs r0, 0x64 muls r0, r5 - ldr r1, _08169334 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 b _081693A2 .align 2, 0 -_08169334: .4byte 0x020244ec + .pool _08169338: movs r0, 0x64 muls r0, r5 - ldr r1, _08169344 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F b _081693A2 .align 2, 0 -_08169344: .4byte 0x020244ec + .pool _08169348: movs r0, 0x64 muls r0, r5 - ldr r1, _08169354 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 b _081693A2 .align 2, 0 -_08169354: .4byte 0x020244ec + .pool _08169358: movs r0, 0x64 muls r0, r5 - ldr r1, _08169364 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 b _081693A2 .align 2, 0 -_08169364: .4byte 0x020244ec + .pool _08169368: movs r0, 0x64 muls r0, r5 - ldr r1, _08169374 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 b _081693A2 .align 2, 0 -_08169374: .4byte 0x020244ec + .pool _08169378: movs r0, 0x64 muls r0, r5 - ldr r1, _08169384 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 b _081693A2 .align 2, 0 -_08169384: .4byte 0x020244ec + .pool _08169388: movs r0, 0x64 muls r0, r5 - ldr r1, _08169394 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 b _081693A2 .align 2, 0 -_08169394: .4byte 0x020244ec + .pool _08169398: movs r0, 0x64 muls r0, r5 - ldr r1, _081693BC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 _081693A2: @@ -740156,7 +715357,7 @@ _081693AA: pop {r1} bx r1 .align 2, 0 -_081693BC: .4byte 0x020244ec + .pool thumb_func_end sub_8168C14 thumb_func_start sub_81693C0 @@ -740170,8 +715371,8 @@ sub_81693C0: @ 81693C0 thumb_func_start sub_81693CC sub_81693CC: @ 81693CC push {r4,r5,lr} - ldr r1, _081693F0 - ldr r0, _081693F4 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -740179,16 +715380,14 @@ sub_81693CC: @ 81693CC ldrb r0, [r1] cmp r0, 0 bne _081693FC - ldr r0, _081693F8 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_8169424 b _0816941A .align 2, 0 -_081693F0: .4byte 0x02023064 -_081693F4: .4byte 0x02024064 -_081693F8: .4byte 0x0202406e + .pool _081693FC: ldrb r4, [r1] movs r5, 0 @@ -740223,10 +715422,10 @@ sub_8169424: @ 8169424 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0816945C + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 - ldr r2, _08169460 + ldr r2, =0x02023067 adds r3, r0, r2 adds r6, r3, 0 subs r1, r2, 0x2 @@ -740238,14 +715437,12 @@ sub_8169424: @ 8169424 bl _08169DEA _08169450: lsls r0, 2 - ldr r1, _08169464 + ldr r1, =_08169468 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0816945C: .4byte 0x02024064 -_08169460: .4byte 0x02023067 -_08169464: .4byte _08169468 + .pool .align 2, 0 _08169468: .4byte _08169558 @@ -740312,7 +715509,7 @@ _08169558: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081696EC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -740379,7 +715576,7 @@ _081695BE: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081696EC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -740489,13 +715686,13 @@ _081695BE: bl pokemon_setattr b _08169DEA .align 2, 0 -_081696EC: .4byte 0x020244ec + .pool _081696F0: movs r0, 0x64 muls r0, r5 - ldr r1, _08169708 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0816970C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740503,14 +715700,13 @@ _081696F0: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169708: .4byte 0x020244ec -_0816970C: .4byte 0x02024064 + .pool _08169710: movs r0, 0x64 muls r0, r5 - ldr r1, _08169728 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0816972C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740518,8 +715714,7 @@ _08169710: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169728: .4byte 0x020244ec -_0816972C: .4byte 0x02024064 + .pool _08169730: movs r0, 0 mov r8, r0 @@ -740529,7 +715724,7 @@ _08169730: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08169784 + ldr r0, =0x020244ec adds r7, r1, r0 adds r6, r3, 0 adds r6, 0x8 @@ -740554,21 +715749,21 @@ _0816974A: ble _0816974A movs r0, 0x64 muls r0, r5 - ldr r1, _08169784 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 mov r2, r9 bl pokemon_setattr b _08169DEA .align 2, 0 -_08169784: .4byte 0x020244ec + .pool _08169788: movs r0, 0x64 muls r0, r5 - ldr r1, _081697A4 + ldr r1, =0x020244ec adds r0, r1 - ldr r3, _081697A8 - ldr r1, _081697AC + ldr r3, =0x02023064 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -740577,16 +715772,14 @@ _08169788: adds r1, 0x9 b _0816982C .align 2, 0 -_081697A4: .4byte 0x020244ec -_081697A8: .4byte 0x02023064 -_081697AC: .4byte 0x02024064 + .pool _081697B0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0816980C + ldr r0, =0x020244ec adds r4, r0 - ldr r5, _08169810 + ldr r5, =0x02024064 ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -740623,15 +715816,14 @@ _081697B0: bl pokemon_setattr b _08169DEA .align 2, 0 -_0816980C: .4byte 0x020244ec -_08169810: .4byte 0x02024064 + .pool _08169814: movs r0, 0x64 muls r0, r5 - ldr r1, _08169838 + ldr r1, =0x020244ec adds r0, r1 - ldr r3, _0816983C - ldr r1, _08169840 + ldr r3, =0x02023064 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -740644,15 +715836,13 @@ _0816982C: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169838: .4byte 0x020244ec -_0816983C: .4byte 0x02023064 -_08169840: .4byte 0x02024064 + .pool _08169844: movs r0, 0x64 muls r0, r5 - ldr r1, _0816985C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169860 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740660,14 +715850,13 @@ _08169844: bl pokemon_setattr b _08169DEA .align 2, 0 -_0816985C: .4byte 0x020244ec -_08169860: .4byte 0x02024064 + .pool _08169864: movs r0, 0x64 muls r0, r5 - ldr r1, _0816987C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169880 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740675,14 +715864,13 @@ _08169864: bl pokemon_setattr b _08169DEA .align 2, 0 -_0816987C: .4byte 0x020244ec -_08169880: .4byte 0x02024064 + .pool _08169884: movs r0, 0x64 muls r0, r5 - ldr r1, _0816989C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081698A0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740690,14 +715878,13 @@ _08169884: bl pokemon_setattr b _08169DEA .align 2, 0 -_0816989C: .4byte 0x020244ec -_081698A0: .4byte 0x02024064 + .pool _081698A4: movs r0, 0x64 muls r0, r5 - ldr r1, _081698BC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081698C0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740705,14 +715892,13 @@ _081698A4: bl pokemon_setattr b _08169DEA .align 2, 0 -_081698BC: .4byte 0x020244ec -_081698C0: .4byte 0x02024064 + .pool _081698C4: movs r0, 0x64 muls r0, r5 - ldr r1, _081698DC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081698E0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740720,14 +715906,13 @@ _081698C4: bl pokemon_setattr b _08169DEA .align 2, 0 -_081698DC: .4byte 0x020244ec -_081698E0: .4byte 0x02024064 + .pool _081698E4: movs r0, 0x64 muls r0, r5 - ldr r1, _081698FC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169900 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740735,14 +715920,13 @@ _081698E4: bl pokemon_setattr b _08169DEA .align 2, 0 -_081698FC: .4byte 0x020244ec -_08169900: .4byte 0x02024064 + .pool _08169904: movs r0, 0x64 muls r0, r5 - ldr r1, _0816991C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169920 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740750,14 +715934,13 @@ _08169904: bl pokemon_setattr b _08169DEA .align 2, 0 -_0816991C: .4byte 0x020244ec -_08169920: .4byte 0x02024064 + .pool _08169924: movs r0, 0x64 muls r0, r5 - ldr r1, _0816993C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169940 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740765,14 +715948,13 @@ _08169924: bl pokemon_setattr b _08169DEA .align 2, 0 -_0816993C: .4byte 0x020244ec -_08169940: .4byte 0x02024064 + .pool _08169944: movs r0, 0x64 muls r0, r5 - ldr r1, _0816995C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169960 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740780,14 +715962,13 @@ _08169944: bl pokemon_setattr b _08169DEA .align 2, 0 -_0816995C: .4byte 0x020244ec -_08169960: .4byte 0x02024064 + .pool _08169964: movs r0, 0x64 muls r0, r5 - ldr r1, _0816997C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169980 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740795,14 +715976,13 @@ _08169964: bl pokemon_setattr b _08169DEA .align 2, 0 -_0816997C: .4byte 0x020244ec -_08169980: .4byte 0x02024064 + .pool _08169984: movs r0, 0x64 muls r0, r5 - ldr r1, _0816999C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081699A0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740810,14 +715990,13 @@ _08169984: bl pokemon_setattr b _08169DEA .align 2, 0 -_0816999C: .4byte 0x020244ec -_081699A0: .4byte 0x02024064 + .pool _081699A4: movs r0, 0x64 muls r0, r5 - ldr r1, _081699BC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081699C0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740825,14 +716004,13 @@ _081699A4: bl pokemon_setattr b _08169DEA .align 2, 0 -_081699BC: .4byte 0x020244ec -_081699C0: .4byte 0x02024064 + .pool _081699C4: movs r0, 0x64 muls r0, r5 - ldr r1, _081699DC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081699E0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740840,14 +716018,13 @@ _081699C4: bl pokemon_setattr b _08169DEA .align 2, 0 -_081699DC: .4byte 0x020244ec -_081699E0: .4byte 0x02024064 + .pool _081699E4: movs r0, 0x64 muls r0, r5 - ldr r1, _081699FC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169A00 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740855,15 +716032,14 @@ _081699E4: bl pokemon_setattr b _08169DEA .align 2, 0 -_081699FC: .4byte 0x020244ec -_08169A00: .4byte 0x02024064 + .pool _08169A04: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08169A6C + ldr r0, =0x020244ec adds r4, r0 - ldr r5, _08169A70 + ldr r5, =0x02024064 ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -740905,14 +716081,13 @@ _08169A04: adds r0, r4, 0 b _08169B24 .align 2, 0 -_08169A6C: .4byte 0x020244ec -_08169A70: .4byte 0x02024064 + .pool _08169A74: movs r0, 0x64 muls r0, r5 - ldr r1, _08169A8C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169A90 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740920,14 +716095,13 @@ _08169A74: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169A8C: .4byte 0x020244ec -_08169A90: .4byte 0x02024064 + .pool _08169A94: movs r0, 0x64 muls r0, r5 - ldr r1, _08169AAC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169AB0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740935,14 +716109,13 @@ _08169A94: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169AAC: .4byte 0x020244ec -_08169AB0: .4byte 0x02024064 + .pool _08169AB4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169ACC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169AD0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740950,14 +716123,13 @@ _08169AB4: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169ACC: .4byte 0x020244ec -_08169AD0: .4byte 0x02024064 + .pool _08169AD4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169AEC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169AF0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740965,14 +716137,13 @@ _08169AD4: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169AEC: .4byte 0x020244ec -_08169AF0: .4byte 0x02024064 + .pool _08169AF4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169B0C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169B10 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740980,14 +716151,13 @@ _08169AF4: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169B0C: .4byte 0x020244ec -_08169B10: .4byte 0x02024064 + .pool _08169B14: movs r0, 0x64 muls r0, r5 - ldr r1, _08169B2C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169B30 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -740996,14 +716166,13 @@ _08169B24: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169B2C: .4byte 0x020244ec -_08169B30: .4byte 0x02024064 + .pool _08169B34: movs r0, 0x64 muls r0, r5 - ldr r1, _08169B4C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169B50 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741011,14 +716180,13 @@ _08169B34: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169B4C: .4byte 0x020244ec -_08169B50: .4byte 0x02024064 + .pool _08169B54: movs r0, 0x64 muls r0, r5 - ldr r1, _08169B6C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169B70 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741026,14 +716194,13 @@ _08169B54: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169B6C: .4byte 0x020244ec -_08169B70: .4byte 0x02024064 + .pool _08169B74: movs r0, 0x64 muls r0, r5 - ldr r1, _08169B8C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169B90 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741041,14 +716208,13 @@ _08169B74: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169B8C: .4byte 0x020244ec -_08169B90: .4byte 0x02024064 + .pool _08169B94: movs r0, 0x64 muls r0, r5 - ldr r1, _08169BAC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169BB0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741056,14 +716222,13 @@ _08169B94: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169BAC: .4byte 0x020244ec -_08169BB0: .4byte 0x02024064 + .pool _08169BB4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169BCC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169BD0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741071,14 +716236,13 @@ _08169BB4: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169BCC: .4byte 0x020244ec -_08169BD0: .4byte 0x02024064 + .pool _08169BD4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169BEC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169BF0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741086,14 +716250,13 @@ _08169BD4: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169BEC: .4byte 0x020244ec -_08169BF0: .4byte 0x02024064 + .pool _08169BF4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169C0C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169C10 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741101,14 +716264,13 @@ _08169BF4: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169C0C: .4byte 0x020244ec -_08169C10: .4byte 0x02024064 + .pool _08169C14: movs r0, 0x64 muls r0, r5 - ldr r1, _08169C2C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169C30 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741116,14 +716278,13 @@ _08169C14: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169C2C: .4byte 0x020244ec -_08169C30: .4byte 0x02024064 + .pool _08169C34: movs r0, 0x64 muls r0, r5 - ldr r1, _08169C4C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169C50 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741131,14 +716292,13 @@ _08169C34: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169C4C: .4byte 0x020244ec -_08169C50: .4byte 0x02024064 + .pool _08169C54: movs r0, 0x64 muls r0, r5 - ldr r1, _08169C6C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169C70 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741146,14 +716306,13 @@ _08169C54: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169C6C: .4byte 0x020244ec -_08169C70: .4byte 0x02024064 + .pool _08169C74: movs r0, 0x64 muls r0, r5 - ldr r1, _08169C8C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169C90 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741161,14 +716320,13 @@ _08169C74: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169C8C: .4byte 0x020244ec -_08169C90: .4byte 0x02024064 + .pool _08169C94: movs r0, 0x64 muls r0, r5 - ldr r1, _08169CAC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169CB0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741176,14 +716334,13 @@ _08169C94: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169CAC: .4byte 0x020244ec -_08169CB0: .4byte 0x02024064 + .pool _08169CB4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169CCC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169CD0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741191,14 +716348,13 @@ _08169CB4: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169CCC: .4byte 0x020244ec -_08169CD0: .4byte 0x02024064 + .pool _08169CD4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169CEC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169CF0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741206,14 +716362,13 @@ _08169CD4: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169CEC: .4byte 0x020244ec -_08169CF0: .4byte 0x02024064 + .pool _08169CF4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169D0C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169D10 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741221,14 +716376,13 @@ _08169CF4: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169D0C: .4byte 0x020244ec -_08169D10: .4byte 0x02024064 + .pool _08169D14: movs r0, 0x64 muls r0, r5 - ldr r1, _08169D2C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169D30 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741236,14 +716390,13 @@ _08169D14: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169D2C: .4byte 0x020244ec -_08169D30: .4byte 0x02024064 + .pool _08169D34: movs r0, 0x64 muls r0, r5 - ldr r1, _08169D4C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169D50 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741251,14 +716404,13 @@ _08169D34: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169D4C: .4byte 0x020244ec -_08169D50: .4byte 0x02024064 + .pool _08169D54: movs r0, 0x64 muls r0, r5 - ldr r1, _08169D6C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169D70 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741266,14 +716418,13 @@ _08169D54: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169D6C: .4byte 0x020244ec -_08169D70: .4byte 0x02024064 + .pool _08169D74: movs r0, 0x64 muls r0, r5 - ldr r1, _08169D8C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169D90 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741281,14 +716432,13 @@ _08169D74: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169D8C: .4byte 0x020244ec -_08169D90: .4byte 0x02024064 + .pool _08169D94: movs r0, 0x64 muls r0, r5 - ldr r1, _08169DAC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169DB0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741296,14 +716446,13 @@ _08169D94: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169DAC: .4byte 0x020244ec -_08169DB0: .4byte 0x02024064 + .pool _08169DB4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169DCC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169DD0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -741311,29 +716460,28 @@ _08169DB4: bl pokemon_setattr b _08169DEA .align 2, 0 -_08169DCC: .4byte 0x020244ec -_08169DD0: .4byte 0x02024064 + .pool _08169DD4: movs r0, 0x64 muls r0, r5 - ldr r1, _08169E14 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _08169E18 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 bl pokemon_setattr _08169DEA: - ldr r2, _08169E1C - ldr r0, _08169E18 + ldr r2, =0x0202406e + ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _08169E14 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 add sp, 0x34 @@ -741345,9 +716493,7 @@ _08169DEA: pop {r0} bx r0 .align 2, 0 -_08169E14: .4byte 0x020244ec -_08169E18: .4byte 0x02024064 -_08169E1C: .4byte 0x0202406e + .pool thumb_func_end sub_8169424 thumb_func_start sub_8169E20 @@ -741377,8 +716523,8 @@ sub_8169E38: @ 8169E38 thumb_func_start sub_8169E44 sub_8169E44: @ 8169E44 push {r4-r6,lr} - ldr r0, _08169E70 - ldr r6, _08169E74 + ldr r0, =0x02023064 + ldr r6, =0x02024064 ldrb r2, [r6] lsls r1, r2, 9 adds r0, 0x1 @@ -741390,26 +716536,23 @@ sub_8169E44: @ 8169E44 adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r0, _08169E78 + ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, _08169E7C + ldr r0, =sub_8168A20 + 1 str r0, [r1] b _08169EB6 .align 2, 0 -_08169E70: .4byte 0x02023064 -_08169E74: .4byte 0x02024064 -_08169E78: .4byte 0x03005d60 -_08169E7C: .4byte sub_8168A20 + 1 + .pool _08169E80: - ldr r5, _08169EBC + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08169EC0 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -741420,7 +716563,7 @@ _08169E80: lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r1, _08169EC4 + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -741431,15 +716574,13 @@ _08169EB6: pop {r0} bx r0 .align 2, 0 -_08169EBC: .4byte 0x020241e4 -_08169EC0: .4byte 0x02020630 -_08169EC4: .4byte 0x03005d70 + .pool thumb_func_end sub_8169E44 thumb_func_start sub_8169EC8 sub_8169EC8: @ 8169EC8 push {r4-r6,lr} - ldr r4, _08169F70 + ldr r4, =0x02024064 ldrb r1, [r4] movs r0, 0x6 bl sub_805DF84 @@ -741450,8 +716591,8 @@ sub_8169EC8: @ 8169EC8 lsrs r1, 24 movs r0, 0x6 bl template_build_for_pokemon_or_trainer - ldr r0, _08169F74 - ldr r1, _08169F78 + ldr r0, =0x0202499c + ldr r1, =0x08305d2c ldrb r1, [r1, 0x18] movs r2, 0x8 subs r2, r1 @@ -741463,11 +716604,11 @@ sub_8169EC8: @ 8169EC8 movs r1, 0x50 movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r6, _08169F7C + ldr r6, =0x020241e4 ldrb r1, [r4] adds r1, r6 strb r0, [r1] - ldr r5, _08169F80 + ldr r5, =0x02020630 ldrb r3, [r4] adds r0, r3, r6 ldrb r0, [r0] @@ -741497,7 +716638,7 @@ sub_8169EC8: @ 8169EC8 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08169F84 + ldr r1, =0x0000fffe strh r1, [r0, 0x2E] ldrb r0, [r4] adds r0, r6 @@ -741507,33 +716648,25 @@ sub_8169EC8: @ 8169EC8 lsls r0, 2 adds r5, 0x1C adds r0, r5 - ldr r1, _08169F88 + ldr r1, =sub_805D7AC + 1 str r1, [r0] - ldr r1, _08169F8C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08169F90 + ldr r1, =sub_816856C + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08169F70: .4byte 0x02024064 -_08169F74: .4byte 0x0202499c -_08169F78: .4byte 0x08305d2c -_08169F7C: .4byte 0x020241e4 -_08169F80: .4byte 0x02020630 -_08169F84: .4byte 0x0000fffe -_08169F88: .4byte sub_805D7AC + 1 -_08169F8C: .4byte 0x03005d60 -_08169F90: .4byte sub_816856C + 1 + .pool thumb_func_end sub_8169EC8 thumb_func_start dp01t_07_6_ dp01t_07_6_: @ 8169F94 push {r4-r6,lr} - ldr r4, _0816A03C + ldr r4, =0x02024064 ldrb r1, [r4] movs r0, 0x6 bl sub_805DF84 @@ -741544,8 +716677,8 @@ dp01t_07_6_: @ 8169F94 lsrs r1, 24 movs r0, 0x6 bl template_build_for_pokemon_or_trainer - ldr r0, _0816A040 - ldr r1, _0816A044 + ldr r0, =0x0202499c + ldr r1, =0x08305d2c ldrb r1, [r1, 0x18] movs r2, 0x8 subs r2, r1 @@ -741557,11 +716690,11 @@ dp01t_07_6_: @ 8169F94 movs r1, 0x50 movs r3, 0x1E bl obj_add_from_template_forward_search - ldr r6, _0816A048 + ldr r6, =0x020241e4 ldrb r1, [r4] adds r1, r6 strb r0, [r1] - ldr r5, _0816A04C + ldr r5, =0x02020630 ldrb r3, [r4] adds r0, r3, r6 ldrb r0, [r0] @@ -741582,7 +716715,7 @@ dp01t_07_6_: @ 8169F94 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0816A050 + ldr r1, =0x0000ffa0 strh r1, [r0, 0x24] ldrb r0, [r4] adds r0, r6 @@ -741601,27 +716734,19 @@ dp01t_07_6_: @ 8169F94 lsls r0, 2 adds r5, 0x1C adds r0, r5 - ldr r1, _0816A054 + ldr r1, =sub_805D7AC + 1 str r1, [r0] - ldr r1, _0816A058 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0816A05C + ldr r1, =sub_8168A90 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0816A03C: .4byte 0x02024064 -_0816A040: .4byte 0x0202499c -_0816A044: .4byte 0x08305d2c -_0816A048: .4byte 0x020241e4 -_0816A04C: .4byte 0x02020630 -_0816A050: .4byte 0x0000ffa0 -_0816A054: .4byte sub_805D7AC + 1 -_0816A058: .4byte 0x03005d60 -_0816A05C: .4byte sub_8168A90 + 1 + .pool thumb_func_end dp01t_07_6_ thumb_func_start sub_816A060 @@ -741651,15 +716776,15 @@ sub_816A078: @ 816A078 thumb_func_start sub_816A084 sub_816A084: @ 816A084 push {r4,r5,lr} - ldr r0, _0816A0C4 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x8] movs r0, 0x4 strb r0, [r1, 0x8] - ldr r1, _0816A0C8 + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] - ldr r5, _0816A0CC + ldr r5, =0x02024064 ldrb r4, [r5] movs r0, 0x1 bl battle_get_side_with_given_state @@ -741670,38 +716795,34 @@ sub_816A084: @ 816A084 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, _0816A0D0 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0816A0D4 + ldr r1, =bx_wait_t5 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0816A0C4: .4byte 0x020244d0 -_0816A0C8: .4byte 0x020244b9 -_0816A0CC: .4byte 0x02024064 -_0816A0D0: .4byte 0x03005d60 -_0816A0D4: .4byte bx_wait_t5 + 1 + .pool thumb_func_end sub_816A084 thumb_func_start sub_816A0D8 sub_816A0D8: @ 816A0D8 push {r4,r5,lr} - ldr r1, _0816A120 - ldr r5, _0816A124 + ldr r1, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r1, [r0] - ldr r0, _0816A128 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] strb r1, [r0, 0x8] - ldr r1, _0816A12C + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] ldrb r4, [r5] @@ -741714,22 +716835,17 @@ sub_816A0D8: @ 816A0D8 adds r1, r4, 0 movs r3, 0x4 bl move_anim_start_t4 - ldr r1, _0816A130 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0816A134 + ldr r1, =bx_wait_t5 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0816A120: .4byte 0x02023064 -_0816A124: .4byte 0x02024064 -_0816A128: .4byte 0x020244d0 -_0816A12C: .4byte 0x020244b9 -_0816A130: .4byte 0x03005d60 -_0816A134: .4byte bx_wait_t5 + 1 + .pool thumb_func_end sub_816A0D8 thumb_func_start sub_816A138 @@ -741743,9 +716859,9 @@ sub_816A138: @ 816A138 thumb_func_start sub_816A144 sub_816A144: @ 816A144 push {r4-r6,lr} - ldr r0, _0816A218 + ldr r0, =0x02023064 mov r12, r0 - ldr r6, _0816A21C + ldr r6, =0x02024064 ldrb r2, [r6] lsls r2, 9 adds r0, 0x1 @@ -741757,13 +716873,13 @@ sub_816A144: @ 816A144 ldrb r1, [r1] lsls r1, 8 orrs r0, r1 - ldr r5, _0816A220 + ldr r5, =0x02038432 mov r1, r12 adds r1, 0x3 adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, _0816A224 + ldr r4, =0x02038408 ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -741777,7 +716893,7 @@ sub_816A144: @ 816A144 lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, _0816A228 + ldr r4, =0x02038404 ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -741803,7 +716919,7 @@ sub_816A144: @ 816A144 lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, _0816A22C + ldr r3, =0x0203841a ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -741811,7 +716927,7 @@ sub_816A144: @ 816A144 adds r1, r2 ldrb r1, [r1] strb r1, [r3] - ldr r4, _0816A230 + ldr r4, =0x0203841c ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -741825,14 +716941,14 @@ sub_816A144: @ 816A144 lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, _0816A234 + ldr r3, =0x02038400 ldrb r2, [r6] lsls r2, 9 mov r1, r12 adds r1, 0x10 adds r2, r1 str r2, [r3] - ldr r3, _0816A238 + ldr r3, =0x020244bc ldrb r1, [r6] lsls r1, 2 adds r1, r3 @@ -741847,17 +716963,9 @@ sub_816A144: @ 816A144 bl dp01_tbl5_exec_completed b _0816A25A .align 2, 0 -_0816A218: .4byte 0x02023064 -_0816A21C: .4byte 0x02024064 -_0816A220: .4byte 0x02038432 -_0816A224: .4byte 0x02038408 -_0816A228: .4byte 0x02038404 -_0816A22C: .4byte 0x0203841a -_0816A230: .4byte 0x0203841c -_0816A234: .4byte 0x02038400 -_0816A238: .4byte 0x020244bc + .pool _0816A23C: - ldr r0, _0816A260 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -741866,20 +716974,18 @@ _0816A23C: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, _0816A264 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _0816A268 + ldr r1, =bx_move_anim_5 + 1 str r1, [r0] _0816A25A: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0816A260: .4byte 0x020244d0 -_0816A264: .4byte 0x03005d60 -_0816A268: .4byte bx_move_anim_5 + 1 + .pool thumb_func_end sub_816A144 thumb_func_start bx_move_anim_5 @@ -741888,8 +716994,8 @@ bx_move_anim_5: @ 816A26C mov r7, r9 mov r6, r8 push {r6,r7} - ldr r2, _0816A2B0 - ldr r6, _0816A2B4 + ldr r2, =0x02023064 + ldr r6, =0x02024064 ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -741902,7 +717008,7 @@ bx_move_anim_5: @ 816A26C ldrb r0, [r1] lsls r0, 8 orrs r4, r0 - ldr r7, _0816A2B8 + ldr r7, =0x020244d0 ldr r5, [r7] ldr r1, [r5, 0x4] lsls r0, r3, 1 @@ -741918,9 +717024,7 @@ bx_move_anim_5: @ 816A26C beq _0816A2C6 b _0816A3AC .align 2, 0 -_0816A2B0: .4byte 0x02023064 -_0816A2B4: .4byte 0x02024064 -_0816A2B8: .4byte 0x020244d0 + .pool _0816A2BC: cmp r2, 0x2 beq _0816A320 @@ -741973,10 +717077,10 @@ _0816A2F6: strb r1, [r0, 0x4] b _0816A3AC _0816A320: - ldr r0, _0816A368 + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _0816A36C + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _0816A3AC @@ -742008,8 +717112,7 @@ _0816A354: strb r1, [r0, 0x4] b _0816A3AC .align 2, 0 -_0816A368: .4byte 0x020383f8 -_0816A36C: .4byte 0x020383fd + .pool _0816A370: ldrb r1, [r0] movs r0, 0x40 @@ -742050,44 +717153,38 @@ _0816A3AC: thumb_func_start sub_816A3B8 sub_816A3B8: @ 816A3B8 push {r4,lr} - ldr r0, _0816A3F0 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _0816A3F4 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r4, _0816A3F8 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 9 - ldr r1, _0816A3FC + ldr r1, =0x02023066 adds r0, r1 ldrh r0, [r0] bl battle_pick_message - ldr r0, _0816A400 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _0816A404 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0816A408 + ldr r1, =sub_81685A4 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0816A3F0: .4byte 0x02022e14 -_0816A3F4: .4byte 0x02022e16 -_0816A3F8: .4byte 0x02024064 -_0816A3FC: .4byte 0x02023066 -_0816A400: .4byte 0x02022e2c -_0816A404: .4byte 0x03005d60 -_0816A408: .4byte sub_81685A4 + 1 + .pool thumb_func_end sub_816A3B8 thumb_func_start dp01t_11_5_message_for_player_only dp01t_11_5_message_for_player_only: @ 816A40C push {lr} - ldr r0, _0816A424 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -742096,7 +717193,7 @@ dp01t_11_5_message_for_player_only: @ 816A40C bl sub_816A3B8 b _0816A42C .align 2, 0 -_0816A424: .4byte 0x02024064 + .pool _0816A428: bl dp01_tbl5_exec_completed _0816A42C: @@ -742112,40 +717209,36 @@ sub_816A430: @ 816A430 lsrs r1, r0, 24 cmp r1, 0 bne _0816A456 - ldr r0, _0816A45C + ldr r0, =0x02022e14 strh r1, [r0] - ldr r1, _0816A460 + ldr r1, =0x02022e16 movs r0, 0xA0 strh r0, [r1] - ldr r1, _0816A464 - ldr r0, _0816A468 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0816A46C + ldr r1, =sub_8168444 + 1 str r1, [r0] _0816A456: pop {r0} bx r0 .align 2, 0 -_0816A45C: .4byte 0x02022e14 -_0816A460: .4byte 0x02022e16 -_0816A464: .4byte 0x03005d60 -_0816A468: .4byte 0x02024064 -_0816A46C: .4byte sub_8168444 + 1 + .pool thumb_func_end sub_816A430 thumb_func_start dp01t_12_1_battle_menu dp01t_12_1_battle_menu: @ 816A470 push {r4,lr} - ldr r1, _0816A4BC - ldr r0, _0816A4C0 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0816A4C4 + ldr r1, =sub_816A430 + 1 str r1, [r0] - ldr r0, _0816A4C8 + ldr r0, =0x085cca3a movs r1, 0x2 bl battle_show_message_maybe movs r4, 0 @@ -742156,29 +717249,23 @@ _0816A48A: adds r4, 0x1 cmp r4, 0x3 ble _0816A48A - ldr r1, _0816A4CC - ldr r0, _0816A4C0 + ldr r1, =0x020244ac + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - ldr r0, _0816A4D0 + ldr r0, =0x085cca15 bl sub_814E6F0 - ldr r0, _0816A4D4 + ldr r0, =0x02022e2c movs r1, 0x1 bl battle_show_message_maybe pop {r4} pop {r0} bx r0 .align 2, 0 -_0816A4BC: .4byte 0x03005d60 -_0816A4C0: .4byte 0x02024064 -_0816A4C4: .4byte sub_816A430 + 1 -_0816A4C8: .4byte 0x085cca3a -_0816A4CC: .4byte 0x020244ac -_0816A4D0: .4byte 0x085cca15 -_0816A4D4: .4byte 0x02022e2c + .pool thumb_func_end dp01t_12_1_battle_menu thumb_func_start sub_816A4D8 @@ -742192,7 +717279,7 @@ sub_816A4D8: @ 816A4D8 thumb_func_start sub_816A4E4 sub_816A4E4: @ 816A4E4 push {r4,lr} - ldr r4, _0816A500 + ldr r4, =0x0202449c ldr r1, [r4] adds r0, r1, 0 adds r0, 0x95 @@ -742205,7 +717292,7 @@ sub_816A4E4: @ 816A4E4 beq _0816A50A b _0816A574 .align 2, 0 -_0816A500: .4byte 0x0202449c + .pool _0816A504: cmp r0, 0x2 beq _0816A550 @@ -742228,9 +717315,9 @@ _0816A522: lsrs r1, r0, 24 cmp r1, 0 bne _0816A574 - ldr r0, _0816A548 + ldr r0, =0x02022e14 strh r1, [r0] - ldr r1, _0816A54C + ldr r1, =0x02022e16 movs r2, 0xA0 lsls r2, 1 adds r0, r2, 0 @@ -742242,8 +717329,7 @@ _0816A522: strb r0, [r1] b _0816A574 .align 2, 0 -_0816A548: .4byte 0x02022e14 -_0816A54C: .4byte 0x02022e16 + .pool _0816A550: adds r1, 0x97 ldrb r0, [r1] @@ -742277,24 +717363,21 @@ sub_816A57C: @ 816A57C movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _0816A5AC - ldr r2, _0816A5B0 + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _0816A5B4 + ldr r1, =sub_81685D4 + 1 str r1, [r0] - ldr r1, _0816A5B8 + ldr r1, =0x020244b8 ldrb r0, [r2] strb r0, [r1] add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_0816A5AC: .4byte 0x03005d60 -_0816A5B0: .4byte 0x02024064 -_0816A5B4: .4byte sub_81685D4 + 1 -_0816A5B8: .4byte 0x020244b8 + .pool thumb_func_end sub_816A57C thumb_func_start sub_816A5BC @@ -742322,8 +717405,8 @@ sub_816A5D4: @ 816A5D4 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _0816A64C - ldr r0, _0816A650 + ldr r3, =0x02023064 + ldr r0, =0x02024064 mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -742337,16 +717420,16 @@ sub_816A5D4: @ 816A5D4 orrs r1, r0 lsls r1, 16 asrs r7, r1, 16 - ldr r0, _0816A654 + ldr r0, =0x00007fff cmp r7, r0 beq _0816A664 - ldr r6, _0816A658 + ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _0816A65C + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x3A bl pokemon_getattr @@ -742363,7 +717446,7 @@ sub_816A5D4: @ 816A5D4 adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _0816A660 + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -742371,27 +717454,22 @@ sub_816A5D4: @ 816A5D4 bl sub_807294C b _0816A69E .align 2, 0 -_0816A64C: .4byte 0x02023064 -_0816A650: .4byte 0x02024064 -_0816A654: .4byte 0x00007fff -_0816A658: .4byte 0x0202406e -_0816A65C: .4byte 0x020244ec -_0816A660: .4byte 0x03005d70 + .pool _0816A664: - ldr r1, _0816A6BC + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0816A6C0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A bl pokemon_getattr adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r4, _0816A6C4 + ldr r4, =0x03005d70 adds r1, r0, r4 ldrb r1, [r1] str r7, [sp] @@ -742405,12 +717483,12 @@ _0816A664: movs r2, 0 bl heathbar_draw_hp _0816A69E: - ldr r1, _0816A6C8 - ldr r0, _0816A6CC + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0816A6D0 + ldr r1, =sub_8168934 + 1 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -742420,12 +717498,7 @@ _0816A69E: pop {r0} bx r0 .align 2, 0 -_0816A6BC: .4byte 0x0202406e -_0816A6C0: .4byte 0x020244ec -_0816A6C4: .4byte 0x03005d70 -_0816A6C8: .4byte 0x03005d60 -_0816A6CC: .4byte 0x02024064 -_0816A6D0: .4byte sub_8168934 + 1 + .pool thumb_func_end sub_816A5D4 thumb_func_start sub_816A6D4 @@ -742559,9 +717632,9 @@ sub_816A788: @ 816A788 thumb_func_start sub_816A794 sub_816A794: @ 816A794 push {r4,lr} - ldr r3, _0816A7BC - ldr r2, _0816A7C0 - ldr r4, _0816A7C4 + ldr r3, =0x02020630 + ldr r2, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -742577,11 +717650,9 @@ sub_816A794: @ 816A794 bl dp01_tbl5_exec_completed b _0816A7F2 .align 2, 0 -_0816A7BC: .4byte 0x02020630 -_0816A7C0: .4byte 0x020241e4 -_0816A7C4: .4byte 0x02024064 + .pool _0816A7C8: - ldr r1, _0816A7F8 + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -742595,20 +717666,18 @@ _0816A7C8: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, _0816A7FC + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0816A800 + ldr r1, =bx_blink_t5 + 1 str r1, [r0] _0816A7F2: pop {r4} pop {r0} bx r0 .align 2, 0 -_0816A7F8: .4byte 0x020244b9 -_0816A7FC: .4byte 0x03005d60 -_0816A800: .4byte bx_blink_t5 + 1 + .pool thumb_func_end sub_816A794 thumb_func_start sub_816A804 @@ -742622,8 +717691,8 @@ sub_816A804: @ 816A804 thumb_func_start sub_816A810 sub_816A810: @ 816A810 push {lr} - ldr r2, _0816A838 - ldr r0, _0816A83C + ldr r2, =0x02023064 + ldr r0, =0x02024064 ldrb r1, [r0] lsls r1, 9 adds r0, r2, 0x1 @@ -742639,15 +717708,14 @@ sub_816A810: @ 816A810 pop {r0} bx r0 .align 2, 0 -_0816A838: .4byte 0x02023064 -_0816A83C: .4byte 0x02024064 + .pool thumb_func_end sub_816A810 thumb_func_start sub_816A840 sub_816A840: @ 816A840 push {r4,r5,lr} - ldr r4, _0816A874 - ldr r5, _0816A878 + ldr r4, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -742669,8 +717737,7 @@ sub_816A840: @ 816A840 bl song_play_for_text b _0816A890 .align 2, 0 -_0816A874: .4byte 0x02023064 -_0816A878: .4byte 0x02024064 + .pool _0816A87C: adds r0, r4, 0x1 adds r0, r3, r0 @@ -742691,15 +717758,15 @@ _0816A890: thumb_func_start sub_816A89C sub_816A89C: @ 816A89C push {lr} - ldr r1, _0816A8CC - ldr r0, _0816A8D0 + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0816A8D4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -742711,23 +717778,21 @@ sub_816A89C: @ 816A89C pop {r0} bx r0 .align 2, 0 -_0816A8CC: .4byte 0x0202406e -_0816A8D0: .4byte 0x02024064 -_0816A8D4: .4byte 0x020244ec + .pool thumb_func_end sub_816A89C thumb_func_start dp01t_2E_5_battle_intro dp01t_2E_5_battle_intro: @ 816A8D8 push {lr} - ldr r1, _0816A900 - ldr r0, _0816A904 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r0, [r0] bl battle_intro_launch - ldr r2, _0816A908 + ldr r2, =0x020243fc ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -742736,23 +717801,21 @@ dp01t_2E_5_battle_intro: @ 816A8D8 pop {r0} bx r0 .align 2, 0 -_0816A900: .4byte 0x02023064 -_0816A904: .4byte 0x02024064 -_0816A908: .4byte 0x020243fc + .pool thumb_func_end dp01t_2E_5_battle_intro thumb_func_start sub_816A90C sub_816A90C: @ 816A90C push {r4-r7,lr} - ldr r6, _0816AA44 - ldr r7, _0816AA48 + ldr r6, =0x020241e4 + ldr r7, =0x02024064 ldrb r0, [r7] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0816AA4C + ldr r5, =0x02020630 adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r7] @@ -742771,7 +717834,7 @@ sub_816A90C: @ 816A90C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0816AA50 + ldr r1, =0x0000ffd8 strh r1, [r0, 0x32] ldrb r0, [r7] adds r0, r6 @@ -742791,7 +717854,7 @@ sub_816A90C: @ 816A90C adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0816AA54 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r2, [r7] adds r0, r2, r6 @@ -742808,7 +717871,7 @@ sub_816A90C: @ 816A90C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0816AA58 + ldr r1, =sub_805CC00 + 1 bl oamt_set_x3A_32 ldrb r0, [r7] adds r0, r6 @@ -742819,11 +717882,11 @@ sub_816A90C: @ 816A90C adds r0, r5 movs r1, 0x1 bl obj_anim_image_start - ldr r0, _0816AA5C + ldr r0, =0x0000d6f8 bl gpu_pal_alloc_new adds r4, r0, 0 lsls r4, 24 - ldr r0, _0816AA60 + ldr r0, =0x08305d8c ldr r0, [r0, 0x30] lsrs r4, 20 movs r2, 0x80 @@ -742843,19 +717906,19 @@ sub_816A90C: @ 816A90C ands r0, r2 orrs r0, r4 strb r0, [r1, 0x5] - ldr r0, _0816AA64 + ldr r0, =sub_816AC04 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r4, _0816AA68 + ldr r4, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r4 ldrb r0, [r7] strh r0, [r1, 0x8] - ldr r3, _0816AA6C + ldr r3, =0x020244d0 ldr r0, [r3] ldrb r2, [r7] ldr r1, [r0, 0x4] @@ -742868,14 +717931,14 @@ sub_816A90C: @ 816A90C ands r0, r1 cmp r0, 0 beq _0816AA24 - ldr r0, _0816AA70 + ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, _0816AA74 + ldr r1, =sub_8073C30 + 1 str r1, [r0] _0816AA24: ldr r0, [r3] @@ -742884,31 +717947,17 @@ _0816AA24: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _0816AA78 + ldr r1, =0x03005d60 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, _0816AA7C + ldr r1, =nullsub_21 + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0816AA44: .4byte 0x020241e4 -_0816AA48: .4byte 0x02024064 -_0816AA4C: .4byte 0x02020630 -_0816AA50: .4byte 0x0000ffd8 -_0816AA54: .4byte sub_80A6EEC + 1 -_0816AA58: .4byte sub_805CC00 + 1 -_0816AA5C: .4byte 0x0000d6f8 -_0816AA60: .4byte 0x08305d8c -_0816AA64: .4byte sub_816AC04 + 1 -_0816AA68: .4byte 0x03005e00 -_0816AA6C: .4byte 0x020244d0 -_0816AA70: .4byte 0x020244b4 -_0816AA74: .4byte sub_8073C30 + 1 -_0816AA78: .4byte 0x03005d60 -_0816AA7C: .4byte nullsub_21 + 1 + .pool thumb_func_end sub_816A90C thumb_func_start sub_816AA80 @@ -742921,17 +717970,17 @@ sub_816AA80: @ 816AA80 adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _0816ABD8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r6, 2 adds r0, r1 movs r1, 0 strh r1, [r0, 0x2] - ldr r0, _0816ABDC + ldr r0, =0x0202406e lsls r2, r6, 1 adds r2, r0 - ldr r0, _0816ABE0 + ldr r0, =0x02023064 lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -742940,7 +717989,7 @@ sub_816AA80: @ 816AA80 ldrh r1, [r2] movs r0, 0x64 muls r0, r1 - ldr r1, _0816ABE4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -742948,9 +717997,9 @@ sub_816AA80: @ 816AA80 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _0816ABE8 + ldr r0, =sub_805D714 + 1 bl object_new_hidden_with_callback - ldr r1, _0816ABEC + ldr r1, =0x03005d7c mov r9, r1 add r9, r6 mov r1, r9 @@ -742962,7 +718011,7 @@ sub_816AA80: @ 816AA80 lsrs r1, 24 mov r0, r8 bl sub_806A068 - ldr r0, _0816ABF0 + ldr r0, =0x0202499c mov r10, r0 adds r0, r6, 0 movs r1, 0x2 @@ -742984,10 +718033,10 @@ sub_816AA80: @ 816AA80 adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _0816ABF4 + ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] - ldr r5, _0816ABF8 + ldr r5, =0x02020630 mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -743032,7 +718081,7 @@ sub_816AA80: @ 816AA80 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0816ABFC + ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] bl obj_anim_image_start @@ -743053,7 +718102,7 @@ sub_816AA80: @ 816AA80 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0816AC00 + ldr r1, =nullsub_12 + 1 str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -743075,17 +718124,7 @@ sub_816AA80: @ 816AA80 pop {r0} bx r0 .align 2, 0 -_0816ABD8: .4byte 0x020244d0 -_0816ABDC: .4byte 0x0202406e -_0816ABE0: .4byte 0x02023064 -_0816ABE4: .4byte 0x020244ec -_0816ABE8: .4byte sub_805D714 + 1 -_0816ABEC: .4byte 0x03005d7c -_0816ABF0: .4byte 0x0202499c -_0816ABF4: .4byte 0x020241e4 -_0816ABF8: .4byte 0x02020630 -_0816ABFC: .4byte 0x020244e4 -_0816AC00: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_816AA80 thumb_func_start sub_816AC04 @@ -743093,7 +718132,7 @@ sub_816AC04: @ 816AC04 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0816AC24 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -743107,29 +718146,29 @@ sub_816AC04: @ 816AC04 strh r0, [r1, 0xA] b _0816AC5E .align 2, 0 -_0816AC24: .4byte 0x03005e00 + .pool _0816AC28: - ldr r4, _0816AC64 + ldr r4, =0x02024064 ldrb r5, [r4] ldrh r0, [r1, 0x8] strb r0, [r4] - ldr r0, _0816AC68 + ldr r0, =0x02023064 ldrb r1, [r4] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _0816AC6C + ldr r0, =0x0202406e lsls r1, 1 adds r1, r0 ldrh r0, [r1] strb r0, [r2] ldrb r0, [r4] bl sub_816AA80 - ldr r1, _0816AC70 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0816AC74 + ldr r1, =sub_816864C + 1 str r1, [r0] strb r5, [r4] adds r0, r6, 0 @@ -743139,18 +718178,14 @@ _0816AC5E: pop {r0} bx r0 .align 2, 0 -_0816AC64: .4byte 0x02024064 -_0816AC68: .4byte 0x02023064 -_0816AC6C: .4byte 0x0202406e -_0816AC70: .4byte 0x03005d60 -_0816AC74: .4byte sub_816864C + 1 + .pool thumb_func_end sub_816AC04 thumb_func_start sub_816AC78 sub_816AC78: @ 816AC78 push {r4,r5,lr} - ldr r1, _0816ACA0 - ldr r0, _0816ACA4 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -743166,12 +718201,11 @@ sub_816AC78: @ 816AC78 bl dp01_tbl5_exec_completed b _0816ACE6 .align 2, 0 -_0816ACA0: .4byte 0x02023064 -_0816ACA4: .4byte 0x02024064 + .pool _0816ACA8: - ldr r0, _0816ACEC + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r5, _0816ACF0 + ldr r5, =0x02024064 ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -743184,7 +718218,7 @@ _0816ACA8: strb r1, [r0] ldrb r0, [r5] lsls r4, r0, 9 - ldr r3, _0816ACF4 + ldr r3, =0x02023068 adds r1, r4, r3 subs r2, r3, 0x3 adds r2, r4, r2 @@ -743193,7 +718227,7 @@ _0816ACA8: adds r4, r3 ldrb r3, [r4] bl sub_80735DC - ldr r2, _0816ACF8 + ldr r2, =0x020244b4 ldrb r1, [r5] adds r1, r2 strb r0, [r1] @@ -743203,10 +718237,7 @@ _0816ACE6: pop {r0} bx r0 .align 2, 0 -_0816ACEC: .4byte 0x020244d0 -_0816ACF0: .4byte 0x02024064 -_0816ACF4: .4byte 0x02023068 -_0816ACF8: .4byte 0x020244b4 + .pool thumb_func_end sub_816AC78 thumb_func_start sub_816ACFC @@ -743237,8 +718268,8 @@ sub_816AD14: @ 816AD14 sub_816AD20: @ 816AD20 push {r4-r6,lr} sub sp, 0x4 - ldr r5, _0816AD58 - ldr r6, _0816AD5C + ldr r5, =0x02023064 + ldr r6, =0x02024064 ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -743262,14 +718293,13 @@ sub_816AD20: @ 816AD20 bl dp01_tbl5_exec_completed b _0816AD6C .align 2, 0 -_0816AD58: .4byte 0x02023064 -_0816AD5C: .4byte 0x02024064 + .pool _0816AD60: - ldr r0, _0816AD74 + ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, _0816AD78 + ldr r0, =sub_8168AC8 + 1 str r0, [r1] _0816AD6C: add sp, 0x4 @@ -743277,8 +718307,7 @@ _0816AD6C: pop {r0} bx r0 .align 2, 0 -_0816AD74: .4byte 0x03005d60 -_0816AD78: .4byte sub_8168AC8 + 1 + .pool thumb_func_end sub_816AD20 thumb_func_start sub_816AD7C @@ -743300,9 +718329,9 @@ sub_816AD88: @ 816AD88 thumb_func_start sub_816AD94 sub_816AD94: @ 816AD94 push {r4,lr} - ldr r2, _0816ADD8 - ldr r1, _0816ADDC - ldr r4, _0816ADE0 + ldr r2, =0x0202433a + ldr r1, =0x02023064 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -743314,29 +718343,24 @@ sub_816AD94: @ 816AD94 movs r0, 0x3 bl sub_80A2390 bl dp01_tbl5_exec_completed - ldr r0, _0816ADE4 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x6 ands r0, r1 cmp r0, 0x2 bne _0816ADD0 - ldr r0, _0816ADE8 + ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, _0816ADEC + ldr r0, =sub_80587B0 + 1 str r0, [r1] _0816ADD0: pop {r4} pop {r0} bx r0 .align 2, 0 -_0816ADD8: .4byte 0x0202433a -_0816ADDC: .4byte 0x02023064 -_0816ADE0: .4byte 0x02024064 -_0816ADE4: .4byte 0x02022fec -_0816ADE8: .4byte 0x03005d60 -_0816ADEC: .4byte sub_80587B0 + 1 + .pool thumb_func_end sub_816AD94 thumb_func_start nullsub_118 @@ -743348,14 +718372,14 @@ nullsub_118: @ 816ADF0 sub_816ADF4: @ 816ADF4 push {r4-r6,lr} movs r4, 0 - ldr r0, _0816AE50 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x93 lsls r1, 3 adds r0, r1 movs r1, 0x32 bl sub_80D6C7C - ldr r1, _0816AE54 + ldr r1, =0x085dfefc ldrh r0, [r1] cmp r0, 0 beq _0816AE48 @@ -743392,64 +718416,53 @@ _0816AE48: pop {r0} bx r0 .align 2, 0 -_0816AE50: .4byte 0x03005d8c -_0816AE54: .4byte 0x085dfefc + .pool thumb_func_end sub_816ADF4 thumb_func_start sub_816AE58 sub_816AE58: @ 816AE58 push {lr} - ldr r1, _0816AE80 - ldr r0, _0816AE84 + ldr r1, =0x0203bcb0 + ldr r0, =0x085dfed4 str r0, [r1] - ldr r1, _0816AE88 + ldr r1, =0x0203bcb4 movs r0, 0x4 strb r0, [r1] - ldr r0, _0816AE8C + ldr r0, =nullsub_4 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r1, _0816AE90 - ldr r2, _0816AE94 + ldr r1, =0x085e8d80 + ldr r2, =sub_816AED8 + 1 bl sub_81978EC pop {r0} bx r0 .align 2, 0 -_0816AE80: .4byte 0x0203bcb0 -_0816AE84: .4byte 0x085dfed4 -_0816AE88: .4byte 0x0203bcb4 -_0816AE8C: .4byte nullsub_4 + 1 -_0816AE90: .4byte 0x085e8d80 -_0816AE94: .4byte sub_816AED8 + 1 + .pool thumb_func_end sub_816AE58 thumb_func_start sub_816AE98 sub_816AE98: @ 816AE98 push {lr} - ldr r1, _0816AEC0 - ldr r0, _0816AEC4 + ldr r1, =0x0203bcb0 + ldr r0, =0x085dfed8 str r0, [r1] - ldr r1, _0816AEC8 + ldr r1, =0x0203bcb4 movs r0, 0x3 strb r0, [r1] - ldr r0, _0816AECC + ldr r0, =nullsub_4 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r1, _0816AED0 - ldr r2, _0816AED4 + ldr r1, =0x085e8d80 + ldr r2, =sub_816AED8 + 1 bl sub_81978EC pop {r0} bx r0 .align 2, 0 -_0816AEC0: .4byte 0x0203bcb0 -_0816AEC4: .4byte 0x085dfed8 -_0816AEC8: .4byte 0x0203bcb4 -_0816AECC: .4byte nullsub_4 + 1 -_0816AED0: .4byte 0x085e8d80 -_0816AED4: .4byte sub_816AED8 + 1 + .pool thumb_func_end sub_816AE98 thumb_func_start sub_816AED8 @@ -743463,37 +718476,35 @@ sub_816AED8: @ 816AED8 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _0816AF00 + ldr r1, =0x03005e08 adds r6, r0, r1 - ldr r0, _0816AF04 + ldr r0, =0x0203bcb4 ldrb r1, [r0] mov r8, r0 cmp r1, 0x3 bne _0816AF0C - ldr r0, _0816AF08 + ldr r0, =0x085dff24 ldr r1, [r0, 0x4] ldr r0, [r0] b _0816AF12 .align 2, 0 -_0816AF00: .4byte 0x03005e08 -_0816AF04: .4byte 0x0203bcb4 -_0816AF08: .4byte 0x085dff24 + .pool _0816AF0C: - ldr r0, _0816AF80 + ldr r0, =0x085dff24 ldr r1, [r0, 0xC] ldr r0, [r0, 0x8] _0816AF12: str r0, [sp] str r1, [sp, 0x4] - ldr r5, _0816AF84 - ldr r4, _0816AF88 + ldr r5, =0x085dfeb4 + ldr r4, =0x0203bcb0 ldr r1, [r4] mov r0, r8 ldrb r2, [r0] adds r0, r5, 0 bl sub_81DB3D8 lsls r0, 24 - ldr r2, _0816AF8C + ldr r2, =0x00ffffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -743518,12 +718529,12 @@ _0816AF12: bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0816AF90 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _0816AF94 + ldr r1, =sub_816AF98 + 1 str r1, [r0] add sp, 0x8 pop {r3} @@ -743532,12 +718543,7 @@ _0816AF12: pop {r0} bx r0 .align 2, 0 -_0816AF80: .4byte 0x085dff24 -_0816AF84: .4byte 0x085dfeb4 -_0816AF88: .4byte 0x0203bcb0 -_0816AF8C: .4byte 0x00ffffff -_0816AF90: .4byte 0x03005e00 -_0816AF94: .4byte sub_816AF98 + 1 + .pool thumb_func_end sub_816AED8 thumb_func_start sub_816AF98 @@ -743548,17 +718554,16 @@ sub_816AF98: @ 816AF98 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0816AFB8 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r0, _0816AFBC + ldr r0, =0x0203bcb4 ldrb r0, [r0] cmp r0, 0x3 bls _0816AFC0 bl ProcessMenuInput b _0816AFC4 .align 2, 0 -_0816AFB8: .4byte 0x03005e08 -_0816AFBC: .4byte 0x0203bcb4 + .pool _0816AFC0: bl ProcessMenuInputNoWrapAround _0816AFC4: @@ -743584,17 +718589,16 @@ _0816AFC4: bl Window_Remove movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0816B00C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _0816B010 + ldr r1, =sub_816B148 + 1 str r1, [r0] b _0816B04C .align 2, 0 -_0816B00C: .4byte 0x03005e00 -_0816B010: .4byte sub_816B148 + 1 + .pool _0816B014: ldrb r0, [r4, 0x8] movs r1, 0 @@ -743605,13 +718609,13 @@ _0816B014: bl Window_Remove movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _0816B054 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r2, _0816B058 - ldr r0, _0816B05C + ldr r2, =0x085dfeb4 + ldr r0, =0x0203bcb0 ldr r0, [r0] adds r0, r5 ldrb r0, [r0] @@ -743625,9 +718629,7 @@ _0816B04C: pop {r0} bx r0 .align 2, 0 -_0816B054: .4byte 0x03005e00 -_0816B058: .4byte 0x085dfeb4 -_0816B05C: .4byte 0x0203bcb0 + .pool thumb_func_end sub_816AF98 thumb_func_start sub_816B060 @@ -743635,14 +718637,13 @@ sub_816B060: @ 816B060 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0816B074 - ldr r2, _0816B078 + ldr r1, =0x085e8d80 + ldr r2, =sub_816AED8 + 1 bl sub_81978EC pop {r0} bx r0 .align 2, 0 -_0816B074: .4byte 0x085e8d80 -_0816B078: .4byte sub_816AED8 + 1 + .pool thumb_func_end sub_816B060 thumb_func_start task_pc_itemstorage @@ -743654,19 +718655,18 @@ task_pc_itemstorage: @ 816B07C adds r0, r4, 0 movs r1, 0 bl sub_816B190 - ldr r1, _0816B0A0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816B0A4 + ldr r1, =sub_816B248 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0816B0A0: .4byte 0x03005e00 -_0816B0A4: .4byte sub_816B248 + 1 + .pool thumb_func_end task_pc_itemstorage thumb_func_start sub_816B0A8 @@ -743676,21 +718676,19 @@ sub_816B0A8: @ 816B0A8 lsrs r4, r0, 24 adds r6, r4, 0 bl sub_816B510 - ldr r5, _0816B0CC + ldr r5, =0x0203bcb8 movs r1, 0 strb r0, [r5, 0x5] lsls r0, 24 cmp r0, 0 bne _0816B0D8 - ldr r1, _0816B0D0 - ldr r2, _0816B0D4 + ldr r1, =0x085eac4b + ldr r2, =sub_816B060 + 1 adds r0, r4, 0 bl sub_81978EC b _0816B12A .align 2, 0 -_0816B0CC: .4byte 0x0203bcb8 -_0816B0D0: .4byte 0x085eac4b -_0816B0D4: .4byte sub_816B060 + 1 + .pool _0816B0D8: strh r1, [r5] strh r1, [r5, 0x2] @@ -743710,20 +718708,19 @@ _0816B0D8: bl sub_8197434 adds r0, r4, 0 bl sub_816B5F8 - ldr r0, _0816B118 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0816B11C + ldr r0, =sub_816B674 + 1 str r0, [r1] b _0816B12A .align 2, 0 -_0816B118: .4byte 0x03005e00 -_0816B11C: .4byte sub_816B674 + 1 + .pool _0816B120: - ldr r1, _0816B130 - ldr r2, _0816B134 + ldr r1, =0x085eac4b + ldr r2, =sub_816B060 + 1 adds r0, r6, 0 bl sub_81978EC _0816B12A: @@ -743731,8 +718728,7 @@ _0816B12A: pop {r0} bx r0 .align 2, 0 -_0816B130: .4byte 0x085eac4b -_0816B134: .4byte sub_816B060 + 1 + .pool thumb_func_end sub_816B0A8 thumb_func_start sub_816B138 @@ -743750,28 +718746,26 @@ sub_816B148: @ 816B148 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0816B168 + ldr r0, =0x0203bcb4 ldrb r0, [r0] cmp r0, 0x4 bne _0816B180 - ldr r0, _0816B16C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 bne _0816B174 - ldr r0, _0816B170 + ldr r0, =0x081f863f bl script_env_1_execute_new_script b _0816B184 .align 2, 0 -_0816B168: .4byte 0x0203bcb4 -_0816B16C: .4byte 0x03005d90 -_0816B170: .4byte 0x081f863f + .pool _0816B174: - ldr r0, _0816B17C + ldr r0, =0x081f958f bl script_env_1_execute_new_script b _0816B184 .align 2, 0 -_0816B17C: .4byte 0x081f958f + .pool _0816B180: bl script_env_2_enable_and_set_ctx_running _0816B184: @@ -743794,19 +718788,19 @@ sub_816B190: @ 816B190 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0816B208 + ldr r0, =0x03005e08 adds r4, r0 - ldr r0, _0816B20C + ldr r0, =0x085dff24 ldr r1, [r0, 0x14] ldr r0, [r0, 0x10] str r0, [sp] str r1, [sp, 0x4] - ldr r6, _0816B210 + ldr r6, =0x085dfedc adds r0, r6, 0 movs r1, 0x4 bl GetMaxWidthInMenuTable lsls r0, 24 - ldr r2, _0816B214 + ldr r2, =0x00ffffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -743828,7 +718822,7 @@ sub_816B190: @ 816B190 bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _0816B218 + ldr r0, =0x085dfea4 lsls r5, 2 adds r5, r0 ldr r0, [r5] @@ -743838,11 +718832,7 @@ sub_816B190: @ 816B190 pop {r0} bx r0 .align 2, 0 -_0816B208: .4byte 0x03005e08 -_0816B20C: .4byte 0x085dff24 -_0816B210: .4byte 0x085dfedc -_0816B214: .4byte 0x00ffffff -_0816B218: .4byte 0x085dfea4 + .pool thumb_func_end sub_816B190 thumb_func_start sub_816B21C @@ -743894,7 +718884,7 @@ sub_816B248: @ 816B248 beq _0816B2B4 movs r0, 0x5 bl audio_play - ldr r0, _0816B294 + ldr r0, =0x085dfedc lsls r1, r4, 3 adds r0, 0x4 adds r1, r0 @@ -743903,21 +718893,21 @@ sub_816B248: @ 816B248 bl _call_via_r1 b _0816B2C0 .align 2, 0 -_0816B294: .4byte 0x085dfedc + .pool _0816B298: lsls r1, r5, 24 lsls r0, r2, 24 asrs r2, r0, 24 cmp r1, r0 beq _0816B2C0 - ldr r0, _0816B2B0 + ldr r0, =0x085dfea4 lsls r1, r2, 2 adds r1, r0 ldr r0, [r1] bl sub_816B21C b _0816B2C0 .align 2, 0 -_0816B2B0: .4byte 0x085dfea4 + .pool _0816B2B4: movs r0, 0x5 bl audio_play @@ -743934,12 +718924,12 @@ sub_816B2C8: @ 816B2C8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0816B2E8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _0816B2EC + ldr r0, =sub_816B2F0 + 1 str r0, [r1] movs r0, 0x1 movs r1, 0 @@ -743947,8 +718937,7 @@ sub_816B2C8: @ 816B2C8 pop {r0} bx r0 .align 2, 0 -_0816B2E8: .4byte 0x03005e00 -_0816B2EC: .4byte sub_816B2F0 + 1 + .pool thumb_func_end sub_816B2C8 thumb_func_start sub_816B2F0 @@ -743956,7 +718945,7 @@ sub_816B2F0: @ 816B2F0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0816B318 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -743971,23 +718960,21 @@ _0816B310: pop {r0} bx r0 .align 2, 0 -_0816B318: .4byte 0x02037fd4 + .pool thumb_func_end sub_816B2F0 thumb_func_start sub_816B31C sub_816B31C: @ 816B31C push {lr} - ldr r0, _0816B330 - ldr r1, _0816B334 + ldr r0, =0x03005dac + ldr r1, =mapldr_080EBC0C + 1 str r1, [r0] - ldr r0, _0816B338 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0816B330: .4byte 0x03005dac -_0816B334: .4byte mapldr_080EBC0C + 1 -_0816B338: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_816B31C thumb_func_start mapldr_080EBC0C @@ -743997,7 +718984,7 @@ mapldr_080EBC0C: @ 816B33C movs r0, 0 movs r1, 0x1 bl sub_81973C4 - ldr r0, _0816B364 + ldr r0, =sub_816B368 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -744008,7 +718995,7 @@ mapldr_080EBC0C: @ 816B33C pop {r0} bx r0 .align 2, 0 -_0816B364: .4byte sub_816B368 + 1 + .pool thumb_func_end mapldr_080EBC0C thumb_func_start sub_816B368 @@ -744021,20 +719008,19 @@ sub_816B368: @ 816B368 lsrs r0, 24 cmp r0, 0x1 bne _0816B388 - ldr r0, _0816B390 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0816B394 + ldr r0, =sub_816B248 + 1 str r0, [r1] _0816B388: pop {r4} pop {r0} bx r0 .align 2, 0 -_0816B390: .4byte 0x03005e00 -_0816B394: .4byte sub_816B248 + 1 + .pool thumb_func_end sub_816B368 thumb_func_start sub_816B398 @@ -744045,7 +719031,7 @@ sub_816B398: @ 816B398 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0816B3C0 + ldr r0, =0x03005e08 adds r4, r0 bl sub_80D6CE4 lsls r0, 24 @@ -744058,12 +719044,12 @@ sub_816B398: @ 816B398 bl sub_816B430 b _0816B3D4 .align 2, 0 -_0816B3C0: .4byte 0x03005e08 + .pool _0816B3C4: adds r0, r5, 0 bl sub_816B4DC - ldr r1, _0816B3DC - ldr r2, _0816B3E0 + ldr r1, =0x085eabd1 + ldr r2, =task_pc_itemstorage + 1 adds r0, r5, 0 bl sub_81978EC _0816B3D4: @@ -744071,8 +719057,7 @@ _0816B3D4: pop {r0} bx r0 .align 2, 0 -_0816B3DC: .4byte 0x085eabd1 -_0816B3E0: .4byte task_pc_itemstorage + 1 + .pool thumb_func_end sub_816B398 thumb_func_start sub_816B3E4 @@ -744083,7 +719068,7 @@ sub_816B3E4: @ 816B3E4 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0816B40C + ldr r0, =0x03005e08 adds r4, r0 bl sub_80D6CE4 lsls r0, 24 @@ -744096,12 +719081,12 @@ sub_816B3E4: @ 816B3E4 bl sub_816B430 b _0816B420 .align 2, 0 -_0816B40C: .4byte 0x03005e08 + .pool _0816B410: adds r0, r5, 0 bl sub_816B4DC - ldr r1, _0816B428 - ldr r2, _0816B42C + ldr r1, =0x085eabd1 + ldr r2, =task_pc_itemstorage + 1 adds r0, r5, 0 bl sub_81978EC _0816B420: @@ -744109,8 +719094,7 @@ _0816B420: pop {r0} bx r0 .align 2, 0 -_0816B428: .4byte 0x085eabd1 -_0816B42C: .4byte task_pc_itemstorage + 1 + .pool thumb_func_end sub_816B3E4 thumb_func_start sub_816B430 @@ -744124,12 +719108,12 @@ sub_816B430: @ 816B430 lsls r5, r4, 2 adds r5, r4 lsls r5, 3 - ldr r6, _0816B494 + ldr r6, =0x03005e08 adds r0, r5, r6 strh r1, [r0, 0x6] adds r0, r4, 0 bl sub_816B4DC - ldr r1, _0816B498 + ldr r1, =0x0203bcb8 movs r0, 0 strh r0, [r1] strh r0, [r1, 0x2] @@ -744140,7 +719124,7 @@ sub_816B430: @ 816B430 bl sub_816BC14 bl gpu_pal_allocator_reset__manage_upper_four bl sub_8122328 - ldr r0, _0816B49C + ldr r0, =0x0203bcc4 ldr r0, [r0] movs r1, 0xCD lsls r1, 3 @@ -744152,16 +719136,13 @@ sub_816B430: @ 816B430 bl sub_8197434 subs r6, 0x8 adds r5, r6 - ldr r0, _0816B4A0 + ldr r0, =sub_816C158 + 1 str r0, [r5] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0816B494: .4byte 0x03005e08 -_0816B498: .4byte 0x0203bcb8 -_0816B49C: .4byte 0x0203bcc4 -_0816B4A0: .4byte sub_816C158 + 1 + .pool thumb_func_end sub_816B430 thumb_func_start sub_816B4A4 @@ -744182,14 +719163,14 @@ sub_816B4A4: @ 816B4A4 thumb_func_start sub_816B4C0 sub_816B4C0: @ 816B4C0 push {lr} - ldr r1, _0816B4D0 + ldr r1, =0x0203bcb8 ldrb r0, [r1, 0x5] cmp r0, 0x7 bls _0816B4D4 movs r0, 0x8 b _0816B4D6 .align 2, 0 -_0816B4D0: .4byte 0x0203bcb8 + .pool _0816B4D4: adds r0, 0x1 _0816B4D6: @@ -744206,7 +719187,7 @@ sub_816B4DC: @ 816B4DC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0816B50C + ldr r0, =0x03005e08 adds r4, r0 ldrb r0, [r4, 0x8] movs r1, 0 @@ -744221,7 +719202,7 @@ sub_816B4DC: @ 816B4DC pop {r0} bx r0 .align 2, 0 -_0816B50C: .4byte 0x03005e08 + .pool thumb_func_end sub_816B4DC thumb_func_start sub_816B510 @@ -744229,7 +719210,7 @@ sub_816B510: @ 816B510 push {r4,lr} movs r2, 0 movs r1, 0x6 - ldr r0, _0816B548 + ldr r0, =0x03005d8c ldr r3, [r0] movs r4, 0xB0 lsls r4, 6 @@ -744256,7 +719237,7 @@ _0816B534: pop {r1} bx r1 .align 2, 0 -_0816B548: .4byte 0x03005d8c + .pool thumb_func_end sub_816B510 thumb_func_start sub_816B54C @@ -744275,13 +719256,13 @@ _0816B55A: mov r8, r1 cmp r4, 0xF bhi _0816B5D4 - ldr r0, _0816B5F0 + ldr r0, =0x03005d8c mov r10, r0 lsls r0, r2, 3 adds r0, r2 lsls r0, 2 mov r12, r0 - ldr r6, _0816B5F4 + ldr r6, =0x00002be0 _0816B574: mov r1, r10 ldr r1, [r1] @@ -744347,8 +719328,7 @@ _0816B5D4: pop {r0} bx r0 .align 2, 0 -_0816B5F0: .4byte 0x03005d8c -_0816B5F4: .4byte 0x00002be0 + .pool thumb_func_end sub_816B54C thumb_func_start sub_816B5F8 @@ -744365,7 +719345,7 @@ sub_816B5F8: @ 816B5F8 lsrs r4, 24 movs r0, 0x1 bl sub_81D1C84 - ldr r6, _0816B668 + ldr r6, =0x085eab4e movs r0, 0x1 adds r1, r6, 0 movs r2, 0x40 @@ -744384,10 +719364,10 @@ sub_816B5F8: @ 816B5F8 bl Print movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r4, _0816B66C + ldr r4, =0x0203bcb8 adds r0, r4, 0 bl sub_81D1DC0 - ldr r2, _0816B670 + ldr r2, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -744402,9 +719382,7 @@ sub_816B5F8: @ 816B5F8 pop {r0} bx r0 .align 2, 0 -_0816B668: .4byte 0x085eab4e -_0816B66C: .4byte 0x0203bcb8 -_0816B670: .4byte 0x03005e00 + .pool thumb_func_end sub_816B5F8 thumb_func_start sub_816B674 @@ -744420,11 +719398,11 @@ sub_816B674: @ 816B674 adds r0, r5 lsls r0, 3 mov r9, r0 - ldr r0, _0816B6C8 + ldr r0, =0x03005e08 mov r10, r0 mov r4, r9 add r4, r10 - ldr r0, _0816B6CC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -744434,7 +719412,7 @@ sub_816B674: @ 816B674 bl sub_81AE604 adds r6, r0, 0 ldrb r0, [r4, 0xA] - ldr r7, _0816B6D0 + ldr r7, =0x0203bcba subs r1, r7, 0x2 mov r8, r1 adds r1, r7, 0 @@ -744449,9 +719427,7 @@ sub_816B674: @ 816B674 bne _0816B6EA b _0816B71E .align 2, 0 -_0816B6C8: .4byte 0x03005e08 -_0816B6CC: .4byte 0x02037fd4 -_0816B6D0: .4byte 0x0203bcba + .pool _0816B6D4: movs r0, 0x5 bl audio_play @@ -744480,7 +719456,7 @@ _0816B6EA: mov r0, r10 subs r0, 0x8 add r0, r9 - ldr r1, _0816B72C + ldr r1, =sub_816B730 + 1 str r1, [r0] _0816B71E: pop {r3-r5} @@ -744491,7 +719467,7 @@ _0816B71E: pop {r0} bx r0 .align 2, 0 -_0816B72C: .4byte sub_816B730 + 1 + .pool thumb_func_end sub_816B674 thumb_func_start sub_816B730 @@ -744500,9 +719476,9 @@ sub_816B730: @ 816B730 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _0816B77C - ldr r2, _0816B780 - ldr r1, _0816B784 + ldr r5, =0x02021cc4 + ldr r2, =0x03005d8c + ldr r1, =0x0203bcb8 ldrh r0, [r1] adds r0, 0x6 ldrh r1, [r1, 0x2] @@ -744512,18 +719488,18 @@ sub_816B730: @ 816B730 lsls r1, 2 ldr r0, [r2] adds r1, r0 - ldr r0, _0816B788 + ldr r0, =0x00002bf2 adds r1, r0 adds r0, r5, 0 bl gf_strcpy adds r0, r5, 0 movs r1, 0 bl sub_81DB554 - ldr r5, _0816B78C - ldr r1, _0816B790 + ldr r5, =0x02021fc4 + ldr r1, =0x085eac63 adds r0, r5, 0 bl ExpandTextCodes - ldr r2, _0816B794 + ldr r2, =sub_816B7DC + 1 adds r0, r4, 0 adds r1, r5, 0 bl sub_81978EC @@ -744531,13 +719507,7 @@ sub_816B730: @ 816B730 pop {r0} bx r0 .align 2, 0 -_0816B77C: .4byte 0x02021cc4 -_0816B780: .4byte 0x03005d8c -_0816B784: .4byte 0x0203bcb8 -_0816B788: .4byte 0x00002bf2 -_0816B78C: .4byte 0x02021fc4 -_0816B790: .4byte 0x085eac63 -_0816B794: .4byte sub_816B7DC + 1 + .pool thumb_func_end sub_816B730 thumb_func_start sub_816B798 @@ -744549,7 +719519,7 @@ sub_816B798: @ 816B798 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _0816B7D8 + ldr r0, =0x03005e08 adds r4, r0 movs r0, 0 bl sub_81D1D04 @@ -744568,7 +719538,7 @@ sub_816B798: @ 816B798 pop {r0} bx r0 .align 2, 0 -_0816B7D8: .4byte 0x03005e08 + .pool thumb_func_end sub_816B798 thumb_func_start sub_816B7DC @@ -744582,7 +719552,7 @@ sub_816B7DC: @ 816B7DC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r2, _0816B820 + ldr r2, =0x085dff04 adds r0, r4, 0 movs r1, 0x4 bl PrintMenuTable @@ -744592,20 +719562,18 @@ sub_816B7DC: @ 816B7DC bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0816B824 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0816B828 + ldr r1, =sub_816B82C + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0816B820: .4byte 0x085dff04 -_0816B824: .4byte 0x03005e00 -_0816B828: .4byte sub_816B82C + 1 + .pool thumb_func_end sub_816B7DC thumb_func_start sub_816B82C @@ -744632,7 +719600,7 @@ sub_816B82C: @ 816B82C _0816B858: movs r0, 0x5 bl audio_play - ldr r0, _0816B874 + ldr r0, =0x085dff04 lsls r1, r4, 3 adds r0, 0x4 adds r1, r0 @@ -744644,7 +719612,7 @@ _0816B86E: pop {r0} bx r0 .align 2, 0 -_0816B874: .4byte 0x085dff04 + .pool thumb_func_end sub_816B82C thumb_func_start sub_816B878 @@ -744656,19 +719624,18 @@ sub_816B878: @ 816B878 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r1, _0816B89C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816B8A0 + ldr r1, =sub_816B8A4 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0816B89C: .4byte 0x03005e00 -_0816B8A0: .4byte sub_816B8A4 + 1 + .pool thumb_func_end sub_816B878 thumb_func_start sub_816B8A4 @@ -744676,7 +719643,7 @@ sub_816B8A4: @ 816B8A4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0816B8EC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -744684,8 +719651,8 @@ sub_816B8A4: @ 816B8A4 bne _0816B8E6 bl sub_81D1EC0 bl overworld_free_bg_tilemaps - ldr r2, _0816B8F0 - ldr r1, _0816B8F4 + ldr r2, =0x03005d8c + ldr r1, =0x0203bcb8 ldrh r0, [r1] adds r0, 0x6 ldrh r1, [r1, 0x2] @@ -744693,11 +719660,11 @@ sub_816B8A4: @ 816B8A4 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _0816B8F8 + ldr r0, =0x00002be0 adds r1, r0 ldr r0, [r2] adds r0, r1 - ldr r1, _0816B8FC + ldr r1, =sub_816B900 + 1 movs r2, 0x1 bl sub_8121478 adds r0, r4, 0 @@ -744707,39 +719674,33 @@ _0816B8E6: pop {r0} bx r0 .align 2, 0 -_0816B8EC: .4byte 0x02037fd4 -_0816B8F0: .4byte 0x03005d8c -_0816B8F4: .4byte 0x0203bcb8 -_0816B8F8: .4byte 0x00002be0 -_0816B8FC: .4byte sub_816B900 + 1 + .pool thumb_func_end sub_816B8A4 thumb_func_start sub_816B900 sub_816B900: @ 816B900 push {lr} - ldr r0, _0816B914 - ldr r1, _0816B918 + ldr r0, =0x03005dac + ldr r1, =pal_fill_for_maplights_or_black + 1 str r1, [r0] - ldr r0, _0816B91C + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0816B914: .4byte 0x03005dac -_0816B918: .4byte pal_fill_for_maplights_or_black + 1 -_0816B91C: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_816B900 thumb_func_start pal_fill_for_maplights_or_black pal_fill_for_maplights_or_black: @ 816B920 push {r4,lr} bl sub_81973A4 - ldr r0, _0816B94C + ldr r0, =task00_080EBBDC + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0816B950 + ldr r0, =0x0203bcb8 ldrb r0, [r0, 0x5] bl sub_81D1C44 lsls r0, 24 @@ -744750,8 +719711,7 @@ pal_fill_for_maplights_or_black: @ 816B920 bl sub_816B5F8 b _0816B95A .align 2, 0 -_0816B94C: .4byte task00_080EBBDC + 1 -_0816B950: .4byte 0x0203bcb8 + .pool _0816B954: adds r0, r4, 0 bl remove_task @@ -744772,20 +719732,19 @@ task00_080EBBDC: @ 816B964 lsrs r0, 24 cmp r0, 0x1 bne _0816B984 - ldr r0, _0816B98C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0816B990 + ldr r0, =sub_816B674 + 1 str r0, [r1] _0816B984: pop {r4} pop {r0} bx r0 .align 2, 0 -_0816B98C: .4byte 0x03005e00 -_0816B990: .4byte sub_816B674 + 1 + .pool thumb_func_end task00_080EBBDC thumb_func_start sub_816B994 @@ -744793,14 +719752,13 @@ sub_816B994: @ 816B994 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0816B9A8 - ldr r2, _0816B9AC + ldr r1, =0x085eac8d + ldr r2, =sub_816B9B0 + 1 bl sub_81978EC pop {r0} bx r0 .align 2, 0 -_0816B9A8: .4byte 0x085eac8d -_0816B9AC: .4byte sub_816B9B0 + 1 + .pool thumb_func_end sub_816B994 thumb_func_start sub_816B9B0 @@ -744810,19 +719768,18 @@ sub_816B9B0: @ 816B9B0 lsls r4, 24 lsrs r4, 24 bl sub_8197930 - ldr r1, _0816B9D0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816B9D4 + ldr r1, =sub_816B9D8 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0816B9D0: .4byte 0x03005e00 -_0816B9D4: .4byte sub_816B9D8 + 1 + .pool thumb_func_end sub_816B9B0 thumb_func_start sub_816B9D8 @@ -744865,8 +719822,8 @@ sub_816BA18: @ 816BA18 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _0816BA54 - ldr r4, _0816BA58 + ldr r2, =0x03005d8c + ldr r4, =0x0203bcb8 ldrh r1, [r4] adds r1, 0x6 ldrh r0, [r4, 0x2] @@ -744874,7 +719831,7 @@ sub_816BA18: @ 816BA18 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0816BA5C + ldr r1, =0x00002be0 adds r0, r1 ldr r1, [r2] adds r5, r1, r0 @@ -744884,20 +719841,16 @@ sub_816BA18: @ 816BA18 lsls r0, 24 cmp r0, 0 bne _0816BA68 - ldr r1, _0816BA60 - ldr r2, _0816BA64 + ldr r1, =0x085eacb5 + ldr r2, =sub_816BBD4 + 1 adds r0, r6, 0 bl sub_81978EC b _0816BA9C .align 2, 0 -_0816BA54: .4byte 0x03005d8c -_0816BA58: .4byte 0x0203bcb8 -_0816BA5C: .4byte 0x00002be0 -_0816BA60: .4byte 0x085eacb5 -_0816BA64: .4byte sub_816BBD4 + 1 + .pool _0816BA68: - ldr r1, _0816BAA4 - ldr r2, _0816BAA8 + ldr r1, =0x085eacc8 + ldr r2, =sub_816BBD4 + 1 adds r0, r6, 0 bl sub_81978EC adds r0, r5, 0 @@ -744924,8 +719877,7 @@ _0816BA9C: pop {r0} bx r0 .align 2, 0 -_0816BAA4: .4byte 0x085eacc8 -_0816BAA8: .4byte sub_816BBD4 + 1 + .pool thumb_func_end sub_816BA18 thumb_func_start sub_816BAAC @@ -744954,20 +719906,19 @@ _0816BAD4: movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _0816BAF0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0816BAF4 + ldr r0, =sub_816BAF8 + 1 str r0, [r1] _0816BAEA: pop {r4} pop {r0} bx r0 .align 2, 0 -_0816BAF0: .4byte 0x03005e00 -_0816BAF4: .4byte sub_816BAF8 + 1 + .pool thumb_func_end sub_816BABC thumb_func_start sub_816BAF8 @@ -744975,7 +719926,7 @@ sub_816BAF8: @ 816BAF8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0816BB24 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -744991,34 +719942,32 @@ _0816BB1C: pop {r0} bx r0 .align 2, 0 -_0816BB24: .4byte 0x02037fd4 + .pool thumb_func_end sub_816BAF8 thumb_func_start sub_816BB28 sub_816BB28: @ 816BB28 push {lr} - ldr r0, _0816BB3C - ldr r1, _0816BB40 + ldr r0, =0x03005dac + ldr r1, =sub_816BB48 + 1 str r1, [r0] - ldr r0, _0816BB44 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0816BB3C: .4byte 0x03005dac -_0816BB40: .4byte sub_816BB48 + 1 -_0816BB44: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_816BB28 thumb_func_start sub_816BB48 sub_816BB48: @ 816BB48 push {r4-r6,lr} - ldr r0, _0816BBA0 + ldr r0, =task00_080EBBDC + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _0816BBA4 + ldr r5, =0x0203bcb8 ldrb r4, [r5, 0x5] bl sub_816B510 strb r0, [r5, 0x5] @@ -745040,7 +719989,7 @@ _0816BB7E: adds r0, r6, 0 bl sub_816B4C0 bl sub_81973A4 - ldr r0, _0816BBA4 + ldr r0, =0x0203bcb8 ldrb r0, [r0, 0x5] bl sub_81D1C44 lsls r0, 24 @@ -745051,8 +720000,7 @@ _0816BB7E: bl sub_816B5F8 b _0816BBAE .align 2, 0 -_0816BBA0: .4byte task00_080EBBDC + 1 -_0816BBA4: .4byte 0x0203bcb8 + .pool _0816BBA8: adds r0, r6, 0 bl remove_task @@ -745068,14 +720016,13 @@ sub_816BBB8: @ 816BBB8 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0816BBCC - ldr r2, _0816BBD0 + ldr r1, =0x085e8de9 + ldr r2, =sub_816BBD4 + 1 bl sub_81978EC pop {r0} bx r0 .align 2, 0 -_0816BBCC: .4byte 0x085e8de9 -_0816BBD0: .4byte sub_816BBD4 + 1 + .pool thumb_func_end sub_816BBB8 thumb_func_start sub_816BBD4 @@ -745093,25 +720040,24 @@ sub_816BBD4: @ 816BBD4 bl sub_816B5F8 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0816BC0C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816BC10 + ldr r1, =sub_816B674 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0816BC0C: .4byte 0x03005e00 -_0816BC10: .4byte sub_816B674 + 1 + .pool thumb_func_end sub_816BBD4 thumb_func_start sub_816BC14 sub_816BC14: @ 816BC14 push {r4,lr} - ldr r4, _0816BC4C + ldr r4, =0x0203bcc4 movs r0, 0xCE lsls r0, 3 bl malloc_and_clear @@ -745123,12 +720069,12 @@ sub_816BC14: @ 816BC14 movs r2, 0x6 bl memset ldr r0, [r4] - ldr r1, _0816BC50 + ldr r1, =0x00000666 adds r0, r1 movs r1, 0xFF strb r1, [r0] ldr r0, [r4] - ldr r1, _0816BC54 + ldr r1, =0x00000667 adds r0, r1 movs r1, 0x1 negs r1, r1 @@ -745137,9 +720083,7 @@ sub_816BC14: @ 816BC14 pop {r0} bx r0 .align 2, 0 -_0816BC4C: .4byte 0x0203bcc4 -_0816BC50: .4byte 0x00000666 -_0816BC54: .4byte 0x00000667 + .pool thumb_func_end sub_816BC14 thumb_func_start sub_816BC58 @@ -745153,14 +720097,14 @@ _0816BC5C: adds r4, 0x1 cmp r4, 0x5 bls _0816BC5C - ldr r0, _0816BC78 + ldr r0, =0x0203bcc4 ldr r0, [r0] bl free pop {r4} pop {r0} bx r0 .align 2, 0 -_0816BC78: .4byte 0x0203bcc4 + .pool thumb_func_end sub_816BC58 thumb_func_start sub_816BC7C @@ -745168,7 +720112,7 @@ sub_816BC7C: @ 816BC7C push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0816BCBC + ldr r0, =0x0203bcc4 movs r3, 0xCC lsls r3, 3 adds r1, r2, r3 @@ -745178,7 +720122,7 @@ sub_816BC7C: @ 816BC7C cmp r0, 0xFF bne _0816BCB4 lsls r0, r2, 3 - ldr r1, _0816BCC0 + ldr r1, =0x085dff5c adds r0, r1 bl Window_AddFromTemplate strb r0, [r4] @@ -745196,8 +720140,7 @@ _0816BCB4: pop {r1} bx r1 .align 2, 0 -_0816BCBC: .4byte 0x0203bcc4 -_0816BCC0: .4byte 0x085dff5c + .pool thumb_func_end sub_816BC7C thumb_func_start sub_816BCC4 @@ -745205,7 +720148,7 @@ sub_816BCC4: @ 816BCC4 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _0816BD00 + ldr r1, =0x0203bcc4 movs r2, 0xCC lsls r2, 3 adds r0, r2 @@ -745229,19 +720172,19 @@ _0816BCF8: pop {r0} bx r0 .align 2, 0 -_0816BD00: .4byte 0x0203bcc4 + .pool thumb_func_end sub_816BCC4 thumb_func_start sub_816BD04 sub_816BD04: @ 816BD04 push {r4-r6,lr} movs r6, 0 - ldr r0, _0816BDB0 + ldr r0, =0x0203bcb8 ldrb r0, [r0, 0x5] subs r0, 0x1 cmp r6, r0 bge _0816BD58 - ldr r5, _0816BDB4 + ldr r5, =0x0203bcc4 _0816BD14: lsls r4, r6, 1 adds r4, r6 @@ -745251,7 +720194,7 @@ _0816BD14: adds r4, r0 ldr r0, [r5] adds r0, r4 - ldr r1, _0816BDB8 + ldr r1, =0x03005d8c ldr r1, [r1] lsls r2, r6, 2 adds r1, r2 @@ -745271,13 +720214,13 @@ _0816BD14: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _0816BDB0 + ldr r0, =0x0203bcb8 ldrb r0, [r0, 0x5] subs r0, 0x1 cmp r6, r0 blt _0816BD14 _0816BD58: - ldr r5, _0816BDB4 + ldr r5, =0x0203bcc4 lsls r4, r6, 1 adds r4, r6 lsls r4, 3 @@ -745286,7 +720229,7 @@ _0816BD58: adds r4, r3 ldr r0, [r5] adds r0, r4 - ldr r1, _0816BDBC + ldr r1, =0x085e8cf7 bl gf_strcpy ldr r0, [r5] lsls r2, r6, 3 @@ -745298,9 +720241,9 @@ _0816BD58: movs r1, 0x2 negs r1, r1 str r1, [r0] - ldr r4, _0816BDC0 + ldr r4, =0x03006310 adds r1, r4, 0 - ldr r0, _0816BDC4 + ldr r0, =0x085dff44 ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} ldm r0!, {r2,r3,r6} @@ -745308,7 +720251,7 @@ _0816BD58: movs r0, 0 bl sub_816BC7C strb r0, [r4, 0x10] - ldr r1, _0816BDB0 + ldr r1, =0x0203bcb8 ldrb r0, [r1, 0x5] strh r0, [r4, 0xC] ldr r0, [r5] @@ -745319,12 +720262,7 @@ _0816BD58: pop {r0} bx r0 .align 2, 0 -_0816BDB0: .4byte 0x0203bcb8 -_0816BDB4: .4byte 0x0203bcc4 -_0816BDB8: .4byte 0x03005d8c -_0816BDBC: .4byte 0x085e8cf7 -_0816BDC0: .4byte 0x03006310 -_0816BDC4: .4byte 0x085dff44 + .pool thumb_func_end sub_816BD04 thumb_func_start sub_816BDC8 @@ -745350,9 +720288,9 @@ sub_816BDDC: @ 816BDDC movs r0, 0x5 bl audio_play _0816BDEE: - ldr r0, _0816BE20 + ldr r0, =0x0203bcc4 ldr r0, [r0] - ldr r1, _0816BE24 + ldr r1, =0x00000666 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF @@ -745362,7 +720300,7 @@ _0816BDEE: negs r0, r0 cmp r4, r0 beq _0816BE2C - ldr r0, _0816BE28 + ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r4, 2 adds r0, r1 @@ -745373,11 +720311,9 @@ _0816BDEE: bl sub_816C060 b _0816BE32 .align 2, 0 -_0816BE20: .4byte 0x0203bcc4 -_0816BE24: .4byte 0x00000666 -_0816BE28: .4byte 0x03005d8c + .pool _0816BE2C: - ldr r0, _0816BE40 + ldr r0, =0x0000ffff bl sub_816C060 _0816BE32: adds r0, r4, 0 @@ -745387,7 +720323,7 @@ _0816BE38: pop {r0} bx r0 .align 2, 0 -_0816BE40: .4byte 0x0000ffff + .pool thumb_func_end sub_816BDDC thumb_func_start fish4_goto_x5_or_x6 @@ -745403,9 +720339,9 @@ fish4_goto_x5_or_x6: @ 816BE44 negs r0, r0 cmp r4, r0 beq _0816BED4 - ldr r0, _0816BE7C + ldr r0, =0x0203bcc4 ldr r0, [r0] - ldr r1, _0816BE80 + ldr r1, =0x00000666 adds r0, r1 ldrb r1, [r0] cmp r1, 0xFF @@ -745420,27 +720356,26 @@ fish4_goto_x5_or_x6: @ 816BE44 bl sub_816BFE0 b _0816BE8E .align 2, 0 -_0816BE7C: .4byte 0x0203bcc4 -_0816BE80: .4byte 0x00000666 + .pool _0816BE84: adds r0, r5, 0 movs r1, 0xFF movs r2, 0xFF bl sub_816BFE0 _0816BE8E: - ldr r0, _0816BEDC - ldr r1, _0816BEE0 + ldr r0, =0x02021cc4 + ldr r1, =0x03005d8c ldr r1, [r1] lsls r2, r4, 2 adds r1, r2 - ldr r2, _0816BEE4 + ldr r2, =0x0000049a adds r1, r2 ldrh r1, [r1] movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string - ldr r4, _0816BEE8 - ldr r1, _0816BEEC + ldr r4, =0x02021fc4 + ldr r1, =0x085e8da0 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x7 @@ -745465,11 +720400,7 @@ _0816BED4: pop {r0} bx r0 .align 2, 0 -_0816BEDC: .4byte 0x02021cc4 -_0816BEE0: .4byte 0x03005d8c -_0816BEE4: .4byte 0x0000049a -_0816BEE8: .4byte 0x02021fc4 -_0816BEEC: .4byte 0x085e8da0 + .pool thumb_func_end fish4_goto_x5_or_x6 thumb_func_start sub_816BEF0 @@ -745477,16 +720408,16 @@ sub_816BEF0: @ 816BEF0 push {r4,r5,lr} sub sp, 0xC adds r1, r0, 0 - ldr r0, _0816BF20 + ldr r0, =0x0203bcc4 ldr r0, [r0] - ldr r2, _0816BF24 + ldr r2, =0x00000661 adds r0, r2 ldrb r5, [r0] movs r0, 0x2 negs r0, r0 cmp r1, r0 beq _0816BF2C - ldr r0, _0816BF28 + ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, 2 adds r0, r1 @@ -745497,11 +720428,9 @@ sub_816BEF0: @ 816BEF0 bl itemid_get_description b _0816BF32 .align 2, 0 -_0816BF20: .4byte 0x0203bcc4 -_0816BF24: .4byte 0x00000661 -_0816BF28: .4byte 0x03005d8c + .pool _0816BF2C: - ldr r0, _0816BF5C + ldr r0, =0x0000ffff bl sub_816C228 _0816BF32: adds r4, r0, 0 @@ -745523,14 +720452,14 @@ _0816BF32: pop {r0} bx r0 .align 2, 0 -_0816BF5C: .4byte 0x0000ffff + .pool thumb_func_end sub_816BEF0 thumb_func_start sub_816BF60 sub_816BF60: @ 816BF60 push {r4,lr} sub sp, 0x10 - ldr r4, _0816BF94 + ldr r4, =0x0203bcb8 ldrb r0, [r4, 0x9] cmp r0, 0xFF bne _0816BF8C @@ -745538,7 +720467,7 @@ sub_816BF60: @ 816BF60 ldrb r1, [r4, 0x4] subs r0, r1 str r0, [sp] - ldr r0, _0816BF98 + ldr r0, =0x000013f8 str r0, [sp, 0x4] str r0, [sp, 0x8] adds r0, r4, 0x2 @@ -745555,14 +720484,13 @@ _0816BF8C: pop {r0} bx r0 .align 2, 0 -_0816BF94: .4byte 0x0203bcb8 -_0816BF98: .4byte 0x000013f8 + .pool thumb_func_end sub_816BF60 thumb_func_start sub_816BF9C sub_816BF9C: @ 816BF9C push {r4,lr} - ldr r4, _0816BFB4 + ldr r4, =0x0203bcb8 ldrb r0, [r4, 0x9] cmp r0, 0xFF beq _0816BFAE @@ -745574,7 +720502,7 @@ _0816BFAE: pop {r0} bx r0 .align 2, 0 -_0816BFB4: .4byte 0x0203bcb8 + .pool thumb_func_end sub_816BF9C thumb_func_start sub_816BFB8 @@ -745609,7 +720537,7 @@ sub_816BFE0: @ 816BFE0 lsrs r1, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, _0816C02C + ldr r0, =0x0203bcc4 ldr r0, [r0] movs r3, 0xCC lsls r3, 3 @@ -745637,17 +720565,17 @@ sub_816BFE0: @ 816BFE0 bl Window_FillPixelRect b _0816C050 .align 2, 0 -_0816C02C: .4byte 0x0203bcc4 + .pool _0816C030: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] - ldr r0, _0816C058 + ldr r0, =0x085dff8c str r0, [sp, 0x8] lsls r0, r2, 24 asrs r0, 24 str r0, [sp, 0xC] - ldr r0, _0816C05C + ldr r0, =0x085e8d60 str r0, [sp, 0x10] adds r0, r5, 0 movs r1, 0x1 @@ -745660,8 +720588,7 @@ _0816C050: pop {r0} bx r0 .align 2, 0 -_0816C058: .4byte 0x085dff8c -_0816C05C: .4byte 0x085e8d60 + .pool thumb_func_end sub_816BFE0 thumb_func_start sub_816C060 @@ -745669,14 +720596,14 @@ sub_816C060: @ 816C060 push {r4-r6,lr} lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _0816C0B8 + ldr r0, =0x0203bcc4 ldr r0, [r0] - ldr r1, _0816C0BC + ldr r1, =0x00000667 adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF bne _0816C0B2 - ldr r4, _0816C0C0 + ldr r4, =0x000013f6 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -745690,7 +720617,7 @@ sub_816C060: @ 816C060 cmp r2, 0x40 beq _0816C0B2 strb r2, [r5] - ldr r0, _0816C0C4 + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -745709,23 +720636,20 @@ _0816C0B2: pop {r0} bx r0 .align 2, 0 -_0816C0B8: .4byte 0x0203bcc4 -_0816C0BC: .4byte 0x00000667 -_0816C0C0: .4byte 0x000013f6 -_0816C0C4: .4byte 0x02020630 + .pool thumb_func_end sub_816C060 thumb_func_start sub_816C0C8 sub_816C0C8: @ 816C0C8 push {r4,r5,lr} - ldr r0, _0816C100 + ldr r0, =0x0203bcc4 ldr r0, [r0] - ldr r1, _0816C104 + ldr r1, =0x00000667 adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF beq _0816C0FA - ldr r4, _0816C108 + ldr r4, =0x000013f6 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -745734,7 +720658,7 @@ sub_816C0C8: @ 816C0C8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0816C10C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles movs r0, 0xFF @@ -745744,10 +720668,7 @@ _0816C0FA: pop {r0} bx r0 .align 2, 0 -_0816C100: .4byte 0x0203bcc4 -_0816C104: .4byte 0x00000667 -_0816C108: .4byte 0x000013f6 -_0816C10C: .4byte 0x02020630 + .pool thumb_func_end sub_816C0C8 thumb_func_start sub_816C110 @@ -745755,12 +720676,12 @@ sub_816C110: @ 816C110 push {lr} sub sp, 0x4 bl sub_80D6E84 - ldr r0, _0816C138 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x93 lsls r1, 3 adds r0, r1 - ldr r2, _0816C13C + ldr r2, =0x0203bcbc adds r3, r2, 0x1 movs r1, 0x8 str r1, [sp] @@ -745770,14 +720691,13 @@ sub_816C110: @ 816C110 pop {r0} bx r0 .align 2, 0 -_0816C138: .4byte 0x03005d8c -_0816C13C: .4byte 0x0203bcbc + .pool thumb_func_end sub_816C110 thumb_func_start sub_816C140 sub_816C140: @ 816C140 push {lr} - ldr r0, _0816C154 + ldr r0, =0x0203bcba subs r1, r0, 0x2 ldrb r2, [r1, 0x4] ldrb r3, [r1, 0x5] @@ -745785,7 +720705,7 @@ sub_816C140: @ 816C140 pop {r0} bx r0 .align 2, 0 -_0816C154: .4byte 0x0203bcba + .pool thumb_func_end sub_816C140 thumb_func_start sub_816C158 @@ -745797,7 +720717,7 @@ sub_816C158: @ 816C158 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0816C200 + ldr r1, =0x03005e08 adds r7, r0, r1 movs r4, 0 _0816C16C: @@ -745809,19 +720729,19 @@ _0816C16C: bls _0816C16C movs r1, 0x6 ldrsh r0, [r7, r1] - ldr r5, _0816C204 + ldr r5, =0x085eab71 cmp r0, 0 bne _0816C186 - ldr r5, _0816C208 + ldr r5, =0x085eab63 _0816C186: movs r0, 0x1 adds r1, r5, 0 movs r2, 0x68 bl sub_81DB35C adds r3, r0, 0 - ldr r4, _0816C20C + ldr r4, =0x0203bcc4 ldr r0, [r4] - ldr r1, _0816C210 + ldr r1, =0x00000663 adds r0, r1 ldrb r0, [r0] lsls r3, 24 @@ -745835,7 +720755,7 @@ _0816C186: adds r2, r5, 0 bl Print ldr r0, [r4] - ldr r1, _0816C214 + ldr r1, =0x00000662 adds r0, r1 ldrb r0, [r0] movs r1, 0x2 @@ -745843,8 +720763,8 @@ _0816C186: bl sub_816C110 bl sub_816C140 bl sub_816BD04 - ldr r0, _0816C218 - ldr r2, _0816C21C + ldr r0, =0x03006310 + ldr r2, =0x0203bcb8 ldrh r1, [r2, 0x2] ldrh r2, [r2] bl calls_per_item_funcs_in_list_outer @@ -745854,28 +720774,19 @@ _0816C186: bl sub_816BF60 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0816C220 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _0816C224 + ldr r1, =sub_816C30C + 1 str r1, [r0] add sp, 0xC pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0816C200: .4byte 0x03005e08 -_0816C204: .4byte 0x085eab71 -_0816C208: .4byte 0x085eab63 -_0816C20C: .4byte 0x0203bcc4 -_0816C210: .4byte 0x00000663 -_0816C214: .4byte 0x00000662 -_0816C218: .4byte 0x03006310 -_0816C21C: .4byte 0x0203bcb8 -_0816C220: .4byte 0x03005e00 -_0816C224: .4byte sub_816C30C + 1 + .pool thumb_func_end sub_816C158 thumb_func_start sub_816C228 @@ -745883,18 +720794,17 @@ sub_816C228: @ 816C228 push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r2, _0816C240 + ldr r2, =0xffff0009 adds r0, r1, r2 cmp r0, 0x8 bhi _0816C2B4 lsls r0, 2 - ldr r1, _0816C244 + ldr r1, =_0816C248 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0816C240: .4byte 0xffff0009 -_0816C244: .4byte _0816C248 + .pool .align 2, 0 _0816C248: .4byte _0816C2AC @@ -745907,50 +720817,50 @@ _0816C248: .4byte _0816C274 .4byte _0816C26C _0816C26C: - ldr r0, _0816C270 + ldr r0, =0x085e8d62 b _0816C2BA .align 2, 0 -_0816C270: .4byte 0x085e8d62 + .pool _0816C274: - ldr r0, _0816C278 + ldr r0, =0x085eac09 b _0816C2BA .align 2, 0 -_0816C278: .4byte 0x085eac09 + .pool _0816C27C: - ldr r0, _0816C280 + ldr r0, =0x085eac22 b _0816C2BA .align 2, 0 -_0816C280: .4byte 0x085eac22 + .pool _0816C284: - ldr r0, _0816C288 + ldr r0, =0x085e8ee0 b _0816C2BA .align 2, 0 -_0816C288: .4byte 0x085e8ee0 + .pool _0816C28C: - ldr r0, _0816C290 + ldr r0, =0x085e8ef9 b _0816C2BA .align 2, 0 -_0816C290: .4byte 0x085e8ef9 + .pool _0816C294: - ldr r0, _0816C298 + ldr r0, =0x085eabe7 b _0816C2BA .align 2, 0 -_0816C298: .4byte 0x085eabe7 + .pool _0816C29C: - ldr r0, _0816C2A0 + ldr r0, =0x085e8eb9 b _0816C2BA .align 2, 0 -_0816C2A0: .4byte 0x085e8eb9 + .pool _0816C2A4: - ldr r0, _0816C2A8 + ldr r0, =0x085e8f0e b _0816C2BA .align 2, 0 -_0816C2A8: .4byte 0x085e8f0e + .pool _0816C2AC: - ldr r0, _0816C2B0 + ldr r0, =0x085e8dfe b _0816C2BA .align 2, 0 -_0816C2B0: .4byte 0x085e8dfe + .pool _0816C2B4: adds r0, r1, 0 bl itemid_get_description @@ -745964,15 +720874,15 @@ sub_816C2C0: @ 816C2C0 push {r4-r6,lr} sub sp, 0xC adds r6, r0, 0 - ldr r0, _0816C300 + ldr r0, =0x0203bcc4 ldr r0, [r0] - ldr r1, _0816C304 + ldr r1, =0x00000661 adds r0, r1 ldrb r5, [r0] adds r0, r5, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r4, _0816C308 + ldr r4, =0x02021fc4 adds r0, r4, 0 adds r1, r6, 0 bl ExpandTextCodes @@ -745991,9 +720901,7 @@ sub_816C2C0: @ 816C2C0 pop {r0} bx r0 .align 2, 0 -_0816C300: .4byte 0x0203bcc4 -_0816C304: .4byte 0x00000661 -_0816C308: .4byte 0x02021fc4 + .pool thumb_func_end sub_816C2C0 thumb_func_start sub_816C30C @@ -746004,16 +720912,16 @@ sub_816C30C: @ 816C30C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0816C350 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r0, _0816C354 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 cmp r0, 0 beq _0816C35C ldrb r0, [r4, 0xA] - ldr r1, _0816C358 + ldr r1, =0x0203bcba subs r4, r1, 0x2 adds r2, r4, 0 bl get_coro_args_x18_x1A @@ -746030,15 +720938,13 @@ sub_816C30C: @ 816C30C bl sub_816C450 b _0816C39E .align 2, 0 -_0816C350: .4byte 0x03005e08 -_0816C354: .4byte 0x030022c0 -_0816C358: .4byte 0x0203bcba + .pool _0816C35C: ldrb r0, [r4, 0xA] bl sub_81AE604 adds r6, r0, 0 ldrb r0, [r4, 0xA] - ldr r1, _0816C380 + ldr r1, =0x0203bcba subs r2, r1, 0x2 bl get_coro_args_x18_x1A movs r0, 0x2 @@ -746050,7 +720956,7 @@ _0816C35C: bne _0816C392 b _0816C39E .align 2, 0 -_0816C380: .4byte 0x0203bcba + .pool _0816C384: movs r0, 0x5 bl audio_play @@ -746076,7 +720982,7 @@ bx_battle_menu_t3: @ 816C3A4 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _0816C3D8 + ldr r1, =0x03005e08 adds r5, r0, r1 bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -746094,26 +721000,25 @@ bx_battle_menu_t3: @ 816C3A4 bl sub_816B190 b _0816C3E4 .align 2, 0 -_0816C3D8: .4byte 0x03005e08 + .pool _0816C3DC: adds r0, r4, 0 movs r1, 0x2 bl sub_816B190 _0816C3E4: - ldr r0, _0816C3F8 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0816C3FC + ldr r0, =sub_816B248 + 1 str r0, [r1] _0816C3F2: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0816C3F8: .4byte 0x03005e00 -_0816C3FC: .4byte sub_816B248 + 1 + .pool thumb_func_end bx_battle_menu_t3 thumb_func_start sub_816C400 @@ -746124,7 +721029,7 @@ sub_816C400: @ 816C400 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r6, _0816C444 + ldr r6, =0x03005e08 adds r5, r4, r6 bl sub_816C0C8 bl sub_816BF9C @@ -746132,7 +721037,7 @@ sub_816C400: @ 816C400 movs r1, 0 movs r2, 0 bl sub_81AE6C8 - ldr r0, _0816C448 + ldr r0, =0x0203bcc4 ldr r0, [r0] movs r1, 0xCD lsls r1, 3 @@ -746142,15 +721047,13 @@ sub_816C400: @ 816C400 bl sub_816BC58 subs r6, 0x8 adds r4, r6 - ldr r0, _0816C44C + ldr r0, =bx_battle_menu_t3 + 1 str r0, [r4] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0816C444: .4byte 0x03005e08 -_0816C448: .4byte 0x0203bcc4 -_0816C44C: .4byte bx_battle_menu_t3 + 1 + .pool thumb_func_end sub_816C400 thumb_func_start sub_816C450 @@ -746164,7 +721067,7 @@ sub_816C450: @ 816C450 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _0816C4DC + ldr r0, =0x03005e08 mov r8, r0 adds r1, r4, 0 add r1, r8 @@ -746173,13 +721076,13 @@ sub_816C450: @ 816C450 movs r1, 0x10 movs r2, 0x1 bl sub_81AF15C - ldr r6, _0816C4E0 + ldr r6, =0x0203bcc4 ldr r2, [r6] - ldr r1, _0816C4E4 + ldr r1, =0x0203bcb8 ldrb r0, [r1] ldrb r1, [r1, 0x2] adds r0, r1 - ldr r5, _0816C4E8 + ldr r5, =0x00000666 adds r2, r5 strb r0, [r2] mov r1, r9 @@ -746191,7 +721094,7 @@ sub_816C450: @ 816C450 adds r0, r5 ldrb r0, [r0] bl sub_816C690 - ldr r0, _0816C4EC + ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, [r6] adds r0, r5 @@ -746202,16 +721105,16 @@ sub_816C450: @ 816C450 lsls r0, 3 adds r1, r0 ldrh r0, [r1] - ldr r1, _0816C4F0 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _0816C4F4 + ldr r0, =0x0000fff7 bl sub_816C228 bl sub_816C2C0 movs r1, 0x8 negs r1, r1 add r8, r1 add r4, r8 - ldr r0, _0816C4F8 + ldr r0, =sub_816C4FC + 1 str r0, [r4] pop {r3,r4} mov r8, r3 @@ -746220,14 +721123,7 @@ sub_816C450: @ 816C450 pop {r0} bx r0 .align 2, 0 -_0816C4DC: .4byte 0x03005e08 -_0816C4E0: .4byte 0x0203bcc4 -_0816C4E4: .4byte 0x0203bcb8 -_0816C4E8: .4byte 0x00000666 -_0816C4EC: .4byte 0x03005d8c -_0816C4F0: .4byte 0x02021cc4 -_0816C4F4: .4byte 0x0000fff7 -_0816C4F8: .4byte sub_816C4FC + 1 + .pool thumb_func_end sub_816C450 thumb_func_start sub_816C4FC @@ -746238,33 +721134,31 @@ sub_816C4FC: @ 816C4FC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0816C524 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r7, _0816C528 + ldr r7, =0x030022c0 ldrh r1, [r7, 0x2E] movs r0, 0x4 ands r0, r1 cmp r0, 0 beq _0816C530 ldrb r0, [r4, 0xA] - ldr r1, _0816C52C + ldr r1, =0x0203bcba subs r2, r1, 0x2 bl get_coro_args_x18_x1A b _0816C57E .align 2, 0 -_0816C524: .4byte 0x03005e08 -_0816C528: .4byte 0x030022c0 -_0816C52C: .4byte 0x0203bcba + .pool _0816C530: ldrb r0, [r4, 0xA] bl sub_81AE604 adds r6, r0, 0 ldrb r0, [r4, 0xA] - ldr r1, _0816C56C + ldr r1, =0x0203bcba subs r4, r1, 0x2 adds r2, r4, 0 bl get_coro_args_x18_x1A - ldr r0, _0816C570 + ldr r0, =0x0203bcc4 ldr r0, [r0] movs r1, 0xCD lsls r1, 3 @@ -746283,8 +721177,7 @@ _0816C530: bne _0816C592 b _0816C59A .align 2, 0 -_0816C56C: .4byte 0x0203bcba -_0816C570: .4byte 0x0203bcc4 + .pool _0816C574: ldrh r1, [r7, 0x2E] movs r0, 0x1 @@ -746324,10 +721217,10 @@ sub_816C5A0: @ 816C5A0 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _0816C670 + ldr r1, =0x03005e08 adds r0, r1 mov r8, r0 - ldr r4, _0816C674 + ldr r4, =0x0203bcb8 ldrh r0, [r4] ldrh r1, [r4, 0x2] adds r0, r1 @@ -746342,9 +721235,9 @@ sub_816C5A0: @ 816C5A0 bl sub_81AE6C8 cmp r5, 0 bne _0816C60A - ldr r1, _0816C678 + ldr r1, =0x0203bcc4 ldr r0, [r1] - ldr r2, _0816C67C + ldr r2, =0x00000666 adds r0, r2 ldrb r2, [r0] adds r4, r1, 0 @@ -746353,7 +721246,7 @@ sub_816C5A0: @ 816C5A0 subs r0, r6, 0x1 cmp r2, r0 beq _0816C60A - ldr r0, _0816C680 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x93 lsls r1, 3 @@ -746363,15 +721256,15 @@ sub_816C5A0: @ 816C5A0 bl sub_80D702C bl sub_816BD04 _0816C60A: - ldr r0, _0816C678 + ldr r0, =0x0203bcc4 ldr r1, [r0] - ldr r2, _0816C67C + ldr r2, =0x00000666 adds r1, r2 ldrb r1, [r1] adds r4, r0, 0 cmp r1, r6 bcs _0816C622 - ldr r1, _0816C674 + ldr r1, =0x0203bcb8 ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] @@ -746384,12 +721277,12 @@ _0816C622: movs r2, 0x1 bl sub_81223FC ldr r0, [r4] - ldr r2, _0816C67C + ldr r2, =0x00000666 adds r0, r2 movs r1, 0xFF strb r1, [r0] - ldr r0, _0816C684 - ldr r2, _0816C674 + ldr r0, =0x03006310 + ldr r2, =0x0203bcb8 ldrh r1, [r2, 0x2] ldrh r2, [r2] bl calls_per_item_funcs_in_list_outer @@ -746399,12 +721292,12 @@ _0816C622: strh r0, [r1, 0xA] movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _0816C688 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _0816C68C + ldr r1, =sub_816C30C + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -746412,14 +721305,7 @@ _0816C622: pop {r0} bx r0 .align 2, 0 -_0816C670: .4byte 0x03005e08 -_0816C674: .4byte 0x0203bcb8 -_0816C678: .4byte 0x0203bcc4 -_0816C67C: .4byte 0x00000666 -_0816C680: .4byte 0x03005d8c -_0816C684: .4byte 0x03006310 -_0816C688: .4byte 0x03005e00 -_0816C68C: .4byte sub_816C30C + 1 + .pool thumb_func_end sub_816C5A0 thumb_func_start sub_816C690 @@ -746427,7 +721313,7 @@ sub_816C690: @ 816C690 push {lr} adds r3, r0, 0 lsls r3, 24 - ldr r0, _0816C6B8 + ldr r0, =0x0203bcc4 ldr r0, [r0] movs r1, 0xCD lsls r1, 3 @@ -746443,7 +721329,7 @@ sub_816C690: @ 816C690 pop {r0} bx r0 .align 2, 0 -_0816C6B8: .4byte 0x0203bcc4 + .pool thumb_func_end sub_816C690 thumb_func_start sub_816C6BC @@ -746461,10 +721347,10 @@ sub_816C6BC: @ 816C6BC lsrs r5, 24 lsls r3, 24 lsrs r3, 24 - ldr r0, _0816C710 + ldr r0, =0x02021cc4 bl decimal_int_to_string - ldr r4, _0816C714 - ldr r1, _0816C718 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8da0 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -746487,9 +721373,7 @@ sub_816C6BC: @ 816C6BC pop {r0} bx r0 .align 2, 0 -_0816C710: .4byte 0x02021cc4 -_0816C714: .4byte 0x02021fc4 -_0816C718: .4byte 0x085e8da0 + .pool thumb_func_end sub_816C6BC thumb_func_start sub_816C71C @@ -746501,9 +721385,9 @@ sub_816C71C: @ 816C71C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0816C764 + ldr r1, =0x03005e08 adds r6, r0, r1 - ldr r1, _0816C768 + ldr r1, =0x0203bcb8 ldrh r0, [r1, 0x2] ldrh r1, [r1] adds r0, r1 @@ -746516,11 +721400,11 @@ sub_816C71C: @ 816C71C ldrsh r0, [r6, r1] cmp r0, 0 bne _0816C798 - ldr r0, _0816C76C + ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r4, 2 adds r1, r0 - ldr r2, _0816C770 + ldr r2, =0x0000049a adds r0, r1, r2 ldrh r0, [r0] cmp r0, 0x1 @@ -746529,30 +721413,26 @@ sub_816C71C: @ 816C71C bl sub_816C8FC b _0816C7FE .align 2, 0 -_0816C764: .4byte 0x03005e08 -_0816C768: .4byte 0x0203bcb8 -_0816C76C: .4byte 0x03005d8c -_0816C770: .4byte 0x0000049a + .pool _0816C774: movs r2, 0x93 lsls r2, 3 adds r0, r1, r2 ldrh r0, [r0] - ldr r1, _0816C790 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _0816C794 + ldr r0, =0x0000fffe bl sub_816C228 bl sub_816C2C0 b _0816C7D4 .align 2, 0 -_0816C790: .4byte 0x02021cc4 -_0816C794: .4byte 0x0000fffe + .pool _0816C798: - ldr r0, _0816C7B4 + ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r4, 2 adds r1, r0 - ldr r2, _0816C7B8 + ldr r2, =0x0000049a adds r0, r1, r2 ldrh r0, [r0] cmp r0, 0x1 @@ -746561,16 +721441,15 @@ _0816C798: bl sub_816C9B8 b _0816C7FE .align 2, 0 -_0816C7B4: .4byte 0x03005d8c -_0816C7B8: .4byte 0x0000049a + .pool _0816C7BC: movs r2, 0x93 lsls r2, 3 adds r0, r1, r2 ldrh r0, [r0] - ldr r1, _0816C808 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _0816C80C + ldr r0, =0x0000fffc bl sub_816C228 bl sub_816C2C0 _0816C7D4: @@ -746586,12 +721465,12 @@ _0816C7D4: movs r2, 0x2 movs r3, 0x8 bl sub_816C6BC - ldr r1, _0816C810 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0816C814 + ldr r1, =sub_816C818 + 1 str r1, [r0] _0816C7FE: add sp, 0x8 @@ -746599,10 +721478,7 @@ _0816C7FE: pop {r0} bx r0 .align 2, 0 -_0816C808: .4byte 0x02021cc4 -_0816C80C: .4byte 0x0000fffc -_0816C810: .4byte 0x03005e00 -_0816C814: .4byte sub_816C818 + 1 + .pool thumb_func_end sub_816C71C thumb_func_start sub_816C818 @@ -746618,20 +721494,20 @@ sub_816C818: @ 816C818 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0816C878 + ldr r1, =0x03005e08 adds r6, r0, r1 - ldr r0, _0816C87C + ldr r0, =0x0203bcb8 ldrh r2, [r0, 0x2] ldrh r0, [r0] adds r2, r0 lsls r2, 16 adds r0, r6, 0x4 - ldr r1, _0816C880 + ldr r1, =0x03005d8c mov r8, r1 ldr r1, [r1] lsrs r7, r2, 14 adds r1, r7 - ldr r2, _0816C884 + ldr r2, =0x0000049a adds r1, r2 ldrh r1, [r1] bl sub_8122034 @@ -746652,12 +721528,9 @@ sub_816C818: @ 816C818 bl sub_816C6BC b _0816C8EC .align 2, 0 -_0816C878: .4byte 0x03005e08 -_0816C87C: .4byte 0x0203bcb8 -_0816C880: .4byte 0x03005d8c -_0816C884: .4byte 0x0000049a + .pool _0816C888: - ldr r0, _0816C8B0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -746675,7 +721548,7 @@ _0816C888: bl sub_816C8FC b _0816C8EC .align 2, 0 -_0816C8B0: .4byte 0x030022c0 + .pool _0816C8B4: adds r0, r5, 0 bl sub_816C9B8 @@ -746720,15 +721593,15 @@ sub_816C8FC: @ 816C8FC lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r0, _0816C970 + ldr r0, =0x03005e08 mov r8, r0 adds r4, r6, r0 - ldr r0, _0816C974 + ldr r0, =0x0203bcb8 ldrh r1, [r0, 0x2] ldrh r0, [r0] adds r1, r0 lsls r1, 16 - ldr r7, _0816C978 + ldr r7, =0x03005d8c ldr r0, [r7] lsrs r5, r1, 14 adds r0, r5 @@ -746748,40 +721621,34 @@ sub_816C8FC: @ 816C8FC lsls r2, 3 adds r0, r2 ldrh r0, [r0] - ldr r1, _0816C97C + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _0816C980 + ldr r0, =0x02021dc4 movs r2, 0x4 ldrsh r1, [r4, r2] movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r0, _0816C984 + ldr r0, =0x0000fffd bl sub_816C228 bl sub_816C2C0 mov r0, r8 subs r0, 0x8 adds r0, r6, r0 - ldr r1, _0816C988 + ldr r1, =sub_816CB04 + 1 b _0816C9A2 .align 2, 0 -_0816C970: .4byte 0x03005e08 -_0816C974: .4byte 0x0203bcb8 -_0816C978: .4byte 0x03005d8c -_0816C97C: .4byte 0x02021cc4 -_0816C980: .4byte 0x02021dc4 -_0816C984: .4byte 0x0000fffd -_0816C988: .4byte sub_816CB04 + 1 + .pool _0816C98C: movs r0, 0 strh r0, [r4, 0x4] - ldr r0, _0816C9B0 + ldr r0, =0x0000fffa bl sub_816C228 bl sub_816C2C0 mov r0, r8 subs r0, 0x8 adds r0, r6, r0 - ldr r1, _0816C9B4 + ldr r1, =sub_816CB74 + 1 _0816C9A2: str r1, [r0] pop {r3} @@ -746790,8 +721657,7 @@ _0816C9A2: pop {r0} bx r0 .align 2, 0 -_0816C9B0: .4byte 0x0000fffa -_0816C9B4: .4byte sub_816CB74 + 1 + .pool thumb_func_end sub_816C8FC thumb_func_start sub_816C9B8 @@ -746807,16 +721673,16 @@ sub_816C9B8: @ 816C9B8 adds r0, r5 lsls r0, 3 mov r8, r0 - ldr r0, _0816CA44 + ldr r0, =0x03005e08 mov r9, r0 mov r7, r8 add r7, r9 - ldr r0, _0816CA48 + ldr r0, =0x0203bcb8 ldrh r1, [r0, 0x2] ldrh r0, [r0] adds r1, r0 lsls r1, 16 - ldr r6, _0816CA4C + ldr r6, =0x03005d8c ldr r0, [r6] lsrs r4, r1, 14 adds r0, r4 @@ -746834,18 +721700,18 @@ sub_816C9B8: @ 816C9B8 lsls r2, 3 adds r0, r2 ldrh r0, [r0] - ldr r1, _0816CA50 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _0816CA54 + ldr r0, =0x02021dc4 movs r2, 0x4 ldrsh r1, [r7, r2] movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r0, _0816CA58 + ldr r0, =0x0000fff8 bl sub_816C228 bl sub_816C2C0 - ldr r1, _0816CA5C + ldr r1, =0x085dff84 movs r0, 0x1 str r0, [sp] movs r0, 0x85 @@ -746853,7 +721719,7 @@ sub_816C9B8: @ 816C9B8 str r0, [sp, 0x4] movs r0, 0xE str r0, [sp, 0x8] - ldr r0, _0816CA60 + ldr r0, =0x085dff3c str r0, [sp, 0xC] adds r0, r5, 0 movs r2, 0x1 @@ -746861,24 +721727,17 @@ sub_816C9B8: @ 816C9B8 bl sub_8121F94 b _0816CA7C .align 2, 0 -_0816CA44: .4byte 0x03005e08 -_0816CA48: .4byte 0x0203bcb8 -_0816CA4C: .4byte 0x03005d8c -_0816CA50: .4byte 0x02021cc4 -_0816CA54: .4byte 0x02021dc4 -_0816CA58: .4byte 0x0000fff8 -_0816CA5C: .4byte 0x085dff84 -_0816CA60: .4byte 0x085dff3c + .pool _0816CA64: movs r0, 0 strh r0, [r7, 0x4] - ldr r0, _0816CA8C + ldr r0, =0x0000fff9 bl sub_816C228 bl sub_816C2C0 mov r0, r9 subs r0, 0x8 add r0, r8 - ldr r1, _0816CA90 + ldr r1, =sub_816CB74 + 1 str r1, [r0] _0816CA7C: add sp, 0x10 @@ -746889,8 +721748,7 @@ _0816CA7C: pop {r0} bx r0 .align 2, 0 -_0816CA8C: .4byte 0x0000fff9 -_0816CA90: .4byte sub_816CB74 + 1 + .pool thumb_func_end sub_816C9B8 thumb_func_start sub_816CA94 @@ -746899,23 +721757,21 @@ sub_816CA94: @ 816CA94 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0816CABC + ldr r0, =0x0000fffb bl sub_816C228 bl sub_816C2C0 - ldr r1, _0816CAC0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816CAC4 + ldr r1, =sub_816CB04 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0816CABC: .4byte 0x0000fffb -_0816CAC0: .4byte 0x03005e00 -_0816CAC4: .4byte sub_816CB04 + 1 + .pool thumb_func_end sub_816CA94 thumb_func_start sub_816CAC8 @@ -746924,9 +721780,9 @@ sub_816CAC8: @ 816CAC8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0816CAFC + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r1, _0816CB00 + ldr r1, =0x0203bcb8 ldrh r0, [r1, 0x2] ldrh r1, [r1] adds r0, r1 @@ -746944,8 +721800,7 @@ sub_816CAC8: @ 816CAC8 pop {r0} bx r0 .align 2, 0 -_0816CAFC: .4byte 0x03005d8c -_0816CB00: .4byte 0x0203bcb8 + .pool thumb_func_end sub_816CAC8 thumb_func_start sub_816CB04 @@ -746956,15 +721811,15 @@ sub_816CB04: @ 816CB04 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0816CB64 + ldr r1, =0x03005e08 adds r5, r0, r1 - ldr r0, _0816CB68 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 beq _0816CB5E - ldr r4, _0816CB6C + ldr r4, =0x0203bcb8 ldrb r0, [r4, 0x2] ldrb r1, [r4] adds r0, r1 @@ -746979,7 +721834,7 @@ sub_816CB04: @ 816CB04 bl sub_816C110 bl sub_816C140 bl sub_816BD04 - ldr r0, _0816CB70 + ldr r0, =0x03006310 ldrh r1, [r4, 0x2] ldrh r2, [r4] bl calls_per_item_funcs_in_list_outer @@ -746993,10 +721848,7 @@ _0816CB5E: pop {r0} bx r0 .align 2, 0 -_0816CB64: .4byte 0x03005e08 -_0816CB68: .4byte 0x030022c0 -_0816CB6C: .4byte 0x0203bcb8 -_0816CB70: .4byte 0x03006310 + .pool thumb_func_end sub_816CB04 thumb_func_start sub_816CB74 @@ -747004,15 +721856,15 @@ sub_816CB74: @ 816CB74 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0816CBB4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 beq _0816CBAC - ldr r0, _0816CBB8 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r1, _0816CBBC + ldr r1, =0x0203bcb8 ldrh r0, [r1, 0x2] ldrh r1, [r1] adds r0, r1 @@ -747031,9 +721883,7 @@ _0816CBAC: pop {r0} bx r0 .align 2, 0 -_0816CBB4: .4byte 0x030022c0 -_0816CBB8: .4byte 0x03005d8c -_0816CBBC: .4byte 0x0203bcb8 + .pool thumb_func_end sub_816CB74 thumb_func_start sub_816CBC0 @@ -747043,19 +721893,18 @@ sub_816CBC0: @ 816CBC0 lsls r4, 24 lsrs r4, 24 bl sub_816BF60 - ldr r1, _0816CBE0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816CBE4 + ldr r1, =sub_816C30C + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0816CBE0: .4byte 0x03005e00 -_0816CBE4: .4byte sub_816C30C + 1 + .pool thumb_func_end sub_816CBC0 thumb_func_start sub_816CBE8 @@ -747076,25 +721925,23 @@ sub_816CC00: @ 816CC00 bl call_obj_callbacks bl obj_sync_something bl fade_and_return_progress_probably - ldr r0, _0816CC30 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] cmp r0, 0 beq _0816CC3C - ldr r0, _0816CC34 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0816CC3C - ldr r0, _0816CC38 + ldr r0, =sub_816CC54 + 1 bl set_callback2 b _0816CC4C .align 2, 0 -_0816CC30: .4byte 0x030022c0 -_0816CC34: .4byte 0x02037fd4 -_0816CC38: .4byte sub_816CC54 + 1 + .pool _0816CC3C: - ldr r2, _0816CC50 + ldr r2, =0x030062a0 ldr r1, [r2] movs r0, 0x1 negs r0, r0 @@ -747106,7 +721953,7 @@ _0816CC4C: pop {r0} bx r0 .align 2, 0 -_0816CC50: .4byte 0x030062a0 + .pool thumb_func_end sub_816CC00 thumb_func_start sub_816CC54 @@ -747116,13 +721963,13 @@ sub_816CC54: @ 816CC54 lsls r0, 24 cmp r0, 0 bne _0816CC66 - ldr r0, _0816CC6C + ldr r0, =c2_title_screen_1 + 1 bl set_callback2 _0816CC66: pop {r0} bx r0 .align 2, 0 -_0816CC6C: .4byte c2_title_screen_1 + 1 + .pool thumb_func_end sub_816CC54 thumb_func_start load_copyright_graphics @@ -747137,17 +721984,17 @@ load_copyright_graphics: @ 816CC70 lsrs r4, 16 lsls r5, 16 lsrs r5, 16 - ldr r0, _0816CCAC + ldr r0, =0x08dc3d74 movs r6, 0xC0 lsls r6, 19 adds r3, r6 adds r1, r3, 0 bl LZ77UnCompVram - ldr r0, _0816CCB0 + ldr r0, =0x08dc3fd4 adds r4, r6 adds r1, r4, 0 bl LZ77UnCompVram - ldr r0, _0816CCB4 + ldr r0, =0x08dc3d54 adds r1, r5, 0 movs r2, 0x20 bl gpu_pal_apply @@ -747155,27 +722002,25 @@ load_copyright_graphics: @ 816CC70 pop {r0} bx r0 .align 2, 0 -_0816CCAC: .4byte 0x08dc3d74 -_0816CCB0: .4byte 0x08dc3fd4 -_0816CCB4: .4byte 0x08dc3d54 + .pool thumb_func_end load_copyright_graphics thumb_func_start sub_816CCB8 sub_816CCB8: @ 816CCB8 push {lr} - ldr r0, _0816CCC4 + ldr r0, =0x030062b0 bl sub_82DEEE2 pop {r0} bx r0 .align 2, 0 -_0816CCC4: .4byte 0x030062b0 + .pool thumb_func_end sub_816CCB8 thumb_func_start do_copyright_screen do_copyright_screen: @ 816CCC8 push {r4-r6,lr} sub sp, 0x10 - ldr r0, _0816CCE8 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r5, r0, r1 @@ -747190,7 +722035,7 @@ _0816CCDC: beq _0816CCF4 b _0816CDBC .align 2, 0 -_0816CCE8: .4byte 0x030022c0 + .pool _0816CCEC: cmp r4, 0x8D bne _0816CCF2 @@ -747211,7 +722056,7 @@ _0816CCF4: bl lcd_io_set movs r1, 0xA0 lsls r1, 19 - ldr r2, _0816CDD8 + ldr r2, =0x00007fff adds r0, r2, 0 strh r0, [r1] movs r0, 0 @@ -747226,19 +722071,19 @@ _0816CCF4: str r4, [sp, 0x4] movs r1, 0xC0 lsls r1, 19 - ldr r2, _0816CDDC + ldr r2, =0x05006000 add r0, sp, 0x4 bl CpuSet str r4, [sp, 0x8] add r0, sp, 0x8 movs r1, 0xE0 lsls r1, 19 - ldr r2, _0816CDE0 + ldr r2, =0x05000100 bl CpuSet add r0, sp, 0xC strh r4, [r0] - ldr r1, _0816CDE4 - ldr r2, _0816CDE8 + ldr r1, =0x05000002 + ldr r2, =0x010001ff bl CpuSet bl sub_80A1A74 movs r1, 0xE0 @@ -747252,7 +722097,7 @@ _0816CCF4: bl gpu_pal_allocator_reset movs r0, 0x1 negs r0, r0 - ldr r1, _0816CDEC + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0x10 @@ -747264,7 +722109,7 @@ _0816CCF4: bl lcd_io_set movs r0, 0x1 bl enable_irqs - ldr r0, _0816CDF0 + ldr r0, =sub_816CBE8 + 1 bl SetVBlankCallback movs r1, 0x80 lsls r1, 19 @@ -747272,35 +722117,26 @@ _0816CCF4: lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - ldr r0, _0816CDF4 + ldr r0, =sub_816CCB8 + 1 bl set_serial_callback - ldr r0, _0816CDF8 + ldr r0, =0x030062b0 bl sub_82DEE98 _0816CDBC: bl fade_and_return_progress_probably - ldr r0, _0816CDFC + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, _0816CDF8 + ldr r0, =0x030062b0 bl sub_82DED84 b _0816CEA0 .align 2, 0 -_0816CDD8: .4byte 0x00007fff -_0816CDDC: .4byte 0x05006000 -_0816CDE0: .4byte 0x05000100 -_0816CDE4: .4byte 0x05000002 -_0816CDE8: .4byte 0x010001ff -_0816CDEC: .4byte 0x0000ffff -_0816CDF0: .4byte sub_816CBE8 + 1 -_0816CDF4: .4byte sub_816CCB8 + 1 -_0816CDF8: .4byte 0x030062b0 -_0816CDFC: .4byte 0x030022c0 + .pool _0816CE00: - ldr r4, _0816CE28 + ldr r4, =0x030062b0 adds r0, r4, 0 bl sub_82DED84 ldrb r0, [r4, 0x2] @@ -747318,30 +722154,30 @@ _0816CE00: strb r0, [r5] b _0816CEA0 .align 2, 0 -_0816CE28: .4byte 0x030062b0 + .pool _0816CE2C: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 bne _0816CEA0 - ldr r0, _0816CE74 + ldr r0, =task_intro_1 + 1 movs r1, 0 bl AddTask - ldr r0, _0816CE78 + ldr r0, =sub_816CC00 + 1 bl set_callback2 - ldr r5, _0816CE7C + ldr r5, =0x030062b0 ldrb r0, [r5, 0x2] cmp r0, 0 beq _0816CE8C ldrb r0, [r5, 0x2] cmp r0, 0x2 bne _0816CE96 - ldr r6, _0816CE80 + ldr r6, =0x020000ac ldr r4, [r6] - ldr r0, _0816CE84 + ldr r0, =0x65366347 cmp r4, r0 bne _0816CE6C - ldr r0, _0816CE88 + ldr r0, =0x089aa144 movs r1, 0x80 lsls r1, 18 movs r2, 0xA0 @@ -747353,21 +722189,16 @@ _0816CE6C: bl sub_82DEE84 b _0816CE96 .align 2, 0 -_0816CE74: .4byte task_intro_1 + 1 -_0816CE78: .4byte sub_816CC00 + 1 -_0816CE7C: .4byte 0x030062b0 -_0816CE80: .4byte 0x020000ac -_0816CE84: .4byte 0x65366347 -_0816CE88: .4byte 0x089aa144 + .pool _0816CE8C: bl sub_82DF012 - ldr r0, _0816CE9C + ldr r0, =sub_800BA38 + 1 bl set_serial_callback _0816CE96: movs r0, 0 b _0816CEA2 .align 2, 0 -_0816CE9C: .4byte sub_800BA38 + 1 + .pool _0816CEA0: movs r0, 0x1 _0816CEA2: @@ -747392,7 +722223,7 @@ c2_copyright_1: @ 816CEAC bl sub_8152680 movs r0, 0 bl sub_81534D0 - ldr r0, _0816CF00 + ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0 beq _0816CEDE @@ -747401,13 +722232,13 @@ c2_copyright_1: @ 816CEAC _0816CEDE: bl init_sav2 _0816CEE2: - ldr r0, _0816CF04 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x15] lsls r0, 31 lsrs r0, 31 bl sub_82E1810 - ldr r0, _0816CF08 + ldr r0, =0x02000000 movs r1, 0xE0 lsls r1, 9 bl init_malloc @@ -747415,9 +722246,7 @@ _0816CEFA: pop {r0} bx r0 .align 2, 0 -_0816CF00: .4byte 0x03006210 -_0816CF04: .4byte 0x03005d90 -_0816CF08: .4byte 0x02000000 + .pool thumb_func_end c2_copyright_1 thumb_func_start c2_show_copyright_and_intro_again_2 @@ -747440,7 +722269,7 @@ task_intro_1: @ 816CF18 mov r8, r0 movs r0, 0 bl SetVBlankCallback - ldr r4, _0816D0BC + ldr r4, =0x0203bcc8 bl GenerateRandomNumber movs r1, 0x1 ands r1, r0 @@ -747458,83 +722287,83 @@ task_intro_1: @ 816CF18 movs r0, 0x12 movs r1, 0x28 bl lcd_io_set - ldr r0, _0816D0C0 + ldr r0, =0x085e13b4 movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _0816D0C4 - ldr r1, _0816D0C8 + ldr r0, =0x085e07c4 + ldr r1, =0x06008000 bl LZ77UnCompVram - ldr r1, _0816D0CC + ldr r1, =0x06008800 add r0, sp, 0x8 movs r6, 0 strh r6, [r0] - ldr r4, _0816D0D0 + ldr r4, =0x040000d4 str r0, [r4] str r1, [r4, 0x4] - ldr r5, _0816D0D4 + ldr r5, =0x81000400 str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, _0816D0D8 - ldr r1, _0816D0DC + ldr r0, =0x085e0b78 + ldr r1, =0x06009000 bl LZ77UnCompVram - ldr r1, _0816D0E0 + ldr r1, =0x06009800 add r0, sp, 0x8 strh r6, [r0] str r0, [r4] str r1, [r4, 0x4] str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, _0816D0E4 - ldr r1, _0816D0E8 + ldr r0, =0x085e0eac + ldr r1, =0x0600a000 bl LZ77UnCompVram - ldr r1, _0816D0EC + ldr r1, =0x0600a800 add r0, sp, 0x8 strh r6, [r0] str r0, [r4] str r1, [r4, 0x4] str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, _0816D0F0 - ldr r1, _0816D0F4 + ldr r0, =0x085e119c + ldr r1, =0x0600b000 bl LZ77UnCompVram - ldr r1, _0816D0F8 + ldr r1, =0x0600b800 add r0, sp, 0x8 strh r6, [r0] str r0, [r4] str r1, [r4, 0x4] str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, _0816D0FC + ldr r0, =0x085e05c4 movs r5, 0x80 lsls r5, 2 movs r1, 0 adds r2, r5, 0 bl gpu_pal_apply - ldr r1, _0816D100 + ldr r1, =0x00009603 movs r0, 0xE bl lcd_io_set - ldr r1, _0816D104 + ldr r1, =0x00009402 movs r0, 0xC bl lcd_io_set - ldr r1, _0816D108 + ldr r1, =0x00009201 movs r0, 0xA bl lcd_io_set movs r1, 0x90 lsls r1, 8 movs r0, 0x8 bl lcd_io_set - ldr r0, _0816D10C + ldr r0, =0x085e4fdc bl gpu_tile_obj_decompress_and_load - ldr r0, _0816D110 + ldr r0, =0x085e4fec bl gpu_tile_obj_decompress_and_load - ldr r0, _0816D114 + ldr r0, =0x085e4ffc bl gpu_pal_obj_alloc_and_load_multiple - ldr r0, _0816D118 + ldr r0, =0x085e4a74 bl gpu_tile_obj_decompress_and_load - ldr r0, _0816D11C + ldr r0, =0x085e4a84 bl gpu_pal_obj_alloc_and_load_multiple - ldr r4, _0816D120 + ldr r4, =0x02037914 movs r3, 0xF0 lsls r3, 1 adds r1, r4, r3 @@ -747591,7 +722420,7 @@ task_intro_1: @ 816CF18 adds r2, r5, 0 movs r3, 0x1 bl sub_816F7D0 - ldr r2, _0816D124 + ldr r2, =0x03005e00 mov r3, r8 lsls r1, r3, 2 add r1, r8 @@ -747600,7 +722429,7 @@ task_intro_1: @ 816CF18 lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0x8] - ldr r0, _0816D128 + ldr r0, =task_intro_2 + 1 str r0, [r1] add sp, 0xC pop {r3} @@ -747609,34 +722438,7 @@ task_intro_1: @ 816CF18 pop {r0} bx r0 .align 2, 0 -_0816D0BC: .4byte 0x0203bcc8 -_0816D0C0: .4byte 0x085e13b4 -_0816D0C4: .4byte 0x085e07c4 -_0816D0C8: .4byte 0x06008000 -_0816D0CC: .4byte 0x06008800 -_0816D0D0: .4byte 0x040000d4 -_0816D0D4: .4byte 0x81000400 -_0816D0D8: .4byte 0x085e0b78 -_0816D0DC: .4byte 0x06009000 -_0816D0E0: .4byte 0x06009800 -_0816D0E4: .4byte 0x085e0eac -_0816D0E8: .4byte 0x0600a000 -_0816D0EC: .4byte 0x0600a800 -_0816D0F0: .4byte 0x085e119c -_0816D0F4: .4byte 0x0600b000 -_0816D0F8: .4byte 0x0600b800 -_0816D0FC: .4byte 0x085e05c4 -_0816D100: .4byte 0x00009603 -_0816D104: .4byte 0x00009402 -_0816D108: .4byte 0x00009201 -_0816D10C: .4byte 0x085e4fdc -_0816D110: .4byte 0x085e4fec -_0816D114: .4byte 0x085e4ffc -_0816D118: .4byte 0x085e4a74 -_0816D11C: .4byte 0x085e4a84 -_0816D120: .4byte 0x02037914 -_0816D124: .4byte 0x03005e00 -_0816D128: .4byte task_intro_2 + 1 + .pool thumb_func_end task_intro_1 thumb_func_start task_intro_2 @@ -747654,20 +722456,20 @@ task_intro_2: @ 816D12C movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _0816D180 + ldr r0, =sub_816CBE8 + 1 bl SetVBlankCallback movs r1, 0xFA lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r1, _0816D184 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816D188 + ldr r1, =task_intro_3 + 1 str r1, [r0] - ldr r0, _0816D18C + ldr r0, =0x030062a0 str r5, [r0] movs r0, 0xCF lsls r0, 1 @@ -747678,10 +722480,7 @@ task_intro_2: @ 816D12C pop {r0} bx r0 .align 2, 0 -_0816D180: .4byte sub_816CBE8 + 1 -_0816D184: .4byte 0x03005e00 -_0816D188: .4byte task_intro_3 + 1 -_0816D18C: .4byte 0x030062a0 + .pool thumb_func_end task_intro_2 thumb_func_start task_intro_3 @@ -747691,12 +722490,12 @@ task_intro_3: @ 816D190 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r5, _0816D284 + ldr r5, =0x030062a0 ldr r0, [r5] cmp r0, 0x4C bne _0816D1BE - ldr r2, _0816D288 - ldr r1, _0816D28C + ldr r2, =0x02020630 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -747713,15 +722512,15 @@ _0816D1BE: ldr r0, [r5] cmp r0, 0x80 bne _0816D1CC - ldr r0, _0816D290 + ldr r0, =task_intro_3_1 + 1 movs r1, 0 bl AddTask _0816D1CC: ldr r0, [r5] cmp r0, 0xFB bne _0816D1EE - ldr r2, _0816D288 - ldr r1, _0816D28C + ldr r2, =0x02020630 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -747740,7 +722539,7 @@ _0816D1EE: lsls r0, 1 cmp r1, r0 bne _0816D200 - ldr r0, _0816D294 + ldr r0, =task_intro_3_2 + 1 movs r1, 0 bl AddTask _0816D200: @@ -747781,14 +722580,14 @@ _0816D240: lsls r4, 2 cmp r0, r4 bne _0816D252 - ldr r0, _0816D298 + ldr r0, =task_intro_3_3 + 1 movs r1, 0 bl AddTask _0816D252: ldr r0, [r5] cmp r0, r4 bls _0816D27A - ldr r1, _0816D28C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -747803,7 +722602,7 @@ _0816D252: movs r1, 0x28 strh r1, [r0, 0x12] strh r2, [r0, 0x14] - ldr r1, _0816D29C + ldr r1, =task_intro_4 + 1 str r1, [r0] _0816D27A: add sp, 0x8 @@ -747811,13 +722610,7 @@ _0816D27A: pop {r0} bx r0 .align 2, 0 -_0816D284: .4byte 0x030062a0 -_0816D288: .4byte 0x02020630 -_0816D28C: .4byte 0x03005e00 -_0816D290: .4byte task_intro_3_1 + 1 -_0816D294: .4byte task_intro_3_2 + 1 -_0816D298: .4byte task_intro_3_3 + 1 -_0816D29C: .4byte task_intro_4 + 1 + .pool thumb_func_end task_intro_3 thumb_func_start task_intro_3_3 @@ -747828,7 +722621,7 @@ task_intro_3_3: @ 816D2A0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0816D2D4 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4, 0x4] adds r0, 0x1 @@ -747849,10 +722642,10 @@ _0816D2C4: beq _0816D314 b _0816D324 .align 2, 0 -_0816D2D4: .4byte 0x03005e08 + .pool _0816D2D8: - ldr r0, _0816D30C - ldr r2, _0816D310 + ldr r0, =0x085e4ab8 + ldr r2, =0x085e4ad0 movs r1, 0x8 ldrsh r3, [r4, r1] lsls r3, 1 @@ -747877,8 +722670,7 @@ _0816D2D8: strh r0, [r4, 0x8] b _0816D324 .align 2, 0 -_0816D30C: .4byte 0x085e4ab8 -_0816D310: .4byte 0x085e4ad0 + .pool _0816D314: ldrh r0, [r4, 0x2] subs r0, 0x1 @@ -747926,12 +722718,12 @@ task_intro_4: @ 816D354 lsls r0, 24 lsrs r1, r0, 24 adds r4, r1, 0 - ldr r5, _0816D3F8 + ldr r5, =0x030062a0 ldr r2, [r5] - ldr r0, _0816D3FC + ldr r0, =0x00000387 cmp r2, r0 bhi _0816D418 - ldr r0, _0816D400 + ldr r0, =0x03005e00 lsls r4, r1, 2 adds r4, r1 lsls r4, 3 @@ -747941,7 +722733,7 @@ task_intro_4: @ 816D354 lsls r0, 16 ldrh r1, [r4, 0xC] adds r1, r0, r1 - ldr r0, _0816D404 + ldr r0, =0xffffa000 adds r1, r0 asrs r0, r1, 16 strh r0, [r4, 0xA] @@ -747954,7 +722746,7 @@ task_intro_4: @ 816D354 lsls r0, 16 ldrh r1, [r4, 0x10] adds r1, r0, r1 - ldr r0, _0816D408 + ldr r0, =0xffff8000 adds r1, r0 asrs r0, r1, 16 strh r0, [r4, 0xE] @@ -747967,7 +722759,7 @@ task_intro_4: @ 816D354 lsls r0, 16 ldrh r1, [r4, 0x14] adds r1, r0, r1 - ldr r0, _0816D40C + ldr r0, =0xffff4000 adds r1, r0 asrs r0, r1, 16 strh r0, [r4, 0x12] @@ -747980,14 +722772,14 @@ task_intro_4: @ 816D354 lsls r0, 2 cmp r1, r0 bne _0816D43E - ldr r0, _0816D410 + ldr r0, =0x085e4fc4 movs r1, 0x78 movs r2, 0xA0 movs r3, 0xA bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _0816D414 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -747999,32 +722791,25 @@ task_intro_4: @ 816D354 strb r0, [r1] b _0816D43E .align 2, 0 -_0816D3F8: .4byte 0x030062a0 -_0816D3FC: .4byte 0x00000387 -_0816D400: .4byte 0x03005e00 -_0816D404: .4byte 0xffffa000 -_0816D408: .4byte 0xffff8000 -_0816D40C: .4byte 0xffff4000 -_0816D410: .4byte 0x085e4fc4 -_0816D414: .4byte 0x02020630 + .pool _0816D418: - ldr r0, _0816D448 + ldr r0, =0x000003ef cmp r2, r0 bls _0816D43E movs r0, 0x1 negs r0, r0 - ldr r1, _0816D44C + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _0816D450 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816D454 + ldr r1, =task_intro_5 + 1 str r1, [r0] _0816D43E: add sp, 0x4 @@ -748032,10 +722817,7 @@ _0816D43E: pop {r0} bx r0 .align 2, 0 -_0816D448: .4byte 0x000003ef -_0816D44C: .4byte 0x0000ffff -_0816D450: .4byte 0x03005e00 -_0816D454: .4byte task_intro_5 + 1 + .pool thumb_func_end task_intro_4 thumb_func_start task_intro_5 @@ -748043,26 +722825,23 @@ task_intro_5: @ 816D458 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0816D47C + ldr r0, =0x030062a0 ldr r1, [r0] - ldr r0, _0816D480 + ldr r0, =0x00000402 cmp r1, r0 bls _0816D476 - ldr r0, _0816D484 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _0816D488 + ldr r0, =task_intro_6 + 1 str r0, [r1] _0816D476: pop {r0} bx r0 .align 2, 0 -_0816D47C: .4byte 0x030062a0 -_0816D480: .4byte 0x00000402 -_0816D484: .4byte 0x03005e00 -_0816D488: .4byte task_intro_6 + 1 + .pool thumb_func_end task_intro_5 thumb_func_start task_intro_6 @@ -748076,31 +722855,27 @@ task_intro_6: @ 816D48C bl SetVBlankCallback bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, _0816D4D0 + ldr r0, =0x0203bd24 movs r1, 0 strh r1, [r0] - ldr r0, _0816D4D4 + ldr r0, =0x0203bd26 strh r1, [r0] - ldr r0, _0816D4D8 + ldr r0, =0x0203bccc strh r1, [r0] movs r0, 0x1 bl load_intro_part2_graphics - ldr r1, _0816D4DC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816D4E0 + ldr r1, =task_intro_7 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0816D4D0: .4byte 0x0203bd24 -_0816D4D4: .4byte 0x0203bd26 -_0816D4D8: .4byte 0x0203bccc -_0816D4DC: .4byte 0x03005e00 -_0816D4E0: .4byte task_intro_7 + 1 + .pool thumb_func_end task_intro_6 thumb_func_start task_intro_7 @@ -748109,27 +722884,26 @@ task_intro_7: @ 816D4E4 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0816D4FC + ldr r0, =0x0203bcc8 ldrh r0, [r0] cmp r0, 0 bne _0816D504 - ldr r0, _0816D500 + ldr r0, =0x085f52bc bl gpu_tile_obj_decompress_and_load b _0816D50A .align 2, 0 -_0816D4FC: .4byte 0x0203bcc8 -_0816D500: .4byte 0x085f52bc + .pool _0816D504: - ldr r0, _0816D56C + ldr r0, =0x085f52cc bl gpu_tile_obj_decompress_and_load _0816D50A: - ldr r0, _0816D570 + ldr r0, =0x085f52dc bl gpu_tile_obj_decompress_and_load - ldr r0, _0816D574 + ldr r0, =0x085f52fc bl gpu_tile_obj_decompress_and_load movs r6, 0 lsls r7, r4, 2 - ldr r5, _0816D578 + ldr r5, =0x085e4ae8 _0816D51C: lsls r0, r6, 3 adds r0, r5 @@ -748139,24 +722913,24 @@ _0816D51C: lsrs r6, r0, 24 cmp r6, 0x2 bls _0816D51C - ldr r0, _0816D57C + ldr r0, =0x085f530c bl gpu_pal_obj_alloc_and_load_multiple - ldr r0, _0816D580 + ldr r0, =0x085e4b08 bl gpu_pal_obj_alloc_and_load_multiple - ldr r0, _0816D584 + ldr r0, =0x085e4bdc movs r5, 0x88 lsls r5, 1 adds r1, r5, 0 movs r2, 0x80 movs r3, 0 bl obj_add_from_template_forward_search - ldr r0, _0816D588 + ldr r0, =0x085e4ba4 movs r1, 0x90 lsls r1, 1 movs r2, 0x6E movs r3, 0x1 bl obj_add_from_template_forward_search - ldr r0, _0816D58C + ldr r0, =0x0203bcc8 ldrh r0, [r0] cmp r0, 0 bne _0816D590 @@ -748165,15 +722939,7 @@ _0816D51C: bl sub_817B834 b _0816D598 .align 2, 0 -_0816D56C: .4byte 0x085f52cc -_0816D570: .4byte 0x085f52dc -_0816D574: .4byte 0x085f52fc -_0816D578: .4byte 0x085e4ae8 -_0816D57C: .4byte 0x085f530c -_0816D580: .4byte 0x085e4b08 -_0816D584: .4byte 0x085e4bdc -_0816D588: .4byte 0x085e4ba4 -_0816D58C: .4byte 0x0203bcc8 + .pool _0816D590: adds r0, r5, 0 movs r1, 0x64 @@ -748181,25 +722947,25 @@ _0816D590: _0816D598: lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _0816D62C + ldr r2, =0x02020630 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 adds r5, r2, 0 adds r5, 0x1C adds r3, r0, r5 - ldr r1, _0816D630 + ldr r1, =sub_816F9D4 + 1 str r1, [r3] adds r2, 0x8 adds r0, r2 - ldr r1, _0816D634 + ldr r1, =0x085e4dc4 str r1, [r0] - ldr r0, _0816D638 + ldr r0, =0x03005e00 adds r4, r7, r4 lsls r4, 3 adds r4, r0 strh r6, [r4, 0xA] - ldr r0, _0816D63C + ldr r0, =0x085e4b40 movs r1, 0x88 lsls r1, 1 movs r2, 0x50 @@ -748215,18 +722981,18 @@ _0816D598: adds r0, r6 lsls r0, 2 adds r0, r5 - ldr r1, _0816D640 + ldr r1, =sub_816FAB0 + 1 str r1, [r0] strh r6, [r4, 0xC] movs r0, 0x1 negs r0, r0 - ldr r1, _0816D644 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _0816D648 + ldr r0, =sub_816CBE8 + 1 bl SetVBlankCallback movs r1, 0x80 lsls r1, 7 @@ -748240,22 +723006,14 @@ _0816D598: strh r0, [r4, 0x8] movs r0, 0x1 bl sub_817B150 - ldr r0, _0816D64C + ldr r0, =task_intro_8 + 1 str r0, [r4] add sp, 0x4 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0816D62C: .4byte 0x02020630 -_0816D630: .4byte sub_816F9D4 + 1 -_0816D634: .4byte 0x085e4dc4 -_0816D638: .4byte 0x03005e00 -_0816D63C: .4byte 0x085e4b40 -_0816D640: .4byte sub_816FAB0 + 1 -_0816D644: .4byte 0x0000ffff -_0816D648: .4byte sub_816CBE8 + 1 -_0816D64C: .4byte task_intro_8 + 1 + .pool thumb_func_end task_intro_7 thumb_func_start task_intro_8 @@ -748265,16 +723023,16 @@ task_intro_8: @ 816D650 lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r5, _0816D7B0 + ldr r5, =0x030062a0 ldr r1, [r5] movs r0, 0xE8 lsls r0, 3 cmp r1, r0 bne _0816D67C - ldr r1, _0816D7B4 + ldr r1, =0x0203bd28 movs r0, 0x2 strh r0, [r1] - ldr r1, _0816D7B8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -748283,31 +723041,31 @@ task_intro_8: @ 816D650 bl remove_task _0816D67C: ldr r1, [r5] - ldr r0, _0816D7BC + ldr r0, =0x0000079a cmp r1, r0 bls _0816D6A4 movs r0, 0x1 negs r0, r0 - ldr r1, _0816D7C0 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0x8 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _0816D7B8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816D7C4 + ldr r1, =task_intro_9 + 1 str r1, [r0] _0816D6A4: ldr r1, [r5] - ldr r0, _0816D7C8 - ldr r3, _0816D7B8 + ldr r0, =0x00000455 + ldr r3, =0x03005e00 cmp r1, r0 bne _0816D6C8 - ldr r2, _0816D7CC + ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -748322,10 +723080,10 @@ _0816D6A4: strh r1, [r0, 0x2E] _0816D6C8: ldr r1, [r5] - ldr r0, _0816D7D0 + ldr r0, =0x000004be cmp r1, r0 bne _0816D6EA - ldr r2, _0816D7CC + ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -748340,10 +723098,10 @@ _0816D6C8: strh r1, [r0, 0x2E] _0816D6EA: ldr r1, [r5] - ldr r0, _0816D7D4 + ldr r0, =0x00000572 cmp r1, r0 bne _0816D70C - ldr r2, _0816D7CC + ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -748358,10 +723116,10 @@ _0816D6EA: strh r1, [r0, 0x2E] _0816D70C: ldr r1, [r5] - ldr r0, _0816D7D8 + ldr r0, =0x00000576 cmp r1, r0 bne _0816D72E - ldr r2, _0816D7CC + ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -748380,7 +723138,7 @@ _0816D72E: lsls r0, 3 cmp r1, r0 bne _0816D752 - ldr r2, _0816D7CC + ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -748395,10 +723153,10 @@ _0816D72E: strh r1, [r0, 0x2E] _0816D752: ldr r1, [r5] - ldr r0, _0816D7DC + ldr r0, =0x000006bf cmp r1, r0 bne _0816D774 - ldr r2, _0816D7CC + ldr r2, =0x02020630 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -748423,12 +723181,12 @@ _0816D774: ands r0, r1 movs r1, 0x30 bl sine - ldr r1, _0816D7E0 + ldr r1, =0x0203bccc strh r0, [r1] ldrh r2, [r4, 0xE] movs r7, 0xE ldrsh r1, [r4, r7] - ldr r0, _0816D7E4 + ldr r0, =0x000001ff cmp r1, r0 bgt _0816D7A0 adds r0, r2, 0x1 @@ -748441,20 +723199,7 @@ _0816D7A0: pop {r0} bx r0 .align 2, 0 -_0816D7B0: .4byte 0x030062a0 -_0816D7B4: .4byte 0x0203bd28 -_0816D7B8: .4byte 0x03005e00 -_0816D7BC: .4byte 0x0000079a -_0816D7C0: .4byte 0x0000ffff -_0816D7C4: .4byte task_intro_9 + 1 -_0816D7C8: .4byte 0x00000455 -_0816D7CC: .4byte 0x02020630 -_0816D7D0: .4byte 0x000004be -_0816D7D4: .4byte 0x00000572 -_0816D7D8: .4byte 0x00000576 -_0816D7DC: .4byte 0x000006bf -_0816D7E0: .4byte 0x0203bccc -_0816D7E4: .4byte 0x000001ff + .pool thumb_func_end task_intro_8 thumb_func_start task_intro_9 @@ -748462,26 +723207,23 @@ task_intro_9: @ 816D7E8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0816D80C + ldr r0, =0x030062a0 ldr r1, [r0] - ldr r0, _0816D810 + ldr r0, =0x00000814 cmp r1, r0 bls _0816D806 - ldr r0, _0816D814 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _0816D818 + ldr r0, =task_intro_10 + 1 str r0, [r1] _0816D806: pop {r0} bx r0 .align 2, 0 -_0816D80C: .4byte 0x030062a0 -_0816D810: .4byte 0x00000814 -_0816D814: .4byte 0x03005e00 -_0816D818: .4byte task_intro_10 + 1 + .pool thumb_func_end task_intro_9 thumb_func_start sub_816D81C @@ -748498,12 +723240,12 @@ sub_816D81C: @ 816D81C b _0816D9BA _0816D830: lsls r0, 2 - ldr r1, _0816D83C + ldr r1, =_0816D840 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0816D83C: .4byte _0816D840 + .pool .align 2, 0 _0816D840: .4byte _0816D864 @@ -748711,12 +723453,12 @@ sub_816D9C0: @ 816D9C0 b _0816DADA _0816D9CE: lsls r0, 2 - ldr r1, _0816D9D8 + ldr r1, =_0816D9DC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0816D9D8: .4byte _0816D9DC + .pool .align 2, 0 _0816D9DC: .4byte _0816D9F4 @@ -748726,7 +723468,7 @@ _0816D9DC: .4byte _0816DA9A .4byte _0816DACA _0816D9F4: - ldr r0, _0816DA04 + ldr r0, =0x030062a0 ldr r1, [r0] movs r0, 0x99 lsls r0, 3 @@ -748734,9 +723476,9 @@ _0816D9F4: bne _0816DADA b _0816DABA .align 2, 0 -_0816DA04: .4byte 0x030062a0 + .pool _0816DA08: - ldr r0, _0816DA1C + ldr r0, =0x030062a0 ldr r1, [r0] movs r0, 0xC5 lsls r0, 3 @@ -748746,11 +723488,11 @@ _0816DA08: movs r1, 0 b _0816DABE .align 2, 0 -_0816DA1C: .4byte 0x030062a0 + .pool _0816DA20: - ldr r0, _0816DA48 + ldr r0, =0x030062a0 ldr r1, [r0] - ldr r0, _0816DA4C + ldr r0, =0x000006c7 cmp r1, r0 beq _0816DA50 ldrh r0, [r4, 0x30] @@ -748768,8 +723510,7 @@ _0816DA20: adds r0, 0x1 b _0816DA8A .align 2, 0 -_0816DA48: .4byte 0x030062a0 -_0816DA4C: .4byte 0x000006c7 + .pool _0816DA50: adds r0, r4, 0 movs r1, 0x1 @@ -748839,9 +723580,9 @@ _0816DABE: strh r0, [r4, 0x2E] b _0816DADA _0816DACA: - ldr r0, _0816DAE0 + ldr r0, =0x030062a0 ldr r1, [r0] - ldr r0, _0816DAE4 + ldr r0, =0x0000073f cmp r1, r0 bls _0816DADA ldrh r0, [r4, 0x20] @@ -748852,8 +723593,7 @@ _0816DADA: pop {r0} bx r0 .align 2, 0 -_0816DAE0: .4byte 0x030062a0 -_0816DAE4: .4byte 0x0000073f + .pool thumb_func_end sub_816D9C0 thumb_func_start sub_816DAE8 @@ -748874,7 +723614,7 @@ _0816DAFE: beq _0816DB42 b _0816DBA4 _0816DB04: - ldr r0, _0816DB18 + ldr r0, =0x030062a0 ldr r1, [r0] movs r0, 0x88 lsls r0, 3 @@ -748885,12 +723625,12 @@ _0816DB04: strh r0, [r4, 0x2E] b _0816DBA4 .align 2, 0 -_0816DB18: .4byte 0x030062a0 + .pool _0816DB1C: ldrh r0, [r4, 0x20] subs r0, 0x2 strh r0, [r4, 0x20] - ldr r0, _0816DB5C + ldr r0, =0x030062a0 ldr r1, [r0] movs r0, 0x92 lsls r0, 3 @@ -748920,7 +723660,7 @@ _0816DB42: bl obj_delete_and_free_tiles b _0816DBA4 .align 2, 0 -_0816DB5C: .4byte 0x030062a0 + .pool _0816DB60: ldrh r0, [r4, 0x30] movs r1, 0xFF @@ -748971,19 +723711,19 @@ task_intro_10: @ 816DBAC lsls r5, 24 lsrs r5, 24 bl intro_reset_and_hide_bgs - ldr r0, _0816DC3C + ldr r0, =0x085e3854 movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _0816DC40 - ldr r1, _0816DC44 + ldr r0, =0x085e3724 + ldr r1, =0x06004000 bl LZ77UnCompVram - ldr r0, _0816DC48 + ldr r0, =0x085e3524 movs r2, 0x80 lsls r2, 2 movs r1, 0 bl gpu_pal_apply - ldr r0, _0816DC4C + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -749002,21 +723742,21 @@ task_intro_10: @ 816DBAC bl gpu_pal_allocator_reset movs r0, 0x1 negs r0, r0 - ldr r1, _0816DC50 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r1, _0816DC54 + ldr r1, =0x00004883 movs r0, 0xC bl lcd_io_set - ldr r1, _0816DC58 + ldr r1, =0x00001441 movs r0, 0 bl lcd_io_set - ldr r0, _0816DC5C + ldr r0, =task_intro_11 + 1 str r0, [r4] - ldr r0, _0816DC60 + ldr r0, =0x030062a0 str r5, [r0] movs r0, 0xDD lsls r0, 1 @@ -749026,16 +723766,7 @@ task_intro_10: @ 816DBAC pop {r0} bx r0 .align 2, 0 -_0816DC3C: .4byte 0x085e3854 -_0816DC40: .4byte 0x085e3724 -_0816DC44: .4byte 0x06004000 -_0816DC48: .4byte 0x085e3524 -_0816DC4C: .4byte 0x03005e00 -_0816DC50: .4byte 0x0000ffff -_0816DC54: .4byte 0x00004883 -_0816DC58: .4byte 0x00001441 -_0816DC5C: .4byte task_intro_11 + 1 -_0816DC60: .4byte 0x030062a0 + .pool thumb_func_end task_intro_10 thumb_func_start task_intro_11 @@ -749044,7 +723775,7 @@ task_intro_11: @ 816DC64 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _0816DC9C + ldr r2, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -749058,7 +723789,7 @@ task_intro_11: @ 816DC64 ldrh r4, [r3, 0xA] movs r0, 0xA ldrsh r1, [r3, r0] - ldr r0, _0816DCA0 + ldr r0, =0x000006bf cmp r1, r0 bgt _0816DCA4 ldrh r0, [r3, 0xC] @@ -749068,10 +723799,9 @@ task_intro_11: @ 816DC64 strh r0, [r3, 0xC] b _0816DCA8 .align 2, 0 -_0816DC9C: .4byte 0x03005e00 -_0816DCA0: .4byte 0x000006bf + .pool _0816DCA4: - ldr r0, _0816DCF0 + ldr r0, =task_intro_12 + 1 str r0, [r3] _0816DCA8: lsls r4, r5, 2 @@ -749090,13 +723820,13 @@ _0816DCA8: movs r0, 0x78 movs r1, 0x50 bl sub_816F2A8 - ldr r0, _0816DCF4 + ldr r0, =0x030062a0 ldr r0, [r0] cmp r0, 0x1C bne _0816DCE6 movs r0, 0x1 negs r0, r0 - ldr r1, _0816DCF8 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0 @@ -749108,9 +723838,7 @@ _0816DCE6: pop {r0} bx r0 .align 2, 0 -_0816DCF0: .4byte task_intro_12 + 1 -_0816DCF4: .4byte 0x030062a0 -_0816DCF8: .4byte 0x0000ffff + .pool thumb_func_end task_intro_11 thumb_func_start task_intro_12 @@ -749118,24 +723846,22 @@ task_intro_12: @ 816DCFC push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0816DD1C + ldr r0, =0x030062a0 ldr r0, [r0] cmp r0, 0x2B bls _0816DD18 - ldr r0, _0816DD20 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _0816DD24 + ldr r0, =task_intro_13 + 1 str r0, [r1] _0816DD18: pop {r0} bx r0 .align 2, 0 -_0816DD1C: .4byte 0x030062a0 -_0816DD20: .4byte 0x03005e00 -_0816DD24: .4byte task_intro_13 + 1 + .pool thumb_func_end task_intro_12 thumb_func_start task_intro_13 @@ -749143,7 +723869,7 @@ task_intro_13: @ 816DD28 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0816DD9C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -749152,58 +723878,44 @@ task_intro_13: @ 816DD28 bl intro_reset_and_hide_bgs bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r1, _0816DDA0 + ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] - ldr r0, _0816DDA4 + ldr r0, =0x08d88494 movs r1, 0xC0 lsls r1, 19 bl call_LZZUnCompVram - ldr r0, _0816DDA8 - ldr r1, _0816DDAC + ldr r0, =0x08d88d40 + ldr r1, =0x0600c000 bl call_LZZUnCompVram - ldr r0, _0816DDB0 - ldr r1, _0816DDB4 + ldr r0, =0x08d89f7c + ldr r1, =0x06004000 bl call_LZZUnCompVram - ldr r0, _0816DDB8 - ldr r1, _0816DDBC + ldr r0, =0x08d8a818 + ldr r1, =0x0600e000 bl call_LZZUnCompVram - ldr r0, _0816DDC0 + ldr r0, =0x08524d14 bl gpu_tile_obj_decompress_and_load3 - ldr r0, _0816DDC4 + ldr r0, =0x0852561c bl gpu_pal_obj_decompress_and_apply3 - ldr r0, _0816DDC8 - ldr r1, _0816DDCC + ldr r0, =0x08d85cd0 + ldr r1, =0x02037714 movs r2, 0x80 lsls r2, 1 bl CpuSet - ldr r1, _0816DDD0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816DDD4 + ldr r1, =task_intro_14 + 1 str r1, [r0] _0816DD94: pop {r4} pop {r0} bx r0 .align 2, 0 -_0816DD9C: .4byte 0x02037fd4 -_0816DDA0: .4byte 0x0300301c -_0816DDA4: .4byte 0x08d88494 -_0816DDA8: .4byte 0x08d88d40 -_0816DDAC: .4byte 0x0600c000 -_0816DDB0: .4byte 0x08d89f7c -_0816DDB4: .4byte 0x06004000 -_0816DDB8: .4byte 0x08d8a818 -_0816DDBC: .4byte 0x0600e000 -_0816DDC0: .4byte 0x08524d14 -_0816DDC4: .4byte 0x0852561c -_0816DDC8: .4byte 0x08d85cd0 -_0816DDCC: .4byte 0x02037714 -_0816DDD0: .4byte 0x03005e00 -_0816DDD4: .4byte task_intro_14 + 1 + .pool thumb_func_end task_intro_13 thumb_func_start task_intro_14 @@ -749225,54 +723937,47 @@ task_intro_14: @ 816DDD8 movs r0, 0x4A movs r1, 0 bl lcd_io_set - ldr r1, _0816DE5C + ldr r1, =0x0000b880 movs r0, 0xC bl lcd_io_set - ldr r1, _0816DE60 + ldr r1, =0x00001c05 movs r0, 0xA bl lcd_io_set - ldr r1, _0816DE64 + ldr r1, =0x00003641 movs r0, 0 bl lcd_io_set movs r0, 0x1 negs r0, r0 - ldr r1, _0816DE68 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _0816DE6C + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 adds r4, r0 movs r0, 0 strh r0, [r4, 0x8] - ldr r0, _0816DE70 + ldr r0, =0x0000ffa0 strh r0, [r4, 0xA] - ldr r1, _0816DE74 + ldr r1, =0x0000ff51 strh r1, [r4, 0xC] movs r2, 0x80 lsls r2, 1 strh r2, [r4, 0xE] movs r3, 0 bl sub_816F2A8 - ldr r0, _0816DE78 + ldr r0, =task_intro_15 + 1 str r0, [r4] add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0816DE5C: .4byte 0x0000b880 -_0816DE60: .4byte 0x00001c05 -_0816DE64: .4byte 0x00003641 -_0816DE68: .4byte 0x0000ffff -_0816DE6C: .4byte 0x03005e00 -_0816DE70: .4byte 0x0000ffa0 -_0816DE74: .4byte 0x0000ff51 -_0816DE78: .4byte task_intro_15 + 1 + .pool thumb_func_end task_intro_14 thumb_func_start task_intro_15 @@ -749280,7 +723985,7 @@ task_intro_15: @ 816DE7C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0816DEB4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -749304,37 +724009,36 @@ task_intro_15: @ 816DE7C bl lcd_io_set b _0816DEC6 .align 2, 0 -_0816DEB4: .4byte 0x03005e00 + .pool _0816DEB8: movs r1, 0x82 lsls r1, 6 movs r0, 0x44 bl lcd_io_set - ldr r0, _0816DECC + ldr r0, =task_intro_16 + 1 str r0, [r4] _0816DEC6: pop {r4} pop {r0} bx r0 .align 2, 0 -_0816DECC: .4byte task_intro_16 + 1 + .pool thumb_func_end task_intro_15 thumb_func_start task_intro_16 task_intro_16: @ 816DED0 lsls r0, 24 lsrs r0, 24 - ldr r2, _0816DEE4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _0816DEE8 + ldr r0, =task_intro_17 + 1 str r0, [r1] bx lr .align 2, 0 -_0816DEE4: .4byte 0x03005e00 -_0816DEE8: .4byte task_intro_17 + 1 + .pool thumb_func_end task_intro_16 thumb_func_start task_intro_17 @@ -749343,14 +724047,14 @@ task_intro_17: @ 816DEEC sub sp, 0xC lsls r0, 24 lsrs r0, 24 - ldr r2, _0816DF24 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 movs r2, 0 strh r2, [r1, 0x8] - ldr r0, _0816DF28 + ldr r0, =task_intro_18 + 1 str r0, [r1] movs r0, 0x1 str r0, [sp] @@ -749366,8 +724070,7 @@ task_intro_17: @ 816DEEC pop {r0} bx r0 .align 2, 0 -_0816DF24: .4byte 0x03005e00 -_0816DF28: .4byte task_intro_18 + 1 + .pool thumb_func_end task_intro_17 thumb_func_start task_intro_18 @@ -749379,7 +724082,7 @@ task_intro_18: @ 816DF2C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0816DF8C + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -749416,13 +724119,12 @@ _0816DF62: b _0816E176 _0816DF80: lsls r0, 2 - ldr r1, _0816DF90 + ldr r1, =_0816DF94 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0816DF8C: .4byte 0x03005e08 -_0816DF90: .4byte _0816DF94 + .pool .align 2, 0 _0816DF94: .4byte _0816DFBC @@ -749470,9 +724172,9 @@ _0816DFF4: strh r0, [r4, 0xC] movs r1, 0xE ldrsh r0, [r4, r1] - ldr r1, _0816E01C + ldr r1, =0x08d85cd0 adds r0, r1 - ldr r1, _0816E020 + ldr r1, =0x02037b52 movs r2, 0x1 bl CpuSet ldrh r0, [r4, 0xE] @@ -749487,8 +724189,7 @@ _0816DFF4: _0816E01A: b _0816E14E .align 2, 0 -_0816E01C: .4byte 0x08d85cd0 -_0816E020: .4byte 0x02037b52 + .pool _0816E024: ldrh r0, [r4, 0xC] subs r0, 0x1 @@ -749514,9 +724215,9 @@ _0816E046: strh r0, [r4, 0xC] movs r2, 0xE ldrsh r0, [r4, r2] - ldr r1, _0816E074 + ldr r1, =0x08d85cd0 adds r0, r1 - ldr r1, _0816E078 + ldr r1, =0x02037b52 movs r2, 0x1 bl CpuSet ldrh r0, [r4, 0xE] @@ -749533,8 +724234,7 @@ _0816E06C: strh r0, [r4, 0xC] b _0816E14E .align 2, 0 -_0816E074: .4byte 0x08d85cd0 -_0816E078: .4byte 0x02037b52 + .pool _0816E07C: ldrh r0, [r4, 0xC] subs r0, 0x1 @@ -749565,7 +724265,7 @@ _0816E09A: strh r0, [r4, 0x4] movs r0, 0x10 strh r0, [r4, 0xC] - ldr r0, _0816E0C4 + ldr r0, =0x00000195 str r1, [sp] movs r1, 0 movs r2, 0x64 @@ -749573,7 +724273,7 @@ _0816E09A: bl sub_80A344C b _0816E14E .align 2, 0 -_0816E0C4: .4byte 0x00000195 + .pool _0816E0C8: ldrh r0, [r4, 0xC] subs r0, 0x1 @@ -749593,7 +724293,7 @@ _0816E0DE: ldrh r0, [r4, 0x4] adds r0, 0x4 strh r0, [r4, 0x4] - ldr r2, _0816E134 + ldr r2, =0x00000666 adds r0, r2, 0 ldrh r1, [r4, 0xC] adds r0, r1 @@ -749617,7 +724317,7 @@ _0816E0DE: bne _0816E176 movs r0, 0x2 negs r0, r0 - ldr r1, _0816E138 + ldr r1, =0x00007fff str r1, [sp] movs r1, 0x3 movs r2, 0 @@ -749628,8 +724328,7 @@ _0816E0DE: strh r0, [r4, 0x8] b _0816E14E .align 2, 0 -_0816E134: .4byte 0x00000666 -_0816E138: .4byte 0x00007fff + .pool _0816E13C: ldrh r1, [r4, 0x6] movs r2, 0x6 @@ -749646,20 +724345,20 @@ _0816E14E: strh r0, [r4] b _0816E176 _0816E156: - ldr r0, _0816E180 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0816E176 - ldr r1, _0816E184 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0816E188 + ldr r1, =task_intro_19 + 1 str r1, [r0] - ldr r1, _0816E18C + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] _0816E176: @@ -749668,10 +724367,7 @@ _0816E176: pop {r0} bx r0 .align 2, 0 -_0816E180: .4byte 0x02037fd4 -_0816E184: .4byte 0x03005e00 -_0816E188: .4byte task_intro_19 + 1 -_0816E18C: .4byte 0x02039b28 + .pool thumb_func_end task_intro_18 thumb_func_start sub_816E190 @@ -749680,14 +724376,14 @@ sub_816E190: @ 816E190 lsls r0, 24 lsrs r7, r0, 24 movs r4, 0 - ldr r6, _0816E1E8 - ldr r5, _0816E1EC + ldr r6, =0x02020630 + ldr r5, =0x085e4c64 _0816E19C: movs r0, 0 ldrsh r1, [r5, r0] lsls r3, r4, 24 lsrs r3, 24 - ldr r0, _0816E1F0 + ldr r0, =0x08596c10 movs r2, 0xA0 bl obj_add_from_template_forward_search lsls r0, 24 @@ -749698,7 +724394,7 @@ _0816E19C: adds r0, r6, 0 adds r0, 0x1C adds r0, r2, r0 - ldr r1, _0816E1F4 + ldr r1, =sub_816E1F8 + 1 str r1, [r0] adds r2, r6 ldrb r0, [r2, 0x5] @@ -749720,10 +724416,7 @@ _0816E19C: pop {r0} bx r0 .align 2, 0 -_0816E1E8: .4byte 0x02020630 -_0816E1EC: .4byte 0x085e4c64 -_0816E1F0: .4byte 0x08596c10 -_0816E1F4: .4byte sub_816E1F8 + 1 + .pool thumb_func_end sub_816E190 thumb_func_start sub_816E1F8 @@ -749751,7 +724444,7 @@ _0816E214: beq _0816E278 b _0816E29C _0816E222: - ldr r2, _0816E270 + ldr r2, =0x085e4c64 movs r0, 0x30 ldrsh r1, [r3, r0] lsls r0, r1, 1 @@ -749775,7 +724468,7 @@ _0816E222: movs r0, 0xFF ands r2, r0 strh r2, [r3, 0x32] - ldr r2, _0816E274 + ldr r2, =0x03005e00 movs r0, 0x36 ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -749791,8 +724484,7 @@ _0816E222: strh r0, [r3, 0x2E] b _0816E29C .align 2, 0 -_0816E270: .4byte 0x085e4c64 -_0816E274: .4byte 0x03005e00 + .pool _0816E278: ldrh r1, [r3, 0x20] movs r2, 0x20 @@ -749829,34 +724521,34 @@ task_intro_19: @ 816E2A0 lsls r4, 24 lsrs r4, 24 bl reset_all_obj_data - ldr r0, _0816E330 + ldr r0, =0x08d89224 movs r1, 0xC0 lsls r1, 19 bl call_LZZUnCompVram - ldr r0, _0816E334 - ldr r1, _0816E338 + ldr r0, =0x08d89abc + ldr r1, =0x0600c000 bl call_LZZUnCompVram - ldr r0, _0816E33C - ldr r1, _0816E340 + ldr r0, =0x08d8a934 + ldr r1, =0x0600e000 bl call_LZZUnCompVram - ldr r0, _0816E344 + ldr r0, =0x085e4c88 bl gpu_tile_obj_decompress_and_load - ldr r0, _0816E348 + ldr r0, =0x085e4c98 bl gpu_pal_obj_alloc_tag_and_apply movs r0, 0x2 negs r0, r0 - ldr r1, _0816E34C + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _0816E350 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0816E354 + ldr r0, =task_intro_20 + 1 str r0, [r1] movs r4, 0 strh r4, [r1, 0x8] @@ -749887,16 +724579,7 @@ task_intro_19: @ 816E2A0 pop {r0} bx r0 .align 2, 0 -_0816E330: .4byte 0x08d89224 -_0816E334: .4byte 0x08d89abc -_0816E338: .4byte 0x0600c000 -_0816E33C: .4byte 0x08d8a934 -_0816E340: .4byte 0x0600e000 -_0816E344: .4byte 0x085e4c88 -_0816E348: .4byte 0x085e4c98 -_0816E34C: .4byte 0x0000ffff -_0816E350: .4byte 0x03005e00 -_0816E354: .4byte task_intro_20 + 1 + .pool thumb_func_end task_intro_19 thumb_func_start task_intro_20 @@ -749908,7 +724591,7 @@ task_intro_20: @ 816E358 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _0816E38C + ldr r1, =0x03005e08 adds r5, r0, r1 ldrh r0, [r5, 0x2] ldrh r1, [r5, 0x4] @@ -749922,13 +724605,12 @@ task_intro_20: @ 816E358 b _0816E6BC _0816E380: lsls r0, 2 - ldr r1, _0816E390 + ldr r1, =_0816E394 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0816E38C: .4byte 0x03005e08 -_0816E390: .4byte _0816E394 + .pool .align 2, 0 _0816E394: .4byte _0816E3CC @@ -749966,7 +724648,7 @@ _0816E3E0: movs r1, 0x80 lsls r1, 1 bl sine - ldr r1, _0816E438 + ldr r1, =0x03005e00 lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -750000,7 +724682,7 @@ _0816E420: bl sub_816E6D4 b _0816E6BC .align 2, 0 -_0816E438: .4byte 0x03005e00 + .pool _0816E43C: ldrh r0, [r5, 0xC] subs r0, 0x1 @@ -750010,7 +724692,7 @@ _0816E43C: beq _0816E44A b _0816E6BC _0816E44A: - ldr r0, _0816E480 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -750021,7 +724703,7 @@ _0816E44A: ldrh r2, [r1, 0xA] adds r0, r2 strh r0, [r1, 0xA] - ldr r2, _0816E484 + ldr r2, =0xfffffefe adds r0, r2, 0 ldrh r2, [r1, 0xC] adds r0, r2 @@ -750036,8 +724718,7 @@ _0816E44A: bl sub_816E74C b _0816E6BC .align 2, 0 -_0816E480: .4byte 0x03005e00 -_0816E484: .4byte 0xfffffefe + .pool _0816E488: ldrh r0, [r5, 0xC] subs r0, 0x1 @@ -750047,12 +724728,12 @@ _0816E488: beq _0816E496 b _0816E6BC _0816E496: - ldr r0, _0816E4BC + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r2, _0816E4C0 + ldr r2, =0xffffff00 adds r0, r2, 0 ldrh r2, [r1, 0xA] adds r0, r2 @@ -750067,8 +724748,7 @@ _0816E496: strh r0, [r5, 0xC] b _0816E690 .align 2, 0 -_0816E4BC: .4byte 0x03005e00 -_0816E4C0: .4byte 0xffffff00 + .pool _0816E4C4: ldrh r0, [r5, 0xC] subs r0, 0x1 @@ -750078,7 +724758,7 @@ _0816E4C4: beq _0816E4D2 b _0816E6BC _0816E4D2: - ldr r1, _0816E4E8 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -750090,7 +724770,7 @@ _0816E4D2: strh r0, [r5, 0xC] b _0816E690 .align 2, 0 -_0816E4E8: .4byte 0x03005e00 + .pool _0816E4EC: ldrh r0, [r5, 0xC] subs r0, 0x1 @@ -750100,7 +724780,7 @@ _0816E4EC: beq _0816E4FA b _0816E6BC _0816E4FA: - ldr r0, _0816E524 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -750121,7 +724801,7 @@ _0816E4FA: strh r0, [r5] b _0816E6BC .align 2, 0 -_0816E524: .4byte 0x03005e00 + .pool _0816E528: movs r0, 0x1 strh r0, [r5, 0xC] @@ -750165,9 +724845,9 @@ _0816E56E: strh r0, [r5, 0xC] movs r2, 0xE ldrsh r0, [r5, r2] - ldr r1, _0816E598 + ldr r1, =0x08d85cd0 adds r0, r1 - ldr r1, _0816E59C + ldr r1, =0x02037b72 movs r2, 0x1 bl CpuSet ldrh r0, [r5, 0xE] @@ -750182,8 +724862,7 @@ _0816E56E: _0816E594: b _0816E690 .align 2, 0 -_0816E598: .4byte 0x08d85cd0 -_0816E59C: .4byte 0x02037b72 + .pool _0816E5A0: ldrh r0, [r5, 0xC] subs r0, 0x1 @@ -750211,9 +724890,9 @@ _0816E5BC: strh r0, [r5, 0xC] movs r2, 0xE ldrsh r0, [r5, r2] - ldr r1, _0816E5F4 + ldr r1, =0x08d85cd0 adds r0, r1 - ldr r1, _0816E5F8 + ldr r1, =0x02037b72 movs r2, 0x1 bl CpuSet ldrh r0, [r5, 0xE] @@ -750228,8 +724907,7 @@ _0816E5BC: strh r0, [r5, 0xC] b _0816E690 .align 2, 0 -_0816E5F4: .4byte 0x08d85cd0 -_0816E5F8: .4byte 0x02037b72 + .pool _0816E5FC: ldrh r0, [r5, 0xC] subs r0, 0x1 @@ -750256,7 +724934,7 @@ _0816E61A: ldrsh r0, [r5, r1] movs r1, 0x3C bl sine - ldr r2, _0816E65C + ldr r2, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -750269,7 +724947,7 @@ _0816E61A: bne _0816E6BC movs r0, 0x2 negs r0, r0 - ldr r1, _0816E660 + ldr r1, =0x00007fff str r1, [sp] movs r1, 0x3 movs r2, 0 @@ -750277,8 +724955,7 @@ _0816E61A: bl sub_80A1AD4 b _0816E690 .align 2, 0 -_0816E65C: .4byte 0x03005e00 -_0816E660: .4byte 0x00007fff + .pool _0816E664: ldrh r0, [r5, 0xC] adds r0, 0x4 @@ -750290,7 +724967,7 @@ _0816E664: ldrsh r0, [r5, r1] movs r1, 0x14 bl sine - ldr r2, _0816E698 + ldr r2, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -750307,22 +724984,22 @@ _0816E690: strh r0, [r5] b _0816E6BC .align 2, 0 -_0816E698: .4byte 0x03005e00 + .pool _0816E69C: - ldr r0, _0816E6C4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0816E6BC - ldr r1, _0816E6C8 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _0816E6CC + ldr r1, =task_intro_21 + 1 str r1, [r0] - ldr r1, _0816E6D0 + ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] _0816E6BC: @@ -750331,10 +725008,7 @@ _0816E6BC: pop {r0} bx r0 .align 2, 0 -_0816E6C4: .4byte 0x02037fd4 -_0816E6C8: .4byte 0x03005e00 -_0816E6CC: .4byte task_intro_21 + 1 -_0816E6D0: .4byte 0x02039b28 + .pool thumb_func_end task_intro_20 thumb_func_start sub_816E6D4 @@ -750347,8 +725021,8 @@ sub_816E6D4: @ 816E6D4 lsrs r0, 24 mov r8, r0 movs r5, 0 - ldr r7, _0816E740 - ldr r0, _0816E744 + ldr r7, =0x085e4ca8 + ldr r0, =0x02020630 mov r9, r0 adds r4, r7, 0 movs r6, 0 @@ -750361,7 +725035,7 @@ _0816E6EE: ldrsh r2, [r0, r3] lsls r3, r5, 24 lsrs r3, 24 - ldr r0, _0816E748 + ldr r0, =0x085e4d14 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 @@ -750393,9 +725067,7 @@ _0816E6EE: pop {r0} bx r0 .align 2, 0 -_0816E740: .4byte 0x085e4ca8 -_0816E744: .4byte 0x02020630 -_0816E748: .4byte 0x085e4d14 + .pool thumb_func_end sub_816E6D4 thumb_func_start sub_816E74C @@ -750404,10 +725076,10 @@ sub_816E74C: @ 816E74C mov r7, r8 push {r7} movs r5, 0 - ldr r7, _0816E7A8 + ldr r7, =0x085e4ca8 adds r4, r7, 0x4 movs r6, 0x24 - ldr r0, _0816E7AC + ldr r0, =0x02020630 mov r8, r0 _0816E75E: movs r3, 0x20 @@ -750418,7 +725090,7 @@ _0816E75E: ldrsh r2, [r0, r3] lsls r3, r5, 24 lsrs r3, 24 - ldr r0, _0816E7B0 + ldr r0, =0x085e4d14 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 @@ -750447,9 +725119,7 @@ _0816E75E: pop {r0} bx r0 .align 2, 0 -_0816E7A8: .4byte 0x085e4ca8 -_0816E7AC: .4byte 0x02020630 -_0816E7B0: .4byte 0x085e4d14 + .pool thumb_func_end sub_816E74C thumb_func_start sub_816E7B4 @@ -750513,7 +725183,7 @@ _0816E80A: ands r0, r1 strb r0, [r2] _0816E82A: - ldr r2, _0816E848 + ldr r2, =0x03005e00 movs r0, 0x38 ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -750529,7 +725199,7 @@ _0816E82A: strh r0, [r4, 0x2E] b _0816E882 .align 2, 0 -_0816E848: .4byte 0x03005e00 + .pool _0816E84C: ldrh r1, [r4, 0x20] movs r2, 0x20 @@ -750576,7 +725246,7 @@ task_intro_21: @ 816E888 movs r0, 0x50 movs r1, 0x87 bl lcd_io_set - ldr r1, _0816E92C + ldr r1, =0x00001f1f movs r0, 0x52 bl lcd_io_set movs r0, 0x54 @@ -750586,10 +725256,10 @@ task_intro_21: @ 816E888 lsls r1, 7 movs r0, 0x8 bl lcd_io_set - ldr r1, _0816E930 + ldr r1, =0x00005a04 movs r0, 0xA bl lcd_io_set - ldr r1, _0816E934 + ldr r1, =0x00001c06 movs r0, 0xC bl lcd_io_set movs r1, 0xDD @@ -750602,7 +725272,7 @@ task_intro_21: @ 816E888 movs r0, 0x12 movs r1, 0 bl lcd_io_set - ldr r1, _0816E938 + ldr r1, =0x0000ffb0 movs r0, 0x14 bl lcd_io_set movs r0, 0x16 @@ -750614,38 +725284,29 @@ task_intro_21: @ 816E888 movs r0, 0x1A movs r1, 0 bl lcd_io_set - ldr r4, _0816E93C + ldr r4, =0x08d8aa54 movs r1, 0xC0 lsls r1, 19 adds r0, r4, 0 bl call_LZZUnCompVram - ldr r1, _0816E940 + ldr r1, =0x06004000 adds r0, r4, 0 bl call_LZZUnCompVram - ldr r0, _0816E944 - ldr r1, _0816E948 + ldr r0, =0x08d8b6e8 + ldr r1, =0x0600e000 bl call_LZZUnCompVram - ldr r1, _0816E94C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0816E950 + ldr r1, =task_intro_22 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0816E92C: .4byte 0x00001f1f -_0816E930: .4byte 0x00005a04 -_0816E934: .4byte 0x00001c06 -_0816E938: .4byte 0x0000ffb0 -_0816E93C: .4byte 0x08d8aa54 -_0816E940: .4byte 0x06004000 -_0816E944: .4byte 0x08d8b6e8 -_0816E948: .4byte 0x0600e000 -_0816E94C: .4byte 0x03005e00 -_0816E950: .4byte task_intro_22 + 1 + .pool thumb_func_end task_intro_21 thumb_func_start task_intro_22 @@ -750654,29 +725315,24 @@ task_intro_22: @ 816E954 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0816E980 - ldr r1, _0816E984 + ldr r0, =0x08d8b180 + ldr r1, =0x0600c000 bl call_LZZUnCompVram - ldr r0, _0816E988 - ldr r1, _0816E98C + ldr r0, =0x08d8b440 + ldr r1, =0x0600d000 bl call_LZZUnCompVram - ldr r1, _0816E990 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816E994 + ldr r1, =task_intro_23 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0816E980: .4byte 0x08d8b180 -_0816E984: .4byte 0x0600c000 -_0816E988: .4byte 0x08d8b440 -_0816E98C: .4byte 0x0600d000 -_0816E990: .4byte 0x03005e00 -_0816E994: .4byte task_intro_23 + 1 + .pool thumb_func_end task_intro_22 thumb_func_start task_intro_23 @@ -750694,12 +725350,12 @@ task_intro_23: @ 816E998 movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r1, _0816E9D4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816E9D8 + ldr r1, =task_intro_24 + 1 str r1, [r0] movs r1, 0 strh r1, [r0, 0x8] @@ -750709,8 +725365,7 @@ task_intro_23: @ 816E998 pop {r0} bx r0 .align 2, 0 -_0816E9D4: .4byte 0x03005e00 -_0816E9D8: .4byte task_intro_24 + 1 + .pool thumb_func_end task_intro_23 thumb_func_start task_intro_24 @@ -750722,7 +725377,7 @@ task_intro_24: @ 816E9DC lsls r1, r0, 2 adds r1, r0 lsls r5, r1, 3 - ldr r6, _0816EA20 + ldr r6, =0x03005e08 adds r4, r5, r6 ldrh r1, [r4, 0xC] lsls r1, 16 @@ -750747,7 +725402,7 @@ task_intro_24: @ 816E9DC beq _0816EA58 b _0816EAA6 .align 2, 0 -_0816EA20: .4byte 0x03005e08 + .pool _0816EA24: ldrh r0, [r4, 0xC] subs r0, 0x1 @@ -750757,7 +725412,7 @@ _0816EA24: bne _0816EAA6 movs r0, 0x2 negs r0, r0 - ldr r1, _0816EA54 + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0 movs r2, 0x10 @@ -750772,7 +725427,7 @@ _0816EA24: strh r0, [r4] b _0816EAA6 .align 2, 0 -_0816EA54: .4byte 0x0000ffff + .pool _0816EA58: movs r0, 0xC ldrsh r1, [r4, r0] @@ -750780,8 +725435,8 @@ _0816EA58: lsls r0, 6 cmp r1, r0 bne _0816EA74 - ldr r0, _0816EA88 - ldr r1, _0816EA8C + ldr r0, =0x0000fffe + ldr r1, =0x00002949 str r1, [sp] movs r1, 0x3 movs r2, 0 @@ -750798,10 +725453,9 @@ _0816EA74: strh r0, [r4, 0xC] b _0816EAA6 .align 2, 0 -_0816EA88: .4byte 0x0000fffe -_0816EA8C: .4byte 0x00002949 + .pool _0816EA90: - ldr r0, _0816EAB0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -750810,7 +725464,7 @@ _0816EA90: adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 - ldr r1, _0816EAB4 + ldr r1, =task_intro_25 + 1 str r1, [r0] _0816EAA6: add sp, 0x4 @@ -750818,8 +725472,7 @@ _0816EAA6: pop {r0} bx r0 .align 2, 0 -_0816EAB0: .4byte 0x02037fd4 -_0816EAB4: .4byte task_intro_25 + 1 + .pool thumb_func_end task_intro_24 thumb_func_start task_intro_25 @@ -750828,16 +725481,16 @@ task_intro_25: @ 816EAB8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0816EB18 - ldr r1, _0816EB1C + ldr r0, =0x08d8c16c + ldr r1, =0x0600e000 bl call_LZZUnCompVram - ldr r0, _0816EB20 - ldr r1, _0816EB24 + ldr r0, =0x08d8ccc8 + ldr r1, =0x0600c000 bl call_LZZUnCompVram - ldr r0, _0816EB28 - ldr r1, _0816EB2C + ldr r0, =0x08d8ba74 + ldr r1, =0x06004000 bl call_LZZUnCompVram - ldr r0, _0816EB30 + ldr r0, =0x08d8c838 movs r1, 0xC0 lsls r1, 19 bl call_LZZUnCompVram @@ -750845,37 +725498,27 @@ task_intro_25: @ 816EAB8 lsls r1, 6 movs r0, 0 bl lcd_io_set - ldr r1, _0816EB34 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0816EB38 + ldr r1, =task_intro_26 + 1 str r1, [r0] movs r2, 0 strh r2, [r0, 0x8] movs r1, 0x1 strh r1, [r0, 0x14] strh r2, [r0, 0x16] - ldr r0, _0816EB3C + ldr r0, =0x085e4bf4 bl gpu_tile_obj_decompress_and_load3 - ldr r0, _0816EB40 + ldr r0, =0x085e4c04 bl gpu_pal_obj_alloc_and_load_multiple pop {r4} pop {r0} bx r0 .align 2, 0 -_0816EB18: .4byte 0x08d8c16c -_0816EB1C: .4byte 0x0600e000 -_0816EB20: .4byte 0x08d8ccc8 -_0816EB24: .4byte 0x0600c000 -_0816EB28: .4byte 0x08d8ba74 -_0816EB2C: .4byte 0x06004000 -_0816EB30: .4byte 0x08d8c838 -_0816EB34: .4byte 0x03005e00 -_0816EB38: .4byte task_intro_26 + 1 -_0816EB3C: .4byte 0x085e4bf4 -_0816EB40: .4byte 0x085e4c04 + .pool thumb_func_end task_intro_25 thumb_func_start task_intro_26 @@ -750886,7 +725529,7 @@ task_intro_26: @ 816EB44 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r2, _0816EB68 + ldr r2, =0x03005e08 adds r6, r1, r2 movs r3, 0 ldrsh r0, [r6, r3] @@ -750898,7 +725541,7 @@ task_intro_26: @ 816EB44 beq _0816EB72 b _0816EC62 .align 2, 0 -_0816EB68: .4byte 0x03005e08 + .pool _0816EB6C: cmp r0, 0x2 beq _0816EC4C @@ -750910,7 +725553,7 @@ _0816EB72: lsls r0, 16 cmp r0, 0 bne _0816EC62 - ldr r4, _0816EBD8 + ldr r4, =0x085e4c4c adds r0, r4, 0 movs r1, 0xC8 movs r2, 0x30 @@ -750926,7 +725569,7 @@ _0816EB72: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0816EBDC + ldr r5, =0x02020630 adds r0, r5 movs r1, 0x1 bl obj_anim_image_start @@ -750950,8 +725593,7 @@ _0816EB72: strh r0, [r6, 0xC] b _0816EC62 .align 2, 0 -_0816EBD8: .4byte 0x085e4c4c -_0816EBDC: .4byte 0x02020630 + .pool _0816EBE0: ldrh r0, [r6, 0xC] subs r0, 0x1 @@ -750959,7 +725601,7 @@ _0816EBE0: lsls r0, 16 cmp r0, 0 bne _0816EC62 - ldr r4, _0816EC44 + ldr r4, =0x085e4c4c adds r0, r4, 0 movs r1, 0x28 movs r2, 0x30 @@ -750975,7 +725617,7 @@ _0816EBE0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0816EC48 + ldr r5, =0x02020630 adds r0, r5 movs r1, 0x1 bl obj_anim_image_start @@ -750999,8 +725641,7 @@ _0816EBE0: strh r0, [r6, 0xC] b _0816EC62 .align 2, 0 -_0816EC44: .4byte 0x085e4c4c -_0816EC48: .4byte 0x02020630 + .pool _0816EC4C: ldrh r0, [r6, 0xC] subs r0, 0x1 @@ -751011,14 +725652,14 @@ _0816EC4C: adds r0, r2, 0 subs r0, 0x8 adds r0, r1, r0 - ldr r1, _0816EC68 + ldr r1, =task_intro_27 + 1 str r1, [r0] _0816EC62: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0816EC68: .4byte task_intro_27 + 1 + .pool thumb_func_end task_intro_26 thumb_func_start sub_816EC6C @@ -751061,9 +725702,9 @@ _0816ECA0: _0816ECAC: movs r1, 0x30 ldrsh r0, [r4, r1] - ldr r1, _0816ED18 + ldr r1, =0x08d85cd0 adds r0, r1 - ldr r1, _0816ED1C + ldr r1, =0x02037bce movs r2, 0x1 bl CpuSet ldrh r0, [r4, 0x30] @@ -751093,9 +725734,9 @@ _0816ECDC: strh r0, [r4, 0x32] movs r1, 0x30 ldrsh r0, [r4, r1] - ldr r1, _0816ED18 + ldr r1, =0x08d85cd0 adds r0, r1 - ldr r1, _0816ED1C + ldr r1, =0x02037bce movs r2, 0x1 bl CpuSet ldrh r0, [r4, 0x30] @@ -751113,8 +725754,7 @@ _0816ED12: pop {r0} bx r0 .align 2, 0 -_0816ED18: .4byte 0x08d85cd0 -_0816ED1C: .4byte 0x02037bce + .pool thumb_func_end sub_816EC6C thumb_func_start task_intro_27 @@ -751124,23 +725764,23 @@ task_intro_27: @ 816ED20 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _0816ED90 + ldr r0, =0x085e5048 bl gpu_tile_obj_decompress_and_load - ldr r0, _0816ED94 + ldr r0, =0x085e5058 bl gpu_pal_obj_alloc_and_load_multiple movs r1, 0xD5 lsls r1, 6 movs r0, 0 bl lcd_io_set - ldr r6, _0816ED98 + ldr r6, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 adds r4, r6 - ldr r0, _0816ED9C + ldr r0, =task_intro_28 + 1 str r0, [r4] - ldr r0, _0816EDA0 - ldr r1, _0816EDA4 + ldr r0, =0x0000ffde + ldr r1, =0x00002949 str r1, [sp] movs r1, 0 movs r2, 0x10 @@ -751150,12 +725790,12 @@ task_intro_27: @ 816ED20 strh r0, [r4, 0x8] movs r0, 0xA8 strh r0, [r4, 0xA] - ldr r1, _0816EDA8 + ldr r1, =0x0000fff0 strh r1, [r4, 0xC] - ldr r0, _0816EDAC + ldr r0, =0x0000ff78 strh r0, [r4, 0xE] strh r1, [r4, 0x10] - ldr r0, _0816EDB0 + ldr r0, =sub_816EEA8 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -751170,15 +725810,7 @@ task_intro_27: @ 816ED20 pop {r0} bx r0 .align 2, 0 -_0816ED90: .4byte 0x085e5048 -_0816ED94: .4byte 0x085e5058 -_0816ED98: .4byte 0x03005e00 -_0816ED9C: .4byte task_intro_28 + 1 -_0816EDA0: .4byte 0x0000ffde -_0816EDA4: .4byte 0x00002949 -_0816EDA8: .4byte 0x0000fff0 -_0816EDAC: .4byte 0x0000ff78 -_0816EDB0: .4byte sub_816EEA8 + 1 + .pool thumb_func_end task_intro_27 thumb_func_start task_intro_28 @@ -751189,7 +725821,7 @@ task_intro_28: @ 816EDB4 lsls r1, r0, 2 adds r1, r0 lsls r4, r1, 3 - ldr r5, _0816EDF0 + ldr r5, =0x03005e08 adds r2, r4, r5 ldrh r0, [r2, 0xE] movs r3, 0x1 @@ -751214,7 +725846,7 @@ _0816EDD6: beq _0816EDFE b _0816EE86 .align 2, 0 -_0816EDF0: .4byte 0x03005e08 + .pool _0816EDF4: cmp r1, 0x2 beq _0816EE3A @@ -751267,7 +725899,7 @@ _0816EE3A: ldrh r0, [r2, 0x8] subs r0, 0x2 strh r0, [r2, 0x8] - ldr r0, _0816EE6C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -751280,7 +725912,7 @@ _0816EE3A: strh r0, [r2] b _0816EE86 .align 2, 0 -_0816EE6C: .4byte 0x02037fd4 + .pool _0816EE70: ldrh r0, [r2, 0xA] subs r0, 0x1 @@ -751291,14 +725923,14 @@ _0816EE70: adds r0, r5, 0 subs r0, 0x8 adds r0, r4, r0 - ldr r1, _0816EE8C + ldr r1, =task_intro_29 + 1 str r1, [r0] _0816EE86: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0816EE8C: .4byte task_intro_29 + 1 + .pool thumb_func_end task_intro_28 thumb_func_start task_intro_29 @@ -751307,12 +725939,12 @@ task_intro_29: @ 816EE90 lsls r0, 24 lsrs r0, 24 bl remove_task - ldr r0, _0816EEA4 + ldr r0, =sub_816CC54 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0816EEA4: .4byte sub_816CC54 + 1 + .pool thumb_func_end task_intro_29 thumb_func_start sub_816EEA8 @@ -751324,7 +725956,7 @@ sub_816EEA8: @ 816EEA8 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0816EED4 + ldr r1, =0x03005e08 adds r5, r0, r1 ldrh r0, [r5, 0x4] adds r0, 0x1 @@ -751336,13 +725968,12 @@ sub_816EEA8: @ 816EEA8 b _0816F0B2 _0816EECA: lsls r0, 2 - ldr r1, _0816EED8 + ldr r1, =_0816EEDC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0816EED4: .4byte 0x03005e08 -_0816EED8: .4byte _0816EEDC + .pool .align 2, 0 _0816EEDC: .4byte _0816EEF4 @@ -751360,9 +725991,9 @@ _0816EEF4: movs r2, 0x2 ldrsh r0, [r5, r2] lsls r0, 1 - ldr r1, _0816EF2C + ldr r1, =0x08d85e72 adds r0, r1 - ldr r1, _0816EF30 + ldr r1, =0x02037bd0 movs r2, 0x1 bl CpuSet ldrh r0, [r5, 0x2] @@ -751382,8 +726013,7 @@ _0816EF20: strh r0, [r5, 0x2] b _0816EF70 .align 2, 0 -_0816EF2C: .4byte 0x08d85e72 -_0816EF30: .4byte 0x02037bd0 + .pool _0816EF34: ldrh r1, [r5, 0x6] movs r2, 0x6 @@ -751398,9 +726028,9 @@ _0816EF34: movs r1, 0x2 ldrsh r0, [r5, r1] lsls r0, 1 - ldr r1, _0816EF78 + ldr r1, =0x08d85e72 adds r0, r1 - ldr r1, _0816EF7C + ldr r1, =0x02037bc4 movs r2, 0x1 bl CpuSet ldrh r0, [r5, 0x2] @@ -751421,8 +726051,7 @@ _0816EF70: strh r0, [r5, 0x6] b _0816F0B2 .align 2, 0 -_0816EF78: .4byte 0x08d85e72 -_0816EF7C: .4byte 0x02037bc4 + .pool _0816EF80: ldrh r1, [r5, 0x6] movs r2, 0x6 @@ -751437,9 +726066,9 @@ _0816EF80: movs r1, 0x2 ldrsh r0, [r5, r1] lsls r0, 1 - ldr r1, _0816EFF4 + ldr r1, =0x08d85e52 adds r0, r1 - ldr r1, _0816EFF8 + ldr r1, =0x02037bcc movs r2, 0x1 bl CpuSet ldrh r0, [r5, 0x2] @@ -751452,7 +726081,7 @@ _0816EFAC: beq _0816EFB6 b _0816F0B2 _0816EFB6: - ldr r0, _0816EFFC + ldr r0, =0x085e5030 movs r1, 0x78 movs r2, 0x58 movs r3, 0xF @@ -751462,7 +726091,7 @@ _0816EFB6: lsrs r4, 24 movs r0, 0x67 bl audio_play - ldr r1, _0816F000 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -751482,10 +726111,7 @@ _0816EFB6: strh r0, [r5, 0x6] b _0816F0B2 .align 2, 0 -_0816EFF4: .4byte 0x08d85e52 -_0816EFF8: .4byte 0x02037bcc -_0816EFFC: .4byte 0x085e5030 -_0816F000: .4byte 0x02020630 + .pool _0816F004: subs r0, r1, 0x1 strh r0, [r5, 0x6] @@ -751505,12 +726131,12 @@ _0816F00A: beq _0816F068 lsls r2, 24 lsrs r2, 24 - ldr r3, _0816F05C + ldr r3, =0x00002949 movs r0, 0x50 movs r1, 0x10 bl pal_fade_1 - ldr r4, _0816F060 - ldr r5, _0816F064 + ldr r4, =0x08d85e7c + ldr r5, =0x02037bd0 adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x1 @@ -751528,9 +726154,7 @@ _0816F00A: bl CpuSet b _0816F0B2 .align 2, 0 -_0816F05C: .4byte 0x00002949 -_0816F060: .4byte 0x08d85e7c -_0816F064: .4byte 0x02037bd0 + .pool _0816F068: ldrh r0, [r5] adds r0, 0x1 @@ -751547,7 +726171,7 @@ _0816F074: bne _0816F0B2 movs r0, 0x1 negs r0, r0 - ldr r1, _0816F09C + ldr r1, =0x00007fff str r1, [sp] movs r1, 0 movs r2, 0 @@ -751558,9 +726182,9 @@ _0816F074: strh r0, [r5] b _0816F0B2 .align 2, 0 -_0816F09C: .4byte 0x00007fff + .pool _0816F0A0: - ldr r0, _0816F0BC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -751574,7 +726198,7 @@ _0816F0B2: pop {r0} bx r0 .align 2, 0 -_0816F0BC: .4byte 0x02037fd4 + .pool thumb_func_end sub_816EEA8 thumb_func_start intro_reset_and_hide_bgs @@ -751625,7 +726249,7 @@ task_intro_3_1: @ 816F128 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0816F168 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -751643,7 +726267,7 @@ _0816F148: lsls r1, 6 movs r0, 0x50 bl lcd_io_set - ldr r0, _0816F16C + ldr r0, =0x0853ff70 ldrh r1, [r0, 0x3E] movs r0, 0x52 bl lcd_io_set @@ -751653,8 +726277,7 @@ _0816F148: movs r0, 0x40 b _0816F1AC .align 2, 0 -_0816F168: .4byte 0x03005e00 -_0816F16C: .4byte 0x0853ff70 + .pool _0816F170: ldrh r1, [r4, 0xA] movs r2, 0xA @@ -751669,7 +726292,7 @@ _0816F170: adds r0, r1 movs r1, 0xFF lsls r1, 1 - ldr r2, _0816F19C + ldr r2, =0x0853ff70 ands r0, r1 adds r0, r2 ldrh r1, [r0] @@ -751677,9 +726300,9 @@ _0816F170: bl lcd_io_set b _0816F1DA .align 2, 0 -_0816F19C: .4byte 0x0853ff70 + .pool _0816F1A0: - ldr r0, _0816F1B8 + ldr r0, =0x0853ff70 ldrh r1, [r0] movs r0, 0x52 bl lcd_io_set @@ -751691,7 +726314,7 @@ _0816F1AC: strh r0, [r4, 0x8] b _0816F1DA .align 2, 0 -_0816F1B8: .4byte 0x0853ff70 + .pool _0816F1BC: movs r0, 0x50 movs r1, 0 @@ -751715,7 +726338,7 @@ task_intro_3_2: @ 816F1E0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0816F220 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -751733,7 +726356,7 @@ _0816F200: lsls r1, 6 movs r0, 0x50 bl lcd_io_set - ldr r0, _0816F224 + ldr r0, =0x0853ff70 ldrh r1, [r0] movs r0, 0x52 bl lcd_io_set @@ -751743,8 +726366,7 @@ _0816F200: movs r0, 0 b _0816F264 .align 2, 0 -_0816F220: .4byte 0x03005e00 -_0816F224: .4byte 0x0853ff70 + .pool _0816F228: ldrh r1, [r4, 0xA] movs r2, 0xA @@ -751759,7 +726381,7 @@ _0816F228: adds r0, r1 movs r1, 0xFF lsls r1, 1 - ldr r2, _0816F254 + ldr r2, =0x0853ff70 ands r0, r1 adds r0, r2 ldrh r1, [r0] @@ -751767,9 +726389,9 @@ _0816F228: bl lcd_io_set b _0816F2A2 .align 2, 0 -_0816F254: .4byte 0x0853ff70 + .pool _0816F258: - ldr r0, _0816F270 + ldr r0, =0x0853ff70 ldrh r1, [r0, 0x3E] movs r0, 0x52 bl lcd_io_set @@ -751781,7 +726403,7 @@ _0816F264: strh r0, [r4, 0x8] b _0816F2A2 .align 2, 0 -_0816F270: .4byte 0x0853ff70 + .pool _0816F274: ldrh r1, [r4, 0xA] movs r2, 0xA @@ -751939,7 +726561,7 @@ _0816F39A: sub_816F3A4: @ 816F3A4 push {r4,lr} adds r4, r0, 0 - ldr r2, _0816F418 + ldr r2, =0x02020630 movs r1, 0x3C ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -751975,7 +726597,7 @@ sub_816F3A4: @ 816F3A4 ands r0, r1 lsls r0, 3 strh r0, [r4, 0x34] - ldr r0, _0816F41C + ldr r0, =sub_816F318 + 1 str r0, [r4, 0x1C] ldrb r1, [r4, 0x1] movs r0, 0x3F @@ -751994,8 +726616,7 @@ sub_816F3A4: @ 816F3A4 bl oam_center b _0816F44C .align 2, 0 -_0816F418: .4byte 0x02020630 -_0816F41C: .4byte sub_816F318 + 1 + .pool _0816F420: ldrh r0, [r1, 0x24] strh r0, [r4, 0x24] @@ -752033,13 +726654,13 @@ sub_816F454: @ 816F454 ldrsh r0, [r1, r2] cmp r0, 0 beq _0816F464 - ldr r0, _0816F468 + ldr r0, =sub_816F46C + 1 str r0, [r1, 0x1C] _0816F464: pop {r0} bx r0 .align 2, 0 -_0816F468: .4byte sub_816F46C + 1 + .pool thumb_func_end sub_816F454 thumb_func_start sub_816F46C @@ -752064,19 +726685,18 @@ sub_816F46C: @ 816F46C strh r1, [r7, 0x26] adds r0, r4, 0x4 strh r0, [r7, 0x20] - ldr r0, _0816F4A4 + ldr r0, =0x0000fffc strh r0, [r7, 0x24] movs r0, 0x80 strh r0, [r7, 0x36] - ldr r0, _0816F4A8 + ldr r0, =sub_816F5B4 + 1 str r0, [r7, 0x1C] b _0816F59E .align 2, 0 -_0816F4A4: .4byte 0x0000fffc -_0816F4A8: .4byte sub_816F5B4 + 1 + .pool _0816F4AC: ldrh r1, [r7, 0x36] - ldr r5, _0816F5B0 + ldr r5, =0x08329f40 lsls r0, r1, 24 lsrs r0, 23 adds r0, r5 @@ -752210,7 +726830,7 @@ _0816F59E: pop {r0} bx r0 .align 2, 0 -_0816F5B0: .4byte 0x08329f40 + .pool thumb_func_end sub_816F46C thumb_func_start sub_816F5B4 @@ -752263,7 +726883,7 @@ sub_816F5B4: @ 816F5B4 strh r0, [r4, 0x36] ldrh r0, [r4, 0x36] adds r1, r0, 0 - ldr r2, _0816F648 + ldr r2, =0x08329f40 adds r0, 0x40 lsls r0, 24 lsrs r0, 23 @@ -752289,11 +726909,11 @@ _0816F642: strh r0, [r4, 0x26] b _0816F654 .align 2, 0 -_0816F648: .4byte 0x08329f40 + .pool _0816F64C: movs r0, 0 strh r0, [r4, 0x36] - ldr r0, _0816F65C + ldr r0, =sub_816F660 + 1 str r0, [r4, 0x1C] _0816F654: add sp, 0x4 @@ -752301,7 +726921,7 @@ _0816F654: pop {r0} bx r0 .align 2, 0 -_0816F65C: .4byte sub_816F660 + 1 + .pool thumb_func_end sub_816F5B4 thumb_func_start sub_816F660 @@ -752315,7 +726935,7 @@ sub_816F660: @ 816F660 ldrh r0, [r1, 0x36] adds r0, 0x8 strh r0, [r1, 0x36] - ldr r3, _0816F6BC + ldr r3, =0x08329f40 lsls r0, 24 lsrs r0, 23 adds r0, r3 @@ -752355,16 +726975,16 @@ _0816F6B4: strh r0, [r1, 0x26] b _0816F6C4 .align 2, 0 -_0816F6BC: .4byte 0x08329f40 + .pool _0816F6C0: - ldr r0, _0816F6CC + ldr r0, =sub_816F6D0 + 1 str r0, [r1, 0x1C] _0816F6C4: pop {r4} pop {r0} bx r0 .align 2, 0 -_0816F6CC: .4byte sub_816F6D0 + 1 + .pool thumb_func_end sub_816F660 thumb_func_start sub_816F6D0 @@ -752409,7 +727029,7 @@ _0816F6E8: ands r0, r1 lsls r0, 3 strh r0, [r4, 0x34] - ldr r0, _0816F74C + ldr r0, =sub_816F318 + 1 str r0, [r4, 0x1C] ldrb r1, [r4, 0x1] movs r0, 0x3F @@ -752431,7 +727051,7 @@ _0816F744: pop {r0} bx r0 .align 2, 0 -_0816F74C: .4byte sub_816F318 + 1 + .pool thumb_func_end sub_816F6D0 thumb_func_start sub_816F750 @@ -752476,7 +727096,7 @@ _0816F768: ands r0, r1 lsls r0, 3 strh r0, [r4, 0x34] - ldr r0, _0816F7CC + ldr r0, =sub_816F318 + 1 str r0, [r4, 0x1C] ldrb r1, [r4, 0x1] movs r0, 0x3F @@ -752498,7 +727118,7 @@ _0816F7C4: pop {r0} bx r0 .align 2, 0 -_0816F7CC: .4byte sub_816F318 + 1 + .pool thumb_func_end sub_816F750 thumb_func_start sub_816F7D0 @@ -752528,7 +727148,7 @@ sub_816F7D0: @ 816F7D0 lsls r1, 24 lsrs r1, 24 mov r8, r1 - ldr r0, _0816F88C + ldr r0, =0x085e4d64 lsrs r2, r4, 16 mov r10, r2 asrs r4, 16 @@ -752541,7 +727161,7 @@ sub_816F7D0: @ 816F7D0 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _0816F890 + ldr r2, =0x02020630 mov r9, r2 lsls r0, r7, 4 adds r0, r7 @@ -752591,17 +727211,15 @@ sub_816F7D0: @ 816F7D0 mov r0, r9 adds r0, 0x1C adds r0, r5, r0 - ldr r1, _0816F894 + ldr r1, =sub_816F454 + 1 b _0816F8A0 .align 2, 0 -_0816F88C: .4byte 0x085e4d64 -_0816F890: .4byte 0x02020630 -_0816F894: .4byte sub_816F454 + 1 + .pool _0816F898: mov r0, r9 adds r0, 0x1C adds r0, r5, r0 - ldr r1, _0816F9C0 + ldr r1, =sub_816F750 + 1 _0816F8A0: str r1, [r0] str r7, [sp, 0x10] @@ -752613,14 +727231,14 @@ _0816F8A0: lsls r0, 16 asrs r0, 16 mov r8, r0 - ldr r0, _0816F9C4 + ldr r0, =0x085e4d64 mov r1, r10 mov r2, r8 movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r7, r0, 24 - ldr r5, _0816F9C8 + ldr r5, =0x02020630 lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -752651,11 +727269,11 @@ _0816F8A0: movs r2, 0x2 movs r3, 0x2 bl oam_center - ldr r2, _0816F9CC + ldr r2, =0x0202064c adds r4, r2 - ldr r0, _0816F9D0 + ldr r0, =sub_816F3A4 + 1 str r0, [r4] - ldr r0, _0816F9C4 + ldr r0, =0x085e4d64 mov r1, r10 mov r2, r8 movs r3, 0x1 @@ -752693,9 +727311,9 @@ _0816F8A0: movs r2, 0x2 movs r3, 0x2 bl oam_center - ldr r0, _0816F9CC + ldr r0, =0x0202064c adds r4, r0 - ldr r1, _0816F9D0 + ldr r1, =sub_816F3A4 + 1 str r1, [r4] ldr r2, [sp, 0xC] lsls r0, r2, 24 @@ -752740,11 +727358,7 @@ _0816F8A0: pop {r1} bx r1 .align 2, 0 -_0816F9C0: .4byte sub_816F750 + 1 -_0816F9C4: .4byte 0x085e4d64 -_0816F9C8: .4byte 0x02020630 -_0816F9CC: .4byte 0x0202064c -_0816F9D0: .4byte sub_816F3A4 + 1 + .pool thumb_func_end sub_816F7D0 thumb_func_start sub_816F9D4 @@ -752756,12 +727370,12 @@ sub_816F9D4: @ 816F9D4 cmp r0, 0x4 bhi _0816FA62 lsls r0, 2 - ldr r1, _0816F9EC + ldr r1, =_0816F9F0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0816F9EC: .4byte _0816F9F0 + .pool .align 2, 0 _0816F9F0: .4byte _0816FA04 @@ -752780,7 +727394,7 @@ _0816FA12: adds r0, r4, 0 movs r1, 0 bl obj_anim_image_start_if_different - ldr r0, _0816FA2C + ldr r0, =0x030062a0 ldr r0, [r0] movs r1, 0x7 ands r0, r1 @@ -752790,14 +727404,14 @@ _0816FA12: adds r0, 0x1 b _0816FA60 .align 2, 0 -_0816FA2C: .4byte 0x030062a0 + .pool _0816FA30: ldrh r2, [r4, 0x20] movs r1, 0x20 ldrsh r0, [r4, r1] cmp r0, 0x78 ble _0816FA46 - ldr r0, _0816FA4C + ldr r0, =0x030062a0 ldr r0, [r0] movs r1, 0x7 ands r0, r1 @@ -752807,7 +727421,7 @@ _0816FA46: adds r0, r2, 0x1 b _0816FA60 .align 2, 0 -_0816FA4C: .4byte 0x030062a0 + .pool _0816FA50: ldrh r2, [r4, 0x20] movs r0, 0x20 @@ -752820,7 +727434,7 @@ _0816FA50: _0816FA60: strh r0, [r4, 0x20] _0816FA62: - ldr r0, _0816FA7C + ldr r0, =0x030062a0 ldr r0, [r0] movs r1, 0x7 ands r0, r1 @@ -752835,7 +727449,7 @@ _0816FA6E: strh r0, [r4, 0x26] b _0816FAAA .align 2, 0 -_0816FA7C: .4byte 0x030062a0 + .pool _0816FA80: bl GenerateRandomNumber movs r1, 0x3 @@ -752853,11 +727467,11 @@ _0816FA96: strh r5, [r4, 0x26] b _0816FAAA _0816FA9E: - ldr r0, _0816FAA4 + ldr r0, =0x0000ffff strh r0, [r4, 0x26] b _0816FAAA .align 2, 0 -_0816FAA4: .4byte 0x0000ffff + .pool _0816FAA8: strh r1, [r4, 0x26] _0816FAAA: @@ -752887,14 +727501,14 @@ _0816FACA: movs r2, 0x20 ldrsh r1, [r4, r2] adds r0, r1 - ldr r1, _0816FAE0 + ldr r1, =0x0000012f cmp r0, r1 bgt _0816FAE4 ldrh r0, [r4, 0x24] adds r0, 0x8 b _0816FB10 .align 2, 0 -_0816FAE0: .4byte 0x0000012f + .pool _0816FAE4: movs r0, 0x2 strh r0, [r4, 0x2E] @@ -752929,7 +727543,7 @@ _0816FB12: lsrs r0, 24 movs r1, 0x8 bl sine - ldr r1, _0816FB34 + ldr r1, =0x0203bccc ldrh r1, [r1] subs r0, r1 strh r0, [r4, 0x26] @@ -752940,7 +727554,7 @@ _0816FB12: pop {r0} bx r0 .align 2, 0 -_0816FB34: .4byte 0x0203bccc + .pool thumb_func_end sub_816FAB0 thumb_func_start sub_816FB38 @@ -752954,12 +727568,12 @@ sub_816FB38: @ 816FB38 b _0816FD38 _0816FB46: lsls r0, 2 - ldr r1, _0816FB50 + ldr r1, =_0816FB54 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0816FB50: .4byte _0816FB54 + .pool .align 2, 0 _0816FB54: .4byte _0816FB6C @@ -752990,7 +727604,7 @@ _0816FB7C: bl sub_8008258 b _0816FCE6 _0816FB94: - ldr r0, _0816FBB0 + ldr r0, =0x030062a0 ldr r0, [r0] cmp r0, 0x90 beq _0816FB9E @@ -753005,7 +727619,7 @@ _0816FB9E: strh r0, [r6, 0x34] b _0816FD38 .align 2, 0 -_0816FBB0: .4byte 0x030062a0 + .pool _0816FBB4: ldrh r1, [r6, 0x34] movs r2, 0x34 @@ -753019,9 +727633,9 @@ _0816FBB4: cmp r0, 0 beq _0816FC14 lsls r0, 1 - ldr r4, _0816FC0C + ldr r4, =0x08d85c50 adds r0, r4 - ldr r5, _0816FC10 + ldr r5, =0x02037d52 adds r1, r5, 0 movs r2, 0x1 bl CpuSet @@ -753049,15 +727663,14 @@ _0816FBB4: strh r0, [r6, 0x30] b _0816FD38 .align 2, 0 -_0816FC0C: .4byte 0x08d85c50 -_0816FC10: .4byte 0x02037d52 + .pool _0816FC14: movs r1, 0x30 ldrsh r0, [r6, r1] lsls r0, 1 - ldr r4, _0816FC54 + ldr r4, =0x08d85c50 adds r0, r4 - ldr r5, _0816FC58 + ldr r5, =0x02037d52 adds r1, r5, 0 movs r2, 0x1 bl CpuSet @@ -753082,8 +727695,7 @@ _0816FC14: bl CpuSet b _0816FCE6 .align 2, 0 -_0816FC54: .4byte 0x08d85c50 -_0816FC58: .4byte 0x02037d52 + .pool _0816FC5C: ldrh r1, [r6, 0x34] movs r2, 0x34 @@ -753102,9 +727714,9 @@ _0816FC6C: cmp r0, 0x9 bgt _0816FCE6 lsls r0, 1 - ldr r4, _0816FCBC + ldr r4, =0x08d85c50 adds r0, r4 - ldr r5, _0816FCC0 + ldr r5, =0x02037d52 adds r1, r5, 0 movs r2, 0x1 bl CpuSet @@ -753132,10 +727744,9 @@ _0816FC6C: strh r0, [r6, 0x30] b _0816FD38 .align 2, 0 -_0816FCBC: .4byte 0x08d85c50 -_0816FCC0: .4byte 0x02037d52 + .pool _0816FCC4: - ldr r0, _0816FCF0 + ldr r0, =0x030062a0 ldr r1, [r0] movs r0, 0x88 lsls r0, 1 @@ -753157,9 +727768,9 @@ _0816FCE6: strh r0, [r6, 0x2E] b _0816FD38 .align 2, 0 -_0816FCF0: .4byte 0x030062a0 + .pool _0816FCF4: - ldr r1, _0816FD40 + ldr r1, =0x085e4f48 movs r2, 0x32 ldrsh r0, [r6, r2] lsls r0, 1 @@ -753198,7 +727809,7 @@ _0816FD38: pop {r0} bx r0 .align 2, 0 -_0816FD40: .4byte 0x085e4f48 + .pool thumb_func_end sub_816FB38 thumb_func_start sub_816FD44 @@ -753219,7 +727830,7 @@ _0816FD5A: beq _0816FD9C b _0816FDB0 _0816FD60: - ldr r0, _0816FD78 + ldr r0, =0x030062a0 ldr r0, [r0] cmp r0, 0x80 bne _0816FDB0 @@ -753232,9 +727843,9 @@ _0816FD60: strb r1, [r2] b _0816FD90 .align 2, 0 -_0816FD78: .4byte 0x030062a0 + .pool _0816FD7C: - ldr r0, _0816FD98 + ldr r0, =0x030062a0 ldr r1, [r0] movs r0, 0x88 lsls r0, 1 @@ -753249,7 +727860,7 @@ _0816FD90: strh r0, [r4, 0x2E] b _0816FDB0 .align 2, 0 -_0816FD98: .4byte 0x030062a0 + .pool _0816FD9C: adds r0, r4, 0 adds r0, 0x3F @@ -753283,7 +727894,7 @@ sub_816FDB8: @ 816FDB8 movs r7, 0 _0816FDD2: lsls r5, r7, 2 - ldr r0, _0816FEC4 + ldr r0, =0x085e4e94 adds r0, 0x2 adds r0, r5, r0 ldr r2, [sp] @@ -753297,9 +727908,9 @@ _0816FDD2: lsls r2, r3, 16 asrs r0, r2, 16 str r0, [sp, 0x8] - ldr r3, _0816FEC8 + ldr r3, =0xfffc0000 adds r2, r3 - ldr r0, _0816FECC + ldr r0, =0x085e4f5c asrs r2, 16 movs r3, 0 bl obj_add_from_template_forward_search @@ -753308,11 +727919,11 @@ _0816FDD2: lsls r4, r6, 4 adds r4, r6 lsls r4, 2 - ldr r0, _0816FED0 + ldr r0, =0x02020630 adds r4, r0 movs r1, 0 strh r1, [r4, 0x2E] - ldr r0, _0816FED4 + ldr r0, =0x085e4fa4 adds r0, r7, r0 ldrb r0, [r0] strh r0, [r4, 0x30] @@ -753340,7 +727951,7 @@ _0816FDD2: ands r0, r2 orrs r0, r1 strb r0, [r4, 0x3] - ldr r3, _0816FEC4 + ldr r3, =0x085e4e94 adds r5, r3 ldrb r1, [r5] adds r0, r4, 0 @@ -753353,7 +727964,7 @@ _0816FDD2: lsrs r7, r0, 16 cmp r7, 0x8 bls _0816FDD2 - ldr r0, _0816FED8 + ldr r0, =0x085e4f8c ldr r2, [sp, 0x8] subs r2, 0x6 lsls r2, 16 @@ -753366,7 +727977,7 @@ _0816FDD2: lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, _0816FED0 + ldr r1, =0x02020630 adds r0, r1 movs r2, 0 strh r2, [r0, 0x2E] @@ -753398,12 +728009,7 @@ _0816FDD2: pop {r1} bx r1 .align 2, 0 -_0816FEC4: .4byte 0x085e4e94 -_0816FEC8: .4byte 0xfffc0000 -_0816FECC: .4byte 0x085e4f5c -_0816FED0: .4byte 0x02020630 -_0816FED4: .4byte 0x085e4fa4 -_0816FED8: .4byte 0x085e4f8c + .pool thumb_func_end sub_816FDB8 thumb_func_start sub_816FEDC @@ -753418,7 +728024,7 @@ sub_816FEDC: @ 816FEDC ldrsh r0, [r4, r1] cmp r0, 0 beq _0816FF48 - ldr r2, _0816FF98 + ldr r2, =0x08329f40 ldrh r1, [r4, 0x32] lsls r0, r1, 24 lsrs r0, 23 @@ -753506,7 +728112,7 @@ _0816FF58: strh r1, [r4, 0x34] b _08170038 .align 2, 0 -_0816FF98: .4byte 0x08329f40 + .pool _0816FF9C: ldrh r0, [r4, 0x34] lsls r0, 24 @@ -753658,7 +728264,7 @@ _081700A6: adds r0, r1, 0x1 strh r0, [r5, 0x30] _081700BE: - ldr r1, _081700F4 + ldr r1, =0x08329f40 ldrh r0, [r5, 0x30] lsls r0, 24 lsrs r0, 23 @@ -753684,13 +728290,13 @@ _081700BE: pop {r0} bx r0 .align 2, 0 -_081700F4: .4byte 0x08329f40 + .pool thumb_func_end sub_8170040 thumb_func_start sub_81700F8 sub_81700F8: @ 81700F8 push {r4,r5,lr} - ldr r5, _08170170 + ldr r5, =0x04000208 ldrh r4, [r5] movs r0, 0 strh r0, [r5] @@ -753700,8 +728306,8 @@ sub_81700F8: @ 81700F8 movs r1, 0x80 bl lcd_io_clear_bits strh r4, [r5] - ldr r1, _08170174 - ldr r0, _08170178 + ldr r1, =0x030022c0 + ldr r0, =0x00000439 adds r1, r0 ldrb r2, [r1] movs r0, 0x3 @@ -753716,7 +728322,7 @@ sub_81700F8: @ 81700F8 bl sub_8152680 movs r0, 0 bl sub_81534D0 - ldr r0, _0817017C + ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0 beq _08170148 @@ -753725,29 +728331,23 @@ sub_81700F8: @ 81700F8 _08170148: bl init_sav2 _0817014C: - ldr r0, _08170180 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x15] lsls r0, 31 lsrs r0, 31 bl sub_82E1810 - ldr r0, _08170184 + ldr r0, =0x02000000 movs r1, 0xE0 lsls r1, 9 bl init_malloc - ldr r0, _08170188 + ldr r0, =sub_8086230 + 1 bl set_callback2 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08170170: .4byte 0x04000208 -_08170174: .4byte 0x030022c0 -_08170178: .4byte 0x00000439 -_0817017C: .4byte 0x03006210 -_08170180: .4byte 0x03005d90 -_08170184: .4byte 0x02000000 -_08170188: .4byte sub_8086230 + 1 + .pool thumb_func_end sub_81700F8 thumb_func_start sub_817018C @@ -753756,25 +728356,23 @@ sub_817018C: @ 817018C adds r5, r0, 0 movs r0, 0 bl SetVBlankCallback - ldr r4, _081701B8 + ldr r4, =0x0203bcd0 movs r0, 0x89 lsls r0, 4 bl malloc str r0, [r4] - ldr r1, _081701BC + ldr r1, =0x0000088c adds r2, r0, r1 movs r1, 0 strh r1, [r2] str r5, [r0] - ldr r0, _081701C0 + ldr r0, =sub_81701C4 + 1 bl set_callback2 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081701B8: .4byte 0x0203bcd0 -_081701BC: .4byte 0x0000088c -_081701C0: .4byte sub_81701C4 + 1 + .pool thumb_func_end sub_817018C thumb_func_start sub_81701C4 @@ -753811,11 +728409,11 @@ sub_81701C4: @ 81701C4 bl gpu_pal_allocator_reset movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08170250 + ldr r1, =0x085e5068 movs r0, 0x1 movs r2, 0x2 bl bg_vram_setup - ldr r0, _08170254 + ldr r0, =0x085e5070 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 @@ -753823,17 +728421,14 @@ sub_81701C4: @ 81701C4 movs r2, 0xD0 bl sub_809882C bl clear_scheduled_bg_copies_to_vram - ldr r0, _08170258 + ldr r0, =sub_8170274 + 1 bl set_callback2 - ldr r0, _0817025C + ldr r0, =sub_8170260 + 1 bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 -_08170250: .4byte 0x085e5068 -_08170254: .4byte 0x085e5070 -_08170258: .4byte sub_8170274 + 1 -_0817025C: .4byte sub_8170260 + 1 + .pool thumb_func_end sub_81701C4 thumb_func_start sub_8170260 @@ -753862,9 +728457,9 @@ sub_8170274: @ 8170274 sub_8170290: @ 8170290 push {r4,r5,lr} sub sp, 0xC - ldr r1, _081702B0 + ldr r1, =0x0203bcd0 ldr r0, [r1] - ldr r2, _081702B4 + ldr r2, =0x0000088c adds r0, r2 ldrh r0, [r0] adds r4, r1, 0 @@ -753873,14 +728468,12 @@ sub_8170290: @ 8170290 b _08170416 _081702A6: lsls r0, 2 - ldr r1, _081702B8 + ldr r1, =_081702BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081702B0: .4byte 0x0203bcd0 -_081702B4: .4byte 0x0000088c -_081702B8: .4byte _081702BC + .pool .align 2, 0 _081702BC: .4byte _081702D8 @@ -753902,18 +728495,18 @@ _081702D8: movs r1, 0x1 bl sub_81240D4 ldr r1, [r4] - ldr r0, _081702FC + ldr r0, =0x0000088c adds r1, r0 b _081703D8 .align 2, 0 -_081702FC: .4byte 0x0000088c + .pool _08170300: movs r0, 0x1 movs r1, 0 movs r2, 0x27 movs r3, 0xD bl SetWindowBorderStyle - ldr r5, _08170354 + ldr r5, =0x085ee8f1 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x38 @@ -753945,7 +728538,7 @@ _08170300: movs r3, 0 b _081703CC .align 2, 0 -_08170354: .4byte 0x085ee8f1 + .pool _08170358: movs r1, 0x82 lsls r1, 5 @@ -753955,16 +728548,15 @@ _08170358: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - ldr r0, _08170378 + ldr r0, =0x0203bcd0 ldr r1, [r0] - ldr r0, _0817037C + ldr r0, =0x0000088c adds r1, r0 b _081703D8 .align 2, 0 -_08170378: .4byte 0x0203bcd0 -_0817037C: .4byte 0x0000088c + .pool _08170380: - ldr r0, _08170390 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -753973,7 +728565,7 @@ _08170380: ldr r1, [r4] b _081703D4 .align 2, 0 -_08170390: .4byte 0x02037fd4 + .pool _08170394: bl sub_81230AC lsls r0, 24 @@ -753987,14 +728579,13 @@ _081703A6: blt _08170416 cmp r0, 0x5 bgt _08170416 - ldr r0, _081703B8 + ldr r0, =0x0203bcd0 ldr r1, [r0] - ldr r0, _081703BC + ldr r0, =0x0000088c adds r1, r0 b _081703D8 .align 2, 0 -_081703B8: .4byte 0x0203bcd0 -_081703BC: .4byte 0x0000088c + .pool _081703C0: movs r0, 0x1 negs r0, r0 @@ -754004,10 +728595,10 @@ _081703C0: movs r3, 0x10 _081703CC: bl sub_80A1AD4 - ldr r0, _081703E0 + ldr r0, =0x0203bcd0 ldr r1, [r0] _081703D4: - ldr r2, _081703E4 + ldr r2, =0x0000088c adds r1, r2 _081703D8: ldrh r0, [r1] @@ -754015,10 +728606,9 @@ _081703D8: strh r0, [r1] b _08170416 .align 2, 0 -_081703E0: .4byte 0x0203bcd0 -_081703E4: .4byte 0x0000088c + .pool _081703E8: - ldr r0, _08170420 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -754027,7 +728617,7 @@ _081703E8: cmp r5, 0 bne _08170416 bl sub_812305C - ldr r4, _08170424 + ldr r4, =0x0203bcd0 ldr r0, [r4] ldr r0, [r0] bl set_callback2 @@ -754044,15 +728634,14 @@ _08170416: pop {r0} bx r0 .align 2, 0 -_08170420: .4byte 0x02037fd4 -_08170424: .4byte 0x0203bcd0 + .pool thumb_func_end sub_8170290 thumb_func_start sub_8170428 sub_8170428: @ 8170428 push {r4,lr} sub sp, 0xC - ldr r4, _0817045C + ldr r4, =0x0203bcd0 ldr r0, [r4] ldrb r0, [r0, 0xA] cmp r0, 0 @@ -754074,7 +728663,7 @@ sub_8170428: @ 8170428 bl schedule_bg_copy_tilemap_to_vram b _08170470 .align 2, 0 -_0817045C: .4byte 0x0203bcd0 + .pool _08170460: movs r0, 0 movs r1, 0x11 @@ -754100,24 +728689,24 @@ sub_8170478: @ 8170478 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x10] - ldr r0, _08170620 + ldr r0, =0x02038436 ldrb r4, [r0] - ldr r0, _08170624 + ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] - ldr r0, _08170628 + ldr r0, =0x02022e26 strh r1, [r0] - ldr r1, _0817062C + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set - ldr r1, _08170630 + ldr r1, =0x00003f3d movs r0, 0x4A bl lcd_io_set movs r1, 0x80 lsls r1, 8 movs r0, 0 bl lcd_io_set_bits - ldr r1, _08170634 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -754140,10 +728729,10 @@ sub_8170478: @ 8170478 movs r1, 0x3 movs r2, 0x1 bl lcd_bg_operations - ldr r0, _08170638 + ldr r0, =0x03005d70 adds r4, r0 ldrb r0, [r4] - ldr r1, _0817063C + ldr r1, =0x02020630 mov r9, r1 lsls r4, r0, 4 adds r4, r0 @@ -754153,12 +728742,12 @@ sub_8170478: @ 8170478 ldrh r6, [r4, 0x38] lsls r6, 24 lsrs r6, 24 - ldr r0, _08170640 + ldr r0, =nullsub_12 + 1 bl object_new_hidden_with_callback lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x14] - ldr r0, _08170640 + ldr r0, =nullsub_12 + 1 bl object_new_hidden_with_callback mov r10, r0 mov r2, r10 @@ -754230,7 +728819,7 @@ sub_8170478: @ 8170478 movs r0, 0x1C add r9, r0 add r6, r9 - ldr r1, _08170640 + ldr r1, =nullsub_12 + 1 str r1, [r6] add r4, r9 str r1, [r4] @@ -754238,31 +728827,31 @@ sub_8170478: @ 8170478 bl sub_80A6B30 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _08170644 + ldr r1, =0x08c2ea9c bl sub_80A6D48 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _08170648 + ldr r1, =0x08c2ea50 mov r2, sp ldrh r2, [r2, 0xA] bl sub_80A6CC0 - ldr r0, _0817064C + ldr r0, =0x08c2dda4 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette - ldr r1, _08170650 + ldr r1, =0x02022e18 ldrh r0, [r7, 0x20] negs r0, r0 adds r0, 0x20 strh r0, [r1] - ldr r1, _08170654 + ldr r1, =0x02022e1a ldrh r0, [r7, 0x22] negs r0, r0 subs r0, 0x20 strh r0, [r1] - ldr r1, _08170658 + ldr r1, =0x03005e00 ldr r2, [sp, 0x10] lsls r0, r2, 2 adds r0, r2 @@ -754276,7 +728865,7 @@ sub_8170478: @ 8170478 strh r1, [r0, 0x8] mov r2, r10 strh r2, [r0, 0xC] - ldr r1, _0817065C + ldr r1, =sub_8170660 + 1 str r1, [r0] add sp, 0x1C pop {r3-r5} @@ -754287,22 +728876,7 @@ sub_8170478: @ 8170478 pop {r0} bx r0 .align 2, 0 -_08170620: .4byte 0x02038436 -_08170624: .4byte 0x02022e24 -_08170628: .4byte 0x02022e26 -_0817062C: .4byte 0x00003f3f -_08170630: .4byte 0x00003f3d -_08170634: .4byte 0x00003f42 -_08170638: .4byte 0x03005d70 -_0817063C: .4byte 0x02020630 -_08170640: .4byte nullsub_12 + 1 -_08170644: .4byte 0x08c2ea9c -_08170648: .4byte 0x08c2ea50 -_0817064C: .4byte 0x08c2dda4 -_08170650: .4byte 0x02022e18 -_08170654: .4byte 0x02022e1a -_08170658: .4byte 0x03005e00 -_0817065C: .4byte sub_8170660 + 1 + .pool thumb_func_end sub_8170478 thumb_func_start sub_8170660 @@ -754312,10 +728886,10 @@ sub_8170660: @ 8170660 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _081706A8 + ldr r0, =0x02038436 ldrb r0, [r0] mov r8, r0 - ldr r1, _081706AC + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -754325,7 +728899,7 @@ sub_8170660: @ 8170660 adds r1, r0 movs r3, 0 strh r1, [r5, 0x22] - ldr r2, _081706B0 + ldr r2, =0x02022e1a lsls r0, r1, 16 lsrs r0, 24 ldrh r4, [r2] @@ -754344,9 +728918,7 @@ sub_8170660: @ 8170660 beq _081706BA b _08170814 .align 2, 0 -_081706A8: .4byte 0x02038436 -_081706AC: .4byte 0x03005e00 -_081706B0: .4byte 0x02022e1a + .pool _081706B4: cmp r0, 0x2 beq _08170708 @@ -754420,11 +728992,11 @@ _08170708: bne _08170814 movs r0, 0 bl sub_80A477C - ldr r0, _08170820 + ldr r0, =0x02022e24 strh r4, [r0] - ldr r0, _08170824 + ldr r0, =0x02022e26 strh r4, [r0] - ldr r4, _08170828 + ldr r4, =0x00003f3f movs r0, 0x48 adds r1, r4, 0 bl lcd_io_set @@ -754462,7 +729034,7 @@ _0817076C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, _0817082C + ldr r6, =0x02020630 adds r0, r6 bl obj_delete_and_free_tiles movs r0, 0xC @@ -754476,7 +729048,7 @@ _0817076C: movs r1, 0x1 movs r2, 0 bl lcd_bg_operations - ldr r0, _08170830 + ldr r0, =0x03005d70 add r0, r8 ldrb r0, [r0] lsls r1, r0, 4 @@ -754523,11 +729095,7 @@ _08170814: pop {r0} bx r0 .align 2, 0 -_08170820: .4byte 0x02022e24 -_08170824: .4byte 0x02022e26 -_08170828: .4byte 0x00003f3f -_0817082C: .4byte 0x02020630 -_08170830: .4byte 0x03005d70 + .pool thumb_func_end sub_8170660 thumb_func_start sub_8170834 @@ -754542,24 +729110,24 @@ sub_8170834: @ 8170834 adds r7, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _0817090C + ldr r0, =0x03005d70 adds r2, r0 ldrb r0, [r2] lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, _08170910 + ldr r0, =0x02020630 adds r5, r0 ldrb r1, [r5, 0x6] mov r10, r1 ldrh r4, [r5, 0x38] lsls r4, 24 lsrs r4, 24 - ldr r0, _08170914 + ldr r0, =0x0000d709 bl gpu_pal_alloc_new mov r2, r9 strb r0, [r2] - ldr r0, _08170918 + ldr r0, =0x0000d70a bl gpu_pal_alloc_new strb r0, [r7] ldrb r0, [r5, 0x5] @@ -754572,14 +729140,14 @@ sub_8170834: @ 8170834 lsls r6, r4, 4 adds r6, r4 lsls r6, 2 - ldr r2, _08170910 + ldr r2, =0x02020630 adds r6, r2 ldrb r4, [r6, 0x5] lsrs r4, 4 lsls r4, 4 orrs r4, r3 lsls r0, 1 - ldr r1, _0817091C + ldr r1, =0x02037714 mov r8, r1 add r0, r8 mov r2, r9 @@ -754612,7 +729180,7 @@ sub_8170834: @ 8170834 lsls r1, r2, 4 add r1, r10 lsls r1, 2 - ldr r0, _08170910 + ldr r0, =0x02020630 adds r1, r0 mov r0, r9 ldrb r2, [r0] @@ -754637,11 +729205,7 @@ sub_8170834: @ 8170834 pop {r0} bx r0 .align 2, 0 -_0817090C: .4byte 0x03005d70 -_08170910: .4byte 0x02020630 -_08170914: .4byte 0x0000d709 -_08170918: .4byte 0x0000d70a -_0817091C: .4byte 0x02037714 + .pool thumb_func_end sub_8170834 thumb_func_start sub_8170920 @@ -754653,7 +729217,7 @@ sub_8170920: @ 8170920 lsrs r4, 24 mov r1, sp adds r1, 0x1 - ldr r0, _08170948 + ldr r0, =0x02038436 ldrb r2, [r0] mov r0, sp bl sub_8170834 @@ -754664,7 +729228,7 @@ sub_8170920: @ 8170920 pop {r0} bx r0 .align 2, 0 -_08170948: .4byte 0x02038436 + .pool thumb_func_end sub_8170920 thumb_func_start sub_817094C @@ -754675,10 +729239,10 @@ sub_817094C: @ 817094C push {r5,r6} lsls r0, 24 lsrs r0, 24 - ldr r1, _081709D4 + ldr r1, =0x03005d70 adds r0, r1 ldrb r0, [r0] - ldr r1, _081709D8 + ldr r1, =0x02020630 mov r8, r1 lsls r5, r0, 4 adds r5, r0 @@ -754689,16 +729253,16 @@ sub_817094C: @ 817094C ldrh r6, [r5, 0x38] lsls r6, 24 lsrs r6, 24 - ldr r0, _081709DC + ldr r0, =0x0000d709 bl gpu_pal_free_tag - ldr r0, _081709E0 + ldr r0, =0x0000d70a bl gpu_pal_free_tag - ldr r0, _081709E4 + ldr r0, =0x0000d6ff bl gpu_pal_tags_index_of adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081709E8 + ldr r0, =0x0000d704 bl gpu_pal_tags_index_of lsls r0, 24 lsls r4, 4 @@ -754734,12 +729298,7 @@ sub_817094C: @ 817094C pop {r0} bx r0 .align 2, 0 -_081709D4: .4byte 0x03005d70 -_081709D8: .4byte 0x02020630 -_081709DC: .4byte 0x0000d709 -_081709E0: .4byte 0x0000d70a -_081709E4: .4byte 0x0000d6ff -_081709E8: .4byte 0x0000d704 + .pool thumb_func_end sub_817094C thumb_func_start sub_81709EC @@ -754748,7 +729307,7 @@ sub_81709EC: @ 81709EC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08170A08 + ldr r0, =0x02038436 ldrb r0, [r0] bl sub_817094C adds r0, r4, 0 @@ -754757,30 +729316,28 @@ sub_81709EC: @ 81709EC pop {r0} bx r0 .align 2, 0 -_08170A08: .4byte 0x02038436 + .pool thumb_func_end sub_81709EC thumb_func_start sub_8170A0C sub_8170A0C: @ 8170A0C lsls r0, 24 lsrs r0, 24 - ldr r2, _08170A2C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _08170A30 + ldr r2, =0x0203841e ldrh r0, [r2] strh r0, [r1, 0x1C] ldrh r0, [r2, 0x2] strh r0, [r1, 0x1E] - ldr r0, _08170A34 + ldr r0, =sub_8170A38 + 1 str r0, [r1] bx lr .align 2, 0 -_08170A2C: .4byte 0x03005e00 -_08170A30: .4byte 0x0203841e -_08170A34: .4byte sub_8170A38 + 1 + .pool thumb_func_end sub_8170A0C thumb_func_start sub_8170A38 @@ -754788,7 +729345,7 @@ sub_8170A38: @ 8170A38 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08170A84 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -754805,7 +729362,7 @@ sub_8170A38: @ 8170A38 cmp r0, r1 blt _08170AF8 strh r6, [r4, 0x8] - ldr r0, _08170A88 + ldr r0, =0x0000d709 bl gpu_pal_tags_index_of lsls r0, 24 lsrs r2, r0, 24 @@ -754824,8 +729381,7 @@ _08170A76: beq _08170AC8 b _08170AF8 .align 2, 0 -_08170A84: .4byte 0x03005e00 -_08170A88: .4byte 0x0000d709 + .pool _08170A8C: ldrh r0, [r4, 0xC] adds r0, 0x2 @@ -754843,7 +729399,7 @@ _08170A9E: adds r0, r2 orrs r0, r1 ldrb r2, [r4, 0xC] - ldr r3, _08170AC4 + ldr r3, =0x00007f74 movs r1, 0x1 bl pal_fade_1 movs r3, 0xC @@ -754855,7 +729411,7 @@ _08170A9E: strh r0, [r4, 0xA] b _08170AF8 .align 2, 0 -_08170AC4: .4byte 0x00007f74 + .pool _08170AC8: ldrh r0, [r4, 0xC] subs r0, 0x2 @@ -754871,7 +729427,7 @@ _08170AD6: adds r0, r2 orrs r0, r1 ldrb r2, [r4, 0xC] - ldr r3, _08170B00 + ldr r3, =0x00007f74 movs r1, 0x1 bl pal_fade_1 movs r3, 0xC @@ -754885,7 +729441,7 @@ _08170AF8: pop {r0} bx r0 .align 2, 0 -_08170B00: .4byte 0x00007f74 + .pool thumb_func_end sub_8170A38 thumb_func_start sub_8170B04 @@ -754893,12 +729449,12 @@ sub_8170B04: @ 8170B04 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _08170B30 - ldr r0, _08170B34 + ldr r1, =0x020241e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 ldrb r5, [r0] - ldr r1, _08170B38 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -754913,9 +729469,7 @@ sub_8170B04: @ 8170B04 beq _08170B42 b _08170BA4 .align 2, 0 -_08170B30: .4byte 0x020241e4 -_08170B34: .4byte 0x02038436 -_08170B38: .4byte 0x03005e00 + .pool _08170B3C: cmp r0, 0x2 beq _08170B84 @@ -754942,7 +729496,7 @@ _08170B52: bl sub_80A7E6C movs r0, 0x1C ldrsh r1, [r4, r0] - ldr r0, _08170B80 + ldr r0, =0x000002cf cmp r1, r0 ble _08170BA4 _08170B76: @@ -754951,11 +729505,11 @@ _08170B76: strh r0, [r4, 0x8] b _08170BA4 .align 2, 0 -_08170B80: .4byte 0x000002cf + .pool _08170B84: adds r0, r5, 0 bl sub_80A7344 - ldr r1, _08170BAC + ldr r1, =0x02020630 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -754972,7 +729526,7 @@ _08170BA4: pop {r0} bx r0 .align 2, 0 -_08170BAC: .4byte 0x02020630 + .pool thumb_func_end sub_8170B04 thumb_func_start sub_8170BB0 @@ -754984,8 +729538,8 @@ sub_8170BB0: @ 8170BB0 sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08170BE8 - ldr r4, _08170BEC + ldr r1, =0x020241e4 + ldr r4, =0x02038436 ldrb r0, [r4] adds r1, r0, r1 ldrb r1, [r1] @@ -754994,29 +729548,26 @@ sub_8170BB0: @ 8170BB0 lsls r0, 24 cmp r0, 0 bne _08170BF8 - ldr r1, _08170BF0 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08170BF4 + ldr r1, =0x020244ec b _08170C08 .align 2, 0 -_08170BE8: .4byte 0x020241e4 -_08170BEC: .4byte 0x02038436 -_08170BF0: .4byte 0x0202406e -_08170BF4: .4byte 0x020244ec + .pool _08170BF8: - ldr r1, _08170C38 + ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08170C3C + ldr r1, =0x02024744 _08170C08: adds r0, r1 movs r1, 0x26 @@ -755027,7 +729578,7 @@ _08170C08: lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r2, _08170C40 + ldr r2, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -755040,11 +729591,9 @@ _08170C08: beq _08170CC4 b _08170CEE .align 2, 0 -_08170C38: .4byte 0x0202406e -_08170C3C: .4byte 0x02024744 -_08170C40: .4byte 0x03005e00 + .pool _08170C44: - ldr r5, _08170CBC + ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0 bl sub_80A5C6C @@ -755056,7 +729605,7 @@ _08170C44: bl sub_80A5C6C adds r1, r0, 0 lsls r1, 24 - ldr r2, _08170CC0 + ldr r2, =0x02020630 mov r3, r9 lsls r0, r3, 4 add r0, r9 @@ -755099,8 +729648,7 @@ _08170C44: strh r0, [r6, 0x8] b _08170CEE .align 2, 0 -_08170CBC: .4byte 0x02038436 -_08170CC0: .4byte 0x02020630 + .pool _08170CC4: movs r1, 0x1C ldrsh r0, [r6, r1] @@ -755138,7 +729686,7 @@ sub_8170CFC: @ 8170CFC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08170D20 + ldr r0, =0x02024208 ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -755150,7 +729698,7 @@ sub_8170CFC: @ 8170CFC pop {r0} bx r0 .align 2, 0 -_08170D20: .4byte 0x02024208 + .pool thumb_func_end sub_8170CFC thumb_func_start sub_8170D24 @@ -755159,7 +729707,7 @@ sub_8170D24: @ 8170D24 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08170D48 + ldr r0, =0x02024208 ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -755171,7 +729719,7 @@ sub_8170D24: @ 8170D24 pop {r0} bx r0 .align 2, 0 -_08170D48: .4byte 0x02024208 + .pool thumb_func_end sub_8170D24 thumb_func_start sub_8170D4C @@ -755179,21 +729727,19 @@ sub_8170D4C: @ 8170D4C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08170D64 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] cmp r0, 0x5 bne _08170D70 - ldr r1, _08170D68 - ldr r0, _08170D6C + ldr r1, =0x0203841e + ldr r0, =0x0000ffff b _08170D74 .align 2, 0 -_08170D64: .4byte 0x020244d0 -_08170D68: .4byte 0x0203841e -_08170D6C: .4byte 0x0000ffff + .pool _08170D70: - ldr r1, _08170D80 + ldr r1, =0x0203841e movs r0, 0 _08170D74: strh r0, [r1, 0xE] @@ -755202,7 +729748,7 @@ _08170D74: pop {r0} bx r0 .align 2, 0 -_08170D80: .4byte 0x0203841e + .pool thumb_func_end sub_8170D4C thumb_func_start ball_number_to_ball_processing_index @@ -755214,12 +729760,12 @@ ball_number_to_ball_processing_index: @ 8170D84 cmp r0, 0xB bhi _08170DFC lsls r0, 2 - ldr r1, _08170D9C + ldr r1, =_08170DA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08170D9C: .4byte _08170DA0 + .pool .align 2, 0 _08170DA0: .4byte _08170DD0 @@ -755285,7 +729831,7 @@ sub_8170E04: @ 8170E04 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _08170ECC + ldr r0, =0x02024208 ldrh r0, [r0] bl ball_number_to_ball_processing_index adds r1, r0, 0 @@ -755294,7 +729840,7 @@ sub_8170E04: @ 8170E04 lsls r0, r1, 1 adds r0, r1 lsls r0, 3 - ldr r1, _08170ED0 + ldr r1, =0x0832c588 adds r0, r1 movs r1, 0x20 movs r2, 0x50 @@ -755303,7 +729849,7 @@ sub_8170E04: @ 8170E04 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r1, _08170ED4 + ldr r1, =0x02020630 mov r9, r1 lsls r4, r5, 4 adds r4, r5 @@ -755311,7 +729857,7 @@ sub_8170E04: @ 8170E04 adds r6, r4, r1 movs r0, 0x22 strh r0, [r6, 0x2E] - ldr r2, _08170ED8 + ldr r2, =0x02038437 mov r8, r2 ldrb r0, [r2] movs r1, 0 @@ -755330,12 +729876,12 @@ sub_8170E04: @ 8170E04 mov r0, r9 adds r0, 0x1C adds r4, r0 - ldr r0, _08170EDC + ldr r0, =sub_8171104 + 1 str r0, [r4] - ldr r0, _08170EE0 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r3, [r0, 0x8] - ldr r1, _08170EE4 + ldr r1, =0x020241e4 mov r2, r8 ldrb r0, [r2] adds r0, r1 @@ -755355,14 +729901,14 @@ sub_8170E04: @ 8170E04 ands r0, r2 orrs r0, r1 strb r0, [r3, 0x9] - ldr r1, _08170EE8 + ldr r1, =0x03005e00 mov r2, r10 lsls r0, r2, 2 add r0, r10 lsls r0, 3 adds r0, r1 strh r5, [r0, 0x8] - ldr r1, _08170EEC + ldr r1, =sub_8170EF0 + 1 str r1, [r0] pop {r3-r5} mov r8, r3 @@ -755372,15 +729918,7 @@ sub_8170E04: @ 8170E04 pop {r0} bx r0 .align 2, 0 -_08170ECC: .4byte 0x02024208 -_08170ED0: .4byte 0x0832c588 -_08170ED4: .4byte 0x02020630 -_08170ED8: .4byte 0x02038437 -_08170EDC: .4byte sub_8171104 + 1 -_08170EE0: .4byte 0x020244d0 -_08170EE4: .4byte 0x020241e4 -_08170EE8: .4byte 0x03005e00 -_08170EEC: .4byte sub_8170EF0 + 1 + .pool thumb_func_end sub_8170E04 thumb_func_start sub_8170EF0 @@ -755388,19 +729926,19 @@ sub_8170EF0: @ 8170EF0 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _08170F20 + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x8] - ldr r2, _08170F24 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r2 ldrh r1, [r0, 0x2E] - ldr r0, _08170F28 + ldr r0, =0x0000ffff cmp r1, r0 bne _08170F1A adds r0, r3, 0 @@ -755409,9 +729947,7 @@ _08170F1A: pop {r0} bx r0 .align 2, 0 -_08170F20: .4byte 0x03005e00 -_08170F24: .4byte 0x02020630 -_08170F28: .4byte 0x0000ffff + .pool thumb_func_end sub_8170EF0 thumb_func_start sub_8170F2C @@ -755422,7 +729958,7 @@ sub_8170F2C: @ 8170F2C push {r6,r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08170F4C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 2 @@ -755433,12 +729969,12 @@ sub_8170F2C: @ 8170F2C movs r5, 0xB b _08170F54 .align 2, 0 -_08170F4C: .4byte 0x02022fec + .pool _08170F50: movs r6, 0x17 movs r5, 0x5 _08170F54: - ldr r0, _0817100C + ldr r0, =0x02024208 ldrh r0, [r0] bl ball_number_to_ball_processing_index adds r4, r0, 0 @@ -755456,7 +729992,7 @@ _08170F54: lsls r0, r4, 1 adds r0, r4 lsls r0, 3 - ldr r1, _08171010 + ldr r1, =0x0832c588 adds r0, r1 adds r1, r6, 0 adds r1, 0x20 @@ -755467,7 +730003,7 @@ _08170F54: adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _08171014 + ldr r0, =0x02020630 mov r9, r0 lsls r4, r5, 4 adds r4, r5 @@ -755475,7 +730011,7 @@ _08170F54: adds r6, r4, r0 movs r0, 0x22 strh r0, [r6, 0x2E] - ldr r1, _08171018 + ldr r1, =0x02038437 mov r8, r1 ldrb r0, [r1] movs r1, 0 @@ -755494,11 +730030,11 @@ _08170F54: movs r0, 0x1C add r9, r0 add r4, r9 - ldr r0, _0817101C + ldr r0, =nullsub_12 + 1 str r0, [r4] movs r0, 0 bl battle_get_side_with_given_state - ldr r1, _08171020 + ldr r1, =0x020241e4 lsls r0, 24 lsrs r0, 24 adds r0, r1 @@ -755507,15 +730043,15 @@ _08170F54: adds r0, r1 lsls r0, 2 add r0, r9 - ldr r1, _08171024 + ldr r1, =sub_8039E84 + 1 str r1, [r0] - ldr r1, _08171028 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 strh r5, [r0, 0x8] - ldr r1, _0817102C + ldr r1, =sub_8171030 + 1 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -755524,15 +730060,7 @@ _08170F54: pop {r0} bx r0 .align 2, 0 -_0817100C: .4byte 0x02024208 -_08171010: .4byte 0x0832c588 -_08171014: .4byte 0x02020630 -_08171018: .4byte 0x02038437 -_0817101C: .4byte nullsub_12 + 1 -_08171020: .4byte 0x020241e4 -_08171024: .4byte sub_8039E84 + 1 -_08171028: .4byte 0x03005e00 -_0817102C: .4byte sub_8171030 + 1 + .pool thumb_func_end sub_8170F2C thumb_func_start sub_8171030 @@ -755540,10 +730068,10 @@ sub_8171030: @ 8171030 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _08171090 + ldr r6, =0x02020630 movs r0, 0 bl battle_get_side_with_given_state - ldr r1, _08171094 + ldr r1, =0x020241e4 lsls r0, 24 lsrs r0, 24 adds r0, r1 @@ -755559,7 +730087,7 @@ sub_8171030: @ 8171030 movs r0, 0x3D movs r1, 0 bl audio_play_and_stuff - ldr r0, _08171098 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -755572,24 +730100,19 @@ sub_8171030: @ 8171030 adds r1, r6, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0817109C + ldr r1, =sub_8171104 + 1 str r1, [r0] - ldr r0, _081710A0 + ldr r0, =sub_81710A8 + 1 movs r1, 0xA bl AddTask - ldr r0, _081710A4 + ldr r0, =sub_8170EF0 + 1 str r0, [r4] _0817108A: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08171090: .4byte 0x02020630 -_08171094: .4byte 0x020241e4 -_08171098: .4byte 0x03005e00 -_0817109C: .4byte sub_8171104 + 1 -_081710A0: .4byte sub_81710A8 + 1 -_081710A4: .4byte sub_8170EF0 + 1 + .pool thumb_func_end sub_8171030 thumb_func_start sub_81710A8 @@ -755597,10 +730120,10 @@ sub_81710A8: @ 81710A8 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _081710FC + ldr r6, =0x02020630 movs r0, 0 bl battle_get_side_with_given_state - ldr r4, _08171100 + ldr r4, =0x020241e4 lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -755633,8 +730156,7 @@ _081710F4: pop {r0} bx r0 .align 2, 0 -_081710FC: .4byte 0x02020630 -_08171100: .4byte 0x020241e4 + .pool thumb_func_end sub_81710A8 thumb_func_start sub_8171104 @@ -755649,18 +730171,17 @@ sub_8171104: @ 8171104 ldrh r0, [r4, 0x22] strh r0, [r4, 0x34] strh r2, [r4, 0x36] - ldr r0, _0817112C + ldr r0, =0x0000ffd8 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r0, _08171130 + ldr r0, =sub_8171134 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0817112C: .4byte 0x0000ffd8 -_08171130: .4byte sub_8171134 + 1 + .pool thumb_func_end sub_8171104 thumb_func_start sub_8171134 @@ -755672,18 +730193,17 @@ sub_8171134: @ 8171134 lsls r0, 24 cmp r0, 0 beq _081711D2 - ldr r0, _08171158 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] cmp r0, 0x5 bne _08171160 - ldr r0, _0817115C + ldr r0, =sub_8171CAC + 1 str r0, [r4, 0x1C] b _081711D2 .align 2, 0 -_08171158: .4byte 0x020244d0 -_0817115C: .4byte sub_8171CAC + 1 + .pool _08171160: adds r0, r4, 0 movs r1, 0x1 @@ -755711,9 +730231,9 @@ _08171188: bge _08171188 movs r0, 0 strh r0, [r4, 0x38] - ldr r0, _081711DC + ldr r0, =sub_81711E8 + 1 str r0, [r4, 0x1C] - ldr r0, _081711E0 + ldr r0, =0x02024208 ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -755733,7 +730253,7 @@ _08171188: movs r2, 0x1 movs r3, 0x1C bl sub_8171D98 - ldr r0, _081711E4 + ldr r0, =0x02038437 ldrb r1, [r0] movs r0, 0 movs r2, 0xE @@ -755745,9 +730265,7 @@ _081711D2: pop {r0} bx r0 .align 2, 0 -_081711DC: .4byte sub_81711E8 + 1 -_081711E0: .4byte 0x02024208 -_081711E4: .4byte 0x02038437 + .pool thumb_func_end sub_8171134 thumb_func_start sub_81711E8 @@ -755761,17 +730279,17 @@ sub_81711E8: @ 81711E8 asrs r0, 16 cmp r0, 0xA bne _08171224 - ldr r0, _0817122C + ldr r0, =nullsub_4 + 1 movs r1, 0x32 bl AddTask lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x38] - ldr r0, _08171230 + ldr r0, =sub_8171240 + 1 str r0, [r4, 0x1C] - ldr r2, _08171234 - ldr r1, _08171238 - ldr r0, _0817123C + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02038437 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -755786,26 +730304,22 @@ _08171224: pop {r0} bx r0 .align 2, 0 -_0817122C: .4byte nullsub_4 + 1 -_08171230: .4byte sub_8171240 + 1 -_08171234: .4byte 0x02020630 -_08171238: .4byte 0x020241e4 -_0817123C: .4byte 0x02038437 + .pool thumb_func_end sub_81711E8 thumb_func_start sub_8171240 sub_8171240: @ 8171240 push {r4-r7,lr} adds r7, r0, 0 - ldr r1, _08171284 - ldr r0, _08171288 + ldr r1, =0x020241e4 + ldr r0, =0x02038437 ldrb r0, [r0] adds r0, r1 ldrb r4, [r0] ldrh r0, [r7, 0x38] lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0817128C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -755830,9 +730344,7 @@ _08171272: beq _08171296 b _08171354 .align 2, 0 -_08171284: .4byte 0x020241e4 -_08171288: .4byte 0x02038437 -_0817128C: .4byte 0x03005e00 + .pool _08171290: cmp r0, 0x2 beq _0817132C @@ -755844,11 +730356,11 @@ _08171296: movs r0, 0x80 lsls r0, 1 strh r0, [r5, 0x1C] - ldr r1, _081712D8 + ldr r1, =0x030062dc movs r0, 0x1C str r0, [r1] - ldr r2, _081712DC - ldr r1, _081712E0 + ldr r2, =0x030062e4 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -755861,7 +730373,7 @@ _08171296: adds r0, r7 subs r1, r0 strh r1, [r2] - ldr r4, _081712E4 + ldr r4, =0x030062e0 ldrh r0, [r2] lsls r0, 8 movs r1, 0x1C @@ -755870,10 +730382,7 @@ _08171296: strh r0, [r5, 0xC] b _08171346 .align 2, 0 -_081712D8: .4byte 0x030062dc -_081712DC: .4byte 0x030062e4 -_081712E0: .4byte 0x02020630 -_081712E4: .4byte 0x030062e0 + .pool _081712E8: ldrh r0, [r5, 0x1C] adds r0, 0x20 @@ -755888,7 +730397,7 @@ _081712E8: ldrh r1, [r5, 0xE] adds r0, r1 strh r0, [r5, 0xE] - ldr r0, _08171324 + ldr r0, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -755900,17 +730409,16 @@ _081712E8: strh r0, [r1, 0x26] movs r0, 0x1C ldrsh r1, [r5, r0] - ldr r0, _08171328 + ldr r0, =0x0000047f cmp r1, r0 ble _0817137C b _08171346 .align 2, 0 -_08171324: .4byte 0x02020630 -_08171328: .4byte 0x0000047f + .pool _0817132C: adds r0, r4, 0 bl sub_80A7344 - ldr r1, _08171350 + ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -755926,9 +730434,9 @@ _08171346: strh r0, [r5, 0x8] b _0817137C .align 2, 0 -_08171350: .4byte 0x02020630 + .pool _08171354: - ldr r0, _08171384 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -755944,15 +730452,14 @@ _08171354: bl obj_anim_image_start movs r0, 0 strh r0, [r7, 0x38] - ldr r0, _08171388 + ldr r0, =sub_817138C + 1 str r0, [r7, 0x1C] _0817137C: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08171384: .4byte 0x03005e00 -_08171388: .4byte sub_817138C + 1 + .pool thumb_func_end sub_8171240 thumb_func_start sub_817138C @@ -755982,14 +730489,14 @@ sub_817138C: @ 817138C bl cosine negs r0, r0 strh r0, [r4, 0x26] - ldr r0, _081713CC + ldr r0, =sub_81713D0 + 1 str r0, [r4, 0x1C] _081713C6: pop {r4} pop {r0} bx r0 .align 2, 0 -_081713CC: .4byte sub_81713D0 + 1 + .pool thumb_func_end sub_817138C thumb_func_start sub_81713D0 @@ -756027,7 +730534,7 @@ _081713E6: ldrh r0, [r4, 0x36] subs r0, 0xA strh r0, [r4, 0x36] - ldr r1, _08171430 + ldr r1, =0x00000101 adds r0, r2, r1 strh r0, [r4, 0x34] lsls r0, 16 @@ -756044,7 +730551,7 @@ _08171422: beq _0817143A b _08171452 .align 2, 0 -_08171430: .4byte 0x00000101 + .pool _08171434: cmp r0, 0x3 beq _0817144A @@ -756084,7 +730591,7 @@ _0817145A: cmp r1, 0 bgt _08171486 strh r5, [r4, 0x38] - ldr r0, _081714B4 + ldr r0, =0xffffff00 ands r0, r2 strh r0, [r4, 0x34] _08171486: @@ -756099,22 +730606,20 @@ _08171486: adds r0, r1 strh r0, [r4, 0x22] strh r5, [r4, 0x26] - ldr r0, _081714B8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] cmp r0, 0 bne _081714C0 strh r5, [r4, 0x38] - ldr r0, _081714BC + ldr r0, =sub_81717B4 + 1 str r0, [r4, 0x1C] b _081714CA .align 2, 0 -_081714B4: .4byte 0xffffff00 -_081714B8: .4byte 0x020244d0 -_081714BC: .4byte sub_81717B4 + 1 + .pool _081714C0: - ldr r0, _081714D0 + ldr r0, =sub_81714D4 + 1 str r0, [r4, 0x1C] movs r0, 0x1 strh r0, [r4, 0x36] @@ -756124,7 +730629,7 @@ _081714CA: pop {r0} bx r0 .align 2, 0 -_081714D0: .4byte sub_81714D4 + 1 + .pool thumb_func_end sub_81713D0 thumb_func_start sub_81714D4 @@ -756149,11 +730654,11 @@ sub_81714D4: @ 81714D4 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r0, _08171518 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] strh r5, [r0, 0xC] - ldr r0, _0817151C + ldr r0, =sub_8171520 + 1 str r0, [r4, 0x1C] movs r0, 0x17 bl audio_play @@ -756162,8 +730667,7 @@ _08171510: pop {r0} bx r0 .align 2, 0 -_08171518: .4byte 0x020244d0 -_0817151C: .4byte sub_8171520 + 1 + .pool thumb_func_end sub_81714D4 thumb_func_start sub_8171520 @@ -756178,12 +730682,12 @@ sub_8171520: @ 8171520 b _08171768 _08171530: lsls r0, r1, 2 - ldr r1, _0817153C + ldr r1, =_08171540 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0817153C: .4byte _08171540 + .pool .align 2, 0 _08171540: .4byte _0817155C @@ -756194,7 +730698,7 @@ _08171540: .4byte _08171708 .4byte _08171768 _0817155C: - ldr r1, _08171580 + ldr r1, =0x020244d0 ldr r5, [r1] ldr r2, [r5, 0x8] ldrh r3, [r2, 0xC] @@ -756212,7 +730716,7 @@ _0817155C: strh r0, [r1, 0xC] b _0817158A .align 2, 0 -_08171580: .4byte 0x020244d0 + .pool _08171584: adds r0, r3, 0 adds r0, 0xB0 @@ -756273,7 +730777,7 @@ _081715EA: bl sub_80082B8 b _081717AE _081715F4: - ldr r1, _08171618 + ldr r1, =0x020244d0 ldr r5, [r1] ldr r2, [r5, 0x8] ldrh r3, [r2, 0xC] @@ -756291,7 +730795,7 @@ _081715F4: strh r0, [r1, 0xC] b _08171622 .align 2, 0 -_08171618: .4byte 0x020244d0 + .pool _0817161C: adds r0, r3, 0 adds r0, 0xB0 @@ -756366,7 +730870,7 @@ _0817169C: movs r1, 0x1 bl sub_80082B8 _081716A4: - ldr r1, _081716C8 + ldr r1, =0x020244d0 ldr r5, [r1] ldr r2, [r5, 0x8] ldrh r3, [r2, 0xC] @@ -756384,7 +730888,7 @@ _081716A4: strh r0, [r1, 0xC] b _081716D2 .align 2, 0 -_081716C8: .4byte 0x020244d0 + .pool _081716CC: adds r0, r3, 0 adds r0, 0xB0 @@ -756426,7 +730930,7 @@ _08171708: strh r0, [r4, 0x34] lsls r0, 16 asrs r1, r0, 24 - ldr r0, _08171738 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] @@ -756438,22 +730942,21 @@ _08171708: movs r1, 0x80 orrs r0, r1 strb r0, [r2] - ldr r0, _0817173C + ldr r0, =sub_81717B4 + 1 str r0, [r4, 0x1C] b _081717AE .align 2, 0 -_08171738: .4byte 0x020244d0 -_0817173C: .4byte sub_81717B4 + 1 + .pool _08171740: cmp r0, 0x4 bne _08171754 cmp r1, 0x3 bne _08171754 - ldr r0, _08171750 + ldr r0, =sub_81717D8 + 1 str r0, [r4, 0x1C] b _0817175A .align 2, 0 -_08171750: .4byte sub_81717D8 + 1 + .pool _08171754: ldrh r0, [r4, 0x34] adds r0, 0x1 @@ -756477,7 +730980,7 @@ _08171768: movs r0, 0 strh r0, [r4, 0x38] ldrh r1, [r4, 0x34] - ldr r0, _0817179C + ldr r0, =0xffffff00 ands r0, r1 strh r0, [r4, 0x34] adds r0, r4, 0 @@ -756492,7 +730995,7 @@ _08171768: bl sub_8008258 b _081717A8 .align 2, 0 -_0817179C: .4byte 0xffffff00 + .pool _081717A0: adds r0, r4, 0 movs r1, 0x1 @@ -756519,13 +731022,13 @@ sub_81717B4: @ 81717B4 bne _081717CE movs r0, 0 strh r0, [r1, 0x38] - ldr r0, _081717D4 + ldr r0, =sub_8171AE4 + 1 str r0, [r1, 0x1C] _081717CE: pop {r0} bx r0 .align 2, 0 -_081717D4: .4byte sub_8171AE4 + 1 + .pool thumb_func_end sub_81717B4 thumb_func_start sub_81717D8 @@ -756536,7 +731039,7 @@ sub_81717D8: @ 81717D8 movs r2, 0x40 orrs r1, r2 strb r1, [r3] - ldr r1, _081717F4 + ldr r1, =sub_81717F8 + 1 str r1, [r0, 0x1C] movs r1, 0 strh r1, [r0, 0x34] @@ -756544,7 +731047,7 @@ sub_81717D8: @ 81717D8 strh r1, [r0, 0x38] bx lr .align 2, 0 -_081717F4: .4byte sub_81717F8 + 1 + .pool thumb_func_end sub_81717D8 thumb_func_start sub_81717F8 @@ -756554,7 +731057,7 @@ sub_81717F8: @ 81717F8 push {r7} sub sp, 0x4 adds r6, r0, 0 - ldr r7, _08171838 + ldr r7, =0x02038437 ldrh r0, [r6, 0x36] adds r0, 0x1 movs r1, 0 @@ -756578,7 +731081,7 @@ sub_81717F8: @ 81717F8 bl sub_81719EC b _081718BC .align 2, 0 -_08171838: .4byte 0x02038437 + .pool _0817183C: cmp r1, 0x3C bne _0817185A @@ -756597,24 +731100,23 @@ _0817183C: _0817185A: cmp r1, 0x5F bne _08171880 - ldr r0, _08171878 + ldr r0, =0x020244b9 movs r1, 0 strb r1, [r0] movs r0, 0x1 bl sub_8072A88 bl m4aMPlayAllStop - ldr r0, _0817187C + ldr r0, =0x00000213 bl audio_play b _081718BC .align 2, 0 -_08171878: .4byte 0x020244b9 -_0817187C: .4byte 0x00000213 + .pool _08171880: - ldr r0, _081718C8 + ldr r0, =0x0000013b cmp r1, r0 bne _081718BC - ldr r5, _081718CC - ldr r4, _081718D0 + ldr r5, =0x02020630 + ldr r4, =0x020241e4 ldrb r0, [r7] adds r0, r4 ldrb r1, [r0] @@ -756636,7 +731138,7 @@ _08171880: bl obj_delete_and_free_tiles mov r0, r8 strh r0, [r6, 0x2E] - ldr r0, _081718D4 + ldr r0, =sub_81718D8 + 1 str r0, [r6, 0x1C] _081718BC: add sp, 0x4 @@ -756646,10 +731148,7 @@ _081718BC: pop {r0} bx r0 .align 2, 0 -_081718C8: .4byte 0x0000013b -_081718CC: .4byte 0x02020630 -_081718D0: .4byte 0x020241e4 -_081718D4: .4byte sub_81718D8 + 1 + .pool thumb_func_end sub_81717F8 thumb_func_start sub_81718D8 @@ -756695,7 +731194,7 @@ _081718F6: adds r0, 0x10 movs r1, 0x1 lsls r1, r0 - ldr r0, _08171940 + ldr r0, =0x00007fff str r0, [sp] adds r0, r1, 0 movs r1, 0 @@ -756704,7 +731203,7 @@ _081718F6: bl sub_80A1AD4 b _08171982 .align 2, 0 -_08171940: .4byte 0x00007fff + .pool _08171944: ldrh r0, [r4, 0x30] adds r1, r0, 0x1 @@ -756743,7 +731242,7 @@ _08171982: strh r0, [r4, 0x2E] b _081719B0 _0817198A: - ldr r0, _081719B8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -756758,7 +731257,7 @@ _0817198A: movs r1, 0 bl lcd_io_set strh r5, [r4, 0x2E] - ldr r0, _081719BC + ldr r0, =sub_81719C0 + 1 str r0, [r4, 0x1C] _081719B0: add sp, 0x4 @@ -756766,8 +731265,7 @@ _081719B0: pop {r0} bx r0 .align 2, 0 -_081719B8: .4byte 0x02037fd4 -_081719BC: .4byte sub_81719C0 + 1 + .pool thumb_func_end sub_81718D8 thumb_func_start sub_81719C0 @@ -756779,11 +731277,11 @@ sub_81719C0: @ 81719C0 ldrsh r0, [r4, r2] cmp r0, 0 bne _081719D8 - ldr r0, _081719D4 + ldr r0, =0x0000ffff strh r0, [r4, 0x2E] b _081719E4 .align 2, 0 -_081719D4: .4byte 0x0000ffff + .pool _081719D8: adds r0, r4, 0 bl obj_free_rotscale_entry @@ -756822,7 +731320,7 @@ _08171A14: movs r0, 0x4 bl sub_8171D60 movs r7, 0 - ldr r2, _08171A98 + ldr r2, =0x02020630 mov r9, r2 movs r0, 0x1C add r0, r9 @@ -756832,7 +731330,7 @@ _08171A26: ldrsh r1, [r6, r2] movs r0, 0x22 ldrsh r2, [r6, r0] - ldr r0, _08171A9C + ldr r0, =0x085e5250 mov r3, r8 bl obj_add_from_template_forward_search lsls r0, 24 @@ -756846,7 +731344,7 @@ _08171A26: adds r5, r4, r2 movs r0, 0x18 strh r0, [r5, 0x2E] - ldr r0, _08171AA0 + ldr r0, =0x085e5088 lsls r1, r7, 2 adds r1, r0 movs r0, 0 @@ -756865,9 +731363,9 @@ _08171A26: adds r0, r5, 0 bl sub_80A68D4 add r4, r10 - ldr r0, _08171AA4 + ldr r0, =sub_8171AAC + 1 str r0, [r4] - ldr r0, _08171AA8 + ldr r0, =0x085e51b4 ldrb r1, [r0, 0x4] adds r0, r5, 0 bl obj_anim_image_start @@ -756883,11 +731381,7 @@ _08171A82: pop {r0} bx r0 .align 2, 0 -_08171A98: .4byte 0x02020630 -_08171A9C: .4byte 0x085e5250 -_08171AA0: .4byte 0x085e5088 -_08171AA4: .4byte sub_8171AAC + 1 -_08171AA8: .4byte 0x085e51b4 + .pool thumb_func_end sub_81719EC thumb_func_start sub_8171AAC @@ -756930,9 +731424,9 @@ sub_8171AE4: @ 8171AE4 adds r0, r4, 0 movs r1, 0 bl sub_8008258 - ldr r0, _08171B98 + ldr r0, =sub_8171BAC + 1 str r0, [r4, 0x1C] - ldr r0, _08171B9C + ldr r0, =0x02024208 ldrh r0, [r0] bl ball_number_to_ball_processing_index lsls r0, 24 @@ -756952,16 +731446,16 @@ sub_8171AE4: @ 8171AE4 movs r2, 0x1 movs r3, 0x1C bl sub_8171D98 - ldr r0, _08171BA0 + ldr r0, =0x02038437 ldrb r1, [r0] movs r0, 0x1 movs r2, 0xE adds r3, r5, 0 bl sub_81729E8 _08171B36: - ldr r6, _08171BA4 - ldr r5, _08171BA8 - ldr r4, _08171BA0 + ldr r6, =0x02020630 + ldr r5, =0x020241e4 + ldr r4, =0x02038437 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -757007,11 +731501,7 @@ _08171B36: pop {r0} bx r0 .align 2, 0 -_08171B98: .4byte sub_8171BAC + 1 -_08171B9C: .4byte 0x02024208 -_08171BA0: .4byte 0x02038437 -_08171BA4: .4byte 0x02020630 -_08171BA8: .4byte 0x020241e4 + .pool thumb_func_end sub_8171AE4 thumb_func_start sub_8171BAC @@ -757032,9 +731522,9 @@ sub_8171BAC: @ 8171BAC orrs r0, r1 strb r0, [r2] _08171BCA: - ldr r4, _08171BF8 - ldr r3, _08171BFC - ldr r2, _08171C00 + ldr r4, =0x02020630 + ldr r3, =0x020241e4 + ldr r2, =0x02038437 ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -757054,11 +731544,9 @@ _08171BCA: movs r5, 0x1 b _08171C24 .align 2, 0 -_08171BF8: .4byte 0x02020630 -_08171BFC: .4byte 0x020241e4 -_08171C00: .4byte 0x02038437 + .pool _08171C04: - ldr r6, _08171C90 + ldr r6, =0xfffffee0 adds r0, r6, 0 ldrh r6, [r1, 0x30] adds r0, r6 @@ -757084,9 +731572,9 @@ _08171C24: beq _08171C8A cmp r5, 0 beq _08171C8A - ldr r4, _08171C94 - ldr r3, _08171C98 - ldr r2, _08171C9C + ldr r4, =0x02020630 + ldr r3, =0x020241e4 + ldr r2, =0x02038437 ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -757104,7 +731592,7 @@ _08171C24: adds r2, r0 lsls r2, 2 adds r2, r4 - ldr r0, _08171CA0 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r1, [r0, 0x9] @@ -757119,9 +731607,9 @@ _08171C24: orrs r0, r1 strb r0, [r2] strh r5, [r7, 0x2E] - ldr r0, _08171CA4 + ldr r0, =sub_81719C0 + 1 str r0, [r7, 0x1C] - ldr r0, _08171CA8 + ldr r0, =0x020244b9 strb r6, [r0] movs r0, 0x1 bl sub_8072A88 @@ -757130,13 +731618,7 @@ _08171C8A: pop {r0} bx r0 .align 2, 0 -_08171C90: .4byte 0xfffffee0 -_08171C94: .4byte 0x02020630 -_08171C98: .4byte 0x020241e4 -_08171C9C: .4byte 0x02038437 -_08171CA0: .4byte 0x020244d0 -_08171CA4: .4byte sub_81719C0 + 1 -_08171CA8: .4byte 0x020244b9 + .pool thumb_func_end sub_8171BAC thumb_func_start sub_8171CAC @@ -757154,7 +731636,7 @@ sub_8171CAC: @ 8171CAC strh r0, [r2, 0x22] strh r1, [r2, 0x26] strh r1, [r2, 0x24] - ldr r4, _08171CE4 + ldr r4, =sub_8171CE8 + 1 movs r3, 0 movs r1, 0x5 adds r0, r2, 0 @@ -757170,7 +731652,7 @@ _08171CD0: pop {r0} bx r0 .align 2, 0 -_08171CE4: .4byte sub_8171CE8 + 1 + .pool thumb_func_end sub_8171CAC thumb_func_start sub_8171CE8 @@ -757221,9 +731703,9 @@ sub_8171CE8: @ 8171CE8 _08171D3E: movs r0, 0 strh r0, [r4, 0x2E] - ldr r0, _08171D58 + ldr r0, =sub_81719C0 + 1 str r0, [r4, 0x1C] - ldr r1, _08171D5C + ldr r1, =0x020244b9 movs r0, 0 strb r0, [r1] movs r0, 0x1 @@ -757233,26 +731715,25 @@ _08171D52: pop {r0} bx r0 .align 2, 0 -_08171D58: .4byte sub_81719C0 + 1 -_08171D5C: .4byte 0x020244b9 + .pool thumb_func_end sub_8171CE8 thumb_func_start sub_8171D60 sub_8171D60: @ 8171D60 push {r4,r5,lr} lsls r0, 24 - ldr r1, _08171D8C + ldr r1, =0x085e5094 lsrs r5, r0, 21 adds r4, r5, r1 ldrh r0, [r4, 0x6] bl gpu_tile_obj_tag_get_range_start lsls r0, 16 - ldr r1, _08171D90 + ldr r1, =0xffff0000 cmp r0, r1 bne _08171D86 adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load3 - ldr r0, _08171D94 + ldr r0, =0x085e50f4 adds r0, r5, r0 bl gpu_pal_obj_decompress_and_apply3 _08171D86: @@ -757260,9 +731741,7 @@ _08171D86: pop {r0} bx r0 .align 2, 0 -_08171D8C: .4byte 0x085e5094 -_08171D90: .4byte 0xffff0000 -_08171D94: .4byte 0x085e50f4 + .pool thumb_func_end sub_8171D60 thumb_func_start sub_8171D98 @@ -757295,7 +731774,7 @@ sub_8171D98: @ 8171D98 lsrs r5, 24 adds r0, r5, 0 bl sub_8171D60 - ldr r1, _08171E18 + ldr r1, =0x085e51c0 lsls r0, r5, 2 adds r0, r1 ldr r0, [r0] @@ -757304,7 +731783,7 @@ sub_8171D98: @ 8171D98 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08171E1C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -757328,22 +731807,21 @@ sub_8171D98: @ 8171D98 pop {r1} bx r1 .align 2, 0 -_08171E18: .4byte 0x085e51c0 -_08171E1C: .4byte 0x03005e00 + .pool thumb_func_end sub_8171D98 thumb_func_start sub_8171E20 sub_8171E20: @ 8171E20 push {lr} - ldr r0, _08171E44 - ldr r1, _08171E48 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _08171E3E - ldr r0, _08171E4C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x8] ldrb r0, [r1, 0xA] @@ -757353,9 +731831,7 @@ _08171E3E: pop {r0} bx r0 .align 2, 0 -_08171E44: .4byte 0x030022c0 -_08171E48: .4byte 0x00000439 -_08171E4C: .4byte 0x020244d0 + .pool thumb_func_end sub_8171E20 thumb_func_start sub_8171E50 @@ -757369,7 +731845,7 @@ sub_8171E50: @ 8171E50 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _08171F2C + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -757392,7 +731868,7 @@ sub_8171E50: @ 8171E50 lsls r0, r4, 1 adds r0, r4 lsls r0, 3 - ldr r4, _08171F30 + ldr r4, =0x085e51f0 adds r0, r4 bl obj_add_from_template_forward_search lsls r0, 24 @@ -757405,9 +731881,9 @@ sub_8171E50: @ 8171E50 lsls r4, r0, 4 add r4, r10 lsls r4, 2 - ldr r5, _08171F34 + ldr r5, =0x02020630 adds r7, r4, r5 - ldr r0, _08171F38 + ldr r0, =0x085e51b4 ldr r1, [sp] adds r0, r1, r0 ldrb r1, [r0] @@ -757415,7 +731891,7 @@ sub_8171E50: @ 8171E50 bl obj_anim_image_start adds r5, 0x1C adds r4, r5 - ldr r0, _08171F3C + ldr r0, =sub_8171F68 + 1 str r0, [r4] movs r0, 0x3 mov r2, r9 @@ -757437,7 +731913,7 @@ _08171EE8: lsls r0, 5 strh r0, [r7, 0x2E] _08171EEC: - ldr r0, _08171F2C + ldr r0, =0x03005e00 mov r4, r8 lsls r1, r4, 2 add r1, r8 @@ -757448,15 +731924,15 @@ _08171EEC: adds r2, r0, 0 cmp r1, 0xF bne _08171F48 - ldr r0, _08171F40 - ldr r4, _08171F44 + ldr r0, =0x030022c0 + ldr r4, =0x00000439 adds r0, r4 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 bne _08171F22 - ldr r0, _08171F34 + ldr r0, =0x02020630 mov r2, r10 lsls r1, r2, 4 add r1, r10 @@ -757469,13 +731945,7 @@ _08171F22: bl remove_task b _08171F58 .align 2, 0 -_08171F2C: .4byte 0x03005e00 -_08171F30: .4byte 0x085e51f0 -_08171F34: .4byte 0x02020630 -_08171F38: .4byte 0x085e51b4 -_08171F3C: .4byte sub_8171F68 + 1 -_08171F40: .4byte 0x030022c0 -_08171F44: .4byte 0x00000439 + .pool _08171F48: mov r4, r8 lsls r0, r4, 2 @@ -757505,11 +731975,11 @@ sub_8171F68: @ 8171F68 ldrsh r0, [r1, r3] cmp r0, 0 bne _08171F80 - ldr r0, _08171F7C + ldr r0, =sub_8171F88 + 1 str r0, [r1, 0x1C] b _08171F84 .align 2, 0 -_08171F7C: .4byte sub_8171F88 + 1 + .pool _08171F80: subs r0, r2, 0x1 strh r0, [r1, 0x30] @@ -757560,7 +732030,7 @@ sub_8171FC4: @ 8171FC4 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _081720A8 + ldr r0, =0x03005e00 mov r2, r9 lsls r1, r2, 2 add r1, r9 @@ -757579,7 +732049,7 @@ sub_8171FC4: @ 8171FC4 ldrb r1, [r1, 0x10] str r1, [sp, 0xC] movs r7, 0 - ldr r3, _081720AC + ldr r3, =0x02020630 mov r10, r3 mov r1, r8 lsls r0, r1, 1 @@ -757587,7 +732057,7 @@ sub_8171FC4: @ 8171FC4 lsls r0, 3 str r0, [sp, 0x10] _0817200A: - ldr r0, _081720B0 + ldr r0, =0x085e51f0 ldr r2, [sp, 0x10] adds r0, r2, r0 ldr r1, [sp] @@ -757604,14 +732074,14 @@ _0817200A: lsls r4, 2 mov r3, r10 adds r5, r4, r3 - ldr r0, _081720B4 + ldr r0, =0x085e51b4 add r0, r8 ldrb r1, [r0] adds r0, r5, 0 bl obj_anim_image_start - ldr r0, _081720B8 + ldr r0, =0x0202064c adds r4, r0 - ldr r0, _081720BC + ldr r0, =sub_8172508 + 1 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -757638,15 +732108,15 @@ _0817206A: lsrs r7, r0, 24 cmp r7, 0x7 bls _0817200A - ldr r0, _081720C0 - ldr r1, _081720C4 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 bne _08172092 - ldr r0, _081720AC + ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -757665,14 +732135,7 @@ _08172092: pop {r0} bx r0 .align 2, 0 -_081720A8: .4byte 0x03005e00 -_081720AC: .4byte 0x02020630 -_081720B0: .4byte 0x085e51f0 -_081720B4: .4byte 0x085e51b4 -_081720B8: .4byte 0x0202064c -_081720BC: .4byte sub_8172508 + 1 -_081720C0: .4byte 0x030022c0 -_081720C4: .4byte 0x00000439 + .pool thumb_func_end sub_8171FC4 thumb_func_start sub_81720C8 @@ -757686,7 +732149,7 @@ sub_81720C8: @ 81720C8 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _081721AC + ldr r0, =0x03005e00 mov r2, r9 lsls r1, r2, 2 add r1, r9 @@ -757705,7 +732168,7 @@ sub_81720C8: @ 81720C8 ldrb r1, [r1, 0x10] str r1, [sp, 0xC] movs r7, 0 - ldr r3, _081721B0 + ldr r3, =0x02020630 mov r10, r3 mov r1, r8 lsls r0, r1, 1 @@ -757713,7 +732176,7 @@ sub_81720C8: @ 81720C8 lsls r0, 3 str r0, [sp, 0x10] _0817210E: - ldr r0, _081721B4 + ldr r0, =0x085e51f0 ldr r2, [sp, 0x10] adds r0, r2, r0 ldr r1, [sp] @@ -757730,14 +732193,14 @@ _0817210E: lsls r4, 2 mov r3, r10 adds r5, r4, r3 - ldr r0, _081721B8 + ldr r0, =0x085e51b4 add r0, r8 ldrb r1, [r0] adds r0, r5, 0 bl obj_anim_image_start - ldr r0, _081721BC + ldr r0, =0x0202064c adds r4, r0 - ldr r0, _081721C0 + ldr r0, =sub_8172508 + 1 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -757764,15 +732227,15 @@ _0817216E: lsrs r7, r0, 24 cmp r7, 0x7 bls _0817210E - ldr r0, _081721C4 - ldr r1, _081721C8 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 bne _08172196 - ldr r0, _081721B0 + ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -757791,14 +732254,7 @@ _08172196: pop {r0} bx r0 .align 2, 0 -_081721AC: .4byte 0x03005e00 -_081721B0: .4byte 0x02020630 -_081721B4: .4byte 0x085e51f0 -_081721B8: .4byte 0x085e51b4 -_081721BC: .4byte 0x0202064c -_081721C0: .4byte sub_8172508 + 1 -_081721C4: .4byte 0x030022c0 -_081721C8: .4byte 0x00000439 + .pool thumb_func_end sub_81720C8 thumb_func_start sub_81721CC @@ -757812,7 +732268,7 @@ sub_81721CC: @ 81721CC lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _081722AC + ldr r1, =0x03005e00 lsls r0, 2 add r0, r9 lsls r0, 3 @@ -757833,13 +732289,13 @@ sub_81721CC: @ 81721CC adds r0, r1 lsls r0, 3 str r0, [sp, 0x10] - ldr r3, _081722B0 + ldr r3, =0x02020630 mov r8, r3 - ldr r0, _081722B4 + ldr r0, =0x085e51b4 adds r1, r0 mov r10, r1 _08172212: - ldr r0, _081722B8 + ldr r0, =0x085e51f0 ldr r1, [sp, 0x10] adds r0, r1, r0 ldr r1, [sp] @@ -757860,9 +732316,9 @@ _08172212: ldrb r1, [r3] adds r0, r5, 0 bl obj_anim_image_start - ldr r0, _081722BC + ldr r0, =0x0202064c adds r4, r0 - ldr r0, _081722C0 + ldr r0, =sub_8172508 + 1 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -757888,15 +732344,15 @@ _0817226E: lsrs r7, r0, 24 cmp r7, 0x7 bls _08172212 - ldr r0, _081722C4 - ldr r1, _081722C8 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 bne _08172296 - ldr r0, _081722B0 + ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -757915,14 +732371,7 @@ _08172296: pop {r0} bx r0 .align 2, 0 -_081722AC: .4byte 0x03005e00 -_081722B0: .4byte 0x02020630 -_081722B4: .4byte 0x085e51b4 -_081722B8: .4byte 0x085e51f0 -_081722BC: .4byte 0x0202064c -_081722C0: .4byte sub_8172508 + 1 -_081722C4: .4byte 0x030022c0 -_081722C8: .4byte 0x00000439 + .pool thumb_func_end sub_81721CC thumb_func_start sub_81722CC @@ -757936,7 +732385,7 @@ sub_81722CC: @ 81722CC lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _081723B4 + ldr r0, =0x03005e00 mov r2, r9 lsls r1, r2, 2 add r1, r9 @@ -757955,7 +732404,7 @@ sub_81722CC: @ 81722CC ldrb r1, [r1, 0x10] str r1, [sp, 0xC] movs r7, 0 - ldr r3, _081723B8 + ldr r3, =0x02020630 mov r10, r3 mov r1, r8 lsls r0, r1, 1 @@ -757963,7 +732412,7 @@ sub_81722CC: @ 81722CC lsls r0, 3 str r0, [sp, 0x10] _08172312: - ldr r0, _081723BC + ldr r0, =0x085e51f0 ldr r2, [sp, 0x10] adds r0, r2, r0 ldr r1, [sp] @@ -757980,14 +732429,14 @@ _08172312: lsls r4, 2 mov r3, r10 adds r5, r4, r3 - ldr r0, _081723C0 + ldr r0, =0x085e51b4 add r0, r8 ldrb r1, [r0] adds r0, r5, 0 bl obj_anim_image_start - ldr r0, _081723C4 + ldr r0, =0x0202064c adds r4, r0 - ldr r0, _081723C8 + ldr r0, =sub_8172508 + 1 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -758016,15 +732465,15 @@ _08172376: lsrs r7, r0, 24 cmp r7, 0x9 bls _08172312 - ldr r0, _081723CC - ldr r1, _081723D0 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 bne _0817239E - ldr r0, _081723B8 + ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -758043,14 +732492,7 @@ _0817239E: pop {r0} bx r0 .align 2, 0 -_081723B4: .4byte 0x03005e00 -_081723B8: .4byte 0x02020630 -_081723BC: .4byte 0x085e51f0 -_081723C0: .4byte 0x085e51b4 -_081723C4: .4byte 0x0202064c -_081723C8: .4byte sub_8172508 + 1 -_081723CC: .4byte 0x030022c0 -_081723D0: .4byte 0x00000439 + .pool thumb_func_end sub_81722CC thumb_func_start sub_81723D4 @@ -758064,7 +732506,7 @@ sub_81723D4: @ 81723D4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _08172400 + ldr r1, =0x03005e00 lsls r2, r0, 2 adds r0, r2, r0 lsls r0, 3 @@ -758078,7 +732520,7 @@ sub_81723D4: @ 81723D4 strh r0, [r3, 0x16] b _081724D6 .align 2, 0 -_08172400: .4byte 0x03005e00 + .pool _08172404: ldrh r0, [r3, 0x26] lsls r0, 24 @@ -758097,13 +732539,13 @@ _08172404: adds r1, r0 lsls r1, 3 str r1, [sp, 0x10] - ldr r3, _081724E8 + ldr r3, =0x02020630 mov r9, r3 - ldr r1, _081724EC + ldr r1, =0x085e51b4 adds r0, r1 mov r10, r0 _08172430: - ldr r0, _081724F0 + ldr r0, =0x085e51f0 ldr r4, [sp, 0x10] adds r0, r4, r0 ldr r1, [sp] @@ -758124,9 +732566,9 @@ _08172430: ldrb r1, [r3] adds r0, r5, 0 bl obj_anim_image_start - ldr r0, _081724F4 + ldr r0, =0x0202064c adds r4, r0 - ldr r0, _081724F8 + ldr r0, =sub_8172508 + 1 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -758152,7 +732594,7 @@ _0817248C: lsrs r7, r0, 24 cmp r7, 0x7 bls _08172430 - ldr r0, _081724FC + ldr r0, =0x03005e00 ldr r1, [sp, 0x14] add r1, r8 lsls r1, 3 @@ -758166,15 +732608,15 @@ _0817248C: asrs r2, r0, 16 cmp r2, 0x2 bne _081724D6 - ldr r0, _08172500 - ldr r4, _08172504 + ldr r0, =0x030022c0 + ldr r4, =0x00000439 adds r0, r4 ldrb r1, [r0] adds r0, r2, 0 ands r0, r1 cmp r0, 0 bne _081724D0 - ldr r0, _081724E8 + ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -758194,14 +732636,7 @@ _081724D6: pop {r0} bx r0 .align 2, 0 -_081724E8: .4byte 0x02020630 -_081724EC: .4byte 0x085e51b4 -_081724F0: .4byte 0x085e51f0 -_081724F4: .4byte 0x0202064c -_081724F8: .4byte sub_8172508 + 1 -_081724FC: .4byte 0x03005e00 -_08172500: .4byte 0x030022c0 -_08172504: .4byte 0x00000439 + .pool thumb_func_end sub_81723D4 thumb_func_start sub_8172508 @@ -758260,7 +732695,7 @@ sub_8172560: @ 8172560 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _0817263C + ldr r1, =0x03005e00 lsls r0, 2 add r0, r9 lsls r0, 3 @@ -758281,13 +732716,13 @@ sub_8172560: @ 8172560 adds r0, r1 lsls r0, 3 str r0, [sp, 0x10] - ldr r3, _08172640 + ldr r3, =0x02020630 mov r8, r3 - ldr r0, _08172644 + ldr r0, =0x085e51b4 adds r1, r0 mov r10, r1 _081725A6: - ldr r0, _08172648 + ldr r0, =0x085e51f0 ldr r1, [sp, 0x10] adds r0, r1, r0 ldr r1, [sp] @@ -758308,9 +732743,9 @@ _081725A6: ldrb r1, [r3] adds r0, r5, 0 bl obj_anim_image_start - ldr r0, _0817264C + ldr r0, =0x0202064c adds r4, r0 - ldr r0, _08172650 + ldr r0, =sub_817265C + 1 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -758334,15 +732769,15 @@ _081725FE: lsrs r7, r0, 24 cmp r7, 0xB bls _081725A6 - ldr r0, _08172654 - ldr r1, _08172658 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 bne _08172626 - ldr r0, _08172640 + ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -758361,14 +732796,7 @@ _08172626: pop {r0} bx r0 .align 2, 0 -_0817263C: .4byte 0x03005e00 -_08172640: .4byte 0x02020630 -_08172644: .4byte 0x085e51b4 -_08172648: .4byte 0x085e51f0 -_0817264C: .4byte 0x0202064c -_08172650: .4byte sub_817265C + 1 -_08172654: .4byte 0x030022c0 -_08172658: .4byte 0x00000439 + .pool thumb_func_end sub_8172560 thumb_func_start sub_817265C @@ -758430,7 +732858,7 @@ sub_81726BC: @ 81726BC lsls r0, 24 lsrs r0, 24 str r0, [sp] - ldr r0, _08172770 + ldr r0, =0x03005e00 ldr r2, [sp] lsls r1, r2, 2 adds r1, r2 @@ -758461,7 +732889,7 @@ _08172700: add r2, r8 mov r10, r2 _08172708: - ldr r0, _08172774 + ldr r0, =0x085e51f0 ldr r3, [sp, 0x14] adds r0, r3, r0 ldr r1, [sp, 0x4] @@ -758476,16 +732904,16 @@ _08172708: lsls r4, r6, 4 adds r4, r6 lsls r4, 2 - ldr r0, _08172778 + ldr r0, =0x02020630 adds r5, r4, r0 - ldr r0, _0817277C + ldr r0, =0x085e51b4 add r0, r9 ldrb r1, [r0] adds r0, r5, 0 bl obj_anim_image_start - ldr r1, _08172780 + ldr r1, =0x0202064c adds r4, r1 - ldr r0, _08172784 + ldr r0, =sub_8172508 + 1 str r0, [r4] movs r0, 0x3 ldr r1, [sp, 0xC] @@ -758510,12 +732938,7 @@ _08172708: movs r0, 0x1 b _0817278E .align 2, 0 -_08172770: .4byte 0x03005e00 -_08172774: .4byte 0x085e51f0 -_08172778: .4byte 0x02020630 -_0817277C: .4byte 0x085e51b4 -_08172780: .4byte 0x0202064c -_08172784: .4byte sub_8172508 + 1 + .pool _08172788: movs r0, 0x1 strh r0, [r5, 0x38] @@ -758534,15 +732957,15 @@ _08172790: mov r8, r0 cmp r0, 0x1 bls _08172700 - ldr r0, _081727DC - ldr r2, _081727E0 + ldr r0, =0x030022c0 + ldr r2, =0x00000439 adds r0, r2 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 bne _081727C4 - ldr r0, _081727E4 + ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -758561,9 +732984,7 @@ _081727C4: pop {r0} bx r0 .align 2, 0 -_081727DC: .4byte 0x030022c0 -_081727E0: .4byte 0x00000439 -_081727E4: .4byte 0x02020630 + .pool thumb_func_end sub_81726BC thumb_func_start sub_81727E8 @@ -758577,7 +732998,7 @@ sub_81727E8: @ 81727E8 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _081728C0 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r9 lsls r0, 3 @@ -758598,13 +733019,13 @@ sub_81727E8: @ 81727E8 adds r0, r1 lsls r0, 3 str r0, [sp, 0x10] - ldr r3, _081728C4 + ldr r3, =0x02020630 mov r8, r3 - ldr r0, _081728C8 + ldr r0, =0x085e51b4 adds r1, r0 mov r10, r1 _0817282E: - ldr r0, _081728CC + ldr r0, =0x085e51f0 ldr r1, [sp, 0x10] adds r0, r1, r0 ldr r1, [sp] @@ -758625,9 +733046,9 @@ _0817282E: ldrb r1, [r3] adds r0, r5, 0 bl obj_anim_image_start - ldr r0, _081728D0 + ldr r0, =0x0202064c adds r4, r0 - ldr r0, _081728D4 + ldr r0, =sub_81728E0 + 1 str r0, [r4] movs r0, 0x3 ldr r2, [sp, 0x8] @@ -758648,15 +733069,15 @@ _08172880: lsrs r7, r0, 24 cmp r7, 0x7 bls _0817282E - ldr r0, _081728D8 - ldr r1, _081728DC + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 bne _081728A8 - ldr r0, _081728C4 + ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -758675,14 +733096,7 @@ _081728A8: pop {r0} bx r0 .align 2, 0 -_081728C0: .4byte 0x03005e00 -_081728C4: .4byte 0x02020630 -_081728C8: .4byte 0x085e51b4 -_081728CC: .4byte 0x085e51f0 -_081728D0: .4byte 0x0202064c -_081728D4: .4byte sub_81728E0 + 1 -_081728D8: .4byte 0x030022c0 -_081728DC: .4byte 0x00000439 + .pool thumb_func_end sub_81727E8 thumb_func_start sub_81728E0 @@ -758739,8 +733153,8 @@ _0817293C: sub_8172944: @ 8172944 push {r4-r7,lr} adds r7, r0, 0 - ldr r0, _08172968 - ldr r1, _0817296C + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -758755,10 +733169,9 @@ sub_8172944: @ 8172944 bl obj_delete_and_free_resources b _081729E2 .align 2, 0 -_08172968: .4byte 0x030022c0 -_0817296C: .4byte 0x00000439 + .pool _08172970: - ldr r2, _0817298C + ldr r2, =0x020244d0 ldr r0, [r2] ldr r1, [r0, 0x8] ldrb r0, [r1, 0xA] @@ -758770,11 +733183,10 @@ _08172970: cmp r0, 0 bne _081729DC movs r4, 0 - ldr r5, _08172990 + ldr r5, =0x085e51c0 b _08172998 .align 2, 0 -_0817298C: .4byte 0x020244d0 -_08172990: .4byte 0x085e51c0 + .pool _08172994: adds r5, 0x4 adds r4, 0x1 @@ -758791,8 +733203,8 @@ _081729AA: cmp r4, 0xC bne _081729CA movs r6, 0 - ldr r5, _081729D4 - ldr r4, _081729D8 + ldr r5, =0x085e5094 + ldr r4, =0x085e50f4 _081729B4: ldrh r0, [r5, 0x6] bl gpu_tile_obj_free_by_tag @@ -758808,8 +733220,7 @@ _081729CA: bl obj_delete_and_free_tiles b _081729E2 .align 2, 0 -_081729D4: .4byte 0x085e5094 -_081729D8: .4byte 0x085e50f4 + .pool _081729DC: adds r0, r7, 0 bl obj_delete_and_free_tiles @@ -758834,13 +733245,13 @@ sub_81729E8: @ 81729E8 lsrs r6, r1, 24 lsls r3, 24 lsrs r7, r3, 24 - ldr r0, _08172A4C + ldr r0, =sub_8172AB0 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _08172A50 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -758859,7 +733270,7 @@ sub_81729E8: @ 81729E8 lsls r2, 17 adds r0, r2 lsrs r0, 16 - ldr r2, _08172A54 + ldr r2, =0x085e5310 lsls r1, r7, 1 adds r1, r2 ldrh r3, [r1] @@ -758870,16 +733281,14 @@ sub_81729E8: @ 81729E8 strh r0, [r5, 0xA] b _08172A7E .align 2, 0 -_08172A4C: .4byte sub_8172AB0 + 1 -_08172A50: .4byte 0x03005e00 -_08172A54: .4byte 0x085e5310 + .pool _08172A58: lsls r0, r6, 20 movs r1, 0x80 lsls r1, 17 adds r0, r1 lsrs r0, 16 - ldr r2, _08172AA0 + ldr r2, =0x085e5310 lsls r1, r7, 1 adds r1, r2 ldrh r3, [r1] @@ -758888,12 +733297,12 @@ _08172A58: bl pal_fade_1 movs r0, 0x10 strh r0, [r5, 0x8] - ldr r0, _08172AA4 + ldr r0, =0x0000ffff strh r0, [r5, 0xA] - ldr r0, _08172AA8 + ldr r0, =sub_8172B40 + 1 str r0, [r5] _08172A7E: - ldr r0, _08172AAC + ldr r0, =0x00007fff str r0, [sp] mov r0, r9 movs r1, 0 @@ -758909,10 +733318,7 @@ _08172A7E: pop {r1} bx r1 .align 2, 0 -_08172AA0: .4byte 0x085e5310 -_08172AA4: .4byte 0x0000ffff -_08172AA8: .4byte sub_8172B40 + 1 -_08172AAC: .4byte 0x00007fff + .pool thumb_func_end sub_81729E8 thumb_func_start sub_8172AB0 @@ -758922,7 +733328,7 @@ sub_8172AB0: @ 8172AB0 lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 - ldr r1, _08172B00 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -758942,7 +733348,7 @@ sub_8172AB0: @ 8172AB0 adds r0, r2 lsrs r0, 16 ldrb r2, [r4, 0x8] - ldr r3, _08172B04 + ldr r3, =0x085e5310 lsls r1, 1 adds r1, r3 ldrh r3, [r1] @@ -758957,10 +733363,9 @@ sub_8172AB0: @ 8172AB0 strh r0, [r4, 0xC] b _08172B30 .align 2, 0 -_08172B00: .4byte 0x03005e00 -_08172B04: .4byte 0x085e5310 + .pool _08172B08: - ldr r0, _08172B38 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -758970,7 +733375,7 @@ _08172B08: ldrh r1, [r4, 0x1E] lsls r1, 16 orrs r0, r1 - ldr r1, _08172B3C + ldr r1, =0x00007fff str r1, [sp] movs r1, 0 movs r2, 0x10 @@ -758984,8 +733389,7 @@ _08172B30: pop {r0} bx r0 .align 2, 0 -_08172B38: .4byte 0x02037fd4 -_08172B3C: .4byte 0x00007fff + .pool thumb_func_end sub_8172AB0 thumb_func_start sub_8172B40 @@ -758994,13 +733398,13 @@ sub_8172B40: @ 8172B40 sub sp, 0x4 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08172B80 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08172B78 - ldr r0, _08172B84 + ldr r0, =0x03005e00 lsls r4, r2, 2 adds r4, r2 lsls r4, 3 @@ -759009,13 +733413,13 @@ sub_8172B40: @ 8172B40 ldrh r1, [r4, 0x1E] lsls r1, 16 orrs r0, r1 - ldr r1, _08172B88 + ldr r1, =0x00007fff str r1, [sp] movs r1, 0 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _08172B8C + ldr r0, =sub_8172B90 + 1 str r0, [r4] _08172B78: add sp, 0x4 @@ -759023,10 +733427,7 @@ _08172B78: pop {r0} bx r0 .align 2, 0 -_08172B80: .4byte 0x02037fd4 -_08172B84: .4byte 0x03005e00 -_08172B88: .4byte 0x00007fff -_08172B8C: .4byte sub_8172B90 + 1 + .pool thumb_func_end sub_8172B40 thumb_func_start sub_8172B90 @@ -759034,7 +733435,7 @@ sub_8172B90: @ 8172B90 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08172BDC + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -759054,7 +733455,7 @@ sub_8172B90: @ 8172B90 adds r0, r3 lsrs r0, 16 ldrb r2, [r4, 0x8] - ldr r3, _08172BE0 + ldr r3, =0x085e5310 lsls r1, 1 adds r1, r3 ldrh r3, [r1] @@ -759069,8 +733470,7 @@ sub_8172B90: @ 8172B90 strh r0, [r4, 0xC] b _08172BEA .align 2, 0 -_08172BDC: .4byte 0x03005e00 -_08172BE0: .4byte 0x085e5310 + .pool _08172BE4: adds r0, r2, 0 bl remove_task @@ -759089,12 +733489,12 @@ sub_8172BF0: @ 8172BF0 lsrs r7, r0, 24 movs r0, 0 mov r8, r0 - ldr r0, _08172C24 - ldr r3, _08172C28 + ldr r0, =0x020241e4 + ldr r3, =0x02038436 ldrb r2, [r3] adds r0, r2, r0 ldrb r6, [r0] - ldr r1, _08172C2C + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -759109,15 +733509,13 @@ sub_8172BF0: @ 8172BF0 beq _08172C36 b _08172D8A .align 2, 0 -_08172C24: .4byte 0x020241e4 -_08172C28: .4byte 0x02038436 -_08172C2C: .4byte 0x03005e00 + .pool _08172C30: cmp r0, 0x2 beq _08172CDA b _08172D8A _08172C36: - ldr r0, _08172C70 + ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r5, 0x1E] movs r2, 0xA0 @@ -759131,7 +733529,7 @@ _08172C36: lsls r0, 24 cmp r0, 0 beq _08172C78 - ldr r2, _08172C74 + ldr r2, =0x02020630 lsls r3, r6, 4 adds r1, r3, r6 lsls r1, 2 @@ -759145,10 +733543,9 @@ _08172C36: adds r4, r3, 0 b _08172C90 .align 2, 0 -_08172C70: .4byte 0x0203841e -_08172C74: .4byte 0x02020630 + .pool _08172C78: - ldr r3, _08172CC0 + ldr r3, =0x02020630 lsls r4, r6, 4 adds r2, r4, r6 lsls r2, 2 @@ -759161,7 +733558,7 @@ _08172C78: strh r0, [r2, 0x24] adds r2, r3, 0 _08172C90: - ldr r1, _08172CC4 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -759186,8 +733583,7 @@ _08172C90: strh r0, [r3, 0x1C] b _08172D8A .align 2, 0 -_08172CC0: .4byte 0x02020630 -_08172CC4: .4byte 0x03005e00 + .pool _08172CC8: ldrb r1, [r5, 0x1E] adds r0, r2, 0 @@ -759209,7 +733605,7 @@ _08172CDA: lsls r0, 24 cmp r0, 0 beq _08172D10 - ldr r0, _08172D0C + ldr r0, =0x02020630 lsls r3, r6, 4 adds r2, r3, r6 lsls r2, 2 @@ -759223,9 +733619,9 @@ _08172CDA: adds r4, r3, 0 b _08172D28 .align 2, 0 -_08172D0C: .4byte 0x02020630 + .pool _08172D10: - ldr r0, _08172D5C + ldr r0, =0x02020630 lsls r2, r6, 4 adds r1, r2, r6 lsls r1, 2 @@ -759238,21 +733634,21 @@ _08172D10: strh r0, [r1, 0x24] adds r4, r2, 0 _08172D28: - ldr r1, _08172D60 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x8] strh r1, [r0, 0x8] - ldr r0, _08172D64 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 beq _08172D68 - ldr r0, _08172D5C + ldr r0, =0x02020630 adds r1, r4, r6 lsls r1, 2 adds r1, r0 @@ -759264,11 +733660,9 @@ _08172D28: strh r0, [r1, 0x24] b _08172D84 .align 2, 0 -_08172D5C: .4byte 0x02020630 -_08172D60: .4byte 0x03005e00 -_08172D64: .4byte 0x02038436 + .pool _08172D68: - ldr r0, _08172D94 + ldr r0, =0x02020630 adds r1, r4, r6 lsls r1, 2 adds r1, r0 @@ -759293,7 +733687,7 @@ _08172D8A: pop {r0} bx r0 .align 2, 0 -_08172D94: .4byte 0x02020630 + .pool thumb_func_end sub_8172BF0 thumb_func_start sub_8172D98 @@ -759301,7 +733695,7 @@ sub_8172D98: @ 8172D98 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08172DBC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -759316,35 +733710,34 @@ sub_8172D98: @ 8172D98 beq _08172DC6 b _08172E84 .align 2, 0 -_08172DBC: .4byte 0x03005e00 + .pool _08172DC0: cmp r0, 0x2 beq _08172E4E b _08172E84 _08172DC6: - ldr r0, _08172DE0 + ldr r0, =0x02038436 ldrb r0, [r0] bl battle_get_per_side_status_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _08172DE8 - ldr r1, _08172DE4 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set b _08172DF0 .align 2, 0 -_08172DE0: .4byte 0x02038436 -_08172DE4: .4byte 0x00003f42 + .pool _08172DE8: - ldr r1, _08172E0C + ldr r1, =0x00003f44 movs r0, 0x50 bl lcd_io_set _08172DF0: movs r0, 0x52 movs r1, 0x10 bl lcd_io_set - ldr r0, _08172E10 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -759354,8 +733747,7 @@ _08172DF0: strh r0, [r1, 0x26] b _08172E84 .align 2, 0 -_08172E0C: .4byte 0x00003f44 -_08172E10: .4byte 0x03005e00 + .pool _08172E14: ldrh r0, [r4, 0xA] adds r1, r0, 0x1 @@ -759386,12 +733778,12 @@ _08172E14: strh r0, [r4, 0x26] b _08172E84 _08172E4E: - ldr r1, _08172E8C - ldr r4, _08172E90 + ldr r1, =0x020241e4 + ldr r4, =0x02038436 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] - ldr r2, _08172E94 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -759399,7 +733791,7 @@ _08172E4E: ldrh r1, [r0, 0x4] lsls r1, 22 lsrs r1, 17 - ldr r0, _08172E98 + ldr r0, =0x06010000 adds r1, r0 movs r2, 0x80 lsls r2, 4 @@ -759415,10 +733807,7 @@ _08172E84: pop {r0} bx r0 .align 2, 0 -_08172E8C: .4byte 0x020241e4 -_08172E90: .4byte 0x02038436 -_08172E94: .4byte 0x02020630 -_08172E98: .4byte 0x06010000 + .pool thumb_func_end sub_8172D98 thumb_func_start sub_8172E9C @@ -759426,10 +733815,10 @@ sub_8172E9C: @ 8172E9C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _08172EC4 - ldr r1, _08172EC8 + ldr r3, =0x0203841e + ldr r1, =0x020244d0 ldr r2, [r1] - ldr r1, _08172ECC + ldr r1, =0x02038436 ldrb r1, [r1] ldr r2, [r2] lsls r1, 2 @@ -759442,9 +733831,7 @@ sub_8172E9C: @ 8172E9C pop {r0} bx r0 .align 2, 0 -_08172EC4: .4byte 0x0203841e -_08172EC8: .4byte 0x020244d0 -_08172ECC: .4byte 0x02038436 + .pool thumb_func_end sub_8172E9C thumb_func_start sub_8172ED0 @@ -759452,16 +733839,15 @@ sub_8172ED0: @ 8172ED0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08172EE8 - ldr r1, _08172EEC + ldr r2, =0x02038437 + ldr r1, =0x0202420e ldrb r1, [r1] strb r1, [r2] bl move_anim_task_del pop {r0} bx r0 .align 2, 0 -_08172EE8: .4byte 0x02038437 -_08172EEC: .4byte 0x0202420e + .pool thumb_func_end sub_8172ED0 thumb_func_start sub_8172EF0 @@ -759474,7 +733860,7 @@ sub_8172EF0: @ 8172EF0 lsrs r6, r0, 24 movs r0, 0 mov r8, r0 - ldr r0, _08172FAC + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r6, 1 @@ -759499,7 +733885,7 @@ sub_8172EF0: @ 8172EF0 cmp r0, 0 beq _08172FC8 lsrs r0, r5, 16 - ldr r7, _08172FB0 + ldr r7, =0x0000ffff ands r5, r7 eors r0, r5 lsrs r1, r4, 16 @@ -759514,18 +733900,18 @@ _08172F4E: mov r0, r8 cmp r0, 0 beq _08172FC8 - ldr r0, _08172FB4 + ldr r0, =0x000027f9 bl gpu_tile_obj_tag_get_range_start lsls r0, 16 lsrs r0, 16 cmp r0, r7 bne _08172F6E - ldr r0, _08172FB8 + ldr r0, =0x0852528c bl gpu_tile_obj_decompress_and_load3 - ldr r0, _08172FBC + ldr r0, =0x08525b94 bl gpu_pal_obj_decompress_and_apply3 _08172F6E: - ldr r5, _08172FC0 + ldr r5, =sub_8172FEC + 1 adds r0, r5, 0 movs r1, 0xA bl AddTask @@ -759537,7 +733923,7 @@ _08172F6E: bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r3, _08172FC4 + ldr r3, =0x03005e00 lsls r2, r4, 2 adds r2, r4 lsls r2, 3 @@ -759554,15 +733940,9 @@ _08172F6E: strh r0, [r1, 0xA] b _08172FDE .align 2, 0 -_08172FAC: .4byte 0x020244d0 -_08172FB0: .4byte 0x0000ffff -_08172FB4: .4byte 0x000027f9 -_08172FB8: .4byte 0x0852528c -_08172FBC: .4byte 0x08525b94 -_08172FC0: .4byte sub_8172FEC + 1 -_08172FC4: .4byte 0x03005e00 + .pool _08172FC8: - ldr r0, _08172FE8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r6, 1 @@ -759580,7 +733960,7 @@ _08172FDE: pop {r0} bx r0 .align 2, 0 -_08172FE8: .4byte 0x020244d0 + .pool thumb_func_end sub_8172EF0 thumb_func_start sub_8172FEC @@ -759591,7 +733971,7 @@ sub_8172FEC: @ 8172FEC push {r6,r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _08173014 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -759605,9 +733985,9 @@ sub_8172FEC: @ 8172FEC strh r0, [r4, 0x22] b _08173190 .align 2, 0 -_08173014: .4byte 0x03005e00 + .pool _08173018: - ldr r0, _0817306C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrb r0, [r0, 0xA] @@ -759641,7 +734021,7 @@ _0817303A: ldrsh r0, [r4, r1] cmp r0, 0 bne _08173074 - ldr r0, _08173070 + ldr r0, =0x085ce388 adds r1, r5, 0 movs r3, 0x5 bl obj_add_from_template_forward_search @@ -759649,20 +734029,19 @@ _0817303A: lsrs r5, r0, 24 b _081730D6 .align 2, 0 -_0817306C: .4byte 0x020244d0 -_08173070: .4byte 0x085ce388 + .pool _08173074: cmp r0, 0 blt _081730A8 cmp r0, 0x3 bgt _081730A8 - ldr r0, _081730A0 + ldr r0, =0x085ce3a0 adds r1, r5, 0 movs r3, 0x5 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081730A4 + ldr r0, =0x02020630 lsls r2, r5, 4 adds r2, r5 lsls r2, 2 @@ -759673,16 +734052,15 @@ _08173074: adds r1, 0x4 b _081730C8 .align 2, 0 -_081730A0: .4byte 0x085ce3a0 -_081730A4: .4byte 0x02020630 + .pool _081730A8: - ldr r0, _08173100 + ldr r0, =0x085ce3a0 adds r1, r5, 0 movs r3, 0x5 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08173104 + ldr r0, =0x02020630 lsls r2, r5, 4 adds r2, r5 lsls r2, 2 @@ -759692,15 +734070,15 @@ _081730A8: lsrs r1, 22 adds r1, 0x5 _081730C8: - ldr r4, _08173108 + ldr r4, =0x000003ff adds r0, r4, 0 ands r1, r0 - ldr r0, _0817310C + ldr r0, =0xfffffc00 ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] _081730D6: - ldr r2, _08173110 + ldr r2, =0x03005e00 lsls r1, r7, 2 adds r0, r1, r7 lsls r0, 3 @@ -759710,35 +734088,30 @@ _081730D6: mov r9, r1 cmp r0, 0 bne _08173118 - ldr r1, _08173104 + ldr r1, =0x02020630 lsls r2, r5, 4 adds r0, r2, r5 lsls r0, 2 adds r1, 0x1C adds r0, r1 - ldr r1, _08173114 + ldr r1, =sub_81731FC + 1 str r1, [r0] adds r4, r2, 0 b _08173160 .align 2, 0 -_08173100: .4byte 0x085ce3a0 -_08173104: .4byte 0x02020630 -_08173108: .4byte 0x000003ff -_0817310C: .4byte 0xfffffc00 -_08173110: .4byte 0x03005e00 -_08173114: .4byte sub_81731FC + 1 + .pool _08173118: - ldr r3, _0817319C + ldr r3, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 adds r0, r3, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, _081731A0 + ldr r2, =sub_8173250 + 1 str r2, [r0] adds r1, r3 - ldr r0, _081731A4 + ldr r0, =0x0000ffe0 strh r0, [r1, 0x24] movs r0, 0x20 strh r0, [r1, 0x26] @@ -759764,12 +734137,12 @@ _08173156: movs r0, 0x66 bl audio_play_and_stuff _08173160: - ldr r1, _0817319C + ldr r1, =0x02020630 adds r0, r4, r5 lsls r0, 2 adds r0, r1 strh r7, [r0, 0x2E] - ldr r1, _081731A8 + ldr r1, =0x03005e00 mov r2, r9 adds r0, r2, r7 lsls r0, 3 @@ -759787,7 +734160,7 @@ _08173184: ldrsh r0, [r1, r4] cmp r0, 0x5 bne _08173190 - ldr r0, _081731AC + ldr r0, =sub_81731B0 + 1 str r0, [r1] _08173190: pop {r3,r4} @@ -759797,11 +734170,7 @@ _08173190: pop {r0} bx r0 .align 2, 0 -_0817319C: .4byte 0x02020630 -_081731A0: .4byte sub_8173250 + 1 -_081731A4: .4byte 0x0000ffe0 -_081731A8: .4byte 0x03005e00 -_081731AC: .4byte sub_81731B0 + 1 + .pool thumb_func_end sub_8172FEC thumb_func_start sub_81731B0 @@ -759810,7 +734179,7 @@ sub_81731B0: @ 81731B0 lsls r0, 24 lsrs r0, 24 adds r3, r0, 0 - ldr r1, _081731F4 + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -759824,7 +734193,7 @@ sub_81731B0: @ 81731B0 cmp r0, 0x1 bne _081731EA ldrb r1, [r1, 0x8] - ldr r0, _081731F8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -759842,8 +734211,7 @@ _081731F0: pop {r0} bx r0 .align 2, 0 -_081731F4: .4byte 0x03005e00 -_081731F8: .4byte 0x020244d0 + .pool thumb_func_end sub_81731B0 thumb_func_start sub_81731FC @@ -759867,7 +734235,7 @@ sub_81731FC: @ 81731FC asrs r0, 16 cmp r0, 0xFF ble _08173246 - ldr r2, _0817324C + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -759886,7 +734254,7 @@ _08173246: pop {r0} bx r0 .align 2, 0 -_0817324C: .4byte 0x03005e00 + .pool thumb_func_end sub_81731FC thumb_func_start sub_8173250 @@ -759919,7 +734287,7 @@ _08173264: asrs r1, 16 cmp r1, 0x20 ble _081732A6 - ldr r2, _081732AC + ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 2 @@ -759938,7 +734306,7 @@ _081732A6: pop {r0} bx r0 .align 2, 0 -_081732AC: .4byte 0x03005e00 + .pool thumb_func_end sub_8173250 thumb_func_start sub_81732B0 @@ -759947,11 +734315,11 @@ sub_81732B0: @ 81732B0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081732D8 + ldr r0, =0x085253ac bl gpu_tile_obj_decompress_and_load3 - ldr r0, _081732DC + ldr r0, =0x08525cb4 bl gpu_pal_obj_decompress_and_apply3 - ldr r0, _081732E0 + ldr r0, =0x0000281d bl gpu_pal_tags_index_of adds r0, r4, 0 bl move_anim_task_del @@ -759959,9 +734327,7 @@ sub_81732B0: @ 81732B0 pop {r0} bx r0 .align 2, 0 -_081732D8: .4byte 0x085253ac -_081732DC: .4byte 0x08525cb4 -_081732E0: .4byte 0x0000281d + .pool thumb_func_end sub_81732B0 thumb_func_start sub_81732E4 @@ -759970,7 +734336,7 @@ sub_81732E4: @ 81732E4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _08173308 + ldr r5, =0x0000281d adds r0, r5, 0 bl gpu_tile_obj_free_by_tag adds r0, r5, 0 @@ -759981,7 +734347,7 @@ sub_81732E4: @ 81732E4 pop {r0} bx r0 .align 2, 0 -_08173308: .4byte 0x0000281d + .pool thumb_func_end sub_81732E4 thumb_func_start sub_817330C @@ -759999,7 +734365,7 @@ sub_817330C: @ 817330C movs r1, 0 bl sub_80A5C6C lsls r0, 24 - ldr r5, _08173380 + ldr r5, =0x0203841e lsrs r0, 24 ldrh r1, [r5, 0x4] adds r0, r1 @@ -760015,13 +734381,13 @@ sub_817330C: @ 817330C ldrh r5, [r5, 0x6] adds r0, r5 strh r0, [r4, 0x36] - ldr r0, _08173384 + ldr r0, =0x0000ffe0 strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_80A68D4 - ldr r2, _08173388 - ldr r1, _0817338C - ldr r0, _08173390 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -760030,30 +734396,24 @@ sub_817330C: @ 817330C lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _08173394 + ldr r1, =sub_8039E84 + 1 str r1, [r0] - ldr r0, _08173398 + ldr r0, =sub_817339C + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08173380: .4byte 0x0203841e -_08173384: .4byte 0x0000ffe0 -_08173388: .4byte 0x02020630 -_0817338C: .4byte 0x020241e4 -_08173390: .4byte 0x02038436 -_08173394: .4byte sub_8039E84 + 1 -_08173398: .4byte sub_817339C + 1 + .pool thumb_func_end sub_817330C thumb_func_start sub_817339C sub_817339C: @ 817339C push {lr} adds r3, r0, 0 - ldr r2, _081733C4 - ldr r1, _081733C8 - ldr r0, _081733CC + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02038436 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -760065,16 +734425,13 @@ sub_817339C: @ 817339C ldrb r0, [r0] cmp r0, 0x1 bne _081733C0 - ldr r0, _081733D0 + ldr r0, =sub_81733D4 + 1 str r0, [r3, 0x1C] _081733C0: pop {r0} bx r0 .align 2, 0 -_081733C4: .4byte 0x02020630 -_081733C8: .4byte 0x020241e4 -_081733CC: .4byte 0x02038436 -_081733D0: .4byte sub_81733D4 + 1 + .pool thumb_func_end sub_817339C thumb_func_start sub_81733D4 @@ -760093,23 +734450,23 @@ sub_81733D4: @ 81733D4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _081733FC + ldr r0, =sub_8173400 + 1 str r0, [r4, 0x1C] _081733F6: pop {r4} pop {r0} bx r0 .align 2, 0 -_081733FC: .4byte sub_8173400 + 1 + .pool thumb_func_end sub_81733D4 thumb_func_start sub_8173400 sub_8173400: @ 8173400 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _08173450 - ldr r3, _08173454 - ldr r2, _08173458 + ldr r5, =0x02020630 + ldr r3, =0x020241e4 + ldr r2, =0x02038436 ldrb r0, [r2] adds r0, r3 ldrb r1, [r0] @@ -760144,9 +734501,7 @@ _08173448: pop {r0} bx r0 .align 2, 0 -_08173450: .4byte 0x02020630 -_08173454: .4byte 0x020241e4 -_08173458: .4byte 0x02038436 + .pool thumb_func_end sub_8173400 thumb_func_start sub_817345C @@ -760154,7 +734509,7 @@ sub_817345C: @ 817345C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08173474 + ldr r0, =0x0203841e movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -760163,25 +734518,25 @@ sub_817345C: @ 817345C beq _0817348C b _081734A0 .align 2, 0 -_08173474: .4byte 0x0203841e + .pool _08173478: movs r0, 0 bl battle_get_side_with_given_state - ldr r1, _08173488 + ldr r1, =0x02038436 strb r0, [r1] movs r0, 0x1 b _08173498 .align 2, 0 -_08173488: .4byte 0x02038436 + .pool _0817348C: movs r0, 0x1 bl battle_get_side_with_given_state - ldr r1, _081734AC + ldr r1, =0x02038436 strb r0, [r1] movs r0, 0 _08173498: bl battle_get_side_with_given_state - ldr r1, _081734B0 + ldr r1, =0x02038437 strb r0, [r1] _081734A0: adds r0, r4, 0 @@ -760190,8 +734545,7 @@ _081734A0: pop {r0} bx r0 .align 2, 0 -_081734AC: .4byte 0x02038436 -_081734B0: .4byte 0x02038437 + .pool thumb_func_end sub_817345C thumb_func_start sub_81734B4 @@ -760199,46 +734553,45 @@ sub_81734B4: @ 81734B4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081734CC + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x8] ldrh r1, [r0] cmp r1, 0x53 bne _081734D4 - ldr r1, _081734D0 + ldr r1, =0x0203841e movs r0, 0x1 b _0817350C .align 2, 0 -_081734CC: .4byte 0x020244d0 -_081734D0: .4byte 0x0203841e + .pool _081734D4: cmp r1, 0xFA bne _081734E4 - ldr r1, _081734E0 + ldr r1, =0x0203841e movs r0, 0x2 b _0817350C .align 2, 0 -_081734E0: .4byte 0x0203841e + .pool _081734E4: cmp r1, 0x80 bne _081734F4 - ldr r1, _081734F0 + ldr r1, =0x0203841e movs r0, 0x3 b _0817350C .align 2, 0 -_081734F0: .4byte 0x0203841e + .pool _081734F4: movs r0, 0xA4 lsls r0, 1 cmp r1, r0 bne _08173508 - ldr r1, _08173504 + ldr r1, =0x0203841e movs r0, 0x4 b _0817350C .align 2, 0 -_08173504: .4byte 0x0203841e + .pool _08173508: - ldr r1, _08173518 + ldr r1, =0x0203841e movs r0, 0 _0817350C: strh r0, [r1] @@ -760247,7 +734600,7 @@ _0817350C: pop {r0} bx r0 .align 2, 0 -_08173518: .4byte 0x0203841e + .pool thumb_func_end sub_81734B4 thumb_func_start sub_817351C @@ -760255,13 +734608,13 @@ sub_817351C: @ 817351C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _08173540 - ldr r1, _08173544 + ldr r3, =0x02038436 + ldr r1, =0x020244d0 ldr r2, [r1] ldr r1, [r2, 0x8] ldrh r1, [r1] strb r1, [r3] - ldr r3, _08173548 + ldr r3, =0x02038437 ldr r1, [r2, 0x8] ldrh r1, [r1] lsrs r1, 8 @@ -760270,9 +734623,7 @@ sub_817351C: @ 817351C pop {r0} bx r0 .align 2, 0 -_08173540: .4byte 0x02038436 -_08173544: .4byte 0x020244d0 -_08173548: .4byte 0x02038437 + .pool thumb_func_end sub_817351C thumb_func_start sub_817354C @@ -760301,7 +734652,7 @@ sub_8173560: @ 8173560 sub_817357C: @ 817357C push {r4,lr} sub sp, 0x4 - ldr r0, _0817359C + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -760311,13 +734662,12 @@ sub_817357C: @ 817357C b _08173688 _08173590: lsls r0, 2 - ldr r1, _081735A0 + ldr r1, =_081735A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0817359C: .4byte 0x030022c0 -_081735A0: .4byte _081735A4 + .pool .align 2, 0 _081735A4: .4byte _081735B8 @@ -760329,11 +734679,11 @@ _081735B8: movs r0, 0 bl SetVBlankCallback bl sub_8174EC4 - ldr r4, _081735DC - ldr r0, _081735E0 + ldr r4, =0x0203bcdc + ldr r0, =0x00002014 bl malloc_and_clear str r0, [r4] - ldr r0, _081735E4 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -760341,14 +734691,12 @@ _081735B8: strb r1, [r0] b _08173688 .align 2, 0 -_081735DC: .4byte 0x0203bcdc -_081735E0: .4byte 0x00002014 -_081735E4: .4byte 0x030022c0 + .pool _081735E8: bl sub_8174F70 b _08173642 _081735EE: - ldr r1, _08173618 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0xE2 @@ -760359,21 +734707,20 @@ _081735EE: movs r1, 0 bl lcd_io_set bl sub_8174FAC - ldr r0, _0817361C + ldr r0, =0x0203bcdc ldr r1, [r0] movs r0, 0 strh r0, [r1] b _08173642 .align 2, 0 -_08173618: .4byte 0x00003f42 -_0817361C: .4byte 0x0203bcdc + .pool _08173620: bl sub_8175024 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 bne _08173688 - ldr r0, _08173654 + ldr r0, =sub_817354C + 1 bl SetVBlankCallback movs r0, 0x1 negs r0, r0 @@ -760383,7 +734730,7 @@ _08173620: movs r3, 0 bl sub_80A1AD4 _08173642: - ldr r1, _08173658 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -760392,17 +734739,16 @@ _08173642: strb r0, [r1] b _08173688 .align 2, 0 -_08173654: .4byte sub_817354C + 1 -_08173658: .4byte 0x030022c0 + .pool _0817365C: bl fade_and_return_progress_probably - ldr r0, _08173680 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08173688 - ldr r0, _08173684 + ldr r0, =sub_8173560 + 1 bl set_callback2 movs r0, 0xDA lsls r0, 1 @@ -760410,8 +734756,7 @@ _0817365C: movs r0, 0 b _0817368A .align 2, 0 -_08173680: .4byte 0x02037fd4 -_08173684: .4byte sub_8173560 + 1 + .pool _08173688: movs r0, 0x1 _0817368A: @@ -760429,18 +734774,18 @@ sub_8173694: @ 8173694 lsrs r4, r0, 24 cmp r4, 0 bne _081736C4 - ldr r0, _081736CC + ldr r0, =sub_817371C + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081736D0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 strh r4, [r1, 0x8] - ldr r4, _081736D4 + ldr r4, =0x0203bcd8 movs r0, 0x78 bl malloc_and_clear str r0, [r4] @@ -760449,9 +734794,7 @@ _081736C4: pop {r0} bx r0 .align 2, 0 -_081736CC: .4byte sub_817371C + 1 -_081736D0: .4byte 0x03005e00 -_081736D4: .4byte 0x0203bcd8 + .pool thumb_func_end sub_8173694 thumb_func_start sub_81736D8 @@ -760461,19 +734804,19 @@ sub_81736D8: @ 81736D8 lsls r0, 24 cmp r0, 0 bne _08173708 - ldr r0, _08173710 + ldr r0, =sub_817371C + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08173714 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 movs r0, 0x1 strh r0, [r1, 0x8] - ldr r4, _08173718 + ldr r4, =0x0203bcd8 movs r0, 0x78 bl malloc_and_clear str r0, [r4] @@ -760482,9 +734825,7 @@ _08173708: pop {r0} bx r0 .align 2, 0 -_08173710: .4byte sub_817371C + 1 -_08173714: .4byte 0x03005e00 -_08173718: .4byte 0x0203bcd8 + .pool thumb_func_end sub_81736D8 thumb_func_start sub_817371C @@ -760497,7 +734838,7 @@ sub_817371C: @ 817371C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _081737F8 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -760505,13 +734846,13 @@ sub_817371C: @ 817371C movs r1, 0 strh r1, [r0, 0xC] movs r7, 0 - ldr r0, _081737FC + ldr r0, =0x0203bcd8 mov r9, r0 _08173740: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _08173800 + ldr r0, =0x020244ec adds r6, r1, r0 adds r0, r6, 0 movs r1, 0xB @@ -760528,11 +734869,11 @@ _08173740: adds r4, r7 lsls r4, 2 adds r3, r4 - ldr r2, _08173804 + ldr r2, =0x000001ff adds r1, r2, 0 ands r0, r1 ldrh r1, [r3, 0x8] - ldr r5, _08173808 + ldr r5, =0xfffffe00 adds r2, r5, 0 ands r1, r2 orrs r1, r0 @@ -760570,7 +734911,7 @@ _08173740: movs r2, 0 mov r6, r8 lsls r5, r6, 2 - ldr r3, _081737FC + ldr r3, =0x0203bcd8 _081737CA: ldr r0, [r3] adds r1, r2, r4 @@ -760585,7 +734926,7 @@ _081737CA: lsrs r2, r0, 16 cmp r2, 0x9 bls _081737CA - ldr r0, _081737F8 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r5, r2 lsls r1, 3 @@ -760595,11 +734936,7 @@ _081737CA: strh r0, [r1, 0xC] b _08173840 .align 2, 0 -_081737F8: .4byte 0x03005e00 -_081737FC: .4byte 0x0203bcd8 -_08173800: .4byte 0x020244ec -_08173804: .4byte 0x000001ff -_08173808: .4byte 0xfffffe00 + .pool _0817380C: mov r6, r9 ldr r3, [r6] @@ -760608,7 +734945,7 @@ _0817380C: lsls r2, 2 adds r4, r3, r2 ldrh r0, [r4, 0x8] - ldr r6, _08173894 + ldr r6, =0xfffffe00 adds r1, r6, 0 ands r0, r1 strh r0, [r4, 0x8] @@ -760635,10 +734972,10 @@ _08173840: bhi _0817384C b _08173740 _0817384C: - ldr r0, _08173898 + ldr r0, =0x0203bcd4 movs r3, 0 str r3, [r0] - ldr r4, _0817389C + ldr r4, =0x03005e00 mov r6, r8 adds r1, r5, r6 lsls r1, 3 @@ -760669,15 +735006,12 @@ _0817386A: ldrsh r0, [r1, r2] cmp r0, 0 beq _081738A4 - ldr r0, _081738A0 + ldr r0, =sub_8173A8C + 1 b _081738A6 .align 2, 0 -_08173894: .4byte 0xfffffe00 -_08173898: .4byte 0x0203bcd4 -_0817389C: .4byte 0x03005e00 -_081738A0: .4byte sub_8173A8C + 1 + .pool _081738A4: - ldr r0, _081738B8 + ldr r0, =sub_81738BC + 1 _081738A6: str r0, [r1] add sp, 0xC @@ -760688,7 +735022,7 @@ _081738A6: pop {r0} bx r0 .align 2, 0 -_081738B8: .4byte sub_81738BC + 1 + .pool thumb_func_end sub_817371C thumb_func_start sub_81738BC @@ -760701,8 +735035,8 @@ sub_81738BC: @ 81738BC lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r7, _081738E4 - ldr r0, _081738E8 + ldr r7, =0x0201c000 + ldr r0, =0x0203bce4 ldrb r0, [r0] cmp r0, 0 bne _081738EC @@ -760713,8 +735047,7 @@ sub_81738BC: @ 81738BC bl memset b _08173906 .align 2, 0 -_081738E4: .4byte 0x0201c000 -_081738E8: .4byte 0x0203bce4 + .pool _081738EC: movs r0, 0x3 bl sub_81534D0 @@ -760730,7 +735063,7 @@ _081738EC: _08173906: movs r5, 0 ldrh r1, [r7, 0x8] - ldr r2, _081739AC + ldr r2, =0x000001ff adds r0, r2, 0 ands r0, r1 mov r1, r9 @@ -760754,7 +735087,7 @@ _08173930: cmp r5, 0x31 bls _08173956 _08173934: - ldr r4, _081739B0 + ldr r4, =0x0201c000 adds r6, r4, 0 adds r4, 0x78 movs r5, 0 @@ -760772,7 +735105,7 @@ _0817393E: cmp r5, 0x30 bls _0817393E _08173956: - ldr r0, _081739B4 + ldr r0, =0x0203bcd8 ldr r1, [r0] adds r0, r7, 0 movs r2, 0x78 @@ -760780,7 +735113,7 @@ _08173956: movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, _081739B8 + ldr r2, =0x082c8959 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -760796,12 +735129,12 @@ _08173956: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r1, _081739BC + ldr r1, =0x03005e00 mov r0, r8 add r0, r9 lsls r0, 3 adds r0, r1 - ldr r1, _081739C0 + ldr r1, =sub_81739C4 + 1 str r1, [r0] add sp, 0x10 pop {r3,r4} @@ -760811,12 +735144,7 @@ _08173956: pop {r0} bx r0 .align 2, 0 -_081739AC: .4byte 0x000001ff -_081739B0: .4byte 0x0201c000 -_081739B4: .4byte 0x0203bcd8 -_081739B8: .4byte 0x082c8959 -_081739BC: .4byte 0x03005e00 -_081739C0: .4byte sub_81739C4 + 1 + .pool thumb_func_end sub_81738BC thumb_func_start sub_81739C4 @@ -760824,8 +735152,8 @@ sub_81739C4: @ 81739C4 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08173A20 - ldr r0, _08173A24 + ldr r1, =0x03006214 + ldr r0, =sub_81736D8 + 1 str r0, [r1] movs r0, 0x3 bl save_game_when_memory_present @@ -760833,7 +735161,7 @@ sub_81739C4: @ 81739C4 lsrs r0, 24 cmp r0, 0xFF bne _08173A34 - ldr r0, _08173A28 + ldr r0, =0x030061fc ldr r0, [r0] cmp r0, 0 beq _08173A34 @@ -760842,7 +735170,7 @@ sub_81739C4: @ 81739C4 movs r0, 0x3 bl bg_unset_tilemap bl Window_FreeMemory - ldr r5, _08173A2C + ldr r5, =0x0203bcdc ldr r0, [r5] cmp r0, 0 beq _08173A06 @@ -760850,7 +735178,7 @@ sub_81739C4: @ 81739C4 movs r0, 0 str r0, [r5] _08173A06: - ldr r5, _08173A30 + ldr r5, =0x0203bcd8 ldr r0, [r5] cmp r0, 0 beq _08173A16 @@ -760862,20 +735190,16 @@ _08173A16: bl remove_task b _08173A4C .align 2, 0 -_08173A20: .4byte 0x03006214 -_08173A24: .4byte sub_81736D8 + 1 -_08173A28: .4byte 0x030061fc -_08173A2C: .4byte 0x0203bcdc -_08173A30: .4byte 0x0203bcd8 + .pool _08173A34: movs r0, 0x37 bl audio_play - ldr r1, _08173A54 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08173A58 + ldr r1, =sub_8173A5C + 1 str r1, [r0] movs r1, 0x20 strh r1, [r0, 0xE] @@ -760884,8 +735208,7 @@ _08173A4C: pop {r0} bx r0 .align 2, 0 -_08173A54: .4byte 0x03005e00 -_08173A58: .4byte sub_8173A5C + 1 + .pool thumb_func_end sub_81739C4 thumb_func_start sub_8173A5C @@ -760893,7 +735216,7 @@ sub_8173A5C: @ 8173A5C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08173A7C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -760907,32 +735230,31 @@ sub_8173A5C: @ 8173A5C strh r0, [r1, 0xE] b _08173A84 .align 2, 0 -_08173A7C: .4byte 0x03005e00 + .pool _08173A80: - ldr r0, _08173A88 + ldr r0, =sub_8173A8C + 1 str r0, [r1] _08173A84: pop {r0} bx r0 .align 2, 0 -_08173A88: .4byte sub_8173A8C + 1 + .pool thumb_func_end sub_8173A5C thumb_func_start sub_8173A8C sub_8173A8C: @ 8173A8C lsls r0, 24 lsrs r0, 24 - ldr r2, _08173AA0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _08173AA4 + ldr r0, =sub_8173AA8 + 1 str r0, [r1] bx lr .align 2, 0 -_08173AA0: .4byte 0x03005e00 -_08173AA4: .4byte sub_8173AA8 + 1 + .pool thumb_func_end sub_8173A8C thumb_func_start sub_8173AA8 @@ -760945,14 +735267,14 @@ sub_8173AA8: @ 8173AA8 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _08173AE0 + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 add r1, r8 lsls r1, 3 adds r1, r0 ldrh r6, [r1, 0xA] - ldr r2, _08173AE4 + ldr r2, =0x0203bcd8 lsls r0, r6, 2 adds r0, r6 lsls r0, 2 @@ -760962,14 +735284,12 @@ sub_8173AA8: @ 8173AA8 ldrsh r0, [r1, r2] cmp r0, 0x3 ble _08173AEC - ldr r1, _08173AE8 + ldr r1, =0x085e53b4 b _08173AEE .align 2, 0 -_08173AE0: .4byte 0x03005e00 -_08173AE4: .4byte 0x0203bcd8 -_08173AE8: .4byte 0x085e53b4 + .pool _08173AEC: - ldr r1, _08173BA4 + ldr r1, =0x085e53e4 _08173AEE: lsls r2, r6, 3 adds r0, r2, r1 @@ -760985,7 +735305,7 @@ _08173AEE: adds r2, r1 ldrh r5, [r2] ldrh r2, [r7, 0x8] - ldr r0, _08173BA8 + ldr r0, =0x000001ff ands r0, r2 movs r1, 0xCE lsls r1, 1 @@ -761010,13 +735330,13 @@ _08173B20: lsls r3, r6, 24 lsrs r3, 24 str r3, [sp, 0x8] - ldr r3, _08173BAC + ldr r3, =0x0000ffff str r3, [sp, 0xC] movs r3, 0x1 bl sub_818D3E4 lsls r0, 24 lsrs r0, 24 - ldr r4, _08173BB0 + ldr r4, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -761034,9 +735354,9 @@ _08173B20: strh r1, [r3, 0x3C] adds r4, 0x1C adds r2, r4 - ldr r1, _08173BB4 + ldr r1, =sub_8175120 + 1 str r1, [r2] - ldr r5, _08173BB8 + ldr r5, =0x03005e00 adds r1, r6, 0x5 lsls r1, 1 mov r2, r8 @@ -761052,7 +735372,7 @@ _08173B20: movs r1, 0x1 bl sub_8197434 adds r4, r5 - ldr r0, _08173BBC + ldr r0, =sub_8173BC0 + 1 str r0, [r4] add sp, 0x10 pop {r3,r4} @@ -761062,13 +735382,7 @@ _08173B20: pop {r0} bx r0 .align 2, 0 -_08173BA4: .4byte 0x085e53e4 -_08173BA8: .4byte 0x000001ff -_08173BAC: .4byte 0x0000ffff -_08173BB0: .4byte 0x02020630 -_08173BB4: .4byte sub_8175120 + 1 -_08173BB8: .4byte 0x03005e00 -_08173BBC: .4byte sub_8173BC0 + 1 + .pool thumb_func_end sub_8173AA8 thumb_func_start sub_8173BC0 @@ -761076,13 +735390,13 @@ sub_8173BC0: @ 8173BC0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _08173C20 + ldr r4, =0x03005e00 lsls r3, r0, 2 adds r3, r0 lsls r3, 3 adds r5, r3, r4 ldrh r0, [r5, 0xA] - ldr r2, _08173C24 + ldr r2, =0x0203bcd8 lsls r1, r0, 2 adds r1, r0 lsls r1, 2 @@ -761098,10 +735412,10 @@ sub_8173BC0: @ 8173BC0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08173C28 + ldr r1, =0x02020630 adds r3, r0, r1 ldr r1, [r3, 0x1C] - ldr r0, _08173C2C + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08173C1A ldrb r1, [r3, 0x1] @@ -761115,18 +735429,14 @@ sub_8173BC0: @ 8173BC0 bl sub_8174A88 movs r0, 0x78 strh r0, [r5, 0xE] - ldr r0, _08173C30 + ldr r0, =sub_8173C34 + 1 str r0, [r5] _08173C1A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08173C20: .4byte 0x03005e00 -_08173C24: .4byte 0x0203bcd8 -_08173C28: .4byte 0x02020630 -_08173C2C: .4byte nullsub_12 + 1 -_08173C30: .4byte sub_8173C34 + 1 + .pool thumb_func_end sub_8173BC0 thumb_func_start sub_8173C34 @@ -761138,13 +735448,13 @@ sub_8173C34: @ 8173C34 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _08173C70 + ldr r2, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 adds r4, r6, r2 ldrh r3, [r4, 0xA] - ldr r1, _08173C74 + ldr r1, =0x0203bcd8 lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -761161,11 +735471,10 @@ sub_8173C34: @ 8173C34 strh r0, [r4, 0xE] b _08173D10 .align 2, 0 -_08173C70: .4byte 0x03005e00 -_08173C74: .4byte 0x0203bcd8 + .pool _08173C78: - ldr r2, _08173CF0 - ldr r0, _08173CF4 + ldr r2, =0x0203bcd4 + ldr r0, =0x02020630 mov r8, r0 adds r0, r3, 0x5 lsls r0, 1 @@ -761194,13 +735503,13 @@ _08173C78: bgt _08173D04 mov r7, r9 ldrh r1, [r7, 0x1C] - ldr r0, _08173CF8 + ldr r0, =0x000001ff ands r0, r1 cmp r0, 0 beq _08173D04 adds r0, r2, 0x1 strh r0, [r4, 0xA] - ldr r0, _08173CFC + ldr r0, =0x000063b0 str r0, [sp] adds r0, r3, 0 movs r1, 0 @@ -761220,21 +735529,17 @@ _08173C78: movs r2, 0x4 orrs r1, r2 strb r1, [r0, 0x5] - ldr r0, _08173D00 + ldr r0, =sub_8173AA8 + 1 str r0, [r4] b _08173D10 .align 2, 0 -_08173CF0: .4byte 0x0203bcd4 -_08173CF4: .4byte 0x02020630 -_08173CF8: .4byte 0x000001ff -_08173CFC: .4byte 0x000063b0 -_08173D00: .4byte sub_8173AA8 + 1 + .pool _08173D04: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 add r0, r12 - ldr r1, _08173D20 + ldr r1, =sub_8173D24 + 1 str r1, [r0] _08173D10: add sp, 0x4 @@ -761245,7 +735550,7 @@ _08173D10: pop {r0} bx r0 .align 2, 0 -_08173D20: .4byte sub_8173D24 + 1 + .pool thumb_func_end sub_8173C34 thumb_func_start sub_8173D24 @@ -761256,7 +735561,7 @@ sub_8173D24: @ 8173D24 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08173DAC + ldr r0, =0xffff0000 movs r1, 0 str r1, [sp] movs r2, 0 @@ -761266,10 +735571,10 @@ sub_8173D24: @ 8173D24 lsls r1, r4, 2 adds r0, r1, r4 lsls r5, r0, 3 - ldr r0, _08173DB0 + ldr r0, =0x03005e08 mov r12, r0 mov r8, r1 - ldr r6, _08173DB4 + ldr r6, =0x02020630 movs r7, 0xD negs r7, r7 _08173D52: @@ -761301,7 +735606,7 @@ _08173D74: bl sub_8174A38 movs r0, 0x69 bl audio_play - ldr r1, _08173DB8 + ldr r1, =0x03005e00 mov r2, r8 adds r0, r2, r4 lsls r0, 3 @@ -761309,7 +735614,7 @@ _08173D74: movs r1, 0xC8 lsls r1, 1 strh r1, [r0, 0xE] - ldr r1, _08173DBC + ldr r1, =sub_8173DC0 + 1 str r1, [r0] add sp, 0x4 pop {r3} @@ -761318,11 +735623,7 @@ _08173D74: pop {r0} bx r0 .align 2, 0 -_08173DAC: .4byte 0xffff0000 -_08173DB0: .4byte 0x03005e08 -_08173DB4: .4byte 0x02020630 -_08173DB8: .4byte 0x03005e00 -_08173DBC: .4byte sub_8173DC0 + 1 + .pool thumb_func_end sub_8173D24 thumb_func_start sub_8173DC0 @@ -761335,7 +735636,7 @@ sub_8173DC0: @ 8173DC0 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _08173E00 + ldr r7, =0x03005e00 lsls r4, r6, 2 adds r0, r4, r6 lsls r5, r0, 3 @@ -761358,16 +735659,16 @@ sub_8173DC0: @ 8173DC0 bl sub_81751FC b _08173E7E .align 2, 0 -_08173E00: .4byte 0x03005e00 + .pool _08173E04: movs r3, 0 mov r9, r4 - ldr r0, _08173E90 + ldr r0, =0x0203bcd4 mov r10, r0 adds r4, r5, 0 adds r7, 0x8 mov r8, r7 - ldr r7, _08173E94 + ldr r7, =0x02020630 movs r1, 0xD negs r1, r1 mov r12, r1 @@ -761399,7 +735700,7 @@ _08173E40: bls _08173E1C mov r3, r10 ldr r0, [r3] - ldr r1, _08173E98 + ldr r1, =0x000063b0 str r1, [sp] movs r1, 0 movs r2, 0xC @@ -761411,14 +735712,14 @@ _08173E40: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r1, _08173E9C + ldr r1, =0x03005e00 mov r2, r9 adds r0, r2, r6 lsls r0, 3 adds r0, r1 movs r1, 0x7 strh r1, [r0, 0xE] - ldr r1, _08173EA0 + ldr r1, =sub_8173EA4 + 1 str r1, [r0] _08173E7E: add sp, 0x4 @@ -761430,11 +735731,7 @@ _08173E7E: pop {r0} bx r0 .align 2, 0 -_08173E90: .4byte 0x0203bcd4 -_08173E94: .4byte 0x02020630 -_08173E98: .4byte 0x000063b0 -_08173E9C: .4byte 0x03005e00 -_08173EA0: .4byte sub_8173EA4 + 1 + .pool thumb_func_end sub_8173DC0 thumb_func_start sub_8173EA4 @@ -761442,7 +735739,7 @@ sub_8173EA4: @ 8173EA4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08173EC4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -761452,12 +735749,11 @@ sub_8173EA4: @ 8173EA4 ldrsh r0, [r1, r3] cmp r0, 0xF ble _08173ECC - ldr r0, _08173EC8 + ldr r0, =sub_8173EE4 + 1 str r0, [r1] b _08173EDE .align 2, 0 -_08173EC4: .4byte 0x03005e00 -_08173EC8: .4byte sub_8173EE4 + 1 + .pool _08173ECC: adds r0, r2, 0x1 strh r0, [r1, 0xE] @@ -761489,7 +735785,7 @@ sub_8173EE4: @ 8173EE4 bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show - ldr r6, _08173F6C + ldr r6, =0x03005d90 ldr r0, [r6] ldrb r0, [r0, 0x8] movs r1, 0x1 @@ -761498,24 +735794,24 @@ sub_8173EE4: @ 8173EE4 lsrs r0, 16 movs r1, 0x6 str r1, [sp] - ldr r1, _08173F70 + ldr r1, =0x0000ffff str r1, [sp, 0x4] movs r1, 0x1 movs r2, 0x78 movs r3, 0x48 bl sub_818D8AC - ldr r1, _08173F74 + ldr r1, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 adds r4, r1 strh r0, [r4, 0x10] - ldr r0, _08173F78 + ldr r0, =0x085e5380 bl Window_AddFromTemplate ldr r0, [r6] ldrb r1, [r0, 0x14] lsrs r1, 3 - ldr r2, _08173F7C + ldr r2, =0x0000021d movs r0, 0x1 movs r3, 0xD0 bl sub_80987D4 @@ -761526,19 +735822,14 @@ sub_8173EE4: @ 8173EE4 bl gpu_pal_apply movs r0, 0x78 strh r0, [r4, 0xE] - ldr r0, _08173F80 + ldr r0, =sub_8173F84 + 1 str r0, [r4] add sp, 0x8 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08173F6C: .4byte 0x03005d90 -_08173F70: .4byte 0x0000ffff -_08173F74: .4byte 0x03005e00 -_08173F78: .4byte 0x085e5380 -_08173F7C: .4byte 0x0000021d -_08173F80: .4byte sub_8173F84 + 1 + .pool thumb_func_end sub_8173EE4 thumb_func_start sub_8173F84 @@ -761547,7 +735838,7 @@ sub_8173F84: @ 8173F84 sub sp, 0x10 lsls r0, 24 lsrs r0, 24 - ldr r2, _08173FA8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -761561,9 +735852,9 @@ sub_8173F84: @ 8173F84 strh r0, [r4, 0xE] b _08174018 .align 2, 0 -_08173FA8: .4byte 0x03005e00 + .pool _08173FAC: - ldr r2, _08173FCC + ldr r2, =0x02020630 movs r3, 0x10 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -761579,7 +735870,7 @@ _08173FAC: strh r0, [r1, 0x20] b _08174018 .align 2, 0 -_08173FCC: .4byte 0x02020630 + .pool _08173FD0: movs r0, 0x20 str r0, [sp] @@ -761595,7 +735886,7 @@ _08173FD0: movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, _08174020 + ldr r2, =0x085e8c14 str r5, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -761610,7 +735901,7 @@ _08173FD0: movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _08174024 + ldr r0, =sub_8174028 + 1 str r0, [r4] _08174018: add sp, 0x10 @@ -761618,8 +735909,7 @@ _08174018: pop {r0} bx r0 .align 2, 0 -_08174020: .4byte 0x085e8c14 -_08174024: .4byte sub_8174028 + 1 + .pool thumb_func_end sub_8173F84 thumb_func_start sub_8174028 @@ -761627,7 +735917,7 @@ sub_8174028: @ 8174028 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08174054 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -761635,21 +735925,19 @@ sub_8174028: @ 8174028 beq _0817404E movs r0, 0x4 bl play_sound_effect - ldr r0, _08174058 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0817405C + ldr r0, =sub_8174060 + 1 str r0, [r1] _0817404E: pop {r4} pop {r0} bx r0 .align 2, 0 -_08174054: .4byte 0x030022c0 -_08174058: .4byte 0x03005e00 -_0817405C: .4byte sub_8174060 + 1 + .pool thumb_func_end sub_8174028 thumb_func_start sub_8174060 @@ -761659,8 +735947,8 @@ sub_8174060: @ 8174060 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081740A0 - ldr r1, _081740A4 + ldr r0, =0x02037b14 + ldr r1, =0x02037714 movs r2, 0x80 lsls r2, 2 bl CpuSet @@ -761672,22 +735960,19 @@ sub_8174060: @ 8174060 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _081740A8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081740AC + ldr r1, =sub_81740B0 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_081740A0: .4byte 0x02037b14 -_081740A4: .4byte 0x02037714 -_081740A8: .4byte 0x03005e00 -_081740AC: .4byte sub_81740B0 + 1 + .pool thumb_func_end sub_8174060 thumb_func_start sub_81740B0 @@ -761698,7 +735983,7 @@ sub_81740B0: @ 81740B0 push {r6,r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08174170 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -761706,12 +735991,12 @@ sub_81740B0: @ 81740B0 bne _08174164 lsls r0, r7, 2 mov r8, r0 - ldr r1, _08174174 + ldr r1, =0x03005e00 adds r0, r7 lsls r0, 3 adds r1, 0x12 adds r5, r0, r1 - ldr r2, _08174178 + ldr r2, =0x02020630 mov r9, r2 movs r6, 0x5 _081740DC: @@ -761733,7 +736018,7 @@ _081740FA: subs r6, 0x1 cmp r6, 0 bge _081740DC - ldr r0, _08174174 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -761755,7 +736040,7 @@ _081740FA: bl gpu_reset_bgs_and_dma3_busy_flags adds r0, r7, 0 bl remove_task - ldr r4, _0817417C + ldr r4, =0x0203bcdc ldr r0, [r4] cmp r0, 0 beq _08174150 @@ -761763,7 +736048,7 @@ _081740FA: movs r0, 0 str r0, [r4] _08174150: - ldr r4, _08174180 + ldr r4, =0x0203bcd8 ldr r0, [r4] cmp r0, 0 beq _08174160 @@ -761780,28 +736065,24 @@ _08174164: pop {r0} bx r0 .align 2, 0 -_08174170: .4byte 0x02037fd4 -_08174174: .4byte 0x03005e00 -_08174178: .4byte 0x02020630 -_0817417C: .4byte 0x0203bcdc -_08174180: .4byte 0x0203bcd8 + .pool thumb_func_end sub_81740B0 thumb_func_start sub_8174184 sub_8174184: @ 8174184 push {lr} - ldr r0, _08174190 + ldr r0, =sub_8175620 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_08174190: .4byte sub_8175620 + 1 + .pool thumb_func_end sub_8174184 thumb_func_start sub_8174194 sub_8174194: @ 8174194 push {r4,lr} - ldr r0, _081741B0 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -761809,13 +736090,12 @@ sub_8174194: @ 8174194 cmp r0, 0x5 bhi _081741D0 lsls r0, 2 - ldr r1, _081741B4 + ldr r1, =_081741B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081741B0: .4byte 0x030022c0 -_081741B4: .4byte _081741B8 + .pool .align 2, 0 _081741B8: .4byte _081741D0 @@ -761828,11 +736108,11 @@ _081741D0: movs r0, 0 bl SetVBlankCallback bl sub_8174EC4 - ldr r4, _081741F4 - ldr r0, _081741F8 + ldr r4, =0x0203bcdc + ldr r0, =0x00002014 bl malloc_and_clear str r0, [r4] - ldr r0, _081741FC + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 @@ -761840,18 +736120,16 @@ _081741D0: strb r1, [r0] b _08174308 .align 2, 0 -_081741F4: .4byte 0x0203bcdc -_081741F8: .4byte 0x00002014 -_081741FC: .4byte 0x030022c0 + .pool _08174200: bl sub_8174F70 - ldr r1, _08174210 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _081742A2 .align 2, 0 -_08174210: .4byte 0x030022c0 + .pool _08174214: movs r0, 0x50 movs r1, 0 @@ -761863,20 +736141,20 @@ _08174214: movs r1, 0 bl lcd_io_set bl sub_8174FAC - ldr r1, _0817423C + ldr r1, =0x030022c0 movs r4, 0x87 lsls r4, 3 adds r1, r4 b _081742A2 .align 2, 0 -_0817423C: .4byte 0x030022c0 + .pool _08174240: bl sub_8175024 lsls r0, 24 cmp r0, 0 bne _08174308 - ldr r1, _08174270 - ldr r0, _08174274 + ldr r1, =0x0201c000 + ldr r0, =0x085e56d4 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2,r3} @@ -761885,18 +736163,15 @@ _08174240: movs r1, 0 movs r2, 0 bl sub_80F9BCC - ldr r0, _08174278 + ldr r0, =sub_817354C + 1 bl SetVBlankCallback - ldr r1, _0817427C + ldr r1, =0x030022c0 movs r4, 0x87 lsls r4, 3 adds r1, r4 b _081742A2 .align 2, 0 -_08174270: .4byte 0x0201c000 -_08174274: .4byte 0x085e56d4 -_08174278: .4byte sub_817354C + 1 -_0817427C: .4byte 0x030022c0 + .pool _08174280: bl run_active_tasks bl call_obj_callbacks @@ -761906,7 +736181,7 @@ _08174280: lsls r0, 24 cmp r0, 0 bne _08174308 - ldr r1, _081742AC + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -761916,9 +736191,9 @@ _081742A2: strb r0, [r1] b _08174308 .align 2, 0 -_081742AC: .4byte 0x030022c0 + .pool _081742B0: - ldr r1, _08174310 + ldr r1, =0x00003f42 movs r0, 0x50 bl lcd_io_set movs r1, 0xE2 @@ -761928,7 +736203,7 @@ _081742B0: movs r0, 0x54 movs r1, 0 bl lcd_io_set - ldr r0, _08174314 + ldr r0, =sub_8174324 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -761937,7 +736212,7 @@ _081742B0: lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r4, _08174318 + ldr r4, =0x03005e08 movs r3, 0xFF _081742E2: adds r0, r2, 0x5 @@ -761950,23 +736225,19 @@ _081742E2: lsrs r2, r0, 24 cmp r2, 0x5 bls _081742E2 - ldr r4, _0817431C + ldr r4, =0x0203bcd8 movs r0, 0x80 lsls r0, 6 bl malloc_and_clear str r0, [r4] - ldr r0, _08174320 + ldr r0, =sub_8173560 + 1 bl set_callback2 _08174308: pop {r4} pop {r0} bx r0 .align 2, 0 -_08174310: .4byte 0x00003f42 -_08174314: .4byte sub_8174324 + 1 -_08174318: .4byte 0x03005e08 -_0817431C: .4byte 0x0203bcd8 -_08174320: .4byte sub_8173560 + 1 + .pool thumb_func_end sub_8174194 thumb_func_start sub_8174324 @@ -761975,7 +736246,7 @@ sub_8174324: @ 8174324 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _08174358 + ldr r0, =0x00000226 str r0, [sp] movs r0, 0 movs r1, 0x1E @@ -761988,20 +736259,18 @@ sub_8174324: @ 8174324 lsrs r0, 24 cmp r0, 0x1 beq _08174364 - ldr r0, _0817435C + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _08174360 + ldr r0, =sub_81749A0 + 1 b _081743DA .align 2, 0 -_08174358: .4byte 0x00000226 -_0817435C: .4byte 0x03005e00 -_08174360: .4byte sub_81749A0 + 1 + .pool _08174364: - ldr r0, _081743AC - ldr r4, _081743B0 + ldr r0, =0x0201c000 + ldr r4, =0x0203bcd8 ldr r1, [r4] movs r2, 0x80 lsls r2, 5 @@ -762009,7 +736278,7 @@ _08174364: ldr r4, [r4] movs r2, 0 ldrh r1, [r4, 0x8] - ldr r3, _081743B4 + ldr r3, =0x000001ff adds r0, r3, 0 ands r0, r1 lsls r5, r6, 2 @@ -762030,19 +736299,16 @@ _08174384: _0817439A: cmp r2, 0x31 bhi _081743BC - ldr r0, _081743B8 + ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 adds r1, r0 subs r0, r2, 0x1 b _081743C6 .align 2, 0 -_081743AC: .4byte 0x0201c000 -_081743B0: .4byte 0x0203bcd8 -_081743B4: .4byte 0x000001ff -_081743B8: .4byte 0x03005e00 + .pool _081743BC: - ldr r0, _081743E4 + ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 adds r1, r0 @@ -762051,12 +736317,12 @@ _081743C6: strh r0, [r1, 0x8] movs r0, 0xA bl sub_80847F8 - ldr r2, _081743E4 + ldr r2, =0x03005e00 adds r1, r5, r6 lsls r1, 3 adds r1, r2 strh r0, [r1, 0xA] - ldr r0, _081743E8 + ldr r0, =sub_81743EC + 1 _081743DA: str r0, [r1] add sp, 0x4 @@ -762064,8 +736330,7 @@ _081743DA: pop {r0} bx r0 .align 2, 0 -_081743E4: .4byte 0x03005e00 -_081743E8: .4byte sub_81743EC + 1 + .pool thumb_func_end sub_8174324 thumb_func_start sub_81743EC @@ -762079,10 +736344,10 @@ sub_81743EC: @ 81743EC lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _081744A0 + ldr r0, =0x0203bcd8 ldr r3, [r0] movs r5, 0 - ldr r1, _081744A4 + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -762091,7 +736356,7 @@ sub_81743EC: @ 81743EC movs r4, 0x8 ldrsh r0, [r0, r4] adds r4, r1, 0 - ldr r2, _081744A8 + ldr r2, =0x0203bcd4 cmp r5, r0 bge _0817442A adds r1, r0, 0 @@ -762115,7 +736380,7 @@ _0817442A: strh r0, [r1, 0x10] movs r5, 0 str r2, [sp, 0x14] - ldr r4, _081744AC + ldr r4, =0x000001ff adds r2, r1, 0 _08174446: ldrh r1, [r6, 0x8] @@ -762135,14 +736400,14 @@ _08174456: bls _08174446 adds r6, r3, 0 movs r5, 0 - ldr r1, _081744A4 + ldr r1, =0x03005e00 ldr r0, [sp, 0x14] add r0, r8 lsls r0, 3 mov r9, r0 adds r0, r1 str r0, [sp, 0x10] - ldr r1, _081744AC + ldr r1, =0x000001ff mov r10, r1 _08174478: ldrh r0, [r6, 0x8] @@ -762157,23 +736422,18 @@ _08174478: cmp r0, 0x3 ble _081744B8 lsls r1, r5, 3 - ldr r0, _081744B0 + ldr r0, =0x085e53b4 adds r0, 0x4 adds r0, r1, r0 ldrh r3, [r0] - ldr r0, _081744B4 + ldr r0, =0x085e53ba adds r1, r0 ldrh r4, [r1] b _081744C8 .align 2, 0 -_081744A0: .4byte 0x0203bcd8 -_081744A4: .4byte 0x03005e00 -_081744A8: .4byte 0x0203bcd4 -_081744AC: .4byte 0x000001ff -_081744B0: .4byte 0x085e53b4 -_081744B4: .4byte 0x085e53ba + .pool _081744B8: - ldr r0, _08174530 + ldr r0, =0x085e53e4 lsls r2, r5, 3 adds r1, r0, 0x4 adds r1, r2, r1 @@ -762207,13 +736467,13 @@ _081744DE: lsls r3, r5, 24 lsrs r3, 24 str r3, [sp, 0x8] - ldr r3, _08174534 + ldr r3, =0x0000ffff str r3, [sp, 0xC] movs r3, 0x1 bl sub_818D7D8 lsls r0, 16 lsrs r0, 16 - ldr r2, _08174538 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -762229,20 +736489,17 @@ _081744DE: adds r1, r5, 0x5 lsls r1, 1 add r1, r9 - ldr r2, _0817453C + ldr r2, =0x03005e08 adds r1, r2 strh r0, [r1] b _0817454E .align 2, 0 -_08174530: .4byte 0x085e53e4 -_08174534: .4byte 0x0000ffff -_08174538: .4byte 0x02020630 -_0817453C: .4byte 0x03005e08 + .pool _08174540: adds r0, r5, 0x5 lsls r0, 1 add r0, r9 - ldr r4, _081745A0 + ldr r4, =0x03005e08 adds r0, r4 movs r1, 0xFF strh r1, [r0] @@ -762253,12 +736510,12 @@ _0817454E: adds r6, 0x14 cmp r5, 0x5 bls _08174478 - ldr r0, _081745A4 - ldr r2, _081745A8 + ldr r0, =0xffff0000 + ldr r2, =0x000063b0 movs r1, 0xC bl sub_80A2A20 - ldr r0, _081745AC - ldr r1, _081745B0 + ldr r0, =0x02021cc4 + ldr r1, =0x03005e00 ldr r4, [sp, 0x14] add r4, r8 lsls r4, 3 @@ -762268,15 +736525,15 @@ _0817454E: movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string - ldr r5, _081745B4 - ldr r1, _081745B8 + ldr r5, =0x02021fc4 + ldr r1, =0x085e8c00 adds r0, r5, 0 bl ExpandTextCodes movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 bgt _081745C0 - ldr r1, _081745BC + ldr r1, =0x085e8574 movs r0, 0x1 str r0, [sp] adds r0, r5, 0 @@ -762285,16 +736542,9 @@ _0817454E: bl sub_8198204 b _081745D0 .align 2, 0 -_081745A0: .4byte 0x03005e08 -_081745A4: .4byte 0xffff0000 -_081745A8: .4byte 0x000063b0 -_081745AC: .4byte 0x02021cc4 -_081745B0: .4byte 0x03005e00 -_081745B4: .4byte 0x02021fc4 -_081745B8: .4byte 0x085e8c00 -_081745BC: .4byte 0x085e8574 + .pool _081745C0: - ldr r1, _081745F0 + ldr r1, =0x085e855c movs r0, 0x1 str r0, [sp] adds r0, r5, 0 @@ -762302,12 +736552,12 @@ _081745C0: movs r3, 0 bl sub_8198204 _081745D0: - ldr r0, _081745F4 + ldr r0, =0x03005e00 ldr r1, [sp, 0x14] add r1, r8 lsls r1, 3 adds r1, r0 - ldr r0, _081745F8 + ldr r0, =sub_81745FC + 1 str r0, [r1] add sp, 0x18 pop {r3-r5} @@ -762318,9 +736568,7 @@ _081745D0: pop {r0} bx r0 .align 2, 0 -_081745F0: .4byte 0x085e855c -_081745F4: .4byte 0x03005e00 -_081745F8: .4byte sub_81745FC + 1 + .pool thumb_func_end sub_81743EC thumb_func_start sub_81745FC @@ -762332,10 +736580,10 @@ sub_81745FC: @ 81745FC push {r5-r7} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08174704 + ldr r0, =0x0203bcd8 ldr r5, [r0] movs r3, 0 - ldr r1, _08174708 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -762357,9 +736605,9 @@ _08174630: lsls r7, r4, 2 adds r0, r7, r4 lsls r6, r0, 3 - ldr r0, _0817470C + ldr r0, =0x03005e08 mov r10, r0 - ldr r1, _08174710 + ldr r1, =0x02020630 mov r8, r1 movs r2, 0xD negs r2, r2 @@ -762392,21 +736640,21 @@ _0817466C: bls _0817464A adds r1, r7, r4 lsls r1, 3 - ldr r0, _08174708 + ldr r0, =0x03005e00 adds r6, r1, r0 movs r2, 0xC ldrsh r0, [r6, r2] adds r0, 0x5 lsls r0, 1 adds r0, r1 - ldr r1, _08174708 + ldr r1, =0x03005e00 adds r1, 0x8 adds r0, r1 ldrh r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08174710 + ldr r1, =0x02020630 adds r0, r1 ldrb r2, [r0, 0x5] movs r1, 0xD @@ -762417,11 +736665,11 @@ _0817466C: movs r0, 0x80 lsls r0, 9 lsls r0, r1 - ldr r1, _08174714 + ldr r1, =0xffff0000 eors r0, r1 - ldr r2, _08174718 + ldr r2, =0x0203bcd4 str r0, [r2] - ldr r2, _0817471C + ldr r2, =0x000063b0 movs r1, 0xC bl sub_80A2A5C movs r0, 0xC @@ -762431,7 +736679,7 @@ _0817466C: lsls r0, 2 adds r4, r5, r0 ldrh r1, [r4, 0x8] - ldr r0, _08174720 + ldr r0, =0x000001ff ands r0, r1 movs r1, 0xCE lsls r1, 1 @@ -762448,7 +736696,7 @@ _081746E6: movs r1, 0 movs r2, 0xE bl sub_8174A88 - ldr r0, _08174724 + ldr r0, =sub_8174728 + 1 str r0, [r6] pop {r3-r5} mov r8, r3 @@ -762458,15 +736706,7 @@ _081746E6: pop {r0} bx r0 .align 2, 0 -_08174704: .4byte 0x0203bcd8 -_08174708: .4byte 0x03005e00 -_0817470C: .4byte 0x03005e08 -_08174710: .4byte 0x02020630 -_08174714: .4byte 0xffff0000 -_08174718: .4byte 0x0203bcd4 -_0817471C: .4byte 0x000063b0 -_08174720: .4byte 0x000001ff -_08174724: .4byte sub_8174728 + 1 + .pool thumb_func_end sub_81745FC thumb_func_start sub_8174728 @@ -762477,14 +736717,14 @@ sub_8174728: @ 8174728 push {r6,r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _081747AC + ldr r1, =0x030022c0 ldrh r2, [r1, 0x2E] movs r0, 0x1 ands r0, r2 adds r3, r1, 0 cmp r0, 0 beq _081747E4 - ldr r0, _081747B0 + ldr r0, =0x03005e00 mov r12, r0 lsls r0, r6, 2 adds r1, r0, r6 @@ -762522,7 +736762,7 @@ _08174782: lsrs r5, r0, 16 cmp r5, 0x5 bls _0817476A - ldr r0, _081747B0 + ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r6 lsls r1, 3 @@ -762535,32 +736775,28 @@ _08174782: subs r0, r2, 0x1 strh r0, [r1, 0xA] _081747A4: - ldr r0, _081747B4 + ldr r0, =sub_81743EC + 1 str r0, [r1] b _08174884 .align 2, 0 -_081747AC: .4byte 0x030022c0 -_081747B0: .4byte 0x03005e00 -_081747B4: .4byte sub_81743EC + 1 + .pool _081747B8: bl sub_80A36C8 lsls r0, 24 cmp r0, 0 beq _081747D2 bl sub_80A369C - ldr r0, _081747D8 - ldr r1, _081747DC + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl _081747D2: - ldr r0, _081747E0 + ldr r0, =sub_8174898 + 1 str r0, [r4] b _08174884 .align 2, 0 -_081747D8: .4byte 0x03007420 -_081747DC: .4byte 0x0000ffff -_081747E0: .4byte sub_8174898 + 1 + .pool _081747E4: movs r0, 0x2 ands r0, r2 @@ -762571,31 +736807,28 @@ _081747E4: cmp r0, 0 beq _08174806 bl sub_80A369C - ldr r0, _08174818 - ldr r1, _0817481C + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl _08174806: - ldr r0, _08174820 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _08174824 + ldr r0, =sub_8174898 + 1 str r0, [r1] b _08174884 .align 2, 0 -_08174818: .4byte 0x03007420 -_0817481C: .4byte 0x0000ffff -_08174820: .4byte 0x03005e00 -_08174824: .4byte sub_8174898 + 1 + .pool _08174828: movs r0, 0x40 ands r0, r2 cmp r0, 0 beq _08174858 - ldr r0, _08174850 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -762607,19 +736840,18 @@ _08174828: beq _08174858 subs r0, r2, 0x1 strh r0, [r1, 0xC] - ldr r0, _08174854 + ldr r0, =sub_81745FC + 1 str r0, [r1] b _08174884 .align 2, 0 -_08174850: .4byte 0x03005e00 -_08174854: .4byte sub_81745FC + 1 + .pool _08174858: ldrh r1, [r3, 0x2E] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _08174884 - ldr r1, _08174890 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -762634,7 +736866,7 @@ _08174858: ldrh r0, [r2, 0xC] adds r0, 0x1 strh r0, [r2, 0xC] - ldr r0, _08174894 + ldr r0, =sub_81745FC + 1 str r0, [r2] _08174884: pop {r3,r4} @@ -762644,8 +736876,7 @@ _08174884: pop {r0} bx r0 .align 2, 0 -_08174890: .4byte 0x03005e00 -_08174894: .4byte sub_81745FC + 1 + .pool thumb_func_end sub_8174728 thumb_func_start sub_8174898 @@ -762654,13 +736885,13 @@ sub_8174898: @ 8174898 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081748D8 - ldr r1, _081748DC + ldr r0, =0x02037b14 + ldr r1, =0x02037714 movs r2, 0x80 lsls r2, 2 bl CpuSet - ldr r1, _081748E0 - ldr r0, _081748E4 + ldr r1, =0x0201c000 + ldr r0, =0x085e56d4 ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3} @@ -762669,23 +736900,18 @@ sub_8174898: @ 8174898 movs r1, 0 movs r2, 0 bl sub_80F9BF4 - ldr r1, _081748E8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081748EC + ldr r1, =sub_81748F0 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081748D8: .4byte 0x02037b14 -_081748DC: .4byte 0x02037714 -_081748E0: .4byte 0x0201c000 -_081748E4: .4byte 0x085e56d4 -_081748E8: .4byte 0x03005e00 -_081748EC: .4byte sub_81748F0 + 1 + .pool thumb_func_end sub_8174898 thumb_func_start sub_81748F0 @@ -762703,7 +736929,7 @@ sub_81748F0: @ 81748F0 lsls r0, r6, 2 adds r0, r6 lsls r7, r0, 3 - ldr r0, _08174994 + ldr r0, =0x03005e08 mov r8, r0 _08174910: adds r0, r5, 0x5 @@ -762739,7 +736965,7 @@ _08174928: bl gpu_reset_bgs_and_dma3_busy_flags adds r0, r6, 0 bl remove_task - ldr r4, _08174998 + ldr r4, =0x0203bcdc ldr r0, [r4] cmp r0, 0 beq _08174974 @@ -762747,7 +736973,7 @@ _08174928: movs r0, 0 str r0, [r4] _08174974: - ldr r4, _0817499C + ldr r4, =0x0203bcd8 ldr r0, [r4] cmp r0, 0 beq _08174984 @@ -762763,9 +736989,7 @@ _08174988: pop {r0} bx r0 .align 2, 0 -_08174994: .4byte 0x03005e08 -_08174998: .4byte 0x0203bcdc -_0817499C: .4byte 0x0203bcd8 + .pool thumb_func_end sub_81748F0 thumb_func_start sub_81749A0 @@ -762775,14 +736999,14 @@ sub_81749A0: @ 81749A0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081749F8 + ldr r0, =0x085e8588 movs r1, 0x8 movs r2, 0x1 bl sub_8198180 movs r0, 0 movs r1, 0 bl sub_81973C4 - ldr r2, _081749FC + ldr r2, =0x085e8bdc movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -762798,22 +737022,19 @@ sub_81749A0: @ 81749A0 movs r0, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r1, _08174A00 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08174A04 + ldr r1, =sub_8174A08 + 1 str r1, [r0] add sp, 0x10 pop {r4} pop {r0} bx r0 .align 2, 0 -_081749F8: .4byte 0x085e8588 -_081749FC: .4byte 0x085e8bdc -_08174A00: .4byte 0x03005e00 -_08174A04: .4byte sub_8174A08 + 1 + .pool thumb_func_end sub_81749A0 thumb_func_start sub_8174A08 @@ -762821,26 +737042,24 @@ sub_8174A08: @ 8174A08 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08174A2C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _08174A28 - ldr r0, _08174A30 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _08174A34 + ldr r0, =sub_8174898 + 1 str r0, [r1] _08174A28: pop {r0} bx r0 .align 2, 0 -_08174A2C: .4byte 0x030022c0 -_08174A30: .4byte 0x03005e00 -_08174A34: .4byte sub_8174898 + 1 + .pool thumb_func_end sub_8174A08 thumb_func_start sub_8174A38 @@ -762852,7 +737071,7 @@ sub_8174A38: @ 8174A38 bl Window_FastFillPixels movs r0, 0 bl Window_WriteStandardTileMap - ldr r4, _08174A80 + ldr r4, =0x085e8b3e movs r0, 0x1 adds r1, r4, 0 movs r2, 0xD0 @@ -762860,7 +737079,7 @@ sub_8174A38: @ 8174A38 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _08174A84 + ldr r0, =0x085e5388 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -762876,8 +737095,7 @@ sub_8174A38: @ 8174A38 pop {r0} bx r0 .align 2, 0 -_08174A80: .4byte 0x085e8b3e -_08174A84: .4byte 0x085e5388 + .pool thumb_func_end sub_8174A38 thumb_func_start sub_8174A88 @@ -762891,13 +737109,13 @@ sub_8174A88: @ 8174A88 movs r0, 0 bl Window_WriteStandardTileMap ldrh r0, [r7, 0x8] - ldr r1, _08174AF8 + ldr r1, =0x000001ff ands r1, r0 movs r0, 0xCE lsls r0, 1 cmp r1, r0 beq _08174B30 - ldr r1, _08174AFC + ldr r1, =0x085e8c36 add r0, sp, 0xC bl gf_strcpy adds r6, r0, 0 @@ -762907,7 +737125,7 @@ sub_8174A88: @ 8174A88 bl sub_806E3C0 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _08174B00 + ldr r0, =0x0000ffff cmp r4, r0 beq _08174B04 adds r0, r4, 0 @@ -762931,9 +737149,7 @@ sub_8174A88: @ 8174A88 subs r0, 0x5F b _08174B0E .align 2, 0 -_08174AF8: .4byte 0x000001ff -_08174AFC: .4byte 0x085e8c36 -_08174B00: .4byte 0x0000ffff + .pool _08174B04: movs r0, 0xAC strb r0, [r6] @@ -762945,7 +737161,7 @@ _08174B0E: adds r6, 0x1 movs r0, 0xFF strb r0, [r6] - ldr r0, _08174B84 + ldr r0, =0x085e5388 str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -762967,7 +737183,7 @@ _08174B30: movs r0, 0xFF strb r0, [r1, 0xA] ldrh r1, [r7, 0x8] - ldr r4, _08174B88 + ldr r4, =0x000001ff adds r0, r4, 0 ands r0, r1 movs r1, 0xCE @@ -762980,7 +737196,7 @@ _08174B30: bl sub_81DB35C lsls r2, r0, 24 lsrs r2, 24 - ldr r0, _08174B84 + ldr r0, =0x085e5388 str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -762996,8 +737212,7 @@ _08174B30: bl Window_CopyToVram b _08174C82 .align 2, 0 -_08174B84: .4byte 0x085e5388 -_08174B88: .4byte 0x000001ff + .pool _08174B8C: movs r0, 0x1 add r1, sp, 0xC @@ -763005,7 +737220,7 @@ _08174B8C: bl sub_81DB368 lsls r2, r0, 24 lsrs r2, 24 - ldr r0, _08174BF8 + ldr r0, =0x085e5388 str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -763026,7 +737241,7 @@ _08174B8C: lsrs r1, 23 movs r2, 0xB muls r1, r2 - ldr r2, _08174BFC + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy adds r6, r0, 0 @@ -763049,8 +737264,7 @@ _08174B8C: beq _08174C04 b _08174C0A .align 2, 0 -_08174BF8: .4byte 0x085e5388 -_08174BFC: .4byte 0x083185c8 + .pool _08174C00: movs r0, 0xB5 b _08174C06 @@ -763062,7 +737276,7 @@ _08174C06: _08174C0A: movs r0, 0xFF strb r0, [r6] - ldr r5, _08174C8C + ldr r5, =0x085e5388 str r5, [sp] movs r4, 0x1 negs r4, r4 @@ -763074,7 +737288,7 @@ _08174C0A: movs r2, 0x80 movs r3, 0x1 bl box_print - ldr r1, _08174C90 + ldr r1, =0x085e8c3b add r0, sp, 0xC bl gf_strcpy adds r6, r0, 0 @@ -763092,7 +737306,7 @@ _08174C0A: movs r2, 0x24 movs r3, 0x11 bl box_print - ldr r1, _08174C94 + ldr r1, =0x085e8c4d add r0, sp, 0xC bl gf_strcpy adds r6, r0, 0 @@ -763118,9 +737332,7 @@ _08174C82: pop {r0} bx r0 .align 2, 0 -_08174C8C: .4byte 0x085e5388 -_08174C90: .4byte 0x085e8c3b -_08174C94: .4byte 0x085e8c4d + .pool thumb_func_end sub_8174A88 thumb_func_start sub_8174C98 @@ -763136,26 +737348,26 @@ sub_8174C98: @ 8174C98 bl Window_FastFillPixels movs r0, 0x1 bl Window_WriteStandardTileMap - ldr r2, _08174EA4 + ldr r2, =0x0000021d movs r0, 0x1 movs r1, 0 movs r3, 0xD bl SetWindowBorderStyle - ldr r0, _08174EA8 + ldr r0, =0x085e538c mov r8, r0 str r0, [sp] movs r1, 0x1 negs r1, r1 mov r9, r1 str r1, [sp, 0x4] - ldr r0, _08174EAC + ldr r0, =0x085e8c48 str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 movs r2, 0 movs r3, 0x1 bl box_print - ldr r0, _08174EB0 + ldr r0, =0x03005d90 mov r10, r0 ldr r1, [r0] movs r0, 0x1 @@ -763184,7 +737396,7 @@ sub_8174C98: @ 8174C98 str r0, [sp] movs r7, 0 str r7, [sp, 0x4] - ldr r0, _08174EB4 + ldr r0, =0x085e8c4d str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -763192,10 +737404,10 @@ sub_8174C98: @ 8174C98 movs r3, 0x11 bl box_print add r6, sp, 0xC - ldr r1, _08174EB8 + ldr r1, =0x000186a0 adds r0, r4, 0 bl __modsi3 - ldr r5, _08174EBC + ldr r5, =0x00002710 adds r1, r5, 0 bl __divsi3 subs r0, 0x5F @@ -763260,7 +737472,7 @@ sub_8174C98: @ 8174C98 str r0, [sp] mov r1, r9 str r1, [sp, 0x4] - ldr r0, _08174EC0 + ldr r0, =0x085e84ce str r0, [sp, 0x8] movs r0, 0x1 movs r1, 0x1 @@ -763312,7 +737524,7 @@ _08174E30: movs r0, 0xF0 strb r0, [r1, 0x3] adds r4, r1, 0 - ldr r0, _08174EB0 + ldr r0, =0x03005d90 ldr r5, [r0] ldrb r0, [r5, 0x10] movs r1, 0x64 @@ -763337,7 +737549,7 @@ _08174E30: bl sub_81DB368 lsls r2, r0, 24 lsrs r2, 24 - ldr r0, _08174EA8 + ldr r0, =0x085e538c str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -763360,14 +737572,7 @@ _08174E30: pop {r0} bx r0 .align 2, 0 -_08174EA4: .4byte 0x0000021d -_08174EA8: .4byte 0x085e538c -_08174EAC: .4byte 0x085e8c48 -_08174EB0: .4byte 0x03005d90 -_08174EB4: .4byte 0x085e8c4d -_08174EB8: .4byte 0x000186a0 -_08174EBC: .4byte 0x00002710 -_08174EC0: .4byte 0x085e84ce + .pool thumb_func_end sub_8174C98 thumb_func_start sub_8174EC4 @@ -763384,10 +737589,10 @@ sub_8174EC4: @ 8174EC4 mov r8, r0 mov r2, sp movs r6, 0 - ldr r1, _08174F64 + ldr r1, =0x040000d4 movs r5, 0x80 lsls r5, 5 - ldr r7, _08174F68 + ldr r7, =0x81000800 movs r0, 0x81 lsls r0, 24 mov r12, r0 @@ -763417,7 +737622,7 @@ _08174EEA: lsls r3, 3 movs r4, 0 str r4, [sp, 0x4] - ldr r2, _08174F64 + ldr r2, =0x040000d4 mov r1, r8 str r1, [r2] str r0, [r2, 0x4] @@ -763440,7 +737645,7 @@ _08174EEA: str r3, [r2, 0x8] ldr r0, [r2, 0x8] bl sub_80A1A74 - ldr r0, _08174F6C + ldr r0, =0x085e54e8 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply @@ -763451,9 +737656,7 @@ _08174EEA: pop {r0} bx r0 .align 2, 0 -_08174F64: .4byte 0x040000d4 -_08174F68: .4byte 0x81000800 -_08174F6C: .4byte 0x085e54e8 + .pool thumb_func_end sub_8174EC4 thumb_func_start sub_8174F70 @@ -763465,19 +737668,17 @@ sub_8174F70: @ 8174F70 bl reset_temp_tile_data_buffers bl dp13_810BB8C bl gpu_pal_allocator_reset - ldr r1, _08174FA0 + ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] - ldr r0, _08174FA4 + ldr r0, =0x085e5394 bl gpu_tile_obj_decompress_and_load - ldr r0, _08174FA8 + ldr r0, =0x085e53a4 bl gpu_pal_obj_decompress_and_apply pop {r0} bx r0 .align 2, 0 -_08174FA0: .4byte 0x0300301c -_08174FA4: .4byte 0x085e5394 -_08174FA8: .4byte 0x085e53a4 + .pool thumb_func_end sub_8174F70 thumb_func_start sub_8174FAC @@ -763485,17 +737686,17 @@ sub_8174FAC: @ 8174FAC push {r4,lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08175018 + ldr r1, =0x085e5374 movs r0, 0 movs r2, 0x3 bl bg_vram_setup - ldr r4, _0817501C + ldr r4, =0x0203bcdc ldr r1, [r4] adds r1, 0x12 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _08175020 + ldr r0, =0x00001012 adds r1, r0 movs r0, 0x3 bl bg_set_tilemap @@ -763527,28 +737728,25 @@ sub_8174FAC: @ 8174FAC pop {r0} bx r0 .align 2, 0 -_08175018: .4byte 0x085e5374 -_0817501C: .4byte 0x0203bcdc -_08175020: .4byte 0x00001012 + .pool thumb_func_end sub_8174FAC thumb_func_start sub_8175024 sub_8175024: @ 8175024 push {r4,lr} sub sp, 0x8 - ldr r0, _0817503C + ldr r0, =0x0203bcdc ldr r0, [r0] ldrh r0, [r0] cmp r0, 0x4 bhi _08175108 lsls r0, 2 - ldr r1, _08175040 + ldr r1, =_08175044 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0817503C: .4byte 0x0203bcdc -_08175040: .4byte _08175044 + .pool .align 2, 0 _08175044: .4byte _08175058 @@ -763557,7 +737755,7 @@ _08175044: .4byte _081750D2 .4byte _081750DC _08175058: - ldr r1, _0817506C + ldr r1, =0x085e5508 movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -763566,7 +737764,7 @@ _08175058: bl decompress_and_copy_tile_data_to_vram b _08175108 .align 2, 0 -_0817506C: .4byte 0x085e5508 + .pool _08175070: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -763626,15 +737824,15 @@ _081750DC: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show - ldr r0, _08175104 + ldr r0, =0x0203bcdc ldr r1, [r0] movs r0, 0 strh r0, [r1] b _08175114 .align 2, 0 -_08175104: .4byte 0x0203bcdc + .pool _08175108: - ldr r0, _0817511C + ldr r0, =0x0203bcdc ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 @@ -763647,7 +737845,7 @@ _08175114: pop {r1} bx r1 .align 2, 0 -_0817511C: .4byte 0x0203bcdc + .pool thumb_func_end sub_8175024 thumb_func_start sub_8175120 @@ -763749,7 +737947,7 @@ _081751BA: movs r1, 0x3 ands r0, r1 adds r0, 0x8 - ldr r1, _081751F8 + ldr r1, =0x08329f40 lsls r4, 1 adds r4, r1 movs r2, 0 @@ -763769,7 +737967,7 @@ _081751F2: pop {r0} bx r0 .align 2, 0 -_081751F8: .4byte 0x08329f40 + .pool thumb_func_end sub_81751A4 thumb_func_start sub_81751FC @@ -763790,7 +737988,7 @@ sub_81751FC: @ 81751FC movs r0, 0x7 ands r2, r0 negs r2, r2 - ldr r0, _0817526C + ldr r0, =0x085e54d0 lsls r4, 16 asrs r4, 16 lsls r2, 16 @@ -763803,7 +738001,7 @@ sub_81751FC: @ 81751FC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08175270 + ldr r0, =0x02020630 adds r4, r1, r0 bl GenerateRandomNumber lsls r0, 16 @@ -763823,8 +738021,7 @@ sub_81751FC: @ 81751FC movs r0, 0 b _08175276 .align 2, 0 -_0817526C: .4byte 0x085e54d0 -_08175270: .4byte 0x02020630 + .pool _08175274: movs r0, 0x1 _08175276: @@ -763838,40 +738035,37 @@ _08175276: thumb_func_start sub_8175280 sub_8175280: @ 8175280 push {r4,lr} - ldr r4, _081752B0 + ldr r4, =0x020375e0 movs r0, 0xB4 strh r0, [r4] - ldr r0, _081752B4 + ldr r0, =sub_8175364 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF beq _081752AA - ldr r1, _081752B8 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r1 ldrh r1, [r4] strh r1, [r0, 0xA] - ldr r0, _081752BC + ldr r0, =0x020375e2 strh r2, [r0] _081752AA: pop {r4} pop {r0} bx r0 .align 2, 0 -_081752B0: .4byte 0x020375e0 -_081752B4: .4byte sub_8175364 + 1 -_081752B8: .4byte 0x03005e00 -_081752BC: .4byte 0x020375e2 + .pool thumb_func_end sub_8175280 thumb_func_start sub_81752C0 sub_81752C0: @ 81752C0 push {r4,lr} - ldr r0, _081752EC + ldr r0, =sub_8175364 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -763880,7 +738074,7 @@ sub_81752C0: @ 81752C0 bl remove_task _081752D4: bl sub_8152254 - ldr r4, _081752F0 + ldr r4, =0x000003e9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -763889,8 +738083,7 @@ _081752D4: pop {r0} bx r0 .align 2, 0 -_081752EC: .4byte sub_8175364 + 1 -_081752F0: .4byte 0x000003e9 + .pool thumb_func_end sub_81752C0 thumb_func_start sub_81752F4 @@ -763902,7 +738095,7 @@ sub_81752F4: @ 81752F4 ldrsh r0, [r5, r2] cmp r0, 0x6E ble _08175324 - ldr r2, _08175320 + ldr r2, =0x03005e00 movs r0, 0x28 ldrsh r1, [r5, r0] lsls r0, r1, 2 @@ -763916,7 +738109,7 @@ sub_81752F4: @ 81752F4 bl sub_81525D0 b _08175358 .align 2, 0 -_08175320: .4byte 0x03005e00 + .pool _08175324: adds r0, r1, 0x1 ldrh r1, [r5, 0x1C] @@ -763929,7 +738122,7 @@ _08175324: movs r1, 0x3 ands r0, r1 adds r0, 0x8 - ldr r1, _08175360 + ldr r1, =0x08329f40 lsls r4, 1 adds r4, r1 movs r2, 0 @@ -763949,7 +738142,7 @@ _08175358: pop {r0} bx r0 .align 2, 0 -_08175360: .4byte 0x08329f40 + .pool thumb_func_end sub_81752F4 thumb_func_start sub_8175364 @@ -763965,7 +738158,7 @@ sub_8175364: @ 8175364 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08175390 + ldr r1, =0x03005e08 adds r6, r0, r1 ldrh r0, [r6] cmp r0, 0x1 @@ -763976,7 +738169,7 @@ sub_8175364: @ 8175364 beq _0817539C b _081754B0 .align 2, 0 -_08175390: .4byte 0x03005e08 + .pool _08175394: cmp r0, 0xFF bne _0817539A @@ -763990,27 +738183,23 @@ _0817539C: bne _081753B8 adds r0, r4, 0 bl remove_task - ldr r0, _081753CC + ldr r0, =0x020375e0 strh r7, [r0] - ldr r1, _081753D0 - ldr r2, _081753D4 + ldr r1, =0x020375e2 + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] _081753B8: - ldr r0, _081753D8 + ldr r0, =0x085e5394 bl gpu_tile_obj_decompress_and_load - ldr r0, _081753DC + ldr r0, =0x085e53a4 bl gpu_pal_obj_decompress_and_apply ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] b _081754B0 .align 2, 0 -_081753CC: .4byte 0x020375e0 -_081753D0: .4byte 0x020375e2 -_081753D4: .4byte 0x0000ffff -_081753D8: .4byte 0x085e5394 -_081753DC: .4byte 0x085e53a4 + .pool _081753E0: ldrh r0, [r6, 0x2] cmp r0, 0 @@ -764044,8 +738233,8 @@ _081753E0: bl __umodsi3 lsls r0, 24 lsrs r0, 24 - ldr r1, _08175488 - ldr r2, _0817548C + ldr r1, =0x085e53fc + ldr r2, =0x000003e9 str r4, [sp] str r0, [sp, 0x4] str r7, [sp, 0x8] @@ -764058,7 +738247,7 @@ _081753E0: cmp r7, 0xFF beq _08175478 adds r4, r7, 0 - ldr r1, _08175490 + ldr r1, =sub_81752F4 + 1 adds r0, r4, 0 bl sub_8152438 bl GenerateRandomNumber @@ -764087,9 +738276,7 @@ _08175478: strh r0, [r6, 0x2] b _081754B0 .align 2, 0 -_08175488: .4byte 0x085e53fc -_0817548C: .4byte 0x000003e9 -_08175490: .4byte sub_81752F4 + 1 + .pool _08175494: ldrh r0, [r6, 0x1E] cmp r0, 0 @@ -764099,10 +738286,10 @@ _08175494: b _081754B0 _081754A0: bl sub_81752C0 - ldr r0, _081754BC + ldr r0, =0x020375e0 strh r7, [r0] - ldr r1, _081754C0 - ldr r2, _081754C4 + ldr r1, =0x020375e2 + ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] _081754B0: @@ -764113,9 +738300,7 @@ _081754B0: pop {r0} bx r0 .align 2, 0 -_081754BC: .4byte 0x020375e0 -_081754C0: .4byte 0x020375e2 -_081754C4: .4byte 0x0000ffff + .pool thumb_func_end sub_8175364 thumb_func_start sub_81754C8 @@ -764133,31 +738318,31 @@ sub_81754DC: @ 81754DC push {lr} bl run_active_tasks bl call_obj_callbacks - ldr r0, _08175530 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _08175522 - ldr r0, _08175534 + ldr r0, =0x0203bce4 ldrb r0, [r0] cmp r0, 0 beq _08175522 - ldr r2, _08175538 - ldr r0, _0817553C + ldr r2, =0x03005e00 + ldr r0, =0x0203bce2 ldrh r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r2 ldr r1, [r0] - ldr r0, _08175540 + ldr r0, =sub_8175774 + 1 cmp r1, r0 bne _08175522 bl sub_81754C8 bl run_active_tasks bl call_obj_callbacks - ldr r1, _08175544 + ldr r1, =0x0203bce5 movs r0, 0x1 strb r0, [r1] _08175522: @@ -764166,12 +738351,7 @@ _08175522: pop {r0} bx r0 .align 2, 0 -_08175530: .4byte 0x030022c0 -_08175534: .4byte 0x0203bce4 -_08175538: .4byte 0x03005e00 -_0817553C: .4byte 0x0203bce2 -_08175540: .4byte sub_8175774 + 1 -_08175544: .4byte 0x0203bce5 + .pool thumb_func_end sub_81754DC thumb_func_start sub_8175548 @@ -764179,7 +738359,7 @@ sub_8175548: @ 8175548 push {lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08175598 + ldr r1, =0x085e6f68 movs r0, 0 movs r2, 0x1 bl bg_vram_setup @@ -764189,11 +738369,11 @@ sub_8175548: @ 8175548 adds r1, r0, 0 movs r0, 0 bl bg_set_tilemap - ldr r0, _0817559C + ldr r0, =0x085e56f0 movs r1, 0x80 movs r2, 0x40 bl gpu_pal_apply - ldr r0, _081755A0 + ldr r0, =0x085e6f6c bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 @@ -764206,9 +738386,7 @@ sub_8175548: @ 8175548 pop {r0} bx r0 .align 2, 0 -_08175598: .4byte 0x085e6f68 -_0817559C: .4byte 0x085e56f0 -_081755A0: .4byte 0x085e6f6c + .pool thumb_func_end sub_8175548 thumb_func_start sub_81755A4 @@ -764287,19 +738465,19 @@ sub_8175620: @ 8175620 bl sub_8175CE4 movs r0, 0 bl SetVBlankCallback - ldr r0, _08175718 + ldr r0, =0x02000000 movs r1, 0xE0 lsls r1, 9 bl init_malloc bl sub_80A1A74 bl clear_tasks bl sub_8175548 - ldr r0, _0817571C + ldr r0, =sub_8175744 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _08175720 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -764317,7 +738495,7 @@ _0817566A: lsls r0, 24 cmp r0, 0 beq _0817566A - ldr r5, _08175720 + ldr r5, =0x03005e00 lsls r4, r7, 2 adds r4, r7 lsls r4, 3 @@ -764333,10 +738511,10 @@ _0817566A: movs r6, 0 movs r1, 0x28 strh r1, [r0, 0x8] - ldr r1, _08175724 + ldr r1, =0x0000fffc movs r0, 0x12 bl lcd_io_set - ldr r0, _08175728 + ldr r0, =sub_8175DA0 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -764356,16 +738534,16 @@ _0817566A: bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, _0817572C + ldr r0, =sub_81754C8 + 1 bl SetVBlankCallback - ldr r0, _08175730 + ldr r0, =0x000001c7 bl m4aSongNumStart - ldr r0, _08175734 + ldr r0, =sub_81754DC + 1 bl set_callback2 - ldr r0, _08175738 + ldr r0, =0x0203bce5 mov r1, r8 strb r1, [r0] - ldr r4, _0817573C + ldr r4, =0x0203bce8 movs r0, 0xEB lsls r0, 2 bl malloc_and_clear @@ -764379,7 +738557,7 @@ _0817566A: strh r6, [r0] adds r0, 0x2 strh r6, [r0] - ldr r0, _08175740 + ldr r0, =0x0203bce2 strh r7, [r0] add sp, 0x4 pop {r3} @@ -764388,17 +738566,7 @@ _0817566A: pop {r0} bx r0 .align 2, 0 -_08175718: .4byte 0x02000000 -_0817571C: .4byte sub_8175744 + 1 -_08175720: .4byte 0x03005e00 -_08175724: .4byte 0x0000fffc -_08175728: .4byte sub_8175DA0 + 1 -_0817572C: .4byte sub_81754C8 + 1 -_08175730: .4byte 0x000001c7 -_08175734: .4byte sub_81754DC + 1 -_08175738: .4byte 0x0203bce5 -_0817573C: .4byte 0x0203bce8 -_08175740: .4byte 0x0203bce2 + .pool thumb_func_end sub_8175620 thumb_func_start sub_8175744 @@ -764406,26 +738574,24 @@ sub_8175744: @ 8175744 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08175768 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08175764 - ldr r0, _0817576C + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _08175770 + ldr r0, =sub_8175774 + 1 str r0, [r1] _08175764: pop {r0} bx r0 .align 2, 0 -_08175768: .4byte 0x02037fd4 -_0817576C: .4byte 0x03005e00 -_08175770: .4byte sub_8175774 + 1 + .pool thumb_func_end sub_8175744 thumb_func_start sub_8175774 @@ -764434,7 +738600,7 @@ sub_8175774: @ 8175774 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r2, _081757A8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -764454,13 +738620,12 @@ sub_8175774: @ 8175774 movs r0, 0x80 lsls r0, 1 strh r0, [r4, 0x20] - ldr r0, _081757AC + ldr r0, =sub_8175A9C + 1 b _081757FA .align 2, 0 -_081757A8: .4byte 0x03005e00 -_081757AC: .4byte sub_8175A9C + 1 + .pool _081757B0: - ldr r0, _081757D8 + ldr r0, =0x0203bce0 strh r1, [r0] ldrh r2, [r4, 0x1E] movs r3, 0x1E @@ -764476,11 +738641,10 @@ _081757B0: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _081757DC + ldr r0, =sub_8175808 + 1 b _081757FA .align 2, 0 -_081757D8: .4byte 0x0203bce0 -_081757DC: .4byte sub_8175808 + 1 + .pool _081757E0: cmp r0, 0x2 bne _081757FC @@ -764493,7 +738657,7 @@ _081757E0: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08175804 + ldr r0, =sub_81758A4 + 1 _081757FA: str r0, [r4] _081757FC: @@ -764502,7 +738666,7 @@ _081757FC: pop {r0} bx r0 .align 2, 0 -_08175804: .4byte sub_81758A4 + 1 + .pool thumb_func_end sub_8175774 thumb_func_start sub_8175808 @@ -764510,7 +738674,7 @@ sub_8175808: @ 8175808 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0817583C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -764521,21 +738685,19 @@ sub_8175808: @ 8175808 bl lcd_io_set adds r0, r4, 0 bl sub_8176CA0 - ldr r0, _08175840 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08175844 + ldr r0, =c2_080C9BFC + 1 str r0, [r1] _08175836: pop {r4} pop {r0} bx r0 .align 2, 0 -_0817583C: .4byte 0x02037fd4 -_08175840: .4byte 0x03005e00 -_08175844: .4byte c2_080C9BFC + 1 + .pool thumb_func_end sub_8175808 thumb_func_start c2_080C9BFC @@ -764547,7 +738709,7 @@ c2_080C9BFC: @ 8175848 lsrs r4, 24 movs r0, 0 bl SetVBlankCallback - ldr r1, _08175898 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -764567,9 +738729,9 @@ c2_080C9BFC: @ 8175848 bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, _0817589C + ldr r0, =sub_81754C8 + 1 bl SetVBlankCallback - ldr r0, _081758A0 + ldr r0, =sub_8175744 + 1 str r0, [r5] _08175890: add sp, 0x4 @@ -764577,9 +738739,7 @@ _08175890: pop {r0} bx r0 .align 2, 0 -_08175898: .4byte 0x03005e00 -_0817589C: .4byte sub_81754C8 + 1 -_081758A0: .4byte sub_8175744 + 1 + .pool thumb_func_end c2_080C9BFC thumb_func_start sub_81758A4 @@ -764587,7 +738747,7 @@ sub_81758A4: @ 81758A4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081758D8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -764598,21 +738758,19 @@ sub_81758A4: @ 81758A4 bl lcd_io_set adds r0, r4, 0 bl sub_8176CA0 - ldr r0, _081758DC + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081758E0 + ldr r0, =sub_81758E4 + 1 str r0, [r1] _081758D2: pop {r4} pop {r0} bx r0 .align 2, 0 -_081758D8: .4byte 0x02037fd4 -_081758DC: .4byte 0x03005e00 -_081758E0: .4byte sub_81758E4 + 1 + .pool thumb_func_end sub_81758A4 thumb_func_start sub_81758E4 @@ -764624,7 +738782,7 @@ sub_81758E4: @ 81758E4 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _081759B0 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r1, r0 @@ -764638,24 +738796,24 @@ _08175906: bl reset_all_obj_data bl dp13_810BB8C bl gpu_pal_allocator_reset - ldr r1, _081759B4 + ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] - ldr r0, _081759B8 + ldr r0, =0x085b0e04 movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _081759BC - ldr r1, _081759C0 + ldr r0, =0x085b0c0c + ldr r1, =0x06003800 bl LZ77UnCompVram - ldr r0, _081759C4 + ldr r0, =0x085b0a02 movs r1, 0x1 movs r2, 0x3E bl gpu_pal_apply movs r1, 0 - ldr r4, _081759C8 + ldr r4, =0x0201c000 movs r3, 0x11 - ldr r2, _081759CC + ldr r2, =0x000007ff _0817593C: adds r0, r1, r4 strb r3, [r0] @@ -764665,12 +738823,12 @@ _0817593C: cmp r1, r2 bls _0817593C movs r1, 0 - ldr r2, _081759D0 - ldr r6, _081759D4 - ldr r0, _081759D8 + ldr r2, =0x0201d800 + ldr r6, =0x085e701c + ldr r0, =0xfffff000 adds r5, r2, r0 movs r4, 0x22 - ldr r3, _081759CC + ldr r3, =0x000007ff _08175958: adds r0, r1, r5 strb r4, [r0] @@ -764680,9 +738838,9 @@ _08175958: cmp r1, r3 bls _08175958 movs r1, 0 - ldr r5, _081759DC + ldr r5, =0x0201d000 movs r4, 0x33 - ldr r3, _081759CC + ldr r3, =0x000007ff _0817596E: adds r0, r1, r5 strb r4, [r0] @@ -764693,20 +738851,20 @@ _0817596E: bls _0817596E movs r0, 0 strh r0, [r2] - ldr r1, _081759E0 + ldr r1, =0x000053ff adds r0, r1, 0 strh r0, [r2, 0x2] - ldr r1, _081759E4 + ldr r1, =0x0000529f adds r0, r1, 0 strh r0, [r2, 0x4] - ldr r1, _081759E8 + ldr r1, =0x00007e94 adds r0, r1, 0 strh r0, [r2, 0x6] adds r0, r6, 0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _081759EC + ldr r0, =0x085e702c bl gpu_pal_obj_alloc_tag_and_apply - ldr r1, _081759B0 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -764715,27 +738873,12 @@ _0817596E: strb r0, [r1] b _08175A7A .align 2, 0 -_081759B0: .4byte 0x030022c0 -_081759B4: .4byte 0x0300301c -_081759B8: .4byte 0x085b0e04 -_081759BC: .4byte 0x085b0c0c -_081759C0: .4byte 0x06003800 -_081759C4: .4byte 0x085b0a02 -_081759C8: .4byte 0x0201c000 -_081759CC: .4byte 0x000007ff -_081759D0: .4byte 0x0201d800 -_081759D4: .4byte 0x085e701c -_081759D8: .4byte 0xfffff000 -_081759DC: .4byte 0x0201d000 -_081759E0: .4byte 0x000053ff -_081759E4: .4byte 0x0000529f -_081759E8: .4byte 0x00007e94 -_081759EC: .4byte 0x085e702c + .pool _081759F0: - ldr r0, _08175A88 + ldr r0, =sub_81760FC + 1 movs r1, 0 bl AddTask - ldr r2, _08175A8C + ldr r2, =0x03005e00 lsls r4, r6, 2 adds r4, r6 lsls r4, 3 @@ -764781,7 +738924,7 @@ _081759F0: movs r0, 0x1E movs r1, 0x20 bl lcd_io_set - ldr r1, _08175A90 + ldr r1, =0x00000703 movs r0, 0xE bl lcd_io_set movs r1, 0xCA @@ -764791,9 +738934,9 @@ _081759F0: mov r0, r9 mov r1, r8 strb r0, [r1] - ldr r0, _08175A94 + ldr r0, =0x0203bd28 strh r5, [r0] - ldr r0, _08175A98 + ldr r0, =sub_8175744 + 1 str r0, [r4] _08175A7A: add sp, 0x4 @@ -764804,11 +738947,7 @@ _08175A7A: pop {r0} bx r0 .align 2, 0 -_08175A88: .4byte sub_81760FC + 1 -_08175A8C: .4byte 0x03005e00 -_08175A90: .4byte 0x00000703 -_08175A94: .4byte 0x0203bd28 -_08175A98: .4byte sub_8175744 + 1 + .pool thumb_func_end sub_81758E4 thumb_func_start sub_8175A9C @@ -764817,7 +738956,7 @@ sub_8175A9C: @ 8175A9C sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r2, _08175AC0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -764831,7 +738970,7 @@ sub_8175A9C: @ 8175A9C strh r0, [r4, 0x20] b _08175AD8 .align 2, 0 -_08175AC0: .4byte 0x03005e00 + .pool _08175AC4: movs r0, 0x1 negs r0, r0 @@ -764840,7 +738979,7 @@ _08175AC4: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08175AE0 + ldr r0, =sub_8175AE4 + 1 str r0, [r4] _08175AD8: add sp, 0x4 @@ -764848,7 +738987,7 @@ _08175AD8: pop {r0} bx r0 .align 2, 0 -_08175AE0: .4byte sub_8175AE4 + 1 + .pool thumb_func_end sub_8175A9C thumb_func_start sub_8175AE4 @@ -764856,7 +738995,7 @@ sub_8175AE4: @ 8175AE4 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08175B10 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -764864,21 +739003,19 @@ sub_8175AE4: @ 8175AE4 bne _08175B0A adds r0, r4, 0 bl sub_8176CA0 - ldr r0, _08175B14 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _08175B18 + ldr r0, =sub_8175B1C + 1 str r0, [r1] _08175B0A: pop {r4} pop {r0} bx r0 .align 2, 0 -_08175B10: .4byte 0x02037fd4 -_08175B14: .4byte 0x03005e00 -_08175B18: .4byte sub_8175B1C + 1 + .pool thumb_func_end sub_8175AE4 thumb_func_start sub_8175B1C @@ -764915,22 +739052,21 @@ sub_8175B1C: @ 8175B1C lsls r1, 1 movs r0, 0 bl lcd_io_set - ldr r1, _08175B88 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0xEB strh r1, [r0, 0x8] - ldr r1, _08175B8C + ldr r1, =sub_8175B90 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_08175B88: .4byte 0x03005e00 -_08175B8C: .4byte sub_8175B90 + 1 + .pool thumb_func_end sub_8175B1C thumb_func_start sub_8175B90 @@ -764939,7 +739075,7 @@ sub_8175B90: @ 8175B90 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r2, _08175BB4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -764953,7 +739089,7 @@ sub_8175B90: @ 8175B90 strh r0, [r4, 0x8] b _08175BCC .align 2, 0 -_08175BB4: .4byte 0x03005e00 + .pool _08175BB8: movs r0, 0x1 negs r0, r0 @@ -764962,7 +739098,7 @@ _08175BB8: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08175BD4 + ldr r0, =sub_8175BD8 + 1 str r0, [r4] _08175BCC: add sp, 0x4 @@ -764970,7 +739106,7 @@ _08175BCC: pop {r0} bx r0 .align 2, 0 -_08175BD4: .4byte sub_8175BD8 + 1 + .pool thumb_func_end sub_8175B90 thumb_func_start sub_8175BD8 @@ -764979,7 +739115,7 @@ sub_8175BD8: @ 8175BD8 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _08175C28 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -764998,7 +739134,7 @@ sub_8175BD8: @ 8175BD8 movs r2, 0 movs r3, 0 bl sub_80A1AD4 - ldr r1, _08175C2C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -765006,7 +739142,7 @@ sub_8175BD8: @ 8175BD8 movs r1, 0xE1 lsls r1, 5 strh r1, [r0, 0x8] - ldr r1, _08175C30 + ldr r1, =sub_8175C34 + 1 str r1, [r0] _08175C1E: add sp, 0x4 @@ -765014,9 +739150,7 @@ _08175C1E: pop {r0} bx r0 .align 2, 0 -_08175C28: .4byte 0x02037fd4 -_08175C2C: .4byte 0x03005e00 -_08175C30: .4byte sub_8175C34 + 1 + .pool thumb_func_end sub_8175BD8 thumb_func_start sub_8175C34 @@ -765025,13 +739159,13 @@ sub_8175C34: @ 8175C34 sub sp, 0x4 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08175C80 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08175CB8 - ldr r1, _08175C84 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -765040,7 +739174,7 @@ sub_8175C34: @ 8175C34 ldrsh r1, [r4, r0] cmp r1, 0 beq _08175C62 - ldr r0, _08175C88 + ldr r0, =0x030022c0 ldrh r0, [r0, 0x2E] cmp r0, 0 beq _08175C94 @@ -765049,23 +739183,19 @@ _08175C62: bl play_sound_effect movs r0, 0x1 negs r0, r0 - ldr r1, _08175C8C + ldr r1, =0x0000ffff str r1, [sp] movs r1, 0x8 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08175C90 + ldr r0, =sub_8175CC8 + 1 str r0, [r4] b _08175CB8 .align 2, 0 -_08175C80: .4byte 0x02037fd4 -_08175C84: .4byte 0x03005e00 -_08175C88: .4byte 0x030022c0 -_08175C8C: .4byte 0x0000ffff -_08175C90: .4byte sub_8175CC8 + 1 + .pool _08175C94: - ldr r0, _08175CC0 + ldr r0, =0x00001be8 cmp r1, r0 bne _08175CA0 movs r0, 0x8 @@ -765073,7 +739203,7 @@ _08175C94: _08175CA0: movs r0, 0x8 ldrsh r1, [r4, r0] - ldr r0, _08175CC4 + ldr r0, =0x00001ab8 cmp r1, r0 bne _08175CB2 movs r0, 0xE4 @@ -765089,14 +739219,13 @@ _08175CB8: pop {r0} bx r0 .align 2, 0 -_08175CC0: .4byte 0x00001be8 -_08175CC4: .4byte 0x00001ab8 + .pool thumb_func_end sub_8175C34 thumb_func_start sub_8175CC8 sub_8175CC8: @ 8175CC8 push {lr} - ldr r0, _08175CE0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -765108,7 +739237,7 @@ _08175CDC: pop {r0} bx r0 .align 2, 0 -_08175CE0: .4byte 0x02037fd4 + .pool thumb_func_end sub_8175CC8 thumb_func_start sub_8175CE4 @@ -765154,13 +739283,13 @@ sub_8175CE4: @ 8175CE4 mov r1, sp movs r0, 0 strh r0, [r1] - ldr r1, _08175D8C + ldr r1, =0x040000d4 mov r0, sp str r0, [r1] movs r0, 0xC0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _08175D90 + ldr r0, =0x8100c000 str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r2, 0 @@ -765170,26 +739299,22 @@ sub_8175CE4: @ 8175CE4 movs r0, 0xE0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _08175D94 + ldr r0, =0x85000100 str r0, [r1, 0x8] ldr r0, [r1, 0x8] mov r0, sp strh r2, [r0] str r0, [r1] - ldr r0, _08175D98 + ldr r0, =0x05000002 str r0, [r1, 0x4] - ldr r0, _08175D9C + ldr r0, =0x810001ff str r0, [r1, 0x8] ldr r0, [r1, 0x8] add sp, 0x8 pop {r0} bx r0 .align 2, 0 -_08175D8C: .4byte 0x040000d4 -_08175D90: .4byte 0x8100c000 -_08175D94: .4byte 0x85000100 -_08175D98: .4byte 0x05000002 -_08175D9C: .4byte 0x810001ff + .pool thumb_func_end sub_8175CE4 thumb_func_start sub_8175DA0 @@ -765201,7 +739326,7 @@ sub_8175DA0: @ 8175DA0 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08175DCC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -765212,13 +739337,12 @@ sub_8175DA0: @ 8175DA0 cmp r0, 0xA bhi _08175E00 lsls r0, 2 - ldr r1, _08175DD0 + ldr r1, =_08175DD4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08175DCC: .4byte 0x03005e00 -_08175DD0: .4byte _08175DD4 + .pool .align 2, 0 _08175DD4: .4byte _08175E00 @@ -765233,7 +739357,7 @@ _08175DD4: .4byte _08175E00 .4byte _08175FFC _08175E00: - ldr r0, _08175E38 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -765258,12 +739382,11 @@ _08175E12: lsls r0, 3 adds r0, r5 strh r2, [r0, 0x24] - ldr r0, _08175E3C + ldr r0, =0x0203bce0 strh r2, [r0] b _0817602A .align 2, 0 -_08175E38: .4byte 0x02037fd4 -_08175E3C: .4byte 0x0203bce0 + .pool _08175E40: lsls r0, r4, 2 adds r0, r4 @@ -765294,7 +739417,7 @@ _08175E60: lsls r0, 3 adds r5, r0, r5 ldr r1, [r5] - ldr r0, _08175F04 + ldr r0, =sub_8175774 + 1 mov r9, r2 cmp r1, r0 bne _08175F32 @@ -765303,7 +739426,7 @@ _08175E60: cmp r0, 0x38 bgt _08175F2C movs r5, 0 - ldr r2, _08175F08 + ldr r2, =0x085e6af4 mov r8, r2 adds r7, r3, 0 movs r6, 0xA0 @@ -765330,7 +739453,7 @@ _08175E92: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram - ldr r3, _08175F0C + ldr r3, =0x03005e00 mov r2, r9 adds r1, r2, r4 lsls r1, 3 @@ -765361,17 +739484,14 @@ _08175E92: bne _08175F14 movs r0, 0xC0 lsls r0, 2 - ldr r1, _08175F10 + ldr r1, =0x0000328d b _08175F1A .align 2, 0 -_08175F04: .4byte sub_8175774 + 1 -_08175F08: .4byte 0x085e6af4 -_08175F0C: .4byte 0x03005e00 -_08175F10: .4byte 0x0000328d + .pool _08175F14: movs r0, 0xC0 lsls r0, 2 - ldr r1, _08175F28 + ldr r1, =0x00001967 _08175F1A: str r1, [sp] movs r1, 0 @@ -765380,7 +739500,7 @@ _08175F1A: bl sub_80A1AD4 b _0817602A .align 2, 0 -_08175F28: .4byte 0x00001967 + .pool _08175F2C: movs r0, 0xA strh r0, [r3, 0x8] @@ -765390,7 +739510,7 @@ _08175F32: strh r0, [r5, 0x24] b _0817602A _08175F38: - ldr r0, _08175F58 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -765407,7 +739527,7 @@ _08175F38: strh r1, [r0, 0x8] b _0817602A .align 2, 0 -_08175F58: .4byte 0x02037fd4 + .pool _08175F5C: lsls r0, r4, 2 adds r0, r4 @@ -765448,14 +739568,14 @@ _08175F8A: bne _08175FB0 movs r0, 0xC0 lsls r0, 2 - ldr r1, _08175FAC + ldr r1, =0x0000328d b _08175FB6 .align 2, 0 -_08175FAC: .4byte 0x0000328d + .pool _08175FB0: movs r0, 0xC0 lsls r0, 2 - ldr r1, _08175FC4 + ldr r1, =0x00001967 _08175FB6: str r1, [sp] movs r1, 0 @@ -765464,9 +739584,9 @@ _08175FB6: bl sub_80A1AD4 b _0817602A .align 2, 0 -_08175FC4: .4byte 0x00001967 + .pool _08175FC8: - ldr r0, _08175FF4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -765478,7 +739598,7 @@ _08175FC8: movs r0, 0 movs r1, 0x2 bl Window_CopyToVram - ldr r0, _08175FF8 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -765487,8 +739607,7 @@ _08175FC8: strh r0, [r1, 0x8] b _0817602A .align 2, 0 -_08175FF4: .4byte 0x02037fd4 -_08175FF8: .4byte 0x03005e00 + .pool _08175FFC: lsls r0, r4, 2 adds r0, r4 @@ -765506,7 +739625,7 @@ _08175FFC: adds r0, r4, 0 bl remove_task bl sub_81755A4 - ldr r4, _08176038 + ldr r4, =0x0203bce8 ldr r0, [r4] bl free str r5, [r4] @@ -765519,7 +739638,7 @@ _0817602A: pop {r0} bx r0 .align 2, 0 -_08176038: .4byte 0x0203bce8 + .pool thumb_func_end sub_8175DA0 thumb_func_start sub_817603C @@ -765531,7 +739650,7 @@ sub_817603C: @ 817603C lsls r1, 24 lsrs r2, r1, 24 adds r5, r2, 0 - ldr r4, _081760F0 + ldr r4, =0x03005e00 cmp r3, 0x6 bne _0817605C lsls r0, r2, 2 @@ -765622,7 +739741,7 @@ _081760DA: movs r0, 0 b _081760F6 .align 2, 0 -_081760F0: .4byte 0x03005e00 + .pool _081760F4: movs r0, 0x1 _081760F6: @@ -765636,7 +739755,7 @@ sub_81760FC: @ 81760FC push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _08176128 + ldr r4, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -765657,9 +739776,9 @@ _0817611A: _08176124: b _08176244 .align 2, 0 -_08176128: .4byte 0x03005e00 + .pool _0817612C: - ldr r0, _08176154 + ldr r0, =0x0203bce8 ldr r0, [r0] adds r0, 0x90 ldrh r0, [r0] @@ -765681,9 +739800,9 @@ _0817614E: adds r0, 0x1 b _08176242 .align 2, 0 -_08176154: .4byte 0x0203bce8 + .pool _08176158: - ldr r6, _081761C8 + ldr r6, =0x0203bce8 ldr r3, [r6] adds r0, r3, 0 adds r0, 0x8E @@ -765697,7 +739816,7 @@ _08176158: lsls r0, 3 adds r0, r4 ldr r1, [r0] - ldr r0, _081761CC + ldr r0, =sub_8175774 + 1 cmp r1, r0 bne _08176244 adds r0, r3, 0 @@ -765706,7 +739825,7 @@ _08176158: lsls r0, 1 adds r0, r3, r0 ldrh r0, [r0] - ldr r4, _081761D0 + ldr r4, =0x085e6f7c adds r1, r3, 0 adds r1, 0x90 ldrh r3, [r1] @@ -765730,7 +739849,7 @@ _08176158: bge _081761D8 adds r0, r3, 0x1 strh r0, [r1] - ldr r1, _081761D4 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -765738,14 +739857,11 @@ _08176158: movs r1, 0x32 b _081761EA .align 2, 0 -_081761C8: .4byte 0x0203bce8 -_081761CC: .4byte sub_8175774 + 1 -_081761D0: .4byte 0x085e6f7c -_081761D4: .4byte 0x02020630 + .pool _081761D8: movs r0, 0 strh r0, [r1] - ldr r1, _08176208 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -765754,7 +739870,7 @@ _081761D8: lsls r1, 2 _081761EA: strh r1, [r0, 0x34] - ldr r0, _0817620C + ldr r0, =0x0203bce8 ldr r1, [r0] adds r2, r1, 0 adds r2, 0x8E @@ -765768,13 +739884,12 @@ _081761EA: movs r0, 0 b _08176212 .align 2, 0 -_08176208: .4byte 0x02020630 -_0817620C: .4byte 0x0203bce8 + .pool _08176210: adds r0, 0x1 _08176212: strh r0, [r1] - ldr r0, _0817622C + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -765786,7 +739901,7 @@ _08176212: strh r0, [r1, 0x8] b _08176244 .align 2, 0 -_0817622C: .4byte 0x03005e00 + .pool _08176230: ldrh r1, [r2, 0xE] movs r3, 0xE @@ -765811,7 +739926,7 @@ sub_817624C: @ 817624C push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08176274 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -765824,13 +739939,12 @@ sub_817624C: @ 817624C b _08176514 _08176268: lsls r0, 2 - ldr r1, _08176278 + ldr r1, =_0817627C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08176274: .4byte 0x03005e00 -_08176278: .4byte _0817627C + .pool .align 2, 0 _0817627C: .4byte _08176348 @@ -765896,13 +740010,13 @@ _08176348: ands r0, r1 movs r1, 0xC bl sine - ldr r1, _08176368 + ldr r1, =0x0203bd26 strh r0, [r1] b _08176390 .align 2, 0 -_08176368: .4byte 0x0203bd26 + .pool _0817636C: - ldr r7, _08176398 + ldr r7, =0x0203bd26 movs r3, 0 ldrsh r4, [r7, r3] cmp r4, 0 @@ -765925,9 +740039,9 @@ _08176390: strh r0, [r4, 0x12] b _08176514 .align 2, 0 -_08176398: .4byte 0x0203bd26 + .pool _0817639C: - ldr r3, _081763BC + ldr r3, =0x02020630 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -765943,7 +740057,7 @@ _0817639C: strh r4, [r1, 0x12] b _08176430 .align 2, 0 -_081763BC: .4byte 0x02020630 + .pool _081763C0: lsls r0, r5, 2 adds r0, r5 @@ -765958,7 +740072,7 @@ _081763C0: strh r0, [r1, 0x12] b _0817644E _081763D8: - ldr r3, _08176410 + ldr r3, =0x02020630 lsls r2, r5, 2 adds r2, r5 lsls r2, 3 @@ -765986,7 +740100,7 @@ _081763D8: strh r0, [r2, 0x8] b _08176514 .align 2, 0 -_08176410: .4byte 0x02020630 + .pool _08176414: lsls r0, r5, 2 adds r0, r5 @@ -766025,13 +740139,13 @@ _0817644E: ands r0, r1 movs r1, 0x14 bl sine - ldr r1, _08176460 + ldr r1, =0x0203bd26 strh r0, [r1] b _08176514 .align 2, 0 -_08176460: .4byte 0x0203bd26 + .pool _08176464: - ldr r2, _08176480 + ldr r2, =0x02020630 movs r3, 0xC ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -766045,7 +740159,7 @@ _08176464: strh r0, [r4, 0x8] b _08176514 .align 2, 0 -_08176480: .4byte 0x02020630 + .pool _08176484: lsls r0, r5, 2 adds r0, r5 @@ -766054,7 +740168,7 @@ _08176484: movs r1, 0x32 b _08176512 _08176490: - ldr r3, _081764AC + ldr r3, =0x02020630 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -766068,9 +740182,9 @@ _08176490: movs r2, 0x2 b _081764C8 .align 2, 0 -_081764AC: .4byte 0x02020630 + .pool _081764B0: - ldr r3, _081764D0 + ldr r3, =0x02020630 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -766088,9 +740202,9 @@ _081764C8: strh r0, [r1, 0x8] b _08176514 .align 2, 0 -_081764D0: .4byte 0x02020630 + .pool _081764D4: - ldr r3, _08176504 + ldr r3, =0x02020630 lsls r2, r5, 2 adds r2, r5 lsls r2, 3 @@ -766115,7 +740229,7 @@ _081764D4: strh r0, [r2, 0x8] b _08176514 .align 2, 0 -_08176504: .4byte 0x02020630 + .pool _08176508: lsls r0, r5, 2 adds r0, r5 @@ -766135,7 +740249,7 @@ sub_817651C: @ 817651C push {r4,r5,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08176540 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -766146,13 +740260,12 @@ sub_817651C: @ 817651C cmp r0, 0x4 bhi _0817655C lsls r0, 2 - ldr r1, _08176544 + ldr r1, =_08176548 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08176540: .4byte 0x03005e00 -_08176544: .4byte _08176548 + .pool .align 2, 0 _08176548: .4byte _0817655C @@ -766167,7 +740280,7 @@ _0817655C: adds r2, r0, r4 movs r1, 0xA ldrsh r0, [r2, r1] - ldr r5, _081765A8 + ldr r5, =0x00007fff cmp r0, r5 beq _081765A0 movs r3, 0xC @@ -766200,7 +740313,7 @@ _081765A0: bl sub_817B540 b _08176646 .align 2, 0 -_081765A8: .4byte 0x00007fff + .pool _081765AC: lsls r0, r2, 2 adds r0, r2 @@ -766208,7 +740321,7 @@ _081765AC: adds r2, r0, r4 movs r3, 0xA ldrsh r0, [r2, r3] - ldr r5, _081765F0 + ldr r5, =0x00007fff cmp r0, r5 beq _08176638 movs r0, 0xC @@ -766236,7 +740349,7 @@ _081765AC: strh r5, [r2, 0xA] b _08176638 .align 2, 0 -_081765F0: .4byte 0x00007fff + .pool _081765F4: lsls r0, r2, 2 adds r0, r2 @@ -766245,7 +740358,7 @@ _081765F4: ldrh r3, [r2, 0xA] movs r0, 0xA ldrsh r1, [r2, r0] - ldr r5, _08176630 + ldr r5, =0x00007fff cmp r1, r5 beq _08176638 movs r0, 0x92 @@ -766269,7 +740382,7 @@ _081765F4: strh r5, [r2, 0xA] b _08176638 .align 2, 0 -_08176630: .4byte 0x00007fff + .pool _08176634: adds r0, r3, 0x1 strh r0, [r2, 0xA] @@ -766301,12 +740414,12 @@ sub_817664C: @ 817664C b _081769E0 _08176662: lsls r0, 2 - ldr r1, _0817666C + ldr r1, =_08176670 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0817666C: .4byte _08176670 + .pool .align 2, 0 _08176670: .4byte _08176684 @@ -766315,8 +740428,8 @@ _08176670: .4byte _08176884 .4byte _08176934 _08176684: - ldr r5, _08176724 - ldr r0, _08176728 + ldr r5, =0x02020630 + ldr r0, =0x03005e00 lsls r4, r7, 2 adds r4, r7 lsls r4, 3 @@ -766396,11 +740509,10 @@ _08176684: movs r2, 0x20 b _081769D4 .align 2, 0 -_08176724: .4byte 0x02020630 -_08176728: .4byte 0x03005e00 + .pool _0817672C: - ldr r5, _081767D0 - ldr r0, _081767D4 + ldr r5, =0x02020630 + ldr r0, =0x03005e00 lsls r4, r7, 2 adds r4, r7 lsls r4, 3 @@ -766481,11 +740593,10 @@ _0817672C: movs r2, 0x20 b _081769D4 .align 2, 0 -_081767D0: .4byte 0x02020630 -_081767D4: .4byte 0x03005e00 + .pool _081767D8: - ldr r5, _0817687C - ldr r0, _08176880 + ldr r5, =0x02020630 + ldr r0, =0x03005e00 lsls r4, r7, 2 adds r4, r7 lsls r4, 3 @@ -766567,11 +740678,10 @@ _081767D8: movs r0, 0x1 b _081769D4 .align 2, 0 -_0817687C: .4byte 0x02020630 -_08176880: .4byte 0x03005e00 + .pool _08176884: - ldr r5, _08176928 - ldr r0, _0817692C + ldr r5, =0x02020630 + ldr r0, =0x03005e00 lsls r4, r7, 2 adds r4, r7 lsls r4, 3 @@ -766614,7 +740724,7 @@ _08176884: adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08176930 + ldr r1, =0x0000ffe0 strh r1, [r0, 0x20] movs r0, 0x12 ldrsh r1, [r4, r0] @@ -766652,12 +740762,10 @@ _08176884: movs r0, 0x1 b _081769D4 .align 2, 0 -_08176928: .4byte 0x02020630 -_0817692C: .4byte 0x03005e00 -_08176930: .4byte 0x0000ffe0 + .pool _08176934: - ldr r5, _08176AA0 - ldr r0, _08176AA4 + ldr r5, =0x02020630 + ldr r0, =0x03005e00 lsls r4, r7, 2 adds r4, r7 lsls r4, 3 @@ -766743,10 +740851,10 @@ _081769D4: lsrs r0, 24 strh r0, [r4, 0x8] _081769E0: - ldr r0, _08176AA8 + ldr r0, =sub_817651C + 1 movs r1, 0 bl AddTask - ldr r6, _08176AA4 + ldr r6, =0x03005e00 lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -766777,7 +740885,7 @@ _081769E0: lsls r0, 3 adds r0, r6 strh r7, [r0, 0xC] - ldr r0, _08176AAC + ldr r0, =sub_817624C + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -766838,10 +740946,7 @@ _08176A94: pop {r0} bx r0 .align 2, 0 -_08176AA0: .4byte 0x02020630 -_08176AA4: .4byte 0x03005e00 -_08176AA8: .4byte sub_817651C + 1 -_08176AAC: .4byte sub_817624C + 1 + .pool thumb_func_end sub_817664C thumb_func_start sub_8176AB0 @@ -766851,7 +740956,7 @@ sub_8176AB0: @ 8176AB0 lsrs r4, r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _08176B2C + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r6, r0, r1 @@ -766899,12 +741004,12 @@ _08176AD6: strb r0, [r6] b _08176C96 .align 2, 0 -_08176B2C: .4byte 0x030022c0 + .pool _08176B30: - ldr r1, _08176B4C + ldr r1, =0x0203bd24 movs r0, 0x22 strh r0, [r1] - ldr r1, _08176B50 + ldr r1, =0x0203bd26 movs r0, 0 strh r0, [r1] adds r0, r4, 0 @@ -766914,45 +741019,44 @@ _08176B30: strb r0, [r6] b _08176C96 .align 2, 0 -_08176B4C: .4byte 0x0203bd24 -_08176B50: .4byte 0x0203bd26 + .pool _08176B54: - ldr r0, _08176BB4 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 bne _08176BD8 - ldr r0, _08176BB8 + ldr r0, =0x085f5334 bl gpu_tile_obj_decompress_and_load - ldr r0, _08176BBC + ldr r0, =0x085f53bc bl gpu_tile_obj_decompress_and_load - ldr r0, _08176BC0 + ldr r0, =0x085f5354 bl gpu_tile_obj_decompress_and_load - ldr r0, _08176BC4 + ldr r0, =0x085f5384 bl gpu_pal_obj_alloc_and_load_multiple movs r0, 0x78 movs r1, 0x2E bl sub_817B834 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08176BC8 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 adds r4, r0 strh r2, [r4, 0x12] - ldr r6, _08176BCC + ldr r6, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 adds r5, r6, 0 adds r5, 0x1C adds r2, r0, r5 - ldr r1, _08176BD0 + ldr r1, =sub_8176EE8 + 1 str r1, [r2] adds r6, 0x8 adds r0, r6 - ldr r1, _08176BD4 + ldr r1, =0x085e6fd0 str r1, [r0] movs r0, 0x88 lsls r0, 1 @@ -766960,47 +741064,39 @@ _08176B54: bl sub_817B88C b _08176C2C .align 2, 0 -_08176BB4: .4byte 0x03005d90 -_08176BB8: .4byte 0x085f5334 -_08176BBC: .4byte 0x085f53bc -_08176BC0: .4byte 0x085f5354 -_08176BC4: .4byte 0x085f5384 -_08176BC8: .4byte 0x03005e00 -_08176BCC: .4byte 0x02020630 -_08176BD0: .4byte sub_8176EE8 + 1 -_08176BD4: .4byte 0x085e6fd0 + .pool _08176BD8: - ldr r0, _08176C54 + ldr r0, =0x085f5344 bl gpu_tile_obj_decompress_and_load - ldr r0, _08176C58 + ldr r0, =0x085f53ac bl gpu_tile_obj_decompress_and_load - ldr r0, _08176C5C + ldr r0, =0x085f5354 bl gpu_tile_obj_decompress_and_load - ldr r0, _08176C60 + ldr r0, =0x085f5384 bl gpu_pal_obj_alloc_and_load_multiple movs r0, 0x78 movs r1, 0x2E bl sub_817B88C lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08176C64 + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 adds r4, r0 strh r2, [r4, 0x12] - ldr r6, _08176C68 + ldr r6, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 adds r5, r6, 0 adds r5, 0x1C adds r2, r0, r5 - ldr r1, _08176C6C + ldr r1, =sub_8176EE8 + 1 str r1, [r2] adds r6, 0x8 adds r0, r6 - ldr r1, _08176C70 + ldr r1, =0x085e6fd0 str r1, [r0] movs r0, 0x88 lsls r0, 1 @@ -767014,12 +741110,12 @@ _08176C2C: adds r0, r2 lsls r0, 2 adds r5, r0, r5 - ldr r1, _08176C74 + ldr r1, =sub_8176F90 + 1 str r1, [r5] adds r0, r6 - ldr r1, _08176C78 + ldr r1, =0x085e7010 str r1, [r0] - ldr r1, _08176C7C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -767028,17 +741124,7 @@ _08176C2C: strb r0, [r1] b _08176C96 .align 2, 0 -_08176C54: .4byte 0x085f5344 -_08176C58: .4byte 0x085f53ac -_08176C5C: .4byte 0x085f5354 -_08176C60: .4byte 0x085f5384 -_08176C64: .4byte 0x03005e00 -_08176C68: .4byte 0x02020630 -_08176C6C: .4byte sub_8176EE8 + 1 -_08176C70: .4byte 0x085e6fd0 -_08176C74: .4byte sub_8176F90 + 1 -_08176C78: .4byte 0x085e7010 -_08176C7C: .4byte 0x030022c0 + .pool _08176C80: adds r0, r4, 0 adds r1, r5, 0 @@ -767062,7 +741148,7 @@ sub_8176CA0: @ 8176CA0 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08176D14 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -767111,15 +741197,14 @@ _08176CF2: movs r0, 0 strh r0, [r4, 0xE] _08176D08: - ldr r1, _08176D18 + ldr r1, =0x0203bd28 movs r0, 0x1 strh r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_08176D14: .4byte 0x03005e00 -_08176D18: .4byte 0x0203bd28 + .pool thumb_func_end sub_8176CA0 thumb_func_start sub_8176D1C @@ -767133,13 +741218,13 @@ sub_8176D1C: @ 8176D1C lsrs r7, r1, 16 lsls r4, 16 lsrs r5, r4, 16 - ldr r0, _08176D6C + ldr r0, =0x085e5770 movs r6, 0xC0 lsls r6, 19 adds r3, r6 adds r1, r3, 0 bl LZ77UnCompVram - ldr r0, _08176D70 + ldr r0, =0x08dc3d54 adds r1, r5, 0 movs r2, 0x20 bl gpu_pal_apply @@ -767148,7 +741233,7 @@ sub_8176D1C: @ 8176D1C lsrs r4, 16 movs r1, 0 adds r4, 0x1 - ldr r2, _08176D74 + ldr r2, =0x000003ff _08176D52: lsls r0, r1, 1 adds r0, r7 @@ -767163,9 +741248,7 @@ _08176D52: pop {r0} bx r0 .align 2, 0 -_08176D6C: .4byte 0x085e5770 -_08176D70: .4byte 0x08dc3d54 -_08176D74: .4byte 0x000003ff + .pool thumb_func_end sub_8176D1C thumb_func_start sub_8176D78 @@ -767292,11 +741375,11 @@ sub_8176E40: @ 8176E40 lsls r1, 28 lsrs r1, 16 movs r2, 0 - ldr r7, _08176ED0 + ldr r7, =0x085e5bac movs r4, 0xC0 lsls r4, 19 adds r1, 0x1 - ldr r3, _08176ED4 + ldr r3, =0x000003ff _08176E5E: lsls r0, r2, 1 adds r0, r5 @@ -767313,13 +741396,13 @@ _08176E5E: movs r2, 0x7 adds r3, r5, 0 bl sub_8176DBC - ldr r0, _08176ED8 + ldr r0, =0x085e5bbb str r6, [sp] movs r1, 0x7 movs r2, 0x7 adds r3, r5, 0 bl sub_8176DBC - ldr r4, _08176EDC + ldr r4, =0x085e5bca str r6, [sp] adds r0, r4, 0 movs r1, 0xB @@ -767332,13 +741415,13 @@ _08176E5E: movs r2, 0x7 adds r3, r5, 0 bl sub_8176DBC - ldr r0, _08176EE0 + ldr r0, =0x085e5bd9 str r6, [sp] movs r1, 0x14 movs r2, 0x7 adds r3, r5, 0 bl sub_8176DBC - ldr r0, _08176EE4 + ldr r0, =0x085e5be8 str r6, [sp] movs r1, 0x18 movs r2, 0x7 @@ -767349,19 +741432,14 @@ _08176E5E: pop {r0} bx r0 .align 2, 0 -_08176ED0: .4byte 0x085e5bac -_08176ED4: .4byte 0x000003ff -_08176ED8: .4byte 0x085e5bbb -_08176EDC: .4byte 0x085e5bca -_08176EE0: .4byte 0x085e5bd9 -_08176EE4: .4byte 0x085e5be8 + .pool thumb_func_end sub_8176E40 thumb_func_start sub_8176EE8 sub_8176EE8: @ 8176EE8 push {r4,lr} adds r4, r0, 0 - ldr r0, _08176F00 + ldr r0, =0x0203bd28 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -767370,19 +741448,19 @@ sub_8176EE8: @ 8176EE8 bl obj_delete_and_free_tiles b _08176F88 .align 2, 0 -_08176F00: .4byte 0x0203bd28 + .pool _08176F04: movs r2, 0x2E ldrsh r0, [r4, r2] cmp r0, 0x5 bhi _08176F88 lsls r0, 2 - ldr r1, _08176F18 + ldr r1, =_08176F1C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08176F18: .4byte _08176F1C + .pool .align 2, 0 _08176F1C: .4byte _08176F34 @@ -767446,7 +741524,7 @@ _08176F88: sub_8176F90: @ 8176F90 push {r4,lr} adds r4, r0, 0 - ldr r0, _08176FA8 + ldr r0, =0x0203bd28 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -767455,7 +741533,7 @@ sub_8176F90: @ 8176F90 bl obj_delete_and_free_tiles b _08177048 .align 2, 0 -_08176FA8: .4byte 0x0203bd28 + .pool _08176FAC: movs r1, 0x2E ldrsh r0, [r4, r1] @@ -767502,13 +741580,13 @@ _08176FEE: subs r0, r2, 0x2 strh r0, [r4, 0x20] _08177000: - ldr r0, _0817700C + ldr r0, =0x0203bd26 ldrh r0, [r0] negs r0, r0 strh r0, [r4, 0x26] b _08177048 .align 2, 0 -_0817700C: .4byte 0x0203bd26 + .pool _08177010: ldrh r0, [r4, 0x3C] adds r0, 0x1 @@ -767549,7 +741627,7 @@ sub_8177050: @ 8177050 push {r4,r5,lr} sub sp, 0x4 adds r5, r0, 0 - ldr r0, _08177068 + ldr r0, =0x0203bd28 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -767558,7 +741636,7 @@ sub_8177050: @ 8177050 bl sub_818D820 b _0817721C .align 2, 0 -_08177068: .4byte 0x0203bd28 + .pool _0817706C: ldrh r0, [r5, 0x3C] adds r0, 0x1 @@ -767568,12 +741646,12 @@ _0817706C: cmp r0, 0xA bhi _081770B4 lsls r0, 2 - ldr r1, _08177084 + ldr r1, =_08177088 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08177084: .4byte _08177088 + .pool .align 2, 0 _08177088: .4byte _081770B4 @@ -767796,7 +741874,7 @@ sub_8177224: @ 8177224 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r6, _081772AC + ldr r6, =0x02020630 lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -767820,10 +741898,10 @@ sub_8177224: @ 8177224 adds r0, r6, 0 adds r0, 0x1C adds r1, r0 - ldr r0, _081772B0 + ldr r0, =sub_8177050 + 1 str r0, [r1] strh r4, [r2, 0x3A] - ldr r0, _081772B4 + ldr r0, =0x085e7068 movs r7, 0x20 ldrsh r1, [r2, r7] movs r3, 0x22 @@ -767847,16 +741925,14 @@ sub_8177224: @ 8177224 pop {r1} bx r1 .align 2, 0 -_081772AC: .4byte 0x02020630 -_081772B0: .4byte sub_8177050 + 1 -_081772B4: .4byte 0x085e7068 + .pool thumb_func_end sub_8177224 thumb_func_start sub_81772B8 sub_81772B8: @ 81772B8 push {r4,lr} adds r3, r0, 0 - ldr r4, _081772E4 + ldr r4, =0x02020630 movs r1, 0x2E ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -767867,7 +741943,7 @@ sub_81772B8: @ 81772B8 ldrsh r0, [r1, r2] cmp r0, 0xA beq _081772DC - ldr r0, _081772E8 + ldr r0, =0x0203bd28 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 @@ -767877,8 +741953,7 @@ _081772DC: bl obj_delete_and_free_tiles b _08177380 .align 2, 0 -_081772E4: .4byte 0x02020630 -_081772E8: .4byte 0x0203bd28 + .pool _081772EC: adds r0, r1, 0 adds r0, 0x3E @@ -767967,7 +742042,7 @@ sub_8177388: @ 8177388 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _08177420 + ldr r0, =0x00004023 bl var_get lsls r0, 16 lsrs r0, 16 @@ -767980,7 +742055,7 @@ sub_8177388: @ 8177388 mov r10, r0 movs r4, 0x1 movs r6, 0 - ldr r5, _08177424 + ldr r5, =0x00000181 _081773B4: adds r0, r4, 0 movs r1, 0x1 @@ -767988,7 +742063,7 @@ _081773B4: lsls r0, 24 cmp r0, 0 beq _081773D4 - ldr r0, _08177428 + ldr r0, =0x0203bce8 ldr r0, [r0] lsls r1, r6, 1 adds r0, 0x96 @@ -768004,8 +742079,8 @@ _081773D4: cmp r4, r5 bls _081773B4 adds r4, r6, 0 - ldr r0, _08177424 - ldr r1, _08177428 + ldr r0, =0x00000181 + ldr r1, =0x0203bce8 mov r8, r1 lsls r7, r4, 16 cmp r4, r0 @@ -768027,7 +742102,7 @@ _081773F2: _08177406: mov r2, r8 ldr r1, [r2] - ldr r2, _0817742C + ldr r2, =0x0000039a adds r0, r1, r2 strh r6, [r0] lsrs r0, r7, 16 @@ -768038,25 +742113,21 @@ _08177406: strh r6, [r0] b _08177436 .align 2, 0 -_08177420: .4byte 0x00004023 -_08177424: .4byte 0x00000181 -_08177428: .4byte 0x0203bce8 -_0817742C: .4byte 0x0000039a + .pool _08177430: adds r1, 0x94 movs r0, 0x47 strh r0, [r1] _08177436: movs r6, 0 - ldr r0, _08177444 + ldr r0, =0x0203bce8 mov r9, r0 - ldr r1, _08177448 + ldr r1, =0x0000039a mov r8, r1 movs r7, 0 b _08177450 .align 2, 0 -_08177444: .4byte 0x0203bce8 -_08177448: .4byte 0x0000039a + .pool _0817744C: cmp r6, 0x46 bhi _081774AC @@ -768107,7 +742178,7 @@ _081774A0: cmp r0, 0 bne _0817744C _081774AC: - ldr r1, _081774F4 + ldr r1, =0x0203bce8 ldr r2, [r1] adds r3, r2, 0 adds r3, 0x94 @@ -768147,7 +742218,7 @@ _081774EE: ldr r0, [r1] b _08177538 .align 2, 0 -_081774F4: .4byte 0x0203bce8 + .pool _081774F8: movs r4, 0 ldrh r0, [r2] @@ -768214,14 +742285,14 @@ sub_8177558: @ 8177558 lsls r0, 16 orrs r0, r4 bl sub_8177814 - ldr r0, _08177580 + ldr r0, =0x00004045 movs r1, 0 bl var_set pop {r4} pop {r0} bx r0 .align 2, 0 -_08177580: .4byte 0x00004045 + .pool thumb_func_end sub_8177558 thumb_func_start sub_8177584 @@ -768235,11 +742306,11 @@ sub_8177584: @ 8177584 subs r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _081775C0 + ldr r0, =0x0000ffff cmp r4, r0 beq _081775B4 - ldr r5, _081775C4 - ldr r3, _081775C8 + ldr r5, =0x41c64e6d + ldr r3, =0x00003039 adds r2, r0, 0 _081775A4: adds r0, r1, 0 @@ -768257,21 +742328,19 @@ _081775B4: pop {r0} bx r0 .align 2, 0 -_081775C0: .4byte 0x0000ffff -_081775C4: .4byte 0x41c64e6d -_081775C8: .4byte 0x00003039 + .pool thumb_func_end sub_8177584 thumb_func_start sub_81775CC sub_81775CC: @ 81775CC push {lr} bl sub_817783C - ldr r1, _081775DC + ldr r1, =0x020375f0 strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_081775DC: .4byte 0x020375f0 + .pool thumb_func_end sub_81775CC thumb_func_start sub_81775E0 @@ -768282,7 +742351,7 @@ sub_81775E0: @ 81775E0 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r1, _0817771C + ldr r1, =0x020375e0 movs r0, 0 strh r0, [r1] movs r0, 0 @@ -768294,7 +742363,7 @@ _081775FC: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _08177720 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -768310,14 +742379,14 @@ _081775FC: movs r1, 0x1 bl pokemon_getattr adds r1, r0, 0 - ldr r0, _08177724 + ldr r0, =0x020375f0 ldrh r0, [r0] lsls r1, 16 lsrs r1, 16 bl sub_817778C lsls r0, 24 lsrs r0, 24 - ldr r1, _0817771C + ldr r1, =0x020375e0 ldrh r2, [r1] cmp r0, r2 bls _0817764E @@ -768336,7 +742405,7 @@ _0817764E: bls _081775FC _08177658: movs r7, 0 - ldr r1, _08177728 + ldr r1, =0x03005d94 mov r9, r1 _0817765E: movs r6, 0 @@ -768377,14 +742446,14 @@ _0817766A: movs r1, 0x1 bl pokemon_getattr_encrypted adds r1, r0, 0 - ldr r0, _08177724 + ldr r0, =0x020375f0 ldrh r0, [r0] lsls r1, 16 lsrs r1, 16 bl sub_817778C lsls r0, 24 lsrs r0, 24 - ldr r1, _0817771C + ldr r1, =0x020375e0 ldrh r2, [r1] cmp r0, r2 bls _081776D2 @@ -768405,12 +742474,12 @@ _081776D2: lsrs r7, r0, 16 cmp r7, 0xD bls _0817765E - ldr r3, _0817771C + ldr r3, =0x020375e0 ldrh r0, [r3] cmp r0, 0 beq _0817776E - ldr r2, _0817772C - ldr r1, _08177730 + ldr r2, =0x020375e2 + ldr r1, =0x085e7080 subs r0, 0x1 lsls r0, 1 adds r0, r1 @@ -768419,32 +742488,25 @@ _081776D2: ldr r2, [sp] cmp r2, 0xE bne _0817773C - ldr r1, _08177734 + ldr r1, =0x020375e4 movs r0, 0 strh r0, [r1] movs r0, 0x64 ldr r1, [sp, 0x4] muls r0, r1 - ldr r1, _08177720 + ldr r1, =0x020244ec adds r0, r1 - ldr r2, _08177738 + ldr r2, =0x02021cc4 movs r1, 0x2 bl pokemon_getattr b _08177768 .align 2, 0 -_0817771C: .4byte 0x020375e0 -_08177720: .4byte 0x020244ec -_08177724: .4byte 0x020375f0 -_08177728: .4byte 0x03005d94 -_0817772C: .4byte 0x020375e2 -_08177730: .4byte 0x085e7080 -_08177734: .4byte 0x020375e4 -_08177738: .4byte 0x02021cc4 + .pool _0817773C: - ldr r1, _08177780 + ldr r1, =0x020375e4 movs r0, 0x1 strh r0, [r1] - ldr r2, _08177784 + ldr r2, =0x03005d94 ldr r1, [sp] lsls r0, r1, 2 adds r0, r1 @@ -768459,11 +742521,11 @@ _0817773C: adds r1, r2 lsls r1, 4 adds r0, r1 - ldr r2, _08177788 + ldr r2, =0x02021cc4 movs r1, 0x2 bl pokemon_getattr_encrypted _08177768: - ldr r0, _08177788 + ldr r0, =0x02021cc4 bl get_end_of_string_ptr_limit_10_chars _0817776E: add sp, 0x8 @@ -768475,9 +742537,7 @@ _0817776E: pop {r0} bx r0 .align 2, 0 -_08177780: .4byte 0x020375e4 -_08177784: .4byte 0x03005d94 -_08177788: .4byte 0x02021cc4 + .pool thumb_func_end sub_81775E0 thumb_func_start sub_817778C @@ -768494,9 +742554,9 @@ sub_817778C: @ 817778C movs r0, 0 mov r8, r0 movs r7, 0 - ldr r1, _0817780C + ldr r1, =0x0203bcec mov r10, r1 - ldr r0, _08177810 + ldr r0, =0x0203bcee mov r9, r0 _081777AC: adds r0, r6, 0 @@ -768544,8 +742604,7 @@ _081777FA: pop {r1} bx r1 .align 2, 0 -_0817780C: .4byte 0x0203bcec -_08177810: .4byte 0x0203bcee + .pool thumb_func_end sub_817778C thumb_func_start sub_8177814 @@ -768555,28 +742614,27 @@ sub_8177814: @ 8177814 lsrs r4, r1, 16 lsls r1, 16 lsrs r1, 16 - ldr r0, _08177834 + ldr r0, =0x0000404b bl var_set - ldr r0, _08177838 + ldr r0, =0x0000404c adds r1, r4, 0 bl var_set pop {r4} pop {r0} bx r0 .align 2, 0 -_08177834: .4byte 0x0000404b -_08177838: .4byte 0x0000404c + .pool thumb_func_end sub_8177814 thumb_func_start sub_817783C sub_817783C: @ 817783C push {r4,lr} - ldr r0, _0817785C + ldr r0, =0x0000404b bl var_get adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _08177860 + ldr r0, =0x0000404c bl var_get lsls r0, 16 orrs r0, r4 @@ -768584,8 +742642,7 @@ sub_817783C: @ 817783C pop {r1} bx r1 .align 2, 0 -_0817785C: .4byte 0x0000404b -_08177860: .4byte 0x0000404c + .pool thumb_func_end sub_817783C thumb_func_start sub_8177864 @@ -768656,13 +742713,13 @@ sub_8177888: @ 8177888 add r1, sp, 0x4 movs r0, 0 strh r0, [r1] - ldr r1, _081779DC + ldr r1, =0x040000d4 add r0, sp, 0x4 str r0, [r1] movs r0, 0xC0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _081779E0 + ldr r0, =0x8100c000 str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r5, 0 @@ -768672,7 +742729,7 @@ sub_8177888: @ 8177888 movs r0, 0xE0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _081779E4 + ldr r0, =0x85000100 str r0, [r1, 0x8] ldr r0, [r1, 0x8] add r0, sp, 0x4 @@ -768681,7 +742738,7 @@ sub_8177888: @ 8177888 movs r0, 0xA0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _081779E8 + ldr r0, =0x81000200 str r0, [r1, 0x8] ldr r0, [r1, 0x8] bl remove_some_task @@ -768689,11 +742746,11 @@ sub_8177888: @ 8177888 bl reset_all_obj_data bl sub_80A1A74 bl gpu_pal_allocator_reset - ldr r0, _081779EC + ldr r0, =0x085e7088 movs r1, 0 movs r2, 0x40 bl gpu_pal_apply - ldr r4, _081779F0 + ldr r4, =0x0203bcf0 movs r0, 0x80 lsls r0, 5 bl malloc @@ -768701,7 +742758,7 @@ sub_8177888: @ 8177888 bl sub_8177B44 bl sub_8177B9C bl reset_temp_tile_data_buffers - ldr r1, _081779F4 + ldr r1, =0x085e7804 str r5, [sp] movs r0, 0x1 movs r2, 0 @@ -768713,8 +742770,8 @@ _0817797C: lsrs r5, r0, 24 cmp r5, 0 bne _0817797C - ldr r0, _081779F8 - ldr r1, _081779F0 + ldr r0, =0x085e70c8 + ldr r1, =0x0203bcf0 ldr r1, [r1] bl call_LZZUnCompWram movs r0, 0x1 @@ -768734,11 +742791,11 @@ _0817797C: bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, _081779FC + ldr r0, =sub_8177874 + 1 bl SetVBlankCallback - ldr r0, _08177A00 + ldr r0, =sub_8177A08 + 1 bl set_callback2 - ldr r0, _08177A04 + ldr r0, =sub_8177A20 + 1 movs r1, 0 bl AddTask add sp, 0xC @@ -768746,17 +742803,7 @@ _0817797C: pop {r0} bx r0 .align 2, 0 -_081779DC: .4byte 0x040000d4 -_081779E0: .4byte 0x8100c000 -_081779E4: .4byte 0x85000100 -_081779E8: .4byte 0x81000200 -_081779EC: .4byte 0x085e7088 -_081779F0: .4byte 0x0203bcf0 -_081779F4: .4byte 0x085e7804 -_081779F8: .4byte 0x085e70c8 -_081779FC: .4byte sub_8177874 + 1 -_08177A00: .4byte sub_8177A08 + 1 -_08177A04: .4byte sub_8177A20 + 1 + .pool thumb_func_end sub_8177888 thumb_func_start sub_8177A08 @@ -768775,26 +742822,24 @@ sub_8177A20: @ 8177A20 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _08177A44 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08177A40 - ldr r0, _08177A48 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 - ldr r0, _08177A4C + ldr r0, =sub_8177A50 + 1 str r0, [r1] _08177A40: pop {r0} bx r0 .align 2, 0 -_08177A44: .4byte 0x02037fd4 -_08177A48: .4byte 0x03005e00 -_08177A4C: .4byte sub_8177A50 + 1 + .pool thumb_func_end sub_8177A20 thumb_func_start sub_8177A50 @@ -768803,7 +742848,7 @@ sub_8177A50: @ 8177A50 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08177A8C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -768816,12 +742861,12 @@ sub_8177A50: @ 8177A50 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _08177A90 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _08177A94 + ldr r1, =sub_8177A98 + 1 str r1, [r0] _08177A82: add sp, 0x4 @@ -768829,9 +742874,7 @@ _08177A82: pop {r0} bx r0 .align 2, 0 -_08177A8C: .4byte 0x030022c0 -_08177A90: .4byte 0x03005e00 -_08177A94: .4byte sub_8177A98 + 1 + .pool thumb_func_end sub_8177A50 thumb_func_start sub_8177A98 @@ -768839,28 +742882,26 @@ sub_8177A98: @ 8177A98 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08177AC8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08177AC2 - ldr r0, _08177ACC + ldr r0, =0x0203bcf0 ldr r0, [r0] bl free bl Window_FreeMemory adds r0, r4, 0 bl remove_task - ldr r0, _08177AD0 + ldr r0, =sub_80861E8 + 1 bl set_callback2 _08177AC2: pop {r4} pop {r0} bx r0 .align 2, 0 -_08177AC8: .4byte 0x02037fd4 -_08177ACC: .4byte 0x0203bcf0 -_08177AD0: .4byte sub_80861E8 + 1 + .pool thumb_func_end sub_8177A98 thumb_func_start pokedex_diploma_something @@ -768874,23 +742915,22 @@ pokedex_diploma_something: @ 8177AD4 lsls r1, 1 movs r0, 0x14 bl lcd_io_set - ldr r0, _08177AF4 - ldr r1, _08177AF8 + ldr r0, =0x02021cc4 + ldr r1, =0x085ee855 bl gf_strcpy b _08177B0C .align 2, 0 -_08177AF4: .4byte 0x02021cc4 -_08177AF8: .4byte 0x085ee855 + .pool _08177AFC: movs r0, 0x14 movs r1, 0 bl lcd_io_set - ldr r0, _08177B34 - ldr r1, _08177B38 + ldr r0, =0x02021cc4 + ldr r1, =0x085ee84f bl gf_strcpy _08177B0C: - ldr r4, _08177B3C - ldr r1, _08177B40 + ldr r4, =0x02021fc4 + ldr r1, =0x085ee85e adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -768906,10 +742946,7 @@ _08177B0C: pop {r0} bx r0 .align 2, 0 -_08177B34: .4byte 0x02021cc4 -_08177B38: .4byte 0x085ee84f -_08177B3C: .4byte 0x02021fc4 -_08177B40: .4byte 0x085ee85e + .pool thumb_func_end pokedex_diploma_something thumb_func_start sub_8177B44 @@ -768917,11 +742954,11 @@ sub_8177B44: @ 8177B44 push {lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08177B94 + ldr r1, =0x085e81fc movs r0, 0 movs r2, 0x2 bl bg_vram_setup - ldr r0, _08177B98 + ldr r0, =0x0203bcf0 ldr r1, [r0] movs r0, 0x1 bl bg_set_tilemap @@ -768945,17 +742982,16 @@ sub_8177B44: @ 8177B44 pop {r0} bx r0 .align 2, 0 -_08177B94: .4byte 0x085e81fc -_08177B98: .4byte 0x0203bcf0 + .pool thumb_func_end sub_8177B44 thumb_func_start sub_8177B9C sub_8177B9C: @ 8177B9C push {lr} - ldr r0, _08177BC4 + ldr r0, =0x085e8204 bl Window_InitFromTemplates bl TextBox_ResetSomeField - ldr r0, _08177BC8 + ldr r0, =0x0860f074 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -768967,8 +743003,7 @@ sub_8177B9C: @ 8177B9C pop {r0} bx r0 .align 2, 0 -_08177BC4: .4byte 0x085e8204 -_08177BC8: .4byte 0x0860f074 + .pool thumb_func_end sub_8177B9C thumb_func_start sub_8177BCC @@ -768982,7 +743017,7 @@ sub_8177BCC: @ 8177BCC lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r1, _08177C10 + ldr r1, =0x085e8214 add r0, sp, 0x14 movs r2, 0x3 bl memcpy @@ -769005,17 +743040,17 @@ sub_8177BCC: @ 8177BCC pop {r0} bx r0 .align 2, 0 -_08177C10: .4byte 0x085e8214 + .pool thumb_func_end sub_8177BCC thumb_func_start sub_8177C14 sub_8177C14: @ 8177C14 push {r4,lr} - ldr r4, _08177C44 - ldr r0, _08177C48 + ldr r4, =0x0203bcf4 + ldr r0, =0x0000180c bl malloc_and_clear str r0, [r4] - ldr r0, _08177C4C + ldr r0, =0x0203ce7c ldrh r0, [r0] bl berryid_from_itemid ldr r1, [r4] @@ -769025,16 +743060,13 @@ sub_8177C14: @ 8177C14 lsls r2, 5 adds r1, r2 strh r0, [r1] - ldr r0, _08177C50 + ldr r0, =sub_8177C84 + 1 bl set_callback2 pop {r4} pop {r0} bx r0 .align 2, 0 -_08177C44: .4byte 0x0203bcf4 -_08177C48: .4byte 0x0000180c -_08177C4C: .4byte 0x0203ce7c -_08177C50: .4byte sub_8177C84 + 1 + .pool thumb_func_end sub_8177C14 thumb_func_start sub_8177C54 @@ -769087,7 +743119,7 @@ _08177CAA: sub_8177CB0: @ 8177CB0 push {lr} sub sp, 0x4 - ldr r0, _08177CD0 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -769097,13 +743129,12 @@ sub_8177CB0: @ 8177CB0 b _08177DF4 _08177CC4: lsls r0, 2 - ldr r1, _08177CD4 + ldr r1, =_08177CD8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08177CD0: .4byte 0x030022c0 -_08177CD4: .4byte _08177CD8 + .pool .align 2, 0 _08177CD8: .4byte _08177D18 @@ -769132,13 +743163,13 @@ _08177D26: b _08177DDC _08177D2C: bl sub_80A1A74 - ldr r2, _08177D3C + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 b _08177DDA .align 2, 0 -_08177D3C: .4byte 0x02037fd4 + .pool _08177D40: bl reset_all_obj_data b _08177DDC @@ -769154,16 +743185,15 @@ _08177D4C: b _08177DDC _08177D5C: bl sub_8177E14 - ldr r0, _08177D70 + ldr r0, =0x0203bcf4 ldr r0, [r0] - ldr r1, _08177D74 + ldr r1, =0x00001808 adds r0, r1 movs r1, 0 strh r1, [r0] b _08177DDC .align 2, 0 -_08177D70: .4byte 0x0203bcf4 -_08177D74: .4byte 0x00001808 + .pool _08177D78: bl sub_8177E88 lsls r0, 24 @@ -769187,12 +743217,12 @@ _08177D9C: bl sub_8178404 b _08177DDC _08177DA6: - ldr r0, _08177DB0 + ldr r0, =sub_8178654 + 1 movs r1, 0 bl AddTask b _08177DDC .align 2, 0 -_08177DB0: .4byte sub_8178654 + 1 + .pool _08177DB4: movs r0, 0x1 negs r0, r0 @@ -769208,14 +743238,14 @@ _08177DC2: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r2, _08177DEC + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 _08177DDA: strb r0, [r2, 0x8] _08177DDC: - ldr r1, _08177DF0 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -769224,18 +743254,16 @@ _08177DDC: strb r0, [r1] b _08177E0C .align 2, 0 -_08177DEC: .4byte 0x02037fd4 -_08177DF0: .4byte 0x030022c0 + .pool _08177DF4: - ldr r0, _08177E04 + ldr r0, =sub_8177C70 + 1 bl SetVBlankCallback - ldr r0, _08177E08 + ldr r0, =sub_8177C54 + 1 bl set_callback2 movs r0, 0x1 b _08177E0E .align 2, 0 -_08177E04: .4byte sub_8177C70 + 1 -_08177E08: .4byte sub_8177C54 + 1 + .pool _08177E0C: movs r0, 0 _08177E0E: @@ -769249,11 +743277,11 @@ sub_8177E14: @ 8177E14 push {r4,lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08177E80 + ldr r1, =0x085efcf0 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r4, _08177E84 + ldr r4, =0x0203bcf4 ldr r1, [r4] movs r0, 0x2 bl bg_set_tilemap @@ -769287,17 +743315,16 @@ sub_8177E14: @ 8177E14 pop {r0} bx r0 .align 2, 0 -_08177E80: .4byte 0x085efcf0 -_08177E84: .4byte 0x0203bcf4 + .pool thumb_func_end sub_8177E14 thumb_func_start sub_8177E88 sub_8177E88: @ 8177E88 push {r4-r7,lr} sub sp, 0x4 - ldr r1, _08177EA8 + ldr r1, =0x0203bcf4 ldr r0, [r1] - ldr r2, _08177EAC + ldr r2, =0x00001808 adds r0, r2 ldrh r0, [r0] adds r7, r1, 0 @@ -769306,14 +743333,12 @@ sub_8177E88: @ 8177E88 b _08177FEC _08177E9E: lsls r0, 2 - ldr r1, _08177EB0 + ldr r1, =_08177EB4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08177EA8: .4byte 0x0203bcf4 -_08177EAC: .4byte 0x00001808 -_08177EB0: .4byte _08177EB4 + .pool .align 2, 0 _08177EB4: .4byte _08177ECC @@ -769324,22 +743349,20 @@ _08177EB4: .4byte _08177FC8 _08177ECC: bl reset_temp_tile_data_buffers - ldr r1, _08177EEC + ldr r1, =0x08d9bb44 movs r0, 0 str r0, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r0, _08177EF0 + ldr r0, =0x0203bcf4 ldr r1, [r0] - ldr r0, _08177EF4 + ldr r0, =0x00001808 adds r1, r0 b _08177FD6 .align 2, 0 -_08177EEC: .4byte 0x08d9bb44 -_08177EF0: .4byte 0x0203bcf4 -_08177EF4: .4byte 0x00001808 + .pool _08177EF8: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -769348,41 +743371,39 @@ _08177EF8: bne _08177F06 b _08177FFC _08177F06: - ldr r0, _08177F14 - ldr r4, _08177F18 + ldr r0, =0x08d9bf98 + ldr r4, =0x0203bcf4 ldr r1, [r4] bl call_LZZUnCompWram ldr r1, [r4] b _08177FD2 .align 2, 0 -_08177F14: .4byte 0x08d9bf98 -_08177F18: .4byte 0x0203bcf4 + .pool _08177F1C: - ldr r0, _08177F34 + ldr r0, =0x08d9c13c ldr r1, [r7] movs r2, 0x80 lsls r2, 5 adds r1, r2 bl call_LZZUnCompWram ldr r1, [r7] - ldr r0, _08177F38 + ldr r0, =0x00001808 adds r1, r0 b _08177FD6 .align 2, 0 -_08177F34: .4byte 0x08d9c13c -_08177F38: .4byte 0x00001808 + .pool _08177F3C: - ldr r0, _08177F68 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 bne _08177F78 movs r2, 0 - ldr r6, _08177F6C + ldr r6, =0x0203bcf4 movs r5, 0x80 lsls r5, 4 - ldr r4, _08177F70 - ldr r3, _08177F74 + ldr r4, =0x00004042 + ldr r3, =0x000003ff _08177F52: ldr r0, [r6] lsls r1, r2, 1 @@ -769396,17 +743417,14 @@ _08177F52: bls _08177F52 b _08177F98 .align 2, 0 -_08177F68: .4byte 0x03005d90 -_08177F6C: .4byte 0x0203bcf4 -_08177F70: .4byte 0x00004042 -_08177F74: .4byte 0x000003ff + .pool _08177F78: movs r2, 0 - ldr r6, _08177F9C + ldr r6, =0x0203bcf4 movs r5, 0x80 lsls r5, 4 - ldr r4, _08177FA0 - ldr r3, _08177FA4 + ldr r4, =0x00005042 + ldr r3, =0x000003ff _08177F84: ldr r0, [r6] lsls r1, r2, 1 @@ -769422,30 +743440,26 @@ _08177F98: ldr r1, [r7] b _08177FD2 .align 2, 0 -_08177F9C: .4byte 0x0203bcf4 -_08177FA0: .4byte 0x00005042 -_08177FA4: .4byte 0x000003ff + .pool _08177FA8: - ldr r0, _08177FBC + ldr r0, =0x08d9bef0 movs r1, 0 movs r2, 0xC0 bl decompress_palette - ldr r0, _08177FC0 + ldr r0, =0x0203bcf4 ldr r1, [r0] - ldr r0, _08177FC4 + ldr r0, =0x00001808 adds r1, r0 b _08177FD6 .align 2, 0 -_08177FBC: .4byte 0x08d9bef0 -_08177FC0: .4byte 0x0203bcf4 -_08177FC4: .4byte 0x00001808 + .pool _08177FC8: - ldr r0, _08177FE0 + ldr r0, =0x0857fdec bl gpu_tile_obj_decompress_and_load - ldr r0, _08177FE4 + ldr r0, =0x0203bcf4 ldr r1, [r0] _08177FD2: - ldr r2, _08177FE8 + ldr r2, =0x00001808 adds r1, r2 _08177FD6: ldrh r0, [r1] @@ -769453,16 +743467,14 @@ _08177FD6: strh r0, [r1] b _08177FFC .align 2, 0 -_08177FE0: .4byte 0x0857fdec -_08177FE4: .4byte 0x0203bcf4 -_08177FE8: .4byte 0x00001808 + .pool _08177FEC: - ldr r0, _08177FF8 + ldr r0, =0x0857fdf4 bl gpu_pal_obj_decompress_and_apply movs r0, 0x1 b _08177FFE .align 2, 0 -_08177FF8: .4byte 0x0857fdf4 + .pool _08177FFC: movs r0, 0 _08177FFE: @@ -769475,10 +743487,10 @@ _08177FFE: thumb_func_start sub_8178008 sub_8178008: @ 8178008 push {r4,lr} - ldr r0, _08178044 + ldr r0, =0x085efd28 bl Window_InitFromTemplates bl TextBox_ResetSomeField - ldr r0, _08178048 + ldr r0, =0x085efd00 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -769500,8 +743512,7 @@ _08178020: pop {r0} bx r0 .align 2, 0 -_08178044: .4byte 0x085efd28 -_08178048: .4byte 0x085efd00 + .pool thumb_func_end sub_8178008 thumb_func_start sub_817804C @@ -769523,7 +743534,7 @@ sub_817804C: @ 817804C str r4, [sp, 0x4] lsls r4, r5, 1 adds r4, r5 - ldr r5, _0817808C + ldr r5, =0x085efd20 adds r4, r5 str r4, [sp, 0x8] lsls r6, 24 @@ -769537,7 +743548,7 @@ sub_817804C: @ 817804C pop {r0} bx r0 .align 2, 0 -_0817808C: .4byte 0x085efd20 + .pool thumb_func_end sub_817804C thumb_func_start sub_8178090 @@ -769546,7 +743557,7 @@ sub_8178090: @ 8178090 sub sp, 0x8 movs r0, 0 bl bg_get_tilemap - ldr r1, _081780EC + ldr r1, =0x0203bcf4 ldr r1, [r1] movs r2, 0x80 lsls r2, 5 @@ -769557,7 +743568,7 @@ sub_8178090: @ 8178090 movs r0, 0x3 movs r1, 0xFF bl Window_FastFillPixels - ldr r4, _081780F0 + ldr r4, =0x085e926b movs r0, 0x1 adds r1, r4, 0 movs r2, 0x40 @@ -769582,8 +743593,7 @@ sub_8178090: @ 8178090 pop {r0} bx r0 .align 2, 0 -_081780EC: .4byte 0x0203bcf4 -_081780F0: .4byte 0x085e926b + .pool thumb_func_end sub_8178090 thumb_func_start sub_81780F4 @@ -769602,7 +743612,7 @@ sub_81780F4: @ 81780F4 sub_8178110: @ 8178110 push {r4-r6,lr} sub sp, 0x8 - ldr r5, _08178160 + ldr r5, =0x0203bcf4 ldr r0, [r5] movs r4, 0xC0 lsls r4, 5 @@ -769610,18 +743620,18 @@ sub_8178110: @ 8178110 ldrb r0, [r0] bl sub_80E167C adds r6, r0, 0 - ldr r0, _08178164 + ldr r0, =0x02021cc4 ldr r1, [r5] adds r1, r4 ldrh r1, [r1] movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r0, _08178168 + ldr r0, =0x02021dc4 adds r1, r6, 0 bl gf_strcpy - ldr r4, _0817816C - ldr r1, _08178170 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9263 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0 @@ -769636,18 +743646,14 @@ sub_8178110: @ 8178110 pop {r0} bx r0 .align 2, 0 -_08178160: .4byte 0x0203bcf4 -_08178164: .4byte 0x02021cc4 -_08178168: .4byte 0x02021dc4 -_0817816C: .4byte 0x02021fc4 -_08178170: .4byte 0x085e9263 + .pool thumb_func_end sub_8178110 thumb_func_start sub_8178174 sub_8178174: @ 8178174 push {r4-r7,lr} sub sp, 0xC - ldr r0, _08178218 + ldr r0, =0x0203bcf4 ldr r0, [r0] movs r1, 0xC0 lsls r1, 5 @@ -769655,7 +743661,7 @@ sub_8178174: @ 8178174 ldrb r0, [r0] bl sub_80E167C adds r4, r0, 0 - ldr r2, _0817821C + ldr r2, =0x085e9225 movs r7, 0x1 str r7, [sp] movs r0, 0xFF @@ -769694,18 +743700,18 @@ _081781C8: movs r1, 0x64 bl __udivsi3 adds r5, r0, 0 - ldr r0, _08178220 + ldr r0, =0x02021cc4 adds r1, r5, 0 movs r2, 0 movs r3, 0x2 bl decimal_int_to_string - ldr r0, _08178224 + ldr r0, =0x02021dc4 adds r1, r4, 0 movs r2, 0 movs r3, 0x2 bl decimal_int_to_string - ldr r4, _08178228 - ldr r1, _0817822C + ldr r4, =0x02021fc4 + ldr r1, =0x085e9233 adds r0, r4, 0 bl ExpandTextCodes str r7, [sp] @@ -769718,14 +743724,9 @@ _081781C8: bl Print b _08178242 .align 2, 0 -_08178218: .4byte 0x0203bcf4 -_0817821C: .4byte 0x085e9225 -_08178220: .4byte 0x02021cc4 -_08178224: .4byte 0x02021dc4 -_08178228: .4byte 0x02021fc4 -_0817822C: .4byte 0x085e9233 + .pool _08178230: - ldr r2, _0817824C + ldr r2, =0x085e8d34 str r7, [sp] str r0, [sp, 0x4] str r0, [sp, 0x8] @@ -769739,14 +743740,14 @@ _08178242: pop {r0} bx r0 .align 2, 0 -_0817824C: .4byte 0x085e8d34 + .pool thumb_func_end sub_8178174 thumb_func_start itemid_copy_name itemid_copy_name: @ 8178250 push {r4-r6,lr} sub sp, 0xC - ldr r0, _081782A4 + ldr r0, =0x0203bcf4 ldr r0, [r0] movs r1, 0xC0 lsls r1, 5 @@ -769754,7 +743755,7 @@ itemid_copy_name: @ 8178250 ldrb r0, [r0] bl sub_80E167C adds r6, r0, 0 - ldr r2, _081782A8 + ldr r2, =0x085e922c movs r5, 0x11 str r5, [sp] movs r0, 0xFF @@ -769768,7 +743769,7 @@ itemid_copy_name: @ 8178250 ldrb r0, [r6, 0x7] cmp r0, 0 beq _081782B0 - ldr r0, _081782AC + ldr r0, =0x085efd50 ldrb r1, [r6, 0x7] subs r1, 0x1 lsls r1, 2 @@ -769783,11 +743784,9 @@ itemid_copy_name: @ 8178250 bl Print b _081782C2 .align 2, 0 -_081782A4: .4byte 0x0203bcf4 -_081782A8: .4byte 0x085e922c -_081782AC: .4byte 0x085efd50 + .pool _081782B0: - ldr r2, _081782CC + ldr r2, =0x085e8d34 str r5, [sp] str r0, [sp, 0x4] str r0, [sp, 0x8] @@ -769801,14 +743800,14 @@ _081782C2: pop {r0} bx r0 .align 2, 0 -_081782CC: .4byte 0x085e8d34 + .pool thumb_func_end itemid_copy_name thumb_func_start sub_81782D0 sub_81782D0: @ 81782D0 push {lr} sub sp, 0xC - ldr r0, _08178300 + ldr r0, =0x0203bcf4 ldr r0, [r0] movs r1, 0xC0 lsls r1, 5 @@ -769829,14 +743828,14 @@ sub_81782D0: @ 81782D0 pop {r0} bx r0 .align 2, 0 -_08178300: .4byte 0x0203bcf4 + .pool thumb_func_end sub_81782D0 thumb_func_start sub_8178304 sub_8178304: @ 8178304 push {lr} sub sp, 0xC - ldr r0, _08178334 + ldr r0, =0x0203bcf4 ldr r0, [r0] movs r1, 0xC0 lsls r1, 5 @@ -769857,13 +743856,13 @@ sub_8178304: @ 8178304 pop {r0} bx r0 .align 2, 0 -_08178334: .4byte 0x0203bcf4 + .pool thumb_func_end sub_8178304 thumb_func_start sub_8178338 sub_8178338: @ 8178338 push {r4,lr} - ldr r4, _08178364 + ldr r4, =0x0203bcf4 ldr r0, [r4] movs r1, 0xC0 lsls r1, 5 @@ -769876,38 +743875,35 @@ sub_8178338: @ 8178338 movs r2, 0x40 bl sub_80D50D4 ldr r1, [r4] - ldr r2, _08178368 + ldr r2, =0x00001802 adds r1, r2 strb r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_08178364: .4byte 0x0203bcf4 -_08178368: .4byte 0x00001802 + .pool thumb_func_end sub_8178338 thumb_func_start sub_817836C sub_817836C: @ 817836C push {lr} - ldr r0, _08178390 + ldr r0, =0x0203bcf4 ldr r0, [r0] - ldr r1, _08178394 + ldr r1, =0x00001802 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08178398 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles bl sub_80D510C pop {r0} bx r0 .align 2, 0 -_08178390: .4byte 0x0203bcf4 -_08178394: .4byte 0x00001802 -_08178398: .4byte 0x02020630 + .pool thumb_func_end sub_817836C thumb_func_start sub_817839C @@ -769915,51 +743911,46 @@ sub_817839C: @ 817839C push {r4,lr} movs r0, 0x40 bl sub_80D518C - ldr r4, _081783EC + ldr r4, =0x0203bcf4 ldr r1, [r4] - ldr r2, _081783F0 + ldr r2, =0x00001803 adds r1, r2 strb r0, [r1] movs r0, 0x68 bl sub_80D518C ldr r1, [r4] - ldr r2, _081783F4 + ldr r2, =0x00001804 adds r1, r2 strb r0, [r1] movs r0, 0x90 bl sub_80D518C ldr r1, [r4] - ldr r2, _081783F8 + ldr r2, =0x00001805 adds r1, r2 strb r0, [r1] movs r0, 0xB8 bl sub_80D518C ldr r1, [r4] - ldr r2, _081783FC + ldr r2, =0x00001806 adds r1, r2 strb r0, [r1] movs r0, 0xE0 bl sub_80D518C ldr r1, [r4] - ldr r2, _08178400 + ldr r2, =0x00001807 adds r1, r2 strb r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_081783EC: .4byte 0x0203bcf4 -_081783F0: .4byte 0x00001803 -_081783F4: .4byte 0x00001804 -_081783F8: .4byte 0x00001805 -_081783FC: .4byte 0x00001806 -_08178400: .4byte 0x00001807 + .pool thumb_func_end sub_817839C thumb_func_start sub_8178404 sub_8178404: @ 8178404 push {r4,r5,lr} - ldr r4, _0817843C + ldr r4, =0x0203bcf4 ldr r0, [r4] movs r1, 0xC0 lsls r1, 5 @@ -769970,9 +743961,9 @@ sub_8178404: @ 8178404 ldrb r0, [r5, 0x15] cmp r0, 0 beq _08178448 - ldr r3, _08178440 + ldr r3, =0x02020630 ldr r0, [r4] - ldr r1, _08178444 + ldr r1, =0x00001803 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -769986,13 +743977,11 @@ sub_8178404: @ 8178404 ands r1, r2 b _08178462 .align 2, 0 -_0817843C: .4byte 0x0203bcf4 -_08178440: .4byte 0x02020630 -_08178444: .4byte 0x00001803 + .pool _08178448: - ldr r3, _0817848C + ldr r3, =0x02020630 ldr r0, [r4] - ldr r1, _08178490 + ldr r1, =0x00001803 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -770009,9 +743998,9 @@ _08178462: ldrb r0, [r5, 0x16] cmp r0, 0 beq _0817849C - ldr r3, _08178494 + ldr r3, =0x0203bcf4 ldr r0, [r3] - ldr r1, _08178498 + ldr r1, =0x00001804 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -770025,14 +744014,11 @@ _08178462: ands r1, r2 b _081784B6 .align 2, 0 -_0817848C: .4byte 0x02020630 -_08178490: .4byte 0x00001803 -_08178494: .4byte 0x0203bcf4 -_08178498: .4byte 0x00001804 + .pool _0817849C: - ldr r3, _081784DC + ldr r3, =0x0203bcf4 ldr r0, [r3] - ldr r1, _081784E0 + ldr r1, =0x00001804 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -770049,7 +744035,7 @@ _081784B6: cmp r0, 0 beq _081784E8 ldr r0, [r3] - ldr r1, _081784E4 + ldr r1, =0x00001805 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -770063,12 +744049,10 @@ _081784B6: ands r1, r2 b _08178500 .align 2, 0 -_081784DC: .4byte 0x0203bcf4 -_081784E0: .4byte 0x00001804 -_081784E4: .4byte 0x00001805 + .pool _081784E8: ldr r0, [r3] - ldr r1, _08178524 + ldr r1, =0x00001805 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -770085,7 +744069,7 @@ _08178500: cmp r0, 0 beq _0817852C ldr r0, [r3] - ldr r1, _08178528 + ldr r1, =0x00001806 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -770099,11 +744083,10 @@ _08178500: ands r1, r2 b _08178544 .align 2, 0 -_08178524: .4byte 0x00001805 -_08178528: .4byte 0x00001806 + .pool _0817852C: ldr r0, [r3] - ldr r1, _08178568 + ldr r1, =0x00001806 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -770120,7 +744103,7 @@ _08178544: cmp r0, 0 beq _08178570 ldr r0, [r3] - ldr r1, _0817856C + ldr r1, =0x00001807 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -770134,11 +744117,10 @@ _08178544: ands r1, r2 b _08178588 .align 2, 0 -_08178568: .4byte 0x00001806 -_0817856C: .4byte 0x00001807 + .pool _08178570: ldr r0, [r3] - ldr r1, _08178590 + ldr r1, =0x00001807 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -770155,7 +744137,7 @@ _08178588: pop {r0} bx r0 .align 2, 0 -_08178590: .4byte 0x00001807 + .pool thumb_func_end sub_8178404 thumb_func_start sub_8178594 @@ -770163,16 +744145,16 @@ sub_8178594: @ 8178594 push {r4,lr} movs r4, 0 _08178598: - ldr r0, _081785C4 + ldr r0, =0x0203bcf4 ldr r0, [r0] - ldr r1, _081785C8 + ldr r1, =0x00001803 adds r0, r1 adds r0, r4 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081785CC + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -770184,9 +744166,7 @@ _08178598: pop {r0} bx r0 .align 2, 0 -_081785C4: .4byte 0x0203bcf4 -_081785C8: .4byte 0x00001803 -_081785CC: .4byte 0x02020630 + .pool thumb_func_end sub_8178594 thumb_func_start sub_81785D0 @@ -770205,20 +744185,19 @@ sub_81785D0: @ 81785D0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _08178608 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0817860C + ldr r1, =sub_8178610 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_08178608: .4byte 0x03005e00 -_0817860C: .4byte sub_8178610 + 1 + .pool thumb_func_end sub_81785D0 thumb_func_start sub_8178610 @@ -770226,7 +744205,7 @@ sub_8178610: @ 8178610 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _08178648 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -770234,11 +744213,11 @@ sub_8178610: @ 8178610 bne _08178642 bl sub_817836C bl sub_8178594 - ldr r0, _0817864C + ldr r0, =0x0203bcf4 ldr r0, [r0] bl free bl Window_FreeMemory - ldr r0, _08178650 + ldr r0, =sub_81AD40C + 1 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -770247,9 +744226,7 @@ _08178642: pop {r0} bx r0 .align 2, 0 -_08178648: .4byte 0x02037fd4 -_0817864C: .4byte 0x0203bcf4 -_08178650: .4byte sub_81AD40C + 1 + .pool thumb_func_end sub_8178610 thumb_func_start sub_8178654 @@ -770258,13 +744235,13 @@ sub_8178654: @ 8178654 lsls r0, 24 lsrs r2, r0, 24 adds r4, r2, 0 - ldr r0, _08178680 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081786A6 - ldr r3, _08178684 + ldr r3, =0x030022c0 ldrh r0, [r3, 0x30] movs r1, 0xF0 ands r1, r0 @@ -770276,8 +744253,7 @@ sub_8178654: @ 8178654 bl sub_81786AC b _081786A6 .align 2, 0 -_08178680: .4byte 0x02037fd4 -_08178684: .4byte 0x030022c0 + .pool _08178688: cmp r1, 0x80 bne _08178696 @@ -770308,9 +744284,9 @@ sub_81786AC: @ 81786AC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r2, _081786EC + ldr r2, =0x03005e08 adds r4, r0, r2 - ldr r2, _081786F0 + ldr r2, =0x0203ce58 ldrh r0, [r2, 0xE] ldrh r2, [r2, 0x18] adds r0, r2 @@ -770333,8 +744309,7 @@ sub_81786AC: @ 81786AC movs r0, 0x2 b _081786F6 .align 2, 0 -_081786EC: .4byte 0x03005e08 -_081786F0: .4byte 0x0203ce58 + .pool _081786F4: movs r0, 0x1 _081786F6: @@ -770346,26 +744321,25 @@ _081786F6: lsls r0, r7, 24 asrs r0, 24 bl sub_8178728 - ldr r1, _08178720 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _08178724 + ldr r1, =sub_81787AC + 1 str r1, [r0] _08178718: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08178720: .4byte 0x03005e00 -_08178724: .4byte sub_81787AC + 1 + .pool thumb_func_end sub_81786AC thumb_func_start sub_8178728 sub_8178728: @ 8178728 push {r4-r6,lr} - ldr r5, _0817875C + ldr r5, =0x0203ce70 adds r6, r5, 0 subs r6, 0xA lsls r0, 24 @@ -770390,7 +744364,7 @@ _08178752: strh r0, [r6] b _0817877A .align 2, 0 -_0817875C: .4byte 0x0203ce70 + .pool _08178760: ldrh r0, [r5] b _08178776 @@ -770419,7 +744393,7 @@ _0817877A: lsls r0, 16 lsrs r0, 16 bl berryid_from_itemid - ldr r1, _081787A8 + ldr r1, =0x0203bcf4 ldr r1, [r1] lsls r0, 24 lsrs r0, 24 @@ -770431,7 +744405,7 @@ _0817877A: pop {r0} bx r0 .align 2, 0 -_081787A8: .4byte 0x0203bcf4 + .pool thumb_func_end sub_8178728 thumb_func_start sub_81787AC @@ -770445,7 +744419,7 @@ sub_81787AC: @ 81787AC lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _081787F0 + ldr r1, =0x03005e08 adds r6, r0, r1 ldrh r0, [r6] adds r0, 0x10 @@ -770470,7 +744444,7 @@ sub_81787AC: @ 81787AC beq _08178898 b _081788A6 .align 2, 0 -_081787F0: .4byte 0x03005e08 + .pool _081787F4: cmp r0, 0x50 beq _0817888E @@ -770584,10 +744558,10 @@ _081788A6: _081788B8: ldrh r5, [r6] _081788BA: - ldr r2, _0817892C - ldr r3, _08178930 + ldr r2, =0x02020630 + ldr r3, =0x0203bcf4 ldr r0, [r3] - ldr r1, _08178934 + ldr r1, =0x00001802 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -770597,7 +744571,7 @@ _081788BA: strh r5, [r0, 0x26] movs r4, 0 adds r7, r2, 0 - ldr r2, _08178938 + ldr r2, =0x00001803 _081788D6: ldr r0, [r3] adds r0, r2 @@ -770627,13 +744601,13 @@ _081788D6: ldrsh r0, [r6, r2] cmp r0, 0 bne _08178922 - ldr r0, _0817893C + ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 add r1, r8 lsls r1, 3 adds r1, r0 - ldr r0, _08178940 + ldr r0, =sub_8178654 + 1 str r0, [r1] _08178922: pop {r3} @@ -770642,12 +744616,7 @@ _08178922: pop {r0} bx r0 .align 2, 0 -_0817892C: .4byte 0x02020630 -_08178930: .4byte 0x0203bcf4 -_08178934: .4byte 0x00001802 -_08178938: .4byte 0x00001803 -_0817893C: .4byte 0x03005e00 -_08178940: .4byte sub_8178654 + 1 + .pool thumb_func_end sub_81787AC thumb_func_start sub_8178944 @@ -770664,7 +744633,7 @@ sub_8178944: @ 8178944 sub_8178958: @ 8178958 push {lr} movs r2, 0 - ldr r1, _08178970 + ldr r1, =0x020229e8 ldrh r0, [r1, 0x1A] ldrh r1, [r1, 0x36] cmp r0, r1 @@ -770675,7 +744644,7 @@ _08178968: pop {r1} bx r1 .align 2, 0 -_08178970: .4byte 0x020229e8 + .pool thumb_func_end sub_8178958 thumb_func_start sub_8178974 @@ -770685,15 +744654,15 @@ sub_8178974: @ 8178974 bl reset_all_obj_data bl gpu_pal_allocator_reset bl clear_tasks - ldr r0, _08178A2C + ldr r0, =sub_8178944 + 1 bl SetVBlankCallback movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08178A30 + ldr r1, =0x085efd64 movs r0, 0 movs r2, 0x1 bl bg_vram_setup - ldr r0, _08178A34 + ldr r0, =0x085efd68 bl Window_InitFromTemplates lsls r0, 16 cmp r0, 0 @@ -770730,7 +744699,7 @@ _081789AC: movs r0, 0x50 movs r1, 0 bl lcd_io_set - ldr r0, _08178A38 + ldr r0, =sub_8009404 + 1 movs r1, 0 bl AddTask bl sub_80A2F30 @@ -770743,7 +744712,7 @@ _081789AC: movs r1, 0 movs r2, 0x2 bl rboxid_80040B8 - ldr r0, _08178A3C + ldr r0, =sub_8178A78 + 1 bl set_callback2 _08178A22: add sp, 0x8 @@ -770751,11 +744720,7 @@ _08178A22: pop {r0} bx r0 .align 2, 0 -_08178A2C: .4byte sub_8178944 + 1 -_08178A30: .4byte 0x085efd64 -_08178A34: .4byte 0x085efd68 -_08178A38: .4byte sub_8009404 + 1 -_08178A3C: .4byte sub_8178A78 + 1 + .pool thumb_func_end sub_8178974 thumb_func_start sub_8178A40 @@ -770766,7 +744731,7 @@ sub_8178A40: @ 8178A40 movs r5, 0x1 cmp r4, 0 bne _08178A54 - ldr r1, _08178A70 + ldr r1, =0x085ee80a bl gf_strcpy movs r5, 0 _08178A54: @@ -770776,7 +744741,7 @@ _08178A54: _08178A5A: cmp r4, 0x1 bne _08178A66 - ldr r1, _08178A74 + ldr r1, =0x085ee827 adds r0, r6, 0 bl gf_strcpy _08178A66: @@ -770785,15 +744750,14 @@ _08178A66: pop {r1} bx r1 .align 2, 0 -_08178A70: .4byte 0x085ee80a -_08178A74: .4byte 0x085ee827 + .pool thumb_func_end sub_8178A40 thumb_func_start sub_8178A78 sub_8178A78: @ 8178A78 push {r4-r6,lr} sub sp, 0x8 - ldr r1, _08178A98 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -770804,13 +744768,12 @@ sub_8178A78: @ 8178A78 b _08178E58 _08178A8E: lsls r0, 2 - ldr r1, _08178A9C + ldr r1, =_08178AA0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08178A98: .4byte 0x030022c0 -_08178A9C: .4byte _08178AA0 + .pool .align 2, 0 _08178AA0: .4byte _08178AE4 @@ -770851,7 +744814,7 @@ _08178AE4: movs r3, 0 b _08178E30 _08178B12: - ldr r0, _08178B3C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -770859,22 +744822,20 @@ _08178B12: beq _08178B20 b _08178E58 _08178B20: - ldr r1, _08178B40 + ldr r1, =0x085ee765 movs r0, 0x1 str r0, [sp] movs r0, 0 movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r1, _08178B44 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _08178E3C .align 2, 0 -_08178B3C: .4byte 0x02037fd4 -_08178B40: .4byte 0x085ee765 -_08178B44: .4byte 0x030022c0 + .pool _08178B48: movs r0, 0 bl a_pressed_maybe @@ -770883,25 +744844,23 @@ _08178B48: beq _08178B56 b _08178E58 _08178B56: - ldr r1, _08178B74 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - ldr r1, _08178B78 - ldr r2, _08178B7C + ldr r1, =0x020229c6 + ldr r2, =0x00005501 adds r0, r2, 0 strh r0, [r1] bl sub_8009734 b _08178E58 .align 2, 0 -_08178B74: .4byte 0x030022c0 -_08178B78: .4byte 0x020229c6 -_08178B7C: .4byte 0x00005501 + .pool _08178B80: - ldr r0, _08178BC0 + ldr r0, =0x030030e0 ldr r1, [r0] movs r0, 0x20 ands r0, r1 @@ -770917,14 +744876,14 @@ _08178B8E: _08178B98: movs r0, 0x15 bl audio_play - ldr r1, _08178BC4 + ldr r1, =0x085ee788 movs r0, 0x1 str r0, [sp] movs r0, 0 movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r1, _08178BC8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -770933,9 +744892,7 @@ _08178B98: strb r0, [r1] b _08178D00 .align 2, 0 -_08178BC0: .4byte 0x030030e0 -_08178BC4: .4byte 0x085ee788 -_08178BC8: .4byte 0x030022c0 + .pool _08178BCC: movs r0, 0 bl a_pressed_maybe @@ -770951,7 +744908,7 @@ _08178BDC: lsrs r2, r0, 24 cmp r2, 0x2 bne _08178CD0 - ldr r4, _08178C30 + ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 @@ -770965,7 +744922,7 @@ _08178BDC: movs r2, 0x1 movs r3, 0xD bl SetWindowBorderStyle - ldr r1, _08178C34 + ldr r1, =0x085ee7bf movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -770982,8 +744939,7 @@ _08178BDC: adds r1, r4, r2 b _08178E3C .align 2, 0 -_08178C30: .4byte 0x030022c0 -_08178C34: .4byte 0x085ee7bf + .pool _08178C38: adds r0, r2, 0 ands r0, r1 @@ -771003,7 +744959,7 @@ _08178C54: lsls r0, 24 cmp r0, 0 beq _08178D00 - ldr r0, _08178CA0 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _08178C68 @@ -771017,7 +744973,7 @@ _08178C68: cmp r0, 0x3 bne _08178CAC bl sub_800AC34 - ldr r4, _08178CA4 + ldr r4, =0x02021fc4 adds r0, r4, 0 movs r1, 0x1 bl sub_8178A40 @@ -771028,21 +744984,19 @@ _08178C68: movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r0, _08178CA8 + ldr r0, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r2 b _08178CF2 .align 2, 0 -_08178CA0: .4byte 0x03003124 -_08178CA4: .4byte 0x02021fc4 -_08178CA8: .4byte 0x030022c0 + .pool _08178CAC: bl sub_8178958 lsls r0, 24 cmp r0, 0 beq _08178CCC - ldr r1, _08178CC8 + ldr r1, =0x085ee7ce movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -771051,11 +745005,11 @@ _08178CAC: bl sub_8178EC4 b _08178E34 .align 2, 0 -_08178CC8: .4byte 0x085ee7ce + .pool _08178CCC: bl sub_80097E8 _08178CD0: - ldr r4, _08178CF8 + ldr r4, =0x02021fc4 adds r0, r4, 0 movs r1, 0x1 bl sub_8178A40 @@ -771066,7 +745020,7 @@ _08178CD0: movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r0, _08178CFC + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -771075,10 +745029,9 @@ _08178CF2: strb r1, [r0] b _08178E58 .align 2, 0 -_08178CF8: .4byte 0x02021fc4 -_08178CFC: .4byte 0x030022c0 + .pool _08178D00: - ldr r4, _08178D24 + ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r0, 0x2 ands r0, r1 @@ -771097,7 +745050,7 @@ _08178D1E: strb r0, [r1] b _08178E58 .align 2, 0 -_08178D24: .4byte 0x030022c0 + .pool _08178D28: movs r0, 0 bl a_pressed_maybe @@ -771115,13 +745068,13 @@ _08178D38: b _08178E58 _08178D44: bl sub_800A5B4 - ldr r1, _08178D54 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _08178E3C .align 2, 0 -_08178D54: .4byte 0x030022c0 + .pool _08178D58: movs r0, 0x87 lsls r0, 3 @@ -771129,30 +745082,30 @@ _08178D58: b _08178E3C _08178D60: bl sub_800AC34 - ldr r1, _08178D70 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _08178E3C .align 2, 0 -_08178D70: .4byte 0x030022c0 + .pool _08178D74: - ldr r0, _08178DAC + ldr r0, =0x03003124 ldrb r6, [r0] cmp r6, 0 bne _08178E58 - ldr r5, _08178DB0 + ldr r5, =0x0201c000 adds r0, r5, 0 bl sub_81538A0 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 str r6, [sp, 0x4] - ldr r2, _08178DB4 + ldr r2, =0x050001f5 add r0, sp, 0x4 adds r1, r5, 0 bl CpuSet - ldr r0, _08178DB8 + ldr r0, =0x02021fc4 adds r1, r4, 0 bl sub_8178A40 lsls r0, 24 @@ -771162,26 +745115,22 @@ _08178D74: bl save_game_when_memory_present b _08178E34 .align 2, 0 -_08178DAC: .4byte 0x03003124 -_08178DB0: .4byte 0x0201c000 -_08178DB4: .4byte 0x050001f5 -_08178DB8: .4byte 0x02021fc4 + .pool _08178DBC: - ldr r1, _08178DD8 + ldr r1, =0x02021fc4 movs r0, 0x1 str r0, [sp] movs r0, 0 movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r1, _08178DDC + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _08178E3C .align 2, 0 -_08178DD8: .4byte 0x02021fc4 -_08178DDC: .4byte 0x030022c0 + .pool _08178DE0: movs r0, 0 bl a_pressed_maybe @@ -771189,19 +745138,18 @@ _08178DE0: lsrs r2, r0, 16 cmp r2, 0 bne _08178E58 - ldr r0, _08178E04 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 ldrb r1, [r0] adds r1, 0x1 strb r1, [r0] - ldr r0, _08178E08 + ldr r0, =0x0203bcf8 strb r2, [r0] b _08178E58 .align 2, 0 -_08178E04: .4byte 0x030022c0 -_08178E08: .4byte 0x0203bcf8 + .pool _08178E0C: ldrh r1, [r4, 0x2E] movs r0, 0x1 @@ -771224,7 +745172,7 @@ _08178E24: _08178E30: bl sub_80A1AD4 _08178E34: - ldr r1, _08178E44 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -771234,9 +745182,9 @@ _08178E3C: strb r0, [r1] b _08178E58 .align 2, 0 -_08178E44: .4byte 0x030022c0 + .pool _08178E48: - ldr r0, _08178EB4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -771244,7 +745192,7 @@ _08178E48: bne _08178E58 bl do_reset _08178E58: - ldr r0, _08178EB8 + ldr r0, =0x030030e0 ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -771255,7 +745203,7 @@ _08178E58: cmp r0, 0 bne _08178E98 bl sub_80097E8 - ldr r4, _08178EBC + ldr r4, =0x02021fc4 adds r0, r4, 0 movs r1, 0x1 bl sub_8178A40 @@ -771266,7 +745214,7 @@ _08178E58: movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - ldr r0, _08178EC0 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -771283,10 +745231,7 @@ _08178E98: pop {r0} bx r0 .align 2, 0 -_08178EB4: .4byte 0x02037fd4 -_08178EB8: .4byte 0x030030e0 -_08178EBC: .4byte 0x02021fc4 -_08178EC0: .4byte 0x030022c0 + .pool thumb_func_end sub_8178A78 thumb_func_start sub_8178EC4 @@ -771370,7 +745315,7 @@ sub_8178F44: @ 8178F44 strb r0, [r1, 0x1] movs r0, 0x3 strb r0, [r1, 0x2] - ldr r0, _08178F8C + ldr r0, =0x0203bd0e ldrb r0, [r0] lsls r4, 27 lsrs r4, 24 @@ -771391,7 +745336,7 @@ sub_8178F44: @ 8178F44 pop {r0} bx r0 .align 2, 0 -_08178F8C: .4byte 0x0203bd0e + .pool thumb_func_end sub_8178F44 thumb_func_start fullscreen_save_activate @@ -771400,26 +745345,23 @@ fullscreen_save_activate: @ 8178F90 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _08178FB8 + ldr r0, =sub_8178FDC + 1 bl set_callback2 - ldr r0, _08178FBC + ldr r0, =0x0203bcfc strh r4, [r0] - ldr r1, _08178FC0 + ldr r1, =0x0203bcfe movs r2, 0 movs r0, 0 strh r0, [r1] strh r0, [r1, 0x2] - ldr r0, _08178FC4 + ldr r0, =0x0203bd0e strb r2, [r0] strb r2, [r0, 0x1] pop {r4} pop {r0} bx r0 .align 2, 0 -_08178FB8: .4byte sub_8178FDC + 1 -_08178FBC: .4byte 0x0203bcfc -_08178FC0: .4byte 0x0203bcfe -_08178FC4: .4byte 0x0203bd0e + .pool thumb_func_end fullscreen_save_activate thumb_func_start sub_8178FC8 @@ -771438,7 +745380,7 @@ sub_8178FDC: @ 8178FDC mov r7, r8 push {r7} sub sp, 0xC - ldr r0, _081791F4 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r7, r0, r1 @@ -771493,12 +745435,12 @@ _08178FF8: add r1, sp, 0x4 movs r0, 0 strh r0, [r1] - ldr r2, _081791F8 + ldr r2, =0x040000d4 str r1, [r2] movs r1, 0xC0 lsls r1, 19 str r1, [r2, 0x4] - ldr r0, _081791FC + ldr r0, =0x8100c000 str r0, [r2, 0x8] ldr r0, [r2, 0x8] movs r3, 0 @@ -771509,7 +745451,7 @@ _08178FF8: movs r0, 0xE0 lsls r0, 19 str r0, [r2, 0x4] - ldr r0, _08179200 + ldr r0, =0x85000100 str r0, [r2, 0x8] ldr r0, [r2, 0x8] add r0, sp, 0x4 @@ -771519,37 +745461,37 @@ _08178FF8: movs r0, 0xA0 lsls r0, 19 str r0, [r2, 0x4] - ldr r0, _08179204 + ldr r0, =0x81000200 str r0, [r2, 0x8] ldr r0, [r2, 0x8] - ldr r0, _08179208 + ldr r0, =0x085b0e04 bl LZ77UnCompVram - ldr r0, _0817920C - ldr r1, _08179210 + ldr r0, =0x085b0a80 + ldr r1, =0x06007000 bl LZ77UnCompVram - ldr r0, _08179214 - ldr r1, _08179218 + ldr r0, =0x085b0c0c + ldr r1, =0x06007800 bl LZ77UnCompVram - ldr r0, _0817921C - ldr r1, _08179220 + ldr r0, =0x085efde4 + ldr r1, =0x06010020 bl LZ77UnCompVram movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08179224 + ldr r1, =0x085efd88 movs r0, 0 movs r2, 0x3 bl bg_vram_setup - ldr r5, _08179228 + ldr r5, =0x0201e000 movs r0, 0 adds r1, r5, 0 bl bg_set_tilemap mov r0, r8 str r0, [sp, 0x8] - ldr r2, _0817922C + ldr r2, =0x05000200 adds r0, r4, 0 adds r1, r5, 0 bl CpuSet - ldr r1, _08179230 + ldr r1, =0x0850e87c movs r2, 0x90 lsls r2, 1 movs r6, 0x85 @@ -771557,11 +745499,11 @@ _08178FF8: movs r0, 0 adds r3, r6, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r0, _08179234 + ldr r0, =0x085efd94 bl Window_InitFromTemplates - ldr r0, _08179238 + ldr r0, =0x085efd9c bl Window_AddFromTemplateWithoutAllocatingMemory - ldr r4, _0817923C + ldr r4, =0x0203bd0e strb r0, [r4] ldrb r0, [r4] movs r1, 0x80 @@ -771569,7 +745511,7 @@ _08178FF8: adds r2, r5, r1 movs r1, 0x7 bl Window_SetField - ldr r0, _08179240 + ldr r0, =0x085efda4 bl Window_AddFromTemplateWithoutAllocatingMemory strb r0, [r4, 0x1] ldrb r0, [r4, 0x1] @@ -771583,20 +745525,20 @@ _08178FF8: bl reset_all_obj_data bl clear_tasks bl sub_80A1A74 - ldr r0, _08179244 + ldr r0, =0x085b0a00 movs r1, 0 movs r2, 0x40 bl gpu_pal_apply - ldr r0, _08179248 + ldr r0, =0x085efdc4 movs r1, 0x80 lsls r1, 1 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0817924C + ldr r0, =0x0850fefc movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _08179250 + ldr r0, =0x0860f074 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -771622,7 +745564,7 @@ _08178FF8: ldrb r0, [r4] movs r1, 0x1 bl Window_CopyToVram - ldr r0, _08179254 + ldr r0, =0x085ec816 movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -771636,7 +745578,7 @@ _08178FF8: bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, _08179258 + ldr r0, =sub_8178FC8 + 1 bl SetVBlankCallback movs r1, 0x82 lsls r1, 5 @@ -771653,40 +745595,15 @@ _08178FF8: strb r0, [r7] b _08179272 .align 2, 0 -_081791F4: .4byte 0x030022c0 -_081791F8: .4byte 0x040000d4 -_081791FC: .4byte 0x8100c000 -_08179200: .4byte 0x85000100 -_08179204: .4byte 0x81000200 -_08179208: .4byte 0x085b0e04 -_0817920C: .4byte 0x085b0a80 -_08179210: .4byte 0x06007000 -_08179214: .4byte 0x085b0c0c -_08179218: .4byte 0x06007800 -_0817921C: .4byte 0x085efde4 -_08179220: .4byte 0x06010020 -_08179224: .4byte 0x085efd88 -_08179228: .4byte 0x0201e000 -_0817922C: .4byte 0x05000200 -_08179230: .4byte 0x0850e87c -_08179234: .4byte 0x085efd94 -_08179238: .4byte 0x085efd9c -_0817923C: .4byte 0x0203bd0e -_08179240: .4byte 0x085efda4 -_08179244: .4byte 0x085b0a00 -_08179248: .4byte 0x085efdc4 -_0817924C: .4byte 0x0850fefc -_08179250: .4byte 0x0860f074 -_08179254: .4byte 0x085ec816 -_08179258: .4byte sub_8178FC8 + 1 + .pool _0817925C: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 bne _08179272 - ldr r0, _08179280 + ldr r0, =sub_8179288 + 1 bl set_callback2 - ldr r0, _08179284 + ldr r0, =sub_8179454 + 1 bl SetVBlankCallback _08179272: add sp, 0xC @@ -771696,18 +745613,17 @@ _08179272: pop {r0} bx r0 .align 2, 0 -_08179280: .4byte sub_8179288 + 1 -_08179284: .4byte sub_8179454 + 1 + .pool thumb_func_end sub_8178FDC thumb_func_start sub_8179288 sub_8179288: @ 8179288 push {r4-r6,lr} movs r5, 0 - ldr r0, _08179300 + ldr r0, =0x0203bcfe movs r1, 0x1 strh r1, [r0] - ldr r1, _08179304 + ldr r1, =0x030061fc ldr r0, [r1] cmp r0, 0 beq _081792EC @@ -771718,15 +745634,15 @@ _0817929C: lsls r0, 24 cmp r0, 0 bne _08179348 - ldr r4, _08179308 + ldr r4, =0x0203bd0e ldrb r0, [r4] movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _0817930C + ldr r0, =0x085ec917 movs r1, 0x1 movs r2, 0 bl sub_8178F44 - ldr r0, _08179310 + ldr r0, =0x0203bcfc ldrb r0, [r0] bl calls_flash_erase_block_3 ldr r0, [r6] @@ -771735,7 +745651,7 @@ _0817929C: ldrb r0, [r4] movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _08179314 + ldr r0, =0x085ec816 movs r1, 0x1 movs r2, 0 bl sub_8178F44 @@ -771751,116 +745667,100 @@ _081792DC: _081792EC: cmp r5, 0x3 bne _0817931C - ldr r0, _08179308 + ldr r0, =0x0203bd0e ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _08179318 + ldr r0, =0x085ec86f b _08179330 .align 2, 0 -_08179300: .4byte 0x0203bcfe -_08179304: .4byte 0x030061fc -_08179308: .4byte 0x0203bd0e -_0817930C: .4byte 0x085ec917 -_08179310: .4byte 0x0203bcfc -_08179314: .4byte 0x085ec816 -_08179318: .4byte 0x085ec86f + .pool _0817931C: - ldr r0, _0817933C + ldr r0, =0x0203bd0e ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _08179340 + ldr r0, =0x03006214 ldr r0, [r0] cmp r0, 0 bne _08179370 - ldr r0, _08179344 + ldr r0, =0x085ec94f _08179330: movs r1, 0x1 movs r2, 0 bl sub_8178F44 b _0817937A .align 2, 0 -_0817933C: .4byte 0x0203bd0e -_08179340: .4byte 0x03006214 -_08179344: .4byte 0x085ec94f + .pool _08179348: - ldr r0, _08179364 + ldr r0, =0x0203bd0e ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _08179368 + ldr r0, =0x085ec86f movs r1, 0x1 movs r2, 0 bl sub_8178F44 - ldr r0, _0817936C + ldr r0, =sub_8179390 + 1 bl set_callback2 b _08179380 .align 2, 0 -_08179364: .4byte 0x0203bd0e -_08179368: .4byte 0x085ec86f -_0817936C: .4byte sub_8179390 + 1 + .pool _08179370: - ldr r0, _08179388 + ldr r0, =0x085ec9a2 movs r1, 0x1 movs r2, 0 bl sub_8178F44 _0817937A: - ldr r0, _0817938C + ldr r0, =sub_81793E0 + 1 bl set_callback2 _08179380: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08179388: .4byte 0x085ec9a2 -_0817938C: .4byte sub_81793E0 + 1 + .pool thumb_func_end sub_8179288 thumb_func_start sub_8179390 sub_8179390: @ 8179390 push {lr} - ldr r1, _081793C8 + ldr r1, =0x0203bcfe movs r0, 0 strh r0, [r1] - ldr r0, _081793CC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _081793C4 - ldr r0, _081793D0 + ldr r0, =0x0203bd0e ldrb r0, [r0] movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _081793D4 + ldr r0, =0x085ec8d4 movs r1, 0x1 movs r2, 0 bl sub_8178F44 - ldr r0, _081793D8 + ldr r0, =sub_8178FC8 + 1 bl SetVBlankCallback - ldr r0, _081793DC + ldr r0, =sub_81793E0 + 1 bl set_callback2 _081793C4: pop {r0} bx r0 .align 2, 0 -_081793C8: .4byte 0x0203bcfe -_081793CC: .4byte 0x030022c0 -_081793D0: .4byte 0x0203bd0e -_081793D4: .4byte 0x085ec8d4 -_081793D8: .4byte sub_8178FC8 + 1 -_081793DC: .4byte sub_81793E0 + 1 + .pool thumb_func_end sub_8179390 thumb_func_start sub_81793E0 sub_81793E0: @ 81793E0 push {lr} sub sp, 0x4 - ldr r0, _08179418 + ldr r0, =0x0203bcfe movs r2, 0 strh r2, [r0] - ldr r0, _0817941C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -771872,19 +745772,16 @@ sub_81793E0: @ 81793E0 movs r1, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _08179420 + ldr r0, =sub_8178FC8 + 1 bl SetVBlankCallback - ldr r0, _08179424 + ldr r0, =sub_8179428 + 1 bl set_callback2 _08179410: add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_08179418: .4byte 0x0203bcfe -_0817941C: .4byte 0x030022c0 -_08179420: .4byte sub_8178FC8 + 1 -_08179424: .4byte sub_8179428 + 1 + .pool thumb_func_end sub_81793E0 thumb_func_start sub_8179428 @@ -771895,14 +745792,14 @@ sub_8179428: @ 8179428 lsrs r4, r0, 24 cmp r4, 0 bne _0817944E - ldr r5, _08179444 + ldr r5, =0x03006214 ldr r0, [r5] cmp r0, 0 bne _08179448 bl do_reset b _0817944E .align 2, 0 -_08179444: .4byte 0x03006214 + .pool _08179448: bl set_callback2 str r4, [r5] @@ -771915,18 +745812,18 @@ _0817944E: thumb_func_start sub_8179454 sub_8179454: @ 8179454 push {r4,r5,lr} - ldr r5, _081794C4 + ldr r5, =0x030022c0 ldr r0, [r5, 0x24] lsrs r4, r0, 3 movs r0, 0x7 ands r4, r0 - ldr r0, _081794C8 + ldr r0, =0x085efd80 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r5, 0x38] str r1, [r5, 0x3C] ldrh r1, [r5, 0x3A] - ldr r0, _081794CC + ldr r0, =0xfffffe00 ands r0, r1 movs r1, 0x70 orrs r0, r1 @@ -771935,17 +745832,17 @@ sub_8179454: @ 8179454 adds r1, 0x38 movs r0, 0x48 strb r0, [r1] - ldr r0, _081794D0 + ldr r0, =0x0203bcfe ldrh r0, [r0] cmp r0, 0 beq _081794DC - ldr r3, _081794D4 + ldr r3, =0x085efdac lsls r2, r4, 1 adds r2, r4 adds r0, r2, r3 ldrb r4, [r0] ldrh r1, [r5, 0x3C] - ldr r0, _081794D8 + ldr r0, =0xfffffc00 ands r0, r1 orrs r0, r4 strh r0, [r5, 0x3C] @@ -771971,26 +745868,21 @@ sub_8179454: @ 8179454 strb r0, [r3] b _081794E8 .align 2, 0 -_081794C4: .4byte 0x030022c0 -_081794C8: .4byte 0x085efd80 -_081794CC: .4byte 0xfffffe00 -_081794D0: .4byte 0x0203bcfe -_081794D4: .4byte 0x085efdac -_081794D8: .4byte 0xfffffc00 + .pool _081794DC: ldrh r0, [r5, 0x3C] - ldr r1, _08179508 + ldr r1, =0xfffffc00 ands r1, r0 movs r0, 0x1 orrs r1, r0 strh r1, [r5, 0x3C] _081794E8: - ldr r0, _0817950C + ldr r0, =0x030022f8 movs r1, 0xE0 lsls r1, 19 movs r2, 0x1 bl CpuFastSet - ldr r1, _08179510 + ldr r1, =0x0203bcfe ldrh r0, [r1, 0x2] cmp r0, 0 beq _08179500 @@ -772001,9 +745893,7 @@ _08179500: pop {r0} bx r0 .align 2, 0 -_08179508: .4byte 0xfffffc00 -_0817950C: .4byte 0x030022f8 -_08179510: .4byte 0x0203bcfe + .pool thumb_func_end sub_8179454 thumb_func_start sub_8179514 @@ -772011,14 +745901,14 @@ sub_8179514: @ 8179514 push {r4,lr} lsls r0, 16 lsrs r0, 16 - ldr r4, _08179538 + ldr r4, =0x0203abbc movs r3, 0x80 lsls r3, 5 movs r1, 0 adds r2, r4, 0 bl ReadFlash movs r1, 0 - ldr r2, _0817953C + ldr r2, =0x000003ff _0817952C: ldr r0, [r4] cmp r0, 0 @@ -772026,8 +745916,7 @@ _0817952C: movs r0, 0x1 b _0817954E .align 2, 0 -_08179538: .4byte 0x0203abbc -_0817953C: .4byte 0x000003ff + .pool _08179540: adds r0, r1, 0x1 lsls r0, 16 @@ -772050,9 +745939,9 @@ sub_8179554: @ 8179554 lsls r0, 16 lsrs r6, r0, 16 movs r0, 0 - ldr r1, _081795A4 + ldr r1, =0x00000fff mov r8, r1 - ldr r7, _081795A8 + ldr r7, =0x03007854 _08179566: movs r4, 0 adds r5, r0, 0x1 @@ -772085,8 +745974,7 @@ _08179596: pop {r1} bx r1 .align 2, 0 -_081795A4: .4byte 0x00000fff -_081795A8: .4byte 0x03007854 + .pool thumb_func_end sub_8179554 thumb_func_start sub_81795AC @@ -772128,37 +746016,32 @@ _081795E0: thumb_func_start sub_81795E8 sub_81795E8: @ 81795E8 push {lr} - ldr r0, _0817961C + ldr r0, =0x000008af bl flag_check lsls r0, 24 cmp r0, 0 bne _08179634 - ldr r0, _08179620 + ldr r0, =0x03005d8c ldr r2, [r0] ldrh r1, [r2, 0x4] - ldr r0, _08179624 + ldr r0, =0x00004718 cmp r1, r0 bne _08179634 ldr r1, [r2] - ldr r0, _08179628 + ldr r0, =0x0003000a cmp r1, r0 beq _08179616 - ldr r0, _0817962C + ldr r0, =0x00030009 cmp r1, r0 beq _08179616 - ldr r0, _08179630 + ldr r0, =0x0003000b cmp r1, r0 bne _08179634 _08179616: movs r0, 0x1 b _08179636 .align 2, 0 -_0817961C: .4byte 0x000008af -_08179620: .4byte 0x03005d8c -_08179624: .4byte 0x00004718 -_08179628: .4byte 0x0003000a -_0817962C: .4byte 0x00030009 -_08179630: .4byte 0x0003000b + .pool _08179634: movs r0, 0 _08179636: @@ -772169,11 +746052,11 @@ _08179636: thumb_func_start sub_817963C sub_817963C: @ 817963C push {lr} - ldr r2, _08179694 + ldr r2, =0x0000022a movs r0, 0x10 movs r1, 0x8 bl setmaptile_0 - ldr r2, _08179698 + ldr r2, =0x0000022b movs r0, 0x11 movs r1, 0x8 bl setmaptile_0 @@ -772182,39 +746065,34 @@ sub_817963C: @ 817963C movs r0, 0x12 movs r1, 0x8 bl setmaptile_0 - ldr r2, _0817969C + ldr r2, =0x00000e32 movs r0, 0x10 movs r1, 0x9 bl setmaptile_0 - ldr r2, _081796A0 + ldr r2, =0x00000233 movs r0, 0x11 movs r1, 0x9 bl setmaptile_0 - ldr r2, _081796A4 + ldr r2, =0x00000e34 movs r0, 0x12 movs r1, 0x9 bl setmaptile_0 bl cur_mapdata_full_redraw movs r0, 0x14 bl audio_play - ldr r0, _081796A8 + ldr r0, =0x000008af bl flag_set bl script_env_2_disable pop {r0} bx r0 .align 2, 0 -_08179694: .4byte 0x0000022a -_08179698: .4byte 0x0000022b -_0817969C: .4byte 0x00000e32 -_081796A0: .4byte 0x00000233 -_081796A4: .4byte 0x00000e34 -_081796A8: .4byte 0x000008af + .pool thumb_func_end sub_817963C thumb_func_start sub_81796AC sub_81796AC: @ 81796AC push {r4,lr} - ldr r4, _081796E8 + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x41 movs r2, 0 @@ -772224,7 +746102,7 @@ sub_81796AC: @ 81796AC cmp r0, r1 bne _081796F4 bl calc_player_party_count - ldr r0, _081796EC + ldr r0, =0x020244e9 ldrb r1, [r0] movs r0, 0x64 muls r0, r1 @@ -772234,15 +746112,13 @@ sub_81796AC: @ 81796AC movs r1, 0x41 movs r2, 0 bl pokemon_getattr - ldr r1, _081796F0 + ldr r1, =0x0000017d cmp r0, r1 bne _081796F4 movs r0, 0x1 b _081796F6 .align 2, 0 -_081796E8: .4byte 0x020244ec -_081796EC: .4byte 0x020244e9 -_081796F0: .4byte 0x0000017d + .pool _081796F4: movs r0, 0 _081796F6: @@ -772259,12 +746135,12 @@ nullsub_84: @ 81796FC thumb_func_start sub_8179700 sub_8179700: @ 8179700 push {lr} - ldr r0, _08179734 + ldr r0, =sub_8179778 + 1 movs r1, 0x9 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08179738 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -772283,19 +746159,18 @@ sub_8179700: @ 8179700 pop {r0} bx r0 .align 2, 0 -_08179734: .4byte sub_8179778 + 1 -_08179738: .4byte 0x03005e00 + .pool thumb_func_end sub_8179700 thumb_func_start sub_817973C sub_817973C: @ 817973C push {lr} - ldr r0, _08179770 + ldr r0, =sub_8179778 + 1 movs r1, 0x9 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08179774 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -772314,8 +746189,7 @@ sub_817973C: @ 817973C pop {r0} bx r0 .align 2, 0 -_08179770: .4byte sub_8179778 + 1 -_08179774: .4byte 0x03005e00 + .pool thumb_func_end sub_817973C thumb_func_start sub_8179778 @@ -772326,7 +746200,7 @@ sub_8179778: @ 8179778 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081797D8 + ldr r1, =0x03005e00 adds r4, r0, r1 ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -772364,7 +746238,7 @@ _081797D0: pop {r0} bx r0 .align 2, 0 -_081797D8: .4byte 0x03005e00 + .pool thumb_func_end sub_8179778 thumb_func_start sub_81797DC @@ -772377,7 +746251,7 @@ sub_81797DC: @ 81797DC lsrs r2, r0, 24 cmp r2, 0 bne _0817982C - ldr r0, _08179818 + ldr r0, =0x03005d8c ldr r3, [r0] ldrh r1, [r3, 0x4] movs r0, 0xC3 @@ -772385,26 +746259,22 @@ sub_81797DC: @ 81797DC cmp r1, r0 bne _0817982C ldr r1, [r3] - ldr r0, _0817981C + ldr r0, =0x00170006 cmp r1, r0 beq _08179810 - ldr r0, _08179820 + ldr r0, =0x00170005 cmp r1, r0 beq _08179810 - ldr r0, _08179824 + ldr r0, =0x00170007 cmp r1, r0 bne _0817982C _08179810: - ldr r0, _08179828 + ldr r0, =0x0203bd14 strb r2, [r0] movs r0, 0x1 b _0817982E .align 2, 0 -_08179818: .4byte 0x03005d8c -_0817981C: .4byte 0x00170006 -_08179820: .4byte 0x00170005 -_08179824: .4byte 0x00170007 -_08179828: .4byte 0x0203bd14 + .pool _0817982C: movs r0, 0 _0817982E: @@ -772416,7 +746286,7 @@ _0817982E: sub_8179834: @ 8179834 push {lr} bl brm_get_pokemon_selection - ldr r1, _0817984C + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -772425,7 +746295,7 @@ sub_8179834: @ 8179834 pop {r0} bx r0 .align 2, 0 -_0817984C: .4byte 0x02038c08 + .pool thumb_func_end sub_8179834 thumb_func_start sub_8179850 @@ -772441,11 +746311,11 @@ sub_8179850: @ 8179850 thumb_func_start sub_8179860 sub_8179860: @ 8179860 push {lr} - ldr r2, _081798BC + ldr r2, =0x0000022a movs r0, 0xE movs r1, 0x1A bl setmaptile_0 - ldr r2, _081798C0 + ldr r2, =0x0000022b movs r0, 0xF movs r1, 0x1A bl setmaptile_0 @@ -772454,15 +746324,15 @@ sub_8179860: @ 8179860 movs r0, 0x10 movs r1, 0x1A bl setmaptile_0 - ldr r2, _081798C4 + ldr r2, =0x00000e32 movs r0, 0xE movs r1, 0x1B bl setmaptile_0 - ldr r2, _081798C8 + ldr r2, =0x00000233 movs r0, 0xF movs r1, 0x1B bl setmaptile_0 - ldr r2, _081798CC + ldr r2, =0x00000e34 movs r0, 0x10 movs r1, 0x1B bl setmaptile_0 @@ -772476,42 +746346,34 @@ sub_8179860: @ 8179860 pop {r0} bx r0 .align 2, 0 -_081798BC: .4byte 0x0000022a -_081798C0: .4byte 0x0000022b -_081798C4: .4byte 0x00000e32 -_081798C8: .4byte 0x00000233 -_081798CC: .4byte 0x00000e34 + .pool thumb_func_end sub_8179860 thumb_func_start sub_81798D0 sub_81798D0: @ 81798D0 push {lr} - ldr r0, _081798FC + ldr r0, =0x000008b2 bl flag_check lsls r0, 24 cmp r0, 0 bne _08179910 - ldr r0, _08179900 + ldr r0, =0x03005d8c ldr r2, [r0] ldrh r1, [r2, 0x4] - ldr r0, _08179904 + ldr r0, =0x00004418 cmp r1, r0 bne _08179910 ldr r1, [r2] - ldr r0, _08179908 + ldr r0, =0x00190008 cmp r1, r0 bne _08179910 - ldr r1, _0817990C + ldr r1, =0x0203bd14 movs r0, 0x1 strb r0, [r1] movs r0, 0x1 b _08179912 .align 2, 0 -_081798FC: .4byte 0x000008b2 -_08179900: .4byte 0x03005d8c -_08179904: .4byte 0x00004418 -_08179908: .4byte 0x00190008 -_0817990C: .4byte 0x0203bd14 + .pool _08179910: movs r0, 0 _08179912: @@ -772523,7 +746385,7 @@ _08179912: sub_8179918: @ 8179918 push {lr} bl brm_get_pokemon_selection - ldr r1, _08179930 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -772532,7 +746394,7 @@ sub_8179918: @ 8179918 pop {r0} bx r0 .align 2, 0 -_08179930: .4byte 0x02038c08 + .pool thumb_func_end sub_8179918 thumb_func_start sub_8179934 @@ -772548,11 +746410,11 @@ sub_8179934: @ 8179934 thumb_func_start sub_8179944 sub_8179944: @ 8179944 push {lr} - ldr r2, _0817999C + ldr r2, =0x0000022a movs r0, 0xE movs r1, 0x1A bl setmaptile_0 - ldr r2, _081799A0 + ldr r2, =0x0000022b movs r0, 0xF movs r1, 0x1A bl setmaptile_0 @@ -772561,33 +746423,28 @@ sub_8179944: @ 8179944 movs r0, 0x10 movs r1, 0x1A bl setmaptile_0 - ldr r2, _081799A4 + ldr r2, =0x00000e32 movs r0, 0xE movs r1, 0x1B bl setmaptile_0 - ldr r2, _081799A8 + ldr r2, =0x00000233 movs r0, 0xF movs r1, 0x1B bl setmaptile_0 - ldr r2, _081799AC + ldr r2, =0x00000e34 movs r0, 0x10 movs r1, 0x1B bl setmaptile_0 bl cur_mapdata_full_redraw movs r0, 0x14 bl audio_play - ldr r0, _081799B0 + ldr r0, =0x000008b2 bl flag_set bl script_env_2_disable pop {r0} bx r0 .align 2, 0 -_0817999C: .4byte 0x0000022a -_081799A0: .4byte 0x0000022b -_081799A4: .4byte 0x00000e32 -_081799A8: .4byte 0x00000233 -_081799AC: .4byte 0x00000e34 -_081799B0: .4byte 0x000008b2 + .pool thumb_func_end sub_8179944 thumb_func_start nullsub_64 @@ -772601,28 +746458,26 @@ sub_81799B8: @ 81799B8 bl oei_task_add lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081799D8 + ldr r0, =0x0203bd14 ldrb r0, [r0] cmp r0, 0x1 bne _081799E4 - ldr r1, _081799DC + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r1 - ldr r2, _081799E0 + ldr r2, =sub_8179934 + 1 b _081799F0 .align 2, 0 -_081799D8: .4byte 0x0203bd14 -_081799DC: .4byte 0x03005e00 -_081799E0: .4byte sub_8179934 + 1 + .pool _081799E4: - ldr r1, _081799FC + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r1 - ldr r2, _08179A00 + ldr r2, =sub_8179850 + 1 _081799F0: lsrs r1, r2, 16 strh r1, [r0, 0x18] @@ -772631,8 +746486,7 @@ _081799F0: pop {r1} bx r1 .align 2, 0 -_081799FC: .4byte 0x03005e00 -_08179A00: .4byte sub_8179850 + 1 + .pool thumb_func_end sub_81799B8 thumb_func_start sub_8179A04 @@ -772641,15 +746495,15 @@ sub_8179A04: @ 8179A04 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r4, _08179A48 + ldr r4, =0x03005d8c ldr r0, [r4] ldrh r1, [r0, 0x4] - ldr r0, _08179A4C + ldr r0, =0x00004318 cmp r1, r0 beq _08179A1A b _08179B5A _08179A1A: - ldr r0, _08179A50 + ldr r0, =0x000008b1 bl flag_check lsls r0, 24 cmp r0, 0 @@ -772671,20 +746525,18 @@ _08179A36: bne _08179A58 b _08179B5A .align 2, 0 -_08179A48: .4byte 0x03005d8c -_08179A4C: .4byte 0x00004318 -_08179A50: .4byte 0x000008b1 + .pool _08179A54: movs r0, 0x1 b _08179B5C _08179A58: movs r5, 0 mov r8, r4 - ldr r4, _08179AA4 + ldr r4, =0x085efe74 adds r0, r4, 0x1 mov r12, r0 - ldr r6, _08179AA8 - ldr r1, _08179AAC + ldr r6, =0x0000403b + ldr r1, =0x0000403c mov r9, r1 _08179A68: lsls r0, r5, 1 @@ -772716,9 +746568,7 @@ _08179A68: bl var_set b _08179AF0 .align 2, 0 -_08179AA4: .4byte 0x085efe74 -_08179AA8: .4byte 0x0000403b -_08179AAC: .4byte 0x0000403c + .pool _08179AB0: cmp r5, 0x1F bhi _08179AD2 @@ -772736,7 +746586,7 @@ _08179AB0: bl var_set b _08179AF0 _08179AD2: - ldr r4, _08179B2C + ldr r4, =0x0000403d adds r0, r4, 0 bl var_get lsls r0, 16 @@ -772750,39 +746600,34 @@ _08179AD2: adds r0, r4, 0 bl var_set _08179AF0: - ldr r0, _08179B30 + ldr r0, =0x0000403b bl var_get lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _08179B34 + ldr r0, =0x0000ffff cmp r4, r0 bne _08179B5A - ldr r0, _08179B38 + ldr r0, =0x0000403c bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, r4 bne _08179B5A - ldr r0, _08179B2C + ldr r0, =0x0000403d bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0xF bne _08179B5A - ldr r0, _08179B3C + ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, [r0] - ldr r0, _08179B40 + ldr r0, =0x00150008 cmp r1, r0 beq _08179A54 b _08179B5A .align 2, 0 -_08179B2C: .4byte 0x0000403d -_08179B30: .4byte 0x0000403b -_08179B34: .4byte 0x0000ffff -_08179B38: .4byte 0x0000403c -_08179B3C: .4byte 0x03005d8c -_08179B40: .4byte 0x00150008 + .pool _08179B44: adds r0, r5, 0x1 lsls r0, 24 @@ -772830,7 +746675,7 @@ sub_8179B84: @ 8179B84 sub_8179B98: @ 8179B98 push {r4,lr} sub sp, 0x4 - ldr r0, _08179BB8 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -772840,13 +746685,12 @@ sub_8179B98: @ 8179B98 b _08179D4C _08179BAC: lsls r0, 2 - ldr r1, _08179BBC + ldr r1, =_08179BC0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08179BB8: .4byte 0x030022c0 -_08179BBC: .4byte _08179BC0 + .pool .align 2, 0 _08179BC0: .4byte _08179BF8 @@ -772864,69 +746708,67 @@ _08179BC0: .4byte _08179CFE .4byte _08179D18 _08179BF8: - ldr r4, _08179C14 - ldr r0, _08179C18 + ldr r4, =0x0203bd18 + ldr r0, =0x00001084 bl malloc_and_clear str r0, [r4] bl vblank_hblank_handler_set_zero bl clear_scheduled_bg_copies_to_vram - ldr r1, _08179C1C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _08179D3A .align 2, 0 -_08179C14: .4byte 0x0203bd18 -_08179C18: .4byte 0x00001084 -_08179C1C: .4byte 0x030022c0 + .pool _08179C20: bl sub_80A1A74 - ldr r2, _08179C30 + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 b _08179D30 .align 2, 0 -_08179C30: .4byte 0x02037fd4 + .pool _08179C34: bl reset_all_obj_data - ldr r1, _08179C44 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _08179D3A .align 2, 0 -_08179C44: .4byte 0x030022c0 + .pool _08179C48: bl gpu_pal_allocator_reset b _08179D32 _08179C4E: bl init_uns_table_pokemon_copy - ldr r1, _08179C5C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _08179D3A .align 2, 0 -_08179C5C: .4byte 0x030022c0 + .pool _08179C60: bl sub_8179D9C b _08179D32 _08179C66: bl sub_8179FAC - ldr r1, _08179C74 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _08179D3A .align 2, 0 -_08179C74: .4byte 0x030022c0 + .pool _08179C78: - ldr r0, _08179C90 + ldr r0, =0x0203bc9c ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08179C94 + ldr r1, =0x020244ec adds r0, r1 bl sub_8179DF4 lsls r0, 24 @@ -772934,51 +746776,46 @@ _08179C78: beq _08179D64 b _08179D32 .align 2, 0 -_08179C90: .4byte 0x0203bc9c -_08179C94: .4byte 0x020244ec + .pool _08179C98: bl sub_817A4A4 - ldr r1, _08179CA8 + ldr r1, =0x0203bd18 ldr r1, [r1] - ldr r2, _08179CAC + ldr r2, =0x0000105e adds r1, r2 strb r0, [r1] b _08179D32 .align 2, 0 -_08179CA8: .4byte 0x0203bd18 -_08179CAC: .4byte 0x0000105e + .pool _08179CB0: - ldr r0, _08179CCC + ldr r0, =0x0203bc9c ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08179CD0 + ldr r1, =0x020244ec adds r0, r1 bl sub_817A358 - ldr r1, _08179CD4 + ldr r1, =0x0203bd18 ldr r1, [r1] - ldr r2, _08179CD8 + ldr r2, =0x0000105d adds r1, r2 strb r0, [r1] b _08179D32 .align 2, 0 -_08179CCC: .4byte 0x0203bc9c -_08179CD0: .4byte 0x020244ec -_08179CD4: .4byte 0x0203bd18 -_08179CD8: .4byte 0x0000105d + .pool _08179CDC: movs r0, 0 movs r1, 0x1 movs r2, 0x1 movs r3, 0xE bl SetWindowBorderStyle - ldr r1, _08179CF4 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _08179D3A .align 2, 0 -_08179CF4: .4byte 0x030022c0 + .pool _08179CF8: bl sub_817A168 b _08179D32 @@ -772988,13 +746825,13 @@ _08179CFE: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r1, _08179D14 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _08179D3A .align 2, 0 -_08179D14: .4byte 0x030022c0 + .pool _08179D18: movs r0, 0x1 negs r0, r0 @@ -773003,14 +746840,14 @@ _08179D18: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r2, _08179D44 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 _08179D30: strb r0, [r2, 0x8] _08179D32: - ldr r1, _08179D48 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -773020,18 +746857,16 @@ _08179D3A: strb r0, [r1] b _08179D64 .align 2, 0 -_08179D44: .4byte 0x02037fd4 -_08179D48: .4byte 0x030022c0 + .pool _08179D4C: - ldr r0, _08179D5C + ldr r0, =sub_8179B84 + 1 bl SetVBlankCallback - ldr r0, _08179D60 + ldr r0, =sub_8179B68 + 1 bl set_callback2 movs r0, 0x1 b _08179D66 .align 2, 0 -_08179D5C: .4byte sub_8179B84 + 1 -_08179D60: .4byte sub_8179B68 + 1 + .pool _08179D64: movs r0, 0 _08179D66: @@ -773071,11 +746906,11 @@ sub_8179D9C: @ 8179D9C bl sub_8121DA0 movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08179DEC + ldr r1, =0x085f0550 movs r0, 0 movs r2, 0x2 bl bg_vram_setup - ldr r0, _08179DF0 + ldr r0, =0x0203bd18 ldr r1, [r0] adds r1, 0x48 movs r0, 0x1 @@ -773097,8 +746932,7 @@ sub_8179D9C: @ 8179D9C pop {r0} bx r0 .align 2, 0 -_08179DEC: .4byte 0x085f0550 -_08179DF0: .4byte 0x0203bd18 + .pool thumb_func_end sub_8179D9C thumb_func_start sub_8179DF4 @@ -773106,9 +746940,9 @@ sub_8179DF4: @ 8179DF4 push {r4-r6,lr} sub sp, 0x4 adds r6, r0, 0 - ldr r0, _08179E18 + ldr r0, =0x0203bd18 ldr r0, [r0] - ldr r1, _08179E1C + ldr r1, =0x0000107e adds r0, r1 movs r1, 0 ldrsh r0, [r0, r1] @@ -773117,14 +746951,12 @@ sub_8179DF4: @ 8179DF4 b _08179FA0 _08179E0C: lsls r0, 2 - ldr r1, _08179E20 + ldr r1, =_08179E24 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08179E18: .4byte 0x0203bd18 -_08179E1C: .4byte 0x0000107e -_08179E20: .4byte _08179E24 + .pool .align 2, 0 _08179E24: .4byte _08179E48 @@ -773147,21 +746979,19 @@ _08179E48: bl pokemon_getattr adds r4, r0, 0 lsls r0, r5, 3 - ldr r1, _08179E78 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _08179E7C + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x8] adds r2, r5, 0 adds r3, r4, 0 bl help_system_enable_unless_flashback__sp199 - ldr r0, _08179E80 + ldr r0, =0x0203bd18 ldr r1, [r0] b _08179F5E .align 2, 0 -_08179E78: .4byte 0x0830a18c -_08179E7C: .4byte 0x020244d4 -_08179E80: .4byte 0x0203bd18 + .pool _08179E84: adds r0, r6, 0 movs r1, 0x41 @@ -773184,106 +747014,96 @@ _08179E84: ldrh r0, [r4, 0x4] movs r1, 0x1 bl sub_806A068 - ldr r0, _08179EC0 + ldr r0, =0x0203bd18 ldr r1, [r0] b _08179F5E .align 2, 0 -_08179EC0: .4byte 0x0203bd18 + .pool _08179EC4: - ldr r0, _08179ED0 + ldr r0, =0x085b26f4 bl gpu_tile_obj_decompress_and_load - ldr r0, _08179ED4 + ldr r0, =0x0203bd18 ldr r1, [r0] b _08179F5E .align 2, 0 -_08179ED0: .4byte 0x085b26f4 -_08179ED4: .4byte 0x0203bd18 + .pool _08179ED8: - ldr r0, _08179EE4 + ldr r0, =0x085b26fc bl gpu_pal_obj_decompress_and_apply - ldr r0, _08179EE8 + ldr r0, =0x0203bd18 ldr r1, [r0] b _08179F5E .align 2, 0 -_08179EE4: .4byte 0x085b26fc -_08179EE8: .4byte 0x0203bd18 + .pool _08179EEC: - ldr r0, _08179EF8 + ldr r0, =0x085f06a0 bl gpu_tile_obj_decompress_and_load - ldr r0, _08179EFC + ldr r0, =0x0203bd18 ldr r1, [r0] b _08179F5E .align 2, 0 -_08179EF8: .4byte 0x085f06a0 -_08179EFC: .4byte 0x0203bd18 + .pool _08179F00: - ldr r0, _08179F14 + ldr r0, =0x0203ce7c ldrb r0, [r0] bl sub_8179FEC - ldr r0, _08179F18 + ldr r0, =0x0203bd1c bl gpu_pal_obj_decompress_and_apply - ldr r0, _08179F1C + ldr r0, =0x0203bd18 ldr r1, [r0] b _08179F5E .align 2, 0 -_08179F14: .4byte 0x0203ce7c -_08179F18: .4byte 0x0203bd1c -_08179F1C: .4byte 0x0203bd18 + .pool _08179F20: bl reset_temp_tile_data_buffers - ldr r1, _08179F3C + ldr r1, =0x08d7c440 movs r0, 0 str r0, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r0, _08179F40 + ldr r0, =0x0203bd18 ldr r1, [r0] b _08179F5E .align 2, 0 -_08179F3C: .4byte 0x08d7c440 -_08179F40: .4byte 0x0203bd18 + .pool _08179F44: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _08179FA0 - ldr r0, _08179F6C - ldr r4, _08179F70 + ldr r0, =0x08d9ba44 + ldr r4, =0x0203bd18 ldr r1, [r4] adds r1, 0x48 bl call_LZZUnCompWram ldr r1, [r4] _08179F5E: - ldr r0, _08179F74 + ldr r0, =0x0000107e adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _08179FA0 .align 2, 0 -_08179F6C: .4byte 0x08d9ba44 -_08179F70: .4byte 0x0203bd18 -_08179F74: .4byte 0x0000107e + .pool _08179F78: - ldr r0, _08179F94 + ldr r0, =0x08d7c9ec movs r1, 0x20 movs r2, 0x60 bl decompress_palette - ldr r0, _08179F98 + ldr r0, =0x0203bd18 ldr r0, [r0] - ldr r1, _08179F9C + ldr r1, =0x0000107e adds r0, r1 movs r1, 0 strh r1, [r0] movs r0, 0x1 b _08179FA2 .align 2, 0 -_08179F94: .4byte 0x08d7c9ec -_08179F98: .4byte 0x0203bd18 -_08179F9C: .4byte 0x0000107e + .pool _08179FA0: movs r0, 0 _08179FA2: @@ -773296,14 +747116,14 @@ _08179FA2: thumb_func_start sub_8179FAC sub_8179FAC: @ 8179FAC push {lr} - ldr r0, _08179FE4 + ldr r0, =0x085f0558 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 movs r1, 0x1 movs r2, 0xE0 bl sub_809882C - ldr r0, _08179FE8 + ldr r0, =0x0860f074 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -773317,17 +747137,16 @@ sub_8179FAC: @ 8179FAC pop {r0} bx r0 .align 2, 0 -_08179FE4: .4byte 0x085f0558 -_08179FE8: .4byte 0x0860f074 + .pool thumb_func_end sub_8179FAC thumb_func_start sub_8179FEC sub_8179FEC: @ 8179FEC push {lr} lsls r0, 24 - ldr r1, _0817A01C + ldr r1, =0x03005d8c lsrs r0, 21 - ldr r2, _0817A020 + ldr r2, =0x00000848 adds r0, r2 ldr r1, [r1] adds r1, r0 @@ -773335,23 +747154,19 @@ sub_8179FEC: @ 8179FEC movs r1, 0 bl sub_8136F9C lsls r0, 24 - ldr r2, _0817A024 - ldr r1, _0817A028 + ldr r2, =0x0203bd1c + ldr r1, =0x085f0568 lsrs r0, 22 subs r0, 0x4 adds r0, r1 ldr r0, [r0] str r0, [r2] - ldr r0, _0817A02C + ldr r0, =0x000039e2 strh r0, [r2, 0x4] pop {r0} bx r0 .align 2, 0 -_0817A01C: .4byte 0x03005d8c -_0817A020: .4byte 0x00000848 -_0817A024: .4byte 0x0203bd1c -_0817A028: .4byte 0x085f0568 -_0817A02C: .4byte 0x000039e2 + .pool thumb_func_end sub_8179FEC thumb_func_start sub_817A030 @@ -773359,7 +747174,7 @@ sub_817A030: @ 817A030 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0817A068 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -773367,14 +747182,14 @@ sub_817A030: @ 817A030 beq _0817A044 b _0817A154 _0817A044: - ldr r0, _0817A06C + ldr r0, =0x03005e00 lsls r2, r4, 2 adds r1, r2, r4 lsls r1, 3 adds r1, r0 movs r0, 0x8 ldrsh r3, [r1, r0] - ldr r0, _0817A070 + ldr r0, =0x0000010d adds r5, r2, 0 cmp r3, r0 beq _0817A0C8 @@ -773386,11 +747201,9 @@ _0817A044: beq _0817A0AC b _0817A104 .align 2, 0 -_0817A068: .4byte 0x02037fd4 -_0817A06C: .4byte 0x03005e00 -_0817A070: .4byte 0x0000010d + .pool _0817A074: - ldr r0, _0817A084 + ldr r0, =0x00000119 cmp r3, r0 beq _0817A0E0 adds r0, 0x10 @@ -773398,67 +747211,62 @@ _0817A074: beq _0817A0F8 b _0817A104 .align 2, 0 -_0817A084: .4byte 0x00000119 + .pool _0817A088: - ldr r0, _0817A0A0 + ldr r0, =0x0203bd18 ldr r1, [r0] - ldr r2, _0817A0A4 + ldr r2, =0x00001050 adds r1, r2 strb r3, [r1] ldr r0, [r0] - ldr r1, _0817A0A8 + ldr r1, =0x00001058 adds r0, r1 strh r3, [r0] bl sub_817A5CC b _0817A104 .align 2, 0 -_0817A0A0: .4byte 0x0203bd18 -_0817A0A4: .4byte 0x00001050 -_0817A0A8: .4byte 0x00001058 + .pool _0817A0AC: - ldr r0, _0817A0C0 + ldr r0, =0x0203bd18 ldr r0, [r0] - ldr r2, _0817A0C4 + ldr r2, =0x0000105e adds r0, r2 ldrb r0, [r0] ldrb r1, [r1, 0xA] bl sub_817A4F8 b _0817A104 .align 2, 0 -_0817A0C0: .4byte 0x0203bd18 -_0817A0C4: .4byte 0x0000105e + .pool _0817A0C8: bl sub_817A56C - ldr r1, _0817A0D8 + ldr r1, =0x0203bd18 ldr r1, [r1] - ldr r2, _0817A0DC + ldr r2, =0x0000105f adds r1, r2 strb r0, [r1] b _0817A104 .align 2, 0 -_0817A0D8: .4byte 0x0203bd18 -_0817A0DC: .4byte 0x0000105f + .pool _0817A0E0: - ldr r0, _0817A0F0 + ldr r0, =0x0203bd18 ldr r0, [r0] - ldr r1, _0817A0F4 + ldr r1, =0x0000105d adds r0, r1 ldrb r0, [r0] bl sub_817A434 b _0817A104 .align 2, 0 -_0817A0F0: .4byte 0x0203bd18 -_0817A0F4: .4byte 0x0000105d + .pool _0817A0F8: - ldr r0, _0817A100 + ldr r0, =sub_817A1C4 + 1 str r0, [r1] b _0817A154 .align 2, 0 -_0817A100: .4byte sub_817A1C4 + 1 + .pool _0817A104: - ldr r0, _0817A120 + ldr r0, =0x0203bd18 ldr r0, [r0] - ldr r2, _0817A124 + ldr r2, =0x00001058 adds r1, r0, r2 subs r2, 0x2 adds r0, r2 @@ -773469,26 +747277,25 @@ _0817A104: bl sub_817A634 b _0817A138 .align 2, 0 -_0817A120: .4byte 0x0203bd18 -_0817A124: .4byte 0x00001058 + .pool _0817A128: cmp r1, r0 bne _0817A138 - ldr r0, _0817A15C + ldr r0, =0x03005e00 adds r1, r5, r4 lsls r1, 3 adds r1, r0 movs r0, 0xFE strh r0, [r1, 0x8] _0817A138: - ldr r0, _0817A160 + ldr r0, =0x0203bd18 ldr r1, [r0] - ldr r0, _0817A164 + ldr r0, =0x00001058 adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - ldr r0, _0817A15C + ldr r0, =0x03005e00 adds r1, r5, r4 lsls r1, 3 adds r1, r0 @@ -773500,20 +747307,18 @@ _0817A154: pop {r0} bx r0 .align 2, 0 -_0817A15C: .4byte 0x03005e00 -_0817A160: .4byte 0x0203bd18 -_0817A164: .4byte 0x00001058 + .pool thumb_func_end sub_817A030 thumb_func_start sub_817A168 sub_817A168: @ 817A168 push {lr} - ldr r0, _0817A18C + ldr r0, =sub_817A030 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0817A190 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -773525,8 +747330,7 @@ sub_817A168: @ 817A168 pop {r0} bx r0 .align 2, 0 -_0817A18C: .4byte sub_817A030 + 1 -_0817A190: .4byte 0x03005e00 + .pool thumb_func_end sub_817A168 thumb_func_start sub_817A194 @@ -773540,20 +747344,19 @@ sub_817A194: @ 817A194 lsrs r0, 16 cmp r0, 0x1 beq _0817A1B6 - ldr r0, _0817A1BC + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _0817A1C0 + ldr r0, =sub_817A320 + 1 str r0, [r1] _0817A1B6: pop {r4} pop {r0} bx r0 .align 2, 0 -_0817A1BC: .4byte 0x03005e00 -_0817A1C0: .4byte sub_817A320 + 1 + .pool thumb_func_end sub_817A194 thumb_func_start sub_817A1C4 @@ -773562,18 +747365,18 @@ sub_817A1C4: @ 817A1C4 sub sp, 0x10 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0817A220 + ldr r0, =0x0203bc9c ldrb r1, [r0] movs r0, 0x64 adds r5, r1, 0 muls r5, r0 - ldr r0, _0817A224 + ldr r0, =0x020244ec adds r5, r0 - ldr r1, _0817A228 - ldr r0, _0817A22C + ldr r1, =0x03005d8c + ldr r0, =0x0203ce7c ldrh r0, [r0] lsls r0, 3 - ldr r2, _0817A230 + ldr r2, =0x00000848 adds r0, r2 ldr r4, [r1] adds r4, r0 @@ -773583,49 +747386,39 @@ sub_817A1C4: @ 817A1C4 lsrs r0, 24 adds r1, r4, 0 bl sub_8136FE4 - ldr r6, _0817A234 + ldr r6, =0x0203bc9e strh r0, [r6] - ldr r1, _0817A238 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 - ldr r1, _0817A23C + ldr r1, =0x02021dc4 adds r0, r4, 0 bl sub_8137044 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 bne _0817A248 - ldr r0, _0817A240 - ldr r1, _0817A244 + ldr r0, =0x02021fc4 + ldr r1, =0x085e937f bl ExpandTextCodes b _0817A268 .align 2, 0 -_0817A220: .4byte 0x0203bc9c -_0817A224: .4byte 0x020244ec -_0817A228: .4byte 0x03005d8c -_0817A22C: .4byte 0x0203ce7c -_0817A230: .4byte 0x00000848 -_0817A234: .4byte 0x0203bc9e -_0817A238: .4byte 0x02021cc4 -_0817A23C: .4byte 0x02021dc4 -_0817A240: .4byte 0x02021fc4 -_0817A244: .4byte 0x085e937f + .pool _0817A248: cmp r0, 0 ble _0817A260 - ldr r0, _0817A258 - ldr r1, _0817A25C + ldr r0, =0x02021fc4 + ldr r1, =0x085e9390 bl ExpandTextCodes b _0817A268 .align 2, 0 -_0817A258: .4byte 0x02021fc4 -_0817A25C: .4byte 0x085e9390 + .pool _0817A260: - ldr r0, _0817A2AC - ldr r1, _0817A2B0 + ldr r0, =0x02021fc4 + ldr r1, =0x085e93a9 bl ExpandTextCodes _0817A268: - ldr r2, _0817A2B4 + ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -773634,7 +747427,7 @@ _0817A268: adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r2, _0817A2AC + ldr r2, =0x02021fc4 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -773646,23 +747439,19 @@ _0817A268: movs r0, 0 movs r1, 0x1 bl text_box_related_one - ldr r1, _0817A2B8 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _0817A2BC + ldr r1, =sub_817A194 + 1 str r1, [r0] add sp, 0x10 pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0817A2AC: .4byte 0x02021fc4 -_0817A2B0: .4byte 0x085e93a9 -_0817A2B4: .4byte 0x03003014 -_0817A2B8: .4byte 0x03005e00 -_0817A2BC: .4byte sub_817A194 + 1 + .pool thumb_func_end sub_817A1C4 thumb_func_start sub_817A2C0 @@ -773670,7 +747459,7 @@ sub_817A2C0: @ 817A2C0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0817A30C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -773678,18 +747467,18 @@ sub_817A2C0: @ 817A2C0 bne _0817A304 bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, _0817A310 - ldr r1, _0817A314 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl - ldr r0, _0817A318 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl set_callback2 adds r0, r4, 0 bl remove_task bl Window_FreeMemory - ldr r0, _0817A31C + ldr r0, =0x0203bd18 ldr r0, [r0] bl free bl sub_805F094 @@ -773698,11 +747487,7 @@ _0817A304: pop {r0} bx r0 .align 2, 0 -_0817A30C: .4byte 0x02037fd4 -_0817A310: .4byte 0x03007420 -_0817A314: .4byte 0x0000ffff -_0817A318: .4byte 0x030022c0 -_0817A31C: .4byte 0x0203bd18 + .pool thumb_func_end sub_817A2C0 thumb_func_start sub_817A320 @@ -773719,20 +747504,19 @@ sub_817A320: @ 817A320 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _0817A350 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0817A354 + ldr r1, =sub_817A2C0 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_0817A350: .4byte 0x03005e00 -_0817A354: .4byte sub_817A2C0 + 1 + .pool thumb_func_end sub_817A320 thumb_func_start sub_817A358 @@ -773747,7 +747531,7 @@ sub_817A358: @ 817A358 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _0817A410 + ldr r0, =0x0202499c movs r1, 0x30 movs r2, 0x50 movs r3, 0x2 @@ -773755,13 +747539,13 @@ sub_817A358: @ 817A358 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0817A414 + ldr r0, =0x0203bd18 mov r9, r0 ldr r0, [r0] - ldr r2, _0817A418 + ldr r2, =0x00001054 adds r1, r0, r2 strh r4, [r1] - ldr r1, _0817A41C + ldr r1, =0x0000105b adds r0, r1 mov r2, r8 strb r2, [r0] @@ -773769,10 +747553,10 @@ sub_817A358: @ 817A358 bl get_nature mov r2, r9 ldr r1, [r2] - ldr r2, _0817A420 + ldr r2, =0x0000105a adds r1, r2 strb r0, [r1] - ldr r7, _0817A424 + ldr r7, =0x02020630 mov r1, r8 lsls r0, r1, 4 add r0, r8 @@ -773782,11 +747566,11 @@ sub_817A358: @ 817A358 adds r0, r7, 0 adds r0, 0x1C adds r0, r5, r0 - ldr r1, _0817A428 + ldr r1, =nullsub_12 + 1 str r1, [r0] mov r2, r9 ldr r0, [r2] - ldr r1, _0817A42C + ldr r1, =0x00001053 adds r0, r1 movs r1, 0x1 strb r1, [r0] @@ -773798,7 +747582,7 @@ sub_817A358: @ 817A358 adds r0, r7, 0 adds r0, 0x10 adds r0, r5, r0 - ldr r1, _0817A430 + ldr r1, =0x085f05b0 str r1, [r0] ldrb r3, [r6, 0x1] movs r0, 0x3 @@ -773813,7 +747597,7 @@ sub_817A358: @ 817A358 bl oam_center mov r2, r9 ldr r0, [r2] - ldr r1, _0817A42C + ldr r1, =0x00001053 adds r0, r1 movs r1, 0 strb r1, [r0] @@ -773826,22 +747610,14 @@ _0817A402: pop {r1} bx r1 .align 2, 0 -_0817A410: .4byte 0x0202499c -_0817A414: .4byte 0x0203bd18 -_0817A418: .4byte 0x00001054 -_0817A41C: .4byte 0x0000105b -_0817A420: .4byte 0x0000105a -_0817A424: .4byte 0x02020630 -_0817A428: .4byte nullsub_12 + 1 -_0817A42C: .4byte 0x00001053 -_0817A430: .4byte 0x085f05b0 + .pool thumb_func_end sub_817A358 thumb_func_start sub_817A434 sub_817A434: @ 817A434 lsls r0, 24 lsrs r0, 24 - ldr r3, _0817A45C + ldr r3, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -773850,19 +747626,17 @@ sub_817A434: @ 817A434 strh r0, [r2, 0x20] movs r0, 0x50 strh r0, [r2, 0x22] - ldr r0, _0817A460 + ldr r0, =0x0000fff8 strh r0, [r2, 0x2E] movs r0, 0x1 strh r0, [r2, 0x30] adds r3, 0x1C adds r1, r3 - ldr r0, _0817A464 + ldr r0, =sub_817A468 + 1 str r0, [r1] bx lr .align 2, 0 -_0817A45C: .4byte 0x02020630 -_0817A460: .4byte 0x0000fff8 -_0817A464: .4byte sub_817A468 + 1 + .pool thumb_func_end sub_817A434 thumb_func_start sub_817A468 @@ -773890,14 +747664,14 @@ _0817A48E: ldrsh r0, [r4, r1] cmp r0, 0x9 bne _0817A49A - ldr r0, _0817A4A0 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _0817A49A: pop {r4} pop {r0} bx r0 .align 2, 0 -_0817A4A0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_817A468 thumb_func_start sub_817A4A4 @@ -773910,7 +747684,7 @@ sub_817A4A4: @ 817A4A4 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _0817A4EC + ldr r5, =0x02020630 lsls r3, r4, 4 adds r3, r4 lsls r3, 2 @@ -773925,11 +747699,11 @@ sub_817A4A4: @ 817A4A4 adds r1, r5, 0 adds r1, 0x10 adds r1, r3, r1 - ldr r2, _0817A4F0 + ldr r2, =0x085f0664 str r2, [r1] adds r5, 0x1C adds r3, r5 - ldr r1, _0817A4F4 + ldr r1, =nullsub_12 + 1 str r1, [r3] bl obj_alloc_rotscale_entry adds r0, r4, 0 @@ -773937,9 +747711,7 @@ sub_817A4A4: @ 817A4A4 pop {r1} bx r1 .align 2, 0 -_0817A4EC: .4byte 0x02020630 -_0817A4F0: .4byte 0x085f0664 -_0817A4F4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_817A4A4 thumb_func_start sub_817A4F8 @@ -773952,7 +747724,7 @@ sub_817A4F8: @ 817A4F8 lsrs r7, r0, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _0817A538 + ldr r0, =0x02020630 mov r8, r0 lsls r0, r7, 4 adds r0, r7 @@ -773972,22 +747744,21 @@ sub_817A4F8: @ 817A4F8 mov r0, r8 adds r0, 0x10 adds r0, r6, r0 - ldr r1, _0817A53C + ldr r1, =0x085f0668 b _0817A548 .align 2, 0 -_0817A538: .4byte 0x02020630 -_0817A53C: .4byte 0x085f0668 + .pool _0817A540: mov r0, r8 adds r0, 0x10 adds r0, r6, r0 - ldr r1, _0817A564 + ldr r1, =0x085f066c _0817A548: str r1, [r0] lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _0817A568 + ldr r1, =0x02020630 adds r0, r1 bl obj_alloc_rotscale_entry pop {r3} @@ -773996,35 +747767,32 @@ _0817A548: pop {r0} bx r0 .align 2, 0 -_0817A564: .4byte 0x085f066c -_0817A568: .4byte 0x02020630 + .pool thumb_func_end sub_817A4F8 thumb_func_start sub_817A56C sub_817A56C: @ 817A56C push {lr} - ldr r0, _0817A594 + ldr r0, =0x085f06a8 movs r1, 0xAE movs r2, 0x54 movs r3, 0x1 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _0817A598 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 adds r1, r2 - ldr r2, _0817A59C + ldr r2, =0x0000fff4 strh r2, [r1, 0x2E] movs r2, 0x1 strh r2, [r1, 0x30] pop {r1} bx r1 .align 2, 0 -_0817A594: .4byte 0x085f06a8 -_0817A598: .4byte 0x02020630 -_0817A59C: .4byte 0x0000fff4 + .pool thumb_func_end sub_817A56C thumb_func_start sub_817A5A0 @@ -774055,21 +747823,21 @@ _0817A5C6: thumb_func_start sub_817A5CC sub_817A5CC: @ 817A5CC push {r4-r7,lr} - ldr r0, _0817A620 + ldr r0, =0x0203bd18 ldr r1, [r0] - ldr r0, _0817A624 + ldr r0, =0x00001056 adds r3, r1, r0 movs r0, 0x1 strh r0, [r3] - ldr r2, _0817A628 - ldr r7, _0817A62C + ldr r2, =0x085efebc + ldr r7, =0x0000105a adds r1, r7 ldrb r0, [r1] lsls r0, 1 adds r0, r2 ldrb r2, [r0] movs r4, 0 - ldr r5, _0817A630 + ldr r5, =0x085eff00 adds r6, r5, 0 subs r6, 0xA _0817A5F0: @@ -774099,19 +747867,15 @@ _0817A61A: pop {r0} bx r0 .align 2, 0 -_0817A620: .4byte 0x0203bd18 -_0817A624: .4byte 0x00001056 -_0817A628: .4byte 0x085efebc -_0817A62C: .4byte 0x0000105a -_0817A630: .4byte 0x085eff00 + .pool thumb_func_end sub_817A5CC thumb_func_start sub_817A634 sub_817A634: @ 817A634 push {r4,lr} - ldr r0, _0817A650 + ldr r0, =0x0203bd18 ldr r4, [r0] - ldr r1, _0817A654 + ldr r1, =0x00001050 adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0x5A @@ -774119,14 +747883,12 @@ sub_817A634: @ 817A634 b _0817A90E _0817A646: lsls r0, 2 - ldr r1, _0817A658 + ldr r1, =_0817A65C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0817A650: .4byte 0x0203bd18 -_0817A654: .4byte 0x00001050 -_0817A658: .4byte _0817A65C + .pool .align 2, 0 _0817A65C: .4byte _0817A7C8 @@ -774221,44 +747983,39 @@ _0817A65C: .4byte _0817A90E .4byte _0817A90E _0817A7C8: - ldr r1, _0817A800 - ldr r2, _0817A804 + ldr r1, =0x085efebc + ldr r2, =0x0000105a adds r0, r4, r2 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrb r1, [r0] - ldr r3, _0817A808 + ldr r3, =0x00001051 adds r0, r4, r3 strb r1, [r0] - ldr r1, _0817A80C + ldr r1, =0x0000105b adds r0, r4, r1 ldrb r0, [r0] lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0817A810 + ldr r0, =0x02020630 adds r1, r0 adds r0, r4, 0 stm r0!, {r1} movs r2, 0x44 bl memcpy - ldr r2, _0817A814 + ldr r2, =0x00001050 adds r1, r4, r2 movs r0, 0xA strb r0, [r1] b _0817A90E .align 2, 0 -_0817A800: .4byte 0x085efebc -_0817A804: .4byte 0x0000105a -_0817A808: .4byte 0x00001051 -_0817A80C: .4byte 0x0000105b -_0817A810: .4byte 0x02020630 -_0817A814: .4byte 0x00001050 + .pool _0817A818: bl sub_817A91C - ldr r1, _0817A884 - ldr r3, _0817A888 + ldr r1, =0x085efebc + ldr r3, =0x0000105a adds r0, r4, r3 ldrb r0, [r0] lsls r0, 1 @@ -774279,17 +748036,17 @@ _0817A818: ands r0, r1 strb r0, [r2, 0x3] ldr r0, [r4] - ldr r1, _0817A88C + ldr r1, =0x085f04fc str r1, [r0, 0x10] bl obj_alloc_rotscale_entry _0817A850: - ldr r0, _0817A890 + ldr r0, =0x00001050 adds r1, r4, r0 movs r0, 0x32 strb r0, [r1] _0817A858: - ldr r1, _0817A884 - ldr r2, _0817A888 + ldr r1, =0x085efebc + ldr r2, =0x0000105a adds r0, r4, r2 ldrb r0, [r0] lsls r0, 1 @@ -774298,7 +748055,7 @@ _0817A858: ldrb r1, [r2] cmp r1, 0 beq _0817A8C8 - ldr r3, _0817A894 + ldr r3, =0x00001053 adds r0, r4, r3 ldrb r0, [r0] cmp r0, 0 @@ -774310,11 +748067,7 @@ _0817A858: bl sub_8008258 b _0817A8C8 .align 2, 0 -_0817A884: .4byte 0x085efebc -_0817A888: .4byte 0x0000105a -_0817A88C: .4byte 0x085f04fc -_0817A890: .4byte 0x00001050 -_0817A894: .4byte 0x00001053 + .pool _0817A898: ldr r0, [r4] ldrb r1, [r2] @@ -774326,48 +748079,46 @@ _0817A8A2: lsrs r0, 24 cmp r0, 0x1 bne _0817A90E - ldr r1, _0817A8D4 + ldr r1, =0x00001072 adds r0, r4, r1 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 bne _0817A8E0 - ldr r3, _0817A8D8 + ldr r3, =0x00001051 adds r1, r4, r3 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] bl sub_817A91C _0817A8C8: - ldr r0, _0817A8DC + ldr r0, =0x00001050 adds r1, r4, r0 movs r0, 0x3C strb r0, [r1] b _0817A90E .align 2, 0 -_0817A8D4: .4byte 0x00001072 -_0817A8D8: .4byte 0x00001051 -_0817A8DC: .4byte 0x00001050 + .pool _0817A8E0: ldr r0, [r4] ldrb r0, [r0, 0x3] lsls r0, 26 lsrs r0, 27 bl rotscale_free_entry - ldr r2, _0817A8F8 + ldr r2, =0x00001050 adds r1, r4, r2 movs r0, 0x46 strb r0, [r1] b _0817A90E .align 2, 0 -_0817A8F8: .4byte 0x00001050 + .pool _0817A8FC: bl sub_817AA3C - ldr r3, _0817A914 + ldr r3, =0x00001051 adds r0, r4, r3 movs r1, 0 strb r1, [r0] - ldr r2, _0817A918 + ldr r2, =0x00001050 adds r0, r4, r2 strb r1, [r0] _0817A90E: @@ -774375,22 +748126,21 @@ _0817A90E: pop {r0} bx r0 .align 2, 0 -_0817A914: .4byte 0x00001051 -_0817A918: .4byte 0x00001050 + .pool thumb_func_end sub_817A634 thumb_func_start sub_817A91C sub_817A91C: @ 817A91C push {r4-r7,lr} - ldr r0, _0817A9C0 + ldr r0, =0x0203bd18 ldr r5, [r0] movs r4, 0 movs r0, 0x83 lsls r0, 5 adds r7, r5, r0 - ldr r1, _0817A9C4 + ldr r1, =0x085efeee mov r12, r1 - ldr r2, _0817A9C8 + ldr r2, =0x00001051 adds r6, r5, r2 _0817A932: lsls r2, r4, 1 @@ -774408,7 +748158,7 @@ _0817A932: lsrs r4, r0, 24 cmp r4, 0x9 bls _0817A932 - ldr r0, _0817A9CC + ldr r0, =0x00001068 adds r6, r5, r0 movs r1, 0 ldrsh r0, [r6, r1] @@ -774424,7 +748174,7 @@ _0817A932: movs r2, 0 ldrsh r1, [r1, r2] bl sine - ldr r2, _0817A9D0 + ldr r2, =0x00001074 adds r1, r5, r2 strh r0, [r1] movs r1, 0 @@ -774434,11 +748184,11 @@ _0817A932: movs r2, 0 ldrsh r1, [r1, r2] bl cosine - ldr r2, _0817A9D4 + ldr r2, =0x00001076 adds r1, r5, r2 strh r0, [r1] ldrh r0, [r6] - ldr r1, _0817A9D8 + ldr r1, =0x00001078 adds r4, r5, r1 strh r0, [r4] ldr r0, [r5] @@ -774460,13 +748210,7 @@ _0817A932: movs r0, 0 b _0817A9DE .align 2, 0 -_0817A9C0: .4byte 0x0203bd18 -_0817A9C4: .4byte 0x085efeee -_0817A9C8: .4byte 0x00001051 -_0817A9CC: .4byte 0x00001068 -_0817A9D0: .4byte 0x00001074 -_0817A9D4: .4byte 0x00001076 -_0817A9D8: .4byte 0x00001078 + .pool _0817A9DC: movs r0, 0x1 _0817A9DE: @@ -774478,11 +748222,11 @@ _0817A9DE: thumb_func_start sub_817A9E4 sub_817A9E4: @ 817A9E4 push {r4,r5,lr} - ldr r0, _0817AA28 + ldr r0, =0x0203bd18 ldr r2, [r0] - ldr r1, _0817AA2C + ldr r1, =0x00001078 adds r0, r2, r1 - ldr r5, _0817AA30 + ldr r5, =0x00001068 adds r4, r2, r5 ldrh r1, [r0] ldrh r0, [r4] @@ -774512,9 +748256,7 @@ sub_817A9E4: @ 817A9E4 movs r0, 0 b _0817AA36 .align 2, 0 -_0817AA28: .4byte 0x0203bd18 -_0817AA2C: .4byte 0x00001078 -_0817AA30: .4byte 0x00001068 + .pool _0817AA34: movs r0, 0x1 _0817AA36: @@ -774526,7 +748268,7 @@ _0817AA36: thumb_func_start sub_817AA3C sub_817AA3C: @ 817AA3C push {lr} - ldr r0, _0817AA50 + ldr r0, =0x0203bd18 ldr r0, [r0] ldr r0, [r0] bl obj_free_rotscale_entry @@ -774534,7 +748276,7 @@ sub_817AA3C: @ 817AA3C pop {r1} bx r1 .align 2, 0 -_0817AA50: .4byte 0x0203bd18 + .pool thumb_func_end sub_817AA3C thumb_func_start sub_817AA54 @@ -774545,13 +748287,13 @@ sub_817AA54: @ 817AA54 mov r5, r8 push {r5-r7} sub sp, 0x14 - ldr r0, _0817AB54 + ldr r0, =0x0203bd18 ldr r7, [r0] - ldr r1, _0817AB58 + ldr r1, =0x00001070 adds r0, r7, r1 ldrh r0, [r0] mov r9, r0 - ldr r2, _0817AB5C + ldr r2, =0x00001078 adds r0, r7, r2 ldrh r0, [r0] mov r3, r9 @@ -774559,7 +748301,7 @@ sub_817AA54: @ 817AA54 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r4, _0817AB60 + ldr r4, =0x0000107a adds r1, r7, r4 subs r2, 0xC adds r0, r7, r2 @@ -774569,7 +748311,7 @@ sub_817AA54: @ 817AA54 lsls r0, 16 lsrs r0, 16 str r0, [sp] - ldr r3, _0817AB64 + ldr r3, =0x0000107c adds r1, r7, r3 subs r4, 0xC adds r0, r7, r4 @@ -774668,11 +748410,7 @@ _0817AB20: pop {r0} bx r0 .align 2, 0 -_0817AB54: .4byte 0x0203bd18 -_0817AB58: .4byte 0x00001070 -_0817AB5C: .4byte 0x00001078 -_0817AB60: .4byte 0x0000107a -_0817AB64: .4byte 0x0000107c + .pool thumb_func_end sub_817AA54 thumb_func_start sub_817AB68 @@ -774683,25 +748421,25 @@ sub_817AB68: @ 817AB68 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _0817AC2C + ldr r0, =0x0203bd18 ldr r6, [r0] movs r0, 0 str r0, [sp] - ldr r1, _0817AC30 + ldr r1, =0x0000107a adds r0, r6, r1 - ldr r2, _0817AC34 + ldr r2, =0x00001074 adds r1, r6, r2 ldrh r2, [r0] ldrh r0, [r1] subs r2, r0 - ldr r3, _0817AC38 + ldr r3, =0x0000107c adds r0, r6, r3 - ldr r1, _0817AC3C + ldr r1, =0x00001076 adds r3, r6, r1 ldrh r1, [r0] ldrh r0, [r3] subs r1, r0 - ldr r3, _0817AC40 + ldr r3, =0x00001068 adds r3, r6 mov r9, r3 movs r0, 0x83 @@ -774715,7 +748453,7 @@ sub_817AB68: @ 817AB68 asrs r1, 16 mov r10, r1 _0817ABB2: - ldr r1, _0817AC44 + ldr r1, =0x0000106a adds r0, r6, r1 movs r2, 0 ldrsh r0, [r0, r2] @@ -774724,14 +748462,14 @@ _0817ABB2: negs r0, r0 _0817ABC0: lsls r0, 16 - ldr r3, _0817AC48 + ldr r3, =0x00001066 adds r7, r6, r3 lsrs r0, 16 ldrh r1, [r7] adds r0, r1 lsls r4, r0, 16 strh r0, [r7] - ldr r2, _0817AC4C + ldr r2, =0x00001064 adds r0, r6, r2 ldrh r2, [r0] movs r3, 0 @@ -774741,7 +748479,7 @@ _0817ABC0: movs r0, 0x1 str r0, [sp] _0817ABE2: - ldr r1, _0817AC50 + ldr r1, =0x00001078 adds r0, r6, r1 ldrh r0, [r0] mov r3, r9 @@ -774777,16 +748515,7 @@ _0817ABE2: adds r1, r4 b _0817AC80 .align 2, 0 -_0817AC2C: .4byte 0x0203bd18 -_0817AC30: .4byte 0x0000107a -_0817AC34: .4byte 0x00001074 -_0817AC38: .4byte 0x0000107c -_0817AC3C: .4byte 0x00001076 -_0817AC40: .4byte 0x00001068 -_0817AC44: .4byte 0x0000106a -_0817AC48: .4byte 0x00001066 -_0817AC4C: .4byte 0x00001064 -_0817AC50: .4byte 0x00001078 + .pool _0817AC54: mov r1, r8 movs r3, 0 @@ -774819,7 +748548,7 @@ _0817AC80: adds r1, r5 add r0, r10 strh r0, [r1] - ldr r1, _0817ACB4 + ldr r1, =0x00001062 adds r0, r6, r1 ldrh r0, [r0] mov r2, r8 @@ -774835,7 +748564,7 @@ _0817AC80: strh r0, [r1] b _0817ABB2 .align 2, 0 -_0817ACB4: .4byte 0x00001062 + .pool _0817ACB8: add sp, 0x8 pop {r3-r5} @@ -774854,14 +748583,14 @@ c2_clear_save_data_screen_2: @ 817ACC8 lsls r0, 24 cmp r0, 0 beq _0817ACDC - ldr r0, _0817ACE0 + ldr r0, =sub_817ACE4 + 1 movs r1, 0 bl AddTask _0817ACDC: pop {r0} bx r0 .align 2, 0 -_0817ACE0: .4byte sub_817ACE4 + 1 + .pool thumb_func_end c2_clear_save_data_screen_2 thumb_func_start sub_817ACE4 @@ -774876,7 +748605,7 @@ sub_817ACE4: @ 817ACE4 movs r2, 0x2 movs r3, 0xE bl SetWindowBorderStyle - ldr r2, _0817AD30 + ldr r2, =0x085efa8f movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -774885,27 +748614,24 @@ sub_817ACE4: @ 817ACE4 movs r1, 0x1 movs r3, 0 bl Print - ldr r0, _0817AD34 + ldr r0, =0x085f06d8 movs r1, 0x2 movs r2, 0xE movs r3, 0x1 bl sub_81996C0 - ldr r1, _0817AD38 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _0817AD3C + ldr r1, =sub_817AD40 + 1 str r1, [r0] add sp, 0xC pop {r4} pop {r0} bx r0 .align 2, 0 -_0817AD30: .4byte 0x085efa8f -_0817AD34: .4byte 0x085f06d8 -_0817AD38: .4byte 0x03005e00 -_0817AD3C: .4byte sub_817AD40 + 1 + .pool thumb_func_end sub_817ACE4 thumb_func_start sub_817AD40 @@ -774934,7 +748660,7 @@ _0817AD68: movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _0817AD94 + ldr r2, =0x085efaaa movs r0, 0x1 str r0, [sp] str r4, [sp, 0x4] @@ -774943,24 +748669,22 @@ _0817AD68: movs r1, 0x1 movs r3, 0 bl Print - ldr r1, _0817AD98 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _0817AD9C + ldr r1, =sub_817ADC0 + 1 str r1, [r0] b _0817ADB2 .align 2, 0 -_0817AD94: .4byte 0x085efaaa -_0817AD98: .4byte 0x03005e00 -_0817AD9C: .4byte sub_817ADC0 + 1 + .pool _0817ADA0: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl remove_task - ldr r0, _0817ADBC + ldr r0, =sub_817AFD4 + 1 bl set_callback2 _0817ADB2: add sp, 0xC @@ -774968,7 +748692,7 @@ _0817ADB2: pop {r0} bx r0 .align 2, 0 -_0817ADBC: .4byte sub_817AFD4 + 1 + .pool thumb_func_end sub_817AD40 thumb_func_start sub_817ADC0 @@ -774980,13 +748704,13 @@ sub_817ADC0: @ 817ADC0 bl calls_flash_erase_block adds r0, r4, 0 bl remove_task - ldr r0, _0817ADE0 + ldr r0, =sub_817AFD4 + 1 bl set_callback2 pop {r4} pop {r0} bx r0 .align 2, 0 -_0817ADE0: .4byte sub_817AFD4 + 1 + .pool thumb_func_end sub_817ADC0 thumb_func_start sub_817ADE4 @@ -775010,7 +748734,7 @@ sub_817ADF4: @ 817ADF4 sub_817AE00: @ 817AE00 push {r4,lr} sub sp, 0xC - ldr r0, _0817AF60 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -775062,12 +748786,12 @@ _0817AE18: add r0, sp, 0x4 movs r4, 0 strh r4, [r0] - ldr r1, _0817AF64 + ldr r1, =0x040000d4 str r0, [r1] movs r0, 0xC0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _0817AF68 + ldr r0, =0x8100c000 str r0, [r1, 0x8] ldr r0, [r1, 0x8] movs r2, 0 @@ -775077,29 +748801,29 @@ _0817AE18: movs r0, 0xE0 lsls r0, 19 str r0, [r1, 0x4] - ldr r0, _0817AF6C + ldr r0, =0x85000100 str r0, [r1, 0x8] ldr r0, [r1, 0x8] add r0, sp, 0x4 strh r2, [r0] str r0, [r1] - ldr r0, _0817AF70 + ldr r0, =0x05000002 str r0, [r1, 0x4] - ldr r0, _0817AF74 + ldr r0, =0x810001ff str r0, [r1, 0x8] ldr r0, [r1, 0x8] bl sub_80A1A74 - ldr r2, _0817AF78 - ldr r0, _0817AF7C + ldr r2, =0x02037714 + ldr r0, =0x00007fff strh r0, [r2] - ldr r1, _0817AF80 + ldr r1, =0x02037b14 strh r0, [r1] - ldr r0, _0817AF84 + ldr r0, =0x00003945 strh r0, [r2, 0x2] strh r0, [r1, 0x2] movs r1, 0 - ldr r3, _0817AF88 - ldr r0, _0817AF8C + ldr r3, =0x06000020 + ldr r0, =0x00001111 adds r2, r0, 0 _0817AED4: lsls r0, r1, 1 @@ -775111,9 +748835,9 @@ _0817AED4: cmp r1, 0xF bls _0817AED4 movs r1, 0 - ldr r4, _0817AF90 + ldr r4, =0x0600f000 movs r3, 0x1 - ldr r2, _0817AF94 + ldr r2, =0x000003ff _0817AEEC: lsls r0, r1, 1 adds r0, r4 @@ -775127,7 +748851,7 @@ _0817AEEC: bl reset_all_obj_data movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0817AF98 + ldr r1, =0x085f06c0 movs r0, 0 movs r2, 0x2 bl bg_vram_setup @@ -775143,7 +748867,7 @@ _0817AEEC: movs r1, 0 bl lcd_io_set bl sub_817B02C - ldr r0, _0817AF9C + ldr r0, =0x0000ffff str r0, [sp] movs r1, 0 movs r2, 0x10 @@ -775151,9 +748875,9 @@ _0817AEEC: bl sub_80A1AD4 movs r0, 0x1 bl enable_irqs - ldr r0, _0817AFA0 + ldr r0, =sub_817ADF4 + 1 bl SetVBlankCallback - ldr r0, _0817AF60 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -775161,38 +748885,21 @@ _0817AEEC: strb r1, [r0] b _0817AFC8 .align 2, 0 -_0817AF60: .4byte 0x030022c0 -_0817AF64: .4byte 0x040000d4 -_0817AF68: .4byte 0x8100c000 -_0817AF6C: .4byte 0x85000100 -_0817AF70: .4byte 0x05000002 -_0817AF74: .4byte 0x810001ff -_0817AF78: .4byte 0x02037714 -_0817AF7C: .4byte 0x00007fff -_0817AF80: .4byte 0x02037b14 -_0817AF84: .4byte 0x00003945 -_0817AF88: .4byte 0x06000020 -_0817AF8C: .4byte 0x00001111 -_0817AF90: .4byte 0x0600f000 -_0817AF94: .4byte 0x000003ff -_0817AF98: .4byte 0x085f06c0 -_0817AF9C: .4byte 0x0000ffff -_0817AFA0: .4byte sub_817ADF4 + 1 + .pool _0817AFA4: bl fade_and_return_progress_probably - ldr r0, _0817AFC0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0817AFC8 - ldr r0, _0817AFC4 + ldr r0, =sub_817ADE4 + 1 bl set_callback2 movs r0, 0x1 b _0817AFCA .align 2, 0 -_0817AFC0: .4byte 0x02037fd4 -_0817AFC4: .4byte sub_817ADE4 + 1 + .pool _0817AFC8: movs r0, 0 _0817AFCA: @@ -775206,7 +748913,7 @@ _0817AFCA: sub_817AFD4: @ 817AFD4 push {r4,lr} sub sp, 0x4 - ldr r0, _0817B000 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r4, r0, r1 @@ -775216,7 +748923,7 @@ sub_817AFD4: @ 817AFD4 cmp r0, 0x1 beq _0817B008 _0817AFEA: - ldr r0, _0817B004 + ldr r0, =0x0000ffff str r0, [sp] movs r1, 0 movs r2, 0 @@ -775226,11 +748933,10 @@ _0817AFEA: strb r0, [r4] b _0817B020 .align 2, 0 -_0817B000: .4byte 0x030022c0 -_0817B004: .4byte 0x0000ffff + .pool _0817B008: bl fade_and_return_progress_probably - ldr r0, _0817B028 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -775244,13 +748950,13 @@ _0817B020: pop {r0} bx r0 .align 2, 0 -_0817B028: .4byte 0x02037fd4 + .pool thumb_func_end sub_817AFD4 thumb_func_start sub_817B02C sub_817B02C: @ 817B02C push {lr} - ldr r0, _0817B05C + ldr r0, =0x085f06c8 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 @@ -775261,15 +748967,14 @@ sub_817B02C: @ 817B02C movs r2, 0x2 movs r3, 0xE0 bl sub_80987D4 - ldr r0, _0817B060 + ldr r0, =0x0860f074 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply pop {r0} bx r0 .align 2, 0 -_0817B05C: .4byte 0x085f06c8 -_0817B060: .4byte 0x0860f074 + .pool thumb_func_end sub_817B02C thumb_func_start load_intro_part2_graphics @@ -775277,13 +748982,13 @@ load_intro_part2_graphics: @ 817B064 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0817B0C0 - ldr r1, _0817B0C4 + ldr r0, =0x085f0740 + ldr r1, =0x06004000 bl LZ77UnCompVram - ldr r0, _0817B0C8 - ldr r1, _0817B0CC + ldr r0, =0x085f0bc0 + ldr r1, =0x06007800 bl LZ77UnCompVram - ldr r0, _0817B0D0 + ldr r0, =0x085f06e0 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -775292,20 +748997,20 @@ load_intro_part2_graphics: @ 817B064 cmp r4, 0x1 beq _0817B0EC _0817B08C: - ldr r0, _0817B0D4 + ldr r0, =0x085f0dbc movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _0817B0D8 - ldr r1, _0817B0DC + ldr r0, =0x085f1398 + ldr r1, =0x06003000 bl LZ77UnCompVram - ldr r0, _0817B0E0 + ldr r0, =0x085f0cfc movs r1, 0 movs r2, 0x60 bl gpu_pal_apply - ldr r0, _0817B0E4 + ldr r0, =0x085f5064 bl gpu_tile_obj_decompress_and_load - ldr r0, _0817B0E8 + ldr r0, =0x085f1668 movs r1, 0x80 lsls r1, 1 movs r2, 0x20 @@ -775313,56 +749018,39 @@ _0817B08C: bl sub_817B76C b _0817B11E .align 2, 0 -_0817B0C0: .4byte 0x085f0740 -_0817B0C4: .4byte 0x06004000 -_0817B0C8: .4byte 0x085f0bc0 -_0817B0CC: .4byte 0x06007800 -_0817B0D0: .4byte 0x085f06e0 -_0817B0D4: .4byte 0x085f0dbc -_0817B0D8: .4byte 0x085f1398 -_0817B0DC: .4byte 0x06003000 -_0817B0E0: .4byte 0x085f0cfc -_0817B0E4: .4byte 0x085f5064 -_0817B0E8: .4byte 0x085f1668 + .pool _0817B0EC: - ldr r0, _0817B130 + ldr r0, =0x085f1824 movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _0817B134 - ldr r1, _0817B138 + ldr r0, =0x085f1eac + ldr r1, =0x06003000 bl LZ77UnCompVram - ldr r0, _0817B13C + ldr r0, =0x085f17e4 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0817B140 + ldr r0, =0x085f50ec bl gpu_tile_obj_decompress_and_load - ldr r0, _0817B144 + ldr r0, =0x085f21b0 movs r1, 0x80 lsls r1, 1 movs r2, 0x20 bl gpu_pal_apply bl sub_817B788 _0817B11E: - ldr r1, _0817B148 + ldr r1, =0x0203bd28 movs r0, 0 strh r0, [r1] - ldr r1, _0817B14C + ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_0817B130: .4byte 0x085f1824 -_0817B134: .4byte 0x085f1eac -_0817B138: .4byte 0x06003000 -_0817B13C: .4byte 0x085f17e4 -_0817B140: .4byte 0x085f50ec -_0817B144: .4byte 0x085f21b0 -_0817B148: .4byte 0x0203bd28 -_0817B14C: .4byte 0x0300301c + .pool thumb_func_end load_intro_part2_graphics thumb_func_start sub_817B150 @@ -775377,13 +749065,13 @@ sub_817B150: @ 817B150 cmp r0, 0x2 beq _0817B194 _0817B162: - ldr r1, _0817B188 + ldr r1, =0x00000603 movs r0, 0xE bl lcd_io_set - ldr r1, _0817B18C + ldr r1, =0x00000702 movs r0, 0xC bl lcd_io_set - ldr r1, _0817B190 + ldr r1, =0x00000f05 movs r0, 0xA bl lcd_io_set movs r1, 0xF2 @@ -775392,17 +749080,15 @@ _0817B162: bl lcd_io_set b _0817B1B6 .align 2, 0 -_0817B188: .4byte 0x00000603 -_0817B18C: .4byte 0x00000702 -_0817B190: .4byte 0x00000f05 + .pool _0817B194: - ldr r1, _0817B1BC + ldr r1, =0x00000603 movs r0, 0xE bl lcd_io_set - ldr r1, _0817B1C0 + ldr r1, =0x00000702 movs r0, 0xC bl lcd_io_set - ldr r1, _0817B1C4 + ldr r1, =0x00000f05 movs r0, 0xA bl lcd_io_set movs r1, 0xF2 @@ -775413,9 +749099,7 @@ _0817B1B6: pop {r0} bx r0 .align 2, 0 -_0817B1BC: .4byte 0x00000603 -_0817B1C0: .4byte 0x00000702 -_0817B1C4: .4byte 0x00000f05 + .pool thumb_func_end sub_817B150 thumb_func_start sub_817B1C8 @@ -775423,25 +749107,21 @@ sub_817B1C8: @ 817B1C8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0817B1EC - ldr r1, _0817B1F0 + ldr r0, =0x085f0740 + ldr r1, =0x06004000 bl LZ77UnCompVram - ldr r0, _0817B1F4 - ldr r1, _0817B1F8 + ldr r0, =0x085f0bc0 + ldr r1, =0x06007800 bl LZ77UnCompVram cmp r4, 0x4 bhi _0817B214 lsls r0, r4, 2 - ldr r1, _0817B1FC + ldr r1, =_0817B200 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0817B1EC: .4byte 0x085f0740 -_0817B1F0: .4byte 0x06004000 -_0817B1F4: .4byte 0x085f0bc0 -_0817B1F8: .4byte 0x06007800 -_0817B1FC: .4byte _0817B200 + .pool .align 2, 0 _0817B200: .4byte _0817B214 @@ -775450,60 +749130,52 @@ _0817B200: .4byte _0817B2DC .4byte _0817B334 _0817B214: - ldr r0, _0817B24C + ldr r0, =0x085f06e0 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0817B250 + ldr r0, =0x085f0dbc movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _0817B254 - ldr r1, _0817B258 + ldr r0, =0x085f1398 + ldr r1, =0x06003000 bl LZ77UnCompVram - ldr r0, _0817B25C + ldr r0, =0x085f0cfc movs r1, 0 movs r2, 0x60 bl gpu_pal_apply - ldr r0, _0817B260 + ldr r0, =0x085f5064 bl gpu_tile_obj_decompress_and_load - ldr r0, _0817B264 - ldr r1, _0817B268 + ldr r0, =0x085f16a8 + ldr r1, =0x06010000 bl LZ77UnCompVram - ldr r0, _0817B26C + ldr r0, =0x085f1668 b _0817B2A6 .align 2, 0 -_0817B24C: .4byte 0x085f06e0 -_0817B250: .4byte 0x085f0dbc -_0817B254: .4byte 0x085f1398 -_0817B258: .4byte 0x06003000 -_0817B25C: .4byte 0x085f0cfc -_0817B260: .4byte 0x085f5064 -_0817B264: .4byte 0x085f16a8 -_0817B268: .4byte 0x06010000 -_0817B26C: .4byte 0x085f1668 + .pool _0817B270: - ldr r0, _0817B2B8 + ldr r0, =0x085f0700 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0817B2BC + ldr r0, =0x085f0dbc movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _0817B2C0 - ldr r1, _0817B2C4 + ldr r0, =0x085f1398 + ldr r1, =0x06003000 bl LZ77UnCompVram - ldr r0, _0817B2C8 + ldr r0, =0x085f0d5c movs r1, 0 movs r2, 0x60 bl gpu_pal_apply - ldr r0, _0817B2CC + ldr r0, =0x085f5064 bl gpu_tile_obj_decompress_and_load - ldr r0, _0817B2D0 - ldr r1, _0817B2D4 + ldr r0, =0x085f16a8 + ldr r1, =0x06010000 bl LZ77UnCompVram - ldr r0, _0817B2D8 + ldr r0, =0x085f1688 _0817B2A6: movs r1, 0x80 lsls r1, 1 @@ -775512,33 +749184,25 @@ _0817B2A6: bl sub_817B76C b _0817B370 .align 2, 0 -_0817B2B8: .4byte 0x085f0700 -_0817B2BC: .4byte 0x085f0dbc -_0817B2C0: .4byte 0x085f1398 -_0817B2C4: .4byte 0x06003000 -_0817B2C8: .4byte 0x085f0d5c -_0817B2CC: .4byte 0x085f5064 -_0817B2D0: .4byte 0x085f16a8 -_0817B2D4: .4byte 0x06010000 -_0817B2D8: .4byte 0x085f1688 + .pool _0817B2DC: - ldr r0, _0817B31C + ldr r0, =0x085f0700 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0817B320 + ldr r0, =0x085f1824 movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _0817B324 - ldr r1, _0817B328 + ldr r0, =0x085f1eac + ldr r1, =0x06003000 bl LZ77UnCompVram - ldr r4, _0817B32C + ldr r4, =0x085f1804 adds r0, r4, 0 movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0817B330 + ldr r0, =0x085f50ec bl gpu_tile_obj_decompress_and_load movs r1, 0x80 lsls r1, 1 @@ -775548,68 +749212,55 @@ _0817B2DC: bl sub_817B788 b _0817B370 .align 2, 0 -_0817B31C: .4byte 0x085f0700 -_0817B320: .4byte 0x085f1824 -_0817B324: .4byte 0x085f1eac -_0817B328: .4byte 0x06003000 -_0817B32C: .4byte 0x085f1804 -_0817B330: .4byte 0x085f50ec + .pool _0817B334: - ldr r0, _0817B384 + ldr r0, =0x085f0720 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0817B388 + ldr r0, =0x085f235c movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _0817B38C - ldr r1, _0817B390 + ldr r0, =0x085f2568 + ldr r1, =0x06003000 bl LZ77UnCompVram - ldr r0, _0817B394 + ldr r0, =0x085f231c movs r1, 0 movs r2, 0x40 bl gpu_pal_apply - ldr r0, _0817B398 + ldr r0, =0x085f5180 bl gpu_tile_obj_decompress_and_load - ldr r0, _0817B39C + ldr r0, =0x085f2548 movs r1, 0x80 lsls r1, 1 movs r2, 0x20 bl gpu_pal_apply bl sub_817B7A4 _0817B370: - ldr r1, _0817B3A0 + ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] - ldr r1, _0817B3A4 + ldr r1, =0x0203bd28 movs r0, 0 strh r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_0817B384: .4byte 0x085f0720 -_0817B388: .4byte 0x085f235c -_0817B38C: .4byte 0x085f2568 -_0817B390: .4byte 0x06003000 -_0817B394: .4byte 0x085f231c -_0817B398: .4byte 0x085f5180 -_0817B39C: .4byte 0x085f2548 -_0817B3A0: .4byte 0x0300301c -_0817B3A4: .4byte 0x0203bd28 + .pool thumb_func_end sub_817B1C8 thumb_func_start sub_817B3A8 sub_817B3A8: @ 817B3A8 push {lr} - ldr r1, _0817B3D0 + ldr r1, =0x00000603 movs r0, 0xE bl lcd_io_set - ldr r1, _0817B3D4 + ldr r1, =0x00000702 movs r0, 0xC bl lcd_io_set - ldr r1, _0817B3D8 + ldr r1, =0x00000f05 movs r0, 0xA bl lcd_io_set movs r1, 0xFA @@ -775619,9 +749270,7 @@ sub_817B3A8: @ 817B3A8 pop {r0} bx r0 .align 2, 0 -_0817B3D0: .4byte 0x00000603 -_0817B3D4: .4byte 0x00000702 -_0817B3D8: .4byte 0x00000f05 + .pool thumb_func_end sub_817B3A8 thumb_func_start sub_817B3DC @@ -775644,7 +749293,7 @@ sub_817B3DC: @ 817B3DC mov r8, r0 lsls r3, 16 lsrs r3, 16 - ldr r1, _0817B450 + ldr r1, =sub_817B458 + 1 mov r9, r1 mov r0, r9 movs r1, 0 @@ -775653,7 +749302,7 @@ sub_817B3DC: @ 817B3DC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _0817B454 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -775683,8 +749332,7 @@ sub_817B3DC: @ 817B3DC pop {r1} bx r1 .align 2, 0 -_0817B450: .4byte sub_817B458 + 1 -_0817B454: .4byte 0x03005e00 + .pool thumb_func_end sub_817B3DC thumb_func_start sub_817B458 @@ -775692,7 +749340,7 @@ sub_817B458: @ 817B458 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0817B4E4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -775714,8 +749362,8 @@ sub_817B458: @ 817B458 ldrh r1, [r4, 0xC] movs r0, 0x14 bl lcd_io_set - ldr r2, _0817B4E8 - ldr r0, _0817B4EC + ldr r2, =0x0203bd24 + ldr r0, =0x0203bd26 ldrh r1, [r0] ldrh r2, [r2] adds r1, r2 @@ -775745,8 +749393,8 @@ _0817B4A0: ldrsh r0, [r4, r1] cmp r0, 0 beq _0817B4F0 - ldr r2, _0817B4E8 - ldr r0, _0817B4EC + ldr r2, =0x0203bd24 + ldr r0, =0x0203bd26 ldrh r1, [r0] ldrh r2, [r2] adds r1, r2 @@ -775756,16 +749404,14 @@ _0817B4A0: bl lcd_io_set b _0817B4FA .align 2, 0 -_0817B4E4: .4byte 0x03005e00 -_0817B4E8: .4byte 0x0203bd24 -_0817B4EC: .4byte 0x0203bd26 + .pool _0817B4F0: - ldr r0, _0817B538 + ldr r0, =0x0203bd24 ldrh r1, [r0] movs r0, 0x1A bl lcd_io_set _0817B4FA: - ldr r0, _0817B53C + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -775787,7 +749433,7 @@ _0817B4FA: ldrh r1, [r2, 0x18] movs r0, 0x1C bl lcd_io_set - ldr r0, _0817B538 + ldr r0, =0x0203bd24 ldrh r1, [r0] movs r0, 0x1E bl lcd_io_set @@ -775796,8 +749442,7 @@ _0817B532: pop {r0} bx r0 .align 2, 0 -_0817B538: .4byte 0x0203bd24 -_0817B53C: .4byte 0x03005e00 + .pool thumb_func_end sub_817B458 thumb_func_start sub_817B540 @@ -775813,13 +749458,13 @@ sub_817B540: @ 817B540 cmp r0, 0x2 beq _0817B5B8 _0817B554: - ldr r0, _0817B580 + ldr r0, =0x030022c0 ldr r2, [r0, 0x20] movs r0, 0x3 ands r0, r2 cmp r0, 0 bne _0817B620 - ldr r0, _0817B584 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -775829,18 +749474,16 @@ _0817B554: ands r2, r0 cmp r2, 0 beq _0817B58C - ldr r2, _0817B588 + ldr r2, =0x02037714 ldrh r1, [r2, 0x12] mov r0, sp strh r1, [r0] ldrh r1, [r2, 0x14] b _0817B596 .align 2, 0 -_0817B580: .4byte 0x030022c0 -_0817B584: .4byte 0x02037fd4 -_0817B588: .4byte 0x02037714 + .pool _0817B58C: - ldr r2, _0817B5B4 + ldr r2, =0x02037714 ldrh r1, [r2, 0x14] mov r0, sp strh r1, [r0] @@ -775859,15 +749502,15 @@ _0817B596: bl gpu_pal_apply b _0817B620 .align 2, 0 -_0817B5B4: .4byte 0x02037714 + .pool _0817B5B8: - ldr r0, _0817B5E8 + ldr r0, =0x030022c0 ldr r2, [r0, 0x20] movs r0, 0x3 ands r0, r2 cmp r0, 0 bne _0817B620 - ldr r0, _0817B5EC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -775878,17 +749521,14 @@ _0817B5B8: cmp r2, 0 beq _0817B5F8 mov r1, sp - ldr r2, _0817B5F0 + ldr r2, =0x00003d27 adds r0, r2, 0 strh r0, [r1] adds r1, 0x2 - ldr r2, _0817B5F4 + ldr r2, =0x00000295 b _0817B606 .align 2, 0 -_0817B5E8: .4byte 0x030022c0 -_0817B5EC: .4byte 0x02037fd4 -_0817B5F0: .4byte 0x00003d27 -_0817B5F4: .4byte 0x00000295 + .pool _0817B5F8: mov r1, sp movs r2, 0xC7 @@ -775896,7 +749536,7 @@ _0817B5F8: adds r0, r2, 0 strh r0, [r1] adds r1, 0x2 - ldr r2, _0817B628 + ldr r2, =0x00003d27 _0817B606: adds r0, r2, 0 strh r0, [r1] @@ -775915,14 +749555,14 @@ _0817B620: pop {r0} bx r0 .align 2, 0 -_0817B628: .4byte 0x00003d27 + .pool thumb_func_end sub_817B540 thumb_func_start sub_817B62C sub_817B62C: @ 817B62C push {lr} adds r2, r0, 0 - ldr r0, _0817B648 + ldr r0, =0x0203bd28 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x2 @@ -775933,7 +749573,7 @@ sub_817B62C: @ 817B62C bl obj_delete_and_free_tiles b _0817B690 .align 2, 0 -_0817B648: .4byte 0x0203bd28 + .pool _0817B64C: movs r1, 0x20 ldrsh r0, [r2, r1] @@ -775947,25 +749587,23 @@ _0817B64C: strh r0, [r2, 0x32] cmp r1, 0xFF ble _0817B668 - ldr r0, _0817B67C + ldr r0, =0x0000ffe0 strh r0, [r2, 0x20] _0817B668: movs r1, 0x2E ldrsh r0, [r2, r1] cmp r0, 0 beq _0817B688 - ldr r1, _0817B680 - ldr r0, _0817B684 + ldr r1, =0x0203bd24 + ldr r0, =0x0203bd26 ldrh r0, [r0] ldrh r1, [r1] adds r0, r1 b _0817B68C .align 2, 0 -_0817B67C: .4byte 0x0000ffe0 -_0817B680: .4byte 0x0203bd24 -_0817B684: .4byte 0x0203bd26 + .pool _0817B688: - ldr r0, _0817B694 + ldr r0, =0x0203bd24 ldrh r0, [r0] _0817B68C: negs r0, r0 @@ -775974,7 +749612,7 @@ _0817B690: pop {r0} bx r0 .align 2, 0 -_0817B694: .4byte 0x0203bd24 + .pool thumb_func_end sub_817B62C thumb_func_start sub_817B698 @@ -775996,7 +749634,7 @@ sub_817B698: @ 817B698 movs r7, 0 cmp r7, r8 bcs _0817B74E - ldr r0, _0817B760 + ldr r0, =0x02020630 mov r10, r0 movs r2, 0x3F mov r9, r2 @@ -776007,7 +749645,7 @@ _0817B6C2: ldrb r1, [r6, 0x1] ldrb r2, [r6, 0x2] ldrb r3, [r6, 0x3] - ldr r0, _0817B764 + ldr r0, =0x085f504c bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 @@ -776047,7 +749685,7 @@ _0817B6C2: movs r0, 0xF ands r3, r0 strb r3, [r4, 0x5] - ldr r0, _0817B768 + ldr r0, =0x02020638 adds r5, r0 ldr r2, [sp, 0x8] str r2, [r5] @@ -776078,54 +749716,49 @@ _0817B74E: pop {r0} bx r0 .align 2, 0 -_0817B760: .4byte 0x02020630 -_0817B764: .4byte 0x085f504c -_0817B768: .4byte 0x02020638 + .pool thumb_func_end sub_817B698 thumb_func_start sub_817B76C sub_817B76C: @ 817B76C push {lr} - ldr r1, _0817B780 - ldr r2, _0817B784 + ldr r1, =0x085f50a4 + ldr r2, =0x085f5094 movs r0, 0 movs r3, 0x9 bl sub_817B698 pop {r0} bx r0 .align 2, 0 -_0817B780: .4byte 0x085f50a4 -_0817B784: .4byte 0x085f5094 + .pool thumb_func_end sub_817B76C thumb_func_start sub_817B788 sub_817B788: @ 817B788 push {lr} - ldr r1, _0817B79C - ldr r2, _0817B7A0 + ldr r1, =0x085f5120 + ldr r2, =0x085f5114 movs r0, 0x1 movs r3, 0xC bl sub_817B698 pop {r0} bx r0 .align 2, 0 -_0817B79C: .4byte 0x085f5120 -_0817B7A0: .4byte 0x085f5114 + .pool thumb_func_end sub_817B788 thumb_func_start sub_817B7A4 sub_817B7A4: @ 817B7A4 push {lr} - ldr r1, _0817B7B8 - ldr r2, _0817B7BC + ldr r1, =0x085f519c + ldr r2, =0x085f5198 movs r0, 0x1 movs r3, 0x6 bl sub_817B698 pop {r0} bx r0 .align 2, 0 -_0817B7B8: .4byte 0x085f519c -_0817B7BC: .4byte 0x085f5198 + .pool thumb_func_end sub_817B7A4 thumb_func_start nullsub_65 @@ -776136,7 +749769,7 @@ nullsub_65: @ 817B7C0 thumb_func_start sub_817B7C4 sub_817B7C4: @ 817B7C4 push {r4,lr} - ldr r4, _0817B830 + ldr r4, =0x02020630 movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -776189,7 +749822,7 @@ sub_817B7C4: @ 817B7C4 pop {r0} bx r0 .align 2, 0 -_0817B830: .4byte 0x02020630 + .pool thumb_func_end sub_817B7C4 thumb_func_start sub_817B834 @@ -776197,7 +749830,7 @@ sub_817B834: @ 817B834 push {r4-r6,lr} adds r5, r0, 0 adds r4, r1, 0 - ldr r0, _0817B880 + ldr r0, =0x085f51ec lsls r5, 16 asrs r5, 16 lsls r4, 16 @@ -776209,7 +749842,7 @@ sub_817B834: @ 817B834 adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _0817B884 + ldr r0, =0x085f523c adds r4, 0x8 lsls r4, 16 asrs r4, 16 @@ -776219,7 +749852,7 @@ sub_817B834: @ 817B834 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _0817B888 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -776230,9 +749863,7 @@ sub_817B834: @ 817B834 pop {r1} bx r1 .align 2, 0 -_0817B880: .4byte 0x085f51ec -_0817B884: .4byte 0x085f523c -_0817B888: .4byte 0x02020630 + .pool thumb_func_end sub_817B834 thumb_func_start sub_817B88C @@ -776240,7 +749871,7 @@ sub_817B88C: @ 817B88C push {r4-r6,lr} adds r5, r0, 0 adds r4, r1, 0 - ldr r0, _0817B8D8 + ldr r0, =0x085f5204 lsls r5, 16 asrs r5, 16 lsls r4, 16 @@ -776252,7 +749883,7 @@ sub_817B88C: @ 817B88C adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _0817B8DC + ldr r0, =0x085f5254 adds r4, 0x8 lsls r4, 16 asrs r4, 16 @@ -776262,7 +749893,7 @@ sub_817B88C: @ 817B88C bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _0817B8E0 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -776273,9 +749904,7 @@ sub_817B88C: @ 817B88C pop {r1} bx r1 .align 2, 0 -_0817B8D8: .4byte 0x085f5204 -_0817B8DC: .4byte 0x085f5254 -_0817B8E0: .4byte 0x02020630 + .pool thumb_func_end sub_817B88C thumb_func_start nullsub_66 @@ -776286,7 +749915,7 @@ nullsub_66: @ 817B8E4 thumb_func_start sub_817B8E8 sub_817B8E8: @ 817B8E8 push {r4,lr} - ldr r4, _0817B944 + ldr r4, =0x02020630 movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -776332,7 +749961,7 @@ sub_817B8E8: @ 817B8E8 pop {r0} bx r0 .align 2, 0 -_0817B944: .4byte 0x02020630 + .pool thumb_func_end sub_817B8E8 thumb_func_start sub_817B948 @@ -776342,11 +749971,11 @@ sub_817B948: @ 817B948 push {r6} adds r2, r0, 0 adds r5, r1, 0 - ldr r0, _0817B9B4 + ldr r0, =0x085f528c mov r8, r0 lsls r2, 16 asrs r4, r2, 16 - ldr r0, _0817B9B8 + ldr r0, =0xffe00000 adds r2, r0 asrs r2, 16 lsls r5, 16 @@ -776369,7 +749998,7 @@ sub_817B948: @ 817B948 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r5, _0817B9BC + ldr r5, =0x02020630 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -776379,7 +750008,7 @@ sub_817B948: @ 817B948 bl obj_anim_image_start adds r5, 0x1C adds r4, r5 - ldr r0, _0817B9C0 + ldr r0, =sub_817B8E8 + 1 str r0, [r4] adds r0, r6, 0 pop {r3} @@ -776388,10 +750017,7 @@ sub_817B948: @ 817B948 pop {r1} bx r1 .align 2, 0 -_0817B9B4: .4byte 0x085f528c -_0817B9B8: .4byte 0xffe00000 -_0817B9BC: .4byte 0x02020630 -_0817B9C0: .4byte sub_817B8E8 + 1 + .pool thumb_func_end sub_817B948 thumb_func_start sub_817B9C4 @@ -776401,11 +750027,11 @@ sub_817B9C4: @ 817B9C4 push {r6} adds r2, r0, 0 adds r5, r1, 0 - ldr r0, _0817BA30 + ldr r0, =0x085f52a4 mov r8, r0 lsls r2, 16 asrs r4, r2, 16 - ldr r0, _0817BA34 + ldr r0, =0xffe00000 adds r2, r0 asrs r2, 16 lsls r5, 16 @@ -776428,7 +750054,7 @@ sub_817B9C4: @ 817B9C4 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r5, _0817BA38 + ldr r5, =0x02020630 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -776438,7 +750064,7 @@ sub_817B9C4: @ 817B9C4 bl obj_anim_image_start adds r5, 0x1C adds r4, r5 - ldr r0, _0817BA3C + ldr r0, =sub_817B8E8 + 1 str r0, [r4] adds r0, r6, 0 pop {r3} @@ -776447,10 +750073,7 @@ sub_817B9C4: @ 817B9C4 pop {r1} bx r1 .align 2, 0 -_0817BA30: .4byte 0x085f52a4 -_0817BA34: .4byte 0xffe00000 -_0817BA38: .4byte 0x02020630 -_0817BA3C: .4byte sub_817B8E8 + 1 + .pool thumb_func_end sub_817B9C4 thumb_func_start nullsub_67 @@ -776463,7 +750086,7 @@ sub_817BA44: @ 817BA44 push {r4,r5,lr} sub sp, 0x4 movs r4, 0 - ldr r5, _0817BA78 + ldr r5, =0x085f5458 _0817BA4C: adds r0, r4, 0 adds r0, 0x14 @@ -776486,7 +750109,7 @@ _0817BA4C: pop {r0} bx r0 .align 2, 0 -_0817BA78: .4byte 0x085f5458 + .pool thumb_func_end sub_817BA44 thumb_func_start sub_817BA7C @@ -776595,7 +750218,7 @@ sub_817BB38: @ 817BB38 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0817BB88 + ldr r0, =0x085f5440 movs r1, 0x78 movs r2, 0x58 movs r3, 0 @@ -776604,7 +750227,7 @@ sub_817BB38: @ 817BB38 lsrs r0, 24 cmp r0, 0x40 beq _0817BB82 - ldr r4, _0817BB8C + ldr r4, =0x02020630 lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -776626,16 +750249,14 @@ sub_817BB38: @ 817BB38 strb r0, [r2, 0x3] adds r4, 0x1C adds r3, r4 - ldr r0, _0817BB90 + ldr r0, =sub_817BA7C + 1 str r0, [r3] _0817BB82: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0817BB88: .4byte 0x085f5440 -_0817BB8C: .4byte 0x02020630 -_0817BB90: .4byte sub_817BA7C + 1 + .pool thumb_func_end sub_817BB38 thumb_func_start sub_817BB94 @@ -776702,7 +750323,7 @@ sub_817BC08: @ 817BC08 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0817BC64 + ldr r0, =0x085f5440 movs r1, 0x78 movs r2, 0x8 movs r3, 0 @@ -776711,7 +750332,7 @@ sub_817BC08: @ 817BC08 lsrs r0, 24 cmp r0, 0x40 beq _0817BC5E - ldr r4, _0817BC68 + ldr r4, =0x02020630 lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -776739,16 +750360,14 @@ sub_817BC08: @ 817BC08 strb r0, [r2] adds r4, 0x1C adds r3, r4 - ldr r0, _0817BC6C + ldr r0, =sub_817BB94 + 1 str r0, [r3] _0817BC5E: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0817BC64: .4byte 0x085f5440 -_0817BC68: .4byte 0x02020630 -_0817BC6C: .4byte sub_817BB94 + 1 + .pool thumb_func_end sub_817BC08 thumb_func_start sub_817BC70 @@ -776797,7 +750416,7 @@ sub_817BCB8: @ 817BCB8 lsrs r6, r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _0817BD14 + ldr r0, =0x085f5440 movs r1, 0x78 movs r2, 0x38 movs r3, 0 @@ -776806,7 +750425,7 @@ sub_817BCB8: @ 817BCB8 lsrs r0, 24 cmp r0, 0x40 beq _0817BD0E - ldr r4, _0817BD18 + ldr r4, =0x02020630 lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -776832,16 +750451,14 @@ sub_817BCB8: @ 817BCB8 strb r0, [r2] adds r4, 0x1C adds r3, r4 - ldr r0, _0817BD1C + ldr r0, =sub_817BC70 + 1 str r0, [r3] _0817BD0E: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0817BD14: .4byte 0x085f5440 -_0817BD18: .4byte 0x02020630 -_0817BD1C: .4byte sub_817BC70 + 1 + .pool thumb_func_end sub_817BCB8 thumb_func_start sub_817BD20 @@ -776961,7 +750578,7 @@ sub_817BDF0: @ 817BDF0 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _0817BE6C + ldr r0, =0x085f5440 movs r1, 0x78 movs r2, 0x38 movs r3, 0 @@ -776971,7 +750588,7 @@ sub_817BDF0: @ 817BDF0 cmp r4, 0x40 beq _0817BE60 bl GenerateRandomNumber - ldr r6, _0817BE70 + ldr r6, =0x02020630 lsls r5, r4, 4 adds r5, r4 lsls r5, 2 @@ -777008,7 +750625,7 @@ sub_817BDF0: @ 817BDF0 strb r0, [r4] adds r6, 0x1C adds r5, r6 - ldr r0, _0817BE74 + ldr r0, =sub_817BD20 + 1 str r0, [r5] _0817BE60: pop {r3} @@ -777017,23 +750634,20 @@ _0817BE60: pop {r0} bx r0 .align 2, 0 -_0817BE6C: .4byte 0x085f5440 -_0817BE70: .4byte 0x02020630 -_0817BE74: .4byte sub_817BD20 + 1 + .pool thumb_func_end sub_817BDF0 thumb_func_start sub_817BE78 sub_817BE78: @ 817BE78 push {lr} - ldr r0, _0817BE8C + ldr r0, =0x085f540c bl gpu_tile_obj_decompress_and_load3 - ldr r0, _0817BE90 + ldr r0, =0x085f541c bl gpu_pal_obj_alloc_and_load_multiple pop {r0} bx r0 .align 2, 0 -_0817BE8C: .4byte 0x085f540c -_0817BE90: .4byte 0x085f541c + .pool thumb_func_end sub_817BE78 thumb_func_start sub_817BE94 @@ -777042,12 +750656,12 @@ sub_817BE94: @ 817BE94 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _0817BEBC + ldr r0, =sub_817BEC4 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0817BEC0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -777057,8 +750671,7 @@ sub_817BE94: @ 817BE94 pop {r1} bx r1 .align 2, 0 -_0817BEBC: .4byte sub_817BEC4 + 1 -_0817BEC0: .4byte 0x03005e00 + .pool thumb_func_end sub_817BE94 thumb_func_start sub_817BEC4 @@ -777069,7 +750682,7 @@ sub_817BEC4: @ 817BEC4 lsls r4, 24 lsrs r4, 24 bl sub_817BA44 - ldr r0, _0817BF08 + ldr r0, =0x03005e00 lsls r5, r4, 2 adds r5, r4 lsls r5, 3 @@ -777080,13 +750693,13 @@ sub_817BEC4: @ 817BEC4 ldrsh r1, [r5, r0] movs r0, 0x3 lsls r0, r1 - ldr r1, _0817BF0C + ldr r1, =0x00007fff str r1, [sp] movs r1, 0xA movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0817BF10 + ldr r0, =sub_817BF14 + 1 str r0, [r5] movs r0, 0x8C bl audio_play @@ -777095,9 +750708,7 @@ sub_817BEC4: @ 817BEC4 pop {r0} bx r0 .align 2, 0 -_0817BF08: .4byte 0x03005e00 -_0817BF0C: .4byte 0x00007fff -_0817BF10: .4byte sub_817BF14 + 1 + .pool thumb_func_end sub_817BEC4 thumb_func_start sub_817BF14 @@ -777105,7 +750716,7 @@ sub_817BF14: @ 817BF14 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0817BF6C + ldr r1, =0x03005e00 lsls r3, r5, 2 adds r0, r3, r5 lsls r0, 3 @@ -777138,7 +750749,7 @@ _0817BF3C: cmp r4, 0x3 bls _0817BF3C _0817BF5A: - ldr r0, _0817BF6C + ldr r0, =0x03005e00 adds r1, r7, r5 lsls r1, 3 adds r1, r0 @@ -777147,18 +750758,18 @@ _0817BF5A: strh r0, [r1, 0x26] b _0817BF78 .align 2, 0 -_0817BF6C: .4byte 0x03005e00 + .pool _0817BF70: movs r0, 0x60 strh r0, [r1, 0x26] - ldr r0, _0817BF80 + ldr r0, =sub_817BF84 + 1 str r0, [r1] _0817BF78: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0817BF80: .4byte sub_817BF84 + 1 + .pool thumb_func_end sub_817BF14 thumb_func_start sub_817BF84 @@ -777166,7 +750777,7 @@ sub_817BF84: @ 817BF84 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _0817BFA4 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -777180,7 +750791,7 @@ sub_817BF84: @ 817BF84 strh r0, [r1, 0x26] b _0817BFAE .align 2, 0 -_0817BFA4: .4byte 0x03005e00 + .pool _0817BFA8: adds r0, r2, 0 bl remove_task @@ -777193,7 +750804,7 @@ _0817BFAE: thumb_func_start sub_817BFB4 sub_817BFB4: @ 817BFB4 push {lr} - ldr r0, _0817BFC8 + ldr r0, =sub_817BFCC + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -777201,7 +750812,7 @@ sub_817BFB4: @ 817BFB4 pop {r1} bx r1 .align 2, 0 -_0817BFC8: .4byte sub_817BFCC + 1 + .pool thumb_func_end sub_817BFB4 thumb_func_start sub_817BFCC @@ -777211,14 +750822,14 @@ sub_817BFCC: @ 817BFCC lsls r4, 24 lsrs r4, 24 bl sub_817BA44 - ldr r1, _0817BFF8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0x26] - ldr r1, _0817BFFC + ldr r1, =sub_817C000 + 1 str r1, [r0] movs r0, 0xB7 bl audio_play @@ -777226,8 +750837,7 @@ sub_817BFCC: @ 817BFCC pop {r0} bx r0 .align 2, 0 -_0817BFF8: .4byte 0x03005e00 -_0817BFFC: .4byte sub_817C000 + 1 + .pool thumb_func_end sub_817BFCC thumb_func_start sub_817C000 @@ -777235,7 +750845,7 @@ sub_817C000: @ 817C000 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0817C044 + ldr r1, =0x03005e00 lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 @@ -777258,7 +750868,7 @@ _0817C020: cmp r4, 0x8 bls _0817C020 _0817C032: - ldr r0, _0817C044 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -777267,16 +750877,16 @@ _0817C032: strh r0, [r1, 0x26] b _0817C04C .align 2, 0 -_0817C044: .4byte 0x03005e00 + .pool _0817C048: - ldr r0, _0817C054 + ldr r0, =sub_817C058 + 1 str r0, [r1] _0817C04C: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0817C054: .4byte sub_817C058 + 1 + .pool thumb_func_end sub_817C000 thumb_func_start sub_817C058 @@ -777292,7 +750902,7 @@ sub_817C058: @ 817C058 thumb_func_start sub_817C068 sub_817C068: @ 817C068 push {lr} - ldr r0, _0817C07C + ldr r0, =sub_817C080 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -777300,7 +750910,7 @@ sub_817C068: @ 817C068 pop {r1} bx r1 .align 2, 0 -_0817C07C: .4byte sub_817C080 + 1 + .pool thumb_func_end sub_817C068 thumb_func_start sub_817C080 @@ -777310,14 +750920,14 @@ sub_817C080: @ 817C080 lsls r4, 24 lsrs r4, 24 bl sub_817BA44 - ldr r1, _0817C0AC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0x26] - ldr r1, _0817C0B0 + ldr r1, =sub_817C0B4 + 1 str r1, [r0] movs r0, 0x66 bl audio_play @@ -777325,8 +750935,7 @@ sub_817C080: @ 817C080 pop {r0} bx r0 .align 2, 0 -_0817C0AC: .4byte 0x03005e00 -_0817C0B0: .4byte sub_817C0B4 + 1 + .pool thumb_func_end sub_817C080 thumb_func_start sub_817C0B4 @@ -777334,7 +750943,7 @@ sub_817C0B4: @ 817C0B4 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0817C120 + ldr r1, =0x03005e00 lsls r2, r5, 2 adds r0, r2, r5 lsls r0, 3 @@ -777358,7 +750967,7 @@ _0817C0D4: cmp r4, 0xF bls _0817C0D4 _0817C0E8: - ldr r0, _0817C120 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -777378,7 +750987,7 @@ _0817C0FA: cmp r4, 0xF bls _0817C0FA _0817C10E: - ldr r0, _0817C120 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 @@ -777387,16 +750996,16 @@ _0817C10E: strh r0, [r1, 0x26] b _0817C128 .align 2, 0 -_0817C120: .4byte 0x03005e00 + .pool _0817C124: - ldr r0, _0817C130 + ldr r0, =sub_817C134 + 1 str r0, [r1] _0817C128: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0817C130: .4byte sub_817C134 + 1 + .pool thumb_func_end sub_817C0B4 thumb_func_start sub_817C134 @@ -777415,12 +751024,12 @@ sub_817C144: @ 817C144 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _0817C16C + ldr r0, =sub_817C174 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0817C170 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -777430,8 +751039,7 @@ sub_817C144: @ 817C144 pop {r1} bx r1 .align 2, 0 -_0817C16C: .4byte sub_817C174 + 1 -_0817C170: .4byte 0x03005e00 + .pool thumb_func_end sub_817C144 thumb_func_start sub_817C174 @@ -777442,25 +751050,25 @@ sub_817C174: @ 817C174 lsls r4, 24 lsrs r4, 24 bl sub_817BA44 - ldr r0, _0817C1BC + ldr r0, =0x03005e00 lsls r5, r4, 2 adds r5, r4 lsls r5, 3 adds r5, r0 movs r0, 0 strh r0, [r5, 0x26] - ldr r0, _0817C1C0 - ldr r1, _0817C1C4 + ldr r0, =0x02037b54 + ldr r1, =0x02037754 movs r2, 0x30 bl CpuSet - ldr r0, _0817C1C8 - ldr r1, _0817C1CC + ldr r0, =0xfff9041c + ldr r1, =0x00007fff str r1, [sp] movs r1, 0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0817C1D0 + ldr r0, =sub_817C1D4 + 1 str r0, [r5] movs r0, 0xCA bl audio_play @@ -777469,12 +751077,7 @@ sub_817C174: @ 817C174 pop {r0} bx r0 .align 2, 0 -_0817C1BC: .4byte 0x03005e00 -_0817C1C0: .4byte 0x02037b54 -_0817C1C4: .4byte 0x02037754 -_0817C1C8: .4byte 0xfff9041c -_0817C1CC: .4byte 0x00007fff -_0817C1D0: .4byte sub_817C1D4 + 1 + .pool thumb_func_end sub_817C174 thumb_func_start sub_817C1D4 @@ -777483,7 +751086,7 @@ sub_817C1D4: @ 817C1D4 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0817C20C + ldr r1, =0x03005e00 lsls r5, r6, 2 adds r0, r5, r6 lsls r0, 3 @@ -777505,7 +751108,7 @@ sub_817C1D4: @ 817C1D4 bl sub_817BDF0 b _0817C234 .align 2, 0 -_0817C20C: .4byte 0x03005e00 + .pool _0817C210: movs r4, 0 _0817C212: @@ -777518,15 +751121,15 @@ _0817C212: bls _0817C212 b _0817C234 _0817C224: - ldr r0, _0817C244 - ldr r1, _0817C248 + ldr r0, =0xffff041c + ldr r1, =0x00007fff str r1, [sp] movs r1, 0x10 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 _0817C234: - ldr r0, _0817C24C + ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 adds r1, r0 @@ -777535,11 +751138,9 @@ _0817C234: strh r0, [r1, 0x26] b _0817C254 .align 2, 0 -_0817C244: .4byte 0xffff041c -_0817C248: .4byte 0x00007fff -_0817C24C: .4byte 0x03005e00 + .pool _0817C250: - ldr r0, _0817C25C + ldr r0, =sub_817C260 + 1 str r0, [r1] _0817C254: add sp, 0x4 @@ -777547,7 +751148,7 @@ _0817C254: pop {r0} bx r0 .align 2, 0 -_0817C25C: .4byte sub_817C260 + 1 + .pool thumb_func_end sub_817C1D4 thumb_func_start sub_817C260 @@ -777555,7 +751156,7 @@ sub_817C260: @ 817C260 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _0817C27C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -777567,7 +751168,7 @@ _0817C278: pop {r0} bx r0 .align 2, 0 -_0817C27C: .4byte 0x02037fd4 + .pool thumb_func_end sub_817C260 thumb_func_start sub_817C280 @@ -777576,12 +751177,12 @@ sub_817C280: @ 817C280 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _0817C2A8 + ldr r0, =sub_817C2B0 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0817C2AC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -777591,8 +751192,7 @@ sub_817C280: @ 817C280 pop {r1} bx r1 .align 2, 0 -_0817C2A8: .4byte sub_817C2B0 + 1 -_0817C2AC: .4byte 0x03005e00 + .pool thumb_func_end sub_817C280 thumb_func_start sub_817C2B0 @@ -777603,25 +751203,25 @@ sub_817C2B0: @ 817C2B0 lsls r4, 24 lsrs r4, 24 bl sub_817BA44 - ldr r0, _0817C2F8 + ldr r0, =0x03005e00 lsls r5, r4, 2 adds r5, r4 lsls r5, 3 adds r5, r0 movs r0, 0 strh r0, [r5, 0x26] - ldr r0, _0817C2FC - ldr r1, _0817C300 + ldr r0, =0x02037b54 + ldr r1, =0x02037754 movs r2, 0x30 bl CpuSet - ldr r0, _0817C304 - ldr r1, _0817C308 + ldr r0, =0xfff90400 + ldr r1, =0x00007fff str r1, [sp] movs r1, 0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _0817C30C + ldr r0, =sub_817C310 + 1 str r0, [r5] movs r0, 0xCA bl audio_play @@ -777630,12 +751230,7 @@ sub_817C2B0: @ 817C2B0 pop {r0} bx r0 .align 2, 0 -_0817C2F8: .4byte 0x03005e00 -_0817C2FC: .4byte 0x02037b54 -_0817C300: .4byte 0x02037754 -_0817C304: .4byte 0xfff90400 -_0817C308: .4byte 0x00007fff -_0817C30C: .4byte sub_817C310 + 1 + .pool thumb_func_end sub_817C2B0 thumb_func_start sub_817C310 @@ -777644,7 +751239,7 @@ sub_817C310: @ 817C310 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0817C348 + ldr r1, =0x03005e00 lsls r5, r6, 2 adds r0, r5, r6 lsls r0, 3 @@ -777666,7 +751261,7 @@ sub_817C310: @ 817C310 bl sub_817BDF0 b _0817C370 .align 2, 0 -_0817C348: .4byte 0x03005e00 + .pool _0817C34C: movs r4, 0 _0817C34E: @@ -777679,15 +751274,15 @@ _0817C34E: bls _0817C34E b _0817C370 _0817C360: - ldr r0, _0817C380 - ldr r1, _0817C384 + ldr r0, =0xffff0400 + ldr r1, =0x00007fff str r1, [sp] movs r1, 0x10 movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 _0817C370: - ldr r0, _0817C388 + ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 adds r1, r0 @@ -777696,11 +751291,9 @@ _0817C370: strh r0, [r1, 0x26] b _0817C390 .align 2, 0 -_0817C380: .4byte 0xffff0400 -_0817C384: .4byte 0x00007fff -_0817C388: .4byte 0x03005e00 + .pool _0817C38C: - ldr r0, _0817C398 + ldr r0, =sub_817C260 + 1 str r0, [r1] _0817C390: add sp, 0x4 @@ -777708,7 +751301,7 @@ _0817C390: pop {r0} bx r0 .align 2, 0 -_0817C398: .4byte sub_817C260 + 1 + .pool thumb_func_end sub_817C310 thumb_func_start nullsub_68 @@ -777729,8 +751322,8 @@ sub_817C3A0: @ 817C3A0 lsls r1, 24 lsrs r7, r1, 24 movs r1, 0 - ldr r3, _0817C4D4 - ldr r2, _0817C4D8 + ldr r3, =sub_817C4EC + 1 + ldr r2, =0x00007fff _0817C3BA: lsls r0, r1, 1 add r0, sp @@ -777749,7 +751342,7 @@ _0817C3BA: lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _0817C4DC + ldr r0, =0x03005e00 mov r1, r8 lsls r6, r1, 2 add r6, r8 @@ -777781,7 +751374,7 @@ _0817C3BA: movs r2, 0 movs r3, 0 bl rotscale_set_direct - ldr r1, _0817C4E0 + ldr r1, =0x02020630 mov r9, r1 lsls r2, r5, 4 adds r2, r5 @@ -777789,7 +751382,7 @@ _0817C3BA: mov r3, r9 adds r3, 0x1C adds r0, r2, r3 - ldr r1, _0817C4E4 + ldr r1, =nullsub_68 + 1 str r1, [r0] add r2, r9 ldrb r1, [r2, 0x1] @@ -777820,7 +751413,7 @@ _0817C3BA: ldrb r1, [r2, 0x5] lsrs r1, 4 lsls r1, 5 - ldr r0, _0817C4E8 + ldr r0, =0x02037d14 mov r10, r0 add r1, r10 add r0, sp, 0x4 @@ -777832,7 +751425,7 @@ _0817C3BA: lsls r1, 2 ldr r3, [sp, 0x24] adds r3, r1, r3 - ldr r0, _0817C4E4 + ldr r0, =nullsub_68 + 1 str r0, [r3] add r1, r9 ldrb r0, [r1, 0x1] @@ -777868,19 +751461,14 @@ _0817C3BA: pop {r1} bx r1 .align 2, 0 -_0817C4D4: .4byte sub_817C4EC + 1 -_0817C4D8: .4byte 0x00007fff -_0817C4DC: .4byte 0x03005e00 -_0817C4E0: .4byte 0x02020630 -_0817C4E4: .4byte nullsub_68 + 1 -_0817C4E8: .4byte 0x02037d14 + .pool thumb_func_end sub_817C3A0 thumb_func_start sub_817C4EC sub_817C4EC: @ 817C4EC lsls r0, 24 lsrs r0, 24 - ldr r2, _0817C508 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -777889,12 +751477,11 @@ sub_817C4EC: @ 817C4EC strh r0, [r1, 0x12] movs r0, 0x8 strh r0, [r1, 0x14] - ldr r0, _0817C50C + ldr r0, =sub_817C510 + 1 str r0, [r1] bx lr .align 2, 0 -_0817C508: .4byte 0x03005e00 -_0817C50C: .4byte sub_817C510 + 1 + .pool thumb_func_end sub_817C4EC thumb_func_start sub_817C510 @@ -777902,7 +751489,7 @@ sub_817C510: @ 817C510 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _0817C530 + ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -777915,7 +751502,7 @@ sub_817C510: @ 817C510 bl sub_817C72C b _0817C556 .align 2, 0 -_0817C530: .4byte 0x03005e00 + .pool _0817C534: ldrh r1, [r2, 0x14] movs r4, 0x14 @@ -777932,14 +751519,14 @@ _0817C546: movs r1, 0x1 eors r0, r1 strh r0, [r2, 0x12] - ldr r0, _0817C55C + ldr r0, =sub_817C560 + 1 str r0, [r2] _0817C556: pop {r4} pop {r0} bx r0 .align 2, 0 -_0817C55C: .4byte sub_817C560 + 1 + .pool thumb_func_end sub_817C510 thumb_func_start sub_817C560 @@ -777948,7 +751535,7 @@ sub_817C560: @ 817C560 sub sp, 0x4 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0817C584 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -777958,12 +751545,11 @@ sub_817C560: @ 817C560 adds r5, r1, 0 cmp r0, 0 beq _0817C58C - ldr r0, _0817C588 + ldr r0, =sub_817C72C + 1 str r0, [r2] b _0817C670 .align 2, 0 -_0817C584: .4byte 0x03005e00 -_0817C588: .4byte sub_817C72C + 1 + .pool _0817C58C: movs r6, 0 movs r7, 0x12 @@ -778082,7 +751668,7 @@ _0817C626: bl rotscale_set_direct cmp r6, 0x2 bne _0817C670 - ldr r0, _0817C678 + ldr r0, =sub_817C510 + 1 str r0, [r5] _0817C670: add sp, 0x4 @@ -778090,7 +751676,7 @@ _0817C670: pop {r0} bx r0 .align 2, 0 -_0817C678: .4byte sub_817C510 + 1 + .pool thumb_func_end sub_817C560 thumb_func_start sub_817C67C @@ -778100,9 +751686,9 @@ sub_817C67C: @ 817C67C push {r6} lsls r0, 24 lsrs r0, 24 - ldr r1, _0817C724 + ldr r1, =0x02020630 mov r8, r1 - ldr r1, _0817C728 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -778179,8 +751765,7 @@ sub_817C67C: @ 817C67C pop {r0} bx r0 .align 2, 0 -_0817C724: .4byte 0x02020630 -_0817C728: .4byte 0x03005e00 + .pool thumb_func_end sub_817C67C thumb_func_start sub_817C72C @@ -778190,9 +751775,9 @@ sub_817C72C: @ 817C72C push {r6} lsls r0, 24 lsrs r0, 24 - ldr r1, _0817C7D4 + ldr r1, =0x02020630 mov r8, r1 - ldr r1, _0817C7D8 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -778269,13 +751854,12 @@ sub_817C72C: @ 817C72C pop {r0} bx r0 .align 2, 0 -_0817C7D4: .4byte 0x02020630 -_0817C7D8: .4byte 0x03005e00 + .pool thumb_func_end sub_817C72C thumb_func_start sub_817C7DC sub_817C7DC: @ 817C7DC - ldr r2, _0817C7F0 + ldr r2, =0x0860a320 lsls r0, 2 adds r0, r2 ldr r0, [r0] @@ -778285,7 +751869,7 @@ sub_817C7DC: @ 817C7DC ldrsh r0, [r1, r2] bx lr .align 2, 0 -_0817C7F0: .4byte 0x0860a320 + .pool thumb_func_end sub_817C7DC thumb_func_start sub_817C7F4 @@ -778298,13 +751882,13 @@ sub_817C7F4: @ 817C7F4 lsls r0, 24 cmp r0, 0 beq _0817C810 - ldr r0, _0817C80C + ldr r0, =0x0860a3ac b _0817C84E .align 2, 0 -_0817C80C: .4byte 0x0860a3ac + .pool _0817C810: lsrs r0, r4, 25 - ldr r2, _0817C824 + ldr r2, =0x000001ff ands r2, r5 cmp r0, 0x13 bhi _0817C828 @@ -778314,22 +751898,22 @@ _0817C810: beq _0817C82C b _0817C83C .align 2, 0 -_0817C824: .4byte 0x000001ff + .pool _0817C828: cmp r0, 0x15 bne _0817C83C _0817C82C: - ldr r1, _0817C830 + ldr r1, =0x085f5494 b _0817C844 .align 2, 0 -_0817C830: .4byte 0x085f5494 + .pool _0817C834: - ldr r1, _0817C838 + ldr r1, =0x085fa1d8 b _0817C844 .align 2, 0 -_0817C838: .4byte 0x085fa1d8 + .pool _0817C83C: - ldr r1, _0817C854 + ldr r1, =0x0860a168 lsls r0, 2 adds r0, r1 ldr r1, [r0] @@ -778344,7 +751928,7 @@ _0817C84E: pop {r1} bx r1 .align 2, 0 -_0817C854: .4byte 0x0860a168 + .pool thumb_func_end sub_817C7F4 thumb_func_start sub_817C858 @@ -778358,7 +751942,7 @@ sub_817C858: @ 817C858 movs r0, 0 strh r0, [r5, 0x4] movs r6, 0 - ldr r0, _0817C8B8 + ldr r0, =0x0860a3dc mov r8, r0 adds r4, r5, 0 adds r4, 0x18 @@ -778399,13 +751983,13 @@ _0817C8A0: pop {r0} bx r0 .align 2, 0 -_0817C8B8: .4byte 0x0860a3dc + .pool thumb_func_end sub_817C858 thumb_func_start sub_817C8BC sub_817C8BC: @ 817C8BC push {lr} - ldr r0, _0817C8D4 + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] bl is_light_level_1_2_3_or_6 lsls r0, 24 @@ -778415,23 +751999,20 @@ sub_817C8BC: @ 817C8BC movs r0, 0 b _0817C8E6 .align 2, 0 -_0817C8D4: .4byte 0x02037318 + .pool _0817C8D8: - ldr r1, _0817C8EC - ldr r0, _0817C8F0 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _0817C8F4 - ldr r0, _0817C8F8 + ldr r1, =0x0203ceec + ldr r0, =hm_teleport_run_dp02scr + 1 str r0, [r1] movs r0, 0x1 _0817C8E6: pop {r1} bx r1 .align 2, 0 -_0817C8EC: .4byte 0x03005db0 -_0817C8F0: .4byte hm_add_c3_launch_phase_2 + 1 -_0817C8F4: .4byte 0x0203ceec -_0817C8F8: .4byte hm_teleport_run_dp02scr + 1 + .pool thumb_func_end sub_817C8BC thumb_func_start hm_teleport_run_dp02scr @@ -778441,14 +752022,14 @@ hm_teleport_run_dp02scr: @ 817C8FC movs r0, 0x3F bl oe_exec bl brm_get_pokemon_selection - ldr r1, _0817C918 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] pop {r0} bx r0 .align 2, 0 -_0817C918: .4byte 0x02038c08 + .pool thumb_func_end hm_teleport_run_dp02scr thumb_func_start sub_817C91C @@ -778457,12 +752038,12 @@ sub_817C91C: @ 817C91C bl oei_task_add lsls r0, 24 lsrs r0, 24 - ldr r2, _0817C944 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _0817C948 + ldr r2, =sub_817C94C + 1 lsrs r0, r2, 16 strh r0, [r1, 0x18] strh r2, [r1, 0x1A] @@ -778472,8 +752053,7 @@ sub_817C91C: @ 817C91C pop {r1} bx r1 .align 2, 0 -_0817C944: .4byte 0x03005e00 -_0817C948: .4byte sub_817C94C + 1 + .pool thumb_func_end sub_817C91C thumb_func_start sub_817C94C @@ -778497,7 +752077,7 @@ sub_817C95C: @ 817C95C lsls r0, 16 lsrs r0, 16 str r0, [sp] - ldr r0, _0817C9E0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -778510,28 +752090,28 @@ sub_817C95C: @ 817C95C beq _0817C988 bl _0817E0A6 _0817C988: - ldr r0, _0817C9E4 + ldr r0, =0x0202449c ldr r0, [r0] movs r1, 0x81 lsls r1, 2 adds r7, r0, r1 - ldr r5, _0817C9E8 + ldr r5, =0x0202420b ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0817C9EC + ldr r0, =0x0202420c ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0817C9F0 + ldr r0, =0x0202420e ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _0817C9F4 + ldr r0, =0x0203aba8 ldr r0, [r0] ldrb r0, [r0, 0x7] bl battle_side_get_owner @@ -778540,67 +752120,57 @@ _0817C988: str r0, [sp, 0x4] cmp r4, 0 bne _0817CA00 - ldr r2, _0817C9F8 + ldr r2, =0x0202406e ldrb r0, [r5] lsls r0, 1 adds r0, r2 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0817C9FC + ldr r0, =0x020244ec b _0817CA10 .align 2, 0 -_0817C9E0: .4byte 0x02022fec -_0817C9E4: .4byte 0x0202449c -_0817C9E8: .4byte 0x0202420b -_0817C9EC: .4byte 0x0202420c -_0817C9F0: .4byte 0x0202420e -_0817C9F4: .4byte 0x0203aba8 -_0817C9F8: .4byte 0x0202406e -_0817C9FC: .4byte 0x020244ec + .pool _0817CA00: - ldr r2, _0817CA2C + ldr r2, =0x0202406e ldrb r0, [r5] lsls r0, 1 adds r0, r2 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0817CA30 + ldr r0, =0x02024744 _0817CA10: adds r1, r0 str r1, [sp, 0x8] cmp r6, 0 bne _0817CA3C - ldr r0, _0817CA34 + ldr r0, =0x0202420c ldrb r0, [r0] lsls r0, 1 adds r0, r2 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0817CA38 + ldr r0, =0x020244ec b _0817CA4C .align 2, 0 -_0817CA2C: .4byte 0x0202406e -_0817CA30: .4byte 0x02024744 -_0817CA34: .4byte 0x0202420c -_0817CA38: .4byte 0x020244ec + .pool _0817CA3C: - ldr r0, _0817CA8C + ldr r0, =0x0202420c ldrb r0, [r0] lsls r0, 1 adds r0, r2 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0817CA90 + ldr r0, =0x02024744 _0817CA4C: adds r1, r0 str r1, [sp, 0xC] - ldr r0, _0817CA94 + ldr r0, =0x0202420b ldrb r0, [r0] - ldr r1, _0817CA98 + ldr r1, =0x0203aba8 ldr r1, [r1] ldrh r1, [r1] bl sub_817F33C @@ -778626,23 +752196,20 @@ _0817CA4C: movs r2, 0x1E bl _0817E0A2 .align 2, 0 -_0817CA8C: .4byte 0x0202420c -_0817CA90: .4byte 0x02024744 -_0817CA94: .4byte 0x0202420b -_0817CA98: .4byte 0x0203aba8 + .pool _0817CA9C: - ldr r0, _0817CADC + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status lsls r0, 24 lsrs r0, 25 mov r8, r0 - ldr r0, _0817CAE0 + ldr r0, =0x0202420c ldrb r0, [r0] bl battle_get_per_side_status lsls r0, 24 lsrs r5, r0, 25 - ldr r0, _0817CAE4 + ldr r0, =0x0202420e ldrb r0, [r0] bl battle_get_per_side_status lsls r0, 24 @@ -778656,15 +752223,12 @@ _0817CA9C: bl _0817E0A6 _0817CAD2: lsls r0, r1, 2 - ldr r1, _0817CAE8 + ldr r1, =_0817CAEC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0817CADC: .4byte 0x0202420b -_0817CAE0: .4byte 0x0202420c -_0817CAE4: .4byte 0x0202420e -_0817CAE8: .4byte _0817CAEC + .pool .align 2, 0 _0817CAEC: .4byte _0817DD7A @@ -779026,7 +752590,7 @@ _0817D070: movs r2, 0x2 movs r3, 0 bl sub_817E684 - ldr r0, _0817D094 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -779037,14 +752601,14 @@ _0817D08C: bl sub_817EECC bl _0817E0A6 .align 2, 0 -_0817D094: .4byte 0x02022fec + .pool _0817D098: movs r0, 0x1 mov r1, r10 movs r2, 0x1 movs r3, 0 bl sub_817E684 - ldr r0, _0817D0D0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -779063,7 +752627,7 @@ _0817D0C6: bl sub_817EECC bl _0817E0A6 .align 2, 0 -_0817D0D0: .4byte 0x02022fec + .pool _0817D0D4: movs r0, 0x1 mov r1, r10 @@ -779074,8 +752638,8 @@ _0817D0DC: adds r3, r4 lsls r3, 2 adds r3, r7, r3 - ldr r1, _0817D118 - ldr r0, _0817D11C + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -779085,7 +752649,7 @@ _0817D0DC: ands r0, r1 lsls r0, 15 ldr r1, [r3, 0x50] - ldr r2, _0817D120 + ldr r2, =0xfffc7fff ands r1, r2 orrs r1, r0 str r1, [r3, 0x50] @@ -779099,16 +752663,14 @@ _0817D0DC: negs r0, r0 bl _0817DC0C .align 2, 0 -_0817D118: .4byte 0x0202406e -_0817D11C: .4byte 0x0202420b -_0817D120: .4byte 0xfffc7fff + .pool _0817D124: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, _0817D164 - ldr r0, _0817D168 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -779135,15 +752697,14 @@ _0817D124: negs r0, r0 bl _0817DFAA .align 2, 0 -_0817D164: .4byte 0x0202406e -_0817D168: .4byte 0x0202420b + .pool _0817D16C: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 adds r5, r7, r0 - ldr r1, _0817D1B0 - ldr r0, _0817D1B4 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -779172,10 +752733,9 @@ _0817D16C: movs r1, 0x40 bl _0817DFAC .align 2, 0 -_0817D1B0: .4byte 0x0202406e -_0817D1B4: .4byte 0x0202420b + .pool _0817D1B8: - ldr r1, _0817D1DC + ldr r1, =0x02022f5c ldrb r0, [r1] cmp r0, 0 beq _0817D1C4 @@ -779193,7 +752753,7 @@ _0817D1C4: movs r2, 0x14 bl _0817E0A2 .align 2, 0 -_0817D1DC: .4byte 0x02022f5c + .pool _0817D1E0: lsls r0, r6, 1 adds r0, r6 @@ -779226,8 +752786,8 @@ _0817D216: adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, _0817D258 - ldr r0, _0817D25C + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -779254,8 +752814,7 @@ _0817D216: negs r0, r0 bl _0817DFAA .align 2, 0 -_0817D258: .4byte 0x0202406e -_0817D25C: .4byte 0x0202420b + .pool _0817D260: lsls r0, r6, 1 adds r0, r6 @@ -779288,8 +752847,8 @@ _0817D296: adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, _0817D2D8 - ldr r0, _0817D2DC + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -779310,15 +752869,13 @@ _0817D296: ands r1, r0 lsls r1, 7 ldrh r3, [r2] - ldr r0, _0817D2E0 + ldr r0, =0xfffffe7f ands r0, r3 orrs r0, r1 strh r0, [r2] bl _0817E0A6 .align 2, 0 -_0817D2D8: .4byte 0x0202406e -_0817D2DC: .4byte 0x0202420b -_0817D2E0: .4byte 0xfffffe7f + .pool _0817D2E4: lsls r0, r6, 1 adds r0, r6 @@ -779349,8 +752906,8 @@ _0817D314: lsls r0, r4, 4 adds r3, r0 adds r3, r7, r3 - ldr r1, _0817D34C - ldr r0, _0817D350 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -779372,8 +752929,7 @@ _0817D314: negs r2, r2 bl _0817DC0C .align 2, 0 -_0817D34C: .4byte 0x0202406e -_0817D350: .4byte 0x0202420b + .pool _0817D354: mov r1, r8 lsls r0, r1, 3 @@ -779417,26 +752973,26 @@ _0817D38C: bl sub_817E684 bl _0817E0A6 _0817D3A6: - ldr r0, _0817D3B4 + ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0xB3 movs r1, 0x1 bl _0817E0A4 .align 2, 0 -_0817D3B4: .4byte 0x0202449c + .pool _0817D3B8: movs r0, 0x12 mov r1, r10 movs r2, 0 b _0817D48E _0817D3C0: - ldr r0, _0817D3E0 + ldr r0, =0x02022f58 ldrb r2, [r0, 0x2] cmp r2, 0 bne _0817D3CC bl _0817E0A6 _0817D3CC: - ldr r1, _0817D3E4 + ldr r1, =0x02022f6a ldrh r0, [r1] cmp r0, 0xD1 bne _0817D3E8 @@ -779446,8 +753002,7 @@ _0817D3CC: movs r0, 0x17 b _0817D48C .align 2, 0 -_0817D3E0: .4byte 0x02022f58 -_0817D3E4: .4byte 0x02022f6a + .pool _0817D3E8: subs r2, 0x1 lsls r2, 24 @@ -779455,19 +753010,19 @@ _0817D3E8: movs r0, 0x16 b _0817D48C _0817D3F2: - ldr r0, _0817D41C + ldr r0, =0x02022f58 ldrb r2, [r0, 0x2] cmp r2, 0 bne _0817D3FE bl _0817E0A6 _0817D3FE: - ldr r0, _0817D420 - ldr r1, _0817D424 + ldr r0, =0x0202420b + ldr r1, =0x0202420c ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 bne _0817D436 - ldr r1, _0817D428 + ldr r1, =0x02022f6a ldrh r0, [r1] cmp r0, 0xD1 bne _0817D42C @@ -779477,10 +753032,7 @@ _0817D3FE: movs r0, 0x17 b _0817D48C .align 2, 0 -_0817D41C: .4byte 0x02022f58 -_0817D420: .4byte 0x0202420b -_0817D424: .4byte 0x0202420c -_0817D428: .4byte 0x02022f6a + .pool _0817D42C: subs r2, 0x1 lsls r2, 24 @@ -779494,7 +753046,7 @@ _0817D436: movs r0, 0x1B b _0817D48C _0817D440: - ldr r0, _0817D458 + ldr r0, =0x02022f58 ldrb r2, [r0, 0x2] cmp r2, 0 bne _0817D44C @@ -779506,15 +753058,15 @@ _0817D44C: movs r0, 0x18 b _0817D48C .align 2, 0 -_0817D458: .4byte 0x02022f58 + .pool _0817D45C: - ldr r0, _0817D47C + ldr r0, =0x02022f58 ldrb r2, [r0, 0x2] cmp r2, 0 bne _0817D468 bl _0817E0A6 _0817D468: - ldr r1, _0817D480 + ldr r1, =0x02022f6a ldrh r0, [r1] cmp r0, 0xD3 bne _0817D484 @@ -779524,8 +753076,7 @@ _0817D468: movs r0, 0x1A b _0817D48C .align 2, 0 -_0817D47C: .4byte 0x02022f58 -_0817D480: .4byte 0x02022f6a + .pool _0817D484: subs r2, 0x1 lsls r2, 24 @@ -779542,8 +753093,8 @@ _0817D498: lsls r0, r6, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, _0817D4D8 - ldr r0, _0817D4DC + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -779569,8 +753120,7 @@ _0817D498: negs r0, r0 bl _0817DFAA .align 2, 0 -_0817D4D8: .4byte 0x0202406e -_0817D4DC: .4byte 0x0202420b + .pool _0817D4E0: ldr r0, [sp, 0x8] movs r1, 0x39 @@ -779621,8 +753171,8 @@ _0817D53C: lsls r0, r6, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, _0817D57C - ldr r0, _0817D580 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -779649,8 +753199,7 @@ _0817D53C: negs r0, r0 bl _0817DFAA .align 2, 0 -_0817D57C: .4byte 0x0202406e -_0817D580: .4byte 0x0202420b + .pool _0817D584: mov r1, r8 lsls r0, r1, 3 @@ -779693,8 +753242,8 @@ _0817D5CE: lsls r0, r6, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, _0817D5FC - ldr r0, _0817D600 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -779704,16 +753253,14 @@ _0817D5CE: ands r1, r0 lsls r1, 6 ldrh r3, [r2, 0x30] - ldr r0, _0817D604 + ldr r0, =0xfffffe3f ands r0, r3 orrs r0, r1 strh r0, [r2, 0x30] adds r2, 0x32 bl _0817DF0A .align 2, 0 -_0817D5FC: .4byte 0x0202406e -_0817D600: .4byte 0x0202420b -_0817D604: .4byte 0xfffffe3f + .pool _0817D608: ldr r0, [sp, 0x8] movs r1, 0x39 @@ -779761,8 +753308,8 @@ _0817D65E: lsls r0, r6, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, _0817D690 - ldr r0, _0817D694 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -779782,8 +753329,7 @@ _0817D65E: adds r2, 0x33 bl _0817DF9E .align 2, 0 -_0817D690: .4byte 0x0202406e -_0817D694: .4byte 0x0202420b + .pool _0817D698: ldr r0, [sp, 0x8] movs r1, 0x39 @@ -779838,8 +753384,8 @@ _0817D6F2: strb r0, [r1] bl _0817E0A6 _0817D704: - ldr r5, _0817D75C - ldr r6, _0817D760 + ldr r5, =0x0202406e + ldr r6, =0x0202420e ldrb r0, [r6] lsls r0, 1 adds r0, r5 @@ -779851,7 +753397,7 @@ _0817D704: lsls r4, 3 adds r2, r4 adds r2, r7, r2 - ldr r0, _0817D764 + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -779861,7 +753407,7 @@ _0817D704: ands r1, r0 lsls r1, 6 ldrh r3, [r2] - ldr r0, _0817D768 + ldr r0, =0xfffffe3f ands r0, r3 orrs r0, r1 strh r0, [r2] @@ -779881,10 +753427,7 @@ _0817D704: strb r0, [r1, 0x2] bl _0817E0A6 .align 2, 0 -_0817D75C: .4byte 0x0202406e -_0817D760: .4byte 0x0202420e -_0817D764: .4byte 0x0202420b -_0817D768: .4byte 0xfffffe3f + .pool _0817D76C: ldr r0, [sp, 0x8] movs r1, 0x39 @@ -779894,8 +753437,8 @@ _0817D76C: bne _0817D77E bl _0817E0A6 _0817D77E: - ldr r6, _0817D7D0 - ldr r5, _0817D7D4 + ldr r6, =0x0202406e + ldr r5, =0x0202420b ldrb r0, [r5] lsls r0, 1 adds r0, r6 @@ -779935,11 +753478,10 @@ _0817D7B2: adds r0, r6 b _0817D934 .align 2, 0 -_0817D7D0: .4byte 0x0202406e -_0817D7D4: .4byte 0x0202420b + .pool _0817D7D8: - ldr r5, _0817D82C - ldr r6, _0817D830 + ldr r5, =0x0202406e + ldr r6, =0x0202420e ldrb r0, [r6] lsls r0, 1 adds r0, r5 @@ -779951,7 +753493,7 @@ _0817D7D8: lsls r4, 3 adds r2, r4 adds r2, r7, r2 - ldr r0, _0817D834 + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -779981,12 +753523,10 @@ _0817D7D8: negs r0, r0 b _0817D88C .align 2, 0 -_0817D82C: .4byte 0x0202406e -_0817D830: .4byte 0x0202420e -_0817D834: .4byte 0x0202420b + .pool _0817D838: - ldr r5, _0817D898 - ldr r6, _0817D89C + ldr r5, =0x0202406e + ldr r6, =0x0202420e ldrb r0, [r6] lsls r0, 1 adds r0, r5 @@ -779998,7 +753538,7 @@ _0817D838: lsls r4, 3 adds r2, r4 adds r2, r7, r2 - ldr r0, _0817D8A0 + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -780033,9 +753573,7 @@ _0817D88C: strb r0, [r1, 0x2] bl _0817E0A6 .align 2, 0 -_0817D898: .4byte 0x0202406e -_0817D89C: .4byte 0x0202420e -_0817D8A0: .4byte 0x0202420b + .pool _0817D8A4: ldr r0, [sp, 0x8] movs r1, 0x39 @@ -780045,9 +753583,9 @@ _0817D8A4: bne _0817D8B6 bl _0817E0A6 _0817D8B6: - ldr r2, _0817D944 + ldr r2, =0x0202406e mov r8, r2 - ldr r6, _0817D948 + ldr r6, =0x0202420b ldrb r0, [r6] lsls r0, 1 add r0, r8 @@ -780117,15 +753655,14 @@ _0817D934: strb r1, [r3] b _0817E0A6 .align 2, 0 -_0817D944: .4byte 0x0202406e -_0817D948: .4byte 0x0202420b + .pool _0817D94C: lsls r2, r5, 3 lsls r0, r6, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, _0817D98C - ldr r0, _0817D990 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780152,8 +753689,7 @@ _0817D94C: negs r0, r0 b _0817DFAA .align 2, 0 -_0817D98C: .4byte 0x0202406e -_0817D990: .4byte 0x0202420b + .pool _0817D994: mov r1, r8 lsls r0, r1, 3 @@ -780180,8 +753716,8 @@ _0817D9AE: movs r0, 0x9 b _0817E086 _0817D9C2: - ldr r5, _0817DA18 - ldr r6, _0817DA1C + ldr r5, =0x0202406e + ldr r6, =0x0202420e ldrb r0, [r6] lsls r0, 1 adds r0, r5 @@ -780193,7 +753729,7 @@ _0817D9C2: lsls r4, 3 adds r2, r4 adds r2, r7, r2 - ldr r0, _0817DA20 + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -780223,12 +753759,10 @@ _0817D9C2: negs r0, r0 b _0817DB76 .align 2, 0 -_0817DA18: .4byte 0x0202406e -_0817DA1C: .4byte 0x0202420e -_0817DA20: .4byte 0x0202420b + .pool _0817DA24: - ldr r1, _0817DA60 - ldr r0, _0817DA64 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780257,11 +753791,10 @@ _0817DA48: bl sub_817E684 b _0817E0A6 .align 2, 0 -_0817DA60: .4byte 0x0202406e -_0817DA64: .4byte 0x0202420b + .pool _0817DA68: - ldr r5, _0817DAC0 - ldr r6, _0817DAC4 + ldr r5, =0x0202406e + ldr r6, =0x0202420e ldrb r0, [r6] lsls r0, 1 adds r0, r5 @@ -780273,7 +753806,7 @@ _0817DA68: lsls r4, 3 adds r2, r4 adds r2, r7, r2 - ldr r0, _0817DAC8 + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -780304,12 +753837,10 @@ _0817DA68: negs r0, r0 b _0817DB76 .align 2, 0 -_0817DAC0: .4byte 0x0202406e -_0817DAC4: .4byte 0x0202420e -_0817DAC8: .4byte 0x0202420b + .pool _0817DACC: - ldr r1, _0817DB18 - ldr r0, _0817DB1C + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780327,7 +753858,7 @@ _0817DACC: bne _0817DAF0 b _0817E0A6 _0817DAF0: - ldr r0, _0817DB20 + ldr r0, =0x0203aba8 ldr r0, [r0] ldrh r0, [r0] cmp r0, 0xAD @@ -780350,12 +753881,10 @@ _0817DB10: bl sub_817E684 b _0817E0A6 .align 2, 0 -_0817DB18: .4byte 0x0202406e -_0817DB1C: .4byte 0x0202420b -_0817DB20: .4byte 0x0203aba8 + .pool _0817DB24: - ldr r5, _0817DB80 - ldr r6, _0817DB84 + ldr r5, =0x0202406e + ldr r6, =0x0202420e ldrb r0, [r6] lsls r0, 1 adds r0, r5 @@ -780367,7 +753896,7 @@ _0817DB24: lsls r4, 3 adds r3, r4 adds r3, r7, r3 - ldr r0, _0817DB88 + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r5 @@ -780377,7 +753906,7 @@ _0817DB24: ands r0, r1 lsls r0, 15 ldr r1, [r3] - ldr r2, _0817DB8C + ldr r2, =0xfffc7fff ands r1, r2 orrs r1, r0 str r1, [r3] @@ -780401,13 +753930,10 @@ _0817DB76: strb r0, [r1, 0x3] b _0817E0A6 .align 2, 0 -_0817DB80: .4byte 0x0202406e -_0817DB84: .4byte 0x0202420e -_0817DB88: .4byte 0x0202420b -_0817DB8C: .4byte 0xfffc7fff + .pool _0817DB90: - ldr r1, _0817DBCC - ldr r0, _0817DBD0 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780437,16 +753963,15 @@ _0817DBC2: bl sub_817E684 b _0817E0A6 .align 2, 0 -_0817DBCC: .4byte 0x0202406e -_0817DBD0: .4byte 0x0202420b + .pool _0817DBD4: lsls r3, 3 mov r1, r9 lsls r0, r1, 4 adds r3, r0 adds r3, r7, r3 - ldr r1, _0817DC14 - ldr r0, _0817DC18 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780456,7 +753981,7 @@ _0817DBD4: ands r0, r1 lsls r0, 15 ldr r1, [r3, 0x30] - ldr r2, _0817DC1C + ldr r2, =0xfffc7fff ands r1, r2 orrs r1, r0 str r1, [r3, 0x30] @@ -780474,9 +753999,7 @@ _0817DC0C: strb r0, [r3] b _0817E0A6 .align 2, 0 -_0817DC14: .4byte 0x0202406e -_0817DC18: .4byte 0x0202420b -_0817DC1C: .4byte 0xfffc7fff + .pool _0817DC20: mov r2, r8 lsls r0, r2, 3 @@ -780516,8 +754039,8 @@ _0817DC62: adds r2, r6 lsls r2, 2 adds r2, r7, r2 - ldr r1, _0817DC90 - ldr r0, _0817DC94 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780536,8 +754059,7 @@ _0817DC62: adds r2, 0x54 b _0817DF9E .align 2, 0 -_0817DC90: .4byte 0x0202406e -_0817DC94: .4byte 0x0202420b + .pool _0817DC98: ldr r1, [sp, 0x4] lsls r0, r1, 1 @@ -780596,8 +754118,8 @@ _0817DCFC: lsls r0, r4, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, _0817DD30 - ldr r0, _0817DD34 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780618,16 +754140,15 @@ _0817DCFC: lsls r3, r1, 6 b _0817DF0E .align 2, 0 -_0817DD30: .4byte 0x0202406e -_0817DD34: .4byte 0x0202420b + .pool _0817DD38: mov r0, r8 lsls r2, r0, 3 lsls r0, r4, 4 adds r2, r0 adds r2, r7, r2 - ldr r1, _0817DD6C - ldr r0, _0817DD70 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780647,8 +754168,7 @@ _0817DD38: movs r1, 0x3F b _0817DF12 .align 2, 0 -_0817DD6C: .4byte 0x0202406e -_0817DD70: .4byte 0x0202420b + .pool _0817DD74: movs r0, 0 bl sub_817EA80 @@ -780700,8 +754220,8 @@ _0817DDC8: adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, _0817DE08 - ldr r0, _0817DE0C + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780728,15 +754248,14 @@ _0817DDC8: negs r0, r0 b _0817DFAA .align 2, 0 -_0817DE08: .4byte 0x0202406e -_0817DE0C: .4byte 0x0202420b + .pool _0817DE10: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, _0817DE4C - ldr r0, _0817DE50 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780748,7 +754267,7 @@ _0817DE10: ands r1, r0 lsls r1, 6 ldrh r3, [r4] - ldr r0, _0817DE54 + ldr r0, =0xfffffe3f ands r0, r3 orrs r0, r1 strh r0, [r4] @@ -780762,11 +754281,9 @@ _0817DE10: negs r0, r0 b _0817DFAA .align 2, 0 -_0817DE4C: .4byte 0x0202406e -_0817DE50: .4byte 0x0202420b -_0817DE54: .4byte 0xfffffe3f + .pool _0817DE58: - ldr r1, _0817DED4 + ldr r1, =0x02022f5a ldrh r0, [r1] cmp r0, 0x73 bne _0817DE82 @@ -780788,7 +754305,7 @@ _0817DE58: ands r0, r2 strb r0, [r1] _0817DE82: - ldr r2, _0817DED4 + ldr r2, =0x02022f5a ldrh r0, [r2] cmp r0, 0x71 bne _0817DEAA @@ -780799,7 +754316,7 @@ _0817DE82: adds r3, r1, 0 adds r3, 0x50 ldrh r2, [r3] - ldr r0, _0817DED8 + ldr r0, =0xfffffe3f ands r0, r2 strh r0, [r3] adds r1, 0x54 @@ -780809,7 +754326,7 @@ _0817DE82: ands r0, r2 strb r0, [r1] _0817DEAA: - ldr r1, _0817DED4 + ldr r1, =0x02022f5a ldrh r0, [r1] cmp r0, 0x36 beq _0817DEB4 @@ -780832,15 +754349,14 @@ _0817DEB4: negs r0, r0 b _0817DF6A .align 2, 0 -_0817DED4: .4byte 0x02022f5a -_0817DED8: .4byte 0xfffffe3f + .pool _0817DEDC: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, _0817DF1C - ldr r0, _0817DF20 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780870,8 +754386,7 @@ _0817DF12: strb r0, [r2] b _0817E0A6 .align 2, 0 -_0817DF1C: .4byte 0x0202406e -_0817DF20: .4byte 0x0202420b + .pool _0817DF24: lsls r0, r6, 1 adds r0, r6 @@ -780919,8 +754434,8 @@ _0817DF70: adds r2, r4 lsls r2, 2 adds r2, r7, r2 - ldr r1, _0817DFB4 - ldr r0, _0817DFB8 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -780952,8 +754467,7 @@ _0817DFAC: strb r0, [r2] b _0817E0A6 .align 2, 0 -_0817DFB4: .4byte 0x0202406e -_0817DFB8: .4byte 0x0202420b + .pool _0817DFBC: lsls r0, r6, 1 adds r0, r6 @@ -780995,7 +754509,7 @@ _0817DFE6: ands r0, r2 strb r0, [r1] ldrh r2, [r3] - ldr r0, _0817E034 + ldr r0, =0xfffffe3f ands r0, r2 strh r0, [r3] ldrb r2, [r1] @@ -781003,8 +754517,8 @@ _0817DFE6: negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _0817E038 - ldr r0, _0817E03C + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -781015,9 +754529,7 @@ _0817DFE6: bl sub_817E684 b _0817E0A6 .align 2, 0 -_0817E034: .4byte 0xfffffe3f -_0817E038: .4byte 0x0202406e -_0817E03C: .4byte 0x0202420b + .pool _0817E040: lsls r0, r4, 4 adds r4, r7, r0 @@ -781090,8 +754602,8 @@ sub_817E0B8: @ 817E0B8 lsls r0, 16 lsrs r5, r0, 16 movs r3, 0 - ldr r4, _0817E0EC - ldr r6, _0817E0F0 + ldr r4, =0x0860a8a4 + ldr r6, =0x0000ffff adds r2, r4, 0 adds r1, r4, 0 _0817E0C8: @@ -781108,14 +754620,13 @@ _0817E0DA: lsls r0, r3, 1 adds r0, r4 ldrh r1, [r0] - ldr r0, _0817E0F0 + ldr r0, =0x0000ffff cmp r1, r0 beq _0817E0F4 movs r0, 0 b _0817E0F6 .align 2, 0 -_0817E0EC: .4byte 0x0860a8a4 -_0817E0F0: .4byte 0x0000ffff + .pool _0817E0F4: movs r0, 0x1 _0817E0F6: @@ -781138,7 +754649,7 @@ sub_817E0FC: @ 817E0FC lsls r1, 16 lsrs r1, 16 str r1, [sp] - ldr r0, _0817E174 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -781146,20 +754657,20 @@ sub_817E0FC: @ 817E0FC bne _0817E122 b _0817E310 _0817E122: - ldr r0, _0817E178 + ldr r0, =0x0202449c ldr r0, [r0] movs r1, 0x81 lsls r1, 2 adds r1, r0, r1 str r1, [sp, 0x8] - ldr r2, _0817E17C + ldr r2, =0x0202420b mov r10, r2 ldrb r0, [r2] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _0817E180 + ldr r0, =0x0202420c ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -781185,10 +754696,7 @@ _0817E122: strb r1, [r0] b _0817E310 .align 2, 0 -_0817E174: .4byte 0x02022fec -_0817E178: .4byte 0x0202449c -_0817E17C: .4byte 0x0202420b -_0817E180: .4byte 0x0202420c + .pool _0817E184: mov r2, r10 ldrb r0, [r2] @@ -781203,7 +754711,7 @@ _0817E184: mov r2, r10 ldrb r1, [r2] lsls r1, 1 - ldr r2, _0817E320 + ldr r2, =0x0202406e adds r1, r2 ldrh r2, [r1] adds r2, 0x1 @@ -781251,7 +754759,7 @@ _0817E184: ands r0, r1 orrs r0, r2 strb r0, [r5] - ldr r1, _0817E324 + ldr r1, =0x0831c898 lsls r4, r7, 1 adds r0, r4, r7 lsls r0, 2 @@ -781278,13 +754786,13 @@ _0817E184: movs r3, 0 bl sub_817E684 _0817E23C: - ldr r0, _0817E328 + ldr r0, =0x00000111 cmp r7, r0 bne _0817E272 mov r1, r10 ldrb r0, [r1] lsls r0, 1 - ldr r2, _0817E320 + ldr r2, =0x0202406e adds r0, r2 ldrh r1, [r0] adds r1, 0x1 @@ -781322,7 +754830,7 @@ _0817E27A: mov r1, r10 ldrb r0, [r1] lsls r0, 1 - ldr r1, _0817E320 + ldr r1, =0x0202406e adds r0, r1 ldrh r1, [r0] adds r1, 0x1 @@ -781356,7 +754864,7 @@ _0817E27A: orrs r0, r1 strb r0, [r4] _0817E2D2: - ldr r1, _0817E324 + ldr r1, =0x0831c898 ldr r2, [sp, 0x10] adds r0, r2, r7 lsls r0, 2 @@ -781393,9 +754901,7 @@ _0817E310: pop {r0} bx r0 .align 2, 0 -_0817E320: .4byte 0x0202406e -_0817E324: .4byte 0x0831c898 -_0817E328: .4byte 0x00000111 + .pool thumb_func_end sub_817E0FC thumb_func_start sub_817E32C @@ -781403,18 +754909,18 @@ sub_817E32C: @ 817E32C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0817E360 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 beq _0817E3EE - ldr r0, _0817E364 + ldr r0, =0x0202449c ldr r0, [r0] movs r1, 0x81 lsls r1, 2 adds r4, r0, r1 - ldr r0, _0817E368 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -781425,9 +754931,7 @@ sub_817E32C: @ 817E32C beq _0817E3AA b _0817E3EE .align 2, 0 -_0817E360: .4byte 0x02022fec -_0817E364: .4byte 0x0202449c -_0817E368: .4byte 0x0202420b + .pool _0817E36C: lsls r0, r2, 1 adds r0, r2 @@ -781514,14 +755018,14 @@ sub_817E3F4: @ 817E3F4 str r1, [sp, 0x4] movs r2, 0 str r2, [sp, 0x8] - ldr r3, _0817E57C + ldr r3, =0x00007fff str r3, [sp, 0xC] movs r4, 0 str r4, [sp, 0x10] movs r7, 0 str r7, [sp, 0x14] mov r8, r0 - ldr r0, _0817E580 + ldr r0, =0x0202449c ldr r1, [r0] adds r0, r1, 0 adds r0, 0xB3 @@ -781539,7 +755043,7 @@ _0817E434: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _0817E584 + ldr r0, =0x020244ec adds r0, r4, r0 movs r1, 0xB movs r2, 0 @@ -781552,7 +755056,7 @@ _0817E434: lsrs r0, 24 mov r8, r0 _0817E454: - ldr r5, _0817E588 + ldr r5, =0x02024744 adds r0, r4, r5 movs r1, 0xB movs r2, 0 @@ -781566,7 +755070,7 @@ _0817E46A: adds r6, 0x1 cmp r6, 0x5 ble _0817E434 - ldr r0, _0817E58C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -781586,7 +755090,7 @@ _0817E484: _0817E48E: mov r1, r8 muls r1, r6 - ldr r0, _0817E584 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -781634,7 +755138,7 @@ _0817E4C4: _0817E4EE: mov r0, r8 muls r0, r6 - ldr r2, _0817E588 + ldr r2, =0x02024744 adds r4, r0, r2 adds r0, r4, 0 movs r1, 0xB @@ -781683,7 +755187,7 @@ _0817E534: bne _0817E590 mov r0, r8 muls r0, r6 - ldr r1, _0817E588 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x19 movs r2, 0 @@ -781692,7 +755196,7 @@ _0817E534: ldr r2, [sp, 0x14] mov r0, r8 muls r0, r2 - ldr r3, _0817E588 + ldr r3, =0x02024744 adds r0, r3 movs r1, 0x19 movs r2, 0 @@ -781701,11 +755205,7 @@ _0817E534: bls _0817E5A0 b _0817E594 .align 2, 0 -_0817E57C: .4byte 0x00007fff -_0817E580: .4byte 0x0202449c -_0817E584: .4byte 0x020244ec -_0817E588: .4byte 0x02024744 -_0817E58C: .4byte 0x02022fec + .pool _0817E590: cmp r1, r0 ble _0817E5A0 @@ -781725,7 +755225,7 @@ _0817E5A8: movs r4, 0 movs r6, 0 movs r3, 0 - ldr r5, _0817E614 + ldr r5, =0x020244ec ldr r7, [sp, 0x10] lsls r0, r7, 3 mov r1, r10 @@ -781759,7 +755259,7 @@ _0817E5C8: beq _0817E670 cmp r4, 0 beq _0817E670 - ldr r0, _0817E618 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -781768,7 +755268,7 @@ _0817E5C8: ldr r3, [sp, 0x10] cmp r3, 0x2 bhi _0817E620 - ldr r0, _0817E61C + ldr r0, =0x02024474 adds r0, 0x25 ldrb r0, [r0] bl sub_806D82C @@ -781777,11 +755277,9 @@ _0817E5C8: beq _0817E630 b _0817E670 .align 2, 0 -_0817E614: .4byte 0x020244ec -_0817E618: .4byte 0x02022fec -_0817E61C: .4byte 0x02024474 + .pool _0817E620: - ldr r0, _0817E658 + ldr r0, =0x02024474 adds r0, 0x25 ldrb r0, [r0] bl sub_806D82C @@ -781797,7 +755295,7 @@ _0817E630: _0817E63A: lsls r0, r3, 24 lsrs r0, 24 - ldr r1, _0817E658 + ldr r1, =0x02024474 adds r1, 0x25 ldrb r1, [r1] bl sub_806EF84 @@ -781809,9 +755307,9 @@ _0817E63A: bl sub_80ECB00 b _0817E670 .align 2, 0 -_0817E658: .4byte 0x02024474 + .pool _0817E65C: - ldr r0, _0817E680 + ldr r0, =0x02024474 adds r0, 0x25 ldrb r1, [r0] movs r0, 0x1 @@ -781830,7 +755328,7 @@ _0817E670: pop {r0} bx r0 .align 2, 0 -_0817E680: .4byte 0x02024474 + .pool thumb_func_end sub_817E3F4 thumb_func_start sub_817E684 @@ -781850,7 +755348,7 @@ sub_817E684: @ 817E684 lsls r3, 24 lsrs r3, 24 mov r9, r3 - ldr r0, _0817E6E0 + ldr r0, =0x0202449c ldr r0, [r0] movs r1, 0xD2 lsls r1, 1 @@ -781859,12 +755357,12 @@ sub_817E684: @ 817E684 movs r2, 0x81 lsls r2, 2 adds r7, r0, r2 - ldr r0, _0817E6E4 + ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0817E6E8 + ldr r0, =0x0202420c ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -781875,16 +755373,13 @@ sub_817E684: @ 817E684 b _0817EA6C _0817E6D4: lsls r0, 2 - ldr r1, _0817E6EC + ldr r1, =_0817E6F0 adds r1, r0, r1 ldr r1, [r1] mov r12, r0 mov pc, r1 .align 2, 0 -_0817E6E0: .4byte 0x0202449c -_0817E6E4: .4byte 0x0202420b -_0817E6E8: .4byte 0x0202420c -_0817E6EC: .4byte _0817E6F0 + .pool .align 2, 0 _0817E6F0: .4byte _0817E760 @@ -781916,8 +755411,8 @@ _0817E6F0: .4byte _0817E760 .4byte _0817E760 _0817E760: - ldr r1, _0817E790 - ldr r0, _0817E794 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -781930,7 +755425,7 @@ _0817E760: lsls r0, 4 adds r1, r0 add r1, r8 - ldr r0, _0817E798 + ldr r0, =0x0860a834 add r0, r12 ldr r2, [r0] lsls r0, r5, 1 @@ -781940,19 +755435,17 @@ _0817E760: adds r0, r2 b _0817EA6A .align 2, 0 -_0817E790: .4byte 0x0202406e -_0817E794: .4byte 0x0202420b -_0817E798: .4byte 0x0860a834 + .pool _0817E79C: - ldr r1, _0817E7D0 + ldr r1, =0x0860a834 add r1, r12 - ldr r7, _0817E7D4 + ldr r7, =0x0202406e lsls r0, r4, 1 adds r0, r4 lsls r2, r0, 4 - ldr r4, _0817E7D8 + ldr r4, =0x0000ffff ldr r1, [r1] - ldr r3, _0817E7DC + ldr r3, =0x0202420b ldrh r0, [r1] cmp r6, r0 bne _0817E7E0 @@ -781971,10 +755464,7 @@ _0817E79C: strh r1, [r0] b _0817EA6C .align 2, 0 -_0817E7D0: .4byte 0x0860a834 -_0817E7D4: .4byte 0x0202406e -_0817E7D8: .4byte 0x0000ffff -_0817E7DC: .4byte 0x0202420b + .pool _0817E7E0: adds r1, 0x4 ldrh r0, [r1] @@ -782019,7 +755509,7 @@ _0817E80A: lsls r0, 4 adds r1, r0 add r1, r8 - ldr r0, _0817E844 + ldr r0, =0x0860a834 add r0, r12 ldr r2, [r0] lsls r0, r6, 1 @@ -782029,7 +755519,7 @@ _0817E80A: adds r0, r2 b _0817EA6A .align 2, 0 -_0817E844: .4byte 0x0860a834 + .pool _0817E848: lsls r0, r5, 1 adds r0, r5 @@ -782049,7 +755539,7 @@ _0817E85C: lsls r0, 4 adds r1, r0 add r1, r8 - ldr r0, _0817E87C + ldr r0, =0x0860a834 add r0, r12 ldr r2, [r0] lsls r0, r6, 1 @@ -782059,7 +755549,7 @@ _0817E85C: adds r0, r2 b _0817EA6A .align 2, 0 -_0817E87C: .4byte 0x0860a834 + .pool _0817E880: lsls r1, r5, 2 add r1, r9 @@ -782069,14 +755559,14 @@ _0817E880: lsls r0, 4 adds r1, r0 add r1, r8 - ldr r0, _0817E89C + ldr r0, =0x0860a834 add r0, r12 ldr r2, [r0] lsls r0, r6, 1 adds r0, r2 b _0817EA64 .align 2, 0 -_0817E89C: .4byte 0x0860a834 + .pool _0817E8A0: lsls r2, r5, 2 add r2, r9 @@ -782088,7 +755578,7 @@ _0817E8A0: lsls r0, 4 adds r2, r0 add r2, r8 - ldr r0, _0817E8C8 + ldr r0, =0x0860a834 add r0, r12 ldr r1, [r0] lsls r0, r6, 1 @@ -782099,7 +755589,7 @@ _0817E8A0: strh r0, [r2] b _0817EA6C .align 2, 0 -_0817E8C8: .4byte 0x0860a834 + .pool _0817E8CC: lsls r1, r5, 2 add r1, r9 @@ -782109,7 +755599,7 @@ _0817E8CC: lsls r0, 4 adds r1, r0 add r1, r8 - ldr r0, _0817E8EC + ldr r0, =0x0860a834 add r0, r12 ldr r0, [r0] ldrh r0, [r0] @@ -782117,7 +755607,7 @@ _0817E8CC: adds r0, r2 b _0817EA6A .align 2, 0 -_0817E8EC: .4byte 0x0860a834 + .pool _0817E8F0: lsls r0, r3, 4 adds r2, r7, r0 @@ -782154,7 +755644,7 @@ _0817E914: lsls r0, 4 adds r1, r0 add r1, r8 - ldr r0, _0817E974 + ldr r0, =0x0860a834 add r0, r12 ldr r0, [r0] ldrh r0, [r0] @@ -782182,7 +755672,7 @@ _0817E94C: lsls r0, 4 adds r1, r0 add r1, r8 - ldr r0, _0817E974 + ldr r0, =0x0860a834 add r0, r12 ldr r0, [r0] ldrh r0, [r0] @@ -782190,7 +755680,7 @@ _0817E94C: adds r0, r2 b _0817EA6A .align 2, 0 -_0817E974: .4byte 0x0860a834 + .pool _0817E978: lsls r1, r3, 4 adds r1, r7, r1 @@ -782220,7 +755710,7 @@ _0817E978: lsls r0, 4 adds r1, r0 add r1, r8 - ldr r0, _0817E9DC + ldr r0, =0x0860a834 add r0, r12 ldr r0, [r0] ldrh r0, [r0] @@ -782243,7 +755733,7 @@ _0817E9BE: lsls r0, 4 b _0817EA5A .align 2, 0 -_0817E9DC: .4byte 0x0860a834 + .pool _0817E9E0: cmp r6, 0x8 bhi _0817EA6C @@ -782272,7 +755762,7 @@ _0817E9E0: lsls r0, r3, 4 adds r1, r0 add r1, r8 - ldr r0, _0817EA24 + ldr r0, =0x0860a834 add r0, r12 ldr r0, [r0] ldrh r0, [r0] @@ -782280,7 +755770,7 @@ _0817E9E0: adds r0, r2 b _0817EA6A .align 2, 0 -_0817EA24: .4byte 0x0860a834 + .pool _0817EA28: cmp r6, 0x8 bls _0817EA6C @@ -782310,7 +755800,7 @@ _0817EA28: _0817EA5A: adds r1, r0 add r1, r8 - ldr r0, _0817EA7C + ldr r0, =0x0860a834 add r0, r12 ldr r0, [r0] _0817EA64: @@ -782328,7 +755818,7 @@ _0817EA6C: pop {r0} bx r0 .align 2, 0 -_0817EA7C: .4byte 0x0860a834 + .pool thumb_func_end sub_817E684 thumb_func_start sub_817EA80 @@ -782338,18 +755828,18 @@ sub_817EA80: @ 817EA80 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _0817EADC + ldr r0, =0x0202449c ldr r0, [r0] movs r1, 0x81 lsls r1, 2 adds r5, r0, r1 - ldr r3, _0817EAE0 + ldr r3, =0x0202420b mov r8, r3 ldrb r0, [r3] bl battle_side_get_owner lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0817EAE4 + ldr r0, =0x0202420c ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 @@ -782374,15 +755864,12 @@ _0817EAC8: b _0817EEBC _0817EAD0: lsls r0, 2 - ldr r1, _0817EAE8 + ldr r1, =_0817EAEC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0817EADC: .4byte 0x0202449c -_0817EAE0: .4byte 0x0202420b -_0817EAE4: .4byte 0x0202420c -_0817EAE8: .4byte _0817EAEC + .pool .align 2, 0 _0817EAEC: .4byte _0817EB28 @@ -782644,8 +756131,8 @@ _0817ECCC: ldrb r0, [r0] lsrs r0, 5 subs r6, r0, 0x1 - ldr r1, _0817ED4C - ldr r0, _0817ED50 + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -782694,8 +756181,7 @@ _0817ED2E: adds r3, r0 b _0817EE88 .align 2, 0 -_0817ED4C: .4byte 0x0202406e -_0817ED50: .4byte 0x0202420b + .pool _0817ED54: movs r0, 0x1 eors r0, r4 @@ -782805,8 +756291,8 @@ _0817EE1C: cmp r7, 0x1 bne _0817EEBC adds r2, r4, 0 - ldr r1, _0817EE48 - ldr r0, _0817EE4C + ldr r1, =0x0202406e + ldr r0, =0x0202420b ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -782825,8 +756311,7 @@ _0817EE1C: movs r0, 0x14 b _0817EE8E .align 2, 0 -_0817EE48: .4byte 0x0202406e -_0817EE4C: .4byte 0x0202420b + .pool _0817EE50: lsls r0, r2, 1 adds r0, r2 @@ -782870,7 +756355,7 @@ _0817EE8E: b _0817EEBC _0817EE96: adds r2, r4, 0 - ldr r1, _0817EEC8 + ldr r1, =0x0202406e mov r3, r8 ldrb r0, [r3] lsls r0, 1 @@ -782894,7 +756379,7 @@ _0817EEBC: pop {r0} bx r0 .align 2, 0 -_0817EEC8: .4byte 0x0202406e + .pool thumb_func_end sub_817EA80 thumb_func_start sub_817EECC @@ -782905,15 +756390,15 @@ sub_817EECC: @ 817EECC mov r5, r8 push {r5-r7} sub sp, 0x28 - ldr r7, _0817F188 + ldr r7, =0x02022fec ldr r0, [r7] - ldr r1, _0817F18C + ldr r1, =0x02000003 ands r0, r1 cmp r0, 0 beq _0817EEE6 b _0817F1FA _0817EEE6: - ldr r4, _0817F190 + ldr r4, =0x0202420b ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -782922,7 +756407,7 @@ _0817EEE6: bne _0817EEF8 b _0817F1FA _0817EEF8: - ldr r5, _0817F194 + ldr r5, =0x02024084 ldrb r4, [r4] movs r1, 0x58 adds r6, r4, 0 @@ -782935,7 +756420,7 @@ _0817EEF8: bgt _0817EF10 b _0817F1FA _0817EF10: - ldr r0, _0817F198 + ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r1 adds r0, r5 @@ -782946,13 +756431,13 @@ _0817EF10: ble _0817EF24 b _0817F1FA _0817EF24: - ldr r0, _0817F19C + ldr r0, =0x020241ea ldrh r1, [r0] cmp r1, 0xED bne _0817EF2E b _0817F1FA _0817EF2E: - ldr r0, _0817F1A0 + ldr r0, =0x00000137 cmp r1, r0 bne _0817EF36 b _0817F1FA @@ -782965,8 +756450,8 @@ _0817EF36: beq _0817EF44 b _0817F1FA _0817EF44: - ldr r3, _0817F1A4 - ldr r2, _0817F1A8 + ldr r3, =0x0831c898 + ldr r2, =0x020244b0 adds r0, r4, r2 ldrb r0, [r0] lsls r0, 1 @@ -782987,8 +756472,8 @@ _0817EF44: _0817EF6A: movs r5, 0 str r1, [sp, 0x24] - ldr r1, _0817F1AC - ldr r4, _0817F1B0 + ldr r1, =0x0860a4ac + ldr r4, =0x0000ffff adds r3, r1, 0 adds r2, r1, 0 _0817EF76: @@ -783006,12 +756491,12 @@ _0817EF8A: lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] - ldr r0, _0817F1B0 + ldr r0, =0x0000ffff cmp r1, r0 beq _0817EF98 b _0817F1FA _0817EF98: - ldr r2, _0817F190 + ldr r2, =0x0202420b ldrb r0, [r2] adds r0, r6 ldrb r0, [r0] @@ -783019,10 +756504,10 @@ _0817EF98: mov r1, sp adds r1, r0 adds r1, 0x10 - ldr r0, _0817F1B4 + ldr r0, =0x020241f0 ldr r0, [r0] str r0, [r1] - ldr r0, _0817F19C + ldr r0, =0x020241ea ldrh r1, [r0] str r1, [sp, 0x24] movs r5, 0 @@ -783030,16 +756515,16 @@ _0817EF98: mov r10, r3 mov r8, r0 add r7, sp, 0x10 - ldr r4, _0817F198 + ldr r4, =0x0202420c mov r9, r4 _0817EFC2: lsls r1, r5, 1 - ldr r6, _0817F190 + ldr r6, =0x0202420b ldrb r0, [r6] movs r2, 0x58 muls r0, r2 adds r1, r0 - ldr r0, _0817F194 + ldr r0, =0x02024084 adds r0, 0xC adds r1, r0 ldrh r0, [r1] @@ -783055,7 +756540,7 @@ _0817EFC2: lsls r0, 24 cmp r0, 0 beq _0817F0B4 - ldr r4, _0817F1B8 + ldr r4, =0x0202428e mov r1, r9 ldrb r0, [r1] bl battle_get_per_side_status @@ -783064,11 +756549,11 @@ _0817EFC2: lsls r1, 1 adds r1, r4 ldrh r3, [r1] - ldr r2, _0817F190 + ldr r2, =0x0202420b ldrb r0, [r2] movs r4, 0x58 muls r0, r4 - ldr r6, _0817F194 + ldr r6, =0x02024084 adds r0, r6 mov r2, r9 ldrb r1, [r2] @@ -783081,7 +756566,7 @@ _0817EFC2: str r4, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r6, _0817F190 + ldr r6, =0x0202420b ldrb r4, [r6] str r4, [sp, 0x8] mov r6, r9 @@ -783089,10 +756574,10 @@ _0817EFC2: str r4, [sp, 0xC] bl sub_806957C adds r3, r0, 0 - ldr r4, _0817F1B4 + ldr r4, =0x020241f0 str r3, [r4] - ldr r1, _0817F1BC - ldr r2, _0817F190 + ldr r1, =0x020242ac + ldr r2, =0x0202420b ldrb r0, [r2] lsls r0, 2 adds r0, r1 @@ -783102,7 +756587,7 @@ _0817EFC2: ands r0, r1 cmp r0, 0 beq _0817F06A - ldr r2, _0817F1A4 + ldr r2, =0x0831c898 mov r6, r8 ldrh r1, [r6] lsls r0, r1, 1 @@ -783115,8 +756600,8 @@ _0817EFC2: lsls r0, r3, 1 str r0, [r4] _0817F06A: - ldr r0, _0817F1C0 - ldr r6, _0817F190 + ldr r0, =0x0202433c + ldr r6, =0x0202420b ldrb r1, [r6] lsls r1, 4 adds r1, r0 @@ -783124,7 +756609,7 @@ _0817F06A: lsls r0, 28 cmp r0, 0 bge _0817F08C - ldr r4, _0817F1B4 + ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 subs r0, r1 @@ -783140,7 +756625,7 @@ _0817F08C: bl move_effectiveness_something lsls r0, 24 lsrs r1, r0, 24 - ldr r0, _0817F1B4 + ldr r0, =0x020241f0 ldr r0, [r0] str r0, [r7] cmp r0, 0 @@ -783157,9 +756642,9 @@ _0817F0B4: cmp r5, 0x3 ble _0817EFC2 movs r5, 0 - ldr r3, _0817F190 - ldr r6, _0817F1A8 - ldr r4, _0817F1C4 + ldr r3, =0x0202420b + ldr r6, =0x020244b0 + ldr r4, =0x0202406e mov r8, r4 movs r7, 0x64 mov r9, r7 @@ -783189,9 +756674,9 @@ _0817F0D8: movs r7, 0 _0817F0F6: movs r5, 0 - ldr r4, _0817F198 - ldr r6, _0817F1C8 - ldr r0, _0817F190 + ldr r4, =0x0202420c + ldr r6, =0x02024744 + ldr r0, =0x0202420b ldrb r0, [r0] add r0, r10 ldrb r3, [r0] @@ -783226,7 +756711,7 @@ _0817F11A: adds r6, r0, 0 lsls r6, 16 lsrs r6, 16 - ldr r2, _0817F190 + ldr r2, =0x0202420b ldrb r0, [r2] lsls r0, 1 add r0, r8 @@ -783234,7 +756719,7 @@ _0817F11A: mov r3, r9 muls r3, r0 adds r0, r3, 0 - ldr r1, _0817F1CC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB movs r2, 0 @@ -783242,7 +756727,7 @@ _0817F11A: adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r4, _0817F190 + ldr r4, =0x0202420b ldrb r3, [r4] mov r2, r10 adds r0, r3, r2 @@ -783250,7 +756735,7 @@ _0817F11A: movs r0, 0x58 adds r4, r3, 0 muls r4, r0 - ldr r5, _0817F1D0 + ldr r5, =0x02024090 adds r3, r4, r5 lsls r0, r7, 1 adds r0, r4 @@ -783261,34 +756746,16 @@ _0817F11A: bl sub_80EE35C b _0817F1DC .align 2, 0 -_0817F188: .4byte 0x02022fec -_0817F18C: .4byte 0x02000003 -_0817F190: .4byte 0x0202420b -_0817F194: .4byte 0x02024084 -_0817F198: .4byte 0x0202420c -_0817F19C: .4byte 0x020241ea -_0817F1A0: .4byte 0x00000137 -_0817F1A4: .4byte 0x0831c898 -_0817F1A8: .4byte 0x020244b0 -_0817F1AC: .4byte 0x0860a4ac -_0817F1B0: .4byte 0x0000ffff -_0817F1B4: .4byte 0x020241f0 -_0817F1B8: .4byte 0x0202428e -_0817F1BC: .4byte 0x020242ac -_0817F1C0: .4byte 0x0202433c -_0817F1C4: .4byte 0x0202406e -_0817F1C8: .4byte 0x02024744 -_0817F1CC: .4byte 0x020244ec -_0817F1D0: .4byte 0x02024090 + .pool _0817F1D4: adds r5, 0x1 cmp r5, 0x3 bgt _0817F1DC b _0817F0CC _0817F1DC: - ldr r2, _0817F20C - ldr r1, _0817F210 - ldr r0, _0817F214 + ldr r2, =0x020241f0 + ldr r1, =0x020244b0 + ldr r0, =0x0202420b ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] @@ -783297,7 +756764,7 @@ _0817F1DC: adds r0, 0x10 ldr r0, [r0] str r0, [r2] - ldr r0, _0817F218 + ldr r0, =0x020241ea mov r3, sp ldrh r3, [r3, 0x24] strh r3, [r0] @@ -783311,10 +756778,7 @@ _0817F1FA: pop {r0} bx r0 .align 2, 0 -_0817F20C: .4byte 0x020241f0 -_0817F210: .4byte 0x020244b0 -_0817F214: .4byte 0x0202420b -_0817F218: .4byte 0x020241ea + .pool thumb_func_end sub_817EECC thumb_func_start sub_817F21C @@ -783324,7 +756788,7 @@ sub_817F21C: @ 817F21C mov r12, r2 lsls r0, 16 lsrs r2, r0, 16 - ldr r1, _0817F264 + ldr r1, =0x0831c898 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -783333,8 +756797,8 @@ sub_817F21C: @ 817F21C cmp r0, 0 beq _0817F286 movs r4, 0 - ldr r5, _0817F268 - ldr r7, _0817F26C + ldr r5, =0x0860a4ac + ldr r7, =0x0000ffff adds r3, r5, 0 adds r1, r5, 0 _0817F240: @@ -783351,21 +756815,19 @@ _0817F252: lsls r0, r4, 1 adds r0, r5 ldrh r1, [r0] - ldr r0, _0817F26C + ldr r0, =0x0000ffff cmp r1, r0 beq _0817F270 movs r0, 0 str r0, [r6] b _0817F2A0 .align 2, 0 -_0817F264: .4byte 0x0831c898 -_0817F268: .4byte 0x0860a4ac -_0817F26C: .4byte 0x0000ffff + .pool _0817F270: cmp r2, 0x95 bne _0817F294 - ldr r2, _0817F28C - ldr r0, _0817F290 + ldr r2, =0x02024084 + ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 muls r0, r1 @@ -783378,8 +756840,7 @@ _0817F286: movs r0, 0 b _0817F2A0 .align 2, 0 -_0817F28C: .4byte 0x02024084 -_0817F290: .4byte 0x0202420b + .pool _0817F294: cmp r2, 0xDE bne _0817F29E @@ -783397,22 +756858,22 @@ _0817F2A0: thumb_func_start sub_817F2A8 sub_817F2A8: @ 817F2A8 push {r4,r5,lr} - ldr r0, _0817F32C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 cmp r0, 0 beq _0817F324 - ldr r0, _0817F330 + ldr r0, =0x0202449c ldr r3, [r0] - ldr r0, _0817F334 + ldr r0, =0x0000025b adds r4, r3, r0 ldrb r2, [r4] subs r1, 0x21 adds r0, r1, 0 ands r0, r2 strb r0, [r4] - ldr r0, _0817F338 + ldr r0, =0x00000267 adds r2, r3, r0 ldrb r0, [r2] ands r1, r0 @@ -783463,10 +756924,7 @@ _0817F324: pop {r0} bx r0 .align 2, 0 -_0817F32C: .4byte 0x02022fec -_0817F330: .4byte 0x0202449c -_0817F334: .4byte 0x0000025b -_0817F338: .4byte 0x00000267 + .pool thumb_func_end sub_817F2A8 thumb_func_start sub_817F33C @@ -783479,20 +756937,18 @@ sub_817F33C: @ 817F33C adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 - ldr r6, _0817F360 + ldr r6, =0x02024744 cmp r0, 0 bne _0817F356 - ldr r6, _0817F364 + ldr r6, =0x020244ec _0817F356: movs r4, 0 - ldr r1, _0817F368 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r5, r0, r1 b _0817F36E .align 2, 0 -_0817F360: .4byte 0x02024744 -_0817F364: .4byte 0x020244ec -_0817F368: .4byte 0x0202406e + .pool _0817F36C: adds r4, 0x1 _0817F36E: @@ -783643,7 +757099,7 @@ sub_817F474: @ 817F474 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r1, _0817F488 + ldr r1, =0x0860a8c8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -783651,7 +757107,7 @@ sub_817F474: @ 817F474 movs r0, 0 b _0817F492 .align 2, 0 -_0817F488: .4byte 0x0860a8c8 + .pool _0817F48C: subs r0, 0x1 lsls r0, 24 @@ -783668,7 +757124,7 @@ sub_817F498: @ 817F498 push {r7} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0817F534 + ldr r1, =0x03005e00 lsls r6, r5, 2 adds r0, r6, r5 lsls r0, 3 @@ -783682,7 +757138,7 @@ sub_817F498: @ 817F498 movs r0, 0x8 ldrsh r4, [r2, r0] mov r8, r1 - ldr r0, _0817F538 + ldr r0, =nullsub_12 + 1 mov r12, r0 cmp r4, 0 bne _0817F508 @@ -783695,8 +757151,8 @@ sub_817F498: @ 817F498 strh r4, [r3, 0x2E] movs r0, 0x2 adds r1, r6, 0 - ldr r6, _0817F53C - ldr r7, _0817F540 + ldr r6, =0x0860aa88 + ldr r7, =0x03001274 movs r4, 0 adds r2, r3, 0 adds r2, 0x32 @@ -783743,10 +757199,7 @@ _0817F528: pop {r0} bx r0 .align 2, 0 -_0817F534: .4byte 0x03005e00 -_0817F538: .4byte nullsub_12 + 1 -_0817F53C: .4byte 0x0860aa88 -_0817F540: .4byte 0x03001274 + .pool thumb_func_end sub_817F498 thumb_func_start sub_817F544 @@ -783755,12 +757208,12 @@ sub_817F544: @ 817F544 adds r5, r0, 0 lsls r4, r1, 24 lsrs r4, 24 - ldr r0, _0817F570 + ldr r0, =sub_817F498 + 1 movs r1, 0x80 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0817F574 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -783773,25 +757226,23 @@ sub_817F544: @ 817F544 pop {r0} bx r0 .align 2, 0 -_0817F570: .4byte sub_817F498 + 1 -_0817F574: .4byte 0x03005e00 + .pool thumb_func_end sub_817F544 thumb_func_start sub_817F578 sub_817F578: @ 817F578 lsls r1, 24 - ldr r3, _0817F58C + ldr r3, =0x03001274 movs r2, 0x1 str r2, [r3] - ldr r2, _0817F590 + ldr r2, =0x0860aa88 lsrs r1, 22 adds r1, r2 ldr r1, [r1] str r1, [r0, 0x1C] bx lr .align 2, 0 -_0817F58C: .4byte 0x03001274 -_0817F590: .4byte 0x0860aa88 + .pool thumb_func_end sub_817F578 thumb_func_start sub_817F594 @@ -783800,12 +757251,12 @@ sub_817F594: @ 817F594 adds r5, r0, 0 lsls r6, r1, 24 lsrs r6, 24 - ldr r0, _0817F5F4 + ldr r0, =sub_817F498 + 1 movs r1, 0x80 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r1, _0817F5F8 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -783815,26 +757266,26 @@ sub_817F594: @ 817F594 strh r5, [r4, 0xC] ldrh r0, [r5, 0x2E] lsls r0, 24 - ldr r1, _0817F5FC + ldr r1, =0x0202406e lsrs r0, 23 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0817F600 + ldr r1, =0x020244ec adds r0, r1 bl get_nature lsls r0, 24 lsrs r0, 24 lsls r1, r6, 1 - ldr r2, _0817F604 + ldr r2, =0x0860ad2f adds r0, r2 adds r1, r6 ldrb r0, [r0] adds r1, r0 lsls r1, 24 lsrs r1, 24 - ldr r0, _0817F608 + ldr r0, =0x0860ace4 adds r1, r0 ldrb r0, [r1] strh r0, [r4, 0xE] @@ -783842,21 +757293,16 @@ sub_817F594: @ 817F594 pop {r0} bx r0 .align 2, 0 -_0817F5F4: .4byte sub_817F498 + 1 -_0817F5F8: .4byte 0x03005e00 -_0817F5FC: .4byte 0x0202406e -_0817F600: .4byte 0x020244ec -_0817F604: .4byte 0x0860ad2f -_0817F608: .4byte 0x0860ace4 + .pool thumb_func_end sub_817F594 thumb_func_start sub_817F60C sub_817F60C: @ 817F60C - ldr r1, _0817F614 + ldr r1, =nullsub_69 + 1 str r1, [r0, 0x1C] bx lr .align 2, 0 -_0817F614: .4byte nullsub_69 + 1 + .pool thumb_func_end sub_817F60C thumb_func_start sub_817F618 @@ -783866,7 +757312,7 @@ sub_817F618: @ 817F618 lsls r1, 16 lsls r3, 16 lsrs r3, 16 - ldr r4, _0817F668 + ldr r4, =0xffff0000 lsls r2, 16 lsrs r1, 16 orrs r1, r2 @@ -783884,7 +757330,7 @@ sub_817F618: @ 817F618 movs r2, 0x1 movs r3, 0x2 bl _082E709C - ldr r0, _0817F66C + ldr r0, =0x02021bc0 lsls r4, 3 adds r4, r0 ldrh r0, [r5] @@ -783900,8 +757346,7 @@ sub_817F618: @ 817F618 pop {r0} bx r0 .align 2, 0 -_0817F668: .4byte 0xffff0000 -_0817F66C: .4byte 0x02021bc0 + .pool thumb_func_end sub_817F618 thumb_func_start sub_817F670 @@ -783912,9 +757357,9 @@ sub_817F670: @ 817F670 movs r1, 0x3 orrs r0, r1 strb r0, [r4, 0x1] - ldr r0, _0817F6A0 + ldr r0, =0x0860ad68 str r0, [r4, 0x10] - ldr r0, _0817F6A4 + ldr r0, =0x03001274 ldr r0, [r0] cmp r0, 0x1 bne _0817F68E @@ -783930,8 +757375,7 @@ _0817F68E: bl sub_8008258 b _0817F6B0 .align 2, 0 -_0817F6A0: .4byte 0x0860ad68 -_0817F6A4: .4byte 0x03001274 + .pool _0817F6A8: adds r0, r4, 0 movs r1, 0 @@ -784012,7 +757456,7 @@ sub_817F724: @ 817F724 lsrs r2, r0, 24 cmp r2, 0x3 bhi _0817F750 - ldr r1, _0817F74C + ldr r1, =0x03001240 lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -784027,7 +757471,7 @@ sub_817F724: @ 817F724 movs r0, 0x1 b _0817F752 .align 2, 0 -_0817F74C: .4byte 0x03001240 + .pool _0817F750: movs r0, 0 _0817F752: @@ -784038,7 +757482,7 @@ _0817F752: thumb_func_start sub_817F758 sub_817F758: @ 817F758 push {r4,lr} - ldr r4, _0817F778 + ldr r4, =0x03001270 ldrb r1, [r4] adds r2, r1, 0x1 adds r0, r2, 0 @@ -784053,7 +757497,7 @@ sub_817F758: @ 817F758 pop {r1} bx r1 .align 2, 0 -_0817F778: .4byte 0x03001270 + .pool thumb_func_end sub_817F758 thumb_func_start sub_817F77C @@ -784074,7 +757518,7 @@ sub_817F77C: @ 817F77C lsrs r3, 30 adds r0, r4, 0 bl oam_center - ldr r0, _0817F7BC + ldr r0, =0x03001274 ldr r0, [r0] cmp r0, 0x1 bne _0817F800 @@ -784090,7 +757534,7 @@ sub_817F77C: @ 817F77C adds r5, r1, 0 b _0817F7D0 .align 2, 0 -_0817F7BC: .4byte 0x03001274 + .pool _0817F7C0: adds r0, r4, 0 adds r0, 0x3F @@ -784153,11 +757597,11 @@ _0817F81A: bl sub_817F6D4 adds r0, r6, 0 bl sub_817F77C - ldr r0, _0817F83C + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _0817F88C .align 2, 0 -_0817F83C: .4byte sub_8184D88 + 1 + .pool _0817F840: movs r1, 0x32 ldrsh r0, [r6, r1] @@ -784212,12 +757656,12 @@ pokemonanimfunc_02: @ 817F898 ldrsh r0, [r4, r2] cmp r0, 0x28 ble _0817F8B4 - ldr r0, _0817F8B0 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 b _0817F8EE .align 2, 0 -_0817F8B0: .4byte sub_8184D88 + 1 + .pool _0817F8B4: movs r0, 0x1 ands r0, r1 @@ -784269,12 +757713,12 @@ sub_817F8FC: @ 817F8FC ldrsh r0, [r4, r2] cmp r1, r0 ble _0817F91C - ldr r0, _0817F918 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 b _0817F946 .align 2, 0 -_0817F918: .4byte sub_8184D88 + 1 + .pool _0817F91C: movs r0, 0x32 ldrsh r1, [r4, r0] @@ -784316,13 +757760,13 @@ pokemonanimfunc_03: @ 817F95C strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F8FC - ldr r0, _0817F974 + ldr r0, =sub_817F8FC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0817F974: .4byte sub_817F8FC + 1 + .pool thumb_func_end pokemonanimfunc_03 thumb_func_start sub_817F978 @@ -784336,12 +757780,12 @@ sub_817F978: @ 817F978 ldrsh r0, [r4, r2] cmp r1, r0 ble _0817F998 - ldr r0, _0817F994 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 b _0817F9C4 .align 2, 0 -_0817F994: .4byte sub_8184D88 + 1 + .pool _0817F998: movs r0, 0x32 ldrsh r1, [r4, r0] @@ -784384,13 +757828,13 @@ pokemonanimfunc_04: @ 817F9D8 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F978 - ldr r0, _0817F9F0 + ldr r0, =sub_817F978 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0817F9F0: .4byte sub_817F978 + 1 + .pool thumb_func_end pokemonanimfunc_04 thumb_func_start sub_817F9F4 @@ -784403,13 +757847,13 @@ sub_817F9F4: @ 817F9F4 lsls r0, 1 cmp r1, r0 ble _0817FA14 - ldr r0, _0817FA10 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] b _0817FA5E .align 2, 0 -_0817FA10: .4byte sub_8184D88 + 1 + .pool _0817FA14: adds r0, r1, 0 cmp r1, 0 @@ -784425,7 +757869,7 @@ _0817FA1C: ble _0817FA48 cmp r0, 0x3 bgt _0817FA60 - ldr r2, _0817FA44 + ldr r2, =0xffffff00 adds r1, r2 lsls r0, r1, 16 asrs r0, 16 @@ -784436,7 +757880,7 @@ _0817FA1C: lsls r1, 16 b _0817FA56 .align 2, 0 -_0817FA44: .4byte 0xffffff00 + .pool _0817FA48: lsls r0, r2, 7 subs r0, r1, r0 @@ -784468,13 +757912,13 @@ pokemonanimfunc_1E: @ 817FA6C strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F9F4 - ldr r0, _0817FA84 + ldr r0, =sub_817F9F4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0817FA84: .4byte sub_817F9F4 + 1 + .pool thumb_func_end pokemonanimfunc_1E thumb_func_start pokemonanimfunc_06 @@ -784487,13 +757931,13 @@ pokemonanimfunc_06: @ 817FA88 lsls r0, 2 cmp r2, r0 ble _0817FAA8 - ldr r0, _0817FAA4 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] b _0817FB56 .align 2, 0 -_0817FAA4: .4byte sub_8184D88 + 1 + .pool _0817FAA8: adds r0, r2, 0 cmp r2, 0 @@ -784505,12 +757949,12 @@ _0817FAB0: cmp r0, 0x5 bhi _0817FB3C lsls r0, 2 - ldr r1, _0817FAC4 + ldr r1, =_0817FAC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0817FAC4: .4byte _0817FAC8 + .pool .align 2, 0 _0817FAC8: .4byte _0817FAE0 @@ -784624,11 +758068,11 @@ _0817FB76: bl sub_817F6D4 adds r0, r6, 0 bl sub_817F77C - ldr r0, _0817FB98 + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _0817FC12 .align 2, 0 -_0817FB98: .4byte sub_8184D88 + 1 + .pool _0817FB9C: movs r1, 0x32 ldrsh r0, [r6, r1] @@ -784707,7 +758151,7 @@ sub_817FC20: @ 817FC20 bne _0817FC32 strh r0, [r4, 0x34] _0817FC32: - ldr r2, _0817FC58 + ldr r2, =0x0860ad70 movs r5, 0x34 ldrsh r1, [r4, r5] lsls r0, r1, 1 @@ -784723,12 +758167,11 @@ _0817FC32: adds r0, r1, 0 cmp r0, 0 bne _0817FC60 - ldr r0, _0817FC5C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _0817FC6A .align 2, 0 -_0817FC58: .4byte 0x0860ad70 -_0817FC5C: .4byte sub_8184D88 + 1 + .pool _0817FC60: ldrh r0, [r4, 0x34] adds r0, 0x1 @@ -784747,11 +758190,11 @@ _0817FC6A: asrs r0, 24 cmp r0, 0 bne _0817FC8C - ldr r0, _0817FC88 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _0817FCBE .align 2, 0 -_0817FC88: .4byte sub_8184D88 + 1 + .pool _0817FC8C: adds r0, r1, r2 ldrb r0, [r0] @@ -784788,13 +758231,13 @@ pokemonanimfunc_0A: @ 817FCC4 push {r4,lr} adds r4, r0, 0 bl sub_817FC20 - ldr r0, _0817FCD8 + ldr r0, =sub_817FC20 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0817FCD8: .4byte sub_817FC20 + 1 + .pool thumb_func_end pokemonanimfunc_0A thumb_func_start sub_817FCDC @@ -784807,12 +758250,12 @@ sub_817FCDC: @ 817FCDC lsls r0, 4 cmp r1, r0 ble _0817FCF8 - ldr r0, _0817FCF4 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 b _0817FD12 .align 2, 0 -_0817FCF4: .4byte sub_8184D88 + 1 + .pool _0817FCF8: adds r0, r1, 0 cmp r1, 0 @@ -784848,13 +758291,13 @@ pokemonanimfunc_0F: @ 817FD24 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817FCDC - ldr r0, _0817FD40 + ldr r0, =sub_817FCDC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0817FD40: .4byte sub_817FCDC + 1 + .pool thumb_func_end pokemonanimfunc_0F thumb_func_start sub_817FD44 @@ -784867,12 +758310,12 @@ sub_817FD44: @ 817FD44 lsls r0, 4 cmp r1, r0 ble _0817FD60 - ldr r0, _0817FD5C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 b _0817FD78 .align 2, 0 -_0817FD5C: .4byte sub_8184D88 + 1 + .pool _0817FD60: adds r0, r1, 0 cmp r1, 0 @@ -784905,13 +758348,13 @@ pokemonanimfunc_10: @ 817FD88 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817FD44 - ldr r0, _0817FDA0 + ldr r0, =sub_817FD44 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0817FDA0: .4byte sub_817FD44 + 1 + .pool thumb_func_end pokemonanimfunc_10 thumb_func_start pokemonanimfunc_11 @@ -784925,14 +758368,14 @@ pokemonanimfunc_11: @ 817FDA4 lsls r0, 2 cmp r1, r0 ble _0817FDC8 - ldr r0, _0817FDC4 + ldr r0, =sub_8184D88 + 1 str r0, [r7, 0x1C] movs r0, 0 strh r0, [r7, 0x24] strh r0, [r7, 0x26] b _0817FE24 .align 2, 0 -_0817FDC4: .4byte sub_8184D88 + 1 + .pool _0817FDC8: movs r0, 0x1 ands r0, r2 @@ -784993,7 +758436,7 @@ _0817FE24: sub_817FE30: @ 817FE30 push {r4-r6,lr} adds r4, r0, 0 - ldr r2, _0817FE50 + ldr r2, =0x03001240 ldrh r6, [r4, 0x2E] movs r0, 0x2E ldrsh r1, [r4, r0] @@ -785008,7 +758451,7 @@ sub_817FE30: @ 817FE30 strh r0, [r5] b _0817FEF8 .align 2, 0 -_0817FE50: .4byte 0x03001240 + .pool _0817FE54: movs r1, 0x32 ldrsh r0, [r4, r1] @@ -785024,7 +758467,7 @@ _0817FE54: adds r0, 0x1 strh r0, [r5, 0x8] _0817FE70: - ldr r2, _0817FEB0 + ldr r2, =0x03001240 lsls r1, r6, 16 asrs r1, 16 lsls r0, r1, 1 @@ -785056,15 +758499,15 @@ _0817FE70: strh r1, [r4, 0x32] b _0817FEF2 .align 2, 0 -_0817FEB0: .4byte 0x03001240 + .pool _0817FEB4: adds r0, r4, 0 bl sub_817F77C - ldr r0, _0817FEC0 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _0817FEF2 .align 2, 0 -_0817FEC0: .4byte sub_8184D88 + 1 + .pool _0817FEC4: movs r0, 0x32 ldrsh r1, [r4, r0] @@ -785107,7 +758550,7 @@ pokemonanimfunc_12: @ 817FF00 lsrs r0, 24 movs r3, 0 strh r0, [r4, 0x2E] - ldr r2, _0817FF34 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -785118,14 +758561,13 @@ pokemonanimfunc_12: @ 817FF00 strh r3, [r1] adds r0, r4, 0 bl sub_817FE30 - ldr r0, _0817FF38 + ldr r0, =sub_817FE30 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0817FF34: .4byte 0x03001240 -_0817FF38: .4byte sub_817FE30 + 1 + .pool thumb_func_end pokemonanimfunc_12 thumb_func_start sub_817FF3C @@ -785144,7 +758586,7 @@ sub_817FF3C: @ 817FF3C _0817FF54: movs r2, 0x32 ldrsh r6, [r4, r2] - ldr r1, _0817FF84 + ldr r1, =0x03001240 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -785160,12 +758602,11 @@ _0817FF54: bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, _0817FF88 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _0817FFAA .align 2, 0 -_0817FF84: .4byte 0x03001240 -_0817FF88: .4byte sub_8184D88 + 1 + .pool _0817FF8C: movs r2, 0x8 ldrsh r1, [r0, r2] @@ -785197,7 +758638,7 @@ pokemonanimfunc_1F: @ 817FFB8 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _0817FFE8 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -785208,14 +758649,13 @@ pokemonanimfunc_1F: @ 817FFB8 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_817FF3C - ldr r0, _0817FFEC + ldr r0, =sub_817FF3C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0817FFE8: .4byte 0x03001240 -_0817FFEC: .4byte sub_817FF3C + 1 + .pool thumb_func_end pokemonanimfunc_1F thumb_func_start sub_817FFF0 @@ -785227,7 +758667,7 @@ sub_817FFF0: @ 817FFF0 lsrs r7, r0, 24 adds r0, r5, 0 bl sub_817F70C - ldr r1, _08180024 + ldr r1, =0x03001240 lsls r0, r7, 1 adds r0, r7 lsls r0, 2 @@ -785241,12 +758681,11 @@ sub_817FFF0: @ 817FFF0 movs r0, 0 strh r0, [r5, 0x24] strh r0, [r5, 0x26] - ldr r0, _08180028 + ldr r0, =sub_8184D88 + 1 str r0, [r5, 0x1C] b _0818006A .align 2, 0 -_08180024: .4byte 0x03001240 -_08180028: .4byte sub_8184D88 + 1 + .pool _0818002C: movs r0, 0x32 ldrsh r1, [r5, r0] @@ -785255,7 +758694,7 @@ _0818002C: adds r4, r0, 0 cmp r0, 0 bge _0818003E - ldr r2, _08180088 + ldr r2, =0x000001bf adds r4, r1, r2 _0818003E: asrs r4, 8 @@ -785279,7 +758718,7 @@ _0818003E: adds r0, r1 strh r0, [r5, 0x26] _0818006A: - ldr r0, _0818008C + ldr r0, =0x03001240 lsls r1, r7, 1 adds r1, r7 lsls r1, 2 @@ -785294,8 +758733,7 @@ _0818006A: pop {r0} bx r0 .align 2, 0 -_08180088: .4byte 0x000001bf -_0818008C: .4byte 0x03001240 + .pool thumb_func_end sub_817FFF0 thumb_func_start pokemonanimfunc_14 @@ -785306,7 +758744,7 @@ pokemonanimfunc_14: @ 8180090 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _081800C8 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -785320,14 +758758,13 @@ pokemonanimfunc_14: @ 8180090 strh r0, [r1, 0x2] adds r0, r4, 0 bl sub_817FFF0 - ldr r0, _081800CC + ldr r0, =sub_817FFF0 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081800C8: .4byte 0x03001240 -_081800CC: .4byte sub_817FFF0 + 1 + .pool thumb_func_end pokemonanimfunc_14 thumb_func_start pokemonanimfunc_15 @@ -785356,11 +758793,11 @@ _081800EC: movs r2, 0 movs r3, 0 bl pal_fade_1 - ldr r0, _08180108 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08180128 .align 2, 0 -_08180108: .4byte sub_8184D88 + 1 + .pool _0818010C: movs r2, 0x32 ldrsh r0, [r4, r2] @@ -785408,11 +758845,11 @@ _08180148: bl sub_817F6D4 adds r0, r6, 0 bl sub_817F77C - ldr r0, _0818016C + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _08180204 .align 2, 0 -_0818016C: .4byte sub_8184D88 + 1 + .pool _08180170: movs r1, 0x32 ldrsh r0, [r6, r1] @@ -785445,14 +758882,14 @@ _08180196: adds r0, r7, 0 movs r1, 0x10 bl sine - ldr r1, _081801C0 + ldr r1, =0xffffff00 adds r0, r1 adds r4, r0 strh r4, [r6, 0x36] adds r4, r5, 0 b _081801E4 .align 2, 0 -_081801C0: .4byte 0xffffff00 + .pool _081801C4: adds r0, r7, 0 movs r1, 0x10 @@ -785521,13 +758958,13 @@ _0818022C: bl sub_817F6D4 adds r0, r5, 0 bl sub_817F77C - ldr r0, _08180254 + ldr r0, =sub_8184D88 + 1 str r0, [r5, 0x1C] mov r0, r8 strh r0, [r5, 0x26] b _0818030A .align 2, 0 -_08180254: .4byte sub_8184D88 + 1 + .pool _08180258: movs r1, 0x32 ldrsh r0, [r5, r1] @@ -785556,13 +758993,13 @@ _0818027E: asrs r0, r4, 16 movs r1, 0x10 bl sine - ldr r2, _0818029C + ldr r2, =0xffffff00 adds r1, r2, 0 subs r1, r0 strh r1, [r5, 0x36] b _081802B2 .align 2, 0 -_0818029C: .4byte 0xffffff00 + .pool _081802A0: lsls r4, 16 asrs r0, r4, 16 @@ -785640,7 +759077,7 @@ sub_818031C: @ 818031C ldrh r0, [r4, 0x3A] lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _08180368 + ldr r2, =0x0860aa80 movs r1, 0x38 ldrsh r0, [r4, r1] lsls r0, 1 @@ -785661,14 +759098,13 @@ sub_818031C: @ 818031C _08180358: cmp r5, 0xFF bne _08180370 - ldr r0, _0818036C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x26] b _08180394 .align 2, 0 -_08180368: .4byte 0x0860aa80 -_0818036C: .4byte sub_8184D88 + 1 + .pool _08180370: mov r0, r8 bl sine @@ -785705,13 +759141,13 @@ pokemonanimfunc_19: @ 81803A0 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_818031C - ldr r0, _081803B8 + ldr r0, =sub_818031C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081803B8: .4byte sub_818031C + 1 + .pool thumb_func_end pokemonanimfunc_19 thumb_func_start pokemonanimfunc_1A @@ -785742,13 +759178,13 @@ _081803DA: bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, _08180400 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] b _0818045E .align 2, 0 -_08180400: .4byte sub_8184D88 + 1 + .pool _08180404: adds r6, r5, 0 subs r6, 0xA @@ -785831,11 +759267,11 @@ _08180486: strh r0, [r6, 0x26] adds r0, r6, 0 bl sub_817F77C - ldr r0, _081804AC + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _081804E8 .align 2, 0 -_081804AC: .4byte sub_8184D88 + 1 + .pool _081804B0: movs r1, 0x32 ldrsh r0, [r6, r1] @@ -785851,7 +759287,7 @@ _081804B0: strh r0, [r6, 0x26] movs r5, 0x80 lsls r5, 1 - ldr r1, _081804F4 + ldr r1, =0x00000ccc adds r0, r4, 0 bl sine adds r3, r0, 0 @@ -785869,7 +759305,7 @@ _081804E8: pop {r0} bx r0 .align 2, 0 -_081804F4: .4byte 0x00000ccc + .pool thumb_func_end pokemonanimfunc_1B thumb_func_start sub_81804F8 @@ -785897,11 +759333,11 @@ _0818050C: strh r5, [r6, 0x26] adds r0, r6, 0 bl sub_817F77C - ldr r0, _08180530 + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _08180582 .align 2, 0 -_08180530: .4byte sub_8184D88 + 1 + .pool _08180534: movs r0, 0x32 ldrsh r5, [r6, r0] @@ -785928,7 +759364,7 @@ _08180534: movs r4, 0x80 lsls r4, 1 adds r0, r5, 0 - ldr r1, _08180590 + ldr r1, =0x00000ccc bl sine adds r3, r0, 0 lsls r3, 16 @@ -785945,7 +759381,7 @@ _08180582: pop {r0} bx r0 .align 2, 0 -_08180590: .4byte 0x00000ccc + .pool thumb_func_end sub_81804F8 thumb_func_start pokemonanimfunc_1C @@ -785956,13 +759392,13 @@ pokemonanimfunc_1C: @ 8180594 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_81804F8 - ldr r0, _081805AC + ldr r0, =sub_81804F8 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081805AC: .4byte sub_81804F8 + 1 + .pool thumb_func_end pokemonanimfunc_1C thumb_func_start sub_81805B0 @@ -785990,11 +759426,11 @@ _081805C4: strh r5, [r6, 0x26] adds r0, r6, 0 bl sub_817F77C - ldr r0, _081805E8 + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _08180644 .align 2, 0 -_081805E8: .4byte sub_8184D88 + 1 + .pool _081805EC: movs r0, 0x32 ldrsh r5, [r6, r0] @@ -786026,7 +759462,7 @@ _081805EC: movs r4, 0x80 lsls r4, 1 adds r0, r5, 0 - ldr r1, _08180650 + ldr r1, =0x00000ccc bl sine adds r3, r0, 0 lsls r3, 16 @@ -786043,7 +759479,7 @@ _08180644: pop {r0} bx r0 .align 2, 0 -_08180650: .4byte 0x00000ccc + .pool thumb_func_end sub_81805B0 thumb_func_start pokemonanimfunc_18 @@ -786054,13 +759490,13 @@ pokemonanimfunc_18: @ 8180654 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_81805B0 - ldr r0, _0818066C + ldr r0, =sub_81805B0 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0818066C: .4byte sub_81805B0 + 1 + .pool thumb_func_end pokemonanimfunc_18 thumb_func_start pokemonanimfunc_1D @@ -786089,11 +759525,11 @@ _08180688: strh r5, [r6, 0x24] adds r0, r6, 0 bl sub_817F77C - ldr r0, _081806AC + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _081806FC .align 2, 0 -_081806AC: .4byte sub_8184D88 + 1 + .pool _081806B0: movs r0, 0x32 ldrsh r5, [r6, r0] @@ -786119,7 +759555,7 @@ _081806B0: movs r4, 0x80 lsls r4, 1 adds r0, r5, 0 - ldr r1, _08180710 + ldr r1, =0x00000ccc bl sine adds r3, r0, 0 lsls r3, 16 @@ -786138,7 +759574,7 @@ _081806FC: pop {r0} bx r0 .align 2, 0 -_08180710: .4byte 0x00000ccc + .pool thumb_func_end pokemonanimfunc_1D thumb_func_start sub_8180714 @@ -786173,11 +759609,11 @@ _0818072A: strh r6, [r4, 0x26] adds r0, r4, 0 bl sub_817F77C - ldr r0, _0818075C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _081807FE .align 2, 0 -_0818075C: .4byte sub_8184D88 + 1 + .pool _08180760: movs r1, 0x36 ldrsh r0, [r4, r1] @@ -786271,13 +759707,13 @@ pokemonanimfunc_00: @ 818080C strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_8180714 - ldr r0, _08180824 + ldr r0, =sub_8180714 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08180824: .4byte sub_8180714 + 1 + .pool thumb_func_end pokemonanimfunc_00 thumb_func_start sub_8180828 @@ -786305,11 +759741,11 @@ sub_8180828: @ 8180828 strh r6, [r5, 0x26] adds r0, r5, 0 bl sub_817F77C - ldr r0, _08180864 + ldr r0, =sub_8184D88 + 1 str r0, [r5, 0x1C] b _081808D0 .align 2, 0 -_08180864: .4byte sub_8184D88 + 1 + .pool _08180868: movs r1, 0x36 ldrsh r0, [r5, r1] @@ -786403,14 +759839,14 @@ sub_8180900: @ 8180900 ldrh r1, [r4, 0x2E] lsls r1, 24 lsrs r1, 24 - ldr r2, _081809A4 + ldr r2, =0x03001240 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 adds r0, r2 ldrh r1, [r0, 0x6] str r1, [sp] - ldr r5, _081809A8 + ldr r5, =0x0860ad8e movs r3, 0x36 ldrsh r2, [r4, r3] lsls r1, r2, 1 @@ -786467,13 +759903,11 @@ _0818096C: strh r5, [r4, 0x26] adds r0, r4, 0 bl sub_817F77C - ldr r0, _081809AC + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08180A3A .align 2, 0 -_081809A4: .4byte 0x03001240 -_081809A8: .4byte 0x0860ad8e -_081809AC: .4byte sub_8184D88 + 1 + .pool _081809B0: lsls r0, r7, 16 asrs r5, r0, 16 @@ -786564,7 +759998,7 @@ pokemonanimfunc_05: @ 8180A50 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08180A84 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -786576,14 +760010,13 @@ pokemonanimfunc_05: @ 8180A50 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_8180900 - ldr r0, _08180A88 + ldr r0, =sub_8180900 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08180A84: .4byte 0x03001240 -_08180A88: .4byte sub_8180900 + 1 + .pool thumb_func_end pokemonanimfunc_05 thumb_func_start pokemonanimfunc_20 @@ -786608,16 +760041,15 @@ _08180AA8: cmp r0, 0x80 ble _08180ACC ldrh r0, [r4, 0x3C] - ldr r3, _08180AC4 + ldr r3, =0x000002df movs r1, 0x10 movs r2, 0 bl pal_fade_1 - ldr r0, _08180AC8 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08180AE8 .align 2, 0 -_08180AC4: .4byte 0x000002df -_08180AC8: .4byte sub_8184D88 + 1 + .pool _08180ACC: movs r2, 0x32 ldrsh r0, [r4, r2] @@ -786628,7 +760060,7 @@ _08180ACC: ldrh r0, [r4, 0x3C] lsls r2, 24 lsrs r2, 24 - ldr r3, _08180AF4 + ldr r3, =0x000002df movs r1, 0x10 bl pal_fade_1 _08180AE8: @@ -786639,7 +760071,7 @@ _08180AE8: pop {r0} bx r0 .align 2, 0 -_08180AF4: .4byte 0x000002df + .pool thumb_func_end pokemonanimfunc_20 thumb_func_start pokemonanimfunc_21 @@ -786668,11 +760100,11 @@ _08180B14: movs r2, 0 movs r3, 0x1F bl pal_fade_1 - ldr r0, _08180B30 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08180B50 .align 2, 0 -_08180B30: .4byte sub_8184D88 + 1 + .pool _08180B34: movs r2, 0x32 ldrsh r0, [r4, r2] @@ -786722,11 +760154,11 @@ _08180B78: movs r1, 0x10 movs r2, 0 bl pal_fade_1 - ldr r0, _08180B94 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08180BB6 .align 2, 0 -_08180B94: .4byte sub_8184D88 + 1 + .pool _08180B98: movs r2, 0x32 ldrsh r0, [r4, r2] @@ -786772,16 +760204,15 @@ _08180BE0: cmp r0, 0x80 ble _08180C04 ldrh r0, [r4, 0x3C] - ldr r3, _08180BFC + ldr r3, =0x000003ff movs r1, 0x10 movs r2, 0 bl pal_fade_1 - ldr r0, _08180C00 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08180C20 .align 2, 0 -_08180BFC: .4byte 0x000003ff -_08180C00: .4byte sub_8184D88 + 1 + .pool _08180C04: movs r2, 0x32 ldrsh r0, [r4, r2] @@ -786792,7 +760223,7 @@ _08180C04: ldrh r0, [r4, 0x3C] lsls r2, 24 lsrs r2, 24 - ldr r3, _08180C2C + ldr r3, =0x000003ff movs r1, 0x10 bl pal_fade_1 _08180C20: @@ -786803,7 +760234,7 @@ _08180C20: pop {r0} bx r0 .align 2, 0 -_08180C2C: .4byte 0x000003ff + .pool thumb_func_end pokemonanimfunc_23 thumb_func_start pokemonanimfunc_24 @@ -786828,16 +760259,15 @@ _08180C4C: cmp r0, 0x80 ble _08180C70 ldrh r0, [r4, 0x3C] - ldr r3, _08180C68 + ldr r3, =0x00006018 movs r1, 0x10 movs r2, 0 bl pal_fade_1 - ldr r0, _08180C6C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08180C8C .align 2, 0 -_08180C68: .4byte 0x00006018 -_08180C6C: .4byte sub_8184D88 + 1 + .pool _08180C70: movs r2, 0x32 ldrsh r0, [r4, r2] @@ -786848,7 +760278,7 @@ _08180C70: ldrh r0, [r4, 0x3C] lsls r2, 24 lsrs r2, 24 - ldr r3, _08180C98 + ldr r3, =0x00006018 movs r1, 0x10 bl pal_fade_1 _08180C8C: @@ -786859,7 +760289,7 @@ _08180C8C: pop {r0} bx r0 .align 2, 0 -_08180C98: .4byte 0x00006018 + .pool thumb_func_end pokemonanimfunc_24 thumb_func_start pokemonanimfunc_25 @@ -786867,13 +760297,13 @@ pokemonanimfunc_25: @ 8180C9C push {r4,lr} adds r4, r0, 0 bl sub_817F670 - ldr r0, _08180CB0 + ldr r0, =sub_8180CB4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08180CB0: .4byte sub_8180CB4 + 1 + .pool thumb_func_end pokemonanimfunc_25 thumb_func_start sub_8180CB4 @@ -786892,7 +760322,7 @@ sub_8180CB4: @ 8180CB4 strh r0, [r4, 0x24] movs r0, 0x2 strh r0, [r4, 0x3C] - ldr r0, _08180CE4 + ldr r0, =sub_8180CE8 + 1 str r0, [r4, 0x1C] _08180CD6: adds r0, r4, 0 @@ -786901,7 +760331,7 @@ _08180CD6: pop {r0} bx r0 .align 2, 0 -_08180CE4: .4byte sub_8180CE8 + 1 + .pool thumb_func_end sub_8180CB4 thumb_func_start sub_8180CE8 @@ -786924,7 +760354,7 @@ sub_8180CE8: @ 8180CE8 movs r0, 0 strh r0, [r4, 0x3A] ldrh r1, [r4, 0x24] - ldr r5, _08180D40 + ldr r5, =sub_8180D44 + 1 movs r3, 0x8 negs r3, r3 _08180D14: @@ -786950,7 +760380,7 @@ _08180D32: pop {r0} bx r0 .align 2, 0 -_08180D40: .4byte sub_8180D44 + 1 + .pool thumb_func_end sub_8180CE8 thumb_func_start sub_8180D44 @@ -787004,7 +760434,7 @@ _08180D84: movs r0, 0 strh r0, [r4, 0x34] strh r5, [r4, 0x32] - ldr r0, _08180DBC + ldr r0, =sub_8180DC0 + 1 str r0, [r4, 0x1C] _08180DAE: adds r0, r4, 0 @@ -787013,7 +760443,7 @@ _08180DAE: pop {r0} bx r0 .align 2, 0 -_08180DBC: .4byte sub_8180DC0 + 1 + .pool thumb_func_end sub_8180D44 thumb_func_start sub_8180DC0 @@ -787047,11 +760477,11 @@ _08180DE2: ldrsh r0, [r4, r1] cmp r0, 0 bne _08180E1C - ldr r0, _08180E04 + ldr r0, =sub_8180E28 + 1 str r0, [r4, 0x1C] b _08180E1C .align 2, 0 -_08180E04: .4byte sub_8180E28 + 1 + .pool _08180E08: ldrh r0, [r4, 0x36] ldrh r2, [r4, 0x24] @@ -787086,7 +760516,7 @@ sub_8180E28: @ 8180E28 strh r0, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C - ldr r0, _08180E58 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] _08180E4A: adds r0, r4, 0 @@ -787095,7 +760525,7 @@ _08180E4A: pop {r0} bx r0 .align 2, 0 -_08180E58: .4byte sub_8184D88 + 1 + .pool thumb_func_end sub_8180E28 thumb_func_start pokemonanimfunc_26 @@ -787105,13 +760535,13 @@ pokemonanimfunc_26: @ 8180E5C bl sub_817F670 movs r0, 0 strh r0, [r4, 0x34] - ldr r0, _08180E74 + ldr r0, =sub_8180E78 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08180E74: .4byte sub_8180E78 + 1 + .pool thumb_func_end pokemonanimfunc_26 thumb_func_start sub_8180E78 @@ -787144,10 +760574,10 @@ _08180EA2: movs r1, 0 movs r0, 0x8 strh r0, [r4, 0x24] - ldr r0, _08180EC8 + ldr r0, =0x0000fff8 strh r0, [r4, 0x26] strh r1, [r4, 0x36] - ldr r0, _08180ECC + ldr r0, =sub_8180ED0 + 1 str r0, [r4, 0x1C] _08180EBA: adds r0, r4, 0 @@ -787156,8 +760586,7 @@ _08180EBA: pop {r0} bx r0 .align 2, 0 -_08180EC8: .4byte 0x0000fff8 -_08180ECC: .4byte sub_8180ED0 + 1 + .pool thumb_func_end sub_8180E78 thumb_func_start sub_8180ED0 @@ -787185,7 +760614,7 @@ sub_8180ED0: @ 8180ED0 strh r0, [r4, 0x32] movs r0, 0xA strh r0, [r4, 0x34] - ldr r0, _08180F28 + ldr r0, =sub_8180F2C + 1 str r0, [r4, 0x1C] _08180F08: ldrh r0, [r4, 0x36] @@ -787204,7 +760633,7 @@ _08180F1A: pop {r0} bx r0 .align 2, 0 -_08180F28: .4byte sub_8180F2C + 1 + .pool thumb_func_end sub_8180ED0 thumb_func_start sub_8180F2C @@ -787256,7 +760685,7 @@ _08180F44: strh r5, [r4, 0x26] adds r0, r4, 0 bl sub_817F77C - ldr r0, _08180FA4 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] _08180F96: adds r0, r4, 0 @@ -787265,7 +760694,7 @@ _08180F96: pop {r0} bx r0 .align 2, 0 -_08180FA4: .4byte sub_8184D88 + 1 + .pool thumb_func_end sub_8180F2C thumb_func_start pokemonanimfunc_27 @@ -787312,7 +760741,7 @@ _08180FC6: ands r1, r0 mov r2, r12 strb r1, [r2] - ldr r0, _08181008 + ldr r0, =sub_8184D88 + 1 str r0, [r3, 0x1C] _08180FFC: movs r0, 0x2 @@ -787322,7 +760751,7 @@ _08180FFE: pop {r0} bx r0 .align 2, 0 -_08181008: .4byte sub_8184D88 + 1 + .pool thumb_func_end pokemonanimfunc_27 thumb_func_start pokemonanimfunc_28 @@ -787330,13 +760759,13 @@ pokemonanimfunc_28: @ 818100C push {r4,lr} adds r4, r0, 0 bl sub_817F670 - ldr r0, _08181020 + ldr r0, =sub_8181024 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08181020: .4byte sub_8181024 + 1 + .pool thumb_func_end pokemonanimfunc_28 thumb_func_start sub_8181024 @@ -787356,11 +760785,11 @@ sub_8181024: @ 8181024 negs r1, r1 cmp r0, r1 bgt _08181054 - ldr r0, _08181060 + ldr r0, =0x0000fff0 strh r0, [r4, 0x24] movs r0, 0x10 strh r0, [r4, 0x26] - ldr r0, _08181064 + ldr r0, =sub_8181068 + 1 str r0, [r4, 0x1C] movs r0, 0xA0 strh r0, [r4, 0x32] @@ -787371,8 +760800,7 @@ _08181054: pop {r0} bx r0 .align 2, 0 -_08181060: .4byte 0x0000fff0 -_08181064: .4byte sub_8181068 + 1 + .pool thumb_func_end sub_8181024 thumb_func_start sub_8181068 @@ -787408,7 +760836,7 @@ sub_8181068: @ 8181068 ldrsh r0, [r4, r1] cmp r0, 0x20 bgt _081810B2 - ldr r0, _081810C0 + ldr r0, =sub_81810C4 + 1 str r0, [r4, 0x1C] _081810B2: adds r0, r4, 0 @@ -787417,7 +760845,7 @@ _081810B2: pop {r0} bx r0 .align 2, 0 -_081810C0: .4byte sub_81810C4 + 1 + .pool thumb_func_end sub_8181068 thumb_func_start sub_81810C4 @@ -787436,7 +760864,7 @@ sub_81810C4: @ 81810C4 bgt _081810E8 adds r0, r4, 0 bl sub_817F77C - ldr r0, _081810F4 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] _081810E8: adds r0, r4, 0 @@ -787445,7 +760873,7 @@ _081810E8: pop {r0} bx r0 .align 2, 0 -_081810F4: .4byte sub_8184D88 + 1 + .pool thumb_func_end sub_81810C4 thumb_func_start pokemonanimfunc_29 @@ -787453,13 +760881,13 @@ pokemonanimfunc_29: @ 81810F8 push {r4,lr} adds r4, r0, 0 bl sub_817F670 - ldr r0, _0818110C + ldr r0, =sub_8181110 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0818110C: .4byte sub_8181110 + 1 + .pool thumb_func_end pokemonanimfunc_29 thumb_func_start sub_8181110 @@ -787479,7 +760907,7 @@ sub_8181110: @ 8181110 ble _08181134 movs r0, 0 strh r0, [r4, 0x32] - ldr r0, _08181140 + ldr r0, =sub_8181144 + 1 str r0, [r4, 0x1C] _08181134: adds r0, r4, 0 @@ -787488,7 +760916,7 @@ _08181134: pop {r0} bx r0 .align 2, 0 -_08181140: .4byte sub_8181144 + 1 + .pool thumb_func_end sub_8181110 thumb_func_start sub_8181144 @@ -787506,18 +760934,17 @@ sub_8181144: @ 8181144 negs r0, r0 cmp r1, r0 bgt _0818117C - ldr r0, _08181174 + ldr r0, =0x0000fff0 strh r0, [r4, 0x24] movs r0, 0x10 strh r0, [r4, 0x26] movs r0, 0 strh r0, [r4, 0x32] - ldr r0, _08181178 + ldr r0, =sub_81811A4 + 1 str r0, [r4, 0x1C] b _08181186 .align 2, 0 -_08181174: .4byte 0x0000fff0 -_08181178: .4byte sub_81811A4 + 1 + .pool _0818117C: subs r0, r2, 0x2 strh r0, [r4, 0x24] @@ -787559,7 +760986,7 @@ sub_81811A4: @ 81811A4 strh r2, [r4, 0x26] adds r0, r4, 0 bl sub_817F77C - ldr r0, _081811DC + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] _081811CE: adds r0, r4, 0 @@ -787568,7 +760995,7 @@ _081811CE: pop {r0} bx r0 .align 2, 0 -_081811DC: .4byte sub_8184D88 + 1 + .pool thumb_func_end sub_81811A4 thumb_func_start pokemonanimfunc_2A @@ -787579,7 +761006,7 @@ pokemonanimfunc_2A: @ 81811E0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _0818120C + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -787588,21 +761015,20 @@ pokemonanimfunc_2A: @ 81811E0 strh r0, [r1, 0x2] adds r0, r4, 0 bl sub_8181214 - ldr r0, _08181210 + ldr r0, =sub_8181214 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0818120C: .4byte 0x03001240 -_08181210: .4byte sub_8181214 + 1 + .pool thumb_func_end pokemonanimfunc_2A thumb_func_start sub_8181214 sub_8181214: @ 8181214 push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _08181234 + ldr r6, =0x03001240 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -787616,7 +761042,7 @@ sub_8181214: @ 8181214 strh r0, [r1] b _0818134A .align 2, 0 -_08181234: .4byte 0x03001240 + .pool _08181238: adds r0, r4, 0 bl sub_817F70C @@ -787637,7 +761063,7 @@ _08181238: adds r0, r6 ldrh r0, [r0, 0x2] strh r0, [r4, 0x3C] - ldr r0, _081812B4 + ldr r0, =0x0000ffff strh r0, [r4, 0x34] movs r0, 0x1 negs r0, r0 @@ -787680,7 +761106,7 @@ _08181270: strh r0, [r4, 0x34] b _081812D4 .align 2, 0 -_081812B4: .4byte 0x0000ffff + .pool _081812B8: adds r0, r2, 0 adds r0, 0xF @@ -787712,7 +761138,7 @@ _081812DA: movs r3, 0 strh r3, [r4, 0x24] strh r3, [r4, 0x26] - ldr r5, _08181324 + ldr r5, =0x03001240 movs r6, 0x2E ldrsh r0, [r4, r6] lsls r1, r0, 1 @@ -787738,11 +761164,11 @@ _081812DA: strh r1, [r0] b _08181332 .align 2, 0 -_08181324: .4byte 0x03001240 + .pool _08181328: adds r0, r4, 0 bl sub_817F77C - ldr r0, _08181350 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] _08181332: movs r2, 0x80 @@ -787760,7 +761186,7 @@ _0818134A: pop {r0} bx r0 .align 2, 0 -_08181350: .4byte sub_8184D88 + 1 + .pool thumb_func_end sub_8181214 thumb_func_start pokemonanimfunc_2B @@ -787771,13 +761197,13 @@ pokemonanimfunc_2B: @ 8181354 movs r0, 0 strh r0, [r4, 0x3A] strh r0, [r4, 0x3C] - ldr r0, _0818136C + ldr r0, =sub_8181370 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0818136C: .4byte sub_8181370 + 1 + .pool thumb_func_end pokemonanimfunc_2B thumb_func_start sub_8181370 @@ -787825,7 +761251,7 @@ _081813BA: ldrsh r0, [r4, r1] cmp r0, 0 bne _081813DE - ldr r1, _08181410 + ldr r1, =0xffffff00 movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -787851,7 +761277,7 @@ _081813DE: bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, _08181414 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] _08181404: adds r0, r4, 0 @@ -787860,8 +761286,7 @@ _08181404: pop {r0} bx r0 .align 2, 0 -_08181410: .4byte 0xffffff00 -_08181414: .4byte sub_8184D88 + 1 + .pool thumb_func_end sub_8181370 thumb_func_start pokemonanimfunc_2C @@ -787888,7 +761313,7 @@ pokemonanimfunc_2C: @ 8181418 strh r2, [r4, 0x38] strh r2, [r4, 0x36] _08181442: - ldr r1, _0818145C + ldr r1, =0x0860aa64 movs r2, 0x3A ldrsh r0, [r4, r2] lsls r2, r0, 1 @@ -787897,12 +761322,11 @@ _08181442: ldrb r0, [r0] cmp r0, 0xFF bne _08181464 - ldr r0, _08181460 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _081814CE .align 2, 0 -_0818145C: .4byte 0x0860aa64 -_08181460: .4byte sub_8184D88 + 1 + .pool _08181464: movs r3, 0x36 ldrsh r0, [r4, r3] @@ -787913,23 +761337,23 @@ _08181464: cmp r0, 0 beq _08181488 ldrh r0, [r4, 0x3C] - ldr r3, _08181484 + ldr r3, =0x000003ff movs r1, 0x10 movs r2, 0x10 bl pal_fade_1 b _08181494 .align 2, 0 -_08181484: .4byte 0x000003ff + .pool _08181488: ldrh r0, [r4, 0x3C] - ldr r3, _081814C0 + ldr r3, =0x000003ff movs r1, 0x10 movs r2, 0 bl pal_fade_1 _08181494: movs r0, 0 strh r0, [r4, 0x36] - ldr r1, _081814C4 + ldr r1, =0x0860aa64 _0818149A: movs r2, 0x3A ldrsh r0, [r4, r2] @@ -787950,8 +761374,7 @@ _0818149A: strh r0, [r4, 0x3A] b _081814CE .align 2, 0 -_081814C0: .4byte 0x000003ff -_081814C4: .4byte 0x0860aa64 + .pool _081814C8: ldrh r0, [r4, 0x38] adds r0, 0x1 @@ -787975,7 +761398,7 @@ sub_81814D4: @ 81814D4 _081814E6: adds r0, r6, 0 bl sub_817F70C - ldr r4, _08181538 + ldr r4, =0x03001240 movs r3, 0x2E ldrsh r1, [r6, r3] lsls r0, r1, 1 @@ -788012,15 +761435,15 @@ _081814E6: strh r3, [r6, 0x32] b _08181588 .align 2, 0 -_08181538: .4byte 0x03001240 + .pool _0818153C: adds r0, r6, 0 bl sub_817F77C - ldr r0, _08181548 + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _08181588 .align 2, 0 -_08181548: .4byte sub_8184D88 + 1 + .pool _0818154C: movs r1, 0x32 ldrsh r0, [r6, r1] @@ -788038,7 +761461,7 @@ _0818154C: strh r0, [r6, 0x24] movs r5, 0x80 lsls r5, 1 - ldr r1, _0818159C + ldr r1, =0x00000ccc adds r0, r4, 0 bl sine adds r3, r0, 0 @@ -788058,7 +761481,7 @@ _08181588: pop {r0} bx r0 .align 2, 0 -_0818159C: .4byte 0x00000ccc + .pool thumb_func_end sub_81814D4 thumb_func_start pokemonanimfunc_2D @@ -788069,7 +761492,7 @@ pokemonanimfunc_2D: @ 81815A0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _081815CC + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -788078,14 +761501,13 @@ pokemonanimfunc_2D: @ 81815A0 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_81814D4 - ldr r0, _081815D0 + ldr r0, =sub_81814D4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081815CC: .4byte 0x03001240 -_081815D0: .4byte sub_81814D4 + 1 + .pool thumb_func_end pokemonanimfunc_2D thumb_func_start sub_81815D4 @@ -788101,7 +761523,7 @@ sub_81815D4: @ 81815D4 _081815E6: adds r0, r6, 0 bl sub_817F70C - ldr r4, _08181638 + ldr r4, =0x03001240 movs r3, 0x2E ldrsh r1, [r6, r3] lsls r0, r1, 1 @@ -788138,15 +761560,15 @@ _081815E6: strh r3, [r6, 0x32] b _0818168A .align 2, 0 -_08181638: .4byte 0x03001240 + .pool _0818163C: adds r0, r6, 0 bl sub_817F77C - ldr r0, _08181648 + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _0818168A .align 2, 0 -_08181648: .4byte sub_8184D88 + 1 + .pool _0818164C: movs r1, 0x32 ldrsh r0, [r6, r1] @@ -788164,7 +761586,7 @@ _0818164C: strh r0, [r6, 0x24] movs r5, 0x80 lsls r5, 1 - ldr r1, _0818169C + ldr r1, =0x00000ccc adds r0, r4, 0 bl sine adds r3, r0, 0 @@ -788185,7 +761607,7 @@ _0818168A: pop {r0} bx r0 .align 2, 0 -_0818169C: .4byte 0x00000ccc + .pool thumb_func_end sub_81815D4 thumb_func_start pokemonanimfunc_2E @@ -788196,7 +761618,7 @@ pokemonanimfunc_2E: @ 81816A0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _081816CC + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -788205,14 +761627,13 @@ pokemonanimfunc_2E: @ 81816A0 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_81815D4 - ldr r0, _081816D0 + ldr r0, =sub_81815D4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081816CC: .4byte 0x03001240 -_081816D0: .4byte sub_81815D4 + 1 + .pool thumb_func_end pokemonanimfunc_2E thumb_func_start pokemonanimfunc_2F @@ -788233,13 +761654,13 @@ pokemonanimfunc_2F: @ 81816D4 strh r0, [r4, 0x3A] movs r0, 0x80 strh r0, [r4, 0x3C] - ldr r0, _08181704 + ldr r0, =sub_8181708 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08181704: .4byte sub_8181708 + 1 + .pool thumb_func_end pokemonanimfunc_2F thumb_func_start sub_8181708 @@ -788282,7 +761703,7 @@ sub_8181708: @ 8181708 strh r0, [r4, 0x3C] movs r0, 0 strh r0, [r4, 0x34] - ldr r0, _0818176C + ldr r0, =sub_8181770 + 1 str r0, [r4, 0x1C] _08181760: adds r0, r4, 0 @@ -788291,7 +761712,7 @@ _08181760: pop {r0} bx r0 .align 2, 0 -_0818176C: .4byte sub_8181770 + 1 + .pool thumb_func_end sub_8181708 thumb_func_start sub_8181770 @@ -788302,7 +761723,7 @@ sub_8181770: @ 8181770 ldrsh r0, [r1, r2] cmp r0, 0x14 bne _08181784 - ldr r0, _08181790 + ldr r0, =sub_8181794 + 1 str r0, [r1, 0x1C] movs r0, 0 strh r0, [r1, 0x34] @@ -788313,7 +761734,7 @@ _08181784: pop {r0} bx r0 .align 2, 0 -_08181790: .4byte sub_8181794 + 1 + .pool thumb_func_end sub_8181770 thumb_func_start sub_8181794 @@ -788364,7 +761785,7 @@ sub_8181794: @ 8181794 strh r6, [r4, 0x32] adds r0, r4, 0 bl sub_817F77C - ldr r0, _0818180C + ldr r0, =pokemonanimfunc_10 + 1 str r0, [r4, 0x1C] _08181800: adds r0, r4, 0 @@ -788373,14 +761794,14 @@ _08181800: pop {r0} bx r0 .align 2, 0 -_0818180C: .4byte pokemonanimfunc_10 + 1 + .pool thumb_func_end sub_8181794 thumb_func_start sub_8181810 sub_8181810: @ 8181810 push {r4-r6,lr} adds r5, r0, 0 - ldr r4, _08181830 + ldr r4, =0x03001240 movs r0, 0x2E ldrsh r1, [r5, r0] lsls r0, r1, 1 @@ -788395,7 +761816,7 @@ sub_8181810: @ 8181810 strh r0, [r1] b _08181950 .align 2, 0 -_08181830: .4byte 0x03001240 + .pool _08181834: movs r1, 0x32 ldrsh r0, [r5, r1] @@ -788518,10 +761939,10 @@ _08181922: bl sub_817F6D4 adds r0, r5, 0 bl sub_817F77C - ldr r0, _08181958 + ldr r0, =sub_8184D88 + 1 str r0, [r5, 0x1C] _0818193A: - ldr r2, _0818195C + ldr r2, =0x03001240 movs r3, 0x2E ldrsh r1, [r5, r3] lsls r0, r1, 1 @@ -788537,8 +761958,7 @@ _08181950: pop {r0} bx r0 .align 2, 0 -_08181958: .4byte sub_8184D88 + 1 -_0818195C: .4byte 0x03001240 + .pool thumb_func_end sub_8181810 thumb_func_start pokemonanimfunc_30 @@ -788549,7 +761969,7 @@ pokemonanimfunc_30: @ 8181960 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _0818198C + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -788558,14 +761978,13 @@ pokemonanimfunc_30: @ 8181960 strh r0, [r1, 0x6] adds r0, r4, 0 bl sub_8181810 - ldr r0, _08181990 + ldr r0, =sub_8181810 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0818198C: .4byte 0x03001240 -_08181990: .4byte sub_8181810 + 1 + .pool thumb_func_end pokemonanimfunc_30 thumb_func_start pokemonanimfunc_31 @@ -788580,13 +761999,13 @@ pokemonanimfunc_31: @ 8181994 lsls r0, 2 cmp r4, r0 ble _081819B8 - ldr r0, _081819B4 + ldr r0, =sub_8184D88 + 1 str r0, [r5, 0x1C] movs r0, 0 strh r0, [r5, 0x24] b _08181A62 .align 2, 0 -_081819B4: .4byte sub_8184D88 + 1 + .pool _081819B8: movs r1, 0x32 ldrsh r0, [r5, r1] @@ -788710,34 +762129,32 @@ pokemonanimfunc_32: @ 8181A78 lsrs r0, 24 movs r5, 0 strh r0, [r4, 0x2E] - ldr r2, _08181AB0 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 adds r1, r2 - ldr r0, _08181AB4 + ldr r0, =0x0000ffff strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_817F670 strh r5, [r4, 0x34] adds r0, r4, 0 bl sub_8181ABC - ldr r0, _08181AB8 + ldr r0, =sub_8181ABC + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08181AB0: .4byte 0x03001240 -_08181AB4: .4byte 0x0000ffff -_08181AB8: .4byte sub_8181ABC + 1 + .pool thumb_func_end pokemonanimfunc_32 thumb_func_start sub_8181ABC sub_8181ABC: @ 8181ABC push {r4-r6,lr} adds r4, r0, 0 - ldr r6, _08181ADC + ldr r6, =0x03001240 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -788752,7 +762169,7 @@ sub_8181ABC: @ 8181ABC strh r0, [r1] b _08181B44 .align 2, 0 -_08181ADC: .4byte 0x03001240 + .pool _08181AE0: adds r0, r4, 0 bl sub_817F70C @@ -788762,11 +762179,11 @@ _08181AE0: cmp r0, 0x80 ble _08181AFC strh r5, [r4, 0x32] - ldr r0, _08181AF8 + ldr r0, =sub_8181B4C + 1 str r0, [r4, 0x1C] b _08181B3E .align 2, 0 -_08181AF8: .4byte sub_8181B4C + 1 + .pool _08181AFC: movs r1, 0x2E ldrsh r0, [r4, r1] @@ -788829,11 +762246,11 @@ sub_8181B4C: @ 8181B4C movs r0, 0 strh r0, [r4, 0x26] strh r0, [r4, 0x32] - ldr r0, _08181B78 + ldr r0, =sub_8181C2C + 1 str r0, [r4, 0x1C] b _08181C1A .align 2, 0 -_08181B78: .4byte sub_8181C2C + 1 + .pool _08181B7C: movs r2, 0x36 ldrsh r0, [r4, r2] @@ -788854,7 +762271,7 @@ _08181B7C: ldrh r0, [r4, 0x34] adds r0, 0x8 strh r0, [r4, 0x34] - ldr r2, _08181C28 + ldr r2, =0x03001240 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -788920,7 +762337,7 @@ _08181C1A: pop {r0} bx r0 .align 2, 0 -_08181C28: .4byte 0x03001240 + .pool thumb_func_end sub_8181B4C thumb_func_start sub_8181C2C @@ -788932,7 +762349,7 @@ sub_8181C2C: @ 8181C2C ldrsh r3, [r4, r0] cmp r3, 0x80 ble _08181C90 - ldr r3, _08181C74 + ldr r3, =0x03001240 movs r1, 0x2E ldrsh r0, [r4, r1] lsls r1, r0, 1 @@ -788958,24 +762375,23 @@ sub_8181C2C: @ 8181C2C strh r2, [r4, 0x34] strh r2, [r4, 0x32] strh r2, [r4, 0x36] - ldr r0, _08181C78 + ldr r0, =sub_8181ABC + 1 b _08181C84 .align 2, 0 -_08181C74: .4byte 0x03001240 -_08181C78: .4byte sub_8181ABC + 1 + .pool _08181C7C: adds r0, r4, 0 bl sub_817F77C - ldr r0, _08181C8C + ldr r0, =sub_8184D88 + 1 _08181C84: str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] b _08181CD0 .align 2, 0 -_08181C8C: .4byte sub_8184D88 + 1 + .pool _08181C90: - ldr r2, _08181CE4 + ldr r2, =0x03001240 movs r5, 0x2E ldrsh r1, [r4, r5] lsls r0, r1, 1 @@ -789019,7 +762435,7 @@ _08181CD0: pop {r0} bx r0 .align 2, 0 -_08181CE4: .4byte 0x03001240 + .pool thumb_func_end sub_8181C2C thumb_func_start sub_8181CE8 @@ -789051,7 +762467,7 @@ _08181D00: adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - ldr r2, _08181D44 + ldr r2, =0x03001240 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -789069,18 +762485,18 @@ _08181D00: strh r5, [r4, 0x3C] b _08181D52 .align 2, 0 -_08181D44: .4byte 0x03001240 + .pool _08181D48: adds r0, r4, 0 bl sub_817F77C - ldr r0, _08181D5C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] _08181D52: adds r0, r4, 0 bl sub_817F70C b _08181DA6 .align 2, 0 -_08181D5C: .4byte sub_8184D88 + 1 + .pool _08181D60: movs r1, 0x3C ldrsh r0, [r4, r1] @@ -789100,7 +762516,7 @@ _08181D60: adds r0, r4, 0 adds r1, r2, 0 bl sub_817F6D4 - ldr r2, _08181DAC + ldr r2, =0x03001240 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -789118,7 +762534,7 @@ _08181DA6: pop {r0} bx r0 .align 2, 0 -_08181DAC: .4byte 0x03001240 + .pool thumb_func_end sub_8181CE8 thumb_func_start pokemonanimfunc_33 @@ -789129,7 +762545,7 @@ pokemonanimfunc_33: @ 8181DB0 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08181DDC + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -789138,14 +762554,13 @@ pokemonanimfunc_33: @ 8181DB0 strh r0, [r1, 0x6] adds r0, r4, 0 bl sub_8181CE8 - ldr r0, _08181DE0 + ldr r0, =sub_8181CE8 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08181DDC: .4byte 0x03001240 -_08181DE0: .4byte sub_8181CE8 + 1 + .pool thumb_func_end pokemonanimfunc_33 thumb_func_start pokemonanimfunc_34 @@ -789179,13 +762594,13 @@ _08181DFC: bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, _08181E30 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] adds r0, r4, 0 bl sub_817F70C b _08181E8A .align 2, 0 -_08181E30: .4byte sub_8184D88 + 1 + .pool _08181E34: movs r1, 0x3C ldrsh r0, [r4, r1] @@ -789282,14 +762697,14 @@ _08181ED8: negs r1, r1 ands r1, r0 strb r1, [r2] - ldr r0, _08181EF4 + ldr r0, =sub_8184D88 + 1 str r0, [r3, 0x1C] _08181EEE: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08181EF4: .4byte sub_8184D88 + 1 + .pool thumb_func_end pokemonanimfunc_35 thumb_func_start pokemonanimfunc_36 @@ -789299,13 +762714,13 @@ pokemonanimfunc_36: @ 8181EF8 bl sub_817F670 movs r0, 0 strh r0, [r4, 0x3C] - ldr r0, _08181F10 + ldr r0, =sub_8181F14 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08181F10: .4byte sub_8181F14 + 1 + .pool thumb_func_end pokemonanimfunc_36 thumb_func_start sub_8181F14 @@ -789321,11 +762736,11 @@ sub_8181F14: @ 8181F14 movs r1, 0x20 strh r1, [r4, 0x3C] strh r0, [r4, 0x32] - ldr r0, _08181F30 + ldr r0, =sub_8181F50 + 1 str r0, [r4, 0x1C] b _08181F38 .align 2, 0 -_08181F30: .4byte sub_8181F50 + 1 + .pool _08181F34: adds r0, r1, 0x4 strh r0, [r4, 0x3C] @@ -789354,13 +762769,13 @@ sub_8181F50: @ 8181F50 lsls r0, 2 cmp r1, r0 ble _08181F74 - ldr r0, _08181F70 + ldr r0, =sub_8181FC0 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] b _08181FAE .align 2, 0 -_08181F70: .4byte sub_8181FC0 + 1 + .pool _08181F74: movs r1, 0x32 ldrsh r0, [r4, r1] @@ -789368,7 +762783,7 @@ _08181F74: negs r0, r0 cmp r0, 0 bge _08181F84 - ldr r1, _08181FBC + ldr r1, =0x000001ff adds r0, r1 _08181F84: asrs r0, 9 @@ -789399,7 +762814,7 @@ _08181FAE: pop {r0} bx r0 .align 2, 0 -_08181FBC: .4byte 0x000001ff + .pool thumb_func_end sub_8181F50 thumb_func_start sub_8181FC0 @@ -789418,11 +762833,11 @@ sub_8181FC0: @ 8181FC0 strh r1, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C - ldr r0, _08181FE8 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08181FFE .align 2, 0 -_08181FE8: .4byte sub_8184D88 + 1 + .pool _08181FEC: movs r1, 0x3C ldrsh r0, [r4, r1] @@ -789476,11 +762891,11 @@ _08182036: strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817F77C - ldr r0, _0818205C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _081820A6 .align 2, 0 -_0818205C: .4byte sub_8184D88 + 1 + .pool _08182060: adds r0, r1, 0 adds r0, 0x10 @@ -789555,13 +762970,13 @@ pokemonanimfunc_38: @ 81820E0 movs r0, 0 strh r0, [r4, 0x3C] strh r0, [r4, 0x36] - ldr r0, _081820F8 + ldr r0, =sub_81820FC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081820F8: .4byte sub_81820FC + 1 + .pool thumb_func_end pokemonanimfunc_38 thumb_func_start sub_81820FC @@ -789583,11 +762998,11 @@ sub_81820FC: @ 81820FC ble _0818214A movs r0, 0 strh r0, [r4, 0x36] - ldr r0, _08182128 + ldr r0, =sub_818216C + 1 str r0, [r4, 0x1C] b _0818214A .align 2, 0 -_08182128: .4byte sub_818216C + 1 + .pool _0818212C: adds r0, r1, 0x2 strh r0, [r4, 0x3C] @@ -789631,11 +763046,11 @@ sub_818216C: @ 818216C ble _0818218C movs r0, 0x1 strh r0, [r4, 0x3A] - ldr r0, _08182188 + ldr r0, =sub_81821CC + 1 str r0, [r4, 0x1C] b _081821AA .align 2, 0 -_08182188: .4byte sub_81821CC + 1 + .pool _0818218C: adds r0, r1, 0x2 strh r0, [r4, 0x3C] @@ -789684,7 +763099,7 @@ sub_81821CC: @ 81821CC ble _081821F0 movs r0, 0x20 strh r0, [r4, 0x3C] - ldr r0, _08182244 + ldr r0, =sub_8182248 + 1 str r0, [r4, 0x1C] _081821F0: movs r1, 0x3C @@ -789727,7 +763142,7 @@ _08182224: pop {r0} bx r0 .align 2, 0 -_08182244: .4byte sub_8182248 + 1 + .pool thumb_func_end sub_81821CC thumb_func_start sub_8182248 @@ -789744,11 +763159,11 @@ sub_8182248: @ 8182248 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817F77C - ldr r0, _0818226C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _0818228E .align 2, 0 -_0818226C: .4byte sub_8184D88 + 1 + .pool _08182270: subs r0, r1, 0x2 strh r0, [r4, 0x3C] @@ -789790,13 +763205,13 @@ pokemonanimfunc_39: @ 81822B0 ldrsh r0, [r4, r2] cmp r0, 0x28 ble _081822D0 - ldr r0, _081822CC + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] b _0818235C .align 2, 0 -_081822CC: .4byte sub_8184D88 + 1 + .pool _081822D0: movs r0, 0x1 ands r0, r1 @@ -789956,7 +763371,7 @@ _081823E4: bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, _08182420 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] _08182410: movs r2, 0x3C @@ -789967,7 +763382,7 @@ _08182410: lsrs r3, r0, 16 b _08182474 .align 2, 0 -_08182420: .4byte sub_8184D88 + 1 + .pool _08182424: movs r1, 0x3C ldrsh r0, [r4, r1] @@ -790066,11 +763481,11 @@ _081824BA: bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, _081824E4 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08182540 .align 2, 0 -_081824E4: .4byte sub_8184D88 + 1 + .pool _081824E8: movs r0, 0x3C ldrsh r1, [r4, r0] @@ -790151,11 +763566,11 @@ _08182562: bl sub_817F6D4 adds r0, r4, 0 bl sub_817F77C - ldr r0, _0818258C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _081825D4 .align 2, 0 -_0818258C: .4byte sub_8184D88 + 1 + .pool _08182590: movs r1, 0x3C ldrsh r0, [r4, r1] @@ -790200,7 +763615,7 @@ pokemonanimfunc_3D: @ 81825DC push {r4,lr} adds r4, r0, 0 bl sub_817F670 - ldr r0, _081825F4 + ldr r0, =sub_81825F8 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3C] @@ -790208,7 +763623,7 @@ pokemonanimfunc_3D: @ 81825DC pop {r0} bx r0 .align 2, 0 -_081825F4: .4byte sub_81825F8 + 1 + .pool thumb_func_end pokemonanimfunc_3D thumb_func_start sub_81825F8 @@ -790225,12 +763640,12 @@ sub_81825F8: @ 81825F8 ble _0818261C strh r1, [r4, 0x3C] strh r1, [r4, 0x3A] - ldr r0, _08182618 + ldr r0, =sub_8182648 + 1 str r0, [r4, 0x1C] movs r0, 0x40 b _08182620 .align 2, 0 -_08182618: .4byte sub_8182648 + 1 + .pool _0818261C: movs r1, 0x3C ldrsh r0, [r4, r1] @@ -790292,14 +763707,14 @@ _08182672: ldrsh r0, [r4, r2] cmp r0, 0x3F ble _081826A4 - ldr r5, _081826A0 + ldr r5, =0x0000ffff adds r0, r1, 0 subs r0, 0x40 lsls r0, 16 lsrs r0, 16 b _081826A8 .align 2, 0 -_081826A0: .4byte 0x0000ffff + .pool _081826A4: movs r5, 0x1 movs r0, 0 @@ -790336,14 +763751,14 @@ _081826C8: bne _081826EE movs r0, 0 strh r0, [r4, 0x3C] - ldr r0, _081826F4 + ldr r0, =sub_81826F8 + 1 str r0, [r4, 0x1C] _081826EE: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081826F4: .4byte sub_81826F8 + 1 + .pool thumb_func_end sub_8182648 thumb_func_start sub_81826F8 @@ -790371,7 +763786,7 @@ sub_81826F8: @ 81826F8 ble _08182742 adds r0, r4, 0 bl sub_817F77C - ldr r0, _08182760 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x26] @@ -790396,7 +763811,7 @@ _08182742: pop {r0} bx r0 .align 2, 0 -_08182760: .4byte sub_8184D88 + 1 + .pool thumb_func_end sub_81826F8 thumb_func_start sub_8182764 @@ -790413,7 +763828,7 @@ sub_8182764: @ 8182764 strh r0, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C - ldr r0, _08182794 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r2, 0x80 lsls r2, 1 @@ -790423,7 +763838,7 @@ sub_8182764: @ 8182764 bl sub_817F6D4 b _081827F4 .align 2, 0 -_08182794: .4byte sub_8184D88 + 1 + .pool _08182798: movs r0, 0x3C ldrsh r1, [r4, r0] @@ -790518,7 +763933,7 @@ sub_8182830: @ 8182830 strh r0, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C - ldr r0, _08182860 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r2, 0x80 lsls r2, 1 @@ -790528,7 +763943,7 @@ sub_8182830: @ 8182830 bl sub_817F6D4 b _081828C0 .align 2, 0 -_08182860: .4byte sub_8184D88 + 1 + .pool _08182864: movs r0, 0x3C ldrsh r1, [r4, r0] @@ -790641,11 +764056,11 @@ _0818291A: adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - ldr r0, _08182944 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _0818299E .align 2, 0 -_08182944: .4byte sub_8184D88 + 1 + .pool _08182948: movs r0, 0x3C ldrsh r1, [r4, r0] @@ -790729,11 +764144,11 @@ _081829CA: adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - ldr r0, _081829F4 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08182A5E .align 2, 0 -_081829F4: .4byte sub_8184D88 + 1 + .pool _081829F8: movs r1, 0x3C ldrsh r0, [r4, r1] @@ -790825,11 +764240,11 @@ _08182A8A: adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - ldr r0, _08182AB4 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08182B16 .align 2, 0 -_08182AB4: .4byte sub_8184D88 + 1 + .pool _08182AB8: movs r0, 0x3C ldrsh r1, [r4, r0] @@ -790896,20 +764311,20 @@ pokemonanimfunc_43: @ 8182B24 lsls r0, 4 cmp r1, r0 ble _08182B48 - ldr r0, _08182B44 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] b _08182C08 .align 2, 0 -_08182B44: .4byte sub_8184D88 + 1 + .pool _08182B48: movs r1, 0x32 ldrsh r2, [r4, r1] adds r0, r2, 0 cmp r2, 0 bge _08182B56 - ldr r1, _08182B7C + ldr r1, =0x000001ff adds r0, r2, r1 _08182B56: asrs r3, r0, 9 @@ -790932,7 +764347,7 @@ _08182B62: beq _08182B8A b _08182BE2 .align 2, 0 -_08182B7C: .4byte 0x000001ff + .pool _08182B80: cmp r0, 0x2 beq _08182BB8 @@ -790947,13 +764362,13 @@ _08182B8A: negs r0, r0 cmp r0, 0 bge _08182B9C - ldr r1, _08182BA0 + ldr r1, =0x000001ff adds r0, r1 _08182B9C: asrs r0, 9 b _08182BE0 .align 2, 0 -_08182BA0: .4byte 0x000001ff + .pool _08182BA4: lsls r0, r3, 9 subs r0, r2, r0 @@ -790985,7 +764400,7 @@ _08182BCA: negs r0, r0 cmp r0, 0 bge _08182BDC - ldr r1, _08182C14 + ldr r1, =0x000001ff adds r0, r1 _08182BDC: asrs r0, 9 @@ -791019,7 +764434,7 @@ _08182C08: pop {r0} bx r0 .align 2, 0 -_08182C14: .4byte 0x000001ff + .pool thumb_func_end pokemonanimfunc_43 thumb_func_start pokemonanimfunc_44 @@ -791068,12 +764483,12 @@ _08182C60: cmp r0, 0x4 bhi _08182D08 lsls r0, 2 - ldr r1, _08182C74 + ldr r1, =_08182C78 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08182C74: .4byte _08182C78 + .pool .align 2, 0 _08182C78: .4byte _08182CEC @@ -791143,7 +764558,7 @@ _08182D08: movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] - ldr r0, _08182D20 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] _08182D12: adds r0, r4, 0 @@ -791152,7 +764567,7 @@ _08182D12: pop {r0} bx r0 .align 2, 0 -_08182D20: .4byte sub_8184D88 + 1 + .pool thumb_func_end pokemonanimfunc_44 thumb_func_start pokemonanimfunc_45 @@ -791163,13 +764578,13 @@ pokemonanimfunc_45: @ 8182D24 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_8180714 - ldr r0, _08182D3C + ldr r0, =sub_8180714 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182D3C: .4byte sub_8180714 + 1 + .pool thumb_func_end pokemonanimfunc_45 thumb_func_start pokemonanimfunc_46 @@ -791180,13 +764595,13 @@ pokemonanimfunc_46: @ 8182D40 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F8FC - ldr r0, _08182D58 + ldr r0, =sub_817F8FC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182D58: .4byte sub_817F8FC + 1 + .pool thumb_func_end pokemonanimfunc_46 thumb_func_start pokemonanimfunc_47 @@ -791197,13 +764612,13 @@ pokemonanimfunc_47: @ 8182D5C strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F978 - ldr r0, _08182D74 + ldr r0, =sub_817F978 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182D74: .4byte sub_817F978 + 1 + .pool thumb_func_end pokemonanimfunc_47 thumb_func_start pokemonanimfunc_48 @@ -791214,7 +764629,7 @@ pokemonanimfunc_48: @ 8182D78 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08182DAC + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791226,14 +764641,13 @@ pokemonanimfunc_48: @ 8182D78 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_8180900 - ldr r0, _08182DB0 + ldr r0, =sub_8180900 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182DAC: .4byte 0x03001240 -_08182DB0: .4byte sub_8180900 + 1 + .pool thumb_func_end pokemonanimfunc_48 thumb_func_start pokemonanimfunc_49 @@ -791294,13 +764708,13 @@ pokemonanimfunc_4C: @ 8182E00 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817FCDC - ldr r0, _08182E1C + ldr r0, =sub_817FCDC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182E1C: .4byte sub_817FCDC + 1 + .pool thumb_func_end pokemonanimfunc_4C thumb_func_start pokemonanimfunc_4D @@ -791311,13 +764725,13 @@ pokemonanimfunc_4D: @ 8182E20 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817FD44 - ldr r0, _08182E38 + ldr r0, =sub_817FD44 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182E38: .4byte sub_817FD44 + 1 + .pool thumb_func_end pokemonanimfunc_4D thumb_func_start pokemonanimfunc_4E @@ -791329,7 +764743,7 @@ pokemonanimfunc_4E: @ 8182E3C lsrs r0, 24 movs r3, 0 strh r0, [r4, 0x2E] - ldr r2, _08182E74 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791342,14 +764756,13 @@ pokemonanimfunc_4E: @ 8182E3C strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_817FE30 - ldr r0, _08182E78 + ldr r0, =sub_817FE30 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182E74: .4byte 0x03001240 -_08182E78: .4byte sub_817FE30 + 1 + .pool thumb_func_end pokemonanimfunc_4E thumb_func_start pokemonanimfunc_4F @@ -791360,7 +764773,7 @@ pokemonanimfunc_4F: @ 8182E7C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08182EB4 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791374,14 +764787,13 @@ pokemonanimfunc_4F: @ 8182E7C strh r0, [r1, 0x2] adds r0, r4, 0 bl sub_817FFF0 - ldr r0, _08182EB8 + ldr r0, =sub_817FFF0 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182EB4: .4byte 0x03001240 -_08182EB8: .4byte sub_817FFF0 + 1 + .pool thumb_func_end pokemonanimfunc_4F thumb_func_start pokemonanimfunc_50 @@ -791392,13 +764804,13 @@ pokemonanimfunc_50: @ 8182EBC strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_818031C - ldr r0, _08182ED4 + ldr r0, =sub_818031C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182ED4: .4byte sub_818031C + 1 + .pool thumb_func_end pokemonanimfunc_50 thumb_func_start pokemonanimfunc_51 @@ -791409,13 +764821,13 @@ pokemonanimfunc_51: @ 8182ED8 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_81804F8 - ldr r0, _08182EF0 + ldr r0, =sub_81804F8 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182EF0: .4byte sub_81804F8 + 1 + .pool thumb_func_end pokemonanimfunc_51 thumb_func_start pokemonanimfunc_52 @@ -791426,13 +764838,13 @@ pokemonanimfunc_52: @ 8182EF4 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F9F4 - ldr r0, _08182F0C + ldr r0, =sub_817F9F4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182F0C: .4byte sub_817F9F4 + 1 + .pool thumb_func_end pokemonanimfunc_52 thumb_func_start pokemonanimfunc_53 @@ -791443,7 +764855,7 @@ pokemonanimfunc_53: @ 8182F10 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08182F40 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791454,14 +764866,13 @@ pokemonanimfunc_53: @ 8182F10 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_817FF3C - ldr r0, _08182F44 + ldr r0, =sub_817FF3C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182F40: .4byte 0x03001240 -_08182F44: .4byte sub_817FF3C + 1 + .pool thumb_func_end pokemonanimfunc_53 thumb_func_start pokemonanimfunc_54 @@ -791472,7 +764883,7 @@ pokemonanimfunc_54: @ 8182F48 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08182F78 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791483,14 +764894,13 @@ pokemonanimfunc_54: @ 8182F48 strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_8181214 - ldr r0, _08182F7C + ldr r0, =sub_8181214 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182F78: .4byte 0x03001240 -_08182F7C: .4byte sub_8181214 + 1 + .pool thumb_func_end pokemonanimfunc_54 thumb_func_start pokemonanimfunc_55 @@ -791501,7 +764911,7 @@ pokemonanimfunc_55: @ 8182F80 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08182FB0 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791512,14 +764922,13 @@ pokemonanimfunc_55: @ 8182F80 strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_8181810 - ldr r0, _08182FB4 + ldr r0, =sub_8181810 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08182FB0: .4byte 0x03001240 -_08182FB4: .4byte sub_8181810 + 1 + .pool thumb_func_end pokemonanimfunc_55 thumb_func_start pokemonanimfunc_56 @@ -791531,7 +764940,7 @@ pokemonanimfunc_56: @ 8182FB8 lsrs r0, 24 movs r5, 0 strh r0, [r4, 0x2E] - ldr r2, _08182FF4 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791545,14 +764954,13 @@ pokemonanimfunc_56: @ 8182FB8 strh r5, [r4, 0x34] adds r0, r4, 0 bl sub_8181ABC - ldr r0, _08182FF8 + ldr r0, =sub_8181ABC + 1 str r0, [r4, 0x1C] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08182FF4: .4byte 0x03001240 -_08182FF8: .4byte sub_8181ABC + 1 + .pool thumb_func_end pokemonanimfunc_56 thumb_func_start pokemonanimfunc_07 @@ -791563,7 +764971,7 @@ pokemonanimfunc_07: @ 8182FFC lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08183028 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791572,14 +764980,13 @@ pokemonanimfunc_07: @ 8182FFC strh r0, [r1, 0x6] adds r0, r4, 0 bl sub_8181CE8 - ldr r0, _0818302C + ldr r0, =sub_8181CE8 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183028: .4byte 0x03001240 -_0818302C: .4byte sub_8181CE8 + 1 + .pool thumb_func_end pokemonanimfunc_07 thumb_func_start pokemonanimfunc_08 @@ -791590,7 +764997,7 @@ pokemonanimfunc_08: @ 8183030 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08183060 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791601,14 +765008,13 @@ pokemonanimfunc_08: @ 8183030 strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_8181CE8 - ldr r0, _08183064 + ldr r0, =sub_8181CE8 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183060: .4byte 0x03001240 -_08183064: .4byte sub_8181CE8 + 1 + .pool thumb_func_end pokemonanimfunc_08 thumb_func_start pokemonanimfunc_0B @@ -791619,7 +765025,7 @@ pokemonanimfunc_0B: @ 8183068 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08183094 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791628,14 +765034,13 @@ pokemonanimfunc_0B: @ 8183068 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_81814D4 - ldr r0, _08183098 + ldr r0, =sub_81814D4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183094: .4byte 0x03001240 -_08183098: .4byte sub_81814D4 + 1 + .pool thumb_func_end pokemonanimfunc_0B thumb_func_start pokemonanimfunc_0C @@ -791646,7 +765051,7 @@ pokemonanimfunc_0C: @ 818309C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _081830CC + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791657,14 +765062,13 @@ pokemonanimfunc_0C: @ 818309C strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_81814D4 - ldr r0, _081830D0 + ldr r0, =sub_81814D4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081830CC: .4byte 0x03001240 -_081830D0: .4byte sub_81814D4 + 1 + .pool thumb_func_end pokemonanimfunc_0C thumb_func_start pokemonanimfunc_0D @@ -791675,7 +765079,7 @@ pokemonanimfunc_0D: @ 81830D4 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08183100 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791684,14 +765088,13 @@ pokemonanimfunc_0D: @ 81830D4 strh r0, [r1, 0x8] adds r0, r4, 0 bl sub_81815D4 - ldr r0, _08183104 + ldr r0, =sub_81815D4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183100: .4byte 0x03001240 -_08183104: .4byte sub_81815D4 + 1 + .pool thumb_func_end pokemonanimfunc_0D thumb_func_start pokemonanimfunc_0E @@ -791702,7 +765105,7 @@ pokemonanimfunc_0E: @ 8183108 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _08183138 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -791713,14 +765116,13 @@ pokemonanimfunc_0E: @ 8183108 strh r0, [r1, 0x4] adds r0, r4, 0 bl sub_81815D4 - ldr r0, _0818313C + ldr r0, =sub_81815D4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183138: .4byte 0x03001240 -_0818313C: .4byte sub_81815D4 + 1 + .pool thumb_func_end pokemonanimfunc_0E thumb_func_start sub_8183140 @@ -791733,19 +765135,19 @@ sub_8183140: @ 8183140 lsls r0, 4 cmp r2, r0 ble _0818315C - ldr r0, _08183158 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 b _08183180 .align 2, 0 -_08183158: .4byte sub_8184D88 + 1 + .pool _0818315C: adds r1, r2, 0 adds r1, 0xC0 adds r0, r1, 0 cmp r1, 0 bge _0818316A - ldr r3, _08183190 + ldr r3, =0x000001bf adds r0, r2, r3 _0818316A: asrs r0, 8 @@ -791768,7 +765170,7 @@ _08183180: pop {r0} bx r0 .align 2, 0 -_08183190: .4byte 0x000001bf + .pool thumb_func_end sub_8183140 thumb_func_start pokemonanimfunc_57 @@ -791781,13 +765183,13 @@ pokemonanimfunc_57: @ 8183194 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183140 - ldr r0, _081831B0 + ldr r0, =sub_8183140 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081831B0: .4byte sub_8183140 + 1 + .pool thumb_func_end pokemonanimfunc_57 thumb_func_start pokemonanimfunc_58 @@ -791800,13 +765202,13 @@ pokemonanimfunc_58: @ 81831B4 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183140 - ldr r0, _081831D0 + ldr r0, =sub_8183140 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081831D0: .4byte sub_8183140 + 1 + .pool thumb_func_end pokemonanimfunc_58 thumb_func_start pokemonanimfunc_59 @@ -791820,20 +765222,20 @@ pokemonanimfunc_59: @ 81831D4 lsls r0, 4 cmp r1, r0 ble _081831F8 - ldr r0, _081831F4 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] b _081832BC .align 2, 0 -_081831F4: .4byte sub_8184D88 + 1 + .pool _081831F8: movs r1, 0x32 ldrsh r2, [r4, r1] adds r0, r2, 0 cmp r2, 0 bge _08183206 - ldr r1, _0818322C + ldr r1, =0x000001ff adds r0, r2, r1 _08183206: asrs r3, r0, 9 @@ -791856,7 +765258,7 @@ _08183212: beq _0818323A b _08183298 .align 2, 0 -_0818322C: .4byte 0x000001ff + .pool _08183230: cmp r0, 0x2 beq _0818324C @@ -791882,13 +765284,13 @@ _0818324C: negs r0, r0 cmp r0, 0 bge _0818325E - ldr r1, _08183264 + ldr r1, =0x000001ff adds r0, r1 _0818325E: asrs r0, 9 b _08183296 .align 2, 0 -_08183264: .4byte 0x000001ff + .pool _08183268: lsls r0, r3, 9 subs r0, r2, r0 @@ -791897,14 +765299,14 @@ _08183268: negs r0, r0 cmp r0, 0 bge _0818327A - ldr r1, _08183280 + ldr r1, =0x000001ff adds r0, r1 _0818327A: asrs r0, 9 adds r0, 0x10 b _08183296 .align 2, 0 -_08183280: .4byte 0x000001ff + .pool _08183284: lsls r0, r3, 9 subs r0, r2, r0 @@ -791976,11 +765378,11 @@ sub_81832C8: @ 81832C8 bgt _08183310 adds r0, r6, 0 bl sub_817F77C - ldr r0, _0818330C + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _081833DC .align 2, 0 -_0818330C: .4byte sub_8184D88 + 1 + .pool _08183310: subs r0, r1, 0x1 strh r0, [r6, 0x36] @@ -792028,7 +765430,7 @@ _08183358: asrs r0, r4, 16 movs r1, 0x10 bl sine - ldr r2, _08183378 + ldr r2, =0xffffff00 adds r1, r2, 0 subs r1, r0 lsls r1, 16 @@ -792036,7 +765438,7 @@ _08183358: mov r9, r1 b _08183392 .align 2, 0 -_08183378: .4byte 0xffffff00 + .pool _0818337C: lsls r4, r2, 16 asrs r0, r4, 16 @@ -792147,11 +765549,11 @@ sub_8183418: @ 8183418 bgt _08183460 adds r0, r6, 0 bl sub_817F77C - ldr r0, _0818345C + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _08183538 .align 2, 0 -_0818345C: .4byte sub_8184D88 + 1 + .pool _08183460: subs r0, r1, 0x1 strh r0, [r6, 0x36] @@ -792215,14 +765617,14 @@ _081834AC: lsrs r1, 23 adds r0, r5, 0 bl sine - ldr r1, _081834EC + ldr r1, =0xffffff00 adds r0, r1 adds r4, r0 lsls r4, 16 lsrs r1, r4, 16 b _08183522 .align 2, 0 -_081834EC: .4byte 0xffffff00 + .pool _081834F0: mov r4, r8 adds r0, r7, 0 @@ -792307,7 +765709,7 @@ sub_8183574: @ 8183574 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r3, _081835D0 + ldr r3, =0x0860aa80 movs r1, 0x38 ldrsh r0, [r4, r1] lsls r1, r0, 1 @@ -792336,14 +765738,13 @@ _081835A6: _081835C2: cmp r5, 0xFF bne _081835D8 - ldr r0, _081835D4 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x26] b _0818360A .align 2, 0 -_081835D0: .4byte 0x0860aa80 -_081835D4: .4byte sub_8184D88 + 1 + .pool _081835D8: mov r1, r8 adds r1, 0xC0 @@ -792390,13 +765791,13 @@ pokemonanimfunc_5C: @ 8183618 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183574 - ldr r0, _08183634 + ldr r0, =sub_8183574 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183634: .4byte sub_8183574 + 1 + .pool thumb_func_end pokemonanimfunc_5C thumb_func_start pokemonanimfunc_5D @@ -792409,13 +765810,13 @@ pokemonanimfunc_5D: @ 8183638 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817FCDC - ldr r0, _08183654 + ldr r0, =sub_817FCDC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183654: .4byte sub_817FCDC + 1 + .pool thumb_func_end pokemonanimfunc_5D thumb_func_start pokemonanimfunc_5E @@ -792426,13 +765827,13 @@ pokemonanimfunc_5E: @ 8183658 strh r0, [r4, 0x2E] adds r0, r4, 0 bl sub_817F8FC - ldr r0, _08183670 + ldr r0, =sub_817F8FC + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183670: .4byte sub_817F8FC + 1 + .pool thumb_func_end pokemonanimfunc_5E thumb_func_start pokemonanimfunc_5F @@ -792444,12 +765845,12 @@ pokemonanimfunc_5F: @ 8183674 ldrsh r0, [r4, r2] cmp r0, 0x28 ble _08183690 - ldr r0, _0818368C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 b _081836CA .align 2, 0 -_0818368C: .4byte sub_8184D88 + 1 + .pool _08183690: movs r0, 0x1 ands r0, r1 @@ -792499,12 +765900,12 @@ pokemonanimfunc_60: @ 81836D8 ldrsh r0, [r4, r2] cmp r0, 0x28 ble _081836F4 - ldr r0, _081836F0 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 b _0818372E .align 2, 0 -_081836F0: .4byte sub_8184D88 + 1 + .pool _081836F4: movs r0, 0x1 ands r0, r1 @@ -792555,13 +765956,13 @@ pokemonanimfunc_61: @ 818373C strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183140 - ldr r0, _08183758 + ldr r0, =sub_8183140 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183758: .4byte sub_8183140 + 1 + .pool thumb_func_end pokemonanimfunc_61 thumb_func_start pokemonanimfunc_62 @@ -792574,13 +765975,13 @@ pokemonanimfunc_62: @ 818375C strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183574 - ldr r0, _08183778 + ldr r0, =sub_8183574 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183778: .4byte sub_8183574 + 1 + .pool thumb_func_end pokemonanimfunc_62 thumb_func_start pokemonanimfunc_63 @@ -792593,13 +765994,13 @@ pokemonanimfunc_63: @ 818377C strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_8183574 - ldr r0, _08183798 + ldr r0, =sub_8183574 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183798: .4byte sub_8183574 + 1 + .pool thumb_func_end pokemonanimfunc_63 thumb_func_start pokemonanimfunc_64 @@ -792610,7 +766011,7 @@ pokemonanimfunc_64: @ 818379C lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _081837D4 + ldr r2, =0x03001240 lsls r1, r0, 1 adds r1, r0 lsls r1, 2 @@ -792624,14 +766025,13 @@ pokemonanimfunc_64: @ 818379C strh r0, [r1, 0x2] adds r0, r4, 0 bl sub_817FFF0 - ldr r0, _081837D8 + ldr r0, =sub_817FFF0 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081837D4: .4byte 0x03001240 -_081837D8: .4byte sub_817FFF0 + 1 + .pool thumb_func_end pokemonanimfunc_64 thumb_func_start sub_81837DC @@ -792664,11 +766064,11 @@ sub_81837DC: @ 81837DC bgt _08183824 adds r0, r7, 0 bl sub_817F77C - ldr r0, _08183820 + ldr r0, =sub_8184D88 + 1 str r0, [r7, 0x1C] b _0818392C .align 2, 0 -_08183820: .4byte sub_8184D88 + 1 + .pool _08183824: subs r0, r1, 0x1 strh r0, [r7, 0x36] @@ -792729,7 +766129,7 @@ _08183866: lsrs r1, 23 adds r0, r5, 0 bl sine - ldr r2, _081838AC + ldr r2, =0xffffff00 adds r4, r2 adds r0, r4 lsls r0, 16 @@ -792738,7 +766138,7 @@ _08183866: mov r0, r8 b _081838EA .align 2, 0 -_081838AC: .4byte 0xffffff00 + .pool _081838B0: lsls r2, 16 mov r8, r2 @@ -792843,20 +766243,20 @@ pokemonanimfunc_66: @ 818396C lsls r0, 4 cmp r1, r0 ble _08183990 - ldr r0, _0818398C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] b _08183A54 .align 2, 0 -_0818398C: .4byte sub_8184D88 + 1 + .pool _08183990: movs r1, 0x32 ldrsh r2, [r4, r1] adds r0, r2, 0 cmp r2, 0 bge _0818399E - ldr r1, _081839C4 + ldr r1, =0x000001ff adds r0, r2, r1 _0818399E: asrs r3, r0, 9 @@ -792879,7 +766279,7 @@ _081839AA: beq _081839D2 b _08183A30 .align 2, 0 -_081839C4: .4byte 0x000001ff + .pool _081839C8: cmp r0, 0x2 beq _081839E4 @@ -792905,13 +766305,13 @@ _081839E4: negs r0, r0 cmp r0, 0 bge _081839F6 - ldr r1, _081839FC + ldr r1, =0x000001ff adds r0, r1 _081839F6: asrs r0, 9 b _08183A2E .align 2, 0 -_081839FC: .4byte 0x000001ff + .pool _08183A00: lsls r0, r3, 9 subs r0, r2, r0 @@ -792920,14 +766320,14 @@ _08183A00: negs r0, r0 cmp r0, 0 bge _08183A12 - ldr r1, _08183A18 + ldr r1, =0x000001ff adds r0, r1 _08183A12: asrs r0, 9 adds r0, 0x10 b _08183A2E .align 2, 0 -_08183A18: .4byte 0x000001ff + .pool _08183A1C: lsls r0, r3, 9 subs r0, r2, r0 @@ -792979,20 +766379,20 @@ pokemonanimfunc_67: @ 8183A60 lsls r0, 4 cmp r1, r0 ble _08183A84 - ldr r0, _08183A80 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] b _08183B40 .align 2, 0 -_08183A80: .4byte sub_8184D88 + 1 + .pool _08183A84: movs r1, 0x32 ldrsh r2, [r4, r1] adds r0, r2, 0 cmp r2, 0 bge _08183A92 - ldr r1, _08183AB8 + ldr r1, =0x000001ff adds r0, r2, r1 _08183A92: asrs r3, r0, 9 @@ -793015,7 +766415,7 @@ _08183A9E: beq _08183AC6 b _08183B24 .align 2, 0 -_08183AB8: .4byte 0x000001ff + .pool _08183ABC: cmp r0, 0x2 beq _08183AD8 @@ -793041,13 +766441,13 @@ _08183AD8: negs r0, r0 cmp r0, 0 bge _08183AEA - ldr r1, _08183AF0 + ldr r1, =0x000001ff adds r0, r1 _08183AEA: asrs r0, 9 b _08183B22 .align 2, 0 -_08183AF0: .4byte 0x000001ff + .pool _08183AF4: lsls r0, r3, 9 subs r0, r2, r0 @@ -793056,14 +766456,14 @@ _08183AF4: negs r0, r0 cmp r0, 0 bge _08183B06 - ldr r1, _08183B0C + ldr r1, =0x000001ff adds r0, r1 _08183B06: asrs r0, 9 adds r0, 0x10 b _08183B22 .align 2, 0 -_08183B0C: .4byte 0x000001ff + .pool _08183B10: lsls r0, r3, 9 subs r0, r2, r0 @@ -793109,7 +766509,7 @@ sub_8183B4C: @ 8183B4C bne _08183B5E strh r0, [r4, 0x34] _08183B5E: - ldr r7, _08183BC0 + ldr r7, =0x0860adbe movs r2, 0x34 ldrsh r1, [r4, r2] lsls r0, r1, 1 @@ -793153,12 +766553,11 @@ _08183B8C: lsls r0, 16 cmp r0, 0 bne _08183BC8 - ldr r0, _08183BC4 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08183C06 .align 2, 0 -_08183BC0: .4byte 0x0860adbe -_08183BC4: .4byte sub_8184D88 + 1 + .pool _08183BC8: strh r1, [r4, 0x32] b _08183C06 @@ -793206,13 +766605,13 @@ pokemonanimfunc_68: @ 8183C0C strh r0, [r4, 0x3A] adds r0, r4, 0 bl sub_8183B4C - ldr r0, _08183C28 + ldr r0, =sub_8183B4C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183C28: .4byte sub_8183B4C + 1 + .pool thumb_func_end pokemonanimfunc_68 thumb_func_start pokemonanimfunc_69 @@ -793225,13 +766624,13 @@ pokemonanimfunc_69: @ 8183C2C strh r0, [r4, 0x3A] adds r0, r4, 0 bl sub_8183B4C - ldr r0, _08183C48 + ldr r0, =sub_8183B4C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183C48: .4byte sub_8183B4C + 1 + .pool thumb_func_end pokemonanimfunc_69 thumb_func_start pokemonanimfunc_6A @@ -793243,13 +766642,13 @@ pokemonanimfunc_6A: @ 8183C4C strh r0, [r4, 0x3A] adds r0, r4, 0 bl sub_8183B4C - ldr r0, _08183C68 + ldr r0, =sub_8183B4C + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08183C68: .4byte sub_8183B4C + 1 + .pool thumb_func_end pokemonanimfunc_6A thumb_func_start sub_8183C6C @@ -793268,7 +766667,7 @@ sub_8183C6C: @ 8183C6C bgt _08183CA4 adds r0, r4, 0 bl sub_817F77C - ldr r0, _08183CA0 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r2, 0x80 lsls r2, 1 @@ -793278,7 +766677,7 @@ sub_8183C6C: @ 8183C6C bl sub_817F6D4 b _08183CE8 .align 2, 0 -_08183CA0: .4byte sub_8184D88 + 1 + .pool _08183CA4: subs r0, r1, 0x1 movs r1, 0 @@ -793712,14 +767111,14 @@ sub_8183FA8: @ 8183FA8 ldrsh r0, [r4, r3] cmp r0, 0x1 bgt _08183FD0 - ldr r0, _08183FCC + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] b _0818403E .align 2, 0 -_08183FCC: .4byte sub_8184D88 + 1 + .pool _08183FD0: movs r0, 0x3C ldrsh r1, [r4, r0] @@ -793750,7 +767149,7 @@ _08183FEA: adds r0, r1, 0 cmp r1, 0 bge _0818400C - ldr r3, _08184044 + ldr r3, =0x000001bf adds r0, r2, r3 _0818400C: asrs r0, 8 @@ -793783,7 +767182,7 @@ _0818403E: pop {r0} bx r0 .align 2, 0 -_08184044: .4byte 0x000001bf + .pool thumb_func_end sub_8183FA8 thumb_func_start pokemonanimfunc_79 @@ -793876,11 +767275,11 @@ sub_81840C4: @ 81840C4 ldrsh r0, [r5, r3] cmp r1, r0 bgt _081840EC - ldr r0, _081840E8 + ldr r0, =sub_8184D88 + 1 str r0, [r5, 0x1C] b _081840F4 .align 2, 0 -_081840E8: .4byte sub_8184D88 + 1 + .pool _081840EC: adds r0, r2, 0x1 movs r1, 0 @@ -794170,7 +767569,7 @@ pokemonanimfunc_82: @ 81842DC strh r0, [r4, 0x3C] movs r0, 0x8 strh r0, [r4, 0x38] - ldr r0, _08184340 + ldr r0, =0x0000ffe0 strh r0, [r4, 0x36] movs r0, 0x1 strh r0, [r4, 0x34] @@ -794202,12 +767601,11 @@ _08184300: bgt _08184348 adds r0, r4, 0 bl sub_817F77C - ldr r0, _08184344 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08184358 .align 2, 0 -_08184340: .4byte 0x0000ffe0 -_08184344: .4byte sub_8184D88 + 1 + .pool _08184348: strh r2, [r4, 0x32] b _08184352 @@ -794238,7 +767636,7 @@ pokemonanimfunc_83: @ 8184360 strh r0, [r4, 0x3C] movs r0, 0x8 strh r0, [r4, 0x38] - ldr r0, _081843C4 + ldr r0, =0x0000ffe0 strh r0, [r4, 0x36] movs r0, 0x1 strh r0, [r4, 0x34] @@ -794270,12 +767668,11 @@ _08184384: bgt _081843CC adds r0, r4, 0 bl sub_817F77C - ldr r0, _081843C8 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _081843DC .align 2, 0 -_081843C4: .4byte 0x0000ffe0 -_081843C8: .4byte sub_8184D88 + 1 + .pool _081843CC: strh r2, [r4, 0x32] b _081843D6 @@ -794306,7 +767703,7 @@ pokemonanimfunc_84: @ 81843E4 strh r0, [r4, 0x3C] movs r0, 0x8 strh r0, [r4, 0x38] - ldr r0, _08184448 + ldr r0, =0x0000ffe0 strh r0, [r4, 0x36] movs r0, 0x2 strh r0, [r4, 0x34] @@ -794338,12 +767735,11 @@ _08184408: bgt _08184450 adds r0, r4, 0 bl sub_817F77C - ldr r0, _0818444C + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _08184460 .align 2, 0 -_08184448: .4byte 0x0000ffe0 -_0818444C: .4byte sub_8184D88 + 1 + .pool _08184450: strh r2, [r4, 0x32] b _0818445A @@ -794380,11 +767776,11 @@ sub_8184468: @ 8184468 bl sub_817F6D4 adds r0, r6, 0 bl sub_817F77C - ldr r0, _08184498 + ldr r0, =sub_8184D88 + 1 str r0, [r6, 0x1C] b _08184544 .align 2, 0 -_08184498: .4byte sub_8184D88 + 1 + .pool _0818449C: movs r1, 0x32 ldrsh r0, [r6, r1] @@ -794568,7 +767964,7 @@ sub_81845D4: @ 81845D4 strh r0, [r4, 0x24] movs r0, 0x2 strh r0, [r4, 0x3C] - ldr r0, _0818460C + ldr r0, =sub_8184610 + 1 str r0, [r4, 0x1C] _081845FE: adds r0, r4, 0 @@ -794577,7 +767973,7 @@ _081845FE: pop {r0} bx r0 .align 2, 0 -_0818460C: .4byte sub_8184610 + 1 + .pool thumb_func_end sub_81845D4 thumb_func_start sub_8184610 @@ -794594,7 +767990,7 @@ sub_8184610: @ 8184610 lsls r1, 16 cmp r1, 0 blt _0818462E - ldr r0, _0818463C + ldr r0, =sub_8184640 + 1 str r0, [r4, 0x1C] _0818462E: adds r0, r4, 0 @@ -794603,7 +767999,7 @@ _0818462E: pop {r0} bx r0 .align 2, 0 -_0818463C: .4byte sub_8184640 + 1 + .pool thumb_func_end sub_8184610 thumb_func_start sub_8184640 @@ -794625,7 +768021,7 @@ sub_8184640: @ 8184640 cmp r1, r0 ble _08184668 strh r2, [r4, 0x24] - ldr r0, _08184674 + ldr r0, =sub_8184678 + 1 str r0, [r4, 0x1C] _08184668: adds r0, r4, 0 @@ -794634,7 +768030,7 @@ _08184668: pop {r0} bx r0 .align 2, 0 -_08184674: .4byte sub_8184678 + 1 + .pool thumb_func_end sub_8184640 thumb_func_start sub_8184678 @@ -794649,11 +768045,11 @@ sub_8184678: @ 8184678 ldrsh r0, [r4, r3] cmp r1, r0 blt _08184698 - ldr r0, _08184694 + ldr r0, =sub_81846B8 + 1 str r0, [r4, 0x1C] b _081846AC .align 2, 0 -_08184694: .4byte sub_81846B8 + 1 + .pool _08184698: ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x24] @@ -794688,7 +768084,7 @@ sub_81846B8: @ 81846B8 strh r0, [r4, 0x24] adds r0, r4, 0 bl sub_817F77C - ldr r0, _081846E8 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] _081846DA: adds r0, r4, 0 @@ -794697,7 +768093,7 @@ _081846DA: pop {r0} bx r0 .align 2, 0 -_081846E8: .4byte sub_8184D88 + 1 + .pool thumb_func_end sub_81846B8 thumb_func_start pokemonanimfunc_88 @@ -794716,13 +768112,13 @@ pokemonanimfunc_88: @ 81846EC strh r2, [r4, 0x34] movs r0, 0x2 strh r0, [r4, 0x32] - ldr r0, _08184714 + ldr r0, =sub_81845D4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08184714: .4byte sub_81845D4 + 1 + .pool thumb_func_end pokemonanimfunc_88 thumb_func_start pokemonanimfunc_89 @@ -794741,13 +768137,13 @@ pokemonanimfunc_89: @ 8184718 strh r2, [r4, 0x34] movs r0, 0x1 strh r0, [r4, 0x32] - ldr r0, _08184740 + ldr r0, =sub_81845D4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_08184740: .4byte sub_81845D4 + 1 + .pool thumb_func_end pokemonanimfunc_89 thumb_func_start pokemonanimfunc_8A @@ -794765,13 +768161,13 @@ pokemonanimfunc_8A: @ 8184744 strh r1, [r4, 0x34] movs r0, 0x1 strh r0, [r4, 0x32] - ldr r0, _0818476C + ldr r0, =sub_81845D4 + 1 str r0, [r4, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_0818476C: .4byte sub_81845D4 + 1 + .pool thumb_func_end pokemonanimfunc_8A thumb_func_start sub_8184770 @@ -794803,7 +768199,7 @@ _08184790: sub_8184798: @ 8184798 push {r4,r5,lr} adds r4, r0, 0 - ldr r1, _081847C8 + ldr r1, =0x0860ae7c movs r2, 0x34 ldrsh r0, [r4, r2] lsls r0, 2 @@ -794820,12 +768216,11 @@ sub_8184798: @ 8184798 bne _081847D0 movs r0, 0 strh r0, [r4, 0x24] - ldr r0, _081847CC + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _0818482E .align 2, 0 -_081847C8: .4byte 0x0860ae7c -_081847CC: .4byte sub_8184D88 + 1 + .pool _081847D0: movs r2, 0x36 ldrsh r0, [r4, r2] @@ -794835,16 +768230,16 @@ _081847D0: cmp r0, 0 beq _081847F0 ldrh r0, [r4, 0x3C] - ldr r3, _081847EC + ldr r3, =0x000003ff movs r1, 0x10 movs r2, 0x10 bl pal_fade_1 b _081847FC .align 2, 0 -_081847EC: .4byte 0x000003ff + .pool _081847F0: ldrh r0, [r4, 0x3C] - ldr r3, _08184824 + ldr r3, =0x000003ff movs r1, 0x10 movs r2, 0 bl pal_fade_1 @@ -794870,7 +768265,7 @@ _08184800: strh r0, [r4, 0x3A] b _0818482E .align 2, 0 -_08184824: .4byte 0x000003ff + .pool _08184828: ldrh r0, [r4, 0x38] adds r0, 0x1 @@ -794991,11 +768386,11 @@ sub_81848E0: @ 81848E0 movs r2, 0 movs r3, 0x1F bl pal_fade_1 - ldr r0, _08184900 + ldr r0, =sub_8184D88 + 1 str r0, [r4, 0x1C] b _0818492A .align 2, 0 -_08184900: .4byte sub_8184D88 + 1 + .pool _08184904: movs r5, 0x32 ldrsh r0, [r4, r5] @@ -795006,7 +768401,7 @@ _08184904: ldrh r0, [r4, 0x3C] lsls r2, 24 lsrs r2, 24 - ldr r3, _08184930 + ldr r3, =0x0860ae88 movs r5, 0x30 ldrsh r1, [r4, r5] lsls r1, 1 @@ -795019,7 +768414,7 @@ _0818492A: pop {r0} bx r0 .align 2, 0 -_08184930: .4byte 0x0860ae88 + .pool thumb_func_end sub_81848E0 thumb_func_start sub_8184934 @@ -795632,13 +769027,13 @@ sub_8184D88: @ 8184D88 ands r0, r1 cmp r0, 0 beq _08184D9C - ldr r0, _08184DA0 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _08184D9C: pop {r0} bx r0 .align 2, 0 -_08184DA0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8184D88 thumb_func_start sub_8184DA4 @@ -795651,36 +769046,36 @@ sub_8184DA4: @ 8184DA4 lsls r0, 24 lsrs r0, 24 mov r12, r0 - ldr r0, _08184E30 + ldr r0, =0x0203c7ac mov r1, r12 strb r1, [r0] - ldr r1, _08184E34 + ldr r1, =0x0203ccd0 movs r0, 0 strb r0, [r1] movs r2, 0 movs r7, 0 - ldr r3, _08184E38 + ldr r3, =0x0203c7bc mov r10, r3 - ldr r6, _08184E3C + ldr r6, =0x0203c794 mov r9, r6 - ldr r0, _08184E40 + ldr r0, =0x0203bd34 mov r8, r0 _08184DD0: lsls r0, r2, 1 mov r3, r9 adds r1, r0, r3 strh r7, [r1] - ldr r6, _08184E44 + ldr r6, =0x0203c79c adds r1, r0, r6 strh r7, [r1] - ldr r1, _08184E48 + ldr r1, =0x0203c7a4 adds r0, r1 strh r7, [r0] adds r4, r2, 0x1 mov r3, r12 cmp r3, 0x1 bne _08184E1C - ldr r5, _08184E4C + ldr r5, =0x02022fec movs r3, 0xFF movs r1, 0xA6 lsls r1, 2 @@ -795697,9 +769092,9 @@ _08184DFC: cmp r1, 0 bne _08184DFC ldr r0, [r5] - ldr r1, _08184E50 + ldr r1, =0x0203c7b8 str r0, [r1] - ldr r3, _08184E54 + ldr r3, =0x020244a8 ldr r0, [r3] ldr r0, [r0, 0x14] ldr r0, [r0, 0xC] @@ -795717,16 +769112,7 @@ _08184E1C: pop {r0} bx r0 .align 2, 0 -_08184E30: .4byte 0x0203c7ac -_08184E34: .4byte 0x0203ccd0 -_08184E38: .4byte 0x0203c7bc -_08184E3C: .4byte 0x0203c794 -_08184E40: .4byte 0x0203bd34 -_08184E44: .4byte 0x0203c79c -_08184E48: .4byte 0x0203c7a4 -_08184E4C: .4byte 0x02022fec -_08184E50: .4byte 0x0203c7b8 -_08184E54: .4byte 0x020244a8 + .pool thumb_func_end sub_8184DA4 thumb_func_start sub_8184E58 @@ -795737,54 +769123,49 @@ sub_8184E58: @ 8184E58 mov r5, r8 push {r5-r7} sub sp, 0x20 - ldr r0, _08184E88 + ldr r0, =0x0203c7ac ldrb r0, [r0] cmp r0, 0x1 bne _08184EA0 - ldr r1, _08184E8C - ldr r0, _08184E90 + ldr r1, =0x0203bd2c + ldr r0, =0x03005d80 ldr r0, [r0] str r0, [r1] - ldr r4, _08184E94 - ldr r0, _08184E98 + ldr r4, =0x0203c7ae + ldr r0, =0x000040cf bl var_get strb r0, [r4] - ldr r4, _08184E9C + ldr r4, =0x0203c7af bl sub_81A513C strb r0, [r4] b _08184EAC .align 2, 0 -_08184E88: .4byte 0x0203c7ac -_08184E8C: .4byte 0x0203bd2c -_08184E90: .4byte 0x03005d80 -_08184E94: .4byte 0x0203c7ae -_08184E98: .4byte 0x000040cf -_08184E9C: .4byte 0x0203c7af + .pool _08184EA0: cmp r0, 0x2 bne _08184EAC - ldr r0, _08184F24 - ldr r1, _08184F28 + ldr r0, =0x03005d80 + ldr r1, =0x0203bd2c ldr r1, [r1] str r1, [r0] _08184EAC: - ldr r0, _08184F2C + ldr r0, =0x02022fec ldr r5, [r0] movs r0, 0x2 ands r5, r0 cmp r5, 0 beq _08184F64 bl link_get_multiplayer_id - ldr r1, _08184F30 + ldr r1, =0x0203c7b4 strb r0, [r1] bl sub_8009FCC lsls r0, 24 lsrs r0, 24 mov r10, r0 movs r5, 0 - ldr r0, _08184F34 + ldr r0, =0x0203cc80 mov r9, r0 - ldr r6, _08184F38 + ldr r6, =0x020229e8 movs r0, 0x8 adds r0, r6 mov r8, r0 @@ -795824,17 +769205,12 @@ _08184EDC: adds r5, 0x1 b _08184F56 .align 2, 0 -_08184F24: .4byte 0x03005d80 -_08184F28: .4byte 0x0203bd2c -_08184F2C: .4byte 0x02022fec -_08184F30: .4byte 0x0203c7b4 -_08184F34: .4byte 0x0203cc80 -_08184F38: .4byte 0x020229e8 + .pool _08184F3C: adds r5, 0x1 - ldr r0, _08184F5C + ldr r0, =0x020229f0 adds r1, r3, r0 - ldr r0, _08184F60 + ldr r0, =0x0203cc84 adds r2, r4, r0 movs r3, 0x7 _08184F48: @@ -795850,11 +769226,10 @@ _08184F56: ble _08184EDC b _08184FA0 .align 2, 0 -_08184F5C: .4byte 0x020229f0 -_08184F60: .4byte 0x0203cc84 + .pool _08184F64: - ldr r3, _08184FB0 - ldr r4, _08184FB4 + ldr r3, =0x0203cc80 + ldr r4, =0x03005d90 ldr r2, [r4] ldrb r1, [r2, 0xA] ldrb r0, [r2, 0xB] @@ -795870,7 +769245,7 @@ _08184F64: ldrb r0, [r2, 0x8] strb r0, [r3, 0xC] strh r5, [r3, 0xE] - ldr r0, _08184FB8 + ldr r0, =0x082e9531 ldrb r0, [r0] strh r0, [r3, 0x10] movs r5, 0 @@ -795894,9 +769269,7 @@ _08184FA0: pop {r0} bx r0 .align 2, 0 -_08184FB0: .4byte 0x0203cc80 -_08184FB4: .4byte 0x03005d90 -_08184FB8: .4byte 0x082e9531 + .pool thumb_func_end sub_8184E58 thumb_func_start sub_8184FBC @@ -795906,19 +769279,19 @@ sub_8184FBC: @ 8184FBC lsrs r5, r0, 24 lsls r1, 24 lsrs r6, r1, 24 - ldr r1, _08184FF8 + ldr r1, =0x0203c794 lsls r0, r5, 1 adds r4, r0, r1 ldrh r2, [r4] adds r3, r2, 0 - ldr r0, _08184FFC + ldr r0, =0x00000297 cmp r3, r0 bhi _08184FF0 - ldr r0, _08185000 + ldr r0, =0x0203c7ac ldrb r0, [r0] cmp r0, 0x2 beq _08184FF0 - ldr r1, _08185004 + ldr r1, =0x0203bd34 adds r0, r2, 0x1 strh r0, [r4] movs r0, 0xA6 @@ -795932,10 +769305,7 @@ _08184FF0: pop {r0} bx r0 .align 2, 0 -_08184FF8: .4byte 0x0203c794 -_08184FFC: .4byte 0x00000297 -_08185000: .4byte 0x0203c7ac -_08185004: .4byte 0x0203bd34 + .pool thumb_func_end sub_8184FBC thumb_func_start sub_8185008 @@ -795948,10 +769318,10 @@ sub_8185008: @ 8185008 movs r3, 0 cmp r3, r4 bge _08185046 - ldr r0, _0818504C + ldr r0, =0x0203c794 lsls r1, r5, 1 adds r2, r1, r0 - ldr r7, _08185050 + ldr r7, =0x0203bd34 movs r0, 0xA6 lsls r0, 2 muls r5, r0 @@ -795977,8 +769347,7 @@ _08185046: pop {r0} bx r0 .align 2, 0 -_0818504C: .4byte 0x0203c794 -_08185050: .4byte 0x0203bd34 + .pool thumb_func_end sub_8185008 thumb_func_start sub_8185054 @@ -795987,14 +769356,14 @@ sub_8185054: @ 8185054 sub sp, 0x4 lsls r0, 24 lsrs r3, r0, 24 - ldr r1, _081850A4 + ldr r1, =0x0203c794 lsls r0, r3, 1 adds r2, r0, r1 ldrh r1, [r2] - ldr r0, _081850A8 + ldr r0, =0x00000297 cmp r1, r0 bhi _0818507A - ldr r4, _081850AC + ldr r4, =0x0203bd34 adds r0, 0x1 muls r3, r0 adds r0, r1, r3 @@ -796003,8 +769372,8 @@ sub_8185054: @ 8185054 cmp r0, 0xFF bne _081850BC _0818507A: - ldr r2, _081850B0 - ldr r1, _081850B4 + ldr r2, =0x020375f0 + ldr r1, =0x0202433a movs r0, 0x5 strb r0, [r1] movs r0, 0x5 @@ -796017,17 +769386,12 @@ _0818507A: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _081850B8 + ldr r0, =sub_80384E4 + 1 bl set_callback2 movs r0, 0xFF b _081850C6 .align 2, 0 -_081850A4: .4byte 0x0203c794 -_081850A8: .4byte 0x00000297 -_081850AC: .4byte 0x0203bd34 -_081850B0: .4byte 0x020375f0 -_081850B4: .4byte 0x0202433a -_081850B8: .4byte sub_80384E4 + 1 + .pool _081850BC: adds r0, r1, 0x1 strh r0, [r2] @@ -796043,11 +769407,11 @@ _081850C6: thumb_func_start sub_81850D0 sub_81850D0: @ 81850D0 - ldr r0, _081850D8 + ldr r0, =0x0203c7ac ldrb r0, [r0] bx lr .align 2, 0 -_081850D8: .4byte 0x0203c7ac + .pool thumb_func_end sub_81850D0 thumb_func_start sub_81850DC @@ -796065,9 +769429,9 @@ sub_81850DC: @ 81850DC _081850F0: mov r1, r12 lsls r3, r1, 1 - ldr r0, _0818519C + ldr r0, =0x0203c794 adds r5, r3, r0 - ldr r1, _081851A0 + ldr r1, =0x0203c79c adds r6, r3, r1 ldrh r0, [r5] mov r9, r3 @@ -796099,9 +769463,9 @@ _081850F0: subs r0, r1 cmp r4, r0 bge _08185172 - ldr r1, _081851A4 + ldr r1, =0x0203bd34 mov r10, r1 - ldr r6, _081851A0 + ldr r6, =0x0203c79c movs r0, 0xA6 lsls r0, 2 mov r5, r12 @@ -796122,7 +769486,7 @@ _08185146: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0818519C + ldr r1, =0x0203c794 adds r0, r3, r1 ldrh r1, [r0] ldrh r0, [r2] @@ -796130,9 +769494,9 @@ _08185146: cmp r4, r1 blt _08185146 _08185172: - ldr r0, _081851A0 + ldr r0, =0x0203c79c add r0, r9 - ldr r1, _0818519C + ldr r1, =0x0203c794 add r1, r9 ldrh r1, [r1] strh r1, [r0] @@ -796153,9 +769517,7 @@ _0818517E: pop {r1} bx r1 .align 2, 0 -_0818519C: .4byte 0x0203c794 -_081851A0: .4byte 0x0203c79c -_081851A4: .4byte 0x0203bd34 + .pool thumb_func_end sub_81850DC thumb_func_start sub_81851A8 @@ -796168,17 +769530,16 @@ sub_81851A8: @ 81851A8 movs r1, 0x2 mov r0, sp strb r1, [r0] - ldr r0, _081851C8 + ldr r0, =0x02022fec ldr r0, [r0] ands r0, r1 cmp r0, 0 beq _0818525E movs r5, 0 - ldr r4, _081851CC + ldr r4, =0x020229e8 b _081851DA .align 2, 0 -_081851C8: .4byte 0x02022fec -_081851CC: .4byte 0x020229e8 + .pool _081851D0: ldrb r0, [r4] cmp r0, 0x3 @@ -796191,7 +769552,7 @@ _081851DA: lsrs r0, 24 cmp r5, r0 blt _081851D0 - ldr r0, _0818526C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x4 ands r0, r1 @@ -796220,8 +769581,8 @@ _08185202: lsrs r2, r0, 24 cmp r2, 0 beq _08185256 - ldr r3, _08185270 - ldr r0, _08185274 + ldr r3, =0x0203bd34 + ldr r0, =0x0203c7a4 lsls r1, r6, 1 adds r4, r1, r0 adds r5, r2, 0 @@ -796259,9 +769620,7 @@ _0818525E: pop {r0} bx r0 .align 2, 0 -_0818526C: .4byte 0x02022fec -_08185270: .4byte 0x0203bd34 -_08185274: .4byte 0x0203c7a4 + .pool thumb_func_end sub_81851A8 thumb_func_start sub_8185278 @@ -796300,16 +769659,16 @@ sub_8185290: @ 8185290 sub_81852B0: @ 81852B0 push {r4,r5,lr} adds r5, r0, 0 - ldr r1, _081852DC + ldr r1, =0x000004ec adds r0, r5, r1 ldr r1, [r0] cmp r1, 0 beq _081852E8 - ldr r0, _081852E0 + ldr r0, =0x7d007e92 ands r1, r0 cmp r1, 0 bne _081852E8 - ldr r4, _081852E4 + ldr r4, =0x00000f7c adds r0, r5, 0 adds r1, r4, 0 bl sub_806F96C @@ -796320,9 +769679,7 @@ sub_81852B0: @ 81852B0 movs r0, 0x1 b _081852EA .align 2, 0 -_081852DC: .4byte 0x000004ec -_081852E0: .4byte 0x7d007e92 -_081852E4: .4byte 0x00000f7c + .pool _081852E8: movs r0, 0 _081852EA: @@ -796346,7 +769703,7 @@ sub_81852F0: @ 81852F0 adds r0, r5, 0 adds r1, r4, 0 bl memcpy - ldr r4, _0818532C + ldr r4, =0x00000f7c adds r0, r5, 0 adds r1, r4, 0 bl sub_806F96C @@ -796360,7 +769717,7 @@ sub_81852F0: @ 81852F0 movs r0, 0x1 b _08185332 .align 2, 0 -_0818532C: .4byte 0x00000f7c + .pool _08185330: movs r0, 0 _08185332: @@ -796393,7 +769750,7 @@ _0818535E: adds r4, r6, 0 muls r4, r0 adds r5, r7, r4 - ldr r1, _08185430 + ldr r1, =0x0203c7c0 adds r1, r4, r1 adds r0, r5, 0 movs r2, 0x64 @@ -796401,7 +769758,7 @@ _0818535E: movs r1, 0x96 lsls r1, 2 adds r5, r1 - ldr r0, _08185434 + ldr r0, =0x0203ca18 adds r4, r0 adds r0, r5, 0 adds r1, r4, 0 @@ -796411,24 +769768,24 @@ _0818535E: cmp r6, 0x5 ble _0818535E movs r6, 0 - ldr r2, _08185438 + ldr r2, =0x03005d90 mov r9, r2 movs r3, 0x9A lsls r3, 3 adds r3, r7, r3 str r3, [sp, 0x8] - ldr r5, _0818543C + ldr r5, =0x0203cc80 mov r8, r6 mov r12, r6 movs r4, 0x96 lsls r4, 3 adds r4, r7 mov r10, r4 - ldr r0, _08185440 + ldr r0, =0x000004e4 adds r4, r7, r0 _081853AC: lsls r1, r6, 3 - ldr r0, _0818543C + ldr r0, =0x0203cc80 adds r0, 0x4 mov r3, r8 adds r2, r3, r0 @@ -796450,7 +769807,7 @@ _081853BA: strb r0, [r4] ldrh r0, [r5, 0xE] strb r0, [r4, 0xC] - ldr r1, _08185444 + ldr r1, =0x000004d4 adds r0, r7, r1 add r0, r12 ldr r1, [r5] @@ -796467,16 +769824,16 @@ _081853BA: movs r4, 0x9D lsls r4, 3 adds r1, r7, r4 - ldr r5, _08185448 + ldr r5, =0x0203bd2c ldr r0, [r5] str r0, [r1] - ldr r0, _0818544C + ldr r0, =0x0203c7b8 ldr r2, [r0] movs r0, 0x2 ands r0, r2 cmp r0, 0 beq _081854DC - ldr r1, _08185450 + ldr r1, =0x000004ec adds r3, r7, r1 movs r1, 0x23 negs r1, r1 @@ -796495,21 +769852,13 @@ _081853BA: str r1, [r3] b _081854E2 .align 2, 0 -_08185430: .4byte 0x0203c7c0 -_08185434: .4byte 0x0203ca18 -_08185438: .4byte 0x03005d90 -_0818543C: .4byte 0x0203cc80 -_08185440: .4byte 0x000004e4 -_08185444: .4byte 0x000004d4 -_08185448: .4byte 0x0203bd2c -_0818544C: .4byte 0x0203c7b8 -_08185450: .4byte 0x000004ec + .pool _08185454: movs r0, 0x40 ands r2, r0 cmp r2, 0 beq _081854E2 - ldr r2, _08185470 + ldr r2, =0x0203cc80 ldrh r0, [r2, 0xE] cmp r0, 0x1 beq _081854A8 @@ -796519,7 +769868,7 @@ _08185454: beq _0818547E b _081854E2 .align 2, 0 -_08185470: .4byte 0x0203cc80 + .pool _08185474: cmp r0, 0x2 beq _0818547E @@ -796527,39 +769876,37 @@ _08185474: beq _081854A8 b _081854E2 _0818547E: - ldr r3, _0818549C + ldr r3, =0x0203c7b4 ldrb r1, [r3] lsls r0, r1, 2 adds r0, r1 lsls r0, 2 - ldr r4, _081854A0 + ldr r4, =0x0203cc80 adds r0, r4 ldrh r1, [r0, 0xE] movs r0, 0x1 ands r0, r1 cmp r0, 0 bne _081854E2 - ldr r5, _081854A4 + ldr r5, =0x000004ec adds r0, r7, r5 b _081854C4 .align 2, 0 -_0818549C: .4byte 0x0203c7b4 -_081854A0: .4byte 0x0203cc80 -_081854A4: .4byte 0x000004ec + .pool _081854A8: - ldr r0, _081854D0 + ldr r0, =0x0203c7b4 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 2 - ldr r1, _081854D4 + ldr r1, =0x0203cc80 adds r0, r1 ldrh r1, [r0, 0xE] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _081854E2 - ldr r2, _081854D8 + ldr r2, =0x000004ec adds r0, r7, r2 _081854C4: ldr r1, [r0] @@ -796569,60 +769916,58 @@ _081854C4: str r1, [r0] b _081854E2 .align 2, 0 -_081854D0: .4byte 0x0203c7b4 -_081854D4: .4byte 0x0203cc80 -_081854D8: .4byte 0x000004ec + .pool _081854DC: - ldr r3, _08185610 + ldr r3, =0x000004ec adds r0, r7, r3 str r2, [r0] _081854E2: - ldr r4, _08185614 + ldr r4, =0x02038bca ldrh r1, [r4] - ldr r5, _08185618 + ldr r5, =0x000004f4 adds r0, r7, r5 strh r1, [r0] - ldr r0, _0818561C + ldr r0, =0x02038bcc ldrh r1, [r0] - ldr r2, _08185620 + ldr r2, =0x000004f6 adds r0, r7, r2 strh r1, [r0] - ldr r3, _08185624 + ldr r3, =0x02038bce ldrh r1, [r3] movs r4, 0x9F lsls r4, 3 adds r0, r7, r4 strh r1, [r0] - ldr r5, _08185628 + ldr r5, =0x0203c7b4 ldrb r1, [r5] adds r2, 0x4 adds r0, r7, r2 strh r1, [r0] mov r3, r9 ldr r0, [r3] - ldr r4, _0818562C + ldr r4, =0x00000ca9 adds r0, r4 ldrb r0, [r0] lsls r0, 30 lsrs r0, 30 - ldr r5, _08185630 + ldr r5, =0x000004fc adds r1, r7, r5 strb r0, [r1] - ldr r0, _08185634 + ldr r0, =0x0203c7ae ldrb r1, [r0] adds r2, 0x3 adds r0, r7, r2 strb r1, [r0] - ldr r3, _08185638 + ldr r3, =0x0203c7af ldrb r1, [r3] - ldr r4, _0818563C + ldr r4, =0x000004fe adds r0, r7, r4 strb r1, [r0] mov r5, r9 ldr r0, [r5] ldrb r1, [r0, 0x15] lsls r1, 29 - ldr r0, _08185640 + ldr r0, =0x000004ff adds r3, r7, r0 lsrs r1, 31 ldrb r2, [r3] @@ -796643,12 +769988,12 @@ _081854E2: movs r2, 0xA0 lsls r2, 3 adds r1, r7, r2 - ldr r3, _08185644 + ldr r3, =0x0203c7bc ldr r0, [r3] str r0, [r1] - ldr r4, _08185648 + ldr r4, =0xfffffed4 adds r1, r4, 0 - ldr r5, _08185614 + ldr r5, =0x02038bca ldrh r5, [r5] adds r0, r1, r5 lsls r0, 16 @@ -796658,14 +770003,14 @@ _081854E2: b _081856C4 _08185580: movs r6, 0 - ldr r0, _0818564C + ldr r0, =0x00000504 adds r3, r7, r0 mov r10, r9 - ldr r1, _08185614 + ldr r1, =0x02038bca mov r12, r1 adds r2, r4, 0 mov r8, r2 - ldr r4, _08185650 + ldr r4, =0x0000073c _08185592: adds r2, r3, r6 mov r5, r10 @@ -796685,28 +770030,28 @@ _08185592: ble _08185592 mov r0, r9 ldr r2, [r0] - ldr r1, _08185614 + ldr r1, =0x02038bca ldrh r0, [r1] - ldr r3, _08185648 + ldr r3, =0xfffffed4 adds r0, r3 movs r1, 0xEC muls r0, r1 adds r2, r0 - ldr r4, _08185654 + ldr r4, =0x00000739 adds r2, r4 ldrb r1, [r2] - ldr r5, _08185658 + ldr r5, =0x0000050c adds r0, r7, r5 strb r1, [r0] - ldr r1, _0818565C + ldr r1, =0x0203cce8 ldrb r0, [r1] cmp r0, 0x1 bne _08185664 movs r6, 0 - ldr r2, _08185660 + ldr r2, =0x0000050e adds r4, r7, r2 mov r10, r9 - ldr r5, _08185614 + ldr r5, =0x02038bca mov r8, r5 adds r5, r3, 0 _081855E6: @@ -796731,33 +770076,13 @@ _081855E6: ble _081855E6 b _08185696 .align 2, 0 -_08185610: .4byte 0x000004ec -_08185614: .4byte 0x02038bca -_08185618: .4byte 0x000004f4 -_0818561C: .4byte 0x02038bcc -_08185620: .4byte 0x000004f6 -_08185624: .4byte 0x02038bce -_08185628: .4byte 0x0203c7b4 -_0818562C: .4byte 0x00000ca9 -_08185630: .4byte 0x000004fc -_08185634: .4byte 0x0203c7ae -_08185638: .4byte 0x0203c7af -_0818563C: .4byte 0x000004fe -_08185640: .4byte 0x000004ff -_08185644: .4byte 0x0203c7bc -_08185648: .4byte 0xfffffed4 -_0818564C: .4byte 0x00000504 -_08185650: .4byte 0x0000073c -_08185654: .4byte 0x00000739 -_08185658: .4byte 0x0000050c -_0818565C: .4byte 0x0203cce8 -_08185660: .4byte 0x0000050e + .pool _08185664: movs r6, 0 - ldr r1, _081856B0 + ldr r1, =0x0000050e adds r4, r7, r1 mov r10, r9 - ldr r2, _081856B4 + ldr r2, =0x02038bca mov r8, r2 adds r5, r3, 0 _08185672: @@ -796770,7 +770095,7 @@ _08185672: movs r1, 0xEC muls r0, r1 adds r3, r0 - ldr r0, _081856B8 + ldr r0, =0x00000754 adds r2, r0 adds r2, r3 ldrh r0, [r2] @@ -796782,25 +770107,21 @@ _08185672: _08185696: mov r1, r9 ldr r2, [r1] - ldr r3, _081856B4 + ldr r3, =0x02038bca ldrh r0, [r3] - ldr r4, _081856BC + ldr r4, =0xfffffed4 adds r0, r4 movs r1, 0xEC muls r0, r1 adds r2, r0 - ldr r5, _081856C0 + ldr r5, =0x0000081c adds r2, r5 ldrb r1, [r2] b _08185856 .align 2, 0 -_081856B0: .4byte 0x0000050e -_081856B4: .4byte 0x02038bca -_081856B8: .4byte 0x00000754 -_081856BC: .4byte 0xfffffed4 -_081856C0: .4byte 0x0000081c + .pool _081856C4: - ldr r3, _08185764 + ldr r3, =0x02038bcc ldrh r3, [r3] adds r0, r1, r3 lsls r0, 16 @@ -796810,14 +770131,14 @@ _081856C4: b _081857E4 _081856D4: movs r6, 0 - ldr r4, _08185768 + ldr r4, =0x00000504 adds r3, r7, r4 mov r10, r9 - ldr r5, _08185764 + ldr r5, =0x02038bcc mov r12, r5 - ldr r0, _0818576C + ldr r0, =0xfffffed4 mov r8, r0 - ldr r4, _08185770 + ldr r4, =0x0000073c _081856E6: adds r2, r3, r6 mov r5, r10 @@ -796837,28 +770158,28 @@ _081856E6: ble _081856E6 mov r0, r9 ldr r2, [r0] - ldr r1, _08185764 + ldr r1, =0x02038bcc ldrh r0, [r1] - ldr r3, _0818576C + ldr r3, =0xfffffed4 adds r0, r3 movs r1, 0xEC muls r0, r1 adds r2, r0 - ldr r4, _08185774 + ldr r4, =0x00000739 adds r2, r4 ldrb r1, [r2] - ldr r5, _08185778 + ldr r5, =0x0000050c adds r0, r7, r5 strb r1, [r0] - ldr r1, _0818577C + ldr r1, =0x0203cce8 ldrb r0, [r1] cmp r0, 0x1 bne _08185784 movs r6, 0 - ldr r2, _08185780 + ldr r2, =0x0000050e adds r4, r7, r2 mov r10, r9 - ldr r5, _08185764 + ldr r5, =0x02038bcc mov r8, r5 adds r5, r3, 0 _0818573A: @@ -796883,20 +770204,13 @@ _0818573A: ble _0818573A b _081857B6 .align 2, 0 -_08185764: .4byte 0x02038bcc -_08185768: .4byte 0x00000504 -_0818576C: .4byte 0xfffffed4 -_08185770: .4byte 0x0000073c -_08185774: .4byte 0x00000739 -_08185778: .4byte 0x0000050c -_0818577C: .4byte 0x0203cce8 -_08185780: .4byte 0x0000050e + .pool _08185784: movs r6, 0 - ldr r1, _081857D0 + ldr r1, =0x0000050e adds r4, r7, r1 mov r10, r9 - ldr r2, _081857D4 + ldr r2, =0x02038bcc mov r8, r2 adds r5, r3, 0 _08185792: @@ -796909,7 +770223,7 @@ _08185792: movs r1, 0xEC muls r0, r1 adds r3, r0 - ldr r0, _081857D8 + ldr r0, =0x00000754 adds r2, r0 adds r2, r3 ldrh r0, [r2] @@ -796921,25 +770235,21 @@ _08185792: _081857B6: mov r1, r9 ldr r2, [r1] - ldr r3, _081857D4 + ldr r3, =0x02038bcc ldrh r0, [r3] - ldr r4, _081857DC + ldr r4, =0xfffffed4 adds r0, r4 movs r1, 0xEC muls r0, r1 adds r2, r0 - ldr r5, _081857E0 + ldr r5, =0x0000081c adds r2, r5 ldrb r1, [r2] b _08185856 .align 2, 0 -_081857D0: .4byte 0x0000050e -_081857D4: .4byte 0x02038bcc -_081857D8: .4byte 0x00000754 -_081857DC: .4byte 0xfffffed4 -_081857E0: .4byte 0x0000081c + .pool _081857E4: - ldr r3, _081858CC + ldr r3, =0x02038bce ldrh r3, [r3] adds r0, r1, r3 lsls r0, 16 @@ -796947,14 +770257,14 @@ _081857E4: cmp r0, 0x63 bhi _0818585C movs r6, 0 - ldr r4, _081858D0 + ldr r4, =0x00000504 adds r3, r7, r4 mov r10, r9 - ldr r5, _081858CC + ldr r5, =0x02038bce mov r12, r5 - ldr r0, _081858D4 + ldr r0, =0xfffffed4 mov r8, r0 - ldr r4, _081858D8 + ldr r4, =0x0000073c _08185804: adds r2, r3, r6 mov r5, r10 @@ -796974,43 +770284,43 @@ _08185804: ble _08185804 mov r0, r9 ldr r1, [r0] - ldr r2, _081858CC + ldr r2, =0x02038bce ldrh r0, [r2] - ldr r3, _081858D4 + ldr r3, =0xfffffed4 adds r0, r3 movs r2, 0xEC muls r0, r2 adds r1, r0 - ldr r4, _081858DC + ldr r4, =0x00000739 adds r1, r4 ldrb r1, [r1] - ldr r5, _081858E0 + ldr r5, =0x0000050c adds r0, r7, r5 strb r1, [r0] mov r0, r9 ldr r1, [r0] - ldr r4, _081858CC + ldr r4, =0x02038bce ldrh r0, [r4] adds r0, r3 muls r0, r2 adds r1, r0 - ldr r5, _081858E4 + ldr r5, =0x0000081c adds r1, r5 ldrb r1, [r1] _08185856: - ldr r2, _081858E8 + ldr r2, =0x0000051a adds r0, r7, r2 strb r1, [r0] _0818585C: - ldr r3, _081858EC + ldr r3, =0x02038bca ldrh r0, [r3] - ldr r1, _081858F0 + ldr r1, =0x0000018f cmp r0, r1 bls _08185900 mov r4, r9 ldr r2, [r4] adds r1, r0, 0 - ldr r3, _081858F4 + ldr r3, =0xfffffe70 adds r1, r3 lsls r0, r1, 4 adds r0, r1 @@ -797020,14 +770330,14 @@ _0818585C: ldrb r0, [r2] lsls r0, 27 lsrs r0, 27 - ldr r5, _081858F8 + ldr r5, =0x0000050d adds r1, r7, r5 strb r0, [r1] movs r6, 0 - ldr r0, _081858FC + ldr r0, =0x0000050e adds r4, r7, r0 mov r10, r9 - ldr r1, _081858EC + ldr r1, =0x02038bca mov r8, r1 adds r5, r3, 0 _08185894: @@ -797053,34 +770363,22 @@ _08185894: ble _08185894 mov r3, r9 ldr r2, [r3] - ldr r4, _081858EC + ldr r4, =0x02038bca ldrh r1, [r4] - ldr r5, _081858F4 + ldr r5, =0xfffffe70 adds r1, r5 b _081859AC .align 2, 0 -_081858CC: .4byte 0x02038bce -_081858D0: .4byte 0x00000504 -_081858D4: .4byte 0xfffffed4 -_081858D8: .4byte 0x0000073c -_081858DC: .4byte 0x00000739 -_081858E0: .4byte 0x0000050c -_081858E4: .4byte 0x0000081c -_081858E8: .4byte 0x0000051a -_081858EC: .4byte 0x02038bca -_081858F0: .4byte 0x0000018f -_081858F4: .4byte 0xfffffe70 -_081858F8: .4byte 0x0000050d -_081858FC: .4byte 0x0000050e + .pool _08185900: - ldr r3, _0818596C + ldr r3, =0x02038bcc ldrh r0, [r3] cmp r0, r1 bls _0818597C mov r4, r9 ldr r2, [r4] adds r1, r0, 0 - ldr r3, _08185970 + ldr r3, =0xfffffe70 adds r1, r3 lsls r0, r1, 4 adds r0, r1 @@ -797090,14 +770388,14 @@ _08185900: ldrb r0, [r2] lsls r0, 27 lsrs r0, 27 - ldr r5, _08185974 + ldr r5, =0x0000050d adds r1, r7, r5 strb r0, [r1] movs r6, 0 - ldr r0, _08185978 + ldr r0, =0x0000050e adds r4, r7, r0 mov r10, r9 - ldr r1, _0818596C + ldr r1, =0x02038bcc mov r8, r1 adds r5, r3, 0 _08185936: @@ -797123,25 +770421,22 @@ _08185936: ble _08185936 mov r3, r9 ldr r2, [r3] - ldr r4, _0818596C + ldr r4, =0x02038bcc ldrh r1, [r4] - ldr r5, _08185970 + ldr r5, =0xfffffe70 adds r1, r5 b _081859AC .align 2, 0 -_0818596C: .4byte 0x02038bcc -_08185970: .4byte 0xfffffe70 -_08185974: .4byte 0x0000050d -_08185978: .4byte 0x0000050e + .pool _0818597C: - ldr r3, _08185A34 + ldr r3, =0x02038bce ldrh r0, [r3] cmp r0, r1 bls _081859C0 mov r4, r9 ldr r2, [r4] adds r1, r0, 0 - ldr r3, _08185A38 + ldr r3, =0xfffffe70 adds r1, r3 lsls r0, r1, 4 adds r0, r1 @@ -797151,11 +770446,11 @@ _0818597C: ldrb r0, [r2] lsls r0, 27 lsrs r0, 27 - ldr r5, _08185A3C + ldr r5, =0x0000050d adds r1, r7, r5 strb r0, [r1] ldr r2, [r4] - ldr r0, _08185A34 + ldr r0, =0x02038bce ldrh r1, [r0] adds r1, r3 _081859AC: @@ -797163,22 +770458,22 @@ _081859AC: adds r0, r1 lsls r0, 2 adds r2, r0 - ldr r1, _08185A40 + ldr r1, =0x0000011b adds r0, r2, r1 ldrb r1, [r0] - ldr r2, _08185A44 + ldr r2, =0x0000051b adds r0, r7, r2 strb r1, [r0] _081859C0: movs r6, 0 - ldr r3, _08185A48 + ldr r3, =0x00000297 mov r10, r3 - ldr r4, _08185A4C + ldr r4, =0x0203bd34 mov r9, r4 movs r5, 0xA6 lsls r5, 2 mov r8, r5 - ldr r0, _08185A50 + ldr r0, =0x0000051c adds r5, r7, r0 _081859D4: adds r4, r6, 0x1 @@ -797229,14 +770524,7 @@ _08185A14: pop {r1} bx r1 .align 2, 0 -_08185A34: .4byte 0x02038bce -_08185A38: .4byte 0xfffffe70 -_08185A3C: .4byte 0x0000050d -_08185A40: .4byte 0x0000011b -_08185A44: .4byte 0x0000051b -_08185A48: .4byte 0x00000297 -_08185A4C: .4byte 0x0203bd34 -_08185A50: .4byte 0x0000051c + .pool thumb_func_end sub_8185338 thumb_func_start sub_8185A54 @@ -797290,11 +770578,11 @@ start_ov_to_battle_anim: @ 8185A88 thumb_func_start sub_8185AB0 sub_8185AB0: @ 8185AB0 push {lr} - ldr r0, _08185AF8 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _08185AFC + ldr r0, =0x0203c7ad ldrb r0, [r0] - ldr r1, _08185B00 + ldr r1, =0x00000ca9 adds r2, r1 movs r1, 0x3 ands r1, r0 @@ -797304,34 +770592,26 @@ sub_8185AB0: @ 8185AB0 ands r0, r3 orrs r0, r1 strb r0, [r2] - ldr r1, _08185B04 + ldr r1, =0x0202433a movs r0, 0 strb r0, [r1] - ldr r0, _08185B08 + ldr r0, =0x02022fec movs r1, 0 str r1, [r0] - ldr r0, _08185B0C + ldr r0, =0x02038bca strh r1, [r0] - ldr r0, _08185B10 + ldr r0, =0x02038bcc strh r1, [r0] - ldr r0, _08185B14 + ldr r0, =0x02038bce strh r1, [r0] bl sub_8185EFC - ldr r0, _08185B18 + ldr r0, =0x0203c7b0 ldr r0, [r0] bl set_callback2 pop {r0} bx r0 .align 2, 0 -_08185AF8: .4byte 0x03005d90 -_08185AFC: .4byte 0x0203c7ad -_08185B00: .4byte 0x00000ca9 -_08185B04: .4byte 0x0202433a -_08185B08: .4byte 0x02022fec -_08185B0C: .4byte 0x02038bca -_08185B10: .4byte 0x02038bcc -_08185B14: .4byte 0x02038bce -_08185B18: .4byte 0x0203c7b0 + .pool thumb_func_end sub_8185AB0 thumb_func_start sub_8185B1C @@ -797339,7 +770619,7 @@ sub_8185B1C: @ 8185B1C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08185B50 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -797350,10 +770630,10 @@ sub_8185B1C: @ 8185B1C lsls r1, 16 cmp r1, 0 bne _08185B4A - ldr r0, _08185B54 - ldr r1, _08185B58 + ldr r0, =0x030022c0 + ldr r1, =sub_8185AB0 + 1 str r1, [r0, 0x8] - ldr r0, _08185B5C + ldr r0, =sub_8036760 + 1 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -797362,10 +770642,7 @@ _08185B4A: pop {r0} bx r0 .align 2, 0 -_08185B50: .4byte 0x03005e00 -_08185B54: .4byte 0x030022c0 -_08185B58: .4byte sub_8185AB0 + 1 -_08185B5C: .4byte sub_8036760 + 1 + .pool thumb_func_end sub_8185B1C thumb_func_start sub_8185B60 @@ -797380,7 +770657,7 @@ sub_8185B60: @ 8185B60 bl zero_player_party_data bl zero_enemy_party_data movs r6, 0 - ldr r0, _08185D90 + ldr r0, =0x020244ec mov r8, r0 _08185B7C: movs r0, 0x64 @@ -797392,7 +770669,7 @@ _08185B7C: adds r1, r5, 0 movs r2, 0x64 bl memcpy - ldr r0, _08185D94 + ldr r0, =0x02024744 adds r4, r0 movs r2, 0x96 lsls r2, 2 @@ -797405,7 +770682,7 @@ _08185B7C: cmp r6, 0x5 ble _08185B7C movs r6, 0 - ldr r3, _08185D98 + ldr r3, =0x020229e8 mov r8, r3 mov r0, r8 adds r0, 0x8 @@ -797449,7 +770726,7 @@ _08185BE8: adds r0, r6 ldrb r0, [r0] strb r0, [r4, 0xF] - ldr r2, _08185D9C + ldr r2, =0x000004e4 adds r0, r7, r2 adds r0, r6 ldrb r1, [r0] @@ -797482,71 +770759,71 @@ _08185C2A: adds r6, 0x1 cmp r6, 0x3 ble _08185BBE - ldr r1, _08185DA0 + ldr r1, =0x0203bd2c movs r3, 0x9D lsls r3, 3 adds r0, r7, r3 ldr r0, [r0] str r0, [r1] - ldr r2, _08185DA4 - ldr r1, _08185DA8 + ldr r2, =0x02022fec + ldr r1, =0x000004ec adds r0, r7, r1 ldr r0, [r0] movs r1, 0x80 lsls r1, 17 orrs r0, r1 str r0, [r2] - ldr r1, _08185DAC - ldr r2, _08185DB0 + ldr r1, =0x02038bca + ldr r2, =0x000004f4 adds r0, r7, r2 ldrh r0, [r0] strh r0, [r1] - ldr r1, _08185DB4 + ldr r1, =0x02038bcc adds r3, 0xE adds r0, r7, r3 ldrh r0, [r0] strh r0, [r1] - ldr r1, _08185DB8 + ldr r1, =0x02038bce adds r2, 0x4 adds r0, r7, r2 ldrh r0, [r0] strh r0, [r1] - ldr r1, _08185DBC + ldr r1, =0x0203c7b4 adds r3, 0x4 adds r0, r7, r3 ldrh r0, [r0] strb r0, [r1] - ldr r1, _08185DC0 - ldr r3, _08185DC4 + ldr r1, =0x0203c7ad + ldr r3, =0x03005d90 ldr r0, [r3] - ldr r2, _08185DC8 + ldr r2, =0x00000ca9 adds r0, r2 ldrb r0, [r0] lsls r0, 30 lsrs r0, 30 strb r0, [r1] - ldr r1, _08185DCC - ldr r2, _08185DD0 + ldr r1, =0x0203c7ae + ldr r2, =0x000004fd adds r0, r7, r2 ldrb r0, [r0] strb r0, [r1] - ldr r1, _08185DD4 + ldr r1, =0x0203c7af adds r2, 0x1 adds r0, r7, r2 ldrb r0, [r0] strb r0, [r1] - ldr r2, _08185DD8 - ldr r1, _08185DDC + ldr r2, =0x0203c7b6 + ldr r1, =0x000004ff adds r0, r7, r1 ldrb r1, [r0] lsls r0, r1, 31 lsrs r0, 31 strb r0, [r2] - ldr r0, _08185DE0 + ldr r0, =0x0203c7b7 lsls r1, 28 lsrs r1, 29 strb r1, [r0] - ldr r1, _08185DE4 + ldr r1, =0x0203c7bc movs r2, 0xA0 lsls r2, 3 adds r0, r7, r2 @@ -797554,14 +770831,14 @@ _08185C2A: str r0, [r1] movs r6, 0 mov r10, r3 - ldr r2, _08185DE8 - ldr r3, _08185DEC - ldr r0, _08185DF0 + ldr r2, =0x0203ccd9 + ldr r3, =0x0203ccda + ldr r0, =0x03001278 mov r8, r0 - ldr r1, _08185DF4 + ldr r1, =0x03001279 mov r9, r1 - ldr r5, _08185DF8 - ldr r0, _08185DFC + ldr r5, =0x0203ccd1 + ldr r0, =0x00000504 adds r4, r7, r0 _08185CE2: adds r0, r6, r5 @@ -797571,15 +770848,15 @@ _08185CE2: adds r6, 0x1 cmp r6, 0x7 ble _08185CE2 - ldr r1, _08185E00 + ldr r1, =0x0000050c adds r0, r7, r1 ldrb r0, [r0] strb r0, [r2] - ldr r2, _08185E04 + ldr r2, =0x0000050d adds r0, r7, r2 ldrb r0, [r0] strb r0, [r3] - ldr r3, _08185E08 + ldr r3, =0x0000051a adds r0, r7, r3 ldrb r0, [r0] mov r1, r8 @@ -797589,9 +770866,9 @@ _08185CE2: ldrb r0, [r0] mov r3, r9 strb r0, [r3] - ldr r0, _08185E0C + ldr r0, =0x0000050e adds r1, r7, r0 - ldr r4, _08185E10 + ldr r4, =0x0203ccdc movs r6, 0x5 _08185D1C: ldrh r0, [r1] @@ -797603,10 +770880,10 @@ _08185D1C: bge _08185D1C mov r1, r10 ldr r2, [r1] - ldr r3, _08185E14 + ldr r3, =0x000004fc adds r0, r7, r3 ldrb r0, [r0] - ldr r1, _08185DC8 + ldr r1, =0x00000ca9 adds r2, r1 movs r1, 0x3 ands r1, r0 @@ -797617,14 +770894,14 @@ _08185D1C: orrs r0, r1 strb r0, [r2] movs r6, 0 - ldr r2, _08185E18 + ldr r2, =0x00000297 mov r10, r2 - ldr r3, _08185E1C + ldr r3, =0x0203bd34 mov r9, r3 movs r0, 0xA6 lsls r0, 2 mov r8, r0 - ldr r1, _08185E20 + ldr r1, =0x0000051c adds r5, r7, r1 _08185D5C: adds r2, r6, 0x1 @@ -797655,43 +770932,7 @@ _08185D6C: pop {r0} bx r0 .align 2, 0 -_08185D90: .4byte 0x020244ec -_08185D94: .4byte 0x02024744 -_08185D98: .4byte 0x020229e8 -_08185D9C: .4byte 0x000004e4 -_08185DA0: .4byte 0x0203bd2c -_08185DA4: .4byte 0x02022fec -_08185DA8: .4byte 0x000004ec -_08185DAC: .4byte 0x02038bca -_08185DB0: .4byte 0x000004f4 -_08185DB4: .4byte 0x02038bcc -_08185DB8: .4byte 0x02038bce -_08185DBC: .4byte 0x0203c7b4 -_08185DC0: .4byte 0x0203c7ad -_08185DC4: .4byte 0x03005d90 -_08185DC8: .4byte 0x00000ca9 -_08185DCC: .4byte 0x0203c7ae -_08185DD0: .4byte 0x000004fd -_08185DD4: .4byte 0x0203c7af -_08185DD8: .4byte 0x0203c7b6 -_08185DDC: .4byte 0x000004ff -_08185DE0: .4byte 0x0203c7b7 -_08185DE4: .4byte 0x0203c7bc -_08185DE8: .4byte 0x0203ccd9 -_08185DEC: .4byte 0x0203ccda -_08185DF0: .4byte 0x03001278 -_08185DF4: .4byte 0x03001279 -_08185DF8: .4byte 0x0203ccd1 -_08185DFC: .4byte 0x00000504 -_08185E00: .4byte 0x0000050c -_08185E04: .4byte 0x0000050d -_08185E08: .4byte 0x0000051a -_08185E0C: .4byte 0x0000050e -_08185E10: .4byte 0x0203ccdc -_08185E14: .4byte 0x000004fc -_08185E18: .4byte 0x00000297 -_08185E1C: .4byte 0x0203bd34 -_08185E20: .4byte 0x0000051c + .pool thumb_func_end sub_8185B60 thumb_func_start sub_8185E24 @@ -797708,23 +770949,23 @@ sub_8185E24: @ 8185E24 bl sub_8185EB8 adds r0, r4, 0 bl sub_8185B60 - ldr r0, _08185E7C + ldr r0, =sub_8185B1C + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08185E80 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 movs r0, 0x80 strh r0, [r1, 0x8] - ldr r0, _08185E84 + ldr r0, =0x0203c7b0 str r5, [r0] movs r0, 0 bl current_map_music_set__default_for_battle - ldr r0, _08185E88 + ldr r0, =sub_8185E8C + 1 bl set_callback2 _08185E6E: adds r0, r4, 0 @@ -797733,10 +770974,7 @@ _08185E6E: pop {r0} bx r0 .align 2, 0 -_08185E7C: .4byte sub_8185B1C + 1 -_08185E80: .4byte 0x03005e00 -_08185E84: .4byte 0x0203c7b0 -_08185E88: .4byte sub_8185E8C + 1 + .pool thumb_func_end sub_8185E24 thumb_func_start sub_8185E8C @@ -797751,39 +770989,39 @@ sub_8185E8C: @ 8185E8C thumb_func_start sub_8185EA0 sub_8185EA0: @ 8185EA0 - ldr r0, _08185EA8 + ldr r0, =0x0203c7ae ldrb r0, [r0] bx lr .align 2, 0 -_08185EA8: .4byte 0x0203c7ae + .pool thumb_func_end sub_8185EA0 thumb_func_start sub_8185EAC sub_8185EAC: @ 8185EAC - ldr r0, _08185EB4 + ldr r0, =0x0203c7af ldrb r0, [r0] bx lr .align 2, 0 -_08185EB4: .4byte 0x0203c7af + .pool thumb_func_end sub_8185EAC thumb_func_start sub_8185EB8 sub_8185EB8: @ 8185EB8 push {r4-r6,lr} movs r5, 0 - ldr r6, _08185EEC + ldr r6, =0x0203c7c0 _08185EBE: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 adds r0, r4, r6 - ldr r1, _08185EF0 + ldr r1, =0x020244ec adds r1, r4, r1 movs r2, 0x64 bl memcpy - ldr r0, _08185EF4 + ldr r0, =0x0203ca18 adds r0, r4, r0 - ldr r1, _08185EF8 + ldr r1, =0x02024744 adds r4, r1 adds r1, r4, 0 movs r2, 0x64 @@ -797795,29 +771033,26 @@ _08185EBE: pop {r0} bx r0 .align 2, 0 -_08185EEC: .4byte 0x0203c7c0 -_08185EF0: .4byte 0x020244ec -_08185EF4: .4byte 0x0203ca18 -_08185EF8: .4byte 0x02024744 + .pool thumb_func_end sub_8185EB8 thumb_func_start sub_8185EFC sub_8185EFC: @ 8185EFC push {r4-r6,lr} movs r5, 0 - ldr r6, _08185F30 + ldr r6, =0x020244ec _08185F02: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 adds r0, r4, r6 - ldr r1, _08185F34 + ldr r1, =0x0203c7c0 adds r1, r4, r1 movs r2, 0x64 bl memcpy - ldr r0, _08185F38 + ldr r0, =0x02024744 adds r0, r4, r0 - ldr r1, _08185F3C + ldr r1, =0x0203ca18 adds r4, r1 adds r1, r4, 0 movs r2, 0x64 @@ -797829,18 +771064,15 @@ _08185F02: pop {r0} bx r0 .align 2, 0 -_08185F30: .4byte 0x020244ec -_08185F34: .4byte 0x0203c7c0 -_08185F38: .4byte 0x02024744 -_08185F3C: .4byte 0x0203ca18 + .pool thumb_func_end sub_8185EFC thumb_func_start sub_8185F40 sub_8185F40: @ 8185F40 push {r4,r5,lr} movs r2, 0 - ldr r0, _08185F6C - ldr r3, _08185F70 + ldr r0, =0x020229e8 + ldr r3, =0x02024064 ldrh r1, [r0, 0x18] adds r4, r0, 0 ldrb r0, [r3] @@ -797862,8 +771094,7 @@ _08185F64: movs r0, 0 b _08185F7E .align 2, 0 -_08185F6C: .4byte 0x020229e8 -_08185F70: .4byte 0x02024064 + .pool _08185F74: lsls r0, r2, 3 subs r0, r2 @@ -797878,19 +771109,19 @@ _08185F7E: thumb_func_start sub_8185F84 sub_8185F84: @ 8185F84 - ldr r1, _08185F8C + ldr r1, =0x0203c7b5 movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_08185F8C: .4byte 0x0203c7b5 + .pool thumb_func_end sub_8185F84 thumb_func_start sub_8185F90 sub_8185F90: @ 8185F90 lsls r0, 16 lsrs r0, 16 - ldr r2, _08185FA8 + ldr r2, =0x0203c7b5 movs r1, 0x80 lsls r1, 8 ands r0, r1 @@ -797901,60 +771132,60 @@ sub_8185F90: @ 8185F90 strb r0, [r2] bx lr .align 2, 0 -_08185FA8: .4byte 0x0203c7b5 + .pool thumb_func_end sub_8185F90 thumb_func_start sub_8185FAC sub_8185FAC: @ 8185FAC - ldr r0, _08185FB4 + ldr r0, =0x0203c7b5 ldrb r0, [r0] bx lr .align 2, 0 -_08185FB4: .4byte 0x0203c7b5 + .pool thumb_func_end sub_8185FAC thumb_func_start sub_8185FB8 sub_8185FB8: @ 8185FB8 - ldr r0, _08185FC0 + ldr r0, =0x0203c7b6 ldrb r0, [r0] bx lr .align 2, 0 -_08185FC0: .4byte 0x0203c7b6 + .pool thumb_func_end sub_8185FB8 thumb_func_start sub_8185FC4 sub_8185FC4: @ 8185FC4 - ldr r0, _08185FCC + ldr r0, =0x0203c7b7 ldrb r0, [r0] bx lr .align 2, 0 -_08185FCC: .4byte 0x0203c7b7 + .pool thumb_func_end sub_8185FC4 thumb_func_start sub_8185FD0 sub_8185FD0: @ 8185FD0 push {r4-r7,lr} - ldr r4, _08186024 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _0818601C - ldr r0, _08186028 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _0818602C + ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 bne _0818601C - ldr r0, _08186030 + ldr r0, =0x0203c7ac ldrb r0, [r0] cmp r0, 0x2 beq _0818601C movs r3, 0 - ldr r7, _08186034 + ldr r7, =0x0203cc70 adds r6, r4, 0 - ldr r5, _08186038 + ldr r5, =0x02024090 movs r4, 0x58 _08186000: lsls r2, r3, 1 @@ -797976,12 +771207,7 @@ _0818601C: pop {r0} bx r0 .align 2, 0 -_08186024: .4byte 0x02024064 -_08186028: .4byte 0x02022fec -_0818602C: .4byte 0x02000002 -_08186030: .4byte 0x0203c7ac -_08186034: .4byte 0x0203cc70 -_08186038: .4byte 0x02024090 + .pool thumb_func_end sub_8185FD0 thumb_func_start sub_818603C @@ -797995,9 +771221,9 @@ sub_818603C: @ 818603C lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x24] - ldr r0, _08186064 + ldr r0, =0x02022fec ldr r0, [r0] - ldr r1, _08186068 + ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 beq _0818605C @@ -798007,8 +771233,7 @@ _0818605C: mov r10, r0 b _081863F2 .align 2, 0 -_08186064: .4byte 0x02022fec -_08186068: .4byte 0x02000002 + .pool _0818606C: mov r1, r10 lsls r4, r1, 24 @@ -798029,7 +771254,7 @@ _0818608A: cmp r3, 0x1 bne _0818611E movs r5, 0 - ldr r4, _08186108 + ldr r4, =0x0203cc70 mov r0, r10 asrs r6, r0, 31 subs r0, r6 @@ -798039,7 +771264,7 @@ _0818608A: movs r1, 0x58 mov r0, r10 muls r0, r1 - ldr r3, _0818610C + ldr r3, =0x02024090 adds r1, r0, r3 _081860AA: ldrh r0, [r1] @@ -798061,7 +771286,7 @@ _081860C2: movs r1, 0x6 bl sub_8184FBC movs r5, 0 - ldr r2, _08186108 + ldr r2, =0x0203cc70 mov r8, r2 movs r3, 0x58 mov r7, r10 @@ -798074,7 +771299,7 @@ _081860DE: lsls r0, r5, 1 adds r5, 0x1 adds r0, r7 - ldr r1, _0818610C + ldr r1, =0x02024090 adds r3, r0, r1 lsls r0, r4, 3 mov r6, r8 @@ -798091,8 +771316,7 @@ _081860F0: bl sub_8184FBC b _08186118 .align 2, 0 -_08186108: .4byte 0x0203cc70 -_0818610C: .4byte 0x02024090 + .pool _08186110: adds r1, 0x2 adds r2, 0x1 @@ -798103,8 +771327,8 @@ _08186118: ble _081860DE b _081863EE _0818611E: - ldr r3, _0818640C - ldr r1, _08186410 + ldr r3, =0x0203bd34 + ldr r1, =0x0203c794 mov r4, r10 lsls r2, r4, 1 adds r1, r2, r1 @@ -798146,7 +771370,7 @@ _08186142: movs r1, 0x58 mov r0, r10 muls r0, r1 - ldr r2, _08186414 + ldr r2, =0x02024084 adds r0, r2 adds r6, r0, 0 adds r6, 0x3B @@ -798165,7 +771389,7 @@ _0818617E: cmp r5, 0x3 ble _0818617E movs r5, 0 - ldr r1, _08186414 + ldr r1, =0x02024084 mov r9, r1 movs r2, 0x58 mov r7, r10 @@ -798190,7 +771414,7 @@ _081861A6: adds r1, r2, r5 ldrb r0, [r4] adds r0, r7 - ldr r3, _08186418 + ldr r3, =0x020240a8 adds r0, r3 ldrb r0, [r0] strb r0, [r1] @@ -798206,11 +771430,11 @@ _081861A6: mov r1, r10 subs r0, r2, r1 lsls r0, 2 - ldr r2, _0818641C + ldr r2, =0x020242bc adds r0, r2 ldrb r1, [r0, 0x18] lsrs r1, 4 - ldr r2, _08186420 + ldr r2, =0x0832a328 lsls r0, r5, 2 adds r0, r2 ldr r0, [r0] @@ -798227,7 +771451,7 @@ _081861A6: negs r3, r3 add r3, r8 mov r12, r3 - ldr r4, _0818641C + ldr r4, =0x020242bc mov r9, r4 movs r6, 0x58 mov r1, r10 @@ -798271,10 +771495,10 @@ _0818622C: ands r0, r1 strb r0, [r2, 0x18] movs r5, 0 - ldr r1, _08186414 + ldr r1, =0x02024084 adds r4, r1 adds r4, 0x3B - ldr r0, _0818641C + ldr r0, =0x020242bc adds r6, r3, r0 _08186274: ldr r2, [sp, 0x3C] @@ -798318,14 +771542,14 @@ _081862BC: mov r3, sp adds r3, 0x20 str r3, [sp, 0x40] - ldr r0, _08186424 + ldr r0, =0x0202406e ldr r4, [sp, 0x44] adds r6, r4, r0 _081862CA: ldrh r1, [r6] movs r0, 0x64 muls r0, r1 - ldr r4, _08186428 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x15 movs r2, 0 @@ -798342,7 +771566,7 @@ _081862CA: cmp r5, 0x3 ble _081862CA movs r5, 0 - ldr r0, _08186424 + ldr r0, =0x0202406e ldr r2, [sp, 0x44] adds r7, r2, r0 movs r3, 0x64 @@ -798385,12 +771609,12 @@ _08186304: cmp r5, 0x3 ble _08186304 movs r5, 0 - ldr r0, _08186424 + ldr r0, =0x0202406e ldr r1, [sp, 0x44] adds r7, r1, r0 movs r2, 0x64 mov r9, r2 - ldr r3, _08186428 + ldr r3, =0x020244ec mov r8, r3 ldr r6, [sp, 0x30] adds r6, 0x8 @@ -798423,8 +771647,8 @@ _08186360: ldr r3, [sp, 0x40] strb r0, [r3] movs r5, 0 - ldr r4, _08186424 - ldr r6, _08186428 + ldr r4, =0x0202406e + ldr r6, =0x020244ec ldr r3, [sp, 0x3C] ldr r2, [sp, 0x40] _081863A2: @@ -798448,10 +771672,10 @@ _081863A2: ldr r2, [sp, 0x40] bl pokemon_setattr _081863CA: - ldr r2, _0818642C + ldr r2, =0x02024274 ldr r3, [sp, 0x44] adds r2, r3, r2 - ldr r0, _08186430 + ldr r0, =0x0202449c ldr r0, [r0] add r0, r10 adds r0, 0x80 @@ -798461,7 +771685,7 @@ _081863CA: mov r1, r10 muls r1, r4 adds r0, r1 - ldr r1, _08186414 + ldr r1, =0x02024084 adds r1, 0xC adds r0, r1 ldrh r0, [r0] @@ -798470,7 +771694,7 @@ _081863EE: ldr r6, [sp, 0x38] mov r10, r6 _081863F2: - ldr r0, _08186434 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 bge _081863FC @@ -798485,43 +771709,33 @@ _081863FC: pop {r0} bx r0 .align 2, 0 -_0818640C: .4byte 0x0203bd34 -_08186410: .4byte 0x0203c794 -_08186414: .4byte 0x02024084 -_08186418: .4byte 0x020240a8 -_0818641C: .4byte 0x020242bc -_08186420: .4byte 0x0832a328 -_08186424: .4byte 0x0202406e -_08186428: .4byte 0x020244ec -_0818642C: .4byte 0x02024274 -_08186430: .4byte 0x0202449c -_08186434: .4byte 0x0202406c + .pool thumb_func_end sub_818603C thumb_func_start sub_8186438 sub_8186438: @ 8186438 - ldr r0, _08186440 + ldr r0, =0x0203c7bc ldr r0, [r0] bx lr .align 2, 0 -_08186440: .4byte 0x0203c7bc + .pool thumb_func_end sub_8186438 thumb_func_start sub_8186444 sub_8186444: @ 8186444 - ldr r1, _0818644C + ldr r1, =0x0203ccd0 movs r0, 0x1 strb r0, [r1] bx lr .align 2, 0 -_0818644C: .4byte 0x0203ccd0 + .pool thumb_func_end sub_8186444 thumb_func_start rfu_lacks_rfufunc rfu_lacks_rfufunc: @ 8186450 push {lr} movs r1, 0 - ldr r0, _08186464 + ldr r0, =0x0203ccd0 ldrb r0, [r0] cmp r0, 0 bne _0818645E @@ -798531,7 +771745,7 @@ _0818645E: pop {r1} bx r1 .align 2, 0 -_08186464: .4byte 0x0203ccd0 + .pool thumb_func_end rfu_lacks_rfufunc thumb_func_start sub_8186468 @@ -798539,8 +771753,8 @@ sub_8186468: @ 8186468 push {r4,r5,lr} adds r3, r0, 0 movs r2, 0 - ldr r5, _08186494 - ldr r4, _08186498 + ldr r5, =0x03001278 + ldr r4, =0x0203ccd1 _08186472: adds r0, r3, r2 adds r1, r2, r4 @@ -798558,64 +771772,62 @@ _08186472: pop {r0} bx r0 .align 2, 0 -_08186494: .4byte 0x03001278 -_08186498: .4byte 0x0203ccd1 + .pool thumb_func_end sub_8186468 thumb_func_start sub_818649C sub_818649C: @ 818649C - ldr r0, _081864A4 + ldr r0, =0x0203ccd9 ldrb r0, [r0] bx lr .align 2, 0 -_081864A4: .4byte 0x0203ccd9 + .pool thumb_func_end sub_818649C thumb_func_start sub_81864A8 sub_81864A8: @ 81864A8 - ldr r0, _081864B0 + ldr r0, =0x0203ccda ldrb r0, [r0] bx lr .align 2, 0 -_081864B0: .4byte 0x0203ccda + .pool thumb_func_end sub_81864A8 thumb_func_start sub_81864B4 sub_81864B4: @ 81864B4 - ldr r0, _081864BC + ldr r0, =0x03001278 ldrb r0, [r0] bx lr .align 2, 0 -_081864BC: .4byte 0x03001278 + .pool thumb_func_end sub_81864B4 thumb_func_start sub_81864C0 sub_81864C0: @ 81864C0 - ldr r0, _081864C8 + ldr r0, =0x03001279 ldrb r0, [r0] bx lr .align 2, 0 -_081864C8: .4byte 0x03001279 + .pool thumb_func_end sub_81864C0 thumb_func_start sub_81864CC sub_81864CC: @ 81864CC - ldr r0, _081864D8 - ldr r1, _081864DC + ldr r0, =0x0203cce8 + ldr r1, =0x0202433a ldrb r1, [r1] strb r1, [r0] bx lr .align 2, 0 -_081864D8: .4byte 0x0203cce8 -_081864DC: .4byte 0x0202433a + .pool thumb_func_end sub_81864CC thumb_func_start sub_81864E0 sub_81864E0: @ 81864E0 - ldr r0, _081864E4 + ldr r0, =0x0203ccdc bx lr .align 2, 0 -_081864E4: .4byte 0x0203ccdc + .pool thumb_func_end sub_81864E0 thumb_func_start nullsub_70 @@ -798625,26 +771837,24 @@ nullsub_70: @ 81864E8 thumb_func_start sub_81864EC sub_81864EC: @ 81864EC - ldr r1, _081864FC - ldr r0, _08186500 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08186504 + ldr r1, =sub_8186508 + 1 str r1, [r0] bx lr .align 2, 0 -_081864FC: .4byte 0x03005d60 -_08186500: .4byte 0x02024064 -_08186504: .4byte sub_8186508 + 1 + .pool thumb_func_end sub_81864EC thumb_func_start sub_8186508 sub_8186508: @ 8186508 push {lr} - ldr r2, _0818653C - ldr r1, _08186540 - ldr r0, _08186544 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -798653,13 +771863,13 @@ sub_8186508: @ 8186508 ands r1, r0 cmp r1, 0 beq _08186554 - ldr r0, _08186548 + ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _08186550 - ldr r0, _0818654C + ldr r0, =0x0860ae90 ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -798667,11 +771877,7 @@ sub_8186508: @ 8186508 bl _call_via_r0 b _08186554 .align 2, 0 -_0818653C: .4byte 0x02024068 -_08186540: .4byte 0x0832a328 -_08186544: .4byte 0x02024064 -_08186548: .4byte 0x02023064 -_0818654C: .4byte 0x0860ae90 + .pool _08186550: bl sub_81871AC _08186554: @@ -798682,9 +771888,9 @@ _08186554: thumb_func_start sub_8186558 sub_8186558: @ 8186558 push {lr} - ldr r2, _08186580 - ldr r1, _08186584 - ldr r0, _08186588 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -798694,7 +771900,7 @@ sub_8186558: @ 8186558 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0818658C + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0818657C bl sub_81871AC @@ -798702,18 +771908,15 @@ _0818657C: pop {r0} bx r0 .align 2, 0 -_08186580: .4byte 0x02020630 -_08186584: .4byte 0x020241e4 -_08186588: .4byte 0x02024064 -_0818658C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8186558 thumb_func_start sub_8186590 sub_8186590: @ 8186590 push {lr} - ldr r2, _081865B8 - ldr r1, _081865BC - ldr r0, _081865C0 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -798723,7 +771926,7 @@ sub_8186590: @ 8186590 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081865C4 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _081865B4 bl sub_81871AC @@ -798731,18 +771934,15 @@ _081865B4: pop {r0} bx r0 .align 2, 0 -_081865B8: .4byte 0x02020630 -_081865BC: .4byte 0x020241e4 -_081865C0: .4byte 0x02024064 -_081865C4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_8186590 thumb_func_start sub_81865C8 sub_81865C8: @ 81865C8 push {r4-r6,lr} - ldr r5, _08186620 - ldr r6, _08186624 - ldr r4, _08186628 + ldr r5, =0x02020630 + ldr r6, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] @@ -798753,7 +771953,7 @@ sub_81865C8: @ 81865C8 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, _0818662C + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0818661A adds r0, r2, r5 @@ -798781,18 +771981,15 @@ _0818661A: pop {r0} bx r0 .align 2, 0 -_08186620: .4byte 0x02020630 -_08186624: .4byte 0x020241e4 -_08186628: .4byte 0x02024064 -_0818662C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81865C8 thumb_func_start sub_8186630 sub_8186630: @ 8186630 push {r4,lr} - ldr r4, _08186670 + ldr r4, =0x020244d0 ldr r1, [r4] - ldr r3, _08186674 + ldr r3, =0x02024064 ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -798821,8 +772018,7 @@ _08186668: pop {r0} bx r0 .align 2, 0 -_08186670: .4byte 0x020244d0 -_08186674: .4byte 0x02024064 + .pool thumb_func_end sub_8186630 thumb_func_start sub_8186678 @@ -798841,16 +772037,16 @@ sub_8186678: @ 8186678 lsls r0, 24 cmp r0, 0 beq _081866F8 - ldr r0, _081866E0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _081866F8 _081866A4: - ldr r4, _081866E4 - ldr r0, _081866E8 - ldr r2, _081866EC + ldr r4, =0x02020630 + ldr r0, =0x03005d70 + ldr r2, =0x02024064 ldrb r3, [r2] adds r0, r3, r0 ldrb r1, [r0] @@ -798861,11 +772057,11 @@ _081866A4: adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _081866F0 + ldr r0, =nullsub_12 + 1 mov r8, r2 cmp r1, r0 bne _08186764 - ldr r0, _081866F4 + ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -798879,16 +772075,11 @@ _081866A4: bge _08186764 b _0818676A .align 2, 0 -_081866E0: .4byte 0x02022fec -_081866E4: .4byte 0x02020630 -_081866E8: .4byte 0x03005d70 -_081866EC: .4byte 0x02024064 -_081866F0: .4byte nullsub_12 + 1 -_081866F4: .4byte 0x020241e4 + .pool _081866F8: - ldr r6, _08186848 - ldr r7, _0818684C - ldr r2, _08186850 + ldr r6, =0x02020630 + ldr r7, =0x03005d70 + ldr r2, =0x02024064 ldrb r3, [r2] adds r0, r3, r7 ldrb r1, [r0] @@ -798899,7 +772090,7 @@ _081866F8: adds r5, 0x1C adds r0, r5 ldr r4, [r0] - ldr r0, _08186854 + ldr r0, =nullsub_12 + 1 mov r8, r2 cmp r4, r0 bne _08186764 @@ -798915,7 +772106,7 @@ _081866F8: ldr r0, [r0] cmp r0, r4 bne _08186764 - ldr r4, _08186858 + ldr r4, =0x020241e4 adds r0, r3, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -798952,7 +772143,7 @@ _0818676A: lsrs r3, r0, 24 cmp r3, 0x1 bne _08186816 - ldr r0, _0818685C + ldr r0, =0x020244d0 mov r12, r0 ldr r0, [r0] ldrb r2, [r6] @@ -799023,13 +772214,13 @@ _0818676A: ldrb r1, [r0, 0x1] ands r4, r1 strb r4, [r0, 0x1] - ldr r4, _08186860 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag _08186816: - ldr r0, _0818685C + ldr r0, =0x020244d0 ldr r0, [r0] mov r2, r8 ldrb r1, [r2] @@ -799040,12 +772231,12 @@ _08186816: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, _08186864 + ldr r1, =0x03005d60 mov r2, r8 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _08186868 + ldr r1, =sub_8186630 + 1 str r1, [r0] _0818683A: pop {r3,r4} @@ -799055,15 +772246,7 @@ _0818683A: pop {r0} bx r0 .align 2, 0 -_08186848: .4byte 0x02020630 -_0818684C: .4byte 0x03005d70 -_08186850: .4byte 0x02024064 -_08186854: .4byte nullsub_12 + 1 -_08186858: .4byte 0x020241e4 -_0818685C: .4byte 0x020244d0 -_08186860: .4byte 0x000027f9 -_08186864: .4byte 0x03005d60 -_08186868: .4byte sub_8186630 + 1 + .pool thumb_func_end sub_8186678 thumb_func_start sub_818686C @@ -799075,9 +772258,9 @@ sub_818686C: @ 818686C movs r0, 0 mov r9, r0 mov r8, r0 - ldr r4, _08186A24 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r7, _08186A28 + ldr r7, =0x02024064 ldrb r2, [r7] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -799090,12 +772273,12 @@ sub_818686C: @ 818686C ands r0, r1 cmp r0, 0 bne _081868AC - ldr r0, _08186A2C + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08186A30 + ldr r0, =0x02024744 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 @@ -799115,12 +772298,12 @@ _081868AC: ands r0, r1 cmp r0, 0 bne _081868DE - ldr r0, _08186A2C + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08186A30 + ldr r0, =0x02024744 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 @@ -799158,25 +772341,25 @@ _081868DE: lsls r0, 24 cmp r0, 0 beq _08186964 - ldr r0, _08186A34 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _08186964 - ldr r4, _08186A38 + ldr r4, =0x03005d70 ldrb r0, [r7] adds r1, r6, 0 eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _08186A2C + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08186A30 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -799189,18 +772372,18 @@ _081868DE: ldrb r0, [r0] bl sub_80729D0 _08186964: - ldr r5, _08186A38 - ldr r4, _08186A28 + ldr r5, =0x03005d70 + ldr r4, =0x02024064 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _08186A2C + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08186A30 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -799211,9 +772394,9 @@ _08186964: ldrb r0, [r0] bl sub_80729D0 _08186994: - ldr r0, _08186A24 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08186A28 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -799225,9 +772408,9 @@ _08186994: orrs r1, r2 strb r1, [r0, 0x1] _081869AE: - ldr r5, _08186A24 + ldr r5, =0x020244d0 ldr r0, [r5] - ldr r4, _08186A28 + ldr r4, =0x02024064 ldrb r2, [r4] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -799266,7 +772449,7 @@ _081869AE: ands r0, r1 cmp r0, 0 bne _08186A4C - ldr r0, _08186A34 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 @@ -799278,27 +772461,21 @@ _081869AE: lsrs r0, 24 cmp r0, 0x1 bne _08186A4C - ldr r0, _08186A3C + ldr r0, =0x03007420 bl m4aMPlayContinue b _08186A4C .align 2, 0 -_08186A24: .4byte 0x020244d0 -_08186A28: .4byte 0x02024064 -_08186A2C: .4byte 0x0202406e -_08186A30: .4byte 0x02024744 -_08186A34: .4byte 0x02022fec -_08186A38: .4byte 0x03005d70 -_08186A3C: .4byte 0x03007420 + .pool _08186A40: - ldr r0, _08186AA8 - ldr r1, _08186AAC + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl _08186A4C: - ldr r0, _08186AB0 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08186AB4 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -799316,9 +772493,9 @@ _08186A6A: lsls r0, 24 cmp r0, 0 bne _08186AC8 - ldr r2, _08186AB8 - ldr r0, _08186ABC - ldr r1, _08186AB4 + ldr r2, =0x02020630 + ldr r0, =0x03005d7c + ldr r1, =0x02024064 ldrb r4, [r1] adds r0, r4, r0 ldrb r1, [r0] @@ -799328,10 +772505,10 @@ _08186A6A: adds r2, 0x1C adds r0, r2 ldr r3, [r0] - ldr r0, _08186AC0 + ldr r0, =nullsub_12 + 1 cmp r3, r0 bne _08186B26 - ldr r0, _08186AC4 + ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -799343,18 +772520,11 @@ _08186A6A: bne _08186B26 b _08186B22 .align 2, 0 -_08186AA8: .4byte 0x03007420 -_08186AAC: .4byte 0x0000ffff -_08186AB0: .4byte 0x020244d0 -_08186AB4: .4byte 0x02024064 -_08186AB8: .4byte 0x02020630 -_08186ABC: .4byte 0x03005d7c -_08186AC0: .4byte nullsub_12 + 1 -_08186AC4: .4byte 0x020241e4 + .pool _08186AC8: - ldr r2, _08186C1C - ldr r7, _08186C20 - ldr r0, _08186C24 + ldr r2, =0x02020630 + ldr r7, =0x03005d7c + ldr r0, =0x02024064 ldrb r3, [r0] adds r0, r3, r7 ldrb r1, [r0] @@ -799364,10 +772534,10 @@ _08186AC8: adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, _08186C28 + ldr r0, =nullsub_12 + 1 cmp r4, r0 bne _08186B26 - ldr r6, _08186C2C + ldr r6, =0x020241e4 adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -799411,14 +772581,14 @@ _08186B26: lsls r0, 24 cmp r0, 0 beq _08186B8A - ldr r0, _08186C30 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _08186B8A - ldr r1, _08186C20 - ldr r5, _08186C24 + ldr r1, =0x03005d7c + ldr r5, =0x02024064 ldrb r0, [r5] movs r4, 0x2 eors r0, r4 @@ -799427,18 +772597,18 @@ _08186B26: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08186C1C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles ldrb r0, [r5] eors r4, r0 - ldr r1, _08186C34 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08186C38 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -799448,25 +772618,25 @@ _08186B26: adds r0, r4, 0 bl sub_805EE54 _08186B8A: - ldr r1, _08186C20 - ldr r4, _08186C24 + ldr r1, =0x03005d7c + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08186C1C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles ldrb r5, [r4] - ldr r1, _08186C34 + ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08186C38 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -799475,7 +772645,7 @@ _08186B8A: lsrs r1, 16 adds r0, r5, 0 bl sub_805EE54 - ldr r3, _08186C3C + ldr r3, =0x020244d0 ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r1, [r2, 0x9] @@ -799506,11 +772676,11 @@ _08186B8A: movs r0, 0x7F ands r0, r2 strb r0, [r1, 0x1] - ldr r1, _08186C40 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08186C44 + ldr r1, =sub_8186678 + 1 str r1, [r0] _08186C10: pop {r3,r4} @@ -799520,25 +772690,15 @@ _08186C10: pop {r0} bx r0 .align 2, 0 -_08186C1C: .4byte 0x02020630 -_08186C20: .4byte 0x03005d7c -_08186C24: .4byte 0x02024064 -_08186C28: .4byte nullsub_12 + 1 -_08186C2C: .4byte 0x020241e4 -_08186C30: .4byte 0x02022fec -_08186C34: .4byte 0x0202406e -_08186C38: .4byte 0x02024744 -_08186C3C: .4byte 0x020244d0 -_08186C40: .4byte 0x03005d60 -_08186C44: .4byte sub_8186678 + 1 + .pool thumb_func_end sub_818686C thumb_func_start sub_8186C48 sub_8186C48: @ 8186C48 push {r4-r7,lr} - ldr r4, _08186CA4 - ldr r0, _08186CA8 - ldr r7, _08186CAC + ldr r4, =0x02020630 + ldr r0, =0x020241e4 + ldr r7, =0x02024064 ldrb r3, [r7] adds r0, r3, r0 ldrb r1, [r0] @@ -799549,7 +772709,7 @@ sub_8186C48: @ 8186C48 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, _08186CB0 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08186CFA adds r0, r2, r4 @@ -799557,7 +772717,7 @@ sub_8186C48: @ 8186C48 ldrsh r0, [r0, r1] cmp r0, 0 bne _08186CFA - ldr r6, _08186CB4 + ldr r6, =0x020244d0 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r4, r3, 1 @@ -799569,24 +772729,18 @@ sub_8186C48: @ 8186C48 ands r0, r5 cmp r0, 0 bne _08186CC0 - ldr r0, _08186CB8 + ldr r0, =0x0202406e adds r0, r4, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08186CBC + ldr r0, =0x02024744 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 b _08186CFA .align 2, 0 -_08186CA4: .4byte 0x02020630 -_08186CA8: .4byte 0x020241e4 -_08186CAC: .4byte 0x02024064 -_08186CB0: .4byte nullsub_12 + 1 -_08186CB4: .4byte 0x020244d0 -_08186CB8: .4byte 0x0202406e -_08186CBC: .4byte 0x02024744 + .pool _08186CC0: ldrb r1, [r2, 0x1] movs r0, 0x1 @@ -799608,7 +772762,7 @@ _08186CC0: negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r4, _08186D00 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -799619,15 +772773,15 @@ _08186CFA: pop {r0} bx r0 .align 2, 0 -_08186D00: .4byte 0x000027f9 + .pool thumb_func_end sub_8186C48 thumb_func_start sub_8186D04 sub_8186D04: @ 8186D04 push {r4-r6,lr} - ldr r6, _08186D44 + ldr r6, =0x02024064 ldrb r0, [r6] - ldr r5, _08186D48 + ldr r5, =0x03005d70 adds r1, r0, r5 ldrb r1, [r1] movs r2, 0 @@ -799653,8 +772807,7 @@ sub_8186D04: @ 8186D04 bl heathbar_draw_hp b _08186D50 .align 2, 0 -_08186D44: .4byte 0x02024064 -_08186D48: .4byte 0x03005d70 + .pool _08186D4C: bl sub_81871AC _08186D50: @@ -799666,9 +772819,9 @@ _08186D50: thumb_func_start sub_8186D58 sub_8186D58: @ 8186D58 push {lr} - ldr r2, _08186D8C - ldr r0, _08186D90 - ldr r1, _08186D94 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 + ldr r1, =0x02024064 ldrb r3, [r1] adds r0, r3, r0 ldrb r1, [r0] @@ -799681,7 +772834,7 @@ sub_8186D58: @ 8186D58 lsls r0, 31 cmp r0, 0 bne _08186D86 - ldr r0, _08186D98 + ldr r0, =0x03005d70 adds r0, r3, r0 ldrb r0, [r0] bl sub_8072984 @@ -799690,18 +772843,15 @@ _08186D86: pop {r0} bx r0 .align 2, 0 -_08186D8C: .4byte 0x02020630 -_08186D90: .4byte 0x020241e4 -_08186D94: .4byte 0x02024064 -_08186D98: .4byte 0x03005d70 + .pool thumb_func_end sub_8186D58 thumb_func_start sub_8186D9C sub_8186D9C: @ 8186D9C push {r4-r6,lr} - ldr r0, _08186DFC + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r6, _08186E00 + ldr r6, =0x02024064 ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -799713,13 +772863,13 @@ sub_8186D9C: @ 8186D9C ands r0, r1 cmp r0, 0 bne _08186DF6 - ldr r5, _08186E04 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08186E08 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -799732,7 +772882,7 @@ sub_8186D9C: @ 8186D9C bl obj_delete_and_free_tiles ldrb r0, [r6] bl sub_805EEE0 - ldr r1, _08186E0C + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -799743,11 +772893,7 @@ _08186DF6: pop {r0} bx r0 .align 2, 0 -_08186DFC: .4byte 0x020244d0 -_08186E00: .4byte 0x02024064 -_08186E04: .4byte 0x020241e4 -_08186E08: .4byte 0x02020630 -_08186E0C: .4byte 0x03005d70 + .pool thumb_func_end sub_8186D9C thumb_func_start sub_8186E10 @@ -799767,12 +772913,12 @@ _08186E22: thumb_func_start bx_blink_t2 bx_blink_t2: @ 8186E28 push {r4,lr} - ldr r1, _08186E64 - ldr r0, _08186E68 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _08186E6C + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -799790,15 +772936,12 @@ bx_blink_t2: @ 8186E28 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, _08186E70 + ldr r0, =0x020244b9 strb r3, [r0] bl sub_81871AC b _08186E9E .align 2, 0 -_08186E64: .4byte 0x020241e4 -_08186E68: .4byte 0x02024064 -_08186E6C: .4byte 0x02020630 -_08186E70: .4byte 0x020244b9 + .pool _08186E74: ldrh r0, [r4, 0x30] movs r1, 0x3 @@ -799831,9 +772974,9 @@ _08186E9E: thumb_func_start sub_8186EA4 sub_8186EA4: @ 8186EA4 push {r4,lr} - ldr r2, _08186EF8 - ldr r0, _08186EFC - ldr r4, _08186F00 + ldr r2, =0x02020630 + ldr r0, =0x03005d70 + ldr r4, =0x02024064 ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -799843,10 +772986,10 @@ sub_8186EA4: @ 8186EA4 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08186F04 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08186EF0 - ldr r0, _08186F08 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] lsls r0, r3, 2 @@ -799862,32 +773005,26 @@ sub_8186EA4: @ 8186EA4 movs r3, 0x6 bl move_anim_start_t4 _08186EE4: - ldr r0, _08186F0C + ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, _08186F10 + ldr r0, =sub_8186F14 + 1 str r0, [r1] _08186EF0: pop {r4} pop {r0} bx r0 .align 2, 0 -_08186EF8: .4byte 0x02020630 -_08186EFC: .4byte 0x03005d70 -_08186F00: .4byte 0x02024064 -_08186F04: .4byte nullsub_12 + 1 -_08186F08: .4byte 0x020244d0 -_08186F0C: .4byte 0x03005d60 -_08186F10: .4byte sub_8186F14 + 1 + .pool thumb_func_end sub_8186EA4 thumb_func_start sub_8186F14 sub_8186F14: @ 8186F14 push {r4,lr} - ldr r0, _08186F74 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r4, _08186F78 + ldr r4, =0x02024064 ldrb r1, [r4] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -799903,8 +773040,8 @@ sub_8186F14: @ 8186F14 lsls r0, 24 cmp r0, 0 bne _08186F6E - ldr r2, _08186F7C - ldr r1, _08186F80 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -799914,15 +773051,15 @@ sub_8186F14: @ 8186F14 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08186F84 + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _08186F5E - ldr r0, _08186F88 + ldr r0, =nullsub_18 + 1 cmp r1, r0 bne _08186F6E _08186F5E: - ldr r0, _08186F8C - ldr r1, _08186F90 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl @@ -799932,22 +773069,15 @@ _08186F6E: pop {r0} bx r0 .align 2, 0 -_08186F74: .4byte 0x020244d0 -_08186F78: .4byte 0x02024064 -_08186F7C: .4byte 0x02020630 -_08186F80: .4byte 0x020241e4 -_08186F84: .4byte nullsub_12 + 1 -_08186F88: .4byte nullsub_18 + 1 -_08186F8C: .4byte 0x03007420 -_08186F90: .4byte 0x0000ffff + .pool thumb_func_end sub_8186F14 thumb_func_start sub_8186F94 sub_8186F94: @ 8186F94 push {r4-r7,lr} - ldr r4, _08187058 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r5, _0818705C + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -799959,8 +773089,8 @@ sub_8186F94: @ 8186F94 ands r0, r1 cmp r0, 0 beq _08187050 - ldr r7, _08187060 - ldr r6, _08187064 + ldr r7, =0x02020630 + ldr r6, =0x020241e4 adds r0, r2, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -799970,7 +773100,7 @@ sub_8186F94: @ 8186F94 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _08187068 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08187050 ldrb r1, [r3] @@ -799989,7 +773119,7 @@ sub_8186F94: @ 8186F94 negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r4, _0818706C + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -800003,17 +773133,17 @@ sub_8186F94: @ 8186F94 adds r0, r7 movs r1, 0 bl obj_anim_image_start - ldr r4, _08187070 + ldr r4, =0x03005d70 ldrb r1, [r5] adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _08187074 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08187078 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -800025,36 +773155,26 @@ sub_8186F94: @ 8186F94 bl sub_80729D0 ldrb r0, [r5] bl sub_805E408 - ldr r1, _0818707C + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08187080 + ldr r1, =sub_8186EA4 + 1 str r1, [r0] _08187050: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08187058: .4byte 0x020244d0 -_0818705C: .4byte 0x02024064 -_08187060: .4byte 0x02020630 -_08187064: .4byte 0x020241e4 -_08187068: .4byte nullsub_12 + 1 -_0818706C: .4byte 0x000027f9 -_08187070: .4byte 0x03005d70 -_08187074: .4byte 0x0202406e -_08187078: .4byte 0x02024744 -_0818707C: .4byte 0x03005d60 -_08187080: .4byte sub_8186EA4 + 1 + .pool thumb_func_end sub_8186F94 thumb_func_start sub_8187084 sub_8187084: @ 8187084 push {r4-r6,lr} - ldr r6, _08187128 + ldr r6, =0x020244d0 ldr r0, [r6] - ldr r5, _0818712C + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -800066,18 +773186,18 @@ sub_8187084: @ 8187084 ands r0, r1 cmp r0, 0 bne _081870B6 - ldr r0, _08187130 + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08187134 + ldr r0, =0x02024744 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 _081870B6: - ldr r4, _08187138 - ldr r0, _0818713C + ldr r4, =0x02020630 + ldr r0, =0x03005d7c ldrb r2, [r5] adds r0, r2, r0 ldrb r1, [r0] @@ -800088,7 +773208,7 @@ _081870B6: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _08187140 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08187120 ldr r0, [r6] @@ -800105,13 +773225,13 @@ _081870B6: adds r0, r3, r4 bl obj_delete_and_free_tiles ldrb r4, [r5] - ldr r1, _08187130 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08187134 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -800120,34 +773240,26 @@ _081870B6: lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, _08187144 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08187148 + ldr r1, =sub_8186F94 + 1 str r1, [r0] _08187120: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08187128: .4byte 0x020244d0 -_0818712C: .4byte 0x02024064 -_08187130: .4byte 0x0202406e -_08187134: .4byte 0x02024744 -_08187138: .4byte 0x02020630 -_0818713C: .4byte 0x03005d7c -_08187140: .4byte nullsub_12 + 1 -_08187144: .4byte 0x03005d60 -_08187148: .4byte sub_8186F94 + 1 + .pool thumb_func_end sub_8187084 thumb_func_start sub_818714C sub_818714C: @ 818714C push {lr} - ldr r0, _08187174 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08187178 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -800164,16 +773276,15 @@ _0818716E: pop {r0} bx r0 .align 2, 0 -_08187174: .4byte 0x020244d0 -_08187178: .4byte 0x02024064 + .pool thumb_func_end sub_818714C thumb_func_start sub_818717C sub_818717C: @ 818717C push {lr} - ldr r0, _081871A4 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _081871A8 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -800190,22 +773301,21 @@ _0818719E: pop {r0} bx r0 .align 2, 0 -_081871A4: .4byte 0x020244d0 -_081871A8: .4byte 0x02024064 + .pool thumb_func_end sub_818717C thumb_func_start sub_81871AC sub_81871AC: @ 81871AC push {r4,lr} sub sp, 0x4 - ldr r1, _081871EC - ldr r4, _081871F0 + ldr r1, =0x03005d60 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _081871F4 + ldr r1, =sub_8186508 + 1 str r1, [r0] - ldr r0, _081871F8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -800218,7 +773328,7 @@ sub_81871AC: @ 81871AC movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _081871FC + ldr r1, =0x02023064 ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -800226,14 +773336,10 @@ sub_81871AC: @ 81871AC strb r1, [r0] b _08187212 .align 2, 0 -_081871EC: .4byte 0x03005d60 -_081871F0: .4byte 0x02024064 -_081871F4: .4byte sub_8186508 + 1 -_081871F8: .4byte 0x02022fec -_081871FC: .4byte 0x02023064 + .pool _08187200: - ldr r2, _0818721C - ldr r1, _08187220 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -800247,8 +773353,7 @@ _08187212: pop {r0} bx r0 .align 2, 0 -_0818721C: .4byte 0x02024068 -_08187220: .4byte 0x0832a328 + .pool thumb_func_end sub_81871AC thumb_func_start sub_8187224 @@ -800256,8 +773361,8 @@ sub_8187224: @ 8187224 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _08187250 - ldr r0, _08187254 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -800265,7 +773370,7 @@ sub_8187224: @ 8187224 ldrb r0, [r1] cmp r0, 0 bne _0818725C - ldr r0, _08187258 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -800274,9 +773379,7 @@ sub_8187224: @ 8187224 adds r6, r0, 0 b _0818727E .align 2, 0 -_08187250: .4byte 0x02023064 -_08187254: .4byte 0x02024064 -_08187258: .4byte 0x0202406e + .pool _0818725C: ldrb r4, [r1] movs r5, 0 @@ -800321,8 +773424,8 @@ sub_8187298: @ 8187298 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _081872CC - ldr r3, _081872D0 + ldr r2, =0x02023064 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -800333,14 +773436,12 @@ sub_8187298: @ 8187298 bl _08187A2E _081872C2: lsls r0, 2 - ldr r1, _081872D4 + ldr r1, =_081872D8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081872CC: .4byte 0x02023064 -_081872D0: .4byte 0x02024064 -_081872D4: .4byte _081872D8 + .pool .align 2, 0 _081872D8: .4byte _081873C8 @@ -800407,7 +773508,7 @@ _081873C8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081875DC + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -800460,7 +773561,7 @@ _08187414: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081875DC + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -800496,7 +773597,7 @@ _08187414: ands r0, r6 lsls r0, 5 ldrh r2, [r3, 0x14] - ldr r1, _081875E0 + ldr r1, =0xfffffc1f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x14] @@ -800519,7 +773620,7 @@ _08187414: ands r1, r0 lsls r1, 15 ldr r0, [sp, 0x14] - ldr r2, _081875E4 + ldr r2, =0xfff07fff ands r0, r2 orrs r0, r1 str r0, [sp, 0x14] @@ -800530,7 +773631,7 @@ _08187414: ands r0, r6 lsls r0, 4 ldrh r2, [r3, 0x16] - ldr r1, _081875E8 + ldr r1, =0xfffffe0f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x16] @@ -800644,28 +773745,25 @@ _081875CC: bls _081875CC b _08187A2E .align 2, 0 -_081875DC: .4byte 0x02024744 -_081875E0: .4byte 0xfffffc1f -_081875E4: .4byte 0xfff07fff -_081875E8: .4byte 0xfffffe0f + .pool _081875EC: movs r0, 0x64 muls r0, r5 - ldr r1, _081875F8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB b _08187966 .align 2, 0 -_081875F8: .4byte 0x02024744 + .pool _081875FC: movs r0, 0x64 muls r0, r5 - ldr r1, _08187608 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xC b _08187966 .align 2, 0 -_08187608: .4byte 0x02024744 + .pool _0818760C: movs r6, 0 add r2, sp, 0x58 @@ -800675,7 +773773,7 @@ _0818760C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08187670 + ldr r0, =0x02024744 adds r4, r1, r0 mov r8, r9 _08187622: @@ -800699,7 +773797,7 @@ _08187622: ble _08187622 movs r0, 0x64 muls r0, r5 - ldr r1, _08187670 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -800717,11 +773815,11 @@ _08187660: bls _08187660 b _08187A2E .align 2, 0 -_08187670: .4byte 0x02024744 + .pool _08187674: movs r0, 0x64 muls r0, r5 - ldr r1, _0818768C + ldr r1, =0x02024744 adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -800731,13 +773829,13 @@ _08187674: adds r1, 0x9 b _08187966 .align 2, 0 -_0818768C: .4byte 0x02024744 + .pool _08187690: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _081876C8 + ldr r2, =0x02024744 mov r8, r2 _0818769C: adds r1, r6, 0 @@ -800752,7 +773850,7 @@ _0818769C: ble _0818769C movs r0, 0x64 muls r0, r5 - ldr r1, _081876C8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -800761,11 +773859,11 @@ _0818769C: adds r6, 0x1 b _08187A2E .align 2, 0 -_081876C8: .4byte 0x02024744 + .pool _081876CC: movs r0, 0x64 muls r0, r5 - ldr r1, _081876E4 + ldr r1, =0x02024744 adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -800775,20 +773873,20 @@ _081876CC: adds r1, 0x8 b _08187A26 .align 2, 0 -_081876E4: .4byte 0x02024744 + .pool _081876E8: movs r0, 0x64 muls r0, r5 - ldr r1, _081876F4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1 b _08187702 .align 2, 0 -_081876F4: .4byte 0x02024744 + .pool _081876F8: movs r0, 0x64 muls r0, r5 - ldr r1, _08187724 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x19 _08187702: @@ -800808,120 +773906,120 @@ _08187702: movs r6, 0x3 b _08187A2E .align 2, 0 -_08187724: .4byte 0x02024744 + .pool _08187728: movs r0, 0x64 muls r0, r5 - ldr r1, _08187734 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1A b _08187A26 .align 2, 0 -_08187734: .4byte 0x02024744 + .pool _08187738: movs r0, 0x64 muls r0, r5 - ldr r1, _08187744 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1B b _08187A26 .align 2, 0 -_08187744: .4byte 0x02024744 + .pool _08187748: movs r0, 0x64 muls r0, r5 - ldr r1, _08187754 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1C b _08187A26 .align 2, 0 -_08187754: .4byte 0x02024744 + .pool _08187758: movs r0, 0x64 muls r0, r5 - ldr r1, _08187764 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1D b _08187A26 .align 2, 0 -_08187764: .4byte 0x02024744 + .pool _08187768: movs r0, 0x64 muls r0, r5 - ldr r1, _08187774 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1E b _08187A26 .align 2, 0 -_08187774: .4byte 0x02024744 + .pool _08187778: movs r0, 0x64 muls r0, r5 - ldr r1, _08187784 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1F b _08187A26 .align 2, 0 -_08187784: .4byte 0x02024744 + .pool _08187788: movs r0, 0x64 muls r0, r5 - ldr r1, _08187794 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x20 b _08187A26 .align 2, 0 -_08187794: .4byte 0x02024744 + .pool _08187798: movs r0, 0x64 muls r0, r5 - ldr r1, _081877A4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x22 b _08187A26 .align 2, 0 -_081877A4: .4byte 0x02024744 + .pool _081877A8: movs r0, 0x64 muls r0, r5 - ldr r1, _081877B4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x23 b _08187A26 .align 2, 0 -_081877B4: .4byte 0x02024744 + .pool _081877B8: movs r0, 0x64 muls r0, r5 - ldr r1, _081877C4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x24 b _08187A26 .align 2, 0 -_081877C4: .4byte 0x02024744 + .pool _081877C8: movs r0, 0x64 muls r0, r5 - ldr r1, _081877D4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x25 b _08187A26 .align 2, 0 -_081877D4: .4byte 0x02024744 + .pool _081877D8: movs r0, 0x64 muls r0, r5 - ldr r1, _081877E4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x26 b _08187A26 .align 2, 0 -_081877E4: .4byte 0x02024744 + .pool _081877E8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08187834 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -800950,83 +774048,83 @@ _081877E8: movs r6, 0x6 b _08187A2E .align 2, 0 -_08187834: .4byte 0x02024744 + .pool _08187838: movs r0, 0x64 muls r0, r5 - ldr r1, _08187844 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x27 b _08187A26 .align 2, 0 -_08187844: .4byte 0x02024744 + .pool _08187848: movs r0, 0x64 muls r0, r5 - ldr r1, _08187854 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x28 b _08187A26 .align 2, 0 -_08187854: .4byte 0x02024744 + .pool _08187858: movs r0, 0x64 muls r0, r5 - ldr r1, _08187864 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x29 b _08187A26 .align 2, 0 -_08187864: .4byte 0x02024744 + .pool _08187868: movs r0, 0x64 muls r0, r5 - ldr r1, _08187874 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2A b _08187A26 .align 2, 0 -_08187874: .4byte 0x02024744 + .pool _08187878: movs r0, 0x64 muls r0, r5 - ldr r1, _08187884 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2B b _08187A26 .align 2, 0 -_08187884: .4byte 0x02024744 + .pool _08187888: movs r0, 0x64 muls r0, r5 - ldr r1, _08187894 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2C b _08187A26 .align 2, 0 -_08187894: .4byte 0x02024744 + .pool _08187898: movs r0, 0x64 muls r0, r5 - ldr r1, _081878A4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0 b _081878C2 .align 2, 0 -_081878A4: .4byte 0x02024744 + .pool _081878A8: movs r0, 0x64 muls r0, r5 - ldr r1, _081878B4 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x9 b _08187966 .align 2, 0 -_081878B4: .4byte 0x02024744 + .pool _081878B8: movs r0, 0x64 muls r0, r5 - ldr r1, _081878E8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x37 _081878C2: @@ -801048,74 +774146,74 @@ _081878C2: movs r6, 0x4 b _08187A2E .align 2, 0 -_081878E8: .4byte 0x02024744 + .pool _081878EC: movs r0, 0x64 muls r0, r5 - ldr r1, _081878F8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x38 b _08187A26 .align 2, 0 -_081878F8: .4byte 0x02024744 + .pool _081878FC: movs r0, 0x64 muls r0, r5 - ldr r1, _08187908 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 b _08187966 .align 2, 0 -_08187908: .4byte 0x02024744 + .pool _0818790C: movs r0, 0x64 muls r0, r5 - ldr r1, _08187918 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A b _08187966 .align 2, 0 -_08187918: .4byte 0x02024744 + .pool _0818791C: movs r0, 0x64 muls r0, r5 - ldr r1, _08187928 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3B b _08187966 .align 2, 0 -_08187928: .4byte 0x02024744 + .pool _0818792C: movs r0, 0x64 muls r0, r5 - ldr r1, _08187938 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3C b _08187966 .align 2, 0 -_08187938: .4byte 0x02024744 + .pool _0818793C: movs r0, 0x64 muls r0, r5 - ldr r1, _08187948 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3D b _08187966 .align 2, 0 -_08187948: .4byte 0x02024744 + .pool _0818794C: movs r0, 0x64 muls r0, r5 - ldr r1, _08187958 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3E b _08187966 .align 2, 0 -_08187958: .4byte 0x02024744 + .pool _0818795C: movs r0, 0x64 muls r0, r5 - ldr r1, _08187978 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3F _08187966: @@ -801128,101 +774226,101 @@ _08187966: movs r6, 0x2 b _08187A2E .align 2, 0 -_08187978: .4byte 0x02024744 + .pool _0818797C: movs r0, 0x64 muls r0, r5 - ldr r1, _08187988 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x16 b _08187A26 .align 2, 0 -_08187988: .4byte 0x02024744 + .pool _0818798C: movs r0, 0x64 muls r0, r5 - ldr r1, _08187998 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x17 b _08187A26 .align 2, 0 -_08187998: .4byte 0x02024744 + .pool _0818799C: movs r0, 0x64 muls r0, r5 - ldr r1, _081879A8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x18 b _08187A26 .align 2, 0 -_081879A8: .4byte 0x02024744 + .pool _081879AC: movs r0, 0x64 muls r0, r5 - ldr r1, _081879B8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x21 b _08187A26 .align 2, 0 -_081879B8: .4byte 0x02024744 + .pool _081879BC: movs r0, 0x64 muls r0, r5 - ldr r1, _081879C8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2F b _08187A26 .align 2, 0 -_081879C8: .4byte 0x02024744 + .pool _081879CC: movs r0, 0x64 muls r0, r5 - ldr r1, _081879D8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x30 b _08187A26 .align 2, 0 -_081879D8: .4byte 0x02024744 + .pool _081879DC: movs r0, 0x64 muls r0, r5 - ldr r1, _081879E8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x32 b _08187A26 .align 2, 0 -_081879E8: .4byte 0x02024744 + .pool _081879EC: movs r0, 0x64 muls r0, r5 - ldr r1, _081879F8 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x33 b _08187A26 .align 2, 0 -_081879F8: .4byte 0x02024744 + .pool _081879FC: movs r0, 0x64 muls r0, r5 - ldr r1, _08187A08 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x34 b _08187A26 .align 2, 0 -_08187A08: .4byte 0x02024744 + .pool _08187A0C: movs r0, 0x64 muls r0, r5 - ldr r1, _08187A18 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x35 b _08187A26 .align 2, 0 -_08187A18: .4byte 0x02024744 + .pool _08187A1C: movs r0, 0x64 muls r0, r5 - ldr r1, _08187A40 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x36 _08187A26: @@ -801240,7 +774338,7 @@ _08187A2E: pop {r1} bx r1 .align 2, 0 -_08187A40: .4byte 0x02024744 + .pool thumb_func_end sub_8187298 thumb_func_start sub_8187A44 @@ -801254,8 +774352,8 @@ sub_8187A44: @ 8187A44 thumb_func_start sub_8187A50 sub_8187A50: @ 8187A50 push {r4,r5,lr} - ldr r1, _08187A74 - ldr r0, _08187A78 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -801263,16 +774361,14 @@ sub_8187A50: @ 8187A50 ldrb r0, [r1] cmp r0, 0 bne _08187A80 - ldr r0, _08187A7C + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl dp01_setattr_for_opponent_pokemon b _08187A9E .align 2, 0 -_08187A74: .4byte 0x02023064 -_08187A78: .4byte 0x02024064 -_08187A7C: .4byte 0x0202406e + .pool _08187A80: ldrb r4, [r1] movs r5, 0 @@ -801307,10 +774403,10 @@ dp01_setattr_for_opponent_pokemon: @ 8187AA8 sub sp, 0x38 lsls r0, 24 lsrs r5, r0, 24 - ldr r3, _08187AE0 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 - ldr r2, _08187AE4 + ldr r2, =0x02023067 adds r4, r0, r2 adds r7, r4, 0 subs r1, r2, 0x2 @@ -801323,14 +774419,12 @@ dp01_setattr_for_opponent_pokemon: @ 8187AA8 bl _081883B4 _08187AD6: lsls r0, 2 - ldr r1, _08187AE8 + ldr r1, =_08187AEC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08187AE0: .4byte 0x02024064 -_08187AE4: .4byte 0x02023067 -_08187AE8: .4byte _08187AEC + .pool .align 2, 0 _08187AEC: .4byte _08187BDC @@ -801397,7 +774491,7 @@ _08187BDC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08187D70 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -801464,7 +774558,7 @@ _08187C42: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08187D70 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -801574,11 +774668,11 @@ _08187C42: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187D70: .4byte 0x02024744 + .pool _08187D74: movs r0, 0x64 muls r0, r5 - ldr r1, _08187D8C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801587,11 +774681,11 @@ _08187D74: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187D8C: .4byte 0x02024744 + .pool _08187D90: movs r0, 0x64 muls r0, r5 - ldr r1, _08187DA8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801600,7 +774694,7 @@ _08187D90: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187DA8: .4byte 0x02024744 + .pool _08187DAC: movs r0, 0 mov r8, r0 @@ -801610,7 +774704,7 @@ _08187DAC: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _08187DFC + ldr r0, =0x02024744 adds r7, r1, r0 adds r6, r4, 0 adds r6, 0x8 @@ -801634,20 +774728,20 @@ _08187DC4: ble _08187DC4 movs r0, 0x64 muls r0, r5 - ldr r1, _08187DFC + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x15 mov r2, r9 bl pokemon_setattr b _081883B4 .align 2, 0 -_08187DFC: .4byte 0x02024744 + .pool _08187E00: movs r0, 0x64 muls r0, r5 - ldr r1, _08187E18 + ldr r1, =0x02024744 adds r0, r1 - ldr r3, _08187E1C + ldr r3, =0x02023064 ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -801656,13 +774750,12 @@ _08187E00: adds r1, 0x9 b _08187E9E .align 2, 0 -_08187E18: .4byte 0x02024744 -_08187E1C: .4byte 0x02023064 + .pool _08187E20: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _08187E84 + ldr r0, =0x02024744 adds r4, r0 ldrb r2, [r6] lsls r2, 9 @@ -801705,13 +774798,13 @@ _08187E20: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187E84: .4byte 0x02024744 + .pool _08187E88: movs r0, 0x64 muls r0, r5 - ldr r1, _08187EA8 + ldr r1, =0x02024744 adds r0, r1 - ldr r3, _08187EAC + ldr r3, =0x02023064 ldrb r2, [r6] lsls r2, 9 adds r1, r3, 0x1 @@ -801724,12 +774817,11 @@ _08187E9E: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187EA8: .4byte 0x02024744 -_08187EAC: .4byte 0x02023064 + .pool _08187EB0: movs r0, 0x64 muls r0, r5 - ldr r1, _08187EC8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801738,11 +774830,11 @@ _08187EB0: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187EC8: .4byte 0x02024744 + .pool _08187ECC: movs r0, 0x64 muls r0, r5 - ldr r1, _08187EE4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801751,11 +774843,11 @@ _08187ECC: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187EE4: .4byte 0x02024744 + .pool _08187EE8: movs r0, 0x64 muls r0, r5 - ldr r1, _08187F00 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801764,11 +774856,11 @@ _08187EE8: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187F00: .4byte 0x02024744 + .pool _08187F04: movs r0, 0x64 muls r0, r5 - ldr r1, _08187F1C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801777,11 +774869,11 @@ _08187F04: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187F1C: .4byte 0x02024744 + .pool _08187F20: movs r0, 0x64 muls r0, r5 - ldr r1, _08187F38 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801790,11 +774882,11 @@ _08187F20: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187F38: .4byte 0x02024744 + .pool _08187F3C: movs r0, 0x64 muls r0, r5 - ldr r1, _08187F54 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801803,11 +774895,11 @@ _08187F3C: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187F54: .4byte 0x02024744 + .pool _08187F58: movs r0, 0x64 muls r0, r5 - ldr r1, _08187F70 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801816,11 +774908,11 @@ _08187F58: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187F70: .4byte 0x02024744 + .pool _08187F74: movs r0, 0x64 muls r0, r5 - ldr r1, _08187F8C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801829,11 +774921,11 @@ _08187F74: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187F8C: .4byte 0x02024744 + .pool _08187F90: movs r0, 0x64 muls r0, r5 - ldr r1, _08187FA8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801842,11 +774934,11 @@ _08187F90: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187FA8: .4byte 0x02024744 + .pool _08187FAC: movs r0, 0x64 muls r0, r5 - ldr r1, _08187FC4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801855,11 +774947,11 @@ _08187FAC: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187FC4: .4byte 0x02024744 + .pool _08187FC8: movs r0, 0x64 muls r0, r5 - ldr r1, _08187FE0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801868,11 +774960,11 @@ _08187FC8: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187FE0: .4byte 0x02024744 + .pool _08187FE4: movs r0, 0x64 muls r0, r5 - ldr r1, _08187FFC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801881,11 +774973,11 @@ _08187FE4: bl pokemon_setattr b _081883B4 .align 2, 0 -_08187FFC: .4byte 0x02024744 + .pool _08188000: movs r0, 0x64 muls r0, r5 - ldr r1, _08188018 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801894,11 +774986,11 @@ _08188000: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188018: .4byte 0x02024744 + .pool _0818801C: movs r0, 0x64 muls r0, r5 - ldr r1, _08188034 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801907,12 +774999,12 @@ _0818801C: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188034: .4byte 0x02024744 + .pool _08188038: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081880A8 + ldr r0, =0x02024744 adds r4, r0 ldrb r2, [r6] lsls r2, 9 @@ -801961,11 +775053,11 @@ _08188038: adds r0, r4, 0 b _08188146 .align 2, 0 -_081880A8: .4byte 0x02024744 + .pool _081880AC: movs r0, 0x64 muls r0, r5 - ldr r1, _081880C4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801974,11 +775066,11 @@ _081880AC: bl pokemon_setattr b _081883B4 .align 2, 0 -_081880C4: .4byte 0x02024744 + .pool _081880C8: movs r0, 0x64 muls r0, r5 - ldr r1, _081880E0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -801987,11 +775079,11 @@ _081880C8: bl pokemon_setattr b _081883B4 .align 2, 0 -_081880E0: .4byte 0x02024744 + .pool _081880E4: movs r0, 0x64 muls r0, r5 - ldr r1, _081880FC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802000,11 +775092,11 @@ _081880E4: bl pokemon_setattr b _081883B4 .align 2, 0 -_081880FC: .4byte 0x02024744 + .pool _08188100: movs r0, 0x64 muls r0, r5 - ldr r1, _08188118 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802013,11 +775105,11 @@ _08188100: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188118: .4byte 0x02024744 + .pool _0818811C: movs r0, 0x64 muls r0, r5 - ldr r1, _08188134 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802026,11 +775118,11 @@ _0818811C: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188134: .4byte 0x02024744 + .pool _08188138: movs r0, 0x64 muls r0, r5 - ldr r1, _08188150 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802040,11 +775132,11 @@ _08188146: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188150: .4byte 0x02024744 + .pool _08188154: movs r0, 0x64 muls r0, r5 - ldr r1, _0818816C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802053,11 +775145,11 @@ _08188154: bl pokemon_setattr b _081883B4 .align 2, 0 -_0818816C: .4byte 0x02024744 + .pool _08188170: movs r0, 0x64 muls r0, r5 - ldr r1, _08188188 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802066,11 +775158,11 @@ _08188170: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188188: .4byte 0x02024744 + .pool _0818818C: movs r0, 0x64 muls r0, r5 - ldr r1, _081881A4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802079,11 +775171,11 @@ _0818818C: bl pokemon_setattr b _081883B4 .align 2, 0 -_081881A4: .4byte 0x02024744 + .pool _081881A8: movs r0, 0x64 muls r0, r5 - ldr r1, _081881C0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802092,11 +775184,11 @@ _081881A8: bl pokemon_setattr b _081883B4 .align 2, 0 -_081881C0: .4byte 0x02024744 + .pool _081881C4: movs r0, 0x64 muls r0, r5 - ldr r1, _081881DC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802105,11 +775197,11 @@ _081881C4: bl pokemon_setattr b _081883B4 .align 2, 0 -_081881DC: .4byte 0x02024744 + .pool _081881E0: movs r0, 0x64 muls r0, r5 - ldr r1, _081881F8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802118,11 +775210,11 @@ _081881E0: bl pokemon_setattr b _081883B4 .align 2, 0 -_081881F8: .4byte 0x02024744 + .pool _081881FC: movs r0, 0x64 muls r0, r5 - ldr r1, _08188214 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802131,11 +775223,11 @@ _081881FC: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188214: .4byte 0x02024744 + .pool _08188218: movs r0, 0x64 muls r0, r5 - ldr r1, _08188230 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802144,11 +775236,11 @@ _08188218: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188230: .4byte 0x02024744 + .pool _08188234: movs r0, 0x64 muls r0, r5 - ldr r1, _0818824C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802157,11 +775249,11 @@ _08188234: bl pokemon_setattr b _081883B4 .align 2, 0 -_0818824C: .4byte 0x02024744 + .pool _08188250: movs r0, 0x64 muls r0, r5 - ldr r1, _08188268 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802170,11 +775262,11 @@ _08188250: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188268: .4byte 0x02024744 + .pool _0818826C: movs r0, 0x64 muls r0, r5 - ldr r1, _08188284 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802183,11 +775275,11 @@ _0818826C: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188284: .4byte 0x02024744 + .pool _08188288: movs r0, 0x64 muls r0, r5 - ldr r1, _081882A0 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802196,11 +775288,11 @@ _08188288: bl pokemon_setattr b _081883B4 .align 2, 0 -_081882A0: .4byte 0x02024744 + .pool _081882A4: movs r0, 0x64 muls r0, r5 - ldr r1, _081882BC + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802209,11 +775301,11 @@ _081882A4: bl pokemon_setattr b _081883B4 .align 2, 0 -_081882BC: .4byte 0x02024744 + .pool _081882C0: movs r0, 0x64 muls r0, r5 - ldr r1, _081882D8 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802222,11 +775314,11 @@ _081882C0: bl pokemon_setattr b _081883B4 .align 2, 0 -_081882D8: .4byte 0x02024744 + .pool _081882DC: movs r0, 0x64 muls r0, r5 - ldr r1, _081882F4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802235,11 +775327,11 @@ _081882DC: bl pokemon_setattr b _081883B4 .align 2, 0 -_081882F4: .4byte 0x02024744 + .pool _081882F8: movs r0, 0x64 muls r0, r5 - ldr r1, _08188310 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802248,11 +775340,11 @@ _081882F8: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188310: .4byte 0x02024744 + .pool _08188314: movs r0, 0x64 muls r0, r5 - ldr r1, _0818832C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802261,11 +775353,11 @@ _08188314: bl pokemon_setattr b _081883B4 .align 2, 0 -_0818832C: .4byte 0x02024744 + .pool _08188330: movs r0, 0x64 muls r0, r5 - ldr r1, _08188348 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802274,11 +775366,11 @@ _08188330: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188348: .4byte 0x02024744 + .pool _0818834C: movs r0, 0x64 muls r0, r5 - ldr r1, _08188364 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802287,11 +775379,11 @@ _0818834C: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188364: .4byte 0x02024744 + .pool _08188368: movs r0, 0x64 muls r0, r5 - ldr r1, _08188380 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802300,11 +775392,11 @@ _08188368: bl pokemon_setattr b _081883B4 .align 2, 0 -_08188380: .4byte 0x02024744 + .pool _08188384: movs r0, 0x64 muls r0, r5 - ldr r1, _0818839C + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802313,11 +775405,11 @@ _08188384: bl pokemon_setattr b _081883B4 .align 2, 0 -_0818839C: .4byte 0x02024744 + .pool _081883A0: movs r0, 0x64 muls r0, r5 - ldr r1, _081883C4 + ldr r1, =0x02024744 adds r0, r1 ldrb r2, [r6] lsls r2, 9 @@ -802334,14 +775426,14 @@ _081883B4: pop {r0} bx r0 .align 2, 0 -_081883C4: .4byte 0x02024744 + .pool thumb_func_end dp01_setattr_for_opponent_pokemon thumb_func_start sub_81883C8 sub_81883C8: @ 81883C8 push {r4-r7,lr} - ldr r1, _0818842C - ldr r7, _08188430 + ldr r1, =0x0202406e + ldr r7, =0x02024064 ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -802349,12 +775441,12 @@ sub_81883C8: @ 81883C8 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, _08188434 + ldr r4, =0x02023064 lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 ldrb r0, [r0] - ldr r1, _08188438 + ldr r1, =0x02024744 adds r0, r1 adds r5, r3, r0 movs r3, 0 @@ -802390,10 +775482,7 @@ _08188420: pop {r0} bx r0 .align 2, 0 -_0818842C: .4byte 0x0202406e -_08188430: .4byte 0x02024064 -_08188434: .4byte 0x02023064 -_08188438: .4byte 0x02024744 + .pool thumb_func_end sub_81883C8 thumb_func_start sub_818843C @@ -802403,8 +775492,8 @@ sub_818843C: @ 818843C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r7, _08188564 - ldr r6, _08188568 + ldr r7, =0x0202406e + ldr r6, =0x02024064 ldrb r0, [r6] lsls r0, 1 adds r0, r7 @@ -802414,7 +775503,7 @@ sub_818843C: @ 818843C mov r2, r10 muls r2, r0 adds r0, r2, 0 - ldr r1, _0818856C + ldr r1, =0x02024744 mov r9, r1 add r0, r9 movs r1, 0xB @@ -802438,7 +775527,7 @@ sub_818843C: @ 818843C lsrs r1, 24 adds r0, r4, 0 bl sub_806A068 - ldr r0, _08188570 + ldr r0, =0x0202499c mov r8, r0 ldrb r0, [r6] movs r1, 0x2 @@ -802460,11 +775549,11 @@ sub_818843C: @ 818843C adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _08188574 + ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, _08188578 + ldr r5, =0x02020630 ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -802472,7 +775561,7 @@ sub_818843C: @ 818843C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0818857C + ldr r1, =0x0000ff10 strh r1, [r0, 0x24] ldrb r2, [r6] adds r0, r2, r4 @@ -802502,7 +775591,7 @@ sub_818843C: @ 818843C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08188580 + ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] bl obj_anim_image_start @@ -802521,11 +775610,11 @@ sub_818843C: @ 818843C lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 - ldr r1, _08188584 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _08188588 + ldr r1, =sub_8186C48 + 1 str r1, [r0] pop {r3-r5} mov r8, r3 @@ -802535,27 +775624,18 @@ sub_818843C: @ 818843C pop {r0} bx r0 .align 2, 0 -_08188564: .4byte 0x0202406e -_08188568: .4byte 0x02024064 -_0818856C: .4byte 0x02024744 -_08188570: .4byte 0x0202499c -_08188574: .4byte 0x020241e4 -_08188578: .4byte 0x02020630 -_0818857C: .4byte 0x0000ff10 -_08188580: .4byte 0x020244e4 -_08188584: .4byte 0x03005d60 -_08188588: .4byte sub_8186C48 + 1 + .pool thumb_func_end sub_818843C thumb_func_start sub_818858C sub_818858C: @ 818858C push {r4,lr} - ldr r1, _081885C4 - ldr r4, _081885C8 + ldr r1, =0x0202406e + ldr r4, =0x02024064 ldrb r0, [r4] lsls r2, r0, 1 adds r2, r1 - ldr r3, _081885CC + ldr r3, =0x02023064 lsls r0, 9 adds r1, r3, 0x1 adds r0, r1 @@ -802567,21 +775647,17 @@ sub_818858C: @ 818858C adds r1, r3 ldrb r1, [r1] bl sub_81885D8 - ldr r1, _081885D0 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _081885D4 + ldr r1, =sub_8187084 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081885C4: .4byte 0x0202406e -_081885C8: .4byte 0x02024064 -_081885CC: .4byte 0x02023064 -_081885D0: .4byte 0x03005d60 -_081885D4: .4byte sub_8187084 + 1 + .pool thumb_func_end sub_818858C thumb_func_start sub_81885D8 @@ -802598,10 +775674,10 @@ sub_81885D8: @ 81885D8 lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, _08188740 + ldr r0, =0x0202406e lsls r4, r6, 1 adds r4, r0 - ldr r0, _08188744 + ldr r0, =0x02023064 lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -802613,7 +775689,7 @@ sub_81885D8: @ 81885D8 mov r1, r9 muls r1, r0 adds r0, r1, 0 - ldr r5, _08188748 + ldr r5, =0x02024744 adds r0, r5 movs r1, 0xB bl pokemon_getattr @@ -802621,9 +775697,9 @@ sub_81885D8: @ 81885D8 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _0818874C + ldr r0, =sub_805D714 + 1 bl object_new_hidden_with_callback - ldr r1, _08188750 + ldr r1, =0x03005d7c mov r10, r1 add r10, r6 mov r1, r10 @@ -802642,7 +775718,7 @@ sub_81885D8: @ 81885D8 lsrs r1, 24 mov r0, r8 bl sub_806A068 - ldr r0, _08188754 + ldr r0, =0x0202499c mov r9, r0 adds r0, r6, 0 movs r1, 0x2 @@ -802664,10 +775740,10 @@ sub_81885D8: @ 81885D8 adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _08188758 + ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] - ldr r5, _0818875C + ldr r5, =0x02020630 mov r0, r10 ldrb r1, [r0] lsls r0, r1, 4 @@ -802712,7 +775788,7 @@ sub_81885D8: @ 81885D8 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08188760 + ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] bl obj_anim_image_start @@ -802733,7 +775809,7 @@ sub_81885D8: @ 81885D8 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08188764 + ldr r1, =nullsub_12 + 1 str r1, [r0] movs r0, 0 movs r1, 0xFE @@ -802755,23 +775831,14 @@ sub_81885D8: @ 81885D8 pop {r0} bx r0 .align 2, 0 -_08188740: .4byte 0x0202406e -_08188744: .4byte 0x02023064 -_08188748: .4byte 0x02024744 -_0818874C: .4byte sub_805D714 + 1 -_08188750: .4byte 0x03005d7c -_08188754: .4byte 0x0202499c -_08188758: .4byte 0x020241e4 -_0818875C: .4byte 0x02020630 -_08188760: .4byte 0x020244e4 -_08188764: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81885D8 thumb_func_start sub_8188768 sub_8188768: @ 8188768 push {r4-r6,lr} - ldr r1, _0818879C - ldr r6, _081887A0 + ldr r1, =0x02023064 + ldr r6, =0x02024064 ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -802779,7 +775846,7 @@ sub_8188768: @ 8188768 ldrb r3, [r0] cmp r3, 0 bne _081887B0 - ldr r0, _081887A4 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -802787,27 +775854,23 @@ sub_8188768: @ 8188768 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, _081887A8 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _081887AC + ldr r1, =sub_8188800 + 1 str r1, [r0] b _081887EC .align 2, 0 -_0818879C: .4byte 0x02023064 -_081887A0: .4byte 0x02024064 -_081887A4: .4byte 0x020244d0 -_081887A8: .4byte 0x03005d60 -_081887AC: .4byte sub_8188800 + 1 + .pool _081887B0: - ldr r5, _081887F4 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _081887F8 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -802820,7 +775883,7 @@ _081887B0: bl obj_delete_and_free_tiles ldrb r0, [r6] bl sub_805EEE0 - ldr r1, _081887FC + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -802831,17 +775894,15 @@ _081887EC: pop {r0} bx r0 .align 2, 0 -_081887F4: .4byte 0x020241e4 -_081887F8: .4byte 0x02020630 -_081887FC: .4byte 0x03005d70 + .pool thumb_func_end sub_8188768 thumb_func_start sub_8188800 sub_8188800: @ 8188800 push {r4-r6,lr} - ldr r6, _08188820 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _08188824 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -802855,8 +775916,7 @@ sub_8188800: @ 8188800 beq _08188856 b _0818887E .align 2, 0 -_08188820: .4byte 0x020244d0 -_08188824: .4byte 0x02024064 + .pool _08188828: ldr r1, [r4] lsls r0, r2, 2 @@ -802895,19 +775955,18 @@ _08188856: adds r1, r2, 0 movs r3, 0x2 bl move_anim_start_t4 - ldr r1, _08188884 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08188888 + ldr r1, =sub_8186D9C + 1 str r1, [r0] _0818887E: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08188884: .4byte 0x03005d60 -_08188888: .4byte sub_8186D9C + 1 + .pool thumb_func_end sub_8188800 thumb_func_start sub_818888C @@ -802916,13 +775975,13 @@ sub_818888C: @ 818888C mov r7, r9 mov r6, r8 push {r6,r7} - ldr r5, _081888CC + ldr r5, =0x02022fec ldr r0, [r5] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _081888F6 - ldr r4, _081888D0 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status movs r1, 0x2 @@ -802941,14 +776000,12 @@ _081888B4: ldrb r0, [r4] cmp r0, 0x1 bne _081888D8 - ldr r0, _081888D4 + ldr r0, =0x02038bca b _081888DA .align 2, 0 -_081888CC: .4byte 0x02022fec -_081888D0: .4byte 0x02024064 -_081888D4: .4byte 0x02038bca + .pool _081888D8: - ldr r0, _081888E8 + ldr r0, =0x02038bcc _081888DA: ldrh r0, [r0] bl sub_8162AA0 @@ -802956,7 +776013,7 @@ _081888DA: lsrs r0, 24 b _0818892C .align 2, 0 -_081888E8: .4byte 0x02038bcc + .pool _081888EC: bl sub_8185F40 lsls r0, 24 @@ -802964,7 +776021,7 @@ _081888EC: b _08188924 _081888F6: movs r7, 0xB0 - ldr r0, _0818890C + ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 @@ -802973,10 +776030,10 @@ _081888F6: bl sub_8068B48 b _08188928 .align 2, 0 -_0818890C: .4byte 0x02038bca + .pool _08188910: - ldr r2, _08188A10 - ldr r0, _08188A14 + ldr r2, =0x020229e8 + ldr r0, =0x0203c7b4 ldrb r0, [r0] movs r1, 0x1 eors r1, r0 @@ -802992,7 +776049,7 @@ _08188928: lsrs r0, 16 _0818892C: mov r8, r0 - ldr r5, _08188A18 + ldr r5, =0x02024064 ldrb r1, [r5] bl sub_805DF38 ldrb r0, [r5] @@ -803002,9 +776059,9 @@ _0818892C: lsrs r1, 24 mov r0, r8 bl template_build_for_pokemon_or_trainer - ldr r6, _08188A1C + ldr r6, =0x0202499c mov r9, r7 - ldr r1, _08188A20 + ldr r1, =0x083054e0 mov r2, r8 lsls r0, r2, 2 adds r0, r1 @@ -803025,11 +776082,11 @@ _0818892C: mov r1, r9 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r6, _08188A24 + ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _08188A28 + ldr r4, =0x02020630 ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] @@ -803037,7 +776094,7 @@ _0818892C: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08188A2C + ldr r1, =0x0000ff10 strh r1, [r0, 0x24] ldrb r0, [r5] adds r0, r6 @@ -803048,7 +776105,7 @@ _0818892C: adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x2E] - ldr r1, _08188A30 + ldr r1, =0x0830593c mov r2, r8 lsls r0, r2, 3 adds r0, r1 @@ -803084,13 +776141,13 @@ _0818892C: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _08188A34 + ldr r1, =sub_805D7AC + 1 str r1, [r0] - ldr r1, _08188A38 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08188A3C + ldr r1, =sub_8186558 + 1 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -803099,18 +776156,7 @@ _0818892C: pop {r0} bx r0 .align 2, 0 -_08188A10: .4byte 0x020229e8 -_08188A14: .4byte 0x0203c7b4 -_08188A18: .4byte 0x02024064 -_08188A1C: .4byte 0x0202499c -_08188A20: .4byte 0x083054e0 -_08188A24: .4byte 0x020241e4 -_08188A28: .4byte 0x02020630 -_08188A2C: .4byte 0x0000ff10 -_08188A30: .4byte 0x0830593c -_08188A34: .4byte sub_805D7AC + 1 -_08188A38: .4byte 0x03005d60 -_08188A3C: .4byte sub_8186558 + 1 + .pool thumb_func_end sub_818888C thumb_func_start sub_8188A40 @@ -803124,15 +776170,15 @@ sub_8188A40: @ 8188A40 thumb_func_start sub_8188A4C sub_8188A4C: @ 8188A4C push {r4-r6,lr} - ldr r6, _08188ADC - ldr r4, _08188AE0 + ldr r6, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08188AE4 + ldr r5, =0x02020630 adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -803172,7 +776218,7 @@ sub_8188A4C: @ 8188A4C adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08188AE8 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -803181,33 +776227,27 @@ sub_8188A4C: @ 8188A4C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08188AEC + ldr r1, =nullsub_12 + 1 bl oamt_set_x3A_32 - ldr r1, _08188AF0 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08188AF4 + ldr r1, =sub_81865C8 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08188ADC: .4byte 0x020241e4 -_08188AE0: .4byte 0x02024064 -_08188AE4: .4byte 0x02020630 -_08188AE8: .4byte sub_80A6EEC + 1 -_08188AEC: .4byte nullsub_12 + 1 -_08188AF0: .4byte 0x03005d60 -_08188AF4: .4byte sub_81865C8 + 1 + .pool thumb_func_end sub_8188A4C thumb_func_start sub_8188AF8 sub_8188AF8: @ 8188AF8 push {r4-r6,lr} - ldr r6, _08188B44 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _08188B48 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -803242,8 +776282,7 @@ _08188B2C: strb r1, [r0, 0x4] b _08188B88 .align 2, 0 -_08188B44: .4byte 0x020244d0 -_08188B48: .4byte 0x02024064 + .pool _08188B4C: ldrb r1, [r3] movs r0, 0x40 @@ -803256,8 +776295,8 @@ _08188B4C: movs r0, 0x10 movs r1, 0x3F bl audio_play_and_stuff - ldr r2, _08188B90 - ldr r1, _08188B94 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 ldrb r0, [r5] adds r0, r1 ldrb r1, [r0] @@ -803266,24 +776305,20 @@ _08188B4C: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _08188B98 + ldr r1, =sub_8039934 + 1 str r1, [r0] - ldr r1, _08188B9C + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _08188BA0 + ldr r1, =sub_8186D58 + 1 str r1, [r0] _08188B88: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08188B90: .4byte 0x02020630 -_08188B94: .4byte 0x020241e4 -_08188B98: .4byte sub_8039934 + 1 -_08188B9C: .4byte 0x03005d60 -_08188BA0: .4byte sub_8186D58 + 1 + .pool thumb_func_end sub_8188AF8 thumb_func_start sub_8188BA4 @@ -803321,7 +776356,7 @@ sub_8188BC8: @ 8188BC8 thumb_func_start sub_8188BD4 sub_8188BD4: @ 8188BD4 push {r4-r6,lr} - ldr r6, _08188CB8 + ldr r6, =0x02024064 ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -803329,7 +776364,7 @@ sub_8188BD4: @ 8188BD4 beq _08188BE6 b _08188CFA _08188BE6: - ldr r0, _08188CBC + ldr r0, =0x02023064 mov r12, r0 ldrb r2, [r6] lsls r2, 9 @@ -803342,13 +776377,13 @@ _08188BE6: ldrb r1, [r1] lsls r1, 8 orrs r0, r1 - ldr r5, _08188CC0 + ldr r5, =0x02038432 mov r1, r12 adds r1, 0x3 adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, _08188CC4 + ldr r4, =0x02038408 ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -803362,7 +776397,7 @@ _08188BE6: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, _08188CC8 + ldr r4, =0x02038404 ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -803388,7 +776423,7 @@ _08188BE6: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, _08188CCC + ldr r3, =0x0203841a ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -803396,7 +776431,7 @@ _08188BE6: adds r1, r2 ldrb r1, [r1] strb r1, [r3] - ldr r4, _08188CD0 + ldr r4, =0x0203841c ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -803410,14 +776445,14 @@ _08188BE6: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, _08188CD4 + ldr r3, =0x02038400 ldrb r2, [r6] lsls r2, 9 mov r1, r12 adds r1, 0x10 adds r2, r1 str r2, [r3] - ldr r3, _08188CD8 + ldr r3, =0x020244bc ldrb r1, [r6] lsls r1, 2 adds r1, r3 @@ -803432,17 +776467,9 @@ _08188BE6: bl sub_81871AC b _08188CFA .align 2, 0 -_08188CB8: .4byte 0x02024064 -_08188CBC: .4byte 0x02023064 -_08188CC0: .4byte 0x02038432 -_08188CC4: .4byte 0x02038408 -_08188CC8: .4byte 0x02038404 -_08188CCC: .4byte 0x0203841a -_08188CD0: .4byte 0x0203841c -_08188CD4: .4byte 0x02038400 -_08188CD8: .4byte 0x020244bc + .pool _08188CDC: - ldr r0, _08188D00 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -803451,20 +776478,18 @@ _08188CDC: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, _08188D04 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _08188D08 + ldr r1, =sub_8188D0C + 1 str r1, [r0] _08188CFA: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08188D00: .4byte 0x020244d0 -_08188D04: .4byte 0x03005d60 -_08188D08: .4byte sub_8188D0C + 1 + .pool thumb_func_end sub_8188BD4 thumb_func_start sub_8188D0C @@ -803474,8 +776499,8 @@ sub_8188D0C: @ 8188D0C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _08188D58 - ldr r6, _08188D5C + ldr r2, =0x02023064 + ldr r6, =0x02024064 ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -803492,7 +776517,7 @@ sub_8188D0C: @ 8188D0C adds r1, r2 ldrb r1, [r1] mov r8, r1 - ldr r7, _08188D60 + ldr r7, =0x020244d0 ldr r5, [r7] ldr r1, [r5, 0x4] lsls r0, r3, 1 @@ -803508,9 +776533,7 @@ sub_8188D0C: @ 8188D0C beq _08188D6E b _08188E80 .align 2, 0 -_08188D58: .4byte 0x02023064 -_08188D5C: .4byte 0x02024064 -_08188D60: .4byte 0x020244d0 + .pool _08188D64: cmp r2, 0x2 beq _08188DCE @@ -803566,10 +776589,10 @@ _08188DA4: strb r1, [r0, 0x4] b _08188E80 _08188DCE: - ldr r0, _08188E34 + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _08188E38 + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _08188E80 @@ -803603,9 +776626,9 @@ _08188DCE: ands r0, r2 strb r0, [r1] _08188E1C: - ldr r0, _08188E3C + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _08188E40 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -803616,10 +776639,7 @@ _08188E1C: strb r1, [r0, 0x4] b _08188E80 .align 2, 0 -_08188E34: .4byte 0x020383f8 -_08188E38: .4byte 0x020383fd -_08188E3C: .4byte 0x020244d0 -_08188E40: .4byte 0x02024064 + .pool _08188E44: ldrb r1, [r0] movs r0, 0x40 @@ -803661,38 +776681,32 @@ _08188E80: thumb_func_start sub_8188E90 sub_8188E90: @ 8188E90 push {r4,lr} - ldr r0, _08188EC8 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _08188ECC + ldr r0, =0x02022e16 strh r1, [r0] - ldr r4, _08188ED0 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 9 - ldr r1, _08188ED4 + ldr r1, =0x02023066 adds r0, r1 ldrh r0, [r0] bl battle_pick_message - ldr r0, _08188ED8 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _08188EDC + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08188EE0 + ldr r1, =sub_8186E10 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_08188EC8: .4byte 0x02022e14 -_08188ECC: .4byte 0x02022e16 -_08188ED0: .4byte 0x02024064 -_08188ED4: .4byte 0x02023066 -_08188ED8: .4byte 0x02022e2c -_08188EDC: .4byte 0x03005d60 -_08188EE0: .4byte sub_8186E10 + 1 + .pool thumb_func_end sub_8188E90 thumb_func_start sub_8188EE4 @@ -803706,7 +776720,7 @@ sub_8188EE4: @ 8188EE4 thumb_func_start sub_8188EF0 sub_8188EF0: @ 8188EF0 push {lr} - ldr r0, _08188F10 + ldr r0, =0x02024064 ldrb r0, [r0] bl sub_8185054 adds r1, r0, 0 @@ -803719,7 +776733,7 @@ sub_8188EF0: @ 8188EF0 pop {r0} bx r0 .align 2, 0 -_08188F10: .4byte 0x02024064 + .pool thumb_func_end sub_8188EF0 thumb_func_start sub_8188F14 @@ -803733,7 +776747,7 @@ sub_8188F14: @ 8188F14 thumb_func_start sub_8188F20 sub_8188F20: @ 8188F20 push {r4,r5,lr} - ldr r0, _08188F44 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 @@ -803749,9 +776763,9 @@ sub_8188F20: @ 8188F20 bl dp01_build_cmdbuf_x21_a_bb b _08188F6C .align 2, 0 -_08188F44: .4byte 0x02022fec + .pool _08188F48: - ldr r5, _08188F78 + ldr r5, =0x02024064 ldrb r0, [r5] bl sub_8185054 adds r4, r0, 0 @@ -803772,7 +776786,7 @@ _08188F6C: pop {r0} bx r0 .align 2, 0 -_08188F78: .4byte 0x02024064 + .pool thumb_func_end sub_8188F20 thumb_func_start sub_8188F7C @@ -803786,11 +776800,11 @@ sub_8188F7C: @ 8188F7C thumb_func_start sub_8188F88 sub_8188F88: @ 8188F88 push {r4,lr} - ldr r4, _08188FBC + ldr r4, =0x02024064 ldrb r0, [r4] bl sub_8185054 ldrb r1, [r4] - ldr r3, _08188FC0 + ldr r3, =0x0202449c ldr r2, [r3] adds r1, r2 adds r1, 0x5C @@ -803808,8 +776822,7 @@ sub_8188F88: @ 8188F88 pop {r0} bx r0 .align 2, 0 -_08188FBC: .4byte 0x02024064 -_08188FC0: .4byte 0x0202449c + .pool thumb_func_end sub_8188F88 thumb_func_start sub_8188FC4 @@ -803829,8 +776842,8 @@ sub_8188FD0: @ 8188FD0 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _08189048 - ldr r0, _0818904C + ldr r3, =0x02023064 + ldr r0, =0x02024064 mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -803844,16 +776857,16 @@ sub_8188FD0: @ 8188FD0 orrs r1, r0 lsls r1, 16 asrs r7, r1, 16 - ldr r0, _08189050 + ldr r0, =0x00007fff cmp r7, r0 beq _08189060 - ldr r6, _08189054 + ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _08189058 + ldr r4, =0x02024744 adds r0, r4 movs r1, 0x3A bl pokemon_getattr @@ -803870,7 +776883,7 @@ sub_8188FD0: @ 8188FD0 adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _0818905C + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -803878,39 +776891,34 @@ sub_8188FD0: @ 8188FD0 bl sub_807294C b _0818908A .align 2, 0 -_08189048: .4byte 0x02023064 -_0818904C: .4byte 0x02024064 -_08189050: .4byte 0x00007fff -_08189054: .4byte 0x0202406e -_08189058: .4byte 0x02024744 -_0818905C: .4byte 0x03005d70 + .pool _08189060: - ldr r1, _081890A8 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081890AC + ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A bl pokemon_getattr adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _081890B0 + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] movs r3, 0 bl sub_807294C _0818908A: - ldr r1, _081890B4 - ldr r0, _081890B8 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _081890BC + ldr r1, =sub_8186D04 + 1 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -803920,12 +776928,7 @@ _0818908A: pop {r0} bx r0 .align 2, 0 -_081890A8: .4byte 0x0202406e -_081890AC: .4byte 0x02024744 -_081890B0: .4byte 0x03005d70 -_081890B4: .4byte 0x03005d60 -_081890B8: .4byte 0x02024064 -_081890BC: .4byte sub_8186D04 + 1 + .pool thumb_func_end sub_8188FD0 thumb_func_start sub_81890C0 @@ -803939,28 +776942,28 @@ sub_81890C0: @ 81890C0 thumb_func_start sub_81890CC sub_81890CC: @ 81890CC push {r4,lr} - ldr r4, _08189128 + ldr r4, =0x02024064 ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08189120 - ldr r0, _0818912C + ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _08189130 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08189134 + ldr r2, =0x02024744 adds r1, r2 movs r2, 0x9 bl healthbar_draw_field_maybe ldrb r2, [r4] - ldr r0, _08189138 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -803972,36 +776975,30 @@ sub_81890CC: @ 81890CC negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _0818913C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08189140 + ldr r1, =sub_818714C + 1 str r1, [r0] _08189120: pop {r4} pop {r0} bx r0 .align 2, 0 -_08189128: .4byte 0x02024064 -_0818912C: .4byte 0x03005d70 -_08189130: .4byte 0x0202406e -_08189134: .4byte 0x02024744 -_08189138: .4byte 0x020244d0 -_0818913C: .4byte 0x03005d60 -_08189140: .4byte sub_818714C + 1 + .pool thumb_func_end sub_81890CC thumb_func_start sub_8189144 sub_8189144: @ 8189144 push {r4,r5,lr} - ldr r5, _0818919C + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _08189194 - ldr r4, _081891A0 + ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -804026,21 +777023,18 @@ sub_8189144: @ 8189144 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, _081891A4 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _081891A8 + ldr r1, =sub_818714C + 1 str r1, [r0] _08189194: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0818919C: .4byte 0x02024064 -_081891A0: .4byte 0x02023064 -_081891A4: .4byte 0x03005d60 -_081891A8: .4byte sub_818714C + 1 + .pool thumb_func_end sub_8189144 thumb_func_start sub_81891AC @@ -804118,7 +777112,7 @@ sub_818920C: @ 818920C thumb_func_start sub_8189218 sub_8189218: @ 8189218 push {lr} - ldr r2, _08189230 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x80 negs r0, r0 @@ -804128,15 +777122,15 @@ sub_8189218: @ 8189218 pop {r0} bx r0 .align 2, 0 -_08189230: .4byte 0x02022d0c + .pool thumb_func_end sub_8189218 thumb_func_start sub_8189234 sub_8189234: @ 8189234 push {lr} - ldr r3, _08189260 - ldr r1, _08189264 - ldr r0, _08189268 + ldr r3, =0x02022d0c + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -804154,15 +777148,13 @@ sub_8189234: @ 8189234 pop {r0} bx r0 .align 2, 0 -_08189260: .4byte 0x02022d0c -_08189264: .4byte 0x02023064 -_08189268: .4byte 0x02024064 + .pool thumb_func_end sub_8189234 thumb_func_start sub_818926C sub_818926C: @ 818926C push {lr} - ldr r2, _08189280 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -804171,13 +777163,13 @@ sub_818926C: @ 818926C pop {r0} bx r0 .align 2, 0 -_08189280: .4byte 0x02022d0c + .pool thumb_func_end sub_818926C thumb_func_start sub_8189284 sub_8189284: @ 8189284 push {lr} - ldr r3, _081892A8 + ldr r3, =0x02022d0c ldr r1, [r3] lsls r1, 24 lsrs r1, 31 @@ -804193,15 +777185,15 @@ sub_8189284: @ 8189284 pop {r0} bx r0 .align 2, 0 -_081892A8: .4byte 0x02022d0c + .pool thumb_func_end sub_8189284 thumb_func_start sub_81892AC sub_81892AC: @ 81892AC push {r4,lr} - ldr r3, _081892D4 - ldr r2, _081892D8 - ldr r4, _081892DC + ldr r3, =0x02020630 + ldr r2, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -804217,11 +777209,9 @@ sub_81892AC: @ 81892AC bl sub_81871AC b _0818930A .align 2, 0 -_081892D4: .4byte 0x02020630 -_081892D8: .4byte 0x020241e4 -_081892DC: .4byte 0x02024064 + .pool _081892E0: - ldr r1, _08189310 + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -804235,20 +777225,18 @@ _081892E0: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, _08189314 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _08189318 + ldr r1, =bx_blink_t2 + 1 str r1, [r0] _0818930A: pop {r4} pop {r0} bx r0 .align 2, 0 -_08189310: .4byte 0x020244b9 -_08189314: .4byte 0x03005d60 -_08189318: .4byte bx_blink_t2 + 1 + .pool thumb_func_end sub_81892AC thumb_func_start sub_818931C @@ -804262,7 +777250,7 @@ sub_818931C: @ 818931C thumb_func_start sub_8189328 sub_8189328: @ 8189328 push {r4,lr} - ldr r4, _08189364 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -804271,7 +777259,7 @@ sub_8189328: @ 8189328 bne _0818933C movs r3, 0xC0 _0818933C: - ldr r2, _08189368 + ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -804290,15 +777278,14 @@ _0818933C: pop {r0} bx r0 .align 2, 0 -_08189364: .4byte 0x02024064 -_08189368: .4byte 0x02023064 + .pool thumb_func_end sub_8189328 thumb_func_start sub_818936C sub_818936C: @ 818936C push {r4,r5,lr} - ldr r4, _081893A0 - ldr r5, _081893A4 + ldr r4, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -804320,8 +777307,7 @@ sub_818936C: @ 818936C bl song_play_for_text b _081893BC .align 2, 0 -_081893A0: .4byte 0x02023064 -_081893A4: .4byte 0x02024064 + .pool _081893A8: adds r0, r4, 0x1 adds r0, r3, r0 @@ -804342,15 +777328,15 @@ _081893BC: thumb_func_start sub_81893C8 sub_81893C8: @ 81893C8 push {lr} - ldr r1, _081893F8 - ldr r0, _081893FC + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _08189400 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -804363,23 +777349,21 @@ sub_81893C8: @ 81893C8 pop {r0} bx r0 .align 2, 0 -_081893F8: .4byte 0x0202406e -_081893FC: .4byte 0x02024064 -_08189400: .4byte 0x02024744 + .pool thumb_func_end sub_81893C8 thumb_func_start sub_8189404 sub_8189404: @ 8189404 push {lr} - ldr r1, _0818942C - ldr r0, _08189430 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r0, [r0] bl battle_intro_launch - ldr r2, _08189434 + ldr r2, =0x020243fc ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -804388,23 +777372,21 @@ sub_8189404: @ 8189404 pop {r0} bx r0 .align 2, 0 -_0818942C: .4byte 0x02023064 -_08189430: .4byte 0x02024064 -_08189434: .4byte 0x020243fc + .pool thumb_func_end sub_8189404 thumb_func_start sub_8189438 sub_8189438: @ 8189438 push {r4-r6,lr} - ldr r5, _08189518 - ldr r6, _0818951C + ldr r5, =0x020241e4 + ldr r6, =0x02024064 ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08189520 + ldr r4, =0x02020630 adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -804444,7 +777426,7 @@ sub_8189438: @ 8189438 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08189524 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r0, [r6] adds r0, r5 @@ -804453,21 +777435,21 @@ sub_8189438: @ 8189438 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08189528 + ldr r1, =sub_818962C + 1 bl oamt_set_x3A_32 - ldr r0, _0818952C + ldr r0, =c3_0803D564 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r4, _08189530 + ldr r4, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r4 ldrb r0, [r6] strh r0, [r1, 0x8] - ldr r3, _08189534 + ldr r3, =0x020244d0 ldr r0, [r3] ldrb r2, [r6] ldr r1, [r0, 0x4] @@ -804480,14 +777462,14 @@ sub_8189438: @ 8189438 ands r0, r1 cmp r0, 0 beq _081894FA - ldr r0, _08189538 + ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, _0818953C + ldr r1, =sub_8073C30 + 1 str r1, [r0] _081894FA: ldr r0, [r3] @@ -804496,28 +777478,17 @@ _081894FA: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _08189540 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _08189544 + ldr r1, =nullsub_70 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_08189518: .4byte 0x020241e4 -_0818951C: .4byte 0x02024064 -_08189520: .4byte 0x02020630 -_08189524: .4byte sub_80A6EEC + 1 -_08189528: .4byte sub_818962C + 1 -_0818952C: .4byte c3_0803D564 + 1 -_08189530: .4byte 0x03005e00 -_08189534: .4byte 0x020244d0 -_08189538: .4byte 0x020244b4 -_0818953C: .4byte sub_8073C30 + 1 -_08189540: .4byte 0x03005d60 -_08189544: .4byte nullsub_70 + 1 + .pool thumb_func_end sub_8189438 thumb_func_start c3_0803D564 @@ -804529,10 +777500,10 @@ c3_0803D564: @ 8189548 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r7, _081895A0 + ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 - ldr r1, _081895A4 + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -804544,19 +777515,19 @@ c3_0803D564: @ 8189548 lsls r0, 24 cmp r0, 0 beq _08189582 - ldr r0, _081895A8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _081895B4 _08189582: - ldr r0, _081895AC + ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _081895B0 + ldr r0, =0x0202406e lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -804566,18 +777537,14 @@ _08189582: bl sub_81885D8 b _081895F4 .align 2, 0 -_081895A0: .4byte 0x02024064 -_081895A4: .4byte 0x03005e00 -_081895A8: .4byte 0x02022fec -_081895AC: .4byte 0x02023064 -_081895B0: .4byte 0x0202406e + .pool _081895B4: - ldr r4, _08189618 + ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r6, _0818961C + ldr r6, =0x0202406e lsls r0, 1 adds r0, r6 ldrh r0, [r0] @@ -804603,12 +777570,12 @@ _081895B4: eors r0, r5 strb r0, [r7] _081895F4: - ldr r1, _08189620 - ldr r2, _08189624 + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _08189628 + ldr r1, =sub_818686C + 1 str r1, [r0] mov r0, r9 strb r0, [r2] @@ -804621,11 +777588,7 @@ _081895F4: pop {r0} bx r0 .align 2, 0 -_08189618: .4byte 0x02023064 -_0818961C: .4byte 0x0202406e -_08189620: .4byte 0x03005d60 -_08189624: .4byte 0x02024064 -_08189628: .4byte sub_818686C + 1 + .pool thumb_func_end c3_0803D564 thumb_func_start sub_818962C @@ -804646,8 +777609,8 @@ sub_818962C: @ 818962C thumb_func_start sub_8189648 sub_8189648: @ 8189648 push {r4-r7,lr} - ldr r1, _08189670 - ldr r0, _08189674 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -804663,12 +777626,11 @@ sub_8189648: @ 8189648 bl sub_81871AC b _08189742 .align 2, 0 -_08189670: .4byte 0x02023064 -_08189674: .4byte 0x02024064 + .pool _08189678: - ldr r4, _081896D0 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _081896D4 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -804679,7 +777641,7 @@ _08189678: movs r2, 0x1 orrs r1, r2 strb r1, [r0] - ldr r1, _081896D8 + ldr r1, =0x02023064 ldrb r2, [r3] lsls r0, r2, 9 adds r1, 0x2 @@ -804710,9 +777672,7 @@ _08189678: strb r1, [r3, 0x1] b _08189742 .align 2, 0 -_081896D0: .4byte 0x020244d0 -_081896D4: .4byte 0x02024064 -_081896D8: .4byte 0x02023064 + .pool _081896DC: movs r0, 0x1F negs r0, r0 @@ -804722,7 +777682,7 @@ _081896E4: adds r5, r7, 0 ldrb r0, [r5] lsls r3, r0, 9 - ldr r4, _08189748 + ldr r4, =0x02023068 adds r1, r3, r4 subs r2, r4, 0x3 adds r2, r3, r2 @@ -804731,12 +777691,12 @@ _081896E4: adds r3, r4 ldrb r3, [r3] bl sub_80735DC - ldr r2, _0818974C + ldr r2, =0x020244b4 ldrb r1, [r5] adds r1, r2 movs r3, 0 strb r0, [r1] - ldr r6, _08189750 + ldr r6, =0x020244d0 ldr r0, [r6] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -804760,30 +777720,26 @@ _081896E4: movs r1, 0x5D strb r1, [r0, 0x5] _08189736: - ldr r0, _08189754 + ldr r0, =0x03005d60 ldrb r1, [r7] lsls r1, 2 adds r1, r0 - ldr r0, _08189758 + ldr r0, =sub_818975C + 1 str r0, [r1] _08189742: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08189748: .4byte 0x02023068 -_0818974C: .4byte 0x020244b4 -_08189750: .4byte 0x020244d0 -_08189754: .4byte 0x03005d60 -_08189758: .4byte sub_818975C + 1 + .pool thumb_func_end sub_8189648 thumb_func_start sub_818975C sub_818975C: @ 818975C push {r4,lr} - ldr r4, _0818979C + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _081897A0 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -804812,16 +777768,15 @@ _08189794: pop {r0} bx r0 .align 2, 0 -_0818979C: .4byte 0x020244d0 -_081897A0: .4byte 0x02024064 + .pool thumb_func_end sub_818975C thumb_func_start sub_81897A4 sub_81897A4: @ 81897A4 push {lr} - ldr r0, _081897E0 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _081897E4 + ldr r0, =0x02024064 ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -804833,26 +777788,22 @@ sub_81897A4: @ 81897A4 ands r0, r1 cmp r0, 0 beq _081897D6 - ldr r2, _081897E8 - ldr r0, _081897EC + ldr r2, =0x03005e00 + ldr r0, =0x020244b4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _081897F0 + ldr r1, =sub_8073C30 + 1 str r1, [r0] _081897D6: bl sub_81871AC pop {r0} bx r0 .align 2, 0 -_081897E0: .4byte 0x020244d0 -_081897E4: .4byte 0x02024064 -_081897E8: .4byte 0x03005e00 -_081897EC: .4byte 0x020244b4 -_081897F0: .4byte sub_8073C30 + 1 + .pool thumb_func_end sub_81897A4 thumb_func_start sub_81897F4 @@ -804866,14 +777817,14 @@ sub_81897F4: @ 81897F4 thumb_func_start sub_8189800 sub_8189800: @ 8189800 push {r4,lr} - ldr r4, _08189850 + ldr r4, =0x02024064 ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _08189846 - ldr r3, _08189854 - ldr r0, _08189858 + ldr r3, =0x02020630 + ldr r0, =0x020241e4 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -804881,7 +777832,7 @@ sub_8189800: @ 8189800 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, _0818985C + ldr r0, =0x02023064 lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -804904,23 +777855,20 @@ _08189846: pop {r0} bx r0 .align 2, 0 -_08189850: .4byte 0x02024064 -_08189854: .4byte 0x02020630 -_08189858: .4byte 0x020241e4 -_0818985C: .4byte 0x02023064 + .pool thumb_func_end sub_8189800 thumb_func_start sub_8189860 sub_8189860: @ 8189860 push {r4-r6,lr} sub sp, 0x4 - ldr r6, _081898A4 + ldr r6, =0x02024064 ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _081898B8 - ldr r5, _081898A8 + ldr r5, =0x02023064 ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -804944,14 +777892,13 @@ sub_8189860: @ 8189860 bl sub_81871AC b _081898B8 .align 2, 0 -_081898A4: .4byte 0x02024064 -_081898A8: .4byte 0x02023064 + .pool _081898AC: - ldr r0, _081898C0 + ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, _081898C4 + ldr r0, =sub_818717C + 1 str r0, [r1] _081898B8: add sp, 0x4 @@ -804959,8 +777906,7 @@ _081898B8: pop {r0} bx r0 .align 2, 0 -_081898C0: .4byte 0x03005d60 -_081898C4: .4byte sub_818717C + 1 + .pool thumb_func_end sub_8189860 thumb_func_start sub_81898C8 @@ -804982,8 +777928,8 @@ sub_81898D4: @ 81898D4 thumb_func_start sub_81898E0 sub_81898E0: @ 81898E0 push {lr} - ldr r1, _081898FC - ldr r0, _08189900 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -804991,15 +777937,13 @@ sub_81898E0: @ 81898E0 ldrb r2, [r0] cmp r2, 0x3 bne _08189908 - ldr r0, _08189904 + ldr r0, =0x0202433a strb r2, [r0] b _08189910 .align 2, 0 -_081898FC: .4byte 0x02023064 -_08189900: .4byte 0x02024064 -_08189904: .4byte 0x0202433a + .pool _08189908: - ldr r0, _08189934 + ldr r0, =0x0202433a movs r1, 0x3 eors r1, r2 strb r1, [r0] @@ -805009,20 +777953,17 @@ _08189910: movs r0, 0x3 bl sub_80A2390 bl sub_81871AC - ldr r1, _08189938 - ldr r0, _0818993C + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08189940 + ldr r1, =sub_80587B0 + 1 str r1, [r0] pop {r0} bx r0 .align 2, 0 -_08189934: .4byte 0x0202433a -_08189938: .4byte 0x03005d60 -_0818993C: .4byte 0x02024064 -_08189940: .4byte sub_80587B0 + 1 + .pool thumb_func_end sub_81898E0 thumb_func_start nullsub_119 @@ -805037,26 +777978,24 @@ nullsub_120: @ 8189948 thumb_func_start sub_818994C sub_818994C: @ 818994C - ldr r1, _0818995C - ldr r0, _08189960 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _08189964 + ldr r1, =sub_8189968 + 1 str r1, [r0] bx lr .align 2, 0 -_0818995C: .4byte 0x03005d60 -_08189960: .4byte 0x02024064 -_08189964: .4byte sub_8189968 + 1 + .pool thumb_func_end sub_818994C thumb_func_start sub_8189968 sub_8189968: @ 8189968 push {lr} - ldr r2, _0818999C - ldr r1, _081899A0 - ldr r0, _081899A4 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -805065,13 +778004,13 @@ sub_8189968: @ 8189968 ands r1, r0 cmp r1, 0 beq _081899B4 - ldr r0, _081899A8 + ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _081899B0 - ldr r0, _081899AC + ldr r0, =0x0860af74 ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -805079,11 +778018,7 @@ sub_8189968: @ 8189968 bl _call_via_r0 b _081899B4 .align 2, 0 -_0818999C: .4byte 0x02024068 -_081899A0: .4byte 0x0832a328 -_081899A4: .4byte 0x02024064 -_081899A8: .4byte 0x02023064 -_081899AC: .4byte 0x0860af74 + .pool _081899B0: bl sub_818A514 _081899B4: @@ -805094,9 +778029,9 @@ _081899B4: thumb_func_start sub_81899B8 sub_81899B8: @ 81899B8 push {lr} - ldr r2, _081899E0 - ldr r1, _081899E4 - ldr r0, _081899E8 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -805106,7 +778041,7 @@ sub_81899B8: @ 81899B8 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081899EC + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _081899DC bl sub_818A514 @@ -805114,18 +778049,15 @@ _081899DC: pop {r0} bx r0 .align 2, 0 -_081899E0: .4byte 0x02020630 -_081899E4: .4byte 0x020241e4 -_081899E8: .4byte 0x02024064 -_081899EC: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81899B8 thumb_func_start sub_81899F0 sub_81899F0: @ 81899F0 push {r4-r6,lr} - ldr r6, _08189A48 - ldr r5, _08189A4C - ldr r4, _08189A50 + ldr r6, =0x02020630 + ldr r5, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -805136,7 +778068,7 @@ sub_81899F0: @ 81899F0 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _08189A54 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08189A40 movs r0, 0 @@ -805163,18 +778095,15 @@ _08189A40: pop {r0} bx r0 .align 2, 0 -_08189A48: .4byte 0x02020630 -_08189A4C: .4byte 0x020241e4 -_08189A50: .4byte 0x02024064 -_08189A54: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81899F0 thumb_func_start sub_8189A58 sub_8189A58: @ 8189A58 push {r4,lr} - ldr r4, _08189A98 + ldr r4, =0x020244d0 ldr r1, [r4] - ldr r3, _08189A9C + ldr r3, =0x02024064 ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -805203,8 +778132,7 @@ _08189A90: pop {r0} bx r0 .align 2, 0 -_08189A98: .4byte 0x020244d0 -_08189A9C: .4byte 0x02024064 + .pool thumb_func_end sub_8189A58 thumb_func_start sub_8189AA0 @@ -805214,7 +778142,7 @@ sub_8189AA0: @ 8189AA0 mov r6, r8 push {r6,r7} movs r6, 0 - ldr r4, _08189AF8 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 @@ -805230,15 +778158,15 @@ _08189ABA: lsls r0, 24 cmp r0, 0 beq _08189B0C - ldr r0, _08189AFC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _08189B0C _08189ADA: - ldr r2, _08189B00 - ldr r1, _08189B04 + ldr r2, =0x02020630 + ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -805248,20 +778176,16 @@ _08189ADA: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08189B08 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08189B42 b _08189B48 .align 2, 0 -_08189AF8: .4byte 0x02024064 -_08189AFC: .4byte 0x02022fec -_08189B00: .4byte 0x02020630 -_08189B04: .4byte 0x03005d70 -_08189B08: .4byte nullsub_12 + 1 + .pool _08189B0C: - ldr r2, _08189C3C - ldr r5, _08189C40 - ldr r0, _08189C44 + ldr r2, =0x02020630 + ldr r5, =0x03005d70 + ldr r0, =0x02024064 ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -805271,7 +778195,7 @@ _08189B0C: adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, _08189C48 + ldr r0, =nullsub_12 + 1 cmp r4, r0 bne _08189B42 movs r0, 0x2 @@ -805291,10 +778215,10 @@ _08189B42: bne _08189B48 b _08189D18 _08189B48: - ldr r0, _08189C4C + ldr r0, =0x020244d0 mov r9, r0 ldr r0, [r0] - ldr r5, _08189C44 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -805369,19 +778293,19 @@ _08189B86: ldrb r1, [r0, 0x1] ands r4, r1 strb r4, [r0, 0x1] - ldr r4, _08189C50 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - ldr r7, _08189C54 + ldr r7, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 adds r0, r7 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r4, _08189C58 + ldr r4, =0x020244ec adds r0, r4 bl sub_805E990 bl battle_type_is_double @@ -805408,19 +778332,11 @@ _08189C22: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, _08189C5C + ldr r1, =0x03005d60 ldrb r0, [r5] b _08189D10 .align 2, 0 -_08189C3C: .4byte 0x02020630 -_08189C40: .4byte 0x03005d70 -_08189C44: .4byte 0x02024064 -_08189C48: .4byte nullsub_12 + 1 -_08189C4C: .4byte 0x020244d0 -_08189C50: .4byte 0x000027f9 -_08189C54: .4byte 0x0202406e -_08189C58: .4byte 0x020244ec -_08189C5C: .4byte 0x03005d60 + .pool _08189C60: bl battle_type_is_double lsls r0, 24 @@ -805430,15 +778346,15 @@ _08189C60: lsls r0, 24 cmp r0, 0 beq _08189CB0 - ldr r0, _08189CA0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _08189CB0 _08189C80: - ldr r2, _08189CA4 - ldr r1, _08189CA8 + ldr r2, =0x02020630 + ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] @@ -805448,19 +778364,16 @@ _08189C80: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08189CAC + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _08189CE6 b _08189CE4 .align 2, 0 -_08189CA0: .4byte 0x02022fec -_08189CA4: .4byte 0x02020630 -_08189CA8: .4byte 0x03005d70 -_08189CAC: .4byte nullsub_12 + 1 + .pool _08189CB0: - ldr r2, _08189D24 - ldr r5, _08189D28 - ldr r0, _08189D2C + ldr r2, =0x02020630 + ldr r5, =0x03005d70 + ldr r0, =0x02024064 ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -805470,7 +778383,7 @@ _08189CB0: adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, _08189D30 + ldr r0, =nullsub_12 + 1 cmp r4, r0 bne _08189CE6 movs r0, 0x2 @@ -805495,9 +778408,9 @@ _08189CE6: _08189CF2: cmp r6, 0 beq _08189D18 - ldr r0, _08189D34 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r3, _08189D2C + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -805506,12 +778419,12 @@ _08189CF2: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, _08189D38 + ldr r1, =0x03005d60 ldrb r0, [r3] _08189D10: lsls r0, 2 adds r0, r1 - ldr r1, _08189D3C + ldr r1, =sub_8189A58 + 1 str r1, [r0] _08189D18: pop {r3,r4} @@ -805521,13 +778434,7 @@ _08189D18: pop {r0} bx r0 .align 2, 0 -_08189D24: .4byte 0x02020630 -_08189D28: .4byte 0x03005d70 -_08189D2C: .4byte 0x02024064 -_08189D30: .4byte nullsub_12 + 1 -_08189D34: .4byte 0x020244d0 -_08189D38: .4byte 0x03005d60 -_08189D3C: .4byte sub_8189A58 + 1 + .pool thumb_func_end sub_8189AA0 thumb_func_start sub_8189D40 @@ -805539,13 +778446,13 @@ sub_8189D40: @ 8189D40 push {r5-r7} movs r0, 0 mov r10, r0 - ldr r4, _08189F1C + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status lsls r0, 24 cmp r0, 0 bne _08189DBE - ldr r5, _08189F20 + ldr r5, =0x020244d0 ldr r0, [r5] ldrb r2, [r4] ldr r1, [r0, 0x4] @@ -805559,12 +778466,12 @@ sub_8189D40: @ 8189D40 ands r0, r1 cmp r0, 0 bne _08189D8C - ldr r0, _08189F24 + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08189F28 + ldr r0, =0x020244ec adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 @@ -805584,19 +778491,19 @@ _08189D8C: ands r0, r1 cmp r0, 0 bne _08189DBE - ldr r0, _08189F24 + ldr r0, =0x0202406e adds r0, r2, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _08189F28 + ldr r0, =0x020244ec adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 _08189DBE: - ldr r3, _08189F20 + ldr r3, =0x020244d0 ldr r0, [r3] - ldr r2, _08189F1C + ldr r2, =0x02024064 ldrb r5, [r2] ldr r4, [r0, 0x4] lsls r0, r5, 1 @@ -805632,26 +778539,26 @@ _08189DBE: lsls r0, 24 cmp r0, 0 beq _08189E54 - ldr r0, _08189F2C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 bne _08189E54 - ldr r4, _08189F30 + ldr r4, =0x03005d70 mov r1, r9 ldrb r0, [r1] adds r1, r7, 0 eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _08189F24 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08189F28 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -805666,18 +778573,18 @@ _08189DBE: ldrb r0, [r0] bl sub_80729D0 _08189E54: - ldr r5, _08189F30 - ldr r4, _08189F1C + ldr r5, =0x03005d70 + ldr r4, =0x02024064 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _08189F24 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _08189F28 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -805688,9 +778595,9 @@ _08189E54: ldrb r0, [r0] bl sub_80729D0 _08189E84: - ldr r4, _08189F20 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _08189F1C + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -805747,7 +778654,7 @@ _08189EA2: ands r0, r1 cmp r0, 0 bne _08189F44 - ldr r0, _08189F2C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x42 ands r0, r1 @@ -805758,27 +778665,21 @@ _08189EA2: lsls r0, 24 cmp r0, 0 bne _08189F44 - ldr r0, _08189F34 + ldr r0, =0x03007420 bl m4aMPlayContinue b _08189F44 .align 2, 0 -_08189F1C: .4byte 0x02024064 -_08189F20: .4byte 0x020244d0 -_08189F24: .4byte 0x0202406e -_08189F28: .4byte 0x020244ec -_08189F2C: .4byte 0x02022fec -_08189F30: .4byte 0x03005d70 -_08189F34: .4byte 0x03007420 + .pool _08189F38: - ldr r0, _0818A038 - ldr r1, _0818A03C + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl _08189F44: - ldr r0, _0818A040 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0818A044 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -805795,9 +778696,9 @@ _08189F62: mov r1, r10 cmp r1, 0 beq _0818A02A - ldr r7, _0818A048 - ldr r6, _0818A04C - ldr r5, _0818A044 + ldr r7, =0x02020630 + ldr r6, =0x03005d7c + ldr r5, =0x02024064 ldrb r3, [r5] adds r0, r3, r6 ldrb r1, [r0] @@ -805808,10 +778709,10 @@ _08189F62: adds r4, 0x1C adds r0, r4 ldr r2, [r0] - ldr r0, _0818A050 + ldr r0, =nullsub_12 + 1 cmp r2, r0 bne _0818A02A - ldr r0, _0818A054 + ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -805825,7 +778726,7 @@ _08189F62: lsls r0, 24 cmp r0, 0 beq _08189FC8 - ldr r0, _0818A058 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -805842,18 +778743,18 @@ _08189F62: adds r0, r7 bl obj_delete_and_free_tiles _08189FC8: - ldr r1, _0818A04C - ldr r4, _0818A044 + ldr r1, =0x03005d7c + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0818A048 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles - ldr r3, _0818A040 + ldr r3, =0x020244d0 ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r1, [r2, 0x9] @@ -805884,11 +778785,11 @@ _08189FC8: movs r0, 0x7F ands r0, r2 strb r0, [r1, 0x1] - ldr r1, _0818A05C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0818A060 + ldr r1, =sub_8189AA0 + 1 str r1, [r0] _0818A02A: pop {r3-r5} @@ -805899,25 +778800,15 @@ _0818A02A: pop {r0} bx r0 .align 2, 0 -_0818A038: .4byte 0x03007420 -_0818A03C: .4byte 0x0000ffff -_0818A040: .4byte 0x020244d0 -_0818A044: .4byte 0x02024064 -_0818A048: .4byte 0x02020630 -_0818A04C: .4byte 0x03005d7c -_0818A050: .4byte nullsub_12 + 1 -_0818A054: .4byte 0x020241e4 -_0818A058: .4byte 0x02022fec -_0818A05C: .4byte 0x03005d60 -_0818A060: .4byte sub_8189AA0 + 1 + .pool thumb_func_end sub_8189D40 thumb_func_start sub_818A064 sub_818A064: @ 818A064 push {lr} - ldr r2, _0818A098 - ldr r1, _0818A09C - ldr r0, _0818A0A0 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -805940,17 +778831,15 @@ _0818A092: pop {r0} bx r0 .align 2, 0 -_0818A098: .4byte 0x02020630 -_0818A09C: .4byte 0x020241e4 -_0818A0A0: .4byte 0x02024064 + .pool thumb_func_end sub_818A064 thumb_func_start sub_818A0A4 sub_818A0A4: @ 818A0A4 push {r4-r6,lr} - ldr r5, _0818A0E4 + ldr r5, =0x02024064 ldrb r0, [r5] - ldr r6, _0818A0E8 + ldr r6, =0x03005d70 adds r1, r0, r6 ldrb r1, [r1] movs r2, 0 @@ -805976,17 +778865,16 @@ sub_818A0A4: @ 818A0A4 bl heathbar_draw_hp b _0818A106 .align 2, 0 -_0818A0E4: .4byte 0x02024064 -_0818A0E8: .4byte 0x03005d70 + .pool _0818A0EC: - ldr r2, _0818A10C + ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0818A110 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 bl sub_818A514 @@ -805995,16 +778883,15 @@ _0818A106: pop {r0} bx r0 .align 2, 0 -_0818A10C: .4byte 0x0202406e -_0818A110: .4byte 0x020244ec + .pool thumb_func_end sub_818A0A4 thumb_func_start sub_818A114 sub_818A114: @ 818A114 push {r4-r6,lr} - ldr r6, _0818A198 - ldr r5, _0818A19C - ldr r4, _0818A1A0 + ldr r6, =0x02020630 + ldr r5, =0x020241e4 + ldr r4, =0x02024064 ldrb r2, [r4] adds r0, r2, r5 ldrb r1, [r0] @@ -806019,13 +778906,13 @@ sub_818A114: @ 818A114 adds r1, r0 cmp r1, 0xA0 ble _0818A190 - ldr r1, _0818A1A4 + ldr r1, =0x0202406e lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0818A1A8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -806051,7 +778938,7 @@ sub_818A114: @ 818A114 lsls r0, 2 adds r0, r6 bl obj_delete_and_free_tiles - ldr r1, _0818A1AC + ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -806062,20 +778949,15 @@ _0818A190: pop {r0} bx r0 .align 2, 0 -_0818A198: .4byte 0x02020630 -_0818A19C: .4byte 0x020241e4 -_0818A1A0: .4byte 0x02024064 -_0818A1A4: .4byte 0x0202406e -_0818A1A8: .4byte 0x020244ec -_0818A1AC: .4byte 0x03005d70 + .pool thumb_func_end sub_818A114 thumb_func_start sub_818A1B0 sub_818A1B0: @ 818A1B0 push {r4-r6,lr} - ldr r0, _0818A20C + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r6, _0818A210 + ldr r6, =0x02024064 ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -806087,13 +778969,13 @@ sub_818A1B0: @ 818A1B0 ands r0, r1 cmp r0, 0 bne _0818A204 - ldr r5, _0818A214 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0818A218 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -806104,7 +778986,7 @@ sub_818A1B0: @ 818A1B0 lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r1, _0818A21C + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -806115,11 +778997,7 @@ _0818A204: pop {r0} bx r0 .align 2, 0 -_0818A20C: .4byte 0x020244d0 -_0818A210: .4byte 0x02024064 -_0818A214: .4byte 0x020241e4 -_0818A218: .4byte 0x02020630 -_0818A21C: .4byte 0x03005d70 + .pool thumb_func_end sub_818A1B0 thumb_func_start sub_818A220 @@ -806139,12 +779017,12 @@ _0818A232: thumb_func_start sub_818A238 sub_818A238: @ 818A238 push {r4,lr} - ldr r1, _0818A274 - ldr r0, _0818A278 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _0818A27C + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -806162,15 +779040,12 @@ sub_818A238: @ 818A238 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, _0818A280 + ldr r0, =0x020244b9 strb r3, [r0] bl sub_818A514 b _0818A2AE .align 2, 0 -_0818A274: .4byte 0x020241e4 -_0818A278: .4byte 0x02024064 -_0818A27C: .4byte 0x02020630 -_0818A280: .4byte 0x020244b9 + .pool _0818A284: ldrh r0, [r4, 0x30] movs r1, 0x3 @@ -806203,9 +779078,9 @@ _0818A2AE: thumb_func_start sub_818A2B4 sub_818A2B4: @ 818A2B4 push {r4,lr} - ldr r2, _0818A30C - ldr r0, _0818A310 - ldr r4, _0818A314 + ldr r2, =0x02020630 + ldr r0, =0x03005d70 + ldr r4, =0x02024064 ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -806215,12 +779090,12 @@ sub_818A2B4: @ 818A2B4 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0818A318 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0818A306 adds r0, r3, 0 bl sub_805E408 - ldr r0, _0818A31C + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r2, [r4] ldr r1, [r0] @@ -806236,32 +779111,26 @@ sub_818A2B4: @ 818A2B4 movs r3, 0x6 bl move_anim_start_t4 _0818A2FA: - ldr r0, _0818A320 + ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, _0818A324 + ldr r0, =sub_818A328 + 1 str r0, [r1] _0818A306: pop {r4} pop {r0} bx r0 .align 2, 0 -_0818A30C: .4byte 0x02020630 -_0818A310: .4byte 0x03005d70 -_0818A314: .4byte 0x02024064 -_0818A318: .4byte nullsub_12 + 1 -_0818A31C: .4byte 0x020244d0 -_0818A320: .4byte 0x03005d60 -_0818A324: .4byte sub_818A328 + 1 + .pool thumb_func_end sub_818A2B4 thumb_func_start sub_818A328 sub_818A328: @ 818A328 push {lr} - ldr r0, _0818A368 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _0818A36C + ldr r0, =0x02024064 ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -806273,8 +779142,8 @@ sub_818A328: @ 818A328 ands r0, r1 cmp r0, 0 bne _0818A364 - ldr r2, _0818A370 - ldr r0, _0818A374 + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -806283,7 +779152,7 @@ sub_818A328: @ 818A328 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0818A378 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0818A364 bl sub_818A514 @@ -806291,11 +779160,7 @@ _0818A364: pop {r0} bx r0 .align 2, 0 -_0818A368: .4byte 0x020244d0 -_0818A36C: .4byte 0x02024064 -_0818A370: .4byte 0x02020630 -_0818A374: .4byte 0x020241e4 -_0818A378: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_818A328 thumb_func_start sub_818A37C @@ -806303,9 +779168,9 @@ sub_818A37C: @ 818A37C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r3, _0818A444 + ldr r3, =0x020244d0 ldr r0, [r3] - ldr r7, _0818A448 + ldr r7, =0x02024064 ldrb r1, [r7] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -806333,15 +779198,15 @@ sub_818A37C: @ 818A37C negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r4, _0818A44C + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - ldr r0, _0818A450 + ldr r0, =c3_0802FDF4 + 1 movs r1, 0xA bl AddTask - ldr r0, _0818A454 + ldr r0, =0x0202406e mov r8, r0 ldrb r1, [r7] lsls r0, r1, 1 @@ -806349,21 +779214,21 @@ sub_818A37C: @ 818A37C ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _0818A458 + ldr r5, =0x020244ec adds r0, r5 bl sub_805E990 - ldr r1, _0818A45C + ldr r1, =0x020241e4 ldrb r0, [r7] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0818A460 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 bl obj_anim_image_start - ldr r4, _0818A464 + ldr r4, =0x03005d70 ldrb r1, [r7] adds r0, r1, r4 ldrb r0, [r0] @@ -806380,11 +779245,11 @@ sub_818A37C: @ 818A37C adds r0, r4 ldrb r0, [r0] bl sub_80729D0 - ldr r1, _0818A468 + ldr r1, =0x03005d60 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, _0818A46C + ldr r1, =sub_818A2B4 + 1 str r1, [r0] _0818A438: pop {r3} @@ -806393,25 +779258,15 @@ _0818A438: pop {r0} bx r0 .align 2, 0 -_0818A444: .4byte 0x020244d0 -_0818A448: .4byte 0x02024064 -_0818A44C: .4byte 0x000027f9 -_0818A450: .4byte c3_0802FDF4 + 1 -_0818A454: .4byte 0x0202406e -_0818A458: .4byte 0x020244ec -_0818A45C: .4byte 0x020241e4 -_0818A460: .4byte 0x02020630 -_0818A464: .4byte 0x03005d70 -_0818A468: .4byte 0x03005d60 -_0818A46C: .4byte sub_818A2B4 + 1 + .pool thumb_func_end sub_818A37C thumb_func_start sub_818A470 sub_818A470: @ 818A470 push {r4-r6,lr} - ldr r6, _0818A4F0 + ldr r6, =0x020244d0 ldr r0, [r6] - ldr r4, _0818A4F4 + ldr r4, =0x02024064 ldrb r2, [r4] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -806423,18 +779278,18 @@ sub_818A470: @ 818A470 ands r0, r1 cmp r0, 0 bne _0818A4A2 - ldr r0, _0818A4F8 + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _0818A4FC + ldr r0, =0x020244ec adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 _0818A4A2: - ldr r5, _0818A500 - ldr r0, _0818A504 + ldr r5, =0x02020630 + ldr r0, =0x03005d7c ldrb r2, [r4] adds r0, r2, r0 ldrb r1, [r0] @@ -806445,7 +779300,7 @@ _0818A4A2: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _0818A508 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _0818A4E8 ldr r0, [r6] @@ -806461,40 +779316,32 @@ _0818A4A2: bne _0818A4E8 adds r0, r3, r5 bl obj_delete_and_free_tiles - ldr r1, _0818A50C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0818A510 + ldr r1, =sub_818A37C + 1 str r1, [r0] _0818A4E8: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0818A4F0: .4byte 0x020244d0 -_0818A4F4: .4byte 0x02024064 -_0818A4F8: .4byte 0x0202406e -_0818A4FC: .4byte 0x020244ec -_0818A500: .4byte 0x02020630 -_0818A504: .4byte 0x03005d7c -_0818A508: .4byte nullsub_12 + 1 -_0818A50C: .4byte 0x03005d60 -_0818A510: .4byte sub_818A37C + 1 + .pool thumb_func_end sub_818A470 thumb_func_start sub_818A514 sub_818A514: @ 818A514 push {r4,lr} sub sp, 0x4 - ldr r1, _0818A554 - ldr r4, _0818A558 + ldr r1, =0x03005d60 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0818A55C + ldr r1, =sub_8189968 + 1 str r1, [r0] - ldr r0, _0818A560 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -806507,7 +779354,7 @@ sub_818A514: @ 818A514 movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _0818A564 + ldr r1, =0x02023064 ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -806515,14 +779362,10 @@ sub_818A514: @ 818A514 strb r1, [r0] b _0818A57A .align 2, 0 -_0818A554: .4byte 0x03005d60 -_0818A558: .4byte 0x02024064 -_0818A55C: .4byte sub_8189968 + 1 -_0818A560: .4byte 0x02022fec -_0818A564: .4byte 0x02023064 + .pool _0818A568: - ldr r2, _0818A584 - ldr r1, _0818A588 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -806536,16 +779379,15 @@ _0818A57A: pop {r0} bx r0 .align 2, 0 -_0818A584: .4byte 0x02024068 -_0818A588: .4byte 0x0832a328 + .pool thumb_func_end sub_818A514 thumb_func_start sub_818A58C sub_818A58C: @ 818A58C push {lr} - ldr r0, _0818A5B4 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0818A5B8 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -806562,16 +779404,15 @@ _0818A5AE: pop {r0} bx r0 .align 2, 0 -_0818A5B4: .4byte 0x020244d0 -_0818A5B8: .4byte 0x02024064 + .pool thumb_func_end sub_818A58C thumb_func_start sub_818A5BC sub_818A5BC: @ 818A5BC push {lr} - ldr r0, _0818A5E4 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0818A5E8 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -806588,8 +779429,7 @@ _0818A5DE: pop {r0} bx r0 .align 2, 0 -_0818A5E4: .4byte 0x020244d0 -_0818A5E8: .4byte 0x02024064 + .pool thumb_func_end sub_818A5BC thumb_func_start sub_818A5EC @@ -806597,8 +779437,8 @@ sub_818A5EC: @ 818A5EC push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _0818A618 - ldr r0, _0818A61C + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -806606,7 +779446,7 @@ sub_818A5EC: @ 818A5EC ldrb r0, [r1] cmp r0, 0 bne _0818A624 - ldr r0, _0818A620 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -806615,9 +779455,7 @@ sub_818A5EC: @ 818A5EC adds r6, r0, 0 b _0818A646 .align 2, 0 -_0818A618: .4byte 0x02023064 -_0818A61C: .4byte 0x02024064 -_0818A620: .4byte 0x0202406e + .pool _0818A624: ldrb r4, [r1] movs r5, 0 @@ -806662,8 +779500,8 @@ sub_818A660: @ 818A660 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _0818A694 - ldr r3, _0818A698 + ldr r2, =0x02023064 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -806674,14 +779512,12 @@ sub_818A660: @ 818A660 bl _0818ADF6 _0818A68A: lsls r0, 2 - ldr r1, _0818A69C + ldr r1, =_0818A6A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0818A694: .4byte 0x02023064 -_0818A698: .4byte 0x02024064 -_0818A69C: .4byte _0818A6A0 + .pool .align 2, 0 _0818A6A0: .4byte _0818A790 @@ -806748,7 +779584,7 @@ _0818A790: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0818A9A4 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -806801,7 +779637,7 @@ _0818A7DC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0818A9A4 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -806837,7 +779673,7 @@ _0818A7DC: ands r0, r6 lsls r0, 5 ldrh r2, [r3, 0x14] - ldr r1, _0818A9A8 + ldr r1, =0xfffffc1f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x14] @@ -806860,7 +779696,7 @@ _0818A7DC: ands r1, r0 lsls r1, 15 ldr r0, [sp, 0x14] - ldr r2, _0818A9AC + ldr r2, =0xfff07fff ands r0, r2 orrs r0, r1 str r0, [sp, 0x14] @@ -806871,7 +779707,7 @@ _0818A7DC: ands r0, r6 lsls r0, 4 ldrh r2, [r3, 0x16] - ldr r1, _0818A9B0 + ldr r1, =0xfffffe0f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x16] @@ -806985,28 +779821,25 @@ _0818A994: bls _0818A994 b _0818ADF6 .align 2, 0 -_0818A9A4: .4byte 0x020244ec -_0818A9A8: .4byte 0xfffffc1f -_0818A9AC: .4byte 0xfff07fff -_0818A9B0: .4byte 0xfffffe0f + .pool _0818A9B4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818A9C0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB b _0818AD2E .align 2, 0 -_0818A9C0: .4byte 0x020244ec + .pool _0818A9C4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818A9D0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC b _0818AD2E .align 2, 0 -_0818A9D0: .4byte 0x020244ec + .pool _0818A9D4: movs r6, 0 add r2, sp, 0x58 @@ -807016,7 +779849,7 @@ _0818A9D4: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0818AA38 + ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 _0818A9EA: @@ -807040,7 +779873,7 @@ _0818A9EA: ble _0818A9EA movs r0, 0x64 muls r0, r5 - ldr r1, _0818AA38 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -807058,11 +779891,11 @@ _0818AA28: bls _0818AA28 b _0818ADF6 .align 2, 0 -_0818AA38: .4byte 0x020244ec + .pool _0818AA3C: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AA54 + ldr r1, =0x020244ec adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -807072,13 +779905,13 @@ _0818AA3C: adds r1, 0x9 b _0818AD2E .align 2, 0 -_0818AA54: .4byte 0x020244ec + .pool _0818AA58: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _0818AA90 + ldr r2, =0x020244ec mov r8, r2 _0818AA64: adds r1, r6, 0 @@ -807093,7 +779926,7 @@ _0818AA64: ble _0818AA64 movs r0, 0x64 muls r0, r5 - ldr r1, _0818AA90 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -807102,11 +779935,11 @@ _0818AA64: adds r6, 0x1 b _0818ADF6 .align 2, 0 -_0818AA90: .4byte 0x020244ec + .pool _0818AA94: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AAAC + ldr r1, =0x020244ec adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -807116,20 +779949,20 @@ _0818AA94: adds r1, 0x8 b _0818ADEE .align 2, 0 -_0818AAAC: .4byte 0x020244ec + .pool _0818AAB0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AABC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 b _0818AACA .align 2, 0 -_0818AABC: .4byte 0x020244ec + .pool _0818AAC0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AAEC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x19 _0818AACA: @@ -807149,120 +779982,120 @@ _0818AACA: movs r6, 0x3 b _0818ADF6 .align 2, 0 -_0818AAEC: .4byte 0x020244ec + .pool _0818AAF0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AAFC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A b _0818ADEE .align 2, 0 -_0818AAFC: .4byte 0x020244ec + .pool _0818AB00: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AB0C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B b _0818ADEE .align 2, 0 -_0818AB0C: .4byte 0x020244ec + .pool _0818AB10: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AB1C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C b _0818ADEE .align 2, 0 -_0818AB1C: .4byte 0x020244ec + .pool _0818AB20: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AB2C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D b _0818ADEE .align 2, 0 -_0818AB2C: .4byte 0x020244ec + .pool _0818AB30: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AB3C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E b _0818ADEE .align 2, 0 -_0818AB3C: .4byte 0x020244ec + .pool _0818AB40: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AB4C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F b _0818ADEE .align 2, 0 -_0818AB4C: .4byte 0x020244ec + .pool _0818AB50: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AB5C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 b _0818ADEE .align 2, 0 -_0818AB5C: .4byte 0x020244ec + .pool _0818AB60: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AB6C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 b _0818ADEE .align 2, 0 -_0818AB6C: .4byte 0x020244ec + .pool _0818AB70: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AB7C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 b _0818ADEE .align 2, 0 -_0818AB7C: .4byte 0x020244ec + .pool _0818AB80: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AB8C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 b _0818ADEE .align 2, 0 -_0818AB8C: .4byte 0x020244ec + .pool _0818AB90: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AB9C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 b _0818ADEE .align 2, 0 -_0818AB9C: .4byte 0x020244ec + .pool _0818ABA0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818ABAC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 b _0818ADEE .align 2, 0 -_0818ABAC: .4byte 0x020244ec + .pool _0818ABB0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0818ABFC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -807291,83 +780124,83 @@ _0818ABB0: movs r6, 0x6 b _0818ADF6 .align 2, 0 -_0818ABFC: .4byte 0x020244ec + .pool _0818AC00: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AC0C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 b _0818ADEE .align 2, 0 -_0818AC0C: .4byte 0x020244ec + .pool _0818AC10: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AC1C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 b _0818ADEE .align 2, 0 -_0818AC1C: .4byte 0x020244ec + .pool _0818AC20: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AC2C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 b _0818ADEE .align 2, 0 -_0818AC2C: .4byte 0x020244ec + .pool _0818AC30: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AC3C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A b _0818ADEE .align 2, 0 -_0818AC3C: .4byte 0x020244ec + .pool _0818AC40: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AC4C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B b _0818ADEE .align 2, 0 -_0818AC4C: .4byte 0x020244ec + .pool _0818AC50: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AC5C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C b _0818ADEE .align 2, 0 -_0818AC5C: .4byte 0x020244ec + .pool _0818AC60: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AC6C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0 b _0818AC8A .align 2, 0 -_0818AC6C: .4byte 0x020244ec + .pool _0818AC70: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AC7C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 b _0818AD2E .align 2, 0 -_0818AC7C: .4byte 0x020244ec + .pool _0818AC80: movs r0, 0x64 muls r0, r5 - ldr r1, _0818ACB0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x37 _0818AC8A: @@ -807389,74 +780222,74 @@ _0818AC8A: movs r6, 0x4 b _0818ADF6 .align 2, 0 -_0818ACB0: .4byte 0x020244ec + .pool _0818ACB4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818ACC0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 b _0818ADEE .align 2, 0 -_0818ACC0: .4byte 0x020244ec + .pool _0818ACC4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818ACD0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 b _0818AD2E .align 2, 0 -_0818ACD0: .4byte 0x020244ec + .pool _0818ACD4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818ACE0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A b _0818AD2E .align 2, 0 -_0818ACE0: .4byte 0x020244ec + .pool _0818ACE4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818ACF0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B b _0818AD2E .align 2, 0 -_0818ACF0: .4byte 0x020244ec + .pool _0818ACF4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AD00 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C b _0818AD2E .align 2, 0 -_0818AD00: .4byte 0x020244ec + .pool _0818AD04: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AD10 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D b _0818AD2E .align 2, 0 -_0818AD10: .4byte 0x020244ec + .pool _0818AD14: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AD20 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E b _0818AD2E .align 2, 0 -_0818AD20: .4byte 0x020244ec + .pool _0818AD24: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AD40 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3F _0818AD2E: @@ -807469,101 +780302,101 @@ _0818AD2E: movs r6, 0x2 b _0818ADF6 .align 2, 0 -_0818AD40: .4byte 0x020244ec + .pool _0818AD44: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AD50 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 b _0818ADEE .align 2, 0 -_0818AD50: .4byte 0x020244ec + .pool _0818AD54: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AD60 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 b _0818ADEE .align 2, 0 -_0818AD60: .4byte 0x020244ec + .pool _0818AD64: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AD70 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 b _0818ADEE .align 2, 0 -_0818AD70: .4byte 0x020244ec + .pool _0818AD74: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AD80 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 b _0818ADEE .align 2, 0 -_0818AD80: .4byte 0x020244ec + .pool _0818AD84: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AD90 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F b _0818ADEE .align 2, 0 -_0818AD90: .4byte 0x020244ec + .pool _0818AD94: movs r0, 0x64 muls r0, r5 - ldr r1, _0818ADA0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 b _0818ADEE .align 2, 0 -_0818ADA0: .4byte 0x020244ec + .pool _0818ADA4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818ADB0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 b _0818ADEE .align 2, 0 -_0818ADB0: .4byte 0x020244ec + .pool _0818ADB4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818ADC0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 b _0818ADEE .align 2, 0 -_0818ADC0: .4byte 0x020244ec + .pool _0818ADC4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818ADD0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 b _0818ADEE .align 2, 0 -_0818ADD0: .4byte 0x020244ec + .pool _0818ADD4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818ADE0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 b _0818ADEE .align 2, 0 -_0818ADE0: .4byte 0x020244ec + .pool _0818ADE4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818AE08 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 _0818ADEE: @@ -807581,7 +780414,7 @@ _0818ADF6: pop {r1} bx r1 .align 2, 0 -_0818AE08: .4byte 0x020244ec + .pool thumb_func_end sub_818A660 thumb_func_start sub_818AE0C @@ -807595,8 +780428,8 @@ sub_818AE0C: @ 818AE0C thumb_func_start sub_818AE18 sub_818AE18: @ 818AE18 push {r4,r5,lr} - ldr r1, _0818AE3C - ldr r0, _0818AE40 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -807604,16 +780437,14 @@ sub_818AE18: @ 818AE18 ldrb r0, [r1] cmp r0, 0 bne _0818AE48 - ldr r0, _0818AE44 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_818AE70 b _0818AE66 .align 2, 0 -_0818AE3C: .4byte 0x02023064 -_0818AE40: .4byte 0x02024064 -_0818AE44: .4byte 0x0202406e + .pool _0818AE48: ldrb r4, [r1] movs r5, 0 @@ -807648,10 +780479,10 @@ sub_818AE70: @ 818AE70 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0818AEA8 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 - ldr r2, _0818AEAC + ldr r2, =0x02023067 adds r3, r0, r2 adds r6, r3, 0 subs r1, r2, 0x2 @@ -807663,14 +780494,12 @@ sub_818AE70: @ 818AE70 bl _0818B836 _0818AE9C: lsls r0, 2 - ldr r1, _0818AEB0 + ldr r1, =_0818AEB4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0818AEA8: .4byte 0x02024064 -_0818AEAC: .4byte 0x02023067 -_0818AEB0: .4byte _0818AEB4 + .pool .align 2, 0 _0818AEB4: .4byte _0818AFA4 @@ -807737,7 +780566,7 @@ _0818AFA4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0818B138 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -807804,7 +780633,7 @@ _0818B00A: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0818B138 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -807914,13 +780743,13 @@ _0818B00A: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B138: .4byte 0x020244ec + .pool _0818B13C: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B154 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B158 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -807928,14 +780757,13 @@ _0818B13C: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B154: .4byte 0x020244ec -_0818B158: .4byte 0x02024064 + .pool _0818B15C: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B174 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B178 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -807943,8 +780771,7 @@ _0818B15C: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B174: .4byte 0x020244ec -_0818B178: .4byte 0x02024064 + .pool _0818B17C: movs r0, 0 mov r8, r0 @@ -807954,7 +780781,7 @@ _0818B17C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _0818B1D0 + ldr r0, =0x020244ec adds r7, r1, r0 adds r6, r3, 0 adds r6, 0x8 @@ -807979,21 +780806,21 @@ _0818B196: ble _0818B196 movs r0, 0x64 muls r0, r5 - ldr r1, _0818B1D0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 mov r2, r9 bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B1D0: .4byte 0x020244ec + .pool _0818B1D4: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B1F0 + ldr r1, =0x020244ec adds r0, r1 - ldr r3, _0818B1F4 - ldr r1, _0818B1F8 + ldr r3, =0x02023064 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -808002,16 +780829,14 @@ _0818B1D4: adds r1, 0x9 b _0818B278 .align 2, 0 -_0818B1F0: .4byte 0x020244ec -_0818B1F4: .4byte 0x02023064 -_0818B1F8: .4byte 0x02024064 + .pool _0818B1FC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0818B258 + ldr r0, =0x020244ec adds r4, r0 - ldr r5, _0818B25C + ldr r5, =0x02024064 ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -808048,15 +780873,14 @@ _0818B1FC: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B258: .4byte 0x020244ec -_0818B25C: .4byte 0x02024064 + .pool _0818B260: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B284 + ldr r1, =0x020244ec adds r0, r1 - ldr r3, _0818B288 - ldr r1, _0818B28C + ldr r3, =0x02023064 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -808069,15 +780893,13 @@ _0818B278: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B284: .4byte 0x020244ec -_0818B288: .4byte 0x02023064 -_0818B28C: .4byte 0x02024064 + .pool _0818B290: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B2A8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B2AC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808085,14 +780907,13 @@ _0818B290: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B2A8: .4byte 0x020244ec -_0818B2AC: .4byte 0x02024064 + .pool _0818B2B0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B2C8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B2CC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808100,14 +780921,13 @@ _0818B2B0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B2C8: .4byte 0x020244ec -_0818B2CC: .4byte 0x02024064 + .pool _0818B2D0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B2E8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B2EC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808115,14 +780935,13 @@ _0818B2D0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B2E8: .4byte 0x020244ec -_0818B2EC: .4byte 0x02024064 + .pool _0818B2F0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B308 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B30C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808130,14 +780949,13 @@ _0818B2F0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B308: .4byte 0x020244ec -_0818B30C: .4byte 0x02024064 + .pool _0818B310: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B328 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B32C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808145,14 +780963,13 @@ _0818B310: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B328: .4byte 0x020244ec -_0818B32C: .4byte 0x02024064 + .pool _0818B330: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B348 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B34C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808160,14 +780977,13 @@ _0818B330: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B348: .4byte 0x020244ec -_0818B34C: .4byte 0x02024064 + .pool _0818B350: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B368 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B36C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808175,14 +780991,13 @@ _0818B350: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B368: .4byte 0x020244ec -_0818B36C: .4byte 0x02024064 + .pool _0818B370: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B388 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B38C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808190,14 +781005,13 @@ _0818B370: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B388: .4byte 0x020244ec -_0818B38C: .4byte 0x02024064 + .pool _0818B390: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B3A8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B3AC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808205,14 +781019,13 @@ _0818B390: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B3A8: .4byte 0x020244ec -_0818B3AC: .4byte 0x02024064 + .pool _0818B3B0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B3C8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B3CC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808220,14 +781033,13 @@ _0818B3B0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B3C8: .4byte 0x020244ec -_0818B3CC: .4byte 0x02024064 + .pool _0818B3D0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B3E8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B3EC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808235,14 +781047,13 @@ _0818B3D0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B3E8: .4byte 0x020244ec -_0818B3EC: .4byte 0x02024064 + .pool _0818B3F0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B408 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B40C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808250,14 +781061,13 @@ _0818B3F0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B408: .4byte 0x020244ec -_0818B40C: .4byte 0x02024064 + .pool _0818B410: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B428 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B42C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808265,14 +781075,13 @@ _0818B410: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B428: .4byte 0x020244ec -_0818B42C: .4byte 0x02024064 + .pool _0818B430: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B448 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B44C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808280,15 +781089,14 @@ _0818B430: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B448: .4byte 0x020244ec -_0818B44C: .4byte 0x02024064 + .pool _0818B450: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _0818B4B8 + ldr r0, =0x020244ec adds r4, r0 - ldr r5, _0818B4BC + ldr r5, =0x02024064 ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -808330,14 +781138,13 @@ _0818B450: adds r0, r4, 0 b _0818B570 .align 2, 0 -_0818B4B8: .4byte 0x020244ec -_0818B4BC: .4byte 0x02024064 + .pool _0818B4C0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B4D8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B4DC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808345,14 +781152,13 @@ _0818B4C0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B4D8: .4byte 0x020244ec -_0818B4DC: .4byte 0x02024064 + .pool _0818B4E0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B4F8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B4FC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808360,14 +781166,13 @@ _0818B4E0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B4F8: .4byte 0x020244ec -_0818B4FC: .4byte 0x02024064 + .pool _0818B500: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B518 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B51C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808375,14 +781180,13 @@ _0818B500: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B518: .4byte 0x020244ec -_0818B51C: .4byte 0x02024064 + .pool _0818B520: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B538 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B53C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808390,14 +781194,13 @@ _0818B520: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B538: .4byte 0x020244ec -_0818B53C: .4byte 0x02024064 + .pool _0818B540: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B558 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B55C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808405,14 +781208,13 @@ _0818B540: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B558: .4byte 0x020244ec -_0818B55C: .4byte 0x02024064 + .pool _0818B560: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B578 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B57C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808421,14 +781223,13 @@ _0818B570: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B578: .4byte 0x020244ec -_0818B57C: .4byte 0x02024064 + .pool _0818B580: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B598 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B59C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808436,14 +781237,13 @@ _0818B580: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B598: .4byte 0x020244ec -_0818B59C: .4byte 0x02024064 + .pool _0818B5A0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B5B8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B5BC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808451,14 +781251,13 @@ _0818B5A0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B5B8: .4byte 0x020244ec -_0818B5BC: .4byte 0x02024064 + .pool _0818B5C0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B5D8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B5DC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808466,14 +781265,13 @@ _0818B5C0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B5D8: .4byte 0x020244ec -_0818B5DC: .4byte 0x02024064 + .pool _0818B5E0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B5F8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B5FC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808481,14 +781279,13 @@ _0818B5E0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B5F8: .4byte 0x020244ec -_0818B5FC: .4byte 0x02024064 + .pool _0818B600: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B618 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B61C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808496,14 +781293,13 @@ _0818B600: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B618: .4byte 0x020244ec -_0818B61C: .4byte 0x02024064 + .pool _0818B620: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B638 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B63C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808511,14 +781307,13 @@ _0818B620: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B638: .4byte 0x020244ec -_0818B63C: .4byte 0x02024064 + .pool _0818B640: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B658 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B65C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808526,14 +781321,13 @@ _0818B640: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B658: .4byte 0x020244ec -_0818B65C: .4byte 0x02024064 + .pool _0818B660: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B678 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B67C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808541,14 +781335,13 @@ _0818B660: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B678: .4byte 0x020244ec -_0818B67C: .4byte 0x02024064 + .pool _0818B680: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B698 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B69C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808556,14 +781349,13 @@ _0818B680: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B698: .4byte 0x020244ec -_0818B69C: .4byte 0x02024064 + .pool _0818B6A0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B6B8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B6BC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808571,14 +781363,13 @@ _0818B6A0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B6B8: .4byte 0x020244ec -_0818B6BC: .4byte 0x02024064 + .pool _0818B6C0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B6D8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B6DC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808586,14 +781377,13 @@ _0818B6C0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B6D8: .4byte 0x020244ec -_0818B6DC: .4byte 0x02024064 + .pool _0818B6E0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B6F8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B6FC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808601,14 +781391,13 @@ _0818B6E0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B6F8: .4byte 0x020244ec -_0818B6FC: .4byte 0x02024064 + .pool _0818B700: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B718 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B71C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808616,14 +781405,13 @@ _0818B700: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B718: .4byte 0x020244ec -_0818B71C: .4byte 0x02024064 + .pool _0818B720: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B738 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B73C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808631,14 +781419,13 @@ _0818B720: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B738: .4byte 0x020244ec -_0818B73C: .4byte 0x02024064 + .pool _0818B740: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B758 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B75C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808646,14 +781433,13 @@ _0818B740: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B758: .4byte 0x020244ec -_0818B75C: .4byte 0x02024064 + .pool _0818B760: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B778 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B77C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808661,14 +781447,13 @@ _0818B760: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B778: .4byte 0x020244ec -_0818B77C: .4byte 0x02024064 + .pool _0818B780: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B798 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B79C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808676,14 +781461,13 @@ _0818B780: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B798: .4byte 0x020244ec -_0818B79C: .4byte 0x02024064 + .pool _0818B7A0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B7B8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B7BC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808691,14 +781475,13 @@ _0818B7A0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B7B8: .4byte 0x020244ec -_0818B7BC: .4byte 0x02024064 + .pool _0818B7C0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B7D8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B7DC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808706,14 +781489,13 @@ _0818B7C0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B7D8: .4byte 0x020244ec -_0818B7DC: .4byte 0x02024064 + .pool _0818B7E0: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B7F8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B7FC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808721,14 +781503,13 @@ _0818B7E0: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B7F8: .4byte 0x020244ec -_0818B7FC: .4byte 0x02024064 + .pool _0818B800: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B818 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B81C + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -808736,29 +781517,28 @@ _0818B800: bl pokemon_setattr b _0818B836 .align 2, 0 -_0818B818: .4byte 0x020244ec -_0818B81C: .4byte 0x02024064 + .pool _0818B820: movs r0, 0x64 muls r0, r5 - ldr r1, _0818B860 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _0818B864 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 bl pokemon_setattr _0818B836: - ldr r2, _0818B868 - ldr r0, _0818B864 + ldr r2, =0x0202406e + ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0818B860 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 add sp, 0x34 @@ -808770,16 +781550,14 @@ _0818B836: pop {r0} bx r0 .align 2, 0 -_0818B860: .4byte 0x020244ec -_0818B864: .4byte 0x02024064 -_0818B868: .4byte 0x0202406e + .pool thumb_func_end sub_818AE70 thumb_func_start sub_818B86C sub_818B86C: @ 818B86C push {r4-r7,lr} - ldr r1, _0818B8D0 - ldr r7, _0818B8D4 + ldr r1, =0x0202406e + ldr r7, =0x02024064 ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -808787,12 +781565,12 @@ sub_818B86C: @ 818B86C movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, _0818B8D8 + ldr r4, =0x02023064 lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 ldrb r0, [r0] - ldr r1, _0818B8DC + ldr r1, =0x020244ec adds r0, r1 adds r5, r3, r0 movs r3, 0 @@ -808828,10 +781606,7 @@ _0818B8C4: pop {r0} bx r0 .align 2, 0 -_0818B8D0: .4byte 0x0202406e -_0818B8D4: .4byte 0x02024064 -_0818B8D8: .4byte 0x02023064 -_0818B8DC: .4byte 0x020244ec + .pool thumb_func_end sub_818B86C thumb_func_start sub_818B8E0 @@ -808839,16 +781614,16 @@ sub_818B8E0: @ 818B8E0 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _0818B9D4 + ldr r0, =0x0202406e mov r8, r0 - ldr r6, _0818B9D8 + ldr r6, =0x02024064 ldrb r1, [r6] lsls r0, r1, 1 add r0, r8 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _0818B9DC + ldr r4, =0x020244ec adds r0, r4 bl sub_805DD7C ldrb r0, [r6] @@ -808869,7 +781644,7 @@ sub_818B8E0: @ 818B8E0 lsrs r1, 24 adds r0, r4, 0 bl sub_806A068 - ldr r0, _0818B9E0 + ldr r0, =0x0202499c mov r8, r0 ldrb r0, [r6] movs r1, 0x2 @@ -808891,11 +781666,11 @@ sub_818B8E0: @ 818B8E0 adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _0818B9E4 + ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, _0818B9E8 + ldr r5, =0x02020630 ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -808903,7 +781678,7 @@ sub_818B8E0: @ 818B8E0 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0818B9EC + ldr r1, =0x0000ff10 strh r1, [r0, 0x24] ldrb r2, [r6] adds r0, r2, r4 @@ -808933,15 +781708,15 @@ sub_818B8E0: @ 818B8E0 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0818B9F0 + ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] bl obj_anim_image_start - ldr r1, _0818B9F4 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _0818B9F8 + ldr r1, =sub_818A064 + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -808949,30 +781724,21 @@ sub_818B8E0: @ 818B8E0 pop {r0} bx r0 .align 2, 0 -_0818B9D4: .4byte 0x0202406e -_0818B9D8: .4byte 0x02024064 -_0818B9DC: .4byte 0x020244ec -_0818B9E0: .4byte 0x0202499c -_0818B9E4: .4byte 0x020241e4 -_0818B9E8: .4byte 0x02020630 -_0818B9EC: .4byte 0x0000ff10 -_0818B9F0: .4byte 0x020244e4 -_0818B9F4: .4byte 0x03005d60 -_0818B9F8: .4byte sub_818A064 + 1 + .pool thumb_func_end sub_818B8E0 thumb_func_start sub_818B9FC sub_818B9FC: @ 818B9FC push {r4-r6,lr} - ldr r5, _0818BA54 + ldr r5, =0x02024064 ldrb r0, [r5] - ldr r4, _0818BA58 + ldr r4, =0x02023064 lsls r1, r0, 9 adds r6, r4, 0x2 adds r1, r6 ldrb r1, [r1] bl sub_805EF84 - ldr r2, _0818BA5C + ldr r2, =0x0202406e ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -808987,7 +781753,7 @@ sub_818B9FC: @ 818B9FC ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0818BA60 + ldr r2, =0x020244ec adds r0, r2 bl sub_805DD7C ldrb r0, [r5] @@ -808995,22 +781761,17 @@ sub_818B9FC: @ 818B9FC adds r1, r6 ldrb r1, [r1] bl sub_818BA6C - ldr r1, _0818BA64 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0818BA68 + ldr r1, =sub_818A470 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0818BA54: .4byte 0x02024064 -_0818BA58: .4byte 0x02023064 -_0818BA5C: .4byte 0x0202406e -_0818BA60: .4byte 0x020244ec -_0818BA64: .4byte 0x03005d60 -_0818BA68: .4byte sub_818A470 + 1 + .pool thumb_func_end sub_818B9FC thumb_func_start sub_818BA6C @@ -809027,10 +781788,10 @@ sub_818BA6C: @ 818BA6C lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, _0818BBC0 + ldr r0, =0x0202406e lsls r2, r6, 1 adds r2, r0 - ldr r0, _0818BBC4 + ldr r0, =0x02023064 lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -809039,7 +781800,7 @@ sub_818BA6C: @ 818BA6C ldrh r1, [r2] movs r0, 0x64 muls r0, r1 - ldr r1, _0818BBC8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -809047,9 +781808,9 @@ sub_818BA6C: @ 818BA6C lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _0818BBCC + ldr r0, =sub_805D714 + 1 bl object_new_hidden_with_callback - ldr r1, _0818BBD0 + ldr r1, =0x03005d7c mov r9, r1 add r9, r6 mov r1, r9 @@ -809061,7 +781822,7 @@ sub_818BA6C: @ 818BA6C lsrs r1, 24 mov r0, r8 bl sub_806A068 - ldr r0, _0818BBD4 + ldr r0, =0x0202499c mov r10, r0 adds r0, r6, 0 movs r1, 0x2 @@ -809083,10 +781844,10 @@ sub_818BA6C: @ 818BA6C adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _0818BBD8 + ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] - ldr r5, _0818BBDC + ldr r5, =0x02020630 mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -809131,7 +781892,7 @@ sub_818BA6C: @ 818BA6C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0818BBE0 + ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] bl obj_anim_image_start @@ -809152,7 +781913,7 @@ sub_818BA6C: @ 818BA6C adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0818BBE4 + ldr r1, =nullsub_12 + 1 str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -809174,23 +781935,14 @@ sub_818BA6C: @ 818BA6C pop {r0} bx r0 .align 2, 0 -_0818BBC0: .4byte 0x0202406e -_0818BBC4: .4byte 0x02023064 -_0818BBC8: .4byte 0x020244ec -_0818BBCC: .4byte sub_805D714 + 1 -_0818BBD0: .4byte 0x03005d7c -_0818BBD4: .4byte 0x0202499c -_0818BBD8: .4byte 0x020241e4 -_0818BBDC: .4byte 0x02020630 -_0818BBE0: .4byte 0x020244e4 -_0818BBE4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_818BA6C thumb_func_start sub_818BBE8 sub_818BBE8: @ 818BBE8 push {r4-r6,lr} - ldr r1, _0818BC1C - ldr r6, _0818BC20 + ldr r1, =0x02023064 + ldr r6, =0x02024064 ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -809198,7 +781950,7 @@ sub_818BBE8: @ 818BBE8 ldrb r3, [r0] cmp r3, 0 bne _0818BC30 - ldr r0, _0818BC24 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -809206,27 +781958,23 @@ sub_818BBE8: @ 818BBE8 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, _0818BC28 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _0818BC2C + ldr r1, =sub_818BC78 + 1 str r1, [r0] b _0818BC66 .align 2, 0 -_0818BC1C: .4byte 0x02023064 -_0818BC20: .4byte 0x02024064 -_0818BC24: .4byte 0x020244d0 -_0818BC28: .4byte 0x03005d60 -_0818BC2C: .4byte sub_818BC78 + 1 + .pool _0818BC30: - ldr r5, _0818BC6C + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0818BC70 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -809237,7 +781985,7 @@ _0818BC30: lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r1, _0818BC74 + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -809248,17 +781996,15 @@ _0818BC66: pop {r0} bx r0 .align 2, 0 -_0818BC6C: .4byte 0x020241e4 -_0818BC70: .4byte 0x02020630 -_0818BC74: .4byte 0x03005d70 + .pool thumb_func_end sub_818BBE8 thumb_func_start sub_818BC78 sub_818BC78: @ 818BC78 push {r4-r6,lr} - ldr r6, _0818BC98 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _0818BC9C + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -809272,8 +782018,7 @@ sub_818BC78: @ 818BC78 beq _0818BCCE b _0818BCF6 .align 2, 0 -_0818BC98: .4byte 0x020244d0 -_0818BC9C: .4byte 0x02024064 + .pool _0818BCA0: ldr r1, [r4] lsls r0, r2, 2 @@ -809312,19 +782057,18 @@ _0818BCCE: adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r1, _0818BCFC + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0818BD00 + ldr r1, =sub_818A1B0 + 1 str r1, [r0] _0818BCF6: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0818BCFC: .4byte 0x03005d60 -_0818BD00: .4byte sub_818A1B0 + 1 + .pool thumb_func_end sub_818BC78 thumb_func_start sub_818BD04 @@ -809333,7 +782077,7 @@ sub_818BD04: @ 818BD04 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _0818BD2C + ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x80 lsls r0, 18 @@ -809349,10 +782093,10 @@ sub_818BD04: @ 818BD04 lsrs r4, r0, 24 b _0818BD4C .align 2, 0 -_0818BD2C: .4byte 0x02022fec + .pool _0818BD30: - ldr r2, _0818BD40 - ldr r0, _0818BD44 + ldr r2, =0x020229e8 + ldr r0, =0x0203c7b4 ldrb r1, [r0] lsls r0, r1, 3 subs r0, r1 @@ -809360,21 +782104,20 @@ _0818BD30: adds r0, r2 b _0818BD4A .align 2, 0 -_0818BD40: .4byte 0x020229e8 -_0818BD44: .4byte 0x0203c7b4 + .pool _0818BD48: - ldr r0, _0818BD88 + ldr r0, =0x020229e8 _0818BD4A: ldrb r4, [r0, 0x13] _0818BD4C: - ldr r0, _0818BD8C + ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x40 ands r1, r2 adds r5, r0, 0 cmp r1, 0 beq _0818BD98 - ldr r0, _0818BD90 + ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status movs r1, 0x2 @@ -809394,18 +782137,15 @@ _0818BD72: beq _0818BD9C movs r0, 0x5A mov r9, r0 - ldr r1, _0818BD94 + ldr r1, =0x083054e0 b _0818BD9E .align 2, 0 -_0818BD88: .4byte 0x020229e8 -_0818BD8C: .4byte 0x02022fec -_0818BD90: .4byte 0x02024064 -_0818BD94: .4byte 0x083054e0 + .pool _0818BD98: movs r0, 0x50 mov r9, r0 _0818BD9C: - ldr r1, _0818BEB8 + ldr r1, =0x08305d2c _0818BD9E: lsls r0, r4, 2 adds r0, r1 @@ -809425,14 +782165,14 @@ _0818BD9E: bne _0818BDC0 b _0818BEDC _0818BDC0: - ldr r0, _0818BEBC + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] bl sub_806F000 lsls r0, 16 lsrs r4, r0, 16 adds r5, r4, 0 - ldr r6, _0818BEC0 + ldr r6, =0x02024064 ldrb r1, [r6] adds r0, r5, 0 bl sub_805DF38 @@ -809443,7 +782183,7 @@ _0818BDC0: lsrs r1, 24 adds r0, r5, 0 bl sub_806A1C0 - ldr r0, _0818BEC4 + ldr r0, =0x0202499c mov r8, r0 lsls r4, r7, 16 asrs r4, 16 @@ -809456,16 +782196,16 @@ _0818BDC0: mov r1, r9 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _0818BEC8 + ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r0, _0818BECC + ldr r0, =0x0830593c lsls r5, 3 adds r5, r0 ldrh r0, [r5, 0x4] bl gpu_pal_tags_index_of - ldr r5, _0818BED0 + ldr r5, =0x02020630 ldrb r1, [r6] adds r1, r4 ldrb r1, [r1] @@ -809504,7 +782244,7 @@ _0818BDC0: adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0818BED4 + ldr r1, =0x0000fffe strh r1, [r0, 0x2E] ldrb r0, [r6] adds r0, r4 @@ -809515,7 +782255,7 @@ _0818BDC0: adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0818BED8 + ldr r1, =sub_805D7AC + 1 str r1, [r0] ldrb r0, [r6] adds r0, r4 @@ -809543,17 +782283,9 @@ _0818BDC0: strb r1, [r0] b _0818BF72 .align 2, 0 -_0818BEB8: .4byte 0x08305d2c -_0818BEBC: .4byte 0x03005d90 -_0818BEC0: .4byte 0x02024064 -_0818BEC4: .4byte 0x0202499c -_0818BEC8: .4byte 0x020241e4 -_0818BECC: .4byte 0x0830593c -_0818BED0: .4byte 0x02020630 -_0818BED4: .4byte 0x0000fffe -_0818BED8: .4byte sub_805D7AC + 1 + .pool _0818BEDC: - ldr r5, _0818BF8C + ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 bl sub_805DF84 @@ -809564,7 +782296,7 @@ _0818BEDC: lsrs r1, 24 adds r0, r4, 0 bl template_build_for_pokemon_or_trainer - ldr r6, _0818BF90 + ldr r6, =0x0202499c mov r8, r9 lsls r4, r7, 16 asrs r4, 16 @@ -809577,11 +782309,11 @@ _0818BEDC: mov r1, r8 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r6, _0818BF94 + ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _0818BF98 + ldr r4, =0x02020630 ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -809611,7 +782343,7 @@ _0818BEDC: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0818BF9C + ldr r1, =0x0000fffe strh r1, [r0, 0x2E] ldrb r0, [r5] adds r0, r6 @@ -809621,15 +782353,15 @@ _0818BEDC: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _0818BFA0 + ldr r1, =sub_805D7AC + 1 str r1, [r0] _0818BF72: - ldr r1, _0818BFA4 - ldr r0, _0818BF8C + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0818BFA8 + ldr r1, =sub_81899B8 + 1 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -809638,14 +782370,7 @@ _0818BF72: pop {r0} bx r0 .align 2, 0 -_0818BF8C: .4byte 0x02024064 -_0818BF90: .4byte 0x0202499c -_0818BF94: .4byte 0x020241e4 -_0818BF98: .4byte 0x02020630 -_0818BF9C: .4byte 0x0000fffe -_0818BFA0: .4byte sub_805D7AC + 1 -_0818BFA4: .4byte 0x03005d60 -_0818BFA8: .4byte sub_81899B8 + 1 + .pool thumb_func_end sub_818BD04 thumb_func_start sub_818BFAC @@ -809659,15 +782384,15 @@ sub_818BFAC: @ 818BFAC thumb_func_start sub_818BFB8 sub_818BFB8: @ 818BFB8 push {r4-r6,lr} - ldr r6, _0818C044 - ldr r4, _0818C048 + ldr r6, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0818C04C + ldr r5, =0x02020630 adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -809686,7 +782411,7 @@ sub_818BFB8: @ 818BFB8 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0818C050 + ldr r1, =0x0000ffd8 strh r1, [r0, 0x32] ldrb r0, [r4] adds r0, r6 @@ -809706,7 +782431,7 @@ sub_818BFB8: @ 818BFB8 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0818C054 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -809715,34 +782440,27 @@ sub_818BFB8: @ 818BFB8 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0818C058 + ldr r1, =nullsub_12 + 1 bl oamt_set_x3A_32 - ldr r1, _0818C05C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0818C060 + ldr r1, =sub_81899F0 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0818C044: .4byte 0x020241e4 -_0818C048: .4byte 0x02024064 -_0818C04C: .4byte 0x02020630 -_0818C050: .4byte 0x0000ffd8 -_0818C054: .4byte sub_80A6EEC + 1 -_0818C058: .4byte nullsub_12 + 1 -_0818C05C: .4byte 0x03005d60 -_0818C060: .4byte sub_81899F0 + 1 + .pool thumb_func_end sub_818BFB8 thumb_func_start sub_818C064 sub_818C064: @ 818C064 push {r4-r6,lr} - ldr r6, _0818C0B0 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _0818C0B4 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -809777,8 +782495,7 @@ _0818C098: strb r1, [r0, 0x4] b _0818C12E .align 2, 0 -_0818C0B0: .4byte 0x020244d0 -_0818C0B4: .4byte 0x02024064 + .pool _0818C0B8: ldrb r1, [r3] movs r0, 0x40 @@ -809788,22 +782505,22 @@ _0818C0B8: cmp r4, 0 bne _0818C12E strb r4, [r3, 0x4] - ldr r2, _0818C134 + ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0818C138 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 movs r1, 0x40 negs r1, r1 movs r0, 0x10 bl audio_play_and_stuff - ldr r2, _0818C13C - ldr r3, _0818C140 + ldr r2, =0x02020630 + ldr r3, =0x020241e4 ldrb r0, [r5] adds r0, r3 ldrb r1, [r0] @@ -809829,26 +782546,20 @@ _0818C0B8: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _0818C144 + ldr r1, =sub_8039C00 + 1 str r1, [r0] - ldr r1, _0818C148 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0818C14C + ldr r1, =sub_818A114 + 1 str r1, [r0] _0818C12E: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0818C134: .4byte 0x0202406e -_0818C138: .4byte 0x020244ec -_0818C13C: .4byte 0x02020630 -_0818C140: .4byte 0x020241e4 -_0818C144: .4byte sub_8039C00 + 1 -_0818C148: .4byte 0x03005d60 -_0818C14C: .4byte sub_818A114 + 1 + .pool thumb_func_end sub_818C064 thumb_func_start sub_818C150 @@ -809886,7 +782597,7 @@ sub_818C174: @ 818C174 thumb_func_start sub_818C180 sub_818C180: @ 818C180 push {r4-r6,lr} - ldr r6, _0818C264 + ldr r6, =0x02024064 ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -809894,7 +782605,7 @@ sub_818C180: @ 818C180 beq _0818C192 b _0818C2A6 _0818C192: - ldr r0, _0818C268 + ldr r0, =0x02023064 mov r12, r0 ldrb r2, [r6] lsls r2, 9 @@ -809907,13 +782618,13 @@ _0818C192: ldrb r1, [r1] lsls r1, 8 orrs r0, r1 - ldr r5, _0818C26C + ldr r5, =0x02038432 mov r1, r12 adds r1, 0x3 adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, _0818C270 + ldr r4, =0x02038408 ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -809927,7 +782638,7 @@ _0818C192: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, _0818C274 + ldr r4, =0x02038404 ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -809953,7 +782664,7 @@ _0818C192: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, _0818C278 + ldr r3, =0x0203841a ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -809961,7 +782672,7 @@ _0818C192: adds r1, r2 ldrb r1, [r1] strb r1, [r3] - ldr r4, _0818C27C + ldr r4, =0x0203841c ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -809975,14 +782686,14 @@ _0818C192: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, _0818C280 + ldr r3, =0x02038400 ldrb r2, [r6] lsls r2, 9 mov r1, r12 adds r1, 0x10 adds r2, r1 str r2, [r3] - ldr r3, _0818C284 + ldr r3, =0x020244bc ldrb r1, [r6] lsls r1, 2 adds r1, r3 @@ -809997,17 +782708,9 @@ _0818C192: bl sub_818A514 b _0818C2A6 .align 2, 0 -_0818C264: .4byte 0x02024064 -_0818C268: .4byte 0x02023064 -_0818C26C: .4byte 0x02038432 -_0818C270: .4byte 0x02038408 -_0818C274: .4byte 0x02038404 -_0818C278: .4byte 0x0203841a -_0818C27C: .4byte 0x0203841c -_0818C280: .4byte 0x02038400 -_0818C284: .4byte 0x020244bc + .pool _0818C288: - ldr r0, _0818C2AC + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -810016,20 +782719,18 @@ _0818C288: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, _0818C2B0 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _0818C2B4 + ldr r1, =bx_move_anim_2 + 1 str r1, [r0] _0818C2A6: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0818C2AC: .4byte 0x020244d0 -_0818C2B0: .4byte 0x03005d60 -_0818C2B4: .4byte bx_move_anim_2 + 1 + .pool thumb_func_end sub_818C180 thumb_func_start bx_move_anim_2 @@ -810039,8 +782740,8 @@ bx_move_anim_2: @ 818C2B8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _0818C304 - ldr r6, _0818C308 + ldr r2, =0x02023064 + ldr r6, =0x02024064 ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -810057,7 +782758,7 @@ bx_move_anim_2: @ 818C2B8 adds r1, r2 ldrb r1, [r1] mov r8, r1 - ldr r7, _0818C30C + ldr r7, =0x020244d0 ldr r5, [r7] ldr r1, [r5, 0x4] lsls r0, r3, 1 @@ -810073,9 +782774,7 @@ bx_move_anim_2: @ 818C2B8 beq _0818C31A b _0818C42C .align 2, 0 -_0818C304: .4byte 0x02023064 -_0818C308: .4byte 0x02024064 -_0818C30C: .4byte 0x020244d0 + .pool _0818C310: cmp r2, 0x2 beq _0818C37A @@ -810131,10 +782830,10 @@ _0818C350: strb r1, [r0, 0x4] b _0818C42C _0818C37A: - ldr r0, _0818C3E0 + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _0818C3E4 + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _0818C42C @@ -810168,9 +782867,9 @@ _0818C37A: ands r0, r2 strb r0, [r1] _0818C3C8: - ldr r0, _0818C3E8 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _0818C3EC + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -810181,10 +782880,7 @@ _0818C3C8: strb r1, [r0, 0x4] b _0818C42C .align 2, 0 -_0818C3E0: .4byte 0x020383f8 -_0818C3E4: .4byte 0x020383fd -_0818C3E8: .4byte 0x020244d0 -_0818C3EC: .4byte 0x02024064 + .pool _0818C3F0: ldrb r1, [r0] movs r0, 0x40 @@ -810226,38 +782922,32 @@ _0818C42C: thumb_func_start sub_818C43C sub_818C43C: @ 818C43C push {r4,lr} - ldr r0, _0818C474 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _0818C478 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r4, _0818C47C + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 9 - ldr r1, _0818C480 + ldr r1, =0x02023066 adds r0, r1 ldrh r0, [r0] bl battle_pick_message - ldr r0, _0818C484 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _0818C488 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0818C48C + ldr r1, =sub_818A220 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0818C474: .4byte 0x02022e14 -_0818C478: .4byte 0x02022e16 -_0818C47C: .4byte 0x02024064 -_0818C480: .4byte 0x02023066 -_0818C484: .4byte 0x02022e2c -_0818C488: .4byte 0x03005d60 -_0818C48C: .4byte sub_818A220 + 1 + .pool thumb_func_end sub_818C43C thumb_func_start sub_818C490 @@ -810271,14 +782961,14 @@ sub_818C490: @ 818C490 thumb_func_start sub_818C49C sub_818C49C: @ 818C49C push {lr} - ldr r1, _0818C4CC - ldr r0, _0818C4D0 + ldr r1, =0x02024332 + ldr r0, =0x0202406c ldrb r0, [r0] ldrb r1, [r1, 0x4] lsrs r0, 1 cmp r1, r0 bcc _0818C4C6 - ldr r0, _0818C4D4 + ldr r0, =0x02024064 ldrb r0, [r0] bl sub_8185054 adds r1, r0, 0 @@ -810292,36 +782982,31 @@ _0818C4C6: pop {r0} bx r0 .align 2, 0 -_0818C4CC: .4byte 0x02024332 -_0818C4D0: .4byte 0x0202406c -_0818C4D4: .4byte 0x02024064 + .pool thumb_func_end sub_818C49C thumb_func_start sub_818C4D8 sub_818C4D8: @ 818C4D8 push {lr} - ldr r0, _0818C4F8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 ands r0, r1 cmp r0, 0 beq _0818C508 - ldr r1, _0818C4FC - ldr r0, _0818C500 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0818C504 + ldr r1, =sub_818C49C + 1 str r1, [r0] b _0818C522 .align 2, 0 -_0818C4F8: .4byte 0x02022fec -_0818C4FC: .4byte 0x03005d60 -_0818C500: .4byte 0x02024064 -_0818C504: .4byte sub_818C49C + 1 + .pool _0818C508: - ldr r0, _0818C528 + ldr r0, =0x02024064 ldrb r0, [r0] bl sub_8185054 adds r1, r0, 0 @@ -810335,7 +783020,7 @@ _0818C522: pop {r0} bx r0 .align 2, 0 -_0818C528: .4byte 0x02024064 + .pool thumb_func_end sub_818C4D8 thumb_func_start sub_818C52C @@ -810349,7 +783034,7 @@ sub_818C52C: @ 818C52C thumb_func_start sub_818C538 sub_818C538: @ 818C538 push {r4,r5,lr} - ldr r0, _0818C55C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 10 @@ -810365,9 +783050,9 @@ sub_818C538: @ 818C538 bl dp01_build_cmdbuf_x21_a_bb b _0818C584 .align 2, 0 -_0818C55C: .4byte 0x02022fec + .pool _0818C560: - ldr r5, _0818C590 + ldr r5, =0x02024064 ldrb r0, [r5] bl sub_8185054 adds r4, r0, 0 @@ -810388,7 +783073,7 @@ _0818C584: pop {r0} bx r0 .align 2, 0 -_0818C590: .4byte 0x02024064 + .pool thumb_func_end sub_818C538 thumb_func_start sub_818C594 @@ -810402,11 +783087,11 @@ sub_818C594: @ 818C594 thumb_func_start sub_818C5A0 sub_818C5A0: @ 818C5A0 push {r4,lr} - ldr r4, _0818C5D4 + ldr r4, =0x02024064 ldrb r0, [r4] bl sub_8185054 ldrb r1, [r4] - ldr r3, _0818C5D8 + ldr r3, =0x0202449c ldr r2, [r3] adds r1, r2 adds r1, 0x5C @@ -810424,8 +783109,7 @@ sub_818C5A0: @ 818C5A0 pop {r0} bx r0 .align 2, 0 -_0818C5D4: .4byte 0x02024064 -_0818C5D8: .4byte 0x0202449c + .pool thumb_func_end sub_818C5A0 thumb_func_start sub_818C5DC @@ -810445,8 +783129,8 @@ sub_818C5E8: @ 818C5E8 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _0818C660 - ldr r0, _0818C664 + ldr r3, =0x02023064 + ldr r0, =0x02024064 mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -810460,16 +783144,16 @@ sub_818C5E8: @ 818C5E8 orrs r1, r0 lsls r1, 16 asrs r7, r1, 16 - ldr r0, _0818C668 + ldr r0, =0x00007fff cmp r7, r0 beq _0818C678 - ldr r6, _0818C66C + ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _0818C670 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x3A bl pokemon_getattr @@ -810486,7 +783170,7 @@ sub_818C5E8: @ 818C5E8 adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _0818C674 + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -810494,27 +783178,22 @@ sub_818C5E8: @ 818C5E8 bl sub_807294C b _0818C6B2 .align 2, 0 -_0818C660: .4byte 0x02023064 -_0818C664: .4byte 0x02024064 -_0818C668: .4byte 0x00007fff -_0818C66C: .4byte 0x0202406e -_0818C670: .4byte 0x020244ec -_0818C674: .4byte 0x03005d70 + .pool _0818C678: - ldr r1, _0818C6D0 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0818C6D4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A bl pokemon_getattr adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r4, _0818C6D8 + ldr r4, =0x03005d70 adds r1, r0, r4 ldrb r1, [r1] str r7, [sp] @@ -810528,12 +783207,12 @@ _0818C678: movs r2, 0 bl heathbar_draw_hp _0818C6B2: - ldr r1, _0818C6DC - ldr r0, _0818C6E0 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _0818C6E4 + ldr r1, =sub_818A0A4 + 1 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -810543,12 +783222,7 @@ _0818C6B2: pop {r0} bx r0 .align 2, 0 -_0818C6D0: .4byte 0x0202406e -_0818C6D4: .4byte 0x020244ec -_0818C6D8: .4byte 0x03005d70 -_0818C6DC: .4byte 0x03005d60 -_0818C6E0: .4byte 0x02024064 -_0818C6E4: .4byte sub_818A0A4 + 1 + .pool thumb_func_end sub_818C5E8 thumb_func_start sub_818C6E8 @@ -810562,28 +783236,28 @@ sub_818C6E8: @ 818C6E8 thumb_func_start sub_818C6F4 sub_818C6F4: @ 818C6F4 push {r4,lr} - ldr r4, _0818C750 + ldr r4, =0x02024064 ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0818C748 - ldr r0, _0818C754 + ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _0818C758 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _0818C75C + ldr r2, =0x020244ec adds r1, r2 movs r2, 0x9 bl healthbar_draw_field_maybe ldrb r2, [r4] - ldr r0, _0818C760 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -810595,36 +783269,30 @@ sub_818C6F4: @ 818C6F4 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _0818C764 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0818C768 + ldr r1, =sub_818A58C + 1 str r1, [r0] _0818C748: pop {r4} pop {r0} bx r0 .align 2, 0 -_0818C750: .4byte 0x02024064 -_0818C754: .4byte 0x03005d70 -_0818C758: .4byte 0x0202406e -_0818C75C: .4byte 0x020244ec -_0818C760: .4byte 0x020244d0 -_0818C764: .4byte 0x03005d60 -_0818C768: .4byte sub_818A58C + 1 + .pool thumb_func_end sub_818C6F4 thumb_func_start sub_818C76C sub_818C76C: @ 818C76C push {r4,r5,lr} - ldr r5, _0818C7C4 + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0818C7BC - ldr r4, _0818C7C8 + ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -810649,21 +783317,18 @@ sub_818C76C: @ 818C76C lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, _0818C7CC + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0818C7D0 + ldr r1, =sub_818A58C + 1 str r1, [r0] _0818C7BC: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0818C7C4: .4byte 0x02024064 -_0818C7C8: .4byte 0x02023064 -_0818C7CC: .4byte 0x03005d60 -_0818C7D0: .4byte sub_818A58C + 1 + .pool thumb_func_end sub_818C76C thumb_func_start sub_818C7D4 @@ -810741,7 +783406,7 @@ sub_818C834: @ 818C834 thumb_func_start sub_818C840 sub_818C840: @ 818C840 push {lr} - ldr r2, _0818C858 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x80 negs r0, r0 @@ -810751,15 +783416,15 @@ sub_818C840: @ 818C840 pop {r0} bx r0 .align 2, 0 -_0818C858: .4byte 0x02022d0c + .pool thumb_func_end sub_818C840 thumb_func_start sub_818C85C sub_818C85C: @ 818C85C push {lr} - ldr r3, _0818C888 - ldr r1, _0818C88C - ldr r0, _0818C890 + ldr r3, =0x02022d0c + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -810777,15 +783442,13 @@ sub_818C85C: @ 818C85C pop {r0} bx r0 .align 2, 0 -_0818C888: .4byte 0x02022d0c -_0818C88C: .4byte 0x02023064 -_0818C890: .4byte 0x02024064 + .pool thumb_func_end sub_818C85C thumb_func_start sub_818C894 sub_818C894: @ 818C894 push {lr} - ldr r2, _0818C8A8 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -810794,13 +783457,13 @@ sub_818C894: @ 818C894 pop {r0} bx r0 .align 2, 0 -_0818C8A8: .4byte 0x02022d0c + .pool thumb_func_end sub_818C894 thumb_func_start sub_818C8AC sub_818C8AC: @ 818C8AC push {lr} - ldr r3, _0818C8D0 + ldr r3, =0x02022d0c ldr r1, [r3] lsls r1, 24 lsrs r1, 31 @@ -810816,15 +783479,15 @@ sub_818C8AC: @ 818C8AC pop {r0} bx r0 .align 2, 0 -_0818C8D0: .4byte 0x02022d0c + .pool thumb_func_end sub_818C8AC thumb_func_start sub_818C8D4 sub_818C8D4: @ 818C8D4 push {r4,lr} - ldr r3, _0818C8FC - ldr r2, _0818C900 - ldr r4, _0818C904 + ldr r3, =0x02020630 + ldr r2, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -810840,11 +783503,9 @@ sub_818C8D4: @ 818C8D4 bl sub_818A514 b _0818C932 .align 2, 0 -_0818C8FC: .4byte 0x02020630 -_0818C900: .4byte 0x020241e4 -_0818C904: .4byte 0x02024064 + .pool _0818C908: - ldr r1, _0818C938 + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -810858,20 +783519,18 @@ _0818C908: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, _0818C93C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0818C940 + ldr r1, =sub_818A238 + 1 str r1, [r0] _0818C932: pop {r4} pop {r0} bx r0 .align 2, 0 -_0818C938: .4byte 0x020244b9 -_0818C93C: .4byte 0x03005d60 -_0818C940: .4byte sub_818A238 + 1 + .pool thumb_func_end sub_818C8D4 thumb_func_start sub_818C944 @@ -810885,7 +783544,7 @@ sub_818C944: @ 818C944 thumb_func_start sub_818C950 sub_818C950: @ 818C950 push {r4,lr} - ldr r4, _0818C98C + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -810894,7 +783553,7 @@ sub_818C950: @ 818C950 bne _0818C964 movs r3, 0xC0 _0818C964: - ldr r2, _0818C990 + ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -810913,15 +783572,14 @@ _0818C964: pop {r0} bx r0 .align 2, 0 -_0818C98C: .4byte 0x02024064 -_0818C990: .4byte 0x02023064 + .pool thumb_func_end sub_818C950 thumb_func_start sub_818C994 sub_818C994: @ 818C994 push {r4,r5,lr} - ldr r4, _0818C9C8 - ldr r5, _0818C9CC + ldr r4, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -810943,8 +783601,7 @@ sub_818C994: @ 818C994 bl song_play_for_text b _0818C9E4 .align 2, 0 -_0818C9C8: .4byte 0x02023064 -_0818C9CC: .4byte 0x02024064 + .pool _0818C9D0: adds r0, r4, 0x1 adds r0, r3, r0 @@ -810965,15 +783622,15 @@ _0818C9E4: thumb_func_start sub_818C9F0 sub_818C9F0: @ 818C9F0 push {lr} - ldr r1, _0818CA24 - ldr r0, _0818CA28 + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _0818CA2C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -810987,23 +783644,21 @@ sub_818C9F0: @ 818C9F0 pop {r0} bx r0 .align 2, 0 -_0818CA24: .4byte 0x0202406e -_0818CA28: .4byte 0x02024064 -_0818CA2C: .4byte 0x020244ec + .pool thumb_func_end sub_818C9F0 thumb_func_start dp01t_2E_2_battle_intro dp01t_2E_2_battle_intro: @ 818CA30 push {lr} - ldr r1, _0818CA58 - ldr r0, _0818CA5C + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r0, [r0] bl battle_intro_launch - ldr r2, _0818CA60 + ldr r2, =0x020243fc ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -811012,23 +783667,21 @@ dp01t_2E_2_battle_intro: @ 818CA30 pop {r0} bx r0 .align 2, 0 -_0818CA58: .4byte 0x02023064 -_0818CA5C: .4byte 0x02024064 -_0818CA60: .4byte 0x020243fc + .pool thumb_func_end dp01t_2E_2_battle_intro thumb_func_start sub_818CA64 sub_818CA64: @ 818CA64 push {r4-r6,lr} - ldr r5, _0818CB30 - ldr r6, _0818CB34 + ldr r5, =0x020241e4 + ldr r6, =0x02024064 ldrb r0, [r6] adds r0, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0818CB38 + ldr r4, =0x02020630 adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -811047,7 +783700,7 @@ sub_818CA64: @ 818CA64 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0818CB3C + ldr r1, =0x0000ffd8 strh r1, [r0, 0x32] ldrb r0, [r6] adds r0, r5 @@ -811067,7 +783720,7 @@ sub_818CA64: @ 818CA64 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0818CB40 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r2, [r6] adds r0, r2, r5 @@ -811084,7 +783737,7 @@ sub_818CA64: @ 818CA64 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _0818CB44 + ldr r1, =sub_805CC00 + 1 bl oamt_set_x3A_32 ldrb r0, [r6] adds r0, r5 @@ -811095,18 +783748,18 @@ sub_818CA64: @ 818CA64 adds r0, r4 movs r1, 0x1 bl obj_anim_image_start - ldr r0, _0818CB48 + ldr r0, =0x0000d6f9 bl gpu_pal_alloc_new lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _0818CB4C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 beq _0818CB54 - ldr r4, _0818CB50 + ldr r4, =0x020229e8 ldrb r0, [r6] bl sub_806D864 lsls r1, r0, 3 @@ -811116,21 +783769,13 @@ sub_818CA64: @ 818CA64 ldrb r0, [r1, 0x13] b _0818CB5A .align 2, 0 -_0818CB30: .4byte 0x020241e4 -_0818CB34: .4byte 0x02024064 -_0818CB38: .4byte 0x02020630 -_0818CB3C: .4byte 0x0000ffd8 -_0818CB40: .4byte sub_80A6EEC + 1 -_0818CB44: .4byte sub_805CC00 + 1 -_0818CB48: .4byte 0x0000d6f9 -_0818CB4C: .4byte 0x02022fec -_0818CB50: .4byte 0x020229e8 + .pool _0818CB54: - ldr r0, _0818CBF4 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] _0818CB5A: - ldr r1, _0818CBF8 + ldr r1, =0x08305d8c lsls r0, 3 adds r0, r1 ldr r0, [r0] @@ -811140,9 +783785,9 @@ _0818CB5A: adds r1, r4, r2 movs r2, 0x20 bl decompress_palette - ldr r2, _0818CBFC - ldr r1, _0818CC00 - ldr r5, _0818CC04 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r5, =0x02024064 ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -811155,19 +783800,19 @@ _0818CB5A: ands r0, r2 orrs r0, r4 strb r0, [r1, 0x5] - ldr r0, _0818CC08 + ldr r0, =sub_818CC24 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r4, _0818CC0C + ldr r4, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r4 ldrb r0, [r5] strh r0, [r1, 0x8] - ldr r3, _0818CC10 + ldr r3, =0x020244d0 ldr r0, [r3] ldrb r2, [r5] ldr r1, [r0, 0x4] @@ -811180,14 +783825,14 @@ _0818CB5A: ands r0, r1 cmp r0, 0 beq _0818CBD4 - ldr r0, _0818CC14 + ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, _0818CC18 + ldr r1, =sub_8073C30 + 1 str r1, [r0] _0818CBD4: ldr r0, [r3] @@ -811196,28 +783841,17 @@ _0818CBD4: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _0818CC1C + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _0818CC20 + ldr r1, =nullsub_120 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0818CBF4: .4byte 0x03005d90 -_0818CBF8: .4byte 0x08305d8c -_0818CBFC: .4byte 0x02020630 -_0818CC00: .4byte 0x020241e4 -_0818CC04: .4byte 0x02024064 -_0818CC08: .4byte sub_818CC24 + 1 -_0818CC0C: .4byte 0x03005e00 -_0818CC10: .4byte 0x020244d0 -_0818CC14: .4byte 0x020244b4 -_0818CC18: .4byte sub_8073C30 + 1 -_0818CC1C: .4byte 0x03005d60 -_0818CC20: .4byte nullsub_120 + 1 + .pool thumb_func_end sub_818CA64 thumb_func_start sub_818CC24 @@ -811229,7 +783863,7 @@ sub_818CC24: @ 818CC24 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _0818CC4C + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -811243,9 +783877,9 @@ sub_818CC24: @ 818CC24 strh r0, [r1, 0xA] b _0818CD0C .align 2, 0 -_0818CC4C: .4byte 0x03005e00 + .pool _0818CC50: - ldr r7, _0818CC90 + ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 ldrh r0, [r1, 0x8] @@ -811254,19 +783888,19 @@ _0818CC50: lsls r0, 24 cmp r0, 0 beq _0818CC70 - ldr r0, _0818CC94 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _0818CCA0 _0818CC70: - ldr r0, _0818CC98 + ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _0818CC9C + ldr r0, =0x0202406e lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -811276,17 +783910,14 @@ _0818CC70: bl sub_818BA6C b _0818CCF4 .align 2, 0 -_0818CC90: .4byte 0x02024064 -_0818CC94: .4byte 0x02022fec -_0818CC98: .4byte 0x02023064 -_0818CC9C: .4byte 0x0202406e + .pool _0818CCA0: - ldr r4, _0818CD18 + ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r5, _0818CD1C + ldr r5, =0x0202406e lsls r0, 1 adds r0, r5 ldrh r0, [r0] @@ -811311,7 +783942,7 @@ _0818CCA0: ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _0818CD20 + ldr r2, =0x020244ec adds r0, r2 bl sub_805DD7C ldrb r0, [r7] @@ -811321,12 +783952,12 @@ _0818CCA0: eors r0, r6 strb r0, [r7] _0818CCF4: - ldr r1, _0818CD24 - ldr r2, _0818CD28 + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _0818CD2C + ldr r1, =sub_8189D40 + 1 str r1, [r0] mov r3, r9 strb r3, [r2] @@ -811340,19 +783971,14 @@ _0818CD0C: pop {r0} bx r0 .align 2, 0 -_0818CD18: .4byte 0x02023064 -_0818CD1C: .4byte 0x0202406e -_0818CD20: .4byte 0x020244ec -_0818CD24: .4byte 0x03005d60 -_0818CD28: .4byte 0x02024064 -_0818CD2C: .4byte sub_8189D40 + 1 + .pool thumb_func_end sub_818CC24 thumb_func_start sub_818CD30 sub_818CD30: @ 818CD30 push {r4-r6,lr} - ldr r1, _0818CD58 - ldr r0, _0818CD5C + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -811368,12 +783994,11 @@ sub_818CD30: @ 818CD30 bl sub_818A514 b _0818CDD4 .align 2, 0 -_0818CD58: .4byte 0x02023064 -_0818CD5C: .4byte 0x02024064 + .pool _0818CD60: - ldr r6, _0818CDDC + ldr r6, =0x020244d0 ldr r0, [r6] - ldr r5, _0818CDE0 + ldr r5, =0x02024064 ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -811386,7 +784011,7 @@ _0818CD60: strb r1, [r0] ldrb r0, [r5] lsls r3, r0, 9 - ldr r4, _0818CDE4 + ldr r4, =0x02023068 adds r1, r3, r4 subs r2, r4, 0x3 adds r2, r3, r2 @@ -811395,7 +784020,7 @@ _0818CD60: adds r3, r4 ldrb r3, [r3] bl sub_80735DC - ldr r2, _0818CDE8 + ldr r2, =0x020244b4 ldrb r1, [r5] adds r1, r2 movs r3, 0 @@ -811423,31 +784048,26 @@ _0818CD60: movs r1, 0x5D strb r1, [r0, 0x5] _0818CDC8: - ldr r0, _0818CDEC + ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, _0818CDF0 + ldr r0, =bx_increment_dp11b_field_5_till_x60_then_resume + 1 str r0, [r1] _0818CDD4: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0818CDDC: .4byte 0x020244d0 -_0818CDE0: .4byte 0x02024064 -_0818CDE4: .4byte 0x02023068 -_0818CDE8: .4byte 0x020244b4 -_0818CDEC: .4byte 0x03005d60 -_0818CDF0: .4byte bx_increment_dp11b_field_5_till_x60_then_resume + 1 + .pool thumb_func_end sub_818CD30 thumb_func_start bx_increment_dp11b_field_5_till_x60_then_resume bx_increment_dp11b_field_5_till_x60_then_resume: @ 818CDF4 push {r4,lr} - ldr r4, _0818CE34 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _0818CE38 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -811476,16 +784096,15 @@ _0818CE2C: pop {r0} bx r0 .align 2, 0 -_0818CE34: .4byte 0x020244d0 -_0818CE38: .4byte 0x02024064 + .pool thumb_func_end bx_increment_dp11b_field_5_till_x60_then_resume thumb_func_start sub_818CE3C sub_818CE3C: @ 818CE3C push {lr} - ldr r0, _0818CE78 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _0818CE7C + ldr r0, =0x02024064 ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -811497,26 +784116,22 @@ sub_818CE3C: @ 818CE3C ands r0, r1 cmp r0, 0 beq _0818CE6E - ldr r2, _0818CE80 - ldr r0, _0818CE84 + ldr r2, =0x03005e00 + ldr r0, =0x020244b4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _0818CE88 + ldr r1, =sub_8073C30 + 1 str r1, [r0] _0818CE6E: bl sub_818A514 pop {r0} bx r0 .align 2, 0 -_0818CE78: .4byte 0x020244d0 -_0818CE7C: .4byte 0x02024064 -_0818CE80: .4byte 0x03005e00 -_0818CE84: .4byte 0x020244b4 -_0818CE88: .4byte sub_8073C30 + 1 + .pool thumb_func_end sub_818CE3C thumb_func_start sub_818CE8C @@ -811530,14 +784145,14 @@ sub_818CE8C: @ 818CE8C thumb_func_start sub_818CE98 sub_818CE98: @ 818CE98 push {r4,lr} - ldr r4, _0818CEE8 + ldr r4, =0x02024064 ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _0818CEDE - ldr r3, _0818CEEC - ldr r0, _0818CEF0 + ldr r3, =0x02020630 + ldr r0, =0x020241e4 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -811545,7 +784160,7 @@ sub_818CE98: @ 818CE98 adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, _0818CEF4 + ldr r0, =0x02023064 lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -811568,23 +784183,20 @@ _0818CEDE: pop {r0} bx r0 .align 2, 0 -_0818CEE8: .4byte 0x02024064 -_0818CEEC: .4byte 0x02020630 -_0818CEF0: .4byte 0x020241e4 -_0818CEF4: .4byte 0x02023064 + .pool thumb_func_end sub_818CE98 thumb_func_start sub_818CEF8 sub_818CEF8: @ 818CEF8 push {r4-r6,lr} sub sp, 0x4 - ldr r6, _0818CF3C + ldr r6, =0x02024064 ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _0818CF50 - ldr r5, _0818CF40 + ldr r5, =0x02023064 ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -811608,14 +784220,13 @@ sub_818CEF8: @ 818CEF8 bl sub_818A514 b _0818CF50 .align 2, 0 -_0818CF3C: .4byte 0x02024064 -_0818CF40: .4byte 0x02023064 + .pool _0818CF44: - ldr r0, _0818CF58 + ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, _0818CF5C + ldr r0, =sub_818A5BC + 1 str r0, [r1] _0818CF50: add sp, 0x4 @@ -811623,8 +784234,7 @@ _0818CF50: pop {r0} bx r0 .align 2, 0 -_0818CF58: .4byte 0x03005d60 -_0818CF5C: .4byte sub_818A5BC + 1 + .pool thumb_func_end sub_818CEF8 thumb_func_start sub_818CF60 @@ -811646,9 +784256,9 @@ sub_818CF6C: @ 818CF6C thumb_func_start sub_818CF78 sub_818CF78: @ 818CF78 push {r4,lr} - ldr r2, _0818CFB0 - ldr r1, _0818CFB4 - ldr r4, _0818CFB8 + ldr r2, =0x0202433a + ldr r1, =0x02023064 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -811660,21 +784270,17 @@ sub_818CF78: @ 818CF78 movs r0, 0x3 bl sub_80A2390 bl sub_818A514 - ldr r1, _0818CFBC + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _0818CFC0 + ldr r1, =sub_80587B0 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0818CFB0: .4byte 0x0202433a -_0818CFB4: .4byte 0x02023064 -_0818CFB8: .4byte 0x02024064 -_0818CFBC: .4byte 0x03005d60 -_0818CFC0: .4byte sub_80587B0 + 1 + .pool thumb_func_end sub_818CF78 thumb_func_start nullsub_121 @@ -811690,8 +784296,8 @@ nullsub_122: @ 818CFC8 thumb_func_start dp13_810BB8C dp13_810BB8C: @ 818CFCC push {r4-r7,lr} - ldr r4, _0818CFEC - ldr r3, _0818CFF0 + ldr r4, =0x0860b058 + ldr r3, =0x0203cd04 movs r2, 0x7 _0818CFD4: adds r1, r3, 0 @@ -811707,8 +784313,7 @@ _0818CFD4: pop {r1} bx r1 .align 2, 0 -_0818CFEC: .4byte 0x0860b058 -_0818CFF0: .4byte 0x0203cd04 + .pool thumb_func_end dp13_810BB8C thumb_func_start load_pokemon_image_TODO @@ -811735,21 +784340,21 @@ load_pokemon_image_TODO: @ 818CFF4 cmp r1, 0 bne _0818D028 lsls r0, r4, 3 - ldr r1, _0818D024 + ldr r1, =0x0830a18c b _0818D03C .align 2, 0 -_0818D024: .4byte 0x0830a18c + .pool _0818D028: lsls r0, r4, 3 - ldr r1, _0818D030 + ldr r1, =0x0830a18c b _0818D054 .align 2, 0 -_0818D030: .4byte 0x0830a18c + .pool _0818D034: cmp r0, 0 bne _0818D050 lsls r0, r4, 3 - ldr r1, _0818D04C + ldr r1, =0x083028b8 _0818D03C: adds r0, r1 str r2, [sp] @@ -811759,10 +784364,10 @@ _0818D03C: bl sub_8034654 b _0818D08E .align 2, 0 -_0818D04C: .4byte 0x083028b8 + .pool _0818D050: lsls r0, r4, 3 - ldr r1, _0818D064 + ldr r1, =0x083028b8 _0818D054: adds r0, r1 str r2, [sp] @@ -811772,22 +784377,22 @@ _0818D054: bl sub_8034B7C b _0818D08E .align 2, 0 -_0818D064: .4byte 0x083028b8 + .pool _0818D068: cmp r2, 0 beq _0818D080 lsls r0, r4, 3 - ldr r1, _0818D07C + ldr r1, =0x08305654 adds r0, r1 adds r1, r5, 0 adds r2, r4, 0 bl sub_80345F0 b _0818D08E .align 2, 0 -_0818D07C: .4byte 0x08305654 + .pool _0818D080: lsls r0, r7, 3 - ldr r1, _0818D098 + ldr r1, =0x08305d4c adds r0, r1 adds r1, r5, 0 adds r2, r7, 0 @@ -811799,7 +784404,7 @@ _0818D08E: pop {r1} bx r1 .align 2, 0 -_0818D098: .4byte 0x08305d4c + .pool thumb_func_end load_pokemon_image_TODO thumb_func_start sub_818D09C @@ -811846,10 +784451,10 @@ sub_818D0C4: @ 818D0C4 lsls r2, 24 cmp r2, 0 bne _0818D128 - ldr r0, _0818D108 + ldr r0, =0x0000ffff cmp r3, r0 bne _0818D110 - ldr r2, _0818D10C + ldr r2, =0x0203ccec ldrh r1, [r2, 0x2] adds r0, r3, 0 orrs r0, r1 @@ -811861,10 +784466,9 @@ sub_818D0C4: @ 818D0C4 lsls r1, r5, 20 b _0818D144 .align 2, 0 -_0818D108: .4byte 0x0000ffff -_0818D10C: .4byte 0x0203ccec + .pool _0818D110: - ldr r0, _0818D124 + ldr r0, =0x0203ccec strh r3, [r0, 0x2] adds r0, r4, 0 adds r1, r7, 0 @@ -811873,17 +784477,17 @@ _0818D110: bl gpu_pal_obj_decompress_and_apply b _0818D16E .align 2, 0 -_0818D124: .4byte 0x0203ccec + .pool _0818D128: - ldr r0, _0818D154 + ldr r0, =0x0000ffff cmp r3, r0 bne _0818D160 - ldr r2, _0818D158 + ldr r2, =0x0203ccec ldrh r1, [r2, 0x2] adds r0, r3, 0 orrs r0, r1 strh r0, [r2, 0x2] - ldr r1, _0818D15C + ldr r1, =0x0830593c lsls r0, r4, 3 adds r0, r1 ldr r0, [r0] @@ -811898,14 +784502,12 @@ _0818D144: bl decompress_palette b _0818D16E .align 2, 0 -_0818D154: .4byte 0x0000ffff -_0818D158: .4byte 0x0203ccec -_0818D15C: .4byte 0x0830593c + .pool _0818D160: - ldr r0, _0818D178 + ldr r0, =0x0203ccec strh r1, [r0, 0x2] lsls r0, r6, 3 - ldr r1, _0818D17C + ldr r1, =0x0830593c adds r0, r1 bl gpu_pal_obj_decompress_and_apply _0818D16E: @@ -811915,8 +784517,7 @@ _0818D16E: pop {r0} bx r0 .align 2, 0 -_0818D178: .4byte 0x0203ccec -_0818D17C: .4byte 0x0830593c + .pool thumb_func_end sub_818D0C4 thumb_func_start sub_818D180 @@ -811938,7 +784539,7 @@ sub_818D180: @ 818D180 bl decompress_palette b _0818D1B4 _0818D1A4: - ldr r1, _0818D1BC + ldr r1, =0x0830593c lsls r0, 3 adds r0, r1 ldr r0, [r0] @@ -811950,7 +784551,7 @@ _0818D1B4: pop {r0} bx r0 .align 2, 0 -_0818D1BC: .4byte 0x0830593c + .pool thumb_func_end sub_818D180 thumb_func_start uns_builder_assign_animtable1 @@ -811959,24 +784560,22 @@ uns_builder_assign_animtable1: @ 818D1C0 lsls r0, 24 cmp r0, 0 bne _0818D1D8 - ldr r1, _0818D1D0 - ldr r0, _0818D1D4 + ldr r1, =0x0203ccec + ldr r0, =0x082ff70c str r0, [r1, 0x8] b _0818D1E0 .align 2, 0 -_0818D1D0: .4byte 0x0203ccec -_0818D1D4: .4byte 0x082ff70c + .pool _0818D1D8: - ldr r0, _0818D1E4 - ldr r1, _0818D1E8 + ldr r0, =0x0203ccec + ldr r1, =0x0830536c ldr r1, [r1] str r1, [r0, 0x8] _0818D1E0: pop {r0} bx r0 .align 2, 0 -_0818D1E4: .4byte 0x0203ccec -_0818D1E8: .4byte 0x0830536c + .pool thumb_func_end uns_builder_assign_animtable1 thumb_func_start oamt_spawn_poke_or_trainer_picture @@ -812021,7 +784620,7 @@ oamt_spawn_poke_or_trainer_picture: @ 818D1EC lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r1, _0818D284 + ldr r1, =0x0203cd04 ldrb r0, [r1, 0xB] cmp r0, 0 beq _0818D25C @@ -812055,11 +784654,10 @@ _0818D25C: adds r0, r7, 0 bl free _0818D280: - ldr r0, _0818D288 + ldr r0, =0x0000ffff b _0818D356 .align 2, 0 -_0818D284: .4byte 0x0203cd04 -_0818D288: .4byte 0x0000ffff + .pool _0818D28C: mov r1, r9 str r1, [sp] @@ -812074,8 +784672,8 @@ _0818D28C: bne _0818D280 lsls r2, r4, 1 str r2, [sp, 0x2C] - ldr r5, _0818D368 - ldr r0, _0818D36C + ldr r5, =0x0203ccec + ldr r0, =0x0860b064 mov r12, r0 ldr r1, [sp, 0x18] lsls r1, 16 @@ -812097,7 +784695,7 @@ _0818D2C6: subs r2, 0x1 cmp r2, 0 bge _0818D2C6 - ldr r0, _0818D370 + ldr r0, =0x0000ffff strh r0, [r5] mov r0, r12 str r0, [r5, 0x4] @@ -812105,9 +784703,9 @@ _0818D2C6: bl uns_builder_assign_animtable1 mov r1, r8 str r1, [r5, 0xC] - ldr r0, _0818D374 + ldr r0, =0x082ec6a8 str r0, [r5, 0x10] - ldr r0, _0818D378 + ldr r0, =nullsub_122 + 1 str r0, [r5, 0x14] mov r2, r10 str r2, [sp] @@ -812128,10 +784726,10 @@ _0818D2C6: lsls r0, 24 lsrs r2, r0, 24 adds r6, r2, 0 - ldr r0, _0818D370 + ldr r0, =0x0000ffff cmp r10, r0 bne _0818D336 - ldr r0, _0818D37C + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -812144,7 +784742,7 @@ _0818D2C6: orrs r0, r3 strb r0, [r1, 0x5] _0818D336: - ldr r1, _0818D380 + ldr r1, =0x0203cd04 ldr r2, [sp, 0x2C] adds r0, r2, r4 lsls r0, 2 @@ -812170,13 +784768,7 @@ _0818D356: pop {r1} bx r1 .align 2, 0 -_0818D368: .4byte 0x0203ccec -_0818D36C: .4byte 0x0860b064 -_0818D370: .4byte 0x0000ffff -_0818D374: .4byte 0x082ec6a8 -_0818D378: .4byte nullsub_122 + 1 -_0818D37C: .4byte 0x02020630 -_0818D380: .4byte 0x0203cd04 + .pool thumb_func_end oamt_spawn_poke_or_trainer_picture thumb_func_start sub_818D384 @@ -812262,7 +784854,7 @@ sub_818D3E4: @ 818D3E4 lsrs r5, 16 str r5, [sp, 0x1C] movs r5, 0 - ldr r1, _0818D464 + ldr r1, =0x0203cd04 ldrb r0, [r1, 0xB] cmp r0, 0 beq _0818D440 @@ -812298,7 +784890,7 @@ _0818D440: mov r9, r0 b _0818D46A .align 2, 0 -_0818D464: .4byte 0x0203cd04 + .pool _0818D468: mov r9, r6 _0818D46A: @@ -812310,10 +784902,10 @@ _0818D46A: adds r0, r7, 0 bl free _0818D47C: - ldr r0, _0818D480 + ldr r0, =0x0000ffff b _0818D588 .align 2, 0 -_0818D480: .4byte 0x0000ffff + .pool _0818D484: movs r0, 0 str r0, [sp] @@ -812328,7 +784920,7 @@ _0818D484: bne _0818D47C lsls r1, r5, 1 str r1, [sp, 0x28] - ldr r4, _0818D4E8 + ldr r4, =0x0203ccec mov r2, r10 lsls r2, 2 mov r12, r2 @@ -812352,9 +784944,9 @@ _0818D4C0: subs r2, 0x1 cmp r2, 0 bge _0818D4C0 - ldr r0, _0818D4EC + ldr r0, =0x0000ffff strh r0, [r4] - ldr r0, _0818D4F0 + ldr r0, =0x08309aac add r0, r12 ldr r0, [r0] str r0, [r4, 0x8] @@ -812363,33 +784955,29 @@ _0818D4C0: mov r0, r9 cmp r0, 0x1 bne _0818D4F8 - ldr r0, _0818D4F4 + ldr r0, =0x082ff694 b _0818D500 .align 2, 0 -_0818D4E8: .4byte 0x0203ccec -_0818D4EC: .4byte 0x0000ffff -_0818D4F0: .4byte 0x08309aac -_0818D4F4: .4byte 0x082ff694 + .pool _0818D4F8: mov r1, r9 cmp r1, 0 bne _0818D510 - ldr r0, _0818D508 + ldr r0, =0x082ff618 _0818D500: str r0, [r4, 0x10] - ldr r0, _0818D50C + ldr r0, =0x0860b06c str r0, [r4, 0x4] b _0818D518 .align 2, 0 -_0818D508: .4byte 0x082ff618 -_0818D50C: .4byte 0x0860b06c + .pool _0818D510: - ldr r0, _0818D598 + ldr r0, =0x0860b064 str r0, [r4, 0x4] - ldr r0, _0818D59C + ldr r0, =0x082ec6a8 str r0, [r4, 0x10] _0818D518: - ldr r2, _0818D5A0 + ldr r2, =nullsub_122 + 1 str r2, [r4, 0x14] ldr r0, [sp, 0x1C] str r0, [sp] @@ -812410,11 +784998,11 @@ _0818D518: lsls r0, 24 lsrs r2, r0, 24 adds r6, r2, 0 - ldr r0, _0818D5A4 + ldr r0, =0x0000ffff ldr r1, [sp, 0x1C] cmp r1, r0 bne _0818D566 - ldr r0, _0818D5A8 + ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -812427,7 +785015,7 @@ _0818D518: orrs r0, r3 strb r0, [r1, 0x5] _0818D566: - ldr r1, _0818D5AC + ldr r1, =0x0203cd04 ldr r2, [sp, 0x28] adds r0, r2, r5 lsls r0, 2 @@ -812454,12 +785042,7 @@ _0818D588: pop {r1} bx r1 .align 2, 0 -_0818D598: .4byte 0x0860b064 -_0818D59C: .4byte 0x082ec6a8 -_0818D5A0: .4byte nullsub_122 + 1 -_0818D5A4: .4byte 0x0000ffff -_0818D5A8: .4byte 0x02020630 -_0818D5AC: .4byte 0x0203cd04 + .pool thumb_func_end sub_818D3E4 thumb_func_start sub_818D5B0 @@ -812470,7 +785053,7 @@ sub_818D5B0: @ 818D5B0 lsls r0, 16 lsrs r4, r0, 16 movs r2, 0 - ldr r0, _0818D5E8 + ldr r0, =0x0203cd04 ldrb r1, [r0, 0xA] adds r3, r0, 0 cmp r1, r4 @@ -812492,11 +785075,10 @@ _0818D5C8: _0818D5E0: cmp r2, 0x8 bne _0818D5F0 - ldr r0, _0818D5EC + ldr r0, =0x0000ffff b _0818D646 .align 2, 0 -_0818D5E8: .4byte 0x0203cd04 -_0818D5EC: .4byte 0x0000ffff + .pool _0818D5F0: lsls r0, r2, 1 adds r0, r2 @@ -812508,11 +785090,11 @@ _0818D5F0: adds r0, r1 ldr r7, [r0] ldrh r1, [r5, 0x8] - ldr r0, _0818D650 + ldr r0, =0x0000ffff lsls r6, r4, 4 cmp r1, r0 beq _0818D624 - ldr r1, _0818D654 + ldr r1, =0x02020630 adds r0, r6, r4 lsls r0, 2 adds r0, r1 @@ -812525,7 +785107,7 @@ _0818D5F0: _0818D624: adds r0, r6, r4 lsls r0, 2 - ldr r1, _0818D654 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles mov r0, r8 @@ -812533,7 +785115,7 @@ _0818D624: adds r0, r7, 0 bl free adds r1, r5, 0 - ldr r0, _0818D658 + ldr r0, =0x0860b058 ldm r0!, {r2-r4} stm r1!, {r2-r4} movs r0, 0 @@ -812544,9 +785126,7 @@ _0818D646: pop {r1} bx r1 .align 2, 0 -_0818D650: .4byte 0x0000ffff -_0818D654: .4byte 0x02020630 -_0818D658: .4byte 0x0860b058 + .pool thumb_func_end sub_818D5B0 thumb_func_start sub_818D65C @@ -812595,7 +785175,7 @@ sub_818D65C: @ 818D65C movs r0, 0 b _0818D6BA _0818D6B8: - ldr r0, _0818D6C8 + ldr r0, =0x0000ffff _0818D6BA: add sp, 0x4 pop {r3,r4} @@ -812605,7 +785185,7 @@ _0818D6BA: pop {r1} bx r1 .align 2, 0 -_0818D6C8: .4byte 0x0000ffff + .pool thumb_func_end sub_818D65C thumb_func_start sub_818D6CC @@ -812681,7 +785261,7 @@ sub_818D6CC: @ 818D6CC movs r0, 0 b _0818D764 _0818D762: - ldr r0, _0818D774 + ldr r0, =0x0000ffff _0818D764: add sp, 0x24 pop {r3-r5} @@ -812692,7 +785272,7 @@ _0818D764: pop {r1} bx r1 .align 2, 0 -_0818D774: .4byte 0x0000ffff + .pool thumb_func_end sub_818D6CC thumb_func_start sub_818D778 @@ -812989,41 +785569,40 @@ sub_818D97C: @ 818D97C bne _0818D9A2 cmp r0, 0 beq _0818D99C - ldr r0, _0818D998 + ldr r0, =0x0831f578 adds r0, 0x3F ldrb r0, [r0] b _0818D9A2 .align 2, 0 -_0818D998: .4byte 0x0831f578 + .pool _0818D99C: - ldr r0, _0818D9A8 + ldr r0, =0x0831f578 adds r0, 0x3C ldrb r0, [r0] _0818D9A2: pop {r1} bx r1 .align 2, 0 -_0818D9A8: .4byte 0x0831f578 + .pool thumb_func_end sub_818D97C thumb_func_start sub_818D9AC sub_818D9AC: @ 818D9AC - ldr r0, _0818D9B8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818D9BC + ldr r1, =0x00003b58 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_0818D9B8: .4byte 0x03005d8c -_0818D9BC: .4byte 0x00003b58 + .pool thumb_func_end sub_818D9AC thumb_func_start sub_818D9C0 sub_818D9C0: @ 818D9C0 push {r4,r5,lr} - ldr r5, _0818DA04 - ldr r4, _0818DA08 + ldr r5, =0x00004010 + ldr r4, =0x0860b07e bl sub_818D9AC lsls r0, 24 lsrs r0, 23 @@ -813036,30 +785615,24 @@ sub_818D9C0: @ 818D9C0 lsrs r0, 24 cmp r0, 0x2 bne _0818DA20 - ldr r0, _0818DA0C + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0818DA10 + ldr r0, =0x00003b58 adds r1, r0 - ldr r0, _0818DA14 - ldr r2, _0818DA18 + ldr r0, =0x00004011 + ldr r2, =0x0860b074 ldrb r1, [r1, 0xD] lsls r1, 1 adds r1, r2 ldrh r1, [r1] bl var_set - ldr r1, _0818DA1C + ldr r1, =0x020375f0 movs r0, 0x1 b _0818DA24 .align 2, 0 -_0818DA04: .4byte 0x00004010 -_0818DA08: .4byte 0x0860b07e -_0818DA0C: .4byte 0x03005d8c -_0818DA10: .4byte 0x00003b58 -_0818DA14: .4byte 0x00004011 -_0818DA18: .4byte 0x0860b074 -_0818DA1C: .4byte 0x020375f0 + .pool _0818DA20: - ldr r1, _0818DA2C + ldr r1, =0x020375f0 movs r0, 0 _0818DA24: strh r0, [r1] @@ -813067,13 +785640,13 @@ _0818DA24: pop {r0} bx r0 .align 2, 0 -_0818DA2C: .4byte 0x020375f0 + .pool thumb_func_end sub_818D9C0 thumb_func_start sub_818DA30 sub_818DA30: @ 818DA30 push {lr} - ldr r0, _0818DA58 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r1, [r0, 0xB] lsls r1, 8 @@ -813092,7 +785665,7 @@ sub_818DA30: @ 818DA30 beq _0818DA62 b _0818DA72 .align 2, 0 -_0818DA58: .4byte 0x03005d90 + .pool _0818DA5C: cmp r1, 0x2 beq _0818DA6E @@ -813178,7 +785751,7 @@ _0818DAE6: thumb_func_start sub_818DAEC sub_818DAEC: @ 818DAEC push {r4,lr} - ldr r4, _0818DB00 + ldr r4, =0x020375f0 bl sub_818D9AC lsls r0, 24 lsrs r0, 24 @@ -813187,7 +785760,7 @@ sub_818DAEC: @ 818DAEC pop {r0} bx r0 .align 2, 0 -_0818DB00: .4byte 0x020375f0 + .pool thumb_func_end sub_818DAEC thumb_func_start sub_818DB04 @@ -813214,14 +785787,14 @@ _0818DB14: sub_818DB20: @ 818DB20 push {r4-r6,lr} bl GenerateRandomNumber - ldr r5, _0818DB74 + ldr r5, =0x0203cd64 ldr r4, [r5] lsls r0, 16 lsrs r0, 16 movs r1, 0x6 bl __umodsi3 strb r0, [r4, 0xC] - ldr r6, _0818DB78 + ldr r6, =0x0860b2ec ldr r0, [r5] ldrb r0, [r0, 0xC] lsls r0, 2 @@ -813250,17 +785823,16 @@ sub_818DB20: @ 818DB20 pop {r0} bx r0 .align 2, 0 -_0818DB74: .4byte 0x0203cd64 -_0818DB78: .4byte 0x0860b2ec + .pool thumb_func_end sub_818DB20 thumb_func_start sub_818DB7C sub_818DB7C: @ 818DB7C push {lr} - ldr r2, _0818DBB4 - ldr r0, _0818DBB8 + ldr r2, =0x0203cd64 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818DBBC + ldr r1, =0x00003b58 adds r0, r1 str r0, [r2] movs r3, 0 @@ -813277,25 +785849,22 @@ sub_818DB7C: @ 818DB7C strb r3, [r0, 0x3] ldr r1, [r2] strh r3, [r1, 0xE] - ldr r0, _0818DBC0 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r1, 0x12] bl sub_818DB20 pop {r0} bx r0 .align 2, 0 -_0818DBB4: .4byte 0x0203cd64 -_0818DBB8: .4byte 0x03005d8c -_0818DBBC: .4byte 0x00003b58 -_0818DBC0: .4byte 0x082e9531 + .pool thumb_func_end sub_818DB7C thumb_func_start sub_818DBC4 sub_818DBC4: @ 818DBC4 - ldr r3, _0818DBDC - ldr r0, _0818DBE0 + ldr r3, =0x0203cd64 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818DBE4 + ldr r1, =0x00003b58 adds r0, r1 str r0, [r3] movs r2, 0 @@ -813305,18 +785874,16 @@ sub_818DBC4: @ 818DBC4 strb r2, [r0, 0x1] bx lr .align 2, 0 -_0818DBDC: .4byte 0x0203cd64 -_0818DBE0: .4byte 0x03005d8c -_0818DBE4: .4byte 0x00003b58 + .pool thumb_func_end sub_818DBC4 thumb_func_start sub_818DBE8 sub_818DBE8: @ 818DBE8 push {lr} - ldr r1, _0818DC00 - ldr r0, _0818DC04 + ldr r1, =0x0203cd64 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818DC08 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] ldrb r0, [r0, 0x1] @@ -813325,9 +785892,7 @@ sub_818DBE8: @ 818DBE8 movs r0, 0x2 b _0818DC16 .align 2, 0 -_0818DC00: .4byte 0x0203cd64 -_0818DC04: .4byte 0x03005d8c -_0818DC08: .4byte 0x00003b58 + .pool _0818DC0C: cmp r0, 0x1 beq _0818DC14 @@ -813343,25 +785908,25 @@ _0818DC16: thumb_func_start sub_818DC1C sub_818DC1C: @ 818DC1C lsls r0, 24 - ldr r1, _0818DC28 + ldr r1, =0x0860b224 lsrs r0, 22 adds r0, r1 ldr r0, [r0] bx lr .align 2, 0 -_0818DC28: .4byte 0x0860b224 + .pool thumb_func_end sub_818DC1C thumb_func_start sub_818DC2C sub_818DC2C: @ 818DC2C push {r4,lr} - ldr r1, _0818DC50 - ldr r0, _0818DC54 + ldr r1, =0x0203cd64 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818DC58 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] - ldr r4, _0818DC5C + ldr r4, =0x02021cc4 ldrb r0, [r0, 0xC] bl sub_818DC1C adds r1, r0, 0 @@ -813371,19 +785936,16 @@ sub_818DC2C: @ 818DC2C pop {r0} bx r0 .align 2, 0 -_0818DC50: .4byte 0x0203cd64 -_0818DC54: .4byte 0x03005d8c -_0818DC58: .4byte 0x00003b58 -_0818DC5C: .4byte 0x02021cc4 + .pool thumb_func_end sub_818DC2C thumb_func_start sub_818DC60 sub_818DC60: @ 818DC60 push {r4,r5,lr} - ldr r5, _0818DC78 - ldr r0, _0818DC7C + ldr r5, =0x0203cd64 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r2, _0818DC80 + ldr r2, =0x00003b58 adds r0, r1, r2 str r0, [r5] ldrb r0, [r0, 0x4] @@ -813392,12 +785954,10 @@ sub_818DC60: @ 818DC60 movs r0, 0 b _0818DC9C .align 2, 0 -_0818DC78: .4byte 0x0203cd64 -_0818DC7C: .4byte 0x03005d8c -_0818DC80: .4byte 0x00003b58 + .pool _0818DC84: - ldr r4, _0818DCA4 - ldr r0, _0818DCA8 + ldr r4, =0x02021ec4 + ldr r0, =0x00003b5c adds r1, r0 adds r0, r4, 0 bl strcpy_limit_7_chars @@ -813411,8 +785971,7 @@ _0818DC9C: pop {r1} bx r1 .align 2, 0 -_0818DCA4: .4byte 0x02021ec4 -_0818DCA8: .4byte 0x00003b5c + .pool thumb_func_end sub_818DC60 thumb_func_start sub_818DCAC @@ -813433,22 +785992,19 @@ sub_818DCAC: @ 818DCAC thumb_func_start sub_818DCC8 sub_818DCC8: @ 818DCC8 push {lr} - ldr r2, _0818DCE4 - ldr r0, _0818DCE8 + ldr r2, =0x0203cd64 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0818DCEC + ldr r0, =0x00003b58 adds r1, r0 str r1, [r2] - ldr r0, _0818DCF0 + ldr r0, =0x02021dc4 ldrh r1, [r1, 0xE] bl sub_818DCAC pop {r0} bx r0 .align 2, 0 -_0818DCE4: .4byte 0x0203cd64 -_0818DCE8: .4byte 0x03005d8c -_0818DCEC: .4byte 0x00003b58 -_0818DCF0: .4byte 0x02021dc4 + .pool thumb_func_end sub_818DCC8 thumb_func_start sub_818DCF4 @@ -813471,15 +786027,15 @@ sub_818DCF4: @ 818DCF4 thumb_func_start sub_818DD14 sub_818DD14: @ 818DD14 push {r4,r5,lr} - ldr r5, _0818DD40 - ldr r0, _0818DD44 + ldr r5, =0x0203cd64 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818DD48 + ldr r2, =0x00003b58 adds r1, r0, r2 str r1, [r5] - ldr r1, _0818DD4C + ldr r1, =0x00003b5c adds r0, r1 - ldr r4, _0818DD50 + ldr r4, =0x02021ec4 adds r1, r4, 0 bl sub_818DCF4 ldr r0, [r5] @@ -813490,19 +786046,15 @@ sub_818DD14: @ 818DD14 pop {r0} bx r0 .align 2, 0 -_0818DD40: .4byte 0x0203cd64 -_0818DD44: .4byte 0x03005d8c -_0818DD48: .4byte 0x00003b58 -_0818DD4C: .4byte 0x00003b5c -_0818DD50: .4byte 0x02021ec4 + .pool thumb_func_end sub_818DD14 thumb_func_start sub_818DD54 sub_818DD54: @ 818DD54 - ldr r1, _0818DD6C - ldr r0, _0818DD70 + ldr r1, =0x0203cd64 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818DD74 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] ldrb r1, [r0, 0x2] @@ -813511,9 +786063,7 @@ sub_818DD54: @ 818DD54 lsrs r0, 31 bx lr .align 2, 0 -_0818DD6C: .4byte 0x0203cd64 -_0818DD70: .4byte 0x03005d8c -_0818DD74: .4byte 0x00003b58 + .pool thumb_func_end sub_818DD54 thumb_func_start sub_818DD78 @@ -813531,13 +786081,13 @@ sub_818DD84: @ 818DD84 push {r7} lsls r0, 16 lsrs r5, r0, 16 - ldr r4, _0818DE0C - ldr r0, _0818DE10 + ldr r4, =0x0203cd64 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818DE14 + ldr r1, =0x00003b58 adds r0, r1 str r0, [r4] - ldr r1, _0818DE18 + ldr r1, =0x0860b2ec mov r8, r1 ldrb r0, [r0, 0xC] lsls r0, 2 @@ -813549,17 +786099,17 @@ sub_818DD84: @ 818DD84 ldr r1, [r4] movs r0, 0x1 strb r0, [r1, 0x1] - ldr r0, _0818DE1C + ldr r0, =0x02021dc4 adds r1, r5, 0 bl sub_818DCAC ldr r1, [r4] strh r5, [r1, 0xE] - ldr r0, _0818DE20 + ldr r0, =0x03005d90 ldr r0, [r0] adds r1, 0x4 bl sub_818DCF4 ldr r1, [r4] - ldr r0, _0818DE24 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r1, 0x12] movs r7, 0 @@ -813592,13 +786142,7 @@ _0818DDDC: strb r0, [r1, 0x3] b _0818DE36 .align 2, 0 -_0818DE0C: .4byte 0x0203cd64 -_0818DE10: .4byte 0x03005d8c -_0818DE14: .4byte 0x00003b58 -_0818DE18: .4byte 0x0860b2ec -_0818DE1C: .4byte 0x02021dc4 -_0818DE20: .4byte 0x03005d90 -_0818DE24: .4byte 0x082e9531 + .pool _0818DE28: movs r0, 0 strb r0, [r2, 0x2] @@ -813619,7 +786163,7 @@ _0818DE36: thumb_func_start sub_818DE44 sub_818DE44: @ 818DE44 push {lr} - ldr r0, _0818DE58 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl sub_818DD84 lsls r0, 24 @@ -813627,16 +786171,16 @@ sub_818DE44: @ 818DE44 pop {r1} bx r1 .align 2, 0 -_0818DE58: .4byte 0x0203ce7c + .pool thumb_func_end sub_818DE44 thumb_func_start sub_818DE5C sub_818DE5C: @ 818DE5C push {lr} - ldr r1, _0818DE7C - ldr r0, _0818DE80 + ldr r1, =0x0203cd64 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818DE84 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] ldrb r0, [r0, 0x3] @@ -813649,9 +786193,7 @@ _0818DE74: pop {r1} bx r1 .align 2, 0 -_0818DE7C: .4byte 0x0203cd64 -_0818DE80: .4byte 0x03005d8c -_0818DE84: .4byte 0x00003b58 + .pool thumb_func_end sub_818DE5C thumb_func_start sub_818DE88 @@ -813660,24 +786202,24 @@ sub_818DE88: @ 818DE88 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r0, _0818DE9C + ldr r0, =0x02021dc4 bl sub_818DCAC pop {r0} bx r0 .align 2, 0 -_0818DE9C: .4byte 0x02021dc4 + .pool thumb_func_end sub_818DE88 thumb_func_start sub_818DEA0 sub_818DEA0: @ 818DEA0 push {r4,r5,lr} - ldr r5, _0818DECC - ldr r0, _0818DED0 + ldr r5, =0x0203cd64 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818DED4 + ldr r1, =0x00003b58 adds r0, r1 str r0, [r5] - ldr r1, _0818DED8 + ldr r1, =0x0860b304 ldrb r0, [r0, 0xC] lsls r0, 1 adds r0, r1 @@ -813692,24 +786234,21 @@ sub_818DEA0: @ 818DEA0 pop {r1} bx r1 .align 2, 0 -_0818DECC: .4byte 0x0203cd64 -_0818DED0: .4byte 0x03005d8c -_0818DED4: .4byte 0x00003b58 -_0818DED8: .4byte 0x0860b304 + .pool thumb_func_end sub_818DEA0 thumb_func_start sub_818DEDC sub_818DEDC: @ 818DEDC push {lr} bl sub_818DB7C - ldr r0, _0818DEF0 + ldr r0, =0x0203cd64 ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x1] pop {r0} bx r0 .align 2, 0 -_0818DEF0: .4byte 0x0203cd64 + .pool thumb_func_end sub_818DEDC thumb_func_start sub_818DEF4 @@ -813729,8 +786268,8 @@ sub_818DF00: @ 818DF00 movs r0, 0xF ands r4, r0 movs r3, 0 - ldr r5, _0818DF58 - ldr r1, _0818DF5C + ldr r5, =0x0203cd68 + ldr r1, =0x0860b1a4 lsls r0, r4, 2 adds r6, r0, r1 adds r7, r5, 0 @@ -813749,12 +786288,12 @@ _0818DF1A: cmp r3, 0x8 bls _0818DF1A ldr r2, [r7] - ldr r0, _0818DF60 + ldr r0, =0x0860b1e4 lsls r1, r4, 1 adds r0, r1, r0 ldrh r0, [r0] strh r0, [r2, 0x14] - ldr r0, _0818DF64 + ldr r0, =0x0860b204 adds r1, r0 ldrh r0, [r1] strh r0, [r2, 0x28] @@ -813767,19 +786306,16 @@ _0818DF1A: pop {r0} bx r0 .align 2, 0 -_0818DF58: .4byte 0x0203cd68 -_0818DF5C: .4byte 0x0860b1a4 -_0818DF60: .4byte 0x0860b1e4 -_0818DF64: .4byte 0x0860b204 + .pool thumb_func_end sub_818DF00 thumb_func_start sub_818DF68 sub_818DF68: @ 818DF68 push {r4-r6,lr} - ldr r2, _0818DFF0 - ldr r0, _0818DFF4 + ldr r2, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818DFF8 + ldr r1, =0x00003b58 adds r0, r1 str r0, [r2] movs r1, 0 @@ -813788,9 +786324,9 @@ sub_818DF68: @ 818DF68 strb r1, [r0, 0x1] movs r3, 0 adds r4, r2, 0 - ldr r6, _0818DFFC + ldr r6, =0x082e9531 adds r5, r4, 0 - ldr r0, _0818E000 + ldr r0, =0x0000ffff adds r2, r0, 0 _0818DF8A: ldr r1, [r5] @@ -813806,7 +786342,7 @@ _0818DF8A: cmp r3, 0x8 bls _0818DF8A ldr r0, [r4] - ldr r1, _0818E000 + ldr r1, =0x0000ffff strh r1, [r0, 0x14] movs r1, 0x1 negs r1, r1 @@ -813844,19 +786380,15 @@ _0818DFB4: pop {r0} bx r0 .align 2, 0 -_0818DFF0: .4byte 0x0203cd68 -_0818DFF4: .4byte 0x03005d8c -_0818DFF8: .4byte 0x00003b58 -_0818DFFC: .4byte 0x082e9531 -_0818E000: .4byte 0x0000ffff + .pool thumb_func_end sub_818DF68 thumb_func_start sub_818E004 sub_818E004: @ 818E004 - ldr r2, _0818E028 - ldr r0, _0818E02C + ldr r2, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818E030 + ldr r1, =0x00003b58 adds r0, r1 str r0, [r2] movs r1, 0 @@ -813867,23 +786399,20 @@ sub_818E004: @ 818E004 adds r0, 0x2A strb r1, [r0] ldr r1, [r2] - ldr r0, _0818E034 + ldr r0, =0x0000ffff strh r0, [r1, 0x16] bx lr .align 2, 0 -_0818E028: .4byte 0x0203cd68 -_0818E02C: .4byte 0x03005d8c -_0818E030: .4byte 0x00003b58 -_0818E034: .4byte 0x0000ffff + .pool thumb_func_end sub_818E004 thumb_func_start sub_818E038 sub_818E038: @ 818E038 push {lr} - ldr r1, _0818E050 - ldr r0, _0818E054 + ldr r1, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818E058 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] ldrb r0, [r0, 0x1] @@ -813892,9 +786421,7 @@ sub_818E038: @ 818E038 movs r0, 0x2 b _0818E066 .align 2, 0 -_0818E050: .4byte 0x0203cd68 -_0818E054: .4byte 0x03005d8c -_0818E058: .4byte 0x00003b58 + .pool _0818E05C: cmp r0, 0x1 beq _0818E064 @@ -813914,23 +786441,23 @@ sub_818E06C: @ 818E06C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _0818E0FC + ldr r0, =0x03005d8c ldr r4, [r0] - ldr r0, _0818E100 + ldr r0, =0x00003b58 adds r7, r4, r0 ldrh r0, [r7, 0x14] bl sub_811F8D8 cmp r0, 0 bne _0818E0EC - ldr r1, _0818E104 + ldr r1, =0x00003b83 adds r0, r4, r1 ldrb r5, [r0] - ldr r0, _0818E108 + ldr r0, =0x00003b5a adds r0, r4 mov r8, r0 adds r1, r4 mov r10, r1 - ldr r6, _0818E10C + ldr r6, =0x0860b1e4 _0818E09A: adds r5, 0x1 cmp r5, 0xF @@ -813944,12 +786471,12 @@ _0818E0A2: cmp r0, 0 beq _0818E09A movs r3, 0 - ldr r0, _0818E10C + ldr r0, =0x0860b1e4 mov r12, r0 lsls r1, r5, 2 - ldr r0, _0818E110 + ldr r0, =0x0860b204 mov r9, r0 - ldr r0, _0818E114 + ldr r0, =0x0860b1a4 adds r6, r1, r0 mov r2, r8 _0818E0C2: @@ -813983,13 +786510,7 @@ _0818E0EC: movs r0, 0x2 b _0818E12C .align 2, 0 -_0818E0FC: .4byte 0x03005d8c -_0818E100: .4byte 0x00003b58 -_0818E104: .4byte 0x00003b83 -_0818E108: .4byte 0x00003b5a -_0818E10C: .4byte 0x0860b1e4 -_0818E110: .4byte 0x0860b204 -_0818E114: .4byte 0x0860b1a4 + .pool _0818E118: cmp r0, 0x2 beq _0818E126 @@ -814016,29 +786537,25 @@ _0818E12C: sub_818E13C: @ 818E13C push {r4-r7,lr} movs r7, 0x1 - ldr r5, _0818E160 - ldr r0, _0818E164 + ldr r5, =0x0203cd68 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r2, _0818E168 + ldr r2, =0x00003b58 adds r0, r1, r2 str r0, [r5] ldrb r0, [r0, 0x18] cmp r0, 0xFF bne _0818E174 - ldr r0, _0818E16C - ldr r1, _0818E170 + ldr r0, =0x02021cc4 + ldr r1, =0x085eeb7e bl strcpy_limit_7_chars movs r7, 0 b _0818E1DC .align 2, 0 -_0818E160: .4byte 0x0203cd68 -_0818E164: .4byte 0x03005d8c -_0818E168: .4byte 0x00003b58 -_0818E16C: .4byte 0x02021cc4 -_0818E170: .4byte 0x085eeb7e + .pool _0818E174: - ldr r4, _0818E1E4 - ldr r0, _0818E1E8 + ldr r4, =0x02021cc4 + ldr r0, =0x00003b70 adds r1, r0 adds r0, r4, 0 bl strcpy_limit_7_chars @@ -814052,7 +786569,7 @@ _0818E174: bl sub_818E258 lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _0818E1EC + ldr r6, =0x03005d90 ldr r0, [r6] bl sub_818E258 lsls r0, 24 @@ -814074,11 +786591,11 @@ _0818E1BA: lsrs r2, r0, 24 cmp r2, r4 bcs _0818E1DC - ldr r0, _0818E1F0 + ldr r0, =0x0203cd68 ldr r1, [r0] adds r1, 0x18 adds r1, r2 - ldr r0, _0818E1EC + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, r2 ldrb r1, [r1] @@ -814093,26 +786610,23 @@ _0818E1DC: pop {r1} bx r1 .align 2, 0 -_0818E1E4: .4byte 0x02021cc4 -_0818E1E8: .4byte 0x00003b70 -_0818E1EC: .4byte 0x03005d90 -_0818E1F0: .4byte 0x0203cd68 + .pool thumb_func_end sub_818E13C thumb_func_start sub_818E1F4 sub_818E1F4: @ 818E1F4 push {r4-r6,lr} - ldr r3, _0818E244 - ldr r0, _0818E248 + ldr r3, =0x0203cd68 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r2, _0818E24C + ldr r2, =0x00003b58 adds r0, r1, r2 str r0, [r3] movs r5, 0 movs r4, 0 - ldr r0, _0818E250 + ldr r0, =0x00003b78 adds r1, r0 - ldr r0, _0818E254 + ldr r0, =0x03005d90 ldr r2, [r0] ldrh r1, [r1] adds r6, r3, 0 @@ -814145,11 +786659,7 @@ _0818E23C: pop {r1} bx r1 .align 2, 0 -_0818E244: .4byte 0x0203cd68 -_0818E248: .4byte 0x03005d8c -_0818E24C: .4byte 0x00003b58 -_0818E250: .4byte 0x00003b78 -_0818E254: .4byte 0x03005d90 + .pool thumb_func_end sub_818E1F4 thumb_func_start sub_818E258 @@ -814175,8 +786685,8 @@ _0818E268: thumb_func_start sub_818E274 sub_818E274: @ 818E274 push {r4,lr} - ldr r4, _0818E290 - ldr r0, _0818E294 + ldr r4, =0x02021cc4 + ldr r0, =0x0203cd68 ldr r0, [r0] ldrh r0, [r0, 0x28] bl itemid_get_item @@ -814187,17 +786697,16 @@ sub_818E274: @ 818E274 pop {r0} bx r0 .align 2, 0 -_0818E290: .4byte 0x02021cc4 -_0818E294: .4byte 0x0203cd68 + .pool thumb_func_end sub_818E274 thumb_func_start sub_818E298 sub_818E298: @ 818E298 push {r4,lr} - ldr r4, _0818E2B4 - ldr r0, _0818E2B8 + ldr r4, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818E2BC + ldr r1, =0x00003b58 adds r0, r1 str r0, [r4] bl sub_818E13C @@ -814207,12 +786716,10 @@ sub_818E298: @ 818E298 movs r0, 0 b _0818E2CC .align 2, 0 -_0818E2B4: .4byte 0x0203cd68 -_0818E2B8: .4byte 0x03005d8c -_0818E2BC: .4byte 0x00003b58 + .pool _0818E2C0: ldr r0, [r4] - ldr r1, _0818E2D4 + ldr r1, =0x082e9531 ldrb r1, [r1] adds r0, 0x2D strb r1, [r0] @@ -814222,26 +786729,23 @@ _0818E2CC: pop {r1} bx r1 .align 2, 0 -_0818E2D4: .4byte 0x082e9531 + .pool thumb_func_end sub_818E298 thumb_func_start sub_818E2D8 sub_818E2D8: @ 818E2D8 - ldr r2, _0818E2EC - ldr r0, _0818E2F0 + ldr r2, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _0818E2F4 + ldr r3, =0x00003b58 adds r1, r0, r3 str r1, [r2] - ldr r1, _0818E2F8 + ldr r1, =0x00003b82 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_0818E2EC: .4byte 0x0203cd68 -_0818E2F0: .4byte 0x03005d8c -_0818E2F4: .4byte 0x00003b58 -_0818E2F8: .4byte 0x00003b82 + .pool thumb_func_end sub_818E2D8 thumb_func_start sub_818E2FC @@ -814255,17 +786759,17 @@ sub_818E2FC: @ 818E2FC thumb_func_start sub_818E308 sub_818E308: @ 818E308 push {r4-r6,lr} - ldr r5, _0818E344 - ldr r0, _0818E348 + ldr r5, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818E34C + ldr r1, =0x00003b58 adds r0, r1 str r0, [r5] - ldr r6, _0818E350 + ldr r6, =0x02021cc4 ldrh r1, [r0, 0x14] adds r0, r6, 0 bl sub_811EBBC - ldr r4, _0818E354 + ldr r4, =0x02021dc4 ldr r0, [r5] ldrh r1, [r0, 0x16] adds r0, r4, 0 @@ -814283,82 +786787,68 @@ _0818E33C: pop {r1} bx r1 .align 2, 0 -_0818E344: .4byte 0x0203cd68 -_0818E348: .4byte 0x03005d8c -_0818E34C: .4byte 0x00003b58 -_0818E350: .4byte 0x02021cc4 -_0818E354: .4byte 0x02021dc4 + .pool thumb_func_end sub_818E308 thumb_func_start sub_818E358 sub_818E358: @ 818E358 - ldr r1, _0818E36C - ldr r0, _0818E370 + ldr r1, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818E374 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] - ldr r1, _0818E378 + ldr r1, =0x020375e2 ldrh r0, [r0, 0x28] strh r0, [r1] bx lr .align 2, 0 -_0818E36C: .4byte 0x0203cd68 -_0818E370: .4byte 0x03005d8c -_0818E374: .4byte 0x00003b58 -_0818E378: .4byte 0x020375e2 + .pool thumb_func_end sub_818E358 thumb_func_start sub_818E37C sub_818E37C: @ 818E37C - ldr r1, _0818E390 - ldr r0, _0818E394 + ldr r1, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818E398 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] movs r1, 0x1 strb r1, [r0, 0x1] bx lr .align 2, 0 -_0818E390: .4byte 0x0203cd68 -_0818E394: .4byte 0x03005d8c -_0818E398: .4byte 0x00003b58 + .pool thumb_func_end sub_818E37C thumb_func_start sub_818E39C sub_818E39C: @ 818E39C - ldr r1, _0818E3B0 - ldr r0, _0818E3B4 + ldr r1, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818E3B8 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] movs r1, 0x2 strb r1, [r0, 0x1] bx lr .align 2, 0 -_0818E3B0: .4byte 0x0203cd68 -_0818E3B4: .4byte 0x03005d8c -_0818E3B8: .4byte 0x00003b58 + .pool thumb_func_end sub_818E39C thumb_func_start sub_818E3BC sub_818E3BC: @ 818E3BC - ldr r1, _0818E3D0 - ldr r0, _0818E3D4 + ldr r1, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818E3D8 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] - ldr r1, _0818E3DC + ldr r1, =0x0000ffff strh r1, [r0, 0x16] bx lr .align 2, 0 -_0818E3D0: .4byte 0x0203cd68 -_0818E3D4: .4byte 0x03005d8c -_0818E3D8: .4byte 0x00003b58 -_0818E3DC: .4byte 0x0000ffff + .pool thumb_func_end sub_818E3BC thumb_func_start sub_818E3E0 @@ -814372,10 +786862,10 @@ sub_818E3E0: @ 818E3E0 thumb_func_start sub_818E3EC sub_818E3EC: @ 818E3EC push {r4,lr} - ldr r4, _0818E410 - ldr r0, _0818E414 + ldr r4, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818E418 + ldr r1, =0x00003b58 adds r0, r1 str r0, [r4] bl sub_818E298 @@ -814389,9 +786879,7 @@ sub_818E3EC: @ 818E3EC adds r0, 0x2C b _0818E422 .align 2, 0 -_0818E410: .4byte 0x0203cd68 -_0818E414: .4byte 0x03005d8c -_0818E418: .4byte 0x00003b58 + .pool _0818E41C: ldr r0, [r4] adds r0, 0x2C @@ -814407,16 +786895,16 @@ _0818E422: thumb_func_start sub_818E430 sub_818E430: @ 818E430 push {r4,r5,lr} - ldr r1, _0818E46C - ldr r0, _0818E470 + ldr r1, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818E474 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] movs r2, 0 adds r5, r1, 0 adds r4, r5, 0 - ldr r0, _0818E478 + ldr r0, =0x0000ffff adds r3, r0, 0 _0818E448: ldr r1, [r4] @@ -814432,59 +786920,56 @@ _0818E448: cmp r2, 0x8 bls _0818E448 ldr r1, [r5] - ldr r0, _0818E478 + ldr r0, =0x0000ffff strh r0, [r1, 0x14] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0818E46C: .4byte 0x0203cd68 -_0818E470: .4byte 0x03005d8c -_0818E474: .4byte 0x00003b58 -_0818E478: .4byte 0x0000ffff + .pool thumb_func_end sub_818E430 thumb_func_start sub_818E47C sub_818E47C: @ 818E47C push {lr} - ldr r1, _0818E48C + ldr r1, =0x020375e0 movs r0, 0x11 strh r0, [r1] bl sub_811A4F0 pop {r0} bx r0 .align 2, 0 -_0818E48C: .4byte 0x020375e0 + .pool thumb_func_end sub_818E47C thumb_func_start sub_818E490 sub_818E490: @ 818E490 push {lr} - ldr r0, _0818E4A0 + ldr r0, =0x0203ce7c ldrh r0, [r0] movs r1, 0x1 bl sub_80D6AA4 pop {r0} bx r0 .align 2, 0 -_0818E4A0: .4byte 0x0203ce7c + .pool thumb_func_end sub_818E490 thumb_func_start sub_818E4A4 sub_818E4A4: @ 818E4A4 push {r4-r6,lr} - ldr r2, _0818E4F8 - ldr r0, _0818E4FC + ldr r2, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818E500 + ldr r1, =0x00003b58 adds r0, r1 str r0, [r2] - ldr r1, _0818E504 + ldr r1, =0x0203ce7c ldrh r1, [r1] strh r1, [r0, 0x28] movs r3, 0 adds r4, r2, 0 - ldr r6, _0818E508 + ldr r6, =0x03005d90 adds r5, r4, 0 adds r2, r6, 0 _0818E4C2: @@ -814507,7 +786992,7 @@ _0818E4C2: ldr r1, [r6] bl strcpy_limit_7_chars ldr r0, [r4] - ldr r1, _0818E50C + ldr r1, =0x082e9531 ldrb r1, [r1] adds r0, 0x2D strb r1, [r0] @@ -814515,53 +787000,42 @@ _0818E4C2: pop {r0} bx r0 .align 2, 0 -_0818E4F8: .4byte 0x0203cd68 -_0818E4FC: .4byte 0x03005d8c -_0818E500: .4byte 0x00003b58 -_0818E504: .4byte 0x0203ce7c -_0818E508: .4byte 0x03005d90 -_0818E50C: .4byte 0x082e9531 + .pool thumb_func_end sub_818E4A4 thumb_func_start sub_818E510 sub_818E510: @ 818E510 - ldr r2, _0818E528 - ldr r0, _0818E52C + ldr r2, =0x0203cd68 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _0818E530 + ldr r3, =0x00003b58 adds r1, r0, r3 str r1, [r2] - ldr r1, _0818E534 + ldr r1, =0x00003b82 adds r0, r1 movs r1, 0x1 strb r1, [r0] bx lr .align 2, 0 -_0818E528: .4byte 0x0203cd68 -_0818E52C: .4byte 0x03005d8c -_0818E530: .4byte 0x00003b58 -_0818E534: .4byte 0x00003b82 + .pool thumb_func_end sub_818E510 thumb_func_start sub_818E538 sub_818E538: @ 818E538 push {lr} - ldr r2, _0818E554 - ldr r0, _0818E558 + ldr r2, =0x0203cd68 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _0818E55C + ldr r0, =0x00003b58 adds r1, r0 str r1, [r2] - ldr r0, _0818E560 + ldr r0, =0x02021ec4 ldrh r1, [r1, 0x14] bl sub_811EBBC pop {r0} bx r0 .align 2, 0 -_0818E554: .4byte 0x0203cd68 -_0818E558: .4byte 0x03005d8c -_0818E55C: .4byte 0x00003b58 -_0818E560: .4byte 0x02021ec4 + .pool thumb_func_end sub_818E538 thumb_func_start sub_818E564 @@ -814575,10 +787049,10 @@ sub_818E564: @ 818E564 thumb_func_start sub_818E570 sub_818E570: @ 818E570 push {r4-r7,lr} - ldr r2, _0818E5F4 - ldr r1, _0818E5F8 + ldr r2, =0x0203cd68 + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r4, _0818E5FC + ldr r4, =0x00003b58 adds r3, r1, r4 str r3, [r2] adds r6, r0, 0 @@ -814591,7 +787065,7 @@ sub_818E570: @ 818E570 cmp r0, 0 bne _0818E5EC movs r5, 0 - ldr r2, _0818E600 + ldr r2, =0x00003b83 adds r0, r1, r2 ldrb r0, [r0] cmp r4, r0 @@ -814622,7 +787096,7 @@ _0818E5C6: adds r2, r0, 0 adds r2, 0x2B ldrb r0, [r6] - ldr r7, _0818E5F4 + ldr r7, =0x0203cd68 ldrb r4, [r2] cmp r0, r4 bne _0818E5E4 @@ -814643,16 +787117,13 @@ _0818E5EC: pop {r0} bx r0 .align 2, 0 -_0818E5F4: .4byte 0x0203cd68 -_0818E5F8: .4byte 0x03005d8c -_0818E5FC: .4byte 0x00003b58 -_0818E600: .4byte 0x00003b83 + .pool thumb_func_end sub_818E570 thumb_func_start sub_818E604 sub_818E604: @ 818E604 push {r4,lr} - ldr r4, _0818E634 + ldr r4, =0x0203cd6c ldr r1, [r4] movs r0, 0xFF strb r0, [r1, 0x4] @@ -814674,16 +787145,16 @@ sub_818E604: @ 818E604 pop {r0} bx r0 .align 2, 0 -_0818E634: .4byte 0x0203cd6c + .pool thumb_func_end sub_818E604 thumb_func_start sub_818E638 sub_818E638: @ 818E638 push {r4,lr} - ldr r4, _0818E664 - ldr r0, _0818E668 + ldr r4, =0x0203cd6c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818E66C + ldr r1, =0x00003b58 adds r0, r1 str r0, [r4] movs r2, 0 @@ -814693,26 +787164,23 @@ sub_818E638: @ 818E638 strb r2, [r0, 0x1] bl sub_818E604 ldr r1, [r4] - ldr r0, _0818E670 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r1, 0xE] pop {r4} pop {r0} bx r0 .align 2, 0 -_0818E664: .4byte 0x0203cd6c -_0818E668: .4byte 0x03005d8c -_0818E66C: .4byte 0x00003b58 -_0818E670: .4byte 0x082e9531 + .pool thumb_func_end sub_818E638 thumb_func_start sub_818E674 sub_818E674: @ 818E674 push {lr} - ldr r2, _0818E6A4 - ldr r0, _0818E6A8 + ldr r2, =0x0203cd6c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _0818E6AC + ldr r1, =0x00003b58 adds r0, r1 str r0, [r2] movs r3, 0 @@ -814733,9 +787201,7 @@ _0818E69E: pop {r0} bx r0 .align 2, 0 -_0818E6A4: .4byte 0x0203cd6c -_0818E6A8: .4byte 0x03005d8c -_0818E6AC: .4byte 0x00003b58 + .pool thumb_func_end sub_818E674 thumb_func_start sub_818E6B0 @@ -814743,10 +787209,10 @@ sub_818E6B0: @ 818E6B0 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r4, _0818E6F0 - ldr r0, _0818E6F4 + ldr r4, =0x0203cd6c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r3, _0818E6F8 + ldr r3, =0x00003b58 adds r1, r0, r3 str r1, [r4] ldrb r0, [r1, 0xC] @@ -814759,13 +787225,13 @@ sub_818E6B0: @ 818E6B0 movs r2, 0x8 bl memset ldr r1, [r4] - ldr r0, _0818E6FC + ldr r0, =0x03005d90 adds r1, 0x4 ldr r0, [r0] ldm r0!, {r2,r3} stm r1!, {r2,r3} ldr r1, [r4] - ldr r0, _0818E700 + ldr r0, =0x082e9531 ldrb r0, [r0] strb r0, [r1, 0xE] _0818E6EA: @@ -814773,11 +787239,7 @@ _0818E6EA: pop {r0} bx r0 .align 2, 0 -_0818E6F0: .4byte 0x0203cd6c -_0818E6F4: .4byte 0x03005d8c -_0818E6F8: .4byte 0x00003b58 -_0818E6FC: .4byte 0x03005d90 -_0818E700: .4byte 0x082e9531 + .pool thumb_func_end sub_818E6B0 thumb_func_start sub_818E704 @@ -814786,10 +787248,10 @@ sub_818E704: @ 818E704 adds r2, r0, 0 movs r3, 0 movs r4, 0 - ldr r1, _0818E72C - ldr r0, _0818E730 + ldr r1, =0x0203cd6c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r5, _0818E734 + ldr r5, =0x00003b58 adds r0, r5 str r0, [r1] ldrb r0, [r0, 0xD] @@ -814797,15 +787259,12 @@ sub_818E704: @ 818E704 cmp r0, 0x4 bhi _0818E76A lsls r0, 2 - ldr r1, _0818E738 + ldr r1, =_0818E73C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0818E72C: .4byte 0x0203cd6c -_0818E730: .4byte 0x03005d8c -_0818E734: .4byte 0x00003b58 -_0818E738: .4byte _0818E73C + .pool .align 2, 0 _0818E73C: .4byte _0818E750 @@ -814837,14 +787296,14 @@ _0818E76A: bne _0818E784 adds r0, r3, 0 bl sub_818E6B0 - ldr r0, _0818E780 + ldr r0, =0x0203cd6c ldr r1, [r0] ldrb r0, [r1, 0x2] adds r0, 0x1 strb r0, [r1, 0x2] b _0818E78C .align 2, 0 -_0818E780: .4byte 0x0203cd6c + .pool _0818E784: ldr r1, [r5] ldrb r0, [r1, 0x3] @@ -814861,19 +787320,19 @@ _0818E78C: sub_818E794: @ 818E794 push {r4,r5,lr} adds r5, r1, 0 - ldr r4, _0818E7CC - ldr r1, _0818E7D0 + ldr r4, =0x0203cd6c + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r2, _0818E7D4 + ldr r2, =0x00003b58 adds r1, r2 str r1, [r4] - ldr r2, _0818E7D8 + ldr r2, =0x0860b324 ldrb r1, [r1, 0xD] lsls r1, 2 adds r1, r2 ldr r1, [r1] bl gf_strcpy - ldr r1, _0818E7DC + ldr r1, =0x0860b310 ldr r0, [r4] ldrb r0, [r0, 0xD] lsls r0, 2 @@ -814885,26 +787344,22 @@ sub_818E794: @ 818E794 pop {r0} bx r0 .align 2, 0 -_0818E7CC: .4byte 0x0203cd6c -_0818E7D0: .4byte 0x03005d8c -_0818E7D4: .4byte 0x00003b58 -_0818E7D8: .4byte 0x0860b324 -_0818E7DC: .4byte 0x0860b310 + .pool thumb_func_end sub_818E794 thumb_func_start sub_818E7E0 sub_818E7E0: @ 818E7E0 push {r4,lr} adds r3, r1, 0 - ldr r2, _0818E80C - ldr r1, _0818E810 + ldr r2, =0x0203cd6c + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r4, _0818E814 + ldr r4, =0x00003b58 adds r1, r4 str r1, [r2] ldrb r2, [r1, 0xD] strb r2, [r0] - ldr r2, _0818E818 + ldr r2, =0x0860b310 ldrb r0, [r1, 0xD] lsls r0, 2 adds r0, r2 @@ -814915,56 +787370,48 @@ sub_818E7E0: @ 818E7E0 pop {r0} bx r0 .align 2, 0 -_0818E80C: .4byte 0x0203cd6c -_0818E810: .4byte 0x03005d8c -_0818E814: .4byte 0x00003b58 -_0818E818: .4byte 0x0860b310 + .pool thumb_func_end sub_818E7E0 thumb_func_start sub_818E81C sub_818E81C: @ 818E81C push {r4,lr} - ldr r3, _0818E838 - ldr r1, _0818E83C + ldr r3, =0x0203cd6c + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r4, _0818E840 + ldr r4, =0x00003b58 adds r2, r1, r4 str r2, [r3] - ldr r2, _0818E844 + ldr r2, =0x00003b5c adds r1, r2 bl gf_strcpy pop {r4} pop {r0} bx r0 .align 2, 0 -_0818E838: .4byte 0x0203cd6c -_0818E83C: .4byte 0x03005d8c -_0818E840: .4byte 0x00003b58 -_0818E844: .4byte 0x00003b5c + .pool thumb_func_end sub_818E81C thumb_func_start sub_818E848 sub_818E848: @ 818E848 - ldr r2, _0818E85C - ldr r1, _0818E860 + ldr r2, =0x0203cd6c + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r3, _0818E864 + ldr r3, =0x00003b58 adds r1, r3 str r1, [r2] ldrb r1, [r1, 0xE] strb r1, [r0] bx lr .align 2, 0 -_0818E85C: .4byte 0x0203cd6c -_0818E860: .4byte 0x03005d8c -_0818E864: .4byte 0x00003b58 + .pool thumb_func_end sub_818E848 thumb_func_start sub_818E868 sub_818E868: @ 818E868 push {lr} lsls r1, 24 - ldr r2, _0818E87C + ldr r2, =0x0860b338 lsrs r1, 22 adds r1, r2 ldr r1, [r1] @@ -814972,16 +787419,16 @@ sub_818E868: @ 818E868 pop {r0} bx r0 .align 2, 0 -_0818E87C: .4byte 0x0860b338 + .pool thumb_func_end sub_818E868 thumb_func_start sub_818E880 sub_818E880: @ 818E880 push {lr} - ldr r1, _0818E898 - ldr r0, _0818E89C + ldr r1, =0x0203cd6c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818E8A0 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] ldrb r0, [r0, 0x2] @@ -814990,9 +787437,7 @@ sub_818E880: @ 818E880 movs r0, 0x1 b _0818E8AE .align 2, 0 -_0818E898: .4byte 0x0203cd6c -_0818E89C: .4byte 0x03005d8c -_0818E8A0: .4byte 0x00003b58 + .pool _0818E8A4: cmp r0, 0 beq _0818E8AC @@ -815008,10 +787453,10 @@ _0818E8AE: thumb_func_start sub_818E8B4 sub_818E8B4: @ 818E8B4 push {lr} - ldr r1, _0818E8CC - ldr r0, _0818E8D0 + ldr r1, =0x0203cd6c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818E8D4 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] ldrb r0, [r0, 0x1] @@ -815020,9 +787465,7 @@ sub_818E8B4: @ 818E8B4 movs r0, 0 b _0818E8DA .align 2, 0 -_0818E8CC: .4byte 0x0203cd6c -_0818E8D0: .4byte 0x03005d8c -_0818E8D4: .4byte 0x00003b58 + .pool _0818E8D8: movs r0, 0x1 _0818E8DA: @@ -815034,10 +787477,10 @@ _0818E8DA: sub_818E8E0: @ 818E8E0 push {r4,lr} movs r3, 0 - ldr r1, _0818E908 - ldr r0, _0818E90C + ldr r1, =0x0203cd6c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r4, _0818E910 + ldr r4, =0x00003b58 adds r2, r0, r4 str r2, [r1] ldrb r0, [r2, 0x2] @@ -815054,63 +787497,58 @@ _0818E8FE: pop {r1} bx r1 .align 2, 0 -_0818E908: .4byte 0x0203cd6c -_0818E90C: .4byte 0x03005d8c -_0818E910: .4byte 0x00003b58 + .pool thumb_func_end sub_818E8E0 thumb_func_start sub_818E914 sub_818E914: @ 818E914 push {lr} - ldr r0, _0818E924 - ldr r1, _0818E928 + ldr r0, =0x02021dc4 + ldr r1, =0x02021cc4 bl sub_818E794 pop {r0} bx r0 .align 2, 0 -_0818E924: .4byte 0x02021dc4 -_0818E928: .4byte 0x02021cc4 + .pool thumb_func_end sub_818E914 thumb_func_start sub_818E92C sub_818E92C: @ 818E92C push {lr} - ldr r1, _0818E93C + ldr r1, =c2_exit_to_overworld_2_switch + 1 movs r0, 0x3 bl sub_81357FC pop {r0} bx r0 .align 2, 0 -_0818E93C: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_818E92C thumb_func_start sub_818E940 sub_818E940: @ 818E940 - ldr r1, _0818E954 - ldr r0, _0818E958 + ldr r1, =0x0203cd6c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818E95C + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] movs r1, 0x1 strb r1, [r0, 0x1] bx lr .align 2, 0 -_0818E954: .4byte 0x0203cd6c -_0818E958: .4byte 0x03005d8c -_0818E95C: .4byte 0x00003b58 + .pool thumb_func_end sub_818E940 thumb_func_start sub_818E960 sub_818E960: @ 818E960 - ldr r1, _0818E97C - ldr r0, _0818E980 + ldr r1, =0x0203cd6c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818E984 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] - ldr r2, _0818E988 - ldr r1, _0818E98C + ldr r2, =0x020375e2 + ldr r1, =0x0860b34c ldrb r0, [r0, 0xD] lsls r0, 1 adds r0, r1 @@ -815118,34 +787556,28 @@ sub_818E960: @ 818E960 strh r0, [r2] bx lr .align 2, 0 -_0818E97C: .4byte 0x0203cd6c -_0818E980: .4byte 0x03005d8c -_0818E984: .4byte 0x00003b58 -_0818E988: .4byte 0x020375e2 -_0818E98C: .4byte 0x0860b34c + .pool thumb_func_end sub_818E960 thumb_func_start sub_818E990 sub_818E990: @ 818E990 - ldr r1, _0818E9A0 - ldr r0, _0818E9A4 + ldr r1, =0x0203cd6c + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _0818E9A8 + ldr r2, =0x00003b58 adds r0, r2 str r0, [r1] ldrb r0, [r0, 0xD] bx lr .align 2, 0 -_0818E9A0: .4byte 0x0203cd6c -_0818E9A4: .4byte 0x03005d8c -_0818E9A8: .4byte 0x00003b58 + .pool thumb_func_end sub_818E990 thumb_func_start sub_818E9AC sub_818E9AC: @ 818E9AC push {lr} - ldr r1, _0818E9C4 - ldr r0, _0818E9C8 + ldr r1, =0x0860d090 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -815154,26 +787586,25 @@ sub_818E9AC: @ 818E9AC pop {r0} bx r0 .align 2, 0 -_0818E9C4: .4byte 0x0860d090 -_0818E9C8: .4byte 0x020375e0 + .pool thumb_func_end sub_818E9AC thumb_func_start sub_818E9CC sub_818E9CC: @ 818E9CC push {r4-r7,lr} - ldr r4, _0818EA60 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _0818EA64 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r5, r0, 30 - ldr r0, _0818EA68 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r7, r0, 16 ldr r0, [r4] - ldr r2, _0818EA6C + ldr r2, =0x00000ca8 adds r0, r2 movs r6, 0 strb r6, [r0] @@ -815181,7 +787612,7 @@ sub_818E9CC: @ 818E9CC adds r2, 0xA adds r0, r1, r2 strh r6, [r0] - ldr r0, _0818EA64 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r2, [r1] movs r0, 0x5 @@ -815189,7 +787620,7 @@ sub_818E9CC: @ 818E9CC ands r0, r2 strb r0, [r1] ldr r1, [r4] - ldr r2, _0818EA64 + ldr r2, =0x00000ca9 adds r1, r2 ldrb r2, [r1] movs r0, 0x9 @@ -815197,9 +787628,9 @@ sub_818E9CC: @ 818E9CC ands r0, r2 strb r0, [r1] ldr r4, [r4] - ldr r0, _0818EA70 + ldr r0, =0x00000cdc adds r3, r4, r0 - ldr r2, _0818EA74 + ldr r2, =0x0860d0ec lsls r1, r5, 2 lsls r0, r7, 3 adds r1, r0 @@ -815212,12 +787643,12 @@ sub_818E9CC: @ 818E9CC lsls r0, r5, 1 lsls r1, r7, 2 adds r0, r1 - ldr r2, _0818EA78 + ldr r2, =0x00000d0c adds r1, r4, r2 adds r1, r0 strh r6, [r1] _0818EA3E: - ldr r0, _0818EA7C + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -815227,54 +787658,42 @@ _0818EA3E: negs r3, r3 movs r0, 0 bl saved_warp2_set - ldr r0, _0818EA80 + ldr r0, =0x02038bca strh r6, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0818EA60: .4byte 0x03005d90 -_0818EA64: .4byte 0x00000ca9 -_0818EA68: .4byte 0x000040ce -_0818EA6C: .4byte 0x00000ca8 -_0818EA70: .4byte 0x00000cdc -_0818EA74: .4byte 0x0860d0ec -_0818EA78: .4byte 0x00000d0c -_0818EA7C: .4byte 0x03005d8c -_0818EA80: .4byte 0x02038bca + .pool thumb_func_end sub_818E9CC thumb_func_start sub_818EA84 sub_818EA84: @ 818EA84 push {r4-r6,lr} - ldr r0, _0818EAB4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0818EAB8 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r5, r0, 30 - ldr r0, _0818EABC + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _0818EAC0 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x9 bls _0818EAA8 b _0818ED10 _0818EAA8: lsls r0, 2 - ldr r1, _0818EAC4 + ldr r1, =_0818EAC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0818EAB4: .4byte 0x03005d90 -_0818EAB8: .4byte 0x00000ca9 -_0818EABC: .4byte 0x000040ce -_0818EAC0: .4byte 0x020375e2 -_0818EAC4: .4byte _0818EAC8 + .pool .align 2, 0 _0818EAC8: .4byte _0818EAF0 @@ -815288,29 +787707,27 @@ _0818EAC8: .4byte _0818ECD0 .4byte _0818ECF4 _0818EAF0: - ldr r3, _0818EB08 - ldr r0, _0818EB0C + ldr r3, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r5, 1 lsls r2, r6, 2 adds r1, r2 - ldr r2, _0818EB10 + ldr r2, =0x00000d0c adds r0, r2 adds r0, r1 ldrh r0, [r0] strh r0, [r3] b _0818ED10 .align 2, 0 -_0818EB08: .4byte 0x020375f0 -_0818EB0C: .4byte 0x03005d90 -_0818EB10: .4byte 0x00000d0c + .pool _0818EB14: - ldr r4, _0818EB38 - ldr r0, _0818EB3C + ldr r4, =0x020375f0 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r3, _0818EB40 + ldr r3, =0x00000cdc adds r2, r3 - ldr r3, _0818EB44 + ldr r3, =0x0860d0ec lsls r0, r5, 2 lsls r1, r6, 3 adds r0, r1 @@ -815324,62 +787741,51 @@ _0818EB14: strh r0, [r4] b _0818ED10 .align 2, 0 -_0818EB38: .4byte 0x020375f0 -_0818EB3C: .4byte 0x03005d90 -_0818EB40: .4byte 0x00000cdc -_0818EB44: .4byte 0x0860d0ec + .pool _0818EB48: - ldr r1, _0818EB58 - ldr r0, _0818EB5C + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _0818EB60 + ldr r2, =0x00000d08 adds r0, r2 ldrb r0, [r0] lsls r0, 31 b _0818ECBE .align 2, 0 -_0818EB58: .4byte 0x020375f0 -_0818EB5C: .4byte 0x03005d90 -_0818EB60: .4byte 0x00000d08 + .pool _0818EB64: - ldr r1, _0818EB74 - ldr r0, _0818EB78 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r3, _0818EB7C + ldr r3, =0x00000d08 adds r0, r3 ldrb r0, [r0] lsls r0, 30 b _0818ECBE .align 2, 0 -_0818EB74: .4byte 0x020375f0 -_0818EB78: .4byte 0x03005d90 -_0818EB7C: .4byte 0x00000d08 + .pool _0818EB80: - ldr r1, _0818EB8C - ldr r0, _0818EB90 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _0818EB94 + ldr r2, =0x00000d08 adds r0, r2 b _0818ECBA .align 2, 0 -_0818EB8C: .4byte 0x020375f0 -_0818EB90: .4byte 0x03005d90 -_0818EB94: .4byte 0x00000d08 + .pool _0818EB98: - ldr r1, _0818EBA8 - ldr r0, _0818EBAC + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r3, _0818EBB0 + ldr r3, =0x00000d08 adds r0, r3 ldrb r0, [r0] lsls r0, 28 b _0818ECBE .align 2, 0 -_0818EBA8: .4byte 0x020375f0 -_0818EBAC: .4byte 0x03005d90 -_0818EBB0: .4byte 0x00000d08 + .pool _0818EBB4: - ldr r0, _0818EBD8 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 @@ -815387,62 +787793,53 @@ _0818EBB4: bne _0818EC04 cmp r5, 0 beq _0818EBE8 - ldr r1, _0818EBDC - ldr r0, _0818EBE0 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _0818EBE4 + ldr r2, =0x00000d08 adds r0, r2 ldrb r0, [r0] lsls r0, 26 b _0818ECBE .align 2, 0 -_0818EBD8: .4byte 0x000040ce -_0818EBDC: .4byte 0x020375f0 -_0818EBE0: .4byte 0x03005d90 -_0818EBE4: .4byte 0x00000d08 + .pool _0818EBE8: - ldr r1, _0818EBF8 - ldr r0, _0818EBFC + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r3, _0818EC00 + ldr r3, =0x00000d08 adds r0, r3 ldrb r0, [r0] lsls r0, 27 b _0818ECBE .align 2, 0 -_0818EBF8: .4byte 0x020375f0 -_0818EBFC: .4byte 0x03005d90 -_0818EC00: .4byte 0x00000d08 + .pool _0818EC04: cmp r5, 0 beq _0818EC24 - ldr r1, _0818EC18 - ldr r0, _0818EC1C + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _0818EC20 + ldr r2, =0x00000d08 adds r0, r2 ldrb r0, [r0] lsls r0, 30 b _0818ECBE .align 2, 0 -_0818EC18: .4byte 0x020375f0 -_0818EC1C: .4byte 0x03005d90 -_0818EC20: .4byte 0x00000d08 + .pool _0818EC24: - ldr r1, _0818EC34 - ldr r0, _0818EC38 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r3, _0818EC3C + ldr r3, =0x00000d08 adds r0, r3 ldrb r0, [r0] lsls r0, 31 b _0818ECBE .align 2, 0 -_0818EC34: .4byte 0x020375f0 -_0818EC38: .4byte 0x03005d90 -_0818EC3C: .4byte 0x00000d08 + .pool _0818EC40: - ldr r0, _0818EC64 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 @@ -815450,53 +787847,46 @@ _0818EC40: bne _0818EC90 cmp r5, 0 beq _0818EC74 - ldr r1, _0818EC68 - ldr r0, _0818EC6C + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _0818EC70 + ldr r2, =0x00000d08 adds r0, r2 ldrb r0, [r0] lsrs r0, 7 strh r0, [r1] b _0818ED10 .align 2, 0 -_0818EC64: .4byte 0x000040ce -_0818EC68: .4byte 0x020375f0 -_0818EC6C: .4byte 0x03005d90 -_0818EC70: .4byte 0x00000d08 + .pool _0818EC74: - ldr r1, _0818EC84 - ldr r0, _0818EC88 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r3, _0818EC8C + ldr r3, =0x00000d08 adds r0, r3 ldrb r0, [r0] lsls r0, 25 b _0818ECBE .align 2, 0 -_0818EC84: .4byte 0x020375f0 -_0818EC88: .4byte 0x03005d90 -_0818EC8C: .4byte 0x00000d08 + .pool _0818EC90: cmp r5, 0 beq _0818ECB0 - ldr r1, _0818ECA4 - ldr r0, _0818ECA8 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _0818ECAC + ldr r2, =0x00000d08 adds r0, r2 ldrb r0, [r0] lsls r0, 28 b _0818ECBE .align 2, 0 -_0818ECA4: .4byte 0x020375f0 -_0818ECA8: .4byte 0x03005d90 -_0818ECAC: .4byte 0x00000d08 + .pool _0818ECB0: - ldr r1, _0818ECC4 - ldr r0, _0818ECC8 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r3, _0818ECCC + ldr r3, =0x00000d08 adds r0, r3 _0818ECBA: ldrb r0, [r0] @@ -815506,13 +787896,11 @@ _0818ECBE: strh r0, [r1] b _0818ED10 .align 2, 0 -_0818ECC4: .4byte 0x020375f0 -_0818ECC8: .4byte 0x03005d90 -_0818ECCC: .4byte 0x00000d08 + .pool _0818ECD0: bl sub_81B8558 - ldr r2, _0818ECEC - ldr r0, _0818ECF0 + ldr r2, =0x0203cef8 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xCB lsls r1, 4 @@ -815524,19 +787912,18 @@ _0818ECD0: strb r0, [r2, 0x1] b _0818ED10 .align 2, 0 -_0818ECEC: .4byte 0x0203cef8 -_0818ECF0: .4byte 0x03005d90 + .pool _0818ECF4: - ldr r2, _0818ED18 - ldr r0, _0818ED1C + ldr r2, =0x020375f0 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r3, _0818ED20 + ldr r3, =0x00000d0a adds r0, r1, r3 ldrb r0, [r0] lsls r0, 1 adds r3, 0x1 adds r1, r3 - ldr r3, _0818ED24 + ldr r3, =0x0000fffd adds r0, r3 ldrb r1, [r1] adds r0, r1 @@ -815546,43 +787933,36 @@ _0818ED10: pop {r0} bx r0 .align 2, 0 -_0818ED18: .4byte 0x020375f0 -_0818ED1C: .4byte 0x03005d90 -_0818ED20: .4byte 0x00000d0a -_0818ED24: .4byte 0x0000fffd + .pool thumb_func_end sub_818EA84 thumb_func_start sub_818ED28 sub_818ED28: @ 818ED28 push {r4,r5,lr} - ldr r0, _0818ED58 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0818ED5C + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r4, r0, 30 - ldr r0, _0818ED60 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _0818ED64 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x8 bls _0818ED4C b _0818F01E _0818ED4C: lsls r0, 2 - ldr r1, _0818ED68 + ldr r1, =_0818ED6C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0818ED58: .4byte 0x03005d90 -_0818ED5C: .4byte 0x00000ca9 -_0818ED60: .4byte 0x000040ce -_0818ED64: .4byte 0x020375e2 -_0818ED68: .4byte _0818ED6C + .pool .align 2, 0 _0818ED6C: .4byte _0818ED90 @@ -815595,32 +787975,30 @@ _0818ED6C: .4byte _0818EF50 .4byte _0818F008 _0818ED90: - ldr r0, _0818EDA8 + ldr r0, =0x03005d90 ldr r2, [r0] lsls r0, r4, 1 lsls r1, r5, 2 adds r0, r1 - ldr r1, _0818EDAC + ldr r1, =0x00000d0c adds r2, r1 adds r2, r0 - ldr r0, _0818EDB0 + ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] b _0818F01E .align 2, 0 -_0818EDA8: .4byte 0x03005d90 -_0818EDAC: .4byte 0x00000d0c -_0818EDB0: .4byte 0x020375e4 + .pool _0818EDB4: - ldr r0, _0818EDD8 + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 beq _0818EDE8 - ldr r0, _0818EDDC + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _0818EDE0 + ldr r0, =0x00000cdc adds r2, r0 - ldr r3, _0818EDE4 + ldr r3, =0x0860d0ec lsls r1, r4, 2 lsls r0, r5, 3 adds r1, r0 @@ -815631,16 +788009,13 @@ _0818EDB4: str r0, [r2] b _0818F01E .align 2, 0 -_0818EDD8: .4byte 0x020375e4 -_0818EDDC: .4byte 0x03005d90 -_0818EDE0: .4byte 0x00000cdc -_0818EDE4: .4byte 0x0860d0ec + .pool _0818EDE8: - ldr r0, _0818EE04 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r1, _0818EE08 + ldr r1, =0x00000cdc adds r2, r1 - ldr r3, _0818EE0C + ldr r3, =0x0860d0fc lsls r1, r4, 2 lsls r0, r5, 3 adds r1, r0 @@ -815651,15 +788026,13 @@ _0818EDE8: str r0, [r2] b _0818F01E .align 2, 0 -_0818EE04: .4byte 0x03005d90 -_0818EE08: .4byte 0x00000cdc -_0818EE0C: .4byte 0x0860d0fc + .pool _0818EE10: - ldr r0, _0818EE28 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _0818EE2C + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r1, _0818EE30 + ldr r1, =0x00000d08 adds r2, r1 movs r1, 0x1 ands r1, r0 @@ -815668,15 +788041,13 @@ _0818EE10: negs r0, r0 b _0818EF74 .align 2, 0 -_0818EE28: .4byte 0x03005d90 -_0818EE2C: .4byte 0x020375e4 -_0818EE30: .4byte 0x00000d08 + .pool _0818EE34: - ldr r0, _0818EE50 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r0, _0818EE54 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r2, _0818EE58 + ldr r2, =0x00000d08 adds r3, r2 movs r1, 0x1 ands r1, r0 @@ -815686,27 +788057,23 @@ _0818EE34: negs r0, r0 b _0818EFF4 .align 2, 0 -_0818EE50: .4byte 0x03005d90 -_0818EE54: .4byte 0x020375e4 -_0818EE58: .4byte 0x00000d08 + .pool _0818EE5C: - ldr r0, _0818EE6C + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r0, _0818EE70 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r1, _0818EE74 + ldr r1, =0x00000d08 adds r3, r1 b _0818EFE8 .align 2, 0 -_0818EE6C: .4byte 0x03005d90 -_0818EE70: .4byte 0x020375e4 -_0818EE74: .4byte 0x00000d08 + .pool _0818EE78: - ldr r0, _0818EE94 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r0, _0818EE98 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r2, _0818EE9C + ldr r2, =0x00000d08 adds r3, r2 movs r1, 0x1 ands r1, r0 @@ -815716,11 +788083,9 @@ _0818EE78: negs r0, r0 b _0818EFF4 .align 2, 0 -_0818EE94: .4byte 0x03005d90 -_0818EE98: .4byte 0x020375e4 -_0818EE9C: .4byte 0x00000d08 + .pool _0818EEA0: - ldr r0, _0818EECC + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r1, r0, 16 @@ -815728,11 +788093,11 @@ _0818EEA0: bne _0818EF00 cmp r4, 0 beq _0818EEDC - ldr r0, _0818EED0 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r0, _0818EED4 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r2, _0818EED8 + ldr r2, =0x00000d08 adds r3, r2 ands r1, r0 lsls r1, 5 @@ -815741,16 +788106,13 @@ _0818EEA0: negs r0, r0 b _0818EFF4 .align 2, 0 -_0818EECC: .4byte 0x000040ce -_0818EED0: .4byte 0x03005d90 -_0818EED4: .4byte 0x020375e4 -_0818EED8: .4byte 0x00000d08 + .pool _0818EEDC: - ldr r0, _0818EEF4 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r0, _0818EEF8 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r2, _0818EEFC + ldr r2, =0x00000d08 adds r3, r2 ands r1, r0 lsls r1, 4 @@ -815759,17 +788121,15 @@ _0818EEDC: negs r0, r0 b _0818EFF4 .align 2, 0 -_0818EEF4: .4byte 0x03005d90 -_0818EEF8: .4byte 0x020375e4 -_0818EEFC: .4byte 0x00000d08 + .pool _0818EF00: cmp r4, 0 beq _0818EF2C - ldr r0, _0818EF20 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r0, _0818EF24 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r1, _0818EF28 + ldr r1, =0x00000d08 adds r3, r1 movs r1, 0x1 ands r1, r0 @@ -815779,15 +788139,13 @@ _0818EF00: negs r0, r0 b _0818EFF4 .align 2, 0 -_0818EF20: .4byte 0x03005d90 -_0818EF24: .4byte 0x020375e4 -_0818EF28: .4byte 0x00000d08 + .pool _0818EF2C: - ldr r0, _0818EF44 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _0818EF48 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r1, _0818EF4C + ldr r1, =0x00000d08 adds r2, r1 movs r1, 0x1 ands r1, r0 @@ -815796,11 +788154,9 @@ _0818EF2C: negs r0, r0 b _0818EF74 .align 2, 0 -_0818EF44: .4byte 0x03005d90 -_0818EF48: .4byte 0x020375e4 -_0818EF4C: .4byte 0x00000d08 + .pool _0818EF50: - ldr r0, _0818EF7C + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r1, r0, 16 @@ -815808,11 +788164,11 @@ _0818EF50: bne _0818EFB0 cmp r4, 0 beq _0818EF8C - ldr r0, _0818EF80 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _0818EF84 + ldr r0, =0x020375e4 ldrb r1, [r0] - ldr r0, _0818EF88 + ldr r0, =0x00000d08 adds r2, r0 lsls r1, 7 ldrb r3, [r2] @@ -815823,16 +788179,13 @@ _0818EF74: strb r0, [r2] b _0818F01E .align 2, 0 -_0818EF7C: .4byte 0x000040ce -_0818EF80: .4byte 0x03005d90 -_0818EF84: .4byte 0x020375e4 -_0818EF88: .4byte 0x00000d08 + .pool _0818EF8C: - ldr r0, _0818EFA4 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r0, _0818EFA8 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r2, _0818EFAC + ldr r2, =0x00000d08 adds r3, r2 ands r1, r0 lsls r1, 6 @@ -815841,17 +788194,15 @@ _0818EF8C: negs r0, r0 b _0818EFF4 .align 2, 0 -_0818EFA4: .4byte 0x03005d90 -_0818EFA8: .4byte 0x020375e4 -_0818EFAC: .4byte 0x00000d08 + .pool _0818EFB0: cmp r4, 0 beq _0818EFDC - ldr r0, _0818EFD0 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r0, _0818EFD4 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r1, _0818EFD8 + ldr r1, =0x00000d08 adds r3, r1 movs r1, 0x1 ands r1, r0 @@ -815861,15 +788212,13 @@ _0818EFB0: negs r0, r0 b _0818EFF4 .align 2, 0 -_0818EFD0: .4byte 0x03005d90 -_0818EFD4: .4byte 0x020375e4 -_0818EFD8: .4byte 0x00000d08 + .pool _0818EFDC: - ldr r0, _0818EFFC + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r0, _0818F000 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r2, _0818F004 + ldr r2, =0x00000d08 adds r3, r2 _0818EFE8: movs r1, 0x1 @@ -815884,13 +788233,11 @@ _0818EFF4: strb r0, [r3] b _0818F01E .align 2, 0 -_0818EFFC: .4byte 0x03005d90 -_0818F000: .4byte 0x020375e4 -_0818F004: .4byte 0x00000d08 + .pool _0818F008: - ldr r0, _0818F024 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _0818F028 + ldr r0, =0x0203cef8 ldrb r1, [r0] ldrb r0, [r0, 0x1] lsls r0, 8 @@ -815904,8 +788251,7 @@ _0818F01E: pop {r0} bx r0 .align 2, 0 -_0818F024: .4byte 0x03005d90 -_0818F028: .4byte 0x0203cef8 + .pool thumb_func_end sub_818ED28 thumb_func_start sub_818F02C @@ -815926,33 +788272,33 @@ sub_818F02C: @ 818F02C movs r0, 0x18 bl malloc_and_clear str r0, [sp, 0x1C] - ldr r4, _0818F1EC + ldr r4, =0x03005d90 ldr r1, [r4] - ldr r2, _0818F1F0 + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 30 lsrs r0, 30 adds r0, 0x1 - ldr r3, _0818F1F4 + ldr r3, =0x00000d0a adds r1, r3 strb r0, [r1] - ldr r0, _0818F1F8 + ldr r0, =0x000040ce bl var_get ldr r1, [r4] adds r0, 0x1 - ldr r5, _0818F1FC + ldr r5, =0x00000d0b adds r1, r5 strb r0, [r1] ldr r2, [r4] - ldr r7, _0818F200 + ldr r7, =0x00000d24 adds r3, r2, r7 ldrh r0, [r3] - ldr r5, _0818F204 + ldr r5, =0x000003ff adds r1, r5, 0 orrs r0, r1 strh r0, [r3] - ldr r3, _0818F208 + ldr r3, =0x00000d25 adds r2, r3 ldrb r1, [r2] movs r0, 0x5 @@ -815975,13 +788321,13 @@ sub_818F02C: @ 818F02C movs r7, 0 mov r10, r7 mov r8, r4 - ldr r0, _0818F20C + ldr r0, =0x02024488 mov r9, r0 movs r4, 0 _0818F0BA: mov r1, r8 ldr r0, [r1] - ldr r2, _0818F210 + ldr r2, =0x00000caa adds r0, r2 adds r0, r4 ldrh r0, [r0] @@ -815993,7 +788339,7 @@ _0818F0BA: bl pokemon_getattr mov r5, r8 ldr r1, [r5] - ldr r7, _0818F214 + ldr r7, =0x00000d64 adds r1, r7 adds r1, r4 strh r0, [r1] @@ -816004,7 +788350,7 @@ _0818F0BA: _0818F0E8: mov r1, r8 ldr r0, [r1] - ldr r2, _0818F210 + ldr r2, =0x00000caa adds r0, r2 adds r0, r4 ldrh r0, [r0] @@ -816017,7 +788363,7 @@ _0818F0E8: bl pokemon_getattr mov r2, r8 ldr r1, [r2] - ldr r3, _0818F218 + ldr r3, =0x00000efc adds r1, r3 adds r1, r6 strh r0, [r1] @@ -816026,10 +788372,10 @@ _0818F0E8: cmp r5, 0x3 ble _0818F0E8 movs r5, 0 - ldr r6, _0818F1EC + ldr r6, =0x03005d90 _0818F11C: ldr r0, [r6] - ldr r1, _0818F210 + ldr r1, =0x00000caa adds r0, r1 adds r0, r4 ldrh r0, [r0] @@ -816042,7 +788388,7 @@ _0818F11C: bl pokemon_getattr ldr r1, [r6] adds r2, r5, r7 - ldr r3, _0818F21C + ldr r3, =0x00000f04 adds r1, r3 adds r1, r2 strb r0, [r1] @@ -816051,7 +788397,7 @@ _0818F11C: ble _0818F11C mov r5, r8 ldr r0, [r5] - ldr r1, _0818F210 + ldr r1, =0x00000caa adds r0, r1 adds r0, r4 ldrh r0, [r0] @@ -816061,7 +788407,7 @@ _0818F11C: bl get_nature ldr r1, [r5] adds r1, r7 - ldr r3, _0818F220 + ldr r3, =0x00000f0a adds r1, r3 strb r0, [r1] adds r4, 0x2 @@ -816090,9 +788436,9 @@ _0818F184: movs r5, 0x1 cmp r5, r10 bge _0818F1CA - ldr r3, _0818F1EC + ldr r3, =0x03005d90 ldr r0, [r3] - ldr r7, _0818F224 + ldr r7, =0x00000d28 adds r0, r7 ldrh r0, [r0] lsls r0, 22 @@ -816100,7 +788446,7 @@ _0818F184: adds r2, r3, 0 cmp r0, r4 beq _0818F1CA - ldr r3, _0818F200 + ldr r3, =0x00000d24 _0818F1B2: adds r5, 0x1 cmp r5, r10 @@ -816117,37 +788463,22 @@ _0818F1B2: _0818F1CA: cmp r5, r10 bne _0818F184 - ldr r0, _0818F1EC + ldr r0, =0x03005d90 ldr r3, [r0] ldr r1, [sp, 0x34] adds r3, r1 - ldr r2, _0818F200 + ldr r2, =0x00000d24 adds r3, r2 - ldr r5, _0818F204 + ldr r5, =0x000003ff adds r0, r5, 0 adds r2, r4, 0 ands r2, r0 ldrh r0, [r3] - ldr r7, _0818F228 + ldr r7, =0xfffffc00 adds r1, r7, 0 b _0818F292 .align 2, 0 -_0818F1EC: .4byte 0x03005d90 -_0818F1F0: .4byte 0x00000ca9 -_0818F1F4: .4byte 0x00000d0a -_0818F1F8: .4byte 0x000040ce -_0818F1FC: .4byte 0x00000d0b -_0818F200: .4byte 0x00000d24 -_0818F204: .4byte 0x000003ff -_0818F208: .4byte 0x00000d25 -_0818F20C: .4byte 0x02024488 -_0818F210: .4byte 0x00000caa -_0818F214: .4byte 0x00000d64 -_0818F218: .4byte 0x00000efc -_0818F21C: .4byte 0x00000f04 -_0818F220: .4byte 0x00000f0a -_0818F224: .4byte 0x00000d28 -_0818F228: .4byte 0xfffffc00 + .pool _0818F22C: bl sub_81A39C4 adds r0, 0x1 @@ -816160,9 +788491,9 @@ _0818F22C: movs r5, 0x1 cmp r5, r10 bge _0818F274 - ldr r1, _0818F5D0 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r2, _0818F5D4 + ldr r2, =0x00000d28 adds r0, r2 ldrh r0, [r0] lsls r0, 22 @@ -816170,7 +788501,7 @@ _0818F22C: adds r2, r1, 0 cmp r0, r4 beq _0818F274 - ldr r3, _0818F5D8 + ldr r3, =0x00000d24 _0818F25C: adds r5, 0x1 cmp r5, r10 @@ -816187,18 +788518,18 @@ _0818F25C: _0818F274: cmp r5, r10 bne _0818F22C - ldr r5, _0818F5D0 + ldr r5, =0x03005d90 ldr r3, [r5] ldr r7, [sp, 0x34] adds r3, r7 - ldr r0, _0818F5D8 + ldr r0, =0x00000d24 adds r3, r0 - ldr r1, _0818F5DC + ldr r1, =0x000003ff adds r0, r1, 0 adds r2, r4, 0 ands r2, r0 ldrh r0, [r3] - ldr r5, _0818F5E0 + ldr r5, =0xfffffc00 adds r1, r5, 0 _0818F292: ands r0, r1 @@ -816225,13 +788556,13 @@ _0818F2AE: movs r7, 0 cmp r7, r5 bge _0818F300 - ldr r0, _0818F5D0 + ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, [sp, 0x8] mov r8, r1 ldr r2, [sp, 0xC] mov r12, r2 - ldr r3, _0818F5E4 + ldr r3, =0x00000d64 adds r0, r3 ldr r1, [sp, 0x20] adds r4, r1, r0 @@ -816239,7 +788570,7 @@ _0818F2D4: ldrh r3, [r4] cmp r3, r6 beq _0818F300 - ldr r2, _0818F5E8 + ldr r2, =0x0203bc8c ldr r1, [r2] lsls r0, r6, 4 adds r2, r0, r1 @@ -816261,18 +788592,18 @@ _0818F2D4: _0818F300: cmp r7, r5 bne _0818F2AE - ldr r3, _0818F5D0 + ldr r3, =0x03005d90 ldr r0, [r3] ldr r1, [sp, 0x38] add r1, r9 - ldr r5, _0818F5E4 + ldr r5, =0x00000d64 adds r0, r5 adds r0, r1 strh r6, [r0] ldr r2, [sp, 0x28] add r2, sp adds r2, 0x8 - ldr r0, _0818F5E8 + ldr r0, =0x0203bc8c ldr r1, [r0] lsls r0, r6, 4 adds r0, r1 @@ -816284,7 +788615,7 @@ _0818F300: ldr r2, [r3] ldr r7, [sp, 0x34] adds r2, r7 - ldr r0, _0818F5EC + ldr r0, =0x00000d25 adds r2, r0 ldrb r0, [r2] movs r3, 0x5 @@ -816292,10 +788623,10 @@ _0818F300: adds r1, r3, 0 ands r0, r1 strb r0, [r2] - ldr r5, _0818F5D0 + ldr r5, =0x03005d90 ldr r2, [r5] adds r2, r7 - ldr r7, _0818F5EC + ldr r7, =0x00000d25 adds r2, r7 ldrb r0, [r2] subs r3, 0x14 @@ -816327,21 +788658,21 @@ _0818F37C: strh r7, [r2] movs r3, 0 mov r10, r3 - ldr r6, _0818F5F0 - ldr r5, _0818F5F4 + ldr r6, =0x0832a328 + ldr r5, =0x083203cc _0818F38A: - ldr r0, _0818F5D0 + ldr r0, =0x03005d90 ldr r0, [r0] mov r2, r10 lsls r1, r2, 1 - ldr r3, _0818F5F8 + ldr r3, =0x00000caa adds r0, r3 adds r0, r1 ldrh r0, [r0] subs r4, r0, 0x1 movs r0, 0x64 muls r4, r0 - ldr r0, _0818F5FC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x3B @@ -816458,12 +788789,12 @@ _0818F462: _0818F494: movs r7, 0 strh r7, [r6] - ldr r1, _0818F5D0 + ldr r1, =0x03005d90 ldr r0, [r1] mov r2, r10 lsls r1, r2, 2 adds r0, r1 - ldr r3, _0818F5D8 + ldr r3, =0x00000d24 adds r0, r3 ldrh r0, [r0] lsls r0, 22 @@ -816476,17 +788807,17 @@ _0818F494: ldr r0, [sp, 0x30] mov r9, r0 _0818F4BC: - ldr r1, _0818F5D0 + ldr r1, =0x03005d90 ldr r0, [r1] mov r4, r9 add r4, r10 adds r4, r5 lsls r4, 1 - ldr r2, _0818F5E4 + ldr r2, =0x00000d64 adds r0, r2 adds r0, r4 ldrh r1, [r0] - ldr r3, _0818F5E8 + ldr r3, =0x0203bc8c ldr r0, [r3] lsls r1, 4 adds r1, r0 @@ -816514,13 +788845,13 @@ _0818F4BC: ldr r1, [r2] adds r0, r1 strh r0, [r6] - ldr r3, _0818F5D0 + ldr r3, =0x03005d90 ldr r0, [r3] - ldr r1, _0818F5E4 + ldr r1, =0x00000d64 adds r0, r1 adds r0, r4 ldrh r0, [r0] - ldr r2, _0818F5E8 + ldr r2, =0x0203bc8c ldr r1, [r2] lsls r0, 4 adds r0, r1 @@ -816528,11 +788859,11 @@ _0818F4BC: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r3, _0818F5F4 + ldr r3, =0x083203cc adds r1, r3 ldrb r0, [r1, 0x6] lsls r0, 2 - ldr r2, _0818F5F0 + ldr r2, =0x0832a328 adds r0, r2 ldr r0, [r0] orrs r7, r0 @@ -816577,7 +788908,7 @@ _0818F556: ble _0818F494 movs r1, 0 mov r10, r1 - ldr r2, _0818F5DC + ldr r2, =0x000003ff mov r8, r2 _0818F58A: mov r5, r10 @@ -816598,11 +788929,11 @@ _0818F5A0: bcc _0818F5C2 cmp r1, r0 bne _0818F61E - ldr r0, _0818F5D0 + ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r5, 2 adds r0, r1, r0 - ldr r2, _0818F5D8 + ldr r2, =0x00000d24 adds r0, r2 ldrh r0, [r0] lsls r2, r0, 22 @@ -816616,25 +788947,14 @@ _0818F5C2: bl sub_818F904 b _0818F600 .align 2, 0 -_0818F5D0: .4byte 0x03005d90 -_0818F5D4: .4byte 0x00000d28 -_0818F5D8: .4byte 0x00000d24 -_0818F5DC: .4byte 0x000003ff -_0818F5E0: .4byte 0xfffffc00 -_0818F5E4: .4byte 0x00000d64 -_0818F5E8: .4byte 0x0203bc8c -_0818F5EC: .4byte 0x00000d25 -_0818F5F0: .4byte 0x0832a328 -_0818F5F4: .4byte 0x083203cc -_0818F5F8: .4byte 0x00000caa -_0818F5FC: .4byte 0x020244ec + .pool _0818F600: b _0818F61E _0818F602: mov r3, r10 lsls r0, r3, 2 adds r0, r1, r0 - ldr r1, _0818F694 + ldr r1, =0x00000d24 adds r0, r1 ldrh r0, [r0] lsls r0, 22 @@ -816660,16 +788980,16 @@ _0818F626: beq _0818F6EE movs r3, 0 mov r10, r3 - ldr r0, _0818F698 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r4, _0818F694 + ldr r4, =0x00000d24 adds r1, r4 ldrh r1, [r1] lsls r1, 22 lsrs r1, 22 - ldr r3, _0818F69C + ldr r3, =0x000003ff adds r2, r0, 0 - ldr r6, _0818F6A0 + ldr r6, =0x0860d3f1 cmp r1, r3 beq _0818F674 adds r5, r2, 0 @@ -816698,30 +789018,25 @@ _0818F674: beq _0818F6AC movs r5, 0 ldr r2, [r2] - ldr r3, _0818F694 + ldr r3, =0x00000d24 adds r2, r3 ldrh r1, [r2] - ldr r0, _0818F6A4 + ldr r0, =0xfffffc00 ands r0, r1 - ldr r7, _0818F6A8 + ldr r7, =0x000003fe adds r1, r7, 0 b _0818F6BE .align 2, 0 -_0818F694: .4byte 0x00000d24 -_0818F698: .4byte 0x03005d90 -_0818F69C: .4byte 0x000003ff -_0818F6A0: .4byte 0x0860d3f1 -_0818F6A4: .4byte 0xfffffc00 -_0818F6A8: .4byte 0x000003fe + .pool _0818F6AC: movs r5, 0x1 ldr r2, [r2] - ldr r0, _0818F70C + ldr r0, =0x00000d28 adds r2, r0 ldrh r1, [r2] - ldr r0, _0818F710 + ldr r0, =0xfffffc00 ands r0, r1 - ldr r3, _0818F714 + ldr r3, =0x000003fe adds r1, r3, 0 _0818F6BE: orrs r0, r1 @@ -816736,9 +789051,9 @@ _0818F6CC: lsls r0, r1, 24 lsrs r0, 24 bl sub_81A4FF0 - ldr r1, _0818F718 + ldr r1, =0x03005d90 ldr r1, [r1] - ldr r2, _0818F71C + ldr r2, =0x00000d64 adds r1, r2 adds r1, r4 strh r0, [r1] @@ -816762,11 +789077,7 @@ _0818F6EE: pop {r0} bx r0 .align 2, 0 -_0818F70C: .4byte 0x00000d28 -_0818F710: .4byte 0xfffffc00 -_0818F714: .4byte 0x000003fe -_0818F718: .4byte 0x03005d90 -_0818F71C: .4byte 0x00000d64 + .pool thumb_func_end sub_818F02C thumb_func_start sub_818F720 @@ -816830,18 +789141,18 @@ _0818F784: subs r2, 0x1 cmp r2, 0 bge _0818F776 - ldr r0, _0818F79C + ldr r0, =0x0000012f cmp r6, r0 bne _0818F7A0 movs r0, 0x1 b _0818F7CA .align 2, 0 -_0818F79C: .4byte 0x0000012f + .pool _0818F7A0: mov r2, r10 subs r0, r2, r6 lsls r0, 2 - ldr r1, _0818F900 + ldr r1, =0x083203cc adds r0, r1 ldrb r0, [r0] lsls r0, 1 @@ -816865,7 +789176,7 @@ _0818F7CA: mov r2, r10 subs r0, r2, r6 lsls r0, 2 - ldr r1, _0818F900 + ldr r1, =0x083203cc adds r4, r0, r1 ldrb r0, [r4, 0x1] lsls r0, 1 @@ -817011,7 +789322,7 @@ _0818F8C8: pop {r0} bx r0 .align 2, 0 -_0818F900: .4byte 0x083203cc + .pool thumb_func_end sub_818F720 thumb_func_start sub_818F904 @@ -817031,11 +789342,11 @@ sub_818F904: @ 818F904 ldrh r3, [r2] strh r3, [r4] strh r5, [r2] - ldr r2, _0818F9A0 + ldr r2, =0x03005d90 ldr r5, [r2] lsls r6, r0, 2 adds r6, r5, r6 - ldr r3, _0818F9A4 + ldr r3, =0x00000d24 adds r6, r3 ldrh r7, [r6] mov r10, r7 @@ -817048,7 +789359,7 @@ sub_818F904: @ 818F904 ldrh r4, [r5] lsls r4, 22 lsrs r4, 22 - ldr r3, _0818F9A8 + ldr r3, =0xfffffc00 adds r2, r3, 0 mov r7, r10 ands r2, r7 @@ -817062,7 +789373,7 @@ sub_818F904: @ 818F904 mov r7, r8 orrs r3, r7 strh r3, [r5] - ldr r2, _0818F9A0 + ldr r2, =0x03005d90 mov r8, r2 add r12, r0 add r9, r1 @@ -817070,7 +789381,7 @@ sub_818F904: @ 818F904 lsls r4, r3, 1 mov r7, r12 lsls r3, r7, 1 - ldr r7, _0818F9AC + ldr r7, =0x00000d64 movs r6, 0x2 _0818F974: mov r1, r8 @@ -817095,20 +789406,17 @@ _0818F974: pop {r0} bx r0 .align 2, 0 -_0818F9A0: .4byte 0x03005d90 -_0818F9A4: .4byte 0x00000d24 -_0818F9A8: .4byte 0xfffffc00 -_0818F9AC: .4byte 0x00000d64 + .pool thumb_func_end sub_818F904 thumb_func_start sub_818F9B0 sub_818F9B0: @ 818F9B0 push {lr} - ldr r0, _0818F9D0 - ldr r2, _0818F9D4 - ldr r1, _0818F9D8 + ldr r0, =0x02021cc4 + ldr r2, =0x085ccd20 + ldr r1, =0x03005d90 ldr r1, [r1] - ldr r3, _0818F9DC + ldr r3, =0x00000cb2 adds r1, r3 ldrh r1, [r1] lsls r1, 2 @@ -817118,53 +789426,45 @@ sub_818F9B0: @ 818F9B0 pop {r0} bx r0 .align 2, 0 -_0818F9D0: .4byte 0x02021cc4 -_0818F9D4: .4byte 0x085ccd20 -_0818F9D8: .4byte 0x03005d90 -_0818F9DC: .4byte 0x00000cb2 + .pool thumb_func_end sub_818F9B0 thumb_func_start sub_818F9E0 sub_818F9E0: @ 818F9E0 push {lr} - ldr r0, _0818FA08 - ldr r2, _0818FA0C - ldr r1, _0818FA10 + ldr r0, =0x02021cc4 + ldr r2, =0x085ccd20 + ldr r1, =0x03005d90 ldr r1, [r1] - ldr r3, _0818FA14 + ldr r3, =0x00000cb2 adds r1, r3 ldrh r1, [r1] lsls r1, 2 adds r1, r2 ldr r1, [r1] bl gf_strcpy - ldr r0, _0818FA18 - ldr r1, _0818FA1C + ldr r0, =0x02021dc4 + ldr r1, =0x02038bca ldrh r1, [r1] bl sub_8195898 pop {r0} bx r0 .align 2, 0 -_0818FA08: .4byte 0x02021cc4 -_0818FA0C: .4byte 0x085ccd20 -_0818FA10: .4byte 0x03005d90 -_0818FA14: .4byte 0x00000cb2 -_0818FA18: .4byte 0x02021dc4 -_0818FA1C: .4byte 0x02038bca + .pool thumb_func_end sub_818F9E0 thumb_func_start sub_818FA20 sub_818FA20: @ 818FA20 push {r4,r5,lr} - ldr r1, _0818FA64 + ldr r1, =0x0203cd70 movs r0, 0 str r0, [r1] - ldr r4, _0818FA68 + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x3A movs r2, 0 bl pokemon_getattr - ldr r5, _0818FA6C + ldr r5, =0x0203cd74 str r0, [r5] adds r4, 0x64 adds r0, r4, 0 @@ -817175,7 +789475,7 @@ sub_818FA20: @ 818FA20 adds r1, r0 str r1, [r5] bl calc_player_party_count - ldr r0, _0818FA70 + ldr r0, =0x02038bca ldrh r0, [r0] bl sub_8195358 lsls r0, 16 @@ -817185,10 +789485,7 @@ sub_818FA20: @ 818FA20 pop {r0} bx r0 .align 2, 0 -_0818FA64: .4byte 0x0203cd70 -_0818FA68: .4byte 0x020244ec -_0818FA6C: .4byte 0x0203cd74 -_0818FA70: .4byte 0x02038bca + .pool thumb_func_end sub_818FA20 thumb_func_start sub_818FA74 @@ -817228,9 +789525,9 @@ sub_818FA74: @ 818FA74 adds r3, r4, 0 muls r3, r0 str r3, [sp, 0x18] - ldr r6, _0818FBC8 + ldr r6, =0x02024744 adds r0, r3, r6 - ldr r7, _0818FBCC + ldr r7, =0x03005d90 ldr r4, [r7] lsls r5, 1 ldr r3, [sp, 0x28] @@ -817238,11 +789535,11 @@ sub_818FA74: @ 818FA74 adds r1, r3 lsls r1, 1 adds r1, r5, r1 - ldr r6, _0818FBD0 + ldr r6, =0x00000d64 adds r4, r6 adds r4, r1 ldrh r3, [r4] - ldr r7, _0818FBD4 + ldr r7, =0x0203bc8c ldr r7, [r7] mov r8, r7 lsls r3, 4 @@ -817267,13 +789564,13 @@ sub_818FA74: @ 818FA74 ldr r2, [sp, 0x18] str r2, [sp, 0x1C] mov r10, r5 - ldr r3, _0818FBD0 + ldr r3, =0x00000d64 mov r9, r3 - ldr r3, _0818FBD4 + ldr r3, =0x0203bc8c mov r4, r10 str r4, [sp, 0x20] _0818FB18: - ldr r7, _0818FBCC + ldr r7, =0x03005d90 ldr r1, [r7] ldr r2, [sp, 0x28] lsls r0, r2, 1 @@ -817296,12 +789593,12 @@ _0818FB18: lsrs r2, 24 mov r12, r2 ldr r7, [sp, 0x1C] - ldr r2, _0818FBC8 + ldr r2, =0x02024744 adds r0, r7, r2 mov r2, r12 str r3, [sp, 0x24] bl sub_80691F4 - ldr r7, _0818FBCC + ldr r7, =0x03005d90 ldr r0, [r7] add r0, r9 adds r0, r5 @@ -817326,27 +789623,27 @@ _0818FB74: ldr r1, [sp, 0x10] adds r4, r1, 0 muls r4, r0 - ldr r0, _0818FBC8 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x20 add r2, sp, 0xC bl pokemon_setattr - ldr r0, _0818FBCC + ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, [sp, 0x20] add r1, r8 - ldr r2, _0818FBD0 + ldr r2, =0x00000d64 adds r0, r2 adds r0, r1 ldrh r0, [r0] - ldr r1, _0818FBD4 + ldr r1, =0x0203bc8c ldr r1, [r1] lsls r0, 4 adds r0, r1 ldrb r2, [r0, 0xA] lsls r2, 1 - ldr r0, _0818FBD8 + ldr r0, =0x085cecb0 adds r2, r0 adds r0, r4, 0 movs r1, 0xC @@ -817360,11 +789657,7 @@ _0818FB74: pop {r0} bx r0 .align 2, 0 -_0818FBC8: .4byte 0x02024744 -_0818FBCC: .4byte 0x03005d90 -_0818FBD0: .4byte 0x00000d64 -_0818FBD4: .4byte 0x0203bc8c -_0818FBD8: .4byte 0x085cecb0 + .pool thumb_func_end sub_818FA74 thumb_func_start sub_818FBDC @@ -817520,16 +789813,16 @@ _0818FCFA: adds r2, r7, 0x1 mov r10, r2 _0818FD00: - ldr r0, _0818FD30 + ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, [sp, 0x18] adds r0, r1, r2 - ldr r2, _0818FD34 + ldr r2, =0x00000d24 adds r0, r2 ldrh r0, [r0] lsls r0, 22 lsrs r0, 22 - ldr r2, _0818FD38 + ldr r2, =0x000003fe cmp r0, r2 bne _0818FD3C mov r1, r9 @@ -817543,9 +789836,7 @@ _0818FD00: lsrs r4, 16 b _0818FD60 .align 2, 0 -_0818FD30: .4byte 0x03005d90 -_0818FD34: .4byte 0x00000d24 -_0818FD38: .4byte 0x000003fe + .pool _0818FD3C: mov r2, r8 lsls r0, r2, 1 @@ -817553,11 +789844,11 @@ _0818FD3C: lsls r0, 1 ldr r2, [sp, 0x10] adds r0, r2, r0 - ldr r2, _0818FDAC + ldr r2, =0x00000d64 adds r1, r2 adds r1, r0 ldrh r0, [r1] - ldr r1, _0818FDB0 + ldr r1, =0x0203bc8c ldr r1, [r1] lsls r0, 4 adds r0, r1 @@ -817568,7 +789859,7 @@ _0818FD3C: _0818FD60: movs r0, 0x64 muls r0, r6 - ldr r1, _0818FDB4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB movs r2, 0 @@ -817602,9 +789893,7 @@ _0818FD60: pop {r1} bx r1 .align 2, 0 -_0818FDAC: .4byte 0x00000d64 -_0818FDB0: .4byte 0x0203bc8c -_0818FDB4: .4byte 0x020244ec + .pool thumb_func_end sub_818FCBC thumb_func_start sub_818FDB8 @@ -817646,16 +789935,16 @@ _0818FDF6: adds r2, r7, 0x1 mov r10, r2 _0818FDFC: - ldr r0, _0818FE2C + ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, [sp, 0x18] adds r0, r1, r2 - ldr r2, _0818FE30 + ldr r2, =0x00000d24 adds r0, r2 ldrh r0, [r0] lsls r0, 22 lsrs r0, 22 - ldr r2, _0818FE34 + ldr r2, =0x000003fe cmp r0, r2 bne _0818FE38 mov r1, r9 @@ -817669,9 +789958,7 @@ _0818FDFC: lsrs r4, 16 b _0818FE5C .align 2, 0 -_0818FE2C: .4byte 0x03005d90 -_0818FE30: .4byte 0x00000d24 -_0818FE34: .4byte 0x000003fe + .pool _0818FE38: mov r2, r8 lsls r0, r2, 1 @@ -817679,11 +789966,11 @@ _0818FE38: lsls r0, 1 ldr r2, [sp, 0x10] adds r0, r2, r0 - ldr r2, _0818FEA8 + ldr r2, =0x00000d64 adds r1, r2 adds r1, r0 ldrh r0, [r1] - ldr r1, _0818FEAC + ldr r1, =0x0203bc8c ldr r1, [r1] lsls r0, 4 adds r0, r1 @@ -817694,7 +789981,7 @@ _0818FE38: _0818FE5C: movs r0, 0x64 muls r0, r6 - ldr r1, _0818FEB0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB movs r2, 0 @@ -817728,9 +790015,7 @@ _0818FE5C: pop {r1} bx r1 .align 2, 0 -_0818FEA8: .4byte 0x00000d64 -_0818FEAC: .4byte 0x0203bc8c -_0818FEB0: .4byte 0x020244ec + .pool thumb_func_end sub_818FDB8 thumb_func_start sub_818FEB4 @@ -817765,7 +790050,7 @@ _0818FECE: cmp r1, 0 beq _0818FFAA movs r3, 0 - ldr r4, _0818FF1C + ldr r4, =0x0832a328 _0818FEF0: str r3, [sp, 0x14] bl GenerateRandomNumber @@ -817790,7 +790075,7 @@ _0818FF16: bne _0818FEF0 b _0818FFAA .align 2, 0 -_0818FF1C: .4byte 0x0832a328 + .pool _0818FF20: movs r3, 0 mov r9, sp @@ -817852,7 +790137,7 @@ _0818FF84: adds r3, 0x1 cmp r3, 0x1 ble _0818FF26 - ldr r2, _0818FFBC + ldr r2, =0x0832a328 mov r1, sp movs r3, 0x1 _0818FF96: @@ -817877,7 +790162,7 @@ _0818FFAA: pop {r1} bx r1 .align 2, 0 -_0818FFBC: .4byte 0x0832a328 + .pool thumb_func_end sub_818FEB4 thumb_func_start sub_818FFC0 @@ -817895,10 +790180,10 @@ sub_818FFC0: @ 818FFC0 movs r2, 0x14 cmp r3, 0 beq _0818FFF0 - ldr r0, _0818FFF4 + ldr r0, =0x0000ffff cmp r3, r0 beq _0818FFF0 - ldr r0, _0818FFF8 + ldr r0, =0x0831c898 lsls r1, r3, 1 adds r1, r3 lsls r1, 2 @@ -817910,10 +790195,9 @@ _0818FFF0: movs r0, 0 b _08190156 .align 2, 0 -_0818FFF4: .4byte 0x0000ffff -_0818FFF8: .4byte 0x0831c898 + .pool _0818FFFC: - ldr r1, _08190028 + ldr r1, =0x083203cc lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -817936,12 +790220,12 @@ _0818FFFC: movs r2, 0x8 b _081900A4 .align 2, 0 -_08190028: .4byte 0x083203cc + .pool _0819002C: - ldr r0, _081900B8 + ldr r0, =0x0831ace8 adds r1, r6, r0 ldrb r0, [r1] - ldr r7, _081900B8 + ldr r7, =0x0831ace8 cmp r0, 0xFF beq _081900A4 adds r4, r1, 0 @@ -817996,7 +790280,7 @@ _08190088: _08190096: adds r4, 0x3 adds r6, 0x3 - ldr r1, _081900B8 + ldr r1, =0x0831ace8 adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0xFF @@ -818013,7 +790297,7 @@ _081900AA: beq _081900C4 b _08190154 .align 2, 0 -_081900B8: .4byte 0x0831ace8 + .pool _081900BC: ldr r0, [sp] cmp r0, 0x2 @@ -818160,15 +790444,15 @@ sub_81901A0: @ 81901A0 adds r3, r0, 0 adds r2, r1, 0 movs r5, 0 - ldr r0, _081901F0 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r4, _081901F4 + ldr r4, =0x00000d24 adds r1, r4 ldrh r1, [r1] lsls r1, 22 lsrs r1, 22 mov r12, r0 - ldr r6, _081901F8 + ldr r6, =0x0860d10c cmp r1, r2 beq _081901D8 mov r7, r12 @@ -818198,9 +790482,7 @@ _081901D8: adds r4, 0x8 b _08190206 .align 2, 0 -_081901F0: .4byte 0x03005d90 -_081901F4: .4byte 0x00000d24 -_081901F8: .4byte 0x0860d10c + .pool _081901FC: lsls r0, r5, 2 adds r1, r3, r0 @@ -818213,7 +790495,7 @@ _08190206: ldrb r2, [r0] cmp r2, r4 bge _08190256 - ldr r1, _0819022C + ldr r1, =0x0860d14c adds r0, r2, r1 ldrb r3, [r0] adds r6, r1, 0 @@ -818223,12 +790505,11 @@ _08190206: ldr r0, [r1] lsls r1, r3, 2 adds r0, r1 - ldr r3, _08190230 + ldr r3, =0x00000d25 adds r0, r3 b _0819024E .align 2, 0 -_0819022C: .4byte 0x0860d14c -_08190230: .4byte 0x00000d25 + .pool _08190234: adds r2, 0x1 cmp r2, r4 @@ -818241,7 +790522,7 @@ _08190234: ldr r0, [r3] lsls r1, 2 adds r0, r1 - ldr r1, _08190264 + ldr r1, =0x00000d25 adds r0, r1 _0819024E: ldrb r0, [r0] @@ -818251,13 +790532,12 @@ _0819024E: _08190256: cmp r2, r4 beq _08190286 - ldr r0, _08190268 + ldr r0, =0x0860d14c adds r0, r2, r0 ldrb r0, [r0] b _08190292 .align 2, 0 -_08190264: .4byte 0x00000d25 -_08190268: .4byte 0x0860d14c + .pool _0819026C: mov r3, r12 ldr r1, [r3] @@ -818266,7 +790546,7 @@ _0819026C: ldrb r2, [r0] lsls r0, r2, 2 adds r1, r0 - ldr r0, _0819028C + ldr r0, =0x00000d25 adds r1, r0 ldrb r0, [r1] lsls r0, 29 @@ -818276,7 +790556,7 @@ _08190286: movs r0, 0xFF b _08190292 .align 2, 0 -_0819028C: .4byte 0x00000d25 + .pool _08190290: adds r0, r2, 0 _08190292: @@ -818289,27 +790569,27 @@ _08190292: sub_8190298: @ 8190298 push {lr} bl sub_81902AC - ldr r1, _081902A8 + ldr r1, =0x02038bca strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_081902A8: .4byte 0x02038bca + .pool thumb_func_end sub_8190298 thumb_func_start sub_81902AC sub_81902AC: @ 81902AC push {r4,lr} - ldr r0, _081902D4 + ldr r0, =0x03005d90 ldr r4, [r0] - ldr r1, _081902D8 + ldr r1, =0x00000cb2 adds r0, r4, r1 ldrh r0, [r0] - ldr r1, _081902DC + ldr r1, =0x000003ff bl sub_81901A0 lsls r0, 2 adds r4, r0 - ldr r0, _081902E0 + ldr r0, =0x00000d24 adds r4, r0 ldrh r0, [r4] lsls r0, 22 @@ -818318,33 +790598,30 @@ sub_81902AC: @ 81902AC pop {r1} bx r1 .align 2, 0 -_081902D4: .4byte 0x03005d90 -_081902D8: .4byte 0x00000cb2 -_081902DC: .4byte 0x000003ff -_081902E0: .4byte 0x00000d24 + .pool thumb_func_end sub_81902AC thumb_func_start sub_81902E4 sub_81902E4: @ 81902E4 push {lr} - ldr r0, _081902F4 + ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 bl sub_8162614 pop {r0} bx r0 .align 2, 0 -_081902F4: .4byte 0x02038bca + .pool thumb_func_end sub_81902E4 thumb_func_start sub_81902F8 sub_81902F8: @ 81902F8 push {r4,lr} - ldr r4, _0819032C + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _08190330 + ldr r1, =0x020375e2 ldrh r1, [r1] - ldr r2, _08190334 + ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] movs r0, 0x80 @@ -818352,7 +790629,7 @@ sub_81902F8: @ 81902F8 movs r1, 0 bl var_set ldr r1, [r4] - ldr r0, _08190338 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x4 @@ -818363,41 +790640,38 @@ sub_81902F8: @ 81902F8 pop {r0} bx r0 .align 2, 0 -_0819032C: .4byte 0x03005d90 -_08190330: .4byte 0x020375e2 -_08190334: .4byte 0x00000ca8 -_08190338: .4byte 0x00000ca9 + .pool thumb_func_end sub_81902F8 thumb_func_start sub_819033C sub_819033C: @ 819033C push {r4,r5,lr} - ldr r5, _0819039C + ldr r5, =0x03005d90 ldr r0, [r5] - ldr r1, _081903A0 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r4, [r0] lsls r4, 30 lsrs r4, 30 - ldr r0, _081903A4 + ldr r0, =0x000040ce bl var_get lsls r0, 24 ldr r1, [r5] lsls r4, 1 lsrs r0, 22 adds r4, r0 - ldr r3, _081903A8 + ldr r3, =0x00000d0c adds r1, r3 adds r1, r4 ldrh r0, [r1] - ldr r2, _081903AC + ldr r2, =0x000003e6 cmp r0, r2 bhi _0819036E adds r0, 0x1 strh r0, [r1] _0819036E: ldr r0, [r5] - ldr r1, _081903B0 + ldr r1, =0x00000d1c adds r0, r1 adds r1, r0, r4 ldrh r0, [r1] @@ -818409,7 +790683,7 @@ _08190380: ldr r0, [r5] adds r1, r0, r3 adds r1, r4 - ldr r2, _081903B4 + ldr r2, =0x00000d14 adds r0, r2 adds r0, r4 ldrh r1, [r1] @@ -818422,24 +790696,18 @@ _08190396: pop {r0} bx r0 .align 2, 0 -_0819039C: .4byte 0x03005d90 -_081903A0: .4byte 0x00000ca9 -_081903A4: .4byte 0x000040ce -_081903A8: .4byte 0x00000d0c -_081903AC: .4byte 0x000003e6 -_081903B0: .4byte 0x00000d1c -_081903B4: .4byte 0x00000d14 + .pool thumb_func_end sub_819033C thumb_func_start sub_81903B8 sub_81903B8: @ 81903B8 push {r4,r5,lr} - ldr r0, _081903F4 + ldr r0, =sub_8190400 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r1, _081903F8 + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -818453,15 +790721,13 @@ sub_81903B8: @ 81903B8 strh r0, [r4, 0xA] strh r5, [r4, 0xC] strh r5, [r4, 0xE] - ldr r0, _081903FC + ldr r0, =sub_8194B54 + 1 bl set_callback2 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081903F4: .4byte sub_8190400 + 1 -_081903F8: .4byte 0x03005e00 -_081903FC: .4byte sub_8194B54 + 1 + .pool thumb_func_end sub_81903B8 thumb_func_start sub_8190400 @@ -818475,7 +790741,7 @@ sub_8190400: @ 8190400 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r1, _0819043C + ldr r1, =0x03005e00 lsls r0, 2 add r0, r10 lsls r0, 3 @@ -818497,7 +790763,7 @@ sub_8190400: @ 8190400 beq _0819044E b _08190772 .align 2, 0 -_0819043C: .4byte 0x03005e00 + .pool _08190440: cmp r4, 0x2 bne _08190446 @@ -818518,58 +790784,48 @@ _0819044E: str r4, [sp, 0x4] movs r1, 0xC0 lsls r1, 19 - ldr r2, _081904B0 + ldr r2, =0x05006000 add r0, sp, 0x4 bl CpuSet movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081904B4 + ldr r1, =0x0860ce84 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r0, _081904B8 + ldr r0, =0x0860ceb4 bl Window_InitFromTemplates bl TextBox_ResetSomeField - ldr r0, _081904BC + ldr r0, =0x02022e14 strh r4, [r0] - ldr r0, _081904C0 + ldr r0, =0x02022e16 strh r4, [r0] - ldr r0, _081904C4 + ldr r0, =0x02022e18 strh r4, [r0] - ldr r0, _081904C8 + ldr r0, =0x02022e1a strh r4, [r0] - ldr r0, _081904CC + ldr r0, =0x02022e20 strh r4, [r0] - ldr r0, _081904D0 + ldr r0, =0x02022e22 strh r4, [r0] mov r2, r9 cmp r2, 0x2 bne _081904DC - ldr r0, _081904D4 + ldr r0, =0x02022e1c strh r4, [r0] - ldr r0, _081904D8 + ldr r0, =0x02022e1e strh r4, [r0] b _081904E6 .align 2, 0 -_081904B0: .4byte 0x05006000 -_081904B4: .4byte 0x0860ce84 -_081904B8: .4byte 0x0860ceb4 -_081904BC: .4byte 0x02022e14 -_081904C0: .4byte 0x02022e16 -_081904C4: .4byte 0x02022e18 -_081904C8: .4byte 0x02022e1a -_081904CC: .4byte 0x02022e20 -_081904D0: .4byte 0x02022e22 -_081904D4: .4byte 0x02022e1c -_081904D8: .4byte 0x02022e1e + .pool _081904DC: - ldr r0, _081904FC + ldr r0, =0x02022e1c strh r4, [r0] - ldr r1, _08190500 + ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] _081904E6: - ldr r0, _08190504 + ldr r0, =0x03005e00 mov r2, r10 lsls r1, r2, 2 add r1, r10 @@ -818580,9 +790836,7 @@ _081904E6: strh r0, [r1, 0x8] b _08190772 .align 2, 0 -_081904FC: .4byte 0x02022e1c -_08190500: .4byte 0x02022e1e -_08190504: .4byte 0x03005e00 + .pool _08190508: movs r0, 0x50 movs r1, 0 @@ -818617,14 +790871,14 @@ _08190508: bl sub_80A1A74 bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r1, _0819056C + ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] b _08190602 .align 2, 0 -_0819056C: .4byte 0x0300301c + .pool _08190570: - ldr r1, _0819060C + ldr r1, =0x08d83d50 movs r5, 0x80 lsls r5, 6 movs r7, 0 @@ -818633,49 +790887,49 @@ _08190570: adds r2, r5, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _08190610 + ldr r1, =0x08d84970 movs r4, 0x1 str r4, [sp] movs r0, 0x2 adds r2, r5, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _08190614 + ldr r1, =0x08d84f00 movs r2, 0x80 lsls r2, 4 str r4, [sp] movs r0, 0x3 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r0, _08190618 + ldr r0, =0x0860cf50 bl gpu_tile_obj_decompress_and_load - ldr r0, _0819061C + ldr r0, =0x08d85358 movs r4, 0x80 lsls r4, 2 movs r1, 0 adds r2, r4, 0 bl decompress_palette - ldr r0, _08190620 + ldr r0, =0x08d85444 movs r1, 0x80 lsls r1, 1 adds r2, r4, 0 bl decompress_palette - ldr r0, _08190624 + ldr r0, =0x08d85600 movs r1, 0xF0 movs r2, 0x20 bl decompress_palette mov r0, r9 cmp r0, 0x2 bne _081905DE - ldr r0, _08190628 + ldr r0, =0x08d854c8 movs r1, 0x50 movs r2, 0x20 bl decompress_palette _081905DE: str r7, [sp, 0x8] add r0, sp, 0x8 - ldr r1, _0819062C - ldr r2, _08190630 + ldr r1, =0x02037b14 + ldr r2, =0x05000100 bl CpuSet movs r0, 0 bl gpu_sync_bg_show @@ -818691,20 +790945,11 @@ _08190602: strh r0, [r6, 0x8] b _08190772 .align 2, 0 -_0819060C: .4byte 0x08d83d50 -_08190610: .4byte 0x08d84970 -_08190614: .4byte 0x08d84f00 -_08190618: .4byte 0x0860cf50 -_0819061C: .4byte 0x08d85358 -_08190620: .4byte 0x08d85444 -_08190624: .4byte 0x08d85600 -_08190628: .4byte 0x08d854c8 -_0819062C: .4byte 0x02037b14 -_08190630: .4byte 0x05000100 + .pool _08190634: - ldr r0, _08190698 + ldr r0, =sub_8194B70 + 1 bl SetVBlankCallback - ldr r4, _0819069C + ldr r4, =0x0203cd78 movs r0, 0x14 bl malloc_and_clear str r0, [r4] @@ -818721,12 +790966,12 @@ _0819064A: cmp r6, 0xF ble _0819064A bl sub_80D2F04 - ldr r0, _081906A0 + ldr r0, =sub_8190CD4 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _081906A4 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -818743,16 +790988,13 @@ _0819064A: lsrs r1, r5, 24 movs r0, 0 bl sub_819314C - ldr r0, _0819069C + ldr r0, =0x0203cd78 ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x10] b _081906B0 .align 2, 0 -_08190698: .4byte sub_8194B70 + 1 -_0819069C: .4byte 0x0203cd78 -_081906A0: .4byte sub_8190CD4 + 1 -_081906A4: .4byte 0x03005e00 + .pool _081906A8: lsrs r1, r5, 24 movs r0, 0 @@ -818765,7 +791007,7 @@ _081906B0: mov r0, r9 cmp r0, 0 beq _0819076C - ldr r5, _08190784 + ldr r5, =0x0860d068 adds r0, r5, 0 movs r1, 0x78 movs r2, 0x4 @@ -818776,7 +791018,7 @@ _081906B0: lsls r4, r7, 4 adds r4, r7 lsls r4, 2 - ldr r1, _08190788 + ldr r1, =0x02020630 mov r8, r1 add r4, r8 adds r0, r4, 0 @@ -818798,7 +791040,7 @@ _081906B0: movs r1, 0x1 bl obj_anim_image_start strh r6, [r4, 0x2E] - ldr r5, _0819078C + ldr r5, =0x0860d050 adds r0, r5, 0 movs r1, 0x6 movs r2, 0x50 @@ -818857,9 +791099,7 @@ _08190772: pop {r0} bx r0 .align 2, 0 -_08190784: .4byte 0x0860d068 -_08190788: .4byte 0x02020630 -_0819078C: .4byte 0x0860d050 + .pool thumb_func_end sub_8190400 thumb_func_start sub_8190790 @@ -818894,17 +791134,17 @@ _081907BC: asrs r0, 16 cmp r0, 0x28 bne _081907F0 - ldr r0, _081907D0 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] b _081907F0 .align 2, 0 -_081907D0: .4byte nullsub_12 + 1 + .pool _081907D4: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xBF ble _081907F0 - ldr r0, _081907F4 + ldr r0, =0x0203cd78 ldr r0, [r0] movs r3, 0x32 ldrsh r1, [r2, r3] @@ -818917,7 +791157,7 @@ _081907F0: pop {r0} bx r0 .align 2, 0 -_081907F4: .4byte 0x0203cd78 + .pool thumb_func_end sub_8190790 thumb_func_start sub_81907F8 @@ -818950,11 +791190,11 @@ _08190820: asrs r0, 16 cmp r0, 0x28 bne _08190858 - ldr r0, _08190834 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] b _08190858 .align 2, 0 -_08190834: .4byte nullsub_12 + 1 + .pool _08190838: lsls r0, r1, 16 asrs r0, 16 @@ -818962,7 +791202,7 @@ _08190838: negs r1, r1 cmp r0, r1 bgt _08190858 - ldr r0, _0819085C + ldr r0, =0x0203cd78 ldr r0, [r0] movs r3, 0x32 ldrsh r1, [r2, r3] @@ -818975,7 +791215,7 @@ _08190858: pop {r0} bx r0 .align 2, 0 -_0819085C: .4byte 0x0203cd78 + .pool thumb_func_end sub_81907F8 thumb_func_start sub_8190860 @@ -819010,17 +791250,17 @@ _0819088C: asrs r0, 16 cmp r0, 0x40 bne _081908C0 - ldr r0, _081908A0 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] b _081908C0 .align 2, 0 -_081908A0: .4byte nullsub_12 + 1 + .pool _081908A4: lsls r1, 16 - ldr r0, _081908C4 + ldr r0, =0x010f0000 cmp r1, r0 ble _081908C0 - ldr r0, _081908C8 + ldr r0, =0x0203cd78 ldr r0, [r0] movs r3, 0x32 ldrsh r1, [r2, r3] @@ -819033,8 +791273,7 @@ _081908C0: pop {r0} bx r0 .align 2, 0 -_081908C4: .4byte 0x010f0000 -_081908C8: .4byte 0x0203cd78 + .pool thumb_func_end sub_8190860 thumb_func_start sub_81908CC @@ -819068,11 +791307,11 @@ _081908F6: asrs r0, 16 cmp r0, 0x40 bne _08190930 - ldr r0, _0819090C + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] b _08190930 .align 2, 0 -_0819090C: .4byte nullsub_12 + 1 + .pool _08190910: lsls r0, r1, 16 asrs r0, 16 @@ -819080,7 +791319,7 @@ _08190910: negs r1, r1 cmp r0, r1 bgt _08190930 - ldr r0, _08190934 + ldr r0, =0x0203cd78 ldr r0, [r0] movs r3, 0x32 ldrsh r1, [r2, r3] @@ -819093,7 +791332,7 @@ _08190930: pop {r0} bx r0 .align 2, 0 -_08190934: .4byte 0x0203cd78 + .pool thumb_func_end sub_81908CC thumb_func_start sub_8190938 @@ -819150,17 +791389,17 @@ _0819098A: asrs r0, 16 cmp r0, 0x28 bne _081909C0 - ldr r0, _081909A0 + ldr r0, =sub_8190938 + 1 str r0, [r4, 0x1C] b _081909C0 .align 2, 0 -_081909A0: .4byte sub_8190938 + 1 + .pool _081909A4: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xAF ble _081909C0 - ldr r0, _081909C8 + ldr r0, =0x0203cd78 ldr r0, [r0] movs r2, 0x32 ldrsh r1, [r4, r2] @@ -819174,7 +791413,7 @@ _081909C0: pop {r0} bx r0 .align 2, 0 -_081909C8: .4byte 0x0203cd78 + .pool thumb_func_end sub_8190950 thumb_func_start sub_81909CC @@ -819214,11 +791453,11 @@ _08190A02: asrs r0, 16 cmp r0, 0x28 bne _08190A3C - ldr r0, _08190A18 + ldr r0, =sub_8190938 + 1 str r0, [r4, 0x1C] b _08190A3C .align 2, 0 -_08190A18: .4byte sub_8190938 + 1 + .pool _08190A1C: lsls r0, r1, 16 asrs r0, 16 @@ -819226,7 +791465,7 @@ _08190A1C: negs r1, r1 cmp r0, r1 bgt _08190A3C - ldr r0, _08190A44 + ldr r0, =0x0203cd78 ldr r0, [r0] movs r2, 0x32 ldrsh r1, [r4, r2] @@ -819240,7 +791479,7 @@ _08190A3C: pop {r0} bx r0 .align 2, 0 -_08190A44: .4byte 0x0203cd78 + .pool thumb_func_end sub_81909CC thumb_func_start sub_8190A48 @@ -819282,17 +791521,17 @@ _08190A82: asrs r0, 16 cmp r0, 0x40 bne _08190AB8 - ldr r0, _08190A98 + ldr r0, =sub_8190938 + 1 str r0, [r4, 0x1C] b _08190AB8 .align 2, 0 -_08190A98: .4byte sub_8190938 + 1 + .pool _08190A9C: lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF ble _08190AB8 - ldr r0, _08190AC0 + ldr r0, =0x0203cd78 ldr r0, [r0] movs r2, 0x32 ldrsh r1, [r4, r2] @@ -819306,7 +791545,7 @@ _08190AB8: pop {r0} bx r0 .align 2, 0 -_08190AC0: .4byte 0x0203cd78 + .pool thumb_func_end sub_8190A48 thumb_func_start sub_8190AC4 @@ -819347,11 +791586,11 @@ _08190AFC: asrs r0, 16 cmp r0, 0x40 bne _08190B34 - ldr r0, _08190B10 + ldr r0, =sub_8190938 + 1 str r0, [r4, 0x1C] b _08190B34 .align 2, 0 -_08190B10: .4byte sub_8190938 + 1 + .pool _08190B14: lsls r0, r1, 16 asrs r0, 16 @@ -819359,7 +791598,7 @@ _08190B14: negs r1, r1 cmp r0, r1 bgt _08190B34 - ldr r0, _08190B3C + ldr r0, =0x0203cd78 ldr r0, [r0] movs r2, 0x32 ldrsh r1, [r4, r2] @@ -819373,7 +791612,7 @@ _08190B34: pop {r0} bx r0 .align 2, 0 -_08190B3C: .4byte 0x0203cd78 + .pool thumb_func_end sub_8190AC4 thumb_func_start sub_8190B40 @@ -819386,7 +791625,7 @@ sub_8190B40: @ 8190B40 adds r3, r0, 0 movs r0, 0x2E ldrsh r6, [r3, r0] - ldr r2, _08190BE4 + ldr r2, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -819399,13 +791638,13 @@ sub_8190B40: @ 8190B40 adds r0, r2 movs r1, 0xA ldrsh r0, [r0, r1] - ldr r1, _08190BE8 + ldr r1, =0x0860d080 adds r0, r1 ldrb r0, [r0] mov r10, r0 - ldr r1, _08190BEC + ldr r1, =0x03005d90 ldr r5, [r1] - ldr r7, _08190BF0 + ldr r7, =0x00000cb2 adds r0, r5, r7 ldrh r0, [r0] mov r12, r0 @@ -819422,14 +791661,14 @@ sub_8190B40: @ 8190B40 mov r2, r10 lsls r0, r2, 2 adds r1, r5, r0 - ldr r7, _08190BF4 + ldr r7, =0x00000d25 adds r1, r7 ldrb r2, [r1] lsls r1, r2, 29 adds r4, r0, 0 cmp r1, 0 bge _08190BB6 - ldr r0, _08190BF8 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r1, [r0, 0x10] subs r1, 0x1 @@ -819441,13 +791680,13 @@ _08190BB6: mov r1, r8 ldr r0, [r1] adds r0, r4 - ldr r2, _08190BF4 + ldr r2, =0x00000d25 adds r0, r2 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 blt _08190BD4 - ldr r0, _08190BF8 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] subs r0, 0x1 @@ -819462,27 +791701,22 @@ _08190BD4: ldrsh r0, [r0, r7] b _08190C4C .align 2, 0 -_08190BE4: .4byte 0x03005e00 -_08190BE8: .4byte 0x0860d080 -_08190BEC: .4byte 0x03005d90 -_08190BF0: .4byte 0x00000cb2 -_08190BF4: .4byte 0x00000d25 -_08190BF8: .4byte 0x0203cd78 + .pool _08190BFC: - ldr r0, _08190C08 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 bne _08190C32 b _08190C48 .align 2, 0 -_08190C08: .4byte 0x0203cd78 + .pool _08190C0C: movs r2, 0x30 ldrsh r0, [r3, r2] cmp r0, 0 beq _08190C28 - ldr r0, _08190C24 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x1 @@ -819491,9 +791725,9 @@ _08190C0C: ldrsh r0, [r4, r7] b _08190C4C .align 2, 0 -_08190C24: .4byte 0x0203cd78 + .pool _08190C28: - ldr r0, _08190C44 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 @@ -819508,7 +791742,7 @@ _08190C32: strb r0, [r2] b _08190C5C .align 2, 0 -_08190C44: .4byte 0x0203cd78 + .pool _08190C48: movs r1, 0x8 ldrsh r0, [r4, r1] @@ -819537,7 +791771,7 @@ sub_8190C6C: @ 8190C6C adds r3, r0, 0 movs r0, 0x2E ldrsh r1, [r3, r0] - ldr r2, _08190C94 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -819546,17 +791780,16 @@ sub_8190C6C: @ 8190C6C ldrsh r0, [r1, r2] cmp r0, 0x1 bne _08190C9C - ldr r0, _08190C98 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 bne _08190CA6 b _08190CC0 .align 2, 0 -_08190C94: .4byte 0x03005e00 -_08190C98: .4byte 0x0203cd78 + .pool _08190C9C: - ldr r0, _08190CBC + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x1 @@ -819574,7 +791807,7 @@ _08190CA6: strb r1, [r0] b _08190CCE .align 2, 0 -_08190CBC: .4byte 0x0203cd78 + .pool _08190CC0: adds r2, r3, 0 adds r2, 0x3E @@ -819599,7 +791832,7 @@ sub_8190CD4: @ 8190CD4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _08190D10 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -819616,13 +791849,12 @@ sub_8190CD4: @ 8190CD4 bl _08192202 _08190D06: lsls r0, 2 - ldr r1, _08190D14 + ldr r1, =_08190D18 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08190D10: .4byte 0x03005e00 -_08190D14: .4byte _08190D18 + .pool .align 2, 0 _08190D18: .4byte _08190D3C @@ -819635,7 +791867,7 @@ _08190D18: .4byte _081920BC .4byte _08192106 _08190D3C: - ldr r0, _08190D74 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -819652,7 +791884,7 @@ _08190D50: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r1, _08190D78 + ldr r1, =0x03005e00 mov r6, r8 lsls r0, r6, 2 add r0, r8 @@ -819662,10 +791894,9 @@ _08190D50: strh r1, [r0, 0x8] bl _08192202 .align 2, 0 -_08190D74: .4byte 0x02037fd4 -_08190D78: .4byte 0x03005e00 + .pool _08190D7C: - ldr r0, _08190DA0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -819677,14 +791908,13 @@ _08190D8C: lsls r0, r1, 2 add r0, r8 lsls r0, 3 - ldr r2, _08190DA4 + ldr r2, =0x03005e00 adds r0, r2 movs r1, 0x2 strh r1, [r0, 0x8] bl _08192202 .align 2, 0 -_08190DA0: .4byte 0x02037fd4 -_08190DA4: .4byte 0x03005e00 + .pool _08190DA8: mov r0, r8 bl sub_819221C @@ -819707,7 +791937,7 @@ _08190DC6: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _08190DEC + ldr r1, =0x03005e00 mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -819717,9 +791947,9 @@ _08190DC6: strh r1, [r0, 0x8] bl _08192202 .align 2, 0 -_08190DEC: .4byte 0x03005e00 + .pool _08190DF0: - ldr r1, _08190E44 + ldr r1, =0x03005e00 mov r4, r8 lsls r2, r4, 2 adds r0, r2, r4 @@ -819753,7 +791983,7 @@ _08190E18: cmp r6, r5 blt _08190E18 _08190E32: - ldr r0, _08190E44 + ldr r0, =0x03005e00 mov r1, r9 add r1, r8 lsls r1, 3 @@ -819762,13 +791992,13 @@ _08190E32: strh r0, [r1, 0x8] bl _08192202 .align 2, 0 -_08190E44: .4byte 0x03005e00 + .pool _08190E48: mov r6, r8 lsls r1, r6, 2 adds r0, r1, r6 lsls r0, 3 - ldr r2, _08190E70 + ldr r2, =0x03005e00 adds r0, r2 movs r3, 0x12 ldrsh r6, [r0, r3] @@ -819779,13 +792009,12 @@ _08190E48: bl _08192202 _08190E64: lsls r0, 2 - ldr r1, _08190E74 + ldr r1, =_08190E78 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08190E70: .4byte 0x03005e00 -_08190E74: .4byte _08190E78 + .pool .align 2, 0 _08190E78: .4byte _08190E98 @@ -819800,56 +792029,52 @@ _08190E98: mov r0, r9 add r0, r8 lsls r0, 3 - ldr r4, _08190EC0 + ldr r4, =0x03005e00 adds r0, r4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 beq _08190ED4 - ldr r0, _08190EC4 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _08190EC8 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r0, _08190ECC + ldr r0, =0x02022e18 strh r1, [r0] - ldr r1, _08190ED0 + ldr r1, =0x02022e1a movs r0, 0xA0 strh r0, [r1] b _08190EE6 .align 2, 0 -_08190EC0: .4byte 0x03005e00 -_08190EC4: .4byte 0x02022e14 -_08190EC8: .4byte 0x02022e16 -_08190ECC: .4byte 0x02022e18 -_08190ED0: .4byte 0x02022e1a + .pool _08190ED4: - ldr r0, _08190F2C + ldr r0, =0x02022e14 strh r2, [r0] - ldr r1, _08190F30 + ldr r1, =0x02022e16 movs r0, 0xA0 strh r0, [r1] - ldr r0, _08190F34 + ldr r0, =0x02022e18 strh r2, [r0] - ldr r0, _08190F38 + ldr r0, =0x02022e1a strh r2, [r0] _08190EE6: cmp r6, 0x1 bne _08190F9C - ldr r5, _08190F3C + ldr r5, =0x0203cd78 ldr r0, [r5] ldrb r1, [r0, 0x10] cmp r1, 0 bne _08190F50 - ldr r0, _08190F40 + ldr r0, =0x02022e1c strh r1, [r0] - ldr r1, _08190F44 + ldr r1, =0x02022e1e movs r6, 0xA0 lsls r6, 1 adds r0, r6, 0 strh r0, [r1] - ldr r3, _08190F48 - ldr r2, _08190F4C + ldr r3, =0x0860d080 + ldr r2, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -819868,26 +792093,18 @@ _08190EE6: bl sub_81924E0 b _08191084 .align 2, 0 -_08190F2C: .4byte 0x02022e14 -_08190F30: .4byte 0x02022e16 -_08190F34: .4byte 0x02022e18 -_08190F38: .4byte 0x02022e1a -_08190F3C: .4byte 0x0203cd78 -_08190F40: .4byte 0x02022e1c -_08190F44: .4byte 0x02022e1e -_08190F48: .4byte 0x0860d080 -_08190F4C: .4byte 0x03005e00 + .pool _08190F50: - ldr r1, _08190F8C + ldr r1, =0x02022e1c movs r6, 0x80 lsls r6, 1 adds r0, r6, 0 strh r0, [r1] - ldr r0, _08190F90 + ldr r0, =0x02022e1e movs r4, 0 strh r4, [r0] - ldr r3, _08190F94 - ldr r2, _08190F98 + ldr r3, =0x0860d080 + ldr r2, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -819908,17 +792125,14 @@ _08190F50: strb r4, [r0, 0x10] b _08191084 .align 2, 0 -_08190F8C: .4byte 0x02022e1c -_08190F90: .4byte 0x02022e1e -_08190F94: .4byte 0x0860d080 -_08190F98: .4byte 0x03005e00 + .pool _08190F9C: - ldr r6, _08190FE8 + ldr r6, =0x0203cd78 ldr r1, [r6] ldrb r5, [r1, 0x10] cmp r5, 0 bne _08190FF8 - ldr r4, _08190FEC + ldr r4, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -819931,9 +792145,9 @@ _08190F9C: lsrs r0, 24 adds r1, 0x11 bl sub_8192F08 - ldr r0, _08190FF0 + ldr r0, =0x02022e1c strh r5, [r0] - ldr r1, _08190FF4 + ldr r1, =0x02022e1e movs r3, 0xA0 lsls r3, 1 adds r0, r3, 0 @@ -819950,14 +792164,11 @@ _08190F9C: bl sub_81924E0 b _08191084 .align 2, 0 -_08190FE8: .4byte 0x0203cd78 -_08190FEC: .4byte 0x03005e00 -_08190FF0: .4byte 0x02022e1c -_08190FF4: .4byte 0x02022e1e + .pool _08190FF8: cmp r5, 0x2 bne _0819104C - ldr r4, _08191040 + ldr r4, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -819970,10 +792181,10 @@ _08190FF8: lsrs r0, 24 adds r1, 0x11 bl sub_8192F08 - ldr r1, _08191044 + ldr r1, =0x02022e1c movs r0, 0 strh r0, [r1] - ldr r1, _08191048 + ldr r1, =0x02022e1e movs r2, 0xA0 lsls r2, 1 adds r0, r2, 0 @@ -819990,19 +792201,17 @@ _08190FF8: bl sub_81924E0 b _08191084 .align 2, 0 -_08191040: .4byte 0x03005e00 -_08191044: .4byte 0x02022e1c -_08191048: .4byte 0x02022e1e + .pool _0819104C: - ldr r1, _081910F4 + ldr r1, =0x02022e1c movs r3, 0x80 lsls r3, 1 adds r0, r3, 0 strh r0, [r1] - ldr r1, _081910F8 + ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] - ldr r1, _081910FC + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -820023,13 +792232,13 @@ _0819104C: bl sub_819314C _08191084: movs r6, 0 - ldr r5, _08191100 + ldr r5, =0x0203cd78 mov r10, r5 - ldr r3, _08191104 + ldr r3, =0x02020630 mov r0, r9 add r0, r8 lsls r0, 3 - ldr r1, _081910FC + ldr r1, =0x03005e00 adds r5, r0, r1 mov r12, r6 adds r4, r3, 0 @@ -820049,7 +792258,7 @@ _0819109E: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08191108 + ldr r1, =sub_8190790 + 1 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -820080,12 +792289,7 @@ _0819109E: strh r1, [r0, 0x34] b _08191150 .align 2, 0 -_081910F4: .4byte 0x02022e1c -_081910F8: .4byte 0x02022e1e -_081910FC: .4byte 0x03005e00 -_08191100: .4byte 0x0203cd78 -_08191104: .4byte 0x02020630 -_08191108: .4byte sub_8190790 + 1 + .pool _0819110C: mov r2, r10 ldr r0, [r2] @@ -820098,7 +792302,7 @@ _0819110C: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _081911C0 + ldr r1, =sub_8190950 + 1 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -820126,10 +792330,10 @@ _08191150: cmp r6, 0x7 ble _0819109E movs r6, 0x8 - ldr r2, _081911C4 + ldr r2, =0x0203cd78 mov r12, r2 - ldr r3, _081911C8 - ldr r1, _081911CC + ldr r3, =0x02020630 + ldr r1, =0x03005e00 mov r0, r9 add r0, r8 lsls r0, 3 @@ -820151,7 +792355,7 @@ _0819116E: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _081911D0 + ldr r1, =sub_8190790 + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -820180,11 +792384,7 @@ _0819116E: strh r1, [r0, 0x34] b _08191214 .align 2, 0 -_081911C0: .4byte sub_8190950 + 1 -_081911C4: .4byte 0x0203cd78 -_081911C8: .4byte 0x02020630 -_081911CC: .4byte 0x03005e00 -_081911D0: .4byte sub_8190790 + 1 + .pool _081911D4: mov r2, r12 ldr r0, [r2] @@ -820197,7 +792397,7 @@ _081911D4: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _0819122C + ldr r1, =sub_8190950 + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -820225,69 +792425,63 @@ _08191214: mov r0, r9 add r0, r8 lsls r0, 3 - ldr r3, _08191230 + ldr r3, =0x03005e00 adds r0, r3 movs r2, 0 movs r1, 0x4 bl _08191FE8 .align 2, 0 -_0819122C: .4byte sub_8190950 + 1 -_08191230: .4byte 0x03005e00 + .pool _08191234: mov r0, r9 add r0, r8 lsls r0, 3 - ldr r4, _08191260 + ldr r4, =0x03005e00 adds r0, r4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 beq _08191278 - ldr r0, _08191264 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _08191268 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r0, _0819126C + ldr r0, =0x02022e18 strh r1, [r0] - ldr r1, _08191270 - ldr r2, _08191274 + ldr r1, =0x02022e1a + ldr r2, =0x0000ff60 adds r0, r2, 0 strh r0, [r1] b _0819128C .align 2, 0 -_08191260: .4byte 0x03005e00 -_08191264: .4byte 0x02022e14 -_08191268: .4byte 0x02022e16 -_0819126C: .4byte 0x02022e18 -_08191270: .4byte 0x02022e1a -_08191274: .4byte 0x0000ff60 + .pool _08191278: - ldr r0, _081912CC + ldr r0, =0x02022e14 strh r2, [r0] - ldr r1, _081912D0 - ldr r3, _081912D4 + ldr r1, =0x02022e16 + ldr r3, =0x0000ff60 adds r0, r3, 0 strh r0, [r1] - ldr r0, _081912D8 + ldr r0, =0x02022e18 strh r2, [r0] - ldr r0, _081912DC + ldr r0, =0x02022e1a strh r2, [r0] _0819128C: cmp r6, 0x2 bne _0819133C - ldr r5, _081912E0 + ldr r5, =0x0203cd78 ldr r0, [r5] ldrb r1, [r0, 0x10] cmp r1, 0 bne _081912F4 - ldr r0, _081912E4 + ldr r0, =0x02022e1c strh r1, [r0] - ldr r1, _081912E8 + ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] - ldr r3, _081912EC - ldr r2, _081912F0 + ldr r3, =0x0860d080 + ldr r2, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -820306,24 +792500,15 @@ _0819128C: bl sub_81924E0 b _0819141C .align 2, 0 -_081912CC: .4byte 0x02022e14 -_081912D0: .4byte 0x02022e16 -_081912D4: .4byte 0x0000ff60 -_081912D8: .4byte 0x02022e18 -_081912DC: .4byte 0x02022e1a -_081912E0: .4byte 0x0203cd78 -_081912E4: .4byte 0x02022e1c -_081912E8: .4byte 0x02022e1e -_081912EC: .4byte 0x0860d080 -_081912F0: .4byte 0x03005e00 + .pool _081912F4: - ldr r0, _0819132C + ldr r0, =0x02022e1c movs r4, 0 strh r4, [r0] - ldr r0, _08191330 + ldr r0, =0x02022e1e strh r4, [r0] - ldr r3, _08191334 - ldr r2, _08191338 + ldr r3, =0x0860d080 + ldr r2, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -820344,17 +792529,14 @@ _081912F4: strb r4, [r0, 0x10] b _0819141C .align 2, 0 -_0819132C: .4byte 0x02022e1c -_08191330: .4byte 0x02022e1e -_08191334: .4byte 0x0860d080 -_08191338: .4byte 0x03005e00 + .pool _0819133C: - ldr r6, _08191384 + ldr r6, =0x0203cd78 ldr r1, [r6] ldrb r5, [r1, 0x10] cmp r5, 0 bne _08191394 - ldr r4, _08191388 + ldr r4, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -820367,9 +792549,9 @@ _0819133C: lsrs r0, 24 adds r1, 0x11 bl sub_8192F08 - ldr r0, _0819138C + ldr r0, =0x02022e1c strh r5, [r0] - ldr r1, _08191390 + ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] ldr r2, [r6] @@ -820384,14 +792566,11 @@ _0819133C: bl sub_81924E0 b _0819141C .align 2, 0 -_08191384: .4byte 0x0203cd78 -_08191388: .4byte 0x03005e00 -_0819138C: .4byte 0x02022e1c -_08191390: .4byte 0x02022e1e + .pool _08191394: cmp r5, 0x2 bne _081913E4 - ldr r4, _081913D8 + ldr r4, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -820404,10 +792583,10 @@ _08191394: lsrs r0, 24 adds r1, 0x11 bl sub_8192F08 - ldr r1, _081913DC + ldr r1, =0x02022e1c movs r0, 0 strh r0, [r1] - ldr r1, _081913E0 + ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] ldr r2, [r6] @@ -820422,19 +792601,17 @@ _08191394: bl sub_81924E0 b _0819141C .align 2, 0 -_081913D8: .4byte 0x03005e00 -_081913DC: .4byte 0x02022e1c -_081913E0: .4byte 0x02022e1e + .pool _081913E4: - ldr r1, _0819148C + ldr r1, =0x02022e1c movs r4, 0x80 lsls r4, 1 adds r0, r4, 0 strh r0, [r1] - ldr r1, _08191490 + ldr r1, =0x02022e1e movs r0, 0 strh r0, [r1] - ldr r1, _08191494 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -820455,13 +792632,13 @@ _081913E4: bl sub_819314C _0819141C: movs r6, 0 - ldr r0, _08191498 + ldr r0, =0x0203cd78 mov r10, r0 - ldr r3, _0819149C + ldr r3, =0x02020630 mov r0, r9 add r0, r8 lsls r0, 3 - ldr r1, _08191494 + ldr r1, =0x03005e00 adds r5, r0, r1 mov r12, r6 adds r4, r3, 0 @@ -820481,7 +792658,7 @@ _08191436: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _081914A0 + ldr r1, =sub_81907F8 + 1 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -820512,12 +792689,7 @@ _08191436: strh r1, [r0, 0x34] b _081914E8 .align 2, 0 -_0819148C: .4byte 0x02022e1c -_08191490: .4byte 0x02022e1e -_08191494: .4byte 0x03005e00 -_08191498: .4byte 0x0203cd78 -_0819149C: .4byte 0x02020630 -_081914A0: .4byte sub_81907F8 + 1 + .pool _081914A4: mov r2, r10 ldr r0, [r2] @@ -820530,7 +792702,7 @@ _081914A4: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08191558 + ldr r1, =sub_81909CC + 1 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -820558,10 +792730,10 @@ _081914E8: cmp r6, 0x7 ble _08191436 movs r6, 0x8 - ldr r2, _0819155C + ldr r2, =0x0203cd78 mov r12, r2 - ldr r3, _08191560 - ldr r1, _08191564 + ldr r3, =0x02020630 + ldr r1, =0x03005e00 mov r0, r9 add r0, r8 lsls r0, 3 @@ -820583,7 +792755,7 @@ _08191506: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _08191568 + ldr r1, =sub_81907F8 + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -820612,11 +792784,7 @@ _08191506: strh r1, [r0, 0x34] b _081915AC .align 2, 0 -_08191558: .4byte sub_81909CC + 1 -_0819155C: .4byte 0x0203cd78 -_08191560: .4byte 0x02020630 -_08191564: .4byte 0x03005e00 -_08191568: .4byte sub_81907F8 + 1 + .pool _0819156C: mov r2, r12 ldr r0, [r2] @@ -820629,7 +792797,7 @@ _0819156C: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _081915C4 + ldr r1, =sub_81909CC + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -820657,71 +792825,66 @@ _081915AC: mov r0, r9 add r0, r8 lsls r0, 3 - ldr r3, _081915C8 + ldr r3, =0x03005e00 adds r0, r3 movs r2, 0 movs r1, 0x5 bl _08191FE8 .align 2, 0 -_081915C4: .4byte sub_81909CC + 1 -_081915C8: .4byte 0x03005e00 + .pool _081915CC: mov r0, r9 add r0, r8 lsls r0, 3 - ldr r4, _081915F8 + ldr r4, =0x03005e00 adds r0, r4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 beq _0819160C - ldr r0, _081915FC + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _08191600 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r2, _08191604 + ldr r2, =0x02022e18 movs r6, 0x80 lsls r6, 1 adds r0, r6, 0 strh r0, [r2] - ldr r0, _08191608 + ldr r0, =0x02022e1a strh r1, [r0] b _08191622 .align 2, 0 -_081915F8: .4byte 0x03005e00 -_081915FC: .4byte 0x02022e14 -_08191600: .4byte 0x02022e16 -_08191604: .4byte 0x02022e18 -_08191608: .4byte 0x02022e1a + .pool _0819160C: - ldr r1, _08191664 + ldr r1, =0x02022e14 movs r3, 0x80 lsls r3, 1 adds r0, r3, 0 strh r0, [r1] - ldr r0, _08191668 + ldr r0, =0x02022e16 strh r2, [r0] - ldr r0, _0819166C + ldr r0, =0x02022e18 strh r2, [r0] - ldr r0, _08191670 + ldr r0, =0x02022e1a strh r2, [r0] _08191622: - ldr r0, _08191674 + ldr r0, =0x0203cd78 ldr r4, [r0] ldrb r0, [r4, 0x10] cmp r0, 0 bne _08191688 - ldr r1, _08191678 + ldr r1, =0x02022e1c movs r4, 0x80 lsls r4, 1 adds r0, r4, 0 strh r0, [r1] - ldr r1, _0819167C + ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] - ldr r3, _08191680 - ldr r2, _08191684 + ldr r3, =0x0860d080 + ldr r2, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -820740,26 +792903,18 @@ _08191622: bl sub_81924E0 b _081916C6 .align 2, 0 -_08191664: .4byte 0x02022e14 -_08191668: .4byte 0x02022e16 -_0819166C: .4byte 0x02022e18 -_08191670: .4byte 0x02022e1a -_08191674: .4byte 0x0203cd78 -_08191678: .4byte 0x02022e1c -_0819167C: .4byte 0x02022e1e -_08191680: .4byte 0x0860d080 -_08191684: .4byte 0x03005e00 + .pool _08191688: - ldr r1, _08191738 + ldr r1, =0x02022e1c movs r6, 0x80 lsls r6, 1 adds r0, r6, 0 strh r0, [r1] - ldr r1, _0819173C + ldr r1, =0x02022e1e movs r0, 0 strh r0, [r1] - ldr r3, _08191740 - ldr r2, _08191744 + ldr r3, =0x0860d15c + ldr r2, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -820782,13 +792937,13 @@ _08191688: bl sub_819314C _081916C6: movs r6, 0 - ldr r0, _08191748 + ldr r0, =0x0203cd78 mov r10, r0 - ldr r3, _0819174C + ldr r3, =0x02020630 mov r0, r9 add r0, r8 lsls r0, 3 - ldr r1, _08191744 + ldr r1, =0x03005e00 adds r5, r0, r1 mov r12, r6 adds r4, r3, 0 @@ -820808,7 +792963,7 @@ _081916E0: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08191750 + ldr r1, =sub_8190860 + 1 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -820839,13 +792994,7 @@ _081916E0: strh r1, [r0, 0x34] b _08191798 .align 2, 0 -_08191738: .4byte 0x02022e1c -_0819173C: .4byte 0x02022e1e -_08191740: .4byte 0x0860d15c -_08191744: .4byte 0x03005e00 -_08191748: .4byte 0x0203cd78 -_0819174C: .4byte 0x02020630 -_08191750: .4byte sub_8190860 + 1 + .pool _08191754: mov r2, r10 ldr r0, [r2] @@ -820858,7 +793007,7 @@ _08191754: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08191808 + ldr r1, =sub_8190A48 + 1 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -820886,10 +793035,10 @@ _08191798: cmp r6, 0x7 ble _081916E0 movs r6, 0x8 - ldr r2, _0819180C + ldr r2, =0x0203cd78 mov r12, r2 - ldr r3, _08191810 - ldr r1, _08191814 + ldr r3, =0x02020630 + ldr r1, =0x03005e00 mov r0, r9 add r0, r8 lsls r0, 3 @@ -820911,7 +793060,7 @@ _081917B6: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _08191818 + ldr r1, =sub_8190860 + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -820940,11 +793089,7 @@ _081917B6: strh r1, [r0, 0x34] b _0819185C .align 2, 0 -_08191808: .4byte sub_8190A48 + 1 -_0819180C: .4byte 0x0203cd78 -_08191810: .4byte 0x02020630 -_08191814: .4byte 0x03005e00 -_08191818: .4byte sub_8190860 + 1 + .pool _0819181C: mov r2, r12 ldr r0, [r2] @@ -820957,7 +793102,7 @@ _0819181C: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _08191874 + ldr r1, =sub_8190A48 + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -820985,70 +793130,65 @@ _0819185C: mov r0, r9 add r0, r8 lsls r0, 3 - ldr r3, _08191878 + ldr r3, =0x03005e00 adds r0, r3 movs r2, 0 movs r1, 0x6 b _08191FE8 .align 2, 0 -_08191874: .4byte sub_8190A48 + 1 -_08191878: .4byte 0x03005e00 + .pool _0819187C: mov r0, r9 add r0, r8 lsls r0, 3 - ldr r4, _081918A8 + ldr r4, =0x03005e00 adds r0, r4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 beq _081918BC - ldr r0, _081918AC + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _081918B0 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r2, _081918B4 + ldr r2, =0x02022e18 movs r6, 0x80 lsls r6, 1 adds r0, r6, 0 strh r0, [r2] - ldr r0, _081918B8 + ldr r0, =0x02022e1a strh r1, [r0] b _081918D2 .align 2, 0 -_081918A8: .4byte 0x03005e00 -_081918AC: .4byte 0x02022e14 -_081918B0: .4byte 0x02022e16 -_081918B4: .4byte 0x02022e18 -_081918B8: .4byte 0x02022e1a + .pool _081918BC: - ldr r1, _08191904 + ldr r1, =0x02022e14 movs r3, 0x80 lsls r3, 1 adds r0, r3, 0 strh r0, [r1] - ldr r0, _08191908 + ldr r0, =0x02022e16 strh r2, [r0] - ldr r0, _0819190C + ldr r0, =0x02022e18 strh r2, [r0] - ldr r0, _08191910 + ldr r0, =0x02022e1a strh r2, [r0] _081918D2: - ldr r0, _08191914 + ldr r0, =0x0203cd78 ldr r2, [r0] ldrb r0, [r2, 0x10] cmp r0, 0 bne _08191924 - ldr r1, _08191918 + ldr r1, =0x02022e1c movs r4, 0x80 lsls r4, 1 adds r0, r4, 0 strh r0, [r1] - ldr r1, _0819191C + ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] - ldr r1, _08191920 + ldr r1, =0x03005e00 mov r0, r9 add r0, r8 lsls r0, 3 @@ -821060,22 +793200,15 @@ _081918D2: bl sub_81924E0 b _08191958 .align 2, 0 -_08191904: .4byte 0x02022e14 -_08191908: .4byte 0x02022e16 -_0819190C: .4byte 0x02022e18 -_08191910: .4byte 0x02022e1a -_08191914: .4byte 0x0203cd78 -_08191918: .4byte 0x02022e1c -_0819191C: .4byte 0x02022e1e -_08191920: .4byte 0x03005e00 + .pool _08191924: - ldr r1, _081919C8 + ldr r1, =0x02022e1c movs r0, 0 strh r0, [r1] - ldr r1, _081919CC + ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] - ldr r1, _081919D0 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -821096,13 +793229,13 @@ _08191924: bl sub_819314C _08191958: movs r6, 0 - ldr r0, _081919D4 + ldr r0, =0x0203cd78 mov r10, r0 - ldr r3, _081919D8 + ldr r3, =0x02020630 mov r0, r9 add r0, r8 lsls r0, 3 - ldr r1, _081919D0 + ldr r1, =0x03005e00 adds r5, r0, r1 mov r12, r6 adds r4, r3, 0 @@ -821122,7 +793255,7 @@ _08191972: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _081919DC + ldr r1, =sub_8190860 + 1 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -821153,12 +793286,7 @@ _08191972: strh r1, [r0, 0x34] b _08191A24 .align 2, 0 -_081919C8: .4byte 0x02022e1c -_081919CC: .4byte 0x02022e1e -_081919D0: .4byte 0x03005e00 -_081919D4: .4byte 0x0203cd78 -_081919D8: .4byte 0x02020630 -_081919DC: .4byte sub_8190860 + 1 + .pool _081919E0: mov r2, r10 ldr r0, [r2] @@ -821171,7 +793299,7 @@ _081919E0: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08191A94 + ldr r1, =sub_8190A48 + 1 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -821199,10 +793327,10 @@ _08191A24: cmp r6, 0x7 ble _08191972 movs r6, 0x8 - ldr r2, _08191A98 + ldr r2, =0x0203cd78 mov r12, r2 - ldr r3, _08191A9C - ldr r1, _08191AA0 + ldr r3, =0x02020630 + ldr r1, =0x03005e00 mov r0, r9 add r0, r8 lsls r0, 3 @@ -821224,7 +793352,7 @@ _08191A42: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _08191AA4 + ldr r1, =sub_8190860 + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -821253,11 +793381,7 @@ _08191A42: strh r1, [r0, 0x34] b _08191AE8 .align 2, 0 -_08191A94: .4byte sub_8190A48 + 1 -_08191A98: .4byte 0x0203cd78 -_08191A9C: .4byte 0x02020630 -_08191AA0: .4byte 0x03005e00 -_08191AA4: .4byte sub_8190860 + 1 + .pool _08191AA8: mov r2, r12 ldr r0, [r2] @@ -821270,7 +793394,7 @@ _08191AA8: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _08191B00 + ldr r1, =sub_8190A48 + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -821298,87 +793422,76 @@ _08191AE8: mov r0, r9 add r0, r8 lsls r0, 3 - ldr r3, _08191B04 + ldr r3, =0x03005e00 adds r0, r3 movs r2, 0 movs r1, 0x6 b _08191FE8 .align 2, 0 -_08191B00: .4byte sub_8190A48 + 1 -_08191B04: .4byte 0x03005e00 + .pool _08191B08: mov r0, r9 add r0, r8 lsls r0, 3 - ldr r4, _08191B34 + ldr r4, =0x03005e00 adds r0, r4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 beq _08191B48 - ldr r0, _08191B38 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _08191B3C + ldr r0, =0x02022e16 strh r1, [r0] - ldr r2, _08191B40 + ldr r2, =0x02022e18 movs r6, 0xFF lsls r6, 8 adds r0, r6, 0 strh r0, [r2] - ldr r0, _08191B44 + ldr r0, =0x02022e1a strh r1, [r0] b _08191B5E .align 2, 0 -_08191B34: .4byte 0x03005e00 -_08191B38: .4byte 0x02022e14 -_08191B3C: .4byte 0x02022e16 -_08191B40: .4byte 0x02022e18 -_08191B44: .4byte 0x02022e1a + .pool _08191B48: - ldr r1, _08191B78 + ldr r1, =0x02022e14 movs r3, 0xFF lsls r3, 8 adds r0, r3, 0 strh r0, [r1] - ldr r0, _08191B7C + ldr r0, =0x02022e16 strh r2, [r0] - ldr r0, _08191B80 + ldr r0, =0x02022e18 strh r2, [r0] - ldr r0, _08191B84 + ldr r0, =0x02022e1a strh r2, [r0] _08191B5E: - ldr r0, _08191B88 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x1 bne _08191B94 - ldr r1, _08191B8C + ldr r1, =0x02022e1c movs r0, 0 strh r0, [r1] - ldr r1, _08191B90 + ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] b _08191B9E .align 2, 0 -_08191B78: .4byte 0x02022e14 -_08191B7C: .4byte 0x02022e16 -_08191B80: .4byte 0x02022e18 -_08191B84: .4byte 0x02022e1a -_08191B88: .4byte 0x0203cd78 -_08191B8C: .4byte 0x02022e1c -_08191B90: .4byte 0x02022e1e + .pool _08191B94: - ldr r0, _08191C34 + ldr r0, =0x02022e1c movs r1, 0 strh r1, [r0] - ldr r0, _08191C38 + ldr r0, =0x02022e1e strh r1, [r0] _08191B9E: - ldr r4, _08191C3C - ldr r5, _08191C40 + ldr r4, =0x0860d15c + ldr r5, =0x0203cd78 ldr r3, [r5] - ldr r2, _08191C44 + ldr r2, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -821400,7 +793513,7 @@ _08191B9E: ldrb r1, [r1] bl sub_819314C movs r6, 0 - ldr r7, _08191C48 + ldr r7, =0x02020630 mov r12, r6 mov r10, r5 adds r5, r7, 0 @@ -821419,7 +793532,7 @@ _08191BDC: adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08191C4C + ldr r1, =sub_81908CC + 1 str r1, [r0] ldrb r1, [r3] lsls r0, r1, 4 @@ -821451,13 +793564,7 @@ _08191BDC: strh r1, [r0, 0x34] b _08191C96 .align 2, 0 -_08191C34: .4byte 0x02022e1c -_08191C38: .4byte 0x02022e1e -_08191C3C: .4byte 0x0860d15c -_08191C40: .4byte 0x0203cd78 -_08191C44: .4byte 0x03005e00 -_08191C48: .4byte 0x02020630 -_08191C4C: .4byte sub_81908CC + 1 + .pool _08191C50: mov r3, r10 ldr r0, [r3] @@ -821470,7 +793577,7 @@ _08191C50: adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08191D08 + ldr r1, =sub_8190AC4 + 1 str r1, [r0] ldrb r1, [r3] lsls r0, r1, 4 @@ -821499,10 +793606,10 @@ _08191C96: cmp r6, 0x7 ble _08191BDC movs r6, 0x8 - ldr r2, _08191D0C + ldr r2, =0x0203cd78 mov r12, r2 - ldr r3, _08191D10 - ldr r1, _08191D14 + ldr r3, =0x02020630 + ldr r1, =0x03005e00 mov r0, r9 add r0, r8 lsls r0, 3 @@ -821524,7 +793631,7 @@ _08191CB4: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _08191D18 + ldr r1, =sub_81908CC + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -821553,11 +793660,7 @@ _08191CB4: strh r1, [r0, 0x34] b _08191D5C .align 2, 0 -_08191D08: .4byte sub_8190AC4 + 1 -_08191D0C: .4byte 0x0203cd78 -_08191D10: .4byte 0x02020630 -_08191D14: .4byte 0x03005e00 -_08191D18: .4byte sub_81908CC + 1 + .pool _08191D1C: mov r2, r12 ldr r0, [r2] @@ -821570,7 +793673,7 @@ _08191D1C: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _08191D64 + ldr r1, =sub_8190AC4 + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -821597,63 +793700,59 @@ _08191D5C: ble _08191CB4 b _08191FDA .align 2, 0 -_08191D64: .4byte sub_8190AC4 + 1 + .pool _08191D68: mov r0, r9 add r0, r8 lsls r0, 3 - ldr r4, _08191D94 + ldr r4, =0x03005e00 adds r0, r4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 beq _08191DA8 - ldr r0, _08191D98 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _08191D9C + ldr r0, =0x02022e16 strh r1, [r0] - ldr r2, _08191DA0 + ldr r2, =0x02022e18 movs r6, 0xFF lsls r6, 8 adds r0, r6, 0 strh r0, [r2] - ldr r0, _08191DA4 + ldr r0, =0x02022e1a strh r1, [r0] b _08191DBE .align 2, 0 -_08191D94: .4byte 0x03005e00 -_08191D98: .4byte 0x02022e14 -_08191D9C: .4byte 0x02022e16 -_08191DA0: .4byte 0x02022e18 -_08191DA4: .4byte 0x02022e1a + .pool _08191DA8: - ldr r1, _08191DF0 + ldr r1, =0x02022e14 movs r3, 0xFF lsls r3, 8 adds r0, r3, 0 strh r0, [r1] - ldr r0, _08191DF4 + ldr r0, =0x02022e16 strh r2, [r0] - ldr r0, _08191DF8 + ldr r0, =0x02022e18 strh r2, [r0] - ldr r0, _08191DFC + ldr r0, =0x02022e1a strh r2, [r0] _08191DBE: - ldr r0, _08191E00 + ldr r0, =0x0203cd78 ldr r2, [r0] ldrb r0, [r2, 0x10] cmp r0, 0x2 bne _08191E10 - ldr r1, _08191E04 + ldr r1, =0x02022e1c movs r4, 0x80 lsls r4, 1 adds r0, r4, 0 strh r0, [r1] - ldr r1, _08191E08 + ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] - ldr r1, _08191E0C + ldr r1, =0x03005e00 mov r0, r9 add r0, r8 lsls r0, 3 @@ -821665,22 +793764,15 @@ _08191DBE: bl sub_81924E0 b _08191E44 .align 2, 0 -_08191DF0: .4byte 0x02022e14 -_08191DF4: .4byte 0x02022e16 -_08191DF8: .4byte 0x02022e18 -_08191DFC: .4byte 0x02022e1a -_08191E00: .4byte 0x0203cd78 -_08191E04: .4byte 0x02022e1c -_08191E08: .4byte 0x02022e1e -_08191E0C: .4byte 0x03005e00 + .pool _08191E10: - ldr r1, _08191EB4 + ldr r1, =0x02022e1c movs r0, 0 strh r0, [r1] - ldr r1, _08191EB8 + ldr r1, =0x02022e1e movs r0, 0xA0 strh r0, [r1] - ldr r1, _08191EBC + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -821701,13 +793793,13 @@ _08191E10: bl sub_819314C _08191E44: movs r6, 0 - ldr r0, _08191EC0 + ldr r0, =0x0203cd78 mov r10, r0 - ldr r3, _08191EC4 + ldr r3, =0x02020630 mov r0, r9 add r0, r8 lsls r0, 3 - ldr r1, _08191EBC + ldr r1, =0x03005e00 adds r5, r0, r1 mov r12, r6 adds r4, r3, 0 @@ -821727,7 +793819,7 @@ _08191E5E: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08191EC8 + ldr r1, =sub_81908CC + 1 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -821758,12 +793850,7 @@ _08191E5E: strh r1, [r0, 0x34] b _08191F10 .align 2, 0 -_08191EB4: .4byte 0x02022e1c -_08191EB8: .4byte 0x02022e1e -_08191EBC: .4byte 0x03005e00 -_08191EC0: .4byte 0x0203cd78 -_08191EC4: .4byte 0x02020630 -_08191EC8: .4byte sub_81908CC + 1 + .pool _08191ECC: mov r2, r10 ldr r0, [r2] @@ -821776,7 +793863,7 @@ _08191ECC: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08191F80 + ldr r1, =sub_8190AC4 + 1 str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -821804,10 +793891,10 @@ _08191F10: cmp r6, 0x7 ble _08191E5E movs r6, 0x8 - ldr r2, _08191F84 + ldr r2, =0x0203cd78 mov r12, r2 - ldr r3, _08191F88 - ldr r1, _08191F8C + ldr r3, =0x02020630 + ldr r1, =0x03005e00 mov r0, r9 add r0, r8 lsls r0, 3 @@ -821829,7 +793916,7 @@ _08191F2E: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _08191F90 + ldr r1, =sub_81908CC + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -821858,11 +793945,7 @@ _08191F2E: strh r1, [r0, 0x34] b _08191FD4 .align 2, 0 -_08191F80: .4byte sub_8190AC4 + 1 -_08191F84: .4byte 0x0203cd78 -_08191F88: .4byte 0x02020630 -_08191F8C: .4byte 0x03005e00 -_08191F90: .4byte sub_81908CC + 1 + .pool _08191F94: mov r2, r12 ldr r0, [r2] @@ -821875,7 +793958,7 @@ _08191F94: adds r0, r1 lsls r0, 2 adds r0, r7 - ldr r1, _08191FF0 + ldr r1, =sub_8190AC4 + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -821904,7 +793987,7 @@ _08191FDA: mov r0, r9 add r0, r8 lsls r0, 3 - ldr r3, _08191FF4 + ldr r3, =0x03005e00 adds r0, r3 movs r2, 0 movs r1, 0x7 @@ -821913,14 +793996,13 @@ _08191FE8: strh r2, [r0, 0x12] b _08192202 .align 2, 0 -_08191FF0: .4byte sub_8190AC4 + 1 -_08191FF4: .4byte 0x03005e00 + .pool _08191FF8: mov r4, r8 lsls r0, r4, 2 add r0, r8 lsls r0, 3 - ldr r5, _08192028 + ldr r5, =0x03005e00 adds r1, r0, r5 ldrh r0, [r1, 0x12] adds r0, 0x1 @@ -821929,27 +794011,24 @@ _08191FF8: asrs r0, 16 cmp r0, 0x29 beq _08192100 - ldr r1, _0819202C + ldr r1, =0x02022e16 ldrh r0, [r1] subs r0, 0x4 strh r0, [r1] - ldr r1, _08192030 + ldr r1, =0x02022e1a ldrh r0, [r1] subs r0, 0x4 strh r0, [r1] - ldr r1, _08192034 + ldr r1, =0x02022e1e b _081920A4 .align 2, 0 -_08192028: .4byte 0x03005e00 -_0819202C: .4byte 0x02022e16 -_08192030: .4byte 0x02022e1a -_08192034: .4byte 0x02022e1e + .pool _08192038: mov r6, r8 lsls r0, r6, 2 add r0, r8 lsls r0, 3 - ldr r2, _08192068 + ldr r2, =0x03005e00 adds r1, r0, r2 ldrh r0, [r1, 0x12] adds r0, 0x1 @@ -821958,27 +794037,24 @@ _08192038: asrs r0, 16 cmp r0, 0x29 beq _08192100 - ldr r1, _0819206C + ldr r1, =0x02022e16 ldrh r0, [r1] adds r0, 0x4 strh r0, [r1] - ldr r1, _08192070 + ldr r1, =0x02022e1a ldrh r0, [r1] adds r0, 0x4 strh r0, [r1] - ldr r1, _08192074 + ldr r1, =0x02022e1e b _081920E8 .align 2, 0 -_08192068: .4byte 0x03005e00 -_0819206C: .4byte 0x02022e16 -_08192070: .4byte 0x02022e1a -_08192074: .4byte 0x02022e1e + .pool _08192078: mov r3, r8 lsls r0, r3, 2 add r0, r8 lsls r0, 3 - ldr r4, _081920AC + ldr r4, =0x03005e00 adds r1, r0, r4 ldrh r0, [r1, 0x12] adds r0, 0x1 @@ -821987,31 +794063,28 @@ _08192078: asrs r0, 16 cmp r0, 0x41 beq _08192100 - ldr r1, _081920B0 + ldr r1, =0x02022e14 ldrh r0, [r1] subs r0, 0x4 strh r0, [r1] - ldr r1, _081920B4 + ldr r1, =0x02022e18 ldrh r0, [r1] subs r0, 0x4 strh r0, [r1] - ldr r1, _081920B8 + ldr r1, =0x02022e1c _081920A4: ldrh r0, [r1] subs r0, 0x4 strh r0, [r1] b _08192202 .align 2, 0 -_081920AC: .4byte 0x03005e00 -_081920B0: .4byte 0x02022e14 -_081920B4: .4byte 0x02022e18 -_081920B8: .4byte 0x02022e1c + .pool _081920BC: mov r5, r8 lsls r0, r5, 2 add r0, r8 lsls r0, 3 - ldr r6, _081920F0 + ldr r6, =0x03005e00 adds r1, r0, r6 ldrh r0, [r1, 0x12] adds r0, 0x1 @@ -822020,38 +794093,35 @@ _081920BC: asrs r0, 16 cmp r0, 0x41 beq _08192100 - ldr r1, _081920F4 + ldr r1, =0x02022e14 ldrh r0, [r1] adds r0, 0x4 strh r0, [r1] - ldr r1, _081920F8 + ldr r1, =0x02022e18 ldrh r0, [r1] adds r0, 0x4 strh r0, [r1] - ldr r1, _081920FC + ldr r1, =0x02022e1c _081920E8: ldrh r0, [r1] adds r0, 0x4 strh r0, [r1] b _08192202 .align 2, 0 -_081920F0: .4byte 0x03005e00 -_081920F4: .4byte 0x02022e14 -_081920F8: .4byte 0x02022e18 -_081920FC: .4byte 0x02022e1c + .pool _08192100: movs r0, 0x2 strh r0, [r1, 0x8] b _08192202 _08192106: - ldr r0, _0819212C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08192202 movs r6, 0 - ldr r4, _08192130 + ldr r4, =0x0203cd78 _08192116: cmp r6, 0x1 bgt _08192134 @@ -822063,8 +794133,7 @@ _08192116: bl sub_818D8F0 b _0819214E .align 2, 0 -_0819212C: .4byte 0x02037fd4 -_08192130: .4byte 0x0203cd78 + .pool _08192134: ldr r0, [r4] adds r1, r0, r6 @@ -822075,7 +794144,7 @@ _08192134: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0819216C + ldr r1, =0x02020630 adds r0, r1 bl sub_80D2EF8 _0819214E: @@ -822083,7 +794152,7 @@ _0819214E: cmp r6, 0x7 ble _08192116 movs r6, 0x8 - ldr r4, _08192170 + ldr r4, =0x0203cd78 _08192158: cmp r6, 0x9 bgt _08192174 @@ -822095,8 +794164,7 @@ _08192158: bl sub_818D8F0 b _0819218E .align 2, 0 -_0819216C: .4byte 0x02020630 -_08192170: .4byte 0x0203cd78 + .pool _08192174: ldr r0, [r4] adds r1, r0, r6 @@ -822107,7 +794175,7 @@ _08192174: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081921B8 + ldr r1, =0x02020630 adds r0, r1 bl sub_80D2EF8 _0819218E: @@ -822115,7 +794183,7 @@ _0819218E: cmp r6, 0xF ble _08192158 bl sub_80D2F9C - ldr r4, _081921BC + ldr r4, =0x0203cd78 ldr r0, [r4] bl free movs r5, 0 @@ -822124,20 +794192,18 @@ _0819218E: mov r0, r9 cmp r0, 0 bne _081921C4 - ldr r0, _081921C0 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 b _081921FC .align 2, 0 -_081921B8: .4byte 0x02020630 -_081921BC: .4byte 0x0203cd78 -_081921C0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool _081921C4: - ldr r0, _08192214 + ldr r0, =sub_8194220 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r6, r0, 24 - ldr r2, _08192218 + ldr r2, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -822172,8 +794238,7 @@ _08192202: pop {r0} bx r0 .align 2, 0 -_08192214: .4byte sub_8194220 + 1 -_08192218: .4byte 0x03005e00 + .pool thumb_func_end sub_8190CD4 thumb_func_start sub_819221C @@ -822187,7 +794252,7 @@ sub_819221C: @ 819221C lsrs r0, 24 mov r9, r0 movs r7, 0 - ldr r2, _0819229C + ldr r2, =0x03005e00 lsls r0, 2 add r0, r9 lsls r0, 3 @@ -822201,17 +794266,17 @@ sub_819221C: @ 819221C adds r0, r2 movs r3, 0xA ldrsh r5, [r0, r3] - ldr r0, _081922A0 + ldr r0, =0x0860d080 adds r0, r5, r0 ldrb r0, [r0] mov r10, r0 - ldr r3, _081922A4 + ldr r3, =0x03005d90 ldr r0, [r3] - ldr r1, _081922A8 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] mov r8, r0 - ldr r1, _081922AC + ldr r1, =0x030022c0 ldrh r4, [r1, 0x2E] movs r0, 0x3 ands r0, r4 @@ -822235,7 +794300,7 @@ _08192280: ands r0, r4 cmp r0, 0 beq _081922BA - ldr r0, _081922B0 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 @@ -822245,12 +794310,7 @@ _08192280: movs r5, 0xF b _081922B6 .align 2, 0 -_0819229C: .4byte 0x03005e00 -_081922A0: .4byte 0x0860d080 -_081922A4: .4byte 0x03005d90 -_081922A8: .4byte 0x00000cb2 -_081922AC: .4byte 0x030022c0 -_081922B0: .4byte 0x0203cd78 + .pool _081922B4: subs r5, 0x1 _081922B6: @@ -822262,7 +794322,7 @@ _081922BA: ands r0, r1 cmp r0, 0 beq _081922E2 - ldr r0, _081922D8 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 @@ -822272,7 +794332,7 @@ _081922BA: movs r5, 0 b _081922DE .align 2, 0 -_081922D8: .4byte 0x0203cd78 + .pool _081922DC: adds r5, 0x1 _081922DE: @@ -822284,7 +794344,7 @@ _081922E2: ands r0, r1 cmp r0, 0 beq _08192304 - ldr r0, _08192300 + ldr r0, =0x0203cd78 ldr r1, [r0] ldrb r0, [r1, 0x10] cmp r0, 0 @@ -822294,26 +794354,26 @@ _081922E2: movs r7, 0x3 b _08192360 .align 2, 0 -_08192300: .4byte 0x0203cd78 + .pool _08192304: ldrh r1, [r2, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _08192360 - ldr r2, _0819238C + ldr r2, =0x03005d90 ldr r0, [r2] mov r3, r10 lsls r1, r3, 2 adds r0, r1 - ldr r2, _08192390 + ldr r2, =0x00000d25 adds r0, r2 ldrb r3, [r0] lsls r0, r3, 29 mov r12, r1 cmp r0, 0 bge _0819233C - ldr r0, _08192394 + ldr r0, =0x0203cd78 ldr r2, [r0] ldrb r4, [r2, 0x10] subs r1, r4, 0x1 @@ -822325,16 +794385,16 @@ _08192304: strb r0, [r2, 0x10] movs r7, 0x4 _0819233C: - ldr r3, _0819238C + ldr r3, =0x03005d90 ldr r0, [r3] add r0, r12 - ldr r1, _08192390 + ldr r1, =0x00000d25 adds r0, r1 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 blt _08192360 - ldr r0, _08192394 + ldr r0, =0x0203cd78 ldr r3, [r0] ldrb r1, [r3, 0x10] subs r0, r1, 0x1 @@ -822348,7 +794408,7 @@ _08192360: beq _08192366 b _081924A0 _08192366: - ldr r0, _08192394 + ldr r0, =0x0203cd78 ldr r3, [r0] ldrb r0, [r3, 0x10] cmp r0, 0 @@ -822356,9 +794416,9 @@ _08192366: lsls r1, r6, 2 adds r1, r6 lsls r1, 3 - ldr r2, _08192398 + ldr r2, =0x03005e00 adds r1, r2 - ldr r2, _0819239C + ldr r2, =0x0860d1a0 lsrs r0, r5, 31 adds r0, r5, r0 asrs r0, 1 @@ -822368,39 +794428,34 @@ _08192366: adds r0, r3 b _08192482 .align 2, 0 -_0819238C: .4byte 0x03005d90 -_08192390: .4byte 0x00000d25 -_08192394: .4byte 0x0203cd78 -_08192398: .4byte 0x03005e00 -_0819239C: .4byte 0x0860d1a0 + .pool _081923A0: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r3, _081923AC + ldr r3, =0x03005e00 adds r0, r3 b _0819249E .align 2, 0 -_081923AC: .4byte 0x03005e00 + .pool _081923B0: movs r0, 0x40 ands r0, r4 cmp r0, 0 beq _081923DE - ldr r0, _081923D0 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x1 bne _081923DE cmp r5, 0x10 bne _081923D8 - ldr r0, _081923D4 + ldr r0, =0x0860d19c add r0, r8 ldrb r5, [r0] b _081923DA .align 2, 0 -_081923D0: .4byte 0x0203cd78 -_081923D4: .4byte 0x0860d19c + .pool _081923D8: subs r5, 0x1 _081923DA: @@ -822412,12 +794467,12 @@ _081923DE: ands r0, r1 cmp r0, 0 beq _0819240E - ldr r0, _08192400 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0x1 bne _0819240E - ldr r0, _08192404 + ldr r0, =0x0860d19c add r0, r8 ldrb r0, [r0] cmp r5, r0 @@ -822425,8 +794480,7 @@ _081923DE: movs r5, 0x10 b _0819240A .align 2, 0 -_08192400: .4byte 0x0203cd78 -_08192404: .4byte 0x0860d19c + .pool _08192408: adds r5, 0x1 _0819240A: @@ -822438,7 +794492,7 @@ _0819240E: ands r0, r1 cmp r0, 0 beq _0819242C - ldr r0, _08192428 + ldr r0, =0x0203cd78 ldr r1, [r0] ldrb r0, [r1, 0x10] cmp r0, 0 @@ -822447,14 +794501,14 @@ _0819240E: subs r0, 0x1 b _08192444 .align 2, 0 -_08192428: .4byte 0x0203cd78 + .pool _0819242C: ldrh r1, [r2, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 beq _08192446 - ldr r0, _08192464 + ldr r0, =0x0203cd78 ldr r1, [r0] ldrb r0, [r1, 0x10] cmp r0, 0x1 @@ -822466,7 +794520,7 @@ _08192444: _08192446: cmp r7, 0x9 bne _081924A0 - ldr r0, _08192464 + ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r1, [r0, 0x10] cmp r1, 0 @@ -822474,24 +794528,22 @@ _08192446: lsls r1, r6, 2 adds r1, r6 lsls r1, 3 - ldr r2, _08192468 + ldr r2, =0x03005e00 adds r1, r2 - ldr r2, _0819246C + ldr r2, =0x0860d1c0 ldrb r0, [r0, 0x11] b _08192482 .align 2, 0 -_08192464: .4byte 0x0203cd78 -_08192468: .4byte 0x03005e00 -_0819246C: .4byte 0x0860d1c0 + .pool _08192470: cmp r1, 0x2 bne _08192494 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 - ldr r3, _0819248C + ldr r3, =0x03005e00 adds r1, r3 - ldr r2, _08192490 + ldr r2, =0x0860d1c0 ldrb r0, [r0, 0x12] _08192482: adds r0, r2 @@ -822499,13 +794551,12 @@ _08192482: strh r0, [r1, 0xA] b _081924A0 .align 2, 0 -_0819248C: .4byte 0x03005e00 -_08192490: .4byte 0x0860d1c0 + .pool _08192494: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081924DC + ldr r1, =0x03005e00 adds r0, r1 _0819249E: strh r5, [r0, 0xA] @@ -822516,7 +794567,7 @@ _081924A0: beq _081924CC movs r0, 0x5 bl audio_play - ldr r1, _081924DC + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -822541,7 +794592,7 @@ _081924CC: pop {r1} bx r1 .align 2, 0 -_081924DC: .4byte 0x03005e00 + .pool thumb_func_end sub_819221C thumb_func_start sub_81924E0 @@ -822569,12 +794620,12 @@ sub_81924E0: @ 81924E0 movs r0, 0x24 bl malloc_and_clear mov r8, r0 - ldr r0, _08192588 + ldr r0, =0x03005d90 ldr r1, [r0] ldr r3, [sp, 0x20] lsls r0, r3, 2 adds r0, r1, r0 - ldr r2, _0819258C + ldr r2, =0x00000d24 adds r0, r2 ldrh r0, [r0] lsls r0, 22 @@ -822612,7 +794663,7 @@ _08192556: ands r0, r2 cmp r0, 0 beq _08192564 - ldr r3, _08192590 + ldr r3, =0xffffff00 str r3, [sp, 0x2C] _08192564: movs r0, 0x10 @@ -822624,7 +794675,7 @@ _08192564: negs r3, r3 str r3, [sp, 0x30] _08192574: - ldr r0, _08192594 + ldr r0, =0x000003ff ldr r2, [sp, 0x24] cmp r2, r0 bne _08192598 @@ -822634,19 +794685,16 @@ _08192574: lsrs r0, 16 b _081925B6 .align 2, 0 -_08192588: .4byte 0x03005d90 -_0819258C: .4byte 0x00000d24 -_08192590: .4byte 0xffffff00 -_08192594: .4byte 0x000003ff + .pool _08192598: - ldr r0, _081925A8 + ldr r0, =0x000003fe ldr r3, [sp, 0x24] cmp r3, r0 bne _081925AC bl sub_8195910 b _081925B2 .align 2, 0 -_081925A8: .4byte 0x000003fe + .pool _081925AC: ldr r0, [sp, 0x24] bl sub_8162AA0 @@ -822661,11 +794709,11 @@ _081925B6: adds r1, r4, 0 adds r1, 0xC str r1, [sp] - ldr r1, _08192644 + ldr r1, =0x0000ffff str r1, [sp, 0x4] movs r1, 0x1 bl sub_818D8AC - ldr r1, _08192648 + ldr r1, =0x0203cd78 ldr r1, [r1] adds r1, r5 strb r0, [r1] @@ -822674,8 +794722,8 @@ _081925B6: ands r0, r4 cmp r0, 0 beq _081925FC - ldr r2, _0819264C - ldr r0, _08192648 + ldr r2, =0x02020630 + ldr r0, =0x0203cd78 ldr r0, [r0] adds r0, r5 ldrb r1, [r0] @@ -822702,79 +794750,70 @@ _081925FC: str r3, [sp, 0x40] ldr r4, [sp, 0x20] adds r0, r4 - ldr r6, _08192648 - ldr r2, _0819264C + ldr r6, =0x0203cd78 + ldr r2, =0x02020630 mov r10, r2 adds r4, r1, 0 lsls r5, r0, 1 movs r3, 0 mov r9, r3 _08192624: - ldr r0, _08192650 + ldr r0, =0x000003ff ldr r1, [sp, 0x24] cmp r1, r0 bne _08192660 - ldr r0, _08192654 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _08192658 + ldr r2, =0x00000d64 adds r0, r2 adds r0, r5 ldrh r0, [r0] - ldr r1, _0819265C + ldr r1, =0x0860d340 adds r1, r7, r1 ldrb r2, [r1] ldr r3, [sp, 0x2C] orrs r2, r3 b _081926B0 .align 2, 0 -_08192644: .4byte 0x0000ffff -_08192648: .4byte 0x0203cd78 -_0819264C: .4byte 0x02020630 -_08192650: .4byte 0x000003ff -_08192654: .4byte 0x03005d90 -_08192658: .4byte 0x00000d64 -_0819265C: .4byte 0x0860d340 + .pool _08192660: - ldr r0, _08192680 + ldr r0, =0x000003fe ldr r3, [sp, 0x24] cmp r3, r0 bne _08192690 - ldr r0, _08192684 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08192688 + ldr r1, =0x00000d64 adds r0, r1 adds r0, r5 ldrh r0, [r0] - ldr r1, _0819268C + ldr r1, =0x0860d340 adds r1, r7, r1 ldrb r2, [r1] ldr r3, [sp, 0x2C] orrs r2, r3 b _081926B0 .align 2, 0 -_08192680: .4byte 0x000003fe -_08192684: .4byte 0x03005d90 -_08192688: .4byte 0x00000d64 -_0819268C: .4byte 0x0860d340 + .pool _08192690: - ldr r0, _08192764 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r3, _08192768 + ldr r3, =0x00000d64 adds r0, r3 adds r0, r5 ldrh r1, [r0] - ldr r0, _0819276C + ldr r0, =0x0203bc8c ldr r0, [r0] lsls r1, 4 adds r1, r0 ldrh r0, [r1] - ldr r1, _08192770 + ldr r1, =0x0860d340 adds r1, r7, r1 ldrb r2, [r1] ldr r1, [sp, 0x2C] orrs r2, r1 _081926B0: - ldr r1, _08192774 + ldr r1, =0x0860d343 adds r1, r7, r1 ldrb r3, [r1] ldr r1, [sp, 0x30] @@ -822784,7 +794823,7 @@ _081926B0: str r1, [sp, 0x4] movs r1, 0x1 str r1, [sp, 0x8] - ldr r1, _08192778 + ldr r1, =sub_8190938 + 1 bl sub_80D2CC4 ldr r1, [r6] adds r1, r4 @@ -822856,32 +794895,25 @@ _0819270A: movs r0, 0xD0 strb r0, [r1, 0xD] movs r7, 0 - ldr r0, _0819277C + ldr r0, =0x000003ff ldr r4, [sp, 0x24] cmp r4, r0 bne _08192784 - ldr r0, _08192780 + ldr r0, =0x0831f5ca adds r0, 0x3C ldrb r5, [r0] b _081927A2 .align 2, 0 -_08192764: .4byte 0x03005d90 -_08192768: .4byte 0x00000d64 -_0819276C: .4byte 0x0203bc8c -_08192770: .4byte 0x0860d340 -_08192774: .4byte 0x0860d343 -_08192778: .4byte sub_8190938 + 1 -_0819277C: .4byte 0x000003ff -_08192780: .4byte 0x0831f5ca + .pool _08192784: - ldr r0, _08192794 + ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 bne _08192798 bl sub_8195924 b _0819279E .align 2, 0 -_08192794: .4byte 0x000003fe + .pool _08192798: ldr r0, [sp, 0x24] bl sub_8162BD8 @@ -822889,7 +794921,7 @@ _0819279E: lsls r0, 24 lsrs r5, r0, 24 _081927A2: - ldr r2, _081927F0 + ldr r2, =0x0830fcd4 movs r0, 0xD adds r1, r5, 0 muls r1, r0 @@ -822898,7 +794930,7 @@ _081927A2: ldrb r0, [r0] cmp r0, 0xFF beq _081927CA - ldr r3, _081927F4 + ldr r3, =0x02021cc4 adds r0, r1, r2 adds r2, r7, r0 _081927BA: @@ -822911,7 +794943,7 @@ _081927BA: cmp r0, 0xFF bne _081927BA _081927CA: - ldr r5, _081927F4 + ldr r5, =0x02021cc4 adds r1, r7, r5 movs r0, 0 strb r0, [r1] @@ -822919,26 +794951,23 @@ _081927CA: adds r0, r5 movs r1, 0xFF strb r1, [r0] - ldr r0, _081927F8 + ldr r0, =0x000003ff ldr r2, [sp, 0x24] cmp r2, r0 bne _08192800 - ldr r0, _081927FC + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r5, 0 bl gf_strcat b _08192836 .align 2, 0 -_081927F0: .4byte 0x0830fcd4 -_081927F4: .4byte 0x02021cc4 -_081927F8: .4byte 0x000003ff -_081927FC: .4byte 0x03005d90 + .pool _08192800: - ldr r0, _0819281C + ldr r0, =0x000003fe ldr r3, [sp, 0x24] cmp r3, r0 bne _08192824 - ldr r4, _08192820 + ldr r4, =0x02021dc4 adds r0, r4, 0 bl sub_8195938 adds r0, r5, 0 @@ -822946,10 +794975,9 @@ _08192800: bl gf_strcat b _08192836 .align 2, 0 -_0819281C: .4byte 0x000003fe -_08192820: .4byte 0x02021dc4 + .pool _08192824: - ldr r4, _081928A8 + ldr r4, =0x02021dc4 ldr r1, [sp, 0x24] adds r0, r4, 0 bl sub_8195898 @@ -822959,7 +794987,7 @@ _08192824: _08192836: add r0, sp, 0xC ldrb r0, [r0, 0x5] - ldr r4, _081928AC + ldr r4, =0x02021cc4 add r1, sp, 0xC ldrb r3, [r1, 0xA] adds r1, r4, 0 @@ -822996,54 +795024,47 @@ _08192836: movs r3, 0xB mov r10, r3 _0819288A: - ldr r0, _081928B0 + ldr r0, =0x0860d346 adds r0, r7, r0 ldrb r0, [r0] strb r0, [r6, 0x9] - ldr r0, _081928B4 + ldr r0, =0x000003ff ldr r4, [sp, 0x24] cmp r4, r0 bne _081928C0 - ldr r0, _081928B8 + ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r7, 1 add r0, r9 - ldr r2, _081928BC + ldr r2, =0x00000d64 adds r1, r2 b _081928FA .align 2, 0 -_081928A8: .4byte 0x02021dc4 -_081928AC: .4byte 0x02021cc4 -_081928B0: .4byte 0x0860d346 -_081928B4: .4byte 0x000003ff -_081928B8: .4byte 0x03005d90 -_081928BC: .4byte 0x00000d64 + .pool _081928C0: - ldr r0, _081928D8 + ldr r0, =0x000003fe ldr r4, [sp, 0x24] cmp r4, r0 bne _081928E4 - ldr r0, _081928DC + ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r7, 1 add r0, r9 - ldr r2, _081928E0 + ldr r2, =0x00000d64 adds r1, r2 b _081928FA .align 2, 0 -_081928D8: .4byte 0x000003fe -_081928DC: .4byte 0x03005d90 -_081928E0: .4byte 0x00000d64 + .pool _081928E4: - ldr r4, _08192920 + ldr r4, =0x03005d90 ldr r1, [r4] lsls r0, r7, 1 add r0, r9 - ldr r2, _08192924 + ldr r2, =0x00000d64 adds r1, r2 adds r1, r0 ldrh r1, [r1] - ldr r0, _08192928 + ldr r0, =0x0203bc8c ldr r0, [r0] lsls r1, 4 _081928FA: @@ -823052,7 +795073,7 @@ _081928FA: mov r3, r10 muls r3, r0 adds r0, r3, 0 - ldr r1, _0819292C + ldr r1, =0x083185c8 adds r0, r1 str r0, [sp, 0xC] adds r0, r7, 0x1 @@ -823066,10 +795087,7 @@ _081928FA: strb r0, [r6, 0x8] b _08192932 .align 2, 0 -_08192920: .4byte 0x03005d90 -_08192924: .4byte 0x00000d64 -_08192928: .4byte 0x0203bc8c -_0819292C: .4byte 0x083185c8 + .pool _08192930: strb r1, [r6, 0x8] _08192932: @@ -823096,18 +795114,17 @@ _08192932: adds r0, r4, 0 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _08192978 + ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 bne _08192980 - ldr r0, _0819297C + ldr r0, =0x0860d1d0 ldr r0, [r0, 0x40] b _0819298A .align 2, 0 -_08192978: .4byte 0x000003fe -_0819297C: .4byte 0x0860d1d0 + .pool _08192980: - ldr r0, _081929F4 + ldr r0, =0x0860d1d0 ldr r2, [sp, 0x20] lsls r1, r2, 2 adds r1, r0 @@ -823129,7 +795146,7 @@ _0819298A: movs r1, 0 bl remo_copy movs r7, 0 - ldr r3, _081929F8 + ldr r3, =0x0860b358 _081929AE: movs r5, 0 adds r4, r7, 0x1 @@ -823144,7 +795161,7 @@ _081929BA: mov r4, r8 mov r9, r2 _081929C4: - ldr r0, _081929FC + ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 bne _08192A00 @@ -823167,26 +795184,22 @@ _081929C4: ldr r2, [sp, 0x48] b _08192A58 .align 2, 0 -_081929F4: .4byte 0x0860d1d0 -_081929F8: .4byte 0x0860b358 -_081929FC: .4byte 0x000003fe + .pool _08192A00: - ldr r0, _08192A14 + ldr r0, =0x000003ff ldr r1, [sp, 0x24] cmp r1, r0 bne _08192A20 - ldr r0, _08192A18 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08192A1C + ldr r1, =0x00000efc adds r0, r1 add r0, r9 b _08192A48 .align 2, 0 -_08192A14: .4byte 0x000003ff -_08192A18: .4byte 0x03005d90 -_08192A1C: .4byte 0x00000efc + .pool _08192A20: - ldr r0, _08192B08 + ldr r0, =0x03005d90 ldr r0, [r0] mov r12, r0 ldr r0, [sp, 0x3C] @@ -823196,11 +795209,11 @@ _08192A20: lsls r0, 1 ldr r1, [sp, 0x34] adds r0, r1, r0 - ldr r1, _08192B0C + ldr r1, =0x00000d64 add r1, r12 adds r1, r0 ldrh r0, [r1] - ldr r1, _08192B10 + ldr r1, =0x0203bc8c ldr r1, [r1] lsls r0, 4 adds r0, r1 @@ -823228,9 +795241,9 @@ _08192A58: cmp r7, 0x2 ble _081929AE movs r7, 0 - ldr r2, _08192B14 + ldr r2, =0x0860d214 mov r9, r2 - ldr r3, _08192B18 + ldr r3, =0x0860c988 mov r10, r3 _08192A78: movs r4, 0 @@ -823285,7 +795298,7 @@ _08192AD0: cmp r0, r8 bge _08192AD0 ldr r2, [sp, 0x24] - ldr r3, _08192B1C + ldr r3, =0xfffffc02 adds r0, r2, r3 cmp r0, 0x1 bls _08192AE4 @@ -823299,7 +795312,7 @@ _08192AEA: mov r4, r8 mov r6, r9 _08192AF0: - ldr r0, _08192B20 + ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 bne _08192B24 @@ -823311,19 +795324,13 @@ _08192AF0: lsrs r0, 24 b _08192B34 .align 2, 0 -_08192B08: .4byte 0x03005d90 -_08192B0C: .4byte 0x00000d64 -_08192B10: .4byte 0x0203bc8c -_08192B14: .4byte 0x0860d214 -_08192B18: .4byte 0x0860c988 -_08192B1C: .4byte 0xfffffc02 -_08192B20: .4byte 0x000003fe + .pool _08192B24: - ldr r0, _08192B64 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r7, 4 adds r1, r5, r1 - ldr r2, _08192B68 + ldr r2, =0x00000f04 adds r0, r2 adds r0, r1 ldrb r0, [r0] @@ -823341,7 +795348,7 @@ _08192B34: movs r5, 0 mov r4, r8 _08192B4C: - ldr r0, _08192B6C + ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 bne _08192B70 @@ -823352,19 +795359,17 @@ _08192B4C: lsrs r2, r0, 24 b _08192B7E .align 2, 0 -_08192B64: .4byte 0x03005d90 -_08192B68: .4byte 0x00000f04 -_08192B6C: .4byte 0x000003fe + .pool _08192B70: - ldr r0, _08192BA8 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r7, 4 adds r0, r1 - ldr r3, _08192BAC + ldr r3, =0x00000f0a adds r0, r3 ldrb r2, [r0] _08192B7E: - ldr r1, _08192BB0 + ldr r1, =0x0831e818 lsls r0, r2, 2 adds r0, r2 adds r0, r5, r0 @@ -823385,9 +795390,7 @@ _08192B7E: strh r1, [r4, 0xE] b _08192BDC .align 2, 0 -_08192BA8: .4byte 0x03005d90 -_08192BAC: .4byte 0x00000f0a -_08192BB0: .4byte 0x0831e818 + .pool _08192BB4: cmp r0, 0 bge _08192BD4 @@ -823449,7 +795452,7 @@ _08192C0C: bge _08192C0C b _08192D70 _08192C24: - ldr r4, _08192CF4 + ldr r4, =0x0203bc8c mov r10, r4 ldr r1, [sp, 0x3C] ldr r2, [sp, 0x20] @@ -823458,9 +795461,9 @@ _08192C24: mov r9, r0 movs r7, 0x2 _08192C34: - ldr r3, _08192CF8 + ldr r3, =0x03005d90 ldr r0, [r3] - ldr r4, _08192CFC + ldr r4, =0x00000d64 adds r0, r4 add r0, r9 ldrh r0, [r0] @@ -823492,9 +795495,9 @@ _08192C60: adds r1, r6, 0 bl __divsi3 adds r6, r0, 0 - ldr r3, _08192CF8 + ldr r3, =0x03005d90 ldr r0, [r3] - ldr r4, _08192CFC + ldr r4, =0x00000d64 adds r0, r4 add r0, r9 ldrh r0, [r0] @@ -823526,9 +795529,9 @@ _08192C9C: movs r5, 0 mov r4, r8 _08192CB4: - ldr r1, _08192CF8 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r2, _08192CFC + ldr r2, =0x00000d64 adds r0, r2 add r0, r9 ldrh r0, [r0] @@ -823540,7 +795543,7 @@ _08192CB4: lsls r0, r2, 2 adds r0, r2 adds r0, r5, r0 - ldr r1, _08192D00 + ldr r1, =0x0831e818 adds r0, r1 ldrb r0, [r0] lsls r0, 24 @@ -823558,10 +795561,7 @@ _08192CB4: strh r1, [r4, 0xE] b _08192D2C .align 2, 0 -_08192CF4: .4byte 0x0203bc8c -_08192CF8: .4byte 0x03005d90 -_08192CFC: .4byte 0x00000d64 -_08192D00: .4byte 0x0831e818 + .pool _08192D04: cmp r0, 0 bge _08192D24 @@ -823760,7 +795760,7 @@ _08192E64: ble _08192D7C cmp r7, 0x2 bne _08192E8C - ldr r0, _08192E88 + ldr r0, =0x0860d349 mov r4, r8 movs r1, 0xC ldrsh r2, [r4, r1] @@ -823773,7 +795773,7 @@ _08192E64: adds r7, r1, r0 b _08192ED2 .align 2, 0 -_08192E88: .4byte 0x0860d349 + .pool _08192E8C: cmp r7, 0x1 bne _08192E9C @@ -823786,7 +795786,7 @@ _08192E8C: _08192E9C: cmp r5, 0x2 bne _08192EC0 - ldr r0, _08192EBC + ldr r0, =0x0860d349 mov r3, r8 movs r4, 0x10 ldrsh r2, [r3, r4] @@ -823801,7 +795801,7 @@ _08192E9C: adds r7, 0x15 b _08192ED2 .align 2, 0 -_08192EBC: .4byte 0x0860d349 + .pool _08192EC0: cmp r5, 0x1 bne _08192ED0 @@ -823815,7 +795815,7 @@ _08192ED0: movs r7, 0x2A _08192ED2: lsls r0, r7, 2 - ldr r3, _08192F04 + ldr r3, =0x0860d294 adds r0, r3 ldr r0, [r0] str r0, [sp, 0xC] @@ -823837,7 +795837,7 @@ _08192ED2: pop {r0} bx r0 .align 2, 0 -_08192F04: .4byte 0x0860d294 + .pool thumb_func_end sub_81924E0 thumb_func_start sub_8192F08 @@ -823854,7 +795854,7 @@ sub_8192F08: @ 8192F08 movs r0, 0 str r0, [sp, 0x4] mov r8, r0 - ldr r2, _08192F7C + ldr r2, =0x0860d3c4 lsls r0, r7, 1 adds r0, r7 adds r1, r0, r2 @@ -823866,19 +795866,19 @@ sub_8192F08: @ 8192F08 adds r3, r2, 0 cmp r6, r0 bge _08192FD4 - ldr r5, _08192F80 - ldr r1, _08192F84 + ldr r5, =0x03005d90 + ldr r1, =0x000003ff mov r10, r1 - ldr r2, _08192F88 + ldr r2, =0x000003fe mov r9, r2 _08192F42: - ldr r0, _08192F8C + ldr r0, =0x0860d3b4 adds r0, r6, r0 ldrb r4, [r0] ldr r0, [r5] lsls r1, r4, 2 adds r0, r1 - ldr r2, _08192F90 + ldr r2, =0x00000d25 adds r0, r2 ldrb r0, [r0] lsls r0, 29 @@ -823889,43 +795889,36 @@ _08192F42: strb r4, [r0] ldr r2, [r5] adds r0, r2, r1 - ldr r1, _08192F94 + ldr r1, =0x00000d24 adds r0, r1 ldrh r0, [r0] lsls r1, r0, 22 lsrs r0, r1, 22 cmp r0, r10 bne _08192F9C - ldr r0, _08192F98 + ldr r0, =0x02021cc4 adds r1, r2, 0 bl gf_strcpy b _08192FB8 .align 2, 0 -_08192F7C: .4byte 0x0860d3c4 -_08192F80: .4byte 0x03005d90 -_08192F84: .4byte 0x000003ff -_08192F88: .4byte 0x000003fe -_08192F8C: .4byte 0x0860d3b4 -_08192F90: .4byte 0x00000d25 -_08192F94: .4byte 0x00000d24 -_08192F98: .4byte 0x02021cc4 + .pool _08192F9C: lsrs r0, r1, 22 cmp r0, r9 bne _08192FB0 - ldr r0, _08192FAC + ldr r0, =0x02021cc4 bl sub_8195938 b _08192FB8 .align 2, 0 -_08192FAC: .4byte 0x02021cc4 + .pool _08192FB0: lsrs r1, 22 - ldr r0, _08192FE0 + ldr r0, =0x02021cc4 bl sub_8195898 _08192FB8: movs r2, 0x1 add r8, r2 - ldr r3, _08192FE4 + ldr r3, =0x0860d3c4 _08192FBE: adds r6, 0x1 lsls r1, r7, 1 @@ -823945,8 +795938,7 @@ _08192FD4: movs r0, 0 b _0819313C .align 2, 0 -_08192FE0: .4byte 0x02021cc4 -_08192FE4: .4byte 0x0860d3c4 + .pool _08192FE8: mov r12, r3 lsls r3, r7, 1 @@ -823964,12 +795956,12 @@ _08192FE8: blt _08193006 b _08193126 _08193006: - ldr r5, _081930A8 + ldr r5, =0x03005d90 mov r10, r5 - ldr r0, _081930AC + ldr r0, =0x00000d25 mov r9, r0 _0819300E: - ldr r0, _081930B0 + ldr r0, =0x0860d3b4 adds r0, r6, r0 ldrb r4, [r0] mov r1, r10 @@ -824017,9 +796009,9 @@ _0819300E: ldrh r1, [r0] movs r0, 0xD muls r1, r0 - ldr r0, _081930B4 + ldr r0, =0x0831977c adds r1, r0 - ldr r0, _081930B8 + ldr r0, =0x02021dc4 bl gf_strcpy mov r2, r10 ldr r1, [r2] @@ -824045,47 +796037,40 @@ _0819300E: str r1, [sp, 0x4] b _08193100 .align 2, 0 -_081930A8: .4byte 0x03005d90 -_081930AC: .4byte 0x00000d25 -_081930B0: .4byte 0x0860d3b4 -_081930B4: .4byte 0x0831977c -_081930B8: .4byte 0x02021dc4 + .pool _081930BC: - ldr r5, _081930D4 + ldr r5, =0x00000d24 adds r0, r2, r5 ldrh r0, [r0] lsls r1, r0, 22 - ldr r0, _081930D8 + ldr r0, =0xffc00000 cmp r1, r0 bne _081930E0 - ldr r0, _081930DC + ldr r0, =0x02021cc4 adds r1, r3, 0 bl gf_strcpy b _08193100 .align 2, 0 -_081930D4: .4byte 0x00000d24 -_081930D8: .4byte 0xffc00000 -_081930DC: .4byte 0x02021cc4 + .pool _081930E0: - ldr r0, _081930F0 + ldr r0, =0xff800000 cmp r1, r0 bne _081930F8 - ldr r0, _081930F4 + ldr r0, =0x02021cc4 bl sub_8195938 b _08193100 .align 2, 0 -_081930F0: .4byte 0xff800000 -_081930F4: .4byte 0x02021cc4 + .pool _081930F8: lsrs r1, 22 - ldr r0, _08193130 + ldr r0, =0x02021cc4 bl sub_8195898 _08193100: mov r0, r8 cmp r0, 0x2 beq _08193126 adds r6, 0x1 - ldr r1, _08193134 + ldr r1, =0x0860d3c4 mov r12, r1 ldr r3, [sp, 0x8] adds r1, r3, r7 @@ -824107,8 +796092,7 @@ _08193126: adds r0, 0x1 b _0819313C .align 2, 0 -_08193130: .4byte 0x02021cc4 -_08193134: .4byte 0x0860d3c4 + .pool _08193138: ldr r0, [sp, 0x4] adds r0, 0x2 @@ -824177,7 +796161,7 @@ _081931A4: ands r0, r1 cmp r0, 0 beq _081931B2 - ldr r2, _08193284 + ldr r2, =0xffffff00 str r2, [sp, 0x40] _081931B2: movs r0, 0x10 @@ -824189,7 +796173,7 @@ _081931B2: negs r0, r0 str r0, [sp, 0x44] _081931C2: - ldr r4, _08193288 + ldr r4, =0x0203cd78 ldr r1, [r4] adds r1, 0x11 adds r0, r6, 0 @@ -824244,9 +796228,9 @@ _081931C2: ldr r0, [r4] adds r0, 0x11 mov r12, r0 - ldr r0, _0819328C + ldr r0, =0x03005d90 ldr r4, [r0] - ldr r0, _08193290 + ldr r0, =0x0860d3c6 movs r3, 0 adds r1, r6 adds r1, r0 @@ -824262,7 +796246,7 @@ _08193240: adds r1, r3, r7 lsls r0, 2 adds r0, r4, r0 - ldr r7, _08193294 + ldr r7, =0x00000d24 adds r0, r7 ldrh r0, [r0] lsls r0, 22 @@ -824271,7 +796255,7 @@ _08193240: ldr r0, [r2] lsls r0, 2 adds r0, r4, r0 - ldr r1, _08193298 + ldr r1, =0x00000d25 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 27 @@ -824286,12 +796270,7 @@ _08193240: movs r0, 0x1 b _081932A2 .align 2, 0 -_08193284: .4byte 0xffffff00 -_08193288: .4byte 0x0203cd78 -_0819328C: .4byte 0x03005d90 -_08193290: .4byte 0x0860d3c6 -_08193294: .4byte 0x00000d24 -_08193298: .4byte 0x00000d25 + .pool _0819329C: ldr r7, [sp, 0x50] adds r1, r3, r7 @@ -824303,10 +796282,10 @@ _081932A2: cmp r5, 0x1 ble _08193240 ldr r1, [sp, 0x24] - ldr r0, _081932CC + ldr r0, =0x000003ff cmp r1, r0 bne _081932D4 - ldr r0, _081932D0 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] bl sub_806F000 @@ -824318,16 +796297,15 @@ _081932A2: str r1, [sp] b _081932F8 .align 2, 0 -_081932CC: .4byte 0x000003ff -_081932D0: .4byte 0x03005d90 + .pool _081932D4: - ldr r0, _081932E0 + ldr r0, =0x000003fe cmp r1, r0 bne _081932E4 bl sub_8195910 b _081932EC .align 2, 0 -_081932E0: .4byte 0x000003fe + .pool _081932E4: lsls r0, r1, 16 lsrs r0, 16 @@ -824340,11 +796318,11 @@ _081932EC: mov r7, r10 str r7, [sp] _081932F8: - ldr r1, _08193374 + ldr r1, =0x0000ffff str r1, [sp, 0x4] movs r1, 0x1 bl sub_818D8AC - ldr r1, _08193378 + ldr r1, =0x0203cd78 ldr r1, [r1] ldr r2, [sp, 0x3C] adds r1, r2 @@ -824354,8 +796332,8 @@ _081932F8: ands r0, r3 cmp r0, 0 beq _08193334 - ldr r2, _0819337C - ldr r0, _08193378 + ldr r2, =0x02020630 + ldr r0, =0x0203cd78 ldr r0, [r0] ldr r7, [sp, 0x3C] adds r0, r7 @@ -824373,8 +796351,8 @@ _08193334: ldr r0, [sp, 0x2C] cmp r0, 0 beq _0819335A - ldr r2, _0819337C - ldr r0, _08193378 + ldr r2, =0x02020630 + ldr r0, =0x0203cd78 ldr r0, [r0] ldr r1, [sp, 0x3C] adds r0, r1 @@ -824392,10 +796370,10 @@ _08193334: _0819335A: ldr r2, [sp, 0x4C] ldr r1, [r2, 0x4] - ldr r0, _08193380 + ldr r0, =0x000003ff cmp r1, r0 bne _08193388 - ldr r0, _08193384 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] bl sub_806F000 @@ -824403,13 +796381,9 @@ _0819335A: lsrs r0, 16 b _081933B0 .align 2, 0 -_08193374: .4byte 0x0000ffff -_08193378: .4byte 0x0203cd78 -_0819337C: .4byte 0x02020630 -_08193380: .4byte 0x000003ff -_08193384: .4byte 0x03005d90 + .pool _08193388: - ldr r0, _081933A0 + ldr r0, =0x000003fe cmp r1, r0 bne _081933A4 bl sub_8195910 @@ -824421,7 +796395,7 @@ _08193388: str r1, [sp] b _081933B8 .align 2, 0 -_081933A0: .4byte 0x000003fe + .pool _081933A4: lsls r0, r1, 16 lsrs r0, 16 @@ -824434,11 +796408,11 @@ _081933B0: ldr r7, [sp, 0x74] str r7, [sp] _081933B8: - ldr r1, _0819344C + ldr r1, =0x0000ffff str r1, [sp, 0x4] movs r1, 0x1 bl sub_818D8AC - ldr r1, _08193450 + ldr r1, =0x0203cd78 ldr r1, [r1] add r1, r9 strb r0, [r1] @@ -824447,8 +796421,8 @@ _081933B8: ands r0, r1 cmp r0, 0 beq _081933F0 - ldr r2, _08193454 - ldr r0, _08193450 + ldr r2, =0x02020630 + ldr r0, =0x0203cd78 ldr r0, [r0] add r0, r9 ldrb r1, [r0] @@ -824466,8 +796440,8 @@ _081933F0: ldr r0, [r2, 0x4] cmp r0, 0 beq _08193416 - ldr r2, _08193454 - ldr r0, _08193450 + ldr r2, =0x02020630 + ldr r0, =0x0203cd78 ldr r0, [r0] add r0, r9 ldrb r1, [r0] @@ -824487,80 +796461,73 @@ _08193416: lsls r3, 2 str r3, [sp, 0x70] mov r8, r5 - ldr r6, _08193450 - ldr r7, _08193454 + ldr r6, =0x0203cd78 + ldr r7, =0x02020630 ldr r4, [sp, 0x54] mov r9, r5 movs r0, 0x1 mov r10, r0 _0819342C: ldr r1, [sp, 0x24] - ldr r0, _08193458 + ldr r0, =0x000003ff cmp r1, r0 bne _08193464 - ldr r0, _0819345C + ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, [sp, 0x1C] lsls r0, r1, 1 adds r0, r1 lsls r0, 1 add r0, r9 - ldr r1, _08193460 + ldr r1, =0x00000d64 adds r2, r1 adds r2, r0 ldrh r0, [r2] b _081934B0 .align 2, 0 -_0819344C: .4byte 0x0000ffff -_08193450: .4byte 0x0203cd78 -_08193454: .4byte 0x02020630 -_08193458: .4byte 0x000003ff -_0819345C: .4byte 0x03005d90 -_08193460: .4byte 0x00000d64 + .pool _08193464: - ldr r0, _08193484 + ldr r0, =0x000003fe cmp r1, r0 bne _08193490 - ldr r0, _08193488 + ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, [sp, 0x1C] lsls r0, r1, 1 adds r0, r1 lsls r0, 1 add r0, r9 - ldr r1, _0819348C + ldr r1, =0x00000d64 adds r2, r1 adds r2, r0 ldrh r0, [r2] b _081934B0 .align 2, 0 -_08193484: .4byte 0x000003fe -_08193488: .4byte 0x03005d90 -_0819348C: .4byte 0x00000d64 + .pool _08193490: - ldr r0, _08193588 + ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, [sp, 0x1C] lsls r0, r1, 1 adds r0, r1 lsls r0, 1 add r0, r9 - ldr r1, _0819358C + ldr r1, =0x00000d64 adds r2, r1 adds r2, r0 ldrh r1, [r2] - ldr r0, _08193590 + ldr r0, =0x0203bc8c ldr r0, [r0] lsls r1, 4 adds r1, r0 ldrh r0, [r1] _081934B0: - ldr r1, _08193594 + ldr r1, =0x0860d3a8 adds r1, r5, r1 ldrb r2, [r1] ldr r3, [sp, 0x40] orrs r2, r3 - ldr r1, _08193598 + ldr r1, =0x0860d3ab adds r1, r5, r1 ldrb r3, [r1] ldr r1, [sp, 0x44] @@ -824570,7 +796537,7 @@ _081934B0: str r1, [sp, 0x4] mov r1, r10 str r1, [sp, 0x8] - ldr r1, _0819359C + ldr r1, =sub_8190938 + 1 bl sub_80D2CC4 ldr r1, [r6] adds r1, r4 @@ -824641,8 +796608,8 @@ _08193548: b _0819342C _08193556: movs r5, 0 - ldr r6, _081935A0 - ldr r7, _081935A4 + ldr r6, =0x0203cd78 + ldr r7, =0x02020630 mov r8, r7 ldr r4, [sp, 0x5C] mov r9, r5 @@ -824650,10 +796617,10 @@ _08193556: _08193564: ldr r0, [sp, 0x4C] ldr r1, [r0, 0x4] - ldr r0, _081935A8 + ldr r0, =0x000003ff cmp r1, r0 bne _081935AC - ldr r0, _08193588 + ldr r0, =0x03005d90 ldr r2, [r0] ldr r3, [sp, 0x48] ldr r1, [r3, 0x4] @@ -824661,26 +796628,18 @@ _08193564: adds r0, r1 lsls r0, 1 add r0, r9 - ldr r1, _0819358C + ldr r1, =0x00000d64 adds r2, r1 adds r2, r0 ldrh r0, [r2] b _081935FA .align 2, 0 -_08193588: .4byte 0x03005d90 -_0819358C: .4byte 0x00000d64 -_08193590: .4byte 0x0203bc8c -_08193594: .4byte 0x0860d3a8 -_08193598: .4byte 0x0860d3ab -_0819359C: .4byte sub_8190938 + 1 -_081935A0: .4byte 0x0203cd78 -_081935A4: .4byte 0x02020630 -_081935A8: .4byte 0x000003ff + .pool _081935AC: - ldr r0, _081935CC + ldr r0, =0x000003fe cmp r1, r0 bne _081935D8 - ldr r0, _081935D0 + ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, [sp, 0x48] ldr r1, [r0, 0x4] @@ -824688,17 +796647,15 @@ _081935AC: adds r0, r1 lsls r0, 1 add r0, r9 - ldr r1, _081935D4 + ldr r1, =0x00000d64 adds r2, r1 adds r2, r0 ldrh r0, [r2] b _081935FA .align 2, 0 -_081935CC: .4byte 0x000003fe -_081935D0: .4byte 0x03005d90 -_081935D4: .4byte 0x00000d64 + .pool _081935D8: - ldr r0, _08193734 + ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, [sp, 0x48] ldr r1, [r0, 0x4] @@ -824706,22 +796663,22 @@ _081935D8: adds r0, r1 lsls r0, 1 add r0, r9 - ldr r1, _08193738 + ldr r1, =0x00000d64 adds r2, r1 adds r2, r0 ldrh r1, [r2] - ldr r0, _0819373C + ldr r0, =0x0203bc8c ldr r0, [r0] lsls r1, 4 adds r1, r0 ldrh r0, [r1] _081935FA: - ldr r1, _08193740 + ldr r1, =0x0860d3ae adds r1, r5, r1 ldrb r2, [r1] ldr r3, [sp, 0x40] orrs r2, r3 - ldr r1, _08193744 + ldr r1, =0x0860d3b1 adds r1, r5, r1 ldrb r3, [r1] ldr r1, [sp, 0x44] @@ -824730,7 +796687,7 @@ _081935FA: str r7, [sp, 0x4] movs r1, 0x1 str r1, [sp, 0x8] - ldr r1, _08193748 + ldr r1, =sub_8190938 + 1 bl sub_80D2CC4 ldr r1, [r6] adds r1, r4 @@ -824832,8 +796789,8 @@ _081936A0: adds r1, r2, 0 movs r0, 0xD0 strb r0, [r1, 0xD] - ldr r4, _0819374C - ldr r0, _08193750 + ldr r4, =0x02021fc4 + ldr r0, =0x0860d38c ldr r7, [sp, 0x70] adds r0, r7, r0 ldr r1, [r0] @@ -824862,37 +796819,27 @@ _081936A0: movs r2, 0 bl remo_copy ldr r1, [sp, 0x24] - ldr r0, _08193754 + ldr r0, =0x000003ff cmp r1, r0 bne _0819375C - ldr r0, _08193758 - ldr r1, _08193734 + ldr r0, =0x02021cc4 + ldr r1, =0x03005d90 ldr r1, [r1] bl gf_strcpy b _0819377E .align 2, 0 -_08193734: .4byte 0x03005d90 -_08193738: .4byte 0x00000d64 -_0819373C: .4byte 0x0203bc8c -_08193740: .4byte 0x0860d3ae -_08193744: .4byte 0x0860d3b1 -_08193748: .4byte sub_8190938 + 1 -_0819374C: .4byte 0x02021fc4 -_08193750: .4byte 0x0860d38c -_08193754: .4byte 0x000003ff -_08193758: .4byte 0x02021cc4 + .pool _0819375C: - ldr r0, _0819376C + ldr r0, =0x000003fe cmp r1, r0 bne _08193774 - ldr r0, _08193770 + ldr r0, =0x02021cc4 bl sub_8195938 b _0819377E .align 2, 0 -_0819376C: .4byte 0x000003fe -_08193770: .4byte 0x02021cc4 + .pool _08193774: - ldr r0, _081937D8 + ldr r0, =0x02021cc4 lsls r1, 16 lsrs r1, 16 bl sub_8195898 @@ -824901,7 +796848,7 @@ _0819377E: movs r4, 0x2 strb r4, [r0, 0x5] strb r4, [r0, 0xA] - ldr r5, _081937D8 + ldr r5, =0x02021cc4 str r5, [sp, 0xC] add r2, sp, 0x64 ldrb r2, [r2] @@ -824929,34 +796876,32 @@ _0819377E: bl remo_copy ldr r3, [sp, 0x4C] ldr r1, [r3, 0x4] - ldr r0, _081937DC + ldr r0, =0x000003ff cmp r1, r0 bne _081937E4 - ldr r0, _081937E0 + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r5, 0 bl gf_strcpy b _08193802 .align 2, 0 -_081937D8: .4byte 0x02021cc4 -_081937DC: .4byte 0x000003ff -_081937E0: .4byte 0x03005d90 + .pool _081937E4: - ldr r0, _081937F4 + ldr r0, =0x000003fe cmp r1, r0 bne _081937F8 adds r0, r5, 0 bl sub_8195938 b _08193802 .align 2, 0 -_081937F4: .4byte 0x000003fe + .pool _081937F8: lsls r1, 16 lsrs r1, 16 adds r0, r5, 0 bl sub_8195898 _08193802: - ldr r0, _0819389C + ldr r0, =0x02021cc4 str r0, [sp, 0xC] add r0, sp, 0xC movs r6, 0 @@ -824987,7 +796932,7 @@ _08193802: bl remo_copy add r0, sp, 0xC strb r6, [r0, 0xA] - ldr r0, _081938A0 + ldr r0, =0x0860d350 ldr r1, [sp, 0x58] adds r0, r1, r0 ldr r0, [r0] @@ -825026,19 +796971,18 @@ _08193802: pop {r0} bx r0 .align 2, 0 -_0819389C: .4byte 0x02021cc4 -_081938A0: .4byte 0x0860d350 + .pool thumb_func_end sub_819314C thumb_func_start sub_81938A4 sub_81938A4: @ 81938A4 push {lr} - ldr r0, _081938D4 + ldr r0, =sub_8194220 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081938D8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -825049,27 +796993,25 @@ sub_81938A4: @ 81938A4 movs r0, 0x2 strh r0, [r1, 0xC] strh r2, [r1, 0x10] - ldr r0, _081938DC + ldr r0, =sub_8194B54 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_081938D4: .4byte sub_8194220 + 1 -_081938D8: .4byte 0x03005e00 -_081938DC: .4byte sub_8194B54 + 1 + .pool thumb_func_end sub_81938A4 thumb_func_start sub_81938E0 sub_81938E0: @ 81938E0 push {r4,lr} bl sub_8194D48 - ldr r4, _08193940 + ldr r4, =0x03005d90 ldr r2, [r4] - ldr r1, _08193944 + ldr r1, =0x00000d0a adds r0, r2, r1 ldrb r1, [r0] subs r1, 0x1 - ldr r0, _08193948 + ldr r0, =0x00000ca9 adds r2, r0 movs r0, 0x3 ands r1, r0 @@ -825080,17 +797022,17 @@ sub_81938E0: @ 81938E0 orrs r0, r1 strb r0, [r2] ldr r0, [r4] - ldr r1, _0819394C + ldr r1, =0x00000cb2 adds r0, r1 movs r4, 0 movs r1, 0x3 strh r1, [r0] - ldr r0, _08193950 + ldr r0, =sub_8194220 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08193954 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -825101,19 +797043,13 @@ sub_81938E0: @ 81938E0 strh r0, [r1, 0xC] movs r0, 0x1 strh r0, [r1, 0x10] - ldr r0, _08193958 + ldr r0, =sub_8194B54 + 1 bl set_callback2 pop {r4} pop {r0} bx r0 .align 2, 0 -_08193940: .4byte 0x03005d90 -_08193944: .4byte 0x00000d0a -_08193948: .4byte 0x00000ca9 -_0819394C: .4byte 0x00000cb2 -_08193950: .4byte sub_8194220 + 1 -_08193954: .4byte 0x03005e00 -_08193958: .4byte sub_8194B54 + 1 + .pool thumb_func_end sub_81938E0 thumb_func_start sub_819395C @@ -825122,7 +797058,7 @@ sub_819395C: @ 819395C sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08193988 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -825137,13 +797073,12 @@ sub_819395C: @ 819395C b _08193BC2 _0819397E: lsls r0, 2 - ldr r1, _0819398C + ldr r1, =_08193990 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08193988: .4byte 0x03005e00 -_0819398C: .4byte _08193990 + .pool .align 2, 0 _08193990: .4byte _081939B0 @@ -825155,7 +797090,7 @@ _08193990: .4byte _08193BC2 .4byte _08193B84 _081939B0: - ldr r0, _081939F4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -825172,7 +797107,7 @@ _081939C2: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r1, _081939F8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -825182,17 +797117,15 @@ _081939C2: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _081939FC + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 bl obj_anim_image_start b _08193BC2 .align 2, 0 -_081939F4: .4byte 0x02037fd4 -_081939F8: .4byte 0x03005e00 -_081939FC: .4byte 0x02020630 + .pool _08193A00: - ldr r0, _08193A1C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -825208,7 +797141,7 @@ _08193A0E: strh r1, [r0, 0x8] b _08193BC2 .align 2, 0 -_08193A1C: .4byte 0x02037fd4 + .pool _08193A20: adds r0, r5, 0 bl sub_8193BDC @@ -825232,7 +797165,7 @@ _08193A3C: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _08193A5C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -825241,7 +797174,7 @@ _08193A3C: strh r1, [r0, 0x8] b _08193BC2 .align 2, 0 -_08193A5C: .4byte 0x03005e00 + .pool _08193A60: movs r0, 0x1 negs r0, r0 @@ -825250,7 +797183,7 @@ _08193A60: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _08193A80 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -825259,7 +797192,7 @@ _08193A60: strh r1, [r0, 0x8] b _08193BC2 .align 2, 0 -_08193A80: .4byte 0x03005e00 + .pool _08193A84: movs r0, 0x1 negs r0, r0 @@ -825268,7 +797201,7 @@ _08193A84: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _08193AA4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -825277,9 +797210,9 @@ _08193A84: strh r1, [r0, 0x8] b _08193BC2 .align 2, 0 -_08193AA4: .4byte 0x03005e00 + .pool _08193AA8: - ldr r0, _08193B08 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -825291,23 +797224,23 @@ _08193AA8: _08193ABA: bl Window_FreeMemory bl remove_some_task - ldr r4, _08193B0C + ldr r4, =0x0203cd7c ldr r0, [r4] bl free str r6, [r4] - ldr r0, _08193B10 + ldr r0, =sub_8190400 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _08193B14 + ldr r2, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 adds r1, r2 movs r3, 0 strh r6, [r1, 0x8] - ldr r0, _08193B18 + ldr r0, =0x0860d080 adds r0, r7, r0 ldrb r0, [r0] strh r0, [r1, 0xA] @@ -825320,19 +797253,14 @@ _08193ABA: adds r0, r2 movs r1, 0x4 strh r1, [r0, 0x8] - ldr r0, _08193B1C + ldr r0, =0x0203cd78 ldr r0, [r0] strb r3, [r0, 0x10] b _08193BC2 .align 2, 0 -_08193B08: .4byte 0x02037fd4 -_08193B0C: .4byte 0x0203cd7c -_08193B10: .4byte sub_8190400 + 1 -_08193B14: .4byte 0x03005e00 -_08193B18: .4byte 0x0860d080 -_08193B1C: .4byte 0x0203cd78 + .pool _08193B20: - ldr r0, _08193B74 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -825342,16 +797270,16 @@ _08193B20: bne _08193BC2 bl Window_FreeMemory bl remove_some_task - ldr r4, _08193B78 + ldr r4, =0x0203cd7c ldr r0, [r4] bl free str r6, [r4] - ldr r0, _08193B7C + ldr r0, =sub_8190400 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _08193B80 + ldr r2, =0x03005e00 lsls r0, r3, 2 adds r0, r3 lsls r0, 3 @@ -825371,12 +797299,9 @@ _08193B20: strh r1, [r0, 0x8] b _08193BC2 .align 2, 0 -_08193B74: .4byte 0x02037fd4 -_08193B78: .4byte 0x0203cd7c -_08193B7C: .4byte sub_8190400 + 1 -_08193B80: .4byte 0x03005e00 + .pool _08193B84: - ldr r0, _08193BCC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -825386,13 +797311,13 @@ _08193B84: bne _08193BC2 bl Window_FreeMemory bl remove_some_task - ldr r4, _08193BD0 + ldr r4, =0x0203cd7c ldr r0, [r4] bl free str r6, [r4] - ldr r0, _08193BD4 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 - ldr r1, _08193BD8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -825407,10 +797332,7 @@ _08193BC2: pop {r0} bx r0 .align 2, 0 -_08193BCC: .4byte 0x02037fd4 -_08193BD0: .4byte 0x0203cd7c -_08193BD4: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 -_08193BD8: .4byte 0x03005e00 + .pool thumb_func_end sub_819395C thumb_func_start sub_8193BDC @@ -825425,19 +797347,19 @@ sub_8193BDC: @ 8193BDC mov r9, r0 movs r1, 0x4 mov r8, r1 - ldr r1, _08193C2C + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 movs r1, 0xA ldrsh r5, [r0, r1] - ldr r0, _08193C30 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08193C34 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r6, [r0] - ldr r0, _08193C38 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] adds r2, r1, 0 adds r3, r0, 0 @@ -825456,10 +797378,7 @@ _08193C20: mov r9, r0 b _08193CDE .align 2, 0 -_08193C2C: .4byte 0x03005e00 -_08193C30: .4byte 0x03005d90 -_08193C34: .4byte 0x00000cb2 -_08193C38: .4byte 0x030022c0 + .pool _08193C3C: cmp r5, 0xF bgt _08193C4C @@ -825477,7 +797396,7 @@ _08193C4C: _08193C58: cmp r2, 0x40 bne _08193C78 - ldr r0, _08193C74 + ldr r0, =0x0860cbf1 lsls r1, r5, 2 adds r1, r5 adds r1, r6 @@ -825490,12 +797409,12 @@ _08193C58: mov r8, r1 b _08193CDE .align 2, 0 -_08193C74: .4byte 0x0860cbf1 + .pool _08193C78: ldrh r0, [r3, 0x2E] cmp r0, 0x80 bne _08193C9C - ldr r0, _08193C98 + ldr r0, =0x0860cbf1 lsls r1, r5, 2 adds r1, r5 adds r1, r6 @@ -825508,12 +797427,12 @@ _08193C78: movs r0, 0x1 b _08193CDC .align 2, 0 -_08193C98: .4byte 0x0860cbf1 + .pool _08193C9C: ldrh r0, [r3, 0x2E] cmp r0, 0x20 bne _08193CC0 - ldr r0, _08193CBC + ldr r0, =0x0860cbf1 lsls r1, r5, 2 adds r1, r5 adds r1, r6 @@ -825527,12 +797446,12 @@ _08193C9C: mov r8, r1 b _08193CDE .align 2, 0 -_08193CBC: .4byte 0x0860cbf1 + .pool _08193CC0: ldrh r0, [r3, 0x2E] cmp r0, 0x10 bne _08193CDE - ldr r0, _08193D34 + ldr r0, =0x0860cbf1 lsls r1, r5, 2 adds r1, r5 adds r1, r6 @@ -825554,11 +797473,11 @@ _08193CDE: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r4, _08193D38 + ldr r4, =0x02020630 adds r0, r4 movs r1, 0 bl obj_anim_image_start - ldr r2, _08193D34 + ldr r2, =0x0860cbf1 lsls r1, r6, 2 add r1, r8 lsls r0, r5, 2 @@ -825573,7 +797492,7 @@ _08193CDE: adds r0, r4 movs r1, 0x1 bl obj_anim_image_start - ldr r1, _08193D3C + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -825588,20 +797507,18 @@ _08193D26: pop {r1} bx r1 .align 2, 0 -_08193D34: .4byte 0x0860cbf1 -_08193D38: .4byte 0x02020630 -_08193D3C: .4byte 0x03005e00 + .pool thumb_func_end sub_8193BDC thumb_func_start sub_8193D40 sub_8193D40: @ 8193D40 push {lr} - ldr r0, _08193D70 + ldr r0, =sub_8194220 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _08193D74 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -825613,14 +797530,12 @@ sub_8193D40: @ 8193D40 movs r0, 0x2 strh r0, [r1, 0xC] strh r2, [r1, 0x10] - ldr r0, _08193D78 + ldr r0, =sub_8194B54 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_08193D70: .4byte sub_8194220 + 1 -_08193D74: .4byte 0x03005e00 -_08193D78: .4byte sub_8194B54 + 1 + .pool thumb_func_end sub_8193D40 thumb_func_start sub_8193D7C @@ -825628,18 +797543,18 @@ sub_8193D7C: @ 8193D7C push {r4-r7,lr} mov r7, r8 push {r7} - ldr r7, _08193DF8 + ldr r7, =0x020375e2 ldrh r0, [r7] cmp r0, 0x1 bne _08193E10 - ldr r5, _08193DFC + ldr r5, =0x02038bca ldrh r0, [r5] bl sub_8195358 - ldr r4, _08193E00 + ldr r4, =0x03005d90 ldr r2, [r4] lsls r0, 2 adds r2, r0 - ldr r6, _08193E04 + ldr r6, =0x00000d25 adds r2, r6 ldrb r0, [r2] movs r1, 0x4 @@ -825650,7 +797565,7 @@ sub_8193D7C: @ 8193D7C ldr r1, [r4] lsls r0, 2 adds r0, r1, r0 - ldr r2, _08193E08 + ldr r2, =0x00000cb2 mov r8, r2 add r1, r8 adds r0, r6 @@ -825672,7 +797587,7 @@ sub_8193D7C: @ 8193D7C lsls r3, 4 adds r1, r2, r3 adds r1, r0 - ldr r0, _08193E0C + ldr r0, =0x03005d10 ldrh r0, [r0, 0x22] strh r0, [r1] add r2, r8 @@ -825684,21 +797599,16 @@ sub_8193D7C: @ 8193D7C bl sub_8195438 b _08193EAE .align 2, 0 -_08193DF8: .4byte 0x020375e2 -_08193DFC: .4byte 0x02038bca -_08193E00: .4byte 0x03005d90 -_08193E04: .4byte 0x00000d25 -_08193E08: .4byte 0x00000cb2 -_08193E0C: .4byte 0x03005d10 + .pool _08193E10: - ldr r5, _08193EB8 + ldr r5, =0x000003ff adds r0, r5, 0 bl sub_8195358 - ldr r4, _08193EBC + ldr r4, =0x03005d90 ldr r2, [r4] lsls r0, 2 adds r2, r0 - ldr r6, _08193EC0 + ldr r6, =0x00000d25 adds r2, r6 ldrb r0, [r2] movs r1, 0x4 @@ -825709,7 +797619,7 @@ _08193E10: ldr r1, [r4] lsls r0, 2 adds r0, r1, r0 - ldr r2, _08193EC4 + ldr r2, =0x00000cb2 adds r1, r2 adds r0, r6 movs r3, 0x3 @@ -825730,10 +797640,10 @@ _08193E10: lsls r3, 4 adds r1, r3 adds r1, r0 - ldr r0, _08193EC8 + ldr r0, =0x03005d10 ldrh r0, [r0, 0x24] strh r0, [r1] - ldr r0, _08193ECC + ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x9 beq _08193E78 @@ -825754,9 +797664,9 @@ _08193E78: orrs r0, r1 strb r0, [r2] _08193E92: - ldr r0, _08193EBC + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08193EC4 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r4, [r0] cmp r4, 0x3 @@ -825775,12 +797685,7 @@ _08193EAE: pop {r0} bx r0 .align 2, 0 -_08193EB8: .4byte 0x000003ff -_08193EBC: .4byte 0x03005d90 -_08193EC0: .4byte 0x00000d25 -_08193EC4: .4byte 0x00000cb2 -_08193EC8: .4byte 0x03005d10 -_08193ECC: .4byte 0x0202433a + .pool thumb_func_end sub_8193D7C thumb_func_start sub_8193ED0 @@ -825829,15 +797734,15 @@ _08193F18: adds r1, r5, r0 movs r0, 0 str r0, [r1] - ldr r0, _08193F54 + ldr r0, =0x03005d90 ldr r3, [r0] ldr r1, [sp, 0x6C] adds r0, r3, r1 - ldr r2, _08193F58 + ldr r2, =0x00000d24 adds r0, r2 ldrh r0, [r0] lsls r0, 22 - ldr r1, _08193F5C + ldr r1, =0xff800000 cmp r0, r1 bne _08193F60 ldr r3, [sp, 0x50] @@ -825852,9 +797757,7 @@ _08193F18: strh r0, [r1] b _08193F8C .align 2, 0 -_08193F54: .4byte 0x03005d90 -_08193F58: .4byte 0x00000d24 -_08193F5C: .4byte 0xff800000 + .pool _08193F60: lsls r2, r4, 1 add r2, r10 @@ -825864,11 +797767,11 @@ _08193F60: ldr r4, [sp, 0x50] adds r0, r4 lsls r0, 1 - ldr r5, _08193FAC + ldr r5, =0x00000d64 adds r1, r3, r5 adds r1, r0 ldrh r0, [r1] - ldr r1, _08193FB0 + ldr r1, =0x0203bc8c ldr r1, [r1] lsls r0, 4 adds r0, r1 @@ -825879,7 +797782,7 @@ _08193F60: ldrh r0, [r0] strh r0, [r2] _08193F8C: - ldr r0, _08193FB4 + ldr r0, =0x0831c898 ldr r1, [sp, 0x74] add r1, r9 lsls r1, 1 @@ -825895,9 +797798,7 @@ _08193F8C: movs r6, 0x28 b _08193FD0 .align 2, 0 -_08193FAC: .4byte 0x00000d64 -_08193FB0: .4byte 0x0203bc8c -_08193FB4: .4byte 0x0831c898 + .pool _08193FB8: cmp r6, 0x1 bne _08193FC0 @@ -825938,13 +797839,13 @@ _08193FEE: lsrs r5, r4, 16 lsls r0, 16 orrs r5, r0 - ldr r2, _08194058 + ldr r2, =0x03005d90 ldr r0, [r2] - ldr r4, _0819405C + ldr r4, =0x00000d64 adds r0, r4 add r0, r8 ldrh r4, [r0] - ldr r3, _08194060 + ldr r3, =0x0203bc8c ldr r0, [r3] lsls r4, 4 adds r4, r0 @@ -825962,7 +797863,7 @@ _08193FEE: ldr r0, [r2] ldr r2, [sp, 0x5C] adds r1, r7, r2 - ldr r4, _0819405C + ldr r4, =0x00000d64 adds r0, r4 adds r0, r1 ldrh r0, [r0] @@ -825977,20 +797878,17 @@ _08193FEE: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r5, _08194064 + ldr r5, =0x083203cc adds r0, r5 ldrb r2, [r0, 0x17] b _08194074 .align 2, 0 -_08194058: .4byte 0x03005d90 -_0819405C: .4byte 0x00000d64 -_08194060: .4byte 0x0203bc8c -_08194064: .4byte 0x083203cc + .pool _08194068: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r2, _08194098 + ldr r2, =0x083203cc adds r0, r2 ldrb r2, [r0, 0x16] _08194074: @@ -826011,7 +797909,7 @@ _08194074: adds r1, r3, r0 b _081940D8 .align 2, 0 -_08194098: .4byte 0x083203cc + .pool _0819409C: movs r0, 0x29 ands r0, r5 @@ -826156,7 +798054,7 @@ _08194182: ldr r0, [sp, 0x48] lsls r5, r0, 24 _0819419A: - ldr r0, _0819421C + ldr r0, =0x03005d90 ldr r4, [r0] ldr r2, [sp, 0x50] lsls r1, r2, 24 @@ -826225,7 +798123,7 @@ _08194204: pop {r1} bx r1 .align 2, 0 -_0819421C: .4byte 0x03005d90 + .pool thumb_func_end sub_8193ED0 thumb_func_start sub_8194220 @@ -826239,7 +798137,7 @@ sub_8194220: @ 8194220 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _0819425C + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -826256,13 +798154,12 @@ sub_8194220: @ 8194220 b _081948C2 _08194250: lsls r0, 2 - ldr r1, _08194260 + ldr r1, =_08194264 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0819425C: .4byte 0x03005e00 -_08194260: .4byte _08194264 + .pool .align 2, 0 _08194264: .4byte _0819427C @@ -826283,24 +798180,24 @@ _0819427C: add r0, sp, 0x14 movs r1, 0xC0 lsls r1, 19 - ldr r2, _081942FC + ldr r2, =0x05006000 bl CpuSet movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _08194300 + ldr r1, =0x0860ce74 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r0, _08194304 + ldr r0, =0x0860ce94 bl Window_InitFromTemplates bl TextBox_ResetSomeField - ldr r0, _08194308 + ldr r0, =0x02022e14 strh r4, [r0] - ldr r0, _0819430C + ldr r0, =0x02022e16 strh r4, [r0] - ldr r0, _08194310 + ldr r0, =0x02022e18 strh r4, [r0] - ldr r0, _08194314 + ldr r0, =0x02022e1a strh r4, [r0] movs r0, 0x2 movs r1, 0 @@ -826319,19 +798216,12 @@ _0819427C: movs r0, 0x3 movs r2, 0 bl bg_change_y_offset - ldr r1, _08194318 + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 b _0819443C .align 2, 0 -_081942FC: .4byte 0x05006000 -_08194300: .4byte 0x0860ce74 -_08194304: .4byte 0x0860ce94 -_08194308: .4byte 0x02022e14 -_0819430C: .4byte 0x02022e16 -_08194310: .4byte 0x02022e18 -_08194314: .4byte 0x02022e1a -_08194318: .4byte 0x03005e00 + .pool _0819431C: movs r0, 0x50 movs r1, 0 @@ -826345,13 +798235,13 @@ _0819431C: movs r0, 0x4C movs r1, 0 bl lcd_io_set - ldr r1, _08194380 + ldr r1, =0x00005860 movs r0, 0x40 bl lcd_io_set movs r0, 0x44 movs r1, 0x9F bl lcd_io_set - ldr r1, _08194384 + ldr r1, =0x00009098 movs r0, 0x42 bl lcd_io_set movs r0, 0x46 @@ -826366,29 +798256,27 @@ _0819431C: bl sub_80A1A74 bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r1, _08194388 + ldr r1, =0x03005e00 mov r3, r8 lsls r0, r3, 2 b _0819443C .align 2, 0 -_08194380: .4byte 0x00005860 -_08194384: .4byte 0x00009098 -_08194388: .4byte 0x03005e00 + .pool _0819438C: - ldr r4, _0819444C + ldr r4, =0x0203cd7c movs r0, 0x80 lsls r0, 4 bl malloc_and_clear adds r1, r0, 0 str r1, [r4] - ldr r0, _08194450 + ldr r0, =0x08d83900 bl call_LZZUnCompWram ldr r1, [r4] movs r0, 0x1 bl bg_set_tilemap movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r1, _08194454 + ldr r1, =0x08d82f10 movs r5, 0x80 lsls r5, 6 movs r6, 0 @@ -826397,44 +798285,44 @@ _0819438C: adds r2, r5, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _08194458 + ldr r1, =0x08d834fc str r6, [sp] movs r0, 0x2 adds r2, r5, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _0819445C + ldr r1, =0x08d83b2c movs r4, 0x1 str r4, [sp] movs r0, 0x2 adds r2, r5, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, _08194460 + ldr r1, =0x08d83c3c str r4, [sp] movs r0, 0x3 adds r2, r5, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r0, _08194464 + ldr r0, =0x08d85358 movs r4, 0x80 lsls r4, 2 movs r1, 0 adds r2, r4, 0 bl decompress_palette - ldr r0, _08194468 + ldr r0, =0x08d85444 movs r1, 0x80 lsls r1, 1 adds r2, r4, 0 bl decompress_palette - ldr r0, _0819446C + ldr r0, =0x08d85600 movs r1, 0xF0 movs r2, 0x20 bl decompress_palette str r6, [sp, 0x18] add r0, sp, 0x18 - ldr r1, _08194470 - ldr r2, _08194474 + ldr r1, =0x02037b14 + ldr r2, =0x05000100 bl CpuSet movs r0, 0 bl gpu_sync_bg_show @@ -826444,7 +798332,7 @@ _0819438C: bl gpu_sync_bg_show movs r0, 0x3 bl gpu_sync_bg_show - ldr r1, _08194478 + ldr r1, =0x03005e00 mov r4, r8 lsls r0, r4, 2 _0819443C: @@ -826456,20 +798344,9 @@ _0819443C: strh r1, [r0, 0x8] b _081948C2 .align 2, 0 -_0819444C: .4byte 0x0203cd7c -_08194450: .4byte 0x08d83900 -_08194454: .4byte 0x08d82f10 -_08194458: .4byte 0x08d834fc -_0819445C: .4byte 0x08d83b2c -_08194460: .4byte 0x08d83c3c -_08194464: .4byte 0x08d85358 -_08194468: .4byte 0x08d85444 -_0819446C: .4byte 0x08d85600 -_08194470: .4byte 0x02037b14 -_08194474: .4byte 0x05000100 -_08194478: .4byte 0x03005e00 + .pool _0819447C: - ldr r0, _081944C8 + ldr r0, =0x0860cf50 bl gpu_tile_obj_decompress_and_load mov r0, r8 lsls r0, 2 @@ -826478,18 +798355,18 @@ _0819447C: cmp r1, 0 bne _081944E8 movs r5, 0 - ldr r4, _081944CC + ldr r4, =0x0860d411 _08194492: ldrb r1, [r4] ldrb r2, [r4, 0x1] - ldr r0, _081944D0 + ldr r0, =0x0860cfa8 movs r3, 0 bl obj_add_from_template_forward_search adds r4, 0x2 adds r5, 0x1 cmp r5, 0x1E bls _08194492 - ldr r0, _081944D4 + ldr r0, =0x03005e00 ldr r1, [sp, 0x1C] add r1, r8 lsls r1, 3 @@ -826498,38 +798375,33 @@ _08194492: ldrsh r0, [r1, r2] cmp r0, 0 beq _081944DC - ldr r0, _081944D8 + ldr r0, =0x0860d008 movs r1, 0xDA movs r2, 0xC movs r3, 0 bl obj_add_from_template_forward_search b _081944E8 .align 2, 0 -_081944C8: .4byte 0x0860cf50 -_081944CC: .4byte 0x0860d411 -_081944D0: .4byte 0x0860cfa8 -_081944D4: .4byte 0x03005e00 -_081944D8: .4byte 0x0860d008 + .pool _081944DC: - ldr r0, _081944F4 + ldr r0, =0x0860cfd8 movs r1, 0xDA movs r2, 0xC movs r3, 0 bl obj_add_from_template_forward_search _081944E8: - ldr r1, _081944F8 + ldr r1, =0x00007f40 movs r0, 0 bl lcd_io_set b _081947A6 .align 2, 0 -_081944F4: .4byte 0x0860cfd8 -_081944F8: .4byte 0x00007f40 + .pool _081944FC: add r0, sp, 0x4 movs r2, 0 movs r1, 0x2 strb r1, [r0, 0x5] - ldr r0, _081945AC + ldr r0, =0x085cccee str r0, [sp, 0x4] add r0, sp, 0x4 strb r1, [r0, 0x4] @@ -826580,29 +798452,29 @@ _081944FC: movs r7, 0 movs r5, 0xF _0819456C: - ldr r3, _081945B0 + ldr r3, =0x03005d90 ldr r0, [r3] adds r0, r7 - ldr r1, _081945B4 + ldr r1, =0x00000d24 adds r0, r1 ldrh r1, [r0] lsls r1, 22 lsrs r1, 22 - ldr r0, _081945B8 + ldr r0, =0x02022e2c bl sub_8195898 mov r2, r10 cmp r2, 0x1 bne _081945C4 - ldr r3, _081945B0 + ldr r3, =0x03005d90 ldr r2, [r3] adds r0, r2, r7 - ldr r1, _081945BC + ldr r1, =0x00000d25 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 29 cmp r0, 0 blt _081945DC - ldr r3, _081945C0 + ldr r3, =0x00000cb2 adds r0, r2, r3 ldrh r1, [r0] cmp r1, 0x1 @@ -826612,20 +798484,15 @@ _0819456C: subs r1, 0x2 b _081945EA .align 2, 0 -_081945AC: .4byte 0x085cccee -_081945B0: .4byte 0x03005d90 -_081945B4: .4byte 0x00000d24 -_081945B8: .4byte 0x02022e2c -_081945BC: .4byte 0x00000d25 -_081945C0: .4byte 0x00000cb2 + .pool _081945C4: mov r3, r10 cmp r3, 0 bne _08194634 - ldr r0, _081945F4 + ldr r0, =0x03005d90 ldr r2, [r0] adds r0, r2, r7 - ldr r1, _081945F8 + ldr r1, =0x00000d25 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 29 @@ -826645,10 +798512,9 @@ _081945EA: bl sub_81948EC b _08194634 .align 2, 0 -_081945F4: .4byte 0x03005d90 -_081945F8: .4byte 0x00000d25 + .pool _081945FC: - ldr r3, _0819461C + ldr r3, =0x00000cb2 adds r1, r2, r3 ldrh r0, [r1] cmp r0, 0 @@ -826656,7 +798522,7 @@ _081945FC: ldr r0, [sp, 0x1C] add r0, r8 lsls r0, 3 - ldr r2, _08194620 + ldr r2, =0x03005e00 adds r0, r2 movs r3, 0x10 ldrsh r0, [r0, r3] @@ -826665,8 +798531,7 @@ _081945FC: ldrh r1, [r1] b _08194628 .align 2, 0 -_0819461C: .4byte 0x00000cb2 -_08194620: .4byte 0x03005e00 + .pool _08194624: ldrh r0, [r1] subs r1, r0, 0x1 @@ -826680,27 +798545,25 @@ _08194634: ldr r0, [sp, 0x1C] add r0, r8 lsls r0, 3 - ldr r3, _08194654 + ldr r3, =0x03005e00 adds r0, r3 movs r1, 0x10 ldrsh r0, [r0, r1] cmp r0, 0 beq _08194660 - ldr r2, _08194658 + ldr r2, =0x03005d90 ldr r0, [r2] - ldr r3, _0819465C + ldr r3, =0x00000cb2 adds r0, r3 ldrh r3, [r0] adds r6, r2, 0 b _0819466E .align 2, 0 -_08194654: .4byte 0x03005e00 -_08194658: .4byte 0x03005d90 -_0819465C: .4byte 0x00000cb2 + .pool _08194660: - ldr r1, _081946DC + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r2, _081946E0 + ldr r2, =0x00000cb2 adds r0, r2 ldrh r0, [r0] subs r3, r0, 0x1 @@ -826711,12 +798574,12 @@ _0819466E: bne _0819468E ldr r2, [r6] adds r0, r2, r7 - ldr r1, _081946E4 + ldr r1, =0x00000d25 adds r0, r1 ldrb r1, [r0] lsls r1, 27 lsrs r1, 30 - ldr r0, _081946E0 + ldr r0, =0x00000cb2 adds r2, r0 ldrh r0, [r2] subs r0, 0x1 @@ -826728,7 +798591,7 @@ _0819468E: bne _081946FA ldr r0, [r6] adds r0, r7 - ldr r2, _081946E4 + ldr r2, =0x00000d25 adds r0, r2 ldrb r0, [r0] lsls r0, 27 @@ -826738,18 +798601,18 @@ _0819468E: _081946A6: ldr r0, [r6] adds r1, r0, r7 - ldr r3, _081946E4 + ldr r3, =0x00000d25 adds r0, r1, r3 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 bge _081946FA - ldr r2, _081946E8 + ldr r2, =0x00000d24 adds r0, r1, r2 ldrh r0, [r0] lsls r0, 22 lsrs r0, 22 - ldr r3, _081946EC + ldr r3, =0x000003ff cmp r0, r3 bne _081946F0 ldrb r1, [r4, 0xC] @@ -826764,11 +798627,7 @@ _081946A6: movs r1, 0x40 b _08194740 .align 2, 0 -_081946DC: .4byte 0x03005d90 -_081946E0: .4byte 0x00000cb2 -_081946E4: .4byte 0x00000d25 -_081946E8: .4byte 0x00000d24 -_081946EC: .4byte 0x000003ff + .pool _081946F0: ldrb r1, [r4, 0xC] mov r0, r9 @@ -826778,12 +798637,12 @@ _081946F0: _081946FA: ldr r0, [r6] adds r0, r7 - ldr r1, _08194724 + ldr r1, =0x00000d24 adds r0, r1 ldrh r0, [r0] lsls r0, 22 lsrs r0, 22 - ldr r2, _08194728 + ldr r2, =0x000003ff cmp r0, r2 bne _0819472C ldrb r1, [r4, 0xC] @@ -826798,8 +798657,7 @@ _081946FA: movs r1, 0x40 b _08194740 .align 2, 0 -_08194724: .4byte 0x00000d24 -_08194728: .4byte 0x000003ff + .pool _0819472C: ldrb r1, [r4, 0xC] mov r0, r9 @@ -826815,7 +798673,7 @@ _08194734: _08194740: orrs r0, r1 strb r0, [r4, 0xD] - ldr r0, _08194760 + ldr r0, =0x0860d3f1 ldr r3, [sp, 0x20] adds r0, r3, r0 ldrb r0, [r0] @@ -826823,25 +798681,24 @@ _08194740: bne _08194768 ldrb r0, [r4, 0x5] ldrb r3, [r4, 0xA] - ldr r1, _08194764 + ldr r1, =0x02022e2c movs r2, 0x3D bl sub_81DB384 b _0819476A .align 2, 0 -_08194760: .4byte 0x0860d3f1 -_08194764: .4byte 0x02022e2c + .pool _08194768: movs r0, 0x3 _0819476A: strb r0, [r4, 0x8] - ldr r0, _081947B8 + ldr r0, =0x02022e2c str r0, [sp, 0x4] - ldr r0, _081947BC + ldr r0, =0x0860d3f1 ldr r1, [sp, 0x20] adds r0, r1, r0 ldrb r0, [r0] strb r0, [r4, 0x4] - ldr r2, _081947C0 + ldr r2, =0x0860d3f2 adds r0, r1, r2 ldrb r0, [r0] strb r0, [r4, 0x9] @@ -826863,7 +798720,7 @@ _0819476A: blt _081947A6 b _0819456C _081947A6: - ldr r0, _081947C4 + ldr r0, =0x03005e00 ldr r1, [sp, 0x1C] add r1, r8 lsls r1, 3 @@ -826873,10 +798730,7 @@ _081947A6: strh r0, [r1, 0x8] b _081948C2 .align 2, 0 -_081947B8: .4byte 0x02022e2c -_081947BC: .4byte 0x0860d3f1 -_081947C0: .4byte 0x0860d3f2 -_081947C4: .4byte 0x03005e00 + .pool _081947C8: movs r0, 0 bl Window_WriteStandardTileMap @@ -826893,21 +798747,21 @@ _081947C8: movs r0, 0x2 movs r1, 0x3 bl Window_CopyToVram - ldr r0, _08194834 + ldr r0, =sub_8194BEC + 1 bl SetHBlankCallback - ldr r0, _08194838 + ldr r0, =sub_8194CE4 + 1 bl SetVBlankCallback cmp r4, 0x2 bne _0819485C mov r2, r10 cmp r2, 0 bne _08194844 - ldr r0, _0819483C + ldr r0, =sub_819395C + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _08194840 + ldr r2, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -826924,23 +798778,19 @@ _081947C8: strh r0, [r1, 0x14] b _08194878 .align 2, 0 -_08194834: .4byte sub_8194BEC + 1 -_08194838: .4byte sub_8194CE4 + 1 -_0819483C: .4byte sub_819395C + 1 -_08194840: .4byte 0x03005e00 + .pool _08194844: - ldr r0, _08194854 + ldr r0, =sub_8194950 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _08194858 + ldr r1, =0x03005e00 b _0819486C .align 2, 0 -_08194854: .4byte sub_8194950 + 1 -_08194858: .4byte 0x03005e00 + .pool _0819485C: - ldr r1, _081948D4 + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -826957,8 +798807,8 @@ _0819486C: strh r1, [r0, 0x8] _08194878: bl dp12_8087EA4 - ldr r0, _081948D8 - ldr r2, _081948DC + ldr r0, =0x02038c28 + ldr r2, =0x00001f0a movs r4, 0xF0 lsls r4, 3 adds r1, r0, r4 @@ -826972,10 +798822,10 @@ _08194888: cmp r5, 0 bge _08194888 movs r5, 0x5B - ldr r3, _081948E0 - ldr r0, _081948D8 - ldr r2, _081948E4 - ldr r4, _081948E8 + ldr r3, =0x0860cf44 + ldr r0, =0x02038c28 + ldr r2, =0x00001f09 + ldr r4, =0x00000836 adds r1, r0, r4 adds r0, 0xB6 _081948A4: @@ -827002,12 +798852,7 @@ _081948C2: pop {r0} bx r0 .align 2, 0 -_081948D4: .4byte 0x03005e00 -_081948D8: .4byte 0x02038c28 -_081948DC: .4byte 0x00001f0a -_081948E0: .4byte 0x0860cf44 -_081948E4: .4byte 0x00001f09 -_081948E8: .4byte 0x00000836 + .pool thumb_func_end sub_8194220 thumb_func_start sub_81948EC @@ -827018,13 +798863,13 @@ sub_81948EC: @ 81948EC lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r4, _08194948 + ldr r4, =0x0860dd10 lsls r2, r1, 2 lsls r3, r0, 4 adds r2, r3 adds r2, r4 ldr r3, [r2] - ldr r2, _0819494C + ldr r2, =0x0860de10 lsls r0, 2 adds r1, r0 adds r1, r2 @@ -827058,8 +798903,7 @@ _08194938: pop {r0} bx r0 .align 2, 0 -_08194948: .4byte 0x0860dd10 -_0819494C: .4byte 0x0860de10 + .pool thumb_func_end sub_81948EC thumb_func_start sub_8194950 @@ -827071,7 +798915,7 @@ sub_8194950: @ 8194950 sub sp, 0x14 lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08194980 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -827084,13 +798928,12 @@ sub_8194950: @ 8194950 b _08194B3C _08194974: lsls r0, 2 - ldr r1, _08194984 + ldr r1, =_08194988 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08194980: .4byte 0x03005e00 -_08194984: .4byte _08194988 + .pool .align 2, 0 _08194988: .4byte _0819499C @@ -827106,7 +798949,7 @@ _0819499C: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r1, _081949BC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -827115,9 +798958,9 @@ _0819499C: strh r1, [r0, 0x8] b _08194B3C .align 2, 0 -_081949BC: .4byte 0x03005e00 + .pool _081949C0: - ldr r0, _08194A68 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -827157,18 +799000,18 @@ _081949CE: movs r0, 0xD0 strb r0, [r1, 0xD] movs r7, 0 - ldr r0, _08194A6C + ldr r0, =0x02022e2c mov r9, r0 - ldr r1, _08194A70 + ldr r1, =0x03005d90 mov r8, r1 adds r4, r2, 0 - ldr r6, _08194A74 + ldr r6, =0x0860d3f1 movs r5, 0 _08194A1C: mov r2, r8 ldr r0, [r2] adds r0, r5 - ldr r1, _08194A78 + ldr r1, =0x00000d24 adds r0, r1 ldrh r1, [r0] lsls r1, 22 @@ -827178,12 +799021,12 @@ _08194A1C: mov r0, r8 ldr r2, [r0] adds r0, r2, r5 - ldr r1, _08194A7C + ldr r1, =0x00000d25 adds r0, r1 ldrb r3, [r0] lsls r1, r3, 27 lsrs r1, 30 - ldr r0, _08194A80 + ldr r0, =0x00000cb2 adds r2, r0 ldrh r0, [r2] subs r0, 0x1 @@ -827202,13 +799045,7 @@ _08194A1C: bl sub_81DB384 b _08194A86 .align 2, 0 -_08194A68: .4byte 0x02037fd4 -_08194A6C: .4byte 0x02022e2c -_08194A70: .4byte 0x03005d90 -_08194A74: .4byte 0x0860d3f1 -_08194A78: .4byte 0x00000d24 -_08194A7C: .4byte 0x00000d25 -_08194A80: .4byte 0x00000cb2 + .pool _08194A84: movs r0, 0x3 _08194A86: @@ -827227,7 +799064,7 @@ _08194A9E: mov r2, r8 ldr r1, [r2] adds r0, r1, r5 - ldr r2, _08194AD0 + ldr r2, =0x00000d25 adds r0, r2 ldrb r0, [r0] lsls r0, 29 @@ -827250,7 +799087,7 @@ _08194AC4: ble _08194A1C b _08194B3C .align 2, 0 -_08194AD0: .4byte 0x00000d25 + .pool _08194AD4: lsls r0, r4, 2 adds r0, r4 @@ -827266,7 +799103,7 @@ _08194AD4: strh r0, [r1, 0x8] b _08194B3C _08194AEE: - ldr r0, _08194B1C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -827279,7 +799116,7 @@ _08194AEE: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _08194B20 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -827288,16 +799125,15 @@ _08194AEE: strh r1, [r0, 0x8] b _08194B3C .align 2, 0 -_08194B1C: .4byte 0x030022c0 -_08194B20: .4byte 0x03005e00 + .pool _08194B24: - ldr r0, _08194B4C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _08194B3C - ldr r0, _08194B50 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 adds r0, r4, 0 bl remove_task @@ -827310,8 +799146,7 @@ _08194B3C: pop {r0} bx r0 .align 2, 0 -_08194B4C: .4byte 0x02037fd4 -_08194B50: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_8194950 thumb_func_start sub_8194B54 @@ -827337,27 +799172,27 @@ sub_8194B70: @ 8194B70 movs r1, 0x80 movs r2, 0x2 bl bg_change_y_offset - ldr r0, _08194BD4 + ldr r0, =0x02022e14 ldrh r1, [r0] movs r0, 0x10 bl lcd_io_set - ldr r0, _08194BD8 + ldr r0, =0x02022e16 ldrh r1, [r0] movs r0, 0x12 bl lcd_io_set - ldr r0, _08194BDC + ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 bl lcd_io_set - ldr r0, _08194BE0 + ldr r0, =0x02022e1a ldrh r1, [r0] movs r0, 0x16 bl lcd_io_set - ldr r0, _08194BE4 + ldr r0, =0x02022e1c ldrh r1, [r0] movs r0, 0x18 bl lcd_io_set - ldr r0, _08194BE8 + ldr r0, =0x02022e1e ldrh r1, [r0] movs r0, 0x1A bl lcd_io_set @@ -827367,115 +799202,97 @@ sub_8194B70: @ 8194B70 pop {r0} bx r0 .align 2, 0 -_08194BD4: .4byte 0x02022e14 -_08194BD8: .4byte 0x02022e16 -_08194BDC: .4byte 0x02022e18 -_08194BE0: .4byte 0x02022e1a -_08194BE4: .4byte 0x02022e1c -_08194BE8: .4byte 0x02022e1e + .pool thumb_func_end sub_8194B70 thumb_func_start sub_8194BEC sub_8194BEC: @ 8194BEC push {lr} - ldr r0, _08194C0C + ldr r0, =0x04000006 ldrh r0, [r0] adds r1, r0, 0 cmp r0, 0x29 bls _08194CC8 cmp r0, 0x31 bhi _08194C1C - ldr r1, _08194C10 - ldr r2, _08194C14 + ldr r1, =0x04000048 + ldr r2, =0x00003b3b adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 - ldr r0, _08194C18 + ldr r0, =0x989b5558 b _08194CD4 .align 2, 0 -_08194C0C: .4byte 0x04000006 -_08194C10: .4byte 0x04000048 -_08194C14: .4byte 0x00003b3b -_08194C18: .4byte 0x989b5558 + .pool _08194C1C: cmp r0, 0x39 bls _08194CC8 cmp r0, 0x4A bhi _08194C40 - ldr r1, _08194C34 - ldr r2, _08194C38 + ldr r1, =0x04000048 + ldr r2, =0x00003b3b adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 - ldr r0, _08194C3C + ldr r0, =0x90985860 b _08194CD4 .align 2, 0 -_08194C34: .4byte 0x04000048 -_08194C38: .4byte 0x00003b3b -_08194C3C: .4byte 0x90985860 + .pool _08194C40: cmp r0, 0x51 bhi _08194C60 - ldr r1, _08194C54 - ldr r2, _08194C58 + ldr r1, =0x04000048 + ldr r2, =0x00003b3b adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 - ldr r0, _08194C5C + ldr r0, =0x989b5558 b _08194CD4 .align 2, 0 -_08194C54: .4byte 0x04000048 -_08194C58: .4byte 0x00003b3b -_08194C5C: .4byte 0x989b5558 + .pool _08194C60: cmp r0, 0x5E bls _08194CC8 cmp r0, 0x66 bhi _08194C84 - ldr r1, _08194C78 - ldr r2, _08194C7C + ldr r1, =0x04000048 + ldr r2, =0x00003737 adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 - ldr r0, _08194C80 + ldr r0, =0x989b5558 b _08194CD4 .align 2, 0 -_08194C78: .4byte 0x04000048 -_08194C7C: .4byte 0x00003737 -_08194C80: .4byte 0x989b5558 + .pool _08194C84: cmp r0, 0x76 bhi _08194CA4 - ldr r1, _08194C98 - ldr r2, _08194C9C + ldr r1, =0x04000048 + ldr r2, =0x00003737 adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 - ldr r0, _08194CA0 + ldr r0, =0x90985860 b _08194CD4 .align 2, 0 -_08194C98: .4byte 0x04000048 -_08194C9C: .4byte 0x00003737 -_08194CA0: .4byte 0x90985860 + .pool _08194CA4: cmp r0, 0x7E bls _08194CC8 cmp r1, 0x86 bhi _08194CC8 - ldr r1, _08194CBC - ldr r2, _08194CC0 + ldr r1, =0x04000048 + ldr r2, =0x00003737 adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 - ldr r0, _08194CC4 + ldr r0, =0x989b5558 b _08194CD4 .align 2, 0 -_08194CBC: .4byte 0x04000048 -_08194CC0: .4byte 0x00003737 -_08194CC4: .4byte 0x989b5558 + .pool _08194CC8: - ldr r1, _08194CDC - ldr r2, _08194CE0 + ldr r1, =0x04000048 + ldr r2, =0x00003f3f adds r0, r2, 0 strh r0, [r1] subs r1, 0x8 @@ -827485,26 +799302,25 @@ _08194CD4: pop {r0} bx r0 .align 2, 0 -_08194CDC: .4byte 0x04000048 -_08194CE0: .4byte 0x00003f3f + .pool thumb_func_end sub_8194BEC thumb_func_start sub_8194CE4 sub_8194CE4: @ 8194CE4 push {lr} - ldr r0, _08194D38 + ldr r0, =0x02022e14 ldrh r1, [r0] movs r0, 0x10 bl lcd_io_set - ldr r0, _08194D3C + ldr r0, =0x02022e16 ldrh r1, [r0] movs r0, 0x12 bl lcd_io_set - ldr r0, _08194D40 + ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 bl lcd_io_set - ldr r0, _08194D44 + ldr r0, =0x02022e1a ldrh r1, [r0] movs r0, 0x16 bl lcd_io_set @@ -827523,26 +799339,20 @@ sub_8194CE4: @ 8194CE4 pop {r0} bx r0 .align 2, 0 -_08194D38: .4byte 0x02022e14 -_08194D3C: .4byte 0x02022e16 -_08194D40: .4byte 0x02022e18 -_08194D44: .4byte 0x02022e1a + .pool thumb_func_end sub_8194CE4 thumb_func_start sub_8194D48 sub_8194D48: @ 8194D48 - ldr r1, _08194D58 - ldr r0, _08194D5C + ldr r1, =0x0203bc8c + ldr r0, =0x085d97bc str r0, [r1] - ldr r1, _08194D60 - ldr r0, _08194D64 + ldr r1, =0x0203bc88 + ldr r0, =0x085d5acc str r0, [r1] bx lr .align 2, 0 -_08194D58: .4byte 0x0203bc8c -_08194D5C: .4byte 0x085d97bc -_08194D60: .4byte 0x0203bc88 -_08194D64: .4byte 0x085d5acc + .pool thumb_func_end sub_8194D48 thumb_func_start sub_8194D68 @@ -827555,14 +799365,14 @@ sub_8194D68: @ 8194D68 sub sp, 0x8 movs r3, 0 _08194D76: - ldr r0, _08194DB0 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _08194DB4 + ldr r0, =0x0203cef8 adds r0, r3, r0 ldrb r0, [r0] subs r0, 0x1 lsls r0, 1 - ldr r2, _08194DB8 + ldr r2, =0x00000caa adds r1, r2 adds r1, r0 ldrh r0, [r1] @@ -827586,15 +799396,13 @@ _08194DA8: mov r8, r0 b _08194DBE .align 2, 0 -_08194DB0: .4byte 0x03005d90 -_08194DB4: .4byte 0x0203cef8 -_08194DB8: .4byte 0x00000caa + .pool _08194DBC: adds r5, 0x1 _08194DBE: cmp r5, 0x3 bgt _08194DEA - ldr r1, _08194E3C + ldr r1, =0x03005d8c ldr r0, [r1] add r0, r9 adds r1, r5, 0 @@ -827605,7 +799413,7 @@ _08194DBE: adds r4, r0, 0 adds r1, r6, 0 adds r1, 0xD - ldr r2, _08194E40 + ldr r2, =0x020244ec adds r0, r7, r2 movs r2, 0 bl pokemon_getattr @@ -827617,7 +799425,7 @@ _08194DEA: bne _08194E00 lsls r2, r6, 24 lsrs r2, 24 - ldr r1, _08194E40 + ldr r1, =0x020244ec adds r0, r7, r1 movs r1, 0xA6 str r3, [sp, 0x4] @@ -827627,7 +799435,7 @@ _08194E00: mov r6, r8 cmp r6, 0x3 ble _08194DA8 - ldr r2, _08194E3C + ldr r2, =0x03005d8c ldr r0, [r2] movs r2, 0x64 mov r1, r10 @@ -827638,7 +799446,7 @@ _08194E00: adds r0, r1 adds r1, r3, 0 muls r1, r2 - ldr r2, _08194E40 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0x64 bl memcpy @@ -827654,8 +799462,7 @@ _08194E00: pop {r0} bx r0 .align 2, 0 -_08194E3C: .4byte 0x03005d8c -_08194E40: .4byte 0x020244ec + .pool thumb_func_end sub_8194D68 thumb_func_start sub_8194E44 @@ -827663,18 +799470,18 @@ sub_8194E44: @ 8194E44 push {r4-r7,lr} sub sp, 0x4 movs r4, 0 - ldr r7, _08194EA0 + ldr r7, =0x03005d8c movs r6, 0x64 movs r5, 0 _08194E50: - ldr r0, _08194EA4 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _08194EA8 + ldr r0, =0x0203cef8 adds r0, r4, r0 ldrb r0, [r0] subs r0, 0x1 lsls r0, 1 - ldr r2, _08194EAC + ldr r2, =0x00000caa adds r1, r2 adds r1, r0 ldrh r0, [r1] @@ -827691,7 +799498,7 @@ _08194E50: bl pokemon_getattr mov r1, sp strh r0, [r1] - ldr r0, _08194EB0 + ldr r0, =0x020244ec adds r0, r5, r0 movs r1, 0xC mov r2, sp @@ -827705,11 +799512,7 @@ _08194E50: pop {r0} bx r0 .align 2, 0 -_08194EA0: .4byte 0x03005d8c -_08194EA4: .4byte 0x03005d90 -_08194EA8: .4byte 0x0203cef8 -_08194EAC: .4byte 0x00000caa -_08194EB0: .4byte 0x020244ec + .pool thumb_func_end sub_8194E44 thumb_func_start sub_8194EB4 @@ -827723,23 +799526,21 @@ sub_8194EB4: @ 8194EB4 thumb_func_start sub_8194EC0 sub_8194EC0: @ 8194EC0 push {r4,lr} - ldr r0, _08194EDC + ldr r0, =0x02038bca ldrh r0, [r0] bl sub_8195358 adds r4, r0, 0 - ldr r0, _08194EE0 + ldr r0, =0x000003ff bl sub_8195358 cmp r4, r0 ble _08194EE8 - ldr r1, _08194EE4 + ldr r1, =0x020375f0 movs r0, 0x1 b _08194EEC .align 2, 0 -_08194EDC: .4byte 0x02038bca -_08194EE0: .4byte 0x000003ff -_08194EE4: .4byte 0x020375f0 + .pool _08194EE8: - ldr r1, _08194EF4 + ldr r1, =0x020375f0 movs r0, 0x2 _08194EEC: strh r0, [r1] @@ -827747,7 +799548,7 @@ _08194EEC: pop {r0} bx r0 .align 2, 0 -_08194EF4: .4byte 0x020375f0 + .pool thumb_func_end sub_8194EC0 thumb_func_start sub_8194EF8 @@ -827755,9 +799556,9 @@ sub_8194EF8: @ 8194EF8 push {r4,lr} bl sub_8194D48 movs r2, 0 - ldr r3, _08194F48 + ldr r3, =0x03005d90 ldr r0, [r3] - ldr r1, _08194F4C + ldr r1, =0x00000d25 adds r0, r1 ldrb r0, [r0] lsls r0, 29 @@ -827778,12 +799579,12 @@ _08194F14: cmp r0, 0 blt _08194F14 _08194F2A: - ldr r0, _08194F50 - ldr r1, _08194F48 + ldr r0, =0x02021cc4 + ldr r1, =0x03005d90 ldr r1, [r1] lsls r2, 2 adds r1, r2 - ldr r2, _08194F54 + ldr r2, =0x00000d24 adds r1, r2 ldrh r1, [r1] lsls r1, 22 @@ -827793,10 +799594,7 @@ _08194F2A: pop {r0} bx r0 .align 2, 0 -_08194F48: .4byte 0x03005d90 -_08194F4C: .4byte 0x00000d25 -_08194F50: .4byte 0x02021cc4 -_08194F54: .4byte 0x00000d24 + .pool thumb_func_end sub_8194EF8 thumb_func_start sub_8194F58 @@ -827811,17 +799609,17 @@ sub_8194F58: @ 8194F58 str r0, [sp, 0x8] str r0, [sp, 0xC] str r0, [sp, 0x10] - ldr r4, _08194FE8 + ldr r4, =0x03005d90 ldr r2, [r4] - ldr r5, _08194FEC + ldr r5, =0x00000d0a adds r0, r2, r5 ldrb r1, [r0] - ldr r6, _08194FF0 + ldr r6, =0x00000d0b adds r0, r2, r6 ldrb r0, [r0] cmn r1, r0 beq _08194F8C - ldr r1, _08194FF4 + ldr r1, =0x00000ca8 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -827835,7 +799633,7 @@ _08194F8C: bl malloc_and_clear str r0, [sp, 0x1C] ldr r1, [r4] - ldr r2, _08194FF8 + ldr r2, =0x00000ca9 adds r1, r2 ldrb r2, [r1] lsls r0, r2, 30 @@ -827871,11 +799669,7 @@ _08194FCC: lsrs r4, r0, 16 b _08195030 .align 2, 0 -_08194FE8: .4byte 0x03005d90 -_08194FEC: .4byte 0x00000d0a -_08194FF0: .4byte 0x00000d0b -_08194FF4: .4byte 0x00000ca8 -_08194FF8: .4byte 0x00000ca9 + .pool _08194FFC: mov r1, r10 cmp r1, 0xE @@ -827904,9 +799698,9 @@ _08195030: movs r6, 0 cmp r6, r10 bge _08195064 - ldr r2, _081952A0 + ldr r2, =0x03005d90 ldr r0, [r2] - ldr r3, _081952A4 + ldr r3, =0x00000d24 adds r0, r3 ldrh r0, [r0] lsls r0, 22 @@ -827914,7 +799708,7 @@ _08195030: cmp r0, r4 beq _08195064 adds r3, r2, 0 - ldr r2, _081952A4 + ldr r2, =0x00000d24 _0819504C: adds r6, 0x1 cmp r6, r10 @@ -827931,18 +799725,18 @@ _0819504C: _08195064: cmp r6, r10 bne _08194FCC - ldr r5, _081952A0 + ldr r5, =0x03005d90 ldr r3, [r5] ldr r0, [sp, 0x38] adds r3, r0 - ldr r1, _081952A4 + ldr r1, =0x00000d24 adds r3, r1 - ldr r2, _081952A8 + ldr r2, =0x000003ff adds r0, r2, 0 adds r2, r4, 0 ands r2, r0 ldrh r0, [r3] - ldr r5, _081952AC + ldr r5, =0xfffffc00 adds r1, r5, 0 ands r0, r1 orrs r0, r2 @@ -827968,15 +799762,15 @@ _0819509E: movs r7, 0 cmp r7, r6 bge _081950F4 - ldr r0, _081952A0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081952B0 + ldr r1, =0x0203bc8c mov r9, r1 ldr r2, [sp, 0x8] mov r8, r2 ldr r3, [sp, 0xC] mov r12, r3 - ldr r4, _081952B4 + ldr r4, =0x00000d64 adds r0, r4 ldr r1, [sp, 0x20] adds r4, r1, r0 @@ -828006,19 +799800,19 @@ _081950C8: _081950F4: cmp r7, r6 bne _0819509E - ldr r3, _081952A0 + ldr r3, =0x03005d90 ldr r0, [r3] ldr r4, [sp, 0x28] ldr r2, [sp, 0x3C] adds r1, r4, r2 - ldr r3, _081952B4 + ldr r3, =0x00000d64 adds r0, r3 adds r0, r1 strh r5, [r0] ldr r2, [sp, 0x2C] add r2, sp adds r2, 0x8 - ldr r3, _081952B0 + ldr r3, =0x0203bc8c ldr r1, [r3] lsls r0, r5, 4 adds r0, r1 @@ -828027,11 +799821,11 @@ _081950F4: ldr r6, [sp, 0x24] cmp r6, 0x2 ble _08195092 - ldr r4, _081952A0 + ldr r4, =0x03005d90 ldr r2, [r4] ldr r5, [sp, 0x38] adds r2, r5 - ldr r0, _081952B8 + ldr r0, =0x00000d25 adds r2, r0 ldrb r0, [r2] movs r4, 0x5 @@ -828039,11 +799833,11 @@ _081950F4: adds r1, r4, 0 ands r0, r1 strb r0, [r2] - ldr r5, _081952A0 + ldr r5, =0x03005d90 ldr r2, [r5] ldr r0, [sp, 0x38] adds r2, r0 - ldr r1, _081952B8 + ldr r1, =0x00000d25 adds r2, r1 ldrb r0, [r2] subs r4, 0x14 @@ -828053,7 +799847,7 @@ _081950F4: ldr r1, [r5] ldr r5, [sp, 0x38] adds r1, r5 - ldr r0, _081952B8 + ldr r0, =0x00000d25 adds r1, r0 ldrb r2, [r1] movs r0, 0x1F @@ -828079,12 +799873,12 @@ _08195178: _08195182: movs r7, 0 strh r7, [r5] - ldr r1, _081952A0 + ldr r1, =0x03005d90 ldr r0, [r1] mov r2, r10 lsls r1, r2, 2 adds r0, r1 - ldr r3, _081952A4 + ldr r3, =0x00000d24 adds r0, r3 ldrh r0, [r0] lsls r0, 22 @@ -828097,17 +799891,17 @@ _08195182: ldr r4, [sp, 0x34] mov r9, r4 _081951AA: - ldr r1, _081952A0 + ldr r1, =0x03005d90 ldr r0, [r1] mov r4, r9 add r4, r10 adds r4, r6 lsls r4, 1 - ldr r2, _081952B4 + ldr r2, =0x00000d64 adds r0, r2 adds r0, r4 ldrh r1, [r0] - ldr r3, _081952B0 + ldr r3, =0x0203bc8c ldr r0, [r3] lsls r1, 4 adds r1, r0 @@ -828135,13 +799929,13 @@ _081951AA: ldr r1, [r2] adds r0, r1 strh r0, [r5] - ldr r3, _081952A0 + ldr r3, =0x03005d90 ldr r0, [r3] - ldr r1, _081952B4 + ldr r1, =0x00000d64 adds r0, r1 adds r0, r4 ldrh r0, [r0] - ldr r2, _081952B0 + ldr r2, =0x0203bc8c ldr r1, [r2] lsls r0, 4 adds r0, r1 @@ -828149,11 +799943,11 @@ _081951AA: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r3, _081952BC + ldr r3, =0x083203cc adds r1, r3 ldrb r0, [r1, 0x6] lsls r0, 2 - ldr r4, _081952C0 + ldr r4, =0x0832a328 adds r0, r4 ldr r0, [r0] orrs r7, r0 @@ -828205,7 +799999,7 @@ _08195276: cmp r6, 0xF bgt _081952F8 mov r8, r7 - ldr r5, _081952A4 + ldr r5, =0x00000d24 lsls r0, r6, 1 ldr r1, [sp, 0x18] adds r4, r0, r1 @@ -828221,19 +800015,11 @@ _08195288: bl sub_818F904 b _081952F0 .align 2, 0 -_081952A0: .4byte 0x03005d90 -_081952A4: .4byte 0x00000d24 -_081952A8: .4byte 0x000003ff -_081952AC: .4byte 0xfffffc00 -_081952B0: .4byte 0x0203bc8c -_081952B4: .4byte 0x00000d64 -_081952B8: .4byte 0x00000d25 -_081952BC: .4byte 0x083203cc -_081952C0: .4byte 0x0832a328 + .pool _081952C4: cmp r1, r0 bne _081952F0 - ldr r0, _08195350 + ldr r0, =0x03005d90 ldr r1, [r0] mov r3, r10 lsls r0, r3, 2 @@ -828280,9 +800066,9 @@ _08195314: mov r3, r10 cmp r3, 0x3 ble _08195314 - ldr r0, _08195350 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r4, _08195354 + ldr r4, =0x00000ca9 adds r1, r4 ldrb r2, [r1] movs r0, 0x4 @@ -828301,8 +800087,7 @@ _0819533E: pop {r0} bx r0 .align 2, 0 -_08195350: .4byte 0x03005d90 -_08195354: .4byte 0x00000ca9 + .pool thumb_func_end sub_8194F58 thumb_func_start sub_8195358 @@ -828311,9 +800096,9 @@ sub_8195358: @ 8195358 lsls r0, 16 lsrs r3, r0, 16 movs r2, 0 - ldr r4, _08195398 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _0819539C + ldr r1, =0x00000d24 adds r0, r1 ldrh r0, [r0] lsls r0, 22 @@ -828341,8 +800126,7 @@ _0819538E: pop {r1} bx r1 .align 2, 0 -_08195398: .4byte 0x03005d90 -_0819539C: .4byte 0x00000d24 + .pool thumb_func_end sub_8195358 thumb_func_start sub_81953A0 @@ -828351,9 +800135,9 @@ sub_81953A0: @ 81953A0 lsls r0, 16 lsrs r3, r0, 16 movs r2, 0 - ldr r4, _081953E0 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081953E4 + ldr r1, =0x00000d24 adds r0, r1 ldrh r0, [r0] lsls r0, 22 @@ -828381,8 +800165,7 @@ _081953D6: pop {r1} bx r1 .align 2, 0 -_081953E0: .4byte 0x03005d90 -_081953E4: .4byte 0x00000d24 + .pool thumb_func_end sub_81953A0 thumb_func_start sub_81953E8 @@ -828394,8 +800177,8 @@ sub_81953E8: @ 81953E8 lsrs r4, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _08195424 - ldr r0, _08195428 + ldr r2, =0x0860d1a0 + ldr r0, =0x0860d1c0 adds r0, r4, r0 ldrb r0, [r0] lsrs r0, 1 @@ -828416,8 +800199,7 @@ sub_81953E8: @ 81953E8 ldrb r0, [r0] b _08195430 .align 2, 0 -_08195424: .4byte 0x0860d1a0 -_08195428: .4byte 0x0860d1c0 + .pool _0819542C: mov r0, sp ldrb r0, [r0, 0x1] @@ -828450,11 +800232,11 @@ sub_8195438: @ 8195438 lsls r0, 3 str r0, [sp, 0x14] _0819545E: - ldr r2, _081954F0 + ldr r2, =0x03005d90 ldr r0, [r2] lsls r4, r5, 2 adds r1, r0, r4 - ldr r3, _081954F4 + ldr r3, =0x00000d25 adds r0, r1, r3 ldrb r0, [r0] lsls r0, 29 @@ -828468,7 +800250,7 @@ _08195478: adds r0, r1, r3 ldrh r0, [r0] lsls r1, r0, 22 - ldr r0, _081954F8 + ldr r0, =0xffc00000 cmp r1, r0 bne _08195488 b _08195876 @@ -828478,14 +800260,14 @@ _08195488: ldr r0, [sp] bl sub_81901A0 str r0, [sp, 0x8] - ldr r0, _081954F0 + ldr r0, =0x03005d90 ldr r3, [r0] adds r0, r3, r4 - ldr r1, _081954FC + ldr r1, =0x00000d24 adds r0, r1 ldrh r0, [r0] lsls r0, 22 - ldr r1, _08195500 + ldr r1, =0xff800000 cmp r0, r1 bne _08195504 ldr r2, [sp, 0x8] @@ -828493,16 +800275,16 @@ _08195488: beq _08195504 lsls r2, 2 adds r1, r3, r2 - ldr r3, _081954F4 + ldr r3, =0x00000d25 adds r1, r3 ldrb r0, [r1] movs r3, 0x4 orrs r0, r3 strb r0, [r1] - ldr r0, _081954F0 + ldr r0, =0x03005d90 ldr r1, [r0] adds r1, r2 - ldr r2, _081954F4 + ldr r2, =0x00000d25 adds r1, r2 ldrb r0, [r1] subs r3, 0x1D @@ -828514,7 +800296,7 @@ _08195488: ldr r1, [sp, 0x8] ldr r2, [sp] bl sub_8193ED0 - ldr r3, _081954F0 + ldr r3, =0x03005d90 ldr r1, [r3] ldr r5, [sp, 0x8] lsls r2, r5, 1 @@ -828524,22 +800306,18 @@ _08195488: adds r1, r2 b _08195874 .align 2, 0 -_081954F0: .4byte 0x03005d90 -_081954F4: .4byte 0x00000d25 -_081954F8: .4byte 0xffc00000 -_081954FC: .4byte 0x00000d24 -_08195500: .4byte 0xff800000 + .pool _08195504: - ldr r4, _0819556C + ldr r4, =0x03005d90 ldr r3, [r4] ldr r0, [sp, 0x8] lsls r2, r0, 2 adds r0, r3, r2 - ldr r1, _08195570 + ldr r1, =0x00000d24 adds r0, r1 ldrh r0, [r0] lsls r0, 22 - ldr r1, _08195574 + ldr r1, =0xff800000 str r2, [sp, 0x30] cmp r0, r1 bne _0819557C @@ -828548,7 +800326,7 @@ _08195504: beq _0819557C lsls r2, 2 adds r1, r3, r2 - ldr r3, _08195578 + ldr r3, =0x00000d25 adds r1, r3 ldrb r0, [r1] movs r3, 0x4 @@ -828556,7 +800334,7 @@ _08195504: strb r0, [r1] ldr r1, [r4] adds r1, r2 - ldr r0, _08195578 + ldr r0, =0x00000d25 adds r1, r0 ldrb r0, [r1] movs r2, 0x19 @@ -828581,10 +800359,7 @@ _08195504: str r5, [sp, 0x24] b _08195876 .align 2, 0 -_0819556C: .4byte 0x03005d90 -_08195570: .4byte 0x00000d24 -_08195574: .4byte 0xff800000 -_08195578: .4byte 0x00000d25 + .pool _0819557C: adds r5, 0x1 str r5, [sp, 0x24] @@ -828616,14 +800391,14 @@ _081955AA: lsls r7, r5, 1 ldr r4, [sp, 0x18] _081955B0: - ldr r2, _08195770 + ldr r2, =0x03005d90 ldr r1, [r2] - ldr r3, _08195774 + ldr r3, =0x00000d64 adds r1, r3 ldr r2, [sp, 0x38] adds r0, r1, r2 ldrh r0, [r0] - ldr r3, _08195778 + ldr r3, =0x0203bc8c mov r8, r3 ldr r2, [r3] lsls r0, 4 @@ -828648,9 +800423,9 @@ _081955B0: adds r5, 0x1 cmp r5, 0x3 ble _081955AA - ldr r2, _08195770 + ldr r2, =0x03005d90 ldr r0, [r2] - ldr r3, _08195774 + ldr r3, =0x00000d64 adds r0, r3 add r0, r9 ldrh r0, [r0] @@ -828659,7 +800434,7 @@ _081955B0: lsls r0, 4 adds r0, r1 ldrh r2, [r0] - ldr r0, _0819577C + ldr r0, =0x083203cc lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -828721,14 +800496,14 @@ _08195678: str r5, [sp, 0x3C] ldr r4, [sp, 0x20] _08195682: - ldr r5, _08195770 + ldr r5, =0x03005d90 ldr r1, [r5] - ldr r0, _08195774 + ldr r0, =0x00000d64 adds r1, r0 mov r2, r8 adds r0, r1, r2 ldrh r0, [r0] - ldr r5, _08195778 + ldr r5, =0x0203bc8c mov r9, r5 ldr r2, [r5] lsls r0, 4 @@ -828755,11 +800530,11 @@ _08195682: ldr r5, [sp, 0x3C] cmp r5, 0x3 ble _08195678 - ldr r2, _08195770 + ldr r2, =0x03005d90 ldr r0, [r2] ldr r5, [sp, 0x1C] adds r1, r3, r5 - ldr r2, _08195774 + ldr r2, =0x00000d64 adds r0, r2 adds r0, r1 ldrh r0, [r0] @@ -828768,7 +800543,7 @@ _08195682: lsls r0, 4 adds r0, r1 ldrh r2, [r0] - ldr r0, _0819577C + ldr r0, =0x083203cc lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -828803,11 +800578,11 @@ _08195682: ldr r2, [sp, 0xC] cmp r2, r0 ble _08195784 - ldr r3, _08195770 + ldr r3, =0x03005d90 ldr r1, [r3] ldr r5, [sp, 0x30] adds r1, r5 - ldr r0, _08195780 + ldr r0, =0x00000d25 adds r1, r0 ldrb r0, [r1] movs r2, 0x4 @@ -828815,7 +800590,7 @@ _08195682: strb r0, [r1] ldr r1, [r3] adds r1, r5 - ldr r3, _08195780 + ldr r3, =0x00000d25 adds r1, r3 ldrb r0, [r1] movs r5, 0x19 @@ -828828,7 +800603,7 @@ _08195682: ldr r1, [sp, 0x8] ldr r2, [sp] bl sub_8193ED0 - ldr r3, _08195770 + ldr r3, =0x03005d90 ldr r1, [r3] movs r5, 0xEC lsls r5, 4 @@ -828837,31 +800612,27 @@ _08195682: adds r1, r2 b _08195874 .align 2, 0 -_08195770: .4byte 0x03005d90 -_08195774: .4byte 0x00000d64 -_08195778: .4byte 0x0203bc8c -_0819577C: .4byte 0x083203cc -_08195780: .4byte 0x00000d25 + .pool _08195784: ldr r3, [sp, 0xC] ldr r5, [sp, 0x10] cmp r3, r5 bge _081957DC - ldr r0, _081957D4 + ldr r0, =0x03005d90 ldr r1, [r0] ldr r3, [sp, 0x4] lsls r2, r3, 2 adds r1, r2 - ldr r5, _081957D8 + ldr r5, =0x00000d25 adds r1, r5 ldrb r0, [r1] movs r3, 0x4 orrs r0, r3 strb r0, [r1] - ldr r5, _081957D4 + ldr r5, =0x03005d90 ldr r1, [r5] adds r1, r2 - ldr r0, _081957D8 + ldr r0, =0x00000d25 adds r1, r0 ldrb r0, [r1] movs r2, 0x19 @@ -828882,24 +800653,23 @@ _08195784: adds r1, r2 b _08195874 .align 2, 0 -_081957D4: .4byte 0x03005d90 -_081957D8: .4byte 0x00000d25 + .pool _081957DC: ldr r3, [sp, 0x4] ldr r5, [sp, 0x8] cmp r3, r5 ble _08195830 - ldr r0, _08195828 + ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, [sp, 0x30] adds r1, r2 - ldr r3, _0819582C + ldr r3, =0x00000d25 adds r1, r3 ldrb r0, [r1] movs r5, 0x4 orrs r0, r5 strb r0, [r1] - ldr r0, _08195828 + ldr r0, =0x03005d90 ldr r1, [r0] adds r1, r2 adds r1, r3 @@ -828914,7 +800684,7 @@ _081957DC: ldr r1, [sp, 0x8] ldr r2, [sp] bl sub_8193ED0 - ldr r5, _08195828 + ldr r5, =0x03005d90 ldr r1, [r5] movs r2, 0xEC lsls r2, 4 @@ -828922,21 +800692,20 @@ _081957DC: ldr r3, [sp, 0x2C] b _08195872 .align 2, 0 -_08195828: .4byte 0x03005d90 -_0819582C: .4byte 0x00000d25 + .pool _08195830: - ldr r5, _08195890 + ldr r5, =0x03005d90 ldr r1, [r5] ldr r0, [sp, 0x4] lsls r2, r0, 2 adds r1, r2 - ldr r3, _08195894 + ldr r3, =0x00000d25 adds r1, r3 ldrb r0, [r1] movs r5, 0x4 orrs r0, r5 strb r0, [r1] - ldr r0, _08195890 + ldr r0, =0x03005d90 ldr r1, [r0] adds r1, r2 adds r1, r3 @@ -828951,7 +800720,7 @@ _08195830: ldr r1, [sp, 0x4] ldr r2, [sp] bl sub_8193ED0 - ldr r5, _08195890 + ldr r5, =0x03005d90 ldr r1, [r5] movs r2, 0xEC lsls r2, 4 @@ -828976,8 +800745,7 @@ _0819587E: pop {r0} bx r0 .align 2, 0 -_08195890: .4byte 0x03005d90 -_08195894: .4byte 0x00000d25 + .pool thumb_func_end sub_8195438 thumb_func_start sub_8195898 @@ -828988,19 +800756,19 @@ sub_8195898: @ 8195898 lsrs r5, r1, 16 movs r4, 0 bl sub_8165C40 - ldr r0, _081958B4 + ldr r0, =0x000003fe cmp r5, r0 bne _081958B8 adds r0, r6, 0 bl sub_8195938 b _08195902 .align 2, 0 -_081958B4: .4byte 0x000003fe + .pool _081958B8: - ldr r0, _081958D4 + ldr r0, =0x000003ff cmp r5, r0 bne _081958DC - ldr r0, _081958D8 + ldr r0, =0x03005d90 ldr r2, [r0] _081958C2: adds r0, r6, r4 @@ -829012,13 +800780,12 @@ _081958C2: ble _081958C2 b _081958FC .align 2, 0 -_081958D4: .4byte 0x000003ff -_081958D8: .4byte 0x03005d90 + .pool _081958DC: - ldr r0, _08195908 + ldr r0, =0x0000012b cmp r5, r0 bhi _081958FC - ldr r0, _0819590C + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r5 @@ -829041,32 +800808,29 @@ _08195902: pop {r0} bx r0 .align 2, 0 -_08195908: .4byte 0x0000012b -_0819590C: .4byte 0x0203bc88 + .pool thumb_func_end sub_8195898 thumb_func_start sub_8195910 sub_8195910: @ 8195910 - ldr r0, _0819591C - ldr r1, _08195920 + ldr r0, =0x08310030 + ldr r1, =0x00007df3 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_0819591C: .4byte 0x08310030 -_08195920: .4byte 0x00007df3 + .pool thumb_func_end sub_8195910 thumb_func_start sub_8195924 sub_8195924: @ 8195924 - ldr r0, _08195930 - ldr r1, _08195934 + ldr r0, =0x08310030 + ldr r1, =0x00007df1 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_08195930: .4byte 0x08310030 -_08195934: .4byte 0x00007df1 + .pool thumb_func_end sub_8195924 thumb_func_start sub_8195938 @@ -829074,7 +800838,7 @@ sub_8195938: @ 8195938 push {r4,lr} adds r3, r0, 0 movs r2, 0 - ldr r4, _0819595C + ldr r4, =0x08317e24 _08195940: adds r0, r3, r2 adds r1, r2, r4 @@ -829090,14 +800854,14 @@ _08195940: pop {r0} bx r0 .align 2, 0 -_0819595C: .4byte 0x08317e24 + .pool thumb_func_end sub_8195938 thumb_func_start sub_8195960 sub_8195960: @ 8195960 push {lr} - ldr r1, _08195978 - ldr r0, _0819597C + ldr r1, =0x0860de50 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -829106,26 +800870,25 @@ sub_8195960: @ 8195960 pop {r0} bx r0 .align 2, 0 -_08195978: .4byte 0x0860de50 -_0819597C: .4byte 0x020375e0 + .pool thumb_func_end sub_8195960 thumb_func_start sub_8195980 sub_8195980: @ 8195980 push {r4-r7,lr} - ldr r4, _08195A14 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _08195A18 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r5, r0, 30 - ldr r0, _08195A1C + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r7, r0, 16 ldr r0, [r4] - ldr r2, _08195A20 + ldr r2, =0x00000ca8 adds r0, r2 movs r6, 0 strb r6, [r0] @@ -829133,7 +800896,7 @@ sub_8195980: @ 8195980 adds r2, 0xA adds r0, r1, r2 strh r6, [r0] - ldr r0, _08195A18 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r2, [r1] movs r0, 0x5 @@ -829141,7 +800904,7 @@ sub_8195980: @ 8195980 ands r0, r2 strb r0, [r1] ldr r1, [r4] - ldr r2, _08195A18 + ldr r2, =0x00000ca9 adds r1, r2 ldrb r2, [r1] movs r0, 0x9 @@ -829149,9 +800912,9 @@ sub_8195980: @ 8195980 ands r0, r2 strb r0, [r1] ldr r4, [r4] - ldr r0, _08195A24 + ldr r0, =0x00000cdc adds r3, r4, r0 - ldr r2, _08195A28 + ldr r2, =0x0860de98 lsls r1, r5, 2 lsls r0, r7, 3 adds r1, r0 @@ -829164,12 +800927,12 @@ sub_8195980: @ 8195980 lsls r0, r5, 1 lsls r1, r7, 2 adds r0, r1 - ldr r2, _08195A2C + ldr r2, =0x00000dc8 adds r1, r4, r2 adds r1, r0 strh r6, [r1] _081959F2: - ldr r0, _08195A30 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -829179,38 +800942,30 @@ _081959F2: negs r3, r3 movs r0, 0 bl saved_warp2_set - ldr r0, _08195A34 + ldr r0, =0x02038bca strh r6, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_08195A14: .4byte 0x03005d90 -_08195A18: .4byte 0x00000ca9 -_08195A1C: .4byte 0x000040ce -_08195A20: .4byte 0x00000ca8 -_08195A24: .4byte 0x00000cdc -_08195A28: .4byte 0x0860de98 -_08195A2C: .4byte 0x00000dc8 -_08195A30: .4byte 0x03005d8c -_08195A34: .4byte 0x02038bca + .pool thumb_func_end sub_8195980 thumb_func_start sub_8195A38 sub_8195A38: @ 8195A38 push {r4-r7,lr} - ldr r5, _08195A64 + ldr r5, =0x03005d90 ldr r0, [r5] - ldr r1, _08195A68 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r7, r0, 30 - ldr r0, _08195A6C + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _08195A70 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 beq _08195A90 @@ -829220,46 +800975,41 @@ sub_8195A38: @ 8195A38 beq _08195A7A b _08195AD0 .align 2, 0 -_08195A64: .4byte 0x03005d90 -_08195A68: .4byte 0x00000ca9 -_08195A6C: .4byte 0x000040ce -_08195A70: .4byte 0x020375e2 + .pool _08195A74: cmp r0, 0x2 beq _08195AB0 b _08195AD0 _08195A7A: - ldr r0, _08195A88 + ldr r0, =0x020375f0 ldr r1, [r5] - ldr r2, _08195A8C + ldr r2, =0x00000dc6 adds r1, r2 ldrh r1, [r1] strh r1, [r0] b _08195AD0 .align 2, 0 -_08195A88: .4byte 0x020375f0 -_08195A8C: .4byte 0x00000dc6 + .pool _08195A90: - ldr r3, _08195AA8 + ldr r3, =0x020375f0 ldr r0, [r5] lsls r1, r7, 1 lsls r2, r6, 2 adds r1, r2 - ldr r2, _08195AAC + ldr r2, =0x00000dc8 adds r0, r2 adds r0, r1 ldrh r0, [r0] strh r0, [r3] b _08195AD0 .align 2, 0 -_08195AA8: .4byte 0x020375f0 -_08195AAC: .4byte 0x00000dc8 + .pool _08195AB0: - ldr r4, _08195AD8 + ldr r4, =0x020375f0 ldr r2, [r5] - ldr r0, _08195ADC + ldr r0, =0x00000cdc adds r2, r0 - ldr r3, _08195AE0 + ldr r3, =0x0860de98 lsls r0, r7, 2 lsls r1, r6, 3 adds r0, r1 @@ -829276,26 +801026,24 @@ _08195AD0: pop {r0} bx r0 .align 2, 0 -_08195AD8: .4byte 0x020375f0 -_08195ADC: .4byte 0x00000cdc -_08195AE0: .4byte 0x0860de98 + .pool thumb_func_end sub_8195A38 thumb_func_start sub_8195AE4 sub_8195AE4: @ 8195AE4 push {r4-r6,lr} - ldr r6, _08195B10 + ldr r6, =0x03005d90 ldr r0, [r6] - ldr r1, _08195B14 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r5, r0, 30 - ldr r0, _08195B18 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _08195B1C + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 beq _08195B3C @@ -829305,49 +801053,44 @@ sub_8195AE4: @ 8195AE4 beq _08195B26 b _08195BA0 .align 2, 0 -_08195B10: .4byte 0x03005d90 -_08195B14: .4byte 0x00000ca9 -_08195B18: .4byte 0x000040ce -_08195B1C: .4byte 0x020375e2 + .pool _08195B20: cmp r0, 0x2 beq _08195B5C b _08195BA0 _08195B26: ldr r0, [r6] - ldr r1, _08195B34 + ldr r1, =0x020375e4 ldrh r1, [r1] - ldr r2, _08195B38 + ldr r2, =0x00000dc6 adds r0, r2 strh r1, [r0] b _08195BA0 .align 2, 0 -_08195B34: .4byte 0x020375e4 -_08195B38: .4byte 0x00000dc6 + .pool _08195B3C: ldr r2, [r6] lsls r0, r5, 1 lsls r1, r4, 2 adds r0, r1 - ldr r1, _08195B54 + ldr r1, =0x00000dc8 adds r2, r1 adds r2, r0 - ldr r0, _08195B58 + ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] b _08195BA0 .align 2, 0 -_08195B54: .4byte 0x00000dc8 -_08195B58: .4byte 0x020375e4 + .pool _08195B5C: - ldr r0, _08195B7C + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 beq _08195B88 ldr r2, [r6] - ldr r0, _08195B80 + ldr r0, =0x00000cdc adds r2, r0 - ldr r3, _08195B84 + ldr r3, =0x0860de98 lsls r1, r5, 2 lsls r0, r4, 3 adds r1, r0 @@ -829357,14 +801100,12 @@ _08195B5C: orrs r0, r1 b _08195B9E .align 2, 0 -_08195B7C: .4byte 0x020375e4 -_08195B80: .4byte 0x00000cdc -_08195B84: .4byte 0x0860de98 + .pool _08195B88: ldr r2, [r6] - ldr r1, _08195BA8 + ldr r1, =0x00000cdc adds r2, r1 - ldr r3, _08195BAC + ldr r3, =0x0860dea8 lsls r1, r5, 2 lsls r0, r4, 3 adds r1, r0 @@ -829379,32 +801120,31 @@ _08195BA0: pop {r0} bx r0 .align 2, 0 -_08195BA8: .4byte 0x00000cdc -_08195BAC: .4byte 0x0860dea8 + .pool thumb_func_end sub_8195AE4 thumb_func_start sub_8195BB0 sub_8195BB0: @ 8195BB0 push {r4,lr} - ldr r0, _08195BEC + ldr r0, =0x000040ce bl var_get lsls r0, 16 - ldr r1, _08195BF0 + ldr r1, =0x03005d90 ldr r2, [r1] - ldr r3, _08195BF4 + ldr r3, =0x00000ca9 adds r1, r2, r3 ldrb r1, [r1] lsls r1, 30 lsrs r1, 29 lsrs r0, 14 adds r1, r0 - ldr r0, _08195BF8 + ldr r0, =0x00000dc8 adds r2, r0 adds r2, r1 ldrh r0, [r2] cmp r0, 0x31 bhi _08195C00 - ldr r4, _08195BFC + ldr r4, =0x020375f0 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -829413,21 +801153,17 @@ sub_8195BB0: @ 8195BB0 strh r0, [r4] b _08195C16 .align 2, 0 -_08195BEC: .4byte 0x000040ce -_08195BF0: .4byte 0x03005d90 -_08195BF4: .4byte 0x00000ca9 -_08195BF8: .4byte 0x00000dc8 -_08195BFC: .4byte 0x020375f0 + .pool _08195C00: cmp r0, 0x62 bhi _08195C10 - ldr r1, _08195C0C + ldr r1, =0x020375f0 movs r0, 0x3 b _08195C14 .align 2, 0 -_08195C0C: .4byte 0x020375f0 + .pool _08195C10: - ldr r1, _08195C1C + ldr r1, =0x020375f0 movs r0, 0x4 _08195C14: strh r0, [r1] @@ -829436,13 +801172,13 @@ _08195C16: pop {r0} bx r0 .align 2, 0 -_08195C1C: .4byte 0x020375f0 + .pool thumb_func_end sub_8195BB0 thumb_func_start sub_8195C20 sub_8195C20: @ 8195C20 push {r4,lr} - ldr r4, _08195C4C + ldr r4, =0x02038bca bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -829461,18 +801197,18 @@ sub_8195C20: @ 8195C20 pop {r0} bx r0 .align 2, 0 -_08195C4C: .4byte 0x02038bca + .pool thumb_func_end sub_8195C20 thumb_func_start sub_8195C50 sub_8195C50: @ 8195C50 push {lr} - ldr r3, _08195C70 + ldr r3, =0x02038bca ldrh r1, [r3] - ldr r0, _08195C74 + ldr r0, =0x0000012b cmp r1, r0 bhi _08195C6C - ldr r2, _08195C78 + ldr r2, =0x0203bc88 movs r0, 0x34 muls r1, r0 ldr r0, [r2] @@ -829483,33 +801219,31 @@ _08195C6C: pop {r0} bx r0 .align 2, 0 -_08195C70: .4byte 0x02038bca -_08195C74: .4byte 0x0000012b -_08195C78: .4byte 0x0203bc88 + .pool thumb_func_end sub_8195C50 thumb_func_start sub_8195C7C sub_8195C7C: @ 8195C7C push {r4-r7,lr} - ldr r4, _08195CD0 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _08195CD4 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r7, r0, 30 - ldr r0, _08195CD8 + ldr r0, =0x000040ce bl var_get lsls r0, 24 ldr r4, [r4] lsls r1, r7, 1 lsrs r5, r0, 22 adds r1, r5 - ldr r3, _08195CDC + ldr r3, =0x00000dc8 adds r6, r4, r3 adds r3, r6, r1 ldrh r2, [r3] - ldr r0, _08195CE0 + ldr r0, =0x0000270e cmp r2, r0 bhi _08195CCA adds r2, 0x1 @@ -829534,21 +801268,17 @@ _08195CCA: pop {r0} bx r0 .align 2, 0 -_08195CD0: .4byte 0x03005d90 -_08195CD4: .4byte 0x00000ca9 -_08195CD8: .4byte 0x000040ce -_08195CDC: .4byte 0x00000dc8 -_08195CE0: .4byte 0x0000270e + .pool thumb_func_end sub_8195C7C thumb_func_start sub_8195CE4 sub_8195CE4: @ 8195CE4 push {r4,lr} - ldr r4, _08195D18 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _08195D1C + ldr r1, =0x020375e2 ldrh r1, [r1] - ldr r2, _08195D20 + ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] movs r0, 0x80 @@ -829556,7 +801286,7 @@ sub_8195CE4: @ 8195CE4 movs r1, 0 bl var_set ldr r1, [r4] - ldr r0, _08195D24 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x4 @@ -829567,28 +801297,25 @@ sub_8195CE4: @ 8195CE4 pop {r0} bx r0 .align 2, 0 -_08195D18: .4byte 0x03005d90 -_08195D1C: .4byte 0x020375e2 -_08195D20: .4byte 0x00000ca8 -_08195D24: .4byte 0x00000ca9 + .pool thumb_func_end sub_8195CE4 thumb_func_start sub_8195D28 sub_8195D28: @ 8195D28 push {r4,r5,lr} - ldr r0, _08195D70 + ldr r0, =0x000040ce bl var_get lsls r0, 16 - ldr r4, _08195D74 + ldr r4, =0x03005d90 ldr r2, [r4] - ldr r3, _08195D78 + ldr r3, =0x00000ca9 adds r1, r2, r3 ldrb r1, [r1] lsls r1, 30 lsrs r1, 29 lsrs r0, 14 adds r1, r0 - ldr r0, _08195D7C + ldr r0, =0x00000dc8 adds r2, r0 adds r2, r1 ldrh r0, [r2] @@ -829596,7 +801323,7 @@ sub_8195D28: @ 8195D28 bls _08195D88 bl GenerateRandomNumber ldr r4, [r4] - ldr r5, _08195D80 + ldr r5, =0x0860de84 lsls r0, 16 lsrs r0, 16 movs r1, 0x9 @@ -829605,20 +801332,15 @@ sub_8195D28: @ 8195D28 lsrs r0, 15 adds r0, r5 ldrh r0, [r0] - ldr r1, _08195D84 + ldr r1, =0x00000dc6 adds r4, r1 b _08195DA6 .align 2, 0 -_08195D70: .4byte 0x000040ce -_08195D74: .4byte 0x03005d90 -_08195D78: .4byte 0x00000ca9 -_08195D7C: .4byte 0x00000dc8 -_08195D80: .4byte 0x0860de84 -_08195D84: .4byte 0x00000dc6 + .pool _08195D88: bl GenerateRandomNumber ldr r4, [r4] - ldr r5, _08195DB0 + ldr r5, =0x0860de78 lsls r0, 16 lsrs r0, 16 movs r1, 0x6 @@ -829627,7 +801349,7 @@ _08195D88: lsrs r0, 15 adds r0, r5 ldrh r0, [r0] - ldr r3, _08195DB4 + ldr r3, =0x00000dc6 adds r4, r3 _08195DA6: strh r0, [r4] @@ -829635,16 +801357,15 @@ _08195DA6: pop {r0} bx r0 .align 2, 0 -_08195DB0: .4byte 0x0860de78 -_08195DB4: .4byte 0x00000dc6 + .pool thumb_func_end sub_8195D28 thumb_func_start sub_8195DB8 sub_8195DB8: @ 8195DB8 push {r4,r5,lr} - ldr r4, _08195DF0 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _08195DF4 + ldr r1, =0x00000dc6 adds r0, r1 ldrh r0, [r0] movs r1, 0x1 @@ -829654,26 +801375,23 @@ sub_8195DB8: @ 8195DB8 cmp r5, 0x1 bne _08195E00 ldr r0, [r4] - ldr r1, _08195DF4 + ldr r1, =0x00000dc6 adds r0, r1 ldrh r0, [r0] - ldr r1, _08195DF8 + ldr r1, =0x02021cc4 bl itemid_get_name ldr r0, [r4] - ldr r1, _08195DF4 + ldr r1, =0x00000dc6 adds r0, r1 movs r1, 0 strh r1, [r0] - ldr r0, _08195DFC + ldr r0, =0x020375f0 strh r5, [r0] b _08195E06 .align 2, 0 -_08195DF0: .4byte 0x03005d90 -_08195DF4: .4byte 0x00000dc6 -_08195DF8: .4byte 0x02021cc4 -_08195DFC: .4byte 0x020375f0 + .pool _08195E00: - ldr r1, _08195E0C + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] _08195E06: @@ -829681,16 +801399,16 @@ _08195E06: pop {r0} bx r0 .align 2, 0 -_08195E0C: .4byte 0x020375f0 + .pool thumb_func_end sub_8195DB8 thumb_func_start sub_8195E10 sub_8195E10: @ 8195E10 push {lr} bl sub_802F588 - ldr r0, _08195E2C + ldr r0, =0x03005cf8 bl sub_8195E34 - ldr r1, _08195E30 + ldr r1, =0x0203cd80 adds r0, 0xA str r0, [r1] movs r0, 0 @@ -829698,8 +801416,7 @@ sub_8195E10: @ 8195E10 pop {r0} bx r0 .align 2, 0 -_08195E2C: .4byte 0x03005cf8 -_08195E30: .4byte 0x0203cd80 + .pool thumb_func_end sub_8195E10 thumb_func_start sub_8195E34 @@ -829728,10 +801445,10 @@ sub_8195E34: @ 8195E34 sub_8195E58: @ 8195E58 push {lr} bl sub_802F588 - ldr r0, _08195E7C + ldr r0, =0x03005cf8 bl sub_8195E34 adds r1, r0, 0 - ldr r2, _08195E80 + ldr r2, =0x0203cd80 ldr r0, [r2] cmp r0, r1 bhi _08195E74 @@ -829743,8 +801460,7 @@ _08195E74: movs r0, 0x1 b _08195E86 .align 2, 0 -_08195E7C: .4byte 0x03005cf8 -_08195E80: .4byte 0x0203cd80 + .pool _08195E84: movs r0, 0 _08195E86: @@ -829756,7 +801472,7 @@ _08195E86: sub_8195E8C: @ 8195E8C push {r4,r5,lr} movs r5, 0x1 - ldr r4, _08195ECC + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr @@ -829784,7 +801500,7 @@ _08195EAE: movs r0, 0 b _08195ED2 .align 2, 0 -_08195ECC: .4byte 0x020244ec + .pool _08195ED0: movs r0, 0x1 _08195ED2: @@ -829796,7 +801512,7 @@ _08195ED2: thumb_func_start sub_8195ED8 sub_8195ED8: @ 8195ED8 push {r4,lr} - ldr r4, _08195F34 + ldr r4, =0x02037318 ldrb r0, [r4, 0x17] bl is_light_level_1_2_3_or_6 lsls r0, 24 @@ -829820,7 +801536,7 @@ sub_8195ED8: @ 8195ED8 cmp r0, 0 beq _08195F30 _08195F0E: - ldr r0, _08195F34 + ldr r0, =0x02037318 ldrb r0, [r0, 0x14] cmp r0, 0x38 bne _08195F38 @@ -829839,7 +801555,7 @@ _08195F30: movs r0, 0 b _08195F3A .align 2, 0 -_08195F34: .4byte 0x02037318 + .pool _08195F38: movs r0, 0x1 _08195F3A: @@ -829851,7 +801567,7 @@ _08195F3A: thumb_func_start sub_8195F40 sub_8195F40: @ 8195F40 push {lr} - ldr r1, _08195F58 + ldr r1, =0x0203cd80 ldrb r0, [r1, 0x6] adds r0, 0x1 strb r0, [r1, 0x6] @@ -829862,7 +801578,7 @@ sub_8195F40: @ 8195F40 movs r0, 0 b _08195F62 .align 2, 0 -_08195F58: .4byte 0x0203cd80 + .pool _08195F5C: movs r0, 0 strb r0, [r1, 0x6] @@ -829885,7 +801601,7 @@ sub_8195F68: @ 8195F68 adds r1, r4, 0 bl __umodsi3 bl sub_8195FF8 - ldr r2, _08195FBC + ldr r2, =0x0203cd80 movs r1, 0 strh r0, [r2, 0x4] strb r1, [r2, 0x7] @@ -829897,7 +801613,7 @@ sub_8195F68: @ 8195F68 bl sub_8196844 adds r4, r0, 0 bl sub_819672C - ldr r1, _08195FC0 + ldr r1, =0x02037318 lsls r0, 16 lsrs r0, 16 ldrb r1, [r1, 0x14] @@ -829911,8 +801627,7 @@ _08195FB8: movs r0, 0 b _08195FC6 .align 2, 0 -_08195FBC: .4byte 0x0203cd80 -_08195FC0: .4byte 0x02037318 + .pool _08195FC4: movs r0, 0x1 _08195FC6: @@ -829952,7 +801667,7 @@ sub_8195FF8: @ 8195FF8 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 - ldr r6, _0819601C + ldr r6, =0x085500a4 _08196000: movs r1, 0xAE lsls r1, 1 @@ -829968,7 +801683,7 @@ _08196000: ldrh r0, [r6] b _0819602C .align 2, 0 -_0819601C: .4byte 0x085500a4 + .pool _08196020: subs r5, 0x1 _08196022: @@ -829986,7 +801701,7 @@ _0819602C: thumb_func_start sub_8196034 sub_8196034: @ 8196034 push {lr} - ldr r0, _08196074 + ldr r0, =0x0000012f bl flag_check lsls r0, 24 cmp r0, 0 @@ -830010,7 +801725,7 @@ sub_8196034: @ 8196034 movs r0, 0x1 b _0819607A .align 2, 0 -_08196074: .4byte 0x0000012f + .pool _08196078: movs r0, 0 _0819607A: @@ -830021,33 +801736,33 @@ _0819607A: thumb_func_start sub_8196080 sub_8196080: @ 8196080 push {lr} - ldr r1, _08196090 + ldr r1, =0x0203cd80 movs r0, 0x1 strb r0, [r1, 0x7] bl task_prev_quest pop {r0} bx r0 .align 2, 0 -_08196090: .4byte 0x0203cd80 + .pool thumb_func_end sub_8196080 thumb_func_start sub_8196094 sub_8196094: @ 8196094 push {lr} - ldr r0, _081960A4 + ldr r0, =sub_81960E0 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_081960A4: .4byte sub_81960E0 + 1 + .pool thumb_func_end sub_8196094 thumb_func_start task_prev_quest task_prev_quest: @ 81960A8 push {lr} - ldr r0, _081960D4 + ldr r0, =0x0203cd80 ldrb r0, [r0, 0x7] cmp r0, 0 bne _081960C2 @@ -830056,17 +801771,15 @@ task_prev_quest: @ 81960A8 bl sub_808B864 bl sub_808BCF4 _081960C2: - ldr r0, _081960D8 + ldr r0, =0x00000107 bl audio_play - ldr r0, _081960DC + ldr r0, =sub_81960E0 + 1 movs r1, 0x1 bl AddTask pop {r0} bx r0 .align 2, 0 -_081960D4: .4byte 0x0203cd80 -_081960D8: .4byte 0x00000107 -_081960DC: .4byte sub_81960E0 + 1 + .pool thumb_func_end task_prev_quest thumb_func_start sub_81960E0 @@ -830077,9 +801790,9 @@ sub_81960E0: @ 81960E0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _08196124 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r1, _08196128 + ldr r1, =0x0860ef78 movs r2, 0 ldrsh r0, [r4, r2] lsls r0, 2 @@ -830105,8 +801818,7 @@ _0819611E: pop {r0} bx r0 .align 2, 0 -_08196124: .4byte 0x03005e08 -_08196128: .4byte 0x0860ef78 + .pool thumb_func_end sub_81960E0 thumb_func_start sub_819612C @@ -830119,9 +801831,9 @@ sub_819612C: @ 819612C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _08196154 + ldr r1, =0x03005e08 adds r5, r0, r1 - ldr r0, _08196158 + ldr r0, =0x0860ef98 bl Window_AddFromTemplate strh r0, [r5, 0x4] lsls r0, 16 @@ -830131,10 +801843,9 @@ sub_819612C: @ 819612C adds r0, r4, 0 b _081961E0 .align 2, 0 -_08196154: .4byte 0x03005e08 -_08196158: .4byte 0x0860ef98 + .pool _0819615C: - ldr r1, _08196180 + ldr r1, =0x0860ea6c movs r2, 0x80 lsls r2, 1 movs r3, 0x9C @@ -830142,7 +801853,7 @@ _0819615C: movs r0, 0 bl gpu_copy_bg_tile_pattern_data_to_vram lsls r0, 16 - ldr r1, _08196184 + ldr r1, =0xffff0000 cmp r0, r1 bne _08196188 ldrb r0, [r5, 0x4] @@ -830150,11 +801861,10 @@ _0819615C: adds r0, r4, 0 b _081961E0 .align 2, 0 -_08196180: .4byte 0x0860ea6c -_08196184: .4byte 0xffff0000 + .pool _08196188: - ldr r1, _081961C4 - ldr r3, _081961C8 + ldr r1, =0x0860eb8c + ldr r3, =0x00000279 movs r0, 0 str r0, [sp] movs r2, 0 @@ -830164,26 +801874,22 @@ _08196188: ldrb r0, [r5, 0x4] movs r1, 0x88 bl Window_FastFillPixels - ldr r0, _081961CC + ldr r0, =0x0860ea4c movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _081961D0 + ldr r0, =0x0860eb6c movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r1, _081961D4 + ldr r1, =0xffffe000 movs r0, 0 movs r2, 0 bl bg_change_y_offset movs r0, 0x1 b _081961E6 .align 2, 0 -_081961C4: .4byte 0x0860eb8c -_081961C8: .4byte 0x00000279 -_081961CC: .4byte 0x0860ea4c -_081961D0: .4byte 0x0860eb6c -_081961D4: .4byte 0xffffe000 + .pool _081961D8: ldrb r0, [r5, 0x4] bl Window_Remove @@ -830207,7 +801913,7 @@ sub_81961F0: @ 81961F0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0819625C + ldr r0, =0x03005e08 adds r4, r1, r0 bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -830221,7 +801927,7 @@ sub_81961F0: @ 81961F0 lsls r1, 2 movs r2, 0xE bl sub_819645C - ldr r1, _08196260 + ldr r1, =0x0000f279 movs r0, 0x4 str r0, [sp] str r0, [sp, 0x4] @@ -830233,7 +801939,7 @@ sub_81961F0: @ 81961F0 movs r2, 0x1 movs r3, 0xF bl bg_write_sequence_to_wram_tile_map_rect - ldr r0, _08196264 + ldr r0, =sub_8196694 + 1 movs r1, 0xA bl AddTask lsls r0, 24 @@ -830247,9 +801953,7 @@ sub_81961F0: @ 81961F0 movs r0, 0x1 b _0819626A .align 2, 0 -_0819625C: .4byte 0x03005e08 -_08196260: .4byte 0x0000f279 -_08196264: .4byte sub_8196694 + 1 + .pool _08196268: movs r0, 0 _0819626A: @@ -830267,7 +801971,7 @@ sub_8196274: @ 8196274 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08196294 + ldr r0, =0x03005e08 adds r4, r1, r0 bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -830276,11 +801980,11 @@ sub_8196274: @ 8196274 movs r0, 0 b _081962A4 .align 2, 0 -_08196294: .4byte 0x03005e08 + .pool _08196298: movs r1, 0x4 ldrsh r0, [r4, r1] - ldr r1, _081962AC + ldr r1, =0x0860ef70 bl sub_81965D8 movs r0, 0x1 _081962A4: @@ -830288,7 +801992,7 @@ _081962A4: pop {r1} bx r1 .align 2, 0 -_081962AC: .4byte 0x0860ef70 + .pool thumb_func_end sub_8196274 thumb_func_start sub_81962B0 @@ -830322,7 +802026,7 @@ sub_81962D8: @ 81962D8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _0819631C + ldr r0, =0x03005e08 adds r4, r1, r0 movs r1, 0x4 ldrsh r0, [r4, r1] @@ -830332,24 +802036,22 @@ sub_81962D8: @ 81962D8 ldrb r0, [r4, 0x4] movs r1, 0x88 bl Window_FastFillPixels - ldr r1, _08196320 + ldr r1, =0x0203cd80 ldrb r0, [r1, 0x7] cmp r0, 0 bne _0819630C ldrh r0, [r1, 0x4] - ldr r1, _08196324 + ldr r1, =0x02021fc4 bl sub_81967AC _0819630C: movs r1, 0x4 ldrsh r0, [r4, r1] - ldr r1, _08196324 + ldr r1, =0x02021fc4 bl sub_81965D8 movs r0, 0x1 b _0819632A .align 2, 0 -_0819631C: .4byte 0x03005e08 -_08196320: .4byte 0x0203cd80 -_08196324: .4byte 0x02021fc4 + .pool _08196328: movs r0, 0 _0819632A: @@ -830366,7 +802068,7 @@ sub_8196330: @ 8196330 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08196380 + ldr r0, =0x03005e08 adds r4, r1, r0 movs r1, 0x4 ldrsh r0, [r4, r1] @@ -830377,7 +802079,7 @@ sub_8196330: @ 8196330 lsls r0, 24 cmp r0, 0 bne _08196388 - ldr r0, _08196384 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -830395,8 +802097,7 @@ sub_8196330: @ 8196330 movs r0, 0x1 b _0819638A .align 2, 0 -_08196380: .4byte 0x03005e08 -_08196384: .4byte 0x030022c0 + .pool _08196388: movs r0, 0 _0819638A: @@ -830414,21 +802115,20 @@ sub_8196390: @ 8196390 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081963B8 + ldr r0, =0x03005e08 adds r4, r1, r0 movs r1, 0xC0 lsls r1, 3 movs r0, 0 movs r2, 0x2 bl bg_change_y_offset - ldr r1, _081963BC + ldr r1, =0xffffe000 cmp r0, r1 ble _081963C0 movs r0, 0 b _081963E8 .align 2, 0 -_081963B8: .4byte 0x03005e08 -_081963BC: .4byte 0xffffe000 + .pool _081963C0: movs r0, 0x1E str r0, [sp] @@ -830468,7 +802168,7 @@ sub_81963F0: @ 81963F0 movs r1, 0 movs r2, 0 bl bg_change_y_offset - ldr r0, _0819644C + ldr r0, =0x0203cd80 ldrb r0, [r0, 0x7] cmp r0, 0 bne _08196446 @@ -830483,7 +802183,7 @@ sub_81963F0: @ 81963F0 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _08196450 + ldr r1, =0x02037350 adds r0, r1 bl sub_8093284 bl sub_80D338C @@ -830493,8 +802193,7 @@ _08196446: movs r0, 0x1 b _08196456 .align 2, 0 -_0819644C: .4byte 0x0203cd80 -_08196450: .4byte 0x02037350 + .pool _08196454: movs r0, 0 _08196456: @@ -830718,7 +802417,7 @@ sub_81965D8: @ 81965D8 movs r0, 0xE0 orrs r1, r0 strb r1, [r2, 0xD] - ldr r2, _08196644 + ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x3 negs r0, r0 @@ -830735,30 +802434,29 @@ sub_81965D8: @ 81965D8 pop {r0} bx r0 .align 2, 0 -_08196644: .4byte 0x03003014 + .pool thumb_func_end sub_81965D8 thumb_func_start sub_8196648 sub_8196648: @ 8196648 push {r4,lr} adds r4, r0, 0 - ldr r0, _08196664 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _0819666C - ldr r0, _08196668 + ldr r0, =0x03003014 ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] b _08196678 .align 2, 0 -_08196664: .4byte 0x030022c0 -_08196668: .4byte 0x03003014 + .pool _0819666C: - ldr r2, _08196690 + ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 @@ -830775,7 +802473,7 @@ _08196678: pop {r1} bx r1 .align 2, 0 -_08196690: .4byte 0x03003014 + .pool thumb_func_end sub_8196648 thumb_func_start sub_8196694 @@ -830787,7 +802485,7 @@ sub_8196694: @ 8196694 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08196704 + ldr r0, =0x03005e08 adds r2, r1, r0 ldrh r0, [r2] adds r0, 0x1 @@ -830810,10 +802508,10 @@ _081966C8: movs r0, 0x2 ldrsh r1, [r2, r0] lsls r1, 4 - ldr r0, _08196708 + ldr r0, =0x00000279 adds r1, r0 strh r1, [r2, 0x4] - ldr r2, _0819670C + ldr r2, =0xfffff000 adds r0, r2, 0 orrs r1, r0 lsls r1, 16 @@ -830836,16 +802534,14 @@ _081966FC: pop {r0} bx r0 .align 2, 0 -_08196704: .4byte 0x03005e08 -_08196708: .4byte 0x00000279 -_0819670C: .4byte 0xfffff000 + .pool thumb_func_end sub_8196694 thumb_func_start sub_8196710 sub_8196710: @ 8196710 - ldr r1, _08196724 + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r2, _08196728 + ldr r2, =0x000009ca adds r1, r2 adds r1, r0 ldrb r1, [r1] @@ -830854,14 +802550,13 @@ sub_8196710: @ 8196710 lsrs r0, 31 bx lr .align 2, 0 -_08196724: .4byte 0x03005d8c -_08196728: .4byte 0x000009ca + .pool thumb_func_end sub_8196710 thumb_func_start sub_819672C sub_819672C: @ 819672C push {lr} - ldr r1, _08196744 + ldr r1, =0x085500a4 lsls r0, 4 adds r0, r1 ldrh r2, [r0, 0xA] @@ -830872,7 +802567,7 @@ sub_819672C: @ 819672C pop {r1} bx r1 .align 2, 0 -_08196744: .4byte 0x085500a4 + .pool thumb_func_end sub_819672C thumb_func_start sub_8196748 @@ -830880,7 +802575,7 @@ sub_8196748: @ 8196748 push {r4-r6,lr} movs r5, 0 movs r6, 0 - ldr r4, _08196770 + ldr r4, =0x085500a4 _08196750: ldrh r0, [r4] bl trainer_flag_check @@ -830898,7 +802593,7 @@ _0819675E: pop {r1} bx r1 .align 2, 0 -_08196770: .4byte 0x085500a4 + .pool thumb_func_end sub_8196748 thumb_func_start sub_8196774 @@ -830907,7 +802602,7 @@ sub_8196774: @ 8196774 adds r7, r0, 0 movs r4, 0 movs r6, 0 - ldr r5, _08196794 + ldr r5, =0x085500a4 _0819677E: ldrh r0, [r5] bl trainer_flag_check @@ -830919,7 +802614,7 @@ _0819677E: adds r0, r4, 0 b _081967A4 .align 2, 0 -_08196794: .4byte 0x085500a4 + .pool _08196798: adds r6, 0x1 _0819679A: @@ -830941,7 +802636,7 @@ sub_81967AC: @ 81967AC movs r7, 0 bl sub_8196844 adds r5, r0, 0 - ldr r0, _081967E4 + ldr r0, =0x0203cd88 strh r7, [r0] adds r0, r5, 0 bl sub_8196710 @@ -830949,7 +802644,7 @@ sub_81967AC: @ 81967AC beq _081967EC adds r0, r5, 0 bl sub_819672C - ldr r1, _081967E8 + ldr r1, =0x02037318 lsls r0, 16 lsrs r0, 16 ldrb r1, [r1, 0x14] @@ -830960,8 +802655,7 @@ sub_81967AC: @ 81967AC bl sub_8196864 b _08196830 .align 2, 0 -_081967E4: .4byte 0x0203cd88 -_081967E8: .4byte 0x02037318 + .pool _081967EC: adds r0, r5, 0 bl sub_8196D74 @@ -831010,7 +802704,7 @@ sub_8196844: @ 8196844 push {lr} adds r3, r0, 0 movs r2, 0 - ldr r1, _08196858 + ldr r1, =0x0860deb8 _0819684C: ldrh r0, [r1] cmp r0, r3 @@ -831019,7 +802713,7 @@ _0819684C: adds r2, 0x1 b _0819684C .align 2, 0 -_08196858: .4byte 0x0860deb8 + .pool _0819685C: adds r0, r2, 0 pop {r1} @@ -831028,7 +802722,7 @@ _0819685C: thumb_func_start sub_8196864 sub_8196864: @ 8196864 - ldr r2, _08196888 + ldr r2, =0x0860deb8 lsls r1, r0, 2 adds r1, r0 lsls r1, 2 @@ -831039,7 +802733,7 @@ sub_8196864: @ 8196864 subs r0, 0x1 ands r1, r2 subs r1, 0x1 - ldr r2, _0819688C + ldr r2, =0x0860ea2c lsls r0, 2 adds r0, r2 lsls r1, 3 @@ -831047,13 +802741,12 @@ sub_8196864: @ 8196864 adds r0, r1 bx lr .align 2, 0 -_08196888: .4byte 0x0860deb8 -_0819688C: .4byte 0x0860ea2c + .pool thumb_func_end sub_8196864 thumb_func_start sub_8196890 sub_8196890: @ 8196890 - ldr r2, _081968B4 + ldr r2, =0x0860deb8 lsls r1, r0, 2 adds r1, r0 lsls r1, 2 @@ -831064,7 +802757,7 @@ sub_8196890: @ 8196890 subs r0, 0x1 ands r1, r2 subs r1, 0x1 - ldr r2, _081968B8 + ldr r2, =0x0860ea2c lsls r0, 2 adds r0, r2 lsls r1, 3 @@ -831072,8 +802765,7 @@ sub_8196890: @ 8196890 adds r0, r1 bx lr .align 2, 0 -_081968B4: .4byte 0x0860deb8 -_081968B8: .4byte 0x0860ea2c + .pool thumb_func_end sub_8196890 thumb_func_start sub_81968BC @@ -831086,7 +802778,7 @@ sub_81968BC: @ 81968BC movs r1, 0x3 bl __umodsi3 lsls r0, 16 - ldr r2, _08196908 + ldr r2, =0x0860deb8 lsrs r0, 15 lsls r1, r4, 2 adds r1, r4 @@ -831105,7 +802797,7 @@ _081968EC: subs r0, 0x1 ands r4, r1 subs r1, r4, 0x1 - ldr r2, _0819690C + ldr r2, =0x0860ea20 lsls r0, 2 adds r0, r2 lsls r1, 3 @@ -831115,8 +802807,7 @@ _081968EC: pop {r1} bx r1 .align 2, 0 -_08196908: .4byte 0x0860deb8 -_0819690C: .4byte 0x0860ea20 + .pool thumb_func_end sub_81968BC thumb_func_start sub_8196910 @@ -831169,7 +802860,7 @@ _08196962: lsrs r0, 16 mov r1, sp bl sub_8196E04 - ldr r1, _081969A0 + ldr r1, =0x0203cd88 strh r0, [r1, 0x2] lsls r0, 16 lsrs r0, 16 @@ -831178,15 +802869,15 @@ _08196962: cmp r5, 0 bne _0819695E _08196980: - ldr r0, _081969A0 + ldr r0, =0x0203cd88 strh r4, [r0] - ldr r1, _081969A4 + ldr r1, =0x0860deb8 adds r0, r7, r6 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0xC] subs r2, r0, 0x1 - ldr r1, _081969A8 + ldr r1, =0x0860ea34 ldr r0, [sp] lsls r0, 2 adds r0, r1 @@ -831195,11 +802886,9 @@ _08196980: adds r0, r1 b _081969D0 .align 2, 0 -_081969A0: .4byte 0x0203cd88 -_081969A4: .4byte 0x0860deb8 -_081969A8: .4byte 0x0860ea34 + .pool _081969AC: - ldr r1, _081969D8 + ldr r1, =0x0860deb8 lsls r0, r6, 2 adds r0, r6 lsls r0, 2 @@ -831211,7 +802900,7 @@ _081969AC: movs r0, 0xFF ands r0, r2 subs r2, r0, 0x1 - ldr r0, _081969DC + ldr r0, =0x0860ea34 lsls r1, 2 adds r1, r0 lsls r2, 3 @@ -831223,8 +802912,7 @@ _081969D0: pop {r1} bx r1 .align 2, 0 -_081969D8: .4byte 0x0860deb8 -_081969DC: .4byte 0x0860ea34 + .pool thumb_func_end sub_8196910 thumb_func_start sub_81969E0 @@ -831248,7 +802936,7 @@ sub_81969FC: @ 81969FC adds r7, r0, 0 adds r6, r1, 0 movs r4, 0 - ldr r5, _08196A28 + ldr r5, =0x0860efa0 _08196A06: adds r1, r6, r4 movs r0, 0 @@ -831268,13 +802956,13 @@ _08196A1A: pop {r0} bx r0 .align 2, 0 -_08196A28: .4byte 0x0860efa0 + .pool thumb_func_end sub_81969FC thumb_func_start sub_8196A2C sub_8196A2C: @ 8196A2C push {lr} - ldr r3, _08196A40 + ldr r3, =0x0860efac lsls r1, 2 adds r1, r3 ldr r3, [r1] @@ -831283,21 +802971,21 @@ sub_8196A2C: @ 8196A2C pop {r0} bx r0 .align 2, 0 -_08196A40: .4byte 0x0860efac + .pool thumb_func_end sub_8196A2C thumb_func_start sub_8196A44 sub_8196A44: @ 8196A44 push {r4-r6,lr} adds r5, r1, 0 - ldr r2, _08196A70 + ldr r2, =0x0860deb8 lsls r1, r0, 2 adds r1, r0 lsls r1, 2 adds r1, r2 ldrh r4, [r1] movs r2, 0 - ldr r3, _08196A74 + ldr r3, =0x0860efc4 adds r6, r3, 0 _08196A5A: lsls r1, r2, 3 @@ -831311,8 +802999,7 @@ _08196A5A: bl gf_strcpy b _08196A90 .align 2, 0 -_08196A70: .4byte 0x0860deb8 -_08196A74: .4byte 0x0860efc4 + .pool _08196A78: adds r3, 0x8 adds r2, 0x1 @@ -831321,7 +803008,7 @@ _08196A78: lsls r1, r4, 2 adds r1, r4 lsls r1, 3 - ldr r0, _08196A98 + ldr r0, =0x08310034 adds r1, r0 adds r0, r5, 0 bl gf_strcpy @@ -831330,7 +803017,7 @@ _08196A90: pop {r0} bx r0 .align 2, 0 -_08196A98: .4byte 0x08310034 + .pool thumb_func_end sub_8196A44 thumb_func_start sub_8196A9C @@ -831489,12 +803176,12 @@ sub_8196B98: @ 8196B98 adds r2, r0, 0 mov r8, r1 movs r3, 0 - ldr r0, _08196C50 + ldr r0, =0x08552d48 ldrb r1, [r0] adds r7, r0, 0 cmp r1, 0xFF beq _08196C5C - ldr r1, _08196C54 + ldr r1, =0x085500a4 lsls r0, r2, 4 adds r2, r0, r1 ldrh r4, [r2, 0xA] @@ -831568,15 +803255,13 @@ _08196C26: ldrh r1, [r0] movs r0, 0xB muls r1, r0 - ldr r0, _08196C58 + ldr r0, =0x083185c8 adds r1, r0 mov r0, r8 bl gf_strcpy b _08196C62 .align 2, 0 -_08196C50: .4byte 0x08552d48 -_08196C54: .4byte 0x085500a4 -_08196C58: .4byte 0x083185c8 + .pool _08196C5C: movs r0, 0xFF mov r5, r8 @@ -831594,7 +803279,7 @@ _08196C62: sub_8196C70: @ 8196C70 push {r4-r7,lr} adds r7, r1, 0 - ldr r2, _08196CC8 + ldr r2, =0x0860deb8 lsls r1, r0, 2 adds r1, r0 lsls r1, 2 @@ -831603,7 +803288,7 @@ sub_8196C70: @ 8196C70 bl sub_80B2250 lsls r0, 16 lsrs r0, 16 - ldr r5, _08196CCC + ldr r5, =0x08310030 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -831634,8 +803319,7 @@ _08196CC2: lsls r0, 3 b _08196CD6 .align 2, 0 -_08196CC8: .4byte 0x0860deb8 -_08196CCC: .4byte 0x08310030 + .pool _08196CD0: lsls r0, 3 b _08196CD6 @@ -831646,7 +803330,7 @@ _08196CD6: ldrh r1, [r0, 0x4] movs r0, 0xB muls r1, r0 - ldr r0, _08196CF0 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r7, 0 bl gf_strcpy @@ -831654,15 +803338,15 @@ _08196CD6: pop {r0} bx r0 .align 2, 0 -_08196CF0: .4byte 0x083185c8 + .pool thumb_func_end sub_8196C70 thumb_func_start sub_8196CF4 sub_8196CF4: @ 8196CF4 push {lr} adds r0, r1, 0 - ldr r2, _08196D0C - ldr r1, _08196D10 + ldr r2, =0x0860eff4 + ldr r1, =0x0203cd88 ldrh r1, [r1] lsls r1, 2 adds r1, r2 @@ -831671,8 +803355,7 @@ sub_8196CF4: @ 8196CF4 pop {r0} bx r0 .align 2, 0 -_08196D0C: .4byte 0x0860eff4 -_08196D10: .4byte 0x0203cd88 + .pool thumb_func_end sub_8196CF4 thumb_func_start sub_8196D14 @@ -831680,7 +803363,7 @@ sub_8196D14: @ 8196D14 push {r4-r6,lr} adds r5, r1, 0 movs r4, 0 - ldr r0, _08196D48 + ldr r0, =0x0203cd88 ldrh r1, [r0, 0x2] adds r6, r0, 0 cmp r1, 0 @@ -831704,17 +803387,17 @@ _08196D34: pop {r0} bx r0 .align 2, 0 -_08196D48: .4byte 0x0203cd88 + .pool thumb_func_end sub_8196D14 thumb_func_start sub_8196D4C sub_8196D4C: @ 8196D4C push {r4,r5,lr} movs r4, 0 - ldr r5, _08196D54 + ldr r5, =0x0860f010 b _08196D5C .align 2, 0 -_08196D54: .4byte 0x0860f010 + .pool _08196D58: adds r5, 0x2 adds r4, 0x1 @@ -831745,16 +803428,16 @@ sub_8196D74: @ 8196D74 ble _08196DF4 bl sub_802F69C adds r4, r0, 0 - ldr r0, _08196DE4 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xA bl sub_80842DC adds r6, r0, 0 - ldr r0, _08196DE8 + ldr r0, =0x0000ffff ands r6, r0 - ldr r0, _08196DEC + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _08196DF0 + ldr r1, =0x00002e6a adds r0, r1 ldrh r5, [r0] bl sub_8196748 @@ -831783,10 +803466,7 @@ sub_8196D74: @ 8196D74 movs r0, 0x1 b _08196DF6 .align 2, 0 -_08196DE4: .4byte 0x03005d90 -_08196DE8: .4byte 0x0000ffff -_08196DEC: .4byte 0x03005d8c -_08196DF0: .4byte 0x00002e6a + .pool _08196DF4: movs r0, 0 _08196DF6: @@ -831810,12 +803490,12 @@ sub_8196E04: @ 8196E04 b _08196F7E _08196E14: lsls r0, 2 - ldr r1, _08196E20 + ldr r1, =_08196E24 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_08196E20: .4byte _08196E24 + .pool .align 2, 0 _08196E24: .4byte _08196E9C @@ -831827,9 +803507,9 @@ _08196E24: .4byte _08196F60 _08196E40: movs r3, 0 - ldr r0, _08196E6C + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08196E70 + ldr r1, =0x00000d14 adds r0, r1 _08196E4A: lsls r1, r3, 2 @@ -831851,12 +803531,11 @@ _08196E5A: movs r0, 0x3 b _08196F7C .align 2, 0 -_08196E6C: .4byte 0x03005d90 -_08196E70: .4byte 0x00000d14 + .pool _08196E74: - ldr r0, _08196E94 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08196E98 + ldr r1, =0x00000e08 adds r0, r1 movs r3, 0x1 _08196E7E: @@ -831872,11 +803551,10 @@ _08196E86: movs r0, 0x4 b _08196F7C .align 2, 0 -_08196E94: .4byte 0x03005d90 -_08196E98: .4byte 0x00000e08 + .pool _08196E9C: movs r3, 0 - ldr r0, _08196ECC + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xCF lsls r1, 4 @@ -831902,10 +803580,10 @@ _08196EB8: str r2, [r5] b _08196F7E .align 2, 0 -_08196ECC: .4byte 0x03005d90 + .pool _08196ED0: movs r3, 0 - ldr r0, _08196F00 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xDD lsls r1, 4 @@ -831931,12 +803609,12 @@ _08196EEC: str r2, [r5] b _08196F7E .align 2, 0 -_08196F00: .4byte 0x03005d90 + .pool _08196F04: movs r3, 0 - ldr r0, _08196F30 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08196F34 + ldr r1, =0x00000dea adds r0, r1 _08196F0E: lsls r1, r3, 2 @@ -831959,12 +803637,11 @@ _08196F1E: str r2, [r5] b _08196F7E .align 2, 0 -_08196F30: .4byte 0x03005d90 -_08196F34: .4byte 0x00000dea + .pool _08196F38: - ldr r0, _08196F58 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08196F5C + ldr r1, =0x00000dde adds r0, r1 movs r3, 0x1 _08196F42: @@ -831981,12 +803658,11 @@ _08196F4A: str r3, [r5] b _08196F7E .align 2, 0 -_08196F58: .4byte 0x03005d90 -_08196F5C: .4byte 0x00000dde + .pool _08196F60: - ldr r0, _08196F88 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _08196F8C + ldr r1, =0x00000e1e adds r0, r1 movs r3, 0x1 _08196F6A: @@ -832008,8 +803684,7 @@ _08196F7E: pop {r1} bx r1 .align 2, 0 -_08196F88: .4byte 0x03005d90 -_08196F8C: .4byte 0x00000e1e + .pool thumb_func_end sub_8196E04 thumb_func_start sub_8196F90 @@ -832128,7 +803803,7 @@ _0819702E: lsls r0, 16 lsrs r4, r0, 16 _08197050: - ldr r0, _08197074 + ldr r0, =0x00000199 bl species_to_pokedex_index lsls r0, 16 lsrs r0, 16 @@ -832146,7 +803821,7 @@ _0819706C: movs r0, 0x14 b _0819707A .align 2, 0 -_08197074: .4byte 0x00000199 + .pool _08197078: movs r0, 0x13 _0819707A: @@ -832182,13 +803857,13 @@ _081970A2: bl sub_80C0844 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _0819716C + ldr r0, =0x02021cc4 mov r10, r0 adds r1, r4, 0 movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r1, _08197170 + ldr r1, =0x02021dc4 mov r9, r1 mov r0, r9 adds r1, r6, 0 @@ -832200,20 +803875,20 @@ _081970A2: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08197174 + ldr r1, =0x082a5c9c adds r0, r7, 0 bl gf_strcpy adds r5, r0, 0 movs r6, 0xFB strb r6, [r5] adds r5, 0x1 - ldr r1, _08197178 + ldr r1, =0x082a5d2c adds r0, r5, 0 bl gf_strcpy adds r5, r0, 0 strb r6, [r5] adds r5, 0x1 - ldr r0, _0819717C + ldr r0, =0x0860f020 lsls r4, 2 adds r4, r0 ldr r1, [r4] @@ -832246,7 +803921,7 @@ _081970A2: movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r1, _08197180 + ldr r1, =0x082a633d adds r0, r5, 0 bl ExpandTextCodes _08197156: @@ -832261,12 +803936,7 @@ _0819715C: pop {r0} bx r0 .align 2, 0 -_0819716C: .4byte 0x02021cc4 -_08197170: .4byte 0x02021dc4 -_08197174: .4byte 0x082a5c9c -_08197178: .4byte 0x082a5d2c -_0819717C: .4byte 0x0860f020 -_08197180: .4byte 0x082a633d + .pool thumb_func_end sub_8197080 thumb_func_start sub_8197184 @@ -832280,14 +803950,14 @@ sub_8197184: @ 8197184 bl Window_GetField lsls r0, 24 lsrs r0, 24 - ldr r1, _081971BC + ldr r1, =0x0860ea6c movs r2, 0x80 lsls r2, 1 lsls r4, 16 lsrs r4, 16 adds r3, r4, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r0, _081971C0 + ldr r0, =0x0860ea4c lsls r5, 20 lsrs r5, 16 adds r1, r5, 0 @@ -832297,8 +803967,7 @@ sub_8197184: @ 8197184 pop {r0} bx r0 .align 2, 0 -_081971BC: .4byte 0x0860ea6c -_081971C0: .4byte 0x0860ea4c + .pool thumb_func_end sub_8197184 thumb_func_start sub_81971C4 @@ -832312,19 +803981,17 @@ sub_81971C4: @ 81971C4 thumb_func_start sub_81971D0 sub_81971D0: @ 81971D0 push {lr} - ldr r0, _081971E8 + ldr r0, =0x0860f098 bl Window_InitFromTemplates - ldr r0, _081971EC + ldr r0, =0x0203cd8c movs r1, 0xFF strb r1, [r0] - ldr r0, _081971F0 + ldr r0, =0x0203cd8d strb r1, [r0] pop {r0} bx r0 .align 2, 0 -_081971E8: .4byte 0x0860f098 -_081971EC: .4byte 0x0203cd8c -_081971F0: .4byte 0x0203cd8d + .pool thumb_func_end sub_81971D0 thumb_func_start sub_81971F4 @@ -832415,7 +804082,7 @@ text_box_related_one: @ 8197238 ands r1, r4 orrs r1, r6 strb r1, [r0, 0xD] - ldr r2, _081972C0 + ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x3 negs r0, r0 @@ -832434,7 +804101,7 @@ text_box_related_one: @ 8197238 pop {r1} bx r1 .align 2, 0 -_081972C0: .4byte 0x03003014 + .pool thumb_func_end text_box_related_one thumb_func_start get_map_name @@ -832444,7 +804111,7 @@ get_map_name: @ 81972C4 lsls r0, 24 lsrs r0, 24 movs r5, 0 - ldr r3, _08197308 + ldr r3, =0x03003014 movs r4, 0x1 ands r0, r4 ldrb r2, [r3] @@ -832457,7 +804124,7 @@ get_map_name: @ 81972C4 adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r2, _0819730C + ldr r2, =0x02021fc4 str r5, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -832472,8 +804139,7 @@ get_map_name: @ 81972C4 pop {r0} bx r0 .align 2, 0 -_08197308: .4byte 0x03003014 -_0819730C: .4byte 0x02021fc4 + .pool thumb_func_end get_map_name thumb_func_start sub_8197310 @@ -832482,7 +804148,7 @@ sub_8197310: @ 8197310 sub sp, 0x10 lsls r0, 24 lsrs r0, 24 - ldr r3, _08197354 + ldr r3, =0x03003014 movs r4, 0x1 ands r0, r4 ldrb r2, [r3] @@ -832495,7 +804161,7 @@ sub_8197310: @ 8197310 adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r2, _08197358 + ldr r2, =0x02021fc4 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -832511,8 +804177,7 @@ sub_8197310: @ 8197310 pop {r0} bx r0 .align 2, 0 -_08197354: .4byte 0x03003014 -_08197358: .4byte 0x02021fc4 + .pool thumb_func_end sub_8197310 thumb_func_start sub_819735C @@ -832524,7 +804189,7 @@ sub_819735C: @ 819735C lsrs r0, 24 lsls r3, 24 lsrs r3, 24 - ldr r4, _0819739C + ldr r4, =0x03003014 movs r5, 0x1 ands r0, r5 ldrb r2, [r4] @@ -832533,7 +804198,7 @@ sub_819735C: @ 819735C ands r1, r2 orrs r1, r0 strb r1, [r4] - ldr r2, _081973A0 + ldr r2, =0x02021fc4 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -832549,8 +804214,7 @@ sub_819735C: @ 819735C pop {r0} bx r0 .align 2, 0 -_0819739C: .4byte 0x03003014 -_081973A0: .4byte 0x02021fc4 + .pool thumb_func_end sub_819735C thumb_func_start sub_81973A4 @@ -832578,7 +804242,7 @@ sub_81973C4: @ 81973C4 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, _081973F8 + ldr r1, =sub_81975F4 + 1 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -832596,7 +804260,7 @@ _081973F2: pop {r0} bx r0 .align 2, 0 -_081973F8: .4byte sub_81975F4 + 1 + .pool thumb_func_end sub_81973C4 thumb_func_start sub_81973FC @@ -832607,7 +804271,7 @@ sub_81973FC: @ 81973FC lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, _08197430 + ldr r1, =sub_81974A4 + 1 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -832625,7 +804289,7 @@ _0819742A: pop {r0} bx r0 .align 2, 0 -_08197430: .4byte sub_81974A4 + 1 + .pool thumb_func_end sub_81973FC thumb_func_start sub_8197434 @@ -832636,7 +804300,7 @@ sub_8197434: @ 8197434 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, _08197468 + ldr r1, =sub_8197804 + 1 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -832654,7 +804318,7 @@ _08197462: pop {r0} bx r0 .align 2, 0 -_08197468: .4byte sub_8197804 + 1 + .pool thumb_func_end sub_8197434 thumb_func_start sub_819746C @@ -832665,7 +804329,7 @@ sub_819746C: @ 819746C lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, _081974A0 + ldr r1, =sub_81977BC + 1 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -832683,7 +804347,7 @@ _0819749A: pop {r0} bx r0 .align 2, 0 -_081974A0: .4byte sub_81977BC + 1 + .pool thumb_func_end sub_819746C thumb_func_start sub_81974A4 @@ -832730,7 +804394,7 @@ sub_81974A4: @ 81974A4 adds r1, r3, 0 adds r3, r4, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081975DC + ldr r1, =0x00000215 ldr r2, [sp, 0x10] str r2, [sp] str r5, [sp, 0x4] @@ -832739,7 +804403,7 @@ sub_81974A4: @ 81974A4 ldr r2, [sp, 0xC] adds r3, r4, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081975E0 + ldr r1, =0x00000216 ldr r3, [sp, 0xC] ldr r2, [sp, 0x10] adds r0, r3, r2 @@ -832770,7 +804434,7 @@ _0819753E: mov r2, r8 str r2, [sp, 0x8] adds r0, r7, 0 - ldr r1, _081975E4 + ldr r1, =0x00000217 ldr r3, [sp, 0x18] lsrs r2, r3, 24 adds r3, r4, 0 @@ -832780,7 +804444,7 @@ _0819753E: mov r0, r8 str r0, [sp, 0x8] adds r0, r7, 0 - ldr r1, _081975E8 + ldr r1, =0x00000219 mov r3, r10 lsrs r2, r3, 24 adds r3, r4, 0 @@ -832791,7 +804455,7 @@ _0819753E: cmp r5, r0 blt _0819753E _08197578: - ldr r1, _081975EC + ldr r1, =0x0000021a ldr r2, [sp, 0xC] subs r2, 0x1 lsls r2, 24 @@ -832808,7 +804472,7 @@ _08197578: adds r0, r7, 0 adds r3, r4, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081975F0 + ldr r1, =0x0000021b ldr r0, [sp, 0x10] str r0, [sp] str r5, [sp, 0x4] @@ -832839,12 +804503,7 @@ _08197578: pop {r0} bx r0 .align 2, 0 -_081975DC: .4byte 0x00000215 -_081975E0: .4byte 0x00000216 -_081975E4: .4byte 0x00000217 -_081975E8: .4byte 0x00000219 -_081975EC: .4byte 0x0000021a -_081975F0: .4byte 0x0000021b + .pool thumb_func_end sub_81974A4 thumb_func_start sub_81975F4 @@ -832870,7 +804529,7 @@ sub_81975F4: @ 81975F4 lsls r1, r2, 24 lsrs r1, 24 str r1, [sp, 0x10] - ldr r1, _0819778C + ldr r1, =0x00000201 lsrs r2, r0, 24 str r2, [sp, 0xC] movs r3, 0xFE @@ -832894,7 +804553,7 @@ sub_81975F4: @ 81975F4 ldr r2, [sp, 0x14] adds r3, r5, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _08197790 + ldr r1, =0x00000203 ldr r0, [sp, 0xC] subs r0, 0x1 lsls r2, r0, 24 @@ -832922,7 +804581,7 @@ sub_81975F4: @ 81975F4 ldr r2, [sp, 0xC] adds r3, r5, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _08197794 + ldr r1, =0x00000205 ldr r7, [sp, 0xC] add r7, r8 subs r0, r7, 0x1 @@ -832936,7 +804595,7 @@ sub_81975F4: @ 81975F4 adds r0, r6, 0 adds r3, r5, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _08197798 + ldr r1, =0x00000206 lsls r2, r7, 24 lsrs r7, r2, 24 str r4, [sp] @@ -832947,7 +804606,7 @@ sub_81975F4: @ 81975F4 adds r2, r7, 0 adds r3, r5, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _0819779C + ldr r1, =0x00000207 str r4, [sp] movs r5, 0x5 str r5, [sp, 0x4] @@ -832957,7 +804616,7 @@ sub_81975F4: @ 81975F4 ldr r2, [sp, 0x14] mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081977A0 + ldr r1, =0x00000209 add r8, r4 mov r3, r8 lsls r3, 24 @@ -832970,7 +804629,7 @@ sub_81975F4: @ 81975F4 ldr r2, [sp, 0x18] mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081977A4 + ldr r1, =0x0000020a str r4, [sp] str r5, [sp, 0x4] mov r2, r9 @@ -832979,7 +804638,7 @@ sub_81975F4: @ 81975F4 adds r2, r7, 0 mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081977A8 + ldr r1, =0x00000a01 ldr r3, [sp, 0x10] add r10, r3 mov r0, r10 @@ -832994,7 +804653,7 @@ sub_81975F4: @ 81975F4 ldr r2, [sp, 0x14] mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081977AC + ldr r1, =0x00000a03 str r4, [sp] str r4, [sp, 0x4] mov r3, r9 @@ -833003,7 +804662,7 @@ sub_81975F4: @ 81975F4 ldr r2, [sp, 0x18] mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081977B0 + ldr r1, =0x00000a04 ldr r0, [sp, 0x1C] str r0, [sp] str r4, [sp, 0x4] @@ -833013,7 +804672,7 @@ sub_81975F4: @ 81975F4 ldr r2, [sp, 0xC] mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081977B4 + ldr r1, =0x00000a05 str r4, [sp] str r4, [sp, 0x4] mov r3, r9 @@ -833022,7 +804681,7 @@ sub_81975F4: @ 81975F4 ldr r2, [sp, 0x20] mov r3, r10 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081977B8 + ldr r1, =0x00000a06 str r4, [sp] str r4, [sp, 0x4] mov r0, r9 @@ -833040,18 +804699,7 @@ sub_81975F4: @ 81975F4 pop {r0} bx r0 .align 2, 0 -_0819778C: .4byte 0x00000201 -_08197790: .4byte 0x00000203 -_08197794: .4byte 0x00000205 -_08197798: .4byte 0x00000206 -_0819779C: .4byte 0x00000207 -_081977A0: .4byte 0x00000209 -_081977A4: .4byte 0x0000020a -_081977A8: .4byte 0x00000a01 -_081977AC: .4byte 0x00000a03 -_081977B0: .4byte 0x00000a04 -_081977B4: .4byte 0x00000a05 -_081977B8: .4byte 0x00000a06 + .pool thumb_func_end sub_81975F4 thumb_func_start sub_81977BC @@ -833179,14 +804827,14 @@ sub_819786C: @ 819786C thumb_func_start sub_819789C sub_819789C: @ 819789C push {lr} - ldr r0, _081978AC + ldr r0, =0x0860f074 movs r1, 0xE0 movs r2, 0x14 bl gpu_pal_apply pop {r0} bx r0 .align 2, 0 -_081978AC: .4byte 0x0860f074 + .pool thumb_func_end sub_819789C thumb_func_start sub_81978B0 @@ -833195,21 +804843,21 @@ sub_81978B0: @ 81978B0 adds r1, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r0, _081978C4 + ldr r0, =0x0860f074 movs r2, 0x14 bl gpu_pal_apply pop {r0} bx r0 .align 2, 0 -_081978C4: .4byte 0x0860f074 + .pool thumb_func_end sub_81978B0 thumb_func_start sub_81978C8 sub_81978C8: @ 81978C8 - ldr r0, _081978CC + ldr r0, =0x0860f074 bx lr .align 2, 0 -_081978CC: .4byte 0x0860f074 + .pool thumb_func_end sub_81978C8 thumb_func_start sub_81978D0 @@ -833221,14 +804869,14 @@ sub_81978D0: @ 81978D0 bls _081978DC movs r1, 0 _081978DC: - ldr r0, _081978E8 + ldr r0, =0x0860f074 lsls r1, 1 adds r1, r0 ldrh r0, [r1] pop {r1} bx r1 .align 2, 0 -_081978E8: .4byte 0x0860f074 + .pool thumb_func_end sub_81978D0 thumb_func_start sub_81978EC @@ -833267,7 +804915,7 @@ sub_81978EC: @ 81978EC thumb_func_start sub_8197930 sub_8197930: @ 8197930 push {lr} - ldr r0, _08197944 + ldr r0, =0x0860f0a8 movs r1, 0x85 lsls r1, 2 movs r2, 0xE @@ -833276,7 +804924,7 @@ sub_8197930: @ 8197930 pop {r0} bx r0 .align 2, 0 -_08197944: .4byte 0x0860f0a8 + .pool thumb_func_end sub_8197930 thumb_func_start sub_8197948 @@ -833285,7 +804933,7 @@ sub_8197948: @ 8197948 adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r0, _08197960 + ldr r0, =0x0860f0a8 movs r1, 0x85 lsls r1, 2 movs r2, 0xE @@ -833293,27 +804941,26 @@ sub_8197948: @ 8197948 pop {r0} bx r0 .align 2, 0 -_08197960: .4byte 0x0860f0a8 + .pool thumb_func_end sub_8197948 thumb_func_start sub_8197964 sub_8197964: @ 8197964 push {lr} - ldr r0, _08197980 + ldr r0, =0x03003014 ldrb r1, [r0] movs r0, 0x8 ands r0, r1 cmp r0, 0 bne _08197988 - ldr r0, _08197984 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x14] lsls r0, 29 lsrs r0, 29 b _0819798A .align 2, 0 -_08197980: .4byte 0x03003014 -_08197984: .4byte 0x03005d90 + .pool _08197988: movs r0, 0x1 _0819798A: @@ -833324,7 +804971,7 @@ _0819798A: thumb_func_start sav2_get_text_speed sav2_get_text_speed: @ 8197990 push {lr} - ldr r0, _081979BC + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x14] lsls r0, r1, 29 @@ -833339,14 +804986,13 @@ sav2_get_text_speed: @ 8197990 strb r0, [r2, 0x14] _081979AC: bl sub_8197964 - ldr r1, _081979C0 + ldr r1, =0x0860f094 adds r0, r1 ldrb r0, [r0] pop {r1} bx r1 .align 2, 0 -_081979BC: .4byte 0x03005d90 -_081979C0: .4byte 0x0860f094 + .pool thumb_func_end sav2_get_text_speed thumb_func_start sub_81979C4 @@ -833355,7 +805001,7 @@ sub_81979C4: @ 81979C4 sub sp, 0xC lsls r0, 24 lsrs r1, r0, 24 - ldr r4, _08197A00 + ldr r4, =0x0203cd8c ldrb r0, [r4] cmp r0, 0xFF bne _081979F6 @@ -833367,7 +805013,7 @@ sub_81979C4: @ 81979C4 str r0, [sp] movs r0, 0xF str r0, [sp, 0x4] - ldr r0, _08197A04 + ldr r0, =0x00000139 str r0, [sp, 0x8] movs r0, 0 movs r1, 0x16 @@ -833382,23 +805028,22 @@ _081979F6: pop {r1} bx r1 .align 2, 0 -_08197A00: .4byte 0x0203cd8c -_08197A04: .4byte 0x00000139 + .pool thumb_func_end sub_81979C4 thumb_func_start sub_8197A08 sub_8197A08: @ 8197A08 - ldr r0, _08197A10 + ldr r0, =0x0203cd8c ldrb r0, [r0] bx lr .align 2, 0 -_08197A10: .4byte 0x0203cd8c + .pool thumb_func_end sub_8197A08 thumb_func_start sub_8197A14 sub_8197A14: @ 8197A14 push {r4,lr} - ldr r4, _08197A2C + ldr r4, =0x0203cd8c ldrb r0, [r4] cmp r0, 0xFF beq _08197A26 @@ -833410,7 +805055,7 @@ _08197A26: pop {r0} bx r0 .align 2, 0 -_08197A2C: .4byte 0x0203cd8c + .pool thumb_func_end sub_8197A14 thumb_func_start sub_8197A30 @@ -833431,7 +805076,7 @@ sub_8197A38: @ 8197A38 sub_8197A40: @ 8197A40 push {r4,lr} sub sp, 0xC - ldr r4, _08197A70 + ldr r4, =0x0203cd8d ldrb r0, [r4] cmp r0, 0xFF bne _08197A66 @@ -833454,22 +805099,22 @@ _08197A66: pop {r1} bx r1 .align 2, 0 -_08197A70: .4byte 0x0203cd8d + .pool thumb_func_end sub_8197A40 thumb_func_start rboxid_upload_textbox_1_no_pal rboxid_upload_textbox_1_no_pal: @ 8197A74 - ldr r0, _08197A7C + ldr r0, =0x0203cd8d ldrb r0, [r0] bx lr .align 2, 0 -_08197A7C: .4byte 0x0203cd8d + .pool thumb_func_end rboxid_upload_textbox_1_no_pal thumb_func_start sub_8197A80 sub_8197A80: @ 8197A80 push {r4,lr} - ldr r4, _08197A98 + ldr r4, =0x0203cd8d ldrb r0, [r4] cmp r0, 0xFF beq _08197A92 @@ -833481,7 +805126,7 @@ _08197A92: pop {r0} bx r0 .align 2, 0 -_08197A98: .4byte 0x0203cd8d + .pool thumb_func_end sub_8197A80 thumb_func_start sub_8197A9C @@ -833491,7 +805136,7 @@ sub_8197A9C: @ 8197A9C adds r5, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r3, _08197AE0 + ldr r3, =0x03003014 movs r4, 0x1 ands r0, r4 ldrb r2, [r3] @@ -833504,7 +805149,7 @@ sub_8197A9C: @ 8197A9C adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r2, _08197AE4 + ldr r2, =0x02021fc4 str r5, [sp] movs r0, 0x2 str r0, [sp, 0x4] @@ -833519,8 +805164,7 @@ sub_8197A9C: @ 8197A9C pop {r0} bx r0 .align 2, 0 -_08197AE0: .4byte 0x03003014 -_08197AE4: .4byte 0x02021fc4 + .pool thumb_func_end sub_8197A9C thumb_func_start sub_8197AE8 @@ -833559,11 +805203,11 @@ sub_8197B1C: @ 8197B1C lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r0, _08197B58 + ldr r0, =0x0203cd9c strh r2, [r0] - ldr r0, _08197B5C + ldr r0, =0x0203cd9e strb r3, [r0] - ldr r1, _08197B60 + ldr r1, =sub_8197BB4 + 1 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -833581,9 +805225,7 @@ _08197B52: pop {r0} bx r0 .align 2, 0 -_08197B58: .4byte 0x0203cd9c -_08197B5C: .4byte 0x0203cd9e -_08197B60: .4byte sub_8197BB4 + 1 + .pool thumb_func_end sub_8197B1C thumb_func_start sub_8197B64 @@ -833594,14 +805236,14 @@ sub_8197B64: @ 8197B64 lsrs r6, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r0, _08197BA8 + ldr r0, =0x0203cd9c strh r2, [r0] - ldr r5, _08197BAC + ldr r5, =0x0203cd9e adds r0, r6, 0 movs r1, 0x5 bl Window_GetField strb r0, [r5] - ldr r1, _08197BB0 + ldr r1, =sub_8197BB4 + 1 adds r0, r6, 0 bl CallWindowFunction adds r0, r6, 0 @@ -833619,9 +805261,7 @@ _08197BA2: pop {r0} bx r0 .align 2, 0 -_08197BA8: .4byte 0x0203cd9c -_08197BAC: .4byte 0x0203cd9e -_08197BB0: .4byte sub_8197BB4 + 1 + .pool thumb_func_end sub_8197B64 thumb_func_start sub_8197BB4 @@ -833646,7 +805286,7 @@ sub_8197BB4: @ 8197BB4 lsls r1, r2, 24 lsrs r1, 24 str r1, [sp, 0x10] - ldr r2, _08197DDC + ldr r2, =0x0203cd9c ldrh r1, [r2] adds r1, 0x1 lsls r1, 16 @@ -833667,7 +805307,7 @@ sub_8197BB4: @ 8197BB4 movs r4, 0x1 str r4, [sp] str r4, [sp, 0x4] - ldr r3, _08197DE0 + ldr r3, =0x0203cd9e mov r10, r3 ldrb r0, [r3] str r0, [sp, 0x8] @@ -833675,7 +805315,7 @@ sub_8197BB4: @ 8197BB4 ldr r2, [sp, 0x14] adds r3, r5, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r0, _08197DDC + ldr r0, =0x0203cd9c ldrh r1, [r0] adds r1, 0x3 lsls r1, 16 @@ -833694,7 +805334,7 @@ sub_8197BB4: @ 8197BB4 ldr r2, [sp, 0x18] adds r3, r5, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r3, _08197DDC + ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0x4 lsls r1, 16 @@ -833712,7 +805352,7 @@ sub_8197BB4: @ 8197BB4 ldr r2, [sp, 0xC] adds r3, r5, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r3, _08197DDC + ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0x5 lsls r1, 16 @@ -833732,7 +805372,7 @@ sub_8197BB4: @ 8197BB4 ldr r2, [sp, 0x20] adds r3, r5, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r3, _08197DDC + ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0x6 lsls r1, 16 @@ -833748,7 +805388,7 @@ sub_8197BB4: @ 8197BB4 adds r2, r7, 0 adds r3, r5, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r3, _08197DDC + ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0x7 lsls r1, 16 @@ -833763,7 +805403,7 @@ sub_8197BB4: @ 8197BB4 ldr r2, [sp, 0x14] mov r3, r9 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r3, _08197DDC + ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0x9 lsls r1, 16 @@ -833780,7 +805420,7 @@ sub_8197BB4: @ 8197BB4 ldr r2, [sp, 0x18] mov r3, r9 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r3, _08197DDC + ldr r3, =0x0203cd9c ldrh r1, [r3] adds r1, 0xA lsls r1, 16 @@ -833794,9 +805434,9 @@ sub_8197BB4: @ 8197BB4 adds r2, r7, 0 mov r3, r9 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r3, _08197DE4 + ldr r3, =0x00000801 adds r1, r3, 0 - ldr r0, _08197DDC + ldr r0, =0x0203cd9c ldrh r0, [r0] adds r1, r0 lsls r1, 16 @@ -833815,9 +805455,9 @@ sub_8197BB4: @ 8197BB4 mov r0, r8 ldr r2, [sp, 0x14] bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r3, _08197DE8 + ldr r3, =0x00000803 adds r1, r3, 0 - ldr r0, _08197DDC + ldr r0, =0x0203cd9c ldrh r0, [r0] adds r1, r0 lsls r1, 16 @@ -833831,9 +805471,9 @@ sub_8197BB4: @ 8197BB4 ldr r2, [sp, 0x18] mov r3, r9 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r3, _08197DEC + ldr r3, =0x00000804 adds r1, r3, 0 - ldr r0, _08197DDC + ldr r0, =0x0203cd9c ldrh r0, [r0] adds r1, r0 lsls r1, 16 @@ -833848,9 +805488,9 @@ sub_8197BB4: @ 8197BB4 ldr r2, [sp, 0xC] mov r3, r9 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r0, _08197DF0 + ldr r0, =0x00000805 adds r1, r0, 0 - ldr r2, _08197DDC + ldr r2, =0x0203cd9c ldrh r2, [r2] adds r1, r2 lsls r1, 16 @@ -833864,9 +805504,9 @@ sub_8197BB4: @ 8197BB4 ldr r2, [sp, 0x20] mov r3, r9 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r0, _08197DF4 + ldr r0, =0x00000806 adds r1, r0, 0 - ldr r2, _08197DDC + ldr r2, =0x0203cd9c ldrh r2, [r2] adds r1, r2 lsls r1, 16 @@ -833889,13 +805529,7 @@ sub_8197BB4: @ 8197BB4 pop {r0} bx r0 .align 2, 0 -_08197DDC: .4byte 0x0203cd9c -_08197DE0: .4byte 0x0203cd9e -_08197DE4: .4byte 0x00000801 -_08197DE8: .4byte 0x00000803 -_08197DEC: .4byte 0x00000804 -_08197DF0: .4byte 0x00000805 -_08197DF4: .4byte 0x00000806 + .pool thumb_func_end sub_8197BB4 thumb_func_start sub_8197DF8 @@ -833906,7 +805540,7 @@ sub_8197DF8: @ 8197DF8 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, _08197E2C + ldr r1, =sub_8197E30 + 1 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -833924,7 +805558,7 @@ _08197E26: pop {r0} bx r0 .align 2, 0 -_08197E2C: .4byte sub_8197E30 + 1 + .pool thumb_func_end sub_8197DF8 thumb_func_start sub_8197E30 @@ -833977,11 +805611,11 @@ SetWindowBorderStyle: @ 8197E80 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r0, _08197EBC + ldr r0, =0x0203cd9c strh r2, [r0] - ldr r0, _08197EC0 + ldr r0, =0x0203cd9e strb r3, [r0] - ldr r1, _08197EC4 + ldr r1, =DrawWindowBorder + 1 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -833999,9 +805633,7 @@ _08197EB6: pop {r0} bx r0 .align 2, 0 -_08197EBC: .4byte 0x0203cd9c -_08197EC0: .4byte 0x0203cd9e -_08197EC4: .4byte DrawWindowBorder + 1 + .pool thumb_func_end SetWindowBorderStyle thumb_func_start sub_8197EC8 @@ -834012,14 +805644,14 @@ sub_8197EC8: @ 8197EC8 lsrs r6, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r0, _08197F0C + ldr r0, =0x0203cd9c strh r2, [r0] - ldr r5, _08197F10 + ldr r5, =0x0203cd9e adds r0, r6, 0 movs r1, 0x5 bl Window_GetField strb r0, [r5] - ldr r1, _08197F14 + ldr r1, =DrawWindowBorder + 1 adds r0, r6, 0 bl CallWindowFunction adds r0, r6, 0 @@ -834037,9 +805669,7 @@ _08197F06: pop {r0} bx r0 .align 2, 0 -_08197F0C: .4byte 0x0203cd9c -_08197F10: .4byte 0x0203cd9e -_08197F14: .4byte DrawWindowBorder + 1 + .pool thumb_func_end sub_8197EC8 thumb_func_start DrawWindowBorder @@ -834066,7 +805696,7 @@ DrawWindowBorder: @ 8197F18 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x14] - ldr r2, _08198068 + ldr r2, =0x0203cd9c ldrh r1, [r2] lsrs r0, r6, 24 str r0, [sp, 0xC] @@ -834081,14 +805711,14 @@ DrawWindowBorder: @ 8197F18 movs r5, 0x1 str r5, [sp] str r5, [sp, 0x4] - ldr r7, _0819806C + ldr r7, =0x0203cd9e ldrb r0, [r7] str r0, [sp, 0x8] mov r0, r9 adds r2, r6, 0 adds r3, r4, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r2, _08198068 + ldr r2, =0x0203cd9c ldrh r1, [r2] adds r1, 0x1 lsls r1, 16 @@ -834102,7 +805732,7 @@ DrawWindowBorder: @ 8197F18 ldr r2, [sp, 0xC] adds r3, r4, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r2, _08198068 + ldr r2, =0x0203cd9c ldrh r1, [r2] adds r1, 0x2 lsls r1, 16 @@ -834121,7 +805751,7 @@ DrawWindowBorder: @ 8197F18 mov r2, r10 adds r3, r4, 0 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r0, _08198068 + ldr r0, =0x0203cd9c ldrh r1, [r0] adds r1, 0x3 lsls r1, 16 @@ -834135,7 +805765,7 @@ DrawWindowBorder: @ 8197F18 adds r2, r6, 0 mov r3, r8 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r0, _08198068 + ldr r0, =0x0203cd9c ldrh r1, [r0] adds r1, 0x5 lsls r1, 16 @@ -834149,7 +805779,7 @@ DrawWindowBorder: @ 8197F18 mov r2, r10 mov r3, r8 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r0, _08198068 + ldr r0, =0x0203cd9c ldrh r1, [r0] adds r1, 0x6 lsls r1, 16 @@ -834168,7 +805798,7 @@ DrawWindowBorder: @ 8197F18 adds r2, r6, 0 mov r3, r8 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r2, _08198068 + ldr r2, =0x0203cd9c ldrh r1, [r2] adds r1, 0x7 lsls r1, 16 @@ -834182,7 +805812,7 @@ DrawWindowBorder: @ 8197F18 ldr r2, [sp, 0xC] mov r3, r8 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r2, _08198068 + ldr r2, =0x0203cd9c ldrh r1, [r2] adds r1, 0x8 lsls r1, 16 @@ -834204,8 +805834,7 @@ DrawWindowBorder: @ 8197F18 pop {r0} bx r0 .align 2, 0 -_08198068: .4byte 0x0203cd9c -_0819806C: .4byte 0x0203cd9e + .pool thumb_func_end DrawWindowBorder thumb_func_start sub_8198070 @@ -834216,7 +805845,7 @@ sub_8198070: @ 8198070 lsrs r5, r0, 24 lsls r4, 24 lsrs r4, 24 - ldr r1, _081980A4 + ldr r1, =sub_81980A8 + 1 adds r0, r5, 0 bl CallWindowFunction adds r0, r5, 0 @@ -834234,7 +805863,7 @@ _0819809E: pop {r0} bx r0 .align 2, 0 -_081980A4: .4byte sub_81980A8 + 1 + .pool thumb_func_end sub_8198070 thumb_func_start sub_81980A8 @@ -834318,7 +805947,7 @@ _0819812A: strb r7, [r1, 0x3] strb r5, [r1, 0x5] strh r4, [r1, 0x6] - ldr r4, _08198154 + ldr r4, =0x0203cda0 mov r0, sp bl Window_AddFromTemplate strb r0, [r4] @@ -834327,16 +805956,16 @@ _0819812A: movs r5, 0xF0 b _0819815C .align 2, 0 -_08198154: .4byte 0x0203cda0 + .pool _08198158: lsls r0, r5, 28 lsrs r5, r0, 24 _0819815C: - ldr r0, _08198178 + ldr r0, =0x0860f0b0 adds r1, r5, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _0819817C + ldr r0, =0x0203cda0 ldrb r0, [r0] add sp, 0x8 pop {r3} @@ -834345,8 +805974,7 @@ _0819815C: pop {r1} bx r1 .align 2, 0 -_08198178: .4byte 0x0860f0b0 -_0819817C: .4byte 0x0203cda0 + .pool thumb_func_end sub_81980F0 thumb_func_start sub_8198180 @@ -834361,7 +805989,7 @@ sub_8198180: @ 8198180 lsls r2, 24 lsrs r2, 24 mov r8, r2 - ldr r5, _081981FC + ldr r5, =0x0203cda0 ldrb r0, [r5] cmp r0, 0xFF beq _081981EE @@ -834387,7 +806015,7 @@ sub_8198180: @ 8198180 lsls r2, 24 lsrs r2, 24 ldrb r0, [r5] - ldr r1, _08198200 + ldr r1, =0x0860f0d0 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] @@ -834408,8 +806036,7 @@ _081981EE: pop {r0} bx r0 .align 2, 0 -_081981FC: .4byte 0x0203cda0 -_08198200: .4byte 0x0860f0d0 + .pool thumb_func_end sub_8198180 thumb_func_start sub_8198204 @@ -834432,7 +806059,7 @@ sub_8198204: @ 8198204 lsrs r0, 24 mov r9, r0 movs r4, 0 - ldr r0, _08198240 + ldr r0, =0x0203cda0 ldrb r1, [r0] adds r7, r0, 0 cmp r1, 0xFF @@ -834444,7 +806071,7 @@ sub_8198204: @ 8198204 adds r1, r0, 0 b _0819824A .align 2, 0 -_08198240: .4byte 0x0203cda0 + .pool _08198244: add r1, sp, 0x14 movs r0, 0xF @@ -834521,7 +806148,7 @@ _081982C8: thumb_func_start sub_81982D8 sub_81982D8: @ 81982D8 push {lr} - ldr r1, _081982EC + ldr r1, =0x0203cda0 ldrb r0, [r1] cmp r0, 0xFF beq _081982E8 @@ -834531,13 +806158,13 @@ _081982E8: pop {r0} bx r0 .align 2, 0 -_081982EC: .4byte 0x0203cda0 + .pool thumb_func_end sub_81982D8 thumb_func_start sub_81982F0 sub_81982F0: @ 81982F0 push {r4,lr} - ldr r4, _08198310 + ldr r4, =0x0203cda0 ldrb r0, [r4] cmp r0, 0xFF beq _08198308 @@ -834551,13 +806178,13 @@ _08198308: pop {r0} bx r0 .align 2, 0 -_08198310: .4byte 0x0203cda0 + .pool thumb_func_end sub_81982F0 thumb_func_start sub_8198314 sub_8198314: @ 8198314 push {r4,lr} - ldr r4, _08198344 + ldr r4, =0x0203cda0 ldrb r0, [r4] cmp r0, 0xFF beq _0819833C @@ -834577,7 +806204,7 @@ _0819833C: pop {r0} bx r0 .align 2, 0 -_08198344: .4byte 0x0203cda0 + .pool thumb_func_end sub_8198314 thumb_func_start sub_8198348 @@ -834595,7 +806222,7 @@ sub_8198348: @ 8198348 lsrs r4, 24 lsls r5, 24 lsrs r7, r5, 24 - ldr r5, _0819838C + ldr r5, =0x0203cd90 movs r6, 0 strb r2, [r5] strb r3, [r5, 0x1] @@ -834618,13 +806245,13 @@ _08198388: strb r6, [r5, 0x2] b _08198392 .align 2, 0 -_0819838C: .4byte 0x0203cd90 + .pool _08198390: strb r7, [r5, 0x2] _08198392: movs r0, 0 bl MoveMenuCursor - ldr r0, _081983A8 + ldr r0, =0x0203cd90 ldrb r0, [r0, 0x2] pop {r3} mov r8, r3 @@ -834632,7 +806259,7 @@ _08198392: pop {r1} bx r1 .align 2, 0 -_081983A8: .4byte 0x0203cd90 + .pool thumb_func_end sub_8198348 thumb_func_start sub_81983AC @@ -834733,7 +806360,7 @@ RedrawMenuCursor: @ 8198448 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r5, _081984D0 + ldr r5, =0x0203cd90 ldrb r0, [r5, 0x6] movs r1, 0 bl sub_8006460 @@ -834762,7 +806389,7 @@ RedrawMenuCursor: @ 8198448 bl Window_FillPixelRect ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, _081984D4 + ldr r2, =0x085ee498 ldrb r3, [r5] ldrb r4, [r5, 0x8] mov r6, r8 @@ -834785,14 +806412,13 @@ RedrawMenuCursor: @ 8198448 pop {r0} bx r0 .align 2, 0 -_081984D0: .4byte 0x0203cd90 -_081984D4: .4byte 0x085ee498 + .pool thumb_func_end RedrawMenuCursor thumb_func_start MoveMenuCursor MoveMenuCursor: @ 81984D8 push {r4,r5,lr} - ldr r1, _081984F8 + ldr r1, =0x0203cd90 ldrb r5, [r1, 0x2] movs r2, 0x2 ldrsb r2, [r1, r2] @@ -834807,7 +806433,7 @@ MoveMenuCursor: @ 81984D8 ldrb r0, [r4, 0x4] b _0819850A .align 2, 0 -_081984F8: .4byte 0x0203cd90 + .pool _081984FC: movs r0, 0x4 ldrsb r0, [r4, r0] @@ -834831,7 +806457,7 @@ _0819850A: thumb_func_start MoveMenuCursorNoWrapAround MoveMenuCursorNoWrapAround: @ 819851C push {r4,r5,lr} - ldr r1, _0819853C + ldr r1, =0x0203cd90 ldrb r5, [r1, 0x2] movs r2, 0x2 ldrsb r2, [r1, r2] @@ -834846,7 +806472,7 @@ MoveMenuCursorNoWrapAround: @ 819851C ldrb r0, [r4, 0x3] b _0819854E .align 2, 0 -_0819853C: .4byte 0x0203cd90 + .pool _08198540: movs r0, 0x4 ldrsb r0, [r4, r0] @@ -834869,23 +806495,23 @@ _0819854E: thumb_func_start GetMenuCursorPos GetMenuCursorPos: @ 8198560 - ldr r0, _08198568 + ldr r0, =0x0203cd90 ldrb r0, [r0, 0x2] bx lr .align 2, 0 -_08198568: .4byte 0x0203cd90 + .pool thumb_func_end GetMenuCursorPos thumb_func_start ProcessMenuInput ProcessMenuInput: @ 819856C push {r4,lr} - ldr r0, _08198590 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _08198598 - ldr r4, _08198594 + ldr r4, =0x0203cd90 ldrb r0, [r4, 0xB] cmp r0, 0 bne _08198588 @@ -834896,8 +806522,7 @@ _08198588: ldrsb r0, [r4, r0] b _081985D2 .align 2, 0 -_08198590: .4byte 0x030022c0 -_08198594: .4byte 0x0203cd90 + .pool _08198598: movs r0, 0x2 ands r0, r1 @@ -834938,10 +806563,10 @@ _081985D2: thumb_func_start ProcessMenuInputNoWrapAround ProcessMenuInputNoWrapAround: @ 81985D8 push {r4-r6,lr} - ldr r4, _08198600 + ldr r4, =0x0203cd90 ldrb r5, [r4, 0x2] adds r6, r5, 0 - ldr r0, _08198604 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -834957,8 +806582,7 @@ _081985F8: ldrsb r0, [r4, r0] b _08198650 .align 2, 0 -_08198600: .4byte 0x0203cd90 -_08198604: .4byte 0x030022c0 + .pool _08198608: movs r0, 0x2 ands r0, r1 @@ -835006,13 +806630,13 @@ _08198650: thumb_func_start ProcessMenuInput_other ProcessMenuInput_other: @ 8198658 push {r4,lr} - ldr r2, _0819867C + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _08198684 - ldr r4, _08198680 + ldr r4, =0x0203cd90 ldrb r0, [r4, 0xB] cmp r0, 0 bne _08198674 @@ -835023,8 +806647,7 @@ _08198674: ldrsb r0, [r4, r0] b _081986BC .align 2, 0 -_0819867C: .4byte 0x030022c0 -_08198680: .4byte 0x0203cd90 + .pool _08198684: movs r0, 0x2 ands r0, r1 @@ -835064,10 +806687,10 @@ _081986BC: thumb_func_start ProcessMenuInputNoWrapAround_other ProcessMenuInputNoWrapAround_other: @ 81986C4 push {r4-r6,lr} - ldr r4, _081986EC + ldr r4, =0x0203cd90 ldrb r5, [r4, 0x2] adds r6, r5, 0 - ldr r2, _081986F0 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -835083,8 +806706,7 @@ _081986E4: ldrsb r0, [r4, r0] b _0819873A .align 2, 0 -_081986EC: .4byte 0x0203cd90 -_081986F0: .4byte 0x030022c0 + .pool _081986F4: movs r0, 0x2 ands r0, r1 @@ -835652,7 +807274,7 @@ sub_8198AF8: @ 8198AF8 lsls r1, 24 lsrs r1, 24 mov r10, r1 - ldr r7, _08198C2C + ldr r7, =0x0203cd9f bl Window_AddFromTemplate strb r0, [r7] ldrb r0, [r7] @@ -835660,7 +807282,7 @@ sub_8198AF8: @ 8198AF8 adds r2, r4, 0 adds r3, r5, 0 bl SetWindowBorderStyle - ldr r0, _08198C30 + ldr r0, =0x085ee491 str r0, [sp, 0xC] add r1, sp, 0xC ldrb r0, [r7] @@ -835764,8 +807386,7 @@ sub_8198AF8: @ 8198AF8 pop {r0} bx r0 .align 2, 0 -_08198C2C: .4byte 0x0203cd9f -_08198C30: .4byte 0x085ee491 + .pool thumb_func_end sub_8198AF8 thumb_func_start sub_8198C34 @@ -835810,7 +807431,7 @@ _08198C6E: thumb_func_start sub_8198C78 sub_8198C78: @ 8198C78 push {r4,lr} - ldr r4, _08198C90 + ldr r4, =0x0203cd9f ldrb r0, [r4] movs r1, 0x1 bl sub_8198070 @@ -835820,7 +807441,7 @@ sub_8198C78: @ 8198C78 pop {r0} bx r0 .align 2, 0 -_08198C90: .4byte 0x0203cd9f + .pool thumb_func_end sub_8198C78 thumb_func_start sub_8198C94 @@ -836204,7 +807825,7 @@ sub_8198F58: @ 8198F58 lsrs r4, 24 lsls r5, 24 lsrs r7, r5, 24 - ldr r5, _08198FB0 + ldr r5, =0x0203cd90 movs r6, 0 strb r2, [r5] strb r3, [r5, 0x1] @@ -836231,14 +807852,14 @@ _08198FAC: strb r6, [r5, 0x2] b _08198FB6 .align 2, 0 -_08198FB0: .4byte 0x0203cd90 + .pool _08198FB4: strb r7, [r5, 0x2] _08198FB6: movs r0, 0 movs r1, 0 bl sub_8199134 - ldr r0, _08198FD0 + ldr r0, =0x0203cd90 ldrb r0, [r0, 0x2] pop {r3-r5} mov r8, r3 @@ -836248,7 +807869,7 @@ _08198FB6: pop {r1} bx r1 .align 2, 0 -_08198FD0: .4byte 0x0203cd90 + .pool thumb_func_end sub_8198F58 thumb_func_start sub_8198FD4 @@ -836336,7 +807957,7 @@ sub_8199060: @ 8199060 mov r8, r0 lsls r0, r1, 24 lsrs r7, r0, 24 - ldr r5, _0819912C + ldr r5, =0x0203cd90 ldrb r0, [r5, 0x6] movs r1, 0 bl sub_8006460 @@ -836403,7 +808024,7 @@ sub_8199060: @ 8199060 lsrs r3, 24 ldrb r0, [r5, 0x5] ldrb r1, [r5, 0x6] - ldr r2, _08199130 + ldr r2, =0x085ee498 str r3, [sp] movs r3, 0 str r3, [sp, 0x4] @@ -836419,8 +808040,7 @@ sub_8199060: @ 8199060 pop {r0} bx r0 .align 2, 0 -_0819912C: .4byte 0x0203cd90 -_08199130: .4byte 0x085ee498 + .pool thumb_func_end sub_8199060 thumb_func_start sub_8199134 @@ -836432,7 +808052,7 @@ sub_8199134: @ 8199134 lsls r1, 24 lsrs r1, 24 mov r9, r1 - ldr r1, _08199170 + ldr r1, =0x0203cd90 ldrb r2, [r1, 0x2] mov r8, r2 lsls r0, 24 @@ -836454,7 +808074,7 @@ sub_8199134: @ 8199134 add r0, r8 b _08199188 .align 2, 0 -_08199170: .4byte 0x0203cd90 + .pool _08199174: cmp r0, r4 blt _08199184 @@ -836537,7 +808157,7 @@ sub_81991F8: @ 81991F8 lsls r1, 24 lsrs r1, 24 mov r8, r1 - ldr r1, _08199270 + ldr r1, =0x0203cd90 ldrb r7, [r1, 0x2] lsls r0, 24 asrs r4, r0, 24 @@ -836590,7 +808210,7 @@ _08199258: bl sub_8199060 b _08199276 .align 2, 0 -_08199270: .4byte 0x0203cd90 + .pool _08199274: strb r7, [r5, 0x2] _08199276: @@ -836605,7 +808225,7 @@ _08199276: thumb_func_start sub_8199284 sub_8199284: @ 8199284 push {r4,lr} - ldr r4, _081992A4 + ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 @@ -836613,14 +808233,13 @@ sub_8199284: @ 8199284 beq _081992AC movs r0, 0x5 bl audio_play - ldr r0, _081992A8 + ldr r0, =0x0203cd90 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 b _0819932C .align 2, 0 -_081992A4: .4byte 0x030022c0 -_081992A8: .4byte 0x0203cd90 + .pool _081992AC: movs r0, 0x2 ands r0, r1 @@ -836697,9 +808316,9 @@ _0819932C: thumb_func_start sub_8199334 sub_8199334: @ 8199334 push {r4-r6,lr} - ldr r5, _08199354 + ldr r5, =0x0203cd90 ldrb r4, [r5, 0x2] - ldr r6, _08199358 + ldr r6, =0x030022c0 ldrh r1, [r6, 0x2E] movs r0, 0x1 ands r0, r1 @@ -836711,8 +808330,7 @@ sub_8199334: @ 8199334 ldrsb r0, [r5, r0] b _081993D2 .align 2, 0 -_08199354: .4byte 0x0203cd90 -_08199358: .4byte 0x030022c0 + .pool _0819935C: movs r0, 0x2 ands r0, r1 @@ -836787,7 +808405,7 @@ _081993D2: thumb_func_start sub_81993D8 sub_81993D8: @ 81993D8 push {r4,r5,lr} - ldr r4, _081993F8 + ldr r4, =0x030022c0 ldrh r1, [r4, 0x2E] movs r0, 0x1 ands r0, r1 @@ -836795,14 +808413,13 @@ sub_81993D8: @ 81993D8 beq _08199400 movs r0, 0x5 bl audio_play - ldr r0, _081993FC + ldr r0, =0x0203cd90 ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 b _0819947C .align 2, 0 -_081993F8: .4byte 0x030022c0 -_081993FC: .4byte 0x0203cd90 + .pool _08199400: movs r0, 0x2 ands r0, r1 @@ -836877,9 +808494,9 @@ _0819947C: thumb_func_start sub_8199484 sub_8199484: @ 8199484 push {r4-r6,lr} - ldr r6, _081994A4 + ldr r6, =0x0203cd90 ldrb r4, [r6, 0x2] - ldr r5, _081994A8 + ldr r5, =0x030022c0 ldrh r1, [r5, 0x2E] movs r0, 0x1 ands r0, r1 @@ -836891,8 +808508,7 @@ sub_8199484: @ 8199484 ldrsb r0, [r6, r0] b _0819951E .align 2, 0 -_081994A4: .4byte 0x0203cd90 -_081994A8: .4byte 0x030022c0 + .pool _081994AC: movs r0, 0x2 ands r0, r1 @@ -836969,7 +808585,7 @@ InitMenuInUpperLeftCorner: @ 8199524 lsrs r1, 24 lsls r2, 24 lsrs r5, r2, 24 - ldr r4, _08199558 + ldr r4, =0x0203cd90 movs r6, 0 strb r6, [r4] movs r2, 0x1 @@ -836992,7 +808608,7 @@ _08199554: strb r6, [r4, 0x2] b _0819955E .align 2, 0 -_08199558: .4byte 0x0203cd90 + .pool _0819955C: strb r5, [r4, 0x2] _0819955E: @@ -837195,7 +808811,7 @@ sub_81996C0: @ 81996C0 lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r1, _081997A4 + ldr r1, =0x0203cd9f mov r8, r1 bl Window_AddFromTemplate mov r2, r8 @@ -837205,7 +808821,7 @@ sub_81996C0: @ 81996C0 adds r2, r4, 0 adds r3, r5, 0 bl SetWindowBorderStyle - ldr r0, _081997A8 + ldr r0, =0x085ee491 str r0, [sp] mov r1, sp mov r2, r8 @@ -837288,8 +808904,7 @@ sub_81996C0: @ 81996C0 pop {r0} bx r0 .align 2, 0 -_081997A4: .4byte 0x0203cd9f -_081997A8: .4byte 0x085ee491 + .pool thumb_func_end sub_81996C0 thumb_func_start sub_81997AC @@ -837513,7 +809128,7 @@ sub_8199944: @ 8199944 lsrs r3, 24 lsls r4, 24 lsrs r7, r4, 24 - ldr r6, _0819998C + ldr r6, =0x0203cd90 movs r4, 0 mov r12, r4 mov r4, r12 @@ -837543,52 +809158,52 @@ _08199986: strb r0, [r6, 0x2] b _08199992 .align 2, 0 -_0819998C: .4byte 0x0203cd90 + .pool _08199990: strb r7, [r6, 0x2] _08199992: movs r0, 0 movs r1, 0 bl sub_8199134 - ldr r0, _081999A4 + ldr r0, =0x0203cd90 ldrb r0, [r0, 0x2] pop {r4-r7} pop {r1} bx r1 .align 2, 0 -_081999A4: .4byte 0x0203cd90 + .pool thumb_func_end sub_8199944 thumb_func_start clear_scheduled_bg_copies_to_vram clear_scheduled_bg_copies_to_vram: @ 81999A8 push {lr} - ldr r0, _081999B8 + ldr r0, =0x0203cda4 movs r1, 0 movs r2, 0x4 bl memset pop {r0} bx r0 .align 2, 0 -_081999B8: .4byte 0x0203cda4 + .pool thumb_func_end clear_scheduled_bg_copies_to_vram thumb_func_start schedule_bg_copy_tilemap_to_vram schedule_bg_copy_tilemap_to_vram: @ 81999BC lsls r0, 24 lsrs r0, 24 - ldr r1, _081999CC + ldr r1, =0x0203cda4 adds r0, r1 movs r1, 0x1 strb r1, [r0] bx lr .align 2, 0 -_081999CC: .4byte 0x0203cda4 + .pool thumb_func_end schedule_bg_copy_tilemap_to_vram thumb_func_start do_scheduled_bg_tilemap_copies_to_vram do_scheduled_bg_tilemap_copies_to_vram: @ 81999D0 push {r4,lr} - ldr r4, _08199A1C + ldr r4, =0x0203cda4 ldrb r0, [r4] cmp r0, 0x1 bne _081999E4 @@ -837625,14 +809240,14 @@ _08199A14: pop {r0} bx r0 .align 2, 0 -_08199A1C: .4byte 0x0203cda4 + .pool thumb_func_end do_scheduled_bg_tilemap_copies_to_vram thumb_func_start reset_temp_tile_data_buffers reset_temp_tile_data_buffers: @ 8199A20 push {lr} - ldr r3, _08199A3C - ldr r1, _08199A40 + ldr r3, =0x0203cda8 + ldr r1, =0x0203cdac movs r2, 0 adds r0, r1, 0 adds r0, 0x7C @@ -837646,8 +809261,7 @@ _08199A2C: pop {r0} bx r0 .align 2, 0 -_08199A3C: .4byte 0x0203cda8 -_08199A40: .4byte 0x0203cdac + .pool thumb_func_end reset_temp_tile_data_buffers thumb_func_start free_temp_tile_data_buffers_if_possible @@ -837657,7 +809271,7 @@ free_temp_tile_data_buffers_if_possible: @ 8199A44 lsls r0, 24 cmp r0, 0 bne _08199A88 - ldr r1, _08199A80 + ldr r1, =0x0203cda8 ldrh r0, [r1] cmp r0, 0 beq _08199A7C @@ -837665,27 +809279,26 @@ free_temp_tile_data_buffers_if_possible: @ 8199A44 ldrh r1, [r1] cmp r4, r1 bge _08199A76 - ldr r5, _08199A84 + ldr r5, =0x0203cdac movs r6, 0 _08199A64: ldr r0, [r5] bl free stm r5!, {r6} adds r4, 0x1 - ldr r0, _08199A80 + ldr r0, =0x0203cda8 ldrh r0, [r0] cmp r4, r0 blt _08199A64 _08199A76: - ldr r1, _08199A80 + ldr r1, =0x0203cda8 movs r0, 0 strh r0, [r1] _08199A7C: movs r0, 0 b _08199A8A .align 2, 0 -_08199A80: .4byte 0x0203cda8 -_08199A84: .4byte 0x0203cdac + .pool _08199A88: movs r0, 0x1 _08199A8A: @@ -837712,7 +809325,7 @@ decompress_and_copy_tile_data_to_vram: @ 8199A90 mov r9, r3 lsls r1, 24 lsrs r7, r1, 24 - ldr r6, _08199AF0 + ldr r6, =0x0203cda8 ldrh r0, [r6] cmp r0, 0x1F bhi _08199AF8 @@ -837733,7 +809346,7 @@ _08199AC8: adds r1, r4, 0 mov r3, r9 bl copy_decompressed_tile_data_to_vram - ldr r2, _08199AF4 + ldr r2, =0x0203cdac ldrh r0, [r6] adds r1, r0, 0x1 strh r1, [r6] @@ -837745,8 +809358,7 @@ _08199AEC: adds r0, r4, 0 b _08199AFA .align 2, 0 -_08199AF0: .4byte 0x0203cda8 -_08199AF4: .4byte 0x0203cdac + .pool _08199AF8: movs r0, 0 _08199AFA: @@ -837786,7 +809398,7 @@ copy_decompressed_tile_data_to_vram_autofree: @ 8199B08 _08199B36: cmp r6, 0 beq _08199B6E - ldr r0, _08199B7C + ldr r0, =task_free_buf_after_copying_tile_data_to_vram + 1 movs r1, 0 bl AddTask adds r4, r0, 0 @@ -837799,7 +809411,7 @@ _08199B36: adds r1, r6, 0 mov r3, r9 bl copy_decompressed_tile_data_to_vram - ldr r2, _08199B80 + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -837818,8 +809430,7 @@ _08199B6E: pop {r0} bx r0 .align 2, 0 -_08199B7C: .4byte task_free_buf_after_copying_tile_data_to_vram + 1 -_08199B80: .4byte 0x03005e00 + .pool thumb_func_end copy_decompressed_tile_data_to_vram_autofree thumb_func_start task_free_buf_after_copying_tile_data_to_vram @@ -837827,7 +809438,7 @@ task_free_buf_after_copying_tile_data_to_vram: @ 8199B84 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _08199BBC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -837849,7 +809460,7 @@ _08199BB4: pop {r0} bx r0 .align 2, 0 -_08199BBC: .4byte 0x03005e00 + .pool thumb_func_end task_free_buf_after_copying_tile_data_to_vram thumb_func_start malloc_and_decompress @@ -837896,10 +809507,10 @@ copy_decompressed_tile_data_to_vram: @ 8199BF0 beq _08199C18 cmp r1, 0x1 beq _08199C20 - ldr r0, _08199C14 + ldr r0, =0x0000ffff b _08199C2A .align 2, 0 -_08199C14: .4byte 0x0000ffff + .pool _08199C18: adds r1, r4, 0 bl gpu_copy_bg_tile_pattern_data_to_vram @@ -837956,7 +809567,7 @@ _08199C6E: cmp r3, r0 bge _08199CA0 lsls r6, r5, 5 - ldr r1, _08199CB8 + ldr r1, =0x00000fff mov r12, r1 mov r1, r10 lsls r5, r1, 12 @@ -837990,7 +809601,7 @@ _08199CA8: pop {r0} bx r0 .align 2, 0 -_08199CB8: .4byte 0x00000fff + .pool thumb_func_end sub_8199C30 thumb_func_start sub_8199CBC @@ -838092,7 +809703,7 @@ _08199D64: movs r0, 0xFC lsls r0, 8 mov r12, r0 - ldr r0, _08199D94 + ldr r0, =0x000003ff adds r7, r0, 0 adds r3, r6, 0 adds r2, r4, 0 @@ -838113,7 +809724,7 @@ _08199D8C: pop {r0} bx r0 .align 2, 0 -_08199D94: .4byte 0x000003ff + .pool thumb_func_end sub_8199D3C thumb_func_start sub_8199D98 @@ -838452,10 +810063,10 @@ sub_819A024: @ 819A024 lsls r3, 16 lsrs r5, r3, 16 movs r2, 0 - ldr r0, _0819A078 + ldr r0, =0x03005d90 ldr r3, [r0] ldrb r0, [r3] - ldr r6, _0819A07C + ldr r6, =0x02021fc4 cmp r0, 0xFF beq _0819A04C _0819A042: @@ -838485,8 +810096,7 @@ _0819A04C: pop {r0} bx r0 .align 2, 0 -_0819A078: .4byte 0x03005d90 -_0819A07C: .4byte 0x02021fc4 + .pool thumb_func_end sub_819A024 thumb_func_start sub_819A080 @@ -838632,7 +810242,7 @@ _0819A12E: cmp r0, 0 beq _0819A1B2 ldrh r0, [r4] - ldr r2, _0819A1A4 + ldr r2, =0x00000fff ands r2, r0 adds r0, r5, 0 ands r0, r7 @@ -838644,7 +810254,7 @@ _0819A12E: lsls r0, 8 b _0819A22A .align 2, 0 -_0819A1A4: .4byte 0x00000fff + .pool _0819A1A8: ldrb r1, [r3] mov r0, r9 @@ -838653,7 +810263,7 @@ _0819A1A8: b _0819A22A _0819A1B2: ldrh r0, [r4] - ldr r2, _0819A1CC + ldr r2, =0x0000f0ff ands r2, r0 adds r0, r5, 0 ands r0, r7 @@ -838665,7 +810275,7 @@ _0819A1B2: lsls r0, 4 b _0819A22A .align 2, 0 -_0819A1CC: .4byte 0x0000f0ff + .pool _0819A1D0: ldrb r1, [r3] mov r0, r9 @@ -838678,7 +810288,7 @@ _0819A1DA: cmp r0, 0 beq _0819A206 ldrh r0, [r4] - ldr r2, _0819A1F8 + ldr r2, =0x0000ff0f ands r2, r0 adds r0, r5, 0 ands r0, r7 @@ -838688,7 +810298,7 @@ _0819A1DA: mov r0, r10 b _0819A228 .align 2, 0 -_0819A1F8: .4byte 0x0000ff0f + .pool _0819A1FC: ldrb r1, [r3] mov r0, r9 @@ -838697,7 +810307,7 @@ _0819A1FC: b _0819A22A _0819A206: ldrh r0, [r4] - ldr r2, _0819A220 + ldr r2, =0x0000fff0 ands r2, r0 adds r0, r5, 0 ands r0, r7 @@ -838709,7 +810319,7 @@ _0819A206: lsrs r0, 4 b _0819A22A .align 2, 0 -_0819A220: .4byte 0x0000fff0 + .pool _0819A224: ldrb r1, [r3] mov r0, r9 @@ -838809,17 +810419,17 @@ sub_819A2BC: @ 819A2BC cmp r1, 0x2 beq _0819A2E4 _0819A2D2: - ldr r0, _0819A2D8 + ldr r0, =0x08dc4318 b _0819A2E6 .align 2, 0 -_0819A2D8: .4byte 0x08dc4318 + .pool _0819A2DC: - ldr r0, _0819A2E0 + ldr r0, =0x08dc4338 b _0819A2E6 .align 2, 0 -_0819A2E0: .4byte 0x08dc4338 + .pool _0819A2E4: - ldr r0, _0819A2F4 + ldr r0, =0x08dc4358 _0819A2E6: adds r1, r2, 0 movs r2, 0x20 @@ -838827,7 +810437,7 @@ _0819A2E6: pop {r0} bx r0 .align 2, 0 -_0819A2F4: .4byte 0x08dc4358 + .pool thumb_func_end sub_819A2BC thumb_func_start sub_819A2F8 @@ -838841,12 +810451,12 @@ sub_819A2F8: @ 819A2F8 lsrs r2, 16 lsls r3, 16 lsrs r3, 16 - ldr r4, _0819A33C + ldr r4, =0x0860f0d4 lsrs r1, 22 adds r1, r4 ldrh r5, [r1, 0x2] lsls r5, 5 - ldr r4, _0819A340 + ldr r4, =0x08dc4378 adds r5, r4 movs r4, 0x80 str r4, [sp] @@ -838866,8 +810476,7 @@ sub_819A2F8: @ 819A2F8 pop {r0} bx r0 .align 2, 0 -_0819A33C: .4byte 0x0860f0d4 -_0819A340: .4byte 0x08dc4378 + .pool thumb_func_end sub_819A2F8 thumb_func_start sub_819A344 @@ -838897,12 +810506,12 @@ sub_819A344: @ 819A344 cmp r3, 0x4 bhi _0819A43C lsls r0, r3, 2 - ldr r1, _0819A380 + ldr r1, =_0819A384 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0819A380: .4byte _0819A384 + .pool .align 2, 0 _0819A384: .4byte _0819A398 @@ -838911,13 +810520,13 @@ _0819A384: .4byte _0819A404 .4byte _0819A414 _0819A398: - ldr r0, _0819A3A4 + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r5, 0 bl gf_strcpy b _0819A43C .align 2, 0 -_0819A3A4: .4byte 0x03005d90 + .pool _0819A3A8: bl sub_809D42C cmp r0, 0 @@ -838941,7 +810550,7 @@ _0819A3BE: strb r0, [r5] b _0819A43C _0819A3D6: - ldr r4, _0819A400 + ldr r4, =0x03005d90 ldr r0, [r4] ldrh r1, [r0, 0xE] adds r0, r5, 0 @@ -838960,17 +810569,17 @@ _0819A3D6: bl decimal_int_to_string b _0819A43C .align 2, 0 -_0819A400: .4byte 0x03005d90 + .pool _0819A404: - ldr r0, _0819A410 + ldr r0, =0x02037318 ldrb r1, [r0, 0x14] adds r0, r5, 0 bl sub_81245DC b _0819A43C .align 2, 0 -_0819A410: .4byte 0x02037318 + .pool _0819A414: - ldr r4, _0819A444 + ldr r4, =0x00000867 movs r6, 0 adds r7, r5, 0x1 _0819A41A: @@ -838983,7 +810592,7 @@ _0819A41A: adds r6, 0x1 _0819A42A: adds r4, 0x1 - ldr r0, _0819A448 + ldr r0, =0x0000086e cmp r4, r0 ble _0819A41A adds r0, r6, 0 @@ -838996,8 +810605,7 @@ _0819A43C: pop {r0} bx r0 .align 2, 0 -_0819A444: .4byte 0x00000867 -_0819A448: .4byte 0x0000086e + .pool thumb_func_end sub_819A344 thumb_func_start sub_819A44C @@ -839089,23 +810697,22 @@ sub_819A4E4: @ 819A4E4 thumb_func_start sub_819A4F8 sub_819A4F8: @ 819A4F8 push {lr} - ldr r0, _0819A50C + ldr r0, =0x0300127c movs r1, 0 str r1, [r0] - ldr r0, _0819A510 + ldr r0, =sub_819A514 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0819A50C: .4byte 0x0300127c -_0819A510: .4byte sub_819A514 + 1 + .pool thumb_func_end sub_819A4F8 thumb_func_start sub_819A514 sub_819A514: @ 819A514 push {r4,r5,lr} sub sp, 0xC - ldr r0, _0819A534 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -839115,13 +810722,12 @@ sub_819A514: @ 819A514 b _0819A98E _0819A528: lsls r0, 2 - ldr r1, _0819A538 + ldr r1, =_0819A53C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0819A534: .4byte 0x030022c0 -_0819A538: .4byte _0819A53C + .pool .align 2, 0 _0819A53C: .4byte _0819A568 @@ -839136,7 +810742,7 @@ _0819A53C: .4byte _0819A8DC .4byte _0819A8FC _0819A568: - ldr r4, _0819A5B0 + ldr r4, =0x0203ce3c ldr r0, [r4] cmp r0, 0 beq _0819A578 @@ -839152,42 +810758,39 @@ _0819A578: str r0, [sp, 0x8] movs r1, 0xC0 lsls r1, 19 - ldr r2, _0819A5B4 + ldr r2, =0x05006000 add r0, sp, 0x8 bl CpuSet movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0819A5B8 + ldr r1, =0x08610428 movs r0, 0 movs r2, 0x3 bl bg_vram_setup - ldr r0, _0819A5BC + ldr r0, =0x08610434 bl Window_InitFromTemplates bl TextBox_ResetSomeField b _0819A8E6 .align 2, 0 -_0819A5B0: .4byte 0x0203ce3c -_0819A5B4: .4byte 0x05006000 -_0819A5B8: .4byte 0x08610428 -_0819A5BC: .4byte 0x08610434 + .pool _0819A5C0: - ldr r5, _0819A688 + ldr r5, =0x0203ce2c movs r4, 0x88 lsls r4, 3 adds r0, r4, 0 bl malloc str r0, [r5] - ldr r5, _0819A68C + ldr r5, =0x0203ce30 adds r0, r4, 0 bl malloc_and_clear str r0, [r5] - ldr r5, _0819A690 + ldr r5, =0x0203ce34 movs r4, 0x80 lsls r4, 4 adds r0, r4, 0 bl malloc str r0, [r5] - ldr r5, _0819A694 + ldr r5, =0x0203ce38 adds r0, r4, 0 bl malloc_and_clear str r0, [r5] @@ -839245,30 +810848,26 @@ _0819A5C0: movs r0, 0x4A movs r1, 0 bl lcd_io_set - ldr r1, _0819A698 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _0819A8EE .align 2, 0 -_0819A688: .4byte 0x0203ce2c -_0819A68C: .4byte 0x0203ce30 -_0819A690: .4byte 0x0203ce34 -_0819A694: .4byte 0x0203ce38 -_0819A698: .4byte 0x030022c0 + .pool _0819A69C: bl sub_80A1A74 bl reset_all_obj_data bl clear_tasks bl gpu_pal_allocator_reset - ldr r0, _0819A74C - ldr r5, _0819A750 + ldr r0, =0x08dc0754 + ldr r5, =0x0203ce2c ldr r1, [r5] movs r2, 0x88 lsls r2, 2 bl CpuSet - ldr r0, _0819A754 - ldr r4, _0819A758 + ldr r0, =0x0861033c + ldr r4, =0x0203ce30 ldr r1, [r4] movs r2, 0x30 bl CpuSet @@ -839283,8 +810882,8 @@ _0819A69C: movs r2, 0x60 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r0, _0819A75C - ldr r4, _0819A760 + ldr r0, =0x08dc0b94 + ldr r4, =0x0203ce34 ldr r1, [r4] movs r2, 0x80 lsls r2, 3 @@ -839295,11 +810894,11 @@ _0819A69C: movs r0, 0x1 movs r3, 0 bl gpu_copy_bg_tile_map_to_vram - ldr r0, _0819A764 + ldr r0, =0x08dc0714 movs r1, 0 movs r2, 0x40 bl gpu_pal_apply - ldr r4, _0819A768 + ldr r4, =0x0861046c adds r0, r4, 0 movs r1, 0xF0 movs r2, 0x8 @@ -839308,12 +810907,12 @@ _0819A69C: movs r1, 0xE0 movs r2, 0xA bl gpu_pal_apply - ldr r0, _0819A76C + ldr r0, =0x0300127c ldr r1, [r0] ldrb r0, [r1, 0x6] cmp r0, 0x1 bne _0819A738 - ldr r0, _0819A770 + ldr r0, =0x02037714 movs r2, 0xA9 lsls r2, 2 adds r1, r2 @@ -839323,34 +810922,23 @@ _0819A69C: adds r0, r3 strh r1, [r0] _0819A738: - ldr r0, _0819A774 + ldr r0, =0x0861039c movs r1, 0x20 movs r2, 0x4 bl gpu_pal_apply - ldr r1, _0819A778 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0819A8EE .align 2, 0 -_0819A74C: .4byte 0x08dc0754 -_0819A750: .4byte 0x0203ce2c -_0819A754: .4byte 0x0861033c -_0819A758: .4byte 0x0203ce30 -_0819A75C: .4byte 0x08dc0b94 -_0819A760: .4byte 0x0203ce34 -_0819A764: .4byte 0x08dc0714 -_0819A768: .4byte 0x0861046c -_0819A76C: .4byte 0x0300127c -_0819A770: .4byte 0x02037714 -_0819A774: .4byte 0x0861039c -_0819A778: .4byte 0x030022c0 + .pool _0819A77C: - ldr r0, _0819A7C4 + ldr r0, =0x0203ce38 ldr r1, [r0] movs r0, 0x3 bl bg_set_tilemap - ldr r5, _0819A7C8 + ldr r5, =0x0861023c movs r4, 0x8 str r4, [sp] str r4, [sp, 0x4] @@ -839377,20 +810965,19 @@ _0819A77C: bl gpu_copy_wram_bg_tilemap_to_vram b _0819A8E6 .align 2, 0 -_0819A7C4: .4byte 0x0203ce38 -_0819A7C8: .4byte 0x0861023c + .pool _0819A7CC: - ldr r0, _0819A838 + ldr r0, =0x086103f4 bl gpu_pal_obj_alloc_and_load_multiple - ldr r0, _0819A83C + ldr r0, =0x086103bc bl gpu_tile_obj_alloc_and_load_multiple - ldr r0, _0819A840 + ldr r0, =0x086103e4 bl gpu_tile_obj_decompress_and_load movs r0, 0 bl gpu_sync_bg_show movs r0, 0x1 bl gpu_sync_bg_show - ldr r0, _0819A844 + ldr r0, =sub_819A4E4 + 1 bl SetVBlankCallback movs r0, 0x1 negs r0, r0 @@ -839403,7 +810990,7 @@ _0819A7CC: lsls r1, 5 movs r0, 0 bl lcd_io_set - ldr r0, _0819A848 + ldr r0, =0x0300127c ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0x1 @@ -839415,39 +811002,33 @@ _0819A7CC: bl sub_819C5D0 movs r0, 0x3 bl gpu_sync_bg_show - ldr r1, _0819A84C + ldr r1, =0x00001248 movs r0, 0x50 bl lcd_io_set - ldr r1, _0819A850 + ldr r1, =0x0000040b movs r0, 0x52 bl lcd_io_set b _0819A85A .align 2, 0 -_0819A838: .4byte 0x086103f4 -_0819A83C: .4byte 0x086103bc -_0819A840: .4byte 0x086103e4 -_0819A844: .4byte sub_819A4E4 + 1 -_0819A848: .4byte 0x0300127c -_0819A84C: .4byte 0x00001248 -_0819A850: .4byte 0x0000040b + .pool _0819A854: movs r0, 0x3 bl gpu_sync_bg_hide _0819A85A: - ldr r1, _0819A864 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _0819A8EE .align 2, 0 -_0819A864: .4byte 0x030022c0 + .pool _0819A868: - ldr r4, _0819A898 + ldr r4, =0x0300127c ldr r1, [r4] ldrb r0, [r1, 0x6] cmp r0, 0x1 bne _0819A878 - ldr r0, _0819A89C + ldr r0, =0x0203cf20 ldrb r0, [r0] strb r0, [r1, 0x3] _0819A878: @@ -839459,15 +811040,13 @@ _0819A878: bne _0819A88C bl sub_819BE34 _0819A88C: - ldr r1, _0819A8A0 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0819A8EE .align 2, 0 -_0819A898: .4byte 0x0300127c -_0819A89C: .4byte 0x0203cf20 -_0819A8A0: .4byte 0x030022c0 + .pool _0819A8A4: bl sub_819BA64 movs r0, 0x2 @@ -839476,31 +811055,31 @@ _0819A8AC: bl sub_819BCF8 movs r0, 0x5 bl Window_WriteStandardTileMap - ldr r1, _0819A8C0 + ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 b _0819A8EE .align 2, 0 -_0819A8C0: .4byte 0x030022c0 + .pool _0819A8C4: bl sub_819B9E8 movs r0, 0x1 bl Window_WriteStandardTileMap - ldr r1, _0819A8D8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0819A8EE .align 2, 0 -_0819A8D8: .4byte 0x030022c0 + .pool _0819A8DC: bl sub_819B9B4 movs r0, 0 _0819A8E2: bl Window_WriteStandardTileMap _0819A8E6: - ldr r1, _0819A8F8 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -839510,22 +811089,22 @@ _0819A8EE: strb r0, [r1] b _0819A98E .align 2, 0 -_0819A8F8: .4byte 0x030022c0 + .pool _0819A8FC: - ldr r0, _0819A940 + ldr r0, =sub_819C69C + 1 movs r1, 0 bl AddTask - ldr r2, _0819A944 + ldr r2, =0x0300127c ldr r1, [r2] - ldr r3, _0819A948 + ldr r3, =0x000002a1 adds r1, r3 strb r0, [r1] ldr r3, [r2] ldrb r5, [r3, 0x6] cmp r5, 0 bne _0819A954 - ldr r4, _0819A94C - ldr r1, _0819A948 + ldr r4, =0x03005e00 + ldr r1, =0x000002a1 adds r0, r3, r1 ldrb r1, [r0] lsls r0, r1, 2 @@ -839533,7 +811112,7 @@ _0819A8FC: lsls r0, 3 adds r0, r4 strh r5, [r0, 0x8] - ldr r0, _0819A950 + ldr r0, =sub_819B378 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -839545,14 +811124,10 @@ _0819A8FC: strh r5, [r0, 0x8] b _0819A988 .align 2, 0 -_0819A940: .4byte sub_819C69C + 1 -_0819A944: .4byte 0x0300127c -_0819A948: .4byte 0x000002a1 -_0819A94C: .4byte 0x03005e00 -_0819A950: .4byte sub_819B378 + 1 + .pool _0819A954: - ldr r4, _0819A998 - ldr r2, _0819A99C + ldr r4, =0x03005e00 + ldr r2, =0x000002a1 adds r0, r3, r2 ldrb r1, [r0] lsls r0, r1, 2 @@ -839562,10 +811137,10 @@ _0819A954: movs r2, 0 movs r1, 0x1 strh r1, [r0, 0x8] - ldr r1, _0819A9A0 + ldr r1, =0x000002a2 adds r0, r3, r1 strb r2, [r0] - ldr r0, _0819A9A4 + ldr r0, =sub_819B124 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -839577,7 +811152,7 @@ _0819A954: movs r1, 0xD strh r1, [r0, 0x8] _0819A988: - ldr r0, _0819A9A8 + ldr r0, =sub_819A4C8 + 1 bl set_callback2 _0819A98E: add sp, 0xC @@ -839585,17 +811160,13 @@ _0819A98E: pop {r0} bx r0 .align 2, 0 -_0819A998: .4byte 0x03005e00 -_0819A99C: .4byte 0x000002a1 -_0819A9A0: .4byte 0x000002a2 -_0819A9A4: .4byte sub_819B124 + 1 -_0819A9A8: .4byte sub_819A4C8 + 1 + .pool thumb_func_end sub_819A514 thumb_func_start sub_819A9AC sub_819A9AC: @ 819A9AC push {r4,r5,lr} - ldr r5, _0819AA00 + ldr r5, =0x0300127c ldr r4, [r5] cmp r4, 0 bne _0819AA12 @@ -839623,9 +811194,9 @@ _0819A9D2: lsrs r2, r0, 24 cmp r2, 0x5 bls _0819A9D2 - ldr r0, _0819AA04 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _0819AA08 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r1, [r0] movs r0, 0x3 @@ -839636,9 +811207,7 @@ _0819A9D2: bl sub_819B484 b _0819AA12 .align 2, 0 -_0819AA00: .4byte 0x0300127c -_0819AA04: .4byte 0x03005d90 -_0819AA08: .4byte 0x00000ca9 + .pool _0819AA0C: movs r0, 0 bl sub_819B63C @@ -839655,7 +811224,7 @@ sub_819AA18: @ 819AA18 push {r7} movs r4, 0 mov r8, r4 - ldr r7, _0819AB28 + ldr r7, =0x02020630 _0819AA24: lsls r1, r4, 3 adds r1, r4 @@ -839664,11 +811233,11 @@ _0819AA24: adds r1, 0x20 lsls r1, 16 asrs r1, 16 - ldr r0, _0819AB2C + ldr r0, =0x086105d8 movs r2, 0x40 movs r3, 0x1 bl obj_add_from_template_forward_search - ldr r6, _0819AB30 + ldr r6, =0x0300127c ldr r2, [r6] movs r5, 0x6C adds r1, r4, 0 @@ -839693,7 +811262,7 @@ _0819AA24: bls _0819AA24 ldr r0, [r6] ldrb r1, [r0, 0x3] - ldr r4, _0819AB28 + ldr r4, =0x02020630 muls r1, r5 adds r0, r1 ldrh r0, [r0, 0xE] @@ -839701,7 +811270,7 @@ _0819AA24: adds r1, r0 lsls r1, 2 adds r1, r4 - ldr r0, _0819AB34 + ldr r0, =0x086105f0 movs r2, 0x20 ldrsh r1, [r1, r2] movs r2, 0x58 @@ -839710,14 +811279,14 @@ _0819AA24: ldr r1, [r6] movs r5, 0 strb r0, [r1, 0x4] - ldr r0, _0819AB38 + ldr r0, =0x08610608 movs r1, 0xB0 movs r2, 0x70 movs r3, 0 bl obj_add_from_template_forward_search ldr r1, [r6] strb r0, [r1, 0x1] - ldr r0, _0819AB3C + ldr r0, =0x08610620 movs r1, 0xB0 movs r2, 0x90 movs r3, 0 @@ -839783,12 +811352,7 @@ _0819AA24: pop {r0} bx r0 .align 2, 0 -_0819AB28: .4byte 0x02020630 -_0819AB2C: .4byte 0x086105d8 -_0819AB30: .4byte 0x0300127c -_0819AB34: .4byte 0x086105f0 -_0819AB38: .4byte 0x08610608 -_0819AB3C: .4byte 0x08610620 + .pool thumb_func_end sub_819AA18 thumb_func_start sub_819AB40 @@ -839796,7 +811360,7 @@ sub_819AB40: @ 819AB40 push {r4-r6,lr} movs r4, 0 _0819AB44: - ldr r6, _0819ABA0 + ldr r6, =0x0300127c ldr r1, [r6] movs r0, 0x6C muls r0, r4 @@ -839805,7 +811369,7 @@ _0819AB44: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0819ABA4 + ldr r5, =0x02020630 adds r0, r5 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -839838,8 +811402,7 @@ _0819AB44: pop {r0} bx r0 .align 2, 0 -_0819ABA0: .4byte 0x0300127c -_0819ABA4: .4byte 0x02020630 + .pool thumb_func_end sub_819AB40 thumb_func_start sub_819ABA8 @@ -839848,7 +811411,7 @@ sub_819ABA8: @ 819ABA8 lsls r0, 24 cmp r0, 0 ble _0819ABC8 - ldr r0, _0819ABC0 + ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1, 0x3] adds r2, r0, 0 @@ -839857,12 +811420,12 @@ sub_819ABA8: @ 819ABA8 adds r0, r3, 0x1 b _0819ABDE .align 2, 0 -_0819ABC0: .4byte 0x0300127c + .pool _0819ABC4: movs r0, 0 b _0819ABDE _0819ABC8: - ldr r0, _0819ABD8 + ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1, 0x3] adds r2, r0, 0 @@ -839871,14 +811434,14 @@ _0819ABC8: subs r0, r3, 0x1 b _0819ABDE .align 2, 0 -_0819ABD8: .4byte 0x0300127c + .pool _0819ABDC: movs r0, 0x5 _0819ABDE: strb r0, [r1, 0x3] ldr r2, [r2] ldrb r3, [r2, 0x3] - ldr r4, _0819AC0C + ldr r4, =0x02020630 ldrb r0, [r2, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -839898,7 +811461,7 @@ _0819ABDE: pop {r0} bx r0 .align 2, 0 -_0819AC0C: .4byte 0x02020630 + .pool thumb_func_end sub_819ABA8 thumb_func_start sub_819AC10 @@ -839907,7 +811470,7 @@ sub_819AC10: @ 819AC10 lsls r0, 24 cmp r0, 0 ble _0819AC30 - ldr r0, _0819AC28 + ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1] adds r2, r0, 0 @@ -839916,12 +811479,12 @@ sub_819AC10: @ 819AC10 adds r0, r3, 0x1 b _0819AC46 .align 2, 0 -_0819AC28: .4byte 0x0300127c + .pool _0819AC2C: movs r0, 0 b _0819AC46 _0819AC30: - ldr r0, _0819AC40 + ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1] adds r2, r0, 0 @@ -839930,12 +811493,12 @@ _0819AC30: subs r0, r3, 0x1 b _0819AC46 .align 2, 0 -_0819AC40: .4byte 0x0300127c + .pool _0819AC44: movs r0, 0x2 _0819AC46: strb r0, [r1] - ldr r3, _0819AC74 + ldr r3, =0x02020630 ldr r2, [r2] ldrb r0, [r2, 0x1] lsls r1, r0, 4 @@ -839958,7 +811521,7 @@ _0819AC46: pop {r0} bx r0 .align 2, 0 -_0819AC74: .4byte 0x02020630 + .pool thumb_func_end sub_819AC10 thumb_func_start sub_819AC78 @@ -839967,7 +811530,7 @@ sub_819AC78: @ 819AC78 lsls r0, 24 cmp r0, 0 ble _0819AC98 - ldr r0, _0819AC90 + ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1, 0x7] adds r2, r0, 0 @@ -839976,12 +811539,12 @@ sub_819AC78: @ 819AC78 adds r0, r3, 0x1 b _0819ACAE .align 2, 0 -_0819AC90: .4byte 0x0300127c + .pool _0819AC94: movs r0, 0 b _0819ACAE _0819AC98: - ldr r0, _0819ACA8 + ldr r0, =0x0300127c ldr r1, [r0] ldrb r3, [r1, 0x7] adds r2, r0, 0 @@ -839990,12 +811553,12 @@ _0819AC98: subs r0, r3, 0x1 b _0819ACAE .align 2, 0 -_0819ACA8: .4byte 0x0300127c + .pool _0819ACAC: movs r0, 0x1 _0819ACAE: strb r0, [r1, 0x7] - ldr r3, _0819ACDC + ldr r3, =0x02020630 ldr r2, [r2] ldrb r0, [r2, 0x1] lsls r1, r0, 4 @@ -840018,13 +811581,13 @@ _0819ACAE: pop {r0} bx r0 .align 2, 0 -_0819ACDC: .4byte 0x02020630 + .pool thumb_func_end sub_819AC78 thumb_func_start sub_819ACE0 sub_819ACE0: @ 819ACE0 push {r4-r6,lr} - ldr r5, _0819AD5C + ldr r5, =0x0300127c ldr r0, [r5] ldrb r6, [r0, 0x3] movs r1, 0x6C @@ -840067,7 +811630,7 @@ _0819AD1A: _0819AD32: cmp r2, 0x6 beq _0819AD9C - ldr r0, _0819AD5C + ldr r0, =0x0300127c ldr r1, [r0] movs r0, 0x6C muls r0, r2 @@ -840075,7 +811638,7 @@ _0819AD32: movs r0, 0x1 strb r0, [r1, 0x10] _0819AD44: - ldr r2, _0819AD5C + ldr r2, =0x0300127c ldr r1, [r2] movs r0, 0x6C muls r0, r6 @@ -840087,7 +811650,7 @@ _0819AD44: subs r0, 0x1 b _0819AD78 .align 2, 0 -_0819AD5C: .4byte 0x0300127c + .pool _0819AD60: movs r0, 0x65 bl gpu_pal_tags_index_of @@ -840102,8 +811665,8 @@ _0819AD60: adds r0, 0x1 _0819AD78: strb r0, [r1, 0x5] - ldr r2, _0819ADA4 - ldr r0, _0819ADA8 + ldr r2, =0x02020630 + ldr r0, =0x0300127c ldr r0, [r0] movs r1, 0x6C muls r1, r6 @@ -840124,8 +811687,7 @@ _0819AD9C: pop {r0} bx r0 .align 2, 0 -_0819ADA4: .4byte 0x02020630 -_0819ADA8: .4byte 0x0300127c + .pool thumb_func_end sub_819ACE0 thumb_func_start sub_819ADAC @@ -840133,7 +811695,7 @@ sub_819ADAC: @ 819ADAC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _0819ADC8 + ldr r0, =0x0300127c ldr r0, [r0] movs r1, 0x6C muls r1, r4 @@ -840144,15 +811706,15 @@ sub_819ADAC: @ 819ADAC movs r0, 0x65 b _0819ADCE .align 2, 0 -_0819ADC8: .4byte 0x0300127c + .pool _0819ADCC: movs r0, 0x64 _0819ADCE: bl gpu_pal_tags_index_of lsls r0, 24 lsrs r3, r0, 24 - ldr r2, _0819AE00 - ldr r0, _0819AE04 + ldr r2, =0x02020630 + ldr r0, =0x0300127c ldr r0, [r0] movs r1, 0x6C muls r1, r4 @@ -840172,8 +811734,7 @@ _0819ADCE: pop {r0} bx r0 .align 2, 0 -_0819AE00: .4byte 0x02020630 -_0819AE04: .4byte 0x0300127c + .pool thumb_func_end sub_819ADAC thumb_func_start sub_819AE08 @@ -840182,7 +811743,7 @@ sub_819AE08: @ 819AE08 sub sp, 0x4 lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _0819AE2C + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -840197,14 +811758,14 @@ sub_819AE08: @ 819AE08 beq _0819AE36 b _0819AF50 .align 2, 0 -_0819AE2C: .4byte 0x03005e00 + .pool _0819AE30: cmp r0, 0x8 beq _0819AEE8 b _0819AF50 _0819AE36: - ldr r1, _0819AE5C - ldr r0, _0819AE60 + ldr r1, =0x02037714 + ldr r0, =0x02037b14 movs r2, 0xE4 lsls r2, 1 adds r0, r2 @@ -840222,10 +811783,9 @@ _0819AE36: strh r0, [r6, 0x8] b _0819AF50 .align 2, 0 -_0819AE5C: .4byte 0x02037714 -_0819AE60: .4byte 0x02037b14 + .pool _0819AE64: - ldr r0, _0819AECC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -840233,9 +811793,9 @@ _0819AE64: lsrs r5, r0, 24 cmp r5, 0 bne _0819AF50 - ldr r4, _0819AED0 + ldr r4, =0x0300127c ldr r0, [r4] - ldr r2, _0819AED4 + ldr r2, =0x000002a1 adds r0, r2 ldrb r0, [r0] bl remove_task @@ -840249,19 +811809,19 @@ _0819AE64: adds r1, r2 bl sub_819F444 bl sub_819AB40 - ldr r4, _0819AED8 + ldr r4, =0x0203ce2c ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0819AEDC + ldr r4, =0x0203ce30 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0819AEE0 + ldr r4, =0x0203ce34 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0819AEE4 + ldr r4, =0x0203ce38 ldr r0, [r4] bl free str r5, [r4] @@ -840270,17 +811830,11 @@ _0819AE64: strh r0, [r6, 0x8] b _0819AF50 .align 2, 0 -_0819AECC: .4byte 0x02037fd4 -_0819AED0: .4byte 0x0300127c -_0819AED4: .4byte 0x000002a1 -_0819AED8: .4byte 0x0203ce2c -_0819AEDC: .4byte 0x0203ce30 -_0819AEE0: .4byte 0x0203ce34 -_0819AEE4: .4byte 0x0203ce38 + .pool _0819AEE8: - ldr r4, _0819AF58 + ldr r4, =0x0300127c ldr r1, [r4] - ldr r0, _0819AF5C + ldr r0, =0x02037714 movs r3, 0xE4 lsls r3, 1 adds r0, r3 @@ -840295,19 +811849,19 @@ _0819AEE8: strb r0, [r1, 0x6] ldr r0, [r4] ldrb r6, [r0, 0x3] - ldr r4, _0819AF60 + ldr r4, =0x0203ce3c movs r0, 0x96 lsls r0, 2 bl malloc_and_clear str r0, [r4] movs r4, 0 _0819AF1A: - ldr r5, _0819AF60 + ldr r5, =0x0203ce3c ldr r1, [r5] movs r0, 0x64 muls r0, r4 adds r0, r1 - ldr r1, _0819AF58 + ldr r1, =0x0300127c ldr r1, [r1] movs r2, 0x6C muls r2, r4 @@ -840321,7 +811875,7 @@ _0819AF1A: cmp r4, 0x5 bls _0819AF1A ldr r1, [r5] - ldr r0, _0819AF64 + ldr r0, =sub_819A514 + 1 str r0, [sp] movs r0, 0x1 adds r2, r6, 0 @@ -840333,10 +811887,7 @@ _0819AF50: pop {r0} bx r0 .align 2, 0 -_0819AF58: .4byte 0x0300127c -_0819AF5C: .4byte 0x02037714 -_0819AF60: .4byte 0x0203ce3c -_0819AF64: .4byte sub_819A514 + 1 + .pool thumb_func_end sub_819AE08 thumb_func_start bc_exit_to_overworld @@ -840345,7 +811896,7 @@ bc_exit_to_overworld: @ 819AF68 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _0819AF98 + ldr r7, =0x0300127c ldr r0, [r7] movs r1, 0xA8 lsls r1, 2 @@ -840353,7 +811904,7 @@ bc_exit_to_overworld: @ 819AF68 ldrb r0, [r0] cmp r0, 0x1 beq _0819B00E - ldr r1, _0819AF9C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -840366,8 +811917,7 @@ bc_exit_to_overworld: @ 819AF68 beq _0819AFB8 b _0819B00E .align 2, 0 -_0819AF98: .4byte 0x0300127c -_0819AF9C: .4byte 0x03005e00 + .pool _0819AFA0: movs r0, 0x1 negs r0, r0 @@ -840388,20 +811938,20 @@ _0819AFB8: bne _0819B00E bl sub_819B764 ldr r0, [r7] - ldr r1, _0819B018 + ldr r1, =0x000002a1 adds r0, r1 ldrb r0, [r0] bl remove_task bl sub_819AB40 - ldr r4, _0819B01C + ldr r4, =0x0203ce2c ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0819B020 + ldr r4, =0x0203ce34 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0819B024 + ldr r4, =0x0203ce38 ldr r0, [r4] bl free str r5, [r4] @@ -840409,7 +811959,7 @@ _0819AFB8: bl free str r5, [r7] bl Window_FreeMemory - ldr r0, _0819B028 + ldr r0, =sub_80861B0 + 1 bl set_callback2 adds r0, r6, 0 bl remove_task @@ -840419,11 +811969,7 @@ _0819B00E: pop {r0} bx r0 .align 2, 0 -_0819B018: .4byte 0x000002a1 -_0819B01C: .4byte 0x0203ce2c -_0819B020: .4byte 0x0203ce34 -_0819B024: .4byte 0x0203ce38 -_0819B028: .4byte sub_80861B0 + 1 + .pool thumb_func_end bc_exit_to_overworld thumb_func_start sub_819B02C @@ -840433,7 +811979,7 @@ sub_819B02C: @ 819B02C push {r7} lsls r0, 24 lsrs r2, r0, 24 - ldr r7, _0819B064 + ldr r7, =0x0300127c ldr r0, [r7] movs r1, 0xA8 lsls r1, 2 @@ -840441,7 +811987,7 @@ sub_819B02C: @ 819B02C ldrb r0, [r0] cmp r0, 0x1 beq _0819B11A - ldr r1, _0819B068 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -840456,8 +812002,7 @@ sub_819B02C: @ 819B02C beq _0819B07A b _0819B11A .align 2, 0 -_0819B064: .4byte 0x0300127c -_0819B068: .4byte 0x03005e00 + .pool _0819B06C: cmp r0, 0xA bne _0819B11A @@ -840471,7 +812016,7 @@ _0819B07A: strh r0, [r5, 0x8] b _0819B11A _0819B084: - ldr r2, _0819B0B0 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 mov r8, r0 @@ -840488,12 +812033,11 @@ _0819B084: bne _0819B0C6 bl sub_819C568 strh r4, [r5, 0x8] - ldr r0, _0819B0B4 + ldr r0, =bc_exit_to_overworld + 1 str r0, [r5] b _0819B11A .align 2, 0 -_0819B0B0: .4byte 0x030022c0 -_0819B0B4: .4byte bc_exit_to_overworld + 1 + .pool _0819B0B8: movs r0, 0x2 ands r0, r1 @@ -840506,17 +812050,16 @@ _0819B0C6: bl sub_819B958 bl sub_819BC9C ldr r0, [r7] - ldr r1, _0819B0E4 + ldr r1, =0x000002a2 adds r0, r1 mov r1, r8 strb r1, [r0] strh r6, [r5, 0x8] - ldr r0, _0819B0E8 + ldr r0, =sub_819B378 + 1 str r0, [r5] b _0819B11A .align 2, 0 -_0819B0E4: .4byte 0x000002a2 -_0819B0E8: .4byte sub_819B378 + 1 + .pool _0819B0EC: ldrh r1, [r2, 0x30] movs r0, 0x40 @@ -840551,7 +812094,7 @@ sub_819B124: @ 819B124 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0819B150 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -840566,13 +812109,12 @@ sub_819B124: @ 819B124 b _0819B36E _0819B144: lsls r0, 2 - ldr r1, _0819B154 + ldr r1, =_0819B158 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0819B150: .4byte 0x03005e00 -_0819B154: .4byte _0819B158 + .pool .align 2, 0 _0819B158: .4byte _0819B188 @@ -840588,12 +812130,12 @@ _0819B158: .4byte _0819B300 .4byte _0819B35C _0819B188: - ldr r0, _0819B1B0 + ldr r0, =0x0300127c ldr r1, [r0] ldrb r0, [r1, 0x6] cmp r0, 0 bne _0819B1A2 - ldr r2, _0819B1B4 + ldr r2, =0x00000299 adds r0, r1, r2 movs r7, 0xA8 lsls r7, 2 @@ -840601,7 +812143,7 @@ _0819B188: movs r2, 0 bl sub_819F2B4 _0819B1A2: - ldr r0, _0819B1B8 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -840609,11 +812151,9 @@ _0819B1A2: movs r0, 0x9 b _0819B36C .align 2, 0 -_0819B1B0: .4byte 0x0300127c -_0819B1B4: .4byte 0x00000299 -_0819B1B8: .4byte 0x03005e00 + .pool _0819B1BC: - ldr r4, _0819B1E4 + ldr r4, =0x0300127c ldr r0, [r4] movs r1, 0xA8 lsls r1, 2 @@ -840627,17 +812167,16 @@ _0819B1CE: ldr r1, [r4] movs r0, 0 strb r0, [r1, 0x6] - ldr r1, _0819B1E8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 b _0819B344 .align 2, 0 -_0819B1E4: .4byte 0x0300127c -_0819B1E8: .4byte 0x03005e00 + .pool _0819B1EC: - ldr r2, _0819B21C + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r7, 0x1 movs r6, 0x1 @@ -840653,35 +812192,32 @@ _0819B1EC: adds r1, r0, 0 cmp r0, 0x1 bne _0819B228 - ldr r0, _0819B220 + ldr r0, =0x0300127c ldr r0, [r0] - ldr r2, _0819B224 + ldr r2, =0x000002a2 adds r0, r2 b _0819B2AC .align 2, 0 -_0819B21C: .4byte 0x030022c0 -_0819B220: .4byte 0x0300127c -_0819B224: .4byte 0x000002a2 + .pool _0819B228: cmp r0, 0x2 bne _0819B248 - ldr r1, _0819B240 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0xA strh r1, [r0, 0x8] - ldr r1, _0819B244 + ldr r1, =sub_819B02C + 1 str r1, [r0] b _0819B36E .align 2, 0 -_0819B240: .4byte 0x03005e00 -_0819B244: .4byte sub_819B02C + 1 + .pool _0819B248: cmp r1, 0x3 bne _0819B260 - ldr r1, _0819B25C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -840690,21 +812226,20 @@ _0819B248: strh r1, [r0, 0x8] b _0819B2BA .align 2, 0 -_0819B25C: .4byte 0x03005e00 + .pool _0819B260: - ldr r1, _0819B274 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0x6 strh r1, [r0, 0x8] - ldr r1, _0819B278 + ldr r1, =sub_819AE08 + 1 str r1, [r0] b _0819B36E .align 2, 0 -_0819B274: .4byte 0x03005e00 -_0819B278: .4byte sub_819AE08 + 1 + .pool _0819B27C: movs r0, 0x2 ands r0, r1 @@ -840712,7 +812247,7 @@ _0819B27C: beq _0819B2D0 movs r0, 0x5 bl audio_play - ldr r4, _0819B2C0 + ldr r4, =0x0300127c ldr r1, [r4] movs r2, 0xA6 lsls r2, 2 @@ -840725,25 +812260,22 @@ _0819B27C: movs r0, 0x3 bl sub_819B958 ldr r0, [r4] - ldr r1, _0819B2C4 + ldr r1, =0x000002a2 adds r0, r1 _0819B2AC: strb r7, [r0] - ldr r1, _0819B2C8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 strh r6, [r0, 0x8] _0819B2BA: - ldr r1, _0819B2CC + ldr r1, =sub_819B378 + 1 str r1, [r0] b _0819B36E .align 2, 0 -_0819B2C0: .4byte 0x0300127c -_0819B2C4: .4byte 0x000002a2 -_0819B2C8: .4byte 0x03005e00 -_0819B2CC: .4byte sub_819B378 + 1 + .pool _0819B2D0: ldrh r1, [r2, 0x30] movs r0, 0x40 @@ -840767,7 +812299,7 @@ _0819B2EA: bl sub_819AC10 b _0819B36E _0819B300: - ldr r0, _0819B34C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -840775,12 +812307,12 @@ _0819B300: lsrs r3, r0, 24 cmp r3, 0 bne _0819B36E - ldr r4, _0819B350 + ldr r4, =0x0300127c ldr r2, [r4] ldrb r0, [r2, 0x6] cmp r0, 0x1 bne _0819B338 - ldr r1, _0819B354 + ldr r1, =0x02037b14 movs r7, 0xA9 lsls r7, 2 adds r0, r2, r7 @@ -840789,7 +812321,7 @@ _0819B300: lsls r2, 1 adds r1, r2 strh r0, [r1] - ldr r0, _0819B358 + ldr r0, =0x02037714 subs r7, 0xBC adds r1, r0, r7 ldrh r1, [r1] @@ -840807,13 +812339,10 @@ _0819B344: strh r1, [r0, 0x8] b _0819B36E .align 2, 0 -_0819B34C: .4byte 0x02037fd4 -_0819B350: .4byte 0x0300127c -_0819B354: .4byte 0x02037b14 -_0819B358: .4byte 0x02037714 + .pool _0819B35C: bl sub_819B844 - ldr r0, _0819B374 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -840826,7 +812355,7 @@ _0819B36E: pop {r0} bx r0 .align 2, 0 -_0819B374: .4byte 0x03005e00 + .pool thumb_func_end sub_819B124 thumb_func_start sub_819B378 @@ -840834,7 +812363,7 @@ sub_819B378: @ 819B378 push {r4-r7,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r5, _0819B3AC + ldr r5, =0x0300127c ldr r3, [r5] movs r7, 0xA8 lsls r7, 2 @@ -840842,7 +812371,7 @@ sub_819B378: @ 819B378 ldrb r0, [r0] cmp r0, 0x1 beq _0819B476 - ldr r1, _0819B3B0 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -840857,14 +812386,13 @@ sub_819B378: @ 819B378 beq _0819B3BA b _0819B476 .align 2, 0 -_0819B3AC: .4byte 0x0300127c -_0819B3B0: .4byte 0x03005e00 + .pool _0819B3B4: cmp r1, 0xB beq _0819B440 b _0819B476 _0819B3BA: - ldr r0, _0819B3D4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -840873,15 +812401,14 @@ _0819B3BA: movs r0, 0x1 movs r1, 0x1 strh r1, [r4, 0x8] - ldr r2, _0819B3D8 + ldr r2, =0x000002a2 adds r1, r3, r2 strb r0, [r1] b _0819B476 .align 2, 0 -_0819B3D4: .4byte 0x02037fd4 -_0819B3D8: .4byte 0x000002a2 + .pool _0819B3DC: - ldr r2, _0819B400 + ldr r2, =0x030022c0 ldrh r0, [r2, 0x2E] ands r1, r0 cmp r1, 0 @@ -840889,19 +812416,17 @@ _0819B3DC: movs r0, 0x5 bl audio_play ldr r0, [r5] - ldr r1, _0819B404 + ldr r1, =0x000002a2 adds r0, r1 movs r1, 0 strb r1, [r0] movs r0, 0x2 strh r0, [r4, 0x8] - ldr r0, _0819B408 + ldr r0, =sub_819B124 + 1 str r0, [r4] b _0819B476 .align 2, 0 -_0819B400: .4byte 0x030022c0 -_0819B404: .4byte 0x000002a2 -_0819B408: .4byte sub_819B124 + 1 + .pool _0819B40C: ldrh r1, [r2, 0x30] movs r0, 0x20 @@ -840927,7 +812452,7 @@ _0819B432: bl sub_819B9E8 b _0819B476 _0819B440: - ldr r0, _0819B47C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r6, 0x1 adds r0, r6, 0 @@ -840946,7 +812471,7 @@ _0819B440: bl sub_819F3F8 bl sub_819BA64 ldr r0, [r5] - ldr r1, _0819B480 + ldr r1, =0x000002a2 adds r0, r1 movs r1, 0x1 strb r1, [r0] @@ -840956,8 +812481,7 @@ _0819B476: pop {r0} bx r0 .align 2, 0 -_0819B47C: .4byte 0x030022c0 -_0819B480: .4byte 0x000002a2 + .pool thumb_func_end sub_819B378 thumb_func_start sub_819B484 @@ -840974,14 +812498,14 @@ sub_819B484: @ 819B484 movs r6, 0 add r0, sp, 0xC strb r6, [r0] - ldr r0, _0819B554 + ldr r0, =0x000040ce bl var_get lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r7, _0819B558 + ldr r7, =0x03005d90 ldr r2, [r7] - ldr r0, _0819B55C + ldr r0, =0x00000ca9 adds r4, r2, r0 ldrb r0, [r4] lsls r0, 30 @@ -840990,7 +812514,7 @@ sub_819B484: @ 819B484 lsls r0, r5, 1 lsls r1, r6, 2 adds r0, r1 - ldr r1, _0819B560 + ldr r1, =0x00000de2 adds r2, r1 adds r2, r0 ldrh r0, [r2] @@ -840999,8 +812523,8 @@ sub_819B484: @ 819B484 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x18] - ldr r1, _0819B564 - ldr r0, _0819B568 + ldr r1, =0x0203bc8c + ldr r0, =0x085d97bc str r0, [r1] ldrb r1, [r4] movs r0, 0x3 @@ -841035,7 +812559,7 @@ _0819B4EA: movs r3, 0 mov r8, r3 _0819B518: - ldr r0, _0819B558 + ldr r0, =0x03005d90 ldr r1, [r0] mov r2, r8 lsls r0, r2, 1 @@ -841046,7 +812570,7 @@ _0819B518: lsls r3, 4 adds r1, r3 ldrh r5, [r1] - ldr r0, _0819B56C + ldr r0, =0x0300127c ldr r1, [r0] ldr r2, [sp, 0x10] add r2, r8 @@ -841065,13 +812589,7 @@ _0819B518: lsrs r0, 24 b _0819B572 .align 2, 0 -_0819B554: .4byte 0x000040ce -_0819B558: .4byte 0x03005d90 -_0819B55C: .4byte 0x00000ca9 -_0819B560: .4byte 0x00000de2 -_0819B564: .4byte 0x0203bc8c -_0819B568: .4byte 0x085d97bc -_0819B56C: .4byte 0x0300127c + .pool _0819B570: ldr r0, [sp, 0x18] _0819B572: @@ -841083,11 +812601,11 @@ _0819B572: mov r4, r10 muls r4, r1 adds r4, 0xC - ldr r2, _0819B630 + ldr r2, =0x0300127c ldr r0, [r2] adds r0, r4 adds r0, 0x8 - ldr r1, _0819B634 + ldr r1, =0x0203bc8c ldr r2, [r1] lsls r5, 4 adds r2, r5, r2 @@ -841107,12 +812625,12 @@ _0819B572: adds r7, r5, 0 movs r3, 0x1 add r8, r3 - ldr r3, _0819B630 + ldr r3, =0x0300127c _0819B5B8: ldr r0, [r3] adds r0, r4 adds r0, 0x8 - ldr r5, _0819B634 + ldr r5, =0x0203bc8c ldr r1, [r5] adds r1, r7, r1 lsls r2, r6, 1 @@ -841132,14 +812650,14 @@ _0819B5B8: mov r4, r10 muls r4, r0 adds r4, 0xC - ldr r1, _0819B630 + ldr r1, =0x0300127c ldr r0, [r1] adds r0, r4 adds r0, 0x8 movs r1, 0x20 add r2, sp, 0xC bl pokemon_setattr - ldr r2, _0819B630 + ldr r2, =0x0300127c ldr r0, [r2] adds r0, r4 adds r0, 0x8 @@ -841147,7 +812665,7 @@ _0819B5B8: adds r1, r7, r1 ldrb r2, [r1, 0xA] lsls r2, 1 - ldr r1, _0819B638 + ldr r1, =0x085cecb0 adds r2, r1 movs r1, 0xC bl pokemon_setattr @@ -841168,9 +812686,7 @@ _0819B620: pop {r0} bx r0 .align 2, 0 -_0819B630: .4byte 0x0300127c -_0819B634: .4byte 0x0203bc8c -_0819B638: .4byte 0x085cecb0 + .pool thumb_func_end sub_819B484 thumb_func_start sub_819B63C @@ -841187,10 +812703,10 @@ sub_819B63C: @ 819B63C add r0, sp, 0xC movs r1, 0 strb r1, [r0] - ldr r2, _0819B750 - ldr r0, _0819B754 + ldr r2, =0x0203bc8c + ldr r0, =0x085de02c str r0, [r2] - ldr r0, _0819B758 + ldr r0, =0x03005d90 ldr r1, [r0] ldrb r3, [r1, 0xA] ldrb r0, [r1, 0xB] @@ -841206,7 +812722,7 @@ sub_819B63C: @ 819B63C movs r7, 0 mov r9, r7 _0819B678: - ldr r0, _0819B758 + ldr r0, =0x03005d90 ldr r1, [r0] mov r2, r9 lsls r0, r2, 1 @@ -841218,7 +812734,7 @@ _0819B678: adds r1, r3 ldrh r1, [r1] mov r8, r1 - ldr r7, _0819B75C + ldr r7, =0x0300127c ldr r0, [r7] ldr r6, [sp, 0x10] add r6, r9 @@ -841231,7 +812747,7 @@ _0819B678: adds r4, 0xC adds r0, r4 adds r0, 0x8 - ldr r3, _0819B750 + ldr r3, =0x0203bc8c ldr r2, [r3] mov r7, r8 lsls r5, r7, 4 @@ -841252,11 +812768,11 @@ _0819B678: movs r0, 0x1 add r9, r0 _0819B6D4: - ldr r1, _0819B75C + ldr r1, =0x0300127c ldr r0, [r1] adds r0, r4 adds r0, 0x8 - ldr r3, _0819B750 + ldr r3, =0x0203bc8c ldr r2, [r3] mov r3, r8 lsls r1, r3, 4 @@ -841276,23 +812792,23 @@ _0819B6D4: adds r4, r6, 0 muls r4, r7 adds r4, 0xC - ldr r1, _0819B75C + ldr r1, =0x0300127c ldr r0, [r1] adds r0, r4 adds r0, 0x8 movs r1, 0x20 add r2, sp, 0xC bl pokemon_setattr - ldr r2, _0819B75C + ldr r2, =0x0300127c ldr r0, [r2] adds r0, r4 adds r0, 0x8 - ldr r3, _0819B750 + ldr r3, =0x0203bc8c ldr r1, [r3] adds r1, r5, r1 ldrb r2, [r1, 0xA] lsls r2, 1 - ldr r1, _0819B760 + ldr r1, =0x085cecb0 adds r2, r1 movs r1, 0xC bl pokemon_setattr @@ -841311,11 +812827,7 @@ _0819B6D4: pop {r0} bx r0 .align 2, 0 -_0819B750: .4byte 0x0203bc8c -_0819B754: .4byte 0x085de02c -_0819B758: .4byte 0x03005d90 -_0819B75C: .4byte 0x0300127c -_0819B760: .4byte 0x085cecb0 + .pool thumb_func_end sub_819B63C thumb_func_start sub_819B764 @@ -841326,9 +812838,9 @@ sub_819B764: @ 819B764 mov r5, r8 push {r5-r7} movs r7, 0 - ldr r0, _0819B804 + ldr r0, =0x0300127c mov r10, r0 - ldr r1, _0819B808 + ldr r1, =0x03005d90 mov r8, r1 _0819B778: movs r2, 0 @@ -841347,7 +812859,7 @@ _0819B77E: movs r0, 0x64 adds r5, r7, 0 muls r5, r0 - ldr r2, _0819B80C + ldr r2, =0x020244ec adds r5, r2 adds r1, 0x14 adds r0, r5, 0 @@ -841373,7 +812885,7 @@ _0819B77E: bl pokemon_getattr mov r2, r8 ldr r1, [r2] - ldr r2, _0819B810 + ldr r2, =0x00000e74 adds r1, r2 adds r1, r4 str r0, [r1] @@ -841384,7 +812896,7 @@ _0819B77E: mov r2, r8 ldr r1, [r2] adds r1, r4 - ldr r2, _0819B814 + ldr r2, =0x00000e79 adds r1, r2 strb r0, [r1] adds r0, r5, 0 @@ -841394,17 +812906,12 @@ _0819B77E: mov r2, r8 ldr r1, [r2] adds r1, r4 - ldr r2, _0819B818 + ldr r2, =0x00000e78 adds r1, r2 strb r0, [r1] b _0819B826 .align 2, 0 -_0819B804: .4byte 0x0300127c -_0819B808: .4byte 0x03005d90 -_0819B80C: .4byte 0x020244ec -_0819B810: .4byte 0x00000e74 -_0819B814: .4byte 0x00000e79 -_0819B818: .4byte 0x00000e78 + .pool _0819B81C: adds r0, r2, 0x1 lsls r0, 24 @@ -841430,14 +812937,14 @@ _0819B826: thumb_func_start sub_819B844 sub_819B844: @ 819B844 push {r4,r5,lr} - ldr r5, _0819B8CC + ldr r5, =0x0300127c ldr r1, [r5] ldrb r0, [r1, 0x6] cmp r0, 0 bne _0819B852 strb r0, [r1] _0819B852: - ldr r4, _0819B8D0 + ldr r4, =0x02020630 ldr r2, [r5] ldrb r1, [r2, 0x1] lsls r0, r1, 4 @@ -841498,18 +813005,17 @@ _0819B852: pop {r0} bx r0 .align 2, 0 -_0819B8CC: .4byte 0x0300127c -_0819B8D0: .4byte 0x02020630 + .pool thumb_func_end sub_819B844 thumb_func_start sub_819B8D4 sub_819B8D4: @ 819B8D4 push {r4,r5,lr} - ldr r5, _0819B950 + ldr r5, =0x0300127c ldr r1, [r5] movs r0, 0 strb r0, [r1, 0x7] - ldr r4, _0819B954 + ldr r4, =0x02020630 ldr r2, [r5] ldrb r1, [r2, 0x1] lsls r0, r1, 4 @@ -841565,8 +813071,7 @@ sub_819B8D4: @ 819B8D4 pop {r0} bx r0 .align 2, 0 -_0819B950: .4byte 0x0300127c -_0819B954: .4byte 0x02020630 + .pool thumb_func_end sub_819B8D4 thumb_func_start sub_819B958 @@ -841575,8 +813080,8 @@ sub_819B958: @ 819B958 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _0819B9AC - ldr r3, _0819B9B0 + ldr r5, =0x02020630 + ldr r3, =0x0300127c ldr r0, [r3] ldrb r1, [r0, 0x1] lsls r0, r1, 4 @@ -841610,8 +813115,7 @@ sub_819B958: @ 819B958 pop {r0} bx r0 .align 2, 0 -_0819B9AC: .4byte 0x02020630 -_0819B9B0: .4byte 0x0300127c + .pool thumb_func_end sub_819B958 thumb_func_start sub_819B9B4 @@ -841621,7 +813125,7 @@ sub_819B9B4: @ 819B9B4 movs r0, 0 movs r1, 0 bl Window_FastFillPixels - ldr r2, _0819B9E4 + ldr r2, =0x085eebb2 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -841637,14 +813141,14 @@ sub_819B9B4: @ 819B9B4 pop {r0} bx r0 .align 2, 0 -_0819B9E4: .4byte 0x085eebb2 + .pool thumb_func_end sub_819B9B4 thumb_func_start sub_819B9E8 sub_819B9E8: @ 819B9E8 push {r4,r5,lr} sub sp, 0xC - ldr r5, _0819BA54 + ldr r5, =0x0300127c ldr r0, [r5] ldrb r4, [r0, 0x3] movs r0, 0x1 @@ -841660,10 +813164,10 @@ sub_819B9E8: @ 819B9E8 bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - ldr r4, _0819BA58 + ldr r4, =0x02021fc4 movs r1, 0xB muls r1, r0 - ldr r0, _0819BA5C + ldr r0, =0x083185c8 adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -841674,7 +813178,7 @@ sub_819B9E8: @ 819B9E8 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _0819BA60 + ldr r0, =0x08610479 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -841691,10 +813195,7 @@ sub_819B9E8: @ 819B9E8 pop {r0} bx r0 .align 2, 0 -_0819BA54: .4byte 0x0300127c -_0819BA58: .4byte 0x02021fc4 -_0819BA5C: .4byte 0x083185c8 -_0819BA60: .4byte 0x08610479 + .pool thumb_func_end sub_819B9E8 thumb_func_start sub_819BA64 @@ -841704,28 +813205,27 @@ sub_819BA64: @ 819BA64 movs r0, 0x2 movs r1, 0 bl Window_FastFillPixels - ldr r0, _0819BA80 + ldr r0, =0x0300127c ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0x1 bne _0819BA88 - ldr r2, _0819BA84 + ldr r2, =0x085eebc1 b _0819BA9C .align 2, 0 -_0819BA80: .4byte 0x0300127c -_0819BA84: .4byte 0x085eebc1 + .pool _0819BA88: cmp r0, 0x2 bne _0819BA94 - ldr r2, _0819BA90 + ldr r2, =0x085eebdb b _0819BA9C .align 2, 0 -_0819BA90: .4byte 0x085eebdb + .pool _0819BA94: - ldr r2, _0819BAC0 + ldr r2, =0x085eec2d cmp r0, 0x3 bne _0819BA9C - ldr r2, _0819BAC4 + ldr r2, =0x085eebf6 _0819BA9C: movs r0, 0x5 str r0, [sp] @@ -841743,8 +813243,7 @@ _0819BA9C: pop {r0} bx r0 .align 2, 0 -_0819BAC0: .4byte 0x085eec2d -_0819BAC4: .4byte 0x085eebf6 + .pool thumb_func_end sub_819BA64 thumb_func_start sub_819BAC8 @@ -841754,7 +813253,7 @@ sub_819BAC8: @ 819BAC8 movs r0, 0x2 movs r1, 0 bl Window_FastFillPixels - ldr r2, _0819BAF8 + ldr r2, =0x085eec50 movs r0, 0x5 str r0, [sp] movs r0, 0 @@ -841771,14 +813270,14 @@ sub_819BAC8: @ 819BAC8 pop {r0} bx r0 .align 2, 0 -_0819BAF8: .4byte 0x085eec50 + .pool thumb_func_end sub_819BAC8 thumb_func_start sub_819BAFC sub_819BAFC: @ 819BAFC push {r4-r6,lr} sub sp, 0xC - ldr r0, _0819BB50 + ldr r0, =0x0300127c ldr r0, [r0] ldrb r2, [r0, 0x3] movs r1, 0x6C @@ -841790,11 +813289,11 @@ sub_819BAFC: @ 819BAFC movs r0, 0x3 movs r1, 0 bl Window_FastFillPixels - ldr r4, _0819BB54 + ldr r4, =0x08610476 str r4, [sp] movs r6, 0 str r6, [sp, 0x4] - ldr r0, _0819BB58 + ldr r0, =0x085eec15 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -841805,7 +813304,7 @@ sub_819BAFC: @ 819BAFC beq _0819BB60 str r4, [sp] str r6, [sp, 0x4] - ldr r0, _0819BB5C + ldr r0, =0x085eec24 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -841814,14 +813313,11 @@ sub_819BAFC: @ 819BAFC bl box_print b _0819BB74 .align 2, 0 -_0819BB50: .4byte 0x0300127c -_0819BB54: .4byte 0x08610476 -_0819BB58: .4byte 0x085eec15 -_0819BB5C: .4byte 0x085eec24 + .pool _0819BB60: str r4, [sp] str r5, [sp, 0x4] - ldr r0, _0819BB9C + ldr r0, =0x085eec10 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -841829,11 +813325,11 @@ _0819BB60: movs r3, 0x11 bl box_print _0819BB74: - ldr r0, _0819BBA0 + ldr r0, =0x08610476 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] - ldr r0, _0819BBA4 + ldr r0, =0x085eec1d str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -841848,9 +813344,7 @@ _0819BB74: pop {r0} bx r0 .align 2, 0 -_0819BB9C: .4byte 0x085eec10 -_0819BBA0: .4byte 0x08610476 -_0819BBA4: .4byte 0x085eec1d + .pool thumb_func_end sub_819BAFC thumb_func_start sub_819BBA8 @@ -841862,11 +813356,11 @@ sub_819BBA8: @ 819BBA8 movs r0, 0x4 movs r1, 0 bl Window_FastFillPixels - ldr r5, _0819BBF8 + ldr r5, =0x08610476 str r5, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, _0819BBFC + ldr r0, =0x085eec49 str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -841875,7 +813369,7 @@ sub_819BBA8: @ 819BBA8 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _0819BC00 + ldr r0, =0x085eec4d str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -841890,17 +813384,15 @@ sub_819BBA8: @ 819BBA8 pop {r0} bx r0 .align 2, 0 -_0819BBF8: .4byte 0x08610476 -_0819BBFC: .4byte 0x085eec49 -_0819BC00: .4byte 0x085eec4d + .pool thumb_func_end sub_819BBA8 thumb_func_start sub_819BC04 sub_819BC04: @ 819BC04 push {lr} - ldr r2, _0819BC24 - ldr r1, _0819BC28 - ldr r0, _0819BC2C + ldr r2, =0x030062e8 + ldr r1, =0x0861041c + ldr r0, =0x0300127c ldr r0, [r0] ldrb r0, [r0] lsls r0, 2 @@ -841913,15 +813405,13 @@ sub_819BC04: @ 819BC04 pop {r1} bx r1 .align 2, 0 -_0819BC24: .4byte 0x030062e8 -_0819BC28: .4byte 0x0861041c -_0819BC2C: .4byte 0x0300127c + .pool thumb_func_end sub_819BC04 thumb_func_start sub_819BC30 sub_819BC30: @ 819BC30 push {r4,lr} - ldr r0, _0819BC5C + ldr r0, =0x0300127c ldr r0, [r0] ldrb r2, [r0, 0x3] movs r1, 0x6C @@ -841940,9 +813430,9 @@ sub_819BC30: @ 819BC30 movs r0, 0x3 b _0819BC96 .align 2, 0 -_0819BC5C: .4byte 0x0300127c + .pool _0819BC60: - ldr r4, _0819BC90 + ldr r4, =0x0300127c ldr r1, [r4] movs r2, 0xA6 lsls r2, 2 @@ -841963,7 +813453,7 @@ _0819BC60: movs r0, 0x1 b _0819BC96 .align 2, 0 -_0819BC90: .4byte 0x0300127c + .pool _0819BC94: movs r0, 0x2 _0819BC96: @@ -841980,7 +813470,7 @@ sub_819BC9C: @ 819BC9C bl sub_819BA64 movs r0, 0x3 bl sub_819B958 - ldr r0, _0819BCC0 + ldr r0, =0x0300127c ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0x3 @@ -841988,7 +813478,7 @@ sub_819BC9C: @ 819BC9C movs r0, 0x1 b _0819BCC6 .align 2, 0 -_0819BCC0: .4byte 0x0300127c + .pool _0819BCC4: movs r0, 0x2 _0819BCC6: @@ -842005,7 +813495,7 @@ sub_819BCCC: @ 819BCCC thumb_func_start sub_819BCD0 sub_819BCD0: @ 819BCD0 push {lr} - ldr r0, _0819BCF4 + ldr r0, =0x0300127c ldr r1, [r0] movs r2, 0xA6 lsls r2, 2 @@ -842021,14 +813511,14 @@ sub_819BCD0: @ 819BCD0 pop {r1} bx r1 .align 2, 0 -_0819BCF4: .4byte 0x0300127c + .pool thumb_func_end sub_819BCD0 thumb_func_start sub_819BCF8 sub_819BCF8: @ 819BCF8 push {r4,r5,lr} sub sp, 0x2C - ldr r5, _0819BD6C + ldr r5, =0x0300127c ldr r0, [r5] ldrb r4, [r0, 0x3] cmp r4, 0x5 @@ -842078,7 +813568,7 @@ _0819BD64: pop {r0} bx r0 .align 2, 0 -_0819BD6C: .4byte 0x0300127c + .pool thumb_func_end sub_819BCF8 thumb_func_start sub_819BD70 @@ -842087,7 +813577,7 @@ sub_819BD70: @ 819BD70 mov r6, r8 push {r6} sub sp, 0x10 - ldr r6, _0819BE14 + ldr r6, =0x0300127c ldr r2, [r6] ldrb r1, [r2, 0x3] movs r0, 0x6C @@ -842118,7 +813608,7 @@ sub_819BD70: @ 819BD70 str r0, [sp, 0x4] movs r0, 0xF str r0, [sp, 0x8] - ldr r0, _0819BE18 + ldr r0, =0x0000ffff str r0, [sp, 0xC] adds r0, r5, 0 mov r2, r8 @@ -842130,7 +813620,7 @@ sub_819BD70: @ 819BD70 adds r1, r2 movs r3, 0 strb r0, [r1] - ldr r4, _0819BE1C + ldr r4, =0x02020630 ldr r0, [r6] adds r0, r2 ldrb r1, [r0] @@ -842161,14 +813651,12 @@ sub_819BD70: @ 819BD70 pop {r0} bx r0 .align 2, 0 -_0819BE14: .4byte 0x0300127c -_0819BE18: .4byte 0x0000ffff -_0819BE1C: .4byte 0x02020630 + .pool thumb_func_end sub_819BD70 thumb_func_start sub_819BE20 sub_819BE20: @ 819BE20 - ldr r1, _0819BE30 + ldr r1, =0x0300127c ldr r1, [r1] movs r2, 0xA8 lsls r2, 2 @@ -842176,7 +813664,7 @@ sub_819BE20: @ 819BE20 strb r0, [r1] bx lr .align 2, 0 -_0819BE30: .4byte 0x0300127c + .pool thumb_func_end sub_819BE20 thumb_func_start sub_819BE34 @@ -842187,14 +813675,14 @@ sub_819BE34: @ 819BE34 mov r5, r8 push {r5-r7} sub sp, 0x10 - ldr r0, _0819BF18 + ldr r0, =0x08610638 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1 bl obj_add_from_template_forward_search - ldr r6, _0819BF1C + ldr r6, =0x0300127c ldr r1, [r6] - ldr r2, _0819BF20 + ldr r2, =0x00000299 mov r10, r2 add r1, r10 movs r7, 0 @@ -842205,7 +813693,7 @@ sub_819BE34: @ 819BE34 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0819BF24 + ldr r1, =0x02020630 mov r8, r1 add r0, r8 movs r1, 0x2 @@ -842240,7 +813728,7 @@ sub_819BE34: @ 819BE34 str r0, [sp, 0x4] movs r0, 0xF str r0, [sp, 0x8] - ldr r0, _0819BF28 + ldr r0, =0x0000ffff str r0, [sp, 0xC] adds r0, r5, 0 mov r2, r9 @@ -842290,11 +813778,7 @@ sub_819BE34: @ 819BE34 pop {r0} bx r0 .align 2, 0 -_0819BF18: .4byte 0x08610638 -_0819BF1C: .4byte 0x0300127c -_0819BF20: .4byte 0x00000299 -_0819BF24: .4byte 0x02020630 -_0819BF28: .4byte 0x0000ffff + .pool thumb_func_end sub_819BE34 thumb_func_start sub_819BF2C @@ -842306,7 +813790,7 @@ sub_819BF2C: @ 819BF2C push {r5-r7} sub sp, 0x10 movs r7, 0 - ldr r0, _0819BFFC + ldr r0, =0x0300127c mov r9, r0 _0819BF3E: movs r2, 0 @@ -842358,7 +813842,7 @@ _0819BF48: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x8] - ldr r0, _0819C000 + ldr r0, =0x0000ffff str r0, [sp, 0xC] adds r0, r5, 0 adds r2, r6, 0 @@ -842379,7 +813863,7 @@ _0819BF48: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r2, _0819C004 + ldr r2, =0x02020630 adds r0, r2 adds r0, 0x28 movs r1, 0 @@ -842394,16 +813878,14 @@ _0819BF48: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r2, _0819C004 + ldr r2, =0x02020630 adds r0, r2 adds r0, 0x29 movs r1, 0 strb r1, [r0] b _0819C012 .align 2, 0 -_0819BFFC: .4byte 0x0300127c -_0819C000: .4byte 0x0000ffff -_0819C004: .4byte 0x02020630 + .pool _0819C008: adds r0, r2, 0x1 lsls r0, 24 @@ -842416,7 +813898,7 @@ _0819C012: lsrs r7, r0, 24 cmp r7, 0x2 bls _0819BF3E - ldr r0, _0819C03C + ldr r0, =0x0300127c ldr r0, [r0] movs r1, 0xA8 lsls r1, 2 @@ -842432,7 +813914,7 @@ _0819C012: pop {r0} bx r0 .align 2, 0 -_0819C03C: .4byte 0x0300127c + .pool thumb_func_end sub_819BF2C thumb_func_start sub_819C040 @@ -842445,10 +813927,10 @@ sub_819C040: @ 819C040 ands r0, r1 cmp r0, 0 beq _0819C0DC - ldr r3, _0819C0E4 - ldr r6, _0819C0E8 + ldr r3, =0x02020630 + ldr r6, =0x0300127c ldr r2, [r6] - ldr r0, _0819C0EC + ldr r0, =0x00000295 adds r5, r2, r0 ldrb r0, [r5] lsls r1, r0, 4 @@ -842460,7 +813942,7 @@ sub_819C040: @ 819C040 lsls r0, 26 cmp r0, 0 bge _0819C0DC - ldr r1, _0819C0F0 + ldr r1, =0x0000029d adds r0, r2, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -842488,7 +813970,7 @@ sub_819C040: @ 819C040 orrs r1, r2 strb r1, [r0] ldr r0, [r6] - ldr r1, _0819C0F0 + ldr r1, =0x0000029d adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -842499,32 +813981,26 @@ sub_819C040: @ 819C040 ldrb r1, [r0] orrs r1, r2 strb r1, [r0] - ldr r0, _0819C0F4 + ldr r0, =sub_819C1D0 + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0819C0F8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 ldr r1, [r1] bl _call_via_r1 - ldr r0, _0819C0FC + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _0819C0DC: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0819C0E4: .4byte 0x02020630 -_0819C0E8: .4byte 0x0300127c -_0819C0EC: .4byte 0x00000295 -_0819C0F0: .4byte 0x0000029d -_0819C0F4: .4byte sub_819C1D0 + 1 -_0819C0F8: .4byte 0x03005e00 -_0819C0FC: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_819C040 thumb_func_start sub_819C100 @@ -842537,10 +814013,10 @@ sub_819C100: @ 819C100 ands r0, r1 cmp r0, 0 beq _0819C1BA - ldr r6, _0819C1C0 - ldr r4, _0819C1C4 + ldr r6, =0x02020630 + ldr r4, =0x0300127c ldr r2, [r4] - ldr r7, _0819C1C8 + ldr r7, =0x00000295 adds r0, r2, r7 ldrb r1, [r0] lsls r0, r1, 4 @@ -842552,7 +814028,7 @@ sub_819C100: @ 819C100 lsls r0, 26 cmp r0, 0 bge _0819C1BA - ldr r1, _0819C1CC + ldr r1, =0x0000029d adds r0, r2, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -842580,7 +814056,7 @@ sub_819C100: @ 819C100 lsrs r0, 27 bl rotscale_free_entry ldr r0, [r4] - ldr r1, _0819C1CC + ldr r1, =0x0000029d adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -842606,7 +814082,7 @@ sub_819C100: @ 819C100 adds r0, r6 bl obj_delete_and_free_tiles ldr r0, [r4] - ldr r1, _0819C1CC + ldr r1, =0x0000029d adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -842621,10 +814097,7 @@ _0819C1BA: pop {r0} bx r0 .align 2, 0 -_0819C1C0: .4byte 0x02020630 -_0819C1C4: .4byte 0x0300127c -_0819C1C8: .4byte 0x00000295 -_0819C1CC: .4byte 0x0000029d + .pool thumb_func_end sub_819C100 thumb_func_start sub_819C1D0 @@ -842635,7 +814108,7 @@ sub_819C1D0: @ 819C1D0 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _0819C1F4 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -842647,7 +814120,7 @@ sub_819C1D0: @ 819C1D0 beq _0819C1FE b _0819C2BA .align 2, 0 -_0819C1F4: .4byte 0x03005e00 + .pool _0819C1F8: cmp r0, 0x2 beq _0819C270 @@ -842691,16 +814164,15 @@ _0819C1FE: _0819C24E: movs r0, 0x3 bl gpu_sync_bg_show - ldr r1, _0819C268 + ldr r1, =0x00001248 movs r0, 0x50 bl lcd_io_set - ldr r1, _0819C26C + ldr r1, =0x0000040b movs r0, 0x52 bl lcd_io_set b _0819C2C6 .align 2, 0 -_0819C268: .4byte 0x00001248 -_0819C26C: .4byte 0x0000040b + .pool _0819C270: ldrh r0, [r4, 0x12] subs r0, 0x4 @@ -842766,7 +814238,7 @@ sub_819C2D4: @ 819C2D4 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _0819C3F0 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -842780,11 +814252,11 @@ _0819C2F6: _0819C2FC: movs r0, 0x3 bl gpu_sync_bg_hide - ldr r4, _0819C3F4 - ldr r0, _0819C3F8 + ldr r4, =0x02020630 + ldr r0, =0x0300127c mov r8, r0 ldr r0, [r0] - ldr r1, _0819C3FC + ldr r1, =0x00000299 mov r12, r1 add r0, r12 ldrb r0, [r0] @@ -842810,9 +814282,9 @@ _0819C2FC: adds r6, r4, 0 adds r6, 0x1C adds r0, r6 - ldr r1, _0819C400 + ldr r1, =sub_819C100 + 1 str r1, [r0] - ldr r0, _0819C404 + ldr r0, =0x00000295 mov r9, r0 add r2, r9 ldrb r1, [r2] @@ -842834,10 +814306,10 @@ _0819C2FC: adds r0, r1 lsls r0, 2 adds r0, r6 - ldr r1, _0819C408 + ldr r1, =nullsub_12 + 1 mov r10, r1 str r1, [r0] - ldr r5, _0819C40C + ldr r5, =0x0000029d adds r2, r5 ldrb r1, [r2] lsls r0, r1, 4 @@ -842894,14 +814366,7 @@ _0819C2FC: bl remove_task b _0819C4A4 .align 2, 0 -_0819C3F0: .4byte 0x03005e00 -_0819C3F4: .4byte 0x02020630 -_0819C3F8: .4byte 0x0300127c -_0819C3FC: .4byte 0x00000299 -_0819C400: .4byte sub_819C100 + 1 -_0819C404: .4byte 0x00000295 -_0819C408: .4byte nullsub_12 + 1 -_0819C40C: .4byte 0x0000029d + .pool _0819C410: movs r0, 0x10 strh r0, [r4, 0xE] @@ -842990,15 +814455,15 @@ sub_819C4B4: @ 819C4B4 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r4, _0819C548 + ldr r4, =0x08610638 adds r0, r4, 0 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1 bl obj_add_from_template_forward_search - ldr r6, _0819C54C + ldr r6, =0x0300127c ldr r1, [r6] - ldr r2, _0819C550 + ldr r2, =0x00000299 mov r8, r2 add r1, r8 strb r0, [r1] @@ -843008,7 +814473,7 @@ sub_819C4B4: @ 819C4B4 movs r3, 0x1 bl obj_add_from_template_forward_search ldr r1, [r6] - ldr r5, _0819C554 + ldr r5, =0x00000295 adds r1, r5 strb r0, [r1] adds r0, r4, 0 @@ -843017,10 +814482,10 @@ sub_819C4B4: @ 819C4B4 movs r3, 0x1 bl obj_add_from_template_forward_search ldr r1, [r6] - ldr r4, _0819C558 + ldr r4, =0x0000029d adds r1, r4 strb r0, [r1] - ldr r3, _0819C55C + ldr r3, =0x02020630 ldr r2, [r6] add r8, r2 mov r0, r8 @@ -843030,7 +814495,7 @@ sub_819C4B4: @ 819C4B4 lsls r0, 2 adds r3, 0x1C adds r0, r3 - ldr r1, _0819C560 + ldr r1, =sub_819C040 + 1 str r1, [r0] adds r5, r2, r5 ldrb r1, [r5] @@ -843038,7 +814503,7 @@ sub_819C4B4: @ 819C4B4 adds r0, r1 lsls r0, 2 adds r0, r3 - ldr r5, _0819C564 + ldr r5, =nullsub_12 + 1 str r5, [r0] adds r4, r2, r4 ldrb r1, [r4] @@ -843058,20 +814523,13 @@ sub_819C4B4: @ 819C4B4 pop {r0} bx r0 .align 2, 0 -_0819C548: .4byte 0x08610638 -_0819C54C: .4byte 0x0300127c -_0819C550: .4byte 0x00000299 -_0819C554: .4byte 0x00000295 -_0819C558: .4byte 0x0000029d -_0819C55C: .4byte 0x02020630 -_0819C560: .4byte sub_819C040 + 1 -_0819C564: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_819C4B4 thumb_func_start sub_819C568 sub_819C568: @ 819C568 push {r4,lr} - ldr r4, _0819C5C4 + ldr r4, =0x0300127c ldr r0, [r4] movs r1, 0xA5 lsls r1, 2 @@ -843090,12 +814548,12 @@ sub_819C568: @ 819C568 adds r0, r1 ldrb r0, [r0] bl sub_818D820 - ldr r0, _0819C5C8 + ldr r0, =sub_819C2D4 + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0819C5CC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -843112,9 +814570,7 @@ sub_819C568: @ 819C568 pop {r0} bx r0 .align 2, 0 -_0819C5C4: .4byte 0x0300127c -_0819C5C8: .4byte sub_819C2D4 + 1 -_0819C5CC: .4byte 0x03005e00 + .pool thumb_func_end sub_819C568 thumb_func_start sub_819C5D0 @@ -843170,12 +814626,12 @@ sub_819C5D0: @ 819C5D0 sub_819C634: @ 819C634 push {r4-r7,lr} lsls r0, 16 - ldr r2, _0819C678 + ldr r2, =0x0203bc8c ldr r1, [r2] lsrs r0, 12 adds r0, r1 ldrh r6, [r0] - ldr r0, _0819C67C + ldr r0, =0x0300127c ldr r0, [r0] ldrb r5, [r0, 0x5] movs r3, 0x1 @@ -843204,8 +814660,7 @@ _0819C658: movs r0, 0 b _0819C696 .align 2, 0 -_0819C678: .4byte 0x0203bc8c -_0819C67C: .4byte 0x0300127c + .pool _0819C680: adds r0, r2, 0x1 lsls r0, 24 @@ -843231,7 +814686,7 @@ sub_819C69C: @ 819C69C push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0819C6C0 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -843246,15 +814701,15 @@ sub_819C69C: @ 819C69C beq _0819C6CA b _0819C7D8 .align 2, 0 -_0819C6C0: .4byte 0x03005e00 + .pool _0819C6C4: cmp r2, 0x2 beq _0819C7B4 b _0819C7D8 _0819C6CA: - ldr r1, _0819C6EC + ldr r1, =0x0300127c ldr r0, [r1] - ldr r3, _0819C6F0 + ldr r3, =0x000002a7 adds r0, r3 strb r2, [r0] ldr r0, [r1] @@ -843262,26 +814717,24 @@ _0819C6CA: adds r0, r3 strb r2, [r0] ldr r0, [r1] - ldr r1, _0819C6F4 + ldr r1, =0x000002a6 adds r0, r1 movs r1, 0x1 strb r1, [r0] strh r1, [r5, 0x8] b _0819C7D8 .align 2, 0 -_0819C6EC: .4byte 0x0300127c -_0819C6F0: .4byte 0x000002a7 -_0819C6F4: .4byte 0x000002a6 + .pool _0819C6F8: - ldr r0, _0819C718 + ldr r0, =0x0300127c ldr r3, [r0] - ldr r2, _0819C71C + ldr r2, =0x000002a2 adds r1, r3, r2 ldrb r1, [r1] adds r7, r0, 0 cmp r1, 0 beq _0819C7D8 - ldr r1, _0819C720 + ldr r1, =0x000002a9 adds r0, r3, r1 ldrb r4, [r0] cmp r4, 0 @@ -843290,11 +814743,9 @@ _0819C6F8: strh r0, [r5, 0x8] b _0819C7D8 .align 2, 0 -_0819C718: .4byte 0x0300127c -_0819C71C: .4byte 0x000002a2 -_0819C720: .4byte 0x000002a9 + .pool _0819C724: - ldr r2, _0819C754 + ldr r2, =0x000002a7 adds r1, r3, r2 ldrb r0, [r1] adds r0, 0x1 @@ -843318,7 +814769,7 @@ _0819C724: subs r0, 0x1 b _0819C762 .align 2, 0 -_0819C754: .4byte 0x000002a7 + .pool _0819C758: movs r0, 0xAA lsls r0, 2 @@ -843342,33 +814793,32 @@ _0819C764: ldrb r0, [r4] cmp r0, 0x5 bls _0819C790 - ldr r3, _0819C78C + ldr r3, =0x000002a6 adds r1, r2, r3 movs r0, 0 b _0819C7D6 .align 2, 0 -_0819C78C: .4byte 0x000002a6 + .pool _0819C790: cmp r0, 0 bne _0819C7D8 - ldr r1, _0819C7AC + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 movs r1, 0x2 strh r1, [r0, 0x8] - ldr r0, _0819C7B0 + ldr r0, =0x000002a6 adds r1, r2, r0 movs r0, 0x1 b _0819C7D6 .align 2, 0 -_0819C7AC: .4byte 0x03005e00 -_0819C7B0: .4byte 0x000002a6 + .pool _0819C7B4: - ldr r0, _0819C7CC + ldr r0, =0x0300127c ldr r0, [r0] - ldr r2, _0819C7D0 + ldr r2, =0x000002a9 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xE @@ -843379,8 +814829,7 @@ _0819C7B4: strh r0, [r5, 0x8] b _0819C7D8 .align 2, 0 -_0819C7CC: .4byte 0x0300127c -_0819C7D0: .4byte 0x000002a9 + .pool _0819C7D4: adds r0, 0x1 _0819C7D6: @@ -843420,14 +814869,14 @@ sub_819C810: @ 819C810 mov r5, r8 push {r5,r6} sub sp, 0x4 - ldr r4, _0819C8F0 - ldr r5, _0819C8F4 + ldr r4, =0x020244ec + ldr r5, =0x03001284 ldr r1, [r5] ldrb r0, [r1, 0x12] movs r6, 0x64 muls r0, r6 adds r0, r4 - ldr r2, _0819C8F8 + ldr r2, =0x02024744 mov r9, r2 ldrb r1, [r1, 0x13] muls r1, r6 @@ -843444,7 +814893,7 @@ sub_819C810: @ 819C810 movs r1, 0x20 mov r2, sp bl pokemon_setattr - ldr r3, _0819C8FC + ldr r3, =0x03005d90 mov r8, r3 ldr r3, [r3] ldr r4, [r5] @@ -843476,7 +814925,7 @@ sub_819C810: @ 819C810 adds r0, r1 lsls r0, 2 adds r3, r0 - ldr r0, _0819C900 + ldr r0, =0x00000e78 adds r3, r0 ldrb r1, [r3] adds r2, r0 @@ -843495,7 +814944,7 @@ sub_819C810: @ 819C810 lsls r1, r3, 1 adds r1, r3 lsls r1, 2 - ldr r3, _0819C904 + ldr r3, =0x00000e74 adds r2, r3 adds r2, r1 str r0, [r2] @@ -843513,7 +814962,7 @@ sub_819C810: @ 819C810 adds r1, r3 lsls r1, 2 adds r2, r1 - ldr r3, _0819C908 + ldr r3, =0x00000e79 adds r2, r3 strb r0, [r2] add sp, 0x4 @@ -843524,13 +814973,7 @@ sub_819C810: @ 819C810 pop {r0} bx r0 .align 2, 0 -_0819C8F0: .4byte 0x020244ec -_0819C8F4: .4byte 0x03001284 -_0819C8F8: .4byte 0x02024744 -_0819C8FC: .4byte 0x03005d90 -_0819C900: .4byte 0x00000e78 -_0819C904: .4byte 0x00000e74 -_0819C908: .4byte 0x00000e79 + .pool thumb_func_end sub_819C810 thumb_func_start sub_819C90C @@ -843539,7 +814982,7 @@ sub_819C90C: @ 819C90C sub sp, 0x4 lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _0819C930 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -843554,7 +814997,7 @@ sub_819C90C: @ 819C90C beq _0819C93A b _0819C9F0 .align 2, 0 -_0819C930: .4byte 0x03005e00 + .pool _0819C934: cmp r0, 0x8 beq _0819C9C4 @@ -843571,7 +815014,7 @@ _0819C93A: strh r0, [r6, 0x8] b _0819C9F0 _0819C950: - ldr r0, _0819C9AC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -843579,7 +815022,7 @@ _0819C950: lsrs r5, r0, 24 cmp r5, 0 bne _0819C9F0 - ldr r4, _0819C9B0 + ldr r4, =0x03001284 ldr r0, [r4] adds r0, 0x21 ldrb r0, [r0] @@ -843589,19 +815032,19 @@ _0819C950: adds r1, 0x30 bl sub_819F444 bl sub_819E538 - ldr r4, _0819C9B4 + ldr r4, =0x0203ce40 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0819C9B8 + ldr r4, =0x0203ce44 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0819C9BC + ldr r4, =0x0203ce48 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0819C9C0 + ldr r4, =0x0203ce4c ldr r0, [r4] bl free str r5, [r4] @@ -843610,29 +815053,24 @@ _0819C950: strh r0, [r6, 0x8] b _0819C9F0 .align 2, 0 -_0819C9AC: .4byte 0x02037fd4 -_0819C9B0: .4byte 0x03001284 -_0819C9B4: .4byte 0x0203ce40 -_0819C9B8: .4byte 0x0203ce44 -_0819C9BC: .4byte 0x0203ce48 -_0819C9C0: .4byte 0x0203ce4c + .pool _0819C9C4: adds r0, r2, 0 bl remove_task - ldr r2, _0819C9F8 + ldr r2, =0x03001284 ldr r1, [r2] movs r0, 0x1 strb r0, [r1, 0x15] ldr r2, [r2] - ldr r0, _0819C9FC + ldr r0, =0x02037714 movs r1, 0xF4 lsls r1, 1 adds r0, r1 ldrh r0, [r0] strh r0, [r2, 0x24] - ldr r1, _0819CA00 + ldr r1, =0x020244ec ldrb r2, [r2, 0x3] - ldr r0, _0819CA04 + ldr r0, =sub_819DC1C + 1 str r0, [sp] movs r0, 0 movs r3, 0x2 @@ -843643,10 +815081,7 @@ _0819C9F0: pop {r0} bx r0 .align 2, 0 -_0819C9F8: .4byte 0x03001284 -_0819C9FC: .4byte 0x02037714 -_0819CA00: .4byte 0x020244ec -_0819CA04: .4byte sub_819DC1C + 1 + .pool thumb_func_end sub_819C90C thumb_func_start sub_819CA08 @@ -843655,14 +815090,14 @@ sub_819CA08: @ 819CA08 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _0819CA3C + ldr r7, =0x03001284 ldr r2, [r7] adds r0, r2, 0 adds r0, 0x30 ldrb r0, [r0] cmp r0, 0x1 beq _0819CAFE - ldr r1, _0819CA40 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -843677,8 +815112,7 @@ sub_819CA08: @ 819CA08 beq _0819CA4E b _0819CAFE .align 2, 0 -_0819CA3C: .4byte 0x03001284 -_0819CA40: .4byte 0x03005e00 + .pool _0819CA44: cmp r1, 0x2 beq _0819CA8C @@ -843694,20 +815128,20 @@ _0819CA4E: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - ldr r0, _0819CA64 + ldr r0, =0x020375f0 strh r1, [r0] b _0819CAFE .align 2, 0 -_0819CA64: .4byte 0x020375f0 + .pool _0819CA68: movs r0, 0x2 strh r0, [r4, 0x8] - ldr r1, _0819CA74 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] b _0819CAFE .align 2, 0 -_0819CA74: .4byte 0x020375f0 + .pool _0819CA78: adds r0, r2, 0 adds r0, 0x20 @@ -843742,19 +815176,19 @@ _0819CAA4: ldrb r0, [r0] bl remove_task bl sub_819E538 - ldr r4, _0819CB08 + ldr r4, =0x0203ce40 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0819CB0C + ldr r4, =0x0203ce44 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0819CB10 + ldr r4, =0x0203ce48 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _0819CB14 + ldr r4, =0x0203ce4c ldr r0, [r4] bl free str r5, [r4] @@ -843762,7 +815196,7 @@ _0819CAA4: bl free str r5, [r7] bl Window_FreeMemory - ldr r0, _0819CB18 + ldr r0, =sub_80861B0 + 1 bl set_callback2 adds r0, r6, 0 bl remove_task @@ -843772,11 +815206,7 @@ _0819CAFE: pop {r0} bx r0 .align 2, 0 -_0819CB08: .4byte 0x0203ce40 -_0819CB0C: .4byte 0x0203ce44 -_0819CB10: .4byte 0x0203ce48 -_0819CB14: .4byte 0x0203ce4c -_0819CB18: .4byte sub_80861B0 + 1 + .pool thumb_func_end sub_819CA08 thumb_func_start sub_819CB1C @@ -843784,13 +815214,13 @@ sub_819CB1C: @ 819CB1C push {r4-r7,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r7, _0819CB48 + ldr r7, =0x03001284 ldr r0, [r7] adds r0, 0x30 ldrb r0, [r0] cmp r0, 0x1 beq _0819CBD6 - ldr r1, _0819CB4C + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -843803,15 +815233,14 @@ sub_819CB1C: @ 819CB1C beq _0819CB5A b _0819CBD6 .align 2, 0 -_0819CB48: .4byte 0x03001284 -_0819CB4C: .4byte 0x03005e00 + .pool _0819CB50: bl sub_819E9E0 movs r0, 0x5 strh r0, [r4, 0x8] b _0819CBD6 _0819CB5A: - ldr r2, _0819CB7C + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r6, 0x1 adds r5, r6, 0 @@ -843827,7 +815256,7 @@ _0819CB5A: strh r6, [r4, 0xA] b _0819CB9C .align 2, 0 -_0819CB7C: .4byte 0x030022c0 + .pool _0819CB80: movs r0, 0 strh r0, [r4, 0xA] @@ -843882,7 +815311,7 @@ sub_819CBDC: @ 819CBDC push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0819CBFC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -843893,28 +815322,26 @@ sub_819CBDC: @ 819CBDC bne _0819CC04 movs r0, 0 strh r0, [r2, 0x8] - ldr r0, _0819CC00 + ldr r0, =sub_819CA08 + 1 b _0819CC16 .align 2, 0 -_0819CBFC: .4byte 0x03005e00 -_0819CC00: .4byte sub_819CA08 + 1 + .pool _0819CC04: movs r0, 0 strh r0, [r2, 0x8] - ldr r1, _0819CC1C + ldr r1, =sub_819CE40 + 1 lsrs r0, r1, 16 strh r0, [r2, 0x14] strh r1, [r2, 0x16] movs r0, 0x1 strh r0, [r2, 0x12] - ldr r0, _0819CC20 + ldr r0, =sub_819D770 + 1 _0819CC16: str r0, [r2] pop {r0} bx r0 .align 2, 0 -_0819CC1C: .4byte sub_819CE40 + 1 -_0819CC20: .4byte sub_819D770 + 1 + .pool thumb_func_end sub_819CBDC thumb_func_start sub_819CC24 @@ -843922,7 +815349,7 @@ sub_819CC24: @ 819CC24 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0819CC60 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -843931,30 +815358,26 @@ sub_819CC24: @ 819CC24 ldrsh r5, [r4, r0] cmp r5, 0 bne _0819CC5A - ldr r0, _0819CC64 + ldr r0, =0x085eecbb bl sub_819EBEC - ldr r0, _0819CC68 + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x20 strb r5, [r0] movs r0, 0x4 strh r0, [r4, 0x8] - ldr r1, _0819CC6C + ldr r1, =sub_819CBDC + 1 lsrs r0, r1, 16 strh r0, [r4, 0x14] strh r1, [r4, 0x16] - ldr r0, _0819CC70 + ldr r0, =sub_819CB1C + 1 str r0, [r4] _0819CC5A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0819CC60: .4byte 0x03005e00 -_0819CC64: .4byte 0x085eecbb -_0819CC68: .4byte 0x03001284 -_0819CC6C: .4byte sub_819CBDC + 1 -_0819CC70: .4byte sub_819CB1C + 1 + .pool thumb_func_end sub_819CC24 thumb_func_start sub_819CC74 @@ -843963,13 +815386,13 @@ sub_819CC74: @ 819CC74 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0819CCA4 + ldr r0, =0x03001284 ldr r1, [r0] ldr r0, [r1, 0x2C] adds r1, 0x30 movs r2, 0x1 bl sub_819F3F8 - ldr r1, _0819CCA8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -843980,30 +815403,27 @@ sub_819CC74: @ 819CC74 bne _0819CCB0 movs r0, 0 strh r0, [r2, 0x8] - ldr r0, _0819CCAC + ldr r0, =sub_819CA08 + 1 b _0819CCC2 .align 2, 0 -_0819CCA4: .4byte 0x03001284 -_0819CCA8: .4byte 0x03005e00 -_0819CCAC: .4byte sub_819CA08 + 1 + .pool _0819CCB0: movs r0, 0 strh r0, [r2, 0x8] - ldr r1, _0819CCCC + ldr r1, =sub_819CE40 + 1 lsrs r0, r1, 16 strh r0, [r2, 0x14] strh r1, [r2, 0x16] movs r0, 0x1 strh r0, [r2, 0x12] - ldr r0, _0819CCD0 + ldr r0, =sub_819D770 + 1 _0819CCC2: str r0, [r2] pop {r4} pop {r0} bx r0 .align 2, 0 -_0819CCCC: .4byte sub_819CE40 + 1 -_0819CCD0: .4byte sub_819D770 + 1 + .pool thumb_func_end sub_819CC74 thumb_func_start sub_819CCD4 @@ -844011,7 +815431,7 @@ sub_819CCD4: @ 819CCD4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0819CD20 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -844020,14 +815440,14 @@ sub_819CCD4: @ 819CCD4 ldrsh r0, [r5, r1] cmp r0, 0 bne _0819CD1A - ldr r4, _0819CD24 + ldr r4, =0x03001284 ldr r1, [r4] adds r0, r1, 0 adds r0, 0x2D adds r1, 0x30 movs r2, 0x1 bl sub_819F2B4 - ldr r0, _0819CD28 + ldr r0, =0x085eecf0 bl sub_819EBEC ldr r0, [r4] adds r0, 0x20 @@ -844035,22 +815455,18 @@ sub_819CCD4: @ 819CCD4 strb r1, [r0] movs r0, 0x4 strh r0, [r5, 0x8] - ldr r1, _0819CD2C + ldr r1, =sub_819CC74 + 1 lsrs r0, r1, 16 strh r0, [r5, 0x14] strh r1, [r5, 0x16] - ldr r0, _0819CD30 + ldr r0, =sub_819CB1C + 1 str r0, [r5] _0819CD1A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0819CD20: .4byte 0x03005e00 -_0819CD24: .4byte 0x03001284 -_0819CD28: .4byte 0x085eecf0 -_0819CD2C: .4byte sub_819CC74 + 1 -_0819CD30: .4byte sub_819CB1C + 1 + .pool thumb_func_end sub_819CCD4 thumb_func_start sub_819CD34 @@ -844060,7 +815476,7 @@ sub_819CD34: @ 819CD34 push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0819CD5C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -844075,13 +815491,13 @@ sub_819CD34: @ 819CD34 beq _0819CD66 b _0819CE36 .align 2, 0 -_0819CD5C: .4byte 0x03005e00 + .pool _0819CD60: cmp r0, 0x9 beq _0819CD88 b _0819CE36 _0819CD66: - ldr r0, _0819CD84 + ldr r0, =0x03001284 ldr r1, [r0] ldrb r0, [r1, 0x15] cmp r0, 0 @@ -844096,9 +815512,9 @@ _0819CD7C: strh r0, [r5, 0x8] b _0819CE36 .align 2, 0 -_0819CD84: .4byte 0x03001284 + .pool _0819CD88: - ldr r0, _0819CDA0 + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x30 ldrb r0, [r0] @@ -844109,15 +815525,15 @@ _0819CD88: strh r0, [r5, 0x8] b _0819CE36 .align 2, 0 -_0819CDA0: .4byte 0x03001284 + .pool _0819CDA4: - ldr r7, _0819CDD0 + ldr r7, =0x03001284 ldr r0, [r7] adds r0, 0x30 ldrb r0, [r0] cmp r0, 0x1 beq _0819CE36 - ldr r2, _0819CDD4 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 mov r8, r0 @@ -844131,8 +815547,7 @@ _0819CDA4: bl sub_819F0A0 b _0819CE36 .align 2, 0 -_0819CDD0: .4byte 0x03001284 -_0819CDD4: .4byte 0x030022c0 + .pool _0819CDD8: movs r0, 0x2 ands r0, r1 @@ -844148,18 +815563,17 @@ _0819CDD8: movs r0, 0x3 bl sub_819EA64 strh r4, [r5, 0x8] - ldr r1, _0819CE0C + ldr r1, =sub_819CE40 + 1 lsrs r0, r1, 16 strh r0, [r5, 0x14] strh r1, [r5, 0x16] mov r1, r8 strh r1, [r5, 0x12] - ldr r0, _0819CE10 + ldr r0, =sub_819D770 + 1 str r0, [r5] b _0819CE36 .align 2, 0 -_0819CE0C: .4byte sub_819CE40 + 1 -_0819CE10: .4byte sub_819D770 + 1 + .pool _0819CE14: ldrh r1, [r2, 0x30] movs r0, 0x40 @@ -844190,7 +815604,7 @@ sub_819CE40: @ 819CE40 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0819CE60 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -844203,15 +815617,15 @@ sub_819CE40: @ 819CE40 beq _0819CE88 b _0819CF4C .align 2, 0 -_0819CE60: .4byte 0x03005e00 + .pool _0819CE64: - ldr r0, _0819CE80 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _0819CF4C - ldr r0, _0819CE84 + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x22 movs r1, 0x1 @@ -844219,10 +815633,9 @@ _0819CE64: strh r1, [r4, 0x8] b _0819CF4C .align 2, 0 -_0819CE80: .4byte 0x02037fd4 -_0819CE84: .4byte 0x03001284 + .pool _0819CE88: - ldr r2, _0819CEB4 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] adds r5, r1, 0 ands r5, r0 @@ -844230,7 +815643,7 @@ _0819CE88: beq _0819CEBC movs r0, 0x5 bl audio_play - ldr r0, _0819CEB8 + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x22 movs r1, 0 @@ -844241,8 +815654,7 @@ _0819CE88: bl sub_819F184 b _0819CF4C .align 2, 0 -_0819CEB4: .4byte 0x030022c0 -_0819CEB8: .4byte 0x03001284 + .pool _0819CEBC: movs r0, 0x2 ands r0, r1 @@ -844250,25 +815662,23 @@ _0819CEBC: beq _0819CEF8 movs r0, 0x5 bl audio_play - ldr r0, _0819CEEC + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x22 strb r5, [r0] bl sub_819EE08 bl sub_819EAC0 - ldr r1, _0819CEF0 + ldr r1, =sub_819CC24 + 1 lsrs r0, r1, 16 strh r0, [r4, 0x14] strh r1, [r4, 0x16] strh r5, [r4, 0x8] strh r5, [r4, 0x12] - ldr r0, _0819CEF4 + ldr r0, =sub_819D588 + 1 str r0, [r4] b _0819CF4C .align 2, 0 -_0819CEEC: .4byte 0x03001284 -_0819CEF0: .4byte sub_819CC24 + 1 -_0819CEF4: .4byte sub_819D588 + 1 + .pool _0819CEF8: ldrh r1, [r2, 0x30] movs r0, 0x20 @@ -844319,7 +815729,7 @@ sub_819CF54: @ 819CF54 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0819CF78 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -844334,13 +815744,13 @@ sub_819CF54: @ 819CF54 beq _0819CF82 b _0819D05C .align 2, 0 -_0819CF78: .4byte 0x03005e00 + .pool _0819CF7C: cmp r2, 0x2 beq _0819D03C b _0819D05C _0819CF82: - ldr r1, _0819CF9C + ldr r1, =0x03001284 ldr r0, [r1] adds r0, 0x27 strb r2, [r0] @@ -844354,9 +815764,9 @@ _0819CF82: strh r1, [r4, 0x8] b _0819D05C .align 2, 0 -_0819CF9C: .4byte 0x03001284 + .pool _0819CFA0: - ldr r1, _0819CFC0 + ldr r1, =0x03001284 ldr r2, [r1] adds r0, r2, 0 adds r0, 0x22 @@ -844373,7 +815783,7 @@ _0819CFA0: strh r0, [r4, 0x8] b _0819D05C .align 2, 0 -_0819CFC0: .4byte 0x03001284 + .pool _0819CFC4: adds r1, r2, 0 adds r1, 0x27 @@ -844424,7 +815834,7 @@ _0819CFF8: _0819D01C: cmp r0, 0 bne _0819D05C - ldr r1, _0819D038 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -844436,9 +815846,9 @@ _0819D01C: movs r0, 0x1 b _0819D05A .align 2, 0 -_0819D038: .4byte 0x03005e00 + .pool _0819D03C: - ldr r0, _0819D054 + ldr r0, =0x03001284 ldr r0, [r0] adds r1, r0, 0 adds r1, 0x29 @@ -844451,7 +815861,7 @@ _0819D03C: strh r0, [r4, 0x8] b _0819D05C .align 2, 0 -_0819D054: .4byte 0x03001284 + .pool _0819D058: adds r0, 0x1 _0819D05A: @@ -844467,7 +815877,7 @@ sub_819D064: @ 819D064 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _0819D088 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -844482,22 +815892,22 @@ sub_819D064: @ 819D064 beq _0819D092 b _0819D118 .align 2, 0 -_0819D088: .4byte 0x03005e00 + .pool _0819D08C: cmp r1, 0x2 beq _0819D0BC b _0819D118 _0819D092: - ldr r0, _0819D0A0 + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x27 strb r1, [r0] strh r1, [r4, 0x10] b _0819D0AE .align 2, 0 -_0819D0A0: .4byte 0x03001284 + .pool _0819D0A4: - ldr r0, _0819D0B8 + ldr r0, =0x020378f4 movs r1, 0xE0 movs r2, 0xA bl gpu_pal_apply @@ -844507,9 +815917,9 @@ _0819D0AE: strh r0, [r4, 0x8] b _0819D118 .align 2, 0 -_0819D0B8: .4byte 0x020378f4 + .pool _0819D0BC: - ldr r2, _0819D120 + ldr r2, =0x03001284 ldr r0, [r2] adds r0, 0x28 ldrb r0, [r0] @@ -844534,8 +815944,8 @@ _0819D0D2: bls _0819D108 movs r0, 0 strb r0, [r1] - ldr r1, _0819D124 - ldr r0, _0819D128 + ldr r1, =0x02037714 + ldr r0, =0x02037b14 movs r3, 0xE4 lsls r3, 1 adds r0, r3 @@ -844561,9 +815971,7 @@ _0819D118: pop {r0} bx r0 .align 2, 0 -_0819D120: .4byte 0x03001284 -_0819D124: .4byte 0x02037714 -_0819D128: .4byte 0x02037b14 + .pool thumb_func_end sub_819D064 thumb_func_start sub_819D12C @@ -844577,7 +815985,7 @@ sub_819D12C: @ 819D12C lsls r0, 24 lsrs r0, 24 str r0, [sp] - ldr r1, _0819D158 + ldr r1, =0x03005e00 lsls r0, 2 ldr r2, [sp] adds r0, r2 @@ -844591,7 +815999,7 @@ sub_819D12C: @ 819D12C beq _0819D168 b _0819D310 .align 2, 0 -_0819D158: .4byte 0x03005e00 + .pool _0819D15C: strh r3, [r4, 0xA] strh r3, [r4, 0xC] @@ -844604,7 +816012,7 @@ _0819D168: str r3, [sp, 0x4] movs r1, 0x2 str r0, [sp, 0x8] - ldr r0, _0819D1CC + ldr r0, =0x03005e00 str r0, [sp, 0xC] _0819D174: lsls r0, r1, 24 @@ -844612,8 +816020,8 @@ _0819D174: mov r9, r0 cmp r4, 0x2 beq _0819D1F2 - ldr r2, _0819D1D0 - ldr r3, _0819D1D4 + ldr r2, =0x02020630 + ldr r3, =0x03001284 ldr r0, [r3] adds r0, 0x5 mov r8, r0 @@ -844637,7 +816045,7 @@ _0819D174: lsls r0, 1 ldr r2, [sp, 0x8] adds r0, r2 - ldr r1, _0819D1CC + ldr r1, =0x03005e00 adds r1, 0x8 adds r0, r1 movs r3, 0 @@ -844653,9 +816061,7 @@ _0819D1BE: strh r0, [r6, 0x20] b _0819D210 .align 2, 0 -_0819D1CC: .4byte 0x03005e00 -_0819D1D0: .4byte 0x02020630 -_0819D1D4: .4byte 0x03001284 + .pool _0819D1D8: cmp r5, 0x10 bls _0819D210 @@ -844671,8 +816077,8 @@ _0819D1D8: strh r0, [r6, 0x20] b _0819D210 _0819D1F2: - ldr r3, _0819D254 - ldr r4, _0819D258 + ldr r3, =0x02020630 + ldr r4, =0x03001284 ldr r0, [r4] ldrb r1, [r0, 0x7] lsls r0, r1, 4 @@ -844693,14 +816099,14 @@ _0819D210: lsls r0, 1 ldr r1, [sp, 0x8] adds r0, r1 - ldr r1, _0819D25C + ldr r1, =0x03005e00 adds r1, 0x8 adds r0, r1 movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0x1 bne _0819D26A - ldr r1, _0819D258 + ldr r1, =0x03001284 ldr r0, [r1] adds r0, 0x5 adds r0, r2 @@ -844722,9 +816128,7 @@ _0819D210: movs r7, 0x1 b _0819D26C .align 2, 0 -_0819D254: .4byte 0x02020630 -_0819D258: .4byte 0x03001284 -_0819D25C: .4byte 0x03005e00 + .pool _0819D260: movs r7, 0 cmp r3, r0 @@ -844735,7 +816139,7 @@ _0819D26A: movs r7, 0 _0819D26C: mov r6, r10 - ldr r5, _0819D2B8 + ldr r5, =0x03001284 ldr r2, [r5] mov r1, r9 asrs r4, r1, 24 @@ -844755,7 +816159,7 @@ _0819D26C: lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] - ldr r0, _0819D2BC + ldr r0, =0x0000fff0 strh r0, [r1, 0x20] ldrb r0, [r2, 0x14] cmp r0, 0x1 @@ -844772,12 +816176,11 @@ _0819D26C: adds r2, r6 b _0819D2D8 .align 2, 0 -_0819D2B8: .4byte 0x03001284 -_0819D2BC: .4byte 0x0000fff0 + .pool _0819D2C0: movs r0, 0x64 bl gpu_pal_tags_index_of - ldr r2, _0819D320 + ldr r2, =0x03001284 ldr r1, [r2] adds r1, 0x5 adds r1, r4 @@ -844826,7 +816229,7 @@ _0819D310: pop {r0} bx r0 .align 2, 0 -_0819D320: .4byte 0x03001284 + .pool thumb_func_end sub_819D12C thumb_func_start sub_819D324 @@ -844840,7 +816243,7 @@ sub_819D324: @ 819D324 lsrs r7, r0, 24 movs r0, 0 mov r8, r0 - ldr r1, _0819D364 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -844865,10 +816268,10 @@ _0819D352: _0819D360: b _0819D570 .align 2, 0 -_0819D364: .4byte 0x03005e00 + .pool _0819D368: - ldr r3, _0819D394 - ldr r2, _0819D398 + ldr r3, =0x02020630 + ldr r2, =0x03001284 ldr r0, [r2] ldrb r1, [r0, 0x8] lsls r0, r1, 4 @@ -844890,8 +816293,7 @@ _0819D368: movs r0, 0xF0 b _0819D3B0 .align 2, 0 -_0819D394: .4byte 0x02020630 -_0819D398: .4byte 0x03001284 + .pool _0819D39C: lsls r0, 16 asrs r0, 16 @@ -844909,8 +816311,8 @@ _0819D3B2: cmp r1, 0x1 bne _0819D3FC movs r3, 0 - ldr r7, _0819D3F4 - ldr r6, _0819D3F8 + ldr r7, =0x02020630 + ldr r6, =0x03001284 asrs r5, r2, 24 _0819D3BE: movs r4, 0 @@ -844941,8 +816343,7 @@ _0819D3C2: bls _0819D3BE b _0819D570 .align 2, 0 -_0819D3F4: .4byte 0x02020630 -_0819D3F8: .4byte 0x03001284 + .pool _0819D3FC: movs r4, 0 lsls r1, r7, 2 @@ -844952,9 +816353,9 @@ _0819D3FC: movs r0, 0x30 add r0, r8 mov r9, r0 - ldr r5, _0819D478 + ldr r5, =0x02020630 _0819D40E: - ldr r1, _0819D47C + ldr r1, =0x03001284 ldr r2, [r1] lsls r3, r4, 1 adds r3, r4 @@ -845006,11 +816407,10 @@ _0819D40E: bl remove_task b _0819D570 .align 2, 0 -_0819D478: .4byte 0x02020630 -_0819D47C: .4byte 0x03001284 + .pool _0819D480: - ldr r2, _0819D4AC - ldr r0, _0819D4B0 + ldr r2, =0x02020630 + ldr r0, =0x03001284 ldr r0, [r0] ldrb r1, [r0, 0xE] lsls r0, r1, 4 @@ -845032,8 +816432,7 @@ _0819D480: movs r0, 0xF0 b _0819D4C8 .align 2, 0 -_0819D4AC: .4byte 0x02020630 -_0819D4B0: .4byte 0x03001284 + .pool _0819D4B4: lsls r0, 16 asrs r0, 16 @@ -845051,8 +816450,8 @@ _0819D4CA: cmp r1, 0x1 bne _0819D510 movs r3, 0 - ldr r7, _0819D508 - ldr r6, _0819D50C + ldr r7, =0x02020630 + ldr r6, =0x03001284 asrs r5, r2, 24 _0819D4D6: movs r4, 0 @@ -845082,16 +816481,15 @@ _0819D4DA: bls _0819D4D6 b _0819D570 .align 2, 0 -_0819D508: .4byte 0x02020630 -_0819D50C: .4byte 0x03001284 + .pool _0819D510: movs r4, 0 lsls r1, r7, 2 mov r12, r1 mov r6, r8 adds r6, 0x10 - ldr r5, _0819D580 - ldr r0, _0819D584 + ldr r5, =0x02020630 + ldr r0, =0x03001284 mov r9, r0 _0819D520: mov r1, r9 @@ -845142,8 +816540,7 @@ _0819D570: pop {r0} bx r0 .align 2, 0 -_0819D580: .4byte 0x02020630 -_0819D584: .4byte 0x03001284 + .pool thumb_func_end sub_819D324 thumb_func_start sub_819D588 @@ -845154,7 +816551,7 @@ sub_819D588: @ 819D588 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _0819D5B4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -845167,13 +816564,12 @@ sub_819D588: @ 819D588 b _0819D762 _0819D5AA: lsls r0, 2 - ldr r1, _0819D5B8 + ldr r1, =_0819D5BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0819D5B4: .4byte 0x03005e00 -_0819D5B8: .4byte _0819D5BC + .pool .align 2, 0 _0819D5BC: .4byte _0819D5D4 @@ -845183,7 +816579,7 @@ _0819D5BC: .4byte _0819D6F0 .4byte _0819D73A _0819D5D4: - ldr r0, _0819D5EC + ldr r0, =0x08610918 movs r1, 0xE0 movs r2, 0xA bl gpu_pal_apply @@ -845192,11 +816588,11 @@ _0819D5D4: bl Window_WriteStandardTileMap b _0819D622 .align 2, 0 -_0819D5EC: .4byte 0x08610918 + .pool _0819D5F0: movs r0, 0x3 bl sub_819EA64 - ldr r0, _0819D608 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -845206,11 +816602,11 @@ _0819D5F0: strh r0, [r1, 0x8] b _0819D762 .align 2, 0 -_0819D608: .4byte 0x03005e00 + .pool _0819D60C: movs r0, 0x80 lsls r0, 7 - ldr r1, _0819D634 + ldr r1, =0x0860f13c adds r1, 0x4A ldrh r1, [r1] str r1, [sp] @@ -845219,7 +816615,7 @@ _0819D60C: movs r3, 0x10 bl sub_80A1AD4 _0819D622: - ldr r1, _0819D638 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -845229,10 +816625,9 @@ _0819D622: strh r1, [r0, 0x8] b _0819D762 .align 2, 0 -_0819D634: .4byte 0x0860f13c -_0819D638: .4byte 0x03005e00 + .pool _0819D63C: - ldr r0, _0819D6A0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -845248,17 +816643,17 @@ _0819D64E: movs r0, 0x5 movs r1, 0x2 bl Window_CopyToVram - ldr r0, _0819D6A4 + ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0x1 bne _0819D6B0 - ldr r0, _0819D6A8 + ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0819D6AC + ldr r1, =0x03005e00 lsls r2, r5, 2 adds r2, r5 lsls r2, 3 @@ -845280,17 +816675,14 @@ _0819D64E: strh r0, [r2, 0x8] b _0819D762 .align 2, 0 -_0819D6A0: .4byte 0x02037fd4 -_0819D6A4: .4byte 0x03001284 -_0819D6A8: .4byte sub_819D324 + 1 -_0819D6AC: .4byte 0x03005e00 + .pool _0819D6B0: - ldr r0, _0819D6E8 + ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r4, r0, 24 - ldr r3, _0819D6EC + ldr r3, =0x03005e00 lsls r2, r5, 2 adds r2, r5 lsls r2, 3 @@ -845312,8 +816704,7 @@ _0819D6B0: strh r0, [r2, 0x8] b _0819D762 .align 2, 0 -_0819D6E8: .4byte sub_819D324 + 1 -_0819D6EC: .4byte 0x03005e00 + .pool _0819D6F0: lsls r0, r5, 2 adds r0, r5 @@ -845325,7 +816716,7 @@ _0819D6F0: ldrsh r7, [r6, r2] cmp r7, 0 bne _0819D734 - ldr r0, _0819D730 + ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -845346,7 +816737,7 @@ _0819D6F0: strh r0, [r6, 0x8] b _0819D762 .align 2, 0 -_0819D730: .4byte sub_819D324 + 1 + .pool _0819D734: subs r0, 0x1 strh r0, [r6, 0xC] @@ -845389,7 +816780,7 @@ sub_819D770: @ 819D770 sub sp, 0x4 lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _0819D7B0 + ldr r1, =0x03001284 ldr r0, [r1] adds r0, 0x30 ldrb r0, [r0] @@ -845398,7 +816789,7 @@ sub_819D770: @ 819D770 bne _0819D78C b _0819D9D8 _0819D78C: - ldr r0, _0819D7B4 + ldr r0, =0x03005e00 lsls r2, r6, 2 adds r1, r2, r6 lsls r1, 3 @@ -845412,14 +816803,12 @@ _0819D78C: b _0819D9D8 _0819D7A4: lsls r0, r1, 2 - ldr r1, _0819D7B8 + ldr r1, =_0819D7BC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0819D7B0: .4byte 0x03001284 -_0819D7B4: .4byte 0x03005e00 -_0819D7B8: .4byte _0819D7BC + .pool .align 2, 0 _0819D7BC: .4byte _0819D7E0 @@ -845436,12 +816825,12 @@ _0819D7E0: ldrb r7, [r0, 0x14] cmp r7, 0x1 bne _0819D828 - ldr r0, _0819D820 + ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r4, r0, 24 - ldr r3, _0819D824 + ldr r3, =0x03005e00 adds r2, r5, r6 lsls r2, 3 adds r2, r3 @@ -845463,15 +816852,14 @@ _0819D7E0: strh r0, [r2, 0x8] b _0819D9D8 .align 2, 0 -_0819D820: .4byte sub_819D324 + 1 -_0819D824: .4byte 0x03005e00 + .pool _0819D828: - ldr r0, _0819D860 + ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r4, r0, 24 - ldr r3, _0819D864 + ldr r3, =0x03005e00 adds r2, r5, r6 lsls r2, 3 adds r2, r3 @@ -845493,8 +816881,7 @@ _0819D828: strh r0, [r2, 0x8] b _0819D9D8 .align 2, 0 -_0819D860: .4byte sub_819D324 + 1 -_0819D864: .4byte 0x03005e00 + .pool _0819D868: adds r0, r5, r6 lsls r0, 3 @@ -845505,7 +816892,7 @@ _0819D868: ldrsh r7, [r5, r2] cmp r7, 0 bne _0819D8A8 - ldr r0, _0819D8A4 + ldr r0, =sub_819D324 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -845526,7 +816913,7 @@ _0819D868: strh r0, [r5, 0x8] b _0819D9D8 .align 2, 0 -_0819D8A4: .4byte sub_819D324 + 1 + .pool _0819D8A8: subs r0, 0x1 strh r0, [r5, 0xC] @@ -845548,8 +816935,8 @@ _0819D8C0: beq _0819D8CA b _0819D9D8 _0819D8CA: - ldr r1, _0819D8EC - ldr r0, _0819D8F0 + ldr r1, =0x02037b14 + ldr r0, =0x0860f13c adds r0, 0x4A ldrh r0, [r0] movs r2, 0xE2 @@ -845564,12 +816951,11 @@ _0819D8CA: strh r0, [r4, 0x8] b _0819D9D8 .align 2, 0 -_0819D8EC: .4byte 0x02037b14 -_0819D8F0: .4byte 0x0860f13c + .pool _0819D8F4: movs r0, 0x80 lsls r0, 7 - ldr r1, _0819D90C + ldr r1, =0x0860f13c adds r1, 0x4A ldrh r1, [r1] str r1, [sp] @@ -845579,9 +816965,9 @@ _0819D8F4: bl sub_80A1AD4 b _0819D990 .align 2, 0 -_0819D90C: .4byte 0x0860f13c + .pool _0819D910: - ldr r0, _0819D924 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -845591,7 +816977,7 @@ _0819D910: bl sub_819EDBC b _0819D990 .align 2, 0 -_0819D924: .4byte 0x02037fd4 + .pool _0819D928: movs r0, 0x1 bl sub_819EDBC @@ -845607,27 +816993,26 @@ _0819D936: bl Window_CopyToVram b _0819D990 _0819D948: - ldr r0, _0819D95C + ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0 bne _0819D964 - ldr r0, _0819D960 + ldr r0, =0x085eec73 bl sub_819EBEC b _0819D96A .align 2, 0 -_0819D95C: .4byte 0x03001284 -_0819D960: .4byte 0x085eec73 + .pool _0819D964: - ldr r0, _0819D9A0 + ldr r0, =0x085eec8b bl sub_819EBEC _0819D96A: - ldr r0, _0819D9A4 + ldr r0, =0x03001284 ldr r1, [r0] ldrb r0, [r1, 0x3] cmp r0, 0x2 bhi _0819D98C - ldr r2, _0819D9A8 + ldr r2, =0x02020630 ldrb r1, [r1, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -845642,7 +817027,7 @@ _0819D96A: _0819D98C: bl sub_819EFA8 _0819D990: - ldr r0, _0819D9AC + ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 adds r1, r0 @@ -845651,19 +817036,16 @@ _0819D990: strh r0, [r1, 0x8] b _0819D9D8 .align 2, 0 -_0819D9A0: .4byte 0x085eec8b -_0819D9A4: .4byte 0x03001284 -_0819D9A8: .4byte 0x02020630 -_0819D9AC: .4byte 0x03005e00 + .pool _0819D9B0: bl sub_819EEF0 bl sub_819EADC - ldr r0, _0819D9E4 + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x22 movs r1, 0x1 strb r1, [r0] - ldr r1, _0819D9E8 + ldr r1, =0x03005e00 adds r0, r5, r6 lsls r0, 3 adds r0, r1 @@ -845682,8 +817064,7 @@ _0819D9D8: pop {r0} bx r0 .align 2, 0 -_0819D9E4: .4byte 0x03001284 -_0819D9E8: .4byte 0x03005e00 + .pool thumb_func_end sub_819D770 thumb_func_start sub_819D9EC @@ -845691,7 +817072,7 @@ sub_819D9EC: @ 819D9EC push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0819DA24 + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x30 ldrb r0, [r0] @@ -845699,7 +817080,7 @@ sub_819D9EC: @ 819D9EC bne _0819DA00 b _0819DBCA _0819DA00: - ldr r0, _0819DA28 + ldr r0, =0x03005e00 lsls r2, r6, 2 adds r1, r2, r6 lsls r1, 3 @@ -845713,14 +817094,12 @@ _0819DA00: b _0819DBCA _0819DA18: lsls r0, r1, 2 - ldr r1, _0819DA2C + ldr r1, =_0819DA30 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0819DA24: .4byte 0x03001284 -_0819DA28: .4byte 0x03005e00 -_0819DA2C: .4byte _0819DA30 + .pool .align 2, 0 _0819DA30: .4byte _0819DA44 @@ -845730,17 +817109,17 @@ _0819DA30: .4byte _0819DBB0 _0819DA44: bl sub_819EEF0 - ldr r0, _0819DA54 + ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 b _0819DB96 .align 2, 0 -_0819DA54: .4byte 0x03005e00 + .pool _0819DA58: bl sub_819EADC - ldr r2, _0819DA80 - ldr r0, _0819DA84 + ldr r2, =0x02020630 + ldr r0, =0x03001284 ldr r0, [r0] ldrb r1, [r0, 0x4] lsls r0, r1, 4 @@ -845752,21 +817131,19 @@ _0819DA58: movs r2, 0x4 orrs r1, r2 strb r1, [r0] - ldr r0, _0819DA88 + ldr r0, =0x03005e00 adds r1, r7, r6 lsls r1, 3 adds r1, r0 b _0819DB96 .align 2, 0 -_0819DA80: .4byte 0x02020630 -_0819DA84: .4byte 0x03001284 -_0819DA88: .4byte 0x03005e00 + .pool _0819DA8C: - ldr r0, _0819DAAC + ldr r0, =sub_819D12C + 1 movs r1, 0 bl AddTask - ldr r2, _0819DAB0 - ldr r0, _0819DAB4 + ldr r2, =0x03005e00 + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x21 ldrb r1, [r0] @@ -845774,24 +817151,21 @@ _0819DA8C: adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _0819DAB8 + ldr r1, =sub_819D064 + 1 str r1, [r0] b _0819DB90 .align 2, 0 -_0819DAAC: .4byte sub_819D12C + 1 -_0819DAB0: .4byte 0x03005e00 -_0819DAB4: .4byte 0x03001284 -_0819DAB8: .4byte sub_819D064 + 1 + .pool _0819DABC: - ldr r0, _0819DAF8 + ldr r0, =sub_819D12C + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 beq _0819DACA b _0819DBCA _0819DACA: - ldr r2, _0819DAFC - ldr r4, _0819DB00 + ldr r2, =0x03005e00 + ldr r4, =0x03001284 ldr r0, [r4] adds r0, 0x21 ldrb r1, [r0] @@ -845812,14 +817186,12 @@ _0819DACA: bl sub_819F048 b _0819DB32 .align 2, 0 -_0819DAF8: .4byte sub_819D12C + 1 -_0819DAFC: .4byte 0x03005e00 -_0819DB00: .4byte 0x03001284 + .pool _0819DB04: movs r0, 0 bl sub_819F048 movs r2, 0 - ldr r5, _0819DBA0 + ldr r5, =0x02020630 movs r3, 0x4 _0819DB10: ldr r0, [r4] @@ -845840,8 +817212,8 @@ _0819DB10: cmp r2, 0x2 bls _0819DB10 _0819DB32: - ldr r5, _0819DBA0 - ldr r4, _0819DBA4 + ldr r5, =0x02020630 + ldr r4, =0x03001284 ldr r3, [r4] ldrb r0, [r3, 0x4] lsls r1, r0, 4 @@ -845859,7 +817231,7 @@ _0819DB32: ldrh r0, [r0, 0x20] movs r5, 0 strh r0, [r1, 0x20] - ldr r2, _0819DBA8 + ldr r2, =0x03005e00 adds r0, r3, 0 adds r0, 0x21 ldrb r1, [r0] @@ -845867,7 +817239,7 @@ _0819DB32: adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _0819DBAC + ldr r1, =sub_819CF54 + 1 str r1, [r0] adds r3, 0x27 strb r5, [r3] @@ -845897,37 +817269,33 @@ _0819DB96: strh r0, [r1, 0x8] b _0819DBCA .align 2, 0 -_0819DBA0: .4byte 0x02020630 -_0819DBA4: .4byte 0x03001284 -_0819DBA8: .4byte 0x03005e00 -_0819DBAC: .4byte sub_819CF54 + 1 + .pool _0819DBB0: adds r0, r7, r6 lsls r0, 3 adds r0, r3 movs r1, 0 strh r1, [r0, 0x8] - ldr r2, _0819DBD0 + ldr r2, =sub_819CE40 + 1 lsrs r1, r2, 16 strh r1, [r0, 0x14] strh r2, [r0, 0x16] movs r1, 0x1 strh r1, [r0, 0x12] - ldr r1, _0819DBD4 + ldr r1, =sub_819D770 + 1 str r1, [r0] _0819DBCA: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0819DBD0: .4byte sub_819CE40 + 1 -_0819DBD4: .4byte sub_819D770 + 1 + .pool thumb_func_end sub_819D9EC thumb_func_start sub_819DBD8 sub_819DBD8: @ 819DBD8 push {r4,r5,lr} - ldr r5, _0819DBFC + ldr r5, =0x03001284 ldr r4, [r5] cmp r4, 0 bne _0819DBF6 @@ -845945,29 +817313,28 @@ _0819DBF6: pop {r0} bx r0 .align 2, 0 -_0819DBFC: .4byte 0x03001284 + .pool thumb_func_end sub_819DBD8 thumb_func_start sub_819DC00 sub_819DC00: @ 819DC00 push {lr} - ldr r0, _0819DC14 + ldr r0, =0x03001284 movs r1, 0 str r1, [r0] - ldr r0, _0819DC18 + ldr r0, =sub_819DC1C + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_0819DC14: .4byte 0x03001284 -_0819DC18: .4byte sub_819DC1C + 1 + .pool thumb_func_end sub_819DC00 thumb_func_start sub_819DC1C sub_819DC1C: @ 819DC1C push {r4-r6,lr} sub sp, 0xC - ldr r1, _0819DC3C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -845978,13 +817345,12 @@ sub_819DC1C: @ 819DC1C b _0819E0AA _0819DC32: lsls r0, 2 - ldr r1, _0819DC40 + ldr r1, =_0819DC44 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0819DC3C: .4byte 0x030022c0 -_0819DC40: .4byte _0819DC44 + .pool .align 2, 0 _0819DC44: .4byte _0819DC84 @@ -846012,46 +817378,43 @@ _0819DC84: str r0, [sp, 0x8] movs r1, 0xC0 lsls r1, 19 - ldr r2, _0819DCC4 + ldr r2, =0x05006000 add r0, sp, 0x8 bl CpuSet movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _0819DCC8 + ldr r1, =0x086108b8 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r0, _0819DCCC + ldr r0, =0x086108c8 bl Window_InitFromTemplates bl TextBox_ResetSomeField - ldr r1, _0819DCD0 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0819E00E .align 2, 0 -_0819DCC4: .4byte 0x05006000 -_0819DCC8: .4byte 0x086108b8 -_0819DCCC: .4byte 0x086108c8 -_0819DCD0: .4byte 0x030022c0 + .pool _0819DCD4: - ldr r5, _0819DD98 + ldr r5, =0x0203ce40 movs r4, 0x88 lsls r4, 3 adds r0, r4, 0 bl malloc str r0, [r5] - ldr r5, _0819DD9C + ldr r5, =0x0203ce44 adds r0, r4, 0 bl malloc_and_clear str r0, [r5] - ldr r5, _0819DDA0 + ldr r5, =0x0203ce48 movs r4, 0x80 lsls r4, 4 adds r0, r4, 0 bl malloc str r0, [r5] - ldr r5, _0819DDA4 + ldr r5, =0x0203ce4c adds r0, r4, 0 bl malloc_and_clear str r0, [r5] @@ -846113,24 +817476,21 @@ _0819DCD4: bl lcd_io_set b _0819E006 .align 2, 0 -_0819DD98: .4byte 0x0203ce40 -_0819DD9C: .4byte 0x0203ce44 -_0819DDA0: .4byte 0x0203ce48 -_0819DDA4: .4byte 0x0203ce4c + .pool _0819DDA8: bl sub_80A1A74 bl reset_all_obj_data bl clear_tasks bl gpu_pal_allocator_reset bl dp13_810BB8C - ldr r0, _0819DE40 - ldr r5, _0819DE44 + ldr r0, =0x08dc0754 + ldr r5, =0x0203ce40 ldr r1, [r5] movs r2, 0x88 lsls r2, 2 bl CpuSet - ldr r0, _0819DE48 - ldr r4, _0819DE4C + ldr r0, =0x0861033c + ldr r4, =0x0203ce44 ldr r1, [r4] movs r2, 0x30 bl CpuSet @@ -846145,8 +817505,8 @@ _0819DDA8: movs r2, 0x60 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r0, _0819DE50 - ldr r4, _0819DE54 + ldr r0, =0x08dc0b94 + ldr r4, =0x0203ce48 ldr r1, [r4] movs r2, 0x80 lsls r2, 3 @@ -846157,11 +817517,11 @@ _0819DDA8: movs r0, 0x1 movs r3, 0 bl gpu_copy_bg_tile_map_to_vram - ldr r0, _0819DE58 + ldr r0, =0x08dc0714 movs r1, 0 movs r2, 0x40 bl gpu_pal_apply - ldr r4, _0819DE5C + ldr r4, =0x08610918 adds r0, r4, 0 movs r1, 0xF0 movs r2, 0xA @@ -846170,32 +817530,23 @@ _0819DDA8: movs r1, 0xE0 movs r2, 0xA bl gpu_pal_apply - ldr r0, _0819DE60 + ldr r0, =0x0861039c movs r1, 0x20 movs r2, 0x4 bl gpu_pal_apply - ldr r1, _0819DE64 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0819E00E .align 2, 0 -_0819DE40: .4byte 0x08dc0754 -_0819DE44: .4byte 0x0203ce40 -_0819DE48: .4byte 0x0861033c -_0819DE4C: .4byte 0x0203ce44 -_0819DE50: .4byte 0x08dc0b94 -_0819DE54: .4byte 0x0203ce48 -_0819DE58: .4byte 0x08dc0714 -_0819DE5C: .4byte 0x08610918 -_0819DE60: .4byte 0x0861039c -_0819DE64: .4byte 0x030022c0 + .pool _0819DE68: - ldr r0, _0819DE8C + ldr r0, =0x0203ce4c ldr r1, [r0] movs r0, 0x3 bl bg_set_tilemap - ldr r1, _0819DE90 + ldr r1, =0x0861023c movs r0, 0x8 str r0, [sp] str r0, [sp, 0x4] @@ -846207,35 +817558,30 @@ _0819DE68: bl gpu_copy_wram_bg_tilemap_to_vram b _0819E006 .align 2, 0 -_0819DE8C: .4byte 0x0203ce4c -_0819DE90: .4byte 0x0861023c + .pool _0819DE94: - ldr r0, _0819DEB8 + ldr r0, =0x086106b0 bl gpu_pal_obj_alloc_and_load_multiple - ldr r0, _0819DEBC + ldr r0, =0x08610650 bl gpu_tile_obj_alloc_and_load_multiple - ldr r0, _0819DEC0 + ldr r0, =0x086106a0 bl gpu_tile_obj_decompress_and_load - ldr r0, _0819DEC4 + ldr r0, =sub_819C7FC + 1 bl SetVBlankCallback - ldr r1, _0819DEC8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0819E00E .align 2, 0 -_0819DEB8: .4byte 0x086106b0 -_0819DEBC: .4byte 0x08610650 -_0819DEC0: .4byte 0x086106a0 -_0819DEC4: .4byte sub_819C7FC + 1 -_0819DEC8: .4byte 0x030022c0 + .pool _0819DECC: - ldr r0, _0819DEE4 + ldr r0, =0x03001284 ldr r1, [r0] ldrb r0, [r1, 0x15] cmp r0, 0x1 bne _0819DEDC - ldr r0, _0819DEE8 + ldr r0, =0x0203cf20 ldrb r0, [r0] strb r0, [r1, 0x3] _0819DEDC: @@ -846244,12 +817590,11 @@ _0819DEDC: adds r1, r2, r0 b _0819E00E .align 2, 0 -_0819DEE4: .4byte 0x03001284 -_0819DEE8: .4byte 0x0203cf20 + .pool _0819DEEC: bl sub_819DBD8 bl sub_819E0C0 - ldr r0, _0819DF0C + ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x15] cmp r0, 0x1 @@ -846260,27 +817605,26 @@ _0819DF02: bl sub_819F048 b _0819E006 .align 2, 0 -_0819DF0C: .4byte 0x03001284 + .pool _0819DF10: - ldr r0, _0819DF28 + ldr r0, =0x085eec73 bl sub_819EBEC movs r0, 0x2 bl Window_WriteStandardTileMap - ldr r1, _0819DF2C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0819E00E .align 2, 0 -_0819DF28: .4byte 0x085eec73 -_0819DF2C: .4byte 0x030022c0 + .pool _0819DF30: bl sub_819EFA8 movs r0, 0x8 bl Window_WriteStandardTileMap b _0819E006 _0819DF3C: - ldr r0, _0819DF5C + ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x15] cmp r0, 0 @@ -846289,14 +817633,13 @@ _0819DF3C: _0819DF4A: movs r0, 0x1 bl Window_WriteStandardTileMap - ldr r1, _0819DF60 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0819E00E .align 2, 0 -_0819DF5C: .4byte 0x03001284 -_0819DF60: .4byte 0x030022c0 + .pool _0819DF64: bl sub_819EB18 movs r0, 0 @@ -846308,7 +817651,7 @@ _0819DF70: adds r1, r2, r0 b _0819E00E _0819DF78: - ldr r0, _0819DF88 + ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x15] cmp r0, 0 @@ -846316,18 +817659,18 @@ _0819DF78: bl sub_819EE08 b _0819E006 .align 2, 0 -_0819DF88: .4byte 0x03001284 + .pool _0819DF8C: bl sub_819ED78 movs r0, 0x3 bl Window_WriteStandardTileMap - ldr r1, _0819DFA0 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _0819E00E .align 2, 0 -_0819DFA0: .4byte 0x030022c0 + .pool _0819DFA4: movs r0, 0x1 negs r0, r0 @@ -846346,29 +817689,27 @@ _0819DFA4: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - ldr r0, _0819DFF4 + ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x15] cmp r0, 0x1 bne _0819E000 movs r0, 0x3 bl gpu_sync_bg_show - ldr r1, _0819DFF8 + ldr r1, =0x00001248 movs r0, 0x50 bl lcd_io_set - ldr r1, _0819DFFC + ldr r1, =0x0000040b movs r0, 0x52 bl lcd_io_set b _0819E006 .align 2, 0 -_0819DFF4: .4byte 0x03001284 -_0819DFF8: .4byte 0x00001248 -_0819DFFC: .4byte 0x0000040b + .pool _0819E000: movs r0, 0x3 bl gpu_sync_bg_hide _0819E006: - ldr r1, _0819E018 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -846378,12 +817719,12 @@ _0819E00E: strb r0, [r1] b _0819E0AA .align 2, 0 -_0819E018: .4byte 0x030022c0 + .pool _0819E01C: - ldr r0, _0819E05C + ldr r0, =sub_819CF54 + 1 movs r1, 0 bl AddTask - ldr r6, _0819E060 + ldr r6, =0x03001284 ldr r1, [r6] adds r1, 0x21 strb r0, [r1] @@ -846391,7 +817732,7 @@ _0819E01C: ldrb r5, [r0, 0x15] cmp r5, 0 bne _0819E06C - ldr r4, _0819E064 + ldr r4, =0x03005e00 adds r0, 0x21 ldrb r1, [r0] lsls r0, r1, 2 @@ -846399,7 +817740,7 @@ _0819E01C: lsls r0, 3 adds r0, r4 strh r5, [r0, 0x8] - ldr r0, _0819E068 + ldr r0, =sub_819CE40 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -846411,13 +817752,10 @@ _0819E01C: strh r5, [r0, 0x8] b _0819E0A4 .align 2, 0 -_0819E05C: .4byte sub_819CF54 + 1 -_0819E060: .4byte 0x03001284 -_0819E064: .4byte 0x03005e00 -_0819E068: .4byte sub_819CE40 + 1 + .pool _0819E06C: bl sub_819EAF8 - ldr r4, _0819E0B4 + ldr r4, =0x03005e00 ldr r2, [r6] adds r0, r2, 0 adds r0, 0x21 @@ -846431,7 +817769,7 @@ _0819E06C: strh r1, [r0, 0x8] adds r2, 0x22 strb r3, [r2] - ldr r0, _0819E0B8 + ldr r0, =sub_819CD34 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -846443,7 +817781,7 @@ _0819E06C: movs r1, 0x2 strh r1, [r0, 0x8] _0819E0A4: - ldr r0, _0819E0BC + ldr r0, =sub_819C7E0 + 1 bl set_callback2 _0819E0AA: add sp, 0xC @@ -846451,9 +817789,7 @@ _0819E0AA: pop {r0} bx r0 .align 2, 0 -_0819E0B4: .4byte 0x03005e00 -_0819E0B8: .4byte sub_819CD34 + 1 -_0819E0BC: .4byte sub_819C7E0 + 1 + .pool thumb_func_end sub_819DC1C thumb_func_start sub_819E0C0 @@ -846465,7 +817801,7 @@ sub_819E0C0: @ 819E0C0 push {r5-r7} sub sp, 0x1C mov r1, sp - ldr r0, _0819E4B0 + ldr r0, =0x08610834 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2,r5,r6} @@ -846474,9 +817810,9 @@ sub_819E0C0: @ 819E0C0 movs r0, 0x65 strh r0, [r1, 0x2] movs r6, 0 - ldr r4, _0819E4B4 + ldr r4, =0x03001284 movs r7, 0 - ldr r5, _0819E4B8 + ldr r5, =0x02020630 _0819E0E6: lsls r1, r6, 1 adds r1, r6 @@ -846507,7 +817843,7 @@ _0819E0E6: lsrs r6, r0, 24 cmp r6, 0x2 bls _0819E0E6 - ldr r7, _0819E4B4 + ldr r7, =0x03001284 ldr r1, [r7] adds r0, r1, 0x5 ldrb r1, [r1, 0x3] @@ -846516,25 +817852,25 @@ _0819E0E6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0819E4B8 + ldr r4, =0x02020630 adds r0, r4 movs r5, 0x20 ldrsh r1, [r0, r5] - ldr r0, _0819E4BC + ldr r0, =0x0861084c movs r2, 0x58 movs r3, 0 bl obj_add_from_template_forward_search ldr r1, [r7] movs r4, 0 strb r0, [r1, 0x4] - ldr r0, _0819E4C0 + ldr r0, =0x08610864 movs r1, 0xB0 movs r2, 0x70 movs r3, 0 bl obj_add_from_template_forward_search ldr r1, [r7] strb r0, [r1, 0x1] - ldr r0, _0819E4C4 + ldr r0, =0x0861087c movs r1, 0xB0 movs r2, 0x90 movs r3, 0 @@ -846546,7 +817882,7 @@ _0819E0E6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, _0819E4B8 + ldr r6, =0x02020630 adds r0, r6 adds r0, 0x3E ldrb r1, [r0] @@ -846605,7 +817941,7 @@ _0819E0E6: str r2, [sp, 0x18] _0819E1E8: mov r1, sp - ldr r0, _0819E4BC + ldr r0, =0x0861084c ldm r0!, {r3-r5} stm r1!, {r3-r5} ldm r0!, {r2,r3,r6} @@ -846622,7 +817958,7 @@ _0819E1E8: ldr r1, [r7] strb r0, [r1, 0x8] mov r1, sp - ldr r0, _0819E4C0 + ldr r0, =0x08610864 ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} ldm r0!, {r4-r6} @@ -846650,7 +817986,7 @@ _0819E1E8: ldr r1, [r7] strb r0, [r1, 0xA] mov r1, sp - ldr r0, _0819E4BC + ldr r0, =0x0861084c ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} ldm r0!, {r2,r3,r6} @@ -846667,7 +818003,7 @@ _0819E1E8: ldr r1, [r7] strb r0, [r1, 0xB] mov r1, sp - ldr r0, _0819E4C0 + ldr r0, =0x08610864 ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} ldm r0!, {r2,r3,r6} @@ -846692,7 +818028,7 @@ _0819E1E8: ldr r1, [r7] strb r0, [r1, 0xD] mov r1, sp - ldr r0, _0819E4BC + ldr r0, =0x0861084c ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2,r3,r5} @@ -846707,7 +818043,7 @@ _0819E1E8: ldr r1, [r7] strb r0, [r1, 0xE] mov r1, sp - ldr r0, _0819E4C0 + ldr r0, =0x08610864 ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r4,r5} @@ -846724,7 +818060,7 @@ _0819E1E8: ldr r1, [r7] strb r0, [r1, 0xF] mov r1, sp - ldr r0, _0819E4BC + ldr r0, =0x0861084c ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} @@ -846739,7 +818075,7 @@ _0819E1E8: ldr r1, [r7] strb r0, [r1, 0x10] mov r1, sp - ldr r0, _0819E4C0 + ldr r0, =0x08610864 ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} @@ -846753,7 +818089,7 @@ _0819E1E8: ldr r1, [r7] strb r0, [r1, 0x11] movs r6, 0 - ldr r5, _0819E4B8 + ldr r5, =0x02020630 adds r4, r7, 0 movs r7, 0 movs r0, 0x4 @@ -846931,9 +818267,9 @@ _0819E330: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 - ldr r3, _0819E4B4 + ldr r3, =0x03001284 mov r8, r3 - ldr r0, _0819E4B8 + ldr r0, =0x02020630 mov r9, r0 cmp r6, 0x1 bhi _0819E496 @@ -846952,12 +818288,7 @@ _0819E496: adds r0, r3, 0 b _0819E4C8 .align 2, 0 -_0819E4B0: .4byte 0x08610834 -_0819E4B4: .4byte 0x03001284 -_0819E4B8: .4byte 0x02020630 -_0819E4BC: .4byte 0x0861084c -_0819E4C0: .4byte 0x08610864 -_0819E4C4: .4byte 0x0861087c + .pool _0819E4C8: ands r0, r2 strb r0, [r1] @@ -847022,7 +818353,7 @@ sub_819E538: @ 819E538 push {r4-r7,lr} movs r5, 0 _0819E53C: - ldr r6, _0819E600 + ldr r6, =0x03001284 ldr r0, [r6] adds r0, 0x5 adds r0, r5 @@ -847030,7 +818361,7 @@ _0819E53C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0819E604 + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles adds r0, r5, 0x1 @@ -847064,7 +818395,7 @@ _0819E590: movs r4, 0 lsls r6, r5, 1 _0819E594: - ldr r0, _0819E600 + ldr r0, =0x03001284 ldr r0, [r0] adds r1, r6, r5 adds r1, r4, r1 @@ -847074,7 +818405,7 @@ _0819E594: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0819E604 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -847093,7 +818424,7 @@ _0819E5C6: adds r7, r5, 0x1 lsls r6, r5, 1 _0819E5CC: - ldr r0, _0819E600 + ldr r0, =0x03001284 ldr r0, [r0] adds r1, r4, r6 adds r0, 0xE @@ -847102,7 +818433,7 @@ _0819E5CC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0819E604 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -847118,8 +818449,7 @@ _0819E5CC: pop {r0} bx r0 .align 2, 0 -_0819E600: .4byte 0x03001284 -_0819E604: .4byte 0x02020630 + .pool thumb_func_end sub_819E538 thumb_func_start sub_819E608 @@ -847129,8 +818459,8 @@ sub_819E608: @ 819E608 lsrs r6, r0, 24 cmp r6, 0x2 bhi _0819E65C - ldr r4, _0819E654 - ldr r5, _0819E658 + ldr r4, =0x02020630 + ldr r5, =0x03001284 ldr r0, [r5] ldrb r1, [r0, 0x4] lsls r0, r1, 4 @@ -847161,11 +818491,10 @@ sub_819E608: @ 819E608 strh r0, [r1, 0x20] b _0819E684 .align 2, 0 -_0819E654: .4byte 0x02020630 -_0819E658: .4byte 0x03001284 + .pool _0819E65C: - ldr r2, _0819E68C - ldr r3, _0819E690 + ldr r2, =0x02020630 + ldr r3, =0x03001284 ldr r0, [r3] ldrb r1, [r0, 0x4] lsls r0, r1, 4 @@ -847188,8 +818517,7 @@ _0819E684: pop {r0} bx r0 .align 2, 0 -_0819E68C: .4byte 0x02020630 -_0819E690: .4byte 0x03001284 + .pool thumb_func_end sub_819E608 thumb_func_start sub_819E694 @@ -847203,7 +818531,7 @@ sub_819E694: @ 819E694 lsls r4, 24 cmp r4, 0 ble _0819E6C0 - ldr r1, _0819E6BC + ldr r1, =0x03001284 ldr r2, [r1] ldrb r0, [r2, 0x3] adds r0, 0x1 @@ -847213,9 +818541,9 @@ sub_819E694: @ 819E694 movs r0, 0 b _0819E6D8 .align 2, 0 -_0819E6BC: .4byte 0x03001284 + .pool _0819E6C0: - ldr r0, _0819E6D0 + ldr r0, =0x03001284 ldr r2, [r0] ldrb r3, [r2, 0x3] adds r1, r0, 0 @@ -847224,7 +818552,7 @@ _0819E6C0: subs r0, r3, 0x1 b _0819E6D8 .align 2, 0 -_0819E6D0: .4byte 0x03001284 + .pool _0819E6D4: ldrb r0, [r2, 0x17] subs r0, 0x1 @@ -847249,7 +818577,7 @@ sub_819E6E8: @ 819E6E8 lsls r4, 24 cmp r4, 0 ble _0819E728 - ldr r0, _0819E710 + ldr r0, =0x03001284 ldr r2, [r0] ldrb r1, [r2, 0x3] adds r4, r0, 0 @@ -847259,7 +818587,7 @@ sub_819E6E8: @ 819E6E8 strb r0, [r2, 0x3] b _0819E74A .align 2, 0 -_0819E710: .4byte 0x03001284 + .pool _0819E714: ldrb r0, [r2, 0x3] adds r0, 0x1 @@ -847273,7 +818601,7 @@ _0819E722: strb r0, [r2, 0x3] b _0819E74A _0819E728: - ldr r0, _0819E740 + ldr r0, =0x03001284 ldr r1, [r0] ldrb r3, [r1, 0x3] adds r2, r3, 0 @@ -847285,7 +818613,7 @@ _0819E728: subs r0, r3, 0x1 b _0819E748 .align 2, 0 -_0819E740: .4byte 0x03001284 + .pool _0819E744: ldrb r0, [r1, 0x17] subs r0, 0x1 @@ -847306,7 +818634,7 @@ sub_819E758: @ 819E758 lsls r0, 24 cmp r0, 0 ble _0819E778 - ldr r0, _0819E770 + ldr r0, =0x03001284 ldr r1, [r0] ldrb r3, [r1, 0x16] adds r2, r0, 0 @@ -847315,12 +818643,12 @@ sub_819E758: @ 819E758 adds r0, r3, 0x1 b _0819E78E .align 2, 0 -_0819E770: .4byte 0x03001284 + .pool _0819E774: movs r0, 0 b _0819E78E _0819E778: - ldr r0, _0819E788 + ldr r0, =0x03001284 ldr r1, [r0] ldrb r3, [r1, 0x16] adds r2, r0, 0 @@ -847329,12 +818657,12 @@ _0819E778: subs r0, r3, 0x1 b _0819E78E .align 2, 0 -_0819E788: .4byte 0x03001284 + .pool _0819E78C: movs r0, 0x1 _0819E78E: strb r0, [r1, 0x16] - ldr r3, _0819E7BC + ldr r3, =0x02020630 ldr r2, [r2] ldrb r0, [r2, 0x1] lsls r1, r0, 4 @@ -847357,7 +818685,7 @@ _0819E78E: pop {r0} bx r0 .align 2, 0 -_0819E7BC: .4byte 0x02020630 + .pool thumb_func_end sub_819E758 thumb_func_start sub_819E7C0 @@ -847371,7 +818699,7 @@ sub_819E7C0: @ 819E7C0 lsls r4, 24 cmp r4, 0 ble _0819E7EC - ldr r0, _0819E7E4 + ldr r0, =0x03001284 ldr r1, [r0] ldrb r3, [r1] adds r2, r0, 0 @@ -847380,12 +818708,12 @@ sub_819E7C0: @ 819E7C0 adds r0, r3, 0x1 b _0819E802 .align 2, 0 -_0819E7E4: .4byte 0x03001284 + .pool _0819E7E8: movs r0, 0 b _0819E802 _0819E7EC: - ldr r0, _0819E7FC + ldr r0, =0x03001284 ldr r1, [r0] ldrb r3, [r1] adds r2, r0, 0 @@ -847394,12 +818722,12 @@ _0819E7EC: subs r0, r3, 0x1 b _0819E802 .align 2, 0 -_0819E7FC: .4byte 0x03001284 + .pool _0819E800: movs r0, 0x2 _0819E802: strb r0, [r1] - ldr r3, _0819E834 + ldr r3, =0x02020630 ldr r2, [r2] ldrb r0, [r2, 0x1] lsls r1, r0, 4 @@ -847423,7 +818751,7 @@ _0819E802: pop {r0} bx r0 .align 2, 0 -_0819E834: .4byte 0x02020630 + .pool thumb_func_end sub_819E7C0 thumb_func_start sub_819E838 @@ -847440,14 +818768,14 @@ sub_819E838: @ 819E838 mov r9, r0 movs r2, 0x4 mov r8, r2 - ldr r0, _0819E890 + ldr r0, =0x02020630 mov r12, r0 - ldr r7, _0819E894 + ldr r7, =0x03001284 _0819E856: cmp r6, 0x2 bne _0819E898 - ldr r5, _0819E890 - ldr r3, _0819E894 + ldr r5, =0x02020630 + ldr r3, =0x03001284 ldr r0, [r3] adds r0, 0xB adds r0, r4 @@ -847473,8 +818801,7 @@ _0819E856: adds r0, r5 b _0819E8CA .align 2, 0 -_0819E890: .4byte 0x02020630 -_0819E894: .4byte 0x03001284 + .pool _0819E898: cmp r6, 0x3 bne _0819E8D4 @@ -847526,8 +818853,8 @@ _0819E8D4: sub_819E8EC: @ 819E8EC push {r4-r6,lr} movs r2, 0 - ldr r5, _0819E93C - ldr r4, _0819E940 + ldr r5, =0x02020630 + ldr r4, =0x03001284 adds r6, r5, 0 movs r3, 0x4 _0819E8F8: @@ -847567,14 +818894,13 @@ _0819E92C: pop {r0} bx r0 .align 2, 0 -_0819E93C: .4byte 0x02020630 -_0819E940: .4byte 0x03001284 + .pool thumb_func_end sub_819E8EC thumb_func_start sub_819E944 sub_819E944: @ 819E944 push {r4,r5,lr} - ldr r0, _0819E958 + ldr r0, =0x03001284 ldr r3, [r0] ldrb r1, [r3, 0x15] adds r5, r0, 0 @@ -847584,12 +818910,12 @@ sub_819E944: @ 819E944 strb r0, [r3, 0x15] b _0819E960 .align 2, 0 -_0819E958: .4byte 0x03001284 + .pool _0819E95C: movs r0, 0 strb r0, [r3] _0819E960: - ldr r4, _0819E9DC + ldr r4, =0x02020630 ldr r2, [r5] ldrb r1, [r2, 0x1] lsls r0, r1, 4 @@ -847650,17 +818976,17 @@ _0819E960: pop {r0} bx r0 .align 2, 0 -_0819E9DC: .4byte 0x02020630 + .pool thumb_func_end sub_819E944 thumb_func_start sub_819E9E0 sub_819E9E0: @ 819E9E0 push {r4,r5,lr} - ldr r5, _0819EA5C + ldr r5, =0x03001284 ldr r1, [r5] movs r0, 0 strb r0, [r1, 0x16] - ldr r4, _0819EA60 + ldr r4, =0x02020630 ldr r2, [r5] ldrb r1, [r2, 0x1] lsls r0, r1, 4 @@ -847716,8 +819042,7 @@ sub_819E9E0: @ 819E9E0 pop {r0} bx r0 .align 2, 0 -_0819EA5C: .4byte 0x03001284 -_0819EA60: .4byte 0x02020630 + .pool thumb_func_end sub_819E9E0 thumb_func_start sub_819EA64 @@ -847726,8 +819051,8 @@ sub_819EA64: @ 819EA64 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _0819EAB8 - ldr r3, _0819EABC + ldr r5, =0x02020630 + ldr r3, =0x03001284 ldr r0, [r3] ldrb r1, [r0, 0x1] lsls r0, r1, 4 @@ -847761,8 +819086,7 @@ sub_819EA64: @ 819EA64 pop {r0} bx r0 .align 2, 0 -_0819EAB8: .4byte 0x02020630 -_0819EABC: .4byte 0x03001284 + .pool thumb_func_end sub_819EA64 thumb_func_start sub_819EAC0 @@ -847818,7 +819142,7 @@ sub_819EB18: @ 819EB18 movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _0819EB48 + ldr r2, =0x085eec66 movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -847834,7 +819158,7 @@ sub_819EB18: @ 819EB18 pop {r0} bx r0 .align 2, 0 -_0819EB48: .4byte 0x085eec66 + .pool thumb_func_end sub_819EB18 thumb_func_start sub_819EB4C @@ -847844,7 +819168,7 @@ sub_819EB4C: @ 819EB4C movs r0, 0x1 movs r1, 0 bl Window_FastFillPixels - ldr r0, _0819EB6C + ldr r0, =0x03001284 ldr r1, [r0] ldrb r0, [r1, 0x3] cmp r0, 0x2 @@ -847854,7 +819178,7 @@ sub_819EB4C: @ 819EB4C bl Window_CopyToVram b _0819EBD4 .align 2, 0 -_0819EB6C: .4byte 0x03001284 + .pool _0819EB70: ldrb r2, [r1, 0x3] ldrb r0, [r1, 0x14] @@ -847862,14 +819186,14 @@ _0819EB70: bne _0819EB84 movs r0, 0x64 muls r0, r2 - ldr r1, _0819EB80 + ldr r1, =0x020244ec b _0819EB8A .align 2, 0 -_0819EB80: .4byte 0x020244ec + .pool _0819EB84: movs r0, 0x64 muls r0, r2 - ldr r1, _0819EBDC + ldr r1, =0x02024744 _0819EB8A: adds r0, r1 movs r1, 0xB @@ -847877,10 +819201,10 @@ _0819EB8A: bl pokemon_getattr lsls r0, 16 lsrs r1, r0, 16 - ldr r4, _0819EBE0 + ldr r4, =0x02021fc4 movs r0, 0xB muls r1, r0 - ldr r0, _0819EBE4 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -847891,7 +819215,7 @@ _0819EB8A: adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _0819EBE8 + ldr r0, =0x08610925 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -847909,10 +819233,7 @@ _0819EBD4: pop {r0} bx r0 .align 2, 0 -_0819EBDC: .4byte 0x02024744 -_0819EBE0: .4byte 0x02021fc4 -_0819EBE4: .4byte 0x083185c8 -_0819EBE8: .4byte 0x08610925 + .pool thumb_func_end sub_819EB4C thumb_func_start sub_819EBEC @@ -847951,11 +819272,11 @@ sub_819EC20: @ 819EC20 movs r0, 0x3 movs r1, 0 bl Window_FastFillPixels - ldr r5, _0819EC84 + ldr r5, =0x08610922 str r5, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, _0819EC88 + ldr r0, =0x085eecaa str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -847964,7 +819285,7 @@ sub_819EC20: @ 819EC20 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _0819EC8C + ldr r0, =0x085eeca5 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -847973,7 +819294,7 @@ sub_819EC20: @ 819EC20 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _0819EC90 + ldr r0, =0x085eecb2 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0x1 @@ -847988,10 +819309,7 @@ sub_819EC20: @ 819EC20 pop {r0} bx r0 .align 2, 0 -_0819EC84: .4byte 0x08610922 -_0819EC88: .4byte 0x085eecaa -_0819EC8C: .4byte 0x085eeca5 -_0819EC90: .4byte 0x085eecb2 + .pool thumb_func_end sub_819EC20 thumb_func_start sub_819EC94 @@ -848003,11 +819321,11 @@ sub_819EC94: @ 819EC94 movs r0, 0x4 movs r1, 0 bl Window_FastFillPixels - ldr r5, _0819ECE4 + ldr r5, =0x08610922 str r5, [sp] movs r4, 0 str r4, [sp, 0x4] - ldr r0, _0819ECE8 + ldr r0, =0x085eecca str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -848016,7 +819334,7 @@ sub_819EC94: @ 819EC94 bl box_print str r5, [sp] str r4, [sp, 0x4] - ldr r0, _0819ECEC + ldr r0, =0x085eecce str r0, [sp, 0x8] movs r0, 0x4 movs r1, 0x1 @@ -848031,9 +819349,7 @@ sub_819EC94: @ 819EC94 pop {r0} bx r0 .align 2, 0 -_0819ECE4: .4byte 0x08610922 -_0819ECE8: .4byte 0x085eecca -_0819ECEC: .4byte 0x085eecce + .pool thumb_func_end sub_819EC94 thumb_func_start sub_819ECF0 @@ -848054,7 +819370,7 @@ sub_819ECF0: @ 819ECF0 lsrs r2, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _0819ED30 + ldr r0, =0x08610922 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -848068,7 +819384,7 @@ sub_819ECF0: @ 819ECF0 pop {r0} bx r0 .align 2, 0 -_0819ED30: .4byte 0x08610922 + .pool thumb_func_end sub_819ECF0 thumb_func_start sub_819ED34 @@ -848077,19 +819393,19 @@ sub_819ED34: @ 819ED34 movs r0, 0x5 movs r1, 0 bl Window_FastFillPixels - ldr r0, _0819ED6C + ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0 beq _0819ED56 cmp r0, 0x1 bne _0819ED60 - ldr r0, _0819ED70 + ldr r0, =0x085eecd1 movs r1, 0 movs r2, 0x5 bl sub_819ECF0 _0819ED56: - ldr r0, _0819ED74 + ldr r0, =0x085eecdd movs r1, 0x18 movs r2, 0x5 bl sub_819ECF0 @@ -848100,9 +819416,7 @@ _0819ED60: pop {r0} bx r0 .align 2, 0 -_0819ED6C: .4byte 0x03001284 -_0819ED70: .4byte 0x085eecd1 -_0819ED74: .4byte 0x085eecdd + .pool thumb_func_end sub_819ED34 thumb_func_start sub_819ED78 @@ -848111,19 +819425,19 @@ sub_819ED78: @ 819ED78 movs r0, 0x3 movs r1, 0 bl Window_FastFillPixels - ldr r0, _0819EDB0 + ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0 beq _0819ED9A cmp r0, 0x1 bne _0819EDA4 - ldr r0, _0819EDB4 + ldr r0, =0x085eecd1 movs r1, 0x8 movs r2, 0x3 bl sub_819ECF0 _0819ED9A: - ldr r0, _0819EDB8 + ldr r0, =0x085eecdd movs r1, 0x20 movs r2, 0x3 bl sub_819ECF0 @@ -848134,9 +819448,7 @@ _0819EDA4: pop {r0} bx r0 .align 2, 0 -_0819EDB0: .4byte 0x03001284 -_0819EDB4: .4byte 0x085eecd1 -_0819EDB8: .4byte 0x085eecdd + .pool thumb_func_end sub_819ED78 thumb_func_start sub_819EDBC @@ -848150,21 +819462,20 @@ sub_819EDBC: @ 819EDBC beq _0819EDEC b _0819EDF6 _0819EDCC: - ldr r0, _0819EDE4 + ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0x1 bne _0819EDF6 - ldr r0, _0819EDE8 + ldr r0, =0x085eecd1 movs r1, 0x8 movs r2, 0x3 bl sub_819ECF0 b _0819EDF6 .align 2, 0 -_0819EDE4: .4byte 0x03001284 -_0819EDE8: .4byte 0x085eecd1 + .pool _0819EDEC: - ldr r0, _0819EE04 + ldr r0, =0x085eecdd movs r1, 0x20 movs r2, 0x3 bl sub_819ECF0 @@ -848175,24 +819486,24 @@ _0819EDF6: pop {r0} bx r0 .align 2, 0 -_0819EE04: .4byte 0x085eecdd + .pool thumb_func_end sub_819EDBC thumb_func_start sub_819EE08 sub_819EE08: @ 819EE08 push {r4,lr} sub sp, 0x18 - ldr r0, _0819EE30 + ldr r0, =0x08610918 add r1, sp, 0xC movs r2, 0x4 bl CpuSet - ldr r0, _0819EE34 + ldr r0, =0x03001284 ldr r2, [r0] ldrb r0, [r2, 0x15] cmp r0, 0 bne _0819EE3C add r0, sp, 0xC - ldr r1, _0819EE38 + ldr r1, =0x02037b14 movs r2, 0xE4 lsls r2, 1 adds r1, r2 @@ -848200,9 +819511,7 @@ sub_819EE08: @ 819EE08 strh r1, [r0, 0x8] b _0819EE42 .align 2, 0 -_0819EE30: .4byte 0x08610918 -_0819EE34: .4byte 0x03001284 -_0819EE38: .4byte 0x02037b14 + .pool _0819EE3C: add r1, sp, 0xC ldrh r0, [r2, 0x24] @@ -848217,7 +819526,7 @@ _0819EE42: movs r0, 0x7 movs r1, 0 bl Window_FastFillPixels - ldr r0, _0819EE70 + ldr r0, =0x03001284 ldr r1, [r0] ldrb r0, [r1, 0x3] cmp r0, 0x2 @@ -848227,7 +819536,7 @@ _0819EE42: bl Window_CopyToVram b _0819EED8 .align 2, 0 -_0819EE70: .4byte 0x03001284 + .pool _0819EE74: ldrb r2, [r1, 0x3] ldrb r0, [r1, 0x14] @@ -848235,14 +819544,14 @@ _0819EE74: bne _0819EE88 movs r0, 0x64 muls r0, r2 - ldr r1, _0819EE84 + ldr r1, =0x020244ec b _0819EE8E .align 2, 0 -_0819EE84: .4byte 0x020244ec + .pool _0819EE88: movs r0, 0x64 muls r0, r2 - ldr r1, _0819EEE0 + ldr r1, =0x02024744 _0819EE8E: adds r0, r1 movs r1, 0xB @@ -848250,10 +819559,10 @@ _0819EE8E: bl pokemon_getattr lsls r0, 16 lsrs r1, r0, 16 - ldr r4, _0819EEE4 + ldr r4, =0x02021fc4 movs r0, 0xB muls r1, r0 - ldr r0, _0819EEE8 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -848264,7 +819573,7 @@ _0819EE8E: adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _0819EEEC + ldr r0, =0x08610925 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -848282,25 +819591,22 @@ _0819EED8: pop {r0} bx r0 .align 2, 0 -_0819EEE0: .4byte 0x02024744 -_0819EEE4: .4byte 0x02021fc4 -_0819EEE8: .4byte 0x083185c8 -_0819EEEC: .4byte 0x08610925 + .pool thumb_func_end sub_819EE08 thumb_func_start sub_819EEF0 sub_819EEF0: @ 819EEF0 push {r4,lr} sub sp, 0xC - ldr r0, _0819EF1C + ldr r0, =0x08610918 movs r1, 0xE0 movs r2, 0xA bl gpu_pal_apply - ldr r0, _0819EF20 - ldr r1, _0819EF24 + ldr r0, =0x020378f4 + ldr r1, =0x02037cd4 movs r2, 0x5 bl CpuSet - ldr r0, _0819EF28 + ldr r0, =0x03001284 ldr r1, [r0] ldrb r0, [r1, 0x3] cmp r0, 0x2 @@ -848310,10 +819616,7 @@ sub_819EEF0: @ 819EEF0 bl Window_CopyToVram b _0819EF90 .align 2, 0 -_0819EF1C: .4byte 0x08610918 -_0819EF20: .4byte 0x020378f4 -_0819EF24: .4byte 0x02037cd4 -_0819EF28: .4byte 0x03001284 + .pool _0819EF2C: ldrb r2, [r1, 0x3] ldrb r0, [r1, 0x14] @@ -848321,14 +819624,14 @@ _0819EF2C: bne _0819EF40 movs r0, 0x64 muls r0, r2 - ldr r1, _0819EF3C + ldr r1, =0x020244ec b _0819EF46 .align 2, 0 -_0819EF3C: .4byte 0x020244ec + .pool _0819EF40: movs r0, 0x64 muls r0, r2 - ldr r1, _0819EF98 + ldr r1, =0x02024744 _0819EF46: adds r0, r1 movs r1, 0xB @@ -848336,10 +819639,10 @@ _0819EF46: bl pokemon_getattr lsls r0, 16 lsrs r1, r0, 16 - ldr r4, _0819EF9C + ldr r4, =0x02021fc4 movs r0, 0xB muls r1, r0 - ldr r0, _0819EFA0 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -848350,7 +819653,7 @@ _0819EF46: adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _0819EFA4 + ldr r0, =0x08610925 str r0, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -848368,17 +819671,14 @@ _0819EF90: pop {r0} bx r0 .align 2, 0 -_0819EF98: .4byte 0x02024744 -_0819EF9C: .4byte 0x02021fc4 -_0819EFA0: .4byte 0x083185c8 -_0819EFA4: .4byte 0x08610925 + .pool thumb_func_end sub_819EEF0 thumb_func_start sub_819EFA8 sub_819EFA8: @ 819EFA8 push {r4-r6,lr} sub sp, 0x2C - ldr r6, _0819EFCC + ldr r6, =0x03001284 ldr r0, [r6] ldrb r4, [r0, 0x3] adds r5, r4, 0 @@ -848392,7 +819692,7 @@ sub_819EFA8: @ 819EFA8 bl Window_CopyToVram b _0819F03A .align 2, 0 -_0819EFCC: .4byte 0x03001284 + .pool _0819EFD0: movs r0, 0x8 bl Window_WriteStandardTileMap @@ -848402,14 +819702,14 @@ _0819EFD0: bne _0819EFEC movs r0, 0x64 muls r0, r4 - ldr r1, _0819EFE8 + ldr r1, =0x020244ec b _0819EFF2 .align 2, 0 -_0819EFE8: .4byte 0x020244ec + .pool _0819EFEC: movs r0, 0x64 muls r0, r5 - ldr r1, _0819F044 + ldr r1, =0x02024744 _0819EFF2: adds r0, r1 movs r1, 0xB @@ -848447,7 +819747,7 @@ _0819F03A: pop {r0} bx r0 .align 2, 0 -_0819F044: .4byte 0x02024744 + .pool thumb_func_end sub_819EFA8 thumb_func_start sub_819F048 @@ -848455,7 +819755,7 @@ sub_819F048: @ 819F048 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r4, _0819F064 + ldr r4, =0x03001284 ldr r3, [r4] ldrb r0, [r3, 0x15] cmp r0, 0x1 @@ -848466,7 +819766,7 @@ sub_819F048: @ 819F048 beq _0819F080 b _0819F094 .align 2, 0 -_0819F064: .4byte 0x03001284 + .pool _0819F068: strb r2, [r3, 0x14] ldr r0, [r4] @@ -848475,10 +819775,10 @@ _0819F068: movs r0, 0x4 strb r0, [r1, 0x17] ldr r1, [r4] - ldr r0, _0819F07C + ldr r0, =0x08610928 b _0819F092 .align 2, 0 -_0819F07C: .4byte 0x08610928 + .pool _0819F080: movs r1, 0 strb r2, [r3, 0x14] @@ -848488,7 +819788,7 @@ _0819F080: movs r0, 0x5 strb r0, [r1, 0x17] ldr r1, [r4] - ldr r0, _0819F09C + ldr r0, =0x08610948 _0819F092: str r0, [r1, 0x18] _0819F094: @@ -848496,7 +819796,7 @@ _0819F094: pop {r0} bx r0 .align 2, 0 -_0819F09C: .4byte 0x08610948 + .pool thumb_func_end sub_819F048 thumb_func_start sub_819F0A0 @@ -848504,9 +819804,9 @@ sub_819F0A0: @ 819F0A0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _0819F0C0 - ldr r2, _0819F0C4 - ldr r1, _0819F0C8 + ldr r3, =0x03001280 + ldr r2, =0x086108ac + ldr r1, =0x03001284 ldr r1, [r1] ldrb r1, [r1] lsls r1, 2 @@ -848517,9 +819817,7 @@ sub_819F0A0: @ 819F0A0 pop {r0} bx r0 .align 2, 0 -_0819F0C0: .4byte 0x03001280 -_0819F0C4: .4byte 0x086108ac -_0819F0C8: .4byte 0x03001284 + .pool thumb_func_end sub_819F0A0 thumb_func_start sub_819F0CC @@ -848528,7 +819826,7 @@ sub_819F0CC: @ 819F0CC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _0819F108 + ldr r5, =0x03001284 ldr r1, [r5] ldr r0, [r1, 0x2C] adds r1, 0x30 @@ -848540,40 +819838,37 @@ sub_819F0CC: @ 819F0CC strb r1, [r0, 0x12] movs r0, 0x3 bl sub_819EA64 - ldr r1, _0819F10C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 strh r5, [r0, 0x8] - ldr r1, _0819F110 + ldr r1, =sub_819D9EC + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0819F108: .4byte 0x03001284 -_0819F10C: .4byte 0x03005e00 -_0819F110: .4byte sub_819D9EC + 1 + .pool thumb_func_end sub_819F0CC thumb_func_start sub_819F114 sub_819F114: @ 819F114 lsls r0, 24 lsrs r0, 24 - ldr r2, _0819F12C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 movs r0, 0x6 strh r0, [r1, 0x8] - ldr r0, _0819F130 + ldr r0, =sub_819C90C + 1 str r0, [r1] bx lr .align 2, 0 -_0819F12C: .4byte 0x03005e00 -_0819F130: .4byte sub_819C90C + 1 + .pool thumb_func_end sub_819F114 thumb_func_start sub_819F134 @@ -848582,7 +819877,7 @@ sub_819F134: @ 819F134 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _0819F174 + ldr r0, =0x03001284 ldr r1, [r0] ldr r0, [r1, 0x2C] adds r1, 0x30 @@ -848590,29 +819885,26 @@ sub_819F134: @ 819F134 bl sub_819F3F8 movs r0, 0x3 bl sub_819EA64 - ldr r1, _0819F178 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0 strh r1, [r0, 0x8] - ldr r2, _0819F17C + ldr r2, =sub_819CE40 + 1 lsrs r1, r2, 16 strh r1, [r0, 0x14] strh r2, [r0, 0x16] movs r1, 0x1 strh r1, [r0, 0x12] - ldr r1, _0819F180 + ldr r1, =sub_819D770 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_0819F174: .4byte 0x03001284 -_0819F178: .4byte 0x03005e00 -_0819F17C: .4byte sub_819CE40 + 1 -_0819F180: .4byte sub_819D770 + 1 + .pool thumb_func_end sub_819F134 thumb_func_start sub_819F184 @@ -848620,8 +819912,8 @@ sub_819F184: @ 819F184 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _0819F1A4 - ldr r1, _0819F1A8 + ldr r3, =0x03001280 + ldr r1, =0x03001284 ldr r2, [r1] ldrb r1, [r2, 0x3] ldr r2, [r2, 0x18] @@ -848633,58 +819925,53 @@ sub_819F184: @ 819F184 pop {r0} bx r0 .align 2, 0 -_0819F1A4: .4byte 0x03001280 -_0819F1A8: .4byte 0x03001284 + .pool thumb_func_end sub_819F184 thumb_func_start sub_819F1AC sub_819F1AC: @ 819F1AC lsls r0, 24 lsrs r0, 24 - ldr r2, _0819F1D0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _0819F1D4 + ldr r2, =sub_819CC24 + 1 lsrs r0, r2, 16 movs r3, 0 strh r0, [r1, 0x14] strh r2, [r1, 0x16] strh r3, [r1, 0x8] strh r3, [r1, 0x12] - ldr r0, _0819F1D8 + ldr r0, =sub_819D588 + 1 str r0, [r1] bx lr .align 2, 0 -_0819F1D0: .4byte 0x03005e00 -_0819F1D4: .4byte sub_819CC24 + 1 -_0819F1D8: .4byte sub_819D588 + 1 + .pool thumb_func_end sub_819F1AC thumb_func_start sub_819F1DC sub_819F1DC: @ 819F1DC lsls r0, 24 lsrs r0, 24 - ldr r2, _0819F200 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r2, _0819F204 + ldr r2, =sub_819D9EC + 1 lsrs r0, r2, 16 movs r3, 0 strh r0, [r1, 0x14] strh r2, [r1, 0x16] strh r3, [r1, 0x12] strh r3, [r1, 0x8] - ldr r0, _0819F208 + ldr r0, =sub_819D588 + 1 str r0, [r1] bx lr .align 2, 0 -_0819F200: .4byte 0x03005e00 -_0819F204: .4byte sub_819D9EC + 1 -_0819F208: .4byte sub_819D588 + 1 + .pool thumb_func_end sub_819F1DC thumb_func_start sub_819F20C @@ -848692,17 +819979,17 @@ sub_819F20C: @ 819F20C push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r5, _0819F234 + ldr r5, =0x03001284 ldr r1, [r5] ldrb r0, [r1, 0x14] cmp r0, 0 bne _0819F240 - ldr r3, _0819F238 + ldr r3, =0x03005e00 lsls r4, r6, 2 adds r0, r4, r6 lsls r0, 3 adds r0, r3 - ldr r2, _0819F23C + ldr r2, =sub_819CD34 + 1 lsrs r1, r2, 16 strh r1, [r0, 0x14] strh r2, [r0, 0x16] @@ -848710,9 +819997,7 @@ sub_819F20C: @ 819F20C strh r1, [r0, 0x12] b _0819F292 .align 2, 0 -_0819F234: .4byte 0x03001284 -_0819F238: .4byte 0x03005e00 -_0819F23C: .4byte sub_819CD34 + 1 + .pool _0819F240: ldrb r0, [r1, 0x3] bl sub_819F59C @@ -848726,7 +820011,7 @@ _0819F240: adds r1, 0x30 movs r2, 0x1 bl sub_819F2B4 - ldr r1, _0819F270 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -848734,18 +820019,17 @@ _0819F240: movs r1, 0 strh r1, [r0, 0x8] strh r4, [r0, 0x12] - ldr r1, _0819F274 + ldr r1, =sub_819F488 + 1 b _0819F29E .align 2, 0 -_0819F270: .4byte 0x03005e00 -_0819F274: .4byte sub_819F488 + 1 + .pool _0819F278: - ldr r4, _0819F2A8 + ldr r4, =0x03005e00 lsls r5, r6, 2 adds r0, r5, r6 lsls r0, 3 adds r0, r4 - ldr r2, _0819F2AC + ldr r2, =sub_819CCD4 + 1 lsrs r1, r2, 16 movs r3, 0 strh r1, [r0, 0x14] @@ -848759,16 +820043,14 @@ _0819F292: adds r0, r3 movs r1, 0 strh r1, [r0, 0x8] - ldr r1, _0819F2B0 + ldr r1, =sub_819D588 + 1 _0819F29E: str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_0819F2A8: .4byte 0x03005e00 -_0819F2AC: .4byte sub_819CCD4 + 1 -_0819F2B0: .4byte sub_819D588 + 1 + .pool thumb_func_end sub_819F20C thumb_func_start sub_819F2B4 @@ -848778,13 +820060,13 @@ sub_819F2B4: @ 819F2B4 adds r6, r1, 0 lsls r5, r2, 24 lsrs r5, 24 - ldr r0, _0819F2F8 + ldr r0, =0x08610894 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1 bl obj_add_from_template_forward_search strb r0, [r4] - ldr r2, _0819F2FC + ldr r2, =0x02020630 ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -848792,7 +820074,7 @@ sub_819F2B4: @ 819F2B4 adds r1, r2, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0819F300 + ldr r1, =sub_819F600 + 1 str r1, [r0] ldrb r1, [r4] lsls r0, r1, 4 @@ -848806,9 +820088,7 @@ sub_819F2B4: @ 819F2B4 pop {r0} bx r0 .align 2, 0 -_0819F2F8: .4byte 0x08610894 -_0819F2FC: .4byte 0x02020630 -_0819F300: .4byte sub_819F600 + 1 + .pool thumb_func_end sub_819F2B4 thumb_func_start sub_819F304 @@ -848819,12 +820099,12 @@ sub_819F304: @ 819F304 mov r4, r8 push {r4-r6} sub sp, 0x10 - ldr r0, _0819F3E4 + ldr r0, =0x08610894 movs r1, 0x78 movs r2, 0x40 movs r3, 0x1 bl obj_add_from_template_forward_search - ldr r6, _0819F3E8 + ldr r6, =0x03001284 ldr r1, [r6] adds r1, 0x2D movs r2, 0 @@ -848836,7 +820116,7 @@ sub_819F304: @ 819F304 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0819F3EC + ldr r1, =0x02020630 mov r8, r1 add r0, r8 movs r1, 0x2 @@ -848846,7 +820126,7 @@ sub_819F304: @ 819F304 movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _0819F3F0 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -848871,7 +820151,7 @@ sub_819F304: @ 819F304 str r0, [sp, 0x4] movs r0, 0xF str r0, [sp, 0x8] - ldr r0, _0819F3F4 + ldr r0, =0x0000ffff str r0, [sp, 0xC] adds r0, r5, 0 mov r1, r9 @@ -848920,11 +820200,7 @@ sub_819F304: @ 819F304 pop {r0} bx r0 .align 2, 0 -_0819F3E4: .4byte 0x08610894 -_0819F3E8: .4byte 0x03001284 -_0819F3EC: .4byte 0x02020630 -_0819F3F0: .4byte 0x020244ec -_0819F3F4: .4byte 0x0000ffff + .pool thumb_func_end sub_819F304 thumb_func_start sub_819F3F8 @@ -848937,12 +820213,12 @@ sub_819F3F8: @ 819F3F8 lsls r0, r4, 24 lsrs r0, 24 bl sub_818D820 - ldr r0, _0819F43C + ldr r0, =sub_819F7B4 + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0819F440 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -848960,8 +820236,7 @@ sub_819F3F8: @ 819F3F8 pop {r0} bx r0 .align 2, 0 -_0819F43C: .4byte sub_819F7B4 + 1 -_0819F440: .4byte 0x03005e00 + .pool thumb_func_end sub_819F3F8 thumb_func_start sub_819F444 @@ -848972,7 +820247,7 @@ sub_819F444: @ 819F444 lsls r0, r4, 24 lsrs r0, 24 bl sub_818D820 - ldr r5, _0819F484 + ldr r5, =0x02020630 lsls r4, 16 lsrs r1, r4, 24 lsls r0, r1, 4 @@ -848995,7 +820270,7 @@ sub_819F444: @ 819F444 pop {r0} bx r0 .align 2, 0 -_0819F484: .4byte 0x02020630 + .pool thumb_func_end sub_819F444 thumb_func_start sub_819F488 @@ -849003,14 +820278,14 @@ sub_819F488: @ 819F488 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _0819F4BC + ldr r1, =0x03001284 ldr r0, [r1] adds r0, 0x30 ldrb r0, [r0] adds r3, r1, 0 cmp r0, 0x1 beq _0819F58A - ldr r2, _0819F4C0 + ldr r2, =0x03005e00 lsls r1, r4, 2 adds r0, r1, r4 lsls r0, 3 @@ -849021,14 +820296,12 @@ sub_819F488: @ 819F488 cmp r0, 0x4 bhi _0819F58A lsls r0, 2 - ldr r1, _0819F4C4 + ldr r1, =_0819F4C8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_0819F4BC: .4byte 0x03001284 -_0819F4C0: .4byte 0x03005e00 -_0819F4C4: .4byte _0819F4C8 + .pool .align 2, 0 _0819F4C8: .4byte _0819F4DC @@ -849037,19 +820310,18 @@ _0819F4C8: .4byte _0819F548 .4byte _0819F568 _0819F4DC: - ldr r0, _0819F4F0 + ldr r0, =0x085eed0a bl sub_819EBEC - ldr r0, _0819F4F4 + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x20 movs r1, 0 strb r1, [r0] b _0819F54E .align 2, 0 -_0819F4F0: .4byte 0x085eed0a -_0819F4F4: .4byte 0x03001284 + .pool _0819F4F8: - ldr r0, _0819F524 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -849062,7 +820334,7 @@ _0819F4F8: _0819F50C: movs r0, 0x5 bl audio_play - ldr r0, _0819F528 + ldr r0, =0x03001284 ldr r1, [r0] ldr r0, [r1, 0x2C] adds r1, 0x30 @@ -849070,8 +820342,7 @@ _0819F50C: bl sub_819F3F8 b _0819F54E .align 2, 0 -_0819F524: .4byte 0x030022c0 -_0819F528: .4byte 0x03001284 + .pool _0819F52C: ldr r0, [r3] adds r0, 0x30 @@ -849086,10 +820357,10 @@ _0819F52C: bl Window_CopyToVram b _0819F54E _0819F548: - ldr r0, _0819F560 + ldr r0, =0x085eec8b bl sub_819EBEC _0819F54E: - ldr r0, _0819F564 + ldr r0, =0x03005e00 adds r1, r5, r4 lsls r1, 3 adds r1, r0 @@ -849098,32 +820369,29 @@ _0819F54E: strh r0, [r1, 0x8] b _0819F58A .align 2, 0 -_0819F560: .4byte 0x085eec8b -_0819F564: .4byte 0x03005e00 + .pool _0819F568: bl sub_819EEF0 bl sub_819EADC - ldr r0, _0819F590 + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x22 movs r1, 0x1 strb r1, [r0] - ldr r1, _0819F594 + ldr r1, =0x03005e00 adds r0, r5, r4 lsls r0, 3 adds r0, r1 ldrh r1, [r0, 0x12] strh r1, [r0, 0x8] - ldr r1, _0819F598 + ldr r1, =sub_819CE40 + 1 str r1, [r0] _0819F58A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0819F590: .4byte 0x03001284 -_0819F594: .4byte 0x03005e00 -_0819F598: .4byte sub_819CE40 + 1 + .pool thumb_func_end sub_819F488 thumb_func_start sub_819F59C @@ -849133,7 +820401,7 @@ sub_819F59C: @ 819F59C lsrs r0, 24 movs r1, 0x64 muls r0, r1 - ldr r1, _0819F5E0 + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB movs r2, 0 @@ -849142,14 +820410,14 @@ sub_819F59C: @ 819F59C lsrs r5, r0, 16 movs r4, 0 _0819F5B8: - ldr r0, _0819F5E4 + ldr r0, =0x03001284 ldr r0, [r0] ldrb r0, [r0, 0x12] cmp r4, r0 beq _0819F5EC movs r0, 0x64 muls r0, r4 - ldr r1, _0819F5E8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB movs r2, 0 @@ -849161,9 +820429,7 @@ _0819F5B8: movs r0, 0x1 b _0819F5F8 .align 2, 0 -_0819F5E0: .4byte 0x02024744 -_0819F5E4: .4byte 0x03001284 -_0819F5E8: .4byte 0x020244ec + .pool _0819F5EC: adds r0, r4, 0x1 lsls r0, 24 @@ -849193,12 +820459,12 @@ sub_819F600: @ 819F600 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _0819F648 + ldr r0, =sub_819F69C + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _0819F64C + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -849207,16 +820473,14 @@ sub_819F600: @ 819F600 strh r2, [r1, 0x16] ldr r1, [r1] bl _call_via_r1 - ldr r0, _0819F650 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _0819F640: pop {r4} pop {r0} bx r0 .align 2, 0 -_0819F648: .4byte sub_819F69C + 1 -_0819F64C: .4byte 0x03005e00 -_0819F650: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_819F600 thumb_func_start sub_819F654 @@ -849237,14 +820501,14 @@ sub_819F654: @ 819F654 ldrsh r0, [r4, r1] cmp r0, 0x1 bne _0819F688 - ldr r0, _0819F684 + ldr r0, =0x03001284 ldr r0, [r0] adds r0, 0x30 movs r1, 0 strb r1, [r0] b _0819F68E .align 2, 0 -_0819F684: .4byte 0x03001284 + .pool _0819F688: movs r0, 0 bl sub_819BE20 @@ -849265,7 +820529,7 @@ sub_819F69C: @ 819F69C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0819F6C0 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -849277,7 +820541,7 @@ sub_819F69C: @ 819F69C beq _0819F6CA b _0819F77C .align 2, 0 -_0819F6C0: .4byte 0x03005e00 + .pool _0819F6C4: cmp r0, 0x2 beq _0819F73C @@ -849321,16 +820585,15 @@ _0819F6CA: _0819F71A: movs r0, 0x3 bl gpu_sync_bg_show - ldr r1, _0819F734 + ldr r1, =0x00001248 movs r0, 0x50 bl lcd_io_set - ldr r1, _0819F738 + ldr r1, =0x0000040b movs r0, 0x52 bl lcd_io_set b _0819F7A6 .align 2, 0 -_0819F734: .4byte 0x00001248 -_0819F738: .4byte 0x0000040b + .pool _0819F73C: ldrh r0, [r4, 0x12] subs r0, 0x4 @@ -849368,7 +820631,7 @@ _0819F760: _0819F77C: adds r0, r5, 0 bl remove_task - ldr r0, _0819F79C + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -849380,7 +820643,7 @@ _0819F77C: bl sub_819F8E0 b _0819F7AC .align 2, 0 -_0819F79C: .4byte 0x03005e00 + .pool _0819F7A0: bl sub_819BD70 b _0819F7AC @@ -849402,7 +820665,7 @@ sub_819F7B4: @ 819F7B4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _0819F838 + ldr r1, =0x03005e00 adds r4, r0, r1 movs r1, 0x8 ldrsh r0, [r4, r1] @@ -849412,7 +820675,7 @@ sub_819F7B4: @ 819F7B4 beq _0819F894 movs r0, 0x3 bl gpu_sync_bg_hide - ldr r3, _0819F83C + ldr r3, =0x02020630 movs r0, 0x14 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -849441,7 +820704,7 @@ sub_819F7B4: @ 819F7B4 adds r1, r3, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0819F840 + ldr r1, =sub_819F654 + 1 str r1, [r0] movs r0, 0x14 ldrsh r1, [r4, r0] @@ -849459,9 +820722,7 @@ sub_819F7B4: @ 819F7B4 bl remove_task b _0819F8D8 .align 2, 0 -_0819F838: .4byte 0x03005e00 -_0819F83C: .4byte 0x02020630 -_0819F840: .4byte sub_819F654 + 1 + .pool _0819F844: movs r0, 0x58 strh r0, [r4, 0xE] @@ -849545,7 +820806,7 @@ _0819F8D8: sub_819F8E0: @ 819F8E0 push {r4-r6,lr} sub sp, 0x10 - ldr r0, _0819F8F8 + ldr r0, =0x03001284 ldr r1, [r0] ldrb r0, [r1, 0x14] cmp r0, 0 @@ -849553,16 +820814,15 @@ sub_819F8E0: @ 819F8E0 ldrb r1, [r1, 0x3] movs r0, 0x64 muls r1, r0 - ldr r0, _0819F8FC + ldr r0, =0x020244ec b _0819F908 .align 2, 0 -_0819F8F8: .4byte 0x03001284 -_0819F8FC: .4byte 0x020244ec + .pool _0819F900: ldrb r1, [r1, 0x3] movs r0, 0x64 muls r1, r0 - ldr r0, _0819F98C + ldr r0, =0x02024744 _0819F908: adds r6, r1, r0 adds r0, r6, 0 @@ -849588,18 +820848,18 @@ _0819F908: str r0, [sp, 0x4] movs r0, 0xF str r0, [sp, 0x8] - ldr r0, _0819F990 + ldr r0, =0x0000ffff str r0, [sp, 0xC] adds r0, r4, 0 adds r2, r5, 0 movs r3, 0x1 bl sub_818D7D8 - ldr r2, _0819F994 + ldr r2, =0x03001284 ldr r1, [r2] adds r1, 0x2C movs r3, 0 strb r0, [r1] - ldr r4, _0819F998 + ldr r4, =0x02020630 ldr r0, [r2] adds r0, 0x2C ldrb r1, [r0] @@ -849626,10 +820886,7 @@ _0819F908: pop {r0} bx r0 .align 2, 0 -_0819F98C: .4byte 0x02024744 -_0819F990: .4byte 0x0000ffff -_0819F994: .4byte 0x03001284 -_0819F998: .4byte 0x02020630 + .pool thumb_func_end sub_819F8E0 thumb_func_start sub_819F99C @@ -849639,7 +820896,7 @@ sub_819F99C: @ 819F99C push {r7} lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _0819FA38 + ldr r2, =0x03005d90 ldr r1, [r2] lsls r0, r5, 4 adds r0, r5 @@ -849649,7 +820906,7 @@ sub_819F99C: @ 819F99C ldrb r1, [r1] movs r6, 0 adds r7, r2, 0 - ldr r0, _0819FA3C + ldr r0, =0x02021cc4 mov r8, r0 cmp r1, 0 beq _0819F9DC @@ -849679,12 +820936,12 @@ _0819F9DC: bl strcpy_limit_7_chars ldr r0, [r7] adds r0, r4 - ldr r1, _0819FA40 + ldr r1, =0x0000011b adds r0, r1 ldrb r1, [r0] mov r0, r8 bl sub_8009308 - ldr r0, _0819FA44 + ldr r0, =0x02021dc4 ldr r1, [r7] adds r1, r4 adds r1, 0xDE @@ -849692,7 +820949,7 @@ _0819F9DC: movs r2, 0x1 adds r3, r6, 0 bl decimal_int_to_string - ldr r1, _0819FA48 + ldr r1, =0x08611330 ldr r0, [r7] adds r0, r4 adds r0, 0xDC @@ -849701,7 +820958,7 @@ _0819F9DC: lsrs r0, 25 adds r0, r1 ldr r1, [r0] - ldr r0, _0819FA4C + ldr r0, =0x02021fc4 bl ExpandTextCodes pop {r3} mov r8, r3 @@ -849709,12 +820966,7 @@ _0819F9DC: pop {r0} bx r0 .align 2, 0 -_0819FA38: .4byte 0x03005d90 -_0819FA3C: .4byte 0x02021cc4 -_0819FA40: .4byte 0x0000011b -_0819FA44: .4byte 0x02021dc4 -_0819FA48: .4byte 0x08611330 -_0819FA4C: .4byte 0x02021fc4 + .pool thumb_func_end sub_819F99C thumb_func_start sub_819FA50 @@ -849732,7 +820984,7 @@ sub_819FA5C: @ 819FA5C movs r2, 0 adds r4, r3, 0 adds r4, 0x28 - ldr r0, _0819FA9C + ldr r0, =0x0000ffff adds r5, r0, 0 _0819FA6A: lsls r0, r2, 1 @@ -849760,7 +821012,7 @@ _0819FA6A: pop {r0} bx r0 .align 2, 0 -_0819FA9C: .4byte 0x0000ffff + .pool thumb_func_end sub_819FA5C thumb_func_start sub_819FAA0 @@ -849770,7 +821022,7 @@ sub_819FAA0: @ 819FAA0 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r3, _0819FBA0 + ldr r3, =0x03005d90 ldr r1, [r3] adds r1, 0xB2 ldrb r2, [r1] @@ -849782,7 +821034,7 @@ sub_819FAA0: @ 819FAA0 mov r12, r0 adds r5, r3, 0 mov r8, r0 - ldr r1, _0819FBA4 + ldr r1, =0x0000ffff mov r10, r1 _0819FAC6: movs r2, 0 @@ -849848,7 +821100,7 @@ _0819FAD6: adds r0, 0xDD strb r4, [r0] movs r2, 0 - ldr r6, _0819FBA0 + ldr r6, =0x03005d90 movs r4, 0x88 lsls r4, 1 _0819FB48: @@ -849868,9 +821120,9 @@ _0819FB48: adds r2, r7, r3 lsls r2, 2 adds r0, r2 - ldr r4, _0819FBA8 + ldr r4, =0x082e9531 ldrb r1, [r4] - ldr r3, _0819FBAC + ldr r3, =0x0000011b adds r0, r3 strb r1, [r0] ldr r0, [r5] @@ -849895,15 +821147,12 @@ _0819FB48: pop {r0} bx r0 .align 2, 0 -_0819FBA0: .4byte 0x03005d90 -_0819FBA4: .4byte 0x0000ffff -_0819FBA8: .4byte 0x082e9531 -_0819FBAC: .4byte 0x0000011b + .pool thumb_func_end sub_819FAA0 thumb_func_start sub_819FBB0 sub_819FBB0: @ 819FBB0 - ldr r0, _0819FBC4 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB1 ldrb r0, [r0] @@ -849914,20 +821163,20 @@ sub_819FBB0: @ 819FBB0 lsrs r0, 31 bx lr .align 2, 0 -_0819FBC4: .4byte 0x03005d90 + .pool thumb_func_end sub_819FBB0 thumb_func_start sub_819FBC8 sub_819FBC8: @ 819FBC8 push {r4,r5,lr} - ldr r2, _0819FC08 + ldr r2, =0x03005d90 ldr r0, [r2] adds r0, 0xDE ldrb r0, [r0] cmp r0, 0 bne _0819FC10 adds r4, r2, 0 - ldr r5, _0819FC0C + ldr r5, =0x08611548 _0819FBDA: bl GenerateRandomNumber ldr r2, [r4] @@ -849952,8 +821201,7 @@ _0819FBDA: beq _0819FBDA b _0819FC38 .align 2, 0 -_0819FC08: .4byte 0x03005d90 -_0819FC0C: .4byte 0x08611548 + .pool _0819FC10: adds r4, r2, 0 _0819FC12: @@ -849985,7 +821233,7 @@ _0819FC38: sub_819FC40: @ 819FC40 lsls r0, 24 lsrs r0, 24 - ldr r1, _0819FC5C + ldr r1, =0x03005d90 ldr r2, [r1] adds r2, 0xB1 movs r1, 0x3 @@ -849997,7 +821245,7 @@ sub_819FC40: @ 819FC40 strb r1, [r2] bx lr .align 2, 0 -_0819FC5C: .4byte 0x03005d90 + .pool thumb_func_end sub_819FC40 thumb_func_start sub_819FC60 @@ -850044,7 +821292,7 @@ _0819FC78: cmp r5, 0x31 bls _0819FC78 movs r5, 0 - ldr r6, _0819FCF4 + ldr r6, =0x03005d90 movs r4, 0xF _0819FCBC: ldr r3, [r6] @@ -850075,7 +821323,7 @@ _0819FCBC: pop {r0} bx r0 .align 2, 0 -_0819FCF4: .4byte 0x03005d90 + .pool thumb_func_end sub_819FC60 thumb_func_start sub_819FCF8 @@ -850086,7 +821334,7 @@ sub_819FCF8: @ 819FCF8 movs r5, 0 cmp r0, 0x2 bne _0819FD4C - ldr r6, _0819FD48 + ldr r6, =0x030062ec _0819FD06: bl GenerateRandomNumber lsls r0, 16 @@ -850122,7 +821370,7 @@ _0819FD38: bhi _0819FD06 b _0819FD5A .align 2, 0 -_0819FD48: .4byte 0x030062ec + .pool _0819FD4C: cmp r0, 0x1 bne _0819FD5A @@ -850191,7 +821439,7 @@ _0819FD92: cmp r5, 0x9 bls _0819FD92 movs r5, 0 - ldr r2, _0819FF8C + ldr r2, =0x086114d3 _0819FDD0: mov r4, sp adds r1, r4, r5 @@ -850231,7 +821479,7 @@ _0819FDE6: lsrs r5, r0, 24 cmp r5, 0x31 bls _0819FDE6 - ldr r4, _0819FF90 + ldr r4, =0x030062ec movs r0, 0x30 bl malloc_and_clear str r0, [r4] @@ -850264,7 +821512,7 @@ _0819FE36: strb r0, [r7] movs r5, 0 _0819FE60: - ldr r0, _0819FF94 + ldr r0, =0x03005d90 ldr r3, [r0] lsls r4, r5, 2 adds r3, r4 @@ -850291,7 +821539,7 @@ _0819FE60: ldr r1, [sp, 0x14] ldr r2, [sp, 0x18] bl sub_819FCF8 - ldr r1, _0819FF94 + ldr r1, =0x03005d90 ldr r3, [r1] add r3, r8 adds r3, 0xB8 @@ -850305,7 +821553,7 @@ _0819FE60: ands r0, r1 orrs r0, r2 strb r0, [r3] - ldr r7, _0819FF94 + ldr r7, =0x03005d90 ldr r0, [r7] add r0, r8 adds r0, 0xB8 @@ -850318,7 +821566,7 @@ _0819FE60: lsls r0, r7, 2 adds r0, r7 mov r10, r0 - ldr r0, _0819FF90 + ldr r0, =0x030062ec mov r9, r0 _0819FED2: bl GenerateRandomNumber @@ -850358,7 +821606,7 @@ _0819FF12: ldr r0, [r1] ldrb r0, [r0] adds r0, 0x1 - ldr r1, _0819FF90 + ldr r1, =0x030062ec cmp r3, r0 bne _0819FED2 ldr r0, [r1] @@ -850368,7 +821616,7 @@ _0819FF12: adds r0, 0x20 adds r0, r1 strb r4, [r0] - ldr r6, _0819FF94 + ldr r6, =0x03005d90 ldr r2, [r6] add r2, r8 adds r2, 0xB8 @@ -850401,7 +821649,7 @@ _0819FF62: bhi _0819FF6E b _0819FE60 _0819FF6E: - ldr r4, _0819FF90 + ldr r4, =0x030062ec ldr r0, [r4] bl free movs r0, 0 @@ -850415,9 +821663,7 @@ _0819FF6E: pop {r0} bx r0 .align 2, 0 -_0819FF8C: .4byte 0x086114d3 -_0819FF90: .4byte 0x030062ec -_0819FF94: .4byte 0x03005d90 + .pool thumb_func_end sub_819FD64 thumb_func_start sub_819FF98 @@ -850437,7 +821683,7 @@ sub_819FF98: @ 819FF98 ldr r1, [sp] cmp r1, 0x2 bhi _0819FFE0 - ldr r2, _0819FFDC + ldr r2, =0x03005d90 ldr r1, [r2] adds r0, r1, 0 adds r0, 0xB4 @@ -850457,12 +821703,12 @@ sub_819FF98: @ 819FF98 ands r4, r0 b _0819FFE4 .align 2, 0 -_0819FFDC: .4byte 0x03005d90 + .pool _0819FFE0: movs r4, 0 - ldr r2, _081A00A4 + ldr r2, =0x03005d90 _0819FFE4: - ldr r3, _081A00A8 + ldr r3, =0x08610970 lsls r1, r4, 1 ldr r4, [r2] adds r0, r4, 0 @@ -850475,7 +821721,7 @@ _0819FFE4: adds r1, r3 ldrh r1, [r1] str r1, [sp, 0x8] - ldr r1, _081A00AC + ldr r1, =0x0832937c ldr r2, [sp, 0x8] lsls r0, r2, 2 adds r0, r1 @@ -850491,7 +821737,7 @@ _0819FFE4: movs r5, 0x32 _081A001A: ldrh r1, [r6] - ldr r4, _081A00B0 + ldr r4, =0x0000ffff cmp r1, r4 beq _081A004C movs r2, 0xFE @@ -850532,7 +821778,7 @@ _081A0052: cmp r0, 0x1 bne _081A00E0 _081A0068: - ldr r1, _081A00B4 + ldr r1, =0x000001ff mov r8, r1 _081A006C: bl GenerateRandomNumber @@ -850548,7 +821794,7 @@ _081A006C: adds r2, r0, 0 cmp r2, 0 beq _081A006C - ldr r2, _081A00B8 + ldr r2, =0x00000121 adds r0, r4, r2 bl sub_81B6CFC lsls r0, 16 @@ -850559,12 +821805,7 @@ _081A006C: movs r3, 0 b _081A00C6 .align 2, 0 -_081A00A4: .4byte 0x03005d90 -_081A00A8: .4byte 0x08610970 -_081A00AC: .4byte 0x0832937c -_081A00B0: .4byte 0x0000ffff -_081A00B4: .4byte 0x000001ff -_081A00B8: .4byte 0x00000121 + .pool _081A00BC: subs r0, r5, 0x4 b _081A00C2 @@ -850596,7 +821837,7 @@ _081A00E0: b _081A0168 _081A00EA: subs r4, r5, 0x4 - ldr r3, _081A0124 + ldr r3, =0x000001ff mov r10, r3 mov r8, r3 lsls r0, r4, 24 @@ -850624,7 +821865,7 @@ _081A00F6: mov r0, r8 b _081A013A .align 2, 0 -_081A0124: .4byte 0x000001ff + .pool _081A0128: adds r0, r3, 0x1 lsls r0, 24 @@ -850650,7 +821891,7 @@ _081A0146: lsls r0, 24 cmp r0, 0 beq _081A0168 - ldr r0, _081A018C + ldr r0, =0x08611370 adds r0, r7, r0 ldrb r0, [r0] cmp r0, 0 @@ -850666,7 +821907,7 @@ _081A0168: bhi _081A0170 b _081A0052 _081A0170: - ldr r0, _081A0190 + ldr r0, =0x030062ec ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 @@ -850681,8 +821922,7 @@ _081A0170: pop {r1} bx r1 .align 2, 0 -_081A018C: .4byte 0x08611370 -_081A0190: .4byte 0x030062ec + .pool thumb_func_end sub_819FF98 thumb_func_start sub_81A0194 @@ -850693,7 +821933,7 @@ sub_81A0194: @ 81A0194 lsls r1, 16 lsrs r5, r1, 16 movs r3, 0 - ldr r0, _081A01C0 + ldr r0, =0x030062ec mov r12, r0 ldr r2, [r0] lsls r1, r4, 2 @@ -850711,7 +821951,7 @@ _081A01B0: movs r0, 0 b _081A01E2 .align 2, 0 -_081A01C0: .4byte 0x030062ec + .pool _081A01C4: adds r0, r3, 0x1 lsls r0, 24 @@ -850740,7 +821980,7 @@ sub_81A01E8: @ 81A01E8 mov r12, r1 lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _081A0274 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB1 ldrb r1, [r0] @@ -850751,13 +821991,13 @@ sub_81A01E8: @ 81A01E8 bne _081A0204 movs r4, 0x32 _081A0204: - ldr r1, _081A0278 + ldr r1, =0x0832937c lsls r0, r2, 2 adds r0, r1 ldr r6, [r0] movs r5, 0 ldrh r1, [r6] - ldr r3, _081A027C + ldr r3, =0x0000ffff cmp r1, r3 beq _081A0240 movs r2, 0xFE @@ -850791,7 +822031,7 @@ _081A0248: movs r2, 0 cmp r2, r4 bcs _081A026C - ldr r7, _081A0280 + ldr r7, =0x000001ff _081A0250: lsls r3, r2, 1 add r3, r12 @@ -850812,10 +822052,7 @@ _081A026C: pop {r0} bx r0 .align 2, 0 -_081A0274: .4byte 0x03005d90 -_081A0278: .4byte 0x0832937c -_081A027C: .4byte 0x0000ffff -_081A0280: .4byte 0x000001ff + .pool thumb_func_end sub_81A01E8 thumb_func_start sub_81A0284 @@ -850832,7 +822069,7 @@ sub_81A0284: @ 81A0284 lsrs r6, r1, 24 lsls r2, 24 lsrs r5, r2, 24 - ldr r1, _081A02B4 + ldr r1, =0x03005d90 ldr r2, [r1] adds r0, r2, 0 adds r0, 0xB1 @@ -850845,7 +822082,7 @@ sub_81A0284: @ 81A0284 movs r0, 0 b _081A037C .align 2, 0 -_081A02B4: .4byte 0x03005d90 + .pool _081A02B8: movs r4, 0 movs r3, 0 @@ -850853,7 +822090,7 @@ _081A02B8: adds r0, 0xB8 ldrb r0, [r0] lsls r0, 30 - ldr r1, _081A038C + ldr r1, =0x08610970 mov r12, r1 lsls r6, 1 lsls r5, 1 @@ -850958,7 +822195,7 @@ _081A037C: pop {r1} bx r1 .align 2, 0 -_081A038C: .4byte 0x08610970 + .pool thumb_func_end sub_81A0284 thumb_func_start sub_81A0390 @@ -850971,7 +822208,7 @@ sub_81A0390: @ 81A0390 lsrs r0, 24 mov r8, r0 movs r5, 0 - ldr r7, _081A04A0 + ldr r7, =0x03005d90 adds r6, r7, 0 movs r4, 0 _081A03A6: @@ -851030,8 +822267,8 @@ _081A03E6: cmp r5, 0x2 bls _081A03E6 movs r5, 0 - ldr r7, _081A04A0 - ldr r6, _081A04A4 + ldr r7, =0x03005d90 + ldr r6, =0x086109a4 _081A0416: ldr r0, [r7] mov r12, r0 @@ -851076,7 +822313,7 @@ _081A0416: movs r5, 0 cmp r5, r8 bcs _081A04D6 - ldr r7, _081A04A0 + ldr r7, =0x03005d90 _081A0470: ldr r1, [r7] lsls r0, r5, 2 @@ -851103,8 +822340,7 @@ _081A0470: strh r0, [r1, 0xA] b _081A04CC .align 2, 0 -_081A04A0: .4byte 0x03005d90 -_081A04A4: .4byte 0x086109a4 + .pool _081A04A8: cmp r1, 0x2 bne _081A04CC @@ -851155,12 +822391,12 @@ sub_81A04E4: @ 81A04E4 b _081A064C _081A04FC: lsls r0, 2 - ldr r1, _081A0508 + ldr r1, =_081A050C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A0508: .4byte _081A050C + .pool .align 2, 0 _081A050C: .4byte _081A0528 @@ -851174,30 +822410,29 @@ _081A0528: movs r0, 0x12 mov r10, r0 movs r6, 0x8 - ldr r0, _081A0538 + ldr r0, =0x085eaeb1 str r0, [sp, 0xC] - ldr r0, _081A053C + ldr r0, =0x085eaeb8 str r0, [sp, 0x10] b _081A0652 .align 2, 0 -_081A0538: .4byte 0x085eaeb1 -_081A053C: .4byte 0x085eaeb8 + .pool _081A0540: movs r7, 0x3 movs r1, 0x12 mov r10, r1 movs r6, 0x6 movs r4, 0 - ldr r0, _081A05A8 + ldr r0, =0x083185c8 mov r9, r0 - ldr r0, _081A05AC + ldr r0, =0x03005d90 ldr r3, [r0] movs r1, 0xB2 adds r1, r3 mov r12, r1 adds r5, r3, 0 adds r5, 0xB0 - ldr r0, _081A05B0 + ldr r0, =0x086109a4 mov r8, r0 _081A0560: adds r0, r3, 0 @@ -851237,14 +822472,12 @@ _081A0560: bls _081A0560 b _081A0652 .align 2, 0 -_081A05A8: .4byte 0x083185c8 -_081A05AC: .4byte 0x03005d90 -_081A05B0: .4byte 0x086109a4 + .pool _081A05B4: movs r0, 0x12 mov r10, r0 movs r6, 0x8 - ldr r0, _081A05E8 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB1 ldrb r0, [r0] @@ -851254,12 +822487,12 @@ _081A05B4: bls _081A05CC b _081A06FA _081A05CC: - ldr r0, _081A05EC + ldr r0, =0x030062f0 ldr r3, [r0] ldrh r0, [r3, 0x2] movs r2, 0xB muls r0, r2 - ldr r1, _081A05F0 + ldr r1, =0x083185c8 adds r0, r1 str r0, [sp, 0x10] ldrh r0, [r3] @@ -851268,19 +822501,17 @@ _081A05CC: str r0, [sp, 0xC] b _081A0652 .align 2, 0 -_081A05E8: .4byte 0x03005d90 -_081A05EC: .4byte 0x030062f0 -_081A05F0: .4byte 0x083185c8 + .pool _081A05F4: movs r1, 0x11 mov r10, r1 movs r6, 0x8 - ldr r0, _081A0614 + ldr r0, =0x030062f0 ldr r3, [r0] ldrh r0, [r3, 0x4] movs r2, 0xD muls r0, r2 - ldr r1, _081A0618 + ldr r1, =0x0831977c adds r0, r1 str r0, [sp, 0xC] ldrh r0, [r3, 0x6] @@ -851289,32 +822520,29 @@ _081A05F4: str r0, [sp, 0x10] b _081A0652 .align 2, 0 -_081A0614: .4byte 0x030062f0 -_081A0618: .4byte 0x0831977c + .pool _081A061C: movs r0, 0x12 mov r10, r0 movs r6, 0x8 - ldr r0, _081A062C + ldr r0, =0x085ed193 str r0, [sp, 0xC] - ldr r0, _081A0630 + ldr r0, =0x085ed198 str r0, [sp, 0x10] b _081A0652 .align 2, 0 -_081A062C: .4byte 0x085ed193 -_081A0630: .4byte 0x085ed198 + .pool _081A0634: movs r1, 0x14 mov r10, r1 movs r6, 0x8 - ldr r0, _081A0644 + ldr r0, =0x085eae62 str r0, [sp, 0xC] - ldr r0, _081A0648 + ldr r0, =0x085eae66 str r0, [sp, 0x10] b _081A0652 .align 2, 0 -_081A0644: .4byte 0x085eae62 -_081A0648: .4byte 0x085eae66 + .pool _081A064C: movs r0, 0 mov r10, r0 @@ -851420,7 +822648,7 @@ sub_81A070C: @ 81A070C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081A072C + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0xA ldrsh r0, [r4, r1] @@ -851429,7 +822657,7 @@ sub_81A070C: @ 81A070C bl ProcessMenuInputNoWrapAround b _081A0734 .align 2, 0 -_081A072C: .4byte 0x03005e08 + .pool _081A0730: bl ProcessMenuInput _081A0734: @@ -851450,14 +822678,14 @@ _081A0734: bne _081A0778 movs r0, 0x5 bl audio_play - ldr r1, _081A0760 + ldr r1, =0x020375f0 movs r0, 0x7F strh r0, [r1] b _081A0768 .align 2, 0 -_081A0760: .4byte 0x020375f0 + .pool _081A0764: - ldr r0, _081A0780 + ldr r0, =0x020375f0 strh r1, [r0] _081A0768: ldrb r0, [r4, 0xC] @@ -851470,7 +822698,7 @@ _081A0778: pop {r0} bx r0 .align 2, 0 -_081A0780: .4byte 0x020375f0 + .pool thumb_func_end sub_81A070C thumb_func_start sub_81A0784 @@ -851550,12 +822778,12 @@ sub_81A0804: @ 81A0804 lsrs r5, 24 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, _081A0838 + ldr r0, =sub_81A070C + 1 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _081A083C + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -851566,13 +822794,12 @@ sub_81A0804: @ 81A0804 movs r0, 0x1 b _081A0842 .align 2, 0 -_081A0838: .4byte sub_81A070C + 1 -_081A083C: .4byte 0x03005e00 + .pool _081A0840: movs r0, 0 _081A0842: strh r0, [r1, 0x12] - ldr r1, _081A0858 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -851582,14 +822809,14 @@ _081A0842: pop {r0} bx r0 .align 2, 0 -_081A0858: .4byte 0x03005e00 + .pool thumb_func_end sub_81A0804 thumb_func_start sub_81A085C sub_81A085C: @ 81A085C push {lr} - ldr r1, _081A0874 - ldr r0, _081A0878 + ldr r1, =0x086114e0 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -851598,15 +822825,14 @@ sub_81A085C: @ 81A085C pop {r0} bx r0 .align 2, 0 -_081A0874: .4byte 0x086114e0 -_081A0878: .4byte 0x020375e0 + .pool thumb_func_end sub_81A085C thumb_func_start sub_81A087C sub_81A087C: @ 81A087C push {r4-r7,lr} bl sub_819FBC8 - ldr r3, _081A0938 + ldr r3, =0x03005d90 ldr r1, [r3] adds r1, 0xB1 ldrb r2, [r1] @@ -851647,7 +822873,7 @@ _081A08BE: cmp r4, 0x2 bls _081A08BE movs r4, 0 - ldr r5, _081A0938 + ldr r5, =0x03005d90 movs r0, 0x4 negs r0, r0 mov r12, r0 @@ -851699,7 +822925,7 @@ _081A08E2: pop {r0} bx r0 .align 2, 0 -_081A0938: .4byte 0x03005d90 + .pool thumb_func_end sub_81A087C thumb_func_start sub_81A093C @@ -851710,32 +822936,32 @@ sub_81A093C: @ 81A093C lsrs r1, r0, 24 cmp r1, 0 bne _081A0954 - ldr r0, _081A0950 + ldr r0, =0x020375f0 strh r1, [r0] b _081A095A .align 2, 0 -_081A0950: .4byte 0x020375f0 + .pool _081A0954: - ldr r1, _081A0960 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] _081A095A: pop {r0} bx r0 .align 2, 0 -_081A0960: .4byte 0x020375f0 + .pool thumb_func_end sub_81A093C thumb_func_start sub_81A0964 sub_81A0964: @ 81A0964 push {lr} - ldr r0, _081A0974 + ldr r0, =0x020375e2 ldrb r0, [r0] bl sub_819FC40 pop {r0} bx r0 .align 2, 0 -_081A0974: .4byte 0x020375e2 + .pool thumb_func_end sub_81A0964 thumb_func_start sub_81A0978 @@ -851756,7 +822982,7 @@ sub_81A0984: @ 81A0984 thumb_func_start sub_81A0990 sub_81A0990: @ 81A0990 - ldr r0, _081A09B0 + ldr r0, =0x03005d90 ldr r2, [r0] adds r2, 0xB1 ldrb r3, [r2] @@ -851773,13 +822999,13 @@ sub_81A0990: @ 81A0990 strb r0, [r2] bx lr .align 2, 0 -_081A09B0: .4byte 0x03005d90 + .pool thumb_func_end sub_81A0990 thumb_func_start sub_81A09B4 sub_81A09B4: @ 81A09B4 - ldr r1, _081A09C8 - ldr r0, _081A09CC + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB1 ldrb r0, [r0] @@ -851788,14 +823014,13 @@ sub_81A09B4: @ 81A09B4 strh r0, [r1] bx lr .align 2, 0 -_081A09C8: .4byte 0x020375f0 -_081A09CC: .4byte 0x03005d90 + .pool thumb_func_end sub_81A09B4 thumb_func_start sub_81A09D0 sub_81A09D0: @ 81A09D0 push {lr} - ldr r3, _081A09EC + ldr r3, =0x03005d90 ldr r0, [r3] adds r0, 0xB1 ldrb r0, [r0] @@ -851804,15 +823029,14 @@ sub_81A09D0: @ 81A09D0 subs r1, r0, 0x3 cmp r1, 0 bge _081A09F4 - ldr r1, _081A09F0 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] b _081A0A1C .align 2, 0 -_081A09EC: .4byte 0x03005d90 -_081A09F0: .4byte 0x020375f0 + .pool _081A09F4: - ldr r2, _081A0A14 + ldr r2, =0x020375f0 cmp r1, 0x8 ble _081A09FE movs r0, 0x1 @@ -851829,7 +823053,7 @@ _081A09FE: movs r0, 0x1 b _081A0A1A .align 2, 0 -_081A0A14: .4byte 0x020375f0 + .pool _081A0A18: movs r0, 0 _081A0A1A: @@ -851842,13 +823066,13 @@ _081A0A1C: thumb_func_start sub_81A0A20 sub_81A0A20: @ 81A0A20 push {lr} - ldr r0, _081A0A30 + ldr r0, =0x020375e2 ldrb r0, [r0] bl sub_81A04E4 pop {r0} bx r0 .align 2, 0 -_081A0A30: .4byte 0x020375e2 + .pool thumb_func_end sub_81A0A20 thumb_func_start sub_81A0A34 @@ -851862,16 +823086,15 @@ sub_81A0A34: @ 81A0A34 bne _081A0A68 adds r0, r4, 0 bl remove_task - ldr r0, _081A0A5C + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 beq _081A0A64 - ldr r0, _081A0A60 + ldr r0, =script_env_2_enable_and_set_ctx_running + 1 bl sub_81A172C b _081A0A68 .align 2, 0 -_081A0A5C: .4byte 0x020375e2 -_081A0A60: .4byte script_env_2_enable_and_set_ctx_running + 1 + .pool _081A0A64: bl script_env_2_enable_and_set_ctx_running _081A0A68: @@ -851883,26 +823106,24 @@ _081A0A68: thumb_func_start sub_81A0A70 sub_81A0A70: @ 81A0A70 push {lr} - ldr r1, _081A0A88 + ldr r1, =0x020375e4 ldrh r0, [r1] cmp r0, 0x6 bne _081A0A94 - ldr r1, _081A0A8C - ldr r0, _081A0A90 + ldr r1, =0x08610ff0 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 b _081A0C66 .align 2, 0 -_081A0A88: .4byte 0x020375e4 -_081A0A8C: .4byte 0x08610ff0 -_081A0A90: .4byte 0x03005d90 + .pool _081A0A94: cmp r0, 0x7 bne _081A0AB0 - ldr r1, _081A0AA8 - ldr r0, _081A0AAC + ldr r1, =0x08610ff0 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] @@ -851910,26 +823131,24 @@ _081A0A94: adds r1, 0x4 b _081A0C66 .align 2, 0 -_081A0AA8: .4byte 0x08610ff0 -_081A0AAC: .4byte 0x03005d90 + .pool _081A0AB0: cmp r0, 0x8 bne _081A0ACC - ldr r1, _081A0AC4 - ldr r0, _081A0AC8 + ldr r1, =0x086111b0 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 b _081A0C66 .align 2, 0 -_081A0AC4: .4byte 0x086111b0 -_081A0AC8: .4byte 0x03005d90 + .pool _081A0ACC: cmp r0, 0x9 bne _081A0AE8 - ldr r1, _081A0AE0 - ldr r0, _081A0AE4 + ldr r1, =0x086111b0 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] @@ -851937,26 +823156,24 @@ _081A0ACC: adds r1, 0x4 b _081A0C66 .align 2, 0 -_081A0AE0: .4byte 0x086111b0 -_081A0AE4: .4byte 0x03005d90 + .pool _081A0AE8: cmp r0, 0x4 bne _081A0B04 - ldr r1, _081A0AFC - ldr r0, _081A0B00 + ldr r1, =0x08611230 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 b _081A0C66 .align 2, 0 -_081A0AFC: .4byte 0x08611230 -_081A0B00: .4byte 0x03005d90 + .pool _081A0B04: cmp r0, 0x5 bne _081A0B20 - ldr r1, _081A0B18 - ldr r0, _081A0B1C + ldr r1, =0x08611230 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] @@ -851964,13 +823181,12 @@ _081A0B04: adds r1, 0x4 b _081A0C66 .align 2, 0 -_081A0B18: .4byte 0x08611230 -_081A0B1C: .4byte 0x03005d90 + .pool _081A0B20: cmp r0, 0xA bne _081A0B40 - ldr r2, _081A0B38 - ldr r0, _081A0B3C + ldr r2, =0x08611070 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r1, [r0] @@ -851979,26 +823195,24 @@ _081A0B20: lsls r0, 2 b _081A0BD6 .align 2, 0 -_081A0B38: .4byte 0x08611070 -_081A0B3C: .4byte 0x03005d90 + .pool _081A0B40: cmp r0, 0xB bne _081A0B5C - ldr r1, _081A0B54 - ldr r0, _081A0B58 + ldr r1, =0x086112b0 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 b _081A0C66 .align 2, 0 -_081A0B54: .4byte 0x086112b0 -_081A0B58: .4byte 0x03005d90 + .pool _081A0B5C: cmp r0, 0xC bne _081A0B7C - ldr r2, _081A0B74 - ldr r0, _081A0B78 + ldr r2, =0x08611070 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r1, [r0] @@ -852008,13 +823222,12 @@ _081A0B5C: adds r2, 0xC b _081A0BD6 .align 2, 0 -_081A0B74: .4byte 0x08611070 -_081A0B78: .4byte 0x03005d90 + .pool _081A0B7C: cmp r0, 0xD bne _081A0B9C - ldr r2, _081A0B94 - ldr r0, _081A0B98 + ldr r2, =0x08611070 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r1, [r0] @@ -852024,14 +823237,13 @@ _081A0B7C: adds r2, 0x4 b _081A0BD6 .align 2, 0 -_081A0B94: .4byte 0x08611070 -_081A0B98: .4byte 0x03005d90 + .pool _081A0B9C: ldrh r0, [r1] cmp r0, 0x10 bne _081A0BC0 - ldr r2, _081A0BB8 - ldr r0, _081A0BBC + ldr r2, =0x08611070 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r1, [r0] @@ -852041,13 +823253,12 @@ _081A0B9C: adds r2, 0x10 b _081A0BD6 .align 2, 0 -_081A0BB8: .4byte 0x08611070 -_081A0BBC: .4byte 0x03005d90 + .pool _081A0BC0: cmp r0, 0xE bne _081A0BE4 - ldr r2, _081A0BDC - ldr r0, _081A0BE0 + ldr r2, =0x08611070 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r1, [r0] @@ -852060,13 +823271,12 @@ _081A0BD6: ldr r1, [r0] b _081A0C7A .align 2, 0 -_081A0BDC: .4byte 0x08611070 -_081A0BE0: .4byte 0x03005d90 + .pool _081A0BE4: cmp r0, 0xF bne _081A0C00 - ldr r1, _081A0BF8 - ldr r0, _081A0BFC + ldr r1, =0x086112b0 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] @@ -852074,26 +823284,24 @@ _081A0BE4: adds r1, 0x4 b _081A0C66 .align 2, 0 -_081A0BF8: .4byte 0x086112b0 -_081A0BFC: .4byte 0x03005d90 + .pool _081A0C00: cmp r0, 0 bne _081A0C1C - ldr r1, _081A0C14 - ldr r0, _081A0C18 + ldr r1, =0x08610ef0 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 4 b _081A0C66 .align 2, 0 -_081A0C14: .4byte 0x08610ef0 -_081A0C18: .4byte 0x03005d90 + .pool _081A0C1C: cmp r0, 0x1 bne _081A0C38 - ldr r1, _081A0C30 - ldr r0, _081A0C34 + ldr r1, =0x08610ef0 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] @@ -852101,13 +823309,12 @@ _081A0C1C: adds r1, 0x4 b _081A0C66 .align 2, 0 -_081A0C30: .4byte 0x08610ef0 -_081A0C34: .4byte 0x03005d90 + .pool _081A0C38: cmp r0, 0x2 bne _081A0C54 - ldr r1, _081A0C4C - ldr r0, _081A0C50 + ldr r1, =0x08610ef0 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] @@ -852115,13 +823322,12 @@ _081A0C38: adds r1, 0x8 b _081A0C66 .align 2, 0 -_081A0C4C: .4byte 0x08610ef0 -_081A0C50: .4byte 0x03005d90 + .pool _081A0C54: cmp r0, 0x3 bne _081A0C74 - ldr r1, _081A0C6C - ldr r0, _081A0C70 + ldr r1, =0x08610ef0 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] @@ -852132,25 +823338,23 @@ _081A0C66: ldr r1, [r0] b _081A0C7A .align 2, 0 -_081A0C6C: .4byte 0x08610ef0 -_081A0C70: .4byte 0x03005d90 + .pool _081A0C74: bl script_env_2_enable_and_set_ctx_running b _081A0C8E _081A0C7A: - ldr r0, _081A0C94 + ldr r0, =0x02021fc4 bl ExpandTextCodes movs r0, 0x1 bl get_map_name - ldr r0, _081A0C98 + ldr r0, =sub_81A0A34 + 1 movs r1, 0x1 bl AddTask _081A0C8E: pop {r0} bx r0 .align 2, 0 -_081A0C94: .4byte 0x02021fc4 -_081A0C98: .4byte sub_81A0A34 + 1 + .pool thumb_func_end sub_81A0A70 thumb_func_start sub_81A0C9C @@ -852171,7 +823375,7 @@ sub_81A0C9C: @ 81A0C9C thumb_func_start sub_81A0CC0 sub_81A0CC0: @ 81A0CC0 push {lr} - ldr r0, _081A0CDC + ldr r0, =0x03005d90 ldr r2, [r0] adds r0, r2, 0 adds r0, 0xB1 @@ -852180,12 +823384,11 @@ sub_81A0CC0: @ 81A0CC0 lsrs r0, r1, 28 cmp r0, 0x2 bhi _081A0CE4 - ldr r1, _081A0CE0 + ldr r1, =0x020375f0 movs r0, 0x2 b _081A0D34 .align 2, 0 -_081A0CDC: .4byte 0x03005d90 -_081A0CE0: .4byte 0x020375f0 + .pool _081A0CE4: lsrs r0, r1, 28 cmp r0, 0xB @@ -852210,43 +823413,43 @@ _081A0D08: beq _081A0D24 b _081A0D30 _081A0D0E: - ldr r1, _081A0D14 + ldr r1, =0x020375f0 movs r0, 0x4 b _081A0D34 .align 2, 0 -_081A0D14: .4byte 0x020375f0 + .pool _081A0D18: - ldr r1, _081A0D20 + ldr r1, =0x020375f0 movs r0, 0x3 b _081A0D34 .align 2, 0 -_081A0D20: .4byte 0x020375f0 + .pool _081A0D24: - ldr r1, _081A0D2C + ldr r1, =0x020375f0 movs r0, 0x1 b _081A0D34 .align 2, 0 -_081A0D2C: .4byte 0x020375f0 + .pool _081A0D30: - ldr r1, _081A0D3C + ldr r1, =0x020375f0 movs r0, 0x5 _081A0D34: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_081A0D3C: .4byte 0x020375f0 + .pool thumb_func_end sub_81A0CC0 thumb_func_start sub_81A0D40 sub_81A0D40: @ 81A0D40 push {r4,lr} - ldr r0, _081A0D74 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 beq _081A0D6E - ldr r4, _081A0D78 - ldr r0, _081A0D7C + ldr r4, =0x020375e4 + ldr r0, =0x03005d90 ldr r2, [r0] adds r2, 0xB2 ldrb r3, [r2] @@ -852268,15 +823471,13 @@ _081A0D6E: pop {r0} bx r0 .align 2, 0 -_081A0D74: .4byte 0x020375e2 -_081A0D78: .4byte 0x020375e4 -_081A0D7C: .4byte 0x03005d90 + .pool thumb_func_end sub_81A0D40 thumb_func_start sub_81A0D80 sub_81A0D80: @ 81A0D80 push {lr} - ldr r0, _081A0DB8 + ldr r0, =0x03005d90 ldr r3, [r0] adds r0, r3, 0 adds r0, 0xB1 @@ -852288,7 +823489,7 @@ sub_81A0D80: @ 81A0D80 subs r0, 0x3 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081A0DBC + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 beq _081A0DC0 @@ -852303,8 +823504,7 @@ sub_81A0D80: @ 81A0D80 strb r0, [r2] b _081A0DCE .align 2, 0 -_081A0DB8: .4byte 0x03005d90 -_081A0DBC: .4byte 0x020375e2 + .pool _081A0DC0: lsls r0, r2, 2 adds r0, r3, r0 @@ -852326,12 +823526,12 @@ sub_81A0DD4: @ 81A0DD4 push {r6,r7} movs r6, 0 movs r2, 0 - ldr r1, _081A0E78 + ldr r1, =0x03005d90 ldr r0, [r1] adds r0, 0xB8 ldrb r0, [r0] lsls r0, 30 - ldr r3, _081A0E7C + ldr r3, =0x030062f0 mov r9, r3 cmp r0, 0 beq _081A0E14 @@ -852359,11 +823559,11 @@ _081A0E14: bl malloc_and_clear adds r7, r0, 0 str r7, [r4] - ldr r0, _081A0E80 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x2 bne _081A0E88 - ldr r0, _081A0E78 + ldr r0, =0x03005d90 ldr r5, [r0] adds r6, r5, 0 adds r6, 0xB1 @@ -852379,7 +823579,7 @@ _081A0E3C: adds r0, r2, r0 ldrb r0, [r0] lsrs r4, r0, 4 - ldr r3, _081A0E84 + ldr r3, =0x08610970 lsls r1, r4, 1 adds r5, 0xB0 ldrb r0, [r5] @@ -852404,14 +823604,11 @@ _081A0E3C: adds r0, r3 b _081A0FCA .align 2, 0 -_081A0E78: .4byte 0x03005d90 -_081A0E7C: .4byte 0x030062f0 -_081A0E80: .4byte 0x020375e2 -_081A0E84: .4byte 0x08610970 + .pool _081A0E88: cmp r0, 0x3 bne _081A0F54 - ldr r0, _081A0F4C + ldr r0, =0x03005d90 mov r8, r0 ldr r5, [r0] movs r1, 0xB1 @@ -852466,7 +823663,7 @@ _081A0EC4: asrs r4, r1 movs r0, 0xF ands r4, r0 - ldr r2, _081A0F50 + ldr r2, =0x08610970 lsls r1, r4, 1 adds r0, r5, 0 adds r0, 0xB0 @@ -852510,12 +823707,11 @@ _081A0EC4: strh r0, [r2, 0x6] b _081A0FCE .align 2, 0 -_081A0F4C: .4byte 0x03005d90 -_081A0F50: .4byte 0x08610970 + .pool _081A0F54: cmp r0, 0x4 bne _081A0FCE - ldr r0, _081A0FDC + ldr r0, =0x03005d90 ldr r3, [r0] adds r0, r3, 0 adds r0, 0xB1 @@ -852562,7 +823758,7 @@ _081A0F54: asrs r0, r1 movs r1, 0xF ands r0, r1 - ldr r2, _081A0FE0 + ldr r2, =0x08610970 lsls r0, 1 adds r1, r3, 0 adds r1, 0xB0 @@ -852583,14 +823779,13 @@ _081A0FCE: pop {r0} bx r0 .align 2, 0 -_081A0FDC: .4byte 0x03005d90 -_081A0FE0: .4byte 0x08610970 + .pool thumb_func_end sub_81A0DD4 thumb_func_start sub_81A0FE4 sub_81A0FE4: @ 81A0FE4 push {r4,lr} - ldr r4, _081A0FF8 + ldr r4, =0x030062f0 ldr r0, [r4] bl free movs r0, 0 @@ -852599,14 +823794,14 @@ sub_81A0FE4: @ 81A0FE4 pop {r0} bx r0 .align 2, 0 -_081A0FF8: .4byte 0x030062f0 + .pool thumb_func_end sub_81A0FE4 thumb_func_start sub_81A0FFC sub_81A0FFC: @ 81A0FFC push {r4-r6,lr} sub sp, 0x10 - ldr r0, _081A1014 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 beq _081A1028 @@ -852616,39 +823811,37 @@ sub_81A0FFC: @ 81A0FFC beq _081A101E b _081A11E6 .align 2, 0 -_081A1014: .4byte 0x020375e2 + .pool _081A1018: cmp r0, 0x2 beq _081A1030 b _081A11E6 _081A101E: - ldr r5, _081A1024 + ldr r5, =0x02021cc4 b _081A1032 .align 2, 0 -_081A1024: .4byte 0x02021cc4 + .pool _081A1028: - ldr r5, _081A102C + ldr r5, =0x02021dc4 b _081A1032 .align 2, 0 -_081A102C: .4byte 0x02021dc4 + .pool _081A1030: - ldr r5, _081A1048 + ldr r5, =0x02021ec4 _081A1032: - ldr r0, _081A104C + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0x9 bls _081A103C b _081A11E6 _081A103C: lsls r0, 2 - ldr r1, _081A1050 + ldr r1, =_081A1054 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A1048: .4byte 0x02021ec4 -_081A104C: .4byte 0x020375e4 -_081A1050: .4byte _081A1054 + .pool .align 2, 0 _081A1054: .4byte _081A107C @@ -852662,67 +823855,62 @@ _081A1054: .4byte _081A1140 .4byte _081A1184 _081A107C: - ldr r0, _081A108C + ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0] movs r0, 0xB muls r1, r0 - ldr r0, _081A1090 + ldr r0, =0x083185c8 adds r1, r0 b _081A1174 .align 2, 0 -_081A108C: .4byte 0x030062f0 -_081A1090: .4byte 0x083185c8 + .pool _081A1094: - ldr r0, _081A10A4 + ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0, 0x2] movs r0, 0xB muls r1, r0 - ldr r0, _081A10A8 + ldr r0, =0x083185c8 adds r1, r0 b _081A1174 .align 2, 0 -_081A10A4: .4byte 0x030062f0 -_081A10A8: .4byte 0x083185c8 + .pool _081A10AC: - ldr r0, _081A10BC + ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0] movs r0, 0xB muls r1, r0 - ldr r0, _081A10C0 + ldr r0, =0x083185c8 adds r1, r0 b _081A1174 .align 2, 0 -_081A10BC: .4byte 0x030062f0 -_081A10C0: .4byte 0x083185c8 + .pool _081A10C4: - ldr r0, _081A10D4 + ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0xD muls r1, r0 - ldr r0, _081A10D8 + ldr r0, =0x0831977c adds r1, r0 b _081A1174 .align 2, 0 -_081A10D4: .4byte 0x030062f0 -_081A10D8: .4byte 0x0831977c + .pool _081A10DC: - ldr r0, _081A10EC + ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0, 0x6] movs r0, 0xD muls r1, r0 - ldr r0, _081A10F0 + ldr r0, =0x0831977c adds r1, r0 b _081A1174 .align 2, 0 -_081A10EC: .4byte 0x030062f0 -_081A10F0: .4byte 0x0831977c + .pool _081A10F4: - ldr r0, _081A1114 + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r1, 0 adds r0, 0xB1 @@ -852738,9 +823926,9 @@ _081A10F4: adds r1, r0, 0 b _081A1174 .align 2, 0 -_081A1114: .4byte 0x03005d90 + .pool _081A1118: - ldr r0, _081A113C + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] @@ -852755,9 +823943,9 @@ _081A1118: bl gf_strcpy b _081A11E6 .align 2, 0 -_081A113C: .4byte 0x03005d90 + .pool _081A1140: - ldr r0, _081A1154 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB1 ldrb r1, [r0] @@ -852765,33 +823953,31 @@ _081A1140: ands r0, r1 cmp r0, 0x1 bne _081A115C - ldr r1, _081A1158 + ldr r1, =0x085eaeb1 b _081A1174 .align 2, 0 -_081A1154: .4byte 0x03005d90 -_081A1158: .4byte 0x085eaeb1 + .pool _081A115C: - ldr r1, _081A1160 + ldr r1, =0x085eaeb8 b _081A1174 .align 2, 0 -_081A1160: .4byte 0x085eaeb8 + .pool _081A1164: - ldr r0, _081A117C + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0x82 lsls r1, 1 adds r0, r1 bl sub_81638AC - ldr r1, _081A1180 + ldr r1, =0x02021fc4 _081A1174: adds r0, r5, 0 bl gf_strcpy b _081A11E6 .align 2, 0 -_081A117C: .4byte 0x03005d90 -_081A1180: .4byte 0x02021fc4 + .pool _081A1184: - ldr r0, _081A11BC + ldr r0, =0x03005d90 ldr r3, [r0] adds r1, r3, 0 adds r1, 0xB1 @@ -852819,11 +824005,11 @@ _081A1184: ands r2, r0 b _081A11C2 .align 2, 0 -_081A11BC: .4byte 0x03005d90 + .pool _081A11C0: movs r2, 0 _081A11C2: - ldr r3, _081A11F0 + ldr r3, =0x08610970 lsls r1, r2, 1 ldr r0, [r6] adds r0, 0xB0 @@ -852836,7 +824022,7 @@ _081A11C2: ldrh r1, [r1] movs r0, 0xB muls r1, r0 - ldr r0, _081A11F4 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r5, 0 bl gf_strcpy @@ -852846,15 +824032,14 @@ _081A11E6: pop {r0} bx r0 .align 2, 0 -_081A11F0: .4byte 0x08610970 -_081A11F4: .4byte 0x083185c8 + .pool thumb_func_end sub_81A0FFC thumb_func_start sub_81A11F8 sub_81A11F8: @ 81A11F8 - ldr r0, _081A1210 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _081A1214 + ldr r0, =0x020375e2 ldrb r1, [r0] adds r2, 0xB1 lsls r1, 6 @@ -852865,8 +824050,7 @@ sub_81A11F8: @ 81A11F8 strb r0, [r2] bx lr .align 2, 0 -_081A1210: .4byte 0x03005d90 -_081A1214: .4byte 0x020375e2 + .pool thumb_func_end sub_81A11F8 thumb_func_start sub_81A1218 @@ -852883,7 +824067,7 @@ sub_81A1224: @ 81A1224 mov r7, r9 mov r6, r8 push {r6,r7} - ldr r1, _081A12FC + ldr r1, =0x03005d90 ldr r3, [r1] adds r0, r3, 0 adds r0, 0xB1 @@ -852901,9 +824085,9 @@ _081A1242: adds r0, 0xB8 ldrb r0, [r0] lsls r0, 30 - ldr r1, _081A1300 + ldr r1, =0x020375e2 mov r12, r1 - ldr r1, _081A1304 + ldr r1, =0x020375f0 mov r8, r1 cmp r0, 0 beq _081A127C @@ -852991,9 +824175,7 @@ _081A1296: strh r1, [r0] b _081A1362 .align 2, 0 -_081A12FC: .4byte 0x03005d90 -_081A1300: .4byte 0x020375e2 -_081A1304: .4byte 0x020375f0 + .pool _081A1308: adds r0, r4, 0x1 lsls r0, 24 @@ -853057,7 +824239,7 @@ sub_81A1370: @ 81A1370 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _081A13B4 + ldr r0, =0x03005d90 ldr r1, [r0] movs r2, 0x8A lsls r2, 1 @@ -853087,18 +824269,18 @@ _081A138E: bl memcpy b _081A1422 .align 2, 0 -_081A13B4: .4byte 0x03005d90 + .pool _081A13B8: adds r5, r2, 0 cmp r5, 0x2 ble _081A138E - ldr r0, _081A1430 + ldr r0, =0x0000ffff mov r10, r0 movs r2, 0x1 negs r2, r2 mov r9, r2 movs r5, 0x1 - ldr r7, _081A1434 + ldr r7, =0x03005d90 movs r0, 0x90 lsls r0, 1 mov r8, r0 @@ -853132,7 +824314,7 @@ _081A13FC: mov r5, r9 cmp r5, 0 ble _081A1422 - ldr r0, _081A1434 + ldr r0, =0x03005d90 ldr r1, [r0] lsls r0, r5, 4 add r0, r9 @@ -853150,14 +824332,13 @@ _081A1422: pop {r0} bx r0 .align 2, 0 -_081A1430: .4byte 0x0000ffff -_081A1434: .4byte 0x03005d90 + .pool thumb_func_end sub_81A1370 thumb_func_start sub_81A1438 sub_81A1438: @ 81A1438 push {r4,r5,lr} - ldr r4, _081A1478 + ldr r4, =0x03005d90 ldr r2, [r4] adds r0, r2, 0 adds r0, 0xB0 @@ -853188,7 +824369,7 @@ sub_81A1438: @ 81A1438 ldr r0, [r4] b _081A148C .align 2, 0 -_081A1478: .4byte 0x03005d90 + .pool _081A147C: adds r0, r2, 0x1 lsls r0, 24 @@ -853205,7 +824386,7 @@ _081A148C: cmp r0, 0 bne _081A147C _081A1496: - ldr r4, _081A1500 + ldr r4, =0x03005d90 ldr r0, [r4] adds r0, 0xDD strb r2, [r0] @@ -853246,9 +824427,9 @@ _081A14C2: adds r0, r1, r2 bl gf_strcpy ldr r1, [r5] - ldr r0, _081A1504 + ldr r0, =0x082e9531 ldrb r0, [r0] - ldr r2, _081A1508 + ldr r2, =0x0000011b adds r1, r2 strb r0, [r1] ldr r0, [r5] @@ -853258,16 +824439,14 @@ _081A14C2: pop {r0} bx r0 .align 2, 0 -_081A1500: .4byte 0x03005d90 -_081A1504: .4byte 0x082e9531 -_081A1508: .4byte 0x0000011b + .pool thumb_func_end sub_81A1438 thumb_func_start sub_81A150C sub_81A150C: @ 81A150C push {lr} - ldr r2, _081A1554 - ldr r0, _081A1558 + ldr r2, =0x08610970 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xDC ldrb r0, [r0] @@ -853279,7 +824458,7 @@ sub_81A150C: @ 81A150C adds r0, 0x32 ldrb r2, [r0] movs r1, 0 - ldr r3, _081A155C + ldr r3, =0x085dcedc ldrb r0, [r3] cmp r0, r2 beq _081A1542 @@ -853296,21 +824475,17 @@ _081A1530: _081A1542: cmp r1, 0x1E beq _081A1568 - ldr r0, _081A1560 + ldr r0, =0x085dcf0e adds r0, r1, r0 ldrb r1, [r0] - ldr r0, _081A1564 + ldr r0, =0x00004010 bl var_set b _081A1594 .align 2, 0 -_081A1554: .4byte 0x08610970 -_081A1558: .4byte 0x03005d90 -_081A155C: .4byte 0x085dcedc -_081A1560: .4byte 0x085dcf0e -_081A1564: .4byte 0x00004010 + .pool _081A1568: movs r1, 0 - ldr r3, _081A1598 + ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 beq _081A1584 @@ -853327,25 +824502,23 @@ _081A1572: _081A1584: cmp r1, 0x14 beq _081A1594 - ldr r0, _081A159C + ldr r0, =0x085dcf2c adds r0, r1, r0 ldrb r1, [r0] - ldr r0, _081A15A0 + ldr r0, =0x00004010 bl var_set _081A1594: pop {r0} bx r0 .align 2, 0 -_081A1598: .4byte 0x085dcefa -_081A159C: .4byte 0x085dcf2c -_081A15A0: .4byte 0x00004010 + .pool thumb_func_end sub_81A150C thumb_func_start sub_81A15A4 sub_81A15A4: @ 81A15A4 push {lr} - ldr r2, _081A15E8 - ldr r0, _081A15EC + ldr r2, =0x08610970 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r1, [r0] @@ -853355,7 +824528,7 @@ sub_81A15A4: @ 81A15A4 adds r0, 0x32 ldrb r2, [r0] movs r1, 0 - ldr r3, _081A15F0 + ldr r3, =0x085dcedc ldrb r0, [r3] cmp r0, r2 beq _081A15D6 @@ -853372,21 +824545,17 @@ _081A15C4: _081A15D6: cmp r1, 0x1E beq _081A15FC - ldr r0, _081A15F4 + ldr r0, =0x085dcf0e adds r0, r1, r0 ldrb r1, [r0] - ldr r0, _081A15F8 + ldr r0, =0x00004010 bl var_set b _081A1628 .align 2, 0 -_081A15E8: .4byte 0x08610970 -_081A15EC: .4byte 0x03005d90 -_081A15F0: .4byte 0x085dcedc -_081A15F4: .4byte 0x085dcf0e -_081A15F8: .4byte 0x00004010 + .pool _081A15FC: movs r1, 0 - ldr r3, _081A162C + ldr r3, =0x085dcefa ldrb r0, [r3] cmp r0, r2 beq _081A1618 @@ -853403,38 +824572,36 @@ _081A1606: _081A1618: cmp r1, 0x14 beq _081A1628 - ldr r0, _081A1630 + ldr r0, =0x085dcf2c adds r0, r1, r0 ldrb r1, [r0] - ldr r0, _081A1634 + ldr r0, =0x00004010 bl var_set _081A1628: pop {r0} bx r0 .align 2, 0 -_081A162C: .4byte 0x085dcefa -_081A1630: .4byte 0x085dcf2c -_081A1634: .4byte 0x00004010 + .pool thumb_func_end sub_81A15A4 thumb_func_start sub_81A1638 sub_81A1638: @ 81A1638 - ldr r1, _081A1640 + ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] bx lr .align 2, 0 -_081A1640: .4byte 0x020375e0 + .pool thumb_func_end sub_81A1638 thumb_func_start sub_81A1644 sub_81A1644: @ 81A1644 - ldr r1, _081A164C + ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] bx lr .align 2, 0 -_081A164C: .4byte 0x020375e0 + .pool thumb_func_end sub_81A1644 thumb_func_start sub_81A1650 @@ -853442,19 +824609,18 @@ sub_81A1650: @ 81A1650 push {lr} movs r2, 0x58 muls r2, r0 - ldr r0, _081A166C + ldr r0, =0x08610970 adds r2, r0 subs r0, r1, 0x1 cmp r0, 0x6 bhi _081A16AC lsls r0, 2 - ldr r1, _081A1670 + ldr r1, =_081A1674 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A166C: .4byte 0x08610970 -_081A1670: .4byte _081A1674 + .pool .align 2, 0 _081A1674: .4byte _081A1690 @@ -853496,7 +824662,7 @@ sub_81A16B4: @ 81A16B4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081A16D8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -853513,7 +824679,7 @@ _081A16D4: pop {r0} bx r0 .align 2, 0 -_081A16D8: .4byte 0x030022c0 + .pool thumb_func_end sub_81A16B4 thumb_func_start sub_81A16DC @@ -853521,7 +824687,7 @@ sub_81A16DC: @ 81A16DC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081A1720 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -853532,8 +824698,8 @@ sub_81A16DC: @ 81A16DC cmp r0, 0 beq _081A1718 _081A16F6: - ldr r2, _081A1724 - ldr r1, _081A1728 + ldr r2, =0x030062f4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -853552,21 +824718,19 @@ _081A1718: pop {r0} bx r0 .align 2, 0 -_081A1720: .4byte 0x030022c0 -_081A1724: .4byte 0x030062f4 -_081A1728: .4byte 0x03005e00 + .pool thumb_func_end sub_81A16DC thumb_func_start sub_81A172C sub_81A172C: @ 81A172C push {r4,lr} adds r4, r0, 0 - ldr r0, _081A1754 + ldr r0, =sub_81A16DC + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081A1758 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -853578,15 +824742,14 @@ sub_81A172C: @ 81A172C pop {r0} bx r0 .align 2, 0 -_081A1754: .4byte sub_81A16DC + 1 -_081A1758: .4byte 0x03005e00 + .pool thumb_func_end sub_81A172C thumb_func_start sub_81A175C sub_81A175C: @ 81A175C push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _081A177C + ldr r4, =sub_81A16B4 + 1 adds r0, r4, 0 movs r1, 0x1 bl AddTask @@ -853599,14 +824762,14 @@ sub_81A175C: @ 81A175C pop {r0} bx r0 .align 2, 0 -_081A177C: .4byte sub_81A16B4 + 1 + .pool thumb_func_end sub_81A175C thumb_func_start sub_81A1780 sub_81A1780: @ 81A1780 push {lr} - ldr r1, _081A1798 - ldr r0, _081A179C + ldr r1, =0x08611c18 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -853615,8 +824778,7 @@ sub_81A1780: @ 81A1780 pop {r0} bx r0 .align 2, 0 -_081A1798: .4byte 0x08611c18 -_081A179C: .4byte 0x020375e0 + .pool thumb_func_end sub_81A1780 thumb_func_start sub_81A17A0 @@ -853626,22 +824788,20 @@ sub_81A17A0: @ 81A17A0 lsls r0, 7 movs r1, 0xFF bl var_set - ldr r0, _081A17C4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A17C8 + ldr r1, =0x00000ca8 adds r0, r1 ldrb r0, [r0] cmp r0, 0x4 bhi _081A1822 lsls r0, 2 - ldr r1, _081A17CC + ldr r1, =_081A17D0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A17C4: .4byte 0x03005d90 -_081A17C8: .4byte 0x00000ca8 -_081A17CC: .4byte _081A17D0 + .pool .align 2, 0 _081A17D0: .4byte _081A1822 @@ -853661,22 +824821,21 @@ _081A17EE: bl sub_813A878 movs r0, 0x80 lsls r0, 7 - ldr r1, _081A1808 + ldr r1, =0x03005d90 ldr r1, [r1] - ldr r2, _081A180C + ldr r2, =0x00000ca8 adds r1, r2 ldrb r1, [r1] bl var_set b _081A1822 .align 2, 0 -_081A1808: .4byte 0x03005d90 -_081A180C: .4byte 0x00000ca8 + .pool _081A1810: movs r0, 0x80 lsls r0, 7 - ldr r1, _081A1828 + ldr r1, =0x03005d90 ldr r1, [r1] - ldr r2, _081A182C + ldr r2, =0x00000ca8 adds r1, r2 ldrb r1, [r1] bl var_set @@ -853684,14 +824843,13 @@ _081A1822: pop {r0} bx r0 .align 2, 0 -_081A1828: .4byte 0x03005d90 -_081A182C: .4byte 0x00000ca8 + .pool thumb_func_end sub_81A17A0 thumb_func_start sub_81A1830 sub_81A1830: @ 81A1830 push {r4-r6,lr} - ldr r0, _081A1860 + ldr r0, =0x000040cf bl var_get lsls r0, 24 lsrs r6, r0, 24 @@ -853703,21 +824861,19 @@ sub_81A1830: @ 81A1830 bne _081A184C movs r5, 0x1 _081A184C: - ldr r0, _081A1864 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x7 bls _081A1856 b _081A1956 _081A1856: lsls r0, 2 - ldr r1, _081A1868 + ldr r1, =_081A186C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A1860: .4byte 0x000040cf -_081A1864: .4byte 0x020375e2 -_081A1868: .4byte _081A186C + .pool .align 2, 0 _081A186C: .4byte _081A188C @@ -853729,23 +824885,21 @@ _081A186C: .4byte _081A1918 .4byte _081A1938 _081A188C: - ldr r1, _081A189C - ldr r0, _081A18A0 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _081A18A4 + ldr r2, =0x00000ca8 adds r0, r2 ldrb r0, [r0] strh r0, [r1] b _081A1956 .align 2, 0 -_081A189C: .4byte 0x020375f0 -_081A18A0: .4byte 0x03005d90 -_081A18A4: .4byte 0x00000ca8 + .pool _081A18A8: - ldr r1, _081A18BC - ldr r0, _081A18C0 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _081A18C4 + ldr r2, =0x00000ca9 adds r0, r2 ldrb r0, [r0] lsls r0, 30 @@ -853753,51 +824907,44 @@ _081A18A8: strh r0, [r1] b _081A1956 .align 2, 0 -_081A18BC: .4byte 0x020375f0 -_081A18C0: .4byte 0x03005d90 -_081A18C4: .4byte 0x00000ca9 + .pool _081A18C8: - ldr r1, _081A18D8 - ldr r0, _081A18DC + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _081A18E0 + ldr r2, =0x00000cb2 adds r0, r2 ldrh r0, [r0] strh r0, [r1] b _081A1956 .align 2, 0 -_081A18D8: .4byte 0x020375f0 -_081A18DC: .4byte 0x03005d90 -_081A18E0: .4byte 0x00000cb2 + .pool _081A18E4: - ldr r1, _081A18F4 - ldr r0, _081A18F8 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _081A18FC + ldr r2, =0x00000ca9 adds r0, r2 ldrb r0, [r0] lsls r0, 29 b _081A1926 .align 2, 0 -_081A18F4: .4byte 0x020375f0 -_081A18F8: .4byte 0x03005d90 -_081A18FC: .4byte 0x00000ca9 + .pool _081A1900: - ldr r2, _081A1910 - ldr r1, _081A1914 + ldr r2, =0x020375f0 + ldr r1, =0x0202433a ldrb r0, [r1] strh r0, [r2] movs r0, 0 strb r0, [r1] b _081A1956 .align 2, 0 -_081A1910: .4byte 0x020375f0 -_081A1914: .4byte 0x0202433a + .pool _081A1918: - ldr r1, _081A192C - ldr r0, _081A1930 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _081A1934 + ldr r2, =0x00000ca9 adds r0, r2 ldrb r0, [r0] lsls r0, 28 @@ -853806,17 +824953,15 @@ _081A1926: strh r0, [r1] b _081A1956 .align 2, 0 -_081A192C: .4byte 0x020375f0 -_081A1930: .4byte 0x03005d90 -_081A1934: .4byte 0x00000ca9 + .pool _081A1938: - ldr r4, _081A195C - ldr r0, _081A1960 + ldr r4, =0x020375f0 + ldr r0, =0x03005d90 ldr r2, [r0] movs r0, 0xD0 lsls r0, 4 adds r2, r0 - ldr r3, _081A1964 + ldr r3, =0x08611bfc lsls r0, r5, 1 lsls r1, r6, 2 adds r0, r1 @@ -853830,15 +824975,13 @@ _081A1956: pop {r0} bx r0 .align 2, 0 -_081A195C: .4byte 0x020375f0 -_081A1960: .4byte 0x03005d90 -_081A1964: .4byte 0x08611bfc + .pool thumb_func_end sub_81A1830 thumb_func_start sub_81A1968 sub_81A1968: @ 81A1968 push {r4,r5,lr} - ldr r0, _081A1998 + ldr r0, =0x000040cf bl var_get lsls r0, 24 lsrs r5, r0, 24 @@ -853850,21 +824993,19 @@ sub_81A1968: @ 81A1968 bne _081A1984 movs r4, 0x1 _081A1984: - ldr r0, _081A199C + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x7 bls _081A198E b _081A1AC4 _081A198E: lsls r0, 2 - ldr r1, _081A19A0 + ldr r1, =_081A19A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A1998: .4byte 0x000040cf -_081A199C: .4byte 0x020375e2 -_081A19A0: .4byte _081A19A4 + .pool .align 2, 0 _081A19A4: .4byte _081A19C4 @@ -853876,24 +825017,22 @@ _081A19A4: .4byte _081A1A7C .4byte _081A1AA8 _081A19C4: - ldr r0, _081A19D4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A19D8 + ldr r1, =0x020375e4 ldrh r1, [r1] - ldr r2, _081A19DC + ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] b _081A1AC4 .align 2, 0 -_081A19D4: .4byte 0x03005d90 -_081A19D8: .4byte 0x020375e4 -_081A19DC: .4byte 0x00000ca8 + .pool _081A19E0: - ldr r0, _081A1A00 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _081A1A04 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r1, _081A1A08 + ldr r1, =0x00000ca9 adds r2, r1 movs r1, 0x3 ands r1, r0 @@ -853905,28 +825044,24 @@ _081A19E0: strb r0, [r2] b _081A1AC4 .align 2, 0 -_081A1A00: .4byte 0x03005d90 -_081A1A04: .4byte 0x020375e4 -_081A1A08: .4byte 0x00000ca9 + .pool _081A1A0C: - ldr r0, _081A1A1C + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A1A20 + ldr r1, =0x020375e4 ldrh r1, [r1] - ldr r2, _081A1A24 + ldr r2, =0x00000cb2 adds r0, r2 strh r1, [r0] b _081A1AC4 .align 2, 0 -_081A1A1C: .4byte 0x03005d90 -_081A1A20: .4byte 0x020375e4 -_081A1A24: .4byte 0x00000cb2 + .pool _081A1A28: - ldr r0, _081A1A44 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r0, _081A1A48 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r1, _081A1A4C + ldr r1, =0x00000ca9 adds r3, r1 movs r1, 0x1 ands r1, r0 @@ -853936,14 +825071,12 @@ _081A1A28: negs r0, r0 b _081A1A94 .align 2, 0 -_081A1A44: .4byte 0x03005d90 -_081A1A48: .4byte 0x020375e4 -_081A1A4C: .4byte 0x00000ca9 + .pool _081A1A50: movs r2, 0 - ldr r5, _081A1A70 - ldr r4, _081A1A74 - ldr r3, _081A1A78 + ldr r5, =0x03005d90 + ldr r4, =0x00000caa + ldr r3, =0x0203cef8 _081A1A58: ldr r1, [r5] lsls r0, r2, 1 @@ -853957,15 +825090,13 @@ _081A1A58: ble _081A1A58 b _081A1AC4 .align 2, 0 -_081A1A70: .4byte 0x03005d90 -_081A1A74: .4byte 0x00000caa -_081A1A78: .4byte 0x0203cef8 + .pool _081A1A7C: - ldr r0, _081A1A9C + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r0, _081A1AA0 + ldr r0, =0x020375e4 ldrb r0, [r0] - ldr r2, _081A1AA4 + ldr r2, =0x00000ca9 adds r3, r2 movs r1, 0x1 ands r1, r0 @@ -853979,16 +825110,14 @@ _081A1A94: strb r0, [r3] b _081A1AC4 .align 2, 0 -_081A1A9C: .4byte 0x03005d90 -_081A1AA0: .4byte 0x020375e4 -_081A1AA4: .4byte 0x00000ca9 + .pool _081A1AA8: - ldr r0, _081A1ACC + ldr r0, =0x03005d90 ldr r2, [r0] movs r0, 0xD0 lsls r0, 4 adds r2, r0 - ldr r3, _081A1AD0 + ldr r3, =0x08611bfc lsls r1, r4, 1 lsls r0, r5, 2 adds r1, r0 @@ -854002,8 +825131,7 @@ _081A1AC4: pop {r0} bx r0 .align 2, 0 -_081A1ACC: .4byte 0x03005d90 -_081A1AD0: .4byte 0x08611bfc + .pool thumb_func_end sub_81A1968 thumb_func_start sub_81A1AD4 @@ -854011,13 +825139,13 @@ sub_81A1AD4: @ 81A1AD4 push {r4-r7,lr} bl sub_81B8558 movs r3, 0 - ldr r4, _081A1B0C + ldr r4, =0x020375e2 ldrh r0, [r4] cmp r3, r0 bge _081A1B00 - ldr r7, _081A1B10 - ldr r6, _081A1B14 - ldr r5, _081A1B18 + ldr r7, =0x0203cef8 + ldr r6, =0x03005d90 + ldr r5, =0x00000caa _081A1AEA: adds r2, r3, r7 ldr r0, [r6] @@ -854036,10 +825164,7 @@ _081A1B00: pop {r0} bx r0 .align 2, 0 -_081A1B0C: .4byte 0x020375e2 -_081A1B10: .4byte 0x0203cef8 -_081A1B14: .4byte 0x03005d90 -_081A1B18: .4byte 0x00000caa + .pool thumb_func_end sub_81A1AD4 thumb_func_start sub_81A1B1C @@ -854052,13 +825177,12 @@ sub_81A1B1C: @ 81A1B1C thumb_func_start sub_81A1B28 sub_81A1B28: @ 81A1B28 - ldr r1, _081A1B30 - ldr r0, _081A1B34 + ldr r1, =0x0203bc88 + ldr r0, =0x085d5acc str r0, [r1] bx lr .align 2, 0 -_081A1B30: .4byte 0x0203bc88 -_081A1B34: .4byte 0x085d5acc + .pool thumb_func_end sub_81A1B28 thumb_func_start sub_81A1B38 @@ -854067,10 +825191,10 @@ sub_81A1B38: @ 81A1B38 movs r4, 0 movs r5, 0x64 _081A1B3E: - ldr r0, _081A1B88 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _081A1B8C + ldr r2, =0x00000caa adds r0, r2 adds r1, r0, r1 ldrh r0, [r1] @@ -854079,7 +825203,7 @@ _081A1B3E: lsrs r0, 16 cmp r0, 0x5 bhi _081A1B76 - ldr r0, _081A1B90 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r1] subs r1, 0x1 @@ -854088,7 +825212,7 @@ _081A1B3E: movs r1, 0x8E lsls r1, 2 adds r0, r1 - ldr r2, _081A1B94 + ldr r2, =0x020244ec adds r1, r4, 0 muls r1, r5 adds r1, r2 @@ -854104,16 +825228,13 @@ _081A1B76: pop {r0} bx r0 .align 2, 0 -_081A1B88: .4byte 0x03005d90 -_081A1B8C: .4byte 0x00000caa -_081A1B90: .4byte 0x03005d8c -_081A1B94: .4byte 0x020244ec + .pool thumb_func_end sub_81A1B38 thumb_func_start sub_81A1B98 sub_81A1B98: @ 81A1B98 push {lr} - ldr r0, _081A1BBC + ldr r0, =0x020375e4 ldrh r1, [r0] adds r2, r0, 0 cmp r1, 0x3 @@ -854121,19 +825242,17 @@ sub_81A1B98: @ 81A1B98 movs r0, 0 strh r0, [r2] _081A1BA8: - ldr r0, _081A1BC0 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x7 bhi _081A1C1E lsls r0, 2 - ldr r1, _081A1BC4 + ldr r1, =_081A1BC8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A1BBC: .4byte 0x020375e4 -_081A1BC0: .4byte 0x020375e2 -_081A1BC4: .4byte _081A1BC8 + .pool .align 2, 0 _081A1BC8: .4byte _081A1BE8 @@ -854179,9 +825298,9 @@ _081A1C1E: thumb_func_start sub_81A1C24 sub_81A1C24: @ 81A1C24 push {lr} - ldr r1, _081A1C3C + ldr r1, =0x03005d90 ldr r1, [r1] - ldr r2, _081A1C40 + ldr r2, =0x00000cdc adds r1, r2 ldr r1, [r1] ands r1, r0 @@ -854190,8 +825309,7 @@ sub_81A1C24: @ 81A1C24 movs r0, 0 b _081A1C46 .align 2, 0 -_081A1C3C: .4byte 0x03005d90 -_081A1C40: .4byte 0x00000cdc + .pool _081A1C44: movs r0, 0x1 _081A1C46: @@ -854212,7 +825330,7 @@ sub_81A1C4C: @ 81A1C4C adds r3, r0, 0 lsls r0, r5, 3 adds r5, r0, 0x1 - ldr r0, _081A1C8C + ldr r0, =0x0203ab74 ldrb r0, [r0] lsls r3, 24 lsrs r3, 24 @@ -854231,7 +825349,7 @@ sub_81A1C4C: @ 81A1C4C pop {r0} bx r0 .align 2, 0 -_081A1C8C: .4byte 0x0203ab74 + .pool thumb_func_end sub_81A1C4C thumb_func_start sub_81A1C90 @@ -854239,7 +825357,7 @@ sub_81A1C90: @ 81A1C90 push {r4,lr} sub sp, 0x34 adds r2, r0, 0 - ldr r3, _081A1CD4 + ldr r3, =0x0203ab74 movs r1, 0xAE mov r0, sp adds r0, 0x2F @@ -854271,7 +825389,7 @@ _081A1C9E: pop {r0} bx r0 .align 2, 0 -_081A1CD4: .4byte 0x0203ab74 + .pool thumb_func_end sub_81A1C90 thumb_func_start sub_81A1CD8 @@ -854295,7 +825413,7 @@ sub_81A1CD8: @ 81A1CD8 lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 - ldr r0, _081A1D64 + ldr r0, =0x0203ab74 mov r10, r0 ldrb r0, [r0] str r7, [sp] @@ -854309,18 +825427,18 @@ sub_81A1CD8: @ 81A1CD8 adds r2, r5, 0 adds r3, r4, 0 bl Print - ldr r0, _081A1D68 + ldr r0, =0x0000270f cmp r6, r0 bls _081A1D24 adds r6, r0, 0 _081A1D24: - ldr r0, _081A1D6C + ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _081A1D70 - ldr r1, _081A1D74 + ldr r4, =0x02021fc4 + ldr r1, =0x085ee302 adds r0, r4, 0 bl ExpandTextCodes mov r1, r10 @@ -854343,11 +825461,7 @@ _081A1D24: pop {r0} bx r0 .align 2, 0 -_081A1D64: .4byte 0x0203ab74 -_081A1D68: .4byte 0x0000270f -_081A1D6C: .4byte 0x02021cc4 -_081A1D70: .4byte 0x02021fc4 -_081A1D74: .4byte 0x085ee302 + .pool thumb_func_end sub_81A1CD8 thumb_func_start sub_81A1D78 @@ -854363,7 +825477,7 @@ sub_81A1D78: @ 81A1D78 lsrs r3, 24 lsls r5, 24 lsrs r5, 24 - ldr r4, _081A1DB4 + ldr r4, =0x03005d90 ldr r4, [r4] lsrs r1, 23 lsrs r0, 22 @@ -854373,7 +825487,7 @@ sub_81A1D78: @ 81A1D78 adds r4, r0 adds r4, r1 ldrh r1, [r4] - ldr r0, _081A1DB8 + ldr r0, =0x085ee319 str r5, [sp] bl sub_81A1CD8 add sp, 0x4 @@ -854381,8 +825495,7 @@ sub_81A1D78: @ 81A1D78 pop {r0} bx r0 .align 2, 0 -_081A1DB4: .4byte 0x03005d90 -_081A1DB8: .4byte 0x085ee319 + .pool thumb_func_end sub_81A1D78 thumb_func_start sub_81A1DBC @@ -854390,7 +825503,7 @@ sub_81A1DBC: @ 81A1DBC push {lr} lsls r0, 24 lsls r1, 24 - ldr r2, _081A1DE4 + ldr r2, =0x03005d90 ldr r2, [r2] lsrs r1, 23 lsrs r0, 22 @@ -854400,7 +825513,7 @@ sub_81A1DBC: @ 81A1DBC adds r2, r0 adds r2, r1 ldrh r0, [r2] - ldr r1, _081A1DE8 + ldr r1, =0x0000270f cmp r0, r1 bls _081A1DDE adds r0, r1, 0 @@ -854408,8 +825521,7 @@ _081A1DDE: pop {r1} bx r1 .align 2, 0 -_081A1DE4: .4byte 0x03005d90 -_081A1DE8: .4byte 0x0000270f + .pool thumb_func_end sub_81A1DBC thumb_func_start sub_81A1DEC @@ -854488,7 +825600,7 @@ _081A1E66: lsrs r0, 24 cmp r0, 0x1 bne _081A1E88 - ldr r0, _081A1E84 + ldr r0, =0x085ee311 str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -854496,9 +825608,9 @@ _081A1E66: bl sub_81A1CD8 b _081A1E96 .align 2, 0 -_081A1E84: .4byte 0x085ee311 + .pool _081A1E88: - ldr r0, _081A1EA4 + ldr r0, =0x085ee320 str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -854513,7 +825625,7 @@ _081A1E96: pop {r0} bx r0 .align 2, 0 -_081A1EA4: .4byte 0x085ee320 + .pool thumb_func_end sub_81A1DEC thumb_func_start sub_81A1EA8 @@ -854525,8 +825637,8 @@ sub_81A1EA8: @ 81A1EA8 sub sp, 0xC lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _081A1EE0 - ldr r0, _081A1EE4 + ldr r4, =0x0203ab74 + ldr r0, =0x08611c74 bl Window_AddFromTemplate strb r0, [r4] ldrb r0, [r4] @@ -854537,46 +825649,41 @@ sub_81A1EA8: @ 81A1EA8 bl Window_FastFillPixels cmp r7, 0 bne _081A1EF0 - ldr r0, _081A1EE8 - ldr r1, _081A1EEC + ldr r0, =0x02021fc4 + ldr r1, =0x085ee158 bl ExpandTextCodes b _081A1F28 .align 2, 0 -_081A1EE0: .4byte 0x0203ab74 -_081A1EE4: .4byte 0x08611c74 -_081A1EE8: .4byte 0x02021fc4 -_081A1EEC: .4byte 0x085ee158 + .pool _081A1EF0: cmp r7, 0x1 bne _081A1F08 - ldr r0, _081A1F00 - ldr r1, _081A1F04 + ldr r0, =0x02021fc4 + ldr r1, =0x085ee178 bl ExpandTextCodes b _081A1F28 .align 2, 0 -_081A1F00: .4byte 0x02021fc4 -_081A1F04: .4byte 0x085ee178 + .pool _081A1F08: cmp r7, 0x2 bne _081A1F20 - ldr r0, _081A1F18 - ldr r1, _081A1F1C + ldr r0, =0x02021fc4 + ldr r1, =0x085ee198 bl ExpandTextCodes b _081A1F28 .align 2, 0 -_081A1F18: .4byte 0x02021fc4 -_081A1F1C: .4byte 0x085ee198 + .pool _081A1F20: - ldr r0, _081A1FC4 - ldr r1, _081A1FC8 + ldr r0, =0x02021fc4 + ldr r1, =0x085ee1b7 bl ExpandTextCodes _081A1F28: - ldr r0, _081A1FC4 + ldr r0, =0x02021fc4 movs r1, 0x2 bl sub_81A1C4C - ldr r6, _081A1FCC + ldr r6, =0x0203ab74 ldrb r0, [r6] - ldr r2, _081A1FD0 + ldr r2, =0x085ee2f2 movs r1, 0x31 mov r8, r1 str r1, [sp] @@ -854588,7 +825695,7 @@ _081A1F28: movs r3, 0x10 bl Print ldrb r0, [r6] - ldr r2, _081A1FD4 + ldr r2, =0x085ee2f9 movs r1, 0x61 mov r9, r1 str r1, [sp] @@ -854640,11 +825747,7 @@ _081A1F28: pop {r0} bx r0 .align 2, 0 -_081A1FC4: .4byte 0x02021fc4 -_081A1FC8: .4byte 0x085ee1b7 -_081A1FCC: .4byte 0x0203ab74 -_081A1FD0: .4byte 0x085ee2f2 -_081A1FD4: .4byte 0x085ee2f9 + .pool thumb_func_end sub_81A1EA8 thumb_func_start sub_81A1FD8 @@ -854652,16 +825755,16 @@ sub_81A1FD8: @ 81A1FD8 push {lr} lsls r0, 24 lsls r1, 24 - ldr r2, _081A1FFC + ldr r2, =0x03005d90 ldr r2, [r2] lsrs r1, 23 lsrs r0, 22 adds r1, r0 - ldr r0, _081A2000 + ldr r0, =0x00000d0c adds r2, r0 adds r2, r1 ldrh r0, [r2] - ldr r1, _081A2004 + ldr r1, =0x0000270f cmp r0, r1 bls _081A1FF8 adds r0, r1, 0 @@ -854669,9 +825772,7 @@ _081A1FF8: pop {r1} bx r1 .align 2, 0 -_081A1FFC: .4byte 0x03005d90 -_081A2000: .4byte 0x00000d0c -_081A2004: .4byte 0x0000270f + .pool thumb_func_end sub_81A1FD8 thumb_func_start sub_81A2008 @@ -854695,7 +825796,7 @@ sub_81A2008: @ 81A2008 lsrs r6, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _081A2088 + ldr r0, =0x0203ab74 mov r10, r0 ldrb r0, [r0] str r5, [sp] @@ -854708,12 +825809,12 @@ sub_81A2008: @ 81A2008 movs r1, 0x1 mov r2, r12 bl Print - ldr r0, _081A208C + ldr r0, =0x02021cc4 adds r1, r4, 0 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _081A2090 + ldr r4, =0x02021fc4 adds r0, r4, 0 adds r1, r7, 0 bl ExpandTextCodes @@ -854737,9 +825838,7 @@ sub_81A2008: @ 81A2008 pop {r0} bx r0 .align 2, 0 -_081A2088: .4byte 0x0203ab74 -_081A208C: .4byte 0x02021cc4 -_081A2090: .4byte 0x02021fc4 + .pool thumb_func_end sub_81A2008 thumb_func_start sub_81A2094 @@ -854794,8 +825893,8 @@ _081A20E6: lsrs r0, 24 cmp r0, 0x1 bne _081A210C - ldr r0, _081A2104 - ldr r1, _081A2108 + ldr r0, =0x085ee311 + ldr r1, =0x085ee338 str r7, [sp] str r4, [sp, 0x4] mov r2, r8 @@ -854803,11 +825902,10 @@ _081A20E6: bl sub_81A2008 b _081A211C .align 2, 0 -_081A2104: .4byte 0x085ee311 -_081A2108: .4byte 0x085ee338 + .pool _081A210C: - ldr r0, _081A212C - ldr r1, _081A2130 + ldr r0, =0x085ee320 + ldr r1, =0x085ee338 str r7, [sp] str r4, [sp, 0x4] mov r2, r8 @@ -854822,8 +825920,7 @@ _081A211C: pop {r0} bx r0 .align 2, 0 -_081A212C: .4byte 0x085ee320 -_081A2130: .4byte 0x085ee338 + .pool thumb_func_end sub_81A2094 thumb_func_start sub_81A2134 @@ -854836,8 +825933,8 @@ sub_81A2134: @ 81A2134 sub sp, 0xC lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _081A216C - ldr r0, _081A2170 + ldr r4, =0x0203ab74 + ldr r0, =0x08611c74 bl Window_AddFromTemplate strb r0, [r4] ldrb r0, [r4] @@ -854848,26 +825945,23 @@ sub_81A2134: @ 81A2134 bl Window_FastFillPixels cmp r7, 0 bne _081A217C - ldr r0, _081A2174 - ldr r1, _081A2178 + ldr r0, =0x02021fc4 + ldr r1, =0x085ee1db bl ExpandTextCodes b _081A2184 .align 2, 0 -_081A216C: .4byte 0x0203ab74 -_081A2170: .4byte 0x08611c74 -_081A2174: .4byte 0x02021fc4 -_081A2178: .4byte 0x085ee1db + .pool _081A217C: - ldr r0, _081A2280 - ldr r1, _081A2284 + ldr r0, =0x02021fc4 + ldr r1, =0x085ee1fe bl ExpandTextCodes _081A2184: - ldr r0, _081A2280 + ldr r0, =0x02021fc4 movs r1, 0 bl sub_81A1C4C - ldr r1, _081A2288 + ldr r1, =0x0203ab74 ldrb r0, [r1] - ldr r2, _081A228C + ldr r2, =0x085ee2f2 movs r6, 0x21 str r6, [sp] movs r5, 0xFF @@ -854877,9 +825971,9 @@ _081A2184: movs r1, 0x1 movs r3, 0x8 bl Print - ldr r1, _081A2288 + ldr r1, =0x0203ab74 ldrb r0, [r1] - ldr r2, _081A2290 + ldr r2, =0x085ee2f9 movs r1, 0x61 str r1, [sp] str r5, [sp, 0x4] @@ -854895,10 +825989,10 @@ _081A2184: movs r2, 0x40 movs r3, 0x79 bl sub_81A2094 - ldr r4, _081A2294 + ldr r4, =0x03005d90 ldr r0, [r4] lsls r5, r7, 2 - ldr r1, _081A2298 + ldr r1, =0x00000d14 adds r0, r1 adds r0, r5 ldrh r2, [r0] @@ -854907,16 +826001,16 @@ _081A2184: str r0, [sp] movs r0, 0x31 str r0, [sp, 0x4] - ldr r0, _081A229C - ldr r1, _081A22A0 + ldr r0, =0x085ee319 + ldr r1, =0x085ee338 movs r3, 0x40 bl sub_81A2008 - ldr r1, _081A22A4 + ldr r1, =0x085ee332 mov r10, r1 - ldr r0, _081A22A8 + ldr r0, =0x085ee349 mov r8, r0 ldr r0, [r4] - ldr r1, _081A22AC + ldr r1, =0x00000d1c adds r0, r1 adds r0, r5 ldrh r2, [r0] @@ -854936,7 +826030,7 @@ _081A2184: movs r3, 0x79 bl sub_81A2094 ldr r0, [r4] - ldr r1, _081A22B0 + ldr r1, =0x00000d16 adds r0, r1 adds r0, r5 ldrh r2, [r0] @@ -854944,12 +826038,12 @@ _081A2184: str r0, [sp] movs r0, 0x71 str r0, [sp, 0x4] - ldr r0, _081A229C - ldr r1, _081A22A0 + ldr r0, =0x085ee319 + ldr r1, =0x085ee338 movs r3, 0x40 bl sub_81A2008 ldr r0, [r4] - ldr r1, _081A22B4 + ldr r1, =0x00000d1e adds r0, r1 adds r0, r5 ldrh r2, [r0] @@ -854960,10 +826054,10 @@ _081A2184: mov r1, r8 movs r3, 0x40 bl sub_81A2008 - ldr r1, _081A2288 + ldr r1, =0x0203ab74 ldrb r0, [r1] bl Window_WriteStandardTileMap - ldr r1, _081A2288 + ldr r1, =0x0203ab74 ldrb r0, [r1] movs r1, 0x3 bl Window_CopyToVram @@ -854976,20 +826070,7 @@ _081A2184: pop {r0} bx r0 .align 2, 0 -_081A2280: .4byte 0x02021fc4 -_081A2284: .4byte 0x085ee1fe -_081A2288: .4byte 0x0203ab74 -_081A228C: .4byte 0x085ee2f2 -_081A2290: .4byte 0x085ee2f9 -_081A2294: .4byte 0x03005d90 -_081A2298: .4byte 0x00000d14 -_081A229C: .4byte 0x085ee319 -_081A22A0: .4byte 0x085ee338 -_081A22A4: .4byte 0x085ee332 -_081A22A8: .4byte 0x085ee349 -_081A22AC: .4byte 0x00000d1c -_081A22B0: .4byte 0x00000d16 -_081A22B4: .4byte 0x00000d1e + .pool thumb_func_end sub_81A2134 thumb_func_start sub_81A22B8 @@ -855013,7 +826094,7 @@ sub_81A22B8: @ 81A22B8 lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 - ldr r0, _081A2344 + ldr r0, =0x0203ab74 mov r10, r0 ldrb r0, [r0] str r7, [sp] @@ -855027,18 +826108,18 @@ sub_81A22B8: @ 81A22B8 adds r2, r5, 0 adds r3, r4, 0 bl Print - ldr r0, _081A2348 + ldr r0, =0x0000270f cmp r6, r0 bls _081A2304 adds r6, r0, 0 _081A2304: - ldr r0, _081A234C + ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _081A2350 - ldr r1, _081A2354 + ldr r4, =0x02021fc4 + ldr r1, =0x085ee302 adds r0, r4, 0 bl ExpandTextCodes mov r1, r10 @@ -855061,11 +826142,7 @@ _081A2304: pop {r0} bx r0 .align 2, 0 -_081A2344: .4byte 0x0203ab74 -_081A2348: .4byte 0x0000270f -_081A234C: .4byte 0x02021cc4 -_081A2350: .4byte 0x02021fc4 -_081A2354: .4byte 0x085ee302 + .pool thumb_func_end sub_81A22B8 thumb_func_start sub_81A2358 @@ -855081,7 +826158,7 @@ sub_81A2358: @ 81A2358 lsrs r3, 24 lsls r5, 24 lsrs r5, 24 - ldr r4, _081A2394 + ldr r4, =0x03005d90 ldr r4, [r4] lsrs r1, 23 lsrs r0, 22 @@ -855091,7 +826168,7 @@ sub_81A2358: @ 81A2358 adds r4, r0 adds r4, r1 ldrh r1, [r4] - ldr r0, _081A2398 + ldr r0, =0x085ee319 str r5, [sp] bl sub_81A22B8 add sp, 0x4 @@ -855099,8 +826176,7 @@ sub_81A2358: @ 81A2358 pop {r0} bx r0 .align 2, 0 -_081A2394: .4byte 0x03005d90 -_081A2398: .4byte 0x085ee319 + .pool thumb_func_end sub_81A2358 thumb_func_start sub_81A239C @@ -855108,16 +826184,16 @@ sub_81A239C: @ 81A239C push {lr} lsls r0, 24 lsls r1, 24 - ldr r2, _081A23C0 + ldr r2, =0x03005d90 ldr r2, [r2] lsrs r1, 23 lsrs r0, 22 adds r1, r0 - ldr r0, _081A23C4 + ldr r0, =0x00000dc8 adds r2, r0 adds r2, r1 ldrh r0, [r2] - ldr r1, _081A23C8 + ldr r1, =0x0000270f cmp r0, r1 bls _081A23BC adds r0, r1, 0 @@ -855125,9 +826201,7 @@ _081A23BC: pop {r1} bx r1 .align 2, 0 -_081A23C0: .4byte 0x03005d90 -_081A23C4: .4byte 0x00000dc8 -_081A23C8: .4byte 0x0000270f + .pool thumb_func_end sub_81A239C thumb_func_start sub_81A23CC @@ -855182,7 +826256,7 @@ _081A241E: lsrs r0, 24 cmp r0, 0x1 bne _081A2440 - ldr r0, _081A243C + ldr r0, =0x085ee311 str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -855190,9 +826264,9 @@ _081A241E: bl sub_81A22B8 b _081A244E .align 2, 0 -_081A243C: .4byte 0x085ee311 + .pool _081A2440: - ldr r0, _081A245C + ldr r0, =0x085ee320 str r7, [sp] adds r1, r4, 0 mov r2, r8 @@ -855207,7 +826281,7 @@ _081A244E: pop {r0} bx r0 .align 2, 0 -_081A245C: .4byte 0x085ee320 + .pool thumb_func_end sub_81A23CC thumb_func_start sub_81A2460 @@ -855219,8 +826293,8 @@ sub_81A2460: @ 81A2460 sub sp, 0xC lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _081A2498 - ldr r0, _081A249C + ldr r4, =0x0203ab74 + ldr r0, =0x08611c74 bl Window_AddFromTemplate strb r0, [r4] ldrb r0, [r4] @@ -855231,26 +826305,23 @@ sub_81A2460: @ 81A2460 bl Window_FastFillPixels cmp r7, 0 bne _081A24A8 - ldr r0, _081A24A0 - ldr r1, _081A24A4 + ldr r0, =0x02021fc4 + ldr r1, =0x085ee221 bl ExpandTextCodes b _081A24B0 .align 2, 0 -_081A2498: .4byte 0x0203ab74 -_081A249C: .4byte 0x08611c74 -_081A24A0: .4byte 0x02021fc4 -_081A24A4: .4byte 0x085ee221 + .pool _081A24A8: - ldr r0, _081A254C - ldr r1, _081A2550 + ldr r0, =0x02021fc4 + ldr r1, =0x085ee241 bl ExpandTextCodes _081A24B0: - ldr r0, _081A254C + ldr r0, =0x02021fc4 movs r1, 0x2 bl sub_81A1C4C - ldr r6, _081A2554 + ldr r6, =0x0203ab74 ldrb r0, [r6] - ldr r2, _081A2558 + ldr r2, =0x085ee2f2 movs r1, 0x31 mov r8, r1 str r1, [sp] @@ -855262,7 +826333,7 @@ _081A24B0: movs r3, 0x10 bl Print ldrb r0, [r6] - ldr r2, _081A255C + ldr r2, =0x085ee2f9 movs r1, 0x61 mov r9, r1 str r1, [sp] @@ -855314,25 +826385,21 @@ _081A24B0: pop {r0} bx r0 .align 2, 0 -_081A254C: .4byte 0x02021fc4 -_081A2550: .4byte 0x085ee241 -_081A2554: .4byte 0x0203ab74 -_081A2558: .4byte 0x085ee2f2 -_081A255C: .4byte 0x085ee2f9 + .pool thumb_func_end sub_81A2460 thumb_func_start sub_81A2560 sub_81A2560: @ 81A2560 push {lr} lsls r0, 24 - ldr r1, _081A2580 + ldr r1, =0x03005d90 ldr r1, [r1] lsrs r0, 23 - ldr r2, _081A2584 + ldr r2, =0x00000e04 adds r1, r2 adds r1, r0 ldrh r0, [r1] - ldr r1, _081A2588 + ldr r1, =0x0000270f cmp r0, r1 bls _081A257A adds r0, r1, 0 @@ -855340,9 +826407,7 @@ _081A257A: pop {r1} bx r1 .align 2, 0 -_081A2580: .4byte 0x03005d90 -_081A2584: .4byte 0x00000e04 -_081A2588: .4byte 0x0000270f + .pool thumb_func_end sub_81A2560 thumb_func_start sub_81A258C @@ -855366,7 +826431,7 @@ sub_81A258C: @ 81A258C lsrs r6, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, _081A260C + ldr r0, =0x0203ab74 mov r10, r0 ldrb r0, [r0] str r5, [sp] @@ -855379,12 +826444,12 @@ sub_81A258C: @ 81A258C movs r1, 0x1 mov r2, r12 bl Print - ldr r0, _081A2610 + ldr r0, =0x02021cc4 adds r1, r4, 0 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _081A2614 + ldr r4, =0x02021fc4 adds r0, r4, 0 adds r1, r7, 0 bl ExpandTextCodes @@ -855408,9 +826473,7 @@ sub_81A258C: @ 81A258C pop {r0} bx r0 .align 2, 0 -_081A260C: .4byte 0x0203ab74 -_081A2610: .4byte 0x02021cc4 -_081A2614: .4byte 0x02021fc4 + .pool thumb_func_end sub_81A258C thumb_func_start sub_81A2618 @@ -855447,8 +826510,8 @@ _081A264C: lsrs r0, 24 cmp r0, 0x1 bne _081A2674 - ldr r0, _081A266C - ldr r1, _081A2670 + ldr r0, =0x085ee311 + ldr r1, =0x085ee35b str r5, [sp] str r6, [sp, 0x4] adds r2, r7, 0 @@ -855456,11 +826519,10 @@ _081A264C: bl sub_81A2008 b _081A2684 .align 2, 0 -_081A266C: .4byte 0x085ee311 -_081A2670: .4byte 0x085ee35b + .pool _081A2674: - ldr r0, _081A2690 - ldr r1, _081A2694 + ldr r0, =0x085ee320 + ldr r1, =0x085ee35b str r5, [sp] str r6, [sp, 0x4] adds r2, r7, 0 @@ -855474,8 +826536,7 @@ _081A2684: pop {r0} bx r0 .align 2, 0 -_081A2690: .4byte 0x085ee320 -_081A2694: .4byte 0x085ee35b + .pool thumb_func_end sub_81A2618 thumb_func_start sub_81A2698 @@ -855486,8 +826547,8 @@ sub_81A2698: @ 81A2698 mov r5, r8 push {r5-r7} sub sp, 0xC - ldr r6, _081A27AC - ldr r0, _081A27B0 + ldr r6, =0x0203ab74 + ldr r0, =0x08611c74 bl Window_AddFromTemplate strb r0, [r6] ldrb r0, [r6] @@ -855496,15 +826557,15 @@ sub_81A2698: @ 81A2698 ldrb r0, [r6] movs r1, 0x11 bl Window_FastFillPixels - ldr r4, _081A27B4 - ldr r1, _081A27B8 + ldr r4, =0x02021fc4 + ldr r1, =0x085ee261 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0 bl sub_81A1C4C ldrb r0, [r6] - ldr r2, _081A27BC + ldr r2, =0x085ee2f2 movs r1, 0x21 str r1, [sp] movs r5, 0xFF @@ -855515,7 +826576,7 @@ sub_81A2698: @ 81A2698 movs r3, 0x8 bl Print ldrb r0, [r6] - ldr r2, _081A27C0 + ldr r2, =0x085ee2f9 movs r1, 0x61 str r1, [sp] str r5, [sp, 0x4] @@ -855530,12 +826591,12 @@ sub_81A2698: @ 81A2698 movs r2, 0x72 movs r3, 0x21 bl sub_81A2618 - ldr r0, _081A27C4 + ldr r0, =0x085ee319 mov r10, r0 - ldr r7, _081A27C8 - ldr r5, _081A27CC + ldr r7, =0x085ee35b + ldr r5, =0x03005d90 ldr r0, [r5] - ldr r1, _081A27D0 + ldr r1, =0x00000e08 adds r0, r1 ldrh r2, [r0] movs r4, 0x72 @@ -855546,12 +826607,12 @@ sub_81A2698: @ 81A2698 adds r1, r7, 0 movs r3, 0x40 bl sub_81A258C - ldr r0, _081A27D4 + ldr r0, =0x085ee332 mov r8, r0 - ldr r1, _081A27D8 + ldr r1, =0x085ee36d mov r9, r1 ldr r0, [r5] - ldr r1, _081A27DC + ldr r1, =0x00000e0c adds r0, r1 ldrh r2, [r0] str r4, [sp] @@ -855567,7 +826628,7 @@ sub_81A2698: @ 81A2698 movs r3, 0x61 bl sub_81A2618 ldr r0, [r5] - ldr r1, _081A27E0 + ldr r1, =0x00000e0a adds r0, r1 ldrh r2, [r0] str r4, [sp] @@ -855578,7 +826639,7 @@ sub_81A2698: @ 81A2698 movs r3, 0x40 bl sub_81A258C ldr r0, [r5] - ldr r1, _081A27E4 + ldr r1, =0x00000e0e adds r0, r1 ldrh r2, [r0] str r4, [sp] @@ -855602,21 +826663,7 @@ sub_81A2698: @ 81A2698 pop {r0} bx r0 .align 2, 0 -_081A27AC: .4byte 0x0203ab74 -_081A27B0: .4byte 0x08611c74 -_081A27B4: .4byte 0x02021fc4 -_081A27B8: .4byte 0x085ee261 -_081A27BC: .4byte 0x085ee2f2 -_081A27C0: .4byte 0x085ee2f9 -_081A27C4: .4byte 0x085ee319 -_081A27C8: .4byte 0x085ee35b -_081A27CC: .4byte 0x03005d90 -_081A27D0: .4byte 0x00000e08 -_081A27D4: .4byte 0x085ee332 -_081A27D8: .4byte 0x085ee36d -_081A27DC: .4byte 0x00000e0c -_081A27E0: .4byte 0x00000e0a -_081A27E4: .4byte 0x00000e0e + .pool thumb_func_end sub_81A2698 thumb_func_start sub_81A27E8 @@ -855640,7 +826687,7 @@ sub_81A27E8: @ 81A27E8 lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 - ldr r0, _081A2874 + ldr r0, =0x0203ab74 mov r10, r0 ldrb r0, [r0] str r7, [sp] @@ -855654,18 +826701,18 @@ sub_81A27E8: @ 81A27E8 adds r2, r5, 0 adds r3, r4, 0 bl Print - ldr r0, _081A2878 + ldr r0, =0x0000270f cmp r6, r0 bls _081A2834 adds r6, r0, 0 _081A2834: - ldr r0, _081A287C + ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _081A2880 - ldr r1, _081A2884 + ldr r4, =0x02021fc4 + ldr r1, =0x085ee381 adds r0, r4, 0 bl ExpandTextCodes mov r1, r10 @@ -855688,11 +826735,7 @@ _081A2834: pop {r0} bx r0 .align 2, 0 -_081A2874: .4byte 0x0203ab74 -_081A2878: .4byte 0x0000270f -_081A287C: .4byte 0x02021cc4 -_081A2880: .4byte 0x02021fc4 -_081A2884: .4byte 0x085ee381 + .pool thumb_func_end sub_81A27E8 thumb_func_start sub_81A2888 @@ -855708,14 +826751,14 @@ sub_81A2888: @ 81A2888 lsrs r5, 24 lsls r3, 24 lsrs r3, 24 - ldr r1, _081A28C0 + ldr r1, =0x03005d90 ldr r1, [r1] lsrs r0, 23 - ldr r2, _081A28C4 + ldr r2, =0x00000dde adds r1, r2 adds r1, r0 ldrh r1, [r1] - ldr r0, _081A28C8 + ldr r0, =0x085ee319 str r3, [sp] adds r2, r4, 0 adds r3, r5, 0 @@ -855725,23 +826768,21 @@ sub_81A2888: @ 81A2888 pop {r0} bx r0 .align 2, 0 -_081A28C0: .4byte 0x03005d90 -_081A28C4: .4byte 0x00000dde -_081A28C8: .4byte 0x085ee319 + .pool thumb_func_end sub_81A2888 thumb_func_start sub_81A28CC sub_81A28CC: @ 81A28CC push {lr} lsls r0, 24 - ldr r1, _081A28EC + ldr r1, =0x03005d90 ldr r1, [r1] lsrs r0, 23 - ldr r2, _081A28F0 + ldr r2, =0x00000dda adds r1, r2 adds r1, r0 ldrh r0, [r1] - ldr r1, _081A28F4 + ldr r1, =0x0000270f cmp r0, r1 bls _081A28E6 adds r0, r1, 0 @@ -855749,9 +826790,7 @@ _081A28E6: pop {r1} bx r1 .align 2, 0 -_081A28EC: .4byte 0x03005d90 -_081A28F0: .4byte 0x00000dda -_081A28F4: .4byte 0x0000270f + .pool thumb_func_end sub_81A28CC thumb_func_start sub_81A28F8 @@ -855786,7 +826825,7 @@ _081A2928: lsrs r0, 24 cmp r0, 0x1 bne _081A2948 - ldr r0, _081A2944 + ldr r0, =0x085ee311 str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -855794,9 +826833,9 @@ _081A2928: bl sub_81A27E8 b _081A2956 .align 2, 0 -_081A2944: .4byte 0x085ee311 + .pool _081A2948: - ldr r0, _081A2964 + ldr r0, =0x085ee320 str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -855810,15 +826849,15 @@ _081A2956: pop {r0} bx r0 .align 2, 0 -_081A2964: .4byte 0x085ee320 + .pool thumb_func_end sub_81A28F8 thumb_func_start sub_81A2968 sub_81A2968: @ 81A2968 push {r4-r6,lr} sub sp, 0xC - ldr r5, _081A2A10 - ldr r0, _081A2A14 + ldr r5, =0x0203ab74 + ldr r0, =0x08611c74 bl Window_AddFromTemplate strb r0, [r5] ldrb r0, [r5] @@ -855829,15 +826868,15 @@ sub_81A2968: @ 81A2968 bl Window_FastFillPixels movs r0, 0xA bl sub_81A1C90 - ldr r4, _081A2A18 - ldr r1, _081A2A1C + ldr r4, =0x02021fc4 + ldr r1, =0x085ee27c adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x2 bl sub_81A1C4C ldrb r0, [r5] - ldr r2, _081A2A20 + ldr r2, =0x085ee2f2 movs r1, 0x31 str r1, [sp] movs r6, 0xFF @@ -855848,7 +826887,7 @@ sub_81A2968: @ 81A2968 movs r3, 0x10 bl Print ldrb r0, [r5] - ldr r2, _081A2A24 + ldr r2, =0x085ee2f9 movs r1, 0x61 str r1, [sp] str r6, [sp, 0x4] @@ -855886,12 +826925,7 @@ sub_81A2968: @ 81A2968 pop {r0} bx r0 .align 2, 0 -_081A2A10: .4byte 0x0203ab74 -_081A2A14: .4byte 0x08611c74 -_081A2A18: .4byte 0x02021fc4 -_081A2A1C: .4byte 0x085ee27c -_081A2A20: .4byte 0x085ee2f2 -_081A2A24: .4byte 0x085ee2f9 + .pool thumb_func_end sub_81A2968 thumb_func_start sub_81A2A28 @@ -855922,7 +826956,7 @@ sub_81A2A28: @ 81A2A28 lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 - ldr r0, _081A2AEC + ldr r0, =0x0203ab74 mov r10, r0 ldrb r0, [r0] str r6, [sp] @@ -855935,19 +826969,19 @@ sub_81A2A28: @ 81A2A28 movs r1, 0x1 mov r2, r12 bl Print - ldr r0, _081A2AF0 + ldr r0, =0x0000270f cmp r7, r0 bls _081A2A80 adds r7, r0, 0 _081A2A80: - ldr r5, _081A2AF4 + ldr r5, =0x02021cc4 adds r0, r5, 0 adds r1, r7, 0 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _081A2AF8 - ldr r1, _081A2AFC + ldr r4, =0x02021fc4 + ldr r1, =0x085ee302 adds r0, r4, 0 bl ExpandTextCodes mov r1, r10 @@ -855966,7 +827000,7 @@ _081A2A80: movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r1, _081A2B00 + ldr r1, =0x085ee392 adds r0, r4, 0 bl ExpandTextCodes mov r1, r10 @@ -855989,12 +827023,7 @@ _081A2A80: pop {r0} bx r0 .align 2, 0 -_081A2AEC: .4byte 0x0203ab74 -_081A2AF0: .4byte 0x0000270f -_081A2AF4: .4byte 0x02021cc4 -_081A2AF8: .4byte 0x02021fc4 -_081A2AFC: .4byte 0x085ee302 -_081A2B00: .4byte 0x085ee392 + .pool thumb_func_end sub_81A2A28 thumb_func_start sub_81A2B04 @@ -856016,21 +827045,21 @@ sub_81A2B04: @ 81A2B04 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r2, _081A2B60 + ldr r2, =0x03005d90 ldr r2, [r2] lsrs r1, 23 lsrs r0, 22 adds r1, r0 - ldr r7, _081A2B64 + ldr r7, =0x00000dea adds r0, r2, r7 adds r0, r1 ldrh r0, [r0] mov r8, r0 - ldr r0, _081A2B68 + ldr r0, =0x00000dfa adds r2, r0 adds r2, r1 ldrh r2, [r2] - ldr r0, _081A2B6C + ldr r0, =0x085ee319 str r3, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -856044,10 +827073,7 @@ sub_81A2B04: @ 81A2B04 pop {r0} bx r0 .align 2, 0 -_081A2B60: .4byte 0x03005d90 -_081A2B64: .4byte 0x00000dea -_081A2B68: .4byte 0x00000dfa -_081A2B6C: .4byte 0x085ee319 + .pool thumb_func_end sub_81A2B04 thumb_func_start sub_81A2B70 @@ -856055,16 +827081,16 @@ sub_81A2B70: @ 81A2B70 push {lr} lsls r0, 24 lsls r1, 24 - ldr r2, _081A2B94 + ldr r2, =0x03005d90 ldr r2, [r2] lsrs r1, 23 lsrs r0, 22 adds r1, r0 - ldr r0, _081A2B98 + ldr r0, =0x00000de2 adds r2, r0 adds r2, r1 ldrh r0, [r2] - ldr r1, _081A2B9C + ldr r1, =0x0000270f cmp r0, r1 bls _081A2B90 adds r0, r1, 0 @@ -856072,9 +827098,7 @@ _081A2B90: pop {r1} bx r1 .align 2, 0 -_081A2B94: .4byte 0x03005d90 -_081A2B98: .4byte 0x00000de2 -_081A2B9C: .4byte 0x0000270f + .pool thumb_func_end sub_81A2B70 thumb_func_start sub_81A2BA0 @@ -856082,16 +827106,16 @@ sub_81A2BA0: @ 81A2BA0 push {lr} lsls r0, 24 lsls r1, 24 - ldr r2, _081A2BC4 + ldr r2, =0x03005d90 ldr r2, [r2] lsrs r1, 23 lsrs r0, 22 adds r1, r0 - ldr r0, _081A2BC8 + ldr r0, =0x00000df2 adds r2, r0 adds r2, r1 ldrh r0, [r2] - ldr r1, _081A2BCC + ldr r1, =0x0000270f cmp r0, r1 bls _081A2BC0 adds r0, r1, 0 @@ -856099,9 +827123,7 @@ _081A2BC0: pop {r1} bx r1 .align 2, 0 -_081A2BC4: .4byte 0x03005d90 -_081A2BC8: .4byte 0x00000df2 -_081A2BCC: .4byte 0x0000270f + .pool thumb_func_end sub_81A2BA0 thumb_func_start sub_81A2BD0 @@ -856169,7 +827191,7 @@ _081A2C3E: lsrs r0, 24 cmp r0, 0x1 bne _081A2C68 - ldr r0, _081A2C64 + ldr r0, =0x085ee311 mov r1, r8 str r1, [sp] mov r1, r9 @@ -856182,9 +827204,9 @@ _081A2C3E: bl sub_81A2A28 b _081A2C80 .align 2, 0 -_081A2C64: .4byte 0x085ee311 + .pool _081A2C68: - ldr r0, _081A2C90 + ldr r0, =0x085ee320 mov r1, r8 str r1, [sp] mov r1, r9 @@ -856205,7 +827227,7 @@ _081A2C80: pop {r0} bx r0 .align 2, 0 -_081A2C90: .4byte 0x085ee320 + .pool thumb_func_end sub_81A2BD0 thumb_func_start sub_81A2C94 @@ -856216,8 +827238,8 @@ sub_81A2C94: @ 81A2C94 sub sp, 0xC lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _081A2CC8 - ldr r0, _081A2CCC + ldr r4, =0x0203ab74 + ldr r0, =0x08611c74 bl Window_AddFromTemplate strb r0, [r4] ldrb r0, [r4] @@ -856228,27 +827250,24 @@ sub_81A2C94: @ 81A2C94 bl Window_FastFillPixels cmp r7, 0 bne _081A2CD8 - ldr r0, _081A2CD0 - ldr r1, _081A2CD4 + ldr r0, =0x02021fc4 + ldr r1, =0x085ee298 bl ExpandTextCodes b _081A2CE0 .align 2, 0 -_081A2CC8: .4byte 0x0203ab74 -_081A2CCC: .4byte 0x08611c74 -_081A2CD0: .4byte 0x02021fc4 -_081A2CD4: .4byte 0x085ee298 + .pool _081A2CD8: - ldr r0, _081A2D9C - ldr r1, _081A2DA0 + ldr r0, =0x02021fc4 + ldr r1, =0x085ee2b8 bl ExpandTextCodes _081A2CE0: - ldr r0, _081A2D9C + ldr r0, =0x02021fc4 movs r1, 0 bl sub_81A1C4C - ldr r0, _081A2DA4 + ldr r0, =0x0203ab74 mov r8, r0 ldrb r0, [r0] - ldr r2, _081A2DA8 + ldr r2, =0x085ee2f2 movs r6, 0x21 str r6, [sp] movs r5, 0xFF @@ -856260,7 +827279,7 @@ _081A2CE0: bl Print mov r1, r8 ldrb r0, [r1] - ldr r2, _081A2DAC + ldr r2, =0x085ee326 str r6, [sp] str r5, [sp, 0x4] str r4, [sp, 0x8] @@ -856269,7 +827288,7 @@ _081A2CE0: bl Print mov r1, r8 ldrb r0, [r1] - ldr r2, _081A2DB0 + ldr r2, =0x085ee2f9 movs r1, 0x61 str r1, [sp] str r5, [sp, 0x4] @@ -856326,12 +827345,7 @@ _081A2CE0: pop {r0} bx r0 .align 2, 0 -_081A2D9C: .4byte 0x02021fc4 -_081A2DA0: .4byte 0x085ee2b8 -_081A2DA4: .4byte 0x0203ab74 -_081A2DA8: .4byte 0x085ee2f2 -_081A2DAC: .4byte 0x085ee326 -_081A2DB0: .4byte 0x085ee2f9 + .pool thumb_func_end sub_81A2C94 thumb_func_start sub_81A2DB4 @@ -856355,7 +827369,7 @@ sub_81A2DB4: @ 81A2DB4 lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 - ldr r0, _081A2E40 + ldr r0, =0x0203ab74 mov r10, r0 ldrb r0, [r0] str r7, [sp] @@ -856369,18 +827383,18 @@ sub_81A2DB4: @ 81A2DB4 adds r2, r5, 0 adds r3, r4, 0 bl Print - ldr r0, _081A2E44 + ldr r0, =0x0000270f cmp r6, r0 bls _081A2E00 adds r6, r0, 0 _081A2E00: - ldr r0, _081A2E48 + ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r4, _081A2E4C - ldr r1, _081A2E50 + ldr r4, =0x02021fc4 + ldr r1, =0x085ee39c adds r0, r4, 0 bl ExpandTextCodes mov r1, r10 @@ -856403,11 +827417,7 @@ _081A2E00: pop {r0} bx r0 .align 2, 0 -_081A2E40: .4byte 0x0203ab74 -_081A2E44: .4byte 0x0000270f -_081A2E48: .4byte 0x02021cc4 -_081A2E4C: .4byte 0x02021fc4 -_081A2E50: .4byte 0x085ee39c + .pool thumb_func_end sub_81A2DB4 thumb_func_start sub_81A2E54 @@ -856423,14 +827433,14 @@ sub_81A2E54: @ 81A2E54 lsrs r5, 24 lsls r3, 24 lsrs r3, 24 - ldr r1, _081A2E8C + ldr r1, =0x03005d90 ldr r1, [r1] lsrs r0, 23 - ldr r2, _081A2E90 + ldr r2, =0x00000e1e adds r1, r2 adds r1, r0 ldrh r1, [r1] - ldr r0, _081A2E94 + ldr r0, =0x085ee319 str r3, [sp] adds r2, r4, 0 adds r3, r5, 0 @@ -856440,23 +827450,21 @@ sub_81A2E54: @ 81A2E54 pop {r0} bx r0 .align 2, 0 -_081A2E8C: .4byte 0x03005d90 -_081A2E90: .4byte 0x00000e1e -_081A2E94: .4byte 0x085ee319 + .pool thumb_func_end sub_81A2E54 thumb_func_start sub_81A2E98 sub_81A2E98: @ 81A2E98 push {lr} lsls r0, 24 - ldr r1, _081A2EB8 + ldr r1, =0x03005d90 ldr r1, [r1] lsrs r0, 23 - ldr r2, _081A2EBC + ldr r2, =0x00000e1a adds r1, r2 adds r1, r0 ldrh r0, [r1] - ldr r1, _081A2EC0 + ldr r1, =0x0000270f cmp r0, r1 bls _081A2EB2 adds r0, r1, 0 @@ -856464,9 +827472,7 @@ _081A2EB2: pop {r1} bx r1 .align 2, 0 -_081A2EB8: .4byte 0x03005d90 -_081A2EBC: .4byte 0x00000e1a -_081A2EC0: .4byte 0x0000270f + .pool thumb_func_end sub_81A2E98 thumb_func_start sub_81A2EC4 @@ -856503,7 +827509,7 @@ _081A2EF8: lsrs r0, 24 cmp r0, 0x1 bne _081A2F18 - ldr r0, _081A2F14 + ldr r0, =0x085ee311 str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -856511,9 +827517,9 @@ _081A2EF8: bl sub_81A2DB4 b _081A2F26 .align 2, 0 -_081A2F14: .4byte 0x085ee311 + .pool _081A2F18: - ldr r0, _081A2F34 + ldr r0, =0x085ee320 str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 @@ -856527,15 +827533,15 @@ _081A2F26: pop {r0} bx r0 .align 2, 0 -_081A2F34: .4byte 0x085ee320 + .pool thumb_func_end sub_81A2EC4 thumb_func_start sub_81A2F38 sub_81A2F38: @ 81A2F38 push {r4-r6,lr} sub sp, 0xC - ldr r5, _081A2FE0 - ldr r0, _081A2FE4 + ldr r5, =0x0203ab74 + ldr r0, =0x08611c74 bl Window_AddFromTemplate strb r0, [r5] ldrb r0, [r5] @@ -856544,15 +827550,15 @@ sub_81A2F38: @ 81A2F38 ldrb r0, [r5] movs r1, 0x11 bl Window_FastFillPixels - ldr r4, _081A2FE8 - ldr r1, _081A2FEC + ldr r4, =0x02021fc4 + ldr r1, =0x085ee2d8 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x2 bl sub_81A1C4C ldrb r0, [r5] - ldr r2, _081A2FF0 + ldr r2, =0x085ee2f2 movs r1, 0x31 str r1, [sp] movs r6, 0xFF @@ -856563,7 +827569,7 @@ sub_81A2F38: @ 81A2F38 movs r3, 0x8 bl Print ldrb r0, [r5] - ldr r2, _081A2FF4 + ldr r2, =0x085ee2f9 movs r1, 0x61 str r1, [sp] str r6, [sp, 0x4] @@ -856603,12 +827609,7 @@ sub_81A2F38: @ 81A2F38 pop {r0} bx r0 .align 2, 0 -_081A2FE0: .4byte 0x0203ab74 -_081A2FE4: .4byte 0x08611c74 -_081A2FE8: .4byte 0x02021fc4 -_081A2FEC: .4byte 0x085ee2d8 -_081A2FF0: .4byte 0x085ee2f2 -_081A2FF4: .4byte 0x085ee2f9 + .pool thumb_func_end sub_81A2F38 thumb_func_start sub_81A2FF8 @@ -856618,8 +827619,8 @@ sub_81A2FF8: @ 81A2FF8 mov r6, r8 push {r6,r7} sub sp, 0xC - ldr r4, _081A31C0 - ldr r0, _081A31C4 + ldr r4, =0x0203ab74 + ldr r0, =0x08611c7c bl Window_AddFromTemplate strb r0, [r4] ldrb r0, [r4] @@ -856628,9 +827629,9 @@ sub_81A2FF8: @ 81A2FF8 ldrb r0, [r4] movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _081A31C8 + ldr r0, =0x02021fc4 mov r9, r0 - ldr r1, _081A31CC + ldr r1, =0x085edf86 bl ExpandTextCodes movs r0, 0x1 mov r1, r9 @@ -856648,7 +827649,7 @@ sub_81A2FF8: @ 81A2FF8 str r5, [sp, 0x8] mov r2, r9 bl Print - ldr r7, _081A31D0 + ldr r7, =0x085edfa0 movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -856666,7 +827667,7 @@ sub_81A2FF8: @ 81A2FF8 movs r1, 0x1 adds r2, r7, 0 bl Print - ldr r7, _081A31D4 + ldr r7, =0x085edfa4 movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -856683,7 +827684,7 @@ sub_81A2FF8: @ 81A2FF8 movs r1, 0x1 adds r2, r7, 0 bl Print - ldr r7, _081A31D8 + ldr r7, =0x085edfa8 movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -856700,7 +827701,7 @@ sub_81A2FF8: @ 81A2FF8 movs r1, 0x1 adds r2, r7, 0 bl Print - ldr r7, _081A31DC + ldr r7, =0x085edfac movs r0, 0x1 adds r1, r7, 0 movs r2, 0x26 @@ -856718,7 +827719,7 @@ sub_81A2FF8: @ 81A2FF8 adds r2, r7, 0 bl Print ldrb r0, [r4] - ldr r2, _081A31E0 + ldr r2, =0x085eb0e8 movs r1, 0x29 str r1, [sp] str r6, [sp, 0x4] @@ -856727,7 +827728,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl Print ldrb r0, [r4] - ldr r2, _081A31E4 + ldr r2, =0x085eb0ed movs r1, 0x39 str r1, [sp] str r6, [sp, 0x4] @@ -856736,7 +827737,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl Print ldrb r0, [r4] - ldr r2, _081A31E8 + ldr r2, =0x085eb0f4 movs r1, 0x49 str r1, [sp] str r6, [sp, 0x4] @@ -856745,7 +827746,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl Print ldrb r0, [r4] - ldr r2, _081A31EC + ldr r2, =0x085eb0f9 movs r1, 0x59 str r1, [sp] str r6, [sp, 0x4] @@ -856754,7 +827755,7 @@ sub_81A2FF8: @ 81A2FF8 movs r3, 0x6 bl Print ldrb r0, [r4] - ldr r2, _081A31F0 + ldr r2, =0x085eb0ff movs r1, 0x69 str r1, [sp] str r6, [sp, 0x4] @@ -856774,9 +827775,9 @@ _081A314A: lsrs r7, r0, 24 lsls r4, r1, 3 _081A315C: - ldr r0, _081A31F4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A31F8 + ldr r1, =0x00000624 adds r0, r1 adds r0, r4 ldrh r1, [r0] @@ -856784,7 +827785,7 @@ _081A315C: movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r6, _081A31C0 + ldr r6, =0x0203ab74 ldrb r0, [r6] movs r1, 0x26 adds r3, r5, 0 @@ -856820,21 +827821,7 @@ _081A315C: pop {r0} bx r0 .align 2, 0 -_081A31C0: .4byte 0x0203ab74 -_081A31C4: .4byte 0x08611c7c -_081A31C8: .4byte 0x02021fc4 -_081A31CC: .4byte 0x085edf86 -_081A31D0: .4byte 0x085edfa0 -_081A31D4: .4byte 0x085edfa4 -_081A31D8: .4byte 0x085edfa8 -_081A31DC: .4byte 0x085edfac -_081A31E0: .4byte 0x085eb0e8 -_081A31E4: .4byte 0x085eb0ed -_081A31E8: .4byte 0x085eb0f4 -_081A31EC: .4byte 0x085eb0f9 -_081A31F0: .4byte 0x085eb0ff -_081A31F4: .4byte 0x03005d90 -_081A31F8: .4byte 0x00000624 + .pool thumb_func_end sub_81A2FF8 thumb_func_start sub_81A31FC @@ -856845,18 +827832,18 @@ sub_81A31FC: @ 81A31FC mov r5, r8 push {r5-r7} sub sp, 0x24 - ldr r0, _081A323C + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A3240 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r7, r0, 30 - ldr r0, _081A3244 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _081A3248 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 @@ -856866,16 +827853,12 @@ sub_81A31FC: @ 81A31FC b _081A35CE _081A3232: lsls r0, r4, 2 - ldr r1, _081A324C + ldr r1, =_081A3250 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A323C: .4byte 0x03005d90 -_081A3240: .4byte 0x00000ca9 -_081A3244: .4byte 0x000040cf -_081A3248: .4byte 0x000040ce -_081A324C: .4byte _081A3250 + .pool .align 2, 0 _081A3250: .4byte _081A326C @@ -856886,7 +827869,7 @@ _081A3250: .4byte _081A354C .4byte _081A3594 _081A326C: - ldr r2, _081A3324 + ldr r2, =0x03005d90 mov r9, r2 ldr r0, [r2] lsls r3, r7, 1 @@ -856913,7 +827896,7 @@ _081A3298: mov r3, r8 cmp r3, 0x3 bne _081A32F2 - ldr r6, _081A3328 + ldr r6, =0x02024474 adds r6, 0x25 ldrb r0, [r6] movs r4, 0x1 @@ -856921,14 +827904,14 @@ _081A3298: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r5, _081A332C + ldr r5, =0x020229f0 adds r1, r5 mov r0, sp bl gf_strcpy mov r0, sp bl sub_8009370 lsls r1, r7, 3 - ldr r0, _081A3330 + ldr r0, =0x00000ee1 adds r1, r0 mov r2, r9 ldr r0, [r2] @@ -856944,7 +827927,7 @@ _081A3298: adds r0, r5 ldr r0, [r0] lsls r2, r7, 2 - ldr r1, _081A3334 + ldr r1, =0x00000ef1 adds r2, r1 mov r3, r9 ldr r1, [r3] @@ -856978,11 +827961,7 @@ _081A3314: beq _081A3344 b _081A35CE .align 2, 0 -_081A3324: .4byte 0x03005d90 -_081A3328: .4byte 0x02024474 -_081A332C: .4byte 0x020229f0 -_081A3330: .4byte 0x00000ee1 -_081A3334: .4byte 0x00000ef1 + .pool _081A3338: mov r7, r8 cmp r7, 0x2 @@ -857041,16 +828020,16 @@ _081A338E: bl sub_80EE8C8 b _081A35CE _081A33A8: - ldr r6, _081A33F8 + ldr r6, =0x03005d90 ldr r0, [r6] lsls r7, 1 mov r2, r8 lsls r1, r2, 2 adds r4, r7, r1 - ldr r5, _081A33FC + ldr r5, =0x00000d0c adds r1, r0, r5 adds r1, r4 - ldr r3, _081A3400 + ldr r3, =0x00000d14 adds r0, r3 adds r0, r4 ldrh r2, [r1] @@ -857082,9 +828061,7 @@ _081A33E0: bl sub_80EE8C8 b _081A35CE .align 2, 0 -_081A33F8: .4byte 0x03005d90 -_081A33FC: .4byte 0x00000d0c -_081A3400: .4byte 0x00000d14 + .pool _081A3404: ldr r0, [r6] adds r0, r5 @@ -857094,13 +828071,13 @@ _081A3404: bl sub_80EE8C8 b _081A35CE _081A3414: - ldr r6, _081A3464 + ldr r6, =0x03005d90 ldr r0, [r6] lsls r7, 1 mov r2, r8 lsls r1, r2, 2 adds r4, r7, r1 - ldr r5, _081A3468 + ldr r5, =0x00000dc8 adds r1, r0, r5 adds r1, r4 movs r3, 0xDD @@ -857136,8 +828113,7 @@ _081A344E: bl sub_80EE8C8 b _081A35CE .align 2, 0 -_081A3464: .4byte 0x03005d90 -_081A3468: .4byte 0x00000dc8 + .pool _081A346C: ldr r0, [r6] adds r0, r5 @@ -857147,13 +828123,13 @@ _081A346C: bl sub_80EE8C8 b _081A35CE _081A347C: - ldr r6, _081A34C0 + ldr r6, =0x03005d90 ldr r1, [r6] lsls r4, r7, 1 - ldr r5, _081A34C4 + ldr r5, =0x00000dda adds r0, r1, r5 adds r0, r4 - ldr r2, _081A34C8 + ldr r2, =0x00000dde adds r1, r2 adds r1, r4 ldrh r2, [r0] @@ -857182,11 +828158,9 @@ _081A34AE: bl sub_80EE8C8 b _081A35CE .align 2, 0 -_081A34C0: .4byte 0x03005d90 -_081A34C4: .4byte 0x00000dda -_081A34C8: .4byte 0x00000dde + .pool _081A34CC: - ldr r6, _081A3528 + ldr r6, =0x03005d90 ldr r2, [r6] lsls r7, 1 mov r9, r7 @@ -857194,10 +828168,10 @@ _081A34CC: lsls r0, r7, 2 mov r1, r9 adds r4, r1, r0 - ldr r5, _081A352C + ldr r5, =0x00000de2 adds r0, r2, r5 adds r3, r0, r4 - ldr r7, _081A3530 + ldr r7, =0x00000dea adds r0, r2, r7 adds r0, r4 ldrh r1, [r3] @@ -857205,10 +828179,10 @@ _081A34CC: cmp r1, r7 bls _081A35CE strh r1, [r0] - ldr r0, _081A3534 + ldr r0, =0x00000dfa adds r1, r2, r0 adds r1, r4 - ldr r7, _081A3538 + ldr r7, =0x00000df2 adds r0, r2, r7 adds r0, r4 ldrh r0, [r0] @@ -857231,11 +828205,7 @@ _081A34CC: bl sub_80EE8C8 b _081A35CE .align 2, 0 -_081A3528: .4byte 0x03005d90 -_081A352C: .4byte 0x00000de2 -_081A3530: .4byte 0x00000dea -_081A3534: .4byte 0x00000dfa -_081A3538: .4byte 0x00000df2 + .pool _081A353C: ldr r0, [r6] adds r0, r5 @@ -857245,13 +828215,13 @@ _081A353C: bl sub_80EE8C8 b _081A35CE _081A354C: - ldr r6, _081A3588 + ldr r6, =0x03005d90 ldr r1, [r6] lsls r4, r7, 1 - ldr r5, _081A358C + ldr r5, =0x00000e04 adds r0, r1, r5 adds r0, r4 - ldr r2, _081A3590 + ldr r2, =0x00000e08 adds r1, r2 adds r1, r4 ldrh r2, [r0] @@ -857274,17 +828244,15 @@ _081A354C: bl sub_80EE8C8 b _081A35CE .align 2, 0 -_081A3588: .4byte 0x03005d90 -_081A358C: .4byte 0x00000e04 -_081A3590: .4byte 0x00000e08 + .pool _081A3594: - ldr r6, _081A35E0 + ldr r6, =0x03005d90 ldr r1, [r6] lsls r4, r7, 1 - ldr r5, _081A35E4 + ldr r5, =0x00000e1a adds r0, r1, r5 adds r0, r4 - ldr r7, _081A35E8 + ldr r7, =0x00000e1e adds r1, r7 adds r1, r4 ldrh r2, [r0] @@ -857315,17 +828283,15 @@ _081A35CE: pop {r0} bx r0 .align 2, 0 -_081A35E0: .4byte 0x03005d90 -_081A35E4: .4byte 0x00000e1a -_081A35E8: .4byte 0x00000e1e + .pool thumb_func_end sub_81A31FC thumb_func_start sub_81A35EC sub_81A35EC: @ 81A35EC push {r4,lr} - ldr r0, _081A3608 + ldr r0, =0x000040cf bl var_get - ldr r4, _081A360C + ldr r4, =0x020375f0 bl sub_81A3610 lsls r0, 24 lsrs r0, 24 @@ -857334,8 +828300,7 @@ sub_81A35EC: @ 81A35EC pop {r0} bx r0 .align 2, 0 -_081A3608: .4byte 0x000040cf -_081A360C: .4byte 0x020375f0 + .pool thumb_func_end sub_81A35EC thumb_func_start sub_81A3610 @@ -857346,18 +828311,18 @@ sub_81A3610: @ 81A3610 push {r6,r7} movs r0, 0 mov r8, r0 - ldr r0, _081A3650 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _081A3654 + ldr r0, =0x000040ce bl var_get adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 bl sub_81A39C4 lsls r0, 16 - ldr r1, _081A3658 + ldr r1, =0x08611550 mov r9, r1 lsls r7, r6, 2 adds r1, 0x3 @@ -857370,9 +828335,7 @@ sub_81A3610: @ 81A3610 movs r0, 0 b _081A36C2 .align 2, 0 -_081A3650: .4byte 0x000040cf -_081A3654: .4byte 0x000040ce -_081A3658: .4byte 0x08611550 + .pool _081A365C: lsls r0, r6, 24 lsrs r0, 24 @@ -857392,7 +828355,7 @@ _081A365C: mov r8, r1 b _081A36BC _081A3680: - ldr r1, _081A3690 + ldr r1, =0x08611550 lsls r2, r6, 2 adds r0, r2, r1 ldrb r0, [r0] @@ -857401,7 +828364,7 @@ _081A3680: movs r0, 0x3 b _081A36BA .align 2, 0 -_081A3690: .4byte 0x08611550 + .pool _081A3694: adds r0, r1, 0x1 adds r0, r2, r0 @@ -857463,21 +828426,20 @@ _081A36F2: lsls r0, 1 cmp r3, r0 bne _081A370C - ldr r0, _081A3704 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A3708 + ldr r1, =0x00000bfc b _081A38C4 .align 2, 0 -_081A3704: .4byte 0x03005d90 -_081A3708: .4byte 0x00000bfc + .pool _081A370C: - ldr r0, _081A372C + ldr r0, =0x000003fe cmp r3, r0 beq _081A3786 - ldr r0, _081A3730 + ldr r0, =0x0000012b cmp r3, r0 bhi _081A3738 - ldr r2, _081A3734 + ldr r2, =0x0203bc88 movs r0, 0x34 adds r1, r3, 0 muls r1, r0 @@ -857487,24 +828449,20 @@ _081A370C: bl sub_81638AC b _081A38F8 .align 2, 0 -_081A372C: .4byte 0x000003fe -_081A3730: .4byte 0x0000012b -_081A3734: .4byte 0x0203bc88 + .pool _081A3738: - ldr r0, _081A374C + ldr r0, =0x0000018f cmp r3, r0 bhi _081A3758 - ldr r1, _081A3750 + ldr r1, =0x03005d90 movs r0, 0xEC muls r0, r3 ldr r1, [r1] adds r0, r1 - ldr r1, _081A3754 + ldr r1, =0xfffef2b8 b _081A38C4 .align 2, 0 -_081A374C: .4byte 0x0000018f -_081A3750: .4byte 0x03005d90 -_081A3754: .4byte 0xfffef2b8 + .pool _081A3758: adds r0, r3, 0 adds r0, 0x70 @@ -857517,15 +828475,14 @@ _081A3766: lsls r0, 1 cmp r3, r0 bne _081A3780 - ldr r0, _081A3778 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A377C + ldr r1, =0x00000c08 b _081A38C4 .align 2, 0 -_081A3778: .4byte 0x03005d90 -_081A377C: .4byte 0x00000c08 + .pool _081A3780: - ldr r0, _081A3790 + ldr r0, =0x000003fe cmp r3, r0 bne _081A3794 _081A3786: @@ -857533,12 +828490,12 @@ _081A3786: bl sub_81A51A8 b _081A38F8 .align 2, 0 -_081A3790: .4byte 0x000003fe + .pool _081A3794: - ldr r0, _081A37B0 + ldr r0, =0x0000012b cmp r3, r0 bhi _081A37B8 - ldr r2, _081A37B4 + ldr r2, =0x0203bc88 movs r0, 0x34 adds r1, r3, 0 muls r1, r0 @@ -857548,77 +828505,70 @@ _081A3794: bl sub_81638AC b _081A38F8 .align 2, 0 -_081A37B0: .4byte 0x0000012b -_081A37B4: .4byte 0x0203bc88 + .pool _081A37B8: - ldr r0, _081A37DC + ldr r0, =0x0000018f cmp r3, r0 bhi _081A37EC - ldr r0, _081A37E0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 bne _081A387C - ldr r1, _081A37E4 + ldr r1, =0x03005d90 movs r0, 0xEC muls r0, r3 ldr r1, [r1] adds r0, r1 - ldr r1, _081A37E8 + ldr r1, =0xfffef2c4 b _081A38C4 .align 2, 0 -_081A37DC: .4byte 0x0000018f -_081A37E0: .4byte 0x02022fec -_081A37E4: .4byte 0x03005d90 -_081A37E8: .4byte 0xfffef2c4 + .pool _081A37EC: - ldr r0, _081A380C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 ands r0, r1 cmp r0, 0 bne _081A387C - ldr r1, _081A3810 + ldr r1, =0x03005d90 lsls r0, r3, 4 adds r0, r3 lsls r0, 2 ldr r1, [r1] adds r0, r1 - ldr r1, _081A3814 + ldr r1, =0xffff96c4 b _081A38C4 .align 2, 0 -_081A380C: .4byte 0x02022fec -_081A3810: .4byte 0x03005d90 -_081A3814: .4byte 0xffff96c4 + .pool _081A3818: movs r0, 0xFA lsls r0, 1 cmp r3, r0 bne _081A3830 - ldr r0, _081A3828 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A382C + ldr r1, =0x00000c14 b _081A38C4 .align 2, 0 -_081A3828: .4byte 0x03005d90 -_081A382C: .4byte 0x00000c14 + .pool _081A3830: - ldr r0, _081A3840 + ldr r0, =0x000003fe cmp r3, r0 bne _081A3844 movs r0, 0x1 bl sub_81A51A8 b _081A38F8 .align 2, 0 -_081A3840: .4byte 0x000003fe + .pool _081A3844: - ldr r0, _081A3860 + ldr r0, =0x0000012b cmp r3, r0 bhi _081A3868 - ldr r2, _081A3864 + ldr r2, =0x0203bc88 movs r0, 0x34 adds r1, r3, 0 muls r1, r0 @@ -857628,13 +828578,12 @@ _081A3844: bl sub_81638AC b _081A38F8 .align 2, 0 -_081A3860: .4byte 0x0000012b -_081A3864: .4byte 0x0203bc88 + .pool _081A3868: - ldr r0, _081A3888 + ldr r0, =0x0000018f cmp r3, r0 bhi _081A38A8 - ldr r0, _081A388C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -857646,21 +828595,19 @@ _081A387C: bl sub_81638AC b _081A38F8 .align 2, 0 -_081A3888: .4byte 0x0000018f -_081A388C: .4byte 0x02022fec + .pool _081A3890: - ldr r1, _081A38A0 + ldr r1, =0x03005d90 movs r0, 0xEC muls r0, r3 ldr r1, [r1] adds r0, r1 - ldr r1, _081A38A4 + ldr r1, =0xfffef2d0 b _081A38C4 .align 2, 0 -_081A38A0: .4byte 0x03005d90 -_081A38A4: .4byte 0xfffef2d0 + .pool _081A38A8: - ldr r0, _081A38CC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -857672,18 +828619,17 @@ _081A38A8: lsrs r3, r0, 24 movs r0, 0x58 muls r0, r3 - ldr r1, _081A38D0 + ldr r1, =0x086109ba _081A38C4: adds r0, r1 bl sub_81638AC b _081A38F8 .align 2, 0 -_081A38CC: .4byte 0x02022fec -_081A38D0: .4byte 0x086109ba + .pool _081A38D4: - ldr r0, _081A38FC + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _081A3900 + ldr r0, =0xfffffe70 adds r2, r3, r0 lsls r0, r2, 4 adds r0, r2 @@ -857695,16 +828641,14 @@ _081A38D4: lsrs r3, r0, 27 movs r0, 0x58 muls r0, r3 - ldr r1, _081A3904 + ldr r1, =0x086109ba adds r0, r1 bl sub_81638AC _081A38F8: pop {r0} bx r0 .align 2, 0 -_081A38FC: .4byte 0x03005d90 -_081A3900: .4byte 0xfffffe70 -_081A3904: .4byte 0x086109ba + .pool thumb_func_end sub_81A36D0 thumb_func_start sub_81A3908 @@ -857714,9 +828658,9 @@ sub_81A3908: @ 81A3908 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _081A39AC + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r2, _081A39B0 + ldr r2, =0x00000cdc adds r1, r2 movs r2, 0 str r2, [r1] @@ -857760,15 +828704,15 @@ _081A3960: bne _081A3980 mov r1, r8 ldr r0, [r1] - ldr r2, _081A39B4 + ldr r2, =0x00000dda adds r1, r0, r2 adds r1, r3 strh r4, [r1] - ldr r7, _081A39B8 + ldr r7, =0x00000e04 adds r1, r0, r7 adds r1, r3 strh r4, [r1] - ldr r1, _081A39BC + ldr r1, =0x00000e1a adds r0, r1 adds r0, r3 strh r4, [r0] @@ -857781,7 +828725,7 @@ _081A3980: ble _081A3926 mov r2, r9 ldr r0, [r2] - ldr r7, _081A39C0 + ldr r7, =0x00000ca8 adds r1, r0, r7 ldrb r0, [r1] cmp r0, 0 @@ -857797,45 +828741,36 @@ _081A399E: pop {r0} bx r0 .align 2, 0 -_081A39AC: .4byte 0x03005d90 -_081A39B0: .4byte 0x00000cdc -_081A39B4: .4byte 0x00000dda -_081A39B8: .4byte 0x00000e04 -_081A39BC: .4byte 0x00000e1a -_081A39C0: .4byte 0x00000ca8 + .pool thumb_func_end sub_81A3908 thumb_func_start sub_81A39C4 sub_81A39C4: @ 81A39C4 push {r4,r5,lr} - ldr r0, _081A39F8 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A39FC + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r4, r0, 30 - ldr r0, _081A3A00 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _081A3A04 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 cmp r0, 0x6 bhi _081A3AC4 lsls r0, 2 - ldr r1, _081A3A08 + ldr r1, =_081A3A0C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A39F8: .4byte 0x03005d90 -_081A39FC: .4byte 0x00000ca9 -_081A3A00: .4byte 0x000040ce -_081A3A04: .4byte 0x000040cf -_081A3A08: .4byte _081A3A0C + .pool .align 2, 0 _081A3A0C: .4byte _081A3A28 @@ -857846,7 +828781,7 @@ _081A3A0C: .4byte _081A3A98 .4byte _081A3AAC _081A3A28: - ldr r0, _081A3A38 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r5, 2 @@ -857855,71 +828790,65 @@ _081A3A28: lsls r2, 4 b _081A3AB4 .align 2, 0 -_081A3A38: .4byte 0x03005d90 + .pool _081A3A3C: - ldr r0, _081A3A4C + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r5, 2 adds r1, r2 - ldr r2, _081A3A50 + ldr r2, =0x00000d0c b _081A3AB4 .align 2, 0 -_081A3A4C: .4byte 0x03005d90 -_081A3A50: .4byte 0x00000d0c + .pool _081A3A54: - ldr r0, _081A3A64 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r5, 2 adds r1, r2 - ldr r2, _081A3A68 + ldr r2, =0x00000dc8 b _081A3AB4 .align 2, 0 -_081A3A64: .4byte 0x03005d90 -_081A3A68: .4byte 0x00000dc8 + .pool _081A3A6C: - ldr r0, _081A3A78 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _081A3A7C + ldr r2, =0x00000dda b _081A3AB4 .align 2, 0 -_081A3A78: .4byte 0x03005d90 -_081A3A7C: .4byte 0x00000dda + .pool _081A3A80: - ldr r0, _081A3A90 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r5, 2 adds r1, r2 - ldr r2, _081A3A94 + ldr r2, =0x00000de2 b _081A3AB4 .align 2, 0 -_081A3A90: .4byte 0x03005d90 -_081A3A94: .4byte 0x00000de2 + .pool _081A3A98: - ldr r0, _081A3AA4 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _081A3AA8 + ldr r2, =0x00000e04 b _081A3AB4 .align 2, 0 -_081A3AA4: .4byte 0x03005d90 -_081A3AA8: .4byte 0x00000e04 + .pool _081A3AAC: - ldr r0, _081A3ABC + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _081A3AC0 + ldr r2, =0x00000e1a _081A3AB4: adds r0, r2 adds r0, r1 ldrh r0, [r0] b _081A3AC6 .align 2, 0 -_081A3ABC: .4byte 0x03005d90 -_081A3AC0: .4byte 0x00000e1a + .pool _081A3AC4: movs r0, 0 _081A3AC6: @@ -857932,9 +828861,9 @@ _081A3AC6: sub_81A3ACC: @ 81A3ACC push {r4,r5,lr} movs r2, 0 - ldr r5, _081A3AF4 - ldr r4, _081A3AF8 - ldr r0, _081A3AFC + ldr r5, =0x03005d90 + ldr r4, =0x00000cb4 + ldr r0, =0x0000ffff adds r3, r0, 0 _081A3AD8: ldr r0, [r5] @@ -857951,35 +828880,31 @@ _081A3AD8: pop {r0} bx r0 .align 2, 0 -_081A3AF4: .4byte 0x03005d90 -_081A3AF8: .4byte 0x00000cb4 -_081A3AFC: .4byte 0x0000ffff + .pool thumb_func_end sub_81A3ACC thumb_func_start sub_81A3B00 sub_81A3B00: @ 81A3B00 push {lr} - ldr r0, _081A3B14 + ldr r0, =0x02038bca ldrh r1, [r0] - ldr r0, _081A3B18 + ldr r0, =0x000003fe cmp r1, r0 bne _081A3B20 - ldr r1, _081A3B1C + ldr r1, =0x020375f0 movs r0, 0x1 b _081A3B24 .align 2, 0 -_081A3B14: .4byte 0x02038bca -_081A3B18: .4byte 0x000003fe -_081A3B1C: .4byte 0x020375f0 + .pool _081A3B20: - ldr r1, _081A3B2C + ldr r1, =0x020375f0 movs r0, 0 _081A3B24: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_081A3B2C: .4byte 0x020375f0 + .pool thumb_func_end sub_81A3B00 thumb_func_start sub_81A3B30 @@ -857988,11 +828913,11 @@ sub_81A3B30: @ 81A3B30 adds r4, r0, 0 lsls r4, 24 lsrs r4, 23 - ldr r1, _081A3B5C + ldr r1, =0x000008c4 adds r0, r4, r1 bl flag_check adds r5, r0, 0 - ldr r0, _081A3B60 + ldr r0, =0x000008c5 adds r4, r0 adds r0, r4, 0 bl flag_check @@ -858004,8 +828929,7 @@ sub_81A3B30: @ 81A3B30 pop {r1} bx r1 .align 2, 0 -_081A3B5C: .4byte 0x000008c4 -_081A3B60: .4byte 0x000008c5 + .pool thumb_func_end sub_81A3B30 thumb_func_start sub_81A3B64 @@ -858015,34 +828939,30 @@ sub_81A3B64: @ 81A3B64 mov r6, r8 push {r6,r7} movs r5, 0 - ldr r0, _081A3BA0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A3BA4 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r4, r0, 30 - ldr r0, _081A3BA8 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _081A3BAC + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r6, r0, 16 cmp r7, 0x6 bhi _081A3C78 lsls r0, r7, 2 - ldr r1, _081A3BB0 + ldr r1, =_081A3BB4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A3BA0: .4byte 0x03005d90 -_081A3BA4: .4byte 0x00000ca9 -_081A3BA8: .4byte 0x000040cf -_081A3BAC: .4byte 0x000040ce -_081A3BB0: .4byte _081A3BB4 + .pool .align 2, 0 _081A3BB4: .4byte _081A3BD0 @@ -858053,7 +828973,7 @@ _081A3BB4: .4byte _081A3C44 .4byte _081A3C60 _081A3BD0: - ldr r0, _081A3BE0 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r6, 2 @@ -858062,70 +828982,65 @@ _081A3BD0: lsls r2, 4 b _081A3C68 .align 2, 0 -_081A3BE0: .4byte 0x03005d90 + .pool _081A3BE4: - ldr r0, _081A3BF8 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r6, 2 adds r1, r2 - ldr r2, _081A3BFC + ldr r2, =0x00000d0c adds r0, r2 adds r0, r1 ldrh r5, [r0] b _081A3C78 .align 2, 0 -_081A3BF8: .4byte 0x03005d90 -_081A3BFC: .4byte 0x00000d0c + .pool _081A3C00: - ldr r0, _081A3C10 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r6, 2 adds r1, r2 - ldr r2, _081A3C14 + ldr r2, =0x00000dc8 b _081A3C68 .align 2, 0 -_081A3C10: .4byte 0x03005d90 -_081A3C14: .4byte 0x00000dc8 + .pool _081A3C18: - ldr r0, _081A3C24 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _081A3C28 + ldr r2, =0x00000dda b _081A3C68 .align 2, 0 -_081A3C24: .4byte 0x03005d90 -_081A3C28: .4byte 0x00000dda + .pool _081A3C2C: - ldr r0, _081A3C3C + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 lsls r2, r6, 2 adds r1, r2 - ldr r2, _081A3C40 + ldr r2, =0x00000de2 b _081A3C68 .align 2, 0 -_081A3C3C: .4byte 0x03005d90 -_081A3C40: .4byte 0x00000de2 + .pool _081A3C44: - ldr r0, _081A3C58 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _081A3C5C + ldr r2, =0x00000e04 adds r0, r2 adds r0, r1 ldrh r0, [r0] movs r1, 0xE b _081A3C70 .align 2, 0 -_081A3C58: .4byte 0x03005d90 -_081A3C5C: .4byte 0x00000e04 + .pool _081A3C60: - ldr r0, _081A3D08 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _081A3D0C + ldr r2, =0x00000e1a _081A3C68: adds r0, r2 adds r0, r1 @@ -858144,7 +829059,7 @@ _081A3C7E: bls _081A3C84 movs r5, 0x1D _081A3C84: - ldr r2, _081A3D10 + ldr r2, =0x086118b4 lsls r1, r7, 2 adds r1, r6, r1 lsls r0, r5, 3 @@ -858153,23 +829068,23 @@ _081A3C84: adds r1, r0 adds r7, r1, r2 ldrb r5, [r7] - ldr r0, _081A3D14 + ldr r0, =0x02038bca mov r9, r0 ldrh r0, [r0] - ldr r1, _081A3D18 + ldr r1, =0x000003fe mov r8, r1 cmp r0, r8 bne _081A3CA6 adds r5, 0xA _081A3CA6: - ldr r6, _081A3D08 + ldr r6, =0x03005d90 ldr r1, [r6] - ldr r4, _081A3D1C + ldr r4, =0x00000eb8 adds r1, r4 ldrh r0, [r1] adds r0, r5 strh r0, [r1] - ldr r0, _081A3D20 + ldr r0, =0x02021cc4 adds r1, r5, 0 movs r2, 0 movs r3, 0x2 @@ -858177,13 +829092,13 @@ _081A3CA6: ldr r0, [r6] adds r2, r0, r4 ldrh r0, [r2] - ldr r1, _081A3D24 + ldr r1, =0x0000270f cmp r0, r1 bls _081A3CCE strh r1, [r2] _081A3CCE: ldr r0, [r6] - ldr r4, _081A3D28 + ldr r4, =0x00000eba adds r0, r4 ldrh r5, [r0] ldrb r0, [r7] @@ -858197,7 +829112,7 @@ _081A3CCE: movs r0, 0xA bl sub_80EED60 _081A3CEE: - ldr r0, _081A3D2C + ldr r0, =0x0000ffff cmp r5, r0 ble _081A3CF6 adds r5, r0, 0 @@ -858212,24 +829127,15 @@ _081A3CF6: pop {r0} bx r0 .align 2, 0 -_081A3D08: .4byte 0x03005d90 -_081A3D0C: .4byte 0x00000e1a -_081A3D10: .4byte 0x086118b4 -_081A3D14: .4byte 0x02038bca -_081A3D18: .4byte 0x000003fe -_081A3D1C: .4byte 0x00000eb8 -_081A3D20: .4byte 0x02021cc4 -_081A3D24: .4byte 0x0000270f -_081A3D28: .4byte 0x00000eba -_081A3D2C: .4byte 0x0000ffff + .pool thumb_func_end sub_81A3B64 thumb_func_start sub_81A3D30 sub_81A3D30: @ 81A3D30 push {r4,lr} - ldr r0, _081A3D50 + ldr r0, =0x000040cf bl var_get - ldr r4, _081A3D54 + ldr r4, =0x020375f0 lsls r0, 24 lsrs r0, 24 bl sub_81A3B30 @@ -858240,14 +829146,13 @@ sub_81A3D30: @ 81A3D30 pop {r0} bx r0 .align 2, 0 -_081A3D50: .4byte 0x000040cf -_081A3D54: .4byte 0x020375f0 + .pool thumb_func_end sub_81A3D30 thumb_func_start sub_81A3D58 sub_81A3D58: @ 81A3D58 push {r4,lr} - ldr r0, _081A3D80 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r4, r0, 16 @@ -858258,17 +829163,16 @@ sub_81A3D58: @ 81A3D58 cmp r0, 0 bne _081A3D88 lsls r0, r4, 17 - ldr r1, _081A3D84 + ldr r1, =0x08c40000 adds r0, r1 lsrs r0, 16 bl flag_set b _081A3D94 .align 2, 0 -_081A3D80: .4byte 0x000040cf -_081A3D84: .4byte 0x08c40000 + .pool _081A3D88: lsls r0, r4, 17 - ldr r1, _081A3D9C + ldr r1, =0x08c50000 adds r0, r1 lsrs r0, 16 bl flag_set @@ -858277,35 +829181,33 @@ _081A3D94: pop {r0} bx r0 .align 2, 0 -_081A3D9C: .4byte 0x08c50000 + .pool thumb_func_end sub_81A3D58 thumb_func_start sub_81A3DA0 sub_81A3DA0: @ 81A3DA0 push {lr} - ldr r0, _081A3DB8 - ldr r1, _081A3DBC + ldr r0, =0x02022fec + ldr r1, =0x020375e2 ldrh r1, [r1] ldr r2, [r0] ands r2, r1 cmp r2, 0 beq _081A3DC4 - ldr r1, _081A3DC0 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] b _081A3DC8 .align 2, 0 -_081A3DB8: .4byte 0x02022fec -_081A3DBC: .4byte 0x020375e2 -_081A3DC0: .4byte 0x020375f0 + .pool _081A3DC4: - ldr r0, _081A3DCC + ldr r0, =0x020375f0 strh r2, [r0] _081A3DC8: pop {r0} bx r0 .align 2, 0 -_081A3DCC: .4byte 0x020375f0 + .pool thumb_func_end sub_81A3DA0 thumb_func_start sub_81A3DD0 @@ -858332,12 +829234,12 @@ sub_81A3DD0: @ 81A3DD0 cmp r0, 0xA bhi _081A3EA0 lsls r0, 2 - ldr r1, _081A3E08 + ldr r1, =_081A3E0C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A3E08: .4byte _081A3E0C + .pool .align 2, 0 _081A3E0C: .4byte _081A3E38 @@ -858354,69 +829256,63 @@ _081A3E0C: _081A3E38: cmp r5, r4 bne _081A3E50 - ldr r0, _081A3E48 - ldr r1, _081A3E4C + ldr r0, =0x02021cc4 + ldr r1, =0x085ccb79 bl gf_strcat b _081A3EC8 .align 2, 0 -_081A3E48: .4byte 0x02021cc4 -_081A3E4C: .4byte 0x085ccb79 + .pool _081A3E50: cmp r5, r4 ble _081A3EC8 - ldr r0, _081A3E60 - ldr r1, _081A3E64 + ldr r0, =0x02021cc4 + ldr r1, =0x085ccb7f bl gf_strcat b _081A3EC8 .align 2, 0 -_081A3E60: .4byte 0x02021cc4 -_081A3E64: .4byte 0x085ccb7f + .pool _081A3E68: cmp r4, r5 bne _081A3E80 - ldr r0, _081A3E78 - ldr r1, _081A3E7C + ldr r0, =0x02021cc4 + ldr r1, =0x085ccb79 bl gf_strcat b _081A3E88 .align 2, 0 -_081A3E78: .4byte 0x02021cc4 -_081A3E7C: .4byte 0x085ccb79 + .pool _081A3E80: - ldr r0, _081A3E94 - ldr r1, _081A3E98 + ldr r0, =0x02021cc4 + ldr r1, =0x085ccb7f bl gf_strcat _081A3E88: - ldr r0, _081A3E94 - ldr r1, _081A3E9C + ldr r0, =0x02021cc4 + ldr r1, =0x085ccb86 bl gf_strcat b _081A3EC8 .align 2, 0 -_081A3E94: .4byte 0x02021cc4 -_081A3E98: .4byte 0x085ccb7f -_081A3E9C: .4byte 0x085ccb86 + .pool _081A3EA0: cmp r4, r5 bne _081A3EB8 - ldr r0, _081A3EB0 - ldr r1, _081A3EB4 + ldr r0, =0x02021cc4 + ldr r1, =0x085ccb79 bl gf_strcat b _081A3EC0 .align 2, 0 -_081A3EB0: .4byte 0x02021cc4 -_081A3EB4: .4byte 0x085ccb79 + .pool _081A3EB8: - ldr r0, _081A3EE0 - ldr r1, _081A3EE4 + ldr r0, =0x02021cc4 + ldr r1, =0x085ccb7f bl gf_strcat _081A3EC0: - ldr r0, _081A3EE0 - ldr r1, _081A3EE8 + ldr r0, =0x02021cc4 + ldr r1, =0x085ccb84 bl gf_strcat _081A3EC8: - ldr r0, _081A3EE0 + ldr r0, =0x02021cc4 movs r1, 0xB muls r1, r6 - ldr r2, _081A3EEC + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcat _081A3ED6: @@ -858425,10 +829321,7 @@ _081A3ED6: pop {r1} bx r1 .align 2, 0 -_081A3EE0: .4byte 0x02021cc4 -_081A3EE4: .4byte 0x085ccb7f -_081A3EE8: .4byte 0x085ccb84 -_081A3EEC: .4byte 0x083185c8 + .pool thumb_func_end sub_81A3DD0 thumb_func_start sub_81A3EF0 @@ -858461,9 +829354,9 @@ sub_81A3EF0: @ 81A3EF0 beq _081A3FBE cmp r4, 0 beq _081A3FBE - ldr r0, _081A3FCC + ldr r0, =0x08611c9a ldrh r1, [r0] - ldr r5, _081A3FD0 + ldr r5, =0x0000ffff adds r3, r0, 0 cmp r1, r5 beq _081A3F54 @@ -858482,7 +829375,7 @@ _081A3F48: lsls r0, r2, 1 adds r0, r3 ldrh r1, [r0] - ldr r0, _081A3FD0 + ldr r0, =0x0000ffff cmp r1, r0 bne _081A3FBE _081A3F54: @@ -858554,8 +829447,7 @@ _081A3FBE: pop {r0} bx r0 .align 2, 0 -_081A3FCC: .4byte 0x08611c9a -_081A3FD0: .4byte 0x0000ffff + .pool thumb_func_end sub_81A3EF0 thumb_func_start sub_81A3FD4 @@ -858570,7 +829462,7 @@ sub_81A3FD4: @ 81A3FD4 str r0, [sp, 0x2C] add r4, sp, 0x28 strb r0, [r4] - ldr r0, _081A4004 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r0, 16 @@ -858583,7 +829475,7 @@ sub_81A3FD4: @ 81A3FD4 beq _081A4010 b _081A402A .align 2, 0 -_081A4004: .4byte 0x000040ce + .pool _081A4008: cmp r0, 0x3 bgt _081A402A @@ -858594,7 +829486,7 @@ _081A4010: str r1, [sp, 0x2C] b _081A402A _081A4016: - ldr r0, _081A4030 + ldr r0, =0x000040cf bl var_get lsls r0, 16 movs r1, 0x3 @@ -858609,7 +829501,7 @@ _081A402A: mov r9, r1 b _081A4040 .align 2, 0 -_081A4030: .4byte 0x000040cf + .pool _081A4034: mov r1, r10 ldrb r0, [r1] @@ -858629,7 +829521,7 @@ _081A404E: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081A40BC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x41 @@ -858652,7 +829544,7 @@ _081A404E: bl pokemon_getattr lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _081A40C0 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 @@ -858660,7 +829552,7 @@ _081A404E: bne _081A40C8 cmp r7, 0 bne _081A40E4 - ldr r0, _081A40C4 + ldr r0, =0x020375f0 ldrb r3, [r0] str r6, [sp] add r1, sp, 0x10 @@ -858675,11 +829567,9 @@ _081A404E: bl sub_81A3EF0 b _081A40E4 .align 2, 0 -_081A40BC: .4byte 0x020244ec -_081A40C0: .4byte 0x000040cf -_081A40C4: .4byte 0x020375f0 + .pool _081A40C8: - ldr r0, _081A4188 + ldr r0, =0x020375f0 ldrb r3, [r0] str r6, [sp] add r1, sp, 0x10 @@ -858710,9 +829600,9 @@ _081A40EC: cmp r0, r1 bge _081A41E0 movs r6, 0 - ldr r0, _081A418C + ldr r0, =0x08611c9a ldrh r2, [r0] - ldr r1, _081A4190 + ldr r1, =0x0000ffff mov r8, r0 cmp r2, r1 beq _081A4134 @@ -858731,14 +829621,14 @@ _081A4112: _081A412A: adds r4, 0x2 ldrh r2, [r4] - ldr r0, _081A4190 + ldr r0, =0x0000ffff cmp r2, r0 bne _081A4112 _081A4134: - ldr r1, _081A4194 + ldr r1, =0x02021cc4 movs r0, 0xFF strb r0, [r1] - ldr r1, _081A4198 + ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] movs r0, 0 @@ -858746,7 +829636,7 @@ _081A4134: strb r0, [r1] mov r1, r8 ldrh r0, [r1] - ldr r1, _081A4190 + ldr r1, =0x0000ffff cmp r0, r1 beq _081A416A mov r5, r10 @@ -858767,56 +829657,47 @@ _081A416A: ldrb r4, [r0] cmp r4, 0 bne _081A41A4 - ldr r4, _081A4194 - ldr r1, _081A419C + ldr r4, =0x02021cc4 + ldr r1, =0x085ccb82 adds r0, r4, 0 bl gf_strcat - ldr r1, _081A41A0 + ldr r1, =0x085ccb88 adds r0, r4, 0 bl gf_strcat b _081A4202 .align 2, 0 -_081A4188: .4byte 0x020375f0 -_081A418C: .4byte 0x08611c9a -_081A4190: .4byte 0x0000ffff -_081A4194: .4byte 0x02021cc4 -_081A4198: .4byte 0x020375e0 -_081A419C: .4byte 0x085ccb82 -_081A41A0: .4byte 0x085ccb88 + .pool _081A41A4: movs r0, 0x1 ands r0, r4 cmp r0, 0 beq _081A41C0 - ldr r0, _081A41B8 - ldr r1, _081A41BC + ldr r0, =0x02021cc4 + ldr r1, =0x085ccb84 bl gf_strcat b _081A41C8 .align 2, 0 -_081A41B8: .4byte 0x02021cc4 -_081A41BC: .4byte 0x085ccb84 + .pool _081A41C0: - ldr r0, _081A41D4 - ldr r1, _081A41D8 + ldr r0, =0x02021cc4 + ldr r1, =0x085ccb82 bl gf_strcat _081A41C8: - ldr r0, _081A41D4 - ldr r1, _081A41DC + ldr r0, =0x02021cc4 + ldr r1, =0x085ccb8c bl gf_strcat b _081A4202 .align 2, 0 -_081A41D4: .4byte 0x02021cc4 -_081A41D8: .4byte 0x085ccb82 -_081A41DC: .4byte 0x085ccb8c + .pool _081A41E0: - ldr r1, _081A4214 + ldr r1, =0x020375e0 movs r0, 0 strh r0, [r1] - ldr r0, _081A4218 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _081A421C + ldr r0, =0x020375f0 ldrb r0, [r0] - ldr r1, _081A4220 + ldr r1, =0x00000ca9 adds r2, r1 movs r1, 0x3 ands r1, r0 @@ -858836,10 +829717,7 @@ _081A4202: pop {r0} bx r0 .align 2, 0 -_081A4214: .4byte 0x020375e0 -_081A4218: .4byte 0x03005d90 -_081A421C: .4byte 0x020375f0 -_081A4220: .4byte 0x00000ca9 + .pool thumb_func_end sub_81A3FD4 thumb_func_start sub_81A4224 @@ -858853,18 +829731,18 @@ sub_81A4224: @ 81A4224 thumb_func_start sub_81A4230 sub_81A4230: @ 81A4230 push {r4-r7,lr} - ldr r0, _081A4264 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A4268 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r4, r0, 30 - ldr r0, _081A426C + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _081A4270 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 @@ -858873,16 +829751,12 @@ sub_81A4230: @ 81A4230 b _081A4394 _081A425A: lsls r0, 2 - ldr r1, _081A4274 + ldr r1, =_081A4278 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A4264: .4byte 0x03005d90 -_081A4268: .4byte 0x00000ca9 -_081A426C: .4byte 0x000040ce -_081A4270: .4byte 0x000040cf -_081A4274: .4byte _081A4278 + .pool .align 2, 0 _081A4278: .4byte _081A4294 @@ -858893,7 +829767,7 @@ _081A4278: .4byte _081A4368 .4byte _081A437C _081A4294: - ldr r7, _081A42D0 + ldr r7, =0x03005d90 ldr r0, [r7] lsls r4, 1 lsls r1, r5, 2 @@ -858903,7 +829777,7 @@ _081A4294: adds r3, r0, r6 adds r2, r3, r1 ldrh r1, [r2] - ldr r0, _081A42D4 + ldr r0, =0x0000270e cmp r1, r0 bhi _081A4394 adds r0, r1, 0x1 @@ -858918,31 +829792,29 @@ _081A4294: adds r0, r1, r6 adds r0, r4 ldrh r0, [r0] - ldr r2, _081A42D8 + ldr r2, =0x00000d02 adds r1, r2 b _081A4392 .align 2, 0 -_081A42D0: .4byte 0x03005d90 -_081A42D4: .4byte 0x0000270e -_081A42D8: .4byte 0x00000d02 + .pool _081A42DC: - ldr r6, _081A430C + ldr r6, =0x03005d90 ldr r0, [r6] lsls r2, r4, 1 lsls r1, r5, 2 adds r1, r2, r1 - ldr r3, _081A4310 + ldr r3, =0x00000d0c adds r0, r3 adds r3, r0, r1 ldrh r0, [r3] - ldr r2, _081A4314 + ldr r2, =0x0000270e cmp r0, r2 bhi _081A42F8 adds r0, 0x1 strh r0, [r3] _081A42F8: ldr r0, [r6] - ldr r3, _081A4318 + ldr r3, =0x00000d1c adds r0, r3 adds r1, r0, r1 ldrh r0, [r1] @@ -858951,67 +829823,60 @@ _081A42F8: adds r0, 0x1 b _081A4392 .align 2, 0 -_081A430C: .4byte 0x03005d90 -_081A4310: .4byte 0x00000d0c -_081A4314: .4byte 0x0000270e -_081A4318: .4byte 0x00000d1c + .pool _081A431C: - ldr r0, _081A4330 + ldr r0, =0x03005d90 ldr r2, [r0] lsls r0, r4, 1 lsls r1, r5, 2 adds r0, r1 - ldr r1, _081A4334 + ldr r1, =0x00000dc8 adds r2, r1 adds r1, r2, r0 b _081A4388 .align 2, 0 -_081A4330: .4byte 0x03005d90 -_081A4334: .4byte 0x00000dc8 + .pool _081A4338: - ldr r0, _081A4344 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _081A4348 + ldr r2, =0x00000dda adds r0, r2 b _081A4386 .align 2, 0 -_081A4344: .4byte 0x03005d90 -_081A4348: .4byte 0x00000dda + .pool _081A434C: - ldr r0, _081A4360 + ldr r0, =0x03005d90 ldr r2, [r0] lsls r0, r4, 1 lsls r1, r5, 2 adds r0, r1 - ldr r3, _081A4364 + ldr r3, =0x00000de2 adds r2, r3 adds r1, r2, r0 b _081A4388 .align 2, 0 -_081A4360: .4byte 0x03005d90 -_081A4364: .4byte 0x00000de2 + .pool _081A4368: - ldr r0, _081A4374 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _081A4378 + ldr r2, =0x00000e04 adds r0, r2 b _081A4386 .align 2, 0 -_081A4374: .4byte 0x03005d90 -_081A4378: .4byte 0x00000e04 + .pool _081A437C: - ldr r0, _081A439C + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r3, _081A43A0 + ldr r3, =0x00000e1a adds r0, r3 _081A4386: adds r1, r0, r1 _081A4388: ldrh r3, [r1] - ldr r0, _081A43A4 + ldr r0, =0x0000270e cmp r3, r0 bhi _081A4394 adds r0, r3, 0x1 @@ -859022,9 +829887,7 @@ _081A4394: pop {r0} bx r0 .align 2, 0 -_081A439C: .4byte 0x03005d90 -_081A43A0: .4byte 0x00000e1a -_081A43A4: .4byte 0x0000270e + .pool thumb_func_end sub_81A4230 thumb_func_start sub_81A43A8 @@ -859032,13 +829895,13 @@ sub_81A43A8: @ 81A43A8 push {r4-r6,lr} sub sp, 0x4 movs r4, 0 - ldr r6, _081A4400 + ldr r6, =0x03005d8c movs r5, 0x64 _081A43B2: - ldr r0, _081A4404 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _081A4408 + ldr r2, =0x00000caa adds r0, r2 adds r1, r0, r1 ldrh r0, [r1] @@ -859058,7 +829921,7 @@ _081A43B2: strh r0, [r1] adds r0, r4, 0 muls r0, r5 - ldr r1, _081A440C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC mov r2, sp @@ -859074,21 +829937,18 @@ _081A43EE: pop {r0} bx r0 .align 2, 0 -_081A4400: .4byte 0x03005d8c -_081A4404: .4byte 0x03005d90 -_081A4408: .4byte 0x00000caa -_081A440C: .4byte 0x020244ec + .pool thumb_func_end sub_81A43A8 thumb_func_start sub_81A4410 sub_81A4410: @ 81A4410 push {r4,lr} - ldr r4, _081A4430 + ldr r4, =0x020375f0 bl sub_8185338 strh r0, [r4] - ldr r0, _081A4434 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _081A4438 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x8 @@ -859098,15 +829958,13 @@ sub_81A4410: @ 81A4410 pop {r0} bx r0 .align 2, 0 -_081A4430: .4byte 0x020375f0 -_081A4434: .4byte 0x03005d90 -_081A4438: .4byte 0x00000ca9 + .pool thumb_func_end sub_81A4410 thumb_func_start sub_81A443C sub_81A443C: @ 81A443C push {lr} - ldr r0, _081A444C + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 beq _081A4450 @@ -859114,27 +829972,25 @@ sub_81A443C: @ 81A443C beq _081A4464 b _081A446E .align 2, 0 -_081A444C: .4byte 0x020375e2 + .pool _081A4450: - ldr r0, _081A445C - ldr r1, _081A4460 + ldr r0, =0x02021cc4 + ldr r1, =0x02038bca ldrh r1, [r1] bl sub_8162E20 b _081A446E .align 2, 0 -_081A445C: .4byte 0x02021cc4 -_081A4460: .4byte 0x02038bca + .pool _081A4464: - ldr r0, _081A4474 - ldr r1, _081A4478 + ldr r0, =0x02021dc4 + ldr r1, =0x02038bca ldrh r1, [r1] bl sub_8162E20 _081A446E: pop {r0} bx r0 .align 2, 0 -_081A4474: .4byte 0x02021dc4 -_081A4478: .4byte 0x02038bca + .pool thumb_func_end sub_81A443C thumb_func_start sub_81A447C @@ -859148,11 +830004,11 @@ sub_81A447C: @ 81A447C movs r0, 0 str r0, [sp] _081A448C: - ldr r1, _081A456C + ldr r1, =0x03005d90 ldr r0, [r1] ldr r2, [sp] lsls r1, r2, 1 - ldr r4, _081A4570 + ldr r4, =0x00000caa adds r0, r4 adds r0, r1 ldrh r0, [r0] @@ -859169,7 +830025,7 @@ _081A448C: movs r2, 0x64 adds r1, r0, 0 muls r1, r2 - ldr r0, _081A4574 + ldr r0, =0x020244ec adds r7, r1, r0 _081A44BA: movs r5, 0 @@ -859179,9 +830035,9 @@ _081A44BA: adds r0, r6, 0x1 mov r10, r0 _081A44C6: - ldr r1, _081A456C + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r2, _081A4570 + ldr r2, =0x00000caa adds r0, r2 add r0, r9 ldrh r0, [r0] @@ -859191,7 +830047,7 @@ _081A44C6: movs r0, 0xEA lsls r0, 1 adds r1, r0 - ldr r2, _081A4578 + ldr r2, =0x03005d8c ldr r0, [r2] adds r0, r1 adds r1, r5, 0 @@ -859223,11 +830079,11 @@ _081A4516: lsrs r6, r0, 24 cmp r6, 0x3 bls _081A44BA - ldr r0, _081A4578 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _081A456C + ldr r2, =0x03005d90 ldr r1, [r2] - ldr r4, _081A4570 + ldr r4, =0x00000caa adds r1, r4 add r1, r9 ldrh r1, [r1] @@ -859238,7 +830094,7 @@ _081A4516: movs r1, 0x8E lsls r1, 2 adds r0, r1 - ldr r2, _081A4574 + ldr r2, =0x020244ec ldr r4, [sp] adds r1, r4, 0 muls r1, r3 @@ -859261,16 +830117,13 @@ _081A454E: pop {r0} bx r0 .align 2, 0 -_081A456C: .4byte 0x03005d90 -_081A4570: .4byte 0x00000caa -_081A4574: .4byte 0x020244ec -_081A4578: .4byte 0x03005d8c + .pool thumb_func_end sub_81A447C thumb_func_start sub_81A457C sub_81A457C: @ 81A457C push {lr} - ldr r0, _081A4590 + ldr r0, =0x000040cf bl var_get lsls r0, 24 lsrs r0, 24 @@ -859278,7 +830131,7 @@ sub_81A457C: @ 81A457C pop {r0} bx r0 .align 2, 0 -_081A4590: .4byte 0x000040cf + .pool thumb_func_end sub_81A457C thumb_func_start sub_81A4594 @@ -859291,11 +830144,11 @@ sub_81A4594: @ 81A4594 sub sp, 0x2C mov r8, r1 adds r6, r3, 0 - ldr r1, _081A466C + ldr r1, =0x0203ab74 ldrb r5, [r1] lsls r4, r0, 1 adds r4, r0 - ldr r1, _081A4670 + ldr r1, =0x085ee424 adds r4, r1 mov r1, r8 lsls r3, r1, 27 @@ -859327,7 +830180,7 @@ sub_81A4594: @ 81A4594 ldrb r2, [r6, 0xE] add r0, sp, 0xC bl sub_81DB5E8 - ldr r1, _081A466C + ldr r1, =0x0203ab74 ldrb r0, [r1] mov r3, r8 adds r3, 0x2 @@ -859342,17 +830195,17 @@ sub_81A4594: @ 81A4594 add r2, sp, 0xC bl Print ldrh r1, [r6, 0x4] - ldr r0, _081A4674 + ldr r0, =0x0000270f cmp r1, r0 bls _081A4618 adds r1, r0, 0 _081A4618: - ldr r0, _081A4678 + ldr r0, =0x02021dc4 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r5, _081A467C - ldr r1, _081A4680 + ldr r5, =0x02021fc4 + ldr r1, =0x08611d08 ldr r0, [sp, 0x4C] lsls r0, 2 adds r0, r1 @@ -859367,7 +830220,7 @@ _081A4618: adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 - ldr r1, _081A466C + ldr r1, =0x0203ab74 ldrb r0, [r1] str r7, [sp] mov r1, r10 @@ -859387,12 +830240,7 @@ _081A465C: pop {r0} bx r0 .align 2, 0 -_081A466C: .4byte 0x0203ab74 -_081A4670: .4byte 0x085ee424 -_081A4674: .4byte 0x0000270f -_081A4678: .4byte 0x02021dc4 -_081A467C: .4byte 0x02021fc4 -_081A4680: .4byte 0x08611d08 + .pool thumb_func_end sub_81A4594 thumb_func_start sub_81A4684 @@ -859407,11 +830255,11 @@ sub_81A4684: @ 81A4684 adds r7, r1, 0 mov r10, r2 adds r5, r3, 0 - ldr r1, _081A472C + ldr r1, =0x0203ab74 ldrb r0, [r1] lsls r2, r6, 1 adds r2, r6 - ldr r1, _081A4730 + ldr r1, =0x085ee424 adds r2, r1 lsls r3, r7, 27 lsrs r3, 24 @@ -859447,7 +830295,7 @@ sub_81A4684: @ 81A4684 ldrb r2, [r5, 0x1A] add r0, sp, 0xC bl sub_81DB5E8 - ldr r1, _081A472C + ldr r1, =0x0203ab74 ldrb r0, [r1] adds r3, r7, 0x2 lsls r3, 27 @@ -859477,14 +830325,13 @@ sub_81A4684: @ 81A4684 bl sub_81DB5E8 b _081A473C .align 2, 0 -_081A472C: .4byte 0x0203ab74 -_081A4730: .4byte 0x085ee424 + .pool _081A4734: add r0, sp, 0xC adds r1, r4, 0 bl gf_strcpy _081A473C: - ldr r2, _081A47CC + ldr r2, =0x0203ab74 mov r9, r2 ldrb r0, [r2] adds r3, r7, 0x4 @@ -859509,17 +830356,17 @@ _081A473C: add r2, sp, 0xC bl Print ldrh r1, [r5, 0x8] - ldr r0, _081A47D0 + ldr r0, =0x0000270f cmp r1, r0 bls _081A4778 adds r1, r0, 0 _081A4778: - ldr r0, _081A47D4 + ldr r0, =0x02021dc4 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r5, _081A47D8 - ldr r0, _081A47DC + ldr r5, =0x02021fc4 + ldr r0, =0x08611d08 ldr r4, [r0, 0x24] adds r0, r5, 0 adds r1, r4, 0 @@ -859554,11 +830401,7 @@ _081A47BC: pop {r0} bx r0 .align 2, 0 -_081A47CC: .4byte 0x0203ab74 -_081A47D0: .4byte 0x0000270f -_081A47D4: .4byte 0x02021dc4 -_081A47D8: .4byte 0x02021fc4 -_081A47DC: .4byte 0x08611d08 + .pool thumb_func_end sub_81A4684 thumb_func_start sub_81A47E0 @@ -859579,7 +830422,7 @@ sub_81A47E0: @ 81A47E0 bl sub_80E8260 add r0, sp, 0x30 mov r12, r0 - ldr r0, _081A48B0 + ldr r0, =0x03005d90 ldr r2, [r0] ldr r3, [sp, 0x40] lsls r1, r3, 1 @@ -859669,7 +830512,7 @@ _081A487A: pop {r0} bx r0 .align 2, 0 -_081A48B0: .4byte 0x03005d90 + .pool thumb_func_end sub_81A47E0 thumb_func_start sub_81A48B4 @@ -859692,7 +830535,7 @@ sub_81A48B4: @ 81A48B4 str r0, [sp, 0x70] add r1, sp, 0x5C mov r12, r1 - ldr r0, _081A4990 + ldr r0, =0x03005d90 ldr r1, [r0] movs r0, 0x54 mov r2, r10 @@ -859703,7 +830546,7 @@ sub_81A48B4: @ 81A48B4 movs r4, 0x2 _081A48EE: adds r0, r2, 0 - ldr r5, _081A4994 + ldr r5, =0x0000057c adds r1, r3, r5 ldm r1!, {r5-r7} stm r0!, {r5-r7} @@ -859787,8 +830630,7 @@ _081A4952: pop {r0} bx r0 .align 2, 0 -_081A4990: .4byte 0x03005d90 -_081A4994: .4byte 0x0000057c + .pool thumb_func_end sub_81A48B4 thumb_func_start sub_81A4998 @@ -859801,19 +830643,19 @@ sub_81A4998: @ 81A4998 sub sp, 0x94 adds r7, r0, 0 str r1, [sp, 0x90] - ldr r0, _081A4A50 - ldr r4, _081A4A54 + ldr r0, =0x02021cc4 + ldr r4, =0x08611cb0 lsls r5, r7, 3 adds r1, r5, r4 ldr r1, [r1] bl gf_strcpy - ldr r6, _081A4A58 + ldr r6, =0x02021fc4 adds r4, 0x4 adds r5, r4 ldr r1, [r5] adds r0, r6, 0 bl ExpandTextCodes - ldr r0, _081A4A5C + ldr r0, =0x0203ab74 mov r8, r0 ldrb r0, [r0] movs r1, 0x1 @@ -859827,7 +830669,7 @@ sub_81A4998: @ 81A4998 adds r2, r6, 0 movs r3, 0 bl Print - ldr r1, _081A4A60 + ldr r1, =0x08611d00 ldr r2, [sp, 0x90] lsls r0, r2, 2 adds r0, r1 @@ -859851,9 +830693,9 @@ sub_81A4998: @ 81A4998 bl Print cmp r7, 0x9 bne _081A4A6C - ldr r2, _081A4A64 + ldr r2, =0x03005d90 ldr r0, [r2] - ldr r1, _081A4A68 + ldr r1, =0x00000ee8 adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -859880,13 +830722,7 @@ _081A4A3A: ble _081A4A3A b _081A4A90 .align 2, 0 -_081A4A50: .4byte 0x02021cc4 -_081A4A54: .4byte 0x08611cb0 -_081A4A58: .4byte 0x02021fc4 -_081A4A5C: .4byte 0x0203ab74 -_081A4A60: .4byte 0x08611d00 -_081A4A64: .4byte 0x03005d90 -_081A4A68: .4byte 0x00000ee8 + .pool _081A4A6C: add r0, sp, 0xC adds r1, r7, 0 @@ -859919,8 +830755,8 @@ _081A4A90: thumb_func_start sub_81A4AA0 sub_81A4AA0: @ 81A4AA0 push {r4,lr} - ldr r4, _081A4ADC - ldr r0, _081A4AE0 + ldr r4, =0x0203ab74 + ldr r0, =0x08611c84 bl Window_AddFromTemplate strb r0, [r4] ldrb r0, [r4] @@ -859929,7 +830765,7 @@ sub_81A4AA0: @ 81A4AA0 ldrb r0, [r4] movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _081A4AE4 + ldr r0, =0x020375e2 ldrh r0, [r0] movs r1, 0 bl sub_81A4998 @@ -859942,19 +830778,17 @@ sub_81A4AA0: @ 81A4AA0 pop {r0} bx r0 .align 2, 0 -_081A4ADC: .4byte 0x0203ab74 -_081A4AE0: .4byte 0x08611c84 -_081A4AE4: .4byte 0x020375e2 + .pool thumb_func_end sub_81A4AA0 thumb_func_start sub_81A4AE8 sub_81A4AE8: @ 81A4AE8 push {r4,lr} - ldr r4, _081A4B0C + ldr r4, =0x0203ab74 ldrb r0, [r4] movs r1, 0x11 bl Window_FastFillPixels - ldr r0, _081A4B10 + ldr r0, =0x020375e2 ldrh r0, [r0] movs r1, 0x1 bl sub_81A4998 @@ -859965,8 +830799,7 @@ sub_81A4AE8: @ 81A4AE8 pop {r0} bx r0 .align 2, 0 -_081A4B0C: .4byte 0x0203ab74 -_081A4B10: .4byte 0x020375e2 + .pool thumb_func_end sub_81A4AE8 thumb_func_start sub_81A4B14 @@ -859978,7 +830811,7 @@ sub_81A4B14: @ 81A4B14 push {r5-r7} sub sp, 0x8 movs r1, 0 - ldr r3, _081A4C18 + ldr r3, =0x03005d90 _081A4B24: movs r6, 0 lsls r0, r1, 1 @@ -860010,7 +830843,7 @@ _081A4B44: ldr r3, [sp, 0x4] ldr r0, [r3] adds r0, r4 - ldr r1, _081A4C1C + ldr r1, =0x00000222 adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -860034,7 +830867,7 @@ _081A4B44: cmp r1, 0x8 ble _081A4B24 movs r6, 0 - ldr r7, _081A4C18 + ldr r7, =0x03005d90 movs r2, 0x54 mov r10, r2 movs r3, 0xFF @@ -860048,7 +830881,7 @@ _081A4B98: adds r4, r6, 0 muls r4, r0 movs r2, 0 - ldr r3, _081A4C20 + ldr r3, =0x0000057c adds r6, r1, r3 movs r5, 0x2 _081A4BAE: @@ -860067,7 +830900,7 @@ _081A4BAE: bl sub_80842F4 ldr r1, [r7] adds r1, r4 - ldr r0, _081A4C24 + ldr r0, =0x00000586 adds r1, r0 ldrb r0, [r1] mov r3, r9 @@ -860075,14 +830908,14 @@ _081A4BAE: strb r0, [r1] ldr r1, [r7] adds r1, r4 - ldr r0, _081A4C28 + ldr r0, =0x0000058e adds r1, r0 ldrb r0, [r1] orrs r0, r3 strb r0, [r1] ldr r0, [r7] adds r0, r4 - ldr r1, _081A4C2C + ldr r1, =0x00000584 adds r0, r1 movs r1, 0 strh r1, [r0] @@ -860104,12 +830937,7 @@ _081A4BAE: pop {r0} bx r0 .align 2, 0 -_081A4C18: .4byte 0x03005d90 -_081A4C1C: .4byte 0x00000222 -_081A4C20: .4byte 0x0000057c -_081A4C24: .4byte 0x00000586 -_081A4C28: .4byte 0x0000058e -_081A4C2C: .4byte 0x00000584 + .pool thumb_func_end sub_81A4B14 thumb_func_start sub_81A4C30 @@ -860126,7 +830954,7 @@ sub_81A4C30: @ 81A4C30 movs r0, 0xFA lsls r0, 1 adds r6, r7, r0 - ldr r0, _081A4CA8 + ldr r0, =0x020244ec mov r8, r0 _081A4C4E: mov r0, r8 @@ -860138,7 +830966,7 @@ _081A4C4E: adds r5, 0x64 cmp r4, r6 ble _081A4C4E - ldr r4, _081A4CAC + ldr r4, =0x020244e9 ldrb r5, [r4] bl copy_player_party_from_sav1 bl sub_8076D5C @@ -860147,7 +830975,7 @@ _081A4C4E: bl sav2_gender2_inplace_and_xFE strb r5, [r4] adds r4, r7, 0 - ldr r5, _081A4CA8 + ldr r5, =0x020244ec movs r0, 0xFA lsls r0, 1 adds r6, r7, r0 @@ -860168,14 +830996,13 @@ _081A4C84: pop {r0} bx r0 .align 2, 0 -_081A4CA8: .4byte 0x020244ec -_081A4CAC: .4byte 0x020244e9 + .pool thumb_func_end sub_81A4C30 thumb_func_start sub_81A4CB0 sub_81A4CB0: @ 81A4CB0 push {lr} - ldr r0, _081A4CCC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -860187,15 +831014,15 @@ sub_81A4CB0: @ 81A4CB0 lsrs r0, 24 b _081A4CDA .align 2, 0 -_081A4CCC: .4byte 0x02022fec + .pool _081A4CD0: - ldr r0, _081A4CF4 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 _081A4CDA: - ldr r2, _081A4CF8 - ldr r1, _081A4CFC + ldr r2, =0x08310030 + ldr r1, =0x08611d30 lsls r0, 1 adds r0, r1 ldrh r1, [r0] @@ -860207,15 +831034,13 @@ _081A4CDA: pop {r1} bx r1 .align 2, 0 -_081A4CF4: .4byte 0x000040cf -_081A4CF8: .4byte 0x08310030 -_081A4CFC: .4byte 0x08611d30 + .pool thumb_func_end sub_81A4CB0 thumb_func_start sub_81A4D00 sub_81A4D00: @ 81A4D00 push {lr} - ldr r0, _081A4D1C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -860227,15 +831052,15 @@ sub_81A4D00: @ 81A4D00 lsrs r0, 24 b _081A4D2A .align 2, 0 -_081A4D1C: .4byte 0x02022fec + .pool _081A4D20: - ldr r0, _081A4D44 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 _081A4D2A: - ldr r2, _081A4D48 - ldr r1, _081A4D4C + ldr r2, =0x08310030 + ldr r1, =0x08611d30 lsls r0, 1 adds r0, r1 ldrh r1, [r0] @@ -860247,16 +831072,14 @@ _081A4D2A: pop {r1} bx r1 .align 2, 0 -_081A4D44: .4byte 0x000040cf -_081A4D48: .4byte 0x08310030 -_081A4D4C: .4byte 0x08611d30 + .pool thumb_func_end sub_81A4D00 thumb_func_start sub_81A4D50 sub_81A4D50: @ 81A4D50 push {r4,lr} adds r4, r0, 0 - ldr r0, _081A4D6C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -860268,17 +831091,17 @@ sub_81A4D50: @ 81A4D50 lsrs r0, 24 b _081A4D7A .align 2, 0 -_081A4D6C: .4byte 0x02022fec + .pool _081A4D70: - ldr r0, _081A4DAC + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 _081A4D7A: movs r3, 0 lsls r0, 1 - ldr r2, _081A4DB0 - ldr r1, _081A4DB4 + ldr r2, =0x08310030 + ldr r1, =0x08611d30 adds r0, r1 ldrh r1, [r0] lsls r0, r1, 2 @@ -860301,18 +831124,16 @@ _081A4D90: pop {r0} bx r0 .align 2, 0 -_081A4DAC: .4byte 0x000040cf -_081A4DB0: .4byte 0x08310030 -_081A4DB4: .4byte 0x08611d30 + .pool thumb_func_end sub_81A4D50 thumb_func_start sub_81A4DB8 sub_81A4DB8: @ 81A4DB8 push {lr} - ldr r0, _081A4DD0 + ldr r0, =0x000040cf bl var_get lsls r0, 16 - ldr r1, _081A4DD4 + ldr r1, =0x08611c8c lsrs r0, 15 adds r1, 0x1 adds r0, r1 @@ -860320,18 +831141,17 @@ sub_81A4DB8: @ 81A4DB8 pop {r1} bx r1 .align 2, 0 -_081A4DD0: .4byte 0x000040cf -_081A4DD4: .4byte 0x08611c8c + .pool thumb_func_end sub_81A4DB8 thumb_func_start sub_81A4DD8 sub_81A4DD8: @ 81A4DD8 push {lr} - ldr r0, _081A4DF8 + ldr r0, =0x000040cf bl var_get lsls r0, 16 - ldr r2, _081A4DFC - ldr r1, _081A4E00 + ldr r2, =0x00004010 + ldr r1, =0x08611c8c lsrs r0, 15 adds r0, r1 ldrb r1, [r0] @@ -860340,9 +831160,7 @@ sub_81A4DD8: @ 81A4DD8 pop {r0} bx r0 .align 2, 0 -_081A4DF8: .4byte 0x000040cf -_081A4DFC: .4byte 0x00004010 -_081A4E00: .4byte 0x08611c8c + .pool thumb_func_end sub_81A4DD8 thumb_func_start sub_81A4E04 @@ -860353,7 +831171,7 @@ sub_81A4E04: @ 81A4E04 mov r5, r8 push {r5-r7} sub sp, 0x44 - ldr r0, _081A4E3C + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 @@ -860363,7 +831181,7 @@ sub_81A4E04: @ 81A4E04 ldr r0, [sp, 0x20] cmp r0, 0x1 bne _081A4E44 - ldr r0, _081A4E40 + ldr r0, =0x000003fe bl sub_81953A0 lsls r0, 16 lsrs r0, 16 @@ -860371,8 +831189,7 @@ sub_81A4E04: @ 81A4E04 adds r4, r0, 0 b _081A4E46 .align 2, 0 -_081A4E3C: .4byte 0x000040cf -_081A4E40: .4byte 0x000003fe + .pool _081A4E44: movs r4, 0x7 _081A4E46: @@ -860424,7 +831241,7 @@ _081A4E96: lsrs r7, r4, 16 lsls r0, 16 orrs r7, r0 - ldr r0, _081A4FE0 + ldr r0, =0x0000ef2a adds r1, r7, 0 bl sub_806EBD0 lsls r0, 24 @@ -860441,7 +831258,7 @@ _081A4E96: subs r0, r3, r1 lsls r6, r0, 3 adds r4, r6 - ldr r2, _081A4FE4 + ldr r2, =0x0861156c adds r4, r2 adds r0, r7, 0 bl getNature @@ -860455,7 +831272,7 @@ _081A4E96: adds r3, r4, 0 muls r3, r0 mov r8, r3 - ldr r1, _081A4FE8 + ldr r1, =0x02024744 add r1, r8 mov r10, r1 ldr r4, [sp, 0x14] @@ -860463,7 +831280,7 @@ _081A4E96: lsls r4, 2 adds r0, r4, r5 adds r0, r6 - ldr r2, _081A4FE4 + ldr r2, =0x0861156c adds r0, r2 ldrh r1, [r0] ldr r3, [sp, 0x3C] @@ -860473,11 +831290,11 @@ _081A4E96: str r0, [sp] str r7, [sp, 0x4] str r0, [sp, 0x8] - ldr r0, _081A4FE0 + ldr r0, =0x0000ef2a str r0, [sp, 0xC] mov r0, r10 bl create_pokemon_set_level - ldr r0, _081A4FE4 + ldr r0, =0x0861156c adds r5, r0 adds r5, r6, r5 adds r4, r5, r4 @@ -860488,7 +831305,7 @@ _081A4E96: bl pokemon_setattr movs r7, 0 mov r6, r8 - ldr r3, _081A4FE8 + ldr r3, =0x02024744 _081A4F32: adds r1, r7, 0 adds r1, 0x1A @@ -860513,9 +831330,9 @@ _081A4F32: movs r2, 0x64 adds r6, r1, 0 muls r6, r2 - ldr r3, _081A4FEC + ldr r3, =0x08611578 mov r8, r3 - ldr r3, _081A4FE8 + ldr r3, =0x02024744 adds r5, r4, 0 _081A4F6A: ldr r4, [sp, 0x38] @@ -860551,7 +831368,7 @@ _081A4F9C: movs r1, 0x64 adds r4, r0, 0 muls r4, r1 - ldr r0, _081A4FE8 + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x20 @@ -860578,10 +831395,7 @@ _081A4FD0: pop {r0} bx r0 .align 2, 0 -_081A4FE0: .4byte 0x0000ef2a -_081A4FE4: .4byte 0x0861156c -_081A4FE8: .4byte 0x02024744 -_081A4FEC: .4byte 0x08611578 + .pool thumb_func_end sub_81A4E04 thumb_func_start sub_81A4FF0 @@ -860590,13 +831404,13 @@ sub_81A4FF0: @ 81A4FF0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081A5028 + ldr r0, =0x000040cf bl var_get adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 bl sub_81A513C - ldr r3, _081A502C + ldr r3, =0x0861156c lsls r2, r4, 2 adds r2, r4 lsls r1, r0, 4 @@ -860613,20 +831427,19 @@ sub_81A4FF0: @ 81A4FF0 pop {r1} bx r1 .align 2, 0 -_081A5028: .4byte 0x000040cf -_081A502C: .4byte 0x0861156c + .pool thumb_func_end sub_81A4FF0 thumb_func_start sub_81A5030 sub_81A5030: @ 81A5030 push {lr} lsls r0, 24 - ldr r2, _081A5050 - ldr r3, _081A5054 + ldr r2, =0x02038bca + ldr r3, =0x000003fe adds r1, r3, 0 strh r1, [r2] - ldr r2, _081A5058 - ldr r1, _081A505C + ldr r2, =0x00004010 + ldr r1, =0x08611c8c lsrs r0, 23 adds r0, r1 ldrb r1, [r0] @@ -860635,10 +831448,7 @@ sub_81A5030: @ 81A5030 pop {r0} bx r0 .align 2, 0 -_081A5050: .4byte 0x02038bca -_081A5054: .4byte 0x000003fe -_081A5058: .4byte 0x00004010 -_081A505C: .4byte 0x08611c8c + .pool thumb_func_end sub_81A5030 thumb_func_start sub_81A5060 @@ -860650,13 +831460,13 @@ sub_81A5060: @ 81A5060 lsrs r6, 24 lsls r4, 24 lsrs r4, 24 - ldr r0, _081A50A8 + ldr r0, =0x000040cf bl var_get adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 bl sub_81A513C - ldr r2, _081A50AC + ldr r2, =0x0861156c lsls r4, 1 lsls r1, r6, 2 adds r1, r6 @@ -860677,8 +831487,7 @@ sub_81A5060: @ 81A5060 pop {r1} bx r1 .align 2, 0 -_081A50A8: .4byte 0x000040cf -_081A50AC: .4byte 0x0861156c + .pool thumb_func_end sub_81A5060 thumb_func_start sub_81A50B0 @@ -860687,13 +831496,13 @@ sub_81A50B0: @ 81A50B0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081A50E8 + ldr r0, =0x000040cf bl var_get adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 bl sub_81A513C - ldr r3, _081A50EC + ldr r3, =0x0861156c lsls r2, r4, 2 adds r2, r4 lsls r1, r0, 4 @@ -860710,8 +831519,7 @@ sub_81A50B0: @ 81A50B0 pop {r1} bx r1 .align 2, 0 -_081A50E8: .4byte 0x000040cf -_081A50EC: .4byte 0x0861156c + .pool thumb_func_end sub_81A50B0 thumb_func_start sub_81A50F0 @@ -860723,13 +831531,13 @@ sub_81A50F0: @ 81A50F0 lsrs r6, 24 lsls r4, 24 lsrs r4, 24 - ldr r0, _081A5134 + ldr r0, =0x000040cf bl var_get adds r5, r0, 0 lsls r5, 16 lsrs r5, 16 bl sub_81A513C - ldr r2, _081A5138 + ldr r2, =0x0861156c lsls r1, r6, 2 adds r1, r6 lsls r1, 2 @@ -860749,14 +831557,13 @@ sub_81A50F0: @ 81A50F0 pop {r1} bx r1 .align 2, 0 -_081A5134: .4byte 0x000040cf -_081A5138: .4byte 0x0861156c + .pool thumb_func_end sub_81A50F0 thumb_func_start sub_81A513C sub_81A513C: @ 81A513C push {r4,r5,lr} - ldr r0, _081A5178 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r5, r0, 16 @@ -860769,7 +831576,7 @@ sub_81A513C: @ 81A513C bne _081A51A0 bl sub_81A39C4 lsls r0, 16 - ldr r3, _081A517C + ldr r3, =0x08611550 lsls r2, r5, 2 adds r1, r3, 0x3 adds r1, r2, r1 @@ -860783,8 +831590,7 @@ sub_81A513C: @ 81A513C movs r4, 0 b _081A51A0 .align 2, 0 -_081A5178: .4byte 0x000040cf -_081A517C: .4byte 0x08611550 + .pool _081A5180: adds r0, r3, 0x1 adds r0, r2, r0 @@ -860814,7 +831620,7 @@ sub_81A51A8: @ 81A51A8 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081A51D0 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 17 @@ -860829,9 +831635,9 @@ sub_81A51A8: @ 81A51A8 lsrs r1, r0, 24 b _081A51E4 .align 2, 0 -_081A51D0: .4byte 0x02022fec + .pool _081A51D4: - ldr r0, _081A51F0 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r4, r0, 16 @@ -860844,10 +831650,10 @@ _081A51E4: beq _081A5214 b _081A5228 .align 2, 0 -_081A51F0: .4byte 0x000040cf + .pool _081A51F4: - ldr r0, _081A520C - ldr r2, _081A5210 + ldr r0, =0x02021fc4 + ldr r2, =0x08611db0 lsls r1, 2 adds r1, r2 ldr r2, [r1] @@ -860857,11 +831663,10 @@ _081A51F4: bl gf_strcpy b _081A5228 .align 2, 0 -_081A520C: .4byte 0x02021fc4 -_081A5210: .4byte 0x08611db0 + .pool _081A5214: - ldr r0, _081A5230 - ldr r2, _081A5234 + ldr r0, =0x02021fc4 + ldr r2, =0x08611db8 lsls r1, 2 adds r1, r2 ldr r2, [r1] @@ -860874,15 +831679,14 @@ _081A5228: pop {r0} bx r0 .align 2, 0 -_081A5230: .4byte 0x02021fc4 -_081A5234: .4byte 0x08611db8 + .pool thumb_func_end sub_81A51A8 thumb_func_start sub_81A5238 sub_81A5238: @ 81A5238 push {lr} - ldr r1, _081A5250 - ldr r0, _081A5254 + ldr r1, =0x08611f84 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -860891,8 +831695,7 @@ sub_81A5238: @ 81A5238 pop {r0} bx r0 .align 2, 0 -_081A5250: .4byte 0x08611f84 -_081A5254: .4byte 0x020375e0 + .pool thumb_func_end sub_81A5238 thumb_func_start sub_81A5258 @@ -860907,12 +831710,12 @@ sub_81A5258: @ 81A5258 b _081A5544 _081A5268: lsls r0, 2 - ldr r1, _081A5274 + ldr r1, =_081A5278 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A5274: .4byte _081A5278 + .pool .align 2, 0 _081A5278: .4byte _081A52A4 @@ -860927,39 +831730,34 @@ _081A5278: .4byte _081A54D4 .4byte _081A5520 _081A52A4: - ldr r0, _081A52DC + ldr r0, =0x7fffff1c movs r1, 0 str r1, [sp] movs r1, 0x4 movs r2, 0 movs r3, 0x8 bl sub_80A1AD4 - ldr r1, _081A52E0 + ldr r1, =0x00003f3e movs r0, 0x48 bl lcd_io_set - ldr r0, _081A52E4 + ldr r0, =0x08611f74 bl gpu_tile_obj_decompress_and_load - ldr r0, _081A52E8 + ldr r0, =0x08d855e8 movs r1, 0xF8 lsls r1, 1 movs r2, 0x20 bl decompress_palette - ldr r1, _081A52EC + ldr r1, =0x02022e24 movs r0, 0xFF strh r0, [r1] - ldr r1, _081A52F0 + ldr r1, =0x02022e26 movs r0, 0x70 strh r0, [r1] b _081A553E .align 2, 0 -_081A52DC: .4byte 0x7fffff1c -_081A52E0: .4byte 0x00003f3e -_081A52E4: .4byte 0x08611f74 -_081A52E8: .4byte 0x08d855e8 -_081A52EC: .4byte 0x02022e24 -_081A52F0: .4byte 0x02022e26 + .pool _081A52F4: - ldr r0, _081A5318 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -860977,7 +831775,7 @@ _081A5306: bl sub_8056A3C b _081A553E .align 2, 0 -_081A5318: .4byte 0x02037fd4 + .pool _081A531C: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -860985,56 +831783,47 @@ _081A531C: beq _081A5328 b _081A5544 _081A5328: - ldr r1, _081A538C + ldr r1, =0x02022f58 movs r2, 0xA1 strb r2, [r1] movs r0, 0xFF strb r0, [r1, 0x1] - ldr r1, _081A5390 + ldr r1, =0x02022f68 strb r2, [r1] movs r0, 0x1 negs r0, r0 strb r0, [r1, 0x1] - ldr r0, _081A5394 + ldr r0, =0x085ccdb2 bl sub_814E6F0 - ldr r4, _081A5398 + ldr r4, =0x02022e2c adds r0, r4, 0 movs r1, 0xF bl battle_show_message_maybe - ldr r0, _081A539C + ldr r0, =0x085ccdb5 movs r1, 0x10 bl battle_show_message_maybe - ldr r0, _081A53A0 + ldr r0, =0x085ccdb8 bl sub_814E6F0 adds r0, r4, 0 movs r1, 0x11 bl battle_show_message_maybe - ldr r0, _081A53A4 + ldr r0, =0x085ccdbb movs r1, 0x12 bl battle_show_message_maybe - ldr r0, _081A53A8 + ldr r0, =0x085ccdc0 movs r1, 0x13 bl battle_show_message_maybe - ldr r0, _081A53AC + ldr r0, =0x085ccdc6 movs r1, 0x14 bl battle_show_message_maybe - ldr r0, _081A53B0 + ldr r0, =0x085ccdcb bl sub_814E6F0 adds r0, r4, 0 movs r1, 0x15 bl battle_show_message_maybe b _081A553E .align 2, 0 -_081A538C: .4byte 0x02022f58 -_081A5390: .4byte 0x02022f68 -_081A5394: .4byte 0x085ccdb2 -_081A5398: .4byte 0x02022e2c -_081A539C: .4byte 0x085ccdb5 -_081A53A0: .4byte 0x085ccdb8 -_081A53A4: .4byte 0x085ccdbb -_081A53A8: .4byte 0x085ccdc0 -_081A53AC: .4byte 0x085ccdc6 -_081A53B0: .4byte 0x085ccdcb + .pool _081A53B4: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 @@ -861042,7 +831831,7 @@ _081A53B4: beq _081A53C0 b _081A5544 _081A53C0: - ldr r1, _081A5400 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set movs r6, 0x80 @@ -861050,7 +831839,7 @@ _081A53C0: movs r4, 0x7 _081A53CE: asrs r1, r6, 16 - ldr r0, _081A5404 + ldr r0, =0x08611f5c movs r2, 0x54 movs r3, 0 bl obj_add_from_template_forward_search @@ -861060,7 +831849,7 @@ _081A53CE: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081A5408 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x3 bl obj_anim_image_start @@ -861072,11 +831861,9 @@ _081A53CE: bge _081A53CE b _081A553C .align 2, 0 -_081A5400: .4byte 0x00003f3f -_081A5404: .4byte 0x08611f5c -_081A5408: .4byte 0x02020630 + .pool _081A540C: - ldr r0, _081A5428 + ldr r0, =0x00000109 bl audio_play movs r0, 0x50 movs r1, 0x28 @@ -861088,9 +831875,9 @@ _081A540C: movs r2, 0 b _081A5464 .align 2, 0 -_081A5428: .4byte 0x00000109 + .pool _081A542C: - ldr r0, _081A5448 + ldr r0, =0x00000109 bl audio_play movs r0, 0x50 movs r1, 0x38 @@ -861102,9 +831889,9 @@ _081A542C: movs r2, 0x1 b _081A5464 .align 2, 0 -_081A5448: .4byte 0x00000109 + .pool _081A544C: - ldr r0, _081A5484 + ldr r0, =0x00000109 bl audio_play movs r0, 0x50 movs r1, 0x48 @@ -861117,9 +831904,9 @@ _081A544C: _081A5464: movs r3, 0x1 bl sub_81A5558 - ldr r0, _081A5488 + ldr r0, =0x085ccdcb bl sub_814E6F0 - ldr r0, _081A548C + ldr r0, =0x02022e2c movs r1, 0x15 bl battle_show_message_maybe ldrb r0, [r5] @@ -861128,43 +831915,39 @@ _081A5464: movs r6, 0x1 b _081A5544 .align 2, 0 -_081A5484: .4byte 0x00000109 -_081A5488: .4byte 0x085ccdcb -_081A548C: .4byte 0x02022e2c + .pool _081A5490: movs r0, 0x85 lsls r0, 1 bl audio_play - ldr r0, _081A54B0 - ldr r1, _081A54B4 + ldr r0, =0x02022f58 + ldr r1, =0x02022f68 ldrb r2, [r0] ldrb r0, [r1] cmp r2, r0 bls _081A54BC movs r6, 0x2 - ldr r1, _081A54B8 + ldr r1, =0x02024474 movs r0, 0 strb r0, [r1, 0x17] b _081A553E .align 2, 0 -_081A54B0: .4byte 0x02022f58 -_081A54B4: .4byte 0x02022f68 -_081A54B8: .4byte 0x02024474 + .pool _081A54BC: cmp r2, r0 bcs _081A54D0 movs r6, 0x3 - ldr r1, _081A54CC + ldr r1, =0x02024474 movs r0, 0x1 strb r0, [r1, 0x17] b _081A553E .align 2, 0 -_081A54CC: .4byte 0x02024474 + .pool _081A54D0: movs r6, 0x4 b _081A553E _081A54D4: - ldr r1, _081A5510 + ldr r1, =0x00003f3e movs r0, 0x48 bl lcd_io_set movs r0, 0x1 @@ -861176,12 +831959,12 @@ _081A54D4: bl sub_8056A3C movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _081A5514 - ldr r1, _081A5518 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl - ldr r0, _081A551C + ldr r0, =0x7fffff1c movs r1, 0 str r1, [sp] movs r1, 0x4 @@ -861190,18 +831973,15 @@ _081A54D4: bl sub_80A1AD4 b _081A553E .align 2, 0 -_081A5510: .4byte 0x00003f3e -_081A5514: .4byte 0x03007420 -_081A5518: .4byte 0x0000ffff -_081A551C: .4byte 0x7fffff1c + .pool _081A5520: - ldr r0, _081A5550 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081A5544 - ldr r1, _081A5554 + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set movs r0, 0xFA @@ -861220,8 +832000,7 @@ _081A5544: pop {r1} bx r1 .align 2, 0 -_081A5550: .4byte 0x02037fd4 -_081A5554: .4byte 0x00003f3f + .pool thumb_func_end sub_81A5258 thumb_func_start sub_81A5558 @@ -861245,12 +832024,12 @@ sub_81A5558: @ 81A5558 lsrs r7, r3, 24 movs r6, 0 movs r1, 0 - ldr r0, _081A55A0 + ldr r0, =0x0202449c ldr r0, [r0] movs r3, 0xA6 lsls r3, 2 adds r4, r0, r3 - ldr r5, _081A55A4 + ldr r5, =0x0000029a adds r3, r0, r5 adds r5, 0x2 adds r5, r0 @@ -861263,8 +832042,7 @@ sub_81A5558: @ 81A5558 beq _081A55B0 b _081A5612 .align 2, 0 -_081A55A0: .4byte 0x0202449c -_081A55A4: .4byte 0x0000029a + .pool _081A55A8: mov r0, r9 cmp r0, 0x2 @@ -861293,7 +832071,7 @@ _081A55C4: ldrsb r1, [r0, r1] b _081A5612 _081A55D8: - ldr r3, _081A5620 + ldr r3, =0x02024084 mov r9, r3 movs r5, 0x58 adds r0, r7, 0 @@ -861326,43 +832104,42 @@ _081A5612: movs r4, 0x2 cmp r7, 0 beq _081A5628 - ldr r1, _081A5624 + ldr r1, =0x02022f68 b _081A562A .align 2, 0 -_081A5620: .4byte 0x02024084 -_081A5624: .4byte 0x02022f68 + .pool _081A5628: - ldr r1, _081A5634 + ldr r1, =0x02022f58 _081A562A: ldrb r0, [r1] adds r0, 0x2 strb r0, [r1] b _081A565E .align 2, 0 -_081A5634: .4byte 0x02022f58 + .pool _081A5638: cmp r6, r1 bne _081A565C movs r4, 0x1 cmp r7, 0 beq _081A564C - ldr r1, _081A5648 + ldr r1, =0x02022f68 b _081A564E .align 2, 0 -_081A5648: .4byte 0x02022f68 + .pool _081A564C: - ldr r1, _081A5658 + ldr r1, =0x02022f58 _081A564E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _081A565E .align 2, 0 -_081A5658: .4byte 0x02022f58 + .pool _081A565C: movs r4, 0 _081A565E: - ldr r0, _081A5690 + ldr r0, =0x08611f5c ldr r1, [sp] mov r2, r10 movs r3, 0 @@ -861372,7 +832149,7 @@ _081A565E: lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, _081A5694 + ldr r1, =0x02020630 adds r0, r1 adds r1, r4, 0 bl obj_anim_image_start @@ -861385,15 +832162,14 @@ _081A565E: pop {r0} bx r0 .align 2, 0 -_081A5690: .4byte 0x08611f5c -_081A5694: .4byte 0x02020630 + .pool thumb_func_end sub_81A5558 thumb_func_start sub_81A5698 sub_81A5698: @ 81A5698 push {lr} adds r1, r0, 0 - ldr r0, _081A56B0 + ldr r0, =0x02024332 ldrb r0, [r0] cmp r0, 0x8 bls _081A56AA @@ -861403,12 +832179,12 @@ _081A56AA: pop {r0} bx r0 .align 2, 0 -_081A56B0: .4byte 0x02024332 + .pool thumb_func_end sub_81A5698 thumb_func_start sub_81A56B4 sub_81A56B4: @ 81A56B4 - ldr r0, _081A56E0 + ldr r0, =0x0202449c ldr r2, [r0] movs r0, 0xA6 lsls r0, 2 @@ -861422,7 +832198,7 @@ sub_81A56B4: @ 81A56B4 strb r0, [r1, 0x1] strb r0, [r3] strb r0, [r3, 0x1] - ldr r0, _081A56E4 + ldr r0, =0x02024084 ldrh r1, [r0, 0x28] strh r1, [r2] adds r0, 0x80 @@ -861430,22 +832206,21 @@ sub_81A56B4: @ 81A56B4 strh r0, [r2, 0x2] bx lr .align 2, 0 -_081A56E0: .4byte 0x0202449c -_081A56E4: .4byte 0x02024084 + .pool thumb_func_end sub_81A56B4 thumb_func_start sub_81A56E8 sub_81A56E8: @ 81A56E8 lsls r0, 24 lsrs r0, 24 - ldr r1, _081A570C + ldr r1, =0x0202449c ldr r1, [r1] movs r2, 0xA6 lsls r2, 2 adds r1, r2 adds r1, r0 - ldr r2, _081A5710 - ldr r0, _081A5714 + ldr r2, =0x08611dc0 + ldr r0, =0x020241ea ldrh r0, [r0] adds r0, r2 ldrb r0, [r0] @@ -861454,9 +832229,7 @@ sub_81A56E8: @ 81A56E8 strb r0, [r1] bx lr .align 2, 0 -_081A570C: .4byte 0x0202449c -_081A5710: .4byte 0x08611dc0 -_081A5714: .4byte 0x020241ea + .pool thumb_func_end sub_81A56E8 thumb_func_start sub_81A5718 @@ -861465,21 +832238,21 @@ sub_81A5718: @ 81A5718 lsls r0, 24 lsrs r3, r0, 24 adds r6, r3, 0 - ldr r0, _081A5758 + ldr r0, =0x0202449c ldr r2, [r0] - ldr r0, _081A575C + ldr r0, =0x0000029a adds r5, r2, r0 - ldr r0, _081A5760 + ldr r0, =0x02024280 ldr r0, [r0] movs r1, 0x80 lsls r1, 18 ands r0, r1 cmp r0, 0 beq _081A57DA - ldr r0, _081A5764 + ldr r0, =0x000002a2 adds r4, r2, r0 ldrb r2, [r4] - ldr r0, _081A5768 + ldr r0, =0x0832a328 lsls r1, r3, 2 adds r1, r0 ldr r1, [r1] @@ -861494,13 +832267,9 @@ sub_81A5718: @ 81A5718 subs r0, 0x2 b _081A57D8 .align 2, 0 -_081A5758: .4byte 0x0202449c -_081A575C: .4byte 0x0000029a -_081A5760: .4byte 0x02024280 -_081A5764: .4byte 0x000002a2 -_081A5768: .4byte 0x0832a328 + .pool _081A576C: - ldr r0, _081A5790 + ldr r0, =0x0202427c ldrb r1, [r0] movs r0, 0x29 ands r0, r1 @@ -861510,7 +832279,7 @@ _081A576C: ands r0, r1 cmp r0, 0 beq _081A5788 - ldr r0, _081A5794 + ldr r0, =0x02024332 ldrb r0, [r0, 0x6] cmp r0, 0x1 beq _081A57DA @@ -861520,8 +832289,7 @@ _081A5788: subs r0, 0x2 b _081A57D8 .align 2, 0 -_081A5790: .4byte 0x0202427c -_081A5794: .4byte 0x02024332 + .pool _081A5798: movs r0, 0x6 ands r0, r1 @@ -861548,7 +832316,7 @@ _081A57B4: subs r0, 0x1 b _081A57D8 _081A57C4: - ldr r0, _081A57E0 + ldr r0, =0x0202433c lsls r1, r6, 4 adds r1, r0 ldrb r0, [r1] @@ -861566,7 +832334,7 @@ _081A57DA: pop {r0} bx r0 .align 2, 0 -_081A57E0: .4byte 0x0202433c + .pool thumb_func_end sub_81A5718 thumb_func_start sub_81A57E4 @@ -861577,9 +832345,9 @@ sub_81A57E4: @ 81A57E4 lsls r1, 16 lsrs r1, 16 adds r2, r1, 0 - ldr r0, _081A5814 + ldr r0, =0x0202449c ldr r0, [r0] - ldr r5, _081A5818 + ldr r5, =0x0000029a adds r3, r0, r5 movs r0, 0x99 lsls r0, 1 @@ -861596,8 +832364,7 @@ sub_81A57E4: @ 81A57E4 beq _081A585C b _081A5864 .align 2, 0 -_081A5814: .4byte 0x0202449c -_081A5818: .4byte 0x0000029a + .pool _081A581C: cmp r1, 0xC7 blt _081A5864 @@ -861607,7 +832374,7 @@ _081A581C: beq _081A585C b _081A5864 _081A582A: - ldr r0, _081A5844 + ldr r0, =0x00000147 cmp r1, r0 beq _081A585C cmp r1, r0 @@ -861620,7 +832387,7 @@ _081A582A: beq _081A585C b _081A5864 .align 2, 0 -_081A5844: .4byte 0x00000147 + .pool _081A5848: movs r0, 0xAD lsls r0, 1 @@ -861648,14 +832415,14 @@ sub_81A586C: @ 81A586C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081A58AC + ldr r1, =0x0202449c ldr r3, [r1] movs r1, 0xA7 lsls r1, 2 adds r3, r1 lsls r2, r0, 1 adds r2, r3 - ldr r5, _081A58B0 + ldr r5, =0x02024084 movs r4, 0x58 adds r1, r0, 0 muls r1, r4 @@ -861678,26 +832445,25 @@ _081A58A4: pop {r0} bx r0 .align 2, 0 -_081A58AC: .4byte 0x0202449c -_081A58B0: .4byte 0x02024084 + .pool thumb_func_end sub_81A586C thumb_func_start sub_81A58B4 sub_81A58B4: @ 81A58B4 push {r4-r6,lr} - ldr r4, _081A5900 + ldr r4, =0x03005d90 ldr r1, [r4] - ldr r3, _081A5904 + ldr r3, =0x00000ca9 adds r0, r1, r3 ldrb r0, [r0] lsls r0, 30 lsrs r5, r0, 30 - ldr r0, _081A5908 + ldr r0, =0x00000ca8 adds r1, r0 movs r2, 0 strb r2, [r1] ldr r1, [r4] - ldr r6, _081A590C + ldr r6, =0x00000cb2 adds r0, r1, r6 strh r2, [r0] adds r1, r3 @@ -861716,20 +832482,16 @@ sub_81A58B4: @ 81A58B4 cmp r5, 0 beq _081A5914 ldr r0, [r4] - ldr r1, _081A5910 + ldr r1, =0x00000cdc adds r0, r1 ldr r2, [r0] movs r0, 0x80 b _081A591E .align 2, 0 -_081A5900: .4byte 0x03005d90 -_081A5904: .4byte 0x00000ca9 -_081A5908: .4byte 0x00000ca8 -_081A590C: .4byte 0x00000cb2 -_081A5910: .4byte 0x00000cdc + .pool _081A5914: ldr r0, [r4] - ldr r3, _081A5954 + ldr r3, =0x00000cdc adds r0, r3 ldr r2, [r0] movs r0, 0x40 @@ -861739,12 +832501,12 @@ _081A591E: bne _081A5930 ldr r0, [r4] lsls r1, r5, 1 - ldr r6, _081A5958 + ldr r6, =0x00000dda adds r0, r6 adds r0, r1 strh r2, [r0] _081A5930: - ldr r0, _081A595C + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -861754,30 +832516,27 @@ _081A5930: negs r3, r3 movs r0, 0 bl saved_warp2_set - ldr r1, _081A5960 + ldr r1, =0x02038bca movs r0, 0 strh r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081A5954: .4byte 0x00000cdc -_081A5958: .4byte 0x00000dda -_081A595C: .4byte 0x03005d8c -_081A5960: .4byte 0x02038bca + .pool thumb_func_end sub_81A58B4 thumb_func_start sub_81A5964 sub_81A5964: @ 81A5964 push {r4,lr} - ldr r0, _081A5988 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r1, _081A598C + ldr r1, =0x00000ca9 adds r0, r3, r1 ldrb r0, [r0] lsls r0, 30 lsrs r1, r0, 30 - ldr r0, _081A5990 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 beq _081A59B0 @@ -861787,49 +832546,44 @@ sub_81A5964: @ 81A5964 beq _081A599A b _081A59EE .align 2, 0 -_081A5988: .4byte 0x03005d90 -_081A598C: .4byte 0x00000ca9 -_081A5990: .4byte 0x020375e2 + .pool _081A5994: cmp r0, 0x2 beq _081A59C8 b _081A59EE _081A599A: - ldr r0, _081A59A8 - ldr r2, _081A59AC + ldr r0, =0x020375f0 + ldr r2, =0x00000dd8 adds r1, r3, r2 ldrh r1, [r1] strh r1, [r0] b _081A59EE .align 2, 0 -_081A59A8: .4byte 0x020375f0 -_081A59AC: .4byte 0x00000dd8 + .pool _081A59B0: - ldr r2, _081A59C0 + ldr r2, =0x020375f0 lsls r1, 1 - ldr r4, _081A59C4 + ldr r4, =0x00000dda adds r0, r3, r4 adds r0, r1 ldrh r0, [r0] b _081A59EC .align 2, 0 -_081A59C0: .4byte 0x020375f0 -_081A59C4: .4byte 0x00000dda + .pool _081A59C8: cmp r1, 0 beq _081A59E0 - ldr r2, _081A59D8 - ldr r1, _081A59DC + ldr r2, =0x020375f0 + ldr r1, =0x00000cdc adds r0, r3, r1 ldr r0, [r0] movs r1, 0x80 b _081A59EA .align 2, 0 -_081A59D8: .4byte 0x020375f0 -_081A59DC: .4byte 0x00000cdc + .pool _081A59E0: - ldr r2, _081A59F4 - ldr r4, _081A59F8 + ldr r2, =0x020375f0 + ldr r4, =0x00000cdc adds r0, r3, r4 ldr r0, [r0] movs r1, 0x40 @@ -861842,21 +832596,20 @@ _081A59EE: pop {r0} bx r0 .align 2, 0 -_081A59F4: .4byte 0x020375f0 -_081A59F8: .4byte 0x00000cdc + .pool thumb_func_end sub_81A5964 thumb_func_start sub_81A59FC sub_81A59FC: @ 81A59FC push {lr} - ldr r0, _081A5A20 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r1, _081A5A24 + ldr r1, =0x00000ca9 adds r0, r2, r1 ldrb r0, [r0] lsls r0, 30 lsrs r1, r0, 30 - ldr r0, _081A5A28 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 beq _081A5A48 @@ -861866,76 +832619,70 @@ sub_81A59FC: @ 81A59FC beq _081A5A32 b _081A5ABA .align 2, 0 -_081A5A20: .4byte 0x03005d90 -_081A5A24: .4byte 0x00000ca9 -_081A5A28: .4byte 0x020375e2 + .pool _081A5A2C: cmp r0, 0x2 beq _081A5A60 b _081A5ABA _081A5A32: - ldr r0, _081A5A40 + ldr r0, =0x020375e4 ldrh r1, [r0] - ldr r3, _081A5A44 + ldr r3, =0x00000dd8 adds r0, r2, r3 strh r1, [r0] b _081A5ABA .align 2, 0 -_081A5A40: .4byte 0x020375e4 -_081A5A44: .4byte 0x00000dd8 + .pool _081A5A48: lsls r1, 1 - ldr r3, _081A5A58 + ldr r3, =0x00000dda adds r0, r2, r3 adds r0, r1 - ldr r1, _081A5A5C + ldr r1, =0x020375e4 ldrh r1, [r1] strh r1, [r0] b _081A5ABA .align 2, 0 -_081A5A58: .4byte 0x00000dda -_081A5A5C: .4byte 0x020375e4 + .pool _081A5A60: cmp r1, 0 beq _081A5A90 - ldr r0, _081A5A78 + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 beq _081A5A80 - ldr r1, _081A5A7C + ldr r1, =0x00000cdc adds r0, r2, r1 ldr r1, [r0] movs r2, 0x80 orrs r1, r2 b _081A5AB8 .align 2, 0 -_081A5A78: .4byte 0x020375e4 -_081A5A7C: .4byte 0x00000cdc + .pool _081A5A80: - ldr r3, _081A5A8C + ldr r3, =0x00000cdc adds r0, r2, r3 ldr r1, [r0] movs r2, 0x81 negs r2, r2 b _081A5AB6 .align 2, 0 -_081A5A8C: .4byte 0x00000cdc + .pool _081A5A90: - ldr r0, _081A5AA4 + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 beq _081A5AAC - ldr r1, _081A5AA8 + ldr r1, =0x00000cdc adds r0, r2, r1 ldr r1, [r0] movs r2, 0x40 orrs r1, r2 b _081A5AB8 .align 2, 0 -_081A5AA4: .4byte 0x020375e4 -_081A5AA8: .4byte 0x00000cdc + .pool _081A5AAC: - ldr r3, _081A5AC0 + ldr r3, =0x00000cdc adds r0, r2, r3 ldr r1, [r0] movs r2, 0x41 @@ -861948,17 +832695,17 @@ _081A5ABA: pop {r0} bx r0 .align 2, 0 -_081A5AC0: .4byte 0x00000cdc + .pool thumb_func_end sub_81A59FC thumb_func_start sub_81A5AC4 sub_81A5AC4: @ 81A5AC4 push {r4,lr} - ldr r4, _081A5AF8 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081A5AFC + ldr r1, =0x020375e2 ldrh r1, [r1] - ldr r2, _081A5B00 + ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] movs r0, 0x80 @@ -861966,7 +832713,7 @@ sub_81A5AC4: @ 81A5AC4 movs r1, 0 bl var_set ldr r1, [r4] - ldr r0, _081A5B04 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x4 @@ -861977,23 +832724,20 @@ sub_81A5AC4: @ 81A5AC4 pop {r0} bx r0 .align 2, 0 -_081A5AF8: .4byte 0x03005d90 -_081A5AFC: .4byte 0x020375e2 -_081A5B00: .4byte 0x00000ca8 -_081A5B04: .4byte 0x00000ca9 + .pool thumb_func_end sub_81A5AC4 thumb_func_start sub_81A5B08 sub_81A5B08: @ 81A5B08 push {r4,r5,lr} - ldr r4, _081A5B44 + ldr r4, =0x03005d90 ldr r1, [r4] - ldr r2, _081A5B48 + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 30 lsrs r0, 29 - ldr r2, _081A5B4C + ldr r2, =0x00000dda adds r1, r2 adds r1, r0 ldrh r0, [r1] @@ -862001,7 +832745,7 @@ sub_81A5B08: @ 81A5B08 bls _081A5B58 bl GenerateRandomNumber ldr r4, [r4] - ldr r5, _081A5B50 + ldr r5, =0x08611fac lsls r0, 16 lsrs r0, 16 movs r1, 0x9 @@ -862010,19 +832754,15 @@ sub_81A5B08: @ 81A5B08 lsrs r0, 15 adds r0, r5 ldrh r0, [r0] - ldr r1, _081A5B54 + ldr r1, =0x00000dd8 adds r4, r1 b _081A5B76 .align 2, 0 -_081A5B44: .4byte 0x03005d90 -_081A5B48: .4byte 0x00000ca9 -_081A5B4C: .4byte 0x00000dda -_081A5B50: .4byte 0x08611fac -_081A5B54: .4byte 0x00000dd8 + .pool _081A5B58: bl GenerateRandomNumber ldr r4, [r4] - ldr r5, _081A5B80 + ldr r5, =0x08611fa0 lsls r0, 16 lsrs r0, 16 movs r1, 0x6 @@ -862031,7 +832771,7 @@ _081A5B58: lsrs r0, 15 adds r0, r5 ldrh r0, [r0] - ldr r2, _081A5B84 + ldr r2, =0x00000dd8 adds r4, r2 _081A5B76: strh r0, [r4] @@ -862039,16 +832779,15 @@ _081A5B76: pop {r0} bx r0 .align 2, 0 -_081A5B80: .4byte 0x08611fa0 -_081A5B84: .4byte 0x00000dd8 + .pool thumb_func_end sub_81A5B08 thumb_func_start sub_81A5B88 sub_81A5B88: @ 81A5B88 push {r4,r5,lr} - ldr r4, _081A5BC0 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081A5BC4 + ldr r1, =0x00000dd8 adds r0, r1 ldrh r0, [r0] movs r1, 0x1 @@ -862058,26 +832797,23 @@ sub_81A5B88: @ 81A5B88 cmp r5, 0x1 bne _081A5BD0 ldr r0, [r4] - ldr r1, _081A5BC4 + ldr r1, =0x00000dd8 adds r0, r1 ldrh r0, [r0] - ldr r1, _081A5BC8 + ldr r1, =0x02021cc4 bl itemid_get_name ldr r0, [r4] - ldr r1, _081A5BC4 + ldr r1, =0x00000dd8 adds r0, r1 movs r1, 0 strh r1, [r0] - ldr r0, _081A5BCC + ldr r0, =0x020375f0 strh r5, [r0] b _081A5BD6 .align 2, 0 -_081A5BC0: .4byte 0x03005d90 -_081A5BC4: .4byte 0x00000dd8 -_081A5BC8: .4byte 0x02021cc4 -_081A5BCC: .4byte 0x020375f0 + .pool _081A5BD0: - ldr r1, _081A5BDC + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] _081A5BD6: @@ -862085,21 +832821,20 @@ _081A5BD6: pop {r0} bx r0 .align 2, 0 -_081A5BDC: .4byte 0x020375f0 + .pool thumb_func_end sub_81A5B88 thumb_func_start sub_81A5BE0 sub_81A5BE0: @ 81A5BE0 push {lr} - ldr r0, _081A5BF0 - ldr r1, _081A5BF4 + ldr r0, =0x02021cc4 + ldr r1, =0x02038bca ldrh r1, [r1] bl sub_8162E20 pop {r0} bx r0 .align 2, 0 -_081A5BF0: .4byte 0x02021cc4 -_081A5BF4: .4byte 0x02038bca + .pool thumb_func_end sub_81A5BE0 thumb_func_start sub_81A5BF8 @@ -862198,7 +832933,7 @@ sub_81A5BF8: @ 81A5BF8 movs r2, 0x1D movs r3, 0xF bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081A5D30 + ldr r1, =0x00000831 str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -862206,7 +832941,7 @@ sub_81A5BF8: @ 81A5BF8 movs r2, 0 movs r3, 0x13 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081A5D34 + ldr r1, =0x00000833 str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -862214,7 +832949,7 @@ sub_81A5BF8: @ 81A5BF8 movs r2, 0x1 movs r3, 0x13 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081A5D38 + ldr r1, =0x00000834 movs r0, 0x1A str r0, [sp] str r4, [sp, 0x4] @@ -862223,7 +832958,7 @@ sub_81A5BF8: @ 81A5BF8 movs r2, 0x2 movs r3, 0x13 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081A5D3C + ldr r1, =0x00000835 str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -862231,7 +832966,7 @@ sub_81A5BF8: @ 81A5BF8 movs r2, 0x1C movs r3, 0x13 bl Bg_FillWramTileMapRectWithTileAndPalette - ldr r1, _081A5D40 + ldr r1, =0x00000836 str r4, [sp] str r4, [sp, 0x4] str r5, [sp, 0x8] @@ -862246,11 +832981,7 @@ sub_81A5BF8: @ 81A5BF8 pop {r0} bx r0 .align 2, 0 -_081A5D30: .4byte 0x00000831 -_081A5D34: .4byte 0x00000833 -_081A5D38: .4byte 0x00000834 -_081A5D3C: .4byte 0x00000835 -_081A5D40: .4byte 0x00000836 + .pool thumb_func_end sub_81A5BF8 thumb_func_start sub_81A5D44 @@ -862397,8 +833128,8 @@ sub_81A5D44: @ 81A5D44 thumb_func_start sub_81A5E74 sub_81A5E74: @ 81A5E74 push {lr} - ldr r1, _081A5E8C - ldr r0, _081A5E90 + ldr r1, =0x08612120 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -862407,31 +833138,30 @@ sub_81A5E74: @ 81A5E74 pop {r0} bx r0 .align 2, 0 -_081A5E8C: .4byte 0x08612120 -_081A5E90: .4byte 0x020375e0 + .pool thumb_func_end sub_81A5E74 thumb_func_start sub_81A5E94 sub_81A5E94: @ 81A5E94 push {r4-r7,lr} - ldr r5, _081A5F74 + ldr r5, =0x03005d90 ldr r0, [r5] - ldr r4, _081A5F78 + ldr r4, =0x00000ca9 adds r0, r4 ldrb r0, [r0] lsls r0, 30 lsrs r7, r0, 30 - ldr r0, _081A5F7C + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r6, r0, 16 ldr r0, [r5] - ldr r1, _081A5F80 + ldr r1, =0x00000ca8 adds r0, r1 movs r2, 0 strb r2, [r0] ldr r1, [r5] - ldr r3, _081A5F84 + ldr r3, =0x00000cb2 adds r0, r1, r3 strh r2, [r0] adds r1, r4 @@ -862448,9 +833178,9 @@ sub_81A5E94: @ 81A5E94 ands r0, r2 strb r0, [r1] ldr r4, [r5] - ldr r0, _081A5F88 + ldr r0, =0x00000cdc adds r3, r4, r0 - ldr r2, _081A5F8C + ldr r2, =0x08612164 lsls r0, r7, 2 lsls r1, r6, 3 adds r0, r1 @@ -862463,7 +833193,7 @@ sub_81A5E94: @ 81A5E94 lsls r1, r7, 1 lsls r0, r6, 2 adds r1, r0 - ldr r2, _081A5F90 + ldr r2, =0x00000de2 adds r0, r4, r2 adds r0, r1 strh r3, [r0] @@ -862472,14 +833202,14 @@ sub_81A5E94: @ 81A5E94 adds r0, r1 strh r3, [r0] _081A5F0A: - ldr r1, _081A5F94 + ldr r1, =0x03001288 movs r0, 0 strb r0, [r1] movs r2, 0 - ldr r6, _081A5F98 + ldr r6, =0x03005d8c movs r4, 0xE7 lsls r4, 4 - ldr r0, _081A5F9C + ldr r0, =0x0000ffff adds r3, r0, 0 _081A5F1C: ldr r1, [r5] @@ -862497,8 +833227,8 @@ _081A5F1C: cmp r2, 0x5 bls _081A5F1C movs r2, 0 - ldr r4, _081A5FA0 - ldr r1, _081A5F9C + ldr r4, =0x03006298 + ldr r1, =0x0000ffff adds r3, r1, 0 _081A5F40: lsls r0, r2, 1 @@ -862520,43 +833250,31 @@ _081A5F40: negs r3, r3 movs r0, 0 bl saved_warp2_set - ldr r1, _081A5FA4 + ldr r1, =0x02038bca movs r0, 0 strh r0, [r1] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081A5F74: .4byte 0x03005d90 -_081A5F78: .4byte 0x00000ca9 -_081A5F7C: .4byte 0x000040ce -_081A5F80: .4byte 0x00000ca8 -_081A5F84: .4byte 0x00000cb2 -_081A5F88: .4byte 0x00000cdc -_081A5F8C: .4byte 0x08612164 -_081A5F90: .4byte 0x00000de2 -_081A5F94: .4byte 0x03001288 -_081A5F98: .4byte 0x03005d8c -_081A5F9C: .4byte 0x0000ffff -_081A5FA0: .4byte 0x03006298 -_081A5FA4: .4byte 0x02038bca + .pool thumb_func_end sub_81A5E94 thumb_func_start sub_81A5FA8 sub_81A5FA8: @ 81A5FA8 push {r4-r7,lr} - ldr r7, _081A5FD4 + ldr r7, =0x03005d90 ldr r0, [r7] - ldr r1, _081A5FD8 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r6, r0, 30 - ldr r0, _081A5FDC + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _081A5FE0 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x2 beq _081A6000 @@ -862566,31 +833284,27 @@ sub_81A5FA8: @ 81A5FA8 beq _081A5FEA b _081A6044 .align 2, 0 -_081A5FD4: .4byte 0x03005d90 -_081A5FD8: .4byte 0x00000ca9 -_081A5FDC: .4byte 0x000040ce -_081A5FE0: .4byte 0x020375e2 + .pool _081A5FE4: cmp r0, 0x3 beq _081A6030 b _081A6044 _081A5FEA: - ldr r3, _081A5FF8 + ldr r3, =0x020375f0 ldr r0, [r7] lsls r1, r6, 1 lsls r2, r5, 2 adds r1, r2 - ldr r2, _081A5FFC + ldr r2, =0x00000de2 b _081A603C .align 2, 0 -_081A5FF8: .4byte 0x020375f0 -_081A5FFC: .4byte 0x00000de2 + .pool _081A6000: - ldr r4, _081A6024 + ldr r4, =0x020375f0 ldr r2, [r7] - ldr r0, _081A6028 + ldr r0, =0x00000cdc adds r2, r0 - ldr r3, _081A602C + ldr r3, =0x08612164 lsls r0, r6, 2 lsls r1, r5, 3 adds r0, r1 @@ -862604,16 +833318,14 @@ _081A6000: strh r0, [r4] b _081A6044 .align 2, 0 -_081A6024: .4byte 0x020375f0 -_081A6028: .4byte 0x00000cdc -_081A602C: .4byte 0x08612164 + .pool _081A6030: - ldr r3, _081A604C + ldr r3, =0x020375f0 ldr r0, [r7] lsls r1, r6, 1 lsls r2, r5, 2 adds r1, r2 - ldr r2, _081A6050 + ldr r2, =0x00000df2 _081A603C: adds r0, r2 adds r0, r1 @@ -862624,25 +833336,24 @@ _081A6044: pop {r0} bx r0 .align 2, 0 -_081A604C: .4byte 0x020375f0 -_081A6050: .4byte 0x00000df2 + .pool thumb_func_end sub_81A5FA8 thumb_func_start sub_81A6054 sub_81A6054: @ 81A6054 push {r4-r6,lr} - ldr r6, _081A6080 + ldr r6, =0x03005d90 ldr r0, [r6] - ldr r1, _081A6084 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r5, r0, 30 - ldr r0, _081A6088 + ldr r0, =0x000040ce bl var_get lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _081A608C + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x2 beq _081A60B4 @@ -862652,10 +833363,7 @@ sub_81A6054: @ 81A6054 beq _081A6096 b _081A6128 .align 2, 0 -_081A6080: .4byte 0x03005d90 -_081A6084: .4byte 0x00000ca9 -_081A6088: .4byte 0x000040ce -_081A608C: .4byte 0x020375e2 + .pool _081A6090: cmp r0, 0x3 beq _081A6108 @@ -862665,25 +833373,24 @@ _081A6096: lsls r0, r5, 1 lsls r1, r4, 2 adds r0, r1 - ldr r1, _081A60AC + ldr r1, =0x00000de2 adds r2, r1 adds r2, r0 - ldr r0, _081A60B0 + ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] b _081A6128 .align 2, 0 -_081A60AC: .4byte 0x00000de2 -_081A60B0: .4byte 0x020375e4 + .pool _081A60B4: - ldr r0, _081A60D8 + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 beq _081A60E4 ldr r2, [r6] - ldr r0, _081A60DC + ldr r0, =0x00000cdc adds r2, r0 - ldr r3, _081A60E0 + ldr r3, =0x08612164 lsls r1, r5, 2 lsls r0, r4, 3 adds r1, r0 @@ -862694,14 +833401,12 @@ _081A60B4: str r0, [r2] b _081A6128 .align 2, 0 -_081A60D8: .4byte 0x020375e4 -_081A60DC: .4byte 0x00000cdc -_081A60E0: .4byte 0x08612164 + .pool _081A60E4: ldr r2, [r6] - ldr r1, _081A6100 + ldr r1, =0x00000cdc adds r2, r1 - ldr r3, _081A6104 + ldr r3, =0x08612174 lsls r1, r5, 2 lsls r0, r4, 3 adds r1, r0 @@ -862712,10 +833417,9 @@ _081A60E4: str r0, [r2] b _081A6128 .align 2, 0 -_081A6100: .4byte 0x00000cdc -_081A6104: .4byte 0x08612174 + .pool _081A6108: - ldr r3, _081A6130 + ldr r3, =0x03001288 ldrb r0, [r3] cmp r0, 0x1 bne _081A6128 @@ -862723,10 +833427,10 @@ _081A6108: lsls r0, r5, 1 lsls r1, r4, 2 adds r0, r1 - ldr r1, _081A6134 + ldr r1, =0x00000df2 adds r2, r1 adds r2, r0 - ldr r0, _081A6138 + ldr r0, =0x020375e4 ldrh r0, [r0] movs r1, 0 strh r0, [r2] @@ -862736,19 +833440,17 @@ _081A6128: pop {r0} bx r0 .align 2, 0 -_081A6130: .4byte 0x03001288 -_081A6134: .4byte 0x00000df2 -_081A6138: .4byte 0x020375e4 + .pool thumb_func_end sub_81A6054 thumb_func_start sub_81A613C sub_81A613C: @ 81A613C push {r4,lr} - ldr r4, _081A6170 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081A6174 + ldr r1, =0x020375e2 ldrh r1, [r1] - ldr r2, _081A6178 + ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] movs r0, 0x80 @@ -862756,7 +833458,7 @@ sub_81A613C: @ 81A613C movs r1, 0 bl var_set ldr r1, [r4] - ldr r0, _081A617C + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x4 @@ -862767,10 +833469,7 @@ sub_81A613C: @ 81A613C pop {r0} bx r0 .align 2, 0 -_081A6170: .4byte 0x03005d90 -_081A6174: .4byte 0x020375e2 -_081A6178: .4byte 0x00000ca8 -_081A617C: .4byte 0x00000ca9 + .pool thumb_func_end sub_81A613C thumb_func_start nullsub_75 @@ -862802,12 +833501,12 @@ sub_81A6198: @ 81A6198 thumb_func_start sub_81A61A4 sub_81A61A4: @ 81A61A4 - ldr r1, _081A61AC + ldr r1, =0x03001288 movs r0, 0x1 strb r0, [r1] bx lr .align 2, 0 -_081A61AC: .4byte 0x03001288 + .pool thumb_func_end sub_81A61A4 thumb_func_start sub_81A61B0 @@ -862818,15 +833517,15 @@ sub_81A61B0: @ 81A61B0 mov r5, r8 push {r5-r7} sub sp, 0x28 - ldr r4, _081A6384 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081A6388 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r0, 30 str r0, [sp, 0x10] - ldr r0, _081A638C + ldr r0, =0x000040ce bl var_get lsls r0, 16 ldr r1, [r4] @@ -862834,16 +833533,16 @@ sub_81A61B0: @ 81A61B0 lsls r2, r3, 1 lsrs r0, 14 adds r2, r0 - ldr r6, _081A6390 + ldr r6, =0x00000de2 adds r1, r6 adds r1, r2 ldrh r0, [r1] movs r1, 0x7 bl __udivsi3 - ldr r2, _081A6394 - ldr r1, _081A6398 + ldr r2, =0x0203bc88 + ldr r1, =0x085d5acc str r1, [r2] - ldr r5, _081A639C + ldr r5, =0x00000cb2 lsls r0, 24 str r0, [sp, 0x20] mov r8, r0 @@ -862865,17 +833564,17 @@ _081A61FA: ldrh r0, [r0] cmp r7, r0 bge _081A6244 - ldr r2, _081A63A0 + ldr r2, =0x00000cb4 adds r0, r1, r2 ldrh r0, [r0] - ldr r6, _081A6384 + ldr r6, =0x03005d90 cmp r0, r3 beq _081A6244 ldr r1, [r6] - ldr r6, _081A639C + ldr r6, =0x00000cb2 adds r0, r1, r6 ldrh r2, [r0] - ldr r0, _081A63A0 + ldr r0, =0x00000cb4 adds r1, r0 _081A6236: adds r1, 0x2 @@ -862887,13 +833586,13 @@ _081A6236: bne _081A6236 _081A6244: ldr r0, [r4] - ldr r1, _081A639C + ldr r1, =0x00000cb2 adds r0, r1 - ldr r6, _081A6384 + ldr r6, =0x03005d90 ldrh r0, [r0] cmp r7, r0 bne _081A61FA - ldr r0, _081A63A4 + ldr r0, =0x02038bca strh r3, [r0] ldr r2, [r6] adds r1, r2, r1 @@ -862902,7 +833601,7 @@ _081A6244: bhi _081A626C adds r1, r0, 0 lsls r1, 1 - ldr r4, _081A63A0 + ldr r4, =0x00000cb4 adds r0, r2, r4 adds r0, r1 strh r3, [r0] @@ -862924,7 +833623,7 @@ _081A627A: lsls r0, 16 lsrs r0, 16 mov r9, r0 - ldr r4, _081A63A8 + ldr r4, =0x0203bc8c ldr r2, [r4] lsls r1, r0, 4 adds r0, r1, r2 @@ -862932,7 +833631,7 @@ _081A627A: cmp r0, 0xC9 beq _081A636E movs r3, 0 - ldr r6, _081A6384 + ldr r6, =0x03005d90 mov r8, r1 adds r5, r0, 0 ldr r1, [r6] @@ -862956,7 +833655,7 @@ _081A62C0: ldr r6, [sp, 0x10] cmp r6, 0 bne _081A62D0 - ldr r0, _081A63AC + ldr r0, =0x00000351 cmp r9, r0 bhi _081A636E _081A62D0: @@ -862969,7 +833668,7 @@ _081A62D0: cmp r0, r5 beq _081A6302 adds r6, r4, 0 - ldr r3, _081A63A8 + ldr r3, =0x0203bc8c mov r12, r3 mov r5, r8 ldr r3, [sp, 0x14] @@ -862992,7 +833691,7 @@ _081A6302: movs r2, 0 cmp r2, r4 bge _081A633E - ldr r3, _081A63B0 + ldr r3, =0x085cecb0 mov r12, r3 add r0, sp, 0x8 ldr r6, [sp, 0x14] @@ -863004,7 +833703,7 @@ _081A631C: ldrh r1, [r3] cmp r1, 0 beq _081A6336 - ldr r6, _081A63A8 + ldr r6, =0x0203bc8c ldr r0, [r6] ldr r6, [sp, 0x24] adds r0, r6, r0 @@ -863023,7 +833722,7 @@ _081A633E: cmp r2, r4 bne _081A636E lsls r4, r7, 1 - ldr r0, _081A63A8 + ldr r0, =0x0203bc8c ldr r1, [r0] add r1, r8 ldrh r0, [r1] @@ -863031,13 +833730,13 @@ _081A633E: strh r0, [r2] add r2, sp, 0x8 adds r2, r4 - ldr r3, _081A63B0 + ldr r3, =0x085cecb0 ldrb r0, [r1, 0xA] lsls r0, 1 adds r0, r3 ldrh r0, [r0] strh r0, [r2] - ldr r0, _081A63B4 + ldr r0, =0x03006298 adds r4, r0 mov r3, r9 strh r3, [r4] @@ -863056,32 +833755,20 @@ _081A636E: pop {r0} bx r0 .align 2, 0 -_081A6384: .4byte 0x03005d90 -_081A6388: .4byte 0x00000ca9 -_081A638C: .4byte 0x000040ce -_081A6390: .4byte 0x00000de2 -_081A6394: .4byte 0x0203bc88 -_081A6398: .4byte 0x085d5acc -_081A639C: .4byte 0x00000cb2 -_081A63A0: .4byte 0x00000cb4 -_081A63A4: .4byte 0x02038bca -_081A63A8: .4byte 0x0203bc8c -_081A63AC: .4byte 0x00000351 -_081A63B0: .4byte 0x085cecb0 -_081A63B4: .4byte 0x03006298 + .pool thumb_func_end sub_81A61B0 thumb_func_start sub_81A63B8 sub_81A63B8: @ 81A63B8 push {lr} - ldr r0, _081A63C8 + ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 bl sub_8162614 pop {r0} bx r0 .align 2, 0 -_081A63C8: .4byte 0x02038bca + .pool thumb_func_end sub_81A63B8 thumb_func_start sub_81A63CC @@ -863089,30 +833776,27 @@ sub_81A63CC: @ 81A63CC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _081A63EC + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A63F0 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r1, [r0] movs r0, 0x3 ands r0, r1 cmp r0, 0x2 beq _081A63FC - ldr r1, _081A63F4 - ldr r0, _081A63F8 + ldr r1, =0x0203bc8c + ldr r0, =0x085d97bc b _081A6400 .align 2, 0 -_081A63EC: .4byte 0x03005d90 -_081A63F0: .4byte 0x00000ca9 -_081A63F4: .4byte 0x0203bc8c -_081A63F8: .4byte 0x085d97bc + .pool _081A63FC: - ldr r1, _081A64A0 - ldr r0, _081A64A4 + ldr r1, =0x0203bc8c + ldr r0, =0x085de02c _081A6400: str r0, [r1] movs r7, 0 - ldr r2, _081A64A8 + ldr r2, =0x03005d90 mov r8, r2 _081A6408: mov r0, r8 @@ -863122,7 +833806,7 @@ _081A6408: adds r4, r0 lsls r4, 2 adds r1, r4 - ldr r0, _081A64AC + ldr r0, =0x03006298 lsls r6, r7, 1 adds r6, r0 ldrh r0, [r6] @@ -863133,7 +833817,7 @@ _081A6408: movs r0, 0x64 adds r5, r7, 0 muls r5, r0 - ldr r0, _081A64B0 + ldr r0, =0x02024744 adds r5, r0 adds r0, r5, 0 movs r1, 0x28 @@ -863142,7 +833826,7 @@ _081A6408: mov r2, r8 ldr r1, [r2] adds r1, r4 - ldr r2, _081A64B4 + ldr r2, =0x00000e78 adds r1, r2 strb r0, [r1] adds r0, r5, 0 @@ -863151,7 +833835,7 @@ _081A6408: bl pokemon_getattr mov r2, r8 ldr r1, [r2] - ldr r2, _081A64B8 + ldr r2, =0x00000e74 adds r1, r2 adds r1, r4 str r0, [r1] @@ -863162,17 +833846,17 @@ _081A6408: mov r2, r8 ldr r1, [r2] adds r1, r4 - ldr r2, _081A64BC + ldr r2, =0x00000e79 adds r1, r2 strb r0, [r1] ldrh r1, [r6] - ldr r0, _081A64A0 + ldr r0, =0x0203bc8c ldr r0, [r0] lsls r1, 4 adds r1, r0 ldrb r2, [r1, 0xA] lsls r2, 1 - ldr r0, _081A64C0 + ldr r0, =0x085cecb0 adds r2, r0 adds r0, r5, 0 movs r1, 0xC @@ -863188,15 +833872,7 @@ _081A6408: pop {r0} bx r0 .align 2, 0 -_081A64A0: .4byte 0x0203bc8c -_081A64A4: .4byte 0x085de02c -_081A64A8: .4byte 0x03005d90 -_081A64AC: .4byte 0x03006298 -_081A64B0: .4byte 0x02024744 -_081A64B4: .4byte 0x00000e78 -_081A64B8: .4byte 0x00000e74 -_081A64BC: .4byte 0x00000e79 -_081A64C0: .4byte 0x085cecb0 + .pool thumb_func_end sub_81A63CC thumb_func_start sub_81A64C4 @@ -863207,9 +833883,9 @@ sub_81A64C4: @ 81A64C4 mov r5, r8 push {r5-r7} sub sp, 0x24 - ldr r0, _081A64F0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A64F4 + ldr r1, =0x00000ca9 adds r2, r0, r1 ldrb r1, [r2] movs r3, 0x3 @@ -863217,20 +833893,17 @@ sub_81A64C4: @ 81A64C4 ands r0, r1 cmp r0, 0x2 bne _081A6500 - ldr r1, _081A64F8 - ldr r0, _081A64FC + ldr r1, =0x0203bc8c + ldr r0, =0x085de02c str r0, [r1] movs r2, 0x1E str r2, [sp, 0x14] b _081A6518 .align 2, 0 -_081A64F0: .4byte 0x03005d90 -_081A64F4: .4byte 0x00000ca9 -_081A64F8: .4byte 0x0203bc8c -_081A64FC: .4byte 0x085de02c + .pool _081A6500: - ldr r1, _081A67C0 - ldr r0, _081A67C4 + ldr r1, =0x0203bc8c + ldr r0, =0x085d97bc str r0, [r1] ldrb r1, [r2] adds r0, r3, 0 @@ -863242,7 +833915,7 @@ _081A6500: movs r5, 0x64 str r5, [sp, 0x14] _081A6518: - ldr r0, _081A67C8 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 bls _081A6522 @@ -863254,10 +833927,10 @@ _081A6522: mov r1, sp adds r1, 0x12 str r1, [sp, 0x1C] - ldr r2, _081A67C0 + ldr r2, =0x0203bc8c mov r9, r2 _081A6534: - ldr r4, _081A67CC + ldr r4, =0x03005d90 ldr r2, [r4] mov r5, r8 lsls r5, 1 @@ -863270,13 +833943,13 @@ _081A6534: lsls r4, 4 adds r0, r1, r4 ldrh r7, [r0] - ldr r5, _081A67D0 + ldr r5, =0x00000e78 adds r1, r5 ldrb r6, [r1] movs r1, 0x64 mov r0, r8 muls r0, r1 - ldr r1, _081A67D4 + ldr r1, =0x020244ec adds r0, r1 mov r4, r9 ldr r1, [r4] @@ -863285,7 +833958,7 @@ _081A6534: ldrh r1, [r1] movs r5, 0x1 str r5, [sp] - ldr r5, _081A67D8 + ldr r5, =0x00000e74 adds r2, r5 adds r2, r3 ldr r2, [r2] @@ -863328,7 +834001,7 @@ _081A65A2: movs r0, 0x64 mov r6, r8 muls r6, r0 - ldr r3, _081A67D4 + ldr r3, =0x020244ec _081A65C4: mov r1, r9 ldr r0, [r1] @@ -863353,7 +834026,7 @@ _081A65E2: movs r2, 0x64 mov r4, r8 muls r4, r2 - ldr r5, _081A67D4 + ldr r5, =0x020244ec adds r0, r4, r5 bl pokemon_calc_effective_stats movs r0, 0 @@ -863378,7 +834051,7 @@ _081A6602: movs r5, 0x64 mov r4, r8 muls r4, r5 - ldr r0, _081A67D4 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x20 @@ -863389,7 +834062,7 @@ _081A6602: adds r0, r7, r0 ldrb r2, [r0, 0xA] lsls r2, 1 - ldr r0, _081A67DC + ldr r0, =0x085cecb0 adds r2, r0 adds r0, r4, 0 movs r1, 0xC @@ -863397,10 +834070,10 @@ _081A6602: mov r2, r10 add r2, r8 lsls r2, 2 - ldr r5, _081A67CC + ldr r5, =0x03005d90 ldr r0, [r5] adds r2, r0 - ldr r0, _081A67E0 + ldr r0, =0x00000e79 adds r2, r0 adds r0, r4, 0 movs r1, 0x2E @@ -863411,7 +834084,7 @@ _081A6602: bgt _081A666C b _081A6534 _081A666C: - ldr r0, _081A67C8 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 beq _081A667A @@ -863421,10 +834094,10 @@ _081A666C: _081A667A: movs r2, 0 mov r8, r2 - ldr r4, _081A67C0 + ldr r4, =0x0203bc8c mov r9, r4 _081A6682: - ldr r5, _081A67CC + ldr r5, =0x03005d90 ldr r3, [r5] mov r0, r8 adds r0, 0x3 @@ -863436,13 +834109,13 @@ _081A6682: lsls r4, 4 adds r0, r1, r4 ldrh r7, [r0] - ldr r5, _081A67D0 + ldr r5, =0x00000e78 adds r1, r5 ldrb r6, [r1] movs r1, 0x64 mov r0, r8 muls r0, r1 - ldr r1, _081A67E4 + ldr r1, =0x02024744 adds r0, r1 mov r4, r9 ldr r1, [r4] @@ -863451,7 +834124,7 @@ _081A6682: ldrh r1, [r1] movs r5, 0x1 str r5, [sp] - ldr r5, _081A67D8 + ldr r5, =0x00000e74 adds r3, r5 adds r3, r2 ldr r2, [r3] @@ -863497,7 +834170,7 @@ _081A66F4: movs r0, 0x64 mov r6, r8 muls r6, r0 - ldr r3, _081A67E4 + ldr r3, =0x02024744 _081A6716: mov r1, r9 ldr r0, [r1] @@ -863522,7 +834195,7 @@ _081A6734: movs r2, 0x64 mov r4, r8 muls r4, r2 - ldr r5, _081A67E4 + ldr r5, =0x02024744 adds r0, r4, r5 bl pokemon_calc_effective_stats movs r6, 0 @@ -863544,14 +834217,14 @@ _081A674E: movs r2, 0x64 mov r4, r8 muls r4, r2 - ldr r0, _081A67E4 + ldr r0, =0x02024744 adds r4, r0 mov r5, r9 ldr r0, [r5] adds r0, r7, r0 ldrb r2, [r0, 0xA] lsls r2, 1 - ldr r0, _081A67DC + ldr r0, =0x085cecb0 adds r2, r0 adds r0, r4, 0 movs r1, 0xC @@ -863559,10 +834232,10 @@ _081A674E: mov r2, r10 add r2, r8 lsls r2, 2 - ldr r1, _081A67CC + ldr r1, =0x03005d90 ldr r0, [r1] adds r2, r0 - ldr r5, _081A67E8 + ldr r5, =0x00000e9d adds r2, r5 adds r0, r4, 0 movs r1, 0x2E @@ -863582,17 +834255,7 @@ _081A67AE: pop {r0} bx r0 .align 2, 0 -_081A67C0: .4byte 0x0203bc8c -_081A67C4: .4byte 0x085d97bc -_081A67C8: .4byte 0x020375e2 -_081A67CC: .4byte 0x03005d90 -_081A67D0: .4byte 0x00000e78 -_081A67D4: .4byte 0x020244ec -_081A67D8: .4byte 0x00000e74 -_081A67DC: .4byte 0x085cecb0 -_081A67E0: .4byte 0x00000e79 -_081A67E4: .4byte 0x02024744 -_081A67E8: .4byte 0x00000e9d + .pool thumb_func_end sub_81A64C4 thumb_func_start sub_81A67EC @@ -863603,8 +834266,8 @@ sub_81A67EC: @ 81A67EC mov r5, r8 push {r5-r7} sub sp, 0x4C - ldr r1, _081A6894 - ldr r0, _081A6898 + ldr r1, =0x0203bc88 + ldr r0, =0x085d5acc str r0, [r1] mov r0, sp adds r0, 0xC @@ -863612,7 +834275,7 @@ sub_81A67EC: @ 81A67EC mov r1, sp adds r1, 0x18 str r1, [sp, 0x3C] - ldr r2, _081A689C + ldr r2, =0x03005d90 mov r9, r2 movs r2, 0 adds r3, r1, 0 @@ -863635,12 +834298,12 @@ _081A681A: bge _081A681A mov r5, r9 ldr r0, [r5] - ldr r7, _081A68A0 + ldr r7, =0x00000ca9 adds r0, r7 ldrb r4, [r0] lsls r4, 30 lsrs r4, 30 - ldr r6, _081A68A4 + ldr r6, =0x000040ce adds r0, r6, 0 bl var_get lsls r0, 24 @@ -863648,7 +834311,7 @@ _081A681A: lsls r4, 1 lsrs r0, 22 adds r4, r0 - ldr r5, _081A68A8 + ldr r5, =0x00000de2 adds r1, r5 adds r1, r4 ldrh r0, [r1] @@ -863666,8 +834329,8 @@ _081A681A: bne _081A6878 movs r2, 0x1 _081A6878: - ldr r1, _081A68AC - ldr r0, _081A68B0 + ldr r1, =0x0203bc8c + ldr r0, =0x085d97bc str r0, [r1] mov r1, r9 ldr r0, [r1] @@ -863681,14 +834344,7 @@ _081A6878: str r4, [sp, 0x28] b _081A68B8 .align 2, 0 -_081A6894: .4byte 0x0203bc88 -_081A6898: .4byte 0x085d5acc -_081A689C: .4byte 0x03005d90 -_081A68A0: .4byte 0x00000ca9 -_081A68A4: .4byte 0x000040ce -_081A68A8: .4byte 0x00000de2 -_081A68AC: .4byte 0x0203bc8c -_081A68B0: .4byte 0x085d97bc + .pool _081A68B4: movs r5, 0 str r5, [sp, 0x28] @@ -863727,7 +834383,7 @@ _081A68F2: bl sub_81A6EF0 lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _081A698C + ldr r0, =0x0203bc8c ldr r1, [r0] lsls r2, r7, 4 adds r4, r2, r1 @@ -863778,7 +834434,7 @@ _081A6950: movs r3, 0 cmp r3, r6 bge _081A699C - ldr r0, _081A6990 + ldr r0, =0x085cecb0 mov r12, r0 ldr r1, [sp, 0x30] ldr r2, [sp, 0x3C] @@ -863787,7 +834443,7 @@ _081A6964: ldrh r4, [r5] cmp r4, 0 beq _081A6994 - ldr r1, _081A698C + ldr r1, =0x0203bc8c ldr r0, [r1] mov r2, r9 adds r1, r2, r0 @@ -863804,8 +834460,7 @@ _081A6964: mov r10, r4 b _081A699C .align 2, 0 -_081A698C: .4byte 0x0203bc8c -_081A6990: .4byte 0x085cecb0 + .pool _081A6994: adds r5, 0x2 adds r3, 0x1 @@ -863814,7 +834469,7 @@ _081A6994: _081A699C: cmp r3, r6 bne _081A69E2 - ldr r0, _081A69FC + ldr r0, =0x03005d90 ldr r1, [r0] mov r5, r8 lsls r3, r5, 1 @@ -863825,13 +834480,13 @@ _081A699C: lsls r0, 4 adds r1, r0 strh r7, [r1] - ldr r2, _081A6A00 + ldr r2, =0x0203bc8c ldr r1, [r2] add r1, r9 ldrh r0, [r1] ldr r4, [sp, 0x44] strh r0, [r4] - ldr r2, _081A6A04 + ldr r2, =0x085cecb0 ldrb r0, [r1, 0xA] lsls r0, 1 adds r0, r2 @@ -863862,9 +834517,7 @@ _081A69EA: pop {r0} bx r0 .align 2, 0 -_081A69FC: .4byte 0x03005d90 -_081A6A00: .4byte 0x0203bc8c -_081A6A04: .4byte 0x085cecb0 + .pool thumb_func_end sub_81A67EC thumb_func_start sub_81A6A08 @@ -863873,12 +834526,12 @@ sub_81A6A08: @ 81A6A08 mov r7, r8 push {r7} sub sp, 0x18 - ldr r1, _081A6A98 - ldr r0, _081A6A9C + ldr r1, =0x0203bc8c + ldr r0, =0x085d97bc str r0, [r1] movs r4, 0 add r5, sp, 0x14 - ldr r7, _081A6AA0 + ldr r7, =0x020375f0 movs r1, 0 _081A6A1E: mov r2, sp @@ -863890,11 +834543,11 @@ _081A6A1E: cmp r4, 0x11 bls _081A6A1E movs r4, 0 - ldr r0, _081A6AA4 + ldr r0, =0x03006298 mov r8, r0 - ldr r0, _081A6A98 + ldr r0, =0x0203bc8c ldr r6, [r0] - ldr r1, _081A6AA8 + ldr r1, =0x083203cc mov r12, r1 _081A6A3C: lsls r0, r4, 1 @@ -863946,11 +834599,7 @@ _081A6A84: strb r4, [r5] b _081A6AB2 .align 2, 0 -_081A6A98: .4byte 0x0203bc8c -_081A6A9C: .4byte 0x085d97bc -_081A6AA0: .4byte 0x020375f0 -_081A6AA4: .4byte 0x03006298 -_081A6AA8: .4byte 0x083203cc + .pool _081A6AAC: cmp r2, r0 bne _081A6AB2 @@ -863994,8 +834643,8 @@ sub_81A6AEC: @ 81A6AEC push {r4-r7,lr} sub sp, 0x8 movs r7, 0 - ldr r1, _081A6B90 - ldr r0, _081A6B94 + ldr r1, =0x0203bc8c + ldr r0, =0x085d97bc str r0, [r1] movs r4, 0 movs r1, 0 @@ -864010,13 +834659,13 @@ _081A6AFC: bls _081A6AFC movs r4, 0 _081A6B0E: - ldr r1, _081A6B98 + ldr r1, =0x03006298 lsls r0, r4, 1 adds r0, r1 ldrh r6, [r0] movs r5, 0 _081A6B18: - ldr r0, _081A6B90 + ldr r0, =0x0203bc8c ldr r1, [r0] lsls r0, r6, 4 adds r0, r1 @@ -864042,12 +834691,12 @@ _081A6B18: lsrs r4, r0, 24 cmp r4, 0x2 bls _081A6B0E - ldr r1, _081A6B9C + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] movs r4, 0x1 adds r5, r1, 0 - ldr r3, _081A6BA0 + ldr r3, =0x08611fc0 adds r2, r5, 0 _081A6B5C: mov r1, sp @@ -864078,11 +834727,7 @@ _081A6B86: pop {r0} bx r0 .align 2, 0 -_081A6B90: .4byte 0x0203bc8c -_081A6B94: .4byte 0x085d97bc -_081A6B98: .4byte 0x03006298 -_081A6B9C: .4byte 0x020375f0 -_081A6BA0: .4byte 0x08611fc0 + .pool thumb_func_end sub_81A6AEC thumb_func_start sub_81A6BA4 @@ -864091,7 +834736,7 @@ sub_81A6BA4: @ 81A6BA4 lsls r0, 16 lsrs r5, r0, 16 movs r2, 0 - ldr r6, _081A6BD0 + ldr r6, =0x08612104 _081A6BAE: movs r3, 0 lsls r0, r2, 2 @@ -864112,7 +834757,7 @@ _081A6BC2: adds r0, r2, 0 b _081A6BEE .align 2, 0 -_081A6BD0: .4byte 0x08612104 + .pool _081A6BD4: adds r0, r3, 0x1 lsls r0, 24 @@ -864138,8 +834783,8 @@ _081A6BEE: sub_81A6BF4: @ 81A6BF4 push {lr} movs r2, 0 - ldr r1, _081A6C14 - ldr r3, _081A6C18 + ldr r1, =0x02037318 + ldr r3, =0xfffffea5 adds r0, r3, 0 ldrh r1, [r1, 0x12] adds r0, r1 @@ -864153,42 +834798,38 @@ _081A6C0C: pop {r1} bx r1 .align 2, 0 -_081A6C14: .4byte 0x02037318 -_081A6C18: .4byte 0xfffffea5 + .pool thumb_func_end sub_81A6BF4 thumb_func_start sub_81A6C1C sub_81A6C1C: @ 81A6C1C push {r4,lr} - ldr r0, _081A6C38 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A6C3C + ldr r1, =0x00000ca9 adds r0, r1 ldrb r1, [r0] movs r0, 0x3 ands r0, r1 cmp r0, 0x2 beq _081A6C48 - ldr r1, _081A6C40 - ldr r0, _081A6C44 + ldr r1, =0x0203bc8c + ldr r0, =0x085d97bc b _081A6C4C .align 2, 0 -_081A6C38: .4byte 0x03005d90 -_081A6C3C: .4byte 0x00000ca9 -_081A6C40: .4byte 0x0203bc8c -_081A6C44: .4byte 0x085d97bc + .pool _081A6C48: - ldr r1, _081A6C94 - ldr r0, _081A6C98 + ldr r1, =0x0203bc8c + ldr r0, =0x085de02c _081A6C4C: str r0, [r1] movs r4, 0 _081A6C50: movs r0, 0x64 muls r0, r4 - ldr r1, _081A6C9C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081A6CA0 + ldr r1, =0x03005d90 ldr r2, [r1] lsls r1, r4, 1 adds r1, r4 @@ -864198,13 +834839,13 @@ _081A6C50: lsls r1, 4 adds r2, r1 ldrh r2, [r2] - ldr r1, _081A6C94 + ldr r1, =0x0203bc8c ldr r1, [r1] lsls r2, 4 adds r2, r1 ldrb r2, [r2, 0xA] lsls r2, 1 - ldr r1, _081A6CA4 + ldr r1, =0x085cecb0 adds r2, r1 movs r1, 0xC bl pokemon_setattr @@ -864217,11 +834858,7 @@ _081A6C50: pop {r0} bx r0 .align 2, 0 -_081A6C94: .4byte 0x0203bc8c -_081A6C98: .4byte 0x085de02c -_081A6C9C: .4byte 0x020244ec -_081A6CA0: .4byte 0x03005d90 -_081A6CA4: .4byte 0x085cecb0 + .pool thumb_func_end sub_81A6C1C thumb_func_start sub_81A6CA8 @@ -864238,7 +834875,7 @@ sub_81A6CA8: @ 81A6CA8 bls _081A6CBE movs r1, 0x7 _081A6CBE: - ldr r0, _081A6CCC + ldr r0, =0x08612184 lsls r1, 1 adds r1, r2, r1 adds r1, r0 @@ -864246,7 +834883,7 @@ _081A6CBE: pop {r1} bx r1 .align 2, 0 -_081A6CCC: .4byte 0x08612184 + .pool thumb_func_end sub_81A6CA8 thumb_func_start sub_81A6CD0 @@ -864257,15 +834894,15 @@ sub_81A6CD0: @ 81A6CD0 mov r5, r8 push {r5-r7} sub sp, 0x34 - ldr r4, _081A6ED0 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081A6ED4 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r0, 30 str r0, [sp, 0x2C] - ldr r0, _081A6ED8 + ldr r0, =0x000040ce bl var_get lsls r0, 24 ldr r1, [r4] @@ -864273,7 +834910,7 @@ sub_81A6CD0: @ 81A6CD0 lsls r2, r3, 1 lsrs r0, 22 adds r2, r0 - ldr r7, _081A6EDC + ldr r7, =0x00000de2 adds r1, r7 adds r1, r2 ldrh r0, [r1] @@ -864316,7 +834953,7 @@ _081A6D4C: bl sub_81A6EF0 lsls r0, 16 lsrs r5, r0, 16 - ldr r7, _081A6EE0 + ldr r7, =0x0203bc8c ldr r1, [r7] lsls r0, r5, 4 adds r0, r1 @@ -864328,13 +834965,13 @@ _081A6D6A: ldr r0, [sp, 0x20] cmp r0, 0x32 bne _081A6D78 - ldr r0, _081A6EE4 + ldr r0, =0x00000351 cmp r5, r0 bls _081A6D78 b _081A6EB8 _081A6D78: movs r2, 0 - ldr r1, _081A6ED0 + ldr r1, =0x03005d90 ldr r0, [r1] movs r3, 0xE7 lsls r3, 4 @@ -864364,7 +835001,7 @@ _081A6DA8: cmp r4, r9 bge _081A6DDC add r2, sp, 0xC - ldr r7, _081A6EE0 + ldr r7, =0x0203bc8c ldr r0, [r7] lsls r1, r5, 4 adds r0, r1, r0 @@ -864373,7 +835010,7 @@ _081A6DA8: ldrh r0, [r0] cmp r2, r0 beq _081A6DDC - ldr r6, _081A6EE0 + ldr r6, =0x0203bc8c adds r3, r7, 0 add r2, sp, 0xC _081A6DC8: @@ -864393,8 +835030,8 @@ _081A6DDC: movs r4, 0 cmp r4, r9 bge _081A6E0C - ldr r7, _081A6EE8 - ldr r6, _081A6EE0 + ldr r7, =0x085cecb0 + ldr r6, =0x0203bc8c add r2, sp, 0x14 lsls r3, r5, 4 _081A6DEE: @@ -864422,7 +835059,7 @@ _081A6E0C: mov r1, sp adds r1, r2 adds r1, 0xC - ldr r3, _081A6EE0 + ldr r3, =0x0203bc8c ldr r4, [r3] lsls r5, 4 mov r8, r5 @@ -864431,7 +835068,7 @@ _081A6E0C: strh r0, [r1] add r1, sp, 0x14 adds r1, r2 - ldr r2, _081A6EE8 + ldr r2, =0x085cecb0 ldrb r0, [r4, 0xA] lsls r0, 1 adds r0, r2 @@ -864440,7 +835077,7 @@ _081A6E0C: movs r0, 0x64 mov r5, r9 muls r5, r0 - ldr r6, _081A6EEC + ldr r6, =0x02024744 adds r0, r5, r6 ldrh r1, [r4] ldr r7, [sp, 0x20] @@ -864464,7 +835101,7 @@ _081A6E0C: add r0, r9 mov r8, r0 _081A6E6E: - ldr r1, _081A6EE0 + ldr r1, =0x0203bc8c ldr r0, [r1] adds r0, r7, r0 lsls r1, r4, 1 @@ -864481,18 +835118,18 @@ _081A6E6E: movs r0, 0x64 mov r4, r9 muls r4, r0 - ldr r0, _081A6EEC + ldr r0, =0x02024744 adds r4, r0 adds r0, r4, 0 movs r1, 0x20 mov r2, r10 bl pokemon_setattr - ldr r2, _081A6EE0 + ldr r2, =0x0203bc8c ldr r0, [r2] adds r0, r7, r0 ldrb r2, [r0, 0xA] lsls r2, 1 - ldr r0, _081A6EE8 + ldr r0, =0x085cecb0 adds r2, r0 adds r0, r4, 0 movs r1, 0xC @@ -864513,14 +835150,7 @@ _081A6EC0: pop {r0} bx r0 .align 2, 0 -_081A6ED0: .4byte 0x03005d90 -_081A6ED4: .4byte 0x00000ca9 -_081A6ED8: .4byte 0x000040ce -_081A6EDC: .4byte 0x00000de2 -_081A6EE0: .4byte 0x0203bc8c -_081A6EE4: .4byte 0x00000351 -_081A6EE8: .4byte 0x085cecb0 -_081A6EEC: .4byte 0x02024744 + .pool thumb_func_end sub_81A6CD0 thumb_func_start sub_81A6EF0 @@ -864542,25 +835172,25 @@ sub_81A6EF0: @ 81A6EF0 bhi _081A6F2C cmp r2, 0 beq _081A6F20 - ldr r2, _081A6F1C + ldr r2, =0x08612194 adds r1, r3 adds r1, 0x1 b _081A6F38 .align 2, 0 -_081A6F1C: .4byte 0x08612194 + .pool _081A6F20: - ldr r2, _081A6F28 + ldr r2, =0x08612194 adds r1, r3 b _081A6F38 .align 2, 0 -_081A6F28: .4byte 0x08612194 + .pool _081A6F2C: adds r1, r3, 0 cmp r1, 0x7 beq _081A6F34 movs r1, 0x7 _081A6F34: - ldr r2, _081A6F6C + ldr r2, =0x08612194 adds r1, r4, r1 _081A6F38: lsls r1, 2 @@ -864587,7 +835217,7 @@ _081A6F38: pop {r1} bx r1 .align 2, 0 -_081A6F6C: .4byte 0x08612194 + .pool thumb_func_end sub_81A6EF0 thumb_func_start sub_81A6F70 @@ -864595,12 +835225,12 @@ sub_81A6F70: @ 81A6F70 push {lr} lsls r0, 24 lsls r1, 24 - ldr r2, _081A6FAC + ldr r2, =0x03005d90 ldr r2, [r2] lsrs r1, 23 lsrs r0, 22 adds r1, r0 - ldr r0, _081A6FB0 + ldr r0, =0x00000df2 adds r2, r0 adds r2, r1 ldrb r1, [r2] @@ -864624,30 +835254,29 @@ _081A6FA8: pop {r1} bx r1 .align 2, 0 -_081A6FAC: .4byte 0x03005d90 -_081A6FB0: .4byte 0x00000df2 + .pool thumb_func_end sub_81A6F70 thumb_func_start sub_81A6FB4 sub_81A6FB4: @ 81A6FB4 push {r4,r5,lr} - ldr r5, _081A6FFC + ldr r5, =0x03005d90 ldr r0, [r5] - ldr r1, _081A7000 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r4, r0, 30 cmp r4, 0x2 beq _081A6FF8 - ldr r0, _081A7004 + ldr r0, =0x000040ce bl var_get lsls r0, 16 ldr r1, [r5] lsls r2, r4, 1 lsrs r0, 14 adds r2, r0 - ldr r0, _081A7008 + ldr r0, =0x00000de2 adds r1, r0 adds r1, r2 ldrh r0, [r1] @@ -864655,9 +835284,9 @@ sub_81A6FB4: @ 81A6FB4 bl __udivsi3 lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _081A700C + ldr r0, =0x02038bca ldrh r1, [r0] - ldr r0, _081A7010 + ldr r0, =0x000003fe cmp r1, r0 beq _081A7018 cmp r2, 0x1 @@ -864666,12 +835295,7 @@ _081A6FF8: movs r0, 0 b _081A701E .align 2, 0 -_081A6FFC: .4byte 0x03005d90 -_081A7000: .4byte 0x00000ca9 -_081A7004: .4byte 0x000040ce -_081A7008: .4byte 0x00000de2 -_081A700C: .4byte 0x02038bca -_081A7010: .4byte 0x000003fe + .pool _081A7014: cmp r2, 0x3 ble _081A701C @@ -864705,8 +835329,8 @@ _081A7034: thumb_func_start sub_81A703C sub_81A703C: @ 81A703C push {lr} - ldr r1, _081A7054 - ldr r0, _081A7058 + ldr r1, =0x086125f8 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -864715,49 +835339,45 @@ sub_81A703C: @ 81A703C pop {r0} bx r0 .align 2, 0 -_081A7054: .4byte 0x086125f8 -_081A7058: .4byte 0x020375e0 + .pool thumb_func_end sub_81A703C thumb_func_start sub_81A705C sub_81A705C: @ 81A705C push {lr} bl sub_81A79EC - ldr r1, _081A706C + ldr r1, =0x0300128c strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_081A706C: .4byte 0x0300128c + .pool thumb_func_end sub_81A705C thumb_func_start sub_81A7070 sub_81A7070: @ 81A7070 push {r4-r7,lr} - ldr r0, _081A709C + ldr r0, =0x00004010 movs r1, 0x1C bl var_set - ldr r0, _081A70A0 + ldr r0, =0x00004011 movs r1, 0xE2 bl var_set movs r4, 0x1 movs r6, 0 movs r5, 0 movs r7, 0 - ldr r0, _081A70A4 + ldr r0, =0x0300128c ldrb r0, [r0] cmp r0, 0x8 bhi _081A7132 lsls r0, 2 - ldr r1, _081A70A8 + ldr r1, =_081A70AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A709C: .4byte 0x00004010 -_081A70A0: .4byte 0x00004011 -_081A70A4: .4byte 0x0300128c -_081A70A8: .4byte _081A70AC + .pool .align 2, 0 _081A70AC: .4byte _081A70D0 @@ -864785,7 +835405,7 @@ _081A70DE: b _081A711A _081A70E8: movs r5, 0x30 - ldr r0, _081A70F8 + ldr r0, =0x0300128d ldrb r0, [r0] movs r7, 0xE1 cmp r0, 0x1 @@ -864793,7 +835413,7 @@ _081A70E8: movs r7, 0xE2 b _081A7118 .align 2, 0 -_081A70F8: .4byte 0x0300128d + .pool _081A70FC: movs r5, 0x30 b _081A711A @@ -864815,13 +835435,13 @@ _081A7118: _081A711A: cmp r4, 0x1 bne _081A7126 - ldr r0, _081A7138 + ldr r0, =0x00004010 adds r1, r5, 0 bl var_set _081A7126: cmp r6, 0x1 bne _081A7132 - ldr r0, _081A713C + ldr r0, =0x00004011 adds r1, r7, 0 bl var_set _081A7132: @@ -864829,35 +835449,31 @@ _081A7132: pop {r0} bx r0 .align 2, 0 -_081A7138: .4byte 0x00004010 -_081A713C: .4byte 0x00004011 + .pool thumb_func_end sub_81A7070 thumb_func_start sub_81A7140 sub_81A7140: @ 81A7140 push {lr} - ldr r1, _081A7164 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r2, _081A7168 + ldr r2, =0x00000ca9 adds r0, r2 ldrb r0, [r0] lsls r0, 30 lsrs r2, r0, 30 - ldr r0, _081A716C + ldr r0, =0x020375e2 ldrh r0, [r0] adds r3, r1, 0 cmp r0, 0x4 bhi _081A723A lsls r0, 2 - ldr r1, _081A7170 + ldr r1, =_081A7174 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A7164: .4byte 0x03005d90 -_081A7168: .4byte 0x00000ca9 -_081A716C: .4byte 0x020375e2 -_081A7170: .4byte _081A7174 + .pool .align 2, 0 _081A7174: .4byte _081A7188 @@ -864866,85 +835482,77 @@ _081A7174: .4byte _081A71E8 .4byte _081A720C _081A7188: - ldr r0, _081A7198 + ldr r0, =0x020375f0 ldr r1, [r3] - ldr r3, _081A719C + ldr r3, =0x00000e02 adds r1, r3 ldrh r1, [r1] strh r1, [r0] b _081A723A .align 2, 0 -_081A7198: .4byte 0x020375f0 -_081A719C: .4byte 0x00000e02 + .pool _081A71A0: - ldr r2, _081A71B8 + ldr r2, =0x020375f0 ldr r1, [r3] - ldr r3, _081A71BC + ldr r3, =0x00000ca9 adds r0, r1, r3 ldrb r0, [r0] lsls r0, 30 lsrs r0, 29 - ldr r3, _081A71C0 + ldr r3, =0x00000e04 adds r1, r3 adds r1, r0 ldrh r0, [r1] b _081A7238 .align 2, 0 -_081A71B8: .4byte 0x020375f0 -_081A71BC: .4byte 0x00000ca9 -_081A71C0: .4byte 0x00000e04 + .pool _081A71C4: - ldr r2, _081A71DC + ldr r2, =0x020375f0 ldr r1, [r3] - ldr r3, _081A71E0 + ldr r3, =0x00000ca9 adds r0, r1, r3 ldrb r0, [r0] lsls r0, 30 lsrs r0, 29 - ldr r3, _081A71E4 + ldr r3, =0x00000e08 adds r1, r3 adds r1, r0 ldrh r0, [r1] b _081A7238 .align 2, 0 -_081A71DC: .4byte 0x020375f0 -_081A71E0: .4byte 0x00000ca9 -_081A71E4: .4byte 0x00000e08 + .pool _081A71E8: - ldr r2, _081A7200 + ldr r2, =0x020375f0 ldr r1, [r3] - ldr r3, _081A7204 + ldr r3, =0x00000ca9 adds r0, r1, r3 ldrb r0, [r0] lsls r0, 30 lsrs r0, 29 - ldr r3, _081A7208 + ldr r3, =0x00000e0c adds r1, r3 adds r1, r0 ldrh r0, [r1] b _081A7238 .align 2, 0 -_081A7200: .4byte 0x020375f0 -_081A7204: .4byte 0x00000ca9 -_081A7208: .4byte 0x00000e0c + .pool _081A720C: cmp r2, 0 beq _081A7228 - ldr r2, _081A7220 + ldr r2, =0x020375f0 ldr r0, [r3] - ldr r1, _081A7224 + ldr r1, =0x00000cdc adds r0, r1 ldr r0, [r0] movs r1, 0x80 lsls r1, 4 b _081A7236 .align 2, 0 -_081A7220: .4byte 0x020375f0 -_081A7224: .4byte 0x00000cdc + .pool _081A7228: - ldr r2, _081A7240 + ldr r2, =0x020375f0 ldr r0, [r3] - ldr r3, _081A7244 + ldr r3, =0x00000cdc adds r0, r3 ldr r0, [r0] movs r1, 0x80 @@ -864957,21 +835565,20 @@ _081A723A: pop {r0} bx r0 .align 2, 0 -_081A7240: .4byte 0x020375f0 -_081A7244: .4byte 0x00000cdc + .pool thumb_func_end sub_81A7140 thumb_func_start sub_81A7248 sub_81A7248: @ 81A7248 push {r4,r5,lr} - ldr r1, _081A7270 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r2, _081A7274 + ldr r2, =0x00000ca9 adds r0, r2 ldrb r0, [r0] lsls r0, 30 lsrs r3, r0, 30 - ldr r0, _081A7278 + ldr r0, =0x020375e2 ldrh r0, [r0] adds r2, r1, 0 cmp r0, 0x4 @@ -864979,15 +835586,12 @@ sub_81A7248: @ 81A7248 b _081A73AA _081A7264: lsls r0, 2 - ldr r1, _081A727C + ldr r1, =_081A7280 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A7270: .4byte 0x03005d90 -_081A7274: .4byte 0x00000ca9 -_081A7278: .4byte 0x020375e2 -_081A727C: .4byte _081A7280 + .pool .align 2, 0 _081A7280: .4byte _081A7294 @@ -864997,50 +835601,46 @@ _081A7280: .4byte _081A7344 _081A7294: ldr r0, [r2] - ldr r1, _081A72A4 + ldr r1, =0x020375e4 ldrh r1, [r1] - ldr r5, _081A72A8 + ldr r5, =0x00000e02 adds r0, r5 strh r1, [r0] b _081A73AA .align 2, 0 -_081A72A4: .4byte 0x020375e4 -_081A72A8: .4byte 0x00000e02 + .pool _081A72AC: - ldr r0, _081A72C8 + ldr r0, =0x020375e4 ldrh r3, [r0] - ldr r0, _081A72CC + ldr r0, =0x0000270f cmp r3, r0 bls _081A72B8 b _081A73AA _081A72B8: ldr r0, [r2] - ldr r2, _081A72D0 + ldr r2, =0x00000ca9 adds r1, r0, r2 ldrb r1, [r1] lsls r1, 30 lsrs r1, 29 - ldr r5, _081A72D4 + ldr r5, =0x00000e04 b _081A732C .align 2, 0 -_081A72C8: .4byte 0x020375e4 -_081A72CC: .4byte 0x0000270f -_081A72D0: .4byte 0x00000ca9 -_081A72D4: .4byte 0x00000e04 + .pool _081A72D8: - ldr r0, _081A7304 + ldr r0, =0x020375e4 ldrh r4, [r0] adds r3, r4, 0 - ldr r0, _081A7308 + ldr r0, =0x0000270f cmp r3, r0 bhi _081A73AA ldr r1, [r2] - ldr r2, _081A730C + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r2, r0, 30 lsrs r0, r2, 29 - ldr r5, _081A7310 + ldr r5, =0x00000e08 adds r1, r5 adds r0, r1, r0 ldrh r0, [r0] @@ -865051,42 +835651,36 @@ _081A72D8: strh r4, [r0] b _081A73AA .align 2, 0 -_081A7304: .4byte 0x020375e4 -_081A7308: .4byte 0x0000270f -_081A730C: .4byte 0x00000ca9 -_081A7310: .4byte 0x00000e08 + .pool _081A7314: - ldr r0, _081A7334 + ldr r0, =0x020375e4 ldrh r3, [r0] - ldr r0, _081A7338 + ldr r0, =0x0000270f cmp r3, r0 bhi _081A73AA ldr r0, [r2] - ldr r2, _081A733C + ldr r2, =0x00000ca9 adds r1, r0, r2 ldrb r1, [r1] lsls r1, 30 lsrs r1, 29 - ldr r5, _081A7340 + ldr r5, =0x00000e0c _081A732C: adds r0, r5 adds r0, r1 strh r3, [r0] b _081A73AA .align 2, 0 -_081A7334: .4byte 0x020375e4 -_081A7338: .4byte 0x0000270f -_081A733C: .4byte 0x00000ca9 -_081A7340: .4byte 0x00000e0c + .pool _081A7344: cmp r3, 0 beq _081A737C - ldr r0, _081A7360 + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 beq _081A7368 ldr r0, [r2] - ldr r1, _081A7364 + ldr r1, =0x00000cdc adds r0, r1 ldr r1, [r0] movs r2, 0x80 @@ -865094,25 +835688,23 @@ _081A7344: orrs r1, r2 b _081A73A8 .align 2, 0 -_081A7360: .4byte 0x020375e4 -_081A7364: .4byte 0x00000cdc + .pool _081A7368: ldr r0, [r2] - ldr r2, _081A7374 + ldr r2, =0x00000cdc adds r0, r2 ldr r1, [r0] - ldr r2, _081A7378 + ldr r2, =0xfffff7ff b _081A73A6 .align 2, 0 -_081A7374: .4byte 0x00000cdc -_081A7378: .4byte 0xfffff7ff + .pool _081A737C: - ldr r0, _081A7394 + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 beq _081A739C ldr r0, [r2] - ldr r5, _081A7398 + ldr r5, =0x00000cdc adds r0, r5 ldr r1, [r0] movs r2, 0x80 @@ -865120,14 +835712,13 @@ _081A737C: orrs r1, r2 b _081A73A8 .align 2, 0 -_081A7394: .4byte 0x020375e4 -_081A7398: .4byte 0x00000cdc + .pool _081A739C: ldr r0, [r2] - ldr r1, _081A73B0 + ldr r1, =0x00000cdc adds r0, r1 ldr r1, [r0] - ldr r2, _081A73B4 + ldr r2, =0xfffffbff _081A73A6: ands r1, r2 _081A73A8: @@ -865137,78 +835728,74 @@ _081A73AA: pop {r0} bx r0 .align 2, 0 -_081A73B0: .4byte 0x00000cdc -_081A73B4: .4byte 0xfffffbff + .pool thumb_func_end sub_81A7248 thumb_func_start sub_81A73B8 sub_81A73B8: @ 81A73B8 push {lr} - ldr r0, _081A73D0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A73D4 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] cmp r0, 0xE bls _081A73DC - ldr r1, _081A73D8 + ldr r1, =0x020375f0 movs r0, 0x1 b _081A73E0 .align 2, 0 -_081A73D0: .4byte 0x03005d90 -_081A73D4: .4byte 0x00000cb2 -_081A73D8: .4byte 0x020375f0 + .pool _081A73DC: - ldr r1, _081A73E8 + ldr r1, =0x020375f0 movs r0, 0 _081A73E0: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_081A73E8: .4byte 0x020375f0 + .pool thumb_func_end sub_81A73B8 thumb_func_start sub_81A73EC sub_81A73EC: @ 81A73EC - ldr r0, _081A73F8 - ldr r1, _081A73FC + ldr r0, =0x020375f0 + ldr r1, =0x0300128c ldrb r1, [r1] strh r1, [r0] bx lr .align 2, 0 -_081A73F8: .4byte 0x020375f0 -_081A73FC: .4byte 0x0300128c + .pool thumb_func_end sub_81A73EC thumb_func_start sub_81A7400 sub_81A7400: @ 81A7400 - ldr r1, _081A7408 + ldr r1, =0x0300128e movs r0, 0x1 strb r0, [r1] bx lr .align 2, 0 -_081A7408: .4byte 0x0300128e + .pool thumb_func_end sub_81A7400 thumb_func_start sub_81A740C sub_81A740C: @ 81A740C - ldr r1, _081A7414 + ldr r1, =0x0300128e movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_081A7414: .4byte 0x0300128e + .pool thumb_func_end sub_81A740C thumb_func_start sub_81A7418 sub_81A7418: @ 81A7418 push {r4,lr} - ldr r4, _081A7450 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081A7454 + ldr r1, =0x020375e2 ldrh r1, [r1] - ldr r2, _081A7458 + ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] movs r0, 0x80 @@ -865216,7 +835803,7 @@ sub_81A7418: @ 81A7418 movs r1, 0 bl var_set ldr r1, [r4] - ldr r0, _081A745C + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x4 @@ -865229,10 +835816,7 @@ sub_81A7418: @ 81A7418 pop {r0} bx r0 .align 2, 0 -_081A7450: .4byte 0x03005d90 -_081A7454: .4byte 0x020375e2 -_081A7458: .4byte 0x00000ca8 -_081A745C: .4byte 0x00000ca9 + .pool thumb_func_end sub_81A7418 thumb_func_start nullsub_76 @@ -865248,7 +835832,7 @@ nullsub_124: @ 81A7464 thumb_func_start sub_81A7468 sub_81A7468: @ 81A7468 push {lr} - ldr r0, _081A7480 + ldr r0, =0x03001290 ldr r0, [r0] cmp r0, 0x20 beq _081A748E @@ -865260,7 +835844,7 @@ sub_81A7468: @ 81A7468 beq _081A7498 b _081A74C2 .align 2, 0 -_081A7480: .4byte 0x03001290 + .pool _081A7484: cmp r0, 0x40 beq _081A74B0 @@ -865268,31 +835852,31 @@ _081A7484: beq _081A74A4 b _081A74C2 _081A748E: - ldr r1, _081A7494 + ldr r1, =0x020375f0 movs r0, 0 b _081A74C0 .align 2, 0 -_081A7494: .4byte 0x020375f0 + .pool _081A7498: - ldr r1, _081A74A0 + ldr r1, =0x020375f0 movs r0, 0x1 b _081A74C0 .align 2, 0 -_081A74A0: .4byte 0x020375f0 + .pool _081A74A4: - ldr r1, _081A74AC + ldr r1, =0x020375f0 movs r0, 0x2 b _081A74C0 .align 2, 0 -_081A74AC: .4byte 0x020375f0 + .pool _081A74B0: - ldr r1, _081A74B8 + ldr r1, =0x020375f0 movs r0, 0x3 b _081A74C0 .align 2, 0 -_081A74B8: .4byte 0x020375f0 + .pool _081A74BC: - ldr r1, _081A74C8 + ldr r1, =0x020375f0 movs r0, 0x4 _081A74C0: strh r0, [r1] @@ -865300,19 +835884,18 @@ _081A74C2: pop {r0} bx r0 .align 2, 0 -_081A74C8: .4byte 0x020375f0 + .pool thumb_func_end sub_81A7468 thumb_func_start sub_81A74CC sub_81A74CC: @ 81A74CC - ldr r0, _081A74D8 - ldr r1, _081A74DC + ldr r0, =0x020375f0 + ldr r1, =0x0300128d ldrb r1, [r1] strh r1, [r0] bx lr .align 2, 0 -_081A74D8: .4byte 0x020375f0 -_081A74DC: .4byte 0x0300128d + .pool thumb_func_end sub_81A74CC thumb_func_start sub_81A74E0 @@ -865327,53 +835910,49 @@ sub_81A74E0: @ 81A74E0 adds r4, 0x1 adds r0, r4, 0 bl sub_81A7F38 - ldr r0, _081A7504 + ldr r0, =0x020375f0 strh r4, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081A7504: .4byte 0x020375f0 + .pool thumb_func_end sub_81A74E0 thumb_func_start sub_81A7508 sub_81A7508: @ 81A7508 push {lr} - ldr r0, _081A7528 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A752C + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] cmp r0, 0x4 bhi _081A7538 - ldr r1, _081A7530 - ldr r0, _081A7534 + ldr r1, =0x0861231c + ldr r0, =0x03001294 ldrb r0, [r0] lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x2] b _081A7560 .align 2, 0 -_081A7528: .4byte 0x03005d90 -_081A752C: .4byte 0x00000cb2 -_081A7530: .4byte 0x0861231c -_081A7534: .4byte 0x03001294 + .pool _081A7538: cmp r0, 0xA bhi _081A7554 - ldr r1, _081A754C - ldr r0, _081A7550 + ldr r1, =0x0861231c + ldr r0, =0x03001294 ldrb r0, [r0] lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x3] b _081A7560 .align 2, 0 -_081A754C: .4byte 0x0861231c -_081A7550: .4byte 0x03001294 + .pool _081A7554: - ldr r1, _081A7574 - ldr r0, _081A7578 + ldr r1, =0x0861231c + ldr r0, =0x03001294 ldrb r0, [r0] lsls r0, 3 adds r0, r1 @@ -865382,27 +835961,25 @@ _081A7560: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, _081A757C + ldr r1, =0x086123e4 adds r0, r1 bl sub_81638AC pop {r0} bx r0 .align 2, 0 -_081A7574: .4byte 0x0861231c -_081A7578: .4byte 0x03001294 -_081A757C: .4byte 0x086123e4 + .pool thumb_func_end sub_81A7508 thumb_func_start sub_81A7580 sub_81A7580: @ 81A7580 push {lr} - ldr r0, _081A7590 + ldr r0, =sub_81A7EE4 + 1 movs r1, 0x2 bl AddTask pop {r0} bx r0 .align 2, 0 -_081A7590: .4byte sub_81A7EE4 + 1 + .pool thumb_func_end sub_81A7580 thumb_func_start sub_81A7594 @@ -865551,7 +836128,7 @@ _081A7696: beq _081A76E0 cmp r1, 0x80 bne _081A771C - ldr r1, _081A76C0 + ldr r1, =0x083203cc lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -865568,9 +836145,9 @@ _081A7696: bne _081A771C b _081A771A .align 2, 0 -_081A76C0: .4byte 0x083203cc + .pool _081A76C4: - ldr r0, _081A76DC + ldr r0, =0x083203cc lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -865583,9 +836160,9 @@ _081A76C4: bne _081A771C b _081A771A .align 2, 0 -_081A76DC: .4byte 0x083203cc + .pool _081A76E0: - ldr r1, _081A7700 + ldr r1, =0x083203cc lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -865602,9 +836179,9 @@ _081A76E0: bne _081A771C b _081A771A .align 2, 0 -_081A7700: .4byte 0x083203cc + .pool _081A7704: - ldr r0, _081A7724 + ldr r0, =0x083203cc lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -865622,7 +836199,7 @@ _081A771C: pop {r1} bx r1 .align 2, 0 -_081A7724: .4byte 0x083203cc + .pool thumb_func_end sub_81A767C thumb_func_start sub_81A7728 @@ -865674,9 +836251,9 @@ _081A774A: mov r8, r0 cmp r0, 0x9 bls _081A774A - ldr r0, _081A77D0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r4, _081A77D4 + ldr r4, =0x00000cb2 adds r0, r4 ldrh r0, [r0] movs r1, 0x1 @@ -865692,7 +836269,7 @@ _081A774A: _081A77A8: movs r1, 0 str r1, [sp, 0x4] - ldr r7, _081A77D8 + ldr r7, =0x03001290 _081A77AE: movs r4, 0 mov r9, r4 @@ -865709,9 +836286,7 @@ _081A77AE: movs r0, 0x80 b _081A77FC .align 2, 0 -_081A77D0: .4byte 0x03005d90 -_081A77D4: .4byte 0x00000cb2 -_081A77D8: .4byte 0x03001290 + .pool _081A77DC: cmp r0, 0x3B bhi _081A77E4 @@ -865735,7 +836310,7 @@ _081A77FA: movs r0, 0x10 _081A77FC: str r0, [r7] - ldr r0, _081A7890 + ldr r0, =0x03001290 ldr r0, [r0] ldr r1, [sp, 0x4] cmp r1, r0 @@ -865750,7 +836325,7 @@ _081A7810: ldrb r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _081A7894 + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x37 @@ -865796,7 +836371,7 @@ _081A7874: mov r0, r9 cmp r0, 0 beq _081A77AE - ldr r0, _081A7890 + ldr r0, =0x03001290 ldr r0, [r0] cmp r0, 0x20 beq _081A7898 @@ -865808,14 +836383,13 @@ _081A7874: beq _081A78A4 b _081A78D0 .align 2, 0 -_081A7890: .4byte 0x03001290 -_081A7894: .4byte 0x020244ec + .pool _081A7898: - ldr r1, _081A78A0 + ldr r1, =0x0300128d movs r0, 0x1 b _081A78D4 .align 2, 0 -_081A78A0: .4byte 0x0300128d + .pool _081A78A4: bl GenerateRandomNumber lsls r0, 16 @@ -865824,22 +836398,22 @@ _081A78A4: ands r1, r2 cmp r1, 0 beq _081A78C0 - ldr r0, _081A78BC + ldr r0, =0x0300128d strb r2, [r0] b _081A78D6 .align 2, 0 -_081A78BC: .4byte 0x0300128d + .pool _081A78C0: - ldr r0, _081A78C8 + ldr r0, =0x0300128d strb r1, [r0] b _081A78D6 .align 2, 0 -_081A78C8: .4byte 0x0300128d + .pool _081A78CC: movs r0, 0 b _081A7956 _081A78D0: - ldr r1, _081A7968 + ldr r1, =0x0300128d movs r0, 0 _081A78D4: strb r0, [r1] @@ -865853,7 +836427,7 @@ _081A78DC: ldrb r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _081A796C + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x37 @@ -865877,7 +836451,7 @@ _081A78DC: bl pokemon_getattr lsls r0, 16 lsrs r4, r0, 16 - ldr r7, _081A7970 + ldr r7, =0x03001290 ldr r1, [r7] adds r0, r5, 0 bl sub_81A7628 @@ -865914,17 +836488,15 @@ _081A7956: pop {r1} bx r1 .align 2, 0 -_081A7968: .4byte 0x0300128d -_081A796C: .4byte 0x020244ec -_081A7970: .4byte 0x03001290 + .pool thumb_func_end sub_81A7728 thumb_func_start sub_81A7974 sub_81A7974: @ 81A7974 push {r4-r7,lr} - ldr r0, _081A7994 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A7998 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] movs r7, 0x1 @@ -865939,8 +836511,7 @@ _081A798E: movs r5, 0 b _081A79A2 .align 2, 0 -_081A7994: .4byte 0x03005d90 -_081A7998: .4byte 0x00000cb2 + .pool _081A799C: adds r0, r5, 0x1 lsls r0, 24 @@ -865951,7 +836522,7 @@ _081A79A2: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081A79E0 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x37 @@ -865977,7 +836548,7 @@ _081A79D8: movs r0, 0x1 b _081A79E6 .align 2, 0 -_081A79E0: .4byte 0x020244ec + .pool _081A79E4: movs r0, 0 _081A79E6: @@ -865990,7 +836561,7 @@ _081A79E6: sub_81A79EC: @ 81A79EC push {r4-r6,lr} sub sp, 0x8 - ldr r1, _081A7A0C + ldr r1, =0x03005d90 ldr r0, [r1] movs r4, 0xE1 lsls r4, 4 @@ -866005,9 +836576,9 @@ sub_81A79EC: @ 81A79EC lsrs r0, 28 b _081A7B48 .align 2, 0 -_081A7A0C: .4byte 0x03005d90 + .pool _081A7A10: - ldr r0, _081A7A30 + ldr r0, =0x020375e6 lsls r1, r2, 29 ldrh r0, [r0] lsrs r1, 29 @@ -866024,10 +836595,10 @@ _081A7A24: lsrs r0, 28 b _081A7B48 .align 2, 0 -_081A7A30: .4byte 0x020375e6 + .pool _081A7A34: movs r2, 0 - ldr r3, _081A7B50 + ldr r3, =0x0861266c movs r1, 0 _081A7A3A: mov r4, sp @@ -866098,7 +836669,7 @@ _081A7AA0: lsls r0, 24 lsrs r4, r0, 24 _081A7ABE: - ldr r0, _081A7B54 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xE1 lsls r1, 4 @@ -866173,21 +836744,20 @@ _081A7B48: pop {r1} bx r1 .align 2, 0 -_081A7B50: .4byte 0x0861266c -_081A7B54: .4byte 0x03005d90 + .pool thumb_func_end sub_81A79EC thumb_func_start sub_81A7B58 sub_81A7B58: @ 81A7B58 push {r4,lr} - ldr r4, _081A7B7C + ldr r4, =0x03001294 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x19 bl __umodsi3 strb r0, [r4] - ldr r1, _081A7B80 + ldr r1, =0x0861231c ldrb r0, [r4] lsls r0, 3 adds r0, r1 @@ -866196,17 +836766,16 @@ sub_81A7B58: @ 81A7B58 pop {r1} bx r1 .align 2, 0 -_081A7B7C: .4byte 0x03001294 -_081A7B80: .4byte 0x0861231c + .pool thumb_func_end sub_81A7B58 thumb_func_start sub_81A7B84 sub_81A7B84: @ 81A7B84 - ldr r0, _081A7B8C + ldr r0, =0x0300128e ldrb r0, [r0] bx lr .align 2, 0 -_081A7B8C: .4byte 0x0300128e + .pool thumb_func_end sub_81A7B84 thumb_func_start sub_81A7B90 @@ -866223,18 +836792,18 @@ sub_81A7B90: @ 81A7B90 bl sub_81A7D00 lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _081A7C0C + ldr r7, =0x03005d90 ldr r0, [r7] - ldr r4, _081A7C10 + ldr r4, =0x00000ca9 adds r0, r4 ldrb r0, [r0] lsls r0, 30 - ldr r1, _081A7C14 + ldr r1, =0x08612314 lsrs r0, 28 adds r0, r1 ldr r0, [r0] str r0, [sp, 0x4] - ldr r0, _081A7C18 + ldr r0, =0x02024744 movs r1, 0xB movs r2, 0 bl pokemon_getattr @@ -866271,10 +836840,7 @@ _081A7C08: movs r7, 0x3C b _081A7C32 .align 2, 0 -_081A7C0C: .4byte 0x03005d90 -_081A7C10: .4byte 0x00000ca9 -_081A7C14: .4byte 0x08612314 -_081A7C18: .4byte 0x02024744 + .pool _081A7C1C: lsls r0, r6, 2 ldr r2, [sp, 0x4] @@ -866300,8 +836866,8 @@ _081A7C32: movs r0, 0 b _081A7CE2 _081A7C4A: - ldr r0, _081A7CF4 - ldr r1, _081A7CF8 + ldr r0, =0x02024744 + ldr r1, =0x083203cc mov r8, r1 lsls r6, 2 mov r9, r6 @@ -866323,7 +836889,7 @@ _081A7C4A: lsls r1, 1 muls r2, r1 lsls r1, r7, 2 - ldr r3, _081A7CFC + ldr r3, =0x0831f72c adds r1, r3 adds r2, r1 movs r1, 0x19 @@ -866347,7 +836913,7 @@ _081A7C4A: ands r0, r1 _081A7CA8: str r0, [sp] - ldr r0, _081A7CF4 + ldr r0, =0x02024744 movs r1, 0x2E mov r2, sp bl pokemon_setattr @@ -866365,12 +836931,12 @@ _081A7CBA: ldrh r1, [r0] lsls r2, r4, 24 lsrs r2, 24 - ldr r0, _081A7CF4 + ldr r0, =0x02024744 bl sub_80691F4 adds r4, 0x1 cmp r4, 0x3 ble _081A7CBA - ldr r0, _081A7CF4 + ldr r0, =0x02024744 bl pokemon_calc_effective_stats movs r0, 0x1 _081A7CE2: @@ -866383,22 +836949,20 @@ _081A7CE2: pop {r1} bx r1 .align 2, 0 -_081A7CF4: .4byte 0x02024744 -_081A7CF8: .4byte 0x083203cc -_081A7CFC: .4byte 0x0831f72c + .pool thumb_func_end sub_81A7B90 thumb_func_start sub_81A7D00 sub_81A7D00: @ 81A7D00 push {lr} - ldr r0, _081A7D28 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r2, _081A7D2C + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 30 lsrs r0, 29 - ldr r2, _081A7D30 + ldr r2, =0x00000e04 adds r1, r2 adds r1, r0 ldrh r1, [r1] @@ -866410,9 +836974,7 @@ sub_81A7D00: @ 81A7D00 movs r1, 0 b _081A7D4C .align 2, 0 -_081A7D28: .4byte 0x03005d90 -_081A7D2C: .4byte 0x00000ca9 -_081A7D30: .4byte 0x00000e04 + .pool _081A7D34: movs r0, 0x8C lsls r0, 2 @@ -866438,8 +837000,8 @@ sub_81A7D54: @ 81A7D54 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081A7D84 - ldr r2, _081A7D88 + ldr r5, =0x08612688 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -866459,8 +837021,7 @@ _081A7D66: pop {r0} bx r0 .align 2, 0 -_081A7D84: .4byte 0x08612688 -_081A7D88: .4byte 0x03005e00 + .pool thumb_func_end sub_81A7D54 thumb_func_start sub_81A7D8C @@ -866494,7 +837055,7 @@ _081A7DBC: movs r0, 0x1 negs r0, r0 ldrb r1, [r4, 0x16] - ldr r2, _081A7DE4 + ldr r2, =0x00002d6b bl sub_80A2A20 _081A7DC8: movs r2, 0x16 @@ -866512,7 +837073,7 @@ _081A7DDA: pop {r1} bx r1 .align 2, 0 -_081A7DE4: .4byte 0x00002d6b + .pool thumb_func_end sub_81A7D8C thumb_func_start sub_81A7DE8 @@ -866545,7 +837106,7 @@ _081A7E16: movs r0, 0x1 negs r0, r0 ldrb r1, [r4, 0x16] - ldr r2, _081A7E48 + ldr r2, =0x00002d6b bl sub_80A2A20 _081A7E22: movs r0, 0x16 @@ -866558,15 +837119,14 @@ _081A7E22: lsls r0, 16 cmp r0, 0 bne _081A7E50 - ldr r0, _081A7E4C + ldr r0, =sub_81A7D54 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task b _081A7E56 .align 2, 0 -_081A7E48: .4byte 0x00002d6b -_081A7E4C: .4byte sub_81A7D54 + 1 + .pool _081A7E50: ldrh r0, [r4, 0xA] strh r0, [r4, 0x14] @@ -866600,13 +837160,13 @@ sub_81A7E60: @ 81A7E60 lsrs r6, 16 lsls r3, 16 lsrs r3, 16 - ldr r0, _081A7EBC + ldr r0, =sub_81A7D54 + 1 movs r1, 0x3 str r3, [sp] bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081A7EC0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -866626,14 +837186,13 @@ sub_81A7E60: @ 81A7E60 pop {r0} bx r0 .align 2, 0 -_081A7EBC: .4byte sub_81A7D54 + 1 -_081A7EC0: .4byte 0x03005e00 + .pool thumb_func_end sub_81A7E60 thumb_func_start sub_81A7EC4 sub_81A7EC4: @ 81A7EC4 push {lr} - ldr r0, _081A7ED8 + ldr r0, =sub_81A7D54 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -866642,7 +837201,7 @@ sub_81A7EC4: @ 81A7EC4 movs r0, 0 b _081A7EDE .align 2, 0 -_081A7ED8: .4byte sub_81A7D54 + 1 + .pool _081A7EDC: movs r0, 0x1 _081A7EDE: @@ -866657,7 +837216,7 @@ sub_81A7EE4: @ 81A7EE4 lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - ldr r1, _081A7F18 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -866678,7 +837237,7 @@ sub_81A7EE4: @ 81A7EE4 bl sub_81A7E60 b _081A7F30 .align 2, 0 -_081A7F18: .4byte 0x03005e00 + .pool _081A7F1C: bl sub_81A7EC4 lsls r0, 24 @@ -866763,7 +837322,7 @@ _081A7FB0: ldrb r1, [r4] movs r0, 0x64 muls r1, r0 - ldr r0, _081A7FF8 + ldr r0, =0x020244ec adds r7, r1, r0 adds r0, r7, 0 movs r1, 0x39 @@ -866789,7 +837348,7 @@ _081A7FB0: mov r10, r0 b _081A8048 .align 2, 0 -_081A7FF8: .4byte 0x020244ec + .pool _081A7FFC: adds r0, r7, 0 movs r1, 0x15 @@ -866836,7 +837395,7 @@ _081A8048: ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081A808C + ldr r1, =0x020244ec adds r0, r1 bl sub_81A7594 ldr r0, [sp, 0x4] @@ -866864,13 +837423,13 @@ _081A807A: pop {r0} bx r0 .align 2, 0 -_081A808C: .4byte 0x020244ec + .pool thumb_func_end sub_81A7F38 thumb_func_start sub_81A8090 sub_81A8090: @ 81A8090 push {r4,lr} - ldr r4, _081A80A4 + ldr r4, =0x020375f0 bl sub_81A80A8 lsls r0, 24 lsrs r0, 24 @@ -866879,16 +837438,16 @@ sub_81A8090: @ 81A8090 pop {r0} bx r0 .align 2, 0 -_081A80A4: .4byte 0x020375f0 + .pool thumb_func_end sub_81A8090 thumb_func_start sub_81A80A8 sub_81A80A8: @ 81A80A8 push {lr} movs r2, 0 - ldr r0, _081A80D4 + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] - ldr r3, _081A80D8 + ldr r3, =0xfffffea1 adds r0, r1, r3 lsls r0, 16 lsrs r0, 16 @@ -866908,8 +837467,7 @@ _081A80CC: pop {r1} bx r1 .align 2, 0 -_081A80D4: .4byte 0x02037318 -_081A80D8: .4byte 0xfffffea1 + .pool thumb_func_end sub_81A80A8 thumb_func_start sub_81A80DC @@ -866917,7 +837475,7 @@ sub_81A80DC: @ 81A80DC push {r4-r7,lr} mov r7, r8 push {r7} - ldr r4, _081A8130 + ldr r4, =0x020375f0 movs r0, 0 strh r0, [r4] movs r0, 0x1 @@ -866928,7 +837486,7 @@ sub_81A80DC: @ 81A80DC movs r0, 0x1 strh r0, [r4] bl GenerateRandomNumber - ldr r5, _081A8134 + ldr r5, =0x03005d90 ldr r4, [r5] lsls r0, 16 lsrs r0, 16 @@ -866954,11 +837512,10 @@ sub_81A80DC: @ 81A80DC movs r1, 0x40 b _081A8248 .align 2, 0 -_081A8130: .4byte 0x020375f0 -_081A8134: .4byte 0x03005d90 + .pool _081A8138: bl GenerateRandomNumber - ldr r7, _081A81AC + ldr r7, =0x03005d90 ldr r4, [r7] lsls r0, 16 lsrs r0, 16 @@ -867015,7 +837572,7 @@ _081A8184: strb r2, [r1] b _081A81B4 .align 2, 0 -_081A81AC: .4byte 0x03005d90 + .pool _081A81B0: adds r0, r5, r2 strb r2, [r0] @@ -867027,7 +837584,7 @@ _081A81B4: bcc _081A8184 _081A81BE: bl GenerateRandomNumber - ldr r7, _081A8258 + ldr r7, =0x03005d90 ldr r4, [r7] lsls r0, 16 lsrs r0, 16 @@ -867070,7 +837627,7 @@ _081A81BE: orrs r0, r1 strb r0, [r2] _081A821C: - ldr r5, _081A8258 + ldr r5, =0x03005d90 ldr r0, [r5] movs r4, 0xE1 lsls r4, 4 @@ -867101,13 +837658,13 @@ _081A824C: pop {r0} bx r0 .align 2, 0 -_081A8258: .4byte 0x03005d90 + .pool thumb_func_end sub_81A80DC thumb_func_start sub_81A825C sub_81A825C: @ 81A825C - ldr r1, _081A8274 - ldr r0, _081A8278 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] movs r2, 0xE1 lsls r2, 4 @@ -867118,15 +837675,14 @@ sub_81A825C: @ 81A825C strh r0, [r1] bx lr .align 2, 0 -_081A8274: .4byte 0x020375f0 -_081A8278: .4byte 0x03005d90 + .pool thumb_func_end sub_81A825C thumb_func_start sub_81A827C sub_81A827C: @ 81A827C - ldr r2, _081A8298 - ldr r1, _081A829C - ldr r0, _081A82A0 + ldr r2, =0x020375f0 + ldr r1, =0x0861266c + ldr r0, =0x03005d90 ldr r0, [r0] movs r3, 0xE1 lsls r3, 4 @@ -867139,9 +837695,7 @@ sub_81A827C: @ 81A827C strh r0, [r2] bx lr .align 2, 0 -_081A8298: .4byte 0x020375f0 -_081A829C: .4byte 0x0861266c -_081A82A0: .4byte 0x03005d90 + .pool thumb_func_end sub_81A827C thumb_func_start sub_81A82A4 @@ -867153,14 +837707,14 @@ sub_81A82A4: @ 81A82A4 bne _081A82B0 movs r7, 0x1 _081A82B0: - ldr r4, _081A82F8 + ldr r4, =0x03005d90 ldr r1, [r4] - ldr r2, _081A82FC + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 30 lsrs r0, 29 - ldr r2, _081A8300 + ldr r2, =0x00000e04 adds r1, r2 adds r1, r0 ldrh r0, [r1] @@ -867178,21 +837732,17 @@ _081A82D2: lsrs r4, r0, 16 movs r3, 0 ldr r1, [r5] - ldr r2, _081A8304 + ldr r2, =0x00000cb2 adds r0, r1, r2 ldrh r0, [r0] subs r2, r0, 0x1 cmp r3, r2 bge _081A831A - ldr r0, _081A8308 + ldr r0, =0x00000cb4 adds r1, r0 b _081A8314 .align 2, 0 -_081A82F8: .4byte 0x03005d90 -_081A82FC: .4byte 0x00000ca9 -_081A8300: .4byte 0x00000e04 -_081A8304: .4byte 0x00000cb2 -_081A8308: .4byte 0x00000cb4 + .pool _081A830C: adds r1, 0x2 adds r3, 0x1 @@ -867204,30 +837754,30 @@ _081A8314: bne _081A830C _081A831A: ldr r0, [r5] - ldr r1, _081A835C + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] subs r0, 0x1 cmp r3, r0 bne _081A82D2 - ldr r5, _081A8360 + ldr r5, =0x02038bca strh r4, [r5] - ldr r1, _081A8364 - ldr r0, _081A8368 + ldr r1, =0x0203bc88 + ldr r0, =0x085d5acc str r0, [r1] ldrh r0, [r5] movs r1, 0 bl sub_8162614 - ldr r0, _081A836C + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _081A835C + ldr r0, =0x00000cb2 adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0xD bhi _081A8356 subs r0, 0x1 lsls r0, 1 - ldr r2, _081A8370 + ldr r2, =0x00000cb4 adds r1, r2 adds r1, r0 ldrh r0, [r5] @@ -867237,25 +837787,20 @@ _081A8356: pop {r0} bx r0 .align 2, 0 -_081A835C: .4byte 0x00000cb2 -_081A8360: .4byte 0x02038bca -_081A8364: .4byte 0x0203bc88 -_081A8368: .4byte 0x085d5acc -_081A836C: .4byte 0x03005d90 -_081A8370: .4byte 0x00000cb4 + .pool thumb_func_end sub_81A82A4 thumb_func_start sub_81A8374 sub_81A8374: @ 81A8374 push {r4-r7,lr} - ldr r4, _081A83C4 + ldr r4, =0x03005d90 ldr r1, [r4] - ldr r2, _081A83C8 + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 30 lsrs r0, 29 - ldr r2, _081A83CC + ldr r2, =0x00000e04 adds r1, r2 adds r1, r0 ldrh r0, [r1] @@ -867263,8 +837808,8 @@ sub_81A8374: @ 81A8374 bl __udivsi3 lsls r0, 16 lsrs r5, r0, 16 - ldr r1, _081A83D0 - ldr r0, _081A83D4 + ldr r1, =0x0203bc88 + ldr r0, =0x085d5acc str r0, [r1] lsls r7, r5, 24 adds r6, r4, 0 @@ -867277,23 +837822,17 @@ _081A83A0: lsrs r4, r0, 16 movs r3, 0 ldr r1, [r6] - ldr r2, _081A83D8 + ldr r2, =0x00000cb2 adds r0, r1, r2 ldrh r0, [r0] subs r2, r0, 0x1 cmp r3, r2 bge _081A83EE - ldr r0, _081A83DC + ldr r0, =0x00000cb4 adds r1, r0 b _081A83E8 .align 2, 0 -_081A83C4: .4byte 0x03005d90 -_081A83C8: .4byte 0x00000ca9 -_081A83CC: .4byte 0x00000e04 -_081A83D0: .4byte 0x0203bc88 -_081A83D4: .4byte 0x085d5acc -_081A83D8: .4byte 0x00000cb2 -_081A83DC: .4byte 0x00000cb4 + .pool _081A83E0: adds r1, 0x2 adds r3, 0x1 @@ -867305,27 +837844,27 @@ _081A83E8: bne _081A83E0 _081A83EE: ldr r0, [r6] - ldr r1, _081A84A0 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] subs r0, 0x1 cmp r3, r0 bne _081A83A0 - ldr r5, _081A84A4 + ldr r5, =0x02038bca strh r4, [r5] ldrh r0, [r5] movs r1, 0 bl sub_8162614 - ldr r3, _081A84A8 + ldr r3, =0x03005d90 ldr r1, [r3] - ldr r0, _081A84A0 + ldr r0, =0x00000cb2 adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0xE bhi _081A8424 subs r0, 0x1 lsls r0, 1 - ldr r2, _081A84AC + ldr r2, =0x00000cb4 adds r1, r2 adds r1, r0 ldrh r0, [r5] @@ -867340,7 +837879,7 @@ _081A8426: lsrs r4, r0, 16 movs r3, 0 ldr r1, [r5] - ldr r2, _081A84A0 + ldr r2, =0x00000cb2 adds r0, r1, r2 ldrh r0, [r0] cmp r3, r0 @@ -867350,12 +837889,12 @@ _081A8426: ldrh r0, [r0] cmp r0, r4 beq _081A8466 - ldr r0, _081A84A8 + ldr r0, =0x03005d90 ldr r1, [r0] subs r2, 0x2 adds r0, r1, r2 ldrh r2, [r0] - ldr r0, _081A84AC + ldr r0, =0x00000cb4 adds r1, r0 _081A8458: adds r1, 0x2 @@ -867367,26 +837906,26 @@ _081A8458: bne _081A8458 _081A8466: ldr r0, [r5] - ldr r1, _081A84A0 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] cmp r3, r0 bne _081A8426 - ldr r5, _081A84B0 + ldr r5, =0x02038bcc strh r4, [r5] ldrh r0, [r5] movs r1, 0x1 bl sub_8162614 - ldr r0, _081A84A8 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _081A84A0 + ldr r0, =0x00000cb2 adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0xD bhi _081A849A subs r0, 0x2 lsls r0, 1 - ldr r2, _081A84AC + ldr r2, =0x00000cb4 adds r1, r2 adds r1, r0 ldrh r0, [r5] @@ -867396,20 +837935,16 @@ _081A849A: pop {r0} bx r0 .align 2, 0 -_081A84A0: .4byte 0x00000cb2 -_081A84A4: .4byte 0x02038bca -_081A84A8: .4byte 0x03005d90 -_081A84AC: .4byte 0x00000cb4 -_081A84B0: .4byte 0x02038bcc + .pool thumb_func_end sub_81A8374 thumb_func_start sub_81A84B4 sub_81A84B4: @ 81A84B4 push {r4,r5,lr} movs r2, 0 - ldr r5, _081A84E0 - ldr r4, _081A84E4 - ldr r0, _081A84E8 + ldr r5, =0x03005d90 + ldr r4, =0x00000cb4 + ldr r0, =0x0000ffff adds r3, r0, 0 _081A84C0: ldr r1, [r5] @@ -867428,24 +837963,22 @@ _081A84C0: pop {r0} bx r0 .align 2, 0 -_081A84E0: .4byte 0x03005d90 -_081A84E4: .4byte 0x00000cb4 -_081A84E8: .4byte 0x0000ffff + .pool thumb_func_end sub_81A84B4 thumb_func_start sub_81A84EC sub_81A84EC: @ 81A84EC push {lr} - ldr r0, _081A8514 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 bne _081A8524 - ldr r3, _081A8518 + ldr r3, =0x02038bca ldrh r1, [r3] - ldr r0, _081A851C + ldr r0, =0x0000012b cmp r1, r0 bhi _081A8542 - ldr r2, _081A8520 + ldr r2, =0x0203bc88 movs r0, 0x34 muls r1, r0 ldr r0, [r2] @@ -867454,19 +837987,16 @@ sub_81A84EC: @ 81A84EC bl sub_81638AC b _081A8542 .align 2, 0 -_081A8514: .4byte 0x020375e2 -_081A8518: .4byte 0x02038bca -_081A851C: .4byte 0x0000012b -_081A8520: .4byte 0x0203bc88 + .pool _081A8524: cmp r0, 0x1 bne _081A8542 - ldr r3, _081A8548 + ldr r3, =0x02038bcc ldrh r1, [r3] - ldr r0, _081A854C + ldr r0, =0x0000012b cmp r1, r0 bhi _081A8542 - ldr r2, _081A8550 + ldr r2, =0x0203bc88 movs r0, 0x34 muls r1, r0 ldr r0, [r2] @@ -867477,15 +838007,13 @@ _081A8542: pop {r0} bx r0 .align 2, 0 -_081A8548: .4byte 0x02038bcc -_081A854C: .4byte 0x0000012b -_081A8550: .4byte 0x0203bc88 + .pool thumb_func_end sub_81A84EC thumb_func_start sub_81A8554 sub_81A8554: @ 81A8554 push {r4-r6,lr} - ldr r5, _081A8584 + ldr r5, =0x020244ec movs r6, 0 movs r4, 0 _081A855C: @@ -867509,7 +838037,7 @@ _081A856E: movs r0, 0x1 b _081A858A .align 2, 0 -_081A8584: .4byte 0x020244ec + .pool _081A8588: movs r0, 0 _081A858A: @@ -867523,14 +838051,14 @@ sub_81A8590: @ 81A8590 push {r4-r6,lr} lsls r0, 24 movs r6, 0 - ldr r1, _081A85E0 + ldr r1, =0x03005d90 ldr r2, [r1] - ldr r3, _081A85E4 + ldr r3, =0x00000ca9 adds r1, r2, r3 ldrb r1, [r1] lsls r1, 30 lsrs r1, 29 - ldr r3, _081A85E8 + ldr r3, =0x00000e04 adds r2, r3 adds r2, r1 lsrs r4, r0, 24 @@ -867546,7 +838074,7 @@ sub_81A8590: @ 81A8590 blt _081A85F0 cmp r2, 0x1 bgt _081A85F0 - ldr r1, _081A85EC + ldr r1, =0x086125dc adds r0, r2, 0 adds r0, 0x14 adds r0, r1 @@ -867560,12 +838088,9 @@ sub_81A8590: @ 81A8590 lsrs r6, r0, 24 b _081A8634 .align 2, 0 -_081A85E0: .4byte 0x03005d90 -_081A85E4: .4byte 0x00000ca9 -_081A85E8: .4byte 0x00000e04 -_081A85EC: .4byte 0x086125dc + .pool _081A85F0: - ldr r5, _081A860C + ldr r5, =0x086125dc movs r0, 0x5 lsls r3, r0, 2 adds r0, r3, r5 @@ -867579,7 +838104,7 @@ _081A85F0: movs r6, 0x3 b _081A8634 .align 2, 0 -_081A860C: .4byte 0x086125dc + .pool _081A8610: adds r0, r5, 0x1 adds r0, r3, r0 @@ -867609,7 +838134,7 @@ _081A8634: thumb_func_start sub_81A863C sub_81A863C: @ 81A863C push {r4,lr} - ldr r4, _081A8654 + ldr r4, =0x020375f0 movs r0, 0 bl sub_81A8590 lsls r0, 24 @@ -867619,15 +838144,15 @@ sub_81A863C: @ 81A863C pop {r0} bx r0 .align 2, 0 -_081A8654: .4byte 0x020375f0 + .pool thumb_func_end sub_81A863C thumb_func_start sub_81A8658 sub_81A8658: @ 81A8658 push {r4,lr} - ldr r3, _081A868C - ldr r2, _081A8690 - ldr r0, _081A8694 + ldr r3, =0x08612675 + ldr r2, =0x020375e6 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xE1 lsls r1, 4 @@ -867643,23 +838168,20 @@ sub_81A8658: @ 81A8658 ldrb r4, [r0] adds r0, r4, 0 bl sub_81A7F38 - ldr r0, _081A8698 + ldr r0, =0x020375f0 strh r4, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081A868C: .4byte 0x08612675 -_081A8690: .4byte 0x020375e6 -_081A8694: .4byte 0x03005d90 -_081A8698: .4byte 0x020375f0 + .pool thumb_func_end sub_81A8658 thumb_func_start sub_81A869C sub_81A869C: @ 81A869C - ldr r0, _081A86B8 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r0, _081A86BC + ldr r0, =0x020375e2 ldrb r1, [r0] movs r0, 0xE1 lsls r0, 4 @@ -867672,8 +838194,7 @@ sub_81A869C: @ 81A869C strb r0, [r2] bx lr .align 2, 0 -_081A86B8: .4byte 0x03005d90 -_081A86BC: .4byte 0x020375e2 + .pool thumb_func_end sub_81A869C thumb_func_start sub_81A86C0 @@ -867683,7 +838204,7 @@ sub_81A86C0: @ 81A86C0 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r1, _081A8724 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] movs r0, 0 @@ -867694,7 +838215,7 @@ _081A86D4: movs r0, 0x64 mov r1, r10 muls r1, r0 - ldr r0, _081A8728 + ldr r0, =0x020244ec adds r7, r1, r0 adds r0, r7, 0 movs r1, 0x39 @@ -867724,8 +838245,7 @@ _081A86D4: movs r6, 0 b _081A8732 .align 2, 0 -_081A8724: .4byte 0x020375f0 -_081A8728: .4byte 0x020244ec + .pool _081A872C: adds r0, r6, 0x1 lsls r0, 24 @@ -867759,12 +838279,12 @@ _081A8766: mov r0, r9 cmp r0, 0x1 bne _081A8778 - ldr r1, _081A8774 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] b _081A8786 .align 2, 0 -_081A8774: .4byte 0x020375f0 + .pool _081A8778: mov r0, r10 adds r0, 0x1 @@ -867787,12 +838307,12 @@ _081A8786: sub_81A8794: @ 81A8794 push {r4-r7,lr} movs r5, 0 - ldr r7, _081A87D8 - ldr r6, _081A87DC + ldr r7, =0x03005d8c + ldr r6, =0x03005d90 _081A879C: ldr r0, [r6] lsls r4, r5, 1 - ldr r1, _081A87E0 + ldr r1, =0x00000caa adds r0, r1 adds r0, r4 ldrh r1, [r0] @@ -867806,7 +838326,7 @@ _081A879C: movs r1, 0xC bl pokemon_getattr ldr r1, [r6] - ldr r2, _081A87E4 + ldr r2, =0x00000e12 adds r1, r2 adds r1, r4 strh r0, [r1] @@ -867819,10 +838339,7 @@ _081A879C: pop {r0} bx r0 .align 2, 0 -_081A87D8: .4byte 0x03005d8c -_081A87DC: .4byte 0x03005d90 -_081A87E0: .4byte 0x00000caa -_081A87E4: .4byte 0x00000e12 + .pool thumb_func_end sub_81A8794 thumb_func_start sub_81A87E8 @@ -867830,18 +838347,18 @@ sub_81A87E8: @ 81A87E8 push {r4,lr} movs r4, 0 _081A87EC: - ldr r0, _081A8820 + ldr r0, =0x03005d90 ldr r2, [r0] lsls r3, r4, 1 - ldr r1, _081A8824 + ldr r1, =0x00000caa adds r0, r2, r1 adds r0, r3 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081A8828 + ldr r1, =0x02024488 adds r0, r1 - ldr r1, _081A882C + ldr r1, =0x00000e12 adds r3, r1 adds r2, r3 movs r1, 0xC @@ -867855,28 +838372,25 @@ _081A87EC: pop {r0} bx r0 .align 2, 0 -_081A8820: .4byte 0x03005d90 -_081A8824: .4byte 0x00000caa -_081A8828: .4byte 0x02024488 -_081A882C: .4byte 0x00000e12 + .pool thumb_func_end sub_81A87E8 thumb_func_start sub_81A8830 sub_81A8830: @ 81A8830 push {r4-r6,lr} - ldr r3, _081A888C + ldr r3, =0x03005d90 ldr r1, [r3] - ldr r2, _081A8890 + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 30 lsrs r5, r0, 30 - ldr r0, _081A8894 + ldr r0, =0x00000ca8 adds r1, r0 movs r4, 0 strb r4, [r1] ldr r1, [r3] - ldr r6, _081A8898 + ldr r6, =0x00000cb2 adds r0, r1, r6 strh r4, [r0] adds r1, r2 @@ -867886,9 +838400,9 @@ sub_81A8830: @ 81A8830 ands r0, r2 strb r0, [r1] ldr r3, [r3] - ldr r0, _081A889C + ldr r0, =0x00000cdc adds r2, r3, r0 - ldr r1, _081A88A0 + ldr r1, =0x08612690 lsls r0, r5, 2 adds r0, r1 ldr r1, [r2] @@ -867897,29 +838411,21 @@ sub_81A8830: @ 81A8830 cmp r1, 0 bne _081A887C lsls r1, r5, 1 - ldr r2, _081A88A4 + ldr r2, =0x00000e04 adds r0, r3, r2 adds r0, r1 strh r4, [r0] _081A887C: - ldr r0, _081A88A8 + ldr r0, =0x02038bca strh r4, [r0] - ldr r1, _081A88AC + ldr r1, =0x0202433a movs r0, 0 strb r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081A888C: .4byte 0x03005d90 -_081A8890: .4byte 0x00000ca9 -_081A8894: .4byte 0x00000ca8 -_081A8898: .4byte 0x00000cb2 -_081A889C: .4byte 0x00000cdc -_081A88A0: .4byte 0x08612690 -_081A88A4: .4byte 0x00000e04 -_081A88A8: .4byte 0x02038bca -_081A88AC: .4byte 0x0202433a + .pool thumb_func_end sub_81A8830 thumb_func_start sub_81A88B0 @@ -867927,7 +838433,7 @@ sub_81A88B0: @ 81A88B0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _081A8900 + ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0x6 bl pokemon_getattr @@ -867962,7 +838468,7 @@ _081A88D6: movs r0, 0 b _081A8906 .align 2, 0 -_081A8900: .4byte 0x020244ec + .pool _081A8904: movs r0, 0x1 _081A8906: @@ -867976,15 +838482,15 @@ sub_81A890C: @ 81A890C push {lr} lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _081A891C + ldr r0, =0x0000017b cmp r2, r0 bne _081A8920 movs r1, 0 b _081A892A .align 2, 0 -_081A891C: .4byte 0x0000017b + .pool _081A8920: - ldr r0, _081A8930 + ldr r0, =0x00000149 movs r1, 0x2 cmp r2, r0 bne _081A892A @@ -867994,7 +838500,7 @@ _081A892A: pop {r1} bx r1 .align 2, 0 -_081A8930: .4byte 0x00000149 + .pool thumb_func_end sub_81A890C thumb_func_start sub_81A8934 @@ -868002,7 +838508,7 @@ sub_81A8934: @ 81A8934 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _081A8958 + ldr r4, =0x0203ce50 ldr r0, [r4] cmp r0, 0 bne _081A894A @@ -868017,13 +838523,13 @@ _081A894A: pop {r0} bx r0 .align 2, 0 -_081A8958: .4byte 0x0203ce50 + .pool thumb_func_end sub_81A8934 thumb_func_start sub_81A895C sub_81A895C: @ 81A895C push {r4,lr} - ldr r4, _081A8998 + ldr r4, =0x0203ce50 ldr r0, [r4] cmp r0, 0 beq _081A896E @@ -868041,7 +838547,7 @@ _081A896E: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081A899C + ldr r1, =0x02037350 adds r0, r1 bl sub_8093284 bl sub_80D338C @@ -868049,8 +838555,7 @@ _081A896E: pop {r0} bx r0 .align 2, 0 -_081A8998: .4byte 0x0203ce50 -_081A899C: .4byte 0x02037350 + .pool thumb_func_end sub_81A895C thumb_func_start sub_81A89A0 @@ -868064,7 +838569,7 @@ sub_81A89A0: @ 81A89A0 lsls r0, 24 lsrs r0, 24 str r0, [sp] - ldr r0, _081A8A38 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0xC7 lsls r1, 4 @@ -868090,7 +838595,7 @@ _081A89C4: bl cur_mapdata_get_blockid_at lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _081A8A3C + ldr r0, =0x0203ce50 ldr r0, [r0] adds r0, 0x41 ldrb r0, [r0] @@ -868100,7 +838605,7 @@ _081A89C4: bne _081A89F8 subs r2, 0x48 _081A89F8: - ldr r0, _081A8A40 + ldr r0, =0x0000024f cmp r1, r0 bls _081A8AD4 subs r1, r2 @@ -868133,9 +838638,7 @@ _081A8A08: beq _081A8A4E b _081A8AD4 .align 2, 0 -_081A8A38: .4byte 0x03005d8c -_081A8A3C: .4byte 0x0203ce50 -_081A8A40: .4byte 0x0000024f + .pool _081A8A44: cmp r5, 0x2 beq _081A8A64 @@ -868143,25 +838646,25 @@ _081A8A44: beq _081A8A70 b _081A8AD4 _081A8A4E: - ldr r7, _081A8A54 + ldr r7, =0x08612698 movs r1, 0x1 b _081A8A74 .align 2, 0 -_081A8A54: .4byte 0x08612698 + .pool _081A8A58: - ldr r7, _081A8A60 + ldr r7, =0x0861269c movs r2, 0x1 b _081A8A74 .align 2, 0 -_081A8A60: .4byte 0x0861269c + .pool _081A8A64: - ldr r7, _081A8A6C + ldr r7, =0x086126a0 movs r1, 0xFF b _081A8A74 .align 2, 0 -_081A8A6C: .4byte 0x086126a0 + .pool _081A8A70: - ldr r7, _081A8AC4 + ldr r7, =0x086126a4 movs r2, 0xFF _081A8A74: mov r3, r8 @@ -868180,7 +838683,7 @@ _081A8A74: adds r0, r3 strh r0, [r4, 0x6] ldrb r0, [r4] - ldr r6, _081A8AC8 + ldr r6, =0x03005d8c ldr r2, [r6] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -868202,8 +838705,7 @@ _081A8A74: bl exec_movement b _081A8AD4 .align 2, 0 -_081A8AC4: .4byte 0x086126a4 -_081A8AC8: .4byte 0x03005d8c + .pool _081A8ACC: mov r0, r8 adds r1, r5, 0 @@ -868236,7 +838738,7 @@ sub_81A8AF8: @ 81A8AF8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r1, _081A8BA4 + ldr r1, =0x0203ce50 ldr r2, [r1] cmp r2, 0 bne _081A8B0C @@ -868254,7 +838756,7 @@ _081A8B0C: lsls r0, 2 mov r10, r0 _081A8B22: - ldr r0, _081A8BA8 + ldr r0, =0x03005d8c ldr r0, [r0] movs r3, 0xC7 lsls r3, 4 @@ -868322,8 +838824,7 @@ _081A8B96: bne _081A8BB4 b _081A8BB2 .align 2, 0 -_081A8BA4: .4byte 0x0203ce50 -_081A8BA8: .4byte 0x03005d8c + .pool _081A8BAC: movs r6, 0x2 cmp r1, 0 @@ -868331,7 +838832,7 @@ _081A8BAC: _081A8BB2: movs r6, 0x1 _081A8BB4: - ldr r5, _081A8C00 + ldr r5, =0x0203ce50 ldr r0, [r5] adds r0, r4 ldrb r1, [r0, 0x1] @@ -868340,7 +838841,7 @@ _081A8BB4: lsls r0, 3 adds r0, r7 ldrb r0, [r0] - ldr r1, _081A8C04 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -868351,7 +838852,7 @@ _081A8BB4: bne _081A8BDC b _081A8D32 _081A8BDC: - ldr r0, _081A8C08 + ldr r0, =0x02037350 lsls r1, r2, 3 adds r1, r2 lsls r1, 2 @@ -868370,9 +838871,7 @@ _081A8BDC: beq _081A8C30 b _081A8D32 .align 2, 0 -_081A8C00: .4byte 0x0203ce50 -_081A8C04: .4byte 0x03005d8c -_081A8C08: .4byte 0x02037350 + .pool _081A8C0C: cmp r0, 0x3 beq _081A8C48 @@ -868380,7 +838879,7 @@ _081A8C0C: beq _081A8C16 b _081A8D32 _081A8C16: - ldr r3, _081A8C2C + ldr r3, =0x086126ae ldr r0, [r5] adds r0, r4 ldrb r1, [r0, 0x1] @@ -868391,9 +838890,9 @@ _081A8C16: movs r1, 0x7 b _081A8C72 .align 2, 0 -_081A8C2C: .4byte 0x086126ae + .pool _081A8C30: - ldr r3, _081A8C44 + ldr r3, =0x086126a8 ldr r0, [r5] adds r0, r4 ldrb r1, [r0, 0x1] @@ -868404,9 +838903,9 @@ _081A8C30: movs r1, 0xA b _081A8C72 .align 2, 0 -_081A8C44: .4byte 0x086126a8 + .pool _081A8C48: - ldr r3, _081A8C5C + ldr r3, =0x086126aa ldr r0, [r5] adds r0, r4 ldrb r1, [r0, 0x1] @@ -868417,9 +838916,9 @@ _081A8C48: movs r1, 0x8 b _081A8C72 .align 2, 0 -_081A8C5C: .4byte 0x086126aa + .pool _081A8C60: - ldr r3, _081A8C94 + ldr r3, =0x086126ac ldr r0, [r5] adds r0, r4 ldrb r1, [r0, 0x1] @@ -868439,15 +838938,14 @@ _081A8C72: lsls r0, 3 adds r0, r7 ldrb r0, [r0] - ldr r1, _081A8C98 + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl exec_movement b _081A8D32 .align 2, 0 -_081A8C94: .4byte 0x086126ac -_081A8C98: .4byte 0x03005d8c + .pool _081A8C9C: cmp r6, 0x1 bne _081A8D32 @@ -868463,7 +838961,7 @@ _081A8CAE: beq _081A8CE8 cmp r1, 0x4 bne _081A8D32 - ldr r3, _081A8CCC + ldr r3, =0x086126aa ldr r0, [r5] adds r0, r4 ldrb r1, [r0, 0x1] @@ -868474,9 +838972,9 @@ _081A8CAE: movs r1, 0x8 b _081A8D12 .align 2, 0 -_081A8CCC: .4byte 0x086126aa + .pool _081A8CD0: - ldr r3, _081A8CE4 + ldr r3, =0x086126ac ldr r0, [r5] adds r0, r4 ldrb r1, [r0, 0x1] @@ -868487,9 +838985,9 @@ _081A8CD0: movs r1, 0x9 b _081A8D12 .align 2, 0 -_081A8CE4: .4byte 0x086126ac + .pool _081A8CE8: - ldr r3, _081A8CFC + ldr r3, =0x086126ae ldr r0, [r5] adds r0, r4 ldrb r1, [r0, 0x1] @@ -868500,9 +838998,9 @@ _081A8CE8: movs r1, 0x7 b _081A8D12 .align 2, 0 -_081A8CFC: .4byte 0x086126ae + .pool _081A8D00: - ldr r3, _081A8D58 + ldr r3, =0x086126a8 ldr r0, [r5] adds r0, r4 ldrb r1, [r0, 0x1] @@ -868522,7 +839020,7 @@ _081A8D12: lsls r0, 3 adds r0, r7 ldrb r0, [r0] - ldr r1, _081A8D5C + ldr r1, =0x03005d8c ldr r2, [r1] ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] @@ -868549,14 +839047,13 @@ _081A8D4A: pop {r0} bx r0 .align 2, 0 -_081A8D58: .4byte 0x086126a8 -_081A8D5C: .4byte 0x03005d8c + .pool thumb_func_end sub_81A8AF8 thumb_func_start sub_81A8D60 sub_81A8D60: @ 81A8D60 push {r4,lr} - ldr r4, _081A8D90 + ldr r4, =0x0203ce50 ldr r3, [r4] adds r2, r3, 0 adds r2, 0x40 @@ -868580,7 +839077,7 @@ sub_81A8D60: @ 81A8D60 pop {r0} bx r0 .align 2, 0 -_081A8D90: .4byte 0x0203ce50 + .pool thumb_func_end sub_81A8D60 thumb_func_start sub_81A8D94 @@ -868590,7 +839087,7 @@ sub_81A8D94: @ 81A8D94 lsrs r4, r0, 24 lsls r1, 24 lsrs r6, r1, 24 - ldr r0, _081A8E00 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0xC7 lsls r1, 4 @@ -868610,7 +839107,7 @@ sub_81A8D94: @ 81A8D94 bl cur_mapdata_get_blockid_at lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _081A8E04 + ldr r0, =0x0203ce50 ldr r0, [r0] adds r0, 0x41 ldrb r0, [r0] @@ -868642,8 +839139,7 @@ _081A8DFC: movs r2, 0 b _081A8E1A .align 2, 0 -_081A8E00: .4byte 0x03005d8c -_081A8E04: .4byte 0x0203ce50 + .pool _081A8E08: cmp r1, 0 bgt _081A8E14 @@ -868721,8 +839217,8 @@ _081A8E76: thumb_func_start sub_81A8E7C sub_81A8E7C: @ 81A8E7C push {lr} - ldr r1, _081A8E94 - ldr r0, _081A8E98 + ldr r1, =0x08613ee0 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -868731,26 +839227,25 @@ sub_81A8E7C: @ 81A8E7C pop {r0} bx r0 .align 2, 0 -_081A8E94: .4byte 0x08613ee0 -_081A8E98: .4byte 0x020375e0 + .pool thumb_func_end sub_81A8E7C thumb_func_start sub_81A8E9C sub_81A8E9C: @ 81A8E9C push {r4-r6,lr} - ldr r3, _081A8EDC + ldr r3, =0x03005d90 ldr r1, [r3] - ldr r4, _081A8EE0 + ldr r4, =0x00000ca9 adds r0, r1, r4 ldrb r0, [r0] lsls r0, 30 lsrs r5, r0, 30 - ldr r0, _081A8EE4 + ldr r0, =0x00000ca8 adds r1, r0 movs r2, 0 strb r2, [r1] ldr r1, [r3] - ldr r6, _081A8EE8 + ldr r6, =0x00000cb2 adds r0, r1, r6 strh r2, [r0] adds r1, r4 @@ -868762,21 +839257,17 @@ sub_81A8E9C: @ 81A8E9C cmp r5, 0 beq _081A8EF0 ldr r0, [r3] - ldr r1, _081A8EEC + ldr r1, =0x00000cdc adds r0, r1 ldr r2, [r0] movs r0, 0x80 lsls r0, 6 b _081A8EFC .align 2, 0 -_081A8EDC: .4byte 0x03005d90 -_081A8EE0: .4byte 0x00000ca9 -_081A8EE4: .4byte 0x00000ca8 -_081A8EE8: .4byte 0x00000cb2 -_081A8EEC: .4byte 0x00000cdc + .pool _081A8EF0: ldr r0, [r3] - ldr r6, _081A8F28 + ldr r6, =0x00000cdc adds r0, r6 ldr r2, [r0] movs r0, 0x80 @@ -868787,7 +839278,7 @@ _081A8EFC: bne _081A8F14 ldr r0, [r3] lsls r1, r5, 1 - ldr r3, _081A8F2C + ldr r3, =0x00000e1a adds r0, r3 adds r0, r1 strh r2, [r0] @@ -868795,32 +839286,29 @@ _081A8EFC: bl sub_81AAA7C _081A8F14: bl sub_81C4EEC - ldr r0, _081A8F30 + ldr r0, =0x02038bca movs r1, 0 strh r1, [r0] - ldr r0, _081A8F34 + ldr r0, =0x0202433a strb r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081A8F28: .4byte 0x00000cdc -_081A8F2C: .4byte 0x00000e1a -_081A8F30: .4byte 0x02038bca -_081A8F34: .4byte 0x0202433a + .pool thumb_func_end sub_81A8E9C thumb_func_start sub_81A8F38 sub_81A8F38: @ 81A8F38 push {r4,lr} - ldr r1, _081A8F60 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r2, _081A8F64 + ldr r2, =0x00000ca9 adds r0, r2 ldrb r0, [r0] lsls r0, 30 lsrs r4, r0, 30 - ldr r0, _081A8F68 + ldr r0, =0x020375e2 ldrh r0, [r0] adds r3, r1, 0 cmp r0, 0x6 @@ -868828,15 +839316,12 @@ sub_81A8F38: @ 81A8F38 b _081A903A _081A8F54: lsls r0, 2 - ldr r1, _081A8F6C + ldr r1, =_081A8F70 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A8F60: .4byte 0x03005d90 -_081A8F64: .4byte 0x00000ca9 -_081A8F68: .4byte 0x020375e2 -_081A8F6C: .4byte _081A8F70 + .pool .align 2, 0 _081A8F70: .4byte _081A8F8C @@ -868847,61 +839332,56 @@ _081A8F70: .4byte _081A9010 .4byte _081A9028 _081A8F8C: - ldr r0, _081A8F94 + ldr r0, =0x020375f0 ldr r1, [r3] - ldr r3, _081A8F98 + ldr r3, =0x00000e18 b _081A8FFE .align 2, 0 -_081A8F94: .4byte 0x020375f0 -_081A8F98: .4byte 0x00000e18 + .pool _081A8F9C: - ldr r2, _081A8FAC + ldr r2, =0x020375f0 ldr r0, [r3] lsls r1, r4, 1 - ldr r3, _081A8FB0 + ldr r3, =0x00000e1a adds r0, r3 adds r0, r1 ldrh r0, [r0] b _081A9038 .align 2, 0 -_081A8FAC: .4byte 0x020375f0 -_081A8FB0: .4byte 0x00000e1a + .pool _081A8FB4: cmp r4, 0 beq _081A8FCC - ldr r2, _081A8FC4 + ldr r2, =0x020375f0 ldr r0, [r3] - ldr r1, _081A8FC8 + ldr r1, =0x00000cdc adds r0, r1 b _081A9030 .align 2, 0 -_081A8FC4: .4byte 0x020375f0 -_081A8FC8: .4byte 0x00000cdc + .pool _081A8FCC: - ldr r2, _081A8FDC + ldr r2, =0x020375f0 ldr r0, [r3] - ldr r3, _081A8FE0 + ldr r3, =0x00000cdc adds r0, r3 ldr r0, [r0] movs r1, 0x80 lsls r1, 5 b _081A9036 .align 2, 0 -_081A8FDC: .4byte 0x020375f0 -_081A8FE0: .4byte 0x00000cdc + .pool _081A8FE4: - ldr r0, _081A8FF0 + ldr r0, =0x020375f0 ldr r1, [r3] - ldr r2, _081A8FF4 + ldr r2, =0x00000e1a adds r1, r2 b _081A9000 .align 2, 0 -_081A8FF0: .4byte 0x020375f0 -_081A8FF4: .4byte 0x00000e1a + .pool _081A8FF8: - ldr r0, _081A9008 + ldr r0, =0x020375f0 ldr r1, [r3] - ldr r3, _081A900C + ldr r3, =0x00000e1c _081A8FFE: adds r1, r3 _081A9000: @@ -868909,24 +839389,22 @@ _081A9000: strh r1, [r0] b _081A903A .align 2, 0 -_081A9008: .4byte 0x020375f0 -_081A900C: .4byte 0x00000e1c + .pool _081A9010: - ldr r2, _081A9020 + ldr r2, =0x020375f0 ldr r0, [r3] - ldr r1, _081A9024 + ldr r1, =0x00000cdc adds r0, r1 ldr r0, [r0] movs r1, 0x80 lsls r1, 5 b _081A9036 .align 2, 0 -_081A9020: .4byte 0x020375f0 -_081A9024: .4byte 0x00000cdc + .pool _081A9028: - ldr r2, _081A9040 + ldr r2, =0x020375f0 ldr r0, [r3] - ldr r3, _081A9044 + ldr r3, =0x00000cdc adds r0, r3 _081A9030: ldr r0, [r0] @@ -868941,21 +839419,20 @@ _081A903A: pop {r0} bx r0 .align 2, 0 -_081A9040: .4byte 0x020375f0 -_081A9044: .4byte 0x00000cdc + .pool thumb_func_end sub_81A8F38 thumb_func_start sub_81A9048 sub_81A9048: @ 81A9048 push {lr} - ldr r0, _081A906C + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r1, _081A9070 + ldr r1, =0x00000ca9 adds r0, r2, r1 ldrb r0, [r0] lsls r0, 30 lsrs r1, r0, 30 - ldr r0, _081A9074 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x1 beq _081A9098 @@ -868965,9 +839442,7 @@ sub_81A9048: @ 81A9048 beq _081A9082 b _081A9126 .align 2, 0 -_081A906C: .4byte 0x03005d90 -_081A9070: .4byte 0x00000ca9 -_081A9074: .4byte 0x020375e2 + .pool _081A9078: cmp r0, 0x2 beq _081A90B0 @@ -868975,58 +839450,54 @@ _081A9078: beq _081A911C b _081A9126 _081A9082: - ldr r0, _081A9090 + ldr r0, =0x020375e4 ldrh r1, [r0] - ldr r3, _081A9094 + ldr r3, =0x00000e18 adds r0, r2, r3 strh r1, [r0] b _081A9126 .align 2, 0 -_081A9090: .4byte 0x020375e4 -_081A9094: .4byte 0x00000e18 + .pool _081A9098: lsls r1, 1 - ldr r3, _081A90A8 + ldr r3, =0x00000e1a adds r0, r2, r3 adds r0, r1 - ldr r1, _081A90AC + ldr r1, =0x020375e4 ldrh r1, [r1] strh r1, [r0] b _081A9126 .align 2, 0 -_081A90A8: .4byte 0x00000e1a -_081A90AC: .4byte 0x020375e4 + .pool _081A90B0: cmp r1, 0 beq _081A90E4 - ldr r0, _081A90C8 + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 beq _081A90D0 - ldr r1, _081A90CC + ldr r1, =0x00000cdc adds r0, r2, r1 ldr r1, [r0] movs r2, 0x80 lsls r2, 6 b _081A90F6 .align 2, 0 -_081A90C8: .4byte 0x020375e4 -_081A90CC: .4byte 0x00000cdc + .pool _081A90D0: - ldr r3, _081A90DC + ldr r3, =0x00000cdc adds r0, r2, r3 ldr r1, [r0] - ldr r2, _081A90E0 + ldr r2, =0xffffdfff b _081A910C .align 2, 0 -_081A90DC: .4byte 0x00000cdc -_081A90E0: .4byte 0xffffdfff + .pool _081A90E4: - ldr r0, _081A90FC + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 beq _081A9104 - ldr r1, _081A9100 + ldr r1, =0x00000cdc adds r0, r2, r1 ldr r1, [r0] movs r2, 0x80 @@ -869036,42 +839507,39 @@ _081A90F6: str r1, [r0] b _081A9126 .align 2, 0 -_081A90FC: .4byte 0x020375e4 -_081A9100: .4byte 0x00000cdc + .pool _081A9104: - ldr r3, _081A9114 + ldr r3, =0x00000cdc adds r0, r2, r3 ldr r1, [r0] - ldr r2, _081A9118 + ldr r2, =0xffffefff _081A910C: ands r1, r2 str r1, [r0] b _081A9126 .align 2, 0 -_081A9114: .4byte 0x00000cdc -_081A9118: .4byte 0xffffefff + .pool _081A911C: - ldr r0, _081A912C + ldr r0, =0x020375e4 ldrh r1, [r0] - ldr r3, _081A9130 + ldr r3, =0x00000e2a adds r0, r2, r3 strb r1, [r0] _081A9126: pop {r0} bx r0 .align 2, 0 -_081A912C: .4byte 0x020375e4 -_081A9130: .4byte 0x00000e2a + .pool thumb_func_end sub_81A9048 thumb_func_start sub_81A9134 sub_81A9134: @ 81A9134 push {r4,lr} - ldr r4, _081A916C + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081A9170 + ldr r1, =0x020375e2 ldrh r1, [r1] - ldr r2, _081A9174 + ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] movs r0, 0x80 @@ -869079,7 +839547,7 @@ sub_81A9134: @ 81A9134 movs r1, 0 bl var_set ldr r1, [r4] - ldr r0, _081A9178 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x4 @@ -869092,23 +839560,20 @@ sub_81A9134: @ 81A9134 pop {r0} bx r0 .align 2, 0 -_081A916C: .4byte 0x03005d90 -_081A9170: .4byte 0x020375e2 -_081A9174: .4byte 0x00000ca8 -_081A9178: .4byte 0x00000ca9 + .pool thumb_func_end sub_81A9134 thumb_func_start sub_81A917C sub_81A917C: @ 81A917C push {r4,r5,lr} - ldr r4, _081A91B8 + ldr r4, =0x03005d90 ldr r1, [r4] - ldr r2, _081A91BC + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 30 lsrs r0, 29 - ldr r2, _081A91C0 + ldr r2, =0x00000e1a adds r1, r2 adds r1, r0 ldrh r0, [r1] @@ -869116,7 +839581,7 @@ sub_81A917C: @ 81A917C bls _081A91CC bl GenerateRandomNumber ldr r4, [r4] - ldr r5, _081A91C4 + ldr r5, =0x08613f34 lsls r0, 16 lsrs r0, 16 movs r1, 0x9 @@ -869125,19 +839590,15 @@ sub_81A917C: @ 81A917C lsrs r0, 15 adds r0, r5 ldrh r0, [r0] - ldr r1, _081A91C8 + ldr r1, =0x00000e18 adds r4, r1 b _081A91EA .align 2, 0 -_081A91B8: .4byte 0x03005d90 -_081A91BC: .4byte 0x00000ca9 -_081A91C0: .4byte 0x00000e1a -_081A91C4: .4byte 0x08613f34 -_081A91C8: .4byte 0x00000e18 + .pool _081A91CC: bl GenerateRandomNumber ldr r4, [r4] - ldr r5, _081A91F4 + ldr r5, =0x08613f28 lsls r0, 16 lsrs r0, 16 movs r1, 0x6 @@ -869146,7 +839607,7 @@ _081A91CC: lsrs r0, 15 adds r0, r5 ldrh r0, [r0] - ldr r2, _081A91F8 + ldr r2, =0x00000e18 adds r4, r2 _081A91EA: strh r0, [r4] @@ -869154,16 +839615,15 @@ _081A91EA: pop {r0} bx r0 .align 2, 0 -_081A91F4: .4byte 0x08613f28 -_081A91F8: .4byte 0x00000e18 + .pool thumb_func_end sub_81A917C thumb_func_start sub_81A91FC sub_81A91FC: @ 81A91FC push {r4,r5,lr} - ldr r4, _081A9234 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081A9238 + ldr r1, =0x00000e18 adds r0, r1 ldrh r0, [r0] movs r1, 0x1 @@ -869173,26 +839633,23 @@ sub_81A91FC: @ 81A91FC cmp r5, 0x1 bne _081A9244 ldr r0, [r4] - ldr r1, _081A9238 + ldr r1, =0x00000e18 adds r0, r1 ldrh r0, [r0] - ldr r1, _081A923C + ldr r1, =0x02021cc4 bl itemid_get_name ldr r0, [r4] - ldr r1, _081A9238 + ldr r1, =0x00000e18 adds r0, r1 movs r1, 0 strh r1, [r0] - ldr r0, _081A9240 + ldr r0, =0x020375f0 strh r5, [r0] b _081A924A .align 2, 0 -_081A9234: .4byte 0x03005d90 -_081A9238: .4byte 0x00000e18 -_081A923C: .4byte 0x02021cc4 -_081A9240: .4byte 0x020375f0 + .pool _081A9244: - ldr r1, _081A9250 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] _081A924A: @@ -869200,28 +839657,28 @@ _081A924A: pop {r0} bx r0 .align 2, 0 -_081A9250: .4byte 0x020375f0 + .pool thumb_func_end sub_81A91FC thumb_func_start sub_81A9254 sub_81A9254: @ 81A9254 push {r4,r5,lr} movs r4, 0 - ldr r5, _081A9284 + ldr r5, =0x03005d90 _081A925A: bl GenerateRandomNumber ldr r1, [r5] lsls r2, r4, 1 - ldr r3, _081A9288 + ldr r3, =0x00000e22 adds r1, r3 adds r1, r2 strh r0, [r1] adds r4, 0x1 cmp r4, 0x3 ble _081A925A - ldr r0, _081A9284 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A928C + ldr r1, =0x00000e2a adds r0, r1 movs r1, 0 strb r1, [r0] @@ -869229,9 +839686,7 @@ _081A925A: pop {r0} bx r0 .align 2, 0 -_081A9284: .4byte 0x03005d90 -_081A9288: .4byte 0x00000e22 -_081A928C: .4byte 0x00000e2a + .pool thumb_func_end sub_81A9254 thumb_func_start sub_81A9290 @@ -869242,9 +839697,9 @@ sub_81A9290: @ 81A9290 mov r5, r8 push {r5-r7} sub sp, 0x4 - ldr r5, _081A9368 + ldr r5, =0x03005d90 ldr r1, [r5] - ldr r2, _081A936C + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 30 @@ -869256,7 +839711,7 @@ sub_81A9290: @ 81A9290 str r0, [sp] mov r2, r10 lsls r0, r2, 1 - ldr r2, _081A9370 + ldr r2, =0x00000e1a adds r1, r2 adds r1, r0 ldrh r0, [r1] @@ -869276,9 +839731,9 @@ sub_81A9290: @ 81A9290 _081A92DE: bl sub_81AA9E4 lsls r0, 24 - ldr r1, _081A9374 + ldr r1, =0x020375f2 ldrh r4, [r1] - ldr r1, _081A9378 + ldr r1, =0x08613650 lsrs r0, 20 adds r0, r1 ldrb r0, [r0, 0x1] @@ -869289,7 +839744,7 @@ _081A92DE: adds r0, r7, r0 asrs r0, 1 lsls r0, 1 - ldr r2, _081A937C + ldr r2, =0x00000e22 adds r1, r2 adds r1, r0 ldrh r6, [r1] @@ -869314,13 +839769,13 @@ _081A9318: cmp r5, r0 blt _081A9318 _081A9332: - ldr r0, _081A9380 + ldr r0, =0x08613b3a ldr r1, [sp] adds r0, r1, r0 ldrb r5, [r0] - ldr r1, _081A9384 - ldr r3, _081A9388 - ldr r4, _081A938C + ldr r1, =0x08613abc + ldr r3, =0x020375d8 + ldr r4, =0x020375da cmp r5, 0x3E bhi _081A935E lsls r2, r5, 1 @@ -869341,22 +839796,12 @@ _081A935E: mov r0, r10 cmp r0, 0 beq _081A9394 - ldr r2, _081A9390 + ldr r2, =0x0861392c b _081A9396 .align 2, 0 -_081A9368: .4byte 0x03005d90 -_081A936C: .4byte 0x00000ca9 -_081A9370: .4byte 0x00000e1a -_081A9374: .4byte 0x020375f2 -_081A9378: .4byte 0x08613650 -_081A937C: .4byte 0x00000e22 -_081A9380: .4byte 0x08613b3a -_081A9384: .4byte 0x08613abc -_081A9388: .4byte 0x020375d8 -_081A938C: .4byte 0x020375da -_081A9390: .4byte 0x0861392c + .pool _081A9394: - ldr r2, _081A93C4 + ldr r2, =0x0861379c _081A9396: lsls r0, r5, 1 adds r1, 0x1 @@ -869381,23 +839826,22 @@ _081A9396: pop {r0} bx r0 .align 2, 0 -_081A93C4: .4byte 0x0861379c + .pool thumb_func_end sub_81A9290 thumb_func_start sub_81A93C8 sub_81A93C8: @ 81A93C8 push {r4,r5,lr} - ldr r0, _081A93DC + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0xC7 lsls r1, 4 adds r3, r0, r1 movs r2, 0 - ldr r4, _081A93E0 + ldr r4, =0x020375f2 b _081A93F4 .align 2, 0 -_081A93DC: .4byte 0x03005d8c -_081A93E0: .4byte 0x020375f2 + .pool _081A93E4: adds r2, 0x1 lsls r0, r2, 1 @@ -869416,7 +839860,7 @@ _081A93F4: ldrh r5, [r4] cmp r0, r5 bne _081A93E4 - ldr r0, _081A9410 + ldr r0, =0x00007fff strh r0, [r1, 0x4] strh r0, [r1, 0x6] _081A940A: @@ -869424,18 +839868,17 @@ _081A940A: pop {r0} bx r0 .align 2, 0 -_081A9410: .4byte 0x00007fff + .pool thumb_func_end sub_81A93C8 thumb_func_start sub_81A9414 sub_81A9414: @ 81A9414 - ldr r1, _081A941C - ldr r0, _081A9420 + ldr r1, =0x0203bc88 + ldr r0, =0x085d5acc str r0, [r1] bx lr .align 2, 0 -_081A941C: .4byte 0x0203bc88 -_081A9420: .4byte 0x085d5acc + .pool thumb_func_end sub_81A9414 thumb_func_start sub_81A9424 @@ -869448,14 +839891,14 @@ sub_81A9424: @ 81A9424 movs r0, 0 mov r9, r0 movs r7, 0 - ldr r0, _081A9474 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0xC7 lsls r1, 4 adds r1, r0 mov r8, r1 - ldr r2, _081A9478 - ldr r0, _081A947C + ldr r2, =0x02037350 + ldr r0, =0x03005df0 ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -869466,8 +839909,8 @@ sub_81A9424: @ 81A9424 lsls r0, 16 lsrs r5, r0, 16 movs r6, 0 - ldr r2, _081A9480 - ldr r0, _081A9484 + ldr r2, =0x08613c1c + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r5 @@ -869480,19 +839923,15 @@ sub_81A9424: @ 81A9424 mov r9, r2 b _081A94AE .align 2, 0 -_081A9474: .4byte 0x03005d8c -_081A9478: .4byte 0x02037350 -_081A947C: .4byte 0x03005df0 -_081A9480: .4byte 0x08613c1c -_081A9484: .4byte 0x0203bc88 + .pool _081A9488: adds r6, 0x1 cmp r6, 0x31 bhi _081A94AE - ldr r4, _081A94E4 + ldr r4, =0x08613c1c lsls r3, r6, 1 adds r2, r3, r4 - ldr r0, _081A94E8 + ldr r0, =0x0203bc88 ldr r1, [r0] movs r0, 0x34 muls r0, r5 @@ -869506,9 +839945,9 @@ _081A9488: ldrb r0, [r0] mov r9, r0 _081A94AE: - ldr r3, _081A94EC - ldr r2, _081A94F0 - ldr r0, _081A94F4 + ldr r3, =0x08613ed8 + ldr r2, =0x02037350 + ldr r0, =0x03005df0 ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -869530,17 +839969,12 @@ _081A94D0: b _081A95E8 _081A94D8: lsls r0, 2 - ldr r1, _081A94F8 + ldr r1, =_081A94FC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081A94E4: .4byte 0x08613c1c -_081A94E8: .4byte 0x0203bc88 -_081A94EC: .4byte 0x08613ed8 -_081A94F0: .4byte 0x02037350 -_081A94F4: .4byte 0x03005df0 -_081A94F8: .4byte _081A94FC + .pool .align 2, 0 _081A94FC: .4byte _081A9520 @@ -869562,13 +839996,13 @@ _081A9520: b _081A95EE _081A9530: movs r6, 0 - ldr r2, _081A953C + ldr r2, =0x7fff0000 mov r4, r8 adds r4, 0x4 mov r5, r8 b _081A9560 .align 2, 0 -_081A953C: .4byte 0x7fff0000 + .pool _081A9540: ldrb r0, [r5, 0x1] cmp r0, 0x3B @@ -869599,16 +840033,16 @@ _081A9560: _081A9572: bl sub_81AA9E4 lsls r0, 24 - ldr r1, _081A95A4 + ldr r1, =0x08613650 lsrs r0, 20 adds r0, r1 ldrb r7, [r0, 0x1] - ldr r0, _081A95A8 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A95AC + ldr r1, =0x00000e2a adds r0, r1 ldrb r2, [r0] - ldr r1, _081A95B0 + ldr r1, =0x0832a328 movs r6, 0x7 _081A958E: ldr r0, [r1] @@ -869623,10 +840057,7 @@ _081A9598: bge _081A958E b _081A95EE .align 2, 0 -_081A95A4: .4byte 0x08613650 -_081A95A8: .4byte 0x03005d90 -_081A95AC: .4byte 0x00000e2a -_081A95B0: .4byte 0x0832a328 + .pool _081A95B4: mov r0, sp movs r1, 0x8 @@ -869663,7 +840094,7 @@ _081A95E8: bne _081A95EE b _081A94D0 _081A95EE: - ldr r1, _081A9614 + ldr r1, =0x08613ec0 add r1, r9 ldr r0, [sp] ldr r1, [r1] @@ -869682,24 +840113,24 @@ _081A95EE: pop {r0} bx r0 .align 2, 0 -_081A9614: .4byte 0x08613ec0 + .pool thumb_func_end sub_81A9424 thumb_func_start sub_81A9618 sub_81A9618: @ 81A9618 push {r4,r5,lr} - ldr r5, _081A9658 + ldr r5, =0x03005d90 ldr r1, [r5] - ldr r2, _081A965C + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 30 lsrs r2, r0, 29 - ldr r4, _081A9660 + ldr r4, =0x00000e1a adds r1, r4 adds r1, r2 ldrh r3, [r1] - ldr r0, _081A9664 + ldr r0, =0x000003e6 cmp r3, r0 bhi _081A963A adds r0, r3, 0x1 @@ -869708,7 +840139,7 @@ _081A963A: ldr r0, [r5] adds r1, r0, r4 adds r1, r2 - ldr r3, _081A9668 + ldr r3, =0x00000e1e adds r0, r3 adds r0, r2 ldrh r1, [r1] @@ -869721,17 +840152,13 @@ _081A9650: pop {r0} bx r0 .align 2, 0 -_081A9658: .4byte 0x03005d90 -_081A965C: .4byte 0x00000ca9 -_081A9660: .4byte 0x00000e1a -_081A9664: .4byte 0x000003e6 -_081A9668: .4byte 0x00000e1e + .pool thumb_func_end sub_81A9618 thumb_func_start sub_81A966C sub_81A966C: @ 81A966C push {r4,lr} - ldr r4, _081A9680 + ldr r4, =0x020375f0 bl sub_81A9E40 lsls r0, 24 lsrs r0, 24 @@ -869740,13 +840167,13 @@ sub_81A966C: @ 81A966C pop {r0} bx r0 .align 2, 0 -_081A9680: .4byte 0x020375f0 + .pool thumb_func_end sub_81A966C thumb_func_start sub_81A9684 sub_81A9684: @ 81A9684 push {r4,lr} - ldr r0, _081A9694 + ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 beq _081A9698 @@ -869754,22 +840181,20 @@ sub_81A9684: @ 81A9684 beq _081A96B4 b _081A9754 .align 2, 0 -_081A9694: .4byte 0x020375e4 + .pool _081A9698: - ldr r0, _081A96A8 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A96AC + ldr r1, =0x020375e2 ldrh r1, [r1] - ldr r2, _081A96B0 + ldr r2, =0x00000e68 adds r0, r2 strb r1, [r0] b _081A9754 .align 2, 0 -_081A96A8: .4byte 0x03005d90 -_081A96AC: .4byte 0x020375e2 -_081A96B0: .4byte 0x00000e68 + .pool _081A96B4: - ldr r4, _081A96E4 + ldr r4, =0x020375f0 ldrh r0, [r4] cmp r0, 0x1 beq _081A9710 @@ -869777,15 +840202,15 @@ _081A96B4: bgt _081A9754 cmp r0, 0 bne _081A9754 - ldr r0, _081A96E8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081A9754 - ldr r0, _081A96EC + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _081A96F0 + ldr r2, =0x00000e68 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0x77 @@ -869794,33 +840219,29 @@ _081A96B4: strb r0, [r1] b _081A96FC .align 2, 0 -_081A96E4: .4byte 0x020375f0 -_081A96E8: .4byte 0x02037fd4 -_081A96EC: .4byte 0x03005d90 -_081A96F0: .4byte 0x00000e68 + .pool _081A96F4: - ldr r0, _081A9708 + ldr r0, =0x020375e6 ldrh r0, [r0] bl audio_play _081A96FC: - ldr r1, _081A970C + ldr r1, =0x020375f0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _081A9754 .align 2, 0 -_081A9708: .4byte 0x020375e6 -_081A970C: .4byte 0x020375f0 + .pool _081A9710: - ldr r1, _081A9744 + ldr r1, =0x020375e2 ldrh r0, [r1] cmp r0, 0 beq _081A9750 subs r0, 0x1 strh r0, [r1] - ldr r3, _081A9748 + ldr r3, =0x03005d90 ldr r1, [r3] - ldr r2, _081A974C + ldr r2, =0x00000e68 adds r1, r2 ldrb r0, [r1] adds r0, 0x1 @@ -869839,9 +840260,7 @@ _081A973E: bl door_upload_tiles b _081A9754 .align 2, 0 -_081A9744: .4byte 0x020375e2 -_081A9748: .4byte 0x03005d90 -_081A974C: .4byte 0x00000e68 + .pool _081A9750: movs r0, 0x2 strh r0, [r4] @@ -869864,7 +840283,7 @@ sub_81A975C: @ 81A975C movs r5, 0 movs r0, 0x64 mov r9, r0 - ldr r1, _081A97BC + ldr r1, =0x020244ec mov r8, r1 _081A9776: movs r4, 0 @@ -869872,10 +840291,10 @@ _081A9776: mov r6, r9 muls r6, r5 _081A977E: - ldr r0, _081A97C0 + ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 - ldr r2, _081A97C4 + ldr r2, =0x00000caa adds r0, r2 adds r1, r0, r1 ldrh r0, [r1] @@ -869904,21 +840323,19 @@ _081A97A2: pop {r0} bx r0 .align 2, 0 -_081A97BC: .4byte 0x020244ec -_081A97C0: .4byte 0x03005d90 -_081A97C4: .4byte 0x00000caa + .pool thumb_func_end sub_81A975C thumb_func_start sub_81A97C8 sub_81A97C8: @ 81A97C8 push {lr} - ldr r0, _081A97D8 + ldr r0, =sub_81A97DC + 1 movs r1, 0 bl AddTask pop {r0} bx r0 .align 2, 0 -_081A97D8: .4byte sub_81A97DC + 1 + .pool thumb_func_end sub_81A97C8 thumb_func_start sub_81A97DC @@ -869926,21 +840343,21 @@ sub_81A97DC: @ 81A97DC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081A9814 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _081A980C - ldr r0, _081A9818 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A981C + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] lsls r0, 5 - ldr r1, _081A9820 + ldr r1, =0x08d856c8 adds r0, r1 - ldr r1, _081A9824 + ldr r1, =0x020377d4 movs r2, 0x10 bl CpuSet adds r0, r4, 0 @@ -869950,11 +840367,7 @@ _081A980C: pop {r0} bx r0 .align 2, 0 -_081A9814: .4byte 0x02037fd4 -_081A9818: .4byte 0x03005d90 -_081A981C: .4byte 0x00000cb2 -_081A9820: .4byte 0x08d856c8 -_081A9824: .4byte 0x020377d4 + .pool thumb_func_end sub_81A97DC thumb_func_start sub_81A9828 @@ -869976,11 +840389,11 @@ sub_81A9834: @ 81A9834 movs r0, 0 str r0, [sp] _081A9844: - ldr r0, _081A98B4 + ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, [sp] lsls r1, r2, 1 - ldr r5, _081A98B8 + ldr r5, =0x00000caa adds r0, r5 adds r0, r1 ldrh r0, [r0] @@ -869997,14 +840410,14 @@ _081A9844: movs r1, 0 str r1, [sp, 0x10] _081A986C: - ldr r2, _081A98BC + ldr r2, =0x03005d8c ldr r0, [r2] adds r0, r6 movs r1, 0xB movs r2, 0 bl pokemon_getattr adds r4, r0, 0 - ldr r3, _081A98C0 + ldr r3, =0x020244ec ldr r1, [sp, 0x10] adds r0, r1, r3 movs r1, 0xB @@ -870033,16 +840446,13 @@ _081A98AC: mov r8, r0 b _081A98C6 .align 2, 0 -_081A98B4: .4byte 0x03005d90 -_081A98B8: .4byte 0x00000caa -_081A98BC: .4byte 0x03005d8c -_081A98C0: .4byte 0x020244ec + .pool _081A98C4: adds r5, 0x1 _081A98C6: cmp r5, 0x3 bgt _081A98EE - ldr r1, _081A9930 + ldr r1, =0x03005d8c ldr r0, [r1] add r0, r9 adds r1, r5, 0 @@ -870071,19 +840481,19 @@ _081A9900: mov r6, r8 cmp r6, 0x3 ble _081A98AC - ldr r1, _081A9930 + ldr r1, =0x03005d8c ldr r0, [r1] ldr r2, [sp, 0x8] adds r0, r2 movs r5, 0x8E lsls r5, 2 adds r0, r5 - ldr r1, _081A9934 + ldr r1, =0x020244ec ldr r2, [sp, 0x10] adds r1, r2, r1 movs r2, 0x64 bl memcpy - ldr r0, _081A9938 + ldr r0, =0x0203cef8 ldr r5, [sp, 0x4] adds r0, r5, r0 mov r1, sp @@ -870091,9 +840501,7 @@ _081A9900: strb r1, [r0] b _081A994C .align 2, 0 -_081A9930: .4byte 0x03005d8c -_081A9934: .4byte 0x020244ec -_081A9938: .4byte 0x0203cef8 + .pool _081A993C: ldr r2, [sp, 0x10] adds r2, 0x64 @@ -870113,9 +840521,9 @@ _081A994C: _081A9958: movs r2, 0 str r2, [sp] - ldr r4, _081A998C - ldr r3, _081A9990 - ldr r2, _081A9994 + ldr r4, =0x03005d90 + ldr r3, =0x00000caa + ldr r2, =0x0203cef8 _081A9962: ldr r1, [r4] ldr r5, [sp] @@ -870138,9 +840546,7 @@ _081A9962: pop {r0} bx r0 .align 2, 0 -_081A998C: .4byte 0x03005d90 -_081A9990: .4byte 0x00000caa -_081A9994: .4byte 0x0203cef8 + .pool thumb_func_end sub_81A9834 thumb_func_start sub_81A9998 @@ -870156,7 +840562,7 @@ sub_81A9998: @ 81A9998 lsls r2, 24 lsrs r7, r2, 24 movs r4, 0 - ldr r0, _081A9A20 + ldr r0, =0x03005dc0 ldr r5, [r0, 0x8] ldr r1, [r0] lsls r0, r1, 3 @@ -870165,11 +840571,11 @@ sub_81A9998: @ 81A9998 adds r0, 0xE adds r5, r0 movs r3, 0 - ldr r0, _081A9A24 + ldr r0, =0x000003ff mov r8, r0 - ldr r1, _081A9A28 + ldr r1, =0x0000028e mov r12, r1 - ldr r0, _081A9A2C + ldr r0, =0x02037350 mov r9, r0 _081A99CC: movs r2, 0 @@ -870182,7 +840588,7 @@ _081A99CE: cmp r0, r12 bne _081A9A8A adds r2, 0x7 - ldr r0, _081A9A30 + ldr r0, =0x03005df0 ldrb r1, [r0] lsls r0, r1, 3 adds r0, r1 @@ -870217,11 +840623,7 @@ _081A9A0E: movs r4, 0x2 b _081A9A7C .align 2, 0 -_081A9A20: .4byte 0x03005dc0 -_081A9A24: .4byte 0x000003ff -_081A9A28: .4byte 0x0000028e -_081A9A2C: .4byte 0x02037350 -_081A9A30: .4byte 0x03005df0 + .pool _081A9A34: cmp r2, 0 bge _081A9A46 @@ -870294,17 +840696,16 @@ _081A9A98: thumb_func_start sub_81A9AA8 sub_81A9AA8: @ 81A9AA8 lsls r0, 24 - ldr r1, _081A9ABC + ldr r1, =0x03005d90 ldr r1, [r1] lsrs r0, 23 adds r1, r0 - ldr r0, _081A9AC0 + ldr r0, =0x00000cb2 adds r1, r0 ldrh r0, [r1] bx lr .align 2, 0 -_081A9ABC: .4byte 0x03005d90 -_081A9AC0: .4byte 0x00000cb2 + .pool thumb_func_end sub_81A9AA8 thumb_func_start sub_81A9AC4 @@ -870312,12 +840713,12 @@ sub_81A9AC4: @ 81A9AC4 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081A9AF4 + ldr r1, =0x03005d90 ldr r2, [r1] - ldr r1, _081A9AF8 + ldr r1, =0x00000e2a adds r2, r1 - ldr r4, _081A9AFC - ldr r3, _081A9B00 + ldr r4, =0x0832a328 + ldr r3, =0x02037350 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 @@ -870333,19 +840734,16 @@ sub_81A9AC4: @ 81A9AC4 pop {r1} bx r1 .align 2, 0 -_081A9AF4: .4byte 0x03005d90 -_081A9AF8: .4byte 0x00000e2a -_081A9AFC: .4byte 0x0832a328 -_081A9B00: .4byte 0x02037350 + .pool thumb_func_end sub_81A9AC4 thumb_func_start sub_81A9B04 sub_81A9B04: @ 81A9B04 push {lr} - ldr r0, _081A9B34 + ldr r0, =0x02038bca ldrh r0, [r0] bl sub_81A9B44 - ldr r0, _081A9B38 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 8 @@ -870354,19 +840752,16 @@ sub_81A9B04: @ 81A9B04 beq _081A9B2E movs r0, 0x1 bl sub_80B47E0 - ldr r1, _081A9B3C + ldr r1, =0x03005df0 strb r0, [r1] - ldr r0, _081A9B40 + ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_81A9B44 _081A9B2E: pop {r0} bx r0 .align 2, 0 -_081A9B34: .4byte 0x02038bca -_081A9B38: .4byte 0x02022fec -_081A9B3C: .4byte 0x03005df0 -_081A9B40: .4byte 0x02038bcc + .pool thumb_func_end sub_81A9B04 thumb_func_start sub_81A9B44 @@ -870379,16 +840774,16 @@ sub_81A9B44: @ 81A9B44 lsls r0, 16 lsrs r5, r0, 16 movs r3, 0 - ldr r0, _081A9BE0 + ldr r0, =0x02037350 mov r12, r0 - ldr r6, _081A9BE4 - ldr r1, _081A9BE8 + ldr r6, =0x03005df0 + ldr r1, =0x03005d8c mov r10, r1 - ldr r7, _081A9BEC + ldr r7, =0x03005d90 mov r9, r7 - ldr r0, _081A9BF0 + ldr r0, =0x00000cb4 mov r8, r0 - ldr r4, _081A9BF4 + ldr r4, =0x0832a328 _081A9B68: mov r1, r9 ldr r2, [r1] @@ -870399,7 +840794,7 @@ _081A9B68: ldrh r0, [r1] cmp r0, r5 bne _081A9B86 - ldr r1, _081A9BF8 + ldr r1, =0x00000e2a adds r0, r2, r1 ldr r1, [r4] ldrb r2, [r0] @@ -870419,14 +840814,14 @@ _081A9B86: strb r3, [r0, 0x6] mov r7, r10 ldr r2, [r7] - ldr r0, _081A9BFC + ldr r0, =0x020375f2 ldrh r1, [r0] subs r1, 0x1 lsls r0, r1, 1 adds r0, r1 lsls r0, 3 adds r2, r0 - ldr r1, _081A9C00 + ldr r1, =0x00000c79 adds r2, r1 strb r3, [r2] ldrb r1, [r6] @@ -870451,30 +840846,22 @@ _081A9B86: pop {r0} bx r0 .align 2, 0 -_081A9BE0: .4byte 0x02037350 -_081A9BE4: .4byte 0x03005df0 -_081A9BE8: .4byte 0x03005d8c -_081A9BEC: .4byte 0x03005d90 -_081A9BF0: .4byte 0x00000cb4 -_081A9BF4: .4byte 0x0832a328 -_081A9BF8: .4byte 0x00000e2a -_081A9BFC: .4byte 0x020375f2 -_081A9C00: .4byte 0x00000c79 + .pool thumb_func_end sub_81A9B44 thumb_func_start sub_81A9C04 sub_81A9C04: @ 81A9C04 push {r4-r6,lr} sub sp, 0x14 - ldr r0, _081A9C44 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r2, _081A9C48 + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 30 lsrs r5, r0, 30 lsls r0, r5, 1 - ldr r2, _081A9C4C + ldr r2, =0x00000e1a adds r1, r2 adds r1, r0 ldrh r0, [r1] @@ -870492,20 +840879,17 @@ sub_81A9C04: @ 81A9C04 _081A9C3A: cmp r5, 0 beq _081A9C54 - ldr r1, _081A9C50 + ldr r1, =0x08613600 b _081A9C56 .align 2, 0 -_081A9C44: .4byte 0x03005d90 -_081A9C48: .4byte 0x00000ca9 -_081A9C4C: .4byte 0x00000e1a -_081A9C50: .4byte 0x08613600 + .pool _081A9C54: - ldr r1, _081A9CCC + ldr r1, =0x08612e30 _081A9C56: lsls r0, 2 adds r0, r1 ldr r6, [r0] - ldr r4, _081A9CD0 + ldr r4, =0x02024744 adds r0, r4, 0 movs r1, 0xB movs r2, 0 @@ -870554,8 +840938,7 @@ _081A9C56: adds r5, r0 b _081A9CF6 .align 2, 0 -_081A9CCC: .4byte 0x08612e30 -_081A9CD0: .4byte 0x02024744 + .pool _081A9CD4: bl GenerateRandomNumber ldr r2, [sp, 0x10] @@ -870573,8 +840956,8 @@ _081A9CD4: subs r0, 0x5 adds r5, r4, r0 _081A9CF6: - ldr r4, _081A9D40 - ldr r2, _081A9D44 + ldr r4, =0x02024744 + ldr r2, =0x083203cc ldr r1, [sp, 0x10] lsls r0, r1, 1 adds r0, r1 @@ -870591,7 +840974,7 @@ _081A9CF6: adds r2, r1, 0 muls r2, r0 lsls r0, r5, 2 - ldr r1, _081A9D48 + ldr r1, =0x0831f72c adds r0, r1 adds r2, r0 adds r0, r4, 0 @@ -870610,11 +840993,9 @@ _081A9CF6: adds r2, r0, 0x3 b _081A9D7C .align 2, 0 -_081A9D40: .4byte 0x02024744 -_081A9D44: .4byte 0x083203cc -_081A9D48: .4byte 0x0831f72c + .pool _081A9D4C: - ldr r2, _081A9D88 + ldr r2, =0x083203cc ldr r1, [sp, 0x10] lsls r0, r1, 1 adds r0, r1 @@ -870628,7 +841009,7 @@ _081A9D4C: ldrb r0, [r0, 0x17] cmp r0, 0 beq _081A9D90 - ldr r4, _081A9D8C + ldr r4, =0x02024744 adds r0, r4, 0 movs r1, 0 movs r2, 0 @@ -870643,11 +841024,10 @@ _081A9D7C: bl pokemon_setattr b _081A9D9C .align 2, 0 -_081A9D88: .4byte 0x083203cc -_081A9D8C: .4byte 0x02024744 + .pool _081A9D90: str r0, [sp, 0xC] - ldr r0, _081A9E1C + ldr r0, =0x02024744 add r2, sp, 0xC movs r1, 0x2E bl pokemon_setattr @@ -870668,7 +841048,7 @@ _081A9DA4: ldrh r1, [r0] lsls r2, 24 lsrs r2, 24 - ldr r0, _081A9E1C + ldr r0, =0x02024744 bl sub_80691F4 ldr r0, [sp, 0xC] adds r0, 0x1 @@ -870676,9 +841056,9 @@ _081A9DA4: adds r2, r0, 0 cmp r2, 0x3 ble _081A9DA4 - ldr r0, _081A9E20 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A9E24 + ldr r1, =0x00000e1a adds r0, r1 adds r0, r4 ldrh r0, [r0] @@ -870698,7 +841078,7 @@ _081A9DA4: _081A9DF6: adds r1, r0, 0 adds r1, 0x27 - ldr r0, _081A9E1C + ldr r0, =0x02024744 add r2, sp, 0x10 bl pokemon_setattr ldr r0, [sp, 0xC] @@ -870707,16 +841087,14 @@ _081A9DF6: cmp r0, 0x5 ble _081A9DF6 _081A9E0C: - ldr r0, _081A9E1C + ldr r0, =0x02024744 bl pokemon_calc_effective_stats add sp, 0x14 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081A9E1C: .4byte 0x02024744 -_081A9E20: .4byte 0x03005d90 -_081A9E24: .4byte 0x00000e1a + .pool thumb_func_end sub_81A9C04 thumb_func_start sub_81A9E28 @@ -870724,29 +841102,28 @@ sub_81A9E28: @ 81A9E28 push {lr} bl sub_81AA9E4 lsls r0, 24 - ldr r1, _081A9E3C + ldr r1, =0x08613650 lsrs r0, 20 adds r0, r1 ldrb r0, [r0, 0x4] pop {r1} bx r1 .align 2, 0 -_081A9E3C: .4byte 0x08613650 + .pool thumb_func_end sub_81A9E28 thumb_func_start sub_81A9E40 sub_81A9E40: @ 81A9E40 push {lr} - ldr r0, _081A9E50 + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] - ldr r0, _081A9E54 + ldr r0, =0x00000169 cmp r1, r0 bne _081A9E58 movs r0, 0x1 b _081A9E66 .align 2, 0 -_081A9E50: .4byte 0x02037318 -_081A9E54: .4byte 0x00000169 + .pool _081A9E58: movs r0, 0xBD lsls r0, 1 @@ -870765,9 +841142,9 @@ _081A9E66: sub_81A9E6C: @ 81A9E6C push {lr} movs r2, 0 - ldr r0, _081A9E88 + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] - ldr r0, _081A9E8C + ldr r0, =0x00000169 cmp r1, r0 beq _081A9E80 adds r0, 0x11 @@ -870780,8 +841157,7 @@ _081A9E82: pop {r1} bx r1 .align 2, 0 -_081A9E88: .4byte 0x02037318 -_081A9E8C: .4byte 0x00000169 + .pool thumb_func_end sub_81A9E6C thumb_func_start sub_81A9E90 @@ -870792,13 +841168,13 @@ sub_81A9E90: @ 81A9E90 cmp r0, 0 beq _081A9EB8 bl sub_81A9834 - ldr r0, _081A9EBC + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081A9EC0 + ldr r1, =0x00000ca8 adds r0, r1 movs r1, 0x2 strb r1, [r0] - ldr r0, _081A9EC4 + ldr r0, =0x0000400e movs r1, 0 bl var_set bl copy_player_party_from_sav1 @@ -870806,9 +841182,7 @@ _081A9EB8: pop {r0} bx r0 .align 2, 0 -_081A9EBC: .4byte 0x03005d90 -_081A9EC0: .4byte 0x00000ca8 -_081A9EC4: .4byte 0x0000400e + .pool thumb_func_end sub_81A9E90 thumb_func_start sub_81A9EC8 @@ -870829,7 +841203,7 @@ sub_81A9EDC: @ 81A9EDC push {lr} lsls r0, 16 lsrs r0, 16 - ldr r2, _081A9EF8 + ldr r2, =0x0203bc88 movs r1, 0x34 muls r1, r0 ldr r0, [r2] @@ -870839,7 +841213,7 @@ sub_81A9EDC: @ 81A9EDC pop {r0} bx r0 .align 2, 0 -_081A9EF8: .4byte 0x0203bc88 + .pool thumb_func_end sub_81A9EDC thumb_func_start sub_81A9EFC @@ -870847,7 +841221,7 @@ sub_81A9EFC: @ 81A9EFC push {lr} lsls r0, 16 lsrs r0, 16 - ldr r2, _081A9F18 + ldr r2, =0x0203bc88 movs r1, 0x34 muls r1, r0 ldr r0, [r2] @@ -870857,7 +841231,7 @@ sub_81A9EFC: @ 81A9EFC pop {r0} bx r0 .align 2, 0 -_081A9F18: .4byte 0x0203bc88 + .pool thumb_func_end sub_81A9EFC thumb_func_start sub_81A9F1C @@ -870865,7 +841239,7 @@ sub_81A9F1C: @ 81A9F1C push {lr} lsls r0, 16 lsrs r0, 16 - ldr r2, _081A9F38 + ldr r2, =0x0203bc88 movs r1, 0x34 muls r1, r0 ldr r0, [r2] @@ -870875,7 +841249,7 @@ sub_81A9F1C: @ 81A9F1C pop {r0} bx r0 .align 2, 0 -_081A9F38: .4byte 0x0203bc88 + .pool thumb_func_end sub_81A9F1C thumb_func_start sub_81A9F3C @@ -870884,8 +841258,8 @@ sub_81A9F3C: @ 81A9F3C lsls r0, 16 lsrs r0, 16 movs r4, 0 - ldr r3, _081A9F64 - ldr r1, _081A9F68 + ldr r3, =0x0831f5ca + ldr r1, =0x0203bc88 ldr r2, [r1] movs r1, 0x34 muls r0, r1 @@ -870893,7 +841267,7 @@ sub_81A9F3C: @ 81A9F3C ldrb r0, [r0] adds r0, r3 ldrb r2, [r0] - ldr r1, _081A9F6C + ldr r1, =0x08613b44 _081A9F58: ldrb r0, [r1] cmp r0, r2 @@ -870901,9 +841275,7 @@ _081A9F58: ldrb r0, [r1, 0x1] b _081A9F7A .align 2, 0 -_081A9F64: .4byte 0x0831f5ca -_081A9F68: .4byte 0x0203bc88 -_081A9F6C: .4byte 0x08613b44 + .pool _081A9F70: adds r1, 0x4 adds r4, 0x1 @@ -870919,12 +841291,12 @@ _081A9F7A: thumb_func_start sub_81A9F80 sub_81A9F80: @ 81A9F80 push {lr} - ldr r0, _081A9F8C + ldr r0, =0x08252c88 bl script_env_1_execute_new_script pop {r0} bx r0 .align 2, 0 -_081A9F8C: .4byte 0x08252c88 + .pool thumb_func_end sub_81A9F80 thumb_func_start sub_81A9F90 @@ -870934,14 +841306,14 @@ sub_81A9F90: @ 81A9F90 push {r7} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081AA00C + ldr r0, =0x03005d90 ldr r4, [r0] - ldr r1, _081AA010 + ldr r1, =0x00000ca9 adds r0, r4, r1 ldrb r1, [r0] lsls r1, 30 lsrs r1, 29 - ldr r2, _081AA014 + ldr r2, =0x00000e1a adds r0, r4, r2 adds r0, r1 ldrh r0, [r0] @@ -870949,7 +841321,7 @@ sub_81A9F90: @ 81A9F90 bl __udivsi3 lsls r0, 16 lsrs r0, 16 - ldr r1, _081AA018 + ldr r1, =0x00000cb2 adds r4, r1 ldrh r1, [r4] cmp r1, 0x7 @@ -870968,9 +841340,9 @@ _081A9FCC: movs r2, 0 cmp r2, r5 bge _081AA004 - ldr r1, _081AA00C + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r4, _081AA01C + ldr r4, =0x00000cb4 adds r0, r4 ldrh r0, [r0] cmp r0, r3 @@ -870992,11 +841364,7 @@ _081AA004: bne _081A9FCC b _081AA062 .align 2, 0 -_081AA00C: .4byte 0x03005d90 -_081AA010: .4byte 0x00000ca9 -_081AA014: .4byte 0x00000e1a -_081AA018: .4byte 0x00000cb2 -_081AA01C: .4byte 0x00000cb4 + .pool _081AA020: lsls r1, 24 mov r8, r1 @@ -871011,9 +841379,9 @@ _081AA026: movs r2, 0 cmp r2, r5 bge _081AA05E - ldr r1, _081AA070 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r4, _081AA074 + ldr r4, =0x00000cb4 adds r0, r4 ldrh r0, [r0] cmp r0, r3 @@ -871041,8 +841409,7 @@ _081AA062: pop {r1} bx r1 .align 2, 0 -_081AA070: .4byte 0x03005d90 -_081AA074: .4byte 0x00000cb4 + .pool thumb_func_end sub_81A9F90 thumb_func_start sub_81AA078 @@ -871071,16 +841438,16 @@ _081AA0A6: ldr r1, [sp, 0xC] adds r0, r1, r7 ldrb r0, [r0] - ldr r2, _081AA178 + ldr r2, =0x00000169 adds r0, r2 lsls r0, 2 - ldr r1, _081AA17C + ldr r1, =0x08481dd4 adds r0, r1 ldr r6, [r0] ldr r2, [r6, 0xC] mov r10, r2 ldr r0, [sp, 0x4] - ldr r1, _081AA180 + ldr r1, =0x03005dc0 str r0, [r1, 0x8] ldr r0, [r6] lsls r0, 2 @@ -871127,15 +841494,15 @@ _081AA10A: str r1, [sp, 0x14] cmp r12, r3 bge _081AA1A2 - ldr r2, _081AA184 + ldr r2, =0x03005d8c str r2, [sp, 0x18] mov r4, r9 mov r5, r10 _081AA120: ldrh r1, [r5] - ldr r0, _081AA188 + ldr r0, =0x000003ff ands r0, r1 - ldr r2, _081AA18C + ldr r2, =0x0000028e cmp r0, r2 bne _081AA194 mov r0, sp @@ -871172,20 +841539,14 @@ _081AA164: movs r1, 0xFC lsls r1, 8 ands r1, r0 - ldr r2, _081AA190 + ldr r2, =0x0000028d adds r0, r2, 0 orrs r1, r0 strh r1, [r4] ldr r3, [r6] b _081AA196 .align 2, 0 -_081AA178: .4byte 0x00000169 -_081AA17C: .4byte 0x08481dd4 -_081AA180: .4byte 0x03005dc0 -_081AA184: .4byte 0x03005d8c -_081AA188: .4byte 0x000003ff -_081AA18C: .4byte 0x0000028e -_081AA190: .4byte 0x0000028d + .pool _081AA194: strh r1, [r4] _081AA196: @@ -871236,9 +841597,9 @@ sub_81AA1D8: @ 81AA1D8 adds r6, 0x1 add r0, sp, 0x4 mov r8, r0 - ldr r4, _081AA23C - ldr r3, _081AA240 - ldr r0, _081AA244 + ldr r4, =0x03005d90 + ldr r3, =0x00000cb4 + ldr r0, =0x0000ffff adds r2, r0, 0 _081AA1F2: ldr r0, [r4] @@ -871259,32 +841620,27 @@ _081AA1F2: bl sub_81AA33C movs r0, 0 str r0, [sp, 0x4] - ldr r0, _081AA248 + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0xC7 lsls r0, 4 adds r1, r0 - ldr r2, _081AA24C + ldr r2, =0x05000180 mov r0, r8 bl CpuSet movs r5, 0 _081AA22E: cmp r5, 0 bne _081AA254 - ldr r1, _081AA250 + ldr r1, =0x08613650 lsls r0, r7, 4 adds r0, r1 ldrb r0, [r0, 0x3] b _081AA25C .align 2, 0 -_081AA23C: .4byte 0x03005d90 -_081AA240: .4byte 0x00000cb4 -_081AA244: .4byte 0x0000ffff -_081AA248: .4byte 0x03005d8c -_081AA24C: .4byte 0x05000180 -_081AA250: .4byte 0x08613650 + .pool _081AA254: - ldr r1, _081AA26C + ldr r1, =0x08613650 lsls r0, r7, 4 adds r0, r1 ldrb r0, [r0, 0x2] @@ -871292,13 +841648,12 @@ _081AA25C: cmp r0, 0x4 bhi _081AA2E4 lsls r0, 2 - ldr r1, _081AA270 + ldr r1, =_081AA274 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081AA26C: .4byte 0x08613650 -_081AA270: .4byte _081AA274 + .pool .align 2, 0 _081AA274: .4byte _081AA288 @@ -871366,10 +841721,10 @@ _081AA2E4: thumb_func_start sub_81AA2F8 sub_81AA2F8: @ 81AA2F8 push {r4,r5,lr} - ldr r0, _081AA31C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r5, _081AA320 - ldr r4, _081AA324 + ldr r5, =0x08252c4f + ldr r4, =0x08252c6a movs r2, 0xC8 lsls r2, 4 adds r1, r0, r2 @@ -871384,9 +841739,7 @@ _081AA310: str r5, [r1] b _081AA32A .align 2, 0 -_081AA31C: .4byte 0x03005d8c -_081AA320: .4byte 0x08252c4f -_081AA324: .4byte 0x08252c6a + .pool _081AA328: str r4, [r1] _081AA32A: @@ -871405,15 +841758,15 @@ sub_81AA33C: @ 81AA33C push {r4-r7,lr} adds r4, r0, 0 adds r6, r1, 0 - ldr r5, _081AA38C + ldr r5, =0x03005d90 ldr r1, [r5] - ldr r2, _081AA390 + ldr r2, =0x00000e28 adds r0, r1, r2 ldrh r2, [r0] movs r3, 0xF ands r2, r3 strb r2, [r4] - ldr r7, _081AA394 + ldr r7, =0x00000e22 adds r1, r7 ldrh r0, [r1] ands r0, r3 @@ -871421,7 +841774,7 @@ sub_81AA33C: @ 81AA33C cmp r2, r0 bne _081AA386 ldr r1, [r5] - ldr r2, _081AA390 + ldr r2, =0x00000e28 adds r0, r1, r2 ldrh r2, [r0] adds r3, r2, 0x1 @@ -871444,9 +841797,7 @@ _081AA386: pop {r0} bx r0 .align 2, 0 -_081AA38C: .4byte 0x03005d90 -_081AA390: .4byte 0x00000e28 -_081AA394: .4byte 0x00000e22 + .pool thumb_func_end sub_81AA33C thumb_func_start sub_81AA398 @@ -871468,9 +841819,9 @@ sub_81AA398: @ 81AA398 bl malloc_and_clear str r0, [sp, 0x8] bl sub_81AA96C - ldr r0, _081AA3E4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081AA3E8 + ldr r1, =0x00000e26 adds r0, r1 ldrh r4, [r0] movs r0, 0xF @@ -871478,7 +841829,7 @@ sub_81AA398: @ 81AA398 ldr r0, [sp] cmp r0, 0 bne _081AA3F0 - ldr r1, _081AA3EC + ldr r1, =0x08613650 lsls r0, r6, 4 adds r0, r1 ldrb r0, [r0, 0x1] @@ -871487,11 +841838,9 @@ sub_81AA398: @ 81AA398 str r1, [sp, 0x4] b _081AA3FE .align 2, 0 -_081AA3E4: .4byte 0x03005d90 -_081AA3E8: .4byte 0x00000e26 -_081AA3EC: .4byte 0x08613650 + .pool _081AA3F0: - ldr r1, _081AA410 + ldr r1, =0x08613650 lsls r0, r6, 4 adds r0, r1 ldrb r1, [r0] @@ -871509,7 +841858,7 @@ _081AA406: mov r9, r1 b _081AA42E .align 2, 0 -_081AA410: .4byte 0x08613650 + .pool _081AA414: lsls r2, r4, 24 lsrs r2, 24 @@ -871524,10 +841873,10 @@ _081AA414: cmp r0, 0 beq _081AA4B6 _081AA42E: - ldr r0, _081AA458 + ldr r0, =0x0832a328 mov r12, r0 - ldr r6, _081AA45C - ldr r7, _081AA460 + ldr r6, =0x03005d90 + ldr r7, =0x00000e28 movs r3, 0x2 lsls r0, r4, 2 mov r1, r12 @@ -871546,9 +841895,7 @@ _081AA43E: bne _081AA474 b _081AA472 .align 2, 0 -_081AA458: .4byte 0x0832a328 -_081AA45C: .4byte 0x03005d90 -_081AA460: .4byte 0x00000e28 + .pool _081AA464: ldr r0, [r6] adds r0, r7 @@ -871568,7 +841915,7 @@ _081AA474: movs r4, 0 _081AA480: ldr r0, [r6] - ldr r1, _081AA4A0 + ldr r1, =0x00000e26 adds r0, r1 ldrh r1, [r0] movs r0, 0xF @@ -871584,7 +841931,7 @@ _081AA480: orrs r5, r0 b _081AA4A6 .align 2, 0 -_081AA4A0: .4byte 0x00000e26 + .pool _081AA4A4: orrs r5, r1 _081AA4A6: @@ -871643,7 +841990,7 @@ sub_81AA4D8: @ 81AA4D8 ldr r1, [sp] cmp r1, 0 bne _081AA524 - ldr r1, _081AA520 + ldr r1, =0x08613650 lsls r0, r4, 4 adds r0, r1 ldrb r0, [r0, 0x1] @@ -871651,9 +841998,9 @@ sub_81AA4D8: @ 81AA4D8 movs r0, 0 b _081AA530 .align 2, 0 -_081AA520: .4byte 0x08613650 + .pool _081AA524: - ldr r1, _081AA564 + ldr r1, =0x08613650 lsls r0, r4, 4 adds r0, r1 ldrb r2, [r0] @@ -871687,7 +842034,7 @@ _081AA548: movs r7, 0x1 b _081AA56E .align 2, 0 -_081AA564: .4byte 0x08613650 + .pool _081AA568: ldr r1, [sp, 0xC] adds r1, 0x1 @@ -871697,7 +842044,7 @@ _081AA56E: ands r0, r7 cmp r0, 0 beq _081AA600 - ldr r2, _081AA5A4 + ldr r2, =0x08613f46 mov r8, r2 ldr r3, [sp, 0x4] lsls r4, r3, 2 @@ -871719,7 +842066,7 @@ _081AA56E: adds r4, 0x1 b _081AA5C2 .align 2, 0 -_081AA5A4: .4byte 0x08613f46 + .pool _081AA5A8: adds r0, r6, r5 adds r0, r2 @@ -871735,7 +842082,7 @@ _081AA5A8: beq _081AA5E0 _081AA5C2: adds r6, 0x1 - ldr r0, _081AA5E4 + ldr r0, =0x08613f46 adds r1, r6, r5 adds r1, r0 ldrb r1, [r1] @@ -871755,7 +842102,7 @@ _081AA5E0: str r4, [sp, 0xC] b _081AA600 .align 2, 0 -_081AA5E4: .4byte 0x08613f46 + .pool _081AA5E8: adds r6, 0x1 adds r0, r6, r4 @@ -871838,7 +842185,7 @@ sub_81AA648: @ 81AA648 ldr r1, [sp] cmp r1, 0 bne _081AA694 - ldr r1, _081AA690 + ldr r1, =0x08613650 lsls r0, r5, 4 adds r0, r1 ldrb r0, [r0, 0x1] @@ -871846,9 +842193,9 @@ sub_81AA648: @ 81AA648 movs r0, 0 b _081AA6A0 .align 2, 0 -_081AA690: .4byte 0x08613650 + .pool _081AA694: - ldr r1, _081AA6D0 + ldr r1, =0x08613650 lsls r0, r5, 4 adds r0, r1 ldrb r2, [r0] @@ -871862,7 +842209,7 @@ _081AA6A0: str r1, [sp, 0xC] cmp r3, r10 bge _081AA73E - ldr r2, _081AA6D4 + ldr r2, =0x08613f46 mov r9, r2 lsls r5, r6, 2 lsls r6, r0, 24 @@ -871880,8 +842227,7 @@ _081AA6B6: adds r7, 0x1 b _081AA6EE .align 2, 0 -_081AA6D0: .4byte 0x08613650 -_081AA6D4: .4byte 0x08613f46 + .pool _081AA6D8: adds r0, r4, r5 adds r0, r1 @@ -871898,7 +842244,7 @@ _081AA6EE: adds r0, r4, r5 add r0, r9 ldrb r0, [r0] - ldr r1, _081AA710 + ldr r1, =0x08613f46 cmp r0, 0xFF beq _081AA700 cmp r4, 0x3 @@ -871913,7 +842259,7 @@ _081AA702: bne _081AA6D8 b _081AA728 .align 2, 0 -_081AA710: .4byte 0x08613f46 + .pool _081AA714: adds r4, 0x1 adds r0, r4, r5 @@ -871977,9 +842323,9 @@ sub_81AA760: @ 81AA760 mov r8, r2 lsls r3, 24 lsrs r7, r3, 24 - ldr r0, _081AA7C4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081AA7C8 + ldr r1, =0x00000e22 adds r0, r1 ldrh r1, [r0] movs r0, 0x1 @@ -872013,8 +842359,7 @@ _081AA796: bgt _081AA792 b _081AA7FC .align 2, 0 -_081AA7C4: .4byte 0x03005d90 -_081AA7C8: .4byte 0x00000e22 + .pool _081AA7CC: movs r0, 0 b _081AA7FE @@ -872079,7 +842424,7 @@ sub_81AA810: @ 81AA810 mov r10, r4 lsls r5, 24 lsrs r6, r5, 24 - ldr r0, _081AA944 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0xC7 lsls r1, 4 @@ -872206,9 +842551,9 @@ _081AA8DC: adds r0, r4, 0 bl sub_81627A4 strb r0, [r5, 0x1] - ldr r0, _081AA948 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081AA94C + ldr r1, =0x00000cb4 adds r0, r1 add r0, r8 strh r4, [r0] @@ -872216,9 +842561,7 @@ _081AA940: movs r0, 0 b _081AA95C .align 2, 0 -_081AA944: .4byte 0x03005d8c -_081AA948: .4byte 0x03005d90 -_081AA94C: .4byte 0x00000cb4 + .pool _081AA950: adds r7, 0x1 mov r1, r12 @@ -872242,12 +842585,12 @@ _081AA95C: sub_81AA96C: @ 81AA96C push {r4-r7,lr} adds r6, r0, 0 - ldr r0, _081AA9CC + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _081AA9D0 + ldr r2, =0x00000e22 adds r1, r0, r2 ldrh r4, [r1] - ldr r1, _081AA9D4 + ldr r1, =0x00000e24 adds r0, r1 ldrh r0, [r0] lsls r0, 16 @@ -872256,7 +842599,7 @@ sub_81AA96C: @ 81AA96C lsls r0, 24 lsrs r5, r0, 24 movs r3, 0 - ldr r2, _081AA9D8 + ldr r2, =0x08613655 mov r12, r2 movs r7, 0x7 _081AA994: @@ -872271,12 +842614,12 @@ _081AA994: asrs r4, 3 cmp r3, 0x7 bne _081AA9C0 - ldr r0, _081AA9CC + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r2, _081AA9DC + ldr r2, =0x00000e26 adds r0, r1, r2 ldrh r4, [r0] - ldr r0, _081AA9E0 + ldr r0, =0x00000e28 adds r1, r0 ldrh r0, [r1] lsls r0, 16 @@ -872290,35 +842633,30 @@ _081AA9C0: pop {r0} bx r0 .align 2, 0 -_081AA9CC: .4byte 0x03005d90 -_081AA9D0: .4byte 0x00000e22 -_081AA9D4: .4byte 0x00000e24 -_081AA9D8: .4byte 0x08613655 -_081AA9DC: .4byte 0x00000e26 -_081AA9E0: .4byte 0x00000e28 + .pool thumb_func_end sub_81AA96C thumb_func_start sub_81AA9E4 sub_81AA9E4: @ 81AA9E4 push {r4,lr} - ldr r0, _081AAA1C + ldr r0, =0x03005d90 ldr r4, [r0] - ldr r1, _081AAA20 + ldr r1, =0x00000e28 adds r0, r4, r1 ldrh r0, [r0] movs r1, 0x64 bl __umodsi3 lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _081AAA24 + ldr r0, =0x00000cb2 adds r4, r0 ldrh r0, [r4] - ldr r1, _081AAA28 + ldr r1, =0x08613794 adds r0, r1 ldrb r2, [r0] cmp r2, 0x21 bhi _081AAA38 - ldr r1, _081AAA2C + ldr r1, =0x08613750 lsls r0, r2, 1 adds r0, r1 _081AAA10: @@ -872328,11 +842666,7 @@ _081AAA10: ldrb r0, [r0, 0x1] b _081AAA3A .align 2, 0 -_081AAA1C: .4byte 0x03005d90 -_081AAA20: .4byte 0x00000e28 -_081AAA24: .4byte 0x00000cb2 -_081AAA28: .4byte 0x08613794 -_081AAA2C: .4byte 0x08613750 + .pool _081AAA30: adds r0, 0x2 adds r2, 0x1 @@ -872349,7 +842683,7 @@ _081AAA3A: thumb_func_start sub_81AAA40 sub_81AAA40: @ 81AAA40 push {lr} - ldr r0, _081AAA58 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0xC7 lsls r1, 4 @@ -872360,7 +842694,7 @@ sub_81AAA40: @ 81AAA40 adds r0, r3 b _081AAA6E .align 2, 0 -_081AAA58: .4byte 0x03005d8c + .pool _081AAA5C: adds r0, r1, 0x1 lsls r0, 24 @@ -872389,16 +842723,16 @@ sub_81AAA7C: @ 81AAA7C lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r1, _081AAAD4 + ldr r1, =0x03005d90 mov r8, r1 lsls r1, r0, 2 adds r1, r0 movs r0, 0 mov r12, r0 lsls r4, r1, 1 - ldr r7, _081AAAD8 + ldr r7, =0x00000e2c movs r6, 0 - ldr r5, _081AAADC + ldr r5, =0x00000e54 lsls r2, r1, 2 _081AAA9E: mov r1, r8 @@ -872427,23 +842761,21 @@ _081AAA9E: pop {r0} bx r0 .align 2, 0 -_081AAAD4: .4byte 0x03005d90 -_081AAAD8: .4byte 0x00000e2c -_081AAADC: .4byte 0x00000e54 + .pool thumb_func_end sub_81AAA7C thumb_func_start sub_81AAAE0 sub_81AAAE0: @ 81AAAE0 push {r4-r6,lr} - ldr r0, _081AAB44 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r2, _081AAB48 + ldr r2, =0x00000ca9 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 30 lsrs r6, r0, 30 lsls r0, r6, 1 - ldr r2, _081AAB4C + ldr r2, =0x00000e1a adds r1, r2 adds r1, r0 ldrh r0, [r1] @@ -872463,7 +842795,7 @@ _081AAB0A: lsls r0, 16 lsrs r2, r0, 16 movs r1, 0 - ldr r3, _081AAB50 + ldr r3, =0x08613f86 ldrb r0, [r3] lsls r5, r4, 2 cmp r0, r2 @@ -872484,16 +842816,12 @@ _081AAB3A: _081AAB3C: cmp r6, 0 bne _081AAB58 - ldr r2, _081AAB54 + ldr r2, =0x0861379c b _081AAB5A .align 2, 0 -_081AAB44: .4byte 0x03005d90 -_081AAB48: .4byte 0x00000ca9 -_081AAB4C: .4byte 0x00000e1a -_081AAB50: .4byte 0x08613f86 -_081AAB54: .4byte 0x0861379c + .pool _081AAB58: - ldr r2, _081AAB6C + ldr r2, =0x0861392c _081AAB5A: lsls r1, 1 adds r0, r5, r4 @@ -872505,13 +842833,13 @@ _081AAB5A: pop {r1} bx r1 .align 2, 0 -_081AAB6C: .4byte 0x0861392c + .pool thumb_func_end sub_81AAAE0 thumb_func_start sub_81AAB70 sub_81AAB70: @ 81AAB70 push {r4,lr} - ldr r4, _081AAB98 + ldr r4, =0x0203ce58 movs r0, 0 strb r0, [r4, 0x5] adds r0, r4, 0 @@ -872528,20 +842856,20 @@ sub_81AAB70: @ 81AAB70 pop {r0} bx r0 .align 2, 0 -_081AAB98: .4byte 0x0203ce58 + .pool thumb_func_end sub_81AAB70 thumb_func_start c2_bag c2_bag: @ 81AAB9C push {lr} - ldr r2, _081AABAC + ldr r2, =sub_8086194 + 1 movs r0, 0 movs r1, 0x5 bl sub_81AAC90 pop {r0} bx r0 .align 2, 0 -_081AABAC: .4byte sub_8086194 + 1 + .pool thumb_func_end c2_bag thumb_func_start sub_81AABB0 @@ -872551,35 +842879,35 @@ sub_81AABB0: @ 81AABB0 lsls r0, 24 cmp r0, 0 bne _081AABCC - ldr r2, _081AABC8 + ldr r2, =sub_8059D50 + 1 movs r0, 0x1 movs r1, 0x5 bl sub_81AAC90 b _081AABD4 .align 2, 0 -_081AABC8: .4byte sub_8059D50 + 1 + .pool _081AABCC: - ldr r1, _081AABD8 + ldr r1, =sub_8059D50 + 1 movs r0, 0x1 bl sub_81C4F98 _081AABD4: pop {r0} bx r0 .align 2, 0 -_081AABD8: .4byte sub_8059D50 + 1 + .pool thumb_func_end sub_81AABB0 thumb_func_start c2_810A554 c2_810A554: @ 81AABDC push {lr} - ldr r2, _081AABEC + ldr r2, =sub_80861B0 + 1 movs r0, 0x4 movs r1, 0x3 bl sub_81AAC90 pop {r0} bx r0 .align 2, 0 -_081AABEC: .4byte sub_80861B0 + 1 + .pool thumb_func_end c2_810A554 thumb_func_start sub_81AABF0 @@ -872596,81 +842924,77 @@ sub_81AABF0: @ 81AABF0 thumb_func_start sub_81AAC00 sub_81AAC00: @ 81AAC00 push {lr} - ldr r2, _081AAC10 + ldr r2, =sub_80DFC48 + 1 movs r0, 0x3 movs r1, 0x5 bl sub_81AAC90 pop {r0} bx r0 .align 2, 0 -_081AAC10: .4byte sub_80DFC48 + 1 + .pool thumb_func_end sub_81AAC00 thumb_func_start sub_81AAC14 sub_81AAC14: @ 81AAC14 push {lr} - ldr r2, _081AAC24 + ldr r2, =sub_816B31C + 1 movs r0, 0x6 movs r1, 0x5 bl sub_81AAC90 pop {r0} bx r0 .align 2, 0 -_081AAC24: .4byte sub_816B31C + 1 + .pool thumb_func_end sub_81AAC14 thumb_func_start sub_81AAC28 sub_81AAC28: @ 81AAC28 push {lr} - ldr r2, _081AAC44 + ldr r2, =sub_81ADE6C + 1 movs r0, 0x9 movs r1, 0x5 bl sub_81AAC90 - ldr r0, _081AAC48 + ldr r0, =0x020375e2 movs r1, 0 strh r1, [r0] - ldr r0, _081AAC4C + ldr r0, =0x020375f0 strh r1, [r0] pop {r0} bx r0 .align 2, 0 -_081AAC44: .4byte sub_81ADE6C + 1 -_081AAC48: .4byte 0x020375e2 -_081AAC4C: .4byte 0x020375f0 + .pool thumb_func_end sub_81AAC28 thumb_func_start sub_81AAC50 sub_81AAC50: @ 81AAC50 push {lr} - ldr r2, _081AAC68 + ldr r2, =sub_81ADEBC + 1 movs r0, 0x7 movs r1, 0x5 bl sub_81AAC90 - ldr r1, _081AAC6C + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_081AAC68: .4byte sub_81ADEBC + 1 -_081AAC6C: .4byte 0x020375f0 + .pool thumb_func_end sub_81AAC50 thumb_func_start sub_81AAC70 sub_81AAC70: @ 81AAC70 push {lr} - ldr r2, _081AAC88 + ldr r2, =sub_81ADF00 + 1 movs r0, 0x8 movs r1, 0x5 bl sub_81AAC90 - ldr r1, _081AAC8C + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_081AAC88: .4byte sub_81ADF00 + 1 -_081AAC8C: .4byte 0x020375f0 + .pool thumb_func_end sub_81AAC70 thumb_func_start sub_81AAC90 @@ -872681,8 +843005,8 @@ sub_81AAC90: @ 81AAC90 lsrs r5, r0, 24 lsls r1, 24 lsrs r7, r1, 24 - ldr r6, _081AACB4 - ldr r0, _081AACB8 + ldr r6, =0x0203ce54 + ldr r0, =0x00000c48 bl malloc_and_clear str r0, [r6] cmp r0, 0 @@ -872691,10 +843015,9 @@ sub_81AAC90: @ 81AAC90 bl set_callback2 b _081AAD3A .align 2, 0 -_081AACB4: .4byte 0x0203ce54 -_081AACB8: .4byte 0x00000c48 + .pool _081AACBC: - ldr r0, _081AAD40 + ldr r0, =0x0203ce58 cmp r5, 0xC beq _081AACC4 strb r5, [r0, 0x4] @@ -872714,7 +843037,7 @@ _081AACD0: cmp r0, 0x1 bhi _081AACF0 ldr r2, [r6] - ldr r0, _081AAD44 + ldr r0, =0x0000081b adds r2, r0 ldrb r1, [r2] movs r0, 0x10 @@ -872727,24 +843050,24 @@ _081AACF0: ldr r0, [r6] movs r1, 0 str r1, [r0] - ldr r1, _081AAD48 + ldr r1, =0x0000081a adds r0, r1 movs r1, 0xFF strb r1, [r0] ldr r0, [r6] - ldr r1, _081AAD4C + ldr r1, =0x0000081e adds r0, r1 movs r1, 0x1 negs r1, r1 strb r1, [r0] ldr r0, [r6] - ldr r1, _081AAD50 + ldr r1, =0x0000081f adds r0, r1 movs r1, 0x1 negs r1, r1 strb r1, [r0] ldr r0, [r6] - ldr r1, _081AAD54 + ldr r1, =0x00000804 adds r0, r1 movs r1, 0xFF movs r2, 0xC @@ -872756,20 +843079,14 @@ _081AACF0: movs r1, 0xFF movs r2, 0xA bl memset - ldr r0, _081AAD58 + ldr r0, =c2_bag_2 + 1 bl set_callback2 _081AAD3A: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081AAD40: .4byte 0x0203ce58 -_081AAD44: .4byte 0x0000081b -_081AAD48: .4byte 0x0000081a -_081AAD4C: .4byte 0x0000081e -_081AAD50: .4byte 0x0000081f -_081AAD54: .4byte 0x00000804 -_081AAD58: .4byte c2_bag_2 + 1 + .pool thumb_func_end sub_81AAC90 thumb_func_start c2_bag_3 @@ -872822,7 +843139,7 @@ _081AADB2: setup_bag_menu: @ 81AADB8 push {r4,r5,lr} sub sp, 0x4 - ldr r1, _081AADD8 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -872833,13 +843150,12 @@ setup_bag_menu: @ 81AADB8 b _081AB02C _081AADCE: lsls r0, 2 - ldr r1, _081AADDC + ldr r1, =_081AADE0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081AADD8: .4byte 0x030022c0 -_081AADDC: .4byte _081AADE0 + .pool .align 2, 0 _081AADE0: .4byte _081AAE34 @@ -872869,31 +843185,30 @@ _081AAE34: b _081AB012 _081AAE3E: bl remove_some_task - ldr r1, _081AAE4C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _081AB01A .align 2, 0 -_081AAE4C: .4byte 0x030022c0 + .pool _081AAE50: bl gpu_pal_allocator_reset b _081AB012 _081AAE56: bl sub_80A1A74 - ldr r2, _081AAE70 + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r1, _081AAE74 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _081AB01A .align 2, 0 -_081AAE70: .4byte 0x02037fd4 -_081AAE74: .4byte 0x030022c0 + .pool _081AAE78: bl reset_all_obj_data b _081AB012 @@ -872909,30 +843224,28 @@ _081AAE86: bne _081AAE94 bl clear_tasks _081AAE94: - ldr r1, _081AAEA0 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _081AB01A .align 2, 0 -_081AAEA0: .4byte 0x030022c0 + .pool _081AAEA4: bl bag_menu_init_bgs - ldr r0, _081AAEC0 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081AAEC4 + ldr r1, =0x00000834 adds r0, r1 movs r1, 0 strh r1, [r0] - ldr r1, _081AAEC8 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _081AB01A .align 2, 0 -_081AAEC0: .4byte 0x0203ce54 -_081AAEC4: .4byte 0x00000834 -_081AAEC8: .4byte 0x030022c0 + .pool _081AAECC: bl load_bag_menu_graphics lsls r0, 24 @@ -872943,13 +843256,13 @@ _081AAED8: b _081AB012 _081AAEDA: bl setup_bag_menu_textboxes - ldr r1, _081AAEE8 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _081AB01A .align 2, 0 -_081AAEE8: .4byte 0x030022c0 + .pool _081AAEEC: bl sub_81ABA6C bl sub_81ABAC4 @@ -872957,23 +843270,23 @@ _081AAEEC: b _081AB012 _081AAEFA: bl allocate_bag_item_list_buffers - ldr r1, _081AAF08 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _081AB01A .align 2, 0 -_081AAF08: .4byte 0x030022c0 + .pool _081AAF0C: - ldr r0, _081AAF18 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] bl load_bag_item_list_buffers b _081AB012 .align 2, 0 -_081AAF18: .4byte 0x0203ce58 + .pool _081AAF1C: - ldr r1, _081AAF48 - ldr r4, _081AAF4C + ldr r1, =0x085e91fc + ldr r4, =0x0203ce58 ldrb r0, [r4, 0x5] lsls r0, 2 adds r0, r1 @@ -872985,23 +843298,21 @@ _081AAF1C: ldrb r0, [r4, 0x5] movs r1, 0x1 bl bag_menu_draw_pocket_indicator_square - ldr r1, _081AAF50 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _081AB01A .align 2, 0 -_081AAF48: .4byte 0x085e91fc -_081AAF4C: .4byte 0x0203ce58 -_081AAF50: .4byte 0x030022c0 + .pool _081AAF54: - ldr r4, _081AAF94 + ldr r4, =0x0203ce58 ldrb r0, [r4, 0x4] bl sub_81AB1F0 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _081AAF98 + ldr r0, =0x03006310 ldrb r2, [r4, 0x5] lsls r2, 1 adds r1, r4, 0 @@ -873012,7 +843323,7 @@ _081AAF54: adds r2, r4 ldrh r2, [r2] bl calls_per_item_funcs_in_list_outer - ldr r2, _081AAF9C + ldr r2, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -873025,34 +843336,31 @@ _081AAF54: strh r2, [r1, 0x18] b _081AB012 .align 2, 0 -_081AAF94: .4byte 0x0203ce58 -_081AAF98: .4byte 0x03006310 -_081AAF9C: .4byte 0x03005e00 + .pool _081AAFA0: - ldr r0, _081AAFB4 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] bl sub_80D4D00 - ldr r1, _081AAFB8 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _081AB01A .align 2, 0 -_081AAFB4: .4byte 0x0203ce58 -_081AAFB8: .4byte 0x030022c0 + .pool _081AAFBC: bl sub_80D4FAC b _081AB012 _081AAFC2: bl sub_81AB7BC bl sub_81AB854 - ldr r1, _081AAFD4 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _081AB01A .align 2, 0 -_081AAFD4: .4byte 0x030022c0 + .pool _081AAFD8: bl sub_81AE2B4 b _081AB012 @@ -873062,13 +843370,13 @@ _081AAFDE: movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r1, _081AAFF4 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 b _081AB01A .align 2, 0 -_081AAFF4: .4byte 0x030022c0 + .pool _081AAFF8: movs r0, 0x1 negs r0, r0 @@ -873077,13 +843385,13 @@ _081AAFF8: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r2, _081AB024 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] _081AB012: - ldr r1, _081AB028 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -873093,18 +843401,16 @@ _081AB01A: strb r0, [r1] b _081AB044 .align 2, 0 -_081AB024: .4byte 0x02037fd4 -_081AB028: .4byte 0x030022c0 + .pool _081AB02C: - ldr r0, _081AB03C + ldr r0, =vblank_cb_bag_menu + 1 bl SetVBlankCallback - ldr r0, _081AB040 + ldr r0, =c2_bag_3 + 1 bl set_callback2 movs r0, 0x1 b _081AB046 .align 2, 0 -_081AB03C: .4byte vblank_cb_bag_menu + 1 -_081AB040: .4byte c2_bag_3 + 1 + .pool _081AB044: movs r0, 0 _081AB046: @@ -873118,7 +843424,7 @@ _081AB046: bag_menu_init_bgs: @ 81AB050 push {r4,lr} bl sub_8121DA0 - ldr r4, _081AB0B4 + ldr r4, =0x0203ce54 ldr r0, [r4] adds r0, 0x4 movs r2, 0x80 @@ -873127,7 +843433,7 @@ bag_menu_init_bgs: @ 81AB050 bl memset movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081AB0B8 + ldr r1, =0x08613f90 movs r0, 0 movs r2, 0x3 bl bg_vram_setup @@ -873155,17 +843461,16 @@ bag_menu_init_bgs: @ 81AB050 pop {r0} bx r0 .align 2, 0 -_081AB0B4: .4byte 0x0203ce54 -_081AB0B8: .4byte 0x08613f90 + .pool thumb_func_end bag_menu_init_bgs thumb_func_start load_bag_menu_graphics load_bag_menu_graphics: @ 81AB0BC push {r4,lr} sub sp, 0x4 - ldr r4, _081AB0DC + ldr r4, =0x0203ce54 ldr r0, [r4] - ldr r1, _081AB0E0 + ldr r1, =0x00000834 adds r0, r1 movs r1, 0 ldrsh r0, [r0, r1] @@ -873174,14 +843479,12 @@ load_bag_menu_graphics: @ 81AB0BC b _081AB1CC _081AB0D2: lsls r0, 2 - ldr r1, _081AB0E4 + ldr r1, =_081AB0E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081AB0DC: .4byte 0x0203ce54 -_081AB0E0: .4byte 0x00000834 -_081AB0E4: .4byte _081AB0E8 + .pool .align 2, 0 _081AB0E8: .4byte _081AB0FC @@ -873191,7 +843494,7 @@ _081AB0E8: .4byte _081AB1A8 _081AB0FC: bl reset_temp_tile_data_buffers - ldr r1, _081AB114 + ldr r1, =0x08d9a620 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -873200,101 +843503,96 @@ _081AB0FC: bl decompress_and_copy_tile_data_to_vram b _081AB1AE .align 2, 0 -_081AB114: .4byte 0x08d9a620 + .pool _081AB118: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081AB1E4 - ldr r0, _081AB134 - ldr r4, _081AB138 + ldr r0, =0x08d9a88c + ldr r4, =0x0203ce54 ldr r1, [r4] adds r1, 0x4 bl call_LZZUnCompWram ldr r1, [r4] b _081AB1B2 .align 2, 0 -_081AB134: .4byte 0x08d9a88c -_081AB138: .4byte 0x0203ce54 + .pool _081AB13C: bl sub_81ADC54 lsls r0, 24 cmp r0, 0 bne _081AB164 - ldr r0, _081AB15C + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 beq _081AB164 - ldr r0, _081AB160 + ldr r0, =0x08d9a5d4 movs r1, 0 movs r2, 0x40 bl decompress_palette b _081AB1AE .align 2, 0 -_081AB15C: .4byte 0x03005d90 -_081AB160: .4byte 0x08d9a5d4 + .pool _081AB164: - ldr r0, _081AB170 + ldr r0, =0x08d9a588 movs r1, 0 movs r2, 0x40 bl decompress_palette b _081AB1AE .align 2, 0 -_081AB170: .4byte 0x08d9a588 + .pool _081AB174: bl sub_81ADC54 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081AB18A - ldr r0, _081AB194 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 bne _081AB19C _081AB18A: - ldr r0, _081AB198 + ldr r0, =0x0857fb34 bl gpu_tile_obj_decompress_and_load b _081AB1AE .align 2, 0 -_081AB194: .4byte 0x03005d90 -_081AB198: .4byte 0x0857fb34 + .pool _081AB19C: - ldr r0, _081AB1A4 + ldr r0, =0x0857fb3c bl gpu_tile_obj_decompress_and_load b _081AB1AE .align 2, 0 -_081AB1A4: .4byte 0x0857fb3c + .pool _081AB1A8: - ldr r0, _081AB1C0 + ldr r0, =0x0857fb44 bl gpu_pal_obj_decompress_and_apply _081AB1AE: - ldr r0, _081AB1C4 + ldr r0, =0x0203ce54 ldr r1, [r0] _081AB1B2: - ldr r0, _081AB1C8 + ldr r0, =0x00000834 adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _081AB1E4 .align 2, 0 -_081AB1C0: .4byte 0x0857fb44 -_081AB1C4: .4byte 0x0203ce54 -_081AB1C8: .4byte 0x00000834 + .pool _081AB1CC: bl sub_8122328 ldr r0, [r4] - ldr r1, _081AB1E0 + ldr r1, =0x00000834 adds r0, r1 movs r1, 0 strh r1, [r0] movs r0, 0x1 b _081AB1E6 .align 2, 0 -_081AB1E0: .4byte 0x00000834 + .pool _081AB1E4: movs r0, 0 _081AB1E6: @@ -873311,12 +843609,12 @@ sub_81AB1F0: @ 81AB1F0 lsrs r0, 24 cmp r0, 0xA bne _081AB204 - ldr r0, _081AB200 + ldr r0, =sub_81ADD98 + 1 b _081AB206 .align 2, 0 -_081AB200: .4byte sub_81ADD98 + 1 + .pool _081AB204: - ldr r0, _081AB214 + ldr r0, =sub_81ABD28 + 1 _081AB206: movs r1, 0 bl AddTask @@ -873325,18 +843623,18 @@ _081AB206: pop {r1} bx r1 .align 2, 0 -_081AB214: .4byte sub_81ABD28 + 1 + .pool thumb_func_end sub_81AB1F0 thumb_func_start allocate_bag_item_list_buffers allocate_bag_item_list_buffers: @ 81AB218 push {r4,lr} - ldr r4, _081AB238 + ldr r4, =0x0203ce74 movs r0, 0x82 lsls r0, 2 bl malloc str r0, [r4] - ldr r4, _081AB23C + ldr r4, =0x0203ce78 movs r0, 0xC3 lsls r0, 3 bl malloc @@ -873345,8 +843643,7 @@ allocate_bag_item_list_buffers: @ 81AB218 pop {r0} bx r0 .align 2, 0 -_081AB238: .4byte 0x0203ce74 -_081AB23C: .4byte 0x0203ce78 + .pool thumb_func_end allocate_bag_item_list_buffers thumb_func_start load_bag_item_list_buffers @@ -873357,12 +843654,12 @@ load_bag_item_list_buffers: @ 81AB240 lsls r0, 24 lsrs r7, r0, 24 lsls r1, r7, 3 - ldr r0, _081AB2E0 + ldr r0, =0x02039dd8 adds r1, r0 mov r8, r1 - ldr r0, _081AB2E4 + ldr r0, =0x0203ce54 ldr r2, [r0] - ldr r1, _081AB2E8 + ldr r1, =0x0000081b adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x80 @@ -873370,14 +843667,14 @@ load_bag_item_list_buffers: @ 81AB240 cmp r0, 0 bne _081AB2FC movs r6, 0 - ldr r3, _081AB2EC + ldr r3, =0x00000829 adds r0, r2, r3 adds r0, r7 ldrb r0, [r0] subs r0, 0x1 cmp r6, r0 bge _081AB2B6 - ldr r5, _081AB2F0 + ldr r5, =0x0203ce78 _081AB276: lsls r4, r6, 1 adds r4, r6 @@ -873390,7 +843687,7 @@ _081AB276: adds r1, r2 ldrh r1, [r1] bl get_name - ldr r0, _081AB2F4 + ldr r0, =0x0203ce74 ldr r0, [r0] lsls r1, r6, 3 adds r1, r0 @@ -873401,9 +843698,9 @@ _081AB276: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _081AB2E4 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r3, _081AB2EC + ldr r3, =0x00000829 adds r0, r3 adds r0, r7 ldrb r0, [r0] @@ -873411,15 +843708,15 @@ _081AB276: cmp r6, r0 blt _081AB276 _081AB2B6: - ldr r5, _081AB2F0 + ldr r5, =0x0203ce78 lsls r4, r6, 1 adds r4, r6 lsls r4, 3 ldr r0, [r5] adds r0, r4 - ldr r1, _081AB2F8 + ldr r1, =0x085e8db4 bl gf_strcpy - ldr r0, _081AB2F4 + ldr r0, =0x0203ce74 ldr r0, [r0] lsls r1, r6, 3 adds r1, r0 @@ -873431,22 +843728,16 @@ _081AB2B6: str r0, [r1, 0x4] b _081AB34A .align 2, 0 -_081AB2E0: .4byte 0x02039dd8 -_081AB2E4: .4byte 0x0203ce54 -_081AB2E8: .4byte 0x0000081b -_081AB2EC: .4byte 0x00000829 -_081AB2F0: .4byte 0x0203ce78 -_081AB2F4: .4byte 0x0203ce74 -_081AB2F8: .4byte 0x085e8db4 + .pool _081AB2FC: movs r6, 0 - ldr r4, _081AB380 + ldr r4, =0x00000829 adds r0, r2, r4 adds r0, r7 ldrb r0, [r0] cmp r6, r0 bcs _081AB34A - ldr r5, _081AB384 + ldr r5, =0x0203ce78 _081AB30C: lsls r4, r6, 1 adds r4, r6 @@ -873459,7 +843750,7 @@ _081AB30C: adds r1, r2 ldrh r1, [r1] bl get_name - ldr r0, _081AB388 + ldr r0, =0x0203ce74 ldr r0, [r0] lsls r1, r6, 3 adds r1, r0 @@ -873470,33 +843761,33 @@ _081AB30C: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _081AB38C + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r3, _081AB380 + ldr r3, =0x00000829 adds r0, r3 adds r0, r7 ldrb r0, [r0] cmp r6, r0 bcc _081AB30C _081AB34A: - ldr r2, _081AB390 + ldr r2, =0x03006310 adds r1, r2, 0 - ldr r0, _081AB394 + ldr r0, =0x08613f9c ldm r0!, {r3-r5} stm r1!, {r3-r5} ldm r0!, {r3-r5} stm r1!, {r3-r5} - ldr r0, _081AB38C + ldr r0, =0x0203ce54 ldr r1, [r0] - ldr r4, _081AB380 + ldr r4, =0x00000829 adds r0, r1, r4 adds r0, r7 ldrb r0, [r0] strh r0, [r2, 0xC] - ldr r0, _081AB388 + ldr r0, =0x0203ce74 ldr r0, [r0] str r0, [r2] - ldr r5, _081AB398 + ldr r5, =0x0000082e adds r1, r5 adds r1, r7 ldrb r0, [r1] @@ -873507,13 +843798,7 @@ _081AB34A: pop {r0} bx r0 .align 2, 0 -_081AB380: .4byte 0x00000829 -_081AB384: .4byte 0x0203ce78 -_081AB388: .4byte 0x0203ce74 -_081AB38C: .4byte 0x0203ce54 -_081AB390: .4byte 0x03006310 -_081AB394: .4byte 0x08613f9c -_081AB398: .4byte 0x0000082e + .pool thumb_func_end load_bag_item_list_buffers thumb_func_start get_name @@ -873522,7 +843807,7 @@ get_name: @ 81AB39C adds r6, r0, 0 lsls r1, 16 lsrs r5, r1, 16 - ldr r0, _081AB3BC + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x2 beq _081AB3C0 @@ -873533,16 +843818,16 @@ get_name: @ 81AB39C bl itemid_get_name b _081AB43E .align 2, 0 -_081AB3BC: .4byte 0x0203ce58 + .pool _081AB3C0: - ldr r4, _081AB3F4 + ldr r4, =0x02021dc4 adds r0, r5, 0 bl sub_81B6CFC lsls r0, 16 lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _081AB3F8 + ldr r0, =0x0831977c adds r1, r0 adds r0, r4, 0 bl gf_strcpy @@ -873550,43 +843835,38 @@ _081AB3C0: lsls r0, 1 cmp r5, r0 bls _081AB408 - ldr r0, _081AB3FC - ldr r2, _081AB400 + ldr r0, =0x02021cc4 + ldr r2, =0xfffffeae adds r1, r5, r2 movs r2, 0x2 movs r3, 0x1 bl decimal_int_to_string - ldr r1, _081AB404 + ldr r1, =0x085e921a b _081AB438 .align 2, 0 -_081AB3F4: .4byte 0x02021dc4 -_081AB3F8: .4byte 0x0831977c -_081AB3FC: .4byte 0x02021cc4 -_081AB400: .4byte 0xfffffeae -_081AB404: .4byte 0x085e921a + .pool _081AB408: - ldr r0, _081AB418 - ldr r2, _081AB41C + ldr r0, =0x02021cc4 + ldr r2, =0xfffffee0 adds r1, r5, r2 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string b _081AB436 .align 2, 0 -_081AB418: .4byte 0x02021cc4 -_081AB41C: .4byte 0xfffffee0 + .pool _081AB420: - ldr r0, _081AB444 + ldr r0, =0x02021cc4 adds r1, r5, 0 subs r1, 0x84 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r1, _081AB448 + ldr r1, =0x02021dc4 adds r0, r5, 0 bl itemid_get_name _081AB436: - ldr r1, _081AB44C + ldr r1, =0x085e9210 _081AB438: adds r0, r6, 0 bl ExpandTextCodes @@ -873595,9 +843875,7 @@ _081AB43E: pop {r0} bx r0 .align 2, 0 -_081AB444: .4byte 0x02021cc4 -_081AB448: .4byte 0x02021dc4 -_081AB44C: .4byte 0x085e9210 + .pool thumb_func_end get_name thumb_func_start sub_81AB450 @@ -873612,9 +843890,9 @@ sub_81AB450: @ 81AB450 bl audio_play bl sub_80D4DC4 _081AB466: - ldr r4, _081AB4B8 + ldr r4, =0x0203ce54 ldr r1, [r4] - ldr r2, _081AB4BC + ldr r2, =0x0000081a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF @@ -873631,7 +843909,7 @@ _081AB466: negs r0, r0 cmp r6, r0 beq _081AB4C8 - ldr r0, _081AB4C0 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] adds r0, 0x1 lsls r0, 24 @@ -873642,7 +843920,7 @@ _081AB466: lsls r0, 16 lsrs r0, 16 ldr r1, [r4] - ldr r2, _081AB4C4 + ldr r2, =0x0000081b adds r1, r2 ldrb r1, [r1] lsls r1, 26 @@ -873650,23 +843928,20 @@ _081AB466: bl sub_80D4F38 b _081AB4DA .align 2, 0 -_081AB4B8: .4byte 0x0203ce54 -_081AB4BC: .4byte 0x0000081a -_081AB4C0: .4byte 0x0203ce58 -_081AB4C4: .4byte 0x0000081b + .pool _081AB4C8: - ldr r0, _081AB514 + ldr r0, =0x0000ffff ldr r1, [r4] - ldr r2, _081AB518 + ldr r2, =0x0000081b adds r1, r2 ldrb r1, [r1] lsls r1, 26 lsrs r1, 30 bl sub_80D4F38 _081AB4DA: - ldr r5, _081AB51C + ldr r5, =0x0203ce54 ldr r2, [r5] - ldr r4, _081AB518 + ldr r4, =0x0000081b adds r2, r4 ldrb r3, [r2] lsls r0, r3, 26 @@ -873693,9 +843968,7 @@ _081AB50C: pop {r0} bx r0 .align 2, 0 -_081AB514: .4byte 0x0000ffff -_081AB518: .4byte 0x0000081b -_081AB51C: .4byte 0x0203ce54 + .pool thumb_func_end sub_81AB450 thumb_func_start sub_81AB520 @@ -873717,9 +843990,9 @@ sub_81AB520: @ 81AB520 bne _081AB540 b _081AB696 _081AB540: - ldr r0, _081AB560 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081AB564 + ldr r1, =0x0000081a adds r0, r1 ldrb r1, [r0] cmp r1, 0xFF @@ -873733,14 +844006,13 @@ _081AB540: bl sub_81AB75C b _081AB570 .align 2, 0 -_081AB560: .4byte 0x0203ce54 -_081AB564: .4byte 0x0000081a + .pool _081AB568: adds r0, r7, 0 movs r1, 0xFF bl sub_81AB75C _081AB570: - ldr r5, _081AB5F8 + ldr r5, =0x0203ce58 ldrb r0, [r5, 0x5] adds r0, 0x1 lsls r0, 24 @@ -873760,13 +844032,13 @@ _081AB570: lsls r0, 16 lsrs r4, r0, 16 mov r9, r4 - ldr r1, _081AB5FC + ldr r1, =0xfffffead adds r0, r6, r1 lsls r0, 16 lsrs r0, 16 cmp r0, 0x7 bhi _081AB5BE - ldr r1, _081AB600 + ldr r1, =0x08dc6378 subs r3, r7, 0x1 lsls r3, 16 lsrs r3, 16 @@ -873780,13 +844052,13 @@ _081AB5BE: ldrb r0, [r5, 0x5] cmp r0, 0x3 bne _081AB610 - ldr r0, _081AB604 + ldr r0, =0x02021cc4 adds r1, r4, 0 movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string - ldr r4, _081AB608 - ldr r1, _081AB60C + ldr r4, =0x02021fc4 + ldr r1, =0x085e8da0 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x7 @@ -873804,12 +844076,7 @@ _081AB5BE: str r1, [sp, 0x10] b _081AB652 .align 2, 0 -_081AB5F8: .4byte 0x0203ce58 -_081AB5FC: .4byte 0xfffffead -_081AB600: .4byte 0x08dc6378 -_081AB604: .4byte 0x02021cc4 -_081AB608: .4byte 0x02021fc4 -_081AB60C: .4byte 0x085e8da0 + .pool _081AB610: cmp r0, 0x4 beq _081AB66C @@ -873819,13 +844086,13 @@ _081AB610: lsrs r5, r0, 24 cmp r5, 0 bne _081AB66C - ldr r0, _081AB660 + ldr r0, =0x02021cc4 mov r1, r9 movs r2, 0x1 movs r3, 0x2 bl decimal_int_to_string - ldr r4, _081AB664 - ldr r1, _081AB668 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8da0 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x7 @@ -873847,20 +844114,18 @@ _081AB652: bl sub_81AE0BC b _081AB696 .align 2, 0 -_081AB660: .4byte 0x02021cc4 -_081AB664: .4byte 0x02021fc4 -_081AB668: .4byte 0x085e8da0 + .pool _081AB66C: - ldr r0, _081AB6A4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081AB6A8 + ldr r1, =0x00000496 adds r0, r1 ldrh r0, [r0] cmp r0, 0 beq _081AB696 cmp r0, r6 bne _081AB696 - ldr r1, _081AB6AC + ldr r1, =0x086140a4 subs r3, r7, 0x1 lsls r3, 16 lsrs r3, 16 @@ -873880,9 +844145,7 @@ _081AB696: pop {r0} bx r0 .align 2, 0 -_081AB6A4: .4byte 0x03005d8c -_081AB6A8: .4byte 0x00000496 -_081AB6AC: .4byte 0x086140a4 + .pool thumb_func_end sub_81AB520 thumb_func_start bag_menu_print_description_box_text @@ -873894,7 +844157,7 @@ bag_menu_print_description_box_text: @ 81AB6B0 negs r0, r0 cmp r1, r0 beq _081AB6E0 - ldr r0, _081AB6DC + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] adds r0, 0x1 lsls r0, 24 @@ -873908,18 +844171,18 @@ bag_menu_print_description_box_text: @ 81AB6B0 adds r4, r0, 0 b _081AB6FC .align 2, 0 -_081AB6DC: .4byte 0x0203ce58 + .pool _081AB6E0: - ldr r0, _081AB728 - ldr r2, _081AB72C - ldr r1, _081AB730 + ldr r0, =0x02021cc4 + ldr r2, =0x085e9180 + ldr r1, =0x0203ce58 ldrb r1, [r1, 0x4] lsls r1, 2 adds r1, r2 ldr r1, [r1] bl gf_strcpy - ldr r4, _081AB734 - ldr r1, _081AB738 + ldr r4, =0x02021fc4 + ldr r1, =0x085e91c0 adds r0, r4, 0 bl ExpandTextCodes _081AB6FC: @@ -873943,11 +844206,7 @@ _081AB6FC: pop {r0} bx r0 .align 2, 0 -_081AB728: .4byte 0x02021cc4 -_081AB72C: .4byte 0x085e9180 -_081AB730: .4byte 0x0203ce58 -_081AB734: .4byte 0x02021fc4 -_081AB738: .4byte 0x085e91c0 + .pool thumb_func_end bag_menu_print_description_box_text thumb_func_start sub_81AB73C @@ -873998,7 +844257,7 @@ sub_81AB75C: @ 81AB75C bl Window_FillPixelRect b _081AB7AE _081AB798: - ldr r2, _081AB7B8 + ldr r2, =0x085e8d60 str r5, [sp] movs r0, 0 str r0, [sp, 0x4] @@ -874014,23 +844273,23 @@ _081AB7AE: pop {r0} bx r0 .align 2, 0 -_081AB7B8: .4byte 0x085e8d60 + .pool thumb_func_end sub_81AB75C thumb_func_start sub_81AB7BC sub_81AB7BC: @ 81AB7BC push {r4-r6,lr} sub sp, 0x10 - ldr r5, _081AB814 + ldr r5, =0x0203ce54 ldr r4, [r5] - ldr r1, _081AB818 + ldr r1, =0x0000081e adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0xFF bne _081AB80A - ldr r2, _081AB81C + ldr r2, =0x0203ce58 ldrb r3, [r2, 0x5] - ldr r6, _081AB820 + ldr r6, =0x00000829 adds r0, r4, r6 adds r0, r3 ldrb r1, [r0] @@ -874054,7 +844313,7 @@ sub_81AB7BC: @ 81AB7BC movs r3, 0x94 bl sub_81AF4A0 ldr r1, [r5] - ldr r2, _081AB818 + ldr r2, =0x0000081e adds r1, r2 strb r0, [r1] _081AB80A: @@ -874063,25 +844322,22 @@ _081AB80A: pop {r0} bx r0 .align 2, 0 -_081AB814: .4byte 0x0203ce54 -_081AB818: .4byte 0x0000081e -_081AB81C: .4byte 0x0203ce58 -_081AB820: .4byte 0x00000829 + .pool thumb_func_end sub_81AB7BC thumb_func_start sub_81AB824 sub_81AB824: @ 81AB824 push {r4,lr} - ldr r4, _081AB84C + ldr r4, =0x0203ce54 ldr r0, [r4] - ldr r2, _081AB850 + ldr r2, =0x0000081e adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF beq _081AB842 bl sub_81AF620 ldr r0, [r4] - ldr r1, _081AB850 + ldr r1, =0x0000081e adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -874091,32 +844347,31 @@ _081AB842: pop {r0} bx r0 .align 2, 0 -_081AB84C: .4byte 0x0203ce54 -_081AB850: .4byte 0x0000081e + .pool thumb_func_end sub_81AB824 thumb_func_start sub_81AB854 sub_81AB854: @ 81AB854 push {r4,lr} - ldr r4, _081AB888 + ldr r4, =0x0203ce54 ldr r2, [r4] - ldr r1, _081AB88C + ldr r1, =0x0000081b adds r0, r2, r1 ldrb r1, [r0] movs r0, 0xF ands r0, r1 cmp r0, 0x1 beq _081AB882 - ldr r1, _081AB890 + ldr r1, =0x0000081f adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0xFF bne _081AB882 - ldr r0, _081AB894 - ldr r1, _081AB898 + ldr r0, =0x08614094 + ldr r1, =0x0203ce5e bl sub_81AF380 ldr r1, [r4] - ldr r2, _081AB890 + ldr r2, =0x0000081f adds r1, r2 strb r0, [r1] _081AB882: @@ -874124,26 +844379,22 @@ _081AB882: pop {r0} bx r0 .align 2, 0 -_081AB888: .4byte 0x0203ce54 -_081AB88C: .4byte 0x0000081b -_081AB890: .4byte 0x0000081f -_081AB894: .4byte 0x08614094 -_081AB898: .4byte 0x0203ce5e + .pool thumb_func_end sub_81AB854 thumb_func_start sub_81AB89C sub_81AB89C: @ 81AB89C push {r4,lr} - ldr r4, _081AB8C0 + ldr r4, =0x0203ce54 ldr r0, [r4] - ldr r2, _081AB8C4 + ldr r2, =0x0000081f adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF beq _081AB8BA bl sub_81AF620 ldr r0, [r4] - ldr r1, _081AB8C4 + ldr r1, =0x0000081f adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -874152,29 +844403,26 @@ _081AB8BA: pop {r0} bx r0 .align 2, 0 -_081AB8C0: .4byte 0x0203ce54 -_081AB8C4: .4byte 0x0000081f + .pool thumb_func_end sub_81AB89C thumb_func_start free_bag_item_list_buffers free_bag_item_list_buffers: @ 81AB8C8 push {lr} - ldr r0, _081AB8EC + ldr r0, =0x0203ce78 ldr r0, [r0] bl free - ldr r0, _081AB8F0 + ldr r0, =0x0203ce74 ldr r0, [r0] bl free bl Window_FreeMemory - ldr r0, _081AB8F4 + ldr r0, =0x0203ce54 ldr r0, [r0] bl free pop {r0} bx r0 .align 2, 0 -_081AB8EC: .4byte 0x0203ce78 -_081AB8F0: .4byte 0x0203ce74 -_081AB8F4: .4byte 0x0203ce54 + .pool thumb_func_end free_bag_item_list_buffers thumb_func_start task_close_bag_menu_1 @@ -874191,20 +844439,19 @@ task_close_bag_menu_1: @ 81AB8F8 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _081AB928 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081AB92C + ldr r1, =task_close_bag_menu_2 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_081AB928: .4byte 0x03005e00 -_081AB92C: .4byte task_close_bag_menu_2 + 1 + .pool thumb_func_end task_close_bag_menu_1 thumb_func_start task_close_bag_menu_2 @@ -874215,16 +844462,16 @@ task_close_bag_menu_2: @ 81AB930 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081AB974 + ldr r1, =0x03005e08 adds r2, r0, r1 - ldr r0, _081AB978 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081AB9A0 ldrb r0, [r2] - ldr r4, _081AB97C + ldr r4, =0x0203ce58 ldrb r2, [r4, 0x5] lsls r2, 1 adds r1, r4, 0 @@ -874234,7 +844481,7 @@ task_close_bag_menu_2: @ 81AB930 adds r3, 0x8 adds r2, r3 bl sub_81AE6C8 - ldr r0, _081AB980 + ldr r0, =0x0203ce54 ldr r0, [r0] ldr r0, [r0] cmp r0, 0 @@ -874242,10 +844489,7 @@ task_close_bag_menu_2: @ 81AB930 bl set_callback2 b _081AB98A .align 2, 0 -_081AB974: .4byte 0x03005e08 -_081AB978: .4byte 0x02037fd4 -_081AB97C: .4byte 0x0203ce58 -_081AB980: .4byte 0x0203ce54 + .pool _081AB984: ldr r0, [r4] bl set_callback2 @@ -874268,7 +844512,7 @@ sub_81AB9A8: @ 81AB9A8 lsls r0, 24 lsrs r5, r0, 24 lsls r1, r5, 3 - ldr r0, _081AB9C4 + ldr r0, =0x02039dd8 adds r4, r1, r0 cmp r5, 0x3 bgt _081AB9C8 @@ -874278,14 +844522,14 @@ sub_81AB9A8: @ 81AB9A8 bl sub_80D6FB4 b _081AB9CE .align 2, 0 -_081AB9C4: .4byte 0x02039dd8 + .pool _081AB9C8: adds r0, r4, 0 bl sub_80D6F64 _081AB9CE: - ldr r0, _081ABA48 + ldr r0, =0x0203ce54 ldr r1, [r0] - ldr r6, _081ABA4C + ldr r6, =0x00000829 adds r1, r6 adds r1, r5 movs r2, 0 @@ -874320,14 +844564,14 @@ _081AB9EE: bne _081AB9EE _081ABA12: ldr r2, [r3] - ldr r1, _081ABA50 + ldr r1, =0x0000081b adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081ABA2E - ldr r0, _081ABA4C + ldr r0, =0x00000829 adds r1, r2, r0 adds r1, r5 ldrb r0, [r1] @@ -874335,25 +844579,22 @@ _081ABA12: strb r0, [r1] _081ABA2E: ldr r1, [r3] - ldr r2, _081ABA4C + ldr r2, =0x00000829 adds r0, r1, r2 adds r0, r5 ldrb r2, [r0] cmp r2, 0x8 bls _081ABA58 - ldr r3, _081ABA54 + ldr r3, =0x0000082e adds r0, r1, r3 adds r0, r5 movs r1, 0x8 strb r1, [r0] b _081ABA60 .align 2, 0 -_081ABA48: .4byte 0x0203ce54 -_081ABA4C: .4byte 0x00000829 -_081ABA50: .4byte 0x0000081b -_081ABA54: .4byte 0x0000082e + .pool _081ABA58: - ldr r3, _081ABA68 + ldr r3, =0x0000082e adds r0, r1, r3 adds r0, r5 strb r2, [r0] @@ -874362,7 +844603,7 @@ _081ABA60: pop {r0} bx r0 .align 2, 0 -_081ABA68: .4byte 0x0000082e + .pool thumb_func_end sub_81AB9A8 thumb_func_start sub_81ABA6C @@ -874388,13 +844629,13 @@ sub_81ABA88: @ 81ABA88 lsls r0, 24 lsrs r0, 24 lsls r1, r0, 1 - ldr r2, _081ABAB8 + ldr r2, =0x0203ce6a adds r4, r1, r2 subs r2, 0xA adds r1, r2 - ldr r2, _081ABABC + ldr r2, =0x0203ce54 ldr r3, [r2] - ldr r5, _081ABAC0 + ldr r5, =0x0000082e adds r2, r3, r5 adds r2, r0 ldrb r2, [r2] @@ -874408,9 +844649,7 @@ sub_81ABA88: @ 81ABA88 pop {r0} bx r0 .align 2, 0 -_081ABAB8: .4byte 0x0203ce6a -_081ABABC: .4byte 0x0203ce54 -_081ABAC0: .4byte 0x0000082e + .pool thumb_func_end sub_81ABA88 thumb_func_start sub_81ABAC4 @@ -874435,16 +844674,16 @@ sub_81ABAE0: @ 81ABAE0 push {r4-r7,lr} sub sp, 0x4 movs r5, 0 - ldr r6, _081ABB20 + ldr r6, =0x0203ce6a adds r7, r6, 0 subs r7, 0xA _081ABAEC: lsls r1, r5, 1 adds r0, r1, r6 adds r1, r7 - ldr r2, _081ABB24 + ldr r2, =0x0203ce54 ldr r3, [r2] - ldr r4, _081ABB28 + ldr r4, =0x0000082e adds r2, r3, r4 adds r2, r5 ldrb r2, [r2] @@ -874465,15 +844704,13 @@ _081ABAEC: pop {r0} bx r0 .align 2, 0 -_081ABB20: .4byte 0x0203ce6a -_081ABB24: .4byte 0x0203ce54 -_081ABB28: .4byte 0x0000082e + .pool thumb_func_end sub_81ABAE0 thumb_func_start sub_81ABB2C sub_81ABB2C: @ 81ABB2C lsls r0, 24 - ldr r1, _081ABB48 + ldr r1, =0x0203ce58 lsrs r0, 23 adds r2, r1, 0 adds r2, 0x12 @@ -874487,7 +844724,7 @@ sub_81ABB2C: @ 81ABB2C lsrs r0, 24 bx lr .align 2, 0 -_081ABB48: .4byte 0x0203ce58 + .pool thumb_func_end sub_81ABB2C thumb_func_start sub_81ABB4C @@ -874508,7 +844745,7 @@ sub_81ABB4C: @ 81ABB4C lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081ABBB8 + ldr r0, =0x03005e08 adds r4, r0 movs r0, 0x4 bl sub_81AE1C4 @@ -874541,7 +844778,7 @@ sub_81ABB4C: @ 81ABB4C pop {r0} bx r0 .align 2, 0 -_081ABBB8: .4byte 0x03005e08 + .pool thumb_func_end sub_81ABB4C thumb_func_start sub_81ABBBC @@ -874555,9 +844792,9 @@ sub_81ABBBC: @ 81ABBBC lsls r5, r6, 2 adds r5, r6 lsls r5, 3 - ldr r0, _081ABC30 + ldr r0, =0x03005e08 adds r5, r0 - ldr r7, _081ABC34 + ldr r7, =0x0203ce58 ldrb r4, [r7, 0x5] lsls r4, 1 movs r0, 0x12 @@ -874579,7 +844816,7 @@ sub_81ABBBC: @ 81ABBBC bl sub_81ABA88 ldrb r0, [r7, 0x5] bl load_bag_item_list_buffers - ldr r0, _081ABC38 + ldr r0, =0x03006310 mov r2, r8 ldrh r1, [r2] ldrh r2, [r4] @@ -874597,9 +844834,7 @@ sub_81ABBBC: @ 81ABBBC pop {r0} bx r0 .align 2, 0 -_081ABC30: .4byte 0x03005e08 -_081ABC34: .4byte 0x0203ce58 -_081ABC38: .4byte 0x03006310 + .pool thumb_func_end sub_81ABBBC thumb_func_start sub_81ABC3C @@ -874624,20 +844859,20 @@ sub_81ABC54: @ 81ABC54 lsrs r5, r0, 24 lsls r1, 16 lsrs r1, 16 - ldr r0, _081ABCB0 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] movs r3, 0x2 cmp r0, 0x3 bne _081ABC6C movs r3, 0x3 _081ABC6C: - ldr r0, _081ABCB4 + ldr r0, =0x02021cc4 lsls r1, 16 asrs r1, 16 movs r2, 0x2 bl decimal_int_to_string - ldr r4, _081ABCB8 - ldr r1, _081ABCBC + ldr r4, =0x02021fc4 + ldr r1, =0x085e8da0 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -874661,10 +844896,7 @@ _081ABC6C: pop {r0} bx r0 .align 2, 0 -_081ABCB0: .4byte 0x0203ce58 -_081ABCB4: .4byte 0x02021cc4 -_081ABCB8: .4byte 0x02021fc4 -_081ABCBC: .4byte 0x085e8da0 + .pool thumb_func_end sub_81ABC54 thumb_func_start sub_81ABCC0 @@ -874673,18 +844905,18 @@ sub_81ABCC0: @ 81ABCC0 sub sp, 0xC adds r4, r0, 0 adds r7, r2, 0 - ldr r0, _081ABD18 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] movs r3, 0x2 cmp r0, 0x3 bne _081ABCD4 movs r3, 0x3 _081ABCD4: - ldr r0, _081ABD1C + ldr r0, =0x02021cc4 movs r2, 0x2 bl decimal_int_to_string - ldr r6, _081ABD20 - ldr r1, _081ABD24 + ldr r6, =0x02021fc4 + ldr r1, =0x085e8da0 adds r0, r6, 0 bl ExpandTextCodes lsls r4, 24 @@ -874711,10 +844943,7 @@ _081ABCD4: pop {r0} bx r0 .align 2, 0 -_081ABD18: .4byte 0x0203ce58 -_081ABD1C: .4byte 0x02021cc4 -_081ABD20: .4byte 0x02021fc4 -_081ABD24: .4byte 0x085e8da0 + .pool thumb_func_end sub_81ABCC0 thumb_func_start sub_81ABD28 @@ -874732,9 +844961,9 @@ sub_81ABD28: @ 81ABD28 add r0, r9 lsls r0, 3 str r0, [sp] - ldr r1, _081ABDA8 + ldr r1, =0x03005e08 adds r6, r0, r1 - ldr r5, _081ABDAC + ldr r5, =0x0203ce58 ldrb r0, [r5, 0x5] lsls r0, 1 adds r1, r5, 0 @@ -874750,7 +844979,7 @@ sub_81ABD28: @ 81ABD28 bne _081ABD66 b _081ABEB2 _081ABD66: - ldr r0, _081ABDB0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -874765,7 +844994,7 @@ _081ABD74: beq _081ABDB8 cmp r0, 0x2 beq _081ABDC0 - ldr r0, _081ABDB4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -874783,10 +845012,7 @@ _081ABD74: _081ABDA4: b _081ABDCC .align 2, 0 -_081ABDA8: .4byte 0x03005e08 -_081ABDAC: .4byte 0x0203ce58 -_081ABDB0: .4byte 0x02037fd4 -_081ABDB4: .4byte 0x030022c0 + .pool _081ABDB8: movs r1, 0x1 negs r1, r1 @@ -874808,10 +845034,10 @@ _081ABDCC: mov r3, r8 ldrh r0, [r3] adds r2, r0 - ldr r0, _081ABE04 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081ABE08 - ldr r3, _081ABE0C + ldr r1, =0x0203ce58 + ldr r3, =0x00000829 adds r0, r3 ldrb r1, [r1, 0x5] adds r0, r1 @@ -874825,9 +845051,7 @@ _081ABDCC: bl sub_81AC2E8 b _081ABEB2 .align 2, 0 -_081ABE04: .4byte 0x0203ce54 -_081ABE08: .4byte 0x0203ce58 -_081ABE0C: .4byte 0x00000829 + .pool _081ABE10: ldrb r0, [r6] bl sub_81AE604 @@ -874854,20 +845078,18 @@ _081ABE32: _081ABE40: movs r0, 0x5 bl audio_play - ldr r0, _081ABE5C + ldr r0, =0x0203ce7c mov r1, r10 strh r1, [r0] - ldr r0, _081ABE60 + ldr r0, =0x03005e08 subs r0, 0x8 ldr r3, [sp] adds r0, r3, r0 - ldr r1, _081ABE64 + ldr r1, =task_close_bag_menu_1 + 1 str r1, [r0] b _081ABEB2 .align 2, 0 -_081ABE5C: .4byte 0x0203ce7c -_081ABE60: .4byte 0x03005e08 -_081ABE64: .4byte task_close_bag_menu_1 + 1 + .pool _081ABE68: movs r0, 0x5 bl audio_play @@ -874891,9 +845113,9 @@ _081ABE68: lsrs r0, 24 adds r1, r4, 0 bl bag_pocket_get_itemid - ldr r1, _081ABEC4 + ldr r1, =0x0203ce7c strh r0, [r1] - ldr r1, _081ABEC8 + ldr r1, =0x08614054 ldrb r0, [r5, 0x4] lsls r0, 2 adds r0, r1 @@ -874910,8 +845132,7 @@ _081ABEB2: pop {r0} bx r0 .align 2, 0 -_081ABEC4: .4byte 0x0203ce7c -_081ABEC8: .4byte 0x08614054 + .pool thumb_func_end sub_81ABD28 thumb_func_start set_callback3_to_bag @@ -874930,27 +845151,26 @@ set_callback3_to_bag: @ 81ABECC bl Window_WriteStandardTileMap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081ABF08 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081ABF0C + ldr r1, =sub_81ABD28 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081ABF08: .4byte 0x03005e00 -_081ABF0C: .4byte sub_81ABD28 + 1 + .pool thumb_func_end set_callback3_to_bag thumb_func_start sub_81ABF10 sub_81ABF10: @ 81ABF10 push {lr} - ldr r0, _081ABF48 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081ABF4C + ldr r1, =0x0000081b adds r0, r1 ldrb r1, [r0] movs r0, 0xF @@ -874960,7 +845180,7 @@ sub_81ABF10: @ 81ABF10 bl sub_81220D0 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081ABF50 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x20 ands r0, r1 @@ -874974,9 +845194,7 @@ _081ABF3C: movs r0, 0x1 b _081ABF6C .align 2, 0 -_081ABF48: .4byte 0x0203ce54 -_081ABF4C: .4byte 0x0000081b -_081ABF50: .4byte 0x030022c0 + .pool _081ABF54: movs r0, 0x10 ands r0, r1 @@ -875043,7 +845261,7 @@ sub_81ABFA8: @ 81ABFA8 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081AC060 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r0, 0 strh r0, [r4, 0x1A] @@ -875056,7 +845274,7 @@ sub_81ABFA8: @ 81ABFA8 movs r0, 0x1 bl Window_FillTileMap ldrb r0, [r4] - ldr r3, _081AC064 + ldr r3, =0x0203ce58 ldrb r2, [r3, 0x5] lsls r2, 1 adds r1, r3, 0 @@ -875067,10 +845285,10 @@ sub_81ABFA8: @ 81ABFA8 bl sub_81AE6C8 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r3, _081AC068 - ldr r0, _081AC06C + ldr r3, =0x02020630 + ldr r0, =0x0203ce54 ldr r2, [r0] - ldr r1, _081AC070 + ldr r1, =0x0000081b adds r0, r2, r1 ldrb r1, [r0] lsls r1, 26 @@ -875078,7 +845296,7 @@ sub_81ABFA8: @ 81ABFA8 movs r0, 0x1 eors r0, r1 adds r2, r0 - ldr r0, _081AC074 + ldr r0, =0x00000806 adds r2, r0 ldrb r1, [r2] lsls r0, r1, 4 @@ -875092,7 +845310,7 @@ sub_81ABFA8: @ 81ABFA8 strb r1, [r0] bl sub_81AB824 _081AC026: - ldr r4, _081AC064 + ldr r4, =0x0203ce58 ldrb r1, [r4, 0x5] add r0, sp, 0x8 strb r1, [r0] @@ -875104,7 +845322,7 @@ _081AC026: adds r5, r0, 0 cmp r1, 0x1 bne _081AC07C - ldr r2, _081AC078 + ldr r2, =0x085e91fc ldrb r0, [r4, 0x5] lsls r0, 2 adds r0, r2 @@ -875119,15 +845337,9 @@ _081AC026: bl sub_81ADFF8 b _081AC09A .align 2, 0 -_081AC060: .4byte 0x03005e08 -_081AC064: .4byte 0x0203ce58 -_081AC068: .4byte 0x02020630 -_081AC06C: .4byte 0x0203ce54 -_081AC070: .4byte 0x0000081b -_081AC074: .4byte 0x00000806 -_081AC078: .4byte 0x085e91fc + .pool _081AC07C: - ldr r2, _081AC0FC + ldr r2, =0x085e91fc add r0, sp, 0x8 ldrb r0, [r0] lsls r0, 2 @@ -875141,7 +845353,7 @@ _081AC07C: movs r0, 0x8 bl sub_81ADFF8 _081AC09A: - ldr r0, _081AC100 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] movs r1, 0 bl bag_menu_draw_pocket_indicator_square @@ -875168,8 +845380,8 @@ _081AC09A: bl sub_80D4CA8 asrs r0, r5, 16 bl sub_80D4E34 - ldr r1, _081AC104 - ldr r2, _081AC108 + ldr r1, =sub_81AC10C + 1 + ldr r2, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -875182,10 +845394,7 @@ _081AC09A: pop {r0} bx r0 .align 2, 0 -_081AC0FC: .4byte 0x085e91fc -_081AC100: .4byte 0x0203ce58 -_081AC104: .4byte sub_81AC10C + 1 -_081AC108: .4byte 0x03005e00 + .pool thumb_func_end sub_81ABFA8 thumb_func_start sub_81AC10C @@ -875196,7 +845405,7 @@ sub_81AC10C: @ 81AC10C lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _081AC144 + ldr r1, =0x03005e08 adds r6, r0, r1 bl sub_81221AC lsls r0, 24 @@ -875215,9 +845424,9 @@ sub_81AC10C: @ 81AC10C beq _081AC164 b _081AC184 .align 2, 0 -_081AC144: .4byte 0x03005e08 + .pool _081AC148: - ldr r0, _081AC160 + ldr r0, =0x0203ce5d movs r1, 0x16 ldrsb r1, [r6, r1] bl sub_81ABF70 @@ -875228,9 +845437,9 @@ _081AC148: adds r0, r7, 0 b _081AC178 .align 2, 0 -_081AC160: .4byte 0x0203ce5d + .pool _081AC164: - ldr r0, _081AC180 + ldr r0, =0x0203ce5d movs r1, 0x16 ldrsb r1, [r6, r1] bl sub_81ABF70 @@ -875243,7 +845452,7 @@ _081AC178: bl sub_81ABFA8 b _081AC22E .align 2, 0 -_081AC180: .4byte 0x0203ce5d + .pool _081AC184: movs r1, 0x1A ldrsh r0, [r6, r1] @@ -875290,7 +845499,7 @@ _081AC1CC: strh r0, [r6, 0x1A] b _081AC22E _081AC1DC: - ldr r4, _081AC234 + ldr r4, =0x0203ce5d movs r1, 0x16 ldrsb r1, [r6, r1] adds r0, r4, 0 @@ -875298,7 +845507,7 @@ _081AC1DC: subs r5, r4, 0x5 ldrb r0, [r5, 0x5] bl load_bag_item_list_buffers - ldr r0, _081AC238 + ldr r0, =0x03006310 ldrb r2, [r5, 0x5] lsls r2, 1 adds r1, r4, 0 @@ -875327,8 +845536,7 @@ _081AC22E: pop {r0} bx r0 .align 2, 0 -_081AC234: .4byte 0x0203ce5d -_081AC238: .4byte 0x03006310 + .pool thumb_func_end sub_81AC10C thumb_func_start sub_81AC23C @@ -875365,7 +845573,7 @@ bag_menu_draw_pocket_indicator_square: @ 81AC26C lsls r1, 24 cmp r1, 0 bne _081AC298 - ldr r1, _081AC294 + ldr r1, =0x00001017 adds r2, r0, 0x5 lsls r2, 24 lsrs r2, 24 @@ -875377,9 +845585,9 @@ bag_menu_draw_pocket_indicator_square: @ 81AC26C bl bg_fill_tilemap_rect b _081AC2AE .align 2, 0 -_081AC294: .4byte 0x00001017 + .pool _081AC298: - ldr r1, _081AC2BC + ldr r1, =0x0000102b adds r2, r0, 0x5 lsls r2, 24 lsrs r2, 24 @@ -875396,13 +845604,13 @@ _081AC2AE: pop {r0} bx r0 .align 2, 0 -_081AC2BC: .4byte 0x0000102b + .pool thumb_func_end bag_menu_draw_pocket_indicator_square thumb_func_start sub_81AC2C0 sub_81AC2C0: @ 81AC2C0 push {lr} - ldr r1, _081AC2DC + ldr r1, =0x0203ce58 ldrb r0, [r1, 0x4] cmp r0, 0x1 bhi _081AC2E0 @@ -875415,7 +845623,7 @@ sub_81AC2C0: @ 81AC2C0 movs r0, 0x1 b _081AC2E2 .align 2, 0 -_081AC2DC: .4byte 0x0203ce58 + .pool _081AC2E0: movs r0, 0 _081AC2E2: @@ -875435,14 +845643,14 @@ sub_81AC2E8: @ 81AC2E8 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081AC3A0 + ldr r0, =0x03005e08 mov r9, r0 adds r6, r4, r0 ldrb r0, [r6] movs r1, 0x10 movs r2, 0x1 bl sub_81AF15C - ldr r3, _081AC3A4 + ldr r3, =0x0203ce58 ldrb r0, [r3, 0x5] lsls r0, 1 adds r2, r3, 0 @@ -875455,9 +845663,9 @@ sub_81AC2E8: @ 81AC2E8 ldrh r2, [r2] adds r1, r2 strh r1, [r6, 0x2] - ldr r0, _081AC3A8 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r2, _081AC3AC + ldr r2, =0x0000081a adds r0, r2 movs r5, 0 strb r1, [r0] @@ -875469,11 +845677,11 @@ sub_81AC2E8: @ 81AC2E8 bl bag_pocket_get_itemid lsls r0, 16 lsrs r0, 16 - ldr r1, _081AC3B0 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _081AC3B4 + ldr r0, =0x02021fc4 mov r8, r0 - ldr r1, _081AC3B8 + ldr r1, =0x085e8dfe bl ExpandTextCodes movs r0, 0x1 movs r1, 0 @@ -875498,7 +845706,7 @@ sub_81AC2E8: @ 81AC2E8 negs r2, r2 add r9, r2 add r4, r9 - ldr r0, _081AC3BC + ldr r0, =sub_81AC3C0 + 1 str r0, [r4] add sp, 0x14 pop {r3,r4} @@ -875508,14 +845716,7 @@ sub_81AC2E8: @ 81AC2E8 pop {r0} bx r0 .align 2, 0 -_081AC3A0: .4byte 0x03005e08 -_081AC3A4: .4byte 0x0203ce58 -_081AC3A8: .4byte 0x0203ce54 -_081AC3AC: .4byte 0x0000081a -_081AC3B0: .4byte 0x02021cc4 -_081AC3B4: .4byte 0x02021fc4 -_081AC3B8: .4byte 0x085e8dfe -_081AC3BC: .4byte sub_81AC3C0 + 1 + .pool thumb_func_end sub_81AC2E8 thumb_func_start sub_81AC3C0 @@ -875528,14 +845729,14 @@ sub_81AC3C0: @ 81AC3C0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081AC40C + ldr r1, =0x03005e08 adds r4, r0, r1 bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081AC48E - ldr r0, _081AC410 + ldr r0, =0x030022c0 mov r8, r0 ldrh r1, [r0, 0x2E] movs r0, 0x4 @@ -875545,7 +845746,7 @@ sub_81AC3C0: @ 81AC3C0 movs r0, 0x5 bl audio_play ldrb r0, [r4] - ldr r3, _081AC414 + ldr r3, =0x0203ce58 ldrb r2, [r3, 0x5] lsls r2, 1 adds r1, r3, 0 @@ -875556,15 +845757,13 @@ sub_81AC3C0: @ 81AC3C0 bl get_coro_args_x18_x1A b _081AC472 .align 2, 0 -_081AC40C: .4byte 0x03005e08 -_081AC410: .4byte 0x030022c0 -_081AC414: .4byte 0x0203ce58 + .pool _081AC418: ldrb r0, [r4] bl sub_81AE604 adds r7, r0, 0 ldrb r0, [r4] - ldr r5, _081AC45C + ldr r5, =0x0203ce58 ldrb r2, [r5, 0x5] lsls r2, 1 adds r1, r5, 0 @@ -875590,7 +845789,7 @@ _081AC418: bne _081AC482 b _081AC48E .align 2, 0 -_081AC45C: .4byte 0x0203ce58 + .pool _081AC460: movs r0, 0x5 bl audio_play @@ -875634,17 +845833,17 @@ sub_81AC498: @ 81AC498 adds r0, r3 lsls r0, 3 mov r10, r0 - ldr r0, _081AC4EC + ldr r0, =0x03005e08 add r0, r10 mov r9, r0 - ldr r5, _081AC4F0 + ldr r5, =0x0203ce58 ldrb r6, [r5, 0x5] lsls r1, r6, 1 adds r0, r5, 0 adds r0, 0x12 adds r0, r1 mov r8, r0 - ldr r2, _081AC4F4 + ldr r2, =0x0203ce60 adds r7, r1, r2 ldrh r0, [r7] mov r1, r8 @@ -875665,20 +845864,18 @@ _081AC4E2: bl sub_81AC590 b _081AC566 .align 2, 0 -_081AC4EC: .4byte 0x03005e08 -_081AC4F0: .4byte 0x0203ce58 -_081AC4F4: .4byte 0x0203ce60 + .pool _081AC4F8: - ldr r1, _081AC574 + ldr r1, =0x02039dd8 lsls r0, r6, 3 adds r0, r1 ldr r0, [r0] adds r1, r2, 0 adds r2, r4, 0 bl sub_80D702C - ldr r0, _081AC578 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r2, _081AC57C + ldr r2, =0x0000081a adds r0, r2 movs r1, 0xFF strb r1, [r0] @@ -875694,7 +845891,7 @@ _081AC4F8: bge _081AC538 ldrb r1, [r5, 0x5] lsls r1, 1 - ldr r2, _081AC580 + ldr r2, =0x0203ce60 adds r1, r2 ldrh r0, [r1] subs r0, 0x1 @@ -875702,7 +845899,7 @@ _081AC4F8: _081AC538: ldrb r0, [r5, 0x5] bl load_bag_item_list_buffers - ldr r0, _081AC584 + ldr r0, =0x03006310 mov r2, r8 ldrh r1, [r2] ldrh r2, [r7] @@ -875714,10 +845911,10 @@ _081AC538: movs r0, 0x1 bl sub_80D4FC8 bl sub_81AB854 - ldr r0, _081AC588 + ldr r0, =0x03005e08 subs r0, 0x8 add r0, r10 - ldr r1, _081AC58C + ldr r1, =sub_81ABD28 + 1 str r1, [r0] _081AC566: pop {r3-r5} @@ -875728,13 +845925,7 @@ _081AC566: pop {r0} bx r0 .align 2, 0 -_081AC574: .4byte 0x02039dd8 -_081AC578: .4byte 0x0203ce54 -_081AC57C: .4byte 0x0000081a -_081AC580: .4byte 0x0203ce60 -_081AC584: .4byte 0x03006310 -_081AC588: .4byte 0x03005e08 -_081AC58C: .4byte sub_81ABD28 + 1 + .pool thumb_func_end sub_81AC498 thumb_func_start sub_81AC590 @@ -875750,11 +845941,11 @@ sub_81AC590: @ 81AC590 adds r1, r0 lsls r1, 3 mov r9, r1 - ldr r0, _081AC62C + ldr r0, =0x03005e08 mov r10, r0 mov r7, r9 add r7, r10 - ldr r4, _081AC630 + ldr r4, =0x0203ce58 ldrb r0, [r4, 0x5] lsls r0, 1 adds r1, r4, 0 @@ -875764,9 +845955,9 @@ sub_81AC590: @ 81AC590 adds r1, r4 mov r8, r1 adds r5, r0, r1 - ldr r0, _081AC634 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081AC638 + ldr r1, =0x0000081a adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -875790,7 +845981,7 @@ sub_81AC590: @ 81AC590 _081AC5F2: ldrb r0, [r4, 0x5] bl load_bag_item_list_buffers - ldr r0, _081AC63C + ldr r0, =0x03006310 ldrh r1, [r6] ldrh r2, [r5] bl calls_per_item_funcs_in_list_outer @@ -875803,7 +845994,7 @@ _081AC5F2: mov r0, r10 subs r0, 0x8 add r0, r9 - ldr r1, _081AC640 + ldr r1, =sub_81ABD28 + 1 str r1, [r0] pop {r3-r5} mov r8, r3 @@ -875813,19 +846004,14 @@ _081AC5F2: pop {r0} bx r0 .align 2, 0 -_081AC62C: .4byte 0x03005e08 -_081AC630: .4byte 0x0203ce58 -_081AC634: .4byte 0x0203ce54 -_081AC638: .4byte 0x0000081a -_081AC63C: .4byte 0x03006310 -_081AC640: .4byte sub_81ABD28 + 1 + .pool thumb_func_end sub_81AC590 thumb_func_start sub_81AC644 sub_81AC644: @ 81AC644 push {r4,r5,lr} sub sp, 0x14 - ldr r0, _081AC660 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x4] subs r0, 0x1 cmp r0, 0x9 @@ -875833,13 +846019,12 @@ sub_81AC644: @ 81AC644 b _081AC82C _081AC654: lsls r0, 2 - ldr r1, _081AC664 + ldr r1, =_081AC668 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081AC660: .4byte 0x0203ce58 -_081AC664: .4byte _081AC668 + .pool .align 2, 0 _081AC668: .4byte _081AC690 @@ -875853,62 +846038,55 @@ _081AC668: .4byte _081AC70C .4byte _081AC690 _081AC690: - ldr r0, _081AC6B4 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_usage lsls r0, 24 cmp r0, 0 beq _081AC6C4 - ldr r0, _081AC6B8 + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC6BC + ldr r0, =0x08614042 str r0, [r2] - ldr r0, _081AC6C0 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 b _081ACA10 .align 2, 0 -_081AC6B4: .4byte 0x0203ce7c -_081AC6B8: .4byte 0x0203ce54 -_081AC6BC: .4byte 0x08614042 -_081AC6C0: .4byte 0x00000828 + .pool _081AC6C4: - ldr r0, _081AC6DC + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC6E0 + ldr r0, =0x08614046 str r0, [r2] - ldr r0, _081AC6E4 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 b _081ACA10 .align 2, 0 -_081AC6DC: .4byte 0x0203ce54 -_081AC6E0: .4byte 0x08614046 -_081AC6E4: .4byte 0x00000828 + .pool _081AC6E8: - ldr r0, _081AC700 + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC704 + ldr r0, =0x08614047 str r0, [r2] - ldr r0, _081AC708 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x4 b _081ACA10 .align 2, 0 -_081AC700: .4byte 0x0203ce54 -_081AC704: .4byte 0x08614047 -_081AC708: .4byte 0x00000828 + .pool _081AC70C: - ldr r4, _081AC738 + ldr r4, =0x0203ce7c ldrh r0, [r4] bl itemid_is_unique lsls r0, 24 @@ -875917,40 +846095,35 @@ _081AC70C: ldrh r0, [r4] cmp r0, 0xAF beq _081AC748 - ldr r0, _081AC73C + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC740 + ldr r0, =0x0861404b str r0, [r2] - ldr r0, _081AC744 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 b _081ACA10 .align 2, 0 -_081AC738: .4byte 0x0203ce7c -_081AC73C: .4byte 0x0203ce54 -_081AC740: .4byte 0x0861404b -_081AC744: .4byte 0x00000828 + .pool _081AC748: - ldr r0, _081AC760 + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC764 + ldr r0, =0x08614046 str r0, [r2] - ldr r0, _081AC768 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 b _081ACA10 .align 2, 0 -_081AC760: .4byte 0x0203ce54 -_081AC764: .4byte 0x08614046 -_081AC768: .4byte 0x00000828 + .pool _081AC76C: - ldr r4, _081AC798 + ldr r4, =0x0203ce7c ldrh r0, [r4] bl itemid_is_unique lsls r0, 24 @@ -875959,40 +846132,35 @@ _081AC76C: ldrh r0, [r4] cmp r0, 0xAF beq _081AC7A8 - ldr r0, _081AC79C + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC7A0 + ldr r0, =0x0861404d str r0, [r2] - ldr r0, _081AC7A4 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 b _081ACA10 .align 2, 0 -_081AC798: .4byte 0x0203ce7c -_081AC79C: .4byte 0x0203ce54 -_081AC7A0: .4byte 0x0861404d -_081AC7A4: .4byte 0x00000828 + .pool _081AC7A8: - ldr r0, _081AC7C0 + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC7C4 + ldr r0, =0x08614046 str r0, [r2] - ldr r0, _081AC7C8 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 b _081ACA10 .align 2, 0 -_081AC7C0: .4byte 0x0203ce54 -_081AC7C4: .4byte 0x08614046 -_081AC7C8: .4byte 0x00000828 + .pool _081AC7CC: - ldr r4, _081AC7F8 + ldr r4, =0x0203ce7c ldrh r0, [r4] bl itemid_is_unique lsls r0, 24 @@ -876001,38 +846169,33 @@ _081AC7CC: ldrh r0, [r4] cmp r0, 0xAF beq _081AC808 - ldr r0, _081AC7FC + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC800 + ldr r0, =0x0861404f str r0, [r2] - ldr r0, _081AC804 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 b _081ACA10 .align 2, 0 -_081AC7F8: .4byte 0x0203ce7c -_081AC7FC: .4byte 0x0203ce54 -_081AC800: .4byte 0x0861404f -_081AC804: .4byte 0x00000828 + .pool _081AC808: - ldr r0, _081AC820 + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC824 + ldr r0, =0x08614046 str r0, [r2] - ldr r0, _081AC828 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 b _081ACA10 .align 2, 0 -_081AC820: .4byte 0x0203ce54 -_081AC824: .4byte 0x08614046 -_081AC828: .4byte 0x00000828 + .pool _081AC82C: bl sub_81221AC lsls r0, 24 @@ -876043,65 +846206,58 @@ _081AC82C: cmp r0, 0x1 bne _081AC8A4 _081AC840: - ldr r0, _081AC86C + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x4 beq _081AC856 - ldr r0, _081AC870 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl sub_8122148 lsls r0, 24 cmp r0, 0 bne _081AC880 _081AC856: - ldr r0, _081AC874 + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC878 + ldr r0, =0x08614046 str r0, [r2] - ldr r0, _081AC87C + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 b _081ACA10 .align 2, 0 -_081AC86C: .4byte 0x0203ce58 -_081AC870: .4byte 0x0203ce7c -_081AC874: .4byte 0x0203ce54 -_081AC878: .4byte 0x08614046 -_081AC87C: .4byte 0x00000828 + .pool _081AC880: - ldr r0, _081AC898 + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC89C + ldr r0, =0x08614044 str r0, [r2] - ldr r0, _081AC8A0 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 b _081ACA10 .align 2, 0 -_081AC898: .4byte 0x0203ce54 -_081AC89C: .4byte 0x08614044 -_081AC8A0: .4byte 0x00000828 + .pool _081AC8A4: - ldr r0, _081AC8B8 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x4 bls _081AC8AE b _081ACA12 _081AC8AE: lsls r0, 2 - ldr r1, _081AC8BC + ldr r1, =_081AC8C0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081AC8B8: .4byte 0x0203ce58 -_081AC8BC: .4byte _081AC8C0 + .pool .align 2, 0 _081AC8C0: .4byte _081AC8D4 @@ -876110,24 +846266,24 @@ _081AC8C0: .4byte _081AC9FC .4byte _081AC92C _081AC8D4: - ldr r4, _081AC918 + ldr r4, =0x0203ce54 ldr r1, [r4] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r3, _081AC91C + ldr r3, =0x00000824 adds r0, r1, r3 str r0, [r2] - ldr r0, _081AC920 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x4 strb r0, [r1] ldr r0, [r4] adds r0, r3 - ldr r1, _081AC924 + ldr r1, =0x0861402c movs r2, 0x4 bl memcpy - ldr r0, _081AC928 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_is_mail lsls r0, 24 @@ -876137,52 +846293,48 @@ _081AC8D4: b _081ACA12 _081AC90A: ldr r0, [r4] - ldr r1, _081AC91C + ldr r1, =0x00000824 adds r0, r1 movs r1, 0x6 strb r1, [r0] b _081ACA12 .align 2, 0 -_081AC918: .4byte 0x0203ce54 -_081AC91C: .4byte 0x00000824 -_081AC920: .4byte 0x00000828 -_081AC924: .4byte 0x0861402c -_081AC928: .4byte 0x0203ce7c + .pool _081AC92C: - ldr r4, _081AC990 + ldr r4, =0x0203ce54 ldr r1, [r4] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r5, _081AC994 + ldr r5, =0x00000824 adds r0, r1, r5 str r0, [r2] - ldr r0, _081AC998 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x4 strb r0, [r1] ldr r0, [r4] adds r0, r5 - ldr r1, _081AC99C + ldr r1, =0x08614030 movs r2, 0x4 bl memcpy - ldr r0, _081AC9A0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081AC9A4 + ldr r1, =0x00000496 adds r0, r1 - ldr r2, _081AC9A8 + ldr r2, =0x0203ce7c ldrh r0, [r0] ldrh r1, [r2] cmp r0, r1 bne _081AC96C ldr r0, [r4] - ldr r1, _081AC9AC + ldr r1, =0x00000825 adds r0, r1 movs r1, 0x8 strb r1, [r0] _081AC96C: ldrh r1, [r2] - ldr r0, _081AC9B0 + ldr r0, =0x00000103 cmp r1, r0 beq _081AC97A adds r0, 0xD @@ -876200,68 +846352,56 @@ _081AC97A: strb r1, [r0] b _081ACA12 .align 2, 0 -_081AC990: .4byte 0x0203ce54 -_081AC994: .4byte 0x00000824 -_081AC998: .4byte 0x00000828 -_081AC99C: .4byte 0x08614030 -_081AC9A0: .4byte 0x03005d8c -_081AC9A4: .4byte 0x00000496 -_081AC9A8: .4byte 0x0203ce7c -_081AC9AC: .4byte 0x00000825 -_081AC9B0: .4byte 0x00000103 + .pool _081AC9B4: - ldr r0, _081AC9CC + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC9D0 + ldr r0, =0x08614034 str r0, [r2] - ldr r0, _081AC9D4 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x4 b _081ACA10 .align 2, 0 -_081AC9CC: .4byte 0x0203ce54 -_081AC9D0: .4byte 0x08614034 -_081AC9D4: .4byte 0x00000828 + .pool _081AC9D8: - ldr r0, _081AC9F0 + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081AC9F4 + ldr r0, =0x08614038 str r0, [r2] - ldr r0, _081AC9F8 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x4 b _081ACA10 .align 2, 0 -_081AC9F0: .4byte 0x0203ce54 -_081AC9F4: .4byte 0x08614038 -_081AC9F8: .4byte 0x00000828 + .pool _081AC9FC: - ldr r0, _081ACA3C + ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 lsls r0, 4 adds r2, r1, r0 - ldr r0, _081ACA40 + ldr r0, =0x0861403c str r0, [r2] - ldr r0, _081ACA44 + ldr r0, =0x00000828 adds r1, r0 movs r0, 0x6 _081ACA10: strb r0, [r1] _081ACA12: - ldr r0, _081ACA48 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x2 bne _081ACA50 movs r0, 0x1 bl Window_FillTileMap - ldr r0, _081ACA4C + ldr r0, =0x0203ce7c ldrh r0, [r0] bl sub_81AE2FC movs r0, 0x3 @@ -876272,18 +846412,14 @@ _081ACA12: bl schedule_bg_copy_tilemap_to_vram b _081ACA86 .align 2, 0 -_081ACA3C: .4byte 0x0203ce54 -_081ACA40: .4byte 0x0861403c -_081ACA44: .4byte 0x00000828 -_081ACA48: .4byte 0x0203ce58 -_081ACA4C: .4byte 0x0203ce7c + .pool _081ACA50: - ldr r0, _081ACA98 + ldr r0, =0x0203ce7c ldrh r0, [r0] - ldr r1, _081ACA9C + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r4, _081ACAA0 - ldr r1, _081ACAA4 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8dbe adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -876302,9 +846438,9 @@ _081ACA50: movs r3, 0x3 bl sub_81AE0BC _081ACA86: - ldr r0, _081ACAA8 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081ACAAC + ldr r1, =0x00000828 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -876312,12 +846448,7 @@ _081ACA86: movs r0, 0 b _081ACAB6 .align 2, 0 -_081ACA98: .4byte 0x0203ce7c -_081ACA9C: .4byte 0x02021cc4 -_081ACAA0: .4byte 0x02021fc4 -_081ACAA4: .4byte 0x085e8dbe -_081ACAA8: .4byte 0x0203ce54 -_081ACAAC: .4byte 0x00000828 + .pool _081ACAB0: cmp r0, 0x2 bne _081ACAC4 @@ -876365,13 +846496,13 @@ sub_81ACAF8: @ 81ACAF8 str r0, [sp] movs r0, 0x10 str r0, [sp, 0x4] - ldr r6, _081ACB48 + ldr r6, =0x0203ce54 ldr r1, [r6] - ldr r5, _081ACB4C + ldr r5, =0x00000828 adds r0, r1, r5 ldrb r0, [r0] str r0, [sp, 0x8] - ldr r0, _081ACB50 + ldr r0, =0x08613fb4 str r0, [sp, 0xC] movs r0, 0x82 lsls r0, 4 @@ -876394,9 +846525,7 @@ sub_81ACAF8: @ 81ACAF8 pop {r0} bx r0 .align 2, 0 -_081ACB48: .4byte 0x0203ce54 -_081ACB4C: .4byte 0x00000828 -_081ACB50: .4byte 0x08613fb4 + .pool thumb_func_end sub_81ACAF8 thumb_func_start sub_81ACB54 @@ -876416,9 +846545,9 @@ sub_81ACB54: @ 81ACB54 str r0, [sp] str r5, [sp, 0x4] str r6, [sp, 0x8] - ldr r0, _081ACBA8 + ldr r0, =0x08613fb4 str r0, [sp, 0xC] - ldr r0, _081ACBAC + ldr r0, =0x0203ce54 ldr r0, [r0] movs r1, 0x82 lsls r1, 4 @@ -876442,8 +846571,7 @@ sub_81ACB54: @ 81ACB54 pop {r0} bx r0 .align 2, 0 -_081ACBA8: .4byte 0x08613fb4 -_081ACBAC: .4byte 0x0203ce54 + .pool thumb_func_end sub_81ACB54 thumb_func_start sub_81ACBB0 @@ -876453,40 +846581,36 @@ sub_81ACBB0: @ 81ACBB0 lsrs r4, r0, 24 adds r0, r4, 0 bl sub_81AC644 - ldr r0, _081ACBD8 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081ACBDC + ldr r1, =0x00000828 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 bhi _081ACBE8 - ldr r0, _081ACBE0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081ACBE4 + ldr r0, =sub_81ACC04 + 1 b _081ACBF4 .align 2, 0 -_081ACBD8: .4byte 0x0203ce54 -_081ACBDC: .4byte 0x00000828 -_081ACBE0: .4byte 0x03005e00 -_081ACBE4: .4byte sub_81ACC04 + 1 + .pool _081ACBE8: - ldr r0, _081ACBFC + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081ACC00 + ldr r0, =sub_81ACC78 + 1 _081ACBF4: str r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_081ACBFC: .4byte 0x03005e00 -_081ACC00: .4byte sub_81ACC78 + 1 + .pool thumb_func_end sub_81ACBB0 thumb_func_start sub_81ACC04 @@ -876512,18 +846636,18 @@ sub_81ACC04: @ 81ACC04 bne _081ACC44 movs r0, 0x5 bl audio_play - ldr r0, _081ACC40 + ldr r0, =0x08613fb4 ldr r1, [r0, 0x24] adds r0, r5, 0 bl _call_via_r1 b _081ACC6A .align 2, 0 -_081ACC40: .4byte 0x08613fb4 + .pool _081ACC44: movs r0, 0x5 bl audio_play - ldr r1, _081ACC70 - ldr r0, _081ACC74 + ldr r1, =0x08613fb4 + ldr r0, =0x0203ce54 ldr r0, [r0] movs r2, 0x82 lsls r2, 4 @@ -876542,8 +846666,7 @@ _081ACC6A: pop {r0} bx r0 .align 2, 0 -_081ACC70: .4byte 0x08613fb4 -_081ACC74: .4byte 0x0203ce54 + .pool thumb_func_end sub_81ACC04 thumb_func_start sub_81ACC78 @@ -876561,7 +846684,7 @@ _081ACC8C: bl GetMenuCursorPos lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _081ACCD0 + ldr r5, =0x030022c0 ldrh r1, [r5, 0x2E] movs r0, 0x40 ands r0, r1 @@ -876590,7 +846713,7 @@ _081ACCBC: bl sub_8199134 b _081ACDF0 .align 2, 0 -_081ACCD0: .4byte 0x030022c0 + .pool _081ACCD4: movs r0, 0x80 ands r0, r1 @@ -876598,9 +846721,9 @@ _081ACCD4: beq _081ACD1C lsls r0, r4, 24 asrs r1, r0, 24 - ldr r0, _081ACD14 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r2, _081ACD18 + ldr r2, =0x00000828 adds r0, r2 ldrb r0, [r0] subs r0, 0x2 @@ -876622,8 +846745,7 @@ _081ACCF2: bl sub_8199134 b _081ACDF0 .align 2, 0 -_081ACD14: .4byte 0x0203ce54 -_081ACD18: .4byte 0x00000828 + .pool _081ACD1C: movs r0, 0x20 ands r0, r1 @@ -876693,8 +846815,8 @@ _081ACD9A: beq _081ACDD8 movs r0, 0x5 bl audio_play - ldr r2, _081ACDD0 - ldr r0, _081ACDD4 + ldr r2, =0x08613fb4 + ldr r0, =0x0203ce54 ldr r0, [r0] lsls r1, r4, 24 asrs r1, 24 @@ -876712,8 +846834,7 @@ _081ACD9A: bl _call_via_r1 b _081ACDF0 .align 2, 0 -_081ACDD0: .4byte 0x08613fb4 -_081ACDD4: .4byte 0x0203ce54 + .pool _081ACDD8: movs r0, 0x2 ands r0, r1 @@ -876721,7 +846842,7 @@ _081ACDD8: beq _081ACDF0 movs r0, 0x5 bl audio_play - ldr r0, _081ACDF8 + ldr r0, =0x08613fb4 ldr r1, [r0, 0x24] adds r0, r6, 0 bl _call_via_r1 @@ -876730,7 +846851,7 @@ _081ACDF0: pop {r0} bx r0 .align 2, 0 -_081ACDF8: .4byte 0x08613fb4 + .pool thumb_func_end sub_81ACC78 thumb_func_start sub_81ACDFC @@ -876740,9 +846861,9 @@ sub_81ACDFC: @ 81ACDFC asrs r1, r0, 24 cmp r1, 0 blt _081ACE30 - ldr r0, _081ACE28 + ldr r0, =0x0203ce54 ldr r2, [r0] - ldr r3, _081ACE2C + ldr r3, =0x00000828 adds r0, r2, r3 ldrb r0, [r0] cmp r1, r0 @@ -876758,8 +846879,7 @@ sub_81ACDFC: @ 81ACDFC movs r0, 0x1 b _081ACE32 .align 2, 0 -_081ACE28: .4byte 0x0203ce54 -_081ACE2C: .4byte 0x00000828 + .pool _081ACE30: movs r0, 0 _081ACE32: @@ -876770,9 +846890,9 @@ _081ACE32: thumb_func_start sub_81ACE38 sub_81ACE38: @ 81ACE38 push {lr} - ldr r0, _081ACE50 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081ACE54 + ldr r1, =0x00000828 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -876781,8 +846901,7 @@ sub_81ACE38: @ 81ACE38 bl sub_81AE184 b _081ACE76 .align 2, 0 -_081ACE50: .4byte 0x0203ce54 -_081ACE54: .4byte 0x00000828 + .pool _081ACE58: cmp r0, 0x2 bne _081ACE64 @@ -876808,7 +846927,7 @@ sub_81ACE7C: @ 81ACE7C push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _081ACEB4 + ldr r5, =0x0203ce7c ldrh r0, [r5] bl itemid_get_overworld_function cmp r0, 0 @@ -876828,18 +846947,18 @@ sub_81ACE7C: @ 81ACE7C bl sub_81AD2F0 b _081ACEEE .align 2, 0 -_081ACEB4: .4byte 0x0203ce7c + .pool _081ACEB8: movs r0, 0x1 movs r1, 0 bl Window_FastFillPixels movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _081ACEE0 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x3 beq _081ACEE8 - ldr r0, _081ACEE4 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_overworld_function adds r1, r0, 0 @@ -876847,8 +846966,7 @@ _081ACEB8: bl _call_via_r1 b _081ACEEE .align 2, 0 -_081ACEE0: .4byte 0x0203ce58 -_081ACEE4: .4byte 0x0203ce7c + .pool _081ACEE8: adds r0, r4, 0 bl sub_80FDD10 @@ -876867,7 +846985,7 @@ sub_81ACEF4: @ 81ACEF4 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _081ACF20 + ldr r7, =0x03005e08 adds r4, r6, r7 bl sub_81ACE38 movs r0, 0x1 @@ -876880,14 +846998,14 @@ sub_81ACEF4: @ 81ACEF4 bl sub_81ACF88 b _081ACF6A .align 2, 0 -_081ACF20: .4byte 0x03005e08 + .pool _081ACF24: - ldr r0, _081ACF74 + ldr r0, =0x0203ce7c ldrh r0, [r0] - ldr r1, _081ACF78 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r4, _081ACF7C - ldr r1, _081ACF80 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8ee0 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -876910,7 +847028,7 @@ _081ACF24: adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, _081ACF84 + ldr r1, =sub_81AD044 + 1 str r1, [r0] _081ACF6A: add sp, 0x14 @@ -876918,11 +847036,7 @@ _081ACF6A: pop {r0} bx r0 .align 2, 0 -_081ACF74: .4byte 0x0203ce7c -_081ACF78: .4byte 0x02021cc4 -_081ACF7C: .4byte 0x02021fc4 -_081ACF80: .4byte 0x085e8ee0 -_081ACF84: .4byte sub_81AD044 + 1 + .pool thumb_func_end sub_81ACEF4 thumb_func_start sub_81ACF88 @@ -876935,20 +847049,20 @@ sub_81ACF88: @ 81ACF88 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081ACFF4 + ldr r0, =0x03005e08 adds r4, r0 - ldr r0, _081ACFF8 + ldr r0, =0x0203ce7c ldrh r0, [r0] - ldr r1, _081ACFFC + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _081AD000 + ldr r0, =0x02021dc4 movs r2, 0x10 ldrsh r1, [r4, r2] movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r4, _081AD004 - ldr r1, _081AD008 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8f0e adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -876966,7 +847080,7 @@ sub_81ACF88: @ 81ACF88 adds r2, r4, 0 movs r3, 0x3 bl sub_81AE0BC - ldr r2, _081AD00C + ldr r2, =0x08614084 adds r0, r5, 0 movs r1, 0x5 bl sub_81AE238 @@ -876975,13 +847089,7 @@ sub_81ACF88: @ 81ACF88 pop {r0} bx r0 .align 2, 0 -_081ACFF4: .4byte 0x03005e08 -_081ACFF8: .4byte 0x0203ce7c -_081ACFFC: .4byte 0x02021cc4 -_081AD000: .4byte 0x02021dc4 -_081AD004: .4byte 0x02021fc4 -_081AD008: .4byte 0x085e8f0e -_081AD00C: .4byte 0x08614084 + .pool thumb_func_end sub_81ACF88 thumb_func_start sub_81AD010 @@ -876993,7 +847101,7 @@ sub_81AD010: @ 81AD010 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081AD040 + ldr r0, =0x03005e08 adds r4, r0 movs r1, 0x2 ldrsh r0, [r4, r1] @@ -877007,7 +847115,7 @@ sub_81AD010: @ 81AD010 pop {r0} bx r0 .align 2, 0 -_081AD040: .4byte 0x03005e08 + .pool thumb_func_end sub_81AD010 thumb_func_start sub_81AD044 @@ -877019,7 +847127,7 @@ sub_81AD044: @ 81AD044 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081AD07C + ldr r1, =0x03005e08 adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x10 @@ -877029,9 +847137,9 @@ sub_81AD044: @ 81AD044 lsrs r0, 24 cmp r0, 0x1 bne _081AD088 - ldr r0, _081AD080 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081AD084 + ldr r1, =0x00000817 adds r0, r1 ldrb r0, [r0] movs r2, 0x10 @@ -877039,11 +847147,9 @@ sub_81AD044: @ 81AD044 bl sub_81ABC54 b _081AD0C6 .align 2, 0 -_081AD07C: .4byte 0x03005e08 -_081AD080: .4byte 0x0203ce54 -_081AD084: .4byte 0x00000817 + .pool _081AD088: - ldr r0, _081AD0A8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -877057,7 +847163,7 @@ _081AD088: bl sub_81ACF88 b _081AD0C6 .align 2, 0 -_081AD0A8: .4byte 0x030022c0 + .pool _081AD0AC: movs r0, 0x2 ands r0, r1 @@ -877084,20 +847190,20 @@ display_threw_away_item_str: @ 81AD0CC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _081AD134 + ldr r5, =0x03005e08 adds r6, r4, r5 - ldr r0, _081AD138 + ldr r0, =0x0203ce7c ldrh r0, [r0] - ldr r1, _081AD13C + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _081AD140 + ldr r0, =0x02021dc4 movs r2, 0x10 ldrsh r1, [r6, r2] movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r6, _081AD144 - ldr r1, _081AD148 + ldr r6, =0x02021fc4 + ldr r1, =0x085e8ef9 adds r0, r6, 0 bl ExpandTextCodes movs r0, 0x1 @@ -877117,20 +847223,14 @@ display_threw_away_item_str: @ 81AD0CC bl sub_81AE0BC subs r5, 0x8 adds r4, r5 - ldr r0, _081AD14C + ldr r0, =sub_81AD150 + 1 str r0, [r4] add sp, 0x14 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081AD134: .4byte 0x03005e08 -_081AD138: .4byte 0x0203ce7c -_081AD13C: .4byte 0x02021cc4 -_081AD140: .4byte 0x02021dc4 -_081AD144: .4byte 0x02021fc4 -_081AD148: .4byte 0x085e8ef9 -_081AD14C: .4byte sub_81AD150 + 1 + .pool thumb_func_end display_threw_away_item_str thumb_func_start sub_81AD150 @@ -877143,9 +847243,9 @@ sub_81AD150: @ 81AD150 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081AD1D8 + ldr r1, =0x03005e08 adds r5, r0, r1 - ldr r4, _081AD1DC + ldr r4, =0x0203ce58 ldrb r0, [r4, 0x5] lsls r0, 1 adds r1, r4, 0 @@ -877155,7 +847255,7 @@ sub_81AD150: @ 81AD150 adds r1, r4, 0 adds r1, 0x8 adds r7, r0, r1 - ldr r0, _081AD1E0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -877163,7 +847263,7 @@ sub_81AD150: @ 81AD150 beq _081AD1CE movs r0, 0x5 bl audio_play - ldr r0, _081AD1E4 + ldr r0, =0x0203ce7c ldrh r0, [r0] ldrh r1, [r5, 0x10] bl sub_80D6AA4 @@ -877177,7 +847277,7 @@ sub_81AD150: @ 81AD150 bl sub_81ABA88 ldrb r0, [r4, 0x5] bl load_bag_item_list_buffers - ldr r0, _081AD1E8 + ldr r0, =0x03006310 mov r2, r8 ldrh r1, [r2] ldrh r2, [r7] @@ -877196,11 +847296,7 @@ _081AD1CE: pop {r0} bx r0 .align 2, 0 -_081AD1D8: .4byte 0x03005e08 -_081AD1DC: .4byte 0x0203ce58 -_081AD1E0: .4byte 0x030022c0 -_081AD1E4: .4byte 0x0203ce7c -_081AD1E8: .4byte 0x03006310 + .pool thumb_func_end sub_81AD150 thumb_func_start sub_81AD1EC @@ -877211,9 +847307,9 @@ sub_81AD1EC: @ 81AD1EC lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _081AD224 + ldr r1, =0x03005e08 adds r7, r0, r1 - ldr r0, _081AD228 + ldr r0, =0x0203ce58 ldrb r1, [r0, 0x5] lsls r1, 1 adds r2, r0, 0 @@ -877221,11 +847317,11 @@ sub_81AD1EC: @ 81AD1EC adds r6, r1, r2 adds r0, 0x8 adds r5, r1, r0 - ldr r0, _081AD22C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _081AD230 + ldr r2, =0x00000496 adds r1, r0, r2 - ldr r0, _081AD234 + ldr r0, =0x0203ce7c ldrh r2, [r0] ldrh r0, [r1] cmp r0, r2 @@ -877234,11 +847330,7 @@ sub_81AD1EC: @ 81AD1EC strh r0, [r1] b _081AD23A .align 2, 0 -_081AD224: .4byte 0x03005e08 -_081AD228: .4byte 0x0203ce58 -_081AD22C: .4byte 0x03005d8c -_081AD230: .4byte 0x00000496 -_081AD234: .4byte 0x0203ce7c + .pool _081AD238: strh r2, [r1] _081AD23A: @@ -877246,10 +847338,10 @@ _081AD23A: adds r1, r6, 0 adds r2, r5, 0 bl sub_81AE6C8 - ldr r0, _081AD270 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] bl load_bag_item_list_buffers - ldr r0, _081AD274 + ldr r0, =0x03006310 ldrh r1, [r6] ldrh r2, [r5] bl calls_per_item_funcs_in_list_outer @@ -877264,8 +847356,7 @@ _081AD23A: pop {r0} bx r0 .align 2, 0 -_081AD270: .4byte 0x0203ce58 -_081AD274: .4byte 0x03006310 + .pool thumb_func_end sub_81AD1EC thumb_func_start sub_81AD278 @@ -877275,22 +847366,20 @@ sub_81AD278: @ 81AD278 lsrs r4, r0, 24 adds r6, r4, 0 bl sub_81ACE38 - ldr r5, _081AD2A0 + ldr r5, =0x0203ce7c ldrh r0, [r5] bl itemid_80BF6D8_mail_related lsls r0, 24 cmp r0, 0 bne _081AD2AC - ldr r2, _081AD2A4 - ldr r3, _081AD2A8 + ldr r2, =0x085e8dce + ldr r3, =sub_81AD350 + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C b _081AD2EA .align 2, 0 -_081AD2A0: .4byte 0x0203ce7c -_081AD2A4: .4byte 0x085e8dce -_081AD2A8: .4byte sub_81AD350 + 1 + .pool _081AD2AC: ldrh r0, [r5] bl itemid_is_unique @@ -877305,16 +847394,15 @@ _081AD2AC: bl sub_81AD2F0 b _081AD2EA _081AD2CA: - ldr r0, _081AD2DC + ldr r0, =0x0203ce54 ldr r1, [r0] - ldr r0, _081AD2E0 + ldr r0, =sub_81B7F60 + 1 str r0, [r1] adds r0, r4, 0 bl task_close_bag_menu_1 b _081AD2EA .align 2, 0 -_081AD2DC: .4byte 0x0203ce54 -_081AD2E0: .4byte sub_81B7F60 + 1 + .pool _081AD2E4: adds r0, r6, 0 bl sub_81AD30C @@ -877329,15 +847417,14 @@ sub_81AD2F0: @ 81AD2F0 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _081AD304 - ldr r3, _081AD308 + ldr r2, =0x085e8de9 + ldr r3, =sub_81AD350 + 1 movs r1, 0x1 bl sub_81ABB4C pop {r0} bx r0 .align 2, 0 -_081AD304: .4byte 0x085e8de9 -_081AD308: .4byte sub_81AD350 + 1 + .pool thumb_func_end sub_81AD2F0 thumb_func_start sub_81AD30C @@ -877346,15 +847433,15 @@ sub_81AD30C: @ 81AD30C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081AD33C + ldr r0, =0x0203ce7c ldrh r0, [r0] - ldr r1, _081AD340 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r5, _081AD344 - ldr r1, _081AD348 + ldr r5, =0x02021fc4 + ldr r1, =0x085e8e11 adds r0, r5, 0 bl ExpandTextCodes - ldr r3, _081AD34C + ldr r3, =sub_81AD350 + 1 adds r0, r4, 0 movs r1, 0x1 adds r2, r5, 0 @@ -877363,11 +847450,7 @@ sub_81AD30C: @ 81AD30C pop {r0} bx r0 .align 2, 0 -_081AD33C: .4byte 0x0203ce7c -_081AD340: .4byte 0x02021cc4 -_081AD344: .4byte 0x02021fc4 -_081AD348: .4byte 0x085e8e11 -_081AD34C: .4byte sub_81AD350 + 1 + .pool thumb_func_end sub_81AD30C thumb_func_start sub_81AD350 @@ -877375,7 +847458,7 @@ sub_81AD350: @ 81AD350 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081AD374 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -877390,7 +847473,7 @@ _081AD36E: pop {r0} bx r0 .align 2, 0 -_081AD374: .4byte 0x030022c0 + .pool thumb_func_end sub_81AD350 thumb_func_start sub_81AD378 @@ -877398,16 +847481,15 @@ sub_81AD378: @ 81AD378 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081AD390 + ldr r1, =0x0203ce54 ldr r2, [r1] - ldr r1, _081AD394 + ldr r1, =sub_8177C14 + 1 str r1, [r2] bl task_close_bag_menu_1 pop {r0} bx r0 .align 2, 0 -_081AD390: .4byte 0x0203ce54 -_081AD394: .4byte sub_8177C14 + 1 + .pool thumb_func_end sub_81AD378 thumb_func_start sub_81AD398 @@ -877419,7 +847501,7 @@ sub_81AD398: @ 81AD398 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081AD3D8 + ldr r0, =0x03005e08 adds r4, r0 bl sub_81ACE38 movs r1, 0x2 @@ -877438,7 +847520,7 @@ sub_81AD398: @ 81AD398 pop {r0} bx r0 .align 2, 0 -_081AD3D8: .4byte 0x03005e08 + .pool thumb_func_end sub_81AD398 thumb_func_start brm_run_item_battle_function @@ -877446,7 +847528,7 @@ brm_run_item_battle_function: @ 81AD3DC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _081AD408 + ldr r4, =0x0203ce7c ldrh r0, [r4] bl itemid_get_battle_function cmp r0, 0 @@ -877462,7 +847544,7 @@ _081AD400: pop {r0} bx r0 .align 2, 0 -_081AD408: .4byte 0x0203ce7c + .pool thumb_func_end brm_run_item_battle_function thumb_func_start sub_81AD40C @@ -877481,22 +847563,20 @@ sub_81AD41C: @ 81AD41C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _081AD440 + ldr r4, =0x0203ce7c ldrh r0, [r4] bl itemid_80BF6D8_mail_related lsls r0, 24 cmp r0, 0 bne _081AD44C - ldr r2, _081AD444 - ldr r3, _081AD448 + ldr r2, =0x085e8dce + ldr r3, =sub_81AD350 + 1 adds r0, r5, 0 movs r1, 0x1 bl sub_81ABB4C b _081AD4AE .align 2, 0 -_081AD440: .4byte 0x0203ce7c -_081AD444: .4byte 0x085e8dce -_081AD448: .4byte sub_81AD350 + 1 + .pool _081AD44C: ldrh r0, [r4] bl sub_8122148 @@ -877504,25 +847584,22 @@ _081AD44C: cmp r0, 0 bne _081AD488 ldrh r0, [r4] - ldr r1, _081AD478 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r4, _081AD47C - ldr r1, _081AD480 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8e27 adds r0, r4, 0 bl ExpandTextCodes - ldr r3, _081AD484 + ldr r3, =sub_81AD350 + 1 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 bl sub_81ABB4C b _081AD4AE .align 2, 0 -_081AD478: .4byte 0x02021cc4 -_081AD47C: .4byte 0x02021fc4 -_081AD480: .4byte 0x085e8e27 -_081AD484: .4byte sub_81AD350 + 1 + .pool _081AD488: - ldr r0, _081AD4A4 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x4 beq _081AD4A8 @@ -877535,7 +847612,7 @@ _081AD488: bl task_close_bag_menu_1 b _081AD4AE .align 2, 0 -_081AD4A4: .4byte 0x0203ce58 + .pool _081AD4A8: adds r0, r5, 0 bl sub_81AD30C @@ -877550,25 +847627,23 @@ sub_81AD4B4: @ 81AD4B4 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _081AD4D8 + ldr r5, =0x0203ce7c ldrh r0, [r5] bl itemid_is_mail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _081AD4E4 - ldr r2, _081AD4DC - ldr r3, _081AD4E0 + ldr r2, =0x085e8dce + ldr r3, =sub_81AD350 + 1 adds r0, r4, 0 movs r1, 0x1 bl sub_81ABB4C b _081AD51A .align 2, 0 -_081AD4D8: .4byte 0x0203ce7c -_081AD4DC: .4byte 0x085e8dce -_081AD4E0: .4byte sub_81AD350 + 1 + .pool _081AD4E4: - ldr r0, _081AD508 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] cmp r0, 0x4 beq _081AD514 @@ -877577,18 +847652,16 @@ _081AD4E4: lsls r0, 24 cmp r0, 0 bne _081AD514 - ldr r0, _081AD50C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081AD510 + ldr r0, =task_close_bag_menu_1 + 1 str r0, [r1] b _081AD51A .align 2, 0 -_081AD508: .4byte 0x0203ce58 -_081AD50C: .4byte 0x03005e00 -_081AD510: .4byte task_close_bag_menu_1 + 1 + .pool _081AD514: adds r0, r4, 0 bl sub_81AD30C @@ -877627,9 +847700,9 @@ _081AD550: movs r1, 0 movs r2, 0 bl bg_change_y_offset_to_copy_queue - ldr r4, _081AD5B4 + ldr r4, =0x03005d8c ldr r0, [r4] - ldr r5, _081AD5B8 + ldr r5, =0x00000496 adds r1, r0, r5 ldrh r0, [r1] cmp r0, 0 @@ -877644,7 +847717,7 @@ _081AD550: bl player_bitmagic bl sub_808B864 bl sub_808BCF4 - ldr r2, _081AD5BC + ldr r2, =0x0203ce7c ldr r0, [r4] adds r0, r5 ldrh r1, [r0] @@ -877655,7 +847728,7 @@ _081AD550: bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081AD5C0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -877663,16 +847736,13 @@ _081AD550: strh r6, [r1, 0xE] b _081AD5D0 .align 2, 0 -_081AD5B4: .4byte 0x03005d8c -_081AD5B8: .4byte 0x00000496 -_081AD5BC: .4byte 0x0203ce7c -_081AD5C0: .4byte 0x03005e00 + .pool _081AD5C4: ldr r0, [r4] adds r0, r5 strh r7, [r0] _081AD5CA: - ldr r0, _081AD5D8 + ldr r0, =0x082736b3 bl script_env_1_execute_new_script _081AD5D0: movs r0, 0x1 @@ -877681,7 +847751,7 @@ _081AD5D2: pop {r1} bx r1 .align 2, 0 -_081AD5D8: .4byte 0x082736b3 + .pool thumb_func_end sub_81AD520 thumb_func_start display_sell_item_ask_str @@ -877693,34 +847763,29 @@ display_sell_item_ask_str: @ 81AD5DC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081AD61C + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r6, _081AD620 + ldr r6, =0x0203ce7c ldrh r0, [r6] bl itemid_get_market_price lsls r0, 16 cmp r0, 0 bne _081AD634 ldrh r0, [r6] - ldr r1, _081AD624 + ldr r1, =0x02021dc4 bl itemid_get_name - ldr r4, _081AD628 - ldr r1, _081AD62C + ldr r4, =0x02021fc4 + ldr r1, =0x085e960f adds r0, r4, 0 bl ExpandTextCodes - ldr r3, _081AD630 + ldr r3, =sub_81ABBBC + 1 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 bl sub_81ABB4C b _081AD66A .align 2, 0 -_081AD61C: .4byte 0x03005e08 -_081AD620: .4byte 0x0203ce7c -_081AD624: .4byte 0x02021dc4 -_081AD628: .4byte 0x02021fc4 -_081AD62C: .4byte 0x085e960f -_081AD630: .4byte sub_81ABBBC + 1 + .pool _081AD634: movs r0, 0x1 strh r0, [r4, 0x10] @@ -877734,13 +847799,13 @@ _081AD634: b _081AD66A _081AD64C: ldrh r0, [r6] - ldr r1, _081AD670 + ldr r1, =0x02021dc4 bl itemid_get_name - ldr r4, _081AD674 - ldr r1, _081AD678 + ldr r4, =0x02021fc4 + ldr r1, =0x085e962f adds r0, r4, 0 bl ExpandTextCodes - ldr r3, _081AD67C + ldr r3, =sub_81AD730 + 1 adds r0, r7, 0 movs r1, 0x1 adds r2, r4, 0 @@ -877750,10 +847815,7 @@ _081AD66A: pop {r0} bx r0 .align 2, 0 -_081AD670: .4byte 0x02021dc4 -_081AD674: .4byte 0x02021fc4 -_081AD678: .4byte 0x085e962f -_081AD67C: .4byte sub_81AD730 + 1 + .pool thumb_func_end display_sell_item_ask_str thumb_func_start sub_81AD680 @@ -877765,10 +847827,10 @@ sub_81AD680: @ 81AD680 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081AD6CC + ldr r0, =0x03005e08 adds r4, r0 - ldr r6, _081AD6D0 - ldr r0, _081AD6D4 + ldr r6, =0x02021cc4 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_market_price lsls r0, 16 @@ -877780,11 +847842,11 @@ sub_81AD680: @ 81AD680 movs r2, 0 movs r3, 0x6 bl decimal_int_to_string - ldr r4, _081AD6D8 - ldr r1, _081AD6DC + ldr r4, =0x02021fc4 + ldr r1, =0x085e9654 adds r0, r4, 0 bl ExpandTextCodes - ldr r3, _081AD6E0 + ldr r3, =sub_81AD6E4 + 1 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 @@ -877793,12 +847855,7 @@ sub_81AD680: @ 81AD680 pop {r0} bx r0 .align 2, 0 -_081AD6CC: .4byte 0x03005e08 -_081AD6D0: .4byte 0x02021cc4 -_081AD6D4: .4byte 0x0203ce7c -_081AD6D8: .4byte 0x02021fc4 -_081AD6DC: .4byte 0x085e9654 -_081AD6E0: .4byte sub_81AD6E4 + 1 + .pool thumb_func_end sub_81AD680 thumb_func_start sub_81AD6E4 @@ -877806,13 +847863,13 @@ sub_81AD6E4: @ 81AD6E4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _081AD6F8 + ldr r2, =0x0861408c movs r1, 0x6 bl sub_81AE238 pop {r0} bx r0 .align 2, 0 -_081AD6F8: .4byte 0x0861408c + .pool thumb_func_end sub_81AD6E4 thumb_func_start sub_81AD6FC @@ -877824,7 +847881,7 @@ sub_81AD6FC: @ 81AD6FC lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081AD72C + ldr r0, =0x03005e08 adds r4, r0 bl sub_81AE2A4 movs r0, 0x4 @@ -877838,7 +847895,7 @@ sub_81AD6FC: @ 81AD6FC pop {r0} bx r0 .align 2, 0 -_081AD72C: .4byte 0x03005e08 + .pool thumb_func_end sub_81AD6FC thumb_func_start sub_81AD730 @@ -877851,7 +847908,7 @@ sub_81AD730: @ 81AD730 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r6, _081AD788 + ldr r6, =0x03005e08 adds r0, r4, r6 mov r8, r0 movs r0, 0x8 @@ -877859,7 +847916,7 @@ sub_81AD730: @ 81AD730 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _081AD78C + ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_market_price lsls r0, 16 @@ -877875,7 +847932,7 @@ sub_81AD730: @ 81AD730 bl sub_81AE268 subs r6, 0x8 adds r4, r6 - ldr r0, _081AD790 + ldr r0, =sub_81AD794 + 1 str r0, [r4] pop {r3} mov r8, r3 @@ -877883,9 +847940,7 @@ sub_81AD730: @ 81AD730 pop {r0} bx r0 .align 2, 0 -_081AD788: .4byte 0x03005e08 -_081AD78C: .4byte 0x0203ce7c -_081AD790: .4byte sub_81AD794 + 1 + .pool thumb_func_end sub_81AD730 thumb_func_start sub_81AD794 @@ -877897,7 +847952,7 @@ sub_81AD794: @ 81AD794 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _081AD7E4 + ldr r1, =0x03005e08 adds r6, r0, r1 adds r0, r6, 0 adds r0, 0x10 @@ -877907,14 +847962,14 @@ sub_81AD794: @ 81AD794 lsrs r0, 24 cmp r0, 0x1 bne _081AD7F4 - ldr r0, _081AD7E8 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081AD7EC + ldr r1, =0x00000818 adds r0, r1 ldrb r4, [r0] movs r2, 0x10 ldrsh r5, [r6, r2] - ldr r0, _081AD7F0 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_market_price lsls r0, 16 @@ -877928,12 +847983,9 @@ sub_81AD794: @ 81AD794 bl sub_81ABCC0 b _081AD844 .align 2, 0 -_081AD7E4: .4byte 0x03005e08 -_081AD7E8: .4byte 0x0203ce54 -_081AD7EC: .4byte 0x00000818 -_081AD7F0: .4byte 0x0203ce7c + .pool _081AD7F4: - ldr r0, _081AD814 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -877947,7 +847999,7 @@ _081AD7F4: bl sub_81AD680 b _081AD844 .align 2, 0 -_081AD814: .4byte 0x030022c0 + .pool _081AD818: movs r0, 0x2 ands r0, r1 @@ -877982,13 +848034,13 @@ sub_81AD84C: @ 81AD84C lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081AD8AC + ldr r0, =0x03005e08 adds r4, r0 - ldr r6, _081AD8B0 + ldr r6, =0x0203ce7c ldrh r0, [r6] - ldr r1, _081AD8B4 + ldr r1, =0x02021dc4 bl itemid_get_name - ldr r0, _081AD8B8 + ldr r0, =0x02021cc4 mov r8, r0 ldrh r0, [r6] bl itemid_get_market_price @@ -878001,11 +848053,11 @@ sub_81AD84C: @ 81AD84C movs r2, 0 movs r3, 0x6 bl decimal_int_to_string - ldr r4, _081AD8BC - ldr r1, _081AD8C0 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9677 adds r0, r4, 0 bl ExpandTextCodes - ldr r3, _081AD8C4 + ldr r3, =sub_81AD8C8 + 1 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 @@ -878016,13 +848068,7 @@ sub_81AD84C: @ 81AD84C pop {r0} bx r0 .align 2, 0 -_081AD8AC: .4byte 0x03005e08 -_081AD8B0: .4byte 0x0203ce7c -_081AD8B4: .4byte 0x02021dc4 -_081AD8B8: .4byte 0x02021cc4 -_081AD8BC: .4byte 0x02021fc4 -_081AD8C0: .4byte 0x085e9677 -_081AD8C4: .4byte sub_81AD8C8 + 1 + .pool thumb_func_end sub_81AD84C thumb_func_start sub_81AD8C8 @@ -878037,10 +848083,10 @@ sub_81AD8C8: @ 81AD8C8 lsls r6, r0, 2 adds r6, r0 lsls r6, 3 - ldr r0, _081AD9A0 + ldr r0, =0x03005e08 adds r0, r6 mov r10, r0 - ldr r7, _081AD9A4 + ldr r7, =0x0203ce58 ldrb r5, [r7, 0x5] lsls r5, 1 movs r1, 0x12 @@ -878052,13 +848098,13 @@ sub_81AD8C8: @ 81AD8C8 adds r5, r0 movs r0, 0x5F bl audio_play - ldr r2, _081AD9A8 + ldr r2, =0x0203ce7c mov r8, r2 ldrh r0, [r2] mov r3, r10 ldrh r1, [r3, 0x10] bl sub_80D6AA4 - ldr r0, _081AD9AC + ldr r0, =0x03005d8c ldr r4, [r0] movs r1, 0x92 lsls r1, 3 @@ -878085,7 +848131,7 @@ sub_81AD8C8: @ 81AD8C8 bl sub_81ABA88 ldrb r0, [r7, 0x5] bl load_bag_item_list_buffers - ldr r0, _081AD9B0 + ldr r0, =0x03006310 mov r2, r9 ldrh r1, [r2] ldrh r2, [r5] @@ -878096,12 +848142,12 @@ sub_81AD8C8: @ 81AD8C8 strh r0, [r3] movs r1, 0x2 bl sub_81AB73C - ldr r0, _081AD9B4 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081AD9B8 + ldr r1, =0x00000819 adds r0, r1 ldrb r4, [r0] - ldr r2, _081AD9AC + ldr r2, =0x03005d8c ldr r0, [r2] movs r3, 0x92 lsls r3, 3 @@ -878111,10 +848157,10 @@ sub_81AD8C8: @ 81AD8C8 adds r0, r4, 0 movs r2, 0 bl PrintMoneyAmountInMoneyBox - ldr r0, _081AD9A0 + ldr r0, =0x03005e08 subs r0, 0x8 adds r6, r0 - ldr r0, _081AD9BC + ldr r0, =sub_81AD9C0 + 1 str r0, [r6] pop {r3-r5} mov r8, r3 @@ -878124,14 +848170,7 @@ sub_81AD8C8: @ 81AD8C8 pop {r0} bx r0 .align 2, 0 -_081AD9A0: .4byte 0x03005e08 -_081AD9A4: .4byte 0x0203ce58 -_081AD9A8: .4byte 0x0203ce7c -_081AD9AC: .4byte 0x03005d8c -_081AD9B0: .4byte 0x03006310 -_081AD9B4: .4byte 0x0203ce54 -_081AD9B8: .4byte 0x00000819 -_081AD9BC: .4byte sub_81AD9C0 + 1 + .pool thumb_func_end sub_81AD8C8 thumb_func_start sub_81AD9C0 @@ -878139,7 +848178,7 @@ sub_81AD9C0: @ 81AD9C0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081AD9E8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -878155,7 +848194,7 @@ _081AD9E2: pop {r0} bx r0 .align 2, 0 -_081AD9E8: .4byte 0x030022c0 + .pool thumb_func_end sub_81AD9C0 thumb_func_start display_deposit_item_ask_str @@ -878167,7 +848206,7 @@ display_deposit_item_ask_str: @ 81AD9EC lsls r0, r2, 2 adds r0, r2 lsls r5, r0, 3 - ldr r6, _081ADA14 + ldr r6, =0x03005e08 adds r1, r5, r6 movs r0, 0x1 strh r0, [r1, 0x10] @@ -878179,14 +848218,14 @@ display_deposit_item_ask_str: @ 81AD9EC bl sub_81ADB14 b _081ADA5E .align 2, 0 -_081ADA14: .4byte 0x03005e08 + .pool _081ADA18: - ldr r0, _081ADA68 + ldr r0, =0x0203ce7c ldrh r0, [r0] - ldr r1, _081ADA6C + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r4, _081ADA70 - ldr r1, _081ADA74 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8e42 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -878209,7 +848248,7 @@ _081ADA18: adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 - ldr r1, _081ADA78 + ldr r1, =sub_81ADA7C + 1 str r1, [r0] _081ADA5E: add sp, 0x14 @@ -878217,11 +848256,7 @@ _081ADA5E: pop {r0} bx r0 .align 2, 0 -_081ADA68: .4byte 0x0203ce7c -_081ADA6C: .4byte 0x02021cc4 -_081ADA70: .4byte 0x02021fc4 -_081ADA74: .4byte 0x085e8e42 -_081ADA78: .4byte sub_81ADA7C + 1 + .pool thumb_func_end display_deposit_item_ask_str thumb_func_start sub_81ADA7C @@ -878233,7 +848268,7 @@ sub_81ADA7C: @ 81ADA7C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _081ADAB4 + ldr r1, =0x03005e08 adds r5, r0, r1 adds r0, r5, 0 adds r0, 0x10 @@ -878243,9 +848278,9 @@ sub_81ADA7C: @ 81ADA7C lsrs r0, 24 cmp r0, 0x1 bne _081ADAC0 - ldr r0, _081ADAB8 + ldr r0, =0x0203ce54 ldr r0, [r0] - ldr r1, _081ADABC + ldr r1, =0x00000817 adds r0, r1 ldrb r0, [r0] movs r2, 0x10 @@ -878253,11 +848288,9 @@ sub_81ADA7C: @ 81ADA7C bl sub_81ABC54 b _081ADB0E .align 2, 0 -_081ADAB4: .4byte 0x03005e08 -_081ADAB8: .4byte 0x0203ce54 -_081ADABC: .4byte 0x00000817 + .pool _081ADAC0: - ldr r0, _081ADAE0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -878271,7 +848304,7 @@ _081ADAC0: bl sub_81ADB14 b _081ADB0E .align 2, 0 -_081ADAE0: .4byte 0x030022c0 + .pool _081ADAE4: movs r0, 0x2 ands r0, r1 @@ -878307,7 +848340,7 @@ sub_81ADB14: @ 81ADB14 lsls r1, r0, 2 adds r1, r0 lsls r7, r1, 3 - ldr r0, _081ADB60 + ldr r0, =0x03005e08 mov r9, r0 adds r2, r7, 0 add r2, r9 @@ -878315,14 +848348,14 @@ sub_81ADB14: @ 81ADB14 movs r0, 0x1 movs r1, 0 bl Window_FastFillPixels - ldr r4, _081ADB64 + ldr r4, =0x0203ce7c ldrh r0, [r4] bl itemid_is_unique lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 beq _081ADB6C - ldr r2, _081ADB68 + ldr r2, =0x085e8e8e movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -878333,9 +848366,7 @@ sub_81ADB14: @ 81ADB14 movs r0, 0x1 b _081ADBE2 .align 2, 0 -_081ADB60: .4byte 0x03005e08 -_081ADB64: .4byte 0x0203ce7c -_081ADB68: .4byte 0x085e8e8e + .pool _081ADB6C: ldrh r0, [r4] mov r3, r8 @@ -878346,17 +848377,17 @@ _081ADB6C: cmp r6, 0x1 bne _081ADBD4 ldrh r0, [r4] - ldr r1, _081ADBC0 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _081ADBC4 + ldr r0, =0x02021dc4 mov r2, r8 movs r3, 0x10 ldrsh r1, [r2, r3] movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r4, _081ADBC8 - ldr r1, _081ADBCC + ldr r4, =0x02021fc4 + ldr r1, =0x085e8e5a adds r0, r4, 0 bl ExpandTextCodes str r6, [sp] @@ -878372,16 +848403,12 @@ _081ADB6C: mov r0, r9 subs r0, 0x8 adds r0, r7, r0 - ldr r1, _081ADBD0 + ldr r1, =sub_81AD150 + 1 b _081ADBF2 .align 2, 0 -_081ADBC0: .4byte 0x02021cc4 -_081ADBC4: .4byte 0x02021dc4 -_081ADBC8: .4byte 0x02021fc4 -_081ADBCC: .4byte 0x085e8e5a -_081ADBD0: .4byte sub_81AD150 + 1 + .pool _081ADBD4: - ldr r2, _081ADC04 + ldr r2, =0x085e8e6e movs r0, 0x1 str r0, [sp] str r5, [sp, 0x4] @@ -878395,7 +848422,7 @@ _081ADBE2: mov r0, r9 subs r0, 0x8 adds r0, r7, r0 - ldr r1, _081ADC08 + ldr r1, =sub_81ADC0C + 1 _081ADBF2: str r1, [r0] add sp, 0x14 @@ -878406,8 +848433,7 @@ _081ADBF2: pop {r0} bx r0 .align 2, 0 -_081ADC04: .4byte 0x085e8e6e -_081ADC08: .4byte sub_81ADC0C + 1 + .pool thumb_func_end sub_81ADB14 thumb_func_start sub_81ADC0C @@ -878418,9 +848444,9 @@ sub_81ADC0C: @ 81ADC0C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _081ADC4C + ldr r1, =0x03005e08 adds r5, r0, r1 - ldr r0, _081ADC50 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -878441,21 +848467,20 @@ _081ADC44: pop {r0} bx r0 .align 2, 0 -_081ADC4C: .4byte 0x03005e08 -_081ADC50: .4byte 0x030022c0 + .pool thumb_func_end sub_81ADC0C thumb_func_start sub_81ADC54 sub_81ADC54: @ 81ADC54 push {lr} - ldr r0, _081ADC64 + ldr r0, =0x0203ce58 ldrb r0, [r0, 0x4] cmp r0, 0xA beq _081ADC68 movs r0, 0 b _081ADC6A .align 2, 0 -_081ADC64: .4byte 0x0203ce58 + .pool _081ADC68: movs r0, 0x1 _081ADC6A: @@ -878466,11 +848491,11 @@ _081ADC6A: thumb_func_start sub_81ADC70 sub_81ADC70: @ 81ADC70 push {r4-r6,lr} - ldr r4, _081ADCF4 + ldr r4, =0x0203ce80 movs r0, 0xD0 bl malloc_and_clear str r0, [r4] - ldr r5, _081ADCF8 + ldr r5, =0x03005d8c ldr r1, [r5] movs r2, 0xAC lsls r2, 3 @@ -878486,7 +848511,7 @@ sub_81ADC70: @ 81ADC70 movs r2, 0x40 bl memcpy ldr r0, [r4] - ldr r2, _081ADCFC + ldr r2, =0x0203ce58 ldrb r1, [r2, 0x5] adds r0, 0xCE strh r1, [r0] @@ -878509,7 +848534,7 @@ _081ADCAE: adds r6, 0x1 cmp r6, 0x4 bls _081ADCAE - ldr r4, _081ADCF8 + ldr r4, =0x03005d8c ldr r0, [r4] movs r1, 0xAC lsls r1, 3 @@ -878527,20 +848552,18 @@ _081ADCAE: pop {r0} bx r0 .align 2, 0 -_081ADCF4: .4byte 0x0203ce80 -_081ADCF8: .4byte 0x03005d8c -_081ADCFC: .4byte 0x0203ce58 + .pool thumb_func_end sub_81ADC70 thumb_func_start sub_81ADD00 sub_81ADD00: @ 81ADD00 push {r4-r6,lr} - ldr r5, _081ADD64 + ldr r5, =0x03005d8c ldr r0, [r5] movs r1, 0xAC lsls r1, 3 adds r0, r1 - ldr r4, _081ADD68 + ldr r4, =0x0203ce80 ldr r1, [r4] movs r2, 0x78 bl memcpy @@ -878552,7 +848575,7 @@ sub_81ADD00: @ 81ADD00 adds r1, 0x78 movs r2, 0x40 bl memcpy - ldr r1, _081ADD6C + ldr r1, =0x0203ce58 ldr r0, [r4] adds r0, 0xCE ldrh r0, [r0] @@ -878583,9 +848606,7 @@ _081ADD3A: pop {r0} bx r0 .align 2, 0 -_081ADD64: .4byte 0x03005d8c -_081ADD68: .4byte 0x0203ce80 -_081ADD6C: .4byte 0x0203ce58 + .pool thumb_func_end sub_81ADD00 thumb_func_start sub_81ADD70 @@ -878598,14 +848619,14 @@ sub_81ADD70: @ 81ADD70 movs r0, 0x4 movs r1, 0x1 bl bag_add_item - ldr r2, _081ADD94 + ldr r2, =sub_8059D50 + 1 movs r0, 0xA movs r1, 0 bl sub_81AAC90 pop {r0} bx r0 .align 2, 0 -_081ADD94: .4byte sub_8059D50 + 1 + .pool thumb_func_end sub_81ADD70 thumb_func_start sub_81ADD98 @@ -878616,9 +848637,9 @@ sub_81ADD98: @ 81ADD98 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081ADDC8 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r0, _081ADDCC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -878634,8 +848655,7 @@ sub_81ADD98: @ 81ADD98 beq _081ADDDA b _081ADE2C .align 2, 0 -_081ADDC8: .4byte 0x03005e08 -_081ADDCC: .4byte 0x02037fd4 + .pool _081ADDD0: movs r0, 0x99 lsls r0, 1 @@ -878656,14 +848676,14 @@ _081ADDEC: ldrb r0, [r4] movs r1, 0x2 bl sub_81AB73C - ldr r1, _081ADE08 + ldr r1, =0x0203ce7c movs r0, 0x4 strh r0, [r1] adds r0, r5, 0 bl sub_81AC644 b _081ADE2C .align 2, 0 -_081ADE08: .4byte 0x0203ce7c + .pool _081ADE0C: movs r0, 0x5 bl audio_play @@ -878692,11 +848712,11 @@ sub_81ADE38: @ 81ADE38 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _081ADE60 - ldr r0, _081ADE64 + ldr r1, =0x020375e2 + ldr r0, =0x0203ce7c ldrh r0, [r0] strh r0, [r1] - ldr r1, _081ADE68 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] bl sub_81ACE38 @@ -878706,25 +848726,21 @@ sub_81ADE38: @ 81ADE38 pop {r0} bx r0 .align 2, 0 -_081ADE60: .4byte 0x020375e2 -_081ADE64: .4byte 0x0203ce7c -_081ADE68: .4byte 0x020375f0 + .pool thumb_func_end sub_81ADE38 thumb_func_start sub_81ADE6C sub_81ADE6C: @ 81ADE6C push {lr} - ldr r0, _081ADE80 - ldr r1, _081ADE84 + ldr r0, =0x03005dac + ldr r1, =sub_819FA50 + 1 str r1, [r0] - ldr r0, _081ADE88 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_081ADE80: .4byte 0x03005dac -_081ADE84: .4byte sub_819FA50 + 1 -_081ADE88: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_81ADE6C thumb_func_start sub_81ADE8C @@ -878733,11 +848749,11 @@ sub_81ADE8C: @ 81ADE8C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081ADEB4 + ldr r0, =0x0203ce7c ldrh r0, [r0] movs r1, 0x1 bl sub_80D6AA4 - ldr r1, _081ADEB8 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] bl sub_81ACE38 @@ -878747,24 +848763,21 @@ sub_81ADE8C: @ 81ADE8C pop {r0} bx r0 .align 2, 0 -_081ADEB4: .4byte 0x0203ce7c -_081ADEB8: .4byte 0x020375f0 + .pool thumb_func_end sub_81ADE8C thumb_func_start sub_81ADEBC sub_81ADEBC: @ 81ADEBC push {lr} - ldr r0, _081ADED0 - ldr r1, _081ADED4 + ldr r0, =0x03005dac + ldr r1, =sub_818DEF4 + 1 str r1, [r0] - ldr r0, _081ADED8 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_081ADED0: .4byte 0x03005dac -_081ADED4: .4byte sub_818DEF4 + 1 -_081ADED8: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_81ADEBC thumb_func_start sub_81ADEDC @@ -878773,7 +848786,7 @@ sub_81ADEDC: @ 81ADEDC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _081ADEFC + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] bl sub_81ACE38 @@ -878783,23 +848796,21 @@ sub_81ADEDC: @ 81ADEDC pop {r0} bx r0 .align 2, 0 -_081ADEFC: .4byte 0x020375f0 + .pool thumb_func_end sub_81ADEDC thumb_func_start sub_81ADF00 sub_81ADF00: @ 81ADF00 push {lr} - ldr r0, _081ADF14 - ldr r1, _081ADF18 + ldr r0, =0x03005dac + ldr r1, =sub_818E564 + 1 str r1, [r0] - ldr r0, _081ADF1C + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_081ADF14: .4byte 0x03005dac -_081ADF18: .4byte sub_818E564 + 1 -_081ADF1C: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_81ADF00 thumb_func_start sub_81ADF20 @@ -878815,14 +848826,14 @@ sub_81ADF20: @ 81ADF20 movs r1, 0 str r0, [sp, 0x14] str r1, [sp, 0x18] - ldr r1, _081ADFE4 + ldr r1, =0x00ffffff ldr r0, [sp, 0x14] ands r0, r1 movs r1, 0x80 lsls r1, 21 orrs r0, r1 str r0, [sp, 0x14] - ldr r1, _081ADFE8 + ldr r1, =0xffffff00 ldr r0, [sp, 0x18] ands r0, r1 movs r1, 0x2 @@ -878879,11 +848890,11 @@ _081ADFBA: adds r0, r6, 0 movs r1, 0x7 bl Window_GetField - ldr r1, _081ADFEC + ldr r1, =0x0203ce54 ldr r1, [r1] - ldr r2, _081ADFF0 + ldr r2, =0x00000844 adds r1, r2 - ldr r2, _081ADFF4 + ldr r2, =0x04000100 bl CpuSet adds r0, r6, 0 bl Window_Remove @@ -878895,11 +848906,7 @@ _081ADFBA: pop {r0} bx r0 .align 2, 0 -_081ADFE4: .4byte 0x00ffffff -_081ADFE8: .4byte 0xffffff00 -_081ADFEC: .4byte 0x0203ce54 -_081ADFF0: .4byte 0x00000844 -_081ADFF4: .4byte 0x04000100 + .pool thumb_func_end sub_81ADF20 thumb_func_start sub_81ADFF8 @@ -878910,9 +848917,9 @@ sub_81ADFF8: @ 81ADFF8 bls _081AE002 movs r7, 0x8 _081AE002: - ldr r0, _081AE048 + ldr r0, =0x0203ce54 ldr r4, [r0] - ldr r0, _081AE04C + ldr r0, =0x00000844 adds r4, r0 movs r0, 0x2 movs r1, 0x7 @@ -878920,7 +848927,7 @@ _081AE002: adds r5, r0, 0 lsls r0, r7, 5 adds r0, r4, r0 - ldr r6, _081AE050 + ldr r6, =0x04000040 adds r1, r5, 0 adds r2, r6, 0 bl CpuSet @@ -878942,15 +848949,13 @@ _081AE002: pop {r0} bx r0 .align 2, 0 -_081AE048: .4byte 0x0203ce54 -_081AE04C: .4byte 0x00000844 -_081AE050: .4byte 0x04000040 + .pool thumb_func_end sub_81ADFF8 thumb_func_start setup_bag_menu_textboxes setup_bag_menu_textboxes: @ 81AE054 push {r4,lr} - ldr r0, _081AE0B4 + ldr r0, =0x08614174 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 @@ -878964,7 +848969,7 @@ setup_bag_menu_textboxes: @ 81AE054 movs r0, 0xC0 movs r1, 0x1 bl sub_819A2BC - ldr r0, _081AE0B8 + ldr r0, =0x0860f074 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -878988,8 +848993,7 @@ _081AE088: pop {r0} bx r0 .align 2, 0 -_081AE0B4: .4byte 0x08614174 -_081AE0B8: .4byte 0x0860f074 + .pool thumb_func_end setup_bag_menu_textboxes thumb_func_start sub_81AE0BC @@ -879026,7 +849030,7 @@ sub_81AE0BC: @ 81AE0BC str r6, [sp, 0x4] lsls r4, r5, 1 adds r4, r5 - ldr r5, _081AE120 + ldr r5, =0x08614164 adds r4, r5 str r4, [sp, 0x8] mov r4, r8 @@ -879044,14 +849048,14 @@ sub_81AE0BC: @ 81AE0BC pop {r0} bx r0 .align 2, 0 -_081AE120: .4byte 0x08614164 + .pool thumb_func_end sub_81AE0BC thumb_func_start sub_81AE124 sub_81AE124: @ 81AE124 lsls r0, 24 lsrs r0, 24 - ldr r1, _081AE138 + ldr r1, =0x0203ce54 ldr r1, [r1] movs r2, 0x81 lsls r2, 4 @@ -879060,7 +849064,7 @@ sub_81AE124: @ 81AE124 ldrb r0, [r1] bx lr .align 2, 0 -_081AE138: .4byte 0x0203ce54 + .pool thumb_func_end sub_81AE124 thumb_func_start sub_81AE13C @@ -879068,7 +849072,7 @@ sub_81AE13C: @ 81AE13C push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081AE17C + ldr r0, =0x0203ce54 movs r3, 0x81 lsls r3, 4 adds r1, r2, r3 @@ -879078,7 +849082,7 @@ sub_81AE13C: @ 81AE13C cmp r0, 0xFF bne _081AE172 lsls r0, r2, 3 - ldr r1, _081AE180 + ldr r1, =0x086141ac adds r0, r1 bl Window_AddFromTemplate strb r0, [r4] @@ -879095,8 +849099,7 @@ _081AE172: pop {r1} bx r1 .align 2, 0 -_081AE17C: .4byte 0x0203ce54 -_081AE180: .4byte 0x086141ac + .pool thumb_func_end sub_81AE13C thumb_func_start sub_81AE184 @@ -879104,7 +849107,7 @@ sub_81AE184: @ 81AE184 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081AE1C0 + ldr r1, =0x0203ce54 movs r2, 0x81 lsls r2, 4 adds r0, r2 @@ -879128,7 +849131,7 @@ _081AE1B8: pop {r0} bx r0 .align 2, 0 -_081AE1C0: .4byte 0x0203ce54 + .pool thumb_func_end sub_81AE184 thumb_func_start sub_81AE1C4 @@ -879136,7 +849139,7 @@ sub_81AE1C4: @ 81AE1C4 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081AE1F0 + ldr r0, =0x0203ce54 movs r3, 0x81 lsls r3, 4 adds r1, r2, r3 @@ -879146,7 +849149,7 @@ sub_81AE1C4: @ 81AE1C4 cmp r0, 0xFF bne _081AE1E8 lsls r0, r2, 3 - ldr r1, _081AE1F4 + ldr r1, =0x086141ac adds r0, r1 bl Window_AddFromTemplate strb r0, [r4] @@ -879156,8 +849159,7 @@ _081AE1E8: pop {r1} bx r1 .align 2, 0 -_081AE1F0: .4byte 0x0203ce54 -_081AE1F4: .4byte 0x086141ac + .pool thumb_func_end sub_81AE1C4 thumb_func_start sub_81AE1F8 @@ -879165,7 +849167,7 @@ sub_81AE1F8: @ 81AE1F8 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081AE234 + ldr r1, =0x0203ce54 movs r2, 0x81 lsls r2, 4 adds r0, r2 @@ -879189,7 +849191,7 @@ _081AE22C: pop {r0} bx r0 .align 2, 0 -_081AE234: .4byte 0x0203ce54 + .pool thumb_func_end sub_81AE1F8 thumb_func_start sub_81AE238 @@ -879200,7 +849202,7 @@ sub_81AE238: @ 81AE238 lsrs r0, 24 lsls r1, 24 lsrs r1, 21 - ldr r3, _081AE264 + ldr r3, =0x086141ac adds r1, r3 movs r3, 0x2 str r3, [sp] @@ -879216,7 +849218,7 @@ sub_81AE238: @ 81AE238 pop {r0} bx r0 .align 2, 0 -_081AE264: .4byte 0x086141ac + .pool thumb_func_end sub_81AE238 thumb_func_start sub_81AE268 @@ -879227,7 +849229,7 @@ sub_81AE268: @ 81AE268 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081AE2A0 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 lsls r1, 3 @@ -879245,7 +849247,7 @@ sub_81AE268: @ 81AE268 pop {r0} bx r0 .align 2, 0 -_081AE2A0: .4byte 0x03005d8c + .pool thumb_func_end sub_81AE268 thumb_func_start sub_81AE2A4 @@ -879320,7 +849322,7 @@ _081AE31A: movs r0, 0x4 str r0, [sp, 0x10] movs r1, 0x1 - ldr r2, _081AE350 + ldr r2, =0x085e8d45 movs r3, 0x7 bl sub_81AE0BC adds r0, r4, 0x1 @@ -879333,13 +849335,13 @@ _081AE31A: bl Window_CopyToVram b _081AE440 .align 2, 0 -_081AE350: .4byte 0x085e8d45 + .pool _081AE354: adds r0, r4, 0 bl sub_81B6CFC lsls r0, 16 lsrs r7, r0, 16 - ldr r1, _081AE384 + ldr r1, =0x0831c898 lsls r0, r7, 1 adds r0, r7 lsls r0, 2 @@ -879355,13 +849357,12 @@ _081AE354: ldrb r0, [r5, 0x1] cmp r0, 0x1 bhi _081AE38C - ldr r2, _081AE388 + ldr r2, =0x085e8d45 b _081AE39C .align 2, 0 -_081AE384: .4byte 0x0831c898 -_081AE388: .4byte 0x085e8d45 + .pool _081AE38C: - ldr r4, _081AE3CC + ldr r4, =0x02021cc4 ldrb r1, [r5, 0x1] adds r0, r4, 0 movs r2, 0x1 @@ -879381,7 +849382,7 @@ _081AE39C: movs r1, 0x1 movs r3, 0x7 bl sub_81AE0BC - ldr r2, _081AE3D0 + ldr r2, =0x0831c898 lsls r1, r7, 1 adds r0, r1, r7 lsls r0, 2 @@ -879390,14 +849391,12 @@ _081AE39C: adds r6, r1, 0 cmp r0, 0 bne _081AE3D8 - ldr r2, _081AE3D4 + ldr r2, =0x085e8d45 b _081AE3E8 .align 2, 0 -_081AE3CC: .4byte 0x02021cc4 -_081AE3D0: .4byte 0x0831c898 -_081AE3D4: .4byte 0x085e8d45 + .pool _081AE3D8: - ldr r4, _081AE450 + ldr r4, =0x02021cc4 ldrb r1, [r2, 0x3] adds r0, r4, 0 movs r2, 0x1 @@ -879419,8 +849418,8 @@ _081AE3E8: movs r1, 0x1 movs r3, 0x7 bl sub_81AE0BC - ldr r5, _081AE450 - ldr r1, _081AE454 + ldr r5, =0x02021cc4 + ldr r1, =0x0831c898 adds r0, r6, r7 lsls r0, 2 adds r0, r1 @@ -879454,8 +849453,7 @@ _081AE440: pop {r0} bx r0 .align 2, 0 -_081AE450: .4byte 0x02021cc4 -_081AE454: .4byte 0x0831c898 + .pool thumb_func_end sub_81AE2FC thumb_func_start nullsub_125 @@ -879484,7 +849482,7 @@ sub_81AE45C: @ 81AE45C mov r8, r0 lsrs r0, 16 mov r9, r0 - ldr r5, _081AE4EC + ldr r5, =0x0203ce84 ldrb r4, [r5, 0x4] cmp r4, 0x1 beq _081AE4F4 @@ -879515,14 +849513,14 @@ _081AE4B0: ldr r1, [sp, 0x4] bl sub_8098858 _081AE4C0: - ldr r0, _081AE4F0 + ldr r0, =0x03006310 adds r2, r0, 0 ldr r1, [sp] ldm r1!, {r3-r5} stm r2!, {r3-r5} ldm r1!, {r3-r5} stm r2!, {r3-r5} - ldr r4, _081AE4EC + ldr r4, =0x0203ce84 ldrb r1, [r4, 0x5] strb r1, [r0, 0x10] movs r1, 0 @@ -879536,13 +849534,12 @@ _081AE4C0: strb r0, [r4, 0x4] b _081AE570 .align 2, 0 -_081AE4EC: .4byte 0x0203ce84 -_081AE4F0: .4byte 0x03006310 + .pool _081AE4F4: ldrb r0, [r5, 0x6] bl sub_81AE604 str r0, [r5] - ldr r1, _081AE530 + ldr r1, =0x030022c0 ldrh r0, [r1, 0x2E] ands r4, r0 cmp r4, 0 @@ -879570,7 +849567,7 @@ _081AE51E: bl Window_FillTileMap b _081AE546 .align 2, 0 -_081AE530: .4byte 0x030022c0 + .pool _081AE534: mov r4, r10 cmp r4, 0 @@ -879581,13 +849578,13 @@ _081AE534: movs r1, 0 bl sub_819746C _081AE546: - ldr r0, _081AE554 + ldr r0, =0x0203ce84 ldrb r0, [r0, 0x5] movs r1, 0x1 bl Window_CopyToVram b _081AE570 .align 2, 0 -_081AE554: .4byte 0x0203ce84 + .pool _081AE558: ldrb r0, [r5, 0x6] movs r1, 0 @@ -879688,9 +849685,9 @@ sub_81AE604: @ 81AE604 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081AE630 + ldr r0, =0x03005e08 adds r3, r1, r0 - ldr r2, _081AE634 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 @@ -879705,8 +849702,7 @@ sub_81AE604: @ 81AE604 ldr r0, [r0, 0x4] b _081AE6C2 .align 2, 0 -_081AE630: .4byte 0x03005e08 -_081AE634: .4byte 0x030022c0 + .pool _081AE638: movs r0, 0x2 ands r0, r1 @@ -879803,7 +849799,7 @@ sub_81AE6C8: @ 81AE6C8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _081AE708 + ldr r1, =0x03005e08 adds r1, r0, r1 cmp r3, 0 beq _081AE6E4 @@ -879829,7 +849825,7 @@ _081AE6FC: pop {r0} bx r0 .align 2, 0 -_081AE708: .4byte 0x03005e08 + .pool thumb_func_end sub_81AE6C8 thumb_func_start sub_81AE70C @@ -879840,7 +849836,7 @@ sub_81AE70C: @ 81AE70C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081AE74C + ldr r0, =0x03005e08 adds r4, r0 ldrb r0, [r4, 0x10] ldrb r2, [r4, 0x15] @@ -879863,7 +849859,7 @@ sub_81AE70C: @ 81AE70C pop {r0} bx r0 .align 2, 0 -_081AE74C: .4byte 0x03005e08 + .pool thumb_func_end sub_81AE70C thumb_func_start sub_81AE750 @@ -879878,7 +849874,7 @@ sub_81AE750: @ 81AE750 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081AE790 + ldr r0, =0x03005e08 adds r4, r0 lsrs r1, 20 ldrb r6, [r4, 0x14] @@ -879901,7 +849897,7 @@ sub_81AE750: @ 81AE750 pop {r0} bx r0 .align 2, 0 -_081AE790: .4byte 0x03005e08 + .pool thumb_func_end sub_81AE750 thumb_func_start sub_81AE794 @@ -879918,7 +849914,7 @@ sub_81AE794: @ 81AE794 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081AE7CC + ldr r0, =0x03005e08 adds r4, r0 ldrb r0, [r4, 0x10] movs r1, 0x1 @@ -879932,7 +849928,7 @@ sub_81AE794: @ 81AE794 pop {r0} bx r0 .align 2, 0 -_081AE7CC: .4byte 0x03005e08 + .pool thumb_func_end sub_81AE794 thumb_func_start sub_81AE7D0 @@ -880001,7 +849997,7 @@ sub_81AE838: @ 81AE838 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081AE85C + ldr r0, =0x03005e08 adds r1, r0 cmp r2, 0 beq _081AE856 @@ -880013,7 +850009,7 @@ _081AE856: pop {r0} bx r0 .align 2, 0 -_081AE85C: .4byte 0x03005e08 + .pool thumb_func_end sub_81AE838 thumb_func_start get_coro_args_x18_x1A @@ -880025,7 +850021,7 @@ get_coro_args_x18_x1A: @ 81AE860 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081AE888 + ldr r0, =0x03005e08 adds r1, r0 cmp r3, 0 beq _081AE87A @@ -880040,7 +850036,7 @@ _081AE882: pop {r0} bx r0 .align 2, 0 -_081AE888: .4byte 0x03005e08 + .pool thumb_func_end get_coro_args_x18_x1A thumb_func_start sub_81AE88C @@ -880051,7 +850047,7 @@ sub_81AE88C: @ 81AE88C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081AE8D0 + ldr r0, =0x03005e08 adds r4, r0 ldrb r0, [r4, 0x17] lsls r0, 26 @@ -880078,7 +850074,7 @@ sub_81AE88C: @ 81AE88C pop {r1} bx r1 .align 2, 0 -_081AE8D0: .4byte 0x03005e08 + .pool thumb_func_end sub_81AE88C thumb_func_start calls_per_item_funcs_in_list @@ -880093,7 +850089,7 @@ calls_per_item_funcs_in_list: @ 81AE8D4 lsrs r5, 16 lsls r6, 16 lsrs r6, 16 - ldr r0, _081AE9A4 + ldr r0, =nullsub_125 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -880102,7 +850098,7 @@ calls_per_item_funcs_in_list: @ 81AE8D4 lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _081AE9A8 + ldr r1, =0x03005e08 adds r7, r0, r1 adds r0, r7, 0 ldm r4!, {r1-r3} @@ -880117,7 +850113,7 @@ calls_per_item_funcs_in_list: @ 81AE8D4 movs r0, 0xFF strb r0, [r7, 0x1E] strb r1, [r7, 0x1F] - ldr r3, _081AE9AC + ldr r3, =0x03006300 ldrb r1, [r7, 0x14] movs r5, 0xF lsrs r1, 4 @@ -880145,7 +850141,7 @@ calls_per_item_funcs_in_list: @ 81AE8D4 lsls r1, 29 lsrs r1, 17 ldr r0, [r3] - ldr r2, _081AE9B0 + ldr r2, =0xfffc0fff ands r0, r2 orrs r0, r1 str r0, [r3] @@ -880183,10 +850179,7 @@ _081AE96C: pop {r1} bx r1 .align 2, 0 -_081AE9A4: .4byte nullsub_125 + 1 -_081AE9A8: .4byte 0x03005e08 -_081AE9AC: .4byte 0x03006300 -_081AE9B0: .4byte 0xfffc0fff + .pool thumb_func_end calls_per_item_funcs_in_list thumb_func_start sub_81AE9B4 @@ -880200,7 +850193,7 @@ sub_81AE9B4: @ 81AE9B4 lsls r3, 24 lsrs r3, 24 mov r12, r3 - ldr r5, _081AEA1C + ldr r5, =0x03006300 ldrb r1, [r5, 0x3] movs r0, 0x80 ands r0, r1 @@ -880242,7 +850235,7 @@ sub_81AE9B4: @ 81AE9B4 strb r0, [r5, 0x3] b _081AEA5E .align 2, 0 -_081AEA1C: .4byte 0x03006300 + .pool _081AEA20: add r2, sp, 0x14 ldrb r1, [r4, 0x15] @@ -880422,14 +850415,14 @@ _081AEB66: beq _081AEBCC b _081AEC0C _081AEB70: - ldr r1, _081AEB80 + ldr r1, =0x085e8d60 adds r0, r6, 0 mov r2, r8 adds r3, r7, 0 bl sub_81AE9B4 b _081AEC0C .align 2, 0 -_081AEB80: .4byte 0x085e8d60 + .pool _081AEB84: ldrb r0, [r6, 0x1E] cmp r0, 0xFF @@ -880445,7 +850438,7 @@ _081AEB94: bl Window_GetField adds r4, r0, 0 lsls r4, 19 - ldr r0, _081AEBC8 + ldr r0, =0xffff0000 adds r4, r0 lsrs r4, 16 ldrb r0, [r6, 0x10] @@ -880463,7 +850456,7 @@ _081AEB94: bl sub_81AF69C b _081AEC0C .align 2, 0 -_081AEBC8: .4byte 0xffff0000 + .pool _081AEBCC: ldrb r0, [r6, 0x1E] cmp r0, 0xFF @@ -880533,7 +850526,7 @@ sub_81AEC18: @ 81AEC18 movs r0, 0x80 lsls r0, 7 strh r0, [r1, 0x6] - ldr r0, _081AEC74 + ldr r0, =0x0000ffff strh r0, [r1, 0x8] movs r0, 0xF strb r0, [r1, 0xA] @@ -880547,7 +850540,7 @@ sub_81AEC18: @ 81AEC18 pop {r1} bx r1 .align 2, 0 -_081AEC74: .4byte 0x0000ffff + .pool thumb_func_end sub_81AEC18 thumb_func_start sub_81AEC78 @@ -881055,7 +851048,7 @@ sub_81AF028: @ 81AF028 lsls r1, 24 lsls r2, 24 lsrs r2, 24 - ldr r6, _081AF074 + ldr r6, =0x03006300 movs r5, 0xF ands r0, r5 ldrb r3, [r6] @@ -881085,7 +851078,7 @@ sub_81AF028: @ 81AF028 pop {r0} bx r0 .align 2, 0 -_081AF074: .4byte 0x03006300 + .pool thumb_func_end sub_81AF028 thumb_func_start sub_81AF078 @@ -881111,18 +851104,17 @@ sub_81AF08C: @ 81AF08C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081AF0B0 + ldr r0, =0x03005e08 adds r2, r1, r0 cmp r3, 0x10 bhi _081AF154 lsls r0, r3, 2 - ldr r1, _081AF0B4 + ldr r1, =_081AF0B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081AF0B0: .4byte 0x03005e08 -_081AF0B4: .4byte _081AF0B8 + .pool .align 2, 0 _081AF0B8: .4byte _081AF0FC @@ -881221,18 +851213,17 @@ sub_81AF15C: @ 81AF15C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081AF180 + ldr r0, =0x03005e08 adds r3, r1, r0 cmp r4, 0x10 bhi _081AF25C lsls r0, r4, 2 - ldr r1, _081AF184 + ldr r1, =_081AF188 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081AF180: .4byte 0x03005e08 -_081AF184: .4byte _081AF188 + .pool .align 2, 0 _081AF188: .4byte _081AF1CC @@ -881383,7 +851374,7 @@ _081AF28A: _081AF29A: movs r0, 0x34 ldrsh r3, [r4, r0] - ldr r1, _081AF2BC + ldr r1, =0x08329f40 ldrh r2, [r4, 0x38] lsls r0, r2, 24 lsrs r0, 23 @@ -881399,11 +851390,11 @@ _081AF2B4: strh r0, [r4, 0x24] b _081AF2DE .align 2, 0 -_081AF2BC: .4byte 0x08329f40 + .pool _081AF2C0: movs r0, 0x34 ldrsh r3, [r4, r0] - ldr r1, _081AF2EC + ldr r1, =0x08329f40 ldrh r2, [r4, 0x38] lsls r0, r2, 24 lsrs r0, 23 @@ -881426,7 +851417,7 @@ _081AF2E4: pop {r0} bx r0 .align 2, 0 -_081AF2EC: .4byte 0x08329f40 + .pool thumb_func_end sub_81AF264 thumb_func_start sub_81AF2F0 @@ -881448,7 +851439,7 @@ sub_81AF2F0: @ 81AF2F0 lsrs r5, 16 mov r12, r5 mov r4, sp - ldr r0, _081AF374 + ldr r0, =0x08614244 ldm r0!, {r5-r7} stm r4!, {r5-r7} ldm r0!, {r5-r7} @@ -881462,7 +851453,7 @@ sub_81AF2F0: @ 81AF2F0 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _081AF378 + ldr r1, =0x02020630 lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -881474,7 +851465,7 @@ sub_81AF2F0: @ 81AF2F0 orrs r1, r2 strb r1, [r5] strh r4, [r3, 0x2E] - ldr r1, _081AF37C + ldr r1, =0x086141fc mov r5, r8 lsls r6, r5, 2 adds r6, r1 @@ -881496,9 +851487,7 @@ sub_81AF2F0: @ 81AF2F0 pop {r1} bx r1 .align 2, 0 -_081AF374: .4byte 0x08614244 -_081AF378: .4byte 0x02020630 -_081AF37C: .4byte 0x086141fc + .pool thumb_func_end sub_81AF2F0 thumb_func_start sub_81AF380 @@ -881510,9 +851499,9 @@ sub_81AF380: @ 81AF380 sub sp, 0x14 adds r6, r0, 0 mov r9, r1 - ldr r0, _081AF3CC + ldr r0, =0x086142c8 str r0, [sp, 0x4] - ldr r5, _081AF3D0 + ldr r5, =0xffff0000 ldr r0, [sp, 0x8] ands r0, r5 movs r1, 0x80 @@ -881520,7 +851509,7 @@ sub_81AF380: @ 81AF380 orrs r0, r1 ldrh r1, [r6, 0xA] lsls r1, 16 - ldr r4, _081AF3D4 + ldr r4, =0x0000ffff ands r0, r4 orrs r0, r1 str r0, [sp, 0x8] @@ -881529,7 +851518,7 @@ sub_81AF380: @ 81AF380 ldrh r2, [r6, 0xC] cmp r2, r4 bne _081AF3DC - ldr r0, _081AF3D8 + ldr r0, =0x086142a8 ldrb r1, [r6, 0xE] lsls r1, 20 movs r2, 0x80 @@ -881540,12 +851529,9 @@ sub_81AF380: @ 81AF380 bl gpu_pal_apply b _081AF3EE .align 2, 0 -_081AF3CC: .4byte 0x086142c8 -_081AF3D0: .4byte 0xffff0000 -_081AF3D4: .4byte 0x0000ffff -_081AF3D8: .4byte 0x086142a8 + .pool _081AF3DC: - ldr r0, _081AF48C + ldr r0, =0x086142a8 str r0, [sp, 0xC] add r0, sp, 0xC ldr r1, [r0, 0x4] @@ -881554,7 +851540,7 @@ _081AF3DC: str r1, [r0, 0x4] bl gpu_pal_obj_alloc_tag_and_apply _081AF3EE: - ldr r0, _081AF490 + ldr r0, =sub_81AF504 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -881563,7 +851549,7 @@ _081AF3EE: lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _081AF494 + ldr r1, =0x03005e08 adds r7, r0, r1 movs r0, 0 strb r0, [r7] @@ -881594,10 +851580,10 @@ _081AF3EE: bl sub_81AF2F0 strb r0, [r7, 0xD] ldrh r1, [r6, 0xC] - ldr r0, _081AF498 + ldr r0, =0x0000ffff cmp r1, r0 bne _081AF47C - ldr r5, _081AF49C + ldr r5, =0x02020630 ldrb r0, [r7, 0xC] lsls r1, r0, 4 adds r1, r0 @@ -881632,11 +851618,7 @@ _081AF47C: pop {r1} bx r1 .align 2, 0 -_081AF48C: .4byte 0x086142a8 -_081AF490: .4byte sub_81AF504 + 1 -_081AF494: .4byte 0x03005e08 -_081AF498: .4byte 0x0000ffff -_081AF49C: .4byte 0x02020630 + .pool thumb_func_end sub_81AF380 thumb_func_start sub_81AF4A0 @@ -881646,7 +851628,7 @@ sub_81AF4A0: @ 81AF4A0 subs r0, 0x2 cmp r0, 0x1 bhi _081AF4C4 - ldr r0, _081AF4C0 + ldr r0, =0x0203ce8c movs r1, 0x2 strb r1, [r0] strb r4, [r0, 0x1] @@ -881657,9 +851639,9 @@ sub_81AF4A0: @ 81AF4A0 strb r3, [r0, 0x5] b _081AF4D6 .align 2, 0 -_081AF4C0: .4byte 0x0203ce8c + .pool _081AF4C4: - ldr r0, _081AF500 + ldr r0, =0x0203ce8c movs r1, 0 strb r1, [r0] strb r2, [r0, 0x1] @@ -881689,7 +851671,7 @@ _081AF4D6: pop {r1} bx r1 .align 2, 0 -_081AF500: .4byte 0x0203ce8c + .pool thumb_func_end sub_81AF4A0 thumb_func_start sub_81AF504 @@ -881700,17 +851682,17 @@ sub_81AF504: @ 81AF504 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081AF53C + ldr r0, =0x03005e08 adds r4, r1, r0 ldr r0, [r4, 0x4] ldrh r5, [r0] ldrh r0, [r4, 0x8] cmp r5, r0 bne _081AF548 - ldr r0, _081AF540 + ldr r0, =0x0000ffff cmp r5, r0 beq _081AF548 - ldr r3, _081AF544 + ldr r3, =0x02020630 ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -881722,11 +851704,9 @@ sub_81AF504: @ 81AF504 orrs r1, r2 b _081AF55E .align 2, 0 -_081AF53C: .4byte 0x03005e08 -_081AF540: .4byte 0x0000ffff -_081AF544: .4byte 0x02020630 + .pool _081AF548: - ldr r3, _081AF57C + ldr r3, =0x02020630 ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -881753,7 +851733,7 @@ _081AF55E: orrs r1, r2 b _081AF594 .align 2, 0 -_081AF57C: .4byte 0x02020630 + .pool _081AF580: ldrb r1, [r4, 0xD] lsls r0, r1, 4 @@ -881780,13 +851760,13 @@ sub_81AF59C: @ 81AF59C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081AF5E0 + ldr r0, =0x03005e08 adds r4, r1, r0 movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0 beq _081AF5E8 - ldr r3, _081AF5E4 + ldr r3, =0x02020630 ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -881809,10 +851789,9 @@ sub_81AF59C: @ 81AF59C orrs r1, r2 b _081AF612 .align 2, 0 -_081AF5E0: .4byte 0x03005e08 -_081AF5E4: .4byte 0x02020630 + .pool _081AF5E8: - ldr r3, _081AF61C + ldr r3, =0x02020630 ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -881839,7 +851818,7 @@ _081AF612: pop {r0} bx r0 .align 2, 0 -_081AF61C: .4byte 0x02020630 + .pool thumb_func_end sub_81AF59C thumb_func_start sub_81AF620 @@ -881851,10 +851830,10 @@ sub_81AF620: @ 81AF620 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081AF674 + ldr r1, =0x03005e08 adds r5, r0, r1 ldrh r0, [r5, 0xE] - ldr r4, _081AF678 + ldr r4, =0x0000ffff cmp r0, r4 beq _081AF63E bl gpu_tile_obj_free_by_tag @@ -881868,7 +851847,7 @@ _081AF648: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _081AF67C + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles ldrb r1, [r5, 0xD] @@ -881883,9 +851862,7 @@ _081AF648: pop {r0} bx r0 .align 2, 0 -_081AF674: .4byte 0x03005e08 -_081AF678: .4byte 0x0000ffff -_081AF67C: .4byte 0x02020630 + .pool thumb_func_end sub_81AF620 thumb_func_start sub_81AF680 @@ -882009,27 +851986,27 @@ sub_81AF724: @ 81AF724 lsls r1, 16 lsrs r1, 16 mov r9, r1 - ldr r0, _081AF808 + ldr r0, =0x0861425c ldr r0, [r0] str r0, [r3] movs r1, 0x88 strb r1, [r3] strb r1, [r3, 0x1] - ldr r0, _081AF80C + ldr r0, =0x08614260 ldr r0, [r0] str r0, [r3, 0x4] mov r2, r8 adds r2, 0x80 strb r2, [r3, 0x4] strb r1, [r3, 0x5] - ldr r0, _081AF810 + ldr r0, =0x08614274 ldr r0, [r0] str r0, [r3, 0x8] strb r1, [r3, 0x8] mov r4, r9 adds r4, 0x80 strb r4, [r3, 0x9] - ldr r0, _081AF814 + ldr r0, =0x08614278 ldr r0, [r0] str r0, [r3, 0xC] strb r2, [r3, 0xC] @@ -882044,10 +852021,10 @@ sub_81AF724: @ 81AF724 subs r5, 0x8 cmp r2, r5 bge _081AF7B8 - ldr r0, _081AF818 + ldr r0, =0x08614264 ldr r0, [r0] str r0, [sp] - ldr r0, _081AF81C + ldr r0, =0x08614270 ldr r6, [r0] adds r1, r3, 0 adds r1, 0x10 @@ -882080,9 +852057,9 @@ _081AF7B8: subs r4, 0x8 cmp r1, r4 bge _081AF7F6 - ldr r0, _081AF820 + ldr r0, =0x08614268 ldr r6, [r0] - ldr r0, _081AF824 + ldr r0, =0x0861426c ldr r5, [r0] mov r7, r12 lsls r0, r7, 2 @@ -882114,14 +852091,7 @@ _081AF7F6: pop {r0} bx r0 .align 2, 0 -_081AF808: .4byte 0x0861425c -_081AF80C: .4byte 0x08614260 -_081AF810: .4byte 0x08614274 -_081AF814: .4byte 0x08614278 -_081AF818: .4byte 0x08614264 -_081AF81C: .4byte 0x08614270 -_081AF820: .4byte 0x08614268 -_081AF824: .4byte 0x0861426c + .pool thumb_func_end sub_81AF724 thumb_func_start sub_81AF828 @@ -882131,9 +852101,9 @@ sub_81AF828: @ 81AF828 push {r7} sub sp, 0x28 adds r6, r0, 0 - ldr r0, _081AF874 + ldr r0, =0x08614338 str r0, [sp, 0x18] - ldr r5, _081AF878 + ldr r5, =0xffff0000 add r0, sp, 0x18 ldr r1, [r0, 0x4] ands r1, r5 @@ -882142,16 +852112,16 @@ sub_81AF828: @ 81AF828 orrs r1, r2 ldrh r2, [r6, 0x6] lsls r2, 16 - ldr r3, _081AF87C + ldr r3, =0x0000ffff ands r1, r3 orrs r1, r2 str r1, [r0, 0x4] bl gpu_tile_obj_decompress_and_load ldrh r2, [r6, 0x8] - ldr r7, _081AF87C + ldr r7, =0x0000ffff cmp r2, r7 bne _081AF884 - ldr r0, _081AF880 + ldr r0, =0x086142a8 ldrb r1, [r6, 0xA] lsls r1, 20 movs r2, 0x80 @@ -882162,12 +852132,9 @@ sub_81AF828: @ 81AF828 bl gpu_pal_apply b _081AF896 .align 2, 0 -_081AF874: .4byte 0x08614338 -_081AF878: .4byte 0xffff0000 -_081AF87C: .4byte 0x0000ffff -_081AF880: .4byte 0x086142a8 + .pool _081AF884: - ldr r0, _081AF97C + ldr r0, =0x086142a8 str r0, [sp, 0x20] add r0, sp, 0x20 ldr r1, [r0, 0x4] @@ -882176,7 +852143,7 @@ _081AF884: str r1, [r0, 0x4] bl gpu_pal_obj_alloc_tag_and_apply _081AF896: - ldr r0, _081AF980 + ldr r0, =nullsub_126 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -882185,7 +852152,7 @@ _081AF896: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _081AF984 + ldr r1, =0x03005e08 adds r5, r0, r1 ldrh r0, [r6, 0x6] movs r3, 0 @@ -882207,7 +852174,7 @@ _081AF896: ldrh r1, [r6, 0x4] bl sub_81AF724 mov r1, sp - ldr r0, _081AF988 + ldr r0, =0x082ec6ac ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -882229,7 +852196,7 @@ _081AF896: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r7, _081AF98C + ldr r7, =0x02020630 adds r0, r7 adds r1, r5, 0 bl obj_set_f18_to_r0_f42_to_40 @@ -882263,7 +852230,7 @@ _081AF896: ands r1, r2 strb r1, [r0] ldrh r1, [r6, 0x8] - ldr r0, _081AF990 + ldr r0, =0x0000ffff cmp r1, r0 bne _081AF96E ldrb r0, [r5, 0xC] @@ -882287,12 +852254,7 @@ _081AF96E: pop {r1} bx r1 .align 2, 0 -_081AF97C: .4byte 0x086142a8 -_081AF980: .4byte nullsub_126 + 1 -_081AF984: .4byte 0x03005e08 -_081AF988: .4byte 0x082ec6ac -_081AF98C: .4byte 0x02020630 -_081AF990: .4byte 0x0000ffff + .pool thumb_func_end sub_81AF828 thumb_func_start sub_81AF994 @@ -882307,9 +852269,9 @@ sub_81AF994: @ 81AF994 lsls r3, r0, 2 adds r3, r0 lsls r3, 3 - ldr r0, _081AF9D0 + ldr r0, =0x03005e08 adds r3, r0 - ldr r5, _081AF9D4 + ldr r5, =0x02020630 ldrb r4, [r3, 0xC] lsls r0, r4, 4 adds r0, r4 @@ -882328,8 +852290,7 @@ sub_81AF994: @ 81AF994 pop {r0} bx r0 .align 2, 0 -_081AF9D0: .4byte 0x03005e08 -_081AF9D4: .4byte 0x02020630 + .pool thumb_func_end sub_81AF994 thumb_func_start sub_81AF9D8 @@ -882341,12 +852302,12 @@ sub_81AF9D8: @ 81AF9D8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081AFA24 + ldr r1, =0x03005e08 adds r4, r0, r1 ldr r0, [r4, 0x8] bl free ldrh r0, [r4, 0xE] - ldr r6, _081AFA28 + ldr r6, =0x0000ffff cmp r0, r6 beq _081AF9FC bl gpu_tile_obj_free_by_tag @@ -882360,7 +852321,7 @@ _081AFA06: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081AFA2C + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r5, 0 @@ -882369,16 +852330,14 @@ _081AFA06: pop {r0} bx r0 .align 2, 0 -_081AFA24: .4byte 0x03005e08 -_081AFA28: .4byte 0x0000ffff -_081AFA2C: .4byte 0x02020630 + .pool thumb_func_end sub_81AF9D8 thumb_func_start sub_81AFA30 sub_81AFA30: @ 81AFA30 push {lr} adds r2, r0, 0 - ldr r1, _081AFA58 + ldr r1, =0x08329f40 ldrh r3, [r2, 0x2E] lsls r0, r3, 24 lsrs r0, 23 @@ -882397,7 +852356,7 @@ _081AFA48: pop {r0} bx r0 .align 2, 0 -_081AFA58: .4byte 0x08329f40 + .pool thumb_func_end sub_81AFA30 thumb_func_start nullsub_127 @@ -882410,9 +852369,9 @@ sub_81AFA60: @ 81AFA60 push {r4-r7,lr} sub sp, 0x28 adds r5, r0, 0 - ldr r0, _081AFAA4 + ldr r0, =0x08614378 str r0, [sp, 0x18] - ldr r6, _081AFAA8 + ldr r6, =0xffff0000 add r0, sp, 0x18 ldr r1, [r0, 0x4] ands r1, r6 @@ -882420,7 +852379,7 @@ sub_81AFA60: @ 81AFA60 orrs r1, r2 ldrh r2, [r5, 0x6] lsls r2, 16 - ldr r4, _081AFAAC + ldr r4, =0x0000ffff ands r1, r4 orrs r1, r2 str r1, [r0, 0x4] @@ -882428,7 +852387,7 @@ sub_81AFA60: @ 81AFA60 ldrh r2, [r5, 0x8] cmp r2, r4 bne _081AFAB4 - ldr r0, _081AFAB0 + ldr r0, =0x086142a8 ldrb r1, [r5, 0xA] lsls r1, 20 movs r2, 0x80 @@ -882439,12 +852398,9 @@ sub_81AFA60: @ 81AFA60 bl gpu_pal_apply b _081AFAC6 .align 2, 0 -_081AFAA4: .4byte 0x08614378 -_081AFAA8: .4byte 0xffff0000 -_081AFAAC: .4byte 0x0000ffff -_081AFAB0: .4byte 0x086142a8 + .pool _081AFAB4: - ldr r0, _081AFB50 + ldr r0, =0x086142a8 str r0, [sp, 0x20] add r0, sp, 0x20 ldr r1, [r0, 0x4] @@ -882453,7 +852409,7 @@ _081AFAB4: str r1, [r0, 0x4] bl gpu_pal_obj_alloc_tag_and_apply _081AFAC6: - ldr r0, _081AFB54 + ldr r0, =nullsub_127 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -882462,14 +852418,14 @@ _081AFAC6: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081AFB58 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r5, 0x6] strh r0, [r4, 0x2] ldrh r0, [r5, 0x8] strh r0, [r4, 0x4] mov r1, sp - ldr r0, _081AFB5C + ldr r0, =0x08614290 ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -882485,7 +852441,7 @@ _081AFAC6: movs r3, 0 bl obj_add_from_template_forward_search strb r0, [r4] - ldr r3, _081AFB60 + ldr r3, =0x02020630 ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -882500,7 +852456,7 @@ _081AFAC6: adds r0, r3 strh r2, [r0, 0x26] ldrh r1, [r5, 0x8] - ldr r0, _081AFB64 + ldr r0, =0x0000ffff cmp r1, r0 bne _081AFB46 ldrb r0, [r4] @@ -882522,12 +852478,7 @@ _081AFB46: pop {r1} bx r1 .align 2, 0 -_081AFB50: .4byte 0x086142a8 -_081AFB54: .4byte nullsub_127 + 1 -_081AFB58: .4byte 0x03005e08 -_081AFB5C: .4byte 0x08614290 -_081AFB60: .4byte 0x02020630 -_081AFB64: .4byte 0x0000ffff + .pool thumb_func_end sub_81AFA60 thumb_func_start sub_81AFB68 @@ -882538,9 +852489,9 @@ sub_81AFB68: @ 81AFB68 lsls r3, r0, 2 adds r3, r0 lsls r3, 3 - ldr r0, _081AFB98 + ldr r0, =0x03005e08 adds r3, r0 - ldr r5, _081AFB9C + ldr r5, =0x02020630 ldrb r4, [r3] lsls r0, r4, 4 adds r0, r4 @@ -882557,8 +852508,7 @@ sub_81AFB68: @ 81AFB68 pop {r0} bx r0 .align 2, 0 -_081AFB98: .4byte 0x03005e08 -_081AFB9C: .4byte 0x02020630 + .pool thumb_func_end sub_81AFB68 thumb_func_start sub_81AFBA0 @@ -882570,10 +852520,10 @@ sub_81AFBA0: @ 81AFBA0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081AFBE4 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4, 0x2] - ldr r6, _081AFBE8 + ldr r6, =0x0000ffff cmp r0, r6 beq _081AFBBE bl gpu_tile_obj_free_by_tag @@ -882587,7 +852537,7 @@ _081AFBC8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081AFBEC + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r5, 0 @@ -882596,15 +852546,13 @@ _081AFBC8: pop {r0} bx r0 .align 2, 0 -_081AFBE4: .4byte 0x03005e08 -_081AFBE8: .4byte 0x0000ffff -_081AFBEC: .4byte 0x02020630 + .pool thumb_func_end sub_81AFBA0 thumb_func_start sub_81AFBF0 sub_81AFBF0: @ 81AFBF0 push {lr} - ldr r1, _081AFC08 + ldr r1, =0x0203ce9c movs r2, 0 adds r0, r1, 0 adds r0, 0x1C @@ -882616,7 +852564,7 @@ _081AFBFA: pop {r0} bx r0 .align 2, 0 -_081AFC08: .4byte 0x0203ce9c + .pool thumb_func_end sub_81AFBF0 thumb_func_start sub_81AFC0C @@ -882627,7 +852575,7 @@ sub_81AFC0C: @ 81AFC0C lsrs r0, 24 cmp r0, 0x7 bhi _081AFC20 - ldr r1, _081AFC24 + ldr r1, =0x0203ce9c lsls r0, 2 adds r0, r1 str r2, [r0] @@ -882635,7 +852583,7 @@ _081AFC20: pop {r0} bx r0 .align 2, 0 -_081AFC24: .4byte 0x0203ce9c + .pool thumb_func_end sub_81AFC0C thumb_func_start sub_81AFC28 @@ -882647,7 +852595,7 @@ sub_81AFC28: @ 81AFC28 adds r0, r1, 0 cmp r0, 0xFF beq _081AFC68 - ldr r5, _081AFC44 + ldr r5, =0x0203ce9c _081AFC38: cmp r1, 0xF7 beq _081AFC48 @@ -882656,7 +852604,7 @@ _081AFC38: adds r2, 0x1 b _081AFC60 .align 2, 0 -_081AFC44: .4byte 0x0203ce9c + .pool _081AFC48: adds r4, 0x1 ldrb r0, [r4] @@ -882687,20 +852635,20 @@ _081AFC68: thumb_func_start sub_81AFC74 sub_81AFC74: @ 81AFC74 lsls r0, 24 - ldr r1, _081AFC80 + ldr r1, =0x0203ce9c lsrs r0, 22 adds r0, r1 ldr r0, [r0] bx lr .align 2, 0 -_081AFC80: .4byte 0x0203ce9c + .pool thumb_func_end sub_81AFC74 thumb_func_start sav1_are_mapnumbers_in_given_list sav1_are_mapnumbers_in_given_list: @ 81AFC84 push {r4,lr} adds r2, r0, 0 - ldr r0, _081AFCB4 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -882712,7 +852660,7 @@ sav1_are_mapnumbers_in_given_list: @ 81AFC84 lsls r0, 16 lsrs r3, r0, 16 ldrh r0, [r2] - ldr r1, _081AFCB8 + ldr r1, =0x0000ffff cmp r0, r1 beq _081AFCC4 adds r4, r1, 0 @@ -882724,8 +852672,7 @@ _081AFCAA: movs r0, 0x1 b _081AFCC6 .align 2, 0 -_081AFCB4: .4byte 0x03005d8c -_081AFCB8: .4byte 0x0000ffff + .pool _081AFCBC: adds r1, 0x2 ldrh r0, [r1] @@ -882742,34 +852689,34 @@ _081AFCC6: thumb_func_start sav1_is_in_pokecenter sav1_is_in_pokecenter: @ 81AFCCC push {lr} - ldr r0, _081AFCD8 + ldr r0, =0x086143bc bl sav1_are_mapnumbers_in_given_list pop {r1} bx r1 .align 2, 0 -_081AFCD8: .4byte 0x086143bc + .pool thumb_func_end sav1_is_in_pokecenter thumb_func_start sub_81AFCDC sub_81AFCDC: @ 81AFCDC push {lr} - ldr r0, _081AFCE8 + ldr r0, =0x0861440a bl sav1_are_mapnumbers_in_given_list pop {r1} bx r1 .align 2, 0 -_081AFCE8: .4byte 0x0861440a + .pool thumb_func_end sub_81AFCDC thumb_func_start sub_81AFCEC sub_81AFCEC: @ 81AFCEC push {lr} - ldr r0, _081AFCF8 + ldr r0, =0x0861440e bl sav1_are_mapnumbers_in_given_list pop {r1} bx r1 .align 2, 0 -_081AFCF8: .4byte 0x0861440e + .pool thumb_func_end sub_81AFCEC thumb_func_start sav2_set_x9_bit3_when_sav1_in_pokecenter @@ -882778,16 +852725,16 @@ sav2_set_x9_bit3_when_sav1_in_pokecenter: @ 81AFCFC bl sav1_is_in_pokecenter cmp r0, 0 bne _081AFD18 - ldr r0, _081AFD14 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0xFD ands r0, r1 b _081AFD22 .align 2, 0 -_081AFD14: .4byte 0x03005d90 + .pool _081AFD18: - ldr r0, _081AFD28 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0x2 @@ -882797,7 +852744,7 @@ _081AFD22: pop {r0} bx r0 .align 2, 0 -_081AFD28: .4byte 0x03005d90 + .pool thumb_func_end sav2_set_x9_bit3_when_sav1_in_pokecenter thumb_func_start sub_81AFD2C @@ -882806,16 +852753,16 @@ sub_81AFD2C: @ 81AFD2C bl sub_81AFCDC cmp r0, 0 bne _081AFD48 - ldr r0, _081AFD44 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0xFB ands r0, r1 b _081AFD52 .align 2, 0 -_081AFD44: .4byte 0x03005d90 + .pool _081AFD48: - ldr r0, _081AFD58 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0x4 @@ -882825,7 +852772,7 @@ _081AFD52: pop {r0} bx r0 .align 2, 0 -_081AFD58: .4byte 0x03005d90 + .pool thumb_func_end sub_81AFD2C thumb_func_start sub_81AFD5C @@ -882834,16 +852781,16 @@ sub_81AFD5C: @ 81AFD5C bl sub_81AFCEC cmp r0, 0 bne _081AFD78 - ldr r0, _081AFD74 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0xF7 ands r0, r1 b _081AFD82 .align 2, 0 -_081AFD74: .4byte 0x03005d90 + .pool _081AFD78: - ldr r0, _081AFD88 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0x8 @@ -882853,7 +852800,7 @@ _081AFD82: pop {r0} bx r0 .align 2, 0 -_081AFD88: .4byte 0x03005d90 + .pool thumb_func_end sub_81AFD5C thumb_func_start sav2_set_x9_depending_on_sav1_map @@ -882868,7 +852815,7 @@ sav2_set_x9_depending_on_sav1_map: @ 81AFD8C thumb_func_start sub_81AFDA0 sub_81AFDA0: @ 81AFDA0 - ldr r0, _081AFDCC + ldr r0, =0x03005d90 ldr r2, [r0] adds r2, 0xA8 ldr r0, [r2] @@ -882890,12 +852837,12 @@ sub_81AFDA0: @ 81AFDA0 str r0, [r2] bx lr .align 2, 0 -_081AFDCC: .4byte 0x03005d90 + .pool thumb_func_end sub_81AFDA0 thumb_func_start sub_81AFDD0 sub_81AFDD0: @ 81AFDD0 - ldr r0, _081AFDE0 + ldr r0, =0x03005d90 ldr r2, [r0] ldrb r1, [r2, 0x9] movs r0, 0x80 @@ -882903,20 +852850,20 @@ sub_81AFDD0: @ 81AFDD0 strb r0, [r2, 0x9] bx lr .align 2, 0 -_081AFDE0: .4byte 0x03005d90 + .pool thumb_func_end sub_81AFDD0 thumb_func_start sub_81AFDE4 sub_81AFDE4: @ 81AFDE4 push {r4,r5,lr} - ldr r5, _081AFE0C + ldr r5, =0x0203cebc movs r0, 0x90 lsls r0, 1 bl malloc str r0, [r5] cmp r0, 0 beq _081AFE1A - ldr r4, _081AFE10 + ldr r4, =0x0203cec0 movs r0, 0x80 lsls r0, 2 bl malloc_and_clear @@ -882926,8 +852873,7 @@ sub_81AFDE4: @ 81AFDE4 movs r0, 0x1 b _081AFE1C .align 2, 0 -_081AFE0C: .4byte 0x0203cebc -_081AFE10: .4byte 0x0203cec0 + .pool _081AFE14: ldr r0, [r5] bl free @@ -882942,17 +852888,16 @@ _081AFE1C: thumb_func_start sub_81AFE24 sub_81AFE24: @ 81AFE24 push {lr} - ldr r0, _081AFE3C + ldr r0, =0x0203cebc ldr r0, [r0] bl free - ldr r0, _081AFE40 + ldr r0, =0x0203cec0 ldr r0, [r0] bl free pop {r0} bx r0 .align 2, 0 -_081AFE3C: .4byte 0x0203cebc -_081AFE40: .4byte 0x0203cec0 + .pool thumb_func_end sub_81AFE24 thumb_func_start sub_81AFE44 @@ -882997,23 +852942,23 @@ AddItemIconObject: @ 81AFE70 adds r0, r5, 0 movs r1, 0 bl GetItemIconPic - ldr r4, _081AFF14 + ldr r4, =0x0203cebc ldr r1, [r4] bl call_LZZUnCompWram ldr r0, [r4] - ldr r4, _081AFF18 + ldr r4, =0x0203cec0 ldr r1, [r4] bl sub_81AFE44 ldr r0, [r4] str r0, [sp] - ldr r4, _081AFF1C + ldr r4, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r4 movs r1, 0x80 lsls r1, 2 orrs r0, r1 lsls r2, r7, 16 - ldr r1, _081AFF20 + ldr r1, =0x0000ffff ands r0, r1 orrs r0, r2 str r0, [sp, 0x4] @@ -883032,7 +852977,7 @@ AddItemIconObject: @ 81AFE70 movs r0, 0x18 bl malloc adds r5, r0, 0 - ldr r0, _081AFF24 + ldr r0, =0x08614ff4 adds r1, r5, 0 movs r2, 0xC bl CpuSet @@ -883052,11 +852997,7 @@ AddItemIconObject: @ 81AFE70 adds r0, r4, 0 b _081AFF2A .align 2, 0 -_081AFF14: .4byte 0x0203cebc -_081AFF18: .4byte 0x0203cec0 -_081AFF1C: .4byte 0xffff0000 -_081AFF20: .4byte 0x0000ffff -_081AFF24: .4byte 0x08614ff4 + .pool _081AFF28: movs r0, 0x40 _081AFF2A: @@ -883086,23 +853027,23 @@ sub_81AFF34: @ 81AFF34 adds r0, r5, 0 movs r1, 0 bl GetItemIconPic - ldr r4, _081AFFDC + ldr r4, =0x0203cebc ldr r1, [r4] bl call_LZZUnCompWram ldr r0, [r4] - ldr r4, _081AFFE0 + ldr r4, =0x0203cec0 ldr r1, [r4] bl sub_81AFE44 ldr r0, [r4] str r0, [sp] - ldr r4, _081AFFE4 + ldr r4, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r4 movs r1, 0x80 lsls r1, 2 orrs r0, r1 lsls r2, r7, 16 - ldr r1, _081AFFE8 + ldr r1, =0x0000ffff ands r0, r1 orrs r0, r2 str r0, [sp, 0x4] @@ -883141,10 +853082,7 @@ sub_81AFF34: @ 81AFF34 adds r0, r4, 0 b _081AFFEE .align 2, 0 -_081AFFDC: .4byte 0x0203cebc -_081AFFE0: .4byte 0x0203cec0 -_081AFFE4: .4byte 0xffff0000 -_081AFFE8: .4byte 0x0000ffff + .pool _081AFFEC: movs r0, 0x40 _081AFFEE: @@ -883163,14 +853101,13 @@ GetItemIconPic: @ 81AFFFC lsrs r3, r0, 16 lsls r1, 24 lsrs r1, 24 - ldr r0, _081B0010 + ldr r0, =0x0000ffff cmp r3, r0 bne _081B0018 - ldr r3, _081B0014 + ldr r3, =0x00000179 b _081B0022 .align 2, 0 -_081B0010: .4byte 0x0000ffff -_081B0014: .4byte 0x00000179 + .pool _081B0018: movs r0, 0xBC lsls r0, 1 @@ -883178,7 +853115,7 @@ _081B0018: bls _081B0022 movs r3, 0 _081B0022: - ldr r2, _081B0034 + ldr r2, =0x08614410 lsls r0, r1, 2 lsls r1, r3, 3 adds r0, r1 @@ -883187,7 +853124,7 @@ _081B0022: pop {r1} bx r1 .align 2, 0 -_081B0034: .4byte 0x08614410 + .pool thumb_func_end GetItemIconPic thumb_func_start sub_81B0038 @@ -883213,7 +853150,7 @@ sub_81B0038: @ 81B0038 lsls r4, 24 lsrs r6, r4, 24 bl reset_brm - ldr r0, _081B0084 + ldr r0, =0x0203cec4 mov r10, r0 movs r0, 0x8E lsls r0, 2 @@ -883227,9 +853164,9 @@ sub_81B0038: @ 81B0038 bl set_callback2 b _081B0194 .align 2, 0 -_081B0084: .4byte 0x0203cec4 + .pool _081B0088: - ldr r3, _081B00EC + ldr r3, =0x0203cec8 movs r1, 0xF mov r4, r8 ands r1, r4 @@ -883279,7 +853216,7 @@ _081B0088: orrs r0, r1 b _081B00F8 .align 2, 0 -_081B00EC: .4byte 0x0203cec8 + .pool _081B00F0: ldrb r1, [r2, 0x8] movs r0, 0x2 @@ -883302,7 +853239,7 @@ _081B00F8: strb r1, [r6, 0x8] _081B0114: movs r2, 0 - ldr r5, _081B0158 + ldr r5, =0x0203cec4 movs r4, 0x86 lsls r4, 2 movs r3, 0 @@ -883318,7 +853255,7 @@ _081B011E: cmp r2, 0xF bls _081B011E movs r2, 0 - ldr r4, _081B0158 + ldr r4, =0x0203cec4 movs r3, 0xFF _081B0138: ldr r0, [r4] @@ -883338,7 +853275,7 @@ _081B0138: strb r4, [r6, 0x9] b _081B017E .align 2, 0 -_081B0158: .4byte 0x0203cec4 + .pool _081B015C: adds r1, r6, 0 movs r0, 0x9 @@ -883348,7 +853285,7 @@ _081B015C: adds r1, r0, 0 movs r0, 0x64 muls r0, r1 - ldr r1, _081B01A4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -883358,14 +853295,14 @@ _081B017A: movs r0, 0 strb r0, [r6, 0x9] _081B017E: - ldr r2, _081B01A8 + ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x5 negs r0, r0 ands r0, r1 strb r0, [r2] bl calc_player_party_count - ldr r0, _081B01AC + ldr r0, =c2_811EBD0 + 1 bl set_callback2 _081B0194: add sp, 0x4 @@ -883377,9 +853314,7 @@ _081B0194: pop {r0} bx r0 .align 2, 0 -_081B01A4: .4byte 0x020244ec -_081B01A8: .4byte 0x03003014 -_081B01AC: .4byte c2_811EBD0 + 1 + .pool thumb_func_end sub_81B0038 thumb_func_start sub_81B01B0 @@ -883432,7 +853367,7 @@ _081B0206: sub_81B020C: @ 81B020C push {r4,lr} sub sp, 0x4 - ldr r1, _081B022C + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r0, r1, r2 @@ -883443,13 +853378,12 @@ sub_81B020C: @ 81B020C b _081B0498 _081B0222: lsls r0, 2 - ldr r1, _081B0230 + ldr r1, =_081B0234 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081B022C: .4byte 0x030022c0 -_081B0230: .4byte _081B0234 + .pool .align 2, 0 _081B0234: .4byte _081B0290 @@ -883479,43 +853413,42 @@ _081B0290: bl vblank_hblank_handler_set_zero bl sub_8121DA0 bl clear_scheduled_bg_copies_to_vram - ldr r1, _081B02A8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081B048C .align 2, 0 -_081B02A8: .4byte 0x030022c0 + .pool _081B02AC: bl remove_some_task b _081B0484 _081B02B2: bl sub_80A1A74 - ldr r2, _081B02CC + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r1, _081B02D0 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081B048C .align 2, 0 -_081B02CC: .4byte 0x02037fd4 -_081B02D0: .4byte 0x030022c0 + .pool _081B02D4: bl reset_all_obj_data b _081B0484 _081B02DA: bl gpu_pal_allocator_reset - ldr r1, _081B02E8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081B048C .align 2, 0 -_081B02E8: .4byte 0x030022c0 + .pool _081B02EC: bl sub_81221AC lsls r0, 24 @@ -883527,13 +853460,13 @@ _081B02F8: b _081B0484 _081B02FE: bl sub_81B209C - ldr r1, _081B030C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081B048C .align 2, 0 -_081B030C: .4byte 0x030022c0 + .pool _081B0310: bl sub_81B0550 lsls r0, 24 @@ -883543,7 +853476,7 @@ _081B0310: movs r0, 0x1 b _081B04B2 _081B0322: - ldr r0, _081B0334 + ldr r0, =0x0203cec4 ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -883552,7 +853485,7 @@ _081B0322: strh r1, [r0] b _081B0484 .align 2, 0 -_081B0334: .4byte 0x0203cec4 + .pool _081B0338: bl sub_81B05C8 lsls r0, 24 @@ -883560,29 +853493,29 @@ _081B0338: bne _081B0344 b _081B04B0 _081B0344: - ldr r1, _081B0350 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081B048C .align 2, 0 -_081B0350: .4byte 0x030022c0 + .pool _081B0354: - ldr r0, _081B0364 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x8] lsls r0, 26 lsrs r0, 30 bl sub_81B239C b _081B0484 .align 2, 0 -_081B0364: .4byte 0x0203cec8 + .pool _081B0368: - ldr r0, _081B0384 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x8] lsls r0, 26 lsrs r0, 30 bl sub_81B0740 - ldr r0, _081B0388 + ldr r0, =0x0203cec4 ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -883591,29 +853524,28 @@ _081B0368: strh r1, [r0] b _081B0484 .align 2, 0 -_081B0384: .4byte 0x0203cec8 -_081B0388: .4byte 0x0203cec4 + .pool _081B038C: bl sub_81B5D30 - ldr r1, _081B039C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081B048C .align 2, 0 -_081B039C: .4byte 0x030022c0 + .pool _081B03A0: bl sub_81B6040 b _081B0484 _081B03A6: bl sub_81B6160 - ldr r1, _081B03B4 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081B048C .align 2, 0 -_081B03B4: .4byte 0x030022c0 + .pool _081B03B8: bl sub_80D2F04 b _081B0484 @@ -883624,7 +853556,7 @@ _081B03BE: bne _081B03CA b _081B04B0 _081B03CA: - ldr r0, _081B03DC + ldr r0, =0x0203cec4 ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -883633,13 +853565,13 @@ _081B03CA: strh r1, [r0] b _081B0484 .align 2, 0 -_081B03DC: .4byte 0x0203cec4 + .pool _081B03E0: bl sub_81B0DA0 lsls r0, 24 cmp r0, 0 beq _081B04B0 - ldr r0, _081B03FC + ldr r0, =0x0203cec4 ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -883648,18 +853580,18 @@ _081B03E0: strh r1, [r0] b _081B0484 .align 2, 0 -_081B03FC: .4byte 0x0203cec4 + .pool _081B0400: bl sub_81B0F28 - ldr r1, _081B0410 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081B048C .align 2, 0 -_081B0410: .4byte 0x030022c0 + .pool _081B0414: - ldr r0, _081B0424 + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -883667,14 +853599,14 @@ _081B0414: bl sub_81B2428 b _081B0484 .align 2, 0 -_081B0424: .4byte 0x0203cec4 + .pool _081B0428: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 b _081B048C _081B0430: - ldr r4, _081B0448 + ldr r4, =0x0203cec4 ldr r0, [r4] ldr r0, [r0] movs r1, 0 @@ -883685,26 +853617,25 @@ _081B0430: bl sub_81B3054 b _081B0484 .align 2, 0 -_081B0448: .4byte 0x0203cec4 + .pool _081B044C: movs r0, 0x1 negs r0, r0 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r2, _081B046C + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 strb r0, [r2, 0x8] - ldr r1, _081B0470 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081B048C .align 2, 0 -_081B046C: .4byte 0x02037fd4 -_081B0470: .4byte 0x030022c0 + .pool _081B0474: movs r0, 0x1 negs r0, r0 @@ -883714,7 +853645,7 @@ _081B0474: movs r3, 0 bl sub_80A1AD4 _081B0484: - ldr r1, _081B0494 + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -883724,17 +853655,16 @@ _081B048C: strb r0, [r1] b _081B04B0 .align 2, 0 -_081B0494: .4byte 0x030022c0 + .pool _081B0498: - ldr r0, _081B04A8 + ldr r0, =sub_81B01CC + 1 bl SetVBlankCallback - ldr r0, _081B04AC + ldr r0, =sub_81B01B0 + 1 bl set_callback2 movs r0, 0x1 b _081B04B2 .align 2, 0 -_081B04A8: .4byte sub_81B01CC + 1 -_081B04AC: .4byte sub_81B01B0 + 1 + .pool _081B04B0: movs r0, 0 _081B04B2: @@ -883755,20 +853685,18 @@ sub_81B04BC: @ 81B04BC movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r0, _081B04EC + ldr r0, =sub_81B04F8 + 1 movs r1, 0 bl AddTask - ldr r0, _081B04F0 + ldr r0, =sub_81B01CC + 1 bl SetVBlankCallback - ldr r0, _081B04F4 + ldr r0, =sub_81B01B0 + 1 bl set_callback2 add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_081B04EC: .4byte sub_81B04F8 + 1 -_081B04F0: .4byte sub_81B01CC + 1 -_081B04F4: .4byte sub_81B01B0 + 1 + .pool thumb_func_end sub_81B04BC thumb_func_start sub_81B04F8 @@ -883776,13 +853704,13 @@ sub_81B04F8: @ 81B04F8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081B0524 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081B051C - ldr r0, _081B0528 + ldr r0, =0x0203cec8 ldr r0, [r0] bl set_callback2 bl sub_81B06F4 @@ -883793,33 +853721,29 @@ _081B051C: pop {r0} bx r0 .align 2, 0 -_081B0524: .4byte 0x02037fd4 -_081B0528: .4byte 0x0203cec8 + .pool thumb_func_end sub_81B04F8 thumb_func_start reset_brm reset_brm: @ 81B052C - ldr r0, _081B0540 + ldr r0, =0x0203cec4 movs r1, 0 str r1, [r0] - ldr r0, _081B0544 + ldr r0, =0x0203cee4 str r1, [r0] - ldr r0, _081B0548 + ldr r0, =0x0203cedc str r1, [r0] - ldr r0, _081B054C + ldr r0, =0x0203cee0 str r1, [r0] bx lr .align 2, 0 -_081B0540: .4byte 0x0203cec4 -_081B0544: .4byte 0x0203cee4 -_081B0548: .4byte 0x0203cedc -_081B054C: .4byte 0x0203cee0 + .pool thumb_func_end reset_brm thumb_func_start sub_81B0550 sub_81B0550: @ 81B0550 push {r4,r5,lr} - ldr r5, _081B05B8 + ldr r5, =0x0203cee4 movs r4, 0x80 lsls r4, 4 adds r0, r4, 0 @@ -883832,7 +853756,7 @@ sub_81B0550: @ 81B0550 bl memset movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081B05BC + ldr r1, =0x086156b8 movs r0, 0 movs r2, 0x3 bl bg_vram_setup @@ -883858,8 +853782,7 @@ sub_81B0550: @ 81B0550 movs r0, 0x1 b _081B05C2 .align 2, 0 -_081B05B8: .4byte 0x0203cee4 -_081B05BC: .4byte 0x086156b8 + .pool _081B05C0: movs r0, 0 _081B05C2: @@ -883872,7 +853795,7 @@ _081B05C2: sub_81B05C8: @ 81B05C8 push {r4,lr} sub sp, 0x4 - ldr r0, _081B05E8 + ldr r0, =0x0203cec4 ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -883882,13 +853805,12 @@ sub_81B05C8: @ 81B05C8 cmp r0, 0x7 bhi _081B06B0 lsls r0, 2 - ldr r1, _081B05EC + ldr r1, =_081B05F0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081B05E8: .4byte 0x0203cec4 -_081B05EC: .4byte _081B05F0 + .pool .align 2, 0 _081B05F0: .4byte _081B0610 @@ -883900,8 +853822,8 @@ _081B05F0: .4byte _081B0690 .4byte _081B0694 _081B0610: - ldr r4, _081B0630 - ldr r0, _081B0634 + ldr r4, =0x0203cee0 + ldr r0, =0x08d967ec mov r1, sp bl malloc_and_decompress adds r1, r0, 0 @@ -883914,29 +853836,27 @@ _081B0610: bl gpu_copy_bg_tile_pattern_data_to_vram b _081B069A .align 2, 0 -_081B0630: .4byte 0x0203cee0 -_081B0634: .4byte 0x08d967ec + .pool _081B0638: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _081B06B4 - ldr r0, _081B0650 - ldr r1, _081B0654 + ldr r0, =0x08d96ba0 + ldr r1, =0x0203cee4 ldr r1, [r1] bl call_LZZUnCompWram b _081B069A .align 2, 0 -_081B0650: .4byte 0x08d96ba0 -_081B0654: .4byte 0x0203cee4 + .pool _081B0658: - ldr r0, _081B0678 + ldr r0, =0x08d96ab4 movs r2, 0xB0 lsls r2, 1 movs r1, 0 bl decompress_palette - ldr r0, _081B067C - ldr r4, _081B0680 + ldr r0, =0x02037714 + ldr r4, =0x0203cec4 ldr r1, [r4] adds r1, 0x18 movs r2, 0xB0 @@ -883944,9 +853864,7 @@ _081B0658: ldr r1, [r4] b _081B069E .align 2, 0 -_081B0678: .4byte 0x08d96ab4 -_081B067C: .4byte 0x02037714 -_081B0680: .4byte 0x0203cec4 + .pool _081B0684: movs r0, 0x4 b _081B0696 @@ -883964,7 +853882,7 @@ _081B0694: _081B0696: bl sub_81B06C0 _081B069A: - ldr r0, _081B06AC + ldr r0, =0x0203cec4 ldr r1, [r0] _081B069E: movs r0, 0x86 @@ -883975,7 +853893,7 @@ _081B069E: strh r0, [r1] b _081B06B4 .align 2, 0 -_081B06AC: .4byte 0x0203cec4 + .pool _081B06B0: movs r0, 0x1 b _081B06B6 @@ -883993,7 +853911,7 @@ sub_81B06C0: @ 81B06C0 push {r4,r5,lr} adds r4, r0, 0 lsls r4, 28 - ldr r5, _081B06EC + ldr r5, =0x02037774 lsrs r4, 23 adds r1, r5, 0 subs r1, 0x60 @@ -884001,7 +853919,7 @@ sub_81B06C0: @ 81B06C0 adds r0, r5, 0 movs r2, 0x10 bl CpuSet - ldr r0, _081B06F0 + ldr r0, =0x02037b14 adds r4, r0 adds r0, r5, 0 adds r1, r4, 0 @@ -884011,32 +853929,31 @@ sub_81B06C0: @ 81B06C0 pop {r0} bx r0 .align 2, 0 -_081B06EC: .4byte 0x02037774 -_081B06F0: .4byte 0x02037b14 + .pool thumb_func_end sub_81B06C0 thumb_func_start sub_81B06F4 sub_81B06F4: @ 81B06F4 push {lr} - ldr r0, _081B0730 + ldr r0, =0x0203cec4 ldr r0, [r0] cmp r0, 0 beq _081B0702 bl free _081B0702: - ldr r0, _081B0734 + ldr r0, =0x0203cee4 ldr r0, [r0] cmp r0, 0 beq _081B070E bl free _081B070E: - ldr r0, _081B0738 + ldr r0, =0x0203cee0 ldr r0, [r0] cmp r0, 0 beq _081B071A bl free _081B071A: - ldr r0, _081B073C + ldr r0, =0x0203cedc ldr r0, [r0] cmp r0, 0 beq _081B0726 @@ -884046,10 +853963,7 @@ _081B0726: pop {r0} bx r0 .align 2, 0 -_081B0730: .4byte 0x0203cec4 -_081B0734: .4byte 0x0203cee4 -_081B0738: .4byte 0x0203cee0 -_081B073C: .4byte 0x0203cedc + .pool thumb_func_end sub_81B06F4 thumb_func_start sub_81B0740 @@ -884060,7 +853974,7 @@ sub_81B0740: @ 81B0740 push {r6,r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _081B07C0 + ldr r4, =0x0203cedc movs r0, 0x60 bl malloc str r0, [r4] @@ -884075,11 +853989,11 @@ _081B0764: ldr r2, [r4] lsls r3, r5, 4 adds r2, r3, r2 - ldr r0, _081B07C4 + ldr r0, =0x086156e4 mov r12, r0 str r0, [r2] lsls r0, r5, 3 - ldr r1, _081B07C8 + ldr r1, =0x08615704 adds r0, r1 add r0, r8 str r0, [r2, 0x4] @@ -884119,9 +854033,7 @@ _081B0764: str r1, [r0, 0x30] b _081B07D2 .align 2, 0 -_081B07C0: .4byte 0x0203cedc -_081B07C4: .4byte 0x086156e4 -_081B07C8: .4byte 0x08615704 + .pool _081B07CC: cmp r7, 0 beq _081B07D2 @@ -884140,7 +854052,7 @@ sub_81B07E0: @ 81B07E0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081B081C + ldr r0, =0x0203cec8 ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 @@ -884150,14 +854062,14 @@ sub_81B07E0: @ 81B07E0 bls _081B085C adds r0, r5, 0 bl sub_81B0CEC - ldr r0, _081B0820 + ldr r0, =0x02022ff8 subs r1, r5, 0x3 lsls r1, 5 adds r1, r0 ldrh r0, [r1] cmp r0, 0 bne _081B0828 - ldr r0, _081B0824 + ldr r0, =0x0203cedc lsls r4, r5, 4 ldr r0, [r0] adds r0, r4 @@ -884165,11 +854077,9 @@ sub_81B07E0: @ 81B07E0 bl sub_81B2748 b _081B0836 .align 2, 0 -_081B081C: .4byte 0x0203cec8 -_081B0820: .4byte 0x02022ff8 -_081B0824: .4byte 0x0203cedc + .pool _081B0828: - ldr r0, _081B0858 + ldr r0, =0x0203cedc lsls r4, r5, 4 ldr r0, [r0] adds r0, r4 @@ -884177,7 +854087,7 @@ _081B0828: bl sub_81B2748 _081B0836: adds r5, r4, 0 - ldr r4, _081B0858 + ldr r4, =0x0203cedc ldr r0, [r4] adds r0, r5, r0 ldrb r0, [r0, 0x8] @@ -884191,17 +854101,17 @@ _081B0836: bl schedule_bg_copy_tilemap_to_vram b _081B093E .align 2, 0 -_081B0858: .4byte 0x0203cedc + .pool _081B085C: movs r0, 0x64 muls r0, r5 - ldr r1, _081B0894 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr cmp r0, 0 bne _081B089C - ldr r4, _081B0898 + ldr r4, =0x0203cedc ldr r0, [r4] lsls r5, 4 adds r0, r5, r0 @@ -884218,10 +854128,9 @@ _081B085C: bl Window_CopyToVram b _081B092C .align 2, 0 -_081B0894: .4byte 0x020244ec -_081B0898: .4byte 0x0203cedc + .pool _081B089C: - ldr r0, _081B08B0 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x8] movs r1, 0xF ands r1, r0 @@ -884231,7 +854140,7 @@ _081B089C: bl sub_81B0B60 b _081B08F6 .align 2, 0 -_081B08B0: .4byte 0x0203cec8 + .pool _081B08B4: cmp r1, 0x2 bne _081B08C0 @@ -884265,7 +854174,7 @@ _081B08E4: adds r0, r5, 0 bl sub_81B0948 _081B08F6: - ldr r2, _081B090C + ldr r2, =0x0203cec8 ldrb r1, [r2, 0x8] movs r0, 0xF ands r0, r1 @@ -884276,7 +854185,7 @@ _081B08F6: bl sub_81B0FCC b _081B092A .align 2, 0 -_081B090C: .4byte 0x0203cec8 + .pool _081B0910: movs r0, 0x9 ldrsb r0, [r2, r0] @@ -884293,7 +854202,7 @@ _081B0922: _081B092A: lsls r5, 4 _081B092C: - ldr r0, _081B0944 + ldr r0, =0x0203cedc ldr r0, [r0] adds r0, r5, r0 ldrb r0, [r0, 0x8] @@ -884305,7 +854214,7 @@ _081B093E: pop {r0} bx r0 .align 2, 0 -_081B0944: .4byte 0x0203cedc + .pool thumb_func_end sub_81B07E0 thumb_func_start sub_81B0948 @@ -884317,7 +854226,7 @@ sub_81B0948: @ 81B0948 movs r0, 0x64 adds r1, r4, 0 muls r1, r0 - ldr r0, _081B0998 + ldr r0, =0x020244ec adds r7, r1, r0 adds r0, r7, 0 movs r1, 0x2D @@ -884325,7 +854234,7 @@ sub_81B0948: @ 81B0948 adds r2, r0, 0 cmp r2, 0 beq _081B09A0 - ldr r6, _081B099C + ldr r6, =0x0203cedc ldr r0, [r6] lsls r5, r4, 4 adds r0, r5, r0 @@ -884347,10 +854256,9 @@ sub_81B0948: @ 81B0948 bl sub_81B2A70 b _081B0A02 .align 2, 0 -_081B0998: .4byte 0x020244ec -_081B099C: .4byte 0x0203cedc + .pool _081B09A0: - ldr r5, _081B0A0C + ldr r5, =0x0203cedc ldr r0, [r5] lsls r4, 4 adds r0, r4, r0 @@ -884398,7 +854306,7 @@ _081B0A02: pop {r0} bx r0 .align 2, 0 -_081B0A0C: .4byte 0x0203cedc + .pool thumb_func_end sub_81B0948 thumb_func_start sub_81B0A10 @@ -884415,9 +854323,9 @@ sub_81B0A10: @ 81B0A10 movs r1, 0x64 adds r2, r0, 0 muls r2, r1 - ldr r1, _081B0A94 + ldr r1, =0x020244ec adds r6, r2, r1 - ldr r7, _081B0A98 + ldr r7, =0x0203cedc ldr r1, [r7] lsls r5, r0, 4 adds r1, r5, r1 @@ -884465,8 +854373,7 @@ _081B0A7C: pop {r0} bx r0 .align 2, 0 -_081B0A94: .4byte 0x020244ec -_081B0A98: .4byte 0x0203cedc + .pool thumb_func_end sub_81B0A10 thumb_func_start sub_81B0A9C @@ -884476,9 +854383,9 @@ sub_81B0A9C: @ 81B0A9C lsrs r5, r0, 24 movs r0, 0x64 muls r0, r5 - ldr r1, _081B0AC0 + ldr r1, =0x020244ec adds r0, r1 - ldr r6, _081B0AC4 + ldr r6, =0x0203cef8 bl sub_81B85AC lsls r0, 24 cmp r0, 0 @@ -884488,8 +854395,7 @@ sub_81B0A9C: @ 81B0A9C bl sub_81B0A10 b _081B0B02 .align 2, 0 -_081B0AC0: .4byte 0x020244ec -_081B0AC4: .4byte 0x0203cef8 + .pool _081B0AC8: adds r1, r4, 0x2 lsls r1, 24 @@ -884534,7 +854440,7 @@ sub_81B0B08: @ 81B0B08 lsrs r4, r0, 24 movs r0, 0x64 muls r0, r4 - ldr r1, _081B0B2C + ldr r1, =0x020244ec adds r0, r1 bl sub_80DAE0C lsls r0, 24 @@ -884542,13 +854448,12 @@ sub_81B0B08: @ 81B0B08 cmp r0, 0x4 bhi _081B0B5A lsls r0, 2 - ldr r1, _081B0B30 + ldr r1, =_081B0B34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081B0B2C: .4byte 0x020244ec -_081B0B30: .4byte _081B0B34 + .pool .align 2, 0 _081B0B34: .4byte _081B0B48 @@ -884578,7 +854483,7 @@ sub_81B0B60: @ 81B0B60 lsrs r4, r0, 24 movs r0, 0x64 muls r0, r4 - ldr r1, _081B0B84 + ldr r1, =0x020244ec adds r0, r1 bl sub_806E25C lsls r0, 24 @@ -884589,7 +854494,7 @@ sub_81B0B60: @ 81B0B60 bl sub_81B0A10 b _081B0B90 .align 2, 0 -_081B0B84: .4byte 0x020244ec + .pool _081B0B88: adds r0, r4, 0 movs r1, 0x8 @@ -884632,7 +854537,7 @@ sub_81B0BC4: @ 81B0BC4 lsrs r4, r0, 24 movs r0, 0x64 muls r0, r4 - ldr r1, _081B0BE8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC bl pokemon_getattr @@ -884643,7 +854548,7 @@ sub_81B0BC4: @ 81B0BC4 bl sub_81B0A10 b _081B0BF4 .align 2, 0 -_081B0BE8: .4byte 0x020244ec + .pool _081B0BEC: adds r0, r4, 0 movs r1, 0xC @@ -884662,29 +854567,25 @@ sub_81B0BFC: @ 81B0BFC movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081B0C2C + ldr r0, =0x020244ec adds r6, r1, r0 - ldr r0, _081B0C30 + ldr r0, =0x0203ce7c ldrh r4, [r0] - ldr r0, _081B0C34 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0xC bne _081B0C40 - ldr r1, _081B0C38 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _081B0C3C + ldr r0, =0x020375e2 ldrb r2, [r0] adds r0, r5, 0 movs r1, 0 bl sub_81B0C94 b _081B0C8A .align 2, 0 -_081B0C2C: .4byte 0x020244ec -_081B0C30: .4byte 0x0203ce7c -_081B0C34: .4byte 0x0203cec8 -_081B0C38: .4byte 0x020375f0 -_081B0C3C: .4byte 0x020375e2 + .pool _081B0C40: cmp r0, 0x3 bne _081B0C56 @@ -884741,7 +854642,7 @@ sub_81B0C94: @ 81B0C94 lsrs r2, 24 movs r0, 0x64 muls r0, r4 - ldr r3, _081B0CC0 + ldr r3, =0x020244ec adds r0, r3 bl sub_81B22D8 lsls r0, 24 @@ -884754,7 +854655,7 @@ sub_81B0C94: @ 81B0C94 beq _081B0CC8 b _081B0CDC .align 2, 0 -_081B0CC0: .4byte 0x020244ec + .pool _081B0CC4: cmp r0, 0x3 bne _081B0CDC @@ -884786,13 +854687,13 @@ sub_81B0CEC: @ 81B0CEC sub sp, 0x8 lsls r0, 24 lsrs r0, 24 - ldr r1, _081B0D1C + ldr r1, =0x0203cedc lsls r2, r0, 4 ldr r1, [r1] adds r6, r1, r2 subs r0, 0x3 lsls r0, 24 - ldr r5, _081B0D20 + ldr r5, =0x02022ff8 lsrs r0, 19 mov r8, r0 adds r7, r0, r5 @@ -884803,8 +854704,7 @@ sub_81B0CEC: @ 81B0CEC bl sub_81B2720 b _081B0D8E .align 2, 0 -_081B0D1C: .4byte 0x0203cedc -_081B0D20: .4byte 0x02022ff8 + .pool _081B0D24: ldr r2, [r6] ldrb r0, [r6, 0x8] @@ -884815,7 +854715,7 @@ _081B0D24: movs r2, 0 movs r3, 0 bl _call_via_r4 - ldr r4, _081B0D9C + ldr r4, =0x02021cc4 adds r5, 0x4 add r5, r8 adds r0, r4, 0 @@ -884857,13 +854757,13 @@ _081B0D8E: pop {r0} bx r0 .align 2, 0 -_081B0D9C: .4byte 0x02021cc4 + .pool thumb_func_end sub_81B0CEC thumb_func_start sub_81B0DA0 sub_81B0DA0: @ 81B0DA0 push {r4,r5,lr} - ldr r5, _081B0DC8 + ldr r5, =0x0203cec4 ldr r0, [r5] movs r4, 0x86 lsls r4, 2 @@ -884882,7 +854782,7 @@ sub_81B0DA0: @ 81B0DA0 movs r0, 0 b _081B0DCE .align 2, 0 -_081B0DC8: .4byte 0x0203cec4 + .pool _081B0DCC: movs r0, 0x1 _081B0DCE: @@ -884894,14 +854794,14 @@ _081B0DCE: thumb_func_start sub_81B0DD4 sub_81B0DD4: @ 81B0DD4 lsls r0, 16 - ldr r1, _081B0DE4 + ldr r1, =0x0203cee0 lsrs r0, 11 ldr r1, [r1] adds r1, r0 adds r0, r1, 0 bx lr .align 2, 0 -_081B0DE4: .4byte 0x0203cee0 + .pool thumb_func_end sub_81B0DD4 thumb_func_start sub_81B0DE8 @@ -884914,7 +854814,7 @@ sub_81B0DE8: @ 81B0DE8 sub sp, 0x4 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _081B0E5C + ldr r0, =0x0203cec8 ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 @@ -884926,7 +854826,7 @@ sub_81B0DE8: @ 81B0DE8 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r0, _081B0E60 + ldr r0, =0x02022ff8 mov r9, r0 mov r2, r10 lsls r2, 5 @@ -884940,7 +854840,7 @@ sub_81B0DE8: @ 81B0DE8 adds r1, 0x18 add r1, r8 ldr r1, [r1] - ldr r4, _081B0E64 + ldr r4, =0x0203cedc lsls r5, r7, 4 ldr r2, [r4] adds r2, r5 @@ -884962,9 +854862,7 @@ sub_81B0DE8: @ 81B0DE8 movs r3, 0x7 b _081B0E78 .align 2, 0 -_081B0E5C: .4byte 0x0203cec8 -_081B0E60: .4byte 0x02022ff8 -_081B0E64: .4byte 0x0203cedc + .pool _081B0E68: mov r0, r9 adds r0, 0x14 @@ -884974,32 +854872,31 @@ _081B0E68: lsls r0, 24 lsrs r3, r0, 24 _081B0E78: - ldr r1, _081B0E90 + ldr r1, =0x02022ff8 mov r2, r10 lsls r0, r2, 5 adds r0, r1 ldrh r0, [r0] - ldr r1, _081B0E94 + ldr r1, =0x0203cedc ldr r2, [r1] adds r2, r5 adds r1, r3, 0 bl sub_81B6098 b _081B0EDC .align 2, 0 -_081B0E90: .4byte 0x02022ff8 -_081B0E94: .4byte 0x0203cedc + .pool _081B0E98: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _081B0EEC + ldr r0, =0x020244ec adds r6, r1, r0 adds r0, r6, 0 movs r1, 0xB bl pokemon_getattr cmp r0, 0 beq _081B0EDC - ldr r4, _081B0EF0 + ldr r4, =0x0203cedc lsls r5, r7, 4 ldr r1, [r4] adds r1, r5 @@ -885028,14 +854925,13 @@ _081B0EDC: pop {r0} bx r0 .align 2, 0 -_081B0EEC: .4byte 0x020244ec -_081B0EF0: .4byte 0x0203cedc + .pool thumb_func_end sub_81B0DE8 thumb_func_start sub_81B0EF4 sub_81B0EF4: @ 81B0EF4 push {r4,r5,lr} - ldr r5, _081B0F1C + ldr r5, =0x0203cec4 ldr r0, [r5] movs r4, 0x86 lsls r4, 2 @@ -885054,7 +854950,7 @@ sub_81B0EF4: @ 81B0EF4 movs r0, 0 b _081B0F22 .align 2, 0 -_081B0F1C: .4byte 0x0203cec4 + .pool _081B0F20: movs r0, 0x1 _081B0F22: @@ -885067,7 +854963,7 @@ _081B0F22: sub_81B0F28: @ 81B0F28 push {r4,lr} sub sp, 0xC - ldr r0, _081B0F50 + ldr r0, =0x0203cec8 ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 @@ -885085,9 +854981,9 @@ sub_81B0F28: @ 81B0F28 bl Bg_FillWramTileMapRectWithTileAndPalette b _081B0FBC .align 2, 0 -_081B0F50: .4byte 0x0203cec8 + .pool _081B0F54: - ldr r4, _081B0F8C + ldr r4, =0x0203cec4 ldr r0, [r4] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -885103,7 +854999,7 @@ _081B0F54: ands r0, r1 lsls r0, 4 ldrh r2, [r3, 0x8] - ldr r1, _081B0F90 + ldr r1, =0xfffff80f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x8] @@ -885113,8 +855009,7 @@ _081B0F54: bl sub_81B5F74 b _081B0F9C .align 2, 0 -_081B0F8C: .4byte 0x0203cec4 -_081B0F90: .4byte 0xfffff80f + .pool _081B0F94: movs r0, 0xC6 movs r1, 0x94 @@ -885127,11 +855022,11 @@ _081B0F9C: ands r0, r1 lsls r0, 11 ldr r1, [r3, 0x8] - ldr r2, _081B0FC4 + ldr r2, =0xfffc07ff ands r1, r2 orrs r1, r0 str r1, [r3, 0x8] - ldr r0, _081B0FC8 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x9] movs r1, 0x1 bl sub_81B0FCC @@ -885141,8 +855036,7 @@ _081B0FBC: pop {r0} bx r0 .align 2, 0 -_081B0FC4: .4byte 0xfffc07ff -_081B0FC8: .4byte 0x0203cec8 + .pool thumb_func_end sub_81B0F28 thumb_func_start sub_81B0FCC @@ -885162,13 +855056,13 @@ sub_81B0FCC: @ 81B0FCC beq _081B1074 movs r0, 0x64 muls r0, r7 - ldr r1, _081B1030 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr cmp r0, 0 beq _081B10E8 - ldr r6, _081B1034 + ldr r6, =0x0203cedc lsls r5, r7, 4 ldr r4, [r6] adds r4, r5 @@ -885192,8 +855086,7 @@ sub_81B0FCC: @ 81B0FCC bl sub_81B5F98 b _081B10E8 .align 2, 0 -_081B1030: .4byte 0x020244ec -_081B1034: .4byte 0x0203cedc + .pool _081B1038: mov r0, r8 cmp r0, 0 @@ -885217,15 +855110,15 @@ _081B1052: movs r3, 0x7 bl sub_8199C30 _081B1064: - ldr r0, _081B1070 + ldr r0, =0x0203cec4 ldr r0, [r0] ldrh r0, [r0, 0x8] lsls r0, 21 b _081B10DA .align 2, 0 -_081B1070: .4byte 0x0203cec4 + .pool _081B1074: - ldr r0, _081B1094 + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -885242,7 +855135,7 @@ _081B1074: movs r2, 0x11 b _081B10B8 .align 2, 0 -_081B1094: .4byte 0x0203cec4 + .pool _081B1098: movs r0, 0x2 str r0, [sp] @@ -885275,7 +855168,7 @@ _081B10C0: movs r3, 0x7 bl sub_8199C30 _081B10D2: - ldr r0, _081B10F4 + ldr r0, =0x0203cec4 ldr r0, [r0] ldr r0, [r0, 0x8] lsls r0, 14 @@ -885293,7 +855186,7 @@ _081B10E8: pop {r0} bx r0 .align 2, 0 -_081B10F4: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B0FCC thumb_func_start sub_81B10F8 @@ -885310,7 +855203,7 @@ sub_81B10F8: @ 81B10F8 _081B110A: movs r0, 0x64 muls r0, r5 - ldr r1, _081B1184 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 bl pokemon_getattr @@ -885330,7 +855223,7 @@ _081B1120: lsls r0, r4, 24 lsrs r4, r0, 24 _081B1136: - ldr r0, _081B1188 + ldr r0, =0x0203cec8 ldrb r1, [r0, 0xB] adds r2, r0, 0 cmp r1, 0x9 @@ -885373,8 +855266,7 @@ _081B117A: pop {r1} bx r1 .align 2, 0 -_081B1184: .4byte 0x020244ec -_081B1188: .4byte 0x0203cec8 + .pool thumb_func_end sub_81B10F8 thumb_func_start sub_81B118C @@ -885382,7 +855274,7 @@ sub_81B118C: @ 81B118C push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081B11B0 + ldr r0, =0x0203cec8 ldrb r1, [r0, 0x8] movs r0, 0x30 ands r0, r1 @@ -885398,19 +855290,19 @@ _081B11AA: movs r0, 0x1 b _081B11F8 .align 2, 0 -_081B11B0: .4byte 0x0203cec8 + .pool _081B11B4: cmp r2, 0x2 bhi _081B11F6 - ldr r0, _081B11FC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 ands r0, r1 cmp r0, 0 beq _081B11F6 - ldr r0, _081B1200 - ldr r1, _081B1204 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -885419,7 +855311,7 @@ _081B11B4: beq _081B11F6 adds r0, r2, 0 bl sub_81B8F38 - ldr r1, _081B1208 + ldr r1, =0x0202449c ldr r1, [r1] movs r2, 0xA8 lsls r2, 2 @@ -885438,17 +855330,14 @@ _081B11F8: pop {r1} bx r1 .align 2, 0 -_081B11FC: .4byte 0x02022fec -_081B1200: .4byte 0x030022c0 -_081B1204: .4byte 0x00000439 -_081B1208: .4byte 0x0202449c + .pool thumb_func_end sub_81B118C thumb_func_start sub_81B120C sub_81B120C: @ 81B120C push {r4-r6,lr} sub sp, 0xC - ldr r1, _081B1248 + ldr r1, =0x086157c4 movs r6, 0x7 str r6, [sp] movs r5, 0x2 @@ -885459,7 +855348,7 @@ sub_81B120C: @ 81B120C movs r2, 0x17 movs r3, 0x10 bl bg_copy_tilemap_rect_simple - ldr r1, _081B124C + ldr r1, =0x086157e0 str r6, [sp] str r5, [sp, 0x4] str r4, [sp, 0x8] @@ -885474,21 +855363,20 @@ sub_81B120C: @ 81B120C pop {r0} bx r0 .align 2, 0 -_081B1248: .4byte 0x086157c4 -_081B124C: .4byte 0x086157e0 + .pool thumb_func_end sub_81B120C thumb_func_start sub_81B1250 sub_81B1250: @ 81B1250 push {lr} - ldr r0, _081B1274 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x49 ands r0, r1 cmp r0, 0x49 bne _081B1280 - ldr r0, _081B1278 - ldr r1, _081B127C + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -885498,9 +855386,7 @@ sub_81B1250: @ 81B1250 movs r0, 0x1 b _081B1282 .align 2, 0 -_081B1274: .4byte 0x02022fec -_081B1278: .4byte 0x030022c0 -_081B127C: .4byte 0x00000439 + .pool _081B1280: movs r0, 0 _081B1282: @@ -885548,20 +855434,19 @@ sub_81B12C0: @ 81B12C0 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _081B12F0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B12F4 + ldr r1, =c3_0811FAB4 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_081B12F0: .4byte 0x03005e00 -_081B12F4: .4byte c3_0811FAB4 + 1 + .pool thumb_func_end sub_81B12C0 thumb_func_start c3_0811FAB4 @@ -885569,13 +855454,13 @@ c3_0811FAB4: @ 81B12F8 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081B132C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081B134C - ldr r4, _081B1330 + ldr r4, =0x0203cec8 ldrb r1, [r4, 0x8] movs r0, 0xF ands r0, r1 @@ -885583,7 +855468,7 @@ c3_0811FAB4: @ 81B12F8 bne _081B131A bl sub_81B9080 _081B131A: - ldr r0, _081B1334 + ldr r0, =0x0203cec4 ldr r0, [r0] ldr r0, [r0, 0x4] cmp r0, 0 @@ -885591,9 +855476,7 @@ _081B131A: bl set_callback2 b _081B133E .align 2, 0 -_081B132C: .4byte 0x02037fd4 -_081B1330: .4byte 0x0203cec8 -_081B1334: .4byte 0x0203cec4 + .pool _081B1338: ldr r0, [r4] bl set_callback2 @@ -885610,22 +855493,22 @@ _081B134C: thumb_func_start brm_get_pokemon_selection brm_get_pokemon_selection: @ 81B1354 - ldr r0, _081B135C + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x9] bx lr .align 2, 0 -_081B135C: .4byte 0x0203cec8 + .pool thumb_func_end brm_get_pokemon_selection thumb_func_start sub_81B1360 sub_81B1360: @ 81B1360 - ldr r0, _081B136C + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x8] lsls r0, 28 lsrs r0, 28 bx lr .align 2, 0 -_081B136C: .4byte 0x0203cec8 + .pool thumb_func_end sub_81B1360 thumb_func_start sub_81B1370 @@ -885634,7 +855517,7 @@ sub_81B1370: @ 81B1370 lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - ldr r0, _081B13AC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -885658,7 +855541,7 @@ sub_81B1370: @ 81B1370 beq _081B13B6 b _081B13E0 .align 2, 0 -_081B13AC: .4byte 0x02037fd4 + .pool _081B13B0: cmp r0, 0x8 beq _081B13CA @@ -885674,7 +855557,7 @@ _081B13C0: bl sub_81B15D0 b _081B13E0 _081B13CA: - ldr r0, _081B13E8 + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -885688,13 +855571,13 @@ _081B13E0: pop {r0} bx r0 .align 2, 0 -_081B13E8: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B1370 thumb_func_start sub_81B13EC sub_81B13EC: @ 81B13EC push {lr} - ldr r0, _081B1400 + ldr r0, =0x0203cec8 ldrb r1, [r0, 0xB] cmp r1, 0x8 beq _081B13FA @@ -885704,7 +855587,7 @@ _081B13FA: adds r0, 0xA b _081B1406 .align 2, 0 -_081B1400: .4byte 0x0203cec8 + .pool _081B1404: adds r0, 0x9 _081B1406: @@ -885722,15 +855605,15 @@ sub_81B140C: @ 81B140C ldrsb r0, [r4, r0] cmp r0, 0x6 bne _081B142C - ldr r0, _081B1428 + ldr r0, =0x0203cec8 ldr r1, [r0, 0x4] adds r0, r5, 0 bl _call_via_r1 b _081B159E .align 2, 0 -_081B1428: .4byte 0x0203cec8 + .pool _081B142C: - ldr r0, _081B1444 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] subs r0, 0x3 cmp r0, 0xA @@ -885738,13 +855621,12 @@ _081B142C: b _081B1592 _081B1438: lsls r0, 2 - ldr r1, _081B1448 + ldr r1, =_081B144C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081B1444: .4byte 0x0203cec8 -_081B1448: .4byte _081B144C + .pool .align 2, 0 _081B144C: .4byte _081B149C @@ -885766,7 +855648,7 @@ _081B1478: bne _081B1486 b _081B159E _081B1486: - ldr r0, _081B1498 + ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xD bl sub_81B302C @@ -885774,7 +855656,7 @@ _081B1486: bl sub_81615A8 b _081B159E .align 2, 0 -_081B1498: .4byte 0x0203cec4 + .pool _081B149C: adds r0, r4, 0 bl sub_81B15A4 @@ -885783,32 +855665,28 @@ _081B149C: bne _081B14AA b _081B159E _081B14AA: - ldr r0, _081B14D4 + ldr r0, =0x0203cec8 ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 - ldr r2, _081B14D8 + ldr r2, =0x0203cec4 cmp r0, 0x1 bne _081B14BE ldr r1, [r2] - ldr r0, _081B14DC + ldr r0, =sub_81B9140 + 1 str r0, [r1, 0x4] _081B14BE: ldr r0, [r2] adds r0, 0xD bl sub_81B302C - ldr r0, _081B14E0 - ldr r1, _081B14E4 + ldr r0, =0x03006328 + ldr r1, =sub_81B6794 + 1 ldr r2, [r0] adds r0, r5, 0 bl _call_via_r2 b _081B159E .align 2, 0 -_081B14D4: .4byte 0x0203cec8 -_081B14D8: .4byte 0x0203cec4 -_081B14DC: .4byte sub_81B9140 + 1 -_081B14E0: .4byte 0x03006328 -_081B14E4: .4byte sub_81B6794 + 1 + .pool _081B14E8: adds r0, r4, 0 bl sub_81B15A4 @@ -885817,7 +855695,7 @@ _081B14E8: beq _081B159E movs r0, 0x5 bl audio_play - ldr r0, _081B150C + ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xD bl sub_81B302C @@ -885825,7 +855703,7 @@ _081B14E8: bl sub_81B7E4C b _081B159E .align 2, 0 -_081B150C: .4byte 0x0203cec4 + .pool _081B1510: adds r0, r4, 0 bl sub_81B15A4 @@ -885834,7 +855712,7 @@ _081B1510: beq _081B159E movs r0, 0x5 bl audio_play - ldr r0, _081B1534 + ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xD bl sub_81B302C @@ -885842,7 +855720,7 @@ _081B1510: bl sub_81B8474 b _081B159E .align 2, 0 -_081B1534: .4byte 0x0203cec4 + .pool _081B1538: adds r0, r4, 0 bl sub_81B15A4 @@ -885851,7 +855729,7 @@ _081B1538: beq _081B159E movs r0, 0x5 bl audio_play - ldr r0, _081B155C + ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xD bl sub_81B302C @@ -885859,7 +855737,7 @@ _081B1538: bl sub_81B7FAC b _081B159E .align 2, 0 -_081B155C: .4byte 0x0203cec4 + .pool _081B1560: movs r0, 0x5 bl audio_play @@ -885899,7 +855777,7 @@ sub_81B15A4: @ 81B15A4 ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081B15C0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2D bl pokemon_getattr @@ -885908,7 +855786,7 @@ sub_81B15A4: @ 81B15A4 movs r0, 0x1 b _081B15CC .align 2, 0 -_081B15C0: .4byte 0x020244ec + .pool _081B15C4: movs r0, 0x20 bl audio_play @@ -885924,7 +855802,7 @@ sub_81B15D0: @ 81B15D0 adds r5, r1, 0 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081B15EC + ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x8 beq _081B1602 @@ -885934,7 +855812,7 @@ sub_81B15D0: @ 81B15D0 beq _081B15FA b _081B161E .align 2, 0 -_081B15EC: .4byte 0x0203cec8 + .pool _081B15F0: cmp r0, 0xA beq _081B1602 @@ -885970,11 +855848,11 @@ _081B161E: lsls r0, 24 cmp r0, 0 bne _081B1642 - ldr r1, _081B1658 + ldr r1, =0x020375e0 movs r0, 0x7 strh r0, [r1] _081B1642: - ldr r0, _081B165C + ldr r0, =0x0203cee8 movs r1, 0 strb r1, [r0] movs r0, 0x7 @@ -885986,8 +855864,7 @@ _081B1652: pop {r0} bx r0 .align 2, 0 -_081B1658: .4byte 0x020375e0 -_081B165C: .4byte 0x0203cee8 + .pool thumb_func_end sub_81B15D0 thumb_func_start sub_81B1660 @@ -885996,17 +855873,16 @@ sub_81B1660: @ 81B1660 lsls r0, 24 lsrs r6, r0, 24 movs r5, 0 - ldr r0, _081B1678 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x8] movs r1, 0xF ands r1, r0 cmp r1, 0x2 bne _081B1680 - ldr r5, _081B167C + ldr r5, =0x085ea110 b _081B168A .align 2, 0 -_081B1678: .4byte 0x0203cec8 -_081B167C: .4byte 0x085ea110 + .pool _081B1680: cmp r1, 0x4 bne _081B168A @@ -886015,31 +855891,28 @@ _081B1680: _081B168A: cmp r5, 0 beq _081B16CC - ldr r0, _081B16BC + ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xD bl sub_81B302C - ldr r4, _081B16C0 + ldr r4, =0x02021fc4 adds r0, r4, 0 adds r1, r5, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B16C4 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B16C8 + ldr r1, =sub_81B16D4 + 1 str r1, [r0] movs r0, 0x1 b _081B16CE .align 2, 0 -_081B16BC: .4byte 0x0203cec4 -_081B16C0: .4byte 0x02021fc4 -_081B16C4: .4byte 0x03005e00 -_081B16C8: .4byte sub_81B16D4 + 1 + .pool _081B16CC: movs r0, 0 _081B16CE: @@ -886059,20 +855932,19 @@ sub_81B16D4: @ 81B16D4 cmp r0, 0x1 beq _081B16F8 bl sub_81B334C - ldr r0, _081B1700 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B1704 + ldr r0, =sub_81B1708 + 1 str r0, [r1] _081B16F8: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B1700: .4byte 0x03005e00 -_081B1704: .4byte sub_81B1708 + 1 + .pool thumb_func_end sub_81B16D4 thumb_func_start sub_81B1708 @@ -886097,9 +855969,9 @@ _081B1728: beq _081B1752 b _081B1758 _081B172E: - ldr r0, _081B1744 + ldr r0, =0x0203cee8 strb r1, [r0] - ldr r1, _081B1748 + ldr r1, =0x0203cec8 movs r0, 0x7 strb r0, [r1, 0x9] bl sub_81B8558 @@ -886107,8 +855979,7 @@ _081B172E: bl sub_81B12C0 b _081B1758 .align 2, 0 -_081B1744: .4byte 0x0203cee8 -_081B1748: .4byte 0x0203cec8 + .pool _081B174C: movs r0, 0x5 bl audio_play @@ -886125,7 +855996,7 @@ _081B1758: sub_81B1760: @ 81B1760 push {r4,lr} adds r4, r0, 0 - ldr r0, _081B1778 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] adds r3, r0, 0 cmp r1, 0x20 @@ -886136,7 +856007,7 @@ sub_81B1760: @ 81B1760 beq _081B1792 b _081B1796 .align 2, 0 -_081B1778: .4byte 0x030022c0 + .pool _081B177C: cmp r1, 0x40 beq _081B1786 @@ -886171,7 +856042,7 @@ _081B17AA: _081B17AE: movs r1, 0x1 _081B17B0: - ldr r3, _081B17C0 + ldr r3, =0x030022c0 _081B17B2: ldrh r2, [r3, 0x2E] movs r0, 0x8 @@ -886181,7 +856052,7 @@ _081B17B2: movs r0, 0x8 b _081B17F0 .align 2, 0 -_081B17C0: .4byte 0x030022c0 + .pool _081B17C4: lsls r0, r1, 24 asrs r1, r0, 24 @@ -886219,7 +856090,7 @@ sub_81B17F8: @ 81B17F8 lsls r1, 24 lsrs r1, 24 ldrb r4, [r5] - ldr r0, _081B181C + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x8] lsls r0, 26 lsrs r0, 30 @@ -886231,7 +856102,7 @@ sub_81B17F8: @ 81B17F8 bl sub_81B1854 b _081B182A .align 2, 0 -_081B181C: .4byte 0x0203cec8 + .pool _081B1820: lsls r1, 24 asrs r1, 24 @@ -886291,16 +856162,16 @@ _081B187A: _081B1888: cmp r1, 0x6 bne _081B1898 - ldr r0, _081B1894 + ldr r0, =0x020244e9 ldrb r0, [r0] subs r0, 0x1 b _081B1950 .align 2, 0 -_081B1894: .4byte 0x020244e9 + .pool _081B1898: cmp r1, 0x7 bne _081B18BC - ldr r0, _081B18AC + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -886309,14 +856180,14 @@ _081B1898: movs r0, 0x6 b _081B1950 .align 2, 0 -_081B18AC: .4byte 0x0203cec4 + .pool _081B18B0: - ldr r0, _081B18B8 + ldr r0, =0x020244e9 ldrb r0, [r0] subs r0, 0x1 b _081B1950 .align 2, 0 -_081B18B8: .4byte 0x020244e9 + .pool _081B18BC: subs r0, 0x1 b _081B1950 @@ -886328,12 +856199,12 @@ _081B18C0: beq _081B194E movs r1, 0 ldrsb r1, [r4, r1] - ldr r0, _081B18E8 + ldr r0, =0x020244e9 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 bne _081B18F4 - ldr r0, _081B18EC + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -886342,8 +856213,7 @@ _081B18C0: movs r0, 0x6 b _081B1950 .align 2, 0 -_081B18E8: .4byte 0x020244e9 -_081B18EC: .4byte 0x0203cec4 + .pool _081B18F0: movs r0, 0x7 b _081B1950 @@ -886351,7 +856221,7 @@ _081B18F4: adds r0, r2, 0x1 b _081B1950 _081B18F8: - ldr r0, _081B191C + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r0, 0x1 beq _081B1952 @@ -886359,7 +856229,7 @@ _081B18F8: ldrsb r0, [r4, r0] cmp r0, 0 bne _081B1952 - ldr r0, _081B1920 + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 28 @@ -886369,8 +856239,7 @@ _081B18F8: movs r0, 0x1 b _081B1950 .align 2, 0 -_081B191C: .4byte 0x020244e9 -_081B1920: .4byte 0x0203cec4 + .pool _081B1924: movs r0, 0 ldrsb r0, [r4, r0] @@ -886380,7 +856249,7 @@ _081B1924: beq _081B1952 cmp r0, 0x7 beq _081B1952 - ldr r0, _081B1958 + ldr r0, =0x0203cec4 ldr r3, [r0] movs r1, 0 ldrsb r1, [r4, r1] @@ -886402,7 +856271,7 @@ _081B1952: pop {r0} bx r0 .align 2, 0 -_081B1958: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B1854 thumb_func_start sub_81B195C @@ -886442,16 +856311,16 @@ _081B1988: _081B1996: cmp r0, 0x6 bne _081B19A8 - ldr r0, _081B19A4 + ldr r0, =0x020244e9 ldrb r0, [r0] subs r0, 0x1 b _081B1AF2 .align 2, 0 -_081B19A4: .4byte 0x020244e9 + .pool _081B19A8: cmp r0, 0x7 bne _081B19C4 - ldr r0, _081B19BC + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -886460,7 +856329,7 @@ _081B19A8: movs r0, 0x6 b _081B1AF2 .align 2, 0 -_081B19BC: .4byte 0x0203cec4 + .pool _081B19C0: subs r0, r1, 0x1 strb r0, [r4] @@ -886503,7 +856372,7 @@ _081B19F8: asrs r0, 24 cmp r0, r6 bne _081B19E0 - ldr r0, _081B1A1C + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -886512,7 +856381,7 @@ _081B19F8: movs r0, 0x6 b _081B1AF2 .align 2, 0 -_081B1A1C: .4byte 0x0203cec4 + .pool _081B1A20: movs r0, 0x7 b _081B1AF2 @@ -886521,14 +856390,14 @@ _081B1A24: ldrsb r0, [r4, r0] cmp r0, 0 bne _081B1A5C - ldr r0, _081B1A4C + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 28 lsrs r6, r0, 29 cmp r6, 0x3 bne _081B1A54 - ldr r0, _081B1A50 + ldr r0, =0x02024618 movs r1, 0xB bl pokemon_getattr cmp r0, 0 @@ -886536,24 +856405,23 @@ _081B1A24: strb r6, [r4] b _081B1AF4 .align 2, 0 -_081B1A4C: .4byte 0x0203cec4 -_081B1A50: .4byte 0x02024618 + .pool _081B1A54: - ldr r0, _081B1A58 + ldr r0, =0x020245b4 b _081B1A70 .align 2, 0 -_081B1A58: .4byte 0x020245b4 + .pool _081B1A5C: cmp r0, 0x1 bne _081B1AF4 - ldr r0, _081B1A80 + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 28 lsrs r5, r0, 29 cmp r5, 0x5 bne _081B1A88 - ldr r0, _081B1A84 + ldr r0, =0x020246e0 _081B1A70: movs r1, 0xB bl pokemon_getattr @@ -886562,10 +856430,9 @@ _081B1A70: strb r5, [r4] b _081B1AF4 .align 2, 0 -_081B1A80: .4byte 0x0203cec4 -_081B1A84: .4byte 0x020246e0 + .pool _081B1A88: - ldr r0, _081B1A98 + ldr r0, =0x0202467c movs r1, 0xB bl pokemon_getattr cmp r0, 0 @@ -886573,7 +856440,7 @@ _081B1A88: movs r0, 0x4 b _081B1AF2 .align 2, 0 -_081B1A98: .4byte 0x0202467c + .pool _081B1A9C: ldrb r1, [r4] subs r0, r1, 0x2 @@ -886581,7 +856448,7 @@ _081B1A9C: lsrs r0, 24 cmp r0, 0x1 bhi _081B1ACC - ldr r0, _081B1AC8 + ldr r0, =0x0203cec4 ldr r3, [r0] movs r1, 0 ldrsb r1, [r4, r1] @@ -886597,14 +856464,14 @@ _081B1A9C: movs r0, 0 b _081B1AF2 .align 2, 0 -_081B1AC8: .4byte 0x0203cec4 + .pool _081B1ACC: subs r0, r1, 0x4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bhi _081B1AF4 - ldr r0, _081B1AFC + ldr r0, =0x0203cec4 ldr r3, [r0] movs r1, 0 ldrsb r1, [r4, r1] @@ -886625,7 +856492,7 @@ _081B1AF4: pop {r0} bx r0 .align 2, 0 -_081B1AFC: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B195C thumb_func_start sub_81B1B00 @@ -886648,7 +856515,7 @@ _081B1B0A: asrs r4, r1, 24 movs r0, 0x64 muls r0, r4 - ldr r1, _081B1B34 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -886657,7 +856524,7 @@ _081B1B0A: adds r0, r4, 0 b _081B1B3C .align 2, 0 -_081B1B34: .4byte 0x020244ec + .pool _081B1B38: movs r0, 0x1 negs r0, r0 @@ -886687,12 +856554,12 @@ sub_81B1B5C: @ 81B1B5C lsls r4, r1, 24 lsrs r4, 24 bl sub_81B3300 - ldr r0, _081B1B84 + ldr r0, =sub_81B1B8C + 1 movs r1, 0x1 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081B1B88 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -886702,8 +856569,7 @@ sub_81B1B5C: @ 81B1B5C pop {r1} bx r1 .align 2, 0 -_081B1B84: .4byte sub_81B1B8C + 1 -_081B1B88: .4byte 0x03005e00 + .pool thumb_func_end sub_81B1B5C thumb_func_start sub_81B1B8C @@ -886718,7 +856584,7 @@ sub_81B1B8C: @ 81B1B8C lsrs r0, 16 cmp r0, 0x1 beq _081B1BC8 - ldr r0, _081B1BD0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -886740,20 +856606,20 @@ _081B1BC8: pop {r0} bx r0 .align 2, 0 -_081B1BD0: .4byte 0x03005e00 + .pool thumb_func_end sub_81B1B8C thumb_func_start sub_81B1BD4 sub_81B1BD4: @ 81B1BD4 push {lr} - ldr r0, _081B1BE4 + ldr r0, =sub_81B1B8C + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_081B1BE4: .4byte sub_81B1B8C + 1 + .pool thumb_func_end sub_81B1BD4 thumb_func_start sub_81B1BE8 @@ -886768,20 +856634,19 @@ sub_81B1BE8: @ 81B1BE8 beq _081B1C0E movs r0, 0 bl sub_81B3054 - ldr r0, _081B1C14 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B1C18 + ldr r0, =sub_81B1370 + 1 str r0, [r1] _081B1C0E: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B1C14: .4byte 0x03005e00 -_081B1C18: .4byte sub_81B1370 + 1 + .pool thumb_func_end sub_81B1BE8 thumb_func_start sub_81B1C1C @@ -886805,25 +856670,24 @@ sub_81B1C1C: @ 81B1C1C lsrs r0, 24 cmp r0, 0x1 bne _081B1C60 - ldr r0, _081B1C58 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B1C5C + ldr r0, =sub_81B1BE8 + 1 b _081B1C72 .align 2, 0 -_081B1C58: .4byte 0x03005e00 -_081B1C5C: .4byte sub_81B1BE8 + 1 + .pool _081B1C60: movs r0, 0 bl sub_81B3054 - ldr r0, _081B1C7C + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081B1C80 + ldr r0, =sub_81B1370 + 1 _081B1C72: str r0, [r1] _081B1C74: @@ -886831,8 +856695,7 @@ _081B1C74: pop {r0} bx r0 .align 2, 0 -_081B1C7C: .4byte 0x03005e00 -_081B1C80: .4byte sub_81B1370 + 1 + .pool thumb_func_end sub_81B1C1C thumb_func_start sub_81B1C84 @@ -886844,13 +856707,13 @@ sub_81B1C84: @ 81B1C84 lsrs r4, 16 lsls r5, 24 lsrs r5, 24 - ldr r1, _081B1CC0 + ldr r1, =0x02021cc4 bl sub_81B1B44 - ldr r1, _081B1CC4 + ldr r1, =0x02021dc4 adds r0, r4, 0 bl itemid_get_name - ldr r4, _081B1CC8 - ldr r1, _081B1CCC + ldr r4, =0x02021fc4 + ldr r1, =0x085e991b adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -886862,10 +856725,7 @@ sub_81B1C84: @ 81B1C84 pop {r0} bx r0 .align 2, 0 -_081B1CC0: .4byte 0x02021cc4 -_081B1CC4: .4byte 0x02021dc4 -_081B1CC8: .4byte 0x02021fc4 -_081B1CCC: .4byte 0x085e991b + .pool thumb_func_end sub_81B1C84 thumb_func_start sub_81B1CD0 @@ -886877,13 +856737,13 @@ sub_81B1CD0: @ 81B1CD0 lsrs r4, 16 lsls r5, 24 lsrs r5, 24 - ldr r1, _081B1D0C + ldr r1, =0x02021cc4 bl sub_81B1B44 - ldr r1, _081B1D10 + ldr r1, =0x02021dc4 adds r0, r4, 0 bl itemid_get_name - ldr r4, _081B1D14 - ldr r1, _081B1D18 + ldr r4, =0x02021fc4 + ldr r1, =0x085e999d adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -886895,10 +856755,7 @@ sub_81B1CD0: @ 81B1CD0 pop {r0} bx r0 .align 2, 0 -_081B1D0C: .4byte 0x02021cc4 -_081B1D10: .4byte 0x02021dc4 -_081B1D14: .4byte 0x02021fc4 -_081B1D18: .4byte 0x085e999d + .pool thumb_func_end sub_81B1CD0 thumb_func_start sub_81B1D1C @@ -886910,13 +856767,13 @@ sub_81B1D1C: @ 81B1D1C lsrs r4, 16 lsls r5, 24 lsrs r5, 24 - ldr r1, _081B1D58 + ldr r1, =0x02021cc4 bl sub_81B1B44 - ldr r1, _081B1D5C + ldr r1, =0x02021dc4 adds r0, r4, 0 bl itemid_get_name - ldr r4, _081B1D60 - ldr r1, _081B1D64 + ldr r4, =0x02021fc4 + ldr r1, =0x085e993a adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -886928,10 +856785,7 @@ sub_81B1D1C: @ 81B1D1C pop {r0} bx r0 .align 2, 0 -_081B1D58: .4byte 0x02021cc4 -_081B1D5C: .4byte 0x02021dc4 -_081B1D60: .4byte 0x02021fc4 -_081B1D64: .4byte 0x085e993a + .pool thumb_func_end sub_81B1D1C thumb_func_start sub_81B1D68 @@ -886945,13 +856799,13 @@ sub_81B1D68: @ 81B1D68 lsrs r4, 16 lsls r5, 24 lsrs r5, 24 - ldr r1, _081B1DA8 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r1, _081B1DAC + ldr r1, =0x02021dc4 adds r0, r4, 0 bl itemid_get_name - ldr r4, _081B1DB0 - ldr r1, _081B1DB4 + ldr r4, =0x02021fc4 + ldr r1, =0x085e99db adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -886963,10 +856817,7 @@ sub_81B1D68: @ 81B1D68 pop {r0} bx r0 .align 2, 0 -_081B1DA8: .4byte 0x02021cc4 -_081B1DAC: .4byte 0x02021dc4 -_081B1DB0: .4byte 0x02021fc4 -_081B1DB4: .4byte 0x085e99db + .pool thumb_func_end sub_81B1D68 thumb_func_start sub_81B1DB8 @@ -887049,14 +856900,13 @@ _081B1E3E: thumb_func_start pokemon_item_not_removed pokemon_item_not_removed: @ 81B1E48 push {lr} - ldr r0, _081B1E58 - ldr r1, _081B1E5C + ldr r0, =0x02021fc4 + ldr r1, =0x085e9a69 bl ExpandTextCodes pop {r0} bx r0 .align 2, 0 -_081B1E58: .4byte 0x02021fc4 -_081B1E5C: .4byte 0x085e9a69 + .pool thumb_func_end pokemon_item_not_removed thumb_func_start sub_81B1E60 @@ -887070,7 +856920,7 @@ sub_81B1E60: @ 81B1E60 lsls r0, 2 add r0, r8 lsls r0, 3 - ldr r1, _081B1F08 + ldr r1, =0x03005e08 adds r7, r0, r1 ldrh r0, [r7, 0x4] ldrh r1, [r7] @@ -887083,7 +856933,7 @@ sub_81B1E60: @ 81B1E60 ldrsh r0, [r7, r2] movs r5, 0x64 muls r0, r5 - ldr r4, _081B1F0C + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x39 adds r2, r7, 0 @@ -887093,7 +856943,7 @@ sub_81B1E60: @ 81B1E60 adds r0, r2, 0 muls r0, r5 adds r0, r4 - ldr r6, _081B1F10 + ldr r6, =0x0203cedc lsls r2, 4 ldr r1, [r6] adds r1, r2 @@ -887127,7 +856977,7 @@ _081B1EDC: ldrsh r0, [r7, r2] cmp r1, r0 ble _081B1EF8 - ldr r0, _081B1F14 + ldr r0, =0x02021dc4 movs r3, 0xA ldrsh r2, [r7, r3] subs r1, r2 @@ -887144,10 +856994,7 @@ _081B1EFE: pop {r0} bx r0 .align 2, 0 -_081B1F08: .4byte 0x03005e08 -_081B1F0C: .4byte 0x020244ec -_081B1F10: .4byte 0x0203cedc -_081B1F14: .4byte 0x02021dc4 + .pool thumb_func_end sub_81B1E60 thumb_func_start sub_81B1F18 @@ -887178,13 +857025,13 @@ sub_81B1F18: @ 81B1F18 movs r0, 0x64 mov r6, r9 muls r6, r0 - ldr r0, _081B1F9C + ldr r0, =0x020244ec adds r6, r0 mov r0, r8 lsls r4, r0, 2 add r4, r8 lsls r4, 3 - ldr r0, _081B1FA0 + ldr r0, =0x03005e08 adds r4, r0 adds r0, r6, 0 movs r1, 0x39 @@ -887203,7 +857050,7 @@ sub_81B1F18: @ 81B1F18 strh r0, [r4, 0x8] ldrh r0, [r4] strh r0, [r4, 0xA] - ldr r1, _081B1FA4 + ldr r1, =sub_81B1E60 + 1 mov r0, r8 adds r2, r7, 0 bl set_task_function_and_args_14_15 @@ -887215,9 +857062,7 @@ sub_81B1F18: @ 81B1F18 pop {r0} bx r0 .align 2, 0 -_081B1F9C: .4byte 0x020244ec -_081B1FA0: .4byte 0x03005e08 -_081B1FA4: .4byte sub_81B1E60 + 1 + .pool thumb_func_end sub_81B1F18 thumb_func_start sub_81B1FA8 @@ -887230,18 +857075,17 @@ sub_81B1FA8: @ 81B1FA8 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _081B1FCC + ldr r1, =0x03005e08 adds r3, r0, r1 cmp r5, 0x5 bhi _081B200A lsls r0, r5, 2 - ldr r1, _081B1FD0 + ldr r1, =_081B1FD4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081B1FCC: .4byte 0x03005e08 -_081B1FD0: .4byte _081B1FD4 + .pool .align 2, 0 _081B1FD4: .4byte _081B1FEC @@ -887267,7 +857111,7 @@ _081B1FFE: strh r2, [r3, 0x8] b _081B200A _081B2002: - ldr r1, _081B2010 + ldr r1, =sub_81B1E60 + 1 adds r0, r4, 0 bl set_task_function_and_args_14_15 _081B200A: @@ -887275,7 +857119,7 @@ _081B200A: pop {r0} bx r0 .align 2, 0 -_081B2010: .4byte sub_81B1E60 + 1 + .pool thumb_func_end sub_81B1FA8 thumb_func_start pokemon_ailments_get_primary @@ -887361,7 +857205,7 @@ _081B2096: thumb_func_start sub_81B209C sub_81B209C: @ 81B209C push {r4,r5,lr} - ldr r2, _081B20EC + ldr r2, =0x0203cec8 ldrb r1, [r2, 0x8] movs r0, 0xF ands r0, r1 @@ -887371,19 +857215,19 @@ sub_81B209C: @ 81B209C adds r5, 0xE movs r0, 0 strh r0, [r2, 0xE] - ldr r0, _081B20F0 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 bne _081B20FC movs r4, 0 - ldr r0, _081B20F4 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 bcs _081B2126 _081B20C4: movs r0, 0x64 muls r0, r4 - ldr r1, _081B20F8 + ldr r1, =0x020244ec adds r0, r1 bl sub_81B2134 lsls r0, 16 @@ -887395,23 +857239,20 @@ _081B20C4: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081B20F4 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 bcc _081B20C4 b _081B2126 .align 2, 0 -_081B20EC: .4byte 0x0203cec8 -_081B20F0: .4byte 0x020375e2 -_081B20F4: .4byte 0x020244e9 -_081B20F8: .4byte 0x020244ec + .pool _081B20FC: movs r4, 0 b _081B211E _081B2100: movs r0, 0x64 muls r0, r4 - ldr r1, _081B212C + ldr r1, =0x020244ec adds r0, r1 bl sub_81B2164 lsls r0, 16 @@ -887424,7 +857265,7 @@ _081B2100: lsls r0, 24 lsrs r4, r0, 24 _081B211E: - ldr r0, _081B2130 + ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 bcc _081B2100 @@ -887433,8 +857274,7 @@ _081B2126: pop {r0} bx r0 .align 2, 0 -_081B212C: .4byte 0x020244ec -_081B2130: .4byte 0x020244e9 + .pool thumb_func_end sub_81B209C thumb_func_start sub_81B2134 @@ -887491,7 +857331,7 @@ sub_81B218C: @ 81B218C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081B21A8 + ldr r1, =0x0203cec8 movs r2, 0xE ldrsh r1, [r1, r2] asrs r1, r0 @@ -887504,7 +857344,7 @@ _081B21A4: pop {r1} bx r1 .align 2, 0 -_081B21A8: .4byte 0x0203cec8 + .pool thumb_func_end sub_81B218C thumb_func_start sub_81B21AC @@ -887522,36 +857362,34 @@ sub_81B21AC: @ 81B21AC bne _081B21DC movs r0, 0x5 bl audio_play - ldr r0, _081B21D8 + ldr r0, =0x020375e0 strh r5, [r0] adds r0, r4, 0 bl sub_81B12C0 b _081B21FE .align 2, 0 -_081B21D8: .4byte 0x020375e0 + .pool _081B21DC: movs r0, 0x20 bl audio_play - ldr r0, _081B2204 + ldr r0, =0x085ea0ee movs r1, 0 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B2208 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B220C + ldr r1, =sub_81B1C1C + 1 str r1, [r0] _081B21FE: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B2204: .4byte 0x085ea0ee -_081B2208: .4byte 0x03005e00 -_081B220C: .4byte sub_81B1C1C + 1 + .pool thumb_func_end sub_81B21AC thumb_func_start sub_81B2210 @@ -887560,25 +857398,23 @@ sub_81B2210: @ 81B2210 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081B223C + ldr r0, =0x085ea110 movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B2240 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B2244 + ldr r1, =sub_81B2248 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081B223C: .4byte 0x085ea110 -_081B2240: .4byte 0x03005e00 -_081B2244: .4byte sub_81B2248 + 1 + .pool thumb_func_end sub_81B2210 thumb_func_start sub_81B2248 @@ -887592,20 +857428,19 @@ sub_81B2248: @ 81B2248 cmp r0, 0x1 beq _081B226C bl sub_81B334C - ldr r0, _081B2274 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B2278 + ldr r0, =sub_81B227C + 1 str r0, [r1] _081B226C: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B2274: .4byte 0x03005e00 -_081B2278: .4byte sub_81B227C + 1 + .pool thumb_func_end sub_81B2248 thumb_func_start sub_81B227C @@ -887630,32 +857465,31 @@ _081B229C: beq _081B22BA b _081B22C8 _081B22A2: - ldr r1, _081B22B0 + ldr r1, =0x020375e0 movs r0, 0x7 strh r0, [r1] adds r0, r4, 0 bl sub_81B12C0 b _081B22C8 .align 2, 0 -_081B22B0: .4byte 0x020375e0 + .pool _081B22B4: movs r0, 0x5 bl audio_play _081B22BA: - ldr r0, _081B22D0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B22D4 + ldr r0, =sub_81B1C1C + 1 str r0, [r1] _081B22C8: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B22D0: .4byte 0x03005e00 -_081B22D4: .4byte sub_81B1C1C + 1 + .pool thumb_func_end sub_81B227C thumb_func_start sub_81B22D8 @@ -887733,13 +857567,13 @@ _081B2356: thumb_func_start sub_81B2360 sub_81B2360: @ 81B2360 lsls r0, 24 - ldr r1, _081B236C + ldr r1, =0x0861500c lsrs r0, 23 adds r0, r1 ldrh r0, [r0] bx lr .align 2, 0 -_081B236C: .4byte 0x0861500c + .pool thumb_func_end sub_81B2360 thumb_func_start sub_81B2370 @@ -887748,7 +857582,7 @@ sub_81B2370: @ 81B2370 lsls r0, 16 lsls r1, 24 lsrs r1, 24 - ldr r2, _081B2390 + ldr r2, =0x08615048 lsrs r0, 14 adds r0, r2 movs r2, 0x1 @@ -887760,7 +857594,7 @@ sub_81B2370: @ 81B2370 movs r0, 0 b _081B2396 .align 2, 0 -_081B2390: .4byte 0x08615048 + .pool _081B2394: movs r0, 0x1 _081B2396: @@ -887786,25 +857620,25 @@ _081B23B2: beq _081B23D0 b _081B23DC _081B23B8: - ldr r0, _081B23C0 + ldr r0, =0x08615810 bl Window_InitFromTemplates b _081B23E2 .align 2, 0 -_081B23C0: .4byte 0x08615810 + .pool _081B23C4: - ldr r0, _081B23CC + ldr r0, =0x08615850 bl Window_InitFromTemplates b _081B23E2 .align 2, 0 -_081B23CC: .4byte 0x08615850 + .pool _081B23D0: - ldr r0, _081B23D8 + ldr r0, =0x08615890 bl Window_InitFromTemplates b _081B23E2 .align 2, 0 -_081B23D8: .4byte 0x08615890 + .pool _081B23DC: - ldr r0, _081B2420 + ldr r0, =0x086158d0 bl Window_InitFromTemplates _081B23E2: bl TextBox_ResetSomeField @@ -887826,7 +857660,7 @@ _081B23E8: movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _081B2424 + ldr r0, =0x0860f074 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -887834,8 +857668,7 @@ _081B23E8: pop {r0} bx r0 .align 2, 0 -_081B2420: .4byte 0x086158d0 -_081B2424: .4byte 0x0860f074 + .pool thumb_func_end sub_81B239C thumb_func_start sub_81B2428 @@ -887844,7 +857677,7 @@ sub_81B2428: @ 81B2428 sub sp, 0x14 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081B24A0 + ldr r0, =0x0203cec8 ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 @@ -887854,7 +857687,7 @@ sub_81B2428: @ 81B2428 _081B243E: cmp r2, 0x1 bne _081B24B4 - ldr r0, _081B24A4 + ldr r0, =0x08615918 bl Window_AddFromTemplate adds r4, r0, 0 lsls r4, 24 @@ -887862,7 +857695,7 @@ _081B243E: adds r0, r4, 0 movs r1, 0 bl Window_FastFillPixels - ldr r5, _081B24A8 + ldr r5, =0x085e8ce3 movs r0, 0 adds r1, r5, 0 movs r2, 0x30 @@ -887872,7 +857705,7 @@ _081B243E: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] - ldr r0, _081B24AC + ldr r0, =0x086157fc str r0, [sp, 0x8] movs r0, 0x1 negs r0, r0 @@ -887887,20 +857720,16 @@ _081B243E: adds r0, r4, 0 movs r1, 0x2 bl Window_CopyToVram - ldr r0, _081B24B0 + ldr r0, =0x08615910 bl Window_AddFromTemplate lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 b _081B24C0 .align 2, 0 -_081B24A0: .4byte 0x0203cec8 -_081B24A4: .4byte 0x08615918 -_081B24A8: .4byte 0x085e8ce3 -_081B24AC: .4byte 0x086157fc -_081B24B0: .4byte 0x08615910 + .pool _081B24B4: - ldr r0, _081B2504 + ldr r0, =0x08615908 bl Window_AddFromTemplate lsls r0, 24 lsrs r5, r0, 24 @@ -887909,13 +857738,13 @@ _081B24C0: adds r0, r5, 0 movs r1, 0 bl Window_FastFillPixels - ldr r0, _081B2508 + ldr r0, =0x0203cec8 ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0xA beq _081B2514 - ldr r4, _081B250C + ldr r4, =0x085e8cf0 movs r0, 0 adds r1, r4, 0 movs r2, 0x30 @@ -887925,7 +857754,7 @@ _081B24C0: adds r2, r6 lsls r2, 24 lsrs r2, 24 - ldr r0, _081B2510 + ldr r0, =0x086157fc str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -887937,12 +857766,9 @@ _081B24C0: bl box_print b _081B2540 .align 2, 0 -_081B2504: .4byte 0x08615908 -_081B2508: .4byte 0x0203cec8 -_081B250C: .4byte 0x085e8cf0 -_081B2510: .4byte 0x086157fc + .pool _081B2514: - ldr r4, _081B255C + ldr r4, =0x085e8cf7 movs r0, 0 adds r1, r4, 0 movs r2, 0x30 @@ -887952,7 +857778,7 @@ _081B2514: adds r2, r6 lsls r2, 24 lsrs r2, 24 - ldr r0, _081B2560 + ldr r0, =0x086157fc str r0, [sp] movs r0, 0x1 negs r0, r0 @@ -887976,14 +857802,13 @@ _081B2554: pop {r0} bx r0 .align 2, 0 -_081B255C: .4byte 0x085e8cf7 -_081B2560: .4byte 0x086157fc + .pool thumb_func_end sub_81B2428 thumb_func_start sub_81B2564 sub_81B2564: @ 81B2564 lsls r0, 24 - ldr r1, _081B2574 + ldr r1, =0x0203cec4 lsrs r0, 23 adds r0, 0x18 ldr r1, [r1] @@ -887991,7 +857816,7 @@ sub_81B2564: @ 81B2564 adds r0, r1, 0 bx lr .align 2, 0 -_081B2574: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B2564 thumb_func_start sub_81B2578 @@ -888136,7 +857961,7 @@ sub_81B2658: @ 81B2658 _081B2684: cmp r5, 0 bne _081B26A0 - ldr r1, _081B269C + ldr r1, =0x08615988 str r2, [sp] str r3, [sp, 0x4] str r4, [sp, 0x8] @@ -888145,9 +857970,9 @@ _081B2684: bl sub_81B2578 b _081B26B0 .align 2, 0 -_081B269C: .4byte 0x08615988 + .pool _081B26A0: - ldr r1, _081B26B8 + ldr r1, =0x086159ce str r2, [sp] str r3, [sp, 0x4] str r4, [sp, 0x8] @@ -888160,7 +857985,7 @@ _081B26B0: pop {r0} bx r0 .align 2, 0 -_081B26B8: .4byte 0x086159ce + .pool thumb_func_end sub_81B2658 thumb_func_start sub_81B26BC @@ -888190,7 +858015,7 @@ sub_81B26BC: @ 81B26BC _081B26E8: cmp r5, 0 bne _081B2704 - ldr r1, _081B2700 + ldr r1, =0x08615a14 str r2, [sp] str r3, [sp, 0x4] str r4, [sp, 0x8] @@ -888199,9 +858024,9 @@ _081B26E8: bl sub_81B2578 b _081B2714 .align 2, 0 -_081B2700: .4byte 0x08615a14 + .pool _081B2704: - ldr r1, _081B271C + ldr r1, =0x08615a4a str r2, [sp] str r3, [sp, 0x4] str r4, [sp, 0x8] @@ -888214,7 +858039,7 @@ _081B2714: pop {r0} bx r0 .align 2, 0 -_081B271C: .4byte 0x08615a4a + .pool thumb_func_end sub_81B26BC thumb_func_start sub_81B2720 @@ -888223,7 +858048,7 @@ sub_81B2720: @ 81B2720 sub sp, 0xC lsls r0, 24 lsrs r0, 24 - ldr r1, _081B2744 + ldr r1, =0x08615a80 movs r2, 0 str r2, [sp] movs r2, 0x12 @@ -888237,7 +858062,7 @@ sub_81B2720: @ 81B2720 pop {r0} bx r0 .align 2, 0 -_081B2744: .4byte 0x08615a80 + .pool thumb_func_end sub_81B2720 thumb_func_start sub_81B2748 @@ -888256,14 +858081,13 @@ sub_81B2748: @ 81B2748 ands r0, r4 cmp r0, 0 beq _081B277C - ldr r5, _081B2774 + ldr r5, =0x08615af1 ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B2778 + ldr r4, =0x08615ac0 b _081B297E .align 2, 0 -_081B2774: .4byte 0x08615af1 -_081B2778: .4byte 0x08615ac0 + .pool _081B277C: movs r0, 0x20 ands r0, r4 @@ -888273,15 +858097,15 @@ _081B277C: ands r0, r4 cmp r0, 0 beq _081B2794 - ldr r5, _081B2790 + ldr r5, =0x08615adf b _081B2942 .align 2, 0 -_081B2790: .4byte 0x08615adf + .pool _081B2794: - ldr r5, _081B27CC + ldr r5, =0x08615adf ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B27D0 + ldr r4, =0x08615aba ldrb r1, [r4] adds r1, r6 movs r2, 0x2 @@ -888298,21 +858122,19 @@ _081B2794: adds r1, r6 movs r2, 0x2 bl gpu_pal_apply - ldr r5, _081B27D4 + ldr r5, =0x08615aee b _081B2976 .align 2, 0 -_081B27CC: .4byte 0x08615adf -_081B27D0: .4byte 0x08615aba -_081B27D4: .4byte 0x08615aee + .pool _081B27D8: movs r0, 0x10 ands r0, r4 cmp r0, 0 beq _081B2824 - ldr r5, _081B2818 + ldr r5, =0x08615adf ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B281C + ldr r4, =0x08615aba ldrb r1, [r4] adds r1, r6 movs r2, 0x2 @@ -888329,12 +858151,10 @@ _081B27D8: adds r1, r6 movs r2, 0x2 bl gpu_pal_apply - ldr r5, _081B2820 + ldr r5, =0x08615aee b _081B2976 .align 2, 0 -_081B2818: .4byte 0x08615adf -_081B281C: .4byte 0x08615aba -_081B2820: .4byte 0x08615aee + .pool _081B2824: movs r0, 0x4 ands r0, r4 @@ -888344,15 +858164,15 @@ _081B2824: ands r0, r4 cmp r0, 0 beq _081B283C - ldr r5, _081B2838 + ldr r5, =0x08615adf b _081B2942 .align 2, 0 -_081B2838: .4byte 0x08615adf + .pool _081B283C: - ldr r5, _081B2874 + ldr r5, =0x08615adf ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B2878 + ldr r4, =0x08615aba ldrb r1, [r4] adds r1, r6 movs r2, 0x2 @@ -888369,12 +858189,10 @@ _081B283C: adds r1, r6 movs r2, 0x2 bl gpu_pal_apply - ldr r5, _081B287C + ldr r5, =0x08615aee b _081B2976 .align 2, 0 -_081B2874: .4byte 0x08615adf -_081B2878: .4byte 0x08615aba -_081B287C: .4byte 0x08615aee + .pool _081B2880: movs r0, 0x2 ands r0, r4 @@ -888384,15 +858202,15 @@ _081B2880: ands r0, r4 cmp r0, 0 beq _081B2898 - ldr r5, _081B2894 + ldr r5, =0x08615adc b _081B2942 .align 2, 0 -_081B2894: .4byte 0x08615adc + .pool _081B2898: - ldr r5, _081B28D0 + ldr r5, =0x08615ad3 ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B28D4 + ldr r4, =0x08615aba ldrb r1, [r4] adds r1, r6 movs r2, 0x2 @@ -888409,12 +858227,10 @@ _081B2898: adds r1, r6 movs r2, 0x2 bl gpu_pal_apply - ldr r5, _081B28D8 + ldr r5, =0x08615ae8 b _081B2976 .align 2, 0 -_081B28D0: .4byte 0x08615ad3 -_081B28D4: .4byte 0x08615aba -_081B28D8: .4byte 0x08615ae8 + .pool _081B28DC: movs r0, 0x8 ands r0, r4 @@ -888424,15 +858240,15 @@ _081B28DC: ands r0, r4 cmp r0, 0 beq _081B28F4 - ldr r5, _081B28F0 + ldr r5, =0x08615ad9 b _081B2942 .align 2, 0 -_081B28F0: .4byte 0x08615ad9 + .pool _081B28F4: - ldr r5, _081B292C + ldr r5, =0x08615ad0 ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B2930 + ldr r4, =0x08615aba ldrb r1, [r4] adds r1, r6 movs r2, 0x2 @@ -888449,22 +858265,20 @@ _081B28F4: adds r1, r6 movs r2, 0x2 bl gpu_pal_apply - ldr r5, _081B2934 + ldr r5, =0x08615ae5 b _081B2976 .align 2, 0 -_081B292C: .4byte 0x08615ad0 -_081B2930: .4byte 0x08615aba -_081B2934: .4byte 0x08615ae5 + .pool _081B2938: movs r0, 0x1 ands r5, r0 cmp r5, 0 beq _081B29BC - ldr r5, _081B29AC + ldr r5, =0x08615ad6 _081B2942: ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B29B0 + ldr r4, =0x08615aba ldrb r1, [r4] adds r1, r6 movs r2, 0x2 @@ -888481,11 +858295,11 @@ _081B2942: adds r1, r6 movs r2, 0x2 bl gpu_pal_apply - ldr r5, _081B29B4 + ldr r5, =0x08615aeb _081B2976: ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B29B8 + ldr r4, =0x08615abd _081B297E: ldrb r1, [r4] adds r1, r6 @@ -888505,15 +858319,12 @@ _081B297E: bl gpu_pal_apply b _081B2A24 .align 2, 0 -_081B29AC: .4byte 0x08615ad6 -_081B29B0: .4byte 0x08615aba -_081B29B4: .4byte 0x08615aeb -_081B29B8: .4byte 0x08615abd + .pool _081B29BC: - ldr r5, _081B2A2C + ldr r5, =0x08615acd ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B2A30 + ldr r4, =0x08615aba ldrb r1, [r4] adds r1, r7 movs r2, 0x2 @@ -888530,10 +858341,10 @@ _081B29BC: adds r1, r7 movs r2, 0x2 bl gpu_pal_apply - ldr r5, _081B2A34 + ldr r5, =0x08615ae2 ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B2A38 + ldr r4, =0x08615abd ldrb r1, [r4] adds r1, r7 movs r2, 0x2 @@ -888555,10 +858366,7 @@ _081B2A24: pop {r0} bx r0 .align 2, 0 -_081B2A2C: .4byte 0x08615acd -_081B2A30: .4byte 0x08615aba -_081B2A34: .4byte 0x08615ae2 -_081B2A38: .4byte 0x08615abd + .pool thumb_func_end sub_81B2748 thumb_func_start sub_81B2A3C @@ -888573,7 +858381,7 @@ sub_81B2A3C: @ 81B2A3C ldrb r3, [r3, 0x1] lsls r4, r2, 1 adds r4, r2 - ldr r2, _081B2A6C + ldr r2, =0x086157fc adds r4, r2 str r4, [sp] movs r2, 0 @@ -888587,7 +858395,7 @@ sub_81B2A3C: @ 81B2A3C pop {r0} bx r0 .align 2, 0 -_081B2A6C: .4byte 0x086157fc + .pool thumb_func_end sub_81B2A3C thumb_func_start sub_81B2A70 @@ -888705,14 +858513,14 @@ sub_81B2B40: @ 81B2B40 adds r6, r1, 0 lsls r2, 24 lsrs r2, 24 - ldr r5, _081B2B80 + ldr r5, =0x02021dc4 adds r0, r5, 0 adds r1, r2, 0 movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r4, _081B2B84 - ldr r1, _081B2B88 + ldr r4, =0x02021cc4 + ldr r1, =0x085e8d4d adds r0, r4, 0 bl gf_strcpy adds r0, r4, 0 @@ -888728,9 +858536,7 @@ sub_81B2B40: @ 81B2B40 pop {r0} bx r0 .align 2, 0 -_081B2B80: .4byte 0x02021dc4 -_081B2B84: .4byte 0x02021cc4 -_081B2B88: .4byte 0x085e8d4d + .pool thumb_func_end sub_81B2B40 thumb_func_start sub_81B2B8C @@ -888813,7 +858619,7 @@ _081B2C24: movs r0, 0xB adds r1, r5, 0 muls r1, r0 - ldr r0, _081B2C44 + ldr r0, =0x083185c8 adds r1, r0 mov r0, r9 bl sub_8008C44 @@ -888827,12 +858633,12 @@ _081B2C38: beq _081B2C88 b _081B2CBA .align 2, 0 -_081B2C44: .4byte 0x083185c8 + .pool _081B2C48: - ldr r5, _081B2C7C + ldr r5, =0x08615ac3 ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B2C80 + ldr r4, =0x08615ab6 ldrb r1, [r4] adds r1, r6 movs r2, 0x2 @@ -888844,21 +858650,19 @@ _081B2C48: movs r2, 0x2 bl gpu_pal_apply ldrb r0, [r7, 0x8] - ldr r1, _081B2C84 + ldr r1, =0x085e8d49 ldr r3, [r7] adds r3, 0xC movs r2, 0x2 bl sub_81B2A3C b _081B2CBA .align 2, 0 -_081B2C7C: .4byte 0x08615ac3 -_081B2C80: .4byte 0x08615ab6 -_081B2C84: .4byte 0x085e8d49 + .pool _081B2C88: - ldr r5, _081B2CC8 + ldr r5, =0x08615ac5 ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B2CCC + ldr r4, =0x08615ab6 ldrb r1, [r4] adds r1, r6 movs r2, 0x2 @@ -888870,7 +858674,7 @@ _081B2C88: movs r2, 0x2 bl gpu_pal_apply ldrb r0, [r7, 0x8] - ldr r1, _081B2CD0 + ldr r1, =0x085e8d4b ldr r3, [r7] adds r3, 0xC movs r2, 0x2 @@ -888883,9 +858687,7 @@ _081B2CBA: pop {r0} bx r0 .align 2, 0 -_081B2CC8: .4byte 0x08615ac5 -_081B2CCC: .4byte 0x08615ab6 -_081B2CD0: .4byte 0x085e8d4b + .pool thumb_func_end sub_81B2BF4 thumb_func_start sub_81B2CD4 @@ -888948,7 +858750,7 @@ sub_81B2D3C: @ 81B2D3C adds r4, r1, 0 lsls r2, 16 lsrs r2, 16 - ldr r5, _081B2D70 + ldr r5, =0x02021cc4 adds r0, r5, 0 adds r1, r2, 0 movs r2, 0x1 @@ -888968,7 +858770,7 @@ sub_81B2D3C: @ 81B2D3C pop {r0} bx r0 .align 2, 0 -_081B2D70: .4byte 0x02021cc4 + .pool thumb_func_end sub_81B2D3C thumb_func_start sub_81B2D74 @@ -889032,14 +858834,14 @@ sub_81B2DDC: @ 81B2DDC adds r6, r1, 0 lsls r2, 16 lsrs r2, 16 - ldr r5, _081B2E1C + ldr r5, =0x02021dc4 adds r0, r5, 0 adds r1, r2, 0 movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string - ldr r4, _081B2E20 - ldr r1, _081B2E24 + ldr r4, =0x02021cc4 + ldr r1, =0x085e8d3e adds r0, r4, 0 bl gf_strcpy adds r0, r4, 0 @@ -889055,9 +858857,7 @@ sub_81B2DDC: @ 81B2DDC pop {r0} bx r0 .align 2, 0 -_081B2E1C: .4byte 0x02021dc4 -_081B2E20: .4byte 0x02021cc4 -_081B2E24: .4byte 0x085e8d3e + .pool thumb_func_end sub_81B2DDC thumb_func_start sub_81B2E28 @@ -889124,16 +858924,16 @@ sub_81B2E64: @ 81B2E64 blt _081B2EE0 cmp r0, 0x4 bgt _081B2EE0 - ldr r5, _081B2EAC + ldr r5, =0x08615ac7 b _081B2EB2 .align 2, 0 -_081B2EAC: .4byte 0x08615ac7 + .pool _081B2EB0: - ldr r5, _081B2ED8 + ldr r5, =0x08615ac9 _081B2EB2: ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B2EDC + ldr r4, =0x08615ab8 ldrb r1, [r4] adds r1, r7 movs r2, 0x2 @@ -889146,13 +858946,12 @@ _081B2EB2: bl gpu_pal_apply b _081B2F04 .align 2, 0 -_081B2ED8: .4byte 0x08615ac9 -_081B2EDC: .4byte 0x08615ab8 + .pool _081B2EE0: - ldr r5, _081B2FA0 + ldr r5, =0x08615acb ldrb r0, [r5] bl sub_81B2564 - ldr r4, _081B2FA4 + ldr r4, =0x08615ab8 ldrb r1, [r4] adds r1, r7 movs r2, 0x2 @@ -889176,7 +858975,7 @@ _081B2F04: lsls r0, 24 lsrs r5, r0, 24 ldrb r0, [r6, 0x8] - ldr r4, _081B2FA4 + ldr r4, =0x08615ab8 ldrb r1, [r4, 0x1] ldr r3, [r6] ldrb r2, [r3, 0x18] @@ -889237,8 +859036,7 @@ _081B2F88: pop {r0} bx r0 .align 2, 0 -_081B2FA0: .4byte 0x08615acb -_081B2FA4: .4byte 0x08615ab8 + .pool thumb_func_end sub_81B2E64 thumb_func_start sub_81B2FA8 @@ -889286,11 +859084,11 @@ _081B2FF2: ldr r1, [r6] ldrb r2, [r1, 0x1C] ldrb r3, [r1, 0x1D] - ldr r1, _081B3024 + ldr r1, =0x086157fc str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r4, _081B3028 + ldr r4, =0x08615b60 mov r5, r8 lsls r1, r5, 2 adds r1, r4 @@ -889306,8 +859104,7 @@ _081B3018: pop {r0} bx r0 .align 2, 0 -_081B3024: .4byte 0x086157fc -_081B3028: .4byte 0x08615b60 + .pool thumb_func_end sub_81B2FA8 thumb_func_start sub_81B302C @@ -889336,7 +859133,7 @@ sub_81B3054: @ 81B3054 push {r4-r6,lr} sub sp, 0xC adds r6, r0, 0 - ldr r0, _081B3084 + ldr r0, =0x0203cec4 ldr r4, [r0] adds r5, r4, 0 adds r5, 0xD @@ -889353,13 +859150,12 @@ _081B306E: cmp r0, 0x5 bhi _081B30D4 lsls r0, 2 - ldr r1, _081B3088 + ldr r1, =_081B308C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081B3084: .4byte 0x0203cec4 -_081B3088: .4byte _081B308C + .pool .align 2, 0 _081B308C: .4byte _081B30A4 @@ -889369,41 +859165,41 @@ _081B308C: .4byte _081B30B4 .4byte _081B30C4 _081B30A4: - ldr r0, _081B30A8 + ldr r0, =0x08615928 b _081B30C6 .align 2, 0 -_081B30A8: .4byte 0x08615928 + .pool _081B30AC: - ldr r0, _081B30B0 + ldr r0, =0x08615930 b _081B30C6 .align 2, 0 -_081B30B0: .4byte 0x08615930 + .pool _081B30B4: - ldr r0, _081B30B8 + ldr r0, =0x08615938 b _081B30C6 .align 2, 0 -_081B30B8: .4byte 0x08615938 + .pool _081B30BC: - ldr r0, _081B30C0 + ldr r0, =0x08615940 b _081B30C6 .align 2, 0 -_081B30C0: .4byte 0x08615940 + .pool _081B30C4: - ldr r0, _081B30D0 + ldr r0, =0x08615948 _081B30C6: bl Window_AddFromTemplate strb r0, [r5] b _081B30DC .align 2, 0 -_081B30D0: .4byte 0x08615948 + .pool _081B30D4: - ldr r0, _081B30F0 + ldr r0, =0x08615920 bl Window_AddFromTemplate strb r0, [r4, 0xD] _081B30DC: cmp r6, 0 bne _081B3104 - ldr r0, _081B30F4 + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x8] lsls r0, 31 @@ -889412,8 +859208,7 @@ _081B30DC: movs r6, 0x2 b _081B3104 .align 2, 0 -_081B30F0: .4byte 0x08615920 -_081B30F4: .4byte 0x0203cec4 + .pool _081B30F8: bl sub_81B314C lsls r0, 24 @@ -889426,8 +859221,8 @@ _081B3104: movs r2, 0x4F movs r3, 0xD bl SetWindowBorderStyle - ldr r4, _081B3144 - ldr r1, _081B3148 + ldr r4, =0x02021fc4 + ldr r1, =0x08615af4 lsls r0, r6, 2 adds r0, r1 ldr r1, [r0] @@ -889451,16 +859246,15 @@ _081B313C: pop {r0} bx r0 .align 2, 0 -_081B3144: .4byte 0x02021fc4 -_081B3148: .4byte 0x08615af4 + .pool thumb_func_end sub_81B3054 thumb_func_start sub_81B314C sub_81B314C: @ 81B314C push {r4-r7,lr} - ldr r7, _081B3160 + ldr r7, =0x020244ec movs r6, 0 - ldr r0, _081B3164 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x1 bne _081B3168 @@ -889468,8 +859262,7 @@ _081B315A: movs r0, 0x1 b _081B31AA .align 2, 0 -_081B3160: .4byte 0x020244ec -_081B3164: .4byte 0x0203cec8 + .pool _081B3168: movs r5, 0 _081B316A: @@ -889531,7 +859324,7 @@ _081B31CC: beq _081B3214 b _081B321C _081B31D2: - ldr r0, _081B3204 + ldr r0, =0x0203cec4 ldr r1, [r0] ldrb r0, [r1, 0x17] lsls r0, 1 @@ -889547,7 +859340,7 @@ _081B31D2: str r0, [sp, 0x4] movs r0, 0xE str r0, [sp, 0x8] - ldr r0, _081B3208 + ldr r0, =0x000002e9 str r0, [sp, 0xC] add r0, sp, 0x14 movs r1, 0x2 @@ -889555,20 +859348,19 @@ _081B31D2: bl rbox_template_set b _081B3226 .align 2, 0 -_081B3204: .4byte 0x0203cec4 -_081B3208: .4byte 0x000002e9 + .pool _081B320C: - ldr r0, _081B3210 + ldr r0, =0x08615950 b _081B321E .align 2, 0 -_081B3210: .4byte 0x08615950 + .pool _081B3214: - ldr r0, _081B3218 + ldr r0, =0x08615958 b _081B321E .align 2, 0 -_081B3218: .4byte 0x08615958 + .pool _081B321C: - ldr r0, _081B3248 + ldr r0, =0x08615960 _081B321E: ldr r1, [r0, 0x4] ldr r0, [r0] @@ -889577,7 +859369,7 @@ _081B321E: _081B3226: add r0, sp, 0x14 bl Window_AddFromTemplate - ldr r6, _081B324C + ldr r6, =0x0203cec4 ldr r1, [r6] strb r0, [r1, 0xC] ldr r0, [r6] @@ -889591,8 +859383,7 @@ _081B3226: ldr r0, [r6] b _081B32E2 .align 2, 0 -_081B3248: .4byte 0x08615960 -_081B324C: .4byte 0x0203cec4 + .pool _081B3250: movs r0, 0x1 movs r1, 0 @@ -889634,11 +859425,11 @@ _081B328C: str r6, [sp, 0x4] lsls r1, r2, 1 adds r1, r2 - ldr r2, _081B32F4 + ldr r2, =0x086157fc adds r1, r2 str r1, [sp, 0x8] str r6, [sp, 0xC] - ldr r2, _081B32F8 + ldr r2, =0x08615c08 ldrb r1, [r4] lsls r1, 3 adds r1, r2 @@ -889655,7 +859446,7 @@ _081B328C: cmp r5, r0 bcc _081B327A _081B32CA: - ldr r4, _081B32FC + ldr r4, =0x0203cec4 ldr r1, [r4] ldrb r0, [r1, 0xC] ldrb r1, [r1, 0x17] @@ -889675,9 +859466,7 @@ _081B32E2: pop {r1} bx r1 .align 2, 0 -_081B32F4: .4byte 0x086157fc -_081B32F8: .4byte 0x08615c08 -_081B32FC: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B31B0 thumb_func_start sub_81B3300 @@ -889690,7 +859479,7 @@ sub_81B3300: @ 81B3300 movs r2, 0x4F movs r3, 0xD bl SetWindowBorderStyle - ldr r2, _081B3348 + ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -889716,13 +859505,13 @@ sub_81B3300: @ 81B3300 pop {r0} bx r0 .align 2, 0 -_081B3348: .4byte 0x03003014 + .pool thumb_func_end sub_81B3300 thumb_func_start sub_81B334C sub_81B334C: @ 81B334C push {lr} - ldr r0, _081B3360 + ldr r0, =0x08615968 movs r1, 0x4F movs r2, 0xD movs r3, 0 @@ -889730,15 +859519,15 @@ sub_81B334C: @ 81B334C pop {r0} bx r0 .align 2, 0 -_081B3360: .4byte 0x08615968 + .pool thumb_func_end sub_81B334C thumb_func_start sub_81B3364 sub_81B3364: @ 81B3364 push {r4,lr} - ldr r0, _081B338C + ldr r0, =0x08615970 bl Window_AddFromTemplate - ldr r4, _081B3390 + ldr r4, =0x0203cec4 ldr r1, [r4] strb r0, [r1, 0xC] ldr r0, [r4] @@ -889753,14 +859542,13 @@ sub_81B3364: @ 81B3364 pop {r1} bx r1 .align 2, 0 -_081B338C: .4byte 0x08615970 -_081B3390: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B3364 thumb_func_start sub_81B3394 sub_81B3394: @ 81B3394 push {r4,lr} - ldr r4, _081B33B0 + ldr r4, =0x0203cec4 ldr r0, [r4] ldrb r0, [r0, 0xC] bl Window_FillTileMap @@ -889771,7 +859559,7 @@ sub_81B3394: @ 81B3394 pop {r0} bx r0 .align 2, 0 -_081B33B0: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B3394 thumb_func_start sub_81B33B4 @@ -889786,9 +859574,9 @@ sub_81B33B4: @ 81B33B4 bl sub_81B3414 b _081B3400 _081B33C8: - ldr r4, _081B3408 + ldr r4, =0x0203cec4 ldr r1, [r4] - ldr r0, _081B340C + ldr r0, =0x08615d70 adds r0, r2, r0 ldrb r0, [r0] strb r0, [r1, 0x17] @@ -889797,7 +859585,7 @@ _081B33C8: ldrb r0, [r0, 0x17] cmp r3, r0 bcs _081B3400 - ldr r1, _081B3410 + ldr r1, =0x08615d38 lsls r0, r2, 2 adds r2, r0, r1 _081B33E4: @@ -889820,9 +859608,7 @@ _081B3400: pop {r0} bx r0 .align 2, 0 -_081B3408: .4byte 0x0203cec4 -_081B340C: .4byte 0x08615d70 -_081B3410: .4byte 0x08615d38 + .pool thumb_func_end sub_81B33B4 thumb_func_start sub_81B3414 @@ -889837,7 +859623,7 @@ sub_81B3414: @ 81B3414 lsls r1, 24 lsrs r1, 24 mov r10, r1 - ldr r2, _081B3488 + ldr r2, =0x0203cec4 ldr r1, [r2] movs r0, 0 strb r0, [r1, 0x17] @@ -889848,7 +859634,7 @@ sub_81B3414: @ 81B3414 movs r2, 0 bl append_byte movs r7, 0 - ldr r0, _081B348C + ldr r0, =0x08615d7e ldrh r0, [r0] str r0, [sp] _081B3446: @@ -889861,7 +859647,7 @@ _081B3446: movs r0, 0x64 mov r6, r10 muls r6, r0 - ldr r5, _081B348C + ldr r5, =0x08615d7e _081B345A: mov r1, r9 adds r0, r1, r6 @@ -889873,7 +859659,7 @@ _081B345A: ldrh r1, [r1] cmp r0, r1 bne _081B3490 - ldr r0, _081B3488 + ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 adds r0, 0xF @@ -889885,8 +859671,7 @@ _081B345A: bl append_byte b _081B34A0 .align 2, 0 -_081B3488: .4byte 0x0203cec4 -_081B348C: .4byte 0x08615d7e + .pool _081B3490: adds r0, r4, 0x1 lsls r0, 24 @@ -889912,7 +859697,7 @@ _081B34A0: bl pokemon_getattr cmp r0, 0 beq _081B34D2 - ldr r0, _081B3504 + ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 adds r0, 0xF @@ -889933,7 +859718,7 @@ _081B34D2: lsls r0, 24 cmp r0, 0 beq _081B3508 - ldr r0, _081B3504 + ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 adds r0, 0xF @@ -889942,9 +859727,9 @@ _081B34D2: bl append_byte b _081B3518 .align 2, 0 -_081B3504: .4byte 0x0203cec4 + .pool _081B3508: - ldr r0, _081B3538 + ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 adds r0, 0xF @@ -889952,7 +859737,7 @@ _081B3508: movs r2, 0x3 bl append_byte _081B3518: - ldr r0, _081B3538 + ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 adds r0, 0xF @@ -889968,14 +859753,14 @@ _081B3518: pop {r0} bx r0 .align 2, 0 -_081B3538: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B3414 thumb_func_start sub_81B353C sub_81B353C: @ 81B353C push {r4,lr} adds r4, r0, 0 - ldr r1, _081B3558 + ldr r1, =0x0203cec8 ldrb r0, [r1, 0x8] lsls r0, 28 lsrs r0, 28 @@ -889983,13 +859768,12 @@ sub_81B353C: @ 81B353C cmp r0, 0xC bhi _081B35FE lsls r0, 2 - ldr r1, _081B355C + ldr r1, =_081B3560 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081B3558: .4byte 0x0203cec8 -_081B355C: .4byte _081B3560 + .pool .align 2, 0 _081B3560: .4byte _081B3594 @@ -890081,17 +859865,17 @@ sub_81B3608: @ 81B3608 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r4, _081B3664 + ldr r4, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r4, r1] movs r0, 0x64 muls r0, r1 - ldr r7, _081B3668 + ldr r7, =0x020244ec adds r5, r0, r7 - ldr r1, _081B366C + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 - ldr r0, _081B3670 + ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xD bl sub_81B302C @@ -890115,10 +859899,7 @@ sub_81B3608: @ 81B3608 bl sub_81B3054 b _081B36EA .align 2, 0 -_081B3664: .4byte 0x0203cec8 -_081B3668: .4byte 0x020244ec -_081B366C: .4byte 0x02021cc4 -_081B3670: .4byte 0x0203cec4 + .pool _081B3674: adds r0, r5, 0 movs r1, 0xC @@ -890127,8 +859908,8 @@ _081B3674: lsrs r6, r0, 16 cmp r6, 0 bne _081B36C0 - ldr r4, _081B36B0 - ldr r1, _081B36B4 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9980 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -890136,21 +859917,18 @@ _081B3674: bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B36B8 + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 lsls r0, 3 adds r0, r1 - ldr r1, _081B36BC + ldr r1, =sub_81B469C + 1 str r1, [r0] movs r0, 0 b _081B36EC .align 2, 0 -_081B36B0: .4byte 0x02021fc4 -_081B36B4: .4byte 0x085e9980 -_081B36B8: .4byte 0x03005e00 -_081B36BC: .4byte sub_81B469C + 1 + .pool _081B36C0: ldrb r4, [r4, 0x9] adds r0, r5, 0 @@ -890163,7 +859941,7 @@ _081B36C0: bl sub_81B33B4 movs r0, 0x1 bl sub_81B31B0 - ldr r1, _081B36F8 + ldr r1, =0x02021dc4 adds r0, r6, 0 bl itemid_get_name movs r0, 0x1A @@ -890177,7 +859955,7 @@ _081B36EC: pop {r1} bx r1 .align 2, 0 -_081B36F8: .4byte 0x02021dc4 + .pool thumb_func_end sub_81B3608 thumb_func_start sub_81B36FC @@ -890190,22 +859968,21 @@ sub_81B36FC: @ 81B36FC lsls r0, 24 cmp r0, 0 beq _081B3720 - ldr r1, _081B3728 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, _081B372C + ldr r1, =sub_81B3730 + 1 str r1, [r0] _081B3720: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B3728: .4byte 0x03005e00 -_081B372C: .4byte sub_81B3730 + 1 + .pool thumb_func_end sub_81B36FC thumb_func_start sub_81B3730 @@ -890213,7 +859990,7 @@ sub_81B3730: @ 81B3730 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _081B3768 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -890227,9 +860004,9 @@ sub_81B3730: @ 81B3730 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081B376C + ldr r1, =0x03005e08 adds r5, r0, r1 - ldr r0, _081B3770 + ldr r0, =0x0203cec4 ldr r0, [r0] ldrb r0, [r0, 0x17] cmp r0, 0x3 @@ -890237,9 +860014,7 @@ sub_81B3730: @ 81B3730 bl ProcessMenuInputNoWrapAround_other b _081B3778 .align 2, 0 -_081B3768: .4byte 0x02037fd4 -_081B376C: .4byte 0x03005e08 -_081B3770: .4byte 0x0203cec4 + .pool _081B3774: bl ProcessMenuInput_other _081B3778: @@ -890260,11 +860035,11 @@ _081B3778: bne _081B37CC movs r0, 0x5 bl audio_play - ldr r4, _081B37C4 + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xE bl sub_81B302C - ldr r2, _081B37C8 + ldr r2, =0x08615c08 ldr r0, [r4] ldrb r1, [r0, 0x17] adds r0, r1 @@ -890277,14 +860052,13 @@ _081B3778: bl _call_via_r1 b _081B37EE .align 2, 0 -_081B37C4: .4byte 0x0203cec4 -_081B37C8: .4byte 0x08615c08 + .pool _081B37CC: - ldr r4, _081B37F4 + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xE bl sub_81B302C - ldr r1, _081B37F8 + ldr r1, =0x08615c08 ldr r0, [r4] adds r0, 0xF adds r0, r5 @@ -890300,8 +860074,7 @@ _081B37EE: pop {r0} bx r0 .align 2, 0 -_081B37F4: .4byte 0x0203cec4 -_081B37F8: .4byte 0x08615c08 + .pool thumb_func_end sub_81B3730 thumb_func_start sub_81B37FC @@ -890312,9 +860085,9 @@ sub_81B37FC: @ 81B37FC lsrs r4, 24 movs r0, 0x5 bl audio_play - ldr r0, _081B3820 + ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, _081B3824 + ldr r0, =sub_81B3828 + 1 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 @@ -890322,47 +860095,43 @@ sub_81B37FC: @ 81B37FC pop {r0} bx r0 .align 2, 0 -_081B3820: .4byte 0x0203cec4 -_081B3824: .4byte sub_81B3828 + 1 + .pool thumb_func_end sub_81B37FC thumb_func_start sub_81B3828 sub_81B3828: @ 81B3828 push {r4,lr} sub sp, 0x4 - ldr r4, _081B3858 + ldr r4, =0x0203cec8 ldrb r1, [r4, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0x1 bne _081B3868 bl pokemon_change_order - ldr r1, _081B385C + ldr r1, =0x020244ec ldrb r2, [r4, 0x9] - ldr r0, _081B3860 + ldr r0, =0x020244e9 ldrb r3, [r0] subs r3, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, _081B3864 + ldr r0, =sub_81B3894 + 1 str r0, [sp] movs r0, 0x1 bl sub_81BF8EC b _081B3880 .align 2, 0 -_081B3858: .4byte 0x0203cec8 -_081B385C: .4byte 0x020244ec -_081B3860: .4byte 0x020244e9 -_081B3864: .4byte sub_81B3894 + 1 + .pool _081B3868: - ldr r1, _081B3888 + ldr r1, =0x020244ec ldrb r2, [r4, 0x9] - ldr r0, _081B388C + ldr r0, =0x020244e9 ldrb r3, [r0] subs r3, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, _081B3890 + ldr r0, =sub_81B3894 + 1 str r0, [sp] movs r0, 0 bl sub_81BF8EC @@ -890372,22 +860141,20 @@ _081B3880: pop {r0} bx r0 .align 2, 0 -_081B3888: .4byte 0x020244ec -_081B388C: .4byte 0x020244e9 -_081B3890: .4byte sub_81B3894 + 1 + .pool thumb_func_end sub_81B3828 thumb_func_start sub_81B3894 sub_81B3894: @ 81B3894 push {lr} sub sp, 0xC - ldr r2, _081B38CC + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r3, _081B38D0 - ldr r0, _081B38D4 + ldr r3, =0x0203cec8 + ldr r0, =0x0203cf20 ldrb r0, [r0] strb r0, [r3, 0x9] ldrb r0, [r3, 0x8] @@ -890396,7 +860163,7 @@ sub_81B3894: @ 81B3894 ldrb r2, [r3, 0xB] movs r1, 0x15 str r1, [sp] - ldr r1, _081B38D8 + ldr r1, =sub_81B36FC + 1 str r1, [sp, 0x4] ldr r1, [r3] str r1, [sp, 0x8] @@ -890407,10 +860174,7 @@ sub_81B3894: @ 81B3894 pop {r0} bx r0 .align 2, 0 -_081B38CC: .4byte 0x02037fd4 -_081B38D0: .4byte 0x0203cec8 -_081B38D4: .4byte 0x0203cf20 -_081B38D8: .4byte sub_81B36FC + 1 + .pool thumb_func_end sub_81B3894 thumb_func_start brm_switch @@ -890421,10 +860185,10 @@ brm_switch: @ 81B38DC lsrs r6, 24 movs r0, 0x5 bl audio_play - ldr r5, _081B3928 + ldr r5, =0x0203cec8 movs r0, 0x8 strb r0, [r5, 0xB] - ldr r4, _081B392C + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xD bl sub_81B302C @@ -890438,21 +860202,18 @@ brm_switch: @ 81B38DC bl sub_81B0FCC ldrb r0, [r5, 0x9] strb r0, [r5, 0xA] - ldr r1, _081B3930 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B3934 + ldr r1, =sub_81B1370 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081B3928: .4byte 0x0203cec8 -_081B392C: .4byte 0x0203cec4 -_081B3930: .4byte 0x03005e00 -_081B3934: .4byte sub_81B1370 + 1 + .pool thumb_func_end brm_switch thumb_func_start sub_81B3938 @@ -890464,9 +860225,9 @@ sub_81B3938: @ 81B3938 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 - ldr r1, _081B3960 + ldr r1, =0x03005e08 adds r6, r0, r1 - ldr r3, _081B3964 + ldr r3, =0x0203cec8 movs r1, 0xA ldrsb r1, [r3, r1] movs r0, 0x9 @@ -890477,13 +860238,12 @@ sub_81B3938: @ 81B3938 bl sub_81B407C b _081B3ABA .align 2, 0 -_081B3960: .4byte 0x03005e08 -_081B3964: .4byte 0x0203cec8 + .pool _081B3968: add r2, sp, 0x8 movs r0, 0x9 ldrsb r0, [r3, r0] - ldr r1, _081B39C0 + ldr r1, =0x0203cedc ldr r1, [r1] lsls r0, 4 adds r0, r1 @@ -890520,17 +860280,17 @@ _081B3968: adds r0, r2, 0 b _081B39C6 .align 2, 0 -_081B39C0: .4byte 0x0203cedc + .pool _081B39C4: movs r0, 0x1 _081B39C6: strh r0, [r6, 0x14] add r2, sp, 0x8 - ldr r0, _081B3A24 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0xA] lsls r0, 24 asrs r0, 24 - ldr r1, _081B3A28 + ldr r1, =0x0203cedc ldr r1, [r1] lsls r0, 4 adds r0, r1 @@ -890567,13 +860327,12 @@ _081B39C6: adds r0, r2, 0 b _081B3A2E .align 2, 0 -_081B3A24: .4byte 0x0203cec8 -_081B3A28: .4byte 0x0203cedc + .pool _081B3A2C: movs r0, 0x1 _081B3A2E: strh r0, [r6, 0x16] - ldr r4, _081B3AC4 + ldr r4, =0x0203cef0 movs r0, 0x4 ldrsh r1, [r6, r0] movs r2, 0x6 @@ -890582,7 +860341,7 @@ _081B3A2E: muls r0, r1 bl malloc str r0, [r4] - ldr r5, _081B3AC8 + ldr r5, =0x0203cef4 movs r0, 0xC ldrsh r1, [r6, r0] movs r2, 0xE @@ -890615,7 +860374,7 @@ _081B3A2E: add r0, sp, 0x8 ldrb r0, [r0, 0x1] bl Window_FillTileMap - ldr r4, _081B3ACC + ldr r4, =0x0203cec8 movs r0, 0x9 strb r0, [r4, 0xB] ldrb r0, [r4, 0x9] @@ -890626,12 +860385,12 @@ _081B3A2E: bl sub_81B0FCC adds r0, r7, 0 bl sub_81B3CC0 - ldr r1, _081B3AD0 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081B3AD4 + ldr r1, =sub_81B3D48 + 1 str r1, [r0] _081B3ABA: add sp, 0xC @@ -890639,11 +860398,7 @@ _081B3ABA: pop {r0} bx r0 .align 2, 0 -_081B3AC4: .4byte 0x0203cef0 -_081B3AC8: .4byte 0x0203cef4 -_081B3ACC: .4byte 0x0203cec8 -_081B3AD0: .4byte 0x03005e00 -_081B3AD4: .4byte sub_81B3D48 + 1 + .pool thumb_func_end sub_81B3938 thumb_func_start sub_81B3AD8 @@ -890812,7 +860567,7 @@ _081B3BFA: thumb_func_start sub_81B3C0C sub_81B3C0C: @ 81B3C0C push {r4,lr} - ldr r4, _081B3C5C + ldr r4, =0x02020630 ldrb r2, [r0, 0xB] lsls r3, r2, 4 adds r3, r2 @@ -890851,7 +860606,7 @@ sub_81B3C0C: @ 81B3C0C pop {r0} bx r0 .align 2, 0 -_081B3C5C: .4byte 0x02020630 + .pool thumb_func_end sub_81B3C0C thumb_func_start sub_81B3C60 @@ -890862,14 +860617,14 @@ sub_81B3C60: @ 81B3C60 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081B3CB4 + ldr r0, =0x03005e08 adds r4, r1, r0 movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0 beq _081B3C8E - ldr r2, _081B3CB8 - ldr r0, _081B3CBC + ldr r2, =0x0203cedc + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] lsls r1, 4 @@ -890883,8 +860638,8 @@ _081B3C8E: ldrsh r0, [r4, r1] cmp r0, 0 beq _081B3CAC - ldr r2, _081B3CB8 - ldr r0, _081B3CBC + ldr r2, =0x0203cedc + ldr r0, =0x0203cec8 movs r1, 0xA ldrsb r1, [r0, r1] lsls r1, 4 @@ -890898,9 +860653,7 @@ _081B3CAC: pop {r0} bx r0 .align 2, 0 -_081B3CB4: .4byte 0x03005e08 -_081B3CB8: .4byte 0x0203cedc -_081B3CBC: .4byte 0x0203cec8 + .pool thumb_func_end sub_81B3C60 thumb_func_start sub_81B3CC0 @@ -890912,13 +860665,13 @@ sub_81B3CC0: @ 81B3CC0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081B3D3C + ldr r0, =0x03005e08 adds r5, r1, r0 movs r1, 0x14 ldrsh r0, [r5, r1] cmp r0, 0 beq _081B3D00 - ldr r0, _081B3D40 + ldr r0, =0x0203cef0 ldr r0, [r0] ldrh r1, [r5, 0x10] ldrh r2, [r5] @@ -890941,7 +860694,7 @@ _081B3D00: ldrsh r0, [r5, r1] cmp r0, 0 beq _081B3D2E - ldr r0, _081B3D44 + ldr r0, =0x0203cef4 ldr r0, [r0] ldrh r1, [r5, 0x12] ldrh r2, [r5, 0x8] @@ -890967,9 +860720,7 @@ _081B3D2E: pop {r0} bx r0 .align 2, 0 -_081B3D3C: .4byte 0x03005e08 -_081B3D40: .4byte 0x0203cef0 -_081B3D44: .4byte 0x0203cef4 + .pool thumb_func_end sub_81B3CC0 thumb_func_start sub_81B3D48 @@ -890984,7 +860735,7 @@ sub_81B3D48: @ 81B3D48 lsls r0, r4, 2 adds r0, r4 lsls r7, r0, 3 - ldr r0, _081B3E48 + ldr r0, =0x03005e08 mov r8, r0 adds r6, r7, r0 adds r0, r4, 0 @@ -891025,14 +860776,14 @@ sub_81B3D48: @ 81B3D48 negs r0, r0 strh r0, [r6, 0x16] bl swap_pokemon_and_oams - ldr r4, _081B3E4C + ldr r4, =0x0203cec8 ldrb r0, [r4, 0x9] bl sub_81B0948 ldrb r0, [r4, 0xA] bl sub_81B0948 movs r0, 0x9 ldrsb r0, [r4, r0] - ldr r5, _081B3E50 + ldr r5, =0x0203cedc ldr r1, [r5] lsls r0, 4 adds r0, r1 @@ -891045,7 +860796,7 @@ sub_81B3D48: @ 81B3D48 adds r0, r1 ldrb r0, [r0, 0x8] bl Window_WriteStandardTileMap - ldr r0, _081B3E54 + ldr r0, =0x0203cef0 ldr r1, [r0] ldrb r2, [r6] ldrb r3, [r6, 0x2] @@ -891055,7 +860806,7 @@ sub_81B3D48: @ 81B3D48 str r0, [sp, 0x4] movs r0, 0 bl sub_8199CBC - ldr r0, _081B3E58 + ldr r0, =0x0203cef4 ldr r1, [r0] ldrb r2, [r6, 0x8] ldrb r3, [r6, 0xA] @@ -891082,7 +860833,7 @@ sub_81B3D48: @ 81B3D48 mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, _081B3E5C + ldr r1, =sub_81B3E60 + 1 str r1, [r0] _081B3E3A: add sp, 0xC @@ -891092,12 +860843,7 @@ _081B3E3A: pop {r0} bx r0 .align 2, 0 -_081B3E48: .4byte 0x03005e08 -_081B3E4C: .4byte 0x0203cec8 -_081B3E50: .4byte 0x0203cedc -_081B3E54: .4byte 0x0203cef0 -_081B3E58: .4byte 0x0203cef4 -_081B3E5C: .4byte sub_81B3E60 + 1 + .pool thumb_func_end sub_81B3D48 thumb_func_start sub_81B3E60 @@ -891108,7 +860854,7 @@ sub_81B3E60: @ 81B3E60 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081B3ED0 + ldr r1, =0x03005e08 adds r4, r0, r1 adds r0, r6, 0 bl sub_81B3CC0 @@ -891122,10 +860868,10 @@ sub_81B3E60: @ 81B3E60 ldrsh r0, [r4, r2] cmp r0, 0 bne _081B3EE4 - ldr r5, _081B3ED4 + ldr r5, =0x0203cec8 movs r0, 0x9 ldrsb r0, [r5, r0] - ldr r4, _081B3ED8 + ldr r4, =0x0203cedc ldr r1, [r4] lsls r0, 4 adds r0, r1 @@ -891140,21 +860886,17 @@ sub_81B3E60: @ 81B3E60 bl Window_WriteStandardTileMap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _081B3EDC + ldr r0, =0x0203cef0 ldr r0, [r0] bl free - ldr r0, _081B3EE0 + ldr r0, =0x0203cef4 ldr r0, [r0] bl free adds r0, r6, 0 bl sub_81B407C b _081B3F08 .align 2, 0 -_081B3ED0: .4byte 0x03005e08 -_081B3ED4: .4byte 0x0203cec8 -_081B3ED8: .4byte 0x0203cedc -_081B3EDC: .4byte 0x0203cef0 -_081B3EE0: .4byte 0x0203cef4 + .pool _081B3EE4: ldrh r1, [r4, 0x14] ldrh r0, [r4, 0x10] @@ -891192,7 +860934,7 @@ oamt_swap_pos: @ 81B3F10 ldrb r2, [r1] strb r2, [r0] strb r3, [r1] - ldr r5, _081B3FD8 + ldr r5, =0x02020630 ldrb r2, [r0] lsls r3, r2, 4 adds r3, r2 @@ -891283,15 +861025,15 @@ oamt_swap_pos: @ 81B3F10 pop {r0} bx r0 .align 2, 0 -_081B3FD8: .4byte 0x02020630 + .pool thumb_func_end oamt_swap_pos thumb_func_start swap_pokemon_and_oams swap_pokemon_and_oams: @ 81B3FDC push {r4-r6,lr} sub sp, 0x8 - ldr r1, _081B4070 - ldr r2, _081B4074 + ldr r1, =0x0203cedc + ldr r2, =0x0203cec8 movs r3, 0x9 ldrsb r3, [r2, r3] lsls r0, r3, 4 @@ -891307,7 +861049,7 @@ swap_pokemon_and_oams: @ 81B3FDC movs r1, 0x64 adds r4, r3, 0 muls r4, r1 - ldr r0, _081B4078 + ldr r0, =0x020244ec adds r4, r0 adds r5, r2, 0 muls r5, r1 @@ -891353,9 +861095,7 @@ swap_pokemon_and_oams: @ 81B3FDC pop {r0} bx r0 .align 2, 0 -_081B4070: .4byte 0x0203cedc -_081B4074: .4byte 0x0203cec8 -_081B4078: .4byte 0x020244ec + .pool thumb_func_end swap_pokemon_and_oams thumb_func_start sub_81B407C @@ -891364,11 +861104,11 @@ sub_81B407C: @ 81B407C adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _081B40C4 + ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xD bl sub_81B302C - ldr r4, _081B40C8 + ldr r4, =0x0203cec8 movs r0, 0 strb r0, [r4, 0xB] ldrb r0, [r4, 0x9] @@ -891381,21 +861121,18 @@ sub_81B407C: @ 81B407C bl sub_81B0FCC movs r0, 0 bl sub_81B3054 - ldr r1, _081B40CC + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081B40D0 + ldr r1, =sub_81B1370 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B40C4: .4byte 0x0203cec4 -_081B40C8: .4byte 0x0203cec8 -_081B40CC: .4byte 0x03005e00 -_081B40D0: .4byte sub_81B1370 + 1 + .pool thumb_func_end sub_81B407C thumb_func_start brm_cancel_1 @@ -891405,14 +861142,14 @@ brm_cancel_1: @ 81B40D4 lsrs r5, r0, 24 movs r0, 0x5 bl audio_play - ldr r4, _081B4108 + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xC bl sub_81B302C ldr r0, [r4] adds r0, 0xD bl sub_81B302C - ldr r0, _081B410C + ldr r0, =0x0203cec8 ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 @@ -891422,25 +861159,23 @@ brm_cancel_1: @ 81B40D4 bl sub_81B3054 b _081B4116 .align 2, 0 -_081B4108: .4byte 0x0203cec4 -_081B410C: .4byte 0x0203cec8 + .pool _081B4110: movs r0, 0 bl sub_81B3054 _081B4116: - ldr r0, _081B412C + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081B4130 + ldr r0, =sub_81B1370 + 1 str r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B412C: .4byte 0x03005e00 -_081B4130: .4byte sub_81B1370 + 1 + .pool thumb_func_end brm_cancel_1 thumb_func_start sub_81B4134 @@ -891451,15 +861186,15 @@ sub_81B4134: @ 81B4134 lsrs r5, 24 movs r0, 0x5 bl audio_play - ldr r4, _081B4184 + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xC bl sub_81B302C ldr r0, [r4] adds r0, 0xD bl sub_81B302C - ldr r0, _081B4188 - ldr r1, _081B418C + ldr r0, =0x020244ec + ldr r1, =0x0203cec8 ldrb r1, [r1, 0x9] movs r2, 0x8 bl sub_81B33B4 @@ -891467,24 +861202,20 @@ sub_81B4134: @ 81B4134 bl sub_81B31B0 movs r0, 0x18 bl sub_81B3054 - ldr r1, _081B4190 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, _081B4194 + ldr r1, =sub_81B3730 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B4184: .4byte 0x0203cec4 -_081B4188: .4byte 0x020244ec -_081B418C: .4byte 0x0203cec8 -_081B4190: .4byte 0x03005e00 -_081B4194: .4byte sub_81B3730 + 1 + .pool thumb_func_end sub_81B4134 thumb_func_start sub_81B4198 @@ -891495,9 +861226,9 @@ sub_81B4198: @ 81B4198 lsrs r4, 24 movs r0, 0x5 bl audio_play - ldr r0, _081B41BC + ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, _081B41C0 + ldr r0, =sub_81B41C4 + 1 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 @@ -891505,8 +861236,7 @@ sub_81B4198: @ 81B4198 pop {r0} bx r0 .align 2, 0 -_081B41BC: .4byte 0x0203cec4 -_081B41C0: .4byte sub_81B41C4 + 1 + .pool thumb_func_end sub_81B4198 thumb_func_start sub_81B41C4 @@ -891516,22 +861246,22 @@ sub_81B41C4: @ 81B41C4 lsls r0, 24 cmp r0, 0 bne _081B41E0 - ldr r2, _081B41DC + ldr r2, =c2_8123744 + 1 movs r0, 0x2 movs r1, 0x5 bl sub_81AAC90 b _081B41E8 .align 2, 0 -_081B41DC: .4byte c2_8123744 + 1 + .pool _081B41E0: - ldr r1, _081B41EC + ldr r1, =c2_8123744 + 1 movs r0, 0x2 bl sub_81C4F98 _081B41E8: pop {r0} bx r0 .align 2, 0 -_081B41EC: .4byte c2_8123744 + 1 + .pool thumb_func_end sub_81B41C4 thumb_func_start c2_8123744 @@ -891540,28 +861270,26 @@ c2_8123744: @ 81B41F0 mov r7, r8 push {r7} sub sp, 0xC - ldr r6, _081B4218 + ldr r6, =0x0203ce7c ldrh r0, [r6] cmp r0, 0 bne _081B4224 - ldr r3, _081B421C + ldr r3, =0x0203cec8 ldrb r0, [r3, 0x8] lsls r0, 28 lsrs r0, 28 ldrb r2, [r3, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, _081B4220 + ldr r1, =sub_81B36FC + 1 str r1, [sp, 0x4] ldr r1, [r3] b _081B425A .align 2, 0 -_081B4218: .4byte 0x0203ce7c -_081B421C: .4byte 0x0203cec8 -_081B4220: .4byte sub_81B36FC + 1 + .pool _081B4224: - ldr r4, _081B4268 - ldr r5, _081B426C + ldr r4, =0x0203cefc + ldr r5, =0x0203cec8 movs r0, 0x9 ldrsb r0, [r5, r0] movs r1, 0x64 @@ -891569,7 +861297,7 @@ _081B4224: mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r7, _081B4270 + ldr r7, =0x020244ec adds r0, r7 movs r1, 0xC bl pokemon_getattr @@ -891583,7 +861311,7 @@ _081B4224: ldrb r2, [r5, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, _081B4274 + ldr r1, =sub_81B4350 + 1 str r1, [sp, 0x4] ldr r1, [r5] _081B425A: @@ -891593,10 +861321,7 @@ _081B425A: bl sub_81B0038 b _081B42C0 .align 2, 0 -_081B4268: .4byte 0x0203cefc -_081B426C: .4byte 0x0203cec8 -_081B4270: .4byte 0x020244ec -_081B4274: .4byte sub_81B4350 + 1 + .pool _081B4278: ldrh r0, [r6] bl itemid_is_mail @@ -891623,7 +861348,7 @@ _081B42A4: ldrb r2, [r5, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, _081B42CC + ldr r1, =sub_81B42D0 + 1 str r1, [sp, 0x4] ldr r1, [r5] str r1, [sp, 0x8] @@ -891638,7 +861363,7 @@ _081B42C0: pop {r0} bx r0 .align 2, 0 -_081B42CC: .4byte sub_81B42D0 + 1 + .pool thumb_func_end c2_8123744 thumb_func_start sub_81B42D0 @@ -891648,22 +861373,22 @@ sub_81B42D0: @ 81B42D0 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _081B4338 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081B432C - ldr r0, _081B433C + ldr r0, =0x0203ce7c ldrh r4, [r0] - ldr r0, _081B4340 + ldr r0, =0x0203cec8 mov r8, r0 ldrb r0, [r0, 0x9] lsls r0, 24 asrs r0, 24 movs r6, 0x64 muls r0, r6 - ldr r5, _081B4344 + ldr r5, =0x020244ec adds r0, r5 adds r1, r4, 0 movs r2, 0 @@ -891679,12 +861404,12 @@ sub_81B42D0: @ 81B42D0 adds r0, r4, 0 movs r1, 0x1 bl sub_80D6AA4 - ldr r1, _081B4348 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081B434C + ldr r1, =sub_81B469C + 1 str r1, [r0] _081B432C: pop {r3} @@ -891693,12 +861418,7 @@ _081B432C: pop {r0} bx r0 .align 2, 0 -_081B4338: .4byte 0x02037fd4 -_081B433C: .4byte 0x0203ce7c -_081B4340: .4byte 0x0203cec8 -_081B4344: .4byte 0x020244ec -_081B4348: .4byte 0x03005e00 -_081B434C: .4byte sub_81B469C + 1 + .pool thumb_func_end sub_81B42D0 thumb_func_start sub_81B4350 @@ -891706,41 +861426,36 @@ sub_81B4350: @ 81B4350 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081B4390 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081B4388 - ldr r0, _081B4394 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B4398 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081B439C + ldr r1, =0x0203cefc ldrh r1, [r1] movs r2, 0x1 bl sub_81B1D1C - ldr r1, _081B43A0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B43A4 + ldr r1, =sub_81B43A8 + 1 str r1, [r0] _081B4388: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B4390: .4byte 0x02037fd4 -_081B4394: .4byte 0x0203cec8 -_081B4398: .4byte 0x020244ec -_081B439C: .4byte 0x0203cefc -_081B43A0: .4byte 0x03005e00 -_081B43A4: .4byte sub_81B43A8 + 1 + .pool thumb_func_end sub_81B4350 thumb_func_start sub_81B43A8 @@ -891754,20 +861469,19 @@ sub_81B43A8: @ 81B43A8 cmp r0, 0x1 beq _081B43CC bl sub_81B334C - ldr r0, _081B43D4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B43D8 + ldr r0, =sub_81B43DC + 1 str r0, [r1] _081B43CC: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B43D4: .4byte 0x03005e00 -_081B43D8: .4byte sub_81B43DC + 1 + .pool thumb_func_end sub_81B43A8 thumb_func_start sub_81B43DC @@ -891792,11 +861506,11 @@ _081B43FC: beq _081B44DE b _081B44EC _081B4402: - ldr r5, _081B4444 + ldr r5, =0x0203ce7c ldrh r0, [r5] movs r1, 0x1 bl sub_80D6AA4 - ldr r6, _081B4448 + ldr r6, =0x0203cefc ldrh r0, [r6] movs r1, 0x1 bl bag_add_item @@ -891808,58 +861522,51 @@ _081B4402: bl bag_add_item ldrh r0, [r6] bl pokemon_item_not_removed - ldr r0, _081B444C + ldr r0, =0x02021fc4 movs r1, 0 bl sub_81B1B5C - ldr r1, _081B4450 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B4454 + ldr r1, =sub_81B1C1C + 1 str r1, [r0] b _081B44EC .align 2, 0 -_081B4444: .4byte 0x0203ce7c -_081B4448: .4byte 0x0203cefc -_081B444C: .4byte 0x02021fc4 -_081B4450: .4byte 0x03005e00 -_081B4454: .4byte sub_81B1C1C + 1 + .pool _081B4458: ldrh r0, [r5] bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _081B4498 - ldr r0, _081B4488 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B448C + ldr r1, =0x020244ec adds r0, r1 ldrh r1, [r5] bl sub_81B1DB8 - ldr r1, _081B4490 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B4494 + ldr r1, =sub_81B44FC + 1 str r1, [r0] b _081B44EC .align 2, 0 -_081B4488: .4byte 0x0203cec8 -_081B448C: .4byte 0x020244ec -_081B4490: .4byte 0x03005e00 -_081B4494: .4byte sub_81B44FC + 1 + .pool _081B4498: - ldr r0, _081B44C8 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B44CC + ldr r1, =0x020244ec adds r0, r1 ldrh r1, [r5] bl sub_81B1DB8 @@ -891867,37 +861574,33 @@ _081B4498: ldrh r1, [r6] movs r2, 0x1 bl sub_81B1D68 - ldr r1, _081B44D0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B44D4 + ldr r1, =sub_81B469C + 1 str r1, [r0] b _081B44EC .align 2, 0 -_081B44C8: .4byte 0x0203cec8 -_081B44CC: .4byte 0x020244ec -_081B44D0: .4byte 0x03005e00 -_081B44D4: .4byte sub_81B469C + 1 + .pool _081B44D8: movs r0, 0x5 bl audio_play _081B44DE: - ldr r0, _081B44F4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B44F8 + ldr r0, =sub_81B1C1C + 1 str r0, [r1] _081B44EC: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081B44F4: .4byte 0x03005e00 -_081B44F8: .4byte sub_81B1C1C + 1 + .pool thumb_func_end sub_81B43DC thumb_func_start sub_81B44FC @@ -891910,9 +861613,9 @@ sub_81B44FC: @ 81B44FC lsrs r0, 24 cmp r0, 0x1 beq _081B451C - ldr r0, _081B4524 + ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, _081B4528 + ldr r0, =sub_81B452C + 1 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 @@ -891921,44 +861624,39 @@ _081B451C: pop {r0} bx r0 .align 2, 0 -_081B4524: .4byte 0x0203cec4 -_081B4528: .4byte sub_81B452C + 1 + .pool thumb_func_end sub_81B44FC thumb_func_start sub_81B452C sub_81B452C: @ 81B452C push {lr} - ldr r0, _081B4564 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B4568 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x40 bl pokemon_getattr lsls r0, 24 lsrs r0, 24 - ldr r1, _081B456C + ldr r1, =0x03005d8c lsls r2, r0, 3 adds r2, r0 lsls r2, 2 - ldr r0, _081B4570 + ldr r0, =0x00002be0 adds r2, r0 ldr r1, [r1] adds r1, r2 - ldr r2, _081B4574 + ldr r2, =sub_81B4578 + 1 movs r0, 0x4 movs r3, 0x3 bl sub_811A20C pop {r0} bx r0 .align 2, 0 -_081B4564: .4byte 0x0203cec8 -_081B4568: .4byte 0x020244ec -_081B456C: .4byte 0x03005d8c -_081B4570: .4byte 0x00002be0 -_081B4574: .4byte sub_81B4578 + 1 + .pool thumb_func_end sub_81B452C thumb_func_start sub_81B4578 @@ -891967,12 +861665,12 @@ sub_81B4578: @ 81B4578 mov r7, r8 push {r7} sub sp, 0xC - ldr r6, _081B45E4 + ldr r6, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r6, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B45E8 + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0xC @@ -891980,13 +861678,13 @@ sub_81B4578: @ 81B4578 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _081B45EC + ldr r0, =0x020375f0 ldrh r7, [r0] cmp r7, 0 bne _081B45F8 adds r0, r5, 0 bl sub_80D4680 - ldr r4, _081B45F0 + ldr r4, =0x0203cefc adds r0, r5, 0 movs r1, 0xC adds r2, r4, 0 @@ -892002,7 +861700,7 @@ sub_81B4578: @ 81B4578 lsrs r0, 28 ldrb r2, [r6, 0xB] str r7, [sp] - ldr r1, _081B45F4 + ldr r1, =sub_81B36FC + 1 str r1, [sp, 0x4] ldr r1, [r6] str r1, [sp, 0x8] @@ -892011,11 +861709,7 @@ sub_81B4578: @ 81B4578 bl sub_81B0038 b _081B4614 .align 2, 0 -_081B45E4: .4byte 0x0203cec8 -_081B45E8: .4byte 0x020244ec -_081B45EC: .4byte 0x020375f0 -_081B45F0: .4byte 0x0203cefc -_081B45F4: .4byte sub_81B36FC + 1 + .pool _081B45F8: ldrb r0, [r6, 0x8] lsls r0, 28 @@ -892023,7 +861717,7 @@ _081B45F8: ldrb r2, [r6, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, _081B4620 + ldr r1, =sub_81B4624 + 1 str r1, [sp, 0x4] ldr r1, [r6] str r1, [sp, 0x8] @@ -892038,7 +861732,7 @@ _081B4614: pop {r0} bx r0 .align 2, 0 -_081B4620: .4byte sub_81B4624 + 1 + .pool thumb_func_end sub_81B4578 thumb_func_start sub_81B4624 @@ -892046,57 +861740,51 @@ sub_81B4624: @ 81B4624 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081B465C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081B468A - ldr r1, _081B4660 + ldr r1, =0x0203cefc ldrh r0, [r1] cmp r0, 0 bne _081B4670 - ldr r0, _081B4664 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B4668 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081B466C + ldr r1, =0x0203ce7c ldrh r1, [r1] movs r2, 0 movs r3, 0 bl sub_81B1C84 b _081B467C .align 2, 0 -_081B465C: .4byte 0x02037fd4 -_081B4660: .4byte 0x0203cefc -_081B4664: .4byte 0x0203cec8 -_081B4668: .4byte 0x020244ec -_081B466C: .4byte 0x0203ce7c + .pool _081B4670: - ldr r0, _081B4690 + ldr r0, =0x0203ce7c ldrh r0, [r0] ldrh r1, [r1] movs r2, 0 bl sub_81B1D68 _081B467C: - ldr r0, _081B4694 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B4698 + ldr r0, =sub_81B469C + 1 str r0, [r1] _081B468A: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B4690: .4byte 0x0203ce7c -_081B4694: .4byte 0x03005e00 -_081B4698: .4byte sub_81B469C + 1 + .pool thumb_func_end sub_81B4624 thumb_func_start sub_81B469C @@ -892104,19 +861792,19 @@ sub_81B469C: @ 81B469C push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _081B46F8 + ldr r4, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r4, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B46FC + ldr r0, =0x020244ec adds r6, r1, r0 bl sub_81B1BD4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081B471C - ldr r5, _081B4700 + ldr r5, =0x0203cedc movs r0, 0x9 ldrsb r0, [r4, r0] lsls r0, 4 @@ -892144,9 +861832,7 @@ sub_81B469C: @ 81B469C bl sub_81B2FA8 b _081B4716 .align 2, 0 -_081B46F8: .4byte 0x0203cec8 -_081B46FC: .4byte 0x020244ec -_081B4700: .4byte 0x0203cedc + .pool _081B4704: movs r0, 0x9 ldrsb r0, [r4, r0] @@ -892170,12 +861856,12 @@ sub_81B4724: @ 81B4724 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _081B477C + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B4780 + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0xC @@ -892184,7 +861870,7 @@ sub_81B4724: @ 81B4724 lsrs r6, r0, 16 movs r0, 0x5 bl audio_play - ldr r4, _081B4784 + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xC bl sub_81B302C @@ -892205,47 +861891,41 @@ sub_81B4724: @ 81B4724 bl sub_81B1CD0 b _081B47BA .align 2, 0 -_081B477C: .4byte 0x0203cec8 -_081B4780: .4byte 0x020244ec -_081B4784: .4byte 0x0203cec4 + .pool _081B4788: - ldr r1, _081B47A0 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 - ldr r4, _081B47A4 - ldr r1, _081B47A8 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9980 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 b _081B47B4 .align 2, 0 -_081B47A0: .4byte 0x02021cc4 -_081B47A4: .4byte 0x02021fc4 -_081B47A8: .4byte 0x085e9980 + .pool _081B47AC: adds r0, r6, 0 bl pokemon_item_not_removed - ldr r0, _081B47D4 + ldr r0, =0x02021fc4 _081B47B4: movs r1, 0x1 bl sub_81B1B5C _081B47BA: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _081B47D8 + ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 lsls r1, 3 adds r1, r0 - ldr r0, _081B47DC + ldr r0, =sub_81B469C + 1 str r0, [r1] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081B47D4: .4byte 0x02021fc4 -_081B47D8: .4byte 0x03005e00 -_081B47DC: .4byte sub_81B469C + 1 + .pool thumb_func_end sub_81B4724 thumb_func_start sub_81B47E0 @@ -892253,12 +861933,12 @@ sub_81B47E0: @ 81B47E0 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _081B4844 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B4848 + ldr r0, =0x020244ec adds r7, r1, r0 adds r0, r7, 0 movs r1, 0xC @@ -892267,7 +861947,7 @@ sub_81B47E0: @ 81B47E0 lsrs r5, r0, 16 movs r0, 0x5 bl audio_play - ldr r4, _081B484C + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xC bl sub_81B302C @@ -892276,60 +861956,49 @@ sub_81B47E0: @ 81B47E0 bl sub_81B302C cmp r5, 0 bne _081B4864 - ldr r1, _081B4850 + ldr r1, =0x02021cc4 adds r0, r7, 0 bl sub_81B1B44 - ldr r4, _081B4854 - ldr r1, _081B4858 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9980 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B485C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B4860 + ldr r1, =sub_81B469C + 1 b _081B488A .align 2, 0 -_081B4844: .4byte 0x0203cec8 -_081B4848: .4byte 0x020244ec -_081B484C: .4byte 0x0203cec4 -_081B4850: .4byte 0x02021cc4 -_081B4854: .4byte 0x02021fc4 -_081B4858: .4byte 0x085e9980 -_081B485C: .4byte 0x03005e00 -_081B4860: .4byte sub_81B469C + 1 + .pool _081B4864: - ldr r1, _081B4894 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl itemid_get_name - ldr r4, _081B4898 - ldr r1, _081B489C + ldr r4, =0x02021fc4 + ldr r1, =0x085e9e00 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B48A0 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B48A4 + ldr r1, =sub_81B48A8 + 1 _081B488A: str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081B4894: .4byte 0x02021cc4 -_081B4898: .4byte 0x02021fc4 -_081B489C: .4byte 0x085e9e00 -_081B48A0: .4byte 0x03005e00 -_081B48A4: .4byte sub_81B48A8 + 1 + .pool thumb_func_end sub_81B47E0 thumb_func_start sub_81B48A8 @@ -892343,20 +862012,19 @@ sub_81B48A8: @ 81B48A8 cmp r0, 0x1 beq _081B48CC bl sub_81B334C - ldr r0, _081B48D4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B48D8 + ldr r0, =sub_81B48DC + 1 str r0, [r1] _081B48CC: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B48D4: .4byte 0x03005e00 -_081B48D8: .4byte sub_81B48DC + 1 + .pool thumb_func_end sub_81B48A8 thumb_func_start sub_81B48DC @@ -892364,12 +862032,12 @@ sub_81B48DC: @ 81B48DC push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081B490C + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B4910 + ldr r0, =0x020244ec adds r4, r1, r0 bl sub_8198C58 lsls r0, 24 @@ -892384,8 +862052,7 @@ sub_81B48DC: @ 81B48DC beq _081B4964 b _081B4978 .align 2, 0 -_081B490C: .4byte 0x0203cec8 -_081B4910: .4byte 0x020244ec + .pool _081B4914: cmp r1, 0x1 beq _081B496A @@ -892396,47 +862063,42 @@ _081B491A: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - ldr r1, _081B4950 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r4, _081B4954 - ldr r1, _081B4958 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9e14 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0 bl sub_81B1B5C - ldr r1, _081B495C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081B4960 + ldr r1, =sub_81B4988 + 1 str r1, [r0] b _081B4978 .align 2, 0 -_081B4950: .4byte 0x02021cc4 -_081B4954: .4byte 0x02021fc4 -_081B4958: .4byte 0x085e9e14 -_081B495C: .4byte 0x03005e00 -_081B4960: .4byte sub_81B4988 + 1 + .pool _081B4964: movs r0, 0x5 bl audio_play _081B496A: - ldr r0, _081B4980 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081B4984 + ldr r0, =sub_81B1C1C + 1 str r0, [r1] _081B4978: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B4980: .4byte 0x03005e00 -_081B4984: .4byte sub_81B1C1C + 1 + .pool thumb_func_end sub_81B48DC thumb_func_start sub_81B4988 @@ -892445,12 +862107,12 @@ sub_81B4988: @ 81B4988 sub sp, 0x4 lsls r0, 24 lsrs r7, r0, 24 - ldr r6, _081B49F4 + ldr r6, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r6, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B49F8 + ldr r0, =0x020244ec adds r5, r1, r0 bl sub_81B1BD4 lsls r0, 24 @@ -892464,7 +862126,7 @@ sub_81B4988: @ 81B4988 movs r1, 0xC mov r2, sp bl pokemon_setattr - ldr r4, _081B49FC + ldr r4, =0x0203cedc movs r0, 0x9 ldrsb r0, [r6, r0] lsls r0, 4 @@ -892480,12 +862142,12 @@ sub_81B4988: @ 81B4988 movs r0, 0xC movs r2, 0x1 bl sub_81B2FA8 - ldr r1, _081B4A00 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081B4A04 + ldr r1, =sub_81B1C1C + 1 str r1, [r0] _081B49EC: add sp, 0x4 @@ -892493,11 +862155,7 @@ _081B49EC: pop {r0} bx r0 .align 2, 0 -_081B49F4: .4byte 0x0203cec8 -_081B49F8: .4byte 0x020244ec -_081B49FC: .4byte 0x0203cedc -_081B4A00: .4byte 0x03005e00 -_081B4A04: .4byte sub_81B1C1C + 1 + .pool thumb_func_end sub_81B4988 thumb_func_start sub_81B4A08 @@ -892508,15 +862166,15 @@ sub_81B4A08: @ 81B4A08 lsrs r5, 24 movs r0, 0x5 bl audio_play - ldr r4, _081B4A58 + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xC bl sub_81B302C ldr r0, [r4] adds r0, 0xD bl sub_81B302C - ldr r0, _081B4A5C - ldr r1, _081B4A60 + ldr r0, =0x020244ec + ldr r1, =0x0203cec8 ldrb r1, [r1, 0x9] movs r2, 0x9 bl sub_81B33B4 @@ -892524,24 +862182,20 @@ sub_81B4A08: @ 81B4A08 bl sub_81B31B0 movs r0, 0x19 bl sub_81B3054 - ldr r1, _081B4A64 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, _081B4A68 + ldr r1, =sub_81B3730 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B4A58: .4byte 0x0203cec4 -_081B4A5C: .4byte 0x020244ec -_081B4A60: .4byte 0x0203cec8 -_081B4A64: .4byte 0x03005e00 -_081B4A68: .4byte sub_81B3730 + 1 + .pool thumb_func_end sub_81B4A08 thumb_func_start sub_81B4A6C @@ -892552,9 +862206,9 @@ sub_81B4A6C: @ 81B4A6C lsrs r4, 24 movs r0, 0x5 bl audio_play - ldr r0, _081B4A90 + ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, _081B4A94 + ldr r0, =sub_81B4A98 + 1 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 @@ -892562,60 +862216,55 @@ sub_81B4A6C: @ 81B4A6C pop {r0} bx r0 .align 2, 0 -_081B4A90: .4byte 0x0203cec4 -_081B4A94: .4byte sub_81B4A98 + 1 + .pool thumb_func_end sub_81B4A6C thumb_func_start sub_81B4A98 sub_81B4A98: @ 81B4A98 push {lr} - ldr r0, _081B4ACC + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B4AD0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x40 bl pokemon_getattr - ldr r2, _081B4AD4 + ldr r2, =0x03005d8c lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _081B4AD8 + ldr r0, =0x00002be0 adds r1, r0 ldr r0, [r2] adds r0, r1 - ldr r1, _081B4ADC + ldr r1, =sub_81B4AE0 + 1 movs r2, 0x1 bl sub_8121478 pop {r0} bx r0 .align 2, 0 -_081B4ACC: .4byte 0x0203cec8 -_081B4AD0: .4byte 0x020244ec -_081B4AD4: .4byte 0x03005d8c -_081B4AD8: .4byte 0x00002be0 -_081B4ADC: .4byte sub_81B4AE0 + 1 + .pool thumb_func_end sub_81B4A98 thumb_func_start sub_81B4AE0 sub_81B4AE0: @ 81B4AE0 push {lr} sub sp, 0xC - ldr r2, _081B4B14 + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - ldr r3, _081B4B18 + ldr r3, =0x0203cec8 ldrb r0, [r3, 0x8] lsls r0, 28 lsrs r0, 28 ldrb r2, [r3, 0xB] movs r1, 0x15 str r1, [sp] - ldr r1, _081B4B1C + ldr r1, =sub_81B36FC + 1 str r1, [sp, 0x4] ldr r1, [r3] str r1, [sp, 0x8] @@ -892626,9 +862275,7 @@ sub_81B4AE0: @ 81B4AE0 pop {r0} bx r0 .align 2, 0 -_081B4B14: .4byte 0x02037fd4 -_081B4B18: .4byte 0x0203cec8 -_081B4B1C: .4byte sub_81B36FC + 1 + .pool thumb_func_end sub_81B4AE0 thumb_func_start brm_take_2 @@ -892639,31 +862286,28 @@ brm_take_2: @ 81B4B20 lsrs r4, 24 movs r0, 0x5 bl audio_play - ldr r5, _081B4B5C + ldr r5, =0x0203cec4 ldr r0, [r5] adds r0, 0xD bl sub_81B302C ldr r0, [r5] adds r0, 0xC bl sub_81B302C - ldr r0, _081B4B60 + ldr r0, =0x085e9855 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B4B64 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B4B68 + ldr r1, =sub_81B4B6C + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B4B5C: .4byte 0x0203cec4 -_081B4B60: .4byte 0x085e9855 -_081B4B64: .4byte 0x03005e00 -_081B4B68: .4byte sub_81B4B6C + 1 + .pool thumb_func_end brm_take_2 thumb_func_start sub_81B4B6C @@ -892677,20 +862321,19 @@ sub_81B4B6C: @ 81B4B6C cmp r0, 0x1 beq _081B4B90 bl sub_81B334C - ldr r0, _081B4B98 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B4B9C + ldr r0, =sub_81B4BA0 + 1 str r0, [r1] _081B4B90: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B4B98: .4byte 0x03005e00 -_081B4B9C: .4byte sub_81B4BA0 + 1 + .pool thumb_func_end sub_81B4B6C thumb_func_start sub_81B4BA0 @@ -892715,62 +862358,56 @@ _081B4BC0: beq _081B4C36 b _081B4C4C _081B4BC6: - ldr r0, _081B4BF8 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B4BFC + ldr r1, =0x020244ec adds r0, r1 bl sub_80D4700 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF beq _081B4C0C - ldr r0, _081B4C00 + ldr r0, =0x085e9877 movs r1, 0 bl sub_81B1B5C - ldr r1, _081B4C04 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B4C08 + ldr r1, =sub_81B469C + 1 b _081B4C4A .align 2, 0 -_081B4BF8: .4byte 0x0203cec8 -_081B4BFC: .4byte 0x020244ec -_081B4C00: .4byte 0x085e9877 -_081B4C04: .4byte 0x03005e00 -_081B4C08: .4byte sub_81B469C + 1 + .pool _081B4C0C: - ldr r0, _081B4C24 + ldr r0, =0x085e9897 movs r1, 0 bl sub_81B1B5C - ldr r1, _081B4C28 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B4C2C + ldr r1, =sub_81B1C1C + 1 b _081B4C4A .align 2, 0 -_081B4C24: .4byte 0x085e9897 -_081B4C28: .4byte 0x03005e00 -_081B4C2C: .4byte sub_81B1C1C + 1 + .pool _081B4C30: movs r0, 0x5 bl audio_play _081B4C36: - ldr r0, _081B4C54 + ldr r0, =0x085e98b4 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B4C58 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B4C5C + ldr r1, =sub_81B4C60 + 1 _081B4C4A: str r1, [r0] _081B4C4C: @@ -892778,9 +862415,7 @@ _081B4C4C: pop {r0} bx r0 .align 2, 0 -_081B4C54: .4byte 0x085e98b4 -_081B4C58: .4byte 0x03005e00 -_081B4C5C: .4byte sub_81B4C60 + 1 + .pool thumb_func_end sub_81B4BA0 thumb_func_start sub_81B4C60 @@ -892794,20 +862429,19 @@ sub_81B4C60: @ 81B4C60 cmp r0, 0x1 beq _081B4C84 bl sub_81B334C - ldr r0, _081B4C8C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B4C90 + ldr r0, =sub_81B4C94 + 1 str r0, [r1] _081B4C84: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B4C8C: .4byte 0x03005e00 -_081B4C90: .4byte sub_81B4C94 + 1 + .pool thumb_func_end sub_81B4C60 thumb_func_start sub_81B4C94 @@ -892834,14 +862468,14 @@ _081B4CB8: beq _081B4D56 b _081B4D64 _081B4CBE: - ldr r0, _081B4D10 + ldr r0, =0x0203cec8 mov r8, r0 ldrb r0, [r0, 0x9] lsls r0, 24 asrs r0, 24 movs r7, 0x64 muls r0, r7 - ldr r6, _081B4D14 + ldr r6, =0x020244ec adds r0, r6 movs r1, 0xC bl pokemon_getattr @@ -892860,51 +862494,45 @@ _081B4CBE: muls r0, r7 adds r0, r6 bl sub_80D4680 - ldr r0, _081B4D18 + ldr r0, =0x085e99b8 movs r1, 0 bl sub_81B1B5C - ldr r1, _081B4D1C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081B4D20 + ldr r1, =sub_81B469C + 1 str r1, [r0] b _081B4D64 .align 2, 0 -_081B4D10: .4byte 0x0203cec8 -_081B4D14: .4byte 0x020244ec -_081B4D18: .4byte 0x085e99b8 -_081B4D1C: .4byte 0x03005e00 -_081B4D20: .4byte sub_81B469C + 1 + .pool _081B4D24: adds r0, r4, 0 bl pokemon_item_not_removed - ldr r0, _081B4D44 + ldr r0, =0x02021fc4 movs r1, 0 bl sub_81B1B5C - ldr r1, _081B4D48 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081B4D4C + ldr r1, =sub_81B1C1C + 1 str r1, [r0] b _081B4D64 .align 2, 0 -_081B4D44: .4byte 0x02021fc4 -_081B4D48: .4byte 0x03005e00 -_081B4D4C: .4byte sub_81B1C1C + 1 + .pool _081B4D50: movs r0, 0x5 bl audio_play _081B4D56: - ldr r0, _081B4D70 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081B4D74 + ldr r0, =sub_81B1C1C + 1 str r0, [r1] _081B4D64: pop {r3} @@ -892913,8 +862541,7 @@ _081B4D64: pop {r0} bx r0 .align 2, 0 -_081B4D70: .4byte 0x03005e00 -_081B4D74: .4byte sub_81B1C1C + 1 + .pool thumb_func_end sub_81B4C94 thumb_func_start sub_81B4D78 @@ -892925,16 +862552,16 @@ sub_81B4D78: @ 81B4D78 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r5, _081B4DD8 + ldr r5, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r5, r1] movs r0, 0x64 muls r0, r1 - ldr r6, _081B4DDC + ldr r6, =0x020244ec adds r7, r0, r6 movs r0, 0x5 bl audio_play - ldr r4, _081B4DE0 + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xC bl sub_81B302C @@ -892961,9 +862588,7 @@ sub_81B4D78: @ 81B4D78 bl sub_81B3054 b _081B4E02 .align 2, 0 -_081B4DD8: .4byte 0x0203cec8 -_081B4DDC: .4byte 0x020244ec -_081B4DE0: .4byte 0x0203cec4 + .pool _081B4DE4: movs r0, 0x1 bl sub_81B31B0 @@ -892972,12 +862597,12 @@ _081B4DE4: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - ldr r1, _081B4E20 + ldr r1, =0x02021dc4 bl itemid_get_name movs r0, 0x1A bl sub_81B3054 _081B4E02: - ldr r1, _081B4E24 + ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -892985,7 +862610,7 @@ _081B4E02: adds r0, r1 movs r1, 0xFF strh r1, [r0, 0x8] - ldr r1, _081B4E28 + ldr r1, =sub_81B3730 + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -892993,9 +862618,7 @@ _081B4E02: pop {r0} bx r0 .align 2, 0 -_081B4E20: .4byte 0x02021dc4 -_081B4E24: .4byte 0x03005e00 -_081B4E28: .4byte sub_81B3730 + 1 + .pool thumb_func_end sub_81B4D78 thumb_func_start brm_shift_sendout @@ -893005,7 +862628,7 @@ brm_shift_sendout: @ 81B4E2C lsrs r4, r0, 24 movs r0, 0x5 bl audio_play - ldr r5, _081B4E58 + ldr r5, =0x0203cec4 ldr r0, [r5] adds r0, 0xC bl sub_81B302C @@ -893018,29 +862641,27 @@ brm_shift_sendout: @ 81B4E2C bl sub_81B12C0 b _081B4E7A .align 2, 0 -_081B4E58: .4byte 0x0203cec4 + .pool _081B4E5C: ldr r0, [r5] adds r0, 0xD bl sub_81B302C - ldr r0, _081B4E80 + ldr r0, =0x02021fc4 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B4E84 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B4E88 + ldr r1, =sub_81B1C1C + 1 str r1, [r0] _081B4E7A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B4E80: .4byte 0x02021fc4 -_081B4E84: .4byte 0x03005e00 -_081B4E88: .4byte sub_81B1C1C + 1 + .pool thumb_func_end brm_shift_sendout thumb_func_start sub_81B4E8C @@ -893051,7 +862672,7 @@ sub_81B4E8C: @ 81B4E8C sub sp, 0x4 lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _081B4F14 + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xC bl sub_81B302C @@ -893064,15 +862685,15 @@ sub_81B4E8C: @ 81B4E8C movs r5, 0 cmp r5, r6 bcs _081B4F36 - ldr r2, _081B4F18 - ldr r1, _081B4F1C + ldr r2, =0x0203cec8 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 mov r8, r0 _081B4EC6: - ldr r0, _081B4F20 + ldr r0, =0x0203cef8 adds r4, r5, r0 ldrb r0, [r4] cmp r0, 0 @@ -893087,7 +862708,7 @@ _081B4EC6: adds r0, r5, 0x2 lsls r0, 24 lsrs r0, 24 - ldr r1, _081B4F24 + ldr r1, =0x0203cedc ldrb r2, [r2, 0x9] lsls r2, 24 asrs r2, 24 @@ -893103,17 +862724,12 @@ _081B4EC6: _081B4F04: movs r0, 0 bl sub_81B3054 - ldr r0, _081B4F28 + ldr r0, =sub_81B1370 + 1 mov r1, r8 str r0, [r1] b _081B4F68 .align 2, 0 -_081B4F14: .4byte 0x0203cec4 -_081B4F18: .4byte 0x0203cec8 -_081B4F1C: .4byte 0x03005e00 -_081B4F20: .4byte 0x0203cef8 -_081B4F24: .4byte 0x0203cedc -_081B4F28: .4byte sub_81B1370 + 1 + .pool _081B4F2C: adds r0, r5, 0x1 lsls r0, 24 @@ -893121,13 +862737,13 @@ _081B4F2C: cmp r5, r6 bcc _081B4EC6 _081B4F36: - ldr r0, _081B4F74 + ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0 movs r3, 0x1 bl decimal_int_to_string - ldr r4, _081B4F78 - ldr r1, _081B4F7C + ldr r4, =0x02021fc4 + ldr r1, =0x085e9830 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x20 @@ -893135,12 +862751,12 @@ _081B4F36: adds r0, r4, 0 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B4F80 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081B4F84 + ldr r1, =sub_81B1C1C + 1 str r1, [r0] _081B4F68: add sp, 0x4 @@ -893150,17 +862766,13 @@ _081B4F68: pop {r0} bx r0 .align 2, 0 -_081B4F74: .4byte 0x02021cc4 -_081B4F78: .4byte 0x02021fc4 -_081B4F7C: .4byte 0x085e9830 -_081B4F80: .4byte 0x03005e00 -_081B4F84: .4byte sub_81B1C1C + 1 + .pool thumb_func_end sub_81B4E8C thumb_func_start sub_81B4F88 sub_81B4F88: @ 81B4F88 push {r4,lr} - ldr r4, _081B4FA4 + ldr r4, =0x0203cec8 ldrb r0, [r4, 0x9] movs r1, 0 bl sub_81B0FCC @@ -893172,7 +862784,7 @@ sub_81B4F88: @ 81B4F88 pop {r0} bx r0 .align 2, 0 -_081B4FA4: .4byte 0x0203cec8 + .pool thumb_func_end sub_81B4F88 thumb_func_start sub_81B4FA8 @@ -893185,7 +862797,7 @@ sub_81B4FA8: @ 81B4FA8 mov r8, r0 movs r0, 0x5 bl audio_play - ldr r4, _081B5014 + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xC bl sub_81B302C @@ -893198,10 +862810,10 @@ sub_81B4FA8: @ 81B4FA8 movs r4, 0 cmp r4, r5 bcs _081B502A - ldr r6, _081B5018 + ldr r6, =0x0203cef8 subs r2, r5, 0x1 adds r7, r6, 0 - ldr r3, _081B501C + ldr r3, =0x0203cec8 _081B4FE2: adds r0, r4, r6 ldrb r1, [r0] @@ -893231,9 +862843,7 @@ _081B500C: strb r0, [r1] b _081B502A .align 2, 0 -_081B5014: .4byte 0x0203cec4 -_081B5018: .4byte 0x0203cef8 -_081B501C: .4byte 0x0203cec8 + .pool _081B5020: adds r0, r4, 0x1 lsls r0, 24 @@ -893241,8 +862851,8 @@ _081B5020: cmp r4, r5 bcc _081B4FE2 _081B502A: - ldr r6, _081B5098 - ldr r0, _081B509C + ldr r6, =0x0203cedc + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x9] lsls r0, 24 asrs r0, 24 @@ -893259,7 +862869,7 @@ _081B502A: cmp r4, r5 bge _081B5078 _081B504E: - ldr r0, _081B50A0 + ldr r0, =0x0203cef8 adds r1, r4, r0 ldrb r0, [r1] cmp r0, 0 @@ -893283,12 +862893,12 @@ _081B506E: _081B5078: movs r0, 0 bl sub_81B3054 - ldr r0, _081B50A4 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r7, r2 lsls r1, 3 adds r1, r0 - ldr r0, _081B50A8 + ldr r0, =sub_81B1370 + 1 str r0, [r1] pop {r3} mov r8, r3 @@ -893296,11 +862906,7 @@ _081B5078: pop {r0} bx r0 .align 2, 0 -_081B5098: .4byte 0x0203cedc -_081B509C: .4byte 0x0203cec8 -_081B50A0: .4byte 0x0203cef8 -_081B50A4: .4byte 0x03005e00 -_081B50A8: .4byte sub_81B1370 + 1 + .pool thumb_func_end sub_81B4FA8 thumb_func_start sub_81B50AC @@ -893326,7 +862932,7 @@ sub_81B50C8: @ 81B50C8 push {r6,r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _081B5154 + ldr r0, =0x0203cec8 mov r9, r0 ldrb r0, [r0, 0x9] lsls r0, 24 @@ -893336,7 +862942,7 @@ sub_81B50C8: @ 81B50C8 mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r4, _081B5158 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x41 bl pokemon_getattr @@ -893383,43 +862989,41 @@ sub_81B50C8: @ 81B50C8 bl sub_81B12C0 b _081B51B0 .align 2, 0 -_081B5154: .4byte 0x0203cec8 -_081B5158: .4byte 0x020244ec + .pool _081B515C: - ldr r0, _081B5168 - ldr r1, _081B516C + ldr r0, =0x02021fc4 + ldr r1, =0x085ea210 bl ExpandTextCodes b _081B5178 .align 2, 0 -_081B5168: .4byte 0x02021fc4 -_081B516C: .4byte 0x085ea210 + .pool _081B5170: - ldr r0, _081B51BC - ldr r1, _081B51C0 + ldr r0, =0x02021fc4 + ldr r1, =0x085ea234 bl ExpandTextCodes _081B5178: movs r0, 0x20 bl audio_play - ldr r4, _081B51C4 + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xC bl sub_81B302C ldr r0, [r4] adds r0, 0xD bl sub_81B302C - ldr r4, _081B51BC - ldr r1, _081B51C8 + ldr r4, =0x02021fc4 + ldr r1, =0x085ea1ca adds r0, r4, 0 bl gf_strcat adds r0, r4, 0 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B51CC + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081B51D0 + ldr r1, =sub_81B1C1C + 1 str r1, [r0] _081B51B0: pop {r3,r4} @@ -893429,12 +863033,7 @@ _081B51B0: pop {r0} bx r0 .align 2, 0 -_081B51BC: .4byte 0x02021fc4 -_081B51C0: .4byte 0x085ea234 -_081B51C4: .4byte 0x0203cec4 -_081B51C8: .4byte 0x085ea1ca -_081B51CC: .4byte 0x03005e00 -_081B51D0: .4byte sub_81B1C1C + 1 + .pool thumb_func_end sub_81B50C8 thumb_func_start brm_trade_1 @@ -893446,14 +863045,14 @@ brm_trade_1: @ 81B51D4 sub sp, 0xC lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _081B529C + ldr r0, =0x0203cec8 mov r8, r0 ldrb r0, [r0, 0x9] lsls r0, 24 asrs r0, 24 movs r6, 0x64 muls r0, r6 - ldr r4, _081B52A0 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x41 bl pokemon_getattr @@ -893484,11 +863083,11 @@ brm_trade_1: @ 81B51D4 lsrs r4, 24 bl sub_800F7DC ldr r0, [r0] - ldr r1, _081B52A4 + ldr r1, =0x02022c38 ldr r1, [r1] - ldr r2, _081B52A8 + ldr r2, =0x02022c3c ldrh r3, [r2] - ldr r2, _081B52AC + ldr r2, =0x02022c3e ldrb r2, [r2] str r2, [sp] str r5, [sp, 0x4] @@ -893497,8 +863096,8 @@ brm_trade_1: @ 81B51D4 bl sub_807A7E0 cmp r0, 0 beq _081B52C8 - ldr r5, _081B52B0 - ldr r1, _081B52B4 + ldr r5, =0x02021fc4 + ldr r1, =0x08615e0c subs r0, 0x1 lsls r0, 2 adds r0, r1 @@ -893507,39 +863106,29 @@ brm_trade_1: @ 81B51D4 bl ExpandTextCodes movs r0, 0x20 bl audio_play - ldr r4, _081B52B8 + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xC bl sub_81B302C ldr r0, [r4] adds r0, 0xD bl sub_81B302C - ldr r1, _081B52BC + ldr r1, =0x085ea1ca adds r0, r5, 0 bl gf_strcat adds r0, r5, 0 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B52C0 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081B52C4 + ldr r1, =sub_81B1C1C + 1 str r1, [r0] b _081B52D4 .align 2, 0 -_081B529C: .4byte 0x0203cec8 -_081B52A0: .4byte 0x020244ec -_081B52A4: .4byte 0x02022c38 -_081B52A8: .4byte 0x02022c3c -_081B52AC: .4byte 0x02022c3e -_081B52B0: .4byte 0x02021fc4 -_081B52B4: .4byte 0x08615e0c -_081B52B8: .4byte 0x0203cec4 -_081B52BC: .4byte 0x085ea1ca -_081B52C0: .4byte 0x03005e00 -_081B52C4: .4byte sub_81B1C1C + 1 + .pool _081B52C8: movs r0, 0x5 bl audio_play @@ -893560,15 +863149,15 @@ sub_81B52E4: @ 81B52E4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _081B531C + ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xC bl sub_81B302C ldr r0, [r4] adds r0, 0xD bl sub_81B302C - ldr r0, _081B5320 - ldr r1, _081B5324 + ldr r0, =0x020244ec + ldr r1, =0x0203cec8 ldrb r1, [r1, 0x9] lsls r1, 24 asrs r1, 24 @@ -893583,97 +863172,83 @@ sub_81B52E4: @ 81B52E4 beq _081B532E b _081B5368 .align 2, 0 -_081B531C: .4byte 0x0203cec4 -_081B5320: .4byte 0x020244ec -_081B5324: .4byte 0x0203cec8 + .pool _081B5328: cmp r0, 0x3 beq _081B5354 b _081B5368 _081B532E: - ldr r0, _081B5338 - ldr r1, _081B533C + ldr r0, =0x02021fc4 + ldr r1, =0x085ea1e8 bl ExpandTextCodes b _081B53C0 .align 2, 0 -_081B5338: .4byte 0x02021fc4 -_081B533C: .4byte 0x085ea1e8 + .pool _081B5340: - ldr r0, _081B534C - ldr r1, _081B5350 + ldr r0, =0x02021fc4 + ldr r1, =0x085ea210 bl ExpandTextCodes b _081B53C0 .align 2, 0 -_081B534C: .4byte 0x02021fc4 -_081B5350: .4byte 0x085ea210 + .pool _081B5354: - ldr r0, _081B5360 - ldr r1, _081B5364 + ldr r0, =0x02021fc4 + ldr r1, =0x085ea234 bl ExpandTextCodes b _081B53C0 .align 2, 0 -_081B5360: .4byte 0x02021fc4 -_081B5364: .4byte 0x085ea234 + .pool _081B5368: movs r0, 0x5 bl audio_play - ldr r0, _081B53A4 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B53A8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081B53AC + ldr r1, =0x02021cc4 bl sub_81B1B44 - ldr r4, _081B53B0 - ldr r1, _081B53B4 + ldr r4, =0x02021fc4 + ldr r1, =0x085ea1cd adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B53B8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081B53BC + ldr r1, =sub_81B53FC + 1 b _081B53E4 .align 2, 0 -_081B53A4: .4byte 0x0203cec8 -_081B53A8: .4byte 0x020244ec -_081B53AC: .4byte 0x02021cc4 -_081B53B0: .4byte 0x02021fc4 -_081B53B4: .4byte 0x085ea1cd -_081B53B8: .4byte 0x03005e00 -_081B53BC: .4byte sub_81B53FC + 1 + .pool _081B53C0: movs r0, 0x20 bl audio_play - ldr r4, _081B53EC - ldr r1, _081B53F0 + ldr r4, =0x02021fc4 + ldr r1, =0x085ea1ca adds r0, r4, 0 bl gf_strcat adds r0, r4, 0 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B53F4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081B53F8 + ldr r1, =sub_81B1C1C + 1 _081B53E4: str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B53EC: .4byte 0x02021fc4 -_081B53F0: .4byte 0x085ea1ca -_081B53F4: .4byte 0x03005e00 -_081B53F8: .4byte sub_81B1C1C + 1 + .pool thumb_func_end sub_81B52E4 thumb_func_start sub_81B53FC @@ -893687,20 +863262,19 @@ sub_81B53FC: @ 81B53FC cmp r0, 0x1 beq _081B5420 bl sub_81B334C - ldr r0, _081B5428 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B542C + ldr r0, =sub_81B5430 + 1 str r0, [r1] _081B5420: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B5428: .4byte 0x03005e00 -_081B542C: .4byte sub_81B5430 + 1 + .pool thumb_func_end sub_81B53FC thumb_func_start sub_81B5430 @@ -893746,7 +863320,7 @@ sub_81B5470: @ 81B5470 lsls r0, 24 lsrs r6, r0, 24 bl GetMenuCursorPos - ldr r5, _081B54DC + ldr r5, =0x0203cec4 ldr r1, [r5] lsls r0, 24 lsrs r0, 24 @@ -893758,7 +863332,7 @@ sub_81B5470: @ 81B5470 lsrs r4, r0, 24 movs r0, 0x5 bl audio_play - ldr r1, _081B54E0 + ldr r1, =0x08615d9c lsls r0, r4, 3 adds r7, r0, r1 ldr r0, [r7] @@ -893791,39 +863365,35 @@ _081B54C6: bl sub_81B3054 b _081B5656 .align 2, 0 -_081B54DC: .4byte 0x0203cec4 -_081B54E0: .4byte 0x08615d9c + .pool _081B54E4: ldrb r0, [r7, 0x4] b _081B5652 _081B54E8: cmp r4, 0x7 bhi _081B5524 - ldr r1, _081B5514 + ldr r1, =0x00000867 adds r0, r4, r1 bl flag_check lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081B5524 - ldr r0, _081B5518 + ldr r0, =0x085e97fc movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B551C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B5520 + ldr r1, =sub_81B1C1C + 1 str r1, [r0] b _081B5664 .align 2, 0 -_081B5514: .4byte 0x00000867 -_081B5518: .4byte 0x085e97fc -_081B551C: .4byte 0x03005e00 -_081B5520: .4byte sub_81B1C1C + 1 + .pool _081B5524: - ldr r1, _081B554C + ldr r1, =0x08615d9c lsls r0, r4, 3 adds r5, r0, r1 ldr r0, [r5] @@ -893838,13 +863408,12 @@ _081B553A: cmp r0, 0x7 bhi _081B5624 lsls r0, 2 - ldr r1, _081B5550 + ldr r1, =_081B5554 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081B554C: .4byte 0x08615d9c -_081B5550: .4byte _081B5554 + .pool .align 2, 0 _081B5554: .4byte _081B5614 @@ -893860,7 +863429,7 @@ _081B5574: bl sub_8161560 b _081B5664 _081B557C: - ldr r0, _081B55A8 + ldr r0, =0x03005d8c ldr r1, [r0] movs r0, 0x1C ldrsb r0, [r1, r0] @@ -893873,19 +863442,16 @@ _081B557C: lsrs r1, 16 bl get_mapheader_by_bank_and_number adds r1, r0, 0 - ldr r0, _081B55AC + ldr r0, =0x02021cc4 ldrb r1, [r1, 0x14] bl sub_81245DC - ldr r0, _081B55B0 - ldr r1, _081B55B4 + ldr r0, =0x02021fc4 + ldr r1, =0x085ea196 b _081B55E8 .align 2, 0 -_081B55A8: .4byte 0x03005d8c -_081B55AC: .4byte 0x02021cc4 -_081B55B0: .4byte 0x02021fc4 -_081B55B4: .4byte 0x085ea196 + .pool _081B55B8: - ldr r0, _081B5600 + ldr r0, =0x03005d8c ldr r1, [r0] adds r0, r1, 0 adds r0, 0x24 @@ -893902,16 +863468,16 @@ _081B55B8: lsrs r1, 16 bl get_mapheader_by_bank_and_number adds r1, r0, 0 - ldr r0, _081B5604 + ldr r0, =0x02021cc4 ldrb r1, [r1, 0x14] bl sub_81245DC - ldr r0, _081B5608 - ldr r1, _081B560C + ldr r0, =0x02021fc4 + ldr r1, =0x085ea16b _081B55E8: bl ExpandTextCodes adds r0, r6, 0 bl sub_81B5674 - ldr r0, _081B5610 + ldr r0, =0x0203cec4 ldr r0, [r0] movs r1, 0x86 lsls r1, 2 @@ -893919,29 +863485,23 @@ _081B55E8: strh r4, [r0] b _081B5664 .align 2, 0 -_081B5600: .4byte 0x03005d8c -_081B5604: .4byte 0x02021cc4 -_081B5608: .4byte 0x02021fc4 -_081B560C: .4byte 0x085ea16b -_081B5610: .4byte 0x0203cec4 + .pool _081B5614: - ldr r1, _081B561C - ldr r0, _081B5620 + ldr r1, =0x0203cec8 + ldr r0, =sub_8124690 + 1 b _081B5628 .align 2, 0 -_081B561C: .4byte 0x0203cec8 -_081B5620: .4byte sub_8124690 + 1 + .pool _081B5624: - ldr r1, _081B5634 - ldr r0, _081B5638 + ldr r1, =0x0203cec8 + ldr r0, =c2_exit_to_overworld_2_switch + 1 _081B5628: str r0, [r1] adds r0, r6, 0 bl sub_81B12C0 b _081B5664 .align 2, 0 -_081B5634: .4byte 0x0203cec8 -_081B5638: .4byte c2_exit_to_overworld_2_switch + 1 + .pool _081B563C: cmp r4, 0x1 beq _081B564A @@ -893957,20 +863517,19 @@ _081B5650: _081B5652: bl sub_81B3054 _081B5656: - ldr r0, _081B566C + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _081B5670 + ldr r0, =task_brm_cancel_1_on_keypad_a_or_b + 1 str r0, [r1] _081B5664: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081B566C: .4byte 0x03005e00 -_081B5670: .4byte task_brm_cancel_1_on_keypad_a_or_b + 1 + .pool thumb_func_end sub_81B5470 thumb_func_start sub_81B5674 @@ -893979,23 +863538,21 @@ sub_81B5674: @ 81B5674 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081B5698 + ldr r0, =0x02021fc4 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B569C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B56A0 + ldr r1, =sub_81B56A4 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081B5698: .4byte 0x02021fc4 -_081B569C: .4byte 0x03005e00 -_081B56A0: .4byte sub_81B56A4 + 1 + .pool thumb_func_end sub_81B5674 thumb_func_start sub_81B56A4 @@ -894009,20 +863566,19 @@ sub_81B56A4: @ 81B56A4 cmp r0, 0x1 beq _081B56C8 bl sub_81B334C - ldr r0, _081B56D0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B56D4 + ldr r0, =sub_81B56D8 + 1 str r0, [r1] _081B56C8: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B56D0: .4byte 0x03005e00 -_081B56D4: .4byte sub_81B56D8 + 1 + .pool thumb_func_end sub_81B56A4 thumb_func_start sub_81B56D8 @@ -894047,23 +863603,22 @@ _081B56F8: beq _081B571A b _081B572A _081B56FE: - ldr r1, _081B570C - ldr r0, _081B5710 + ldr r1, =0x0203cec8 + ldr r0, =c2_exit_to_overworld_2_switch + 1 str r0, [r1] adds r0, r4, 0 bl sub_81B12C0 b _081B572A .align 2, 0 -_081B570C: .4byte 0x0203cec8 -_081B5710: .4byte c2_exit_to_overworld_2_switch + 1 + .pool _081B5714: movs r0, 0x5 bl audio_play _081B571A: - ldr r0, _081B5730 + ldr r0, =0x03005db0 movs r1, 0 str r1, [r0] - ldr r0, _081B5734 + ldr r0, =0x0203ceec str r1, [r0] adds r0, r4, 0 bl sub_81B1C1C @@ -894072,22 +863627,21 @@ _081B572A: pop {r0} bx r0 .align 2, 0 -_081B5730: .4byte 0x03005db0 -_081B5734: .4byte 0x0203ceec + .pool thumb_func_end sub_81B56D8 thumb_func_start hm_add_c3_launch_phase_2 hm_add_c3_launch_phase_2: @ 81B5738 push {lr} bl pal_fill_black - ldr r0, _081B574C + ldr r0, =task_launch_hm_phase_2 + 1 movs r1, 0x8 bl AddTask movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_081B574C: .4byte task_launch_hm_phase_2 + 1 + .pool thumb_func_end hm_add_c3_launch_phase_2 thumb_func_start task_launch_hm_phase_2 @@ -894101,11 +863655,11 @@ task_launch_hm_phase_2: @ 81B5750 cmp r0, 0x1 bne _081B577C bl brm_get_selected_species - ldr r1, _081B5784 + ldr r1, =0x02038c08 lsls r0, 16 lsrs r0, 16 str r0, [r1] - ldr r0, _081B5788 + ldr r0, =0x0203ceec ldr r0, [r0] bl _call_via_r0 adds r0, r4, 0 @@ -894115,19 +863669,18 @@ _081B577C: pop {r0} bx r0 .align 2, 0 -_081B5784: .4byte 0x02038c08 -_081B5788: .4byte 0x0203ceec + .pool thumb_func_end task_launch_hm_phase_2 thumb_func_start brm_get_selected_species brm_get_selected_species: @ 81B578C push {lr} - ldr r0, _081B57AC + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B57B0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -894136,8 +863689,7 @@ brm_get_selected_species: @ 81B578C pop {r1} bx r1 .align 2, 0 -_081B57AC: .4byte 0x0203cec8 -_081B57B0: .4byte 0x020244ec + .pool thumb_func_end brm_get_selected_species thumb_func_start task_brm_cancel_1_on_keypad_a_or_b @@ -894145,7 +863697,7 @@ task_brm_cancel_1_on_keypad_a_or_b: @ 81B57B4 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081B57D8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -894162,13 +863714,13 @@ _081B57D4: pop {r0} bx r0 .align 2, 0 -_081B57D8: .4byte 0x030022c0 + .pool thumb_func_end task_brm_cancel_1_on_keypad_a_or_b thumb_func_start sub_81B57DC sub_81B57DC: @ 81B57DC push {lr} - ldr r0, _081B57F4 + ldr r0, =0x00000888 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -894178,7 +863730,7 @@ sub_81B57DC: @ 81B57DC bl sub_81B3054 b _081B57FE .align 2, 0 -_081B57F4: .4byte 0x00000888 + .pool _081B57F8: movs r0, 0xD bl sub_81B3054 @@ -894191,7 +863743,7 @@ _081B57FE: hm_surf_run_dp02scr: @ 81B5804 push {lr} bl brm_get_pokemon_selection - ldr r1, _081B581C + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -894200,7 +863752,7 @@ hm_surf_run_dp02scr: @ 81B5804 pop {r0} bx r0 .align 2, 0 -_081B581C: .4byte 0x02038c08 + .pool thumb_func_end hm_surf_run_dp02scr thumb_func_start sub_81B5820 @@ -894216,19 +863768,16 @@ sub_81B5820: @ 81B5820 lsrs r0, 24 cmp r0, 0x1 bne _081B585C - ldr r1, _081B584C - ldr r0, _081B5850 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _081B5854 - ldr r0, _081B5858 + ldr r1, =0x0203ceec + ldr r0, =hm_surf_run_dp02scr + 1 str r0, [r1] movs r0, 0x1 b _081B585E .align 2, 0 -_081B584C: .4byte 0x03005db0 -_081B5850: .4byte hm_add_c3_launch_phase_2 + 1 -_081B5854: .4byte 0x0203ceec -_081B5858: .4byte hm_surf_run_dp02scr + 1 + .pool _081B585C: movs r0, 0 _081B585E: @@ -894258,7 +863807,7 @@ _081B5880: thumb_func_start sub_81B5884 sub_81B5884: @ 81B5884 push {lr} - ldr r0, _081B589C + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] bl is_light_level_1_2_3_or_6 lsls r0, 24 @@ -894268,7 +863817,7 @@ sub_81B5884: @ 81B5884 movs r0, 0 b _081B58A2 .align 2, 0 -_081B589C: .4byte 0x02037318 + .pool _081B58A0: movs r0, 0x1 _081B58A2: @@ -894282,9 +863831,9 @@ sub_81B58A8: @ 81B58A8 sub sp, 0xC movs r0, 0 str r0, [sp] - ldr r0, _081B58CC + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B58D0 + ldr r0, =sub_8086194 + 1 str r0, [sp, 0x8] movs r0, 0 movs r1, 0 @@ -894295,15 +863844,14 @@ sub_81B58A8: @ 81B58A8 pop {r0} bx r0 .align 2, 0 -_081B58CC: .4byte sub_81B1370 + 1 -_081B58D0: .4byte sub_8086194 + 1 + .pool thumb_func_end sub_81B58A8 thumb_func_start hm2_waterfall hm2_waterfall: @ 81B58D4 push {lr} bl brm_get_pokemon_selection - ldr r1, _081B58EC + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -894312,7 +863860,7 @@ hm2_waterfall: @ 81B58D4 pop {r0} bx r0 .align 2, 0 -_081B58EC: .4byte 0x02038c08 + .pool thumb_func_end hm2_waterfall thumb_func_start hm_prepare_waterfall @@ -894342,19 +863890,16 @@ hm_prepare_waterfall: @ 81B58F0 lsrs r0, 24 cmp r0, 0x1 bne _081B594C - ldr r1, _081B593C - ldr r0, _081B5940 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _081B5944 - ldr r0, _081B5948 + ldr r1, =0x0203ceec + ldr r0, =hm2_waterfall + 1 str r0, [r1] movs r0, 0x1 b _081B594E .align 2, 0 -_081B593C: .4byte 0x03005db0 -_081B5940: .4byte hm_add_c3_launch_phase_2 + 1 -_081B5944: .4byte 0x0203ceec -_081B5948: .4byte hm2_waterfall + 1 + .pool _081B594C: movs r0, 0 _081B594E: @@ -894368,7 +863913,7 @@ _081B594E: sub_81B5958: @ 81B5958 push {lr} bl brm_get_pokemon_selection - ldr r1, _081B5970 + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -894377,14 +863922,14 @@ sub_81B5958: @ 81B5958 pop {r0} bx r0 .align 2, 0 -_081B5970: .4byte 0x02038c08 + .pool thumb_func_end sub_81B5958 thumb_func_start sub_81B5974 sub_81B5974: @ 81B5974 push {lr} bl sub_809D1E8 - ldr r1, _081B598C + ldr r1, =0x02038c08 lsls r0, 24 lsrs r0, 24 str r0, [r1, 0x4] @@ -894393,23 +863938,20 @@ sub_81B5974: @ 81B5974 movs r0, 0 b _081B599E .align 2, 0 -_081B598C: .4byte 0x02038c08 + .pool _081B5990: - ldr r1, _081B59A4 - ldr r0, _081B59A8 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_launch_phase_2 + 1 str r0, [r1] - ldr r1, _081B59AC - ldr r0, _081B59B0 + ldr r1, =0x0203ceec + ldr r0, =sub_81B5958 + 1 str r0, [r1] movs r0, 0x1 _081B599E: pop {r1} bx r1 .align 2, 0 -_081B59A4: .4byte 0x03005db0 -_081B59A8: .4byte hm_add_c3_launch_phase_2 + 1 -_081B59AC: .4byte 0x0203ceec -_081B59B0: .4byte sub_81B5958 + 1 + .pool thumb_func_end sub_81B5974 thumb_func_start sub_81B59B4 @@ -894425,15 +863967,15 @@ sub_81B59B4: @ 81B59B4 lsrs r0, 24 cmp r0, 0x1 bne _081B59EA - ldr r0, _081B5A20 - ldr r1, _081B5A24 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _081B59EA - ldr r0, _081B5A28 + ldr r0, =0x08616020 adds r0, r4, r0 ldrb r1, [r0] eors r1, r6 @@ -894464,9 +864006,7 @@ _081B59EA: pop {r0} bx r0 .align 2, 0 -_081B5A20: .4byte 0x030022c0 -_081B5A24: .4byte 0x00000439 -_081B5A28: .4byte 0x08616020 + .pool thumb_func_end sub_81B59B4 thumb_func_start sub_81B5A2C @@ -894481,7 +864021,7 @@ sub_81B5A2C: @ 81B5A2C lsrs r7, r3, 24 cmp r5, 0 beq _081B5A7A - ldr r1, _081B5A84 + ldr r1, =sub_80D3014 + 1 ldr r0, [r4, 0x4] ldrb r2, [r0] ldrb r3, [r0, 0x1] @@ -894493,7 +864033,7 @@ sub_81B5A2C: @ 81B5A2C adds r0, r5, 0 bl sub_80D2CC4 strb r0, [r4, 0x9] - ldr r2, _081B5A88 + ldr r2, =0x02020630 ldrb r0, [r4, 0x9] lsls r1, r0, 4 adds r1, r0 @@ -894515,8 +864055,7 @@ _081B5A7A: pop {r0} bx r0 .align 2, 0 -_081B5A84: .4byte sub_80D3014 + 1 -_081B5A88: .4byte 0x02020630 + .pool thumb_func_end sub_81B5A2C thumb_func_start sub_81B5A8C @@ -894548,51 +864087,51 @@ _081B5AB4: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _081B5AD0 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 bl sub_80D32C8 b _081B5B2C .align 2, 0 -_081B5AD0: .4byte 0x02020630 + .pool _081B5AD4: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _081B5AE8 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 bl sub_80D32C8 b _081B5B2C .align 2, 0 -_081B5AE8: .4byte 0x02020630 + .pool _081B5AEC: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _081B5B00 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x2 bl sub_80D32C8 b _081B5B2C .align 2, 0 -_081B5B00: .4byte 0x02020630 + .pool _081B5B04: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _081B5B18 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x3 bl sub_80D32C8 b _081B5B2C .align 2, 0 -_081B5B18: .4byte 0x02020630 + .pool _081B5B1C: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _081B5B34 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x4 bl sub_80D32C8 @@ -894601,7 +864140,7 @@ _081B5B2C: pop {r0} bx r0 .align 2, 0 -_081B5B34: .4byte 0x02020630 + .pool thumb_func_end sub_81B5A8C thumb_func_start sub_81B5B38 @@ -894637,7 +864176,7 @@ sub_81B5B6C: @ 81B5B6C lsls r0, 24 lsrs r4, r0, 24 lsls r1, 24 - ldr r5, _081B5B9C + ldr r5, =0x02020630 lsls r0, r4, 4 adds r0, r4 lsls r6, r0, 2 @@ -894653,14 +864192,13 @@ sub_81B5B6C: @ 81B5B6C cmp r0, 0x10 bne _081B5BA4 strh r3, [r2, 0x24] - ldr r0, _081B5BA0 + ldr r0, =0x0000fffc strh r0, [r2, 0x26] b _081B5BAA .align 2, 0 -_081B5B9C: .4byte 0x02020630 -_081B5BA0: .4byte 0x0000fffc + .pool _081B5BA4: - ldr r0, _081B5BBC + ldr r0, =0x0000fffc strh r0, [r2, 0x24] strh r3, [r2, 0x26] _081B5BAA: @@ -894670,25 +864208,24 @@ _081B5BAA: mov r1, r12 adds r1, 0x1C adds r0, r1 - ldr r1, _081B5BC0 + ldr r1, =sub_81B5C08 + 1 b _081B5BD0 .align 2, 0 -_081B5BBC: .4byte 0x0000fffc -_081B5BC0: .4byte sub_81B5C08 + 1 + .pool _081B5BC4: strh r3, [r2, 0x24] strh r3, [r2, 0x26] adds r0, r5, 0 adds r0, 0x1C adds r0, r6, r0 - ldr r1, _081B5BD8 + ldr r1, =sub_81B5BDC + 1 _081B5BD0: str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081B5BD8: .4byte sub_81B5BDC + 1 + .pool thumb_func_end sub_81B5B6C thumb_func_start sub_81B5BDC @@ -894704,11 +864241,11 @@ sub_81B5BDC: @ 81B5BDC ands r0, r1 cmp r0, 0 beq _081B5C00 - ldr r0, _081B5BFC + ldr r0, =0x0000fffd strh r0, [r4, 0x26] b _081B5C02 .align 2, 0 -_081B5BFC: .4byte 0x0000fffd + .pool _081B5C00: strh r1, [r4, 0x26] _081B5C02: @@ -894734,7 +864271,7 @@ sub_81B5C14: @ 81B5C14 bl pokemon_getattr cmp r0, 0 beq _081B5C3C - ldr r0, _081B5C44 + ldr r0, =0x08615ec0 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x3] @@ -894749,7 +864286,7 @@ _081B5C3C: pop {r0} bx r0 .align 2, 0 -_081B5C44: .4byte 0x08615ec0 + .pool thumb_func_end sub_81B5C14 thumb_func_start sub_81B5C48 @@ -894761,14 +864298,14 @@ sub_81B5C48: @ 81B5C48 lsrs r5, r1, 16 cmp r0, 0 beq _081B5C84 - ldr r0, _081B5C8C + ldr r0, =0x08615ec0 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x3] movs r3, 0 bl obj_add_from_template_forward_search strb r0, [r4, 0xA] - ldr r2, _081B5C90 + ldr r2, =0x02020630 ldrb r0, [r4, 0xA] lsls r1, r0, 4 adds r1, r0 @@ -894787,8 +864324,7 @@ _081B5C84: pop {r0} bx r0 .align 2, 0 -_081B5C8C: .4byte 0x08615ec0 -_081B5C90: .4byte 0x02020630 + .pool thumb_func_end sub_81B5C48 thumb_func_start sub_81B5C94 @@ -894814,7 +864350,7 @@ sub_81B5CB0: @ 81B5CB0 lsrs r0, 16 cmp r0, 0 bne _081B5CD8 - ldr r2, _081B5CD4 + ldr r2, =0x02020630 ldrb r1, [r4, 0xA] lsls r0, r1, 4 adds r0, r1 @@ -894826,7 +864362,7 @@ sub_81B5CB0: @ 81B5CB0 orrs r1, r2 b _081B5D24 .align 2, 0 -_081B5CD4: .4byte 0x02020630 + .pool _081B5CD8: bl itemid_is_mail lsls r0, 24 @@ -894836,24 +864372,24 @@ _081B5CD8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081B5CF8 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0x1 bl obj_anim_image_start b _081B5D0E .align 2, 0 -_081B5CF8: .4byte 0x02020630 + .pool _081B5CFC: ldrb r1, [r4, 0xA] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081B5D2C + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 bl obj_anim_image_start _081B5D0E: - ldr r2, _081B5D2C + ldr r2, =0x02020630 ldrb r1, [r4, 0xA] lsls r0, r1, 4 adds r0, r1 @@ -894870,21 +864406,20 @@ _081B5D24: pop {r0} bx r0 .align 2, 0 -_081B5D2C: .4byte 0x02020630 + .pool thumb_func_end sub_81B5CB0 thumb_func_start sub_81B5D30 sub_81B5D30: @ 81B5D30 push {lr} - ldr r0, _081B5D44 + ldr r0, =0x08615eb0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r0, _081B5D48 + ldr r0, =0x08615eb8 bl gpu_pal_obj_alloc_tag_and_apply pop {r0} bx r0 .align 2, 0 -_081B5D44: .4byte 0x08615eb0 -_081B5D48: .4byte 0x08615eb8 + .pool thumb_func_end sub_81B5D30 thumb_func_start sub_81B5D4C @@ -894907,7 +864442,7 @@ _081B5D60: _081B5D68: movs r0, 0x64 muls r0, r5 - ldr r1, _081B5DA4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC bl pokemon_getattr @@ -894933,14 +864468,14 @@ _081B5D94: bcc _081B5D68 b _081B5DE4 .align 2, 0 -_081B5DA4: .4byte 0x020244ec + .pool _081B5DA8: movs r5, 0 b _081B5DDE _081B5DAC: movs r0, 0x64 muls r0, r5 - ldr r1, _081B5DEC + ldr r1, =0x02024744 adds r0, r1 movs r1, 0xC bl pokemon_getattr @@ -894970,7 +864505,7 @@ _081B5DE4: pop {r0} bx r0 .align 2, 0 -_081B5DEC: .4byte 0x02024744 + .pool thumb_func_end sub_81B5D4C thumb_func_start sub_81B5DF0 @@ -894987,7 +864522,7 @@ sub_81B5DF0: @ 81B5DF0 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _081B5E68 + ldr r0, =0x02020630 mov r8, r0 lsls r0, r6, 4 adds r0, r6 @@ -894995,7 +864530,7 @@ sub_81B5DF0: @ 81B5DF0 add r0, r8 adds r0, 0x43 ldrb r3, [r0] - ldr r0, _081B5E6C + ldr r0, =0x08615ec0 subs r3, 0x1 lsls r3, 24 lsrs r3, 24 @@ -895016,7 +864551,7 @@ sub_81B5DF0: @ 81B5DF0 movs r0, 0x1C add r8, r0 add r4, r8 - ldr r0, _081B5E70 + ldr r0, =sub_81B5E74 + 1 str r0, [r4] strh r6, [r5, 0x3C] adds r0, r5, 0 @@ -895032,9 +864567,7 @@ sub_81B5DF0: @ 81B5DF0 pop {r0} bx r0 .align 2, 0 -_081B5E68: .4byte 0x02020630 -_081B5E6C: .4byte 0x08615ec0 -_081B5E70: .4byte sub_81B5E74 + 1 + .pool thumb_func_end sub_81B5DF0 thumb_func_start sub_81B5E74 @@ -895044,7 +864577,7 @@ sub_81B5E74: @ 81B5E74 ldrh r1, [r4, 0x3C] lsls r1, 24 lsrs r1, 24 - ldr r2, _081B5EA4 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -895063,7 +864596,7 @@ sub_81B5E74: @ 81B5E74 strb r1, [r0] b _081B5EC6 .align 2, 0 -_081B5EA4: .4byte 0x02020630 + .pool _081B5EA8: adds r3, r4, 0 adds r3, 0x3E @@ -895094,7 +864627,7 @@ sub_81B5ECC: @ 81B5ECC bl pokemon_getattr cmp r0, 0 beq _081B5EEA - ldr r0, _081B5EF0 + ldr r0, =0x08615f08 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] ldrb r2, [r2, 0x7] @@ -895106,7 +864639,7 @@ _081B5EEA: pop {r0} bx r0 .align 2, 0 -_081B5EF0: .4byte 0x08615f08 + .pool thumb_func_end sub_81B5ECC thumb_func_start sub_81B5EF4 @@ -895116,14 +864649,14 @@ sub_81B5EF4: @ 81B5EF4 lsls r0, 16 cmp r0, 0 beq _081B5F24 - ldr r0, _081B5F2C + ldr r0, =0x08615f08 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] ldrb r2, [r2, 0x7] movs r3, 0x8 bl obj_add_from_template_forward_search strb r0, [r4, 0xB] - ldr r2, _081B5F30 + ldr r2, =0x02020630 ldrb r0, [r4, 0xB] lsls r1, r0, 4 adds r1, r0 @@ -895139,8 +864672,7 @@ _081B5F24: pop {r0} bx r0 .align 2, 0 -_081B5F2C: .4byte 0x08615f08 -_081B5F30: .4byte 0x02020630 + .pool thumb_func_end sub_81B5EF4 thumb_func_start sub_81B5F34 @@ -895152,13 +864684,13 @@ sub_81B5F34: @ 81B5F34 lsrs r3, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, _081B5F6C + ldr r0, =0x08615f08 adds r1, r3, 0 movs r3, 0x8 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r2, _081B5F70 + ldr r2, =0x02020630 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -895173,8 +864705,7 @@ sub_81B5F34: @ 81B5F34 pop {r1} bx r1 .align 2, 0 -_081B5F6C: .4byte 0x08615f08 -_081B5F70: .4byte 0x02020630 + .pool thumb_func_end sub_81B5F34 thumb_func_start sub_81B5F74 @@ -895186,7 +864717,7 @@ sub_81B5F74: @ 81B5F74 lsrs r3, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, _081B5F94 + ldr r0, =0x08615f78 adds r1, r3, 0 movs r3, 0x8 bl obj_add_from_template_forward_search @@ -895195,7 +864726,7 @@ sub_81B5F74: @ 81B5F74 pop {r1} bx r1 .align 2, 0 -_081B5F94: .4byte 0x08615f78 + .pool thumb_func_end sub_81B5F74 thumb_func_start sub_81B5F98 @@ -895209,13 +864740,13 @@ sub_81B5F98: @ 81B5F98 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, _081B5FB8 + ldr r2, =0x02020630 adds r0, r2 bl obj_anim_image_start pop {r0} bx r0 .align 2, 0 -_081B5FB8: .4byte 0x02020630 + .pool thumb_func_end sub_81B5F98 thumb_func_start sub_81B5FBC @@ -895234,7 +864765,7 @@ sub_81B5FBC: @ 81B5FBC lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _081B5FFC + ldr r0, =0x02020630 mov r8, r0 add r4, r8 adds r0, r4, 0 @@ -895251,12 +864782,12 @@ sub_81B5FBC: @ 81B5FBC strh r6, [r5, 0x26] b _081B602C .align 2, 0 -_081B5FFC: .4byte 0x02020630 + .pool _081B6000: lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, _081B6038 + ldr r0, =0x02020630 mov r8, r0 add r5, r8 adds r0, r5, 0 @@ -895269,7 +864800,7 @@ _081B6000: adds r0, r4, 0 movs r1, 0x5 bl obj_anim_image_start - ldr r0, _081B603C + ldr r0, =0x0000fffc strh r0, [r5, 0x26] movs r0, 0x4 strh r0, [r4, 0x26] @@ -895280,25 +864811,22 @@ _081B602C: pop {r0} bx r0 .align 2, 0 -_081B6038: .4byte 0x02020630 -_081B603C: .4byte 0x0000fffc + .pool thumb_func_end sub_81B5FBC thumb_func_start sub_81B6040 sub_81B6040: @ 81B6040 push {lr} - ldr r0, _081B6058 + ldr r0, =0x08615ef8 bl gpu_tile_obj_decompress_and_load - ldr r0, _081B605C + ldr r0, =0x08615f70 bl gpu_tile_obj_decompress_and_load - ldr r0, _081B6060 + ldr r0, =0x08615f00 bl gpu_pal_obj_decompress_and_apply pop {r0} bx r0 .align 2, 0 -_081B6058: .4byte 0x08615ef8 -_081B605C: .4byte 0x08615f70 -_081B6060: .4byte 0x08615f00 + .pool thumb_func_end sub_81B6040 thumb_func_start sub_81B6064 @@ -895310,7 +864838,7 @@ sub_81B6064: @ 81B6064 bl pokemon_getattr cmp r0, 0 beq _081B608C - ldr r0, _081B6094 + ldr r0, =0x08616008 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] ldrb r2, [r2, 0x5] @@ -895325,7 +864853,7 @@ _081B608C: pop {r0} bx r0 .align 2, 0 -_081B6094: .4byte 0x08616008 + .pool thumb_func_end sub_81B6064 thumb_func_start sub_81B6098 @@ -895337,7 +864865,7 @@ sub_81B6098: @ 81B6098 lsrs r5, r1, 24 cmp r0, 0 beq _081B60D4 - ldr r0, _081B60DC + ldr r0, =0x08616008 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] ldrb r2, [r2, 0x5] @@ -895347,7 +864875,7 @@ sub_81B6098: @ 81B6098 adds r0, r5, 0 adds r1, r4, 0 bl sub_81B60FC - ldr r2, _081B60E0 + ldr r2, =0x02020630 ldrb r0, [r4, 0xC] lsls r1, r0, 4 adds r1, r0 @@ -895363,8 +864891,7 @@ _081B60D4: pop {r0} bx r0 .align 2, 0 -_081B60DC: .4byte 0x08616008 -_081B60E0: .4byte 0x02020630 + .pool thumb_func_end sub_81B6098 thumb_func_start sub_81B60E4 @@ -895392,7 +864919,7 @@ sub_81B60FC: @ 81B60FC cmp r2, 0x6 bne _081B6128 _081B610C: - ldr r2, _081B6124 + ldr r2, =0x02020630 ldrb r1, [r5, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -895404,13 +864931,13 @@ _081B610C: orrs r1, r2 b _081B6152 .align 2, 0 -_081B6124: .4byte 0x02020630 + .pool _081B6128: ldrb r1, [r5, 0xC] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _081B615C + ldr r4, =0x02020630 adds r0, r4 subs r1, r2, 0x1 lsls r1, 24 @@ -895432,21 +864959,20 @@ _081B6152: pop {r0} bx r0 .align 2, 0 -_081B615C: .4byte 0x02020630 + .pool thumb_func_end sub_81B60FC thumb_func_start sub_81B6160 sub_81B6160: @ 81B6160 push {lr} - ldr r0, _081B6174 + ldr r0, =0x08615ff8 bl gpu_tile_obj_decompress_and_load - ldr r0, _081B6178 + ldr r0, =0x08616000 bl gpu_pal_obj_decompress_and_apply pop {r0} bx r0 .align 2, 0 -_081B6174: .4byte 0x08615ff8 -_081B6178: .4byte 0x08616000 + .pool thumb_func_end sub_81B6160 thumb_func_start sub_81B617C @@ -895455,10 +864981,10 @@ sub_81B617C: @ 81B617C mov r7, r8 push {r7} sub sp, 0xC - ldr r0, _081B61A4 + ldr r0, =c2_815ABFC + 1 mov r8, r0 - ldr r0, _081B61A8 - ldr r1, _081B61AC + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -895471,27 +864997,25 @@ sub_81B617C: @ 81B617C lsrs r6, r0, 24 b _081B61C0 .align 2, 0 -_081B61A4: .4byte c2_815ABFC + 1 -_081B61A8: .4byte 0x030022c0 -_081B61AC: .4byte 0x00000439 + .pool _081B61B0: - ldr r0, _081B61B8 + ldr r0, =0x0203cec8 strb r5, [r0, 0x9] b _081B6204 .align 2, 0 -_081B61B8: .4byte 0x0203cec8 + .pool _081B61BC: movs r7, 0 movs r6, 0 _081B61C0: - ldr r4, _081B620C + ldr r4, =0x0203ce7c ldrh r0, [r4] bl sub_81B7CEC lsls r0, 24 lsrs r0, 24 cmp r0, 0xA bne _081B621C - ldr r1, _081B6210 + ldr r1, =0x0203cec8 movs r0, 0 strb r0, [r1, 0x9] movs r5, 0 @@ -895499,7 +865023,7 @@ _081B61D8: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081B6214 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0xB @@ -895518,14 +865042,11 @@ _081B61FA: cmp r5, 0x5 bls _081B61D8 _081B6204: - ldr r0, _081B6218 + ldr r0, =sub_81B6280 + 1 movs r1, 0x7F b _081B6230 .align 2, 0 -_081B620C: .4byte 0x0203ce7c -_081B6210: .4byte 0x0203cec8 -_081B6214: .4byte 0x020244ec -_081B6218: .4byte sub_81B6280 + 1 + .pool _081B621C: ldrh r0, [r4] bl sub_80D6C68 @@ -895536,7 +865057,7 @@ _081B621C: bne _081B622E movs r1, 0x4 _081B622E: - ldr r0, _081B6250 + ldr r0, =sub_81B1370 + 1 _081B6230: str r1, [sp] str r0, [sp, 0x4] @@ -895554,7 +865075,7 @@ _081B6230: pop {r0} bx r0 .align 2, 0 -_081B6250: .4byte sub_81B1370 + 1 + .pool thumb_func_end sub_81B617C thumb_func_start c2_815ABFC @@ -895570,7 +865091,7 @@ c2_815ABFC: @ 81B6254 bl sub_81AAC90 b _081B6276 _081B626C: - ldr r0, _081B627C + ldr r0, =0x0203cf30 ldr r1, [r0] movs r0, 0x4 bl sub_81C4F98 @@ -895578,7 +865099,7 @@ _081B6276: pop {r0} bx r0 .align 2, 0 -_081B627C: .4byte 0x0203cf30 + .pool thumb_func_end c2_815ABFC thumb_func_start sub_81B6280 @@ -895586,25 +865107,25 @@ sub_81B6280: @ 81B6280 push {lr} lsls r0, 24 lsrs r3, r0, 24 - ldr r0, _081B62B8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081B62B2 - ldr r0, _081B62BC + ldr r0, =0x0203cec8 ldrb r1, [r0, 0x8] movs r0, 0xF ands r0, r1 cmp r0, 0x1 bne _081B62A6 - ldr r0, _081B62C0 + ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, _081B62C4 + ldr r0, =sub_81B9140 + 1 str r0, [r1, 0x4] _081B62A6: - ldr r0, _081B62C8 - ldr r1, _081B62CC + ldr r0, =0x03006328 + ldr r1, =sub_81B6794 + 1 ldr r2, [r0] adds r0, r3, 0 bl _call_via_r2 @@ -895612,12 +865133,7 @@ _081B62B2: pop {r0} bx r0 .align 2, 0 -_081B62B8: .4byte 0x02037fd4 -_081B62BC: .4byte 0x0203cec8 -_081B62C0: .4byte 0x0203cec4 -_081B62C4: .4byte sub_81B9140 + 1 -_081B62C8: .4byte 0x03006328 -_081B62CC: .4byte sub_81B6794 + 1 + .pool thumb_func_end sub_81B6280 thumb_func_start sub_81B62D0 @@ -895627,16 +865143,15 @@ sub_81B62D0: @ 81B62D0 lsrs r0, 16 cmp r0, 0xAF bne _081B62EC - ldr r0, _081B62E4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081B62E8 + ldr r1, =0x00003214 adds r0, r1 b _081B62F6 .align 2, 0 -_081B62E4: .4byte 0x03005d8c -_081B62E8: .4byte 0x00003214 + .pool _081B62EC: - ldr r1, _081B6304 + ldr r1, =0x0831e58c subs r0, 0xD lsls r0, 2 adds r0, r1 @@ -895650,7 +865165,7 @@ _081B62F6: movs r0, 0 b _081B630A .align 2, 0 -_081B6304: .4byte 0x0831e58c + .pool _081B6308: movs r0, 0x1 _081B630A: @@ -895672,12 +865187,12 @@ sub_81B6310: @ 81B6310 b _081B64BC _081B6326: lsls r0, 2 - ldr r1, _081B6330 + ldr r1, =_081B6334 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081B6330: .4byte _081B6334 + .pool .align 2, 0 _081B6334: .4byte _081B6380 @@ -895700,144 +865215,125 @@ _081B6334: .4byte _081B6494 .4byte _081B64A8 _081B6380: - ldr r0, _081B638C - ldr r1, _081B6390 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9c3e bl ExpandTextCodes b _081B64C4 .align 2, 0 -_081B638C: .4byte 0x02021fc4 -_081B6390: .4byte 0x085e9c3e + .pool _081B6394: - ldr r0, _081B63A0 - ldr r1, _081B63A4 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9c7c bl ExpandTextCodes b _081B64C4 .align 2, 0 -_081B63A0: .4byte 0x02021fc4 -_081B63A4: .4byte 0x085e9c7c + .pool _081B63A8: - ldr r0, _081B63B4 - ldr r1, _081B63B8 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9c8a bl ExpandTextCodes b _081B64C4 .align 2, 0 -_081B63B4: .4byte 0x02021fc4 -_081B63B8: .4byte 0x085e9c8a + .pool _081B63BC: - ldr r0, _081B63C8 - ldr r1, _081B63CC + ldr r0, =0x02021fc4 + ldr r1, =0x085e9ca2 bl ExpandTextCodes b _081B64C4 .align 2, 0 -_081B63C8: .4byte 0x02021fc4 -_081B63CC: .4byte 0x085e9ca2 + .pool _081B63D0: - ldr r0, _081B63DC - ldr r1, _081B63E0 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9c5f bl ExpandTextCodes b _081B64C4 .align 2, 0 -_081B63DC: .4byte 0x02021fc4 -_081B63E0: .4byte 0x085e9c5f + .pool _081B63E4: - ldr r0, _081B63F0 - ldr r1, _081B63F4 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9dbe bl ExpandTextCodes b _081B64C4 .align 2, 0 -_081B63F0: .4byte 0x02021fc4 -_081B63F4: .4byte 0x085e9dbe + .pool _081B63F8: - ldr r0, _081B6404 - ldr r1, _081B6408 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9de1 bl ExpandTextCodes b _081B64C4 .align 2, 0 -_081B6404: .4byte 0x02021fc4 -_081B6408: .4byte 0x085e9de1 + .pool _081B640C: - ldr r0, _081B6418 - ldr r1, _081B641C + ldr r0, =0x02021fc4 + ldr r1, =0x085e9ce0 bl ExpandTextCodes b _081B64C4 .align 2, 0 -_081B6418: .4byte 0x02021fc4 -_081B641C: .4byte 0x085e9ce0 + .pool _081B6420: - ldr r0, _081B6428 - ldr r1, _081B642C + ldr r0, =0x02021dc4 + ldr r1, =0x085e96e3 b _081B6474 .align 2, 0 -_081B6428: .4byte 0x02021dc4 -_081B642C: .4byte 0x085e96e3 + .pool _081B6430: - ldr r0, _081B6438 - ldr r1, _081B643C + ldr r0, =0x02021dc4 + ldr r1, =0x085ea33c b _081B6474 .align 2, 0 -_081B6438: .4byte 0x02021dc4 -_081B643C: .4byte 0x085ea33c + .pool _081B6440: - ldr r0, _081B6448 - ldr r1, _081B644C + ldr r0, =0x02021dc4 + ldr r1, =0x085ea343 b _081B6474 .align 2, 0 -_081B6448: .4byte 0x02021dc4 -_081B644C: .4byte 0x085ea343 + .pool _081B6450: - ldr r0, _081B6458 - ldr r1, _081B645C + ldr r0, =0x02021dc4 + ldr r1, =0x085ea35b b _081B6474 .align 2, 0 -_081B6458: .4byte 0x02021dc4 -_081B645C: .4byte 0x085ea35b + .pool _081B6460: - ldr r0, _081B6468 - ldr r1, _081B646C + ldr r0, =0x02021dc4 + ldr r1, =0x085e96e6 b _081B6474 .align 2, 0 -_081B6468: .4byte 0x02021dc4 -_081B646C: .4byte 0x085e96e6 + .pool _081B6470: - ldr r0, _081B6484 - ldr r1, _081B6488 + ldr r0, =0x02021dc4 + ldr r1, =0x085e96ee _081B6474: bl gf_strcpy - ldr r0, _081B648C - ldr r1, _081B6490 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9d25 bl ExpandTextCodes b _081B64C4 .align 2, 0 -_081B6484: .4byte 0x02021dc4 -_081B6488: .4byte 0x085e96ee -_081B648C: .4byte 0x02021fc4 -_081B6490: .4byte 0x085e9d25 + .pool _081B6494: - ldr r0, _081B64A0 - ldr r1, _081B64A4 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9cf5 bl ExpandTextCodes b _081B64C4 .align 2, 0 -_081B64A0: .4byte 0x02021fc4 -_081B64A4: .4byte 0x085e9cf5 + .pool _081B64A8: - ldr r0, _081B64B4 - ldr r1, _081B64B8 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9cb7 bl ExpandTextCodes b _081B64C4 .align 2, 0 -_081B64B4: .4byte 0x02021fc4 -_081B64B8: .4byte 0x085e9cb7 + .pool _081B64BC: - ldr r0, _081B64C8 - ldr r1, _081B64CC + ldr r0, =0x02021fc4 + ldr r1, =0x085e96f6 bl ExpandTextCodes _081B64C4: pop {r0} bx r0 .align 2, 0 -_081B64C8: .4byte 0x02021fc4 -_081B64CC: .4byte 0x085e96f6 + .pool thumb_func_end sub_81B6310 thumb_func_start sub_81B64D0 @@ -895854,13 +865350,13 @@ sub_81B64D0: @ 81B64D0 adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr - ldr r1, _081B64F8 + ldr r1, =0x0000012f cmp r0, r1 bne _081B64FC movs r0, 0 b _081B64FE .align 2, 0 -_081B64F8: .4byte 0x0000012f + .pool _081B64FC: movs r0, 0x1 _081B64FE: @@ -895899,8 +865395,8 @@ sub_81B6520: @ 81B6520 lsrs r5, r1, 16 lsls r2, 24 lsrs r6, r2, 24 - ldr r0, _081B654C - ldr r1, _081B6550 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 @@ -895909,20 +865405,18 @@ sub_81B6520: @ 81B6520 bne _081B6558 movs r0, 0x64 muls r0, r3 - ldr r1, _081B6554 + ldr r1, =0x020244ec adds r0, r1 adds r1, r5, 0 adds r2, r3, 0 b _081B6572 .align 2, 0 -_081B654C: .4byte 0x030022c0 -_081B6550: .4byte 0x00000439 -_081B6554: .4byte 0x020244ec + .pool _081B6558: movs r0, 0x64 adds r4, r3, 0 muls r4, r0 - ldr r0, _081B6584 + ldr r0, =0x020244ec adds r4, r0 adds r0, r3, 0 bl sub_81B8F38 @@ -895940,7 +865434,7 @@ _081B6572: pop {r1} bx r1 .align 2, 0 -_081B6584: .4byte 0x020244ec + .pool thumb_func_end sub_81B6520 thumb_func_start sub_81B6588 @@ -895957,14 +865451,14 @@ sub_81B6588: @ 81B6588 mov r9, r0 movs r0, 0 mov r10, r0 - ldr r0, _081B6610 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B6614 + ldr r0, =0x020244ec adds r5, r1, r0 - ldr r0, _081B6618 + ldr r0, =0x0203ce7c ldrh r6, [r0] adds r0, r5, 0 adds r1, r6, 0 @@ -895993,7 +865487,7 @@ sub_81B6588: @ 81B6588 movs r1, 0 mov r8, r1 _081B65EE: - ldr r4, _081B6610 + ldr r4, =0x0203cec8 ldrb r0, [r4, 0x9] adds r1, r6, 0 movs r2, 0 @@ -896002,21 +865496,17 @@ _081B65EE: cmp r0, 0 beq _081B6624 _081B6600: - ldr r1, _081B661C + ldr r1, =0x0203cee8 movs r0, 0 strb r0, [r1] movs r0, 0x5 bl audio_play - ldr r0, _081B6620 + ldr r0, =0x085e96f6 b _081B66F4 .align 2, 0 -_081B6610: .4byte 0x0203cec8 -_081B6614: .4byte 0x020244ec -_081B6618: .4byte 0x0203ce7c -_081B661C: .4byte 0x0203cee8 -_081B6620: .4byte 0x085e96f6 + .pool _081B6624: - ldr r1, _081B664C + ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] adds r0, r6, 0 @@ -896034,13 +865524,13 @@ _081B6624: bl sub_80D6AA4 b _081B6656 .align 2, 0 -_081B664C: .4byte 0x0203cee8 + .pool _081B6650: movs r0, 0x75 bl audio_play _081B6656: - ldr r4, _081B66D4 - ldr r7, _081B66D8 + ldr r4, =0x0203cedc + ldr r7, =0x0203cec8 movs r0, 0x9 ldrsb r0, [r7, r0] lsls r0, 4 @@ -896048,7 +865538,7 @@ _081B6656: adds r1, r0 adds r0, r5, 0 bl sub_81B60E4 - ldr r2, _081B66DC + ldr r2, =0x02020630 movs r0, 0x9 ldrsb r0, [r7, r0] ldr r1, [r4] @@ -896088,7 +865578,7 @@ _081B66A8: lsls r3, 16 asrs r3, 16 ldrb r1, [r7, 0x9] - ldr r0, _081B66E0 + ldr r0, =sub_81B672C + 1 str r0, [sp] mov r0, r9 movs r2, 0x1 @@ -896099,23 +865589,20 @@ _081B66A8: bl sub_81B1FA8 b _081B6710 .align 2, 0 -_081B66D4: .4byte 0x0203cedc -_081B66D8: .4byte 0x0203cec8 -_081B66DC: .4byte 0x02020630 -_081B66E0: .4byte sub_81B672C + 1 + .pool _081B66E4: - ldr r1, _081B6720 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 adds r0, r6, 0 bl sub_81B6310 - ldr r0, _081B6724 + ldr r0, =0x02021fc4 _081B66F4: movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B6728 + ldr r1, =0x03005e00 mov r2, r9 lsls r0, r2, 2 add r0, r9 @@ -896133,9 +865620,7 @@ _081B6710: pop {r0} bx r0 .align 2, 0 -_081B6720: .4byte 0x02021cc4 -_081B6724: .4byte 0x02021fc4 -_081B6728: .4byte 0x03005e00 + .pool thumb_func_end sub_81B6588 thumb_func_start sub_81B672C @@ -896144,17 +865629,17 @@ sub_81B672C: @ 81B672C adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _081B6778 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B677C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081B6780 + ldr r1, =0x02021cc4 bl sub_81B1B44 - ldr r4, _081B6784 - ldr r1, _081B6788 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9c17 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -896163,24 +865648,18 @@ sub_81B672C: @ 81B672C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram bl sub_805EAE8 - ldr r1, _081B678C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081B6790 + ldr r1, =sub_81B6794 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B6778: .4byte 0x0203cec8 -_081B677C: .4byte 0x020244ec -_081B6780: .4byte 0x02021cc4 -_081B6784: .4byte 0x02021fc4 -_081B6788: .4byte 0x085e9c17 -_081B678C: .4byte 0x03005e00 -_081B6790: .4byte sub_81B6794 + 1 + .pool thumb_func_end sub_81B672C thumb_func_start sub_81B6794 @@ -896193,11 +865672,11 @@ sub_81B6794: @ 81B6794 lsrs r0, 24 cmp r0, 0x1 beq _081B67BA - ldr r0, _081B67C0 + ldr r0, =0x0203cee8 ldrb r1, [r0] cmp r1, 0 bne _081B67B4 - ldr r0, _081B67C4 + ldr r0, =0x0203cec4 ldr r0, [r0] str r1, [r0, 0x4] _081B67B4: @@ -896208,8 +865687,7 @@ _081B67BA: pop {r0} bx r0 .align 2, 0 -_081B67C0: .4byte 0x0203cee8 -_081B67C4: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B6794 thumb_func_start sub_81B67C8 @@ -896224,14 +865702,14 @@ sub_81B67C8: @ 81B67C8 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r4, _081B6860 + ldr r4, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r4, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B6864 + ldr r0, =0x020244ec adds r5, r1, r0 - ldr r0, _081B6868 + ldr r0, =0x0203ce7c ldrh r6, [r0] adds r0, r6, 0 bl sub_81B7CEC @@ -896277,21 +865755,17 @@ sub_81B67C8: @ 81B67C8 cmp r1, r8 bne _081B6874 _081B6850: - ldr r1, _081B686C + ldr r1, =0x0203cee8 movs r0, 0 strb r0, [r1] movs r0, 0x5 bl audio_play - ldr r0, _081B6870 + ldr r0, =0x085e96f6 b _081B68E2 .align 2, 0 -_081B6860: .4byte 0x0203cec8 -_081B6864: .4byte 0x020244ec -_081B6868: .4byte 0x0203ce7c -_081B686C: .4byte 0x0203cee8 -_081B6870: .4byte 0x085e96f6 + .pool _081B6874: - ldr r1, _081B68B0 + ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] movs r0, 0x1 @@ -896299,10 +865773,10 @@ _081B6874: adds r0, r6, 0 movs r1, 0x1 bl sub_80D6AA4 - ldr r1, _081B68B4 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 - ldr r1, _081B68B8 + ldr r1, =0x02021dc4 adds r0, r7, 0 bl option_menu_get_string ldr r2, [sp, 0x4] @@ -896311,36 +865785,31 @@ _081B6874: ldr r0, [sp, 0x8] cmp r0, r8 beq _081B68C4 - ldr r0, _081B68BC - ldr r1, _081B68C0 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9d45 bl ExpandTextCodes b _081B68E0 .align 2, 0 -_081B68B0: .4byte 0x0203cee8 -_081B68B4: .4byte 0x02021cc4 -_081B68B8: .4byte 0x02021dc4 -_081B68BC: .4byte 0x02021fc4 -_081B68C0: .4byte 0x085e9d45 + .pool _081B68C4: - ldr r0, _081B68D0 - ldr r1, _081B68D4 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9d90 bl ExpandTextCodes b _081B68E0 .align 2, 0 -_081B68D0: .4byte 0x02021fc4 -_081B68D4: .4byte 0x085e9d90 + .pool _081B68D8: - ldr r0, _081B6910 - ldr r1, _081B6914 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9d6d bl ExpandTextCodes _081B68E0: - ldr r0, _081B6910 + ldr r0, =0x02021fc4 _081B68E2: movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B6918 + ldr r1, =0x03005e00 mov r2, r10 lsls r0, r2, 2 add r0, r10 @@ -896357,9 +865826,7 @@ _081B68E2: pop {r0} bx r0 .align 2, 0 -_081B6910: .4byte 0x02021fc4 -_081B6914: .4byte 0x085e9d6d -_081B6918: .4byte 0x03005e00 + .pool thumb_func_end sub_81B67C8 thumb_func_start sub_81B691C @@ -896373,12 +865840,12 @@ sub_81B691C: @ 81B691C cmp r0, 0x5 bhi _081B6992 lsls r0, 2 - ldr r1, _081B6938 + ldr r1, =_081B693C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081B6938: .4byte _081B693C + .pool .align 2, 0 _081B693C: .4byte _081B696C @@ -896391,14 +865858,14 @@ _081B6954: adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr - ldr r1, _081B6968 + ldr r1, =0x0000012f cmp r0, r1 beq _081B6992 adds r0, r4, 0 movs r1, 0x1A b _081B6988 .align 2, 0 -_081B6968: .4byte 0x0000012f + .pool _081B696C: adds r0, r4, 0 movs r1, 0x1B @@ -896441,12 +865908,12 @@ option_menu_get_string: @ 81B699C cmp r0, 0x5 bhi _081B6A08 lsls r0, 2 - ldr r1, _081B69B4 + ldr r1, =_081B69B8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081B69B4: .4byte _081B69B8 + .pool .align 2, 0 _081B69B8: .4byte _081B69D8 @@ -896456,42 +865923,42 @@ _081B69B8: .4byte _081B69E8 .4byte _081B69E0 _081B69D0: - ldr r1, _081B69D4 + ldr r1, =0x085e96e3 b _081B69F2 .align 2, 0 -_081B69D4: .4byte 0x085e96e3 + .pool _081B69D8: - ldr r1, _081B69DC + ldr r1, =0x085ea33c b _081B69F2 .align 2, 0 -_081B69DC: .4byte 0x085ea33c + .pool _081B69E0: - ldr r1, _081B69E4 + ldr r1, =0x085ea343 b _081B69F2 .align 2, 0 -_081B69E4: .4byte 0x085ea343 + .pool _081B69E8: - ldr r1, _081B69EC + ldr r1, =0x085ea35b b _081B69F2 .align 2, 0 -_081B69EC: .4byte 0x085ea35b + .pool _081B69F0: - ldr r1, _081B69FC + ldr r1, =0x085e96e6 _081B69F2: adds r0, r2, 0 bl gf_strcpy b _081B6A08 .align 2, 0 -_081B69FC: .4byte 0x085e96e6 + .pool _081B6A00: - ldr r1, _081B6A0C + ldr r1, =0x085e96ee adds r0, r2, 0 bl gf_strcpy _081B6A08: pop {r0} bx r0 .align 2, 0 -_081B6A0C: .4byte 0x085e96ee + .pool thumb_func_end option_menu_get_string thumb_func_start sub_81B6A10 @@ -896517,7 +865984,7 @@ sub_81B6A10: @ 81B6A10 adds r1, r4, 0 muls r1, r0 mov r8, r1 - ldr r0, _081B6AAC + ldr r0, =0x020244ec mov r9, r0 _081B6A40: adds r1, r5, 0 @@ -896531,7 +865998,7 @@ _081B6A40: movs r0, 0xD adds r2, r4, 0 muls r2, r0 - ldr r0, _081B6AB0 + ldr r0, =0x0831977c adds r2, r0 lsls r0, r5, 4 adds r0, 0x1 @@ -896572,8 +866039,7 @@ _081B6A82: pop {r0} bx r0 .align 2, 0 -_081B6AAC: .4byte 0x020244ec -_081B6AB0: .4byte 0x0831977c + .pool thumb_func_end sub_81B6A10 thumb_func_start sub_81B6AB4 @@ -896598,7 +866064,7 @@ sub_81B6AB4: @ 81B6AB4 bl sub_81B6BB4 b _081B6AF0 _081B6AE0: - ldr r0, _081B6AF8 + ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xD bl sub_81B302C @@ -896609,7 +866075,7 @@ _081B6AF0: pop {r0} bx r0 .align 2, 0 -_081B6AF8: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B6AB4 thumb_func_start dp05_ether @@ -896617,21 +866083,19 @@ dp05_ether: @ 81B6AFC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081B6B14 + ldr r0, =0x0203ce7c ldrh r0, [r0] cmp r0, 0xAF bne _081B6B20 - ldr r0, _081B6B18 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081B6B1C + ldr r1, =0x00003214 adds r0, r1 b _081B6B2A .align 2, 0 -_081B6B14: .4byte 0x0203ce7c -_081B6B18: .4byte 0x03005d8c -_081B6B1C: .4byte 0x00003214 + .pool _081B6B20: - ldr r1, _081B6B44 + ldr r1, =0x0831e58c subs r0, 0xD lsls r0, 2 adds r0, r1 @@ -896644,37 +866108,34 @@ _081B6B2A: lsrs r1, r0, 24 cmp r1, 0 bne _081B6B4C - ldr r0, _081B6B48 + ldr r0, =0x0203cec8 strh r1, [r0, 0xE] adds r0, r4, 0 bl sub_81B6BEC b _081B6B6E .align 2, 0 -_081B6B44: .4byte 0x0831e58c -_081B6B48: .4byte 0x0203cec8 + .pool _081B6B4C: movs r0, 0x5 bl audio_play movs r0, 0x16 bl sub_81B3054 - ldr r0, _081B6B74 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x9] bl sub_81B6A10 - ldr r1, _081B6B78 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B6B7C + ldr r1, =sub_81B6AB4 + 1 str r1, [r0] _081B6B6E: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B6B74: .4byte 0x0203cec8 -_081B6B78: .4byte 0x03005e00 -_081B6B7C: .4byte sub_81B6AB4 + 1 + .pool thumb_func_end dp05_ether thumb_func_start sub_81B6B80 @@ -896683,12 +866144,12 @@ sub_81B6B80: @ 81B6B80 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081B6BAC + ldr r0, =0x0203cec4 ldr r0, [r0] adds r0, 0xC bl sub_81B302C bl GetMenuCursorPos - ldr r1, _081B6BB0 + ldr r1, =0x0203cec8 lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0xE] @@ -896698,8 +866159,7 @@ sub_81B6B80: @ 81B6B80 pop {r0} bx r0 .align 2, 0 -_081B6BAC: .4byte 0x0203cec4 -_081B6BB0: .4byte 0x0203cec8 + .pool thumb_func_end sub_81B6B80 thumb_func_start sub_81B6BB4 @@ -896707,14 +866167,14 @@ sub_81B6BB4: @ 81B6BB4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _081B6BE0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r2 - ldr r0, _081B6BE4 + ldr r0, =sub_81B1370 + 1 str r0, [r1] - ldr r0, _081B6BE8 + ldr r0, =0x0203cec4 ldr r0, [r0] movs r1, 0 str r1, [r0, 0x4] @@ -896725,9 +866185,7 @@ sub_81B6BB4: @ 81B6BB4 pop {r0} bx r0 .align 2, 0 -_081B6BE0: .4byte 0x03005e00 -_081B6BE4: .4byte sub_81B1370 + 1 -_081B6BE8: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B6BB4 thumb_func_start sub_81B6BEC @@ -896738,8 +866196,8 @@ sub_81B6BEC: @ 81B6BEC lsls r0, 24 lsrs r6, r0, 24 movs r4, 0 - ldr r7, _081B6C24 - ldr r0, _081B6C28 + ldr r7, =0x0203ced6 + ldr r0, =0x0203ce7c ldrh r5, [r0] movs r0, 0xE negs r0, r0 @@ -896752,19 +866210,16 @@ sub_81B6BEC: @ 81B6BEC lsls r0, 24 cmp r0, 0 beq _081B6C34 - ldr r0, _081B6C2C + ldr r0, =0x0203cee8 strb r4, [r0] movs r0, 0x5 bl audio_play - ldr r0, _081B6C30 + ldr r0, =0x085e96f6 b _081B6C7E .align 2, 0 -_081B6C24: .4byte 0x0203ced6 -_081B6C28: .4byte 0x0203ce7c -_081B6C2C: .4byte 0x0203cee8 -_081B6C30: .4byte 0x085e96f6 + .pool _081B6C34: - ldr r1, _081B6CA4 + ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] mov r0, r8 @@ -896773,7 +866228,7 @@ _081B6C34: movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _081B6CA8 + ldr r0, =0x020244ec adds r4, r0 movs r0, 0x1 bl audio_play @@ -896787,26 +866242,26 @@ _081B6C34: bl pokemon_getattr lsls r0, 16 lsrs r4, r0, 16 - ldr r0, _081B6CAC + ldr r0, =0x02021cc4 movs r1, 0xD muls r1, r4 - ldr r2, _081B6CB0 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy adds r0, r5, 0 bl sub_81B6310 - ldr r0, _081B6CB4 + ldr r0, =0x02021fc4 _081B6C7E: movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B6CB8 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B6CBC + ldr r1, =sub_81B6794 + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -896814,13 +866269,7 @@ _081B6C7E: pop {r0} bx r0 .align 2, 0 -_081B6CA4: .4byte 0x0203cee8 -_081B6CA8: .4byte 0x020244ec -_081B6CAC: .4byte 0x02021cc4 -_081B6CB0: .4byte 0x0831977c -_081B6CB4: .4byte 0x02021fc4 -_081B6CB8: .4byte 0x03005e00 -_081B6CBC: .4byte sub_81B6794 + 1 + .pool thumb_func_end sub_81B6BEC thumb_func_start dp05_pp_up @@ -896833,38 +866282,35 @@ dp05_pp_up: @ 81B6CC0 bl audio_play movs r0, 0x17 bl sub_81B3054 - ldr r0, _081B6CF0 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x9] bl sub_81B6A10 - ldr r1, _081B6CF4 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B6CF8 + ldr r1, =sub_81B6AB4 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081B6CF0: .4byte 0x0203cec8 -_081B6CF4: .4byte 0x03005e00 -_081B6CF8: .4byte sub_81B6AB4 + 1 + .pool thumb_func_end dp05_pp_up thumb_func_start sub_81B6CFC sub_81B6CFC: @ 81B6CFC lsls r0, 16 - ldr r1, _081B6D0C + ldr r1, =0xfedf0000 adds r0, r1 - ldr r1, _081B6D10 + ldr r1, =0x08616040 lsrs r0, 15 adds r0, r1 ldrh r0, [r0] bx lr .align 2, 0 -_081B6D0C: .4byte 0xfedf0000 -_081B6D10: .4byte 0x08616040 + .pool thumb_func_end sub_81B6CFC thumb_func_start sub_81B6D14 @@ -896873,7 +866319,7 @@ sub_81B6D14: @ 81B6D14 lsls r0, 16 lsrs r2, r0, 16 movs r1, 0 - ldr r3, _081B6D30 + ldr r3, =0x08616040 _081B6D1E: adds r0, r1, 0 adds r0, 0x32 @@ -896885,7 +866331,7 @@ _081B6D1E: movs r0, 0x1 b _081B6D40 .align 2, 0 -_081B6D30: .4byte 0x08616040 + .pool _081B6D34: adds r0, r1, 0x1 lsls r0, 24 @@ -896931,7 +866377,7 @@ _081B6D6C: sub_81B6D74: @ 81B6D74 push {r4,lr} adds r1, r0, 0 - ldr r4, _081B6D94 + ldr r4, =0x02021fc4 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -896943,7 +866389,7 @@ sub_81B6D74: @ 81B6D74 pop {r0} bx r0 .align 2, 0 -_081B6D94: .4byte 0x02021fc4 + .pool thumb_func_end sub_81B6D74 thumb_func_start sub_81B6D98 @@ -896954,19 +866400,18 @@ sub_81B6D98: @ 81B6D98 lsls r4, 24 lsrs r4, 24 bl sub_81B6D74 - ldr r1, _081B6DBC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B6DC0 + ldr r1, =sub_81B6794 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081B6DBC: .4byte 0x03005e00 -_081B6DC0: .4byte sub_81B6794 + 1 + .pool thumb_func_end sub_81B6D98 thumb_func_start sub_81B6DC4 @@ -896978,30 +866423,30 @@ sub_81B6DC4: @ 81B6DC4 lsrs r6, r0, 24 movs r0, 0x5 bl audio_play - ldr r7, _081B6E4C + ldr r7, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r7, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B6E50 + ldr r0, =0x020244ec adds r5, r1, r0 movs r0, 0xE adds r0, r7 mov r8, r0 - ldr r0, _081B6E54 + ldr r0, =0x0203ce7c ldrh r4, [r0] - ldr r1, _081B6E58 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 adds r0, r4, 0 bl sub_81B6CFC strh r0, [r7, 0xE] - ldr r0, _081B6E5C + ldr r0, =0x02021dc4 movs r1, 0xE ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, _081B6E60 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy movs r0, 0 @@ -897021,49 +866466,41 @@ sub_81B6DC4: @ 81B6DC4 adds r0, r5, 0 bl pokemon_moveset_pad_ lsls r0, 16 - ldr r1, _081B6E64 + ldr r1, =0xffff0000 cmp r0, r1 beq _081B6E88 - ldr r0, _081B6E68 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _081B6E6C + ldr r0, =sub_81B6EB4 + 1 str r0, [r1] b _081B6E9C .align 2, 0 -_081B6E4C: .4byte 0x0203cec8 -_081B6E50: .4byte 0x020244ec -_081B6E54: .4byte 0x0203ce7c -_081B6E58: .4byte 0x02021cc4 -_081B6E5C: .4byte 0x02021dc4 -_081B6E60: .4byte 0x0831977c -_081B6E64: .4byte 0xffff0000 -_081B6E68: .4byte 0x03005e00 -_081B6E6C: .4byte sub_81B6EB4 + 1 + .pool _081B6E70: - ldr r1, _081B6E74 + ldr r1, =0x085e9ab4 b _081B6E7A .align 2, 0 -_081B6E74: .4byte 0x085e9ab4 + .pool _081B6E78: - ldr r1, _081B6E84 + ldr r1, =0x085e9c00 _081B6E7A: adds r0, r6, 0 bl sub_81B6D98 b _081B6E9C .align 2, 0 -_081B6E84: .4byte 0x085e9c00 + .pool _081B6E88: - ldr r0, _081B6EA8 + ldr r0, =0x085e9ae9 bl sub_81B6D74 - ldr r1, _081B6EAC + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B6EB0 + ldr r1, =sub_81B6FF4 + 1 str r1, [r0] _081B6E9C: pop {r3} @@ -897072,9 +866509,7 @@ _081B6E9C: pop {r0} bx r0 .align 2, 0 -_081B6EA8: .4byte 0x085e9ae9 -_081B6EAC: .4byte 0x03005e00 -_081B6EB0: .4byte sub_81B6FF4 + 1 + .pool thumb_func_end sub_81B6DC4 thumb_func_start sub_81B6EB4 @@ -897082,16 +866517,16 @@ sub_81B6EB4: @ 81B6EB4 push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _081B6F38 + ldr r2, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r2, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B6F3C + ldr r0, =0x020244ec adds r5, r1, r0 adds r6, r2, 0 adds r6, 0xE - ldr r0, _081B6F40 + ldr r0, =0x0203ce7c ldrh r4, [r0] movs r1, 0x2 ldrsh r0, [r6, r1] @@ -897108,19 +866543,19 @@ sub_81B6EB4: @ 81B6EB4 movs r1, 0x1 bl sub_80D6AA4 _081B6EF0: - ldr r1, _081B6F44 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 - ldr r0, _081B6F48 + ldr r0, =0x02021dc4 movs r1, 0 ldrsh r2, [r6, r1] movs r1, 0xD muls r1, r2 - ldr r2, _081B6F4C + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r4, _081B6F50 - ldr r1, _081B6F54 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9aa5 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -897128,27 +866563,18 @@ _081B6EF0: bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B6F58 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081B6F5C + ldr r1, =sub_81B6F60 + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081B6F38: .4byte 0x0203cec8 -_081B6F3C: .4byte 0x020244ec -_081B6F40: .4byte 0x0203ce7c -_081B6F44: .4byte 0x02021cc4 -_081B6F48: .4byte 0x02021dc4 -_081B6F4C: .4byte 0x0831977c -_081B6F50: .4byte 0x02021fc4 -_081B6F54: .4byte 0x085e9aa5 -_081B6F58: .4byte 0x03005e00 -_081B6F5C: .4byte sub_81B6F60 + 1 + .pool thumb_func_end sub_81B6EB4 thumb_func_start sub_81B6F60 @@ -897161,23 +866587,21 @@ sub_81B6F60: @ 81B6F60 lsrs r0, 24 cmp r0, 0x1 beq _081B6F86 - ldr r0, _081B6F8C + ldr r0, =0x0000016f bl fanfare_play - ldr r1, _081B6F90 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B6F94 + ldr r1, =sub_81B6F98 + 1 str r1, [r0] _081B6F86: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B6F8C: .4byte 0x0000016f -_081B6F90: .4byte 0x03005e00 -_081B6F94: .4byte sub_81B6F98 + 1 + .pool thumb_func_end sub_81B6F60 thumb_func_start sub_81B6F98 @@ -897190,7 +866614,7 @@ sub_81B6F98: @ 81B6F98 lsls r0, 24 cmp r0, 0 beq _081B6FEA - ldr r0, _081B6FD4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r2, 0x1 adds r0, r2, 0 @@ -897202,7 +866626,7 @@ sub_81B6F98: @ 81B6F98 cmp r0, 0 beq _081B6FEA _081B6FC0: - ldr r0, _081B6FD8 + ldr r0, =0x0203cec8 movs r1, 0x10 ldrsh r0, [r0, r1] cmp r0, 0x1 @@ -897211,12 +866635,11 @@ _081B6FC0: bl sub_81B77AC b _081B6FEA .align 2, 0 -_081B6FD4: .4byte 0x030022c0 -_081B6FD8: .4byte 0x0203cec8 + .pool _081B6FDC: cmp r0, 0x2 bne _081B6FE4 - ldr r0, _081B6FF0 + ldr r0, =0x020375f0 strh r2, [r0] _081B6FE4: adds r0, r5, 0 @@ -897226,7 +866649,7 @@ _081B6FEA: pop {r0} bx r0 .align 2, 0 -_081B6FF0: .4byte 0x020375f0 + .pool thumb_func_end sub_81B6F98 thumb_func_start sub_81B6FF4 @@ -897240,20 +866663,19 @@ sub_81B6FF4: @ 81B6FF4 cmp r0, 0x1 beq _081B7018 bl sub_81B334C - ldr r0, _081B7020 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B7024 + ldr r0, =sub_81B7028 + 1 str r0, [r1] _081B7018: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B7020: .4byte 0x03005e00 -_081B7024: .4byte sub_81B7028 + 1 + .pool thumb_func_end sub_81B6FF4 thumb_func_start sub_81B7028 @@ -897278,21 +866700,19 @@ _081B7048: beq _081B707A b _081B7080 _081B704E: - ldr r0, _081B7068 + ldr r0, =0x085e9b96 movs r1, 0x1 bl sub_81B1B5C - ldr r1, _081B706C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B7070 + ldr r1, =sub_81B7088 + 1 str r1, [r0] b _081B7080 .align 2, 0 -_081B7068: .4byte 0x085e9b96 -_081B706C: .4byte 0x03005e00 -_081B7070: .4byte sub_81B7088 + 1 + .pool _081B7074: movs r0, 0x5 bl audio_play @@ -897315,9 +866735,9 @@ sub_81B7088: @ 81B7088 lsrs r0, 24 cmp r0, 0x1 beq _081B70A8 - ldr r0, _081B70B0 + ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, _081B70B4 + ldr r0, =sub_81B70B8 + 1 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 @@ -897326,23 +866746,22 @@ _081B70A8: pop {r0} bx r0 .align 2, 0 -_081B70B0: .4byte 0x0203cec4 -_081B70B4: .4byte sub_81B70B8 + 1 + .pool thumb_func_end sub_81B7088 thumb_func_start sub_81B70B8 sub_81B70B8: @ 81B70B8 push {r4,lr} sub sp, 0x4 - ldr r0, _081B70E0 - ldr r4, _081B70E4 + ldr r0, =0x020244ec + ldr r4, =0x0203cec8 ldrb r1, [r4, 0x9] - ldr r2, _081B70E8 + ldr r2, =0x020244e9 ldrb r2, [r2] subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, _081B70EC + ldr r3, =sub_81B70F0 + 1 ldrh r4, [r4, 0xE] str r4, [sp] bl sub_81BFA38 @@ -897351,10 +866770,7 @@ sub_81B70B8: @ 81B70B8 pop {r0} bx r0 .align 2, 0 -_081B70E0: .4byte 0x020244ec -_081B70E4: .4byte 0x0203cec8 -_081B70E8: .4byte 0x020244e9 -_081B70EC: .4byte sub_81B70F0 + 1 + .pool thumb_func_end sub_81B70B8 thumb_func_start sub_81B70F0 @@ -897363,9 +866779,9 @@ sub_81B70F0: @ 81B70F0 sub sp, 0xC movs r0, 0x7F str r0, [sp] - ldr r0, _081B7114 + ldr r0, =sub_81B711C + 1 str r0, [sp, 0x4] - ldr r0, _081B7118 + ldr r0, =0x0203cec8 ldr r0, [r0] str r0, [sp, 0x8] movs r0, 0 @@ -897377,8 +866793,7 @@ sub_81B70F0: @ 81B70F0 pop {r0} bx r0 .align 2, 0 -_081B7114: .4byte sub_81B711C + 1 -_081B7118: .4byte 0x0203cec8 + .pool thumb_func_end sub_81B70F0 thumb_func_start sub_81B711C @@ -897387,7 +866802,7 @@ sub_81B711C: @ 81B711C lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r0, _081B7144 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -897402,7 +866817,7 @@ sub_81B711C: @ 81B711C bl sub_81B7154 b _081B714E .align 2, 0 -_081B7144: .4byte 0x02037fd4 + .pool _081B7148: adds r0, r5, 0 bl sub_81B7230 @@ -897418,13 +866833,13 @@ sub_81B7154: @ 81B7154 adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _081B71B4 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 adds r5, r1, 0 muls r5, r0 - ldr r0, _081B71B8 + ldr r0, =0x020244ec adds r5, r0 bl sub_81C1B94 adds r1, r0, 0 @@ -897436,36 +866851,29 @@ sub_81B7154: @ 81B7154 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r1, _081B71BC + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 - ldr r0, _081B71C0 + ldr r0, =0x02021dc4 movs r1, 0xD muls r1, r4 - ldr r2, _081B71C4 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r0, _081B71C8 + ldr r0, =0x085e9bb8 bl sub_81B6D74 - ldr r1, _081B71CC + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B71D0 + ldr r1, =sub_81B71D4 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081B71B4: .4byte 0x0203cec8 -_081B71B8: .4byte 0x020244ec -_081B71BC: .4byte 0x02021cc4 -_081B71C0: .4byte 0x02021dc4 -_081B71C4: .4byte 0x0831977c -_081B71C8: .4byte 0x085e9bb8 -_081B71CC: .4byte 0x03005e00 -_081B71D0: .4byte sub_81B71D4 + 1 + .pool thumb_func_end sub_81B7154 thumb_func_start sub_81B71D4 @@ -897478,13 +866886,13 @@ sub_81B71D4: @ 81B71D4 lsrs r0, 24 cmp r0, 0x1 beq _081B7220 - ldr r5, _081B7228 + ldr r5, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r5, r1] movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _081B722C + ldr r0, =0x020244ec adds r4, r0 bl sub_81C1B94 adds r1, r0, 0 @@ -897507,8 +866915,7 @@ _081B7220: pop {r0} bx r0 .align 2, 0 -_081B7228: .4byte 0x0203cec8 -_081B722C: .4byte 0x020244ec + .pool thumb_func_end sub_81B71D4 thumb_func_start sub_81B7230 @@ -897517,17 +866924,17 @@ sub_81B7230: @ 81B7230 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _081B7278 - ldr r1, _081B727C + ldr r0, =0x02021dc4 + ldr r1, =0x0203cec8 movs r3, 0xE ldrsh r2, [r1, r3] movs r1, 0xD muls r1, r2 - ldr r2, _081B7280 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r4, _081B7284 - ldr r1, _081B7288 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9b5d adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -897535,24 +866942,18 @@ sub_81B7230: @ 81B7230 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B728C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081B7290 + ldr r1, =sub_81B7294 + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B7278: .4byte 0x02021dc4 -_081B727C: .4byte 0x0203cec8 -_081B7280: .4byte 0x0831977c -_081B7284: .4byte 0x02021fc4 -_081B7288: .4byte 0x085e9b5d -_081B728C: .4byte 0x03005e00 -_081B7290: .4byte sub_81B7294 + 1 + .pool thumb_func_end sub_81B7230 thumb_func_start sub_81B7294 @@ -897566,20 +866967,19 @@ sub_81B7294: @ 81B7294 cmp r0, 0x1 beq _081B72B8 bl sub_81B334C - ldr r0, _081B72C0 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B72C4 + ldr r0, =sub_81B72C8 + 1 str r0, [r1] _081B72B8: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B72C0: .4byte 0x03005e00 -_081B72C4: .4byte sub_81B72C8 + 1 + .pool thumb_func_end sub_81B7294 thumb_func_start sub_81B72C8 @@ -897587,12 +866987,12 @@ sub_81B72C8: @ 81B72C8 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r7, _081B72F8 + ldr r7, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r7, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B72FC + ldr r0, =0x020244ec adds r4, r1, r0 bl sub_8198C58 lsls r0, 24 @@ -897607,26 +867007,25 @@ sub_81B72C8: @ 81B72C8 beq _081B738C b _081B73C2 .align 2, 0 -_081B72F8: .4byte 0x0203cec8 -_081B72FC: .4byte 0x020244ec + .pool _081B7300: cmp r5, 0x1 beq _081B7392 b _081B73C2 _081B7306: - ldr r1, _081B734C + ldr r1, =0x02021cc4 adds r0, r4, 0 bl sub_81B1B44 - ldr r0, _081B7350 + ldr r0, =0x02021dc4 movs r1, 0xE ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, _081B7354 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r4, _081B7358 - ldr r1, _081B735C + ldr r4, =0x02021fc4 + ldr r1, =0x085e9b76 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -897636,77 +867035,63 @@ _081B7306: ldrsh r0, [r7, r3] cmp r0, 0x1 bne _081B7368 - ldr r0, _081B7360 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _081B7364 + ldr r0, =sub_81B73E4 + 1 str r0, [r1] b _081B73C2 .align 2, 0 -_081B734C: .4byte 0x02021cc4 -_081B7350: .4byte 0x02021dc4 -_081B7354: .4byte 0x0831977c -_081B7358: .4byte 0x02021fc4 -_081B735C: .4byte 0x085e9b76 -_081B7360: .4byte 0x03005e00 -_081B7364: .4byte sub_81B73E4 + 1 + .pool _081B7368: cmp r0, 0x2 bne _081B7370 - ldr r0, _081B7380 + ldr r0, =0x020375f0 strh r5, [r0] _081B7370: - ldr r0, _081B7384 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _081B7388 + ldr r0, =sub_81B6794 + 1 str r0, [r1] b _081B73C2 .align 2, 0 -_081B7380: .4byte 0x020375f0 -_081B7384: .4byte 0x03005e00 -_081B7388: .4byte sub_81B6794 + 1 + .pool _081B738C: movs r0, 0x5 bl audio_play _081B7392: - ldr r1, _081B73C8 + ldr r1, =0x02021cc4 adds r0, r4, 0 bl sub_81B1B44 - ldr r0, _081B73CC - ldr r1, _081B73D0 + ldr r0, =0x02021dc4 + ldr r1, =0x0203cec8 movs r3, 0xE ldrsh r2, [r1, r3] movs r1, 0xD muls r1, r2 - ldr r2, _081B73D4 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r0, _081B73D8 + ldr r0, =0x085e9ae9 bl sub_81B6D74 - ldr r1, _081B73DC + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B73E0 + ldr r1, =sub_81B6FF4 + 1 str r1, [r0] _081B73C2: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081B73C8: .4byte 0x02021cc4 -_081B73CC: .4byte 0x02021dc4 -_081B73D0: .4byte 0x0203cec8 -_081B73D4: .4byte 0x0831977c -_081B73D8: .4byte 0x085e9ae9 -_081B73DC: .4byte 0x03005e00 -_081B73E0: .4byte sub_81B6FF4 + 1 + .pool thumb_func_end sub_81B72C8 thumb_func_start sub_81B73E4 @@ -897737,20 +867122,20 @@ dp05_rare_candy: @ 81B7404 mov r10, r1 lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _081B7468 + ldr r0, =0x0203cec8 mov r9, r0 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B746C + ldr r0, =0x020244ec adds r5, r1, r0 - ldr r0, _081B7470 + ldr r0, =0x0203cec4 ldr r6, [r0] movs r1, 0x86 lsls r1, 2 adds r4, r6, r1 - ldr r2, _081B7474 + ldr r2, =0x0203ce7c mov r8, r2 adds r0, r5, 0 movs r1, 0x38 @@ -897775,10 +867160,7 @@ dp05_rare_candy: @ 81B7404 bl sub_81B79A0 b _081B747A .align 2, 0 -_081B7468: .4byte 0x0203cec8 -_081B746C: .4byte 0x020244ec -_081B7470: .4byte 0x0203cec4 -_081B7474: .4byte 0x0203ce7c + .pool _081B7478: movs r4, 0x1 _081B747A: @@ -897786,15 +867168,15 @@ _081B747A: bl audio_play cmp r4, 0 beq _081B74B4 - ldr r1, _081B74A8 + ldr r1, =0x0203cee8 movs r0, 0 strb r0, [r1] - ldr r0, _081B74AC + ldr r0, =0x085e96f6 movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B74B0 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -897802,27 +867184,25 @@ _081B747A: mov r1, r10 b _081B7516 .align 2, 0 -_081B74A8: .4byte 0x0203cee8 -_081B74AC: .4byte 0x085e96f6 -_081B74B0: .4byte 0x03005e00 + .pool _081B74B4: - ldr r1, _081B7528 + ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] movs r0, 0 bl pause_music_for_sound_maybe - ldr r0, _081B752C + ldr r0, =0x0203cec8 ldrb r0, [r0, 0x9] adds r1, r5, 0 bl sub_81B754C - ldr r0, _081B7530 + ldr r0, =0x0203ce7c ldrh r0, [r0] movs r1, 0x1 bl sub_80D6AA4 - ldr r1, _081B7534 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 - ldr r4, _081B7538 + ldr r4, =0x02021dc4 adds r0, r5, 0 movs r1, 0x38 bl pokemon_getattr @@ -897831,8 +867211,8 @@ _081B74B4: movs r2, 0 movs r3, 0x3 bl decimal_int_to_string - ldr r4, _081B753C - ldr r1, _081B7540 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9d0a adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -897840,12 +867220,12 @@ _081B74B4: bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B7544 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081B7548 + ldr r1, =sub_81B75D4 + 1 _081B7516: str r1, [r0] pop {r3-r5} @@ -897856,15 +867236,7 @@ _081B7516: pop {r0} bx r0 .align 2, 0 -_081B7528: .4byte 0x0203cee8 -_081B752C: .4byte 0x0203cec8 -_081B7530: .4byte 0x0203ce7c -_081B7534: .4byte 0x02021cc4 -_081B7538: .4byte 0x02021dc4 -_081B753C: .4byte 0x02021fc4 -_081B7540: .4byte 0x085e9d0a -_081B7544: .4byte 0x03005e00 -_081B7548: .4byte sub_81B75D4 + 1 + .pool thumb_func_end dp05_rare_candy thumb_func_start sub_81B754C @@ -897874,13 +867246,13 @@ sub_81B754C: @ 81B754C lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 - ldr r6, _081B75CC + ldr r6, =0x0203cedc lsls r4, r7, 4 ldr r1, [r6] adds r1, r4 adds r0, r5, 0 bl sub_81B60E4 - ldr r2, _081B75D0 + ldr r2, =0x02020630 ldr r0, [r6] adds r3, r4, r0 ldrb r1, [r3, 0xC] @@ -897926,8 +867298,7 @@ _081B7588: pop {r0} bx r0 .align 2, 0 -_081B75CC: .4byte 0x0203cedc -_081B75D0: .4byte 0x02020630 + .pool thumb_func_end sub_81B754C thumb_func_start sub_81B75D4 @@ -897945,7 +867316,7 @@ sub_81B75D4: @ 81B75D4 lsrs r0, 24 cmp r0, 0x1 beq _081B7620 - ldr r0, _081B7628 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -897960,21 +867331,19 @@ _081B7606: bl audio_play adds r0, r4, 0 bl sub_81B767C - ldr r0, _081B762C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B7630 + ldr r0, =sub_81B7634 + 1 str r0, [r1] _081B7620: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B7628: .4byte 0x030022c0 -_081B762C: .4byte 0x03005e00 -_081B7630: .4byte sub_81B7634 + 1 + .pool thumb_func_end sub_81B75D4 thumb_func_start sub_81B7634 @@ -897982,7 +867351,7 @@ sub_81B7634: @ 81B7634 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081B7670 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -897997,28 +867366,26 @@ _081B764E: bl audio_play adds r0, r4, 0 bl sub_81B76C8 - ldr r0, _081B7674 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B7678 + ldr r0, =sub_81B7704 + 1 str r0, [r1] _081B7668: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B7670: .4byte 0x030022c0 -_081B7674: .4byte 0x03005e00 -_081B7678: .4byte sub_81B7704 + 1 + .pool thumb_func_end sub_81B7634 thumb_func_start sub_81B767C sub_81B767C: @ 81B767C push {r4,r5,lr} sub sp, 0x8 - ldr r0, _081B76C4 + ldr r0, =0x0203cec4 ldr r5, [r0] movs r0, 0x86 lsls r0, 2 @@ -898048,14 +867415,14 @@ sub_81B767C: @ 81B767C pop {r0} bx r0 .align 2, 0 -_081B76C4: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B767C thumb_func_start sub_81B76C8 sub_81B76C8: @ 81B76C8 push {r4,lr} sub sp, 0x4 - ldr r0, _081B7700 + ldr r0, =0x0203cec4 ldr r1, [r0] movs r0, 0x86 lsls r0, 2 @@ -898079,7 +867446,7 @@ sub_81B76C8: @ 81B76C8 pop {r0} bx r0 .align 2, 0 -_081B7700: .4byte 0x0203cec4 + .pool thumb_func_end sub_81B76C8 thumb_func_start sub_81B7704 @@ -898092,7 +867459,7 @@ sub_81B7704: @ 81B7704 lsls r0, 24 cmp r0, 0 beq _081B77A6 - ldr r0, _081B775C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r6, 0x1 adds r0, r6, 0 @@ -898105,19 +867472,19 @@ sub_81B7704: @ 81B7704 beq _081B77A6 _081B772C: bl sub_81B3394 - ldr r4, _081B7760 + ldr r4, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r4, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B7764 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 bl sub_8069318 lsls r0, 16 lsrs r1, r0, 16 strh r6, [r4, 0x10] - ldr r0, _081B7768 + ldr r0, =0x0000fffe cmp r1, r0 beq _081B7788 cmp r1, r0 @@ -898126,17 +867493,14 @@ _081B772C: beq _081B7778 b _081B77A0 .align 2, 0 -_081B775C: .4byte 0x030022c0 -_081B7760: .4byte 0x0203cec8 -_081B7764: .4byte 0x020244ec -_081B7768: .4byte 0x0000fffe + .pool _081B776C: - ldr r0, _081B7774 + ldr r0, =0x0000ffff cmp r1, r0 beq _081B7780 b _081B77A0 .align 2, 0 -_081B7774: .4byte 0x0000ffff + .pool _081B7778: adds r0, r5, 0 bl sub_81B7810 @@ -898146,17 +867510,16 @@ _081B7780: bl sub_81B787C b _081B77A6 _081B7788: - ldr r0, _081B7798 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081B779C + ldr r0, =sub_81B77AC + 1 str r0, [r1] b _081B77A6 .align 2, 0 -_081B7798: .4byte 0x03005e00 -_081B779C: .4byte sub_81B77AC + 1 + .pool _081B77A0: adds r0, r5, 0 bl sub_81B7910 @@ -898171,18 +867534,18 @@ sub_81B77AC: @ 81B77AC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081B77DC + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B77E0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0 bl sub_8069318 lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _081B77E4 + ldr r0, =0x0000fffe cmp r1, r0 beq _081B780A cmp r1, r0 @@ -898191,16 +867554,14 @@ sub_81B77AC: @ 81B77AC beq _081B77F4 b _081B7804 .align 2, 0 -_081B77DC: .4byte 0x0203cec8 -_081B77E0: .4byte 0x020244ec -_081B77E4: .4byte 0x0000fffe + .pool _081B77E8: - ldr r0, _081B77F0 + ldr r0, =0x0000ffff cmp r1, r0 beq _081B77FC b _081B7804 .align 2, 0 -_081B77F0: .4byte 0x0000ffff + .pool _081B77F4: adds r0, r4, 0 bl sub_81B7810 @@ -898223,12 +867584,12 @@ sub_81B7810: @ 81B7810 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _081B7854 + ldr r6, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r6, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B7858 + ldr r0, =0x020244ec adds r7, r1, r0 adds r0, r7, 0 movs r1, 0 @@ -898239,7 +867600,7 @@ sub_81B7810: @ 81B7810 cmp r4, 0 beq _081B7860 bl sub_81B06F4 - ldr r0, _081B785C + ldr r0, =0x030061e8 ldr r1, [r6] str r1, [r0] ldrb r3, [r6, 0x9] @@ -898251,24 +867612,21 @@ sub_81B7810: @ 81B7810 bl remove_task b _081B786E .align 2, 0 -_081B7854: .4byte 0x0203cec8 -_081B7858: .4byte 0x020244ec -_081B785C: .4byte 0x030061e8 + .pool _081B7860: - ldr r0, _081B7874 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081B7878 + ldr r0, =sub_81B6794 + 1 str r0, [r1] _081B786E: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081B7874: .4byte 0x03005e00 -_081B7878: .4byte sub_81B6794 + 1 + .pool thumb_func_end sub_81B7810 thumb_func_start sub_81B787C @@ -898279,26 +867637,26 @@ sub_81B787C: @ 81B787C adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _081B78E8 + ldr r0, =0x0203cec8 mov r8, r0 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B78EC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081B78F0 + ldr r1, =0x02021cc4 bl sub_81B1B44 - ldr r0, _081B78F4 - ldr r6, _081B78F8 + ldr r0, =0x02021dc4 + ldr r6, =0x020244e2 ldrh r2, [r6] movs r1, 0xD muls r1, r2 - ldr r2, _081B78FC + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r4, _081B7900 - ldr r1, _081B7904 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9ae9 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -898309,12 +867667,12 @@ sub_81B787C: @ 81B787C ldrh r0, [r6] mov r1, r8 strh r0, [r1, 0xE] - ldr r1, _081B7908 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081B790C + ldr r1, =sub_81B6FF4 + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -898322,16 +867680,7 @@ sub_81B787C: @ 81B787C pop {r0} bx r0 .align 2, 0 -_081B78E8: .4byte 0x0203cec8 -_081B78EC: .4byte 0x020244ec -_081B78F0: .4byte 0x02021cc4 -_081B78F4: .4byte 0x02021dc4 -_081B78F8: .4byte 0x020244e2 -_081B78FC: .4byte 0x0831977c -_081B7900: .4byte 0x02021fc4 -_081B7904: .4byte 0x085e9ae9 -_081B7908: .4byte 0x03005e00 -_081B790C: .4byte sub_81B6FF4 + 1 + .pool thumb_func_end sub_81B787C thumb_func_start sub_81B7910 @@ -898345,24 +867694,24 @@ sub_81B7910: @ 81B7910 lsrs r6, 24 lsls r5, 16 lsrs r5, 16 - ldr r0, _081B797C + ldr r0, =0x0203cec8 mov r8, r0 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B7980 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081B7984 + ldr r1, =0x02021cc4 bl sub_81B1B44 - ldr r0, _081B7988 + ldr r0, =0x02021dc4 movs r1, 0xD muls r1, r5 - ldr r2, _081B798C + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy - ldr r4, _081B7990 - ldr r1, _081B7994 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9aa5 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -898372,12 +867721,12 @@ sub_81B7910: @ 81B7910 bl schedule_bg_copy_tilemap_to_vram mov r0, r8 strh r5, [r0, 0xE] - ldr r1, _081B7998 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B799C + ldr r1, =sub_81B6F60 + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -898385,15 +867734,7 @@ sub_81B7910: @ 81B7910 pop {r0} bx r0 .align 2, 0 -_081B797C: .4byte 0x0203cec8 -_081B7980: .4byte 0x020244ec -_081B7984: .4byte 0x02021cc4 -_081B7988: .4byte 0x02021dc4 -_081B798C: .4byte 0x0831977c -_081B7990: .4byte 0x02021fc4 -_081B7994: .4byte 0x085e9aa5 -_081B7998: .4byte 0x03005e00 -_081B799C: .4byte sub_81B6F60 + 1 + .pool thumb_func_end sub_81B7910 thumb_func_start sub_81B79A0 @@ -898434,17 +867775,17 @@ sub_81B79E8: @ 81B79E8 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081B7A1C + ldr r1, =0x0203cec4 ldr r2, [r1] movs r3, 0x86 lsls r3, 2 adds r1, r2, r3 movs r3, 0 strh r3, [r1] - ldr r4, _081B7A20 + ldr r4, =0x0000021a adds r1, r2, r4 strh r3, [r1] - ldr r1, _081B7A24 + ldr r1, =0x0203cec8 ldrb r1, [r1, 0x9] lsls r1, 24 asrs r1, 24 @@ -898457,9 +867798,7 @@ sub_81B79E8: @ 81B79E8 pop {r0} bx r0 .align 2, 0 -_081B7A1C: .4byte 0x0203cec4 -_081B7A20: .4byte 0x0000021a -_081B7A24: .4byte 0x0203cec8 + .pool thumb_func_end sub_81B79E8 thumb_func_start sub_81B7A28 @@ -898471,12 +867810,12 @@ sub_81B7A28: @ 81B7A28 lsls r0, 24 lsrs r4, r0, 24 mov r8, r4 - ldr r6, _081B7A80 + ldr r6, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r6, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B7A84 + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0xB @@ -898489,7 +867828,7 @@ sub_81B7A28: @ 81B7A28 lsls r0, 16 lsrs r7, r0, 16 ldrb r0, [r6, 0x9] - ldr r1, _081B7A88 + ldr r1, =0x0203ce7c ldrh r1, [r1] movs r2, 0 bl sub_81B6520 @@ -898497,24 +867836,20 @@ sub_81B7A28: @ 81B7A28 cmp r0, 0 beq _081B7A94 _081B7A6E: - ldr r0, _081B7A8C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B7A90 + ldr r0, =task_intro_gamefreak + 1 str r0, [r1] b _081B7B2A .align 2, 0 -_081B7A80: .4byte 0x0203cec8 -_081B7A84: .4byte 0x020244ec -_081B7A88: .4byte 0x0203ce7c -_081B7A8C: .4byte 0x03005e00 -_081B7A90: .4byte task_intro_gamefreak + 1 + .pool _081B7A94: movs r0, 0x1 bl audio_play - ldr r4, _081B7B38 + ldr r4, =0x0203cedc movs r0, 0x9 ldrsb r0, [r6, r0] lsls r0, 4 @@ -898522,7 +867857,7 @@ _081B7A94: adds r1, r0 adds r0, r5, 0 bl sub_81B60E4 - ldr r2, _081B7B3C + ldr r2, =0x02020630 movs r0, 0x9 ldrsb r0, [r6, r0] ldr r1, [r4] @@ -898543,7 +867878,7 @@ _081B7A94: movs r2, 0x1 bl sub_81B2AC8 _081B7AD6: - ldr r4, _081B7B40 + ldr r4, =0x0203cec4 ldr r0, [r4] movs r1, 0x87 lsls r1, 2 @@ -898562,7 +867897,7 @@ _081B7AD6: lsls r3, 16 asrs r3, 16 ldrb r1, [r6, 0x9] - ldr r0, _081B7B44 + ldr r0, =sub_81B7C10 + 1 str r0, [sp] mov r0, r8 movs r2, 0x1 @@ -898577,7 +867912,7 @@ _081B7AD6: adds r1, r0, r2 movs r2, 0x1 strh r2, [r1] - ldr r1, _081B7B48 + ldr r1, =0x0000021a adds r0, r1 strh r2, [r0] _081B7B2A: @@ -898588,11 +867923,7 @@ _081B7B2A: pop {r0} bx r0 .align 2, 0 -_081B7B38: .4byte 0x0203cedc -_081B7B3C: .4byte 0x02020630 -_081B7B40: .4byte 0x0203cec4 -_081B7B44: .4byte sub_81B7C10 + 1 -_081B7B48: .4byte 0x0000021a + .pool thumb_func_end sub_81B7A28 thumb_func_start task_intro_gamefreak @@ -898605,14 +867936,14 @@ task_intro_gamefreak: @ 81B7B4C lsrs r0, 24 cmp r0, 0x1 beq _081B7C0A - ldr r5, _081B7BB4 + ldr r5, =0x0203cec4 ldr r2, [r5] movs r0, 0x86 lsls r0, 2 adds r1, r2, r0 movs r3, 0 ldrsh r0, [r1, r3] - ldr r3, _081B7BB8 + ldr r3, =0x0203cec8 cmp r0, 0x1 bne _081B7B82 movs r0, 0 @@ -898632,52 +867963,44 @@ _081B7B82: cmp r0, 0x6 bne _081B7C04 ldr r0, [r5] - ldr r1, _081B7BBC + ldr r1, =0x0000021a adds r0, r1 movs r2, 0 ldrsh r1, [r0, r2] cmp r1, 0 bne _081B7BC8 - ldr r0, _081B7BC0 + ldr r0, =0x0203cee8 strb r1, [r0] - ldr r0, _081B7BC4 + ldr r0, =0x085e96f6 movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram b _081B7BD8 .align 2, 0 -_081B7BB4: .4byte 0x0203cec4 -_081B7BB8: .4byte 0x0203cec8 -_081B7BBC: .4byte 0x0000021a -_081B7BC0: .4byte 0x0203cee8 -_081B7BC4: .4byte 0x085e96f6 + .pool _081B7BC8: - ldr r1, _081B7BF0 + ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] - ldr r0, _081B7BF4 + ldr r0, =0x0203ce7c ldrh r0, [r0] movs r1, 0x1 bl sub_80D6AA4 _081B7BD8: - ldr r1, _081B7BF8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B7BFC + ldr r1, =sub_81B6794 + 1 str r1, [r0] - ldr r1, _081B7C00 + ldr r1, =0x0203cec8 movs r0, 0 strb r0, [r1, 0x9] b _081B7C0A .align 2, 0 -_081B7BF0: .4byte 0x0203cee8 -_081B7BF4: .4byte 0x0203ce7c -_081B7BF8: .4byte 0x03005e00 -_081B7BFC: .4byte sub_81B6794 + 1 -_081B7C00: .4byte 0x0203cec8 + .pool _081B7C04: adds r0, r4, 0 bl sub_81B7A28 @@ -898693,17 +868016,17 @@ sub_81B7C10: @ 81B7C10 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _081B7C58 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B7C5C + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081B7C60 + ldr r1, =0x02021cc4 bl sub_81B1B44 - ldr r4, _081B7C64 - ldr r1, _081B7C68 + ldr r4, =0x02021fc4 + ldr r1, =0x085e9c17 adds r0, r4, 0 bl ExpandTextCodes adds r0, r4, 0 @@ -898711,24 +868034,18 @@ sub_81B7C10: @ 81B7C10 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B7C6C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081B7C70 + ldr r1, =task_intro_gamefreak + 1 str r1, [r0] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B7C58: .4byte 0x0203cec8 -_081B7C5C: .4byte 0x020244ec -_081B7C60: .4byte 0x02021cc4 -_081B7C64: .4byte 0x02021fc4 -_081B7C68: .4byte 0x085e9c17 -_081B7C6C: .4byte 0x03005e00 -_081B7C70: .4byte task_intro_gamefreak + 1 + .pool thumb_func_end sub_81B7C10 thumb_func_start sub_81B7C74 @@ -898739,27 +868056,27 @@ sub_81B7C74: @ 81B7C74 lsrs r5, r0, 24 movs r0, 0x5 bl audio_play - ldr r2, _081B7CC0 - ldr r1, _081B7CC4 + ldr r2, =0x030061e8 + ldr r1, =0x0203cec8 ldr r0, [r1] str r0, [r2] ldrb r0, [r1, 0x9] - ldr r4, _081B7CC8 + ldr r4, =0x0203ce7c ldrh r1, [r4] movs r2, 0 bl sub_81B6520 lsls r0, 24 cmp r0, 0 beq _081B7CD8 - ldr r1, _081B7CCC + ldr r1, =0x0203cee8 movs r0, 0 strb r0, [r1] - ldr r0, _081B7CD0 + ldr r0, =0x085e96f6 movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B7CD4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -898767,12 +868084,7 @@ sub_81B7C74: @ 81B7C74 str r6, [r0] b _081B7CE4 .align 2, 0 -_081B7CC0: .4byte 0x030061e8 -_081B7CC4: .4byte 0x0203cec8 -_081B7CC8: .4byte 0x0203ce7c -_081B7CCC: .4byte 0x0203cee8 -_081B7CD0: .4byte 0x085e96f6 -_081B7CD4: .4byte 0x03005e00 + .pool _081B7CD8: ldrh r0, [r4] movs r1, 0x1 @@ -898799,16 +868111,15 @@ sub_81B7CEC: @ 81B7CEC _081B7D00: cmp r1, 0xAF bne _081B7D18 - ldr r0, _081B7D10 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081B7D14 + ldr r1, =0x00003214 adds r4, r0, r1 b _081B7D20 .align 2, 0 -_081B7D10: .4byte 0x03005d8c -_081B7D14: .4byte 0x00003214 + .pool _081B7D18: - ldr r1, _081B7D48 + ldr r1, =0x0831e58c lsls r0, r2, 2 adds r0, r1 ldr r4, [r0] @@ -898834,7 +868145,7 @@ _081B7D42: movs r0, 0 b _081B7E46 .align 2, 0 -_081B7D48: .4byte 0x0831e58c + .pool _081B7D4C: movs r2, 0x40 adds r0, r2, 0 @@ -898997,35 +868308,35 @@ sub_81B7E4C: @ 81B7E4C push {r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _081B7ED0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081B7F1C - ldr r7, _081B7ED4 + ldr r7, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r7, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B7ED8 + ldr r0, =0x020244ec adds r5, r1, r0 movs r0, 0xE adds r0, r7 mov r8, r0 - ldr r1, _081B7EDC + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 - ldr r4, _081B7EE0 + ldr r4, =0x020375e2 ldrb r0, [r4] bl sub_81B2360 strh r0, [r7, 0xE] - ldr r0, _081B7EE4 + ldr r0, =0x02021dc4 movs r1, 0xE ldrsh r2, [r7, r1] movs r1, 0xD muls r1, r2 - ldr r2, _081B7EE8 + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy movs r0, 0x2 @@ -899045,43 +868356,36 @@ sub_81B7E4C: @ 81B7E4C adds r0, r5, 0 bl pokemon_moveset_pad_ lsls r0, 16 - ldr r1, _081B7EEC + ldr r1, =0xffff0000 cmp r0, r1 beq _081B7F08 adds r0, r6, 0 bl sub_81B6EB4 b _081B7F1C .align 2, 0 -_081B7ED0: .4byte 0x02037fd4 -_081B7ED4: .4byte 0x0203cec8 -_081B7ED8: .4byte 0x020244ec -_081B7EDC: .4byte 0x02021cc4 -_081B7EE0: .4byte 0x020375e2 -_081B7EE4: .4byte 0x02021dc4 -_081B7EE8: .4byte 0x0831977c -_081B7EEC: .4byte 0xffff0000 + .pool _081B7EF0: - ldr r1, _081B7EF4 + ldr r1, =0x085e9ab4 b _081B7EFA .align 2, 0 -_081B7EF4: .4byte 0x085e9ab4 + .pool _081B7EF8: - ldr r1, _081B7F04 + ldr r1, =0x085e9c00 _081B7EFA: adds r0, r6, 0 bl sub_81B6D98 b _081B7F1C .align 2, 0 -_081B7F04: .4byte 0x085e9c00 + .pool _081B7F08: - ldr r0, _081B7F28 + ldr r0, =0x085e9ae9 bl sub_81B6D74 - ldr r1, _081B7F2C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B7F30 + ldr r1, =sub_81B6FF4 + 1 str r1, [r0] _081B7F1C: pop {r3} @@ -899090,9 +868394,7 @@ _081B7F1C: pop {r0} bx r0 .align 2, 0 -_081B7F28: .4byte 0x085e9ae9 -_081B7F2C: .4byte 0x03005e00 -_081B7F30: .4byte sub_81B6FF4 + 1 + .pool thumb_func_end sub_81B7E4C thumb_func_start sub_81B7F34 @@ -899101,9 +868403,9 @@ sub_81B7F34: @ 81B7F34 sub sp, 0xC movs r0, 0 str r0, [sp] - ldr r0, _081B7F58 + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B7F5C + ldr r0, =sub_8086194 + 1 str r0, [sp, 0x8] movs r0, 0 movs r1, 0 @@ -899114,8 +868416,7 @@ sub_81B7F34: @ 81B7F34 pop {r0} bx r0 .align 2, 0 -_081B7F58: .4byte sub_81B1370 + 1 -_081B7F5C: .4byte sub_8086194 + 1 + .pool thumb_func_end sub_81B7F34 thumb_func_start sub_81B7F60 @@ -899124,14 +868425,14 @@ sub_81B7F60: @ 81B7F60 sub sp, 0xC bl sub_81A9E40 lsls r0, 24 - ldr r1, _081B7F98 + ldr r1, =sub_81C4F84 + 1 cmp r0, 0 bne _081B7F72 - ldr r1, _081B7F9C + ldr r1, =c2_815ABFC + 1 _081B7F72: movs r0, 0x6 str r0, [sp] - ldr r0, _081B7FA0 + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] str r1, [sp, 0x8] movs r0, 0 @@ -899139,19 +868440,15 @@ _081B7F72: movs r2, 0x5 movs r3, 0 bl sub_81B0038 - ldr r1, _081B7FA4 - ldr r0, _081B7FA8 + ldr r1, =0x0203cec8 + ldr r0, =0x0203ce7c ldrh r0, [r0] strh r0, [r1, 0xC] add sp, 0xC pop {r0} bx r0 .align 2, 0 -_081B7F98: .4byte sub_81C4F84 + 1 -_081B7F9C: .4byte c2_815ABFC + 1 -_081B7FA0: .4byte sub_81B1370 + 1 -_081B7FA4: .4byte 0x0203cec8 -_081B7FA8: .4byte 0x0203ce7c + .pool thumb_func_end sub_81B7F60 thumb_func_start sub_81B7FAC @@ -899163,8 +868460,8 @@ sub_81B7FAC: @ 81B7FAC lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r5, _081B7FEC - ldr r0, _081B7FF0 + ldr r5, =0x0203cefc + ldr r0, =0x0203cec8 mov r9, r0 ldrb r0, [r0, 0x9] lsls r0, 24 @@ -899174,7 +868471,7 @@ sub_81B7FAC: @ 81B7FAC mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r7, _081B7FF4 + ldr r7, =0x020244ec adds r0, r7 movs r1, 0xC bl pokemon_getattr @@ -899186,9 +868483,7 @@ sub_81B7FAC: @ 81B7FAC bl sub_81B8044 b _081B8030 .align 2, 0 -_081B7FEC: .4byte 0x0203cefc -_081B7FF0: .4byte 0x0203cec8 -_081B7FF4: .4byte 0x020244ec + .pool _081B7FF8: ldrh r0, [r5] bl itemid_is_mail @@ -899209,12 +868504,12 @@ _081B800C: ldrh r1, [r5] movs r2, 0x1 bl sub_81B1D1C - ldr r1, _081B803C + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081B8040 + ldr r1, =sub_81B82A0 + 1 str r1, [r0] _081B8030: pop {r3,r4} @@ -899224,8 +868519,7 @@ _081B8030: pop {r0} bx r0 .align 2, 0 -_081B803C: .4byte 0x03005e00 -_081B8040: .4byte sub_81B82A0 + 1 + .pool thumb_func_end sub_81B7FAC thumb_func_start sub_81B8044 @@ -899233,7 +868527,7 @@ sub_81B8044: @ 81B8044 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _081B8070 + ldr r5, =0x0203cec8 ldrh r0, [r5, 0xC] bl itemid_is_mail lsls r0, 24 @@ -899241,17 +868535,15 @@ sub_81B8044: @ 81B8044 beq _081B807C ldrh r0, [r5, 0xC] bl sub_81B83F0 - ldr r0, _081B8074 + ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, _081B8078 + ldr r0, =sub_81B814C + 1 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 b _081B8082 .align 2, 0 -_081B8070: .4byte 0x0203cec8 -_081B8074: .4byte 0x0203cec4 -_081B8078: .4byte sub_81B814C + 1 + .pool _081B807C: adds r0, r4, 0 bl sub_81B8088 @@ -899268,13 +868560,13 @@ sub_81B8088: @ 81B8088 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _081B80F0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081B80E4 - ldr r4, _081B80F4 + ldr r4, =0x0203cec8 ldrh r5, [r4, 0xC] movs r0, 0x9 ldrsb r0, [r4, r0] @@ -899283,7 +868575,7 @@ sub_81B8088: @ 81B8088 mov r1, r8 muls r1, r0 adds r0, r1, 0 - ldr r6, _081B80F8 + ldr r6, =0x020244ec adds r0, r6 adds r1, r5, 0 movs r2, 0 @@ -899299,12 +868591,12 @@ sub_81B8088: @ 81B8088 bl sub_81B1DB8 adds r0, r5, 0 bl sub_81B83F0 - ldr r1, _081B80FC + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081B8100 + ldr r1, =sub_81B8104 + 1 str r1, [r0] _081B80E4: pop {r3} @@ -899313,11 +868605,7 @@ _081B80E4: pop {r0} bx r0 .align 2, 0 -_081B80F0: .4byte 0x02037fd4 -_081B80F4: .4byte 0x0203cec8 -_081B80F8: .4byte 0x020244ec -_081B80FC: .4byte 0x03005e00 -_081B8100: .4byte sub_81B8104 + 1 + .pool thumb_func_end sub_81B8088 thumb_func_start sub_81B8104 @@ -899325,7 +868613,7 @@ sub_81B8104: @ 81B8104 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081B8140 + ldr r0, =0x0203cec8 ldrb r4, [r0, 0x9] bl sub_81B1BD4 lsls r0, 24 @@ -899336,9 +868624,9 @@ sub_81B8104: @ 81B8104 asrs r2, 24 movs r0, 0x64 muls r0, r2 - ldr r1, _081B8144 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081B8148 + ldr r1, =0x0203cedc lsls r2, 4 ldr r1, [r1] adds r1, r2 @@ -899350,20 +868638,18 @@ _081B8138: pop {r0} bx r0 .align 2, 0 -_081B8140: .4byte 0x0203cec8 -_081B8144: .4byte 0x020244ec -_081B8148: .4byte 0x0203cedc + .pool thumb_func_end sub_81B8104 thumb_func_start sub_81B814C sub_81B814C: @ 81B814C push {r4-r6,lr} - ldr r4, _081B8194 + ldr r4, =0x0203cec8 movs r0, 0x9 ldrsb r0, [r4, r0] movs r6, 0x64 muls r0, r6 - ldr r5, _081B8198 + ldr r5, =0x020244ec adds r0, r5 ldrh r1, [r4, 0xC] bl sub_81B1DB8 @@ -899375,15 +868661,15 @@ sub_81B814C: @ 81B814C bl pokemon_getattr lsls r0, 24 lsrs r0, 24 - ldr r1, _081B819C + ldr r1, =0x03005d8c lsls r2, r0, 3 adds r2, r0 lsls r2, 2 - ldr r0, _081B81A0 + ldr r0, =0x00002be0 adds r2, r0 ldr r1, [r1] adds r1, r2 - ldr r2, _081B81A4 + ldr r2, =sub_81B81A8 + 1 movs r0, 0x4 movs r3, 0x3 bl sub_811A20C @@ -899391,36 +868677,32 @@ sub_81B814C: @ 81B814C pop {r0} bx r0 .align 2, 0 -_081B8194: .4byte 0x0203cec8 -_081B8198: .4byte 0x020244ec -_081B819C: .4byte 0x03005d8c -_081B81A0: .4byte 0x00002be0 -_081B81A4: .4byte sub_81B81A8 + 1 + .pool thumb_func_end sub_81B814C thumb_func_start sub_81B81A8 sub_81B81A8: @ 81B81A8 push {r4-r7,lr} sub sp, 0xC - ldr r6, _081B81F8 + ldr r6, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r6, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B81FC + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0xC bl pokemon_getattr lsls r0, 16 lsrs r7, r0, 16 - ldr r0, _081B8200 + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 bne _081B8208 adds r0, r5, 0 bl sub_80D4680 - ldr r4, _081B8204 + ldr r4, =0x0203cefc adds r0, r5, 0 movs r1, 0xC adds r2, r4, 0 @@ -899434,10 +868716,7 @@ sub_81B81A8: @ 81B81A8 bl set_callback2 b _081B8224 .align 2, 0 -_081B81F8: .4byte 0x0203cec8 -_081B81FC: .4byte 0x020244ec -_081B8200: .4byte 0x020375f0 -_081B8204: .4byte 0x0203cefc + .pool _081B8208: ldrb r0, [r6, 0x8] lsls r0, 28 @@ -899445,7 +868724,7 @@ _081B8208: ldrb r2, [r6, 0xB] movs r1, 0x7F str r1, [sp] - ldr r1, _081B822C + ldr r1, =sub_81B8230 + 1 str r1, [sp, 0x4] ldr r1, [r6] str r1, [sp, 0x8] @@ -899458,7 +868737,7 @@ _081B8224: pop {r0} bx r0 .align 2, 0 -_081B822C: .4byte sub_81B8230 + 1 + .pool thumb_func_end sub_81B81A8 thumb_func_start sub_81B8230 @@ -899466,55 +868745,50 @@ sub_81B8230: @ 81B8230 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081B8258 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081B828A - ldr r1, _081B825C + ldr r1, =0x0203cefc ldrh r0, [r1] cmp r0, 0 beq _081B8264 - ldr r0, _081B8260 + ldr r0, =0x0203cec8 ldrh r0, [r0, 0xC] ldrh r1, [r1] movs r2, 0 bl sub_81B1D68 b _081B827C .align 2, 0 -_081B8258: .4byte 0x02037fd4 -_081B825C: .4byte 0x0203cefc -_081B8260: .4byte 0x0203cec8 + .pool _081B8264: - ldr r2, _081B8290 + ldr r2, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r2, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B8294 + ldr r1, =0x020244ec adds r0, r1 ldrh r1, [r2, 0xC] movs r2, 0 movs r3, 0x1 bl sub_81B1C84 _081B827C: - ldr r0, _081B8298 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B829C + ldr r0, =sub_81B8104 + 1 str r0, [r1] _081B828A: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B8290: .4byte 0x0203cec8 -_081B8294: .4byte 0x020244ec -_081B8298: .4byte 0x03005e00 -_081B829C: .4byte sub_81B8104 + 1 + .pool thumb_func_end sub_81B8230 thumb_func_start sub_81B82A0 @@ -899528,20 +868802,19 @@ sub_81B82A0: @ 81B82A0 cmp r0, 0x1 beq _081B82C4 bl sub_81B334C - ldr r0, _081B82CC + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B82D0 + ldr r0, =sub_81B82D4 + 1 str r0, [r1] _081B82C4: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B82CC: .4byte 0x03005e00 -_081B82D0: .4byte sub_81B82D4 + 1 + .pool thumb_func_end sub_81B82A0 thumb_func_start sub_81B82D4 @@ -899566,11 +868839,11 @@ _081B82F4: beq _081B839A b _081B83A8 _081B82FA: - ldr r7, _081B832C + ldr r7, =0x0203cec8 ldrh r4, [r7, 0xC] adds r0, r4, 0 bl sub_81B83F0 - ldr r6, _081B8330 + ldr r6, =0x0203cefc ldrh r0, [r6] movs r1, 0x1 bl bag_add_item @@ -899581,36 +868854,33 @@ _081B82FA: bl sub_81B841C ldrh r0, [r6] bl pokemon_item_not_removed - ldr r0, _081B8334 + ldr r0, =0x02021fc4 movs r1, 0 bl sub_81B1B5C b _081B8378 .align 2, 0 -_081B832C: .4byte 0x0203cec8 -_081B8330: .4byte 0x0203cefc -_081B8334: .4byte 0x02021fc4 + .pool _081B8338: adds r0, r4, 0 bl itemid_is_mail lsls r0, 24 cmp r0, 0 beq _081B835C - ldr r0, _081B8354 + ldr r0, =0x0203cec4 ldr r1, [r0] - ldr r0, _081B8358 + ldr r0, =sub_81B814C + 1 str r0, [r1, 0x4] adds r0, r5, 0 bl sub_81B12C0 b _081B83A8 .align 2, 0 -_081B8354: .4byte 0x0203cec4 -_081B8358: .4byte sub_81B814C + 1 + .pool _081B835C: movs r1, 0x9 ldrsb r1, [r7, r1] movs r0, 0x64 muls r0, r1 - ldr r1, _081B8388 + ldr r1, =0x020244ec adds r0, r1 adds r1, r4, 0 bl sub_81B1DB8 @@ -899619,36 +868889,33 @@ _081B835C: movs r2, 0x1 bl sub_81B1D68 _081B8378: - ldr r1, _081B838C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081B8390 + ldr r1, =sub_81B8104 + 1 str r1, [r0] b _081B83A8 .align 2, 0 -_081B8388: .4byte 0x020244ec -_081B838C: .4byte 0x03005e00 -_081B8390: .4byte sub_81B8104 + 1 + .pool _081B8394: movs r0, 0x5 bl audio_play _081B839A: - ldr r0, _081B83B0 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081B83B4 + ldr r0, =sub_81B8104 + 1 str r0, [r1] _081B83A8: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081B83B0: .4byte 0x03005e00 -_081B83B4: .4byte sub_81B8104 + 1 + .pool thumb_func_end sub_81B82D4 thumb_func_start sub_81B83B8 @@ -899657,25 +868924,23 @@ sub_81B83B8: @ 81B83B8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081B83E4 + ldr r0, =0x085e98ec movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081B83E8 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081B83EC + ldr r1, =sub_81B8104 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081B83E4: .4byte 0x085e98ec -_081B83E8: .4byte 0x03005e00 -_081B83EC: .4byte sub_81B8104 + 1 + .pool thumb_func_end sub_81B83B8 thumb_func_start sub_81B83F0 @@ -899683,7 +868948,7 @@ sub_81B83F0: @ 81B83F0 push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _081B840C + ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x6 bne _081B8410 @@ -899693,7 +868958,7 @@ sub_81B83F0: @ 81B83F0 bl sub_80D6E48 b _081B8418 .align 2, 0 -_081B840C: .4byte 0x0203cec8 + .pool _081B8410: adds r0, r1, 0 movs r1, 0x1 @@ -899708,7 +868973,7 @@ sub_81B841C: @ 81B841C push {lr} lsls r0, 16 lsrs r1, r0, 16 - ldr r0, _081B8434 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x5 beq _081B8438 @@ -899717,7 +868982,7 @@ sub_81B841C: @ 81B841C bl sub_80D6D70 b _081B8440 .align 2, 0 -_081B8434: .4byte 0x0203cec8 + .pool _081B8438: adds r0, r1, 0 movs r1, 0x1 @@ -899735,9 +869000,9 @@ sub_81B8448: @ 81B8448 sub sp, 0xC movs r0, 0x6 str r0, [sp] - ldr r0, _081B846C + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B8470 + ldr r0, =sub_816BB28 + 1 str r0, [sp, 0x8] movs r0, 0 movs r1, 0 @@ -899748,8 +869013,7 @@ sub_81B8448: @ 81B8448 pop {r0} bx r0 .align 2, 0 -_081B846C: .4byte sub_81B1370 + 1 -_081B8470: .4byte sub_816BB28 + 1 + .pool thumb_func_end sub_81B8448 thumb_func_start sub_81B8474 @@ -899757,18 +869021,18 @@ sub_81B8474: @ 81B8474 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _081B84C0 + ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] movs r0, 0x64 muls r1, r0 - ldr r0, _081B84C4 + ldr r0, =0x020244ec adds r5, r1, r0 - ldr r1, _081B84C8 + ldr r1, =0x0203cee8 movs r0, 0 strb r0, [r1] - ldr r2, _081B84CC - ldr r0, _081B84D0 + ldr r2, =0x03005d8c + ldr r0, =0x0203bcb8 ldrh r1, [r0] adds r1, 0x6 ldrh r0, [r0, 0x2] @@ -899776,7 +869040,7 @@ sub_81B8474: @ 81B8474 lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _081B84D4 + ldr r1, =0x00002be0 adds r0, r1 ldr r1, [r2] adds r4, r1, r0 @@ -899785,44 +869049,36 @@ sub_81B8474: @ 81B8474 bl pokemon_getattr cmp r0, 0 beq _081B84DC - ldr r0, _081B84D8 + ldr r0, =0x085e9a08 movs r1, 0x1 bl sub_81B1B5C b _081B84F2 .align 2, 0 -_081B84C0: .4byte 0x0203cec8 -_081B84C4: .4byte 0x020244ec -_081B84C8: .4byte 0x0203cee8 -_081B84CC: .4byte 0x03005d8c -_081B84D0: .4byte 0x0203bcb8 -_081B84D4: .4byte 0x00002be0 -_081B84D8: .4byte 0x085e9a08 + .pool _081B84DC: adds r0, r5, 0 adds r1, r4, 0 bl sub_80D460C adds r0, r4, 0 bl sub_80D439C - ldr r0, _081B850C + ldr r0, =0x085e9a40 movs r1, 0x1 bl sub_81B1B5C _081B84F2: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _081B8510 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _081B8514 + ldr r0, =sub_81B8104 + 1 str r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081B850C: .4byte 0x085e9a40 -_081B8510: .4byte 0x03005e00 -_081B8514: .4byte sub_81B8104 + 1 + .pool thumb_func_end sub_81B8474 thumb_func_start sub_81B8518 @@ -899832,9 +869088,9 @@ sub_81B8518: @ 81B8518 bl sub_81B8558 movs r0, 0 str r0, [sp] - ldr r0, _081B8548 + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B854C + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] str r0, [sp, 0x8] movs r0, 0x4 @@ -899842,30 +869098,27 @@ sub_81B8518: @ 81B8518 movs r2, 0 movs r3, 0 bl sub_81B0038 - ldr r1, _081B8550 - ldr r0, _081B8554 + ldr r1, =0x0203cec8 + ldr r0, =sub_81B879C + 1 str r0, [r1, 0x4] add sp, 0xC pop {r0} bx r0 .align 2, 0 -_081B8548: .4byte sub_81B1370 + 1 -_081B854C: .4byte 0x030022c0 -_081B8550: .4byte 0x0203cec8 -_081B8554: .4byte sub_81B879C + 1 + .pool thumb_func_end sub_81B8518 thumb_func_start sub_81B8558 sub_81B8558: @ 81B8558 push {lr} - ldr r0, _081B8568 + ldr r0, =0x0203cef8 movs r1, 0 movs r2, 0x4 bl memset pop {r0} bx r0 .align 2, 0 -_081B8568: .4byte 0x0203cef8 + .pool thumb_func_end sub_81B8558 thumb_func_start sub_81B856C @@ -899875,7 +869128,7 @@ sub_81B856C: @ 81B856C asrs r4, r0, 24 movs r0, 0x64 muls r0, r4 - ldr r1, _081B8588 + ldr r1, =0x020244ec adds r0, r1 bl sub_81B85AC lsls r0, 24 @@ -899884,7 +869137,7 @@ sub_81B856C: @ 81B856C movs r0, 0x2 b _081B85A4 .align 2, 0 -_081B8588: .4byte 0x020244ec + .pool _081B858C: adds r0, r4, 0x1 lsls r0, 24 @@ -899922,10 +869175,10 @@ sub_81B85AC: @ 81B85AC lsrs r0, 24 cmp r4, r0 bhi _081B8608 - ldr r0, _081B860C + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _081B8610 + ldr r0, =0x0000191a cmp r1, r0 bne _081B85EA adds r0, r5, 0 @@ -899934,7 +869187,7 @@ sub_81B85AC: @ 81B85AC cmp r0, 0 bne _081B8608 _081B85EA: - ldr r0, _081B8614 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 @@ -899951,20 +869204,18 @@ _081B8608: movs r0, 0 b _081B864C .align 2, 0 -_081B860C: .4byte 0x03005d8c -_081B8610: .4byte 0x0000191a -_081B8614: .4byte 0x000040cf + .pool _081B8618: adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr lsls r0, 16 lsrs r4, r0, 16 - ldr r3, _081B8654 + ldr r3, =0x08611c9a lsls r1, r6, 1 adds r0, r1, r3 ldrh r0, [r0] - ldr r2, _081B8658 + ldr r2, =0x0000ffff cmp r0, r2 beq _081B864A _081B8632: @@ -899987,8 +869238,7 @@ _081B864C: pop {r1} bx r1 .align 2, 0 -_081B8654: .4byte 0x08611c9a -_081B8658: .4byte 0x0000ffff + .pool thumb_func_end sub_81B85AC thumb_func_start sub_81B865C @@ -900002,7 +869252,7 @@ sub_81B865C: @ 81B865C lsls r0, 24 lsrs r2, r0, 24 adds r1, r2, 0 - ldr r3, _081B8684 + ldr r3, =0x0203cef8 adds r0, r2, r3 subs r0, 0x1 ldrb r0, [r0] @@ -900013,18 +869263,18 @@ sub_81B865C: @ 81B865C movs r0, 0xE b _081B8758 .align 2, 0 -_081B8684: .4byte 0x0203cef8 + .pool _081B8688: - ldr r0, _081B8698 + ldr r0, =0x02021cc4 movs r2, 0 movs r3, 0x1 bl decimal_int_to_string movs r0, 0x11 b _081B8758 .align 2, 0 -_081B8698: .4byte 0x02021cc4 + .pool _081B869C: - ldr r0, _081B86B4 + ldr r0, =0x000040cf bl var_get lsls r0, 24 movs r1, 0xF8 @@ -900035,7 +869285,7 @@ _081B869C: bhi _081B86C0 b _081B8756 .align 2, 0 -_081B86B4: .4byte 0x000040cf + .pool _081B86B8: movs r0, 0x12 b _081B8758 @@ -900050,13 +869300,13 @@ _081B86C0: movs r5, 0 b _081B8750 _081B86CE: - ldr r3, _081B8768 + ldr r3, =0x0203cef8 adds r4, r3, r5 ldrb r0, [r4] movs r1, 0x64 muls r0, r1 subs r0, 0x64 - ldr r3, _081B876C + ldr r3, =0x020244ec adds r0, r3, r0 movs r1, 0xB bl pokemon_getattr @@ -900067,7 +869317,7 @@ _081B86CE: movs r1, 0x64 muls r0, r1 subs r0, 0x64 - ldr r3, _081B876C + ldr r3, =0x020244ec adds r0, r3, r0 movs r1, 0xC bl pokemon_getattr @@ -900081,12 +869331,12 @@ _081B86CE: bcs _081B8748 movs r7, 0x64 _081B870E: - ldr r0, _081B8768 + ldr r0, =0x0203cef8 adds r5, r0, r4 ldrb r0, [r5] muls r0, r7 subs r0, 0x64 - ldr r1, _081B876C + ldr r1, =0x020244ec adds r0, r1, r0 movs r1, 0xB bl pokemon_getattr @@ -900097,7 +869347,7 @@ _081B870E: ldrb r0, [r5] muls r0, r7 subs r0, 0x64 - ldr r3, _081B876C + ldr r3, =0x020244ec adds r0, r3, r0 movs r1, 0xC bl pokemon_getattr @@ -900129,8 +869379,7 @@ _081B8758: pop {r1} bx r1 .align 2, 0 -_081B8768: .4byte 0x0203cef8 -_081B876C: .4byte 0x020244ec + .pool thumb_func_end sub_81B865C thumb_func_start sub_81B8770 @@ -900139,7 +869388,7 @@ sub_81B8770: @ 81B8770 lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _081B8788 + ldr r3, =0x0203cef8 _081B877A: adds r0, r1, r3 ldrb r0, [r0] @@ -900148,7 +869397,7 @@ _081B877A: movs r0, 0x1 b _081B8798 .align 2, 0 -_081B8788: .4byte 0x0203cef8 + .pool _081B878C: adds r0, r1, 0x1 lsls r0, 24 @@ -900175,17 +869424,16 @@ sub_81B879C: @ 81B879C bl audio_play adds r0, r4, 0 bl sub_81B3054 - ldr r0, _081B87CC + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081B87D0 + ldr r0, =sub_81B87E8 + 1 str r0, [r1] b _081B87E0 .align 2, 0 -_081B87CC: .4byte 0x03005e00 -_081B87D0: .4byte sub_81B87E8 + 1 + .pool _081B87D4: movs r0, 0x5 bl audio_play @@ -900202,7 +869450,7 @@ sub_81B87E8: @ 81B87E8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081B8824 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -900217,27 +869465,25 @@ _081B8802: bl audio_play movs r0, 0 bl sub_81B3054 - ldr r0, _081B8828 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081B882C + ldr r0, =sub_81B1370 + 1 str r0, [r1] _081B881C: pop {r4} pop {r0} bx r0 .align 2, 0 -_081B8824: .4byte 0x030022c0 -_081B8828: .4byte 0x03005e00 -_081B882C: .4byte sub_81B1370 + 1 + .pool thumb_func_end sub_81B87E8 thumb_func_start sub_81B8830 sub_81B8830: @ 81B8830 push {lr} - ldr r0, _081B8848 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 @@ -900248,24 +869494,24 @@ sub_81B8830: @ 81B8830 movs r0, 0x3 b _081B8854 .align 2, 0 -_081B8848: .4byte 0x000040cf + .pool _081B884C: movs r0, 0x2 b _081B8854 _081B8850: - ldr r0, _081B8858 + ldr r0, =0x020375e2 ldrb r0, [r0] _081B8854: pop {r1} bx r1 .align 2, 0 -_081B8858: .4byte 0x020375e2 + .pool thumb_func_end sub_81B8830 thumb_func_start sub_81B885C sub_81B885C: @ 81B885C push {lr} - ldr r0, _081B8874 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 @@ -900276,24 +869522,24 @@ sub_81B885C: @ 81B885C movs r0, 0x1 b _081B8880 .align 2, 0 -_081B8874: .4byte 0x000040cf + .pool _081B8878: movs r0, 0x2 b _081B8880 _081B887C: - ldr r0, _081B8884 + ldr r0, =0x020375e2 ldrb r0, [r0] _081B8880: pop {r1} bx r1 .align 2, 0 -_081B8884: .4byte 0x020375e2 + .pool thumb_func_end sub_81B885C thumb_func_start sub_81B8888 sub_81B8888: @ 81B8888 push {lr} - ldr r0, _081B88A0 + ldr r0, =0x000040cf bl var_get lsls r0, 16 lsrs r0, 16 @@ -900305,12 +869551,12 @@ _081B889C: movs r0, 0x64 b _081B88B2 .align 2, 0 -_081B88A0: .4byte 0x000040cf + .pool _081B88A4: movs r0, 0x1E b _081B88B2 _081B88A8: - ldr r0, _081B88B8 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 bne _081B889C @@ -900319,13 +869565,13 @@ _081B88B2: pop {r1} bx r1 .align 2, 0 -_081B88B8: .4byte 0x020375e0 + .pool thumb_func_end sub_81B8888 thumb_func_start sub_81B88BC sub_81B88BC: @ 81B88BC push {lr} - ldr r0, _081B88D8 + ldr r0, =0x000040cf bl var_get lsls r0, 24 lsrs r1, r0, 24 @@ -900335,30 +869581,28 @@ sub_81B88BC: @ 81B88BC lsrs r0, 24 cmp r0, 0x1 bhi _081B88E0 - ldr r0, _081B88DC + ldr r0, =0x085ea126 b _081B88FA .align 2, 0 -_081B88D8: .4byte 0x000040cf -_081B88DC: .4byte 0x085ea126 + .pool _081B88E0: cmp r1, 0x1 bne _081B88F8 - ldr r0, _081B88F0 + ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x2 bne _081B88F8 - ldr r0, _081B88F4 + ldr r0, =0x085ea139 b _081B88FA .align 2, 0 -_081B88F0: .4byte 0x020375e2 -_081B88F4: .4byte 0x085ea139 + .pool _081B88F8: - ldr r0, _081B8900 + ldr r0, =0x085ea155 _081B88FA: pop {r1} bx r1 .align 2, 0 -_081B8900: .4byte 0x085ea155 + .pool thumb_func_end sub_81B88BC thumb_func_start sub_81B8904 @@ -900369,7 +869613,7 @@ sub_81B8904: @ 81B8904 lsrs r0, 24 movs r2, 0 str r2, [sp] - ldr r2, _081B8928 + ldr r2, =sub_81B1370 + 1 str r2, [sp, 0x4] str r1, [sp, 0x8] movs r1, 0 @@ -900380,7 +869624,7 @@ sub_81B8904: @ 81B8904 pop {r0} bx r0 .align 2, 0 -_081B8928: .4byte sub_81B1370 + 1 + .pool thumb_func_end sub_81B8904 thumb_func_start sub_81B892C @@ -900389,9 +869633,9 @@ sub_81B892C: @ 81B892C sub sp, 0xC movs r0, 0x4 str r0, [sp] - ldr r0, _081B8950 + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B8954 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 str r0, [sp, 0x8] movs r0, 0 movs r1, 0 @@ -900402,8 +869646,7 @@ sub_81B892C: @ 81B892C pop {r0} bx r0 .align 2, 0 -_081B8950: .4byte sub_81B1370 + 1 -_081B8954: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_81B892C thumb_func_start sub_81B8958 @@ -900412,9 +869655,9 @@ sub_81B8958: @ 81B8958 sub sp, 0xC movs r0, 0x1 str r0, [sp] - ldr r0, _081B897C + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B8980 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 str r0, [sp, 0x8] movs r0, 0xB movs r1, 0 @@ -900425,8 +869668,7 @@ sub_81B8958: @ 81B8958 pop {r0} bx r0 .align 2, 0 -_081B897C: .4byte sub_81B1370 + 1 -_081B8980: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool thumb_func_end sub_81B8958 thumb_func_start sub_81B8984 @@ -900466,9 +869708,9 @@ sub_81B89AC: @ 81B89AC lsrs r1, 24 movs r0, 0 str r0, [sp] - ldr r0, _081B89E8 + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B89EC + ldr r0, =sub_8059D40 + 1 str r0, [sp, 0x8] movs r0, 0x1 adds r2, r4, 0 @@ -900481,8 +869723,7 @@ sub_81B89AC: @ 81B89AC pop {r0} bx r0 .align 2, 0 -_081B89E8: .4byte sub_81B1370 + 1 -_081B89EC: .4byte sub_8059D40 + 1 + .pool thumb_func_end sub_81B89AC thumb_func_start sub_81B89F0 @@ -900495,9 +869736,9 @@ sub_81B89F0: @ 81B89F0 lsrs r1, 24 movs r0, 0x5 str r0, [sp] - ldr r0, _081B8A24 + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B8A28 + ldr r0, =c2_815ABFC + 1 str r0, [sp, 0x8] movs r0, 0x1 movs r2, 0x3 @@ -900509,15 +869750,14 @@ sub_81B89F0: @ 81B89F0 pop {r0} bx r0 .align 2, 0 -_081B8A24: .4byte sub_81B1370 + 1 -_081B8A28: .4byte c2_815ABFC + 1 + .pool thumb_func_end sub_81B89F0 thumb_func_start sub_81B8A2C sub_81B8A2C: @ 81B8A2C push {r4,lr} adds r4, r0, 0 - ldr r0, _081B8A54 + ldr r0, =0x02024550 movs r1, 0xB bl pokemon_getattr cmp r0, 0 @@ -900527,17 +869767,16 @@ sub_81B8A2C: @ 81B8A2C bl pokemon_getattr cmp r0, 0 bne _081B8A74 - ldr r0, _081B8A58 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x1 bne _081B8A5C movs r0, 0x3 b _081B8A76 .align 2, 0 -_081B8A54: .4byte 0x02024550 -_081B8A58: .4byte 0x0203cec8 + .pool _081B8A5C: - ldr r0, _081B8A70 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 11 @@ -900547,7 +869786,7 @@ _081B8A5C: movs r0, 0x2 b _081B8A76 .align 2, 0 -_081B8A70: .4byte 0x02022fec + .pool _081B8A74: movs r0, 0x7 _081B8A76: @@ -900576,40 +869815,35 @@ sub_81B8A7C: @ 81B8A7C cmp r5, 0x5 bne _081B8AC4 _081B8AA2: - ldr r4, _081B8AB8 + ldr r4, =0x02021cc4 bl sub_806EBF8 adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy - ldr r0, _081B8ABC - ldr r1, _081B8AC0 + ldr r0, =0x02021fc4 + ldr r1, =0x085e97b2 b _081B8C42 .align 2, 0 -_081B8AB8: .4byte 0x02021cc4 -_081B8ABC: .4byte 0x02021fc4 -_081B8AC0: .4byte 0x085e97b2 + .pool _081B8AC4: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081B8AE8 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 bne _081B8AF8 - ldr r1, _081B8AEC + ldr r1, =0x02021cc4 adds r0, r4, 0 bl sub_81B1B44 - ldr r0, _081B8AF0 - ldr r1, _081B8AF4 + ldr r0, =0x02021fc4 + ldr r1, =0x085e978f b _081B8C42 .align 2, 0 -_081B8AE8: .4byte 0x020244ec -_081B8AEC: .4byte 0x02021cc4 -_081B8AF0: .4byte 0x02021fc4 -_081B8AF4: .4byte 0x085e978f + .pool _081B8AF8: movs r4, 0 b _081B8B24 @@ -900622,7 +869856,7 @@ _081B8AFC: adds r0, r5, 0 bl sub_81B8F38 lsls r0, 24 - ldr r2, _081B8B4C + ldr r2, =0x0202406e lsls r1, r4, 1 adds r1, r2 lsrs r0, 24 @@ -900634,14 +869868,14 @@ _081B8B1E: lsls r0, 24 lsrs r4, r0, 24 _081B8B24: - ldr r0, _081B8B50 + ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 bcc _081B8AFC movs r7, 0x64 adds r0, r5, 0 muls r0, r7 - ldr r1, _081B8B54 + ldr r1, =0x020244ec mov r8, r1 adds r6, r0, r1 adds r0, r6, 0 @@ -900649,19 +869883,15 @@ _081B8B24: bl pokemon_getattr cmp r0, 0 beq _081B8B60 - ldr r0, _081B8B58 - ldr r1, _081B8B5C + ldr r0, =0x02021fc4 + ldr r1, =0x085e97e5 b _081B8C42 .align 2, 0 -_081B8B4C: .4byte 0x0202406e -_081B8B50: .4byte 0x0202406c -_081B8B54: .4byte 0x020244ec -_081B8B58: .4byte 0x02021fc4 -_081B8B5C: .4byte 0x085e97e5 + .pool _081B8B60: adds r0, r5, 0 bl sub_81B8F38 - ldr r1, _081B8B84 + ldr r1, =0x0202449c ldr r1, [r1] adds r1, 0x8B lsls r0, 24 @@ -900669,38 +869899,35 @@ _081B8B60: ldrb r1, [r1] cmp r0, r1 bne _081B8B94 - ldr r1, _081B8B88 + ldr r1, =0x02021cc4 adds r0, r6, 0 bl sub_81B1B44 - ldr r0, _081B8B8C - ldr r1, _081B8B90 + ldr r0, =0x02021fc4 + ldr r1, =0x085e976f b _081B8C42 .align 2, 0 -_081B8B84: .4byte 0x0202449c -_081B8B88: .4byte 0x02021cc4 -_081B8B8C: .4byte 0x02021fc4 -_081B8B90: .4byte 0x085e976f + .pool _081B8B94: - ldr r0, _081B8BA4 + ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x4 bne _081B8BA8 bl sub_806E994 b _081B8C46 .align 2, 0 -_081B8BA4: .4byte 0x0203cec8 + .pool _081B8BA8: cmp r0, 0x2 beq _081B8C20 adds r0, r5, 0 bl sub_81B8F38 - ldr r1, _081B8BEC + ldr r1, =0x0203cee9 strb r0, [r1] - ldr r1, _081B8BF0 + ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] - ldr r1, _081B8BF4 - ldr r0, _081B8BF8 + ldr r1, =0x0202406e + ldr r0, =0x020244b8 ldrb r0, [r0] lsls r0, 1 adds r0, r1 @@ -900720,29 +869947,23 @@ _081B8BA8: movs r0, 0x1 b _081B8C48 .align 2, 0 -_081B8BEC: .4byte 0x0203cee9 -_081B8BF0: .4byte 0x0203cee8 -_081B8BF4: .4byte 0x0202406e -_081B8BF8: .4byte 0x020244b8 + .pool _081B8BFC: movs r0, 0x64 muls r0, r5 - ldr r1, _081B8C10 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081B8C14 + ldr r1, =0x02021cc4 bl sub_81B1B44 - ldr r0, _081B8C18 - ldr r1, _081B8C1C + ldr r0, =0x02021fc4 + ldr r1, =0x085e9754 b _081B8C42 .align 2, 0 -_081B8C10: .4byte 0x020244ec -_081B8C14: .4byte 0x02021cc4 -_081B8C18: .4byte 0x02021fc4 -_081B8C1C: .4byte 0x085e9754 + .pool _081B8C20: - ldr r0, _081B8C54 + ldr r0, =0x020244b8 ldrb r0, [r0] - ldr r1, _081B8C58 + ldr r1, =0x0202406e lsls r0, 1 adds r0, r1 ldrb r0, [r0] @@ -900751,10 +869972,10 @@ _081B8C20: lsrs r0, 24 muls r0, r7 add r0, r8 - ldr r1, _081B8C5C + ldr r1, =0x02021cc4 bl sub_81B1B44 - ldr r0, _081B8C60 - ldr r1, _081B8C64 + ldr r0, =0x02021fc4 + ldr r1, =0x085e9738 _081B8C42: bl ExpandTextCodes _081B8C46: @@ -900766,17 +869987,13 @@ _081B8C48: pop {r1} bx r1 .align 2, 0 -_081B8C54: .4byte 0x020244b8 -_081B8C58: .4byte 0x0202406e -_081B8C5C: .4byte 0x02021cc4 -_081B8C60: .4byte 0x02021fc4 -_081B8C64: .4byte 0x085e9738 + .pool thumb_func_end sub_81B8A7C thumb_func_start sub_81B8C68 sub_81B8C68: @ 81B8C68 push {r4,lr} - ldr r4, _081B8C84 + ldr r4, =0x0203cf00 bl sub_806D7EC adds r1, r0, 0 lsls r1, 24 @@ -900787,7 +870004,7 @@ sub_81B8C68: @ 81B8C68 pop {r0} bx r0 .align 2, 0 -_081B8C84: .4byte 0x0203cf00 + .pool thumb_func_end sub_81B8C68 thumb_func_start sub_81B8C88 @@ -900828,7 +870045,7 @@ _081B8CBE: movs r0, 0 bl battle_get_side_with_given_state mov r2, sp - ldr r1, _081B8CF8 + ldr r1, =0x0202406e lsls r0, 24 lsrs r0, 23 adds r0, r1 @@ -900850,13 +870067,13 @@ _081B8CF0: ble _081B8CE2 b _081B8D40 .align 2, 0 -_081B8CF8: .4byte 0x0202406e + .pool _081B8CFC: movs r5, 0x2 movs r0, 0 bl battle_get_side_with_given_state mov r1, sp - ldr r4, _081B8D60 + ldr r4, =0x0202406e lsls r0, 24 lsrs r0, 23 adds r0, r4 @@ -900906,7 +870123,7 @@ _081B8D58: pop {r0} bx r0 .align 2, 0 -_081B8D60: .4byte 0x0202406e + .pool thumb_func_end sub_81B8C88 thumb_func_start sub_81B8D64 @@ -900917,7 +870134,7 @@ sub_81B8D64: @ 81B8D64 lsrs r2, 24 lsls r1, 24 lsrs r1, 24 - ldr r0, _081B8D84 + ldr r0, =0x0202449c lsls r3, r2, 1 adds r3, r2 adds r3, 0x60 @@ -900927,7 +870144,7 @@ sub_81B8D64: @ 81B8D64 pop {r0} bx r0 .align 2, 0 -_081B8D84: .4byte 0x0202449c + .pool thumb_func_end sub_81B8D64 thumb_func_start sub_81B8D88 @@ -900989,7 +870206,7 @@ _081B8DF0: bne _081B8E28 movs r3, 0x1 mov r2, sp - ldr r1, _081B8E24 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r0, [r0] @@ -901010,11 +870227,11 @@ _081B8E1A: ble _081B8E0C b _081B8E5A .align 2, 0 -_081B8E24: .4byte 0x0202406e + .pool _081B8E28: movs r3, 0x2 mov r1, sp - ldr r2, _081B8E7C + ldr r2, =0x0202406e lsls r0, r4, 1 adds r0, r2 ldrh r0, [r0] @@ -901059,7 +870276,7 @@ _081B8E72: pop {r0} bx r0 .align 2, 0 -_081B8E7C: .4byte 0x0202406e + .pool thumb_func_end sub_81B8D88 thumb_func_start sub_81B8E80 @@ -901077,7 +870294,7 @@ sub_81B8E80: @ 81B8E80 lsls r0, 24 cmp r0, 0 beq _081B8F2E - ldr r0, _081B8EE4 + ldr r0, =0x0202449c lsls r1, r4, 1 adds r1, r4 adds r1, 0x60 @@ -901114,7 +870331,7 @@ _081B8EB2: strb r3, [r0] b _081B8EFC .align 2, 0 -_081B8EE4: .4byte 0x0202449c + .pool _081B8EE8: adds r2, 0x1 cmp r2, 0x5 @@ -901169,16 +870386,16 @@ sub_81B8F38: @ 81B8F38 lsrs r2, r0, 25 cmp r1, 0 beq _081B8F58 - ldr r0, _081B8F54 + ldr r0, =0x0203cf00 adds r0, r2, r0 ldrb r0, [r0] movs r1, 0xF ands r1, r0 b _081B8F60 .align 2, 0 -_081B8F54: .4byte 0x0203cf00 + .pool _081B8F58: - ldr r0, _081B8F68 + ldr r0, =0x0203cf00 adds r0, r2, r0 ldrb r0, [r0] lsrs r1, r0, 4 @@ -901187,7 +870404,7 @@ _081B8F60: pop {r1} bx r1 .align 2, 0 -_081B8F68: .4byte 0x0203cf00 + .pool thumb_func_end sub_81B8F38 thumb_func_start sub_81B8F6C @@ -901202,7 +870419,7 @@ sub_81B8F6C: @ 81B8F6C lsrs r3, r0, 25 cmp r1, 0 beq _081B8F94 - ldr r0, _081B8F90 + ldr r0, =0x0203cf00 adds r0, r3, r0 ldrb r2, [r0] movs r1, 0xF0 @@ -901211,9 +870428,9 @@ sub_81B8F6C: @ 81B8F6C strb r1, [r0] b _081B8FA4 .align 2, 0 -_081B8F90: .4byte 0x0203cf00 + .pool _081B8F94: - ldr r2, _081B8FAC + ldr r2, =0x0203cf00 adds r2, r3, r2 ldrb r1, [r2] movs r0, 0xF @@ -901226,7 +870443,7 @@ _081B8FA4: pop {r0} bx r0 .align 2, 0 -_081B8FAC: .4byte 0x0203cf00 + .pool thumb_func_end sub_81B8F6C thumb_func_start sub_81B8FB0 @@ -901265,7 +870482,7 @@ pokemon_order_func: @ 81B8FEC lsrs r4, r0, 24 movs r3, 0 movs r2, 0 - ldr r5, _081B9014 + ldr r5, =0x0203cf00 _081B8FF8: adds r0, r3, r5 ldrb r1, [r0] @@ -901283,7 +870500,7 @@ _081B9010: adds r0, r2, 0 b _081B902A .align 2, 0 -_081B9014: .4byte 0x0203cf00 + .pool _081B9018: adds r0, r2, 0x1 lsls r0, 24 @@ -901308,7 +870525,7 @@ pokemon_change_order: @ 81B9030 adds r0, r4, 0 bl malloc adds r5, r0, 0 - ldr r1, _081B907C + ldr r1, =0x020244ec adds r2, r4, 0 bl memcpy movs r4, 0 @@ -901319,7 +870536,7 @@ _081B904A: lsls r0, 24 lsrs r0, 24 muls r0, r6 - ldr r1, _081B907C + ldr r1, =0x020244ec adds r0, r1 adds r1, r4, 0 muls r1, r6 @@ -901337,7 +870554,7 @@ _081B904A: pop {r0} bx r0 .align 2, 0 -_081B907C: .4byte 0x020244ec + .pool thumb_func_end pokemon_change_order thumb_func_start sub_81B9080 @@ -901348,7 +870565,7 @@ sub_81B9080: @ 81B9080 adds r0, r4, 0 bl malloc adds r5, r0, 0 - ldr r1, _081B90CC + ldr r1, =0x020244ec adds r2, r4, 0 bl memcpy movs r4, 0 @@ -901359,7 +870576,7 @@ _081B909A: lsls r0, 24 lsrs r0, 24 muls r0, r6 - ldr r1, _081B90CC + ldr r1, =0x020244ec adds r0, r1 adds r1, r4, 0 muls r1, r6 @@ -901377,7 +870594,7 @@ _081B909A: pop {r0} bx r0 .align 2, 0 -_081B90CC: .4byte 0x020244ec + .pool thumb_func_end sub_81B9080 thumb_func_start sub_81B90D0 @@ -901387,7 +870604,7 @@ sub_81B90D0: @ 81B90D0 push {r7} movs r6, 0x1 movs r7, 0x64 - ldr r0, _081B9128 + ldr r0, =0x020244ec mov r8, r0 _081B90DE: adds r0, r6, 0 @@ -901422,7 +870639,7 @@ _081B90DE: bl sub_81B1288 b _081B9136 .align 2, 0 -_081B9128: .4byte 0x020244ec + .pool _081B912C: adds r0, r6, 0x1 lsls r0, 24 @@ -901440,12 +870657,12 @@ _081B9136: thumb_func_start sub_81B9140 sub_81B9140: @ 81B9140 push {lr} - ldr r0, _081B914C + ldr r0, =sub_8059D40 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_081B914C: .4byte sub_8059D40 + 1 + .pool thumb_func_end sub_81B9140 thumb_func_start sub_81B9150 @@ -901454,9 +870671,9 @@ sub_81B9150: @ 81B9150 sub sp, 0xC movs r0, 0x7F str r0, [sp] - ldr r0, _081B9174 + ldr r0, =sub_81B917C + 1 str r0, [sp, 0x4] - ldr r0, _081B9178 + ldr r0, =0x030022c0 ldr r0, [r0, 0x8] str r0, [sp, 0x8] movs r0, 0x5 @@ -901468,8 +870685,7 @@ sub_81B9150: @ 81B9150 pop {r0} bx r0 .align 2, 0 -_081B9174: .4byte sub_81B917C + 1 -_081B9178: .4byte 0x030022c0 + .pool thumb_func_end sub_81B9150 thumb_func_start sub_81B917C @@ -901477,7 +870693,7 @@ sub_81B917C: @ 81B917C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081B91AC + ldr r1, =0x03005e00 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 @@ -901491,14 +870707,13 @@ sub_81B917C: @ 81B917C movs r0, 0x2 movs r2, 0 bl bg_change_x_offset - ldr r0, _081B91B0 + ldr r0, =sub_81B91B4 + 1 str r0, [r4] pop {r4} pop {r0} bx r0 .align 2, 0 -_081B91AC: .4byte 0x03005e00 -_081B91B0: .4byte sub_81B91B4 + 1 + .pool thumb_func_end sub_81B917C thumb_func_start sub_81B91B4 @@ -901509,9 +870724,9 @@ sub_81B91B4: @ 81B91B4 lsls r6, r5, 2 adds r0, r6, r5 lsls r0, 3 - ldr r1, _081B9228 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r0, _081B922C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -901527,7 +870742,7 @@ sub_81B91B4: @ 81B91B4 cmp r0, 0 bne _081B9220 movs r4, 0x3 - ldr r7, _081B9230 + ldr r7, =0x02022ff8 _081B91E8: subs r0, r4, 0x3 lsls r0, 5 @@ -901535,7 +870750,7 @@ _081B91E8: ldrh r0, [r0] cmp r0, 0 beq _081B9204 - ldr r0, _081B9234 + ldr r0, =0x0203cedc ldr r1, [r0] lsls r0, r4, 4 adds r0, r1 @@ -901550,23 +870765,18 @@ _081B9204: bls _081B91E8 movs r0, 0x78 bl audio_play - ldr r0, _081B9238 + ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081B923C + ldr r0, =sub_81B9240 + 1 str r0, [r1] _081B9220: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081B9228: .4byte 0x03005e08 -_081B922C: .4byte 0x02037fd4 -_081B9230: .4byte 0x02022ff8 -_081B9234: .4byte 0x0203cedc -_081B9238: .4byte 0x03005e00 -_081B923C: .4byte sub_81B9240 + 1 + .pool thumb_func_end sub_81B91B4 thumb_func_start sub_81B9240 @@ -901577,7 +870787,7 @@ sub_81B9240: @ 81B9240 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _081B926C + ldr r1, =0x03005e08 adds r0, r1 ldrh r1, [r0] adds r1, 0x1 @@ -901593,7 +870803,7 @@ _081B9266: pop {r0} bx r0 .align 2, 0 -_081B926C: .4byte 0x03005e08 + .pool thumb_func_end sub_81B9240 thumb_func_start sub_81B9270 @@ -901605,7 +870815,7 @@ sub_81B9270: @ 81B9270 lsrs r3, r1, 16 cmp r1, 0 blt _081B928A - ldr r1, _081B9290 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -901615,7 +870825,7 @@ _081B928A: pop {r0} bx r0 .align 2, 0 -_081B9290: .4byte 0x02020630 + .pool thumb_func_end sub_81B9270 thumb_func_start sub_81B9294 @@ -901626,12 +870836,12 @@ sub_81B9294: @ 81B9294 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081B931C + ldr r0, =0x03005e08 adds r5, r1, r0 movs r6, 0x3 - ldr r7, _081B9320 + ldr r7, =0x0203cedc _081B92A8: - ldr r0, _081B9324 + ldr r0, =0x02022ff8 subs r1, r6, 0x3 lsls r1, 5 adds r1, r0 @@ -901686,9 +870896,7 @@ _081B9300: pop {r0} bx r0 .align 2, 0 -_081B931C: .4byte 0x03005e08 -_081B9320: .4byte 0x0203cedc -_081B9324: .4byte 0x02022ff8 + .pool thumb_func_end sub_81B9294 thumb_func_start sub_81B9328 @@ -901697,9 +870905,9 @@ sub_81B9328: @ 81B9328 sub sp, 0xC movs r0, 0xF str r0, [sp] - ldr r0, _081B934C + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B9350 + ldr r0, =sub_81B9390 + 1 str r0, [sp, 0x8] movs r0, 0x6 movs r1, 0 @@ -901710,8 +870918,7 @@ sub_81B9328: @ 81B9328 pop {r0} bx r0 .align 2, 0 -_081B934C: .4byte sub_81B1370 + 1 -_081B9350: .4byte sub_81B9390 + 1 + .pool thumb_func_end sub_81B9328 thumb_func_start sub_81B9354 @@ -901720,14 +870927,14 @@ sub_81B9354: @ 81B9354 sub sp, 0xC lsls r0, 24 lsrs r0, 24 - ldr r2, _081B9380 - ldr r1, _081B9384 + ldr r2, =0x03005db0 + ldr r1, =hm_add_c3_without_phase_2 + 1 str r1, [r2] movs r1, 0 str r1, [sp] - ldr r1, _081B9388 + ldr r1, =sub_81B1370 + 1 str r1, [sp, 0x4] - ldr r1, _081B938C + ldr r1, =c2_exit_to_overworld_2_switch + 1 str r1, [sp, 0x8] movs r1, 0 movs r2, 0xB @@ -901737,16 +870944,13 @@ sub_81B9354: @ 81B9354 pop {r0} bx r0 .align 2, 0 -_081B9380: .4byte 0x03005db0 -_081B9384: .4byte hm_add_c3_without_phase_2 + 1 -_081B9388: .4byte sub_81B1370 + 1 -_081B938C: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_81B9354 thumb_func_start sub_81B9390 sub_81B9390: @ 81B9390 push {r4,lr} - ldr r4, _081B93B8 + ldr r4, =0x020375e0 bl brm_get_pokemon_selection lsls r0, 24 lsrs r0, 24 @@ -901756,33 +870960,30 @@ sub_81B9390: @ 81B9390 movs r0, 0xFF strh r0, [r4] _081B93A6: - ldr r0, _081B93BC - ldr r1, _081B93C0 + ldr r0, =0x03005db0 + ldr r1, =hm_add_c3_without_phase_2 + 1 str r1, [r0] - ldr r0, _081B93C4 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r4} pop {r0} bx r0 .align 2, 0 -_081B93B8: .4byte 0x020375e0 -_081B93BC: .4byte 0x03005db0 -_081B93C0: .4byte hm_add_c3_without_phase_2 + 1 -_081B93C4: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_81B9390 thumb_func_start hm_add_c3_without_phase_2 hm_add_c3_without_phase_2: @ 81B93C8 push {lr} bl pal_fill_black - ldr r0, _081B93DC + ldr r0, =task_hm_without_phase_2 + 1 movs r1, 0xA bl AddTask movs r0, 0x1 pop {r1} bx r1 .align 2, 0 -_081B93DC: .4byte task_hm_without_phase_2 + 1 + .pool thumb_func_end hm_add_c3_without_phase_2 thumb_func_start task_hm_without_phase_2 @@ -901811,13 +871012,13 @@ sub_81B9404: @ 81B9404 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _081B9420 + ldr r0, =sub_81B9424 + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_081B9420: .4byte sub_81B9424 + 1 + .pool thumb_func_end sub_81B9404 thumb_func_start sub_81B9424 @@ -901826,7 +871027,7 @@ sub_81B9424: @ 81B9424 sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081B9464 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -901836,9 +871037,9 @@ sub_81B9424: @ 81B9424 bne _081B945C bl overworld_free_bg_tilemaps str r4, [sp] - ldr r0, _081B9468 + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B946C + ldr r0, =sub_81B9470 + 1 str r0, [sp, 0x8] movs r0, 0x2 movs r1, 0 @@ -901853,16 +871054,14 @@ _081B945C: pop {r0} bx r0 .align 2, 0 -_081B9464: .4byte 0x02037fd4 -_081B9468: .4byte sub_81B1370 + 1 -_081B946C: .4byte sub_81B9470 + 1 + .pool thumb_func_end sub_81B9424 thumb_func_start sub_81B9470 sub_81B9470: @ 81B9470 push {lr} bl brm_get_pokemon_selection - ldr r2, _081B949C + ldr r2, =0x02039f24 strb r0, [r2] lsls r0, 24 lsrs r0, 24 @@ -901871,22 +871070,18 @@ sub_81B9470: @ 81B9470 movs r0, 0xFF strb r0, [r2] _081B9486: - ldr r1, _081B94A0 + ldr r1, =0x020375e0 ldrb r0, [r2] strh r0, [r1] - ldr r1, _081B94A4 - ldr r0, _081B94A8 + ldr r1, =0x03005db0 + ldr r0, =hm_add_c3_without_phase_2 + 1 str r0, [r1] - ldr r0, _081B94AC + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_081B949C: .4byte 0x02039f24 -_081B94A0: .4byte 0x020375e0 -_081B94A4: .4byte 0x03005db0 -_081B94A8: .4byte hm_add_c3_without_phase_2 + 1 -_081B94AC: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_81B9470 thumb_func_start sub_81B94B0 @@ -901896,13 +871091,13 @@ sub_81B94B0: @ 81B94B0 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _081B94CC + ldr r0, =sub_81B94D0 + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_081B94CC: .4byte sub_81B94D0 + 1 + .pool thumb_func_end sub_81B94B0 thumb_func_start sub_81B94D0 @@ -901911,7 +871106,7 @@ sub_81B94D0: @ 81B94D0 sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081B9510 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -901921,9 +871116,9 @@ sub_81B94D0: @ 81B94D0 bne _081B9508 bl overworld_free_bg_tilemaps str r4, [sp] - ldr r0, _081B9514 + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B9518 + ldr r0, =sub_81B9390 + 1 str r0, [sp, 0x8] movs r0, 0x3 movs r1, 0 @@ -901938,9 +871133,7 @@ _081B9508: pop {r0} bx r0 .align 2, 0 -_081B9510: .4byte 0x02037fd4 -_081B9514: .4byte sub_81B1370 + 1 -_081B9518: .4byte sub_81B9390 + 1 + .pool thumb_func_end sub_81B94D0 thumb_func_start sub_81B951C @@ -901950,13 +871143,13 @@ sub_81B951C: @ 81B951C movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _081B9538 + ldr r0, =sub_81B953C + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_081B9538: .4byte sub_81B953C + 1 + .pool thumb_func_end sub_81B951C thumb_func_start sub_81B953C @@ -901965,7 +871158,7 @@ sub_81B953C: @ 81B953C sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081B957C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -901975,9 +871168,9 @@ sub_81B953C: @ 81B953C bne _081B9574 bl overworld_free_bg_tilemaps str r4, [sp] - ldr r0, _081B9580 + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B9584 + ldr r0, =sub_81B9588 + 1 str r0, [sp, 0x8] movs r0, 0x7 movs r1, 0 @@ -901992,15 +871185,13 @@ _081B9574: pop {r0} bx r0 .align 2, 0 -_081B957C: .4byte 0x02037fd4 -_081B9580: .4byte sub_81B1370 + 1 -_081B9584: .4byte sub_81B9588 + 1 + .pool thumb_func_end sub_81B953C thumb_func_start sub_81B9588 sub_81B9588: @ 81B9588 push {r4,r5,lr} - ldr r5, _081B95A0 + ldr r5, =0x020375e0 bl brm_get_pokemon_selection lsls r0, 24 lsrs r0, 24 @@ -902011,46 +871202,42 @@ sub_81B9588: @ 81B9588 strh r0, [r5] b _081B95BA .align 2, 0 -_081B95A0: .4byte 0x020375e0 + .pool _081B95A4: - ldr r4, _081B95CC + ldr r4, =0x020375e2 ldrh r1, [r5] movs r0, 0x64 muls r0, r1 - ldr r1, _081B95D0 + ldr r1, =0x020244ec adds r0, r1 bl sub_806E25C lsls r0, 24 lsrs r0, 24 strh r0, [r4] _081B95BA: - ldr r0, _081B95D4 - ldr r1, _081B95D8 + ldr r0, =0x03005db0 + ldr r1, =hm_add_c3_without_phase_2 + 1 str r1, [r0] - ldr r0, _081B95DC + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B95CC: .4byte 0x020375e2 -_081B95D0: .4byte 0x020244ec -_081B95D4: .4byte 0x03005db0 -_081B95D8: .4byte hm_add_c3_without_phase_2 + 1 -_081B95DC: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_81B9588 thumb_func_start sub_81B95E0 sub_81B95E0: @ 81B95E0 push {r4,r5,lr} - ldr r1, _081B95F0 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] movs r4, 0 adds r5, r1, 0 b _081B95FA .align 2, 0 -_081B95F0: .4byte 0x020375f0 + .pool _081B95F4: adds r0, r4, 0x1 lsls r0, 24 @@ -902060,7 +871247,7 @@ _081B95FA: bhi _081B9614 movs r0, 0x64 muls r0, r4 - ldr r1, _081B961C + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC bl pokemon_getattr @@ -902073,7 +871260,7 @@ _081B9614: pop {r0} bx r0 .align 2, 0 -_081B961C: .4byte 0x020244ec + .pool thumb_func_end sub_81B95E0 thumb_func_start sub_81B9620 @@ -902083,13 +871270,13 @@ sub_81B9620: @ 81B9620 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _081B963C + ldr r0, =sub_81B9640 + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_081B963C: .4byte sub_81B9640 + 1 + .pool thumb_func_end sub_81B9620 thumb_func_start sub_81B9640 @@ -902098,7 +871285,7 @@ sub_81B9640: @ 81B9640 sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081B9680 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -902108,9 +871295,9 @@ sub_81B9640: @ 81B9640 bne _081B9678 bl overworld_free_bg_tilemaps str r4, [sp] - ldr r0, _081B9684 + ldr r0, =sub_81B1370 + 1 str r0, [sp, 0x4] - ldr r0, _081B9688 + ldr r0, =sub_81B9390 + 1 str r0, [sp, 0x8] movs r0, 0xC movs r1, 0 @@ -902125,56 +871312,49 @@ _081B9678: pop {r0} bx r0 .align 2, 0 -_081B9680: .4byte 0x02037fd4 -_081B9684: .4byte sub_81B1370 + 1 -_081B9688: .4byte sub_81B9390 + 1 + .pool thumb_func_end sub_81B9640 thumb_func_start sub_81B968C sub_81B968C: @ 81B968C push {lr} sub sp, 0x4 - ldr r1, _081B96B8 - ldr r0, _081B96BC + ldr r1, =0x020244ec + ldr r0, =0x020375e0 ldrb r2, [r0] - ldr r0, _081B96C0 + ldr r0, =0x020244e9 ldrb r3, [r0] subs r3, 0x1 lsls r3, 24 lsrs r3, 24 - ldr r0, _081B96C4 + ldr r0, =c2_exit_to_overworld_2_switch + 1 str r0, [sp] movs r0, 0x3 bl sub_81BF8EC - ldr r1, _081B96C8 - ldr r0, _081B96CC + ldr r1, =0x03005dac + ldr r0, =sub_80AF168 + 1 str r0, [r1] add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_081B96B8: .4byte 0x020244ec -_081B96BC: .4byte 0x020375e0 -_081B96C0: .4byte 0x020244e9 -_081B96C4: .4byte c2_exit_to_overworld_2_switch + 1 -_081B96C8: .4byte 0x03005dac -_081B96CC: .4byte sub_80AF168 + 1 + .pool thumb_func_end sub_81B968C thumb_func_start sub_81B96D0 sub_81B96D0: @ 81B96D0 push {r4,r5,lr} - ldr r1, _081B970C + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] movs r4, 0 adds r5, r1, 0 _081B96DC: - ldr r0, _081B9710 + ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081B9714 + ldr r1, =0x020244ec adds r0, r1 adds r1, r4, 0 adds r1, 0xD @@ -902194,22 +871374,20 @@ _081B96FA: pop {r0} bx r0 .align 2, 0 -_081B970C: .4byte 0x020375f0 -_081B9710: .4byte 0x020375e0 -_081B9714: .4byte 0x020244ec + .pool thumb_func_end sub_81B96D0 thumb_func_start sub_81B9718 sub_81B9718: @ 81B9718 push {r4,r5,lr} - ldr r0, _081B9758 + ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 adds r5, r1, 0 muls r5, r0 - ldr r0, _081B975C + ldr r0, =0x020244ec adds r5, r0 - ldr r0, _081B9760 + ldr r0, =0x020375e2 ldrh r1, [r0] adds r1, 0xD adds r0, r5, 0 @@ -902217,25 +871395,20 @@ sub_81B9718: @ 81B9718 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r1, _081B9764 + ldr r1, =0x02021cc4 adds r0, r5, 0 bl sub_81B1B44 - ldr r0, _081B9768 + ldr r0, =0x02021dc4 movs r1, 0xD muls r1, r4 - ldr r2, _081B976C + ldr r2, =0x0831977c adds r1, r2 bl gf_strcpy pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B9758: .4byte 0x020375e0 -_081B975C: .4byte 0x020244ec -_081B9760: .4byte 0x020375e2 -_081B9764: .4byte 0x02021cc4 -_081B9768: .4byte 0x02021dc4 -_081B976C: .4byte 0x0831977c + .pool thumb_func_end sub_81B9718 thumb_func_start sub_81B9770 @@ -902243,14 +871416,14 @@ sub_81B9770: @ 81B9770 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _081B97D0 + ldr r0, =0x020375e0 mov r8, r0 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _081B97D4 + ldr r5, =0x020244ec adds r0, r5 - ldr r4, _081B97D8 + ldr r4, =0x020375e2 ldrb r2, [r4] movs r1, 0 bl sub_80691F4 @@ -902264,11 +871437,11 @@ sub_81B9770: @ 81B9770 cmp r4, 0x2 bhi _081B97C4 _081B97A2: - ldr r0, _081B97D0 + ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081B97D4 + ldr r1, =0x020244ec adds r0, r1 lsls r1, r4, 24 lsrs r1, 24 @@ -902287,9 +871460,7 @@ _081B97C4: pop {r0} bx r0 .align 2, 0 -_081B97D0: .4byte 0x020375e0 -_081B97D4: .4byte 0x020244ec -_081B97D8: .4byte 0x020375e2 + .pool thumb_func_end sub_81B9770 thumb_func_start sub_81B97DC @@ -902350,7 +871521,7 @@ sub_81B97DC: @ 81B97DC mov r6, sp adds r6, 0x6 strb r0, [r6] - ldr r1, _081B98D8 + ldr r1, =0x08329d22 adds r0, r5, r1 ldrb r0, [r0] mov r9, r0 @@ -902411,39 +871582,37 @@ sub_81B97DC: @ 81B97DC pop {r0} bx r0 .align 2, 0 -_081B98D8: .4byte 0x08329d22 + .pool thumb_func_end sub_81B97DC thumb_func_start sub_81B98DC sub_81B98DC: @ 81B98DC push {lr} - ldr r0, _081B9900 + ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081B9904 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2D bl pokemon_getattr adds r1, r0, 0 cmp r1, 0 beq _081B990C - ldr r1, _081B9908 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] b _081B9910 .align 2, 0 -_081B9900: .4byte 0x020375e0 -_081B9904: .4byte 0x020244ec -_081B9908: .4byte 0x020375f0 + .pool _081B990C: - ldr r0, _081B9914 + ldr r0, =0x020375f0 strh r1, [r0] _081B9910: pop {r0} bx r0 .align 2, 0 -_081B9914: .4byte 0x020375f0 + .pool thumb_func_end sub_81B98DC thumb_func_start sub_81B9918 @@ -902451,16 +871620,16 @@ sub_81B9918: @ 81B9918 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r1, _081B9948 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - ldr r0, _081B994C + ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081B9950 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081B9954 + ldr r1, =0x020375e2 ldrh r1, [r1] adds r1, 0xD bl pokemon_getattr @@ -902472,12 +871641,9 @@ sub_81B9918: @ 81B9918 movs r6, 0 b _081B9980 .align 2, 0 -_081B9948: .4byte 0x020375f0 -_081B994C: .4byte 0x020375e0 -_081B9950: .4byte 0x020244ec -_081B9954: .4byte 0x020375e2 + .pool _081B9958: - ldr r0, _081B99A8 + ldr r0, =0x020375e0 ldrh r0, [r0] cmp r6, r0 beq _081B997E @@ -902485,7 +871651,7 @@ _081B9958: movs r0, 0x64 adds r5, r6, 0 muls r5, r0 - ldr r7, _081B99AC + ldr r7, =0x020244ec _081B996A: adds r1, r4, 0 adds r1, 0xD @@ -902508,7 +871674,7 @@ _081B9980: bl sub_80D23A8 cmp r0, 0x1 beq _081B999C - ldr r1, _081B99B0 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] _081B999C: @@ -902518,16 +871684,14 @@ _081B999C: pop {r0} bx r0 .align 2, 0 -_081B99A8: .4byte 0x020375e0 -_081B99AC: .4byte 0x020244ec -_081B99B0: .4byte 0x020375f0 + .pool thumb_func_end sub_81B9918 thumb_func_start sub_81B99B4 sub_81B99B4: @ 81B99B4 push {lr} - ldr r1, _081B99CC - ldr r0, _081B99D0 + ldr r1, =0x086160b4 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -902536,31 +871700,30 @@ sub_81B99B4: @ 81B99B4 pop {r0} bx r0 .align 2, 0 -_081B99CC: .4byte 0x086160b4 -_081B99D0: .4byte 0x020375e0 + .pool thumb_func_end sub_81B99B4 thumb_func_start sub_81B99D4 sub_81B99D4: @ 81B99D4 push {lr} - ldr r1, _081B9A14 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r2, _081B9A18 + ldr r2, =0x00000ca8 adds r0, r2 movs r2, 0 strb r2, [r0] ldr r1, [r1] - ldr r3, _081B9A1C + ldr r3, =0x00000cb2 adds r0, r1, r3 strh r2, [r0] - ldr r0, _081B9A20 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r2, [r1] movs r0, 0x5 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r0, _081B9A24 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -902573,49 +871736,41 @@ sub_81B99D4: @ 81B99D4 pop {r0} bx r0 .align 2, 0 -_081B9A14: .4byte 0x03005d90 -_081B9A18: .4byte 0x00000ca8 -_081B9A1C: .4byte 0x00000cb2 -_081B9A20: .4byte 0x00000ca9 -_081B9A24: .4byte 0x03005d8c + .pool thumb_func_end sub_81B99D4 thumb_func_start sub_81B9A28 sub_81B9A28: @ 81B9A28 - ldr r1, _081B9A38 - ldr r0, _081B9A3C + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _081B9A40 + ldr r2, =0x00000e6a adds r0, r2 ldrh r0, [r0] strh r0, [r1] bx lr .align 2, 0 -_081B9A38: .4byte 0x020375f0 -_081B9A3C: .4byte 0x03005d90 -_081B9A40: .4byte 0x00000e6a + .pool thumb_func_end sub_81B9A28 thumb_func_start sub_81B9A44 sub_81B9A44: @ 81B9A44 - ldr r0, _081B9A54 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081B9A58 + ldr r1, =0x020375e4 ldrh r1, [r1] - ldr r2, _081B9A5C + ldr r2, =0x00000e6a adds r0, r2 strh r1, [r0] bx lr .align 2, 0 -_081B9A54: .4byte 0x03005d90 -_081B9A58: .4byte 0x020375e4 -_081B9A5C: .4byte 0x00000e6a + .pool thumb_func_end sub_81B9A44 thumb_func_start sub_81B9A60 sub_81B9A60: @ 81B9A60 push {r4,lr} - ldr r4, _081B9A8C + ldr r4, =0x02038bca bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -902634,18 +871789,18 @@ sub_81B9A60: @ 81B9A60 pop {r0} bx r0 .align 2, 0 -_081B9A8C: .4byte 0x02038bca + .pool thumb_func_end sub_81B9A60 thumb_func_start sub_81B9A90 sub_81B9A90: @ 81B9A90 push {lr} - ldr r3, _081B9AB0 + ldr r3, =0x02038bca ldrh r1, [r3] - ldr r0, _081B9AB4 + ldr r0, =0x0000012b cmp r1, r0 bhi _081B9AAC - ldr r2, _081B9AB8 + ldr r2, =0x0203bc88 movs r0, 0x34 muls r1, r0 ldr r0, [r2] @@ -902656,19 +871811,17 @@ _081B9AAC: pop {r0} bx r0 .align 2, 0 -_081B9AB0: .4byte 0x02038bca -_081B9AB4: .4byte 0x0000012b -_081B9AB8: .4byte 0x0203bc88 + .pool thumb_func_end sub_81B9A90 thumb_func_start sub_81B9ABC sub_81B9ABC: @ 81B9ABC push {r4,lr} - ldr r4, _081B9AF0 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081B9AF4 + ldr r1, =0x020375e2 ldrh r1, [r1] - ldr r2, _081B9AF8 + ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] movs r0, 0x80 @@ -902676,7 +871829,7 @@ sub_81B9ABC: @ 81B9ABC movs r1, 0 bl var_set ldr r1, [r4] - ldr r0, _081B9AFC + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x4 @@ -902687,38 +871840,33 @@ sub_81B9ABC: @ 81B9ABC pop {r0} bx r0 .align 2, 0 -_081B9AF0: .4byte 0x03005d90 -_081B9AF4: .4byte 0x020375e2 -_081B9AF8: .4byte 0x00000ca8 -_081B9AFC: .4byte 0x00000ca9 + .pool thumb_func_end sub_81B9ABC thumb_func_start sub_81B9B00 sub_81B9B00: @ 81B9B00 push {r4,r5,lr} - ldr r0, _081B9B1C + ldr r0, =0x03005d90 ldr r4, [r0] - ldr r5, _081B9B20 + ldr r5, =0x086160d4 bl GenerateRandomNumber ldrh r0, [r5] - ldr r1, _081B9B24 + ldr r1, =0x00000e6a adds r4, r1 strh r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B9B1C: .4byte 0x03005d90 -_081B9B20: .4byte 0x086160d4 -_081B9B24: .4byte 0x00000e6a + .pool thumb_func_end sub_81B9B00 thumb_func_start sub_81B9B28 sub_81B9B28: @ 81B9B28 push {r4,r5,lr} - ldr r4, _081B9B60 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081B9B64 + ldr r1, =0x00000e6a adds r0, r1 ldrh r0, [r0] movs r1, 0x1 @@ -902728,26 +871876,23 @@ sub_81B9B28: @ 81B9B28 cmp r5, 0x1 bne _081B9B70 ldr r0, [r4] - ldr r1, _081B9B64 + ldr r1, =0x00000e6a adds r0, r1 ldrh r0, [r0] - ldr r1, _081B9B68 + ldr r1, =0x02021cc4 bl itemid_get_name ldr r0, [r4] - ldr r1, _081B9B64 + ldr r1, =0x00000e6a adds r0, r1 movs r1, 0 strh r1, [r0] - ldr r0, _081B9B6C + ldr r0, =0x020375f0 strh r5, [r0] b _081B9B76 .align 2, 0 -_081B9B60: .4byte 0x03005d90 -_081B9B64: .4byte 0x00000e6a -_081B9B68: .4byte 0x02021cc4 -_081B9B6C: .4byte 0x020375f0 + .pool _081B9B70: - ldr r1, _081B9B7C + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] _081B9B76: @@ -902755,14 +871900,14 @@ _081B9B76: pop {r0} bx r0 .align 2, 0 -_081B9B7C: .4byte 0x020375f0 + .pool thumb_func_end sub_81B9B28 thumb_func_start sub_81B9B80 sub_81B9B80: @ 81B9B80 push {lr} - ldr r1, _081B9B98 - ldr r0, _081B9B9C + ldr r1, =0x086160d8 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -902771,31 +871916,30 @@ sub_81B9B80: @ 81B9B80 pop {r0} bx r0 .align 2, 0 -_081B9B98: .4byte 0x086160d8 -_081B9B9C: .4byte 0x020375e0 + .pool thumb_func_end sub_81B9B80 thumb_func_start sub_81B9BA0 sub_81B9BA0: @ 81B9BA0 push {lr} - ldr r1, _081B9BE0 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r2, _081B9BE4 + ldr r2, =0x00000ca8 adds r0, r2 movs r2, 0 strb r2, [r0] ldr r1, [r1] - ldr r3, _081B9BE8 + ldr r3, =0x00000cb2 adds r0, r1, r3 strh r2, [r0] - ldr r0, _081B9BEC + ldr r0, =0x00000ca9 adds r1, r0 ldrb r2, [r1] movs r0, 0x5 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r0, _081B9BF0 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -902808,53 +871952,45 @@ sub_81B9BA0: @ 81B9BA0 pop {r0} bx r0 .align 2, 0 -_081B9BE0: .4byte 0x03005d90 -_081B9BE4: .4byte 0x00000ca8 -_081B9BE8: .4byte 0x00000cb2 -_081B9BEC: .4byte 0x00000ca9 -_081B9BF0: .4byte 0x03005d8c + .pool thumb_func_end sub_81B9BA0 thumb_func_start sub_81B9BF4 sub_81B9BF4: @ 81B9BF4 - ldr r1, _081B9C04 - ldr r0, _081B9C08 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _081B9C0C + ldr r2, =0x00000e6c adds r0, r2 ldrh r0, [r0] strh r0, [r1] bx lr .align 2, 0 -_081B9C04: .4byte 0x020375f0 -_081B9C08: .4byte 0x03005d90 -_081B9C0C: .4byte 0x00000e6c + .pool thumb_func_end sub_81B9BF4 thumb_func_start sub_81B9C10 sub_81B9C10: @ 81B9C10 - ldr r0, _081B9C20 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081B9C24 + ldr r1, =0x020375e4 ldrh r1, [r1] - ldr r2, _081B9C28 + ldr r2, =0x00000e6c adds r0, r2 strh r1, [r0] bx lr .align 2, 0 -_081B9C20: .4byte 0x03005d90 -_081B9C24: .4byte 0x020375e4 -_081B9C28: .4byte 0x00000e6c + .pool thumb_func_end sub_81B9C10 thumb_func_start sub_81B9C2C sub_81B9C2C: @ 81B9C2C push {r4,lr} - ldr r4, _081B9C60 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081B9C64 + ldr r1, =0x020375e2 ldrh r1, [r1] - ldr r2, _081B9C68 + ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] movs r0, 0x80 @@ -902862,7 +871998,7 @@ sub_81B9C2C: @ 81B9C2C movs r1, 0 bl var_set ldr r1, [r4] - ldr r0, _081B9C6C + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x4 @@ -902873,38 +872009,33 @@ sub_81B9C2C: @ 81B9C2C pop {r0} bx r0 .align 2, 0 -_081B9C60: .4byte 0x03005d90 -_081B9C64: .4byte 0x020375e2 -_081B9C68: .4byte 0x00000ca8 -_081B9C6C: .4byte 0x00000ca9 + .pool thumb_func_end sub_81B9C2C thumb_func_start sub_81B9C70 sub_81B9C70: @ 81B9C70 push {r4,r5,lr} - ldr r0, _081B9C8C + ldr r0, =0x03005d90 ldr r4, [r0] - ldr r5, _081B9C90 + ldr r5, =0x086160f4 bl GenerateRandomNumber ldrh r0, [r5] - ldr r1, _081B9C94 + ldr r1, =0x00000e6c adds r4, r1 strh r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B9C8C: .4byte 0x03005d90 -_081B9C90: .4byte 0x086160f4 -_081B9C94: .4byte 0x00000e6c + .pool thumb_func_end sub_81B9C70 thumb_func_start sub_81B9C98 sub_81B9C98: @ 81B9C98 push {r4,r5,lr} - ldr r4, _081B9CD0 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081B9CD4 + ldr r1, =0x00000e6c adds r0, r1 ldrh r0, [r0] movs r1, 0x1 @@ -902914,26 +872045,23 @@ sub_81B9C98: @ 81B9C98 cmp r5, 0x1 bne _081B9CE0 ldr r0, [r4] - ldr r1, _081B9CD4 + ldr r1, =0x00000e6c adds r0, r1 ldrh r0, [r0] - ldr r1, _081B9CD8 + ldr r1, =0x02021cc4 bl itemid_get_name ldr r0, [r4] - ldr r1, _081B9CD4 + ldr r1, =0x00000e6c adds r0, r1 movs r1, 0 strh r1, [r0] - ldr r0, _081B9CDC + ldr r0, =0x020375f0 strh r5, [r0] b _081B9CE6 .align 2, 0 -_081B9CD0: .4byte 0x03005d90 -_081B9CD4: .4byte 0x00000e6c -_081B9CD8: .4byte 0x02021cc4 -_081B9CDC: .4byte 0x020375f0 + .pool _081B9CE0: - ldr r1, _081B9CEC + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] _081B9CE6: @@ -902941,28 +872069,27 @@ _081B9CE6: pop {r0} bx r0 .align 2, 0 -_081B9CEC: .4byte 0x020375f0 + .pool thumb_func_end sub_81B9C98 thumb_func_start sub_81B9CF0 sub_81B9CF0: @ 81B9CF0 push {lr} - ldr r0, _081B9D00 - ldr r1, _081B9D04 + ldr r0, =0x02021cc4 + ldr r1, =0x02038bca ldrh r1, [r1] bl sub_8162E20 pop {r0} bx r0 .align 2, 0 -_081B9D00: .4byte 0x02021cc4 -_081B9D04: .4byte 0x02038bca + .pool thumb_func_end sub_81B9CF0 thumb_func_start sub_81B9D08 sub_81B9D08: @ 81B9D08 push {lr} - ldr r1, _081B9D20 - ldr r0, _081B9D24 + ldr r1, =0x086160f8 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -902971,31 +872098,30 @@ sub_81B9D08: @ 81B9D08 pop {r0} bx r0 .align 2, 0 -_081B9D20: .4byte 0x086160f8 -_081B9D24: .4byte 0x020375e0 + .pool thumb_func_end sub_81B9D08 thumb_func_start sub_81B9D28 sub_81B9D28: @ 81B9D28 push {lr} - ldr r1, _081B9D68 + ldr r1, =0x03005d90 ldr r0, [r1] - ldr r2, _081B9D6C + ldr r2, =0x00000ca8 adds r0, r2 movs r2, 0 strb r2, [r0] ldr r1, [r1] - ldr r3, _081B9D70 + ldr r3, =0x00000cb2 adds r0, r1, r3 strh r2, [r0] - ldr r0, _081B9D74 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r2, [r1] movs r0, 0x5 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r0, _081B9D78 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -903008,53 +872134,45 @@ sub_81B9D28: @ 81B9D28 pop {r0} bx r0 .align 2, 0 -_081B9D68: .4byte 0x03005d90 -_081B9D6C: .4byte 0x00000ca8 -_081B9D70: .4byte 0x00000cb2 -_081B9D74: .4byte 0x00000ca9 -_081B9D78: .4byte 0x03005d8c + .pool thumb_func_end sub_81B9D28 thumb_func_start sub_81B9D7C sub_81B9D7C: @ 81B9D7C - ldr r1, _081B9D8C - ldr r0, _081B9D90 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _081B9D94 + ldr r2, =0x00000e6e adds r0, r2 ldrh r0, [r0] strh r0, [r1] bx lr .align 2, 0 -_081B9D8C: .4byte 0x020375f0 -_081B9D90: .4byte 0x03005d90 -_081B9D94: .4byte 0x00000e6e + .pool thumb_func_end sub_81B9D7C thumb_func_start sub_81B9D98 sub_81B9D98: @ 81B9D98 - ldr r0, _081B9DA8 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081B9DAC + ldr r1, =0x020375e4 ldrh r1, [r1] - ldr r2, _081B9DB0 + ldr r2, =0x00000e6e adds r0, r2 strh r1, [r0] bx lr .align 2, 0 -_081B9DA8: .4byte 0x03005d90 -_081B9DAC: .4byte 0x020375e4 -_081B9DB0: .4byte 0x00000e6e + .pool thumb_func_end sub_81B9D98 thumb_func_start sub_81B9DB4 sub_81B9DB4: @ 81B9DB4 push {r4,lr} - ldr r4, _081B9DE8 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081B9DEC + ldr r1, =0x020375e2 ldrh r1, [r1] - ldr r2, _081B9DF0 + ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] movs r0, 0x80 @@ -903062,7 +872180,7 @@ sub_81B9DB4: @ 81B9DB4 movs r1, 0 bl var_set ldr r1, [r4] - ldr r0, _081B9DF4 + ldr r0, =0x00000ca9 adds r1, r0 ldrb r0, [r1] movs r2, 0x4 @@ -903073,38 +872191,33 @@ sub_81B9DB4: @ 81B9DB4 pop {r0} bx r0 .align 2, 0 -_081B9DE8: .4byte 0x03005d90 -_081B9DEC: .4byte 0x020375e2 -_081B9DF0: .4byte 0x00000ca8 -_081B9DF4: .4byte 0x00000ca9 + .pool thumb_func_end sub_81B9DB4 thumb_func_start sub_81B9DF8 sub_81B9DF8: @ 81B9DF8 push {r4,r5,lr} - ldr r0, _081B9E14 + ldr r0, =0x03005d90 ldr r4, [r0] - ldr r5, _081B9E18 + ldr r5, =0x08616120 bl GenerateRandomNumber ldrh r0, [r5] - ldr r1, _081B9E1C + ldr r1, =0x00000e6e adds r4, r1 strh r0, [r4] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081B9E14: .4byte 0x03005d90 -_081B9E18: .4byte 0x08616120 -_081B9E1C: .4byte 0x00000e6e + .pool thumb_func_end sub_81B9DF8 thumb_func_start sub_81B9E20 sub_81B9E20: @ 81B9E20 push {r4,r5,lr} - ldr r4, _081B9E58 + ldr r4, =0x03005d90 ldr r0, [r4] - ldr r1, _081B9E5C + ldr r1, =0x00000e6e adds r0, r1 ldrh r0, [r0] movs r1, 0x1 @@ -903114,26 +872227,23 @@ sub_81B9E20: @ 81B9E20 cmp r5, 0x1 bne _081B9E68 ldr r0, [r4] - ldr r1, _081B9E5C + ldr r1, =0x00000e6e adds r0, r1 ldrh r0, [r0] - ldr r1, _081B9E60 + ldr r1, =0x02021cc4 bl itemid_get_name ldr r0, [r4] - ldr r1, _081B9E5C + ldr r1, =0x00000e6e adds r0, r1 movs r1, 0 strh r1, [r0] - ldr r0, _081B9E64 + ldr r0, =0x020375f0 strh r5, [r0] b _081B9E6E .align 2, 0 -_081B9E58: .4byte 0x03005d90 -_081B9E5C: .4byte 0x00000e6e -_081B9E60: .4byte 0x02021cc4 -_081B9E64: .4byte 0x020375f0 + .pool _081B9E68: - ldr r1, _081B9E74 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] _081B9E6E: @@ -903141,7 +872251,7 @@ _081B9E6E: pop {r0} bx r0 .align 2, 0 -_081B9E74: .4byte 0x020375f0 + .pool thumb_func_end sub_81B9E20 thumb_func_start sub_81B9E78 @@ -903165,11 +872275,11 @@ sub_81B9E88: @ 81B9E88 sub_81B9E94: @ 81B9E94 push {lr} movs r2, 0 - ldr r1, _081B9EB8 + ldr r1, =0x02037318 ldrb r0, [r1, 0x14] cmp r0, 0x8 bne _081B9EB2 - ldr r3, _081B9EBC + ldr r3, =0xfffffe7f adds r0, r3, 0 ldrh r1, [r1, 0x12] adds r0, r1 @@ -903183,8 +872293,7 @@ _081B9EB2: pop {r1} bx r1 .align 2, 0 -_081B9EB8: .4byte 0x02037318 -_081B9EBC: .4byte 0xfffffe7f + .pool thumb_func_end sub_81B9E94 thumb_func_start sub_81B9EC0 @@ -903195,16 +872304,16 @@ sub_81B9EC0: @ 81B9EC0 mov r5, r8 push {r5-r7} sub sp, 0x3C - ldr r1, _081B9FB8 - ldr r0, _081B9FBC + ldr r1, =0x0203bc88 + ldr r0, =0x085dda14 str r0, [r1] add r0, sp, 0xC mov r9, r0 mov r1, sp adds r1, 0x18 str r1, [sp, 0x2C] - ldr r5, _081B9FC0 - ldr r4, _081B9FC4 + ldr r5, =0x0203bc8c + ldr r4, =0x085de02c movs r2, 0 adds r3, r1, 0 mov r1, r9 @@ -903254,7 +872363,7 @@ _081B9F1E: ldrh r0, [r1] cmp r0, r5 beq _081B9F7C - ldr r0, _081B9FC0 + ldr r0, =0x0203bc8c ldr r1, [r0] lsls r0, r5, 4 adds r4, r0, r1 @@ -903291,9 +872400,9 @@ _081B9F7C: movs r2, 0 cmp r2, r6 bge _081B9FD4 - ldr r0, _081B9FC8 + ldr r0, =0x085cecb0 mov r12, r0 - ldr r7, _081B9FC0 + ldr r7, =0x0203bc8c ldr r1, [sp, 0x24] ldr r0, [sp, 0x2C] adds r4, r1, r0 @@ -903317,11 +872426,7 @@ _081B9F92: mov r10, r1 b _081B9FD4 .align 2, 0 -_081B9FB8: .4byte 0x0203bc88 -_081B9FBC: .4byte 0x085dda14 -_081B9FC0: .4byte 0x0203bc8c -_081B9FC4: .4byte 0x085de02c -_081B9FC8: .4byte 0x085cecb0 + .pool _081B9FCC: adds r4, 0x2 adds r2, 0x1 @@ -903330,7 +872435,7 @@ _081B9FCC: _081B9FD4: cmp r2, r6 bne _081BA01C - ldr r0, _081BA034 + ldr r0, =0x03005d90 ldr r1, [r0] mov r2, r8 lsls r3, r2, 1 @@ -903341,14 +872446,14 @@ _081B9FD4: lsls r6, 4 adds r1, r6 strh r5, [r1] - ldr r0, _081BA038 + ldr r0, =0x0203bc8c ldr r0, [r0] lsls r1, r5, 4 adds r1, r0 ldrh r0, [r1] ldr r7, [sp, 0x34] strh r0, [r7] - ldr r2, _081BA03C + ldr r2, =0x085cecb0 ldrb r0, [r1, 0xA] lsls r0, 1 adds r0, r2 @@ -903379,9 +872484,7 @@ _081BA024: pop {r0} bx r0 .align 2, 0 -_081BA034: .4byte 0x03005d90 -_081BA038: .4byte 0x0203bc8c -_081BA03C: .4byte 0x085cecb0 + .pool thumb_func_end sub_81B9EC0 thumb_func_start sub_81BA040 @@ -903394,14 +872497,14 @@ sub_81BA040: @ 81BA040 sub sp, 0x10 movs r0, 0 mov r10, r0 - ldr r1, _081BA0EC - ldr r0, _081BA0F0 + ldr r1, =0x0203bc88 + ldr r0, =0x085dda14 str r0, [r1] - ldr r1, _081BA0F4 - ldr r0, _081BA0F8 + ldr r1, =0x0203bc8c + ldr r0, =0x085de02c str r0, [r1] - ldr r7, _081BA0FC - ldr r1, _081BA100 + ldr r7, =0x03005d90 + ldr r1, =0x0000ffff mov r8, r1 _081BA062: mov r2, r10 @@ -903416,17 +872519,17 @@ _081BA066: lsrs r3, r0, 16 movs r5, 0 ldr r1, [r7] - ldr r4, _081BA104 + ldr r4, =0x00000cb2 adds r0, r1, r4 ldrh r0, [r0] cmp r5, r0 bge _081BA0AA - ldr r2, _081BA108 + ldr r2, =0x00000cb4 adds r0, r1, r2 ldrh r0, [r0] cmp r0, r3 beq _081BA0AA - ldr r0, _081BA0FC + ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r1, r4 ldrh r2, [r0] @@ -903442,15 +872545,15 @@ _081BA09C: bne _081BA09C _081BA0AA: ldr r0, [r7] - ldr r1, _081BA104 + ldr r1, =0x00000cb2 adds r0, r1 ldrh r0, [r0] cmp r5, r0 bne _081BA066 - ldr r2, _081BA10C + ldr r2, =0x02038bca strh r3, [r2] ldrh r3, [r2] - ldr r4, _081BA0EC + ldr r4, =0x0203bc88 ldr r1, [r4] movs r0, 0x34 muls r0, r3 @@ -903460,7 +872563,7 @@ _081BA0AA: ldrh r0, [r1] cmp r0, r8 beq _081BA0DE - ldr r3, _081BA100 + ldr r3, =0x0000ffff _081BA0D2: adds r1, 0x2 movs r6, 0x1 @@ -903476,25 +872579,17 @@ _081BA0DE: mov r10, r1 b _081BA062 .align 2, 0 -_081BA0EC: .4byte 0x0203bc88 -_081BA0F0: .4byte 0x085dda14 -_081BA0F4: .4byte 0x0203bc8c -_081BA0F8: .4byte 0x085de02c -_081BA0FC: .4byte 0x03005d90 -_081BA100: .4byte 0x0000ffff -_081BA104: .4byte 0x00000cb2 -_081BA108: .4byte 0x00000cb4 -_081BA10C: .4byte 0x02038bca + .pool _081BA110: - ldr r0, _081BA234 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r6, _081BA238 + ldr r6, =0x00000cb2 adds r3, r1, r6 ldrh r0, [r3] cmp r0, 0x1 bhi _081BA12A lsls r0, 1 - ldr r3, _081BA23C + ldr r3, =0x00000cb4 adds r1, r3 adds r1, r0 ldrh r0, [r2] @@ -903508,7 +872603,7 @@ _081BA12A: ldr r0, [r0, 0x30] mov r9, r0 movs r5, 0 - ldr r7, _081BA240 + ldr r7, =0x03001298 mov r8, sp _081BA13E: bl GenerateRandomNumber @@ -903522,11 +872617,11 @@ _081BA13E: strh r0, [r7] movs r2, 0 ldrh r0, [r7] - ldr r4, _081BA244 + ldr r4, =0x0203bc8c ldr r3, [r4] lsls r0, 4 adds r0, r3 - ldr r1, _081BA234 + ldr r1, =0x03005d90 ldrh r6, [r0] ldr r1, [r1] _081BA166: @@ -903553,8 +872648,8 @@ _081BA180: ldrh r0, [r0] cmp r0, r6 beq _081BA1B0 - ldr r6, _081BA240 - ldr r3, _081BA244 + ldr r6, =0x03001298 + ldr r3, =0x0203bc8c mov r2, sp _081BA198: adds r2, 0x2 @@ -903575,16 +872670,16 @@ _081BA1B0: movs r4, 0 cmp r4, r5 bge _081BA1E6 - ldr r6, _081BA248 + ldr r6, =0x085cecb0 mov r12, r6 add r3, sp, 0x8 _081BA1C0: ldrh r2, [r3] cmp r2, 0 beq _081BA1DE - ldr r1, _081BA240 + ldr r1, =0x03001298 ldrh r0, [r1] - ldr r6, _081BA244 + ldr r6, =0x0203bc8c ldr r1, [r6] lsls r0, 4 adds r0, r1 @@ -903604,7 +872699,7 @@ _081BA1E6: bne _081BA220 lsls r2, r5, 1 ldrh r0, [r7] - ldr r1, _081BA244 + ldr r1, =0x0203bc8c ldr r4, [r1] lsls r0, 4 adds r0, r4 @@ -903613,7 +872708,7 @@ _081BA1E6: strh r0, [r3] add r1, sp, 0x8 adds r1, r2 - ldr r3, _081BA248 + ldr r3, =0x085cecb0 ldrh r0, [r7] lsls r0, 4 adds r0, r4 @@ -903622,7 +872717,7 @@ _081BA1E6: adds r0, r3 ldrh r0, [r0] strh r0, [r1] - ldr r0, _081BA24C + ldr r0, =0x03006298 adds r2, r0 ldrh r0, [r7] strh r0, [r2] @@ -903641,13 +872736,7 @@ _081BA220: pop {r0} bx r0 .align 2, 0 -_081BA234: .4byte 0x03005d90 -_081BA238: .4byte 0x00000cb2 -_081BA23C: .4byte 0x00000cb4 -_081BA240: .4byte 0x03001298 -_081BA244: .4byte 0x0203bc8c -_081BA248: .4byte 0x085cecb0 -_081BA24C: .4byte 0x03006298 + .pool thumb_func_end sub_81BA040 thumb_func_start fbox6_func @@ -903662,12 +872751,12 @@ fbox6_func: @ 81BA250 b _081BA660 _081BA260: lsls r0, 2 - ldr r1, _081BA26C + ldr r1, =_081BA270 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BA26C: .4byte _081BA270 + .pool .align 2, 0 _081BA270: .4byte _081BA28C @@ -903678,7 +872767,7 @@ _081BA270: .4byte _081BA63C .4byte _081BA64E _081BA28C: - ldr r2, _081BA2E0 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2C] movs r0, 0x3 ands r0, r1 @@ -903700,7 +872789,7 @@ _081BA2A6: beq _081BA2E8 subs r0, r1, 0x1 strb r0, [r6, 0x1E] - ldr r0, _081BA2E4 + ldr r0, =0x03003014 ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -903723,10 +872812,9 @@ _081BA2D0: strb r0, [r6, 0x1E] b _081BA50E .align 2, 0 -_081BA2E0: .4byte 0x030022c0 -_081BA2E4: .4byte 0x03003014 + .pool _081BA2E8: - ldr r2, _081BA2F8 + ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x4 ands r0, r1 @@ -903735,7 +872823,7 @@ _081BA2E8: movs r0, 0x3 b _081BA2FE .align 2, 0 -_081BA2F8: .4byte 0x03003014 + .pool _081BA2FC: ldrb r0, [r6, 0x1D] _081BA2FE: @@ -903751,12 +872839,12 @@ _081BA2FE: b _081BA52E _081BA312: lsls r0, 2 - ldr r1, _081BA31C + ldr r1, =_081BA320 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BA31C: .4byte _081BA320 + .pool .align 2, 0 _081BA320: .4byte _081BA524 @@ -903771,7 +872859,7 @@ _081BA340: ldrb r0, [r6, 0x6] strb r0, [r6, 0x8] ldrb r1, [r6, 0x5] - ldr r0, _081BA364 + ldr r0, =0x03002f80 ldr r2, [r0] lsls r0, r1, 1 adds r0, r1 @@ -903787,7 +872875,7 @@ _081BA35E: movs r0, 0x2 b _081BA662 .align 2, 0 -_081BA364: .4byte 0x03002f80 + .pool _081BA368: ldr r0, [r6] adds r0, 0x1 @@ -903803,12 +872891,12 @@ _081BA36E: b _081BA52E _081BA37E: lsls r0, 2 - ldr r1, _081BA388 + ldr r1, =_081BA38C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BA388: .4byte _081BA38C + .pool .align 2, 0 _081BA38C: .4byte _081BA3CC @@ -904030,7 +873118,7 @@ _081BA52E: bl sub_81BA668 adds r0, r6, 0 bl CopyGlyphToWindow - ldr r0, _081BA550 + ldr r0, =0x03002f90 adds r0, 0x80 ldrb r1, [r6, 0xA] ldrb r0, [r0] @@ -904041,7 +873129,7 @@ _081BA52E: movs r0, 0 b _081BA662 .align 2, 0 -_081BA550: .4byte 0x03002f90 + .pool _081BA554: adds r0, r6, 0 bl remo_is_it_time_to_continue @@ -904080,7 +873168,7 @@ _081BA590: adds r0, r6, 0 bl remo_clear_down_arrow ldrb r1, [r6, 0x5] - ldr r0, _081BA5C4 + ldr r0, =0x03002f80 ldr r2, [r0] lsls r0, r1, 1 adds r0, r1 @@ -904096,13 +873184,13 @@ _081BA590: strb r0, [r6, 0x1C] b _081BA50E .align 2, 0 -_081BA5C4: .4byte 0x03002f80 + .pool _081BA5C8: ldrb r2, [r6, 0x1F] cmp r2, 0 beq _081BA638 - ldr r4, _081BA5FC - ldr r5, _081BA600 + ldr r4, =0x08616124 + ldr r5, =0x03005d90 ldr r0, [r5] ldrb r0, [r0, 0x14] lsls r1, r0, 29 @@ -904123,8 +873211,7 @@ _081BA5C8: strb r0, [r6, 0x1F] b _081BA62E .align 2, 0 -_081BA5FC: .4byte 0x08616124 -_081BA600: .4byte 0x03005d90 + .pool _081BA604: ldrb r0, [r6, 0x4] lsrs r1, 29 @@ -904193,10 +873280,10 @@ sub_81BA668: @ 81BA668 lsls r1, 11 ands r1, r0 lsrs r1, 11 - ldr r0, _081BA6C4 + ldr r0, =0x08616128 adds r1, r0 adds r5, r2, r1 - ldr r4, _081BA6C8 + ldr r4, =0x03002f90 adds r0, r5, 0 adds r1, r4, 0 bl font_render_sub @@ -904227,8 +873314,7 @@ sub_81BA668: @ 81BA668 pop {r0} bx r0 .align 2, 0 -_081BA6C4: .4byte 0x08616128 -_081BA6C8: .4byte 0x03002f90 + .pool thumb_func_end sub_81BA668 thumb_func_start get_font_width_x10 @@ -904252,20 +873338,17 @@ sub_81BA6D0: @ 81BA6D0 adds r0, 0x48 strb r1, [r0] strh r1, [r2, 0x16] - ldr r0, _081BA6FC + ldr r0, =0x04000134 strh r1, [r0] - ldr r2, _081BA700 - ldr r3, _081BA704 + ldr r2, =0x04000128 + ldr r3, =0x00002003 adds r0, r3, 0 strh r0, [r2] - ldr r0, _081BA708 + ldr r0, =0x0400012a strh r1, [r0] bx lr .align 2, 0 -_081BA6FC: .4byte 0x04000134 -_081BA700: .4byte 0x04000128 -_081BA704: .4byte 0x00002003 -_081BA708: .4byte 0x0400012a + .pool thumb_func_end sub_81BA6D0 thumb_func_start sub_81BA70C @@ -904299,7 +873382,7 @@ _081BA736: beq _081BA760 movs r0, 0 strb r0, [r1] - ldr r0, _081BA75C + ldr r0, =0x04000128 ldrh r0, [r0] movs r5, 0xFC ands r5, r0 @@ -904311,7 +873394,7 @@ _081BA736: eors r0, r5 b _081BAAEC .align 2, 0 -_081BA75C: .4byte 0x04000128 + .pool _081BA760: ldrb r0, [r7, 0x18] cmp r0, 0xDF @@ -904380,16 +873463,16 @@ _081BA7D4: _081BA7D6: movs r3, 0xE movs r5, 0x3 - ldr r0, _081BA81C + ldr r0, =0x04000120 ldrh r0, [r0, 0x6] adds r1, r0, 0 - ldr r0, _081BA820 + ldr r0, =0x0000ffff ldrb r2, [r7, 0x1E] adds r6, r2, 0 cmp r1, r0 bne _081BA7FE adds r4, r1, 0 - ldr r1, _081BA824 + ldr r1, =0x04000126 _081BA7EE: asrs r3, 1 subs r1, 0x2 @@ -904404,7 +873487,7 @@ _081BA7FE: ands r3, r0 strb r3, [r7, 0x1D] movs r5, 0x3 - ldr r0, _081BA81C + ldr r0, =0x04000120 ldrh r0, [r0, 0x6] adds r4, r0, 0 asrs r0, r2, 3 @@ -904412,19 +873495,16 @@ _081BA7FE: ands r0, r1 cmp r0, 0 beq _081BA82C - ldr r0, _081BA828 + ldr r0, =0x00007208 b _081BA852 .align 2, 0 -_081BA81C: .4byte 0x04000120 -_081BA820: .4byte 0x0000ffff -_081BA824: .4byte 0x04000126 -_081BA828: .4byte 0x00007208 + .pool _081BA82C: subs r5, 0x1 cmp r5, 0 beq _081BA858 lsls r0, r5, 1 - ldr r1, _081BA880 + ldr r1, =0x04000120 adds r0, r1 ldrh r0, [r0] adds r4, r0, 0 @@ -904465,7 +873545,7 @@ _081BA868: bl sub_81BAB48 b _081BA892 .align 2, 0 -_081BA880: .4byte 0x04000120 + .pool _081BA884: subs r0, 0x1 mov r1, r10 @@ -904482,10 +873562,10 @@ _081BA892: strb r0, [r1] movs r5, 0x3 mov r12, r1 - ldr r3, _081BA8E8 + ldr r3, =0x0300129c _081BA8A0: lsls r0, r5, 1 - ldr r2, _081BA8EC + ldr r2, =0x04000120 adds r0, r2 ldrh r0, [r0] adds r4, r0, 0 @@ -904522,8 +873602,7 @@ _081BA8CA: lsls r2, 7 b _081BA992 .align 2, 0 -_081BA8E8: .4byte 0x0300129c -_081BA8EC: .4byte 0x04000120 + .pool _081BA8F0: movs r5, 0x3 movs r0, 0x49 @@ -904531,9 +873610,9 @@ _081BA8F0: mov r12, r0 mov r4, r12 movs r6, 0x1 - ldr r1, _081BA934 + ldr r1, =0x0300129c mov r9, r1 - ldr r2, _081BA938 + ldr r2, =0x04000120 mov r8, r2 _081BA904: ldrb r3, [r4] @@ -904561,8 +873640,7 @@ _081BA92A: bne _081BA904 b _081BAA90 .align 2, 0 -_081BA934: .4byte 0x0300129c -_081BA938: .4byte 0x04000120 + .pool _081BA93C: movs r3, 0x1 movs r5, 0x3 @@ -904571,11 +873649,11 @@ _081BA93C: mov r12, r0 adds r6, r7, 0 adds r6, 0x19 - ldr r1, _081BA9A0 + ldr r1, =0x0300129c mov r8, r1 _081BA94E: lsls r0, r5, 1 - ldr r2, _081BA9A4 + ldr r2, =0x04000120 adds r0, r2 ldrh r0, [r0] adds r4, r0, 0 @@ -904617,8 +873695,7 @@ _081BA992: bl sub_81BAAFC b _081BAAEC .align 2, 0 -_081BA9A0: .4byte 0x0300129c -_081BA9A4: .4byte 0x04000120 + .pool _081BA9A8: movs r0, 0xD1 strb r0, [r7, 0x18] @@ -904647,7 +873724,7 @@ _081BA9D6: movs r5, 0x3 movs r2, 0x49 ldrb r1, [r2, r7] - ldr r2, _081BAA14 + ldr r2, =0x04000126 movs r3, 0x1 _081BA9E0: ldrh r0, [r2] @@ -904676,7 +873753,7 @@ _081BA9F4: strh r0, [r7, 0x16] b _081BAAEA .align 2, 0 -_081BAA14: .4byte 0x04000126 + .pool _081BAA18: adds r0, r7, 0 bl sub_81BA6D0 @@ -904703,7 +873780,7 @@ _081BAA36: cmp r0, 0 beq _081BAA70 lsls r0, r5, 1 - ldr r1, _081BAA8C + ldr r1, =0x04000120 adds r0, r1 ldrh r0, [r0] adds r4, r0, 0 @@ -904739,7 +873816,7 @@ _081BAA70: strb r5, [r7, 0x18] b _081BA88A .align 2, 0 -_081BAA8C: .4byte 0x04000120 + .pool _081BAA90: mov r1, r12 ldrb r0, [r1] @@ -904804,15 +873881,15 @@ sub_81BAAFC: @ 81BAAFC adds r2, r0, 0 lsls r1, 16 lsrs r1, 16 - ldr r3, _081BAB28 + ldr r3, =0x04000128 ldrh r0, [r3] movs r4, 0x8C ands r4, r0 cmp r4, 0x8 bne _081BAB34 - ldr r0, _081BAB2C + ldr r0, =0x0400012a strh r1, [r0] - ldr r1, _081BAB30 + ldr r1, =0x00002083 adds r0, r1, 0 strh r0, [r3] adds r1, r2, 0 @@ -904822,9 +873899,7 @@ sub_81BAAFC: @ 81BAAFC movs r0, 0 b _081BAB40 .align 2, 0 -_081BAB28: .4byte 0x04000128 -_081BAB2C: .4byte 0x0400012a -_081BAB30: .4byte 0x00002083 + .pool _081BAB34: adds r0, r2, 0 bl sub_81BA6D0 @@ -904888,7 +873963,7 @@ sub_81BAB6C: @ 81BAB6C ands r2, r0 subs r0, 0xF0 adds r1, r2, r0 - ldr r0, _081BABB0 + ldr r0, =0x0003ff00 cmp r1, r0 bls _081BABB4 _081BABA8: @@ -904896,7 +873971,7 @@ _081BABA8: bl sub_81BA6D0 b _081BAC28 .align 2, 0 -_081BABB0: .4byte 0x0003ff00 + .pool _081BABB4: adds r0, r6, r2 str r0, [r4, 0x24] @@ -904909,12 +873984,12 @@ _081BABB4: cmp r0, 0x8 bhi _081BAC14 lsls r0, 2 - ldr r1, _081BABD4 + ldr r1, =_081BABD8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BABD4: .4byte _081BABD8 + .pool .align 2, 0 _081BABD8: .4byte _081BABFC @@ -905003,7 +874078,7 @@ _081BAC70: movs r4, 0x3 ldrb r5, [r3, 0x1E] movs r6, 0x1 - ldr r1, _081BACCC + ldr r1, =0x04000126 _081BAC78: ldrh r0, [r1] adds r2, r0, 0 @@ -905050,10 +874125,10 @@ _081BACC2: bl sub_81BAAFC b _081BAD28 .align 2, 0 -_081BACCC: .4byte 0x04000126 + .pool _081BACD0: lsls r0, r4, 1 - ldr r1, _081BAD18 + ldr r1, =0x04000120 adds r0, r1 ldrh r0, [r0] adds r2, r0, 0 @@ -905089,7 +874164,7 @@ _081BACEC: str r1, [r3, 0x4] b _081BACC0 .align 2, 0 -_081BAD18: .4byte 0x04000120 + .pool _081BAD1C: adds r0, r3, 0 bl sub_81BA6D0 @@ -905124,13 +874199,13 @@ _081BAD42: sub_81BAD48: @ 81BAD48 push {r4,r5,lr} movs r2, 0 - ldr r3, _081BAD7C + ldr r3, =0x04000128 ldrh r1, [r3] movs r0, 0x80 ands r0, r1 cmp r0, 0 beq _081BAD6C - ldr r5, _081BAD80 + ldr r5, =0x0000795c movs r4, 0x80 _081BAD5C: adds r2, 0x1 @@ -905149,8 +874224,7 @@ _081BAD6C: pop {r0} bx r0 .align 2, 0 -_081BAD7C: .4byte 0x04000128 -_081BAD80: .4byte 0x0000795c + .pool thumb_func_end sub_81BAD48 thumb_func_start sub_81BAD84 @@ -905160,13 +874234,13 @@ sub_81BAD84: @ 81BAD84 lsls r6, 19 movs r2, 0 strh r2, [r6] - ldr r1, _081BADE0 + ldr r1, =0x04000010 strh r2, [r1] adds r1, 0x2 strh r2, [r1] adds r1, 0x3E strh r2, [r1] - ldr r5, _081BADE4 + ldr r5, =0x08617128 lsls r4, r0, 1 adds r4, r0 lsls r4, 2 @@ -905178,7 +874252,7 @@ sub_81BAD84: @ 81BAD84 adds r0, r5, 0x4 adds r0, r4, r0 ldr r0, [r0] - ldr r1, _081BADE8 + ldr r1, =0x0600f800 bl LZ77UnCompVram adds r5, 0x8 adds r4, r5 @@ -905189,7 +874263,7 @@ sub_81BAD84: @ 81BAD84 lsls r4, 1 adds r2, r4, 0 bl CpuSet - ldr r1, _081BADEC + ldr r1, =0x04000008 movs r2, 0xF8 lsls r2, 5 adds r0, r2, 0 @@ -905199,10 +874273,7 @@ sub_81BAD84: @ 81BAD84 pop {r0} bx r0 .align 2, 0 -_081BADE0: .4byte 0x04000010 -_081BADE4: .4byte 0x08617128 -_081BADE8: .4byte 0x0600f800 -_081BADEC: .4byte 0x04000008 + .pool thumb_func_end sub_81BAD84 thumb_func_start nullsub_77 @@ -905212,26 +874283,24 @@ nullsub_77: @ 81BADF0 thumb_func_start sub_81BADF4 sub_81BADF4: @ 81BADF4 - ldr r1, _081BAE04 - ldr r0, _081BAE08 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _081BAE0C + ldr r1, =bx_exec_buffer_A_ch0_tbl3 + 1 str r1, [r0] bx lr .align 2, 0 -_081BAE04: .4byte 0x03005d60 -_081BAE08: .4byte 0x02024064 -_081BAE0C: .4byte bx_exec_buffer_A_ch0_tbl3 + 1 + .pool thumb_func_end sub_81BADF4 thumb_func_start bx_exec_buffer_A_ch0_tbl3 bx_exec_buffer_A_ch0_tbl3: @ 81BAE10 push {lr} - ldr r2, _081BAE44 - ldr r1, _081BAE48 - ldr r0, _081BAE4C + ldr r2, =0x02024068 + ldr r1, =0x0832a328 + ldr r0, =0x02024064 ldrb r3, [r0] lsls r0, r3, 2 adds r0, r1 @@ -905240,13 +874309,13 @@ bx_exec_buffer_A_ch0_tbl3: @ 81BAE10 ands r1, r0 cmp r1, 0 beq _081BAE5C - ldr r0, _081BAE50 + ldr r0, =0x02023064 lsls r1, r3, 9 adds r1, r0 ldrb r0, [r1] cmp r0, 0x38 bhi _081BAE58 - ldr r0, _081BAE54 + ldr r0, =0x08617170 ldrb r1, [r1] lsls r1, 2 adds r1, r0 @@ -905254,11 +874323,7 @@ bx_exec_buffer_A_ch0_tbl3: @ 81BAE10 bl _call_via_r0 b _081BAE5C .align 2, 0 -_081BAE44: .4byte 0x02024068 -_081BAE48: .4byte 0x0832a328 -_081BAE4C: .4byte 0x02024064 -_081BAE50: .4byte 0x02023064 -_081BAE54: .4byte 0x08617170 + .pool _081BAE58: bl dp01_tbl3_exec_completed _081BAE5C: @@ -905269,9 +874334,9 @@ _081BAE5C: thumb_func_start sub_81BAE60 sub_81BAE60: @ 81BAE60 push {lr} - ldr r2, _081BAE88 - ldr r1, _081BAE8C - ldr r0, _081BAE90 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -905281,7 +874346,7 @@ sub_81BAE60: @ 81BAE60 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081BAE94 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _081BAE84 bl dp01_tbl3_exec_completed @@ -905289,18 +874354,15 @@ _081BAE84: pop {r0} bx r0 .align 2, 0 -_081BAE88: .4byte 0x02020630 -_081BAE8C: .4byte 0x020241e4 -_081BAE90: .4byte 0x02024064 -_081BAE94: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81BAE60 thumb_func_start sub_81BAE98 sub_81BAE98: @ 81BAE98 push {r4-r6,lr} - ldr r6, _081BAEF0 - ldr r5, _081BAEF4 - ldr r4, _081BAEF8 + ldr r6, =0x02020630 + ldr r5, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r5 ldrb r1, [r0] @@ -905311,7 +874373,7 @@ sub_81BAE98: @ 81BAE98 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _081BAEFC + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _081BAEE8 movs r0, 0 @@ -905338,18 +874400,15 @@ _081BAEE8: pop {r0} bx r0 .align 2, 0 -_081BAEF0: .4byte 0x02020630 -_081BAEF4: .4byte 0x020241e4 -_081BAEF8: .4byte 0x02024064 -_081BAEFC: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81BAE98 thumb_func_start sub_81BAF00 sub_81BAF00: @ 81BAF00 push {r4,lr} - ldr r4, _081BAF40 + ldr r4, =0x020244d0 ldr r1, [r4] - ldr r3, _081BAF44 + ldr r3, =0x02024064 ldrb r0, [r3] ldr r2, [r1, 0x4] lsls r1, r0, 1 @@ -905378,8 +874437,7 @@ _081BAF38: pop {r0} bx r0 .align 2, 0 -_081BAF40: .4byte 0x020244d0 -_081BAF44: .4byte 0x02024064 + .pool thumb_func_end sub_81BAF00 thumb_func_start sub_81BAF48 @@ -905394,16 +874452,16 @@ sub_81BAF48: @ 81BAF48 lsls r0, 24 cmp r0, 0 beq _081BAFA0 - ldr r0, _081BAF8C + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _081BAFA0 _081BAF6C: - ldr r2, _081BAF90 - ldr r1, _081BAF94 - ldr r0, _081BAF98 + ldr r2, =0x02020630 + ldr r1, =0x03005d70 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -905413,20 +874471,16 @@ _081BAF6C: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081BAF9C + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _081BAFD8 b _081BAFD6 .align 2, 0 -_081BAF8C: .4byte 0x02022fec -_081BAF90: .4byte 0x02020630 -_081BAF94: .4byte 0x03005d70 -_081BAF98: .4byte 0x02024064 -_081BAF9C: .4byte nullsub_12 + 1 + .pool _081BAFA0: - ldr r2, _081BB010 - ldr r5, _081BB014 - ldr r0, _081BB018 + ldr r2, =0x02020630 + ldr r5, =0x03005d70 + ldr r0, =0x02024064 ldrb r3, [r0] adds r0, r3, r5 ldrb r1, [r0] @@ -905437,7 +874491,7 @@ _081BAFA0: adds r4, 0x1C adds r0, r4 ldr r2, [r0] - ldr r0, _081BB01C + ldr r0, =nullsub_12 + 1 cmp r2, r0 bne _081BAFD8 movs r0, 0x2 @@ -905462,9 +874516,9 @@ _081BAFD8: _081BAFE4: cmp r6, 0 beq _081BB00A - ldr r0, _081BB020 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r3, _081BB018 + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -905473,24 +874527,18 @@ _081BAFE4: adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x9] - ldr r1, _081BB024 + ldr r1, =0x03005d60 ldrb r0, [r3] lsls r0, 2 adds r0, r1 - ldr r1, _081BB028 + ldr r1, =sub_81BAF00 + 1 str r1, [r0] _081BB00A: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081BB010: .4byte 0x02020630 -_081BB014: .4byte 0x03005d70 -_081BB018: .4byte 0x02024064 -_081BB01C: .4byte nullsub_12 + 1 -_081BB020: .4byte 0x020244d0 -_081BB024: .4byte 0x03005d60 -_081BB028: .4byte sub_81BAF00 + 1 + .pool thumb_func_end sub_81BAF48 thumb_func_start sub_81BB02C @@ -905500,10 +874548,10 @@ sub_81BB02C: @ 81BB02C mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _081BB1A4 + ldr r0, =0x020244d0 mov r12, r0 ldr r0, [r0] - ldr r7, _081BB1A8 + ldr r7, =0x02024064 ldrb r2, [r7] ldr r3, [r0, 0x4] lsls r0, r2, 1 @@ -905536,9 +874584,9 @@ _081BB058: beq _081BB07A b _081BB196 _081BB07A: - ldr r1, _081BB1AC + ldr r1, =0x02020630 mov r10, r1 - ldr r0, _081BB1B0 + ldr r0, =0x03005d7c mov r9, r0 adds r0, r2, r0 ldrb r1, [r0] @@ -905549,10 +874597,10 @@ _081BB07A: adds r5, 0x1C adds r0, r5 ldr r3, [r0] - ldr r0, _081BB1B4 + ldr r0, =nullsub_12 + 1 cmp r3, r0 bne _081BB196 - ldr r0, _081BB1B8 + ldr r0, =0x020241e4 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -905582,7 +874630,7 @@ _081BB07A: lsls r0, 24 cmp r0, 0 beq _081BB134 - ldr r0, _081BB1BC + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 @@ -905598,19 +874646,19 @@ _081BB07A: lsls r0, 2 add r0, r10 bl obj_delete_and_free_tiles - ldr r4, _081BB1C0 + ldr r4, =0x03005d70 ldrb r0, [r7] mov r1, r8 eors r1, r0 adds r0, r1, r4 ldrb r0, [r0] - ldr r2, _081BB1C4 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _081BB1C8 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -905625,28 +874673,28 @@ _081BB07A: ldrb r0, [r0] bl sub_80729D0 _081BB134: - ldr r1, _081BB1B0 - ldr r4, _081BB1A8 + ldr r1, =0x03005d7c + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081BB1AC + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles - ldr r5, _081BB1C0 + ldr r5, =0x03005d70 ldrb r1, [r4] adds r0, r1, r5 ldrb r0, [r0] - ldr r2, _081BB1C4 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _081BB1C8 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe @@ -905656,7 +874704,7 @@ _081BB134: adds r0, r5 ldrb r0, [r0] bl sub_80729D0 - ldr r0, _081BB1A4 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r2, [r0, 0x8] ldrb r1, [r2, 0x9] @@ -905664,11 +874712,11 @@ _081BB134: negs r0, r0 ands r0, r1 strb r0, [r2, 0x9] - ldr r1, _081BB1CC + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _081BB1D0 + ldr r1, =sub_81BAF48 + 1 str r1, [r0] _081BB196: pop {r3-r5} @@ -905679,26 +874727,15 @@ _081BB196: pop {r0} bx r0 .align 2, 0 -_081BB1A4: .4byte 0x020244d0 -_081BB1A8: .4byte 0x02024064 -_081BB1AC: .4byte 0x02020630 -_081BB1B0: .4byte 0x03005d7c -_081BB1B4: .4byte nullsub_12 + 1 -_081BB1B8: .4byte 0x020241e4 -_081BB1BC: .4byte 0x02022fec -_081BB1C0: .4byte 0x03005d70 -_081BB1C4: .4byte 0x0202406e -_081BB1C8: .4byte 0x020244ec -_081BB1CC: .4byte 0x03005d60 -_081BB1D0: .4byte sub_81BAF48 + 1 + .pool thumb_func_end sub_81BB02C thumb_func_start sub_81BB1D4 sub_81BB1D4: @ 81BB1D4 push {lr} - ldr r2, _081BB208 - ldr r1, _081BB20C - ldr r0, _081BB210 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] @@ -905721,17 +874758,15 @@ _081BB202: pop {r0} bx r0 .align 2, 0 -_081BB208: .4byte 0x02020630 -_081BB20C: .4byte 0x020241e4 -_081BB210: .4byte 0x02024064 + .pool thumb_func_end sub_81BB1D4 thumb_func_start bx_t3_healthbar_update bx_t3_healthbar_update: @ 81BB214 push {r4-r6,lr} - ldr r5, _081BB254 + ldr r5, =0x02024064 ldrb r0, [r5] - ldr r6, _081BB258 + ldr r6, =0x03005d70 adds r1, r0, r6 ldrb r1, [r1] movs r2, 0 @@ -905757,17 +874792,16 @@ bx_t3_healthbar_update: @ 81BB214 bl heathbar_draw_hp b _081BB276 .align 2, 0 -_081BB254: .4byte 0x02024064 -_081BB258: .4byte 0x03005d70 + .pool _081BB25C: - ldr r2, _081BB27C + ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _081BB280 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 bl dp01_tbl3_exec_completed @@ -905776,8 +874810,7 @@ _081BB276: pop {r0} bx r0 .align 2, 0 -_081BB27C: .4byte 0x0202406e -_081BB280: .4byte 0x020244ec + .pool thumb_func_end bx_t3_healthbar_update thumb_func_start sub_81BB284 @@ -905805,7 +874838,7 @@ sub_81BB29C: @ 81BB29C lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r1, _081BB39C + ldr r1, =0x03005e00 lsls r0, 2 add r0, r9 lsls r0, 3 @@ -905823,7 +874856,7 @@ sub_81BB29C: @ 81BB29C lsrs r0, 24 cmp r0, 0x1 beq _081BB2E2 - ldr r1, _081BB3A0 + ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 ldrh r0, [r0] @@ -905834,7 +874867,7 @@ _081BB2E2: movs r0, 0x64 mov r1, r10 muls r1, r0 - ldr r0, _081BB3A4 + ldr r0, =0x020244ec adds r6, r1, r0 adds r0, r6, 0 movs r1, 0xB @@ -905852,10 +874885,10 @@ _081BB2E2: movs r1, 0x19 bl pokemon_getattr str r0, [sp, 0x4] - ldr r3, _081BB3A8 + ldr r3, =0x0831f72c adds r4, 0x1 lsls r4, 2 - ldr r2, _081BB3AC + ldr r2, =0x083203cc lsls r1, r5, 3 subs r1, r5 lsls r1, 2 @@ -905886,7 +874919,7 @@ _081BB2E2: subs r2, r0 ldr r0, [sp, 0xC] subs r2, r0, r2 - ldr r4, _081BB3B0 + ldr r4, =0x02024064 ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -905900,7 +874933,7 @@ _081BB2E2: lsrs r0, 24 cmp r0, 0x1 bne _081BB3B8 - ldr r2, _081BB3A0 + ldr r2, =0x0202406e lsls r0, r7, 1 adds r0, r2 mov r1, r10 @@ -905915,48 +874948,40 @@ _081BB2E2: cmp r1, r0 bne _081BB3B8 _081BB396: - ldr r0, _081BB3B4 + ldr r0, =sub_81BB628 + 1 b _081BB3FA .align 2, 0 -_081BB39C: .4byte 0x03005e00 -_081BB3A0: .4byte 0x0202406e -_081BB3A4: .4byte 0x020244ec -_081BB3A8: .4byte 0x0831f72c -_081BB3AC: .4byte 0x083203cc -_081BB3B0: .4byte 0x02024064 -_081BB3B4: .4byte sub_81BB628 + 1 + .pool _081BB3B8: - ldr r0, _081BB3C8 + ldr r0, =0x03005e00 mov r2, r9 lsls r1, r2, 2 add r1, r9 lsls r1, 3 adds r1, r0 - ldr r0, _081BB3CC + ldr r0, =sub_81BB740 + 1 b _081BB3FC .align 2, 0 -_081BB3C8: .4byte 0x03005e00 -_081BB3CC: .4byte sub_81BB740 + 1 + .pool _081BB3D0: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r6, 0 movs r1, 0x19 bl pokemon_setattr - ldr r1, _081BB3F0 + ldr r1, =0x03005d60 ldr r3, [sp, 0x8] lsls r0, r3, 2 adds r0, r1 - ldr r1, _081BB3F4 + ldr r1, =sub_81BB284 + 1 str r1, [r0] mov r0, r9 bl remove_task b _081BB3FE .align 2, 0 -_081BB3F0: .4byte 0x03005d60 -_081BB3F4: .4byte sub_81BB284 + 1 + .pool _081BB3F8: - ldr r0, _081BB410 + ldr r0, =sub_81BB414 + 1 _081BB3FA: mov r1, r8 _081BB3FC: @@ -905971,7 +874996,7 @@ _081BB3FE: pop {r0} bx r0 .align 2, 0 -_081BB410: .4byte sub_81BB414 + 1 + .pool thumb_func_end sub_81BB29C thumb_func_start sub_81BB414 @@ -905984,7 +875009,7 @@ sub_81BB414: @ 81BB414 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r1, _081BB4CC + ldr r1, =0x03005e00 lsls r2, r0, 2 mov r8, r2 add r8, r0 @@ -906003,7 +875028,7 @@ sub_81BB414: @ 81BB414 movs r0, 0x64 adds r6, r1, 0 muls r6, r0 - ldr r0, _081BB4D0 + ldr r0, =0x020244ec adds r6, r0 adds r0, r6, 0 movs r1, 0x38 @@ -906021,9 +875046,9 @@ sub_81BB414: @ 81BB414 movs r1, 0x19 bl pokemon_getattr adds r3, r0, 0 - ldr r6, _081BB4D4 + ldr r6, =0x0831f72c lsls r1, r4, 2 - ldr r2, _081BB4D8 + ldr r2, =0x083203cc lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -906042,7 +875067,7 @@ sub_81BB414: @ 81BB414 adds r4, r6 ldr r2, [r4] subs r2, r1 - ldr r0, _081BB4DC + ldr r0, =0x03005d70 add r0, r10 ldrb r1, [r0] mov r0, r9 @@ -906052,7 +875077,7 @@ sub_81BB414: @ 81BB414 bl sub_807294C movs r0, 0x21 bl audio_play - ldr r0, _081BB4E0 + ldr r0, =sub_81BB4E4 + 1 mov r1, r8 str r0, [r1] add sp, 0x4 @@ -906064,12 +875089,7 @@ sub_81BB414: @ 81BB414 pop {r0} bx r0 .align 2, 0 -_081BB4CC: .4byte 0x03005e00 -_081BB4D0: .4byte 0x020244ec -_081BB4D4: .4byte 0x0831f72c -_081BB4D8: .4byte 0x083203cc -_081BB4DC: .4byte 0x03005d70 -_081BB4E0: .4byte sub_81BB4E4 + 1 + .pool thumb_func_end sub_81BB414 thumb_func_start sub_81BB4E4 @@ -906083,7 +875103,7 @@ sub_81BB4E4: @ 81BB4E4 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _081BB510 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -906097,14 +875117,14 @@ sub_81BB4E4: @ 81BB4E4 strh r0, [r6, 0x1C] b _081BB610 .align 2, 0 -_081BB510: .4byte 0x03005e00 + .pool _081BB514: ldrb r0, [r6, 0x8] mov r9, r0 ldrh r2, [r6, 0xA] mov r10, r2 ldrb r7, [r6, 0xC] - ldr r5, _081BB5DC + ldr r5, =0x03005d70 adds r5, r7, r5 ldrb r1, [r5] adds r0, r7, 0 @@ -906127,7 +875147,7 @@ _081BB514: movs r0, 0x64 mov r1, r9 muls r1, r0 - ldr r0, _081BB5E0 + ldr r0, =0x020244ec adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x38 @@ -906144,10 +875164,10 @@ _081BB514: bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - ldr r3, _081BB5E4 + ldr r3, =0x0831f72c adds r4, 0x1 lsls r4, 2 - ldr r2, _081BB5E8 + ldr r2, =0x083203cc lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -906178,7 +875198,7 @@ _081BB514: ldrh r0, [r0] subs r2, r0 subs r2, r4, r2 - ldr r4, _081BB5EC + ldr r4, =0x02024064 ldrb r5, [r4] strb r7, [r4] lsls r2, 16 @@ -906187,26 +875207,21 @@ _081BB514: movs r1, 0xB bl dp01_build_cmdbuf_x21_a_bb strb r5, [r4] - ldr r0, _081BB5F0 + ldr r0, =sub_81BB628 + 1 str r0, [r6] b _081BB610 .align 2, 0 -_081BB5DC: .4byte 0x03005d70 -_081BB5E0: .4byte 0x020244ec -_081BB5E4: .4byte 0x0831f72c -_081BB5E8: .4byte 0x083203cc -_081BB5EC: .4byte 0x02024064 -_081BB5F0: .4byte sub_81BB628 + 1 + .pool _081BB5F4: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r5, 0 movs r1, 0x19 bl pokemon_setattr - ldr r1, _081BB620 + ldr r1, =0x03005d60 lsls r0, r7, 2 adds r0, r1 - ldr r1, _081BB624 + ldr r1, =sub_81BB284 + 1 str r1, [r0] mov r0, r8 bl remove_task @@ -906220,8 +875235,7 @@ _081BB610: pop {r0} bx r0 .align 2, 0 -_081BB620: .4byte 0x03005d60 -_081BB624: .4byte sub_81BB284 + 1 + .pool thumb_func_end sub_81BB4E4 thumb_func_start sub_81BB628 @@ -906229,7 +875243,7 @@ sub_81BB628: @ 81BB628 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _081BB67C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -906241,7 +875255,7 @@ sub_81BB628: @ 81BB628 lsrs r0, 24 cmp r0, 0x1 bne _081BB65C - ldr r1, _081BB680 + ldr r1, =0x0202406e movs r0, 0x2 adds r2, r4, 0 eors r2, r0 @@ -906257,20 +875271,18 @@ _081BB65C: adds r2, r4, 0 movs r3, 0 bl move_anim_start_t4 - ldr r0, _081BB67C + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081BB684 + ldr r0, =sub_81BB688 + 1 str r0, [r1] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081BB67C: .4byte 0x03005e00 -_081BB680: .4byte 0x0202406e -_081BB684: .4byte sub_81BB688 + 1 + .pool thumb_func_end sub_81BB628 thumb_func_start sub_81BB688 @@ -906278,13 +875290,13 @@ sub_81BB688: @ 81BB688 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _081BB6F4 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r2, r0, r1 ldrb r5, [r2, 0xC] - ldr r0, _081BB6F8 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r5, 1 @@ -906300,7 +875312,7 @@ sub_81BB688: @ 81BB688 movs r0, 0x64 adds r1, r4, 0 muls r1, r0 - ldr r0, _081BB6FC + ldr r0, =0x020244ec adds r7, r1, r0 adds r0, r7, 0 movs r1, 0x38 @@ -906310,7 +875322,7 @@ sub_81BB688: @ 81BB688 lsrs r0, 24 cmp r0, 0x1 bne _081BB708 - ldr r1, _081BB700 + ldr r1, =0x0202406e movs r0, 0x2 adds r2, r5, 0 eors r2, r0 @@ -906319,7 +875331,7 @@ sub_81BB688: @ 81BB688 ldrh r0, [r0] cmp r4, r0 bne _081BB708 - ldr r0, _081BB704 + ldr r0, =0x03005d70 adds r0, r2, r0 ldrb r0, [r0] adds r1, r7, 0 @@ -906327,38 +875339,31 @@ sub_81BB688: @ 81BB688 bl healthbar_draw_field_maybe b _081BB71C .align 2, 0 -_081BB6F4: .4byte 0x03005e00 -_081BB6F8: .4byte 0x020244d0 -_081BB6FC: .4byte 0x020244ec -_081BB700: .4byte 0x0202406e -_081BB704: .4byte 0x03005d70 + .pool _081BB708: - ldr r0, _081BB730 + ldr r0, =0x03005d70 adds r0, r5, r0 ldrb r0, [r0] movs r1, 0x64 muls r1, r4 - ldr r2, _081BB734 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe _081BB71C: - ldr r0, _081BB738 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _081BB73C + ldr r0, =sub_81BB740 + 1 str r0, [r1] _081BB72A: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081BB730: .4byte 0x03005d70 -_081BB734: .4byte 0x020244ec -_081BB738: .4byte 0x03005e00 -_081BB73C: .4byte sub_81BB740 + 1 + .pool thumb_func_end sub_81BB688 thumb_func_start sub_81BB740 @@ -906367,7 +875372,7 @@ sub_81BB740: @ 81BB740 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _081BB77C + ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -906375,15 +875380,15 @@ sub_81BB740: @ 81BB740 ldrb r1, [r4, 0x8] movs r0, 0x64 muls r0, r1 - ldr r1, _081BB780 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 bl pokemon_getattr ldrb r0, [r4, 0xC] - ldr r1, _081BB784 + ldr r1, =0x03005d60 lsls r0, 2 adds r0, r1 - ldr r1, _081BB788 + ldr r1, =sub_81BB284 + 1 str r1, [r0] adds r0, r5, 0 bl remove_task @@ -906391,18 +875396,15 @@ sub_81BB740: @ 81BB740 pop {r0} bx r0 .align 2, 0 -_081BB77C: .4byte 0x03005e00 -_081BB780: .4byte 0x020244ec -_081BB784: .4byte 0x03005d60 -_081BB788: .4byte sub_81BB284 + 1 + .pool thumb_func_end sub_81BB740 thumb_func_start sub_81BB78C sub_81BB78C: @ 81BB78C push {r4-r6,lr} - ldr r6, _081BB810 - ldr r5, _081BB814 - ldr r4, _081BB818 + ldr r6, =0x02020630 + ldr r5, =0x020241e4 + ldr r4, =0x02024064 ldrb r2, [r4] adds r0, r2, r5 ldrb r1, [r0] @@ -906417,13 +875419,13 @@ sub_81BB78C: @ 81BB78C adds r1, r0 cmp r1, 0xA0 ble _081BB808 - ldr r1, _081BB81C + ldr r1, =0x0202406e lsls r0, r2, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081BB820 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -906449,7 +875451,7 @@ sub_81BB78C: @ 81BB78C lsls r0, 2 adds r0, r6 bl obj_delete_and_free_tiles - ldr r1, _081BB824 + ldr r1, =0x03005d70 ldrb r0, [r4] adds r0, r1 ldrb r0, [r0] @@ -906460,20 +875462,15 @@ _081BB808: pop {r0} bx r0 .align 2, 0 -_081BB810: .4byte 0x02020630 -_081BB814: .4byte 0x020241e4 -_081BB818: .4byte 0x02024064 -_081BB81C: .4byte 0x0202406e -_081BB820: .4byte 0x020244ec -_081BB824: .4byte 0x03005d70 + .pool thumb_func_end sub_81BB78C thumb_func_start sub_81BB828 sub_81BB828: @ 81BB828 push {r4-r6,lr} - ldr r0, _081BB884 + ldr r0, =0x020244d0 ldr r0, [r0] - ldr r6, _081BB888 + ldr r6, =0x02024064 ldrb r2, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -906485,13 +875482,13 @@ sub_81BB828: @ 81BB828 ands r0, r1 cmp r0, 0 bne _081BB87C - ldr r5, _081BB88C + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _081BB890 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -906502,7 +875499,7 @@ sub_81BB828: @ 81BB828 lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r1, _081BB894 + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -906513,11 +875510,7 @@ _081BB87C: pop {r0} bx r0 .align 2, 0 -_081BB884: .4byte 0x020244d0 -_081BB888: .4byte 0x02024064 -_081BB88C: .4byte 0x020241e4 -_081BB890: .4byte 0x02020630 -_081BB894: .4byte 0x03005d70 + .pool thumb_func_end sub_81BB828 thumb_func_start sub_81BB898 @@ -906537,12 +875530,12 @@ _081BB8AA: thumb_func_start bx_blink_t3 bx_blink_t3: @ 81BB8B0 push {r4,lr} - ldr r1, _081BB8EC - ldr r0, _081BB8F0 + ldr r1, =0x020241e4 + ldr r0, =0x02024064 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _081BB8F4 + ldr r2, =0x02020630 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -906560,15 +875553,12 @@ bx_blink_t3: @ 81BB8B0 subs r0, 0x5 ands r0, r1 strb r0, [r2] - ldr r0, _081BB8F8 + ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl3_exec_completed b _081BB926 .align 2, 0 -_081BB8EC: .4byte 0x020241e4 -_081BB8F0: .4byte 0x02024064 -_081BB8F4: .4byte 0x02020630 -_081BB8F8: .4byte 0x020244b9 + .pool _081BB8FC: ldrh r0, [r4, 0x30] movs r1, 0x3 @@ -906601,9 +875591,9 @@ _081BB926: thumb_func_start sub_81BB92C sub_81BB92C: @ 81BB92C push {r4,lr} - ldr r2, _081BB984 - ldr r0, _081BB988 - ldr r4, _081BB98C + ldr r2, =0x02020630 + ldr r0, =0x03005d70 + ldr r4, =0x02024064 ldrb r3, [r4] adds r0, r3, r0 ldrb r1, [r0] @@ -906613,12 +875603,12 @@ sub_81BB92C: @ 81BB92C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081BB990 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _081BB97E adds r0, r3, 0 bl sub_805E408 - ldr r0, _081BB994 + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r2, [r4] ldr r1, [r0] @@ -906634,32 +875624,26 @@ sub_81BB92C: @ 81BB92C movs r3, 0x6 bl move_anim_start_t4 _081BB972: - ldr r0, _081BB998 + ldr r0, =0x03005d60 ldrb r1, [r4] lsls r1, 2 adds r1, r0 - ldr r0, _081BB99C + ldr r0, =dp01t_35_3_free_vram + 1 str r0, [r1] _081BB97E: pop {r4} pop {r0} bx r0 .align 2, 0 -_081BB984: .4byte 0x02020630 -_081BB988: .4byte 0x03005d70 -_081BB98C: .4byte 0x02024064 -_081BB990: .4byte nullsub_12 + 1 -_081BB994: .4byte 0x020244d0 -_081BB998: .4byte 0x03005d60 -_081BB99C: .4byte dp01t_35_3_free_vram + 1 + .pool thumb_func_end sub_81BB92C thumb_func_start dp01t_35_3_free_vram dp01t_35_3_free_vram: @ 81BB9A0 push {lr} - ldr r0, _081BB9E0 + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _081BB9E4 + ldr r0, =0x02024064 ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -906671,8 +875655,8 @@ dp01t_35_3_free_vram: @ 81BB9A0 ands r0, r1 cmp r0, 0 bne _081BB9DC - ldr r2, _081BB9E8 - ldr r0, _081BB9EC + ldr r2, =0x02020630 + ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 4 @@ -906681,7 +875665,7 @@ dp01t_35_3_free_vram: @ 81BB9A0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081BB9F0 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _081BB9DC bl dp01_tbl3_exec_completed @@ -906689,11 +875673,7 @@ _081BB9DC: pop {r0} bx r0 .align 2, 0 -_081BB9E0: .4byte 0x020244d0 -_081BB9E4: .4byte 0x02024064 -_081BB9E8: .4byte 0x02020630 -_081BB9EC: .4byte 0x020241e4 -_081BB9F0: .4byte nullsub_12 + 1 + .pool thumb_func_end dp01t_35_3_free_vram thumb_func_start sub_81BB9F4 @@ -906701,9 +875681,9 @@ sub_81BB9F4: @ 81BB9F4 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r3, _081BBABC + ldr r3, =0x020244d0 ldr r0, [r3] - ldr r7, _081BBAC0 + ldr r7, =0x02024064 ldrb r1, [r7] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -906731,15 +875711,15 @@ sub_81BB9F4: @ 81BB9F4 negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] - ldr r4, _081BBAC4 + ldr r4, =0x000027f9 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl gpu_pal_free_tag - ldr r0, _081BBAC8 + ldr r0, =c3_0802FDF4 + 1 movs r1, 0xA bl AddTask - ldr r0, _081BBACC + ldr r0, =0x0202406e mov r8, r0 ldrb r1, [r7] lsls r0, r1, 1 @@ -906747,21 +875727,21 @@ sub_81BB9F4: @ 81BB9F4 ldrh r0, [r0] movs r6, 0x64 muls r0, r6 - ldr r5, _081BBAD0 + ldr r5, =0x020244ec adds r0, r5 bl sub_805E990 - ldr r1, _081BBAD4 + ldr r1, =0x020241e4 ldrb r0, [r7] adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081BBAD8 + ldr r1, =0x02020630 adds r0, r1 movs r1, 0 bl obj_anim_image_start - ldr r4, _081BBADC + ldr r4, =0x03005d70 ldrb r1, [r7] adds r0, r1, r4 ldrb r0, [r0] @@ -906778,11 +875758,11 @@ sub_81BB9F4: @ 81BB9F4 adds r0, r4 ldrb r0, [r0] bl sub_80729D0 - ldr r1, _081BBAE0 + ldr r1, =0x03005d60 ldrb r0, [r7] lsls r0, 2 adds r0, r1 - ldr r1, _081BBAE4 + ldr r1, =sub_81BB92C + 1 str r1, [r0] _081BBAB0: pop {r3} @@ -906791,25 +875771,15 @@ _081BBAB0: pop {r0} bx r0 .align 2, 0 -_081BBABC: .4byte 0x020244d0 -_081BBAC0: .4byte 0x02024064 -_081BBAC4: .4byte 0x000027f9 -_081BBAC8: .4byte c3_0802FDF4 + 1 -_081BBACC: .4byte 0x0202406e -_081BBAD0: .4byte 0x020244ec -_081BBAD4: .4byte 0x020241e4 -_081BBAD8: .4byte 0x02020630 -_081BBADC: .4byte 0x03005d70 -_081BBAE0: .4byte 0x03005d60 -_081BBAE4: .4byte sub_81BB92C + 1 + .pool thumb_func_end sub_81BB9F4 thumb_func_start sub_81BBAE8 sub_81BBAE8: @ 81BBAE8 push {r4-r6,lr} - ldr r6, _081BBB68 + ldr r6, =0x020244d0 ldr r0, [r6] - ldr r4, _081BBB6C + ldr r4, =0x02024064 ldrb r2, [r4] ldr r1, [r0, 0x4] lsls r3, r2, 1 @@ -906821,18 +875791,18 @@ sub_81BBAE8: @ 81BBAE8 ands r0, r1 cmp r0, 0 bne _081BBB1A - ldr r0, _081BBB70 + ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] movs r0, 0x64 muls r1, r0 - ldr r0, _081BBB74 + ldr r0, =0x020244ec adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 _081BBB1A: - ldr r5, _081BBB78 - ldr r0, _081BBB7C + ldr r5, =0x02020630 + ldr r0, =0x03005d7c ldrb r2, [r4] adds r0, r2, r0 ldrb r1, [r0] @@ -906843,7 +875813,7 @@ _081BBB1A: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _081BBB80 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _081BBB60 ldr r0, [r6] @@ -906859,40 +875829,32 @@ _081BBB1A: bne _081BBB60 adds r0, r3, r5 bl obj_delete_and_free_tiles - ldr r1, _081BBB84 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _081BBB88 + ldr r1, =sub_81BB9F4 + 1 str r1, [r0] _081BBB60: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081BBB68: .4byte 0x020244d0 -_081BBB6C: .4byte 0x02024064 -_081BBB70: .4byte 0x0202406e -_081BBB74: .4byte 0x020244ec -_081BBB78: .4byte 0x02020630 -_081BBB7C: .4byte 0x03005d7c -_081BBB80: .4byte nullsub_12 + 1 -_081BBB84: .4byte 0x03005d60 -_081BBB88: .4byte sub_81BB9F4 + 1 + .pool thumb_func_end sub_81BBAE8 thumb_func_start dp01_tbl3_exec_completed dp01_tbl3_exec_completed: @ 81BBB8C push {r4,lr} sub sp, 0x4 - ldr r1, _081BBBCC - ldr r4, _081BBBD0 + ldr r1, =0x03005d60 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _081BBBD4 + ldr r1, =bx_exec_buffer_A_ch0_tbl3 + 1 str r1, [r0] - ldr r0, _081BBBD8 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x2 ands r0, r1 @@ -906905,7 +875867,7 @@ dp01_tbl3_exec_completed: @ 81BBB8C movs r1, 0x4 mov r2, sp bl dp01_prepare_buffer_wireless_probably - ldr r1, _081BBBDC + ldr r1, =0x02023064 ldrb r0, [r4] lsls r0, 9 adds r0, r1 @@ -906913,14 +875875,10 @@ dp01_tbl3_exec_completed: @ 81BBB8C strb r1, [r0] b _081BBBF2 .align 2, 0 -_081BBBCC: .4byte 0x03005d60 -_081BBBD0: .4byte 0x02024064 -_081BBBD4: .4byte bx_exec_buffer_A_ch0_tbl3 + 1 -_081BBBD8: .4byte 0x02022fec -_081BBBDC: .4byte 0x02023064 + .pool _081BBBE0: - ldr r2, _081BBBFC - ldr r1, _081BBC00 + ldr r2, =0x02024068 + ldr r1, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -906934,16 +875892,15 @@ _081BBBF2: pop {r0} bx r0 .align 2, 0 -_081BBBFC: .4byte 0x02024068 -_081BBC00: .4byte 0x0832a328 + .pool thumb_func_end dp01_tbl3_exec_completed thumb_func_start sub_81BBC04 sub_81BBC04: @ 81BBC04 push {lr} - ldr r0, _081BBC2C + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _081BBC30 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -906960,16 +875917,15 @@ _081BBC26: pop {r0} bx r0 .align 2, 0 -_081BBC2C: .4byte 0x020244d0 -_081BBC30: .4byte 0x02024064 + .pool thumb_func_end sub_81BBC04 thumb_func_start bx_80E8A6C bx_80E8A6C: @ 81BBC34 push {lr} - ldr r0, _081BBC5C + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _081BBC60 + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -906986,8 +875942,7 @@ _081BBC56: pop {r0} bx r0 .align 2, 0 -_081BBC5C: .4byte 0x020244d0 -_081BBC60: .4byte 0x02024064 + .pool thumb_func_end bx_80E8A6C thumb_func_start dp01t_00_3_getattr @@ -906995,8 +875950,8 @@ dp01t_00_3_getattr: @ 81BBC64 push {r4-r6,lr} sub sp, 0x100 movs r6, 0 - ldr r1, _081BBC90 - ldr r0, _081BBC94 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -907004,7 +875959,7 @@ dp01t_00_3_getattr: @ 81BBC64 ldrb r0, [r1] cmp r0, 0 bne _081BBC9C - ldr r0, _081BBC98 + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] @@ -907013,9 +875968,7 @@ dp01t_00_3_getattr: @ 81BBC64 adds r6, r0, 0 b _081BBCBE .align 2, 0 -_081BBC90: .4byte 0x02023064 -_081BBC94: .4byte 0x02024064 -_081BBC98: .4byte 0x0202406e + .pool _081BBC9C: ldrb r4, [r1] movs r5, 0 @@ -907060,8 +876013,8 @@ dp01_getattr_by_ch1_for_player_pokemon: @ 81BBCD8 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - ldr r2, _081BBD0C - ldr r3, _081BBD10 + ldr r2, =0x02023064 + ldr r3, =0x02024064 ldrb r0, [r3] lsls r0, 9 adds r1, r2, 0x1 @@ -907072,14 +876025,12 @@ dp01_getattr_by_ch1_for_player_pokemon: @ 81BBCD8 bl _081BC46E _081BBD02: lsls r0, 2 - ldr r1, _081BBD14 + ldr r1, =_081BBD18 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BBD0C: .4byte 0x02023064 -_081BBD10: .4byte 0x02024064 -_081BBD14: .4byte _081BBD18 + .pool .align 2, 0 _081BBD18: .4byte _081BBE08 @@ -907146,7 +876097,7 @@ _081BBE08: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081BC01C + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -907199,7 +876150,7 @@ _081BBE54: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081BC01C + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -907235,7 +876186,7 @@ _081BBE54: ands r0, r6 lsls r0, 5 ldrh r2, [r3, 0x14] - ldr r1, _081BC020 + ldr r1, =0xfffffc1f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x14] @@ -907258,7 +876209,7 @@ _081BBE54: ands r1, r0 lsls r1, 15 ldr r0, [sp, 0x14] - ldr r2, _081BC024 + ldr r2, =0xfff07fff ands r0, r2 orrs r0, r1 str r0, [sp, 0x14] @@ -907269,7 +876220,7 @@ _081BBE54: ands r0, r6 lsls r0, 4 ldrh r2, [r3, 0x16] - ldr r1, _081BC028 + ldr r1, =0xfffffe0f ands r1, r2 orrs r1, r0 strh r1, [r3, 0x16] @@ -907383,28 +876334,25 @@ _081BC00C: bls _081BC00C b _081BC46E .align 2, 0 -_081BC01C: .4byte 0x020244ec -_081BC020: .4byte 0xfffffc1f -_081BC024: .4byte 0xfff07fff -_081BC028: .4byte 0xfffffe0f + .pool _081BC02C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC038 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB b _081BC3A6 .align 2, 0 -_081BC038: .4byte 0x020244ec + .pool _081BC03C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC048 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC b _081BC3A6 .align 2, 0 -_081BC048: .4byte 0x020244ec + .pool _081BC04C: movs r6, 0 add r2, sp, 0x58 @@ -907414,7 +876362,7 @@ _081BC04C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081BC0B0 + ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 _081BC062: @@ -907438,7 +876386,7 @@ _081BC062: ble _081BC062 movs r0, 0x64 muls r0, r5 - ldr r1, _081BC0B0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -907456,11 +876404,11 @@ _081BC0A0: bls _081BC0A0 b _081BC46E .align 2, 0 -_081BC0B0: .4byte 0x020244ec + .pool _081BC0B4: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC0CC + ldr r1, =0x020244ec adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -907470,13 +876418,13 @@ _081BC0B4: adds r1, 0x9 b _081BC3A6 .align 2, 0 -_081BC0CC: .4byte 0x020244ec + .pool _081BC0D0: movs r6, 0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r2, _081BC108 + ldr r2, =0x020244ec mov r8, r2 _081BC0DC: adds r1, r6, 0 @@ -907491,7 +876439,7 @@ _081BC0DC: ble _081BC0DC movs r0, 0x64 muls r0, r5 - ldr r1, _081BC108 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 bl pokemon_getattr @@ -907500,11 +876448,11 @@ _081BC0DC: adds r6, 0x1 b _081BC46E .align 2, 0 -_081BC108: .4byte 0x020244ec + .pool _081BC10C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC124 + ldr r1, =0x020244ec adds r0, r1 ldrb r1, [r3] lsls r1, 9 @@ -907514,20 +876462,20 @@ _081BC10C: adds r1, 0x8 b _081BC466 .align 2, 0 -_081BC124: .4byte 0x020244ec + .pool _081BC128: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC134 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 b _081BC142 .align 2, 0 -_081BC134: .4byte 0x020244ec + .pool _081BC138: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC164 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x19 _081BC142: @@ -907547,120 +876495,120 @@ _081BC142: movs r6, 0x3 b _081BC46E .align 2, 0 -_081BC164: .4byte 0x020244ec + .pool _081BC168: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC174 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A b _081BC466 .align 2, 0 -_081BC174: .4byte 0x020244ec + .pool _081BC178: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC184 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B b _081BC466 .align 2, 0 -_081BC184: .4byte 0x020244ec + .pool _081BC188: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC194 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C b _081BC466 .align 2, 0 -_081BC194: .4byte 0x020244ec + .pool _081BC198: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC1A4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D b _081BC466 .align 2, 0 -_081BC1A4: .4byte 0x020244ec + .pool _081BC1A8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC1B4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E b _081BC466 .align 2, 0 -_081BC1B4: .4byte 0x020244ec + .pool _081BC1B8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC1C4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F b _081BC466 .align 2, 0 -_081BC1C4: .4byte 0x020244ec + .pool _081BC1C8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC1D4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 b _081BC466 .align 2, 0 -_081BC1D4: .4byte 0x020244ec + .pool _081BC1D8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC1E4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 b _081BC466 .align 2, 0 -_081BC1E4: .4byte 0x020244ec + .pool _081BC1E8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC1F4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 b _081BC466 .align 2, 0 -_081BC1F4: .4byte 0x020244ec + .pool _081BC1F8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC204 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 b _081BC466 .align 2, 0 -_081BC204: .4byte 0x020244ec + .pool _081BC208: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC214 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 b _081BC466 .align 2, 0 -_081BC214: .4byte 0x020244ec + .pool _081BC218: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC224 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 b _081BC466 .align 2, 0 -_081BC224: .4byte 0x020244ec + .pool _081BC228: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081BC274 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x27 @@ -907689,83 +876637,83 @@ _081BC228: movs r6, 0x6 b _081BC46E .align 2, 0 -_081BC274: .4byte 0x020244ec + .pool _081BC278: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC284 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 b _081BC466 .align 2, 0 -_081BC284: .4byte 0x020244ec + .pool _081BC288: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC294 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 b _081BC466 .align 2, 0 -_081BC294: .4byte 0x020244ec + .pool _081BC298: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC2A4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 b _081BC466 .align 2, 0 -_081BC2A4: .4byte 0x020244ec + .pool _081BC2A8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC2B4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A b _081BC466 .align 2, 0 -_081BC2B4: .4byte 0x020244ec + .pool _081BC2B8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC2C4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B b _081BC466 .align 2, 0 -_081BC2C4: .4byte 0x020244ec + .pool _081BC2C8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC2D4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C b _081BC466 .align 2, 0 -_081BC2D4: .4byte 0x020244ec + .pool _081BC2D8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC2E4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0 b _081BC302 .align 2, 0 -_081BC2E4: .4byte 0x020244ec + .pool _081BC2E8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC2F4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 b _081BC3A6 .align 2, 0 -_081BC2F4: .4byte 0x020244ec + .pool _081BC2F8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC328 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x37 _081BC302: @@ -907787,74 +876735,74 @@ _081BC302: movs r6, 0x4 b _081BC46E .align 2, 0 -_081BC328: .4byte 0x020244ec + .pool _081BC32C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC338 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 b _081BC466 .align 2, 0 -_081BC338: .4byte 0x020244ec + .pool _081BC33C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC348 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 b _081BC3A6 .align 2, 0 -_081BC348: .4byte 0x020244ec + .pool _081BC34C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC358 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A b _081BC3A6 .align 2, 0 -_081BC358: .4byte 0x020244ec + .pool _081BC35C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC368 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B b _081BC3A6 .align 2, 0 -_081BC368: .4byte 0x020244ec + .pool _081BC36C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC378 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C b _081BC3A6 .align 2, 0 -_081BC378: .4byte 0x020244ec + .pool _081BC37C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC388 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D b _081BC3A6 .align 2, 0 -_081BC388: .4byte 0x020244ec + .pool _081BC38C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC398 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E b _081BC3A6 .align 2, 0 -_081BC398: .4byte 0x020244ec + .pool _081BC39C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC3B8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3F _081BC3A6: @@ -907867,101 +876815,101 @@ _081BC3A6: movs r6, 0x2 b _081BC46E .align 2, 0 -_081BC3B8: .4byte 0x020244ec + .pool _081BC3BC: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC3C8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 b _081BC466 .align 2, 0 -_081BC3C8: .4byte 0x020244ec + .pool _081BC3CC: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC3D8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 b _081BC466 .align 2, 0 -_081BC3D8: .4byte 0x020244ec + .pool _081BC3DC: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC3E8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 b _081BC466 .align 2, 0 -_081BC3E8: .4byte 0x020244ec + .pool _081BC3EC: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC3F8 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 b _081BC466 .align 2, 0 -_081BC3F8: .4byte 0x020244ec + .pool _081BC3FC: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC408 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F b _081BC466 .align 2, 0 -_081BC408: .4byte 0x020244ec + .pool _081BC40C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC418 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 b _081BC466 .align 2, 0 -_081BC418: .4byte 0x020244ec + .pool _081BC41C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC428 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 b _081BC466 .align 2, 0 -_081BC428: .4byte 0x020244ec + .pool _081BC42C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC438 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 b _081BC466 .align 2, 0 -_081BC438: .4byte 0x020244ec + .pool _081BC43C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC448 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 b _081BC466 .align 2, 0 -_081BC448: .4byte 0x020244ec + .pool _081BC44C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC458 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 b _081BC466 .align 2, 0 -_081BC458: .4byte 0x020244ec + .pool _081BC45C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC480 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 _081BC466: @@ -907979,7 +876927,7 @@ _081BC46E: pop {r1} bx r1 .align 2, 0 -_081BC480: .4byte 0x020244ec + .pool thumb_func_end dp01_getattr_by_ch1_for_player_pokemon thumb_func_start sub_81BC484 @@ -907993,8 +876941,8 @@ sub_81BC484: @ 81BC484 thumb_func_start sub_81BC490 sub_81BC490: @ 81BC490 push {r4,r5,lr} - ldr r1, _081BC4B4 - ldr r0, _081BC4B8 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x2 @@ -908002,16 +876950,14 @@ sub_81BC490: @ 81BC490 ldrb r0, [r1] cmp r0, 0 bne _081BC4C0 - ldr r0, _081BC4BC + ldr r0, =0x0202406e lsls r1, r2, 1 adds r1, r0 ldrb r0, [r1] bl sub_81BC4E8 b _081BC4DE .align 2, 0 -_081BC4B4: .4byte 0x02023064 -_081BC4B8: .4byte 0x02024064 -_081BC4BC: .4byte 0x0202406e + .pool _081BC4C0: ldrb r4, [r1] movs r5, 0 @@ -908046,10 +876992,10 @@ sub_81BC4E8: @ 81BC4E8 sub sp, 0x34 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081BC520 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 - ldr r2, _081BC524 + ldr r2, =0x02023067 adds r3, r0, r2 adds r6, r3, 0 subs r1, r2, 0x2 @@ -908061,14 +877007,12 @@ sub_81BC4E8: @ 81BC4E8 bl _081BCEAE _081BC514: lsls r0, 2 - ldr r1, _081BC528 + ldr r1, =_081BC52C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BC520: .4byte 0x02024064 -_081BC524: .4byte 0x02023067 -_081BC528: .4byte _081BC52C + .pool .align 2, 0 _081BC52C: .4byte _081BC61C @@ -908135,7 +877079,7 @@ _081BC61C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081BC7B0 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -908202,7 +877146,7 @@ _081BC682: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081BC7B0 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x15 @@ -908312,13 +877256,13 @@ _081BC682: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC7B0: .4byte 0x020244ec + .pool _081BC7B4: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC7CC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BC7D0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908326,14 +877270,13 @@ _081BC7B4: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC7CC: .4byte 0x020244ec -_081BC7D0: .4byte 0x02024064 + .pool _081BC7D4: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC7EC + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BC7F0 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908341,8 +877284,7 @@ _081BC7D4: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC7EC: .4byte 0x020244ec -_081BC7F0: .4byte 0x02024064 + .pool _081BC7F4: movs r0, 0 mov r8, r0 @@ -908352,7 +877294,7 @@ _081BC7F4: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081BC848 + ldr r0, =0x020244ec adds r7, r1, r0 adds r6, r3, 0 adds r6, 0x8 @@ -908377,21 +877319,21 @@ _081BC80E: ble _081BC80E movs r0, 0x64 muls r0, r5 - ldr r1, _081BC848 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x15 mov r2, r9 bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC848: .4byte 0x020244ec + .pool _081BC84C: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC868 + ldr r1, =0x020244ec adds r0, r1 - ldr r3, _081BC86C - ldr r1, _081BC870 + ldr r3, =0x02023064 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -908400,16 +877342,14 @@ _081BC84C: adds r1, 0x9 b _081BC8F0 .align 2, 0 -_081BC868: .4byte 0x020244ec -_081BC86C: .4byte 0x02023064 -_081BC870: .4byte 0x02024064 + .pool _081BC874: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081BC8D0 + ldr r0, =0x020244ec adds r4, r0 - ldr r5, _081BC8D4 + ldr r5, =0x02024064 ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -908446,15 +877386,14 @@ _081BC874: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC8D0: .4byte 0x020244ec -_081BC8D4: .4byte 0x02024064 + .pool _081BC8D8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC8FC + ldr r1, =0x020244ec adds r0, r1 - ldr r3, _081BC900 - ldr r1, _081BC904 + ldr r3, =0x02023064 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r1, r3, 0x1 @@ -908467,15 +877406,13 @@ _081BC8F0: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC8FC: .4byte 0x020244ec -_081BC900: .4byte 0x02023064 -_081BC904: .4byte 0x02024064 + .pool _081BC908: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC920 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BC924 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908483,14 +877420,13 @@ _081BC908: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC920: .4byte 0x020244ec -_081BC924: .4byte 0x02024064 + .pool _081BC928: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC940 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BC944 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908498,14 +877434,13 @@ _081BC928: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC940: .4byte 0x020244ec -_081BC944: .4byte 0x02024064 + .pool _081BC948: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC960 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BC964 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908513,14 +877448,13 @@ _081BC948: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC960: .4byte 0x020244ec -_081BC964: .4byte 0x02024064 + .pool _081BC968: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC980 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BC984 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908528,14 +877462,13 @@ _081BC968: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC980: .4byte 0x020244ec -_081BC984: .4byte 0x02024064 + .pool _081BC988: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC9A0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BC9A4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908543,14 +877476,13 @@ _081BC988: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC9A0: .4byte 0x020244ec -_081BC9A4: .4byte 0x02024064 + .pool _081BC9A8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC9C0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BC9C4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908558,14 +877490,13 @@ _081BC9A8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC9C0: .4byte 0x020244ec -_081BC9C4: .4byte 0x02024064 + .pool _081BC9C8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BC9E0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BC9E4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908573,14 +877504,13 @@ _081BC9C8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BC9E0: .4byte 0x020244ec -_081BC9E4: .4byte 0x02024064 + .pool _081BC9E8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCA00 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCA04 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908588,14 +877518,13 @@ _081BC9E8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCA00: .4byte 0x020244ec -_081BCA04: .4byte 0x02024064 + .pool _081BCA08: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCA20 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCA24 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908603,14 +877532,13 @@ _081BCA08: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCA20: .4byte 0x020244ec -_081BCA24: .4byte 0x02024064 + .pool _081BCA28: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCA40 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCA44 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908618,14 +877546,13 @@ _081BCA28: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCA40: .4byte 0x020244ec -_081BCA44: .4byte 0x02024064 + .pool _081BCA48: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCA60 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCA64 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908633,14 +877560,13 @@ _081BCA48: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCA60: .4byte 0x020244ec -_081BCA64: .4byte 0x02024064 + .pool _081BCA68: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCA80 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCA84 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908648,14 +877574,13 @@ _081BCA68: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCA80: .4byte 0x020244ec -_081BCA84: .4byte 0x02024064 + .pool _081BCA88: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCAA0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCAA4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908663,14 +877588,13 @@ _081BCA88: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCAA0: .4byte 0x020244ec -_081BCAA4: .4byte 0x02024064 + .pool _081BCAA8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCAC0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCAC4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908678,15 +877602,14 @@ _081BCAA8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCAC0: .4byte 0x020244ec -_081BCAC4: .4byte 0x02024064 + .pool _081BCAC8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081BCB30 + ldr r0, =0x020244ec adds r4, r0 - ldr r5, _081BCB34 + ldr r5, =0x02024064 ldrb r2, [r5] lsls r2, 9 adds r2, r7 @@ -908728,14 +877651,13 @@ _081BCAC8: adds r0, r4, 0 b _081BCBE8 .align 2, 0 -_081BCB30: .4byte 0x020244ec -_081BCB34: .4byte 0x02024064 + .pool _081BCB38: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCB50 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCB54 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908743,14 +877665,13 @@ _081BCB38: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCB50: .4byte 0x020244ec -_081BCB54: .4byte 0x02024064 + .pool _081BCB58: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCB70 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCB74 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908758,14 +877679,13 @@ _081BCB58: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCB70: .4byte 0x020244ec -_081BCB74: .4byte 0x02024064 + .pool _081BCB78: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCB90 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCB94 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908773,14 +877693,13 @@ _081BCB78: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCB90: .4byte 0x020244ec -_081BCB94: .4byte 0x02024064 + .pool _081BCB98: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCBB0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCBB4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908788,14 +877707,13 @@ _081BCB98: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCBB0: .4byte 0x020244ec -_081BCBB4: .4byte 0x02024064 + .pool _081BCBB8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCBD0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCBD4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908803,14 +877721,13 @@ _081BCBB8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCBD0: .4byte 0x020244ec -_081BCBD4: .4byte 0x02024064 + .pool _081BCBD8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCBF0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCBF4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908819,14 +877736,13 @@ _081BCBE8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCBF0: .4byte 0x020244ec -_081BCBF4: .4byte 0x02024064 + .pool _081BCBF8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCC10 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCC14 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908834,14 +877750,13 @@ _081BCBF8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCC10: .4byte 0x020244ec -_081BCC14: .4byte 0x02024064 + .pool _081BCC18: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCC30 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCC34 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908849,14 +877764,13 @@ _081BCC18: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCC30: .4byte 0x020244ec -_081BCC34: .4byte 0x02024064 + .pool _081BCC38: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCC50 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCC54 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908864,14 +877778,13 @@ _081BCC38: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCC50: .4byte 0x020244ec -_081BCC54: .4byte 0x02024064 + .pool _081BCC58: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCC70 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCC74 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908879,14 +877792,13 @@ _081BCC58: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCC70: .4byte 0x020244ec -_081BCC74: .4byte 0x02024064 + .pool _081BCC78: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCC90 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCC94 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908894,14 +877806,13 @@ _081BCC78: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCC90: .4byte 0x020244ec -_081BCC94: .4byte 0x02024064 + .pool _081BCC98: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCCB0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCCB4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908909,14 +877820,13 @@ _081BCC98: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCCB0: .4byte 0x020244ec -_081BCCB4: .4byte 0x02024064 + .pool _081BCCB8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCCD0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCCD4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908924,14 +877834,13 @@ _081BCCB8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCCD0: .4byte 0x020244ec -_081BCCD4: .4byte 0x02024064 + .pool _081BCCD8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCCF0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCCF4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908939,14 +877848,13 @@ _081BCCD8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCCF0: .4byte 0x020244ec -_081BCCF4: .4byte 0x02024064 + .pool _081BCCF8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCD10 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCD14 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908954,14 +877862,13 @@ _081BCCF8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCD10: .4byte 0x020244ec -_081BCD14: .4byte 0x02024064 + .pool _081BCD18: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCD30 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCD34 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908969,14 +877876,13 @@ _081BCD18: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCD30: .4byte 0x020244ec -_081BCD34: .4byte 0x02024064 + .pool _081BCD38: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCD50 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCD54 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908984,14 +877890,13 @@ _081BCD38: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCD50: .4byte 0x020244ec -_081BCD54: .4byte 0x02024064 + .pool _081BCD58: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCD70 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCD74 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -908999,14 +877904,13 @@ _081BCD58: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCD70: .4byte 0x020244ec -_081BCD74: .4byte 0x02024064 + .pool _081BCD78: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCD90 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCD94 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -909014,14 +877918,13 @@ _081BCD78: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCD90: .4byte 0x020244ec -_081BCD94: .4byte 0x02024064 + .pool _081BCD98: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCDB0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCDB4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -909029,14 +877932,13 @@ _081BCD98: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCDB0: .4byte 0x020244ec -_081BCDB4: .4byte 0x02024064 + .pool _081BCDB8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCDD0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCDD4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -909044,14 +877946,13 @@ _081BCDB8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCDD0: .4byte 0x020244ec -_081BCDD4: .4byte 0x02024064 + .pool _081BCDD8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCDF0 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCDF4 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -909059,14 +877960,13 @@ _081BCDD8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCDF0: .4byte 0x020244ec -_081BCDF4: .4byte 0x02024064 + .pool _081BCDF8: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCE10 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCE14 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -909074,14 +877974,13 @@ _081BCDF8: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCE10: .4byte 0x020244ec -_081BCE14: .4byte 0x02024064 + .pool _081BCE18: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCE30 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCE34 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -909089,14 +877988,13 @@ _081BCE18: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCE30: .4byte 0x020244ec -_081BCE34: .4byte 0x02024064 + .pool _081BCE38: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCE50 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCE54 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -909104,14 +878002,13 @@ _081BCE38: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCE50: .4byte 0x020244ec -_081BCE54: .4byte 0x02024064 + .pool _081BCE58: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCE70 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCE74 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -909119,14 +878016,13 @@ _081BCE58: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCE70: .4byte 0x020244ec -_081BCE74: .4byte 0x02024064 + .pool _081BCE78: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCE90 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCE94 + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 @@ -909134,29 +878030,28 @@ _081BCE78: bl pokemon_setattr b _081BCEAE .align 2, 0 -_081BCE90: .4byte 0x020244ec -_081BCE94: .4byte 0x02024064 + .pool _081BCE98: movs r0, 0x64 muls r0, r5 - ldr r1, _081BCED8 + ldr r1, =0x020244ec adds r0, r1 - ldr r1, _081BCEDC + ldr r1, =0x02024064 ldrb r2, [r1] lsls r2, 9 adds r2, r7 movs r1, 0x36 bl pokemon_setattr _081BCEAE: - ldr r2, _081BCEE0 - ldr r0, _081BCEDC + ldr r2, =0x0202406e + ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _081BCED8 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 add sp, 0x34 @@ -909168,16 +878063,14 @@ _081BCEAE: pop {r0} bx r0 .align 2, 0 -_081BCED8: .4byte 0x020244ec -_081BCEDC: .4byte 0x02024064 -_081BCEE0: .4byte 0x0202406e + .pool thumb_func_end sub_81BC4E8 thumb_func_start sub_81BCEE4 sub_81BCEE4: @ 81BCEE4 push {r4-r7,lr} - ldr r1, _081BCF48 - ldr r7, _081BCF4C + ldr r1, =0x0202406e + ldr r7, =0x02024064 ldrb r2, [r7] lsls r0, r2, 1 adds r0, r1 @@ -909185,12 +878078,12 @@ sub_81BCEE4: @ 81BCEE4 movs r0, 0x64 adds r3, r1, 0 muls r3, r0 - ldr r4, _081BCF50 + ldr r4, =0x02023064 lsls r2, 9 adds r0, r4, 0x1 adds r0, r2, r0 ldrb r0, [r0] - ldr r1, _081BCF54 + ldr r1, =0x020244ec adds r0, r1 adds r5, r3, r0 movs r3, 0 @@ -909226,10 +878119,7 @@ _081BCF3C: pop {r0} bx r0 .align 2, 0 -_081BCF48: .4byte 0x0202406e -_081BCF4C: .4byte 0x02024064 -_081BCF50: .4byte 0x02023064 -_081BCF54: .4byte 0x020244ec + .pool thumb_func_end sub_81BCEE4 thumb_func_start sub_81BCF58 @@ -909237,16 +878127,16 @@ sub_81BCF58: @ 81BCF58 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _081BD04C + ldr r0, =0x0202406e mov r8, r0 - ldr r6, _081BD050 + ldr r6, =0x02024064 ldrb r1, [r6] lsls r0, r1, 1 add r0, r8 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _081BD054 + ldr r4, =0x020244ec adds r0, r4 bl sub_805DD7C ldrb r0, [r6] @@ -909267,7 +878157,7 @@ sub_81BCF58: @ 81BCF58 lsrs r1, 24 adds r0, r4, 0 bl sub_806A068 - ldr r0, _081BD058 + ldr r0, =0x0202499c mov r8, r0 ldrb r0, [r6] movs r1, 0x2 @@ -909289,11 +878179,11 @@ sub_81BCF58: @ 81BCF58 adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _081BD05C + ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, _081BD060 + ldr r5, =0x02020630 ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -909301,7 +878191,7 @@ sub_81BCF58: @ 81BCF58 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _081BD064 + ldr r1, =0x0000ff10 strh r1, [r0, 0x24] ldrb r2, [r6] adds r0, r2, r4 @@ -909331,15 +878221,15 @@ sub_81BCF58: @ 81BCF58 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _081BD068 + ldr r1, =0x020244e4 adds r2, r1 ldrb r1, [r2] bl obj_anim_image_start - ldr r1, _081BD06C + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _081BD070 + ldr r1, =sub_81BB1D4 + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -909347,30 +878237,21 @@ sub_81BCF58: @ 81BCF58 pop {r0} bx r0 .align 2, 0 -_081BD04C: .4byte 0x0202406e -_081BD050: .4byte 0x02024064 -_081BD054: .4byte 0x020244ec -_081BD058: .4byte 0x0202499c -_081BD05C: .4byte 0x020241e4 -_081BD060: .4byte 0x02020630 -_081BD064: .4byte 0x0000ff10 -_081BD068: .4byte 0x020244e4 -_081BD06C: .4byte 0x03005d60 -_081BD070: .4byte sub_81BB1D4 + 1 + .pool thumb_func_end sub_81BCF58 thumb_func_start sub_81BD074 sub_81BD074: @ 81BD074 push {r4-r6,lr} - ldr r5, _081BD0CC + ldr r5, =0x02024064 ldrb r0, [r5] - ldr r4, _081BD0D0 + ldr r4, =0x02023064 lsls r1, r0, 9 adds r6, r4, 0x2 adds r1, r6 ldrb r1, [r1] bl sub_805EF84 - ldr r2, _081BD0D4 + ldr r2, =0x0202406e ldrb r0, [r5] lsls r1, r0, 1 adds r1, r2 @@ -909385,7 +878266,7 @@ sub_81BD074: @ 81BD074 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _081BD0D8 + ldr r2, =0x020244ec adds r0, r2 bl sub_805DD7C ldrb r0, [r5] @@ -909393,22 +878274,17 @@ sub_81BD074: @ 81BD074 adds r1, r6 ldrb r1, [r1] bl sub_81BD0E4 - ldr r1, _081BD0DC + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _081BD0E0 + ldr r1, =sub_81BBAE8 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081BD0CC: .4byte 0x02024064 -_081BD0D0: .4byte 0x02023064 -_081BD0D4: .4byte 0x0202406e -_081BD0D8: .4byte 0x020244ec -_081BD0DC: .4byte 0x03005d60 -_081BD0E0: .4byte sub_81BBAE8 + 1 + .pool thumb_func_end sub_81BD074 thumb_func_start sub_81BD0E4 @@ -909425,10 +878301,10 @@ sub_81BD0E4: @ 81BD0E4 lsrs r1, 24 adds r0, r6, 0 bl sub_805EF84 - ldr r0, _081BD238 + ldr r0, =0x0202406e lsls r2, r6, 1 adds r2, r0 - ldr r0, _081BD23C + ldr r0, =0x02023064 lsls r1, r6, 9 adds r0, 0x1 adds r1, r0 @@ -909437,7 +878313,7 @@ sub_81BD0E4: @ 81BD0E4 ldrh r1, [r2] movs r0, 0x64 muls r0, r1 - ldr r1, _081BD240 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -909445,9 +878321,9 @@ sub_81BD0E4: @ 81BD0E4 lsls r0, 16 lsrs r0, 16 mov r8, r0 - ldr r0, _081BD244 + ldr r0, =sub_805D714 + 1 bl object_new_hidden_with_callback - ldr r1, _081BD248 + ldr r1, =0x03005d7c mov r9, r1 add r9, r6 mov r1, r9 @@ -909459,7 +878335,7 @@ sub_81BD0E4: @ 81BD0E4 lsrs r1, 24 mov r0, r8 bl sub_806A068 - ldr r0, _081BD24C + ldr r0, =0x0202499c mov r10, r0 adds r0, r6, 0 movs r1, 0x2 @@ -909481,10 +878357,10 @@ sub_81BD0E4: @ 81BD0E4 adds r1, r5, 0 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _081BD250 + ldr r4, =0x020241e4 adds r4, r6, r4 strb r0, [r4] - ldr r5, _081BD254 + ldr r5, =0x02020630 mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -909529,7 +878405,7 @@ sub_81BD0E4: @ 81BD0E4 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _081BD258 + ldr r1, =0x020244e4 adds r6, r1 ldrb r1, [r6] bl obj_anim_image_start @@ -909550,7 +878426,7 @@ sub_81BD0E4: @ 81BD0E4 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _081BD25C + ldr r1, =nullsub_12 + 1 str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -909572,23 +878448,14 @@ sub_81BD0E4: @ 81BD0E4 pop {r0} bx r0 .align 2, 0 -_081BD238: .4byte 0x0202406e -_081BD23C: .4byte 0x02023064 -_081BD240: .4byte 0x020244ec -_081BD244: .4byte sub_805D714 + 1 -_081BD248: .4byte 0x03005d7c -_081BD24C: .4byte 0x0202499c -_081BD250: .4byte 0x020241e4 -_081BD254: .4byte 0x02020630 -_081BD258: .4byte 0x020244e4 -_081BD25C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81BD0E4 thumb_func_start sub_81BD260 sub_81BD260: @ 81BD260 push {r4-r6,lr} - ldr r1, _081BD294 - ldr r6, _081BD298 + ldr r1, =0x02023064 + ldr r6, =0x02024064 ldrb r2, [r6] lsls r0, r2, 9 adds r1, 0x1 @@ -909596,7 +878463,7 @@ sub_81BD260: @ 81BD260 ldrb r3, [r0] cmp r3, 0 bne _081BD2A8 - ldr r0, _081BD29C + ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -909604,27 +878471,23 @@ sub_81BD260: @ 81BD260 lsls r0, 2 adds r0, r1 strb r3, [r0, 0x4] - ldr r1, _081BD2A0 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _081BD2A4 + ldr r1, =sub_81BD2F0 + 1 str r1, [r0] b _081BD2DE .align 2, 0 -_081BD294: .4byte 0x02023064 -_081BD298: .4byte 0x02024064 -_081BD29C: .4byte 0x020244d0 -_081BD2A0: .4byte 0x03005d60 -_081BD2A4: .4byte sub_81BD2F0 + 1 + .pool _081BD2A8: - ldr r5, _081BD2E4 + ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _081BD2E8 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r0, [r6] @@ -909635,7 +878498,7 @@ _081BD2A8: lsls r0, 2 adds r0, r4 bl obj_delete_and_free_tiles - ldr r1, _081BD2EC + ldr r1, =0x03005d70 ldrb r0, [r6] adds r0, r1 ldrb r0, [r0] @@ -909646,17 +878509,15 @@ _081BD2DE: pop {r0} bx r0 .align 2, 0 -_081BD2E4: .4byte 0x020241e4 -_081BD2E8: .4byte 0x02020630 -_081BD2EC: .4byte 0x03005d70 + .pool thumb_func_end sub_81BD260 thumb_func_start sub_81BD2F0 sub_81BD2F0: @ 81BD2F0 push {r4-r6,lr} - ldr r6, _081BD310 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _081BD314 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r1, [r4, 0x4] lsls r0, r2, 1 @@ -909670,8 +878531,7 @@ sub_81BD2F0: @ 81BD2F0 beq _081BD346 b _081BD36E .align 2, 0 -_081BD310: .4byte 0x020244d0 -_081BD314: .4byte 0x02024064 + .pool _081BD318: ldr r1, [r4] lsls r0, r2, 2 @@ -909710,19 +878570,18 @@ _081BD346: adds r1, r2, 0 movs r3, 0x1 bl move_anim_start_t4 - ldr r1, _081BD374 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _081BD378 + ldr r1, =sub_81BB828 + 1 str r1, [r0] _081BD36E: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081BD374: .4byte 0x03005d60 -_081BD378: .4byte sub_81BB828 + 1 + .pool thumb_func_end sub_81BD2F0 thumb_func_start sub_81BD37C @@ -909731,21 +878590,19 @@ sub_81BD37C: @ 81BD37C mov r7, r9 mov r6, r8 push {r6,r7} - ldr r2, _081BD39C + ldr r2, =0x02038bce ldrh r1, [r2] - ldr r0, _081BD3A0 + ldr r0, =0x00000c03 cmp r1, r0 bne _081BD3A8 movs r4, 0x7 movs r0, 0x5A mov r9, r0 - ldr r0, _081BD3A4 + ldr r0, =0x08305d2c ldrb r1, [r0, 0x1C] b _081BD3BE .align 2, 0 -_081BD39C: .4byte 0x02038bce -_081BD3A0: .4byte 0x00000c03 -_081BD3A4: .4byte 0x08305d2c + .pool _081BD3A8: ldrh r0, [r2] bl sub_8162AA0 @@ -909753,7 +878610,7 @@ _081BD3A8: lsrs r4, r0, 24 movs r0, 0x20 mov r9, r0 - ldr r1, _081BD470 + ldr r1, =0x083054e0 lsls r0, r4, 2 adds r0, r1 ldrb r1, [r0] @@ -909765,12 +878622,12 @@ _081BD3BE: lsls r1, 15 adds r0, r1 lsrs r7, r0, 16 - ldr r0, _081BD474 + ldr r0, =0x02038bce ldrh r1, [r0] - ldr r0, _081BD478 + ldr r0, =0x00000c03 cmp r1, r0 bne _081BD494 - ldr r5, _081BD47C + ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 bl sub_805DF84 @@ -909781,7 +878638,7 @@ _081BD3BE: lsrs r1, 24 adds r0, r4, 0 bl template_build_for_pokemon_or_trainer - ldr r6, _081BD480 + ldr r6, =0x0202499c mov r8, r9 lsls r4, r7, 16 asrs r4, 16 @@ -909794,11 +878651,11 @@ _081BD3BE: mov r1, r8 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r6, _081BD484 + ldr r6, =0x020241e4 ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _081BD488 + ldr r4, =0x02020630 ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -909828,7 +878685,7 @@ _081BD3BE: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _081BD48C + ldr r1, =0x0000fffe strh r1, [r0, 0x2E] ldrb r0, [r5] adds r0, r6 @@ -909838,22 +878695,14 @@ _081BD3BE: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _081BD490 + ldr r1, =sub_805D7AC + 1 str r1, [r0] b _081BD57C .align 2, 0 -_081BD470: .4byte 0x083054e0 -_081BD474: .4byte 0x02038bce -_081BD478: .4byte 0x00000c03 -_081BD47C: .4byte 0x02024064 -_081BD480: .4byte 0x0202499c -_081BD484: .4byte 0x020241e4 -_081BD488: .4byte 0x02020630 -_081BD48C: .4byte 0x0000fffe -_081BD490: .4byte sub_805D7AC + 1 + .pool _081BD494: adds r5, r4, 0 - ldr r6, _081BD598 + ldr r6, =0x02024064 ldrb r1, [r6] adds r0, r5, 0 bl sub_805DF38 @@ -909864,7 +878713,7 @@ _081BD494: lsrs r1, 24 adds r0, r5, 0 bl sub_806A1C0 - ldr r0, _081BD59C + ldr r0, =0x0202499c mov r8, r0 lsls r4, r7, 16 asrs r4, 16 @@ -909877,16 +878726,16 @@ _081BD494: mov r1, r9 adds r2, r4, 0 bl obj_add_from_template_forward_search - ldr r4, _081BD5A0 + ldr r4, =0x020241e4 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r0, _081BD5A4 + ldr r0, =0x0830593c lsls r5, 3 adds r5, r0 ldrh r0, [r5, 0x4] bl gpu_pal_tags_index_of - ldr r5, _081BD5A8 + ldr r5, =0x02020630 ldrb r1, [r6] adds r1, r4 ldrb r1, [r1] @@ -909925,7 +878774,7 @@ _081BD494: adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _081BD5AC + ldr r1, =0x0000fffe strh r1, [r0, 0x2E] ldrb r0, [r6] adds r0, r4 @@ -909936,7 +878785,7 @@ _081BD494: adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _081BD5B0 + ldr r1, =sub_805D7AC + 1 str r1, [r0] ldrb r0, [r6] adds r0, r4 @@ -909963,12 +878812,12 @@ _081BD494: orrs r1, r2 strb r1, [r0] _081BD57C: - ldr r1, _081BD5B4 - ldr r0, _081BD598 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _081BD5B8 + ldr r1, =sub_81BAE60 + 1 str r1, [r0] pop {r3,r4} mov r8, r3 @@ -909977,15 +878826,7 @@ _081BD57C: pop {r0} bx r0 .align 2, 0 -_081BD598: .4byte 0x02024064 -_081BD59C: .4byte 0x0202499c -_081BD5A0: .4byte 0x020241e4 -_081BD5A4: .4byte 0x0830593c -_081BD5A8: .4byte 0x02020630 -_081BD5AC: .4byte 0x0000fffe -_081BD5B0: .4byte sub_805D7AC + 1 -_081BD5B4: .4byte 0x03005d60 -_081BD5B8: .4byte sub_81BAE60 + 1 + .pool thumb_func_end sub_81BD37C thumb_func_start sub_81BD5BC @@ -909999,15 +878840,15 @@ sub_81BD5BC: @ 81BD5BC thumb_func_start sub_81BD5C8 sub_81BD5C8: @ 81BD5C8 push {r4-r6,lr} - ldr r6, _081BD654 - ldr r4, _081BD658 + ldr r6, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _081BD65C + ldr r5, =0x02020630 adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -910026,7 +878867,7 @@ sub_81BD5C8: @ 81BD5C8 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _081BD660 + ldr r1, =0x0000ffd8 strh r1, [r0, 0x32] ldrb r0, [r4] adds r0, r6 @@ -910046,7 +878887,7 @@ sub_81BD5C8: @ 81BD5C8 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _081BD664 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r0, [r4] adds r0, r6 @@ -910055,34 +878896,27 @@ sub_81BD5C8: @ 81BD5C8 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _081BD668 + ldr r1, =nullsub_12 + 1 bl oamt_set_x3A_32 - ldr r1, _081BD66C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _081BD670 + ldr r1, =sub_81BAE98 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081BD654: .4byte 0x020241e4 -_081BD658: .4byte 0x02024064 -_081BD65C: .4byte 0x02020630 -_081BD660: .4byte 0x0000ffd8 -_081BD664: .4byte sub_80A6EEC + 1 -_081BD668: .4byte nullsub_12 + 1 -_081BD66C: .4byte 0x03005d60 -_081BD670: .4byte sub_81BAE98 + 1 + .pool thumb_func_end sub_81BD5C8 thumb_func_start sub_81BD674 sub_81BD674: @ 81BD674 push {r4-r6,lr} - ldr r6, _081BD6C0 + ldr r6, =0x020244d0 ldr r4, [r6] - ldr r5, _081BD6C4 + ldr r5, =0x02024064 ldrb r2, [r5] ldr r0, [r4, 0x4] lsls r1, r2, 1 @@ -910117,8 +878951,7 @@ _081BD6A8: strb r1, [r0, 0x4] b _081BD73E .align 2, 0 -_081BD6C0: .4byte 0x020244d0 -_081BD6C4: .4byte 0x02024064 + .pool _081BD6C8: ldrb r1, [r3] movs r0, 0x40 @@ -910128,22 +878961,22 @@ _081BD6C8: cmp r4, 0 bne _081BD73E strb r4, [r3, 0x4] - ldr r2, _081BD744 + ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 adds r0, r2 ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _081BD748 + ldr r2, =0x020244ec adds r0, r2 bl sub_805E990 movs r1, 0x40 negs r1, r1 movs r0, 0x10 bl audio_play_and_stuff - ldr r2, _081BD74C - ldr r3, _081BD750 + ldr r2, =0x02020630 + ldr r3, =0x020241e4 ldrb r0, [r5] adds r0, r3 ldrb r1, [r0] @@ -910169,26 +879002,20 @@ _081BD6C8: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _081BD754 + ldr r1, =sub_8039C00 + 1 str r1, [r0] - ldr r1, _081BD758 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _081BD75C + ldr r1, =sub_81BB78C + 1 str r1, [r0] _081BD73E: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081BD744: .4byte 0x0202406e -_081BD748: .4byte 0x020244ec -_081BD74C: .4byte 0x02020630 -_081BD750: .4byte 0x020241e4 -_081BD754: .4byte sub_8039C00 + 1 -_081BD758: .4byte 0x03005d60 -_081BD75C: .4byte sub_81BB78C + 1 + .pool thumb_func_end sub_81BD674 thumb_func_start sub_81BD760 @@ -910226,7 +879053,7 @@ sub_81BD784: @ 81BD784 thumb_func_start sub_81BD790 sub_81BD790: @ 81BD790 push {r4-r6,lr} - ldr r6, _081BD874 + ldr r6, =0x02024064 ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 @@ -910234,7 +879061,7 @@ sub_81BD790: @ 81BD790 beq _081BD7A2 b _081BD8B6 _081BD7A2: - ldr r0, _081BD878 + ldr r0, =0x02023064 mov r12, r0 ldrb r2, [r6] lsls r2, 9 @@ -910247,13 +879074,13 @@ _081BD7A2: ldrb r1, [r1] lsls r1, 8 orrs r0, r1 - ldr r5, _081BD87C + ldr r5, =0x02038432 mov r1, r12 adds r1, 0x3 adds r2, r1 ldrb r1, [r2] strb r1, [r5] - ldr r4, _081BD880 + ldr r4, =0x02038408 ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -910267,7 +879094,7 @@ _081BD7A2: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r4, _081BD884 + ldr r4, =0x02038404 ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -910293,7 +879120,7 @@ _081BD7A2: lsls r1, 24 orrs r3, r1 str r3, [r4] - ldr r3, _081BD888 + ldr r3, =0x0203841a ldrb r1, [r6] lsls r1, 9 mov r2, r12 @@ -910301,7 +879128,7 @@ _081BD7A2: adds r1, r2 ldrb r1, [r1] strb r1, [r3] - ldr r4, _081BD88C + ldr r4, =0x0203841c ldrb r2, [r6] lsls r2, 9 mov r1, r12 @@ -910315,14 +879142,14 @@ _081BD7A2: lsls r1, 8 orrs r3, r1 strh r3, [r4] - ldr r3, _081BD890 + ldr r3, =0x02038400 ldrb r2, [r6] lsls r2, 9 mov r1, r12 adds r1, 0x10 adds r2, r1 str r2, [r3] - ldr r3, _081BD894 + ldr r3, =0x020244bc ldrb r1, [r6] lsls r1, 2 adds r1, r3 @@ -910337,17 +879164,9 @@ _081BD7A2: bl dp01_tbl3_exec_completed b _081BD8B6 .align 2, 0 -_081BD874: .4byte 0x02024064 -_081BD878: .4byte 0x02023064 -_081BD87C: .4byte 0x02038432 -_081BD880: .4byte 0x02038408 -_081BD884: .4byte 0x02038404 -_081BD888: .4byte 0x0203841a -_081BD88C: .4byte 0x0203841c -_081BD890: .4byte 0x02038400 -_081BD894: .4byte 0x020244bc + .pool _081BD898: - ldr r0, _081BD8BC + ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -910356,20 +879175,18 @@ _081BD898: lsls r0, 2 adds r0, r2 strb r3, [r0, 0x4] - ldr r1, _081BD8C0 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _081BD8C4 + ldr r1, =bx_move_anim_3 + 1 str r1, [r0] _081BD8B6: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081BD8BC: .4byte 0x020244d0 -_081BD8C0: .4byte 0x03005d60 -_081BD8C4: .4byte bx_move_anim_3 + 1 + .pool thumb_func_end sub_81BD790 thumb_func_start bx_move_anim_3 @@ -910379,8 +879196,8 @@ bx_move_anim_3: @ 81BD8C8 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r2, _081BD914 - ldr r6, _081BD918 + ldr r2, =0x02023064 + ldr r6, =0x02024064 ldrb r3, [r6] lsls r1, r3, 9 adds r0, r2, 0x1 @@ -910397,7 +879214,7 @@ bx_move_anim_3: @ 81BD8C8 adds r1, r2 ldrb r1, [r1] mov r8, r1 - ldr r7, _081BD91C + ldr r7, =0x020244d0 ldr r5, [r7] ldr r1, [r5, 0x4] lsls r0, r3, 1 @@ -910413,9 +879230,7 @@ bx_move_anim_3: @ 81BD8C8 beq _081BD92A b _081BDA3C .align 2, 0 -_081BD914: .4byte 0x02023064 -_081BD918: .4byte 0x02024064 -_081BD91C: .4byte 0x020244d0 + .pool _081BD920: cmp r2, 0x2 beq _081BD98A @@ -910471,10 +879286,10 @@ _081BD960: strb r1, [r0, 0x4] b _081BDA3C _081BD98A: - ldr r0, _081BD9F0 + ldr r0, =0x020383f8 ldr r0, [r0] bl _call_via_r0 - ldr r0, _081BD9F4 + ldr r0, =0x020383fd ldrb r0, [r0] cmp r0, 0 bne _081BDA3C @@ -910508,9 +879323,9 @@ _081BD98A: ands r0, r2 strb r0, [r1] _081BD9D8: - ldr r0, _081BD9F8 + ldr r0, =0x020244d0 ldr r2, [r0] - ldr r0, _081BD9FC + ldr r0, =0x02024064 ldrb r1, [r0] ldr r2, [r2, 0x4] lsls r0, r1, 1 @@ -910521,10 +879336,7 @@ _081BD9D8: strb r1, [r0, 0x4] b _081BDA3C .align 2, 0 -_081BD9F0: .4byte 0x020383f8 -_081BD9F4: .4byte 0x020383fd -_081BD9F8: .4byte 0x020244d0 -_081BD9FC: .4byte 0x02024064 + .pool _081BDA00: ldrb r1, [r0] movs r0, 0x40 @@ -910566,38 +879378,32 @@ _081BDA3C: thumb_func_start sub_81BDA4C sub_81BDA4C: @ 81BDA4C push {r4,lr} - ldr r0, _081BDA84 + ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] - ldr r0, _081BDA88 + ldr r0, =0x02022e16 strh r1, [r0] - ldr r4, _081BDA8C + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 9 - ldr r1, _081BDA90 + ldr r1, =0x02023066 adds r0, r1 ldrh r0, [r0] bl battle_pick_message - ldr r0, _081BDA94 + ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe - ldr r1, _081BDA98 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _081BDA9C + ldr r1, =sub_81BB898 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081BDA84: .4byte 0x02022e14 -_081BDA88: .4byte 0x02022e16 -_081BDA8C: .4byte 0x02024064 -_081BDA90: .4byte 0x02023066 -_081BDA94: .4byte 0x02022e2c -_081BDA98: .4byte 0x03005d60 -_081BDA9C: .4byte sub_81BB898 + 1 + .pool thumb_func_end sub_81BDA4C thumb_func_start sub_81BDAA0 @@ -910628,17 +879434,17 @@ sub_81BDABC: @ 81BDABC thumb_func_start sub_81BDAC8 sub_81BDAC8: @ 81BDAC8 push {r4-r6,lr} - ldr r6, _081BDB58 + ldr r6, =0x02024064 ldrb r4, [r6] lsls r4, 9 - ldr r0, _081BDB5C + ldr r0, =0x02023068 adds r4, r0 movs r0, 0xF bl sub_8130950 bl sub_8130BA4 lsls r0, 24 lsrs r5, r0, 24 - ldr r2, _081BDB60 + ldr r2, =0x0831c898 lsls r0, r5, 1 adds r4, r0 ldrh r1, [r4] @@ -910651,7 +879457,7 @@ sub_81BDAC8: @ 81BDAC8 ands r0, r1 cmp r0, 0 beq _081BDB02 - ldr r1, _081BDB64 + ldr r1, =0x0202420c ldrb r0, [r6] strb r0, [r1] _081BDB02: @@ -910667,11 +879473,11 @@ _081BDB02: beq _081BDB3C movs r0, 0x1 bl battle_get_side_with_given_state - ldr r4, _081BDB64 + ldr r4, =0x0202420c strb r0, [r4] - ldr r0, _081BDB68 + ldr r0, =0x02024210 ldrb r1, [r0] - ldr r2, _081BDB6C + ldr r2, =0x0832a328 ldrb r0, [r4] lsls r0, 2 adds r0, r2 @@ -910683,7 +879489,7 @@ _081BDB02: bl battle_get_side_with_given_state strb r0, [r4] _081BDB3C: - ldr r0, _081BDB64 + ldr r0, =0x0202420c ldrb r2, [r0] lsls r2, 8 orrs r2, r5 @@ -910695,12 +879501,7 @@ _081BDB3C: pop {r0} bx r0 .align 2, 0 -_081BDB58: .4byte 0x02024064 -_081BDB5C: .4byte 0x02023068 -_081BDB60: .4byte 0x0831c898 -_081BDB64: .4byte 0x0202420c -_081BDB68: .4byte 0x02024210 -_081BDB6C: .4byte 0x0832a328 + .pool thumb_func_end sub_81BDAC8 thumb_func_start sub_81BDB70 @@ -910736,13 +879537,13 @@ _081BDBA4: bgt _081BDBD0 movs r0, 0x64 muls r0, r4 - ldr r1, _081BDBF4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 bl pokemon_getattr cmp r0, 0 beq _081BDBA2 - ldr r1, _081BDBF8 + ldr r1, =0x0202406e lsls r0, r6, 1 adds r0, r1 ldrh r0, [r0] @@ -910754,9 +879555,9 @@ _081BDBA4: cmp r4, r0 beq _081BDBA2 _081BDBD0: - ldr r0, _081BDBFC + ldr r0, =0x02024064 ldrb r0, [r0] - ldr r1, _081BDC00 + ldr r1, =0x0202449c ldr r1, [r1] adds r0, r1 adds r0, 0x5C @@ -910771,10 +879572,7 @@ _081BDBD0: pop {r0} bx r0 .align 2, 0 -_081BDBF4: .4byte 0x020244ec -_081BDBF8: .4byte 0x0202406e -_081BDBFC: .4byte 0x02024064 -_081BDC00: .4byte 0x0202449c + .pool thumb_func_end sub_81BDB7C thumb_func_start sub_81BDC04 @@ -910794,8 +879592,8 @@ sub_81BDC10: @ 81BDC10 sub sp, 0x4 movs r0, 0 bl load_gfxc_health_bar - ldr r3, _081BDC88 - ldr r0, _081BDC8C + ldr r3, =0x02023064 + ldr r0, =0x02024064 mov r9, r0 ldrb r4, [r0] lsls r2, r4, 9 @@ -910809,16 +879607,16 @@ sub_81BDC10: @ 81BDC10 orrs r1, r0 lsls r1, 16 asrs r7, r1, 16 - ldr r0, _081BDC90 + ldr r0, =0x00007fff cmp r7, r0 beq _081BDCA0 - ldr r6, _081BDC94 + ldr r6, =0x0202406e lsls r0, r4, 1 adds r0, r6 ldrh r0, [r0] movs r5, 0x64 muls r0, r5 - ldr r4, _081BDC98 + ldr r4, =0x020244ec adds r0, r4 movs r1, 0x3A bl pokemon_getattr @@ -910835,7 +879633,7 @@ sub_81BDC10: @ 81BDC10 adds r3, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _081BDC9C + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] @@ -910843,39 +879641,34 @@ sub_81BDC10: @ 81BDC10 bl sub_807294C b _081BDCCA .align 2, 0 -_081BDC88: .4byte 0x02023064 -_081BDC8C: .4byte 0x02024064 -_081BDC90: .4byte 0x00007fff -_081BDC94: .4byte 0x0202406e -_081BDC98: .4byte 0x020244ec -_081BDC9C: .4byte 0x03005d70 + .pool _081BDCA0: - ldr r1, _081BDCE8 + ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081BDCEC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A bl pokemon_getattr adds r2, r0, 0 mov r1, r9 ldrb r0, [r1] - ldr r1, _081BDCF0 + ldr r1, =0x03005d70 adds r1, r0, r1 ldrb r1, [r1] str r7, [sp] movs r3, 0 bl sub_807294C _081BDCCA: - ldr r1, _081BDCF4 - ldr r0, _081BDCF8 + ldr r1, =0x03005d60 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 2 adds r0, r1 - ldr r1, _081BDCFC + ldr r1, =bx_t3_healthbar_update + 1 str r1, [r0] add sp, 0x4 pop {r3,r4} @@ -910885,19 +879678,14 @@ _081BDCCA: pop {r0} bx r0 .align 2, 0 -_081BDCE8: .4byte 0x0202406e -_081BDCEC: .4byte 0x020244ec -_081BDCF0: .4byte 0x03005d70 -_081BDCF4: .4byte 0x03005d60 -_081BDCF8: .4byte 0x02024064 -_081BDCFC: .4byte bx_t3_healthbar_update + 1 + .pool thumb_func_end sub_81BDC10 thumb_func_start sub_81BDD00 sub_81BDD00: @ 81BDD00 push {r4-r7,lr} - ldr r5, _081BDD2C - ldr r6, _081BDD30 + ldr r5, =0x02023064 + ldr r6, =0x02024064 ldrb r0, [r6] lsls r0, 9 adds r1, r5, 0x1 @@ -910906,7 +879694,7 @@ sub_81BDD00: @ 81BDD00 movs r0, 0x64 adds r1, r7, 0 muls r1, r0 - ldr r0, _081BDD34 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x38 @@ -910916,9 +879704,7 @@ sub_81BDD00: @ 81BDD00 bl dp01_tbl3_exec_completed b _081BDD84 .align 2, 0 -_081BDD2C: .4byte 0x02023064 -_081BDD30: .4byte 0x02024064 -_081BDD34: .4byte 0x020244ec + .pool _081BDD38: movs r0, 0x1 bl load_gfxc_health_bar @@ -910935,12 +879721,12 @@ _081BDD38: ldrb r0, [r1] lsls r0, 8 orrs r4, r0 - ldr r0, _081BDD8C + ldr r0, =sub_81BB29C + 1 movs r1, 0xA bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081BDD90 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -910949,48 +879735,45 @@ _081BDD38: strh r4, [r1, 0xA] ldrb r0, [r6] strh r0, [r1, 0xC] - ldr r1, _081BDD94 + ldr r1, =0x03005d60 ldrb r0, [r6] lsls r0, 2 adds r0, r1 - ldr r1, _081BDD98 + ldr r1, =nullsub_21 + 1 str r1, [r0] _081BDD84: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081BDD8C: .4byte sub_81BB29C + 1 -_081BDD90: .4byte 0x03005e00 -_081BDD94: .4byte 0x03005d60 -_081BDD98: .4byte nullsub_21 + 1 + .pool thumb_func_end sub_81BDD00 thumb_func_start sub_81BDD9C sub_81BDD9C: @ 81BDD9C push {r4,lr} - ldr r4, _081BDDF8 + ldr r4, =0x02024064 ldrb r0, [r4] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _081BDDF0 - ldr r0, _081BDDFC + ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] - ldr r2, _081BDE00 + ldr r2, =0x0202406e lsls r1, 1 adds r1, r2 ldrh r2, [r1] movs r1, 0x64 muls r1, r2 - ldr r2, _081BDE04 + ldr r2, =0x020244ec adds r1, r2 movs r2, 0x9 bl healthbar_draw_field_maybe ldrb r2, [r4] - ldr r0, _081BDE08 + ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] lsls r1, r2, 1 @@ -911002,36 +879785,30 @@ sub_81BDD9C: @ 81BDD9C negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r1, _081BDE0C + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _081BDE10 + ldr r1, =sub_81BBC04 + 1 str r1, [r0] _081BDDF0: pop {r4} pop {r0} bx r0 .align 2, 0 -_081BDDF8: .4byte 0x02024064 -_081BDDFC: .4byte 0x03005d70 -_081BDE00: .4byte 0x0202406e -_081BDE04: .4byte 0x020244ec -_081BDE08: .4byte 0x020244d0 -_081BDE0C: .4byte 0x03005d60 -_081BDE10: .4byte sub_81BBC04 + 1 + .pool thumb_func_end sub_81BDD9C thumb_func_start sub_81BDE14 sub_81BDE14: @ 81BDE14 push {r4,r5,lr} - ldr r5, _081BDE6C + ldr r5, =0x02024064 ldrb r0, [r5] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _081BDE64 - ldr r4, _081BDE70 + ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 adds r0, r4, 0x1 @@ -911056,21 +879833,18 @@ sub_81BDE14: @ 81BDE14 lsls r2, 24 orrs r1, r2 bl move_anim_start_t2_for_situation - ldr r1, _081BDE74 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _081BDE78 + ldr r1, =sub_81BBC04 + 1 str r1, [r0] _081BDE64: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081BDE6C: .4byte 0x02024064 -_081BDE70: .4byte 0x02023064 -_081BDE74: .4byte 0x03005d60 -_081BDE78: .4byte sub_81BBC04 + 1 + .pool thumb_func_end sub_81BDE14 thumb_func_start sub_81BDE7C @@ -911148,7 +879922,7 @@ sub_81BDEDC: @ 81BDEDC thumb_func_start sub_81BDEE8 sub_81BDEE8: @ 81BDEE8 push {lr} - ldr r2, _081BDF00 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x80 negs r0, r0 @@ -911158,15 +879932,15 @@ sub_81BDEE8: @ 81BDEE8 pop {r0} bx r0 .align 2, 0 -_081BDF00: .4byte 0x02022d0c + .pool thumb_func_end sub_81BDEE8 thumb_func_start sub_81BDF04 sub_81BDF04: @ 81BDF04 push {lr} - ldr r3, _081BDF30 - ldr r1, _081BDF34 - ldr r0, _081BDF38 + ldr r3, =0x02022d0c + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 @@ -911184,15 +879958,13 @@ sub_81BDF04: @ 81BDF04 pop {r0} bx r0 .align 2, 0 -_081BDF30: .4byte 0x02022d0c -_081BDF34: .4byte 0x02023064 -_081BDF38: .4byte 0x02024064 + .pool thumb_func_end sub_81BDF04 thumb_func_start sub_81BDF3C sub_81BDF3C: @ 81BDF3C push {lr} - ldr r2, _081BDF50 + ldr r2, =0x02022d0c ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -911201,13 +879973,13 @@ sub_81BDF3C: @ 81BDF3C pop {r0} bx r0 .align 2, 0 -_081BDF50: .4byte 0x02022d0c + .pool thumb_func_end sub_81BDF3C thumb_func_start sub_81BDF54 sub_81BDF54: @ 81BDF54 push {lr} - ldr r3, _081BDF78 + ldr r3, =0x02022d0c ldr r1, [r3] lsls r1, 24 lsrs r1, 31 @@ -911223,15 +879995,15 @@ sub_81BDF54: @ 81BDF54 pop {r0} bx r0 .align 2, 0 -_081BDF78: .4byte 0x02022d0c + .pool thumb_func_end sub_81BDF54 thumb_func_start dp01t_29_3_blink dp01t_29_3_blink: @ 81BDF7C push {r4,lr} - ldr r3, _081BDFA4 - ldr r2, _081BDFA8 - ldr r4, _081BDFAC + ldr r3, =0x02020630 + ldr r2, =0x020241e4 + ldr r4, =0x02024064 ldrb r0, [r4] adds r0, r2 ldrb r1, [r0] @@ -911247,11 +880019,9 @@ dp01t_29_3_blink: @ 81BDF7C bl dp01_tbl3_exec_completed b _081BDFDA .align 2, 0 -_081BDFA4: .4byte 0x02020630 -_081BDFA8: .4byte 0x020241e4 -_081BDFAC: .4byte 0x02024064 + .pool _081BDFB0: - ldr r1, _081BDFE0 + ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] ldrb r0, [r4] @@ -911265,20 +880035,18 @@ _081BDFB0: strh r1, [r0, 0x30] ldrb r0, [r4] bl sub_80769F4 - ldr r1, _081BDFE4 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _081BDFE8 + ldr r1, =bx_blink_t3 + 1 str r1, [r0] _081BDFDA: pop {r4} pop {r0} bx r0 .align 2, 0 -_081BDFE0: .4byte 0x020244b9 -_081BDFE4: .4byte 0x03005d60 -_081BDFE8: .4byte bx_blink_t3 + 1 + .pool thumb_func_end dp01t_29_3_blink thumb_func_start sub_81BDFEC @@ -911292,7 +880060,7 @@ sub_81BDFEC: @ 81BDFEC thumb_func_start sub_81BDFF8 sub_81BDFF8: @ 81BDFF8 push {r4,lr} - ldr r4, _081BE034 + ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner lsls r0, 24 @@ -911301,7 +880069,7 @@ sub_81BDFF8: @ 81BDFF8 bne _081BE00C movs r3, 0xC0 _081BE00C: - ldr r2, _081BE038 + ldr r2, =0x02023064 ldrb r1, [r4] lsls r1, 9 adds r0, r2, 0x1 @@ -911320,15 +880088,14 @@ _081BE00C: pop {r0} bx r0 .align 2, 0 -_081BE034: .4byte 0x02024064 -_081BE038: .4byte 0x02023064 + .pool thumb_func_end sub_81BDFF8 thumb_func_start sub_81BE03C sub_81BE03C: @ 81BE03C push {r4,r5,lr} - ldr r4, _081BE070 - ldr r5, _081BE074 + ldr r4, =0x02023064 + ldr r5, =0x02024064 ldrb r0, [r5] lsls r3, r0, 9 adds r0, r4, 0x3 @@ -911350,8 +880117,7 @@ sub_81BE03C: @ 81BE03C bl song_play_for_text b _081BE08C .align 2, 0 -_081BE070: .4byte 0x02023064 -_081BE074: .4byte 0x02024064 + .pool _081BE078: adds r0, r4, 0x1 adds r0, r3, r0 @@ -911372,15 +880138,15 @@ _081BE08C: thumb_func_start sub_81BE098 sub_81BE098: @ 81BE098 push {lr} - ldr r1, _081BE0CC - ldr r0, _081BE0D0 + ldr r1, =0x0202406e + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 1 adds r0, r1 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081BE0D4 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -911394,23 +880160,21 @@ sub_81BE098: @ 81BE098 pop {r0} bx r0 .align 2, 0 -_081BE0CC: .4byte 0x0202406e -_081BE0D0: .4byte 0x02024064 -_081BE0D4: .4byte 0x020244ec + .pool thumb_func_end sub_81BE098 thumb_func_start dp01t_2E_3_battle_intro dp01t_2E_3_battle_intro: @ 81BE0D8 push {lr} - ldr r1, _081BE100 - ldr r0, _081BE104 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 adds r1, 0x1 adds r0, r1 ldrb r0, [r0] bl battle_intro_launch - ldr r2, _081BE108 + ldr r2, =0x020243fc ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -911419,23 +880183,21 @@ dp01t_2E_3_battle_intro: @ 81BE0D8 pop {r0} bx r0 .align 2, 0 -_081BE100: .4byte 0x02023064 -_081BE104: .4byte 0x02024064 -_081BE108: .4byte 0x020243fc + .pool thumb_func_end dp01t_2E_3_battle_intro thumb_func_start sub_81BE10C sub_81BE10C: @ 81BE10C push {r4-r6,lr} - ldr r6, _081BE1D4 - ldr r5, _081BE1D8 + ldr r6, =0x020241e4 + ldr r5, =0x02024064 ldrb r0, [r5] adds r0, r6 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _081BE1DC + ldr r4, =0x02020630 adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r5] @@ -911454,7 +880216,7 @@ sub_81BE10C: @ 81BE10C adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _081BE1E0 + ldr r1, =0x0000ffd8 strh r1, [r0, 0x32] ldrb r0, [r5] adds r0, r6 @@ -911474,7 +880236,7 @@ sub_81BE10C: @ 81BE10C adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _081BE1E4 + ldr r1, =sub_80A6EEC + 1 str r1, [r0] ldrb r2, [r5] adds r0, r2, r6 @@ -911491,7 +880253,7 @@ sub_81BE10C: @ 81BE10C adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _081BE1E8 + ldr r1, =sub_805CC00 + 1 bl oamt_set_x3A_32 ldrb r0, [r5] adds r0, r6 @@ -911502,16 +880264,16 @@ sub_81BE10C: @ 81BE10C adds r0, r4 movs r1, 0x1 bl obj_anim_image_start - ldr r0, _081BE1EC + ldr r0, =0x0000d6f9 bl gpu_pal_alloc_new lsls r0, 24 lsrs r4, r0, 24 - ldr r2, _081BE1F0 + ldr r2, =0x02038bce ldrh r1, [r2] - ldr r0, _081BE1F4 + ldr r0, =0x00000c03 cmp r1, r0 bne _081BE1FC - ldr r0, _081BE1F8 + ldr r0, =0x08305d8c ldr r0, [r0, 0x38] lsls r4, 4 movs r2, 0x80 @@ -911521,21 +880283,12 @@ sub_81BE10C: @ 81BE10C bl decompress_palette b _081BE21A .align 2, 0 -_081BE1D4: .4byte 0x020241e4 -_081BE1D8: .4byte 0x02024064 -_081BE1DC: .4byte 0x02020630 -_081BE1E0: .4byte 0x0000ffd8 -_081BE1E4: .4byte sub_80A6EEC + 1 -_081BE1E8: .4byte sub_805CC00 + 1 -_081BE1EC: .4byte 0x0000d6f9 -_081BE1F0: .4byte 0x02038bce -_081BE1F4: .4byte 0x00000c03 -_081BE1F8: .4byte 0x08305d8c + .pool _081BE1FC: ldrh r0, [r2] bl sub_8162AA0 lsls r0, 24 - ldr r1, _081BE29C + ldr r1, =0x0830593c lsrs r0, 21 adds r0, r1 ldr r0, [r0] @@ -911546,9 +880299,9 @@ _081BE1FC: movs r2, 0x20 bl decompress_palette _081BE21A: - ldr r2, _081BE2A0 - ldr r1, _081BE2A4 - ldr r5, _081BE2A8 + ldr r2, =0x02020630 + ldr r1, =0x020241e4 + ldr r5, =0x02024064 ldrb r0, [r5] adds r0, r1 ldrb r0, [r0] @@ -911561,19 +880314,19 @@ _081BE21A: ands r0, r2 orrs r0, r4 strb r0, [r1, 0x5] - ldr r0, _081BE2AC + ldr r0, =sub_81BE2C8 + 1 movs r1, 0x5 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r4, _081BE2B0 + ldr r4, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 adds r1, r4 ldrb r0, [r5] strh r0, [r1, 0x8] - ldr r3, _081BE2B4 + ldr r3, =0x020244d0 ldr r0, [r3] ldrb r2, [r5] ldr r1, [r0, 0x4] @@ -911586,14 +880339,14 @@ _081BE21A: ands r0, r1 cmp r0, 0 beq _081BE27E - ldr r0, _081BE2B8 + ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r4 - ldr r1, _081BE2BC + ldr r1, =sub_8073C30 + 1 str r1, [r0] _081BE27E: ldr r0, [r3] @@ -911602,27 +880355,17 @@ _081BE27E: movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x9] - ldr r1, _081BE2C0 + ldr r1, =0x03005d60 ldrb r0, [r5] lsls r0, 2 adds r0, r1 - ldr r1, _081BE2C4 + ldr r1, =nullsub_77 + 1 str r1, [r0] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081BE29C: .4byte 0x0830593c -_081BE2A0: .4byte 0x02020630 -_081BE2A4: .4byte 0x020241e4 -_081BE2A8: .4byte 0x02024064 -_081BE2AC: .4byte sub_81BE2C8 + 1 -_081BE2B0: .4byte 0x03005e00 -_081BE2B4: .4byte 0x020244d0 -_081BE2B8: .4byte 0x020244b4 -_081BE2BC: .4byte sub_8073C30 + 1 -_081BE2C0: .4byte 0x03005d60 -_081BE2C4: .4byte nullsub_77 + 1 + .pool thumb_func_end sub_81BE10C thumb_func_start sub_81BE2C8 @@ -911634,7 +880377,7 @@ sub_81BE2C8: @ 81BE2C8 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r1, _081BE2F0 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r8 lsls r0, 3 @@ -911648,9 +880391,9 @@ sub_81BE2C8: @ 81BE2C8 strh r0, [r1, 0xA] b _081BE3B0 .align 2, 0 -_081BE2F0: .4byte 0x03005e00 + .pool _081BE2F4: - ldr r7, _081BE334 + ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 ldrh r0, [r1, 0x8] @@ -911659,19 +880402,19 @@ _081BE2F4: lsls r0, 24 cmp r0, 0 beq _081BE314 - ldr r0, _081BE338 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _081BE344 _081BE314: - ldr r0, _081BE33C + ldr r0, =0x02023064 ldrb r1, [r7] lsls r2, r1, 9 adds r0, 0x1 adds r2, r0 - ldr r0, _081BE340 + ldr r0, =0x0202406e lsls r1, 1 adds r1, r0 ldrh r0, [r1] @@ -911681,17 +880424,14 @@ _081BE314: bl sub_81BD0E4 b _081BE398 .align 2, 0 -_081BE334: .4byte 0x02024064 -_081BE338: .4byte 0x02022fec -_081BE33C: .4byte 0x02023064 -_081BE340: .4byte 0x0202406e + .pool _081BE344: - ldr r4, _081BE3BC + ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 adds r4, 0x1 adds r1, r4 - ldr r5, _081BE3C0 + ldr r5, =0x0202406e lsls r0, 1 adds r0, r5 ldrh r0, [r0] @@ -911716,7 +880456,7 @@ _081BE344: ldrh r2, [r0] movs r0, 0x64 muls r0, r2 - ldr r2, _081BE3C4 + ldr r2, =0x020244ec adds r0, r2 bl sub_805DD7C ldrb r0, [r7] @@ -911726,12 +880466,12 @@ _081BE344: eors r0, r6 strb r0, [r7] _081BE398: - ldr r1, _081BE3C8 - ldr r2, _081BE3CC + ldr r1, =0x03005d60 + ldr r2, =0x02024064 ldrb r0, [r2] lsls r0, 2 adds r0, r1 - ldr r1, _081BE3D0 + ldr r1, =sub_81BB02C + 1 str r1, [r0] mov r3, r9 strb r3, [r2] @@ -911745,19 +880485,14 @@ _081BE3B0: pop {r0} bx r0 .align 2, 0 -_081BE3BC: .4byte 0x02023064 -_081BE3C0: .4byte 0x0202406e -_081BE3C4: .4byte 0x020244ec -_081BE3C8: .4byte 0x03005d60 -_081BE3CC: .4byte 0x02024064 -_081BE3D0: .4byte sub_81BB02C + 1 + .pool thumb_func_end sub_81BE2C8 thumb_func_start dp01t_30_3_80EB11C dp01t_30_3_80EB11C: @ 81BE3D4 push {r4-r6,lr} - ldr r1, _081BE3FC - ldr r0, _081BE400 + ldr r1, =0x02023064 + ldr r0, =0x02024064 ldrb r2, [r0] lsls r0, r2, 9 adds r1, 0x1 @@ -911773,12 +880508,11 @@ dp01t_30_3_80EB11C: @ 81BE3D4 bl dp01_tbl3_exec_completed b _081BE478 .align 2, 0 -_081BE3FC: .4byte 0x02023064 -_081BE400: .4byte 0x02024064 + .pool _081BE404: - ldr r6, _081BE480 + ldr r6, =0x020244d0 ldr r0, [r6] - ldr r5, _081BE484 + ldr r5, =0x02024064 ldrb r1, [r5] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -911791,7 +880525,7 @@ _081BE404: strb r1, [r0] ldrb r0, [r5] lsls r3, r0, 9 - ldr r4, _081BE488 + ldr r4, =0x02023068 adds r1, r3, r4 subs r2, r4, 0x3 adds r2, r3, r2 @@ -911800,7 +880534,7 @@ _081BE404: adds r3, r4 ldrb r3, [r3] bl sub_80735DC - ldr r2, _081BE48C + ldr r2, =0x020244b4 ldrb r1, [r5] adds r1, r2 movs r3, 0 @@ -911828,31 +880562,26 @@ _081BE404: movs r1, 0x5D strb r1, [r0, 0x5] _081BE46C: - ldr r0, _081BE490 + ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 - ldr r0, _081BE494 + ldr r0, =sub_81BE498 + 1 str r0, [r1] _081BE478: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081BE480: .4byte 0x020244d0 -_081BE484: .4byte 0x02024064 -_081BE488: .4byte 0x02023068 -_081BE48C: .4byte 0x020244b4 -_081BE490: .4byte 0x03005d60 -_081BE494: .4byte sub_81BE498 + 1 + .pool thumb_func_end dp01t_30_3_80EB11C thumb_func_start sub_81BE498 sub_81BE498: @ 81BE498 push {r4,lr} - ldr r4, _081BE4D8 + ldr r4, =0x020244d0 ldr r0, [r4] - ldr r3, _081BE4DC + ldr r3, =0x02024064 ldrb r1, [r3] ldr r2, [r0, 0x4] lsls r0, r1, 1 @@ -911881,16 +880610,15 @@ _081BE4D0: pop {r0} bx r0 .align 2, 0 -_081BE4D8: .4byte 0x020244d0 -_081BE4DC: .4byte 0x02024064 + .pool thumb_func_end sub_81BE498 thumb_func_start sub_81BE4E0 sub_81BE4E0: @ 81BE4E0 push {lr} - ldr r0, _081BE51C + ldr r0, =0x020244d0 ldr r1, [r0] - ldr r0, _081BE520 + ldr r0, =0x02024064 ldrb r3, [r0] ldr r1, [r1, 0x4] lsls r0, r3, 1 @@ -911902,26 +880630,22 @@ sub_81BE4E0: @ 81BE4E0 ands r0, r1 cmp r0, 0 beq _081BE512 - ldr r2, _081BE524 - ldr r0, _081BE528 + ldr r2, =0x03005e00 + ldr r0, =0x020244b4 adds r0, r3, r0 ldrb r1, [r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _081BE52C + ldr r1, =sub_8073C30 + 1 str r1, [r0] _081BE512: bl dp01_tbl3_exec_completed pop {r0} bx r0 .align 2, 0 -_081BE51C: .4byte 0x020244d0 -_081BE520: .4byte 0x02024064 -_081BE524: .4byte 0x03005e00 -_081BE528: .4byte 0x020244b4 -_081BE52C: .4byte sub_8073C30 + 1 + .pool thumb_func_end sub_81BE4E0 thumb_func_start sub_81BE530 @@ -911935,14 +880659,14 @@ sub_81BE530: @ 81BE530 thumb_func_start sub_81BE53C sub_81BE53C: @ 81BE53C push {r4,lr} - ldr r4, _081BE58C + ldr r4, =0x02024064 ldrb r0, [r4] bl sub_80A6A90 lsls r0, 24 cmp r0, 0 beq _081BE582 - ldr r3, _081BE590 - ldr r0, _081BE594 + ldr r3, =0x02020630 + ldr r0, =0x020241e4 ldrb r1, [r4] adds r0, r1, r0 ldrb r0, [r0] @@ -911950,7 +880674,7 @@ sub_81BE53C: @ 81BE53C adds r2, r0 lsls r2, 2 adds r2, r3 - ldr r0, _081BE598 + ldr r0, =0x02023064 lsls r1, 9 adds r0, 0x1 adds r1, r0 @@ -911973,23 +880697,20 @@ _081BE582: pop {r0} bx r0 .align 2, 0 -_081BE58C: .4byte 0x02024064 -_081BE590: .4byte 0x02020630 -_081BE594: .4byte 0x020241e4 -_081BE598: .4byte 0x02023064 + .pool thumb_func_end sub_81BE53C thumb_func_start sub_81BE59C sub_81BE59C: @ 81BE59C push {r4-r6,lr} sub sp, 0x4 - ldr r6, _081BE5E0 + ldr r6, =0x02024064 ldrb r0, [r6] bl mplay_80342A4 lsls r0, 24 cmp r0, 0 bne _081BE5F4 - ldr r5, _081BE5E4 + ldr r5, =0x02023064 ldrb r2, [r6] lsls r1, r2, 9 adds r0, r5, 0x1 @@ -912013,14 +880734,13 @@ sub_81BE59C: @ 81BE59C bl dp01_tbl3_exec_completed b _081BE5F4 .align 2, 0 -_081BE5E0: .4byte 0x02024064 -_081BE5E4: .4byte 0x02023064 + .pool _081BE5E8: - ldr r0, _081BE5FC + ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 - ldr r0, _081BE600 + ldr r0, =bx_80E8A6C + 1 str r0, [r1] _081BE5F4: add sp, 0x4 @@ -912028,8 +880748,7 @@ _081BE5F4: pop {r0} bx r0 .align 2, 0 -_081BE5FC: .4byte 0x03005d60 -_081BE600: .4byte bx_80E8A6C + 1 + .pool thumb_func_end sub_81BE59C thumb_func_start sub_81BE604 @@ -912051,9 +880770,9 @@ sub_81BE610: @ 81BE610 thumb_func_start sub_81BE61C sub_81BE61C: @ 81BE61C push {r4,lr} - ldr r2, _081BE654 - ldr r1, _081BE658 - ldr r4, _081BE65C + ldr r2, =0x0202433a + ldr r1, =0x02023064 + ldr r4, =0x02024064 ldrb r0, [r4] lsls r0, 9 adds r1, 0x1 @@ -912065,21 +880784,17 @@ sub_81BE61C: @ 81BE61C movs r0, 0x3 bl sub_80A2390 bl dp01_tbl3_exec_completed - ldr r1, _081BE660 + ldr r1, =0x03005d60 ldrb r0, [r4] lsls r0, 2 adds r0, r1 - ldr r1, _081BE664 + ldr r1, =sub_80587B0 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081BE654: .4byte 0x0202433a -_081BE658: .4byte 0x02023064 -_081BE65C: .4byte 0x02024064 -_081BE660: .4byte 0x03005d60 -_081BE664: .4byte sub_80587B0 + 1 + .pool thumb_func_end sub_81BE61C thumb_func_start nullsub_128 @@ -912090,7 +880805,7 @@ nullsub_128: @ 81BE668 thumb_func_start sub_81BE66C sub_81BE66C: @ 81BE66C push {lr} - ldr r0, _081BE68C + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0xD0 @@ -912104,7 +880819,7 @@ sub_81BE66C: @ 81BE66C lsrs r0, 24 b _081BE692 .align 2, 0 -_081BE68C: .4byte 0x03005d8c + .pool _081BE690: movs r0, 0 _081BE692: @@ -912115,30 +880830,30 @@ _081BE692: thumb_func_start sub_81BE698 sub_81BE698: @ 81BE698 push {lr} - ldr r0, _081BE6A8 + ldr r0, =0x0203cf18 ldr r0, [r0] adds r0, 0x4 bl sub_8151E50 pop {r0} bx r0 .align 2, 0 -_081BE6A8: .4byte 0x0203cf18 + .pool thumb_func_end sub_81BE698 thumb_func_start sub_81BE6AC sub_81BE6AC: @ 81BE6AC - ldr r1, _081BE6B4 + ldr r1, =0x0203cf18 movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_081BE6B4: .4byte 0x0203cf18 + .pool thumb_func_end sub_81BE6AC thumb_func_start sub_81BE6B8 sub_81BE6B8: @ 81BE6B8 push {r4,lr} - ldr r4, _081BE6C8 + ldr r4, =0x0203cf18 ldr r0, [r4] cmp r0, 0 beq _081BE6CC @@ -912146,9 +880861,9 @@ sub_81BE6B8: @ 81BE6B8 str r0, [r4] b _081BE718 .align 2, 0 -_081BE6C8: .4byte 0x0203cf18 + .pool _081BE6CC: - ldr r0, _081BE720 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0xD0 @@ -912168,14 +880883,14 @@ _081BE6CC: bl sub_8151B3C ldr r0, [r4] adds r0, 0x4 - ldr r1, _081BE724 + ldr r1, =0x08617e18 bl sub_8151B68 ldr r0, [r4] adds r0, 0x4 movs r1, 0x1 movs r2, 0x1 bl sub_8151CA8 - ldr r0, _081BE728 + ldr r0, =sub_81BE698 + 1 movs r1, 0xFF bl AddTask ldr r1, [r4] @@ -912185,15 +880900,13 @@ _081BE718: pop {r0} bx r0 .align 2, 0 -_081BE720: .4byte 0x03005d8c -_081BE724: .4byte 0x08617e18 -_081BE728: .4byte sub_81BE698 + 1 + .pool thumb_func_end sub_81BE6B8 thumb_func_start sub_81BE72C sub_81BE72C: @ 81BE72C push {r4,lr} - ldr r0, _081BE790 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0xD0 @@ -912206,11 +880919,11 @@ sub_81BE72C: @ 81BE72C lsls r0, 24 cmp r0, 0 beq _081BE788 - ldr r4, _081BE794 + ldr r4, =0x0203cf18 ldr r0, [r4] cmp r0, 0 beq _081BE788 - ldr r0, _081BE798 + ldr r0, =sub_81BE698 + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -912238,15 +880951,13 @@ _081BE788: pop {r0} bx r0 .align 2, 0 -_081BE790: .4byte 0x03005d8c -_081BE794: .4byte 0x0203cf18 -_081BE798: .4byte sub_81BE698 + 1 + .pool thumb_func_end sub_81BE72C thumb_func_start sub_81BE79C sub_81BE79C: @ 81BE79C push {r4,lr} - ldr r0, _081BE7B4 + ldr r0, =0x000040cb bl var_get lsls r0, 16 cmp r0, 0 @@ -912256,7 +880967,7 @@ sub_81BE79C: @ 81BE79C bl flag_clear b _081BE7EE .align 2, 0 -_081BE7B4: .4byte 0x000040cb + .pool _081BE7B8: bl GenerateRandomNumber lsls r0, 16 @@ -912291,13 +881002,13 @@ _081BE7EE: thumb_func_start sub_81BE7F4 sub_81BE7F4: @ 81BE7F4 push {lr} - ldr r0, _081BE804 + ldr r0, =sub_81BE808 + 1 movs r1, 0x8 bl AddTask pop {r0} bx r0 .align 2, 0 -_081BE804: .4byte sub_81BE808 + 1 + .pool thumb_func_end sub_81BE7F4 thumb_func_start sub_81BE808 @@ -912306,7 +881017,7 @@ sub_81BE808: @ 81BE808 sub sp, 0x4 lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081BE88C + ldr r0, =0x03005d8c ldr r0, [r0] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -912318,9 +881029,9 @@ sub_81BE808: @ 81BE808 lsls r2, r0, 3 adds r2, r0 lsls r2, 2 - ldr r4, _081BE890 + ldr r4, =0x02037350 adds r2, r4 - ldr r3, _081BE894 + ldr r3, =0x02020630 ldrb r1, [r2, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -912329,7 +881040,7 @@ sub_81BE808: @ 81BE808 ldrh r1, [r0, 0x26] adds r1, 0x4 strh r1, [r0, 0x26] - ldr r0, _081BE898 + ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -912366,10 +881077,7 @@ _081BE882: pop {r0} bx r0 .align 2, 0 -_081BE88C: .4byte 0x03005d8c -_081BE890: .4byte 0x02037350 -_081BE894: .4byte 0x02020630 -_081BE898: .4byte 0x02037590 + .pool thumb_func_end sub_81BE808 thumb_func_start sp136_strengh_sound @@ -912390,12 +881098,12 @@ sp136_strengh_sound: @ 81BE89C lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r0, _081BE8F8 + ldr r0, =sub_81BE900 + 1 movs r1, 0x9 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081BE8FC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -912417,8 +881125,7 @@ sp136_strengh_sound: @ 81BE89C pop {r0} bx r0 .align 2, 0 -_081BE8F8: .4byte sub_81BE900 + 1 -_081BE8FC: .4byte 0x03005e00 + .pool thumb_func_end sp136_strengh_sound thumb_func_start sub_81BE900 @@ -912429,7 +881136,7 @@ sub_81BE900: @ 81BE900 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081BE964 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4, 0x2] adds r0, 0x1 @@ -912469,19 +881176,19 @@ _081BE95C: pop {r0} bx r0 .align 2, 0 -_081BE964: .4byte 0x03005e08 + .pool thumb_func_end sub_81BE900 thumb_func_start sub_81BE968 sub_81BE968: @ 81BE968 push {lr} - ldr r0, _081BE98C + ldr r0, =sub_81BE9C0 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF beq _081BE988 - ldr r0, _081BE990 + ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -912493,17 +881200,16 @@ _081BE988: pop {r0} bx r0 .align 2, 0 -_081BE98C: .4byte sub_81BE9C0 + 1 -_081BE990: .4byte 0x03005e00 + .pool thumb_func_end sub_81BE968 thumb_func_start sub_81BE994 sub_81BE994: @ 81BE994 push {lr} - ldr r0, _081BE9B8 + ldr r0, =0x08617d94 bl gpu_tile_obj_alloc_and_load_multiple bl sub_81BEA20 - ldr r0, _081BE9BC + ldr r0, =sub_81BE9C0 + 1 movs r1, 0x8 bl AddTask movs r0, 0x2 @@ -912514,8 +881220,7 @@ sub_81BE994: @ 81BE994 pop {r0} bx r0 .align 2, 0 -_081BE9B8: .4byte 0x08617d94 -_081BE9BC: .4byte sub_81BE9C0 + 1 + .pool thumb_func_end sub_81BE994 thumb_func_start sub_81BE9C0 @@ -912526,7 +881231,7 @@ sub_81BE9C0: @ 81BE9C0 lsls r1, r0, 2 adds r1, r0 lsls r3, r1, 3 - ldr r4, _081BE9F8 + ldr r4, =0x03005e08 adds r2, r3, r4 ldrh r0, [r2, 0x2] adds r0, 0x1 @@ -912543,15 +881248,14 @@ _081BE9E6: adds r0, r4, 0 subs r0, 0x8 adds r0, r3, r0 - ldr r1, _081BE9FC + ldr r1, =sub_81BEA00 + 1 str r1, [r0] _081BE9F0: pop {r4} pop {r0} bx r0 .align 2, 0 -_081BE9F8: .4byte 0x03005e08 -_081BE9FC: .4byte sub_81BEA00 + 1 + .pool thumb_func_end sub_81BE9C0 thumb_func_start sub_81BEA00 @@ -912575,9 +881279,9 @@ sub_81BEA00: @ 81BEA00 sub_81BEA20: @ 81BEA20 push {r4-r7,lr} movs r4, 0 - ldr r5, _081BEAC8 + ldr r5, =0x08617d64 adds r7, r5, 0x2 - ldr r6, _081BEACC + ldr r6, =0x02020630 _081BEA2A: lsls r0, r4, 1 adds r0, r4 @@ -912590,7 +881294,7 @@ _081BEA2A: adds r0, r7 movs r3, 0 ldrsh r2, [r0, r3] - ldr r0, _081BEAD0 + ldr r0, =0x08617e60 movs r3, 0x8 bl obj_add_from_template_forward_search lsls r0, 24 @@ -912614,9 +881318,9 @@ _081BEA2A: cmp r4, 0x7 bls _081BEA2A movs r4, 0 - ldr r5, _081BEAC8 + ldr r5, =0x08617d64 adds r7, r5, 0x2 - ldr r6, _081BEACC + ldr r6, =0x02020630 _081BEA78: lsls r0, r4, 1 adds r0, r4 @@ -912631,7 +881335,7 @@ _081BEA78: subs r2, 0x3 lsls r2, 16 asrs r2, 16 - ldr r0, _081BEAD4 + ldr r0, =0x08617e34 movs r3, 0x8 bl obj_add_from_template_forward_search lsls r0, 24 @@ -912658,10 +881362,7 @@ _081BEA78: pop {r0} bx r0 .align 2, 0 -_081BEAC8: .4byte 0x08617d64 -_081BEACC: .4byte 0x02020630 -_081BEAD0: .4byte 0x08617e60 -_081BEAD4: .4byte 0x08617e34 + .pool thumb_func_end sub_81BEA20 thumb_func_start sub_81BEAD8 @@ -912682,7 +881383,7 @@ sub_81BEAD8: @ 81BEAD8 movs r1, 0x26 ldrsh r0, [r4, r1] adds r3, r0 - ldr r2, _081BEB20 + ldr r2, =0x08617d64 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -912702,14 +881403,14 @@ _081BEB1A: pop {r0} bx r0 .align 2, 0 -_081BEB20: .4byte 0x08617d64 + .pool thumb_func_end sub_81BEAD8 thumb_func_start sub_81BEB24 sub_81BEB24: @ 81BEB24 push {r4,r5,lr} movs r4, 0 - ldr r5, _081BEB50 + ldr r5, =0x08617da4 _081BEB2A: lsls r2, r4, 2 adds r2, r5 @@ -912729,49 +881430,49 @@ _081BEB2A: pop {r0} bx r0 .align 2, 0 -_081BEB50: .4byte 0x08617da4 + .pool thumb_func_end sub_81BEB24 thumb_func_start sub_81BEB54 sub_81BEB54: @ 81BEB54 push {lr} - ldr r0, _081BEB64 + ldr r0, =sub_81BED50 + 1 movs r1, 0x9 bl AddTask pop {r0} bx r0 .align 2, 0 -_081BEB64: .4byte sub_81BED50 + 1 + .pool thumb_func_end sub_81BEB54 thumb_func_start sub_81BEB68 sub_81BEB68: @ 81BEB68 push {lr} - ldr r0, _081BEB78 + ldr r0, =sub_81BEBF4 + 1 movs r1, 0x9 bl AddTask pop {r0} bx r0 .align 2, 0 -_081BEB78: .4byte sub_81BEBF4 + 1 + .pool thumb_func_end sub_81BEB68 thumb_func_start sub_81BEB7C sub_81BEB7C: @ 81BEB7C push {lr} - ldr r0, _081BEB8C + ldr r0, =sub_81BF028 + 1 movs r1, 0x9 bl AddTask pop {r0} bx r0 .align 2, 0 -_081BEB8C: .4byte sub_81BF028 + 1 + .pool thumb_func_end sub_81BEB7C thumb_func_start sub_81BEB90 sub_81BEB90: @ 81BEB90 push {r4,lr} - ldr r4, _081BEBB0 + ldr r4, =0x0203cf14 ldr r0, [r4] ldrh r1, [r0] movs r0, 0x10 @@ -912784,7 +881485,7 @@ sub_81BEB90: @ 81BEB90 pop {r0} bx r0 .align 2, 0 -_081BEBB0: .4byte 0x0203cf14 + .pool thumb_func_end sub_81BEB90 thumb_func_start sub_81BEBB4 @@ -912792,7 +881493,7 @@ sub_81BEBB4: @ 81BEBB4 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _081BEBE4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -912802,7 +881503,7 @@ sub_81BEBB4: @ 81BEBB4 ldrsh r0, [r2, r3] cmp r0, 0 bne _081BEBEC - ldr r0, _081BEBE8 + ldr r0, =0x0203cf14 ldr r1, [r0] ldrh r0, [r1] negs r0, r0 @@ -912812,8 +881513,7 @@ sub_81BEBB4: @ 81BEBB4 bl sub_81BEB90 b _081BEBF0 .align 2, 0 -_081BEBE4: .4byte 0x03005e00 -_081BEBE8: .4byte 0x0203cf14 + .pool _081BEBEC: subs r0, r1, 0x1 strh r0, [r2, 0x8] @@ -912828,7 +881528,7 @@ sub_81BEBF4: @ 81BEBF4 sub sp, 0xC lsls r0, 24 lsrs r5, r0, 24 - ldr r1, _081BEC1C + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -912840,13 +881540,12 @@ sub_81BEBF4: @ 81BEBF4 b _081BED40 _081BEC10: lsls r0, 2 - ldr r1, _081BEC20 + ldr r1, =_081BEC24 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BEC1C: .4byte 0x03005e00 -_081BEC20: .4byte _081BEC24 + .pool .align 2, 0 _081BEC24: .4byte _081BEC40 @@ -912864,12 +881563,12 @@ _081BEC40: bl gpu_bg_config_set_field b _081BED04 _081BEC50: - ldr r4, _081BEC80 + ldr r4, =0x0203cf04 movs r0, 0x92 lsls r0, 4 bl malloc_and_clear str r0, [r4] - ldr r4, _081BEC84 + ldr r4, =0x0203cf08 movs r0, 0x80 lsls r0, 4 bl malloc_and_clear @@ -912884,11 +881583,10 @@ _081BEC50: bl bg_change_y_offset b _081BECD8 .align 2, 0 -_081BEC80: .4byte 0x0203cf04 -_081BEC84: .4byte 0x0203cf08 + .pool _081BEC88: - ldr r0, _081BECA8 - ldr r4, _081BECAC + ldr r0, =0x08617274 + ldr r4, =0x0203cf04 ldr r1, [r4] movs r2, 0x92 lsls r2, 3 @@ -912901,14 +881599,13 @@ _081BEC88: bl gpu_copy_bg_tile_pattern_data_to_vram b _081BECD8 .align 2, 0 -_081BECA8: .4byte 0x08617274 -_081BECAC: .4byte 0x0203cf04 + .pool _081BECB0: - ldr r0, _081BECEC + ldr r0, =0x0203cf08 ldr r1, [r0] movs r0, 0 bl bg_set_tilemap - ldr r1, _081BECF0 + ldr r1, =0x08617b94 movs r0, 0x6 str r0, [sp] movs r0, 0xC @@ -912922,7 +881619,7 @@ _081BECB0: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram _081BECD8: - ldr r1, _081BECF4 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -912932,9 +881629,7 @@ _081BECD8: strh r1, [r0, 0x8] b _081BED40 .align 2, 0 -_081BECEC: .4byte 0x0203cf08 -_081BECF0: .4byte 0x08617b94 -_081BECF4: .4byte 0x03005e00 + .pool _081BECF8: movs r0, 0 bl gpu_sync_bg_show @@ -912942,7 +881637,7 @@ _081BECF8: _081BED00: bl sub_81BEB24 _081BED04: - ldr r0, _081BED18 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -912952,9 +881647,9 @@ _081BED04: strh r0, [r1, 0x8] b _081BED40 .align 2, 0 -_081BED18: .4byte 0x03005e00 + .pool _081BED1C: - ldr r4, _081BED48 + ldr r4, =0x0203cf14 movs r0, 0x4 bl malloc str r0, [r4] @@ -912962,7 +881657,7 @@ _081BED1C: movs r1, 0x2 strh r1, [r0] strh r2, [r0, 0x2] - ldr r0, _081BED4C + ldr r0, =sub_81BEBB4 + 1 movs r1, 0xA bl AddTask adds r0, r5, 0 @@ -912974,8 +881669,7 @@ _081BED40: pop {r0} bx r0 .align 2, 0 -_081BED48: .4byte 0x0203cf14 -_081BED4C: .4byte sub_81BEBB4 + 1 + .pool thumb_func_end sub_81BEBF4 thumb_func_start sub_81BED50 @@ -912989,7 +881683,7 @@ sub_81BED50: @ 81BED50 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r1, _081BED88 + ldr r1, =0x03005e00 lsls r0, 2 add r0, r10 lsls r0, 3 @@ -913004,13 +881698,12 @@ sub_81BED50: @ 81BED50 b _081BF002 _081BED7C: lsls r0, 2 - ldr r1, _081BED8C + ldr r1, =_081BED90 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BED88: .4byte 0x03005e00 -_081BED8C: .4byte _081BED90 + .pool .align 2, 0 _081BED90: .4byte _081BEDB0 @@ -913022,14 +881715,14 @@ _081BED90: .4byte _081BEFF0 .4byte _081BEFF8 _081BEDB0: - ldr r4, _081BEDC0 + ldr r4, =0x0203cf10 movs r0, 0xC0 lsls r0, 2 bl malloc_and_clear str r0, [r4] b _081BF002 .align 2, 0 -_081BEDC0: .4byte 0x0203cf10 + .pool _081BEDC4: mov r1, r10 lsls r0, r1, 2 @@ -913050,7 +881743,7 @@ _081BEDC4: lsrs r4, r0, 24 movs r0, 0x30 bl malloc - ldr r3, _081BEF54 + ldr r3, =0x0203cf10 ldr r1, [r3] lsls r2, r4, 3 adds r1, r2, r1 @@ -913069,7 +881762,7 @@ _081BEDFA: cmp r5, 0x2F bls _081BEDFA movs r5, 0 - ldr r7, _081BEF54 + ldr r7, =0x0203cf10 adds r6, r2, 0 _081BEE14: bl GenerateRandomNumber @@ -913105,7 +881798,7 @@ _081BEE14: lsrs r5, r0, 16 cmp r5, 0x2F bls _081BEE14 - ldr r0, _081BEF58 + ldr r0, =0x03005e00 ldr r1, [sp, 0x8] add r1, r10 lsls r1, 3 @@ -913152,9 +881845,9 @@ _081BEE9E: lsls r0, 4 mov r9, r0 _081BEEB2: - ldr r0, _081BEF5C + ldr r0, =0x0203cf04 ldr r0, [r0] - ldr r7, _081BEF54 + ldr r7, =0x0203cf10 ldr r3, [r7] adds r3, r4, r3 ldrb r2, [r3, 0x4] @@ -913193,7 +881886,7 @@ _081BEEB2: ldr r1, [sp, 0x8] add r1, r10 lsls r1, 3 - ldr r4, _081BEF58 + ldr r4, =0x03005e00 adds r1, r4 ldrh r0, [r1, 0xC] adds r0, 0x1 @@ -913202,7 +881895,7 @@ _081BEEB2: ands r5, r0 cmp r5, 0x1 bne _081BEF24 - ldr r0, _081BEF60 + ldr r0, =0x0203cf14 ldr r1, [r0] ldrh r0, [r1, 0x2] subs r0, 0x1 @@ -913216,14 +881909,14 @@ _081BEF24: cmp r5, r0 bcc _081BEE9E _081BEF32: - ldr r0, _081BEF5C + ldr r0, =0x0203cf04 ldr r1, [r0] movs r2, 0x92 lsls r2, 4 movs r0, 0 movs r3, 0 bl gpu_copy_bg_tile_pattern_data_to_vram - ldr r0, _081BEF54 + ldr r0, =0x0203cf10 ldr r0, [r0] movs r4, 0xBE lsls r4, 2 @@ -913233,14 +881926,11 @@ _081BEF32: bhi _081BF002 b _081BF014 .align 2, 0 -_081BEF54: .4byte 0x0203cf10 -_081BEF58: .4byte 0x03005e00 -_081BEF5C: .4byte 0x0203cf04 -_081BEF60: .4byte 0x0203cf14 + .pool _081BEF64: movs r0, 0 bl bg_unset_tilemap - ldr r0, _081BEF8C + ldr r0, =sub_81BEBB4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -913248,7 +881938,7 @@ _081BEF64: beq _081BEF7C bl remove_task _081BEF7C: - ldr r0, _081BEF90 + ldr r0, =0x0203cf14 ldr r1, [r0] movs r0, 0 strh r0, [r1] @@ -913256,32 +881946,28 @@ _081BEF7C: bl sub_81BEB90 b _081BF002 .align 2, 0 -_081BEF8C: .4byte sub_81BEBB4 + 1 -_081BEF90: .4byte 0x0203cf14 + .pool _081BEF94: - ldr r4, _081BEFC0 + ldr r4, =0x0203cf14 ldr r0, [r4] bl free movs r5, 0 str r5, [r4] - ldr r4, _081BEFC4 + ldr r4, =0x0203cf10 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _081BEFC8 + ldr r4, =0x0203cf04 ldr r0, [r4] bl free str r5, [r4] - ldr r4, _081BEFCC + ldr r4, =0x0203cf08 ldr r0, [r4] bl free str r5, [r4] b _081BF002 .align 2, 0 -_081BEFC0: .4byte 0x0203cf14 -_081BEFC4: .4byte 0x0203cf10 -_081BEFC8: .4byte 0x0203cf04 -_081BEFCC: .4byte 0x0203cf08 + .pool _081BEFD0: movs r0, 0xC movs r1, 0x2 @@ -913304,7 +881990,7 @@ _081BEFF8: bl remove_task bl script_env_2_enable_and_set_ctx_running _081BF002: - ldr r0, _081BF024 + ldr r0, =0x03005e00 mov r2, r10 lsls r1, r2, 2 add r1, r10 @@ -913323,7 +882009,7 @@ _081BF014: pop {r0} bx r0 .align 2, 0 -_081BF024: .4byte 0x03005e00 + .pool thumb_func_end sub_81BED50 thumb_func_start sub_81BF028 @@ -913334,7 +882020,7 @@ sub_81BF028: @ 81BF028 sub sp, 0x18 lsls r0, 24 lsrs r7, r0, 24 - ldr r1, _081BF058 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -913348,13 +882034,12 @@ sub_81BF028: @ 81BF028 b _081BF228 _081BF04C: lsls r0, 2 - ldr r1, _081BF05C + ldr r1, =_081BF060 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BF058: .4byte 0x03005e00 -_081BF05C: .4byte _081BF060 + .pool .align 2, 0 _081BF060: .4byte _081BF080 @@ -913366,7 +882051,7 @@ _081BF060: .4byte _081BF1CC .4byte _081BF224 _081BF080: - ldr r4, _081BF0B0 + ldr r4, =0x0203cf0c movs r0, 0x14 bl malloc_and_clear str r0, [r4] @@ -913387,13 +882072,13 @@ _081BF080: strh r0, [r1, 0x10] b _081BF228 .align 2, 0 -_081BF0B0: .4byte 0x0203cf0c + .pool _081BF0B4: - ldr r0, _081BF0D4 + ldr r0, =0x0203cf0c ldr r0, [r0] ldr r1, [r0] movs r5, 0 - ldr r2, _081BF0D8 + ldr r2, =0x08617c44 _081BF0BE: adds r0, r5, r2 ldrb r0, [r0] @@ -913406,10 +882091,9 @@ _081BF0BE: bls _081BF0BE b _081BF228 .align 2, 0 -_081BF0D4: .4byte 0x0203cf0c -_081BF0D8: .4byte 0x08617c44 + .pool _081BF0DC: - ldr r0, _081BF0EC + ldr r0, =0x0203cf0c ldr r0, [r0] ldr r1, [r0, 0x4] ldr r0, [r0] @@ -913418,15 +882102,15 @@ _081BF0DC: strh r0, [r1, 0x4] b _081BF228 .align 2, 0 -_081BF0EC: .4byte 0x0203cf0c + .pool _081BF0F0: mov r1, sp - ldr r0, _081BF164 + ldr r0, =0x08617e00 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2-r4} stm r1!, {r2-r4} - ldr r4, _081BF168 + ldr r4, =0x0203cf0c ldr r0, [r4] ldr r0, [r0, 0x4] str r0, [sp, 0xC] @@ -913439,7 +882123,7 @@ _081BF0F0: ldr r1, [r4] movs r3, 0 strb r0, [r1, 0x8] - ldr r2, _081BF16C + ldr r2, =0x02020630 ldr r0, [r4] ldrb r1, [r0, 0x8] lsls r0, r1, 4 @@ -913465,7 +882149,7 @@ _081BF0F0: strh r1, [r0, 0x30] _081BF148: movs r5, 0 - ldr r2, _081BF168 + ldr r2, =0x0203cf0c _081BF14C: ldr r0, [r2] ldr r1, [r0, 0xC] @@ -913479,13 +882163,11 @@ _081BF14C: bls _081BF14C b _081BF228 .align 2, 0 -_081BF164: .4byte 0x08617e00 -_081BF168: .4byte 0x0203cf0c -_081BF16C: .4byte 0x02020630 + .pool _081BF170: movs r5, 0 movs r6, 0xFF - ldr r0, _081BF1BC + ldr r0, =0x000001ff mov r8, r0 _081BF178: bl GenerateRandomNumber @@ -913494,7 +882176,7 @@ _081BF178: bl GenerateRandomNumber adds r1, r6, 0 ands r1, r0 - ldr r0, _081BF1C0 + ldr r0, =0x0203cf0c ldr r3, [r0] ldr r0, [r3, 0xC] lsls r1, 1 @@ -913510,24 +882192,21 @@ _081BF178: lsrs r5, r0, 16 cmp r5, r8 bls _081BF178 - ldr r2, _081BF1C4 + ldr r2, =0x02020630 ldrb r1, [r3, 0x8] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _081BF1C8 + ldr r1, =sub_81BF248 + 1 str r1, [r0] b _081BF228 .align 2, 0 -_081BF1BC: .4byte 0x000001ff -_081BF1C0: .4byte 0x0203cf0c -_081BF1C4: .4byte 0x02020630 -_081BF1C8: .4byte sub_81BF248 + 1 + .pool _081BF1CC: - ldr r3, _081BF218 - ldr r5, _081BF21C + ldr r3, =0x02020630 + ldr r5, =0x0203cf0c ldr r0, [r5] ldrb r1, [r0, 0x8] lsls r0, r1, 4 @@ -913537,7 +882216,7 @@ _081BF1CC: adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, _081BF220 + ldr r0, =nullsub_12 + 1 cmp r1, r0 bne _081BF238 adds r0, r2, r3 @@ -913560,13 +882239,11 @@ _081BF1CC: str r4, [r5] b _081BF228 .align 2, 0 -_081BF218: .4byte 0x02020630 -_081BF21C: .4byte 0x0203cf0c -_081BF220: .4byte nullsub_12 + 1 + .pool _081BF224: bl script_env_2_enable_and_set_ctx_running _081BF228: - ldr r0, _081BF244 + ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 lsls r1, 3 @@ -913582,7 +882259,7 @@ _081BF238: pop {r0} bx r0 .align 2, 0 -_081BF244: .4byte 0x03005e00 + .pool thumb_func_end sub_81BF028 thumb_func_start sub_81BF248 @@ -913590,17 +882267,16 @@ sub_81BF248: @ 81BF248 push {r4,r5,lr} sub sp, 0x4 adds r5, r0, 0 - ldr r0, _081BF260 + ldr r0, =0x0203cf0c ldr r0, [r0] ldrh r0, [r0, 0x10] cmp r0, 0xFF bls _081BF268 - ldr r0, _081BF264 + ldr r0, =nullsub_12 + 1 str r0, [r5, 0x1C] b _081BF2B0 .align 2, 0 -_081BF260: .4byte 0x0203cf0c -_081BF264: .4byte nullsub_12 + 1 + .pool _081BF268: ldrh r1, [r5, 0x22] movs r2, 0x22 @@ -913609,7 +882285,7 @@ _081BF268: ble _081BF2AC movs r4, 0 _081BF274: - ldr r0, _081BF2A8 + ldr r0, =0x0203cf0c ldr r3, [r0] ldr r0, [r3] ldrh r1, [r3, 0x10] @@ -913634,7 +882310,7 @@ _081BF274: bl obj_anim_image_start b _081BF2B0 .align 2, 0 -_081BF2A8: .4byte 0x0203cf0c + .pool _081BF2AC: adds r0, r1, 0x1 strh r0, [r5, 0x22] @@ -913678,7 +882354,7 @@ sub_81BF2B8: @ 81BF2B8 adds r5, r0, 0 lsls r5, 24 lsrs r4, r5, 24 - ldr r3, _081BF380 + ldr r3, =0x030012a8 strh r4, [r3] mov r0, r10 adds r1, r7, 0 @@ -913746,13 +882422,13 @@ sub_81BF2B8: @ 81BF2B8 pop {r0} bx r0 .align 2, 0 -_081BF380: .4byte 0x030012a8 + .pool thumb_func_end sub_81BF2B8 thumb_func_start sub_81BF384 sub_81BF384: @ 81BF384 push {r4,lr} - ldr r0, _081BF3D0 + ldr r0, =0x0000ffff bl disable_irqs movs r0, 0x1 bl enable_irqs @@ -913765,7 +882441,7 @@ sub_81BF384: @ 81BF384 movs r0, 0 movs r1, 0 bl lcd_io_set - ldr r4, _081BF3D4 + ldr r4, =0x030012b8 movs r0, 0x50 bl malloc_and_clear str r0, [r4] @@ -913774,22 +882450,20 @@ sub_81BF384: @ 81BF384 ldr r1, [r4] movs r0, 0x6 strb r0, [r1, 0x1] - ldr r0, _081BF3D8 + ldr r0, =sub_81BF3DC + 1 bl set_callback2 pop {r4} pop {r0} bx r0 .align 2, 0 -_081BF3D0: .4byte 0x0000ffff -_081BF3D4: .4byte 0x030012b8 -_081BF3D8: .4byte sub_81BF3DC + 1 + .pool thumb_func_end sub_81BF384 thumb_func_start sub_81BF3DC sub_81BF3DC: @ 81BF3DC push {r4,r5,lr} sub sp, 0x4 - ldr r1, _081BF3F8 + ldr r1, =0x030012b8 ldr r0, [r1] ldrb r0, [r0] adds r5, r1, 0 @@ -913798,13 +882472,12 @@ sub_81BF3DC: @ 81BF3DC b _081BF592 _081BF3EE: lsls r0, 2 - ldr r1, _081BF3FC + ldr r1, =_081BF400 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BF3F8: .4byte 0x030012b8 -_081BF3FC: .4byte _081BF400 + .pool .align 2, 0 _081BF400: .4byte _081BF420 @@ -913817,12 +882490,12 @@ _081BF400: .4byte _081BF574 _081BF420: bl sub_81BF5A4 - ldr r0, _081BF42C + ldr r0, =0x030012b8 ldr r1, [r0] movs r0, 0x1 b _081BF590 .align 2, 0 -_081BF42C: .4byte 0x030012b8 + .pool _081BF430: movs r0, 0x5 bl sub_81BF7A4 @@ -913830,7 +882503,7 @@ _081BF430: beq _081BF43C b _081BF592 _081BF43C: - ldr r0, _081BF454 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -913838,13 +882511,12 @@ _081BF43C: bne _081BF44A b _081BF592 _081BF44A: - ldr r0, _081BF458 + ldr r0, =0x030012b8 ldr r1, [r0] movs r0, 0x2 b _081BF590 .align 2, 0 -_081BF454: .4byte 0x030022c0 -_081BF458: .4byte 0x030012b8 + .pool _081BF45C: movs r0, 0 bl sub_81BF7A4 @@ -913852,7 +882524,7 @@ _081BF45C: beq _081BF468 b _081BF592 _081BF468: - ldr r0, _081BF480 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -913860,13 +882532,12 @@ _081BF468: bne _081BF476 b _081BF592 _081BF476: - ldr r0, _081BF484 + ldr r0, =0x030012b8 ldr r1, [r0] movs r0, 0x3 b _081BF590 .align 2, 0 -_081BF480: .4byte 0x030022c0 -_081BF484: .4byte 0x030012b8 + .pool _081BF488: movs r0, 0x1 bl sub_81BF7A4 @@ -913874,9 +882545,9 @@ _081BF488: beq _081BF494 b _081BF592 _081BF494: - ldr r4, _081BF4B4 + ldr r4, =0x030012b8 ldr r0, [r4] - ldr r1, _081BF4B8 + ldr r1, =0x089a6550 str r1, [r0, 0x2C] adds r0, 0x4F movs r5, 0 @@ -913889,8 +882560,7 @@ _081BF494: movs r0, 0x4 b _081BF590 .align 2, 0 -_081BF4B4: .4byte 0x030012b8 -_081BF4B8: .4byte 0x089a6550 + .pool _081BF4BC: adds r4, r5, 0 ldr r0, [r4] @@ -913901,7 +882571,7 @@ _081BF4BC: cmp r0, 0 bne _081BF4D8 ldr r0, [r4, 0x20] - ldr r1, _081BF4E0 + ldr r1, =0x00020200 ands r0, r1 cmp r0, r1 beq _081BF4E4 @@ -913910,7 +882580,7 @@ _081BF4D8: strh r0, [r4, 0x2] b _081BF592 .align 2, 0 -_081BF4E0: .4byte 0x00020200 + .pool _081BF4E4: ldrh r0, [r4, 0x2] adds r0, 0x1 @@ -913920,8 +882590,8 @@ _081BF4E4: cmp r0, 0xB4 bls _081BF592 adds r0, r4, 0x4 - ldr r1, _081BF50C - ldr r2, _081BF510 + ldr r1, =0x089a6610 + ldr r2, =0x089aa144 subs r2, r1 movs r3, 0x1 str r3, [sp] @@ -913931,15 +882601,14 @@ _081BF4E4: movs r0, 0x5 b _081BF590 .align 2, 0 -_081BF50C: .4byte 0x089a6610 -_081BF510: .4byte 0x089aa144 + .pool _081BF514: movs r0, 0x2 bl sub_81BF7A4 adds r4, r0, 0 cmp r4, 0x2 bne _081BF592 - ldr r5, _081BF53C + ldr r5, =0x030012b8 ldr r0, [r5] adds r0, 0x4 bl sub_81BA70C @@ -913952,7 +882621,7 @@ _081BF514: movs r0, 0x6 b _081BF590 .align 2, 0 -_081BF53C: .4byte 0x030012b8 + .pool _081BF540: ldr r1, [r5] adds r0, r1, 0 @@ -913968,7 +882637,7 @@ _081BF552: bl sub_81BF7A4 cmp r0, 0x3 bne _081BF592 - ldr r0, _081BF570 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -913977,19 +882646,19 @@ _081BF552: bl do_reset b _081BF592 .align 2, 0 -_081BF570: .4byte 0x030022c0 + .pool _081BF574: movs r0, 0x4 bl sub_81BF7A4 cmp r0, 0x4 bne _081BF592 - ldr r0, _081BF59C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _081BF592 - ldr r0, _081BF5A0 + ldr r0, =0x030012b8 ldr r1, [r0] movs r0, 0x1 _081BF590: @@ -914000,8 +882669,7 @@ _081BF592: pop {r0} bx r0 .align 2, 0 -_081BF59C: .4byte 0x030022c0 -_081BF5A0: .4byte 0x030012b8 + .pool thumb_func_end sub_81BF3DC thumb_func_start sub_81BF5A4 @@ -914033,13 +882701,13 @@ sub_81BF5A4: @ 81BF5A4 bl lcd_io_set movs r1, 0 str r1, [sp, 0xC] - ldr r4, _081BF770 + ldr r4, =0x040000d4 add r0, sp, 0xC str r0, [r4] movs r0, 0xC0 lsls r0, 19 str r0, [r4, 0x4] - ldr r0, _081BF774 + ldr r0, =0x85006000 str r0, [r4, 0x8] ldr r0, [r4, 0x8] str r1, [sp, 0xC] @@ -914048,7 +882716,7 @@ sub_81BF5A4: @ 81BF5A4 movs r0, 0xE0 lsls r0, 19 str r0, [r4, 0x4] - ldr r2, _081BF778 + ldr r2, =0x85000100 str r2, [r4, 0x8] ldr r0, [r4, 0x8] str r1, [sp, 0xC] @@ -914061,7 +882729,7 @@ sub_81BF5A4: @ 81BF5A4 ldr r0, [r4, 0x8] movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081BF77C + ldr r1, =0x08618108 movs r0, 0 movs r2, 0x2 bl bg_vram_setup @@ -914081,14 +882749,14 @@ sub_81BF5A4: @ 81BF5A4 movs r1, 0 movs r2, 0 bl bg_change_y_offset - ldr r0, _081BF780 + ldr r0, =0x08618110 bl Window_InitFromTemplates bl TextBox_ResetSomeField - ldr r0, _081BF784 + ldr r0, =0x08618138 str r0, [r4] - ldr r0, _081BF788 + ldr r0, =0x050001e0 str r0, [r4, 0x4] - ldr r0, _081BF78C + ldr r0, =0x84000008 str r0, [r4, 0x8] ldr r0, [r4, 0x8] movs r0, 0 @@ -914103,7 +882771,7 @@ sub_81BF5A4: @ 81BF5A4 movs r0, 0 movs r1, 0xAA bl Window_FastFillPixels - ldr r5, _081BF790 + ldr r5, =0x08617e9b movs r0, 0 adds r1, r5, 0 movs r2, 0 @@ -914116,7 +882784,7 @@ sub_81BF5A4: @ 81BF5A4 asrs r0, 1 lsls r2, r0, 24 lsrs r2, 24 - ldr r6, _081BF794 + ldr r6, =0x0861815b str r6, [sp] movs r0, 0x1 negs r0, r0 @@ -914127,7 +882795,7 @@ sub_81BF5A4: @ 81BF5A4 movs r1, 0 movs r3, 0x3 bl box_print - ldr r5, _081BF798 + ldr r5, =0x08617e8d movs r0, 0 adds r1, r5, 0 movs r2, 0 @@ -914169,7 +882837,7 @@ sub_81BF5A4: @ 81BF5A4 movs r1, 0 movs r3, 0 bl box_print - ldr r4, _081BF79C + ldr r4, =0x08617e78 movs r0, 0x1 adds r1, r4, 0 movs r2, 0 @@ -914182,7 +882850,7 @@ sub_81BF5A4: @ 81BF5A4 asrs r0, 1 lsls r2, r0, 24 lsrs r2, 24 - ldr r0, _081BF7A0 + ldr r0, =0x08618158 str r0, [sp] mov r0, r8 str r0, [sp, 0x4] @@ -914207,26 +882875,14 @@ sub_81BF5A4: @ 81BF5A4 pop {r0} bx r0 .align 2, 0 -_081BF770: .4byte 0x040000d4 -_081BF774: .4byte 0x85006000 -_081BF778: .4byte 0x85000100 -_081BF77C: .4byte 0x08618108 -_081BF780: .4byte 0x08618110 -_081BF784: .4byte 0x08618138 -_081BF788: .4byte 0x050001e0 -_081BF78C: .4byte 0x84000008 -_081BF790: .4byte 0x08617e9b -_081BF794: .4byte 0x0861815b -_081BF798: .4byte 0x08617e8d -_081BF79C: .4byte 0x08617e78 -_081BF7A0: .4byte 0x08618158 + .pool thumb_func_end sub_81BF5A4 thumb_func_start sub_81BF7A4 sub_81BF7A4: @ 81BF7A4 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _081BF7B8 + ldr r5, =0x030012b8 ldr r0, [r5] ldrb r0, [r0, 0x1] cmp r0, r4 @@ -914234,7 +882890,7 @@ sub_81BF7A4: @ 81BF7A4 adds r0, r4, 0 b _081BF7DC .align 2, 0 -_081BF7B8: .4byte 0x030012b8 + .pool _081BF7BC: cmp r0, 0x6 bne _081BF7CC @@ -914249,7 +882905,7 @@ _081BF7CC: movs r0, 0x6 strb r0, [r1, 0x1] _081BF7D6: - ldr r0, _081BF7E4 + ldr r0, =0x030012b8 ldr r0, [r0] ldrb r0, [r0, 0x1] _081BF7DC: @@ -914257,7 +882913,7 @@ _081BF7DC: pop {r1} bx r1 .align 2, 0 -_081BF7E4: .4byte 0x030012b8 + .pool thumb_func_end sub_81BF7A4 thumb_func_start sub_81BF7E8 @@ -914276,12 +882932,12 @@ sub_81BF7E8: @ 81BF7E8 movs r0, 0x1 movs r1, 0xAA bl Window_FastFillPixels - ldr r0, _081BF844 + ldr r0, =0x08618158 str r0, [sp] movs r0, 0x1 negs r0, r0 str r0, [sp, 0x4] - ldr r0, _081BF848 + ldr r0, =0x08618160 lsls r4, r6, 2 adds r0, r4, r0 ldr r0, [r0] @@ -914298,14 +882954,12 @@ sub_81BF7E8: @ 81BF7E8 bl Window_CopyToVram cmp r6, 0x5 bhi _081BF87E - ldr r0, _081BF84C + ldr r0, =_081BF850 adds r0, r4, r0 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BF844: .4byte 0x08618158 -_081BF848: .4byte 0x08618160 -_081BF84C: .4byte _081BF850 + .pool .align 2, 0 _081BF850: .4byte _081BF868 @@ -914328,25 +882982,25 @@ _081BF878: _081BF87E: movs r0, 0 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r5, _081BF8C8 + ldr r5, =0x08618178 lsls r4, r6, 1 adds r4, r6 lsls r4, 2 adds r0, r4, r5 ldr r0, [r0] - ldr r1, _081BF8CC + ldr r1, =0x06004000 bl LZ77UnCompVram adds r0, r5, 0x4 adds r0, r4, r0 ldr r0, [r0] - ldr r1, _081BF8D0 + ldr r1, =0x0600f800 bl LZ77UnCompVram adds r5, 0x8 adds r4, r5 ldr r0, [r4] movs r1, 0xA0 lsls r1, 19 - ldr r2, _081BF8D4 + ldr r2, =0x04000040 bl CpuSet movs r0, 0 bl gpu_sync_bg_show @@ -914357,10 +883011,7 @@ _081BF87E: pop {r0} bx r0 .align 2, 0 -_081BF8C8: .4byte 0x08618178 -_081BF8CC: .4byte 0x06004000 -_081BF8D0: .4byte 0x0600f800 -_081BF8D4: .4byte 0x04000040 + .pool thumb_func_end sub_81BF7E8 thumb_func_start sub_81BF8D8 @@ -914388,11 +883039,11 @@ sub_81BF8EC: @ 81BF8EC lsrs r5, 24 lsls r6, 24 lsrs r6, 24 - ldr r4, _081BF93C - ldr r0, _081BF940 + ldr r4, =0x0203cf1c + ldr r0, =0x000040f8 bl malloc_and_clear str r0, [r4] - ldr r1, _081BF944 + ldr r1, =0x000040bc adds r0, r1 strb r7, [r0] ldr r0, [r4] @@ -914402,7 +883053,7 @@ sub_81BF8EC: @ 81BF8EC adds r0, r1 strb r5, [r0] ldr r0, [r4] - ldr r2, _081BF948 + ldr r2, =0x000040bf adds r0, r2 strb r6, [r0] ldr r1, [r4] @@ -914415,12 +883066,9 @@ sub_81BF8EC: @ 81BF8EC movs r0, 0x1 b _081BF952 .align 2, 0 -_081BF93C: .4byte 0x0203cf1c -_081BF940: .4byte 0x000040f8 -_081BF944: .4byte 0x000040bc -_081BF948: .4byte 0x000040bf + .pool _081BF94C: - ldr r0, _081BF964 + ldr r0, =0x000040bd adds r1, r0 movs r0, 0 _081BF952: @@ -914431,67 +883079,61 @@ _081BF952: bgt _081BF96C cmp r7, 0 beq _081BF97C - ldr r2, _081BF968 + ldr r2, =0x0203cf1c b _081BF9EE .align 2, 0 -_081BF964: .4byte 0x000040bd -_081BF968: .4byte 0x0203cf1c + .pool _081BF96C: cmp r7, 0x2 beq _081BF97C cmp r7, 0x3 beq _081BF9D0 - ldr r2, _081BF978 + ldr r2, =0x0203cf1c b _081BF9EE .align 2, 0 -_081BF978: .4byte 0x0203cf1c + .pool _081BF97C: - ldr r2, _081BF994 + ldr r2, =0x0203cf1c ldr r0, [r2] - ldr r1, _081BF998 + ldr r1, =0x000040c1 adds r0, r1 movs r1, 0 strb r1, [r0] ldr r0, [r2] - ldr r1, _081BF99C + ldr r1, =0x000040c2 adds r0, r1 movs r1, 0x3 b _081BF9EC .align 2, 0 -_081BF994: .4byte 0x0203cf1c -_081BF998: .4byte 0x000040c1 -_081BF99C: .4byte 0x000040c2 + .pool _081BF9A0: - ldr r2, _081BF9C0 + ldr r2, =0x0203cf1c ldr r0, [r2] - ldr r1, _081BF9C4 + ldr r1, =0x000040c1 adds r0, r1 movs r1, 0 strb r1, [r0] ldr r0, [r2] - ldr r1, _081BF9C8 + ldr r1, =0x000040c2 adds r0, r1 movs r1, 0x3 strb r1, [r0] ldr r0, [r2] - ldr r1, _081BF9CC + ldr r1, =0x000040c8 adds r0, r1 strb r7, [r0] b _081BF9EE .align 2, 0 -_081BF9C0: .4byte 0x0203cf1c -_081BF9C4: .4byte 0x000040c1 -_081BF9C8: .4byte 0x000040c2 -_081BF9CC: .4byte 0x000040c8 + .pool _081BF9D0: - ldr r2, _081BFA24 + ldr r2, =0x0203cf1c ldr r0, [r2] - ldr r1, _081BFA28 + ldr r1, =0x000040c1 adds r0, r1 movs r1, 0x2 strb r1, [r0] ldr r0, [r2] - ldr r1, _081BFA2C + ldr r1, =0x000040c2 adds r0, r1 strb r7, [r0] ldr r0, [r2] @@ -914502,7 +883144,7 @@ _081BF9EC: strb r1, [r0] _081BF9EE: ldr r0, [r2] - ldr r2, _081BFA28 + ldr r2, =0x000040c1 adds r1, r0, r2 ldrb r1, [r1] subs r2, 0x1 @@ -914510,7 +883152,7 @@ _081BF9EE: strb r1, [r0] movs r0, 0xFF bl sub_81C488C - ldr r0, _081BFA30 + ldr r0, =0x020244d4 ldr r0, [r0] cmp r0, 0 bne _081BFA12 @@ -914518,7 +883160,7 @@ _081BF9EE: movs r1, 0 bl sub_806F2AC _081BFA12: - ldr r0, _081BFA34 + ldr r0, =sub_81BFAE4 + 1 bl set_callback2 pop {r3} mov r8, r3 @@ -914526,11 +883168,7 @@ _081BFA12: pop {r0} bx r0 .align 2, 0 -_081BFA24: .4byte 0x0203cf1c -_081BFA28: .4byte 0x000040c1 -_081BFA2C: .4byte 0x000040c2 -_081BFA30: .4byte 0x020244d4 -_081BFA34: .4byte sub_81BFAE4 + 1 + .pool thumb_func_end sub_81BF8EC thumb_func_start sub_81BFA38 @@ -914555,9 +883193,9 @@ sub_81BFA38: @ 81BFA38 adds r2, r4, 0 adds r3, r5, 0 bl sub_81BF8EC - ldr r0, _081BFA78 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081BFA7C + ldr r1, =0x000040c4 adds r0, r1 strh r6, [r0] add sp, 0x4 @@ -914567,8 +883205,7 @@ sub_81BFA38: @ 81BFA38 pop {r0} bx r0 .align 2, 0 -_081BFA78: .4byte 0x0203cf1c -_081BFA7C: .4byte 0x000040c4 + .pool thumb_func_end sub_81BFA38 thumb_func_start sub_81BFA80 @@ -914584,9 +883221,9 @@ sub_81BFA80: @ 81BFA80 lsrs r3, 24 str r4, [sp] bl sub_81BF8EC - ldr r0, _081BFAAC + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081BFAB0 + ldr r1, =0x000040ef adds r0, r1 movs r1, 0x1 strb r1, [r0] @@ -914595,8 +883232,7 @@ sub_81BFA80: @ 81BFA80 pop {r0} bx r0 .align 2, 0 -_081BFAAC: .4byte 0x0203cf1c -_081BFAB0: .4byte 0x000040ef + .pool thumb_func_end sub_81BFA80 thumb_func_start sub_81BFAB4 @@ -914649,7 +883285,7 @@ _081BFB0A: sub_81BFB10: @ 81BFB10 push {r4,lr} sub sp, 0x4 - ldr r0, _081BFB30 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -914659,13 +883295,12 @@ sub_81BFB10: @ 81BFB10 b _081BFE00 _081BFB24: lsls r0, 2 - ldr r1, _081BFB34 + ldr r1, =_081BFB38 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BFB30: .4byte 0x030022c0 -_081BFB34: .4byte _081BFB38 + .pool .align 2, 0 _081BFB38: .4byte _081BFB9C @@ -914700,46 +883335,45 @@ _081BFB9C: b _081BFDE6 _081BFBAA: bl remove_some_task - ldr r1, _081BFBB8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081BFDEE .align 2, 0 -_081BFBB8: .4byte 0x030022c0 + .pool _081BFBBC: bl sub_80A1A74 - ldr r2, _081BFBCC + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 b _081BFDE4 .align 2, 0 -_081BFBCC: .4byte 0x02037fd4 + .pool _081BFBD0: bl reset_all_obj_data - ldr r1, _081BFBE0 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081BFDEE .align 2, 0 -_081BFBE0: .4byte 0x030022c0 + .pool _081BFBE4: bl gpu_pal_allocator_reset b _081BFDE6 _081BFBEA: bl sub_81BFE24 - ldr r0, _081BFBFC + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081BFC00 + ldr r1, =0x000040f0 adds r0, r1 movs r1, 0 strh r1, [r0] b _081BFDE6 .align 2, 0 -_081BFBFC: .4byte 0x0203cf1c -_081BFC00: .4byte 0x000040f0 + .pool _081BFC04: bl sub_81BFEB0 lsls r0, 24 @@ -914747,41 +883381,40 @@ _081BFC04: bne _081BFC10 b _081BFE18 _081BFC10: - ldr r1, _081BFC1C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081BFDEE .align 2, 0 -_081BFC1C: .4byte 0x030022c0 + .pool _081BFC20: bl sub_81C2554 b _081BFDE6 _081BFC26: bl sub_81C1BA0 - ldr r1, _081BFC34 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081BFDEE .align 2, 0 -_081BFC34: .4byte 0x030022c0 + .pool _081BFC38: - ldr r4, _081BFC50 + ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0xC bl sub_81C0098 ldr r0, [r4] - ldr r1, _081BFC54 + ldr r1, =0x000040f0 adds r0, r1 movs r1, 0 strh r1, [r0] b _081BFDE6 .align 2, 0 -_081BFC50: .4byte 0x0203cf1c -_081BFC54: .4byte 0x000040f0 + .pool _081BFC58: - ldr r0, _081BFC74 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C00F0 @@ -914790,80 +883423,76 @@ _081BFC58: bne _081BFC6A b _081BFE18 _081BFC6A: - ldr r1, _081BFC78 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081BFDEE .align 2, 0 -_081BFC74: .4byte 0x0203cf1c -_081BFC78: .4byte 0x030022c0 + .pool _081BFC7C: bl sub_81C25E8 b _081BFDE6 _081BFC82: bl sub_81C286C - ldr r1, _081BFC90 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081BFDEE .align 2, 0 -_081BFC90: .4byte 0x030022c0 + .pool _081BFC94: - ldr r0, _081BFCA4 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081BFCA8 + ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] bl sub_81C2D9C b _081BFDE6 .align 2, 0 -_081BFCA4: .4byte 0x0203cf1c -_081BFCA8: .4byte 0x000040c0 + .pool _081BFCAC: bl sub_81C0348 - ldr r1, _081BFCBC + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081BFDEE .align 2, 0 -_081BFCBC: .4byte 0x030022c0 + .pool _081BFCC0: - ldr r0, _081BFCD0 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081BFCD4 + ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] bl sub_81C2AFC b _081BFDE6 .align 2, 0 -_081BFCD0: .4byte 0x0203cf1c -_081BFCD4: .4byte 0x000040c0 + .pool _081BFCD8: bl sub_81C4190 bl sub_81C42C8 - ldr r0, _081BFCF0 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081BFCF4 + ldr r1, =0x000040f0 adds r0, r1 movs r1, 0 strh r1, [r0] b _081BFDE6 .align 2, 0 -_081BFCF0: .4byte 0x0203cf1c -_081BFCF4: .4byte 0x000040f0 + .pool _081BFCF8: - ldr r4, _081BFD28 + ldr r4, =0x0203cf1c ldr r1, [r4] adds r0, r1, 0 adds r0, 0xC - ldr r2, _081BFD2C + ldr r2, =0x000040f0 adds r1, r2 bl sub_81C45F4 ldr r1, [r4] - ldr r2, _081BFD30 + ldr r2, =0x000040d3 adds r1, r2 strb r0, [r1] ldr r1, [r4] @@ -914873,84 +883502,79 @@ _081BFCF8: bne _081BFD1C b _081BFE18 _081BFD1C: - ldr r0, _081BFD2C + ldr r0, =0x000040f0 adds r1, r0 movs r0, 0 strh r0, [r1] b _081BFDE6 .align 2, 0 -_081BFD28: .4byte 0x0203cf1c -_081BFD2C: .4byte 0x000040f0 -_081BFD30: .4byte 0x000040d3 + .pool _081BFD34: - ldr r0, _081BFD48 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C4984 - ldr r1, _081BFD4C + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081BFDEE .align 2, 0 -_081BFD48: .4byte 0x0203cf1c -_081BFD4C: .4byte 0x030022c0 + .pool _081BFD50: - ldr r0, _081BFD5C + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C4A08 b _081BFDE6 .align 2, 0 -_081BFD5C: .4byte 0x0203cf1c + .pool _081BFD60: bl sub_81C4A88 - ldr r1, _081BFD70 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081BFDEE .align 2, 0 -_081BFD70: .4byte 0x030022c0 + .pool _081BFD74: bl sub_81C4280 b _081BFDE6 _081BFD7A: - ldr r0, _081BFD94 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081BFD98 + ldr r1, =0x000040bc adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 beq _081BFDA0 - ldr r0, _081BFD9C + ldr r0, =sub_81C0510 + 1 movs r1, 0 bl AddTask b _081BFDE6 .align 2, 0 -_081BFD94: .4byte 0x0203cf1c -_081BFD98: .4byte 0x000040bc -_081BFD9C: .4byte sub_81C0510 + 1 + .pool _081BFDA0: - ldr r0, _081BFDAC + ldr r0, =sub_81C171C + 1 movs r1, 0 bl AddTask b _081BFDE6 .align 2, 0 -_081BFDAC: .4byte sub_81C171C + 1 + .pool _081BFDB0: movs r0, 0x1 negs r0, r0 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r1, _081BFDC8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 b _081BFDEE .align 2, 0 -_081BFDC8: .4byte 0x030022c0 + .pool _081BFDCC: movs r0, 0x1 negs r0, r0 @@ -914959,14 +883583,14 @@ _081BFDCC: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r2, _081BFDF8 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 _081BFDE4: strb r0, [r2, 0x8] _081BFDE6: - ldr r1, _081BFDFC + ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 @@ -914976,18 +883600,16 @@ _081BFDEE: strb r0, [r1] b _081BFE18 .align 2, 0 -_081BFDF8: .4byte 0x02037fd4 -_081BFDFC: .4byte 0x030022c0 + .pool _081BFE00: - ldr r0, _081BFE10 + ldr r0, =sub_81BFAD0 + 1 bl SetVBlankCallback - ldr r0, _081BFE14 + ldr r0, =sub_81BFAB4 + 1 bl set_callback2 movs r0, 0x1 b _081BFE1A .align 2, 0 -_081BFE10: .4byte sub_81BFAD0 + 1 -_081BFE14: .4byte sub_81BFAB4 + 1 + .pool _081BFE18: movs r0, 0 _081BFE1A: @@ -915002,18 +883624,18 @@ sub_81BFE24: @ 81BFE24 push {r4,lr} movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081BFEA0 + ldr r1, =0x0861cbb4 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r4, _081BFEA4 + ldr r4, =0x0203cf1c ldr r1, [r4] - ldr r0, _081BFEA8 + ldr r0, =0x000020bc adds r1, r0 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081BFEAC + ldr r0, =0x000010bc adds r1, r0 movs r0, 0x2 bl bg_set_tilemap @@ -915047,19 +883669,16 @@ sub_81BFE24: @ 81BFE24 pop {r0} bx r0 .align 2, 0 -_081BFEA0: .4byte 0x0861cbb4 -_081BFEA4: .4byte 0x0203cf1c -_081BFEA8: .4byte 0x000020bc -_081BFEAC: .4byte 0x000010bc + .pool thumb_func_end sub_81BFE24 thumb_func_start sub_81BFEB0 sub_81BFEB0: @ 81BFEB0 push {r4,lr} sub sp, 0x4 - ldr r1, _081BFED4 + ldr r1, =0x0203cf1c ldr r0, [r1] - ldr r2, _081BFED8 + ldr r2, =0x000040f0 adds r0, r2 movs r2, 0 ldrsh r0, [r0, r2] @@ -915069,14 +883688,12 @@ sub_81BFEB0: @ 81BFEB0 b _081C008C _081BFEC8: lsls r0, 2 - ldr r1, _081BFEDC + ldr r1, =_081BFEE0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081BFED4: .4byte 0x0203cf1c -_081BFED8: .4byte 0x000040f0 -_081BFEDC: .4byte _081BFEE0 + .pool .align 2, 0 _081BFEE0: .4byte _081BFF14 @@ -915094,7 +883711,7 @@ _081BFEE0: .4byte _081C0064 _081BFF14: bl reset_temp_tile_data_buffers - ldr r1, _081BFF2C + ldr r1, =0x08d97d0c movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -915103,7 +883720,7 @@ _081BFF14: bl decompress_and_copy_tile_data_to_vram b _081C0046 .align 2, 0 -_081BFF2C: .4byte 0x08d97d0c + .pool _081BFF30: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -915112,127 +883729,114 @@ _081BFF30: bne _081BFF3E b _081C008C _081BFF3E: - ldr r0, _081BFF54 - ldr r4, _081BFF58 + ldr r0, =0x08d9862c + ldr r4, =0x0203cf1c ldr r1, [r4] adds r1, 0xBC bl call_LZZUnCompWram ldr r1, [r4] - ldr r2, _081BFF5C + ldr r2, =0x000040f0 adds r1, r2 b _081C004E .align 2, 0 -_081BFF54: .4byte 0x08d9862c -_081BFF58: .4byte 0x0203cf1c -_081BFF5C: .4byte 0x000040f0 + .pool _081BFF60: - ldr r0, _081BFF70 + ldr r0, =0x08d98cc8 ldr r1, [r4] - ldr r2, _081BFF74 + ldr r2, =0x000008bc adds r1, r2 bl call_LZZUnCompWram ldr r1, [r4] b _081C004A .align 2, 0 -_081BFF70: .4byte 0x08d98cc8 -_081BFF74: .4byte 0x000008bc + .pool _081BFF78: - ldr r0, _081BFF88 + ldr r0, =0x08d987fc ldr r1, [r4] - ldr r2, _081BFF8C + ldr r2, =0x000018bc adds r1, r2 bl call_LZZUnCompWram ldr r1, [r4] b _081C004A .align 2, 0 -_081BFF88: .4byte 0x08d987fc -_081BFF8C: .4byte 0x000018bc + .pool _081BFF90: - ldr r0, _081BFFA0 + ldr r0, =0x08d9898c ldr r1, [r4] - ldr r2, _081BFFA4 + ldr r2, =0x000028bc adds r1, r2 bl call_LZZUnCompWram ldr r1, [r4] b _081C004A .align 2, 0 -_081BFFA0: .4byte 0x08d9898c -_081BFFA4: .4byte 0x000028bc + .pool _081BFFA8: - ldr r0, _081BFFB8 + ldr r0, =0x08d98b28 ldr r1, [r4] - ldr r2, _081BFFBC + ldr r2, =0x000038bc adds r1, r2 bl call_LZZUnCompWram ldr r1, [r4] b _081C004A .align 2, 0 -_081BFFB8: .4byte 0x08d98b28 -_081BFFBC: .4byte 0x000038bc + .pool _081BFFC0: - ldr r0, _081BFFE0 + ldr r0, =0x08d9853c movs r2, 0x80 lsls r2, 1 movs r1, 0 bl decompress_palette - ldr r0, _081BFFE4 + ldr r0, =0x08d85620 movs r1, 0x81 movs r2, 0x1E bl gpu_pal_apply - ldr r0, _081BFFE8 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081BFFEC + ldr r2, =0x000040f0 adds r1, r2 b _081C004E .align 2, 0 -_081BFFE0: .4byte 0x08d9853c -_081BFFE4: .4byte 0x08d85620 -_081BFFE8: .4byte 0x0203cf1c -_081BFFEC: .4byte 0x000040f0 + .pool _081BFFF0: - ldr r0, _081BFFF8 + ldr r0, =0x0861cfbc bl gpu_tile_obj_decompress_and_load b _081C0046 .align 2, 0 -_081BFFF8: .4byte 0x0861cfbc + .pool _081BFFFC: - ldr r0, _081C000C + ldr r0, =0x0861d074 bl gpu_tile_obj_decompress_and_load - ldr r0, _081C0010 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C0014 + ldr r2, =0x000040f0 adds r1, r2 b _081C004E .align 2, 0 -_081C000C: .4byte 0x0861d074 -_081C0010: .4byte 0x0203cf1c -_081C0014: .4byte 0x000040f0 + .pool _081C0018: - ldr r0, _081C0020 + ldr r0, =0x0861d0f8 bl gpu_tile_obj_decompress_and_load b _081C0046 .align 2, 0 -_081C0020: .4byte 0x0861d0f8 + .pool _081C0024: - ldr r0, _081C0034 + ldr r0, =0x0861d100 bl gpu_pal_obj_decompress_and_apply - ldr r0, _081C0038 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C003C + ldr r2, =0x000040f0 adds r1, r2 b _081C004E .align 2, 0 -_081C0034: .4byte 0x0861d100 -_081C0038: .4byte 0x0203cf1c -_081C003C: .4byte 0x000040f0 + .pool _081C0040: - ldr r0, _081C0058 + ldr r0, =0x0861d07c bl gpu_pal_obj_decompress_and_apply _081C0046: - ldr r0, _081C005C + ldr r0, =0x0203cf1c ldr r1, [r0] _081C004A: - ldr r0, _081C0060 + ldr r0, =0x000040f0 adds r1, r0 _081C004E: ldrh r0, [r1] @@ -915240,27 +883844,23 @@ _081C004E: strh r0, [r1] b _081C008C .align 2, 0 -_081C0058: .4byte 0x0861d07c -_081C005C: .4byte 0x0203cf1c -_081C0060: .4byte 0x000040f0 + .pool _081C0064: - ldr r0, _081C0080 + ldr r0, =0x08d97b84 movs r1, 0xE8 lsls r1, 1 movs r2, 0x60 bl decompress_palette - ldr r0, _081C0084 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C0088 + ldr r1, =0x000040f0 adds r0, r1 movs r1, 0 strh r1, [r0] movs r0, 0x1 b _081C008E .align 2, 0 -_081C0080: .4byte 0x08d97b84 -_081C0084: .4byte 0x0203cf1c -_081C0088: .4byte 0x000040f0 + .pool _081C008C: movs r0, 0 _081C008E: @@ -915274,15 +883874,15 @@ _081C008E: sub_81C0098: @ 81C0098 push {r4,lr} adds r3, r0, 0 - ldr r0, _081C00C4 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C00C8 + ldr r2, =0x000040bd adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 bne _081C00D0 ldr r2, [r1] - ldr r4, _081C00CC + ldr r4, =0x000040be adds r0, r1, r4 ldrb r1, [r0] movs r0, 0x64 @@ -915293,12 +883893,10 @@ sub_81C0098: @ 81C0098 bl memcpy b _081C00E6 .align 2, 0 -_081C00C4: .4byte 0x0203cf1c -_081C00C8: .4byte 0x000040bd -_081C00CC: .4byte 0x000040be + .pool _081C00D0: ldr r0, [r1] - ldr r2, _081C00EC + ldr r2, =0x000040be adds r1, r2 ldrb r2, [r1] lsls r1, r2, 2 @@ -915312,7 +883910,7 @@ _081C00E6: pop {r0} bx r0 .align 2, 0 -_081C00EC: .4byte 0x000040be + .pool thumb_func_end sub_81C0098 thumb_func_start sub_81C00F0 @@ -915322,11 +883920,11 @@ sub_81C00F0: @ 81C00F0 mov r6, r8 push {r6,r7} adds r5, r0, 0 - ldr r0, _081C0118 + ldr r0, =0x0203cf1c ldr r7, [r0] adds r6, r7, 0 adds r6, 0x70 - ldr r1, _081C011C + ldr r1, =0x000040f0 adds r0, r7, r1 movs r2, 0 ldrsh r0, [r0, r2] @@ -915338,8 +883936,7 @@ sub_81C00F0: @ 81C00F0 beq _081C012C b _081C0314 .align 2, 0 -_081C0118: .4byte 0x0203cf1c -_081C011C: .4byte 0x000040f0 + .pool _081C0120: cmp r0, 0x2 beq _081C01DC @@ -915430,15 +884027,15 @@ _081C01AA: b _081C0322 _081C01DC: ldr r1, [r7] - ldr r0, _081C0248 + ldr r0, =0x020244ec cmp r1, r0 beq _081C01F8 - ldr r2, _081C024C + ldr r2, =0x000040bc adds r0, r7, r2 ldrb r0, [r0] cmp r0, 0x2 beq _081C01F8 - ldr r1, _081C0250 + ldr r1, =0x000040ef adds r0, r7, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -915477,9 +884074,7 @@ _081C01F8: movs r1, 0x3D b _081C02A0 .align 2, 0 -_081C0248: .4byte 0x020244ec -_081C024C: .4byte 0x000040bc -_081C0250: .4byte 0x000040ef + .pool _081C0254: adds r0, r5, 0 bl get_nature @@ -915569,9 +884164,9 @@ _081C0314: movs r0, 0x1 b _081C0332 _081C0322: - ldr r0, _081C0340 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C0344 + ldr r2, =0x000040f0 adds r1, r2 ldrh r0, [r1] adds r0, 0x1 @@ -915585,16 +884180,15 @@ _081C0332: pop {r1} bx r1 .align 2, 0 -_081C0340: .4byte 0x0203cf1c -_081C0344: .4byte 0x000040f0 + .pool thumb_func_end sub_81C00F0 thumb_func_start sub_81C0348 sub_81C0348: @ 81C0348 push {r4-r6,lr} - ldr r6, _081C0374 + ldr r6, =0x0203cf1c ldr r2, [r6] - ldr r1, _081C0378 + ldr r1, =0x000040c0 adds r0, r2, r1 ldrb r0, [r0] subs r0, 0x2 @@ -915611,10 +884205,9 @@ sub_81C0348: @ 81C0348 bl sub_81C1EFC b _081C03D8 .align 2, 0 -_081C0374: .4byte 0x0203cf1c -_081C0378: .4byte 0x000040c0 + .pool _081C037C: - ldr r1, _081C03F0 + ldr r1, =0x000040c6 adds r0, r2, r1 ldrb r1, [r0] lsls r1, 1 @@ -915624,13 +884217,13 @@ _081C037C: ldrh r0, [r0] bl sub_81C240C ldr r0, [r6] - ldr r5, _081C03F4 + ldr r5, =0x000020bc adds r0, r5 movs r1, 0x3 movs r2, 0 bl sub_81C2194 ldr r0, [r6] - ldr r4, _081C03F8 + ldr r4, =0x000030bc adds r0, r4 movs r1, 0x1 movs r2, 0 @@ -915653,7 +884246,7 @@ _081C037C: movs r0, 0xD bl Window_FillTileMap _081C03D8: - ldr r0, _081C03FC + ldr r0, =0x0203cf1c ldr r1, [r0] adds r0, r1, 0 adds r0, 0x77 @@ -915665,12 +884258,9 @@ _081C03D8: bl sub_81C2074 b _081C0416 .align 2, 0 -_081C03F0: .4byte 0x000040c6 -_081C03F4: .4byte 0x000020bc -_081C03F8: .4byte 0x000030bc -_081C03FC: .4byte 0x0203cf1c + .pool _081C0400: - ldr r2, _081C042C + ldr r2, =0x000040c0 adds r0, r1, r2 ldrb r0, [r0] subs r0, 0x2 @@ -915682,7 +884272,7 @@ _081C0400: bl Window_WriteStandardTileMap _081C0416: bl sub_81C2524 - ldr r0, _081C0430 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C2228 @@ -915690,21 +884280,20 @@ _081C0416: pop {r0} bx r0 .align 2, 0 -_081C042C: .4byte 0x000040c0 -_081C0430: .4byte 0x0203cf1c + .pool thumb_func_end sub_81C0348 thumb_func_start sub_81C0434 sub_81C0434: @ 81C0434 push {lr} bl Window_FreeMemory - ldr r0, _081C0448 + ldr r0, =0x0203cf1c ldr r0, [r0] bl free pop {r0} bx r0 .align 2, 0 -_081C0448: .4byte 0x0203cf1c + .pool thumb_func_end sub_81C0434 thumb_func_start sub_81C044C @@ -915721,20 +884310,19 @@ sub_81C044C: @ 81C044C movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _081C047C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081C0480 + ldr r1, =sub_81C0484 + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_081C047C: .4byte 0x03005e00 -_081C0480: .4byte sub_81C0484 + 1 + .pool thumb_func_end sub_81C044C thumb_func_start sub_81C0484 @@ -915747,19 +884335,19 @@ sub_81C0484: @ 81C0484 lsrs r0, 24 cmp r0, 0x1 beq _081C04EC - ldr r0, _081C04F4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081C04EC - ldr r4, _081C04F8 + ldr r4, =0x0203cf1c ldr r0, [r4] ldr r0, [r0, 0x4] bl set_callback2 - ldr r1, _081C04FC + ldr r1, =0x0203cf20 ldr r0, [r4] - ldr r2, _081C0500 + ldr r2, =0x000040be adds r0, r2 ldrb r0, [r0] strb r0, [r1] @@ -915767,12 +884355,12 @@ sub_81C0484: @ 81C0484 bl reset_all_obj_data bl gpu_pal_allocator_reset bl sub_80A369C - ldr r0, _081C0504 - ldr r1, _081C0508 + ldr r0, =0x03007420 + ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl - ldr r0, _081C050C + ldr r0, =0x020244d4 ldr r0, [r0] cmp r0, 0 bne _081C04E2 @@ -915787,13 +884375,7 @@ _081C04EC: pop {r0} bx r0 .align 2, 0 -_081C04F4: .4byte 0x02037fd4 -_081C04F8: .4byte 0x0203cf1c -_081C04FC: .4byte 0x0203cf20 -_081C0500: .4byte 0x000040be -_081C0504: .4byte 0x03007420 -_081C0508: .4byte 0x0000ffff -_081C050C: .4byte 0x020244d4 + .pool thumb_func_end sub_81C0484 thumb_func_start sub_81C0510 @@ -915806,14 +884388,14 @@ sub_81C0510: @ 81C0510 lsrs r0, 24 cmp r0, 0x1 beq _081C05FE - ldr r0, _081C0548 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r2, 0x80 adds r0, r2, 0 ands r0, r1 cmp r0, 0 bne _081C05FE - ldr r5, _081C054C + ldr r5, =0x030022c0 ldrh r1, [r5, 0x2E] movs r0, 0x40 ands r0, r1 @@ -915825,8 +884407,7 @@ sub_81C0510: @ 81C0510 bl sub_81C0604 b _081C05FE .align 2, 0 -_081C0548: .4byte 0x02037fd4 -_081C054C: .4byte 0x030022c0 + .pool _081C0550: adds r0, r2, 0 ands r0, r1 @@ -915874,9 +884455,9 @@ _081C05A2: ands r0, r1 cmp r0, 0 beq _081C05E6 - ldr r0, _081C05D0 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C05D4 + ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -915890,8 +884471,7 @@ _081C05A2: bl sub_81C044C b _081C05FE .align 2, 0 -_081C05D0: .4byte 0x0203cf1c -_081C05D4: .4byte 0x000040c0 + .pool _081C05D8: movs r0, 0x5 bl audio_play @@ -915922,15 +884502,15 @@ sub_81C0604: @ 81C0604 lsls r1, 24 lsrs r5, r1, 24 adds r4, r5, 0 - ldr r1, _081C0648 + ldr r1, =0x0203cf1c ldr r3, [r1] - ldr r2, _081C064C + ldr r2, =0x000040c3 adds r0, r3, r2 ldrb r0, [r0] adds r6, r1, 0 cmp r0, 0 bne _081C06EE - ldr r1, _081C0650 + ldr r1, =0x000040bd adds r0, r3, r1 ldrb r2, [r0] cmp r2, 0x1 @@ -915950,9 +884530,7 @@ sub_81C0604: @ 81C0604 ands r4, r0 b _081C065C .align 2, 0 -_081C0648: .4byte 0x0203cf1c -_081C064C: .4byte 0x000040c3 -_081C0650: .4byte 0x000040bd + .pool _081C0654: movs r4, 0x3 cmp r5, 0x1 @@ -915961,7 +884539,7 @@ _081C0654: _081C065C: ldr r2, [r6] ldr r0, [r2] - ldr r3, _081C0674 + ldr r3, =0x000040be adds r1, r2, r3 ldrb r1, [r1] adds r3, 0x1 @@ -915971,7 +884549,7 @@ _081C065C: bl sub_80D214C b _081C0696 .align 2, 0 -_081C0674: .4byte 0x000040be + .pool _081C0678: bl sub_81B1250 lsls r0, 24 @@ -915997,7 +884575,7 @@ _081C0696: beq _081C06EE movs r0, 0x5 bl audio_play - ldr r5, _081C06F4 + ldr r5, =0x0203cf1c ldr r0, [r5] adds r0, 0x77 ldrb r0, [r0] @@ -916015,27 +884593,24 @@ _081C0696: bl sub_81C2074 _081C06D4: ldr r0, [r5] - ldr r1, _081C06F8 + ldr r1, =0x000040be adds r0, r1 movs r2, 0 strb r4, [r0] - ldr r1, _081C06FC + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 strh r2, [r0, 0x8] - ldr r1, _081C0700 + ldr r1, =sub_81C0704 + 1 str r1, [r0] _081C06EE: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081C06F4: .4byte 0x0203cf1c -_081C06F8: .4byte 0x000040be -_081C06FC: .4byte 0x03005e00 -_081C0700: .4byte sub_81C0704 + 1 + .pool thumb_func_end sub_81C0604 thumb_func_start sub_81C0704 @@ -916046,7 +884621,7 @@ sub_81C0704: @ 81C0704 lsls r1, r0, 2 adds r1, r0 lsls r4, r1, 3 - ldr r6, _081C0728 + ldr r6, =0x03005e08 adds r5, r4, r6 movs r1, 0 ldrsh r0, [r5, r1] @@ -916055,13 +884630,12 @@ sub_81C0704: @ 81C0704 b _081C08BC _081C071E: lsls r0, 2 - ldr r1, _081C072C + ldr r1, =_081C0730 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C0728: .4byte 0x03005e08 -_081C072C: .4byte _081C0730 + .pool .align 2, 0 _081C0730: .4byte _081C0764 @@ -916082,47 +884656,43 @@ _081C0764: b _081C08EC _081C076A: bl sub_81C4898 - ldr r0, _081C0778 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C077C + ldr r1, =0x000040d3 b _081C0786 .align 2, 0 -_081C0778: .4byte 0x0203cf1c -_081C077C: .4byte 0x000040d3 + .pool _081C0780: - ldr r0, _081C079C + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C07A0 + ldr r1, =0x000040d4 _081C0786: adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081C07A4 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_resources b _081C08EC .align 2, 0 -_081C079C: .4byte 0x0203cf1c -_081C07A0: .4byte 0x000040d4 -_081C07A4: .4byte 0x02020630 + .pool _081C07A8: - ldr r4, _081C07C0 + ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0xC bl sub_81C0098 ldr r0, [r4] - ldr r1, _081C07C4 + ldr r1, =0x000040f0 adds r0, r1 movs r1, 0 strh r1, [r0] b _081C08EC .align 2, 0 -_081C07C0: .4byte 0x0203cf1c -_081C07C4: .4byte 0x000040f0 + .pool _081C07C8: - ldr r0, _081C07DC + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C00F0 @@ -916133,25 +884703,25 @@ _081C07C8: _081C07DA: b _081C08EC .align 2, 0 -_081C07DC: .4byte 0x0203cf1c + .pool _081C07E0: - ldr r0, _081C07EC + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C49E0 b _081C08EC .align 2, 0 -_081C07EC: .4byte 0x0203cf1c + .pool _081C07F0: - ldr r0, _081C07FC + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C4A08 b _081C08EC .align 2, 0 -_081C07FC: .4byte 0x0203cf1c + .pool _081C0800: - ldr r4, _081C0824 + ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0x77 ldrb r0, [r0] @@ -916169,15 +884739,15 @@ _081C0816: strh r0, [r5, 0x2] b _081C08EC .align 2, 0 -_081C0824: .4byte 0x0203cf1c + .pool _081C0828: - ldr r4, _081C0860 + ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0xC adds r1, r5, 0x2 bl sub_81C45F4 ldr r1, [r4] - ldr r2, _081C0864 + ldr r2, =0x000040d3 adds r1, r2 strb r0, [r1] ldr r0, [r4] @@ -916185,7 +884755,7 @@ _081C0828: ldrb r0, [r1] cmp r0, 0xFF beq _081C08F2 - ldr r2, _081C0868 + ldr r2, =0x02020630 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -916198,9 +884768,7 @@ _081C0828: strh r0, [r5, 0x2] b _081C08EC .align 2, 0 -_081C0860: .4byte 0x0203cf1c -_081C0864: .4byte 0x000040d3 -_081C0868: .4byte 0x02020630 + .pool _081C086C: bl sub_81C4280 b _081C08EC @@ -916208,22 +884776,21 @@ _081C0872: bl sub_81C25E8 b _081C08EC _081C0878: - ldr r0, _081C088C + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C0890 + ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] bl sub_81C2D9C bl sub_81C2524 b _081C08EC .align 2, 0 -_081C088C: .4byte 0x0203cf1c -_081C0890: .4byte 0x000040c0 + .pool _081C0894: - ldr r2, _081C08B0 - ldr r0, _081C08B4 + ldr r2, =0x02020630 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C08B8 + ldr r1, =0x000040d3 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -916234,15 +884801,13 @@ _081C0894: strh r1, [r0, 0x32] b _081C08EC .align 2, 0 -_081C08B0: .4byte 0x02020630 -_081C08B4: .4byte 0x0203cf1c -_081C08B8: .4byte 0x000040d3 + .pool _081C08BC: bl sub_81221EC lsls r0, 24 cmp r0, 0 bne _081C08F2 - ldr r0, _081C08E4 + ldr r0, =sub_81C20F0 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -916252,12 +884817,11 @@ _081C08BC: adds r0, r6, 0 subs r0, 0x8 adds r0, r4, r0 - ldr r1, _081C08E8 + ldr r1, =sub_81C0510 + 1 str r1, [r0] b _081C08F2 .align 2, 0 -_081C08E4: .4byte sub_81C20F0 + 1 -_081C08E8: .4byte sub_81C0510 + 1 + .pool _081C08EC: ldrh r0, [r5] adds r0, 0x1 @@ -916273,10 +884837,10 @@ sub_81C08F8: @ 81C08F8 push {r4-r7,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r1, _081C0950 + ldr r1, =0x0203cf1c ldr r2, [r1] ldr r7, [r2] - ldr r3, _081C0954 + ldr r3, =0x000040c0 adds r0, r2, r3 ldrb r0, [r0] adds r5, r1, 0 @@ -916289,7 +884853,7 @@ sub_81C08F8: @ 81C08F8 adds r6, r0, 0 cmp r3, r1 bne _081C0928 - ldr r1, _081C0958 + ldr r1, =0x000040be adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 @@ -916299,9 +884863,9 @@ _081C0928: cmp r0, 0x1 bne _081C0940 ldr r0, [r5] - ldr r2, _081C0958 + ldr r2, =0x000040be adds r1, r0, r2 - ldr r3, _081C095C + ldr r3, =0x000040bf adds r0, r3 ldrb r1, [r1] ldrb r0, [r0] @@ -916309,7 +884873,7 @@ _081C0928: bcs _081C0988 _081C0940: ldr r0, [r5] - ldr r1, _081C0958 + ldr r1, =0x000040be adds r0, r1 ldrb r0, [r0] adds r0, r4 @@ -916317,12 +884881,9 @@ _081C0940: asrs r0, 24 b _081C09AE .align 2, 0 -_081C0950: .4byte 0x0203cf1c -_081C0954: .4byte 0x000040c0 -_081C0958: .4byte 0x000040be -_081C095C: .4byte 0x000040bf + .pool _081C0960: - ldr r3, _081C0990 + ldr r3, =0x000040be adds r0, r2, r3 ldrb r5, [r0] lsls r6, r4, 24 @@ -916336,9 +884897,9 @@ _081C0968: asrs r4, r0, 24 cmp r4, 0 blt _081C0988 - ldr r0, _081C0994 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C0998 + ldr r1, =0x000040bf adds r0, r1 ldrb r0, [r0] cmp r4, r0 @@ -916348,9 +884909,7 @@ _081C0988: negs r0, r0 b _081C09AE .align 2, 0 -_081C0990: .4byte 0x000040be -_081C0994: .4byte 0x0203cf1c -_081C0998: .4byte 0x000040bf + .pool _081C099C: movs r0, 0x64 muls r0, r4 @@ -916374,16 +884933,16 @@ sub_81C09B4: @ 81C09B4 lsls r0, 24 lsrs r0, 24 mov r12, r0 - ldr r6, _081C0A34 + ldr r6, =0x0203cf1c ldr r0, [r6] ldr r1, [r0] mov r8, r1 movs r5, 0 movs r2, 0 - ldr r3, _081C0A38 + ldr r3, =0x0861cc1c movs r1, 0 ldrsb r1, [r3, r1] - ldr r4, _081C0A3C + ldr r4, =0x000040be adds r0, r4 ldrb r0, [r0] cmp r1, r0 @@ -916408,7 +884967,7 @@ _081C09E0: _081C09FC: mov r0, r12 lsls r6, r0, 24 - ldr r7, _081C0A38 + ldr r7, =0x0861cc1c _081C0A02: lsls r0, r5, 24 asrs r0, 24 @@ -916435,9 +884994,7 @@ _081C0A02: adds r0, r4, 0 b _081C0A44 .align 2, 0 -_081C0A34: .4byte 0x0203cf1c -_081C0A38: .4byte 0x0861cc1c -_081C0A3C: .4byte 0x000040be + .pool _081C0A40: movs r0, 0x1 negs r0, r0 @@ -916457,9 +885014,9 @@ sub_81C0A50: @ 81C0A50 bl pokemon_getattr cmp r0, 0 beq _081C0A84 - ldr r0, _081C0A7C + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C0A80 + ldr r1, =0x000040be adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -916473,8 +885030,7 @@ _081C0A78: movs r0, 0x1 b _081C0A86 .align 2, 0 -_081C0A7C: .4byte 0x0203cf1c -_081C0A80: .4byte 0x000040be + .pool _081C0A84: movs r0, 0 _081C0A86: @@ -916497,7 +885053,7 @@ sub_81C0A8C: @ 81C0A8C lsls r1, 24 lsrs r3, r1, 24 str r3, [sp, 0x4] - ldr r0, _081C0B34 + ldr r0, =0x0203cf1c mov r8, r0 ldr r2, [r0] adds r1, r2, 0 @@ -916505,7 +885061,7 @@ sub_81C0A8C: @ 81C0A8C lsls r0, r6, 2 adds r0, r6 lsls r7, r0, 3 - ldr r0, _081C0B38 + ldr r0, =0x03005e08 mov r9, r0 adds r0, r7, r0 str r0, [sp, 0x8] @@ -916519,9 +885075,9 @@ sub_81C0A8C: @ 81C0A8C negs r0, r0 cmp r5, r0 bne _081C0AE0 - ldr r1, _081C0B3C + ldr r1, =0x000040c0 adds r0, r2, r1 - ldr r3, _081C0B40 + ldr r3, =0x000040c1 adds r1, r2, r3 ldrb r0, [r0] ldrb r1, [r1] @@ -916530,9 +885086,9 @@ sub_81C0A8C: @ 81C0A8C _081C0AE0: cmp r5, 0x1 bne _081C0AF4 - ldr r1, _081C0B3C + ldr r1, =0x000040c0 adds r0, r2, r1 - ldr r3, _081C0B44 + ldr r3, =0x000040c2 adds r1, r2, r3 ldrb r0, [r0] ldrb r1, [r1] @@ -916543,7 +885099,7 @@ _081C0AF4: bl audio_play mov r1, r8 ldr r0, [r1] - ldr r4, _081C0B3C + ldr r4, =0x000040c0 adds r0, r4 ldrb r0, [r0] bl sub_81C2C38 @@ -916559,7 +885115,7 @@ _081C0AF4: strh r1, [r0] cmp r5, 0x1 bne _081C0B4C - ldr r1, _081C0B48 + ldr r1, =sub_81C0B8C + 1 mov r0, r9 subs r0, 0x8 adds r0, r7, r0 @@ -916568,14 +885124,9 @@ _081C0AF4: bl set_task_function_and_args_14_15 b _081C0B5C .align 2, 0 -_081C0B34: .4byte 0x0203cf1c -_081C0B38: .4byte 0x03005e08 -_081C0B3C: .4byte 0x000040c0 -_081C0B40: .4byte 0x000040c1 -_081C0B44: .4byte 0x000040c2 -_081C0B48: .4byte sub_81C0B8C + 1 + .pool _081C0B4C: - ldr r1, _081C0B80 + ldr r1, =sub_81C0CC4 + 1 mov r0, r9 subs r0, 0x8 adds r0, r7, r0 @@ -916583,9 +885134,9 @@ _081C0B4C: ldr r0, [sp] bl set_task_function_and_args_14_15 _081C0B5C: - ldr r0, _081C0B84 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r2, _081C0B88 + ldr r2, =0x000040c0 adds r0, r2 ldrb r0, [r0] bl sub_81C2DE4 @@ -916600,9 +885151,7 @@ _081C0B6E: pop {r0} bx r0 .align 2, 0 -_081C0B80: .4byte sub_81C0CC4 + 1 -_081C0B84: .4byte 0x0203cf1c -_081C0B88: .4byte 0x000040c0 + .pool thumb_func_end sub_81C0A8C thumb_func_start sub_81C0B8C @@ -916613,15 +885162,15 @@ sub_81C0B8C: @ 81C0B8C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C0BD4 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 bne _081C0C2A - ldr r0, _081C0BD8 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r3, _081C0BDC + ldr r3, =0x000040c9 adds r0, r3 ldrb r0, [r0] cmp r0, 0 @@ -916640,9 +885189,7 @@ sub_81C0B8C: @ 81C0B8C bl schedule_bg_copy_tilemap_to_vram b _081C0BFE .align 2, 0 -_081C0BD4: .4byte 0x03005e08 -_081C0BD8: .4byte 0x0203cf1c -_081C0BDC: .4byte 0x000040c9 + .pool _081C0BE0: movs r0, 0x2 strh r0, [r4, 0x2] @@ -916662,9 +885209,9 @@ _081C0BFE: movs r2, 0 bl bg_change_x_offset ldrb r0, [r4, 0x2] - ldr r1, _081C0C58 + ldr r1, =0x0203cf1c ldr r1, [r1] - ldr r3, _081C0C5C + ldr r3, =0x000040c0 adds r2, r1, r3 ldrb r2, [r2] lsls r2, 12 @@ -916688,22 +885235,19 @@ _081C0C2A: asrs r0, 16 cmp r0, 0xFF ble _081C0C52 - ldr r0, _081C0C60 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081C0C64 + ldr r0, =sub_81C0C68 + 1 str r0, [r1] _081C0C52: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081C0C58: .4byte 0x0203cf1c -_081C0C5C: .4byte 0x000040c0 -_081C0C60: .4byte 0x03005e00 -_081C0C64: .4byte sub_81C0C68 + 1 + .pool thumb_func_end sub_81C0B8C thumb_func_start sub_81C0C68 @@ -916715,11 +885259,11 @@ sub_81C0C68: @ 81C0C68 lsls r2, r4, 2 adds r2, r4 lsls r2, 3 - ldr r0, _081C0CB4 + ldr r0, =0x03005e08 adds r2, r0 - ldr r5, _081C0CB8 + ldr r5, =0x0203cf1c ldr r3, [r5] - ldr r0, _081C0CBC + ldr r0, =0x000040c9 adds r3, r0 ldrb r0, [r3] movs r1, 0x1 @@ -916730,7 +885274,7 @@ sub_81C0C68: @ 81C0C68 strh r1, [r2] bl sub_81C1BA0 ldr r0, [r5] - ldr r1, _081C0CC0 + ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] bl sub_81C2AFC @@ -916742,10 +885286,7 @@ sub_81C0C68: @ 81C0C68 pop {r0} bx r0 .align 2, 0 -_081C0CB4: .4byte 0x03005e08 -_081C0CB8: .4byte 0x0203cf1c -_081C0CBC: .4byte 0x000040c9 -_081C0CC0: .4byte 0x000040c0 + .pool thumb_func_end sub_81C0C68 thumb_func_start sub_81C0CC4 @@ -916756,15 +885297,15 @@ sub_81C0CC4: @ 81C0CC4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C0CF0 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 bne _081C0D0C - ldr r0, _081C0CF4 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C0CF8 + ldr r1, =0x000040c9 adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -916772,9 +885313,7 @@ sub_81C0CC4: @ 81C0CC4 movs r0, 0x2 b _081C0CFE .align 2, 0 -_081C0CF0: .4byte 0x03005e08 -_081C0CF4: .4byte 0x0203cf1c -_081C0CF8: .4byte 0x000040c9 + .pool _081C0CFC: movs r0, 0x1 _081C0CFE: @@ -916797,20 +885336,19 @@ _081C0D0C: asrs r0, 16 cmp r0, 0xFF ble _081C0D34 - ldr r0, _081C0D3C + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081C0D40 + ldr r0, =sub_81C0D44 + 1 str r0, [r1] _081C0D34: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081C0D3C: .4byte 0x03005e00 -_081C0D40: .4byte sub_81C0D44 + 1 + .pool thumb_func_end sub_81C0CC4 thumb_func_start sub_81C0D44 @@ -916821,11 +885359,11 @@ sub_81C0D44: @ 81C0D44 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C0D80 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r0, _081C0D84 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C0D88 + ldr r1, =0x000040c9 adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -916842,9 +885380,7 @@ sub_81C0D44: @ 81C0D44 bl schedule_bg_copy_tilemap_to_vram b _081C0DA6 .align 2, 0 -_081C0D80: .4byte 0x03005e08 -_081C0D84: .4byte 0x0203cf1c -_081C0D88: .4byte 0x000040c9 + .pool _081C0D8C: movs r0, 0x2 movs r1, 0x7 @@ -916857,9 +885393,9 @@ _081C0D8C: movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram _081C0DA6: - ldr r6, _081C0E14 + ldr r6, =0x0203cf1c ldr r2, [r6] - ldr r7, _081C0E18 + ldr r7, =0x000040c0 adds r1, r2, r7 ldrb r0, [r1] cmp r0, 0x1 @@ -916867,7 +885403,7 @@ _081C0DA6: ldrb r0, [r4, 0x2] ldrb r1, [r1] lsls r1, 12 - ldr r3, _081C0E1C + ldr r3, =0xfffff0bc adds r1, r3 adds r1, r2, r1 bl bg_set_tilemap @@ -916882,7 +885418,7 @@ _081C0DD0: movs r0, 0x2 bl gpu_sync_bg_show ldr r2, [r6] - ldr r0, _081C0E20 + ldr r0, =0x000040c9 adds r2, r0 ldrb r0, [r2] movs r1, 0x1 @@ -916904,18 +885440,15 @@ _081C0DD0: pop {r0} bx r0 .align 2, 0 -_081C0E14: .4byte 0x0203cf1c -_081C0E18: .4byte 0x000040c0 -_081C0E1C: .4byte 0xfffff0bc -_081C0E20: .4byte 0x000040c9 + .pool thumb_func_end sub_81C0D44 thumb_func_start sub_81C0E24 sub_81C0E24: @ 81C0E24 push {lr} - ldr r0, _081C0E40 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C0E44 + ldr r2, =0x000040c0 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 @@ -916927,8 +885460,7 @@ _081C0E3C: pop {r0} bx r0 .align 2, 0 -_081C0E40: .4byte 0x0203cf1c -_081C0E44: .4byte 0x000040c0 + .pool thumb_func_end sub_81C0E24 thumb_func_start sub_81C0E48 @@ -916938,9 +885470,9 @@ sub_81C0E48: @ 81C0E48 push {r7} lsls r0, 24 lsrs r7, r0, 24 - ldr r5, _081C0F20 + ldr r5, =0x0203cf1c ldr r0, [r5] - ldr r2, _081C0F24 + ldr r2, =0x000040c6 adds r0, r2 movs r1, 0 strb r1, [r0] @@ -916954,9 +885486,9 @@ sub_81C0E48: @ 81C0E48 mov r8, r6 movs r0, 0x13 bl Window_FillTileMap - ldr r2, _081C0F28 + ldr r2, =0x02020630 ldr r0, [r5] - ldr r1, _081C0F2C + ldr r1, =0x000040d5 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -916981,7 +885513,7 @@ _081C0E96: adds r2, r6, 0 bl sub_81C1EFC ldr r0, [r5] - ldr r1, _081C0F30 + ldr r1, =0x000040c8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -916992,13 +885524,13 @@ _081C0E96: bl Window_WriteStandardTileMap _081C0EC4: ldr r0, [r5] - ldr r1, _081C0F34 + ldr r1, =0x000020bc adds r0, r1 movs r1, 0x3 movs r2, 0 bl sub_81C2194 ldr r0, [r5] - ldr r1, _081C0F38 + ldr r1, =0x000030bc adds r0, r1 movs r1, 0x1 movs r2, 0 @@ -917015,12 +885547,12 @@ _081C0EC4: bl schedule_bg_copy_tilemap_to_vram movs r0, 0x8 bl sub_81C4AF8 - ldr r1, _081C0F3C + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081C0F40 + ldr r1, =sub_81C0F44 + 1 str r1, [r0] pop {r3} mov r8, r3 @@ -917028,15 +885560,7 @@ _081C0EC4: pop {r0} bx r0 .align 2, 0 -_081C0F20: .4byte 0x0203cf1c -_081C0F24: .4byte 0x000040c6 -_081C0F28: .4byte 0x02020630 -_081C0F2C: .4byte 0x000040d5 -_081C0F30: .4byte 0x000040c8 -_081C0F34: .4byte 0x000020bc -_081C0F38: .4byte 0x000030bc -_081C0F3C: .4byte 0x03005e00 -_081C0F40: .4byte sub_81C0F44 + 1 + .pool thumb_func_end sub_81C0E48 thumb_func_start sub_81C0F44 @@ -917048,14 +885572,14 @@ sub_81C0F44: @ 81C0F44 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C0F88 + ldr r1, =0x03005e08 adds r4, r0, r1 bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081C103A - ldr r0, _081C0F8C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -917065,18 +885589,15 @@ sub_81C0F44: @ 81C0F44 strh r0, [r4] movs r1, 0x1 negs r1, r1 - ldr r0, _081C0F90 + ldr r0, =0x0203cf1c ldr r2, [r0] - ldr r0, _081C0F94 + ldr r0, =0x000040c6 adds r2, r0 adds r0, r4, 0 bl sub_81C1070 b _081C103A .align 2, 0 -_081C0F88: .4byte 0x03005e08 -_081C0F8C: .4byte 0x030022c0 -_081C0F90: .4byte 0x0203cf1c -_081C0F94: .4byte 0x000040c6 + .pool _081C0F98: movs r0, 0x80 ands r0, r1 @@ -917084,25 +885605,24 @@ _081C0F98: beq _081C0FC0 movs r0, 0x4 strh r0, [r4] - ldr r0, _081C0FB8 + ldr r0, =0x0203cf1c ldr r2, [r0] - ldr r0, _081C0FBC + ldr r0, =0x000040c6 adds r2, r0 adds r0, r4, 0 movs r1, 0x1 bl sub_81C1070 b _081C103A .align 2, 0 -_081C0FB8: .4byte 0x0203cf1c -_081C0FBC: .4byte 0x000040c6 + .pool _081C0FC0: movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _081C1026 - ldr r0, _081C0FF8 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C0FFC + ldr r2, =0x000040c8 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 @@ -917110,7 +885630,7 @@ _081C0FC0: subs r2, 0x4 adds r0, r1, r2 ldr r0, [r0] - ldr r1, _081C1000 + ldr r1, =0x00ffffff ands r0, r1 movs r1, 0x80 lsls r1, 11 @@ -917123,9 +885643,7 @@ _081C0FE8: bl sub_81C11F4 b _081C103A .align 2, 0 -_081C0FF8: .4byte 0x0203cf1c -_081C0FFC: .4byte 0x000040c8 -_081C1000: .4byte 0x00ffffff + .pool _081C1004: bl sub_81C1040 lsls r0, 24 @@ -917160,7 +885678,7 @@ _081C103A: sub_81C1040: @ 81C1040 push {lr} movs r1, 0x1 - ldr r0, _081C105C + ldr r0, =0x0203cf1c ldr r0, [r0] adds r2, r0, 0 adds r2, 0x84 @@ -917173,7 +885691,7 @@ _081C104C: movs r0, 0x1 b _081C106C .align 2, 0 -_081C105C: .4byte 0x0203cf1c + .pool _081C1060: adds r0, r1, 0x1 lsls r0, 24 @@ -917232,7 +885750,7 @@ _081C10B6: bne _081C10C2 b _081C11CC _081C10C2: - ldr r0, _081C11B8 + ldr r0, =0x0203cf1c ldr r0, [r0] lsls r1, 1 adds r0, 0x84 @@ -917261,9 +885779,9 @@ _081C10E2: ldrb r0, [r1] cmp r0, 0x4 bne _081C1110 - ldr r0, _081C11B8 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C11BC + ldr r1, =0x000040c4 adds r0, r1 ldrh r0, [r0] cmp r0, 0 @@ -917276,10 +885794,10 @@ _081C1110: _081C1118: movs r0, 0x13 bl Window_FillTileMap - ldr r2, _081C11C0 - ldr r0, _081C11B8 + ldr r2, =0x02020630 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C11C4 + ldr r1, =0x000040d5 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -917314,9 +885832,9 @@ _081C115E: asrs r0, r1, 24 cmp r0, 0x4 bne _081C11A0 - ldr r0, _081C11B8 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C11BC + ldr r1, =0x000040c4 adds r0, r1 ldrh r0, [r0] cmp r0, 0 @@ -917337,9 +885855,9 @@ _081C115E: _081C11A0: mov r0, r8 strb r6, [r0] - ldr r0, _081C11B8 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C11C8 + ldr r1, =0x000040c6 adds r0, r1 cmp r8, r0 bne _081C11E0 @@ -917347,21 +885865,16 @@ _081C11A0: bl sub_81C4D18 b _081C11E6 .align 2, 0 -_081C11B8: .4byte 0x0203cf1c -_081C11BC: .4byte 0x000040c4 -_081C11C0: .4byte 0x02020630 -_081C11C4: .4byte 0x000040d5 -_081C11C8: .4byte 0x000040c6 + .pool _081C11CC: - ldr r0, _081C11D8 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C11DC + ldr r1, =0x000040c4 adds r0, r1 ldrh r5, [r0] b _081C10E2 .align 2, 0 -_081C11D8: .4byte 0x0203cf1c -_081C11DC: .4byte 0x000040c4 + .pool _081C11E0: movs r0, 0x12 bl sub_81C4D18 @@ -917387,22 +885900,22 @@ sub_81C11F4: @ 81C11F4 bl Window_WriteStandardTileMap movs r0, 0 bl sub_81C3E9C - ldr r4, _081C1284 + ldr r4, =0x0203cf1c ldr r0, [r4] - ldr r1, _081C1288 + ldr r1, =0x000020bc adds r0, r1 movs r1, 0x3 movs r2, 0x1 bl sub_81C2194 ldr r0, [r4] - ldr r1, _081C128C + ldr r1, =0x000030bc adds r0, r1 movs r1, 0x1 movs r2, 0x1 bl sub_81C2194 bl sub_81C4064 ldr r0, [r4] - ldr r1, _081C1290 + ldr r1, =0x000040c6 adds r0, r1 ldrb r0, [r0] cmp r0, 0x4 @@ -917425,23 +885938,18 @@ _081C125E: bl schedule_bg_copy_tilemap_to_vram movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r0, _081C1294 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081C1298 + ldr r0, =sub_81C0510 + 1 str r0, [r1] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081C1284: .4byte 0x0203cf1c -_081C1288: .4byte 0x000020bc -_081C128C: .4byte 0x000030bc -_081C1290: .4byte 0x000040c6 -_081C1294: .4byte 0x03005e00 -_081C1298: .4byte sub_81C0510 + 1 + .pool thumb_func_end sub_81C11F4 thumb_func_start sub_81C129C @@ -917450,9 +885958,9 @@ sub_81C129C: @ 81C129C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081C12D4 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r2, _081C12D8 + ldr r2, =0x000040c6 adds r1, r0, r2 ldrb r1, [r1] adds r2, 0x1 @@ -917462,21 +885970,18 @@ sub_81C129C: @ 81C129C bl sub_81C4C84 movs r0, 0x12 bl sub_81C4AF8 - ldr r1, _081C12DC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081C12E0 + ldr r1, =sub_81C12E4 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081C12D4: .4byte 0x0203cf1c -_081C12D8: .4byte 0x000040c6 -_081C12DC: .4byte 0x03005e00 -_081C12E0: .4byte sub_81C12E4 + 1 + .pool thumb_func_end sub_81C129C thumb_func_start sub_81C12E4 @@ -917488,14 +885993,14 @@ sub_81C12E4: @ 81C12E4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C1328 + ldr r1, =0x03005e08 adds r4, r0, r1 bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081C13AA - ldr r0, _081C132C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -917505,18 +886010,15 @@ sub_81C12E4: @ 81C12E4 strh r0, [r4] movs r1, 0x1 negs r1, r1 - ldr r0, _081C1330 + ldr r0, =0x0203cf1c ldr r2, [r0] - ldr r0, _081C1334 + ldr r0, =0x000040c7 adds r2, r0 adds r0, r4, 0 bl sub_81C1070 b _081C13AA .align 2, 0 -_081C1328: .4byte 0x03005e08 -_081C132C: .4byte 0x030022c0 -_081C1330: .4byte 0x0203cf1c -_081C1334: .4byte 0x000040c7 + .pool _081C1338: movs r0, 0x80 ands r0, r1 @@ -917524,25 +886026,24 @@ _081C1338: beq _081C1360 movs r0, 0x3 strh r0, [r4] - ldr r0, _081C1358 + ldr r0, =0x0203cf1c ldr r2, [r0] - ldr r0, _081C135C + ldr r0, =0x000040c7 adds r2, r0 adds r0, r4, 0 movs r1, 0x1 bl sub_81C1070 b _081C13AA .align 2, 0 -_081C1358: .4byte 0x0203cf1c -_081C135C: .4byte 0x000040c7 + .pool _081C1360: movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _081C139A - ldr r0, _081C1388 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r2, _081C138C + ldr r2, =0x000040c6 adds r1, r0, r2 adds r2, 0x1 adds r0, r2 @@ -917555,8 +886056,7 @@ _081C1360: bl sub_81C13B0 b _081C13AA .align 2, 0 -_081C1388: .4byte 0x0203cf1c -_081C138C: .4byte 0x000040c6 + .pool _081C1390: adds r0, r5, 0 movs r1, 0x1 @@ -917592,21 +886092,21 @@ sub_81C13B0: @ 81C13B0 bl sub_81C4C60 cmp r4, 0x1 bne _081C1464 - ldr r0, _081C1400 + ldr r0, =0x0203cf1c ldr r3, [r0] - ldr r1, _081C1404 + ldr r1, =0x000040bd adds r0, r3, r1 ldrb r0, [r0] cmp r0, 0 bne _081C1410 ldr r0, [r3] - ldr r2, _081C1408 + ldr r2, =0x000040be adds r1, r3, r2 ldrb r2, [r1] movs r1, 0x64 muls r1, r2 adds r0, r1 - ldr r4, _081C140C + ldr r4, =0x000040c6 adds r1, r3, r4 ldrb r1, [r1] adds r4, 0x1 @@ -917615,20 +886115,17 @@ sub_81C13B0: @ 81C13B0 bl sub_81C14BC b _081C1430 .align 2, 0 -_081C1400: .4byte 0x0203cf1c -_081C1404: .4byte 0x000040bd -_081C1408: .4byte 0x000040be -_081C140C: .4byte 0x000040c6 + .pool _081C1410: ldr r0, [r3] - ldr r2, _081C14A4 + ldr r2, =0x000040be adds r1, r3, r2 ldrb r2, [r1] lsls r1, r2, 2 adds r1, r2 lsls r1, 4 adds r0, r1 - ldr r4, _081C14A8 + ldr r4, =0x000040c6 adds r1, r3, r4 ldrb r1, [r1] adds r4, 0x1 @@ -917636,15 +886133,15 @@ _081C1410: ldrb r2, [r2] bl sub_81C15EC _081C1430: - ldr r5, _081C14AC + ldr r5, =0x0203cf1c ldr r0, [r5] adds r0, 0xC bl sub_81C0098 ldr r1, [r5] - ldr r6, _081C14A8 + ldr r6, =0x000040c6 adds r0, r1, r6 ldrb r0, [r0] - ldr r4, _081C14B0 + ldr r4, =0x000040c7 adds r1, r4 ldrb r1, [r1] bl sub_81C40A0 @@ -917660,9 +886157,9 @@ _081C1430: adds r0, r6 strb r1, [r0] _081C1464: - ldr r0, _081C14AC + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C14A8 + ldr r2, =0x000040c6 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 1 @@ -917677,23 +886174,18 @@ _081C1464: bl schedule_bg_copy_tilemap_to_vram movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - ldr r1, _081C14B4 + ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 lsls r0, 3 adds r0, r1 - ldr r1, _081C14B8 + ldr r1, =sub_81C0F44 + 1 str r1, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081C14A4: .4byte 0x000040be -_081C14A8: .4byte 0x000040c6 -_081C14AC: .4byte 0x0203cf1c -_081C14B0: .4byte 0x000040c7 -_081C14B4: .4byte 0x03005e00 -_081C14B8: .4byte sub_81C0F44 + 1 + .pool thumb_func_end sub_81C13B0 thumb_func_start sub_81C14BC @@ -917711,7 +886203,7 @@ sub_81C14BC: @ 81C14BC lsrs r4, 24 lsls r6, 24 lsrs r6, 24 - ldr r0, _081C15E4 + ldr r0, =0x0203cf1c ldr r2, [r0] lsls r0, r4, 1 mov r10, r0 @@ -917753,7 +886245,7 @@ sub_81C14BC: @ 81C14BC mov r5, sp adds r5, 0x6 strb r0, [r5] - ldr r1, _081C15E8 + ldr r1, =0x08329d22 adds r0, r4, r1 ldrb r0, [r0] mov r8, r0 @@ -917842,8 +886334,7 @@ sub_81C14BC: @ 81C14BC pop {r0} bx r0 .align 2, 0 -_081C15E4: .4byte 0x0203cf1c -_081C15E8: .4byte 0x08329d22 + .pool thumb_func_end sub_81C14BC thumb_func_start sub_81C15EC @@ -917861,7 +886352,7 @@ sub_81C15EC: @ 81C15EC lsrs r4, 24 lsls r6, 24 lsrs r6, 24 - ldr r0, _081C1714 + ldr r0, =0x0203cf1c ldr r2, [r0] lsls r0, r4, 1 mov r10, r0 @@ -917903,7 +886394,7 @@ sub_81C15EC: @ 81C15EC mov r5, sp adds r5, 0x6 strb r0, [r5] - ldr r1, _081C1718 + ldr r1, =0x08329d22 adds r0, r4, r1 ldrb r0, [r0] mov r8, r0 @@ -917992,8 +886483,7 @@ sub_81C15EC: @ 81C15EC pop {r0} bx r0 .align 2, 0 -_081C1714: .4byte 0x0203cf1c -_081C1718: .4byte 0x08329d22 + .pool thumb_func_end sub_81C15EC thumb_func_start sub_81C171C @@ -918005,19 +886495,18 @@ sub_81C171C: @ 81C171C bl sub_81C44F0 movs r0, 0x8 bl sub_81C4AF8 - ldr r1, _081C1744 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081C1748 + ldr r1, =sub_81C174C + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081C1744: .4byte 0x03005e00 -_081C1748: .4byte sub_81C174C + 1 + .pool thumb_func_end sub_81C171C thumb_func_start sub_81C174C @@ -918028,7 +886517,7 @@ sub_81C174C: @ 81C174C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C17A0 + ldr r1, =0x03005e08 adds r4, r0, r1 bl sub_81221EC lsls r0, 24 @@ -918037,7 +886526,7 @@ sub_81C174C: @ 81C174C bne _081C176A b _081C189A _081C176A: - ldr r0, _081C17A4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r2, 0x80 adds r0, r2, 0 @@ -918046,7 +886535,7 @@ _081C176A: beq _081C177A b _081C189A _081C177A: - ldr r6, _081C17A8 + ldr r6, =0x030022c0 ldrh r1, [r6, 0x2E] movs r0, 0x40 ands r0, r1 @@ -918056,19 +886545,15 @@ _081C177A: strh r0, [r4] movs r1, 0x1 negs r1, r1 - ldr r0, _081C17AC + ldr r0, =0x0203cf1c ldr r2, [r0] - ldr r0, _081C17B0 + ldr r0, =0x000040c6 adds r2, r0 adds r0, r4, 0 bl sub_81C1070 b _081C189A .align 2, 0 -_081C17A0: .4byte 0x03005e08 -_081C17A4: .4byte 0x02037fd4 -_081C17A8: .4byte 0x030022c0 -_081C17AC: .4byte 0x0203cf1c -_081C17B0: .4byte 0x000040c6 + .pool _081C17B4: adds r0, r2, 0 ands r0, r1 @@ -918076,17 +886561,16 @@ _081C17B4: beq _081C17DC movs r0, 0x4 strh r0, [r4] - ldr r0, _081C17D4 + ldr r0, =0x0203cf1c ldr r2, [r0] - ldr r1, _081C17D8 + ldr r1, =0x000040c6 adds r2, r1 adds r0, r4, 0 movs r1, 0x1 bl sub_81C1070 b _081C189A .align 2, 0 -_081C17D4: .4byte 0x0203cf1c -_081C17D8: .4byte 0x000040c6 + .pool _081C17DC: movs r0, 0x20 ands r0, r1 @@ -918133,24 +886617,21 @@ _081C181C: bl sub_81C48F0 movs r0, 0x5 bl audio_play - ldr r2, _081C1858 - ldr r0, _081C185C + ldr r2, =0x0203cf21 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C1860 + ldr r1, =0x000040c6 adds r0, r1 ldrb r0, [r0] strb r0, [r2] - ldr r1, _081C1864 + ldr r1, =0x020375e2 ldrb r0, [r2] strh r0, [r1] adds r0, r5, 0 bl sub_81C044C b _081C189A .align 2, 0 -_081C1858: .4byte 0x0203cf21 -_081C185C: .4byte 0x0203cf1c -_081C1860: .4byte 0x000040c6 -_081C1864: .4byte 0x020375e2 + .pool _081C1868: movs r0, 0x20 bl audio_play @@ -918165,10 +886646,10 @@ _081C1876: bl sub_81C48F0 movs r0, 0x5 bl audio_play - ldr r1, _081C18A0 + ldr r1, =0x0203cf21 movs r0, 0x4 strb r0, [r1] - ldr r1, _081C18A4 + ldr r1, =0x020375e2 movs r0, 0x4 strh r0, [r1] adds r0, r5, 0 @@ -918178,21 +886659,20 @@ _081C189A: pop {r0} bx r0 .align 2, 0 -_081C18A0: .4byte 0x0203cf21 -_081C18A4: .4byte 0x020375e2 + .pool thumb_func_end sub_81C174C thumb_func_start sub_81C18A8 sub_81C18A8: @ 81C18A8 push {lr} - ldr r0, _081C18E0 + ldr r0, =0x0203cf1c ldr r2, [r0] - ldr r0, _081C18E4 + ldr r0, =0x000040c6 adds r1, r2, r0 ldrb r0, [r1] cmp r0, 0x4 beq _081C18DA - ldr r3, _081C18E8 + ldr r3, =0x000040c4 adds r0, r2, r3 ldrh r0, [r0] cmp r0, 0 @@ -918212,9 +886692,7 @@ _081C18DA: movs r0, 0x1 b _081C18EE .align 2, 0 -_081C18E0: .4byte 0x0203cf1c -_081C18E4: .4byte 0x000040c6 -_081C18E8: .4byte 0x000040c4 + .pool _081C18EC: movs r0, 0 _081C18EE: @@ -918242,19 +886720,18 @@ sub_81C18F4: @ 81C18F4 movs r2, 0 bl sub_81C1EFC bl sub_81C4154 - ldr r1, _081C1938 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081C193C + ldr r1, =sub_81C1940 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081C1938: .4byte 0x03005e00 -_081C193C: .4byte sub_81C1940 + 1 + .pool thumb_func_end sub_81C18F4 thumb_func_start sub_81C1940 @@ -918269,11 +886746,11 @@ sub_81C1940: @ 81C1940 adds r0, r7 lsls r0, 3 mov r8, r0 - ldr r0, _081C199C + ldr r0, =0x03005e08 mov r9, r0 mov r4, r8 add r4, r9 - ldr r0, _081C19A0 + ldr r0, =sub_81C1E20 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 @@ -918281,7 +886758,7 @@ sub_81C1940: @ 81C1940 bne _081C196C b _081C1B74 _081C196C: - ldr r6, _081C19A4 + ldr r6, =0x030022c0 ldrh r1, [r6, 0x2E] movs r0, 0x40 ands r0, r1 @@ -918295,9 +886772,9 @@ _081C196C: strh r0, [r4] movs r1, 0x1 negs r1, r1 - ldr r0, _081C19A8 + ldr r0, =0x0203cf1c ldr r2, [r0] - ldr r0, _081C19AC + ldr r0, =0x000040c6 adds r2, r0 adds r0, r4, 0 bl sub_81C1070 @@ -918305,11 +886782,7 @@ _081C196C: strh r0, [r4, 0x2] b _081C1B6A .align 2, 0 -_081C199C: .4byte 0x03005e08 -_081C19A0: .4byte sub_81C1E20 + 1 -_081C19A4: .4byte 0x030022c0 -_081C19A8: .4byte 0x0203cf1c -_081C19AC: .4byte 0x000040c6 + .pool _081C19B0: movs r0, 0x80 ands r0, r1 @@ -918319,9 +886792,9 @@ _081C19B0: strh r0, [r4, 0x2] movs r0, 0x4 strh r0, [r4] - ldr r0, _081C19D4 + ldr r0, =0x0203cf1c ldr r2, [r0] - ldr r1, _081C19D8 + ldr r1, =0x000040c6 adds r2, r1 adds r0, r4, 0 movs r1, 0x1 @@ -918329,8 +886802,7 @@ _081C19B0: strh r5, [r4, 0x2] b _081C1B6A .align 2, 0 -_081C19D4: .4byte 0x0203cf1c -_081C19D8: .4byte 0x000040c6 + .pool _081C19DC: movs r0, 0x20 ands r0, r1 @@ -918342,9 +886814,9 @@ _081C19DC: cmp r0, 0x1 bne _081C1A64 _081C19F0: - ldr r4, _081C1A4C + ldr r4, =0x0203cf1c ldr r0, [r4] - ldr r2, _081C1A50 + ldr r2, =0x000040c0 adds r0, r2 ldrb r0, [r0] cmp r0, 0x2 @@ -918353,9 +886825,9 @@ _081C19F0: _081C1A00: movs r0, 0x13 bl Window_FillTileMap - ldr r2, _081C1A54 + ldr r2, =0x02020630 ldr r0, [r4] - ldr r1, _081C1A58 + ldr r1, =0x000040d5 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -918371,7 +886843,7 @@ _081C1A00: bl Window_FillTileMap _081C1A28: ldr r1, [r4] - ldr r2, _081C1A5C + ldr r2, =0x000040c6 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 1 @@ -918381,19 +886853,14 @@ _081C1A28: mov r0, r9 subs r0, 0x8 add r0, r8 - ldr r1, _081C1A60 + ldr r1, =sub_81C174C + 1 str r1, [r0] movs r1, 0x1 negs r1, r1 adds r0, r7, 0 b _081C1ACE .align 2, 0 -_081C1A4C: .4byte 0x0203cf1c -_081C1A50: .4byte 0x000040c0 -_081C1A54: .4byte 0x02020630 -_081C1A58: .4byte 0x000040d5 -_081C1A5C: .4byte 0x000040c6 -_081C1A60: .4byte sub_81C174C + 1 + .pool _081C1A64: ldrh r1, [r6, 0x2E] movs r0, 0x10 @@ -918406,18 +886873,18 @@ _081C1A64: cmp r0, 0x2 bne _081C1B04 _081C1A7A: - ldr r4, _081C1AEC + ldr r4, =0x0203cf1c ldr r0, [r4] - ldr r1, _081C1AF0 + ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 beq _081C1B74 movs r0, 0x13 bl Window_FillTileMap - ldr r2, _081C1AF4 + ldr r2, =0x02020630 ldr r0, [r4] - ldr r1, _081C1AF8 + ldr r1, =0x000040d5 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -918433,7 +886900,7 @@ _081C1A7A: bl Window_FillTileMap _081C1AB0: ldr r1, [r4] - ldr r2, _081C1AFC + ldr r2, =0x000040c6 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 1 @@ -918443,7 +886910,7 @@ _081C1AB0: mov r0, r9 subs r0, 0x8 add r0, r8 - ldr r1, _081C1B00 + ldr r1, =sub_81C174C + 1 str r1, [r0] adds r0, r7, 0 movs r1, 0x1 @@ -918460,12 +886927,7 @@ _081C1ACE: bl sub_81C1EFC b _081C1B74 .align 2, 0 -_081C1AEC: .4byte 0x0203cf1c -_081C1AF0: .4byte 0x000040c0 -_081C1AF4: .4byte 0x02020630 -_081C1AF8: .4byte 0x000040d5 -_081C1AFC: .4byte 0x000040c6 -_081C1B00: .4byte sub_81C174C + 1 + .pool _081C1B04: ldrh r1, [r6, 0x2E] movs r0, 0x3 @@ -918474,10 +886936,10 @@ _081C1B04: beq _081C1B74 movs r0, 0x13 bl Window_FillTileMap - ldr r2, _081C1B80 - ldr r4, _081C1B84 + ldr r2, =0x02020630 + ldr r4, =0x0203cf1c ldr r0, [r4] - ldr r1, _081C1B88 + ldr r1, =0x000040d5 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -918493,7 +886955,7 @@ _081C1B04: bl Window_FillTileMap _081C1B38: ldr r1, [r4] - ldr r2, _081C1B8C + ldr r2, =0x000040c6 adds r0, r1, r2 ldrb r0, [r0] lsls r0, 1 @@ -918517,7 +886979,7 @@ _081C1B6A: mov r0, r9 subs r0, 0x8 add r0, r8 - ldr r1, _081C1B90 + ldr r1, =sub_81C174C + 1 str r1, [r0] _081C1B74: pop {r3,r4} @@ -918527,20 +886989,16 @@ _081C1B74: pop {r0} bx r0 .align 2, 0 -_081C1B80: .4byte 0x02020630 -_081C1B84: .4byte 0x0203cf1c -_081C1B88: .4byte 0x000040d5 -_081C1B8C: .4byte 0x000040c6 -_081C1B90: .4byte sub_81C174C + 1 + .pool thumb_func_end sub_81C1940 thumb_func_start sub_81C1B94 sub_81C1B94: @ 81C1B94 - ldr r0, _081C1B9C + ldr r0, =0x0203cf21 ldrb r0, [r0] bx lr .align 2, 0 -_081C1B9C: .4byte 0x0203cf21 + .pool thumb_func_end sub_81C1B94 thumb_func_start sub_81C1BA0 @@ -918555,9 +887013,9 @@ _081C1BAE: lsls r0, r5, 25 lsrs r1, r0, 24 adds r6, r1, 0 - ldr r0, _081C1BD0 + ldr r0, =0x0203cf1c ldr r3, [r0] - ldr r2, _081C1BD4 + ldr r2, =0x000040c1 adds r0, r3, r2 ldrb r0, [r0] cmp r5, r0 @@ -918570,10 +887028,9 @@ _081C1BAE: movs r1, 0x50 b _081C1BEE .align 2, 0 -_081C1BD0: .4byte 0x0203cf1c -_081C1BD4: .4byte 0x000040c1 + .pool _081C1BD8: - ldr r7, _081C1BF4 + ldr r7, =0x000040c2 adds r0, r3, r7 ldrb r2, [r0] cmp r5, r2 @@ -918589,9 +887046,9 @@ _081C1BEE: strh r1, [r0, 0x12] b _081C1C78 .align 2, 0 -_081C1BF4: .4byte 0x000040c2 + .pool _081C1BF8: - ldr r7, _081C1C18 + ldr r7, =0x000040c0 adds r0, r3, r7 ldrb r0, [r0] cmp r5, r0 @@ -918607,7 +887064,7 @@ _081C1BF8: movs r0, 0x57 b _081C1C76 .align 2, 0 -_081C1C18: .4byte 0x000040c0 + .pool _081C1C1C: cmp r5, r0 bne _081C1C4C @@ -918737,7 +887194,7 @@ _081C1D00: lsls r1, 1 adds r1, r7, r1 subs r2, r6 - ldr r3, _081C1D2C + ldr r3, =0x001fffff ands r2, r3 bl CpuSet adds r0, r5, 0x1 @@ -918748,7 +887205,7 @@ _081C1D00: bcc _081C1D00 b _081C1D60 .align 2, 0 -_081C1D2C: .4byte 0x001fffff + .pool _081C1D30: movs r5, 0 ldrb r0, [r4, 0x7] @@ -918765,7 +887222,7 @@ _081C1D38: lsls r1, 1 adds r1, r7, r1 subs r2, r6 - ldr r3, _081C1D64 + ldr r3, =0x001fffff ands r2, r3 bl CpuSet adds r0, r5, 0x1 @@ -918778,7 +887235,7 @@ _081C1D60: movs r5, 0 b _081C1D8A .align 2, 0 -_081C1D64: .4byte 0x001fffff + .pool _081C1D68: ldrb r2, [r4, 0x6] adds r0, r2, 0 @@ -918818,7 +887275,7 @@ sub_81C1DA4: @ 81C1DA4 lsls r1, 16 lsrs r4, r1, 16 asrs r1, 16 - ldr r3, _081C1DDC + ldr r3, =0x0861cc04 ldrb r2, [r3, 0x6] cmp r1, r2 ble _081C1DBA @@ -918831,9 +887288,9 @@ _081C1DBA: cmp r0, r2 bne _081C1DE8 _081C1DC6: - ldr r0, _081C1DE0 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r0, _081C1DE4 + ldr r0, =0x000020bc adds r1, r0 lsls r2, r4, 24 lsrs r2, 24 @@ -918842,11 +887299,9 @@ _081C1DC6: bl sub_81C1CB0 b _081C1E12 .align 2, 0 -_081C1DDC: .4byte 0x0861cc04 -_081C1DE0: .4byte 0x0203cf1c -_081C1DE4: .4byte 0x000020bc + .pool _081C1DE8: - ldr r5, _081C1E18 + ldr r5, =sub_81C1E20 + 1 adds r0, r5, 0 bl get_task_id_by_function lsls r0, 24 @@ -918859,7 +887314,7 @@ _081C1DE8: lsls r0, 24 lsrs r2, r0, 24 _081C1E04: - ldr r1, _081C1E1C + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -918871,8 +887326,7 @@ _081C1E12: pop {r0} bx r0 .align 2, 0 -_081C1E18: .4byte sub_81C1E20 + 1 -_081C1E1C: .4byte 0x03005e00 + .pool thumb_func_end sub_81C1DA4 thumb_func_start sub_81C1E20 @@ -918883,7 +887337,7 @@ sub_81C1E20: @ 81C1E20 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081C1E48 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4] ldrh r1, [r4, 0x2] @@ -918894,24 +887348,23 @@ sub_81C1E20: @ 81C1E20 bge _081C1E50 movs r0, 0 strh r0, [r4, 0x2] - ldr r7, _081C1E4C + ldr r7, =0x0861cc04 b _081C1E60 .align 2, 0 -_081C1E48: .4byte 0x03005e08 -_081C1E4C: .4byte 0x0861cc04 + .pool _081C1E50: movs r0, 0x2 ldrsh r1, [r4, r0] - ldr r0, _081C1E9C + ldr r0, =0x0861cc04 ldrb r2, [r0, 0x6] adds r7, r0, 0 cmp r1, r2 ble _081C1E60 strh r2, [r4, 0x2] _081C1E60: - ldr r5, _081C1EA0 + ldr r5, =0x0203cf1c ldr r1, [r5] - ldr r0, _081C1EA4 + ldr r0, =0x000020bc adds r1, r0 ldrb r2, [r4, 0x2] adds r0, r7, 0 @@ -918930,7 +887383,7 @@ _081C1E80: cmp r0, 0 bge _081C1EAC ldr r0, [r5] - ldr r1, _081C1EA8 + ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 @@ -918939,14 +887392,11 @@ _081C1E80: bl Window_WriteStandardTileMap b _081C1ED4 .align 2, 0 -_081C1E9C: .4byte 0x0861cc04 -_081C1EA0: .4byte 0x0203cf1c -_081C1EA4: .4byte 0x000020bc -_081C1EA8: .4byte 0x000040c0 + .pool _081C1EAC: - ldr r2, _081C1EF4 + ldr r2, =0x02020630 ldr r0, [r5] - ldr r1, _081C1EF8 + ldr r1, =0x000040d5 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -918977,8 +887427,7 @@ _081C1EE0: pop {r0} bx r0 .align 2, 0 -_081C1EF4: .4byte 0x02020630 -_081C1EF8: .4byte 0x000040d5 + .pool thumb_func_end sub_81C1E20 thumb_func_start sub_81C1EFC @@ -918991,7 +887440,7 @@ sub_81C1EFC: @ 81C1EFC lsrs r6, r2, 16 lsrs r4, r1, 16 asrs r1, 16 - ldr r3, _081C1F38 + ldr r3, =0x0861cc10 ldrb r2, [r3, 0x6] cmp r1, r2 ble _081C1F16 @@ -919004,9 +887453,9 @@ _081C1F16: cmp r0, r2 bne _081C1F44 _081C1F22: - ldr r0, _081C1F3C + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r0, _081C1F40 + ldr r0, =0x000030bc adds r1, r0 lsls r2, r4, 24 lsrs r2, 24 @@ -919015,11 +887464,9 @@ _081C1F22: bl sub_81C1CB0 b _081C1F70 .align 2, 0 -_081C1F38: .4byte 0x0861cc10 -_081C1F3C: .4byte 0x0203cf1c -_081C1F40: .4byte 0x000030bc + .pool _081C1F44: - ldr r5, _081C1F78 + ldr r5, =sub_81C1F80 + 1 adds r0, r5, 0 bl get_task_id_by_function lsls r0, 24 @@ -919032,7 +887479,7 @@ _081C1F44: lsls r0, 24 lsrs r2, r0, 24 _081C1F60: - ldr r1, _081C1F7C + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -919045,8 +887492,7 @@ _081C1F70: pop {r0} bx r0 .align 2, 0 -_081C1F78: .4byte sub_81C1F80 + 1 -_081C1F7C: .4byte 0x03005e00 + .pool thumb_func_end sub_81C1EFC thumb_func_start sub_81C1F80 @@ -919057,7 +887503,7 @@ sub_81C1F80: @ 81C1F80 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081C1FA8 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4] ldrh r1, [r4, 0x2] @@ -919068,24 +887514,23 @@ sub_81C1F80: @ 81C1F80 bge _081C1FB0 movs r0, 0 strh r0, [r4, 0x2] - ldr r7, _081C1FAC + ldr r7, =0x0861cc10 b _081C1FC0 .align 2, 0 -_081C1FA8: .4byte 0x03005e08 -_081C1FAC: .4byte 0x0861cc10 + .pool _081C1FB0: movs r0, 0x2 ldrsh r1, [r4, r0] - ldr r0, _081C2010 + ldr r0, =0x0861cc10 ldrb r2, [r0, 0x6] adds r7, r0, 0 cmp r1, r2 ble _081C1FC0 strh r2, [r4, 0x2] _081C1FC0: - ldr r5, _081C2014 + ldr r5, =0x0203cf1c ldr r1, [r5] - ldr r0, _081C2018 + ldr r0, =0x000030bc adds r1, r0 ldrb r2, [r4, 0x2] adds r0, r7, 0 @@ -919104,12 +887549,12 @@ _081C1FE0: cmp r0, 0 bge _081C2024 ldr r0, [r5] - ldr r1, _081C201C + ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 bne _081C2006 - ldr r0, _081C2020 + ldr r0, =sub_81C0B8C + 1 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 @@ -919121,15 +887566,11 @@ _081C2006: bl sub_81C240C b _081C204C .align 2, 0 -_081C2010: .4byte 0x0861cc10 -_081C2014: .4byte 0x0203cf1c -_081C2018: .4byte 0x000030bc -_081C201C: .4byte 0x000040c0 -_081C2020: .4byte sub_81C0B8C + 1 + .pool _081C2024: - ldr r2, _081C206C + ldr r2, =0x02020630 ldr r0, [r5] - ldr r1, _081C2070 + ldr r1, =0x000040d5 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -919160,8 +887601,7 @@ _081C2058: pop {r0} bx r0 .align 2, 0 -_081C206C: .4byte 0x02020630 -_081C2070: .4byte 0x000040d5 + .pool thumb_func_end sub_81C1F80 thumb_func_start sub_81C2074 @@ -919172,7 +887612,7 @@ sub_81C2074: @ 81C2074 lsls r1, 16 lsrs r4, r1, 16 asrs r1, 16 - ldr r3, _081C20BC + ldr r3, =0x0861cbec ldrb r2, [r3, 0x6] cmp r1, r2 ble _081C208A @@ -919185,7 +887625,7 @@ _081C208A: cmp r0, r2 bne _081C20C8 _081C2096: - ldr r5, _081C20C0 + ldr r5, =0x0203cf1c ldr r1, [r5] adds r1, 0xBC lsls r4, 24 @@ -919194,7 +887634,7 @@ _081C2096: adds r2, r4, 0 movs r3, 0 bl sub_81C1CB0 - ldr r0, _081C20C4 + ldr r0, =0x0861cbf8 ldr r1, [r5] adds r1, 0xBC adds r2, r4, 0 @@ -919202,16 +887642,14 @@ _081C2096: bl sub_81C1CB0 b _081C20E2 .align 2, 0 -_081C20BC: .4byte 0x0861cbec -_081C20C0: .4byte 0x0203cf1c -_081C20C4: .4byte 0x0861cbf8 + .pool _081C20C8: - ldr r0, _081C20E8 + ldr r0, =sub_81C20F0 + 1 movs r1, 0x8 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081C20EC + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -919223,8 +887661,7 @@ _081C20E2: pop {r0} bx r0 .align 2, 0 -_081C20E8: .4byte sub_81C20F0 + 1 -_081C20EC: .4byte 0x03005e00 + .pool thumb_func_end sub_81C2074 thumb_func_start sub_81C20F0 @@ -919235,7 +887672,7 @@ sub_81C20F0: @ 81C20F0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081C2118 + ldr r1, =0x03005e08 adds r5, r0, r1 ldrh r0, [r5] ldrh r1, [r5, 0x2] @@ -919246,29 +887683,28 @@ sub_81C20F0: @ 81C20F0 bge _081C2120 movs r0, 0 strh r0, [r5, 0x2] - ldr r7, _081C211C + ldr r7, =0x0861cbec b _081C2130 .align 2, 0 -_081C2118: .4byte 0x03005e08 -_081C211C: .4byte 0x0861cbec + .pool _081C2120: movs r0, 0x2 ldrsh r1, [r5, r0] - ldr r0, _081C2188 + ldr r0, =0x0861cbec ldrb r2, [r0, 0x6] adds r7, r0, 0 cmp r1, r2 ble _081C2130 strh r2, [r5, 0x2] _081C2130: - ldr r4, _081C218C + ldr r4, =0x0203cf1c ldr r1, [r4] adds r1, 0xBC ldrb r2, [r5, 0x2] adds r0, r7, 0 movs r3, 0 bl sub_81C1CB0 - ldr r0, _081C2190 + ldr r0, =0x0861cbf8 ldr r1, [r4] adds r1, 0xBC ldrb r2, [r5, 0x2] @@ -919301,9 +887737,7 @@ _081C2180: pop {r0} bx r0 .align 2, 0 -_081C2188: .4byte 0x0861cbec -_081C218C: .4byte 0x0203cf1c -_081C2190: .4byte 0x0861cbf8 + .pool thumb_func_end sub_81C20F0 thumb_func_start sub_81C2194 @@ -919313,11 +887747,11 @@ sub_81C2194: @ 81C2194 lsls r2, 24 lsls r1, 28 lsrs r4, r1, 16 - ldr r7, _081C21DC + ldr r7, =0x0000056a cmp r2, 0 bne _081C21E4 movs r3, 0 - ldr r5, _081C21E0 + ldr r5, =0x08dc3cd4 _081C21A8: adds r2, r7, r3 lsls r2, 1 @@ -919345,11 +887779,10 @@ _081C21A8: bls _081C21A8 b _081C221C .align 2, 0 -_081C21DC: .4byte 0x0000056a -_081C21E0: .4byte 0x08dc3cd4 + .pool _081C21E4: movs r3, 0 - ldr r5, _081C2224 + ldr r5, =0x08dc3cd4 _081C21E8: adds r1, r7, r3 lsls r1, 1 @@ -919382,7 +887815,7 @@ _081C221C: pop {r0} bx r0 .align 2, 0 -_081C2224: .4byte 0x08dc3cd4 + .pool thumb_func_end sub_81C2194 thumb_func_start sub_81C2228 @@ -919400,24 +887833,23 @@ sub_81C2228: @ 81C2228 lsls r0, 24 cmp r0, 0 beq _081C225C - ldr r0, _081C2254 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r2, _081C2258 + ldr r2, =0x00000502 adds r1, r0, r2 movs r2, 0x2C b _081C2266 .align 2, 0 -_081C2254: .4byte 0x0203cf1c -_081C2258: .4byte 0x00000502 + .pool _081C225C: - ldr r0, _081C227C + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r2, _081C2280 + ldr r2, =0x00000502 adds r1, r0, r2 - ldr r2, _081C2284 + ldr r2, =0x0000081a _081C2266: strh r2, [r1] - ldr r1, _081C2288 + ldr r1, =0x00000d02 adds r0, r1 strh r2, [r0] movs r0, 0x3 @@ -919426,10 +887858,7 @@ _081C2266: pop {r0} bx r0 .align 2, 0 -_081C227C: .4byte 0x0203cf1c -_081C2280: .4byte 0x00000502 -_081C2284: .4byte 0x0000081a -_081C2288: .4byte 0x00000d02 + .pool thumb_func_end sub_81C2228 thumb_func_start sub_81C228C @@ -919474,7 +887903,7 @@ sub_81C22CC: @ 81C22CC mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, _081C2334 + ldr r0, =0x0203cf1c ldr r1, [r0] adds r6, r1, 0 adds r6, 0x70 @@ -919482,11 +887911,11 @@ sub_81C22CC: @ 81C22CC mov r8, r0 cmp r1, 0x63 bhi _081C2340 - ldr r5, _081C2338 + ldr r5, =0x0831f72c adds r2, r1, 0 adds r1, r2, 0x1 lsls r1, 2 - ldr r4, _081C233C + ldr r4, =0x083203cc ldrh r3, [r6] lsls r0, r3, 3 subs r0, r3 @@ -919520,21 +887949,19 @@ sub_81C22CC: @ 81C22CC movs r7, 0 b _081C2344 .align 2, 0 -_081C2334: .4byte 0x0203cf1c -_081C2338: .4byte 0x0831f72c -_081C233C: .4byte 0x083203cc + .pool _081C2340: movs r6, 0 movs r7, 0 _081C2344: mov r1, r8 ldr r0, [r1] - ldr r2, _081C2370 + ldr r2, =0x00001d66 adds r2, r0 mov r9, r2 movs r0, 0 mov r12, r0 - ldr r1, _081C2374 + ldr r1, =0x00002062 mov r10, r1 _081C2356: cmp r7, 0 @@ -919547,14 +887974,12 @@ _081C2362: mov r2, r12 lsls r0, r2, 1 add r0, r9 - ldr r2, _081C2378 + ldr r2, =0x0000206a adds r1, r2, 0 strh r1, [r0] b _081C23B6 .align 2, 0 -_081C2370: .4byte 0x00001d66 -_081C2374: .4byte 0x00002062 -_081C2378: .4byte 0x0000206a + .pool _081C237C: mov r1, r12 lsls r0, r1, 1 @@ -919606,9 +888031,9 @@ _081C23C8: bls _081C2356 movs r0, 0x1 bl bg_get_tilemap - ldr r1, _081C23F0 + ldr r1, =0x0203cf1c ldr r1, [r1] - ldr r2, _081C23F4 + ldr r2, =0x000010bc adds r1, r2 cmp r0, r1 bne _081C23F8 @@ -919616,8 +888041,7 @@ _081C23C8: bl schedule_bg_copy_tilemap_to_vram b _081C23FE .align 2, 0 -_081C23F0: .4byte 0x0203cf1c -_081C23F4: .4byte 0x000010bc + .pool _081C23F8: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram @@ -919640,14 +888064,14 @@ sub_81C240C: @ 81C240C push {r5-r7} lsls r0, 16 lsrs r3, r0, 16 - ldr r0, _081C2470 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C2474 + ldr r1, =0x000038bc adds r5, r0, r1 cmp r3, 0 beq _081C2510 - ldr r1, _081C2478 - ldr r2, _081C247C + ldr r1, =0x0858cdcc + ldr r2, =0x0858c2b4 lsls r3, 3 adds r0, r3, r2 ldrb r0, [r0] @@ -919682,14 +888106,10 @@ _081C2454: lsls r0, 1 adds r0, r5 adds r0, r3 - ldr r7, _081C2480 + ldr r7, =0x0000103a b _081C2496 .align 2, 0 -_081C2470: .4byte 0x0203cf1c -_081C2474: .4byte 0x000038bc -_081C2478: .4byte 0x0858cdcc -_081C247C: .4byte 0x0858c2b4 -_081C2480: .4byte 0x0000103a + .pool _081C2484: lsrs r0, r2, 2 adds r1, r2, 0 @@ -919699,7 +888119,7 @@ _081C2484: lsls r0, 1 adds r0, r5 adds r0, r3 - ldr r7, _081C24E4 + ldr r7, =0x00001039 _081C2496: adds r1, r7, 0 strh r1, [r0] @@ -919724,7 +888144,7 @@ _081C2496: _081C24C0: movs r2, 0 movs r6, 0x3 - ldr r3, _081C24E8 + ldr r3, =0x0000044c _081C24C6: cmp r4, 0xFF beq _081C24F0 @@ -919738,12 +888158,10 @@ _081C24C6: lsls r0, 1 adds r0, r5 adds r0, r3 - ldr r7, _081C24EC + ldr r7, =0x0000103c b _081C2502 .align 2, 0 -_081C24E4: .4byte 0x00001039 -_081C24E8: .4byte 0x0000044c -_081C24EC: .4byte 0x0000103c + .pool _081C24F0: lsrs r0, r2, 2 adds r1, r2, 0 @@ -919753,7 +888171,7 @@ _081C24F0: lsls r0, 1 adds r0, r5 adds r0, r3 - ldr r7, _081C2520 + ldr r7, =0x0000103d _081C2502: adds r1, r7, 0 strh r1, [r0] @@ -919771,13 +888189,13 @@ _081C2510: pop {r0} bx r0 .align 2, 0 -_081C2520: .4byte 0x0000103d + .pool thumb_func_end sub_81C240C thumb_func_start sub_81C2524 sub_81C2524: @ 81C2524 push {lr} - ldr r0, _081C2540 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0x74 ldrb r0, [r0] @@ -919790,7 +888208,7 @@ sub_81C2524: @ 81C2524 bl bg_change_x_offset b _081C254E .align 2, 0 -_081C2540: .4byte 0x0203cf1c + .pool _081C2544: movs r0, 0x3 movs r1, 0 @@ -919804,7 +888222,7 @@ _081C254E: thumb_func_start sub_81C2554 sub_81C2554: @ 81C2554 push {r4,r5,lr} - ldr r0, _081C2598 + ldr r0, =0x0861cc24 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r4, 0 @@ -919818,8 +888236,8 @@ _081C2562: cmp r4, 0x13 bls _081C2562 movs r4, 0 - ldr r5, _081C259C - ldr r3, _081C25A0 + ldr r5, =0x0203cf1c + ldr r3, =0x000040cb movs r2, 0xFF _081C257C: ldr r0, [r5] @@ -919837,9 +888255,7 @@ _081C257C: pop {r0} bx r0 .align 2, 0 -_081C2598: .4byte 0x0861cc24 -_081C259C: .4byte 0x0203cf1c -_081C25A0: .4byte 0x000040cb + .pool thumb_func_end sub_81C2554 thumb_func_start sub_81C25A4 @@ -919863,7 +888279,7 @@ sub_81C25A4: @ 81C25A4 str r4, [sp, 0x4] lsls r4, r5, 1 adds r4, r5 - ldr r5, _081C25E4 + ldr r5, =0x0861cd2c adds r4, r5 str r4, [sp, 0x8] str r6, [sp, 0xC] @@ -919875,7 +888291,7 @@ sub_81C25A4: @ 81C25A4 pop {r0} bx r0 .align 2, 0 -_081C25E4: .4byte 0x0861cd2c + .pool thumb_func_end sub_81C25A4 thumb_func_start sub_81C25E8 @@ -919890,7 +888306,7 @@ sub_81C25E8: @ 81C25E8 movs r0, 0x13 movs r1, 0 bl Window_FastFillPixels - ldr r0, _081C2614 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0x74 ldrb r0, [r0] @@ -919899,7 +888315,7 @@ sub_81C25E8: @ 81C25E8 bl sub_81C2628 b _081C261C .align 2, 0 -_081C2614: .4byte 0x0203cf1c + .pool _081C2618: bl sub_81C2794 _081C261C: @@ -919915,7 +888331,7 @@ sub_81C2628: @ 81C2628 mov r7, r8 push {r7} sub sp, 0x18 - ldr r0, _081C2698 + ldr r0, =0x0203cf1c ldr r0, [r0] movs r1, 0xC adds r1, r0 @@ -919926,14 +888342,14 @@ sub_81C2628: @ 81C2628 bl sub_806E3C0 lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _081C269C + ldr r0, =0x0000ffff cmp r5, r0 beq _081C26CE - ldr r6, _081C26A0 - ldr r1, _081C26A4 + ldr r6, =0x02021cc4 + ldr r1, =0x085e8d4f adds r0, r6, 0 bl gf_strcpy - ldr r4, _081C26A8 + ldr r4, =0x02021dc4 adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x2 @@ -919960,11 +888376,7 @@ sub_81C2628: @ 81C2628 bl sub_81C228C b _081C26C6 .align 2, 0 -_081C2698: .4byte 0x0203cf1c -_081C269C: .4byte 0x0000ffff -_081C26A0: .4byte 0x02021cc4 -_081C26A4: .4byte 0x085e8d4f -_081C26A8: .4byte 0x02021dc4 + .pool _081C26AC: movs r0, 0 str r0, [sp] @@ -919996,11 +888408,11 @@ _081C26E8: movs r0, 0x1 bl sub_81C228C _081C26EE: - ldr r4, _081C2784 - ldr r1, _081C2788 + ldr r4, =0x02021cc4 + ldr r1, =0x085e8d4d adds r0, r4, 0 bl gf_strcpy - ldr r5, _081C278C + ldr r5, =0x02021dc4 ldrb r1, [r7, 0x5] adds r0, r5, 0 movs r2, 0 @@ -920036,7 +888448,7 @@ _081C26EE: ldrh r2, [r7, 0x2] movs r1, 0xB muls r1, r2 - ldr r2, _081C2790 + ldr r2, =0x083185c8 adds r1, r2 bl gf_strcpy str r6, [sp] @@ -920060,20 +888472,17 @@ _081C26EE: pop {r0} bx r0 .align 2, 0 -_081C2784: .4byte 0x02021cc4 -_081C2788: .4byte 0x085e8d4d -_081C278C: .4byte 0x02021dc4 -_081C2790: .4byte 0x083185c8 + .pool thumb_func_end sub_81C2628 thumb_func_start sub_81C2794 sub_81C2794: @ 81C2794 push {r4,lr} sub sp, 0x8 - ldr r0, _081C27D4 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC - ldr r4, _081C27D8 + ldr r4, =0x02021cc4 adds r1, r4, 0 bl sub_81B1B44 movs r0, 0 @@ -920096,8 +888505,7 @@ sub_81C2794: @ 81C2794 pop {r0} bx r0 .align 2, 0 -_081C27D4: .4byte 0x0203cf1c -_081C27D8: .4byte 0x02021cc4 + .pool thumb_func_end sub_81C2794 thumb_func_start sub_81C27DC @@ -920119,7 +888527,7 @@ sub_81C27DC: @ 81C27DC beq _081C2818 b _081C282C _081C27FE: - ldr r1, _081C2814 + ldr r1, =0x085e8d49 str r0, [sp] movs r0, 0x3 str r0, [sp, 0x4] @@ -920129,9 +888537,9 @@ _081C27FE: bl sub_81C25A4 b _081C282C .align 2, 0 -_081C2814: .4byte 0x085e8d49 + .pool _081C2818: - ldr r1, _081C2834 + ldr r1, =0x085e8d4b movs r0, 0 str r0, [sp] movs r0, 0x4 @@ -920145,7 +888553,7 @@ _081C282C: pop {r0} bx r0 .align 2, 0 -_081C2834: .4byte 0x085e8d4b + .pool thumb_func_end sub_81C27DC thumb_func_start sub_81C2838 @@ -920155,7 +888563,7 @@ sub_81C2838: @ 81C2838 lsls r0, 24 lsrs r4, r0, 24 lsls r1, 24 - ldr r3, _081C2868 + ldr r3, =0x0861cdd3 cmp r1, 0 bne _081C284A subs r3, 0x80 @@ -920174,14 +888582,14 @@ _081C284A: pop {r0} bx r0 .align 2, 0 -_081C2868: .4byte 0x0861cdd3 + .pool thumb_func_end sub_81C2838 thumb_func_start sub_81C286C sub_81C286C: @ 81C286C push {r4-r7,lr} sub sp, 0x8 - ldr r1, _081C2AA4 + ldr r1, =0x085ea3cf movs r5, 0 str r5, [sp] movs r6, 0x1 @@ -920190,28 +888598,28 @@ sub_81C286C: @ 81C286C movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, _081C2AA8 + ldr r1, =0x085ea3dc str r5, [sp] str r6, [sp, 0x4] movs r0, 0x1 movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, _081C2AAC + ldr r1, =0x085ea3eb str r5, [sp] str r6, [sp, 0x4] movs r0, 0x2 movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, _081C2AB0 + ldr r1, =0x085ea3f8 str r5, [sp] str r6, [sp, 0x4] movs r0, 0x3 movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r7, _081C2AB4 + ldr r7, =0x085e8cf7 movs r0, 0x1 adds r1, r7, 0 movs r2, 0x3E @@ -920234,7 +888642,7 @@ _081C28CC: adds r1, r7, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r7, _081C2AB8 + ldr r7, =0x085ea406 movs r0, 0x1 adds r1, r7, 0 movs r2, 0x3E @@ -920257,7 +888665,7 @@ _081C28FE: adds r1, r7, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r7, _081C2ABC + ldr r7, =0x085ea3c8 movs r0, 0x1 adds r1, r7, 0 movs r2, 0x3E @@ -920280,21 +888688,21 @@ _081C2930: adds r1, r7, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, _081C2AC0 + ldr r1, =0x085ea369 str r5, [sp] str r6, [sp, 0x4] movs r0, 0x8 movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, _081C2AC4 + ldr r1, =0x085ea378 str r5, [sp] str r5, [sp, 0x4] movs r0, 0x9 movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r4, _081C2AC8 + ldr r4, =0x085ea361 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x2A @@ -920308,7 +888716,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r4, _081C2ACC + ldr r4, =0x085ea33c movs r0, 0x1 adds r1, r4, 0 movs r2, 0x2A @@ -920322,7 +888730,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x11 bl sub_81C25A4 - ldr r4, _081C2AD0 + ldr r4, =0x085ea343 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x2A @@ -920336,7 +888744,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x21 bl sub_81C25A4 - ldr r4, _081C2AD4 + ldr r4, =0x085ea34b movs r0, 0x1 adds r1, r4, 0 movs r2, 0x24 @@ -920350,7 +888758,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r4, _081C2AD8 + ldr r4, =0x085ea353 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x24 @@ -920364,7 +888772,7 @@ _081C2930: adds r1, r4, 0 movs r3, 0x11 bl sub_81C25A4 - ldr r4, _081C2ADC + ldr r4, =0x085ea35b movs r0, 0x1 adds r1, r4, 0 movs r2, 0x24 @@ -920378,49 +888786,49 @@ _081C2930: adds r1, r4, 0 movs r3, 0x21 bl sub_81C25A4 - ldr r1, _081C2AE0 + ldr r1, =0x085ea39f str r5, [sp] str r6, [sp, 0x4] movs r0, 0xC movs r2, 0x6 movs r3, 0x1 bl sub_81C25A4 - ldr r1, _081C2AE4 + ldr r1, =0x085ea3ab str r5, [sp] str r6, [sp, 0x4] movs r0, 0xC movs r2, 0x6 movs r3, 0x11 bl sub_81C25A4 - ldr r1, _081C2AE8 + ldr r1, =0x085ea398 str r5, [sp] str r6, [sp, 0x4] movs r0, 0xD movs r2, 0x2 movs r3, 0x1 bl sub_81C25A4 - ldr r1, _081C2AEC + ldr r1, =0x085ea37e str r5, [sp] str r6, [sp, 0x4] movs r0, 0xE movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, _081C2AF0 + ldr r1, =0x085ea384 str r5, [sp] str r6, [sp, 0x4] movs r0, 0xE movs r2, 0 movs r3, 0x11 bl sub_81C25A4 - ldr r1, _081C2AF4 + ldr r1, =0x085ea38d str r5, [sp] str r6, [sp, 0x4] movs r0, 0xF movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, _081C2AF8 + ldr r1, =0x085ea394 str r5, [sp] str r6, [sp, 0x4] movs r0, 0xF @@ -920432,28 +888840,7 @@ _081C2930: pop {r0} bx r0 .align 2, 0 -_081C2AA4: .4byte 0x085ea3cf -_081C2AA8: .4byte 0x085ea3dc -_081C2AAC: .4byte 0x085ea3eb -_081C2AB0: .4byte 0x085ea3f8 -_081C2AB4: .4byte 0x085e8cf7 -_081C2AB8: .4byte 0x085ea406 -_081C2ABC: .4byte 0x085ea3c8 -_081C2AC0: .4byte 0x085ea369 -_081C2AC4: .4byte 0x085ea378 -_081C2AC8: .4byte 0x085ea361 -_081C2ACC: .4byte 0x085ea33c -_081C2AD0: .4byte 0x085ea343 -_081C2AD4: .4byte 0x085ea34b -_081C2AD8: .4byte 0x085ea353 -_081C2ADC: .4byte 0x085ea35b -_081C2AE0: .4byte 0x085ea39f -_081C2AE4: .4byte 0x085ea3ab -_081C2AE8: .4byte 0x085ea398 -_081C2AEC: .4byte 0x085ea37e -_081C2AF0: .4byte 0x085ea384 -_081C2AF4: .4byte 0x085ea38d -_081C2AF8: .4byte 0x085ea394 + .pool thumb_func_end sub_81C286C thumb_func_start sub_81C2AFC @@ -920518,9 +888905,9 @@ _081C2B66: _081C2B80: movs r0, 0x2 bl Window_WriteStandardTileMap - ldr r0, _081C2BB0 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C2BB4 + ldr r2, =0x000040bc adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 @@ -920528,7 +888915,7 @@ _081C2B80: adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] - ldr r1, _081C2BB8 + ldr r1, =0x00ffffff ands r0, r1 movs r1, 0x80 lsls r1, 11 @@ -920538,9 +888925,7 @@ _081C2B80: bl Window_WriteStandardTileMap b _081C2C06 .align 2, 0 -_081C2BB0: .4byte 0x0203cf1c -_081C2BB4: .4byte 0x000040bc -_081C2BB8: .4byte 0x00ffffff + .pool _081C2BBC: movs r0, 0x5 bl Window_WriteStandardTileMap @@ -920548,9 +888933,9 @@ _081C2BBC: _081C2BC4: movs r0, 0x3 bl Window_WriteStandardTileMap - ldr r0, _081C2BF4 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C2BF8 + ldr r2, =0x000040bc adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 @@ -920558,7 +888943,7 @@ _081C2BC4: adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] - ldr r1, _081C2BFC + ldr r1, =0x00ffffff ands r0, r1 movs r1, 0x80 lsls r1, 11 @@ -920568,18 +888953,16 @@ _081C2BC4: bl Window_WriteStandardTileMap b _081C2C06 .align 2, 0 -_081C2BF4: .4byte 0x0203cf1c -_081C2BF8: .4byte 0x000040bc -_081C2BFC: .4byte 0x00ffffff + .pool _081C2C00: movs r0, 0x5 bl Window_WriteStandardTileMap _081C2C06: movs r4, 0 - ldr r5, _081C2C30 + ldr r5, =0x0203cf1c _081C2C0A: ldr r0, [r5] - ldr r1, _081C2C34 + ldr r1, =0x000040cb adds r0, r1 adds r0, r4 ldrb r0, [r0] @@ -920595,8 +888978,7 @@ _081C2C0A: pop {r0} bx r0 .align 2, 0 -_081C2C30: .4byte 0x0203cf1c -_081C2C34: .4byte 0x000040cb + .pool thumb_func_end sub_81C2AFC thumb_func_start sub_81C2C38 @@ -920647,9 +889029,9 @@ _081C2C84: bl Window_FillTileMap b _081C2D0E _081C2C98: - ldr r0, _081C2CC0 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C2CC4 + ldr r2, =0x000040bc adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 @@ -920657,7 +889039,7 @@ _081C2C98: adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] - ldr r1, _081C2CC8 + ldr r1, =0x00ffffff ands r0, r1 movs r1, 0x80 lsls r1, 11 @@ -920667,17 +889049,15 @@ _081C2C98: bl Window_FillTileMap b _081C2D0E .align 2, 0 -_081C2CC0: .4byte 0x0203cf1c -_081C2CC4: .4byte 0x000040bc -_081C2CC8: .4byte 0x00ffffff + .pool _081C2CCC: movs r0, 0x5 bl Window_FillTileMap b _081C2D0E _081C2CD4: - ldr r0, _081C2CFC + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C2D00 + ldr r2, =0x000040bc adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 @@ -920685,7 +889065,7 @@ _081C2CD4: adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] - ldr r1, _081C2D04 + ldr r1, =0x00ffffff ands r0, r1 movs r1, 0x80 lsls r1, 11 @@ -920695,9 +889075,7 @@ _081C2CD4: bl Window_FillTileMap b _081C2D0E .align 2, 0 -_081C2CFC: .4byte 0x0203cf1c -_081C2D00: .4byte 0x000040bc -_081C2D04: .4byte 0x00ffffff + .pool _081C2D08: movs r0, 0x5 bl Window_FillTileMap @@ -920724,8 +889102,8 @@ sub_81C2D2C: @ 81C2D2C adds r3, r0, 0 lsls r1, 24 lsrs r2, r1, 24 - ldr r0, _081C2D60 - ldr r4, _081C2D64 + ldr r0, =0x0203cf1c + ldr r4, =0x000040cb adds r1, r2, r4 ldr r0, [r0] adds r4, r0, r1 @@ -920745,8 +889123,7 @@ _081C2D56: pop {r1} bx r1 .align 2, 0 -_081C2D60: .4byte 0x0203cf1c -_081C2D64: .4byte 0x000040cb + .pool thumb_func_end sub_81C2D2C thumb_func_start sub_81C2D68 @@ -920754,8 +889131,8 @@ sub_81C2D68: @ 81C2D68 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081C2D94 - ldr r2, _081C2D98 + ldr r1, =0x0203cf1c + ldr r2, =0x000040cb adds r0, r2 ldr r1, [r1] adds r4, r1, r0 @@ -920772,8 +889149,7 @@ _081C2D8C: pop {r0} bx r0 .align 2, 0 -_081C2D94: .4byte 0x0203cf1c -_081C2D98: .4byte 0x000040cb + .pool thumb_func_end sub_81C2D68 thumb_func_start sub_81C2D9C @@ -920783,9 +889159,9 @@ sub_81C2D9C: @ 81C2D9C lsrs r5, r0, 24 movs r4, 0 _081C2DA4: - ldr r0, _081C2DD8 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C2DDC + ldr r1, =0x000040cb adds r0, r1 adds r1, r0, r4 ldrb r0, [r1] @@ -920799,7 +889175,7 @@ _081C2DBA: lsrs r4, r0, 16 cmp r4, 0x7 bls _081C2DA4 - ldr r0, _081C2DE0 + ldr r0, =0x0861ce54 lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] @@ -920808,16 +889184,14 @@ _081C2DBA: pop {r0} bx r0 .align 2, 0 -_081C2DD8: .4byte 0x0203cf1c -_081C2DDC: .4byte 0x000040cb -_081C2DE0: .4byte 0x0861ce54 + .pool thumb_func_end sub_81C2D9C thumb_func_start sub_81C2DE4 sub_81C2DE4: @ 81C2DE4 push {lr} lsls r0, 24 - ldr r1, _081C2DFC + ldr r1, =0x0861ce64 lsrs r0, 22 adds r0, r1 ldr r0, [r0] @@ -920826,13 +889200,13 @@ sub_81C2DE4: @ 81C2DE4 pop {r0} bx r0 .align 2, 0 -_081C2DFC: .4byte 0x0861ce64 + .pool thumb_func_end sub_81C2DE4 thumb_func_start sub_81C2E00 sub_81C2E00: @ 81C2E00 push {lr} - ldr r0, _081C2E20 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0x74 ldrb r0, [r0] @@ -920844,7 +889218,7 @@ sub_81C2E00: @ 81C2E00 bl sub_81C349C b _081C2E3C .align 2, 0 -_081C2E20: .4byte 0x0203cf1c + .pool _081C2E24: bl sub_81C2EC4 bl sub_81C2F5C @@ -920865,7 +889239,7 @@ sub_81C2E40: @ 81C2E40 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _081C2E68 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4] subs r0, 0x1 @@ -920874,13 +889248,12 @@ sub_81C2E40: @ 81C2E40 cmp r0, 0x6 bhi _081C2EB8 lsls r0, 2 - ldr r1, _081C2E6C + ldr r1, =_081C2E70 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C2E68: .4byte 0x03005e08 -_081C2E6C: .4byte _081C2E70 + .pool .align 2, 0 _081C2E70: .4byte _081C2E8C @@ -920936,12 +889309,12 @@ sub_81C2EC4: @ 81C2EC4 lsrs r0, 24 cmp r0, 0x1 beq _081C2F54 - ldr r0, _081C2F34 + ldr r0, =0x0861cccc movs r1, 0 bl sub_81C2D2C lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _081C2F38 + ldr r4, =0x085ea365 movs r6, 0 str r6, [sp] movs r0, 0x1 @@ -920956,7 +889329,7 @@ sub_81C2EC4: @ 81C2EC4 movs r2, 0 bl font_get_width_of_string adds r2, r0, 0 - ldr r0, _081C2F3C + ldr r0, =0x0203cf1c ldr r1, [r0] adds r0, r1, 0 adds r0, 0xA2 @@ -920974,9 +889347,7 @@ sub_81C2EC4: @ 81C2EC4 bl sub_81C25A4 b _081C2F54 .align 2, 0 -_081C2F34: .4byte 0x0861cccc -_081C2F38: .4byte 0x085ea365 -_081C2F3C: .4byte 0x0203cf1c + .pool _081C2F40: adds r1, 0xA6 lsls r2, 24 @@ -921008,11 +889379,11 @@ sub_81C2F5C: @ 81C2F5C lsrs r0, 24 cmp r0, 0x1 beq _081C2FC0 - ldr r5, _081C2FC8 - ldr r1, _081C2FCC + ldr r5, =0x02021cc4 + ldr r1, =0x085e8d59 adds r0, r5, 0 bl gf_strcpy - ldr r1, _081C2FD0 + ldr r1, =0x0203cf1c ldr r1, [r1] adds r1, 0xB8 ldrh r1, [r1] @@ -921024,7 +889395,7 @@ sub_81C2F5C: @ 81C2F5C movs r2, 0x38 bl sub_81DB368 adds r4, r0, 0 - ldr r0, _081C2FD4 + ldr r0, =0x0861cccc movs r1, 0x1 bl sub_81C2D2C lsls r0, 24 @@ -921045,17 +889416,14 @@ _081C2FC0: pop {r0} bx r0 .align 2, 0 -_081C2FC8: .4byte 0x02021cc4 -_081C2FCC: .4byte 0x085e8d59 -_081C2FD0: .4byte 0x0203cf1c -_081C2FD4: .4byte 0x0861cccc + .pool thumb_func_end sub_81C2F5C thumb_func_start sub_81C2FD8 sub_81C2FD8: @ 81C2FD8 push {r4,lr} sub sp, 0x8 - ldr r0, _081C3020 + ldr r0, =0x0203cf1c ldr r1, [r0] adds r0, r1, 0 adds r0, 0x70 @@ -921066,14 +889434,14 @@ sub_81C2FD8: @ 81C2FD8 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081C3024 + ldr r0, =0x0861cccc movs r1, 0x2 bl sub_81C2D2C lsls r0, 24 lsrs r0, 24 movs r1, 0xD muls r1, r4 - ldr r2, _081C3028 + ldr r2, =0x0831b6db adds r1, r2 movs r2, 0 str r2, [sp] @@ -921087,16 +889455,14 @@ sub_81C2FD8: @ 81C2FD8 pop {r0} bx r0 .align 2, 0 -_081C3020: .4byte 0x0203cf1c -_081C3024: .4byte 0x0861cccc -_081C3028: .4byte 0x0831b6db + .pool thumb_func_end sub_81C2FD8 thumb_func_start sub_81C302C sub_81C302C: @ 81C302C push {r4,lr} sub sp, 0x8 - ldr r0, _081C3070 + ldr r0, =0x0203cf1c ldr r1, [r0] adds r0, r1, 0 adds r0, 0x70 @@ -921107,12 +889473,12 @@ sub_81C302C: @ 81C302C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081C3074 + ldr r0, =0x0861cccc movs r1, 0x2 bl sub_81C2D2C lsls r0, 24 lsrs r0, 24 - ldr r1, _081C3078 + ldr r1, =0x0831bad4 lsls r4, 2 adds r4, r1 ldr r1, [r4] @@ -921126,23 +889492,21 @@ sub_81C302C: @ 81C302C pop {r0} bx r0 .align 2, 0 -_081C3070: .4byte 0x0203cf1c -_081C3074: .4byte 0x0861cccc -_081C3078: .4byte 0x0831bad4 + .pool thumb_func_end sub_81C302C thumb_func_start sub_81C307C sub_81C307C: @ 81C307C push {r4-r6,lr} - ldr r0, _081C30CC + ldr r0, =0x0203cf1c ldr r0, [r0] adds r4, r0, 0 adds r4, 0x70 bl sub_81AFBF0 - ldr r1, _081C30D0 + ldr r1, =0x0861ce74 movs r0, 0 bl sub_81AFC0C - ldr r1, _081C30D4 + ldr r1, =0x0861ce7b movs r0, 0x1 bl sub_81AFC0C bl sub_81C31C0 @@ -921162,16 +889526,12 @@ sub_81C307C: @ 81C307C cmp r0, 0x1 bne _081C30E0 _081C30C2: - ldr r0, _081C30D8 - ldr r1, _081C30DC + ldr r0, =0x02021fc4 + ldr r1, =0x085ea5db bl sub_81AFC28 b _081C3182 .align 2, 0 -_081C30CC: .4byte 0x0203cf1c -_081C30D0: .4byte 0x0861ce74 -_081C30D4: .4byte 0x0861ce7b -_081C30D8: .4byte 0x02021fc4 -_081C30DC: .4byte 0x085ea5db + .pool _081C30E0: movs r0, 0x20 bl malloc @@ -921200,32 +889560,30 @@ _081C310C: cmp r0, 0 bne _081C3134 ldrb r0, [r4, 0x9] - ldr r1, _081C312C + ldr r1, =0x085ea516 cmp r0, 0xD4 bls _081C3170 - ldr r1, _081C3130 + ldr r1, =0x085ea617 b _081C3170 .align 2, 0 -_081C312C: .4byte 0x085ea516 -_081C3130: .4byte 0x085ea617 + .pool _081C3134: ldrb r0, [r4, 0x9] - ldr r1, _081C3140 + ldr r1, =0x085ea4ec cmp r0, 0xD4 bls _081C3170 - ldr r1, _081C3144 + ldr r1, =0x085ea5eb b _081C3170 .align 2, 0 -_081C3140: .4byte 0x085ea4ec -_081C3144: .4byte 0x085ea5eb + .pool _081C3148: ldrb r0, [r4, 0x9] cmp r0, 0xFF bne _081C3158 - ldr r1, _081C3154 + ldr r1, =0x085ea56a b _081C3170 .align 2, 0 -_081C3154: .4byte 0x085ea56a + .pool _081C3158: cmp r0, 0xFE beq _081C316E @@ -921234,13 +889592,13 @@ _081C3158: cmp r0, 0 beq _081C316E ldrb r0, [r4, 0x9] - ldr r1, _081C3188 + ldr r1, =0x085ea5a8 cmp r0, 0xD4 bls _081C3170 _081C316E: - ldr r1, _081C318C + ldr r1, =0x085ea544 _081C3170: - ldr r0, _081C3190 + ldr r0, =0x02021fc4 bl sub_81AFC28 adds r0, r6, 0 bl free @@ -921251,21 +889609,19 @@ _081C3182: pop {r0} bx r0 .align 2, 0 -_081C3188: .4byte 0x085ea5a8 -_081C318C: .4byte 0x085ea544 -_081C3190: .4byte 0x02021fc4 + .pool thumb_func_end sub_81C307C thumb_func_start sub_81C3194 sub_81C3194: @ 81C3194 push {lr} sub sp, 0x8 - ldr r0, _081C31B8 + ldr r0, =0x0861cccc movs r1, 0x3 bl sub_81C2D2C lsls r0, 24 lsrs r0, 24 - ldr r1, _081C31BC + ldr r1, =0x02021fc4 movs r2, 0 str r2, [sp] str r2, [sp, 0x4] @@ -921275,16 +889631,15 @@ sub_81C3194: @ 81C3194 pop {r0} bx r0 .align 2, 0 -_081C31B8: .4byte 0x0861cccc -_081C31BC: .4byte 0x02021fc4 + .pool thumb_func_end sub_81C3194 thumb_func_start sub_81C31C0 sub_81C31C0: @ 81C31C0 push {lr} - ldr r0, _081C31E4 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C31E8 + ldr r1, =0x0861cb50 adds r0, 0xA3 ldrb r0, [r0] lsls r0, 2 @@ -921292,22 +889647,20 @@ sub_81C31C0: @ 81C31C0 ldr r1, [r0] movs r0, 0x2 bl sub_81AFC0C - ldr r1, _081C31EC + ldr r1, =0x085ea3c0 movs r0, 0x5 bl sub_81AFC0C pop {r0} bx r0 .align 2, 0 -_081C31E4: .4byte 0x0203cf1c -_081C31E8: .4byte 0x0861cb50 -_081C31EC: .4byte 0x085ea3c0 + .pool thumb_func_end sub_81C31C0 thumb_func_start sub_81C31F0 sub_81C31F0: @ 81C31F0 push {r4,lr} adds r4, r0, 0 - ldr r0, _081C321C + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0x7A ldrb r1, [r0] @@ -921326,18 +889679,18 @@ _081C3202: pop {r0} bx r0 .align 2, 0 -_081C321C: .4byte 0x0203cf1c + .pool thumb_func_end sub_81C31F0 thumb_func_start sub_81C3220 sub_81C3220: @ 81C3220 push {r4-r6,lr} - ldr r0, _081C325C + ldr r0, =0x0203cf1c ldr r0, [r0] adds r6, r0, 0 adds r6, 0x70 ldr r1, [r0] - ldr r0, _081C3260 + ldr r0, =0x02024744 cmp r1, r0 bne _081C326C bl link_get_multiplayer_id @@ -921345,7 +889698,7 @@ sub_81C3220: @ 81C3220 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r2, _081C3264 + ldr r2, =0x020229e8 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -921354,25 +889707,22 @@ sub_81C3220: @ 81C3220 ldrh r4, [r0] adds r0, r1, r2 ldrb r5, [r0, 0x13] - ldr r0, _081C3268 + ldr r0, =0x02021cc4 adds r2, 0x8 adds r1, r2 bl gf_strcpy b _081C3282 .align 2, 0 -_081C325C: .4byte 0x0203cf1c -_081C3260: .4byte 0x02024744 -_081C3264: .4byte 0x020229e8 -_081C3268: .4byte 0x02021cc4 + .pool _081C326C: bl sub_80F0020 adds r4, r0, 0 - ldr r0, _081C32A8 + ldr r0, =0x0000ffff ands r4, r0 - ldr r0, _081C32AC + ldr r0, =0x03005d90 ldr r1, [r0] ldrb r5, [r1, 0x8] - ldr r0, _081C32B0 + ldr r0, =0x02021cc4 bl gf_strcpy _081C3282: adds r0, r6, 0 @@ -921381,11 +889731,11 @@ _081C3282: cmp r5, r0 bne _081C32A4 ldr r0, [r6, 0x48] - ldr r1, _081C32A8 + ldr r1, =0x0000ffff ands r0, r1 cmp r4, r0 bne _081C32A4 - ldr r0, _081C32B0 + ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x36 bl sub_80092BC @@ -921395,9 +889745,7 @@ _081C32A4: movs r0, 0 b _081C32B6 .align 2, 0 -_081C32A8: .4byte 0x0000ffff -_081C32AC: .4byte 0x03005d90 -_081C32B0: .4byte 0x02021cc4 + .pool _081C32B4: movs r0, 0x1 _081C32B6: @@ -921409,7 +889757,7 @@ _081C32B6: thumb_func_start sub_81C32BC sub_81C32BC: @ 81C32BC push {lr} - ldr r0, _081C32D4 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0x70 ldrb r0, [r0, 0xB] @@ -921421,7 +889769,7 @@ sub_81C32BC: @ 81C32BC movs r0, 0 b _081C32DA .align 2, 0 -_081C32D4: .4byte 0x0203cf1c + .pool _081C32D8: movs r0, 0x1 _081C32DA: @@ -921432,7 +889780,7 @@ _081C32DA: thumb_func_start sub_81C32E0 sub_81C32E0: @ 81C32E0 push {lr} - ldr r0, _081C32F8 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0x70 ldrb r0, [r0, 0xB] @@ -921444,7 +889792,7 @@ sub_81C32E0: @ 81C32E0 movs r0, 0 b _081C32FE .align 2, 0 -_081C32F8: .4byte 0x0203cf1c + .pool _081C32FC: movs r0, 0x1 _081C32FE: @@ -921455,24 +889803,24 @@ _081C32FE: thumb_func_start sub_81C3304 sub_81C3304: @ 81C3304 push {lr} - ldr r0, _081C3340 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 15 ands r0, r1 cmp r0, 0 beq _081C3354 - ldr r0, _081C3344 - ldr r1, _081C3348 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _081C3354 - ldr r0, _081C334C + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C3350 + ldr r1, =0x000040be adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -921485,11 +889833,7 @@ _081C333A: movs r0, 0x1 b _081C3356 .align 2, 0 -_081C3340: .4byte 0x02022fec -_081C3344: .4byte 0x030022c0 -_081C3348: .4byte 0x00000439 -_081C334C: .4byte 0x0203cf1c -_081C3350: .4byte 0x000040be + .pool _081C3354: movs r0, 0 _081C3356: @@ -921504,13 +889848,13 @@ sub_81C335C: @ 81C335C mov r5, r8 push {r5,r6} sub sp, 0x8 - ldr r0, _081C33C0 + ldr r0, =0x0861cccc movs r1, 0 bl sub_81C2D2C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081C33C4 + ldr r0, =0x085ea365 mov r8, r0 movs r0, 0x1 mov r1, r8 @@ -921527,7 +889871,7 @@ sub_81C335C: @ 81C335C movs r2, 0 movs r3, 0x1 bl sub_81C25A4 - ldr r1, _081C33C8 + ldr r1, =0x085e8d38 lsls r5, 24 lsrs r5, 24 mov r0, r9 @@ -921545,20 +889889,18 @@ sub_81C335C: @ 81C335C pop {r0} bx r0 .align 2, 0 -_081C33C0: .4byte 0x0861cccc -_081C33C4: .4byte 0x085ea365 -_081C33C8: .4byte 0x085e8d38 + .pool thumb_func_end sub_81C335C thumb_func_start sub_81C33CC sub_81C33CC: @ 81C33CC push {r4,r5,lr} sub sp, 0x8 - ldr r5, _081C3418 - ldr r1, _081C341C + ldr r5, =0x02021cc4 + ldr r1, =0x085e8d59 adds r0, r5, 0 bl gf_strcpy - ldr r1, _081C3420 + ldr r1, =0x085e8d38 adds r0, r5, 0 bl gf_strcat movs r0, 0x1 @@ -921566,7 +889908,7 @@ sub_81C33CC: @ 81C33CC movs r2, 0x38 bl sub_81DB368 adds r4, r0, 0 - ldr r0, _081C3424 + ldr r0, =0x0861cccc movs r1, 0x1 bl sub_81C2D2C lsls r0, 24 @@ -921586,17 +889928,14 @@ sub_81C33CC: @ 81C33CC pop {r0} bx r0 .align 2, 0 -_081C3418: .4byte 0x02021cc4 -_081C341C: .4byte 0x085e8d59 -_081C3420: .4byte 0x085e8d38 -_081C3424: .4byte 0x0861cccc + .pool thumb_func_end sub_81C33CC thumb_func_start sub_81C3428 sub_81C3428: @ 81C3428 push {r4,lr} sub sp, 0x8 - ldr r0, _081C3440 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r1, r0, 0 adds r1, 0x70 @@ -921604,33 +889943,32 @@ sub_81C3428: @ 81C3428 ldrb r0, [r0] cmp r0, 0x1 bne _081C3448 - ldr r4, _081C3444 + ldr r4, =0x085ea40b b _081C346C .align 2, 0 -_081C3440: .4byte 0x0203cf1c -_081C3444: .4byte 0x085ea40b + .pool _081C3448: ldrh r0, [r1, 0x30] cmp r0, 0x5 bhi _081C3458 - ldr r4, _081C3454 + ldr r4, =0x085ea4a2 b _081C346C .align 2, 0 -_081C3454: .4byte 0x085ea4a2 + .pool _081C3458: cmp r0, 0xA bhi _081C3464 - ldr r4, _081C3460 + ldr r4, =0x085ea475 b _081C346C .align 2, 0 -_081C3460: .4byte 0x085ea475 + .pool _081C3464: - ldr r4, _081C3490 + ldr r4, =0x085ea40b cmp r0, 0x28 bhi _081C346C - ldr r4, _081C3494 + ldr r4, =0x085ea442 _081C346C: - ldr r0, _081C3498 + ldr r0, =0x0861cccc movs r1, 0x2 bl sub_81C2D2C lsls r0, 24 @@ -921647,16 +889985,14 @@ _081C346C: pop {r0} bx r0 .align 2, 0 -_081C3490: .4byte 0x085ea40b -_081C3494: .4byte 0x085ea442 -_081C3498: .4byte 0x0861cccc + .pool thumb_func_end sub_81C3428 thumb_func_start sub_81C349C sub_81C349C: @ 81C349C push {r4,lr} sub sp, 0x8 - ldr r0, _081C34BC + ldr r0, =0x0203cf1c ldr r0, [r0] adds r4, r0, 0 adds r4, 0x70 @@ -921667,11 +890003,10 @@ sub_81C349C: @ 81C349C ldrb r0, [r4, 0x9] cmp r0, 0xFF bne _081C34C4 - ldr r4, _081C34C0 + ldr r4, =0x085ea678 b _081C3502 .align 2, 0 -_081C34BC: .4byte 0x0203cf1c -_081C34C0: .4byte 0x085ea678 + .pool _081C34C4: bl sub_81C32BC lsls r0, 24 @@ -921682,10 +890017,10 @@ _081C34C4: cmp r0, 0 bne _081C34E0 _081C34D8: - ldr r4, _081C34DC + ldr r4, =0x085ea6ab b _081C3502 .align 2, 0 -_081C34DC: .4byte 0x085ea6ab + .pool _081C34E0: ldrb r0, [r4, 0x9] cmp r0, 0xFD @@ -921693,18 +890028,17 @@ _081C34E0: bl sub_81C32E0 lsls r0, 24 lsrs r0, 24 - ldr r4, _081C34F8 + ldr r4, =0x085ea702 cmp r0, 0x1 bne _081C3502 - ldr r4, _081C34FC + ldr r4, =0x085ea6d7 b _081C3502 .align 2, 0 -_081C34F8: .4byte 0x085ea702 -_081C34FC: .4byte 0x085ea6d7 + .pool _081C3500: - ldr r4, _081C3528 + ldr r4, =0x085ea647 _081C3502: - ldr r0, _081C352C + ldr r0, =0x0861cccc movs r1, 0x3 bl sub_81C2D2C lsls r0, 24 @@ -921721,8 +890055,7 @@ _081C3502: pop {r0} bx r0 .align 2, 0 -_081C3528: .4byte 0x085ea647 -_081C352C: .4byte 0x0861cccc + .pool thumb_func_end sub_81C349C thumb_func_start sub_81C3530 @@ -921747,7 +890080,7 @@ sub_81C3554: @ 81C3554 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _081C357C + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4] subs r0, 0x1 @@ -921756,13 +890089,12 @@ sub_81C3554: @ 81C3554 cmp r0, 0x7 bhi _081C35D6 lsls r0, 2 - ldr r1, _081C3580 + ldr r1, =_081C3584 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C357C: .4byte 0x03005e08 -_081C3580: .4byte _081C3584 + .pool .align 2, 0 _081C3584: .4byte _081C35A4 @@ -921812,7 +890144,7 @@ _081C35DC: sub_81C35E4: @ 81C35E4 push {r4,r5,lr} sub sp, 0x8 - ldr r4, _081C3620 + ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0x9E ldrh r0, [r0] @@ -921824,7 +890156,7 @@ sub_81C35E4: @ 81C35E4 cmp r0, 0x1 bne _081C3628 ldr r0, [r4] - ldr r1, _081C3624 + ldr r1, =0x000040be adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -921839,24 +890171,22 @@ _081C3614: adds r5, r0, 0 b _081C3650 .align 2, 0 -_081C3620: .4byte 0x0203cf1c -_081C3624: .4byte 0x000040be + .pool _081C3628: - ldr r0, _081C363C + ldr r0, =0x0203cf1c ldr r0, [r0] adds r1, r0, 0 adds r1, 0x9E ldrh r0, [r1] cmp r0, 0 bne _081C3644 - ldr r5, _081C3640 + ldr r5, =0x085e8d26 b _081C3650 .align 2, 0 -_081C363C: .4byte 0x0203cf1c -_081C3640: .4byte 0x085e8d26 + .pool _081C3644: ldrh r0, [r1] - ldr r4, _081C3688 + ldr r4, =0x02021cc4 adds r1, r4, 0 bl itemid_get_name adds r5, r4, 0 @@ -921867,7 +890197,7 @@ _081C3650: bl sub_81DB35C adds r4, r0, 0 adds r4, 0x6 - ldr r0, _081C368C + ldr r0, =0x0861ccec movs r1, 0 bl sub_81C2D2C lsls r0, 24 @@ -921886,34 +890216,32 @@ _081C3650: pop {r0} bx r0 .align 2, 0 -_081C3688: .4byte 0x02021cc4 -_081C368C: .4byte 0x0861ccec + .pool thumb_func_end sub_81C35E4 thumb_func_start sub_81C3690 sub_81C3690: @ 81C3690 push {r4,r5,lr} sub sp, 0x8 - ldr r0, _081C36A8 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r1, r0, 0 adds r1, 0x76 ldrb r0, [r1] cmp r0, 0 bne _081C36B0 - ldr r5, _081C36AC + ldr r5, =0x085e8d26 b _081C36C8 .align 2, 0 -_081C36A8: .4byte 0x0203cf1c -_081C36AC: .4byte 0x085e8d26 + .pool _081C36B0: - ldr r0, _081C3700 + ldr r0, =0x02021cc4 ldrb r1, [r1] movs r2, 0x1 movs r3, 0x2 bl decimal_int_to_string - ldr r4, _081C3704 - ldr r1, _081C3708 + ldr r4, =0x02021fc4 + ldr r1, =0x085ea3b4 adds r0, r4, 0 bl ExpandTextCodes adds r5, r4, 0 @@ -921924,7 +890252,7 @@ _081C36C8: bl sub_81DB35C adds r4, r0, 0 adds r4, 0x6 - ldr r0, _081C370C + ldr r0, =0x0861ccec movs r1, 0x1 bl sub_81C2D2C lsls r0, 24 @@ -921943,10 +890271,7 @@ _081C36C8: pop {r0} bx r0 .align 2, 0 -_081C3700: .4byte 0x02021cc4 -_081C3704: .4byte 0x02021fc4 -_081C3708: .4byte 0x085ea3b4 -_081C370C: .4byte 0x0861ccec + .pool thumb_func_end sub_81C3690 thumb_func_start sub_81C3710 @@ -921967,7 +890292,7 @@ sub_81C3710: @ 81C3710 movs r0, 0x8 bl malloc adds r5, r0, 0 - ldr r4, _081C37CC + ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0x90 ldrh r1, [r0] @@ -922009,8 +890334,8 @@ sub_81C3710: @ 81C3710 movs r0, 0x3 adds r1, r5, 0 bl sub_81AFC0C - ldr r0, _081C37D0 - ldr r1, _081C37D4 + ldr r0, =0x02021fc4 + ldr r1, =0x0861ce82 bl sub_81AFC28 mov r0, r9 bl free @@ -922027,21 +890352,19 @@ sub_81C3710: @ 81C3710 pop {r0} bx r0 .align 2, 0 -_081C37CC: .4byte 0x0203cf1c -_081C37D0: .4byte 0x02021fc4 -_081C37D4: .4byte 0x0861ce82 + .pool thumb_func_end sub_81C3710 thumb_func_start sub_81C37D8 sub_81C37D8: @ 81C37D8 push {lr} sub sp, 0x8 - ldr r0, _081C3800 + ldr r0, =0x0861ccec movs r1, 0x2 bl sub_81C2D2C lsls r0, 24 lsrs r0, 24 - ldr r1, _081C3804 + ldr r1, =0x02021fc4 movs r2, 0 str r2, [sp] str r2, [sp, 0x4] @@ -922052,8 +890375,7 @@ sub_81C37D8: @ 81C37D8 pop {r0} bx r0 .align 2, 0 -_081C3800: .4byte 0x0861ccec -_081C3804: .4byte 0x02021fc4 + .pool thumb_func_end sub_81C37D8 thumb_func_start sub_81C3808 @@ -922061,9 +890383,9 @@ sub_81C3808: @ 81C3808 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _081C3878 + ldr r0, =0x02021cc4 mov r8, r0 - ldr r4, _081C387C + ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0x98 ldrh r1, [r0] @@ -922071,7 +890393,7 @@ sub_81C3808: @ 81C3808 movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string - ldr r6, _081C3880 + ldr r6, =0x02021dc4 ldr r0, [r4] adds r0, 0x9A ldrh r1, [r0] @@ -922079,7 +890401,7 @@ sub_81C3808: @ 81C3808 movs r2, 0x1 movs r3, 0x3 bl decimal_int_to_string - ldr r5, _081C3884 + ldr r5, =0x02021ec4 ldr r0, [r4] adds r0, 0x9C ldrh r1, [r0] @@ -922097,8 +890419,8 @@ sub_81C3808: @ 81C3808 movs r0, 0x2 adds r1, r5, 0 bl sub_81AFC0C - ldr r0, _081C3888 - ldr r1, _081C388C + ldr r0, =0x02021fc4 + ldr r1, =0x0861ce8e bl sub_81AFC28 pop {r3} mov r8, r3 @@ -922106,24 +890428,19 @@ sub_81C3808: @ 81C3808 pop {r0} bx r0 .align 2, 0 -_081C3878: .4byte 0x02021cc4 -_081C387C: .4byte 0x0203cf1c -_081C3880: .4byte 0x02021dc4 -_081C3884: .4byte 0x02021ec4 -_081C3888: .4byte 0x02021fc4 -_081C388C: .4byte 0x0861ce8e + .pool thumb_func_end sub_81C3808 thumb_func_start sub_81C3890 sub_81C3890: @ 81C3890 push {lr} sub sp, 0x8 - ldr r0, _081C38B8 + ldr r0, =0x0861ccec movs r1, 0x3 bl sub_81C2D2C lsls r0, 24 lsrs r0, 24 - ldr r1, _081C38BC + ldr r1, =0x02021fc4 movs r2, 0 str r2, [sp] str r2, [sp, 0x4] @@ -922134,24 +890451,23 @@ sub_81C3890: @ 81C3890 pop {r0} bx r0 .align 2, 0 -_081C38B8: .4byte 0x0861ccec -_081C38BC: .4byte 0x02021fc4 + .pool thumb_func_end sub_81C3890 thumb_func_start sub_81C38C0 sub_81C38C0: @ 81C38C0 push {r4-r6,lr} sub sp, 0x8 - ldr r0, _081C3934 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r5, r0, 0 adds r5, 0x70 - ldr r0, _081C3938 + ldr r0, =0x0861ccec movs r1, 0x4 bl sub_81C2D2C lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _081C393C + ldr r4, =0x02021cc4 ldr r1, [r5, 0x10] adds r0, r4, 0 movs r2, 0x1 @@ -922174,11 +890490,11 @@ sub_81C38C0: @ 81C38C0 ldrb r0, [r5, 0x5] cmp r0, 0x63 bhi _081C3948 - ldr r4, _081C3940 + ldr r4, =0x0831f72c adds r1, r0, 0 adds r1, 0x1 lsls r1, 2 - ldr r3, _081C3944 + ldr r3, =0x083203cc ldrh r2, [r5] lsls r0, r2, 3 subs r0, r2 @@ -922195,15 +890511,11 @@ sub_81C38C0: @ 81C38C0 subs r1, r0 b _081C394A .align 2, 0 -_081C3934: .4byte 0x0203cf1c -_081C3938: .4byte 0x0861ccec -_081C393C: .4byte 0x02021cc4 -_081C3940: .4byte 0x0831f72c -_081C3944: .4byte 0x083203cc + .pool _081C3948: movs r1, 0 _081C394A: - ldr r4, _081C3980 + ldr r4, =0x02021cc4 adds r0, r4, 0 movs r2, 0x1 movs r3, 0x6 @@ -922227,7 +890539,7 @@ _081C394A: pop {r0} bx r0 .align 2, 0 -_081C3980: .4byte 0x02021cc4 + .pool thumb_func_end sub_81C38C0 thumb_func_start sub_81C3984 @@ -922241,21 +890553,21 @@ sub_81C3984: @ 81C3984 bl sub_81C3B08 movs r0, 0x3 bl sub_81C3B08 - ldr r4, _081C39CC + ldr r4, =0x0203cf1c ldr r0, [r4] - ldr r1, _081C39D0 + ldr r1, =0x000040bc adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 bne _081C39EA bl sub_81C3F44 ldr r1, [r4] - ldr r0, _081C39D4 + ldr r0, =0x000040c6 adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0x4 bne _081C39DC - ldr r0, _081C39D8 + ldr r0, =0x000040c4 adds r1, r0 ldrh r0, [r1] cmp r0, 0 @@ -922263,10 +890575,7 @@ sub_81C3984: @ 81C3984 bl sub_81C3E9C b _081C39EA .align 2, 0 -_081C39CC: .4byte 0x0203cf1c -_081C39D0: .4byte 0x000040bc -_081C39D4: .4byte 0x000040c6 -_081C39D8: .4byte 0x000040c4 + .pool _081C39DC: ldrb r0, [r2] lsls r0, 1 @@ -922288,7 +890597,7 @@ sub_81C39F0: @ 81C39F0 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _081C3A18 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4] subs r0, 0x1 @@ -922297,13 +890606,12 @@ sub_81C39F0: @ 81C39F0 cmp r0, 0x7 bhi _081C3AFC lsls r0, 2 - ldr r1, _081C3A1C + ldr r1, =_081C3A20 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C3A18: .4byte 0x03005e08 -_081C3A1C: .4byte _081C3A20 + .pool .align 2, 0 _081C3A20: .4byte _081C3A40 @@ -922331,9 +890639,9 @@ _081C3A58: bl sub_81C3B08 b _081C3AFC _081C3A60: - ldr r0, _081C3A74 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C3A78 + ldr r1, =0x000040bc adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 @@ -922341,31 +890649,27 @@ _081C3A60: bl sub_81C3F44 b _081C3AFC .align 2, 0 -_081C3A74: .4byte 0x0203cf1c -_081C3A78: .4byte 0x000040bc + .pool _081C3A7C: - ldr r0, _081C3AA0 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C3AA4 + ldr r2, =0x000040bc adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 bne _081C3AFC - ldr r0, _081C3AA8 + ldr r0, =0x000040c6 adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0x4 bne _081C3AB0 - ldr r2, _081C3AAC + ldr r2, =0x000040c4 adds r0, r1, r2 ldrh r0, [r0] strh r0, [r4, 0x2] b _081C3AFC .align 2, 0 -_081C3AA0: .4byte 0x0203cf1c -_081C3AA4: .4byte 0x000040bc -_081C3AA8: .4byte 0x000040c6 -_081C3AAC: .4byte 0x000040c4 + .pool _081C3AB0: ldrb r0, [r2] lsls r0, 1 @@ -922375,9 +890679,9 @@ _081C3AB0: strh r0, [r4, 0x2] b _081C3AFC _081C3ABE: - ldr r0, _081C3AE8 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C3AEC + ldr r2, =0x000040bc adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 @@ -922385,7 +890689,7 @@ _081C3ABE: adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] - ldr r1, _081C3AF0 + ldr r1, =0x00ffffff ands r0, r1 movs r1, 0x80 lsls r1, 11 @@ -922395,9 +890699,7 @@ _081C3ABE: bl sub_81C3E9C b _081C3AFC .align 2, 0 -_081C3AE8: .4byte 0x0203cf1c -_081C3AEC: .4byte 0x000040bc -_081C3AF0: .4byte 0x00ffffff + .pool _081C3AF4: adds r0, r2, 0 bl remove_task @@ -922422,10 +890724,10 @@ sub_81C3B08: @ 81C3B08 sub sp, 0xC lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _081C3BE4 + ldr r0, =0x0203cf1c ldr r0, [r0] mov r10, r0 - ldr r4, _081C3BE8 + ldr r4, =0x0861cd14 adds r0, r4, 0 movs r1, 0 bl sub_81C2D2C @@ -922457,7 +890759,7 @@ sub_81C3B08: @ 81C3B08 movs r0, 0xD adds r1, r5, 0 muls r1, r0 - ldr r0, _081C3BEC + ldr r0, =0x0831977c adds r1, r0 lsls r0, r7, 4 mov r9, r0 @@ -922472,7 +890774,7 @@ sub_81C3B08: @ 81C3B08 mov r0, r8 movs r2, 0 bl sub_81C25A4 - ldr r0, _081C3BF0 + ldr r0, =0x02021cc4 mov r8, r0 mov r5, r10 adds r5, 0x8C @@ -922481,7 +890783,7 @@ sub_81C3B08: @ 81C3B08 movs r2, 0x1 movs r3, 0x2 bl decimal_int_to_string - ldr r4, _081C3BF4 + ldr r4, =0x02021dc4 adds r0, r4, 0 adds r1, r6, 0 movs r2, 0x1 @@ -922494,8 +890796,8 @@ sub_81C3B08: @ 81C3B08 movs r0, 0x1 adds r1, r4, 0 bl sub_81AFC0C - ldr r4, _081C3BF8 - ldr r1, _081C3BFC + ldr r4, =0x02021fc4 + ldr r1, =0x0861ce97 adds r0, r4, 0 bl sub_81AFC28 adds r7, r4, 0 @@ -922513,15 +890815,9 @@ sub_81C3B08: @ 81C3B08 mov r4, r9 b _081C3C26 .align 2, 0 -_081C3BE4: .4byte 0x0203cf1c -_081C3BE8: .4byte 0x0861cd14 -_081C3BEC: .4byte 0x0831977c -_081C3BF0: .4byte 0x02021cc4 -_081C3BF4: .4byte 0x02021dc4 -_081C3BF8: .4byte 0x02021fc4 -_081C3BFC: .4byte 0x0861ce97 + .pool _081C3C00: - ldr r1, _081C3C54 + ldr r1, =0x085e8d40 lsls r4, r7, 4 adds r3, r4, 0x1 lsls r3, 24 @@ -922532,7 +890828,7 @@ _081C3C00: mov r0, r8 movs r2, 0 bl sub_81C25A4 - ldr r7, _081C3C58 + ldr r7, =0x085e8d42 movs r5, 0xC movs r0, 0x1 adds r1, r7, 0 @@ -922561,8 +890857,7 @@ _081C3C26: pop {r0} bx r0 .align 2, 0 -_081C3C54: .4byte 0x085e8d40 -_081C3C58: .4byte 0x085e8d42 + .pool thumb_func_end sub_81C3B08 thumb_func_start sub_81C3C5C @@ -922582,7 +890877,7 @@ sub_81C3C5C: @ 81C3C5C movs r2, 0x35 movs r3, 0 bl Window_FillPixelRect - ldr r2, _081C3C94 + ldr r2, =0x0831c898 lsls r1, r5, 1 adds r0, r1, r5 lsls r0, 2 @@ -922591,13 +890886,12 @@ sub_81C3C5C: @ 81C3C5C adds r6, r1, 0 cmp r0, 0x1 bhi _081C3C9C - ldr r1, _081C3C98 + ldr r1, =0x085e8d45 b _081C3CAC .align 2, 0 -_081C3C94: .4byte 0x0831c898 -_081C3C98: .4byte 0x085e8d45 + .pool _081C3C9C: - ldr r4, _081C3CD0 + ldr r4, =0x02021cc4 ldrb r1, [r2, 0x1] adds r0, r4, 0 movs r2, 0x1 @@ -922612,21 +890906,19 @@ _081C3CAC: movs r2, 0x35 movs r3, 0x1 bl sub_81C25A4 - ldr r1, _081C3CD4 + ldr r1, =0x0831c898 adds r0, r6, r5 lsls r0, 2 adds r1, r0, r1 ldrb r0, [r1, 0x3] cmp r0, 0 bne _081C3CDC - ldr r1, _081C3CD8 + ldr r1, =0x085e8d45 b _081C3CEC .align 2, 0 -_081C3CD0: .4byte 0x02021cc4 -_081C3CD4: .4byte 0x0831c898 -_081C3CD8: .4byte 0x085e8d45 + .pool _081C3CDC: - ldr r4, _081C3D04 + ldr r4, =0x02021cc4 ldrb r1, [r1, 0x3] adds r0, r4, 0 movs r2, 0x1 @@ -922647,7 +890939,7 @@ _081C3CFC: pop {r0} bx r0 .align 2, 0 -_081C3D04: .4byte 0x02021cc4 + .pool thumb_func_end sub_81C3C5C thumb_func_start sub_81C3D08 @@ -922661,16 +890953,16 @@ sub_81C3D08: @ 81C3D08 bl sub_81C3B08 movs r0, 0x3 bl sub_81C3B08 - ldr r4, _081C3D48 + ldr r4, =0x0203cf1c ldr r0, [r4] - ldr r1, _081C3D4C + ldr r1, =0x000040bc adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 bne _081C3D40 bl sub_81C3F44 ldr r0, [r4] - ldr r1, _081C3D50 + ldr r1, =0x000040c6 adds r0, r1 ldrb r0, [r0] bl sub_81C3E2C @@ -922679,9 +890971,7 @@ _081C3D40: pop {r0} bx r0 .align 2, 0 -_081C3D48: .4byte 0x0203cf1c -_081C3D4C: .4byte 0x000040bc -_081C3D50: .4byte 0x000040c6 + .pool thumb_func_end sub_81C3D08 thumb_func_start sub_81C3D54 @@ -922692,7 +890982,7 @@ sub_81C3D54: @ 81C3D54 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 - ldr r1, _081C3D7C + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4] subs r0, 0x1 @@ -922701,13 +890991,12 @@ sub_81C3D54: @ 81C3D54 cmp r0, 0x6 bhi _081C3E20 lsls r0, 2 - ldr r1, _081C3D80 + ldr r1, =_081C3D84 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C3D7C: .4byte 0x03005e08 -_081C3D80: .4byte _081C3D84 + .pool .align 2, 0 _081C3D84: .4byte _081C3DA0 @@ -922734,9 +891023,9 @@ _081C3DB8: bl sub_81C3B08 b _081C3E20 _081C3DC0: - ldr r0, _081C3DD4 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C3DD8 + ldr r1, =0x000040bc adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 @@ -922744,12 +891033,11 @@ _081C3DC0: bl sub_81C3F44 b _081C3E20 .align 2, 0 -_081C3DD4: .4byte 0x0203cf1c -_081C3DD8: .4byte 0x000040bc + .pool _081C3DDC: - ldr r0, _081C3E08 + ldr r0, =0x0203cf1c ldr r2, [r0] - ldr r1, _081C3E0C + ldr r1, =0x000040bc adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x3 @@ -922757,22 +891045,19 @@ _081C3DDC: adds r1, 0x8 adds r0, r2, r1 ldr r0, [r0] - ldr r1, _081C3E10 + ldr r1, =0x00ffffff ands r0, r1 movs r1, 0x80 lsls r1, 11 cmp r0, r1 beq _081C3E20 - ldr r1, _081C3E14 + ldr r1, =0x000040c6 adds r0, r2, r1 ldrb r0, [r0] bl sub_81C3E2C b _081C3E20 .align 2, 0 -_081C3E08: .4byte 0x0203cf1c -_081C3E0C: .4byte 0x000040bc -_081C3E10: .4byte 0x00ffffff -_081C3E14: .4byte 0x000040c6 + .pool _081C3E18: adds r0, r2, 0 bl remove_task @@ -922795,15 +891080,14 @@ sub_81C3E2C: @ 81C3E2C lsrs r1, r0, 24 cmp r1, 0x4 bne _081C3E48 - ldr r0, _081C3E40 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C3E44 + ldr r1, =0x000040c4 b _081C3E50 .align 2, 0 -_081C3E40: .4byte 0x0203cf1c -_081C3E44: .4byte 0x000040c4 + .pool _081C3E48: - ldr r0, _081C3E8C + ldr r0, =0x0203cf1c ldr r0, [r0] lsls r1, 1 adds r0, 0x84 @@ -922812,13 +891096,13 @@ _081C3E50: ldrh r4, [r0] cmp r4, 0 beq _081C3E82 - ldr r0, _081C3E90 + ldr r0, =0x0861cd14 movs r1, 0x2 bl sub_81C2D2C lsls r0, 24 lsrs r0, 24 - ldr r3, _081C3E94 - ldr r2, _081C3E98 + ldr r3, =0x08587c50 + ldr r2, =0x0858c2b4 lsls r1, r4, 3 adds r1, r2 ldrb r1, [r1] @@ -922837,10 +891121,7 @@ _081C3E82: pop {r0} bx r0 .align 2, 0 -_081C3E8C: .4byte 0x0203cf1c -_081C3E90: .4byte 0x0861cd14 -_081C3E94: .4byte 0x08587c50 -_081C3E98: .4byte 0x0858c2b4 + .pool thumb_func_end sub_81C3E2C thumb_func_start sub_81C3E9C @@ -922850,7 +891131,7 @@ sub_81C3E9C: @ 81C3E9C lsls r0, 16 lsrs r4, r0, 16 adds r6, r4, 0 - ldr r0, _081C3EF0 + ldr r0, =0x0861cd14 movs r1, 0x2 bl sub_81C2D2C lsls r0, 24 @@ -922860,16 +891141,16 @@ sub_81C3E9C: @ 81C3E9C bl Window_FastFillPixels cmp r4, 0 beq _081C3F30 - ldr r0, _081C3EF4 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C3EF8 + ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 bne _081C3F00 adds r0, r4, 0 bl sub_81C3C5C - ldr r1, _081C3EFC + ldr r1, =0x0861c524 subs r0, r4, 0x1 lsls r0, 2 adds r0, r1 @@ -922883,13 +891164,10 @@ sub_81C3E9C: @ 81C3E9C bl sub_81C25A4 b _081C3F20 .align 2, 0 -_081C3EF0: .4byte 0x0861cd14 -_081C3EF4: .4byte 0x0203cf1c -_081C3EF8: .4byte 0x000040c0 -_081C3EFC: .4byte 0x0861c524 + .pool _081C3F00: - ldr r2, _081C3F28 - ldr r1, _081C3F2C + ldr r2, =0x08587c50 + ldr r1, =0x0858c2b4 lsls r0, r6, 3 adds r0, r1 ldrb r0, [r0] @@ -922908,8 +891186,7 @@ _081C3F20: bl Window_WriteStandardTileMap b _081C3F36 .align 2, 0 -_081C3F28: .4byte 0x08587c50 -_081C3F2C: .4byte 0x0858c2b4 + .pool _081C3F30: adds r0, r5, 0 bl Window_FillTileMap @@ -922928,7 +891205,7 @@ sub_81C3F44: @ 81C3F44 mov r7, r8 push {r7} sub sp, 0x8 - ldr r4, _081C3F8C + ldr r4, =0x0861cd14 adds r0, r4, 0 movs r1, 0 bl sub_81C2D2C @@ -922941,14 +891218,14 @@ sub_81C3F44: @ 81C3F44 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _081C3F90 + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r2, _081C3F94 + ldr r2, =0x000040c4 adds r0, r1, r2 ldrh r2, [r0] cmp r2, 0 bne _081C3F9C - ldr r1, _081C3F98 + ldr r1, =0x085e8cf0 str r2, [sp] movs r0, 0x1 str r0, [sp, 0x4] @@ -922958,13 +891235,10 @@ sub_81C3F44: @ 81C3F44 bl sub_81C25A4 b _081C4044 .align 2, 0 -_081C3F8C: .4byte 0x0861cd14 -_081C3F90: .4byte 0x0203cf1c -_081C3F94: .4byte 0x000040c4 -_081C3F98: .4byte 0x085e8cf0 + .pool _081C3F9C: ldrh r5, [r0] - ldr r2, _081C3FC8 + ldr r2, =0x000040c0 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x2 @@ -922972,7 +891246,7 @@ _081C3F9C: movs r0, 0xD adds r1, r5, 0 muls r1, r0 - ldr r0, _081C3FCC + ldr r0, =0x0831977c adds r1, r0 movs r0, 0 str r0, [sp] @@ -922984,13 +891258,12 @@ _081C3F9C: bl sub_81C25A4 b _081C3FEC .align 2, 0 -_081C3FC8: .4byte 0x000040c0 -_081C3FCC: .4byte 0x0831977c + .pool _081C3FD0: movs r0, 0xD adds r1, r5, 0 muls r1, r0 - ldr r0, _081C4050 + ldr r0, =0x0831977c adds r1, r0 movs r0, 0 str r0, [sp] @@ -923001,8 +891274,8 @@ _081C3FD0: movs r3, 0x41 bl sub_81C25A4 _081C3FEC: - ldr r4, _081C4054 - ldr r1, _081C4058 + ldr r4, =0x02021cc4 + ldr r1, =0x0831c898 lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -923019,8 +891292,8 @@ _081C3FEC: movs r0, 0x1 adds r1, r4, 0 bl sub_81AFC0C - ldr r4, _081C405C - ldr r1, _081C4060 + ldr r4, =0x02021fc4 + ldr r1, =0x0861ce97 adds r0, r4, 0 bl sub_81AFC28 movs r0, 0x1 @@ -923046,18 +891319,14 @@ _081C4044: pop {r0} bx r0 .align 2, 0 -_081C4050: .4byte 0x0831977c -_081C4054: .4byte 0x02021cc4 -_081C4058: .4byte 0x0831c898 -_081C405C: .4byte 0x02021fc4 -_081C4060: .4byte 0x0861ce97 + .pool thumb_func_end sub_81C3F44 thumb_func_start sub_81C4064 sub_81C4064: @ 81C4064 push {r4,lr} sub sp, 0x8 - ldr r0, _081C409C + ldr r0, =0x0861cd14 movs r1, 0 bl sub_81C2D2C adds r4, r0, 0 @@ -923080,7 +891349,7 @@ sub_81C4064: @ 81C4064 pop {r0} bx r0 .align 2, 0 -_081C409C: .4byte 0x0861cd14 + .pool thumb_func_end sub_81C4064 thumb_func_start sub_81C40A0 @@ -923100,7 +891369,7 @@ sub_81C40A0: @ 81C40A0 lsls r0, 24 lsrs r0, 24 mov r10, r0 - ldr r5, _081C4150 + ldr r5, =0x0861cd14 adds r0, r5, 0 movs r1, 0 bl sub_81C2D2C @@ -923166,14 +891435,14 @@ sub_81C40A0: @ 81C40A0 pop {r0} bx r0 .align 2, 0 -_081C4150: .4byte 0x0861cd14 + .pool thumb_func_end sub_81C40A0 thumb_func_start sub_81C4154 sub_81C4154: @ 81C4154 push {r4,lr} sub sp, 0x8 - ldr r0, _081C4188 + ldr r0, =0x0861cd14 movs r1, 0x2 bl sub_81C2D2C adds r4, r0, 0 @@ -923182,7 +891451,7 @@ sub_81C4154: @ 81C4154 adds r0, r4, 0 movs r1, 0 bl Window_FastFillPixels - ldr r1, _081C418C + ldr r1, =0x085ea4cb movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -923195,16 +891464,15 @@ sub_81C4154: @ 81C4154 pop {r0} bx r0 .align 2, 0 -_081C4188: .4byte 0x0861cd14 -_081C418C: .4byte 0x085ea4cb + .pool thumb_func_end sub_81C4154 thumb_func_start sub_81C4190 sub_81C4190: @ 81C4190 push {r4,r5,lr} movs r2, 0 - ldr r5, _081C41B8 - ldr r4, _081C41BC + ldr r5, =0x0203cf1c + ldr r4, =0x000040d3 movs r3, 0xFF _081C419A: ldr r0, [r5] @@ -923222,8 +891490,7 @@ _081C419A: pop {r0} bx r0 .align 2, 0 -_081C41B8: .4byte 0x0203cf1c -_081C41BC: .4byte 0x000040d3 + .pool thumb_func_end sub_81C4190 thumb_func_start sub_81C41C0 @@ -923231,9 +891498,9 @@ sub_81C41C0: @ 81C41C0 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _081C41F8 + ldr r5, =0x0203cf1c ldr r0, [r5] - ldr r1, _081C41FC + ldr r1, =0x000040d3 adds r0, r1 adds r1, r0, r4 ldrb r0, [r1] @@ -923243,11 +891510,11 @@ sub_81C41C0: @ 81C41C0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081C4200 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles ldr r0, [r5] - ldr r1, _081C41FC + ldr r1, =0x000040d3 adds r0, r1 adds r0, r4 movs r1, 0xFF @@ -923257,9 +891524,7 @@ _081C41F2: pop {r0} bx r0 .align 2, 0 -_081C41F8: .4byte 0x0203cf1c -_081C41FC: .4byte 0x000040d3 -_081C4200: .4byte 0x02020630 + .pool thumb_func_end sub_81C41C0 thumb_func_start sub_81C4204 @@ -923269,10 +891534,10 @@ sub_81C4204: @ 81C4204 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r3, _081C4240 - ldr r2, _081C4244 + ldr r3, =0x02020630 + ldr r2, =0x0203cf1c ldr r2, [r2] - ldr r4, _081C4248 + ldr r4, =0x000040d3 adds r2, r4 adds r2, r0 ldrb r0, [r2] @@ -923294,9 +891559,7 @@ sub_81C4204: @ 81C4204 pop {r0} bx r0 .align 2, 0 -_081C4240: .4byte 0x02020630 -_081C4244: .4byte 0x0203cf1c -_081C4248: .4byte 0x000040d3 + .pool thumb_func_end sub_81C4204 thumb_func_start sub_81C424C @@ -923304,9 +891567,9 @@ sub_81C424C: @ 81C424C push {r4,lr} movs r4, 0x3 _081C4250: - ldr r0, _081C4278 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C427C + ldr r1, =0x000040d3 adds r0, r1 adds r0, r4 ldrb r0, [r0] @@ -923325,16 +891588,15 @@ _081C4268: pop {r0} bx r0 .align 2, 0 -_081C4278: .4byte 0x0203cf1c -_081C427C: .4byte 0x000040d3 + .pool thumb_func_end sub_81C424C thumb_func_start sub_81C4280 sub_81C4280: @ 81C4280 push {lr} - ldr r0, _081C429C + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C42A0 + ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x2 @@ -923345,8 +891607,7 @@ sub_81C4280: @ 81C4280 beq _081C42AA b _081C42C2 .align 2, 0 -_081C429C: .4byte 0x0203cf1c -_081C42A0: .4byte 0x000040c0 + .pool _081C42A4: cmp r0, 0x3 beq _081C42BA @@ -923370,22 +891631,22 @@ _081C42C2: sub_81C42C8: @ 81C42C8 push {r4,r5,lr} movs r4, 0x3 - ldr r5, _081C430C + ldr r5, =0x0203cf1c _081C42CE: ldr r0, [r5] - ldr r1, _081C4310 + ldr r1, =0x000040d3 adds r0, r1 adds r0, r4 ldrb r0, [r0] cmp r0, 0xFF bne _081C42F2 - ldr r0, _081C4314 + ldr r0, =0x0861cfc4 movs r1, 0 movs r2, 0 movs r3, 0x2 bl obj_add_from_template_forward_search ldr r1, [r5] - ldr r2, _081C4310 + ldr r2, =0x000040d3 adds r1, r2 adds r1, r4 strb r0, [r1] @@ -923402,9 +891663,7 @@ _081C42F2: pop {r0} bx r0 .align 2, 0 -_081C430C: .4byte 0x0203cf1c -_081C4310: .4byte 0x000040d3 -_081C4314: .4byte 0x0861cfc4 + .pool thumb_func_end sub_81C42C8 thumb_func_start sub_81C4318 @@ -923426,22 +891685,22 @@ sub_81C4318: @ 81C4318 mov r8, r0 lsls r3, 24 lsrs r3, 24 - ldr r0, _081C4390 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C4394 + ldr r1, =0x000040d3 adds r0, r1 adds r0, r3 ldrb r0, [r0] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _081C4398 + ldr r0, =0x02020630 adds r4, r0 adds r0, r4, 0 adds r1, r5, 0 str r3, [sp] bl obj_anim_image_start - ldr r0, _081C439C + ldr r0, =0x0861cfdc adds r5, r0 ldrb r1, [r5] lsls r1, 4 @@ -923467,16 +891726,13 @@ sub_81C4318: @ 81C4318 pop {r0} bx r0 .align 2, 0 -_081C4390: .4byte 0x0203cf1c -_081C4394: .4byte 0x000040d3 -_081C4398: .4byte 0x02020630 -_081C439C: .4byte 0x0861cfdc + .pool thumb_func_end sub_81C4318 thumb_func_start sub_81C43A0 sub_81C43A0: @ 81C43A0 push {r4,r5,lr} - ldr r0, _081C43C8 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r5, r0, 0 adds r5, 0x70 @@ -923493,9 +891749,9 @@ sub_81C43A0: @ 81C43A0 bl sub_81C4204 b _081C4418 .align 2, 0 -_081C43C8: .4byte 0x0203cf1c + .pool _081C43CC: - ldr r4, _081C440C + ldr r4, =0x083203cc ldrh r1, [r5] lsls r0, r1, 3 subs r0, r1 @@ -923525,7 +891781,7 @@ _081C43CC: bl sub_81C4204 b _081C4418 .align 2, 0 -_081C440C: .4byte 0x083203cc + .pool _081C4410: movs r0, 0x4 movs r1, 0x1 @@ -923539,12 +891795,12 @@ _081C4418: thumb_func_start sub_81C4420 sub_81C4420: @ 81C4420 push {r4-r6,lr} - ldr r0, _081C4460 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r5, r0, 0 adds r5, 0x70 movs r4, 0 - ldr r6, _081C4464 + ldr r6, =0x0831c898 _081C442E: lsls r0, r4, 1 adds r1, r5, 0 @@ -923571,8 +891827,7 @@ _081C442E: bl sub_81C4318 b _081C4474 .align 2, 0 -_081C4460: .4byte 0x0203cf1c -_081C4464: .4byte 0x0831c898 + .pool _081C4468: adds r0, r4, 0x3 lsls r0, 24 @@ -923593,7 +891848,7 @@ _081C4474: thumb_func_start sub_81C4484 sub_81C4484: @ 81C4484 push {r4,r5,lr} - ldr r0, _081C44CC + ldr r0, =0x0203cf1c ldr r0, [r0] adds r5, r0, 0 adds r5, 0x70 @@ -923606,7 +891861,7 @@ _081C4490: ldrh r0, [r2] cmp r0, 0 beq _081C44D4 - ldr r1, _081C44D0 + ldr r1, =0x0858c2b4 lsls r0, 3 adds r0, r1 ldrb r0, [r0, 0x1] @@ -923628,8 +891883,7 @@ _081C4490: bl sub_81C4318 b _081C44E0 .align 2, 0 -_081C44CC: .4byte 0x0203cf1c -_081C44D0: .4byte 0x0858c2b4 + .pool _081C44D4: adds r0, r4, 0x3 lsls r0, 24 @@ -923650,9 +891904,9 @@ _081C44E0: thumb_func_start sub_81C44F0 sub_81C44F0: @ 81C44F0 push {lr} - ldr r0, _081C450C + ldr r0, =0x0203cf1c ldr r1, [r0] - ldr r0, _081C4510 + ldr r0, =0x000040c4 adds r3, r1, r0 ldrh r0, [r3] cmp r0, 0 @@ -923662,15 +891916,14 @@ sub_81C44F0: @ 81C44F0 bl sub_81C4204 b _081C4560 .align 2, 0 -_081C450C: .4byte 0x0203cf1c -_081C4510: .4byte 0x000040c4 + .pool _081C4514: - ldr r2, _081C4538 + ldr r2, =0x000040c0 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x2 bne _081C4540 - ldr r2, _081C453C + ldr r2, =0x0831c898 ldrh r1, [r3] lsls r0, r1, 1 adds r0, r1 @@ -923683,10 +891936,9 @@ _081C4514: bl sub_81C4318 b _081C4560 .align 2, 0 -_081C4538: .4byte 0x000040c0 -_081C453C: .4byte 0x0831c898 + .pool _081C4540: - ldr r1, _081C4564 + ldr r1, =0x0858c2b4 ldrh r0, [r3] lsls r0, 3 adds r0, r1 @@ -923705,7 +891957,7 @@ _081C4560: pop {r0} bx r0 .align 2, 0 -_081C4564: .4byte 0x0858c2b4 + .pool thumb_func_end sub_81C44F0 thumb_func_start sub_81C4568 @@ -923715,17 +891967,17 @@ sub_81C4568: @ 81C4568 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _081C45E8 + ldr r2, =0x0203cf1c ldr r2, [r2] adds r0, 0x3 - ldr r3, _081C45EC + ldr r3, =0x000040d3 adds r2, r3 adds r0, r2, r0 ldrb r0, [r0] lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r5, _081C45F0 + ldr r5, =0x02020630 adds r4, r5 adds r1, 0x3 adds r2, r1 @@ -923774,9 +892026,7 @@ sub_81C4568: @ 81C4568 pop {r0} bx r0 .align 2, 0 -_081C45E8: .4byte 0x0203cf1c -_081C45EC: .4byte 0x000040d3 -_081C45F0: .4byte 0x02020630 + .pool thumb_func_end sub_81C4568 thumb_func_start sub_81C45F4 @@ -923784,7 +892034,7 @@ sub_81C45F4: @ 81C45F4 push {r4-r6,lr} adds r3, r0, 0 adds r6, r1, 0 - ldr r0, _081C461C + ldr r0, =0x0203cf1c ldr r2, [r0] adds r5, r2, 0 adds r5, 0x70 @@ -923802,17 +892052,17 @@ _081C4610: lsrs r0, 24 b _081C4770 .align 2, 0 -_081C461C: .4byte 0x0203cf1c + .pool _081C4620: - ldr r0, _081C4654 - ldr r1, _081C4658 + ldr r0, =0x030022c0 + ldr r1, =0x00000439 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 ands r0, r1 cmp r0, 0 beq _081C4680 - ldr r1, _081C465C + ldr r1, =0x000040be adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x3 @@ -923822,40 +892072,35 @@ _081C4620: beq _081C4668 ldrh r2, [r5, 0x2] lsls r0, r2, 3 - ldr r1, _081C4660 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _081C4664 + ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x8] b _081C46D6 .align 2, 0 -_081C4654: .4byte 0x030022c0 -_081C4658: .4byte 0x00000439 -_081C465C: .4byte 0x000040be -_081C4660: .4byte 0x0830a18c -_081C4664: .4byte 0x020244d4 + .pool _081C4668: ldrh r2, [r5, 0x2] lsls r0, r2, 3 - ldr r1, _081C4678 + ldr r1, =0x0830a18c adds r0, r1 - ldr r1, _081C467C + ldr r1, =0x020244d4 ldr r1, [r1] b _081C46B0 .align 2, 0 -_081C4678: .4byte 0x0830a18c -_081C467C: .4byte 0x020244d4 + .pool _081C4680: - ldr r0, _081C46BC + ldr r0, =0x020244d4 ldr r3, [r0] adds r4, r0, 0 cmp r3, 0 beq _081C46E4 ldr r1, [r2] - ldr r0, _081C46C0 + ldr r0, =0x020244ec cmp r1, r0 beq _081C46A6 - ldr r1, _081C46C4 + ldr r1, =0x000040bc adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x2 @@ -923868,7 +892113,7 @@ _081C4680: _081C46A6: ldrh r2, [r5, 0x2] lsls r0, r2, 3 - ldr r1, _081C46C8 + ldr r1, =0x0830a18c adds r0, r1 ldr r1, [r4] _081C46B0: @@ -923877,14 +892122,11 @@ _081C46B0: bl help_system_enable_unless_flashback__sp199 b _081C4768 .align 2, 0 -_081C46BC: .4byte 0x020244d4 -_081C46C0: .4byte 0x020244ec -_081C46C4: .4byte 0x000040bc -_081C46C8: .4byte 0x0830a18c + .pool _081C46CC: ldrh r2, [r5, 0x2] lsls r0, r2, 3 - ldr r1, _081C46E0 + ldr r1, =0x0830a18c adds r0, r1 ldr r1, [r3, 0x8] _081C46D6: @@ -923892,13 +892134,13 @@ _081C46D6: bl sub_8034B50 b _081C4768 .align 2, 0 -_081C46E0: .4byte 0x0830a18c + .pool _081C46E4: ldr r1, [r2] - ldr r0, _081C4720 + ldr r0, =0x020244ec cmp r1, r0 beq _081C4700 - ldr r1, _081C4724 + ldr r1, =0x000040bc adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x2 @@ -923911,7 +892153,7 @@ _081C46E4: _081C4700: ldrh r4, [r5, 0x2] lsls r4, 3 - ldr r0, _081C4728 + ldr r0, =0x0830a18c adds r4, r0 movs r0, 0 movs r1, 0x1 @@ -923923,13 +892165,11 @@ _081C4700: bl help_system_enable_unless_flashback__sp199 b _081C4768 .align 2, 0 -_081C4720: .4byte 0x020244ec -_081C4724: .4byte 0x000040bc -_081C4728: .4byte 0x0830a18c + .pool _081C472C: ldrh r4, [r5, 0x2] lsls r4, 3 - ldr r0, _081C474C + ldr r0, =0x0830a18c adds r4, r0 movs r0, 0 movs r1, 0x1 @@ -923941,7 +892181,7 @@ _081C472C: bl sub_8034B50 b _081C4768 .align 2, 0 -_081C474C: .4byte 0x0830a18c + .pool _081C4750: ldrh r0, [r5, 0x2] ldr r1, [r5, 0x48] @@ -923966,7 +892206,7 @@ _081C4770: thumb_func_start sub_81C4778 sub_81C4778: @ 81C4778 push {r4,lr} - ldr r0, _081C47A0 + ldr r0, =0x0203cf1c ldr r1, [r0] adds r4, r1, 0 adds r4, 0x70 @@ -923984,7 +892224,7 @@ sub_81C4778: @ 81C4778 bl sub_80A32E4 b _081C47AE .align 2, 0 -_081C47A0: .4byte 0x0203cf1c + .pool _081C47A4: ldrh r0, [r4, 0x2] movs r1, 0 @@ -924001,10 +892241,10 @@ sub_81C47B4: @ 81C47B4 push {r4-r7,lr} mov r7, r8 push {r7} - ldr r0, _081C4818 + ldr r0, =0x0203cf1c ldr r6, [r0] adds r6, 0x70 - ldr r0, _081C481C + ldr r0, =0x0202499c movs r1, 0x28 movs r2, 0x40 movs r3, 0x5 @@ -924015,7 +892255,7 @@ sub_81C47B4: @ 81C47B4 lsls r4, r0, 4 add r4, r8 lsls r4, 2 - ldr r5, _081C4820 + ldr r5, =0x02020630 adds r7, r4, r5 adds r0, r7, 0 bl obj_free_rotscale_entry @@ -924025,7 +892265,7 @@ sub_81C47B4: @ 81C47B4 strh r1, [r7, 0x32] adds r5, 0x1C adds r4, r5 - ldr r0, _081C4824 + ldr r0, =sub_81C4844 + 1 str r0, [r4] ldrb r1, [r7, 0x5] movs r0, 0xD @@ -924045,10 +892285,7 @@ sub_81C47B4: @ 81C47B4 strb r1, [r0] b _081C4836 .align 2, 0 -_081C4818: .4byte 0x0203cf1c -_081C481C: .4byte 0x0202499c -_081C4820: .4byte 0x02020630 -_081C4824: .4byte sub_81C4844 + 1 + .pool _081C4828: adds r2, r7, 0 adds r2, 0x3F @@ -924070,11 +892307,11 @@ _081C4836: sub_81C4844: @ 81C4844 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _081C4884 + ldr r0, =0x0203cf1c ldr r0, [r0] adds r5, r0, 0 adds r5, 0x70 - ldr r0, _081C4888 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -924099,23 +892336,22 @@ _081C487E: pop {r0} bx r0 .align 2, 0 -_081C4884: .4byte 0x0203cf1c -_081C4888: .4byte 0x02037fd4 + .pool thumb_func_end sub_81C4844 thumb_func_start sub_81C488C sub_81C488C: @ 81C488C - ldr r1, _081C4894 + ldr r1, =0x0203cf24 strb r0, [r1] bx lr .align 2, 0 -_081C4894: .4byte 0x0203cf24 + .pool thumb_func_end sub_81C488C thumb_func_start sub_81C4898 sub_81C4898: @ 81C4898 push {r4,lr} - ldr r4, _081C48B0 + ldr r4, =0x0203cf24 ldrb r0, [r4] cmp r0, 0xFF beq _081C48AA @@ -924127,16 +892363,16 @@ _081C48AA: pop {r0} bx r0 .align 2, 0 -_081C48B0: .4byte 0x0203cf24 + .pool thumb_func_end sub_81C4898 thumb_func_start sub_81C48B4 sub_81C48B4: @ 81C48B4 push {lr} - ldr r2, _081C48D8 - ldr r0, _081C48DC + ldr r2, =0x02020630 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C48E0 + ldr r1, =0x000040d3 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -924145,16 +892381,13 @@ sub_81C48B4: @ 81C48B4 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081C48E4 + ldr r0, =nullsub_12 + 1 cmp r1, r0 beq _081C48E8 movs r0, 0x1 b _081C48EA .align 2, 0 -_081C48D8: .4byte 0x02020630 -_081C48DC: .4byte 0x0203cf1c -_081C48E0: .4byte 0x000040d3 -_081C48E4: .4byte nullsub_12 + 1 + .pool _081C48E8: movs r0, 0 _081C48EA: @@ -924165,10 +892398,10 @@ _081C48EA: thumb_func_start sub_81C48F0 sub_81C48F0: @ 81C48F0 push {r4-r6,lr} - ldr r6, _081C496C - ldr r5, _081C4970 + ldr r6, =0x02020630 + ldr r5, =0x0203cf1c ldr r0, [r5] - ldr r4, _081C4974 + ldr r4, =0x000040d3 adds r0, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -924189,7 +892422,7 @@ sub_81C48F0: @ 81C48F0 adds r1, r6, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _081C4978 + ldr r1, =nullsub_12 + 1 str r1, [r0] bl sub_806EE98 ldr r0, [r5] @@ -924207,8 +892440,8 @@ sub_81C48F0: @ 81C48F0 adds r0, r1, 0 orrs r3, r0 movs r2, 0 - ldr r5, _081C497C - ldr r4, _081C4980 + ldr r5, =0x02037714 + ldr r4, =0x02037b14 _081C494C: adds r0, r2, r3 lsls r0, 16 @@ -924226,24 +892459,19 @@ _081C494C: pop {r0} bx r0 .align 2, 0 -_081C496C: .4byte 0x02020630 -_081C4970: .4byte 0x0203cf1c -_081C4974: .4byte 0x000040d3 -_081C4978: .4byte nullsub_12 + 1 -_081C497C: .4byte 0x02037714 -_081C4980: .4byte 0x02037b14 + .pool thumb_func_end sub_81C48F0 thumb_func_start sub_81C4984 sub_81C4984: @ 81C4984 push {r4-r6,lr} adds r5, r0, 0 - ldr r1, _081C49D4 - ldr r2, _081C49D8 + ldr r1, =0x00007533 + ldr r2, =0x0861d120 adds r0, r1, 0 bl sub_811FF94 adds r4, r0, 0 - ldr r6, _081C49DC + ldr r6, =0x0203cf1c ldr r0, [r6] str r4, [r0, 0x8] cmp r4, 0 @@ -924275,20 +892503,18 @@ _081C49CE: pop {r0} bx r0 .align 2, 0 -_081C49D4: .4byte 0x00007533 -_081C49D8: .4byte 0x0861d120 -_081C49DC: .4byte 0x0203cf1c + .pool thumb_func_end sub_81C4984 thumb_func_start sub_81C49E0 sub_81C49E0: @ 81C49E0 push {r4,lr} adds r4, r0, 0 - ldr r0, _081C4A00 + ldr r0, =0x0203cf1c ldr r0, [r0] ldr r0, [r0, 0x8] bl obj_delete_and_free_tiles - ldr r0, _081C4A04 + ldr r0, =0x00007533 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 bl sub_81C4984 @@ -924296,8 +892522,7 @@ sub_81C49E0: @ 81C49E0 pop {r0} bx r0 .align 2, 0 -_081C4A00: .4byte 0x0203cf1c -_081C4A04: .4byte 0x00007533 + .pool thumb_func_end sub_81C49E0 thumb_func_start sub_81C4A08 @@ -924316,18 +892541,18 @@ sub_81C4A08: @ 81C4A08 lsls r0, r4, 1 adds r0, r4 lsls r0, 3 - ldr r1, _081C4A74 + ldr r1, =0x0832c588 adds r0, r1 movs r1, 0x10 movs r2, 0x88 movs r3, 0 bl obj_add_from_template_forward_search - ldr r2, _081C4A78 + ldr r2, =0x0203cf1c ldr r1, [r2] - ldr r3, _081C4A7C + ldr r3, =0x000040d4 adds r1, r3 strb r0, [r1] - ldr r4, _081C4A80 + ldr r4, =0x02020630 ldr r2, [r2] adds r2, r3 ldrb r1, [r2] @@ -924337,7 +892562,7 @@ sub_81C4A08: @ 81C4A08 adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _081C4A84 + ldr r1, =nullsub_12 + 1 str r1, [r0] ldrb r1, [r2] lsls r0, r1, 4 @@ -924352,24 +892577,20 @@ sub_81C4A08: @ 81C4A08 pop {r0} bx r0 .align 2, 0 -_081C4A74: .4byte 0x0832c588 -_081C4A78: .4byte 0x0203cf1c -_081C4A7C: .4byte 0x000040d4 -_081C4A80: .4byte 0x02020630 -_081C4A84: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81C4A08 thumb_func_start sub_81C4A88 sub_81C4A88: @ 81C4A88 push {r4,r5,lr} - ldr r5, _081C4AD8 + ldr r5, =0x0203cf1c ldr r0, [r5] - ldr r1, _081C4ADC + ldr r1, =0x000040d5 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF bne _081C4AA6 - ldr r0, _081C4AE0 + ldr r0, =0x0861d108 movs r1, 0x40 movs r2, 0x98 movs r3, 0 @@ -924387,7 +892608,7 @@ _081C4AA6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081C4AE4 + ldr r1, =0x02020630 adds r0, r1 subs r1, r2, 0x1 lsls r1, 24 @@ -924398,10 +892619,7 @@ _081C4AA6: bl sub_81C4204 b _081C4AF0 .align 2, 0 -_081C4AD8: .4byte 0x0203cf1c -_081C4ADC: .4byte 0x000040d5 -_081C4AE0: .4byte 0x0861d108 -_081C4AE4: .4byte 0x02020630 + .pool _081C4AE8: movs r0, 0x2 movs r1, 0x1 @@ -924422,12 +892640,12 @@ sub_81C4AF8: @ 81C4AF8 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _081C4B60 - ldr r1, _081C4B64 + ldr r0, =0x0203cf1c + ldr r1, =0x000040d3 add r1, r8 ldr r0, [r0] adds r7, r0, r1 - ldr r1, _081C4B68 + ldr r1, =0x000040c0 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 @@ -924441,7 +892659,7 @@ sub_81C4AF8: @ 81C4AF8 mov r9, r0 _081C4B2A: movs r5, 0 - ldr r6, _081C4B6C + ldr r6, =0x02020630 mov r10, r5 _081C4B30: lsls r1, r5, 20 @@ -924449,7 +892667,7 @@ _081C4B30: lsls r0, 15 adds r1, r0 asrs r1, 16 - ldr r0, _081C4B70 + ldr r0, =0x0861d084 movs r2, 0x28 mov r3, r9 bl obj_add_from_template_forward_search @@ -924467,11 +892685,7 @@ _081C4B30: bl obj_anim_image_start b _081C4B9A .align 2, 0 -_081C4B60: .4byte 0x0203cf1c -_081C4B64: .4byte 0x000040d3 -_081C4B68: .4byte 0x000040c0 -_081C4B6C: .4byte 0x02020630 -_081C4B70: .4byte 0x0861d084 + .pool _081C4B74: cmp r5, 0x9 bne _081C4B8A @@ -924499,7 +892713,7 @@ _081C4B9A: adds r1, r6, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _081C4BE0 + ldr r1, =sub_81C4BE4 + 1 str r1, [r0] ldrb r1, [r4] lsls r0, r1, 4 @@ -924529,7 +892743,7 @@ _081C4BD2: pop {r0} bx r0 .align 2, 0 -_081C4BE0: .4byte sub_81C4BE4 + 1 + .pool thumb_func_end sub_81C4AF8 thumb_func_start sub_81C4BE4 @@ -924578,17 +892792,16 @@ _081C4C2A: ldrsh r0, [r3, r1] cmp r0, 0x8 bne _081C4C44 - ldr r0, _081C4C3C + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C4C40 + ldr r1, =0x000040c6 b _081C4C4A .align 2, 0 -_081C4C3C: .4byte 0x0203cf1c -_081C4C40: .4byte 0x000040c6 + .pool _081C4C44: - ldr r0, _081C4C58 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C4C5C + ldr r1, =0x000040c7 _081C4C4A: adds r0, r1 ldrb r0, [r0] @@ -924597,8 +892810,7 @@ _081C4C4A: pop {r0} bx r0 .align 2, 0 -_081C4C58: .4byte 0x0203cf1c -_081C4C5C: .4byte 0x000040c7 + .pool thumb_func_end sub_81C4BE4 thumb_func_start sub_81C4C60 @@ -924630,15 +892842,15 @@ sub_81C4C84: @ 81C4C84 push {r6,r7} lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _081C4CC8 + ldr r0, =0x0203cf1c ldr r0, [r0] - ldr r1, _081C4CCC + ldr r1, =0x000040db adds r5, r0, r1 lsls r0, r6, 1 adds r0, r6 lsls r0, 24 movs r4, 0 - ldr r7, _081C4CD0 + ldr r7, =0x02020630 movs r2, 0x80 lsls r2, 19 adds r2, r0 @@ -924659,9 +892871,7 @@ _081C4CB4: mov r2, r9 b _081C4CE4 .align 2, 0 -_081C4CC8: .4byte 0x0203cf1c -_081C4CCC: .4byte 0x000040db -_081C4CD0: .4byte 0x02020630 + .pool _081C4CD4: cmp r4, 0x9 bne _081C4CEC @@ -924705,13 +892915,13 @@ sub_81C4D18: @ 81C4D18 push {r4-r7,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081C4D64 - ldr r2, _081C4D68 + ldr r1, =0x0203cf1c + ldr r2, =0x000040d3 adds r0, r2 ldr r1, [r1] adds r5, r1, r0 movs r3, 0 - ldr r4, _081C4D6C + ldr r4, =0x02020630 movs r7, 0x5 negs r7, r7 movs r6, 0 @@ -924742,9 +892952,7 @@ _081C4D32: pop {r0} bx r0 .align 2, 0 -_081C4D64: .4byte 0x0203cf1c -_081C4D68: .4byte 0x000040d3 -_081C4D6C: .4byte 0x02020630 + .pool thumb_func_end sub_81C4D18 thumb_func_start sub_81C4D70 @@ -924752,7 +892960,7 @@ sub_81C4D70: @ 81C4D70 push {r4,r5,lr} sub sp, 0x4 adds r5, r0, 0 - ldr r4, _081C4DD0 + ldr r4, =0x0203cf28 movs r0, 0x4 bl malloc str r0, [r4] @@ -924769,7 +892977,7 @@ sub_81C4D70: @ 81C4D70 ldr r3, [r5] lsls r0, r3, 30 lsrs r0, 30 - ldr r1, _081C4DD4 + ldr r1, =0x0861d1a0 lsls r3, 22 lsrs r3, 24 str r4, [sp] @@ -924778,7 +892986,7 @@ sub_81C4D70: @ 81C4D70 ldr r0, [r5] lsls r0, 30 lsrs r0, 30 - ldr r1, _081C4DD8 + ldr r1, =0x0861def4 movs r2, 0x1 str r2, [sp] movs r2, 0 @@ -924793,9 +893001,7 @@ sub_81C4D70: @ 81C4D70 bl sub_8199D3C b _081C4E2E .align 2, 0 -_081C4DD0: .4byte 0x0203cf28 -_081C4DD4: .4byte 0x0861d1a0 -_081C4DD8: .4byte 0x0861def4 + .pool _081C4DDC: lsls r0, r1, 30 lsrs r0, 30 @@ -924811,7 +893017,7 @@ _081C4DDC: ldr r3, [r5] lsls r0, r3, 30 lsrs r0, 30 - ldr r1, _081C4E78 + ldr r1, =0x0861e208 lsls r3, 22 lsrs r3, 24 movs r2, 0 @@ -924820,7 +893026,7 @@ _081C4DDC: ldr r0, [r5] lsls r0, 30 lsrs r0, 30 - ldr r1, _081C4E7C + ldr r1, =0x0861ef64 movs r4, 0x1 str r4, [sp] movs r2, 0 @@ -924852,11 +893058,11 @@ _081C4E2E: movs r1, 0x4 movs r2, 0x1 bl gpu_bg_config_set_field - ldr r0, _081C4E80 - ldr r1, _081C4E84 - ldr r2, _081C4E88 + ldr r0, =0x0861d140 + ldr r1, =0x020377f4 + ldr r2, =0x04000018 bl CpuSet - ldr r0, _081C4E8C + ldr r0, =0x0203cf28 ldr r1, [r0] ldr r0, [r5] lsls r0, 30 @@ -924867,12 +893073,7 @@ _081C4E2E: pop {r0} bx r0 .align 2, 0 -_081C4E78: .4byte 0x0861e208 -_081C4E7C: .4byte 0x0861ef64 -_081C4E80: .4byte 0x0861d140 -_081C4E84: .4byte 0x020377f4 -_081C4E88: .4byte 0x04000018 -_081C4E8C: .4byte 0x0203cf28 + .pool thumb_func_end sub_81C4D70 thumb_func_start sub_81C4E90 @@ -924885,7 +893086,7 @@ sub_81C4E90: @ 81C4E90 movs r0, 0x1 b _081C4EAC _081C4EA0: - ldr r0, _081C4EB0 + ldr r0, =0x0203cf28 ldr r0, [r0] ldrb r0, [r0] bl gpu_sync_bg_show @@ -924894,13 +893095,13 @@ _081C4EAC: pop {r1} bx r1 .align 2, 0 -_081C4EB0: .4byte 0x0203cf28 + .pool thumb_func_end sub_81C4E90 thumb_func_start sub_81C4EB4 sub_81C4EB4: @ 81C4EB4 push {r4,lr} - ldr r4, _081C4ECC + ldr r4, =0x0203cf28 ldr r0, [r4] cmp r0, 0 beq _081C4EC6 @@ -924912,14 +893113,14 @@ _081C4EC6: pop {r0} bx r0 .align 2, 0 -_081C4ECC: .4byte 0x0203cf28 + .pool thumb_func_end sub_81C4EB4 thumb_func_start sub_81C4ED0 sub_81C4ED0: @ 81C4ED0 push {lr} adds r1, r0, 0 - ldr r0, _081C4EE8 + ldr r0, =0x0203cf28 ldr r0, [r0] ldrb r0, [r0] lsls r1, 8 @@ -924928,42 +893129,42 @@ sub_81C4ED0: @ 81C4ED0 pop {r0} bx r0 .align 2, 0 -_081C4EE8: .4byte 0x0203cf28 + .pool thumb_func_end sub_81C4ED0 thumb_func_start sub_81C4EEC sub_81C4EEC: @ 81C4EEC - ldr r1, _081C4EF8 + ldr r1, =0x0203cf30 movs r0, 0 strh r0, [r1, 0x6] strh r0, [r1, 0x8] bx lr .align 2, 0 -_081C4EF8: .4byte 0x0203cf30 + .pool thumb_func_end sub_81C4EEC thumb_func_start sub_81C4EFC sub_81C4EFC: @ 81C4EFC push {lr} - ldr r1, _081C4F0C + ldr r1, =sub_8086194 + 1 movs r0, 0 bl sub_81C4F98 pop {r0} bx r0 .align 2, 0 -_081C4F0C: .4byte sub_8086194 + 1 + .pool thumb_func_end sub_81C4EFC thumb_func_start sub_81C4F10 sub_81C4F10: @ 81C4F10 push {lr} - ldr r1, _081C4F20 + ldr r1, =sub_8059D50 + 1 movs r0, 0x1 bl sub_81C4F98 pop {r0} bx r0 .align 2, 0 -_081C4F20: .4byte sub_8059D50 + 1 + .pool thumb_func_end sub_81C4F10 thumb_func_start sub_81C4F24 @@ -924973,13 +893174,13 @@ sub_81C4F24: @ 81C4F24 movs r0, 0x1 movs r1, 0 bl fade_screen - ldr r0, _081C4F40 + ldr r0, =sub_81C4F44 + 1 movs r1, 0xA bl AddTask pop {r0} bx r0 .align 2, 0 -_081C4F40: .4byte sub_81C4F44 + 1 + .pool thumb_func_end sub_81C4F24 thumb_func_start sub_81C4F44 @@ -924987,17 +893188,17 @@ sub_81C4F44: @ 81C4F44 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081C4F74 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081C4F6E bl overworld_free_bg_tilemaps - ldr r0, _081C4F78 - ldr r1, _081C4F7C + ldr r0, =0x03005db0 + ldr r1, =hm_add_c3_without_phase_2 + 1 str r1, [r0] - ldr r1, _081C4F80 + ldr r1, =c2_exit_to_overworld_2_switch + 1 movs r0, 0x3 bl sub_81C4F98 adds r0, r4, 0 @@ -925007,23 +893208,20 @@ _081C4F6E: pop {r0} bx r0 .align 2, 0 -_081C4F74: .4byte 0x02037fd4 -_081C4F78: .4byte 0x03005db0 -_081C4F7C: .4byte hm_add_c3_without_phase_2 + 1 -_081C4F80: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_81C4F44 thumb_func_start sub_81C4F84 sub_81C4F84: @ 81C4F84 push {lr} - ldr r0, _081C4F94 + ldr r0, =0x0203cf30 ldr r1, [r0] movs r0, 0x4 bl sub_81C4F98 pop {r0} bx r0 .align 2, 0 -_081C4F94: .4byte 0x0203cf30 + .pool thumb_func_end sub_81C4F84 thumb_func_start sub_81C4F98 @@ -925032,59 +893230,52 @@ sub_81C4F98: @ 81C4F98 adds r5, r1, 0 lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _081C4FFC - ldr r0, _081C5000 + ldr r6, =0x0203cf2c + ldr r0, =0x0000098c bl malloc_and_clear str r0, [r6] cmp r4, 0x4 beq _081C4FB2 - ldr r0, _081C5004 + ldr r0, =0x0203cf30 strb r4, [r0, 0x4] _081C4FB2: cmp r5, 0 beq _081C4FBA - ldr r0, _081C5004 + ldr r0, =0x0203cf30 str r5, [r0] _081C4FBA: ldr r0, [r6] movs r1, 0 str r1, [r0] - ldr r1, _081C5008 + ldr r1, =0x00000814 adds r0, r1 movs r1, 0xFF strb r1, [r0] ldr r0, [r6] - ldr r1, _081C500C + ldr r1, =0x00000816 adds r0, r1 movs r1, 0x1 negs r1, r1 strb r1, [r0] ldr r0, [r6] - ldr r1, _081C5010 + ldr r1, =0x00000804 adds r0, r1 movs r1, 0xFF movs r2, 0xB bl memset ldr r0, [r6] - ldr r1, _081C5014 + ldr r1, =0x0000080f adds r0, r1 movs r1, 0xFF movs r2, 0x5 bl memset - ldr r0, _081C5018 + ldr r0, =sub_81C504C + 1 bl set_callback2 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081C4FFC: .4byte 0x0203cf2c -_081C5000: .4byte 0x0000098c -_081C5004: .4byte 0x0203cf30 -_081C5008: .4byte 0x00000814 -_081C500C: .4byte 0x00000816 -_081C5010: .4byte 0x00000804 -_081C5014: .4byte 0x0000080f -_081C5018: .4byte sub_81C504C + 1 + .pool thumb_func_end sub_81C4F98 thumb_func_start sub_81C501C @@ -925137,7 +893328,7 @@ _081C5072: sub_81C5078: @ 81C5078 push {lr} sub sp, 0x4 - ldr r0, _081C5098 + ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 adds r0, r1 @@ -925147,13 +893338,12 @@ sub_81C5078: @ 81C5078 b _081C51BC _081C508C: lsls r0, 2 - ldr r1, _081C509C + ldr r1, =_081C50A0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C5098: .4byte 0x030022c0 -_081C509C: .4byte _081C50A0 + .pool .align 2, 0 _081C50A0: .4byte _081C50E4 @@ -925185,13 +893375,13 @@ _081C50F4: b _081C51A2 _081C50FA: bl sub_80A1A74 - ldr r2, _081C5108 + ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 b _081C51A0 .align 2, 0 -_081C5108: .4byte 0x02037fd4 + .pool _081C510C: bl reset_all_obj_data b _081C51A2 @@ -925204,16 +893394,15 @@ _081C5112: b _081C51A2 _081C5122: bl sub_81C51DC - ldr r0, _081C5134 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r1, _081C5138 + ldr r1, =0x00000984 adds r0, r1 movs r1, 0 strh r1, [r0] b _081C51A2 .align 2, 0 -_081C5134: .4byte 0x0203cf2c -_081C5138: .4byte 0x00000984 + .pool _081C513C: bl sub_81C5238 lsls r0, 24 @@ -925258,14 +893447,14 @@ _081C5188: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r2, _081C51B4 + ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 _081C51A0: strb r0, [r2, 0x8] _081C51A2: - ldr r1, _081C51B8 + ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 @@ -925274,18 +893463,16 @@ _081C51A2: strb r0, [r1] b _081C51D4 .align 2, 0 -_081C51B4: .4byte 0x02037fd4 -_081C51B8: .4byte 0x030022c0 + .pool _081C51BC: - ldr r0, _081C51CC + ldr r0, =sub_81C5038 + 1 bl SetVBlankCallback - ldr r0, _081C51D0 + ldr r0, =sub_81C501C + 1 bl set_callback2 movs r0, 0x1 b _081C51D6 .align 2, 0 -_081C51CC: .4byte sub_81C5038 + 1 -_081C51D0: .4byte sub_81C501C + 1 + .pool _081C51D4: movs r0, 0 _081C51D6: @@ -925300,11 +893487,11 @@ sub_81C51DC: @ 81C51DC bl sub_8121DA0 movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081C5230 + ldr r1, =0x0861f2b4 movs r0, 0 movs r2, 0x3 bl bg_vram_setup - ldr r0, _081C5234 + ldr r0, =0x0203cf2c ldr r1, [r0] adds r1, 0x4 movs r0, 0x2 @@ -925328,31 +893515,28 @@ sub_81C51DC: @ 81C51DC pop {r0} bx r0 .align 2, 0 -_081C5230: .4byte 0x0861f2b4 -_081C5234: .4byte 0x0203cf2c + .pool thumb_func_end sub_81C51DC thumb_func_start sub_81C5238 sub_81C5238: @ 81C5238 push {r4,lr} sub sp, 0x4 - ldr r4, _081C5258 + ldr r4, =0x0203cf2c ldr r0, [r4] - ldr r1, _081C525C + ldr r1, =0x00000984 adds r0, r1 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x4 bhi _081C52F0 lsls r0, 2 - ldr r1, _081C5260 + ldr r1, =_081C5264 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C5258: .4byte 0x0203cf2c -_081C525C: .4byte 0x00000984 -_081C5260: .4byte _081C5264 + .pool .align 2, 0 _081C5264: .4byte _081C5278 @@ -925362,7 +893546,7 @@ _081C5264: .4byte _081C52D4 _081C5278: bl reset_temp_tile_data_buffers - ldr r1, _081C5290 + ldr r1, =0x08d9a620 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -925371,63 +893555,61 @@ _081C5278: bl decompress_and_copy_tile_data_to_vram b _081C52D8 .align 2, 0 -_081C5290: .4byte 0x08d9a620 + .pool _081C5294: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081C5308 - ldr r0, _081C52B0 - ldr r4, _081C52B4 + ldr r0, =0x08d9ae04 + ldr r4, =0x0203cf2c ldr r1, [r4] adds r1, 0x4 bl call_LZZUnCompWram ldr r1, [r4] b _081C52DC .align 2, 0 -_081C52B0: .4byte 0x08d9ae04 -_081C52B4: .4byte 0x0203cf2c + .pool _081C52B8: - ldr r0, _081C52C4 + ldr r0, =0x08d9af44 movs r1, 0 movs r2, 0x20 bl decompress_palette b _081C52D8 .align 2, 0 -_081C52C4: .4byte 0x08d9af44 + .pool _081C52C8: - ldr r0, _081C52D0 + ldr r0, =0x0861f3cc bl gpu_tile_obj_decompress_and_load b _081C52D8 .align 2, 0 -_081C52D0: .4byte 0x0861f3cc + .pool _081C52D4: bl sub_81C6E98 _081C52D8: - ldr r0, _081C52E8 + ldr r0, =0x0203cf2c ldr r1, [r0] _081C52DC: - ldr r0, _081C52EC + ldr r0, =0x00000984 adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] b _081C5308 .align 2, 0 -_081C52E8: .4byte 0x0203cf2c -_081C52EC: .4byte 0x00000984 + .pool _081C52F0: bl sub_8122328 ldr r0, [r4] - ldr r1, _081C5304 + ldr r1, =0x00000984 adds r0, r1 movs r1, 0 strh r1, [r0] movs r0, 0x1 b _081C530A .align 2, 0 -_081C5304: .4byte 0x00000984 + .pool _081C5308: movs r0, 0 _081C530A: @@ -925440,9 +893622,9 @@ _081C530A: thumb_func_start sub_81C5314 sub_81C5314: @ 81C5314 push {r4-r7,lr} - ldr r0, _081C53DC + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r1, _081C53E0 + ldr r1, =0x00000ca9 adds r0, r2, r1 ldrb r1, [r0] lsls r1, 30 @@ -925450,13 +893632,13 @@ sub_81C5314: @ 81C5314 lsls r0, r1, 2 adds r0, r1 lsls r0, 2 - ldr r3, _081C53E4 + ldr r3, =0x00000e2c adds r0, r3 adds r7, r2, r0 movs r6, 0 - ldr r1, _081C53E8 + ldr r1, =0x0203cf2c ldr r0, [r1] - ldr r4, _081C53EC + ldr r4, =0x00000821 adds r0, r4 ldrb r0, [r0] subs r0, 0x1 @@ -925467,7 +893649,7 @@ _081C5344: lsls r1, r6, 1 adds r4, r1, r6 lsls r4, 3 - ldr r0, _081C53F0 + ldr r0, =0x0000087c adds r4, r0 ldr r0, [r5] adds r0, r4 @@ -925476,63 +893658,63 @@ _081C5344: bl sub_81C540C ldr r1, [r5] lsls r2, r6, 3 - ldr r3, _081C53F4 + ldr r3, =0x00000824 adds r0, r1, r3 adds r0, r2 adds r4, r1, r4 str r4, [r0] - ldr r4, _081C53F8 + ldr r4, =0x00000828 adds r0, r1, r4 adds r0, r2 str r6, [r0] adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - ldr r0, _081C53EC + ldr r0, =0x00000821 adds r1, r0 ldrb r0, [r1] subs r0, 0x1 cmp r6, r0 blt _081C5344 _081C5382: - ldr r5, _081C53E8 + ldr r5, =0x0203cf2c lsls r4, r6, 1 adds r4, r6 lsls r4, 3 - ldr r1, _081C53F0 + ldr r1, =0x0000087c adds r4, r1 ldr r0, [r5] adds r0, r4 - ldr r1, _081C53FC + ldr r1, =0x085e8db4 bl gf_strcpy ldr r1, [r5] lsls r2, r6, 3 - ldr r3, _081C53F4 + ldr r3, =0x00000824 adds r0, r1, r3 adds r0, r2 adds r4, r1, r4 str r4, [r0] - ldr r4, _081C53F8 + ldr r4, =0x00000828 adds r1, r4 adds r1, r2 movs r0, 0x2 negs r0, r0 str r0, [r1] - ldr r2, _081C5400 + ldr r2, =0x03006310 adds r1, r2, 0 - ldr r0, _081C5404 + ldr r0, =0x0861f2c0 ldm r0!, {r4,r6,r7} stm r1!, {r4,r6,r7} ldm r0!, {r4,r6,r7} stm r1!, {r4,r6,r7} ldr r1, [r5] - ldr r6, _081C53EC + ldr r6, =0x00000821 adds r0, r1, r6 ldrb r0, [r0] strh r0, [r2, 0xC] adds r3, r1, r3 str r3, [r2] - ldr r7, _081C5408 + ldr r7, =0x00000822 adds r1, r7 ldrb r0, [r1] strh r0, [r2, 0xE] @@ -925540,18 +893722,7 @@ _081C5382: pop {r0} bx r0 .align 2, 0 -_081C53DC: .4byte 0x03005d90 -_081C53E0: .4byte 0x00000ca9 -_081C53E4: .4byte 0x00000e2c -_081C53E8: .4byte 0x0203cf2c -_081C53EC: .4byte 0x00000821 -_081C53F0: .4byte 0x0000087c -_081C53F4: .4byte 0x00000824 -_081C53F8: .4byte 0x00000828 -_081C53FC: .4byte 0x085e8db4 -_081C5400: .4byte 0x03006310 -_081C5404: .4byte 0x0861f2c0 -_081C5408: .4byte 0x00000822 + .pool thumb_func_end sub_81C5314 thumb_func_start sub_81C540C @@ -925566,23 +893737,21 @@ sub_81C540C: @ 81C540C lsrs r0, 24 cmp r0, 0x4 bne _081C5450 - ldr r0, _081C5444 + ldr r0, =0x02021cc4 adds r1, r4, 0 subs r1, 0x84 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r1, _081C5448 + ldr r1, =0x02021dc4 adds r0, r4, 0 bl itemid_get_name - ldr r1, _081C544C + ldr r1, =0x085e9210 adds r0, r5, 0 bl ExpandTextCodes b _081C5458 .align 2, 0 -_081C5444: .4byte 0x02021cc4 -_081C5448: .4byte 0x02021dc4 -_081C544C: .4byte 0x085e9210 + .pool _081C5450: adds r0, r4, 0 adds r1, r5, 0 @@ -925605,9 +893774,9 @@ sub_81C5460: @ 81C5460 bl audio_play bl sub_81C6F20 _081C5476: - ldr r5, _081C54C8 + ldr r5, =0x0203cf2c ldr r1, [r5] - ldr r2, _081C54CC + ldr r2, =0x00000814 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF @@ -925622,10 +893791,10 @@ _081C5476: negs r0, r0 cmp r4, r0 beq _081C54E0 - ldr r0, _081C54D0 + ldr r0, =0x03005d90 ldr r2, [r0] lsls r3, r4, 1 - ldr r1, _081C54D4 + ldr r1, =0x00000ca9 adds r0, r2, r1 ldrb r1, [r0] lsls r1, 30 @@ -925634,34 +893803,29 @@ _081C5476: adds r0, r1 lsls r0, 2 adds r3, r0 - ldr r0, _081C54D8 + ldr r0, =0x00000e2c adds r2, r0 adds r2, r3 ldrh r0, [r2] ldr r1, [r5] - ldr r2, _081C54DC + ldr r2, =0x00000815 adds r1, r2 ldrb r1, [r1] bl sub_81C6F90 b _081C54EE .align 2, 0 -_081C54C8: .4byte 0x0203cf2c -_081C54CC: .4byte 0x00000814 -_081C54D0: .4byte 0x03005d90 -_081C54D4: .4byte 0x00000ca9 -_081C54D8: .4byte 0x00000e2c -_081C54DC: .4byte 0x00000815 + .pool _081C54E0: - ldr r0, _081C550C + ldr r0, =0x0000ffff ldr r1, [r5] - ldr r2, _081C5510 + ldr r2, =0x00000815 adds r1, r2 ldrb r1, [r1] bl sub_81C6F90 _081C54EE: - ldr r0, _081C5514 + ldr r0, =0x0203cf2c ldr r1, [r0] - ldr r0, _081C5510 + ldr r0, =0x00000815 adds r1, r0 ldrb r0, [r1] movs r2, 0x1 @@ -925674,9 +893838,7 @@ _081C5504: pop {r0} bx r0 .align 2, 0 -_081C550C: .4byte 0x0000ffff -_081C5510: .4byte 0x00000815 -_081C5514: .4byte 0x0203cf2c + .pool thumb_func_end sub_81C5460 thumb_func_start sub_81C5518 @@ -925692,9 +893854,9 @@ sub_81C5518: @ 81C5518 negs r0, r0 cmp r4, r0 beq _081C55B8 - ldr r0, _081C5550 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r1, _081C5554 + ldr r1, =0x00000814 adds r0, r1 ldrb r1, [r0] cmp r1, 0xFF @@ -925708,17 +893870,16 @@ sub_81C5518: @ 81C5518 bl sub_81C5AB8 b _081C5560 .align 2, 0 -_081C5550: .4byte 0x0203cf2c -_081C5554: .4byte 0x00000814 + .pool _081C5558: adds r0, r5, 0 movs r1, 0xFF bl sub_81C5AB8 _081C5560: - ldr r0, _081C55C0 - ldr r1, _081C55C4 + ldr r0, =0x02021cc4 + ldr r1, =0x03005d90 ldr r3, [r1] - ldr r2, _081C55C8 + ldr r2, =0x00000ca9 adds r1, r3, r2 ldrb r2, [r1] lsls r2, 30 @@ -925727,15 +893888,15 @@ _081C5560: adds r1, r2 lsls r1, 1 adds r1, r4, r1 - ldr r2, _081C55CC + ldr r2, =0x00000e54 adds r3, r2 adds r3, r1 ldrb r1, [r3] movs r2, 0x1 movs r3, 0x2 bl decimal_int_to_string - ldr r4, _081C55D0 - ldr r1, _081C55D4 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8da0 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x7 @@ -925761,12 +893922,7 @@ _081C55B8: pop {r0} bx r0 .align 2, 0 -_081C55C0: .4byte 0x02021cc4 -_081C55C4: .4byte 0x03005d90 -_081C55C8: .4byte 0x00000ca9 -_081C55CC: .4byte 0x00000e54 -_081C55D0: .4byte 0x02021fc4 -_081C55D4: .4byte 0x085e8da0 + .pool thumb_func_end sub_81C5518 thumb_func_start sub_81C55D8 @@ -925778,10 +893934,10 @@ sub_81C55D8: @ 81C55D8 negs r0, r0 cmp r3, r0 beq _081C561C - ldr r0, _081C5610 + ldr r0, =0x03005d90 ldr r2, [r0] lsls r3, 1 - ldr r1, _081C5614 + ldr r1, =0x00000ca9 adds r0, r2, r1 ldrb r1, [r0] lsls r1, 30 @@ -925790,7 +893946,7 @@ sub_81C55D8: @ 81C55D8 adds r0, r1 lsls r0, 2 adds r3, r0 - ldr r0, _081C5618 + ldr r0, =0x00000e2c adds r2, r0 adds r2, r3 ldrh r0, [r2] @@ -925798,20 +893954,18 @@ sub_81C55D8: @ 81C55D8 adds r4, r0, 0 b _081C5638 .align 2, 0 -_081C5610: .4byte 0x03005d90 -_081C5614: .4byte 0x00000ca9 -_081C5618: .4byte 0x00000e2c + .pool _081C561C: - ldr r0, _081C5660 - ldr r2, _081C5664 - ldr r1, _081C5668 + ldr r0, =0x02021cc4 + ldr r2, =0x085e91b0 + ldr r1, =0x0203cf30 ldrb r1, [r1, 0x4] lsls r1, 2 adds r1, r2 ldr r1, [r1] bl gf_strcpy - ldr r4, _081C566C - ldr r1, _081C5670 + ldr r4, =0x02021fc4 + ldr r1, =0x085e91c0 adds r0, r4, 0 bl ExpandTextCodes _081C5638: @@ -925833,20 +893987,16 @@ _081C5638: pop {r0} bx r0 .align 2, 0 -_081C5660: .4byte 0x02021cc4 -_081C5664: .4byte 0x085e91b0 -_081C5668: .4byte 0x0203cf30 -_081C566C: .4byte 0x02021fc4 -_081C5670: .4byte 0x085e91c0 + .pool thumb_func_end sub_81C55D8 thumb_func_start sub_81C5674 sub_81C5674: @ 81C5674 push {r4,lr} sub sp, 0x10 - ldr r4, _081C56BC + ldr r4, =0x0203cf2c ldr r1, [r4] - ldr r2, _081C56C0 + ldr r2, =0x00000816 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF @@ -925859,10 +894009,10 @@ sub_81C5674: @ 81C5674 ldrb r1, [r1] subs r0, r1 str r0, [sp] - ldr r0, _081C56C4 + ldr r0, =0x00000b5e str r0, [sp, 0x4] str r0, [sp, 0x8] - ldr r0, _081C56C8 + ldr r0, =0x0203cf38 str r0, [sp, 0xC] movs r0, 0x2 movs r1, 0xAC @@ -925870,7 +894020,7 @@ sub_81C5674: @ 81C5674 movs r3, 0x94 bl sub_81AF4A0 ldr r1, [r4] - ldr r2, _081C56C0 + ldr r2, =0x00000816 adds r1, r2 strb r0, [r1] _081C56B4: @@ -925879,25 +894029,22 @@ _081C56B4: pop {r0} bx r0 .align 2, 0 -_081C56BC: .4byte 0x0203cf2c -_081C56C0: .4byte 0x00000816 -_081C56C4: .4byte 0x00000b5e -_081C56C8: .4byte 0x0203cf38 + .pool thumb_func_end sub_81C5674 thumb_func_start sub_81C56CC sub_81C56CC: @ 81C56CC push {r4,lr} - ldr r4, _081C56F0 + ldr r4, =0x0203cf2c ldr r0, [r4] - ldr r2, _081C56F4 + ldr r2, =0x00000816 adds r1, r0, r2 ldrb r0, [r1] cmp r0, 0xFF beq _081C56EA bl sub_81AF620 ldr r0, [r4] - ldr r1, _081C56F4 + ldr r1, =0x00000816 adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -925906,14 +894053,13 @@ _081C56EA: pop {r0} bx r0 .align 2, 0 -_081C56F0: .4byte 0x0203cf2c -_081C56F4: .4byte 0x00000816 + .pool thumb_func_end sub_81C56CC thumb_func_start sub_81C56F8 sub_81C56F8: @ 81C56F8 push {r4,lr} - ldr r0, _081C5728 + ldr r0, =sub_81C5BC8 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -925921,10 +894067,10 @@ sub_81C56F8: @ 81C56F8 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081C572C + ldr r0, =0x03005e08 adds r4, r0 - ldr r0, _081C5730 - ldr r2, _081C5734 + ldr r0, =0x03006310 + ldr r2, =0x0203cf30 ldrh r1, [r2, 0x8] ldrh r2, [r2, 0x6] bl calls_per_item_funcs_in_list_outer @@ -925935,10 +894081,7 @@ sub_81C56F8: @ 81C56F8 pop {r0} bx r0 .align 2, 0 -_081C5728: .4byte sub_81C5BC8 + 1 -_081C572C: .4byte 0x03005e08 -_081C5730: .4byte 0x03006310 -_081C5734: .4byte 0x0203cf30 + .pool thumb_func_end sub_81C56F8 thumb_func_start sub_81C5738 @@ -925950,9 +894093,9 @@ sub_81C5738: @ 81C5738 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, _081C5798 + ldr r2, =0x03005d90 ldr r6, [r2] - ldr r3, _081C579C + ldr r3, =0x00000ca9 adds r2, r6, r3 ldrb r3, [r2] lsls r3, 30 @@ -925960,14 +894103,14 @@ sub_81C5738: @ 81C5738 lsls r4, r2, 2 adds r4, r2 lsls r4, 2 - ldr r2, _081C57A0 + ldr r2, =0x00000e2c adds r4, r2 adds r4, r6, r4 lsrs r3, 30 lsls r2, r3, 2 adds r2, r3 lsls r2, 1 - ldr r3, _081C57A4 + ldr r3, =0x00000e54 adds r2, r3 adds r6, r2 lsls r5, r0, 1 @@ -925992,10 +894135,7 @@ sub_81C5738: @ 81C5738 pop {r0} bx r0 .align 2, 0 -_081C5798: .4byte 0x03005d90 -_081C579C: .4byte 0x00000ca9 -_081C57A0: .4byte 0x00000e2c -_081C57A4: .4byte 0x00000e54 + .pool thumb_func_end sub_81C5738 thumb_func_start sub_81C57A8 @@ -926008,9 +894148,9 @@ sub_81C57A8: @ 81C57A8 adds r7, r4, 0 lsls r1, 24 lsrs r5, r1, 24 - ldr r0, _081C5820 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r1, _081C5824 + ldr r1, =0x00000ca9 adds r0, r3, r1 ldrb r1, [r0] lsls r1, 30 @@ -926018,14 +894158,14 @@ sub_81C57A8: @ 81C57A8 lsls r0, r2, 2 adds r0, r2 lsls r0, 2 - ldr r2, _081C5828 + ldr r2, =0x00000e2c adds r0, r2 adds r6, r3, r0 lsrs r1, 30 lsls r0, r1, 2 adds r0, r1 lsls r0, 1 - ldr r1, _081C582C + ldr r1, =0x00000e54 adds r0, r1 adds r3, r0 cmp r4, r5 @@ -926061,10 +894201,7 @@ _081C5802: blt _081C5802 b _081C5854 .align 2, 0 -_081C5820: .4byte 0x03005d90 -_081C5824: .4byte 0x00000ca9 -_081C5828: .4byte 0x00000e2c -_081C582C: .4byte 0x00000e54 + .pool _081C5830: lsls r2, r7, 16 cmp r7, r5 @@ -926107,9 +894244,9 @@ sub_81C586C: @ 81C586C mov r7, r9 mov r6, r8 push {r6,r7} - ldr r0, _081C5914 + ldr r0, =0x03005d90 ldr r3, [r0] - ldr r1, _081C5918 + ldr r1, =0x00000ca9 adds r0, r3, r1 ldrb r1, [r0] lsls r1, 30 @@ -926117,7 +894254,7 @@ sub_81C586C: @ 81C586C lsls r0, r2, 2 adds r0, r2 lsls r0, 2 - ldr r2, _081C591C + ldr r2, =0x00000e2c adds r0, r2 adds r0, r3 mov r9, r0 @@ -926125,7 +894262,7 @@ sub_81C586C: @ 81C586C lsls r0, r1, 2 adds r0, r1 lsls r0, 1 - ldr r4, _081C5920 + ldr r4, =0x00000e54 adds r0, r4 adds r3, r0 mov r8, r3 @@ -926194,18 +894331,15 @@ _081C58FE: pop {r0} bx r0 .align 2, 0 -_081C5914: .4byte 0x03005d90 -_081C5918: .4byte 0x00000ca9 -_081C591C: .4byte 0x00000e2c -_081C5920: .4byte 0x00000e54 + .pool thumb_func_end sub_81C586C thumb_func_start sub_81C5924 sub_81C5924: @ 81C5924 push {r4-r6,lr} - ldr r0, _081C5994 + ldr r0, =0x03005d90 ldr r2, [r0] - ldr r1, _081C5998 + ldr r1, =0x00000ca9 adds r0, r2, r1 ldrb r1, [r0] lsls r1, 30 @@ -926213,13 +894347,13 @@ sub_81C5924: @ 81C5924 lsls r0, r1, 2 adds r0, r1 lsls r0, 2 - ldr r1, _081C599C + ldr r1, =0x00000e2c adds r0, r1 adds r5, r2, r0 bl sub_81C586C - ldr r3, _081C59A0 + ldr r3, =0x0203cf2c ldr r0, [r3] - ldr r2, _081C59A4 + ldr r2, =0x00000821 adds r0, r2 movs r1, 0 strb r1, [r0] @@ -926229,7 +894363,7 @@ _081C5954: lsls r0, r4, 1 adds r0, r5 ldrh r0, [r0] - ldr r3, _081C59A0 + ldr r3, =0x0203cf2c cmp r0, 0 beq _081C596A ldr r1, [r6] @@ -926244,7 +894378,7 @@ _081C596A: cmp r4, 0x9 bls _081C5954 ldr r0, [r3] - ldr r2, _081C59A4 + ldr r2, =0x00000821 adds r0, r2 ldrb r1, [r0] adds r1, 0x1 @@ -926254,20 +894388,15 @@ _081C596A: ldrb r2, [r2] cmp r2, 0x8 bls _081C59AC - ldr r2, _081C59A8 + ldr r2, =0x00000822 adds r1, r0, r2 movs r0, 0x8 strb r0, [r1] b _081C59B2 .align 2, 0 -_081C5994: .4byte 0x03005d90 -_081C5998: .4byte 0x00000ca9 -_081C599C: .4byte 0x00000e2c -_081C59A0: .4byte 0x0203cf2c -_081C59A4: .4byte 0x00000821 -_081C59A8: .4byte 0x00000822 + .pool _081C59AC: - ldr r1, _081C59B8 + ldr r1, =0x00000822 adds r0, r1 strb r2, [r0] _081C59B2: @@ -926275,21 +894404,21 @@ _081C59B2: pop {r0} bx r0 .align 2, 0 -_081C59B8: .4byte 0x00000822 + .pool thumb_func_end sub_81C5924 thumb_func_start sub_81C59BC sub_81C59BC: @ 81C59BC push {r4,r5,lr} - ldr r0, _081C5A04 + ldr r0, =0x0203cf30 ldrh r1, [r0, 0x8] adds r3, r0, 0 - ldr r4, _081C5A08 + ldr r4, =0x0203cf2c cmp r1, 0 beq _081C59E4 ldrh r0, [r3, 0x8] ldr r1, [r4] - ldr r5, _081C5A0C + ldr r5, =0x00000822 adds r2, r1, r5 ldrb r2, [r2] adds r0, r2 @@ -926306,7 +894435,7 @@ _081C59E4: ldrh r0, [r2, 0x6] adds r1, r0 ldr r0, [r4] - ldr r4, _081C5A10 + ldr r4, =0x00000821 adds r0, r4 ldrb r0, [r0] cmp r1, r0 @@ -926317,10 +894446,7 @@ _081C59E4: strh r1, [r2, 0x6] b _081C5A18 .align 2, 0 -_081C5A04: .4byte 0x0203cf30 -_081C5A08: .4byte 0x0203cf2c -_081C5A0C: .4byte 0x00000822 -_081C5A10: .4byte 0x00000821 + .pool _081C5A14: subs r0, 0x1 strh r0, [r3, 0x6] @@ -926333,7 +894459,7 @@ _081C5A18: thumb_func_start sub_81C5A20 sub_81C5A20: @ 81C5A20 push {r4-r7,lr} - ldr r0, _081C5A88 + ldr r0, =0x0203cf30 ldrh r1, [r0, 0x6] adds r5, r0, 0 cmp r1, 0x4 @@ -926344,13 +894470,13 @@ sub_81C5A20: @ 81C5A20 cmp r4, r0 bgt _081C5A80 ldrh r2, [r5, 0x8] - ldr r6, _081C5A8C + ldr r6, =0x0203cf2c ldr r0, [r6] - ldr r3, _081C5A90 + ldr r3, =0x00000822 adds r1, r0, r3 ldrb r1, [r1] adds r2, r1 - ldr r7, _081C5A94 + ldr r7, =0x00000821 adds r0, r7 ldrb r0, [r0] cmp r2, r0 @@ -926372,11 +894498,11 @@ _081C5A50: bgt _081C5A80 ldrh r2, [r5, 0x8] ldr r1, [r6] - ldr r7, _081C5A90 + ldr r7, =0x00000822 adds r0, r1, r7 ldrb r0, [r0] adds r2, r0 - ldr r0, _081C5A94 + ldr r0, =0x00000821 adds r1, r0 ldrb r1, [r1] cmp r2, r1 @@ -926386,10 +894512,7 @@ _081C5A80: pop {r0} bx r0 .align 2, 0 -_081C5A88: .4byte 0x0203cf30 -_081C5A8C: .4byte 0x0203cf2c -_081C5A90: .4byte 0x00000822 -_081C5A94: .4byte 0x00000821 + .pool thumb_func_end sub_81C5A20 thumb_func_start sub_81C5A98 @@ -926440,7 +894563,7 @@ sub_81C5AB8: @ 81C5AB8 bl Window_FillPixelRect b _081C5B08 _081C5AF4: - ldr r1, _081C5B10 + ldr r1, =0x085e8d60 movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -926455,7 +894578,7 @@ _081C5B08: pop {r0} bx r0 .align 2, 0 -_081C5B10: .4byte 0x085e8d60 + .pool thumb_func_end sub_81C5AB8 thumb_func_start sub_81C5B14 @@ -926472,20 +894595,19 @@ sub_81C5B14: @ 81C5B14 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _081C5B44 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081C5B48 + ldr r1, =sub_81C5B4C + 1 str r1, [r0] add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_081C5B44: .4byte 0x03005e00 -_081C5B48: .4byte sub_81C5B4C + 1 + .pool thumb_func_end sub_81C5B14 thumb_func_start sub_81C5B4C @@ -926496,20 +894618,20 @@ sub_81C5B4C: @ 81C5B4C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C5B84 + ldr r1, =0x03005e08 adds r2, r0, r1 - ldr r0, _081C5B88 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081C5BBC ldrb r0, [r2] - ldr r4, _081C5B8C + ldr r4, =0x0203cf38 subs r2, r4, 0x2 adds r1, r4, 0 bl sub_81AE6C8 - ldr r0, _081C5B90 + ldr r0, =0x0203cf2c ldr r0, [r0] ldr r0, [r0] cmp r0, 0 @@ -926517,10 +894639,7 @@ sub_81C5B4C: @ 81C5B4C bl set_callback2 b _081C5B9E .align 2, 0 -_081C5B84: .4byte 0x03005e08 -_081C5B88: .4byte 0x02037fd4 -_081C5B8C: .4byte 0x0203cf38 -_081C5B90: .4byte 0x0203cf2c + .pool _081C5B94: adds r0, r4, 0 subs r0, 0x8 @@ -926531,7 +894650,7 @@ _081C5B9E: bl reset_all_obj_data bl gpu_pal_allocator_reset bl Window_FreeMemory - ldr r0, _081C5BC4 + ldr r0, =0x0203cf2c ldr r0, [r0] bl free adds r0, r5, 0 @@ -926541,7 +894660,7 @@ _081C5BBC: pop {r0} bx r0 .align 2, 0 -_081C5BC4: .4byte 0x0203cf2c + .pool thumb_func_end sub_81C5B4C thumb_func_start sub_81C5BC8 @@ -926554,7 +894673,7 @@ sub_81C5BC8: @ 81C5BC8 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C5C44 + ldr r1, =0x03005e08 adds r7, r0, r1 bl sub_81221EC lsls r0, 24 @@ -926563,7 +894682,7 @@ sub_81C5BC8: @ 81C5BC8 bne _081C5BEA b _081C5D16 _081C5BEA: - ldr r0, _081C5C48 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -926571,7 +894690,7 @@ _081C5BEA: beq _081C5BF8 b _081C5D16 _081C5BF8: - ldr r0, _081C5C4C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x4 ands r0, r1 @@ -926579,7 +894698,7 @@ _081C5BF8: lsrs r4, r0, 16 cmp r4, 0 beq _081C5C5C - ldr r4, _081C5C50 + ldr r4, =0x0203cf30 ldrb r0, [r4, 0x4] cmp r0, 0x2 bne _081C5C12 @@ -926593,9 +894712,9 @@ _081C5C12: ldrh r1, [r4, 0x8] ldrh r0, [r4, 0x6] adds r1, r0 - ldr r0, _081C5C54 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r2, _081C5C58 + ldr r2, =0x00000821 adds r0, r2 ldrb r0, [r0] subs r0, 0x1 @@ -926607,18 +894726,13 @@ _081C5C12: bl sub_81C67CC b _081C5D16 .align 2, 0 -_081C5C44: .4byte 0x03005e08 -_081C5C48: .4byte 0x02037fd4 -_081C5C4C: .4byte 0x030022c0 -_081C5C50: .4byte 0x0203cf30 -_081C5C54: .4byte 0x0203cf2c -_081C5C58: .4byte 0x00000821 + .pool _081C5C5C: ldrb r0, [r7] bl sub_81AE604 adds r6, r0, 0 ldrb r0, [r7] - ldr r1, _081C5C84 + ldr r1, =0x0203cf38 mov r8, r1 mov r2, r8 subs r2, 0x2 @@ -926632,26 +894746,26 @@ _081C5C5C: bne _081C5CA0 b _081C5D16 .align 2, 0 -_081C5C84: .4byte 0x0203cf38 + .pool _081C5C88: movs r0, 0x5 bl audio_play - ldr r0, _081C5C9C + ldr r0, =0x0203ce7c strh r4, [r0] adds r0, r5, 0 bl sub_81C5B14 b _081C5D16 .align 2, 0 -_081C5C9C: .4byte 0x0203ce7c + .pool _081C5CA0: movs r0, 0x5 bl audio_play - ldr r2, _081C5CFC + ldr r2, =0x0203ce7c mov r12, r2 - ldr r0, _081C5D00 + ldr r0, =0x03005d90 ldr r2, [r0] lsls r3, r6, 1 - ldr r0, _081C5D04 + ldr r0, =0x00000ca9 adds r4, r2, r0 ldrb r1, [r4] lsls r1, 30 @@ -926660,7 +894774,7 @@ _081C5CA0: adds r0, r1 lsls r0, 2 adds r3, r0 - ldr r1, _081C5D08 + ldr r1, =0x00000e2c adds r0, r2, r1 adds r0, r3 ldrh r0, [r0] @@ -926674,7 +894788,7 @@ _081C5CA0: adds r0, r1 lsls r0, 1 adds r0, r6, r0 - ldr r1, _081C5D0C + ldr r1, =0x00000e54 adds r2, r1 adds r2, r0 ldrb r0, [r2] @@ -926688,11 +894802,7 @@ _081C5CA0: bl sub_81C674C b _081C5D16 .align 2, 0 -_081C5CFC: .4byte 0x0203ce7c -_081C5D00: .4byte 0x03005d90 -_081C5D04: .4byte 0x00000ca9 -_081C5D08: .4byte 0x00000e2c -_081C5D0C: .4byte 0x00000e54 + .pool _081C5D10: adds r0, r5, 0 bl sub_81C5D20 @@ -926713,23 +894823,23 @@ sub_81C5D20: @ 81C5D20 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081C5D60 + ldr r0, =0x03005e08 adds r4, r0 bl sub_81C56CC ldrb r0, [r4] movs r1, 0x1 bl sub_81C5A98 - ldr r0, _081C5D64 + ldr r0, =0x0203cf30 ldrb r4, [r0, 0x4] cmp r4, 0x1 beq _081C5D74 cmp r4, 0x3 beq _081C5DC4 - ldr r0, _081C5D68 + ldr r0, =0x0203cf2c ldr r1, [r0] - ldr r0, _081C5D6C + ldr r0, =0x00000818 adds r2, r1, r0 - ldr r0, _081C5D70 + ldr r0, =0x0861f308 str r0, [r2] movs r0, 0x82 lsls r0, 4 @@ -926737,35 +894847,28 @@ sub_81C5D20: @ 81C5D20 movs r0, 0x4 b _081C5DD8 .align 2, 0 -_081C5D60: .4byte 0x03005e08 -_081C5D64: .4byte 0x0203cf30 -_081C5D68: .4byte 0x0203cf2c -_081C5D6C: .4byte 0x00000818 -_081C5D70: .4byte 0x0861f308 + .pool _081C5D74: - ldr r0, _081C5D90 + ldr r0, =0x0203ce7c ldrh r0, [r0] bl itemid_get_usage lsls r0, 24 cmp r0, 0 beq _081C5DA0 - ldr r0, _081C5D94 + ldr r0, =0x0203cf2c ldr r1, [r0] - ldr r0, _081C5D98 + ldr r0, =0x00000818 adds r2, r1, r0 - ldr r0, _081C5D9C + ldr r0, =0x0861f30e b _081C5DCE .align 2, 0 -_081C5D90: .4byte 0x0203ce7c -_081C5D94: .4byte 0x0203cf2c -_081C5D98: .4byte 0x00000818 -_081C5D9C: .4byte 0x0861f30e + .pool _081C5DA0: - ldr r0, _081C5DB8 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r1, _081C5DBC + ldr r1, =0x00000818 adds r2, r0, r1 - ldr r1, _081C5DC0 + ldr r1, =0x0861f310 str r1, [r2] movs r1, 0x82 lsls r1, 4 @@ -926773,15 +894876,13 @@ _081C5DA0: strb r4, [r0] b _081C5DDA .align 2, 0 -_081C5DB8: .4byte 0x0203cf2c -_081C5DBC: .4byte 0x00000818 -_081C5DC0: .4byte 0x0861f310 + .pool _081C5DC4: - ldr r0, _081C5E20 + ldr r0, =0x0203cf2c ldr r1, [r0] - ldr r0, _081C5E24 + ldr r0, =0x00000818 adds r2, r1, r0 - ldr r0, _081C5E28 + ldr r0, =0x0861f30c _081C5DCE: str r0, [r2] movs r0, 0x82 @@ -926791,12 +894892,12 @@ _081C5DCE: _081C5DD8: strb r0, [r1] _081C5DDA: - ldr r0, _081C5E2C + ldr r0, =0x0203ce7c ldrh r0, [r0] - ldr r1, _081C5E30 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r4, _081C5E34 - ldr r1, _081C5E38 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8dbe adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -926812,7 +894913,7 @@ _081C5DDA: movs r2, 0x3 movs r3, 0 bl sub_81C6C3C - ldr r0, _081C5E20 + ldr r0, =0x0203cf2c ldr r0, [r0] movs r1, 0x82 lsls r1, 4 @@ -926823,13 +894924,7 @@ _081C5DDA: movs r0, 0 b _081C5E42 .align 2, 0 -_081C5E20: .4byte 0x0203cf2c -_081C5E24: .4byte 0x00000818 -_081C5E28: .4byte 0x0861f30c -_081C5E2C: .4byte 0x0203ce7c -_081C5E30: .4byte 0x02021cc4 -_081C5E34: .4byte 0x02021fc4 -_081C5E38: .4byte 0x085e8dbe + .pool _081C5E3C: cmp r0, 0x2 bne _081C5E50 @@ -926849,7 +894944,7 @@ _081C5E50: movs r2, 0x2 bl sub_81C5F08 _081C5E62: - ldr r0, _081C5E80 + ldr r0, =0x0203cf2c ldr r0, [r0] movs r1, 0x82 lsls r1, 4 @@ -926857,24 +894952,22 @@ _081C5E62: ldrb r0, [r0] cmp r0, 0x4 bne _081C5E8C - ldr r0, _081C5E84 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081C5E88 + ldr r0, =sub_81C5FE4 + 1 b _081C5E98 .align 2, 0 -_081C5E80: .4byte 0x0203cf2c -_081C5E84: .4byte 0x03005e00 -_081C5E88: .4byte sub_81C5FE4 + 1 + .pool _081C5E8C: - ldr r0, _081C5EA4 + ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 - ldr r0, _081C5EA8 + ldr r0, =sub_81C5F68 + 1 _081C5E98: str r0, [r1] add sp, 0x10 @@ -926882,8 +894975,7 @@ _081C5E98: pop {r0} bx r0 .align 2, 0 -_081C5EA4: .4byte 0x03005e00 -_081C5EA8: .4byte sub_81C5F68 + 1 + .pool thumb_func_end sub_81C5D20 thumb_func_start sub_81C5EAC @@ -926897,16 +894989,16 @@ sub_81C5EAC: @ 81C5EAC str r0, [sp] movs r0, 0x10 str r0, [sp, 0x4] - ldr r6, _081C5EFC + ldr r6, =0x0203cf2c ldr r1, [r6] movs r5, 0x82 lsls r5, 4 adds r0, r1, r5 ldrb r0, [r0] str r0, [sp, 0x8] - ldr r0, _081C5F00 + ldr r0, =0x0861f2d8 str r0, [sp, 0xC] - ldr r0, _081C5F04 + ldr r0, =0x00000818 adds r1, r0 ldr r0, [r1] str r0, [sp, 0x10] @@ -926926,9 +895018,7 @@ sub_81C5EAC: @ 81C5EAC pop {r0} bx r0 .align 2, 0 -_081C5EFC: .4byte 0x0203cf2c -_081C5F00: .4byte 0x0861f2d8 -_081C5F04: .4byte 0x00000818 + .pool thumb_func_end sub_81C5EAC thumb_func_start sub_81C5F08 @@ -926948,11 +895038,11 @@ sub_81C5F08: @ 81C5F08 str r0, [sp] str r5, [sp, 0x4] str r6, [sp, 0x8] - ldr r0, _081C5F5C + ldr r0, =0x0861f2d8 str r0, [sp, 0xC] - ldr r0, _081C5F60 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r1, _081C5F64 + ldr r1, =0x00000818 adds r0, r1 ldr r0, [r0] str r0, [sp, 0x10] @@ -926973,9 +895063,7 @@ sub_81C5F08: @ 81C5F08 pop {r0} bx r0 .align 2, 0 -_081C5F5C: .4byte 0x0861f2d8 -_081C5F60: .4byte 0x0203cf2c -_081C5F64: .4byte 0x00000818 + .pool thumb_func_end sub_81C5F08 thumb_func_start sub_81C5F68 @@ -927001,20 +895089,20 @@ sub_81C5F68: @ 81C5F68 bne _081C5FA8 movs r0, 0x5 bl audio_play - ldr r0, _081C5FA4 + ldr r0, =0x0861f2d8 ldr r1, [r0, 0x1C] adds r0, r5, 0 bl _call_via_r1 b _081C5FD0 .align 2, 0 -_081C5FA4: .4byte 0x0861f2d8 + .pool _081C5FA8: movs r0, 0x5 bl audio_play - ldr r1, _081C5FD8 - ldr r0, _081C5FDC + ldr r1, =0x0861f2d8 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r2, _081C5FE0 + ldr r2, =0x00000818 adds r0, r2 ldr r0, [r0] adds r0, r4 @@ -927032,9 +895120,7 @@ _081C5FD0: pop {r0} bx r0 .align 2, 0 -_081C5FD8: .4byte 0x0861f2d8 -_081C5FDC: .4byte 0x0203cf2c -_081C5FE0: .4byte 0x00000818 + .pool thumb_func_end sub_81C5F68 thumb_func_start sub_81C5FE4 @@ -927052,7 +895138,7 @@ _081C5FF8: bl GetMenuCursorPos lsls r0, 24 lsrs r4, r0, 24 - ldr r5, _081C603C + ldr r5, =0x030022c0 ldrh r1, [r5, 0x2E] movs r0, 0x40 ands r0, r1 @@ -927081,7 +895167,7 @@ _081C6028: bl sub_8199134 b _081C6160 .align 2, 0 -_081C603C: .4byte 0x030022c0 + .pool _081C6040: movs r0, 0x80 ands r0, r1 @@ -927089,7 +895175,7 @@ _081C6040: beq _081C6084 lsls r0, r4, 24 asrs r1, r0, 24 - ldr r0, _081C6080 + ldr r0, =0x0203cf2c ldr r0, [r0] movs r2, 0x82 lsls r2, 4 @@ -927114,7 +895200,7 @@ _081C6060: bl sub_8199134 b _081C6160 .align 2, 0 -_081C6080: .4byte 0x0203cf2c + .pool _081C6084: movs r0, 0x20 ands r0, r1 @@ -927184,12 +895270,12 @@ _081C6102: beq _081C6148 movs r0, 0x5 bl audio_play - ldr r2, _081C613C - ldr r0, _081C6140 + ldr r2, =0x0861f2d8 + ldr r0, =0x0203cf2c ldr r0, [r0] lsls r1, r4, 24 asrs r1, 24 - ldr r3, _081C6144 + ldr r3, =0x00000818 adds r0, r3 ldr r0, [r0] adds r0, r1 @@ -927204,9 +895290,7 @@ _081C6102: bl _call_via_r1 b _081C6160 .align 2, 0 -_081C613C: .4byte 0x0861f2d8 -_081C6140: .4byte 0x0203cf2c -_081C6144: .4byte 0x00000818 + .pool _081C6148: movs r0, 0x2 ands r0, r1 @@ -927214,7 +895298,7 @@ _081C6148: beq _081C6160 movs r0, 0x5 bl audio_play - ldr r0, _081C6168 + ldr r0, =0x0861f2d8 ldr r1, [r0, 0x1C] adds r0, r6, 0 bl _call_via_r1 @@ -927223,7 +895307,7 @@ _081C6160: pop {r0} bx r0 .align 2, 0 -_081C6168: .4byte 0x0861f2d8 + .pool thumb_func_end sub_81C5FE4 thumb_func_start sub_81C616C @@ -927233,7 +895317,7 @@ sub_81C616C: @ 81C616C asrs r1, r0, 24 cmp r1, 0 blt _081C61A0 - ldr r0, _081C6198 + ldr r0, =0x0203cf2c ldr r2, [r0] movs r3, 0x82 lsls r3, 4 @@ -927241,7 +895325,7 @@ sub_81C616C: @ 81C616C ldrb r0, [r0] cmp r1, r0 bgt _081C61A0 - ldr r3, _081C619C + ldr r3, =0x00000818 adds r0, r2, r3 ldr r0, [r0] adds r0, r1 @@ -927251,8 +895335,7 @@ sub_81C616C: @ 81C616C movs r0, 0x1 b _081C61A2 .align 2, 0 -_081C6198: .4byte 0x0203cf2c -_081C619C: .4byte 0x00000818 + .pool _081C61A0: movs r0, 0 _081C61A2: @@ -927263,7 +895346,7 @@ _081C61A2: thumb_func_start sub_81C61A8 sub_81C61A8: @ 81C61A8 push {lr} - ldr r0, _081C61C4 + ldr r0, =0x0203cf2c ldr r0, [r0] movs r1, 0x82 lsls r1, 4 @@ -927275,7 +895358,7 @@ sub_81C61A8: @ 81C61A8 bl sub_81C6D6C b _081C61DA .align 2, 0 -_081C61C4: .4byte 0x0203cf2c + .pool _081C61C8: cmp r0, 0x2 bne _081C61D4 @@ -927295,7 +895378,7 @@ sub_81C61E0: @ 81C61E0 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _081C621C + ldr r4, =0x0203ce7c ldrh r0, [r4] bl itemid_get_pocket_number lsls r0, 24 @@ -927314,15 +895397,13 @@ sub_81C61E0: @ 81C61E0 bne _081C6228 _081C620C: bl sub_81C61A8 - ldr r1, _081C6220 - ldr r2, _081C6224 + ldr r1, =0x085e8f31 + ldr r2, =sub_81C6714 + 1 adds r0, r5, 0 bl sub_81C6DD8 b _081C6252 .align 2, 0 -_081C621C: .4byte 0x0203ce7c -_081C6220: .4byte 0x085e8f31 -_081C6224: .4byte sub_81C6714 + 1 + .pool _081C6228: ldrh r0, [r4] bl itemid_get_overworld_function @@ -927354,7 +895435,7 @@ sub_81C6258: @ 81C6258 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081C6298 + ldr r0, =0x03005e08 adds r4, r0 bl sub_81C61A8 movs r1, 0x2 @@ -927373,7 +895454,7 @@ sub_81C6258: @ 81C6258 pop {r0} bx r0 .align 2, 0 -_081C6298: .4byte 0x03005e08 + .pool thumb_func_end sub_81C6258 thumb_func_start sub_81C629C @@ -927383,19 +895464,18 @@ sub_81C629C: @ 81C629C lsls r4, 24 lsrs r4, 24 bl sub_81C5674 - ldr r1, _081C62BC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081C62C0 + ldr r1, =sub_81C5BC8 + 1 str r1, [r0] pop {r4} pop {r0} bx r0 .align 2, 0 -_081C62BC: .4byte 0x03005e00 -_081C62C0: .4byte sub_81C5BC8 + 1 + .pool thumb_func_end sub_81C629C thumb_func_start sub_81C62C4 @@ -927407,7 +895487,7 @@ sub_81C62C4: @ 81C62C4 lsls r0, r5, 2 adds r0, r5 lsls r6, r0, 3 - ldr r7, _081C62F0 + ldr r7, =0x03005e08 adds r4, r6, r7 bl sub_81C61A8 movs r0, 0x1 @@ -927420,14 +895500,14 @@ sub_81C62C4: @ 81C62C4 bl sub_81C6350 b _081C6334 .align 2, 0 -_081C62F0: .4byte 0x03005e08 + .pool _081C62F4: - ldr r0, _081C633C + ldr r0, =0x0203ce7c ldrh r0, [r0] - ldr r1, _081C6340 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r4, _081C6344 - ldr r1, _081C6348 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8ee0 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -927447,7 +895527,7 @@ _081C62F4: adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, _081C634C + ldr r1, =sub_81C64B4 + 1 str r1, [r0] _081C6334: add sp, 0x10 @@ -927455,11 +895535,7 @@ _081C6334: pop {r0} bx r0 .align 2, 0 -_081C633C: .4byte 0x0203ce7c -_081C6340: .4byte 0x02021cc4 -_081C6344: .4byte 0x02021fc4 -_081C6348: .4byte 0x085e8ee0 -_081C634C: .4byte sub_81C64B4 + 1 + .pool thumb_func_end sub_81C62C4 thumb_func_start sub_81C6350 @@ -927472,20 +895548,20 @@ sub_81C6350: @ 81C6350 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081C63B4 + ldr r0, =0x03005e08 adds r4, r0 - ldr r0, _081C63B8 + ldr r0, =0x0203ce7c ldrh r0, [r0] - ldr r1, _081C63BC + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _081C63C0 + ldr r0, =0x02021dc4 movs r2, 0x10 ldrsh r1, [r4, r2] movs r2, 0 movs r3, 0x2 bl decimal_int_to_string - ldr r4, _081C63C4 - ldr r1, _081C63C8 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8f0e adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -927501,7 +895577,7 @@ sub_81C6350: @ 81C6350 movs r2, 0x3 movs r3, 0 bl sub_81C6C3C - ldr r1, _081C63CC + ldr r1, =0x0861f314 adds r0, r5, 0 bl sub_81C6DAC add sp, 0x10 @@ -927509,13 +895585,7 @@ sub_81C6350: @ 81C6350 pop {r0} bx r0 .align 2, 0 -_081C63B4: .4byte 0x03005e08 -_081C63B8: .4byte 0x0203ce7c -_081C63BC: .4byte 0x02021cc4 -_081C63C0: .4byte 0x02021dc4 -_081C63C4: .4byte 0x02021fc4 -_081C63C8: .4byte 0x085e8f0e -_081C63CC: .4byte 0x0861f314 + .pool thumb_func_end sub_81C6350 thumb_func_start sub_81C63D0 @@ -927527,7 +895597,7 @@ sub_81C63D0: @ 81C63D0 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081C6400 + ldr r0, =0x03005e08 adds r4, r0 movs r1, 0x2 ldrsh r0, [r4, r1] @@ -927541,20 +895611,20 @@ sub_81C63D0: @ 81C63D0 pop {r0} bx r0 .align 2, 0 -_081C6400: .4byte 0x03005e08 + .pool thumb_func_end sub_81C63D0 thumb_func_start sub_81C6404 sub_81C6404: @ 81C6404 push {r4,lr} sub sp, 0xC - ldr r0, _081C6450 + ldr r0, =0x02021cc4 movs r1, 0x1 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r4, _081C6454 - ldr r1, _081C6458 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8da0 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x3 @@ -927580,9 +895650,7 @@ sub_81C6404: @ 81C6404 pop {r0} bx r0 .align 2, 0 -_081C6450: .4byte 0x02021cc4 -_081C6454: .4byte 0x02021fc4 -_081C6458: .4byte 0x085e8da0 + .pool thumb_func_end sub_81C6404 thumb_func_start sub_81C645C @@ -927590,14 +895658,14 @@ sub_81C645C: @ 81C645C push {r4,lr} sub sp, 0xC adds r1, r0, 0 - ldr r0, _081C64A8 + ldr r0, =0x02021cc4 lsls r1, 16 asrs r1, 16 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string - ldr r4, _081C64AC - ldr r1, _081C64B0 + ldr r4, =0x02021fc4 + ldr r1, =0x085e8da0 adds r0, r4, 0 bl ExpandTextCodes movs r0, 0x1 @@ -927621,9 +895689,7 @@ sub_81C645C: @ 81C645C pop {r0} bx r0 .align 2, 0 -_081C64A8: .4byte 0x02021cc4 -_081C64AC: .4byte 0x02021fc4 -_081C64B0: .4byte 0x085e8da0 + .pool thumb_func_end sub_81C645C thumb_func_start sub_81C64B4 @@ -927635,7 +895701,7 @@ sub_81C64B4: @ 81C64B4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C64E4 + ldr r1, =0x03005e08 adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x10 @@ -927650,9 +895716,9 @@ sub_81C64B4: @ 81C64B4 bl sub_81C645C b _081C6544 .align 2, 0 -_081C64E4: .4byte 0x03005e08 + .pool _081C64E8: - ldr r0, _081C6518 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -927671,7 +895737,7 @@ _081C64E8: bl sub_81C6350 b _081C6544 .align 2, 0 -_081C6518: .4byte 0x030022c0 + .pool _081C651C: movs r0, 0x2 ands r0, r1 @@ -927703,20 +895769,20 @@ sub_81C654C: @ 81C654C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _081C65B0 + ldr r5, =0x03005e08 adds r6, r4, r5 - ldr r0, _081C65B4 + ldr r0, =0x0203ce7c ldrh r0, [r0] - ldr r1, _081C65B8 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r0, _081C65BC + ldr r0, =0x02021dc4 movs r2, 0x10 ldrsh r1, [r6, r2] movs r2, 0 movs r3, 0x2 bl decimal_int_to_string - ldr r6, _081C65C0 - ldr r1, _081C65C4 + ldr r6, =0x02021fc4 + ldr r1, =0x085e8ef9 adds r0, r6, 0 bl ExpandTextCodes movs r0, 0x1 @@ -927734,20 +895800,14 @@ sub_81C654C: @ 81C654C bl sub_81C6C3C subs r5, 0x8 adds r4, r5 - ldr r0, _081C65C8 + ldr r0, =sub_81C65CC + 1 str r0, [r4] add sp, 0x10 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081C65B0: .4byte 0x03005e08 -_081C65B4: .4byte 0x0203ce7c -_081C65B8: .4byte 0x02021cc4 -_081C65BC: .4byte 0x02021dc4 -_081C65C0: .4byte 0x02021fc4 -_081C65C4: .4byte 0x085e8ef9 -_081C65C8: .4byte sub_81C65CC + 1 + .pool thumb_func_end sub_81C654C thumb_func_start sub_81C65CC @@ -927758,11 +895818,11 @@ sub_81C65CC: @ 81C65CC lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C6634 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r6, _081C6638 + ldr r6, =0x0203cf38 subs r7, r6, 0x2 - ldr r0, _081C663C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -927770,7 +895830,7 @@ sub_81C65CC: @ 81C65CC beq _081C662E movs r0, 0x5 bl audio_play - ldr r0, _081C6640 + ldr r0, =0x0203ce7c ldrh r0, [r0] ldrh r1, [r4, 0x10] bl sub_80D7334 @@ -927781,7 +895841,7 @@ sub_81C65CC: @ 81C65CC bl sub_81C5924 bl sub_81C59BC bl sub_81C5314 - ldr r0, _081C6644 + ldr r0, =0x03006310 ldrh r1, [r6] ldrh r2, [r7] bl calls_per_item_funcs_in_list_outer @@ -927797,11 +895857,7 @@ _081C662E: pop {r0} bx r0 .align 2, 0 -_081C6634: .4byte 0x03005e08 -_081C6638: .4byte 0x0203cf38 -_081C663C: .4byte 0x030022c0 -_081C6640: .4byte 0x0203ce7c -_081C6644: .4byte 0x03006310 + .pool thumb_func_end sub_81C65CC thumb_func_start sub_81C6648 @@ -927811,38 +895867,35 @@ sub_81C6648: @ 81C6648 lsrs r4, r0, 24 adds r6, r4, 0 bl sub_81C61A8 - ldr r5, _081C6670 + ldr r5, =0x0203ce7c ldrh r0, [r5] bl itemid_is_mail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _081C667C - ldr r1, _081C6674 - ldr r2, _081C6678 + ldr r1, =0x085e8dce + ldr r2, =sub_81C66EC + 1 adds r0, r4, 0 bl sub_81C6DD8 b _081C66A6 .align 2, 0 -_081C6670: .4byte 0x0203ce7c -_081C6674: .4byte 0x085e8dce -_081C6678: .4byte sub_81C66EC + 1 + .pool _081C667C: ldrh r0, [r5] bl itemid_is_unique lsls r0, 24 cmp r0, 0 bne _081C66A0 - ldr r0, _081C6698 + ldr r0, =0x0203cf2c ldr r1, [r0] - ldr r0, _081C669C + ldr r0, =sub_81B7F60 + 1 str r0, [r1] adds r0, r4, 0 bl sub_81C5B14 b _081C66A6 .align 2, 0 -_081C6698: .4byte 0x0203cf2c -_081C669C: .4byte sub_81B7F60 + 1 + .pool _081C66A0: adds r0, r6, 0 bl sub_81C66AC @@ -927858,15 +895911,15 @@ sub_81C66AC: @ 81C66AC adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081C66D8 + ldr r0, =0x0203ce7c ldrh r0, [r0] - ldr r1, _081C66DC + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r5, _081C66E0 - ldr r1, _081C66E4 + ldr r5, =0x02021fc4 + ldr r1, =0x085e8e11 adds r0, r5, 0 bl ExpandTextCodes - ldr r2, _081C66E8 + ldr r2, =sub_81C66EC + 1 adds r0, r4, 0 adds r1, r5, 0 bl sub_81C6DD8 @@ -927874,11 +895927,7 @@ sub_81C66AC: @ 81C66AC pop {r0} bx r0 .align 2, 0 -_081C66D8: .4byte 0x0203ce7c -_081C66DC: .4byte 0x02021cc4 -_081C66E0: .4byte 0x02021fc4 -_081C66E4: .4byte 0x085e8e11 -_081C66E8: .4byte sub_81C66EC + 1 + .pool thumb_func_end sub_81C66AC thumb_func_start sub_81C66EC @@ -927886,7 +895935,7 @@ sub_81C66EC: @ 81C66EC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081C6710 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -927901,7 +895950,7 @@ _081C670A: pop {r0} bx r0 .align 2, 0 -_081C6710: .4byte 0x030022c0 + .pool thumb_func_end sub_81C66EC thumb_func_start sub_81C6714 @@ -927913,7 +895962,7 @@ sub_81C6714: @ 81C6714 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 - ldr r0, _081C6748 + ldr r0, =0x03005e08 adds r4, r0 bl sub_81C6E1C movs r1, 0x2 @@ -927928,7 +895977,7 @@ sub_81C6714: @ 81C6714 pop {r0} bx r0 .align 2, 0 -_081C6748: .4byte 0x03005e08 + .pool thumb_func_end sub_81C6714 thumb_func_start sub_81C674C @@ -927937,21 +895986,19 @@ sub_81C674C: @ 81C674C lsls r0, 24 lsrs r4, r0, 24 adds r6, r4, 0 - ldr r5, _081C6770 + ldr r5, =0x0203ce7c ldrh r0, [r5] bl itemid_80BF6D8_mail_related lsls r0, 24 cmp r0, 0 bne _081C677C - ldr r1, _081C6774 - ldr r2, _081C6778 + ldr r1, =0x085e8dce + ldr r2, =sub_81C66EC + 1 adds r0, r4, 0 bl sub_81C6DD8 b _081C6796 .align 2, 0 -_081C6770: .4byte 0x0203ce7c -_081C6774: .4byte 0x085e8dce -_081C6778: .4byte sub_81C66EC + 1 + .pool _081C677C: ldrh r0, [r5] bl itemid_is_unique @@ -927975,7 +896022,7 @@ sub_81C679C: @ 81C679C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r4, _081C67C8 + ldr r4, =0x0203ce7c ldrh r0, [r4] bl itemid_get_battle_function cmp r0, 0 @@ -927991,7 +896038,7 @@ _081C67C0: pop {r0} bx r0 .align 2, 0 -_081C67C8: .4byte 0x0203ce7c + .pool thumb_func_end sub_81C679C thumb_func_start sub_81C67CC @@ -928006,17 +896053,17 @@ sub_81C67CC: @ 81C67CC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081C6884 + ldr r0, =0x03005e08 mov r9, r0 adds r5, r4, r0 - ldr r0, _081C6888 + ldr r0, =0x0203cf30 ldrh r1, [r0, 0x6] ldrh r0, [r0, 0x8] adds r1, r0 strh r1, [r5, 0x2] - ldr r0, _081C688C + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r2, _081C6890 + ldr r2, =0x00000814 adds r0, r2 movs r2, 0 mov r8, r2 @@ -928025,12 +896072,12 @@ sub_81C67CC: @ 81C67CC movs r1, 0x10 movs r2, 0x1 bl sub_81AF15C - ldr r0, _081C6894 + ldr r0, =0x03005d90 ldr r3, [r0] movs r0, 0x2 ldrsh r2, [r5, r0] lsls r2, 1 - ldr r1, _081C6898 + ldr r1, =0x00000ca9 adds r0, r3, r1 ldrb r1, [r0] lsls r1, 30 @@ -928039,14 +896086,14 @@ sub_81C67CC: @ 81C67CC adds r0, r1 lsls r0, 2 adds r2, r0 - ldr r0, _081C689C + ldr r0, =0x00000e2c adds r3, r0 adds r3, r2 ldrh r0, [r3] - ldr r1, _081C68A0 + ldr r1, =0x02021cc4 bl itemid_get_name - ldr r6, _081C68A4 - ldr r1, _081C68A8 + ldr r6, =0x02021fc4 + ldr r1, =0x085e8dfe adds r0, r6, 0 bl ExpandTextCodes movs r0, 0x1 @@ -928071,7 +896118,7 @@ sub_81C67CC: @ 81C67CC negs r2, r2 add r9, r2 add r4, r9 - ldr r0, _081C68AC + ldr r0, =sub_81C68B0 + 1 str r0, [r4] add sp, 0x10 pop {r3,r4} @@ -928081,17 +896128,7 @@ sub_81C67CC: @ 81C67CC pop {r0} bx r0 .align 2, 0 -_081C6884: .4byte 0x03005e08 -_081C6888: .4byte 0x0203cf30 -_081C688C: .4byte 0x0203cf2c -_081C6890: .4byte 0x00000814 -_081C6894: .4byte 0x03005d90 -_081C6898: .4byte 0x00000ca9 -_081C689C: .4byte 0x00000e2c -_081C68A0: .4byte 0x02021cc4 -_081C68A4: .4byte 0x02021fc4 -_081C68A8: .4byte 0x085e8dfe -_081C68AC: .4byte sub_81C68B0 + 1 + .pool thumb_func_end sub_81C67CC thumb_func_start sub_81C68B0 @@ -928102,14 +896139,14 @@ sub_81C68B0: @ 81C68B0 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C68EC + ldr r1, =0x03005e08 adds r4, r0, r1 bl sub_81221EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 beq _081C695C - ldr r7, _081C68F0 + ldr r7, =0x030022c0 ldrh r1, [r7, 0x2E] movs r0, 0x4 ands r0, r1 @@ -928118,20 +896155,18 @@ sub_81C68B0: @ 81C68B0 movs r0, 0x5 bl audio_play ldrb r0, [r4] - ldr r1, _081C68F4 + ldr r1, =0x0203cf38 subs r2, r1, 0x2 bl get_coro_args_x18_x1A b _081C6940 .align 2, 0 -_081C68EC: .4byte 0x03005e08 -_081C68F0: .4byte 0x030022c0 -_081C68F4: .4byte 0x0203cf38 + .pool _081C68F8: ldrb r0, [r4] bl sub_81AE604 adds r6, r0, 0 ldrb r0, [r4] - ldr r4, _081C692C + ldr r4, =0x0203cf38 subs r2, r4, 0x2 adds r1, r4, 0 bl get_coro_args_x18_x1A @@ -928149,7 +896184,7 @@ _081C68F8: bne _081C6950 b _081C695C .align 2, 0 -_081C692C: .4byte 0x0203cf38 + .pool _081C6930: movs r0, 0x5 bl audio_play @@ -928187,9 +896222,9 @@ sub_81C6964: @ 81C6964 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081C69A0 + ldr r1, =0x03005e08 adds r5, r0, r1 - ldr r7, _081C69A4 + ldr r7, =0x0203cf38 subs r0, r7, 0x2 mov r8, r0 ldrh r0, [r0] @@ -928209,16 +896244,15 @@ _081C6996: bl sub_81C6A14 b _081C69FC .align 2, 0 -_081C69A0: .4byte 0x03005e08 -_081C69A4: .4byte 0x0203cf38 + .pool _081C69A8: ldrb r0, [r5, 0x2] lsls r1, r4, 24 lsrs r1, 24 bl sub_81C57A8 - ldr r0, _081C6A08 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r1, _081C6A0C + ldr r1, =0x00000814 adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -928239,7 +896273,7 @@ _081C69A8: strh r0, [r1, 0x6] _081C69E0: bl sub_81C5314 - ldr r0, _081C6A10 + ldr r0, =0x03006310 ldrh r1, [r7] mov r3, r8 ldrh r2, [r3] @@ -928256,9 +896290,7 @@ _081C69FC: pop {r0} bx r0 .align 2, 0 -_081C6A08: .4byte 0x0203cf2c -_081C6A0C: .4byte 0x00000814 -_081C6A10: .4byte 0x03006310 + .pool thumb_func_end sub_81C6964 thumb_func_start sub_81C6A14 @@ -928270,13 +896302,13 @@ sub_81C6A14: @ 81C6A14 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081C6A80 + ldr r1, =0x03005e08 adds r4, r0, r1 - ldr r5, _081C6A84 + ldr r5, =0x0203cf38 subs r7, r5, 0x2 - ldr r0, _081C6A88 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r1, _081C6A8C + ldr r1, =0x00000814 adds r0, r1 movs r1, 0xFF strb r1, [r0] @@ -928300,7 +896332,7 @@ sub_81C6A14: @ 81C6A14 strh r0, [r1, 0x6] _081C6A5E: bl sub_81C5314 - ldr r0, _081C6A90 + ldr r0, =0x03006310 ldrh r1, [r5] ldrh r2, [r7] bl calls_per_item_funcs_in_list_outer @@ -928313,11 +896345,7 @@ _081C6A5E: pop {r0} bx r0 .align 2, 0 -_081C6A80: .4byte 0x03005e08 -_081C6A84: .4byte 0x0203cf38 -_081C6A88: .4byte 0x0203cf2c -_081C6A8C: .4byte 0x00000814 -_081C6A90: .4byte 0x03006310 + .pool thumb_func_end sub_81C6A14 thumb_func_start sub_81C6A94 @@ -928327,7 +896355,7 @@ sub_81C6A94: @ 81C6A94 mov r6, r8 push {r6,r7} sub sp, 0x4 - ldr r0, _081C6B70 + ldr r0, =0x020244ec mov r9, r0 movs r0, 0x14 bl malloc @@ -928335,10 +896363,10 @@ sub_81C6A94: @ 81C6A94 movs r0, 0xA bl malloc adds r5, r0, 0 - ldr r1, _081C6B74 + ldr r1, =0x03005d90 mov r8, r1 ldr r2, [r1] - ldr r4, _081C6B78 + ldr r4, =0x00000ca9 adds r0, r2, r4 ldrb r0, [r0] lsls r0, 30 @@ -928347,7 +896375,7 @@ sub_81C6A94: @ 81C6A94 adds r1, r0 lsls r1, 2 adds r1, r2 - ldr r0, _081C6B7C + ldr r0, =0x00000e2c adds r1, r0 adds r0, r7, 0 movs r2, 0x14 @@ -928362,7 +896390,7 @@ sub_81C6A94: @ 81C6A94 adds r1, r0 lsls r1, 1 adds r1, r2 - ldr r0, _081C6B80 + ldr r0, =0x00000e54 adds r1, r0 adds r0, r5, 0 movs r2, 0xA @@ -928395,7 +896423,7 @@ _081C6AF8: adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081C6B7C + ldr r1, =0x00000e2c adds r0, r1 adds r1, r7, 0 movs r2, 0x14 @@ -928410,7 +896438,7 @@ _081C6AF8: adds r0, r1 lsls r0, 1 adds r0, r2 - ldr r1, _081C6B80 + ldr r1, =0x00000e54 adds r0, r1 adds r1, r5, 0 movs r2, 0xA @@ -928419,17 +896447,12 @@ _081C6AF8: bl free adds r0, r5, 0 bl free - ldr r1, _081C6B84 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] b _081C6BC6 .align 2, 0 -_081C6B70: .4byte 0x020244ec -_081C6B74: .4byte 0x03005d90 -_081C6B78: .4byte 0x00000ca9 -_081C6B7C: .4byte 0x00000e2c -_081C6B80: .4byte 0x00000e54 -_081C6B84: .4byte 0x020375f0 + .pool _081C6B88: adds r0, r6, 0x1 lsls r0, 24 @@ -928453,7 +896476,7 @@ _081C6B9C: lsrs r6, r0, 24 cmp r6, 0x2 bls _081C6B9C - ldr r1, _081C6BD4 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] adds r0, r7, 0 @@ -928469,13 +896492,13 @@ _081C6BC6: pop {r0} bx r0 .align 2, 0 -_081C6BD4: .4byte 0x020375f0 + .pool thumb_func_end sub_81C6A94 thumb_func_start sub_81C6BD8 sub_81C6BD8: @ 81C6BD8 push {r4,lr} - ldr r0, _081C6C34 + ldr r0, =0x0861f328 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 @@ -928486,7 +896509,7 @@ sub_81C6BD8: @ 81C6BD8 movs r1, 0xA movs r2, 0xD0 bl copy_textbox_border_tile_patterns_to_vram - ldr r0, _081C6C38 + ldr r0, =0x0860f074 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -928512,8 +896535,7 @@ _081C6C04: pop {r0} bx r0 .align 2, 0 -_081C6C34: .4byte 0x0861f328 -_081C6C38: .4byte 0x0860f074 + .pool thumb_func_end sub_81C6BD8 thumb_func_start sub_81C6C3C @@ -928543,7 +896565,7 @@ sub_81C6C3C: @ 81C6C3C str r6, [sp, 0x4] lsls r4, r5, 1 adds r4, r5 - ldr r5, _081C6C90 + ldr r5, =0x0861f31c adds r4, r5 str r4, [sp, 0x8] mov r4, r8 @@ -928560,7 +896582,7 @@ sub_81C6C3C: @ 81C6C3C pop {r0} bx r0 .align 2, 0 -_081C6C90: .4byte 0x0861f31c + .pool thumb_func_end sub_81C6C3C thumb_func_start sub_81C6C94 @@ -928590,7 +896612,7 @@ sub_81C6C94: @ 81C6C94 str r6, [sp, 0x4] lsls r4, r5, 1 adds r4, r5 - ldr r5, _081C6CE8 + ldr r5, =0x0861f31c adds r4, r5 str r4, [sp, 0x8] mov r4, r8 @@ -928607,7 +896629,7 @@ sub_81C6C94: @ 81C6C94 pop {r0} bx r0 .align 2, 0 -_081C6CE8: .4byte 0x0861f31c + .pool thumb_func_end sub_81C6C94 thumb_func_start sub_81C6CEC @@ -928629,16 +896651,15 @@ sub_81C6CEC: @ 81C6CEC sub_81C6D08: @ 81C6D08 lsls r0, 24 lsrs r0, 24 - ldr r1, _081C6D1C + ldr r1, =0x0203cf2c ldr r1, [r1] - ldr r2, _081C6D20 + ldr r2, =0x0000080f adds r1, r2 adds r1, r0 ldrb r0, [r1] bx lr .align 2, 0 -_081C6D1C: .4byte 0x0203cf2c -_081C6D20: .4byte 0x0000080f + .pool thumb_func_end sub_81C6D08 thumb_func_start sub_81C6D24 @@ -928646,8 +896667,8 @@ sub_81C6D24: @ 81C6D24 push {r4,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081C6D60 - ldr r3, _081C6D64 + ldr r0, =0x0203cf2c + ldr r3, =0x0000080f adds r1, r2, r3 ldr r0, [r0] adds r4, r0, r1 @@ -928655,7 +896676,7 @@ sub_81C6D24: @ 81C6D24 cmp r0, 0xFF bne _081C6D58 lsls r0, r2, 3 - ldr r1, _081C6D68 + ldr r1, =0x0861f350 adds r0, r1 bl Window_AddFromTemplate strb r0, [r4] @@ -928672,9 +896693,7 @@ _081C6D58: pop {r1} bx r1 .align 2, 0 -_081C6D60: .4byte 0x0203cf2c -_081C6D64: .4byte 0x0000080f -_081C6D68: .4byte 0x0861f350 + .pool thumb_func_end sub_81C6D24 thumb_func_start sub_81C6D6C @@ -928682,8 +896701,8 @@ sub_81C6D6C: @ 81C6D6C push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081C6DA4 - ldr r2, _081C6DA8 + ldr r1, =0x0203cf2c + ldr r2, =0x0000080f adds r0, r2 ldr r1, [r1] adds r4, r1, r0 @@ -928705,8 +896724,7 @@ _081C6D9E: pop {r0} bx r0 .align 2, 0 -_081C6DA4: .4byte 0x0203cf2c -_081C6DA8: .4byte 0x0000080f + .pool thumb_func_end sub_81C6D6C thumb_func_start sub_81C6DAC @@ -928716,7 +896734,7 @@ sub_81C6DAC: @ 81C6DAC adds r3, r1, 0 lsls r0, 24 lsrs r0, 24 - ldr r1, _081C6DD4 + ldr r1, =0x0861f370 movs r2, 0x2 str r2, [sp] movs r2, 0x1 @@ -928731,7 +896749,7 @@ sub_81C6DAC: @ 81C6DAC pop {r0} bx r0 .align 2, 0 -_081C6DD4: .4byte 0x0861f370 + .pool thumb_func_end sub_81C6DAC thumb_func_start sub_81C6DD8 @@ -928786,15 +896804,15 @@ sub_81C6E38: @ 81C6E38 push {r4,r5,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081C6E88 - ldr r2, _081C6E8C + ldr r0, =0x0203cf2c + ldr r2, =0x00000804 adds r1, r4, r2 ldr r0, [r0] adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF beq _081C6E80 - ldr r0, _081C6E90 + ldr r0, =0x00001024 adds r4, r0 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag @@ -928804,7 +896822,7 @@ sub_81C6E38: @ 81C6E38 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _081C6E94 + ldr r4, =0x02020630 adds r0, r4 bl obj_free_rotscale_entry ldrb r1, [r5] @@ -928820,10 +896838,7 @@ _081C6E80: pop {r0} bx r0 .align 2, 0 -_081C6E88: .4byte 0x0203cf2c -_081C6E8C: .4byte 0x00000804 -_081C6E90: .4byte 0x00001024 -_081C6E94: .4byte 0x02020630 + .pool thumb_func_end sub_81C6E38 thumb_func_start sub_81C6E98 @@ -928833,22 +896848,22 @@ sub_81C6E98: @ 81C6E98 movs r0, 0x40 bl malloc adds r4, r0, 0 - ldr r0, _081C6EE0 + ldr r0, =0x08d9add0 adds r1, r4, 0 bl call_LZZUnCompWram - ldr r0, _081C6EE4 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r1, _081C6EE8 + ldr r1, =0x00000ca9 adds r0, r1 ldrb r0, [r0] lsls r0, 30 lsrs r0, 25 adds r0, r4, r0 str r0, [sp] - ldr r1, _081C6EEC + ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 - ldr r1, _081C6EF0 + ldr r1, =0x00001024 orrs r0, r1 str r0, [sp, 0x4] mov r0, sp @@ -928860,21 +896875,17 @@ sub_81C6E98: @ 81C6E98 pop {r0} bx r0 .align 2, 0 -_081C6EE0: .4byte 0x08d9add0 -_081C6EE4: .4byte 0x03005d90 -_081C6EE8: .4byte 0x00000ca9 -_081C6EEC: .4byte 0xffff0000 -_081C6EF0: .4byte 0x00001024 + .pool thumb_func_end sub_81C6E98 thumb_func_start sub_81C6EF4 sub_81C6EF4: @ 81C6EF4 push {r4,lr} - ldr r0, _081C6F14 + ldr r0, =0x0203cf2c ldr r4, [r0] - ldr r0, _081C6F18 + ldr r0, =0x00000804 adds r4, r0 - ldr r0, _081C6F1C + ldr r0, =0x0861f3d4 movs r1, 0x44 movs r2, 0x38 movs r3, 0 @@ -928884,23 +896895,21 @@ sub_81C6EF4: @ 81C6EF4 pop {r0} bx r0 .align 2, 0 -_081C6F14: .4byte 0x0203cf2c -_081C6F18: .4byte 0x00000804 -_081C6F1C: .4byte 0x0861f3d4 + .pool thumb_func_end sub_81C6EF4 thumb_func_start sub_81C6F20 sub_81C6F20: @ 81C6F20 push {r4,lr} - ldr r0, _081C6F58 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r1, _081C6F5C + ldr r1, =0x00000804 adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081C6F60 + ldr r1, =0x02020630 adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x3F @@ -928912,17 +896921,14 @@ sub_81C6F20: @ 81C6F20 adds r0, r4, 0 movs r1, 0x1 bl sub_8008258 - ldr r0, _081C6F64 + ldr r0, =sub_81C6F68 + 1 str r0, [r4, 0x1C] _081C6F50: pop {r4} pop {r0} bx r0 .align 2, 0 -_081C6F58: .4byte 0x0203cf2c -_081C6F5C: .4byte 0x00000804 -_081C6F60: .4byte 0x02020630 -_081C6F64: .4byte sub_81C6F68 + 1 + .pool thumb_func_end sub_81C6F20 thumb_func_start sub_81C6F68 @@ -928938,14 +896944,14 @@ sub_81C6F68: @ 81C6F68 adds r0, r4, 0 movs r1, 0 bl sub_8008258 - ldr r0, _081C6F8C + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _081C6F84: pop {r4} pop {r0} bx r0 .align 2, 0 -_081C6F8C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81C6F68 thumb_func_start sub_81C6F90 @@ -928955,15 +896961,15 @@ sub_81C6F90: @ 81C6F90 lsrs r6, r0, 16 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _081C6FE8 - ldr r2, _081C6FEC + ldr r0, =0x0203cf2c + ldr r2, =0x00000805 adds r1, r4, r2 ldr r0, [r0] adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF bne _081C6FE0 - ldr r0, _081C6FF0 + ldr r0, =0x00001025 adds r4, r0 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag @@ -928978,7 +896984,7 @@ sub_81C6F90: @ 81C6F90 cmp r2, 0x40 beq _081C6FE0 strb r2, [r5] - ldr r1, _081C6FF4 + ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -928992,10 +896998,7 @@ _081C6FE0: pop {r0} bx r0 .align 2, 0 -_081C6FE8: .4byte 0x0203cf2c -_081C6FEC: .4byte 0x00000805 -_081C6FF0: .4byte 0x00001025 -_081C6FF4: .4byte 0x02020630 + .pool thumb_func_end sub_81C6F90 thumb_func_start sub_81C6FF8 @@ -929014,17 +897017,16 @@ sub_81C6FF8: @ 81C6FF8 thumb_func_start sub_81C700C sub_81C700C: @ 81C700C push {lr} - ldr r0, _081C7020 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r1, _081C7024 + ldr r1, =0x00000807 adds r0, r1 movs r1, 0x8 bl sub_8122344 pop {r0} bx r0 .align 2, 0 -_081C7020: .4byte 0x0203cf2c -_081C7024: .4byte 0x00000807 + .pool thumb_func_end sub_81C700C thumb_func_start sub_81C7028 @@ -929033,17 +897035,16 @@ sub_81C7028: @ 81C7028 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 - ldr r0, _081C7044 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r1, _081C7048 + ldr r1, =0x00000807 adds r0, r1 movs r1, 0x8 bl sub_81223FC pop {r0} bx r0 .align 2, 0 -_081C7044: .4byte 0x0203cf2c -_081C7048: .4byte 0x00000807 + .pool thumb_func_end sub_81C7028 thumb_func_start sub_81C704C @@ -929051,9 +897052,9 @@ sub_81C704C: @ 81C704C push {lr} adds r3, r0, 0 lsls r3, 24 - ldr r0, _081C7070 + ldr r0, =0x0203cf2c ldr r0, [r0] - ldr r1, _081C7074 + ldr r1, =0x00000807 adds r0, r1 lsrs r3, 4 movs r1, 0x80 @@ -929066,8 +897067,7 @@ sub_81C704C: @ 81C704C pop {r0} bx r0 .align 2, 0 -_081C7070: .4byte 0x0203cf2c -_081C7074: .4byte 0x00000807 + .pool thumb_func_end sub_81C704C thumb_func_start sub_81C7078 @@ -929078,12 +897078,12 @@ sub_81C7078: @ 81C7078 bl is_c1_link_related_active cmp r0, 0 bne _081C7090 - ldr r0, _081C708C + ldr r0, =sub_81C7170 + 1 b _081C7092 .align 2, 0 -_081C708C: .4byte sub_81C7170 + 1 + .pool _081C7090: - ldr r0, _081C70CC + ldr r0, =sub_81C71E4 + 1 _081C7092: lsls r1, r4, 24 lsrs r1, 24 @@ -929094,12 +897094,12 @@ _081C7092: movs r1, 0x1 adds r2, r5, 0 bl set_word_task_arg - ldr r1, _081C70D0 + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r2, _081C70D4 + ldr r2, =0x0203cf3c ldrb r1, [r2] strh r1, [r0, 0xE] ldrb r0, [r2] @@ -929112,18 +897112,16 @@ _081C7092: pop {r1} bx r1 .align 2, 0 -_081C70CC: .4byte sub_81C71E4 + 1 -_081C70D0: .4byte 0x03005e00 -_081C70D4: .4byte 0x0203cf3c + .pool thumb_func_end sub_81C7078 thumb_func_start sub_81C70D8 sub_81C70D8: @ 81C70D8 push {lr} - ldr r1, _081C710C + ldr r1, =0x0000ffff ands r1, r0 lsrs r3, r0, 16 - ldr r2, _081C7110 + ldr r2, =0x03005e00 lsls r0, r1, 2 adds r0, r1 lsls r0, 3 @@ -929132,10 +897130,10 @@ sub_81C70D8: @ 81C70D8 cmp r0, 0 beq _081C711C ldr r2, [r1] - ldr r0, _081C7114 + ldr r0, =sub_81C7170 + 1 cmp r2, r0 beq _081C70FE - ldr r0, _081C7118 + ldr r0, =sub_81C71E4 + 1 cmp r2, r0 bne _081C711C _081C70FE: @@ -929146,10 +897144,7 @@ _081C70FE: movs r0, 0x1 b _081C711E .align 2, 0 -_081C710C: .4byte 0x0000ffff -_081C7110: .4byte 0x03005e00 -_081C7114: .4byte sub_81C7170 + 1 -_081C7118: .4byte sub_81C71E4 + 1 + .pool _081C711C: movs r0, 0 _081C711E: @@ -929162,16 +897157,16 @@ sub_81C7124: @ 81C7124 push {r4-r6,lr} adds r6, r0, 0 movs r5, 0 - ldr r4, _081C7154 + ldr r4, =0x03005e00 _081C712C: ldrb r0, [r4, 0x4] cmp r0, 0 beq _081C7160 ldr r1, [r4] - ldr r0, _081C7158 + ldr r0, =sub_81C7170 + 1 cmp r1, r0 beq _081C7140 - ldr r0, _081C715C + ldr r0, =sub_81C71E4 + 1 cmp r1, r0 bne _081C7160 _081C7140: @@ -929184,9 +897179,7 @@ _081C7140: movs r0, 0x1 b _081C716A .align 2, 0 -_081C7154: .4byte 0x03005e00 -_081C7158: .4byte sub_81C7170 + 1 -_081C715C: .4byte sub_81C71E4 + 1 + .pool _081C7160: adds r4, 0x28 adds r5, 0x1 @@ -929211,7 +897204,7 @@ sub_81C7170: @ 81C7170 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C71A4 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r7, 0 _081C718C: @@ -929221,13 +897214,12 @@ _081C718C: cmp r0, 0x4 bhi _081C71D6 lsls r0, 2 - ldr r1, _081C71A8 + ldr r1, =_081C71AC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C71A4: .4byte 0x03005e08 -_081C71A8: .4byte _081C71AC + .pool .align 2, 0 _081C71AC: .4byte _081C71C6 @@ -929276,7 +897268,7 @@ sub_81C71E4: @ 81C71E4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081C721C + ldr r1, =0x03005e08 adds r4, r0, r1 movs r1, 0 ldrsh r0, [r4, r1] @@ -929284,13 +897276,12 @@ sub_81C71E4: @ 81C71E4 cmp r0, 0x4 bhi _081C7246 lsls r0, 2 - ldr r1, _081C7220 + ldr r1, =_081C7224 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C721C: .4byte 0x03005e08 -_081C7220: .4byte _081C7224 + .pool .align 2, 0 _081C7224: .4byte _081C7238 @@ -929319,44 +897310,41 @@ _081C724A: thumb_func_start sub_81C7250 sub_81C7250: @ 81C7250 push {r4,lr} - ldr r4, _081C7268 + ldr r4, =0x0203cf40 movs r0, 0x5C bl malloc str r0, [r4] cmp r0, 0 bne _081C7270 - ldr r0, _081C726C + ldr r0, =sub_8086194 + 1 bl set_callback2 b _081C7292 .align 2, 0 -_081C7268: .4byte 0x0203cf40 -_081C726C: .4byte sub_8086194 + 1 + .pool _081C7270: bl sub_81C7360 bl clear_tasks movs r0, 0 bl SetVBlankCallback - ldr r0, _081C7298 + ldr r0, =sub_81C742C + 1 movs r1, 0 bl AddTask - ldr r0, _081C729C + ldr r0, =sub_81C7400 + 1 bl set_callback2 - ldr r0, _081C72A0 + ldr r0, =sub_81C7418 + 1 bl SetVBlankCallback _081C7292: pop {r4} pop {r0} bx r0 .align 2, 0 -_081C7298: .4byte sub_81C742C + 1 -_081C729C: .4byte sub_81C7400 + 1 -_081C72A0: .4byte sub_81C7418 + 1 + .pool thumb_func_end sub_81C7250 thumb_func_start sub_81C72A4 sub_81C72A4: @ 81C72A4 push {lr} - ldr r0, _081C72B8 + ldr r0, =sub_81C72BC + 1 bl set_callback2 movs r0, 0x1 movs r1, 0 @@ -929364,32 +897352,30 @@ sub_81C72A4: @ 81C72A4 pop {r0} bx r0 .align 2, 0 -_081C72B8: .4byte sub_81C72BC + 1 + .pool thumb_func_end sub_81C72A4 thumb_func_start sub_81C72BC sub_81C72BC: @ 81C72BC push {r4,lr} bl fade_and_return_progress_probably - ldr r0, _081C72E4 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081C7320 - ldr r4, _081C72E8 + ldr r4, =0x0203cf40 movs r0, 0x5C bl malloc str r0, [r4] cmp r0, 0 bne _081C72F0 - ldr r0, _081C72EC + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 b _081C7320 .align 2, 0 -_081C72E4: .4byte 0x02037fd4 -_081C72E8: .4byte 0x0203cf40 -_081C72EC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool _081C72F0: bl sub_81C7360 ldr r1, [r4] @@ -929400,21 +897386,19 @@ _081C72F0: bl gpu_pal_allocator_reset movs r0, 0 bl SetVBlankCallback - ldr r0, _081C7328 + ldr r0, =sub_81C742C + 1 movs r1, 0 bl AddTask - ldr r0, _081C732C + ldr r0, =sub_81C7400 + 1 bl set_callback2 - ldr r0, _081C7330 + ldr r0, =sub_81C7418 + 1 bl SetVBlankCallback _081C7320: pop {r4} pop {r0} bx r0 .align 2, 0 -_081C7328: .4byte sub_81C742C + 1 -_081C732C: .4byte sub_81C7400 + 1 -_081C7330: .4byte sub_81C7418 + 1 + .pool thumb_func_end sub_81C72BC thumb_func_start sub_81C7334 @@ -929427,7 +897411,7 @@ _081C7338: adds r4, 0x1 cmp r4, 0x12 ble _081C7338 - ldr r4, _081C735C + ldr r4, =0x0203cf40 ldr r0, [r4] bl free movs r0, 0 @@ -929437,7 +897421,7 @@ _081C7338: pop {r0} bx r0 .align 2, 0 -_081C735C: .4byte 0x0203cf40 + .pool thumb_func_end sub_81C7334 thumb_func_start sub_81C7360 @@ -929472,7 +897456,7 @@ _081C738C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081C73E8 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -929514,7 +897498,7 @@ _081C73E2: movs r0, 0x1 b _081C73FA .align 2, 0 -_081C73E8: .4byte 0x020244ec + .pool _081C73EC: adds r5, 0x1 cmp r5, 0x1D @@ -929558,7 +897542,7 @@ sub_81C742C: @ 81C742C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081C7450 + ldr r0, =0x03005e08 adds r7, r1, r0 movs r1, 0 ldrsh r0, [r7, r1] @@ -929567,13 +897551,12 @@ sub_81C742C: @ 81C742C b _081C7562 _081C7446: lsls r0, 2 - ldr r1, _081C7454 + ldr r1, =_081C7458 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C7450: .4byte 0x03005e08 -_081C7454: .4byte _081C7458 + .pool .align 2, 0 _081C7458: .4byte _081C7470 @@ -929591,11 +897574,11 @@ _081C747A: bl sub_81C76FC cmp r0, 0 bne _081C7562 - ldr r0, _081C748C + ldr r0, =0x000186a0 bl sub_81C756C b _081C74E8 .align 2, 0 -_081C748C: .4byte 0x000186a0 + .pool _081C7490: bl sub_81C786C cmp r0, 0 @@ -929609,11 +897592,11 @@ _081C749C: negs r0, r0 cmp r6, r0 beq _081C74FC - ldr r0, _081C74F0 + ldr r0, =0x0001869f cmp r6, r0 bls _081C7506 - ldr r4, _081C74F4 - ldr r5, _081C74F8 + ldr r4, =0x0861f3ec + ldr r5, =0x0203cf40 ldr r0, [r5] ldr r1, [r0, 0x4] lsls r0, r1, 3 @@ -929642,9 +897625,7 @@ _081C74E8: strh r0, [r7] b _081C7562 .align 2, 0 -_081C74F0: .4byte 0x0001869f -_081C74F4: .4byte 0x0861f3ec -_081C74F8: .4byte 0x0203cf40 + .pool _081C74FC: bl sub_81C7710 movs r0, 0x5 @@ -929672,7 +897653,7 @@ _081C752C: bl sub_81C7738 cmp r0, 0 bne _081C7562 - ldr r0, _081C7554 + ldr r0, =0x0203cf40 ldr r0, [r0] ldrh r0, [r0, 0x8] negs r4, r0 @@ -929682,30 +897663,29 @@ _081C752C: bl sub_81C7334 cmp r4, 0 beq _081C755C - ldr r0, _081C7558 + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + 1 bl set_callback2 b _081C7562 .align 2, 0 -_081C7554: .4byte 0x0203cf40 -_081C7558: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music + 1 + .pool _081C755C: - ldr r0, _081C7568 + ldr r0, =sub_8086194 + 1 bl set_callback2 _081C7562: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081C7568: .4byte sub_8086194 + 1 + .pool thumb_func_end sub_81C742C thumb_func_start sub_81C756C sub_81C756C: @ 81C756C push {r4-r6,lr} - ldr r1, _081C75C0 + ldr r1, =0xfffe7960 adds r6, r0, r1 bl sub_81C75F4 - ldr r5, _081C75C4 + ldr r5, =0x0861f3ec lsls r0, r6, 3 subs r0, r6 lsls r4, r0, 2 @@ -929730,7 +897710,7 @@ sub_81C756C: @ 81C756C adds r1, r4, r1 ldr r1, [r1] bl sub_81C7834 - ldr r0, _081C75C8 + ldr r0, =0x0203cf40 ldr r1, [r0] adds r0, r5, 0x4 adds r0, r4, r0 @@ -929740,9 +897720,7 @@ sub_81C756C: @ 81C756C movs r0, 0x1 b _081C75CE .align 2, 0 -_081C75C0: .4byte 0xfffe7960 -_081C75C4: .4byte 0x0861f3ec -_081C75C8: .4byte 0x0203cf40 + .pool _081C75CC: movs r0, 0 _081C75CE: @@ -929762,14 +897740,14 @@ sub_81C75D4: @ 81C75D4 thumb_func_start sub_81C75E0 sub_81C75E0: @ 81C75E0 push {lr} - ldr r0, _081C75F0 + ldr r0, =0x0203cf40 ldr r0, [r0] ldr r0, [r0] bl _call_via_r0 pop {r1} bx r1 .align 2, 0 -_081C75F0: .4byte 0x0203cf40 + .pool thumb_func_end sub_81C75E0 thumb_func_start sub_81C75F4 @@ -929791,12 +897769,12 @@ c3args_set_0toR1_1to0: @ 81C7600 thumb_func_start sub_81C760C sub_81C760C: @ 81C760C push {lr} - ldr r0, _081C7618 + ldr r0, =sub_81C7418 + 1 bl SetVBlankCallback pop {r0} bx r0 .align 2, 0 -_081C7618: .4byte sub_81C7418 + 1 + .pool thumb_func_end sub_81C760C thumb_func_start sub_81C761C @@ -929805,7 +897783,7 @@ sub_81C761C: @ 81C761C adds r4, r0, 0 adds r0, r1, 0 bl malloc - ldr r1, _081C7638 + ldr r1, =0x0203cf40 ldr r1, [r1] lsls r4, 2 adds r1, 0x10 @@ -929815,12 +897793,12 @@ sub_81C761C: @ 81C761C pop {r1} bx r1 .align 2, 0 -_081C7638: .4byte 0x0203cf40 + .pool thumb_func_end sub_81C761C thumb_func_start sub_81C763C sub_81C763C: @ 81C763C - ldr r1, _081C764C + ldr r1, =0x0203cf40 ldr r1, [r1] lsls r0, 2 adds r1, 0x10 @@ -929828,13 +897806,13 @@ sub_81C763C: @ 81C763C ldr r0, [r1] bx lr .align 2, 0 -_081C764C: .4byte 0x0203cf40 + .pool thumb_func_end sub_81C763C thumb_func_start sub_81C7650 sub_81C7650: @ 81C7650 push {r4,r5,lr} - ldr r5, _081C7678 + ldr r5, =0x0203cf40 ldr r1, [r5] lsls r4, r0, 2 adds r1, 0x10 @@ -929853,27 +897831,27 @@ _081C7670: pop {r0} bx r0 .align 2, 0 -_081C7678: .4byte 0x0203cf40 + .pool thumb_func_end sub_81C7650 thumb_func_start sub_81C767C sub_81C767C: @ 81C767C - ldr r0, _081C7684 + ldr r0, =0x0203cf40 ldr r0, [r0] ldrh r0, [r0, 0x8] bx lr .align 2, 0 -_081C7684: .4byte 0x0203cf40 + .pool thumb_func_end sub_81C767C thumb_func_start sub_81C7688 sub_81C7688: @ 81C7688 - ldr r1, _081C7690 + ldr r1, =0x0203cf40 ldr r1, [r1] strh r0, [r1, 0x8] bx lr .align 2, 0 -_081C7690: .4byte 0x0203cf40 + .pool thumb_func_end sub_81C7688 thumb_func_start sub_81C7694 @@ -929884,39 +897862,39 @@ sub_81C7694: @ 81C7694 bls _081C769E movs r1, 0 _081C769E: - ldr r0, _081C76A8 + ldr r0, =0x0203cf40 ldr r0, [r0] strh r1, [r0, 0xA] pop {r0} bx r0 .align 2, 0 -_081C76A8: .4byte 0x0203cf40 + .pool thumb_func_end sub_81C7694 thumb_func_start sub_81C76AC sub_81C76AC: @ 81C76AC - ldr r0, _081C76B4 + ldr r0, =0x0203cf40 ldr r0, [r0] ldrh r0, [r0, 0xA] bx lr .align 2, 0 -_081C76B4: .4byte 0x0203cf40 + .pool thumb_func_end sub_81C76AC thumb_func_start sub_81C76B8 sub_81C76B8: @ 81C76B8 - ldr r0, _081C76C0 + ldr r0, =0x0203cf40 ldr r0, [r0] ldr r0, [r0, 0xC] bx lr .align 2, 0 -_081C76C0: .4byte 0x0203cf40 + .pool thumb_func_end sub_81C76B8 thumb_func_start sub_81C76C4 sub_81C76C4: @ 81C76C4 push {r4,lr} - ldr r1, _081C76EC + ldr r1, =0x0000082c movs r0, 0 bl sub_81C761C adds r4, r0, 0 @@ -929924,15 +897902,14 @@ sub_81C76C4: @ 81C76C4 beq _081C76F4 bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, _081C76F0 + ldr r0, =sub_81C7764 + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0xC] movs r0, 0x1 b _081C76F6 .align 2, 0 -_081C76EC: .4byte 0x0000082c -_081C76F0: .4byte sub_81C7764 + 1 + .pool _081C76F4: movs r0, 0 _081C76F6: @@ -929975,7 +897952,7 @@ sub_81C7710: @ 81C7710 thumb_func_start sub_81C7738 sub_81C7738: @ 81C7738 push {lr} - ldr r0, _081C774C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -929984,7 +897961,7 @@ sub_81C7738: @ 81C7738 movs r0, 0x1 b _081C775E .align 2, 0 -_081C774C: .4byte 0x02037fd4 + .pool _081C7750: bl sub_81C99D4 bl sub_81C7C94 @@ -930020,7 +897997,7 @@ _081C7780: bl Window_FreeMemory movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081C77AC + ldr r1, =0x0861fa04 movs r0, 0 movs r2, 0x1 bl bg_vram_setup @@ -930029,12 +898006,12 @@ _081C7780: movs r0, 0x1 b _081C782C .align 2, 0 -_081C77AC: .4byte 0x0861fa04 + .pool _081C77B0: movs r0, 0 bl sub_81C763C adds r4, r0, 0 - ldr r1, _081C77F0 + ldr r1, =0x08dc7b80 movs r0, 0 str r0, [sp] movs r2, 0 @@ -930044,12 +898021,12 @@ _081C77B0: movs r0, 0 adds r1, r4, 0 bl bg_set_tilemap - ldr r1, _081C77F4 + ldr r1, =0x08dc7d84 movs r0, 0 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r0, _081C77F8 + ldr r0, =0x08dc7b60 movs r1, 0 movs r2, 0x20 bl sub_81C7944 @@ -930058,9 +898035,7 @@ _081C77B0: movs r0, 0 b _081C782C .align 2, 0 -_081C77F0: .4byte 0x08dc7b80 -_081C77F4: .4byte 0x08dc7d84 -_081C77F8: .4byte 0x08dc7b60 + .pool _081C77FC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -930140,7 +898115,7 @@ sub_81C7880: @ 81C7880 movs r0, 0 bl sub_81C763C adds r4, r0, 0 - ldr r0, _081C789C + ldr r0, =atk47_cmd47 + 1 movs r1, 0x4 bl sub_81C7078 str r0, [r4, 0xC] @@ -930148,7 +898123,7 @@ sub_81C7880: @ 81C7880 pop {r0} bx r0 .align 2, 0 -_081C789C: .4byte atk47_cmd47 + 1 + .pool thumb_func_end sub_81C7880 thumb_func_start sub_81C78A0 @@ -930157,7 +898132,7 @@ sub_81C78A0: @ 81C78A0 movs r0, 0 bl sub_81C763C adds r4, r0, 0 - ldr r0, _081C78BC + ldr r0, =sub_81C791C + 1 movs r1, 0x4 bl sub_81C7078 str r0, [r4, 0xC] @@ -930165,7 +898140,7 @@ sub_81C78A0: @ 81C78A0 pop {r0} bx r0 .align 2, 0 -_081C78BC: .4byte sub_81C791C + 1 + .pool thumb_func_end sub_81C78A0 thumb_func_start sub_81C78C0 @@ -930202,13 +898177,13 @@ _081C78EE: movs r0, 0 movs r2, 0x1 bl bg_change_y_offset - ldr r1, _081C7904 + ldr r1, =0x00001fff cmp r0, r1 bhi _081C7908 movs r0, 0x2 b _081C7916 .align 2, 0 -_081C7904: .4byte 0x00001fff + .pool _081C7908: movs r1, 0x80 lsls r1, 6 @@ -930249,7 +898224,7 @@ _081C793E: sub_81C7944: @ 81C7944 push {lr} lsls r1, 1 - ldr r3, _081C7958 + ldr r3, =0x02037714 adds r1, r3 lsls r2, 10 lsrs r2, 11 @@ -930257,7 +898232,7 @@ sub_81C7944: @ 81C7944 pop {r0} bx r0 .align 2, 0 -_081C7958: .4byte 0x02037714 + .pool thumb_func_end sub_81C7944 thumb_func_start sub_81C795C @@ -930300,9 +898275,9 @@ sub_81C7990: @ 81C7990 mov r0, sp strh r1, [r0] lsls r3, 5 - ldr r0, _081C79B4 + ldr r0, =0x02037d14 adds r3, r0 - ldr r2, _081C79B8 + ldr r2, =0x01000010 mov r0, sp adds r1, r3, 0 bl CpuSet @@ -930310,8 +898285,7 @@ sub_81C7990: @ 81C7990 pop {r0} bx r0 .align 2, 0 -_081C79B4: .4byte 0x02037d14 -_081C79B8: .4byte 0x01000010 + .pool thumb_func_end sub_81C7990 thumb_func_start sub_81C79BC @@ -930329,19 +898303,19 @@ sub_81C79BC: @ 81C79BC ldr r0, [sp, 0x2C] cmp r0, 0 bne _081C79E4 - ldr r2, _081C79E0 + ldr r2, =0x001fffff mov r1, r10 ands r2, r1 ldr r0, [sp] b _081C79F4 .align 2, 0 -_081C79E0: .4byte 0x001fffff + .pool _081C79E4: ldr r2, [sp, 0x2C] ldr r0, [sp, 0x8] cmp r2, r0 blt _081C7A00 - ldr r2, _081C79FC + ldr r2, =0x001fffff mov r1, r10 ands r2, r1 ldr r0, [sp, 0x4] @@ -930350,7 +898324,7 @@ _081C79F4: bl CpuSet b _081C7AAE .align 2, 0 -_081C79FC: .4byte 0x001fffff + .pool _081C7A00: movs r2, 0x1 negs r2, r2 @@ -930516,25 +898490,25 @@ _081C7B2C: thumb_func_start sub_81C7B34 sub_81C7B34: @ 81C7B34 - ldr r0, _081C7B3C + ldr r0, =0x02037fd4 ldrb r0, [r0, 0x7] lsrs r0, 7 bx lr .align 2, 0 -_081C7B3C: .4byte 0x02037fd4 + .pool thumb_func_end sub_81C7B34 thumb_func_start sub_81C7B40 sub_81C7B40: @ 81C7B40 push {lr} - ldr r0, _081C7B50 + ldr r0, =0xfffefffe movs r1, 0x10 movs r2, 0 bl sub_80A2A20 pop {r0} bx r0 .align 2, 0 -_081C7B50: .4byte 0xfffefffe + .pool thumb_func_end sub_81C7B40 thumb_func_start sub_81C7B54 @@ -930563,7 +898537,7 @@ sub_81C7B74: @ 81C7B74 movs r0, 0 bl sub_81C763C adds r4, r0, 0 - ldr r0, _081C7BA0 + ldr r0, =0x0861fa08 bl Window_InitFromTemplates movs r0, 0 str r0, [r4, 0x10] @@ -930577,7 +898551,7 @@ sub_81C7B74: @ 81C7B74 pop {r0} bx r0 .align 2, 0 -_081C7BA0: .4byte 0x0861fa08 + .pool thumb_func_end sub_81C7B74 thumb_func_start sub_81C7BA4 @@ -930591,11 +898565,11 @@ sub_81C7BA4: @ 81C7BA4 ldr r0, [r5, 0x10] bl sub_81C7BF8 ldrb r0, [r5, 0x10] - ldr r1, _081C7BE0 + ldr r1, =0x0861fa48 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, _081C7BE4 + ldr r1, =0x0861fa18 lsls r4, 2 adds r4, r1 ldr r1, [r4] @@ -930609,8 +898583,7 @@ sub_81C7BA4: @ 81C7BA4 pop {r0} bx r0 .align 2, 0 -_081C7BE0: .4byte 0x0861fa48 -_081C7BE4: .4byte 0x0861fa18 + .pool thumb_func_end sub_81C7BA4 thumb_func_start sub_81C7BE8 @@ -930655,7 +898628,7 @@ sub_81C7C28: @ 81C7C28 bl sub_81C763C adds r6, r0, 0 movs r5, 0 - ldr r4, _081C7C84 + ldr r4, =0x0861fa4c _081C7C36: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load @@ -930663,7 +898636,7 @@ _081C7C36: adds r5, 0x1 cmp r5, 0 beq _081C7C36 - ldr r0, _081C7C88 + ldr r0, =0x0861fa54 bl sub_81C795C movs r0, 0 bl gpu_pal_tags_index_of @@ -930676,7 +898649,7 @@ _081C7C36: negs r0, r0 bics r0, r1 str r0, [r6, 0x14] - ldr r0, _081C7C8C + ldr r0, =0x0861fb04 movs r1, 0xDC movs r2, 0xC movs r3, 0 @@ -930686,17 +898659,14 @@ _081C7C36: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _081C7C90 + ldr r0, =0x02020630 adds r1, r0 str r1, [r6, 0x18] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081C7C84: .4byte 0x0861fa4c -_081C7C88: .4byte 0x0861fa54 -_081C7C8C: .4byte 0x0861fb04 -_081C7C90: .4byte 0x02020630 + .pool thumb_func_end sub_81C7C28 thumb_func_start sub_81C7C94 @@ -930734,12 +898704,12 @@ sub_81C7CCC: @ 81C7CCC movs r0, 0 bl sub_81C763C ldr r0, [r0, 0x18] - ldr r1, _081C7CE0 + ldr r1, =nullsub_12 + 1 str r1, [r0, 0x1C] pop {r1} bx r1 .align 2, 0 -_081C7CE0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81C7CCC thumb_func_start sub_81C7CE4 @@ -930755,7 +898725,7 @@ sub_81C7CE4: @ 81C7CE4 movs r1, 0xC strh r1, [r2, 0x22] ldr r2, [r0, 0x18] - ldr r1, _081C7D24 + ldr r1, =sub_81C7CB4 + 1 str r1, [r2, 0x1C] adds r2, 0x3E ldrb r3, [r2] @@ -930776,7 +898746,7 @@ sub_81C7CE4: @ 81C7CE4 pop {r0} bx r0 .align 2, 0 -_081C7D24: .4byte sub_81C7CB4 + 1 + .pool thumb_func_end sub_81C7CE4 thumb_func_start sub_81C7D28 @@ -930787,18 +898757,18 @@ sub_81C7D28: @ 81C7D28 movs r0, 0 bl sub_81C763C adds r6, r0, 0 - ldr r0, _081C7DE4 + ldr r0, =0x0861fa64 bl gpu_tile_obj_decompress_and_load movs r0, 0x1 bl gpu_pal_alloc_new movs r0, 0x2 bl gpu_pal_alloc_new movs r5, 0 - ldr r0, _081C7DE8 + ldr r0, =0x02020630 mov r8, r0 movs r7, 0x4 _081C7D50: - ldr r0, _081C7DEC + ldr r0, =0x0861fb2c movs r1, 0 movs r2, 0 movs r3, 0x1 @@ -930821,7 +898791,7 @@ _081C7D50: ldr r1, [r2] lsls r0, r5, 6 strh r0, [r1, 0x24] - ldr r0, _081C7DF0 + ldr r0, =0x0861fb44 movs r1, 0 movs r2, 0 movs r3, 0x2 @@ -930853,10 +898823,10 @@ _081C7D50: lsls r0, r5, 3 adds r0, 0x40 adds r1, r0 - ldr r4, _081C7DF4 + ldr r4, =0x000003ff adds r0, r4, 0 ands r1, r0 - ldr r4, _081C7DF8 + ldr r4, =0xfffffc00 adds r0, r4, 0 ands r2, r0 orrs r2, r1 @@ -930870,12 +898840,7 @@ _081C7D50: pop {r0} bx r0 .align 2, 0 -_081C7DE4: .4byte 0x0861fa64 -_081C7DE8: .4byte 0x02020630 -_081C7DEC: .4byte 0x0861fb2c -_081C7DF0: .4byte 0x0861fb44 -_081C7DF4: .4byte 0x000003ff -_081C7DF8: .4byte 0xfffffc00 + .pool thumb_func_end sub_81C7D28 thumb_func_start sub_81C7DFC @@ -930913,11 +898878,11 @@ _081C7E30: ldr r3, [r5, 0x20] adds r0, 0x40 _081C7E3A: - ldr r2, _081C7E50 + ldr r2, =0x000003ff adds r1, r2, 0 ands r0, r1 ldrh r2, [r3, 0x4] - ldr r1, _081C7E54 + ldr r1, =0xfffffc00 ands r1, r2 orrs r1, r0 strh r1, [r3, 0x4] @@ -930925,8 +898890,7 @@ _081C7E3A: pop {r0} bx r0 .align 2, 0 -_081C7E50: .4byte 0x000003ff -_081C7E54: .4byte 0xfffffc00 + .pool thumb_func_end sub_81C7E14 thumb_func_start sub_81C7E58 @@ -930941,7 +898905,7 @@ sub_81C7E58: @ 81C7E58 movs r0, 0 bl sub_81C763C adds r7, r0, 0 - ldr r0, _081C7EF8 + ldr r0, =0x0861fa6c mov r1, r9 lsls r6, r1, 3 adds r6, r0 @@ -930952,7 +898916,7 @@ sub_81C7E58: @ 81C7E58 bl sub_8034974 adds r5, r0, 0 lsls r4, 5 - ldr r0, _081C7EFC + ldr r0, =0x08dc7f00 adds r4, r0 movs r0, 0x1 bl gpu_pal_tags_index_of @@ -930966,7 +898930,7 @@ sub_81C7E58: @ 81C7E58 adds r0, r4, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r4, _081C7F00 + ldr r4, =0x0201c000 mov r0, r8 adds r1, r4, 0 bl LZ77UnCompWram @@ -930975,7 +898939,7 @@ sub_81C7E58: @ 81C7E58 adds r1, r0, 0 lsls r1, 16 lsrs r1, 11 - ldr r2, _081C7F04 + ldr r2, =0x06010000 adds r1, r2 lsls r5, 16 lsrs r5, 16 @@ -930988,11 +898952,11 @@ sub_81C7E58: @ 81C7E58 ldr r3, [r7, 0x20] ldrh r1, [r6, 0x4] adds r0, r1 - ldr r2, _081C7F08 + ldr r2, =0x000003ff adds r1, r2, 0 ands r0, r1 ldrh r2, [r3, 0x4] - ldr r1, _081C7F0C + ldr r1, =0xfffffc00 ands r1, r2 orrs r1, r0 strh r1, [r3, 0x4] @@ -931004,12 +898968,7 @@ sub_81C7E58: @ 81C7E58 movs r0, 0x38 b _081C7F14 .align 2, 0 -_081C7EF8: .4byte 0x0861fa6c -_081C7EFC: .4byte 0x08dc7f00 -_081C7F00: .4byte 0x0201c000 -_081C7F04: .4byte 0x06010000 -_081C7F08: .4byte 0x000003ff -_081C7F0C: .4byte 0xfffffc00 + .pool _081C7F10: ldr r1, [r7, 0x20] movs r0, 0x40 @@ -931029,7 +898988,7 @@ sub_81C7F24: @ 81C7F24 push {r4-r6,lr} cmp r0, 0x6 bhi _081C7F8A - ldr r2, _081C7F90 + ldr r2, =0x0861fa9c lsls r1, r0, 3 adds r0, r2, 0x4 adds r0, r1, r0 @@ -931040,7 +898999,7 @@ sub_81C7F24: @ 81C7F24 bl sub_8034974 adds r5, r0, 0 lsls r4, 5 - ldr r0, _081C7F94 + ldr r0, =0x08dc7f00 adds r4, r0 movs r0, 0x2 bl gpu_pal_tags_index_of @@ -931054,7 +899013,7 @@ sub_81C7F24: @ 81C7F24 adds r0, r4, 0 movs r2, 0x20 bl gpu_pal_apply - ldr r4, _081C7F98 + ldr r4, =0x0201d000 adds r0, r6, 0 adds r1, r4, 0 bl LZ77UnCompWram @@ -931063,7 +899022,7 @@ sub_81C7F24: @ 81C7F24 adds r1, r0, 0 lsls r1, 16 lsrs r1, 11 - ldr r0, _081C7F9C + ldr r0, =0x06010800 adds r1, r0 lsls r5, 16 lsrs r5, 16 @@ -931076,10 +899035,7 @@ _081C7F8A: pop {r0} bx r0 .align 2, 0 -_081C7F90: .4byte 0x0861fa9c -_081C7F94: .4byte 0x08dc7f00 -_081C7F98: .4byte 0x0201d000 -_081C7F9C: .4byte 0x06010800 + .pool thumb_func_end sub_81C7F24 thumb_func_start sub_81C7FA0 @@ -931157,7 +899113,7 @@ sub_81C8010: @ 81C8010 adds r1, r0, 0 ldr r0, [r1, 0x1C] ldr r2, [r0, 0x1C] - ldr r0, _081C8030 + ldr r0, =nullsub_12 + 1 cmp r2, r0 bne _081C8034 ldr r0, [r1, 0x24] @@ -931167,7 +899123,7 @@ sub_81C8010: @ 81C8010 movs r0, 0 b _081C8036 .align 2, 0 -_081C8030: .4byte nullsub_12 + 1 + .pool _081C8034: movs r0, 0x1 _081C8036: @@ -931344,13 +899300,13 @@ sub_81C814C: @ 81C814C strh r0, [r4, 0x30] strh r5, [r4, 0x32] strh r6, [r4, 0x3C] - ldr r0, _081C8178 + ldr r0, =sub_81C817C + 1 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081C8178: .4byte sub_81C817C + 1 + .pool thumb_func_end sub_81C814C thumb_func_start sub_81C817C @@ -931395,13 +899351,13 @@ _081C81B6: _081C81C4: ldrh r0, [r2, 0x3C] strh r0, [r2, 0x20] - ldr r0, _081C81D0 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _081C81CC: pop {r0} bx r0 .align 2, 0 -_081C81D0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81C817C thumb_func_start sub_81C81D4 @@ -931410,13 +899366,13 @@ sub_81C81D4: @ 81C81D4 adds r6, r0, 0 adds r5, r1, 0 adds r7, r2, 0 - ldr r1, _081C8210 + ldr r1, =0x000008a4 movs r0, 0x11 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 beq _081C821C - ldr r1, _081C8214 + ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r5, 0 bl sub_81C9160 @@ -931427,15 +899383,13 @@ sub_81C81D4: @ 81C81D4 bl sub_81C91AC cmp r0, 0 beq _081C821C - ldr r0, _081C8218 + ldr r0, =sub_81C8254 + 1 movs r1, 0x6 bl sub_81C7078 movs r0, 0x1 b _081C821E .align 2, 0 -_081C8210: .4byte 0x000008a4 -_081C8214: .4byte 0x00000888 -_081C8218: .4byte sub_81C8254 + 1 + .pool _081C821C: movs r0, 0 _081C821E: @@ -931447,12 +899401,12 @@ _081C821E: thumb_func_start sub_81C8224 sub_81C8224: @ 81C8224 push {lr} - ldr r0, _081C8230 + ldr r0, =sub_81C8254 + 1 bl sub_81C7124 pop {r1} bx r1 .align 2, 0 -_081C8230: .4byte sub_81C8254 + 1 + .pool thumb_func_end sub_81C8224 thumb_func_start sub_81C8234 @@ -931485,12 +899439,12 @@ sub_81C8254: @ 81C8254 cmp r4, 0x4 bhi _081C82D6 lsls r0, r4, 2 - ldr r1, _081C8278 + ldr r1, =_081C827C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C8278: .4byte _081C827C + .pool .align 2, 0 _081C827C: .4byte _081C8290 @@ -931509,14 +899463,14 @@ _081C829A: movs r0, 0 b _081C82D8 _081C82A4: - ldr r1, _081C82B4 + ldr r1, =0x00000888 adds r0, r2, r1 adds r1, r2, 0 bl sub_81C837C movs r0, 0 b _081C82D8 .align 2, 0 -_081C82B4: .4byte 0x00000888 + .pool _081C82B8: bl sub_81C83E0 cmp r0, 0 @@ -931529,7 +899483,7 @@ _081C82C4: movs r0, 0x1 b _081C82D8 _081C82CC: - ldr r1, _081C82E0 + ldr r1, =0x00000888 adds r0, r2, r1 adds r1, r2, 0 bl sub_81C8EF8 @@ -931540,7 +899494,7 @@ _081C82D8: pop {r1} bx r1 .align 2, 0 -_081C82E0: .4byte 0x00000888 + .pool thumb_func_end sub_81C8254 thumb_func_start sub_81C82E4 @@ -931661,7 +899615,7 @@ sub_81C83AC: @ 81C83AC str r5, [r1, 0x14] ldr r0, [sp, 0xC] str r0, [r1, 0x10] - ldr r0, _081C83DC + ldr r0, =sub_81C83F0 + 1 movs r1, 0x5 bl sub_81C7078 _081C83D6: @@ -931669,18 +899623,18 @@ _081C83D6: pop {r0} bx r0 .align 2, 0 -_081C83DC: .4byte sub_81C83F0 + 1 + .pool thumb_func_end sub_81C83AC thumb_func_start sub_81C83E0 sub_81C83E0: @ 81C83E0 push {lr} - ldr r0, _081C83EC + ldr r0, =sub_81C83F0 + 1 bl sub_81C7124 pop {r1} bx r1 .align 2, 0 -_081C83EC: .4byte sub_81C83F0 + 1 + .pool thumb_func_end sub_81C83E0 thumb_func_start sub_81C83F0 @@ -931783,7 +899737,7 @@ sub_81C84A4: @ 81C84A4 push {lr} movs r0, 0x11 bl sub_81C763C - ldr r1, _081C84BC + ldr r1, =0x00000888 adds r0, r1 ldrh r1, [r0] negs r0, r1 @@ -931792,7 +899746,7 @@ sub_81C84A4: @ 81C84A4 pop {r1} bx r1 .align 2, 0 -_081C84BC: .4byte 0x00000888 + .pool thumb_func_end sub_81C84A4 thumb_func_start sub_81C84C0 @@ -931800,7 +899754,7 @@ sub_81C84C0: @ 81C84C0 push {lr} movs r0, 0x11 bl sub_81C763C - ldr r1, _081C84E4 + ldr r1, =0x00000888 adds r0, r1 movs r3, 0 ldrh r1, [r0] @@ -931815,7 +899769,7 @@ _081C84DC: pop {r1} bx r1 .align 2, 0 -_081C84E4: .4byte 0x00000888 + .pool thumb_func_end sub_81C84C0 thumb_func_start sub_81C84E8 @@ -931827,7 +899781,7 @@ sub_81C84E8: @ 81C84E8 movs r0, 0x11 bl sub_81C763C adds r7, r0, 0 - ldr r0, _081C8520 + ldr r0, =0x00000888 adds r5, r7, r0 cmp r6, 0 bge _081C8524 @@ -931848,11 +899802,11 @@ _081C850A: bl sub_81C83AC b _081C854E .align 2, 0 -_081C8520: .4byte 0x00000888 + .pool _081C8524: cmp r4, 0 beq _081C854E - ldr r2, _081C8564 + ldr r2, =0x0203cf44 ldrh r1, [r5] ldrh r0, [r5, 0x8] adds r4, r1, r0 @@ -931883,7 +899837,7 @@ _081C854E: pop {r0} bx r0 .align 2, 0 -_081C8564: .4byte 0x0203cf44 + .pool thumb_func_end sub_81C84E8 thumb_func_start sub_81C8568 @@ -931906,7 +899860,7 @@ _081C8584: _081C8586: str r0, [r4, 0x30] str r5, [r4, 0x2C] - ldr r0, _081C859C + ldr r0, =sub_81C85A0 + 1 movs r1, 0x6 bl sub_81C7078 str r0, [r4, 0x28] @@ -931914,7 +899868,7 @@ _081C8586: pop {r0} bx r0 .align 2, 0 -_081C859C: .4byte sub_81C85A0 + 1 + .pool thumb_func_end sub_81C8568 thumb_func_start sub_81C85A0 @@ -932013,12 +899967,12 @@ sub_81C8644: @ 81C8644 push {lr} movs r0, 0x11 bl sub_81C763C - ldr r1, _081C8654 + ldr r1, =0x00000888 adds r0, r1 pop {r1} bx r1 .align 2, 0 -_081C8654: .4byte 0x00000888 + .pool thumb_func_end sub_81C8644 thumb_func_start sub_81C8658 @@ -932199,11 +900153,11 @@ sub_81C877C: @ 81C877C movs r0, 0x11 bl sub_81C763C adds r4, r0, 0 - ldr r0, _081C87A4 + ldr r0, =0x0000089c adds r1, r4, r0 movs r0, 0 str r0, [r1] - ldr r0, _081C87A8 + ldr r0, =sub_81C8870 + 1 movs r1, 0x6 bl sub_81C7078 movs r1, 0x8A @@ -932214,8 +900168,7 @@ sub_81C877C: @ 81C877C pop {r0} bx r0 .align 2, 0 -_081C87A4: .4byte 0x0000089c -_081C87A8: .4byte sub_81C8870 + 1 + .pool thumb_func_end sub_81C877C thumb_func_start sub_81C87AC @@ -932227,16 +900180,16 @@ sub_81C87AC: @ 81C87AC movs r0, 0x11 bl sub_81C763C adds r5, r0, 0 - ldr r0, _081C87E4 + ldr r0, =0x00000888 adds r1, r5, r0 ldrh r0, [r1] adds r0, r4 movs r2, 0 strh r0, [r1] - ldr r1, _081C87E8 + ldr r1, =0x0000089c adds r0, r5, r1 str r2, [r0] - ldr r0, _081C87EC + ldr r0, =sub_81C8958 + 1 movs r1, 0x6 bl sub_81C7078 movs r1, 0x8A @@ -932247,9 +900200,7 @@ sub_81C87AC: @ 81C87AC pop {r0} bx r0 .align 2, 0 -_081C87E4: .4byte 0x00000888 -_081C87E8: .4byte 0x0000089c -_081C87EC: .4byte sub_81C8958 + 1 + .pool thumb_func_end sub_81C87AC thumb_func_start sub_81C87F0 @@ -932258,11 +900209,11 @@ sub_81C87F0: @ 81C87F0 movs r0, 0x11 bl sub_81C763C adds r4, r0, 0 - ldr r0, _081C8818 + ldr r0, =0x0000089c adds r1, r4, r0 movs r0, 0 str r0, [r1] - ldr r0, _081C881C + ldr r0, =sub_81C8A28 + 1 movs r1, 0x6 bl sub_81C7078 movs r1, 0x8A @@ -932273,8 +900224,7 @@ sub_81C87F0: @ 81C87F0 pop {r0} bx r0 .align 2, 0 -_081C8818: .4byte 0x0000089c -_081C881C: .4byte sub_81C8A28 + 1 + .pool thumb_func_end sub_81C87F0 thumb_func_start sub_81C8820 @@ -932297,7 +900247,7 @@ sub_81C8838: @ 81C8838 movs r0, 0x11 bl sub_81C763C adds r4, r0, 0 - ldr r0, _081C886C + ldr r0, =0x00000888 adds r2, r4, r0 ldrh r0, [r4, 0x8] ldrh r1, [r2] @@ -932316,7 +900266,7 @@ sub_81C8838: @ 81C8838 pop {r0} bx r0 .align 2, 0 -_081C886C: .4byte 0x00000888 + .pool thumb_func_end sub_81C8838 thumb_func_start sub_81C8870 @@ -932329,12 +900279,12 @@ sub_81C8870: @ 81C8870 cmp r5, 0x4 bhi _081C894C lsls r0, r5, 2 - ldr r1, _081C888C + ldr r1, =_081C8890 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C888C: .4byte _081C8890 + .pool .align 2, 0 _081C8890: .4byte _081C88A4 @@ -932347,9 +900297,9 @@ _081C88A4: movs r1, 0x1 bl sub_81C9008 _081C88AC: - ldr r0, _081C88D0 + ldr r0, =0x0000089c adds r5, r4, r0 - ldr r1, _081C88D4 + ldr r1, =0x0000088e adds r0, r4, r1 ldr r1, [r5] ldrh r0, [r0] @@ -932366,14 +900316,13 @@ _081C88CA: movs r0, 0 b _081C894E .align 2, 0 -_081C88D0: .4byte 0x0000089c -_081C88D4: .4byte 0x0000088e + .pool _081C88D8: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _081C8942 - ldr r2, _081C88F8 + ldr r2, =0x0000089c adds r0, r4, r2 subs r2, 0xC adds r1, r4, r2 @@ -932384,9 +900333,9 @@ _081C88D8: movs r0, 0x6 b _081C894E .align 2, 0 -_081C88F8: .4byte 0x0000089c + .pool _081C88FC: - ldr r0, _081C8914 + ldr r0, =0x0000088e adds r1, r4, r0 ldrh r0, [r1] cmp r0, 0 @@ -932397,13 +900346,13 @@ _081C88FC: bl sub_81C8B70 b _081C88CA .align 2, 0 -_081C8914: .4byte 0x0000088e + .pool _081C8918: bl is_dma3_queue_busy_with_gpu_copy lsls r0, 24 cmp r0, 0 bne _081C8942 - ldr r2, _081C8934 + ldr r2, =0x0000088e adds r1, r4, r2 ldrh r0, [r1] cmp r0, 0 @@ -932412,7 +900361,7 @@ _081C8918: bl sub_81C84E8 b _081C88CA .align 2, 0 -_081C8934: .4byte 0x0000088e + .pool _081C8938: bl sub_81C8630 adds r1, r0, 0 @@ -932422,7 +900371,7 @@ _081C8942: movs r0, 0x2 b _081C894E _081C8946: - ldr r2, _081C8954 + ldr r2, =0x0000088e adds r0, r4, r2 strh r1, [r0] _081C894C: @@ -932432,7 +900381,7 @@ _081C894E: pop {r1} bx r1 .align 2, 0 -_081C8954: .4byte 0x0000088e + .pool thumb_func_end sub_81C8870 thumb_func_start sub_81C8958 @@ -932452,12 +900401,12 @@ _081C8972: cmp r5, 0x7 bhi _081C8A1C lsls r0, r5, 2 - ldr r1, _081C8980 + ldr r1, =_081C8984 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C8980: .4byte _081C8984 + .pool .align 2, 0 _081C8984: .4byte _081C89A4 @@ -932469,64 +900418,64 @@ _081C8984: .4byte _081C89F6 .4byte _081C8A08 _081C89A4: - ldr r1, _081C89B0 + ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r4, 0 bl sub_81C8CB4 b _081C8A20 .align 2, 0 -_081C89B0: .4byte 0x00000888 + .pool _081C89B4: adds r0, r4, 0 movs r1, 0 bl sub_81C8DBC b _081C8A20 _081C89BE: - ldr r1, _081C89CC + ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r4, 0 movs r2, 0 bl sub_81C8E54 b _081C8A20 .align 2, 0 -_081C89CC: .4byte 0x00000888 + .pool _081C89D0: adds r0, r4, 0 movs r1, 0x1 bl sub_81C8DBC b _081C8A20 _081C89DA: - ldr r1, _081C89E8 + ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r4, 0 movs r2, 0x1 bl sub_81C8E54 b _081C8A20 .align 2, 0 -_081C89E8: .4byte 0x00000888 + .pool _081C89EC: adds r0, r4, 0 movs r1, 0x2 bl sub_81C8DBC b _081C8A20 _081C89F6: - ldr r1, _081C8A04 + ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r4, 0 movs r2, 0x2 bl sub_81C8E54 b _081C8A20 .align 2, 0 -_081C8A04: .4byte 0x00000888 + .pool _081C8A08: - ldr r1, _081C8A18 + ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r4, 0 movs r2, 0x3 bl sub_81C8E54 b _081C8A20 .align 2, 0 -_081C8A18: .4byte 0x00000888 + .pool _081C8A1C: movs r0, 0x4 b _081C8A22 @@ -932550,7 +900499,7 @@ sub_81C8A28: @ 81C8A28 movs r0, 0x11 bl sub_81C763C adds r4, r0, 0 - ldr r0, _081C8A58 + ldr r0, =0x00000888 adds r6, r4, r0 adds r2, r4, 0 cmp r5, 0x6 @@ -932558,13 +900507,12 @@ sub_81C8A28: @ 81C8A28 b _081C8B64 _081C8A4C: lsls r0, r5, 2 - ldr r1, _081C8A5C + ldr r1, =_081C8A60 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C8A58: .4byte 0x00000888 -_081C8A5C: .4byte _081C8A60 + .pool .align 2, 0 _081C8A60: .4byte _081C8A7C @@ -932581,7 +900529,7 @@ _081C8A7C: movs r0, 0 b _081C8B66 _081C8A88: - ldr r1, _081C8AAC + ldr r1, =0x0000089c adds r7, r4, r1 ldr r0, [r7] adds r1, r0, 0x1 @@ -932599,7 +900547,7 @@ _081C8AA6: movs r0, 0x2 b _081C8B66 .align 2, 0 -_081C8AAC: .4byte 0x0000089c + .pool _081C8AB0: movs r0, 0 str r0, [r7] @@ -932631,7 +900579,7 @@ _081C8AD4: movs r0, 0 b _081C8B66 _081C8AE8: - ldr r2, _081C8AF8 + ldr r2, =0x0000089c adds r0, r4, r2 ldr r0, [r0] movs r1, 0 @@ -932639,24 +900587,24 @@ _081C8AE8: movs r0, 0 b _081C8B66 .align 2, 0 -_081C8AF8: .4byte 0x0000089c + .pool _081C8AFC: bl sub_81C8630 adds r1, r0, 0 cmp r1, 0 bne _081C8AA6 - ldr r3, _081C8B10 + ldr r3, =0x0000089c adds r0, r4, r3 str r1, [r0] _081C8B0C: movs r0, 0x1 b _081C8B66 .align 2, 0 -_081C8B10: .4byte 0x0000089c + .pool _081C8B14: ldr r0, [r6, 0x10] ldrh r1, [r6] - ldr r3, _081C8B30 + ldr r3, =0x0000089c adds r2, r4, r3 ldr r2, [r2] adds r1, r2 @@ -932668,12 +900616,12 @@ _081C8B14: movs r0, 0 b _081C8B66 .align 2, 0 -_081C8B30: .4byte 0x0000089c + .pool _081C8B34: bl sub_81C83E0 cmp r0, 0 bne _081C8AA6 - ldr r0, _081C8B58 + ldr r0, =0x0000089c adds r1, r4, r0 ldr r0, [r1] adds r0, 0x1 @@ -932688,7 +900636,7 @@ _081C8B52: movs r0, 0x9 b _081C8B66 .align 2, 0 -_081C8B58: .4byte 0x0000089c + .pool _081C8B5C: adds r0, r2, 0 movs r1, 0 @@ -932727,7 +900675,7 @@ sub_81C8B70: @ 81C8B70 adds r0, r7, r6 cmp r0, 0x10 bgt _081C8BD4 - ldr r0, _081C8BCC + ldr r0, =0x11111111 str r0, [sp] adds r1, r7, 0 muls r1, r3 @@ -932735,7 +900683,7 @@ sub_81C8B70: @ 81C8B70 adds r2, r6, 0 muls r2, r3 lsrs r2, 2 - ldr r0, _081C8BD0 + ldr r0, =0x001fffff ands r2, r0 movs r0, 0x80 lsls r0, 17 @@ -932748,14 +900696,13 @@ sub_81C8B70: @ 81C8B70 bl Window_CopyToVram b _081C8C1E .align 2, 0 -_081C8BCC: .4byte 0x11111111 -_081C8BD0: .4byte 0x001fffff + .pool _081C8BD4: movs r2, 0x10 subs r2, r7 subs r0, r6, r2 mov r8, r0 - ldr r1, _081C8C5C + ldr r1, =0x11111111 str r1, [sp, 0x4] add r0, sp, 0x4 adds r1, r7, 0 @@ -932763,14 +900710,14 @@ _081C8BD4: add r1, r10 muls r2, r3 lsrs r2, 2 - ldr r5, _081C8C60 + ldr r5, =0x001fffff ands r2, r5 movs r4, 0x80 lsls r4, 17 orrs r2, r4 str r3, [sp, 0xC] bl CpuFastSet - ldr r0, _081C8C5C + ldr r0, =0x11111111 str r0, [sp, 0x8] add r0, sp, 0x8 ldr r3, [sp, 0xC] @@ -932817,8 +900764,7 @@ _081C8C40: pop {r0} bx r0 .align 2, 0 -_081C8C5C: .4byte 0x11111111 -_081C8C60: .4byte 0x001fffff + .pool thumb_func_end sub_81C8B70 thumb_func_start sub_81C8C64 @@ -932870,7 +900816,7 @@ sub_81C8CB4: @ 81C8CB4 sub sp, 0x10 adds r5, r0, 0 adds r4, r1, 0 - ldr r1, _081C8D48 + ldr r1, =0x0861fbe4 add r0, sp, 0xC movs r2, 0x3 bl memcpy @@ -932934,7 +900880,7 @@ sub_81C8CB4: @ 81C8CB4 pop {r0} bx r0 .align 2, 0 -_081C8D48: .4byte 0x0861fbe4 + .pool thumb_func_end sub_81C8CB4 thumb_func_start sub_81C8D4C @@ -933001,12 +900947,12 @@ sub_81C8DBC: @ 81C8DBC adds r6, r0, 0 mov r8, r1 add r1, sp, 0xC - ldr r0, _081C8E4C + ldr r0, =0x0861fbe8 ldm r0!, {r2-r4} stm r1!, {r2-r4} add r0, sp, 0x18 mov r9, r0 - ldr r1, _081C8E50 + ldr r1, =0x0861fbf4 movs r2, 0x3 bl memcpy ldrh r4, [r6, 0xA] @@ -933062,8 +901008,7 @@ sub_81C8DBC: @ 81C8DBC pop {r0} bx r0 .align 2, 0 -_081C8E4C: .4byte 0x0861fbe8 -_081C8E50: .4byte 0x0861fbf4 + .pool thumb_func_end sub_81C8DBC thumb_func_start sub_81C8E54 @@ -933075,7 +901020,7 @@ sub_81C8E54: @ 81C8E54 adds r7, r1, 0 adds r1, r2, 0 ldrh r3, [r7, 0xA] - ldr r2, _081C8ECC + ldr r2, =0x0861fbf7 adds r2, r1, r2 ldrb r2, [r2] adds r6, r3, r2 @@ -933126,14 +901071,14 @@ _081C8EC0: pop {r0} bx r0 .align 2, 0 -_081C8ECC: .4byte 0x0861fbf7 + .pool thumb_func_end sub_81C8E54 thumb_func_start sub_81C8ED0 sub_81C8ED0: @ 81C8ED0 push {r4,r5,lr} movs r5, 0 - ldr r4, _081C8EF0 + ldr r4, =0x0861fbfc _081C8ED6: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load @@ -933141,14 +901086,13 @@ _081C8ED6: adds r5, 0x1 cmp r5, 0 beq _081C8ED6 - ldr r0, _081C8EF4 + ldr r0, =0x0861fc04 bl sub_81C795C pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081C8EF0: .4byte 0x0861fbfc -_081C8EF4: .4byte 0x0861fc04 + .pool thumb_func_end sub_81C8ED0 thumb_func_start sub_81C8EF8 @@ -933160,7 +901104,7 @@ sub_81C8EF8: @ 81C8EF8 push {r4-r6} adds r4, r0, 0 adds r5, r1, 0 - ldr r0, _081C8FC4 + ldr r0, =0x0861fc1c ldrb r1, [r5, 0x2] lsls r1, 3 adds r1, 0x3 @@ -933174,7 +901118,7 @@ sub_81C8EF8: @ 81C8EF8 lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r1, _081C8FC8 + ldr r1, =0x02020630 mov r8, r1 add r0, r8 str r0, [r5, 0x3C] @@ -933183,7 +901127,7 @@ sub_81C8EF8: @ 81C8EF8 ldrb r0, [r5, 0x4] subs r0, 0x1 lsls r0, 2 - ldr r3, _081C8FCC + ldr r3, =0x0861fc3c mov r10, r3 adds r6, r0 ldrb r2, [r5, 0x3] @@ -933208,17 +901152,17 @@ sub_81C8EF8: @ 81C8EF8 lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x2 - ldr r0, _081C8FD0 + ldr r0, =0x000003ff mov r9, r0 mov r0, r9 ands r1, r0 - ldr r4, _081C8FD4 + ldr r4, =0xfffffc00 adds r0, r4, 0 ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] ldr r1, [r5, 0x44] - ldr r0, _081C8FD8 + ldr r0, =sub_81C90A0 + 1 str r0, [r1, 0x1C] ldrb r2, [r5, 0x3] lsls r2, 3 @@ -933243,7 +901187,7 @@ sub_81C8EF8: @ 81C8EF8 orrs r4, r0 strh r4, [r1, 0x4] ldr r1, [r5, 0x40] - ldr r0, _081C8FDC + ldr r0, =sub_81C90F4 + 1 str r0, [r1, 0x1C] pop {r3-r5} mov r8, r3 @@ -933253,13 +901197,7 @@ sub_81C8EF8: @ 81C8EF8 pop {r0} bx r0 .align 2, 0 -_081C8FC4: .4byte 0x0861fc1c -_081C8FC8: .4byte 0x02020630 -_081C8FCC: .4byte 0x0861fc3c -_081C8FD0: .4byte 0x000003ff -_081C8FD4: .4byte 0xfffffc00 -_081C8FD8: .4byte sub_81C90A0 + 1 -_081C8FDC: .4byte sub_81C90F4 + 1 + .pool thumb_func_end sub_81C8EF8 thumb_func_start sub_81C8FE0 @@ -933289,7 +901227,7 @@ sub_81C9008: @ 81C9008 cmp r4, 0 beq _081C9028 ldr r2, [r5, 0x3C] - ldr r1, _081C9024 + ldr r1, =nullsub_12 + 1 str r1, [r2, 0x1C] ldr r0, [r5, 0x40] str r1, [r0, 0x1C] @@ -933297,16 +901235,16 @@ sub_81C9008: @ 81C9008 str r1, [r0, 0x1C] b _081C903A .align 2, 0 -_081C9024: .4byte nullsub_12 + 1 + .pool _081C9028: ldr r2, [r5, 0x3C] - ldr r0, _081C9074 + ldr r0, =sub_81C9080 + 1 str r0, [r2, 0x1C] ldr r1, [r5, 0x40] - ldr r0, _081C9078 + ldr r0, =sub_81C90F4 + 1 str r0, [r1, 0x1C] ldr r1, [r5, 0x44] - ldr r0, _081C907C + ldr r0, =sub_81C90A0 + 1 str r0, [r1, 0x1C] _081C903A: adds r3, r2, 0 @@ -933338,9 +901276,7 @@ _081C903A: pop {r0} bx r0 .align 2, 0 -_081C9074: .4byte sub_81C9080 + 1 -_081C9078: .4byte sub_81C90F4 + 1 -_081C907C: .4byte sub_81C90A0 + 1 + .pool thumb_func_end sub_81C9008 thumb_func_start sub_81C9080 @@ -933349,7 +901285,7 @@ sub_81C9080: @ 81C9080 adds r4, r0, 0 movs r0, 0x11 bl sub_81C763C - ldr r1, _081C909C + ldr r1, =0x0000088e adds r0, r1 ldrh r0, [r0] lsls r0, 4 @@ -933358,7 +901294,7 @@ sub_81C9080: @ 81C9080 pop {r0} bx r0 .align 2, 0 -_081C909C: .4byte 0x0000088e + .pool thumb_func_end sub_81C9080 thumb_func_start sub_81C90A0 @@ -933546,20 +901482,20 @@ sub_81C91AC: @ 81C91AC ldrb r0, [r2, 0xE] strb r0, [r7, 0x5] lsrs r4, 30 - ldr r2, _081C9244 + ldr r2, =0xffffff00 mov r8, r2 ldr r0, [sp] ands r0, r2 orrs r0, r4 lsls r1, 24 lsrs r1, 16 - ldr r2, _081C9248 + ldr r2, =0xffff00ff ands r0, r2 orrs r0, r1 - ldr r1, _081C924C + ldr r1, =0xff00ffff ands r0, r1 lsls r5, 24 - ldr r1, _081C9250 + ldr r1, =0x00ffffff ands r0, r1 orrs r0, r5 str r0, [sp] @@ -933574,7 +901510,7 @@ sub_81C91AC: @ 81C91AC orrs r0, r6 adds r3, 0x2 lsls r3, 16 - ldr r1, _081C9254 + ldr r1, =0x0000ffff ands r0, r1 orrs r0, r3 str r0, [sp, 0x4] @@ -933594,11 +901530,7 @@ sub_81C91AC: @ 81C91AC movs r0, 0x1 b _081C925A .align 2, 0 -_081C9244: .4byte 0xffffff00 -_081C9248: .4byte 0xffff00ff -_081C924C: .4byte 0xff00ffff -_081C9250: .4byte 0x00ffffff -_081C9254: .4byte 0x0000ffff + .pool _081C9258: movs r0, 0 _081C925A: @@ -933622,7 +901554,7 @@ sub_81C9268: @ 81C9268 cmp r0, 0 beq _081C928A movs r4, 0x1 - ldr r0, _081C9294 + ldr r0, =0x0000089b bl flag_check lsls r0, 24 cmp r0, 0 @@ -933634,7 +901566,7 @@ _081C928A: pop {r1} bx r1 .align 2, 0 -_081C9294: .4byte 0x0000089b + .pool thumb_func_end sub_81C9268 thumb_func_start sub_81C9298 @@ -933788,12 +901720,12 @@ sub_81C939C: @ 81C939C cmp r0, 0x4 bhi _081C93E0 lsls r0, 2 - ldr r1, _081C93B0 + ldr r1, =_081C93B4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C93B0: .4byte _081C93B4 + .pool .align 2, 0 _081C93B4: .4byte _081C93C8 @@ -933808,12 +901740,12 @@ _081C93CE: bl sub_81C93EC b _081C93DE _081C93D4: - ldr r0, _081C93D8 + ldr r0, =sub_81C963C + 1 b _081C93DE .align 2, 0 -_081C93D8: .4byte sub_81C963C + 1 + .pool _081C93DC: - ldr r0, _081C93E8 + ldr r0, =sub_81C96FC + 1 _081C93DE: str r0, [r4, 0xC] _081C93E0: @@ -933821,7 +901753,7 @@ _081C93E0: pop {r0} bx r0 .align 2, 0 -_081C93E8: .4byte sub_81C96FC + 1 + .pool thumb_func_end sub_81C939C thumb_func_start sub_81C93EC @@ -933835,22 +901767,22 @@ sub_81C93EC: @ 81C93EC cmp r0, 0x2 beq _081C9410 _081C93FE: - ldr r0, _081C9404 + ldr r0, =sub_81C943C + 1 b _081C9412 .align 2, 0 -_081C9404: .4byte sub_81C943C + 1 + .pool _081C9408: - ldr r0, _081C940C + ldr r0, =sub_81C9520 + 1 b _081C9412 .align 2, 0 -_081C940C: .4byte sub_81C9520 + 1 + .pool _081C9410: - ldr r0, _081C9418 + ldr r0, =c2_pre_battle_1 + 1 _081C9412: pop {r1} bx r1 .align 2, 0 -_081C9418: .4byte c2_pre_battle_1 + 1 + .pool thumb_func_end sub_81C93EC thumb_func_start sub_81C941C @@ -933883,14 +901815,14 @@ sub_81C943C: @ 81C943C movs r0, 0x1 b _081C951A _081C944C: - ldr r2, _081C947C + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 adds r5, r2, 0 cmp r0, 0 beq _081C9508 - ldr r3, _081C9480 + ldr r3, =0x0861fc59 movs r0, 0x2 ldrsh r1, [r4, r0] ldrh r2, [r4] @@ -933903,14 +901835,12 @@ _081C944C: cmp r0, 0x4 bhi _081C9508 lsls r0, 2 - ldr r1, _081C9484 + ldr r1, =_081C9488 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C947C: .4byte 0x030022c0 -_081C9480: .4byte 0x0861fc59 -_081C9484: .4byte _081C9488 + .pool .align 2, 0 _081C9488: .4byte _081C949C @@ -933919,7 +901849,7 @@ _081C9488: .4byte _081C94E0 .4byte _081C9516 _081C949C: - ldr r0, _081C94B4 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r1, [r0, 0x15] movs r0, 0x8 @@ -933930,11 +901860,10 @@ _081C949C: movs r1, 0x2 _081C94AE: strh r1, [r4, 0x6] - ldr r1, _081C94B8 + ldr r1, =0x000186a6 b _081C94EE .align 2, 0 -_081C94B4: .4byte 0x03005d90 -_081C94B8: .4byte 0x000186a6 + .pool _081C94BC: movs r1, 0 movs r0, 0x3 @@ -933942,40 +901871,40 @@ _081C94BC: strh r1, [r4, 0x2] ldrb r0, [r3, 0x12] strh r0, [r4, 0x4] - ldr r0, _081C94D0 + ldr r0, =sub_81C963C + 1 str r0, [r4, 0xC] movs r0, 0x2 b _081C951A .align 2, 0 -_081C94D0: .4byte sub_81C963C + 1 + .pool _081C94D4: movs r0, 0x6 strh r0, [r4, 0x6] - ldr r1, _081C94DC + ldr r1, =0x000186ab b _081C94EE .align 2, 0 -_081C94DC: .4byte 0x000186ab + .pool _081C94E0: bl sub_81C76B8 cmp r0, 0 beq _081C94FC movs r0, 0x9 strh r0, [r4, 0x6] - ldr r1, _081C94F8 + ldr r1, =0x000186ac _081C94EE: adds r0, r4, 0 bl sub_81C97B0 movs r0, 0x8 b _081C951A .align 2, 0 -_081C94F8: .4byte 0x000186ac + .pool _081C94FC: - ldr r0, _081C9504 + ldr r0, =sub_81C9600 + 1 str r0, [r4, 0xC] movs r0, 0x6 b _081C951A .align 2, 0 -_081C9504: .4byte sub_81C9600 + 1 + .pool _081C9508: ldrh r1, [r5, 0x2E] movs r0, 0x2 @@ -934003,13 +901932,13 @@ sub_81C9520: @ 81C9520 movs r0, 0x1 b _081C9580 _081C9530: - ldr r0, _081C9564 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _081C9570 - ldr r3, _081C9568 + ldr r3, =0x0861fc59 movs r0, 0x2 ldrsh r1, [r4, r0] ldrh r2, [r4] @@ -934023,15 +901952,13 @@ _081C9530: bne _081C9578 movs r0, 0x6 strh r0, [r4, 0x6] - ldr r1, _081C956C + ldr r1, =0x000186ab adds r0, r4, 0 bl sub_81C97B0 movs r0, 0x8 b _081C9580 .align 2, 0 -_081C9564: .4byte 0x030022c0 -_081C9568: .4byte 0x0861fc59 -_081C956C: .4byte 0x000186ab + .pool _081C9570: movs r0, 0x2 ands r0, r1 @@ -934058,13 +901985,13 @@ c2_pre_battle_1: @ 81C9588 movs r0, 0x1 b _081C95F8 _081C9598: - ldr r0, _081C95CC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _081C95E8 - ldr r3, _081C95D0 + ldr r3, =0x0861fc59 movs r0, 0x2 ldrsh r1, [r4, r0] ldrh r2, [r4] @@ -934083,18 +902010,17 @@ _081C9598: movs r0, 0 b _081C95F8 .align 2, 0 -_081C95CC: .4byte 0x030022c0 -_081C95D0: .4byte 0x0861fc59 + .pool _081C95D4: movs r0, 0x6 strh r0, [r4, 0x6] - ldr r1, _081C95E4 + ldr r1, =0x000186ab adds r0, r4, 0 bl sub_81C97B0 movs r0, 0x8 b _081C95F8 .align 2, 0 -_081C95E4: .4byte 0x000186ab + .pool _081C95E8: movs r0, 0x2 ands r0, r1 @@ -934123,7 +902049,7 @@ sub_81C9600: @ 81C9600 movs r0, 0x1 b _081C9634 _081C9616: - ldr r0, _081C9628 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -934132,7 +902058,7 @@ _081C9616: movs r0, 0 b _081C9634 .align 2, 0 -_081C9628: .4byte 0x030022c0 + .pool _081C962C: bl sub_81C93EC str r0, [r4, 0xC] @@ -934154,14 +902080,14 @@ sub_81C963C: @ 81C963C movs r0, 0x1 b _081C96F6 _081C964E: - ldr r2, _081C9680 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x1 ands r0, r1 adds r6, r2, 0 cmp r0, 0 beq _081C96B8 - ldr r5, _081C9684 + ldr r5, =0x0861fc59 movs r1, 0x2 ldrsh r0, [r4, r1] ldrh r2, [r4] @@ -934179,8 +902105,7 @@ _081C964E: beq _081C96A4 b _081C96B8 .align 2, 0 -_081C9680: .4byte 0x030022c0 -_081C9684: .4byte 0x0861fc59 + .pool _081C9688: cmp r0, 0x7 beq _081C96E4 @@ -934191,21 +902116,21 @@ _081C968E: strh r3, [r4, 0x2] ldrb r0, [r5, 0x18] strh r0, [r4, 0x4] - ldr r0, _081C96A0 + ldr r0, =sub_81C96FC + 1 str r0, [r4, 0xC] movs r0, 0x4 b _081C96F6 .align 2, 0 -_081C96A0: .4byte sub_81C96FC + 1 + .pool _081C96A4: strh r3, [r4, 0x6] - ldr r1, _081C96B4 + ldr r1, =0x000186a7 adds r0, r4, 0 bl sub_81C97B0 movs r0, 0x8 b _081C96F6 .align 2, 0 -_081C96B4: .4byte 0x000186a7 + .pool _081C96B8: ldrh r1, [r6, 0x2E] movs r0, 0x2 @@ -934214,20 +902139,19 @@ _081C96B8: beq _081C96F4 movs r0, 0x2 ldrsh r2, [r4, r0] - ldr r1, _081C96DC + ldr r1, =0x0861fc54 ldrh r0, [r4] adds r0, r1 ldrb r0, [r0] cmp r2, r0 beq _081C96E4 strh r0, [r4, 0x2] - ldr r0, _081C96E0 + ldr r0, =sub_81C9798 + 1 str r0, [r4, 0xC] movs r0, 0x1 b _081C96F6 .align 2, 0 -_081C96DC: .4byte 0x0861fc54 -_081C96E0: .4byte sub_81C9798 + 1 + .pool _081C96E4: movs r0, 0x5 bl audio_play @@ -934253,13 +902177,13 @@ sub_81C96FC: @ 81C96FC movs r0, 0x1 b _081C9792 _081C970C: - ldr r0, _081C9748 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _081C9754 - ldr r3, _081C974C + ldr r3, =0x0861fc59 movs r0, 0x2 ldrsh r1, [r4, r0] ldrh r2, [r4] @@ -934273,7 +902197,7 @@ _081C970C: beq _081C9780 subs r0, 0x8 bl sub_81C7694 - ldr r1, _081C9750 + ldr r1, =0x000186a8 adds r0, r4, 0 bl sub_81C97B0 movs r0, 0x3 @@ -934281,9 +902205,7 @@ _081C970C: movs r0, 0x8 b _081C9792 .align 2, 0 -_081C9748: .4byte 0x030022c0 -_081C974C: .4byte 0x0861fc59 -_081C9750: .4byte 0x000186a8 + .pool _081C9754: movs r0, 0x2 ands r0, r1 @@ -934291,20 +902213,19 @@ _081C9754: beq _081C9790 movs r0, 0x2 ldrsh r2, [r4, r0] - ldr r1, _081C9778 + ldr r1, =0x0861fc54 ldrh r0, [r4] adds r0, r1 ldrb r0, [r0] cmp r2, r0 beq _081C9780 strh r0, [r4, 0x2] - ldr r0, _081C977C + ldr r0, =sub_81C97A4 + 1 str r0, [r4, 0xC] movs r0, 0x1 b _081C9792 .align 2, 0 -_081C9778: .4byte 0x0861fc54 -_081C977C: .4byte sub_81C97A4 + 1 + .pool _081C9780: movs r0, 0x5 bl audio_play @@ -934341,11 +902262,11 @@ sub_81C97A4: @ 81C97A4 thumb_func_start sub_81C97B0 sub_81C97B0: @ 81C97B0 str r1, [r0, 0x8] - ldr r1, _081C97B8 + ldr r1, =sub_81C97BC + 1 str r1, [r0, 0xC] bx lr .align 2, 0 -_081C97B8: .4byte sub_81C97BC + 1 + .pool thumb_func_end sub_81C97B0 thumb_func_start sub_81C97BC @@ -934364,7 +902285,7 @@ sub_81C97C0: @ 81C97C0 strh r0, [r4] movs r0, 0x1 strh r0, [r4, 0x2] - ldr r2, _081C97F0 + ldr r2, =0x0861fc59 ldrh r1, [r4] lsls r0, r1, 1 adds r0, r1 @@ -934373,14 +902294,13 @@ sub_81C97C0: @ 81C97C0 adds r0, r2 ldrb r0, [r0] strh r0, [r4, 0x4] - ldr r0, _081C97F4 + ldr r0, =sub_81C943C + 1 str r0, [r4, 0xC] pop {r4} pop {r0} bx r0 .align 2, 0 -_081C97F0: .4byte 0x0861fc59 -_081C97F4: .4byte sub_81C943C + 1 + .pool thumb_func_end sub_81C97C0 thumb_func_start sub_81C97F8 @@ -934389,22 +902309,21 @@ sub_81C97F8: @ 81C97F8 strh r1, [r0] movs r1, 0x1 strh r1, [r0, 0x2] - ldr r1, _081C980C + ldr r1, =0x0861fc59 ldrb r1, [r1, 0x13] strh r1, [r0, 0x4] - ldr r1, _081C9810 + ldr r1, =sub_81C963C + 1 str r1, [r0, 0xC] bx lr .align 2, 0 -_081C980C: .4byte 0x0861fc59 -_081C9810: .4byte sub_81C963C + 1 + .pool thumb_func_end sub_81C97F8 thumb_func_start sub_81C9814 sub_81C9814: @ 81C9814 push {r4,r5,lr} adds r4, r0, 0 - ldr r0, _081C9840 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x40 ands r0, r1 @@ -934419,14 +902338,13 @@ sub_81C9814: @ 81C9814 ldrh r3, [r4] cmp r0, 0 bge _081C986A - ldr r0, _081C9844 + ldr r0, =0x0861fc54 adds r0, r3, r0 ldrb r0, [r0] strh r0, [r4, 0x2] b _081C986A .align 2, 0 -_081C9840: .4byte 0x030022c0 -_081C9844: .4byte 0x0861fc54 + .pool _081C9848: movs r0, 0x80 ands r0, r1 @@ -934437,7 +902355,7 @@ _081C9848: strh r0, [r4, 0x2] movs r0, 0x2 ldrsh r2, [r4, r0] - ldr r0, _081C9884 + ldr r0, =0x0861fc54 ldrh r1, [r4] adds r0, r1, r0 adds r3, r1, 0 @@ -934446,7 +902364,7 @@ _081C9848: ble _081C986A strh r5, [r4, 0x2] _081C986A: - ldr r2, _081C9888 + ldr r2, =0x0861fc59 movs r0, 0x2 ldrsh r1, [r4, r0] lsls r0, r3, 1 @@ -934459,8 +902377,7 @@ _081C986A: movs r0, 0x1 b _081C988E .align 2, 0 -_081C9884: .4byte 0x0861fc54 -_081C9888: .4byte 0x0861fc59 + .pool _081C988C: movs r0, 0 _081C988E: @@ -934517,7 +902434,7 @@ sub_81C98D4: @ 81C98D4 _081C98D8: adds r0, r4, 0 bl sub_81CB0C8 - ldr r1, _081C9908 + ldr r1, =0x02037318 lsls r0, 24 lsrs r0, 24 ldrb r1, [r1, 0x14] @@ -934527,9 +902444,9 @@ _081C98D8: bl sub_81CAE08 cmp r0, 0 beq _081C9914 - ldr r0, _081C990C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081C9910 + ldr r1, =0x000009ca adds r0, r1 adds r0, r4 ldrb r0, [r0] @@ -934538,9 +902455,7 @@ _081C98D8: movs r0, 0x1 b _081C991C .align 2, 0 -_081C9908: .4byte 0x02037318 -_081C990C: .4byte 0x03005d8c -_081C9910: .4byte 0x000009ca + .pool _081C9914: adds r4, 0x1 cmp r4, 0x4D @@ -934590,7 +902505,7 @@ _081C9954: thumb_func_start sub_81C9958 sub_81C9958: @ 81C9958 push {r4,lr} - ldr r1, _081C9984 + ldr r1, =0x0000088c movs r0, 0x2 bl sub_81C761C adds r4, r0, 0 @@ -934598,11 +902513,11 @@ sub_81C9958: @ 81C9958 beq _081C997A movs r0, 0 strb r0, [r4, 0xC] - ldr r0, _081C9988 + ldr r0, =sub_81C9A10 + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, _081C998C + ldr r0, =sub_81C99FC + 1 str r0, [r4] _081C997A: adds r0, r4, 0 @@ -934610,9 +902525,7 @@ _081C997A: pop {r1} bx r1 .align 2, 0 -_081C9984: .4byte 0x0000088c -_081C9988: .4byte sub_81C9A10 + 1 -_081C998C: .4byte sub_81C99FC + 1 + .pool thumb_func_end sub_81C9958 thumb_func_start sub_81C9990 @@ -934622,21 +902535,20 @@ sub_81C9990: @ 81C9990 movs r0, 0x2 bl sub_81C763C adds r5, r0, 0 - ldr r0, _081C99B8 + ldr r0, =0x086201a0 lsls r4, 2 adds r4, r0 ldr r0, [r4] movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, _081C99BC + ldr r0, =sub_81C99FC + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081C99B8: .4byte 0x086201a0 -_081C99BC: .4byte sub_81C99FC + 1 + .pool thumb_func_end sub_81C9990 thumb_func_start sub_81C99C0 @@ -934692,12 +902604,12 @@ sub_81C9A10: @ 81C9A10 b _081C9C60 _081C9A24: lsls r0, r4, 2 - ldr r1, _081C9A30 + ldr r1, =_081C9A34 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081C9A30: .4byte _081C9A34 + .pool .align 2, 0 _081C9A34: .4byte _081C9A5C @@ -934711,10 +902623,10 @@ _081C9A34: .4byte _081C9C0E .4byte _081C9C4C _081C9A5C: - ldr r0, _081C9ADC + ldr r0, =0x08620194 movs r1, 0x3 bl sub_81C7B54 - ldr r1, _081C9AE0 + ldr r1, =0x08dc90e0 movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -934725,14 +902637,14 @@ _081C9A5C: adds r1, 0x8C movs r0, 0x1 bl bg_set_tilemap - ldr r1, _081C9AE4 + ldr r1, =0x08dc9130 movs r0, 0x1 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _081C9AE8 + ldr r0, =0x08dc90c0 movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 @@ -934764,10 +902676,7 @@ _081C9AD6: movs r0, 0 b _081C9C62 .align 2, 0 -_081C9ADC: .4byte 0x08620194 -_081C9AE0: .4byte 0x08dc90e0 -_081C9AE4: .4byte 0x08dc9130 -_081C9AE8: .4byte 0x08dc90c0 + .pool _081C9AEC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -934776,28 +902685,26 @@ _081C9AEC: beq _081C9AFA b _081C9C5C _081C9AFA: - ldr r1, _081C9B24 + ldr r1, =0x0861fd6c str r0, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _081C9B28 + ldr r1, =0x0861fff4 movs r0, 0x1 str r0, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r0, _081C9B2C + ldr r0, =0x0861fd4c movs r1, 0x20 movs r2, 0x20 bl sub_81C7944 b _081C9AD6 .align 2, 0 -_081C9B24: .4byte 0x0861fd6c -_081C9B28: .4byte 0x0861fff4 -_081C9B2C: .4byte 0x0861fd4c + .pool _081C9B30: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -934806,20 +902713,20 @@ _081C9B30: beq _081C9B3E b _081C9C5C _081C9B3E: - ldr r1, _081C9B7C + ldr r1, =0x0861fc98 str r0, [sp] movs r0, 0x3 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _081C9B80 + ldr r1, =0x0861fcac movs r0, 0x1 str r0, [sp] movs r0, 0x3 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r0, _081C9B84 + ldr r0, =0x0861fc78 movs r1, 0x30 movs r2, 0x20 bl sub_81C7944 @@ -934833,9 +902740,7 @@ _081C9B76: bl sub_81CA850 b _081C9AD6 .align 2, 0 -_081C9B7C: .4byte 0x0861fc98 -_081C9B80: .4byte 0x0861fcac -_081C9B84: .4byte 0x0861fc78 + .pool _081C9B88: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -935376,7 +903281,7 @@ _081C9FBE: sub_81C9FC4: @ 81C9FC4 push {r4,r5,lr} movs r5, 0 - ldr r4, _081C9FE4 + ldr r4, =0x086201c4 _081C9FCA: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load @@ -935384,14 +903289,13 @@ _081C9FCA: adds r5, 0x1 cmp r5, 0x1 bls _081C9FCA - ldr r0, _081C9FE8 + ldr r0, =0x086201d4 bl sub_81C795C pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081C9FE4: .4byte 0x086201c4 -_081C9FE8: .4byte 0x086201d4 + .pool thumb_func_end sub_81C9FC4 thumb_func_start sub_81C9FEC @@ -935442,7 +903346,7 @@ _081CA03E: mov r0, r8 adds r6, r1, r0 _081CA054: - ldr r0, _081CA08C + ldr r0, =0x0862034c movs r1, 0x8C asrs r2, r5, 16 movs r3, 0x3 @@ -935452,7 +903356,7 @@ _081CA054: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _081CA090 + ldr r0, =0x02020630 adds r1, r0 stm r6!, {r1} lsls r0, r4, 5 @@ -935469,8 +903373,7 @@ _081CA054: pop {r0} bx r0 .align 2, 0 -_081CA08C: .4byte 0x0862034c -_081CA090: .4byte 0x02020630 + .pool thumb_func_end sub_81CA02C thumb_func_start sub_81CA094 @@ -935509,7 +903412,7 @@ sub_81CA0C8: @ 81CA0C8 lsls r2, r0, 3 subs r2, r0 lsls r2, 2 - ldr r1, _081CA0E8 + ldr r1, =0x08620244 adds r0, r2, r1 subs r1, 0x4 adds r2, r1 @@ -935519,7 +903422,7 @@ sub_81CA0C8: @ 81CA0C8 pop {r0} bx r0 .align 2, 0 -_081CA0E8: .4byte 0x08620244 + .pool thumb_func_end sub_81CA0C8 thumb_func_start sub_81CA0EC @@ -935572,11 +903475,11 @@ _081CA13E: adds r2, r7 lsls r0, r5, 3 adds r2, r0 - ldr r1, _081CA1A8 + ldr r1, =0x000003ff adds r0, r1, 0 ands r2, r0 ldrh r0, [r3, 0x4] - ldr r7, _081CA1AC + ldr r7, =0xfffffc00 adds r1, r7, 0 ands r0, r1 orrs r0, r2 @@ -935618,8 +903521,7 @@ _081CA13E: movs r0, 0x1 b _081CA1EC .align 2, 0 -_081CA1A8: .4byte 0x000003ff -_081CA1AC: .4byte 0xfffffc00 + .pool _081CA1B0: lsls r2, r1, 4 mov r0, r10 @@ -935827,7 +903729,7 @@ sub_81CA324: @ 81CA324 bl sub_81C763C adds r3, r0, 0 movs r2, 0 - ldr r4, _081CA350 + ldr r4, =nullsub_12 + 1 adds r1, r3, 0 adds r1, 0x2C _081CA336: @@ -935845,7 +903747,7 @@ _081CA336: movs r0, 0 b _081CA356 .align 2, 0 -_081CA350: .4byte nullsub_12 + 1 + .pool _081CA354: movs r0, 0x1 _081CA356: @@ -935864,7 +903766,7 @@ sub_81CA35C: @ 81CA35C adds r5, r1, 0 mov r9, r2 adds r6, r3, 0 - ldr r0, _081CA3B0 + ldr r0, =sub_81CA474 + 1 mov r8, r0 subs r0, r2, r5 lsls r0, 4 @@ -935898,7 +903800,7 @@ _081CA380: pop {r0} bx r0 .align 2, 0 -_081CA3B0: .4byte sub_81CA474 + 1 + .pool thumb_func_end sub_81CA35C thumb_func_start sub_81CA3B4 @@ -935928,7 +903830,7 @@ _081CA3C8: orrs r0, r1 strb r0, [r2, 0x1] ldr r1, [r4] - ldr r0, _081CA43C + ldr r0, =sub_81CA4AC + 1 str r0, [r1, 0x1C] movs r6, 0x8 strh r6, [r1, 0x2E] @@ -935948,12 +903850,12 @@ _081CA3C8: movs r0, 0x52 movs r1, 0x10 bl lcd_io_set - ldr r0, _081CA440 + ldr r0, =sub_81CA580 + 1 movs r1, 0x3 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081CA444 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -935968,9 +903870,7 @@ _081CA3C8: pop {r0} bx r0 .align 2, 0 -_081CA43C: .4byte sub_81CA4AC + 1 -_081CA440: .4byte sub_81CA580 + 1 -_081CA444: .4byte 0x03005e00 + .pool thumb_func_end sub_81CA3B4 thumb_func_start sub_81CA448 @@ -936023,13 +903923,13 @@ sub_81CA474: @ 81CA474 _081CA49A: ldrh r0, [r2, 0x3C] strh r0, [r2, 0x20] - ldr r0, _081CA4A8 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _081CA4A2: pop {r0} bx r0 .align 2, 0 -_081CA4A8: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81CA474 thumb_func_start sub_81CA4AC @@ -936134,11 +904034,11 @@ _081CA526: negs r1, r1 ands r0, r1 strb r0, [r4, 0x1] - ldr r0, _081CA570 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] b _081CA578 .align 2, 0 -_081CA570: .4byte nullsub_12 + 1 + .pool _081CA574: subs r0, r1, 0x1 strh r0, [r4, 0x2E] @@ -936156,7 +904056,7 @@ sub_81CA580: @ 81CA580 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081CA5A8 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r0, [r4] movs r1, 0 @@ -936171,7 +904071,7 @@ sub_81CA580: @ 81CA580 beq _081CA5CC b _081CA638 .align 2, 0 -_081CA5A8: .4byte 0x03005e08 + .pool _081CA5AC: movs r0, 0x10 strh r0, [r4, 0x4] @@ -936253,7 +904153,7 @@ sub_81CA640: @ 81CA640 movs r0, 0x2 bl sub_81C763C adds r4, r0, 0 - ldr r0, _081CA678 + ldr r0, =0x0862036c movs r1, 0x10 movs r2, 0x60 movs r3, 0x4 @@ -936263,20 +904163,18 @@ sub_81CA640: @ 81CA640 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _081CA67C + ldr r0, =0x02020630 adds r1, r0 str r1, [r4, 0x28] bl sub_81C98D4 cmp r0, 0 beq _081CA684 ldr r1, [r4, 0x28] - ldr r0, _081CA680 + ldr r0, =sub_81CA6AC + 1 str r0, [r1, 0x1C] b _081CA690 .align 2, 0 -_081CA678: .4byte 0x0862036c -_081CA67C: .4byte 0x02020630 -_081CA680: .4byte sub_81CA6AC + 1 + .pool _081CA684: ldr r0, [r4, 0x28] adds r0, 0x3E @@ -936337,7 +904235,7 @@ sub_81CA6E0: @ 81CA6E0 movs r0, 0x2 bl sub_81C763C adds r4, r0, 0 - ldr r0, _081CA710 + ldr r0, =0x086202cc bl Window_AddFromTemplate strh r0, [r4, 0x8] lsls r0, 24 @@ -936353,7 +904251,7 @@ sub_81CA6E0: @ 81CA6E0 pop {r0} bx r0 .align 2, 0 -_081CA710: .4byte 0x086202cc + .pool thumb_func_end sub_81CA6E0 thumb_func_start sub_81CA714 @@ -936364,7 +904262,7 @@ sub_81CA714: @ 81CA714 bl sub_81C763C adds r5, r0, 0 bl sub_81C98B4 - ldr r1, _081CA768 + ldr r1, =0x086202d4 lsls r0, 2 adds r0, r1 ldr r6, [r0] @@ -936383,7 +904281,7 @@ sub_81CA714: @ 81CA714 lsrs r2, 1 lsls r2, 24 lsrs r2, 24 - ldr r1, _081CA76C + ldr r1, =0x0862030c str r1, [sp] movs r1, 0 str r1, [sp, 0x4] @@ -936396,8 +904294,7 @@ sub_81CA714: @ 81CA714 pop {r0} bx r0 .align 2, 0 -_081CA768: .4byte 0x086202d4 -_081CA76C: .4byte 0x0862030c + .pool thumb_func_end sub_81CA714 thumb_func_start sub_81CA770 @@ -936407,7 +904304,7 @@ sub_81CA770: @ 81CA770 movs r0, 0x2 bl sub_81C763C adds r5, r0, 0 - ldr r6, _081CA7BC + ldr r6, =0x085ebd4a movs r2, 0x1 negs r2, r2 movs r0, 0x1 @@ -936423,7 +904320,7 @@ sub_81CA770: @ 81CA770 lsrs r2, 1 lsls r2, 24 lsrs r2, 24 - ldr r1, _081CA7C0 + ldr r1, =0x0862030f str r1, [sp] movs r1, 0 str r1, [sp, 0x4] @@ -936436,8 +904333,7 @@ sub_81CA770: @ 81CA770 pop {r0} bx r0 .align 2, 0 -_081CA7BC: .4byte 0x085ebd4a -_081CA7C0: .4byte 0x0862030f + .pool thumb_func_end sub_81CA770 thumb_func_start sub_81CA7C4 @@ -936456,7 +904352,7 @@ sub_81CA7D4: @ 81CA7D4 movs r0, 0x2 bl sub_81C763C adds r4, r0, 0 - ldr r0, _081CA7F0 + ldr r0, =sub_81CA808 + 1 movs r1, 0x2 bl AddTask strb r0, [r4, 0xA] @@ -936464,7 +904360,7 @@ sub_81CA7D4: @ 81CA7D4 pop {r0} bx r0 .align 2, 0 -_081CA7F0: .4byte sub_81CA808 + 1 + .pool thumb_func_end sub_81CA7D4 thumb_func_start sub_81CA7F4 @@ -936492,13 +904388,13 @@ sub_81CA808: @ 81CA808 thumb_func_start sub_81CA818 sub_81CA818: @ 81CA818 push {r4,r5,lr} - ldr r0, _081CA848 + ldr r0, =sub_81CA8B0 + 1 movs r1, 0x3 bl AddTask adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _081CA84C + ldr r5, =0x0861fc7a adds r0, r4, 0 movs r1, 0x1 adds r2, r5, 0 @@ -936512,33 +904408,32 @@ sub_81CA818: @ 81CA818 pop {r0} bx r0 .align 2, 0 -_081CA848: .4byte sub_81CA8B0 + 1 -_081CA84C: .4byte 0x0861fc7a + .pool thumb_func_end sub_81CA818 thumb_func_start sub_81CA850 sub_81CA850: @ 81CA850 push {lr} - ldr r0, _081CA860 + ldr r0, =0x0861fc86 movs r1, 0x31 movs r2, 0x4 bl sub_81C7944 pop {r0} bx r0 .align 2, 0 -_081CA860: .4byte 0x0861fc86 + .pool thumb_func_end sub_81CA850 thumb_func_start sub_81CA864 sub_81CA864: @ 81CA864 push {r4,r5,lr} - ldr r0, _081CA894 + ldr r0, =sub_81CA8B0 + 1 movs r1, 0x3 bl AddTask adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _081CA898 + ldr r5, =0x0861fc86 adds r0, r4, 0 movs r1, 0x1 adds r2, r5, 0 @@ -936552,21 +904447,20 @@ sub_81CA864: @ 81CA864 pop {r0} bx r0 .align 2, 0 -_081CA894: .4byte sub_81CA8B0 + 1 -_081CA898: .4byte 0x0861fc86 + .pool thumb_func_end sub_81CA864 thumb_func_start sub_81CA89C sub_81CA89C: @ 81CA89C push {lr} - ldr r0, _081CA8AC + ldr r0, =sub_81CA8B0 + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_081CA8AC: .4byte sub_81CA8B0 + 1 + .pool thumb_func_end sub_81CA89C thumb_func_start sub_81CA8B0 @@ -936578,7 +904472,7 @@ sub_81CA8B0: @ 81CA8B0 lsls r4, r6, 2 adds r4, r6 lsls r4, 3 - ldr r0, _081CA910 + ldr r0, =0x03005e08 adds r4, r0 adds r0, r6, 0 movs r1, 0x1 @@ -936616,7 +904510,7 @@ _081CA908: pop {r0} bx r0 .align 2, 0 -_081CA910: .4byte 0x03005e08 + .pool thumb_func_end sub_81CA8B0 thumb_func_start sub_81CA914 @@ -936654,22 +904548,20 @@ titlescreen_0: @ 81CA92C bl lcd_io_set_bits bl remove_some_task bl sub_81CAA3C - ldr r2, _081CA988 + ldr r2, =0x08620384 ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] bl sub_80BA038 - ldr r0, _081CA98C + ldr r0, =sub_81CA914 + 1 bl c3args_set_0toR1_1to0 - ldr r0, _081CA990 + ldr r0, =sub_81CA9EC + 1 movs r1, 0x3 bl AddTask pop {r0} bx r0 .align 2, 0 -_081CA988: .4byte 0x08620384 -_081CA98C: .4byte sub_81CA914 + 1 -_081CA990: .4byte sub_81CA9EC + 1 + .pool thumb_func_end titlescreen_0 thumb_func_start sub_81CA994 @@ -936683,7 +904575,7 @@ sub_81CA994: @ 81CA994 movs r0, 0 bl lcd_io_clear_bits bl remove_some_task - ldr r0, _081CA9C4 + ldr r0, =sub_81CA9EC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -936692,7 +904584,7 @@ sub_81CA994: @ 81CA994 pop {r0} bx r0 .align 2, 0 -_081CA9C4: .4byte sub_81CA9EC + 1 + .pool thumb_func_end sub_81CA994 thumb_func_start sub_81CA9C8 @@ -936724,7 +904616,7 @@ sub_81CA9EC: @ 81CA9EC lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081CAA34 + ldr r0, =0x03005e08 adds r2, r1, r0 ldrh r0, [r2] adds r0, 0x1 @@ -936739,7 +904631,7 @@ sub_81CA9EC: @ 81CA9EC movs r1, 0x7F ands r0, r1 strh r0, [r2, 0x2] - ldr r1, _081CAA38 + ldr r1, =0x08329f40 movs r3, 0x2 ldrsh r0, [r2, r3] lsls r0, 1 @@ -936755,8 +904647,7 @@ _081CAA30: pop {r0} bx r0 .align 2, 0 -_081CAA34: .4byte 0x03005e08 -_081CAA38: .4byte 0x08329f40 + .pool thumb_func_end sub_81CA9EC thumb_func_start sub_81CAA3C @@ -936769,7 +904660,7 @@ sub_81CAA3C: @ 81CAA3C bl sub_81C9894 adds r4, r0, 0 bl sub_81C98A4 - ldr r2, _081CAAC8 + ldr r2, =0x08620240 lsls r1, r4, 3 subs r1, r4 lsls r1, 2 @@ -936783,8 +904674,8 @@ sub_81CAA3C: @ 81CAA3C mov r0, sp movs r6, 0 strh r6, [r0] - ldr r5, _081CAACC - ldr r0, _081CAAD0 + ldr r5, =0x02038c28 + ldr r0, =0x010000a0 mov r8, r0 mov r0, sp adds r1, r5, 0 @@ -936800,12 +904691,12 @@ sub_81CAA3C: @ 81CAA3C mov r2, r8 bl CpuSet add r0, sp, 0x4 - ldr r1, _081CAAD4 + ldr r1, =0x000072f0 adds r6, r1, 0 strh r6, [r0] lsls r4, 1 adds r5, r4, r5 - ldr r1, _081CAAD8 + ldr r1, =0x01000010 mov r8, r1 adds r1, r5, 0 mov r2, r8 @@ -936825,11 +904716,7 @@ sub_81CAA3C: @ 81CAA3C pop {r0} bx r0 .align 2, 0 -_081CAAC8: .4byte 0x08620240 -_081CAACC: .4byte 0x02038c28 -_081CAAD0: .4byte 0x010000a0 -_081CAAD4: .4byte 0x000072f0 -_081CAAD8: .4byte 0x01000010 + .pool thumb_func_end sub_81CAA3C thumb_func_start sub_81CAADC @@ -936850,20 +904737,19 @@ sub_81CAAE8: @ 81CAAE8 adds r4, r0, 0 cmp r4, 0 beq _081CAB1C - ldr r0, _081CAB14 + ldr r0, =sub_81CAB44 + 1 str r0, [r4, 0x18] movs r0, 0 strh r0, [r4, 0x8] str r0, [r4, 0x10] - ldr r0, _081CAB18 + ldr r0, =sub_81CAD20 + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x14] movs r0, 0x1 b _081CAB1E .align 2, 0 -_081CAB14: .4byte sub_81CAB44 + 1 -_081CAB18: .4byte sub_81CAD20 + 1 + .pool _081CAB1C: movs r0, 0 _081CAB1E: @@ -936896,7 +904782,7 @@ sub_81CAB38: @ 81CAB38 sub_81CAB44: @ 81CAB44 push {r4,r5,lr} adds r4, r0, 0 - ldr r3, _081CAB58 + ldr r3, =0x030022c0 ldrh r1, [r3, 0x30] movs r0, 0x40 ands r0, r1 @@ -936905,7 +904791,7 @@ sub_81CAB44: @ 81CAB44 movs r0, 0x2 b _081CABF4 .align 2, 0 -_081CAB58: .4byte 0x030022c0 + .pool _081CAB5C: movs r0, 0x80 ands r0, r1 @@ -936936,7 +904822,7 @@ _081CAB84: ands r0, r1 cmp r0, 0 beq _081CABD0 - ldr r0, _081CABB8 + ldr r0, =sub_81CAC04 + 1 str r0, [r4, 0x18] strh r2, [r4] bl sub_81C875C @@ -936950,23 +904836,22 @@ _081CAB84: cmp r0, 0 beq _081CABC0 _081CABAE: - ldr r0, _081CABBC + ldr r0, =0x0862250a str r0, [r4, 0x4] movs r0, 0x2 strh r0, [r4, 0x2] b _081CABC6 .align 2, 0 -_081CABB8: .4byte sub_81CAC04 + 1 -_081CABBC: .4byte 0x0862250a + .pool _081CABC0: - ldr r0, _081CABCC + ldr r0, =0x08622508 str r0, [r4, 0x4] strh r5, [r4, 0x2] _081CABC6: movs r0, 0x5 b _081CABF4 .align 2, 0 -_081CABCC: .4byte 0x08622508 + .pool _081CABD0: movs r0, 0x2 ands r0, r1 @@ -936975,12 +904860,12 @@ _081CABD0: bl sub_81C767C cmp r0, 0x1 beq _081CABEC - ldr r0, _081CABE8 + ldr r0, =sub_81CABFC + 1 str r0, [r4, 0x18] movs r0, 0xF b _081CABF4 .align 2, 0 -_081CABE8: .4byte sub_81CABFC + 1 + .pool _081CABEC: movs r0, 0x20 bl audio_play @@ -936994,17 +904879,17 @@ _081CABF4: thumb_func_start sub_81CABFC sub_81CABFC: @ 81CABFC - ldr r0, _081CAC00 + ldr r0, =0x000186a4 bx lr .align 2, 0 -_081CAC00: .4byte 0x000186a4 + .pool thumb_func_end sub_81CABFC thumb_func_start sub_81CAC04 sub_81CAC04: @ 81CAC04 push {r4,lr} adds r4, r0, 0 - ldr r2, _081CAC20 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r0, 0x40 ands r0, r1 @@ -937016,7 +904901,7 @@ sub_81CAC04: @ 81CAC04 subs r0, 0x1 b _081CAC38 .align 2, 0 -_081CAC20: .4byte 0x030022c0 + .pool _081CAC24: ldrh r1, [r2, 0x2E] movs r0, 0x80 @@ -937060,7 +904945,7 @@ _081CAC64: movs r0, 0x2 bl sub_81C7688 _081CAC72: - ldr r0, _081CAC84 + ldr r0, =sub_81CACF8 + 1 str r0, [r4, 0x18] bl sub_81CB1D0 cmp r0, 0 @@ -937068,17 +904953,17 @@ _081CAC72: movs r0, 0x9 b _081CACAC .align 2, 0 -_081CAC84: .4byte sub_81CACF8 + 1 + .pool _081CAC88: movs r0, 0x8 b _081CACAC _081CAC8C: - ldr r0, _081CAC94 + ldr r0, =sub_81CACB8 + 1 str r0, [r4, 0x18] movs r0, 0xB b _081CACAC .align 2, 0 -_081CAC94: .4byte sub_81CACB8 + 1 + .pool _081CAC98: ldrh r1, [r2, 0x2E] movs r0, 0x2 @@ -937088,7 +904973,7 @@ _081CAC98: movs r0, 0 b _081CACAC _081CACA6: - ldr r0, _081CACB4 + ldr r0, =sub_81CAB44 + 1 str r0, [r4, 0x18] movs r0, 0x7 _081CACAC: @@ -937096,14 +904981,14 @@ _081CACAC: pop {r1} bx r1 .align 2, 0 -_081CACB4: .4byte sub_81CAB44 + 1 + .pool thumb_func_end sub_81CAC04 thumb_func_start sub_81CACB8 sub_81CACB8: @ 81CACB8 push {lr} adds r3, r0, 0 - ldr r2, _081CACCC + ldr r2, =0x030022c0 ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 @@ -937112,7 +904997,7 @@ sub_81CACB8: @ 81CACB8 movs r0, 0xC b _081CACF0 .align 2, 0 -_081CACCC: .4byte 0x030022c0 + .pool _081CACD0: movs r0, 0x80 ands r0, r1 @@ -937129,21 +905014,21 @@ _081CACDC: movs r0, 0 b _081CACF0 _081CACEA: - ldr r0, _081CACF4 + ldr r0, =sub_81CAB44 + 1 str r0, [r3, 0x18] movs r0, 0xE _081CACF0: pop {r1} bx r1 .align 2, 0 -_081CACF4: .4byte sub_81CAB44 + 1 + .pool thumb_func_end sub_81CACB8 thumb_func_start sub_81CACF8 sub_81CACF8: @ 81CACF8 push {lr} adds r2, r0, 0 - ldr r0, _081CAD0C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 @@ -937152,16 +905037,16 @@ sub_81CACF8: @ 81CACF8 movs r0, 0 b _081CAD16 .align 2, 0 -_081CAD0C: .4byte 0x030022c0 + .pool _081CAD10: - ldr r0, _081CAD1C + ldr r0, =sub_81CAB44 + 1 str r0, [r2, 0x18] movs r0, 0xA _081CAD16: pop {r1} bx r1 .align 2, 0 -_081CAD1C: .4byte sub_81CAB44 + 1 + .pool thumb_func_end sub_81CACF8 thumb_func_start sub_81CAD20 @@ -937423,9 +905308,9 @@ _081CAED4: _081CAEDC: cmp r4, 0x4E beq _081CAEFC - ldr r0, _081CAEF4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081CAEF8 + ldr r1, =0x000009ca adds r0, r1 adds r0, r4 ldrb r1, [r0] @@ -937434,8 +905319,7 @@ _081CAEDC: lsrs r0, 31 b _081CAEFE .align 2, 0 -_081CAEF4: .4byte 0x03005d8c -_081CAEF8: .4byte 0x000009ca + .pool _081CAEFC: movs r0, 0 _081CAEFE: @@ -937458,7 +905342,7 @@ sub_81CAF04: @ 81CAF04 ldrh r0, [r1, 0x1E] bl sub_81D15BC adds r4, r0, 0 - ldr r1, _081CAF30 + ldr r1, =0x08310030 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -937466,7 +905350,7 @@ sub_81CAF04: @ 81CAF04 ldrb r0, [r0, 0x3] b _081CAF6C .align 2, 0 -_081CAF30: .4byte 0x08310030 + .pool _081CAF34: ldrh r5, [r1, 0x1E] adds r0, r5, 0 @@ -937477,17 +905361,17 @@ _081CAF34: adds r0, r5, 0 bl sub_81D1BD0 adds r4, r0, 0 - ldr r0, _081CAF54 + ldr r0, =0x0831f578 adds r0, r4, r0 ldrb r0, [r0] b _081CAF6C .align 2, 0 -_081CAF54: .4byte 0x0831f578 + .pool _081CAF58: adds r0, r4, 0 bl sub_81D15BC adds r4, r0, 0 - ldr r0, _081CAF74 + ldr r0, =0x08310030 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 @@ -937498,7 +905382,7 @@ _081CAF6C: pop {r1} bx r1 .align 2, 0 -_081CAF74: .4byte 0x08310030 + .pool thumb_func_end sub_81CAF04 thumb_func_start sub_81CAF78 @@ -937511,17 +905395,16 @@ sub_81CAF78: @ 81CAF78 adds r4, r0, 0 movs r0, 0 strb r0, [r6] - ldr r0, _081CAF9C + ldr r0, =0x02037318 ldrb r0, [r0, 0x17] bl is_light_level_1_2_3_or_6 lsls r0, 24 cmp r0, 0 bne _081CAFA4 - ldr r0, _081CAFA0 + ldr r0, =0x085eeb0b b _081CAFCE .align 2, 0 -_081CAF9C: .4byte 0x02037318 -_081CAFA0: .4byte 0x085eeb0b + .pool _081CAFA4: lsls r0, r5, 2 adds r1, r4, r0 @@ -937530,24 +905413,24 @@ _081CAFA4: bne _081CAFC4 ldrh r0, [r1, 0x1E] bl sub_81D15BC - ldr r1, _081CAFC0 + ldr r1, =0x02021fc4 bl sub_81967AC strb r0, [r6] b _081CAFCC .align 2, 0 -_081CAFC0: .4byte 0x02021fc4 + .pool _081CAFC4: ldrh r0, [r1, 0x1E] - ldr r1, _081CAFD4 + ldr r1, =0x02021fc4 bl sub_81D189C _081CAFCC: - ldr r0, _081CAFD4 + ldr r0, =0x02021fc4 _081CAFCE: pop {r4-r6} pop {r1} bx r1 .align 2, 0 -_081CAFD4: .4byte 0x02021fc4 + .pool thumb_func_end sub_81CAF78 thumb_func_start sub_81CAFD8 @@ -937574,7 +905457,7 @@ sub_81CAFD8: @ 81CAFD8 _081CB004: ldrh r1, [r4, 0x1E] _081CB006: - ldr r2, _081CB018 + ldr r2, =0x08622028 lsls r0, r5, 2 lsls r1, 4 adds r0, r1 @@ -937585,7 +905468,7 @@ _081CB012: pop {r1} bx r1 .align 2, 0 -_081CB018: .4byte 0x08622028 + .pool thumb_func_end sub_81CAFD8 thumb_func_start sub_81CB01C @@ -937634,20 +905517,19 @@ sub_81CB050: @ 81CB050 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081CB080 + ldr r0, =0x08310030 adds r1, r0 ldrb r2, [r1, 0x1] movs r0, 0xD muls r0, r2 - ldr r2, _081CB084 + ldr r2, =0x0830fcd4 adds r0, r2 str r0, [sp] adds r1, 0x4 str r1, [sp, 0x4] b _081CB092 .align 2, 0 -_081CB080: .4byte 0x08310030 -_081CB084: .4byte 0x0830fcd4 + .pool _081CB088: ldrh r0, [r2, 0x2] add r2, sp, 0x4 @@ -937685,7 +905567,7 @@ _081CB0C0: thumb_func_start sub_81CB0C8 sub_81CB0C8: @ 81CB0C8 push {lr} - ldr r1, _081CB0E0 + ldr r1, =0x085500a4 lsls r0, 4 adds r0, r1 ldrh r2, [r0, 0xA] @@ -937696,7 +905578,7 @@ sub_81CB0C8: @ 81CB0C8 pop {r1} bx r1 .align 2, 0 -_081CB0E0: .4byte 0x085500a4 + .pool thumb_func_end sub_81CB0C8 thumb_func_start sub_81CB0E4 @@ -937789,9 +905671,9 @@ _081CB170: bl sub_81CAE08 cmp r0, 0 beq _081CB18A - ldr r0, _081CB1B8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081CB1BC + ldr r1, =0x000009ca adds r0, r1 adds r0, r4 ldrb r0, [r0] @@ -937809,9 +905691,9 @@ _081CB192: beq _081CB1C0 adds r0, r4, 0 bl sub_81D1854 - ldr r1, _081CB1B8 + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r2, _081CB1BC + ldr r2, =0x000009ca adds r1, r2 adds r1, r0 ldrb r0, [r1] @@ -937821,8 +905703,7 @@ _081CB1B2: movs r0, 0x1 b _081CB1C8 .align 2, 0 -_081CB1B8: .4byte 0x03005d8c -_081CB1BC: .4byte 0x000009ca + .pool _081CB1C0: adds r4, 0x1 cmp r4, 0x14 @@ -937849,37 +905730,35 @@ sub_81CB1D0: @ 81CB1D0 bne _081CB218 adds r0, r1, 0 bl sub_81CAEA4 - ldr r1, _081CB20C + ldr r1, =0x02037318 lsls r0, 16 lsrs r0, 16 ldrb r1, [r1, 0x14] cmp r0, r1 bne _081CB258 - ldr r0, _081CB210 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081CB214 + ldr r1, =0x000009ca adds r0, r1 ldrh r4, [r4, 0x1E] adds r0, r4 ldrb r0, [r0] b _081CB246 .align 2, 0 -_081CB20C: .4byte 0x02037318 -_081CB210: .4byte 0x03005d8c -_081CB214: .4byte 0x000009ca + .pool _081CB218: ldrh r0, [r4, 0x1E] cmp r0, 0xB bne _081CB258 adds r0, r1, 0 bl sub_81CAEA4 - ldr r1, _081CB250 + ldr r1, =0x02037318 lsls r0, 16 lsrs r0, 16 ldrb r1, [r1, 0x14] cmp r0, r1 bne _081CB258 - ldr r0, _081CB254 + ldr r0, =0x0000086b bl flag_check lsls r0, 24 lsrs r0, 24 @@ -937894,8 +905773,7 @@ _081CB246: movs r0, 0x1 b _081CB25A .align 2, 0 -_081CB250: .4byte 0x02037318 -_081CB254: .4byte 0x0000086b + .pool _081CB258: movs r0, 0 _081CB25A: @@ -937907,7 +905785,7 @@ _081CB25A: thumb_func_start sub_81CB260 sub_81CB260: @ 81CB260 push {r4,lr} - ldr r1, _081CB288 + ldr r1, =0x00002048 movs r0, 0x6 bl sub_81C761C adds r4, r0, 0 @@ -937915,18 +905793,16 @@ sub_81CB260: @ 81CB260 beq _081CB294 movs r0, 0 strb r0, [r4, 0x19] - ldr r0, _081CB28C + ldr r0, =sub_81CB324 + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, _081CB290 + ldr r0, =sub_81CB310 + 1 str r0, [r4] movs r0, 0x1 b _081CB296 .align 2, 0 -_081CB288: .4byte 0x00002048 -_081CB28C: .4byte sub_81CB324 + 1 -_081CB290: .4byte sub_81CB310 + 1 + .pool _081CB294: movs r0, 0 _081CB296: @@ -937942,21 +905818,20 @@ sub_81CB29C: @ 81CB29C movs r0, 0x6 bl sub_81C763C adds r5, r0, 0 - ldr r0, _081CB2C4 + ldr r0, =0x08622798 lsls r4, 2 adds r4, r0 ldr r0, [r4] movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, _081CB2C8 + ldr r0, =sub_81CB310 + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081CB2C4: .4byte 0x08622798 -_081CB2C8: .4byte sub_81CB310 + 1 + .pool thumb_func_end sub_81CB29C thumb_func_start sub_81CB2CC @@ -938015,12 +905890,12 @@ sub_81CB324: @ 81CB324 b _081CB504 _081CB338: lsls r0, r4, 2 - ldr r1, _081CB344 + ldr r1, =_081CB348 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CB344: .4byte _081CB348 + .pool .align 2, 0 _081CB348: .4byte _081CB368 @@ -938032,7 +905907,7 @@ _081CB348: .4byte _081CB4A6 .4byte _081CB4EA _081CB368: - ldr r0, _081CB3C0 + ldr r0, =0x0862278c movs r1, 0x3 bl sub_81C7B54 movs r0, 0x2 @@ -938043,36 +905918,32 @@ _081CB368: movs r1, 0 movs r2, 0 bl bg_change_y_offset - ldr r1, _081CB3C4 + ldr r1, =0x08622530 movs r0, 0 str r0, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r0, _081CB3C8 + ldr r0, =0x00001024 adds r1, r5, r0 movs r0, 0x2 bl bg_set_tilemap - ldr r1, _081CB3CC + ldr r1, =0x086225d4 movs r0, 0x2 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _081CB3D0 + ldr r0, =0x08622510 movs r1, 0x20 movs r2, 0x20 bl sub_81C7944 movs r0, 0x2 b _081CB418 .align 2, 0 -_081CB3C0: .4byte 0x0862278c -_081CB3C4: .4byte 0x08622530 -_081CB3C8: .4byte 0x00001024 -_081CB3CC: .4byte 0x086225d4 -_081CB3D0: .4byte 0x08622510 + .pool _081CB3D4: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -938099,7 +905970,7 @@ _081CB3E0: movs r2, 0 movs r3, 0 bl bg_fill_tilemap_rect - ldr r0, _081CB420 + ldr r0, =0x086226e0 movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 @@ -938109,7 +905980,7 @@ _081CB418: movs r0, 0 b _081CB506 .align 2, 0 -_081CB420: .4byte 0x086226e0 + .pool _081CB424: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -938118,26 +905989,24 @@ _081CB424: bne _081CB4FA adds r0, r5, 0 bl sub_81CC034 - ldr r1, _081CB45C + ldr r1, =0x08622760 str r4, [sp] movs r0, 0x3 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r0, _081CB460 + ldr r0, =0x08622700 movs r1, 0x30 movs r2, 0x20 bl sub_81C7944 - ldr r0, _081CB464 + ldr r0, =0x08622720 movs r1, 0x50 movs r2, 0x20 bl sub_81C7944 movs r0, 0 b _081CB506 .align 2, 0 -_081CB45C: .4byte 0x08622760 -_081CB460: .4byte 0x08622700 -_081CB464: .4byte 0x08622720 + .pool _081CB468: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -938616,13 +906485,13 @@ _081CB7D4: bne _081CB816 adds r0, r5, 0 bl sub_81CC0E0 - ldr r0, _081CB7F4 + ldr r0, =0x00000107 bl audio_play strb r4, [r5, 0xE] movs r0, 0 b _081CB81C .align 2, 0 -_081CB7F4: .4byte 0x00000107 + .pool _081CB7F8: adds r0, r5, 0 bl sub_81CC104 @@ -938713,12 +906582,12 @@ sub_81CB888: @ 81CB888 cmp r5, 0x6 bhi _081CB934 lsls r0, r5, 2 - ldr r1, _081CB8A4 + ldr r1, =_081CB8A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CB8A4: .4byte _081CB8A8 + .pool .align 2, 0 _081CB8A8: .4byte _081CB8C4 @@ -938870,12 +906739,12 @@ sub_81CB9C8: @ 81CB9C8 cmp r5, 0x4 bhi _081CBA60 lsls r0, r5, 2 - ldr r1, _081CB9E4 + ldr r1, =_081CB9E8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CB9E4: .4byte _081CB9E8 + .pool .align 2, 0 _081CB9E8: .4byte _081CB9FC @@ -939003,12 +906872,12 @@ sub_81CBAD4: @ 81CBAD4 cmp r5, 0x4 bhi _081CBB6C lsls r0, r5, 2 - ldr r1, _081CBAF0 + ldr r1, =_081CBAF4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CBAF0: .4byte _081CBAF4 + .pool .align 2, 0 _081CBAF4: .4byte _081CBB08 @@ -939133,31 +907002,28 @@ sub_81CBBB8: @ 81CBBB8 strb r0, [r1, 0xD] movs r0, 0x7 strb r0, [r1, 0xE] - ldr r0, _081CBC0C + ldr r0, =sub_81CB050 + 1 str r0, [sp, 0x10] - ldr r0, _081CBC10 + ldr r0, =sub_81CBCEC + 1 str r0, [sp, 0x14] - ldr r0, _081CBC14 + ldr r0, =0x08622794 movs r2, 0x2 bl sub_81C81D4 - ldr r0, _081CBC18 + ldr r0, =sub_81CBC64 + 1 movs r1, 0x7 bl AddTask add sp, 0x18 pop {r0} bx r0 .align 2, 0 -_081CBC0C: .4byte sub_81CB050 + 1 -_081CBC10: .4byte sub_81CBCEC + 1 -_081CBC14: .4byte 0x08622794 -_081CBC18: .4byte sub_81CBC64 + 1 + .pool thumb_func_end sub_81CBBB8 thumb_func_start sub_81CBC1C sub_81CBC1C: @ 81CBC1C push {lr} bl sub_81C8234 - ldr r0, _081CBC34 + ldr r0, =sub_81CBC64 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -939165,20 +907031,20 @@ sub_81CBC1C: @ 81CBC1C pop {r0} bx r0 .align 2, 0 -_081CBC34: .4byte sub_81CBC64 + 1 + .pool thumb_func_end sub_81CBC1C thumb_func_start sub_81CBC38 sub_81CBC38: @ 81CBC38 push {r4,lr} adds r4, r0, 0 - ldr r0, _081CBC5C + ldr r0, =sub_81CBC64 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF beq _081CBC56 - ldr r1, _081CBC60 + ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -939189,8 +907055,7 @@ _081CBC56: pop {r0} bx r0 .align 2, 0 -_081CBC5C: .4byte sub_81CBC64 + 1 -_081CBC60: .4byte 0x03005e00 + .pool thumb_func_end sub_81CBC38 thumb_func_start sub_81CBC64 @@ -939202,7 +907067,7 @@ sub_81CBC64: @ 81CBC64 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081CBCD0 + ldr r0, =0x03005e08 adds r2, r1, r0 movs r1, 0x1E ldrsh r0, [r2, r1] @@ -939213,7 +907078,7 @@ sub_81CBC64: @ 81CBC64 movs r1, 0x7F ands r0, r1 strh r0, [r2] - ldr r1, _081CBCD4 + ldr r1, =0x08329f40 movs r3, 0 ldrsh r0, [r2, r3] lsls r0, 1 @@ -939222,25 +907087,25 @@ sub_81CBC64: @ 81CBC64 lsls r0, 16 asrs r0, 20 strh r0, [r2, 0x2] - ldr r0, _081CBCD8 + ldr r0, =0x08622720 adds r1, r0, 0 adds r1, 0x20 movs r3, 0x2 ldrsh r2, [r2, r3] str r2, [sp] - ldr r4, _081CBCDC + ldr r4, =0x020377b4 str r4, [sp, 0x4] movs r2, 0x10 movs r3, 0x10 bl sub_81C79BC - ldr r0, _081CBCE0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 bne _081CBCC8 - ldr r1, _081CBCE4 - ldr r2, _081CBCE8 + ldr r1, =0x02037bb4 + ldr r2, =0x04000008 adds r0, r4, 0 bl CpuSet _081CBCC8: @@ -939249,13 +907114,7 @@ _081CBCC8: pop {r0} bx r0 .align 2, 0 -_081CBCD0: .4byte 0x03005e08 -_081CBCD4: .4byte 0x08329f40 -_081CBCD8: .4byte 0x08622720 -_081CBCDC: .4byte 0x020377b4 -_081CBCE0: .4byte 0x02037fd4 -_081CBCE4: .4byte 0x02037bb4 -_081CBCE8: .4byte 0x04000008 + .pool thumb_func_end sub_81CBC64 thumb_func_start sub_81CBCEC @@ -939284,14 +907143,14 @@ sub_81CBCEC: @ 81CBCEC strh r0, [r6] adds r1, r6, 0 adds r1, 0x40 - ldr r2, _081CBD2C + ldr r2, =0x00005001 adds r0, r2, 0 strh r0, [r1] b _081CBD3C .align 2, 0 -_081CBD2C: .4byte 0x00005001 + .pool _081CBD30: - ldr r0, _081CBD44 + ldr r0, =0x00005002 adds r1, r0, 0 strh r1, [r6] adds r0, r6, 0 @@ -939302,7 +907161,7 @@ _081CBD3C: pop {r0} bx r0 .align 2, 0 -_081CBD44: .4byte 0x00005002 + .pool thumb_func_end sub_81CBCEC thumb_func_start sub_81CBD48 @@ -939319,7 +907178,7 @@ sub_81CBD48: @ 81CBD48 lsls r4, 7 adds r4, 0x3A adds r0, r4 - ldr r2, _081CBD74 + ldr r2, =0x00005002 adds r1, r2, 0 strh r1, [r0] adds r0, 0x40 @@ -939328,17 +907187,17 @@ sub_81CBD48: @ 81CBD48 pop {r0} bx r0 .align 2, 0 -_081CBD74: .4byte 0x00005002 + .pool thumb_func_end sub_81CBD48 thumb_func_start sub_81CBD78 sub_81CBD78: @ 81CBD78 push {r4,lr} adds r4, r0, 0 - ldr r0, _081CBDB8 + ldr r0, =0x086227d8 bl Window_AddFromTemplate strh r0, [r4, 0x10] - ldr r0, _081CBDBC + ldr r0, =0x086227e0 bl Window_AddFromTemplate strh r0, [r4, 0x12] ldrb r0, [r4, 0x10] @@ -939358,8 +907217,7 @@ sub_81CBD78: @ 81CBD78 pop {r0} bx r0 .align 2, 0 -_081CBDB8: .4byte 0x086227d8 -_081CBDBC: .4byte 0x086227e0 + .pool thumb_func_end sub_81CBD78 thumb_func_start sub_81CBDC0 @@ -939390,13 +907248,13 @@ sub_81CBDF4: @ 81CBDF4 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r1, _081CBE08 + ldr r1, =0x085ebe5f movs r2, 0 bl sub_81CBE88 pop {r0} bx r0 .align 2, 0 -_081CBE08: .4byte 0x085ebe5f + .pool thumb_func_end sub_81CBDF4 thumb_func_start sub_81CBE0C @@ -939427,13 +907285,13 @@ sub_81CBE38: @ 81CBE38 push {lr} lsls r0, 16 lsrs r0, 16 - ldr r1, _081CBE4C + ldr r1, =0x085ebe6e movs r2, 0x2 bl sub_81CBE88 pop {r0} bx r0 .align 2, 0 -_081CBE4C: .4byte 0x085ebe6e + .pool thumb_func_end sub_81CBE38 thumb_func_start sub_81CBE50 @@ -939445,7 +907303,7 @@ sub_81CBE50: @ 81CBE50 movs r0, 0x9 bl sub_80847F8 adds r1, r0, 0 - ldr r0, _081CBE84 + ldr r0, =0x0001869f cmp r1, r0 ble _081CBE68 adds r1, r0, 0 @@ -939463,7 +907321,7 @@ _081CBE68: pop {r0} bx r0 .align 2, 0 -_081CBE84: .4byte 0x0001869f + .pool thumb_func_end sub_81CBE50 thumb_func_start sub_81CBE88 @@ -939545,7 +907403,7 @@ sub_81CBEF8: @ 81CBEF8 bl GetMapName b _081CBF24 _081CBF1C: - ldr r1, _081CBF5C + ldr r1, =0x085ec00f add r0, sp, 0xC bl gf_strcpy _081CBF24: @@ -939574,7 +907432,7 @@ _081CBF24: pop {r0} bx r0 .align 2, 0 -_081CBF5C: .4byte 0x085ec00f + .pool thumb_func_end sub_81CBEF8 thumb_func_start sub_81CBF60 @@ -939591,7 +907449,7 @@ sub_81CBF60: @ 81CBF60 b _081CBF9C _081CBF76: ldrb r0, [r5, 0x12] - ldr r2, _081CBFC0 + ldr r2, =0x086227e8 lsls r1, 2 adds r1, r2 ldr r2, [r1] @@ -939626,7 +907484,7 @@ _081CBFAE: pop {r0} bx r0 .align 2, 0 -_081CBFC0: .4byte 0x086227e8 + .pool thumb_func_end sub_81CBF60 thumb_func_start sub_81CBFC4 @@ -939695,7 +907553,7 @@ sub_81CC014: @ 81CC014 sub_81CC034: @ 81CC034 push {r4,lr} adds r4, r0, 0 - ldr r0, _081CC054 + ldr r0, =0x08622808 bl Window_AddFromTemplate strh r0, [r4, 0x14] ldrh r0, [r4, 0x14] @@ -939707,7 +907565,7 @@ sub_81CC034: @ 81CC034 pop {r0} bx r0 .align 2, 0 -_081CC054: .4byte 0x08622808 + .pool thumb_func_end sub_81CC034 thumb_func_start sub_81CC058 @@ -939782,7 +907640,7 @@ sub_81CC0E0: @ 81CC0E0 push {lr} sub sp, 0xC ldrb r0, [r0, 0x14] - ldr r2, _081CC100 + ldr r2, =0x086227f4 movs r1, 0x1 str r1, [sp] str r1, [sp, 0x4] @@ -939795,7 +907653,7 @@ sub_81CC0E0: @ 81CC0E0 pop {r0} bx r0 .align 2, 0 -_081CC100: .4byte 0x086227f4 + .pool thumb_func_end sub_81CC0E0 thumb_func_start sub_81CC104 @@ -939817,7 +907675,7 @@ sub_81CC11C: @ 81CC11C push {lr} sub sp, 0xC ldrb r0, [r0, 0x14] - ldr r2, _081CC13C + ldr r2, =0x085ebf95 movs r1, 0x1 str r1, [sp] str r1, [sp, 0x4] @@ -939830,7 +907688,7 @@ sub_81CC11C: @ 81CC11C pop {r0} bx r0 .align 2, 0 -_081CC13C: .4byte 0x085ebf95 + .pool thumb_func_end sub_81CC11C thumb_func_start sub_81CC140 @@ -939880,23 +907738,22 @@ sub_81CC158: @ 81CC158 sub_81CC194: @ 81CC194 push {r4,lr} adds r4, r0, 0 - ldr r0, _081CC1B0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x1 ands r0, r1 cmp r0, 0 beq _081CC1B8 - ldr r0, _081CC1B4 + ldr r0, =0x03003014 ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] b _081CC1C4 .align 2, 0 -_081CC1B0: .4byte 0x030022c0 -_081CC1B4: .4byte 0x03003014 + .pool _081CC1B8: - ldr r2, _081CC1D8 + ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 @@ -939912,7 +907769,7 @@ _081CC1C4: pop {r1} bx r1 .align 2, 0 -_081CC1D8: .4byte 0x03003014 + .pool thumb_func_end sub_81CC194 thumb_func_start sub_81CC1DC @@ -939954,7 +907811,7 @@ sub_81CC214: @ 81CC214 bl sub_81C763C adds r6, r0, 0 movs r5, 0 - ldr r4, _081CC298 + ldr r4, =0x08622810 _081CC224: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load @@ -939962,20 +907819,20 @@ _081CC224: adds r5, 0x1 cmp r5, 0 beq _081CC224 - ldr r0, _081CC29C + ldr r0, =0x08622818 bl sub_81C795C movs r0, 0 str r0, [r6, 0x1C] - ldr r1, _081CC2A0 + ldr r1, =0x00001828 adds r0, r6, r1 str r0, [sp] - ldr r1, _081CC2A4 + ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 movs r1, 0x80 lsls r1, 4 orrs r0, r1 - ldr r1, _081CC2A8 + ldr r1, =0x0000ffff ands r0, r1 movs r1, 0x80 lsls r1, 12 @@ -939983,11 +907840,11 @@ _081CC224: str r0, [sp, 0x4] mov r0, sp bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r2, _081CC2AC + ldr r2, =0x00001824 adds r1, r6, r2 lsls r0, 16 lsrs r0, 11 - ldr r2, _081CC2B0 + ldr r2, =0x06010000 adds r0, r2 str r0, [r1] movs r0, 0xD @@ -940010,13 +907867,7 @@ _081CC224: pop {r0} bx r0 .align 2, 0 -_081CC298: .4byte 0x08622810 -_081CC29C: .4byte 0x08622818 -_081CC2A0: .4byte 0x00001828 -_081CC2A4: .4byte 0xffff0000 -_081CC2A8: .4byte 0x0000ffff -_081CC2AC: .4byte 0x00001824 -_081CC2B0: .4byte 0x06010000 + .pool thumb_func_end sub_81CC214 thumb_func_start sub_81CC2B4 @@ -940056,7 +907907,7 @@ sub_81CC2F0: @ 81CC2F0 ldr r0, [r4, 0x1C] cmp r0, 0 bne _081CC320 - ldr r0, _081CC328 + ldr r0, =0x08622830 movs r1, 0x4 movs r2, 0x50 movs r3, 0x5 @@ -940066,7 +907917,7 @@ sub_81CC2F0: @ 81CC2F0 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _081CC32C + ldr r0, =0x02020630 adds r1, r0 str r1, [r4, 0x1C] adds r0, r4, 0 @@ -940077,8 +907928,7 @@ _081CC320: pop {r0} bx r0 .align 2, 0 -_081CC328: .4byte 0x08622830 -_081CC32C: .4byte 0x02020630 + .pool thumb_func_end sub_81CC2F0 thumb_func_start sub_81CC330 @@ -940128,7 +907978,7 @@ _081CC36C: thumb_func_start sub_81CC370 sub_81CC370: @ 81CC370 push {lr} - ldr r0, _081CC394 + ldr r0, =0x08622850 movs r1, 0x2C movs r2, 0x68 movs r3, 0x6 @@ -940139,13 +907989,12 @@ sub_81CC370: @ 81CC370 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081CC398 + ldr r1, =0x02020630 adds r0, r1 pop {r1} bx r1 .align 2, 0 -_081CC394: .4byte 0x08622850 -_081CC398: .4byte 0x02020630 + .pool thumb_func_end sub_81CC370 thumb_func_start sub_81CC39C @@ -940157,21 +908006,21 @@ sub_81CC39C: @ 81CC39C cmp r0, 0 blt _081CC400 lsls r4, r0, 3 - ldr r0, _081CC408 + ldr r0, =0x08305654 adds r0, r4, r0 - ldr r1, _081CC40C + ldr r1, =0x00001828 adds r5, r7, r1 adds r1, r5, 0 movs r2, 0 bl sub_80345F0 - ldr r0, _081CC410 + ldr r0, =0x0830593c adds r4, r0 ldr r0, [r4] - ldr r1, _081CC414 + ldr r1, =0x00002028 adds r6, r7, r1 adds r1, r6, 0 bl LZ77UnCompWram - ldr r1, _081CC418 + ldr r1, =0x00001824 adds r0, r7, r1 ldr r1, [r0] movs r2, 0x80 @@ -940192,43 +908041,38 @@ sub_81CC39C: @ 81CC39C ldr r0, [r7, 0x20] strh r4, [r0, 0x3C] ldr r1, [r7, 0x20] - ldr r0, _081CC41C + ldr r0, =sub_81CC440 + 1 str r0, [r1, 0x1C] _081CC400: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081CC408: .4byte 0x08305654 -_081CC40C: .4byte 0x00001828 -_081CC410: .4byte 0x0830593c -_081CC414: .4byte 0x00002028 -_081CC418: .4byte 0x00001824 -_081CC41C: .4byte sub_81CC440 + 1 + .pool thumb_func_end sub_81CC39C thumb_func_start sub_81CC420 sub_81CC420: @ 81CC420 ldr r1, [r0, 0x20] - ldr r0, _081CC428 + ldr r0, =sub_81CC4A4 + 1 str r0, [r1, 0x1C] bx lr .align 2, 0 -_081CC428: .4byte sub_81CC4A4 + 1 + .pool thumb_func_end sub_81CC420 thumb_func_start sub_81CC42C sub_81CC42C: @ 81CC42C ldr r0, [r0, 0x20] ldr r1, [r0, 0x1C] - ldr r0, _081CC43C + ldr r0, =nullsub_12 + 1 eors r1, r0 negs r0, r1 orrs r0, r1 lsrs r0, 31 bx lr .align 2, 0 -_081CC43C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81CC42C thumb_func_start sub_81CC440 @@ -940252,7 +908096,7 @@ _081CC452: negs r1, r1 cmp r0, r1 beq _081CC498 - ldr r0, _081CC480 + ldr r0, =0x0000ffb0 strh r0, [r4, 0x24] adds r2, r4, 0 adds r2, 0x3E @@ -940266,7 +908110,7 @@ _081CC452: strh r0, [r4, 0x2E] b _081CC498 .align 2, 0 -_081CC480: .4byte 0x0000ffb0 + .pool _081CC484: ldrh r0, [r4, 0x24] adds r0, 0x8 @@ -940276,14 +908120,14 @@ _081CC484: blt _081CC498 movs r0, 0 strh r0, [r4, 0x24] - ldr r0, _081CC4A0 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _081CC498: pop {r4} pop {r0} bx r0 .align 2, 0 -_081CC4A0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81CC440 thumb_func_start sub_81CC4A4 @@ -940305,13 +908149,13 @@ sub_81CC4A4: @ 81CC4A4 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _081CC4D0 + ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] _081CC4CA: pop {r0} bx r0 .align 2, 0 -_081CC4D0: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81CC4A4 thumb_func_start sub_81CC4D4 @@ -940323,7 +908167,7 @@ sub_81CC4D4: @ 81CC4D4 adds r4, r0, 0 cmp r4, 0 beq _081CC4F0 - ldr r1, _081CC4F4 + ldr r1, =0x00000884 movs r0, 0x10 bl sub_81C761C cmp r0, 0 @@ -940332,21 +908176,20 @@ _081CC4F0: movs r0, 0 b _081CC51A .align 2, 0 -_081CC4F4: .4byte 0x00000884 + .pool _081CC4F8: - ldr r0, _081CC50C + ldr r0, =0x02037318 ldrb r0, [r0, 0x14] bl sub_8124668 str r0, [r4, 0xC] cmp r0, 0 bne _081CC514 - ldr r0, _081CC510 + ldr r0, =sub_81CC568 + 1 b _081CC516 .align 2, 0 -_081CC50C: .4byte 0x02037318 -_081CC510: .4byte sub_81CC568 + 1 + .pool _081CC514: - ldr r0, _081CC520 + ldr r0, =sub_81CC5B4 + 1 _081CC516: str r0, [r4, 0x10] movs r0, 0x1 @@ -940355,14 +908198,14 @@ _081CC51A: pop {r1} bx r1 .align 2, 0 -_081CC520: .4byte sub_81CC5B4 + 1 + .pool thumb_func_end sub_81CC4D4 thumb_func_start sub_81CC524 sub_81CC524: @ 81CC524 push {lr} bl sub_8124658 - ldr r1, _081CC550 + ldr r1, =0x03005d90 ldr r3, [r1] movs r1, 0x1 ands r1, r0 @@ -940380,7 +908223,7 @@ sub_81CC524: @ 81CC524 pop {r0} bx r0 .align 2, 0 -_081CC550: .4byte 0x03005d90 + .pool thumb_func_end sub_81CC524 thumb_func_start sub_81CC554 @@ -940426,12 +908269,12 @@ _081CC59A: movs r0, 0x2 b _081CC5AE _081CC59E: - ldr r0, _081CC5A8 + ldr r0, =sub_81CC5DC + 1 str r0, [r4, 0x10] movs r0, 0x4 b _081CC5AE .align 2, 0 -_081CC5A8: .4byte sub_81CC5DC + 1 + .pool _081CC5AC: movs r0, 0 _081CC5AE: @@ -940444,7 +908287,7 @@ _081CC5AE: sub_81CC5B4: @ 81CC5B4 push {lr} adds r2, r0, 0 - ldr r0, _081CC5C8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -940453,24 +908296,24 @@ sub_81CC5B4: @ 81CC5B4 movs r0, 0 b _081CC5D2 .align 2, 0 -_081CC5C8: .4byte 0x030022c0 + .pool _081CC5CC: - ldr r0, _081CC5D8 + ldr r0, =sub_81CC5DC + 1 str r0, [r2, 0x10] movs r0, 0x4 _081CC5D2: pop {r1} bx r1 .align 2, 0 -_081CC5D8: .4byte sub_81CC5DC + 1 + .pool thumb_func_end sub_81CC5B4 thumb_func_start sub_81CC5DC sub_81CC5DC: @ 81CC5DC - ldr r0, _081CC5E0 + ldr r0, =0x000186a1 bx lr .align 2, 0 -_081CC5E0: .4byte 0x000186a1 + .pool thumb_func_end sub_81CC5DC thumb_func_start sub_81CC5E4 @@ -940486,24 +908329,22 @@ sub_81CC5E4: @ 81CC5E4 thumb_func_start sub_81CC5F4 sub_81CC5F4: @ 81CC5F4 push {r4,lr} - ldr r1, _081CC618 + ldr r1, =0x00001948 movs r0, 0x4 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 beq _081CC624 - ldr r0, _081CC61C + ldr r0, =sub_81CC6F4 + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, _081CC620 + ldr r0, =sub_81CC6BC + 1 str r0, [r4] movs r0, 0x1 b _081CC626 .align 2, 0 -_081CC618: .4byte 0x00001948 -_081CC61C: .4byte sub_81CC6F4 + 1 -_081CC620: .4byte sub_81CC6BC + 1 + .pool _081CC624: movs r0, 0 _081CC626: @@ -940519,21 +908360,20 @@ sub_81CC62C: @ 81CC62C movs r0, 0x4 bl sub_81C763C adds r5, r0, 0 - ldr r0, _081CC654 + ldr r0, =0x086230e4 lsls r4, 2 adds r4, r0 ldr r0, [r4] movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, _081CC658 + ldr r0, =sub_81CC6BC + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081CC654: .4byte 0x086230e4 -_081CC658: .4byte sub_81CC6BC + 1 + .pool thumb_func_end sub_81CC62C thumb_func_start sub_81CC65C @@ -940597,7 +908437,7 @@ sub_81CC6D0: @ 81CC6D0 bl sub_81CC5E4 cmp r0, 0 bne _081CC6EC - ldr r0, _081CC6E8 + ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x15] lsrs r0, 3 @@ -940605,7 +908445,7 @@ sub_81CC6D0: @ 81CC6D0 ands r0, r1 b _081CC6EE .align 2, 0 -_081CC6E8: .4byte 0x03005d90 + .pool _081CC6EC: movs r0, 0 _081CC6EE: @@ -940625,12 +908465,12 @@ sub_81CC6F4: @ 81CC6F4 b _081CC83E _081CC706: lsls r0, r4, 2 - ldr r1, _081CC710 + ldr r1, =_081CC714 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CC710: .4byte _081CC714 + .pool .align 2, 0 _081CC714: .4byte _081CC734 @@ -940652,7 +908492,7 @@ _081CC734: bl gpu_sync_bg_hide movs r0, 0x1 bl call_gpu_set_bg_mode - ldr r4, _081CC780 + ldr r4, =0x086230d8 adds r0, r4, 0 movs r1, 0x2 bl sub_81C7B54 @@ -940672,7 +908512,7 @@ _081CC77C: movs r0, 0 b _081CC840 .align 2, 0 -_081CC780: .4byte 0x086230d8 + .pool _081CC784: bl sub_8122DB0 lsls r0, 24 @@ -940723,11 +908563,11 @@ _081CC7E2: bl gpu_sync_bg_show movs r0, 0x2 bl gpu_sync_bg_show - ldr r0, _081CC800 + ldr r0, =sub_81CC6A4 + 1 bl c3args_set_0toR1_1to0 b _081CC77C .align 2, 0 -_081CC800: .4byte sub_81CC6A4 + 1 + .pool _081CC804: bl sub_81CC6D0 lsls r0, 24 @@ -940966,7 +908806,7 @@ _081CC9BA: sub_81CC9C0: @ 81CC9C0 push {r4,r5,lr} movs r5, 0 - ldr r4, _081CC9E4 + ldr r4, =0x086230f8 _081CC9C6: adds r0, r4, 0 bl gpu_tile_obj_decompress_and_load @@ -940974,15 +908814,14 @@ _081CC9C6: adds r5, 0x1 cmp r5, 0 beq _081CC9C6 - ldr r0, _081CC9E8 + ldr r0, =0x08623100 bl sub_81C795C bl sub_81CCE58 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081CC9E4: .4byte 0x086230f8 -_081CC9E8: .4byte 0x08623100 + .pool thumb_func_end sub_81CC9C0 thumb_func_start sub_81CC9EC @@ -941031,14 +908870,14 @@ sub_81CCA1C: @ 81CCA1C strh r0, [r1] adds r4, r5, 0 adds r4, 0x18 - ldr r2, _081CCAC8 + ldr r2, =0x01000400 adds r0, r1, 0 adds r1, r4, 0 bl CpuSet movs r0, 0x1 adds r1, r4, 0 bl bg_set_tilemap - ldr r0, _081CCACC + ldr r0, =0x08623110 bl Window_AddFromTemplate movs r4, 0 strh r0, [r5, 0x8] @@ -941051,7 +908890,7 @@ sub_81CCA1C: @ 81CCA1C movs r1, 0x42 movs r2, 0x4 bl sub_8098858 - ldr r1, _081CCAD0 + ldr r1, =0x08622888 str r4, [sp] movs r0, 0x1 movs r2, 0 @@ -941065,11 +908904,11 @@ sub_81CCA1C: @ 81CCA1C ldrb r0, [r5, 0x8] movs r1, 0x3 bl Window_CopyToVram - ldr r0, _081CCAD4 + ldr r0, =0x08622868 movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 - ldr r0, _081CCAD8 + ldr r0, =0x08dc91e8 movs r1, 0x30 movs r2, 0x20 bl sub_81C7944 @@ -941077,18 +908916,13 @@ sub_81CCA1C: @ 81CCA1C lsls r0, 24 cmp r0, 0 bne _081CCAE0 - ldr r1, _081CCADC + ldr r1, =0xffffa000 movs r0, 0x1 movs r2, 0 bl bg_change_y_offset b _081CCAEA .align 2, 0 -_081CCAC8: .4byte 0x01000400 -_081CCACC: .4byte 0x08623110 -_081CCAD0: .4byte 0x08622888 -_081CCAD4: .4byte 0x08622868 -_081CCAD8: .4byte 0x08dc91e8 -_081CCADC: .4byte 0xffffa000 + .pool _081CCAE0: movs r0, 0x1 movs r1, 0 @@ -941129,12 +908963,12 @@ sub_81CCB0C: @ 81CCB0C b _081CCC40 _081CCB22: lsls r0, 2 - ldr r1, _081CCB2C + ldr r1, =_081CCB30 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CCB2C: .4byte _081CCB30 + .pool .align 2, 0 _081CCB30: .4byte _081CCC1C @@ -941196,7 +909030,7 @@ _081CCB8E: movs r1, 0x7 movs r3, 0 bl Print - ldr r1, _081CCBD8 + ldr r1, =0x00001041 movs r0, 0xC str r0, [sp] movs r0, 0xB @@ -941209,7 +909043,7 @@ _081CCB8E: bl Bg_FillWramTileMapRectWithTileAndPalette b _081CCC0C .align 2, 0 -_081CCBD8: .4byte 0x00001041 + .pool _081CCBDC: ldrb r0, [r4, 0x8] movs r1, 0x11 @@ -941239,7 +909073,7 @@ _081CCC0C: bl sub_81CCFA4 b _081CCC40 _081CCC1C: - ldr r1, _081CCC48 + ldr r1, =0x00001041 movs r0, 0xC str r0, [sp] movs r0, 0xD @@ -941260,7 +909094,7 @@ _081CCC40: pop {r0} bx r0 .align 2, 0 -_081CCC48: .4byte 0x00001041 + .pool thumb_func_end sub_81CCB0C thumb_func_start sub_81CCC4C @@ -941277,12 +909111,12 @@ sub_81CCC4C: @ 81CCC4C sub_81CCC5C: @ 81CCC5C push {r4,lr} adds r4, r0, 0 - ldr r0, _081CCC80 + ldr r0, =sub_81CCC9C + 1 movs r1, 0x3 bl AddTask lsls r0, 24 lsrs r0, 24 - ldr r2, _081CCC84 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -941292,21 +909126,20 @@ sub_81CCC5C: @ 81CCC5C pop {r0} bx r0 .align 2, 0 -_081CCC80: .4byte sub_81CCC9C + 1 -_081CCC84: .4byte 0x03005e00 + .pool thumb_func_end sub_81CCC5C thumb_func_start sub_81CCC88 sub_81CCC88: @ 81CCC88 push {lr} - ldr r0, _081CCC98 + ldr r0, =sub_81CCC9C + 1 bl is_function_an_active_task lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 .align 2, 0 -_081CCC98: .4byte sub_81CCC9C + 1 + .pool thumb_func_end sub_81CCC88 thumb_func_start sub_81CCC9C @@ -941315,7 +909148,7 @@ sub_81CCC9C: @ 81CCC9C lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - ldr r1, _081CCCDC + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -941341,14 +909174,14 @@ _081CCCD6: bl sub_81CCF78 b _081CCD04 .align 2, 0 -_081CCCDC: .4byte 0x03005e00 + .pool _081CCCE0: movs r1, 0x90 lsls r1, 3 movs r0, 0x1 movs r2, 0x2 bl bg_change_y_offset - ldr r1, _081CCD0C + ldr r1, =0xffffa000 cmp r0, r1 bgt _081CCD00 movs r0, 0x1 @@ -941363,30 +909196,30 @@ _081CCD04: pop {r0} bx r0 .align 2, 0 -_081CCD0C: .4byte 0xffffa000 + .pool thumb_func_end sub_81CCC9C thumb_func_start sub_81CCD10 sub_81CCD10: @ 81CCD10 push {lr} - ldr r0, _081CCD20 + ldr r0, =sub_81CCD34 + 1 movs r1, 0x1 bl sub_81C7078 pop {r0} bx r0 .align 2, 0 -_081CCD20: .4byte sub_81CCD34 + 1 + .pool thumb_func_end sub_81CCD10 thumb_func_start sub_81CCD24 sub_81CCD24: @ 81CCD24 push {lr} - ldr r0, _081CCD30 + ldr r0, =sub_81CCD34 + 1 bl sub_81C7124 pop {r1} bx r1 .align 2, 0 -_081CCD30: .4byte sub_81CCD34 + 1 + .pool thumb_func_end sub_81CCD24 thumb_func_start sub_81CCD34 @@ -941401,14 +909234,14 @@ sub_81CCD34: @ 81CCD34 movs r0, 0x4 b _081CCD62 _081CCD48: - ldr r0, _081CCD68 + ldr r0, =0x08623118 lsls r1, r4, 3 adds r0, 0x4 adds r1, r0 ldr r0, [r1] movs r1, 0xC8 muls r1, r4 - ldr r3, _081CCD6C + ldr r3, =0x00000818 adds r1, r3 adds r1, r2, r1 bl LZ77UnCompWram @@ -941418,8 +909251,7 @@ _081CCD62: pop {r1} bx r1 .align 2, 0 -_081CCD68: .4byte 0x08623118 -_081CCD6C: .4byte 0x00000818 + .pool thumb_func_end sub_81CCD34 thumb_func_start sub_81CCD70 @@ -941429,7 +909261,7 @@ sub_81CCD70: @ 81CCD70 adds r6, r0, 0 adds r3, r1, 0 movs r4, 0 - ldr r0, _081CCDDC + ldr r0, =0x08623118 ldrh r1, [r0] adds r5, r0, 0 cmp r1, r3 @@ -941452,7 +909284,7 @@ _081CCD8A: _081CCDA0: cmp r4, 0x16 beq _081CCDD4 - ldr r1, _081CCDE0 + ldr r1, =0x00001041 movs r0, 0xC str r0, [sp] movs r0, 0xB @@ -941464,7 +909296,7 @@ _081CCDA0: movs r0, 0xC8 adds r1, r4, 0 muls r1, r0 - ldr r0, _081CCDE4 + ldr r0, =0x00000818 adds r1, r0 adds r1, r6, r1 movs r0, 0xA @@ -941480,9 +909312,7 @@ _081CCDD4: pop {r0} bx r0 .align 2, 0 -_081CCDDC: .4byte 0x08623118 -_081CCDE0: .4byte 0x00001041 -_081CCDE4: .4byte 0x00000818 + .pool thumb_func_end sub_81CCD70 thumb_func_start sub_81CCDE8 @@ -941494,7 +909324,7 @@ sub_81CCDE8: @ 81CCDE8 sub sp, 0xC mov r9, r0 movs r5, 0 - ldr r6, _081CCE04 + ldr r6, =0x02021cc4 movs r4, 0x88 lsls r4, 21 lsls r1, 24 @@ -941502,7 +909332,7 @@ sub_81CCDE8: @ 81CCDE8 lsls r7, r2, 24 b _081CCE34 .align 2, 0 -_081CCE04: .4byte 0x02021cc4 + .pool _081CCE08: adds r0, r6, 0 movs r2, 0 @@ -941566,7 +909396,7 @@ _081CCE74: lsls r6, 16 _081CCE80: asrs r1, r6, 16 - ldr r0, _081CCEE4 + ldr r0, =0x086231d0 asrs r2, r7, 16 movs r3, 0x8 bl obj_add_from_template_forward_search @@ -941575,7 +909405,7 @@ _081CCE80: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _081CCEE8 + ldr r0, =0x02020630 adds r2, r0 movs r0, 0 strh r0, [r2, 0x2E] @@ -941590,10 +909420,10 @@ _081CCE80: strh r0, [r2, 0x34] strh r4, [r2, 0x36] adds r1, r4 - ldr r4, _081CCEEC + ldr r4, =0x000003ff adds r0, r4, 0 ands r1, r0 - ldr r4, _081CCEF0 + ldr r4, =0xfffffc00 adds r0, r4, 0 ands r3, r0 orrs r3, r1 @@ -941615,10 +909445,7 @@ _081CCE80: pop {r0} bx r0 .align 2, 0 -_081CCEE4: .4byte 0x086231d0 -_081CCEE8: .4byte 0x02020630 -_081CCEEC: .4byte 0x000003ff -_081CCEF0: .4byte 0xfffffc00 + .pool thumb_func_end sub_81CCE58 thumb_func_start sub_81CCEF4 @@ -941654,11 +909481,11 @@ _081CCF26: ldrh r5, [r3, 0x30] ldrh r2, [r3, 0x32] adds r1, r5, r2 - ldr r2, _081CCF54 + ldr r2, =0x000003ff adds r0, r2, 0 ands r1, r0 ldrh r2, [r3, 0x4] - ldr r0, _081CCF58 + ldr r0, =0xfffffc00 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] @@ -941675,8 +909502,7 @@ _081CCF26: strh r0, [r3, 0x38] b _081CCF6C .align 2, 0 -_081CCF54: .4byte 0x000003ff -_081CCF58: .4byte 0xfffffc00 + .pool _081CCF5C: lsls r0, r5, 16 asrs r0, 16 @@ -941753,31 +909579,27 @@ _081CCFBE: thumb_func_start sub_81CCFD8 sub_81CCFD8: @ 81CCFD8 push {r4,lr} - ldr r1, _081CD008 + ldr r1, =0x0000678c movs r0, 0xB bl sub_81C761C adds r4, r0, 0 cmp r4, 0 beq _081CD01C - ldr r1, _081CD00C + ldr r1, =0x00006428 adds r0, r4, r1 bl sub_81D1ED4 bl sub_81CD970 - ldr r1, _081CD010 + ldr r1, =0x030022b0 movs r0, 0x14 strh r0, [r1] - ldr r0, _081CD014 + ldr r0, =0x00006304 adds r1, r4, r0 - ldr r0, _081CD018 + ldr r0, =sub_81CD08C + 1 str r0, [r1] movs r0, 0x1 b _081CD01E .align 2, 0 -_081CD008: .4byte 0x0000678c -_081CD00C: .4byte 0x00006428 -_081CD010: .4byte 0x030022b0 -_081CD014: .4byte 0x00006304 -_081CD018: .4byte sub_81CD08C + 1 + .pool _081CD01C: movs r0, 0 _081CD01E: @@ -941789,31 +909611,27 @@ _081CD01E: thumb_func_start sub_81CD024 sub_81CD024: @ 81CD024 push {r4,lr} - ldr r1, _081CD054 + ldr r1, =0x0000678c movs r0, 0xB bl sub_81C761C adds r4, r0, 0 cmp r4, 0 beq _081CD068 - ldr r1, _081CD058 + ldr r1, =0x00006428 adds r0, r4, r1 bl sub_81D1ED4 bl sub_81CD9F8 - ldr r1, _081CD05C + ldr r1, =0x030022b0 movs r0, 0x14 strh r0, [r1] - ldr r0, _081CD060 + ldr r0, =0x00006304 adds r1, r4, r0 - ldr r0, _081CD064 + ldr r0, =sub_81CD08C + 1 str r0, [r1] movs r0, 0x1 b _081CD06A .align 2, 0 -_081CD054: .4byte 0x0000678c -_081CD058: .4byte 0x00006428 -_081CD05C: .4byte 0x030022b0 -_081CD060: .4byte 0x00006304 -_081CD064: .4byte sub_81CD08C + 1 + .pool _081CD068: movs r0, 0 _081CD06A: @@ -941827,14 +909645,14 @@ sub_81CD070: @ 81CD070 push {lr} movs r0, 0xB bl sub_81C763C - ldr r2, _081CD088 + ldr r2, =0x00006304 adds r1, r0, r2 ldr r1, [r1] bl _call_via_r1 pop {r1} bx r1 .align 2, 0 -_081CD088: .4byte 0x00006304 + .pool thumb_func_end sub_81CD070 thumb_func_start sub_81CD08C @@ -941850,7 +909668,7 @@ sub_81CD08C: @ 81CD08C lsrs r2, r0, 24 cmp r2, 0 bne _081CD100 - ldr r0, _081CD0E4 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -941874,23 +909692,21 @@ sub_81CD08C: @ 81CD08C _081CD0D0: movs r0, 0x5 bl audio_play - ldr r0, _081CD0E8 + ldr r0, =0x00006304 adds r1, r4, r0 - ldr r0, _081CD0EC + ldr r0, =sub_81CD19C + 1 str r0, [r1] movs r2, 0x2 b _081CD100 .align 2, 0 -_081CD0E4: .4byte 0x030022c0 -_081CD0E8: .4byte 0x00006304 -_081CD0EC: .4byte sub_81CD19C + 1 + .pool _081CD0F0: movs r0, 0x5 bl audio_play movs r2, 0x5 - ldr r0, _081CD108 + ldr r0, =0x00006304 adds r1, r4, r0 - ldr r0, _081CD10C + ldr r0, =sub_81CD110 + 1 str r0, [r1] _081CD100: adds r0, r2, 0 @@ -941898,8 +909714,7 @@ _081CD100: pop {r1} bx r1 .align 2, 0 -_081CD108: .4byte 0x00006304 -_081CD10C: .4byte sub_81CD110 + 1 + .pool thumb_func_end sub_81CD08C thumb_func_start sub_81CD110 @@ -941913,11 +909728,11 @@ sub_81CD110: @ 81CD110 cmp r0, 0 bne _081CD18A bl sub_81CEF14 - ldr r1, _081CD168 + ldr r1, =0x00006786 adds r5, r6, r1 movs r1, 0 ldrsb r1, [r5, r1] - ldr r2, _081CD16C + ldr r2, =0x00006783 adds r4, r6, r2 adds r1, r4, r1 strb r0, [r1] @@ -941938,16 +909753,14 @@ sub_81CD110: @ 81CD110 bne _081CD174 movs r0, 0x64 muls r0, r3 - ldr r1, _081CD170 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x8 mov r2, sp bl pokemon_setattr b _081CD180 .align 2, 0 -_081CD168: .4byte 0x00006786 -_081CD16C: .4byte 0x00006783 -_081CD170: .4byte 0x020244ec + .pool _081CD174: adds r0, r2, 0 adds r1, r3, 0 @@ -941955,9 +909768,9 @@ _081CD174: mov r3, sp bl set_pokemon_data_from_any_box _081CD180: - ldr r0, _081CD194 + ldr r0, =0x00006304 adds r1, r6, r0 - ldr r0, _081CD198 + ldr r0, =sub_81CD08C + 1 str r0, [r1] movs r4, 0x6 _081CD18A: @@ -941967,8 +909780,7 @@ _081CD18A: pop {r1} bx r1 .align 2, 0 -_081CD194: .4byte 0x00006304 -_081CD198: .4byte sub_81CD08C + 1 + .pool thumb_func_end sub_81CD110 thumb_func_start sub_81CD19C @@ -941980,17 +909792,17 @@ sub_81CD19C: @ 81CD19C ldrb r0, [r0] cmp r0, 0 beq _081CD1B4 - ldr r0, _081CD1B0 + ldr r0, =0x000186aa b _081CD1B6 .align 2, 0 -_081CD1B0: .4byte 0x000186aa + .pool _081CD1B4: - ldr r0, _081CD1BC + ldr r0, =0x000186a2 _081CD1B6: pop {r1} bx r1 .align 2, 0 -_081CD1BC: .4byte 0x000186a2 + .pool thumb_func_end sub_81CD19C thumb_func_start sub_81CD1C0 @@ -942021,7 +909833,7 @@ sub_81CD1E4: @ 81CD1E4 bl sub_81C763C adds r2, r0, 0 movs r3, 0 - ldr r0, _081CD21C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2C] movs r0, 0x40 ands r0, r1 @@ -942042,7 +909854,7 @@ _081CD210: movs r0, 0x1 b _081CD246 .align 2, 0 -_081CD21C: .4byte 0x030022c0 + .pool _081CD220: movs r0, 0x80 ands r0, r1 @@ -942091,13 +909903,13 @@ sub_81CD258: @ 81CD258 mov r0, r8 cmp r0, 0 beq _081CD284 - ldr r1, _081CD280 + ldr r1, =0x00006788 adds r0, r4, r1 b _081CD288 .align 2, 0 -_081CD280: .4byte 0x00006788 + .pool _081CD284: - ldr r2, _081CD2C8 + ldr r2, =0x00006787 adds r0, r4, r2 _081CD288: ldrb r0, [r0] @@ -942106,16 +909918,16 @@ _081CD288: lsls r0, 16 lsrs r0, 16 adds r7, r0, 0 - ldr r1, _081CD2CC + ldr r1, =0x00006428 adds r0, r4, r1 - ldr r2, _081CD2D0 + ldr r2, =0x00006786 adds r1, r4, r2 movs r2, 0 ldrsb r2, [r1, r2] lsls r1, r2, 2 adds r1, r2 lsls r1, 2 - ldr r3, _081CD2D4 + ldr r3, =0x0000643c adds r1, r3 adds r1, r4, r1 lsls r2, r7, 2 @@ -942131,10 +909943,7 @@ _081CD288: ldrh r1, [r5] b _081CD2DC .align 2, 0 -_081CD2C8: .4byte 0x00006787 -_081CD2CC: .4byte 0x00006428 -_081CD2D0: .4byte 0x00006786 -_081CD2D4: .4byte 0x0000643c + .pool _081CD2D8: ldrh r1, [r5] subs r1, 0x1 @@ -942147,19 +909956,19 @@ _081CD2DC: mov r0, r8 cmp r0, 0 beq _081CD332 - ldr r1, _081CD320 + ldr r1, =0x00006787 adds r2, r4, r1 ldrb r0, [r2] adds r1, 0x1 adds r3, r4, r1 strb r0, [r3] - ldr r0, _081CD324 + ldr r0, =0x00006786 adds r1, r4, r0 ldrb r0, [r1] strb r0, [r2] strb r7, [r1] ldrb r1, [r3] - ldr r2, _081CD328 + ldr r2, =0x00006789 adds r0, r4, r2 strb r1, [r0] ldrh r0, [r5, 0x2] @@ -942175,27 +909984,25 @@ _081CD312: subs r1, 0x1 b _081CD384 .align 2, 0 -_081CD320: .4byte 0x00006787 -_081CD324: .4byte 0x00006786 -_081CD328: .4byte 0x00006789 + .pool _081CD32C: ldrh r0, [r5] subs r1, r0, 0x1 b _081CD384 _081CD332: - ldr r0, _081CD360 + ldr r0, =0x00006788 adds r2, r4, r0 ldrb r0, [r2] - ldr r1, _081CD364 + ldr r1, =0x00006787 adds r3, r4, r1 strb r0, [r3] - ldr r0, _081CD368 + ldr r0, =0x00006786 adds r1, r4, r0 ldrb r0, [r1] strb r0, [r2] strb r7, [r1] ldrb r1, [r3] - ldr r2, _081CD36C + ldr r2, =0x00006789 adds r0, r4, r2 strb r1, [r0] ldrh r1, [r5, 0x2] @@ -942206,10 +910013,7 @@ _081CD332: adds r0, r1, 0x1 b _081CD372 .align 2, 0 -_081CD360: .4byte 0x00006788 -_081CD364: .4byte 0x00006787 -_081CD368: .4byte 0x00006786 -_081CD36C: .4byte 0x00006789 + .pool _081CD370: movs r0, 0 _081CD372: @@ -942224,7 +910028,7 @@ _081CD372: _081CD382: movs r1, 0 _081CD384: - ldr r2, _081CD398 + ldr r2, =0x00006302 adds r0, r4, r2 strh r1, [r0] ldrh r4, [r5, 0x2] @@ -942234,7 +910038,7 @@ _081CD384: ldrh r1, [r5] b _081CD3A0 .align 2, 0 -_081CD398: .4byte 0x00006302 + .pool _081CD39C: ldrh r1, [r5] subs r1, 0x1 @@ -942271,7 +910075,7 @@ sub_81CD3C4: @ 81CD3C4 movs r0, 0x12 bl sub_81C763C adds r2, r0, 0 - ldr r1, _081CD3EC + ldr r1, =0x0000678a adds r0, r4, r1 ldrb r0, [r0] cmp r0, 0x9 @@ -942279,13 +910083,12 @@ sub_81CD3C4: @ 81CD3C4 b _081CD530 _081CD3E2: lsls r0, 2 - ldr r1, _081CD3F0 + ldr r1, =_081CD3F4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CD3EC: .4byte 0x0000678a -_081CD3F0: .4byte _081CD3F4 + .pool .align 2, 0 _081CD3F4: .4byte _081CD41C @@ -942320,7 +910123,7 @@ _081CD440: ldrh r0, [r2] cmp r0, 0x1 bne _081CD468 - ldr r2, _081CD464 + ldr r2, =0x00006786 adds r0, r4, r2 movs r1, 0 strb r1, [r0] @@ -942336,25 +910139,23 @@ _081CD440: movs r0, 0x1 b _081CD53C .align 2, 0 -_081CD464: .4byte 0x00006786 + .pool _081CD468: - ldr r0, _081CD484 + ldr r0, =0x00006786 adds r1, r4, r0 movs r0, 0 strb r0, [r1] - ldr r2, _081CD488 + ldr r2, =0x00006787 adds r1, r4, r2 movs r0, 0x1 strb r0, [r1] - ldr r0, _081CD48C + ldr r0, =0x00006788 adds r1, r4, r0 movs r0, 0x2 strb r0, [r1] b _081CD530 .align 2, 0 -_081CD484: .4byte 0x00006786 -_081CD488: .4byte 0x00006787 -_081CD48C: .4byte 0x00006788 + .pool _081CD490: ldrh r0, [r2, 0x2] adds r0, 0x1 @@ -942432,16 +910233,16 @@ _081CD514: asrs r0, 16 movs r1, 0x2 bl sub_81CDB98 - ldr r2, _081CD52C + ldr r2, =0x0000678a adds r1, r4, r2 movs r0, 0 strb r0, [r1] movs r0, 0x1 b _081CD53C .align 2, 0 -_081CD52C: .4byte 0x0000678a + .pool _081CD530: - ldr r0, _081CD544 + ldr r0, =0x0000678a adds r1, r4, r0 ldrb r0, [r1] adds r0, 0x1 @@ -942452,7 +910253,7 @@ _081CD53C: pop {r1} bx r1 .align 2, 0 -_081CD544: .4byte 0x0000678a + .pool thumb_func_end sub_81CD3C4 thumb_func_start sub_81CD548 @@ -942476,45 +910277,42 @@ _081CD566: beq _081CD5A4 b _081CD5C4 _081CD56C: - ldr r2, _081CD580 + ldr r2, =0x00006302 adds r0, r1, r2 movs r2, 0 ldrsh r0, [r0, r2] - ldr r2, _081CD584 + ldr r2, =0x00006789 adds r1, r2 ldrb r1, [r1] bl sub_81CD824 b _081CD5C4 .align 2, 0 -_081CD580: .4byte 0x00006302 -_081CD584: .4byte 0x00006789 + .pool _081CD588: - ldr r2, _081CD59C + ldr r2, =0x00006302 adds r0, r1, r2 movs r2, 0 ldrsh r0, [r0, r2] - ldr r2, _081CD5A0 + ldr r2, =0x00006789 adds r1, r2 ldrb r1, [r1] bl sub_81CDA1C b _081CD5C4 .align 2, 0 -_081CD59C: .4byte 0x00006302 -_081CD5A0: .4byte 0x00006789 + .pool _081CD5A4: - ldr r2, _081CD5BC + ldr r2, =0x00006302 adds r0, r1, r2 movs r2, 0 ldrsh r0, [r0, r2] - ldr r2, _081CD5C0 + ldr r2, =0x00006789 adds r1, r2 ldrb r1, [r1] bl sub_81CDB98 movs r0, 0x1 b _081CD5C6 .align 2, 0 -_081CD5BC: .4byte 0x00006302 -_081CD5C0: .4byte 0x00006789 + .pool _081CD5C4: movs r0, 0 _081CD5C6: @@ -942535,7 +910333,7 @@ _081CD5D6: adds r1, 0x1 adds r4, 0x1 lsls r0, r2, 16 - ldr r2, _081CD620 + ldr r2, =0xffff0000 adds r0, r2 lsrs r2, r0, 16 _081CD5E4: @@ -942545,7 +910343,7 @@ _081CD5E4: bne _081CD5D6 adds r1, r2, 0 lsls r0, r1, 16 - ldr r2, _081CD620 + ldr r2, =0xffff0000 adds r0, r2 lsrs r2, r0, 16 lsls r1, 16 @@ -942557,7 +910355,7 @@ _081CD5FE: adds r4, 0x1 adds r1, r2, 0 lsls r0, r1, 16 - ldr r2, _081CD620 + ldr r2, =0xffff0000 adds r0, r2 lsrs r2, r0, 16 lsls r1, 16 @@ -942571,7 +910369,7 @@ _081CD612: pop {r1} bx r1 .align 2, 0 -_081CD620: .4byte 0xffff0000 + .pool thumb_func_end sub_81CD5CC thumb_func_start sub_81CD624 @@ -942618,14 +910416,14 @@ sub_81CD624: @ 81CD624 bl sub_81D2C68 cmp r0, 0 beq _081CD690 - ldr r1, _081CD68C + ldr r1, =0x085e8264 adds r0, r5, 0 movs r2, 0 movs r3, 0xC bl sub_8009128 b _081CD80E .align 2, 0 -_081CD68C: .4byte 0x085e8264 + .pool _081CD690: adds r0, r4, 0 adds r1, r6, 0 @@ -942646,7 +910444,7 @@ _081CD690: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _081CD6DC + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x38 @@ -942660,7 +910458,7 @@ _081CD690: lsrs r6, r0, 24 b _081CD6FE .align 2, 0 -_081CD6DC: .4byte 0x020244ec + .pool _081CD6E0: mov r0, r8 mov r1, r9 @@ -942683,7 +910481,7 @@ _081CD706: movs r0, 0xB adds r1, r7, 0 muls r1, r0 - ldr r0, _081CD720 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r5, 0 bl sub_8008C44 @@ -942694,7 +910492,7 @@ _081CD71C: adds r3, r5, 0 b _081CD726 .align 2, 0 -_081CD720: .4byte 0x083185c8 + .pool _081CD724: adds r3, 0x1 _081CD726: @@ -942798,10 +910596,10 @@ _081CD790: movs r0, 0x3 subs r0, r4 lsls r0, 16 - ldr r1, _081CD81C + ldr r1, =0xffff0000 adds r0, r1 lsrs r4, r0, 16 - ldr r0, _081CD820 + ldr r0, =0x0000ffff cmp r4, r0 beq _081CD808 movs r2, 0 @@ -942827,8 +910625,7 @@ _081CD80E: pop {r1} bx r1 .align 2, 0 -_081CD81C: .4byte 0xffff0000 -_081CD820: .4byte 0x0000ffff + .pool thumb_func_end sub_81CD624 thumb_func_start sub_81CD824 @@ -942864,7 +910661,7 @@ _081CD85A: beq _081CD900 _081CD862: lsls r0, r6, 6 - ldr r1, _081CD8C4 + ldr r1, =0x00006368 adds r0, r1 adds r0, r5, r0 mov r2, r8 @@ -942878,27 +910675,27 @@ _081CD862: lsls r0, r6, 1 adds r0, r6 lsls r4, r0, 3 - ldr r1, _081CD8C8 + ldr r1, =0x00006320 adds r0, r5, r1 adds r0, r4 movs r2, 0 movs r1, 0xFC strb r1, [r0] - ldr r1, _081CD8CC + ldr r1, =0x00006321 adds r0, r5, r1 adds r0, r4 movs r1, 0x4 strb r1, [r0] - ldr r1, _081CD8D0 + ldr r1, =0x00006322 adds r0, r5, r1 adds r0, r4 movs r1, 0x8 strb r1, [r0] - ldr r1, _081CD8D4 + ldr r1, =0x00006323 adds r0, r5, r1 adds r0, r4 strb r2, [r0] - ldr r2, _081CD8D8 + ldr r2, =0x00006324 adds r0, r5, r2 adds r0, r4 movs r1, 0x9 @@ -942906,22 +910703,15 @@ _081CD862: cmp r3, 0xE bne _081CD8E4 adds r0, r4, r5 - ldr r1, _081CD8DC + ldr r1, =0x00006325 adds r0, r1 - ldr r1, _081CD8E0 + ldr r1, =0x085ebfce b _081CD8F4 .align 2, 0 -_081CD8C4: .4byte 0x00006368 -_081CD8C8: .4byte 0x00006320 -_081CD8CC: .4byte 0x00006321 -_081CD8D0: .4byte 0x00006322 -_081CD8D4: .4byte 0x00006323 -_081CD8D8: .4byte 0x00006324 -_081CD8DC: .4byte 0x00006325 -_081CD8E0: .4byte 0x085ebfce + .pool _081CD8E4: adds r4, r5 - ldr r2, _081CD8FC + ldr r2, =0x00006325 adds r4, r2 adds r0, r3, 0 bl sav3_get_box_name @@ -942932,14 +910722,14 @@ _081CD8F4: bl sub_81CD5CC b _081CD95C .align 2, 0 -_081CD8FC: .4byte 0x00006325 + .pool _081CD900: movs r1, 0 lsls r4, r6, 6 lsls r0, r6, 1 mov r8, r0 adds r3, r4, 0 - ldr r0, _081CD968 + ldr r0, =0x00006368 adds r2, r5, r0 movs r7, 0 _081CD910: @@ -942952,7 +910742,7 @@ _081CD910: cmp r1, 0xB bls _081CD910 adds r1, r4 - ldr r2, _081CD968 + ldr r2, =0x00006368 adds r0, r5, r2 adds r0, r1 movs r1, 0xFF @@ -942961,7 +910751,7 @@ _081CD910: mov r2, r8 adds r0, r2, r6 lsls r3, r0, 3 - ldr r0, _081CD96C + ldr r0, =0x00006320 adds r2, r5, r0 movs r4, 0 _081CD93A: @@ -942977,7 +910767,7 @@ _081CD93A: adds r0, r2, r6 lsls r0, 3 adds r0, r1, r0 - ldr r2, _081CD96C + ldr r2, =0x00006320 adds r1, r5, r2 adds r1, r0 movs r0, 0xFF @@ -942989,8 +910779,7 @@ _081CD95C: pop {r0} bx r0 .align 2, 0 -_081CD968: .4byte 0x00006368 -_081CD96C: .4byte 0x00006320 + .pool thumb_func_end sub_81CD824 thumb_func_start sub_81CD970 @@ -942999,7 +910788,7 @@ sub_81CD970: @ 81CD970 movs r0, 0xB bl sub_81C763C adds r7, r0, 0 - ldr r1, _081CD994 + ldr r1, =0x000006ac movs r0, 0x12 bl sub_81C761C adds r6, r0, 0 @@ -943012,11 +910801,11 @@ sub_81CD970: @ 81CD970 movs r5, 0 b _081CD9C4 .align 2, 0 -_081CD994: .4byte 0x000006ac + .pool _081CD998: movs r0, 0x64 muls r0, r4 - ldr r1, _081CD9F0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2D bl pokemon_getattr @@ -943052,15 +910841,14 @@ _081CD9C4: strh r1, [r6, 0x2] adds r0, r5, 0x1 strh r0, [r6] - ldr r1, _081CD9F4 + ldr r1, =0x0000678a adds r0, r7, r1 strb r2, [r0] pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081CD9F0: .4byte 0x020244ec -_081CD9F4: .4byte 0x0000678a + .pool thumb_func_end sub_81CD970 thumb_func_start sub_81CD9F8 @@ -943074,13 +910862,13 @@ sub_81CD9F8: @ 81CD9F8 movs r3, 0 movs r1, 0x1 strb r1, [r2] - ldr r1, _081CDA18 + ldr r1, =0x0000678a adds r0, r1 strb r3, [r0] pop {r0} bx r0 .align 2, 0 -_081CDA18: .4byte 0x0000678a + .pool thumb_func_end sub_81CD9F8 thumb_func_start sub_81CDA1C @@ -943128,7 +910916,7 @@ _081CDA5A: mov r1, r9 lsls r5, r1, 2 adds r4, r5, r1 - ldr r1, _081CDAFC + ldr r1, =0x00006428 add r1, r8 adds r1, r4 strb r0, [r1] @@ -943137,7 +910925,7 @@ _081CDA5A: movs r2, 0x2F movs r3, 0 bl sub_81D2C68 - ldr r1, _081CDB00 + ldr r1, =0x00006429 add r1, r8 adds r1, r4 strb r0, [r1] @@ -943146,7 +910934,7 @@ _081CDA5A: movs r2, 0x21 movs r3, 0 bl sub_81D2C68 - ldr r1, _081CDB04 + ldr r1, =0x0000642a add r1, r8 adds r1, r4 strb r0, [r1] @@ -943155,7 +910943,7 @@ _081CDA5A: movs r2, 0x18 movs r3, 0 bl sub_81D2C68 - ldr r1, _081CDB08 + ldr r1, =0x0000642b add r1, r8 adds r1, r4 strb r0, [r1] @@ -943164,7 +910952,7 @@ _081CDA5A: movs r2, 0x17 movs r3, 0 bl sub_81D2C68 - ldr r1, _081CDB0C + ldr r1, =0x0000642c add r1, r8 adds r1, r4 strb r0, [r1] @@ -943189,11 +910977,7 @@ _081CDA5A: bl __udivsi3 b _081CDB12 .align 2, 0 -_081CDAFC: .4byte 0x00006428 -_081CDB00: .4byte 0x00006429 -_081CDB04: .4byte 0x0000642a -_081CDB08: .4byte 0x0000642b -_081CDB0C: .4byte 0x0000642c + .pool _081CDB10: movs r0, 0x9 _081CDB12: @@ -943203,13 +910987,13 @@ _081CDB12: movs r2, 0x8 movs r3, 0 bl sub_81D2C68 - ldr r1, _081CDB40 + ldr r1, =0x00006783 add r1, r8 add r1, r9 strb r0, [r1] mov r0, r9 adds r1, r5, r0 - ldr r2, _081CDB44 + ldr r2, =0x00006428 adds r0, r1, r2 add r0, r8 lsls r1, 2 @@ -943219,18 +911003,17 @@ _081CDB12: bl sub_81D2754 b _081CDB80 .align 2, 0 -_081CDB40: .4byte 0x00006783 -_081CDB44: .4byte 0x00006428 + .pool _081CDB48: movs r2, 0 mov r0, r9 lsls r5, r0, 2 add r5, r9 - ldr r4, _081CDB8C + ldr r4, =0x00006428 add r4, r8 lsls r3, r5, 2 mov r9, r2 - ldr r7, _081CDB90 + ldr r7, =0x0000643c movs r6, 0x9B _081CDB5C: adds r0, r2, r5 @@ -943242,7 +911025,7 @@ _081CDB5C: add r0, r8 adds r1, r0, r7 strh r6, [r1] - ldr r1, _081CDB94 + ldr r1, =0x0000643e adds r0, r1 movs r1, 0x5B strh r1, [r0] @@ -943259,9 +911042,7 @@ _081CDB80: pop {r0} bx r0 .align 2, 0 -_081CDB8C: .4byte 0x00006428 -_081CDB90: .4byte 0x0000643c -_081CDB94: .4byte 0x0000643e + .pool thumb_func_end sub_81CDA1C thumb_func_start sub_81CDB98 @@ -943321,7 +911102,7 @@ _081CDBD0: bl sub_81D2C68 adds r5, r0, 0 lsls r0, r4, 3 - ldr r1, _081CDC4C + ldr r1, =0x0830a18c adds r0, r1 mov r2, r9 lsls r1, r2, 13 @@ -943351,7 +911132,7 @@ _081CDC3E: pop {r0} bx r0 .align 2, 0 -_081CDC4C: .4byte 0x0830a18c + .pool thumb_func_end sub_81CDB98 thumb_func_start sub_81CDC50 @@ -943379,12 +911160,12 @@ sub_81CDC70: @ 81CDC70 push {lr} movs r0, 0xB bl sub_81C763C - ldr r1, _081CDC80 + ldr r1, =0x00006428 adds r0, r1 pop {r1} bx r1 .align 2, 0 -_081CDC80: .4byte 0x00006428 + .pool thumb_func_end sub_81CDC70 thumb_func_start sub_81CDC84 @@ -943392,13 +911173,13 @@ sub_81CDC84: @ 81CDC84 push {lr} movs r0, 0xB bl sub_81C763C - ldr r1, _081CDC98 + ldr r1, =0x00006786 adds r0, r1 ldrb r0, [r0] pop {r1} bx r1 .align 2, 0 -_081CDC98: .4byte 0x00006786 + .pool thumb_func_end sub_81CDC84 thumb_func_start sub_81CDC9C @@ -943406,13 +911187,13 @@ sub_81CDC9C: @ 81CDC9C push {lr} movs r0, 0xB bl sub_81C763C - ldr r1, _081CDCB0 + ldr r1, =0x00006302 adds r0, r1 ldrb r0, [r0] pop {r1} bx r1 .align 2, 0 -_081CDCB0: .4byte 0x00006302 + .pool thumb_func_end sub_81CDC9C thumb_func_start sub_81CDCB4 @@ -943453,13 +911234,13 @@ sub_81CDCEC: @ 81CDCEC push {lr} movs r0, 0xB bl sub_81C763C - ldr r1, _081CDD00 + ldr r1, =0x00006789 adds r0, r1 ldrb r0, [r0] pop {r1} bx r1 .align 2, 0 -_081CDD00: .4byte 0x00006789 + .pool thumb_func_end sub_81CDCEC thumb_func_start sub_81CDD04 @@ -943471,14 +911252,14 @@ sub_81CDD04: @ 81CDD04 movs r0, 0xB bl sub_81C763C lsls r4, 6 - ldr r1, _081CDD20 + ldr r1, =0x00006368 adds r4, r1 adds r0, r4 pop {r4} pop {r1} bx r1 .align 2, 0 -_081CDD20: .4byte 0x00006368 + .pool thumb_func_end sub_81CDD04 thumb_func_start sub_81CDD24 @@ -943492,14 +911273,14 @@ sub_81CDD24: @ 81CDD24 lsls r1, r4, 1 adds r1, r4 lsls r1, 3 - ldr r2, _081CDD44 + ldr r2, =0x00006320 adds r1, r2 adds r0, r1 pop {r4} pop {r1} bx r1 .align 2, 0 -_081CDD44: .4byte 0x00006320 + .pool thumb_func_end sub_81CDD24 thumb_func_start sub_81CDD48 @@ -943550,7 +911331,7 @@ sub_81CDD7C: @ 81CDD7C movs r0, 0 b _081CDDA6 _081CDD96: - ldr r3, _081CDDAC + ldr r3, =0x00006786 adds r0, r2, r3 movs r1, 0 ldrsb r1, [r0, r1] @@ -943562,7 +911343,7 @@ _081CDDA6: pop {r1} bx r1 .align 2, 0 -_081CDDAC: .4byte 0x00006786 + .pool thumb_func_end sub_81CDD7C thumb_func_start sub_81CDDB0 @@ -943570,7 +911351,7 @@ sub_81CDDB0: @ 81CDDB0 push {lr} movs r0, 0xB bl sub_81C763C - ldr r2, _081CDDD0 + ldr r2, =0x00006786 adds r1, r0, r2 ldrb r1, [r1] lsls r1, 24 @@ -943582,43 +911363,38 @@ sub_81CDDB0: @ 81CDDB0 pop {r1} bx r1 .align 2, 0 -_081CDDD0: .4byte 0x00006786 + .pool thumb_func_end sub_81CDDB0 thumb_func_start sub_81CDDD4 sub_81CDDD4: @ 81CDDD4 push {r4,lr} - ldr r1, _081CDE0C + ldr r1, =0x000038ac movs r0, 0xC bl sub_81C761C adds r4, r0, 0 cmp r4, 0 beq _081CDE24 - ldr r0, _081CDE10 + ldr r0, =0x00001816 adds r1, r4, r0 movs r0, 0xFF strb r0, [r1] - ldr r0, _081CDE14 + ldr r0, =sub_81CDE94 + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4] - ldr r0, _081CDE18 + ldr r0, =0x00001810 adds r1, r4, r0 - ldr r0, _081CDE1C + ldr r0, =sub_81CDE80 + 1 str r0, [r1] - ldr r0, _081CDE20 + ldr r0, =0x00002908 adds r1, r4, r0 movs r0, 0 strb r0, [r1] movs r0, 0x1 b _081CDE26 .align 2, 0 -_081CDE0C: .4byte 0x000038ac -_081CDE10: .4byte 0x00001816 -_081CDE14: .4byte sub_81CDE94 + 1 -_081CDE18: .4byte 0x00001810 -_081CDE1C: .4byte sub_81CDE80 + 1 -_081CDE20: .4byte 0x00002908 + .pool _081CDE24: movs r0, 0 _081CDE26: @@ -943634,24 +911410,22 @@ sub_81CDE2C: @ 81CDE2C movs r0, 0xC bl sub_81C763C adds r5, r0, 0 - ldr r0, _081CDE58 + ldr r0, =0x08623384 lsls r4, 2 adds r4, r0 ldr r0, [r4] movs r1, 0x1 bl sub_81C7078 str r0, [r5] - ldr r0, _081CDE5C + ldr r0, =0x00001810 adds r5, r0 - ldr r0, _081CDE60 + ldr r0, =sub_81CDE80 + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081CDE58: .4byte 0x08623384 -_081CDE5C: .4byte 0x00001810 -_081CDE60: .4byte sub_81CDE80 + 1 + .pool thumb_func_end sub_81CDE2C thumb_func_start sub_81CDE64 @@ -943659,14 +911433,14 @@ sub_81CDE64: @ 81CDE64 push {lr} movs r0, 0xC bl sub_81C763C - ldr r1, _081CDE7C + ldr r1, =0x00001810 adds r0, r1 ldr r0, [r0] bl _call_via_r0 pop {r1} bx r1 .align 2, 0 -_081CDE7C: .4byte 0x00001810 + .pool thumb_func_end sub_81CDE64 thumb_func_start sub_81CDE80 @@ -943693,12 +911467,12 @@ sub_81CDE94: @ 81CDE94 b _081CE2C4 _081CDEA8: lsls r0, r4, 2 - ldr r1, _081CDEB4 + ldr r1, =_081CDEB8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CDEB4: .4byte _081CDEB8 + .pool .align 2, 0 _081CDEB8: .4byte _081CDF0C @@ -943730,7 +911504,7 @@ _081CDF0C: _081CDF16: b _081CDFB0 _081CDF18: - ldr r0, _081CDF80 + ldr r0, =0x08623358 movs r1, 0x3 bl sub_81C7B54 movs r0, 0x1 @@ -943757,26 +911531,22 @@ _081CDF18: movs r1, 0 movs r2, 0 bl bg_change_y_offset - ldr r1, _081CDF84 + ldr r1, =0x00007940 movs r0, 0 bl lcd_io_set - ldr r1, _081CDF88 + ldr r1, =0x00000844 movs r0, 0x50 bl lcd_io_set - ldr r1, _081CDF8C + ldr r1, =0x0000040b movs r0, 0x52 bl lcd_io_set - ldr r1, _081CDF90 + ldr r1, =0x08dc6548 movs r0, 0 str r0, [sp] movs r0, 0x3 b _081CDFA8 .align 2, 0 -_081CDF80: .4byte 0x08623358 -_081CDF84: .4byte 0x00007940 -_081CDF88: .4byte 0x00000844 -_081CDF8C: .4byte 0x0000040b -_081CDF90: .4byte 0x08dc6548 + .pool _081CDF94: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -943785,7 +911555,7 @@ _081CDF94: beq _081CDFA2 b _081CE2C0 _081CDFA2: - ldr r1, _081CDFB4 + ldr r1, =0x08623228 str r0, [sp] movs r0, 0x2 _081CDFA8: @@ -943796,7 +911566,7 @@ _081CDFB0: movs r0, 0 b _081CE2C6 .align 2, 0 -_081CDFB4: .4byte 0x08623228 + .pool _081CDFB8: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -943804,7 +911574,7 @@ _081CDFB8: beq _081CDFC4 b _081CE2C0 _081CDFC4: - ldr r0, _081CE018 + ldr r0, =0x08dc6dfc adds r4, r5, 0x4 adds r1, r4, 0 bl LZ77UnCompVram @@ -943814,7 +911584,7 @@ _081CDFC4: bl sub_81CDD5C cmp r0, 0x1 bne _081CDFF2 - ldr r1, _081CE01C + ldr r1, =0x08dc7070 movs r0, 0x9 str r0, [sp] movs r0, 0x4 @@ -943826,26 +911596,21 @@ _081CDFC4: _081CDFF2: movs r0, 0x3 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _081CE020 + ldr r0, =0x08dc6528 movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 - ldr r0, _081CE024 + ldr r0, =0x08623208 movs r1, 0xF0 movs r2, 0x20 bl sub_81C7944 - ldr r0, _081CE028 + ldr r0, =0x00001814 adds r1, r5, r0 - ldr r0, _081CE02C + ldr r0, =0x0000ffb0 strh r0, [r1] b _081CDFB0 .align 2, 0 -_081CE018: .4byte 0x08dc6dfc -_081CE01C: .4byte 0x08dc7070 -_081CE020: .4byte 0x08dc6528 -_081CE024: .4byte 0x08623208 -_081CE028: .4byte 0x00001814 -_081CE02C: .4byte 0x0000ffb0 + .pool _081CE030: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -943853,8 +911618,8 @@ _081CE030: beq _081CE03C b _081CE2C0 _081CE03C: - ldr r0, _081CE068 - ldr r1, _081CE06C + ldr r0, =0x0862323c + ldr r1, =0x00001004 adds r4, r5, r1 adds r1, r4, 0 bl LZ77UnCompVram @@ -943863,7 +911628,7 @@ _081CE03C: bl bg_set_tilemap movs r0, 0x2 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _081CE070 + ldr r0, =0x086231e8 movs r1, 0x30 movs r2, 0x20 bl sub_81C7944 @@ -943871,9 +911636,7 @@ _081CE03C: bl sub_81D21DC b _081CDFB0 .align 2, 0 -_081CE068: .4byte 0x0862323c -_081CE06C: .4byte 0x00001004 -_081CE070: .4byte 0x086231e8 + .pool _081CE074: movs r0, 0x1 movs r1, 0 @@ -943887,9 +911650,9 @@ _081CE074: bl sub_8199DF0 movs r0, 0 str r0, [sp, 0x8] - ldr r2, _081CE0A8 + ldr r2, =0x00000804 adds r4, r5, r2 - ldr r2, _081CE0AC + ldr r2, =0x05000200 add r0, sp, 0x8 adds r1, r4, 0 bl CpuSet @@ -943898,8 +911661,7 @@ _081CE074: bl bg_set_tilemap b _081CDFB0 .align 2, 0 -_081CE0A8: .4byte 0x00000804 -_081CE0AC: .4byte 0x05000200 + .pool _081CE0B0: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -943907,7 +911669,7 @@ _081CE0B0: beq _081CE0BC b _081CE2C0 _081CE0BC: - ldr r0, _081CE0FC + ldr r0, =0x08623364 bl Window_AddFromTemplate movs r2, 0xC1 lsls r2, 5 @@ -943916,32 +911678,26 @@ _081CE0BC: bl sub_81CDD5C cmp r0, 0x1 bne _081CE0F6 - ldr r0, _081CE100 + ldr r0, =0x0862336c bl Window_AddFromTemplate - ldr r2, _081CE104 + ldr r2, =0x00001821 adds r1, r5, r2 strb r0, [r1] - ldr r0, _081CE108 + ldr r0, =0x08623374 bl Window_AddFromTemplate - ldr r2, _081CE10C + ldr r2, =0x00001822 adds r1, r5, r2 strb r0, [r1] - ldr r0, _081CE110 + ldr r0, =0x0862337c bl Window_AddFromTemplate - ldr r2, _081CE114 + ldr r2, =0x00001823 adds r1, r5, r2 strb r0, [r1] _081CE0F6: bl TextBox_ResetSomeField b _081CDFB0 .align 2, 0 -_081CE0FC: .4byte 0x08623364 -_081CE100: .4byte 0x0862336c -_081CE104: .4byte 0x00001821 -_081CE108: .4byte 0x08623374 -_081CE10C: .4byte 0x00001822 -_081CE110: .4byte 0x0862337c -_081CE114: .4byte 0x00001823 + .pool _081CE118: movs r0, 0 bl sub_81CED30 @@ -944007,23 +911763,21 @@ _081CE186: beq _081CE19C b _081CDFB0 _081CE19C: - ldr r2, _081CE1BC + ldr r2, =0x00001821 adds r0, r5, r2 ldrb r0, [r0] bl Window_WriteStandardTileMap - ldr r1, _081CE1C0 + ldr r1, =0x00001822 adds r0, r5, r1 ldrb r0, [r0] bl Window_WriteStandardTileMap - ldr r2, _081CE1C4 + ldr r2, =0x00001823 adds r0, r5, r2 ldrb r0, [r0] bl Window_WriteStandardTileMap b _081CDFB0 .align 2, 0 -_081CE1BC: .4byte 0x00001821 -_081CE1C0: .4byte 0x00001822 -_081CE1C4: .4byte 0x00001823 + .pool _081CE1C8: movs r0, 0x1 bl gpu_sync_bg_show @@ -944069,11 +911823,11 @@ _081CE218: cmp r0, 0 bne _081CE2C0 _081CE230: - ldr r0, _081CE238 + ldr r0, =sub_81CEE44 + 1 bl c3args_set_0toR1_1to0 b _081CDFB0 .align 2, 0 -_081CE238: .4byte sub_81CEE44 + 1 + .pool _081CE23C: bl sub_81CEE90 bl sub_81CDC70 @@ -944092,13 +911846,13 @@ _081CE25A: b _081CDFB0 _081CE262: bl sub_81CDC70 - ldr r2, _081CE2B4 + ldr r2, =0x00001814 adds r1, r5, r2 bl sub_81D3178 lsls r0, 24 cmp r0, 0 bne _081CE2C0 - ldr r0, _081CE2B8 + ldr r0, =0x000028e0 adds r6, r5, r0 adds r0, r6, 0 bl sub_81D3464 @@ -944113,7 +911867,7 @@ _081CE262: cmp r4, r0 beq _081CE2C4 _081CE298: - ldr r1, _081CE2BC + ldr r1, =0x00001816 adds r0, r5, r1 ldrb r4, [r0] bl sub_81CDDB0 @@ -944125,9 +911879,7 @@ _081CE298: bl sub_81D3480 b _081CE2C4 .align 2, 0 -_081CE2B4: .4byte 0x00001814 -_081CE2B8: .4byte 0x000028e0 -_081CE2BC: .4byte 0x00001816 + .pool _081CE2C0: movs r0, 0x2 b _081CE2C6 @@ -944162,16 +911914,16 @@ _081CE2EA: b _081CE374 _081CE2F4: bl sub_81CEEC8 - ldr r1, _081CE304 + ldr r1, =0x000028e0 adds r0, r5, r1 bl sub_81D3520 movs r0, 0x1 b _081CE376 .align 2, 0 -_081CE304: .4byte 0x000028e0 + .pool _081CE308: bl sub_81CDC70 - ldr r2, _081CE324 + ldr r2, =0x00001814 adds r1, r5, r2 bl sub_81D31A4 lsls r0, 24 @@ -944182,7 +911934,7 @@ _081CE308: movs r0, 0x1 b _081CE376 .align 2, 0 -_081CE324: .4byte 0x00001814 + .pool _081CE328: movs r0, 0 bl sub_81C7AC0 @@ -944204,7 +911956,7 @@ _081CE34E: movs r0, 0x2 b _081CE376 _081CE352: - ldr r1, _081CE370 + ldr r1, =0x000028e0 adds r0, r5, r1 bl sub_81D354C movs r0, 0x1 @@ -944216,7 +911968,7 @@ _081CE352: movs r0, 0x1 b _081CE376 .align 2, 0 -_081CE370: .4byte 0x000028e0 + .pool _081CE374: movs r0, 0x4 _081CE376: @@ -944239,12 +911991,12 @@ sub_81CE37C: @ 81CE37C b _081CE4D0 _081CE394: lsls r0, r4, 2 - ldr r1, _081CE3A0 + ldr r1, =_081CE3A4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CE3A0: .4byte _081CE3A4 + .pool .align 2, 0 _081CE3A4: .4byte _081CE3CC @@ -944270,18 +912022,18 @@ _081CE3D6: _081CE3DA: movs r0, 0x2 bl sub_81CD548 - ldr r1, _081CE3EC + ldr r1, =0x000028e0 adds r0, r6, r1 bl sub_81D3520 b _081CE3D6 .align 2, 0 -_081CE3EC: .4byte 0x000028e0 + .pool _081CE3F0: adds r0, r2, 0 bl sub_81D2074 b _081CE3D6 _081CE3F8: - ldr r1, _081CE414 + ldr r1, =0x00001814 adds r0, r6, r1 bl sub_81D3150 lsls r0, 24 @@ -944293,7 +912045,7 @@ _081CE3F8: bl sub_81CED30 b _081CE3D6 .align 2, 0 -_081CE414: .4byte 0x00001814 + .pool _081CE418: bl sub_81CDC84 adds r1, r0, 0 @@ -944336,14 +912088,14 @@ _081CE44E: _081CE468: bl sub_81CDC70 adds r2, r0, 0 - ldr r0, _081CE4C0 + ldr r0, =0x00001814 adds r1, r6, r0 adds r0, r2, 0 bl sub_81D3178 lsls r0, 24 cmp r0, 0 bne _081CE4CC - ldr r1, _081CE4C4 + ldr r1, =0x000028e0 adds r0, r6, r1 bl sub_81D3464 bl sub_81CDD5C @@ -944357,9 +912109,9 @@ _081CE468: cmp r4, r0 beq _081CE3D6 _081CE4A0: - ldr r0, _081CE4C4 + ldr r0, =0x000028e0 adds r5, r6, r0 - ldr r1, _081CE4C8 + ldr r1, =0x00001816 adds r0, r6, r1 ldrb r4, [r0] bl sub_81CDDB0 @@ -944371,9 +912123,7 @@ _081CE4A0: bl sub_81D3480 b _081CE3D6 .align 2, 0 -_081CE4C0: .4byte 0x00001814 -_081CE4C4: .4byte 0x000028e0 -_081CE4C8: .4byte 0x00001816 + .pool _081CE4CC: movs r0, 0x2 b _081CE4D2 @@ -944395,12 +912145,12 @@ sub_81CE4D8: @ 81CE4D8 cmp r4, 0x8 bhi _081CE5DC lsls r0, r4, 2 - ldr r1, _081CE4F4 + ldr r1, =_081CE4F8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CE4F4: .4byte _081CE4F8 + .pool .align 2, 0 _081CE4F8: .4byte _081CE51C @@ -944474,17 +912224,17 @@ _081CE576: b _081CE5DE _081CE592: bl sub_81CDC70 - ldr r2, _081CE5CC + ldr r2, =0x00001814 adds r1, r5, r2 bl sub_81D3178 lsls r0, 24 cmp r0, 0 bne _081CE5D8 - ldr r0, _081CE5D0 + ldr r0, =0x000028e0 adds r4, r5, r0 adds r0, r4, 0 bl sub_81D3464 - ldr r1, _081CE5D4 + ldr r1, =0x00001816 adds r0, r5, r1 ldrb r5, [r0] bl sub_81CDDB0 @@ -944497,9 +912247,7 @@ _081CE592: movs r0, 0x1 b _081CE5DE .align 2, 0 -_081CE5CC: .4byte 0x00001814 -_081CE5D0: .4byte 0x000028e0 -_081CE5D4: .4byte 0x00001816 + .pool _081CE5D8: movs r0, 0x2 b _081CE5DE @@ -944521,12 +912269,12 @@ sub_81CE5E4: @ 81CE5E4 cmp r4, 0x7 bhi _081CE6B2 lsls r0, r4, 2 - ldr r1, _081CE600 + ldr r1, =_081CE604 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CE600: .4byte _081CE604 + .pool .align 2, 0 _081CE604: .4byte _081CE624 @@ -944550,15 +912298,15 @@ _081CE62E: _081CE632: movs r0, 0x2 bl sub_81CD548 - ldr r1, _081CE644 + ldr r1, =0x000028e0 adds r0, r5, r1 bl sub_81D3520 b _081CE62E .align 2, 0 -_081CE644: .4byte 0x000028e0 + .pool _081CE648: bl sub_81CDC70 - ldr r2, _081CE65C + ldr r2, =0x00001814 adds r1, r5, r2 bl sub_81D31A4 lsls r0, 24 @@ -944566,7 +912314,7 @@ _081CE648: beq _081CE62E b _081CE6AE .align 2, 0 -_081CE65C: .4byte 0x00001814 + .pool _081CE660: bl sub_81CDC84 adds r1, r0, 0 @@ -944701,12 +912449,12 @@ sub_81CE738: @ 81CE738 movs r2, 0x1 movs r3, 0x4 bl decimal_int_to_string - ldr r1, _081CE750 + ldr r1, =0x085ebfd7 bl gf_strcpy pop {r1} bx r1 .align 2, 0 -_081CE750: .4byte 0x085ebfd7 + .pool thumb_func_end sub_81CE738 thumb_func_start sub_81CE754 @@ -944753,14 +912501,14 @@ _081CE78E: beq _081CE7A6 b _081CE924 _081CE7A6: - ldr r1, _081CE7B4 + ldr r1, =0x00001821 adds r0, r6, r1 ldrb r0, [r0] movs r1, 0 bl Window_FastFillPixels b _081CE924 .align 2, 0 -_081CE7B4: .4byte 0x00001821 + .pool _081CE7B8: bl sub_81CDC60 adds r4, r0, 0 @@ -944831,10 +912579,10 @@ _081CE80C: strb r0, [r1, 0x4] mov r5, sp adds r5, 0x11 - ldr r1, _081CE894 + ldr r1, =0x085ebfd7 adds r0, r5, 0 bl gf_strcpy - ldr r0, _081CE898 + ldr r0, =0x00001821 adds r6, r0 ldrb r0, [r6] str r7, [sp] @@ -944862,10 +912610,9 @@ _081CE80C: bl Print b _081CE924 .align 2, 0 -_081CE894: .4byte 0x085ebfd7 -_081CE898: .4byte 0x00001821 + .pool _081CE89C: - ldr r1, _081CE8AC + ldr r1, =0x00002908 adds r0, r6, r1 ldrb r0, [r0] cmp r0, 0 @@ -944874,7 +912621,7 @@ _081CE89C: beq _081CE8EC b _081CE924 .align 2, 0 -_081CE8AC: .4byte 0x00002908 + .pool _081CE8B0: cmp r5, 0 beq _081CE8C4 @@ -944896,41 +912643,40 @@ _081CE8D2: bl sub_81CDD5C cmp r0, 0x1 bne _081CE910 - ldr r0, _081CE8E8 + ldr r0, =0x00002908 adds r1, r6, r0 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] b _081CE924 .align 2, 0 -_081CE8E8: .4byte 0x00002908 + .pool _081CE8EC: cmp r5, 0 beq _081CE904 - ldr r1, _081CE900 + ldr r1, =0x00001821 adds r0, r6, r1 ldrb r0, [r0] movs r1, 0x3 bl Window_CopyToVram b _081CE910 .align 2, 0 -_081CE900: .4byte 0x00001821 + .pool _081CE904: - ldr r1, _081CE91C + ldr r1, =0x00001821 adds r0, r6, r1 ldrb r0, [r0] movs r1, 0x2 bl Window_CopyToVram _081CE910: - ldr r0, _081CE920 + ldr r0, =0x00002908 adds r1, r6, r0 movs r0, 0 strb r0, [r1] movs r0, 0x1 b _081CE926 .align 2, 0 -_081CE91C: .4byte 0x00001821 -_081CE920: .4byte 0x00002908 + .pool _081CE924: movs r0, 0 _081CE926: @@ -944948,12 +912694,12 @@ sub_81CE934: @ 81CE934 movs r0, 0xC bl sub_81C763C adds r4, r0, 0 - ldr r1, _081CE95C + ldr r1, =0x00001822 adds r0, r4, r1 ldrb r0, [r0] movs r1, 0x3 bl Window_CopyToVram - ldr r0, _081CE960 + ldr r0, =0x00001823 adds r4, r0 ldrb r0, [r4] movs r1, 0x3 @@ -944962,8 +912708,7 @@ sub_81CE934: @ 81CE934 pop {r0} bx r0 .align 2, 0 -_081CE95C: .4byte 0x00001822 -_081CE960: .4byte 0x00001823 + .pool thumb_func_end sub_81CE934 thumb_func_start sub_81CE964 @@ -945059,16 +912804,16 @@ sub_81CE9E4: @ 81CE9E4 mov r10, r5 cmp r0, 0x1 bne _081CEA78 - ldr r1, _081CEA64 + ldr r1, =0x00001824 adds r0, r6, r1 movs r2, 0x6A strh r2, [r0] - ldr r3, _081CEA68 + ldr r3, =0x00001826 adds r1, r6, r3 strh r2, [r1] bl sub_811F90C bl sub_811FA90 - ldr r2, _081CEA6C + ldr r2, =0x08623338 movs r0, 0x69 movs r1, 0x69 bl sub_811FF94 @@ -945080,9 +912825,9 @@ sub_81CE9E4: @ 81CE9E4 strh r1, [r0, 0x20] movs r1, 0x20 strh r1, [r0, 0x22] - ldr r1, _081CEA70 + ldr r1, =sub_81CE9C8 + 1 str r1, [r0, 0x1C] - ldr r2, _081CEA74 + ldr r2, =0x000028dc adds r1, r6, r2 str r0, [r1] movs r0, 0x69 @@ -945095,11 +912840,7 @@ sub_81CE9E4: @ 81CE9E4 mov r8, r3 b _081CEBC6 .align 2, 0 -_081CEA64: .4byte 0x00001824 -_081CEA68: .4byte 0x00001826 -_081CEA6C: .4byte 0x08623338 -_081CEA70: .4byte sub_81CE9C8 + 1 -_081CEA74: .4byte 0x000028dc + .pool _081CEA78: mov r0, sp bl gpu_tile_obj_alloc_and_load_multiple @@ -945125,11 +912866,11 @@ _081CEA8C: lsrs r3, r0, 24 cmp r3, 0x40 beq _081CEAD8 - ldr r2, _081CEACC + ldr r2, =0x00001806 adds r0, r6, r2 adds r0, r4 strb r3, [r0] - ldr r2, _081CEAD0 + ldr r2, =0x02020630 lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -945137,15 +912878,13 @@ _081CEA8C: strh r4, [r1, 0x2E] adds r2, 0x1C adds r0, r2 - ldr r1, _081CEAD4 + ldr r1, =sub_81CE964 + 1 str r1, [r0] b _081CEAE2 .align 2, 0 -_081CEACC: .4byte 0x00001806 -_081CEAD0: .4byte 0x02020630 -_081CEAD4: .4byte sub_81CE964 + 1 + .pool _081CEAD8: - ldr r3, _081CEB40 + ldr r3, =0x00001806 adds r0, r6, r3 adds r0, r4 movs r1, 0xFF @@ -945163,13 +912902,13 @@ _081CEAE8: blt _081CEA8C movs r0, 0x67 strh r0, [r7] - ldr r0, _081CEB44 + ldr r0, =nullsub_12 + 1 str r0, [r7, 0x14] cmp r4, 0x5 bhi _081CEB5C - ldr r0, _081CEB40 + ldr r0, =0x00001806 adds r5, r6, r0 - ldr r1, _081CEB48 + ldr r1, =0x02020630 mov r9, r1 _081CEB0A: lsls r2, r4, 2 @@ -945199,9 +912938,7 @@ _081CEB0A: strb r0, [r1, 0x3] b _081CEB52 .align 2, 0 -_081CEB40: .4byte 0x00001806 -_081CEB44: .4byte nullsub_12 + 1 -_081CEB48: .4byte 0x02020630 + .pool _081CEB4C: adds r1, r5, r4 movs r0, 0xFF @@ -945215,7 +912952,7 @@ _081CEB52: _081CEB5C: movs r0, 0x66 strh r0, [r7] - ldr r0, _081CEBB0 + ldr r0, =sub_81CE990 + 1 str r0, [r7, 0x14] lsls r2, r4, 2 adds r2, r4 @@ -945232,11 +912969,11 @@ _081CEB5C: lsrs r3, r0, 24 cmp r3, 0x40 beq _081CEBBC - ldr r1, _081CEBB4 + ldr r1, =0x00001806 adds r0, r6, r1 adds r0, r4 strb r3, [r0] - ldr r0, _081CEBB8 + ldr r0, =0x02020630 lsls r2, r3, 4 adds r2, r3 lsls r2, 2 @@ -945255,11 +912992,9 @@ _081CEB5C: strb r1, [r2, 0x3] b _081CEBC6 .align 2, 0 -_081CEBB0: .4byte sub_81CE990 + 1 -_081CEBB4: .4byte 0x00001806 -_081CEBB8: .4byte 0x02020630 + .pool _081CEBBC: - ldr r2, _081CEBF0 + ldr r2, =0x00001806 adds r0, r6, r2 adds r0, r4 movs r1, 0xFF @@ -945284,7 +913019,7 @@ _081CEBC6: pop {r0} bx r0 .align 2, 0 -_081CEBF0: .4byte 0x00001806 + .pool thumb_func_end sub_81CE9E4 thumb_func_start sub_81CEBF4 @@ -945294,7 +913029,7 @@ sub_81CEBF4: @ 81CEBF4 bl sub_81CDD5C cmp r0, 0x1 bne _081CEC28 - ldr r1, _081CEC24 + ldr r1, =0x000028dc adds r0, r5, r1 ldr r0, [r0] bl obj_delete_and_free_tiles @@ -945308,18 +913043,18 @@ sub_81CEBF4: @ 81CEBF4 bl gpu_pal_free_tag b _081CEC68 .align 2, 0 -_081CEC24: .4byte 0x000028dc + .pool _081CEC28: movs r4, 0 _081CEC2A: - ldr r1, _081CEC94 + ldr r1, =0x00001806 adds r0, r5, r1 adds r0, r4 ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081CEC98 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles adds r0, r4, 0x1 @@ -945338,7 +913073,7 @@ _081CEC2A: movs r0, 0x66 bl gpu_pal_free_tag _081CEC68: - ldr r0, _081CEC9C + ldr r0, =0x00001816 adds r1, r5, r0 ldrb r0, [r1] cmp r0, 0xFF @@ -945347,7 +913082,7 @@ _081CEC68: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081CEC98 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles movs r0, 0x64 @@ -945359,9 +913094,7 @@ _081CEC8E: pop {r0} bx r0 .align 2, 0 -_081CEC94: .4byte 0x00001806 -_081CEC98: .4byte 0x02020630 -_081CEC9C: .4byte 0x00001816 + .pool thumb_func_end sub_81CEBF4 thumb_func_start sub_81CECA0 @@ -945378,23 +913111,21 @@ sub_81CECA0: @ 81CECA0 bl sub_81CDD5C cmp r0, 0x1 bne _081CECEC - ldr r1, _081CECE0 + ldr r1, =0x00001821 adds r0, r4, r1 ldrb r0, [r0] bl Window_Remove - ldr r1, _081CECE4 + ldr r1, =0x00001822 adds r0, r4, r1 ldrb r0, [r0] bl Window_Remove - ldr r1, _081CECE8 + ldr r1, =0x00001823 adds r0, r4, r1 ldrb r0, [r0] bl Window_Remove b _081CECF0 .align 2, 0 -_081CECE0: .4byte 0x00001821 -_081CECE4: .4byte 0x00001822 -_081CECE8: .4byte 0x00001823 + .pool _081CECEC: bl sub_81C7FDC _081CECF0: @@ -945418,7 +913149,7 @@ sub_81CED10: @ 81CED10 adds r4, r0, 0 movs r0, 0xC bl sub_81C763C - ldr r1, _081CED2C + ldr r1, =0x00001814 adds r0, r1 ldrh r0, [r0] adds r0, 0x26 @@ -945427,7 +913158,7 @@ sub_81CED10: @ 81CED10 pop {r0} bx r0 .align 2, 0 -_081CED2C: .4byte 0x00001814 + .pool thumb_func_end sub_81CED10 thumb_func_start sub_81CED30 @@ -945441,7 +913172,7 @@ sub_81CED30: @ 81CED30 movs r0, 0xC bl sub_81C763C mov r8, r0 - ldr r7, _081CEDB0 + ldr r7, =0x00001816 add r7, r8 ldrb r0, [r7] cmp r0, 0xFF @@ -945462,12 +913193,12 @@ sub_81CED30: @ 81CED30 bl gpu_pal_obj_alloc_tag_and_apply lsls r0, 24 lsrs r0, 24 - ldr r4, _081CEDB4 + ldr r4, =0x00001818 add r4, r8 strh r0, [r4] adds r0, r5, 0 bl gpu_tile_obj_alloc_tag_and_copy_to_vram - ldr r5, _081CEDB8 + ldr r5, =0x0000181a add r5, r8 strh r0, [r5] mov r0, sp @@ -945488,25 +913219,23 @@ sub_81CED30: @ 81CED30 strb r0, [r7] b _081CEE26 .align 2, 0 -_081CEDB0: .4byte 0x00001816 -_081CEDB4: .4byte 0x00001818 -_081CEDB8: .4byte 0x0000181a + .pool _081CEDBC: strb r0, [r7] - ldr r2, _081CEDEC + ldr r2, =0x02020630 ldrb r1, [r7] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _081CEDF0 + ldr r1, =sub_81CED10 + 1 str r1, [r0] - ldr r1, _081CEDF4 + ldr r1, =0x0000181c add r1, r8 ldrh r0, [r5] lsls r0, 5 - ldr r2, _081CEDF8 + ldr r2, =0x06010000 adds r0, r2 str r0, [r1] ldrh r0, [r4] @@ -945517,25 +913246,22 @@ _081CEDBC: strh r0, [r4] b _081CEE26 .align 2, 0 -_081CEDEC: .4byte 0x02020630 -_081CEDF0: .4byte sub_81CED10 + 1 -_081CEDF4: .4byte 0x0000181c -_081CEDF8: .4byte 0x06010000 + .pool _081CEDFC: adds r0, r6, 0 bl sub_81CDCB4 - ldr r1, _081CEE34 + ldr r1, =0x0000181c add r1, r8 ldr r2, [r1] - ldr r1, _081CEE38 + ldr r1, =0x040000d4 str r0, [r1] str r2, [r1, 0x4] - ldr r0, _081CEE3C + ldr r0, =0x80000400 str r0, [r1, 0x8] ldr r0, [r1, 0x8] adds r0, r6, 0 bl sub_81CDCD4 - ldr r1, _081CEE40 + ldr r1, =0x00001818 add r1, r8 ldrh r1, [r1] movs r2, 0x20 @@ -945548,10 +913274,7 @@ _081CEE26: pop {r0} bx r0 .align 2, 0 -_081CEE34: .4byte 0x0000181c -_081CEE38: .4byte 0x040000d4 -_081CEE3C: .4byte 0x80000400 -_081CEE40: .4byte 0x00001818 + .pool thumb_func_end sub_81CED30 thumb_func_start sub_81CEE44 @@ -945603,7 +913326,7 @@ sub_81CEE90: @ 81CEE90 bl sub_81CDC84 lsls r0, 24 lsrs r0, 24 - ldr r1, _081CEEC4 + ldr r1, =0x030012bc strb r0, [r1] adds r1, r4, 0 adds r1, 0x50 @@ -945620,7 +913343,7 @@ sub_81CEE90: @ 81CEE90 pop {r0} bx r0 .align 2, 0 -_081CEEC4: .4byte 0x030012bc + .pool thumb_func_end sub_81CEE90 thumb_func_start sub_81CEEC8 @@ -945672,7 +913395,7 @@ sub_81CEF14: @ 81CEF14 movs r0, 0 b _081CEF30 _081CEF2A: - ldr r1, _081CEF38 + ldr r1, =0x00001828 adds r0, r4, r1 ldrb r0, [r0] _081CEF30: @@ -945680,7 +913403,7 @@ _081CEF30: pop {r1} bx r1 .align 2, 0 -_081CEF38: .4byte 0x00001828 + .pool thumb_func_end sub_81CEF14 thumb_func_start sub_81CEF3C @@ -945692,22 +913415,22 @@ sub_81CEF3C: @ 81CEF3C adds r4, r0, 0 cmp r4, 0 beq _081CEF90 - ldr r1, _081CEF80 + ldr r1, =0x000006ac movs r0, 0x12 bl sub_81C761C str r0, [r4, 0x20] cmp r0, 0 beq _081CEF90 - ldr r0, _081CEF84 + ldr r0, =sub_81CF010 + 1 str r0, [r4] - ldr r0, _081CEF88 + ldr r0, =sub_81CF11C + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] movs r0, 0 str r0, [r4, 0x18] bl sub_81C76AC - ldr r1, _081CEF8C + ldr r1, =0x086233a0 lsls r0, 2 adds r0, r1 ldr r0, [r0] @@ -945715,10 +913438,7 @@ sub_81CEF3C: @ 81CEF3C movs r0, 0x1 b _081CEF92 .align 2, 0 -_081CEF80: .4byte 0x000006ac -_081CEF84: .4byte sub_81CF010 + 1 -_081CEF88: .4byte sub_81CF11C + 1 -_081CEF8C: .4byte 0x086233a0 + .pool _081CEF90: movs r0, 0 _081CEF92: @@ -945739,12 +913459,12 @@ sub_81CEF98: @ 81CEF98 movs r0, 0x12 bl sub_81C763C str r0, [r4, 0x20] - ldr r0, _081CEFCC + ldr r0, =sub_81CF030 + 1 str r0, [r4] movs r0, 0x1 str r0, [r4, 0x18] bl sub_81C76AC - ldr r1, _081CEFD0 + ldr r1, =0x086233a0 lsls r0, 2 adds r0, r1 ldr r0, [r0] @@ -945752,8 +913472,7 @@ sub_81CEF98: @ 81CEF98 movs r0, 0x1 b _081CEFD6 .align 2, 0 -_081CEFCC: .4byte sub_81CF030 + 1 -_081CEFD0: .4byte 0x086233a0 + .pool _081CEFD4: movs r0, 0 _081CEFD6: @@ -945798,7 +913517,7 @@ sub_81CF010: @ 81CF010 bl sub_81C70D8 cmp r0, 0 bne _081CF022 - ldr r0, _081CF02C + ldr r0, =sub_81CF030 + 1 str r0, [r4] _081CF022: movs r0, 0 @@ -945806,14 +913525,14 @@ _081CF022: pop {r1} bx r1 .align 2, 0 -_081CF02C: .4byte sub_81CF030 + 1 + .pool thumb_func_end sub_81CF010 thumb_func_start sub_81CF030 sub_81CF030: @ 81CF030 push {r4,r5,lr} adds r4, r0, 0 - ldr r2, _081CF044 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 @@ -945822,7 +913541,7 @@ sub_81CF030: @ 81CF030 movs r0, 0x1 b _081CF0A6 .align 2, 0 -_081CF044: .4byte 0x030022c0 + .pool _081CF048: movs r0, 0x80 ands r0, r1 @@ -945853,12 +913572,12 @@ _081CF072: cmp r0, 0 beq _081CF088 str r2, [r4, 0x1C] - ldr r0, _081CF084 + ldr r0, =sub_81CF0B0 + 1 str r0, [r4] movs r0, 0x5 b _081CF0A6 .align 2, 0 -_081CF084: .4byte sub_81CF0B0 + 1 + .pool _081CF088: movs r5, 0x1 adds r0, r5, 0 @@ -945872,7 +913591,7 @@ _081CF096: ldr r1, [r4, 0x20] strh r0, [r1, 0x2] str r5, [r4, 0x1C] - ldr r0, _081CF0AC + ldr r0, =sub_81CF0B8 + 1 str r0, [r4] movs r0, 0x6 _081CF0A6: @@ -945880,23 +913599,23 @@ _081CF0A6: pop {r1} bx r1 .align 2, 0 -_081CF0AC: .4byte sub_81CF0B8 + 1 + .pool thumb_func_end sub_81CF030 thumb_func_start sub_81CF0B0 sub_81CF0B0: @ 81CF0B0 - ldr r0, _081CF0B4 + ldr r0, =0x000186a3 bx lr .align 2, 0 -_081CF0B4: .4byte 0x000186a3 + .pool thumb_func_end sub_81CF0B0 thumb_func_start sub_81CF0B8 sub_81CF0B8: @ 81CF0B8 - ldr r0, _081CF0BC + ldr r0, =0x000186a9 bx lr .align 2, 0 -_081CF0BC: .4byte 0x000186a9 + .pool thumb_func_end sub_81CF0B8 thumb_func_start sub_81CF0C0 @@ -945961,7 +913680,7 @@ sub_81CF10C: @ 81CF10C thumb_func_start sub_81CF11C sub_81CF11C: @ 81CF11C push {lr} - ldr r2, _081CF130 + ldr r2, =0x086233b4 lsls r1, r0, 2 adds r1, r2 ldr r1, [r1] @@ -945969,7 +913688,7 @@ sub_81CF11C: @ 81CF11C pop {r1} bx r1 .align 2, 0 -_081CF130: .4byte 0x086233b4 + .pool thumb_func_end sub_81CF11C thumb_func_start sub_81CF134 @@ -945984,7 +913703,7 @@ sub_81CF134: @ 81CF134 strh r1, [r0] ldr r0, [r6, 0x20] strh r1, [r0, 0x2] - ldr r1, _081CF1B4 + ldr r1, =0xffffff00 ldr r0, [sp] ands r0, r1 movs r1, 0xE @@ -945995,7 +913714,7 @@ _081CF158: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081CF1B8 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -946009,7 +913728,7 @@ _081CF158: bne _081CF1A4 lsls r1, r5, 24 lsrs r1, 16 - ldr r2, _081CF1BC + ldr r2, =0xffff00ff ldr r0, [sp] ands r0, r2 orrs r0, r1 @@ -946018,7 +913737,7 @@ _081CF158: adds r0, r4, 0 bl pokemon_getattr lsls r0, 16 - ldr r2, _081CF1C0 + ldr r2, =0x0000ffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -946037,10 +913756,7 @@ _081CF1AA: pop {r1} bx r1 .align 2, 0 -_081CF1B4: .4byte 0xffffff00 -_081CF1B8: .4byte 0x020244ec -_081CF1BC: .4byte 0xffff00ff -_081CF1C0: .4byte 0x0000ffff + .pool thumb_func_end sub_81CF134 thumb_func_start sub_81CF1C4 @@ -946082,14 +913798,14 @@ _081CF1FC: bl sub_80D2270 cmp r0, 0 beq _081CF23A - ldr r1, _081CF250 + ldr r1, =0xffffff00 ldr r0, [sp] ands r0, r1 orrs r0, r7 lsls r1, r4, 24 lsrs r1, 24 lsls r3, r1, 8 - ldr r2, _081CF254 + ldr r2, =0xffff00ff ands r0, r2 orrs r0, r3 str r0, [sp] @@ -946097,7 +913813,7 @@ _081CF1FC: adds r0, r7, 0 bl get_pokemon_data_from_any_box lsls r0, 16 - ldr r2, _081CF258 + ldr r2, =0x0000ffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -946117,9 +913833,7 @@ _081CF23A: movs r0, 0x3 b _081CF26A .align 2, 0 -_081CF250: .4byte 0xffffff00 -_081CF254: .4byte 0xffff00ff -_081CF258: .4byte 0x0000ffff + .pool _081CF25C: cmp r4, 0x1D ble _081CF1FC @@ -946258,19 +913972,18 @@ sub_81CF330: @ 81CF330 adds r4, r0, 0 cmp r4, 0 beq _081CF360 - ldr r0, _081CF358 + ldr r0, =sub_81CF418 + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, _081CF35C + ldr r0, =sub_81CF3E4 + 1 str r0, [r4] movs r0, 0 str r0, [r4, 0xC] movs r0, 0x1 b _081CF362 .align 2, 0 -_081CF358: .4byte sub_81CF418 + 1 -_081CF35C: .4byte sub_81CF3E4 + 1 + .pool _081CF360: movs r0, 0 _081CF362: @@ -946289,18 +914002,17 @@ sub_81CF368: @ 81CF368 adds r4, r0, 0 cmp r4, 0 beq _081CF398 - ldr r0, _081CF390 + ldr r0, =sub_81CF418 + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, _081CF394 + ldr r0, =sub_81CF3E4 + 1 str r0, [r4] movs r0, 0x1 str r0, [r4, 0xC] b _081CF39A .align 2, 0 -_081CF390: .4byte sub_81CF418 + 1 -_081CF394: .4byte sub_81CF3E4 + 1 + .pool _081CF398: movs r0, 0 _081CF39A: @@ -946316,21 +914028,20 @@ sub_81CF3A0: @ 81CF3A0 movs r0, 0x8 bl sub_81C763C adds r5, r0, 0 - ldr r0, _081CF3C8 + ldr r0, =0x08623598 lsls r4, 2 adds r4, r0 ldr r0, [r4] movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, _081CF3CC + ldr r0, =sub_81CF3E4 + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081CF3C8: .4byte 0x08623598 -_081CF3CC: .4byte sub_81CF3E4 + 1 + .pool thumb_func_end sub_81CF3A0 thumb_func_start sub_81CF3D0 @@ -946384,12 +914095,12 @@ sub_81CF418: @ 81CF418 b _081CF56E _081CF42C: lsls r0, r4, 2 - ldr r1, _081CF438 + ldr r1, =_081CF43C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CF438: .4byte _081CF43C + .pool .align 2, 0 _081CF43C: .4byte _081CF454 @@ -946399,10 +914110,10 @@ _081CF43C: .4byte _081CF4F6 .4byte _081CF55A _081CF454: - ldr r0, _081CF49C + ldr r0, =0x08623590 movs r1, 0x2 bl sub_81C7B54 - ldr r1, _081CF4A0 + ldr r1, =0x086233e4 movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -946413,14 +914124,14 @@ _081CF454: adds r1, 0x10 movs r0, 0x1 bl bg_set_tilemap - ldr r1, _081CF4A4 + ldr r1, =0x086234ac movs r0, 0x1 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map movs r0, 0x1 bl gpu_copy_wram_bg_tilemap_to_vram - ldr r0, _081CF4A8 + ldr r0, =0x086233c4 movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 @@ -946430,10 +914141,7 @@ _081CF498: movs r0, 0 b _081CF570 .align 2, 0 -_081CF49C: .4byte 0x08623590 -_081CF4A0: .4byte 0x086233e4 -_081CF4A4: .4byte 0x086234ac -_081CF4A8: .4byte 0x086233c4 + .pool _081CF4AC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -946448,14 +914156,14 @@ _081CF4C0: lsls r0, 24 cmp r0, 0 bne _081CF56A - ldr r0, _081CF4DC + ldr r0, =0x08623570 movs r1, 0x20 movs r2, 0x20 bl sub_81C7944 bl sub_81CF88C b _081CF498 .align 2, 0 -_081CF4DC: .4byte 0x08623570 + .pool _081CF4E0: bl sub_81C8224 cmp r0, 0 @@ -946864,7 +914572,7 @@ _081CF7C2: sub_81CF7C8: @ 81CF7C8 push {r4,lr} adds r4, r0, 0 - ldr r0, _081CF7F0 + ldr r0, =0x086235b4 bl Window_AddFromTemplate strh r0, [r4, 0x8] lsls r0, 24 @@ -946879,7 +914587,7 @@ sub_81CF7C8: @ 81CF7C8 pop {r0} bx r0 .align 2, 0 -_081CF7F0: .4byte 0x086235b4 + .pool thumb_func_end sub_81CF7C8 thumb_func_start sub_81CF7F4 @@ -946894,14 +914602,14 @@ sub_81CF7F4: @ 81CF7F4 bl sub_81CF0F0 adds r7, r0, 0 bl sub_81AFBF0 - ldr r4, _081CF880 + ldr r4, =0x02021cc4 movs r0, 0 adds r1, r4, 0 bl sub_81AFC0C movs r0, 0xFF strb r0, [r4] - ldr r5, _081CF884 - ldr r1, _081CF888 + ldr r5, =0x02021dc4 + ldr r1, =0x085ec029 adds r0, r5, 0 bl sub_81AFC28 mov r1, r8 @@ -946947,9 +914655,7 @@ sub_81CF7F4: @ 81CF7F4 pop {r0} bx r0 .align 2, 0 -_081CF880: .4byte 0x02021cc4 -_081CF884: .4byte 0x02021dc4 -_081CF888: .4byte 0x085ec029 + .pool thumb_func_end sub_81CF7F4 thumb_func_start sub_81CF88C @@ -946980,10 +914686,10 @@ sub_81CF88C: @ 81CF88C strb r0, [r1, 0xD] mov r0, sp strb r2, [r0, 0xE] - ldr r0, _081CF8DC + ldr r0, =sub_81CF8E4 + 1 str r0, [sp, 0x10] str r4, [sp, 0x14] - ldr r0, _081CF8E0 + ldr r0, =0x08623594 movs r2, 0 bl sub_81C81D4 add sp, 0x18 @@ -946991,8 +914697,7 @@ sub_81CF88C: @ 81CF88C pop {r0} bx r0 .align 2, 0 -_081CF8DC: .4byte sub_81CF8E4 + 1 -_081CF8E0: .4byte 0x08623594 + .pool thumb_func_end sub_81CF88C thumb_func_start sub_81CF8E4 @@ -947007,7 +914712,7 @@ sub_81CF8E4: @ 81CF8E4 movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _081CF91C + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 bl pokemon_get_gender @@ -947017,14 +914722,13 @@ sub_81CF8E4: @ 81CF8E4 bl level_by_exp lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _081CF920 + ldr r2, =0x02021ec4 adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr b _081CF94A .align 2, 0 -_081CF91C: .4byte 0x020244ec -_081CF920: .4byte 0x02021ec4 + .pool _081CF924: ldrb r0, [r2] ldrb r1, [r2, 0x1] @@ -947037,12 +914741,12 @@ _081CF924: bl sub_80690C0 lsls r0, 24 lsrs r7, r0, 24 - ldr r2, _081CF96C + ldr r2, =0x02021ec4 adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr_encrypted _081CF94A: - ldr r4, _081CF96C + ldr r4, =0x02021ec4 adds r0, r4, 0 bl get_end_of_string_ptr_limit_10_chars adds r0, r6, 0 @@ -947055,20 +914759,19 @@ _081CF94A: beq _081CF974 cmp r5, 0xFE beq _081CF97C - ldr r1, _081CF970 + ldr r1, =0x086235d4 b _081CF97E .align 2, 0 -_081CF96C: .4byte 0x02021ec4 -_081CF970: .4byte 0x086235d4 + .pool _081CF974: - ldr r1, _081CF978 + ldr r1, =0x086235bc b _081CF97E .align 2, 0 -_081CF978: .4byte 0x086235bc + .pool _081CF97C: - ldr r1, _081CF9B4 + ldr r1, =0x086235c8 _081CF97E: - ldr r4, _081CF9B8 + ldr r4, =0x02021cc4 adds r0, r4, 0 bl gf_strcpy movs r1, 0xBA @@ -947093,8 +914796,7 @@ _081CF97E: pop {r0} bx r0 .align 2, 0 -_081CF9B4: .4byte 0x086235c8 -_081CF9B8: .4byte 0x02021cc4 + .pool thumb_func_end sub_81CF8E4 thumb_func_start sub_81CF9BC @@ -947106,15 +914808,15 @@ sub_81CF9BC: @ 81CF9BC adds r4, r0, 0 cmp r4, 0 beq _081CF9FC - ldr r1, _081CF9F0 + ldr r1, =0x000006ac movs r0, 0x12 bl sub_81C761C str r0, [r4, 0x1C] cmp r0, 0 beq _081CF9FC - ldr r0, _081CF9F4 + ldr r0, =sub_81CFA68 + 1 str r0, [r4] - ldr r0, _081CF9F8 + ldr r0, =sub_81CFB74 + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] @@ -947123,9 +914825,7 @@ sub_81CF9BC: @ 81CF9BC movs r0, 0x1 b _081CF9FE .align 2, 0 -_081CF9F0: .4byte 0x000006ac -_081CF9F4: .4byte sub_81CFA68 + 1 -_081CF9F8: .4byte sub_81CFB74 + 1 + .pool _081CF9FC: movs r0, 0 _081CF9FE: @@ -947146,13 +914846,13 @@ sub_81CFA04: @ 81CFA04 movs r0, 0x12 bl sub_81C763C str r0, [r4, 0x1C] - ldr r0, _081CFA28 + ldr r0, =sub_81CFA88 + 1 str r0, [r4] movs r0, 0x1 str r0, [r4, 0x14] b _081CFA2E .align 2, 0 -_081CFA28: .4byte sub_81CFA88 + 1 + .pool _081CFA2C: movs r0, 0 _081CFA2E: @@ -947197,7 +914897,7 @@ sub_81CFA68: @ 81CFA68 bl sub_81C70D8 cmp r0, 0 bne _081CFA7A - ldr r0, _081CFA84 + ldr r0, =sub_81CFA88 + 1 str r0, [r4] _081CFA7A: movs r0, 0 @@ -947205,14 +914905,14 @@ _081CFA7A: pop {r1} bx r1 .align 2, 0 -_081CFA84: .4byte sub_81CFA88 + 1 + .pool thumb_func_end sub_81CFA68 thumb_func_start sub_81CFA88 sub_81CFA88: @ 81CFA88 push {r4,r5,lr} adds r4, r0, 0 - ldr r2, _081CFA9C + ldr r2, =0x030022c0 ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 @@ -947221,7 +914921,7 @@ sub_81CFA88: @ 81CFA88 movs r0, 0x1 b _081CFAFE .align 2, 0 -_081CFA9C: .4byte 0x030022c0 + .pool _081CFAA0: movs r0, 0x80 ands r0, r1 @@ -947252,12 +914952,12 @@ _081CFACA: cmp r0, 0 beq _081CFAE0 str r2, [r4, 0x18] - ldr r0, _081CFADC + ldr r0, =sub_81CFB08 + 1 str r0, [r4] movs r0, 0x5 b _081CFAFE .align 2, 0 -_081CFADC: .4byte sub_81CFB08 + 1 + .pool _081CFAE0: movs r5, 0x1 adds r0, r5, 0 @@ -947271,7 +914971,7 @@ _081CFAEE: ldr r1, [r4, 0x1C] strh r0, [r1, 0x2] str r5, [r4, 0x18] - ldr r0, _081CFB04 + ldr r0, =sub_81CFB10 + 1 str r0, [r4] movs r0, 0x6 _081CFAFE: @@ -947279,23 +914979,23 @@ _081CFAFE: pop {r1} bx r1 .align 2, 0 -_081CFB04: .4byte sub_81CFB10 + 1 + .pool thumb_func_end sub_81CFA88 thumb_func_start sub_81CFB08 sub_81CFB08: @ 81CFB08 - ldr r0, _081CFB0C + ldr r0, =0x000186a5 bx lr .align 2, 0 -_081CFB0C: .4byte 0x000186a5 + .pool thumb_func_end sub_81CFB08 thumb_func_start sub_81CFB10 sub_81CFB10: @ 81CFB10 - ldr r0, _081CFB14 + ldr r0, =0x000186ad bx lr .align 2, 0 -_081CFB14: .4byte 0x000186ad + .pool thumb_func_end sub_81CFB10 thumb_func_start sub_81CFB18 @@ -947360,7 +915060,7 @@ sub_81CFB64: @ 81CFB64 thumb_func_start sub_81CFB74 sub_81CFB74: @ 81CFB74 push {lr} - ldr r2, _081CFB88 + ldr r2, =0x086235d8 lsls r1, r0, 2 adds r1, r2 ldr r1, [r1] @@ -947368,7 +915068,7 @@ sub_81CFB74: @ 81CFB74 pop {r1} bx r1 .align 2, 0 -_081CFB88: .4byte 0x086235d8 + .pool thumb_func_end sub_81CFB74 thumb_func_start sub_81CFB8C @@ -947383,7 +915083,7 @@ sub_81CFB8C: @ 81CFB8C strh r1, [r0] ldr r0, [r6, 0x1C] strh r1, [r0, 0x2] - ldr r1, _081CFC1C + ldr r1, =0xffffff00 ldr r0, [sp] ands r0, r1 movs r1, 0xE @@ -947394,7 +915094,7 @@ _081CFBB0: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081CFC20 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -947419,12 +915119,12 @@ _081CFBB0: beq _081CFC0A lsls r1, r5, 24 lsrs r1, 16 - ldr r2, _081CFC24 + ldr r2, =0xffff00ff ldr r0, [sp] ands r0, r2 orrs r0, r1 lsls r2, r3, 16 - ldr r1, _081CFC28 + ldr r1, =0x0000ffff ands r0, r1 orrs r0, r2 str r0, [sp] @@ -947442,10 +915142,7 @@ _081CFC10: pop {r1} bx r1 .align 2, 0 -_081CFC1C: .4byte 0xffffff00 -_081CFC20: .4byte 0x020244ec -_081CFC24: .4byte 0xffff00ff -_081CFC28: .4byte 0x0000ffff + .pool thumb_func_end sub_81CFB8C thumb_func_start sub_81CFC2C @@ -947495,16 +915192,16 @@ _081CFC60: adds r3, r0, 0 cmp r3, 0 beq _081CFCA6 - ldr r1, _081CFCBC + ldr r1, =0xffffff00 ldr r0, [sp] ands r0, r1 orrs r0, r5 lsls r2, r4, 8 - ldr r1, _081CFCC0 + ldr r1, =0xffff00ff ands r0, r1 orrs r0, r2 lsls r2, r3, 16 - ldr r1, _081CFCC4 + ldr r1, =0x0000ffff ands r0, r1 orrs r0, r2 str r0, [sp] @@ -947524,9 +915221,7 @@ _081CFCA6: movs r0, 0x3 b _081CFCDC .align 2, 0 -_081CFCBC: .4byte 0xffffff00 -_081CFCC0: .4byte 0xffff00ff -_081CFCC4: .4byte 0x0000ffff + .pool _081CFCC8: cmp r6, 0x1D ble _081CFC60 @@ -947621,7 +915316,7 @@ _081CFD5C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 - ldr r0, _081CFDB8 + ldr r0, =0x020244ec adds r4, r1, r0 adds r0, r4, 0 movs r1, 0x5 @@ -947663,7 +915358,7 @@ _081CFDB2: movs r0, 0x1 b _081CFDCA .align 2, 0 -_081CFDB8: .4byte 0x020244ec + .pool _081CFDBC: adds r4, 0x1 cmp r4, 0x1D @@ -947688,19 +915383,18 @@ sub_81CFDD0: @ 81CFDD0 adds r4, r0, 0 cmp r4, 0 beq _081CFE00 - ldr r0, _081CFDF8 + ldr r0, =sub_81CFEB8 + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, _081CFDFC + ldr r0, =sub_81CFE84 + 1 str r0, [r4] movs r0, 0 str r0, [r4, 0xC] movs r0, 0x1 b _081CFE02 .align 2, 0 -_081CFDF8: .4byte sub_81CFEB8 + 1 -_081CFDFC: .4byte sub_81CFE84 + 1 + .pool _081CFE00: movs r0, 0 _081CFE02: @@ -947719,18 +915413,17 @@ sub_81CFE08: @ 81CFE08 adds r4, r0, 0 cmp r4, 0 beq _081CFE38 - ldr r0, _081CFE30 + ldr r0, =sub_81CFEB8 + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, _081CFE34 + ldr r0, =sub_81CFE84 + 1 str r0, [r4] movs r0, 0x1 str r0, [r4, 0xC] b _081CFE3A .align 2, 0 -_081CFE30: .4byte sub_81CFEB8 + 1 -_081CFE34: .4byte sub_81CFE84 + 1 + .pool _081CFE38: movs r0, 0 _081CFE3A: @@ -947746,21 +915439,20 @@ sub_81CFE40: @ 81CFE40 movs r0, 0xA bl sub_81C763C adds r5, r0, 0 - ldr r0, _081CFE68 + ldr r0, =0x086237b8 lsls r4, 2 adds r4, r0 ldr r0, [r4] movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, _081CFE6C + ldr r0, =sub_81CFE84 + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081CFE68: .4byte 0x086237b8 -_081CFE6C: .4byte sub_81CFE84 + 1 + .pool thumb_func_end sub_81CFE40 thumb_func_start sub_81CFE70 @@ -947814,12 +915506,12 @@ sub_81CFEB8: @ 81CFEB8 b _081CFFF2 _081CFECC: lsls r0, r4, 2 - ldr r1, _081CFED8 + ldr r1, =_081CFEDC adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081CFED8: .4byte _081CFEDC + .pool .align 2, 0 _081CFEDC: .4byte _081CFEF4 @@ -947829,10 +915521,10 @@ _081CFEDC: .4byte _081CFFA4 .4byte _081CFFDE _081CFEF4: - ldr r0, _081CFF38 + ldr r0, =0x086237b0 movs r1, 0x2 bl sub_81C7B54 - ldr r1, _081CFF3C + ldr r1, =0x08623604 movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -947843,12 +915535,12 @@ _081CFEF4: adds r1, 0x10 movs r0, 0x1 bl bg_set_tilemap - ldr r1, _081CFF40 + ldr r1, =0x086236cc movs r0, 0x1 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r0, _081CFF44 + ldr r0, =0x086235e4 movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 @@ -947858,10 +915550,7 @@ _081CFF32: movs r0, 0 b _081CFFF4 .align 2, 0 -_081CFF38: .4byte 0x086237b0 -_081CFF3C: .4byte 0x08623604 -_081CFF40: .4byte 0x086236cc -_081CFF44: .4byte 0x086235e4 + .pool _081CFF48: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -947886,14 +915575,14 @@ _081CFF76: lsls r0, 24 cmp r0, 0 bne _081CFFEE - ldr r0, _081CFF90 + ldr r0, =0x08623790 movs r1, 0x20 movs r2, 0x20 bl sub_81C7944 bl sub_81D0304 b _081CFF32 .align 2, 0 -_081CFF90: .4byte 0x08623790 + .pool _081CFF94: bl sub_81C8224 cmp r0, 0 @@ -948282,7 +915971,7 @@ _081D0246: sub_81D024C: @ 81D024C push {r4,lr} adds r4, r0, 0 - ldr r0, _081D0284 + ldr r0, =0x086237d4 bl Window_AddFromTemplate strh r0, [r4, 0x8] lsls r0, 24 @@ -948302,7 +915991,7 @@ sub_81D024C: @ 81D024C pop {r0} bx r0 .align 2, 0 -_081D0284: .4byte 0x086237d4 + .pool thumb_func_end sub_81D024C thumb_func_start sub_81D0288 @@ -948395,10 +916084,10 @@ sub_81D0304: @ 81D0304 strb r0, [r1, 0xD] mov r0, sp strb r2, [r0, 0xE] - ldr r0, _081D0354 + ldr r0, =sub_81D035C + 1 str r0, [sp, 0x10] str r4, [sp, 0x14] - ldr r0, _081D0358 + ldr r0, =0x086237b4 movs r2, 0 bl sub_81C81D4 add sp, 0x18 @@ -948406,8 +916095,7 @@ sub_81D0304: @ 81D0304 pop {r0} bx r0 .align 2, 0 -_081D0354: .4byte sub_81D035C + 1 -_081D0358: .4byte 0x086237b4 + .pool thumb_func_end sub_81D0304 thumb_func_start sub_81D035C @@ -948424,7 +916112,7 @@ sub_81D035C: @ 81D035C movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _081D039C + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 bl pokemon_get_gender @@ -948435,14 +916123,13 @@ sub_81D035C: @ 81D035C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r2, _081D03A0 + ldr r2, =0x02021ec4 adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr b _081D03CC .align 2, 0 -_081D039C: .4byte 0x020244ec -_081D03A0: .4byte 0x02021ec4 + .pool _081D03A4: ldrb r0, [r7] ldrb r1, [r7, 0x1] @@ -948456,12 +916143,12 @@ _081D03A4: lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r2, _081D03F0 + ldr r2, =0x02021ec4 adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr_encrypted _081D03CC: - ldr r4, _081D03F0 + ldr r4, =0x02021ec4 adds r0, r4, 0 bl get_end_of_string_ptr_limit_10_chars adds r0, r6, 0 @@ -948474,20 +916161,19 @@ _081D03CC: beq _081D03F8 cmp r5, 0xFE beq _081D0400 - ldr r1, _081D03F4 + ldr r1, =0x086237f4 b _081D0402 .align 2, 0 -_081D03F0: .4byte 0x02021ec4 -_081D03F4: .4byte 0x086237f4 + .pool _081D03F8: - ldr r1, _081D03FC + ldr r1, =0x086237dc b _081D0402 .align 2, 0 -_081D03FC: .4byte 0x086237dc + .pool _081D0400: - ldr r1, _081D0448 + ldr r1, =0x086237e8 _081D0402: - ldr r4, _081D044C + ldr r4, =0x02021cc4 adds r0, r4, 0 bl gf_strcpy movs r1, 0xBA @@ -948519,8 +916205,7 @@ _081D0402: pop {r0} bx r0 .align 2, 0 -_081D0448: .4byte 0x086237e8 -_081D044C: .4byte 0x02021cc4 + .pool thumb_func_end sub_81D035C thumb_func_start sub_81D0450 @@ -948541,20 +916226,18 @@ sub_81D0450: @ 81D0450 bl sub_81D0814 adds r1, r4, 0 adds r1, 0x98 - ldr r0, _081D048C + ldr r0, =sub_81D04C4 + 1 str r0, [r1] - ldr r1, _081D0490 + ldr r1, =0x030026fc movs r0, 0x3 strh r0, [r1] - ldr r1, _081D0494 + ldr r1, =0x030022b0 movs r0, 0xA strh r0, [r1] movs r0, 0x1 b _081D049A .align 2, 0 -_081D048C: .4byte sub_81D04C4 + 1 -_081D0490: .4byte 0x030026fc -_081D0494: .4byte 0x030022b0 + .pool _081D0498: movs r0, 0 _081D049A: @@ -948589,7 +916272,7 @@ sub_81D04B8: @ 81D04B8 sub_81D04C4: @ 81D04C4 push {r4,lr} adds r4, r0, 0 - ldr r2, _081D04E0 + ldr r2, =0x030022c0 ldrh r1, [r2, 0x30] movs r0, 0x40 ands r0, r1 @@ -948602,7 +916285,7 @@ sub_81D04C4: @ 81D04C4 subs r0, 0x1 b _081D04FC .align 2, 0 -_081D04E0: .4byte 0x030022c0 + .pool _081D04E4: ldrh r1, [r2, 0x30] movs r0, 0x80 @@ -948632,12 +916315,12 @@ _081D050C: beq _081D0528 adds r1, r4, 0 adds r1, 0x98 - ldr r0, _081D0524 + ldr r0, =sub_81D0548 + 1 str r0, [r1] movs r0, 0x2 b _081D053E .align 2, 0 -_081D0524: .4byte sub_81D0548 + 1 + .pool _081D0528: movs r0, 0x2 ands r0, r2 @@ -948648,7 +916331,7 @@ _081D0528: _081D0534: adds r1, r4, 0 adds r1, 0x98 - ldr r0, _081D0544 + ldr r0, =sub_81D05D4 + 1 str r0, [r1] movs r0, 0x5 _081D053E: @@ -948656,14 +916339,14 @@ _081D053E: pop {r1} bx r1 .align 2, 0 -_081D0544: .4byte sub_81D05D4 + 1 + .pool thumb_func_end sub_81D04C4 thumb_func_start sub_81D0548 sub_81D0548: @ 81D0548 push {r4,lr} adds r4, r0, 0 - ldr r0, _081D05A8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] movs r0, 0x40 ands r0, r1 @@ -948674,7 +916357,7 @@ sub_81D0548: @ 81D0548 cmp r0, 0 bne _081D05A4 _081D0562: - ldr r0, _081D05A8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] movs r0, 0x80 ands r0, r1 @@ -948685,7 +916368,7 @@ _081D0562: cmp r0, 0 bne _081D05A4 _081D0578: - ldr r0, _081D05A8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] movs r0, 0x20 ands r0, r1 @@ -948696,7 +916379,7 @@ _081D0578: cmp r0, 0 bne _081D05A4 _081D058E: - ldr r0, _081D05A8 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x30] movs r0, 0x10 ands r0, r1 @@ -948710,9 +916393,9 @@ _081D05A4: movs r0, 0x3 b _081D05CA .align 2, 0 -_081D05A8: .4byte 0x030022c0 + .pool _081D05AC: - ldr r0, _081D05BC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -948721,11 +916404,11 @@ _081D05AC: movs r0, 0 b _081D05CA .align 2, 0 -_081D05BC: .4byte 0x030022c0 + .pool _081D05C0: adds r1, r4, 0 adds r1, 0x98 - ldr r0, _081D05D0 + ldr r0, =sub_81D04C4 + 1 str r0, [r1] movs r0, 0x4 _081D05CA: @@ -948733,15 +916416,15 @@ _081D05CA: pop {r1} bx r1 .align 2, 0 -_081D05D0: .4byte sub_81D04C4 + 1 + .pool thumb_func_end sub_81D0548 thumb_func_start sub_81D05D4 sub_81D05D4: @ 81D05D4 - ldr r0, _081D05D8 + ldr r0, =0x000186ae bx lr .align 2, 0 -_081D05D8: .4byte 0x000186ae + .pool thumb_func_end sub_81D05D4 thumb_func_start sub_81D05DC @@ -948931,7 +916614,7 @@ sub_81D06E4: @ 81D06E4 movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _081D072C + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x2 @@ -948945,7 +916628,7 @@ sub_81D06E4: @ 81D06E4 strb r0, [r6] b _081D0752 .align 2, 0 -_081D072C: .4byte 0x020244ec + .pool _081D0730: ldrb r0, [r1] ldrb r1, [r1, 0x1] @@ -948988,7 +916671,7 @@ sub_81D0760: @ 81D0760 movs r0, 0x64 adds r4, r1, 0 muls r4, r0 - ldr r0, _081D07A8 + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0xB @@ -949003,7 +916686,7 @@ sub_81D0760: @ 81D0760 bl pokemon_getattr b _081D07D0 .align 2, 0 -_081D07A8: .4byte 0x020244ec + .pool _081D07AC: ldrb r0, [r1] ldrb r1, [r1, 0x1] @@ -949047,7 +916730,7 @@ _081D07FA: ldrb r1, [r1, 0x1] movs r0, 0x64 muls r0, r1 - ldr r1, _081D0810 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x52 bl pokemon_getattr @@ -949055,7 +916738,7 @@ _081D080A: pop {r1} bx r1 .align 2, 0 -_081D0810: .4byte 0x020244ec + .pool thumb_func_end sub_81D07D8 thumb_func_start sub_81D0814 @@ -949077,13 +916760,13 @@ sub_81D0814: @ 81D0814 ldrb r1, [r1, 0x1] movs r0, 0x64 muls r0, r1 - ldr r1, _081D0844 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x53 bl pokemon_getattr b _081D0852 .align 2, 0 -_081D0844: .4byte 0x020244ec + .pool _081D0848: ldrb r0, [r1] ldrb r1, [r1, 0x1] @@ -949095,7 +916778,7 @@ _081D0852: strh r0, [r5, 0x10] strh r0, [r5, 0x12] movs r6, 0 - ldr r0, _081D08A8 + ldr r0, =0x086237f8 mov r9, r0 mov r10, r9 _081D0862: @@ -949136,7 +916819,7 @@ _081D0890: blt _081D0890 b _081D08D6 .align 2, 0 -_081D08A8: .4byte 0x086237f8 + .pool _081D08AC: movs r3, 0 adds r6, 0x1 @@ -949259,24 +916942,22 @@ _081D0970: thumb_func_start sub_81D0978 sub_81D0978: @ 81D0978 push {r4,lr} - ldr r1, _081D099C + ldr r1, =0x0000101c movs r0, 0xE bl sub_81C761C adds r4, r0, 0 cmp r4, 0 beq _081D09A8 - ldr r0, _081D09A0 + ldr r0, =sub_81D0A6C + 1 movs r1, 0x1 bl sub_81C7078 str r0, [r4, 0x4] - ldr r0, _081D09A4 + ldr r0, =sub_81D0A58 + 1 str r0, [r4] movs r0, 0x1 b _081D09AA .align 2, 0 -_081D099C: .4byte 0x0000101c -_081D09A0: .4byte sub_81D0A6C + 1 -_081D09A4: .4byte sub_81D0A58 + 1 + .pool _081D09A8: movs r0, 0 _081D09AA: @@ -949292,21 +916973,20 @@ sub_81D09B0: @ 81D09B0 movs r0, 0xE bl sub_81C763C adds r5, r0, 0 - ldr r0, _081D09D8 + ldr r0, =0x08624ba0 lsls r4, 2 adds r4, r0 ldr r0, [r4] movs r1, 0x1 bl sub_81C7078 str r0, [r5, 0x4] - ldr r0, _081D09DC + ldr r0, =sub_81D0A58 + 1 str r0, [r5] pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081D09D8: .4byte 0x08624ba0 -_081D09DC: .4byte sub_81D0A58 + 1 + .pool thumb_func_end sub_81D09B0 thumb_func_start sub_81D09E0 @@ -949383,12 +917063,12 @@ sub_81D0A6C: @ 81D0A6C b _081D0C48 _081D0A80: lsls r0, r4, 2 - ldr r1, _081D0A8C + ldr r1, =_081D0A90 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081D0A8C: .4byte _081D0A90 + .pool .align 2, 0 _081D0A90: .4byte _081D0AB8 @@ -949402,10 +917082,10 @@ _081D0A90: .4byte _081D0BE8 .4byte _081D0C3C _081D0AB8: - ldr r0, _081D0AF4 + ldr r0, =0x08624b98 movs r1, 0x2 bl sub_81C7B54 - ldr r1, _081D0AF8 + ldr r1, =0x08dde030 movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -949416,21 +917096,18 @@ _081D0AB8: adds r1, 0x1C movs r0, 0x2 bl bg_set_tilemap - ldr r1, _081D0AFC + ldr r1, =0x08dde12c movs r0, 0x2 movs r2, 0 movs r3, 0 bl gpu_copy_to_wram_bg_tile_map - ldr r0, _081D0B00 + ldr r0, =0x08dde010 movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 b _081D0BBA .align 2, 0 -_081D0AF4: .4byte 0x08624b98 -_081D0AF8: .4byte 0x08dde030 -_081D0AFC: .4byte 0x08dde12c -_081D0B00: .4byte 0x08dde010 + .pool _081D0B04: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -949444,13 +917121,13 @@ _081D0B12: movs r2, 0 movs r3, 0x1 bl sub_8199DF0 - ldr r1, _081D0B64 + ldr r1, =0x086240b8 str r4, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0x1 bl decompress_and_copy_tile_data_to_vram - ldr r0, _081D0B68 + ldr r0, =0x0000081c adds r1, r5, r0 movs r0, 0x1 bl bg_set_tilemap @@ -949463,21 +917140,18 @@ _081D0B12: movs r2, 0 movs r3, 0 bl bg_fill_tilemap_rect - ldr r0, _081D0B6C + ldr r0, =0x08623ff8 movs r1, 0x20 movs r2, 0xA0 bl sub_81C7944 - ldr r0, _081D0B70 + ldr r0, =0x08624098 movs r1, 0xA0 movs r2, 0x20 bl sub_81C7944 movs r0, 0x1 b _081D0BBC .align 2, 0 -_081D0B64: .4byte 0x086240b8 -_081D0B68: .4byte 0x0000081c -_081D0B6C: .4byte 0x08623ff8 -_081D0B70: .4byte 0x08624098 + .pool _081D0B74: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 @@ -949619,12 +917293,12 @@ sub_81D0C84: @ 81D0C84 cmp r5, 0x6 bhi _081D0D24 lsls r0, r5, 2 - ldr r1, _081D0CA0 + ldr r1, =_081D0CA4 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081D0CA0: .4byte _081D0CA4 + .pool .align 2, 0 _081D0CA4: .4byte _081D0CC0 @@ -949859,7 +917533,7 @@ _081D0E5A: sub_81D0E60: @ 81D0E60 push {r4,lr} adds r4, r0, 0 - ldr r0, _081D0E80 + ldr r0, =0x08624bb8 bl Window_AddFromTemplate strh r0, [r4, 0xA] lsls r0, 24 @@ -949871,7 +917545,7 @@ sub_81D0E60: @ 81D0E60 pop {r0} bx r0 .align 2, 0 -_081D0E80: .4byte 0x08624bb8 + .pool thumb_func_end sub_81D0E60 thumb_func_start sub_81D0E84 @@ -949879,11 +917553,11 @@ sub_81D0E84: @ 81D0E84 push {r4,r5,lr} sub sp, 0x10 adds r5, r0, 0 - ldr r1, _081D0EEC + ldr r1, =0x08624bc0 add r0, sp, 0xC movs r2, 0x3 bl memcpy - ldr r4, _081D0EF0 + ldr r4, =0x02021cc4 bl sub_81D07D8 adds r1, r0, 0 adds r0, r4, 0 @@ -949894,8 +917568,8 @@ sub_81D0E84: @ 81D0E84 movs r0, 0 adds r1, r4, 0 bl sub_81AFC0C - ldr r4, _081D0EF4 - ldr r1, _081D0EF8 + ldr r4, =0x02021fc4 + ldr r1, =0x085ec030 adds r0, r4, 0 bl sub_81AFC28 ldrb r0, [r5, 0xA] @@ -949920,10 +917594,7 @@ sub_81D0E84: @ 81D0E84 pop {r0} bx r0 .align 2, 0 -_081D0EEC: .4byte 0x08624bc0 -_081D0EF0: .4byte 0x02021cc4 -_081D0EF4: .4byte 0x02021fc4 -_081D0EF8: .4byte 0x085ec030 + .pool thumb_func_end sub_81D0E84 thumb_func_start sub_81D0EFC @@ -949935,7 +917606,7 @@ sub_81D0EFC: @ 81D0EFC adds r7, r0, 0 bl sub_81D0954 adds r5, r0, 0 - ldr r1, _081D0F58 + ldr r1, =0x08624bc0 add r0, sp, 0xC movs r2, 0x3 bl memcpy @@ -949945,7 +917616,7 @@ sub_81D0EFC: @ 81D0EFC cmp r5, 0x18 bhi _081D0F60 lsls r1, r5, 3 - ldr r0, _081D0F5C + ldr r0, =0x086239ac adds r6, r1, r0 movs r5, 0x80 lsls r5, 17 @@ -949971,20 +917642,19 @@ _081D0F2E: bge _081D0F2E b _081D0FAA .align 2, 0 -_081D0F58: .4byte 0x08624bc0 -_081D0F5C: .4byte 0x086239ac + .pool _081D0F60: - ldr r0, _081D0FC0 + ldr r0, =0x03005d8c ldr r0, [r0] adds r0, r5 - ldr r1, _081D0FC4 + ldr r1, =0x0000318f adds r0, r1 ldrb r5, [r0] cmp r5, 0 beq _081D0FB2 subs r5, 0x1 movs r4, 0 - ldr r0, _081D0FC8 + ldr r0, =0x08623df8 mov r8, r0 movs r6, 0x80 lsls r6, 17 @@ -950023,16 +917693,14 @@ _081D0FB2: pop {r0} bx r0 .align 2, 0 -_081D0FC0: .4byte 0x03005d8c -_081D0FC4: .4byte 0x0000318f -_081D0FC8: .4byte 0x08623df8 + .pool thumb_func_end sub_81D0EFC thumb_func_start sub_81D0FCC sub_81D0FCC: @ 81D0FCC push {r4,lr} adds r4, r0, 0 - ldr r0, _081D0FEC + ldr r0, =0x08624bc4 bl Window_AddFromTemplate strh r0, [r4, 0x8] lsls r0, 24 @@ -950044,7 +917712,7 @@ sub_81D0FCC: @ 81D0FCC pop {r0} bx r0 .align 2, 0 -_081D0FEC: .4byte 0x08624bc4 + .pool thumb_func_end sub_81D0FCC thumb_func_start sub_81D0FF0 @@ -950056,7 +917724,7 @@ sub_81D0FF0: @ 81D0FF0 adds r0, r5, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r4, _081D1038 + ldr r4, =0x02021ec4 mov r6, sp adds r6, 0xD adds r0, r4, 0 @@ -950079,20 +917747,19 @@ sub_81D0FF0: @ 81D0FF0 beq _081D1040 cmp r0, 0xFE beq _081D1048 - ldr r1, _081D103C + ldr r1, =0x08624be4 b _081D104A .align 2, 0 -_081D1038: .4byte 0x02021ec4 -_081D103C: .4byte 0x08624be4 + .pool _081D1040: - ldr r1, _081D1044 + ldr r1, =0x08624bcc b _081D104A .align 2, 0 -_081D1044: .4byte 0x08624bcc + .pool _081D1048: - ldr r1, _081D109C + ldr r1, =0x08624bd8 _081D104A: - ldr r5, _081D10A0 + ldr r5, =0x02021cc4 adds r0, r5, 0 bl gf_strcpy movs r1, 0xBA @@ -950130,15 +917797,14 @@ _081D104A: pop {r0} bx r0 .align 2, 0 -_081D109C: .4byte 0x08624bd8 -_081D10A0: .4byte 0x02021cc4 + .pool thumb_func_end sub_81D0FF0 thumb_func_start sub_81D10A4 sub_81D10A4: @ 81D10A4 push {r4,lr} adds r4, r0, 0 - ldr r0, _081D10CC + ldr r0, =0x08624be8 bl Window_AddFromTemplate strh r0, [r4, 0xC] lsls r0, 24 @@ -950153,7 +917819,7 @@ sub_81D10A4: @ 81D10A4 pop {r0} bx r0 .align 2, 0 -_081D10CC: .4byte 0x08624be8 + .pool thumb_func_end sub_81D10A4 thumb_func_start sub_81D10D0 @@ -950168,7 +917834,7 @@ sub_81D10D0: @ 81D10D0 adds r4, 0x1 bl sub_81D06D4 adds r6, r0, 0 - ldr r5, _081D1144 + ldr r5, =0x02021cc4 adds r0, r5, 0 adds r1, r4, 0 movs r2, 0x1 @@ -950210,7 +917876,7 @@ sub_81D10D0: @ 81D10D0 pop {r0} bx r0 .align 2, 0 -_081D1144: .4byte 0x02021cc4 + .pool thumb_func_end sub_81D10D0 thumb_func_start sub_81D1148 @@ -950263,13 +917929,13 @@ sub_81D1184: @ 81D1184 str r3, [sp, 0x4] movs r3, 0xF str r3, [sp, 0x8] - ldr r3, _081D11D0 + ldr r3, =0x0000ffff str r3, [sp, 0xC] movs r3, 0x1 bl sub_818D7D8 lsls r0, 16 lsrs r0, 16 - ldr r1, _081D11D4 + ldr r1, =0x02020630 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -950283,8 +917949,7 @@ sub_81D1184: @ 81D1184 pop {r1} bx r1 .align 2, 0 -_081D11D0: .4byte 0x0000ffff -_081D11D4: .4byte 0x02020630 + .pool thumb_func_end sub_81D1184 thumb_func_start sub_81D11D8 @@ -950294,7 +917959,7 @@ sub_81D11D8: @ 81D11D8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081D11F8 + ldr r1, =0x02020630 adds r0, r1 movs r2, 0x20 negs r2, r2 @@ -950304,7 +917969,7 @@ sub_81D11D8: @ 81D11D8 pop {r0} bx r0 .align 2, 0 -_081D11F8: .4byte 0x02020630 + .pool thumb_func_end sub_81D11D8 thumb_func_start sub_81D11FC @@ -950323,7 +917988,7 @@ sub_81D11FC: @ 81D11FC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081D1230 + ldr r1, =0x02020630 adds r0, r1 adds r1, r5, 0 movs r2, 0x28 @@ -950333,12 +917998,12 @@ sub_81D11FC: @ 81D11FC pop {r0} bx r0 .align 2, 0 -_081D1230: .4byte 0x02020630 + .pool thumb_func_end sub_81D11FC thumb_func_start sub_81D1234 sub_81D1234: @ 81D1234 - ldr r2, _081D1250 + ldr r2, =0x02020630 ldrh r1, [r0, 0x10] lsls r0, r1, 4 adds r0, r1 @@ -950346,15 +918011,14 @@ sub_81D1234: @ 81D1234 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081D1254 + ldr r0, =nullsub_12 + 1 eors r1, r0 negs r0, r1 orrs r0, r1 lsrs r0, 31 bx lr .align 2, 0 -_081D1250: .4byte 0x02020630 -_081D1254: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81D1234 thumb_func_start sub_81D1258 @@ -950373,13 +918037,13 @@ sub_81D1258: @ 81D1258 strh r0, [r4, 0x30] strh r5, [r4, 0x32] strh r6, [r4, 0x34] - ldr r0, _081D1280 + ldr r0, =sub_81D1284 + 1 str r0, [r4, 0x1C] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081D1280: .4byte sub_81D1284 + 1 + .pool thumb_func_end sub_81D1258 thumb_func_start sub_81D1284 @@ -950422,24 +918086,24 @@ _081D12BA: _081D12C8: ldrh r0, [r2, 0x34] strh r0, [r2, 0x20] - ldr r0, _081D12D4 + ldr r0, =nullsub_12 + 1 str r0, [r2, 0x1C] _081D12D0: pop {r0} bx r0 .align 2, 0 -_081D12D4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81D1284 thumb_func_start sub_81D12D8 sub_81D12D8: @ 81D12D8 push {r4-r6,lr} bl sub_81D1350 - ldr r5, _081D1348 + ldr r5, =0x030012c0 adds r0, r5, 0 bl sub_81D0914 adds r6, r0, 0 - ldr r2, _081D134C + ldr r2, =0x030012c4 movs r1, 0 str r1, [r2] ldr r0, [r5] @@ -950457,11 +918121,11 @@ _081D12F6: cmp r1, r0 bcc _081D12F6 _081D130A: - ldr r4, _081D1348 + ldr r4, =0x030012c0 adds r0, r4, 0 bl sub_81D092C adds r6, r0, 0 - ldr r2, _081D134C + ldr r2, =0x030012c4 movs r1, 0 str r1, [r2] ldr r0, [r4] @@ -950476,7 +918140,7 @@ _081D1322: ldr r1, [r4] adds r1, 0x1 str r1, [r4] - ldr r0, _081D1348 + ldr r0, =0x030012c0 ldr r0, [r0] cmp r1, r0 bcc _081D1322 @@ -950487,8 +918151,7 @@ _081D133A: pop {r0} bx r0 .align 2, 0 -_081D1348: .4byte 0x030012c0 -_081D134C: .4byte 0x030012c4 + .pool thumb_func_end sub_81D12D8 thumb_func_start sub_81D1350 @@ -950550,7 +918213,7 @@ sub_81D1370: @ 81D1370 thumb_func_start sub_81D13BC sub_81D13BC: @ 81D13BC push {r4,r5,lr} - ldr r2, _081D13F8 + ldr r2, =0x08624bf8 lsls r1, 2 adds r1, r2 ldrh r3, [r1, 0x2] @@ -950579,18 +918242,18 @@ sub_81D13BC: @ 81D13BC pop {r0} bx r0 .align 2, 0 -_081D13F8: .4byte 0x08624bf8 + .pool thumb_func_end sub_81D13BC thumb_func_start sub_81D13FC sub_81D13FC: @ 81D13FC push {r4,lr} adds r4, r0, 0 - ldr r0, _081D1438 + ldr r0, =0x08624c78 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D143C + ldr r0, =0x08624c80 bl sub_81C795C - ldr r0, _081D1440 + ldr r0, =0x08624d04 movs r1, 0 movs r2, 0 movs r3, 0 @@ -950600,7 +918263,7 @@ sub_81D13FC: @ 81D13FC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _081D1444 + ldr r0, =0x02020630 adds r1, r0 str r1, [r4, 0x14] adds r1, 0x3E @@ -950612,10 +918275,7 @@ sub_81D13FC: @ 81D13FC pop {r0} bx r0 .align 2, 0 -_081D1438: .4byte 0x08624c78 -_081D143C: .4byte 0x08624c80 -_081D1440: .4byte 0x08624d04 -_081D1444: .4byte 0x02020630 + .pool thumb_func_end sub_81D13FC thumb_func_start sub_81D1448 @@ -950650,17 +918310,17 @@ sub_81D1448: @ 81D1448 movs r0, 0x9 bl gpu_tile_obj_tag_get_range_start ldr r3, [r6, 0x14] - ldr r1, _081D14F0 + ldr r1, =0x08624bf8 lsls r4, 2 adds r4, r1 ldrh r1, [r4] lsls r1, 4 adds r0, r1 - ldr r2, _081D14F4 + ldr r2, =0x000003ff adds r1, r2, 0 ands r0, r1 ldrh r2, [r3, 0x4] - ldr r1, _081D14F8 + ldr r1, =0xfffffc00 ands r1, r2 orrs r1, r0 strh r1, [r3, 0x4] @@ -950690,7 +918350,7 @@ sub_81D1448: @ 81D1448 mov r1, r8 strh r1, [r0, 0x2E] ldr r1, [r6, 0x14] - ldr r0, _081D14FC + ldr r0, =sub_81D1538 + 1 str r0, [r1, 0x1C] pop {r3} mov r8, r3 @@ -950698,10 +918358,7 @@ sub_81D1448: @ 81D1448 pop {r0} bx r0 .align 2, 0 -_081D14F0: .4byte 0x08624bf8 -_081D14F4: .4byte 0x000003ff -_081D14F8: .4byte 0xfffffc00 -_081D14FC: .4byte sub_81D1538 + 1 + .pool thumb_func_end sub_81D1448 thumb_func_start sub_81D1500 @@ -950715,27 +918372,27 @@ sub_81D1500: @ 81D1500 movs r1, 0x2 bl sub_8008258 ldr r1, [r4, 0x14] - ldr r0, _081D1520 + ldr r0, =sub_81D1538 + 1 str r0, [r1, 0x1C] pop {r4} pop {r0} bx r0 .align 2, 0 -_081D1520: .4byte sub_81D1538 + 1 + .pool thumb_func_end sub_81D1500 thumb_func_start sub_81D1524 sub_81D1524: @ 81D1524 ldr r0, [r0, 0x14] ldr r1, [r0, 0x1C] - ldr r0, _081D1534 + ldr r0, =nullsub_12 + 1 eors r1, r0 negs r0, r1 orrs r0, r1 lsrs r0, 31 bx lr .align 2, 0 -_081D1534: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81D1524 thumb_func_start sub_81D1538 @@ -950763,13 +918420,13 @@ sub_81D1538: @ 81D1538 orrs r0, r1 mov r1, r12 strb r0, [r1] - ldr r0, _081D1570 + ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] _081D156A: pop {r0} bx r0 .align 2, 0 -_081D1570: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81D1538 thumb_func_start sub_81D1574 @@ -950779,12 +918436,12 @@ sub_81D1574: @ 81D1574 cmp r0, 0x5 bhi _081D15A4 lsls r0, 2 - ldr r1, _081D1588 + ldr r1, =_081D158C adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081D1588: .4byte _081D158C + .pool .align 2, 0 _081D158C: .4byte _081D15A4 @@ -950814,13 +918471,13 @@ _081D15B6: thumb_func_start sub_81D15BC sub_81D15BC: @ 81D15BC - ldr r1, _081D15C8 + ldr r1, =0x085500a4 lsls r0, 4 adds r0, r1 ldrh r0, [r0] bx lr .align 2, 0 -_081D15C8: .4byte 0x085500a4 + .pool thumb_func_end sub_81D15BC thumb_func_start sub_81D15CC @@ -950828,7 +918485,7 @@ sub_81D15CC: @ 81D15CC push {lr} adds r3, r0, 0 movs r1, 0 - ldr r2, _081D15E0 + ldr r2, =0x085500a4 _081D15D4: ldrh r0, [r2] cmp r0, r3 @@ -950836,7 +918493,7 @@ _081D15D4: adds r0, r1, 0 b _081D15F0 .align 2, 0 -_081D15E0: .4byte 0x085500a4 + .pool _081D15E4: adds r2, 0x10 adds r1, 0x1 @@ -950854,13 +918511,13 @@ sub_81D15F4: @ 81D15F4 push {r4,lr} cmp r0, 0x14 bhi _081D1620 - ldr r1, _081D1618 + ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 ldr r4, [r0] adds r0, r4, 0 bl sub_81D1574 - ldr r1, _081D161C + ldr r1, =0x086252fc lsls r0, 2 adds r0, r1 ldr r1, [r0] @@ -950868,8 +918525,7 @@ sub_81D15F4: @ 81D15F4 bl _call_via_r1 b _081D1622 .align 2, 0 -_081D1618: .4byte 0x086252a8 -_081D161C: .4byte 0x086252fc + .pool _081D1620: movs r0, 0 _081D1622: @@ -950883,7 +918539,7 @@ sub_81D1628: @ 81D1628 push {lr} adds r2, r0, 0 ldrh r1, [r2, 0x2] - ldr r0, _081D1640 + ldr r0, =0x0000ffff cmp r1, r0 beq _081D1644 adds r0, r1, 0 @@ -950892,7 +918548,7 @@ sub_81D1628: @ 81D1628 lsrs r0, 24 b _081D1646 .align 2, 0 -_081D1640: .4byte 0x0000ffff + .pool _081D1644: movs r0, 0x1 _081D1646: @@ -950905,7 +918561,7 @@ sub_81D164C: @ 81D164C push {lr} adds r2, r0, 0 ldrh r1, [r2, 0x2] - ldr r0, _081D1664 + ldr r0, =0x0000ffff cmp r1, r0 beq _081D1668 adds r0, r1, 0 @@ -950914,7 +918570,7 @@ sub_81D164C: @ 81D164C lsrs r0, 24 b _081D166A .align 2, 0 -_081D1664: .4byte 0x0000ffff + .pool _081D1668: movs r0, 0x1 _081D166A: @@ -950927,7 +918583,7 @@ sub_81D1670: @ 81D1670 push {lr} adds r2, r0, 0 ldrh r1, [r2, 0x2] - ldr r0, _081D1688 + ldr r0, =0x0000ffff cmp r1, r0 beq _081D168C adds r0, r1, 0 @@ -950936,7 +918592,7 @@ sub_81D1670: @ 81D1670 lsrs r0, 24 b _081D168E .align 2, 0 -_081D1688: .4byte 0x0000ffff + .pool _081D168C: movs r0, 0x1 _081D168E: @@ -950948,7 +918604,7 @@ _081D168E: sub_81D1694: @ 81D1694 push {lr} adds r2, r0, 0 - ldr r0, _081D16A8 + ldr r0, =0x03005d90 ldr r1, [r0] ldrb r0, [r2, 0x1] ldrb r1, [r1, 0x8] @@ -950957,10 +918613,10 @@ sub_81D1694: @ 81D1694 movs r0, 0 b _081D16C6 .align 2, 0 -_081D16A8: .4byte 0x03005d90 + .pool _081D16AC: ldrh r1, [r2, 0x2] - ldr r0, _081D16C0 + ldr r0, =0x0000ffff cmp r1, r0 beq _081D16C4 adds r0, r1, 0 @@ -950969,7 +918625,7 @@ _081D16AC: lsrs r0, 24 b _081D16C6 .align 2, 0 -_081D16C0: .4byte 0x0000ffff + .pool _081D16C4: movs r0, 0x1 _081D16C6: @@ -950993,13 +918649,13 @@ sub_81D16DC: @ 81D16DC push {r4,lr} cmp r0, 0x14 bhi _081D170C - ldr r1, _081D1704 + ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 ldr r4, [r0] adds r0, r4, 0 bl sub_81D1574 - ldr r1, _081D1708 + ldr r1, =0x08625310 lsls r0, 2 adds r0, r1 ldr r1, [r0] @@ -951009,8 +918665,7 @@ sub_81D16DC: @ 81D16DC lsrs r0, 24 b _081D170E .align 2, 0 -_081D1704: .4byte 0x086252a8 -_081D1708: .4byte 0x08625310 + .pool _081D170C: movs r0, 0 _081D170E: @@ -951036,10 +918691,10 @@ sub_81D171C: @ 81D171C push {r4-r7,lr} adds r5, r0, 0 movs r6, 0 - ldr r7, _081D1728 + ldr r7, =0x0000ffff b _081D172E .align 2, 0 -_081D1728: .4byte 0x0000ffff + .pool _081D172C: adds r6, 0x1 _081D172E: @@ -951079,13 +918734,13 @@ sub_81D1758: @ 81D1758 push {r4,lr} cmp r0, 0x14 bhi _081D1784 - ldr r1, _081D177C + ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 ldr r4, [r0] adds r0, r4, 0 bl sub_81D1574 - ldr r1, _081D1780 + ldr r1, =0x08625324 lsls r0, 2 adds r0, r1 ldr r1, [r0] @@ -951093,8 +918748,7 @@ sub_81D1758: @ 81D1758 bl _call_via_r1 b _081D1786 .align 2, 0 -_081D177C: .4byte 0x086252a8 -_081D1780: .4byte 0x08625324 + .pool _081D1784: movs r0, 0 _081D1786: @@ -951116,9 +918770,9 @@ sub_81D1790: @ 81D1790 ldrh r0, [r1, 0x4] cmp r0, 0x48 bhi _081D17B8 - ldr r0, _081D17B0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _081D17B4 + ldr r2, =0x000009ca adds r0, r2 ldrh r1, [r1, 0x4] adds r0, r1 @@ -951128,8 +918782,7 @@ sub_81D1790: @ 81D1790 lsrs r0, 31 b _081D17BA .align 2, 0 -_081D17B0: .4byte 0x03005d8c -_081D17B4: .4byte 0x000009ca + .pool _081D17B8: movs r0, 0 _081D17BA: @@ -951139,9 +918792,9 @@ _081D17BA: thumb_func_start sub_81D17C0 sub_81D17C0: @ 81D17C0 - ldr r1, _081D17D8 + ldr r1, =0x03005d8c ldr r1, [r1] - ldr r2, _081D17DC + ldr r2, =0x000009ca adds r1, r2 ldrh r0, [r0, 0x4] adds r1, r0 @@ -951151,8 +918804,7 @@ sub_81D17C0: @ 81D17C0 lsrs r0, 31 bx lr .align 2, 0 -_081D17D8: .4byte 0x03005d8c -_081D17DC: .4byte 0x000009ca + .pool thumb_func_end sub_81D17C0 thumb_func_start sub_81D17E0 @@ -951173,14 +918825,14 @@ sub_81D17E8: @ 81D17E8 adds r5, r0, 0 cmp r5, 0x14 bhi _081D1832 - ldr r1, _081D1818 + ldr r1, =0x086252a8 lsls r0, r5, 2 adds r0, r1 ldr r4, [r0] adds r0, r4, 0 bl sub_81D1574 adds r2, r0, 0 - ldr r1, _081D181C + ldr r1, =0x08625338 lsls r0, r2, 2 adds r0, r1 ldr r1, [r0] @@ -951192,11 +918844,10 @@ _081D1812: movs r0, 0x1 b _081D1834 .align 2, 0 -_081D1818: .4byte 0x086252a8 -_081D181C: .4byte 0x08625338 + .pool _081D1820: movs r2, 0 - ldr r1, _081D183C + ldr r1, =0x08625388 _081D1824: ldrh r0, [r1] cmp r0, r5 @@ -951212,7 +918863,7 @@ _081D1834: pop {r1} bx r1 .align 2, 0 -_081D183C: .4byte 0x08625388 + .pool thumb_func_end sub_81D17E8 thumb_func_start sub_81D1840 @@ -951250,13 +918901,13 @@ sub_81D1854: @ 81D1854 push {r4,lr} cmp r0, 0x14 bhi _081D1880 - ldr r1, _081D1878 + ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 ldr r4, [r0] adds r0, r4, 0 bl sub_81D1574 - ldr r1, _081D187C + ldr r1, =0x0862534c lsls r0, 2 adds r0, r1 ldr r1, [r0] @@ -951264,8 +918915,7 @@ sub_81D1854: @ 81D1854 bl _call_via_r1 b _081D1882 .align 2, 0 -_081D1878: .4byte 0x086252a8 -_081D187C: .4byte 0x0862534c + .pool _081D1880: movs r0, 0x4E _081D1882: @@ -951310,13 +918960,13 @@ sub_81D189C: @ 81D189C adds r5, r1, 0 cmp r0, 0x14 bhi _081D18C2 - ldr r1, _081D18C8 + ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 ldr r4, [r0] adds r0, r4, 0 bl sub_81D1574 - ldr r1, _081D18CC + ldr r1, =0x08625360 lsls r0, 2 adds r0, r1 ldr r2, [r0] @@ -951328,8 +918978,7 @@ _081D18C2: pop {r0} bx r0 .align 2, 0 -_081D18C8: .4byte 0x086252a8 -_081D18CC: .4byte 0x08625360 + .pool thumb_func_end sub_81D189C thumb_func_start sub_81D18D0 @@ -951412,14 +919061,14 @@ _081D1940: beq _081D1946 subs r5, 0x1 _081D1946: - ldr r0, _081D1954 + ldr r0, =0x0000ffff mov r8, r0 lsls r0, r5, 3 adds r0, 0x4 adds r4, r0, r6 b _081D195C .align 2, 0 -_081D1954: .4byte 0x0000ffff + .pool _081D1958: subs r4, 0x8 subs r5, 0x1 @@ -951438,7 +919087,7 @@ _081D195C: _081D1974: adds r4, r7, r6 ldrh r1, [r4, 0x6] - ldr r0, _081D1998 + ldr r0, =0x0000ffff cmp r1, r0 beq _081D1984 adds r0, r1, 0 @@ -951454,7 +919103,7 @@ _081D1984: pop {r0} bx r0 .align 2, 0 -_081D1998: .4byte 0x0000ffff + .pool thumb_func_end sub_81D1920 thumb_func_start sub_81D199C @@ -951473,10 +919122,10 @@ sub_81D199C: @ 81D199C cmp r0, 0 beq _081D19E6 ldrh r0, [r6, 0x4] - ldr r1, _081D1A14 + ldr r1, =0x0000fffe cmp r0, r1 beq _081D1A24 - ldr r0, _081D1A18 + ldr r0, =0x0000ffff mov r9, r0 mov r8, r1 adds r4, r6, 0 @@ -951501,7 +919150,7 @@ _081D19E6: lsls r0, r5, 3 adds r0, r6 ldrh r1, [r0, 0x4] - ldr r0, _081D1A14 + ldr r0, =0x0000fffe cmp r1, r0 beq _081D1A24 cmp r5, 0 @@ -951511,7 +919160,7 @@ _081D19F8: lsls r0, r5, 3 adds r4, r0, r6 ldrh r1, [r4, 0x6] - ldr r0, _081D1A18 + ldr r0, =0x0000ffff cmp r1, r0 beq _081D1A0A adds r0, r1, 0 @@ -951522,8 +919171,7 @@ _081D1A0A: bl ExpandTextCodes b _081D1A5C .align 2, 0 -_081D1A14: .4byte 0x0000fffe -_081D1A18: .4byte 0x0000ffff + .pool _081D1A1C: adds r5, 0x2 b _081D1A50 @@ -951531,14 +919179,14 @@ _081D1A20: adds r5, 0x3 b _081D1A50 _081D1A24: - ldr r0, _081D1A6C + ldr r0, =0x00000864 bl flag_check lsls r0, 24 cmp r0, 0 beq _081D1A50 - ldr r0, _081D1A70 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081D1A74 + ldr r1, =0x000009ca adds r0, r1 adds r0, r7 ldrb r0, [r0] @@ -951566,9 +919214,7 @@ _081D1A5C: pop {r0} bx r0 .align 2, 0 -_081D1A6C: .4byte 0x00000864 -_081D1A70: .4byte 0x03005d8c -_081D1A74: .4byte 0x000009ca + .pool thumb_func_end sub_81D199C thumb_func_start sub_81D1A78 @@ -951578,13 +919224,13 @@ sub_81D1A78: @ 81D1A78 adds r6, r2, 0 cmp r0, 0x14 bhi _081D1AA2 - ldr r1, _081D1AA8 + ldr r1, =0x086252a8 lsls r0, 2 adds r0, r1 ldr r4, [r0] adds r0, r4, 0 bl sub_81D1574 - ldr r1, _081D1AAC + ldr r1, =0x08625374 lsls r0, 2 adds r0, r1 ldr r3, [r0] @@ -951597,8 +919243,7 @@ _081D1AA2: pop {r0} bx r0 .align 2, 0 -_081D1AA8: .4byte 0x086252a8 -_081D1AAC: .4byte 0x08625374 + .pool thumb_func_end sub_81D1A78 thumb_func_start sub_81D1AB0 @@ -951672,12 +919317,12 @@ sub_81D1B0C: @ 81D1B0C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081D1B38 + ldr r0, =0x08310030 adds r1, r0 ldrb r2, [r1, 0x1] movs r0, 0xD muls r0, r2 - ldr r2, _081D1B3C + ldr r2, =0x0830fcd4 adds r0, r2 str r0, [r4] adds r1, 0x4 @@ -951686,8 +919331,7 @@ sub_81D1B0C: @ 81D1B0C pop {r0} bx r0 .align 2, 0 -_081D1B38: .4byte 0x08310030 -_081D1B3C: .4byte 0x0830fcd4 + .pool thumb_func_end sub_81D1B0C thumb_func_start sub_81D1B40 @@ -951698,7 +919342,7 @@ sub_81D1B40: @ 81D1B40 push {r6,r7} adds r6, r0, 0 movs r5, 0 - ldr r2, _081D1BB8 + ldr r2, =0x08625388 movs r0, 0x8 adds r0, r2 mov r9, r0 @@ -951722,7 +919366,7 @@ _081D1B54: ldrh r0, [r0] cmp r0, r6 bne _081D1BA8 - ldr r7, _081D1BB8 + ldr r7, =0x08625388 _081D1B7C: lsls r0, r4, 1 adds r0, r4 @@ -951754,7 +919398,7 @@ _081D1BA8: ldr r0, [r0] b _081D1BC4 .align 2, 0 -_081D1BB8: .4byte 0x08625388 + .pool _081D1BBC: adds r5, 0x1 cmp r5, 0x3 @@ -951774,7 +919418,7 @@ sub_81D1BD0: @ 81D1BD0 push {lr} adds r3, r0, 0 movs r2, 0 - ldr r1, _081D1BE4 + ldr r1, =0x08625388 _081D1BD8: ldrh r0, [r1] cmp r0, r3 @@ -951782,7 +919426,7 @@ _081D1BD8: ldrh r0, [r1, 0x2] b _081D1BF4 .align 2, 0 -_081D1BE4: .4byte 0x08625388 + .pool _081D1BE8: adds r1, 0x18 adds r2, 0x1 @@ -951823,7 +919467,7 @@ _081D1C18: thumb_func_start sub_81D1C20 sub_81D1C20: @ 81D1C20 push {lr} - ldr r0, _081D1C40 + ldr r0, =0x020375e0 ldrh r0, [r0] bl sub_81D15CC cmp r0, 0 @@ -951838,14 +919482,14 @@ _081D1C3C: pop {r0} bx r0 .align 2, 0 -_081D1C40: .4byte 0x020375e0 + .pool thumb_func_end sub_81D1C20 thumb_func_start sub_81D1C44 sub_81D1C44: @ 81D1C44 push {r4,lr} lsls r0, 24 - ldr r4, _081D1C5C + ldr r4, =0x0203cf4c lsrs r0, 21 adds r0, 0x8 bl malloc @@ -951855,10 +919499,10 @@ sub_81D1C44: @ 81D1C44 movs r0, 0 b _081D1C7A .align 2, 0 -_081D1C5C: .4byte 0x0203cf4c + .pool _081D1C60: movs r2, 0 - ldr r4, _081D1C80 + ldr r4, =0x0203cf48 movs r3, 0xFF _081D1C66: adds r0, r2, r4 @@ -951876,7 +919520,7 @@ _081D1C7A: pop {r1} bx r1 .align 2, 0 -_081D1C80: .4byte 0x0203cf48 + .pool thumb_func_end sub_81D1C44 thumb_func_start sub_81D1C84 @@ -951885,23 +919529,23 @@ sub_81D1C84: @ 81D1C84 sub sp, 0x8 lsls r0, 24 lsrs r4, r0, 24 - ldr r6, _081D1CC4 + ldr r6, =0x0203cf48 adds r5, r4, r6 ldrb r0, [r5] cmp r0, 0xFF bne _081D1CEC cmp r4, 0x2 bne _081D1CD4 - ldr r0, _081D1CC8 + ldr r0, =0x086253e8 ldr r1, [r0, 0x14] ldr r0, [r0, 0x10] str r0, [sp] str r1, [sp, 0x4] - ldr r0, _081D1CCC + ldr r0, =0x085dff04 movs r1, 0x4 bl GetMaxWidthInMenuTable lsls r0, 24 - ldr r2, _081D1CD0 + ldr r2, =0x00ffffff ldr r1, [sp] ands r1, r2 orrs r1, r0 @@ -951911,24 +919555,21 @@ sub_81D1C84: @ 81D1C84 strb r0, [r6, 0x2] b _081D1CE0 .align 2, 0 -_081D1CC4: .4byte 0x0203cf48 -_081D1CC8: .4byte 0x086253e8 -_081D1CCC: .4byte 0x085dff04 -_081D1CD0: .4byte 0x00ffffff + .pool _081D1CD4: lsls r0, r4, 3 - ldr r1, _081D1CFC + ldr r1, =0x086253e8 adds r0, r1 bl Window_AddFromTemplate strb r0, [r5] _081D1CE0: - ldr r0, _081D1D00 + ldr r0, =0x0203cf48 adds r0, r4, r0 ldrb r0, [r0] movs r1, 0 bl SetStandardWindowBorderStyle _081D1CEC: - ldr r0, _081D1D00 + ldr r0, =0x0203cf48 adds r0, r4, r0 ldrb r0, [r0] add sp, 0x8 @@ -951936,8 +919577,7 @@ _081D1CEC: pop {r1} bx r1 .align 2, 0 -_081D1CFC: .4byte 0x086253e8 -_081D1D00: .4byte 0x0203cf48 + .pool thumb_func_end sub_81D1C84 thumb_func_start sub_81D1D04 @@ -951946,7 +919586,7 @@ sub_81D1D04: @ 81D1D04 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081D1D30 + ldr r0, =0x0203cf48 adds r4, r0 ldrb r0, [r4] movs r1, 0 @@ -951961,19 +919601,19 @@ sub_81D1D04: @ 81D1D04 pop {r0} bx r0 .align 2, 0 -_081D1D30: .4byte 0x0203cf48 + .pool thumb_func_end sub_81D1D04 thumb_func_start sub_81D1D34 sub_81D1D34: @ 81D1D34 lsls r0, 24 lsrs r0, 24 - ldr r1, _081D1D40 + ldr r1, =0x0203cf48 adds r0, r1 ldrb r0, [r0] bx lr .align 2, 0 -_081D1D40: .4byte 0x0203cf48 + .pool thumb_func_end sub_81D1D34 thumb_func_start sub_81D1D44 @@ -951989,13 +919629,13 @@ sub_81D1D44: @ 81D1D44 negs r0, r0 cmp r3, r0 beq _081D1DAC - ldr r0, _081D1DB4 + ldr r0, =0x03005d8c lsls r1, r3, 3 adds r1, r3 lsls r1, 2 ldr r0, [r0] adds r1, r0 - ldr r0, _081D1DB8 + ldr r0, =0x00002cca adds r1, r0 add r0, sp, 0x14 bl gf_strcpy @@ -952014,7 +919654,7 @@ _081D1D8C: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] - ldr r0, _081D1DBC + ldr r0, =0x08625400 str r0, [sp, 0x8] movs r0, 0x1 negs r0, r0 @@ -952032,9 +919672,7 @@ _081D1DAC: pop {r0} bx r0 .align 2, 0 -_081D1DB4: .4byte 0x03005d8c -_081D1DB8: .4byte 0x00002cca -_081D1DBC: .4byte 0x08625400 + .pool thumb_func_end sub_81D1D44 thumb_func_start sub_81D1DC0 @@ -952046,21 +919684,21 @@ sub_81D1DC0: @ 81D1DC0 push {r5-r7} adds r5, r0, 0 movs r3, 0 - ldr r7, _081D1E60 - ldr r0, _081D1E64 + ldr r7, =0x0203cf4c + ldr r0, =0x085e8cf7 mov r12, r0 - ldr r4, _081D1E68 - ldr r1, _081D1E6C + ldr r4, =0x03006310 + ldr r1, =0x0203cf48 mov r8, r1 - ldr r2, _081D1E70 + ldr r2, =sub_81D1E7C + 1 mov r9, r2 - ldr r0, _081D1E74 + ldr r0, =sub_81D1D44 + 1 mov r10, r0 ldrb r1, [r5, 0x5] cmp r3, r1 bcs _081D1E02 adds r6, r7, 0 - ldr r2, _081D1E78 + ldr r2, =0x08625403 _081D1DEC: ldr r1, [r6] lsls r0, r3, 3 @@ -952121,13 +919759,7 @@ _081D1E02: pop {r1} bx r1 .align 2, 0 -_081D1E60: .4byte 0x0203cf4c -_081D1E64: .4byte 0x085e8cf7 -_081D1E68: .4byte 0x03006310 -_081D1E6C: .4byte 0x0203cf48 -_081D1E70: .4byte sub_81D1E7C + 1 -_081D1E74: .4byte sub_81D1D44 + 1 -_081D1E78: .4byte 0x08625403 + .pool thumb_func_end sub_81D1DC0 thumb_func_start sub_81D1E7C @@ -952174,13 +919806,13 @@ sub_81D1E90: @ 81D1E90 thumb_func_start sub_81D1EC0 sub_81D1EC0: @ 81D1EC0 push {lr} - ldr r0, _081D1ED0 + ldr r0, =0x0203cf4c ldr r0, [r0] bl free pop {r0} bx r0 .align 2, 0 -_081D1ED0: .4byte 0x0203cf4c + .pool thumb_func_end sub_81D1EC0 thumb_func_start sub_81D1ED4 @@ -952262,7 +919894,7 @@ _081D1F1C: adds r0, r3, r2 movs r1, 0 strb r1, [r0] - ldr r4, _081D1F80 + ldr r4, =0x00000352 adds r0, r3, r4 strh r1, [r0] add sp, 0x4 @@ -952274,7 +919906,7 @@ _081D1F1C: pop {r0} bx r0 .align 2, 0 -_081D1F80: .4byte 0x00000352 + .pool thumb_func_end sub_81D1ED4 thumb_func_start sub_81D1F84 @@ -952385,7 +920017,7 @@ _081D2012: lsrs r7, r0, 16 cmp r7, 0x4 bls _081D1F98 - ldr r1, _081D2070 + ldr r1, =0x00000352 add r1, r8 movs r0, 0 strh r0, [r1] @@ -952398,14 +920030,14 @@ _081D2012: pop {r0} bx r0 .align 2, 0 -_081D2070: .4byte 0x00000352 + .pool thumb_func_end sub_81D1F84 thumb_func_start sub_81D2074 sub_81D2074: @ 81D2074 push {r4,lr} adds r1, r0, 0 - ldr r0, _081D2088 + ldr r0, =0x00000352 adds r4, r1, r0 ldrh r0, [r4] cmp r0, 0x9 @@ -952413,7 +920045,7 @@ sub_81D2074: @ 81D2074 movs r0, 0 b _081D20A6 .align 2, 0 -_081D2088: .4byte 0x00000352 + .pool _081D208C: adds r0, r1, 0 bl sub_81D2230 @@ -952435,20 +920067,20 @@ _081D20A6: thumb_func_start sub_81D20AC sub_81D20AC: @ 81D20AC - ldr r1, _081D20B8 + ldr r1, =0x00000355 adds r0, r1 movs r1, 0 strb r1, [r0] bx lr .align 2, 0 -_081D20B8: .4byte 0x00000355 + .pool thumb_func_end sub_81D20AC thumb_func_start sub_81D20BC sub_81D20BC: @ 81D20BC push {r4,r5,lr} sub sp, 0xC - ldr r1, _081D20D0 + ldr r1, =0x00000355 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0 @@ -952457,7 +920089,7 @@ sub_81D20BC: @ 81D20BC beq _081D20E2 b _081D20FA .align 2, 0 -_081D20D0: .4byte 0x00000355 + .pool _081D20D4: bl dp12_8087EA4 ldrb r0, [r4] @@ -952467,7 +920099,7 @@ _081D20D4: b _081D20FC _081D20E2: mov r0, sp - ldr r1, _081D2104 + ldr r1, =0x08625404 ldm r1!, {r2,r3,r5} stm r0!, {r2,r3,r5} ldr r0, [sp] @@ -952485,7 +920117,7 @@ _081D20FC: pop {r1} bx r1 .align 2, 0 -_081D2104: .4byte 0x08625404 + .pool thumb_func_end sub_81D20BC thumb_func_start sub_81D2108 @@ -952508,7 +920140,7 @@ sub_81D2108: @ 81D2108 adds r0, r6, 0 bl sub_81D2634 movs r7, 0 - ldr r5, _081D21D0 + ldr r5, =0x02038c28 mov r12, r5 movs r0, 0xF0 lsls r0, 3 @@ -952518,7 +920150,7 @@ sub_81D2108: @ 81D2108 lsls r1, 1 adds r1, r6, r1 str r1, [sp] - ldr r5, _081D21D4 + ldr r5, =0x0000ffff mov r8, r5 movs r0, 0xA1 lsls r0, 1 @@ -952528,7 +920160,7 @@ sub_81D2108: @ 81D2108 lsls r1, 2 adds r1, r6, r1 str r1, [sp, 0x8] - ldr r5, _081D21D8 + ldr r5, =0x0000024a adds r5, r6 mov r10, r5 _081D215E: @@ -952590,9 +920222,7 @@ _081D21BE: pop {r0} bx r0 .align 2, 0 -_081D21D0: .4byte 0x02038c28 -_081D21D4: .4byte 0x0000ffff -_081D21D8: .4byte 0x0000024a + .pool thumb_func_end sub_81D2108 thumb_func_start sub_81D21DC @@ -952614,14 +920244,14 @@ _081D21E8: movs r0, 0x42 movs r1, 0x9B bl lcd_io_set - ldr r4, _081D2228 + ldr r4, =0x00003879 movs r0, 0x44 adds r1, r4, 0 bl lcd_io_set movs r0, 0x46 adds r1, r4, 0 bl lcd_io_set - ldr r1, _081D222C + ldr r1, =0x00003f3f movs r0, 0x48 bl lcd_io_set movs r0, 0x4A @@ -952631,8 +920261,7 @@ _081D21E8: pop {r0} bx r0 .align 2, 0 -_081D2228: .4byte 0x00003879 -_081D222C: .4byte 0x00003f3f + .pool thumb_func_end sub_81D21DC thumb_func_start sub_81D2230 @@ -952643,7 +920272,7 @@ sub_81D2230: @ 81D2230 movs r7, 0x96 lsls r7, 1 add r7, r12 - ldr r6, _081D2274 + ldr r6, =0x00000352 add r6, r12 mov r5, r12 adds r5, 0x64 @@ -952672,7 +920301,7 @@ _081D2244: pop {r0} bx r0 .align 2, 0 -_081D2274: .4byte 0x00000352 + .pool thumb_func_end sub_81D2230 thumb_func_start sub_81D2278 @@ -952785,7 +920414,7 @@ _081D2328: str r0, [sp, 0x10] cmp r5, r8 bcs _081D237A - ldr r0, _081D23BC + ldr r0, =0x00026bff cmp r4, r0 bgt _081D237A mov r1, r12 @@ -952808,7 +920437,7 @@ _081D2352: lsrs r5, r0, 16 cmp r5, r8 bcs _081D237A - ldr r1, _081D23BC + ldr r1, =0x00026bff cmp r4, r1 ble _081D2352 _081D237A: @@ -952847,7 +920476,7 @@ _081D23B6: subs r0, r6, 0x4 b _081D248C .align 2, 0 -_081D23BC: .4byte 0x00026bff + .pool _081D23C0: ldr r1, [sp, 0xC] cmp r1, 0 @@ -952893,7 +920522,7 @@ _081D23F2: add r2, r9 strh r2, [r3] _081D2414: - ldr r0, _081D2460 + ldr r0, =0x00026bff cmp r4, r0 bgt _081D23F2 movs r0, 0x9B @@ -952934,7 +920563,7 @@ _081D245A: subs r0, r7, 0x4 b _081D248C .align 2, 0 -_081D2460: .4byte 0x00026bff + .pool _081D2464: ldr r1, [sp] movs r2, 0xD4 @@ -953347,7 +920976,7 @@ sub_81D2754: @ 81D2754 push {r5-r7} adds r6, r0, 0 mov r8, r1 - ldr r1, _081D281C + ldr r1, =0x08625410 ldrb r0, [r6] adds r0, r1 ldrb r2, [r0] @@ -953363,7 +920992,7 @@ sub_81D2754: @ 81D2754 mov r12, r0 movs r2, 0x1 mov r9, r2 - ldr r3, _081D2820 + ldr r3, =0x08329f40 mov r10, r3 _081D2786: adds r0, r7, 0 @@ -953392,7 +921021,7 @@ _081D27A4: lsrs r7, r0, 24 _081D27B4: ldrb r0, [r6] - ldr r2, _081D281C + ldr r2, =0x08625410 adds r0, r2 ldrb r2, [r0] adds r6, 0x1 @@ -953446,8 +921075,7 @@ _081D2800: pop {r0} bx r0 .align 2, 0 -_081D281C: .4byte 0x08625410 -_081D2820: .4byte 0x08329f40 + .pool thumb_func_end sub_81D2754 thumb_func_start sub_81D2824 @@ -953455,14 +921083,14 @@ sub_81D2824: @ 81D2824 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081D2874 + ldr r0, =0x08625510 bl Window_InitFromTemplates bl TextBox_ResetSomeField movs r0, 0 movs r1, 0x1 movs r2, 0xE0 bl sub_809882C - ldr r0, _081D2878 + ldr r0, =0x0860f074 movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply @@ -953487,8 +921115,7 @@ _081D284A: bl SetWindowBorderStyle b _081D288E .align 2, 0 -_081D2874: .4byte 0x08625510 -_081D2878: .4byte 0x0860f074 + .pool _081D287C: movs r0, 0x1 bl Window_WriteStandardTileMap @@ -953530,9 +921157,9 @@ sub_81D28C8: @ 81D28C8 push {r4-r7,lr} lsls r1, 16 lsrs r4, r1, 16 - ldr r3, _081D28E8 + ldr r3, =0x03006310 adds r2, r3, 0 - ldr r1, _081D28EC + ldr r1, =0x08625548 ldm r1!, {r5-r7} stm r2!, {r5-r7} ldm r1!, {r5-r7} @@ -953544,8 +921171,7 @@ sub_81D28C8: @ 81D28C8 strh r4, [r3, 0xE] b _081D28F4 .align 2, 0 -_081D28E8: .4byte 0x03006310 -_081D28EC: .4byte 0x08625548 + .pool _081D28F0: movs r0, 0x6 strh r0, [r3, 0xE] @@ -953568,7 +921194,7 @@ sub_81D28FC: @ 81D28FC movs r0, 0 movs r1, 0x11 bl Window_FastFillPixels - ldr r5, _081D29B4 + ldr r5, =0x085efa31 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x80 @@ -953587,7 +921213,7 @@ sub_81D28FC: @ 81D28FC movs r1, 0x1 adds r2, r5, 0 bl Print - ldr r5, _081D29B8 + ldr r5, =0x085efa52 movs r1, 0x29 mov r10, r1 str r1, [sp] @@ -953599,7 +921225,7 @@ sub_81D28FC: @ 81D28FC adds r2, r5, 0 movs r3, 0x4 bl Print - ldr r5, _081D29BC + ldr r5, =0x085efa56 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x6A @@ -953616,7 +921242,7 @@ sub_81D28FC: @ 81D28FC movs r1, 0x1 adds r2, r5, 0 bl Print - ldr r5, _081D29C0 + ldr r5, =0x085efa5d movs r0, 0x1 adds r1, r5, 0 movs r2, 0x6A @@ -953642,21 +921268,18 @@ sub_81D28FC: @ 81D28FC bl Window_CopyToVram b _081D2AB6 .align 2, 0 -_081D29B4: .4byte 0x085efa31 -_081D29B8: .4byte 0x085efa52 -_081D29BC: .4byte 0x085efa56 -_081D29C0: .4byte 0x085efa5d + .pool _081D29C4: mov r1, r9 lsls r0, r1, 1 add r0, r9 lsls r0, 2 - ldr r1, _081D2A2C + ldr r1, =0x0831c898 adds r6, r0, r1 ldrb r1, [r6, 0x2] lsls r0, r1, 3 subs r0, r1 - ldr r1, _081D2A30 + ldr r1, =0x0831ae38 adds r5, r0, r1 movs r0, 0x19 str r0, [sp] @@ -953668,7 +921291,7 @@ _081D29C4: adds r2, r5, 0 movs r3, 0x4 bl Print - ldr r1, _081D2A34 + ldr r1, =0x085efa52 movs r0, 0x1 movs r2, 0 bl font_get_width_of_string @@ -953692,13 +921315,10 @@ _081D29C4: ldrb r0, [r6, 0x1] cmp r0, 0x1 bhi _081D2A3C - ldr r5, _081D2A38 + ldr r5, =0x085e8d45 b _081D2A4A .align 2, 0 -_081D2A2C: .4byte 0x0831c898 -_081D2A30: .4byte 0x0831ae38 -_081D2A34: .4byte 0x085efa52 -_081D2A38: .4byte 0x085e8d45 + .pool _081D2A3C: ldrb r1, [r6, 0x1] add r0, sp, 0xC @@ -953720,10 +921340,10 @@ _081D2A4A: ldrb r0, [r6, 0x3] cmp r0, 0 bne _081D2A70 - ldr r5, _081D2A6C + ldr r5, =0x085e8d45 b _081D2A7E .align 2, 0 -_081D2A6C: .4byte 0x085e8d45 + .pool _081D2A70: ldrb r1, [r6, 0x3] add r0, sp, 0xC @@ -953743,7 +921363,7 @@ _081D2A7E: adds r2, r5, 0 movs r3, 0x6A bl Print - ldr r1, _081D2AC8 + ldr r1, =0x0861c524 mov r0, r9 subs r0, 0x1 lsls r0, 2 @@ -953768,7 +921388,7 @@ _081D2AB6: pop {r0} bx r0 .align 2, 0 -_081D2AC8: .4byte 0x0861c524 + .pool thumb_func_end sub_81D28FC thumb_func_start sub_81D2ACC @@ -953782,7 +921402,7 @@ sub_81D2ACC: @ 81D2ACC movs r0, 0x1 movs r1, 0x11 bl Window_FastFillPixels - ldr r5, _081D2B60 + ldr r5, =0x085efa3e movs r0, 0x1 adds r1, r5, 0 movs r2, 0x80 @@ -953798,7 +921418,7 @@ sub_81D2ACC: @ 81D2ACC movs r1, 0x1 adds r2, r5, 0 bl Print - ldr r5, _081D2B64 + ldr r5, =0x085efa67 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x5C @@ -953814,7 +921434,7 @@ sub_81D2ACC: @ 81D2ACC movs r1, 0x1 adds r2, r5, 0 bl Print - ldr r5, _081D2B68 + ldr r5, =0x085efa6e movs r0, 0x1 adds r1, r5, 0 movs r2, 0x5C @@ -953838,14 +921458,12 @@ sub_81D2ACC: @ 81D2ACC bl Window_CopyToVram b _081D2BB8 .align 2, 0 -_081D2B60: .4byte 0x085efa3e -_081D2B64: .4byte 0x085efa67 -_081D2B68: .4byte 0x085efa6e + .pool _081D2B6C: lsls r4, 3 - ldr r0, _081D2BC4 + ldr r0, =0x0858c2b4 adds r4, r0 - ldr r1, _081D2BC8 + ldr r1, =0x08587d48 ldrb r0, [r4, 0x1] lsls r0, 29 lsrs r0, 27 @@ -953860,7 +921478,7 @@ _081D2B6C: adds r2, r5, 0 movs r3, 0x4 bl Print - ldr r1, _081D2BCC + ldr r1, =0x08587c50 ldrb r0, [r4] lsls r0, 2 adds r0, r1 @@ -953885,9 +921503,7 @@ _081D2BB8: pop {r0} bx r0 .align 2, 0 -_081D2BC4: .4byte 0x0858c2b4 -_081D2BC8: .4byte 0x08587d48 -_081D2BCC: .4byte 0x08587c50 + .pool thumb_func_end sub_81D2ACC thumb_func_start sub_81D2BD0 @@ -953918,7 +921534,7 @@ sub_81D2BF4: @ 81D2BF4 movs r0, 0x3 movs r1, 0x11 bl Window_FastFillPixels - ldr r2, _081D2C38 + ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x1 orrs r0, r1 @@ -953943,7 +921559,7 @@ sub_81D2BF4: @ 81D2BF4 pop {r0} bx r0 .align 2, 0 -_081D2C38: .4byte 0x03003014 + .pool thumb_func_end sub_81D2BF4 thumb_func_start sub_81D2C3C @@ -953961,7 +921577,7 @@ sub_81D2C3C: @ 81D2C3C thumb_func_start sub_81D2C50 sub_81D2C50: @ 81D2C50 push {lr} - ldr r0, _081D2C64 + ldr r0, =0x08625540 movs r1, 0x1 movs r2, 0xE movs r3, 0 @@ -953969,7 +921585,7 @@ sub_81D2C50: @ 81D2C50 pop {r0} bx r0 .align 2, 0 -_081D2C64: .4byte 0x08625540 + .pool thumb_func_end sub_81D2C50 thumb_func_start sub_81D2C68 @@ -953988,24 +921604,24 @@ sub_81D2C68: @ 81D2C68 _081D2C7E: movs r0, 0x64 muls r0, r1 - ldr r1, _081D2C90 + ldr r1, =0x020244ec adds r0, r1 adds r1, r2, 0 adds r2, r3, 0 bl pokemon_getattr b _081D2CCA .align 2, 0 -_081D2C90: .4byte 0x020244ec + .pool _081D2C94: movs r0, 0x64 muls r0, r1 - ldr r1, _081D2CA4 + ldr r1, =0x020244ec adds r0, r1 adds r1, r2, 0 bl pokemon_getattr b _081D2CCA .align 2, 0 -_081D2CA4: .4byte 0x020244ec + .pool _081D2CA8: cmp r2, 0x2 beq _081D2CB0 @@ -954061,14 +921677,14 @@ sub_81D2CD0: @ 81D2CD0 bl sub_81D2C68 cmp r0, 0 beq _081D2D20 - ldr r1, _081D2D1C + ldr r1, =0x085e8264 adds r0, r5, 0 movs r2, 0 movs r3, 0xC bl sub_8009128 b _081D2E70 .align 2, 0 -_081D2D1C: .4byte 0x085e8264 + .pool _081D2D20: adds r0, r4, 0 adds r1, r6, 0 @@ -954089,7 +921705,7 @@ _081D2D20: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 - ldr r0, _081D2D6C + ldr r0, =0x020244ec adds r4, r0 adds r0, r4, 0 movs r1, 0x38 @@ -954103,7 +921719,7 @@ _081D2D20: lsrs r6, r0, 24 b _081D2D92 .align 2, 0 -_081D2D6C: .4byte 0x020244ec + .pool _081D2D70: lsls r0, r4, 24 lsrs r0, 24 @@ -954128,7 +921744,7 @@ _081D2D9A: movs r0, 0xB adds r1, r7, 0 muls r1, r0 - ldr r0, _081D2DB4 + ldr r0, =0x083185c8 adds r1, r0 adds r0, r5, 0 bl sub_8008C44 @@ -954139,7 +921755,7 @@ _081D2DB0: adds r3, r5, 0 b _081D2DBA .align 2, 0 -_081D2DB4: .4byte 0x083185c8 + .pool _081D2DB8: adds r3, 0x1 _081D2DBA: @@ -954256,7 +921872,7 @@ _081D2E86: adds r1, 0x1 adds r4, 0x1 lsls r0, r2, 16 - ldr r2, _081D2ED0 + ldr r2, =0xffff0000 adds r0, r2 lsrs r2, r0, 16 _081D2E94: @@ -954266,7 +921882,7 @@ _081D2E94: bne _081D2E86 adds r1, r2, 0 lsls r0, r1, 16 - ldr r2, _081D2ED0 + ldr r2, =0xffff0000 adds r0, r2 lsrs r2, r0, 16 lsls r1, 16 @@ -954278,7 +921894,7 @@ _081D2EAE: adds r4, 0x1 adds r1, r2, 0 lsls r0, r1, 16 - ldr r2, _081D2ED0 + ldr r2, =0xffff0000 adds r0, r2 lsrs r2, r0, 16 lsls r1, 16 @@ -954292,7 +921908,7 @@ _081D2EC2: pop {r1} bx r1 .align 2, 0 -_081D2ED0: .4byte 0xffff0000 + .pool thumb_func_end sub_81D2E7C thumb_func_start sub_81D2ED4 @@ -954337,10 +921953,10 @@ _081D2EFC: cmp r7, 0xE bne _081D2F2C adds r0, r5, 0x5 - ldr r1, _081D2F28 + ldr r1, =0x085ebfce b _081D2F3A .align 2, 0 -_081D2F28: .4byte 0x085ebfce + .pool _081D2F2C: adds r4, r5, 0x5 lsls r0, r7, 24 @@ -954578,7 +922194,7 @@ _081D30C4: bl sub_81D2C68 adds r5, r0, 0 lsls r0, r4, 3 - ldr r1, _081D3128 + ldr r1, =0x0830a18c adds r0, r1 movs r1, 0x1 str r1, [sp] @@ -954601,7 +922217,7 @@ _081D311A: pop {r0} bx r0 .align 2, 0 -_081D3128: .4byte 0x0830a18c + .pool thumb_func_end sub_81D3094 thumb_func_start sub_81D312C @@ -954707,18 +922323,18 @@ _081D31C8: sub_81D31D0: @ 81D31D0 push {r4-r7,lr} sub sp, 0x20 - ldr r3, _081D3210 + ldr r3, =0x08625a48 ldr r4, [r3] ldr r5, [r3, 0x4] str r4, [sp, 0x18] str r5, [sp, 0x1C] mov r4, sp - ldr r3, _081D3214 + ldr r3, =0x08625a50 ldm r3!, {r5-r7} stm r4!, {r5-r7} ldm r3!, {r5-r7} stm r4!, {r5-r7} - ldr r3, _081D3218 + ldr r3, =0x08625a68 ldr r4, [r3, 0x4] ldr r3, [r3] ldr r5, [sp, 0x18] @@ -954737,9 +922353,7 @@ sub_81D31D0: @ 81D31D0 pop {r0} bx r0 .align 2, 0 -_081D3210: .4byte 0x08625a48 -_081D3214: .4byte 0x08625a50 -_081D3218: .4byte 0x08625a68 + .pool thumb_func_end sub_81D31D0 thumb_func_start sub_81D321C @@ -954752,7 +922366,7 @@ sub_81D321C: @ 81D321C mov r12, r1 mov r8, r2 mov r1, sp - ldr r0, _081D32A4 + ldr r0, =0x08625a70 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2,r6,r7} @@ -954761,14 +922375,14 @@ sub_81D321C: @ 81D321C stm r1!, {r3,r4} add r3, sp, 0x20 adds r1, r3, 0 - ldr r0, _081D32A8 + ldr r0, =0x08625a90 ldm r0!, {r2,r6,r7} stm r1!, {r2,r6,r7} ldm r0!, {r4,r6,r7} stm r1!, {r4,r6,r7} add r2, sp, 0x38 adds r1, r2, 0 - ldr r0, _081D32AC + ldr r0, =0x08625aa8 ldm r0!, {r4,r6,r7} stm r1!, {r4,r6,r7} ldm r0!, {r4,r6,r7} @@ -954814,18 +922428,16 @@ _081D327A: pop {r0} bx r0 .align 2, 0 -_081D32A4: .4byte 0x08625a70 -_081D32A8: .4byte 0x08625a90 -_081D32AC: .4byte 0x08625aa8 + .pool thumb_func_end sub_81D321C thumb_func_start sub_81D32B0 sub_81D32B0: @ 81D32B0 push {r4,r5,lr} - ldr r2, _081D32CC + ldr r2, =0x08625ac0 ldr r4, [r2] ldr r5, [r2, 0x4] - ldr r2, _081D32D0 + ldr r2, =0x08625ac8 ldr r3, [r2, 0x4] ldr r2, [r2] str r4, [r0] @@ -954836,8 +922448,7 @@ sub_81D32B0: @ 81D32B0 pop {r0} bx r0 .align 2, 0 -_081D32CC: .4byte 0x08625ac0 -_081D32D0: .4byte 0x08625ac8 + .pool thumb_func_end sub_81D32B0 thumb_func_start sub_81D32D4 @@ -954872,13 +922483,13 @@ sub_81D32F4: @ 81D32F4 beq _081D330C movs r0, 0 strh r0, [r2, 0x30] - ldr r0, _081D3310 + ldr r0, =sub_81D32D4 + 1 str r0, [r2, 0x1C] _081D330C: pop {r0} bx r0 .align 2, 0 -_081D3310: .4byte sub_81D32D4 + 1 + .pool thumb_func_end sub_81D32F4 thumb_func_start sub_81D3314 @@ -954890,14 +922501,14 @@ sub_81D3314: @ 81D3314 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _081D3358 + ldr r0, =0x02020630 adds r3, r1, r0 cmp r3, 0 beq _081D3360 ldrh r1, [r3, 0x24] ldrh r2, [r3, 0x20] adds r1, r2 - ldr r2, _081D335C + ldr r2, =0x08625b2c movs r5, 0x2E ldrsh r0, [r4, r5] lsls r0, 2 @@ -954917,10 +922528,9 @@ sub_81D3314: @ 81D3314 adds r0, r1 b _081D337E .align 2, 0 -_081D3358: .4byte 0x02020630 -_081D335C: .4byte 0x08625b2c + .pool _081D3360: - ldr r1, _081D3388 + ldr r1, =0x08625b2c movs r5, 0x2E ldrsh r0, [r4, r5] lsls r0, 2 @@ -954941,7 +922551,7 @@ _081D337E: pop {r0} bx r0 .align 2, 0 -_081D3388: .4byte 0x08625b2c + .pool thumb_func_end sub_81D3314 thumb_func_start sub_81D338C @@ -954977,18 +922587,18 @@ _081D339E: beq _081D33D0 _081D33C4: ldr r1, [r4] - ldr r0, _081D33CC + ldr r0, =sub_81D3564 + 1 str r0, [r1, 0x1C] b _081D33F0 .align 2, 0 -_081D33CC: .4byte sub_81D3564 + 1 + .pool _081D33D0: ldr r0, [r4] bl sub_81D3314 ldr r0, [r4] bl sub_81D35E8 ldr r2, [r4] - ldr r0, _081D3404 + ldr r0, =sub_81D32F4 + 1 str r0, [r2, 0x1C] adds r2, 0x3E ldrb r0, [r2] @@ -955009,7 +922619,7 @@ _081D33F0: pop {r0} bx r0 .align 2, 0 -_081D3404: .4byte sub_81D32F4 + 1 + .pool thumb_func_end sub_81D338C thumb_func_start sub_81D3408 @@ -955025,11 +922635,11 @@ sub_81D3408: @ 81D3408 adds r0, 0x1 cmp r3, r0 bge _081D3454 - ldr r5, _081D345C + ldr r5, =0x02020630 movs r7, 0x1C adds r7, r5 mov r12, r7 - ldr r6, _081D3460 + ldr r6, =sub_81D3564 + 1 _081D3428: lsls r1, r2, 4 adds r1, r2 @@ -955058,8 +922668,7 @@ _081D3454: pop {r0} bx r0 .align 2, 0 -_081D345C: .4byte 0x02020630 -_081D3460: .4byte sub_81D3564 + 1 + .pool thumb_func_end sub_81D3408 thumb_func_start sub_81D3464 @@ -955101,7 +922710,7 @@ sub_81D3480: @ 81D3480 cmp r9, r0 bge _081D34FE _081D34A2: - ldr r0, _081D34E8 + ldr r0, =0x08625b14 movs r1, 0 movs r2, 0 movs r3, 0 @@ -955117,7 +922726,7 @@ _081D34A2: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r1, _081D34EC + ldr r1, =0x02020630 adds r0, r1 str r0, [r4] adds r0, 0x3E @@ -955135,8 +922744,7 @@ _081D34A2: strh r3, [r0, 0x38] b _081D34F2 .align 2, 0 -_081D34E8: .4byte 0x08625b14 -_081D34EC: .4byte 0x02020630 + .pool _081D34F0: mov r9, r6 _081D34F2: @@ -955253,17 +922861,17 @@ _081D3592: bne _081D35D0 adds r0, r4, 0 bl sub_81D35E8 - ldr r0, _081D35CC + ldr r0, =sub_81D32F4 + 1 b _081D35DA .align 2, 0 -_081D35CC: .4byte sub_81D32F4 + 1 + .pool _081D35D0: - ldr r0, _081D35D4 + ldr r0, =sub_81D32D4 + 1 b _081D35DA .align 2, 0 -_081D35D4: .4byte sub_81D32D4 + 1 + .pool _081D35D8: - ldr r0, _081D35E4 + ldr r0, =nullsub_12 + 1 _081D35DA: str r0, [r4, 0x1C] _081D35DC: @@ -955271,7 +922879,7 @@ _081D35DC: pop {r0} bx r0 .align 2, 0 -_081D35E4: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81D3564 thumb_func_start sub_81D35E8 @@ -955294,7 +922902,7 @@ _081D3604: lsls r4, r1, 4 adds r4, r1 lsls r4, 2 - ldr r0, _081D363C + ldr r0, =0x02020630 adds r4, r0 adds r0, r4, 0 movs r1, 0 @@ -955320,7 +922928,7 @@ _081D3636: pop {r0} bx r0 .align 2, 0 -_081D363C: .4byte 0x02020630 + .pool thumb_func_end sub_81D35E8 thumb_func_start sub_81D3640 @@ -955402,7 +923010,7 @@ _081D36CA: str r1, [sp] mov r0, r9 str r0, [sp, 0x4] - ldr r1, _081D3778 + ldr r1, =0x08625b54 lsls r0, r7, 2 adds r0, r1 ldr r0, [r0] @@ -955418,10 +923026,10 @@ _081D36CA: adds r4, 0xC movs r1, 0 ldrsh r0, [r4, r1] - ldr r1, _081D377C + ldr r1, =0x085eea76 cmp r0, 0 blt _081D3704 - ldr r1, _081D3780 + ldr r1, =0x085eea73 _081D3704: adds r0, r6, 0 bl gf_strcpy @@ -955480,9 +923088,7 @@ _081D373A: pop {r0} bx r0 .align 2, 0 -_081D3778: .4byte 0x08625b54 -_081D377C: .4byte 0x085eea76 -_081D3780: .4byte 0x085eea73 + .pool thumb_func_end sub_81D3640 thumb_func_start sub_81D3784 @@ -955577,7 +923183,7 @@ _081D3808: str r0, [sp] mov r1, r8 str r1, [sp, 0x4] - ldr r1, _081D3888 + ldr r1, =0x08625b54 lsls r0, r6, 2 adds r0, r1 ldr r0, [r0] @@ -955615,7 +923221,7 @@ _081D3808: pop {r0} bx r0 .align 2, 0 -_081D3888: .4byte 0x08625b54 + .pool thumb_func_end sub_81D3784 thumb_func_start sub_81D388C @@ -955654,9 +923260,9 @@ sub_81D388C: @ 81D388C thumb_func_start sub_81D38D4 sub_81D38D4: @ 81D38D4 push {lr} - ldr r0, _081D38F4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081D38F8 + ldr r1, =0x00003d6d adds r0, r1 ldrb r1, [r0] adds r2, r1, 0x1 @@ -955669,8 +923275,7 @@ sub_81D38D4: @ 81D38D4 pop {r1} bx r1 .align 2, 0 -_081D38F4: .4byte 0x03005d8c -_081D38F8: .4byte 0x00003d6d + .pool thumb_func_end sub_81D38D4 thumb_func_start sub_81D38FC @@ -955870,7 +923475,7 @@ _081D3A42: movs r1, 0xAA lsls r1, 1 adds r0, r1 - ldr r3, _081D3AA0 + ldr r3, =0x08625b6c lsls r1, r2, 2 adds r1, r2 lsls r1, 3 @@ -955896,7 +923501,7 @@ _081D3A7E: movs r0, 0x1 b _081D3AA6 .align 2, 0 -_081D3AA0: .4byte 0x08625b6c + .pool _081D3AA4: movs r0, 0 _081D3AA6: @@ -955936,7 +923541,7 @@ sub_81D3AD8: @ 81D3AD8 bl sub_81535DC cmp r0, 0x1 bne _081D3B04 - ldr r2, _081D3B00 + ldr r2, =0x00000ee8 adds r0, r5, 0 adds r1, r4, 0 bl memcpy @@ -955947,7 +923552,7 @@ sub_81D3AD8: @ 81D3AD8 movs r0, 0x1 b _081D3B06 .align 2, 0 -_081D3B00: .4byte 0x00000ee8 + .pool _081D3B04: movs r0, 0 _081D3B06: @@ -956001,10 +923606,10 @@ sub_81D3B54: @ 81D3B54 adds r5, r1, 0 bl sub_81D41A0 movs r7, 0x2 - ldr r4, _081D3B94 + ldr r4, =0x03003144 _081D3B64: bl sub_81D4170 - ldr r0, _081D3B98 + ldr r0, =0x030012e2 ldrh r1, [r0] movs r0, 0x2 ands r0, r1 @@ -956018,7 +923623,7 @@ _081D3B76: movs r3, 0 bl sub_81D3D70 adds r1, r0, 0 - ldr r0, _081D3B9C + ldr r0, =0x030012e4 strh r1, [r0] movs r0, 0x13 ands r0, r1 @@ -956027,9 +923632,7 @@ _081D3B76: movs r4, 0 b _081D3BC2 .align 2, 0 -_081D3B94: .4byte 0x03003144 -_081D3B98: .4byte 0x030012e2 -_081D3B9C: .4byte 0x030012e4 + .pool _081D3BA0: movs r0, 0x8 ands r0, r1 @@ -956052,8 +923655,8 @@ _081D3BC0: _081D3BC2: movs r0, 0 str r0, [sp] - ldr r1, _081D3BE0 - ldr r2, _081D3BE4 + ldr r1, =0x030012c8 + ldr r2, =0x05000006 mov r0, sp bl CpuSet bl sub_81D41F4 @@ -956063,8 +923666,7 @@ _081D3BC2: pop {r1} bx r1 .align 2, 0 -_081D3BE0: .4byte 0x030012c8 -_081D3BE4: .4byte 0x05000006 + .pool thumb_func_end sub_81D3B54 thumb_func_start sub_81D3BE8 @@ -956074,10 +923676,10 @@ sub_81D3BE8: @ 81D3BE8 adds r5, r0, 0 bl sub_81D41A0 movs r6, 0x2 - ldr r4, _081D3C28 + ldr r4, =0x03003144 _081D3BF6: bl sub_81D4170 - ldr r0, _081D3C2C + ldr r0, =0x030012e2 ldrh r1, [r0] movs r0, 0x2 ands r0, r1 @@ -956091,7 +923693,7 @@ _081D3C08: adds r3, r5, 0 bl sub_81D3D70 adds r1, r0, 0 - ldr r0, _081D3C30 + ldr r0, =0x030012e4 strh r1, [r0] movs r0, 0x13 ands r0, r1 @@ -956100,9 +923702,7 @@ _081D3C08: movs r4, 0 b _081D3C56 .align 2, 0 -_081D3C28: .4byte 0x03003144 -_081D3C2C: .4byte 0x030012e2 -_081D3C30: .4byte 0x030012e4 + .pool _081D3C34: movs r0, 0x8 ands r0, r1 @@ -956125,8 +923725,8 @@ _081D3C54: _081D3C56: movs r0, 0 str r0, [sp] - ldr r1, _081D3C74 - ldr r2, _081D3C78 + ldr r1, =0x030012c8 + ldr r2, =0x05000006 mov r0, sp bl CpuSet bl sub_81D41F4 @@ -956136,64 +923736,59 @@ _081D3C56: pop {r1} bx r1 .align 2, 0 -_081D3C74: .4byte 0x030012c8 -_081D3C78: .4byte 0x05000006 + .pool thumb_func_end sub_81D3BE8 thumb_func_start sub_81D3C7C sub_81D3C7C: @ 81D3C7C push {r4,lr} - ldr r4, _081D3CA8 + ldr r4, =0x04000208 movs r3, 0 strh r3, [r4] - ldr r2, _081D3CAC + ldr r2, =0x04000200 ldrh r1, [r2] - ldr r0, _081D3CB0 + ldr r0, =0x0000ff3f ands r0, r1 strh r0, [r2] movs r0, 0x1 strh r0, [r4] - ldr r0, _081D3CB4 + ldr r0, =0x04000128 strh r3, [r0] subs r0, 0x1A strh r3, [r0] - ldr r1, _081D3CB8 + ldr r1, =0x04000202 movs r0, 0xC0 strh r0, [r1] pop {r4} pop {r0} bx r0 .align 2, 0 -_081D3CA8: .4byte 0x04000208 -_081D3CAC: .4byte 0x04000200 -_081D3CB0: .4byte 0x0000ff3f -_081D3CB4: .4byte 0x04000128 -_081D3CB8: .4byte 0x04000202 + .pool thumb_func_end sub_81D3C7C thumb_func_start sub_81D3CBC sub_81D3CBC: @ 81D3CBC push {r4-r7,lr} sub sp, 0x4 - ldr r5, _081D3D14 + ldr r5, =0x04000208 movs r4, 0 strh r4, [r5] - ldr r3, _081D3D18 + ldr r3, =0x04000200 ldrh r1, [r3] - ldr r0, _081D3D1C + ldr r0, =0x0000ff3f ands r0, r1 strh r0, [r3] movs r6, 0x1 strh r6, [r5] - ldr r0, _081D3D20 + ldr r0, =0x04000134 strh r4, [r0] - ldr r2, _081D3D24 + ldr r2, =0x04000128 movs r1, 0x80 lsls r1, 6 adds r0, r1, 0 strh r0, [r2] ldrh r0, [r2] - ldr r7, _081D3D28 + ldr r7, =0x00004003 adds r1, r7, 0 orrs r0, r1 strh r0, [r2] @@ -956203,12 +923798,12 @@ sub_81D3CBC: @ 81D3CBC orrs r0, r1 strh r0, [r3] strh r6, [r5] - ldr r1, _081D3D2C + ldr r1, =0x030012c8 ldrb r0, [r1, 0x1] cmp r0, 0 bne _081D3D0A str r0, [sp] - ldr r2, _081D3D30 + ldr r2, =0x05000006 mov r0, sp bl CpuSet _081D3D0A: @@ -956217,22 +923812,15 @@ _081D3D0A: pop {r0} bx r0 .align 2, 0 -_081D3D14: .4byte 0x04000208 -_081D3D18: .4byte 0x04000200 -_081D3D1C: .4byte 0x0000ff3f -_081D3D20: .4byte 0x04000134 -_081D3D24: .4byte 0x04000128 -_081D3D28: .4byte 0x00004003 -_081D3D2C: .4byte 0x030012c8 -_081D3D30: .4byte 0x05000006 + .pool thumb_func_end sub_81D3CBC thumb_func_start sub_81D3D34 sub_81D3D34: @ 81D3D34 - ldr r0, _081D3D5C + ldr r0, =0x04000134 movs r3, 0 strh r3, [r0] - ldr r2, _081D3D60 + ldr r2, =0x04000128 movs r1, 0xA0 lsls r1, 7 adds r0, r1, 0 @@ -956241,20 +923829,16 @@ sub_81D3D34: @ 81D3D34 movs r1, 0x8 orrs r0, r1 strh r0, [r2] - ldr r0, _081D3D64 + ldr r0, =0x03003144 strb r3, [r0] - ldr r0, _081D3D68 + ldr r0, =0x030012e6 strh r3, [r0] - ldr r1, _081D3D6C + ldr r1, =0x030012e8 movs r0, 0 str r0, [r1] bx lr .align 2, 0 -_081D3D5C: .4byte 0x04000134 -_081D3D60: .4byte 0x04000128 -_081D3D64: .4byte 0x03003144 -_081D3D68: .4byte 0x030012e6 -_081D3D6C: .4byte 0x030012e8 + .pool thumb_func_end sub_81D3D34 thumb_func_start sub_81D3D70 @@ -956265,20 +923849,19 @@ sub_81D3D70: @ 81D3D70 adds r6, r3, 0 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081D3D90 + ldr r0, =0x030012c8 ldrb r0, [r0, 0x1] cmp r0, 0x6 bls _081D3D86 b _081D3ECC _081D3D86: lsls r0, 2 - ldr r1, _081D3D94 + ldr r1, =_081D3D98 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081D3D90: .4byte 0x030012c8 -_081D3D94: .4byte _081D3D98 + .pool .align 2, 0 _081D3D98: .4byte _081D3DB4 @@ -956290,13 +923873,13 @@ _081D3D98: .4byte _081D3EBC _081D3DB4: bl sub_81D3CBC - ldr r1, _081D3DC4 + ldr r1, =0x030012c8 movs r0, 0x1 strb r0, [r1, 0x2] strb r0, [r1, 0x1] b _081D3ECC .align 2, 0 -_081D3DC4: .4byte 0x030012c8 + .pool _081D3DC8: adds r0, r2, 0 bl sub_81D3EE8 @@ -956305,7 +923888,7 @@ _081D3DC8: beq _081D3DD8 bl sub_81D413C _081D3DD8: - ldr r0, _081D3DE4 + ldr r0, =0x03003144 ldrb r0, [r0] cmp r0, 0x2 beq _081D3DE2 @@ -956313,40 +923896,39 @@ _081D3DD8: _081D3DE2: b _081D3E04 .align 2, 0 -_081D3DE4: .4byte 0x03003144 + .pool _081D3DE8: bl sub_81D3D34 adds r0, r4, 0 adds r1, r5, 0 adds r2, r6, 0 bl sub_81D3F1C - ldr r1, _081D3E10 + ldr r1, =0x030012c8 movs r0, 0x3 strb r0, [r1, 0x1] _081D3DFC: - ldr r0, _081D3E14 + ldr r0, =0x03003144 ldrb r0, [r0] cmp r0, 0x2 bne _081D3E18 _081D3E04: - ldr r1, _081D3E10 + ldr r1, =0x030012c8 strb r0, [r1, 0x4] movs r0, 0x6 strb r0, [r1, 0x1] b _081D3ECC .align 2, 0 -_081D3E10: .4byte 0x030012c8 -_081D3E14: .4byte 0x03003144 + .pool _081D3E18: - ldr r2, _081D3E58 + ldr r2, =0x030012e6 ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - ldr r1, _081D3E5C + ldr r1, =0x030012e8 ldr r0, [r1] adds r3, r0, 0x1 str r3, [r1] - ldr r1, _081D3E60 + ldr r1, =0x030012c8 ldrb r0, [r1] cmp r0, 0 bne _081D3E3C @@ -956357,7 +923939,7 @@ _081D3E18: movs r0, 0x6 strb r0, [r1, 0x1] _081D3E3C: - ldr r4, _081D3E60 + ldr r4, =0x030012c8 ldrb r0, [r4, 0x2] cmp r0, 0x2 beq _081D3ECC @@ -956371,37 +923953,35 @@ _081D3E3C: movs r0, 0x2 b _081D3ECA .align 2, 0 -_081D3E58: .4byte 0x030012e6 -_081D3E5C: .4byte 0x030012e8 -_081D3E60: .4byte 0x030012c8 + .pool _081D3E64: bl sub_81D413C - ldr r1, _081D3E70 + ldr r1, =0x030012c8 movs r0, 0x2 strb r0, [r1, 0x2] b _081D3ECC .align 2, 0 -_081D3E70: .4byte 0x030012c8 + .pool _081D3E74: bl sub_81D3CBC - ldr r1, _081D3E80 + ldr r1, =0x030012c8 movs r0, 0x5 strb r0, [r1, 0x1] b _081D3ECC .align 2, 0 -_081D3E80: .4byte 0x030012c8 + .pool _081D3E84: - ldr r0, _081D3EB4 + ldr r0, =0x030012c8 ldrb r0, [r0] cmp r0, 0x1 bne _081D3E98 - ldr r0, _081D3EB8 + ldr r0, =0x030012e6 ldrh r0, [r0] cmp r0, 0x2 bls _081D3E98 bl sub_81D413C _081D3E98: - ldr r1, _081D3EB8 + ldr r1, =0x030012e6 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] @@ -956409,17 +923989,16 @@ _081D3E98: lsrs r0, 16 cmp r0, 0x3C bls _081D3ECC - ldr r0, _081D3EB4 + ldr r0, =0x030012c8 movs r1, 0x1 strb r1, [r0, 0x4] movs r1, 0x6 strb r1, [r0, 0x1] b _081D3ECC .align 2, 0 -_081D3EB4: .4byte 0x030012c8 -_081D3EB8: .4byte 0x030012e6 + .pool _081D3EBC: - ldr r4, _081D3EE4 + ldr r4, =0x030012c8 ldrb r0, [r4, 0x2] cmp r0, 0 beq _081D3ECC @@ -956428,7 +924007,7 @@ _081D3EBC: _081D3ECA: strb r0, [r4, 0x2] _081D3ECC: - ldr r2, _081D3EE4 + ldr r2, =0x030012c8 ldrb r0, [r2, 0x2] ldrb r1, [r2, 0x4] lsls r1, 2 @@ -956440,7 +924019,7 @@ _081D3ECC: pop {r1} bx r1 .align 2, 0 -_081D3EE4: .4byte 0x030012c8 + .pool thumb_func_end sub_81D3D70 thumb_func_start sub_81D3EE8 @@ -956448,7 +924027,7 @@ sub_81D3EE8: @ 81D3EE8 push {lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081D3F04 + ldr r0, =0x04000128 ldr r0, [r0] movs r1, 0xC ands r0, r1 @@ -956456,21 +924035,20 @@ sub_81D3EE8: @ 81D3EE8 bne _081D3F0C cmp r2, 0 beq _081D3F0C - ldr r1, _081D3F08 + ldr r1, =0x030012c8 movs r0, 0x1 b _081D3F10 .align 2, 0 -_081D3F04: .4byte 0x04000128 -_081D3F08: .4byte 0x030012c8 + .pool _081D3F0C: - ldr r1, _081D3F18 + ldr r1, =0x030012c8 movs r0, 0 _081D3F10: strb r0, [r1] pop {r1} bx r1 .align 2, 0 -_081D3F18: .4byte 0x030012c8 + .pool thumb_func_end sub_81D3EE8 thumb_func_start sub_81D3F1C @@ -956478,17 +924056,17 @@ sub_81D3F1C: @ 81D3F1C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - ldr r3, _081D3F48 + ldr r3, =0x030012c8 ldrb r0, [r3] cmp r0, 0 beq _081D3F54 - ldr r2, _081D3F4C + ldr r2, =0x04000128 ldrh r0, [r2] movs r1, 0x1 orrs r0, r1 strh r0, [r2] str r5, [r3, 0x8] - ldr r0, _081D3F50 + ldr r0, =0x04000120 str r4, [r0] lsrs r0, r4, 2 adds r0, 0x1 @@ -956496,11 +924074,9 @@ sub_81D3F1C: @ 81D3F1C bl sub_81D3F68 b _081D3F5C .align 2, 0 -_081D3F48: .4byte 0x030012c8 -_081D3F4C: .4byte 0x04000128 -_081D3F50: .4byte 0x04000120 + .pool _081D3F54: - ldr r1, _081D3F64 + ldr r1, =0x04000128 ldrh r0, [r1] strh r0, [r1] str r2, [r3, 0x8] @@ -956509,19 +924085,19 @@ _081D3F5C: pop {r0} bx r0 .align 2, 0 -_081D3F64: .4byte 0x04000128 + .pool thumb_func_end sub_81D3F1C thumb_func_start sub_81D3F68 sub_81D3F68: @ 81D3F68 - ldr r1, _081D3F8C - ldr r2, _081D3F90 + ldr r1, =0x0400010c + ldr r2, =0x0000fda7 adds r0, r2, 0 strh r0, [r1] - ldr r0, _081D3F94 + ldr r0, =0x0400010e movs r2, 0x40 strh r2, [r0] - ldr r3, _081D3F98 + ldr r3, =0x04000208 movs r0, 0 strh r0, [r3] adds r1, 0xF4 @@ -956532,10 +924108,7 @@ sub_81D3F68: @ 81D3F68 strh r0, [r3] bx lr .align 2, 0 -_081D3F8C: .4byte 0x0400010c -_081D3F90: .4byte 0x0000fda7 -_081D3F94: .4byte 0x0400010e -_081D3F98: .4byte 0x04000208 + .pool thumb_func_end sub_81D3F68 thumb_func_start sub_81D3F9C @@ -956551,7 +924124,7 @@ sub_81D3F9C: @ 81D3F9C sub_81D3FAC: @ 81D3FAC push {r4-r6,lr} sub sp, 0x8 - ldr r2, _081D3FC4 + ldr r2, =0x030012c8 ldrb r0, [r2, 0x1] adds r3, r2, 0 cmp r0, 0x3 @@ -956562,7 +924135,7 @@ sub_81D3FAC: @ 81D3FAC beq _081D3FD0 b _081D412A .align 2, 0 -_081D3FC4: .4byte 0x030012c8 + .pool _081D3FC8: cmp r0, 0x5 bne _081D3FCE @@ -956570,11 +924143,11 @@ _081D3FC8: _081D3FCE: b _081D412A _081D3FD0: - ldr r1, _081D4000 - ldr r2, _081D4004 + ldr r1, =0x0400012a + ldr r2, =0x0000ccd0 adds r0, r2, 0 strh r0, [r1] - ldr r0, _081D4008 + ldr r0, =0x04000120 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] @@ -956582,8 +924155,8 @@ _081D3FD0: movs r1, 0 movs r2, 0 movs r4, 0 - ldr r6, _081D4004 - ldr r5, _081D400C + ldr r6, =0x0000ccd0 + ldr r5, =0x0000ffff _081D3FEC: lsls r0, r1, 1 add r0, sp @@ -956595,10 +924168,7 @@ _081D3FEC: lsrs r2, r0, 16 b _081D401A .align 2, 0 -_081D4000: .4byte 0x0400012a -_081D4004: .4byte 0x0000ccd0 -_081D4008: .4byte 0x04000120 -_081D400C: .4byte 0x0000ffff + .pool _081D4010: cmp r0, r5 beq _081D401A @@ -956622,7 +924192,7 @@ _081D4030: strb r2, [r3, 0x1] b _081D412A _081D4034: - ldr r0, _081D4070 + ldr r0, =0x04000120 ldr r4, [r0] ldr r0, [r2, 0xC] cmp r0, 0 @@ -956641,7 +924211,7 @@ _081D404A: ldr r0, [r3, 0x10] cmp r1, r0 bge _081D4074 - ldr r2, _081D4070 + ldr r2, =0x04000120 ldr r0, [r3, 0x8] lsls r1, 2 adds r1, r0 @@ -956653,13 +924223,13 @@ _081D404A: str r0, [r3, 0x14] b _081D40BA .align 2, 0 -_081D4070: .4byte 0x04000120 + .pool _081D4074: - ldr r1, _081D407C + ldr r1, =0x04000120 ldr r0, [r3, 0x14] b _081D40B8 .align 2, 0 -_081D407C: .4byte 0x04000120 + .pool _081D4080: ldr r1, [r3, 0xC] cmp r1, 0 @@ -956691,7 +924261,7 @@ _081D40B0: _081D40B2: strb r0, [r3, 0x3] _081D40B4: - ldr r1, _081D40DC + ldr r1, =0x030012e8 movs r0, 0 _081D40B8: str r0, [r1] @@ -956706,15 +924276,14 @@ _081D40BA: ldrb r0, [r3] cmp r0, 0 beq _081D40E4 - ldr r0, _081D40E0 + ldr r0, =0x0400010e ldrh r1, [r0] movs r2, 0x80 orrs r1, r2 strh r1, [r0] b _081D412A .align 2, 0 -_081D40DC: .4byte 0x030012e8 -_081D40E0: .4byte 0x0400010e + .pool _081D40E4: bl sub_81D413C b _081D412A @@ -956722,20 +924291,20 @@ _081D40EA: movs r0, 0 movs r1, 0x4 strb r1, [r3, 0x1] - ldr r1, _081D40F8 + ldr r1, =0x030012e6 strh r0, [r1] b _081D412A .align 2, 0 -_081D40F8: .4byte 0x030012e6 + .pool _081D40FC: ldrb r3, [r2] cmp r3, 0 bne _081D4108 - ldr r1, _081D4134 + ldr r1, =0x0400012a ldrb r0, [r2, 0x3] strh r0, [r1] _081D4108: - ldr r0, _081D4138 + ldr r0, =0x04000120 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp] @@ -956759,51 +924328,47 @@ _081D412A: pop {r0} bx r0 .align 2, 0 -_081D4134: .4byte 0x0400012a -_081D4138: .4byte 0x04000120 + .pool thumb_func_end sub_81D3FAC thumb_func_start sub_81D413C sub_81D413C: @ 81D413C - ldr r0, _081D4148 + ldr r0, =0x04000128 ldrh r1, [r0] movs r2, 0x80 orrs r1, r2 strh r1, [r0] bx lr .align 2, 0 -_081D4148: .4byte 0x04000128 + .pool thumb_func_end sub_81D413C thumb_func_start sub_81D414C sub_81D414C: @ 81D414C - ldr r2, _081D4160 + ldr r2, =0x0400010e ldrh r1, [r2] - ldr r0, _081D4164 + ldr r0, =0x0000ff7f ands r0, r1 strh r0, [r2] - ldr r1, _081D4168 - ldr r2, _081D416C + ldr r1, =0x0400010c + ldr r2, =0x0000fda7 adds r0, r2, 0 strh r0, [r1] bx lr .align 2, 0 -_081D4160: .4byte 0x0400010e -_081D4164: .4byte 0x0000ff7f -_081D4168: .4byte 0x0400010c -_081D416C: .4byte 0x0000fda7 + .pool thumb_func_end sub_81D414C thumb_func_start sub_81D4170 sub_81D4170: @ 81D4170 push {r4,lr} - ldr r0, _081D4190 + ldr r0, =0x04000130 ldrh r0, [r0] - ldr r2, _081D4194 + ldr r2, =0x000003ff adds r1, r2, 0 eors r1, r0 - ldr r4, _081D4198 - ldr r3, _081D419C + ldr r4, =0x030012e2 + ldr r3, =0x030012e0 ldrh r2, [r3] adds r0, r1, 0 bics r0, r2 @@ -956813,78 +924378,61 @@ sub_81D4170: @ 81D4170 pop {r0} bx r0 .align 2, 0 -_081D4190: .4byte 0x04000130 -_081D4194: .4byte 0x000003ff -_081D4198: .4byte 0x030012e2 -_081D419C: .4byte 0x030012e0 + .pool thumb_func_end sub_81D4170 thumb_func_start sub_81D41A0 sub_81D41A0: @ 81D41A0 - ldr r1, _081D41CC - ldr r0, _081D41D0 + ldr r1, =0x030012ec + ldr r0, =0x04000208 ldrh r0, [r0] strh r0, [r1] - ldr r1, _081D41D4 - ldr r0, _081D41D8 + ldr r1, =0x030012ee + ldr r0, =0x04000200 ldrh r0, [r0] strh r0, [r1] - ldr r1, _081D41DC - ldr r0, _081D41E0 + ldr r1, =0x030012f0 + ldr r0, =0x0400010e ldrh r0, [r0] strh r0, [r1] - ldr r1, _081D41E4 - ldr r0, _081D41E8 + ldr r1, =0x030012f2 + ldr r0, =0x04000128 ldrh r0, [r0] strh r0, [r1] - ldr r1, _081D41EC - ldr r0, _081D41F0 + ldr r1, =0x030012f4 + ldr r0, =0x04000134 ldrh r0, [r0] strh r0, [r1] bx lr .align 2, 0 -_081D41CC: .4byte 0x030012ec -_081D41D0: .4byte 0x04000208 -_081D41D4: .4byte 0x030012ee -_081D41D8: .4byte 0x04000200 -_081D41DC: .4byte 0x030012f0 -_081D41E0: .4byte 0x0400010e -_081D41E4: .4byte 0x030012f2 -_081D41E8: .4byte 0x04000128 -_081D41EC: .4byte 0x030012f4 -_081D41F0: .4byte 0x04000134 + .pool thumb_func_end sub_81D41A0 thumb_func_start sub_81D41F4 sub_81D41F4: @ 81D41F4 - ldr r1, _081D4220 - ldr r0, _081D4224 + ldr r1, =0x04000208 + ldr r0, =0x030012ec ldrh r0, [r0] strh r0, [r1] subs r1, 0x8 - ldr r0, _081D4228 + ldr r0, =0x030012ee ldrh r0, [r0] strh r0, [r1] subs r1, 0xF2 - ldr r0, _081D422C + ldr r0, =0x030012f0 ldrh r0, [r0] strh r0, [r1] adds r1, 0x1A - ldr r0, _081D4230 + ldr r0, =0x030012f2 ldrh r0, [r0] strh r0, [r1] adds r1, 0xC - ldr r0, _081D4234 + ldr r0, =0x030012f4 ldrh r0, [r0] strh r0, [r1] bx lr .align 2, 0 -_081D4220: .4byte 0x04000208 -_081D4224: .4byte 0x030012ec -_081D4228: .4byte 0x030012ee -_081D422C: .4byte 0x030012f0 -_081D4230: .4byte 0x030012f2 -_081D4234: .4byte 0x030012f4 + .pool thumb_func_end sub_81D41F4 thumb_func_start sub_81D4238 @@ -956893,23 +924441,22 @@ sub_81D4238: @ 81D4238 sub sp, 0x4 movs r0, 0 str r0, [sp] - ldr r1, _081D4250 - ldr r2, _081D4254 + ldr r1, =0x030012c8 + ldr r2, =0x05000006 mov r0, sp bl CpuSet add sp, 0x4 pop {r0} bx r0 .align 2, 0 -_081D4250: .4byte 0x030012c8 -_081D4254: .4byte 0x05000006 + .pool thumb_func_end sub_81D4238 thumb_func_start sub_81D4258 sub_81D4258: @ 81D4258 push {lr} sub sp, 0x4 - ldr r0, _081D4278 + ldr r0, =0x03005d8c ldr r0, [r0] ldrb r1, [r0, 0x5] ldrb r2, [r0, 0x4] @@ -956922,7 +924469,7 @@ sub_81D4258: @ 81D4258 pop {r1} bx r1 .align 2, 0 -_081D4278: .4byte 0x03005d8c + .pool thumb_func_end sub_81D4258 thumb_func_start sub_81D427C @@ -956938,10 +924485,10 @@ sub_81D427C: @ 81D427C lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r2, _081D4320 + ldr r2, =0x02037350 adds r5, r1, r2 - ldr r4, _081D4324 - ldr r3, _081D4328 + ldr r4, =0x030012f8 + ldr r3, =0x02037590 ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -956951,7 +924498,7 @@ sub_81D427C: @ 81D427C ldrh r1, [r5, 0x10] subs r0, r1 strh r0, [r4] - ldr r4, _081D432C + ldr r4, =0x030012fa ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -956963,7 +924510,7 @@ sub_81D427C: @ 81D427C strh r0, [r4] movs r0, 0 mov r8, r0 - ldr r2, _081D4330 + ldr r2, =0x030012fc movs r1, 0 _081D42CA: mov r3, r8 @@ -956976,8 +924523,8 @@ _081D42CA: mov r8, r0 cmp r0, 0x3 bls _081D42CA - ldr r2, _081D4320 - ldr r0, _081D4328 + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -956996,7 +924543,7 @@ _081D42CA: cmp r1, r0 beq _081D4356 _081D4304: - ldr r0, _081D4334 + ldr r0, =0x0000403a bl var_get lsls r0, 16 movs r1, 0xE0 @@ -957010,19 +924557,14 @@ _081D4304: ands r0, r1 b _081D433E .align 2, 0 -_081D4320: .4byte 0x02037350 -_081D4324: .4byte 0x030012f8 -_081D4328: .4byte 0x02037590 -_081D432C: .4byte 0x030012fa -_081D4330: .4byte 0x030012fc -_081D4334: .4byte 0x0000403a + .pool _081D4338: ldrb r0, [r5, 0x1] movs r1, 0x20 orrs r0, r1 _081D433E: strb r0, [r5, 0x1] - ldr r0, _081D435C + ldr r0, =0x0000403a bl var_get lsls r0, 16 lsrs r0, 16 @@ -957035,14 +924577,14 @@ _081D4356: movs r0, 0 b _081D4816 .align 2, 0 -_081D435C: .4byte 0x0000403a + .pool _081D4360: movs r4, 0 mov r8, r4 - ldr r6, _081D43B0 + ldr r6, =0x02037350 mov r10, r6 _081D4368: - ldr r3, _081D43B4 + ldr r3, =0x02037590 ldrb r1, [r3, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -957051,13 +924593,13 @@ _081D4368: adds r4, r0, r1 mov r2, r8 lsls r1, r2, 2 - ldr r6, _081D43B8 + ldr r6, =0x0862608c adds r0, r1, r6 movs r6, 0x14 ldrsh r2, [r4, r6] movs r6, 0 ldrsh r0, [r0, r6] - ldr r6, _081D43B0 + ldr r6, =0x02037350 mov r9, r6 mov r12, r3 adds r7, r1, 0 @@ -957066,7 +924608,7 @@ _081D4368: b _081D449E _081D4394: movs r3, 0 - ldr r1, _081D43BC + ldr r1, =0x0862608e adds r0, r7, r1 movs r2, 0x16 ldrsh r1, [r4, r2] @@ -957080,10 +924622,7 @@ _081D4394: bgt _081D43CA b _081D449E .align 2, 0 -_081D43B0: .4byte 0x02037350 -_081D43B4: .4byte 0x02037590 -_081D43B8: .4byte 0x0862608c -_081D43BC: .4byte 0x0862608e + .pool _081D43C0: movs r1, 0x12 ldrsh r0, [r5, r1] @@ -957093,7 +924632,7 @@ _081D43C0: _081D43CA: cmp r3, 0 bne _081D449E - ldr r0, _081D440C + ldr r0, =0x030012f8 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 @@ -957125,7 +924664,7 @@ _081D4408: movs r0, 0x4 b _081D4816 .align 2, 0 -_081D440C: .4byte 0x030012f8 + .pool _081D4410: cmp r0, 0 bge _081D4446 @@ -957154,7 +924693,7 @@ _081D4410: beq _081D4446 b _081D45AA _081D4446: - ldr r0, _081D4480 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -957166,7 +924705,7 @@ _081D4446: ldrsh r0, [r0, r4] cmp r1, r0 bne _081D449E - ldr r0, _081D4484 + ldr r0, =0x030012fa movs r6, 0 ldrsh r0, [r0, r6] cmp r0, 0 @@ -957184,8 +924723,7 @@ _081D447C: movs r0, 0x2 b _081D4816 .align 2, 0 -_081D4480: .4byte 0x02037590 -_081D4484: .4byte 0x030012fa + .pool _081D4488: movs r2, 0x10 ldrsh r0, [r5, r2] @@ -957198,21 +924736,21 @@ _081D4488: cmp r0, 0 bne _081D4538 _081D449E: - ldr r2, _081D44E0 + ldr r2, =0x02037590 ldrb r1, [r2, 0x5] lsls r0, r1, 3 adds r0, r1 lsls r0, 2 mov r3, r10 adds r4, r0, r3 - ldr r6, _081D44E4 - ldr r1, _081D44E8 + ldr r6, =0x0862608c + ldr r1, =0x0862608e adds r0, r7, r1 movs r3, 0x16 ldrsh r1, [r4, r3] movs r3, 0 ldrsh r0, [r0, r3] - ldr r3, _081D44EC + ldr r3, =0x02037350 mov r9, r3 mov r12, r2 cmp r1, r0 @@ -957233,10 +924771,7 @@ _081D44C6: bgt _081D44FA b _081D45D0 .align 2, 0 -_081D44E0: .4byte 0x02037590 -_081D44E4: .4byte 0x0862608c -_081D44E8: .4byte 0x0862608e -_081D44EC: .4byte 0x02037350 + .pool _081D44F0: movs r1, 0x10 ldrsh r0, [r5, r1] @@ -957246,7 +924781,7 @@ _081D44F0: _081D44FA: cmp r3, 0 bne _081D45D0 - ldr r0, _081D453C + ldr r0, =0x030012fa movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 @@ -957278,7 +924813,7 @@ _081D4538: movs r0, 0x1 b _081D4816 .align 2, 0 -_081D453C: .4byte 0x030012fa + .pool _081D4540: cmp r0, 0 bge _081D4576 @@ -957307,7 +924842,7 @@ _081D4540: beq _081D4576 b _081D447C _081D4576: - ldr r0, _081D45B0 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -957319,7 +924854,7 @@ _081D4576: ldrsh r0, [r0, r3] cmp r1, r0 bne _081D45D0 - ldr r0, _081D45B4 + ldr r0, =0x030012f8 movs r4, 0 ldrsh r0, [r0, r4] cmp r0, 0 @@ -957336,8 +924871,7 @@ _081D45AA: movs r0, 0x3 b _081D4816 .align 2, 0 -_081D45B0: .4byte 0x02037590 -_081D45B4: .4byte 0x030012f8 + .pool _081D45B8: ldrh r0, [r5, 0x10] adds r0, 0x1 @@ -957472,13 +925006,13 @@ _081D46C8: bl sub_81D4D24 b _081D4812 _081D46D0: - ldr r0, _081D4824 + ldr r0, =0x030012fa movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0 bne _081D476E - ldr r2, _081D4828 - ldr r0, _081D482C + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -957502,8 +925036,8 @@ _081D46D0: beq _081D470C b _081D447C _081D470C: - ldr r2, _081D4828 - ldr r0, _081D482C + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -957551,13 +925085,13 @@ _081D4756: beq _081D476E b _081D4538 _081D476E: - ldr r0, _081D4830 + ldr r0, =0x030012f8 movs r2, 0 ldrsh r0, [r0, r2] cmp r0, 0 bne _081D480C - ldr r2, _081D4828 - ldr r0, _081D482C + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -957581,8 +925115,8 @@ _081D476E: beq _081D47AA b _081D45AA _081D47AA: - ldr r2, _081D4828 - ldr r0, _081D482C + ldr r2, =0x02037350 + ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -957644,10 +925178,7 @@ _081D4816: pop {r1} bx r1 .align 2, 0 -_081D4824: .4byte 0x030012fa -_081D4828: .4byte 0x02037350 -_081D482C: .4byte 0x02037590 -_081D4830: .4byte 0x030012f8 + .pool thumb_func_end sub_81D427C thumb_func_start sub_81D4834 @@ -957656,8 +925187,8 @@ sub_81D4834: @ 81D4834 lsls r0, 16 lsls r1, 16 lsrs r4, r1, 16 - ldr r3, _081D4868 - ldr r1, _081D486C + ldr r3, =0x02037350 + ldr r1, =0x02037590 ldrb r2, [r1, 0x5] lsls r1, r2, 3 adds r1, r2 @@ -957678,8 +925209,7 @@ sub_81D4834: @ 81D4834 movs r0, 0 b _081D4888 .align 2, 0 -_081D4868: .4byte 0x02037350 -_081D486C: .4byte 0x02037590 + .pool _081D4870: lsls r0, r3, 16 asrs r0, 16 @@ -957709,10 +925239,10 @@ sub_81D4890: @ 81D4890 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _081D496C + ldr r0, =0x02037350 adds r4, r1, r0 movs r1, 0 - ldr r3, _081D4970 + ldr r3, =0x030012fc movs r2, 0 _081D48B0: adds r0, r1, r3 @@ -957735,7 +925265,7 @@ _081D48B0: bne _081D48E8 cmp r6, 0x2 beq _081D48E8 - ldr r0, _081D4970 + ldr r0, =0x030012fc adds r0, r5, r0 movs r1, 0x2 strb r1, [r0] @@ -957756,7 +925286,7 @@ _081D48E8: bne _081D4912 cmp r6, 0x4 beq _081D4912 - ldr r0, _081D4970 + ldr r0, =0x030012fc adds r0, r5, r0 movs r1, 0x4 strb r1, [r0] @@ -957777,7 +925307,7 @@ _081D4912: bne _081D493A cmp r6, 0x1 beq _081D493A - ldr r0, _081D4970 + ldr r0, =0x030012fc adds r0, r5, r0 strb r1, [r0] adds r0, r5, 0x1 @@ -957797,7 +925327,7 @@ _081D493A: bne _081D4964 cmp r6, 0x3 beq _081D4964 - ldr r0, _081D4970 + ldr r0, =0x030012fc adds r0, r5, r0 movs r1, 0x3 strb r1, [r0] @@ -957807,14 +925337,13 @@ _081D493A: _081D4964: cmp r5, 0x1 bhi _081D4974 - ldr r0, _081D4970 + ldr r0, =0x030012fc b _081D4988 .align 2, 0 -_081D496C: .4byte 0x02037350 -_081D4970: .4byte 0x030012fc + .pool _081D4974: - ldr r4, _081D4990 - ldr r0, _081D4994 + ldr r4, =0x030012fc + ldr r0, =0x0000403a bl var_get lsls r0, 16 lsrs r0, 16 @@ -957827,28 +925356,27 @@ _081D4988: pop {r1} bx r1 .align 2, 0 -_081D4990: .4byte 0x030012fc -_081D4994: .4byte 0x0000403a + .pool thumb_func_end sub_81D4890 thumb_func_start sub_81D4998 sub_81D4998: @ 81D4998 push {r4,lr} - ldr r4, _081D49C8 + ldr r4, =0x0000403a adds r0, r4, 0 bl var_get lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _081D49CC + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _081D49D0 + ldr r0, =0x0000391a cmp r1, r0 bne _081D49E0 adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 - ldr r0, _081D49D4 + ldr r0, =0x0000270e cmp r2, r0 bls _081D49D8 adds r0, r4, 0 @@ -957856,10 +925384,7 @@ sub_81D4998: @ 81D4998 bl var_set b _081D49E0 .align 2, 0 -_081D49C8: .4byte 0x0000403a -_081D49CC: .4byte 0x03005d8c -_081D49D0: .4byte 0x0000391a -_081D49D4: .4byte 0x0000270e + .pool _081D49D8: adds r0, r4, 0 adds r1, r2, 0 @@ -957874,10 +925399,10 @@ _081D49E0: sub_81D49E8: @ 81D49E8 push {lr} adds r2, r0, 0 - ldr r0, _081D4A04 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _081D4A08 + ldr r0, =0x0000391a cmp r1, r0 bne _081D4A0C ldrb r0, [r2, 0x5] @@ -957886,8 +925411,7 @@ sub_81D49E8: @ 81D49E8 movs r0, 0x1 b _081D4A0E .align 2, 0 -_081D4A04: .4byte 0x03005d8c -_081D4A08: .4byte 0x0000391a + .pool _081D4A0C: movs r0, 0 _081D4A0E: @@ -957898,10 +925422,10 @@ _081D4A0E: thumb_func_start unown_chamber_related unown_chamber_related: @ 81D4A14 push {lr} - ldr r0, _081D4A44 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r0, 0x4] - ldr r0, _081D4A48 + ldr r0, =0x0000391a cmp r1, r0 bne _081D4A50 movs r0, 0xE5 @@ -957911,7 +925435,7 @@ unown_chamber_related: @ 81D4A14 lsrs r0, 24 cmp r0, 0x1 beq _081D4A50 - ldr r0, _081D4A4C + ldr r0, =0x000002ce bl flag_check lsls r0, 24 lsrs r0, 24 @@ -957920,9 +925444,7 @@ unown_chamber_related: @ 81D4A14 movs r0, 0x1 b _081D4A52 .align 2, 0 -_081D4A44: .4byte 0x03005d8c -_081D4A48: .4byte 0x0000391a -_081D4A4C: .4byte 0x000002ce + .pool _081D4A50: movs r0, 0 _081D4A52: @@ -957933,11 +925455,11 @@ _081D4A52: thumb_func_start sub_81D4A58 sub_81D4A58: @ 81D4A58 push {r4,lr} - ldr r4, _081D4A80 + ldr r4, =0x0000403a adds r0, r4, 0 bl var_get lsls r0, 16 - ldr r1, _081D4A84 + ldr r1, =0xffff0000 cmp r0, r1 beq _081D4A88 adds r0, r4, 0 @@ -957951,8 +925473,7 @@ sub_81D4A58: @ 81D4A58 movs r0, 0x1 b _081D4A8A .align 2, 0 -_081D4A80: .4byte 0x0000403a -_081D4A84: .4byte 0xffff0000 + .pool _081D4A88: movs r0, 0 _081D4A8A: @@ -957971,14 +925492,14 @@ sub_81D4A90: @ 81D4A90 lsls r1, r0, 3 adds r1, r0 lsls r1, 2 - ldr r0, _081D4AEC + ldr r0, =0x02037350 adds r5, r1, r0 ldrb r1, [r5, 0x1] movs r0, 0x21 negs r0, r0 ands r0, r1 strb r0, [r5, 0x1] - ldr r0, _081D4AF0 + ldr r0, =0x020375e0 ldrh r4, [r0] cmp r4, 0x1 bne _081D4AF8 @@ -957986,7 +925507,7 @@ sub_81D4A90: @ 81D4A90 movs r1, 0x4 orrs r0, r1 strb r0, [r5, 0x3] - ldr r3, _081D4AF4 + ldr r3, =0x02020630 ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -958008,18 +925529,16 @@ sub_81D4A90: @ 81D4A90 strb r4, [r0] b _081D4BC4 .align 2, 0 -_081D4AEC: .4byte 0x02037350 -_081D4AF0: .4byte 0x020375e0 -_081D4AF4: .4byte 0x02020630 + .pool _081D4AF8: - ldr r0, _081D4BCC - ldr r1, _081D4BD0 + ldr r0, =0x0000403a + ldr r1, =0x0000ffff bl var_set ldrb r0, [r5, 0x3] movs r1, 0x4 orrs r0, r1 strb r0, [r5, 0x3] - ldr r6, _081D4BD4 + ldr r6, =0x02020630 ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -958032,7 +925551,7 @@ _081D4AF8: movs r2, 0x80 orrs r1, r2 strb r1, [r0] - ldr r0, _081D4BD8 + ldr r0, =0x020375f4 ldrh r0, [r0] cmp r0, 0x2 beq _081D4B3A @@ -958045,7 +925564,7 @@ _081D4AF8: movs r0, 0x1 strb r0, [r1] _081D4B3A: - ldr r4, _081D4BDC + ldr r4, =0x0850c9c8 adds r0, r4, 0 bl gpu_pal_obj_alloc_tag_and_apply ldrh r0, [r4, 0x4] @@ -958065,7 +925584,7 @@ _081D4B3A: movs r2, 0x8 movs r3, 0x8 bl sub_80930E0 - ldr r0, _081D4BE0 + ldr r0, =0x085059f8 ldr r0, [r0, 0x3C] mov r1, sp movs r2, 0 @@ -958083,7 +925602,7 @@ _081D4B3A: lsls r3, 24 lsrs r3, 24 bl obj_add_from_template_backward_search - ldr r1, _081D4BE4 + ldr r1, =0x0203cf50 strb r0, [r1] lsls r0, 24 lsrs r0, 24 @@ -958107,7 +925626,7 @@ _081D4B3A: movs r2, 0x8 orrs r0, r2 strb r0, [r1, 0x5] - ldr r0, _081D4BE8 + ldr r0, =nullsub_12 + 1 str r0, [r1, 0x1C] _081D4BC4: add sp, 0x4 @@ -958115,20 +925634,13 @@ _081D4BC4: pop {r0} bx r0 .align 2, 0 -_081D4BCC: .4byte 0x0000403a -_081D4BD0: .4byte 0x0000ffff -_081D4BD4: .4byte 0x02020630 -_081D4BD8: .4byte 0x020375f4 -_081D4BDC: .4byte 0x0850c9c8 -_081D4BE0: .4byte 0x085059f8 -_081D4BE4: .4byte 0x0203cf50 -_081D4BE8: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81D4A90 thumb_func_start sub_81D4BEC sub_81D4BEC: @ 81D4BEC push {lr} - ldr r1, _081D4C0C + ldr r1, =0x0203cf50 ldrb r0, [r1] cmp r0, 0x40 beq _081D4C06 @@ -958136,15 +925648,14 @@ sub_81D4BEC: @ 81D4BEC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081D4C10 + ldr r1, =0x02020630 adds r0, r1 bl obj_delete_and_free_tiles _081D4C06: pop {r0} bx r0 .align 2, 0 -_081D4C0C: .4byte 0x0203cf50 -_081D4C10: .4byte 0x02020630 + .pool thumb_func_end sub_81D4BEC thumb_func_start sub_81D4C14 @@ -958153,7 +925664,7 @@ sub_81D4C14: @ 81D4C14 adds r2, r0, 0 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _081D4C48 + ldr r0, =0x030012fa movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -958168,15 +925679,14 @@ sub_81D4C14: @ 81D4C14 lsls r0, 24 cmp r0, 0 beq _081D4C50 - ldr r0, _081D4C4C + ldr r0, =0x030012fc adds r0, r4, r0 movs r1, 0x2 strb r1, [r0] movs r0, 0x1 b _081D4C52 .align 2, 0 -_081D4C48: .4byte 0x030012fa -_081D4C4C: .4byte 0x030012fc + .pool _081D4C50: movs r0, 0 _081D4C52: @@ -958191,7 +925701,7 @@ sub_81D4C58: @ 81D4C58 adds r2, r0, 0 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _081D4C8C + ldr r0, =0x030012f8 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -958206,15 +925716,14 @@ sub_81D4C58: @ 81D4C58 lsls r0, 24 cmp r0, 0 beq _081D4C94 - ldr r0, _081D4C90 + ldr r0, =0x030012fc adds r0, r4, r0 movs r1, 0x4 strb r1, [r0] movs r0, 0x1 b _081D4C96 .align 2, 0 -_081D4C8C: .4byte 0x030012f8 -_081D4C90: .4byte 0x030012fc + .pool _081D4C94: movs r0, 0 _081D4C96: @@ -958229,7 +925738,7 @@ sub_81D4C9C: @ 81D4C9C adds r2, r0, 0 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _081D4CD0 + ldr r0, =0x030012fa movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -958244,15 +925753,14 @@ sub_81D4C9C: @ 81D4C9C lsls r0, 24 cmp r0, 0 beq _081D4CD8 - ldr r0, _081D4CD4 + ldr r0, =0x030012fc adds r0, r4, r0 movs r1, 0x1 strb r1, [r0] movs r0, 0x1 b _081D4CDA .align 2, 0 -_081D4CD0: .4byte 0x030012fa -_081D4CD4: .4byte 0x030012fc + .pool _081D4CD8: movs r0, 0 _081D4CDA: @@ -958267,7 +925775,7 @@ sub_81D4CE0: @ 81D4CE0 adds r2, r0, 0 lsls r1, 24 lsrs r4, r1, 24 - ldr r0, _081D4D14 + ldr r0, =0x030012f8 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 @@ -958282,15 +925790,14 @@ sub_81D4CE0: @ 81D4CE0 lsls r0, 24 cmp r0, 0 beq _081D4D1C - ldr r0, _081D4D18 + ldr r0, =0x030012fc adds r0, r4, r0 movs r1, 0x3 strb r1, [r0] movs r0, 0x1 b _081D4D1E .align 2, 0 -_081D4D14: .4byte 0x030012f8 -_081D4D18: .4byte 0x030012fc + .pool _081D4D1C: movs r0, 0 _081D4D1E: @@ -958305,8 +925812,8 @@ sub_81D4D24: @ 81D4D24 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r5, _081D4D48 - ldr r0, _081D4D4C + ldr r5, =0x030012fc + ldr r0, =0x0000403a bl var_get lsls r0, 16 lsrs r0, 16 @@ -958318,8 +925825,7 @@ sub_81D4D24: @ 81D4D24 pop {r1} bx r1 .align 2, 0 -_081D4D48: .4byte 0x030012fc -_081D4D4C: .4byte 0x0000403a + .pool thumb_func_end sub_81D4D24 thumb_func_start sub_81D4D50 @@ -958332,19 +925838,19 @@ sub_81D4D50: @ 81D4D50 adds r6, r1, 0 mov r8, r2 mov r1, sp - ldr r4, _081D4DA4 + ldr r4, =0x04000208 ldrh r0, [r4] strh r0, [r1] movs r0, 0 strh r0, [r4] - ldr r1, _081D4DA8 - ldr r0, _081D4DAC + ldr r1, =0x03002710 + ldr r0, =sub_81D3FAC + 1 str r0, [r1, 0x4] - ldr r0, _081D4DB0 + ldr r0, =sub_81D3F9C + 1 str r0, [r1, 0x8] bl sub_81D41A0 bl sub_81D4238 - ldr r2, _081D4DB4 + ldr r2, =0x04000200 ldrh r0, [r2] movs r1, 0x4 orrs r0, r1 @@ -958364,11 +925870,7 @@ sub_81D4D50: @ 81D4D50 pop {r0} bx r0 .align 2, 0 -_081D4DA4: .4byte 0x04000208 -_081D4DA8: .4byte 0x03002710 -_081D4DAC: .4byte sub_81D3FAC + 1 -_081D4DB0: .4byte sub_81D3F9C + 1 -_081D4DB4: .4byte 0x04000200 + .pool thumb_func_end sub_81D4D50 thumb_func_start sub_81D4DB8 @@ -958376,7 +925878,7 @@ sub_81D4DB8: @ 81D4DB8 push {r4,lr} sub sp, 0x4 mov r1, sp - ldr r4, _081D4DE4 + ldr r4, =0x04000208 ldrh r0, [r4] strh r0, [r1] movs r0, 0 @@ -958392,7 +925894,7 @@ sub_81D4DB8: @ 81D4DB8 pop {r0} bx r0 .align 2, 0 -_081D4DE4: .4byte 0x04000208 + .pool thumb_func_end sub_81D4DB8 thumb_func_start sub_81D4DE8 @@ -958425,7 +925927,7 @@ _081D4E12: beq _081D4E1C movs r5, 0x3 _081D4E1C: - ldr r1, _081D4E2C + ldr r1, =0x03003144 movs r0, 0 strb r0, [r1] adds r0, r5, 0 @@ -958433,19 +925935,19 @@ _081D4E1C: pop {r1} bx r1 .align 2, 0 -_081D4E2C: .4byte 0x03003144 + .pool thumb_func_end sub_81D4DE8 thumb_func_start sub_81D4E30 sub_81D4E30: @ 81D4E30 push {lr} - ldr r0, _081D4E54 + ldr r0, =0x0201c000 movs r2, 0x80 lsls r2, 6 movs r1, 0 bl memset - ldr r1, _081D4E58 - ldr r2, _081D4E5C + ldr r1, =0x020229c6 + ldr r2, =0x00005503 adds r0, r2, 0 strh r0, [r1] bl sub_8009734 @@ -958454,9 +925956,7 @@ sub_81D4E30: @ 81D4E30 pop {r0} bx r0 .align 2, 0 -_081D4E54: .4byte 0x0201c000 -_081D4E58: .4byte 0x020229c6 -_081D4E5C: .4byte 0x00005503 + .pool thumb_func_end sub_81D4E30 thumb_func_start sub_81D4E60 @@ -958464,12 +925964,12 @@ sub_81D4E60: @ 81D4E60 push {lr} sub sp, 0xC mov r1, sp - ldr r2, _081D4EA4 + ldr r2, =0x04000208 ldrh r0, [r2] strh r0, [r1] movs r0, 0 strh r0, [r2] - ldr r0, _081D4EA8 + ldr r0, =0x03003174 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x4] @@ -958479,15 +925979,15 @@ sub_81D4E60: @ 81D4E60 strh r0, [r2] add r2, sp, 0x4 ldrh r1, [r2] - ldr r0, _081D4EAC + ldr r0, =0x0000b9a0 cmp r1, r0 bne _081D4EB8 ldrh r1, [r2, 0x2] - ldr r0, _081D4EB0 + ldr r0, =0x0000ccd0 cmp r1, r0 bne _081D4EB8 ldrh r1, [r2, 0x4] - ldr r0, _081D4EB4 + ldr r0, =0x0000ffff cmp r1, r0 bne _081D4EB8 ldrh r0, [r2, 0x6] @@ -958496,11 +925996,7 @@ sub_81D4E60: @ 81D4E60 movs r0, 0x1 b _081D4EBA .align 2, 0 -_081D4EA4: .4byte 0x04000208 -_081D4EA8: .4byte 0x03003174 -_081D4EAC: .4byte 0x0000b9a0 -_081D4EB0: .4byte 0x0000ccd0 -_081D4EB4: .4byte 0x0000ffff + .pool _081D4EB8: movs r0, 0 _081D4EBA: @@ -958556,12 +926052,12 @@ _081D4F08: b _081D500C _081D4F10: lsls r0, 2 - ldr r1, _081D4F1C + ldr r1, =_081D4F20 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081D4F1C: .4byte _081D4F20 + .pool .align 2, 0 _081D4F20: .4byte _081D4F38 @@ -958609,7 +926105,7 @@ _081D4F6C: strh r0, [r5] b _081D4FE6 _081D4F88: - ldr r0, _081D4F9C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -958620,7 +926116,7 @@ _081D4F88: movs r0, 0x1 b _081D500E .align 2, 0 -_081D4F9C: .4byte 0x030022c0 + .pool _081D4FA0: ldrh r0, [r5] adds r0, 0x1 @@ -958638,7 +926134,7 @@ _081D4FB6: lsls r0, 24 cmp r0, 0 beq _081D500C - ldr r0, _081D4FDC + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 beq _081D4FE6 @@ -958651,7 +926147,7 @@ _081D4FB6: movs r0, 0x2 b _081D500E .align 2, 0 -_081D4FDC: .4byte 0x03003124 + .pool _081D4FE0: movs r0, 0x4 strb r0, [r4] @@ -958667,7 +926163,7 @@ _081D4FEC: strb r0, [r4] b _081D500C _081D4FF8: - ldr r0, _081D5008 + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _081D500C @@ -958675,7 +926171,7 @@ _081D4FF8: movs r0, 0x4 b _081D500E .align 2, 0 -_081D5008: .4byte 0x03003124 + .pool _081D500C: movs r0, 0 _081D500E: @@ -958687,7 +926183,7 @@ _081D500E: thumb_func_start sub_81D5014 sub_81D5014: @ 81D5014 push {r4,lr} - ldr r0, _081D5054 + ldr r0, =sub_81D5084 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -958695,7 +926191,7 @@ sub_81D5014: @ 81D5014 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081D5058 + ldr r0, =0x03005e08 adds r4, r0 movs r0, 0 strb r0, [r4, 0x8] @@ -958717,8 +926213,7 @@ sub_81D5014: @ 81D5014 pop {r0} bx r0 .align 2, 0 -_081D5054: .4byte sub_81D5084 + 1 -_081D5058: .4byte 0x03005e08 + .pool thumb_func_end sub_81D5014 thumb_func_start sub_81D505C @@ -958758,7 +926253,7 @@ sub_81D5084: @ 81D5084 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081D50A8 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrb r0, [r4, 0x8] cmp r0, 0x1A @@ -958766,13 +926261,12 @@ sub_81D5084: @ 81D5084 b _081D548A _081D509C: lsls r0, 2 - ldr r1, _081D50AC + ldr r1, =_081D50B0 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081D50A8: .4byte 0x03005e08 -_081D50AC: .4byte _081D50B0 + .pool .align 2, 0 _081D50B0: .4byte _081D511C @@ -958805,7 +926299,7 @@ _081D50B0: _081D511C: adds r0, r4, 0 adds r0, 0x9 - ldr r1, _081D5134 + ldr r1, =0x085edfd6 bl mevent_0814257C cmp r0, 0 bne _081D512C @@ -958815,7 +926309,7 @@ _081D512C: strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D5134: .4byte 0x085edfd6 + .pool _081D5138: bl sub_81D4E30 adds r0, r4, 0 @@ -958845,13 +926339,13 @@ _081D5166: _081D516C: adds r0, r4, 0 adds r0, 0x9 - ldr r1, _081D5190 + ldr r1, =0x085edff5 bl mevent_0814257C cmp r0, 0 bne _081D517C b _081D548A _081D517C: - ldr r0, _081D5194 + ldr r0, =0x085ee014 bl sub_8018884 adds r0, r4, 0 bl sub_81D505C @@ -958859,8 +926353,7 @@ _081D517C: strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D5190: .4byte 0x085edff5 -_081D5194: .4byte 0x085ee014 + .pool _081D5198: adds r0, r4, 0 movs r1, 0x5A @@ -958872,7 +926365,7 @@ _081D5198: strb r0, [r4, 0x8] b _081D548A _081D51AE: - ldr r0, _081D51CC + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -958886,9 +926379,9 @@ _081D51BC: bl audio_play b _081D535A .align 2, 0 -_081D51CC: .4byte 0x030022c0 + .pool _081D51D0: - ldr r0, _081D51F0 + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 ands r0, r1 @@ -958901,7 +926394,7 @@ _081D51D0: bl sub_81D505C b _081D535A .align 2, 0 -_081D51F0: .4byte 0x030022c0 + .pool _081D51F4: bl sub_800ABAC lsls r0, 24 @@ -958942,7 +926435,7 @@ _081D523C: _081D524C: adds r0, r4, 0 adds r0, 0x9 - ldr r1, _081D5264 + ldr r1, =0x085ee05c bl mevent_0814257C cmp r0, 0 bne _081D525C @@ -958952,25 +926445,22 @@ _081D525C: strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D5264: .4byte 0x085ee05c + .pool _081D5268: - ldr r0, _081D5280 + ldr r0, =0x085ee097 bl sub_8018884 - ldr r0, _081D5284 - ldr r1, _081D5288 - ldr r2, _081D528C + ldr r0, =0x03006370 + ldr r1, =0x089a6550 + ldr r2, =0x089a3470 subs r1, r2 bl sub_81D4D50 movs r0, 0x9 strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D5280: .4byte 0x085ee097 -_081D5284: .4byte 0x03006370 -_081D5288: .4byte 0x089a6550 -_081D528C: .4byte 0x089a3470 + .pool _081D5290: - ldr r0, _081D52A8 + ldr r0, =0x03006370 bl sub_81D4DE8 strb r0, [r4, 0xE] lsls r0, 24 @@ -958982,9 +926472,9 @@ _081D52A0: strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D52A8: .4byte 0x03006370 + .pool _081D52AC: - ldr r0, _081D52D4 + ldr r0, =0x03006370 bl sub_81D4DB8 ldrb r0, [r4, 0xE] cmp r0, 0x3 @@ -958997,14 +926487,13 @@ _081D52BA: _081D52C0: adds r0, r4, 0 bl sub_81D505C - ldr r0, _081D52D8 + ldr r0, =0x085ee120 bl sub_8018884 movs r0, 0xB strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D52D4: .4byte 0x03006370 -_081D52D8: .4byte 0x085ee120 + .pool _081D52DC: movs r1, 0xD2 lsls r1, 2 @@ -959019,14 +926508,14 @@ _081D52EC: b _081D548A _081D52F2: bl sub_81D4E30 - ldr r0, _081D5304 + ldr r0, =0x085ee0dc bl sub_8018884 _081D52FC: movs r0, 0xD strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D5304: .4byte 0x085ee0dc + .pool _081D5308: adds r0, r4, 0 adds r0, 0x9 @@ -959037,12 +926526,12 @@ _081D5308: b _081D548A _081D5318: lsls r0, 2 - ldr r1, _081D5324 + ldr r1, =_081D5328 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081D5324: .4byte _081D5328 + .pool .align 2, 0 _081D5328: .4byte _081D548A @@ -959052,13 +926541,13 @@ _081D5328: .4byte _081D5374 .4byte _081D5360 _081D5340: - ldr r0, _081D534C + ldr r0, =0x085ee097 bl sub_8018884 movs r0, 0xE strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D534C: .4byte 0x085ee097 + .pool _081D5350: movs r0, 0x5 bl audio_play @@ -959092,7 +926581,7 @@ _081D5386: strb r0, [r4, 0x8] b _081D548A _081D5390: - ldr r0, _081D53A4 + ldr r0, =0x0201c000 bl sub_81D3920 strb r0, [r4, 0xE] ldrb r0, [r4, 0xE] @@ -959101,9 +926590,9 @@ _081D5390: strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D53A4: .4byte 0x0201c000 + .pool _081D53A8: - ldr r0, _081D53BC + ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 bne _081D548A @@ -959114,17 +926603,17 @@ _081D53A8: strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D53BC: .4byte 0x03003124 + .pool _081D53C0: movs r0, 0x14 strb r0, [r4, 0x8] b _081D548A _081D53C6: - ldr r0, _081D53E4 + ldr r0, =0x0201c000 bl sub_81D3AB0 cmp r0, 0 beq _081D53EC - ldr r0, _081D53E8 + ldr r0, =0x085ee0fa bl sub_8018884 adds r0, r4, 0 bl sub_81D505C @@ -959132,8 +926621,7 @@ _081D53C6: strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D53E4: .4byte 0x0201c000 -_081D53E8: .4byte 0x085ee0fa + .pool _081D53EC: movs r0, 0x16 strb r0, [r4, 0x8] @@ -959144,7 +926632,7 @@ _081D53F2: bl sub_81D5064 cmp r0, 0 beq _081D548A - ldr r0, _081D5414 + ldr r0, =0x085ee107 bl sub_8018884 movs r0, 0xB9 lsls r0, 1 @@ -959153,23 +926641,23 @@ _081D53F2: strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D5414: .4byte 0x085ee107 + .pool _081D5418: bl task_is_not_running_overworld_fanfare lsls r0, 24 cmp r0, 0 beq _081D548A - ldr r0, _081D542C + ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x3 ands r0, r1 b _081D543A .align 2, 0 -_081D542C: .4byte 0x030022c0 + .pool _081D5430: adds r0, r4, 0 adds r0, 0x9 - ldr r1, _081D5444 + ldr r1, =0x085ee06b bl mevent_0814257C _081D543A: cmp r0, 0 @@ -959178,25 +926666,25 @@ _081D543A: strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D5444: .4byte 0x085ee06b + .pool _081D5448: adds r0, r4, 0 adds r0, 0x9 - ldr r1, _081D5450 + ldr r1, =0x085ee0a3 b _081D5466 .align 2, 0 -_081D5450: .4byte 0x085ee0a3 + .pool _081D5454: adds r0, r4, 0 adds r0, 0x9 - ldr r1, _081D545C + ldr r1, =0x085ee0bf b _081D5466 .align 2, 0 -_081D545C: .4byte 0x085ee0bf + .pool _081D5460: adds r0, r4, 0 adds r0, 0x9 - ldr r1, _081D5474 + ldr r1, =0x085ee12d _081D5466: bl mevent_0814257C cmp r0, 0 @@ -959206,28 +926694,28 @@ _081D546E: strb r0, [r4, 0x8] b _081D548A .align 2, 0 -_081D5474: .4byte 0x085ee12d + .pool _081D5478: ldr r0, [r4, 0x10] bl free adds r0, r5, 0 bl remove_task - ldr r0, _081D5490 + ldr r0, =sub_80186A4 + 1 bl set_callback2 _081D548A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081D5490: .4byte sub_80186A4 + 1 + .pool thumb_func_end sub_81D5084 thumb_func_start sp194_trainer_tower sp194_trainer_tower: @ 81D5494 push {lr} bl sub_81D56B0 - ldr r1, _081D54B4 - ldr r0, _081D54B8 + ldr r1, =0x0862a618 + ldr r0, =0x020375e0 ldrh r0, [r0] lsls r0, 2 adds r0, r1 @@ -959237,16 +926725,15 @@ sp194_trainer_tower: @ 81D5494 pop {r0} bx r0 .align 2, 0 -_081D54B4: .4byte 0x0862a618 -_081D54B8: .4byte 0x020375e0 + .pool thumb_func_end sp194_trainer_tower thumb_func_start sub_81D54BC sub_81D54BC: @ 81D54BC push {r4-r6,lr} - ldr r4, _081D5508 + ldr r4, =0x03005d90 ldr r1, [r4] - ldr r3, _081D550C + ldr r3, =0x00000ef9 adds r1, r3 ldrb r2, [r1] movs r0, 0x7F @@ -959259,19 +926746,19 @@ sub_81D54BC: @ 81D54BC negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r2, _081D5510 + ldr r2, =0x03005d8c ldr r0, [r2] - ldr r1, _081D5514 + ldr r1, =0x00003d68 adds r0, r1 movs r1, 0 str r1, [r0] adds r6, r2, 0 - ldr r5, _081D5518 + ldr r5, =0x00003718 movs r4, 0x3 _081D54EE: ldr r0, [r6] adds r0, r5 - ldr r1, _081D551C + ldr r1, =0x00034bbf bl sub_81D5DF4 adds r5, 0x4 subs r4, 0x1 @@ -959281,24 +926768,19 @@ _081D54EE: pop {r0} bx r0 .align 2, 0 -_081D5508: .4byte 0x03005d90 -_081D550C: .4byte 0x00000ef9 -_081D5510: .4byte 0x03005d8c -_081D5514: .4byte 0x00003d68 -_081D5518: .4byte 0x00003718 -_081D551C: .4byte 0x00034bbf + .pool thumb_func_end sub_81D54BC thumb_func_start sub_81D5520 sub_81D5520: @ 81D5520 - ldr r0, _081D552C + ldr r0, =0x02037318 ldrb r0, [r0, 0x12] adds r0, 0x61 lsls r0, 24 lsrs r0, 24 bx lr .align 2, 0 -_081D552C: .4byte 0x02037318 + .pool thumb_func_end sub_81D5520 thumb_func_start sub_81D5530 @@ -959308,8 +926790,8 @@ sub_81D5530: @ 81D5530 lsls r1, 24 adds r0, r1 lsrs r0, 24 - ldr r2, _081D554C - ldr r1, _081D5550 + ldr r2, =0x0831f5ca + ldr r1, =0x0203cf58 ldr r1, [r1] adds r1, 0x16 adds r1, r0 @@ -959318,8 +926800,7 @@ sub_81D5530: @ 81D5530 ldrb r0, [r0] bx lr .align 2, 0 -_081D554C: .4byte 0x0831f5ca -_081D5550: .4byte 0x0203cf58 + .pool thumb_func_end sub_81D5530 thumb_func_start sub_81D5554 @@ -959332,7 +926813,7 @@ sub_81D5554: @ 81D5554 adds r1, r0 lsrs r1, 24 movs r3, 0 - ldr r0, _081D5584 + ldr r0, =0x0203cf58 ldr r2, [r0] movs r0, 0xB muls r0, r1 @@ -959349,7 +926830,7 @@ _081D556E: pop {r0} bx r0 .align 2, 0 -_081D5584: .4byte 0x0203cf58 + .pool thumb_func_end sub_81D5554 thumb_func_start sub_81D5588 @@ -959362,7 +926843,7 @@ sub_81D5588: @ 81D5588 subs r4, 0x1 lsls r4, 24 lsrs r4, 24 - ldr r0, _081D55C8 + ldr r0, =0x0203cf54 ldr r3, [r0] lsls r1, r4, 2 adds r1, r4 @@ -959378,15 +926859,14 @@ sub_81D5588: @ 81D5588 adds r3, r0 ldrb r4, [r3, 0x1B] bl sub_81D5710 - ldr r0, _081D55CC + ldr r0, =0x0831f578 adds r4, r0 ldrb r0, [r4] pop {r4} pop {r1} bx r1 .align 2, 0 -_081D55C8: .4byte 0x0203cf54 -_081D55CC: .4byte 0x0831f578 + .pool thumb_func_end sub_81D5588 thumb_func_start sub_81D55D0 @@ -959397,12 +926877,12 @@ sub_81D55D0: @ 81D55D0 mov r5, r8 push {r5-r7} bl sub_81D56B0 - ldr r4, _081D5684 + ldr r4, =0x0203cf58 movs r0, 0x18 bl malloc_and_clear str r0, [r4] movs r6, 0 - ldr r0, _081D5688 + ldr r0, =0x0203cf54 mov r10, r0 _081D55EE: movs r5, 0 @@ -959420,7 +926900,7 @@ _081D55EE: adds r0, r6 lsls r7, r0, 3 _081D560A: - ldr r0, _081D5684 + ldr r0, =0x0203cf58 ldr r4, [r0] mov r1, r12 adds r0, r5, r1 @@ -959442,7 +926922,7 @@ _081D560A: adds r5, 0x1 cmp r5, 0xA ble _081D560A - ldr r1, _081D5684 + ldr r1, =0x0203cf58 ldr r4, [r1] adds r4, 0x16 adds r4, r6 @@ -959465,9 +926945,9 @@ _081D560A: mov r6, r9 cmp r6, 0x1 ble _081D55EE - ldr r1, _081D568C + ldr r1, =0x03005d8c ldr r0, [r1] - ldr r1, _081D5690 + ldr r1, =0x00003d64 adds r0, r1 bl sub_80008DC bl sub_81D5710 @@ -959479,16 +926959,13 @@ _081D560A: pop {r0} bx r0 .align 2, 0 -_081D5684: .4byte 0x0203cf58 -_081D5688: .4byte 0x0203cf54 -_081D568C: .4byte 0x03005d8c -_081D5690: .4byte 0x00003d64 + .pool thumb_func_end sub_81D55D0 thumb_func_start sub_81D5694 sub_81D5694: @ 81D5694 push {r4,lr} - ldr r4, _081D56AC + ldr r4, =0x0203cf58 ldr r0, [r4] cmp r0, 0 beq _081D56A6 @@ -959500,27 +926977,27 @@ _081D56A6: pop {r0} bx r0 .align 2, 0 -_081D56AC: .4byte 0x0203cf58 + .pool thumb_func_end sub_81D5694 thumb_func_start sub_81D56B0 sub_81D56B0: @ 81D56B0 push {r4,lr} - ldr r4, _081D56F4 + ldr r4, =0x0203cf54 ldr r0, [r4] cmp r0, 0 bne _081D56EC - ldr r0, _081D56F8 + ldr r0, =0x00000eec bl malloc_and_clear str r0, [r4] - ldr r1, _081D56FC + ldr r1, =0x02037318 ldrb r1, [r1, 0x12] adds r1, 0x61 strb r1, [r0] - ldr r1, _081D5700 - ldr r0, _081D5704 + ldr r1, =0x0862a5f8 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r2, _081D5708 + ldr r2, =0x00003d6e adds r0, r2 ldrb r0, [r0] lsrs r0, 6 @@ -959529,7 +927006,7 @@ sub_81D56B0: @ 81D56B0 ldr r0, [r0] ldr r1, [r4] adds r1, 0x4 - ldr r2, _081D570C + ldr r2, =0x040003ba bl CpuSet bl nullsub_2 _081D56EC: @@ -959537,19 +927014,13 @@ _081D56EC: pop {r0} bx r0 .align 2, 0 -_081D56F4: .4byte 0x0203cf54 -_081D56F8: .4byte 0x00000eec -_081D56FC: .4byte 0x02037318 -_081D5700: .4byte 0x0862a5f8 -_081D5704: .4byte 0x03005d8c -_081D5708: .4byte 0x00003d6e -_081D570C: .4byte 0x040003ba + .pool thumb_func_end sub_81D56B0 thumb_func_start sub_81D5710 sub_81D5710: @ 81D5710 push {r4,lr} - ldr r4, _081D5728 + ldr r4, =0x0203cf54 ldr r0, [r4] cmp r0, 0 beq _081D5722 @@ -959561,7 +927032,7 @@ _081D5722: pop {r0} bx r0 .align 2, 0 -_081D5728: .4byte 0x0203cf54 + .pool thumb_func_end sub_81D5710 thumb_func_start sub_81D572C @@ -959594,7 +927065,7 @@ _081D575A: beq _081D57E8 b _081D580E _081D5764: - ldr r0, _081D578C + ldr r0, =0x0203cf54 lsls r1, r2, 4 subs r1, r2 lsls r1, 3 @@ -959614,9 +927085,9 @@ _081D5764: bl sub_81638AC b _081D580E .align 2, 0 -_081D578C: .4byte 0x0203cf54 + .pool _081D5790: - ldr r0, _081D57B8 + ldr r0, =0x0203cf54 lsls r1, r2, 4 subs r1, r2 lsls r1, 3 @@ -959636,9 +927107,9 @@ _081D5790: bl sub_81638AC b _081D580E .align 2, 0 -_081D57B8: .4byte 0x0203cf54 + .pool _081D57BC: - ldr r0, _081D57E4 + ldr r0, =0x0203cf54 lsls r1, r2, 4 subs r1, r2 lsls r1, 3 @@ -959658,9 +927129,9 @@ _081D57BC: bl sub_81638AC b _081D580E .align 2, 0 -_081D57E4: .4byte 0x0203cf54 + .pool _081D57E8: - ldr r0, _081D5818 + ldr r0, =0x0203cf54 lsls r1, r2, 4 subs r1, r2 lsls r1, 3 @@ -959684,7 +927155,7 @@ _081D580E: pop {r0} bx r0 .align 2, 0 -_081D5818: .4byte 0x0203cf54 + .pool thumb_func_end sub_81D572C thumb_func_start sub_81D581C @@ -959694,21 +927165,20 @@ sub_81D581C: @ 81D581C bl sub_81D3B34 cmp r0, 0 bne _081D5844 - ldr r3, _081D583C + ldr r3, =0x03005d8c ldr r1, [r3] - ldr r0, _081D5840 + ldr r0, =0x00003d6e adds r1, r0 ldrb r0, [r1] movs r2, 0x20 orrs r0, r2 b _081D5854 .align 2, 0 -_081D583C: .4byte 0x03005d8c -_081D5840: .4byte 0x00003d6e + .pool _081D5844: - ldr r3, _081D58C0 + ldr r3, =0x03005d8c ldr r1, [r3] - ldr r0, _081D58C4 + ldr r0, =0x00003d6e adds r1, r0 ldrb r2, [r1] movs r0, 0x21 @@ -959718,18 +927188,18 @@ _081D5854: strb r0, [r1] adds r6, r3, 0 ldr r0, [r6] - ldr r1, _081D58C8 + ldr r1, =0x00003d6c adds r0, r1 movs r5, 0 strb r5, [r0] ldr r0, [r6] - ldr r4, _081D58CC + ldr r4, =0x00003d64 adds r0, r4 bl sub_80008DC ldr r1, [r6] adds r4, r1, r4 str r5, [r4] - ldr r3, _081D58C4 + ldr r3, =0x00003d6e adds r1, r3 ldrb r2, [r1] movs r0, 0x5 @@ -959750,13 +927220,13 @@ _081D5854: negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r0, _081D58D0 + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xEE lsls r1, 4 adds r0, r1 strb r5, [r0] - ldr r0, _081D58D4 + ldr r0, =0x0202433a strb r5, [r0] ldr r1, [r6] adds r1, r3 @@ -959769,24 +927239,19 @@ _081D5854: pop {r0} bx r0 .align 2, 0 -_081D58C0: .4byte 0x03005d8c -_081D58C4: .4byte 0x00003d6e -_081D58C8: .4byte 0x00003d6c -_081D58CC: .4byte 0x00003d64 -_081D58D0: .4byte 0x03005d90 -_081D58D4: .4byte 0x0202433a + .pool thumb_func_end sub_81D581C thumb_func_start sub_81D58D8 sub_81D58D8: @ 81D58D8 push {lr} bl sub_80008E8 - ldr r3, _081D5918 + ldr r3, =0x020375f0 movs r0, 0 strh r0, [r3] - ldr r0, _081D591C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081D5920 + ldr r1, =0x00003d6e adds r2, r0, r1 ldrb r1, [r2] movs r0, 0x4 @@ -959812,9 +927277,7 @@ _081D590A: pop {r0} bx r0 .align 2, 0 -_081D5918: .4byte 0x020375f0 -_081D591C: .4byte 0x03005d8c -_081D5920: .4byte 0x00003d6e + .pool thumb_func_end sub_81D58D8 thumb_func_start sub_81D5924 @@ -959825,15 +927288,15 @@ sub_81D5924: @ 81D5924 bl sub_81D6640 lsls r0, 16 lsrs r5, r0, 16 - ldr r0, _081D595C + ldr r0, =0x0203cf54 ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0x4 bne _081D5952 - ldr r0, _081D5960 + ldr r0, =0x03005d8c mov r8, r0 ldr r0, [r0] - ldr r7, _081D5964 + ldr r7, =0x00003d6e adds r0, r7 ldrb r0, [r0] movs r6, 0x1 @@ -959842,15 +927305,12 @@ sub_81D5924: @ 81D5924 cmp r4, 0 beq _081D596C _081D5952: - ldr r1, _081D5968 + ldr r1, =0x020375f0 movs r0, 0x2 strh r0, [r1] b _081D59C0 .align 2, 0 -_081D595C: .4byte 0x0203cf54 -_081D5960: .4byte 0x03005d8c -_081D5964: .4byte 0x00003d6e -_081D5968: .4byte 0x020375f0 + .pool _081D596C: adds r0, r5, 0 movs r1, 0x1 @@ -959859,7 +927319,7 @@ _081D596C: lsrs r0, 24 cmp r0, 0x1 bne _081D59BC - ldr r1, _081D59AC + ldr r1, =0x02021dc4 adds r0, r5, 0 bl itemid_get_name mov r0, r8 @@ -959869,25 +927329,22 @@ _081D596C: movs r2, 0x1 orrs r0, r2 strb r0, [r1] - ldr r0, _081D59B0 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _081D59B4 + ldr r0, =0x00000ef9 adds r1, r0 ldrb r2, [r1] movs r0, 0x80 negs r0, r0 ands r0, r2 strb r0, [r1] - ldr r0, _081D59B8 + ldr r0, =0x020375f0 strh r4, [r0] b _081D59C0 .align 2, 0 -_081D59AC: .4byte 0x02021dc4 -_081D59B0: .4byte 0x03005d90 -_081D59B4: .4byte 0x00000ef9 -_081D59B8: .4byte 0x020375f0 + .pool _081D59BC: - ldr r0, _081D59CC + ldr r0, =0x020375f0 strh r6, [r0] _081D59C0: pop {r3} @@ -959896,15 +927353,15 @@ _081D59C0: pop {r0} bx r0 .align 2, 0 -_081D59CC: .4byte 0x020375f0 + .pool thumb_func_end sub_81D5924 thumb_func_start sub_81D59D0 sub_81D59D0: @ 81D59D0 push {r4-r6,lr} - ldr r4, _081D59F0 + ldr r4, =0x03005d8c ldr r2, [r4] - ldr r6, _081D59F4 + ldr r6, =0x00003d6e adds r0, r2, r6 ldrb r1, [r0] movs r3, 0x2 @@ -959914,19 +927371,17 @@ sub_81D59D0: @ 81D59D0 lsrs r5, r0, 24 cmp r5, 0 beq _081D59FC - ldr r0, _081D59F8 + ldr r0, =0x020375f0 strh r3, [r0] b _081D5A4E .align 2, 0 -_081D59F0: .4byte 0x03005d8c -_081D59F4: .4byte 0x00003d6e -_081D59F8: .4byte 0x020375f0 + .pool _081D59FC: - ldr r1, _081D5A38 + ldr r1, =0x00003d68 adds r0, r2, r1 bl free_203F458 ldr r2, [r4] - ldr r3, _081D5A3C + ldr r3, =0x00003d64 adds r1, r2, r3 ldr r1, [r1] cmp r0, r1 @@ -959939,29 +927394,26 @@ _081D59FC: ldrb r0, [r0] lsrs r0, 6 lsls r0, 2 - ldr r3, _081D5A40 + ldr r3, =0x00003718 adds r1, r2, r3 adds r1, r0 - ldr r0, _081D5A38 + ldr r0, =0x00003d68 adds r2, r0 ldr r0, [r2] str r0, [r1] - ldr r0, _081D5A44 + ldr r0, =0x020375f0 strh r5, [r0] b _081D5A4E .align 2, 0 -_081D5A38: .4byte 0x00003d68 -_081D5A3C: .4byte 0x00003d64 -_081D5A40: .4byte 0x00003718 -_081D5A44: .4byte 0x020375f0 + .pool _081D5A48: - ldr r1, _081D5A64 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] _081D5A4E: - ldr r0, _081D5A68 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r3, _081D5A6C + ldr r3, =0x00003d6e adds r1, r3 ldrb r0, [r1] movs r2, 0x2 @@ -959971,37 +927423,32 @@ _081D5A4E: pop {r0} bx r0 .align 2, 0 -_081D5A64: .4byte 0x020375f0 -_081D5A68: .4byte 0x03005d8c -_081D5A6C: .4byte 0x00003d6e + .pool thumb_func_end sub_81D59D0 thumb_func_start sub_81D5A70 sub_81D5A70: @ 81D5A70 push {lr} - ldr r0, _081D5A98 + ldr r0, =0x03005d8c ldr r2, [r0] - ldr r1, _081D5A9C + ldr r1, =0x00003d6e adds r0, r2, r1 ldrb r1, [r0] movs r0, 0x4 ands r0, r1 cmp r0, 0 bne _081D5AAE - ldr r0, _081D5AA0 + ldr r0, =0x00003d64 adds r2, r0 ldr r1, [r2] - ldr r0, _081D5AA4 + ldr r0, =0x00034bbe cmp r1, r0 bls _081D5AA8 adds r0, 0x1 str r0, [r2] b _081D5AAE .align 2, 0 -_081D5A98: .4byte 0x03005d8c -_081D5A9C: .4byte 0x00003d6e -_081D5AA0: .4byte 0x00003d64 -_081D5AA4: .4byte 0x00034bbe + .pool _081D5AA8: adds r0, r2, 0 bl sub_80008DC @@ -960012,9 +927459,9 @@ _081D5AAE: thumb_func_start sub_81D5AB4 sub_81D5AB4: @ 81D5AB4 - ldr r0, _081D5AC8 + ldr r0, =0x03005d8c ldr r1, [r0] - ldr r0, _081D5ACC + ldr r0, =0x00003d6e adds r1, r0 ldrb r0, [r1] movs r2, 0x8 @@ -960022,16 +927469,15 @@ sub_81D5AB4: @ 81D5AB4 strb r0, [r1] bx lr .align 2, 0 -_081D5AC8: .4byte 0x03005d8c -_081D5ACC: .4byte 0x00003d6e + .pool thumb_func_end sub_81D5AB4 thumb_func_start sub_81D5AD0 sub_81D5AD0: @ 81D5AD0 push {lr} - ldr r0, _081D5AF4 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081D5AF8 + ldr r1, =0x00003d6e adds r2, r0, r1 ldrb r1, [r2] movs r0, 0x8 @@ -960042,13 +927488,11 @@ sub_81D5AD0: @ 81D5AD0 negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r1, _081D5AFC + ldr r1, =0x020375f0 movs r0, 0 b _081D5B20 .align 2, 0 -_081D5AF4: .4byte 0x03005d8c -_081D5AF8: .4byte 0x00003d6e -_081D5AFC: .4byte 0x020375f0 + .pool _081D5B00: movs r0, 0x10 ands r0, r1 @@ -960058,34 +927502,34 @@ _081D5B00: negs r0, r0 ands r0, r1 strb r0, [r2] - ldr r1, _081D5B18 + ldr r1, =0x020375f0 movs r0, 0x1 b _081D5B20 .align 2, 0 -_081D5B18: .4byte 0x020375f0 + .pool _081D5B1C: - ldr r1, _081D5B28 + ldr r1, =0x020375f0 movs r0, 0x2 _081D5B20: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_081D5B28: .4byte 0x020375f0 + .pool thumb_func_end sub_81D5AD0 thumb_func_start sub_81D5B2C sub_81D5B2C: @ 81D5B2C push {r4-r7,lr} - ldr r0, _081D5BA0 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081D5BA4 + ldr r1, =0x00003d64 adds r0, r1 ldr r7, [r0] - ldr r0, _081D5BA8 + ldr r0, =0x00034bbe cmp r7, r0 ble _081D5B40 - ldr r7, _081D5BAC + ldr r7, =0x00034bbf _081D5B40: movs r4, 0xE1 lsls r4, 4 @@ -960109,17 +927553,17 @@ _081D5B40: movs r1, 0x64 bl __divsi3 adds r4, r0, 0 - ldr r0, _081D5BB0 + ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0x1 movs r3, 0x2 bl decimal_int_to_string - ldr r0, _081D5BB4 + ldr r0, =0x02021dc4 adds r1, r5, 0 movs r2, 0x1 movs r3, 0x2 bl decimal_int_to_string - ldr r0, _081D5BB8 + ldr r0, =0x02021ec4 adds r1, r4, 0 movs r2, 0x2 movs r3, 0x2 @@ -960128,38 +927572,30 @@ _081D5B40: pop {r0} bx r0 .align 2, 0 -_081D5BA0: .4byte 0x03005d8c -_081D5BA4: .4byte 0x00003d64 -_081D5BA8: .4byte 0x00034bbe -_081D5BAC: .4byte 0x00034bbf -_081D5BB0: .4byte 0x02021cc4 -_081D5BB4: .4byte 0x02021dc4 -_081D5BB8: .4byte 0x02021ec4 + .pool thumb_func_end sub_81D5B2C thumb_func_start sub_81D5BBC sub_81D5BBC: @ 81D5BBC push {lr} bl sub_81D56B0 - ldr r0, _081D5BE0 + ldr r0, =0x0203cf54 ldr r1, [r0] ldrb r0, [r1, 0x6] cmp r0, 0x4 beq _081D5BEC - ldr r0, _081D5BE4 + ldr r0, =0x02021cc4 ldrb r1, [r1, 0x6] movs r2, 0 movs r3, 0x1 bl decimal_int_to_string - ldr r1, _081D5BE8 + ldr r1, =0x020375f0 movs r0, 0 b _081D5BF0 .align 2, 0 -_081D5BE0: .4byte 0x0203cf54 -_081D5BE4: .4byte 0x02021cc4 -_081D5BE8: .4byte 0x020375f0 + .pool _081D5BEC: - ldr r1, _081D5BFC + ldr r1, =0x020375f0 movs r0, 0x1 _081D5BF0: strh r0, [r1] @@ -960167,34 +927603,34 @@ _081D5BF0: pop {r0} bx r0 .align 2, 0 -_081D5BFC: .4byte 0x020375f0 + .pool thumb_func_end sub_81D5BBC thumb_func_start sub_81D5C00 sub_81D5C00: @ 81D5C00 push {lr} bl sub_81D56B0 - ldr r1, _081D5C14 + ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] bl sub_81D5710 pop {r0} bx r0 .align 2, 0 -_081D5C14: .4byte 0x020375f0 + .pool thumb_func_end sub_81D5C00 thumb_func_start sub_81D5C18 sub_81D5C18: @ 81D5C18 push {lr} - ldr r0, _081D5C48 + ldr r0, =0x000040d6 bl var_get lsls r0, 16 cmp r0, 0 beq _081D5C42 - ldr r0, _081D5C4C + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081D5C50 + ldr r1, =0x00003d6e adds r0, r1 ldrb r1, [r0] movs r0, 0x4 @@ -960209,9 +927645,7 @@ _081D5C42: movs r0, 0 b _081D5C56 .align 2, 0 -_081D5C48: .4byte 0x000040d6 -_081D5C4C: .4byte 0x03005d8c -_081D5C50: .4byte 0x00003d6e + .pool _081D5C54: movs r0, 0x1 _081D5C56: @@ -960227,20 +927661,20 @@ sub_81D5C5C: @ 81D5C5C lsrs r1, r0, 24 cmp r1, 0 bne _081D5C74 - ldr r0, _081D5C70 + ldr r0, =0x020375f0 strh r1, [r0] b _081D5C7A .align 2, 0 -_081D5C70: .4byte 0x020375f0 + .pool _081D5C74: - ldr r1, _081D5C80 + ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] _081D5C7A: pop {r0} bx r0 .align 2, 0 -_081D5C80: .4byte 0x020375f0 + .pool thumb_func_end sub_81D5C5C thumb_func_start nullsub_129 @@ -960265,14 +927699,14 @@ sub_81D5C8C: @ 81D5C8C movs r0, 0 movs r1, 0 bl Window_FastFillPixels - ldr r5, _081D5DC4 + ldr r5, =0x085ef88a movs r0, 0x1 adds r1, r5, 0 movs r2, 0xD0 bl sub_81DB35C lsls r2, r0, 24 lsrs r2, 24 - ldr r6, _081D5DC8 + ldr r6, =0x0862a5f4 str r6, [sp] movs r4, 0x1 negs r4, r4 @@ -960286,16 +927720,16 @@ sub_81D5C8C: @ 81D5C8C movs r0, 0 mov r8, r0 mov r10, r4 - ldr r1, _081D5DCC + ldr r1, =0x02021fc4 mov r9, r1 _081D5CD6: lsls r3, r7, 24 lsrs r3, 24 - ldr r0, _081D5DC8 + ldr r0, =0x0862a5f4 str r0, [sp] mov r1, r10 str r1, [sp, 0x4] - ldr r0, _081D5DD0 + ldr r0, =0x0862a660 mov r1, r8 lsls r4, r1, 2 adds r0, r4, r0 @@ -960306,8 +927740,8 @@ _081D5CD6: movs r2, 0 bl box_print adds r7, 0xF - ldr r0, _081D5DD4 - ldr r1, _081D5DD8 + ldr r0, =0x03005d8c + ldr r1, =0x00003718 adds r4, r1 ldr r0, [r0] adds r0, r4 @@ -960322,7 +927756,7 @@ _081D5CD6: adds r1, r5, 0 bl __umodsi3 adds r5, r0, 0 - ldr r0, _081D5DDC + ldr r0, =0x02021cc4 adds r1, r6, 0 movs r2, 0x1 movs r3, 0x2 @@ -960335,7 +927769,7 @@ _081D5CD6: movs r1, 0x3C bl __umodsi3 adds r5, r0, 0 - ldr r0, _081D5DE0 + ldr r0, =0x02021dc4 adds r1, r4, 0 movs r2, 0x1 movs r3, 0x2 @@ -960345,14 +927779,14 @@ _081D5CD6: movs r1, 0x64 bl __udivsi3 adds r1, r0, 0 - ldr r0, _081D5DE4 + ldr r0, =0x02021ec4 movs r2, 0x2 movs r3, 0x2 bl decimal_int_to_string mov r0, r9 - ldr r1, _081D5DE8 + ldr r1, =0x085ef895 bl gf_strcpy - ldr r1, _081D5DEC + ldr r1, =0x085ef8a3 bl ExpandTextCodes movs r0, 0x1 mov r1, r9 @@ -960362,7 +927796,7 @@ _081D5CD6: lsrs r2, 24 lsls r3, r7, 24 lsrs r3, 24 - ldr r0, _081D5DC8 + ldr r0, =0x0862a5f4 str r0, [sp] mov r1, r10 str r1, [sp, 0x4] @@ -960392,17 +927826,7 @@ _081D5CD6: pop {r0} bx r0 .align 2, 0 -_081D5DC4: .4byte 0x085ef88a -_081D5DC8: .4byte 0x0862a5f4 -_081D5DCC: .4byte 0x02021fc4 -_081D5DD0: .4byte 0x0862a660 -_081D5DD4: .4byte 0x03005d8c -_081D5DD8: .4byte 0x00003718 -_081D5DDC: .4byte 0x02021cc4 -_081D5DE0: .4byte 0x02021dc4 -_081D5DE4: .4byte 0x02021ec4 -_081D5DE8: .4byte 0x085ef895 -_081D5DEC: .4byte 0x085ef8a3 + .pool thumb_func_end sub_81D5C8C thumb_func_start free_203F458 @@ -960425,7 +927849,7 @@ sub_81D5DF8: @ 81D5DF8 mov r5, r8 push {r5-r7} sub sp, 0x8 - ldr r0, _081D5F20 + ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0xC7 lsls r1, 4 @@ -960436,9 +927860,9 @@ sub_81D5DF8: @ 81D5DF8 beq _081D5F0E bl sub_81D56B0 movs r7, 0 - ldr r4, _081D5F24 - ldr r3, _081D5F28 - ldr r0, _081D5F2C + ldr r4, =0x03005d90 + ldr r3, =0x00000cb4 + ldr r0, =0x0000ffff adds r2, r0, 0 _081D5E26: ldr r1, [r4] @@ -960455,12 +927879,12 @@ _081D5E26: bls _081D5E26 movs r0, 0 str r0, [sp] - ldr r0, _081D5F20 + ldr r0, =0x03005d8c ldr r1, [r0] movs r2, 0xC7 lsls r2, 4 adds r1, r2 - ldr r2, _081D5F30 + ldr r2, =0x05000180 mov r0, sp bl CpuSet bl sub_81D5520 @@ -960468,7 +927892,7 @@ _081D5E26: lsrs r0, 24 mov r9, r0 movs r7, 0 - ldr r3, _081D5F34 + ldr r3, =0x0203cf54 mov r10, r3 _081D5E64: lsls r4, r7, 1 @@ -960478,7 +927902,7 @@ _081D5E64: ldr r0, [sp, 0x4] adds r5, r0 adds r1, r5, 0 - ldr r0, _081D5F38 + ldr r0, =0x0862a670 ldm r0!, {r2-r4} stm r1!, {r2-r4} ldm r0!, {r2-r4} @@ -960523,7 +927947,7 @@ _081D5E64: lsls r1, r7, 26 lsrs r1, 24 adds r3, r4 - ldr r2, _081D5F3C + ldr r2, =0x000003c2 adds r3, r2 ldrb r0, [r3] asrs r0, r1 @@ -960534,18 +927958,18 @@ _081D5E64: mov r2, r10 ldr r0, [r2] adds r0, r4 - ldr r3, _081D5F40 + ldr r3, =0x000003c3 adds r0, r3 ldrb r0, [r0] asrs r0, r1 movs r1, 0xF ands r0, r1 strh r0, [r5, 0xE] - ldr r0, _081D5F44 + ldr r0, =0x082c83f0 str r0, [r5, 0x10] - ldr r0, _081D5F24 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r4, _081D5F28 + ldr r4, =0x00000cb4 adds r0, r4 add r0, r8 strh r6, [r0] @@ -960564,16 +927988,7 @@ _081D5F0E: pop {r0} bx r0 .align 2, 0 -_081D5F20: .4byte 0x03005d8c -_081D5F24: .4byte 0x03005d90 -_081D5F28: .4byte 0x00000cb4 -_081D5F2C: .4byte 0x0000ffff -_081D5F30: .4byte 0x05000180 -_081D5F34: .4byte 0x0203cf54 -_081D5F38: .4byte 0x0862a670 -_081D5F3C: .4byte 0x000003c2 -_081D5F40: .4byte 0x000003c3 -_081D5F44: .4byte 0x082c83f0 + .pool thumb_func_end sub_81D5DF8 thumb_func_start sub_81D5F48 @@ -960591,7 +928006,7 @@ sub_81D5F58: @ 81D5F58 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _081D5FB0 + ldr r4, =0x0203cf54 ldr r4, [r4] mov r12, r4 lsls r4, r2, 1 @@ -960632,7 +928047,7 @@ sub_81D5F58: @ 81D5F58 pop {r1} bx r1 .align 2, 0 -_081D5FB0: .4byte 0x0203cf54 + .pool thumb_func_end sub_81D5F58 thumb_func_start sub_81D5FB4 @@ -960663,10 +928078,10 @@ _081D5FE6: lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _081D606C + ldr r0, =0x02037318 ldr r0, [r0] ldr r2, [r0, 0xC] - ldr r1, _081D6070 + ldr r1, =0x03005dc0 str r4, [r1, 0x8] movs r0, 0x1F str r0, [r1] @@ -960727,15 +928142,14 @@ _081D605E: pop {r0} bx r0 .align 2, 0 -_081D606C: .4byte 0x02037318 -_081D6070: .4byte 0x03005dc0 + .pool thumb_func_end sub_81D5FB4 thumb_func_start sub_81D6074 sub_81D6074: @ 81D6074 push {lr} - ldr r1, _081D6094 - ldr r2, _081D6098 + ldr r1, =0x02037318 + ldr r2, =0xfffffe61 adds r0, r2, 0 ldrh r1, [r1, 0x12] adds r0, r1 @@ -960750,23 +928164,21 @@ _081D608C: pop {r1} bx r1 .align 2, 0 -_081D6094: .4byte 0x02037318 -_081D6098: .4byte 0xfffffe61 + .pool thumb_func_end sub_81D6074 thumb_func_start sub_81D609C sub_81D609C: @ 81D609C push {lr} - ldr r0, _081D60AC + ldr r0, =0x02037318 ldrh r2, [r0, 0x12] - ldr r0, _081D60B0 + ldr r0, =0x0000019f cmp r2, r0 bne _081D60B4 movs r1, 0x1 b _081D60F8 .align 2, 0 -_081D60AC: .4byte 0x02037318 -_081D60B0: .4byte 0x0000019f + .pool _081D60B4: movs r0, 0xD0 lsls r0, 1 @@ -960775,13 +928187,13 @@ _081D60B4: movs r1, 0x2 b _081D60F8 _081D60C0: - ldr r0, _081D60CC + ldr r0, =0x000001a1 cmp r2, r0 bne _081D60D0 movs r1, 0x3 b _081D60F8 .align 2, 0 -_081D60CC: .4byte 0x000001a1 + .pool _081D60D0: movs r0, 0xD1 lsls r0, 1 @@ -960790,13 +928202,13 @@ _081D60D0: movs r1, 0x4 b _081D60F8 _081D60DC: - ldr r0, _081D60E8 + ldr r0, =0x000001a3 cmp r2, r0 bne _081D60EC movs r1, 0x5 b _081D60F8 .align 2, 0 -_081D60E8: .4byte 0x000001a3 + .pool _081D60EC: movs r0, 0xCF lsls r0, 1 @@ -960813,9 +928225,9 @@ _081D60F8: thumb_func_start sub_81D6100 sub_81D6100: @ 81D6100 push {lr} - ldr r0, _081D6118 + ldr r0, =0x02037318 ldrh r1, [r0, 0x12] - ldr r0, _081D611C + ldr r0, =0x000001a3 movs r2, 0 cmp r1, r0 bne _081D6110 @@ -960825,8 +928237,7 @@ _081D6110: pop {r1} bx r1 .align 2, 0 -_081D6118: .4byte 0x02037318 -_081D611C: .4byte 0x000001a3 + .pool thumb_func_end sub_81D6100 thumb_func_start sub_81D6120 @@ -960849,13 +928260,13 @@ sub_81D6134: @ 81D6134 lsrs r0, 24 cmp r0, 0x1 bne _081D614C - ldr r0, _081D6148 + ldr r0, =0x02037318 ldr r0, [r0, 0x4] ldr r0, [r0, 0x8] adds r0, 0x8 b _081D6176 .align 2, 0 -_081D6148: .4byte 0x02037318 + .pool _081D614C: bl sub_81D6490 lsls r0, 24 @@ -960868,7 +928279,7 @@ _081D614C: bls _081D6162 movs r2, 0x4 _081D6162: - ldr r1, _081D617C + ldr r1, =0x0862a688 subs r0, r2, 0x1 lsls r0, 2 adds r0, r1 @@ -960881,23 +928292,22 @@ _081D6176: pop {r1} bx r1 .align 2, 0 -_081D617C: .4byte 0x0862a688 + .pool thumb_func_end sub_81D6134 thumb_func_start battle_init battle_init: @ 81D6180 lsls r0, 24 - ldr r1, _081D6194 + ldr r1, =0x03005d90 ldr r1, [r1] lsrs r0, 23 adds r1, r0 - ldr r0, _081D6198 + ldr r0, =0x00000cb2 adds r1, r0 ldrh r0, [r1] bx lr .align 2, 0 -_081D6194: .4byte 0x03005d90 -_081D6198: .4byte 0x00000cb2 + .pool thumb_func_end battle_init thumb_func_start sub_81D619C @@ -960909,7 +928319,7 @@ sub_81D619C: @ 81D619C bl sub_81D5520 lsls r0, 24 lsrs r0, 23 - ldr r2, _081D61DC + ldr r2, =0x02037350 lsls r1, r4, 3 adds r1, r4 lsls r1, 2 @@ -960918,12 +928328,12 @@ sub_81D619C: @ 81D619C ldrb r1, [r1, 0x8] adds r0, r1 lsls r0, 24 - ldr r1, _081D61E0 + ldr r1, =0x03005d90 ldr r1, [r1] movs r2, 0xEE lsls r2, 4 adds r1, r2 - ldr r2, _081D61E4 + ldr r2, =0x0832a328 lsrs r0, 22 adds r0, r2 ldr r0, [r0] @@ -960933,9 +928343,7 @@ sub_81D619C: @ 81D619C pop {r1} bx r1 .align 2, 0 -_081D61DC: .4byte 0x02037350 -_081D61E0: .4byte 0x03005d90 -_081D61E4: .4byte 0x0832a328 + .pool thumb_func_end sub_81D619C thumb_func_start sub_81D61E8 @@ -960947,16 +928355,16 @@ sub_81D61E8: @ 81D61E8 lsls r0, 25 lsrs r4, r0, 24 movs r3, 0 - ldr r0, _081D6230 + ldr r0, =0x02038bca mov r8, r0 - ldr r6, _081D6234 - ldr r1, _081D6238 + ldr r6, =0x03005d90 + ldr r1, =0x0832a328 mov r12, r1 adds r5, r6, 0 _081D6204: ldr r2, [r5] lsls r0, r3, 1 - ldr r7, _081D623C + ldr r7, =0x00000cb4 adds r1, r2, r7 adds r1, r0 ldrh r0, [r1] @@ -960976,10 +928384,7 @@ _081D6204: strb r0, [r2] b _081D624A .align 2, 0 -_081D6230: .4byte 0x02038bca -_081D6234: .4byte 0x03005d90 -_081D6238: .4byte 0x0832a328 -_081D623C: .4byte 0x00000cb4 + .pool _081D6240: adds r0, r3, 0x1 lsls r0, 24 @@ -960987,7 +928392,7 @@ _081D6240: cmp r3, 0x1 bls _081D6204 _081D624A: - ldr r0, _081D6288 + ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x80 lsls r1, 8 @@ -960995,13 +928400,13 @@ _081D624A: cmp r0, 0 beq _081D62A2 movs r3, 0 - ldr r5, _081D628C - ldr r0, _081D6290 + ldr r5, =0x02038bcc + ldr r0, =0x0832a328 mov r8, r0 _081D6260: ldr r2, [r6] lsls r0, r3, 1 - ldr r7, _081D6294 + ldr r7, =0x00000cb4 adds r1, r2, r7 adds r1, r0 ldrh r0, [r1] @@ -961020,10 +928425,7 @@ _081D6260: strb r0, [r2] b _081D62A2 .align 2, 0 -_081D6288: .4byte 0x02022fec -_081D628C: .4byte 0x02038bcc -_081D6290: .4byte 0x0832a328 -_081D6294: .4byte 0x00000cb4 + .pool _081D6298: adds r0, r3, 0x1 lsls r0, 24 @@ -961040,16 +928442,16 @@ _081D62A2: thumb_func_start sub_81D62AC sub_81D62AC: @ 81D62AC - ldr r0, _081D62B0 + ldr r0, =0x082c83f0 bx lr .align 2, 0 -_081D62B0: .4byte 0x082c83f0 + .pool thumb_func_end sub_81D62AC thumb_func_start sub_81D62B4 sub_81D62B4: @ 81D62B4 push {lr} - ldr r0, _081D62C8 + ldr r0, =0x020375f2 ldrh r1, [r0] movs r0, 0x5 bl sub_81D572C @@ -961057,7 +928459,7 @@ sub_81D62B4: @ 81D62B4 pop {r0} bx r0 .align 2, 0 -_081D62C8: .4byte 0x020375f2 + .pool thumb_func_end sub_81D62B4 thumb_func_start sub_81D62CC @@ -961092,7 +928494,7 @@ sub_81D62CC: @ 81D62CC adds r0, r5, 0x3 cmp r5, r0 bge _081D6366 - ldr r1, _081D6378 + ldr r1, =0x0862a698 lsls r0, r6, 1 adds r0, r6 adds r7, r0, r1 @@ -961101,7 +928503,7 @@ _081D6316: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 - ldr r0, _081D637C + ldr r0, =0x02024744 adds r4, r0 mov r1, r8 lsls r0, r1, 4 @@ -961110,7 +928512,7 @@ _081D6316: subs r0, r1 lsls r0, 3 adds r0, 0xC - ldr r3, _081D6380 + ldr r3, =0x0203cf54 ldr r1, [r3] adds r1, r0 lsls r0, r6, 2 @@ -961146,42 +928548,39 @@ _081D636A: pop {r0} bx r0 .align 2, 0 -_081D6378: .4byte 0x0862a698 -_081D637C: .4byte 0x02024744 -_081D6380: .4byte 0x0203cf54 + .pool thumb_func_end sub_81D62CC thumb_func_start sub_81D6384 sub_81D6384: @ 81D6384 push {lr} bl zero_enemy_party_data - ldr r0, _081D6398 + ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 bl sub_81D62CC pop {r0} bx r0 .align 2, 0 -_081D6398: .4byte 0x02038bca + .pool thumb_func_end sub_81D6384 thumb_func_start sub_81D639C sub_81D639C: @ 81D639C push {lr} bl zero_enemy_party_data - ldr r0, _081D63BC + ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 bl sub_81D62CC - ldr r0, _081D63C0 + ldr r0, =0x02038bcc ldrh r0, [r0] movs r1, 0x3 bl sub_81D62CC pop {r0} bx r0 .align 2, 0 -_081D63BC: .4byte 0x02038bca -_081D63C0: .4byte 0x02038bcc + .pool thumb_func_end sub_81D639C thumb_func_start sub_81D63C4 @@ -961200,7 +928599,7 @@ sub_81D63C8: @ 81D63C8 subs r4, 0x1 lsls r4, 24 lsrs r4, 24 - ldr r0, _081D6410 + ldr r0, =0x0203cf54 ldr r3, [r0] lsls r1, r4, 2 adds r1, r4 @@ -961217,10 +928616,10 @@ sub_81D63C8: @ 81D63C8 ldrb r4, [r3, 0x1B] bl sub_81D5710 movs r2, 0 - ldr r0, _081D6414 + ldr r0, =0x0831f5ca adds r4, r0 ldrb r3, [r4] - ldr r1, _081D6418 + ldr r1, =0x0862a3b4 _081D6406: ldrb r0, [r1] cmp r0, r3 @@ -961228,9 +928627,7 @@ _081D6406: ldrb r0, [r1, 0x1] b _081D6426 .align 2, 0 -_081D6410: .4byte 0x0203cf54 -_081D6414: .4byte 0x0831f5ca -_081D6418: .4byte 0x0862a3b4 + .pool _081D641C: adds r1, 0x4 adds r2, 0x1 @@ -961256,11 +928653,11 @@ sub_81D642C: @ 81D642C bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - ldr r5, _081D6488 + ldr r5, =0x0831f72c mov r1, sp ldrb r2, [r1] lsls r2, 2 - ldr r3, _081D648C + ldr r3, =0x083203cc lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -961288,15 +928685,14 @@ sub_81D642C: @ 81D642C pop {r0} bx r0 .align 2, 0 -_081D6488: .4byte 0x0831f72c -_081D648C: .4byte 0x083203cc + .pool thumb_func_end sub_81D642C thumb_func_start sub_81D6490 sub_81D6490: @ 81D6490 push {r4,lr} bl sub_81D56B0 - ldr r0, _081D64A8 + ldr r0, =0x0203cf54 ldr r0, [r0] ldrb r4, [r0, 0x6] bl sub_81D5710 @@ -961305,12 +928701,12 @@ sub_81D6490: @ 81D6490 pop {r1} bx r1 .align 2, 0 -_081D64A8: .4byte 0x0203cf54 + .pool thumb_func_end sub_81D6490 thumb_func_start sub_81D64AC sub_81D64AC: @ 81D64AC - ldr r0, _081D64BC + ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0xEE lsls r1, 4 @@ -961319,7 +928715,7 @@ sub_81D64AC: @ 81D64AC strb r1, [r0] bx lr .align 2, 0 -_081D64BC: .4byte 0x03005d90 + .pool thumb_func_end sub_81D64AC thumb_func_start sub_81D64C0 @@ -961328,7 +928724,7 @@ sub_81D64C0: @ 81D64C0 bl sub_81D6534 cmp r0, 0x1 bne _081D64D4 - ldr r0, _081D64D8 + ldr r0, =0x0862a5d4 movs r1, 0x70 movs r2, 0x20 bl gpu_pal_apply @@ -961336,31 +928732,29 @@ _081D64D4: pop {r0} bx r0 .align 2, 0 -_081D64D8: .4byte 0x0862a5d4 + .pool thumb_func_end sub_81D64C0 thumb_func_start sub_81D64DC sub_81D64DC: @ 81D64DC - ldr r1, _081D64F0 - ldr r0, _081D64F4 + ldr r1, =0x020375f0 + ldr r0, =0x03005d90 ldr r0, [r0] - ldr r2, _081D64F8 + ldr r2, =0x00000ef9 adds r0, r2 ldrb r0, [r0] lsrs r0, 7 strh r0, [r1] bx lr .align 2, 0 -_081D64F0: .4byte 0x020375f0 -_081D64F4: .4byte 0x03005d90 -_081D64F8: .4byte 0x00000ef9 + .pool thumb_func_end sub_81D64DC thumb_func_start sub_81D64FC sub_81D64FC: @ 81D64FC - ldr r0, _081D6510 + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _081D6514 + ldr r0, =0x00000ef9 adds r1, r0 ldrb r0, [r1] movs r2, 0x80 @@ -961368,15 +928762,14 @@ sub_81D64FC: @ 81D64FC strb r0, [r1] bx lr .align 2, 0 -_081D6510: .4byte 0x03005d90 -_081D6514: .4byte 0x00000ef9 + .pool thumb_func_end sub_81D64FC thumb_func_start sub_81D6518 sub_81D6518: @ 81D6518 - ldr r0, _081D652C + ldr r0, =0x03005d90 ldr r1, [r0] - ldr r0, _081D6530 + ldr r0, =0x00000ef9 adds r1, r0 ldrb r2, [r1] movs r0, 0x7F @@ -961384,8 +928777,7 @@ sub_81D6518: @ 81D6518 strb r0, [r1] bx lr .align 2, 0 -_081D652C: .4byte 0x03005d90 -_081D6530: .4byte 0x00000ef9 + .pool thumb_func_end sub_81D6518 thumb_func_start sub_81D6534 @@ -961401,14 +928793,14 @@ sub_81D6534: @ 81D6534 cmp r0, 0x6 beq _081D6560 bl sub_81D5C00 - ldr r0, _081D655C + ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 beq _081D6560 movs r0, 0x1 b _081D6562 .align 2, 0 -_081D655C: .4byte 0x020375f0 + .pool _081D6560: movs r0, 0 _081D6562: @@ -961419,40 +928811,38 @@ _081D6562: thumb_func_start sub_81D6568 sub_81D6568: @ 81D6568 push {lr} - ldr r0, _081D6584 + ldr r0, =0x03005d8c ldr r0, [r0] - ldr r1, _081D6588 + ldr r1, =0x00003d6e adds r0, r1 ldrb r1, [r0] movs r0, 0x8 ands r0, r1 cmp r0, 0 beq _081D6590 - ldr r1, _081D658C + ldr r1, =0x020375f0 movs r0, 0 b _081D6594 .align 2, 0 -_081D6584: .4byte 0x03005d8c -_081D6588: .4byte 0x00003d6e -_081D658C: .4byte 0x020375f0 + .pool _081D6590: - ldr r1, _081D659C + ldr r1, =0x020375f0 movs r0, 0x1 _081D6594: strh r0, [r1] pop {r0} bx r0 .align 2, 0 -_081D659C: .4byte 0x020375f0 + .pool thumb_func_end sub_81D6568 thumb_func_start sub_81D65A0 sub_81D65A0: @ 81D65A0 push {r4,r5,lr} - ldr r4, _081D65D4 + ldr r4, =0x03005d8c ldr r2, [r4] - ldr r5, _081D65D8 - ldr r0, _081D65DC + ldr r5, =0x020375e2 + ldr r0, =0x00003d6e adds r2, r0 ldrb r1, [r5] lsls r1, 6 @@ -961462,11 +928852,11 @@ sub_81D65A0: @ 81D65A0 orrs r0, r1 strb r0, [r2] ldr r1, [r4] - ldr r3, _081D65E0 + ldr r3, =0x00003d68 adds r2, r1, r3 ldrh r0, [r5] lsls r0, 2 - ldr r3, _081D65E4 + ldr r3, =0x00003718 adds r1, r3 adds r1, r0 ldr r0, [r1] @@ -961475,11 +928865,7 @@ sub_81D65A0: @ 81D65A0 pop {r0} bx r0 .align 2, 0 -_081D65D4: .4byte 0x03005d8c -_081D65D8: .4byte 0x020375e2 -_081D65DC: .4byte 0x00003d6e -_081D65E0: .4byte 0x00003d68 -_081D65E4: .4byte 0x00003718 + .pool thumb_func_end sub_81D65A0 thumb_func_start sub_81D65E8 @@ -961489,7 +928875,7 @@ sub_81D65E8: @ 81D65E8 lsrs r7, r0, 24 movs r3, 0 movs r4, 0 - ldr r0, _081D663C + ldr r0, =0x0203cf54 ldr r6, [r0] movs r5, 0x1F _081D65F8: @@ -961528,7 +928914,7 @@ _081D662A: pop {r1} bx r1 .align 2, 0 -_081D663C: .4byte 0x0203cf54 + .pool thumb_func_end sub_81D65E8 thumb_func_start sub_81D6640 @@ -961536,7 +928922,7 @@ sub_81D6640: @ 81D6640 push {r4,r5,lr} movs r3, 0 movs r2, 0 - ldr r0, _081D6698 + ldr r0, =0x0203cf54 ldr r4, [r0] _081D664A: lsls r0, r2, 4 @@ -961565,12 +928951,12 @@ _081D6670: asrs r0, 1 lsls r0, 1 subs r4, r0 - ldr r0, _081D669C + ldr r0, =0x00000864 bl flag_check lsls r0, 24 cmp r0, 0 beq _081D66A0 - ldr r0, _081D6698 + ldr r0, =0x0203cf54 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r0, 0x8 @@ -961578,17 +928964,16 @@ _081D6670: movs r0, 0x1 b _081D66A2 .align 2, 0 -_081D6698: .4byte 0x0203cf54 -_081D669C: .4byte 0x00000864 + .pool _081D66A0: movs r0, 0 _081D66A2: bl sub_81D65E8 lsls r0, 24 lsrs r2, r0, 24 - ldr r0, _081D6710 + ldr r0, =0x03005d8c ldr r5, [r0] - ldr r1, _081D6714 + ldr r1, =0x00003d6e adds r0, r5, r1 ldrb r1, [r0] movs r0, 0xC0 @@ -961601,14 +928986,14 @@ _081D66A2: lsls r0, 24 lsrs r2, r0, 24 _081D66C8: - ldr r1, _081D6718 + ldr r1, =0x0862a5cc lsls r0, r4, 2 adds r0, r1 ldr r1, [r0] lsls r0, r2, 2 adds r0, r1 ldr r4, [r0] - ldr r1, _081D671C + ldr r1, =0x00003d64 adds r0, r5, r1 ldr r0, [r0] movs r1, 0xE1 @@ -961638,10 +929023,7 @@ _081D6704: pop {r1} bx r1 .align 2, 0 -_081D6710: .4byte 0x03005d8c -_081D6714: .4byte 0x00003d6e -_081D6718: .4byte 0x0862a5cc -_081D671C: .4byte 0x00003d64 + .pool thumb_func_end sub_81D6640 thumb_func_start sub_81D6720 @@ -961656,20 +929038,20 @@ sub_81D6720: @ 81D6720 lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r6, _081D6760 - ldr r0, _081D6764 + ldr r6, =0x0203cf60 + ldr r0, =0x00002018 bl malloc_and_clear str r0, [r6] - ldr r1, _081D6768 + ldr r1, =0x00002006 adds r0, r1 strb r4, [r0] ldr r0, [r6] mov r1, r8 str r1, [r0] - ldr r1, _081D676C + ldr r1, =0x00002007 adds r0, r1 strb r5, [r0] - ldr r0, _081D6770 + ldr r0, =sub_81D6774 + 1 bl set_callback2 pop {r3} mov r8, r3 @@ -961677,11 +929059,7 @@ sub_81D6720: @ 81D6720 pop {r0} bx r0 .align 2, 0 -_081D6760: .4byte 0x0203cf60 -_081D6764: .4byte 0x00002018 -_081D6768: .4byte 0x00002006 -_081D676C: .4byte 0x00002007 -_081D6770: .4byte sub_81D6774 + 1 + .pool thumb_func_end sub_81D6720 thumb_func_start sub_81D6774 @@ -961698,10 +929076,10 @@ sub_81D6774: @ 81D6774 movs r1, 0xF0 movs r2, 0x20 bl rboxid_80040B8 - ldr r1, _081D67C0 - ldr r0, _081D67C4 + ldr r1, =0x0862a6a0 + ldr r0, =0x0203cf60 ldr r0, [r0] - ldr r2, _081D67C8 + ldr r2, =0x00002006 adds r0, r2 ldrb r0, [r0] lsls r0, 2 @@ -961709,15 +929087,12 @@ sub_81D6774: @ 81D6774 ldr r0, [r0] movs r1, 0 bl AddTask - ldr r0, _081D67CC + ldr r0, =sub_81D67D0 + 1 bl set_callback2 pop {r0} bx r0 .align 2, 0 -_081D67C0: .4byte 0x0862a6a0 -_081D67C4: .4byte 0x0203cf60 -_081D67C8: .4byte 0x00002006 -_081D67CC: .4byte sub_81D67D0 + 1 + .pool thumb_func_end sub_81D6774 thumb_func_start sub_81D67D0 @@ -961747,7 +929122,7 @@ sub_81D6800: @ 81D6800 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _081D6838 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -961755,7 +929130,7 @@ sub_81D6800: @ 81D6800 bne _081D6830 bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r4, _081D683C + ldr r4, =0x0203cf60 ldr r0, [r4] ldr r0, [r0] bl set_callback2 @@ -961768,8 +929143,7 @@ _081D6830: pop {r0} bx r0 .align 2, 0 -_081D6838: .4byte 0x02037fd4 -_081D683C: .4byte 0x0203cf60 + .pool thumb_func_end sub_81D6800 thumb_func_start sub_81D6840 @@ -961778,7 +929152,7 @@ sub_81D6840: @ 81D6840 lsls r0, 24 lsrs r3, r0, 24 adds r6, r3, 0 - ldr r0, _081D6874 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -961786,42 +929160,38 @@ sub_81D6840: @ 81D6840 lsrs r5, r0, 24 cmp r5, 0 bne _081D68B2 - ldr r2, _081D6878 + ldr r2, =0x0203cf60 ldr r1, [r2] - ldr r4, _081D687C + ldr r4, =0x00002007 adds r0, r1, r4 ldrb r0, [r0] cmp r0, 0x1 bne _081D6888 - ldr r0, _081D6880 + ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 lsls r1, 3 adds r1, r0 - ldr r0, _081D6884 + ldr r0, =sub_81D6800 + 1 b _081D68B0 .align 2, 0 -_081D6874: .4byte 0x02037fd4 -_081D6878: .4byte 0x0203cf60 -_081D687C: .4byte 0x00002007 -_081D6880: .4byte 0x03005e00 -_081D6884: .4byte sub_81D6800 + 1 + .pool _081D6888: - ldr r4, _081D68B8 + ldr r4, =0x00002006 adds r1, r4 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] ldr r2, [r2] - ldr r1, _081D68BC + ldr r1, =0x00002004 adds r0, r2, r1 strh r5, [r0] - ldr r0, _081D68C0 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r3, _081D68C4 + ldr r3, =0x0862a6a0 adds r2, r4 ldrb r0, [r2] lsls r0, 2 @@ -961834,10 +929204,7 @@ _081D68B2: pop {r0} bx r0 .align 2, 0 -_081D68B8: .4byte 0x00002006 -_081D68BC: .4byte 0x00002004 -_081D68C0: .4byte 0x03005e00 -_081D68C4: .4byte 0x0862a6a0 + .pool thumb_func_end sub_81D6840 thumb_func_start sub_81D68C8 @@ -961852,20 +929219,18 @@ sub_81D68C8: @ 81D68C8 movs r0, 0x40 movs r1, 0xF0 bl lcd_io_set - ldr r1, _081D68F8 + ldr r1, =0x00001888 movs r0, 0x44 bl lcd_io_set - ldr r0, _081D68FC + ldr r0, =0x02037714 movs r1, 0 strh r1, [r0] - ldr r0, _081D6900 + ldr r0, =0x02037b14 strh r1, [r0] pop {r0} bx r0 .align 2, 0 -_081D68F8: .4byte 0x00001888 -_081D68FC: .4byte 0x02037714 -_081D6900: .4byte 0x02037b14 + .pool thumb_func_end sub_81D68C8 thumb_func_start sub_81D6904 @@ -961890,10 +929255,10 @@ sub_81D691C: @ 81D691C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _081D694C + ldr r1, =0x03005e08 adds r5, r0, r1 bl sub_81D750C - ldr r0, _081D6950 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -961906,8 +929271,7 @@ sub_81D691C: @ 81D691C bl sub_81D7438 b _081D6978 .align 2, 0 -_081D694C: .4byte 0x03005e08 -_081D6950: .4byte 0x02037fd4 + .pool _081D6954: cmp r1, 0x90 bne _081D695E @@ -961941,7 +929305,7 @@ sub_81D6984: @ 81D6984 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _081D6A0C + ldr r0, =0x0862a72c mov r8, r0 movs r1, 0x58 movs r2, 0x48 @@ -961950,14 +929314,14 @@ sub_81D6984: @ 81D6984 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _081D6A10 + ldr r6, =0x02020630 lsls r4, r5, 4 adds r4, r5 lsls r4, 2 adds r0, r6, 0 adds r0, 0x1C adds r0, r4, r0 - ldr r1, _081D6A14 + ldr r1, =sub_81D6A20 + 1 str r1, [r0] adds r0, r6, 0 adds r0, 0x2E @@ -961970,7 +929334,7 @@ sub_81D6984: @ 81D6984 lsls r0, 24 lsrs r0, 24 strh r0, [r4] - ldr r0, _081D6A18 + ldr r0, =0x0862a750 movs r1, 0x4B movs r2, 0x65 movs r3, 0 @@ -961978,7 +929342,7 @@ sub_81D6984: @ 81D6984 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2] - ldr r0, _081D6A1C + ldr r0, =0x0862a774 movs r1, 0x6D movs r2, 0x72 movs r3, 0x1 @@ -962001,11 +929365,7 @@ sub_81D6984: @ 81D6984 pop {r1} bx r1 .align 2, 0 -_081D6A0C: .4byte 0x0862a72c -_081D6A10: .4byte 0x02020630 -_081D6A14: .4byte sub_81D6A20 + 1 -_081D6A18: .4byte 0x0862a750 -_081D6A1C: .4byte 0x0862a774 + .pool thumb_func_end sub_81D6984 thumb_func_start sub_81D6A20 @@ -962030,7 +929390,7 @@ sub_81D6A20: @ 81D6A20 beq _081D6A84 subs r0, r1, 0x1 strh r0, [r3, 0x20] - ldr r2, _081D6A98 + ldr r2, =0x02020630 movs r4, 0x2E ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -962072,7 +929432,7 @@ _081D6A84: beq _081D6AA6 b _081D6B68 .align 2, 0 -_081D6A98: .4byte 0x02020630 + .pool _081D6A9C: cmp r3, 0x2 beq _081D6B24 @@ -962080,7 +929440,7 @@ _081D6A9C: beq _081D6AE4 b _081D6B68 _081D6AA6: - ldr r2, _081D6AE0 + ldr r2, =0x02020630 mov r0, r12 movs r4, 0x2 ldrsh r1, [r0, r4] @@ -962110,9 +929470,9 @@ _081D6AA6: ldrsh r1, [r0, r4] b _081D6B5E .align 2, 0 -_081D6AE0: .4byte 0x02020630 + .pool _081D6AE4: - ldr r2, _081D6B1C + ldr r2, =0x02020630 mov r0, r12 movs r3, 0x2 ldrsh r1, [r0, r3] @@ -962120,7 +929480,7 @@ _081D6AE4: adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081D6B20 + ldr r1, =0x0000ffff strh r1, [r0, 0x24] mov r4, r12 movs r0, 0x2 @@ -962141,10 +929501,9 @@ _081D6AE4: negs r1, r1 b _081D6B58 .align 2, 0 -_081D6B1C: .4byte 0x02020630 -_081D6B20: .4byte 0x0000ffff + .pool _081D6B24: - ldr r2, _081D6B70 + ldr r2, =0x02020630 mov r3, r12 movs r4, 0x2 ldrsh r1, [r3, r4] @@ -962152,7 +929511,7 @@ _081D6B24: adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081D6B74 + ldr r1, =0x0000ffff strh r1, [r0, 0x24] movs r0, 0x2 ldrsh r1, [r3, r0] @@ -962169,7 +929528,7 @@ _081D6B24: adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081D6B78 + ldr r1, =0x0000fffe _081D6B58: strh r1, [r0, 0x24] movs r0, 0x4 @@ -962185,9 +929544,7 @@ _081D6B68: pop {r0} bx r0 .align 2, 0 -_081D6B70: .4byte 0x02020630 -_081D6B74: .4byte 0x0000ffff -_081D6B78: .4byte 0x0000fffe + .pool thumb_func_end sub_81D6A20 thumb_func_start sub_81D6B7C @@ -962195,7 +929552,7 @@ sub_81D6B7C: @ 81D6B7C push {r4-r6,lr} mov r6, r8 push {r6} - ldr r5, _081D6D0C + ldr r5, =0x0862a81c adds r0, r5, 0 movs r1, 0x88 movs r2, 0x60 @@ -962206,14 +929563,14 @@ sub_81D6B7C: @ 81D6B7C lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r6, _081D6D10 + ldr r6, =0x02020630 lsls r4, r0, 4 add r4, r8 lsls r4, 2 adds r0, r6, 0 adds r0, 0x1C adds r0, r4, r0 - ldr r1, _081D6D14 + ldr r1, =sub_81D6D20 + 1 str r1, [r0] adds r0, r6, 0 adds r0, 0x2E @@ -962286,14 +929643,14 @@ sub_81D6B7C: @ 81D6B7C ldrh r1, [r4, 0x6] orrs r0, r1 strh r0, [r4, 0x6] - ldr r0, _081D6D18 + ldr r0, =0x0862a84c movs r1, 0xD0 movs r2, 0x84 movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 8 strh r0, [r4, 0x8] - ldr r0, _081D6D1C + ldr r0, =0x0862a864 movs r1, 0xC8 movs r2, 0x78 movs r3, 0x1 @@ -962374,11 +929731,7 @@ sub_81D6B7C: @ 81D6B7C pop {r1} bx r1 .align 2, 0 -_081D6D0C: .4byte 0x0862a81c -_081D6D10: .4byte 0x02020630 -_081D6D14: .4byte sub_81D6D20 + 1 -_081D6D18: .4byte 0x0862a84c -_081D6D1C: .4byte 0x0862a864 + .pool thumb_func_end sub_81D6B7C thumb_func_start sub_81D6D20 @@ -962392,7 +929745,7 @@ sub_81D6D20: @ 81D6D20 movs r1, 0x1F ands r0, r1 strh r0, [r3, 0xA] - ldr r7, _081D6E30 + ldr r7, =0x02020630 cmp r0, 0 bne _081D6E0E ldrh r1, [r4, 0x20] @@ -962520,7 +929873,7 @@ _081D6E0E: beq _081D6E40 b _081D6FC8 .align 2, 0 -_081D6E30: .4byte 0x02020630 + .pool _081D6E34: cmp r2, 0x2 bne _081D6E3A @@ -962751,22 +930104,22 @@ sub_81D6FE0: @ 81D6FE0 bl sub_8121DA0 movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081D705C + ldr r1, =0x0862a888 movs r0, 0 movs r2, 0x3 bl bg_vram_setup - ldr r4, _081D7060 + ldr r4, =0x0203cf60 ldr r1, [r4] adds r1, 0x4 movs r0, 0 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D7064 + ldr r0, =0x00000804 adds r1, r0 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D7068 + ldr r0, =0x00001004 adds r1, r0 movs r0, 0x2 bl bg_set_tilemap @@ -962794,10 +930147,7 @@ sub_81D6FE0: @ 81D6FE0 pop {r0} bx r0 .align 2, 0 -_081D705C: .4byte 0x0862a888 -_081D7060: .4byte 0x0203cf60 -_081D7064: .4byte 0x00000804 -_081D7068: .4byte 0x00001004 + .pool thumb_func_end sub_81D6FE0 thumb_func_start sub_81D706C @@ -962805,7 +930155,7 @@ sub_81D706C: @ 81D706C push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, _081D70F4 + ldr r1, =0x08da33c0 movs r0, 0 str r0, [sp] movs r2, 0 @@ -962816,62 +930166,47 @@ _081D7082: lsls r0, 24 cmp r0, 0 bne _081D7082 - ldr r0, _081D70F8 - ldr r4, _081D70FC + ldr r0, =0x08da3988 + ldr r4, =0x0203cf60 ldr r1, [r4] adds r1, 0x4 bl call_LZZUnCompWram - ldr r0, _081D7100 + ldr r0, =0x08da3824 ldr r1, [r4] - ldr r2, _081D7104 + ldr r2, =0x00000804 adds r1, r2 bl call_LZZUnCompWram - ldr r0, _081D7108 + ldr r0, =0x08da3a88 ldr r1, [r4] - ldr r2, _081D710C + ldr r2, =0x00001004 adds r1, r2 bl call_LZZUnCompWram - ldr r0, _081D7110 + ldr r0, =0x08da37e8 movs r1, 0 movs r2, 0x40 bl decompress_palette - ldr r0, _081D7114 + ldr r0, =0x0862a8c4 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D7118 + ldr r0, =0x0862a8f8 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D711C + ldr r0, =0x0862a924 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D7120 + ldr r0, =0x0862a9d4 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D7124 + ldr r0, =0x0862aa14 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D7128 + ldr r0, =0x0862aa34 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D712C + ldr r0, =0x0862a8cc bl gpu_pal_obj_decompress_and_apply - ldr r0, _081D7130 + ldr r0, =0x0862a9dc bl gpu_pal_obj_decompress_and_apply add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_081D70F4: .4byte 0x08da33c0 -_081D70F8: .4byte 0x08da3988 -_081D70FC: .4byte 0x0203cf60 -_081D7100: .4byte 0x08da3824 -_081D7104: .4byte 0x00000804 -_081D7108: .4byte 0x08da3a88 -_081D710C: .4byte 0x00001004 -_081D7110: .4byte 0x08da37e8 -_081D7114: .4byte 0x0862a8c4 -_081D7118: .4byte 0x0862a8f8 -_081D711C: .4byte 0x0862a924 -_081D7120: .4byte 0x0862a9d4 -_081D7124: .4byte 0x0862aa14 -_081D7128: .4byte 0x0862aa34 -_081D712C: .4byte 0x0862a8cc -_081D7130: .4byte 0x0862a9dc + .pool thumb_func_end sub_81D706C thumb_func_start task_add_00_WIN0V_open_close_above_and_more @@ -962883,32 +930218,32 @@ task_add_00_WIN0V_open_close_above_and_more: @ 81D7134 lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _081D71AC + ldr r7, =0x03005e08 adds r5, r6, r7 bl dp12_8087EA4 bl sub_81D6FE0 bl sub_81D706C movs r4, 0 str r4, [sp, 0x4] - ldr r1, _081D71B0 - ldr r2, _081D71B4 + ldr r1, =0x02038c28 + ldr r2, =0x010003c0 add r0, sp, 0x4 bl CpuFastSet - ldr r2, _081D71B8 + ldr r2, =0x0862a87c ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] bl sub_80BA038 strh r4, [r5] - ldr r0, _081D71BC + ldr r0, =sub_81D7228 + 1 movs r1, 0 bl AddTask lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x2] - ldr r0, _081D71C0 + ldr r0, =0x0203cf60 ldr r0, [r0] - ldr r1, _081D71C4 + ldr r1, =0x00002006 adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -962924,18 +930259,11 @@ task_add_00_WIN0V_open_close_above_and_more: @ 81D7134 adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, _081D71C8 + ldr r1, =sub_81D691C + 1 str r1, [r0] b _081D71EE .align 2, 0 -_081D71AC: .4byte 0x03005e08 -_081D71B0: .4byte 0x02038c28 -_081D71B4: .4byte 0x010003c0 -_081D71B8: .4byte 0x0862a87c -_081D71BC: .4byte sub_81D7228 + 1 -_081D71C0: .4byte 0x0203cf60 -_081D71C4: .4byte 0x00002006 -_081D71C8: .4byte sub_81D691C + 1 + .pool _081D71CC: bl sub_81D7664 lsls r0, 24 @@ -962948,7 +930276,7 @@ _081D71CC: adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, _081D7220 + ldr r1, =sub_81D736C + 1 str r1, [r0] bl sub_80A2F30 _081D71EE: @@ -962965,7 +930293,7 @@ _081D71EE: movs r2, 0x10 movs r3, 0 bl sub_80A1AD4 - ldr r0, _081D7224 + ldr r0, =sub_81D6FD0 + 1 bl SetVBlankCallback movs r0, 0x53 bl audio_play @@ -962974,8 +930302,7 @@ _081D71EE: pop {r0} bx r0 .align 2, 0 -_081D7220: .4byte sub_81D736C + 1 -_081D7224: .4byte sub_81D6FD0 + 1 + .pool thumb_func_end task_add_00_WIN0V_open_close_above_and_more thumb_func_start sub_81D7228 @@ -962986,11 +930313,11 @@ sub_81D7228: @ 81D7228 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081D7260 + ldr r0, =0x03005e08 adds r3, r1, r0 movs r1, 0x18 - ldr r7, _081D7264 - ldr r4, _081D7268 + ldr r7, =0x0203cf60 + ldr r4, =0x02038c28 movs r0, 0xF0 lsls r0, 3 adds r5, r4, r0 @@ -963009,9 +930336,7 @@ _081D7244: ldrh r0, [r3] b _081D72CA .align 2, 0 -_081D7260: .4byte 0x03005e08 -_081D7264: .4byte 0x0203cf60 -_081D7268: .4byte 0x02038c28 + .pool _081D726C: cmp r1, 0x3F bgt _081D7280 @@ -963075,7 +930400,7 @@ _081D72CA: cmp r0, 0x5B ble _081D7244 ldr r0, [r7] - ldr r1, _081D7320 + ldr r1, =0x00002006 adds r0, r1 ldrb r0, [r0] cmp r0, 0 @@ -963108,7 +930433,7 @@ _081D72CA: adds r0, 0xC0 b _081D735E .align 2, 0 -_081D7320: .4byte 0x00002006 + .pool _081D7324: movs r1, 0xC0 lsls r1, 2 @@ -963157,10 +930482,10 @@ sub_81D736C: @ 81D736C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r7, _081D73A4 + ldr r7, =0x03005e08 adds r4, r0, r7 bl sub_81D750C - ldr r0, _081D73A8 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -963178,8 +930503,7 @@ _081D739C: bl sub_81D7438 b _081D7428 .align 2, 0 -_081D73A4: .4byte 0x03005e08 -_081D73A8: .4byte 0x02037fd4 + .pool _081D73AC: cmp r1, 0xD8 bne _081D73B6 @@ -963215,7 +930539,7 @@ _081D73D8: adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _081D7434 + ldr r1, =sub_81D752C + 1 str r1, [r0] movs r0, 0x2 ldrsh r1, [r4, r0] @@ -963250,7 +930574,7 @@ _081D742E: pop {r0} bx r0 .align 2, 0 -_081D7434: .4byte sub_81D752C + 1 + .pool thumb_func_end sub_81D736C thumb_func_start sub_81D7438 @@ -963259,8 +930583,8 @@ sub_81D7438: @ 81D7438 sub sp, 0xC movs r0, 0x57 bl audio_play - ldr r0, _081D7474 - ldr r1, _081D7478 + ldr r0, =0x00007fff + ldr r1, =0x0000ffff str r1, [sp] movs r4, 0 str r4, [sp, 0x4] @@ -963269,7 +930593,7 @@ sub_81D7438: @ 81D7438 movs r2, 0x10 movs r3, 0 bl sub_80A2C44 - ldr r0, _081D747C + ldr r0, =0xffff0000 str r4, [sp] str r4, [sp, 0x4] movs r1, 0x1 @@ -963283,9 +930607,7 @@ sub_81D7438: @ 81D7438 pop {r0} bx r0 .align 2, 0 -_081D7474: .4byte 0x00007fff -_081D7478: .4byte 0x0000ffff -_081D747C: .4byte 0xffff0000 + .pool thumb_func_end sub_81D7438 thumb_func_start sub_81D7480 @@ -963294,8 +930616,8 @@ sub_81D7480: @ 81D7480 sub sp, 0xC movs r0, 0x57 bl audio_play - ldr r0, _081D74BC - ldr r1, _081D74C0 + ldr r0, =0x00007fff + ldr r1, =0x0000ffff str r1, [sp] movs r4, 0 str r4, [sp, 0x4] @@ -963304,7 +930626,7 @@ sub_81D7480: @ 81D7480 movs r2, 0x10 movs r3, 0x10 bl sub_80A2C44 - ldr r0, _081D74C4 + ldr r0, =0xffff0000 str r4, [sp] str r4, [sp, 0x4] movs r1, 0x1 @@ -963318,17 +930640,15 @@ sub_81D7480: @ 81D7480 pop {r0} bx r0 .align 2, 0 -_081D74BC: .4byte 0x00007fff -_081D74C0: .4byte 0x0000ffff -_081D74C4: .4byte 0xffff0000 + .pool thumb_func_end sub_81D7480 thumb_func_start sub_81D74C8 sub_81D74C8: @ 81D74C8 push {r4,lr} sub sp, 0xC - ldr r0, _081D7500 - ldr r1, _081D7504 + ldr r0, =0x00007fff + ldr r1, =0x0000ffff str r1, [sp] movs r4, 0 str r4, [sp, 0x4] @@ -963337,7 +930657,7 @@ sub_81D74C8: @ 81D74C8 movs r2, 0x10 movs r3, 0 bl sub_80A2C44 - ldr r0, _081D7508 + ldr r0, =0xffff0000 str r4, [sp] str r4, [sp, 0x4] movs r1, 0x1 @@ -963351,9 +930671,7 @@ sub_81D74C8: @ 81D74C8 pop {r0} bx r0 .align 2, 0 -_081D7500: .4byte 0x00007fff -_081D7504: .4byte 0x0000ffff -_081D7508: .4byte 0xffff0000 + .pool thumb_func_end sub_81D74C8 thumb_func_start sub_81D750C @@ -963381,14 +930699,14 @@ sub_81D752C: @ 81D752C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081D75AC + ldr r0, =0x03005e08 adds r5, r1, r0 movs r0, 0x4 ldrsh r1, [r5, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _081D75B0 + ldr r4, =0x02020630 adds r0, r4 bl sub_81D7860 movs r0, 0x6 @@ -963437,8 +930755,7 @@ _081D75A6: pop {r0} bx r0 .align 2, 0 -_081D75AC: .4byte 0x03005e08 -_081D75B0: .4byte 0x02020630 + .pool thumb_func_end sub_81D752C thumb_func_start sub_81D75B4 @@ -963463,20 +930780,19 @@ sub_81D75B4: @ 81D75B4 movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _081D75F8 + ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 adds r0, r1 - ldr r1, _081D75FC + ldr r1, =sub_81D7600 + 1 str r1, [r0] add sp, 0x4 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081D75F8: .4byte 0x03005e00 -_081D75FC: .4byte sub_81D7600 + 1 + .pool thumb_func_end sub_81D75B4 thumb_func_start sub_81D7600 @@ -963487,10 +930803,10 @@ sub_81D7600: @ 81D7600 lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _081D7658 + ldr r7, =0x03005e08 adds r5, r6, r7 bl sub_81D750C - ldr r0, _081D765C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -963513,16 +930829,14 @@ sub_81D7600: @ 81D7600 adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, _081D7660 + ldr r1, =sub_81D6840 + 1 str r1, [r0] _081D7652: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081D7658: .4byte 0x03005e08 -_081D765C: .4byte 0x02037fd4 -_081D7660: .4byte sub_81D6840 + 1 + .pool thumb_func_end sub_81D7600 thumb_func_start sub_81D7664 @@ -963530,7 +930844,7 @@ sub_81D7664: @ 81D7664 push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _081D76EC + ldr r0, =0x0862a8d4 mov r8, r0 movs r1, 0x62 movs r2, 0x48 @@ -963539,14 +930853,14 @@ sub_81D7664: @ 81D7664 adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r6, _081D76F0 + ldr r6, =0x02020630 lsls r4, r5, 4 adds r4, r5 lsls r4, 2 adds r0, r6, 0 adds r0, 0x1C adds r0, r4, r0 - ldr r1, _081D76F4 + ldr r1, =sub_81D7700 + 1 str r1, [r0] adds r0, r6, 0 adds r0, 0x2E @@ -963559,7 +930873,7 @@ sub_81D7664: @ 81D7664 lsls r0, 24 lsrs r0, 24 strh r0, [r4] - ldr r0, _081D76F8 + ldr r0, =0x0862a900 movs r1, 0x55 movs r2, 0x65 movs r3, 0 @@ -963567,7 +930881,7 @@ sub_81D7664: @ 81D7664 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2] - ldr r0, _081D76FC + ldr r0, =0x0862a92c movs r1, 0x77 movs r2, 0x72 movs r3, 0x1 @@ -963590,11 +930904,7 @@ sub_81D7664: @ 81D7664 pop {r1} bx r1 .align 2, 0 -_081D76EC: .4byte 0x0862a8d4 -_081D76F0: .4byte 0x02020630 -_081D76F4: .4byte sub_81D7700 + 1 -_081D76F8: .4byte 0x0862a900 -_081D76FC: .4byte 0x0862a92c + .pool thumb_func_end sub_81D7664 thumb_func_start sub_81D7700 @@ -963621,7 +930931,7 @@ sub_81D7700: @ 81D7700 beq _081D7768 subs r0, r1, 0x1 strh r0, [r3, 0x20] - ldr r2, _081D777C + ldr r2, =0x02020630 movs r4, 0x2E ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -963663,7 +930973,7 @@ _081D7768: beq _081D778A b _081D784C .align 2, 0 -_081D777C: .4byte 0x02020630 + .pool _081D7780: cmp r3, 0x2 beq _081D7808 @@ -963671,7 +930981,7 @@ _081D7780: beq _081D77C8 b _081D784C _081D778A: - ldr r2, _081D77C4 + ldr r2, =0x02020630 mov r0, r12 movs r4, 0x2 ldrsh r1, [r0, r4] @@ -963701,9 +931011,9 @@ _081D778A: ldrsh r1, [r0, r4] b _081D7842 .align 2, 0 -_081D77C4: .4byte 0x02020630 + .pool _081D77C8: - ldr r2, _081D7800 + ldr r2, =0x02020630 mov r0, r12 movs r3, 0x2 ldrsh r1, [r0, r3] @@ -963711,7 +931021,7 @@ _081D77C8: adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081D7804 + ldr r1, =0x0000ffff strh r1, [r0, 0x24] mov r4, r12 movs r0, 0x2 @@ -963732,10 +931042,9 @@ _081D77C8: negs r1, r1 b _081D783C .align 2, 0 -_081D7800: .4byte 0x02020630 -_081D7804: .4byte 0x0000ffff + .pool _081D7808: - ldr r2, _081D7854 + ldr r2, =0x02020630 mov r3, r12 movs r4, 0x2 ldrsh r1, [r3, r4] @@ -963743,7 +931052,7 @@ _081D7808: adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081D7858 + ldr r1, =0x0000ffff strh r1, [r0, 0x24] movs r0, 0x2 ldrsh r1, [r3, r0] @@ -963760,7 +931069,7 @@ _081D7808: adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081D785C + ldr r1, =0x0000fffe _081D783C: strh r1, [r0, 0x24] movs r0, 0x4 @@ -963776,9 +931085,7 @@ _081D784C: pop {r0} bx r0 .align 2, 0 -_081D7854: .4byte 0x02020630 -_081D7858: .4byte 0x0000ffff -_081D785C: .4byte 0x0000fffe + .pool thumb_func_end sub_81D7700 thumb_func_start sub_81D7860 @@ -963795,7 +931102,7 @@ sub_81D7860: @ 81D7860 adds r0, r2, 0 adds r0, 0x8 strh r0, [r1, 0x22] - ldr r2, _081D78B8 + ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r1, r0] lsls r0, r1, 4 @@ -963828,7 +931135,7 @@ _081D78B0: pop {r0} bx r0 .align 2, 0 -_081D78B8: .4byte 0x02020630 + .pool thumb_func_end sub_81D7860 thumb_func_start sub_81D78BC @@ -963836,7 +931143,7 @@ sub_81D78BC: @ 81D78BC push {r4-r6,lr} mov r6, r8 push {r6} - ldr r5, _081D7A4C + ldr r5, =0x0862a9e4 adds r0, r5, 0 movs r1, 0x7E movs r2, 0x60 @@ -963847,14 +931154,14 @@ sub_81D78BC: @ 81D78BC lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r6, _081D7A50 + ldr r6, =0x02020630 lsls r4, r0, 4 add r4, r8 lsls r4, 2 adds r0, r6, 0 adds r0, 0x1C adds r0, r4, r0 - ldr r1, _081D7A54 + ldr r1, =sub_81D7A60 + 1 str r1, [r0] adds r0, r6, 0 adds r0, 0x2E @@ -963927,14 +931234,14 @@ sub_81D78BC: @ 81D78BC ldrh r1, [r4, 0x6] orrs r0, r1 strh r0, [r4, 0x6] - ldr r0, _081D7A58 + ldr r0, =0x0862aa1c movs r1, 0xC6 movs r2, 0x84 movs r3, 0 bl obj_add_from_template_forward_search lsls r0, 8 strh r0, [r4, 0x8] - ldr r0, _081D7A5C + ldr r0, =0x0862aa3c movs r1, 0xBE movs r2, 0x78 movs r3, 0x1 @@ -964015,11 +931322,7 @@ sub_81D78BC: @ 81D78BC pop {r1} bx r1 .align 2, 0 -_081D7A4C: .4byte 0x0862a9e4 -_081D7A50: .4byte 0x02020630 -_081D7A54: .4byte sub_81D7A60 + 1 -_081D7A58: .4byte 0x0862aa1c -_081D7A5C: .4byte 0x0862aa3c + .pool thumb_func_end sub_81D78BC thumb_func_start sub_81D7A60 @@ -964035,7 +931338,7 @@ sub_81D7A60: @ 81D7A60 strh r0, [r3, 0xA] movs r1, 0x7 ands r1, r0 - ldr r7, _081D7B74 + ldr r7, =0x02020630 cmp r1, 0 bne _081D7B52 ldrh r1, [r4, 0x20] @@ -964163,7 +931466,7 @@ _081D7B52: beq _081D7B84 b _081D7D0C .align 2, 0 -_081D7B74: .4byte 0x02020630 + .pool _081D7B78: cmp r2, 0x2 bne _081D7B7E @@ -964394,7 +931697,7 @@ sub_81D7D14: @ 81D7D14 adds r0, r1, 0 adds r0, 0x8 strh r0, [r2, 0x22] - ldr r3, _081D7E0C + ldr r3, =0x02020630 ldrh r1, [r2, 0x2E] lsls r1, 16 asrs r1, 24 @@ -964507,7 +931810,7 @@ _081D7E08: pop {r0} bx r0 .align 2, 0 -_081D7E0C: .4byte 0x02020630 + .pool thumb_func_end sub_81D7D14 thumb_func_start sub_81D7E10 @@ -964516,22 +931819,22 @@ sub_81D7E10: @ 81D7E10 bl sub_8121DA0 movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081D7E8C + ldr r1, =0x0862aa54 movs r0, 0x1 movs r2, 0x3 bl bg_vram_setup - ldr r4, _081D7E90 + ldr r4, =0x0203cf60 ldr r1, [r4] adds r1, 0x4 movs r0, 0 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D7E94 + ldr r0, =0x00000804 adds r1, r0 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D7E98 + ldr r0, =0x00001004 adds r1, r0 movs r0, 0x2 bl bg_set_tilemap @@ -964559,10 +931862,7 @@ sub_81D7E10: @ 81D7E10 pop {r0} bx r0 .align 2, 0 -_081D7E8C: .4byte 0x0862aa54 -_081D7E90: .4byte 0x0203cf60 -_081D7E94: .4byte 0x00000804 -_081D7E98: .4byte 0x00001004 + .pool thumb_func_end sub_81D7E10 thumb_func_start sub_81D7E9C @@ -964570,20 +931870,20 @@ sub_81D7E9C: @ 81D7E9C push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, _081D7F1C + ldr r1, =0x08da33c0 movs r4, 0 str r4, [sp] movs r0, 0 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _081D7F20 + ldr r1, =0x08da4f70 str r4, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _081D7F24 + ldr r1, =0x08da3c94 str r4, [sp] movs r0, 0x2 movs r2, 0 @@ -964594,46 +931894,35 @@ _081D7ED0: lsls r0, 24 cmp r0, 0 bne _081D7ED0 - ldr r0, _081D7F28 - ldr r4, _081D7F2C + ldr r0, =0x08da3988 + ldr r4, =0x0203cf60 ldr r1, [r4] adds r1, 0x4 bl call_LZZUnCompWram - ldr r0, _081D7F30 + ldr r0, =0x08da60b8 ldr r1, [r4] - ldr r2, _081D7F34 + ldr r2, =0x00000804 adds r1, r2 bl call_LZZUnCompWram - ldr r0, _081D7F38 + ldr r0, =0x08da4dec ldr r1, [r4] - ldr r2, _081D7F3C + ldr r2, =0x00001004 adds r1, r2 bl call_LZZUnCompWram - ldr r0, _081D7F40 + ldr r0, =0x08da4da8 movs r1, 0 movs r2, 0x40 bl decompress_palette - ldr r0, _081D7F44 + ldr r0, =0x0862aa90 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D7F48 + ldr r0, =0x0862aa98 bl gpu_pal_obj_decompress_and_apply add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_081D7F1C: .4byte 0x08da33c0 -_081D7F20: .4byte 0x08da4f70 -_081D7F24: .4byte 0x08da3c94 -_081D7F28: .4byte 0x08da3988 -_081D7F2C: .4byte 0x0203cf60 -_081D7F30: .4byte 0x08da60b8 -_081D7F34: .4byte 0x00000804 -_081D7F38: .4byte 0x08da4dec -_081D7F3C: .4byte 0x00001004 -_081D7F40: .4byte 0x08da4da8 -_081D7F44: .4byte 0x0862aa90 -_081D7F48: .4byte 0x0862aa98 + .pool thumb_func_end sub_81D7E9C thumb_func_start sub_81D7F4C @@ -964644,7 +931933,7 @@ sub_81D7F4C: @ 81D7F4C lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _081D7FAC + ldr r5, =0x03005e08 adds r6, r4, r5 movs r0, 0xE8 lsls r0, 1 @@ -964655,7 +931944,7 @@ sub_81D7F4C: @ 81D7F4C lsls r1, 2 movs r0, 0x50 bl lcd_io_set - ldr r1, _081D7FB0 + ldr r1, =0x00000808 movs r0, 0x52 bl lcd_io_set movs r0, 0x1 @@ -964663,9 +931952,9 @@ sub_81D7F4C: @ 81D7F4C movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, _081D7FB4 + ldr r0, =sub_81D67EC + 1 bl SetVBlankCallback - ldr r0, _081D7FB8 + ldr r0, =sub_81D81A4 + 1 movs r1, 0 bl AddTask movs r0, 0 @@ -964673,17 +931962,13 @@ sub_81D7F4C: @ 81D7F4C strh r0, [r6, 0x2] subs r5, 0x8 adds r4, r5 - ldr r0, _081D7FBC + ldr r0, =sub_81D7FC0 + 1 str r0, [r4] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081D7FAC: .4byte 0x03005e08 -_081D7FB0: .4byte 0x00000808 -_081D7FB4: .4byte sub_81D67EC + 1 -_081D7FB8: .4byte sub_81D81A4 + 1 -_081D7FBC: .4byte sub_81D7FC0 + 1 + .pool thumb_func_end sub_81D7F4C thumb_func_start sub_81D7FC0 @@ -964695,7 +931980,7 @@ sub_81D7FC0: @ 81D7FC0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081D7FE4 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r0, 0 ldrsh r5, [r4, r0] @@ -964707,7 +931992,7 @@ sub_81D7FC0: @ 81D7FC0 beq _081D7FF4 b _081D815A .align 2, 0 -_081D7FE4: .4byte 0x03005e08 + .pool _081D7FE8: cmp r5, 0x2 beq _081D80A4 @@ -964855,7 +932140,7 @@ _081D80F4: strh r0, [r4, 0xE] movs r3, 0x2 ldrsh r1, [r4, r3] - ldr r0, _081D8120 + ldr r0, =0x00000127 cmp r1, r0 ble _081D815A ldrh r0, [r4] @@ -964870,7 +932155,7 @@ _081D80F4: bl sub_80A1AD4 b _081D815A .align 2, 0 -_081D8120: .4byte 0x00000127 + .pool _081D8124: ldrh r0, [r4, 0x4] adds r0, 0x10 @@ -964909,7 +932194,7 @@ sub_81D8164: @ 81D8164 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081D8198 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -964919,21 +932204,19 @@ sub_81D8164: @ 81D8164 bl SetVBlankCallback bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, _081D819C + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081D81A0 + ldr r0, =sub_81D6840 + 1 str r0, [r1] _081D8192: pop {r4} pop {r0} bx r0 .align 2, 0 -_081D8198: .4byte 0x02037fd4 -_081D819C: .4byte 0x03005e00 -_081D81A0: .4byte sub_81D6840 + 1 + .pool thumb_func_end sub_81D8164 thumb_func_start sub_81D81A4 @@ -964944,15 +932227,15 @@ sub_81D81A4: @ 81D81A4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081D8240 + ldr r1, =0x03005e08 adds r4, r0, r1 ldrh r1, [r4, 0x2] movs r0, 0x3 ands r0, r1 cmp r0, 0 bne _081D8254 - ldr r0, _081D8244 - ldr r3, _081D8248 + ldr r0, =0x0862aaa0 + ldr r3, =0x0862aab8 movs r1, 0 ldrsh r2, [r4, r1] lsls r2, 1 @@ -964979,7 +932262,7 @@ sub_81D81A4: @ 81D81A4 bl obj_add_from_template_forward_search lsls r0, 24 lsrs r0, 24 - ldr r1, _081D824C + ldr r1, =0x02020630 lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -965013,10 +932296,7 @@ sub_81D81A4: @ 81D81A4 bl remove_task b _081D825A .align 2, 0 -_081D8240: .4byte 0x03005e08 -_081D8244: .4byte 0x0862aaa0 -_081D8248: .4byte 0x0862aab8 -_081D824C: .4byte 0x02020630 + .pool _081D8250: adds r0, r1, 0x1 strh r0, [r4] @@ -965041,7 +932321,7 @@ sub_81D8260: @ 81D8260 strh r0, [r2, 0x24] b _081D829A _081D8270: - ldr r1, _081D82AC + ldr r1, =0x0862aab8 movs r3, 0x2E ldrsh r0, [r2, r3] lsls r0, 1 @@ -965072,7 +932352,7 @@ _081D829A: pop {r0} bx r0 .align 2, 0 -_081D82AC: .4byte 0x0862aab8 + .pool thumb_func_end sub_81D8260 thumb_func_start sub_81D82B0 @@ -965081,27 +932361,27 @@ sub_81D82B0: @ 81D82B0 bl sub_8121DA0 movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081D8344 + ldr r1, =0x0862aacc movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r4, _081D8348 + ldr r4, =0x0203cf60 ldr r1, [r4] adds r1, 0x4 movs r0, 0 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D834C + ldr r0, =0x00000804 adds r1, r0 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D8350 + ldr r0, =0x00001004 adds r1, r0 movs r0, 0x2 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D8354 + ldr r0, =0x00001804 adds r1, r0 movs r0, 0x3 bl bg_set_tilemap @@ -965133,11 +932413,7 @@ sub_81D82B0: @ 81D82B0 pop {r0} bx r0 .align 2, 0 -_081D8344: .4byte 0x0862aacc -_081D8348: .4byte 0x0203cf60 -_081D834C: .4byte 0x00000804 -_081D8350: .4byte 0x00001004 -_081D8354: .4byte 0x00001804 + .pool thumb_func_end sub_81D82B0 thumb_func_start sub_81D8358 @@ -965145,14 +932421,14 @@ sub_81D8358: @ 81D8358 push {r4-r7,lr} sub sp, 0xC bl reset_temp_tile_data_buffers - ldr r1, _081D8404 + ldr r1, =0x08da7528 movs r4, 0 str r4, [sp] movs r0, 0 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _081D8408 + ldr r1, =0x08da69bc str r4, [sp] movs r0, 0x1 movs r2, 0 @@ -965165,26 +932441,26 @@ _081D8380: lsrs r6, r0, 24 cmp r6, 0 bne _081D8380 - ldr r0, _081D840C - ldr r5, _081D8410 + ldr r0, =0x08da7aac + ldr r5, =0x0203cf60 ldr r1, [r5] adds r1, 0x4 bl call_LZZUnCompWram - ldr r0, _081D8414 + ldr r0, =0x08da7784 ldr r1, [r5] - ldr r4, _081D8418 + ldr r4, =0x00001804 adds r1, r4 bl call_LZZUnCompWram str r6, [sp, 0x4] ldr r1, [r5] - ldr r0, _081D841C + ldr r0, =0x00001004 adds r1, r0 - ldr r2, _081D8420 + ldr r2, =0x01000200 add r0, sp, 0x4 bl CpuFastSet ldr r1, [r5] adds r4, r1, r4 - ldr r0, _081D8424 + ldr r0, =0x00000804 adds r1, r0 movs r2, 0x80 lsls r2, 2 @@ -965192,49 +932468,32 @@ _081D8380: bl CpuFastSet str r6, [sp, 0x8] ldr r1, [r5] - ldr r0, _081D8428 + ldr r0, =0x00000904 adds r1, r0 - ldr r2, _081D842C + ldr r2, =0x010000d0 adds r0, r7, 0 bl CpuFastSet - ldr r0, _081D8430 + ldr r0, =0x08da7744 movs r1, 0 movs r2, 0x40 bl decompress_palette - ldr r0, _081D8434 - ldr r1, _081D8438 + ldr r0, =0x02037714 + ldr r1, =0x00007fff strh r1, [r0] - ldr r0, _081D843C + ldr r0, =0x02037b14 strh r1, [r0] - ldr r0, _081D8440 + ldr r0, =0x0862aafc bl gpu_tile_obj_decompress_and_load - ldr r0, _081D8444 + ldr r0, =0x0862ab04 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D8448 + ldr r0, =0x0862ab0c bl gpu_pal_obj_decompress_and_apply add sp, 0xC pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_081D8404: .4byte 0x08da7528 -_081D8408: .4byte 0x08da69bc -_081D840C: .4byte 0x08da7aac -_081D8410: .4byte 0x0203cf60 -_081D8414: .4byte 0x08da7784 -_081D8418: .4byte 0x00001804 -_081D841C: .4byte 0x00001004 -_081D8420: .4byte 0x01000200 -_081D8424: .4byte 0x00000804 -_081D8428: .4byte 0x00000904 -_081D842C: .4byte 0x010000d0 -_081D8430: .4byte 0x08da7744 -_081D8434: .4byte 0x02037714 -_081D8438: .4byte 0x00007fff -_081D843C: .4byte 0x02037b14 -_081D8440: .4byte 0x0862aafc -_081D8444: .4byte 0x0862ab04 -_081D8448: .4byte 0x0862ab0c + .pool thumb_func_end sub_81D8358 thumb_func_start sub_81D844C @@ -965250,24 +932509,21 @@ sub_81D844C: @ 81D844C lsrs r0, 16 cmp r0, 0x6F bhi _081D848C - ldr r0, _081D847C + ldr r0, =0x0203cf60 ldr r0, [r0] - ldr r3, _081D8480 + ldr r3, =0x00002008 adds r0, r3 movs r3, 0 ldrsh r0, [r0, r3] cmp r1, r0 bgt _081D848C - ldr r1, _081D8484 - ldr r3, _081D8488 + ldr r1, =0x04000052 + ldr r3, =0x00000d08 b _081D8492 .align 2, 0 -_081D847C: .4byte 0x0203cf60 -_081D8480: .4byte 0x00002008 -_081D8484: .4byte 0x04000052 -_081D8488: .4byte 0x00000d08 + .pool _081D848C: - ldr r1, _081D84B8 + ldr r1, =0x04000052 movs r3, 0x80 lsls r3, 5 _081D8492: @@ -965275,14 +932531,14 @@ _081D8492: strh r0, [r1] cmp r2, 0 bne _081D84E0 - ldr r0, _081D84BC + ldr r0, =0x0203cf60 ldr r1, [r0] - ldr r2, _081D84C0 + ldr r2, =0x00002008 adds r3, r1, r2 ldrh r4, [r3] movs r1, 0 ldrsh r2, [r3, r1] - ldr r1, _081D84C4 + ldr r1, =0x00001fff adds r5, r0, 0 cmp r2, r1 bgt _081D84D4 @@ -965291,10 +932547,7 @@ _081D8492: adds r0, r4, 0x4 b _081D84D2 .align 2, 0 -_081D84B8: .4byte 0x04000052 -_081D84BC: .4byte 0x0203cf60 -_081D84C0: .4byte 0x00002008 -_081D84C4: .4byte 0x00001fff + .pool _081D84C8: cmp r2, 0x4F bgt _081D84D0 @@ -965306,7 +932559,7 @@ _081D84D2: strh r0, [r3] _081D84D4: ldr r1, [r5] - ldr r2, _081D84E8 + ldr r2, =0x0000200a adds r1, r2 ldrh r0, [r1] adds r0, 0x1 @@ -965316,7 +932569,7 @@ _081D84E0: pop {r0} bx r0 .align 2, 0 -_081D84E8: .4byte 0x0000200a + .pool thumb_func_end sub_81D844C thumb_func_start sub_81D84EC @@ -965329,11 +932582,11 @@ sub_81D84EC: @ 81D84EC lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r6, _081D8560 + ldr r6, =0x03005e08 adds r5, r4, r6 bl sub_81D82B0 bl sub_81D8358 - ldr r1, _081D8564 + ldr r1, =0x00001e41 movs r0, 0x50 bl lcd_io_set_bits movs r0, 0x80 @@ -965347,15 +932600,15 @@ sub_81D84EC: @ 81D84EC movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, _081D8568 + ldr r0, =sub_81D67EC + 1 bl SetVBlankCallback - ldr r0, _081D856C + ldr r0, =0x0203cf60 ldr r0, [r0] - ldr r1, _081D8570 + ldr r1, =0x00002008 adds r2, r0, r1 movs r1, 0 strh r1, [r2] - ldr r2, _081D8574 + ldr r2, =0x0000200a adds r0, r2 strh r1, [r0] strh r1, [r5] @@ -965366,7 +932619,7 @@ sub_81D84EC: @ 81D84EC strh r0, [r5, 0x8] subs r6, 0x8 adds r4, r6 - ldr r0, _081D8578 + ldr r0, =sub_81D857C + 1 str r0, [r4] pop {r3} mov r8, r3 @@ -965374,13 +932627,7 @@ sub_81D84EC: @ 81D84EC pop {r0} bx r0 .align 2, 0 -_081D8560: .4byte 0x03005e08 -_081D8564: .4byte 0x00001e41 -_081D8568: .4byte sub_81D67EC + 1 -_081D856C: .4byte 0x0203cf60 -_081D8570: .4byte 0x00002008 -_081D8574: .4byte 0x0000200a -_081D8578: .4byte sub_81D857C + 1 + .pool thumb_func_end sub_81D84EC thumb_func_start sub_81D857C @@ -965392,20 +932639,19 @@ sub_81D857C: @ 81D857C lsls r0, r4, 2 adds r0, r4 lsls r0, 3 - ldr r1, _081D85A0 + ldr r1, =0x03005e08 adds r5, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0x4 bhi _081D8674 lsls r0, 2 - ldr r1, _081D85A4 + ldr r1, =_081D85A8 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081D85A0: .4byte 0x03005e08 -_081D85A4: .4byte _081D85A8 + .pool .align 2, 0 _081D85A8: .4byte _081D85BC @@ -965430,7 +932676,7 @@ _081D85BC: strh r4, [r5, 0x2] b _081D864E _081D85DC: - ldr r0, _081D860C + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -965447,14 +932693,13 @@ _081D85DC: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - ldr r0, _081D8610 + ldr r0, =sub_81D844C + 1 bl SetHBlankCallback movs r0, 0x3 bl enable_irqs b _081D8674 .align 2, 0 -_081D860C: .4byte 0x02037fd4 -_081D8610: .4byte sub_81D844C + 1 + .pool _081D8614: adds r0, r2, 0x1 strh r0, [r5, 0x2] @@ -965500,12 +932745,12 @@ _081D8656: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _081D867C + ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r1, _081D8680 + ldr r1, =sub_81D8684 + 1 str r1, [r0] _081D8674: add sp, 0x4 @@ -965513,8 +932758,7 @@ _081D8674: pop {r0} bx r0 .align 2, 0 -_081D867C: .4byte 0x03005e00 -_081D8680: .4byte sub_81D8684 + 1 + .pool thumb_func_end sub_81D857C thumb_func_start sub_81D8684 @@ -965522,7 +932766,7 @@ sub_81D8684: @ 81D8684 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _081D86C0 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -965534,21 +932778,19 @@ sub_81D8684: @ 81D8684 bl SetHBlankCallback bl reset_all_obj_data bl gpu_pal_allocator_reset - ldr r0, _081D86C4 + ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 - ldr r0, _081D86C8 + ldr r0, =sub_81D6840 + 1 str r0, [r1] _081D86B8: pop {r4} pop {r0} bx r0 .align 2, 0 -_081D86C0: .4byte 0x02037fd4 -_081D86C4: .4byte 0x03005e00 -_081D86C8: .4byte sub_81D6840 + 1 + .pool thumb_func_end sub_81D8684 thumb_func_start sub_81D86CC @@ -965556,7 +932798,7 @@ sub_81D86CC: @ 81D86CC push {r4-r6,lr} mov r6, r8 push {r6} - ldr r0, _081D873C + ldr r0, =0x0862ab14 movs r1, 0xA0 movs r2, 0 movs r3, 0 @@ -965567,10 +932809,10 @@ sub_81D86CC: @ 81D86CC lsls r5, r6, 4 adds r5, r6 lsls r5, 2 - ldr r4, _081D8740 + ldr r4, =0x0202065e adds r0, r5, r4 mov r8, r0 - ldr r0, _081D8744 + ldr r0, =0x0862ab2c movs r2, 0x30 negs r2, r2 movs r1, 0xB8 @@ -965584,7 +932826,7 @@ sub_81D86CC: @ 81D86CC subs r3, 0x2E subs r4, 0x12 adds r4, r5, r4 - ldr r0, _081D8748 + ldr r0, =sub_81D874C + 1 str r0, [r4] adds r5, r3 ldrb r0, [r5, 0x5] @@ -965607,10 +932849,7 @@ sub_81D86CC: @ 81D86CC pop {r1} bx r1 .align 2, 0 -_081D873C: .4byte 0x0862ab14 -_081D8740: .4byte 0x0202065e -_081D8744: .4byte 0x0862ab2c -_081D8748: .4byte sub_81D874C + 1 + .pool thumb_func_end sub_81D86CC thumb_func_start sub_81D874C @@ -965693,7 +932932,7 @@ _081D87C4: ldrh r0, [r5, 0x24] subs r0, 0x1 strh r0, [r5, 0x24] - ldr r2, _081D8824 + ldr r2, =0x02020630 movs r0, 0 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -965714,7 +932953,7 @@ _081D87EE: ldrh r0, [r5, 0x26] adds r0, 0x1 strh r0, [r5, 0x26] - ldr r2, _081D8824 + ldr r2, =0x02020630 movs r0, 0 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -965732,7 +932971,7 @@ _081D8818: pop {r0} bx r0 .align 2, 0 -_081D8824: .4byte 0x02020630 + .pool thumb_func_end sub_81D874C thumb_func_start sub_81D8828 @@ -965741,27 +932980,27 @@ sub_81D8828: @ 81D8828 bl sub_8121DA0 movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081D88BC + ldr r1, =0x0862ab44 movs r0, 0 movs r2, 0x4 bl bg_vram_setup - ldr r4, _081D88C0 + ldr r4, =0x0203cf60 ldr r1, [r4] adds r1, 0x4 movs r0, 0 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D88C4 + ldr r0, =0x00000804 adds r1, r0 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D88C8 + ldr r0, =0x00001004 adds r1, r0 movs r0, 0x2 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D88CC + ldr r0, =0x00001804 adds r1, r0 movs r0, 0x3 bl bg_set_tilemap @@ -965793,11 +933032,7 @@ sub_81D8828: @ 81D8828 pop {r0} bx r0 .align 2, 0 -_081D88BC: .4byte 0x0862ab44 -_081D88C0: .4byte 0x0203cf60 -_081D88C4: .4byte 0x00000804 -_081D88C8: .4byte 0x00001004 -_081D88CC: .4byte 0x00001804 + .pool thumb_func_end sub_81D8828 thumb_func_start sub_81D88D0 @@ -965805,20 +933040,20 @@ sub_81D88D0: @ 81D88D0 push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, _081D8950 + ldr r1, =0x08da80bc movs r4, 0 str r4, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _081D8954 + ldr r1, =0x08da7eac str r4, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _081D8958 + ldr r1, =0x08da7c30 str r4, [sp] movs r0, 0x3 movs r2, 0 @@ -965829,27 +933064,27 @@ _081D8904: lsls r0, 24 cmp r0, 0 bne _081D8904 - ldr r0, _081D895C - ldr r4, _081D8960 + ldr r0, =0x08da8d6c + ldr r4, =0x0203cf60 ldr r1, [r4] adds r1, 0x4 bl call_LZZUnCompWram - ldr r0, _081D8964 + ldr r0, =0x08da8b40 ldr r1, [r4] - ldr r2, _081D8968 + ldr r2, =0x00000804 adds r1, r2 bl call_LZZUnCompWram - ldr r0, _081D896C + ldr r0, =0x08da7fb4 ldr r1, [r4] - ldr r2, _081D8970 + ldr r2, =0x00001004 adds r1, r2 bl call_LZZUnCompWram - ldr r0, _081D8974 + ldr r0, =0x08da7d6c ldr r1, [r4] - ldr r2, _081D8978 + ldr r2, =0x00001804 adds r1, r2 bl call_LZZUnCompWram - ldr r0, _081D897C + ldr r0, =0x08da8e84 movs r1, 0 movs r2, 0x80 bl decompress_palette @@ -965858,18 +933093,7 @@ _081D8904: pop {r0} bx r0 .align 2, 0 -_081D8950: .4byte 0x08da80bc -_081D8954: .4byte 0x08da7eac -_081D8958: .4byte 0x08da7c30 -_081D895C: .4byte 0x08da8d6c -_081D8960: .4byte 0x0203cf60 -_081D8964: .4byte 0x08da8b40 -_081D8968: .4byte 0x00000804 -_081D896C: .4byte 0x08da7fb4 -_081D8970: .4byte 0x00001004 -_081D8974: .4byte 0x08da7d6c -_081D8978: .4byte 0x00001804 -_081D897C: .4byte 0x08da8e84 + .pool thumb_func_end sub_81D88D0 thumb_func_start sub_81D8980 @@ -965880,7 +933104,7 @@ sub_81D8980: @ 81D8980 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _081D89D0 + ldr r5, =0x03005e08 adds r6, r4, r5 bl sub_81D8828 bl sub_81D88D0 @@ -965890,12 +933114,12 @@ sub_81D8980: @ 81D8980 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, _081D89D4 + ldr r0, =sub_81D67EC + 1 bl SetVBlankCallback movs r0, 0 strh r0, [r6] strh r0, [r6, 0x2] - ldr r0, _081D89D8 + ldr r0, =sub_81D8AD8 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -965903,16 +933127,13 @@ sub_81D8980: @ 81D8980 strh r0, [r6, 0x4] subs r5, 0x8 adds r4, r5 - ldr r0, _081D89DC + ldr r0, =sub_81D89E0 + 1 str r0, [r4] pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081D89D0: .4byte 0x03005e08 -_081D89D4: .4byte sub_81D67EC + 1 -_081D89D8: .4byte sub_81D8AD8 + 1 -_081D89DC: .4byte sub_81D89E0 + 1 + .pool thumb_func_end sub_81D8980 thumb_func_start sub_81D89E0 @@ -965924,7 +933145,7 @@ sub_81D89E0: @ 81D89E0 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 - ldr r1, _081D8A30 + ldr r1, =0x03005e08 adds r4, r0, r1 bl sub_81D8BB4 ldrh r1, [r4, 0x6] @@ -965956,7 +933177,7 @@ _081D8A16: beq _081D8A3E b _081D8AC6 .align 2, 0 -_081D8A30: .4byte 0x03005e08 + .pool _081D8A34: cmp r5, 0x2 beq _081D8A8C @@ -965989,18 +933210,17 @@ _081D8A5C: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - ldr r2, _081D8A84 + ldr r2, =0x03005e00 movs r0, 0x4 ldrsh r1, [r4, r0] lsls r0, r1, 2 adds r0, r1 lsls r0, 3 adds r0, r2 - ldr r1, _081D8A88 + ldr r1, =sub_81D8B2C + 1 b _081D8AC4 .align 2, 0 -_081D8A84: .4byte 0x03005e00 -_081D8A88: .4byte sub_81D8B2C + 1 + .pool _081D8A8C: ldrh r1, [r4, 0x2] movs r2, 0x2 @@ -966026,12 +933246,12 @@ _081D8AA8: movs r2, 0 movs r3, 0x10 bl sub_80A1AD4 - ldr r1, _081D8AD0 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 adds r0, r1 - ldr r1, _081D8AD4 + ldr r1, =sub_81D8BEC + 1 _081D8AC4: str r1, [r0] _081D8AC6: @@ -966040,8 +933260,7 @@ _081D8AC6: pop {r0} bx r0 .align 2, 0 -_081D8AD0: .4byte 0x03005e00 -_081D8AD4: .4byte sub_81D8BEC + 1 + .pool thumb_func_end sub_81D89E0 thumb_func_start sub_81D8AD8 @@ -966052,7 +933271,7 @@ sub_81D8AD8: @ 81D8AD8 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081D8B28 + ldr r0, =0x03005e08 adds r5, r1, r0 ldrh r1, [r5, 0x1E] movs r0, 0x3 @@ -966084,7 +933303,7 @@ _081D8B1C: pop {r0} bx r0 .align 2, 0 -_081D8B28: .4byte 0x03005e08 + .pool thumb_func_end sub_81D8AD8 thumb_func_start sub_81D8B2C @@ -966095,7 +933314,7 @@ sub_81D8B2C: @ 81D8B2C lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081D8B6C + ldr r0, =0x03005e08 adds r4, r1, r0 movs r1, 0 ldrsh r0, [r4, r1] @@ -966119,7 +933338,7 @@ sub_81D8B2C: @ 81D8B2C adds r0, r1, 0 b _081D8BAA .align 2, 0 -_081D8B6C: .4byte 0x03005e08 + .pool _081D8B70: cmp r0, 0x1 bne _081D8BAC @@ -966192,10 +933411,10 @@ sub_81D8BEC: @ 81D8BEC lsls r1, r0, 2 adds r1, r0 lsls r5, r1, 3 - ldr r6, _081D8C2C + ldr r6, =0x03005e08 adds r4, r5, r6 bl sub_81D8BB4 - ldr r0, _081D8C30 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -966209,16 +933428,14 @@ sub_81D8BEC: @ 81D8BEC adds r0, r6, 0 subs r0, 0x8 adds r0, r5, r0 - ldr r1, _081D8C34 + ldr r1, =sub_81D6840 + 1 str r1, [r0] _081D8C26: pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081D8C2C: .4byte 0x03005e08 -_081D8C30: .4byte 0x02037fd4 -_081D8C34: .4byte sub_81D6840 + 1 + .pool thumb_func_end sub_81D8BEC thumb_func_start sub_81D8C38 @@ -966227,22 +933444,22 @@ sub_81D8C38: @ 81D8C38 bl sub_8121DA0 movs r0, 0 bl gpu_reset_bgs_and_dma3_busy_flags - ldr r1, _081D8CB4 + ldr r1, =0x0862ad08 movs r0, 0x1 movs r2, 0x3 bl bg_vram_setup - ldr r4, _081D8CB8 + ldr r4, =0x0203cf60 ldr r1, [r4] adds r1, 0x4 movs r0, 0 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D8CBC + ldr r0, =0x00000804 adds r1, r0 movs r0, 0x1 bl bg_set_tilemap ldr r1, [r4] - ldr r0, _081D8CC0 + ldr r0, =0x00001004 adds r1, r0 movs r0, 0x2 bl bg_set_tilemap @@ -966270,10 +933487,7 @@ sub_81D8C38: @ 81D8C38 pop {r0} bx r0 .align 2, 0 -_081D8CB4: .4byte 0x0862ad08 -_081D8CB8: .4byte 0x0203cf60 -_081D8CBC: .4byte 0x00000804 -_081D8CC0: .4byte 0x00001004 + .pool thumb_func_end sub_81D8C38 thumb_func_start sub_81D8CC4 @@ -966281,14 +933495,14 @@ sub_81D8CC4: @ 81D8CC4 push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, _081D8D68 + ldr r1, =0x08daab24 movs r4, 0 str r4, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, _081D8D6C + ldr r1, =0x08daa8b4 str r4, [sp] movs r0, 0 movs r2, 0 @@ -966299,69 +933513,51 @@ _081D8CEA: lsls r0, 24 cmp r0, 0 bne _081D8CEA - ldr r0, _081D8D70 - ldr r4, _081D8D74 + ldr r0, =0x08daae54 + ldr r4, =0x0203cf60 ldr r1, [r4] - ldr r2, _081D8D78 + ldr r2, =0x00000804 adds r1, r2 bl call_LZZUnCompWram - ldr r0, _081D8D7C + ldr r0, =0x08daac1c ldr r1, [r4] adds r1, 0x4 bl call_LZZUnCompWram - ldr r0, _081D8D80 + ldr r0, =0x08daaf98 ldr r1, [r4] - ldr r2, _081D8D84 + ldr r2, =0x00001004 adds r1, r2 bl call_LZZUnCompWram - ldr r0, _081D8D88 + ldr r0, =0x08daafec movs r1, 0 movs r2, 0x60 bl decompress_palette - ldr r0, _081D8D8C + ldr r0, =0x0862ac28 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D8D90 + ldr r0, =0x0862ac30 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D8D94 + ldr r0, =0x0862ac38 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D8D98 + ldr r0, =0x0862ac40 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D8D9C + ldr r0, =0x0862ac48 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D8DA0 + ldr r0, =0x0862ac50 bl gpu_tile_obj_decompress_and_load - ldr r0, _081D8DA4 + ldr r0, =0x0862ac58 bl gpu_pal_obj_decompress_and_apply - ldr r0, _081D8DA8 + ldr r0, =0x0862ac60 bl gpu_pal_obj_decompress_and_apply - ldr r0, _081D8DAC + ldr r0, =0x0862ac68 bl gpu_pal_obj_decompress_and_apply - ldr r0, _081D8DB0 + ldr r0, =0x0862ac70 bl gpu_pal_obj_decompress_and_apply add sp, 0x4 pop {r4} pop {r0} bx r0 .align 2, 0 -_081D8D68: .4byte 0x08daab24 -_081D8D6C: .4byte 0x08daa8b4 -_081D8D70: .4byte 0x08daae54 -_081D8D74: .4byte 0x0203cf60 -_081D8D78: .4byte 0x00000804 -_081D8D7C: .4byte 0x08daac1c -_081D8D80: .4byte 0x08daaf98 -_081D8D84: .4byte 0x00001004 -_081D8D88: .4byte 0x08daafec -_081D8D8C: .4byte 0x0862ac28 -_081D8D90: .4byte 0x0862ac30 -_081D8D94: .4byte 0x0862ac38 -_081D8D98: .4byte 0x0862ac40 -_081D8D9C: .4byte 0x0862ac48 -_081D8DA0: .4byte 0x0862ac50 -_081D8DA4: .4byte 0x0862ac58 -_081D8DA8: .4byte 0x0862ac60 -_081D8DAC: .4byte 0x0862ac68 -_081D8DB0: .4byte 0x0862ac70 + .pool thumb_func_end sub_81D8CC4 thumb_func_start sub_81D8DB4 @@ -966372,7 +933568,7 @@ sub_81D8DB4: @ 81D8DB4 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r5, _081D8E68 + ldr r5, =0x03005e08 adds r6, r4, r5 bl sub_81D8C38 bl sub_81D8CC4 @@ -966381,10 +933577,10 @@ sub_81D8DB4: @ 81D8DB4 lsls r1, 3 movs r0, 0 bl lcd_io_clear_bits - ldr r1, _081D8E6C + ldr r1, =0x00000241 movs r0, 0x50 bl lcd_io_set - ldr r1, _081D8E70 + ldr r1, =0x00000e09 movs r0, 0x52 bl lcd_io_set movs r0, 0x1 @@ -966392,16 +933588,16 @@ sub_81D8DB4: @ 81D8DB4 movs r1, 0x10 movs r2, 0 bl sub_80A2A20 - ldr r0, _081D8E74 + ldr r0, =sub_81D67EC + 1 bl SetVBlankCallback movs r0, 0 strh r0, [r6] strh r0, [r6, 0x2] subs r5, 0x8 adds r4, r5 - ldr r0, _081D8E78 + ldr r0, =sub_81D8E80 + 1 str r0, [r4] - ldr r0, _081D8E7C + ldr r0, =sub_81D8FB0 + 1 movs r1, 0 bl AddTask lsls r0, 24 @@ -966448,12 +933644,7 @@ sub_81D8DB4: @ 81D8DB4 pop {r0} bx r0 .align 2, 0 -_081D8E68: .4byte 0x03005e08 -_081D8E6C: .4byte 0x00000241 -_081D8E70: .4byte 0x00000e09 -_081D8E74: .4byte sub_81D67EC + 1 -_081D8E78: .4byte sub_81D8E80 + 1 -_081D8E7C: .4byte sub_81D8FB0 + 1 + .pool thumb_func_end sub_81D8DB4 thumb_func_start sub_81D8E80 @@ -966467,7 +933658,7 @@ sub_81D8E80: @ 81D8E80 lsls r0, r6, 2 adds r0, r6 lsls r7, r0, 3 - ldr r0, _081D8EAC + ldr r0, =0x03005e08 mov r8, r0 adds r4, r7, r0 movs r1, 0 @@ -966480,7 +933671,7 @@ sub_81D8E80: @ 81D8E80 beq _081D8EBA b _081D8FA0 .align 2, 0 -_081D8EAC: .4byte 0x03005e08 + .pool _081D8EB0: cmp r5, 0x2 beq _081D8F1E @@ -966505,7 +933696,7 @@ _081D8EBA: strh r5, [r4, 0x2] b _081D8F30 _081D8EDE: - ldr r2, _081D8F10 + ldr r2, =0x02020630 movs r0, 0xA ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -966514,7 +933705,7 @@ _081D8EDE: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081D8F14 + ldr r0, =sub_81D97E0 + 1 cmp r1, r0 bne _081D8FA0 ldrh r1, [r4, 0x2] @@ -966528,8 +933719,7 @@ _081D8EDE: bl sub_81D93D8 b _081D8F2C .align 2, 0 -_081D8F10: .4byte 0x02020630 -_081D8F14: .4byte sub_81D97E0 + 1 + .pool _081D8F18: adds r0, r1, 0x1 strh r0, [r4, 0x2] @@ -966561,8 +933751,8 @@ _081D8F38: asrs r4, r0, 16 cmp r4, 0 bne _081D8FA0 - ldr r0, _081D8F78 - ldr r1, _081D8F7C + ldr r0, =0x0000fffe + ldr r1, =0x0000ffff str r1, [sp] str r4, [sp, 0x4] str r4, [sp, 0x8] @@ -966570,7 +933760,7 @@ _081D8F38: movs r2, 0x10 movs r3, 0 bl sub_80A2C44 - ldr r0, _081D8F80 + ldr r0, =0xffff0000 str r4, [sp] str r4, [sp, 0x4] movs r1, 0x1 @@ -966581,9 +933771,7 @@ _081D8F38: bl sub_80A2C44 b _081D8FA0 .align 2, 0 -_081D8F78: .4byte 0x0000fffe -_081D8F7C: .4byte 0x0000ffff -_081D8F80: .4byte 0xffff0000 + .pool _081D8F84: movs r0, 0x1 negs r0, r0 @@ -966596,7 +933784,7 @@ _081D8F84: mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - ldr r1, _081D8FAC + ldr r1, =sub_81D9034 + 1 str r1, [r0] _081D8FA0: add sp, 0xC @@ -966606,7 +933794,7 @@ _081D8FA0: pop {r0} bx r0 .align 2, 0 -_081D8FAC: .4byte sub_81D9034 + 1 + .pool thumb_func_end sub_81D8E80 thumb_func_start sub_81D8FB0 @@ -966617,7 +933805,7 @@ sub_81D8FB0: @ 81D8FB0 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081D9030 + ldr r0, =0x03005e08 adds r4, r1, r0 ldrh r1, [r4] movs r0, 0xF @@ -966679,7 +933867,7 @@ _081D9024: pop {r0} bx r0 .align 2, 0 -_081D9030: .4byte 0x03005e08 + .pool thumb_func_end sub_81D8FB0 thumb_func_start sub_81D9034 @@ -966690,9 +933878,9 @@ sub_81D9034: @ 81D9034 lsls r1, r0, 2 adds r1, r0 lsls r6, r1, 3 - ldr r7, _081D9090 + ldr r7, =0x03005e08 adds r4, r6, r7 - ldr r0, _081D9094 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -966722,13 +933910,11 @@ _081D9078: adds r0, r7, 0 subs r0, 0x8 adds r0, r6, r0 - ldr r1, _081D9098 + ldr r1, =sub_81D6840 + 1 str r1, [r0] b _081D90A0 .align 2, 0 -_081D9090: .4byte 0x03005e08 -_081D9094: .4byte 0x02037fd4 -_081D9098: .4byte sub_81D6840 + 1 + .pool _081D909C: adds r0, r1, 0x1 strh r0, [r4, 0x2] @@ -966750,9 +933936,9 @@ sub_81D90A8: @ 81D90A8 lsls r4, r0, 2 adds r4, r0 lsls r4, 3 - ldr r0, _081D9258 + ldr r0, =0x03005e08 adds r4, r0 - ldr r0, _081D925C + ldr r0, =0x0862ac78 movs r1, 0x40 movs r2, 0x78 movs r3, 0 @@ -966765,10 +933951,10 @@ sub_81D90A8: @ 81D90A8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081D9260 + ldr r1, =0x0202065e mov r10, r1 adds r7, r0, r1 - ldr r0, _081D9264 + ldr r0, =0x0862ac90 movs r1, 0x10 movs r2, 0x82 movs r3, 0 @@ -966808,7 +933994,7 @@ sub_81D90A8: @ 81D90A8 mov r2, r9 orrs r0, r2 strb r0, [r1, 0x5] - ldr r5, _081D9268 + ldr r5, =0x0862aca8 adds r0, r5, 0 movs r1, 0xA0 movs r2, 0x80 @@ -966892,7 +934078,7 @@ sub_81D90A8: @ 81D90A8 add r0, r8 movs r1, 0x2 bl obj_anim_image_start - ldr r0, _081D926C + ldr r0, =0x0862acc0 movs r2, 0x41 negs r2, r2 movs r1, 0x78 @@ -966908,7 +934094,7 @@ sub_81D90A8: @ 81D90A8 lsls r0, 2 mov r1, r10 adds r7, r0, r1 - ldr r0, _081D9270 + ldr r0, =0x0862acd8 movs r2, 0x71 negs r2, r2 movs r1, 0x78 @@ -966947,13 +934133,7 @@ sub_81D90A8: @ 81D90A8 pop {r0} bx r0 .align 2, 0 -_081D9258: .4byte 0x03005e08 -_081D925C: .4byte 0x0862ac78 -_081D9260: .4byte 0x0202065e -_081D9264: .4byte 0x0862ac90 -_081D9268: .4byte 0x0862aca8 -_081D926C: .4byte 0x0862acc0 -_081D9270: .4byte 0x0862acd8 + .pool thumb_func_end sub_81D90A8 thumb_func_start sub_81D9274 @@ -966966,9 +934146,9 @@ sub_81D9274: @ 81D9274 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 - ldr r0, _081D932C + ldr r0, =0x03005e08 adds r2, r0 - ldr r3, _081D9330 + ldr r3, =0x02020630 movs r0, 0x6 ldrsh r1, [r2, r0] lsls r0, r1, 4 @@ -966978,7 +934158,7 @@ sub_81D9274: @ 81D9274 adds r1, r3 mov r8, r1 add r0, r8 - ldr r6, _081D9334 + ldr r6, =pokemon_alive_on_battle_side + 1 str r6, [r0] movs r0, 0x6 ldrsh r1, [r2, r0] @@ -967050,9 +934230,7 @@ sub_81D9274: @ 81D9274 pop {r0} bx r0 .align 2, 0 -_081D932C: .4byte 0x03005e08 -_081D9330: .4byte 0x02020630 -_081D9334: .4byte pokemon_alive_on_battle_side + 1 + .pool thumb_func_end sub_81D9274 thumb_func_start pokemon_alive_on_battle_side @@ -967072,7 +934250,7 @@ pokemon_alive_on_battle_side: @ 81D9338 ldrh r3, [r4, 0x3A] subs r0, r3 strh r0, [r4, 0x20] - ldr r2, _081D936C + ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -967083,13 +934261,13 @@ pokemon_alive_on_battle_side: @ 81D9338 subs r1, r3 b _081D939E .align 2, 0 -_081D936C: .4byte 0x02020630 + .pool _081D9370: ldrh r2, [r4, 0x3A] ldrh r1, [r4, 0x20] adds r0, r2, r1 strh r0, [r4, 0x20] - ldr r3, _081D93C4 + ldr r3, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -967124,12 +934302,11 @@ _081D939E: strh r2, [r4, 0x36] strh r2, [r4, 0x38] strh r2, [r4, 0x3A] - ldr r0, _081D93C8 + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] b _081D93D2 .align 2, 0 -_081D93C4: .4byte 0x02020630 -_081D93C8: .4byte nullsub_12 + 1 + .pool _081D93CC: ldrh r0, [r4, 0x36] adds r0, 0x1 @@ -967148,9 +934325,9 @@ sub_81D93D8: @ 81D93D8 lsls r2, r0, 2 adds r2, r0 lsls r2, 3 - ldr r0, _081D9414 + ldr r0, =0x03005e08 adds r2, r0 - ldr r3, _081D9418 + ldr r3, =0x02020630 movs r0, 0x6 ldrsh r1, [r2, r0] lsls r0, r1, 4 @@ -967159,7 +934336,7 @@ sub_81D93D8: @ 81D93D8 adds r1, r3, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _081D941C + ldr r1, =sub_81D9420 + 1 str r1, [r0] movs r0, 0x6 ldrsh r1, [r2, r0] @@ -967172,9 +934349,7 @@ sub_81D93D8: @ 81D93D8 pop {r0} bx r0 .align 2, 0 -_081D9414: .4byte 0x03005e08 -_081D9418: .4byte 0x02020630 -_081D941C: .4byte sub_81D9420 + 1 + .pool thumb_func_end sub_81D93D8 thumb_func_start sub_81D9420 @@ -967205,7 +934380,7 @@ _081D9440: movs r1, 0xC bl __umodsi3 lsls r0, 24 - ldr r2, _081D9484 + ldr r2, =0x02020630 cmp r0, 0 bne _081D9470 ldrh r0, [r4, 0x20] @@ -967231,16 +934406,16 @@ _081D9470: strh r0, [r1, 0x26] b _081D94C4 .align 2, 0 -_081D9484: .4byte 0x02020630 + .pool _081D9488: - ldr r2, _081D94CC + ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 adds r0, r2 - ldr r1, _081D94D0 + ldr r1, =0x0000fffe strh r1, [r0, 0x26] adds r0, r4, 0 adds r0, 0x2C @@ -967268,8 +934443,7 @@ _081D94C4: pop {r0} bx r0 .align 2, 0 -_081D94CC: .4byte 0x02020630 -_081D94D0: .4byte 0x0000fffe + .pool thumb_func_end sub_81D9420 thumb_func_start sub_81D94D4 @@ -967280,18 +934454,18 @@ sub_81D94D4: @ 81D94D4 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _081D951C + ldr r0, =0x03005e08 adds r1, r0 movs r0, 0x8 ldrsh r1, [r1, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r2, _081D9520 + ldr r2, =0x0202065e adds r4, r0, r2 subs r2, 0x12 adds r0, r2 - ldr r3, _081D9524 + ldr r3, =sub_81D9528 + 1 str r3, [r0] movs r0, 0 ldrsh r1, [r4, r0] @@ -967311,9 +934485,7 @@ sub_81D94D4: @ 81D94D4 pop {r0} bx r0 .align 2, 0 -_081D951C: .4byte 0x03005e08 -_081D9520: .4byte 0x0202065e -_081D9524: .4byte sub_81D9528 + 1 + .pool thumb_func_end sub_81D94D4 thumb_func_start sub_81D9528 @@ -967332,10 +934504,10 @@ sub_81D9528: @ 81D9528 ldrsh r0, [r7, r2] cmp r0, 0x1 bne _081D954C - ldr r0, _081D9548 + ldr r0, =0x0000ffff b _081D954E .align 2, 0 -_081D9548: .4byte 0x0000ffff + .pool _081D954C: movs r0, 0x1 _081D954E: @@ -967345,7 +934517,7 @@ _081D9550: ldrsh r0, [r7, r1] cmp r0, 0x80 bne _081D95CE - ldr r2, _081D95F0 + ldr r2, =0x0862acf0 mov r8, r2 mov r0, r8 movs r1, 0x98 @@ -967355,7 +934527,7 @@ _081D9550: lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x3C] - ldr r5, _081D95F4 + ldr r5, =0x02020630 movs r1, 0x3C ldrsh r0, [r7, r1] lsls r1, r0, 4 @@ -967420,8 +934592,7 @@ _081D95CE: strh r0, [r7, 0x26] b _081D95FC .align 2, 0 -_081D95F0: .4byte 0x0862acf0 -_081D95F4: .4byte 0x02020630 + .pool _081D95F8: adds r0, r1, 0x1 strh r0, [r7, 0x38] @@ -967455,7 +934626,7 @@ sub_81D961C: @ 81D961C ldrh r0, [r4, 0x26] adds r0, 0x2 strh r0, [r4, 0x26] - ldr r5, _081D9684 + ldr r5, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -967479,7 +934650,7 @@ _081D964C: bl sub_81D9868 movs r2, 0x5 strh r2, [r4, 0x36] - ldr r0, _081D9688 + ldr r0, =0x0000ffff strh r0, [r4, 0x38] movs r0, 0x2E ldrsh r1, [r4, r0] @@ -967498,8 +934669,7 @@ _081D964C: strh r2, [r0, 0x38] b _081D979E .align 2, 0 -_081D9684: .4byte 0x02020630 -_081D9688: .4byte 0x0000ffff + .pool _081D968C: cmp r1, 0x6F bgt _081D96BE @@ -967527,7 +934697,7 @@ _081D96A4: _081D96BE: cmp r1, 0x70 bne _081D96EC - ldr r2, _081D96E8 + ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -967546,9 +934716,9 @@ _081D96BE: strh r1, [r0, 0x38] b _081D96F2 .align 2, 0 -_081D96E8: .4byte 0x02020630 + .pool _081D96EC: - ldr r0, _081D96FC + ldr r0, =0x00000147 cmp r1, r0 bgt _081D9700 _081D96F2: @@ -967556,7 +934726,7 @@ _081D96F2: bl sub_81D97E0 b _081D979E .align 2, 0 -_081D96FC: .4byte 0x00000147 + .pool _081D9700: movs r0, 0xA4 lsls r0, 1 @@ -967571,7 +934741,7 @@ _081D9700: bl sub_81D9868 movs r3, 0x1 strh r3, [r4, 0x24] - ldr r2, _081D9744 + ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -967583,13 +934753,12 @@ _081D9700: lsls r0, 1 movs r1, 0 bl cry_related - ldr r0, _081D9748 + ldr r0, =sub_81D98B4 + 1 movs r1, 0 bl AddTask b _081D979E .align 2, 0 -_081D9744: .4byte 0x02020630 -_081D9748: .4byte sub_81D98B4 + 1 + .pool _081D974C: movs r0, 0xB0 lsls r0, 1 @@ -967600,7 +934769,7 @@ _081D974C: bne _081D979E movs r3, 0 strh r3, [r4, 0x24] - ldr r2, _081D9788 + ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -967615,14 +934784,13 @@ _081D974C: movs r2, 0x30 movs r3, 0x10 bl sub_81D9868 - ldr r0, _081D978C + ldr r0, =sub_81D97E0 + 1 str r0, [r4, 0x1C] b _081D97D2 .align 2, 0 -_081D9788: .4byte 0x02020630 -_081D978C: .4byte sub_81D97E0 + 1 + .pool _081D9790: - ldr r0, _081D97D8 + ldr r0, =sub_81D8E80 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -967643,7 +934811,7 @@ _081D979E: ldrsh r2, [r4, r1] negs r2, r2 strh r2, [r4, 0x24] - ldr r3, _081D97DC + ldr r3, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -967660,8 +934828,7 @@ _081D97D2: pop {r0} bx r0 .align 2, 0 -_081D97D8: .4byte sub_81D8E80 + 1 -_081D97DC: .4byte 0x02020630 + .pool thumb_func_end sub_81D961C thumb_func_start sub_81D97E0 @@ -967673,7 +934840,7 @@ sub_81D97E0: @ 81D97E0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _081D9840 + ldr r5, =0x02020630 adds r4, r0, r5 ldrh r1, [r3, 0x3A] ldrh r0, [r4, 0x36] @@ -967715,7 +934882,7 @@ _081D9836: strh r6, [r3, 0x36] b _081D9854 .align 2, 0 -_081D9840: .4byte 0x02020630 + .pool _081D9844: movs r0, 0x36 ldrsh r1, [r3, r0] @@ -967750,7 +934917,7 @@ sub_81D9868: @ 81D9868 lsls r4, r1, 4 adds r4, r1 lsls r4, 2 - ldr r1, _081D98B0 + ldr r1, =0x02020630 adds r4, r1 lsls r2, 16 asrs r2, 16 @@ -967775,7 +934942,7 @@ sub_81D9868: @ 81D9868 pop {r0} bx r0 .align 2, 0 -_081D98B0: .4byte 0x02020630 + .pool thumb_func_end sub_81D9868 thumb_func_start sub_81D98B4 @@ -967787,7 +934954,7 @@ sub_81D98B4: @ 81D98B4 lsls r0, r5, 2 adds r0, r5 lsls r0, 3 - ldr r1, _081D98D8 + ldr r1, =0x03005e08 adds r4, r0, r1 movs r0, 0 ldrsh r1, [r4, r0] @@ -967799,7 +934966,7 @@ sub_81D98B4: @ 81D98B4 beq _081D98E2 b _081D99B4 .align 2, 0 -_081D98D8: .4byte 0x03005e08 + .pool _081D98DC: cmp r1, 0x2 beq _081D99A4 @@ -967922,7 +935089,7 @@ sub_81D99BC: @ 81D99BC bl sub_80D2578 cmp r0, 0 bne _081D99DC - ldr r4, _081D99D8 + ldr r4, =0x02021cc4 bl sub_80D2548 adds r1, r0, 0 adds r0, r4, 0 @@ -967930,7 +935097,7 @@ sub_81D99BC: @ 81D99BC movs r0, 0x1 b _081D99DE .align 2, 0 -_081D99D8: .4byte 0x02021cc4 + .pool _081D99DC: movs r0, 0 _081D99DE: @@ -967943,14 +935110,14 @@ _081D99DE: sub_81D99E4: @ 81D99E4 push {r4,lr} sub sp, 0x8 - ldr r4, _081D9A14 + ldr r4, =0x02021dc4 bl sub_80D2548 adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy movs r0, 0 str r0, [sp] - ldr r0, _081D9A18 + ldr r0, =sub_81D9A1C + 1 str r0, [sp, 0x4] movs r0, 0x4 adds r1, r4, 0 @@ -967962,15 +935129,14 @@ sub_81D99E4: @ 81D99E4 pop {r0} bx r0 .align 2, 0 -_081D9A14: .4byte 0x02021dc4 -_081D9A18: .4byte sub_81D9A1C + 1 + .pool thumb_func_end sub_81D99E4 thumb_func_start sub_81D9A1C sub_81D9A1C: @ 81D9A1C push {r4,r5,lr} - ldr r4, _081D9A3C - ldr r5, _081D9A40 + ldr r4, =0x020375e0 + ldr r5, =0x02021dc4 adds r0, r5, 0 bl sub_81D9A98 strh r0, [r4] @@ -967983,19 +935149,18 @@ sub_81D9A1C: @ 81D9A1C beq _081D9A62 b _081D9A68 .align 2, 0 -_081D9A3C: .4byte 0x020375e0 -_081D9A40: .4byte 0x02021dc4 + .pool _081D9A44: cmp r0, 0x2 bne _081D9A68 bl sub_80D2578 cmp r0, 0 beq _081D9A5C - ldr r0, _081D9A58 + ldr r0, =0x085ee49a bl sub_80D255C b _081D9A68 .align 2, 0 -_081D9A58: .4byte 0x085ee49a + .pool _081D9A5C: movs r0, 0x1 strh r0, [r4] @@ -968004,24 +935169,21 @@ _081D9A62: adds r0, r5, 0 bl sub_80D255C _081D9A68: - ldr r4, _081D9A88 + ldr r4, =0x02021cc4 bl sub_80D2548 adds r1, r0, 0 adds r0, r4, 0 bl gf_strcpy - ldr r1, _081D9A8C - ldr r0, _081D9A90 + ldr r1, =0x03005dac + ldr r0, =sub_80AF168 + 1 str r0, [r1] - ldr r0, _081D9A94 + ldr r0, =c2_exit_to_overworld_2_switch + 1 bl set_callback2 pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_081D9A88: .4byte 0x02021cc4 -_081D9A8C: .4byte 0x03005dac -_081D9A90: .4byte sub_80AF168 + 1 -_081D9A94: .4byte c2_exit_to_overworld_2_switch + 1 + .pool thumb_func_end sub_81D9A1C thumb_func_start sub_81D9A98 @@ -968056,14 +935218,14 @@ sub_81D9AC4: @ 81D9AC4 mov r7, r8 push {r7} sub sp, 0x10 - ldr r0, _081D9B38 + ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xA bl sub_80842DC adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _081D9B3C + ldr r0, =0x020375f0 mov r8, r0 bl sub_80D2548 mov r7, sp @@ -968104,8 +935266,7 @@ _081D9B1E: pop {r1} bx r1 .align 2, 0 -_081D9B38: .4byte 0x03005d90 -_081D9B3C: .4byte 0x020375f0 + .pool thumb_func_end sub_81D9AC4 thumb_func_start sub_81D9B40 @@ -968114,7 +935275,7 @@ sub_81D9B40: @ 81D9B40 lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _081D9B58 + ldr r3, =0x0862ad14 _081D9B4A: adds r0, r1, r3 ldrb r0, [r0] @@ -968124,7 +935285,7 @@ _081D9B4A: lsrs r0, 24 b _081D9B64 .align 2, 0 -_081D9B58: .4byte 0x0862ad14 + .pool _081D9B5C: adds r1, 0x1 cmp r1, 0x1F @@ -968491,7 +935652,7 @@ sub_81D9DE4: @ 81D9DE4 push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 - ldr r1, _081D9E08 + ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -968501,13 +935662,12 @@ sub_81D9DE4: @ 81D9DE4 cmp r0, 0x4 bhi _081D9EA4 lsls r0, 2 - ldr r1, _081D9E0C + ldr r1, =_081D9E10 adds r0, r1 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081D9E08: .4byte 0x03005e00 -_081D9E0C: .4byte _081D9E10 + .pool .align 2, 0 _081D9E10: .4byte _081D9E24 @@ -968516,83 +935676,75 @@ _081D9E10: .4byte _081D9E84 .4byte _081D9EA4 _081D9E24: - ldr r4, _081D9E38 - ldr r0, _081D9E3C + ldr r4, =0x02039f31 + ldr r0, =0x02039f24 ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081D9E40 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 b _081D9EB4 .align 2, 0 -_081D9E38: .4byte 0x02039f31 -_081D9E3C: .4byte 0x02039f24 -_081D9E40: .4byte 0x020244ec + .pool _081D9E44: - ldr r4, _081D9E58 - ldr r0, _081D9E5C + ldr r4, =0x02039f31 + ldr r0, =0x02039f24 ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081D9E60 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 b _081D9EB4 .align 2, 0 -_081D9E58: .4byte 0x02039f31 -_081D9E5C: .4byte 0x02039f24 -_081D9E60: .4byte 0x020244ec + .pool _081D9E64: - ldr r4, _081D9E78 - ldr r0, _081D9E7C + ldr r4, =0x02039f31 + ldr r0, =0x02039f24 ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081D9E80 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 b _081D9EB4 .align 2, 0 -_081D9E78: .4byte 0x02039f31 -_081D9E7C: .4byte 0x02039f24 -_081D9E80: .4byte 0x020244ec + .pool _081D9E84: - ldr r4, _081D9E98 - ldr r0, _081D9E9C + ldr r4, =0x02039f31 + ldr r0, =0x02039f24 ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081D9EA0 + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 b _081D9EB4 .align 2, 0 -_081D9E98: .4byte 0x02039f31 -_081D9E9C: .4byte 0x02039f24 -_081D9EA0: .4byte 0x020244ec + .pool _081D9EA4: - ldr r4, _081D9EF4 - ldr r0, _081D9EF8 + ldr r4, =0x02039f31 + ldr r0, =0x02039f24 ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _081D9EFC + ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 _081D9EB4: bl pokemon_getattr strb r0, [r4] - ldr r5, _081D9F00 - ldr r4, _081D9F04 + ldr r5, =0x02039e00 + ldr r4, =0x02039f25 ldrb r0, [r4] lsls r0, 6 adds r0, r5 - ldr r1, _081D9EF4 + ldr r1, =0x02039f31 ldrb r1, [r1] adds r0, 0x2C strb r1, [r0] - ldr r0, _081D9F08 + ldr r0, =0x00000864 bl flag_check lsls r0, 24 lsrs r0, 24 @@ -968603,22 +935755,15 @@ _081D9EB4: adds r1, r5 adds r1, 0x2D strb r0, [r1] - ldr r1, _081D9F0C - ldr r2, _081D9F10 + ldr r1, =sub_81DA160 + 1 + ldr r2, =sub_81D9F14 + 1 adds r0, r6, 0 bl set_task_function_and_args_14_15 pop {r4-r6} pop {r0} bx r0 .align 2, 0 -_081D9EF4: .4byte 0x02039f31 -_081D9EF8: .4byte 0x02039f24 -_081D9EFC: .4byte 0x020244ec -_081D9F00: .4byte 0x02039e00 -_081D9F04: .4byte 0x02039f25 -_081D9F08: .4byte 0x00000864 -_081D9F0C: .4byte sub_81DA160 + 1 -_081D9F10: .4byte sub_81D9F14 + 1 + .pool thumb_func_end sub_81D9DE4 thumb_func_start sub_81D9F14 @@ -968626,14 +935771,13 @@ sub_81D9F14: @ 81D9F14 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081D9F28 - ldr r2, _081D9F2C + ldr r1, =sub_81DA244 + 1 + ldr r2, =sub_81D9F30 + 1 bl set_task_function_and_args_14_15 pop {r0} bx r0 .align 2, 0 -_081D9F28: .4byte sub_81DA244 + 1 -_081D9F2C: .4byte sub_81D9F30 + 1 + .pool thumb_func_end sub_81D9F14 thumb_func_start sub_81D9F30 @@ -968641,14 +935785,13 @@ sub_81D9F30: @ 81D9F30 push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081D9F44 - ldr r2, _081D9F48 + ldr r1, =sub_81DA2E8 + 1 + ldr r2, =sub_81D9F4C + 1 bl set_task_function_and_args_14_15 pop {r0} bx r0 .align 2, 0 -_081D9F44: .4byte sub_81DA2E8 + 1 -_081D9F48: .4byte sub_81D9F4C + 1 + .pool thumb_func_end sub_81D9F30 thumb_func_start sub_81D9F4C @@ -968656,14 +935799,13 @@ sub_81D9F4C: @ 81D9F4C push {lr} lsls r0, 24 lsrs r0, 24 - ldr r1, _081D9F60 - ldr r2, _081D9F64 + ldr r1, =sub_81DA3B8 + 1 + ldr r2, =sub_81D9F68 + 1 bl set_task_function_and_args_14_15 pop {r0} bx r0 .align 2, 0 -_081D9F60: .4byte sub_81DA3B8 + 1 -_081D9F64: .4byte sub_81D9F68 + 1 + .pool thumb_func_end sub_81D9F4C thumb_func_start sub_81D9F68 @@ -968679,9 +935821,9 @@ sub_81D9F68: @ 81D9F68 str r0, [sp] str r0, [sp, 0x4] movs r3, 0 - ldr r5, _081D9FE8 + ldr r5, =0x02039f30 mov r8, r5 - ldr r0, _081D9FEC + ldr r0, =0x020375e0 mov r12, r0 add r1, sp, 0x4 mov r9, r1 @@ -968691,7 +935833,7 @@ sub_81D9F68: @ 81D9F68 lsls r0, r6, 2 adds r0, r6 lsls r4, r0, 3 - ldr r7, _081D9FF0 + ldr r7, =0x03005e08 _081D9F98: mov r0, sp adds r2, r0, r3 @@ -968736,9 +935878,7 @@ _081D9FD6: strh r0, [r1] b _081D9FFA .align 2, 0 -_081D9FE8: .4byte 0x02039f30 -_081D9FEC: .4byte 0x020375e0 -_081D9FF0: .4byte 0x03005e08 + .pool _081D9FF4: movs r0, 0x1 mov r4, r12 @@ -968754,7 +935894,7 @@ _081D9FFA: lsls r0, r6, 2 adds r0, r6 lsls r2, r0, 3 - ldr r5, _081DA088 + ldr r5, =0x03005e08 _081DA010: adds r1, r4, r3 adds r0, r3, 0x5 @@ -968778,7 +935918,7 @@ _081DA02A: lsls r0, 24 cmp r0, 0 bne _081DA0B8 - ldr r0, _081DA08C + ldr r0, =0x02039e00 adds r1, r0, 0 adds r1, 0x2C ldrb r2, [r1] @@ -968820,8 +935960,7 @@ _081DA076: adds r0, r5, 0 b _081DA0A2 .align 2, 0 -_081DA088: .4byte 0x03005e08 -_081DA08C: .4byte 0x02039e00 + .pool _081DA090: adds r0, r3, 0x1 lsls r0, 24 @@ -968847,29 +935986,26 @@ _081DA0AC: _081DA0B8: mov r0, r9 bl sub_80F86E0 - ldr r1, _081DA0D8 + ldr r1, =0x02039f2b strb r0, [r1] - ldr r0, _081DA0DC + ldr r0, =0x02039f30 ldrb r0, [r0] cmp r0, 0x3 bhi _081DA0E8 - ldr r1, _081DA0E0 - ldr r2, _081DA0E4 + ldr r1, =sub_81DA488 + 1 + ldr r2, =sub_81DA10C + 1 adds r0, r6, 0 bl set_task_function_and_args_14_15 b _081DA0F6 .align 2, 0 -_081DA0D8: .4byte 0x02039f2b -_081DA0DC: .4byte 0x02039f30 -_081DA0E0: .4byte sub_81DA488 + 1 -_081DA0E4: .4byte sub_81DA10C + 1 + .pool _081DA0E8: - ldr r0, _081DA104 + ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 - ldr r0, _081DA108 + ldr r0, =sub_81DA10C + 1 str r0, [r1] _081DA0F6: add sp, 0x8 @@ -968880,8 +936016,7 @@ _081DA0F6: pop {r0} bx r0 .align 2, 0 -_081DA104: .4byte 0x03005e00 -_081DA108: .4byte sub_81DA10C + 1 + .pool thumb_func_end sub_81D9F68 thumb_func_start sub_81DA10C @@ -968890,20 +936025,18 @@ sub_81DA10C: @ 81DA10C adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _081DA12C + ldr r0, =0x02039f2c ldrb r0, [r0] bl sub_80DB09C - ldr r1, _081DA130 - ldr r2, _081DA134 + ldr r1, =sub_80FCF40 + 1 + ldr r2, =sub_81DA138 + 1 adds r0, r4, 0 bl set_task_function_and_args_14_15 pop {r4} pop {r0} bx r0 .align 2, 0 -_081DA12C: .4byte 0x02039f2c -_081DA130: .4byte sub_80FCF40 + 1 -_081DA134: .4byte sub_81DA138 + 1 + .pool thumb_func_end sub_81DA10C thumb_func_start sub_81DA138 @@ -968914,16 +936047,15 @@ sub_81DA138: @ 81DA138 lsrs r4, 24 movs r0, 0 bl sub_80DCE58 - ldr r1, _081DA158 - ldr r2, _081DA15C + ldr r1, =sub_80FCFD0 + 1 + ldr r2, =sub_80F8714 + 1 adds r0, r4, 0 bl set_task_function_and_args_14_15 pop {r4} pop {r0} bx r0 .align 2, 0 -_081DA158: .4byte sub_80FCFD0 + 1 -_081DA15C: .4byte sub_80F8714 + 1 + .pool thumb_func_end sub_81DA138 thumb_func_start sub_81DA160 @@ -968936,7 +936068,7 @@ sub_81DA160: @ 81DA160 lsls r6, r7, 2 adds r0, r6, r7 lsls r4, r0, 3 - ldr r5, _081DA1A0 + ldr r5, =0x03005e08 adds r0, r4, r5 adds r0, 0x18 bl sub_80FC670 @@ -968958,16 +936090,16 @@ sub_81DA160: @ 81DA160 bl set_task_function_to_args_14_15 b _081DA224 .align 2, 0 -_081DA1A0: .4byte 0x03005e08 + .pool _081DA1A4: bl sub_800A520 lsls r0, 24 cmp r0, 0 beq _081DA224 - ldr r0, _081DA1CC + ldr r0, =0x02039f25 ldrb r0, [r0] lsls r0, 6 - ldr r1, _081DA1D0 + ldr r1, =0x02039e00 adds r0, r1 movs r1, 0x40 bl sub_80FC4F4 @@ -968978,26 +936110,25 @@ _081DA1A4: strh r0, [r4, 0x8] b _081DA224 .align 2, 0 -_081DA1CC: .4byte 0x02039f25 -_081DA1D0: .4byte 0x02039e00 + .pool _081DA1D4: bl sub_80FC55C lsls r0, 24 cmp r0, 0 beq _081DA224 movs r5, 0 - ldr r0, _081DA230 + ldr r0, =0x02039f30 mov r8, r6 ldrb r0, [r0] cmp r5, r0 bge _081DA214 - ldr r6, _081DA234 + ldr r6, =0x020229e8 _081DA1EC: lsls r4, r5, 6 - ldr r0, _081DA238 + ldr r0, =0x02039e00 adds r4, r0 lsls r1, r5, 8 - ldr r0, _081DA23C + ldr r0, =0x020223c4 adds r1, r0 adds r0, r4, 0 movs r2, 0x40 @@ -969007,12 +936138,12 @@ _081DA1EC: bl sub_80DFA08 adds r6, 0x1C adds r5, 0x1 - ldr r0, _081DA230 + ldr r0, =0x02039f30 ldrb r0, [r0] cmp r5, r0 blt _081DA1EC _081DA214: - ldr r0, _081DA240 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 lsls r1, 3 @@ -969027,11 +936158,7 @@ _081DA224: pop {r0} bx r0 .align 2, 0 -_081DA230: .4byte 0x02039f30 -_081DA234: .4byte 0x020229e8 -_081DA238: .4byte 0x02039e00 -_081DA23C: .4byte 0x020223c4 -_081DA240: .4byte 0x03005e00 + .pool thumb_func_end sub_81DA160 thumb_func_start sub_81DA244 @@ -969042,7 +936169,7 @@ sub_81DA244: @ 81DA244 lsls r0, r4, 2 adds r0, r4 lsls r5, r0, 3 - ldr r6, _081DA280 + ldr r6, =0x03005e08 adds r0, r5, r6 adds r0, 0x18 bl sub_80FC670 @@ -969064,7 +936191,7 @@ sub_81DA244: @ 81DA244 bl set_task_function_to_args_14_15 b _081DA2D4 .align 2, 0 -_081DA280: .4byte 0x03005e08 + .pool _081DA284: bl link_get_multiplayer_id lsls r0, 24 @@ -969074,26 +936201,26 @@ _081DA284: lsls r0, 24 cmp r0, 0 beq _081DA2D4 - ldr r0, _081DA2A8 + ldr r0, =0x03005d80 movs r1, 0x4 bl sub_80FC4F4 cmp r0, 0x1 bne _081DA2D4 b _081DA2CE .align 2, 0 -_081DA2A8: .4byte 0x03005d80 + .pool _081DA2AC: movs r0, 0 bl sub_80FC530 lsls r0, 24 cmp r0, 0 beq _081DA2D4 - ldr r0, _081DA2DC - ldr r4, _081DA2E0 + ldr r0, =0x03005d80 + ldr r4, =0x020223c4 adds r1, r4, 0 movs r2, 0x4 bl memcpy - ldr r0, _081DA2E4 + ldr r0, =0x030060b8 adds r1, r4, 0 movs r2, 0x4 bl memcpy @@ -969106,9 +936233,7 @@ _081DA2D4: pop {r0} bx r0 .align 2, 0 -_081DA2DC: .4byte 0x03005d80 -_081DA2E0: .4byte 0x020223c4 -_081DA2E4: .4byte 0x030060b8 + .pool thumb_func_end sub_81DA244 thumb_func_start sub_81DA2E8 @@ -969125,7 +936250,7 @@ sub_81DA2E8: @ 81DA2E8 mov r9, r0 adds r0, r6 lsls r5, r0, 3 - ldr r1, _081DA334 + ldr r1, =0x03005e08 mov r8, r1 adds r0, r5, r1 adds r0, 0x18 @@ -969150,7 +936275,7 @@ sub_81DA2E8: @ 81DA2E8 bl set_task_function_to_args_14_15 b _081DA39E .align 2, 0 -_081DA334: .4byte 0x03005e08 + .pool _081DA338: bl sub_800A520 lsls r0, 24 @@ -969173,14 +936298,14 @@ _081DA35A: cmp r0, 0 beq _081DA39E movs r1, 0 - ldr r7, _081DA3B0 + ldr r7, =0x02039f30 ldrb r0, [r7] cmp r1, r0 bge _081DA390 mov r0, r8 adds r0, 0xA adds r3, r5, r0 - ldr r4, _081DA3B4 + ldr r4, =0x020223c4 mov r2, sp movs r5, 0x80 lsls r5, 1 @@ -969213,8 +936338,7 @@ _081DA39E: pop {r0} bx r0 .align 2, 0 -_081DA3B0: .4byte 0x02039f30 -_081DA3B4: .4byte 0x020223c4 + .pool thumb_func_end sub_81DA2E8 thumb_func_start sub_81DA3B8 @@ -969231,7 +936355,7 @@ sub_81DA3B8: @ 81DA3B8 mov r9, r0 adds r0, r6 lsls r5, r0, 3 - ldr r1, _081DA404 + ldr r1, =0x03005e08 mov r8, r1 adds r0, r5, r1 adds r0, 0x18 @@ -969256,7 +936380,7 @@ sub_81DA3B8: @ 81DA3B8 bl set_task_function_to_args_14_15 b _081DA46E .align 2, 0 -_081DA404: .4byte 0x03005e08 + .pool _081DA408: bl sub_800A520 lsls r0, 24 @@ -969279,14 +936403,14 @@ _081DA42A: cmp r0, 0 beq _081DA46E movs r1, 0 - ldr r7, _081DA480 + ldr r7, =0x02039f30 ldrb r0, [r7] cmp r1, r0 bge _081DA460 mov r0, r8 adds r0, 0x2 adds r3, r5, r0 - ldr r4, _081DA484 + ldr r4, =0x020223c4 mov r2, sp movs r5, 0x80 lsls r5, 1 @@ -969319,8 +936443,7 @@ _081DA46E: pop {r0} bx r0 .align 2, 0 -_081DA480: .4byte 0x02039f30 -_081DA484: .4byte 0x020223c4 + .pool thumb_func_end sub_81DA3B8 thumb_func_start sub_81DA488 @@ -969333,7 +936456,7 @@ sub_81DA488: @ 81DA488 lsls r7, r6, 2 adds r0, r7, r6 lsls r4, r0, 3 - ldr r5, _081DA4C8 + ldr r5, =0x03005e08 adds r0, r4, r5 adds r0, 0x18 bl sub_80FC670 @@ -969355,7 +936478,7 @@ sub_81DA488: @ 81DA488 bl set_task_function_to_args_14_15 b _081DA55C .align 2, 0 -_081DA4C8: .4byte 0x03005e08 + .pool _081DA4CC: bl link_get_multiplayer_id lsls r0, 24 @@ -969365,10 +936488,10 @@ _081DA4CC: lsls r0, 24 cmp r0, 0 beq _081DA55C - ldr r0, _081DA504 + ldr r0, =0x02039f30 ldrb r2, [r0] lsls r0, r2, 6 - ldr r1, _081DA508 + ldr r1, =0x02039e00 adds r0, r1 movs r1, 0x4 subs r1, r2 @@ -969383,20 +936506,19 @@ _081DA4FA: strh r0, [r4, 0x8] b _081DA55C .align 2, 0 -_081DA504: .4byte 0x02039f30 -_081DA508: .4byte 0x02039e00 + .pool _081DA50C: movs r0, 0 bl sub_80FC530 lsls r0, 24 cmp r0, 0 beq _081DA55C - ldr r4, _081DA568 + ldr r4, =0x02039f30 ldrb r3, [r4] lsls r0, r3, 6 - ldr r5, _081DA56C + ldr r5, =0x02039e00 adds r0, r5 - ldr r1, _081DA570 + ldr r1, =0x020223c4 movs r2, 0x4 subs r2, r3 lsls r2, 6 @@ -969407,7 +936529,7 @@ _081DA50C: bgt _081DA54C lsls r0, r4, 6 adds r5, r0, r5 - ldr r7, _081DA574 + ldr r7, =0x020229e8 _081DA53C: ldrh r1, [r7, 0x1A] adds r0, r5, 0 @@ -969417,7 +936539,7 @@ _081DA53C: cmp r4, 0x3 ble _081DA53C _081DA54C: - ldr r0, _081DA578 + ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r6 lsls r1, 3 @@ -969432,17 +936554,13 @@ _081DA55C: pop {r0} bx r0 .align 2, 0 -_081DA568: .4byte 0x02039f30 -_081DA56C: .4byte 0x02039e00 -_081DA570: .4byte 0x020223c4 -_081DA574: .4byte 0x020229e8 -_081DA578: .4byte 0x03005e00 + .pool thumb_func_end sub_81DA488 thumb_func_start sub_81DA57C sub_81DA57C: @ 81DA57C push {lr} - ldr r0, _081DA5B8 + ldr r0, =0x00000864 bl flag_check lsls r0, 24 cmp r0, 0 @@ -969461,16 +936579,15 @@ sub_81DA57C: @ 81DA57C lsls r0, 24 cmp r0, 0 beq _081DA5C0 - ldr r0, _081DA5BC + ldr r0, =0x0862ad34 movs r1, 0x8 movs r2, 0x5 bl sub_81DA5D4 b _081DA5CA .align 2, 0 -_081DA5B8: .4byte 0x00000864 -_081DA5BC: .4byte 0x0862ad34 + .pool _081DA5C0: - ldr r0, _081DA5D0 + ldr r0, =0x0862ad44 movs r1, 0x7 movs r2, 0x1 bl sub_81DA5D4 @@ -969478,7 +936595,7 @@ _081DA5CA: pop {r0} bx r0 .align 2, 0 -_081DA5D0: .4byte 0x0862ad44 + .pool thumb_func_end sub_81DA57C thumb_func_start sub_81DA5D4 @@ -969500,10 +936617,10 @@ sub_81DA5D4: @ 81DA5D4 bcs _081DA61C mov r4, r9 _081DA5F4: - ldr r0, _081DA6A8 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r4] - ldr r2, _081DA6AC + ldr r2, =0x000009ca adds r0, r2 adds r0, r1 ldrb r0, [r0] @@ -969532,10 +936649,10 @@ _081DA61C: bcs _081DA654 mov r4, r9 _081DA62E: - ldr r0, _081DA6A8 + ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r4] - ldr r2, _081DA6AC + ldr r2, =0x000009ca adds r0, r2 adds r0, r1 ldrb r0, [r0] @@ -969563,8 +936680,8 @@ _081DA654: movs r5, 0 cmp r5, r7 bcs _081DA6BA - ldr r2, _081DA6A8 - ldr r3, _081DA6AC + ldr r2, =0x03005d8c + ldr r3, =0x000009ca mov r4, r9 _081DA674: ldr r0, [r2] @@ -969592,8 +936709,7 @@ _081DA674: strb r1, [r0] b _081DA6BA .align 2, 0 -_081DA6A8: .4byte 0x03005d8c -_081DA6AC: .4byte 0x000009ca + .pool _081DA6B0: subs r6, 0x1 _081DA6B2: @@ -969617,7 +936733,7 @@ sub_81DA6CC: @ 81DA6CC push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 - ldr r6, _081DA6EC + ldr r6, =0x085500a4 _081DA6D4: lsls r0, r4, 1 lsls r1, r5, 4 @@ -969631,7 +936747,7 @@ _081DA6D4: adds r0, r4, 0 b _081DA6F8 .align 2, 0 -_081DA6EC: .4byte 0x085500a4 + .pool _081DA6F0: adds r4, 0x1 cmp r4, 0x4 @@ -969650,29 +936766,25 @@ sub_81DA700: @ 81DA700 add r1, sp, 0x4 mov r0, sp bl sub_8149F58 - ldr r0, _081DA738 + ldr r0, =0x0862ad54 ldr r1, [sp, 0x4] bl LZ77UnCompVram - ldr r0, _081DA73C + ldr r0, =0x0862af30 ldr r1, [sp] bl LZ77UnCompVram - ldr r0, _081DA740 + ldr r0, =0x0862b53c movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - ldr r0, _081DA744 + ldr r0, =0x0862b724 bl gpu_tile_obj_decompress_and_load - ldr r0, _081DA748 + ldr r0, =0x0862b72c bl gpu_pal_obj_alloc_tag_and_apply add sp, 0x8 pop {r0} bx r0 .align 2, 0 -_081DA738: .4byte 0x0862ad54 -_081DA73C: .4byte 0x0862af30 -_081DA740: .4byte 0x0862b53c -_081DA744: .4byte 0x0862b724 -_081DA748: .4byte 0x0862b72c + .pool thumb_func_end sub_81DA700 thumb_func_start sub_81DA74C @@ -969702,7 +936814,7 @@ sub_81DA74C: @ 81DA74C mov r9, r1 lsls r4, 24 lsrs r7, r4, 24 - ldr r0, _081DA7A4 + ldr r0, =0x0862b758 lsls r5, 16 asrs r5, 16 lsls r6, 16 @@ -969721,18 +936833,18 @@ sub_81DA74C: @ 81DA74C beq _081DA7B8 b _081DA7AC .align 2, 0 -_081DA7A4: .4byte 0x0862b758 + .pool _081DA7A8: cmp r7, 0x2 beq _081DA7E4 _081DA7AC: - ldr r6, _081DA7B4 + ldr r6, =0x02020630 lsls r3, r5, 4 b _081DA7F8 .align 2, 0 -_081DA7B4: .4byte 0x02020630 + .pool _081DA7B8: - ldr r2, _081DA7CC + ldr r2, =0x02020630 lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -969742,9 +936854,9 @@ _081DA7B8: movs r1, 0x2D b _081DA7F4 .align 2, 0 -_081DA7CC: .4byte 0x02020630 + .pool _081DA7D0: - ldr r2, _081DA7E0 + ldr r2, =0x02020630 lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -969752,9 +936864,9 @@ _081DA7D0: movs r1, 0x59 b _081DA7F0 .align 2, 0 -_081DA7E0: .4byte 0x02020630 + .pool _081DA7E4: - ldr r2, _081DA840 + ldr r2, =0x02020630 lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -969791,7 +936903,7 @@ _081DA7F8: adds r0, r6, 0 adds r0, 0x1C adds r4, r0 - ldr r0, _081DA844 + ldr r0, =sub_81DA848 + 1 str r0, [r4] adds r0, r5, 0 add sp, 0x4 @@ -969803,8 +936915,7 @@ _081DA7F8: pop {r1} bx r1 .align 2, 0 -_081DA840: .4byte 0x02020630 -_081DA844: .4byte sub_81DA848 + 1 + .pool thumb_func_end sub_81DA74C thumb_func_start sub_81DA848 @@ -969825,11 +936936,11 @@ sub_81DA848: @ 81DA848 ldrsh r0, [r2, r4] cmp r1, r0 bne _081DA874 - ldr r0, _081DA870 + ldr r0, =nullsub_12 + 1 str r0, [r3, 0x1C] b _081DA8B4 .align 2, 0 -_081DA870: .4byte nullsub_12 + 1 + .pool _081DA874: ldrh r4, [r2, 0x8] movs r5, 0x8 @@ -969902,7 +937013,7 @@ sub_81DA8BC: @ 81DA8BC lsrs r7, r4, 16 lsls r5, 24 lsrs r5, 24 - ldr r0, _081DA920 + ldr r0, =0x0862b758 lsls r6, 16 asrs r6, 16 mov r1, r8 @@ -969923,18 +937034,18 @@ sub_81DA8BC: @ 81DA8BC beq _081DA934 b _081DA928 .align 2, 0 -_081DA920: .4byte 0x0862b758 + .pool _081DA924: cmp r5, 0x2 beq _081DA960 _081DA928: - ldr r2, _081DA930 + ldr r2, =0x02020630 lsls r3, r6, 4 b _081DA972 .align 2, 0 -_081DA930: .4byte 0x02020630 + .pool _081DA934: - ldr r2, _081DA948 + ldr r2, =0x02020630 lsls r3, r6, 4 adds r0, r3, r6 lsls r0, 2 @@ -969944,9 +937055,9 @@ _081DA934: movs r1, 0x2D b _081DA970 .align 2, 0 -_081DA948: .4byte 0x02020630 + .pool _081DA94C: - ldr r2, _081DA95C + ldr r2, =0x02020630 lsls r3, r6, 4 adds r0, r3, r6 lsls r0, 2 @@ -969954,9 +937065,9 @@ _081DA94C: movs r1, 0x59 b _081DA96C .align 2, 0 -_081DA95C: .4byte 0x02020630 + .pool _081DA960: - ldr r2, _081DA9B4 + ldr r2, =0x02020630 lsls r3, r6, 4 adds r0, r3, r6 lsls r0, 2 @@ -969989,7 +937100,7 @@ _081DA972: adds r0, r2, 0 adds r0, 0x1C adds r4, r0 - ldr r0, _081DA9B8 + ldr r0, =sub_81DA9BC + 1 str r0, [r4] adds r0, r6, 0 add sp, 0xC @@ -970001,8 +937112,7 @@ _081DA972: pop {r1} bx r1 .align 2, 0 -_081DA9B4: .4byte 0x02020630 -_081DA9B8: .4byte sub_81DA9BC + 1 + .pool thumb_func_end sub_81DA8BC thumb_func_start sub_81DA9BC @@ -970048,21 +937158,21 @@ sub_81DA9BC: @ 81DA9BC strh r0, [r4, 0x36] b _081DAA16 _081DAA12: - ldr r0, _081DAA1C + ldr r0, =nullsub_12 + 1 str r0, [r4, 0x1C] _081DAA16: pop {r4} pop {r0} bx r0 .align 2, 0 -_081DAA1C: .4byte nullsub_12 + 1 + .pool thumb_func_end sub_81DA9BC thumb_func_start sub_81DAA20 sub_81DAA20: @ 81DAA20 push {r4,r5,lr} adds r5, r0, 0 - ldr r4, _081DAA6C + ldr r4, =0x00002e90 adds r0, r4, 0 bl gpu_tile_obj_free_by_tag adds r0, r4, 0 @@ -970072,7 +937182,7 @@ sub_81DAA20: @ 81DAA20 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _081DAA70 + ldr r4, =0x02020630 adds r0, r4 bl obj_delete_and_free_tiles movs r0, 0x12 @@ -970093,15 +937203,14 @@ sub_81DAA20: @ 81DAA20 pop {r0} bx r0 .align 2, 0 -_081DAA6C: .4byte 0x00002e90 -_081DAA70: .4byte 0x02020630 + .pool thumb_func_end sub_81DAA20 thumb_func_start sub_81DAA74 sub_81DAA74: @ 81DAA74 push {r4,r5,lr} adds r3, r0, 0 - ldr r2, _081DAABC + ldr r2, =0x02020630 movs r0, 0x10 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -970111,7 +937220,7 @@ sub_81DAA74: @ 81DAA74 adds r5, 0x1C adds r0, r5 ldr r4, [r0] - ldr r0, _081DAAC0 + ldr r0, =nullsub_12 + 1 cmp r4, r0 bne _081DAAC4 movs r0, 0x12 @@ -970135,8 +937244,7 @@ sub_81DAA74: @ 81DAA74 movs r0, 0x1 b _081DAAC6 .align 2, 0 -_081DAABC: .4byte 0x02020630 -_081DAAC0: .4byte nullsub_12 + 1 + .pool _081DAAC4: movs r0, 0 _081DAAC6: @@ -970154,7 +937262,7 @@ sub_81DAACC: @ 81DAACC cmp r0, 0 beq _081DAB20 bl sub_81DA700 - ldr r1, _081DAB1C + ldr r1, =0x00003f41 movs r0, 0x50 bl lcd_io_set movs r1, 0x80 @@ -970182,7 +937290,7 @@ sub_81DAACC: @ 81DAACC movs r0, 0x1 b _081DAB46 .align 2, 0 -_081DAB1C: .4byte 0x00003f41 + .pool _081DAB20: movs r1, 0x80 lsls r1, 6 @@ -970290,8 +937398,8 @@ sub_81DABDC: @ 81DABDC push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081DAC0C - ldr r2, _081DAC10 + ldr r5, =0x0862b770 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -970311,8 +937419,7 @@ _081DABEE: pop {r0} bx r0 .align 2, 0 -_081DAC0C: .4byte 0x0862b770 -_081DAC10: .4byte 0x03005e00 + .pool thumb_func_end sub_81DABDC thumb_func_start sub_81DAC14 @@ -970374,7 +937481,7 @@ sub_81DAC14: @ 81DAC14 sub_81DAC80: @ 81DAC80 push {lr} adds r2, r0, 0 - ldr r0, _081DACAC + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -970382,7 +937489,7 @@ sub_81DAC80: @ 81DAC80 bne _081DACA4 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, _081DACB0 + ldr r0, =sub_81DABDC + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -970392,8 +937499,7 @@ _081DACA4: pop {r1} bx r1 .align 2, 0 -_081DACAC: .4byte 0x02037fd4 -_081DACB0: .4byte sub_81DABDC + 1 + .pool thumb_func_end sub_81DAC80 thumb_func_start sub_81DACB4 @@ -970401,8 +937507,8 @@ sub_81DACB4: @ 81DACB4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081DACE4 - ldr r2, _081DACE8 + ldr r5, =0x0862b784 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -970422,8 +937528,7 @@ _081DACC6: pop {r0} bx r0 .align 2, 0 -_081DACE4: .4byte 0x0862b784 -_081DACE8: .4byte 0x03005e00 + .pool thumb_func_end sub_81DACB4 thumb_func_start sub_81DACEC @@ -970485,7 +937590,7 @@ sub_81DACEC: @ 81DACEC sub_81DAD58: @ 81DAD58 push {lr} adds r2, r0, 0 - ldr r0, _081DAD84 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -970493,7 +937598,7 @@ sub_81DAD58: @ 81DAD58 bne _081DAD7C adds r0, r2, 0 bl sub_81DAA20 - ldr r0, _081DAD88 + ldr r0, =sub_81DACB4 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -970503,8 +937608,7 @@ _081DAD7C: pop {r1} bx r1 .align 2, 0 -_081DAD84: .4byte 0x02037fd4 -_081DAD88: .4byte sub_81DACB4 + 1 + .pool thumb_func_end sub_81DAD58 thumb_func_start sub_81DAD8C @@ -970512,8 +937616,8 @@ sub_81DAD8C: @ 81DAD8C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081DADBC - ldr r2, _081DADC0 + ldr r5, =0x0862b798 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -970533,8 +937637,7 @@ _081DAD9E: pop {r0} bx r0 .align 2, 0 -_081DADBC: .4byte 0x0862b798 -_081DADC0: .4byte 0x03005e00 + .pool thumb_func_end sub_81DAD8C thumb_func_start sub_81DADC4 @@ -970605,7 +937708,7 @@ sub_81DADC4: @ 81DADC4 sub_81DAE44: @ 81DAE44 push {lr} adds r2, r0, 0 - ldr r0, _081DAE70 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -970613,7 +937716,7 @@ sub_81DAE44: @ 81DAE44 bne _081DAE68 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, _081DAE74 + ldr r0, =sub_81DAD8C + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -970623,8 +937726,7 @@ _081DAE68: pop {r1} bx r1 .align 2, 0 -_081DAE70: .4byte 0x02037fd4 -_081DAE74: .4byte sub_81DAD8C + 1 + .pool thumb_func_end sub_81DAE44 thumb_func_start sub_81DAE78 @@ -970632,8 +937734,8 @@ sub_81DAE78: @ 81DAE78 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081DAEA8 - ldr r2, _081DAEAC + ldr r5, =0x0862b7ac + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -970653,8 +937755,7 @@ _081DAE8A: pop {r0} bx r0 .align 2, 0 -_081DAEA8: .4byte 0x0862b7ac -_081DAEAC: .4byte 0x03005e00 + .pool thumb_func_end sub_81DAE78 thumb_func_start sub_81DAEB0 @@ -970727,7 +937828,7 @@ sub_81DAEB0: @ 81DAEB0 sub_81DAF34: @ 81DAF34 push {lr} adds r2, r0, 0 - ldr r0, _081DAF60 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -970735,7 +937836,7 @@ sub_81DAF34: @ 81DAF34 bne _081DAF58 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, _081DAF64 + ldr r0, =sub_81DAE78 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -970745,8 +937846,7 @@ _081DAF58: pop {r1} bx r1 .align 2, 0 -_081DAF60: .4byte 0x02037fd4 -_081DAF64: .4byte sub_81DAE78 + 1 + .pool thumb_func_end sub_81DAF34 thumb_func_start sub_81DAF68 @@ -970754,8 +937854,8 @@ sub_81DAF68: @ 81DAF68 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081DAF98 - ldr r2, _081DAF9C + ldr r5, =0x0862b7c0 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -970775,8 +937875,7 @@ _081DAF7A: pop {r0} bx r0 .align 2, 0 -_081DAF98: .4byte 0x0862b7c0 -_081DAF9C: .4byte 0x03005e00 + .pool thumb_func_end sub_81DAF68 thumb_func_start sub_81DAFA0 @@ -970856,7 +937955,7 @@ _081DB01A: sub_81DB02C: @ 81DB02C push {lr} adds r2, r0, 0 - ldr r0, _081DB058 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -970864,7 +937963,7 @@ sub_81DB02C: @ 81DB02C bne _081DB050 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, _081DB05C + ldr r0, =sub_81DAF68 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -970874,8 +937973,7 @@ _081DB050: pop {r1} bx r1 .align 2, 0 -_081DB058: .4byte 0x02037fd4 -_081DB05C: .4byte sub_81DAF68 + 1 + .pool thumb_func_end sub_81DB02C thumb_func_start sub_81DB060 @@ -970883,8 +937981,8 @@ sub_81DB060: @ 81DB060 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081DB090 - ldr r2, _081DB094 + ldr r5, =0x0862b7d4 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -970904,8 +938002,7 @@ _081DB072: pop {r0} bx r0 .align 2, 0 -_081DB090: .4byte 0x0862b7d4 -_081DB094: .4byte 0x03005e00 + .pool thumb_func_end sub_81DB060 thumb_func_start sub_81DB098 @@ -970985,7 +938082,7 @@ _081DB112: sub_81DB124: @ 81DB124 push {lr} adds r2, r0, 0 - ldr r0, _081DB150 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -970993,7 +938090,7 @@ sub_81DB124: @ 81DB124 bne _081DB148 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, _081DB154 + ldr r0, =sub_81DB060 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -971003,8 +938100,7 @@ _081DB148: pop {r1} bx r1 .align 2, 0 -_081DB150: .4byte 0x02037fd4 -_081DB154: .4byte sub_81DB060 + 1 + .pool thumb_func_end sub_81DB124 thumb_func_start sub_81DB158 @@ -971012,8 +938108,8 @@ sub_81DB158: @ 81DB158 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081DB188 - ldr r2, _081DB18C + ldr r5, =0x0862b7e8 + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -971033,8 +938129,7 @@ _081DB16A: pop {r0} bx r0 .align 2, 0 -_081DB188: .4byte 0x0862b7e8 -_081DB18C: .4byte 0x03005e00 + .pool thumb_func_end sub_81DB158 thumb_func_start sub_81DB190 @@ -971118,7 +938213,7 @@ _081DB212: sub_81DB224: @ 81DB224 push {lr} adds r2, r0, 0 - ldr r0, _081DB250 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -971126,7 +938221,7 @@ sub_81DB224: @ 81DB224 bne _081DB248 adds r0, r2, 0 bl sub_81DAA20 - ldr r0, _081DB254 + ldr r0, =sub_81DB158 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -971136,8 +938231,7 @@ _081DB248: pop {r1} bx r1 .align 2, 0 -_081DB250: .4byte 0x02037fd4 -_081DB254: .4byte sub_81DB158 + 1 + .pool thumb_func_end sub_81DB224 thumb_func_start sub_81DB258 @@ -971145,8 +938239,8 @@ sub_81DB258: @ 81DB258 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _081DB288 - ldr r2, _081DB28C + ldr r5, =0x0862b7fc + ldr r2, =0x03005e00 lsls r1, r0, 2 adds r1, r0 lsls r1, 3 @@ -971166,8 +938260,7 @@ _081DB26A: pop {r0} bx r0 .align 2, 0 -_081DB288: .4byte 0x0862b7fc -_081DB28C: .4byte 0x03005e00 + .pool thumb_func_end sub_81DB258 thumb_func_start sub_81DB290 @@ -971253,7 +938346,7 @@ _081DB316: sub_81DB328: @ 81DB328 push {lr} adds r2, r0, 0 - ldr r0, _081DB354 + ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 @@ -971261,7 +938354,7 @@ sub_81DB328: @ 81DB328 bne _081DB34C adds r0, r2, 0 bl sub_81DAA20 - ldr r0, _081DB358 + ldr r0, =sub_81DB258 + 1 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 @@ -971271,8 +938364,7 @@ _081DB34C: pop {r1} bx r1 .align 2, 0 -_081DB354: .4byte 0x02037fd4 -_081DB358: .4byte sub_81DB258 + 1 + .pool thumb_func_end sub_81DB328 thumb_func_start sub_81DB35C @@ -971445,20 +938537,19 @@ sub_81DB468: @ 81DB468 adds r2, r0, 0 adds r0, r1, 0 lsls r2, 5 - ldr r1, _081DB48C + ldr r1, =0x0856b5b0 adds r2, r1 adds r1, r2, 0 bl gf_strcpy movs r1, 0 strb r1, [r0] adds r0, 0x1 - ldr r1, _081DB490 + ldr r1, =0x085e8268 bl gf_strcpy pop {r0} bx r0 .align 2, 0 -_081DB48C: .4byte 0x0856b5b0 -_081DB490: .4byte 0x085e8268 + .pool thumb_func_end sub_81DB468 thumb_func_start sub_81DB494 @@ -971699,7 +938790,7 @@ sub_81DB620: @ 81DB620 lsls r4, r0, 1 adds r4, r0 lsls r4, 2 - ldr r0, _081DB674 + ldr r0, =0x02020004 adds r4, r0 lsls r7, r3, 5 ldrb r0, [r4, 0x3] @@ -971714,7 +938805,7 @@ sub_81DB620: @ 81DB620 ble _081DB66C adds r4, r0, 0 _081DB646: - ldr r0, _081DB678 + ldr r0, =0x11111111 str r0, [sp] adds r2, r7, 0 cmp r2, 0 @@ -971739,8 +938830,7 @@ _081DB66C: pop {r0} bx r0 .align 2, 0 -_081DB674: .4byte 0x02020004 -_081DB678: .4byte 0x11111111 + .pool thumb_func_end sub_81DB620 .incbin "base_emerald.gba", 0x1db67c, 0x2ded70 - 0x1db67c